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

Overview Repositories Revisions Requests Users Attributes Meta

File mate-utils-gtk-3.20.patch of Package mate-utils (Revision 6ea8330fd94f7cf4cecd4ffb2e44897d)

Currently displaying revision 6ea8330fd94f7cf4cecd4ffb2e44897d , Show latest

--- a/baobab/src/baobab.c
+++ b/baobab/src/baobab.c
@@ -1002,8 +1002,14 @@ on_chart_button_release (BaobabChart *ch
 					  baobab_chart_can_zoom_out (baobab.current_chart));
 
 		/* show the menu */
+#if GTK_CHECK_VERSION (3, 22, 0)
 		gtk_menu_popup_at_pointer (GTK_MENU (menu->widget),
 		                           (const GdkEvent*) event);
+#else
+		gtk_menu_popup (GTK_MENU (menu->widget),
+		                NULL, NULL, NULL, NULL,
+		                event->button, event->time);
+#endif
 
 		gtk_tree_path_free (root_path);
 	}
--- a/baobab/src/baobab-utils.c
+++ b/baobab/src/baobab-utils.c
@@ -371,8 +371,14 @@ popupmenu_list (GtkTreePath *path, GdkEv
 	}
 
 	gtk_widget_show_all (pmenu);
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_menu_popup_at_pointer (GTK_MENU (pmenu),
 	                           (const GdkEvent*) event);
+#else
+	gtk_menu_popup (GTK_MENU (pmenu),
+	                NULL, NULL, NULL, NULL,
+	                event->button, event->time);
+#endif
 }
 
 void
@@ -506,10 +512,17 @@ baobab_help_display (GtkWindow   *parent
 		g_strdup_printf ("help:%s/%s", file_name, link_id) :
 		g_strdup_printf ("help:%s", file_name);
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	ret = gtk_show_uri_on_window (parent,
 	                              uri,
 	                              gtk_get_current_event_time (),
 	                              &error);
+#else
+	ret = gtk_show_uri (gtk_window_get_screen (parent),
+	                    uri,
+	                    gtk_get_current_event_time (),
+	                    &error);
+#endif
 	g_free (uri);
 
 	if (error != NULL) {
--- a/configure.ac
+++ b/configure.ac
@@ -59,10 +59,10 @@ AC_SUBST(LIBGDICT_LT_VERSION)
 
 dnl pkg-config check
 
-GLIB_REQUIRED=2.50.0
-GIO_REQUIRED=2.50.0
+GLIB_REQUIRED=2.48.0
+GIO_REQUIRED=2.48.0
 GIO_UNIX_REQUIRED=2.18.0
-GTK_REQUIRED=3.22.0
+GTK_REQUIRED=3.20.0
 LIBMATE_PANEL_APPLET_REQUIRED=1.17.0
 LIBGTOP_REQUIRED=2.12.0
 LIBCANBERRA_GTK_REQUIRED=0.4
--- a/gsearchtool/src/gsearchtool-callbacks.c
+++ b/gsearchtool/src/gsearchtool-callbacks.c
@@ -186,8 +186,13 @@ click_help_cb (GtkWidget * widget,
 	GtkWidget * window = data;
 	GError * error = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	gtk_show_uri_on_window (GTK_WINDOW (window), "help:mate-search-tool",  
 	                        gtk_get_current_event_time (), &error);
+#else
+	gtk_show_uri (gtk_widget_get_screen (widget), "help:mate-search-tool",
+	              gtk_get_current_event_time (), &error);
+#endif
 
 	if (error) {
 		GtkWidget * dialog;
@@ -1386,8 +1391,14 @@ file_button_release_event_cb (GtkWidget
 			file = g_strdup (((show_app_list == TRUE) ? locale_file_first : NULL));
 
 			build_popup_menu_for_file (gsearch, file);
+#if GTK_CHECK_VERSION (3, 22, 0)
 			gtk_menu_popup_at_pointer (GTK_MENU (gsearch->search_results_popup_menu),
 			                           (const GdkEvent*) event);
+#else
+			gtk_menu_popup (GTK_MENU (gsearch->search_results_popup_menu),
+			                NULL, NULL, NULL, NULL,
+			                event->button, event->time);
+#endif
 			g_free (file);
 
 		}
@@ -1886,8 +1897,14 @@ key_press_cb (GtkWidget * widget,
 			g_list_free (list);
 
 			if (!no_files_found) {
+#if GTK_CHECK_VERSION (3, 22, 0)
 				gtk_menu_popup_at_pointer (GTK_MENU (gsearch->search_results_popup_menu),
 				                           (const GdkEvent*) event);
+#else
+				gtk_menu_popup (GTK_MENU (gsearch->search_results_popup_menu),
+				                NULL, NULL, NULL, NULL,
+				                event->keyval, event->time);
+#endif
 				return TRUE;
 			}
 		}
--- a/logview/src/logview-window.c
+++ b/logview/src/logview-window.c
@@ -356,7 +356,11 @@ logview_help (GtkAction *action, GtkWidg
 {
   GError *error = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
   gtk_show_uri_on_window (GTK_WINDOW (parent_window),
+#else
+  gtk_show_uri (gtk_widget_get_screen (GTK_WINDOW (parent_window)),
+#endif
                 "help:mate-system-log", gtk_get_current_event_time (),
                 &error);
 
--- a/mate-dictionary/src/gdict-applet.c
+++ b/mate-dictionary/src/gdict-applet.c
@@ -131,7 +131,12 @@ set_window_default_size (GdictApplet *ap
   gint width, height;
   gint font_size;
   GdkDisplay *display;
+#if GTK_CHECK_VERSION (3, 22, 0)
   GdkMonitor *monitor_num;
+#else
+  GdkScreen *screen;
+  gint monitor_num;
+#endif
   GtkRequisition req;
   GdkRectangle monitor;
 
@@ -155,9 +160,16 @@ set_window_default_size (GdictApplet *ap
 
   /* ... but make it no larger than half the monitor size */
   display = gtk_widget_get_display (widget);
+#if GTK_CHECK_VERSION (3, 22, 0)
   monitor_num = gdk_display_get_monitor_at_window (display,
                                                    gtk_widget_get_window (widget));
   gdk_monitor_get_geometry (monitor_num, &monitor);
+#else
+  screen = gdk_display_get_default_screen (display);
+  monitor_num = gdk_screen_get_monitor_at_window (screen,
+                                                  gtk_widget_get_window (widget));
+  gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+#endif
 
   width = MIN (width, monitor.width / 2);
   height = MIN (height, monitor.height / 2);
@@ -731,9 +743,15 @@ gdict_applet_cmd_help (GtkAction *action
 {
   GError *err = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
   gtk_show_uri_on_window (NULL,
 		"help:mate-dictionary/mate-dictionary-applet",
 		gtk_get_current_event_time (), &err);
+#else
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)),
+                "help:mate-dictionary/mate-dictionary-applet",
+                gtk_get_current_event_time (), &err);
+#endif
   
   if (err)
     {
--- a/mate-dictionary/src/gdict-pref-dialog.c
+++ b/mate-dictionary/src/gdict-pref-dialog.c
@@ -487,9 +487,15 @@ response_cb (GtkDialog *dialog,
   switch (response_id)
     {
     case GTK_RESPONSE_HELP:
+#if GTK_CHECK_VERSION (3, 22, 0)
       gtk_show_uri_on_window (GTK_WINDOW (dialog),
                     "help:mate-dictionary/mate-dictionary-preferences",
                     gtk_get_current_event_time (), &err);
+#else
+      gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
+                    "help:mate-dictionary/mate-dictionary-preferences",
+                    gtk_get_current_event_time (), &err);
+#endif
       if (err)
 	{
           GtkWidget *error_dialog;
--- a/mate-dictionary/src/gdict-sidebar.c
+++ b/mate-dictionary/src/gdict-sidebar.c
@@ -137,6 +137,31 @@ gdict_sidebar_dispose (GObject *object)
   G_OBJECT_CLASS (gdict_sidebar_parent_class)->dispose (object);
 }
 
+#if !GTK_CHECK_VERSION (3, 22, 0)
+static void
+gdict_sidebar_menu_position_function (GtkMenu  *menu,
+                                      gint     *x,
+                                      gint     *y,
+                                      gboolean *push_in,
+                                      gpointer  user_data)
+{
+  GtkWidget *widget;
+  GtkAllocation allocation;
+
+  g_return_if_fail (GTK_IS_WIDGET (user_data));
+
+  widget = GTK_WIDGET (user_data);
+
+  gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
+
+  gtk_widget_get_allocation (widget, &allocation);
+  *x += allocation.x;
+  *y += allocation.y + allocation.height;
+
+  *push_in = FALSE;
+}
+#endif
+
 static gboolean
 gdict_sidebar_select_button_press_cb (GtkWidget      *widget,
 				      GdkEventButton *event,
@@ -159,11 +184,19 @@ gdict_sidebar_select_button_press_cb (Gt
       gtk_widget_grab_focus (widget);
 
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+#if GTK_CHECK_VERSION (3, 22, 0)
       gtk_menu_popup_at_widget (GTK_MENU (sidebar->priv->menu),
                                 widget,
                                 GDK_GRAVITY_SOUTH_WEST,
                                 GDK_GRAVITY_NORTH_WEST,
                                 (const GdkEvent*) event);
+#else
+      gtk_menu_popup (GTK_MENU (sidebar->priv->menu),
+                      NULL, NULL,
+                      gdict_sidebar_menu_position_function,
+                      (gpointer) widget,
+                      event->button, event->time);
+#endif
 
       return TRUE;
     }
@@ -184,11 +217,19 @@ gdict_sidebar_select_key_press_cb (GtkWi
       event->keyval == GDK_KEY_KP_Enter)
     {
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+#if GTK_CHECK_VERSION (3, 22, 0)
       gtk_menu_popup_at_widget (GTK_MENU (sidebar->priv->menu),
                                 widget,
                                 GDK_GRAVITY_SOUTH_WEST,
                                 GDK_GRAVITY_NORTH_WEST,
                                 (const GdkEvent*) event);
+#else
+      gtk_menu_popup (GTK_MENU (sidebar->priv->menu),
+                      NULL, NULL,
+                      gdict_sidebar_menu_position_function,
+                      (gpointer) widget,
+                      1, event->time);
+#endif
 
       return TRUE;
     }
--- a/mate-dictionary/src/gdict-source-dialog.c
+++ b/mate-dictionary/src/gdict-source-dialog.c
@@ -469,9 +469,15 @@ gdict_source_dialog_response_cb (GtkDial
       build_new_source (GDICT_SOURCE_DIALOG (dialog));
       break;
     case GTK_RESPONSE_HELP:
+#if GTK_CHECK_VERSION (3, 22, 0)
       gtk_show_uri_on_window (GTK_WINDOW (dialog),
                     "help:mate-dictionary/mate-dictionary-add-source",
                     gtk_get_current_event_time (), &err);
+#else
+      gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
+                    "help:mate-dictionary/mate-dictionary-add-source",
+                    gtk_get_current_event_time (), &err);
+#endif
       if (err)
         {
           gdict_show_gerror_dialog (GTK_WINDOW (dialog),
--- a/mate-dictionary/src/gdict-window.c
+++ b/mate-dictionary/src/gdict-window.c
@@ -1244,9 +1244,15 @@ gdict_window_cmd_help_contents (GtkActio
   
   g_return_if_fail (GDICT_IS_WINDOW (window));
 
+#if GTK_CHECK_VERSION (3, 22, 0)
   gtk_show_uri_on_window (GTK_WINDOW (window),
                 "help:mate-dictionary",
                 gtk_get_current_event_time (), &err); 
+#else
+  gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (window)),
+                "help:mate-dictionary",
+                gtk_get_current_event_time (), &err);
+#endif
   if (err)
     {
       gdict_show_gerror_dialog (GTK_WINDOW (window),
--- a/mate-screenshot/src/mate-screenshot.c
+++ b/mate-screenshot/src/mate-screenshot.c
@@ -127,10 +127,17 @@ display_help (GtkWindow *parent)
 {
   GError *error = NULL;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
   gtk_show_uri_on_window (parent,
                           "help:mate-user-guide/goseditmainmenu-53",
                           gtk_get_current_event_time (),
                           &error);
+#else
+  gtk_show_uri (gtk_window_get_screen (parent),
+                "help:mate-user-guide/goseditmainmenu-53",
+                gtk_get_current_event_time (),
+                &error);
+#endif
 
   if (error)
     {
--- a/mate-screenshot/src/screenshot-utils.c
+++ b/mate-screenshot/src/screenshot-utils.c
@@ -477,7 +477,11 @@ make_region_with_monitors (GdkScreen *sc
   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
 
   region = cairo_region_create ();
 
@@ -485,7 +489,11 @@ make_region_with_monitors (GdkScreen *sc
     {
       GdkRectangle rect;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
       gdk_monitor_get_geometry (gdk_display_get_monitor (display, i), &rect);
+#else
+      gdk_screen_get_monitor_geometry (screen, i, &rect);
+#endif
       cairo_region_union_rectangle (region, &rect);
     }

Places

File mate-utils-gtk-3.20.patch of Package mate-utils (Revision 6ea8330fd94f7cf4cecd4ffb2e44897d)

Places