diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-07-23 22:55:52 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-07-23 22:55:52 +0800 |
| commit | 64a3e0a91c24b5b6677bfc1149505e620ddc4875 (patch) | |
| tree | f29d109cd8938e517dfdd6c046da36160e07052d | |
| parent | c4e2afa4a076769c3bd22393edd6ca8710f96c2e (diff) | |
| download | gsoc2013-evolution-64a3e0a91c24b5b6677bfc1149505e620ddc4875.tar.gz gsoc2013-evolution-64a3e0a91c24b5b6677bfc1149505e620ddc4875.tar.zst gsoc2013-evolution-64a3e0a91c24b5b6677bfc1149505e620ddc4875.zip | |
Fix a non-ANSI switch label.
* e-component-listener.c (connection_listen_cb): Fix a non-ANSI
switch label.
* e-gui-utils.c: only include "art/empty.xpm" if
HAVE_LIBGNOMEUI_GNOME_ICON_LOOKUP_H isn't defined
* e-xml-hash-utils.c (e_xml_to_hash): Deconstify a non-const
variable to fix a warning.
svn path=/trunk/; revision=21901
| -rw-r--r-- | e-util/ChangeLog | 11 | ||||
| -rw-r--r-- | e-util/e-component-listener.c | 1 | ||||
| -rw-r--r-- | e-util/e-gui-utils.c | 7 | ||||
| -rw-r--r-- | e-util/e-xml-hash-utils.c | 3 |
4 files changed, 18 insertions, 4 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 65389666b9..338519c8a2 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,14 @@ +2003-07-23 Dan Winship <danw@ximian.com> + + * e-component-listener.c (connection_listen_cb): Fix a non-ANSI + switch label. + + * e-gui-utils.c: only include "art/empty.xpm" if + HAVE_LIBGNOMEUI_GNOME_ICON_LOOKUP_H isn't defined + + * e-xml-hash-utils.c (e_xml_to_hash): Deconstify a non-const + variable to fix a warning. + 2003-07-03 JP Rosevear <jpr@ximian.com> * e-xml-hash-utils.c (foreach_save_func): encode the text diff --git a/e-util/e-component-listener.c b/e-util/e-component-listener.c index 024e4a93f1..1e7027f33d 100644 --- a/e-util/e-component-listener.c +++ b/e-util/e-component-listener.c @@ -53,6 +53,7 @@ connection_listen_cb (gpointer object, gpointer user_data) g_object_unref (cl); break; default : + break; } } } diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c index 80cf4affc0..fc8e5921b2 100644 --- a/e-util/e-gui-utils.c +++ b/e-util/e-gui-utils.c @@ -23,12 +23,13 @@ #include <gtk/gtkhbox.h> #include <libgnome/gnome-program.h> -#ifdef HAVE_LIBGNOMEUI_GNOME_ICON_LOOKUP_H -#include <libgnomeui/gnome-icon-lookup.h> -#endif #include <libgnomevfs/gnome-vfs-mime-handlers.h> +#ifdef HAVE_LIBGNOMEUI_GNOME_ICON_LOOKUP_H +#include <libgnomeui/gnome-icon-lookup.h> +#else #include "art/empty.xpm" +#endif GtkWidget *e_create_image_widget(gchar *name, gchar *string1, gchar *string2, diff --git a/e-util/e-xml-hash-utils.c b/e-util/e-xml-hash-utils.c index 3100807b13..ba72321afe 100644 --- a/e-util/e-xml-hash-utils.c +++ b/e-util/e-xml-hash-utils.c @@ -32,7 +32,8 @@ GHashTable * e_xml_to_hash (xmlDoc *doc, EXmlHashType type) { xmlNode *root, *node; - const char *key, *value; + const char *key; + xmlChar *value; GHashTable *hash; hash = g_hash_table_new (g_str_hash, g_str_equal); |