Hello community,
here is the log from the commit of package liferea
checked in at Mon Oct 8 12:24:46 CEST 2007.
--------
--- GNOME/liferea/liferea.changes 2007-09-25 22:51:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/liferea/liferea.changes 2007-10-06 22:42:51.901479000 +0200
@@ -1,0 +2,15 @@
+Sat Oct 6 22:45:36 CEST 2007 - cthiel@suse.de
+
+- update to version 1.4.4
+ * Removing deprecated "Encoding" entry from
+ .desktop file
+ * Fixed warnings/errors with "gecko" as program name. Now the correct name
+ "liferea" is used.
+ * Fixes assertion when cancelling feed updates using the update monitor
+ dialog.
+ * Fixes Debian #443751: Tries to run scripts to retrieve favicons
+ * Fixes SF #1803072: Search folders broken
+ * Fixes vertical/horizontal pane position saving when exiting Liferea
+ while the mainwindow is not visible.
+
+-------------------------------------------------------------------
Old:
----
liferea-1.4.3b.tar.bz2
New:
----
liferea-1.4.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ liferea.spec ++++++
--- /var/tmp/diff_new_pack.W11454/_old 2007-10-08 12:24:34.000000000 +0200
+++ /var/tmp/diff_new_pack.W11454/_new 2007-10-08 12:24:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package liferea (Version 1.4.3b)
+# spec file for package liferea (Version 1.4.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,7 +15,7 @@
# FIXME: for libgtkhtml-devel: checking for 64bit platform... yes -> disabling GtkHTML2
License: GPL v2 or later
Group: Productivity/Other
-Version: 1.4.3b
+Version: 1.4.4
Release: 1
Summary: Linux Feed Reader
Source: %{name}-%{version}.tar.bz2
@@ -112,6 +112,18 @@
%files lang -f %{name}.lang
%changelog
+* Sat Oct 06 2007 - cthiel@suse.de
+- update to version 1.4.4
+ * Removing deprecated "Encoding" entry from
+ .desktop file
+ * Fixed warnings/errors with "gecko" as program name. Now the correct name
+ "liferea" is used.
+ * Fixes assertion when cancelling feed updates using the update monitor
+ dialog.
+ * Fixes Debian #443751: Tries to run scripts to retrieve favicons
+ * Fixes SF #1803072: Search folders broken
+ * Fixes vertical/horizontal pane position saving when exiting Liferea
+ while the mainwindow is not visible.
* Tue Sep 25 2007 - cthiel@suse.de
- update to version 1.4.3b
* Fixes a data loss problem that causes flagged items to be dropped out of
++++++ liferea-1.4.3b.tar.bz2 -> liferea-1.4.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/aclocal.m4 new/liferea-1.4.4/aclocal.m4
--- old/liferea-1.4.3b/aclocal.m4 2007-08-09 02:38:18.000000000 +0200
+++ new/liferea-1.4.4/aclocal.m4 2007-09-27 22:53:39.000000000 +0200
@@ -7785,6 +7785,46 @@
AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC])
+# serial 2
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+
+# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# 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, 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.
+
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+])
+
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
# Copyright © 2004 Scott James Remnant .
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/ChangeLog new/liferea-1.4.4/ChangeLog
--- old/liferea-1.4.3b/ChangeLog 2007-09-25 21:44:15.000000000 +0200
+++ new/liferea-1.4.4/ChangeLog 2007-10-01 18:00:19.000000000 +0200
@@ -1,3 +1,23 @@
+2007-10-01 Lars Lindner
+
+ Version 1.4.4 (Stable)
+
+ * Removing deprecated "Encoding" entry from
+ .desktop file (Luis Rodrigo Gallardo Cruz)
+ * Fixed warnings/errors with "gecko" as program
+ name. Now the correct name "liferea" is used.
+ * Fixes assertion when cancelling feed updates
+ using the update monitor dialog. (reported
+ by caccolangrifata and Aleksei Miheev)
+ * Fixes Debian #443751: Tries to run scripts
+ to retrieve favicons (reported by Daniel
+ Jacobowitz)
+ * Fixes SF #1803072: Search folders broken
+ * Fixes vertical/horizontal pane position saving
+ when exiting Liferea while the mainwindow is
+ not visible. (Keith Curtis)
+
+
2007-09-25 Lars Lindner
Version 1.4.3b (Stable)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/config.h.in new/liferea-1.4.4/config.h.in
--- old/liferea-1.4.3b/config.h.in 2007-07-26 22:32:15.000000000 +0200
+++ new/liferea-1.4.4/config.h.in 2007-09-27 22:53:53.000000000 +0200
@@ -75,6 +75,9 @@
/* Mozilla component path */
#undef MOZILLA_LIB_ROOT
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
/* defines a OS version string, used for OS specific code */
#undef OS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/configure new/liferea-1.4.4/configure
--- old/liferea-1.4.3b/configure 2007-09-25 21:54:10.000000000 +0200
+++ new/liferea-1.4.4/configure 2007-09-27 22:53:52.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for liferea 1.4.3b.
+# Generated by GNU Autoconf 2.61 for liferea 1.4.4.
#
# Report bugs to .
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='liferea'
PACKAGE_TARNAME='liferea'
-PACKAGE_VERSION='1.4.3b'
-PACKAGE_STRING='liferea 1.4.3b'
+PACKAGE_VERSION='1.4.4'
+PACKAGE_STRING='liferea 1.4.4'
PACKAGE_BUGREPORT='liferea-devel@lists.sourceforge.net'
ac_unique_file="src/feedlist.c"
@@ -1516,7 +1516,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures liferea 1.4.3b to adapt to many kinds of systems.
+\`configure' configures liferea 1.4.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1591,7 +1591,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of liferea 1.4.3b:";;
+ short | recursive ) echo "Configuration of liferea 1.4.4:";;
esac
cat <<\_ACEOF
@@ -1749,7 +1749,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-liferea configure 1.4.3b
+liferea configure 1.4.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1763,7 +1763,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by liferea $as_me 1.4.3b, which was
+It was created by liferea $as_me 1.4.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2580,7 +2580,7 @@
# Define the identity of the package.
PACKAGE=liferea
- VERSION=1.4.3b
+ VERSION=1.4.4
cat >>confdefs.h <<_ACEOF
@@ -20832,6 +20832,131 @@
*) CC="$CC $am_cv_prog_cc_stdc" ;;
esac
+if test "x$CC" != xcc; then
+ { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
+else
+ { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
+fi
+set dummy $CC; ac_cc=`echo $2 |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ test -f conftest2.$ac_objext && { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); };
+then
+ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+ if test "x$CC" != xcc; then
+ # Test first that cc exists at all.
+ if { ac_try='cc -c conftest.$ac_ext >&5'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+ rm -f conftest2.*
+ if { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ test -f conftest2.$ac_objext && { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); };
+ then
+ # cc works too.
+ :
+ else
+ # cc exists but doesn't like -o.
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+ fi
+ fi
+ fi
+else
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+
{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
if test "${ac_cv_header_stdc+set}" = set; then
@@ -28112,7 +28237,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by liferea $as_me 1.4.3b, which was
+This file was extended by liferea $as_me 1.4.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -28165,7 +28290,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-liferea config.status 1.4.3b
+liferea config.status 1.4.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/configure.ac new/liferea-1.4.4/configure.ac
--- old/liferea-1.4.3b/configure.ac 2007-09-25 21:46:09.000000000 +0200
+++ new/liferea-1.4.4/configure.ac 2007-09-27 22:53:31.000000000 +0200
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([liferea],[1.4.3b],[liferea-devel@lists.sourceforge.net])
+AC_INIT([liferea],[1.4.4],[liferea-devel@lists.sourceforge.net])
AC_CANONICAL_TARGET([])
AC_CONFIG_SRCDIR([src/feedlist.c])
@@ -22,6 +22,7 @@
AC_ISC_POSIX
AC_PROG_CC
AM_PROG_CC_STDC
+AM_PROG_CC_C_O
AC_HEADER_STDC
AC_PROG_INSTALL
AC_PROG_LN_S
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/liferea.desktop new/liferea-1.4.4/liferea.desktop
--- old/liferea-1.4.3b/liferea.desktop 2007-09-21 00:32:44.000000000 +0200
+++ new/liferea-1.4.4/liferea.desktop 2007-09-26 21:07:45.000000000 +0200
@@ -48,6 +48,5 @@
StartupNotify=true
Terminal=false
Type=Application
-Encoding=UTF-8
Categories=Network;News;
Version=0.9.4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/liferea.desktop.in new/liferea-1.4.4/liferea.desktop.in
--- old/liferea-1.4.3b/liferea.desktop.in 2007-07-23 19:56:59.000000000 +0200
+++ new/liferea-1.4.4/liferea.desktop.in 2007-09-26 20:59:22.000000000 +0200
@@ -7,6 +7,5 @@
StartupNotify=true
Terminal=false
Type=Application
-Encoding=UTF-8
Categories=Network;News;
Version=0.9.4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/liferea.spec new/liferea-1.4.4/liferea.spec
--- old/liferea-1.4.3b/liferea.spec 2007-09-25 21:54:47.000000000 +0200
+++ new/liferea-1.4.4/liferea.spec 2007-09-30 19:34:10.000000000 +0200
@@ -1,6 +1,6 @@
Summary: Liferea (Linux RSS News Aggregator)
Name: liferea
-Version: 1.4.3b
+Version: 1.4.4
Release: 1
Group: Applications/Internet
License: GPL
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/src/favicon.c new/liferea-1.4.4/src/favicon.c
--- old/liferea-1.4.3b/src/favicon.c 2007-09-16 15:43:54.000000000 +0200
+++ new/liferea-1.4.4/src/favicon.c 2007-09-26 22:40:21.000000000 +0200
@@ -271,12 +271,14 @@
/* case 2. */
g_assert(source_url);
- tmp = tmp2 = g_strdup(source_url);
- tmp = strrchr(tmp, '/');
- if(tmp) {
- *tmp = 0;
- ctxt->urls = g_slist_append(ctxt->urls, tmp2);
- debug1(DEBUG_UPDATE, "(2) adding favicon search URL: %s", tmp2);
+ if(*source_url != '|') {
+ tmp = tmp2 = g_strdup(source_url);
+ tmp = strrchr(tmp, '/');
+ if(tmp) {
+ *tmp = 0;
+ ctxt->urls = g_slist_append(ctxt->urls, tmp2);
+ debug1(DEBUG_UPDATE, "(2) adding favicon search URL: %s", tmp2);
+ }
}
/* case 3. */
@@ -298,7 +300,7 @@
}
}
- if(2 < count_slashes(source_url)) {
+ if(*source_url != '|' && 2 < count_slashes(source_url)) {
/* case 4 */
tmp = tmp2 = g_strdup(source_url);
tmp = strrchr(tmp, '/');
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/src/main.c new/liferea-1.4.4/src/main.c
--- old/liferea-1.4.3b/src/main.c 2007-08-25 23:36:01.000000000 +0200
+++ new/liferea-1.4.4/src/main.c 2007-09-26 22:28:44.000000000 +0200
@@ -138,8 +138,8 @@
textdomain(GETTEXT_PACKAGE);
setlocale(LC_ALL, "");
#endif
+ /* Do not set program name here as it would be overwritten by Gecko! */
- g_set_prgname("liferea");
gtk_set_locale();
g_thread_init(NULL);
#ifdef USE_DBUS
@@ -260,7 +260,7 @@
debug0(DEBUG_GUI, "Compiled without DBUS support.");
#endif
ui_mainwindow_init(mainwindowState); /* setup mainwindow and initialize gconf configured GUI behaviour */
-
+ g_set_prgname("liferea");
#ifdef USE_SM
/* This must be after feedlist reading because some session
managers will tell Liferea to exit if Liferea does not
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/src/ui/ui_feedlist.c new/liferea-1.4.4/src/ui/ui_feedlist.c
--- old/liferea-1.4.3b/src/ui/ui_feedlist.c 2007-09-05 22:37:38.000000000 +0200
+++ new/liferea-1.4.4/src/ui/ui_feedlist.c 2007-09-27 22:31:05.000000000 +0200
@@ -114,9 +114,16 @@
IS_NODE_SOURCE (node)));
if(realNode) {
/* FIXME: another workaround to prevent strange window
- size increasings after feed selection changing */
- geometry.min_height = 480;
- geometry.min_width = 640;
+ size increasings after feed selection changing
+
+ Why is this workaround necessary? Missing documentation!!!
+
+ Starting with 1.4.4 changing the minimum size from
+ 640x480 to 50x50. If anyone experiences it there will
+ be bug reports soon. If there are none over about a month
+ this should be removed! */
+ geometry.min_height = 50;
+ geometry.min_width = 50;
g_assert (mainwindow != NULL);
gtk_window_set_geometry_hints (GTK_WINDOW (mainwindow), mainwindow, &geometry, GDK_HINT_MIN_SIZE);
@@ -265,13 +272,12 @@
focused = gtk_window_get_focus (GTK_WINDOW (mainwindow));
gtk_window_set_focus (GTK_WINDOW (mainwindow), treeview);
- if (node) {
+ if (node && node != feedlist_get_root ()) {
GtkTreePath *path = gtk_tree_model_get_path (GTK_TREE_MODEL (feedstore), ui_node_to_iter(node->id));
- ui_feedlist_expand_parents (node);
-
- if (IS_FOLDER (node))
- gtk_tree_view_expand_to_path (GTK_TREE_VIEW (treeview), path);
+ if (node->parent)
+ ui_feedlist_expand_parents (node->parent);
+
gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (treeview), path, NULL, FALSE, 0.0, 0.0);
gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview), path, NULL, FALSE);
gtk_tree_path_free (path);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/src/ui/ui_mainwindow.c new/liferea-1.4.4/src/ui/ui_mainwindow.c
--- old/liferea-1.4.3b/src/ui/ui_mainwindow.c 2007-09-06 20:40:50.000000000 +0200
+++ new/liferea-1.4.4/src/ui/ui_mainwindow.c 2007-09-27 21:25:38.000000000 +0200
@@ -820,6 +820,26 @@
GtkWidget *pane;
gint x, y, w, h;
+ /* save pane proportions */
+ if (NULL != (pane = liferea_shell_lookup ("leftpane"))) {
+ x = gtk_paned_get_position (GTK_PANED (pane));
+ setNumericConfValue (LAST_VPANE_POS, x);
+ }
+
+ if (NULL != (pane = liferea_shell_lookup ("normalViewPane"))) {
+ y = gtk_paned_get_position (GTK_PANED (pane));
+ setNumericConfValue (LAST_HPANE_POS, y);
+ }
+
+ if (NULL != (pane = liferea_shell_lookup ("wideViewPane"))) {
+ y = gtk_paned_get_position (GTK_PANED (pane));
+ setNumericConfValue (LAST_WPANE_POS, y);
+ }
+
+ /* save itemlist properties */
+ setNumericConfValue (LAST_ZOOMLEVEL, (gint)(100.* liferea_htmlview_get_zoom (ui_mainwindow_get_active_htmlview ())));
+
+ /* The following needs to be skipped when the window is not visible */
if (!GTK_WIDGET_VISIBLE (mainwindow))
return;
@@ -841,25 +861,6 @@
/* save window size */
setNumericConfValue (LAST_WINDOW_WIDTH, w);
setNumericConfValue (LAST_WINDOW_HEIGHT, h);
-
- /* save pane proportions */
- if (NULL != (pane = liferea_shell_lookup ("leftpane"))) {
- x = gtk_paned_get_position (GTK_PANED (pane));
- setNumericConfValue (LAST_VPANE_POS, x);
- }
-
- if (NULL != (pane = liferea_shell_lookup ("normalViewPane"))) {
- y = gtk_paned_get_position (GTK_PANED (pane));
- setNumericConfValue (LAST_HPANE_POS, y);
- }
-
- if (NULL != (pane = liferea_shell_lookup ("wideViewPane"))) {
- y = gtk_paned_get_position (GTK_PANED (pane));
- setNumericConfValue (LAST_WPANE_POS, y);
- }
-
- /* save itemlist properties */
- setNumericConfValue (LAST_ZOOMLEVEL, (gint)(100.* liferea_htmlview_get_zoom (ui_mainwindow_get_active_htmlview ())));
}
void ui_mainwindow_tray_add() {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/src/ui/ui_popup.c new/liferea-1.4.4/src/ui/ui_popup.c
--- old/liferea-1.4.3b/src/ui/ui_popup.c 2007-08-19 17:58:42.000000000 +0200
+++ new/liferea-1.4.4/src/ui/ui_popup.c 2007-09-27 22:22:24.000000000 +0200
@@ -344,9 +344,11 @@
/* mouse button handler */
/*------------------------------------------------------------------------------*/
-gboolean on_mainfeedlist_button_press_event(GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data) {
+gboolean
+on_mainfeedlist_button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data)
+{
GdkEventButton *eb;
GtkWidget *treeview;
GtkTreeModel *model;
@@ -356,47 +358,47 @@
nodePtr node = NULL;
treeview = liferea_shell_lookup ("feedlist");
- g_assert(treeview);
+ g_assert (treeview);
- if(event->type != GDK_BUTTON_PRESS)
+ if (event->type != GDK_BUTTON_PRESS)
return FALSE;
eb = (GdkEventButton*)event;
/* determine node */
- if(!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(liferea_shell_lookup("feedlist")), event->x, event->y, &path, NULL, NULL, NULL)) {
- selected=FALSE;
- node = feedlist_get_root();
+ if (!gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (treeview), event->x, event->y, &path, NULL, NULL, NULL)) {
+ selected = FALSE;
+ node = feedlist_get_root ();
} else {
- model = gtk_tree_view_get_model(GTK_TREE_VIEW(liferea_shell_lookup("feedlist")));
- gtk_tree_model_get_iter(model, &iter, path);
- gtk_tree_path_free(path);
- gtk_tree_model_get(model, &iter, FS_PTR, &node, -1);
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
+ gtk_tree_model_get_iter (model, &iter, path);
+ gtk_tree_path_free (path);
+ gtk_tree_model_get (model, &iter, FS_PTR, &node, -1);
}
/* apply action */
- switch(eb->button) {
+ switch (eb->button) {
default:
/* Shouldn't happen... */
return FALSE;
break;
case 2:
- if(node) {
+ if (node) {
feedlist_mark_all_read (node);
itemview_update_node_info (node);
itemview_update ();
}
break;
case 3:
- if(node) {
- ui_feedlist_select(node);
+ if (node) {
+ ui_feedlist_select (node);
} else {
/* This happens when an "empty" node or nothing (feed list root) is clicked */
selected = FALSE;
- node = feedlist_get_root();
+ node = feedlist_get_root ();
}
- gtk_menu_popup(ui_popup_node_menu(node, selected), NULL, NULL, NULL, NULL, eb->button, eb->time);
+ gtk_menu_popup (ui_popup_node_menu (node, selected), NULL, NULL, NULL, NULL, eb->button, eb->time);
break;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/src/ui/ui_update.c new/liferea-1.4.4/src/ui/ui_update.c
--- old/liferea-1.4.3b/src/ui/ui_update.c 2007-09-10 20:52:44.000000000 +0200
+++ new/liferea-1.4.4/src/ui/ui_update.c 2007-09-26 22:33:27.000000000 +0200
@@ -108,8 +108,13 @@
if (node->children)
node_foreach_child (node, ui_update_cancel);
- if (node->subscription)
- subscription_cancel_update (node->subscription);
+ if (!node->subscription)
+ return;
+
+ if (!node->subscription->updateJob)
+ return;
+
+ subscription_cancel_update (node->subscription);
}
void on_cancel_all_requests_clicked(GtkButton *button, gpointer user_data) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/liferea-1.4.3b/src/ui/ui_vfolder.c new/liferea-1.4.4/src/ui/ui_vfolder.c
--- old/liferea-1.4.3b/src/ui/ui_vfolder.c 2007-07-23 19:56:54.000000000 +0200
+++ new/liferea-1.4.4/src/ui/ui_vfolder.c 2007-09-27 19:39:48.000000000 +0200
@@ -77,7 +77,7 @@
if(response_id == GTK_RESPONSE_OK) {
/* update vfolder */
ui_itemlist_clear();
- // FIXME: update vfolder
+ vfolder_refresh (ui_data->vp);
itemlist_load(ui_data->np);
ui_node_update(ui_data->np->id);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org