aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-popup.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-09-19 01:05:23 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-09-19 01:05:23 +0800
commit2a88606f5d7bf0ce98b930d489e54157663751f3 (patch)
tree25fd8b1781bac3f4871efcf9c078bd78ab2cae8e /mail/em-popup.c
parent6205217822761f5e424a9207b261786f9cb8772d (diff)
downloadgsoc2013-evolution-2a88606f5d7bf0ce98b930d489e54157663751f3.tar
gsoc2013-evolution-2a88606f5d7bf0ce98b930d489e54157663751f3.tar.gz
gsoc2013-evolution-2a88606f5d7bf0ce98b930d489e54157663751f3.tar.bz2
gsoc2013-evolution-2a88606f5d7bf0ce98b930d489e54157663751f3.tar.lz
gsoc2013-evolution-2a88606f5d7bf0ce98b930d489e54157663751f3.tar.xz
gsoc2013-evolution-2a88606f5d7bf0ce98b930d489e54157663751f3.tar.zst
gsoc2013-evolution-2a88606f5d7bf0ce98b930d489e54157663751f3.zip
updated for camel namespace changes
2003-09-18 Jeffrey Stedfast <fejj@ximian.com> * component-factory.c: updated for camel namespace changes * em-folder-view.c: updated for camel namespace changes * em-format-html-display.c: updated for camel namespace changes * em-format-html-quote.c: updated for camel namespace changes * em-format.c: updated for camel namespace changes * em-popup.c: updated for camel namespace changes * em-utils.c: updated for camel namespace changes * mail-autofilter.c: updated for camel namespace changes * mail-ops.c: updated for camel namespace changes * mail-session.c: updated for camel namespace changes * message-list.c: updated for camel namespace changes * message-tag-followup.c: updated for camel namespace changes * importers/evolution-mbox-importer.c: updated for camel namespace changes 2003-09-18 Jeffrey Stedfast <fejj@ximian.com> * em-popup.c (emp_standard_menu_factory): Don't forget to initialise/increment 'i' when using it as an object id in the for-loop. * em-format.c (em_format_format_text): Initialise charset to NULL or it may be used uninitialised. Also include gnome-vfs-mime-handlers.h for gnome_vfs_mime_type_get_description(). svn path=/trunk/; revision=22610
Diffstat (limited to 'mail/em-popup.c')
-rw-r--r--mail/em-popup.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/mail/em-popup.c b/mail/em-popup.c
index d2b2ca1e6e..a7d8a90179 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -760,7 +760,9 @@ emp_standard_menu_factory(EMPopup *emp, EMPopupTarget *target, void *data)
/* FIXME: use the snoop_part stuff from em-format.c */
if (apps == NULL && strcmp(target->data.part.mime_type, "application/octet-stream") == 0) {
- const char *filename = camel_mime_part_get_filename(target->data.part.part), *name_type;
+ const char *filename, *name_type;
+
+ filename = camel_mime_part_get_filename(target->data.part.part);
if (filename) {
/* GNOME-VFS will misidentify TNEF attachments as MPEG */
@@ -780,7 +782,7 @@ emp_standard_menu_factory(EMPopup *emp, EMPopupTarget *target, void *data)
menus = g_slist_prepend(menus, (void *)&emp_standard_part_apps_bar);
- for (l=apps;l;l=l->next) {
+ for (l = apps, i = 0; l; l = l->next, i++) {
GnomeVFSMimeApplication *app = l->data;
struct _open_in_item *item;
@@ -809,6 +811,10 @@ emp_standard_menu_factory(EMPopup *emp, EMPopupTarget *target, void *data)
items = emp_standard_object_popups;
len = LEN(emp_standard_object_popups);
break; }
+ default:
+ items = NULL;
+ len = 0;
+ g_assert_not_reached ();
}
for (i=0;i<len;i++) {