[evolution-rss] fix a regression caused by latest commit

[Lucian Langa <lucilanga src gnome org>]

commit d5bb9d6c54d5f379fca39e521cf5bb6494714d39
Author: Lucian Langa <lucilanga gnome org>
Date:   Wed Jun 3 23:11:36 2009 +0300

    fix a regression caused by latest commit
---
 src/rss-config-factory.c |   13 ++++++++-----
 src/rss-ui.glade         |    3 +--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index e70a7e3..baac5ac 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <glib.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 #include <gdk/gdkkeysyms.h>
@@ -41,7 +42,6 @@
 #include "rss.h"
 #include "misc.h"
 #include "parser.h"
-#include <glib/gi18n-lib.h>
 
 #define d(x)
 
@@ -341,6 +341,7 @@ build_dialog_add(gchar *url, gchar *feed_text)
   	guint del_feed = 0;
 	gchar *iconfile = NULL, *deffile = NULL;
 	GdkPixbuf *folder_icon = NULL;
+	gpointer key = NULL;
 	GtkAccelGroup *accel_group = gtk_accel_group_new ();
 
         gladefile = g_build_filename (EVOLUTION_GLADEDIR,
@@ -364,8 +365,8 @@ build_dialog_add(gchar *url, gchar *feed_text)
 
         GtkWidget *entry1 = (GtkWidget *)glade_xml_get_widget (gui, "url_entry");
   	//editing
-  	gpointer key = lookup_key(feed_text);
   	if (url != NULL) {
+  		key = lookup_key(feed_text);
 		gtk_expander_set_expanded(GTK_EXPANDER(adv_options), TRUE);	
   		gtk_entry_set_text(GTK_ENTRY(entry1), url);
 		fhtml = GPOINTER_TO_INT(
@@ -425,14 +426,16 @@ build_dialog_add(gchar *url, gchar *feed_text)
 	GtkWidget *radiobutton5 = (GtkWidget *)glade_xml_get_widget (gui, "ttl");
 	GtkWidget *radiobutton6 = (GtkWidget *)glade_xml_get_widget (gui, "ttl_disabled");
 	GtkWidget *ttl_value = (GtkWidget *)glade_xml_get_widget (gui, "ttl_value");
-        GtkWidget *folder_box = (GtkWidget *)glade_xml_get_widget (gui, "folder_box");
-        GtkWidget *image = (GtkWidget *)glade_xml_get_widget (gui, "image1");
+        GtkImage *image = (GtkImage *)glade_xml_get_widget (gui, "image1");
 	gtk_spin_button_set_range((GtkSpinButton *)ttl_value, 0, (guint)MAX_TTL);
 
 	/*set feed icon*/
-	gtk_image_set_from_icon_name(image, 
+	if (key) {
+		gtk_image_set_from_icon_name(image, 
 			g_hash_table_lookup(icons, key) ? key : "evolution-rss-main",
 			GTK_ICON_SIZE_LARGE_TOOLBAR);
+		gtk_widget_show(GTK_WIDGET(image));
+	}
 
   	switch (del_feed) {
         case 1:         //all but the last
diff --git a/src/rss-ui.glade b/src/rss-ui.glade
index fa119d0..b3fda12 100644
--- a/src/rss-ui.glade
+++ b/src/rss-ui.glade
@@ -947,9 +947,9 @@
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
+    <property name="action">save</property>
     <property name="local_only">False</property>
     <property name="show_hidden">True</property>
-    <property name="action">save</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="vbox26">
         <property name="visible">True</property>
@@ -1050,7 +1050,6 @@
                 <property name="spacing">8</property>
                 <child>
                   <widget class="GtkImage" id="image1">
-                    <property name="visible">True</property>
                     <property name="stock">gtk-missing-image</property>
                     <property name="icon-size">6</property>
                   </widget>