Merge branch 'backport' into work

[dana/openbox.git] / openbox / startupnotify.c

diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 47c95da..aa6db7e 100644 (file)
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -43,7 +43,6 @@ void sn_spawn_cancel() {}
 #else
 
 #include "openbox.h"
 #else
 
 #include "openbox.h"

-#include "mainloop.h"

 #include "screen.h"
 
 #define SN_API_NOT_YET_FROZEN
 #include "screen.h"
 
 #define SN_API_NOT_YET_FROZEN


@@ -63,12 +62,12 @@ void sn_startup(gboolean reconfig)
 {
     if (reconfig) return;
 
 {
     if (reconfig) return;
 

-    sn_display = sn_display_new(ob_display, NULL, NULL);
+    sn_display = sn_display_new(obt_display, NULL, NULL);

     sn_context = sn_monitor_context_new(sn_display, ob_screen,
                                         sn_event_func, NULL, NULL);
     sn_launcher = sn_launcher_context_new(sn_display, ob_screen);
 
     sn_context = sn_monitor_context_new(sn_display, ob_screen,
                                         sn_event_func, NULL, NULL);
     sn_launcher = sn_launcher_context_new(sn_display, ob_screen);
 

-    ob_main_loop_x_add(ob_main_loop, sn_handler, NULL, NULL);
+    obt_main_loop_x_add(ob_main_loop, sn_handler, NULL, NULL);

 }
 
 void sn_shutdown(gboolean reconfig)
 }
 
 void sn_shutdown(gboolean reconfig)


@@ -77,7 +76,7 @@ void sn_shutdown(gboolean reconfig)
 
     if (reconfig) return;
 
 
     if (reconfig) return;
 

-    ob_main_loop_x_remove(ob_main_loop, sn_handler);
+    obt_main_loop_x_remove(ob_main_loop, sn_handler);

 
     for (it = sn_waits; it; it = g_slist_next(it))
         sn_startup_sequence_unref((SnStartupSequence*)it->data);
 
     for (it = sn_waits; it; it = g_slist_next(it))
         sn_startup_sequence_unref((SnStartupSequence*)it->data);


@@ -140,10 +139,10 @@ static void sn_event_func(SnMonitorEvent *ev, gpointer data)
         sn_waits = g_slist_prepend(sn_waits, seq);
         /* 20 second timeout for apps to start if the launcher doesn't
            have a timeout */
         sn_waits = g_slist_prepend(sn_waits, seq);
         /* 20 second timeout for apps to start if the launcher doesn't
            have a timeout */

-        ob_main_loop_timeout_add(ob_main_loop, 20 * G_USEC_PER_SEC,
-                                 sn_wait_timeout, seq,
-                                 g_direct_equal,
-                                 (GDestroyNotify)sn_startup_sequence_unref);
+        obt_main_loop_timeout_add(ob_main_loop, 20 * G_USEC_PER_SEC,
+                                  sn_wait_timeout, seq,
+                                  g_direct_equal,
+                                  (GDestroyNotify)sn_startup_sequence_unref);

         change = TRUE;
         break;
     case SN_MONITOR_EVENT_CHANGED:
         change = TRUE;
         break;
     case SN_MONITOR_EVENT_CHANGED:


@@ -154,8 +153,8 @@ static void sn_event_func(SnMonitorEvent *ev, gpointer data)
     case SN_MONITOR_EVENT_CANCELED:
         if ((seq = sequence_find(sn_startup_sequence_get_id(seq)))) {
             sn_waits = g_slist_remove(sn_waits, seq);
     case SN_MONITOR_EVENT_CANCELED:
         if ((seq = sequence_find(sn_startup_sequence_get_id(seq)))) {
             sn_waits = g_slist_remove(sn_waits, seq);

-            ob_main_loop_timeout_remove_data(ob_main_loop, sn_wait_timeout,
-                                             seq, FALSE);
+            obt_main_loop_timeout_remove_data(ob_main_loop, sn_wait_timeout,
+                                              seq, FALSE);

             change = TRUE;
         }
         break;
             change = TRUE;
         }
         break;


@@ -261,10 +260,10 @@ void sn_setup_spawn_environment(const gchar *program, const gchar *name,
 
     /* 20 second timeout for apps to start */
     sn_launcher_context_ref(sn_launcher);
 
     /* 20 second timeout for apps to start */
     sn_launcher_context_ref(sn_launcher);

-    ob_main_loop_timeout_add(ob_main_loop, 20 * G_USEC_PER_SEC,
-                             sn_launch_wait_timeout, sn_launcher,
-                             g_direct_equal,
-                             (GDestroyNotify)sn_launcher_context_unref);
+    obt_main_loop_timeout_add(ob_main_loop, 20 * G_USEC_PER_SEC,
+                              sn_launch_wait_timeout, sn_launcher,
+                              g_direct_equal,
+                              (GDestroyNotify)sn_launcher_context_unref);

 
     setenv("DESKTOP_STARTUP_ID", id, TRUE);
 
 
     setenv("DESKTOP_STARTUP_ID", id, TRUE);