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

Overview Repositories Revisions Requests Users Attributes Meta

File mate-applets-gtk-3.20.patch of Package mate-applets (Revision d11e1d59031beb29e2ad7c0b8d7a6195)

Currently displaying revision d11e1d59031beb29e2ad7c0b8d7a6195 , Show latest

--- a/accessx-status/applet.c
+++ b/accessx-status/applet.c
@@ -107,10 +107,17 @@ static void help_cb(GtkAction* action, A
 	GError* error = NULL;
 	GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(sapplet->applet));
 
+#if GTK_CHECK_VERSION(3, 22, 0)
 	gtk_show_uri_on_window(NULL,
 	                       "help:mate-accessx-status",
 	                       gtk_get_current_event_time(),
 	                       &error);
+#else
+	gtk_show_uri(screen,
+	             "help:mate-accessx-status",
+	             gtk_get_current_event_time(),
+	             &error);
+#endif
 
 	if (error)
 	{
--- a/battstat/battstat_applet.c
+++ b/battstat/battstat_applet.c
@@ -769,10 +769,17 @@ battstat_show_help( ProgressData *battst
   else
     uri = g_strdup ("help:mate-battstat");
 
+#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 (battstat->applet)),
+                uri,
+                gtk_get_current_event_time (),
+                &error);
+#endif
 
   g_free (uri);
 
--- a/charpick/charpick.c
+++ b/charpick/charpick.c
@@ -328,6 +328,48 @@ populate_menu (charpick_data *curr_data)
 	gtk_style_context_add_class(context,"mate-panel-menu-bar");
 }
 
+#if !GTK_CHECK_VERSION (3, 22, 0)
+static void
+popup_menu_position (GtkMenu  *menu,
+                     gint     *x,
+                     gint     *y,
+                     gboolean *push_in,
+                     gpointer  user_data)
+{
+	charpick_data *curr_data = user_data;
+	GdkScreen     *screen;
+	GdkWindow     *applet_window;
+	GtkRequisition reqmenu;
+	gint           tempx, tempy, width, height;
+
+	screen = gtk_widget_get_screen (curr_data->applet);
+	applet_window = gtk_widget_get_window (curr_data->applet);
+	gtk_widget_get_preferred_size (GTK_WIDGET (menu), NULL, &reqmenu);
+        gdk_window_get_origin (applet_window, &tempx, &tempy);
+        gdk_window_get_geometry (applet_window, NULL, NULL, &width, &height);
+
+	switch (mate_panel_applet_get_orient (MATE_PANEL_APPLET (curr_data->applet))) {
+	case MATE_PANEL_APPLET_ORIENT_DOWN:
+		tempy += height;
+		break;
+	case MATE_PANEL_APPLET_ORIENT_UP:
+		tempy -= reqmenu.height;
+		break;
+	case MATE_PANEL_APPLET_ORIENT_LEFT:
+		tempx -= reqmenu.width;
+		break;
+	case MATE_PANEL_APPLET_ORIENT_RIGHT:
+		tempx += width;
+		break;
+	}
+
+	*x = CLAMP (tempx, 0,
+	            MAX (0, gdk_screen_get_width (screen) - reqmenu.width));
+	*y = CLAMP (tempy, 0,
+	            MAX (0, gdk_screen_get_height (screen) - reqmenu.height));
+}
+#endif
+
 static void
 chooser_button_clicked (GtkButton *button, charpick_data *curr_data)
 {
@@ -336,12 +378,19 @@ chooser_button_clicked (GtkButton *butto
 	else {
 		gtk_menu_set_screen (GTK_MENU (curr_data->menu),
 				gtk_widget_get_screen (GTK_WIDGET (curr_data->applet)));
-		
+
+#if GTK_CHECK_VERSION (3, 22, 0)
 		gtk_menu_popup_at_widget (GTK_MENU (curr_data->menu),
 		                          GTK_WIDGET (button),
 		                          GDK_GRAVITY_SOUTH_WEST,
 		                          GDK_GRAVITY_NORTH_WEST,
 		                          NULL);
+#else
+		gtk_menu_popup (GTK_MENU (curr_data->menu),
+		                NULL, NULL,
+		                popup_menu_position, curr_data,
+		                0, GDK_CURRENT_TIME);
+#endif
 	}				    
 }
 
@@ -596,10 +645,17 @@ help_cb (GtkAction     *action,
 {
   GError *error = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
   gtk_show_uri_on_window (NULL,
                           "help:mate-char-palette",
                           gtk_get_current_event_time (),
                           &error);
+#else
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (curr_data->applet)),
+                "help:mate-char-palette",
+                gtk_get_current_event_time (),
+                &error);
+#endif
 
   if (error) { /* FIXME: the user needs to see this */
     g_warning ("help error: %s\n", error->message);
--- a/charpick/properties.c
+++ b/charpick/properties.c
@@ -515,10 +515,17 @@ phelp_cb (GtkDialog *dialog, gint tab, g
 {
   GError *error = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
   gtk_show_uri_on_window (GTK_WINDOW (dialog),
                           "help:mate-char-palette/charpick-prefs",
                           gtk_get_current_event_time (),
                           &error);
+#else
+  gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
+                "help:mate-char-palette/charpick-prefs",
+                gtk_get_current_event_time (),
+                &error);
+#endif
 
   if (error) { /* FIXME: the user needs to see this */
     g_warning ("help error: %s\n", error->message);
--- a/configure.ac
+++ b/configure.ac
@@ -12,9 +12,9 @@ AC_CONFIG_MACRO_DIR(m4)
 dnl ***************************************************************************
 dnl *** Minimum library versions for MATE-APPLETS                          ***
 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
 LIBPANEL4_REQUIRED=1.17.0
 LIBGTOP_REQUIRED=2.12.0
 LIBNOTIFY_REQUIRED=0.7.0
--- a/cpufreq/src/cpufreq-applet.c
+++ b/cpufreq/src/cpufreq-applet.c
@@ -301,6 +301,53 @@ get_max_text_width (GtkWidget *widget,
 	return logical_rect.width;
 }
 
+#if !GTK_CHECK_VERSION (3, 22, 0)
+static void
+cpufreq_applet_popup_position_menu (GtkMenu  *menu,
+                                    gint     *x,
+                                    gint     *y,
+                                    gboolean *push_in,
+                                    gpointer  user_data)
+{
+        GtkWidget     *widget = GTK_WIDGET (user_data);
+        GtkRequisition requisition;
+        GtkAllocation  allocation;
+        gint           menu_xpos, menu_ypos;
+
+        gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
+        gdk_window_get_origin (gtk_widget_get_window (widget), &menu_xpos, &menu_ypos);
+        gtk_widget_get_allocation (widget, &allocation);
+
+        menu_xpos += allocation.x;
+        menu_ypos += allocation.y;
+
+        switch (mate_panel_applet_get_orient (MATE_PANEL_APPLET (widget))) {
+        case MATE_PANEL_APPLET_ORIENT_DOWN:
+        case MATE_PANEL_APPLET_ORIENT_UP:
+                if (menu_ypos > gdk_screen_get_height (gtk_widget_get_screen (widget)) / 2) {
+                        menu_ypos -= requisition.height;
+                } else {
+                        menu_ypos += allocation.height;
+                }
+                break;
+        case MATE_PANEL_APPLET_ORIENT_RIGHT:
+        case MATE_PANEL_APPLET_ORIENT_LEFT:
+                if (menu_xpos > gdk_screen_get_width (gtk_widget_get_screen (widget)) / 2) {
+                        menu_xpos -= requisition.width;
+                } else {
+                        menu_xpos += allocation.width;
+                }
+                break;
+        }
+        *x = menu_xpos;
+        *y = menu_ypos;
+
+        if (push_in != NULL) {
+                *push_in = FALSE;
+        }
+}
+#endif
+
 static void
 cpufreq_applet_menu_popup (CPUFreqApplet *applet,
                            guint32        time)
@@ -333,11 +380,19 @@ cpufreq_applet_menu_popup (CPUFreqApplet
         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_SOUTH_WEST,
                                   GDK_GRAVITY_NORTH_WEST,
                                   NULL);
+#else
+        gtk_menu_popup (GTK_MENU (menu),
+                        NULL, NULL,
+                        cpufreq_applet_popup_position_menu,
+                        (gpointer) applet,
+                        1, time);
+#endif
 }
 
 static gboolean
@@ -443,10 +498,17 @@ cpufreq_applet_help_cb (GtkAction     *a
 {
         GError *error = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL,
 	                        "help:mate-cpufreq-applet",
 	                        gtk_get_current_event_time (),
 	                        &error);
+#else
+	gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)),
+	              "help:mate-cpufreq-applet",
+	              gtk_get_current_event_time (),
+	              &error);
+#endif
 
         if (error) {
                 cpufreq_utils_display_error (_("Could not open help document"),
--- a/cpufreq/src/cpufreq-prefs.c
+++ b/cpufreq/src/cpufreq-prefs.c
@@ -356,10 +356,17 @@ cpufreq_prefs_dialog_response_cb (CPUFre
         GError *error = NULL;
 
         if (response == GTK_RESPONSE_HELP) {
+#if GTK_CHECK_VERSION (3, 22, 0)
 		gtk_show_uri_on_window (GTK_WINDOW (prefs->priv->dialog),
 	                            "help:mate-cpufreq-applet/cpufreq-applet-prefs",
 	                            gtk_get_current_event_time (),
 	                            &error);
+#else
+		gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (prefs->priv->dialog)),
+		              "help:mate-cpufreq-applet/cpufreq-applet-prefs",
+		              gtk_get_current_event_time (),
+		              &error);
+#endif
 
                 if (error) {
                         cpufreq_utils_display_error (_("Could not open help document"),
--- a/drivemount/drive-button.c
+++ b/drivemount/drive-button.c
@@ -166,6 +166,7 @@ drive_button_unrealize (GtkWidget *widge
 }
 #endif /* 0 */
 
+#if GTK_CHECK_VERSION(3, 22, 0)
 static int
 _gtk_get_monitor_num (GdkMonitor *monitor)
 {
@@ -182,6 +183,67 @@ _gtk_get_monitor_num (GdkMonitor *monito
 
     return -1;
 }
+#else
+/* the following function is adapted from gtkmenuitem.c */
+static void
+popup_menu_position (GtkMenu  *menu,
+                     gint     *x,
+                     gint     *y,
+                     gboolean *push_in,
+                     gpointer  user_data)
+{
+    GtkWidget       *widget = GTK_WIDGET (user_data);
+    GdkScreen       *screen;
+    gint             monitor_num, twidth, theight, tx, ty;
+    GtkTextDirection direction;
+    GtkAllocation    allocation;
+    GtkRequisition   requisition;
+    GdkRectangle     monitor;
+
+    g_return_if_fail (menu != NULL);
+    g_return_if_fail (x != NULL);
+    g_return_if_fail (y != NULL);
+
+    if (push_in)
+        *push_in = FALSE;
+
+
+    screen = gtk_widget_get_screen (GTK_WIDGET (menu));
+
+    monitor_num = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
+    if (monitor_num > 0)
+        monitor_num = 0;
+    gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+
+    if (gdk_window_get_origin (gtk_widget_get_window (widget), &tx, &ty) == 0) {
+	g_warning ("Menu is not on screen");
+	return;
+    }
+
+    direction = gtk_widget_get_direction (widget);
+    gtk_widget_get_allocation (widget, &allocation);
+    tx += allocation.x;
+    ty += allocation.y;
+    gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
+    twidth = requisition.width;
+    theight = requisition.height;
+
+    if (direction == GTK_TEXT_DIR_RTL)
+	tx += allocation.width - twidth;
+    if ((ty + allocation.height + theight) <= monitor.y + monitor.height)
+	ty += allocation.height;
+    else if ((ty - theight) >= monitor.y)
+	ty -= theight;
+    else if (monitor.y + monitor.height - (ty + allocation.height) > ty)
+	ty += allocation.height;
+    else
+	ty -= theight;
+    *x = CLAMP (tx, monitor.x, MAX (monitor.x, monitor.x + monitor.width - twidth));
+    *y = ty;
+
+    gtk_menu_set_monitor (menu, monitor_num);
+}
+#endif
 
 static gboolean
 drive_button_button_press (GtkWidget      *widget,
@@ -193,11 +255,18 @@ drive_button_button_press (GtkWidget
     if (event->button == 1) {
 	drive_button_ensure_popup (self);
 	if (self->popup_menu) {
+#if GTK_CHECK_VERSION (3, 22, 0)
 		gtk_menu_popup_at_widget (GTK_MENU (self->popup_menu),
 		                          widget,
 		                          GDK_GRAVITY_SOUTH_WEST,
 		                          GDK_GRAVITY_NORTH_WEST,
 		                          (const GdkEvent*) event);
+#else
+		gtk_menu_popup (GTK_MENU (self->popup_menu),
+		                NULL, NULL,
+		                popup_menu_position, self,
+		                event->button, event->time);
+#endif
 	}
 	return TRUE;
     }
@@ -217,11 +286,18 @@ drive_button_key_press (GtkWidget      *
     case GDK_KEY_Return:
 	drive_button_ensure_popup (self);
 	if (self->popup_menu) {
+#if GTK_CHECK_VERSION (3, 22, 0)
 		gtk_menu_popup_at_widget (GTK_MENU (self->popup_menu),
 		                          widget,
 		                          GDK_GRAVITY_SOUTH_WEST,
 		                          GDK_GRAVITY_NORTH_WEST,
 		                          (const GdkEvent*) event);
+#else
+		gtk_menu_popup (GTK_MENU (self->popup_menu),
+		                NULL, NULL,
+		                popup_menu_position, self,
+		                0, event->time);
+#endif
 	}
 	return TRUE;
     }
--- a/drivemount/drivemount.c
+++ b/drivemount/drivemount.c
@@ -132,10 +132,17 @@ display_help (GtkAction *action,
 
     screen = gtk_widget_get_screen (GTK_WIDGET (drive_list));
 
+#if GTK_CHECK_VERSION (3, 22, 0)
     gtk_show_uri_on_window (NULL,
                            "help:mate-drivemount",
                             gtk_get_current_event_time (),
                             &error);
+#else
+    gtk_show_uri (screen,
+                  "help:mate-drivemount",
+                  gtk_get_current_event_time (),
+                  &error);
+#endif
 
     if (error) {
 	GtkWidget *dialog;
--- a/geyes/geyes.c
+++ b/geyes/geyes.c
@@ -329,10 +329,17 @@ help_cb (GtkAction  *action,
 {
 	GError *error = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL,
 	                        "help:mate-geyes",
 	                        gtk_get_current_event_time (),
 	                        &error);
+#else
+	gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (eyes_applet->applet)),
+	              "help:mate-geyes",
+	              gtk_get_current_event_time (),
+	              &error);
+#endif
 
 	if (error) {
 		GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, 
--- a/geyes/themes.c
+++ b/geyes/themes.c
@@ -216,10 +216,17 @@ phelp_cb (GtkDialog *dialog)
 {
 	GError *error = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (GTK_WINDOW (dialog),
 	                        "help:mate-geyes/geyes-settings",
 	                        gtk_get_current_event_time (),
 	                        &error);
+#else
+	gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
+	              "help:mate-geyes/geyes-settings",
+	              gtk_get_current_event_time (),
+	              &error);
+#endif
 
 	if (error) {
 		GtkWidget *error_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
--- a/mateweather/mateweather-applet.c
+++ b/mateweather/mateweather-applet.c
@@ -53,10 +53,17 @@ static void help_cb (GtkAction      *act
 {
     GError *error = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
     gtk_show_uri_on_window (NULL,
                             "help:mateweather",
                             gtk_get_current_event_time (),
                             &error);
+#else
+    gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (gw_applet->applet)),
+                  "help:mateweather",
+                  gtk_get_current_event_time (),
+                  &error);
+#endif
 
     if (error) { 
 	GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
--- a/mateweather/mateweather-dialog.c
+++ b/mateweather/mateweather-dialog.c
@@ -109,10 +109,17 @@ static void response_cb(MateWeatherDialo
 
 static void link_cb(GtkButton* button, gpointer data)
 {
+#if GTK_CHECK_VERSION (3, 22, 0)
     gtk_show_uri_on_window (NULL,
                             "http://www.weather.com/",
                             gtk_get_current_event_time (),
                             NULL);
+#else
+    gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (button)),
+                  "https://weather.com/",
+                  gtk_get_current_event_time (),
+                  NULL);
+#endif
 }
 
 static gchar* replace_multiple_new_lines(gchar* s)
--- a/mateweather/mateweather-pref.c
+++ b/mateweather/mateweather-pref.c
@@ -740,10 +740,17 @@ static void help_cb(GtkDialog* dialog, M
 
 	current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (pref->priv->notebook));
 	uri = g_strdup_printf ("help:mateweather/mateweather-prefs#mateweather-%s", (current_page == 0) ? "metric" : "change-location");
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (GTK_WINDOW (dialog),
 	                        uri,
 	                        gtk_get_current_event_time (),
 	                        &error);
+#else
+	gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
+	              uri,
+	              gtk_get_current_event_time (),
+	              &error);
+#endif
 	g_free (uri);
 
 	if (error)
--- a/multiload/main.c
+++ b/multiload/main.c
@@ -73,10 +73,17 @@ help_cb (GtkAction       *action,
 
  	GError *error = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL,
 	                        "help:mate-multiload",
 	                        gtk_get_current_event_time (),
 	                        &error);
+#else
+	gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (ma->applet)),
+	              "help:mate-multiload",
+	              gtk_get_current_event_time (),
+	              &error);
+#endif
 
     	if (error) { /* FIXME: the user needs to see this */
         	g_warning ("help error: %s\n", error->message);
--- a/multiload/properties.c
+++ b/multiload/properties.c
@@ -86,10 +86,17 @@ properties_close_cb (GtkWidget *widget,
 	{
 		case GTK_RESPONSE_HELP:
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 			gtk_show_uri_on_window (NULL,
 			                        "help:mate-multiload/multiload-prefs",
 			                        gtk_get_current_event_time (),
 			                        &error);
+#else
+			gtk_show_uri (gtk_widget_get_screen (widget),
+			              "help:mate-multiload/multiload-prefs",
+			              gtk_get_current_event_time (),
+			              &error);
+#endif
 
 			if (error) { /* FIXME: the user needs to see this */
 				g_warning ("help error: %s\n", error->message);
--- a/netspeed/src/netspeed.c
+++ b/netspeed/src/netspeed.c
@@ -777,10 +777,17 @@ display_help (GtkWidget *dialog, const g
 	else
 		uri = g_strdup ("help:mate-netspeed-applet");
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	ret = gtk_show_uri_on_window (NULL,
 	                              uri,
 	                              gtk_get_current_event_time (),
 	                              &error);
+#else
+	ret = gtk_show_uri (gtk_widget_get_screen (dialog),
+	                    uri,
+	                    gtk_get_current_event_time (),
+	                    &error);
+#endif
 	g_free (uri);
 
 	if (ret == FALSE) {
--- a/stickynotes/stickynotes_applet_callbacks.c
+++ b/stickynotes/stickynotes_applet_callbacks.c
@@ -336,10 +336,17 @@ void menu_help_cb(GtkAction *action, Sti
 {
 	GError *error = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (NULL,
 	                        "help:mate-stickynotes-applet",
 	                        gtk_get_current_event_time (),
 	                        &error);
+#else
+	gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet->w_applet)),
+	              "help:mate-stickynotes-applet",
+	              gtk_get_current_event_time (),
+	              &error);
+#endif
 	if (error) {
 		GtkWidget *dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
 							   _("There was an error displaying help: %s"), error->message);
@@ -526,10 +533,17 @@ void preferences_response_cb(GtkWidget *
 	if (response == GTK_RESPONSE_HELP) {
 		GError *error = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 		gtk_show_uri_on_window (GTK_WINDOW (dialog),
 		                        "help:mate-stickynotes-applet/stickynotes-advanced-settings",
 		                        gtk_get_current_event_time (),
 		                        &error);
+#else
+		gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
+		              "help:mate-stickynotes-applet/stickynotes-advanced-settings",
+		              gtk_get_current_event_time (),
+		              &error);
+#endif
 		if (error) {
 			dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
 								   _("There was an error displaying help: %s"), error->message);
--- a/stickynotes/stickynotes.c
+++ b/stickynotes/stickynotes.c
@@ -379,10 +379,17 @@ static void
 response_cb (GtkWidget *dialog, gint id, gpointer data)
 {
         if (id == GTK_RESPONSE_HELP)
+#if GTK_CHECK_VERSION (3, 22, 0)
 		gtk_show_uri_on_window (GTK_WINDOW (dialog),
 		                        "help:mate-stickynotes-applet/stickynotes-settings-individual",
 		                        gtk_get_current_event_time (),
 		                        NULL);
+#else
+		gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
+		              "help:mate-stickynotes-applet/stickynotes-settings-individual",
+		              gtk_get_current_event_time (),
+		              NULL);
+#endif
         else if (id == GTK_RESPONSE_CLOSE)
                 gtk_widget_hide (dialog);
 }
--- a/stickynotes/stickynotes_callbacks.c
+++ b/stickynotes/stickynotes_callbacks.c
@@ -95,8 +95,15 @@ stickynote_show_popup_menu (GtkWidget *w
 {
 	if (event->type == GDK_BUTTON_PRESS && event->button == 3)
 	{
+#if GTK_CHECK_VERSION (3, 22, 0)
 		gtk_menu_popup_at_pointer (GTK_MENU (popup_menu),
 		                           (const GdkEvent*) event);
+#else
+		gtk_menu_popup (GTK_MENU (popup_menu),
+		                NULL, NULL,
+		                NULL, NULL,
+		                event->button, event->time);
+#endif
 	}
 
 	return FALSE;
--- a/trashapplet/src/trashapplet.c
+++ b/trashapplet/src/trashapplet.c
@@ -368,10 +368,17 @@ trash_applet_open_folder (GtkAction   *a
 {
   GError *err = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
   gtk_show_uri_on_window (NULL,
                           "trash:",
                           gtk_get_current_event_time (),
                           &err);
+#else
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)),
+                "trash:",
+                gtk_get_current_event_time (),
+                &err);
+#endif
 
   if (err)
     {
@@ -388,10 +395,17 @@ trash_applet_show_help (GtkAction   *act
   GError *err = NULL;
 
   /* FIXME - Actually, we need a user guide */
+#if GTK_CHECK_VERSION (3, 22, 0)
   gtk_show_uri_on_window (NULL,
                           "help:mate-trashapplet",
                           gtk_get_current_event_time (),
                           &err);
+#else
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)),
+                "help:mate-trashapplet",
+                gtk_get_current_event_time (),
+                &err);
+#endif
 
   if (err)
     {
--- a/trashapplet/src/xstuff.c
+++ b/trashapplet/src/xstuff.c
@@ -153,7 +153,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;
+#endif
 
 	if (opt_rect)
 		rect = *opt_rect;
@@ -169,9 +173,14 @@ xstuff_zoom_animate (GtkWidget *widget,
 	}
 
 	gscreen = gtk_widget_get_screen (widget);
+#if GTK_CHECK_VERSION (3, 22, 0)
 	monitor = gdk_display_get_monitor_at_window (gdk_screen_get_display (gscreen),
 						     gtk_widget_get_window (widget));
 	gdk_monitor_get_geometry (monitor, &dest);
+#else
+	monitor = gdk_screen_get_monitor_at_window (gscreen, gtk_widget_get_window (widget));
+	gdk_screen_get_monitor_geometry (gscreen, monitor, &dest);
+#endif
 
 	draw_zoom_animation (gscreen,
 			     rect.x, rect.y, rect.width, rect.height,

Places

File mate-applets-gtk-3.20.patch of Package mate-applets (Revision d11e1d59031beb29e2ad7c0b8d7a6195)

Places