aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-display.c
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@ximian.com>2002-04-18 06:29:56 +0800
committerChris Lahey <clahey@src.gnome.org>2002-04-18 06:29:56 +0800
commitc2ee47d180f472cdcc2c9c35e6e7d9400ab2d6c1 (patch)
treefa30eef3dba8dfc871dad0aecf14df1156ed6572 /mail/mail-display.c
parenta35bc80a53e50752c52f20e21765b95a55f27331 (diff)
downloadgsoc2013-evolution-c2ee47d180f472cdcc2c9c35e6e7d9400ab2d6c1.tar
gsoc2013-evolution-c2ee47d180f472cdcc2c9c35e6e7d9400ab2d6c1.tar.gz
gsoc2013-evolution-c2ee47d180f472cdcc2c9c35e6e7d9400ab2d6c1.tar.bz2
gsoc2013-evolution-c2ee47d180f472cdcc2c9c35e6e7d9400ab2d6c1.tar.lz
gsoc2013-evolution-c2ee47d180f472cdcc2c9c35e6e7d9400ab2d6c1.tar.xz
gsoc2013-evolution-c2ee47d180f472cdcc2c9c35e6e7d9400ab2d6c1.tar.zst
gsoc2013-evolution-c2ee47d180f472cdcc2c9c35e6e7d9400ab2d6c1.zip
Bumped required gal version number to 0.19.99.11.
2002-04-17 Christopher James Lahey <clahey@ximian.com> * configure.in: Bumped required gal version number to 0.19.99.11. From addressbook/ChangeLog: 2002-04-17 Christopher James Lahey <clahey@ximian.com> * gui/component/select-names/e-select-names.c (e_select_names_create_categories): Changed this to use ECategoriesMasterListOptionMenu. * gui/component/select-names/e-select-names.c (section_right_click_cb), gui/widgets/e-addressbook-reflow-adapter.c, gui/widgets/e-addressbook-view.c: Updated these to match the new EPopupMenu. From calendar/ChangeLog: 2002-04-17 Christopher James Lahey <clahey@ximian.com> * gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c, gui/dialogs/meeting-page.c: Updated these to match the new EPopupMenu. From mail/ChangeLog: 2002-04-17 Christopher James Lahey <clahey@ximian.com> * folder-browser.c, mail-display.c: Updated these to match the new EPopupMenu. From shell/ChangeLog: 2002-04-17 Christopher James Lahey <clahey@ximian.com> * e-activity-handler.c: Updated this to match the new EPopupMenu. svn path=/trunk/; revision=16498
Diffstat (limited to 'mail/mail-display.c')
-rw-r--r--mail/mail-display.c23
1 files changed, 8 insertions, 15 deletions
diff --git a/mail/mail-display.c b/mail/mail-display.c
index e3dbcfc67d..a4d3ae65bd 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -385,12 +385,9 @@ static gboolean
pixmap_press (GtkWidget *widget, GdkEventButton *event, EScrollFrame *user_data)
{
EPopupMenu *menu;
- EPopupMenu save_item = { N_("Save to Disk..."), NULL,
- GTK_SIGNAL_FUNC (save_cb), NULL, NULL, 0 };
- EPopupMenu view_item = { N_("View Inline"), NULL,
- GTK_SIGNAL_FUNC (inline_cb), NULL, NULL, 2 };
- EPopupMenu open_item = { N_("Open in %s..."), NULL,
- GTK_SIGNAL_FUNC (launch_cb), NULL, NULL, 1 };
+ EPopupMenu save_item = E_POPUP_ITEM (N_("Save to Disk..."), GTK_SIGNAL_FUNC (save_cb), 0);
+ EPopupMenu view_item = E_POPUP_ITEM (N_("View Inline"), GTK_SIGNAL_FUNC (inline_cb), 2);
+ EPopupMenu open_item = E_POPUP_ITEM (N_("Open in %s..."), GTK_SIGNAL_FUNC (launch_cb), 1);
MailDisplay *md;
CamelMimePart *part;
MailMimeHandler *handler;
@@ -1123,7 +1120,7 @@ load_http (MailDisplay *md, gpointer data)
}
while ((result = gnome_vfs_read (handle, buf, sizeof (buf), &read)) == GNOME_VFS_OK) {
- printf ("%s: read %d bytes\n", url, read);
+ printf ("%s: read %d bytes\n", url, (int) read);
g_byte_array_append (ba, buf, read);
total += read;
}
@@ -1813,16 +1810,12 @@ enum {
#define TERMINATOR { NULL, NULL, (NULL), NULL, 0 }
static EPopupMenu link_menu [] = {
- { N_("Open Link in Browser"), NULL,
- GTK_SIGNAL_FUNC (link_open_in_browser), NULL, NULL, MASK_URL },
- { N_("Copy Link Location"), NULL,
- GTK_SIGNAL_FUNC (link_copy_location), NULL, NULL, MASK_URL },
+ E_POPUP_ITEM (N_("Open Link in Browser"), GTK_SIGNAL_FUNC (link_open_in_browser), MASK_URL),
+ E_POPUP_ITEM (N_("Copy Link Location"), GTK_SIGNAL_FUNC (link_copy_location), MASK_URL),
#if 0
- { N_("Save Link as (FIXME)"), NULL,
- GTK_SIGNAL_FUNC (link_save_as), NULL, NULL, MASK_URL },
+ E_POPUP_ITEM (N_("Save Link as (FIXME)"), GTK_SIGNAL_FUNC (link_save_as), MASK_URL),
#endif
- { N_("Save Image as..."), NULL,
- GTK_SIGNAL_FUNC (image_save_as), NULL, NULL, MASK_SRC },
+ E_POPUP_ITEM (N_("Save Image as..."), GTK_SIGNAL_FUNC (image_save_as), MASK_SRC),
TERMINATOR
};