[ekiga] Made ekiga compile with GSEAL
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Made ekiga compile with GSEAL
- Date: Tue, 15 Jun 2010 15:18:28 +0000 (UTC)
commit 3335c2ff69b13f727c973a9b39611a1035b07b1c
Author: Julien Puydt <jpuydt gnome org>
Date: Tue Jun 15 17:02:16 2010 +0200
Made ekiga compile with GSEAL
lib/gui/gmlevelmeter.c | 5 +++++
lib/gui/gmmenuaddon.c | 5 ++++-
lib/gui/gmstatusbar.c | 8 ++++++--
3 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/lib/gui/gmlevelmeter.c b/lib/gui/gmlevelmeter.c
index 0a25450..4e25fad 100644
--- a/lib/gui/gmlevelmeter.c
+++ b/lib/gui/gmlevelmeter.c
@@ -362,7 +362,12 @@ gm_level_meter_realize (GtkWidget *widget)
g_return_if_fail (GM_IS_LEVEL_METER (widget));
+#if GTK_CHECK_VERSION(2,20,0)
+ gtk_widget_set_realized (widget, TRUE);
+#else
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+#endif
+
lm = GM_LEVEL_METER (widget);
gtk_widget_get_allocation (widget, &allocation);
diff --git a/lib/gui/gmmenuaddon.c b/lib/gui/gmmenuaddon.c
index 89fa3e0..1511e2f 100644
--- a/lib/gui/gmmenuaddon.c
+++ b/lib/gui/gmmenuaddon.c
@@ -139,11 +139,14 @@ menu_item_selected (GtkWidget *w,
}
else {
-
+#if GTK_CHECK_VERSION (2, 22, 0)
+ gtk_statusbar_remove_all (GTK_STATUSBAR (statusbar), id);
+#else
len = g_slist_length ((GSList *) (GTK_STATUSBAR (statusbar)->messages));
for (i = 0 ; i < len ; i++)
gtk_statusbar_pop (GTK_STATUSBAR (statusbar), id);
+#endif
}
}
}
diff --git a/lib/gui/gmstatusbar.c b/lib/gui/gmstatusbar.c
index 1907e13..ae87fe5 100644
--- a/lib/gui/gmstatusbar.c
+++ b/lib/gui/gmstatusbar.c
@@ -110,14 +110,18 @@ gm_sb_push_message (GmStatusbar *sb,
g_return_if_fail (sb != NULL);
- len = g_slist_length ((GSList *) (GTK_STATUSBAR (sb)->messages));
if (info_message)
id = gtk_statusbar_get_context_id (GTK_STATUSBAR (sb), "info");
else
id = gtk_statusbar_get_context_id (GTK_STATUSBAR (sb), "statusbar");
-
+
+#if GTK_CHECK_VERSION (2, 22, 0)
+ gtk_statusbar_remove_all (GTK_STATUSBAR (sb), id);
+#else
+ len = g_slist_length ((GSList *) (GTK_STATUSBAR (sb)->messages));
for (i = 0 ; i < len ; i++)
gtk_statusbar_pop (GTK_STATUSBAR (sb), id);
+#endif
if (msg) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]