Hello community, here is the log from the commit of package xreader for openSUSE:Factory checked in at 2017-06-22 10:40:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xreader (Old) and /work/SRC/openSUSE:Factory/.xreader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xreader" Thu Jun 22 10:40:53 2017 rev:10 rq:505547 version:1.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/xreader/xreader.changes 2017-05-27 13:13:21.969908513 +0200 +++ /work/SRC/openSUSE:Factory/.xreader.new/xreader.changes 2017-06-22 10:40:59.688531708 +0200 @@ -1,0 +2,12 @@ +Wed Jun 21 16:11:48 UTC 2017 - sor.ale...@meowr.ru + +- Update to version 1.4.3: + * shell: Make main window title translatable + (gh#linuxmint/xreader#39). + * Fix "Having selected text leads to high cpu load". + * Fix for "Inverted Colours won't be saved by Save Current + Settings as Default" + * Build: Remove unnecessary ev_get_locale_dir(). + * Branding: Use a generic application name. + +------------------------------------------------------------------- Old: ---- xreader-1.4.2.tar.gz New: ---- xreader-1.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xreader.spec ++++++ --- /var/tmp/diff_new_pack.aMA2Ra/_old 2017-06-22 10:41:00.376434719 +0200 +++ /var/tmp/diff_new_pack.aMA2Ra/_new 2017-06-22 10:41:00.380434156 +0200 @@ -20,7 +20,7 @@ %define typelib1 typelib-1_0-XreaderDocument-1_5_0 %define typelib2 typelib-1_0-XreaderView-1_5_0 Name: xreader -Version: 1.4.2 +Version: 1.4.3 Release: 0 Summary: Document viewer for documents like PDF/PostScript License: GPL-2.0 and LGPL-2.0 ++++++ xreader-1.4.2.tar.gz -> xreader-1.4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/backend/comics/Makefile.am new/xreader-1.4.3/backend/comics/Makefile.am --- old/xreader-1.4.2/backend/comics/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/backend/comics/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/libdocument \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DXREADER_COMPILATION \ $(BACKEND_CFLAGS) \ $(LIB_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/backend/djvu/Makefile.am new/xreader-1.4.3/backend/djvu/Makefile.am --- old/xreader-1.4.2/backend/djvu/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/backend/djvu/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -2,7 +2,7 @@ -I$(top_srcdir) \ -I$(top_srcdir)/libdocument \ -DMATEICONDIR=\""${prefix}/${DATADIRNAME}/pixmaps"\" \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DXREADER_COMPILATION \ $(BACKEND_CFLAGS) \ $(DJVU_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/backend/dvi/Makefile.am new/xreader-1.4.3/backend/dvi/Makefile.am --- old/xreader-1.4.2/backend/dvi/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/backend/dvi/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -4,7 +4,7 @@ -I$(top_srcdir) \ -I$(top_srcdir)/libdocument \ -I$(srcdir)/mdvi-lib \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DXREADER_COMPILATION \ $(WARN_CFLAGS) \ $(BACKEND_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/backend/epub/Makefile.am new/xreader-1.4.3/backend/epub/Makefile.am --- old/xreader-1.4.2/backend/epub/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/backend/epub/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -4,7 +4,7 @@ -I$(top_srcdir) \ -I$(top_srcdir)/libdocument \ -I$(srcdir)/minizip \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DXREADER_COMPILATION \ $(BACKEND_CFLAGS) \ $(WARN_CXXFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/backend/pdf/Makefile.am new/xreader-1.4.3/backend/pdf/Makefile.am --- old/xreader-1.4.2/backend/pdf/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/backend/pdf/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/libdocument \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DXREADER_COMPILATION \ $(BACKEND_CFLAGS) \ $(POPPLER_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/backend/pixbuf/Makefile.am new/xreader-1.4.3/backend/pixbuf/Makefile.am --- old/xreader-1.4.2/backend/pixbuf/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/backend/pixbuf/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/libdocument \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DXREADER_COMPILATION \ $(BACKEND_CFLAGS) \ $(WARN_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/backend/ps/Makefile.am new/xreader-1.4.3/backend/ps/Makefile.am --- old/xreader-1.4.2/backend/ps/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/backend/ps/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/libdocument \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DXREADER_COMPILATION \ $(BACKEND_CFLAGS) \ $(SPECTRE_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/backend/tiff/Makefile.am new/xreader-1.4.3/backend/tiff/Makefile.am --- old/xreader-1.4.2/backend/tiff/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/backend/tiff/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/libdocument \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DXREADER_COMPILATION \ $(BACKEND_CFLAGS) \ $(WARN_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/backend/xps/Makefile.am new/xreader-1.4.3/backend/xps/Makefile.am --- old/xreader-1.4.2/backend/xps/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/backend/xps/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -1,7 +1,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/libdocument \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DXREADER_COMPILATION \ $(BACKEND_CFLAGS) \ $(WARN_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/configure.ac new/xreader-1.4.3/configure.ac --- old/xreader-1.4.2/configure.ac 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/configure.ac 2017-06-19 13:43:57.000000000 +0200 @@ -4,7 +4,7 @@ m4_define([ev_major_version], [1]) m4_define([ev_minor_version], [4]) -m4_define([ev_micro_version], [2]) +m4_define([ev_micro_version], [3]) m4_define([ev_extra_version], []) m4_define([ev_version], [ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/debian/changelog new/xreader-1.4.3/debian/changelog --- old/xreader-1.4.2/debian/changelog 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/debian/changelog 2017-06-19 13:43:57.000000000 +0200 @@ -1,3 +1,16 @@ +xreader (1.4.3) sonya; urgency=medium + + [ Piiit ] + * shell: Make main window title translatable (fix issue #39) (#138) + * Fixes "Having selected text leads to high cpu load" (#140) + * Fix for 'Inverted Colors won't be saved by Save Current Settings as Default' (#142) + + [ Clement Lefebvre ] + * Build: Remove unnecessary ev_get_locale_dir() + * Branding: Use a generic app name + + -- Clement Lefebvre <r...@linuxmint.com> Mon, 19 Jun 2017 13:43:22 +0200 + xreader (1.4.2) sonya; urgency=medium [ Clement Lefebvre ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/help/reference/libdocument/Makefile.am new/xreader-1.4.3/help/reference/libdocument/Makefile.am --- old/xreader-1.4.2/help/reference/libdocument/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/help/reference/libdocument/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -98,7 +98,7 @@ -DXREADERDATADIR=\"$(pkgdatadir)\" \ -DMATEDATADIR=\"$(datadir)\" \ -DXREADER_UIDIR=\"$(pkgdatadir)\" \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DEV_BACKENDSDIR=\"$(backenddir)\" \ -DXREADER_COMPILATION \ $(AM_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/help/reference/libview/Makefile.am new/xreader-1.4.3/help/reference/libview/Makefile.am --- old/xreader-1.4.2/help/reference/libview/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/help/reference/libview/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -104,7 +104,7 @@ -DXREADERDATADIR=\"$(pkgdatadir)\" \ -DMATEDATADIR=\"$(datadir)\" \ -DXREADER_UIDIR=\"$(pkgdatadir)\" \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DEV_BACKENDSDIR=\"$(backenddir)\" \ -DXREADER_COMPILATION \ $(AM_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/help/reference/shell/Makefile.am new/xreader-1.4.3/help/reference/shell/Makefile.am --- old/xreader-1.4.2/help/reference/shell/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/help/reference/shell/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -99,7 +99,7 @@ -I$(top_builddir)/libview \ -DXREADERDATADIR=\"$(pkgdatadir)\" \ -DMATEDATADIR=\"$(datadir)\" \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DMATEICONDIR=\""$(datadir)/pixmaps"\" \ -DXREADER_COMPILATION \ $(SHELL_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/libdocument/Makefile.am new/xreader-1.4.3/libdocument/Makefile.am --- old/xreader-1.4.2/libdocument/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/libdocument/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -94,7 +94,7 @@ libxreaderdocument_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"XreaderDocument\" \ -DXREADER_UIDIR=\"$(pkgdatadir)\" \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DEV_BACKENDSDIR=\"$(backenddir)\" \ -DEV_BACKENDSBINARYVERSION=\"$(backend_binary_version)\" \ -DXREADER_COMPILATION \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/libdocument/ev-document-misc.c new/xreader-1.4.3/libdocument/ev-document-misc.c --- old/xreader-1.4.2/libdocument/ev-document-misc.c 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/libdocument/ev-document-misc.c 2017-06-19 13:43:57.000000000 +0200 @@ -144,9 +144,11 @@ GtkStateFlags state = gtk_widget_get_state_flags (widget); GdkRGBA fg, bg, shade_bg; + gtk_style_context_save (context); gtk_style_context_get_background_color (context, state, &bg); gtk_style_context_get_color (context, state, &fg); gtk_style_context_get_color (context, state, &shade_bg); + gtk_style_context_restore (context); shade_bg.alpha *= 0.5; gdk_cairo_set_source_rgba (cr, highlight ? &fg : &shade_bg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/libdocument/ev-document.h new/xreader-1.4.3/libdocument/ev-document.h --- old/xreader-1.4.2/libdocument/ev-document.h 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/libdocument/ev-document.h 2017-06-19 13:43:57.000000000 +0200 @@ -277,7 +277,7 @@ }; \ \ /* Initialise the i18n stuff */ \ - bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); \ + bindtextdomain (GETTEXT_PACKAGE, XREADER_LOCALE_DIR); \ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); \ \ g_define_type_id = g_type_module_register_type (module, \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/libdocument/ev-init.c new/xreader-1.4.3/libdocument/ev-init.c --- old/xreader-1.4.2/libdocument/ev-init.c 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/libdocument/ev-init.c 2017-06-19 13:43:57.000000000 +0200 @@ -29,12 +29,6 @@ static int ev_init_count; -const gchar * -ev_get_locale_dir (void) -{ - return MATELOCALEDIR; -} - /** * ev_init: * @@ -55,7 +49,7 @@ return have_backends; /* set up translation catalog */ - bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir ()); + bindtextdomain (GETTEXT_PACKAGE, XREADER_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); _ev_debug_init (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/libdocument/ev-init.h new/xreader-1.4.3/libdocument/ev-init.h --- old/xreader-1.4.2/libdocument/ev-init.h 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/libdocument/ev-init.h 2017-06-19 13:43:57.000000000 +0200 @@ -28,8 +28,6 @@ G_BEGIN_DECLS -const gchar* ev_get_locale_dir (void); - gboolean ev_init (void); void ev_shutdown (void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/libview/Makefile.am new/xreader-1.4.3/libview/Makefile.am --- old/xreader-1.4.2/libview/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/libview/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -54,7 +54,7 @@ libxreaderview_la_CPPFLAGS = \ -DXREADERDATADIR=\"$(pkgdatadir)\" \ -DG_LOG_DOMAIN=\"XreaderView\" \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DXREADER_COMPILATION \ -I$(top_srcdir) \ -I$(top_srcdir)/libdocument \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/libview/ev-pixbuf-cache.c new/xreader-1.4.3/libview/ev-pixbuf-cache.c --- old/xreader-1.4.2/libview/ev-pixbuf-cache.c 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/libview/ev-pixbuf-cache.c 2017-06-19 13:43:57.000000000 +0200 @@ -633,6 +633,8 @@ state |= gtk_widget_has_focus (widget) ? GTK_STATE_FLAG_SELECTED : GTK_STATE_FLAG_ACTIVE; + gtk_style_context_save (context); + gtk_style_context_get_color (context, state, &fg); text->pixel = 0; text->red = CLAMP ((guint) (fg.red * 65535), 0, 65535); @@ -644,6 +646,8 @@ base->red = CLAMP ((guint) (bg.red * 65535), 0, 65535); base->green = CLAMP ((guint) (bg.green * 65535), 0, 65535); base->blue = CLAMP ((guint) (bg.blue * 65535), 0, 65535); + + gtk_style_context_restore (context); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/libview/ev-view.c new/xreader-1.4.3/libview/ev-view.c --- old/xreader-1.4.2/libview/ev-view.c 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/libview/ev-view.c 2017-06-19 13:43:57.000000000 +0200 @@ -4284,7 +4284,9 @@ GdkRGBA color; context = gtk_widget_get_style_context (GTK_WIDGET (view)); + gtk_style_context_save (context); gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &color); + gtk_style_context_restore (context); cairo_save (cr); cairo_set_source_rgba (cr, color.red, color.green, color.blue, alpha); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/libview/ev-web-view.c new/xreader-1.4.3/libview/ev-web-view.c --- old/xreader-1.4.2/libview/ev-web-view.c 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/libview/ev-web-view.c 2017-06-19 13:43:57.000000000 +0200 @@ -252,7 +252,10 @@ EvWebView *webview) { EvDocument *document = ev_document_model_get_document(model); - + + if (!document || !document->iswebdocument) + return; + if (ev_document_model_get_inverted_colors(model) == TRUE) { if (document == NULL) { ev_document_model_set_inverted_colors(model,FALSE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/previewer/Makefile.am new/xreader-1.4.3/previewer/Makefile.am --- old/xreader-1.4.2/previewer/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/previewer/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -10,6 +10,7 @@ xreader_previewer_CPPFLAGS = \ -DXREADERDATADIR=\"$(pkgdatadir)\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/libdocument \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/previewer/ev-previewer.c new/xreader-1.4.3/previewer/ev-previewer.c --- old/xreader-1.4.2/previewer/ev-previewer.c 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/previewer/ev-previewer.c 2017-06-19 13:43:57.000000000 +0200 @@ -99,7 +99,7 @@ #ifdef ENABLE_NLS /* Initialize the i18n stuff */ - bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir()); + bindtextdomain (GETTEXT_PACKAGE, XREADER_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/properties-caja/Makefile.am new/xreader-1.4.3/properties-caja/Makefile.am --- old/xreader-1.4.2/properties-caja/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/properties-caja/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS= \ -DXREADERDATADIR=\"$(pkgdatadir)\" \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -I$(top_srcdir) \ -I$(top_builddir) \ $(FRONTEND_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/properties-nemo/Makefile.am new/xreader-1.4.3/properties-nemo/Makefile.am --- old/xreader-1.4.2/properties-nemo/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/properties-nemo/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS= \ -DXREADERDATADIR=\"$(pkgdatadir)\" \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -I$(top_srcdir) \ -I$(top_builddir) \ $(FRONTEND_CFLAGS) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/shell/Makefile.am new/xreader-1.4.3/shell/Makefile.am --- old/xreader-1.4.2/shell/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/shell/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -1,5 +1,6 @@ AM_CPPFLAGS= \ -DXREADERDATADIR=\"$(pkgdatadir)\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DMATEDATADIR=\"$(datadir)\" \ -I$(top_srcdir) \ -I$(top_builddir) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/shell/main.c new/xreader-1.4.3/shell/main.c --- old/xreader-1.4.2/shell/main.c 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/shell/main.c 2017-06-19 13:43:57.000000000 +0200 @@ -36,7 +36,6 @@ #include "eggsmclient.h" #include "eggdesktopfile.h" - static gchar *ev_page_label; static gchar *ev_find_string; static gint ev_page_index = 0; @@ -55,9 +54,10 @@ gpointer data, GError **error) { - g_print ("%s %s\n", _("MATE Document Viewer"), VERSION); - + g_print ("%s %s\n", g_get_application_name(), VERSION); exit (0); + + /* Keep compiler quiet */ return FALSE; } @@ -229,14 +229,14 @@ #ifdef ENABLE_NLS /* Initialize the i18n stuff */ - bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir()); + bindtextdomain (GETTEXT_PACKAGE, XREADER_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); #endif gdk_set_allowed_backends ("x11"); - context = g_option_context_new (N_("MATE Document Viewer")); + context = g_option_context_new (N_("Document Viewer")); g_option_context_set_translation_domain(context, GETTEXT_PACKAGE); g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE); g_option_context_add_group (context, egg_sm_client_get_option_group ()); @@ -264,7 +264,8 @@ ev_stock_icons_init (); - egg_set_desktop_file (MATEDATADIR "/applications/xreader.desktop"); + gtk_window_set_default_icon_name ("accessories-document-viewer"); + g_set_application_name (_("Document Viewer")); ev_application_load_session (EV_APP); load_files (file_arguments); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/thumbnailer/Makefile.am new/xreader-1.4.3/thumbnailer/Makefile.am --- old/xreader-1.4.2/thumbnailer/Makefile.am 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/thumbnailer/Makefile.am 2017-06-19 13:43:57.000000000 +0200 @@ -9,7 +9,7 @@ -DXREADERDATADIR=\"$(pkgdatadir)\" \ -I$(top_srcdir) \ -I$(top_builddir) \ - -DMATELOCALEDIR=\"$(datadir)/locale\" \ + -DXREADER_LOCALE_DIR=\"$(datadir)/locale\" \ -DMATEICONDIR=\""$(datadir)/pixmaps"\" \ $(AM_CPPFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xreader-1.4.2/xreader.pot new/xreader-1.4.3/xreader.pot --- old/xreader-1.4.2/xreader.pot 2017-05-23 15:06:02.000000000 +0200 +++ new/xreader-1.4.3/xreader.pot 2017-06-19 13:43:57.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-05 13:04+0100\n" +"POT-Creation-Date: 2017-06-19 13:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -431,6 +431,7 @@ msgstr "" #: ../data/xreader.desktop.in.in.h:1 ../shell/ev-window-title.c:157 +#: ../shell/main.c:239 ../shell/main.c:268 msgid "Document Viewer" msgstr "" @@ -1682,10 +1683,6 @@ msgid "By extension" msgstr "" -#: ../shell/main.c:58 ../shell/main.c:239 -msgid "MATE Document Viewer" -msgstr "" - #: ../shell/main.c:66 msgid "The page label of the document to display." msgstr ""