ekiga r7449 - in trunk: lib/engine/framework lib/gmconf src/dbus-helper src/gui

[jpuydt svn gnome org]

Author: jpuydt
Date: Thu Dec 11 12:30:11 2008
New Revision: 7449
URL: http://svn.gnome.org/viewvc/ekiga?rev=7449&view=rev

Log:
Fixed bug #564110 : saving the world one uW at a time

Modified:
   trunk/lib/engine/framework/runtime-glib.cpp
   trunk/lib/gmconf/gmconf-glib.c
   trunk/src/dbus-helper/dbus-helper.cpp
   trunk/src/gui/main.cpp
   trunk/src/gui/statusicon.cpp

Modified: trunk/lib/engine/framework/runtime-glib.cpp
==============================================================================
--- trunk/lib/engine/framework/runtime-glib.cpp	(original)
+++ trunk/lib/engine/framework/runtime-glib.cpp	Thu Dec 11 12:30:11 2008
@@ -99,9 +99,13 @@
   if (msg->seconds == 0)
     (void)run_later_or_back_in_main_helper ((gpointer)msg);
   else
-    g_timeout_add (1000*msg->seconds,
+#if GLIB_CHECK_VERSION (2, 14, 0)
+    g_timeout_add_seconds (msg->seconds,
+			   run_later_or_back_in_main_helper, (gpointer)msg);
+#else
+    g_timeout_add (1000 * msg->seconds,
 		   run_later_or_back_in_main_helper, (gpointer)msg);
-
+#endif
   return TRUE;
 }
 

Modified: trunk/lib/gmconf/gmconf-glib.c
==============================================================================
--- trunk/lib/gmconf/gmconf-glib.c	(original)
+++ trunk/lib/gmconf/gmconf-glib.c	Thu Dec 11 12:30:11 2008
@@ -1271,7 +1271,11 @@
   gm_conf_set_bool ("/desktop/gnome/interface/menus_have_icons", TRUE);
 
   /* automatic savings */
+#if GLIB_CHECK_VERSION (2, 14, 0)
+  g_timeout_add_seconds (5, (GSourceFunc)saveconf_timer_callback, NULL);
+#else
   g_timeout_add (5000, (GSourceFunc)saveconf_timer_callback, NULL);
+#endif
 
 }
 

Modified: trunk/src/dbus-helper/dbus-helper.cpp
==============================================================================
--- trunk/src/dbus-helper/dbus-helper.cpp	(original)
+++ trunk/src/dbus-helper/dbus-helper.cpp	Thu Dec 11 12:30:11 2008
@@ -200,8 +200,11 @@
 
   dbus_g_connection_register_g_object (bus, GM_HELPER_OBJECT, helper);
 
+#if GLIB_CHECK_VERSION (2,14,0)
+  g_timeout_add_seconds (5, hara_kiri, mainloop);
+#else
   g_timeout_add (5000, hara_kiri, mainloop);
-
+#endif
   g_main_loop_run (mainloop);
 
   g_object_unref (helper);

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Thu Dec 11 12:30:11 2008
@@ -650,7 +650,11 @@
 
   mw->priv->current_call = call;
 
+#if GLIB_CHECK_VERSION (2, 14, 0)
+  mw->priv->timeout_id = g_timeout_add_seconds (1, on_stats_refresh_cb, self);
+#else
   mw->priv->timeout_id = g_timeout_add (1000, on_stats_refresh_cb, self);
+#endif
 
   gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
     = mw->priv->core->get ("audiooutput-core");
@@ -4484,7 +4488,11 @@
       if (!gm_conf_get_bool (USER_INTERFACE_KEY "start_hidden")) 
         gtk_widget_show (main_window);
       else
+#if GLIB_CHECK_VERSION (2, 14, 0)
+        g_timeout_add_seconds (15, (GtkFunction) gnomemeeting_tray_hack_cb, NULL);
+#else
         g_timeout_add (15000, (GtkFunction) gnomemeeting_tray_hack_cb, NULL);
+#endif
     }
 
     /* Call the given host if needed */

Modified: trunk/src/gui/statusicon.cpp
==============================================================================
--- trunk/src/gui/statusicon.cpp	(original)
+++ trunk/src/gui/statusicon.cpp	Thu Dec 11 12:30:11 2008
@@ -422,8 +422,13 @@
   g_return_if_fail (icon != NULL);
 
   icon->priv->blink_image = g_strdup (stock_id);
+#if GLIB_CHECK_VERSION (2, 14, 0)
+  if (icon->priv->blink_id == -1)
+    icon->priv->blink_id = g_timeout_add_seconds (1, statusicon_blink_cb, icon);
+#else
   if (icon->priv->blink_id == -1)
     icon->priv->blink_id = g_timeout_add (1000, statusicon_blink_cb, icon);
+#endif
 }