[ekiga] Fix last compilation error with GTK 2.24
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Fix last compilation error with GTK 2.24
- Date: Fri, 8 Apr 2011 20:33:36 +0000 (UTC)
commit 8de1c76a6d3af739af0872aeac2eef4eccf5ac57
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date: Fri Apr 8 22:33:00 2011 +0200
Fix last compilation error with GTK 2.24
src/gui/main_window.cpp | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index f3e1e0a..494e1b3 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -2195,7 +2195,7 @@ ekiga_main_window_zooms_menu_update_sensitivity (EkigaMainWindow *mw,
/* GTK callbacks */
-static gint
+static gboolean
gnomemeeting_tray_hack_cb (G_GNUC_UNUSED gpointer data)
{
GtkWidget *main_window = NULL;
@@ -2203,10 +2203,11 @@ gnomemeeting_tray_hack_cb (G_GNUC_UNUSED gpointer data)
statusicon = GTK_STATUS_ICON (GnomeMeeting::Process ()->GetStatusicon ());
main_window = GnomeMeeting::Process ()->GetMainWindow ();
-
- if (!gtk_status_icon_is_embedded (GTK_STATUS_ICON (statusicon)))
+
+ // show the main window if the icon has not appeared in tray
+ if (!gtk_status_icon_is_embedded (GTK_STATUS_ICON (statusicon)))
gtk_widget_show (main_window);
-
+
return FALSE;
}
@@ -4857,7 +4858,7 @@ main (int argc,
if (!gm_conf_get_bool (USER_INTERFACE_KEY "start_hidden"))
gtk_widget_show (main_window);
else
- g_timeout_add_seconds (15, (GtkFunction) gnomemeeting_tray_hack_cb, NULL);
+ g_timeout_add_seconds (15, gnomemeeting_tray_hack_cb, NULL);
}
/* Call the given host if needed */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]