diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog index 9dcf349a9..481a32ceb 100644 --- a/capplets/default-applications/ChangeLog +++ b/capplets/default-applications/ChangeLog @@ -1,3 +1,11 @@ +2006-02-08 Luca Cavalli + + * gnome-da-capplet.c: (web_radiobutton_toggled_cb), + (web_item_comp), (mail_gconf_changed_cb), (term_gconf_changed_cb), + (show_dialog): + * gnome-da-xml.c: (gnome_da_xml_load_xml): fix some compilation + warnings. Close bug #330384. + 2006-01-28 chpe Fixes #327220 diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c index 91ce7c54a..e70fe1bc7 100644 --- a/capplets/default-applications/gnome-da-capplet.c +++ b/capplets/default-applications/gnome-da-capplet.c @@ -22,7 +22,7 @@ #include "config.h" #endif -#include +#include #include #include @@ -169,15 +169,15 @@ web_radiobutton_toggled_cb (GtkToggleButton *togglebutton, GnomeDACapplet *cappl item = (GnomeDAWebItem*) g_list_nth_data (capplet->web_browsers, index); - if (GTK_WIDGET (togglebutton) == capplet->default_radiobutton) { - command = item->generic.command; - } - else if (GTK_WIDGET (togglebutton) == capplet->new_win_radiobutton) { + if (GTK_WIDGET (togglebutton) == capplet->new_win_radiobutton) { command = item->win_command; } else if (GTK_WIDGET (togglebutton) == capplet->new_tab_radiobutton) { command = item->tab_command; } + else { + command = item->generic.command; + } gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error); @@ -373,7 +373,6 @@ generic_item_comp (gconstpointer list_item, gconstpointer command) static gint web_item_comp (gconstpointer item, gconstpointer command) { - gint res; GnomeDAWebItem *web_list_item; web_list_item = (GnomeDAWebItem *) item; @@ -555,8 +554,6 @@ static void mail_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet) { GConfValue *value; - GList *mail_entry; - gint index; g_return_if_fail (gconf_entry_get_key (entry) != NULL); @@ -577,8 +574,6 @@ static void term_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet) { GConfValue *value; - GList *terminal_entry; - gint index; g_return_if_fail (gconf_entry_get_key (entry) != NULL); @@ -671,7 +666,6 @@ show_dialog (GnomeDACapplet *capplet) { GConfValue *value; GtkIconTheme *theme; - gint i; if (g_file_test (GLADEDIR "/gnome-default-applications-properties.glade", G_FILE_TEST_EXISTS) != FALSE) { capplet->xml = glade_xml_new (GLADEDIR "/gnome-default-applications-properties.glade", NULL, PACKAGE); diff --git a/capplets/default-applications/gnome-da-xml.c b/capplets/default-applications/gnome-da-xml.c index c05bd4eb5..87f315b78 100644 --- a/capplets/default-applications/gnome-da-xml.c +++ b/capplets/default-applications/gnome-da-xml.c @@ -18,6 +18,7 @@ * */ +#include #include #include #include @@ -126,13 +127,11 @@ static void gnome_da_xml_load_xml (GnomeDACapplet *capplet, const gchar * filename) { xmlDoc *xml_doc; - xmlNode *root, *section, *element, *value; + xmlNode *root, *section, *element; GnomeDAWebItem *web_item; GnomeDAMailItem *mail_item; GnomeDATermItem *term_item; - gint i; - xml_doc = xmlParseFile (filename); if (!xml_doc)