fix some compilation warnings. Close bug #330384.
2006-02-08 Luca Cavalli <loopback@slackit.org> * 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.
This commit is contained in:
parent
05042a5cb1
commit
54f951afb8
3 changed files with 15 additions and 14 deletions
|
@ -1,3 +1,11 @@
|
|||
2006-02-08 Luca Cavalli <loopback@slackit.org>
|
||||
|
||||
* 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 <chpe@gnome.org>
|
||||
|
||||
Fixes #327220
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <gnome.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
|
@ -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);
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <libxml/parser.h>
|
||||
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue