evolution-rss r161 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Thu Feb 21 19:25:46 2008
New Revision: 161
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=161&view=rev

Log:
fix webkit operations

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/rss.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Thu Feb 21 19:25:46 2008
@@ -36,3 +36,5 @@
 	* check mycall resize, verify data is valid widget -> generates crash
 	* crash (mail_append_message) if folder contains .lock file ? or ibex crashes
 	* implement notify back of imported feed perhaps libnotify
+	* prefetch html content for all webkits (perhaps temp file)
+	* implement web controls for diferent redering <Webkits> or <Gecko>

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Thu Feb 21 19:25:46 2008
@@ -1473,6 +1473,9 @@
 #ifdef	HAVE_GTKMOZEMBED
 	gtk_moz_embed_stop_load(GTK_MOZ_EMBED(rf->mozembed));
 #endif
+#ifdef	HAVE_WEBKIT
+	webkit_gtk_page_stop_loading(WEBKIT_GTK_PAGE(rf->mozembed));
+#endif
 }
 
 reload_cb (GtkWidget *button, gpointer data)
@@ -1489,7 +1492,7 @@
 		case 1:
 #ifdef	HAVE_WEBKIT
 	webkit_gtk_page_stop_loading(WEBKIT_GTK_PAGE(rf->mozembed));
-       	webkit_gtk_page_open(WEBKIT_GTK_PAGE(rf->mozembed), data);
+     	webkit_gtk_page_open(WEBKIT_GTK_PAGE(rf->mozembed), data);
 #endif
 		break;
 	}
@@ -1588,8 +1591,6 @@
 	struct _org_gnome_rss_controls_pobject *po = (struct _org_gnome_rss_controls_pobject *) pobject;
 	int width, height;
         GtkRequisition req;
-	GtkWidget *gpage;
-	GtkWidget *gpage2;
 	GtkWidget *moz;
 
 //        gtk_widget_size_request (efhd->priv->attachment_bar, &req);
@@ -1607,8 +1608,8 @@
   //              	g_thread_init (NULL);
     //    	}
 		webkit_gtk_init();
-		gpage = (GtkWidget *)webkit_gtk_page_new();
-		gtk_container_add(GTK_CONTAINER(moz), GTK_WIDGET(gpage));
+		rf->mozembed = (GtkWidget *)webkit_gtk_page_new();
+		gtk_container_add(GTK_CONTAINER(moz), GTK_WIDGET(rf->mozembed));
 	}
 #endif
 
@@ -1643,9 +1644,9 @@
 	{
 		g_print("Render engine Webkit\n");
 		if (rf->online)
-        		webkit_gtk_page_open(WEBKIT_GTK_PAGE(gpage), po->website);
+        		webkit_gtk_page_open(WEBKIT_GTK_PAGE(rf->mozembed), po->website);
 		else
-        		webkit_gtk_page_open(WEBKIT_GTK_PAGE(gpage), "about:blank");
+        		webkit_gtk_page_open(WEBKIT_GTK_PAGE(rf->mozembed), "about:blank");
 	}
 #endif
 
@@ -1669,11 +1670,9 @@
 
 //	gtk_container_set_resize_mode(w, GTK_RESIZE_PARENT);
 //	gtk_scrolled_window_set_policy(w, GTK_POLICY_NEVER, GTK_POLICY_NEVER);
-//	gtk_box_pack_start (GTK_BOX (w), gpage, TRUE, TRUE, 0);
 	gtk_widget_show_all(moz);
         gtk_container_add ((GtkContainer *) eb, moz);
         gtk_container_check_resize ((GtkContainer *) eb);
-	g_print("add\n");
 //	gtk_widget_set_size_request((GtkWidget *)rf->mozembed, 330, 330);
 //        gtk_container_add ((GtkContainer *) eb, rf->mozembed);
 	EMFormat *myf = (EMFormat *)efh;