[evolution-rss] warnings cleanup; remove obsolete code

[Lucian Langa <lucilanga src gnome org>]

commit 164d679438aed4595cd1cf8c1f5c0aa878c95fb8
Author: Lucian Langa <lucilanga gnome org>
Date:   Fri May 22 08:34:07 2009 +0300

    warnings cleanup; remove obsolete code
---
 TODO                     |    2 +-
 src/dbus.c               |   18 ++++++++++--------
 src/misc.c               |   22 ++++++----------------
 src/rss-config-factory.c |   29 -----------------------------
 src/rss.c                |   10 +++++-----
 src/rss.h                |    2 +-
 6 files changed, 23 insertions(+), 60 deletions(-)

diff --git a/TODO b/TODO
index c58ea2c..15e567e 100644
--- a/TODO
+++ b/TODO
@@ -57,4 +57,4 @@
 	* grey stop button on complete load
 	* display links from content in status bar
 	* grey out disabled folders (feeds)
-	* runtime validation
+	* feed check runtime validation
diff --git a/src/dbus.c b/src/dbus.c
index 8346523..b1b2a10 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -30,7 +30,7 @@
 #include <gtk/gtk.h>
 
 #include "rss.h"
-//#include <rss-config-factory.h>
+#include "rss-config-factory.h"
 #include "misc.h"
 #include "dbus.h"
 
@@ -45,17 +45,18 @@ static gboolean enabled = FALSE;
 
 extern rssfeed *rf;
 
-/*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
@@ -64,11 +65,12 @@ send_dbus_message (const char *name, const char *data, guint new)
 				  DBUS_TYPE_INVALID);
 
 	/* Sends the message */
-//	dbus_connection_send (bus, message, NULL);
+	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)
@@ -122,7 +124,7 @@ filter_function (DBusConnection *connection, DBusMessage *message, void *user_da
                 		if (setup_feed(feed))
 				{
 					gchar *msg = g_strdup_printf(_("New feed imported: %s"),
-							(char *)lookup_chn_name_by_url(feed->feed_url));
+							lookup_chn_name_by_url(feed->feed_url));
 					taskbar_push_message(msg);
 					g_free(msg);
 				}	
diff --git a/src/misc.c b/src/misc.c
index e76f5fd..72d4f03 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -133,22 +133,12 @@ sanitize_folder(gchar *text)
 	//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 = (unsigned char *)(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;
 }
  
 gchar *
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index efb4923..3d441ef 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -220,20 +220,6 @@ rep_check_timeout_cb (GtkWidget *widget, gpointer data)
 }
 
 static void
-host_proxy_cb (GtkWidget *widget, gpointer data)
-{
-    gconf_client_set_string (rss_gconf, GCONF_KEY_HOST_PROXY,
-                gtk_entry_get_text((GtkEntry*)widget), NULL);
-}
-
-static void
-port_proxy_cb (GtkWidget *widget, gpointer data)
-{
-    gconf_client_set_int (rss_gconf, GCONF_KEY_PORT_PROXY,
-                gtk_spin_button_get_value_as_int((GtkSpinButton*)widget), NULL);
-}
-
-static void
 close_details_cb (GtkWidget *widget, gpointer data)
 {
         gtk_widget_hide(data);
@@ -330,8 +316,6 @@ build_dialog_add(gchar *url, gchar *feed_text)
   	gboolean fhtml = FALSE;
   	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,
@@ -807,7 +791,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)) {
@@ -1560,7 +1543,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);
@@ -2111,17 +2093,6 @@ rss_config_control_new (void)
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sf->use_proxy),
         	gconf_client_get_bool(rss_gconf, GCONF_KEY_USE_PROXY, NULL));
 	g_signal_connect(sf->use_proxy, "clicked", G_CALLBACK(start_check_cb), GCONF_KEY_USE_PROXY);
-
-	gchar *host = gconf_client_get_string(rss_gconf, GCONF_KEY_HOST_PROXY, NULL);
-	if (host)
-		gtk_entry_set_text(GTK_ENTRY(sf->host_proxy), host);
-	g_signal_connect(sf->host_proxy, "changed", G_CALLBACK(host_proxy_cb), NULL);
-
-  	gint port = gconf_client_get_int(rss_gconf, GCONF_KEY_PORT_PROXY, NULL);
-  	if (port)
-		gtk_spin_button_set_value((GtkSpinButton *)sf->port_proxy, (gdouble)port);
-	g_signal_connect(sf->port_proxy, "changed", G_CALLBACK(port_proxy_cb), NULL);
-	g_signal_connect(sf->port_proxy, "value_changed", G_CALLBACK(port_proxy_cb), NULL);
 #endif
 
 	g_signal_connect(sf->details, "clicked", G_CALLBACK(details_cb), sf->gui);
diff --git a/src/rss.c b/src/rss.c
index b7cc262..594374e 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -244,7 +244,7 @@ lookup_key(gpointer key)
 void
 compare_enabled(gpointer key, gpointer value, guint *data)
 {
-	if (value == 1)
+	if (GPOINTER_TO_INT(value) == 1)
 		*data = *data+1;
 }
 
@@ -252,7 +252,7 @@ guint
 rss_find_enabled(void)
 {
 	guint enabled=0;
-	g_hash_table_foreach (rf->hre, compare_enabled, &enabled);
+	g_hash_table_foreach (rf->hre, (GHFunc)compare_enabled, &enabled);
 	return enabled;
 }
 
@@ -2739,7 +2739,7 @@ finish_comments (SoupSession *soup_sess, SoupMessage *msg, EMFormatHTML *user_da
 	commstream = response->str; 
 
 	if (reload) {
-		em_format_redraw((EMFormatHTML *)user_data);
+		em_format_redraw((EMFormat *)user_data);
 	}
 	
 	while (gtk_events_pending ())
@@ -2931,11 +2931,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 8d077c9..5f0663b 100644
--- a/src/rss.h
+++ b/src/rss.h
@@ -311,7 +311,7 @@ void err_destroy (GtkWidget *widget, guint response, gpointer 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);
 xmlNode *html_find (xmlNode *node, char *match);
 gchar *lookup_main_folder(void);