diff options
author | Hans Petter Jansson <hpj@ximian.com> | 2003-12-17 00:50:03 +0000 |
---|---|---|
committer | Hans Petter <hansp@src.gnome.org> | 2003-12-17 00:50:03 +0000 |
commit | 07eca4524d25d3691e2b004f1135e4b810834bc1 (patch) | |
tree | ad3040a32b9807475568e6054646aeabe83633f4 | |
parent | 5ea27bc7a765be43b528661a314f85a8763289dd (diff) | |
download | evolution-data-server-07eca4524d25d3691e2b004f1135e4b810834bc1.tar.gz |
Use e_source_equal() instead of comparing pointers. This allows user to
2003-12-16 Hans Petter Jansson <hpj@ximian.com>
* misc/e-source-option-menu.c (select_source_foreach_menu_item):
Use e_source_equal() instead of comparing pointers. This allows user
to pass in a source that was obtained from somewhere else. Set the
matching internal source as "selected" instead of the one passed in.
(select_source): Emit signal only if we found a match. Don't ref/unref
anything, since the selected source will always be from our internal
list.
-rw-r--r-- | libedataserverui/e-source-option-menu.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/libedataserverui/e-source-option-menu.c b/libedataserverui/e-source-option-menu.c index f2b5b4b5c..fd1fd3de1 100644 --- a/libedataserverui/e-source-option-menu.c +++ b/libedataserverui/e-source-option-menu.c @@ -59,6 +59,8 @@ static uint signals[NUM_SIGNALS] = { 0 }; typedef struct { ESourceOptionMenu *option_menu; + ESource *source; + ESource *found_source; int i; } ForeachMenuItemData; @@ -68,8 +70,13 @@ select_source_foreach_menu_item (GtkWidget *menu_item, { ESource *source = gtk_object_get_data (GTK_OBJECT (menu_item), MENU_ITEM_SOURCE_DATA_ID); - if (source == data->option_menu->priv->selected_source) + if (data->found_source) + return; + + if (source && e_source_equal (source, data->source)) { + data->found_source = source; gtk_option_menu_set_history (GTK_OPTION_MENU (data->option_menu), data->i); + } data->i ++; } @@ -80,20 +87,19 @@ select_source (ESourceOptionMenu *menu, { ForeachMenuItemData *foreach_data; - if (menu->priv->selected_source != NULL) - g_object_unref (menu->priv->selected_source); - menu->priv->selected_source = source; - foreach_data = g_new0 (ForeachMenuItemData, 1); foreach_data->option_menu = menu; + foreach_data->source = source; gtk_container_foreach (GTK_CONTAINER (GTK_OPTION_MENU (menu)->menu), (GtkCallback) select_source_foreach_menu_item, foreach_data); - g_free (foreach_data); - g_object_ref (source); + if (foreach_data->found_source) { + menu->priv->selected_source = foreach_data->found_source; + g_signal_emit (menu, signals[SOURCE_SELECTED], 0, foreach_data->found_source); + } - g_signal_emit (menu, signals[SOURCE_SELECTED], 0, source); + g_free (foreach_data); } |