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

Overview Repositories Revisions Requests Users Attributes Meta

File mate-terminal-gtk-3.20.patch of Package mate-terminal (Revision f30d5df3c5d509b6aa64c3c51f6f3ba0)

Currently displaying revision f30d5df3c5d509b6aa64c3c51f6f3ba0 , Show latest

--- a/configure.ac
+++ b/configure.ac
@@ -38,10 +38,10 @@ MATE_COMPILE_WARNINGS([maximum])
 
 AM_GLIB_GNU_GETTEXT
 
-GLIB_REQUIRED=2.50.0
-GIO_REQUIRED=2.50.0
-GTK_REQUIRED=3.22.0
-VTE_REQUIRED=0.48
+GLIB_REQUIRED=2.48.0
+GIO_REQUIRED=2.48.0
+GTK_REQUIRED=3.20.0
+VTE_REQUIRED=0.44
 DCONF_REQUIRED=0.13.4
 
 PKG_CHECK_MODULES([TERM],
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1552,6 +1552,9 @@ terminal_screen_launch_child_cb (Termina
 	const char *working_dir;
 	VtePtyFlags pty_flags = VTE_PTY_DEFAULT;
 	GSpawnFlags spawn_flags = 0;
+#if !VTE_CHECK_VERSION(0, 48, 0)
+	GPid pid;
+#endif
 
 	priv->launch_child_source_id = 0;
 
@@ -1577,6 +1580,7 @@ terminal_screen_launch_child_cb (Termina
 		return FALSE;
 	}
 
+#if VTE_CHECK_VERSION(0, 48, 0)
         vte_terminal_spawn_async (terminal,
 				  pty_flags,
 				  working_dir,
@@ -1590,6 +1594,20 @@ terminal_screen_launch_child_cb (Termina
 				  NULL,
 				  (VteTerminalSpawnAsyncCallback) term_spawn_callback,
 				  NULL);
+#else
+	vte_terminal_spawn_sync (terminal,
+	                         pty_flags,
+	                         working_dir,
+	                         argv,
+	                         env,
+	                         spawn_flags,
+	                         NULL,
+	                         NULL,
+	                         &pid,
+	                         NULL,
+	                         &err);
+	term_spawn_callback (GTK_WIDGET (terminal), pid, err, NULL);;
+#endif
 
 	g_free (shell);
 	g_strfreev (argv);
--- a/src/terminal-util.c
+++ b/src/terminal-util.c
@@ -139,7 +139,12 @@ terminal_util_show_help (const char *top
 		url = g_strdup ("help:mate-terminal");
 	}
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	if (!gtk_show_uri_on_window (GTK_WINDOW (parent), url, gtk_get_current_event_time (), &error))
+#else
+	if (!gtk_show_uri (gtk_window_get_screen (GTK_WINDOW( parent)), url,
+	                   gtk_get_current_event_time (), &error))
+#endif
 	{
 		terminal_util_show_error_dialog (GTK_WINDOW (parent), NULL, error,
 		                                 _("There was an error displaying help"));
@@ -211,7 +216,12 @@ terminal_util_open_url (GtkWidget *paren
 		g_assert_not_reached ();
 	}
 
+#if GTK_CHECK_VERSION (3, 22, 0)
 	if (!gtk_show_uri_on_window (GTK_WINDOW (parent), uri, user_time, &error))
+#else
+	if (!gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (parent)), uri,
+	                   user_time, &error))
+#endif
 	{
 		terminal_util_show_error_dialog (GTK_WINDOW (parent), NULL, error,
 		                                 _("Could not open the address “%s”"),
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -1152,7 +1152,11 @@ terminal_window_update_search_sensitivit
     if (screen != priv->active_screen)
         return;
 
+#if VTE_CHECK_VERSION (0, 46, 0)
     can_search = vte_terminal_search_get_regex (VTE_TERMINAL (screen)) != NULL;
+#else
+    can_search = vte_terminal_search_get_gregex (VTE_TERMINAL (screen)) != NULL;
+#endif
 
     action = gtk_action_group_get_action (priv->action_group, "SearchFindNext");
     gtk_action_set_sensitive (action, can_search);
@@ -1502,7 +1506,13 @@ popup_clipboard_targets_received_cb (Gtk
 
     gdk_event_set_device (event, device);
 
+#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,
+                    info->button, info->timestamp);
+#endif
 
     gdk_event_free (event);
 }
@@ -2933,7 +2943,13 @@ notebook_button_press_cb (GtkWidget *wid
       gtk_menu_detach (GTK_MENU (menu));
     tab = gtk_notebook_get_nth_page (notebook, tab_clicked);
     gtk_menu_attach_to_widget (GTK_MENU (menu), tab, NULL);
+#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,
+                    event->button, event->time);
+#endif
 
     return TRUE;
 }
@@ -2974,6 +2990,59 @@ window_key_press_cb (GtkWidget *widget,
     return FALSE;
 }
 
+static void
+position_menu_under_widget (GtkMenu *menu,
+                            gint *x,
+                            gint *y,
+                            gboolean *push_in,
+                            gpointer user_data)
+{
+    /* Adapted from gtktoolbar.c */
+    GtkWidget *widget = GTK_WIDGET (user_data);
+    GdkWindow *widget_window;
+    GtkWidget *container;
+    GtkRequisition req;
+    GtkRequisition menu_req;
+    GdkRectangle monitor;
+    GdkScreen *screen;
+    gint monitor_num;
+    GtkAllocation widget_allocation;
+
+    widget_window = gtk_widget_get_window (widget);
+    gtk_widget_get_allocation (widget, &widget_allocation);
+    container = gtk_widget_get_ancestor (widget, GTK_TYPE_CONTAINER);
+
+    gtk_widget_get_preferred_size (widget, &req, NULL);
+    gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_req, NULL);
+
+    screen = gtk_widget_get_screen (GTK_WIDGET (menu));
+    monitor_num = gdk_screen_get_monitor_at_window (screen, widget_window);
+    monitor_num = monitor_num > 0 ? monitor_num : 0;
+    gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+
+    gdk_window_get_origin (widget_window, x, y);
+    if (!gtk_widget_get_has_window (widget))
+    {
+        *x += widget_allocation.x;
+        *y += widget_allocation.y;
+    }
+    if (gtk_widget_get_direction (container) == GTK_TEXT_DIR_LTR)
+        *x += widget_allocation.width - req.width;
+    else
+        *x += req.width - menu_req.width;
+
+    if ((*y + widget_allocation.height + menu_req.height) <= monitor.y + monitor.height)
+        *y += widget_allocation.height;
+    else if ((*y - menu_req.height) >= monitor.y)
+        *y -= menu_req.height;
+    else if (monitor.y + monitor.height - (*y + widget_allocation.height) > *y)
+        *y += widget_allocation.height;
+    else
+        *y -= menu_req.height;
+
+    *push_in = FALSE;
+}
+
 static gboolean
 notebook_popup_menu_cb (GtkWidget *widget,
                         TerminalWindow *window)
@@ -3000,11 +3068,18 @@ notebook_popup_menu_cb (GtkWidget *widge
     if (gtk_menu_get_attach_widget (GTK_MENU (menu)))
       gtk_menu_detach (GTK_MENU (menu));
     gtk_menu_attach_to_widget (GTK_MENU (menu), tab_label, NULL);
+#if GTK_CHECK_VERSION (3, 22, 0)
     gtk_menu_popup_at_widget (GTK_MENU (menu),
                               tab_label,
                               GDK_GRAVITY_SOUTH_WEST,
                               GDK_GRAVITY_NORTH_WEST,
                               NULL);
+#else
+    gtk_menu_popup (GTK_MENU (menu),
+                    NULL, NULL,
+                    position_menu_under_widget, tab_label,
+                    0, GDK_CURRENT_TIME);
+#endif
     gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
 
     return TRUE;

Places

File mate-terminal-gtk-3.20.patch of Package mate-terminal (Revision f30d5df3c5d509b6aa64c3c51f6f3ba0)

Places