r1201 - /unstable/evolution-rss/debian/patches/01_build_warnings.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue May  5 13:04:02 2009
New Revision: 1201

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1201
Log:
Improve patch, add reference

Modified:
    unstable/evolution-rss/debian/patches/01_build_warnings.patch

Modified: unstable/evolution-rss/debian/patches/01_build_warnings.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/01_build_warnings.patch?rev=1201&op=diff
==============================================================================
--- unstable/evolution-rss/debian/patches/01_build_warnings.patch (original)
+++ unstable/evolution-rss/debian/patches/01_build_warnings.patch Tue May  5 13:04:02 2009
@@ -1,3 +1,5 @@
+GNOME #581449
+
 diff --git a/src/dbus.c b/src/dbus.c
 index bfbf797..120ec76 100644
 --- a/src/dbus.c
@@ -406,7 +408,7 @@
  	GtkTreeSelection *selection;
  	GtkTreeViewColumn *column;
 diff --git a/src/rss.c b/src/rss.c
-index 4f59f35..c2c7297 100644
+index 4f59f35..821395b 100644
 --- a/src/rss.c
 +++ b/src/rss.c
 @@ -24,6 +24,7 @@
@@ -429,7 +431,19 @@
  		break;
  	}
  }
-@@ -1642,6 +1645,7 @@ rss_menu_items_free(EPopup *ep, GSList *items, void *data)
+@@ -1512,9 +1515,11 @@ mycall (GtkWidget *widget, GtkAllocation *event, gpointer data)
+ 		if (po->mozembedwindow && rf->mozembed)
+ 			if(GTK_IS_WIDGET(po->mozembedwindow) && height > 0)
+ 			{
++#ifdef HAVE_GECKO
+ 				if (engine == 2)
+ 					gtk_moz_embed_open_stream(GTK_MOZ_EMBED(rf->mozembed),
+ 		    					po->website, "text/html");
++#endif
+ 		//browser_write("test", 4);
+ 				if (!browser_fetching) {
+ 					gint fill=0;
+@@ -1642,6 +1647,7 @@ rss_menu_items_free(EPopup *ep, GSList *items, void *data)
          g_slist_free(items);
  }
  
@@ -437,7 +451,7 @@
  static gboolean
  webkit_click (WebKitWebView *view, WebKitWebFrame *frame, WebKitNetworkRequest *request)
  {
-@@ -1654,7 +1658,9 @@ webkit_click (WebKitWebView *view, WebKitWebFrame *frame, WebKitNetworkRequest *
+@@ -1654,7 +1660,9 @@ webkit_click (WebKitWebView *view, WebKitWebFrame *frame, WebKitNetworkRequest *
          g_print("uri:%s\n", uri);
          return TRUE;
  }
@@ -447,7 +461,7 @@
  gboolean
  gecko_click(GtkMozEmbed *mozembed, gpointer dom_event, gpointer user_data)
  {
-@@ -1698,6 +1704,7 @@ gecko_click(GtkMozEmbed *mozembed, gpointer dom_event, gpointer user_data)
+@@ -1698,6 +1706,7 @@ gecko_click(GtkMozEmbed *mozembed, gpointer dom_event, gpointer user_data)
  		gtk_moz_embed_load_url(rf->mozembed, link);
  	g_print("button:%d\n", button);
  }
@@ -455,7 +469,18 @@
  
  #ifdef HAVE_RENDERKIT
  static gboolean
-@@ -3126,11 +3133,11 @@ lookup_feed_folder(gchar *folder)
+@@ -2914,8 +2923,10 @@ finish_website (SoupSession *soup_sess, SoupMessage *msg, gint user_data)
+ 	g_print("len:%d\n", len);
+ 	if (len>0) {
+ 		browser_write(str, len, user_data);
++#ifdef HAVE_GECKO
+ 		if (engine == 2)
+ 			gtk_moz_embed_close_stream(GTK_MOZ_EMBED(rf->mozembed));
++#endif
+ 		g_string_free(response, 1);
+ //		gtk_widget_show(rf->mozembed);
+ 	}
+@@ -3126,11 +3137,11 @@ lookup_feed_folder(gchar *folder)
  	return new_folder ? new_folder : folder;
  }