Hello community,
here is the log from the commit of package pluma for openSUSE:Factory checked
in at 2019-05-16 22:05:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pluma (Old)
and /work/SRC/openSUSE:Factory/.pluma.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pluma"
Thu May 16 22:05:06 2019 rev:21 rq:682587 version:1.22.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/pluma/pluma.changes 2018-12-28
12:36:03.751932391 +0100
+++ /work/SRC/openSUSE:Factory/.pluma.new.5148/pluma.changes 2019-05-16
22:05:08.630560945 +0200
@@ -1,0 +2,64 @@
+Tue Mar 5 15:19:33 UTC 2019 - sor.ale...@meowr.ru
+
+- Update to version 1.22.0:
+ * pluma-utils.c: Avoid deprecated gdk_error_trap_push/pop.
+ * pluma-notebook: Pass event to gdk_seat_grab.
+ * pluma-window: Use gtk_menu_popup_at_widget for GtkNotebook.
+ * Avoid deprecated gtk_menu_popup.
+ * pluma-notebook.c: Avoid deprecated gdk_pointer_ ... functions.
+ * pluma-notebook.c: Avoid deprecated gdk_window_at_pointer.
+ * Avoid deprecated gtk_dialog_get_action_area.
+ * pluma-view.c: Avoid deprecated gtk_widget_override_font.
+ * Avoid deprecated gtk_font_button_set/get_font_name.
+ * pluma-file-browser-widget.c: Avoid deprecated GtkImageMenuItem.
+ * error-message-area: Avoid gtk_info_bar_new_with_buttons with
+ stock ids.
+ * Avoid gtk_info_bar_add_button with stock ids.
+ * Avoid pluma_file_chooser_dialog_new with stock ids.
+ * Avoid gtk_file_chooser_dialog_new with stock ids.
+ * pluma-time-plugin.c: Avoid gtk_dialog_new_with_buttons with
+ stock ids.
+ * Avoid gtk_dialog_add_buttons with stock ids.
+ * Use the same legal.xml file.
+ * Refer to the strftime(3) man page for more information.
+ * Refer to the pluma(1) man page for more information.
+ * prefs-manager: Silent some build warnings.
+ * Fix a few introspection and doc warnings.
+ * Fix search backwards with regex.
+ * pluma-document: Fix a possible memory leak.
+ * pluma-view: Fix: Don't lose the PRIMARY clipboard.
+ * Make the "close confirmation" dialogue bigger with multiple
+ files.
+ * pluma-view: Fix bold and italic fonts in menus.
+ * spell plugin: Autocheck spelling with [control + F7].
+ * Add the option to hide the first tab if there is only one tab.
+ * pluma-view: Fix a possible memory leak.
+ * pluma-view: Use static variables for cssprovider and settings.
+ * pluma-view: Synch the font in context-menu with a gsettings key.
+ * pluma-window: Make sure some resources are freed.
+ * Add the ability to switch tabs using [ctrl+tab] and
+ [ctrl+shift+tab].
+ * pluma-view: Fix the font in context menu.
+ * pluma-view: pluma_override_font: Add CSS provider only one time.
+ * pluma-view: Fix: Bold and Italic fonts don't work.
+ * Add update-authors.pl script which helps to update
+ pluma.about.
+ * Read authors (updated) from pluma.about file.
+ * Show enchant version when configure.
+ * Replace the deprecated enchant_dict_add_to_pwl with
+ enchant_dict_add.
+ * Make translatable the documenters in the About dialogue.
+ * Ensure proper translation of the About dialogue title.
+ * Add Licence button in About Pluma dialogue.
+ * Make translatable the copyright in the About dialogue.
+ * Remove type & url attr of ulink in translation.
+ * Remove deprecated help section: Opening a File from a URI.
+ * eggsmclient: Avoid deprecated g_type_class_add_private.
+ * Get snippet window size before destroying it.
+ * Fix misplaced underscore.
+ * pluma-utils: Fix a memory leak.
+ * pluma-window: Fix memory leaks.
+ * Update translations.
+- Rebase pluma-gtk-3.20.patch.
+
+-------------------------------------------------------------------
Old:
----
pluma-1.20.4.tar.xz
New:
----
pluma-1.22.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pluma.spec ++++++
--- /var/tmp/diff_new_pack.f6jJTo/_old 2019-05-16 22:05:09.638560000 +0200
+++ /var/tmp/diff_new_pack.f6jJTo/_new 2019-05-16 22:05:09.638560000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package pluma
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,9 +17,9 @@
%define typelib typelib-1_0-Pluma-1_0
-%define _version 1.20
+%define _version 1.22
Name: pluma
-Version: 1.20.4
+Version: 1.22.0
Release: 0
Summary: Text editor for the MATE desktop
License: GPL-2.0-or-later
++++++ pluma-1.20.4.tar.xz -> pluma-1.22.0.tar.xz ++++++
++++ 770008 lines of diff (skipped)
++++++ pluma-gtk-3.20.patch ++++++
--- /var/tmp/diff_new_pack.f6jJTo/_old 2019-05-16 22:05:11.690558078 +0200
+++ /var/tmp/diff_new_pack.f6jJTo/_new 2019-05-16 22:05:11.694558074 +0200
@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -142,16 +142,16 @@ fi
+@@ -150,16 +150,16 @@ fi
AM_CONDITIONAL(ENABLE_ENCHANT, test x"$enable_enchant" = "xyes")
@@ -20,9 +20,46 @@
gtk+-3.0 >= $GTK_REQUIRED
gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED
libpeas-1.0 >= 1.2.0
+--- a/plugins/docinfo/docinfo.ui
++++ b/plugins/docinfo/docinfo.ui
+@@ -2,7 +2,7 @@
+ <!-- Generated with glade 3.20.2 -->
+ <!--*- mode: xml -*-->
+ <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/plugins/externaltools/tools/outputpanel.ui
++++ b/plugins/externaltools/tools/outputpanel.ui
+@@ -8,7 +8,7 @@ Version: 2.91.3
+
+ -->
+ <interface>
+- <requires lib="gtk+" version="3.22"/>
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkBox" id="output-panel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
--- a/plugins/filebrowser/pluma-file-browser-widget.c
+++ b/plugins/filebrowser/pluma-file-browser-widget.c
-@@ -2473,7 +2473,11 @@ directory_open (PlumaFileBrowserWidget *
+@@ -1375,7 +1375,14 @@ popup_menu (PlumaFileBrowserWidget * obj
+ }
+ }
+
++#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
+ } else {
+ menu_popup_at_treeview_selection (menu, GTK_WIDGET
(obj->priv->treeview));
+ gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
+@@ -2472,7 +2477,11 @@ directory_open (PlumaFileBrowserWidget *
if (FILE_IS_DIR (flags)) {
result = TRUE;
@@ -34,6 +71,161 @@
g_signal_emit (obj, signals[ERROR], 0,
PLUMA_FILE_BROWSER_ERROR_OPEN_DIRECTORY,
error->message);
+--- a/plugins/sort/sort.ui
++++ b/plugins/sort/sort.ui
+@@ -2,7 +2,7 @@
+ <!-- Generated with glade 3.20.4 -->
+ <!--*- mode: xml -*-->
+ <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">100</property>
+--- a/plugins/spell/languages-dialog.ui
++++ b/plugins/spell/languages-dialog.ui
+@@ -2,7 +2,7 @@
+ <!-- Generated with glade 3.20.2 -->
+ <!--*- mode: xml -*-->
+ <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/plugins/spell/pluma-spell-setup-dialog.ui
++++ b/plugins/spell/pluma-spell-setup-dialog.ui
+@@ -2,7 +2,7 @@
+ <!-- Generated with glade 3.20.2 -->
+ <!--*- mode: xml -*-->
+ <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/plugins/spell/spell-checker.ui
++++ b/plugins/spell/spell-checker.ui
+@@ -2,7 +2,7 @@
+ <!-- Generated with glade 3.20.4 -->
+ <!--*- mode: xml -*-->
+ <interface>
+- <requires lib="gtk+" version="3.22"/>
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkImage" id="add_word_image">
+ <property name="can_focus">False</property>
+ <property name="icon_name">list-add</property>
+--- a/plugins/time/pluma-time-dialog.ui
++++ b/plugins/time/pluma-time-dialog.ui
+@@ -2,7 +2,7 @@
+ <!-- Generated with glade 3.20.2 -->
+ <!--*- mode: xml -*-->
+ <interface>
+- <requires lib="gtk+" version="3.22"/>
++ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+--- a/plugins/time/pluma-time-setup-dialog.ui
++++ b/plugins/time/pluma-time-setup-dialog.ui
+@@ -2,7 +2,7 @@
+ <!-- Generated with glade 3.20.2 -->
+ <!--*- mode: xml -*-->
+ <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/pluma/dialogs/pluma-close-confirmation-dialog.c
++++ b/pluma/dialogs/pluma-close-confirmation-dialog.c
+@@ -684,6 +684,9 @@ build_multiple_docs_dialog (PlumaCloseCo
+ GtkWidget *treeview;
+ GtkWidget *secondary_label;
+ GdkDisplay *display;
++#if !GTK_CHECK_VERSION (3, 22, 0)
++ GdkScreen *screen;
++#endif
+ GdkRectangle mon_geo;
+ gchar *str;
+ gchar *markup_str;
+@@ -755,7 +758,9 @@ build_multiple_docs_dialog (PlumaCloseCo
+ gtk_widget_set_can_focus (GTK_WIDGET (select_label), FALSE);
+
+ scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
++#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW
(scrolledwindow), TRUE);
++#endif
+ gtk_box_pack_start (GTK_BOX (vbox2), scrolledwindow, TRUE, TRUE, 0);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
+ GTK_POLICY_AUTOMATIC,
+@@ -787,8 +792,16 @@ build_multiple_docs_dialog (PlumaCloseCo
+ gtk_window_get_size (GTK_WINDOW (GTK_DIALOG (dlg)), &new_width,
&new_height);
+
+ display = gtk_widget_get_display (scrolledwindow);
++#if GTK_CHECK_VERSION (3, 22, 0)
+
+ gdk_monitor_get_geometry (gdk_display_get_primary_monitor (display),
&mon_geo);
++#else
++ screen = gdk_display_get_default_screen (display);
++
++ gdk_screen_get_monitor_geometry (screen,
++ gdk_screen_get_primary_monitor
(screen),
++ &mon_geo);
++#endif
+
+ max_height = mon_geo.height * 40 / 100;
+
+--- a/pluma/dialogs/pluma-encodings-dialog.ui
++++ b/pluma/dialogs/pluma-encodings-dialog.ui
+@@ -2,7 +2,7 @@
+ <!-- Generated with glade 3.20.2 -->
+ <!--*- mode: xml -*-->
+ <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/pluma/dialogs/pluma-preferences-dialog.ui
++++ b/pluma/dialogs/pluma-preferences-dialog.ui
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Generated with glade 3.20.2 -->
+ <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">160</property>
+--- a/pluma/dialogs/pluma-search-dialog.ui
++++ b/pluma/dialogs/pluma-search-dialog.ui
+@@ -23,7 +23,7 @@ Author: Wolfgang Ulbrich
+ -->
+ <!--*- mode: xml -*-->
+ <interface>
+- <requires lib="gtk+" version="3.22"/>
++ <requires lib="gtk+" version="3.20"/>
+ <!-- interface-license-type gplv2 -->
+ <!-- interface-name pluma -->
+ <!-- interface-description search-dialog -->
+--- a/pluma/pluma-documents-panel.c
++++ b/pluma/pluma-documents-panel.c
+@@ -503,7 +503,14 @@ show_popup_menu (PlumaDocumentsPanel *pa
+
+ if (event != 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
+ }
+ else
+ {
--- a/pluma/pluma-help.c
+++ b/pluma/pluma-help.c
@@ -63,10 +63,17 @@ pluma_help_display (GtkWindow *parent,
@@ -54,9 +246,180 @@
g_free (link);
+--- a/pluma/pluma-print-preview.c
++++ b/pluma/pluma-print-preview.c
+@@ -498,7 +498,14 @@ multi_button_clicked (GtkWidget *button
+ gtk_menu_attach (GTK_MENU (m), i, 1, 2, 1, 2);
+ g_signal_connect (i, "activate", G_CALLBACK (on_2x2_clicked), preview);
+
++#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_menu_popup_at_pointer (GTK_MENU (m), NULL);
++#else
++ gtk_menu_popup (GTK_MENU (m),
++ NULL, NULL,
++ NULL, NULL,
++ 0, GDK_CURRENT_TIME);
++#endif
+ }
+
+ static void
+--- a/pluma/pluma-status-combo-box.c
++++ b/pluma/pluma-status-combo-box.c
+@@ -182,6 +182,32 @@ menu_deactivate (GtkMenu *me
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo->priv->button),
FALSE);
+ }
+
++#if !GTK_CHECK_VERSION (3, 22, 0)
++static void
++menu_position_above_widget (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));
++ g_return_if_fail (!gtk_widget_get_has_window (GTK_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 void
+ button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+@@ -203,11 +229,19 @@ button_press_event (GtkWidget
+ gtk_widget_set_size_request (gtk_widget_get_toplevel
(combo->priv->menu), -1, max_height);
+ }
+
++#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_menu_popup_at_widget (GTK_MENU (combo->priv->menu),
+ gtk_widget_get_parent (widget),
+ GDK_GRAVITY_NORTH_WEST,
+ GDK_GRAVITY_SOUTH_WEST,
+ (const GdkEvent*) event);
++#else
++ gtk_menu_popup (GTK_MENU (combo->priv->menu),
++ NULL, NULL,
++ (GtkMenuPositionFunc) menu_position_above_widget,
++ (gpointer) gtk_widget_get_parent (widget),
++ event->button, event->time);
++#endif
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo->priv->button),
TRUE);
+
+--- a/pluma/pluma-utils.c
++++ b/pluma/pluma-utils.c
+@@ -152,10 +152,67 @@ pluma_utils_menu_position_under_widget (
+ *push_in = TRUE;
+ }
+
++#if !GTK_CHECK_VERSION (3, 22, 0)
++static void
++menu_popup_at_treeview_position (GtkMenu *menu,
++ gint *x,
++ gint *y,
++ gboolean *push_in,
++ gpointer *user_data)
++{
++ GtkWidget *widget;
++ GtkTreePath *path;
++ GtkTreeViewColumn *column;
++ GdkRectangle rect;
++ GtkAllocation allocation;
++ GtkRequisition requisition;
++ int wy;
++
++ g_return_if_fail (GTK_IS_TREE_VIEW (user_data));
++ g_return_if_fail (!gtk_widget_get_has_window (GTK_WIDGET (user_data)));
++
++ widget = GTK_WIDGET (user_data);
++ gtk_tree_view_get_cursor (GTK_TREE_VIEW (widget), &path, &column);
++
++ g_return_if_fail (path != NULL);
++
++ if (column == NULL)
++ {
++ column = gtk_tree_view_get_column (GTK_TREE_VIEW (widget), 0);
++ }
++
++ gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
++ gtk_widget_get_allocation(widget, &allocation);
++
++ gtk_tree_view_get_cell_area (GTK_TREE_VIEW (widget), path, column,
&rect);
++
++ wy = rect.y;
++
++ gtk_widget_get_preferred_size (GTK_WIDGET (menu), NULL, &requisition);
++
++ if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL)
++ {
++ *x += allocation.x + 10;
++ }
++ else
++ {
++ *x += allocation.x + allocation.width - requisition.width - 10;
++ }
++
++ wy = MAX (*y + 5, *y + wy + 5);
++ wy = MIN (wy, *y + allocation.height - requisition.height - 5);
++
++ *y = wy;
++
++ *push_in = TRUE;
++}
++#endif
++
+ void
+ menu_popup_at_treeview_selection (GtkWidget *menu,
+ GtkWidget *treeview)
+ {
++#if GTK_CHECK_VERSION (3, 22, 0)
+ GtkTreePath *path;
+ GtkTreeViewColumn *column;
+ GdkWindow *bin_window;
+@@ -175,6 +232,13 @@ menu_popup_at_treeview_selection (GtkWid
+ NULL);
+
+ gtk_tree_path_free(path);
++#else
++ gtk_menu_popup (GTK_MENU (menu),
++ NULL, NULL,
++ (GtkMenuPositionFunc) menu_popup_at_treeview_position,
++ (gpointer) treeview,
++ 0, GDK_CURRENT_TIME);
++#endif
+ }
+
+ /**
+--- a/pluma/pluma-view.c
++++ b/pluma/pluma-view.c
+@@ -2131,7 +2131,12 @@ show_line_numbers_menu (GtkWidget *
+
+ menu = create_line_numbers_menu (view);
+
++#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
+ }
+
+ static gboolean
--- a/pluma/pluma-window.c
+++ b/pluma/pluma-window.c
-@@ -2828,9 +2828,16 @@ fullscreen_controls_show (PlumaWindow *w
+@@ -2868,9 +2868,16 @@ fullscreen_controls_show (PlumaWindow *w
screen = gtk_window_get_screen (GTK_WINDOW (window));
display = gdk_screen_get_display (screen);
@@ -73,7 +436,7 @@
gtk_window_get_size (GTK_WINDOW (window->priv->fullscreen_controls),
&w, &h);
-@@ -2855,10 +2862,17 @@ run_fullscreen_animation (gpointer data)
+@@ -2895,10 +2902,17 @@ run_fullscreen_animation (gpointer data)
screen = gtk_window_get_screen (GTK_WINDOW (window));
display = gdk_screen_get_display (screen);
@@ -92,7 +455,7 @@
gtk_window_get_position (GTK_WINDOW (window->priv->fullscreen_controls),
&x, &y);
-@@ -2932,9 +2946,16 @@ show_hide_fullscreen_toolbar (PlumaWindo
+@@ -2972,9 +2986,16 @@ show_hide_fullscreen_toolbar (PlumaWindo
screen = gtk_window_get_screen (GTK_WINDOW (window));
display = gdk_screen_get_display (screen);
@@ -109,3 +472,24 @@
if (show)
gtk_window_move (GTK_WINDOW
(window->priv->fullscreen_controls),
+@@ -3486,11 +3507,20 @@ show_notebook_popup_menu (GtkNotebook
+
+ tab_label = gtk_notebook_get_tab_label (notebook, tab);
+
++#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,
+ (const GdkEvent*) event);
++#else
++ gtk_menu_popup (GTK_MENU (menu),
++ NULL, NULL,
++ (GtkMenuPositionFunc)
pluma_utils_menu_position_under_widget,
++ (gpointer) tab_label,
++ event != NULL ? event->button : 0,
++ event != NULL ? event->time : GDK_CURRENT_TIME);
++#endif
+
+ gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
+
