diff options
Diffstat (limited to 'plugins/groupwise-features')
20 files changed, 124 insertions, 65 deletions
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index 42b68c58ec..57b37fd522 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -2,7 +2,6 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ - -I$(top_srcdir)/camel \ -I$(top_builddir)/composer \ -I$(top_builddir)/mail \ $(EVOLUTION_MAIL_CFLAGS) \ diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c index c5959249df..b6519c636e 100644 --- a/plugins/groupwise-features/addressbook-groupwise.c +++ b/plugins/groupwise-features/addressbook-groupwise.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index bfe295447f..29c5ed2855 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index 4cee3919f4..3e7d522c19 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -114,7 +114,7 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data) } static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "50.emfv.05", N_("Junk Mail Settings..."), junk_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY} + { E_POPUP_ITEM, (gchar *) "50.emfv.05", (gchar *) N_("Junk Mail Settings..."), junk_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY} }; static void diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index bff2abc35a..3d66a1c518 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -48,7 +48,6 @@ static void free_all(JunkSettings *js); static void get_junk_list (JunkSettings *js); static void disable_clicked (GtkRadioButton *button, JunkSettings *js); static void enable_clicked (GtkRadioButton *button, JunkSettings *js); -GType junk_settings_get_type (void); static GtkVBoxClass *parent_class = NULL; @@ -243,24 +242,32 @@ commit_changes (JunkSettings *js) if (E_IS_GW_CONNECTION (js->cnc)) { 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); + if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK) { + ; + } } if (js->flag_for_ok == 0 && !js->enabled) { use_block = use_pab =0; use_junk = 1; persistence = 14; /* We are setting the default persistence*/ - if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK) { + ; + } } while (new_list) { entry = new_list->data; - if (e_gw_connection_create_junk_entry (js->cnc, entry->match, "email", "junk") == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_create_junk_entry (js->cnc, entry->match, "email", "junk") == E_GW_CONNECTION_STATUS_OK) { + ; + } new_list = new_list->next; } while (remove_list) { entry = remove_list->data; - if (e_gw_connection_remove_junk_entry (js->cnc, entry->id) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_remove_junk_entry (js->cnc, entry->id) == E_GW_CONNECTION_STATUS_OK) { + ; + } remove_list = remove_list->next; } diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h index 9e3f60ce1a..43322de018 100644 --- a/plugins/groupwise-features/junk-settings.h +++ b/plugins/groupwise-features/junk-settings.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 928a780124..cf039931a5 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -50,8 +50,8 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data) if (cnc && E_IS_GW_CONNECTION(cnc)) { id = (char *)item->user_data; - confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), NULL, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), NULL, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_YES, GTK_RESPONSE_YES, GTK_STOCK_NO, GTK_RESPONSE_NO, NULL); @@ -78,13 +78,13 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data) gtk_dialog_run (GTK_DIALOG(dialog)); gtk_widget_destroy (dialog); } - } + } } } static EPopupItem popup_items[] = { -{ E_POPUP_BAR, "20.emfv.03" }, -{ E_POPUP_ITEM, "20.emfv.04", N_("Retract Mail"), retract_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY} + { E_POPUP_BAR, (gchar *) "20.emfv.03" }, + { E_POPUP_ITEM, (gchar *) "20.emfv.04", (gchar *) N_("Retract Mail"), retract_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY} }; static void popup_free (EPopup *ep, GSList *items, void *data) diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c index 0e0663c801..7954f9e1a4 100644 --- a/plugins/groupwise-features/mail-send-options.c +++ b/plugins/groupwise-features/mail-send-options.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/plugins/groupwise-features/mail-send-options.h b/plugins/groupwise-features/mail-send-options.h index 943614e995..71cacbff01 100644 --- a/plugins/groupwise-features/mail-send-options.h +++ b/plugins/groupwise-features/mail-send-options.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/plugins/groupwise-features/org-gnome-process-meeting.error.xml b/plugins/groupwise-features/org-gnome-process-meeting.error.xml new file mode 100644 index 0000000000..82bf25b0d3 --- /dev/null +++ b/plugins/groupwise-features/org-gnome-process-meeting.error.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<error-list domain="org.gnome.evolution.process_meeting"> + +<error id="recurrence-accept" type="question" default="GTK_RESPONSE_YES"> +<_primary>This is a recurring meeting</_primary> +<!--Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") --> +<_secondary>Would you like to accept it?</_secondary> + <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/> + <button label="This instance" response="GTK_RESPONSE_NO"/> + <button label="All instances" response="GTK_RESPONSE_YES"/> +</error> + +<error id="recurrence-decline" type="question" default="GTK_RESPONSE_YES"> +<_primary>This is a recurring meeting</_primary> +<!--Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") --> +<_secondary>Would you like to decline it?</_secondary> + <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/> + <button label="This instance" response="GTK_RESPONSE_NO"/> + <button label="All instances" response="GTK_RESPONSE_YES"/> +</error> + +<error id="resend" type="question" default="GTK_RESPONSE_YES"> +<_primary>Do you want to resend the meeting ?</_primary> +<_secondary>This will create a new meeting using the existing meeting details.</_secondary> + <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/> + <button stock="gtk-ok" response="GTK_RESPONSE_OK"/> +</error> + +<error id="resend-recurrence" type="question" default="GTK_RESPONSE_YES"> +<_primary>Do you want to resend the recurring meeting ?</_primary> +<_secondary>This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered.</_secondary> + <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/> + <button label="This instance" response="GTK_RESPONSE_NO"/> + <button label="All instances" response="GTK_RESPONSE_YES"/> +</error> + +<error id="resend-retract" type="question" default="GTK_RESPONSE_YES"> +<_primary>Do you want to retract the original item ?</_primary> +<_secondary>The original will be removed from the recipient's mailbox.</_secondary> + <button stock="gtk-no" response="GTK_RESPONSE_NO"/> + <button stock="gtk-yes" response="GTK_RESPONSE_YES"/> +</error> + +</error-list> diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index bc046c0a05..67123decf4 100644 --- a/plugins/groupwise-features/process-meeting.c +++ b/plugins/groupwise-features/process-meeting.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -50,9 +50,9 @@ static void on_decline_meeting (EPopup *ep, EPopupItem *pitem, void *data); static void on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data); static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "41.accept", N_("Accept"), on_accept_meeting, NULL, GTK_STOCK_APPLY, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE}, -{ E_POPUP_ITEM, "42.accept", N_("Accept Tentatively"), on_accept_meeting_tentative, NULL, GTK_STOCK_DIALOG_QUESTION, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE}, -{ E_POPUP_ITEM, "43.decline", N_("Decline"), on_decline_meeting, NULL, GTK_STOCK_CANCEL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} + { E_POPUP_ITEM, (gchar *) "41.accept", (gchar *) N_("Accept"), on_accept_meeting, NULL, (gchar *) GTK_STOCK_APPLY, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE}, + { E_POPUP_ITEM, (gchar *) "42.accept", (gchar *) N_("Accept Tentatively"), on_accept_meeting_tentative, NULL, (gchar *) GTK_STOCK_DIALOG_QUESTION, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE}, + { E_POPUP_ITEM, (gchar *) "43.decline", (gchar *) N_("Decline"), on_decline_meeting, NULL, (gchar *) GTK_STOCK_CANCEL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} }; static void @@ -319,10 +319,10 @@ typedef struct { } ThreadData; static EPopupItem retract_popup_items[] = { -{ E_POPUP_ITEM, "49.resend", N_("Rese_nd Meeting..."), on_resend_meeting, NULL, GTK_STOCK_EDIT, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} + { E_POPUP_ITEM, (gchar *) "49.resend", (gchar *) N_("Rese_nd Meeting..."), on_resend_meeting, NULL, (gchar *) GTK_STOCK_EDIT, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} }; -void +void org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target) { GSList *menus = NULL; @@ -348,7 +348,7 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target) if (! g_strrstr (uri, "groupwise://")) return ; - + comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); @@ -394,7 +394,7 @@ add_retract_data (ECalComponent *comp, const char *retract_comment, CalObjModTyp icalcomponent_add_property (icalcomp, icalprop); } -static void +static void free_thread_data (ThreadData *data) { if (data == NULL) @@ -420,10 +420,10 @@ retract_object (gpointer val) GError *error = NULL; add_retract_data (data->comp, NULL, data->mod); - + icalcomp = e_cal_component_get_icalcomponent (data->comp); icalcomponent_set_method (icalcomp, ICAL_METHOD_CANCEL); - + if (!e_cal_send_objects (data->client, icalcomp, &users, &mod_comp, &error)) { /* FIXME report error */ @@ -434,15 +434,15 @@ retract_object (gpointer val) if (mod_comp) icalcomponent_free (mod_comp); - + if (users) { g_list_foreach (users, (GFunc) g_free, NULL); g_list_free (users); } - + rid = e_cal_component_get_recurid_as_string (data->comp); e_cal_component_get_uid (data->comp, &uid); - + if (!e_cal_remove_object_with_mod (data->client, uid, rid, data->mod, &error)) { g_warning ("Unable to remove the item \n"); @@ -461,7 +461,7 @@ object_created_cb (CompEditor *ce, gpointer data) GThread *thread = NULL; int response; GError *error = NULL; - + gtk_widget_hide (GTK_WIDGET (ce)); response = e_error_run (NULL, "org.gnome.evolution.process_meeting:resend-retract", NULL); @@ -507,18 +507,18 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data) response = e_error_run (NULL, msg, NULL); if (response == GTK_RESPONSE_YES) { - mod = CALOBJ_MOD_ALL; + mod = CALOBJ_MOD_ALL; } else if (response == GTK_RESPONSE_CANCEL) { g_object_unref (comp); return; } - + data = g_new0 (ThreadData, 1); data->client = g_object_ref (event->comp_data->client); data->comp = comp; data->mod = mod; - - if (resend) + + if (resend) { guint flags = 0; char *new_uid = NULL; @@ -535,7 +535,7 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data) e_cal_component_set_uid (new_comp, new_uid); icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (new_comp)); ce = e_calendar_view_open_event_with_flags (cal_view, data->client, icalcomp, flags); - + g_signal_connect (ce, "object_created", G_CALLBACK (object_created_cb), data); g_object_unref (new_comp); g_free (new_uid); diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 012a0df6e1..94435bf983 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -178,7 +178,8 @@ proxy_login_new (void) static int proxy_get_password (EAccount *account, char **user_name, char **password) { - char *uri, *failed_auth, *key, *prompt; + const gchar *failed_auth; + char *uri, *key, *prompt; CamelURL *url; const char *poa_address, *use_ssl = NULL, *soap_port; @@ -222,7 +223,8 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent) { EGwConnection *cnc; CamelURL *url; - char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL; + const gchar *failed_auth; + char *uri = NULL, *key = NULL, *prompt = NULL, *password = NULL; const char *use_ssl = NULL, *soap_port; gboolean remember; @@ -508,7 +510,7 @@ static EPopupItem popup_items[] = { /* 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 */ -{ E_POPUP_ITEM, "20.emc.04", N_("_Proxy Login..."), org_gnome_proxy_account_login, NULL, NULL, 0, EM_POPUP_FOLDER_STORE } + { E_POPUP_ITEM, (gchar *) "20.emc.04", (gchar *) N_("_Proxy Login..."), org_gnome_proxy_account_login, NULL, NULL, 0, EM_POPUP_FOLDER_STORE } }; static void diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h index b36d31563b..24717f8cc7 100644 --- a/plugins/groupwise-features/proxy-login.h +++ b/plugins/groupwise-features/proxy-login.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 60be390eb3..7ab0095dbf 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -459,7 +459,8 @@ static EGwConnection * proxy_get_cnc (EAccount *account, GtkWindow *parent_window) { EGwConnection *cnc; - char *uri, *failed_auth, *key, *prompt, *password = NULL; + const gchar *failed_auth; + char *uri, *key, *prompt, *password = NULL; CamelURL *url; const char *poa_address, *use_ssl, *soap_port; gboolean remember; diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h index 8c8d30368c..c2bd933db4 100644 --- a/plugins/groupwise-features/proxy.h +++ b/plugins/groupwise-features/proxy.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -52,7 +52,6 @@ struct _proxyDialogClass { GType proxy_dialog_get_type (void); proxyDialog *proxy_dialog_new (void); -void proxy_commit(GtkWidget *button, EConfigHookItemFactoryData *data); GtkWidget * org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data); static void proxy_add_account (GtkWidget *button, EAccount *account); static void proxy_remove_account (GtkWidget *button, EAccount *account); diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index ed8e6093a2..33f1dd2cb4 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -55,7 +55,8 @@ static EGwConnection * get_cnc (GtkWindow *parent_window) { EGwConnection *cnc; - char *uri, *failed_auth, *key, *prompt, *password = NULL; + const gchar *failed_auth; + char *uri, *key, *prompt, *password = NULL; CamelURL *url; const char *poa_address, *use_ssl, *soap_port; gboolean remember; @@ -393,7 +394,9 @@ get_source (ESourceList *list) } static void -add_return_value (EGwSendOptionsReturnNotify track, ESource *source, char *notify) +add_return_value (EGwSendOptionsReturnNotify track, + ESource *source, + const gchar *notify) { char *value; diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 3a850b2a55..74ca71fbb4 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -337,7 +337,7 @@ new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *mo } static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "20.emc.001", N_("New _Shared Folder..."), create_shared_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, (gchar *) "20.emc.001", (gchar *) N_("New _Shared Folder..."), create_shared_folder, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; static void @@ -497,7 +497,7 @@ get_cnc (CamelStore *store) } gchar * -get_container_id(EGwConnection *cnc, gchar *fname) +get_container_id(EGwConnection *cnc, const gchar *fname) { GList *container_list = NULL; gchar *id = NULL; diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 9b3062b1c3..382cf75124 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -49,7 +49,6 @@ static void free_user_node(EShUsers *user); static void free_node(SharedUser *user); static void free_all(ShareFolder *sf); static SharedUser * find_node(GList *list, gchar *email); -static void free_all(ShareFolder *sf); static void get_container_list (ShareFolder *sf); static void user_selected(GtkTreeSelection *selection, ShareFolder *sf); static void not_shared_clicked (GtkRadioButton *button, ShareFolder *sf); @@ -58,7 +57,6 @@ static void add_clicked(GtkButton *button, ShareFolder *sf); static void remove_clicked(GtkButton *button, ShareFolder *sf); static void not_ok_clicked(GtkButton *button, ShareFolder *sf); static void not_cancel_clicked(GtkButton *button, GtkWidget *window); -static void not_cancel_clicked(GtkButton *button, GtkWidget *window); static void share_folder_construct (ShareFolder *sf); GType share_folder_get_type (void); @@ -453,18 +451,24 @@ share_folder (ShareFolder *sf) } else { if (new_list) { - if (e_gw_connection_share_folder (sf->cnc, sf->container_id, new_list, sf->sub, sf->mesg, 0) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_share_folder (sf->cnc, sf->container_id, new_list, sf->sub, sf->mesg, 0) == E_GW_CONNECTION_STATUS_OK) { + ; + } } if (update_list) { sf->sub = "Shared Folder rights updated"; - if (e_gw_connection_share_folder (sf->cnc, sf->container_id, update_list, sf->sub, sf->mesg, 2) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_share_folder (sf->cnc, sf->container_id, update_list, sf->sub, sf->mesg, 2) == E_GW_CONNECTION_STATUS_OK) { + ; + } } } if (remove_list) { sf->sub = "Shared Folder removed"; - if (e_gw_connection_share_folder (sf->cnc, sf->container_id, remove_list, sf->sub, sf->mesg, 1) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_share_folder (sf->cnc, sf->container_id, remove_list, sf->sub, sf->mesg, 1) == E_GW_CONNECTION_STATUS_OK) { + ; + } } } diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index 3acf595053..fadf37bcfb 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -93,7 +93,7 @@ struct _ShareFolder { gboolean is_shared; EGwConnection *cnc; gchar *container_id; - gchar *sub; + const gchar *sub; gchar *mesg; GList *container_list; GtkTreeIter iter; @@ -109,7 +109,7 @@ struct _ShareFolderClass { GType share_folderget_type (void); struct _ShareFolder * share_folder_new (EGwConnection *ccnc, gchar *id); void share_folder(struct _ShareFolder *sf); -gchar * get_container_id (EGwConnection *cnc, gchar *fname); +gchar * get_container_id (EGwConnection *cnc, const gchar *fname); EGwConnection * get_cnc (CamelStore *store); #ifdef __cplusplus diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index 65b66962c5..a465752c95 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> + * License along with the program; if not, see <http://www.gnu.org/licenses/> * * * Authors: @@ -238,7 +238,7 @@ track_status (EPopup *ep, EPopupItem *item, void *data) } static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "20.emfv.02", N_("Track Message Status..."), track_status, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY} + { E_POPUP_ITEM, (gchar * ) "20.emfv.02", (gchar *) N_("Track Message Status..."), track_status, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY} }; static void |