aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-12-22 15:38:16 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-12-22 15:38:16 +0800
commitda10c48009573371ec19e12da0ffe95344bd02a0 (patch)
tree2948e3c2279f0e678a10ca7f5f4503676f4aacba
parent6fec7fed87a7f21eacc80ea687671c4084f7b1af (diff)
downloadgsoc2013-evolution-da10c48009573371ec19e12da0ffe95344bd02a0.tar.gz
gsoc2013-evolution-da10c48009573371ec19e12da0ffe95344bd02a0.tar.zst
gsoc2013-evolution-da10c48009573371ec19e12da0ffe95344bd02a0.zip
moved to after emae_authtype_changed to fix warning.
2004-12-22 Not Zed <NotZed@Ximian.com> * em-account-editor.c (emae_needs_auth): moved to after emae_authtype_changed to fix warning. 2004-12-17 Not Zed <NotZed@Ximian.com> * em-format-html-display.c (efhd_attachment_popup): * message-list.c (ml_tree_drag_data_received): * em-folder-view.c (emfv_popup, emfv_format_popup_event): * em-folder-tree.c (tree_drag_data_received): api changes. (emft_popup): * em-popup.c (emp_standard_menu_factory) (emp_standard_menu_factory): api changes. svn path=/trunk/; revision=28180
-rw-r--r--mail/ChangeLog19
-rw-r--r--mail/em-account-editor.c40
-rw-r--r--mail/em-folder-tree.c4
-rw-r--r--mail/em-folder-view.c6
-rw-r--r--mail/em-format-html-display.c2
-rw-r--r--mail/em-popup.c4
-rw-r--r--mail/message-list.c2
7 files changed, 48 insertions, 29 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index daff59ef7e..a180dcd440 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,22 @@
+2004-12-22 Not Zed <NotZed@Ximian.com>
+
+ * em-account-editor.c (emae_needs_auth): moved to after
+ emae_authtype_changed to fix warning.
+
+2004-12-17 Not Zed <NotZed@Ximian.com>
+
+ * em-format-html-display.c (efhd_attachment_popup):
+
+ * message-list.c (ml_tree_drag_data_received):
+
+ * em-folder-view.c (emfv_popup, emfv_format_popup_event):
+
+ * em-folder-tree.c (tree_drag_data_received): api changes.
+ (emft_popup):
+
+ * em-popup.c (emp_standard_menu_factory)
+ (emp_standard_menu_factory): api changes.
+
2004-12-21 Not Zed <NotZed@Ximian.com>
* em-account-editor.c (emae_needs_auth): if we're turned on, then
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index a6f17fc546..4d702963b6 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -1061,26 +1061,6 @@ emae_path_changed(GtkEntry *entry, EMAccountEditorService *service)
emae_service_url_changed(service, camel_url_set_path, entry);
}
-static void
-emae_needs_auth(GtkToggleButton *toggle, EMAccountEditorService *service)
-{
- GtkWidget *w;
- int need = gtk_toggle_button_get_active(toggle);
-
- w = glade_xml_get_widget(service->emae->priv->xml, emae_service_info[service->type].auth_frame);
- gtk_widget_set_sensitive(w, need);
-
- if (need)
- emae_authtype_changed(service->authtype, service);
- else {
- CamelURL *url = emae_account_url(service->emae, emae_service_info[service->type].account_uri_key);
-
- camel_url_set_authmech(url, NULL);
- emae_uri_changed(service, url);
- camel_url_free(url);
- }
-}
-
static int
emae_ssl_update(EMAccountEditorService *service, CamelURL *url)
{
@@ -1361,6 +1341,26 @@ emae_authtype_changed(GtkComboBox *dropdown, EMAccountEditorService *service)
gtk_widget_set_sensitive((GtkWidget *)service->remember, authtype?authtype->need_password:FALSE);
}
+static void
+emae_needs_auth(GtkToggleButton *toggle, EMAccountEditorService *service)
+{
+ GtkWidget *w;
+ int need = gtk_toggle_button_get_active(toggle);
+
+ w = glade_xml_get_widget(service->emae->priv->xml, emae_service_info[service->type].auth_frame);
+ gtk_widget_set_sensitive(w, need);
+
+ if (need)
+ emae_authtype_changed(service->authtype, service);
+ else {
+ CamelURL *url = emae_account_url(service->emae, emae_service_info[service->type].account_uri_key);
+
+ camel_url_set_authmech(url, NULL);
+ emae_uri_changed(service, url);
+ camel_url_free(url);
+ }
+}
+
static void emae_check_authtype(GtkWidget *w, EMAccountEditorService *service);
static GtkWidget *
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 60045e7d19..8ef1f59c74 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1104,7 +1104,7 @@ tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, int x, int y
if ((item->visible & mask) == 0)
menus = g_slist_append(menus, item);
}
- e_popup_add_items((EPopup *)emp, menus, emft_drop_popup_free, m);
+ e_popup_add_items((EPopup *)emp, menus, NULL, emft_drop_popup_free, m);
menu = e_popup_create_menu_once((EPopup *)emp, NULL, mask);
gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
} else {
@@ -2823,7 +2823,7 @@ emft_popup (EMFolderTree *emft, GdkEvent *event)
for (i = 0; i < sizeof (emft_popup_items) / sizeof (emft_popup_items[0]); i++)
menus = g_slist_prepend (menus, &emft_popup_items[i]);
- e_popup_add_items ((EPopup *)emp, menus, emft_popup_free, emft);
+ e_popup_add_items ((EPopup *)emp, menus, NULL, emft_popup_free, emft);
menu = e_popup_create_menu_once ((EPopup *)emp, (EPopupTarget *)target, 0);
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index ab824ed949..c019b848b8 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1027,7 +1027,7 @@ emfv_popup(EMFolderView *emfv, GdkEvent *event)
for (i=0;i<sizeof(emfv_popup_items)/sizeof(emfv_popup_items[0]);i++)
menus = g_slist_prepend(menus, &emfv_popup_items[i]);
- e_popup_add_items((EPopup *)emp, menus, emfv_popup_items_free, emfv);
+ e_popup_add_items((EPopup *)emp, menus, NULL, emfv_popup_items_free, emfv);
i = 1;
for (l = mail_config_get_labels(); l; l = l->next) {
@@ -1059,7 +1059,7 @@ emfv_popup(EMFolderView *emfv, GdkEvent *event)
label_list = g_slist_prepend(label_list, item);
}
- e_popup_add_items((EPopup *)emp, label_list, emfv_popup_labels_free, emfv);
+ e_popup_add_items((EPopup *)emp, label_list, NULL, emfv_popup_labels_free, emfv);
menu = e_popup_create_menu_once((EPopup *)emp, (EPopupTarget *)target, 0);
@@ -2248,7 +2248,7 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const
emfv_uri_popups[i].user_data = g_strdup(t->uri);
menus = g_slist_prepend(menus, &emfv_uri_popups[i]);
}
- e_popup_add_items((EPopup *)emp, menus, emfv_uri_popup_free, emfv);
+ e_popup_add_items((EPopup *)emp, menus, NULL, emfv_uri_popup_free, emfv);
}
menu = e_popup_create_menu_once((EPopup *)emp, target, 0);
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 131f2cab99..da9cc53c55 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -1106,7 +1106,7 @@ efhd_attachment_popup(GtkWidget *w, GdkEventButton *event, struct _attach_puri *
menus = g_slist_prepend(menus, item);
}
- e_popup_add_items((EPopup *)emp, menus, efhd_menu_items_free, info);
+ e_popup_add_items((EPopup *)emp, menus, NULL, efhd_menu_items_free, info);
menu = e_popup_create_menu_once((EPopup *)emp, (EPopupTarget *)target, 0);
if (event)
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 9c9ed7a369..1928192904 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -691,7 +691,7 @@ emp_standard_menu_factory(EPopup *emp, void *data)
}
if (open_menus)
- e_popup_add_items(emp, open_menus, emp_apps_popup_free, NULL);
+ e_popup_add_items(emp, open_menus, NULL, emp_apps_popup_free, NULL);
g_string_free(label, TRUE);
g_list_free(apps);
@@ -711,7 +711,7 @@ emp_standard_menu_factory(EPopup *emp, void *data)
}
if (menus)
- e_popup_add_items(emp, menus, emp_standard_items_free, NULL);
+ e_popup_add_items(emp, menus, NULL, emp_standard_items_free, NULL);
}
/* ********************************************************************** */
diff --git a/mail/message-list.c b/mail/message-list.c
index 0e2669d6f4..bbbd192cdb 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1759,7 +1759,7 @@ ml_tree_drag_data_received (ETree *tree, int row, ETreePath path, int col,
for (i=0;i<sizeof(ml_drop_popup_menu)/sizeof(ml_drop_popup_menu[0]);i++)
menus = g_slist_append(menus, &ml_drop_popup_menu[i]);
- e_popup_add_items((EPopup *)emp, menus, ml_drop_popup_free, m);
+ e_popup_add_items((EPopup *)emp, menus, NULL, ml_drop_popup_free, m);
menu = e_popup_create_menu_once((EPopup *)emp, NULL, 0);
gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
} else {