Hello community, here is the log from the commit of package liferea for openSUSE:Factory checked in at 2014-01-21 11:11:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liferea (Old) and /work/SRC/openSUSE:Factory/.liferea.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "liferea" Changes: -------- --- /work/SRC/openSUSE:Factory/liferea/liferea.changes 2014-01-16 15:11:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.liferea.new/liferea.changes 2014-01-23 15:49:01.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Jan 16 16:43:25 UTC 2014 - [email protected] + +- Update to version 1.10.5 (bnc#859043): + + sf#1056, sf#1089, sf#1098: Honor preferences when opening + links. + + sf#1096: missing installation of liferea.convert file. + + rh#947358: popup notification only for new items. + +------------------------------------------------------------------- Old: ---- liferea-1.10.4.tar.bz2 New: ---- liferea-1.10.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liferea.spec ++++++ --- /var/tmp/diff_new_pack.s1FtJX/_old 2014-01-23 15:49:02.000000000 +0100 +++ /var/tmp/diff_new_pack.s1FtJX/_new 2014-01-23 15:49:02.000000000 +0100 @@ -17,13 +17,13 @@ Name: liferea -Version: 1.10.4 +Version: 1.10.5 Release: 0 Summary: Linux Feed Reader License: GPL-2.0+ Group: Productivity/Other Url: http://liferea.sourceforge.net/ -Source: http://downloads.sourceforge.net/project/liferea/Liferea%20Stable/1.10.4/%{name}-%{version}.tar.bz2 +Source: https://github.com/lwindolf/liferea/releases/download/v1.10.5/%{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE liferea-opensuse-feeds.patch -- Add openSUSE feeds to default feeds Patch0: liferea-opensuse-feeds.patch BuildRequires: fdupes @@ -97,6 +97,7 @@ %{_datadir}/liferea/ %dir %{_datadir}/appdata %{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/GConf/gsettings/liferea.convert %{_datadir}/glib-2.0/schemas/net.sf.liferea.gschema.xml %{_datadir}/icons/hicolor/*/*/*.* %{_libdir}/%{name}/ ++++++ liferea-1.10.4.tar.bz2 -> liferea-1.10.5.tar.bz2 ++++++ ++++ 7102 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/liferea-1.10.4/ChangeLog new/liferea-1.10.5/ChangeLog --- old/liferea-1.10.4/ChangeLog 2014-01-13 22:05:44.000000000 +0100 +++ new/liferea-1.10.5/ChangeLog 2014-01-15 22:56:49.000000000 +0100 @@ -1,3 +1,15 @@ +2014-01-15 Lars Windolf <[email protected]> + + Version 1.10.5 + + * Fixes #1056, #1089, #1098: Honor preferences when opening links + (patch by Daniel Seither) + * Fixes SF #1096: missing installation of liferea.convert file + (reported by stqn) + * Fixes Redhat #947358: popup notification only for new items + (patch by Fabrice Bellet) + + 2014-01-13 Lars Windolf <[email protected]> Version 1.10.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/liferea-1.10.4/Makefile.am new/liferea-1.10.5/Makefile.am --- old/liferea-1.10.4/Makefile.am 2014-01-13 22:05:44.000000000 +0100 +++ new/liferea-1.10.5/Makefile.am 2014-01-15 22:56:19.000000000 +0100 @@ -33,9 +33,11 @@ @INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ +data_convertdir = $(datadir)/GConf/gsettings +dist_data_convert_DATA = liferea.convert + EXTRA_DIST = \ net.sf.liferea.gschema.xml.in \ - liferea.convert \ po/liferea.pot \ $(desktop_in_files) \ $(desktop_DATA) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/liferea-1.10.4/configure.ac new/liferea-1.10.5/configure.ac --- old/liferea-1.10.4/configure.ac 2014-01-13 22:05:44.000000000 +0100 +++ new/liferea-1.10.5/configure.ac 2014-01-15 22:57:03.000000000 +0100 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([liferea],[1.10.4],[[email protected]]) +AC_INIT([liferea],[1.10.5],[[email protected]]) AC_CANONICAL_HOST AC_CONFIG_SRCDIR([src/feedlist.c]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/liferea-1.10.4/src/feed.c new/liferea-1.10.5/src/feed.c --- old/liferea-1.10.4/src/feed.c 2014-01-13 22:05:44.000000000 +0100 +++ new/liferea-1.10.5/src/feed.c 2014-01-15 22:56:19.000000000 +0100 @@ -282,7 +282,7 @@ liferea_shell_set_status_bar (_("\"%s\" updated..."), node_get_title (node)); - if (!feed->preventPopup) + if (!feed->preventPopup && newCount) notification_node_has_new_items (node, feed->enforcePopup); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/liferea-1.10.4/src/ui/item_list_view.c new/liferea-1.10.5/src/ui/item_list_view.c --- old/liferea-1.10.4/src/ui/item_list_view.c 2014-01-13 22:05:44.000000000 +0100 +++ new/liferea-1.10.5/src/ui/item_list_view.c 2014-01-15 22:56:19.000000000 +0100 @@ -76,6 +76,49 @@ ITEMSTORE_LEN /**< Number of columns in the itemstore */ }; +typedef enum { + DEFAULT, + INTERNAL, + TAB, + EXTERNAL +} open_link_target_type; + +static void +launch_item_selected (open_link_target_type open_link_target) +{ + itemPtr item; + + item = itemlist_get_selected (); + if (item) { + gchar *link = item_make_link (item); + + if (link) { + switch (open_link_target) + { + case DEFAULT: + itemview_launch_URL (link, FALSE); + break; + case INTERNAL: + itemview_launch_URL (link, TRUE); + break; + case TAB: + browser_tabs_add_new (link, link, FALSE); + break; + case EXTERNAL: + browser_launch_URL_external (link); + break; + } + + g_free (link); + } else + ui_show_error_box (_("This item has no link specified!")); + + item_unload (item); + } else { + liferea_shell_set_important_status_bar (_("No item has been selected")); + } +} + #define ITEM_LIST_VIEW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), ITEM_LIST_VIEW_TYPE, ItemListViewPrivate)) struct ItemListViewPrivate { @@ -606,8 +649,7 @@ GtkTreeViewColumn *column, gpointer user_data) { - // FIXME: Internal or external should be decided on preferences! - on_popup_launch_item_selected (); + launch_item_selected (DEFAULT); } GtkTreeView * @@ -763,64 +805,19 @@ void on_popup_launch_item_selected (void) { - itemPtr item; - - item = itemlist_get_selected (); - if (item) { - gchar *link = item_make_link (item); - - if (link) { - itemview_launch_URL (link, TRUE /* launch in internal browser */); - g_free (link); - } else - ui_show_error_box (_("This item has no link specified!")); - - item_unload (item); - } else { - liferea_shell_set_important_status_bar (_("No item has been selected")); - } + launch_item_selected (INTERNAL); } void on_popup_launch_item_in_tab_selected (void) { - itemPtr item; - gchar *link; - - item = itemlist_get_selected (); - if (item) { - link = item_make_link (item); - if (link) { - browser_tabs_add_new (link, link, FALSE); - g_free (link); - } else - ui_show_error_box (_("This item has no link specified!")); - - item_unload (item); - } else { - liferea_shell_set_important_status_bar (_("No item has been selected")); - } + launch_item_selected (TAB); } void on_popup_launch_item_external_selected (void) { - itemPtr item; - gchar *link; - - item = itemlist_get_selected (); - if (item) { - link = item_make_link (item); - if (link) { - browser_launch_URL_external (link); - g_free (link); - } else - ui_show_error_box (_("This item has no link specified!")); - - item_unload (item); - } else { - liferea_shell_set_important_status_bar (_("No item has been selected")); - } + launch_item_selected (EXTERNAL); } /* menu callbacks */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
