File mate-panel-gtk-3.20.patch of Package mate-panel

Overview Repositories Revisions Requests Users Attributes Meta

File mate-panel-gtk-3.20.patch of Package mate-panel (Revision d643970f017cb07eed5141a5d5c3a73d)

Currently displaying revision d643970f017cb07eed5141a5d5c3a73d , Show latest

--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -883,9 +883,17 @@ position_calendar_popup (ClockData *cd)
         screen = gtk_window_get_screen (GTK_WINDOW (cd->calendar_popup));
         display = gdk_screen_get_display (screen);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
         n = gdk_display_get_n_monitors (display);
+#else
+        n = gdk_screen_get_n_monitors (screen);
+#endif
         for (i = 0; i < n; i++) {
+#if GTK_CHECK_VERSION (3, 22, 0)
                 gdk_monitor_get_geometry (gdk_display_get_monitor (display, i), &monitor);
+#else
+                gdk_screen_get_monitor_geometry (screen, i, &monitor);
+#endif
                 if (x >= monitor.x && x <= monitor.x + monitor.width &&
                     y >= monitor.y && y <= monitor.y + monitor.height) {
                         found_monitor = TRUE;
--- a/applets/clock/clock.ui
+++ b/applets/clock/clock.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="GtkAdjustment" id="adjustment1">
     <property name="upper">59</property>
     <property name="value">59</property>
--- a/applets/clock/clock-utils.c
+++ b/applets/clock/clock-utils.c
@@ -73,8 +73,13 @@ clock_utils_display_help (GtkWidget  *wi
 	else
 		uri = g_strdup_printf ("help:%s", doc_id);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL, uri, 
 		gtk_get_current_event_time (), &error);
+#else
+	gtk_show_uri (gtk_widget_get_screen (widget), uri,
+		gtk_get_current_event_time (), &error);
+#endif
 	g_free (uri);
 
 	if (error &&
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -155,8 +155,13 @@ static void show_help(FishApplet* fish,
 	else
 		uri = g_strdup_printf ("help:%s", FISH_HELP_DOC);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL, uri, 
 			  gtk_get_current_event_time (), &error);
+#else
+	gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (fish)), uri,
+		      gtk_get_current_event_time (), &error);
+#endif
 	g_free (uri);
 
 	if (error &&
@@ -839,7 +844,11 @@ static void display_fortune_dialog(FishA
 	if (!fish->fortune_dialog) {
 		GtkWidget *scrolled;
 		GtkWidget *vbox;
+#if GTK_CHECK_VERSION (3, 22, 0)
 		GdkMonitor *monitor;
+#else
+		gint monitor_num;
+#endif
 		GdkRectangle monitor_geom;
 
 		fish->fortune_dialog = gtk_dialog_new ();
@@ -864,9 +873,16 @@ static void display_fortune_dialog(FishA
 		g_signal_connect (fish->fortune_dialog, "response",
 				  G_CALLBACK (handle_fortune_response), fish);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 		monitor = gdk_display_get_monitor_at_window (gtk_widget_get_display (GTK_WIDGET (fish)),
 							     gtk_widget_get_window (GTK_WIDGET (fish)));
 		gdk_monitor_get_geometry(monitor, &monitor_geom);
+#else
+		monitor_num = gdk_screen_get_monitor_at_window (gtk_widget_get_screen (GTK_WIDGET (fish)),
+		                                                gtk_widget_get_window (GTK_WIDGET (fish)));
+		gdk_screen_get_monitor_geometry (gtk_widget_get_screen (GTK_WIDGET (fish)),
+		                                 monitor_num, &monitor_geom);
+#endif
 		gtk_window_set_default_size (GTK_WINDOW (fish->fortune_dialog),
 					     MIN (600, monitor_geom.width  * 0.9),
 					     MIN (350, monitor_geom.height * 0.9));
--- a/applets/fish/fish.ui
+++ b/applets/fish/fish.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="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
     <property name="upper">255</property>
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -223,7 +223,12 @@ static void help_cb(GtkAction* action, N
 	#define NA_HELP_DOC "mate-user-guide"
 
 	uri = g_strdup_printf("help:%s/%s", NA_HELP_DOC, "panels-notification-area");
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL, uri, gtk_get_current_event_time (), &error);
+#else
+	gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)), uri,
+	              gtk_get_current_event_time (), &error);
+#endif
 	g_free(uri);
 
 	if (error && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
--- a/applets/notification_area/notification-area-preferences-dialog.ui
+++ b/applets/notification_area/notification-area-preferences-dialog.ui
@@ -22,7 +22,7 @@ Author: Wolfgang Ulbrich
 
 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk+" version="3.20"/>
   
   
   
--- a/applets/notification_area/status-notifier/sn-dbus-menu.c
+++ b/applets/notification_area/status-notifier/sn-dbus-menu.c
@@ -188,9 +188,11 @@ get_layout_cb (GObject      *source_obje
   g_hash_table_remove_all (menu->items);
   layout_parse (menu, layout, GTK_MENU (menu));
 
+#if GTK_CHECK_VERSION (3, 22, 0)
   /* Reposition menu to accomodate any size changes   */
   /* Menu size never changes with GTK 3.20 or earlier */
   gtk_menu_reposition(GTK_MENU(menu));
+#endif
 
   g_variant_unref (layout);
 }
--- a/applets/notification_area/status-notifier/sn-item.c
+++ b/applets/notification_area/status-notifier/sn-item.c
@@ -182,6 +182,49 @@ sn_item_get_action_coordinates (SnItem *
     *x += width;
 }
 
+#if !GTK_CHECK_VERSION (3, 22, 0)
+static void
+sn_item_popup_menu_position_func (GtkMenu  *menu,
+                                  gint     *x,
+                                  gint     *y,
+                                  gboolean *push_in,
+                                  gpointer  widget)
+{
+  GtkAllocation  widget_alloc;
+  GtkRequisition menu_req;
+  GdkWindow     *window;
+  GdkScreen     *screen;
+  gint           monitor_num;
+  GdkRectangle   monitor;
+
+  gtk_widget_get_allocation (widget, &widget_alloc);
+  gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_req, NULL);
+
+  window = gtk_widget_get_window (widget);
+  gdk_window_get_origin (window, x, y);
+
+  *x += widget_alloc.x;
+  *y += widget_alloc.y;
+
+  screen = gtk_widget_get_screen (widget);
+  monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
+  gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+
+  /* put the menu on the left if we can't put it on the right */
+  if (*x + menu_req.width > monitor.x + monitor.width)
+    *x -= menu_req.width - widget_alloc.width;
+  /* and push it back in if all else failed */
+  if (*x < monitor.x)
+    *x = monitor.x;
+
+  /* put the menu above if we can't put it below */
+  if (*y + widget_alloc.height + menu_req.height > monitor.y + monitor.height)
+    *y -= menu_req.height;
+  else
+    *y += widget_alloc.height;
+}
+#endif
+
 static gboolean
 sn_item_button_press_event (GtkWidget      *widget,
                             GdkEventButton *event)
@@ -208,10 +251,16 @@ sn_item_button_press_event (GtkWidget
     {
       if (priv->menu != NULL)
         {
+#if GTK_CHECK_VERSION (3, 22, 0)
           gtk_menu_popup_at_widget (priv->menu, widget,
                                     GDK_GRAVITY_SOUTH_WEST,
                                     GDK_GRAVITY_NORTH_WEST,
                                     (GdkEvent *) event);
+#else
+          gtk_menu_popup (priv->menu, NULL, NULL,
+                          sn_item_popup_menu_position_func, widget,
+                          event->button, event->time);
+#endif
           /*Fix positioning if size changed since last shown*/
           gtk_menu_reposition(priv->menu);
         }
@@ -240,10 +289,26 @@ sn_item_popup_menu (GtkWidget *widget)
 
   if (priv->menu != NULL)
     {
+#if GTK_CHECK_VERSION (3, 22, 0)
       gtk_menu_popup_at_widget (priv->menu, widget,
                                 GDK_GRAVITY_SOUTH_WEST,
                                 GDK_GRAVITY_NORTH_WEST,
                                 NULL);
+#else
+      guint button = 0;
+      guint32 active_time = GDK_CURRENT_TIME;
+      GdkEvent *event = gtk_get_current_event ();
+
+      if (event)
+        {
+          gdk_event_get_button (event, &button);
+          active_time = gdk_event_get_time (event);
+        }
+
+      gtk_menu_popup (priv->menu, NULL, NULL,
+                      sn_item_popup_menu_position_func, widget,
+                      button, active_time);
+#endif
       /*Fix positioning if size changed since last shown*/
       gtk_menu_reposition(priv->menu);
     }
--- a/applets/wncklet/window-list.ui
+++ b/applets/wncklet/window-list.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="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
--- a/applets/wncklet/wncklet.c
+++ b/applets/wncklet/wncklet.c
@@ -53,8 +53,12 @@ void wncklet_display_help(GtkWidget* wid
 		uri = g_strdup_printf("help:%s/%s", doc_id, link_id);
 	else
 		uri = g_strdup_printf("help:%s", doc_id);
-
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL, uri, gtk_get_current_event_time (), &error);
+#else
+	gtk_show_uri (gtk_widget_get_screen (widget), uri,
+	              gtk_get_current_event_time (), &error);
+#endif
 	g_free(uri);
 
 	if (error && g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
--- a/applets/wncklet/workspace-switcher.ui
+++ b/applets/wncklet/workspace-switcher.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="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
--- a/configure.ac
+++ b/configure.ac
@@ -57,12 +57,12 @@ LT_LIB_M
 LIBMATE_DESKTOP_REQUIRED=1.17.0
 GDK_PIXBUF_REQUIRED=2.25.2
 PANGO_REQUIRED=1.15.4
-GLIB_REQUIRED=2.50.0
+GLIB_REQUIRED=2.48.0
 LIBMATE_MENU_REQUIRED=1.21.0
 CAIRO_REQUIRED=1.0.0
 DCONF_REQUIRED=0.13.4
 LIBRSVG_REQUIRED=2.36.2
-GTK_REQUIRED=3.22.0
+GTK_REQUIRED=3.20.0
 LIBWNCK_REQUIRED=3.4.6
 WEATHER_REQUIRED=1.17.0
 
--- a/libmate-panel-applet/mate-panel-applet.c
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -835,6 +835,85 @@ container_has_focusable_child (GtkContai
 	return retval;
 }
 
+#if !GTK_CHECK_VERSION (3, 22, 0)
+static void
+mate_panel_applet_position_menu (GtkMenu   *menu,
+                                 gint      *x,
+                                 gint      *y,
+                                 gboolean  *push_in,
+                                 GtkWidget *widget)
+{
+	MatePanelApplet    *applet;
+	GtkAllocation   allocation;
+	GtkRequisition  requisition;
+	GdkDevice      *device;
+	GdkDisplay     *display;
+	GdkScreen      *screen;
+	gint            menu_x = 0;
+	gint            menu_y = 0;
+	gint            pointer_x;
+	gint            pointer_y;
+
+	g_return_if_fail (PANEL_IS_APPLET (widget));
+
+	applet = MATE_PANEL_APPLET (widget);
+
+	display = gtk_widget_get_display (applet);
+	screen = gdk_display_get_default_screen (display);
+
+	gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
+	gdk_window_get_origin (gtk_widget_get_window (widget),
+			       &menu_x, &menu_y);
+
+	device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
+	gdk_window_get_device_position (gtk_widget_get_window (widget), device,
+	                                &pointer_x, &pointer_y, NULL);
+
+	gtk_widget_get_allocation (widget, &allocation);
+
+	menu_x += allocation.x;
+	menu_y += allocation.y;
+
+	if (applet->priv->orient == MATE_PANEL_APPLET_ORIENT_UP ||
+	    applet->priv->orient == MATE_PANEL_APPLET_ORIENT_DOWN) {
+		if (gtk_widget_get_direction (GTK_WIDGET (menu)) != GTK_TEXT_DIR_RTL) {
+			if (pointer_x < allocation.width &&
+			    requisition.width < pointer_x)
+				menu_x += MIN (pointer_x,
+				               allocation.width - requisition.width);
+		} else {
+			menu_x += allocation.width - requisition.width;
+			if (pointer_x > 0 && pointer_x < allocation.width &&
+			    pointer_x < allocation.width - requisition.width) {
+				menu_x -= MIN (allocation.width - pointer_x,
+				               allocation.width - requisition.width);
+			}
+		}
+		menu_x = MIN (menu_x, gdk_screen_get_width (screen) - requisition.width);
+
+		if (menu_y > gdk_screen_get_height (screen) / 2)
+			menu_y -= requisition.height;
+		else
+			menu_y += allocation.height;
+	} else  {
+		if (pointer_y < allocation.height &&
+		    requisition.height < pointer_y)
+			menu_y += MIN (pointer_y, allocation.height - requisition.height);
+		menu_y = MIN (menu_y, gdk_screen_get_height (screen) - requisition.height);
+
+		if (menu_x > gdk_screen_get_width (screen) / 2)
+			menu_x -= requisition.width;
+		else
+			menu_x += allocation.width;
+
+	}
+
+	*x = menu_x;
+	*y = menu_y;
+	*push_in = FALSE;
+}
+#endif
+
 static void
 mate_panel_applet_menu_popup (MatePanelApplet *applet,
                               GdkEvent    *event)
@@ -855,11 +934,20 @@ mate_panel_applet_menu_popup (MatePanelA
 	context = gtk_widget_get_style_context (GTK_WIDGET(toplevel));
 	gtk_style_context_add_class(context,"gnome-panel-menu-bar");
 	gtk_style_context_add_class(context,"mate-panel-menu-bar");
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_menu_popup_at_widget (GTK_MENU (menu),
 	                          GTK_WIDGET (applet),
 	                          GDK_GRAVITY_NORTH_WEST,
 	                          GDK_GRAVITY_NORTH_WEST,
 	                          event);
+#else
+	gtk_menu_popup (GTK_MENU (menu),
+	                NULL, NULL,
+	                (GtkMenuPositionFunc) mate_panel_applet_position_menu,
+	                applet,
+	                event->button.button,
+	                event->button.time);
+#endif
 }
 
 static gboolean
--- a/mate-panel/applet.c
+++ b/mate-panel/applet.c
@@ -636,6 +636,85 @@ mate_panel_applet_menu_set_recurse (GtkM
 	g_list_free (children);
 }
 
+#if !GTK_CHECK_VERSION (3, 22, 0)
+void
+mate_panel_applet_position_menu (GtkMenu   *menu,
+                                 gint      *x,
+                                 gint      *y,
+                                 gboolean  *push_in,
+                                 GtkWidget *applet)
+{
+	GtkAllocation   allocation;
+	GtkRequisition  requisition;
+	GdkDevice      *device;
+	GdkDisplay     *display;
+	GdkScreen      *screen;
+	GtkWidget      *parent;
+	gint            menu_x = 0;
+	gint            menu_y = 0;
+	gint            pointer_x;
+	gint            pointer_y;
+
+	parent = gtk_widget_get_parent (applet);
+
+	g_return_if_fail (PANEL_IS_WIDGET (parent));
+
+	display = gtk_widget_get_display (applet);
+	screen = gdk_display_get_default_screen (display);
+
+	gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
+
+	gdk_window_get_origin (gtk_widget_get_window (applet), &menu_x, &menu_y);
+
+	device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
+	gdk_window_get_device_position (gtk_widget_get_window (applet), device,
+	                                &pointer_x, &pointer_y, NULL);
+
+	gtk_widget_get_allocation (applet, &allocation);
+
+	if (!gtk_widget_get_has_window (applet)) {
+		menu_x += allocation.x;
+		menu_y += allocation.y;
+	}
+
+	if (PANEL_WIDGET (parent)->orient == GTK_ORIENTATION_HORIZONTAL) {
+		if (gtk_widget_get_direction (GTK_WIDGET (menu)) != GTK_TEXT_DIR_RTL) {
+			if (pointer_x < allocation.width &&
+			    requisition.width < pointer_x)
+				menu_x += MIN (pointer_x,
+				               allocation.width - requisition.width);
+		} else {
+			menu_x += allocation.width - requisition.width;
+			if (pointer_x > 0 && pointer_x < allocation.width &&
+			    pointer_x < allocation.width - requisition.width) {
+				menu_x -= MIN (allocation.width - pointer_x,
+				               allocation.width - requisition.width);
+			}
+		}
+		menu_x = MIN (menu_x, gdk_screen_get_width (screen) - requisition.width);
+
+		if (menu_y > gdk_screen_get_height (screen) / 2)
+			menu_y -= requisition.height;
+		else
+			menu_y += allocation.height;
+	} else {
+		if (pointer_y < allocation.height &&
+		    requisition.height < pointer_y)
+			menu_y += MIN (pointer_y, allocation.height - requisition.height);
+		menu_y = MIN (menu_y, gdk_screen_get_height (screen) - requisition.height);
+
+		if (menu_x > gdk_screen_get_width (screen) / 2)
+			menu_x -= requisition.width;
+		else
+			menu_x += allocation.width;
+	}
+
+	*x = menu_x;
+	*y = menu_y;
+	*push_in = FALSE;
+}
+#endif
+
 static void
 applet_show_menu (AppletInfo     *info,
 		  GdkEventButton *event)
@@ -662,7 +738,15 @@ applet_show_menu (AppletInfo     *info,
 	if (!gtk_widget_get_realized (info->menu))
 		gtk_widget_show (info->menu);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_menu_popup_at_pointer (GTK_MENU (info->menu), NULL);
+#else
+	gtk_menu_popup (GTK_MENU (info->menu),
+	                NULL, NULL,
+	                (GtkMenuPositionFunc) mate_panel_applet_position_menu,
+	                (gpointer) info->widget,
+	                event->button, event->time);
+#endif
 }
 
 static gboolean
--- a/mate-panel/applet.h
+++ b/mate-panel/applet.h
@@ -111,6 +111,13 @@ void        mate_panel_applet_menu_set_r
 
 gboolean    mate_panel_applet_toggle_locked  (AppletInfo *info);
 
+
+
+void        mate_panel_applet_position_menu (GtkMenu   *menu,
+                                             gint      *x,
+                                             gint      *y,
+                                             gboolean  *push_in,
+                                             GtkWidget *applet);
 #ifdef __cplusplus
 }
 #endif
--- a/mate-panel/libpanel-util/panel-show.c
+++ b/mate-panel/libpanel-util/panel-show.c
@@ -178,7 +178,11 @@ gboolean panel_show_uri(GdkScreen* scree
 		return panel_show_caja_search_uri(screen, uri, timestamp, error);
 	}
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL, uri,timestamp, &local_error);
+#else
+	gtk_show_uri (screen, uri, timestamp, &local_error);
+#endif
 
 	return _panel_show_handle_error(uri, screen, local_error, error);
 }
@@ -283,7 +287,11 @@ panel_show_help (GdkScreen    *screen,
 	else
 		uri = g_strdup_printf ("help:%s", doc);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL, uri, gtk_get_current_event_time (), &local_error);
+#else
+	gtk_show_uri (screen, uri, gtk_get_current_event_time (), &local_error);
+#endif
 	g_free (uri);
 
 	return _panel_show_help_handle_error (doc, screen, local_error, error);
--- a/mate-panel/menu.c
+++ b/mate-panel/menu.c
@@ -573,7 +573,14 @@ show_item_menu (GtkWidget      *item,
 	context = gtk_widget_get_style_context (GTK_WIDGET (toplevel));
 	gtk_style_context_add_class(context,"gnome-panel-menu-bar");
 	gtk_style_context_add_class(context,"mate-panel-menu-bar");
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_menu_popup_at_pointer (GTK_MENU (menu), event);
+#else
+	gtk_menu_popup (GTK_MENU (menu),
+	                NULL, NULL, NULL, NULL,
+	                event->button.button,
+	                event->button.time);
+#endif
 
 	return TRUE;
 }
--- a/mate-panel/panel-action-protocol.c
+++ b/mate-panel/panel-action-protocol.c
@@ -99,7 +99,14 @@ panel_action_protocol_main_menu (GdkScre
 	device = gdk_seat_get_pointer (seat);
 	gdk_event_set_device (event, device);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_menu_popup_at_pointer (GTK_MENU (menu),event);
+#else
+	gtk_menu_popup (GTK_MENU (menu),
+	                NULL, NULL,
+	                NULL, NULL,
+	                0, activate_time);
+#endif
 }
 
 static void
--- a/mate-panel/panel.c
+++ b/mate-panel/panel.c
@@ -364,7 +364,14 @@ panel_popup_menu (PanelToplevel *topleve
 	gtk_menu_set_screen (GTK_MENU (menu),
 			     gtk_window_get_screen (GTK_WINDOW (toplevel)));
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+#else
+	gtk_menu_popup (GTK_MENU (menu),
+	                NULL, NULL,
+	                NULL, NULL,
+	                button, activate_time);
+#endif
 
 	return TRUE;
 }
--- a/mate-panel/panel-menu-button.c
+++ b/mate-panel/panel-menu-button.c
@@ -471,6 +471,7 @@ panel_menu_button_popup_menu (PanelMenuB
 	screen = gtk_window_get_screen (GTK_WINDOW (button->priv->toplevel));
 	gtk_menu_set_screen (GTK_MENU (button->priv->menu), screen);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	/*using these same anchor points lets default "anchor-hints" properly position the menu
 	 *so that on a vertical panel the menu aligns with the outside edge of a menu button
 	 *placed at the top or bottom of a left or a right panel
@@ -481,6 +482,13 @@ panel_menu_button_popup_menu (PanelMenuB
 	                          GDK_GRAVITY_NORTH_WEST,
 	                          GDK_GRAVITY_NORTH_WEST,
 	                          NULL);
+#else
+	gtk_menu_popup (GTK_MENU (button->priv->menu),
+	                NULL, NULL,
+	                (GtkMenuPositionFunc) mate_panel_applet_position_menu,
+	                (gpointer) button,
+	                n_button, activate_time);
+#endif
 
 	g_signal_connect(GTK_MENU_SHELL (button->priv->menu), "deactivate", G_CALLBACK (panel_menu_button_menu_deactivate), button);
 	toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button->priv->toplevel));
--- a/mate-panel/panel-multiscreen.c
+++ b/mate-panel/panel-multiscreen.c
@@ -89,7 +89,11 @@ panel_multiscreen_get_randr_monitors_for
 {
 #ifdef HAVE_RANDR
 	GdkDisplay         *display;
+#if GTK_CHECK_VERSION (3, 22, 0)
 	GdkMonitor         *monitor;
+#else
+	gint                monitor_num;
+#endif
 	Display            *xdisplay;
 	Window              xroot;
 	XRRScreenResources *resources;
@@ -142,10 +146,17 @@ panel_multiscreen_get_randr_monitors_for
 
 	primary = XRRGetOutputPrimary (xdisplay, xroot);
 	display = gdk_screen_get_display (screen);
+#if GTK_CHECK_VERSION (3, 22, 0)
 	monitor = gdk_display_get_primary_monitor (display);
 
 	/* Use scale factor to bring geometries down to device pixels to support HiDPI displays */
 	scale = gdk_monitor_get_scale_factor (monitor);
+#else
+	monitor_num = gdk_screen_get_primary_monitor (screen);
+
+	/* Use scale factor to bring geometries down to device pixels to support HiDPI displays */
+	scale = gdk_screen_get_monitor_scale_factor (screen, monitor_num);
+#endif
 
 	geometries = g_array_sized_new (FALSE, FALSE,
 					sizeof (GdkRectangle),
@@ -216,11 +227,19 @@ panel_multiscreen_get_gdk_monitors_for_s
 	int           i;
 
 	display = gdk_screen_get_display (screen);
+#if GTK_CHECK_VERSION (3, 22, 0)
 	num_monitors = gdk_display_get_n_monitors (display);
+#else
+	num_monitors = gdk_screen_get_n_monitors (screen);
+#endif
 	geometries = g_new (GdkRectangle, num_monitors);
 
 	for (i = 0; i < num_monitors; i++)
+#if GTK_CHECK_VERSION (3, 22, 0)
 		gdk_monitor_get_geometry (gdk_display_get_monitor (display, i), &(geometries[i]));
+#else
+		gdk_screen_get_monitor_geometry (screen, i, &(geometries[i]));
+#endif
 
 	*monitors_ret = num_monitors;
 	*geometries_ret = geometries;
--- a/mate-panel/panel-properties-dialog.ui
+++ b/mate-panel/panel-properties-dialog.ui
@@ -22,7 +22,7 @@ Author: Wolfgang Ulbrich
 
 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk+" version="3.20"/>
   
   
   
--- a/mate-panel/panel-run-dialog.ui
+++ b/mate-panel/panel-run-dialog.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="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
--- a/mate-panel/panel-test-applets.ui
+++ b/mate-panel/panel-test-applets.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="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
--- a/mate-panel/xstuff.c
+++ b/mate-panel/xstuff.c
@@ -346,7 +346,11 @@ xstuff_zoom_animate (GtkWidget *widget,
 	GdkScreen *gscreen;
 	GdkRectangle rect, dest;
 	GtkAllocation allocation;
+#if GTK_CHECK_VERSION (3, 22, 0)
 	GdkMonitor *monitor;
+#else
+	gint monitor_num;
+#endif
 	GdkDisplay *display;
 
 	if (opt_rect)
@@ -376,9 +380,15 @@ xstuff_zoom_animate (GtkWidget *widget,
 		g_object_unref (pixbuf);
 	} else {
 		display = gdk_screen_get_display (gscreen);
+#if GTK_CHECK_VERSION (3, 22, 0)
 		monitor = gdk_display_get_monitor_at_window (display,
 							     gtk_widget_get_window (widget));
 		gdk_monitor_get_geometry (monitor, &dest);
+#else
+		monitor_num = gdk_screen_get_monitor_at_window (gscreen,
+		                                                gtk_widget_get_window (widget));
+		gdk_screen_get_monitor_geometry (gscreen, monitor_num, &dest);
+#endif
 
 		draw_zoom_animation (gscreen,
 				     rect.x, rect.y, rect.width, rect.height,

Places

File mate-panel-gtk-3.20.patch of Package mate-panel (Revision d643970f017cb07eed5141a5d5c3a73d)

Places