File engrampa-gtk-3.20.patch of Package engrampa

Overview Repositories Revisions Requests Users Attributes Meta

File engrampa-gtk-3.20.patch of Package engrampa (Revision 797181b85100a7d4750cfe66d358b3dd)

Currently displaying revision 797181b85100a7d4750cfe66d358b3dd , Show latest

--- a/configure.ac
+++ b/configure.ac
@@ -29,9 +29,9 @@ dnl it too, or it will never make it int
 dnl
 dnl ==========================================================================
 
-GLIB_REQUIRED=2.50.0
-GIO_REQUIRED=2.50.0
-GTK_REQUIRED=3.22.0
+GLIB_REQUIRED=2.48.0
+GIO_REQUIRED=2.48.0
+GTK_REQUIRED=3.20.0
 CAJA_REQUIRED=1.17.1
 JSON_GLIB_REQUIRED=0.14.0
 
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -2263,7 +2263,11 @@ open_folder (GtkWindow  *parent,
 	if (folder == NULL)
 		return;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	if (! gtk_show_uri_on_window (parent, folder, GDK_CURRENT_TIME, &error)) {
+#else
+	if (! gtk_show_uri (gtk_window_get_screen (parent), folder, GDK_CURRENT_TIME, &error)) {
+#endif
 		GtkWidget *d;
 		char      *utf8_name;
 		char      *message;
@@ -3681,8 +3685,14 @@ dir_tree_button_press_cb (GtkWidget
 				gtk_tree_selection_select_iter (selection, &iter);
 			}
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 			gtk_menu_popup_at_pointer (GTK_MENU (window->priv->sidebar_folder_popup_menu),
 			                           (const GdkEvent*) event);
+#else
+			gtk_menu_popup (GTK_MENU (window->priv->sidebar_folder_popup_menu),
+			                NULL, NULL, NULL, window,
+			                event->button, event->time);
+#endif
 		}
 		else
 			gtk_tree_selection_unselect_all (selection);
@@ -3869,12 +3879,23 @@ file_button_press_cb (GtkWidget      *wi
 			gtk_tree_selection_unselect_all (selection);
 
 		n_selected = fr_window_get_n_selected_files (window);
+#if GTK_CHECK_VERSION (3, 22, 0)
 		if ((n_selected == 1) && selection_has_a_dir (window))
 			gtk_menu_popup_at_pointer (GTK_MENU (window->priv->folder_popup_menu),
 			                           (const GdkEvent*) event);
 		else
 			gtk_menu_popup_at_pointer (GTK_MENU (window->priv->file_popup_menu),
 			                           (const GdkEvent*) event);
+#else
+		if ((n_selected == 1) && selection_has_a_dir (window))
+			gtk_menu_popup (GTK_MENU (window->priv->folder_popup_menu),
+			                NULL, NULL, NULL, window,
+			                event->button, event->time);
+		else
+			gtk_menu_popup (GTK_MENU (window->priv->file_popup_menu),
+			                NULL, NULL, NULL, window,
+			                event->button, event->time);
+#endif
 		return TRUE;
 	}
 	else if ((event->type == GDK_BUTTON_PRESS) && (event->button == 1)) {
@@ -4672,8 +4693,14 @@ key_press_cb (GtkWidget   *widget,
 			if (selection == NULL)
 				return FALSE;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 			gtk_menu_popup_at_pointer (GTK_MENU (window->priv->file_popup_menu),
 			                           (const GdkEvent*) event);
+#else
+			gtk_menu_popup (GTK_MENU (window->priv->file_popup_menu),
+			                NULL, NULL, NULL, window,
+			                GDK_BUTTON_SECONDARY, GDK_CURRENT_TIME);
+#endif
 			retval = TRUE;
 		}
 		break;
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -731,7 +731,11 @@ show_help_dialog (GtkWindow  *parent,
 	GError *error = NULL;
 
 	uri = g_strconcat ("help:engrampa", section ? "/" : NULL, section, NULL);
+#if GTK_CHECK_VERSION (3, 22, 0)
 	if (! gtk_show_uri_on_window (parent, uri, GDK_CURRENT_TIME, &error)) {
+#else
+	if (! gtk_show_uri (gtk_window_get_screen (parent), uri, GDK_CURRENT_TIME, &error)) {
+#endif
 		GtkWidget *dialog;
 
 		dialog = _gtk_message_dialog_new (parent,

Places

File engrampa-gtk-3.20.patch of Package engrampa (Revision 797181b85100a7d4750cfe66d358b3dd)

Places