From dcf2c0e754d6e251733cea74c2427738122620af Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 18 Jul 2009 14:05:05 -0400 Subject: More whitespace cleanup. --- plugins/groupwise-features/install-shared.c | 8 ++--- plugins/groupwise-features/junk-mail-settings.c | 2 +- plugins/groupwise-features/junk-settings.c | 22 ++++++------- plugins/groupwise-features/proxy.c | 6 ++-- plugins/groupwise-features/send-options.c | 2 +- plugins/groupwise-features/share-folder-common.c | 10 +++--- plugins/groupwise-features/share-folder.c | 40 ++++++++++++------------ 7 files changed, 45 insertions(+), 45 deletions(-) (limited to 'plugins/groupwise-features') diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index ef664b48ef..6dcbfe8d22 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -75,7 +75,7 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data) CamelProvider *provider; EGwConnection *cnc; - if (response == GTK_RESPONSE_CANCEL){ + if (response == GTK_RESPONSE_CANCEL) { gtk_widget_destroy (GTK_WIDGET (emfs)); } else { model = accept_data->model; @@ -83,7 +83,7 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data) uri = em_folder_selector_get_selected_uri (emfs); path = em_folder_selector_get_selected_path (emfs); names = g_strsplit (path, "/", -1); - if(names == NULL){ + if (names == NULL) { folder_name = (gchar *)path; parent_name = NULL; } else { @@ -103,10 +103,10 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data) } cnc = get_cnc (store); - if(E_IS_GW_CONNECTION (cnc)) { + if (E_IS_GW_CONNECTION (cnc)) { container_id = get_container_id (cnc, parent_name); - if(e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) { + if (e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) { folder = camel_store_get_folder (store, "Mailbox", 0, NULL); /*changes = camel_folder_change_info_new (); diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index 68cbaf6f9d..bfaeee585d 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -100,7 +100,7 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, gpointer data) gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 6); /*We might have to add more options for settings i.e. more pages*/ - while (page_count > 0 ){ + while (page_count > 0 ) { notebook = gtk_notebook_new (); gtk_notebook_append_page ((GtkNotebook *)notebook, box, NULL); gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, notebook, TRUE, TRUE, 0); diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index 5c8c76928e..f7c32ee969 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -115,7 +115,7 @@ junk_settings_init (JunkSettings *js) static void free_entry_node(EGwJunkEntry *entry) { - if(entry){ + if (entry) { g_free(entry->match); entry->match = NULL; } @@ -128,7 +128,7 @@ free_node(JunkEntry *nentry) { EGwJunkEntry *junk_entry = nentry->entry; - if(junk_entry){ + if (junk_entry) { g_free(junk_entry->match); junk_entry->match = NULL; } @@ -144,13 +144,13 @@ find_node(GList *list, gchar *match) GList *tmp; gint i; - if(list){ + if (list) { tmp = g_list_first(list); - for(i=0; tmp; i++) + for (i=0; tmp; i++) { one_entry = tmp->data; ent = one_entry->entry; - if(!g_ascii_strcasecmp(ent->match, match)){ + if (!g_ascii_strcasecmp(ent->match, match)) { return one_entry; /*if found, it returns that user*/ } @@ -164,7 +164,7 @@ find_node(GList *list, gchar *match) static void free_all (JunkSettings *js) { - if (js->junk_list){ + if (js->junk_list) { g_list_foreach (js->junk_list,(GFunc) free_node, NULL); g_list_free (js->junk_list); js->junk_list = NULL; @@ -240,7 +240,7 @@ commit_changes (JunkSettings *js) } if (E_IS_GW_CONNECTION (js->cnc)) { - if(js->flag_for_ok == 2 && js->enabled){ /* just turn off the bits*/ + if (js->flag_for_ok == 2 && js->enabled){ /* just turn off the bits*/ use_junk = use_pab = use_block = persistence = 0; if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK) { ; @@ -272,12 +272,12 @@ commit_changes (JunkSettings *js) } } - if(new_list){ + if (new_list) { g_list_foreach (new_list, (GFunc) free_entry_node, NULL); g_list_free (new_list); } new_list = NULL; - if(remove_list){ + if (remove_list) { g_list_foreach (remove_list,(GFunc) free_entry_node, NULL); g_list_free (remove_list); } @@ -314,7 +314,7 @@ add_clicked(GtkButton *button, JunkSettings *js) return; else { /*check whether already exists*/ - if (js->junk_list && email){ + if (js->junk_list && email) { new_entry = find_node (js->junk_list, (gchar *)email); if (new_entry) return; @@ -361,7 +361,7 @@ user_selected(GtkTreeSelection *selection, JunkSettings *js) GtkTreeModel *model; gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); - if (gtk_tree_selection_get_selected (selection, &model, &(js->iter))){ + if (gtk_tree_selection_get_selected (selection, &model, &(js->iter))) { gtk_widget_set_sensitive (GTK_WIDGET (js->remove), TRUE); } diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 637a13cb2d..91016a6126 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -146,7 +146,7 @@ proxy_dialog_finalize (GObject *object) g_return_if_fail (IS_PROXY_DIALOG (prd)); priv = prd->priv; - if(priv->proxy_name_selector) + if (priv->proxy_name_selector) g_object_unref (priv->proxy_name_selector); if (priv) { @@ -614,7 +614,7 @@ proxy_update_tree_view (EAccount *account) for (;list_iter; list_iter = g_list_next(list_iter)) { aclInstance = (proxyHandler *) list_iter->data; - if(! (aclInstance->flags & E_GW_PROXY_DELETED )) { + if (! (aclInstance->flags & E_GW_PROXY_DELETED )) { gtk_tree_store_append (priv->store, &iter, NULL); gtk_tree_store_set (priv->store, &iter, 0, broken_image, 1, g_strconcat(aclInstance->proxy_name,"\n",aclInstance->proxy_email, NULL), -1); } @@ -682,7 +682,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data) g_signal_connect (editProxy, "clicked", G_CALLBACK(proxy_edit_account), account); priv->proxy_list = NULL; - } else if (account->enabled){ + } else if (account->enabled) { GtkWidget *label; priv->tab_dialog = gtk_vbox_new (TRUE, 10); /*To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation*/ diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index 16c639b38e..db82ba9ca8 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -203,7 +203,7 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data) target_account = (EMConfigTargetAccount *)data->config->target; account = target_account->account; - if(!g_strrstr (account->source->url, "groupwise://")) + if (!g_strrstr (account->source->url, "groupwise://")) return NULL; vbox = gtk_vbox_new (FALSE, 0); diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index debb1acaa5..c9e8ffb572 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -79,7 +79,7 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store) uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL); account = mail_config_get_account_by_source_url (uri); - if (!account){ + if (!account) { return; } @@ -164,7 +164,7 @@ create_folder_done (struct _EMCreateFolder *m) if (m->done) { ccnc = get_cnc (store); - if(E_IS_GW_CONNECTION (ccnc)) { + if (E_IS_GW_CONNECTION (ccnc)) { (ssi->sf)->cnc = ccnc; (ssi->sf)->container_id = g_strdup (get_container_id ((ssi->sf)->cnc, m->full_name)); @@ -198,7 +198,7 @@ new_folder_created_cb (struct _EMCreateFolder *m, gpointer user_data) { struct ShareInfo *ssi = (struct ShareInfo *) user_data; EMFolderSelector *emfs = ssi->emfs; - if (m->fi){ + if (m->fi) { refresh_folder_tree (ssi->model, m->store); gtk_widget_destroy ((GtkWidget *) emfs); gtk_widget_destroy ((GtkWidget *) ssi->d); @@ -470,7 +470,7 @@ get_cnc (CamelStore *store) user = g_strdup (url->user); property_value = camel_url_get_param (url, "soap_port"); use_ssl = g_strdup (camel_url_get_param (url, "use_ssl")); - if(property_value == NULL) + if (property_value == NULL) port = g_strdup ("7191"); else if (strlen(property_value) == 0) port = g_strdup ("7191"); @@ -505,7 +505,7 @@ get_container_id(EGwConnection *cnc, const gchar *fname) gint i = 0, parts = 0; names = g_strsplit (fname, "/", -1); - if(names){ + if (names) { while (names [parts]) parts++; fname = names[i]; diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 29ff8acc8a..67c58f05fd 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -129,7 +129,7 @@ share_folder_init (ShareFolder *sf) static void free_user_node(EShUsers *user) { - if(user){ + if (user) { g_free(user->email); user->email = NULL; } @@ -140,7 +140,7 @@ static void free_node(SharedUser *usr) { EShUsers *user = usr->user_node; - if(user){ + if (user) { g_free(user->email); user->email = NULL; } @@ -155,13 +155,13 @@ find_node(GList *list, gchar *email) GList *tmp; gint i; - if(list){ + if (list) { tmp = g_list_first(list); - for(i=0; tmp; i++) + for (i=0; tmp; i++) { user = tmp->data; usr = user->user_node; - if(!g_ascii_strcasecmp(usr->email, email)){ + if (!g_ascii_strcasecmp(usr->email, email)) { return user; /*if found, it returns that user*/ } tmp= g_list_next(tmp); @@ -173,7 +173,7 @@ find_node(GList *list, gchar *email) static void free_all (ShareFolder *sf) { - if (sf->users_list){ + if (sf->users_list) { g_list_foreach (sf->users_list,(GFunc) free_node, NULL); g_list_free (sf->users_list); sf->users_list = NULL; @@ -193,12 +193,12 @@ display_container (EGwContainer *container , ShareFolder *sf) EShUsers *user = NULL; sf->gcontainer = container; - if(!(byme = e_gw_container_get_is_shared_by_me(container))) + if (!(byme = e_gw_container_get_is_shared_by_me(container))) tome = e_gw_container_get_is_shared_to_me(container); - if(byme || tome) { + if (byme || tome) { e_gw_container_get_user_list (sf->gcontainer, &user_list); sf->users = g_list_length (user_list); - if(sf->users != 0) { + if (sf->users != 0) { sf->is_shared = TRUE; gtk_toggle_button_set_active((GtkToggleButton *) sf->shared, TRUE); shared_clicked(sf->shared , sf); @@ -273,13 +273,13 @@ get_container_list (ShareFolder *sf) id_shared = g_strdup(e_gw_container_get_id (container->data)); /* this has to be done since id changes after the folder is shared*/ - if( g_str_has_suffix (id_shared, "35")){ + if ( g_str_has_suffix (id_shared, "35")) { tail = g_strsplit(id_shared, "@", 2); id_unshared = g_strconcat(tail[0], "@", "13", NULL); g_strfreev(tail); } - if((id_shared && !g_ascii_strcasecmp(id_shared, sf->container_id)) ||(id_unshared && !g_ascii_strcasecmp(id_unshared, sf->container_id))) { + if ((id_shared && !g_ascii_strcasecmp(id_shared, sf->container_id)) ||(id_unshared && !g_ascii_strcasecmp(id_unshared, sf->container_id))) { display_container (E_GW_CONTAINER (container->data), sf); g_free (id_shared); @@ -348,7 +348,7 @@ add_clicked(GtkButton *button, ShareFolder *sf) } /*check whether already exists*/ - if (sf->users_list && email){ + if (sf->users_list && email) { new_user = find_node (sf->users_list, (gchar *)email); if (new_user) return; @@ -419,20 +419,20 @@ share_folder (ShareFolder *sf) } if (E_IS_GW_CONNECTION (sf->cnc)) { - if(sf->flag_for_ok == 2){ /* you have to remove all the users*/ + if (sf->flag_for_ok == 2){ /* you have to remove all the users*/ GList *list = NULL; - if(new_list){ + if (new_list) { g_list_foreach (new_list, (GFunc) free_user_node, NULL); g_list_free (new_list); } - if(update_list){ + if (update_list) { g_list_foreach (update_list, (GFunc) free_user_node, NULL); g_list_free (update_list); } new_list = NULL; - if(remove_list){ + if (remove_list) { g_list_foreach (remove_list,(GFunc) free_user_node, NULL); g_list_free (remove_list); } @@ -579,7 +579,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) GtkTreePath *path = NULL; path = gtk_tree_path_new_from_string (arg1); - if (!gtk_tree_model_get_iter ((GtkTreeModel *) sf->model, &(sf->iter), path)){ + if (!gtk_tree_model_get_iter ((GtkTreeModel *) sf->model, &(sf->iter), path)) { gtk_tree_path_free (path); return; } @@ -589,7 +589,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) gtk_tree_path_free (path); return; } - if(! usr->flag) /* if user was already existing one change the flag to update*/ + if (! usr->flag) /* if user was already existing one change the flag to update*/ usr->flag = usr->flag | 0x2; user = usr->user_node; if (!right) { @@ -622,7 +622,7 @@ edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) gtk_tree_path_free (path); return; } - if(! usr->flag) /* if user was already existing one change the flag to update*/ + if (! usr->flag) /* if user was already existing one change the flag to update*/ usr->flag = usr->flag | 0x2; user = usr->user_node; @@ -656,7 +656,7 @@ delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) gtk_tree_path_free (path); return; } - if(! usr->flag) /* if user was already existing one change the flag to update*/ + if (! usr->flag) /* if user was already existing one change the flag to update*/ usr->flag = usr->flag | 0x2; user = usr->user_node; if (!right) { -- cgit v1.2.3 From 606f6c15dbfbd7821a5aa92a81d64b318842fe7a Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Thu, 23 Jul 2009 18:34:02 +0530 Subject: Bug #339361 (bnc) - soap threading not working. --- plugins/groupwise-features/mail-send-options.c | 20 ++++++++++++++++++++ .../org-gnome-groupwise-features.eplug.xml | 11 ++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) (limited to 'plugins/groupwise-features') diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c index 4faaf9bbc6..701205f04c 100644 --- a/plugins/groupwise-features/mail-send-options.c +++ b/plugins/groupwise-features/mail-send-options.c @@ -44,6 +44,7 @@ static ESendOptionsDialog * dialog = NULL; void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t); +void org_gnome_composer_message_reply (EPlugin *ep, EMEventTargetMessage *t); static time_t add_day_to_time (time_t time, gint days) @@ -171,3 +172,22 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t) G_CALLBACK (send_options_commit), dialog); } +void +org_gnome_composer_message_reply (EPlugin *ep, EMEventTargetMessage *t) +{ + EMsgComposer *comp = (struct _EMsgComposer *)t->composer ; + EComposerHeaderTable *table; + EAccount *account = NULL; + char *temp = NULL; + + table = e_msg_composer_get_header_table (comp); + account = e_composer_header_table_get_account (table); + if (!account) + return; + + temp = strstr (account->transport->url, "groupwise") ; + if (!temp) { + return; + } + e_msg_composer_add_header (comp, "X-GW-ORIG-ITEM-ID", t->uid); +} diff --git a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml index 8bb6651acf..ea4f06a6e7 100644 --- a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml +++ b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml @@ -72,7 +72,16 @@ enable="sendoption" /> - + + + + + -- cgit v1.2.3 From f69c15d69d634a3fb857cc062f91e31055a95863 Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Thu, 23 Jul 2009 19:17:45 +0530 Subject: Bug #583972 - Resend meeting dialog isn't coming properly. --- plugins/groupwise-features/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugins/groupwise-features') diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index 1af407dcd7..b26fa1693d 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -65,6 +65,7 @@ error_DATA = \ org-gnome-shared-folder.error \ org-gnome-proxy.error \ org-gnome-proxy-login.error \ + org-gnome-process-meeting.error \ org-gnome-mail-retract.error errordir = $(privdatadir)/errors @@ -76,6 +77,7 @@ EXTRA_DIST = \ org-gnome-compose-send-options.xml \ org-gnome-groupwise-features.eplug.xml \ org-gnome-shared-folder.error.xml \ + org-gnome-process-meeting.error.xml \ org-gnome-proxy.error.xml \ org-gnome-proxy-login.error.xml \ org-gnome-mail-retract.error.xml -- cgit v1.2.3 From 30ac043b6ef2ad85de31c8dfbd87ac5a63d58dd8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 26 Jul 2009 08:18:59 -0400 Subject: Coding style and whitespace cleanups. --- plugins/groupwise-features/mail-send-options.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/groupwise-features') diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c index 701205f04c..8244088f8a 100644 --- a/plugins/groupwise-features/mail-send-options.c +++ b/plugins/groupwise-features/mail-send-options.c @@ -175,17 +175,17 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t) void org_gnome_composer_message_reply (EPlugin *ep, EMEventTargetMessage *t) { - EMsgComposer *comp = (struct _EMsgComposer *)t->composer ; + EMsgComposer *comp = (struct _EMsgComposer *)t->composer; EComposerHeaderTable *table; EAccount *account = NULL; - char *temp = NULL; - + gchar *temp = NULL; + table = e_msg_composer_get_header_table (comp); account = e_composer_header_table_get_account (table); if (!account) return; - - temp = strstr (account->transport->url, "groupwise") ; + + temp = strstr (account->transport->url, "groupwise"); if (!temp) { return; } -- cgit v1.2.3 From 919a9bde9c9af0ef4a2119909c6de9e4042de3e0 Mon Sep 17 00:00:00 2001 From: Bharath Acharya Date: Mon, 27 Jul 2009 10:45:49 +0530 Subject: BUG #480095 (BNC) - Alpha Search In Proxy Dialog Crashes Evolution. * proxy-login.c (proxy_login_tree_view_changed_cb): Use the unique stamp to catch only the valid iterators. Bug description: If you right mouse click on your Groupwise email account, you can select "Proxy Login" and a dialog appears with all of your previously used accounts in a list. If you click focus into the list and then type in a keyboard letter it crashes. This should position you at the first match of that letter, or at least not crash :) --- plugins/groupwise-features/proxy-login.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'plugins/groupwise-features') diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 00d851f449..b8fe49506b 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -400,7 +400,9 @@ proxy_login_tree_view_changed_cb(GtkDialog *dialog) account_select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree)); gtk_tree_selection_get_selected (account_select, &model, &iter); - gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1); + if ((priv->store)->stamp != (&iter)->stamp) + return; + gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1); account_mailid = g_strrstr (account_mailid, "\n") + 1; account_name_tbox = glade_xml_get_widget (priv->xml, "account_name"); gtk_entry_set_text((GtkEntry*) account_name_tbox,account_mailid); -- cgit v1.2.3