[Xfce4-commits] [xfce/exo] 02/02: Some deprecation replacements
noreply at xfce.org
noreply at xfce.org
Thu Jun 15 04:52:14 CEST 2017
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/exo.
commit fac670d382b0227cb34a522f21f80b983037069b
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Wed Jun 14 22:52:01 2017 -0400
Some deprecation replacements
---
exo-desktop-item-edit/exo-die-editor.c | 13 -----------
exo-helper/exo-helper-chooser-dialog.c | 2 --
exo-helper/exo-helper-chooser.c | 7 +++++-
exo-open/main.c | 4 ++++
exo/exo-gtk-extensions.c | 8 ++++++-
exo/exo-icon-view.c | 42 ++++++++++++++++++++++++++++++----
exo/exo-toolbars-private.c | 4 ----
7 files changed, 55 insertions(+), 25 deletions(-)
diff --git a/exo-desktop-item-edit/exo-die-editor.c b/exo-desktop-item-edit/exo-die-editor.c
index 8c43dd6..62f49b9 100644
--- a/exo-desktop-item-edit/exo-die-editor.c
+++ b/exo-desktop-item-edit/exo-die-editor.c
@@ -595,10 +595,6 @@ exo_die_editor_icon_clicked (GtkWidget *button,
_("_OK"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
- gtk_dialog_set_alternative_button_order (GTK_DIALOG (chooser),
- GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_CANCEL,
- -1);
/* check if we have an icon to set for the chooser */
if (G_LIKELY (!exo_str_is_empty (editor->icon)))
@@ -643,10 +639,6 @@ exo_die_editor_path_clicked (GtkWidget *button,
_("_OK"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
- gtk_dialog_set_alternative_button_order (GTK_DIALOG (chooser),
- GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_CANCEL,
- -1);
/* check if we have a path to set for the chooser */
if (G_LIKELY (!exo_str_is_empty (editor->path)))
@@ -1332,8 +1324,3 @@ exo_die_editor_set_terminal (ExoDieEditor *editor,
g_object_notify (G_OBJECT (editor), "terminal");
}
}
-
-
-
-
-
diff --git a/exo-helper/exo-helper-chooser-dialog.c b/exo-helper/exo-helper-chooser-dialog.c
index 2164307..9c622f8 100644
--- a/exo-helper/exo-helper-chooser-dialog.c
+++ b/exo-helper/exo-helper-chooser-dialog.c
@@ -309,5 +309,3 @@ exo_helper_chooser_dialog_get_plug_child (ExoHelperChooserDialog *dialog)
{
return dialog->plug_child;
}
-
-
diff --git a/exo-helper/exo-helper-chooser.c b/exo-helper/exo-helper-chooser.c
index 3d7b056..1c8d50c 100644
--- a/exo-helper/exo-helper-chooser.c
+++ b/exo-helper/exo-helper-chooser.c
@@ -609,7 +609,7 @@ menu_activate_other (GtkWidget *item,
}
-
+#if !GTK_CHECK_VERSION (3, 22, 0)
static void
menu_position (GtkMenu *menu,
gint *x,
@@ -648,6 +648,7 @@ menu_position (GtkMenu *menu,
*push_in = TRUE;
}
+#endif
@@ -787,7 +788,11 @@ exo_helper_chooser_pressed (ExoHelperChooser *chooser,
/* run the loop for the menu */
gtk_grab_add (menu);
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_menu_popup_at_widget (GTK_MENU (menu), button, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, NULL);
+#else
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, menu_position, button, 0, gtk_get_current_event_time ());
+#endif
g_main_loop_run (loop);
gtk_grab_remove (menu);
g_main_loop_unref (loop);
diff --git a/exo-open/main.c b/exo-open/main.c
index 119b557..8cba8d5 100644
--- a/exo-open/main.c
+++ b/exo-open/main.c
@@ -437,7 +437,11 @@ exo_open_uri (const gchar *uri,
&& (strcmp (scheme, "ftp") == 0 || strcmp (scheme, "ftps") == 0))
retval = exo_open_launch_category ("WebBrowser", uri);
else
+#if GTK_CHECK_VERSION (3, 22, 0)
+ retval = gtk_show_uri_on_window (NULL, uri, 0, error);
+#else
retval = gtk_show_uri (NULL, uri, 0, error);
+#endif
}
g_free (scheme);
diff --git a/exo/exo-gtk-extensions.c b/exo/exo-gtk-extensions.c
index 3b2a761..0d68fa3 100644
--- a/exo/exo-gtk-extensions.c
+++ b/exo/exo-gtk-extensions.c
@@ -205,7 +205,9 @@ exo_gtk_url_about_dialog_hook (GtkAboutDialog *about_dialog,
gpointer user_data)
{
GtkWidget *message;
+#if !GTK_CHECK_VERSION (3, 22, 0)
GdkScreen *screen;
+#endif
GError *error = NULL;
gchar *uri, *escaped;
@@ -224,11 +226,15 @@ exo_gtk_url_about_dialog_hook (GtkAboutDialog *about_dialog,
uri = g_strdup (address);
}
+ /* try to open the url on the given screen */
+#if GTK_CHECK_VERSION (3, 22, 0)
+ if (!gtk_show_uri_on_window (GTK_WINDOW(about_dialog), uri, gtk_get_current_event_time (), &error))
+#else
/* determine the screen from the about dialog */
screen = gtk_widget_get_screen (GTK_WIDGET (about_dialog));
- /* try to open the url on the given screen */
if (!gtk_show_uri (screen, uri, gtk_get_current_event_time (), &error))
+#endif
{
/* make sure to initialize i18n support first,
* so we'll see a translated message.
diff --git a/exo/exo-icon-view.c b/exo/exo-icon-view.c
index a2cfbcd..20ba3fe 100644
--- a/exo/exo-icon-view.c
+++ b/exo/exo-icon-view.c
@@ -1801,9 +1801,11 @@ exo_icon_view_size_allocate (GtkWidget *widget,
if (gtk_adjustment_get_value (vadjustment) > gtk_adjustment_get_upper (vadjustment) - gtk_adjustment_get_page_size (vadjustment))
gtk_adjustment_set_value (vadjustment, MAX (0, gtk_adjustment_get_upper (vadjustment) - gtk_adjustment_get_page_size (vadjustment)));
- /* we need to emit "changed" ourselves */
+ /* Prior to GTK 3.18, we need to emit "changed" ourselves */
+#if !GTK_CHECK_VERSION (3, 18, 0)
gtk_adjustment_changed (hadjustment);
gtk_adjustment_changed (vadjustment);
+#endif
}
@@ -2933,14 +2935,21 @@ exo_icon_view_update_rubberband (gpointer data)
GdkRectangle new_area;
GdkRectangle common;
GdkRegion *invalid_region;
-#if GTK_CHECK_VERSION (3, 0, 0)
+#if GTK_CHECK_VERSION (3, 16, 0)
+ GdkSeat *seat;
+ GdkDevice *pointer_dev;
+#elif GTK_CHECK_VERSION (3, 0, 0)
GdkDeviceManager *device_manager;
GdkDevice *pointer_dev;
#endif
icon_view = EXO_ICON_VIEW (data);
-#if GTK_CHECK_VERSION (3, 0, 0)
+#if GTK_CHECK_VERSION (3, 16, 0)
+ seat = gdk_display_get_default_seat (gdk_window_get_display (icon_view->priv->bin_window));
+ pointer_dev = gdk_seat_get_pointer (seat);
+ gdk_window_get_device_position (icon_view->priv->bin_window, pointer_dev, &x, &y, NULL);
+#elif GTK_CHECK_VERSION (3, 0, 0)
device_manager = gdk_display_get_device_manager (gdk_window_get_display (icon_view->priv->bin_window));
pointer_dev = gdk_device_manager_get_client_pointer (device_manager);
gdk_window_get_device_position (icon_view->priv->bin_window, pointer_dev, &x, &y, NULL);
@@ -3554,20 +3563,30 @@ exo_icon_view_set_adjustment_upper (GtkAdjustment *adj,
if (upper != gtk_adjustment_get_upper (adj))
{
gdouble min = MAX (0.0, upper - gtk_adjustment_get_page_size (adj));
+#if !GTK_CHECK_VERSION (3, 18, 0)
gboolean value_changed = FALSE;
+#endif
gtk_adjustment_set_upper (adj, upper);
if (gtk_adjustment_get_value (adj) > min)
{
gtk_adjustment_set_value (adj, min);
+#if !GTK_CHECK_VERSION (3, 18, 0)
value_changed = TRUE;
+#endif
}
+ /* Prior to GTK 3.18, we need to emit "changed" ourselves */
+#if !GTK_CHECK_VERSION (3, 18, 0)
gtk_adjustment_changed (adj);
+#endif
+ /* Prior to GTK 3.18, we need to emit "value-changed" ourselves */
+#if !GTK_CHECK_VERSION (3, 18, 0)
if (value_changed)
gtk_adjustment_value_changed (adj);
+#endif
}
}
@@ -5194,8 +5213,11 @@ exo_icon_view_scroll_to_item (ExoIconView *icon_view,
x + item->area.x + item_width + focus_width - allocation.width));
}
+ /* Prior to GTK 3.18, we need to emit "changed" ourselves */
+#if !GTK_CHECK_VERSION (3, 18, 0)
gtk_adjustment_changed (icon_view->priv->hadjustment);
gtk_adjustment_changed (icon_view->priv->vadjustment);
+#endif
}
@@ -6586,8 +6608,11 @@ exo_icon_view_scroll_to_path (ExoIconView *icon_view,
gtk_adjustment_get_upper (icon_view->priv->hadjustment) - gtk_adjustment_get_page_size (icon_view->priv->hadjustment));
gtk_adjustment_set_value (icon_view->priv->hadjustment, value);
+ /* Prior to GTK 3.18, we need to emit "changed" ourselves */
+#if !GTK_CHECK_VERSION (3, 18, 0)
gtk_adjustment_changed (icon_view->priv->hadjustment);
gtk_adjustment_changed (icon_view->priv->vadjustment);
+#endif
}
else
{
@@ -7141,7 +7166,16 @@ exo_icon_view_autoscroll (ExoIconView *icon_view)
gint hoffset, voffset;
gfloat value;
-#if GTK_CHECK_VERSION (3, 0, 0)
+#if GTK_CHECK_VERSION (3, 16, 0)
+ GdkSeat *seat;
+ GdkDevice *pointer_dev;
+
+ seat = gdk_display_get_default_seat (gdk_window_get_display (gtk_widget_get_window (GTK_WIDGET (icon_view))));
+ pointer_dev = gdk_seat_get_pointer (seat);
+
+ gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (icon_view)), pointer_dev, &px, &py, NULL);
+ gdk_window_get_geometry (gtk_widget_get_window (GTK_WIDGET (icon_view)), &x, &y, &width, &height);
+#elif GTK_CHECK_VERSION (3, 0, 0)
GdkDeviceManager *dev_manager;
GdkDevice *pointer_dev;
diff --git a/exo/exo-toolbars-private.c b/exo/exo-toolbars-private.c
index 0904b00..deca5c2 100644
--- a/exo/exo-toolbars-private.c
+++ b/exo/exo-toolbars-private.c
@@ -364,7 +364,3 @@ _exo_toolbars_unset_drag_cursor (GtkWidget *widget)
if (G_LIKELY (gtk_widget_get_window (widget) != NULL))
gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
}
-
-
-
-
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list