|
 |
6159b2 |
diff -up evolution-3.22.6/e-util/e-name-selector-entry.c.name-selector-entry-fake-changed-signal evolution-3.22.6/e-util/e-name-selector-entry.c
|
|
|
6159b2 |
--- evolution-3.22.6/e-util/e-name-selector-entry.c.name-selector-entry-fake-changed-signal 2017-01-27 12:06:11.000000000 +0100
|
|
|
6159b2 |
+++ evolution-3.22.6/e-util/e-name-selector-entry.c 2017-04-18 10:51:23.716045722 +0200
|
|
|
6159b2 |
@@ -65,6 +65,8 @@ struct _ENameSelectorEntryPrivate {
|
|
|
6159b2 |
GQueue cancellables;
|
|
|
6159b2 |
|
|
|
6159b2 |
GHashTable *known_contacts; /* gchar * ~> 1 */
|
|
|
6159b2 |
+
|
|
|
6159b2 |
+ gboolean block_entry_changed_signal;
|
|
|
6159b2 |
};
|
|
|
6159b2 |
|
|
|
6159b2 |
enum {
|
|
|
6159b2 |
@@ -2028,6 +2030,16 @@ sanitize_entry (ENameSelectorEntry *name
|
|
|
6159b2 |
generate_attribute_list (name_selector_entry);
|
|
|
6159b2 |
}
|
|
|
6159b2 |
|
|
|
6159b2 |
+static void
|
|
|
6159b2 |
+maybe_block_entry_changed_cb (ENameSelectorEntry *name_selector_entry,
|
|
|
6159b2 |
+ gpointer user_data)
|
|
|
6159b2 |
+{
|
|
|
6159b2 |
+ g_return_if_fail (E_IS_NAME_SELECTOR_ENTRY (name_selector_entry));
|
|
|
6159b2 |
+
|
|
|
6159b2 |
+ if (name_selector_entry->priv->block_entry_changed_signal)
|
|
|
6159b2 |
+ g_signal_stop_emission_by_name (name_selector_entry, "changed");
|
|
|
6159b2 |
+}
|
|
|
6159b2 |
+
|
|
|
6159b2 |
static gboolean
|
|
|
6159b2 |
user_focus_in (ENameSelectorEntry *name_selector_entry,
|
|
|
6159b2 |
GdkEventFocus *event_focus)
|
|
|
6159b2 |
@@ -2037,6 +2049,8 @@ user_focus_in (ENameSelectorEntry *name_
|
|
|
6159b2 |
GString *str = g_string_new ("");
|
|
|
6159b2 |
EDestination *dest_dummy = e_destination_new ();
|
|
|
6159b2 |
|
|
|
6159b2 |
+ /* To not send fake 'changed' signals, which can influence message composer */
|
|
|
6159b2 |
+ name_selector_entry->priv->block_entry_changed_signal = TRUE;
|
|
|
6159b2 |
g_signal_handlers_block_matched (name_selector_entry, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, name_selector_entry);
|
|
|
6159b2 |
g_signal_handlers_block_matched (name_selector_entry->priv->destination_store, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, name_selector_entry);
|
|
|
6159b2 |
|
|
|
6159b2 |
@@ -2072,6 +2086,7 @@ user_focus_in (ENameSelectorEntry *name_
|
|
|
6159b2 |
|
|
|
6159b2 |
g_signal_handlers_unblock_matched (name_selector_entry->priv->destination_store, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, name_selector_entry);
|
|
|
6159b2 |
g_signal_handlers_unblock_matched (name_selector_entry, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, name_selector_entry);
|
|
|
6159b2 |
+ name_selector_entry->priv->block_entry_changed_signal = FALSE;
|
|
|
6159b2 |
|
|
|
6159b2 |
generate_attribute_list (name_selector_entry);
|
|
|
6159b2 |
|
|
|
6159b2 |
@@ -3381,11 +3396,15 @@ e_name_selector_entry_init (ENameSelecto
|
|
|
6159b2 |
|
|
|
6159b2 |
name_selector_entry->priv->minimum_query_length = 3;
|
|
|
6159b2 |
name_selector_entry->priv->show_address = FALSE;
|
|
|
6159b2 |
+ name_selector_entry->priv->block_entry_changed_signal = FALSE;
|
|
|
6159b2 |
name_selector_entry->priv->known_contacts = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
|
|
|
6159b2 |
|
|
|
6159b2 |
/* Edit signals */
|
|
|
6159b2 |
|
|
|
6159b2 |
g_signal_connect (
|
|
|
6159b2 |
+ name_selector_entry, "changed",
|
|
|
6159b2 |
+ G_CALLBACK (maybe_block_entry_changed_cb), NULL);
|
|
|
6159b2 |
+ g_signal_connect (
|
|
|
6159b2 |
name_selector_entry, "insert-text",
|
|
|
6159b2 |
G_CALLBACK (user_insert_text), name_selector_entry);
|
|
|
6159b2 |
g_signal_connect (
|