wp/xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix some deprecation warnings (#289)

Browse Source 
* xed-app.c: replace get_active_window with gtk_application version

This allows us to remove quite a bit of code, some of which uses
deprecated functions, so it also has the benefit of cleaning up the
deprecation warnings a bit.

* Switch a couple uses of gtk_show_uri with gtk_show_uri_on_window

gtk_show_uri is deprecated.

* Taglist plugin: remove call to gtk_tree_view_set_rules_hint

This function is deprecated, and it already defaults to false in
any case, so it wasn't doing anything anyway.

* Deprecations: move all instances of gtk_menu_popup to newer methods

In a couple cases this simplifies the code quite a bit

* Replace deprecated gdk_window_at_pointer with newer method
This commit is contained in:
Stephen Collins
2019-05-05 03:25:37 -06:00
committed by Clement Lefebvre
parent 2ebff67c9c
commit 67892da099
11 changed files with 53 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/filebrowser/xed-file-browser-widget.c
View File

@@ -1247,6 +1247,7 @@ popup_menu (XedFileBrowserWidget *obj,
GtkTreeModel *model)
{
GtkWidget *menu;
GtkTreeView *tree;
if (XED_IS_FILE_BROWSER_STORE (model))
{
@@ -1263,16 +1264,18 @@ popup_menu (XedFileBrowserWidget *obj,
g_return_val_if_fail (menu != NULL, FALSE);
tree = GTK_TREE_VIEW (obj->priv->treeview);
if (event != NULL)
{
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (obj->priv->treeview));
selection = gtk_tree_view_get_selection (tree);
if (gtk_tree_selection_count_selected_rows (selection) <= 1)
{
GtkTreePath *path;
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (obj->priv->treeview),
if (gtk_tree_view_get_path_at_pos (tree,
(gint)event->x, (gint)event->y,
&path, NULL, NULL, NULL))
{
@@ -1282,14 +1285,38 @@ popup_menu (XedFileBrowserWidget *obj,
}
}
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time);
gtk_menu_popup_at_pointer (GTK_MENU (menu), (GdkEvent *) event);
}
else
{
gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
xed_utils_menu_position_under_tree_view,
obj->priv->treeview, 0,
gtk_get_current_event_time ());
GtkTreeModel *model;
GtkTreeSelection *selection;
GtkTreeIter iter;
model = gtk_tree_view_get_model (tree);
g_return_val_if_fail (model != NULL, FALSE);
selection = gtk_tree_view_get_selection (tree);
g_return_val_if_fail (selection != NULL, FALSE);
if (gtk_tree_selection_get_selected (selection, NULL, &iter))
{
GtkTreePath *path;
GdkRectangle rect;
path = gtk_tree_model_get_path (model, &iter);
gtk_tree_view_get_cell_area (tree, path, gtk_tree_view_get_column (tree, 0), &rect);
gtk_menu_popup_at_rect (GTK_MENU (menu), gtk_widget_get_window (GTK_WIDGET (tree)),
&rect, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, NULL);
gtk_tree_path_free (path);
}
else
{
gtk_menu_popup_at_widget (GTK_MENU (menu), GTK_WIDGET (obj->priv->treeview),
GDK_GRAVITY_SOUTH, GDK_GRAVITY_NORTH, NULL);
}
gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
}
@@ -2329,7 +2356,8 @@ directory_open (XedFileBrowserWidget *obj,
uri = g_file_get_uri (location);
if (!gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (obj)), uri, GDK_CURRENT_TIME, &error))
if (!gtk_show_uri_on_window (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (obj))),
uri, GDK_CURRENT_TIME, &error))
{
g_signal_emit (obj, signals[ERROR], 0, XED_FILE_BROWSER_ERROR_OPEN_DIRECTORY, error->message);