r1200 - in /unstable/evolution-rss/debian: changelog patches/01_build_warnings.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue May 5 12:41:12 UTC 2009
Author: joss
Date: Tue May 5 12:41:11 2009
New Revision: 1200
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1200
Log:
* New upstream release from git snapshot, fixes countless bugs.
* 01_build_warnings.patch: new patch. Fix a load of warnings, as well
as a build failure.
Added:
unstable/evolution-rss/debian/patches/01_build_warnings.patch
Modified:
unstable/evolution-rss/debian/changelog
Modified: unstable/evolution-rss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/changelog?rev=1200&op=diff
==============================================================================
--- unstable/evolution-rss/debian/changelog (original)
+++ unstable/evolution-rss/debian/changelog Tue May 5 12:41:11 2009
@@ -1,3 +1,11 @@
+evolution-rss (0.1.3~git20090505-1) unstable; urgency=low
+
+ * New upstream release from git snapshot, fixes countless bugs.
+ * 01_build_warnings.patch: new patch. Fix a load of warnings, as well
+ as a build failure.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 05 May 2009 12:12:49 +0200
+
evolution-rss (0.1.2-2) unstable; urgency=low
* Rebuild against evolution 2.26.
Added: 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=1200&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/01_build_warnings.patch (added)
+++ unstable/evolution-rss/debian/patches/01_build_warnings.patch Tue May 5 12:41:11 2009
@@ -1,0 +1,484 @@
+diff --git a/src/dbus.c b/src/dbus.c
+index bfbf797..120ec76 100644
+--- a/src/dbus.c
++++ b/src/dbus.c
+@@ -38,17 +38,18 @@ static DBusConnection *init_dbus (void);
+ static DBusConnection *bus = NULL;
+ static gboolean enabled = FALSE;
+
+-/*static void
++#if 0
++static void
+ send_dbus_message (const char *name, const char *data, guint new)
+ {
+ DBusMessage *message;
+
+ /* Create a new message on the DBUS_INTERFACE */
+-/* if (!(message = dbus_message_new_signal (DBUS_PATH, DBUS_INTERFACE, name)))
++ if (!(message = dbus_message_new_signal (DBUS_PATH, DBUS_INTERFACE, name)))
+ return;
+
+ /* Appends the data as an argument to the message */
+-/* dbus_message_append_args (message,
++ dbus_message_append_args (message,
+ #if DBUS_VERSION >= 310
+ DBUS_TYPE_STRING, &data,
+ #else
+@@ -60,8 +61,9 @@ send_dbus_message (const char *name, const char *data, guint new)
+ // dbus_connection_send (bus, message, NULL);
+
+ /* Frees the message */
+-/* dbus_message_unref (message);
+-}*/
++ dbus_message_unref (message);
++}
++#endif
+
+ static gboolean
+ reinit_dbus (gpointer user_data)
+@@ -137,7 +139,6 @@ filter_function (DBusConnection *connection, DBusMessage *message, void *user_da
+ return DBUS_HANDLER_RESULT_HANDLED;
+ }
+ else if (dbus_message_is_signal (message, DBUS_INTERFACE, "ping")) {
+- gchar *data = g_strdup("PONG");
+ DBusMessage *reply;
+ fprintf(stderr, "!!Ping!! received from %s\n",
+ dbus_message_get_sender(message));
+diff --git a/src/misc.c b/src/misc.c
+index 266737b..dd7b51b 100644
+--- a/src/misc.c
++++ b/src/misc.c
+@@ -33,6 +33,7 @@ on_next_unread_item_activate(gpointer a)
+ return 1;
+ }
+
++#if 0
+ static void
+ print_hash(gpointer key, gpointer value, gpointer user_data)
+ {
+@@ -45,6 +46,7 @@ free_hash(gpointer key, gpointer value, gpointer user_data)
+ g_print("FREE - key:%p, value:%p\n", key, value);
+ // xmlFreeDoc(key);
+ }
++#endif
+
+ gchar *
+ strextr(gchar *text, gchar *substr)
+@@ -105,25 +107,18 @@ gchar *
+ sanitize_folder(gchar *text)
+ {
+ g_return_val_if_fail( text != NULL, NULL);
++
+ //first convert "/" character
+ char *tmp = g_strdup(text);
+ g_strdelimit(tmp, "/", '|');
+- GString *str = g_string_new(NULL);
+- gchar *string;
+- const unsigned char *s = (const unsigned char *)tmp;
+- g_string_append(str, tmp);
+- guint len = strlen(tmp);
+- while (*s == '.' && len)
+- {
+- str = g_string_erase (str, 0, 1);
+- s = str->str;
+- len--;
+- }
+- g_string_append_c(str, 0);
+- string = str->str;
+- g_string_free(str, 0);
+- g_free(tmp);
+- return string;
++
++ // Strip leading dots
++ char *tmp2 = tmp;
++ while (*tmp2 == '.') tmp2++;
++ tmp2 = g_strdup (tmp2);
++ g_free (tmp);
++
++ return tmp2;
+ }
+
+ static gchar *
+@@ -181,7 +176,7 @@ strplchr(gchar *source)
+ if (*s == 0x3f)
+ {
+ g_string_append(str, "%3F");
+- *s++;
++ s++;
+ }
+ else
+ g_string_append_c (str, *s++);
+@@ -347,7 +342,7 @@ gchar *extract_main_folder(gchar *folder)
+ gchar *base = g_strdup_printf("%s/", main_folder);
+ gchar **nnew;
+ gchar *tmp;
+- if (nnew = g_strsplit(folder, base, 0))
++ if ((nnew = g_strsplit(folder, base, 0)))
+ {
+ g_free(base);
+ tmp = g_strdup(nnew[1]);
+diff --git a/src/network-soup.c b/src/network-soup.c
+index c8254cd..2c0deff 100644
+--- a/src/network-soup.c
++++ b/src/network-soup.c
+@@ -38,7 +38,7 @@ typedef struct {
+ NetStatusCallback user_cb;
+ gpointer user_data;
+ int current, total;
+- gchar *chunk;
++ const gchar *chunk;
+ } CallbackInfo;
+
+ static void
+@@ -188,7 +188,7 @@ proxy_init(void)
+
+ //this will insert proxy in the session
+ void
+-proxify_session(EProxy *proxy, SoupSession *session, gchar *uri)
++proxify_session(EProxy *proxy, SoupSession *session, const gchar *uri)
+ {
+ SoupURI *proxy_uri = NULL;
+
+@@ -357,7 +357,6 @@ reauthenticate (SoupSession *session,
+ char **password,
+ gpointer data)
+ {
+- gchar *user, *pass;
+ if (rf->soup_auth_retry)
+ {
+ //means we're already tested once and probably
+diff --git a/src/network.h b/src/network.h
+index ee4473e..460521e 100644
+--- a/src/network.h
++++ b/src/network.h
+@@ -106,8 +106,8 @@ typedef enum {
+ typedef struct {
+ guint32 current;
+ guint32 total;
+- gchar *chunk;
+- gchar *chunksize;
++ const gchar *chunk;
++ guint32 chunksize;
+ } NetStatusProgress;
+
+ typedef void (*NetStatusCallback)(NetStatusType status,
+diff --git a/src/parser.c b/src/parser.c
+index db5d8c4..8d92f3c 100644
+--- a/src/parser.c
++++ b/src/parser.c
+@@ -39,9 +39,9 @@ html_set_base(xmlNode *doc, char *base, char *tag, char *prop, char *basehref)
+ #else
+ SoupURI *base_uri = soup_uri_new (base);
+ #endif
+- while (doc = html_find((xmlNode *)doc, tag))
++ while ((doc = html_find((xmlNode *)doc, tag)))
+ {
+- if (url = xmlGetProp(doc, prop))
++ if ((url = xmlGetProp(doc, prop)))
+ {
+ if (!strncmp(tag, "img", 3) && !strncmp(prop, "src", 3))
+ {
+@@ -257,8 +257,6 @@ parse_html(char *url, const char *html, int len)
+ static gchar *
+ parse_href (const gchar *s, const gchar *base)
+ {
+- gchar *retval;
+- gchar *tmp;
+ gchar *tmpurl;
+
+ if(s == NULL || *s == 0)
+@@ -268,18 +266,19 @@ parse_href (const gchar *s, const gchar *base)
+ // if (html_url_get_protocol (tmpurl) == NULL) {
+ if (s[0] == '/') {
+ if (s[1] == '/') {
++#if 0
+ gchar *t;
+-
+ /* Double slash at the beginning. */
+
+ /* FIXME? This is a bit sucky. */
+-/* t = g_strconcat (html_url_get_protocol (baseURL),
++ t = g_strconcat (html_url_get_protocol (baseURL),
+ ":", s, NULL);
+ html_url_destroy (tmpurl);
+ tmpurl = html_url_new (t);
+ retval = html_url_to_string (tmpurl);
+ html_url_destroy (tmpurl);
+- g_free (t);*/
++ g_free (t);
++#endif
+ } else {
+ /* Single slash at the beginning. */
+
+@@ -583,8 +582,6 @@ layer_find_tag_prop (xmlNodePtr node,
+ char *search,
+ char *fail)
+ {
+- gchar *content;
+- guint len = 0;
+ int i;
+ char* (*func)();
+
+@@ -993,12 +990,12 @@ parse_channel_line(xmlNode *top, gchar *feed_name, char *main_date)
+ {
+ xmlNode *doc = (xmlNode *)src;
+
+- while (doc = html_find(doc, "img"))
++ while ((doc = html_find(doc, "img")))
+ {
+ gchar *name = NULL;
+ xmlChar *url = xmlGetProp(doc, "src");
+ if (url) {
+- if (name = fetch_image(url, link)) {
++ if ((name = fetch_image(url, link))) {
+ xmlSetProp(doc, "src", name);
+ g_free(name);
+ }
+@@ -1043,11 +1040,7 @@ update_channel(RDF *r)
+ {
+ guint i;
+ gchar *sender;
+- char *d2 = NULL;
+ xmlNodePtr el;
+- char *q = NULL;
+- char *b = NULL;
+- gchar *encl;
+ gchar *subj;
+ create_feed *CF;
+ CamelFolder *mail_folder;
+diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
+index 74bd54d..06efccc 100644
+--- a/src/rss-config-factory.c
++++ b/src/rss-config-factory.c
+@@ -296,8 +296,6 @@ create_dialog_add(gchar *text, gchar *feed_text)
+ gboolean enabled = TRUE;
+ gboolean del_unread = FALSE;
+ guint del_feed = 0;
+- guint del_days = 10;
+- guint del_messages = 10;
+ GtkAccelGroup *accel_group = gtk_accel_group_new ();
+
+ gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+@@ -430,7 +428,7 @@ create_dialog_add(gchar *text, gchar *feed_text)
+ case 3:
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton6), 1);
+ break;
+- defaut:
++ default:
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton4), 1);
+ break;
+ }
+@@ -749,7 +747,6 @@ delete_response(GtkWidget *selector, guint response, gpointer user_data)
+ GtkTreeIter iter;
+ gchar *name;
+ CamelException ex;
+- CamelFolder *mail_folder;
+ if (response == GTK_RESPONSE_OK) {
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(user_data));
+ if (gtk_tree_selection_get_selected(selection, &model, &iter))
+@@ -794,6 +791,7 @@ delete_response(GtkWidget *selector, guint response, gpointer user_data)
+ rf->import = 0;
+ }
+
++#if 0
+ feeds_dialog_disable(GtkDialog *d, gpointer data)
+ {
+ GtkTreeSelection *selection;
+@@ -817,6 +815,7 @@ feeds_dialog_disable(GtkDialog *d, gpointer data)
+ g_hash_table_foreach(rf->hrname, construct_list, model);
+ save_gconf_feed();
+ }
++#endif
+
+ GtkWidget*
+ remove_feed_dialog(gchar *msg)
+@@ -824,11 +823,8 @@ remove_feed_dialog(gchar *msg)
+ GtkWidget *dialog1;
+ GtkWidget *dialog_vbox1;
+ GtkWidget *vbox1;
+- GtkWidget *label1;
+ GtkWidget *checkbutton1;
+ GtkWidget *dialog_action_area1;
+- GtkWidget *cancelbutton1;
+- GtkWidget *okbutton1;
+
+ dialog1 = e_error_new(NULL, "org-gnome-evolution-rss:ask-delete-feed", msg, NULL);
+ gtk_window_set_keep_above(GTK_WINDOW(dialog1), TRUE);
+@@ -858,6 +854,7 @@ remove_feed_dialog(gchar *msg)
+ return dialog1;
+ }
+
++static void
+ feeds_dialog_delete(GtkDialog *d, gpointer data)
+ {
+ GtkTreeSelection *selection;
+@@ -1069,7 +1066,6 @@ import_opml(gchar *file)
+ {
+ gchar *url = NULL;
+ xmlChar *name = NULL;
+- xmlChar *buff = NULL;
+ guint total = 0;
+ guint current = 0;
+ guint type = 0; //file type
+@@ -1080,7 +1076,6 @@ import_opml(gchar *file)
+
+ xmlNode *src = (xmlNode *)xmlParseFile (file);
+ xmlNode *doc = src;
+- xmlNode *my = src;
+ gchar *msg = g_strdup(_("Importing feeds..."));
+ import_dialog = e_error_new((GtkWindow *)rf->preferences, "shell:importing", msg, NULL);
+ gtk_window_set_keep_above(GTK_WINDOW(import_dialog), TRUE);
+@@ -1099,7 +1094,7 @@ import_opml(gchar *file)
+ 0);
+ gtk_widget_show_all(import_dialog);
+ g_free(msg);
+- if (src=src->children)
++ if ((src=src->children))
+ {
+ d(g_print("found %s\n", src->name));
+ if (!g_ascii_strcasecmp(src->name, "rdf")) {
+@@ -1111,7 +1106,7 @@ import_opml(gchar *file)
+ src = src->children;
+ d(g_print("group name:%s\n", layer_find(src, "name", NULL)));
+ src = src->next;
+- while (src = iterate_import_file(src, &url, &name, 1)) {
++ while ((src = iterate_import_file(src, &url, &name, 1))) {
+ if (url) {
+ total++;
+ xmlFree(url);
+@@ -1124,7 +1119,7 @@ import_opml(gchar *file)
+ }
+ else if (!g_ascii_strcasecmp(src->name, "opml")) {
+
+- while (src = iterate_import_file(src, &url, &name, 0)) {
++ while ((src = iterate_import_file(src, &url, &name, 0))) {
+ if (url && strlen(url)) {
+ total++;
+ xmlFree(url);
+@@ -1153,7 +1148,7 @@ import_opml(gchar *file)
+ d(g_print("group name:%s\n", layer_find(src, "name", NULL)));
+ src = src->next;
+ }
+- while (src = iterate_import_file(src, &url, &name, type)) {
++ while ((src = iterate_import_file(src, &url, &name, type))) {
+ if (url && strlen(url)) {
+ g_print("url:%s\n", url);
+ if (rf->cancel)
+@@ -1518,7 +1513,6 @@ select_export_response(GtkWidget *selector, guint response, gpointer user_data)
+ static void
+ decorate_export_fs (gpointer data)
+ {
+- add_feed *feed = g_new0(add_feed, 1);
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (data), TRUE);
+ gtk_dialog_set_default_response (GTK_DIALOG (data), GTK_RESPONSE_OK);
+ gtk_file_chooser_set_local_only (data, FALSE);
+@@ -1603,7 +1597,6 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
+ {
+ GtkListStore *store;
+ GtkTreeIter iter;
+- GConfClient *gconf = gconf_client_get_default();
+ GtkWidget *hbox;
+ guint i;
+
+@@ -1735,15 +1728,10 @@ GtkWidget *
+ folder_factory (EPlugin *epl, EConfigHookItemFactoryData *data)
+ {
+ EMConfigTargetFolder *target= (EMConfigTargetFolder *)data->config->target;
+- CamelFolder *cml_folder = target->folder;
+- CamelService *service;
+- CamelProvider *provider;
+ GtkWidget *lbl_size, *lbl_size_val;
+- GtkListStore *model;
+ GtkVBox *vbx;
+ GtkHBox *hbx_size;
+- char *folder_name, *folder_size;
+- int mode;
++ char *folder_size;
+ GladeXML *gui;
+
+ char *gladefile;
+@@ -1794,7 +1782,6 @@ rss_config_control_new (void)
+
+ GtkListStore *store;
+ GtkTreeIter iter;
+- int i;
+ GtkCellRenderer *cell;
+ GtkTreeSelection *selection;
+ GtkTreeViewColumn *column;
+diff --git a/src/rss.c b/src/rss.c
+index 4f59f35..c2c7297 100644
+--- a/src/rss.c
++++ b/src/rss.c
+@@ -24,6 +24,7 @@
+ int rss_verbose_debug = 0;
+ #define d(x) (rss_verbose_debug?(x):0)
+
++#define _GNU_SOURCE
+ #include <string.h>
+ #include <stdio.h>
+ #include <time.h>
+@@ -516,9 +517,11 @@ browser_write(gchar *string, gint length, gchar *base)
+ #endif
+ break;
+ case 1:
++#ifdef HAVE_WEBKIT
+ webkit_web_view_load_html_string(WEBKIT_WEB_VIEW(rf->mozembed),
+ string,
+ base);
++#endif
+ break;
+ }
+ }
+@@ -1642,6 +1645,7 @@ rss_menu_items_free(EPopup *ep, GSList *items, void *data)
+ g_slist_free(items);
+ }
+
++#ifdef HAVE_WEBKIT
+ static gboolean
+ webkit_click (WebKitWebView *view, WebKitWebFrame *frame, WebKitNetworkRequest *request)
+ {
+@@ -1654,7 +1658,9 @@ webkit_click (WebKitWebView *view, WebKitWebFrame *frame, WebKitNetworkRequest *
+ g_print("uri:%s\n", uri);
+ return TRUE;
+ }
++#endif
+
++#ifdef HAVE_GECKO
+ 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)
+ gtk_moz_embed_load_url(rf->mozembed, link);
+ g_print("button:%d\n", button);
+ }
++#endif
+
+ #ifdef HAVE_RENDERKIT
+ static gboolean
+@@ -3126,11 +3133,11 @@ lookup_feed_folder(gchar *folder)
+ return new_folder ? new_folder : folder;
+ }
+
+-gpointer
++gchar *
+ lookup_chn_name_by_url(gchar *url)
+ {
+ gpointer crc_feed = gen_md5(url);
+- gpointer chn_name = g_hash_table_lookup(rf->hrname_r,
++ gchar * chn_name = g_hash_table_lookup(rf->hrname_r,
+ g_strdup(crc_feed));
+ g_free(crc_feed);
+ return chn_name;
+diff --git a/src/rss.h b/src/rss.h
+index a9eaee5..5357d0b 100644
+--- a/src/rss.h
++++ b/src/rss.h
+@@ -303,7 +303,7 @@ static gboolean check_if_match (gpointer key, gpointer value, gpointer user_data
+ void save_gconf_feed(void);
+ void rss_error(gpointer key, gchar *name, gchar *error, gchar *emsg);
+ void rss_select_folder(gchar *folder_name);
+-gpointer lookup_chn_name_by_url(gchar *url);
++gchar *lookup_chn_name_by_url(gchar *url);
+ gboolean update_articles(gboolean disabler);
+ static xmlNode *html_find (xmlNode *node, char *match);
+ gchar *lookup_main_folder(void);
More information about the pkg-evolution-commits
mailing list