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 7bcbd0d45ff7009228d4a343f067ba0b)

Currently displaying revision 7bcbd0d45ff7009228d4a343f067ba0b , Show latest

--- a/baobab/src/baobab-utils.c
+++ b/baobab/src/baobab-utils.c
@@ -506,10 +506,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;
--- 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;
+  int 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);
@@ -716,9 +729,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
@@ -484,9 +484,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-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
@@ -126,10 +126,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
@@ -471,7 +471,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 ();
 
@@ -479,7 +483,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 7bcbd0d45ff7009228d4a343f067ba0b)

Places