r1350 - in /unstable/evolution-rss/debian: changelog patches/01_folder-rename.patch patches/02_folder-properties.patch rules

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Sep 23 20:14:22 2009
New Revision: 1350

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1350
Log:
* Set webkit as primary renderer.
* 01_folder-rename.patch: patch from upstream. Allows to rename 
  folders.
* 02_folder-properties.patch: patch from upstream. Fixes a crasher.

Added:
    unstable/evolution-rss/debian/patches/01_folder-rename.patch
    unstable/evolution-rss/debian/patches/02_folder-properties.patch
Modified:
    unstable/evolution-rss/debian/changelog
    unstable/evolution-rss/debian/rules

Modified: unstable/evolution-rss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/changelog?rev=1350&op=diff
==============================================================================
--- unstable/evolution-rss/debian/changelog (original)
+++ unstable/evolution-rss/debian/changelog Wed Sep 23 20:14:22 2009
@@ -1,3 +1,12 @@
+evolution-rss (0.1.4-2) unstable; urgency=low
+
+  * Set webkit as primary renderer.
+  * 01_folder-rename.patch: patch from upstream. Allows to rename 
+    folders.
+  * 02_folder-properties.patch: patch from upstream. Fixes a crasher.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 23 Sep 2009 22:00:09 +0200
+
 evolution-rss (0.1.4-1) unstable; urgency=low
 
   * Remove useless .la file.

Added: unstable/evolution-rss/debian/patches/01_folder-rename.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/01_folder-rename.patch?rev=1350&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/01_folder-rename.patch (added)
+++ unstable/evolution-rss/debian/patches/01_folder-rename.patch Wed Sep 23 20:14:22 2009
@@ -1,0 +1,18 @@
+--- src/rss.c.orig	2009-09-23 22:02:02.510080391 +0200
++++ src/rss.c	2009-09-23 22:04:10.425583965 +0200
+@@ -3659,8 +3659,13 @@
+ 		nname = g_strdup(new_name);
+ 	gchar *orig_name = g_hash_table_lookup(rf->feed_folders, oname);
+ 	if (!orig_name) {
+-		if (valid_folder)
+-			return 0;
++		if (valid_folder) {
++			gchar *ofolder = lookup_original_folder(old_name);
++			if (!ofolder)
++				return 0;
++			else if (!lookup_key(ofolder))
++				return 0;
++		}
+ 		g_hash_table_replace(rf->feed_folders, g_strdup(nname), g_strdup(oname));
+ 	} else {
+ 		g_hash_table_replace(rf->feed_folders, g_strdup(nname), g_strdup(orig_name));

Added: unstable/evolution-rss/debian/patches/02_folder-properties.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/02_folder-properties.patch?rev=1350&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/02_folder-properties.patch (added)
+++ unstable/evolution-rss/debian/patches/02_folder-properties.patch Wed Sep 23 20:14:22 2009
@@ -1,0 +1,20 @@
+diff -urN evolution-rss-0.1.4.orig/src/rss-config-factory.c evolution-rss-0.1.4/src/rss-config-factory.c
+--- evolution-rss-0.1.4.orig/src/rss-config-factory.c	2009-08-26 09:24:36.000000000 +0100
++++ evolution-rss-0.1.4/src/rss-config-factory.c	2009-09-15 23:27:13.787560110 +0100
+@@ -2192,7 +2192,15 @@
+ 	add_feed *feed = (add_feed *)g_object_get_data((GObject *)epl, "add-feed");
+ 	gchar *url = (gchar *)g_object_get_data((GObject *)epl, "url");
+ 	gchar *ofolder = (gchar *)g_object_get_data((GObject *)epl, "ofolder");
++
++	EMConfigTargetFolder *targetfolder = (EMConfigTargetFolder *)target->config->target;
++	gchar *main_folder = lookup_main_folder();
++	gchar *folder = targetfolder->folder->full_name;
+ 	
++	if (folder == NULL
++          || g_ascii_strncasecmp(folder, main_folder, strlen(main_folder))
++          || !g_ascii_strcasecmp(folder, main_folder))
++                return;
+ 
+ 	GtkWidget *entry1 = (GtkWidget *)glade_xml_get_widget (feed->gui, "url_entry");
+         GtkWidget *checkbutton1 = (GtkWidget *)glade_xml_get_widget (feed->gui, "html_check");
+

Modified: unstable/evolution-rss/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/rules?rev=1350&op=diff
==============================================================================
--- unstable/evolution-rss/debian/rules (original)
+++ unstable/evolution-rss/debian/rules Wed Sep 23 20:14:22 2009
@@ -8,7 +8,8 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
        --enable-webkit \
-       --disable-gecko
+       --disable-gecko \
+       --with-primary-render=webkit
 
 binary-post-install/evolution-rss::
 	rm -f debian/evolution-rss/usr/lib/evolution/*/plugins/*.la