File mate-power-manager-gtk-3.20.patch of Package mate-power-manager

Overview Repositories Revisions Requests Users Attributes Meta

File mate-power-manager-gtk-3.20.patch of Package mate-power-manager (Revision 78ed716c013648ed8f11dc45f0d330f9)

Currently displaying revision 78ed716c013648ed8f11dc45f0d330f9 , Show latest

--- a/applets/brightness/gpm-common.c
+++ b/applets/brightness/gpm-common.c
@@ -45,7 +45,11 @@ gpm_help_display (const gchar *link_id)
 	else
 		uri = g_strdup ("help:mate-power-manager");
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL, uri, GDK_CURRENT_TIME, &error);
+#else
+	gtk_show_uri (gdk_screen_get_default (), uri, GDK_CURRENT_TIME, &error);
+#endif
 
 	if (error != NULL) {
 		GtkWidget *d;
--- a/applets/inhibit/gpm-common.c
+++ b/applets/inhibit/gpm-common.c
@@ -45,7 +45,11 @@ gpm_help_display (const gchar *link_id)
 	else
 		uri = g_strdup ("help:mate-power-manager");
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL, uri, GDK_CURRENT_TIME, &error);
+#else
+	gtk_show_uri (gdk_screen_get_default (), uri, GDK_CURRENT_TIME, &error);
+#endif
 
 	if (error != NULL) {
 		GtkWidget *d;
--- a/configure.ac
+++ b/configure.ac
@@ -89,10 +89,10 @@ GLIB_GSETTINGS
 dnl ----------------------------------------------------------------------------
 dnl - Library dependencies
 dnl ----------------------------------------------------------------------------
-GLIB_REQUIRED=2.50.0
-GIO_REQUIRED=2.50.0
-GDK_REQUIRED=3.22.0
-GTK_REQUIRED=3.22.0
+GLIB_REQUIRED=2.48.0
+GIO_REQUIRED=2.48.0
+GDK_REQUIRED=3.20.0
+GTK_REQUIRED=3.20.0
 GNOME_KEYRING_REQUIRED=3.0.0
 DBUS_REQUIRED=1.0
 DBUS_GLIB_REQUIRED=0.70
--- a/src/gpm-backlight.c
+++ b/src/gpm-backlight.c
@@ -208,7 +208,11 @@ gpm_backlight_dialog_show (GpmBacklight
 	GtkRequisition win_req;
 	GdkScreen     *pointer_screen;
 	GdkRectangle   geometry;
+#if GTK_CHECK_VERSION (3, 22, 0)
 	GdkMonitor    *monitor;
+#else
+	int            monitor;
+#endif
         GdkDisplay    *display;
         GdkDeviceManager *device_manager;
         GdkDevice     *device;
@@ -237,11 +241,21 @@ gpm_backlight_dialog_show (GpmBacklight
 				 &pointer_x,
 				 &pointer_y);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	monitor = gdk_display_get_monitor_at_point (gdk_screen_get_display (pointer_screen),
 						    pointer_x,
 						    pointer_y);
 
 	gdk_monitor_get_geometry (monitor, &geometry);
+#else
+	monitor = gdk_screen_get_monitor_at_point (pointer_screen,
+	                                           pointer_x,
+	                                           pointer_y);
+
+	gdk_screen_get_monitor_geometry (pointer_screen,
+	                                 monitor,
+	                                 &geometry);
+#endif
 
 	screen_w = geometry.width;
 	screen_h = geometry.height;
--- a/src/gpm-common.c
+++ b/src/gpm-common.c
@@ -145,7 +145,11 @@ gpm_help_display (const gchar *link_id)
 	else
 		uri = g_strdup ("help:mate-power-manager");
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL, uri, GDK_CURRENT_TIME, &error);
+#else
+	gtk_show_uri (gdk_screen_get_default (), uri, GDK_CURRENT_TIME, &error);
+#endif
 
 	if (error != NULL) {
 		GtkWidget *d;
--- a/src/gpm-kbd-backlight.c
+++ b/src/gpm-kbd-backlight.c
@@ -185,7 +185,11 @@ gpm_kbd_backlight_dialog_show (GpmKbdBac
 	GtkRequisition win_req;
 	GdkScreen     *pointer_screen;
 	GdkRectangle   geometry;
+#if GTK_CHECK_VERSION (3, 22, 0)
 	GdkMonitor    *monitor;
+#else
+	int            monitor;
+#endif
         GdkDisplay    *display;
         GdkDeviceManager *device_manager;
         GdkDevice     *device;
@@ -214,11 +218,21 @@ gpm_kbd_backlight_dialog_show (GpmKbdBac
 				 &pointer_x,
 				 &pointer_y);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	monitor = gdk_display_get_monitor_at_point (gdk_screen_get_display (pointer_screen),
 						    pointer_x,
 						    pointer_y);
 
 	gdk_monitor_get_geometry (monitor, &geometry);
+#else
+	monitor = gdk_screen_get_monitor_at_point (pointer_screen,
+	                                           pointer_x,
+	                                           pointer_y);
+
+	gdk_screen_get_monitor_geometry (pointer_screen,
+	                                 monitor,
+	                                 &geometry);
+#endif
 
 	screen_w = geometry.width;
 	screen_h = geometry.height;
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -536,7 +536,12 @@ gpm_manager_sleep_failure_response_cb (G
 	/* user clicked the help button */
 	if (response_id == GTK_RESPONSE_HELP) {
 		uri = g_settings_get_string (manager->priv->settings, GPM_SETTINGS_NOTIFY_SLEEP_FAILED_URI);
+#if GTK_CHECK_VERSION (3, 22, 0)
 		ret = gtk_show_uri_on_window (GTK_WINDOW (dialog), uri, gtk_get_current_event_time (), &error);
+#else
+		ret = gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
+		                    uri, gtk_get_current_event_time (), &error);
+#endif
 		if (!ret) {
 			dialog_error = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
 							       "Failed to show uri %s", error->message);

Places

File mate-power-manager-gtk-3.20.patch of Package mate-power-manager (Revision 78ed716c013648ed8f11dc45f0d330f9)

Places