File pluma-gtk-3.20.patch of Package pluma

Overview Repositories Revisions Requests Users Attributes Meta

File pluma-gtk-3.20.patch of Package pluma (Revision b343665d5e43f49356e1ad104ea4f2ef)

Currently displaying revision b343665d5e43f49356e1ad104ea4f2ef , Show latest

--- a/configure.ac
+++ b/configure.ac
@@ -142,16 +142,16 @@ fi
 
 AM_CONDITIONAL(ENABLE_ENCHANT, test x"$enable_enchant" = "xyes")
 
-GTK_REQUIRED=3.22.0
+GTK_REQUIRED=3.20.0
 GTKSOURCEVIEW_REQUIRED=3.0.0
 
 PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
 PKG_CHECK_MODULES(PLUMA, [
 	libxml-2.0 >= 2.5.0
-	glib-2.0 >= 2.50.0
+	glib-2.0 >= 2.48.0
 	$GMODULE_ADD
 	gthread-2.0 >= 2.13.0
-	gio-2.0 >= 2.50.0
+	gio-2.0 >= 2.48.0
 	gtk+-3.0 >= $GTK_REQUIRED
 	gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED
 	libpeas-1.0 >= 1.2.0
--- a/plugins/filebrowser/pluma-file-browser-widget.c
+++ b/plugins/filebrowser/pluma-file-browser-widget.c
@@ -2473,7 +2473,11 @@ directory_open (PlumaFileBrowserWidget *
 	if (FILE_IS_DIR (flags)) {
 		result = TRUE;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 		if (!gtk_show_uri_on_window (NULL, uri, GDK_CURRENT_TIME, &error)) {
+#else
+		if (!gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (obj)), uri, GDK_CURRENT_TIME, &error)) {
+#endif
 			g_signal_emit (obj, signals[ERROR], 0,
 				       PLUMA_FILE_BROWSER_ERROR_OPEN_DIRECTORY,
 				       error->message);
--- a/pluma/pluma-help.c
+++ b/pluma/pluma-help.c
@@ -63,10 +63,17 @@ pluma_help_display (GtkWindow   *parent,
 	else
 		link = g_strdup_printf ("help:%s", name);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	ret = gtk_show_uri_on_window (parent,
 	                              link,
 	                              GDK_CURRENT_TIME,
 	                              &error);
+#else
+	ret = gtk_show_uri (gtk_window_get_screen (parent),
+	                    link,
+	                    GDK_CURRENT_TIME,
+	                    &error);
+#endif
 
 	g_free (link);
 
--- a/pluma/pluma-window.c
+++ b/pluma/pluma-window.c
@@ -2828,9 +2828,16 @@ fullscreen_controls_show (PlumaWindow *w
 	screen = gtk_window_get_screen (GTK_WINDOW (window));
 	display = gdk_screen_get_display (screen);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display,
 								     gtk_widget_get_window (GTK_WIDGET (window))),
 				  &fs_rect);
+#else
+	gdk_screen_get_monitor_geometry (screen,
+	                                 gdk_screen_get_monitor_at_window (screen,
+	                                                                   gtk_widget_get_window (GTK_WIDGET (window))),
+	                                 &fs_rect);
+#endif
 
 	gtk_window_get_size (GTK_WINDOW (window->priv->fullscreen_controls), &w, &h);
 
@@ -2855,10 +2862,17 @@ run_fullscreen_animation (gpointer data)
 	screen = gtk_window_get_screen (GTK_WINDOW (window));
 	display = gdk_screen_get_display (screen);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display,
 								     gtk_widget_get_window (GTK_WIDGET (window))),
 				  &fs_rect);
-					 
+#else
+	gdk_screen_get_monitor_geometry (screen,
+					 gdk_screen_get_monitor_at_window (screen,
+									   gtk_widget_get_window (GTK_WIDGET (window))),
+					 &fs_rect);
+#endif
+
 	gtk_window_get_position (GTK_WINDOW (window->priv->fullscreen_controls),
 				 &x, &y);
 	
@@ -2932,9 +2946,16 @@ show_hide_fullscreen_toolbar (PlumaWindo
 		screen = gtk_window_get_screen (GTK_WINDOW (window));
 		display = gdk_screen_get_display (screen);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 		gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display,
 									     gtk_widget_get_window (GTK_WIDGET (window))),
 					  &fs_rect);
+#else
+		gdk_screen_get_monitor_geometry (screen,
+		                                 gdk_screen_get_monitor_at_window (screen,
+		                                                                   gtk_widget_get_window (GTK_WIDGET (window))),
+		                                 &fs_rect);
+#endif
 
 		if (show)
 			gtk_window_move (GTK_WINDOW (window->priv->fullscreen_controls),

Places

File pluma-gtk-3.20.patch of Package pluma (Revision b343665d5e43f49356e1ad104ea4f2ef)

Places