[ekiga] Removed a few GTK_CHECK_VERSION which are now useless given our deps
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Removed a few GTK_CHECK_VERSION which are now useless given our deps
- Date: Tue, 15 Jun 2010 15:57:01 +0000 (UTC)
commit 16184df3359e4e9133c50b874275d7c4e7bac8b5
Author: Julien Puydt <jpuydt gnome org>
Date: Tue Jun 15 17:57:21 2010 +0200
Removed a few GTK_CHECK_VERSION which are now useless given our deps
lib/engine/gui/gtk-frontend/chat-area.cpp | 6 +-----
lib/gui/gm-smiley-chooser-button.c | 5 -----
lib/toolbox/toolbox-gtk.c | 4 ----
src/gui/callbacks.cpp | 7 +------
src/gui/statusicon.cpp | 17 ++---------------
5 files changed, 4 insertions(+), 35 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/chat-area.cpp b/lib/engine/gui/gtk-frontend/chat-area.cpp
index 4252891..27e4764 100644
--- a/lib/engine/gui/gtk-frontend/chat-area.cpp
+++ b/lib/engine/gui/gtk-frontend/chat-area.cpp
@@ -433,12 +433,8 @@ on_extlink_tag_event (GtkTextTag* tag,
case GDK_SETTING:
case GDK_OWNER_CHANGE:
case GDK_GRAB_BROKEN:
-#if GTK_CHECK_VERSION(2,14,0)
case GDK_DAMAGE:
-#endif
-#if GTK_CHECK_VERSION (2,18,0)
- case GDK_EVENT_LAST:
-#endif
+ case GDK_EVENT_LAST:
default:
result = FALSE; // nothing
break; // nothing
diff --git a/lib/gui/gm-smiley-chooser-button.c b/lib/gui/gm-smiley-chooser-button.c
index 5356ac2..5d55898 100644
--- a/lib/gui/gm-smiley-chooser-button.c
+++ b/lib/gui/gm-smiley-chooser-button.c
@@ -434,10 +434,7 @@ static gboolean on_popup_button_press_event (G_GNUC_UNUSED GtkWidget* widget,
gm_smiley_chooser_button_popdown (self);
return FALSE;
break;
- /* FIXME is that neccesary? Compiler warnings and so... */
-#if GTK_CHECK_VERSION (2,14,0)
case GDK_DAMAGE:
-#endif
case GDK_NOTHING:
case GDK_DELETE:
case GDK_DESTROY:
@@ -474,9 +471,7 @@ static gboolean on_popup_button_press_event (G_GNUC_UNUSED GtkWidget* widget,
case GDK_SETTING:
case GDK_OWNER_CHANGE:
case GDK_GRAB_BROKEN:
-#if GTK_CHECK_VERSION (2,18,0)
case GDK_EVENT_LAST:
-#endif
default:
return FALSE;
}
diff --git a/lib/toolbox/toolbox-gtk.c b/lib/toolbox/toolbox-gtk.c
index 3dc82d0..a4f4246 100644
--- a/lib/toolbox/toolbox-gtk.c
+++ b/lib/toolbox/toolbox-gtk.c
@@ -45,12 +45,8 @@ gm_open_uri (const gchar *uri)
g_return_if_fail (uri != NULL);
-#if GTK_CHECK_VERSION(2,13,1)
if (!gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, &error)) {
g_error_free (error);
gm_open_uri_fallback (uri);
}
-#else
- gm_open_uri_fallback (uri);
-#endif
}
diff --git a/src/gui/callbacks.cpp b/src/gui/callbacks.cpp
index 7a6d879..dbfa525 100644
--- a/src/gui/callbacks.cpp
+++ b/src/gui/callbacks.cpp
@@ -207,13 +207,8 @@ help_cb (G_GNUC_UNUSED GtkWidget *widget,
#ifdef HAVE_GNOME
success = gnome_help_display (PACKAGE_NAME ".xml", NULL, &err);
-#elif GTK_CHECK_VERSION(2, 13, 1)
- success = gtk_show_uri (NULL, "ghelp:" PACKAGE_NAME, GDK_CURRENT_TIME, &err);
#else
- success = FALSE;
- err = g_error_new_literal (g_quark_from_static_string ("ekiga"),
- 0,
- _("Help display is not supported by your GTK+ version"));
+ success = gtk_show_uri (NULL, "ghelp:" PACKAGE_NAME, GDK_CURRENT_TIME, &err);
#endif
if (!success) {
diff --git a/src/gui/statusicon.cpp b/src/gui/statusicon.cpp
index 3e2fcbc..fe0b370 100644
--- a/src/gui/statusicon.cpp
+++ b/src/gui/statusicon.cpp
@@ -314,21 +314,12 @@ unread_count_cb (G_GNUC_UNUSED GtkWidget *widget,
"You have %d messages",
messages), messages);
-#if GTK_CHECK_VERSION(2,16,0)
gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (self), message);
-#else
- gtk_status_icon_set_tooltip (GTK_STATUS_ICON (self), message);
-#endif
g_free (message);
}
- else {
-#if GTK_CHECK_VERSION(2,16,0)
+ else
gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (self), NULL);
-#else
- gtk_status_icon_set_tooltip (GTK_STATUS_ICON (self), NULL);
-#endif
- }
self->priv->unread_messages = (messages > 0);
}
@@ -441,11 +432,7 @@ on_account_updated (Ekiga::BankPtr /*bank*/,
message = "";
}
-#if GTK_CHECK_VERSION(2,16,0)
- gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (data), message.c_str ());
-#else
- gtk_status_icon_set_tooltip (GTK_STATUS_ICON (data), message.c_str ());
-#endif
+ gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (data), message.c_str ());
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]