[Window] Fix automatic pulldown code

[tilda-gobject.git] / tilda.c

diff --git a/tilda.c b/tilda.c
index 854520a..d0d81f2 100644 (file)
--- a/tilda.c
+++ b/tilda.c
@@ -2,11 +2,12 @@
 #include <signal.h>
 
 #include "tilda.h"
+#include "tilda-config.h"
 #include "tilda-controller.h"
 #include "tomboykeybinder.h"
 
 /* Project-global variables */
-DBusGConnection *dbus_connection;
+DBusGConnection *dbus_connection = NULL;
 
 static void
 tilda_dbus_init ()
@@ -64,7 +65,7 @@ tilda_parse_command_line (gint argc, gchar *argv[])
 
        /* All of the various command-line options */
        const GOptionEntry cl_opts[] = {
-               { "version",                    'V', 0, G_OPTION_ARG_NONE,              &version,                       N_("Show version information"), NULL },
+               { "version",                    'V', 0, G_OPTION_ARG_NONE,              &version,                       _("Show version information"), NULL },
                { NULL },
        };
 
@@ -155,6 +156,9 @@ int main (int argc, char *argv[])
        /* Initialize the keybinder */
        tomboy_keybinder_init ();
 
+       /* Initialize the configuration system */
+       tilda_config_init ("tilda.conf");
+
        /* Start our connection to DBus */
        tilda_dbus_init ();
 
@@ -169,6 +173,9 @@ int main (int argc, char *argv[])
        /* Unref the TildaController that controls this whole operation */
        g_object_unref (G_OBJECT(tilda));
 
+       /* Clean up after the config system */
+       tilda_config_free ();
+
        return 0;
 }