From 3daf545d0c7792b4e543bbf12b160c140f1b35fc Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Mon, 29 Jan 2007 09:20:09 +0000 Subject: [PATCH] Fix compiler warnings. Correct order of args to a gnome_vfs_xfer function. 2007-01-29 Kjartan Maraas * gnome-theme-details.c: (update_color_scheme_tab), (remove_theme), (gnome_theme_details_init): * gnome-theme-installer.c: (extract_files_error_dialog): * gnome-theme-manager.c: (get_lockdown_status): Fix compiler warnings. Correct order of args to a gnome_vfs_xfer function. svn path=/trunk/; revision=7198 --- capplets/theme-switcher/ChangeLog | 9 +++++++++ capplets/theme-switcher/gnome-theme-details.c | 12 ++++++------ capplets/theme-switcher/gnome-theme-installer.c | 2 +- capplets/theme-switcher/gnome-theme-manager.c | 4 ++-- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog index 28b2e0969..75a15d6c7 100644 --- a/capplets/theme-switcher/ChangeLog +++ b/capplets/theme-switcher/ChangeLog @@ -1,3 +1,12 @@ +2007-01-29 Kjartan Maraas + + * gnome-theme-details.c: (update_color_scheme_tab), (remove_theme), + (gnome_theme_details_init): + * gnome-theme-installer.c: (extract_files_error_dialog): + * gnome-theme-manager.c: (get_lockdown_status): + Fix compiler warnings. Correct order of args to a gnome_vfs_xfer + function. + 2007-01-26 Thomas Wood Patch by: Alberto Ruiz diff --git a/capplets/theme-switcher/gnome-theme-details.c b/capplets/theme-switcher/gnome-theme-details.c index c97ad4051..dcb059502 100644 --- a/capplets/theme-switcher/gnome-theme-details.c +++ b/capplets/theme-switcher/gnome-theme-details.c @@ -203,7 +203,7 @@ gtk_theme_update_remove_button (GtkTreeSelection *selection, } static void -update_color_scheme_tab () +update_color_scheme_tab (void) { GSList *symbolic_colors = NULL; GSList *engines = NULL; @@ -472,8 +472,8 @@ remove_theme(GtkWidget *button, gpointer data) uri_list = g_list_prepend(NULL, gnome_vfs_uri_new (theme_dir)); - result = gnome_vfs_xfer_delete_list (uri_list, GNOME_VFS_XFER_RECURSIVE, - GNOME_VFS_XFER_ERROR_MODE_ABORT, + result = gnome_vfs_xfer_delete_list (uri_list, GNOME_VFS_XFER_ERROR_MODE_ABORT, + GNOME_VFS_XFER_RECURSIVE, NULL, NULL); if (result == GNOME_VFS_OK) { @@ -501,7 +501,7 @@ remove_theme(GtkWidget *button, gpointer data) } } -void +static void color_select (GtkWidget *colorbutton, GladeXML *dialog) { GConfClient *client = NULL; @@ -585,7 +585,7 @@ gnome_theme_details_init (void) /* gtk themes */ widget = WID ("control_remove_button"); - g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (remove_theme), THEME_GTK); + g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (remove_theme), (gint*)THEME_GTK); widget = WID ("control_install_button"); g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (gnome_theme_installer_run_cb), parent); @@ -846,7 +846,7 @@ update_list_something (GtkWidget *tree_view, const gchar *theme) } } -void +static void update_color_buttons_from_string (gchar *color_scheme) { GdkColor color_scheme_colors[6]; diff --git a/capplets/theme-switcher/gnome-theme-installer.c b/capplets/theme-switcher/gnome-theme-installer.c index 33a6fa506..0dd7db7ce 100644 --- a/capplets/theme-switcher/gnome-theme-installer.c +++ b/capplets/theme-switcher/gnome-theme-installer.c @@ -156,7 +156,7 @@ missing_utility_message_dialog (gchar *utility) } static void -extract_files_error_dialog () +extract_files_error_dialog (void) { GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Can not install theme. \nThere was a problem while extracting the theme")); diff --git a/capplets/theme-switcher/gnome-theme-manager.c b/capplets/theme-switcher/gnome-theme-manager.c index b0c5210e2..0606ab5a0 100644 --- a/capplets/theme-switcher/gnome-theme-manager.c +++ b/capplets/theme-switcher/gnome-theme-manager.c @@ -963,7 +963,7 @@ update_settings_from_gconf_idle (gpointer data) return FALSE; } -void +static void update_settings_from_gconf (void) { if (update_settings_from_gconf_idle_id != 0) @@ -1297,7 +1297,7 @@ revert_theme_clicked (GtkWidget *button, /* Find out if the lockdown key has been set. Currently returns false on error... */ static gboolean -get_lockdown_status () +get_lockdown_status (void) { GConfClient *client; gboolean result;