[network-manager-applet] core: fix up GTK deprecation versions
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] core: fix up GTK deprecation versions
- Date: Thu, 18 Nov 2010 16:18:54 +0000 (UTC)
commit c9b4306b2e6eb67ad20027189ceb48b5bc29c24b
Author: Dan Williams <dcbw redhat com>
Date: Thu Nov 18 10:17:18 2010 -0600
core: fix up GTK deprecation versions
Most of the deprecated stuff we're using was deprecated in 2.23,
not 2.90.
src/applet-dialogs.c | 4 ++--
src/applet.c | 4 ++--
src/utils/mobile-wizard.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c
index c76f94a..67f0c86 100644
--- a/src/applet-dialogs.c
+++ b/src/applet-dialogs.c
@@ -567,7 +567,7 @@ applet_info_dialog_show (NMApplet *applet)
gdk_x11_get_server_time (gtk_widget_get_window (dialog)));
}
-#if !GTK_CHECK_VERSION(2,90,0)
+#if !GTK_CHECK_VERSION(2,23,0)
static void
about_dialog_handle_url_cb (GtkAboutDialog *about, const gchar *url, gpointer data)
{
@@ -592,7 +592,7 @@ about_dialog_handle_url_cb (GtkAboutDialog *about, const gchar *url, gpointer da
void
applet_about_dialog_show (NMApplet *applet)
{
-#if !GTK_CHECK_VERSION(2,90,0)
+#if !GTK_CHECK_VERSION(2,23,0)
gtk_about_dialog_set_url_hook (about_dialog_handle_url_cb, NULL, NULL);
#endif
gtk_show_about_dialog (NULL,
diff --git a/src/applet.c b/src/applet.c
index 7e13e2a..15a9c98 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -2936,7 +2936,7 @@ applet_pre_keyring_callback (gpointer user_data)
if (applet->menu)
window = gtk_widget_get_window (applet->menu);
if (window) {
-#if GTK_CHECK_VERSION(2,90,0)
+#if GTK_CHECK_VERSION(2,23,0)
screen = gdk_window_get_screen (window);
#else
screen = gdk_drawable_get_screen (window);
@@ -2961,7 +2961,7 @@ applet_pre_keyring_callback (gpointer user_data)
if (applet->context_menu)
window = gtk_widget_get_window (applet->context_menu);
if (window) {
-#if GTK_CHECK_VERSION(2,90,0)
+#if GTK_CHECK_VERSION(2,23,0)
screen = gdk_window_get_screen (window);
#else
screen = gdk_drawable_get_screen (window);
diff --git a/src/utils/mobile-wizard.c b/src/utils/mobile-wizard.c
index d562fc5..f84a49d 100644
--- a/src/utils/mobile-wizard.c
+++ b/src/utils/mobile-wizard.c
@@ -747,19 +747,19 @@ providers_setup (MobileWizard *self)
gtk_table_attach (GTK_TABLE (unlisted_table), alignment,
1, 2, 0, 1, GTK_EXPAND | GTK_FILL, 0, 6, 6);
-#if GTK_CHECK_VERSION(2,90,0)
+#if GTK_CHECK_VERSION(2,23,0)
self->provider_unlisted_type_combo = gtk_combo_box_text_new ();
#else
self->provider_unlisted_type_combo = gtk_combo_box_new_text ();
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (label), self->provider_unlisted_type_combo);
-#if GTK_CHECK_VERSION(2,90,0)
+#if GTK_CHECK_VERSION(2,23,0)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (self->provider_unlisted_type_combo),
#else
gtk_combo_box_append_text (GTK_COMBO_BOX (self->provider_unlisted_type_combo),
#endif
_("My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"));
-#if GTK_CHECK_VERSION(2,90,0)
+#if GTK_CHECK_VERSION(2,23,0)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (self->provider_unlisted_type_combo),
#else
gtk_combo_box_append_text (GTK_COMBO_BOX (self->provider_unlisted_type_combo),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]