aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/exchange-operations/ChangeLog33
-rw-r--r--plugins/exchange-operations/exchange-calendar.c12
-rw-r--r--plugins/exchange-operations/exchange-contacts.c13
-rw-r--r--plugins/exchange-operations/exchange-folder.c34
-rw-r--r--plugins/groupwise-account-setup/camel-gw-listener.c2
-rw-r--r--plugins/groupwise-features/ChangeLog5
-rw-r--r--plugins/groupwise-features/proxy.c34
7 files changed, 43 insertions, 90 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index dad4cdbb93..81c17b6c1a 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -5,30 +5,12 @@
properly to get the efolder.
* exchange-folder.c (org_gnome_exchange_folder_inbox_unsubscribe),
(exchange_get_folder), (org_gnome_exchange_check_inbox_subscribed),
- (unsubscribe_dialog_ab_response), (unsubscribe_dialog_response):
+ (unsubscribe_dialog_ab_response), (unsubscribe_dialog_response):
Creating proper path.
-
+
The above modifications will now allow the user to do the operations
like unsubscribed to Inbox and giving permission to a folder.
- -
-
-2005-09-30 Shakti Sen <shprasad@novell.com>
-
- * exchange-folder-subscription.c (setup_folder_name_combo): Sets the
- corresponding 'Folder name'.
- (create_folder_subscription_dialog): Sets the cursor to User's entry
- text field.
- * exchange-folder-subscription.h: Added one more argument to function
- create_folder_subscription_dialog() to set the window title.
- * exchange-folder.c (org_gnome_exchange_inbox_subscription),
- (org_gnome_exchange_addressbook_subscription),
- (org_gnome_exchange_calendar_subscription),
- (org_gnome_exchange_tasks_subscription): Added newly.
- * org-gnome-exchange-operations.eplug.in: Changed the activate callback
- function names so that it can show appropriate window title.
-
- Fixes bug #317019, #317023.
-
+
2005-09-28 Sarfraaz Ahmed <asarfraaz@novell.com>
* exchange-account-setup.c (owa_authenticate_user) : Propogate the
@@ -37,15 +19,6 @@
* exchange-contacts.c
* exchange-folder.c : Parse the new account uri.
-2005-09-28 Tor Lillqvist <tml@novell.com>
-
- * Makefile.am (INCLUDES, LIBADD): Use just CAMEL_EXCHANGE_CFLAGS
- and _LIBS, they now includes all necessary (see top-level
- ChangeLog).
- (LDFLAGS): Use NO_UNDEFINED.
-
- * org-gnome-exchange-operations.eplug.in: Use SOEXT.
-
2005-09-22 Praveen Kumar <kpraveen@novell.com>
** Fixes bug 312849
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index 0117e18af7..28b70d699d 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.c
@@ -99,7 +99,6 @@ e_exchange_calendar_get_calendars (ECalSourceType ftype)
tmp = (gchar *)e_folder_get_physical_uri (folder);
if (g_str_has_prefix (tmp, uri_prefix)) {
ruri = g_strdup (tmp+prefix_len); /* ATTN: Shouldn't free this explictly */
- printf ("adding ruri : %s\n", ruri);
g_ptr_array_add (calendar_list, (gpointer)ruri);
}
}
@@ -154,8 +153,6 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
const char *rel_uri;
int row, i;
gint offline_status;
- char *offline_msg;
- GtkWidget *lbl_offline_msg;
if (!hidden)
@@ -188,14 +185,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
if (offline_status == OFFLINE_MODE) {
/* Evolution is in offline mode; we will not be able to create
new folders or modify existing folders. */
- offline_msg = g_markup_printf_escaped ("<b>%s</b>",
- _("Evolution is in offline mode. You cannot create or modify folders now.\nPlease switch to online mode for such operations."));
- lbl_offline_msg = gtk_label_new ("");
- gtk_label_set_markup (GTK_LABEL (lbl_offline_msg), offline_msg);
- g_free (offline_msg);
- gtk_widget_show (lbl_offline_msg);
- gtk_table_attach (GTK_TABLE (parent), lbl_offline_msg, 0, 2, row, row+1, GTK_FILL|GTK_EXPAND, 0, 0, 0);
- return lbl_offline_msg;
+ return NULL;
}
rel_uri = e_source_peek_relative_uri (t->source);
diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index ae99fc5566..3bf753b750 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.c
@@ -136,8 +136,6 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
ESource *source = t->source;
- GtkWidget *lbl_offline_msg, *vb_offline_msg;
- char *offline_msg;
gint offline_status;
@@ -158,16 +156,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
if (offline_status == OFFLINE_MODE) {
/* Evolution is in offline mode; we will not be able to create
new folders or modify existing folders. */
- offline_msg = g_markup_printf_escaped ("<b>%s</b>",
- _("Evolution is in offline mode. You cannot create or modify folders now.\nPlease switch to online mode for such operations."));
- vb_offline_msg = gtk_vbox_new (FALSE, 6);
- gtk_container_add (GTK_CONTAINER (data->parent), vb_offline_msg);
- lbl_offline_msg = gtk_label_new ("");
- gtk_label_set_markup (GTK_LABEL (lbl_offline_msg), offline_msg);
- g_free (offline_msg);
- gtk_box_pack_start (GTK_BOX (vb_offline_msg), lbl_offline_msg, FALSE, FALSE, 0);
- gtk_widget_show_all (vb_offline_msg);
- return vb_offline_msg;
+ return NULL;
}
rel_uri = e_source_peek_relative_uri (source);
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index 1c6eeaeccf..9ddccfd1e3 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -43,11 +43,7 @@
#include "addressbook/gui/widgets/eab-popup.h"
#include "exchange-folder-subscription.h"
-void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, gchar *fname);
-void org_gnome_exchange_inbox_subscription (EPlugin *ep, EMMenuTargetSelect *target);
-void org_gnome_exchange_addressbook_subscription (EPlugin *ep, EMMenuTargetSelect *target);
-void org_gnome_exchange_calendar_subscription (EPlugin *ep, EMMenuTargetSelect *target);
-void org_gnome_exchange_tasks_subscription (EPlugin *ep, EMMenuTargetSelect *target);
+void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target);
void org_gnome_exchange_check_subscribed (EPlugin *ep, ECalPopupTargetSource *target);
void org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data);
void org_gnome_exchange_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target);
@@ -544,7 +540,7 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
void
-org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, gchar *fname)
+org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target)
{
ExchangeAccount *account = NULL;
EFolder *folder = NULL;
@@ -574,7 +570,7 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target,
return;
}
- create_folder_subscription_dialog (account->account_name, fname, &user_email_address, &folder_name);
+ create_folder_subscription_dialog (account->account_name, &user_email_address, &folder_name);
if (user_email_address && folder_name) {
result = exchange_account_discover_shared_folder (account, user_email_address, folder_name, &folder);
@@ -615,27 +611,3 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target,
exchange_account_open_folder (account, g_strdup_printf ("/%s", user_email_address));
}
-void
-org_gnome_exchange_calendar_subscription (EPlugin *ep, EMMenuTargetSelect *target)
-{
- gchar *folder_name = "Calendar";
- org_gnome_exchange_folder_subscription (ep, target, folder_name);
-}
-void
-org_gnome_exchange_addressbook_subscription (EPlugin *ep, EMMenuTargetSelect *target)
-{
- gchar *folder_name = "Contacts";
- org_gnome_exchange_folder_subscription (ep, target, folder_name);
-}
-void
-org_gnome_exchange_tasks_subscription (EPlugin *ep, EMMenuTargetSelect *target)
-{
- gchar *folder_name = "Tasks";
- org_gnome_exchange_folder_subscription (ep, target, folder_name);
-}
-void
-org_gnome_exchange_inbox_subscription (EPlugin *ep, EMMenuTargetSelect *target)
-{
- gchar *folder_name = "Inbox";
- org_gnome_exchange_folder_subscription (ep, target, folder_name);
-}
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index 58122ff7b4..865705fe30 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -636,7 +636,7 @@ add_addressbook_sources (EAccount *account)
/* mark system address book for offline usage */
/* FIXME: add isPersonal flag to container and use that isFrequentContact
* properties, instead of using writable to distinguish between the
- * system address book and other address books.
+ * system address book and other address books
*/
if (!e_gw_container_get_is_writable (E_GW_CONTAINER(temp_list->data)))
e_source_set_property (source, "offline_sync", "1");
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 6398ef81a0..8824b1e1c1 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -5,6 +5,11 @@
* install-shared.c : (org_gnome_popup_wizard)
enable shared-folder functionalilty, remove env check
+2005-09-30 Shreyas Srinivasan <sshreyas@novell.com>
+
+ * proxy.c (proxy_page_changed_cb): Load proxy list only when
+ the tab is clicked. Fixes #314337
+
2005-09-28 Sankar P <psankar@novell.com>
* proxy.c (proxy_dialog_store_widgets_data):
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index e3d68ab608..f7a0217003 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -73,6 +73,8 @@
static GObjectClass *parent_class = NULL;
+static int proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account);
+
struct _proxyDialogPrivate {
/* Glade XML data for the Add/Edit Proxy dialog*/
GladeXML *xml;
@@ -525,12 +527,13 @@ proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data)
account = target_account->account;
prd = g_object_get_data ((GObject *)account, "prd");
- if (prd == NULL)
+ if (!prd || !prd->priv || !prd->priv->proxy_list)
return;
g_object_unref (prd);
prd = NULL;
}
+
void
proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
{
@@ -640,6 +643,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
GtkButton *addProxy, *removeProxy, *editProxy;
proxyDialog *prd;
proxyDialogPrivate *priv;
+ int pag_num;
target_account = (EMConfigTargetAccount *)data->config->target;
account = target_account->account;
@@ -670,9 +674,6 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
prd->cnc = proxy_get_cnc(account);
priv->proxy_list = NULL;
- if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK)
- return NULL;
- proxy_update_tree_view (account);
} else {
GtkWidget *label;
priv->tab_dialog = gtk_vbox_new (TRUE, 10);
@@ -681,13 +682,16 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
}
gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new("Proxy"));
+ g_signal_connect ((GtkNotebook *)(data->parent), "switch-page", G_CALLBACK (proxy_page_changed_cb), account);
+ pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog);
+ g_object_set_data ((GObject *) account, "proxy_tab_num", pag_num);
gtk_widget_show_all (priv->tab_dialog);
} else if (!g_strrstr (e_account_get_string(account, E_ACCOUNT_SOURCE_URL), "groupwise://")) {
prd = g_object_get_data ((GObject *) account, "prd");
if (prd) {
priv = prd->priv;
- int pag_num;
+
if (priv) {
pag_num = gtk_notebook_page_num ( (GtkNotebook *)(data->parent), (GtkWidget *) priv->tab_dialog);
gtk_notebook_remove_page ( (GtkNotebook *)(data->parent), pag_num);
@@ -697,6 +701,26 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
return NULL;
}
+static int
+proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account)
+{
+ proxyDialog *prd;
+ proxyDialogPrivate *priv;
+
+ if (!prd || !prd->priv || !prd->priv->proxy_list)
+ return;
+
+ prd = g_object_get_data ((GObject *) account, "prd");
+ priv = prd->priv;
+
+ if (num == g_object_get_data ((GObject *) account, "proxy_tab_num") && account->enabled) {
+ if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK)
+ return NULL;
+ proxy_update_tree_view (account);
+ }
+ return TRUE;
+}
+
static void
proxy_cancel(GtkWidget *button, EAccount *account)
{
generated by cgit (git 2.34.1) at 2025-03-26 16:25:35 +0800