diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2007-10-23 02:49:30 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-10-23 02:49:30 +0800 |
commit | b37af8f269484ebd836996c140ea718885954ca3 (patch) | |
tree | 8ed883fcc7c60b5200be9438514902accd991cd1 /calendar/gui/dialogs/event-page.c | |
parent | 16af69fb17d52a18b0c308e8ed137f71d2dba1fa (diff) | |
download | gsoc2013-evolution-b37af8f269484ebd836996c140ea718885954ca3.tar gsoc2013-evolution-b37af8f269484ebd836996c140ea718885954ca3.tar.gz gsoc2013-evolution-b37af8f269484ebd836996c140ea718885954ca3.tar.bz2 gsoc2013-evolution-b37af8f269484ebd836996c140ea718885954ca3.tar.lz gsoc2013-evolution-b37af8f269484ebd836996c140ea718885954ca3.tar.xz gsoc2013-evolution-b37af8f269484ebd836996c140ea718885954ca3.tar.zst gsoc2013-evolution-b37af8f269484ebd836996c140ea718885954ca3.zip |
** Fixes part of bug #417999
2007-10-22 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #417999
* addressbook/gui/contact-editor/contact-editor.glade:
* addressbook/gui/contact-editor/e-contact-editor.c:
* addressbook/gui/contact-editor/e-contact-quick-add.c:
* addressbook/gui/contact-list-editor/contact-list-editor.c:
* addressbook/gui/contact-list-editor/contact-list-editor.glade:
* calendar/gui/dialogs/event-page.c:
* calendar/gui/dialogs/event-page.glade:
* calendar/gui/dialogs/memo-page.c:
* calendar/gui/dialogs/memo-page.glade:
* calendar/gui/dialogs/task-page.c:
* calendar/gui/dialogs/task-page.glade:
* calendar/gui/e-itip-control.c:
* plugins/bbdb/bbdb.c:
* plugins/bbdb/gaimbuddies.c:
* plugins/itip-formatter/itip-view.c:
* widgets/misc/e-pilot-settings.c:
Use ESourceComboBox instead of ESourceOptionMenu (deprecated).
svn path=/trunk/; revision=34408
Diffstat (limited to 'calendar/gui/dialogs/event-page.c')
-rw-r--r-- | calendar/gui/dialogs/event-page.c | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index f43640c264..ed8f1ddb93 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -33,7 +33,7 @@ #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> #include <glade/glade.h> -#include <libedataserverui/e-source-option-menu.h> +#include <libedataserverui/e-source-combo-box.h> #include "common/authentication.h" #include "e-util/e-categories-config.h" #include "e-util/e-dialog-widgets.h" @@ -1000,7 +1000,6 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) const char *location, *uid = NULL; const char *categories; gchar *backend_addr = NULL; - ESource *source; GSList *l; gboolean validated = TRUE; @@ -1215,8 +1214,9 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) e_dialog_editable_set (priv->categories, categories); /* Source */ - source = e_cal_get_source (page->client); - e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source); + e_source_combo_box_set_active ( + E_SOURCE_COMBO_BOX (priv->source_selector), + e_cal_get_source (page->client)); e_cal_component_get_uid (comp, &uid); if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) @@ -2662,7 +2662,8 @@ event_page_sendoptions_clicked_cb (EventPage *epage) if (!priv->sod) { priv->sod = e_sendoptions_dialog_new (); - source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->source_selector)); + source = e_source_combo_box_get_active ( + E_SOURCE_COMBO_BOX (priv->source_selector)); e_sendoptions_utils_set_default_data (priv->sod, source, "calendar"); priv->sod->data->initialized = TRUE; } @@ -2691,13 +2692,12 @@ field_changed_cb (GtkWidget *widget, gpointer data) } static void -source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) +source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage) { - EventPage *epage; - EventPagePrivate *priv; + EventPagePrivate *priv = epage->priv; + ESource *source; - epage = EVENT_PAGE (data); - priv = epage->priv; + source = e_source_combo_box_get_active (source_combo_box); if (!priv->updating) { ECal *client; @@ -2716,8 +2716,9 @@ source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) if (client) g_object_unref (client); - e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), - e_cal_get_source (COMP_EDITOR_PAGE (epage)->client)); + e_source_combo_box_set_active ( + E_SOURCE_COMBO_BOX (priv->source_selector), + e_cal_get_source (COMP_EDITOR_PAGE (epage)->client)); dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, @@ -2980,7 +2981,7 @@ init_widgets (EventPage *epage) G_CALLBACK (categories_clicked_cb), epage); /* Source selector */ - g_signal_connect((priv->source_selector), "source_selected", + g_signal_connect((priv->source_selector), "changed", G_CALLBACK (source_changed_cb), epage); /* Alarms */ priv->alarm_list_store = e_alarm_list_new (); @@ -3306,24 +3307,25 @@ make_timezone_entry (void) return w; } -GtkWidget *event_page_create_source_option_menu (void); +GtkWidget *event_page_create_source_combo_box (void); GtkWidget * -event_page_create_source_option_menu (void) +event_page_create_source_combo_box (void) { - GtkWidget *menu; + GtkWidget *combo_box; GConfClient *gconf_client; ESourceList *source_list; gconf_client = gconf_client_get_default (); - source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources"); + source_list = e_source_list_new_for_gconf ( + gconf_client, "/apps/evolution/calendar/sources"); - menu = e_source_option_menu_new (source_list); + combo_box = e_source_combo_box_new (source_list); g_object_unref (source_list); g_object_unref (gconf_client); - gtk_widget_show (menu); - return menu; + gtk_widget_show (combo_box); + return combo_box; } GtkWidget *make_status_icons (void); |