X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tools%2Fobconf%2Fmain.c;h=a4278d9df68ec81eb437099d970679f1c2c7b2ad;hb=960a7f0184a84f99545fa2d3dd22cefc77f2cbc6;hp=9abd8716b4061bbbc7fb89daa32ab3e340df447a;hpb=a354b0f5a93b711c0eb70d52ba8fe5b42ff4ae36;p=chaz%2Fopenbox

diff --git a/tools/obconf/main.c b/tools/obconf/main.c
index 9abd8716..a4278d9d 100644
--- a/tools/obconf/main.c
+++ b/tools/obconf/main.c
@@ -1,5 +1,5 @@
-#include "obconf.h"
-#include "plugins.h"
+/*#include "obconf.h"
+  #include "plugins.h"*/
 #include "parser/parse.h"
 #include "gettext.h"
 
@@ -20,8 +20,10 @@ static void obconf_error(GError *e)
                                GTK_MESSAGE_ERROR,
                                GTK_BUTTONS_CLOSE,
                                "%s", e->message);
-    gtk_dialog_run(GTK_DIALOG(d));
-    gtk_widget_destroy(d);
+    g_signal_connect_swapped(GTK_OBJECT(d), "response",
+                             G_CALLBACK(gtk_widget_destroy),
+                             GTK_OBJECT(d));
+    gtk_widget_show(d);
 }
 
 static void load_stock ()
@@ -55,16 +57,16 @@ int main(int argc, char **argv)
     gtk_set_locale();
     gtk_init(&argc, &argv);
 
-    load_stock();
-
     mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_window_set_title(GTK_WINDOW(mainwin), "Obconf");
     gtk_window_set_wmclass(GTK_WINDOW(mainwin), "obconf", "Obconf");
     gtk_window_set_role(GTK_WINDOW(mainwin), "main window");
-    if (ob_icon) gtk_window_set_icon(GTK_WINDOW(mainwin), ob_icon);
 
     gtk_widget_show_all(mainwin);
 
+    load_stock();
+    if (ob_icon) gtk_window_set_icon(GTK_WINDOW(mainwin), ob_icon);
+
     gtk_main();
     return 0;
 }