aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJesse Pavel <jpavel@src.gnome.org>2000-11-08 06:10:15 +0800
committerJesse Pavel <jpavel@src.gnome.org>2000-11-08 06:10:15 +0800
commitba58be670e008ff3c4e2f4222fc782bb114f7cba (patch)
tree0efe2d328ef40762a4f69874d4e5efb59ddbf061 /mail
parent13ef654ef7766db0bd74945607279ec56e49863d (diff)
downloadgsoc2013-evolution-ba58be670e008ff3c4e2f4222fc782bb114f7cba.tar
gsoc2013-evolution-ba58be670e008ff3c4e2f4222fc782bb114f7cba.tar.gz
gsoc2013-evolution-ba58be670e008ff3c4e2f4222fc782bb114f7cba.tar.bz2
gsoc2013-evolution-ba58be670e008ff3c4e2f4222fc782bb114f7cba.tar.lz
gsoc2013-evolution-ba58be670e008ff3c4e2f4222fc782bb114f7cba.tar.xz
gsoc2013-evolution-ba58be670e008ff3c4e2f4222fc782bb114f7cba.tar.zst
gsoc2013-evolution-ba58be670e008ff3c4e2f4222fc782bb114f7cba.zip
(on_object_requested): passed the user's default email address
to the iTip control. svn path=/trunk/; revision=6488
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/mail-display.c8
2 files changed, 11 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index b82b909a12..080a22efe8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -2,7 +2,9 @@
* mail-display.c: (pixmap_press): modified some of the EPopupMenu
structures to account for differences in the popup menu API (as
- informed by Jeff.)
+ informed by Jeff.
+ (on_object_requested): passed the user's default email address
+ to the iTip control.
2000-11-07 Ettore Perazzoli <ettore@helixcode.com>
diff --git a/mail/mail-display.c b/mail/mail-display.c
index d9da7e2a9a..35f6b51e96 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -18,6 +18,7 @@
#include <gal/util/e-util.h>
#include <gal/widgets/e-popup-menu.h>
#include "mail-display.h"
+#include "mail-config.h"
#include "mail.h"
#include <bonobo.h>
@@ -555,6 +556,11 @@ on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
to pass a bunch of useful things to all embedded controls. */
const CamelInternetAddress *from;
char *from_address;
+ MailConfigIdentity *id;
+
+ id = mail_config_get_default_identity ();
+
+ g_assert (id != NULL);
CORBA_exception_init (&ev);
@@ -562,6 +568,8 @@ on_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
from_address = camel_address_encode((CamelAddress *)from);
bonobo_property_bag_client_set_value_string (prop_bag, "from_address",
from_address, &ev);
+ bonobo_property_bag_client_set_value_string (prop_bag, "my_address",
+ id->address, &ev);
g_free(from_address);
CORBA_exception_free (&ev);
}