[ekiga] Remove obsolete code

[Eugen Dedu <ededu src gnome org>]

commit 17324dd79f7ef97039a43aed5701571ed7a979ab
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Wed Jun 2 19:10:44 2010 +0200

    Remove obsolete code
    
    It was used for old version of glib, ekiga depends on glib >= 2.14.0
    anyway.

 lib/engine/framework/runtime-glib.cpp |    5 -----
 lib/gmconf/gmconf-glib.c              |    5 -----
 lib/gui/gmstatusbar.c                 |    5 -----
 src/dbus-helper/dbus-helper.cpp       |    4 ----
 src/gui/main_window.cpp               |    8 --------
 src/gui/statusicon.cpp                |    5 -----
 6 files changed, 0 insertions(+), 32 deletions(-)
---
diff --git a/lib/engine/framework/runtime-glib.cpp b/lib/engine/framework/runtime-glib.cpp
index a71c008..c5acd30 100644
--- a/lib/engine/framework/runtime-glib.cpp
+++ b/lib/engine/framework/runtime-glib.cpp
@@ -109,13 +109,8 @@ dispatch (GSource *source,
   if (msg->seconds == 0)
     (void)run_later_or_back_in_main_helper ((gpointer)msg);
   else
-#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;
 }
 
diff --git a/lib/gmconf/gmconf-glib.c b/lib/gmconf/gmconf-glib.c
index 2acf5de..39a01d0 100644
--- a/lib/gmconf/gmconf-glib.c
+++ b/lib/gmconf/gmconf-glib.c
@@ -1271,12 +1271,7 @@ gm_conf_init ()
   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
-
 }
 
 
diff --git a/lib/gui/gmstatusbar.c b/lib/gui/gmstatusbar.c
index 61436ea..1907e13 100644
--- a/lib/gui/gmstatusbar.c
+++ b/lib/gui/gmstatusbar.c
@@ -135,13 +135,8 @@ gm_sb_push_message (GmStatusbar *sb,
         timer_source = 0;
       }
 
-#if GLIB_CHECK_VERSION (2, 14, 0)
       timer_source = g_timeout_add_seconds (15, gm_statusbar_clear_msg_cb, 
 		       GINT_TO_POINTER (msg_id));
-#else
-      timer_source = g_timeout_add (15000, gm_statusbar_clear_msg_cb, 
-		       GINT_TO_POINTER (msg_id));
-#endif
     }
   }
 }
diff --git a/src/dbus-helper/dbus-helper.cpp b/src/dbus-helper/dbus-helper.cpp
index 20bdd9c..b5d7b7a 100644
--- a/src/dbus-helper/dbus-helper.cpp
+++ b/src/dbus-helper/dbus-helper.cpp
@@ -200,11 +200,7 @@ main (G_GNUC_UNUSED int argc,
 
   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);
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 0c9db75..353f906 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -667,11 +667,7 @@ static void on_established_call_cb (boost::shared_ptr<Ekiga::CallManager>  /*man
 
   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
 
   boost::shared_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get<Ekiga::AudioOutputCore> ("audiooutput-core");
 
@@ -4516,11 +4512,7 @@ main (int argc,
       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 */
diff --git a/src/gui/statusicon.cpp b/src/gui/statusicon.cpp
index 7e01409..3e2fcbc 100644
--- a/src/gui/statusicon.cpp
+++ b/src/gui/statusicon.cpp
@@ -494,13 +494,8 @@ statusicon_start_blinking (StatusIcon *icon,
   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
 }