Changeset 5f649045eb54b700a7af27066ec33c1133276db5

Timestamp:

10/14/08 22:15:21 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

8429a15f4cb78d463a897be993ca943724f59f53

Children:

86c32c8ba885e66218f79923a22d968a37125468

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-10-14T22:15:21Z+0200

Message:

Use inf_init() instead of calling the required initialization routines directly

2008-10-14 Armin Burgmeier <armin@…>

• code/main.cpp: Call inf_init() instead of initializing gnutls and the GObject type system directly.

Files:

• ChangeLog (modified) (1 diff)
• code/main.cpp (modified) (4 diffs)

ChangeLog

@@ +1 @@
+2008-10-14  Armin Burgmeier  <armin@arbur.net>
+
+        * code/main.cpp: Call inf_init() instead of initializing gnutls and
+        the GObject type system directly.
+
 2008-10-14  Armin Burgmeier  <armin@arbur.net>
 

code/main.cpp

@@ -24 +24 @@
 #include "util/file.hpp"
 #include "util/i18n.hpp"
+
+#include <libinfinity/common/inf-init.h>
 
 #include <gtkmm/main.h>
@@ -56 +58 @@
 {
         g_thread_init(NULL);
-        gnutls_global_init();
         Gio::init();
 
@@ -103 +104 @@
         }
 
+        GError* error = NULL;
+        if(!inf_init(&error))
+        {
+                std::string message = error->message;
+                g_error_free(error);
+                throw std::runtime_error(message);
+        }
+
         Gobby::IconManager icon_manager;
 
@@ -121 +130 @@
         kit->run();
 
-        //gnutls_global_deinit();
+        //inf_deinit();
         return 0;
 }