diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2007-06-03 10:49:38 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-06-03 10:49:38 +0800 |
| commit | bdb60ce109c1a2958c89bb07b599407d26a2cf4f (patch) | |
| tree | 691263b22b737cd652d26200accd031fd93c870f | |
| parent | 646455c0f94ac047b3ed44dbd7e796f746451700 (diff) | |
| download | gsoc2013-evolution-bdb60ce109c1a2958c89bb07b599407d26a2cf4f.tar.gz gsoc2013-evolution-bdb60ce109c1a2958c89bb07b599407d26a2cf4f.tar.zst gsoc2013-evolution-bdb60ce109c1a2958c89bb07b599407d26a2cf4f.zip | |
Fix compilation warnings in shell directory (#441055).
svn path=/trunk/; revision=33627
| -rw-r--r-- | shell/ChangeLog | 10 | ||||
| -rw-r--r-- | shell/e-component-registry.c | 3 | ||||
| -rw-r--r-- | shell/e-shell-nm-glib.c | 6 | ||||
| -rw-r--r-- | shell/e-shell-settings-dialog.c | 2 |
4 files changed, 16 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 4f852dff4b..4222dcf296 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,13 @@ +2007-06-02 Gilles Dartiguelongue <dartigug@esiee.fr> + + * Fix bug #441055 + + * e-component-registry.c: (query_components): + * e-shell-nm-glib.c: (e_shell_nm_glib_initialise), + (e_shell_nm_glib_dispose): + * e-shell-settings-dialog.c: (load_pages): + various compilation warning cleanup + 2007-05-28 Jules Colding <colding@omesc.com> * main.c (main): Prevent dup2() and close() on -1 diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index d4a9411490..21a87629e9 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -149,7 +149,6 @@ query_components (EComponentRegistry *registry) const gchar * const *language_names; CORBA_Environment ev; GSList *languages = NULL; - const GList *l; char *query; int i; @@ -173,7 +172,7 @@ query_components (EComponentRegistry *registry) language_names = g_get_language_names (); while (*language_names != NULL) - languages = g_slist_append (languages, *language_names++); + languages = g_slist_append (languages, (gpointer)(*language_names++)); for (i = 0; i < info_list->_length; i++) { const char *id; diff --git a/shell/e-shell-nm-glib.c b/shell/e-shell-nm-glib.c index 5f5d68db3f..f67c744f02 100644 --- a/shell/e-shell-nm-glib.c +++ b/shell/e-shell-nm-glib.c @@ -55,8 +55,10 @@ static void e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_dat } } +int e_shell_nm_glib_initialise (EShellWindow *window); +void e_shell_nm_glib_dispose (EShellWindow *window); -int e_shell_nm_glib_initialise (EShellWindow *window ) +int e_shell_nm_glib_initialise (EShellWindow *window) { if (!nm_ctx) { @@ -72,7 +74,7 @@ int e_shell_nm_glib_initialise (EShellWindow *window ) return TRUE; } -void e_shell_nm_glib_dispose (EShellWindow *window ) +void e_shell_nm_glib_dispose (EShellWindow *window) { if (id != 0 && nm_ctx != NULL) { libnm_glib_unregister_callback (nm_ctx, id); diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 9f3f24e2a2..1732d5e95a 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -172,7 +172,7 @@ load_pages (EShellSettingsDialog *dialog) language_names = g_get_language_names (); while (*language_names != NULL) - languages = g_slist_append (languages, *language_names++); + languages = g_slist_append (languages, (gpointer)(*language_names++)); page_list = NULL; for (i = 0; i < control_list->_length; i ++) { |