evolution-rss r334 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Mon Jul  7 13:51:15 2008
New Revision: 334
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=334&view=rev

Log:
2008-07-05  Lucian Langa  <lucilanga gnome org>

* src/rss.c: enable
gtk_tree_view_set_tooltip_column only for
gtk >= 2.12
* src/misc: sanitize_url() parse aditional
url (beging with 'feed:' )
* src/network-soup.c: 
net_post_blocking() - fix handling url

Modified:
   trunk/ChangeLog
   trunk/src/rss-config-factory.c
   trunk/src/rss.c

Modified: trunk/src/rss-config-factory.c
==============================================================================
--- trunk/src/rss-config-factory.c	(original)
+++ trunk/src/rss-config-factory.c	Mon Jul  7 13:51:15 2008
@@ -1104,7 +1104,7 @@
                         }
                         gchar *name = xmlGetProp((xmlNode *)src, "title");
                         gtk_label_set_text(GTK_LABEL(import_label), name);
-#if GTK_2_6
+#if GTK_VERSION >= 2006000
                         gtk_label_set_ellipsize (GTK_LABEL (import_label), PANGO_ELLIPSIZE_START);
 #endif
                         gtk_label_set_justify(GTK_LABEL(import_label), GTK_JUSTIFY_CENTER);
@@ -1772,7 +1772,9 @@
 	gtk_tree_view_column_set_sort_column_id (column, 2);
 	gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
                                                    2);
+#if GTK_VERSION >= 2012000
 	gtk_tree_view_set_tooltip_column (treeview, 1);
+#endif
 
 	if (rf->hr != NULL)
         	g_hash_table_foreach(rf->hrname, construct_list, store);

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Mon Jul  7 13:51:15 2008
@@ -1339,6 +1339,7 @@
 				| XML_PARSE_NOENT
 				| XML_PARSE_NOCDATA);
 
+
         xmlParseDocument (ctxt);
 
         doc = ctxt->myDoc;
@@ -2402,6 +2403,7 @@
         r->shown = TRUE;
         xmlSubstituteEntitiesDefaultValue = 1;
         r->cache = xml_parse_sux (response->str, response->len);
+//        r->cache = xmlParseDoc (response->str);
 
 	if (msg->status_code == SOUP_STATUS_CANCELLED)
 		goto out;
@@ -2979,7 +2981,7 @@
 		G_CALLBACK(readrss_dialog_cb),
 		NULL);
         GtkWidget *label2 = gtk_label_new(NULL);
-#if GTK_VERSION > 2006000
+#if GTK_VERSION >= 2006000
 	gtk_label_set_ellipsize (GTK_LABEL (label2), PANGO_ELLIPSIZE_START);
 #endif
 #if GTK_VERSION > 2008011
@@ -3124,7 +3126,7 @@
 
         char *pretty_url = g_strdup ("RSS");
         label = gtk_label_new (NULL);
-#if GTK_VERSION > 2006000
+#if GTK_VERSION >= 2006000
         gtk_label_set_ellipsize (
                 GTK_LABEL (label), PANGO_ELLIPSIZE_END);
 #endif
@@ -4350,6 +4352,7 @@
                 char *link = g_strdup(layer_find (el->children, "link", NULL));		//RSS,
 		if (!link) 
 			link = layer_find_innerelement(el->children, "link", "href", g_strdup(_("No Information")));	//ATOM
+
 		char *id = layer_find (el->children, "id",				//ATOM
 				layer_find (el->children, "guid", NULL));		//RSS 2.0
 		feed = g_strdup_printf("%s\n", id ? id : link);