diff options
| -rw-r--r-- | e-util/ChangeLog | 13 | ||||
| -rw-r--r-- | e-util/e-config.c | 2 | ||||
| -rw-r--r-- | e-util/e-icon-factory.c | 4 | ||||
| -rw-r--r-- | e-util/e-import.c | 6 | ||||
| -rw-r--r-- | e-util/e-plugin.c | 8 | ||||
| -rw-r--r-- | e-util/e-plugin.h | 2 | ||||
| -rw-r--r-- | e-util/e-popup.c | 1 | ||||
| -rw-r--r-- | e-util/e-profile-event.c | 2 | ||||
| -rw-r--r-- | e-util/e-text-event-processor-emacs-like.c | 6 |
9 files changed, 28 insertions, 16 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index c063689e4e..f9acc094db 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,16 @@ +2006-02-08 Kjartan Maraas <kmaraas@gnome.org> + + * e-config.c: Use guint for 1-bit bitfield. + * e-icon-factory.c: (load_icon): Remove unused var + * e-import.c: (ep_init), (ep_finalise): Remove unused vars + * e-plugin.c: (e_plugin_register_type): Rename a var + * e-plugin.h: guint for 1-bit bitfield + * e-popup.c: (ep_finalise): Add comment. + * e-profile-event.c: Remove unused prototype + * e-text-event-processor-emacs-like.c: + (e_text_event_processor_emacs_like_event): Add comment about + a compiler warning from the Intel compiler. + 2006-02-07 Benjamin Berg <benjamin@sipsolutions.net> * e-gui-utils.c: * e-icon-factory.c: diff --git a/e-util/e-config.c b/e-util/e-config.c index 272b84419a..828ebedcd0 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -77,7 +77,7 @@ struct _widget_node { struct _GtkWidget *widget; /* widget created by the factory, if any */ struct _GtkWidget *frame; /* if created by us */ - int empty:1; /* set if empty (i.e. hidden) */ + guint empty:1; /* set if empty (i.e. hidden) */ }; struct _check_node { diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 6ed841b98e..2a5cfb35f5 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -98,7 +98,7 @@ load_icon (const char *icon_key, const char *icon_name, int size, int scale) if (!filename || !(unscaled = gdk_pixbuf_new_from_file (filename, NULL))) { if (scale) { const char *dent; - int width, height; + int width; GDir *dir; char *x; @@ -114,7 +114,7 @@ load_icon (const char *icon_key, const char *icon_name, int size, int scale) if (((width = strtol (dent, &x, 10)) < size) || *x != 'x') continue; - if (((height = strtol (x + 1, &x, 10)) != width) || *x != '\0') + if (((strtol (x + 1, &x, 10)) != width) || *x != '\0') continue; /* if the icon exists in this directory, we can [use/scale] it */ diff --git a/e-util/e-import.c b/e-util/e-import.c index d9b57b8e23..1a85991463 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -69,18 +69,12 @@ static void ep_init(GObject *o) { /*EImport *emp = (EImport *)o;*/ - struct _EImportPrivate *p; - - p = _PRIVATE(o); } static void ep_finalise(GObject *o) { EImport *emp = (EImport *)o; - struct _EImportPrivate *p; - - p = _PRIVATE(emp); d(printf("finalising EImport %p\n", o)); diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index d1911abbea..176b03a1ff 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -557,12 +557,12 @@ e_plugin_register_type(GType type) for (l=pdoc->plugins;l;l=g_slist_next(l)) { xmlNodePtr root = l->data; - char *type; + char *prop_type; - type = xmlGetProp(root, "type"); - if (!strcmp(type, klass->type)) + prop_type = xmlGetProp(root, "type"); + if (!strcmp((char *)type, klass->type)) add = g_slist_append(add, l->data); - xmlFree(type); + xmlFree(prop_type); } for (l=add;l;l=g_slist_next(l)) { diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h index 7e4bfbc24b..e6f04504d9 100644 --- a/e-util/e-plugin.h +++ b/e-util/e-plugin.h @@ -52,7 +52,7 @@ struct _EPlugin { GSList *hooks; GSList *authors; /* EPluginAuthor structures */ - int enabled:1; + guint enabled:1; }; /** diff --git a/e-util/e-popup.c b/e-util/e-popup.c index d812e01d31..a49793e9b1 100644 --- a/e-util/e-popup.c +++ b/e-util/e-popup.c @@ -118,6 +118,7 @@ ep_finalise(GObject *o) /* free item activate callback data */ inode = mnode->items; while (inode) { + /* This was declared as _menu_node above already */ struct _item_node *nnode = inode->link; g_free(inode); diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c index 3cc2475800..b997741907 100644 --- a/e-util/e-profile-event.c +++ b/e-util/e-profile-event.c @@ -135,8 +135,6 @@ e_profile_event_emit(const char *id, const char *uid, guint32 flags) } #else #undef e_profile_event_emit -void e_profile_event_emit(const char *id, const char *uid, guint32 flags); - void e_profile_event_emit(const char *id, const char *uid, guint32 flags) { diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c index 5fa248fe75..41bfcf4545 100644 --- a/e-util/e-text-event-processor-emacs-like.c +++ b/e-util/e-text-event-processor-emacs-like.c @@ -133,6 +133,12 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro ETextEventProcessorCommand command; ETextEventProcessorEmacsLike *tep_el = E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(tep); command.action = E_TEP_NOP; + /* Warning from the Intel compiler here: + * e-text-event-processor-emacs-like.c(136): warning #589: transfer of control bypasses initialization of: + * variable "key" (declared at line 194) + * switch (event->type) { + * ^ + */ switch (event->type) { case GDK_BUTTON_PRESS: if (event->button.button == 1) { |