From 4c3cd50809b82b3d166db21f69d9fe11caf493f8 Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 17 May 2014 16:34:14 +0200 Subject: Use gtk_widget_hide instead of gtk_widget_hide_all gtk_widget_hide_all is deprecated in gtk+2.24 for gtk_widget_hide. --- src/eom-properties-dialog.c | 20 ++++++++------------ src/eom-thumb-nav.c | 20 ++++++++------------ src/eom-window.c | 7 +++---- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/src/eom-properties-dialog.c b/src/eom-properties-dialog.c index 27a8a95..1dc6715 100644 --- a/src/eom-properties-dialog.c +++ b/src/eom-properties-dialog.c @@ -51,10 +51,6 @@ #include "eom-exif-details.h" #endif -#if GTK_CHECK_VERSION(3, 0, 0) - #define gtk_widget_hide_all(w) gtk_widget_hide(w) -#endif - #define EOM_PROPERTIES_DIALOG_GET_PRIVATE(object) \ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_PROPERTIES_DIALOG, EomPropertiesDialogPrivate)) @@ -358,10 +354,10 @@ pd_update_metadata_tab (EomPropertiesDialog *prop_dlg, } if (gtk_widget_get_visible (priv->exif_box)) { - gtk_widget_hide_all (priv->exif_box); + gtk_widget_hide (priv->exif_box); } if (gtk_widget_get_visible (priv->metadata_details_box)) { - gtk_widget_hide_all (priv->metadata_details_box); + gtk_widget_hide (priv->metadata_details_box); } return; @@ -371,7 +367,7 @@ pd_update_metadata_tab (EomPropertiesDialog *prop_dlg, if (priv->netbook_mode && !gtk_widget_get_visible (priv->metadata_details_box)) { gtk_widget_show_all (priv->metadata_details_box); - gtk_widget_hide_all (priv->exif_details_expander); + gtk_widget_hide (priv->exif_details_expander); } } @@ -541,7 +537,7 @@ eom_properties_dialog_set_netbook_mode (EomPropertiesDialog *dlg, if (gtk_widget_get_visible (priv->exif_box)) gtk_widget_show_all (priv->metadata_details_box); - gtk_widget_hide_all (priv->exif_details_expander); + gtk_widget_hide (priv->exif_details_expander); } else { gtk_widget_reparent (priv->metadata_details_sw, priv->exif_details_expander); @@ -549,7 +545,7 @@ eom_properties_dialog_set_netbook_mode (EomPropertiesDialog *dlg, if (gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)) == EOM_PROPERTIES_DIALOG_PAGE_DETAILS) gtk_notebook_prev_page (GTK_NOTEBOOK (priv->notebook)); - gtk_widget_hide_all (priv->metadata_details_box); + gtk_widget_hide (priv->metadata_details_box); } #endif } @@ -753,7 +749,7 @@ eom_properties_dialog_init (EomPropertiesDialog *prop_dlg) priv->metadata_details_sw = sw; if (priv->netbook_mode) { - gtk_widget_hide_all (priv->exif_details_expander); + gtk_widget_hide (priv->exif_details_expander); gtk_box_pack_start (GTK_BOX (priv->metadata_details_box), sw, TRUE, TRUE, 6); } else { @@ -767,8 +763,8 @@ eom_properties_dialog_init (EomPropertiesDialog *prop_dlg) dlg); #ifndef HAVE_EXEMPI - gtk_widget_hide_all (xmp_box); - gtk_widget_hide_all (xmp_box_label); + gtk_widget_hide (xmp_box); + gtk_widget_hide (xmp_box_label); #endif #else diff --git a/src/eom-thumb-nav.c b/src/eom-thumb-nav.c index 0bde9f8..949c46a 100644 --- a/src/eom-thumb-nav.c +++ b/src/eom-thumb-nav.c @@ -32,10 +32,6 @@ #include #include -#if GTK_CHECK_VERSION(3, 0, 0) - #define gtk_widget_hide_all(w) gtk_widget_hide(w) -#endif - #define EOM_THUMB_NAV_GET_PRIVATE(object) \ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOM_TYPE_THUMB_NAV, EomThumbNavPrivate)) @@ -487,8 +483,8 @@ eom_thumb_nav_set_show_buttons (EomThumbNav *nav, gboolean show_buttons) gtk_widget_show_all (nav->priv->button_left); gtk_widget_show_all (nav->priv->button_right); } else { - gtk_widget_hide_all (nav->priv->button_left); - gtk_widget_hide_all (nav->priv->button_right); + gtk_widget_hide (nav->priv->button_left); + gtk_widget_hide (nav->priv->button_right); } } @@ -555,8 +551,8 @@ eom_thumb_nav_set_mode (EomThumbNav *nav, EomThumbNavMode mode) GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_widget_hide_all (priv->button_left); - gtk_widget_hide_all (priv->button_right); + gtk_widget_hide (priv->button_left); + gtk_widget_hide (priv->button_right); break; @@ -571,8 +567,8 @@ eom_thumb_nav_set_mode (EomThumbNav *nav, EomThumbNavMode mode) GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_widget_hide_all (priv->button_left); - gtk_widget_hide_all (priv->button_right); + gtk_widget_hide (priv->button_left); + gtk_widget_hide (priv->button_right); break; @@ -587,8 +583,8 @@ eom_thumb_nav_set_mode (EomThumbNav *nav, EomThumbNavMode mode) GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_widget_hide_all (priv->button_left); - gtk_widget_hide_all (priv->button_right); + gtk_widget_hide (priv->button_left); + gtk_widget_hide (priv->button_right); break; } diff --git a/src/eom-window.c b/src/eom-window.c index 597f129..82bfe42 100644 --- a/src/eom-window.c +++ b/src/eom-window.c @@ -76,7 +76,6 @@ #endif #if GTK_CHECK_VERSION(3, 0, 0) -#define gtk_widget_hide_all(w) gtk_widget_hide(w) #define MATE_DESKTOP_USE_UNSTABLE_API #include #endif @@ -1884,7 +1883,7 @@ fullscreen_timeout_cb (gpointer data) { EomWindow *window = EOM_WINDOW (data); - gtk_widget_hide_all (window->priv->fullscreen_popup); + gtk_widget_hide (window->priv->fullscreen_popup); eom_scroll_view_hide_cursor (EOM_SCROLL_VIEW (window->priv->view)); @@ -2184,7 +2183,7 @@ update_ui_visibility (EomWindow *window) } if (priv->fullscreen_popup != NULL) { - gtk_widget_hide_all (priv->fullscreen_popup); + gtk_widget_hide (priv->fullscreen_popup); } } @@ -5121,7 +5120,7 @@ eom_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event) priv->mode == EOM_WINDOW_MODE_SLIDESHOW; if (fullscreen) { - gtk_widget_hide_all (priv->fullscreen_popup); + gtk_widget_hide (priv->fullscreen_popup); } return GTK_WIDGET_CLASS (eom_window_parent_class)->focus_out_event (widget, event); -- cgit v1.2.1