File mate-control-center-gtk-3.20.patch of Package mate-control-center

Overview Repositories Revisions Requests Users Attributes Meta

File mate-control-center-gtk-3.20.patch of Package mate-control-center (Revision b94f7ffa6ca2c84e6425409962f91dbc)

Currently displaying revision b94f7ffa6ca2c84e6425409962f91dbc , Show latest

--- a/capplets/appearance/appearance-desktop.c
+++ b/capplets/appearance/appearance-desktop.c
@@ -883,11 +883,20 @@ static gdouble
 get_monitor_aspect_ratio_for_widget (GtkWidget *widget)
 {
   gdouble aspect;
+#if GTK_CHECK_VERSION (3, 22, 0)
   GdkMonitor *monitor;
+#else
+  int monitor;
+#endif
   GdkRectangle rect;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
   monitor = gdk_display_get_monitor_at_window (gtk_widget_get_display (widget), gtk_widget_get_window (widget));
   gdk_monitor_get_geometry (monitor, &rect);
+#else
+  monitor = gdk_screen_get_monitor_at_window (gtk_widget_get_screen (widget), gtk_widget_get_window (widget));
+  gdk_screen_get_monitor_geometry (gtk_widget_get_screen (widget), monitor, &rect);
+#endif
 
   aspect = rect.height / (gdouble)rect.width;
 
--- a/capplets/common/capplet-util.c
+++ b/capplets/common/capplet-util.c
@@ -76,7 +76,11 @@ capplet_help (GtkWindow *parent, char co
 
 	uri = g_strdup_printf ("help:mate-user-guide/%s", section);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	if (!gtk_show_uri_on_window (parent , uri, gtk_get_current_event_time (), &error)) {
+#else
+	if (!gtk_show_uri (gtk_window_get_screen (parent), uri, gtk_get_current_event_time (), &error)) {
+#endif
 		capplet_error_dialog (
 			parent,
 			_("There was an error displaying help: %s"),
--- a/capplets/display/display-capplet.ui
+++ b/capplets/display/display-capplet.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk+" version="3.20"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       
--- a/configure.ac
+++ b/configure.ac
@@ -59,8 +59,8 @@ AC_CHECK_FUNC(XScreenSaverQueryInfo, [
 AC_SUBST(TYPING_BREAK)
 AC_SUBST(SCREENSAVER_LIBS)
 
-GLIB_REQUIRED=2.50.0
-GTK_REQUIRED=3.22.0
+GLIB_REQUIRED=2.48.0
+GTK_REQUIRED=3.20.0
 MARCO_REQUIRED=1.17.0
 MSD_REQUIRED=1.21.2
 MATEKBD_REQUIRED=1.17.0
--- a/libslab/slab-mate-util.c
+++ b/libslab/slab-mate-util.c
@@ -118,7 +118,11 @@ open_desktop_item_help (MateDesktopItem
 		help_uri = g_strdup_printf ("help:%s", doc_path);
 
 		error = NULL;
+#if GTK_CHECK_VERSION (3, 22, 0)
 		if (!gtk_show_uri_on_window (NULL, help_uri, gtk_get_current_event_time (), &error))
+#else
+		if (!gtk_show_uri (libslab_get_current_screen (), help_uri, gtk_get_current_event_time (), &error))
+#endif
 		{
 			g_warning ("error opening %s [%s]\n", help_uri, error->message);
 
--- a/libslab/tile.c
+++ b/libslab/tile.c
@@ -396,11 +396,16 @@ tile_button_release (GtkWidget * widget,
 
 	case 3:
 		if (GTK_IS_MENU (tile->context_menu))
+#if GTK_CHECK_VERSION (3, 22, 0)
 		    gtk_menu_popup_at_widget (GTK_MENU (tile->context_menu),
 		                              widget,
 		                              GDK_GRAVITY_SOUTH_WEST,
 		                              GDK_GRAVITY_NORTH_WEST,
 		                              (const GdkEvent*) event);
+#else
+		    gtk_menu_popup (GTK_MENU (tile->context_menu), NULL, NULL,
+		                    NULL, NULL, event->button, event->time);
+#endif
 
 		break;
 
@@ -430,6 +435,33 @@ tile_key_release (GtkWidget * widget, Gd
 	return FALSE;
 }
 
+#if !GTK_CHECK_VERSION (3, 22, 0)
+static void
+tile_popup_menu_position (GtkMenu * menu, gint * x, gint * y,
+                          gboolean * push_in, gpointer data)
+{
+	Tile *tile = TILE (data);
+	GtkAllocation all;
+	GtkRequisition req;
+	GtkWidget *top;
+
+	if (!gtk_widget_get_realized (GTK_WIDGET (tile)))
+		return;
+
+	gtk_widget_get_preferred_size (GTK_WIDGET (menu), &req, NULL);
+	gtk_widget_get_allocation (GTK_WIDGET (menu), &all);
+
+	top = gtk_widget_get_toplevel (GTK_WIDGET (tile));
+
+	gdk_window_get_origin (gtk_widget_get_window (top), x, y);
+
+	*x += (all.width / 2) - (req.width / 2);
+	*y += (all.height / 2) - (req.height / 2);
+
+	*push_in = FALSE;
+}
+#endif
+
 static gboolean
 tile_popup_menu (GtkWidget * widget)
 {
@@ -437,12 +469,17 @@ tile_popup_menu (GtkWidget * widget)
 
 	if (GTK_IS_MENU (tile->context_menu))
 	{
+#if GTK_CHECK_VERSION (3, 22, 0)
 		gtk_menu_popup_at_widget (GTK_MENU (tile->context_menu),
 		                          widget,
 		                          GDK_GRAVITY_SOUTH_WEST,
 		                          GDK_GRAVITY_NORTH_WEST,
 		                          NULL);
-
+#else
+		gtk_menu_popup (GTK_MENU (tile->context_menu), NULL, NULL,
+		                tile_popup_menu_position, tile, 0,
+		                GDK_CURRENT_TIME);
+#endif
 		return TRUE;
 	}
 
--- a/typing-break/drw-break-window.c
+++ b/typing-break/drw-break-window.c
@@ -152,7 +152,11 @@ drw_break_window_init (DrwBreakWindow *w
 	display = gdk_screen_get_display (screen);
 	scale = gtk_widget_get_scale_factor (GTK_WIDGET (window));
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gdk_monitor_get_geometry (gdk_display_get_monitor (display, root_monitor), &monitor);
+#else
+	gdk_screen_get_monitor_geometry (screen, root_monitor, &monitor);
+#endif
 
 	gtk_window_set_default_size (GTK_WINDOW (window),
 				     WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale,

Places

File mate-control-center-gtk-3.20.patch of Package mate-control-center (Revision b94f7ffa6ca2c84e6425409962f91dbc)

Places