Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xviewer-plugins for openSUSE:Factory checked in at 2022-05-05 23:07:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xviewer-plugins (Old) and /work/SRC/openSUSE:Factory/.xviewer-plugins.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xviewer-plugins" Thu May 5 23:07:38 2022 rev:6 rq:975240 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xviewer-plugins/xviewer-plugins.changes 2016-11-15 17:59:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xviewer-plugins.new.1538/xviewer-plugins.changes 2022-05-05 23:08:24.141707768 +0200 @@ -1,0 +2,11 @@ +Sun May 1 12:34:06 UTC 2022 - Ferdinand Thiessen <r...@fthiessen.de> + +- Update to version 1.4.1 + * Remove fit-to-width plugin, is now supported by native + xviewer 3.2.1 +- Update to version 1.4.0 + * Update map plugin + * Fix send-by-mail + * Use symbolic icons + +------------------------------------------------------------------- Old: ---- xviewer-plugins-1.2.0.tar.gz New: ---- xviewer-plugins-1.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xviewer-plugins.spec ++++++ --- /var/tmp/diff_new_pack.zWcpwc/_old 2022-05-05 23:08:24.593708332 +0200 +++ /var/tmp/diff_new_pack.zWcpwc/_new 2022-05-05 23:08:24.597708337 +0200 @@ -1,7 +1,7 @@ # # spec file for package xviewer-plugins # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define _name xviewer Name: xviewer-plugins -Version: 1.2.0 +Version: 1.4.1 Release: 0 -# FIXME: Add postr BuildRequires when we have a package. Summary: A collection of plugins for xviewer -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Graphics/Viewers -Url: https://github.com/linuxmint/xviewer-plugins +URL: https://github.com/linuxmint/xviewer-plugins Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.SUSE BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: pkgconfig -BuildRequires: python3 >= 3.2 +BuildRequires: python3 BuildRequires: pkgconfig(champlain-gtk-0.12) >= 0.9.0 BuildRequires: pkgconfig(clutter-gtk-1.0) >= 1.1.2 BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 @@ -44,7 +43,6 @@ Recommends: %{name}-lang Suggests: %{_name}-plugin-exif-display Suggests: %{_name}-plugin-exif-export-to-folder -Suggests: %{_name}-plugin-exif-fit-to-width Suggests: %{_name}-plugin-exif-light-theme Suggests: %{_name}-plugin-exif-map Suggests: %{_name}-plugin-exif-postasa @@ -84,15 +82,6 @@ %description -n %{_name}-plugin-export-to-folder xviewer export to directory plugin -%package -n %{_name}-plugin-fit-to-width -Summary: Xviewer fit to width plugin -Group: Productivity/Graphics/Viewers -Requires: %{name}-data = %{version} -Provides: %{_name}-plugins:%{_libdir}/%{_name}/plugins/fit-to-width.plugin - -%description -n %{_name}-plugin-fit-to-width -xviewer fit to width plugin - %package -n %{_name}-plugin-light-theme Summary: Xviewer light-theme plugin Group: Productivity/Graphics/Viewers @@ -178,12 +167,6 @@ %postun -n %{_name}-plugin-export-to-folder %glib2_gsettings_schema_post -%post -n %{_name}-plugin-fit-to-width -%glib2_gsettings_schema_post - -%postun -n %{_name}-plugin-fit-to-width -%glib2_gsettings_schema_post - %post -n %{_name}-plugin-pythonconsole %glib2_gsettings_schema_post @@ -226,15 +209,6 @@ %dir %{_datadir}/appdata/ %{_datadir}/appdata/%{_name}-export-to-folder.metainfo.xml -%files -n %{_name}-plugin-fit-to-width -%defattr(-,root,root) -%dir %{_libdir}/%{_name}/ -%dir %{_libdir}/%{_name}/plugins/ -%{_libdir}/%{_name}/plugins/fit-to-width.plugin -%{_libdir}/%{_name}/plugins/libfit-to-width.so -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/%{_name}-fit-to-width.metainfo.xml - %files -n %{_name}-plugin-light-theme %defattr(-,root,root) %dir %{_libdir}/%{_name}/ ++++++ xviewer-plugins-1.2.0.tar.gz -> xviewer-plugins-1.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/.circleci/config.yml new/xviewer-plugins-1.4.1/.circleci/config.yml --- old/xviewer-plugins-1.2.0/.circleci/config.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/xviewer-plugins-1.4.1/.circleci/config.yml 2021-11-29 11:14:04.000000000 +0100 @@ -0,0 +1,65 @@ +version: 2.0 + +shared: &shared + + steps: + + - checkout + + - run: + name: Prepare environment + command: apt-get update + + - run: + name: Install dependencies + command: | + wget https://github.com/linuxmint/xapps/releases/download/master.${CIRCLE_JOB}/packages.tar.gz -O xapps.tar.gz + wget https://github.com/linuxmint/xviewer/releases/download/master.${CIRCLE_JOB}/packages.tar.gz -O xviewer.tar.gz + ls *.tar.gz | xargs -i tar zxvf {} + apt install --yes --allow-downgrades ./packages/*.deb + rm -rf packages + + - run: + name: Build project + command: mint-build -i + + - run: + name: Prepare packages + command: | + if [ -z $CI_PULL_REQUEST ]; then + mkdir /packages + mv /root/*.deb /packages/ + git log > /packages/git.log + cd / + tar zcvf packages.tar.gz packages + fi + + - run: + name: Deploy packages to Github + command: | + if [ -z $CI_PULL_REQUEST ]; then + wget https://github.com/tcnksm/ghr/releases/download/v0.5.4/ghr_v0.5.4_linux_amd64.zip + apt-get install --yes unzip + unzip ghr_v0.5.4_linux_amd64.zip + TAG="master".$CIRCLE_JOB + ./ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME -replace $TAG /packages.tar.gz + ./ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME -recreate -b "Latest unstable packages" $TAG /packages.tar.gz + fi + +jobs: + "mint20": + <<: *shared + docker: + - image: linuxmintd/mint20-amd64 + + "lmde4": + <<: *shared + docker: + - image: linuxmintd/lmde4-amd64 + +workflows: + version: 2 + build: + jobs: + - "mint20" + - "lmde4" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/configure.ac new/xviewer-plugins-1.4.1/configure.ac --- old/xviewer-plugins-1.2.0/configure.ac 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/configure.ac 2021-11-29 11:14:04.000000000 +0100 @@ -3,7 +3,7 @@ XVIEWER_MAJOR=3.0.0 XVIEWER_PLUGINS_MAJOR=3.0.0 -AC_INIT([xviewer-plugins], [1.2.0], [http://github.com/linuxmint/xviewer-plugins/issues]) +AC_INIT([xviewer-plugins], [1.4.1], [http://github.com/linuxmint/xviewer-plugins/issues]) AC_CONFIG_SRCDIR([plugins]) AC_PREFIX_PROGRAM([xviewer]) @@ -61,9 +61,9 @@ AC_MSG_CHECKING([which plugins to build]) -ALL_PLUGINS="postr map fit-to-width exif-display send-by-mail postasa light-theme" -USEFUL_PLUGINS="postr map fit-to-width exif-display send-by-mail postasa light-theme" -DEFAULT_PLUGINS="postr map fit-to-width exif-display send-by-mail postasa light-theme" +ALL_PLUGINS="postr map exif-display send-by-mail postasa light-theme" +USEFUL_PLUGINS="postr map exif-display send-by-mail postasa light-theme" +DEFAULT_PLUGINS="postr map exif-display send-by-mail postasa light-theme" PYTHON_ALL_PLUGINS="slideshowshuffle pythonconsole export-to-folder" PYTHON_USEFUL_PLUGINS="slideshowshuffle pythonconsole export-to-folder" @@ -82,7 +82,7 @@ AC_ARG_WITH([plugins], [AS_HELP_STRING([--with-plugins=LIST], [Comma-separated list specifying the plugins to build. - Available: map, exif-display, fit-to-width, + Available: map, exif-display, postr, postasa, pythonconsole, slideshowshuffle, as well as the aliases default, all, and really-all])], @@ -336,7 +336,6 @@ Makefile plugins/Makefile plugins/map/Makefile -plugins/fit-to-width/Makefile plugins/exif-display/Makefile plugins/exif-display/org.x.viewer.plugins.exif-display.gschema.xml plugins/export-to-folder/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/debian/changelog new/xviewer-plugins-1.4.1/debian/changelog --- old/xviewer-plugins-1.2.0/debian/changelog 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/debian/changelog 2021-11-29 11:14:04.000000000 +0100 @@ -1,3 +1,28 @@ +xviewer-plugins (1.4.1) una; urgency=medium + + * Remove fit-to-width plugin + + -- Clement Lefebvre <r...@linuxmint.com> Mon, 29 Nov 2021 10:13:27 +0000 + +xviewer-plugins (1.4.0) una; urgency=medium + + [ Clement Lefebvre ] + * Add CI configuration + * Packaging: Add missing dh-python to build-deps + * Packaging: Don't build postr plugin + * CI: Update targets + + [ cat_in_136 ] + * Update map plugin (#7) + + [ Oliver K??stner ] + * Fix send-by-mail (#9) + + [ Clement Lefebvre ] + * Use symbolic icons + + -- Clement Lefebvre <r...@linuxmint.com> Wed, 24 Nov 2021 13:21:02 +0000 + xviewer-plugins (1.2.0) serena; urgency=medium * Removed hide-titlebar plugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/debian/control new/xviewer-plugins-1.4.1/debian/control --- old/xviewer-plugins-1.2.0/debian/control 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/debian/control 2021-11-29 11:14:04.000000000 +0100 @@ -6,6 +6,7 @@ gnome-pkg-tools (>= 0.11), debhelper (>= 8), dh-autoreconf, + dh-python, autotools-dev, intltool (>= 0.40.0), libglib2.0-dev (>= 2.32.0), @@ -13,7 +14,6 @@ libpeas-dev (>= 0.7.4), xviewer-dev, python3 (>= 3.2), - postr, libgdata-dev (>= 0.6), libchamplain-0.12-dev, libchamplain-gtk-0.12-dev, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/exif-display/exif-display.plugin.desktop.in new/xviewer-plugins-1.4.1/plugins/exif-display/exif-display.plugin.desktop.in --- old/xviewer-plugins-1.2.0/plugins/exif-display/exif-display.plugin.desktop.in 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/exif-display/exif-display.plugin.desktop.in 2021-11-29 11:14:04.000000000 +0100 @@ -2,7 +2,7 @@ Module=exif-display IAge=2 _Name=Exif Display -Icon=zoom-fit-best +Icon=zoom-fit-best-symbolic _Description=Displays camera settings and histogram Authors=Emmanuel Touzery Copyright=Copyright ?? 2009 Emmanuel Touzery diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/export-to-folder/export-to-folder.plugin.desktop.in new/xviewer-plugins-1.4.1/plugins/export-to-folder/export-to-folder.plugin.desktop.in --- old/xviewer-plugins-1.2.0/plugins/export-to-folder/export-to-folder.plugin.desktop.in 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/export-to-folder/export-to-folder.plugin.desktop.in 2021-11-29 11:14:04.000000000 +0100 @@ -3,7 +3,7 @@ Module=export-to-folder IAge=2 _Name=Export to Folder -Icon=xviewer +Icon=folder-symbolic _Description=Export the current image to a separate directory Authors=Jendrik Seipp <jendrikse...@web.de> Copyright=Copyright ?? 2012 Jendrik Seipp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/fit-to-width/Makefile.am new/xviewer-plugins-1.4.1/plugins/fit-to-width/Makefile.am --- old/xviewer-plugins-1.2.0/plugins/fit-to-width/Makefile.am 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/fit-to-width/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -# Fit-to-width plugin -plugindir = $(libdir)/xviewer/plugins -appstreamdir = $(datadir)/appdata - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - $(XVIEWER_CFLAGS) \ - $(WARN_CFLAGS) \ - -DXVIEWER_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" - -plugin_LTLIBRARIES = libfit-to-width.la - -libfit_to_width_la_SOURCES = \ - xviewer-fit-to-width-plugin.h \ - xviewer-fit-to-width-plugin.c - -libfit_to_width_la_LDFLAGS = \ - -avoid-version -module - -libfit_to_width_la_LIBADD = $(XVIEWER_LIBS) - -# Plugin Info - -plugin_in_files = fit-to-width.plugin.desktop.in - -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - -plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) - -appstream_in_files = xviewer-fit-to-width.metainfo.xml.in - -appstream_DATA = $(appstream_in_files:.xml.in=.xml) -@INTLTOOL_XML_RULE@ - -EXTRA_DIST = $(plugin_in_files) $(appstream_in_files) - -CLEANFILES = $(plugin_DATA) $(appstream_DATA) -DISTCLEANFILES = $(plugin_DATA) $(appstream_DATA) - --include $(top_srcdir)/git.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/fit-to-width/fit-to-width.plugin.desktop.in new/xviewer-plugins-1.4.1/plugins/fit-to-width/fit-to-width.plugin.desktop.in --- old/xviewer-plugins-1.2.0/plugins/fit-to-width/fit-to-width.plugin.desktop.in 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/fit-to-width/fit-to-width.plugin.desktop.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -[Plugin] -Module=fit-to-width -IAge=2 -_Name=Zoom to Fit Image Width -Icon=gtk-zoom-fit -_Description=Fit images to the window width -Authors=Javier S??nchez <jsanc...@deskblue.com> -Copyright=Copyright ?? 2009 Javier S??nchez -Website=http://github.com/linuxmint/xviewer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/fit-to-width/xviewer-fit-to-width-plugin.c new/xviewer-plugins-1.4.1/plugins/fit-to-width/xviewer-fit-to-width-plugin.c --- old/xviewer-plugins-1.2.0/plugins/fit-to-width/xviewer-fit-to-width-plugin.c 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/fit-to-width/xviewer-fit-to-width-plugin.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,236 +0,0 @@ -/* Fit-to-width -- Fit zoom to the image width - * - * Copyright (C) 2009 The Free Software Foundation - * - * Author: Javier S??nchez <jsanc...@deskblue.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <glib/gi18n-lib.h> -#include <xviewer/xviewer-scroll-view.h> -#include <xviewer/xviewer-image.h> -#include <xviewer/xviewer-window.h> -#include <xviewer/xviewer-window-activatable.h> - -#include <libpeas/peas.h> - -#include "xviewer-fit-to-width-plugin.h" - - -static void -xviewer_window_activatable_iface_init (XviewerWindowActivatableInterface *iface); - -G_DEFINE_DYNAMIC_TYPE_EXTENDED (XviewerFitToWidthPlugin, xviewer_fit_to_width_plugin, - PEAS_TYPE_EXTENSION_BASE, 0, - G_IMPLEMENT_INTERFACE_DYNAMIC (XVIEWER_TYPE_WINDOW_ACTIVATABLE, - xviewer_window_activatable_iface_init)) - -enum { - PROP_0, - PROP_WINDOW -}; - -static void -fit_to_width_cb (GtkAction *action, XviewerWindow *window) -{ - GtkWidget *view; - XviewerImage *image; - gint image_width; - gint image_height; - gint view_width; - double zoom; - GtkAllocation allocation; - - - g_return_if_fail (XVIEWER_IS_WINDOW (window)); - - view = xviewer_window_get_view (window); - image = xviewer_window_get_image (window); - - g_return_if_fail (XVIEWER_IS_SCROLL_VIEW (view)); - g_return_if_fail (XVIEWER_IS_IMAGE (image)); - - xviewer_image_get_size (image, &image_width, &image_height); - gtk_widget_get_allocation (view, &allocation); - view_width = allocation.width; - - // HACK: It's necessary subtract the width size (15) of vscrollbar - // to scrollview for obtain the display area. - zoom = (double) (view_width - 15) / image_width; - - xviewer_scroll_view_set_zoom (XVIEWER_SCROLL_VIEW (view), zoom); -} - -static const gchar * const ui_definition = - "<ui><menubar name=\"MainMenu\">" - "<menu action=\"View\">" - "<menuitem action=\"XviewerPluginFitToWidth\"/>" - "</menu></menubar></ui>"; - -static const GtkActionEntry action_entries[] = -{ - { "XviewerPluginFitToWidth", - "zoom-fit-best", - N_("Fit to width"), - "W", - N_("Fit the image to the window width"), - G_CALLBACK (fit_to_width_cb) } -}; - - -static void -xviewer_fit_to_width_plugin_init (XviewerFitToWidthPlugin *plugin) -{ - plugin->ui_action_group = NULL; - plugin->ui_menuitem_id = 0; -} - -static void -impl_activate (XviewerWindowActivatable *activatable) -{ - XviewerFitToWidthPlugin *plugin = XVIEWER_FIT_TO_WIDTH_PLUGIN (activatable); - GtkUIManager *manager; - - manager = xviewer_window_get_ui_manager (plugin->window); - - plugin->ui_action_group = gtk_action_group_new ("XviewerFitToWidthPluginActions"); - - gtk_action_group_set_translation_domain (plugin->ui_action_group, - GETTEXT_PACKAGE); - - gtk_action_group_add_actions (plugin->ui_action_group, - action_entries, - G_N_ELEMENTS (action_entries), - plugin->window); - - gtk_ui_manager_insert_action_group (manager, - plugin->ui_action_group, - -1); - - plugin->ui_menuitem_id = gtk_ui_manager_add_ui_from_string (manager, - ui_definition, - -1, NULL); -} - -static void -impl_deactivate (XviewerWindowActivatable *activatable) -{ - XviewerFitToWidthPlugin *plugin = XVIEWER_FIT_TO_WIDTH_PLUGIN (activatable); - GtkUIManager *manager; - - manager = xviewer_window_get_ui_manager (plugin->window); - - gtk_ui_manager_remove_ui (manager, - plugin->ui_menuitem_id); - - plugin->ui_menuitem_id = 0; - - gtk_ui_manager_remove_action_group (manager, - plugin->ui_action_group); - g_object_unref (plugin->ui_action_group); - plugin->ui_action_group = NULL; -} - -static void -xviewer_fit_to_width_plugin_dispose (GObject *object) -{ - XviewerFitToWidthPlugin *plugin = XVIEWER_FIT_TO_WIDTH_PLUGIN (object); - - if (plugin->window != NULL) { - g_object_unref (plugin->window); - plugin->window = NULL; - } - - G_OBJECT_CLASS (xviewer_fit_to_width_plugin_parent_class)->dispose (object); -} - -static void -xviewer_fit_to_width_plugin_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - XviewerFitToWidthPlugin *plugin = XVIEWER_FIT_TO_WIDTH_PLUGIN (object); - - switch (prop_id) - { - case PROP_WINDOW: - g_value_set_object (value, plugin->window); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -xviewer_fit_to_width_plugin_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - XviewerFitToWidthPlugin *plugin = XVIEWER_FIT_TO_WIDTH_PLUGIN (object); - - switch (prop_id) - { - case PROP_WINDOW: - plugin->window = XVIEWER_WINDOW (g_value_dup_object (value)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -xviewer_fit_to_width_plugin_class_init (XviewerFitToWidthPluginClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->dispose = xviewer_fit_to_width_plugin_dispose; - object_class->set_property = xviewer_fit_to_width_plugin_set_property; - object_class->get_property = xviewer_fit_to_width_plugin_get_property; - - g_object_class_override_property (object_class, PROP_WINDOW, "window"); -} - -static void -xviewer_fit_to_width_plugin_class_finalize (XviewerFitToWidthPluginClass *klass) -{ - /* Dummy needed for G_DEFINE_DYNAMIC_TYPE_EXTENDED */ -} - -static void -xviewer_window_activatable_iface_init (XviewerWindowActivatableInterface *iface) -{ - iface->activate = impl_activate; - iface->deactivate = impl_deactivate; -} - -G_MODULE_EXPORT void -peas_register_types (PeasObjectModule *module) -{ - xviewer_fit_to_width_plugin_register_type (G_TYPE_MODULE (module)); - peas_object_module_register_extension_type (module, - XVIEWER_TYPE_WINDOW_ACTIVATABLE, - XVIEWER_TYPE_FIT_TO_WIDTH_PLUGIN); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/fit-to-width/xviewer-fit-to-width-plugin.h new/xviewer-plugins-1.4.1/plugins/fit-to-width/xviewer-fit-to-width-plugin.h --- old/xviewer-plugins-1.2.0/plugins/fit-to-width/xviewer-fit-to-width-plugin.h 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/fit-to-width/xviewer-fit-to-width-plugin.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,83 +0,0 @@ -/* Fit-to-width -- Fit zoom to the image width - * - * Copyright (C) 2009 The Free Software Foundation - * - * Author: Javier S??nchez <jsanc...@deskblue.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef __XVIEWER_FIT_TO_WIDTH_PLUGIN_H__ -#define __XVIEWER_FIT_TO_WIDTH_PLUGIN_H__ - -#include <glib.h> -#include <glib-object.h> -#include <gtk/gtk.h> -#include <xviewer/xviewer-window.h> -#include <libpeas/peas-extension-base.h> -#include <libpeas/peas-object-module.h> - -G_BEGIN_DECLS - -/* - * Type checking and casting macros - */ -#define XVIEWER_TYPE_FIT_TO_WIDTH_PLUGIN (xviewer_fit_to_width_plugin_get_type ()) -#define XVIEWER_FIT_TO_WIDTH_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XVIEWER_TYPE_FIT_TO_WIDTH_PLUGIN, XviewerFitToWidthPlugin)) -#define XVIEWER_FIT_TO_WIDTH_PLUGIN_CLASS(k) G_TYPE_CHECK_CLASS_CAST((k), XVIEWER_TYPE_FIT_TO_WIDTH_PLUGIN, XviewerFitToWidthPluginClass)) -#define XVIEWER_IS_FIT_TO_WIDTH_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XVIEWER_TYPE_FIT_TO_WIDTH_PLUGIN)) -#define XVIEWER_IS_FIT_TO_WIDTH_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), XVIEWER_TYPE_FIT_TO_WIDTH_PLUGIN)) -#define XVIEWER_FIT_TO_WIDTH_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XVIEWER_TYPE_FIT_TO_WIDTH_PLUGIN, XviewerFitToWidthPluginClass)) - -/* Private structure type */ -typedef struct _XviewerFitToWidthPluginPrivate XviewerFitToWidthPluginPrivate; - -/* - * Main object structure - */ -typedef struct _XviewerFitToWidthPlugin XviewerFitToWidthPlugin; - -struct _XviewerFitToWidthPlugin -{ - PeasExtensionBase parent_instance; - - XviewerWindow *window; - - GtkActionGroup *ui_action_group; - guint ui_menuitem_id; - -}; - -/* - * Class definition - */ -typedef struct _XviewerFitToWidthPluginClass XviewerFitToWidthPluginClass; - -struct _XviewerFitToWidthPluginClass -{ - PeasExtensionBaseClass parent_class; -}; - -/* - * Public methods - */ -GType xviewer_fit_to_width_plugin_get_type (void) G_GNUC_CONST; - -/* All the plugins must implement this function */ -G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module); - -G_END_DECLS - -#endif /* __XVIEWER_FIT_TO_WIDTH_PLUGIN_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/fit-to-width/xviewer-fit-to-width.metainfo.xml.in new/xviewer-plugins-1.4.1/plugins/fit-to-width/xviewer-fit-to-width.metainfo.xml.in --- old/xviewer-plugins-1.2.0/plugins/fit-to-width/xviewer-fit-to-width.metainfo.xml.in 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/fit-to-width/xviewer-fit-to-width.metainfo.xml.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.br...@gmail.com> --> -<component type="addon"> - <id>xviewer-fit-to-width</id> - <extends>xviewer.desktop</extends> - <_name>Zoom to Fit Image Width</_name> - <_summary>Adjusts the zoom to have the image's width fit into the window</_summary> - <url type="homepage">https://github.com/linuxmint/xviewer-plugins</url> - <url type="bugtracker">https://github.com/linuxmint/xviewer-plugins/issues</url> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> - <updatecontact>i.gnatenko.br...@gmail.com</updatecontact> -</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/light-theme/light-theme.plugin.desktop.in new/xviewer-plugins-1.4.1/plugins/light-theme/light-theme.plugin.desktop.in --- old/xviewer-plugins-1.2.0/plugins/light-theme/light-theme.plugin.desktop.in 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/light-theme/light-theme.plugin.desktop.in 2021-11-29 11:14:04.000000000 +0100 @@ -2,7 +2,7 @@ Module=light-theme IAge=2 _Name=Disable Dark Theme -Icon=xviewer-plugin +Icon=preferences-color-symbolic _Description=Disables xviewer's preference of dark theme variants Authors=Felix Riemann <friem...@gnome.org> Copyright=Copyright ?? 2012 Felix Riemann diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/map/map.plugin.desktop.in new/xviewer-plugins-1.4.1/plugins/map/map.plugin.desktop.in --- old/xviewer-plugins-1.2.0/plugins/map/map.plugin.desktop.in 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/map/map.plugin.desktop.in 2021-11-29 11:14:04.000000000 +0100 @@ -2,7 +2,7 @@ Module=map IAge=2 _Name=Map -Icon=map +Icon=mark-location-symbolic _Description=Display the geolocation of the image on a map Authors=Pierre-Luc Beaudoin <pierre-...@pierlux.com> Copyright=Copyright ?? 2008, 2010 Pierre-Luc Beaudoin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/map/xviewer-map-plugin.c new/xviewer-plugins-1.4.1/plugins/map/xviewer-map-plugin.c --- old/xviewer-plugins-1.2.0/plugins/map/xviewer-map-plugin.c 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/map/xviewer-map-plugin.c 2021-11-29 11:14:04.000000000 +0100 @@ -58,17 +58,31 @@ static void update_marker_image (ChamplainLabel *marker, - GtkIconSize size) + GtkIconSize size) { GtkWidget *widget; ClutterActor *thumb; widget = gtk_button_new (); thumb = gtk_clutter_texture_new (); - gtk_clutter_texture_set_from_icon_name (GTK_CLUTTER_TEXTURE (thumb), - widget, - "gnome-mime-image", - size, NULL); + if (G_UNLIKELY (!gtk_clutter_texture_set_from_icon_name (GTK_CLUTTER_TEXTURE (thumb), + widget, + "mark-location", + size, NULL))) + { + /* mark-location doesn't appear to be a "standard" icon yet, + * so try falling back to image-x-generic as before if + * it is not available */ + if (G_UNLIKELY (!gtk_clutter_texture_set_from_icon_name (GTK_CLUTTER_TEXTURE (thumb), + widget, + "image-x-generic", + size, NULL))) + { + g_warning ("Could not load icon for map marker. " + "Please install a suitable icon theme!"); + } + } + /* don't need to unref widget because it is floating */ champlain_label_set_image (marker, thumb); @@ -251,9 +265,9 @@ "longitude", &lon, NULL); - champlain_view_center_on (CHAMPLAIN_VIEW (plugin->map), - lat, - lon); + champlain_view_go_to (CHAMPLAIN_VIEW (plugin->map), + lat, + lon); /* Reset the previous selection */ if (plugin->marker) @@ -290,9 +304,9 @@ "longitude", &lon, NULL); - champlain_view_center_on (CHAMPLAIN_VIEW (plugin->map), - lat, - lon); + champlain_view_go_to (CHAMPLAIN_VIEW (plugin->map), + lat, + lon); } static void @@ -335,6 +349,7 @@ prepared_cb (XviewerWindow *window, XviewerMapPlugin *plugin) { + GList *markers; plugin->store = xviewer_window_get_store (plugin->window); @@ -362,6 +377,17 @@ */ selection_changed_cb (XVIEWER_THUMB_VIEW (plugin->thumbview), plugin); + /* zoom in and the be sure that all markers are visible. + * This is useful to have a good starting zoom level where + * you can see a available markers on the map + */ + markers = champlain_marker_layer_get_markers (plugin->layer); + if(markers != NULL) + { + champlain_view_set_zoom_level (plugin->map, 15); + champlain_view_ensure_layers_visible (plugin->map, FALSE); + g_list_free (markers); + } } static void @@ -386,6 +412,7 @@ g_object_set (G_OBJECT (plugin->map), "zoom-level", 3, "kinetic-mode", TRUE, + "goto-animation-duration", 1000, NULL); scale = champlain_scale_new (); champlain_scale_connect_view (CHAMPLAIN_SCALE (scale), plugin->map); @@ -399,7 +426,8 @@ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); bbox = gtk_toolbar_new (); - button = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_JUMP_TO)); + button = GTK_WIDGET (gtk_tool_button_new (NULL, NULL)); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (button), "go-jump-symbolic"); gtk_widget_set_tooltip_text (button, _("Jump to current image's location")); g_signal_connect (button, "clicked", @@ -411,7 +439,8 @@ button = GTK_WIDGET (gtk_separator_tool_item_new ()); gtk_container_add (GTK_CONTAINER (bbox), button); - button = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_IN)); + button = GTK_WIDGET (gtk_tool_button_new (NULL, NULL)); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (button), "zoom-in-symbolic"); gtk_widget_set_tooltip_text (button, _("Zoom in")); g_signal_connect (button, "clicked", @@ -419,7 +448,8 @@ plugin->map); gtk_container_add (GTK_CONTAINER (bbox), button); - button = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_OUT)); + button = GTK_WIDGET (gtk_tool_button_new (NULL, NULL)); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (button), "zoom-out-symbolic"); gtk_widget_set_tooltip_text (button, _("Zoom out")); g_signal_connect (button, "clicked", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/postasa/postasa.plugin.desktop.in new/xviewer-plugins-1.4.1/plugins/postasa/postasa.plugin.desktop.in --- old/xviewer-plugins-1.2.0/plugins/postasa/postasa.plugin.desktop.in 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/postasa/postasa.plugin.desktop.in 2021-11-29 11:14:04.000000000 +0100 @@ -2,7 +2,7 @@ Module=postasa IAge=2 _Name=PicasaWeb Uploader -Icon=postasa +Icon=emblem-shared-symbolic _Description=Upload your pictures to PicasaWeb Authors=Richard Schwarting <aquari...@gmail.com> Copyright=Copyright ?? 2009 Richard Schwarting diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/postr/postr.plugin.desktop.in new/xviewer-plugins-1.4.1/plugins/postr/postr.plugin.desktop.in --- old/xviewer-plugins-1.2.0/plugins/postr/postr.plugin.desktop.in 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/postr/postr.plugin.desktop.in 2021-11-29 11:14:04.000000000 +0100 @@ -2,7 +2,7 @@ Module=postr IAge=2 _Name=Flickr Uploader -Icon=postr +Icon=emblem-shared-symbolic _Description=Upload your pictures to Flickr Authors=Lucas Rocha <luc...@gnome.org> Copyright=Copyright ?? 2007 Lucas Rocha diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/pythonconsole/pythonconsole.plugin.desktop.in new/xviewer-plugins-1.4.1/plugins/pythonconsole/pythonconsole.plugin.desktop.in --- old/xviewer-plugins-1.2.0/plugins/pythonconsole/pythonconsole.plugin.desktop.in 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/pythonconsole/pythonconsole.plugin.desktop.in 2021-11-29 11:14:04.000000000 +0100 @@ -4,7 +4,7 @@ IAge=2 _Name=Python Console _Description=Python console for xviewer -Icon=about +Icon=applications-engineering-symbolic Authors=Diego Escalante Urrelo <die...@gnome.org> Copyright=Copyright ?? 2008 Diego Escalante Urrelo Website=http://www.gnome.org/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/send-by-mail/send-by-mail.plugin.desktop.in new/xviewer-plugins-1.4.1/plugins/send-by-mail/send-by-mail.plugin.desktop.in --- old/xviewer-plugins-1.2.0/plugins/send-by-mail/send-by-mail.plugin.desktop.in 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/send-by-mail/send-by-mail.plugin.desktop.in 2021-11-29 11:14:04.000000000 +0100 @@ -2,7 +2,7 @@ Module=send-by-mail IAge=2 _Name=Send By Mail -Icon=mail-send +Icon=mail-send-symbolic _Description=Sends an image attached to a new mail Authors=Felix Riemann <friem...@gnome.org> Copyright=Copyright ?? 2009 Felix Riemann diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/send-by-mail/xviewer-send-by-mail-plugin.c new/xviewer-plugins-1.4.1/plugins/send-by-mail/xviewer-send-by-mail-plugin.c --- old/xviewer-plugins-1.2.0/plugins/send-by-mail/xviewer-send-by-mail-plugin.c 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/send-by-mail/xviewer-send-by-mail-plugin.c 2021-11-29 11:14:04.000000000 +0100 @@ -59,7 +59,7 @@ static const GtkActionEntry action_entries[] = { { "XviewerPluginSendByMail", - "mail-message-new", + "mail-message-new-symbolic", N_("Send by Mail"), NULL, N_("Send the selected images by mail"), @@ -201,8 +201,10 @@ GdkScreen *screen = NULL; GtkWidget *tview = NULL; GList *images = NULL, *image = NULL; - GString *uri = NULL; gboolean first = TRUE; + GString *attachment_str = NULL; + gchar *attachment = NULL; + gchar *argv[] = { "thunderbird", "-compose", NULL, NULL }; g_return_if_fail (XVIEWER_IS_WINDOW (window)); @@ -211,12 +213,13 @@ tview = xviewer_window_get_thumb_view (window); images = xviewer_thumb_view_get_selected_images (XVIEWER_THUMB_VIEW (tview)); - uri = g_string_new ("mailto:?attach="); + + attachment_str = g_string_new ("attachment='"); for (image = images; image != NULL; image = image->next) { XviewerImage *img = XVIEWER_IMAGE (image->data); GFile *file; - gchar *path; + gchar *file_uri; file = xviewer_image_get_file (img); if (!file) { @@ -224,23 +227,27 @@ continue; } - path = g_file_get_path (file); + file_uri = g_file_get_uri (file); if (first) { - uri = g_string_append (uri, path); + g_string_append (attachment_str, file_uri); first = FALSE; } else { - g_string_append_printf (uri, "&attach=%s", path); + g_string_append_c (attachment_str, ','); + g_string_append (attachment_str, file_uri); } - g_free (path); + g_free (file_uri); g_object_unref (file); g_object_unref (img); } - g_list_free (images); - /* TODO: Error handling/reporting? */ - gtk_show_uri (screen, uri->str, gtk_get_current_event_time (), NULL); + g_string_append_c (attachment_str, '\''); + attachment = g_string_free (attachment_str, FALSE); + argv[2] = attachment; - g_string_free (uri, TRUE); + g_spawn_async (NULL, argv, NULL, G_SPAWN_DEFAULT, NULL, NULL, NULL, NULL); + + g_free (attachment); + g_list_free (images); } G_MODULE_EXPORT void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in new/xviewer-plugins-1.4.1/plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in --- old/xviewer-plugins-1.2.0/plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in 2021-11-29 11:14:04.000000000 +0100 @@ -3,7 +3,7 @@ Module=slideshowshuffle IAge=2 _Name=Slideshow Shuffle -Icon=media-playlist-shuffle +Icon=media-playlist-shuffle-symbolic _Description=Shuffles images in slideshow mode Authors=Johannes Marbach <j...@rapidrabbit.de> Copyright=Copyright ?? 2008 Johannes Marbach diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xviewer-plugins-1.2.0/po/POTFILES.in new/xviewer-plugins-1.4.1/po/POTFILES.in --- old/xviewer-plugins-1.2.0/po/POTFILES.in 2016-11-04 16:16:35.000000000 +0100 +++ new/xviewer-plugins-1.4.1/po/POTFILES.in 2021-11-29 11:14:04.000000000 +0100 @@ -8,9 +8,6 @@ plugins/export-to-folder/export-to-folder.py [type: gettext/gsettings]plugins/export-to-folder/org.x.viewer.plugins.export-to-folder.gschema.xml.in [type: gettext/glade]plugins/export-to-folder/preferences_dialog.ui -plugins/fit-to-width/xviewer-fit-to-width.metainfo.xml.in -plugins/fit-to-width/xviewer-fit-to-width-plugin.c -plugins/fit-to-width/fit-to-width.plugin.desktop.in plugins/light-theme/xviewer-light-theme.metainfo.xml.in plugins/light-theme/light-theme.plugin.desktop.in plugins/map/xviewer-map.metainfo.xml.in