[ekiga/v4_0] Replace call to one-line function with its code

[Eugen Dedu <ededu src gnome org>]

commit 6dfc95ffced571798e67d533d018578635059eb0
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Tue Dec 18 15:17:03 2012 +0100

    Replace call to one-line function with its code

 lib/engine/gui/gtk-frontend/call-window.cpp |   19 ++++---------------
 lib/gui/gmwindow.c                          |    8 --------
 lib/gui/gmwindow.h                          |    7 -------
 3 files changed, 4 insertions(+), 30 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index eb747df..8969c2d 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -396,9 +396,6 @@ static void window_closed_from_menu_cb (G_GNUC_UNUSED GtkWidget *,
 static void ekiga_call_window_update_calling_state (EkigaCallWindow *cw,
                                                     unsigned calling_state);
 
-static void ekiga_call_window_set_stay_on_top (EkigaCallWindow *cw,
-                                               gboolean stay_on_top);
-
 static void ekiga_call_window_clear_signal_levels (EkigaCallWindow *cw);
 
 static void ekiga_call_window_clear_stats (EkigaCallWindow *cw);
@@ -488,7 +485,7 @@ stay_on_top_changed_nt (G_GNUC_UNUSED gpointer id,
   if (gm_conf_entry_get_type (entry) == GM_CONF_BOOL) {
 
     val = gm_conf_entry_get_bool (entry);
-    ekiga_call_window_set_stay_on_top (EKIGA_CALL_WINDOW (data), val);
+    gdk_window_set_keep_above (GTK_WIDGET (data)->window, val);
   }
 }
 
@@ -1157,7 +1154,7 @@ on_established_call_cb (boost::shared_ptr<Ekiga::CallManager>  /*manager*/,
   gtk_window_set_title (GTK_WINDOW (cw), call->get_remote_party_name ().c_str ());
 
   if (gm_conf_get_bool (VIDEO_DISPLAY_KEY "stay_on_top"))
-    ekiga_call_window_set_stay_on_top (cw, true);
+    gdk_window_set_keep_above (GTK_WIDGET (cw)->window, true);
   ekiga_call_window_set_status (cw, _("Connected with %s"), call->get_remote_party_name ().c_str ());
   ekiga_call_window_update_calling_state (cw, Connected);
 
@@ -1179,7 +1176,7 @@ on_cleared_call_cb (G_GNUC_UNUSED boost::shared_ptr<Ekiga::CallManager> manager,
   }
 
   if (gm_conf_get_bool (VIDEO_DISPLAY_KEY "stay_on_top"))
-    ekiga_call_window_set_stay_on_top (cw, false);
+    gdk_window_set_keep_above (GTK_WIDGET (cw)->window, false);
   ekiga_call_window_update_calling_state (cw, Standby);
   ekiga_call_window_set_status (cw, _("Standby"));
   ekiga_call_window_set_bandwidth (cw, 0.0, 0.0, 0.0, 0.0, 0, 0);
@@ -1477,14 +1474,6 @@ ekiga_call_window_update_calling_state (EkigaCallWindow *cw,
 }
 
 static void
-ekiga_call_window_set_stay_on_top (EkigaCallWindow *cw,
-				   gboolean stay_on_top)
-{
-  g_return_if_fail (EKIGA_IS_CALL_WINDOW (cw));
-  gm_window_set_always_on_top (GTK_WIDGET (cw)->window, stay_on_top);
-}
-
-static void
 ekiga_call_window_clear_signal_levels (EkigaCallWindow *cw)
 {
   g_return_if_fail (EKIGA_IS_CALL_WINDOW (cw));
@@ -2589,7 +2578,7 @@ ekiga_call_window_show (GtkWidget *widget)
 {
   EkigaCallWindow *cw = EKIGA_CALL_WINDOW (widget);
   if (gm_conf_get_bool (VIDEO_DISPLAY_KEY "stay_on_top") && cw->priv->current_call)
-    gm_window_set_always_on_top (widget->window, true);
+    gdk_window_set_keep_above (widget->window, true);
   GTK_WIDGET_CLASS (ekiga_call_window_parent_class)->show (widget);
 
   gtk_widget_queue_draw (GTK_WIDGET (cw));
diff --git a/lib/gui/gmwindow.c b/lib/gui/gmwindow.c
index 67d58a1..49f1cd8 100644
--- a/lib/gui/gmwindow.c
+++ b/lib/gui/gmwindow.c
@@ -474,14 +474,6 @@ gm_window_get_hide_on_escape (GmWindow *window)
 }
 
 
-void
-gm_window_set_always_on_top (GdkWindow *window,
-			     gboolean enable)
-{
-  gdk_window_set_keep_above (window, enable);
-}
-
-
 gboolean
 gm_window_is_visible (GtkWidget* w)
 {
diff --git a/lib/gui/gmwindow.h b/lib/gui/gmwindow.h
index a064c42..bdaf313 100644
--- a/lib/gui/gmwindow.h
+++ b/lib/gui/gmwindow.h
@@ -121,13 +121,6 @@ void gm_window_set_hide_on_escape (GmWindow *window,
  */
 gboolean gm_window_get_hide_on_escape (GmWindow *window);
 
-/** Makes sure the given window is always on top
- * @param window is a GdkWindow
- * @param enable whether to set or unset the always on top state
- */
-void gm_window_set_always_on_top (GdkWindow* window,
-				  gboolean enable);
-
 /** Check whether a window is visible or not
  * @param window is a GtkWidget
  */