[network-manager-applet] Remove obsolete compile time version checks
- From: Christopher Aillon <caillon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] Remove obsolete compile time version checks
- Date: Thu, 24 Feb 2011 19:26:54 +0000 (UTC)
commit 2c95bac1c53f8b049d18231e4aa36daca2830627
Author: Christopher Aillon <caillon redhat com>
Date: Thu Feb 24 11:13:46 2011 -0800
Remove obsolete compile time version checks
Minimum GTK+ version required to compile is 2.20, so drop the checks
for earlier versions.
src/applet.c | 12 ------------
src/connection-editor/ce-page.h | 4 ----
src/gnome-bluetooth/bt-widget.c | 4 ----
src/wireless-security/eap-method-tls.c | 4 ----
4 files changed, 0 insertions(+), 24 deletions(-)
---
diff --git a/src/applet.c b/src/applet.c
index 41c4ce1..8cdf4fa 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -1653,11 +1653,7 @@ static void nma_menu_show_cb (GtkWidget *menu, NMApplet *applet)
g_return_if_fail (menu != NULL);
g_return_if_fail (applet != NULL);
-#if GTK_CHECK_VERSION(2, 15, 0)
gtk_status_icon_set_tooltip_text (applet->status_icon, NULL);
-#else
- gtk_status_icon_set_tooltip (applet->status_icon, NULL);
-#endif
if (!nm_client_get_manager_running (applet->nm_client)) {
nma_menu_add_text_item (menu, _("NetworkManager is not running..."));
@@ -1704,11 +1700,7 @@ nma_menu_deactivate_cb (GtkWidget *widget, NMApplet *applet)
applet->menu = NULL;
/* Re-set the tooltip */
-#if GTK_CHECK_VERSION(2, 15, 0)
gtk_status_icon_set_tooltip_text (applet->status_icon, applet->tip);
-#else
- gtk_status_icon_set_tooltip (applet->status_icon, applet->tip);
-#endif
}
static gboolean
@@ -2531,11 +2523,7 @@ applet_update_icon (gpointer user_data)
g_string_free (tip, FALSE);
}
-#if GTK_CHECK_VERSION(2, 15, 0)
gtk_status_icon_set_tooltip_text (applet->status_icon, applet->tip);
-#else
- gtk_status_icon_set_tooltip (applet->status_icon, applet->tip);
-#endif
return FALSE;
}
diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h
index 7cacfb5..aa14e57 100644
--- a/src/connection-editor/ce-page.h
+++ b/src/connection-editor/ce-page.h
@@ -31,10 +31,6 @@
#include <dbus/dbus-glib.h>
#include <nm-connection.h>
-#if !GTK_CHECK_VERSION(2,18,0)
-#define gtk_widget_is_toplevel GTK_WIDGET_TOPLEVEL
-#endif
-
typedef void (*PageNewConnectionResultFunc) (NMConnection *connection,
gboolean canceled,
GError *error,
diff --git a/src/gnome-bluetooth/bt-widget.c b/src/gnome-bluetooth/bt-widget.c
index aca658a..5715a05 100644
--- a/src/gnome-bluetooth/bt-widget.c
+++ b/src/gnome-bluetooth/bt-widget.c
@@ -619,11 +619,7 @@ modem_get_all_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
info->dun_timeout_id = 0;
parent = gtk_widget_get_toplevel (info->hbox);
-#if GTK_CHECK_VERSION(2,18,0)
if (gtk_widget_is_toplevel (parent)) {
-#else
- if (GTK_WIDGET_TOPLEVEL (parent)) {
-#endif
info->window_group = gtk_window_group_new ();
gtk_window_group_add_window (info->window_group, GTK_WINDOW (parent));
} else {
diff --git a/src/wireless-security/eap-method-tls.c b/src/wireless-security/eap-method-tls.c
index 26eaafc..89f672d 100644
--- a/src/wireless-security/eap-method-tls.c
+++ b/src/wireless-security/eap-method-tls.c
@@ -246,11 +246,7 @@ private_key_picker_helper (EAPMethod *parent, const char *filename, gboolean cha
GtkWindow *parent_window = NULL;
toplevel = gtk_widget_get_toplevel (parent->ui_widget);
-#if GTK_CHECK_VERSION(2,18,0)
if (gtk_widget_is_toplevel (toplevel))
-#else
- if (GTK_WIDGET_TOPLEVEL (toplevel))
-#endif
parent_window = GTK_WINDOW (toplevel);
dialog = gtk_message_dialog_new (parent_window,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]