aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2000-10-14 08:46:08 +0800
committerIain Holmes <iain@src.gnome.org>2000-10-14 08:46:08 +0800
commit0cca35f2edff27b7510b98d8b1eccd092c973053 (patch)
tree451062d7437e67b9a1f9b4c2f7a65a797cd35770
parent084956121985a0642ef8c55b6178568f15abcb32 (diff)
downloadgsoc2013-evolution-0cca35f2edff27b7510b98d8b1eccd092c973053.tar
gsoc2013-evolution-0cca35f2edff27b7510b98d8b1eccd092c973053.tar.gz
gsoc2013-evolution-0cca35f2edff27b7510b98d8b1eccd092c973053.tar.bz2
gsoc2013-evolution-0cca35f2edff27b7510b98d8b1eccd092c973053.tar.lz
gsoc2013-evolution-0cca35f2edff27b7510b98d8b1eccd092c973053.tar.xz
gsoc2013-evolution-0cca35f2edff27b7510b98d8b1eccd092c973053.tar.zst
gsoc2013-evolution-0cca35f2edff27b7510b98d8b1eccd092c973053.zip
Only allow one select-names dialog for each composer.
svn path=/trunk/; revision=5909
-rw-r--r--composer/ChangeLog8
-rw-r--r--composer/e-msg-composer-hdrs.c11
2 files changed, 17 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index ef2827b613..227f795b39 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-14 Iain Holmes <iain@helixcode.com>
+
+ * e-msg-composer-hdrs.c (init): Create a unique-ish id for this set
+ of headers, so that only one select-names dialog will be created for
+ a given set of headers.
+ (address_button_clicked_cb): Pass the unique-ish id to the activate
+ dialog command.
+
2000-10-13 Larry Ewing <lewing@helixcode.com>
* e-msg-composer.c (build_message): stop using format_text,
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 29e27389a3..414ee2d206 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -59,6 +59,9 @@ struct _EMsgComposerHdrsPrivate {
GtkWidget *cc_entry;
GtkWidget *bcc_entry;
GtkWidget *subject_entry;
+
+ /* Unique section ID */
+ char *section_id;
};
@@ -119,8 +122,7 @@ address_button_clicked_cb (GtkButton *button,
CORBA_exception_init (&ev);
- /* FIXME section. */
- Evolution_Addressbook_SelectNames_activate_dialog (priv->corba_select_names, "", &ev);
+ Evolution_Addressbook_SelectNames_activate_dialog (priv->corba_select_names, priv->section_id, &ev);
CORBA_exception_free (&ev);
}
@@ -342,6 +344,7 @@ destroy (GtkObject *object)
CORBA_exception_free (&ev);
}
+ g_free (priv->section_id);
gtk_object_destroy (GTK_OBJECT (priv->tooltips));
if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL)
@@ -390,6 +393,10 @@ init (EMsgComposerHdrs *hdrs)
priv->num_hdrs = 0;
+ /* Make a unique id from the addresses various things
+ This only needs to be unique as long as hdrs exists */
+ priv->section_id = g_strdup_printf ("%p-%p", hdrs, priv);
+
hdrs->priv = priv;
}