diff options
| -rw-r--r-- | e-util/ChangeLog | 22 | ||||
| -rw-r--r-- | e-util/Makefile.am | 8 | ||||
| -rw-r--r-- | e-util/e-account-list.c | 1 | ||||
| -rw-r--r-- | e-util/e-account.c | 5 | ||||
| -rw-r--r-- | e-util/e-categories-config.c | 8 | ||||
| -rw-r--r-- | e-util/e-config-listener.c | 1 | ||||
| -rw-r--r-- | e-util/e-gui-utils.c | 1 | ||||
| -rw-r--r-- | e-util/e-lang-utils.c | 1 | ||||
| -rw-r--r-- | e-util/e-msgport.c | 2 | ||||
| -rw-r--r-- | e-util/e-passwords.c | 1 | ||||
| -rw-r--r-- | e-util/e-trie.c | 2 | ||||
| -rw-r--r-- | e-util/e-url.c | 3 | ||||
| -rw-r--r-- | e-util/ename/Makefile.am | 2 |
13 files changed, 40 insertions, 17 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 05bb50c343..01c2f72ce3 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,25 @@ +2003-02-05 Dan Winship <danw@ximian.com> + + * Makefile.am (eutilincludedir, etc): define in terms of + privincludedir. + + * ename/Makefile.am (libenameincludedir): Likewise + + * e-account.c: Fix warnings + * e-account-list.c: Likewise + * e-config-listener.c: Likewise + * e-gui-utils.c: Likewise. + * e-lang-utils.c: Likewise + * e-msgport.c: Likewise + * e-passwords.c: Likewise + + * e-categories-config.c + (e_categories_config_open_dialog_for_entry): Use g_object_get/_set + rather than gtk_ + + * e-url.c (e_uri_new): Use g_ascii_strdown instead of deprecated + g_strdown. + 2003-01-27 Ettore Perazzoli <ettore@ximian.com> * e-request.c (e_request_string): Port to GtkDialog. Strdup the diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 59ebc99b14..f9ab2c9e55 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -1,10 +1,8 @@ SUBDIRS = . ename -imagesdir = $(datadir)/evolution-$(BASE_VERSION)/images - -eutilincludedir = $(includedir)/evolution-$(BASE_VERSION)/e-util -econdincludedir = $(includedir)/evolution-$(BASE_VERSION)/e-conduit -edb3includedir = $(includedir)/evolution-$(BASE_VERSION)/e-db3util +eutilincludedir = $(privincludedir)/e-util +econdincludedir = $(privincludedir)/e-conduit +edb3includedir = $(privincludedir)/e-db3util INCLUDES = \ -I$(top_srcdir) \ diff --git a/e-util/e-account-list.c b/e-util/e-account-list.c index 89b0f1f9d8..bd6f026b63 100644 --- a/e-util/e-account-list.c +++ b/e-util/e-account-list.c @@ -25,6 +25,7 @@ #include "e-account.h" #include "e-util-marshal.h" +#include <string.h> #include <gal/util/e-util.h> struct EAccountListPrivate { diff --git a/e-util/e-account.c b/e-util/e-account.c index 16cded8cf6..510200b723 100644 --- a/e-util/e-account.c +++ b/e-util/e-account.c @@ -23,6 +23,10 @@ #include "e-account.h" +#include <string.h> +#include <time.h> +#include <unistd.h> + #include <gal/util/e-util.h> #include <libxml/parser.h> #include <libxml/tree.h> @@ -273,7 +277,6 @@ static gboolean xml_set_service (xmlNodePtr node, EAccountService *service) { gboolean changed = FALSE; - int timeout; changed |= xml_set_bool (node, "save-passwd", &service->save_passwd); changed |= xml_set_bool (node, "keep-on-server", &service->keep_on_server); diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c index 7131f7b88c..9dcfc53da5 100644 --- a/e-util/e-categories-config.c +++ b/e-util/e-categories-config.c @@ -187,17 +187,13 @@ e_categories_config_open_dialog_for_entry (GtkEntry *entry) text = gtk_entry_get_text (GTK_ENTRY (entry)); dialog = GTK_DIALOG (e_categories_new (text)); - gtk_object_set (GTK_OBJECT (dialog), - "ecml", ecmlw, - NULL); + g_object_set (dialog, "ecml", ecmlw, NULL); /* run the dialog */ result = gtk_dialog_run (dialog); if (result == 0) { - gtk_object_get (GTK_OBJECT (dialog), - "categories", &categories, - NULL); + g_object_get (dialog, "categories", &categories, NULL); gtk_entry_set_text (GTK_ENTRY (entry), categories); g_free (categories); } diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c index 8db46d049d..19c40b1dba 100644 --- a/e-util/e-config-listener.c +++ b/e-util/e-config-listener.c @@ -8,6 +8,7 @@ * Copyright 2002, Ximian, Inc. */ +#include <string.h> #include <gconf/gconf-client.h> #include "e-config-listener.h" diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c index 892f97a064..f7c2e2a458 100644 --- a/e-util/e-gui-utils.c +++ b/e-util/e-gui-utils.c @@ -13,6 +13,7 @@ #include "e-gui-utils.h" #include <glib.h> +#include <gtk/gtkalignment.h> #include <gtk/gtkimage.h> GtkWidget *e_create_image_widget(gchar *name, diff --git a/e-util/e-lang-utils.c b/e-util/e-lang-utils.c index 649a8cc887..564b4a353d 100644 --- a/e-util/e-lang-utils.c +++ b/e-util/e-lang-utils.c @@ -35,7 +35,6 @@ e_get_language_list (void) GSList *list = NULL; const char *env; const char *p; - char *lang; env = g_getenv ("LANGUAGE"); if (env == NULL) { diff --git a/e-util/e-msgport.c b/e-util/e-msgport.c index dc55156dc7..03c12c8847 100644 --- a/e-util/e-msgport.c +++ b/e-util/e-msgport.c @@ -922,6 +922,8 @@ int e_mutex_cond_wait(void *vcond, EMutex *m) g_assert(m->owner == pthread_self()); pthread_mutex_unlock(&m->mutex); return ret; + default: + g_return_val_if_reached(-1); } } diff --git a/e-util/e-passwords.c b/e-util/e-passwords.c index f44e785f6f..507fb0bd27 100644 --- a/e-util/e-passwords.c +++ b/e-util/e-passwords.c @@ -27,6 +27,7 @@ #endif #include "e-passwords.h" +#include <string.h> #include <libgnome/gnome-config.h> #include <libgnome/gnome-i18n.h> #include <gtk/gtkentry.h> diff --git a/e-util/e-trie.c b/e-util/e-trie.c index cdfc3dd0c6..da1a162115 100644 --- a/e-util/e-trie.c +++ b/e-util/e-trie.c @@ -304,7 +304,7 @@ e_trie_search (ETrie *trie, const char *buffer, size_t buflen, int *matched_id) register size_t inlen = buflen; struct _trie_state *q; struct _trie_match *m; - gunichar c, u; + gunichar c; inptr = (const unsigned char *) buffer; inend = inptr + buflen; diff --git a/e-util/e-url.c b/e-util/e-url.c index 6c24b20b8d..b96ee9cf9b 100644 --- a/e-util/e-url.c +++ b/e-util/e-url.c @@ -133,8 +133,7 @@ e_uri_new (const char *uri_string) p++; if (p > uri_string && *p == ':') { - uri->protocol = g_strndup (uri_string, p - uri_string); - g_strdown (uri->protocol); + uri->protocol = g_ascii_strdown (uri_string, p - uri_string); uri_string = p + 1; } else diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am index 697bd7779c..20ac03209b 100644 --- a/e-util/ename/Makefile.am +++ b/e-util/ename/Makefile.am @@ -18,7 +18,7 @@ libename_la_SOURCES = \ e-address-western.c \ e-name-western.c -libenameincludedir = $(includedir)/evolution-$(BASE_VERSION)/ename +libenameincludedir = $(privincludedir)/ename libenameinclude_HEADERS = \ e-address-western.h \ |