Created
July 29, 2010 12:42
-
-
Save ebi/498014 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/fe-gtk/dccgui.c b/src/fe-gtk/dccgui.c | |
index 61f6d50..ccb60cf 100644 | |
--- a/src/fe-gtk/dccgui.c | |
+++ b/src/fe-gtk/dccgui.c | |
@@ -704,7 +704,7 @@ dcc_exp_cb (GtkWidget *exp, GtkWidget *box) | |
#if GTK_CHECK_VERSION(2,20,0) | |
if (gtk_widget_get_visible (box)) | |
#else | |
- if (GTK_WIDGET_VISIBLE (box)) | |
+ if (gtk_widget_get_visible (box)) | |
#endif | |
gtk_widget_hide (box); | |
else | |
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c | |
index 251a7d7..8b97055 100644 | |
--- a/src/fe-gtk/fe-gtk.c | |
+++ b/src/fe-gtk/fe-gtk.c | |
@@ -820,7 +820,7 @@ fe_gui_info (session *sess, int info_type) | |
#if GTK_CHECK_VERSION(2,20,0) | |
if (!gtk_widget_get_visible (GTK_WINDOW (sess->gui->window))) | |
#else | |
- if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (sess->gui->window))) | |
+ if (!gtk_widget_get_visible (GTK_WINDOW (sess->gui->window))) | |
#endif | |
return 2; /* hidden (iconified or systray) */ | |
#if GTK_CHECK_VERSION(2,4,0) | |
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c | |
index 994e8cd..618363e 100644 | |
--- a/src/fe-gtk/maingui.c | |
+++ b/src/fe-gtk/maingui.c | |
@@ -597,8 +597,8 @@ mg_show_generic_tab (GtkWidget *box) | |
int num; | |
GtkWidget *f = NULL; | |
-#if defined(GTK_WIDGET_HAS_FOCUS) | |
- if (current_sess && GTK_WIDGET_HAS_FOCUS (current_sess->gui->input_box)) | |
+#if defined(gtk_widget_has_focus) | |
+ if (current_sess && gtk_widget_has_focus (current_sess->gui->input_box)) | |
#else | |
if (current_sess && gtk_widget_has_focus (current_sess->gui->input_box)) | |
#endif | |
@@ -811,9 +811,9 @@ mg_set_topic_tip (session *sess) | |
static void | |
mg_hide_empty_pane (GtkPaned *pane) | |
{ | |
-#if defined(GTK_WIDGET_VISIBLE) | |
- if ((pane->child1 == NULL || !GTK_WIDGET_VISIBLE (pane->child1)) && | |
- (pane->child2 == NULL || !GTK_WIDGET_VISIBLE (pane->child2))) | |
+#if defined(gtk_widget_get_visible) | |
+ if ((pane->child1 == NULL || !gtk_widget_get_visible (pane->child1)) && | |
+ (pane->child2 == NULL || !gtk_widget_get_visible (pane->child2))) | |
#else | |
if ((pane->child1 == NULL || !gtk_widget_get_visible (pane->child1)) && | |
(pane->child2 == NULL || !gtk_widget_get_visible (pane->child2))) | |
@@ -2570,9 +2570,9 @@ mg_rightpane_cb (GtkPaned *pane, GParamSpec *param, session_gui *gui) | |
{ | |
int handle_size; | |
-/* if (pane->child1 == NULL || (!GTK_WIDGET_VISIBLE (pane->child1))) | |
+/* if (pane->child1 == NULL || (!gtk_widget_get_visible (pane->child1))) | |
return; | |
- if (pane->child2 == NULL || (!GTK_WIDGET_VISIBLE (pane->child2))) | |
+ if (pane->child2 == NULL || (!gtk_widget_get_visible (pane->child2))) | |
return;*/ | |
gtk_widget_style_get (GTK_WIDGET (pane), "handle-size", &handle_size, NULL); | |
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c | |
index d04be22..e873d4c 100644 | |
--- a/src/fe-gtk/menu.c | |
+++ b/src/fe-gtk/menu.c | |
@@ -1687,7 +1687,7 @@ menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data) | |
#if GTK_CHECK_VERSION(2,20,0) | |
return gtk_widget_is_sensitive (widget); | |
#else | |
- return GTK_WIDGET_IS_SENSITIVE (widget); | |
+ return gtk_widget_is_sensitive (widget); | |
#endif | |
} | |
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c | |
index 923a2dd..ece80f3 100644 | |
--- a/src/fe-gtk/plugin-tray.c | |
+++ b/src/fe-gtk/plugin-tray.c | |
@@ -462,7 +462,7 @@ tray_toggle_visibility (gboolean force_hide) | |
#if GTK_CHECK_VERSION(2,20,0) | |
if (force_hide || gtk_widget_get_visible (win)) | |
#else | |
- if (force_hide || GTK_WIDGET_VISIBLE (win)) | |
+ if (force_hide || gtk_widget_get_visible (win)) | |
#endif | |
{ | |
gtk_window_get_position (win, &x, &y); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment