diff -Nru pluma-1.16.0/configure.ac pluma-1.16.2/configure.ac --- pluma-1.16.0/configure.ac 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/configure.ac 2017-05-05 08:51:08.000000000 +0000 @@ -4,7 +4,7 @@ m4_define(pluma_major_version, 1) m4_define(pluma_minor_version, 16) -m4_define(pluma_micro_version, 0) +m4_define(pluma_micro_version, 2) m4_define(pluma_version, pluma_major_version.pluma_minor_version.pluma_micro_version) AC_INIT([pluma], [pluma_version], @@ -328,21 +328,6 @@ MATE_COMPILE_WARNINGS(yes) -AC_ARG_ENABLE(deprecations, - [AS_HELP_STRING([--enable-deprecations], - [warn about deprecated usages [default=no]])],, - [enable_deprecations=no]) - -if test "x$enable_deprecations" = "xyes"; then - DISABLE_DEPRECATED_CFLAGS="\ --DG_DISABLE_DEPRECATED \ --DGDK_DISABLE_DEPRECATED \ --DGTK_DISABLE_DEPRECATED \ --DGDK_PIXBUF_DISABLE_DEPRECATED \ --DMATE_DISABLE_DEPRECATED" - AC_SUBST(DISABLE_DEPRECATED_CFLAGS) -fi - AC_ARG_ENABLE([tests], AS_HELP_STRING([--enable-tests], [Enable the tests]), [enable_tests=$enableval], diff -Nru pluma-1.16.0/debian/changelog pluma-1.16.2/debian/changelog --- pluma-1.16.0/debian/changelog 2017-01-13 02:01:50.000000000 +0000 +++ pluma-1.16.2/debian/changelog 2017-05-14 23:14:27.000000000 +0000 @@ -1,3 +1,9 @@ +pluma (1.16.2-1~xenial1.0) xenial; urgency=medium + + * Automated PPA build. + + -- Martin Wimpress Mon, 15 May 2017 00:14:27 +0100 + pluma (1.16.0-1~xenial3.1) xenial; urgency=medium * Automated PPA build. diff -Nru pluma-1.16.0/NEWS pluma-1.16.2/NEWS --- pluma-1.16.0/NEWS 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/NEWS 2017-05-05 08:51:08.000000000 +0000 @@ -1,3 +1,22 @@ +pluma 1.16.2 +============ + + * Close confirm dialog: various fixes for visual issues + * GTK+3: force X11 backend + +pluma 1.16.1 +============ + + * Build: remove --enable-deprecations option - it actually + disabled all deprecated stuff + * Modelines plugin: fix random crash on closing one of several + Pluma windows + * Snippets plugin: fix snippet parts staying after Ctrl-Z + * Fix unexpected closing of the first tab with middle-click + under the line numbers column + * Fix some runtime warnings in plugins + * Some more fixes and cleanups in code and docs + pluma 1.16.0 ============ diff -Nru pluma-1.16.0/plugins/changecase/Makefile.am pluma-1.16.2/plugins/changecase/Makefile.am --- pluma-1.16.0/plugins/changecase/Makefile.am 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/changecase/Makefile.am 2017-05-05 08:51:08.000000000 +0000 @@ -4,8 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) + $(WARN_CFLAGS) plugin_LTLIBRARIES = libchangecase.la diff -Nru pluma-1.16.0/plugins/docinfo/Makefile.am pluma-1.16.2/plugins/docinfo/Makefile.am --- pluma-1.16.0/plugins/docinfo/Makefile.am 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/docinfo/Makefile.am 2017-05-05 08:51:08.000000000 +0000 @@ -4,8 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) + $(WARN_CFLAGS) plugin_LTLIBRARIES = libdocinfo.la diff -Nru pluma-1.16.0/plugins/externaltools/tools/library.py pluma-1.16.2/plugins/externaltools/tools/library.py --- pluma-1.16.0/plugins/externaltools/tools/library.py 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/externaltools/tools/library.py 2017-05-05 08:51:08.000000000 +0000 @@ -19,7 +19,6 @@ import os import re import locale -import platform class Singleton(object): _instance = None @@ -39,22 +38,13 @@ def set_locations(self, datadir): self.locations = [] - if platform.platform() != 'Windows': - for d in self.get_xdg_data_dirs(): - self.locations.append(os.path.join(d, 'pluma', 'plugins', 'externaltools', 'tools')) + for d in self.get_xdg_data_dirs(): + self.locations.append(os.path.join(d, 'pluma', 'plugins', 'externaltools', 'tools')) self.locations.append(datadir) # self.locations[0] is where we save the custom scripts - if platform.platform() == 'Windows': - toolsdir = os.path.expanduser('~/pluma/tools') - else: - userdir = os.getenv('MATE22_USER_DIR') - if userdir: - toolsdir = os.path.join(userdir, 'pluma/tools') - else: - toolsdir = os.path.expanduser('~/.config/pluma/tools') - + toolsdir = os.path.expanduser('~/.config/pluma/tools') self.locations.insert(0, toolsdir); if not os.path.isdir(self.locations[0]): @@ -78,11 +68,7 @@ # storage file. def import_old_xml_store(self): import xml.etree.ElementTree as et - userdir = os.getenv('MATE22_USER_DIR') - if userdir: - filename = os.path.join(userdir, 'pluma/pluma-tools.xml') - else: - filename = os.path.expanduser('~/.config/pluma/pluma-tools.xml') + filename = os.path.expanduser('~/.config/pluma/pluma-tools.xml') if not os.path.isfile(filename): return diff -Nru pluma-1.16.0/plugins/filebrowser/Makefile.am pluma-1.16.2/plugins/filebrowser/Makefile.am --- pluma-1.16.0/plugins/filebrowser/Makefile.am 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/filebrowser/Makefile.am 2017-05-05 08:51:08.000000000 +0000 @@ -5,8 +5,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) + $(WARN_CFLAGS) BUILT_SOURCES = \ pluma-file-browser-enum-types.h \ diff -Nru pluma-1.16.0/plugins/modelines/Makefile.am pluma-1.16.2/plugins/modelines/Makefile.am --- pluma-1.16.0/plugins/modelines/Makefile.am 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/modelines/Makefile.am 2017-05-05 08:51:08.000000000 +0000 @@ -4,8 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) + $(WARN_CFLAGS) modelinesdir = $(PLUMA_PLUGINS_DATA_DIR)/modelines modelines_DATA = \ diff -Nru pluma-1.16.0/plugins/modelines/modeline-parser.c pluma-1.16.2/plugins/modelines/modeline-parser.c --- pluma-1.16.0/plugins/modelines/modeline-parser.c 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/modelines/modeline-parser.c 2017-05-05 08:51:08.000000000 +0000 @@ -82,7 +82,8 @@ void modeline_parser_init (const gchar *data_dir) { - modelines_data_dir = g_strdup (data_dir); + if (modelines_data_dir == NULL) + modelines_data_dir = g_strdup (data_dir); } void @@ -102,6 +103,7 @@ kate_languages = NULL; g_free (modelines_data_dir); + modelines_data_dir = NULL; } static GHashTable * diff -Nru pluma-1.16.0/plugins/snippets/snippets/Document.py pluma-1.16.2/plugins/snippets/snippets/Document.py --- pluma-1.16.0/plugins/snippets/snippets/Document.py 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/snippets/snippets/Document.py 2017-05-05 08:51:08.000000000 +0000 @@ -731,6 +731,14 @@ self.update_snippet_contents) def on_buffer_changed(self, buf): + for snippet in list(self.active_snippets): + begin = snippet.begin_iter() + end = snippet.end_iter() + + if begin.compare(end) >= 0: + # Begin collapsed on end, just remove it + self.deactivate_snippet(snippet) + current = self.current_placeholder() if current: diff -Nru pluma-1.16.0/plugins/snippets/snippets/__init__.py pluma-1.16.2/plugins/snippets/snippets/__init__.py --- pluma-1.16.0/plugins/snippets/snippets/__init__.py 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/snippets/snippets/__init__.py 2017-05-05 08:51:08.000000000 +0000 @@ -22,7 +22,6 @@ import gtk from gtk import gdk import pluma -import platform from WindowHelper import WindowHelper from Library import Library @@ -38,31 +37,22 @@ library = Library() library.set_accelerator_callback(self.accelerator_activated) - if platform.platform() == 'Windows': - snippetsdir = os.path.expanduser('~/pluma/snippets') - else: - userdir = os.getenv('MATE22_USER_DIR') - if userdir: - snippetsdir = os.path.join(userdir, 'pluma/snippets') - else: - snippetsdir = os.path.expanduser('~/.config/pluma/snippets') - + snippetsdir = os.path.expanduser('~/.config/pluma/snippets') library.set_dirs(snippetsdir, self.system_dirs()) def system_dirs(self): - if platform.platform() != 'Windows': - if 'XDG_DATA_DIRS' in os.environ: - datadirs = os.environ['XDG_DATA_DIRS'] - else: - datadirs = '/usr/local/share' + os.pathsep + '/usr/share' + if 'XDG_DATA_DIRS' in os.environ: + datadirs = os.environ['XDG_DATA_DIRS'] + else: + datadirs = '/usr/local/share' + os.pathsep + '/usr/share' - dirs = [] + dirs = [] - for d in datadirs.split(os.pathsep): - d = os.path.join(d, 'pluma', 'plugins', 'snippets') + for d in datadirs.split(os.pathsep): + d = os.path.join(d, 'pluma', 'plugins', 'snippets') - if os.path.isdir(d): - dirs.append(d) + if os.path.isdir(d): + dirs.append(d) dirs.append(self.get_data_dir()) return dirs diff -Nru pluma-1.16.0/plugins/snippets/snippets/Manager.py pluma-1.16.2/plugins/snippets/snippets/Manager.py --- pluma-1.16.0/plugins/snippets/snippets/Manager.py 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/snippets/snippets/Manager.py 2017-05-05 08:51:08.000000000 +0000 @@ -878,7 +878,7 @@ if len(export_snippets) == 0 and show_dialogs: message = _('There are no snippets selected to be exported') - message_dialog(self.dlg, gtk.MESSAGE_INFORMATION, message) + message_dialog(self.dlg, gtk.MESSAGE_INFO, message) return False if not filename: @@ -948,7 +948,7 @@ dlg.destroy() message = _('There are no snippets selected to be exported') - message_dialog(self.dlg, gtk.MESSAGE_INFORMATION, message) + message_dialog(self.dlg, gtk.MESSAGE_INFO, message) return dlg.add_filter(self.file_filter(_('All supported archives'), ('*.gz','*.bz2','*.tar'))) diff -Nru pluma-1.16.0/plugins/sort/Makefile.am pluma-1.16.2/plugins/sort/Makefile.am --- pluma-1.16.0/plugins/sort/Makefile.am 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/sort/Makefile.am 2017-05-05 08:51:08.000000000 +0000 @@ -4,8 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) + $(WARN_CFLAGS) plugin_LTLIBRARIES = libsort.la diff -Nru pluma-1.16.0/plugins/sort/pluma-sort-plugin.c pluma-1.16.2/plugins/sort/pluma-sort-plugin.c --- pluma-1.16.0/plugins/sort/pluma-sort-plugin.c 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/sort/pluma-sort-plugin.c 2017-05-05 08:51:08.000000000 +0000 @@ -92,7 +92,7 @@ }; static void -sort_dialog_dispose (GObject *obj, +sort_dialog_destroy (GObject *obj, gpointer dialog_pointer) { pluma_debug (DEBUG_PLUGINS); @@ -194,8 +194,8 @@ GTK_RESPONSE_OK); g_signal_connect (dialog->dialog, - "dispose", - G_CALLBACK (sort_dialog_dispose), + "destroy", + G_CALLBACK (sort_dialog_destroy), dialog); g_signal_connect (dialog->dialog, diff -Nru pluma-1.16.0/plugins/spell/Makefile.am pluma-1.16.2/plugins/spell/Makefile.am --- pluma-1.16.0/plugins/spell/Makefile.am 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/spell/Makefile.am 2017-05-05 08:51:08.000000000 +0000 @@ -5,8 +5,7 @@ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(ENCHANT_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) + $(WARN_CFLAGS) BUILT_SOURCES = \ pluma-spell-marshal.c \ diff -Nru pluma-1.16.0/plugins/spell/pluma-spell-plugin.c pluma-1.16.2/plugins/spell/pluma-spell-plugin.c --- pluma-1.16.0/plugins/spell/pluma-spell-plugin.c 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/spell/pluma-spell-plugin.c 2017-05-05 08:51:08.000000000 +0000 @@ -818,8 +818,6 @@ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->never), TRUE); } - gtk_window_set_default_size (GTK_WIDGET (content), 15, 120); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), content, FALSE, FALSE, 0); g_object_unref (content); diff -Nru pluma-1.16.0/plugins/taglist/Makefile.am pluma-1.16.2/plugins/taglist/Makefile.am --- pluma-1.16.0/plugins/taglist/Makefile.am 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/taglist/Makefile.am 2017-05-05 08:51:08.000000000 +0000 @@ -14,8 +14,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) + $(WARN_CFLAGS) plugin_LTLIBRARIES = libtaglist.la diff -Nru pluma-1.16.0/plugins/taglist/pluma-taglist-plugin-parser.c pluma-1.16.2/plugins/taglist/pluma-taglist-plugin-parser.c --- pluma-1.16.0/plugins/taglist/pluma-taglist-plugin-parser.c 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/taglist/pluma-taglist-plugin-parser.c 2017-05-05 08:51:08.000000000 +0000 @@ -43,8 +43,6 @@ #include "pluma-taglist-plugin-parser.h" -/* we screwed up so we still look here for compatibility */ -#define USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY ".pluma/plugins/taglist/" #define USER_PLUMA_TAGLIST_PLUGIN_LOCATION "pluma/taglist/" TagList* taglist = NULL; @@ -603,33 +601,12 @@ } const gchar* home; - const gchar* envvar; /* load user's taglists */ - /* legacy dir */ home = g_get_home_dir (); if (home != NULL) { - pdir = g_build_filename (home, - USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY, - NULL); - parse_taglist_dir (pdir); - g_free (pdir); - } - - /* Support old libmate env var */ - envvar = g_getenv ("MATE22_USER_DIR"); - if (envvar != NULL) - { - pdir = g_build_filename (envvar, - USER_PLUMA_TAGLIST_PLUGIN_LOCATION, - NULL); - parse_taglist_dir (pdir); - g_free (pdir); - } - else if (home != NULL) - { pdir = g_build_filename(home, ".config", USER_PLUMA_TAGLIST_PLUGIN_LOCATION, NULL); parse_taglist_dir(pdir); g_free (pdir); diff -Nru pluma-1.16.0/plugins/time/Makefile.am pluma-1.16.2/plugins/time/Makefile.am --- pluma-1.16.0/plugins/time/Makefile.am 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/time/Makefile.am 2017-05-05 08:51:08.000000000 +0000 @@ -4,8 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) + $(WARN_CFLAGS) plugin_LTLIBRARIES = libtime.la diff -Nru pluma-1.16.0/plugins/time/pluma-time-plugin.c pluma-1.16.2/plugins/time/pluma-time-plugin.c --- pluma-1.16.0/plugins/time/pluma-time-plugin.c 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/time/pluma-time-plugin.c 2017-05-05 08:51:08.000000000 +0000 @@ -448,7 +448,7 @@ } static void -dialog_disposed (GObject *obj, gpointer dialog_pointer) +dialog_destroyed (GObject *obj, gpointer dialog_pointer) { pluma_debug (DEBUG_PLUGINS); @@ -829,8 +829,8 @@ G_CALLBACK (configure_dialog_button_toggled), dialog); g_signal_connect (dialog->dialog, - "dispose", - G_CALLBACK (dialog_disposed), + "destroy", + G_CALLBACK (dialog_destroyed), dialog); g_signal_connect (dialog->custom_entry, "changed", @@ -991,8 +991,8 @@ G_CALLBACK (choose_format_dialog_button_toggled), dialog); g_signal_connect (dialog->dialog, - "dispose", - G_CALLBACK (dialog_disposed), + "destroy", + G_CALLBACK (dialog_destroyed), dialog); g_signal_connect (dialog->custom_entry, "changed", diff -Nru pluma-1.16.0/plugins/trailsave/Makefile.am pluma-1.16.2/plugins/trailsave/Makefile.am --- pluma-1.16.0/plugins/trailsave/Makefile.am 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/plugins/trailsave/Makefile.am 2017-05-05 08:51:08.000000000 +0000 @@ -4,8 +4,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) + $(WARN_CFLAGS) plugin_LTLIBRARIES = libtrailsave.la diff -Nru pluma-1.16.0/pluma/dialogs/Makefile.am pluma-1.16.2/pluma/dialogs/Makefile.am --- pluma-1.16.0/pluma/dialogs/Makefile.am 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/pluma/dialogs/Makefile.am 2017-05-05 08:51:08.000000000 +0000 @@ -6,8 +6,7 @@ -I$(top_srcdir)/pluma \ -I$(top_builddir)/pluma \ $(PLUMA_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) + $(WARN_CFLAGS) noinst_LTLIBRARIES = libdialogs.la diff -Nru pluma-1.16.0/pluma/dialogs/pluma-close-confirmation-dialog.c pluma-1.16.2/pluma/dialogs/pluma-close-confirmation-dialog.c --- pluma-1.16.0/pluma/dialogs/pluma-close-confirmation-dialog.c 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/pluma/dialogs/pluma-close-confirmation-dialog.c 2017-05-05 08:51:08.000000000 +0000 @@ -527,6 +527,9 @@ #endif gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE); gtk_widget_set_can_focus (GTK_WIDGET (primary_label), FALSE); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_label_set_max_width_chars (GTK_LABEL (primary_label), 72); +#endif doc_name = pluma_document_get_short_name_for_display (doc); @@ -564,6 +567,9 @@ #endif gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); gtk_widget_set_can_focus (GTK_WIDGET (secondary_label), FALSE); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_label_set_max_width_chars (GTK_LABEL (secondary_label), 72); +#endif hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); @@ -733,6 +739,10 @@ gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5); #endif gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE); + gtk_widget_set_can_focus (GTK_WIDGET (primary_label), FALSE); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_label_set_max_width_chars (GTK_LABEL (primary_label), 72); +#endif if (priv->disable_save_to_disk) str = g_strdup_printf ( @@ -766,11 +776,16 @@ gtk_box_pack_start (GTK_BOX (vbox2), select_label, FALSE, FALSE, 0); gtk_label_set_line_wrap (GTK_LABEL (select_label), TRUE); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_label_set_max_width_chars (GTK_LABEL (select_label), 72); +#endif #if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (select_label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (select_label), 0.0, 0.5); #endif + gtk_label_set_selectable (GTK_LABEL (select_label), TRUE); + gtk_widget_set_can_focus (GTK_WIDGET (select_label), FALSE); scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_box_pack_start (GTK_BOX (vbox2), scrolledwindow, TRUE, TRUE, 0); @@ -798,6 +813,10 @@ gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5); #endif gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); + gtk_widget_set_can_focus (GTK_WIDGET (secondary_label), FALSE); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_label_set_max_width_chars (GTK_LABEL (secondary_label), 72); +#endif gtk_label_set_mnemonic_widget (GTK_LABEL (select_label), treeview); diff -Nru pluma-1.16.0/pluma/Makefile.am pluma-1.16.2/pluma/Makefile.am --- pluma-1.16.0/pluma/Makefile.am 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/pluma/Makefile.am 2017-05-05 08:51:08.000000000 +0000 @@ -11,7 +11,6 @@ -I$(srcdir)/smclient \ $(PLUMA_CFLAGS) \ $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" diff -Nru pluma-1.16.0/pluma/pluma.c pluma-1.16.2/pluma/pluma.c --- pluma-1.16.0/pluma/pluma.c 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/pluma/pluma.c 2017-05-05 08:51:08.000000000 +0000 @@ -514,6 +514,10 @@ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); +#if GTK_CHECK_VERSION (3, 0, 0) + gdk_set_allowed_backends ("x11"); +#endif + startup_timestamp = get_startup_timestamp(); /* Setup command line options */ diff -Nru pluma-1.16.0/pluma/pluma-document.c pluma-1.16.2/pluma/pluma-document.c --- pluma-1.16.0/pluma/pluma-document.c 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/pluma/pluma-document.c 2017-05-05 08:51:08.000000000 +0000 @@ -554,8 +554,6 @@ * @create: whether the document should be created if it doesn't exist. * * The "load" signal is emitted when a document is loaded. - * - * Since: 2.22 */ document_signals[LOAD] = g_signal_new ("load", @@ -605,8 +603,6 @@ * @flags: the #PlumaDocumentSaveFlags for the save operation. * * The "save" signal is emitted when the document is saved. - * - * Since: 2.20 */ document_signals[SAVE] = g_signal_new ("save", diff -Nru pluma-1.16.0/pluma/pluma-message-bus.c pluma-1.16.2/pluma/pluma-message-bus.c --- pluma-1.16.0/pluma/pluma-message-bus.c 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/pluma/pluma-message-bus.c 2017-05-05 08:51:08.000000000 +0000 @@ -88,9 +88,6 @@ * NULL); * * - * - * Since: 2.25.3 - * */ #define PLUMA_MESSAGE_BUS_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), PLUMA_TYPE_MESSAGE_BUS, PlumaMessageBusPrivate)) diff -Nru pluma-1.16.0/pluma/pluma-message.c pluma-1.16.2/pluma/pluma-message.c --- pluma-1.16.0/pluma/pluma-message.c 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/pluma/pluma-message.c 2017-05-05 08:51:08.000000000 +0000 @@ -17,9 +17,6 @@ * A message can be seen as a method call, or signal emission depending on * who is the sender and who is the receiver. There is no explicit distinction * between methods and signals. - * - * Since: 2.25.3 - * */ #define PLUMA_MESSAGE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), PLUMA_TYPE_MESSAGE, PlumaMessagePrivate)) diff -Nru pluma-1.16.0/pluma/pluma-message-type.c pluma-1.16.2/pluma/pluma-message-type.c --- pluma-1.16.0/pluma/pluma-message-type.c 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/pluma/pluma-message-type.c 2017-05-05 08:51:08.000000000 +0000 @@ -33,9 +33,6 @@ * NULL); * * - * - * Since: 2.25.3 - * */ typedef struct { diff -Nru pluma-1.16.0/pluma/pluma-view.c pluma-1.16.2/pluma/pluma-view.c --- pluma-1.16.0/pluma/pluma-view.c 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/pluma/pluma-view.c 2017-05-05 08:51:08.000000000 +0000 @@ -2069,13 +2069,16 @@ pluma_view_button_press_event (GtkWidget *widget, GdkEventButton *event) { if ((event->type == GDK_BUTTON_PRESS) && - (event->button == 3) && (event->window == gtk_text_view_get_window (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_LEFT))) { - show_line_numbers_menu (widget, event); - - return TRUE; + if (event->button == 3) + { + show_line_numbers_menu (widget, event); + return TRUE; + } + else if (event->button == 2) + return TRUE; } return GTK_WIDGET_CLASS (pluma_view_parent_class)->button_press_event (widget, event); diff -Nru pluma-1.16.0/README pluma-1.16.2/README --- pluma-1.16.0/README 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/README 2017-05-05 08:51:08.000000000 +0000 @@ -117,18 +117,8 @@ Patches ======= -Patches should also be submitted to github.com/mate-desktop/pluma. If the patch -fixes an existing bug, add the patch as an attachment to that bug -report. - -Otherwise, enter a new bug report that describes the patch, and attach -the patch to that bug report. - -Patches should be in unified diff form. (The -u option to GNU diff.) - -If you are interested in helping us to develop pluma, please see the -file 'AUTHOR' for contact information and/or send a message to the pluma -mailing list. See also the file 'HACKING' for more detailed information. +Patches should also be submitted to https://github.com/mate-desktop/pluma, +preferably via pull requests. The pluma team. diff -Nru pluma-1.16.0/tools/plugin_template/Makefile.am pluma-1.16.2/tools/plugin_template/Makefile.am --- pluma-1.16.0/tools/plugin_template/Makefile.am 2016-09-19 06:06:53.000000000 +0000 +++ pluma-1.16.2/tools/plugin_template/Makefile.am 2017-05-05 08:51:08.000000000 +0000 @@ -6,7 +6,6 @@ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) \ -DPLUMA_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" plugin_LTLIBRARIES = lib##(PLUGIN_MODULE).la