ekiga r6882 - in trunk: . src/gui

[jschamp svn gnome org]

Author: jschamp
Date: Mon Sep  8 19:35:29 2008
New Revision: 6882
URL: http://svn.gnome.org/viewvc/ekiga?rev=6882&view=rev

Log:
Do not touch the WM stay-on-top hint when we're not configured to do so. Fixes #438375 in some way.

Modified:
   trunk/ChangeLog
   trunk/src/gui/main.cpp

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Mon Sep  8 19:35:29 2008
@@ -719,7 +719,8 @@
 			  call.get_remote_party_name ().c_str ());
 
   gm_main_window_set_call_url (GTK_WIDGET (self), call.get_remote_uri ().c_str());
-  gm_main_window_set_stay_on_top (GTK_WIDGET (self), gm_conf_get_bool (VIDEO_DISPLAY_KEY "stay_on_top"));
+  if (gm_conf_get_bool (VIDEO_DISPLAY_KEY "stay_on_top"))
+    gm_main_window_set_stay_on_top (GTK_WIDGET (self), TRUE);
   gm_main_window_set_status (GTK_WIDGET (self), info);
   gm_main_window_flash_message (GTK_WIDGET (self), "%s", info);
   if (!gm_conf_get_bool (USER_INTERFACE_KEY "main_window/show_call_panel"))
@@ -746,7 +747,8 @@
 {
   GmMainWindow *mw = gm_mw_get_mw (GTK_WIDGET (self));
 
-  gm_main_window_set_stay_on_top (GTK_WIDGET (self), FALSE);
+  if (gm_conf_get_bool (VIDEO_DISPLAY_KEY "stay_on_top"))
+    gm_main_window_set_stay_on_top (GTK_WIDGET (self), FALSE);
   gm_main_window_update_calling_state (GTK_WIDGET (self), Standby);
   gm_main_window_set_status (GTK_WIDGET (self), _("Standby"));
   gm_main_window_set_call_duration (GTK_WIDGET (self), NULL);