end startup notify when the main window is shown

diff --git a/src/main.c b/src/main.c
index 5302c7247925011f4da48bdf697ee90b621ea6c7..40f56d53d00c510a6fb208df0256ff1f0aa753b8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -113,8 +113,6 @@ static void parse_args(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
-    SnDisplay *sn_d;
-    SnLauncheeContext *sn_cx;
     gchar *p;
 
     gtk_init(&argc, &argv);
@@ -186,24 +184,6 @@ int main(int argc, char **argv)
 
     mainwin = get_widget("main_window");
 
-    sn_d = sn_display_new(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
-                          NULL, NULL);
-
-    sn_cx = sn_launchee_context_new_from_environment
-        (sn_d, gdk_screen_get_number(gdk_display_get_default_screen
-                                     (gdk_display_get_default())));
-
-    if (sn_cx)
-        sn_launchee_context_setup_window
-            (sn_cx, GDK_WINDOW_XWINDOW(GDK_WINDOW(mainwin->window)));
-
-    if (sn_cx)
-        sn_launchee_context_complete(sn_cx);
-
-    if (sn_cx)
-        sn_launchee_context_unref(sn_cx);
-    sn_display_unref(sn_d);
-
     if (obc_theme_install)
         theme_install(obc_theme_install);
 
@@ -235,3 +215,29 @@ void on_close_clicked()
 {
     gtk_main_quit();
 }
+
+void obconf_show_main()
+{
+    SnDisplay *sn_d;
+    SnLauncheeContext *sn_cx;
+
+    sn_d = sn_display_new(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
+                          NULL, NULL);
+
+    sn_cx = sn_launchee_context_new_from_environment
+        (sn_d, gdk_screen_get_number(gdk_display_get_default_screen
+                                     (gdk_display_get_default())));
+
+    if (sn_cx)
+        sn_launchee_context_setup_window
+            (sn_cx, GDK_WINDOW_XWINDOW(GDK_WINDOW(mainwin->window)));
+
+    if (sn_cx)
+        sn_launchee_context_complete(sn_cx);
+
+    if (sn_cx)
+        sn_launchee_context_unref(sn_cx);
+    sn_display_unref(sn_d);
+
+    gtk_widget_show_all(mainwin);
+}

diff --git a/src/main.h b/src/main.h
index 9a1bf2cd8e95a088d4cb970199f9759831d949e8..53fe1896170cd78e0bc509e154465ae7b6ce25f2 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -35,5 +35,6 @@ extern GtkWidget *mainwin;
 #define get_widget(s) glade_xml_get_widget(glade, s)
 
 void obconf_error(gchar *msg);
+void obconf_show_main();
 
 #endif

diff --git a/src/preview_update.c b/src/preview_update.c
index bc45f07002c45db03b4c8011ada495eb87a85c13..10791cf30a18069ddc5946de898fe5589fe2b40d 100644 (file)
--- a/src/preview_update.c
+++ b/src/preview_update.c
@@ -105,7 +105,7 @@ static gboolean update_theme_preview_iterate(gpointer data)
                                          FALSE, 0, 0);
             gtk_tree_path_free(path);
 
-            gtk_widget_show_all(mainwin);
+            obconf_show_main();
 
             return FALSE;
         }