diff options
Diffstat (limited to 'plugins')
44 files changed, 1579 insertions, 920 deletions
diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c index 6c8922788e..37ed087c01 100644 --- a/plugins/addressbook-file/addressbook-file.c +++ b/plugins/addressbook-file/addressbook-file.c @@ -32,7 +32,8 @@ gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } @@ -40,7 +41,8 @@ e_plugin_lib_enable (EPlugin *ep, gint enable) GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data); GtkWidget * -e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data) +e_book_file_dummy (EPlugin *epl, + EConfigHookItemFactoryData *data) { EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; ESource *source = t->source; diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index 5c842d156d..7a6a9fce55 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -66,7 +66,7 @@ gint e_plugin_lib_enable (EPlugin *ep, gint enable); GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin); void org_gnome_evolution_attachment_reminder (EPlugin *ep, EMEventTargetComposer *t); -GtkWidget* org_gnome_attachment_reminder_config_option (EPlugin *plugin, struct _EConfigHookItemFactoryData *data); +GtkWidget * org_gnome_attachment_reminder_config_option (EPlugin *plugin, struct _EConfigHookItemFactoryData *data); static gboolean ask_for_missing_attachment (EPlugin *ep, GtkWindow *widget); static gboolean check_for_attachment_clues (gchar *msg); @@ -75,13 +75,15 @@ static gchar * strip_text_msg (gchar *msg); static void commit_changes (UIData *ui); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } void -org_gnome_evolution_attachment_reminder (EPlugin *ep, EMEventTargetComposer *t) +org_gnome_evolution_attachment_reminder (EPlugin *ep, + EMEventTargetComposer *t) { GByteArray *raw_msg_barray; @@ -107,7 +109,8 @@ org_gnome_evolution_attachment_reminder (EPlugin *ep, EMEventTargetComposer *t) } static gboolean -ask_for_missing_attachment (EPlugin *ep, GtkWindow *window) +ask_for_missing_attachment (EPlugin *ep, + GtkWindow *window) { GtkWidget *check; GtkWidget *dialog; @@ -157,7 +160,7 @@ check_for_attachment_clues (gchar *msg) g_object_unref (gconf); msg_length = strlen (msg); - for (list = clue_list;list && !ret_val;list=g_slist_next (list)) { + for (list = clue_list; list && !ret_val; list = g_slist_next (list)) { gchar *needle = g_utf8_strdown (list->data, -1); if (g_strstr_len (msg, msg_length, needle)) { ret_val = TRUE; @@ -191,7 +194,7 @@ strip_text_msg (gchar *msg) { gchar **lines = g_strsplit ( msg, "\n", -1); gchar *stripped_msg = g_strdup (" "); - guint i=0; + guint i = 0; gchar *temp; /* Note : HTML Signatures won't work. Depends on Bug #522784 */ @@ -273,7 +276,8 @@ cell_editing_canceled_cb (GtkCellRenderer *cell, } static void -clue_add_clicked (GtkButton *button, UIData *ui) +clue_add_clicked (GtkButton *button, + UIData *ui) { GtkTreeModel *model; GtkTreeView *tree_view; @@ -294,7 +298,8 @@ clue_add_clicked (GtkButton *button, UIData *ui) } static void -clue_remove_clicked (GtkButton *button, UIData *ui) +clue_remove_clicked (GtkButton *button, + UIData *ui) { GtkTreeSelection *selection; GtkTreeModel *model; @@ -337,7 +342,8 @@ clue_remove_clicked (GtkButton *button, UIData *ui) } static void -clue_edit_clicked (GtkButton *button, UIData *ui) +clue_edit_clicked (GtkButton *button, + UIData *ui) { GtkTreeSelection *selection; GtkTreeModel *model; @@ -359,7 +365,8 @@ clue_edit_clicked (GtkButton *button, UIData *ui) } static void -selection_changed (GtkTreeSelection *selection, UIData *ui) +selection_changed (GtkTreeSelection *selection, + UIData *ui) { GtkTreeModel *model; GtkTreeIter iter; @@ -456,7 +463,7 @@ e_plugin_lib_get_configure_widget (EPlugin *plugin) renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Keywords"), renderer, "text", CLUE_KEYWORD_COLUMN, NULL); - g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); + g_object_set (renderer, "editable", TRUE, NULL); g_signal_connect ( renderer, "edited", G_CALLBACK (cell_edited_cb), ui); @@ -466,18 +473,26 @@ e_plugin_lib_get_configure_widget (EPlugin *plugin) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); - g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), ui); + g_signal_connect ( + selection, "changed", + G_CALLBACK (selection_changed), ui); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ui->treeview), TRUE); ui->clue_add = clue_add; - g_signal_connect (G_OBJECT (ui->clue_add), "clicked", G_CALLBACK (clue_add_clicked), ui); + g_signal_connect ( + ui->clue_add, "clicked", + G_CALLBACK (clue_add_clicked), ui); ui->clue_remove = clue_remove; - g_signal_connect (G_OBJECT (ui->clue_remove), "clicked", G_CALLBACK (clue_remove_clicked), ui); + g_signal_connect ( + ui->clue_remove, "clicked", + G_CALLBACK (clue_remove_clicked), ui); gtk_widget_set_sensitive (ui->clue_remove, FALSE); ui->clue_edit = clue_edit; - g_signal_connect (G_OBJECT (ui->clue_edit), "clicked", G_CALLBACK (clue_edit_clicked), ui); + g_signal_connect ( + ui->clue_edit, "clicked", + G_CALLBACK (clue_edit_clicked), ui); gtk_widget_set_sensitive (ui->clue_edit, FALSE); /* Populate tree view with values from gconf */ diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 07b1bd679b..a5e7ccd68c 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -37,7 +37,8 @@ gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } @@ -104,7 +105,8 @@ org_gnome_audio_inline_pobject_free (EMFormatHTMLPObject *o) } static void -org_gnome_audio_inline_pause_clicked (GtkWidget *button, EMFormatHTMLPObject *pobject) +org_gnome_audio_inline_pause_clicked (GtkWidget *button, + EMFormatHTMLPObject *pobject) { struct _org_gnome_audio_inline_pobject *po = (struct _org_gnome_audio_inline_pobject *) pobject; @@ -115,7 +117,8 @@ org_gnome_audio_inline_pause_clicked (GtkWidget *button, EMFormatHTMLPObject *po } static void -org_gnome_audio_inline_stop_clicked (GtkWidget *button, EMFormatHTMLPObject *pobject) +org_gnome_audio_inline_stop_clicked (GtkWidget *button, + EMFormatHTMLPObject *pobject) { struct _org_gnome_audio_inline_pobject *po = (struct _org_gnome_audio_inline_pobject *) pobject; @@ -143,7 +146,9 @@ org_gnome_audio_inline_set_audiosink (GstElement *playbin) } static gboolean -org_gnome_audio_inline_gst_callback (GstBus * bus, GstMessage * message, gpointer data) +org_gnome_audio_inline_gst_callback (GstBus *bus, + GstMessage *message, + gpointer data) { struct _org_gnome_audio_inline_pobject *po = (struct _org_gnome_audio_inline_pobject *) data; GstMessageType msg_type; @@ -189,7 +194,8 @@ org_gnome_audio_inline_gst_callback (GstBus * bus, GstMessage * message, gpointe } static void -org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pobject) +org_gnome_audio_inline_play_clicked (GtkWidget *button, + EMFormatHTMLPObject *pobject) { struct _org_gnome_audio_inline_pobject *po = (struct _org_gnome_audio_inline_pobject *) pobject; GstState cur_state; @@ -230,7 +236,7 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob } uri = g_filename_to_uri (po->filename, NULL, NULL); - g_object_set (G_OBJECT (po->playbin), "uri", uri, NULL); + g_object_set (po->playbin, "uri", uri, NULL); g_free (uri); org_gnome_audio_inline_set_audiosink (po->playbin); @@ -257,7 +263,11 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob } static GtkWidget * -org_gnome_audio_inline_add_button (GtkWidget *box, const gchar *stock_icon, GCallback cb, gpointer data, gboolean sensitive) +org_gnome_audio_inline_add_button (GtkWidget *box, + const gchar *stock_icon, + GCallback cb, + gpointer data, + gboolean sensitive) { GtkWidget *button; @@ -272,7 +282,9 @@ org_gnome_audio_inline_add_button (GtkWidget *box, const gchar *stock_icon, GCal } static gboolean -org_gnome_audio_inline_button_panel (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject) +org_gnome_audio_inline_button_panel (EMFormatHTML *efh, + GtkHTMLEmbedded *eb, + EMFormatHTMLPObject *pobject) { GtkWidget *box; struct _org_gnome_audio_inline_pobject *po = (struct _org_gnome_audio_inline_pobject *) pobject; @@ -291,7 +303,8 @@ org_gnome_audio_inline_button_panel (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMF } void -org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t) +org_gnome_audio_inline_format (gpointer ep, + EMFormatHookTarget *t) { struct _org_gnome_audio_inline_pobject *pobj; gchar *classid; diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index d6e1b05076..f558b19c71 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -55,20 +55,22 @@ void backup_restore_commit (EPlugin *ep, EMConfigTargetAccount *target); void backup_restore_abort (EPlugin *ep, EMConfigTargetAccount *target); typedef enum _br_flags { - BR_OK = 1<<0, - BR_START = 1<<1 + BR_OK = 1 << 0, + BR_START = 1 << 1 }br_flags; gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } static void -backup (const gchar *filename, gboolean restart) +backup (const gchar *filename, + gboolean restart) { if (restart) execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", "--restart", filename, (gchar *)NULL); @@ -77,7 +79,8 @@ backup (const gchar *filename, gboolean restart) } static void -restore (const gchar *filename, gboolean restart) +restore (const gchar *filename, + gboolean restart) { if (restart) execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", "--restart", filename, (gchar *)NULL); @@ -111,7 +114,10 @@ sanity_check (const gchar *filename) } static guint32 -dialog_prompt_user (GtkWindow *parent, const gchar *string, const gchar *tag, ...) +dialog_prompt_user (GtkWindow *parent, + const gchar *string, + const gchar *tag, + ...) { GtkWidget *dialog; GtkWidget *check = NULL; @@ -270,7 +276,8 @@ action_settings_restore_cb (GtkAction *action, } static void -check_toggled (GtkToggleButton *button, GtkAssistant *assistant) +check_toggled (GtkToggleButton *button, + GtkAssistant *assistant) { GtkWidget *box = g_object_get_data ((GObject *)button, "box"); gboolean state = gtk_toggle_button_get_active ((GtkToggleButton *) button); @@ -283,7 +290,8 @@ check_toggled (GtkToggleButton *button, GtkAssistant *assistant) } static void -file_changed (GtkFileChooser *chooser, GtkAssistant *assistant) +file_changed (GtkFileChooser *chooser, + GtkAssistant *assistant) { gchar *file = NULL, *prevfile = NULL; @@ -296,7 +304,9 @@ file_changed (GtkFileChooser *chooser, GtkAssistant *assistant) } static gboolean -backup_restore_check (EConfig *ec, const gchar *pageid, gpointer data) +backup_restore_check (EConfig *ec, + const gchar *pageid, + gpointer data) { GtkAssistant *assistant = data; gint do_restore; @@ -314,7 +324,8 @@ backup_restore_check (EConfig *ec, const gchar *pageid, gpointer data) } GtkWidget * -backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data) +backup_restore_page (EPlugin *ep, + EConfigHookItemFactoryData *hook_data) { GtkWidget *page, *hbox, *label, *cbox, *button; GtkAssistant *assistant = GTK_ASSISTANT (hook_data->parent); @@ -359,7 +370,8 @@ backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data) return GTK_WIDGET (page); } void -backup_restore_commit (EPlugin *ep, EMConfigTargetAccount *target) +backup_restore_commit (EPlugin *ep, + EMConfigTargetAccount *target) { GtkWidget *assistant = target->target.config->widget; gboolean state = GPOINTER_TO_INT (g_object_get_data ((GObject *)assistant, "restore")) ? TRUE : FALSE; @@ -377,7 +389,8 @@ backup_restore_commit (EPlugin *ep, EMConfigTargetAccount *target) } void -backup_restore_abort (EPlugin *ep, EMConfigTargetAccount *target) +backup_restore_abort (EPlugin *ep, + EMConfigTargetAccount *target) { /* Nothing really */ } diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index f813b2ca55..370608ac2a 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -95,7 +95,9 @@ static GOptionEntry options[] = { static gboolean check (const gchar *filename, gboolean *is_new_format); static GString * -replace_string (const gchar *text, const gchar *find, const gchar *replace) +replace_string (const gchar *text, + const gchar *find, + const gchar *replace) { const gchar *p, *next; GString *str; @@ -183,7 +185,9 @@ replace_variables (const gchar *str) } static void -replace_in_file (const gchar *filename, const gchar *find, const gchar *replace) +replace_in_file (const gchar *filename, + const gchar *find, + const gchar *replace) { gchar *content = NULL; GError *error = NULL; @@ -338,7 +342,9 @@ backup (const gchar *filename, } static void -extract_backup_dirs (const gchar *filename, gchar **data_dir, gchar **config_dir) +extract_backup_dirs (const gchar *filename, + gchar **data_dir, + gchar **config_dir) { GKeyFile *key_file; GError *error = NULL; @@ -524,7 +530,8 @@ restore (const gchar *filename, } static gboolean -check (const gchar *filename, gboolean *is_new_format) +check (const gchar *filename, + gboolean *is_new_format) { gchar *command; gchar *quotedfname; @@ -650,7 +657,8 @@ dlg_response (GtkWidget *dlg, } gint -main (gint argc, gchar **argv) +main (gint argc, + gchar **argv) { GCancellable *cancellable; gchar *file = NULL, *oper = NULL; @@ -674,7 +682,7 @@ main (gint argc, gchar **argv) p_SetProcessDEPPolicy = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetProcessDEPPolicy"); if (p_SetProcessDEPPolicy) - (*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE|PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION); + (*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION); } #endif #endif @@ -770,7 +778,7 @@ main (gint argc, gchar **argv) txt2 = _("Please wait while Evolution is restoring your data."); } else { /* do not translate these two, it's just a fallback when something goes wrong, - we should never get here anyway. */ + * we should never get here anyway. */ txt = "Oops, doing nothing..."; txt2 = "Should not be here now, really..."; } diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 2c53eaf56c..d24e75480c 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -67,7 +67,8 @@ static GtkWidget *create_addressbook_combo_box (struct bbdb_stuff *stuff, gint t static void cleanup_cb (GObject *o, gpointer data); static ESource * -find_esource_by_uri (ESourceList *source_list, const gchar *target_uri) +find_esource_by_uri (ESourceList *source_list, + const gchar *target_uri) { GSList *groups; @@ -135,7 +136,8 @@ get_check_interval (void) } gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { static guint update_source = 0; @@ -229,7 +231,8 @@ bbdb_do_in_thread (gpointer data) } static void -bbdb_do_thread (const gchar *name, const gchar *email) +bbdb_do_thread (const gchar *name, + const gchar *email) { todo_struct *td; @@ -243,7 +246,7 @@ bbdb_do_thread (const gchar *name, const gchar *email) G_LOCK (todo); if (todo) { /* the list isn't empty, which means there is a thread taking - care of that, thus just add it to the queue */ + * care of that, thus just add it to the queue */ todo = g_slist_append (todo, td); } else { GError *error = NULL; @@ -303,7 +306,8 @@ walk_destinations_and_free (EDestination **dests) } void -bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target) +bbdb_handle_send (EPlugin *ep, + EMEventTargetComposer *target) { EComposerHeaderTable *table; GConfClient *gconf; @@ -325,7 +329,9 @@ bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target) } static void -bbdb_do_it (EBookClient *client, const gchar *name, const gchar *email) +bbdb_do_it (EBookClient *client, + const gchar *name, + const gchar *email) { gchar *query_string, *delim, *temp_name = NULL, *uid; GSList *contacts = NULL; @@ -377,8 +383,8 @@ bbdb_do_it (EBookClient *client, const gchar *name, const gchar *email) g_free (query_string); if (contacts != NULL || !status) { /* FIXME: If there's more than one contact with this - name, just give up; we're not smart enough for - this. */ + * name, just give up; we're not smart enough for + * this. */ if (!status || contacts->next != NULL) { e_client_util_free_object_slist (contacts); g_free (temp_name); @@ -492,7 +498,8 @@ bbdb_check_gaim_enabled (void) } static void -add_email_to_contact (EContact *contact, const gchar *email) +add_email_to_contact (EContact *contact, + const gchar *email) { GList *emails; @@ -504,7 +511,8 @@ add_email_to_contact (EContact *contact, const gchar *email) /* Code to implement the configuration user interface follows */ static void -enable_toggled_cb (GtkWidget *widget, gpointer data) +enable_toggled_cb (GtkWidget *widget, + gpointer data) { struct bbdb_stuff *stuff = (struct bbdb_stuff *) data; gboolean active; @@ -543,7 +551,8 @@ enable_toggled_cb (GtkWidget *widget, gpointer data) } static void -enable_gaim_toggled_cb (GtkWidget *widget, gpointer data) +enable_gaim_toggled_cb (GtkWidget *widget, + gpointer data) { struct bbdb_stuff *stuff = (struct bbdb_stuff *) data; gboolean active; @@ -613,7 +622,8 @@ gaim_source_changed_cb (ESourceComboBox *source_combo_box, } static GtkWidget * -create_addressbook_combo_box (struct bbdb_stuff *stuff, gint type) +create_addressbook_combo_box (struct bbdb_stuff *stuff, + gint type) { GtkWidget *combo_box; ESourceList *source_list; @@ -645,7 +655,8 @@ create_addressbook_combo_box (struct bbdb_stuff *stuff, gint type) } GtkWidget * -bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) +bbdb_page_factory (EPlugin *ep, + EConfigHookItemFactoryData *hook_data) { struct bbdb_stuff *stuff; EABConfigTargetPrefs *target = (EABConfigTargetPrefs *) hook_data->config->target; @@ -762,7 +773,8 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) } static void -cleanup_cb (GObject *o, gpointer data) +cleanup_cb (GObject *o, + gpointer data) { struct bbdb_stuff *stuff = data; diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index cbeb4ebb42..82951a7566 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -42,11 +42,11 @@ /* bbdb.c */ /* creates an EBookClient for a given type (gaim or contacts), but doesn't open it; - this function should be called in a main thread. */ + * this function should be called in a main thread. */ EBookClient *bbdb_create_book_client (gint type); /* opens an EBookClient. Returns false if it fails, and unrefs the book too; - this function can be called in any thread */ + * this function can be called in any thread */ gboolean bbdb_open_book_client (EBookClient *client); gboolean bbdb_check_gaim_enabled (void); diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index 7e42066638..d2e3c0016c 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -250,8 +250,8 @@ bbdb_sync_buddy_list_in_thread (gpointer data) if (contacts != NULL) { /* FIXME: If there's more than one contact with this - name, just give up; we're not smart enough for - this. */ + * name, just give up; we're not smart enough for + * this. */ if (contacts->next != NULL) { e_client_util_free_object_slist (contacts); continue; @@ -360,7 +360,8 @@ bbdb_sync_buddy_list (void) } static gboolean -im_list_contains_buddy (GList *ims, GaimBuddy *b) +im_list_contains_buddy (GList *ims, + GaimBuddy *b) { GList *l; @@ -375,7 +376,9 @@ im_list_contains_buddy (GList *ims, GaimBuddy *b) } static gboolean -bbdb_merge_buddy_to_contact (EBookClient *client, GaimBuddy *b, EContact *c) +bbdb_merge_buddy_to_contact (EBookClient *client, + GaimBuddy *b, + EContact *c) { EContactField field; GList *ims; @@ -450,7 +453,8 @@ proto_to_contact_field (const gchar *proto) } static void -get_all_blocked (xmlNodePtr node, GSList **blocked) +get_all_blocked (xmlNodePtr node, + GSList **blocked) { xmlNodePtr child; @@ -578,7 +582,9 @@ get_buddy_icon_from_setting (xmlNodePtr setting) } static void -parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked) +parse_contact (xmlNodePtr contact, + GList **buddies, + GSList *blocked) { xmlNodePtr child; xmlNodePtr buddy = NULL; @@ -631,7 +637,9 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked) } static void -parse_buddy_group (xmlNodePtr group, GList **buddies, GSList *blocked) +parse_buddy_group (xmlNodePtr group, + GList **buddies, + GSList *blocked) { xmlNodePtr child; diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c index 3ebd0aaf61..e2cce51de6 100644 --- a/plugins/caldav/caldav-browse-server.c +++ b/plugins/caldav/caldav-browse-server.c @@ -65,8 +65,9 @@ typedef void (*process_message_cb) (GObject *dialog, const gchar *msg_path, guin static void send_xml_message (xmlDocPtr doc, gboolean depth_1, const gchar *url, GObject *dialog, process_message_cb cb, gpointer cb_user_data, const gchar *info); -static gchar * -xpath_get_string (xmlXPathContextPtr xpctx, const gchar *path_format, ...) +static gchar * xpath_get_string (xmlXPathContextPtr xpctx, + const gchar *path_format, + ...) { gchar *res = NULL, *path, *tmp; va_list args; @@ -101,7 +102,10 @@ xpath_get_string (xmlXPathContextPtr xpctx, const gchar *path_format, ...) } static gboolean -xpath_exists (xmlXPathContextPtr xpctx, xmlXPathObjectPtr *resobj, const gchar *path_format, ...) +xpath_exists (xmlXPathContextPtr xpctx, + xmlXPathObjectPtr *resobj, + const gchar *path_format, + ...) { gchar *path; va_list args; @@ -131,7 +135,8 @@ xpath_exists (xmlXPathContextPtr xpctx, xmlXPathObjectPtr *resobj, const gchar * } static gchar * -change_url_path (const gchar *base_url, const gchar *new_path) +change_url_path (const gchar *base_url, + const gchar *new_path) { SoupURI *suri; gchar *url; @@ -153,7 +158,9 @@ change_url_path (const gchar *base_url, const gchar *new_path) } static void -report_error (GObject *dialog, gboolean is_fatal, const gchar *msg) +report_error (GObject *dialog, + gboolean is_fatal, + const gchar *msg) { g_return_if_fail (dialog != NULL); g_return_if_fail (GTK_IS_DIALOG (dialog)); @@ -192,7 +199,11 @@ report_error (GObject *dialog, gboolean is_fatal, const gchar *msg) } static gboolean -check_soup_status (GObject *dialog, guint status_code, const gchar *reason_phrase, const gchar *msg_body, gboolean is_fatal) +check_soup_status (GObject *dialog, + guint status_code, + const gchar *reason_phrase, + const gchar *msg_body, + gboolean is_fatal) { gchar *msg; @@ -222,7 +233,10 @@ struct test_exists_data { }; static gboolean -test_href_exists_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data) +test_href_exists_cb (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) { struct test_exists_data *ted = user_data; gchar *href = NULL; @@ -242,7 +256,9 @@ test_href_exists_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, } static void -add_collection_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent_iter, const gchar *href) +add_collection_node_to_tree (GtkTreeStore *store, + GtkTreeIter *parent_iter, + const gchar *href) { SoupURI *suri; const gchar *path; @@ -319,7 +335,12 @@ add_collection_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent_iter, cons /* called with "caldav-thread-mutex" unlocked; 'user_data' is parent tree iter, NULL for "User's calendars" */ static void -traverse_users_calendars_cb (GObject *dialog, const gchar *msg_path, guint status_code, const gchar *reason_phrase, const gchar *msg_body, gpointer user_data) +traverse_users_calendars_cb (GObject *dialog, + const gchar *msg_path, + guint status_code, + const gchar *reason_phrase, + const gchar *msg_body, + gpointer user_data) { xmlDocPtr doc; xmlXPathContextPtr xpctx; @@ -512,7 +533,10 @@ traverse_users_calendars_cb (GObject *dialog, const gchar *msg_path, guint statu } static void -fetch_folder_content (GObject *dialog, const gchar *relative_path, const GtkTreeIter *parent_iter, const gchar *op_info) +fetch_folder_content (GObject *dialog, + const gchar *relative_path, + const GtkTreeIter *parent_iter, + const gchar *op_info) { xmlDocPtr doc; xmlNodePtr root, node; @@ -604,7 +628,9 @@ mail_account_configured (const gchar *email) } static void -add_usermail (GtkComboBoxText *usermail_combo, const gchar *email, gboolean is_first) +add_usermail (GtkComboBoxText *usermail_combo, + const gchar *email, + gboolean is_first) { GtkTreeModel *model; GtkTreeIter iter; @@ -642,7 +668,12 @@ add_usermail (GtkComboBoxText *usermail_combo, const gchar *email, gboolean is_f /* called with "caldav-thread-mutex" unlocked; user_data is not NULL when called second time on principal */ static void -find_users_calendar_cb (GObject *dialog, const gchar *msg_path, guint status_code, const gchar *reason_phrase, const gchar *msg_body, gpointer user_data) +find_users_calendar_cb (GObject *dialog, + const gchar *msg_path, + guint status_code, + const gchar *reason_phrase, + const gchar *msg_body, + gpointer user_data) { xmlDocPtr doc; xmlXPathContextPtr xpctx; @@ -775,7 +806,8 @@ find_users_calendar_cb (GObject *dialog, const gchar *msg_path, guint status_cod } static void -redirect_handler (SoupMessage *msg, gpointer user_data) +redirect_handler (SoupMessage *msg, + gpointer user_data) { if (SOUP_STATUS_IS_REDIRECTION (msg->status_code)) { SoupSession *soup_session = user_data; @@ -802,7 +834,8 @@ redirect_handler (SoupMessage *msg, gpointer user_data) } static void -send_and_handle_redirection (SoupSession *soup_session, SoupMessage *msg) +send_and_handle_redirection (SoupSession *soup_session, + SoupMessage *msg) { soup_message_set_flags (msg, SOUP_MESSAGE_NO_REDIRECT); soup_message_add_header_handler (msg, "got_body", "Location", G_CALLBACK (redirect_handler), soup_session); @@ -876,7 +909,11 @@ caldav_browse_server_thread (gpointer data) } static void -soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gboolean retrying, gpointer data) +soup_authenticate (SoupSession *session, + SoupMessage *msg, + SoupAuth *auth, + gboolean retrying, + gpointer data) { GObject *dialog = data; const gchar *username, *password; @@ -936,7 +973,9 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool /* the dialog is about to die, so cancel any pending operations to close the thread too */ static void -dialog_response_cb (GObject *dialog, gint response_id, gpointer user_data) +dialog_response_cb (GObject *dialog, + gint response_id, + gpointer user_data) { GCond *cond; GMutex *mutex; @@ -958,7 +997,9 @@ dialog_response_cb (GObject *dialog, gint response_id, gpointer user_data) } static gboolean -check_message (GtkWindow *dialog, SoupMessage *message, const gchar *url) +check_message (GtkWindow *dialog, + SoupMessage *message, + const gchar *url) { g_return_val_if_fail (dialog != NULL, FALSE); g_return_val_if_fail (GTK_IS_DIALOG (dialog), FALSE); @@ -970,7 +1011,8 @@ check_message (GtkWindow *dialog, SoupMessage *message, const gchar *url) } static void -indicate_busy (GObject *dialog, gboolean is_busy) +indicate_busy (GObject *dialog, + gboolean is_busy) { GtkWidget *spinner = g_object_get_data (dialog, "caldav-spinner"); @@ -1064,7 +1106,13 @@ poll_for_message_sent_cb (gpointer data) } static void -send_xml_message (xmlDocPtr doc, gboolean depth_1, const gchar *url, GObject *dialog, process_message_cb cb, gpointer cb_user_data, const gchar *info) +send_xml_message (xmlDocPtr doc, + gboolean depth_1, + const gchar *url, + GObject *dialog, + process_message_cb cb, + gpointer cb_user_data, + const gchar *info) { GCond *cond; GMutex *mutex; @@ -1136,7 +1184,8 @@ send_xml_message (xmlDocPtr doc, gboolean depth_1, const gchar *url, GObject *di } static void -url_entry_changed (GtkEntry *entry, GObject *dialog) +url_entry_changed (GtkEntry *entry, + GObject *dialog) { const gchar *url; @@ -1149,7 +1198,8 @@ url_entry_changed (GtkEntry *entry, GObject *dialog) } static void -tree_selection_changed_cb (GtkTreeSelection *selection, GtkEntry *url_entry) +tree_selection_changed_cb (GtkTreeSelection *selection, + GtkEntry *url_entry) { gboolean ok = FALSE; GtkTreeModel *model = NULL; @@ -1179,7 +1229,10 @@ tree_selection_changed_cb (GtkTreeSelection *selection, GtkEntry *url_entry) } static void -tree_row_expanded_cb (GtkTreeView *tree, GtkTreeIter *iter, GtkTreePath *path, GObject *dialog) +tree_row_expanded_cb (GtkTreeView *tree, + GtkTreeIter *iter, + GtkTreePath *path, + GObject *dialog) { GtkTreeModel *model; gboolean is_loaded = TRUE; @@ -1217,7 +1270,15 @@ tree_row_expanded_cb (GtkTreeView *tree, GtkTreeIter *iter, GtkTreePath *path, G } static void -init_dialog (GtkDialog *dialog, GtkWidget **new_url_entry, GtkWidget **new_usermail_combo, GtkWidget **new_autoschedule_check, const gchar *url, const gchar *username, const gchar *usermail, gboolean autoschedule, gint source_type) +init_dialog (GtkDialog *dialog, + GtkWidget **new_url_entry, + GtkWidget **new_usermail_combo, + GtkWidget **new_autoschedule_check, + const gchar *url, + const gchar *username, + const gchar *usermail, + gboolean autoschedule, + gint source_type) { GtkBox *content_area; GtkWidget *label, *info_box, *spinner, *info_label, *hbox; @@ -1251,7 +1312,9 @@ init_dialog (GtkDialog *dialog, GtkWidget **new_url_entry, GtkWidget **new_userm *new_url_entry = gtk_entry_new (); gtk_box_pack_start (content_area, *new_url_entry, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (*new_url_entry), "changed", G_CALLBACK (url_entry_changed), dialog); + g_signal_connect ( + *new_url_entry, "changed", + G_CALLBACK (url_entry_changed), dialog); *new_usermail_combo = gtk_combo_box_text_new (); if (usermail && *usermail) { @@ -1438,7 +1501,8 @@ init_dialog (GtkDialog *dialog, GtkWidget **new_url_entry, GtkWidget **new_userm } static gchar * -prepare_url (const gchar *server_url, gboolean use_ssl) +prepare_url (const gchar *server_url, + gboolean use_ssl) { gchar *url; gint len; @@ -1502,7 +1566,13 @@ prepare_url (const gchar *server_url, gboolean use_ssl) } gchar * -caldav_browse_server (GtkWindow *parent, const gchar *server_url, const gchar *username, gboolean use_ssl, gchar **new_usermail, gboolean *new_autoschedule, gint source_type) +caldav_browse_server (GtkWindow *parent, + const gchar *server_url, + const gchar *username, + gboolean use_ssl, + gchar **new_usermail, + gboolean *new_autoschedule, + gint source_type) { GtkWidget *dialog, *new_url_entry, *new_usermail_combo, *new_autoschedule_check; gchar *url, *new_url = NULL; diff --git a/plugins/caldav/caldav-browse-server.h b/plugins/caldav/caldav-browse-server.h index 0936761bba..6a275f1726 100644 --- a/plugins/caldav/caldav-browse-server.h +++ b/plugins/caldav/caldav-browse-server.h @@ -25,7 +25,7 @@ #include <gtk/gtk.h> /* Opens a window with a list of available calendars for a given server; - Returns server URL of a calendar user chose, or NULL to let it be as is. */ + * Returns server URL of a calendar user chose, or NULL to let it be as is. */ gchar *caldav_browse_server (GtkWindow *parent, const gchar *server_url, const gchar *username, gboolean use_ssl, gchar **new_usermail, gboolean *new_autoschedule, gint source_type); #endif /* CALDAV_BROWSE_SERVER_H */ diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index c9c44fb470..9b318bca2f 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -69,7 +69,8 @@ ensure_caldav_source_group (ECalClientSourceType source_type) } gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { if (enable) { @@ -85,7 +86,8 @@ e_plugin_lib_enable (EPlugin *ep, gint enable) /*****************************************************************************/ static void -location_changed_cb (GtkEntry *editable, ESource *source) +location_changed_cb (GtkEntry *editable, + ESource *source) { SoupURI *suri; gchar *ruri; @@ -110,7 +112,8 @@ location_changed_cb (GtkEntry *editable, ESource *source) } static void -user_changed_cb (GtkEntry *editable, ESource *source) +user_changed_cb (GtkEntry *editable, + ESource *source) { SoupURI *suri; gchar *uri, *ruri; @@ -145,7 +148,8 @@ user_changed_cb (GtkEntry *editable, ESource *source) } static void -browse_cal_clicked_cb (GtkButton *button, gpointer user_data) +browse_cal_clicked_cb (GtkButton *button, + gpointer user_data) { GtkEntry *url, *username, *usermail; GtkToggleButton *ssl, *autoschedule; @@ -197,8 +201,8 @@ browse_cal_clicked_cb (GtkButton *button, gpointer user_data) } GtkWidget * -oge_caldav (EPlugin *epl, - EConfigHookItemFactoryData *data) +oge_caldav (EPlugin *epl, + EConfigHookItemFactoryData *data) { ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; ESource *source; diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c index a7b821d285..6aa1483c3f 100644 --- a/plugins/calendar-file/calendar-file.c +++ b/plugins/calendar-file/calendar-file.c @@ -34,13 +34,15 @@ gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } static void -location_changed (GtkFileChooserButton *widget, ESource *source) +location_changed (GtkFileChooserButton *widget, + ESource *source) { gchar *filename; @@ -53,7 +55,8 @@ location_changed (GtkFileChooserButton *widget, ESource *source) } static void -maincheck_toggled (GtkToggleButton *check, ESource *source) +maincheck_toggled (GtkToggleButton *check, + ESource *source) { GtkWidget *w; gboolean enabled = gtk_toggle_button_get_active (check); @@ -78,7 +81,8 @@ maincheck_toggled (GtkToggleButton *check, ESource *source) } static void -refresh_type_changed (GtkComboBox *refresh_type, ESource *source) +refresh_type_changed (GtkComboBox *refresh_type, + ESource *source) { GtkWidget *refresh_hbox; gint active = gtk_combo_box_get_active (refresh_type); @@ -102,7 +106,8 @@ refresh_type_changed (GtkComboBox *refresh_type, ESource *source) GtkWidget *e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data); GtkWidget * -e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data) +e_calendar_file_customs (EPlugin *epl, + EConfigHookItemFactoryData *data) { ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; ESource *source = t->source; @@ -186,8 +191,12 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data) } maincheck_toggled (GTK_TOGGLE_BUTTON (maincheck), NULL); - g_signal_connect (G_OBJECT (w2), "file-set", G_CALLBACK (location_changed), source); - g_signal_connect (G_OBJECT (maincheck), "toggled", G_CALLBACK (maincheck_toggled), source); + g_signal_connect ( + w2, "file-set", + G_CALLBACK (location_changed), source); + g_signal_connect ( + maincheck, "toggled", + G_CALLBACK (maincheck_toggled), source); box2 = gtk_hbox_new (FALSE, 2); gtk_box_pack_start ((GtkBox *) box1, box2, FALSE, TRUE, 2); @@ -212,7 +221,9 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data) g_object_set_data (G_OBJECT (w1), "refresh-hbox", w2); - g_signal_connect (G_OBJECT (w1), "changed", G_CALLBACK (refresh_type_changed), source); + g_signal_connect ( + w1, "changed", + G_CALLBACK (refresh_type_changed), source); w2 = e_plugin_util_add_check (NULL, _("Force read _only"), source, "custom-file-readonly", "1", NULL); gtk_box_pack_start ((GtkBox *) box1, w2, TRUE, TRUE, 2); @@ -220,7 +231,7 @@ e_calendar_file_customs (EPlugin *epl, EConfigHookItemFactoryData *data) gtk_widget_show_all (mainbox); /* w1 is a refresh-type combobox, and it hides widgets, - thus should be called after show_all call */ + * thus should be called after show_all call */ refresh_type_changed (GTK_COMBO_BOX (w1), source); return mainbox; diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c index 9e1acfa02e..fcf7002ab5 100644 --- a/plugins/calendar-http/calendar-http.c +++ b/plugins/calendar-http/calendar-http.c @@ -41,13 +41,15 @@ GtkWidget *e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data) gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } static void -url_changed (GtkEntry *entry, ESource *source) +url_changed (GtkEntry *entry, + ESource *source) { SoupURI *uri; gchar *relative_uri; @@ -74,7 +76,8 @@ url_changed (GtkEntry *entry, ESource *source) } GtkWidget * -e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data) +e_calendar_http_url (EPlugin *epl, + EConfigHookItemFactoryData *data) { GtkWidget *entry; ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; @@ -103,14 +106,17 @@ e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data) entry = e_plugin_util_add_entry (data->parent, _("_URL:"), NULL, NULL); gtk_entry_set_text (GTK_ENTRY (entry), uri_text); - g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (url_changed), t->source); + g_signal_connect ( + entry, "changed", + G_CALLBACK (url_changed), t->source); g_free (uri_text); return entry; } GtkWidget * -e_calendar_http_refresh (EPlugin *epl, EConfigHookItemFactoryData *data) +e_calendar_http_refresh (EPlugin *epl, + EConfigHookItemFactoryData *data) { ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; @@ -124,7 +130,8 @@ e_calendar_http_refresh (EPlugin *epl, EConfigHookItemFactoryData *data) } GtkWidget * -e_calendar_http_secure (EPlugin *epl, EConfigHookItemFactoryData *data) +e_calendar_http_secure (EPlugin *epl, + EConfigHookItemFactoryData *data) { ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; GtkWidget *secure_setting; @@ -144,7 +151,8 @@ e_calendar_http_secure (EPlugin *epl, EConfigHookItemFactoryData *data) } static void -username_changed (GtkEntry *entry, ESource *source) +username_changed (GtkEntry *entry, + ESource *source) { const gchar *username; gchar *uri; @@ -181,7 +189,8 @@ username_changed (GtkEntry *entry, ESource *source) } GtkWidget * -e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data) +e_calendar_http_auth (EPlugin *epl, + EConfigHookItemFactoryData *data) { ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; GtkWidget *entry; @@ -197,13 +206,16 @@ e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data) entry = e_plugin_util_add_entry (data->parent, _("Userna_me:"), NULL, NULL); gtk_entry_set_text (GTK_ENTRY (entry), username ? username : ""); - g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (username_changed), t->source); + g_signal_connect ( + entry, "changed", + G_CALLBACK (username_changed), t->source); return entry; } gboolean -e_calendar_http_check (EPlugin *epl, EConfigHookPageCheckData *data) +e_calendar_http_check (EPlugin *epl, + EConfigHookPageCheckData *data) { /* FIXME - check pageid */ ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c index 5095106254..93f1c0ae50 100644 --- a/plugins/calendar-weather/calendar-weather.c +++ b/plugins/calendar-weather/calendar-weather.c @@ -51,7 +51,8 @@ gint e_plugin_lib_enable (EPlugin *epl, gint enable); #define WEATHER_BASE_URI "weather://" gint -e_plugin_lib_enable (EPlugin *epl, gint enable) +e_plugin_lib_enable (EPlugin *epl, + gint enable) { GList *l, *saved_cats; const gchar *tmp; @@ -100,7 +101,8 @@ exit: } void -e_calendar_weather_migrate (EPlugin *epl, ECalEventTargetBackend *data) +e_calendar_weather_migrate (EPlugin *epl, + ECalEventTargetBackend *data) { /* Perform a migration step here. This allows us to keep the weather calendar completely * separate from evolution. If the plugin isn't built, the weather source group won't @@ -135,7 +137,8 @@ e_calendar_weather_migrate (EPlugin *epl, ECalEventTargetBackend *data) } static void -selection_changed (GtkTreeSelection *selection, GtkDialog *dialog) +selection_changed (GtkTreeSelection *selection, + GtkDialog *dialog) { GtkTreeModel *model; GtkTreeIter iter; @@ -157,7 +160,10 @@ static struct } find_data; static gboolean -find_location_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *node, gpointer data) +find_location_func (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *node, + gpointer data) { WeatherLocation *wl = NULL; @@ -173,7 +179,8 @@ find_location_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *node, g } static GtkTreeIter * -find_location (GtkTreeModel *model, gchar *relative_url) +find_location (GtkTreeModel *model, + gchar *relative_url) { /* old URL uses type/code/name, but new uses only code/name */ if (strncmp (relative_url, "ccf/", 4) == 0) { @@ -191,7 +198,9 @@ find_location (GtkTreeModel *model, gchar *relative_url) } static gboolean -treeview_clicked (GtkTreeView *treeview, GdkEventButton *event, GtkDialog *dialog) +treeview_clicked (GtkTreeView *treeview, + GdkEventButton *event, + GtkDialog *dialog) { if (event->type == GDK_2BUTTON_PRESS) { GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview); @@ -242,7 +251,9 @@ create_source_selector (ESource *source) gtk_widget_show (treeview); gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), treeview); gtk_widget_add_events (treeview, GDK_BUTTON_PRESS); - g_signal_connect (G_OBJECT (treeview), "button-press-event", G_CALLBACK (treeview_clicked), dialog); + g_signal_connect ( + treeview, "button-press-event", + G_CALLBACK (treeview_clicked), dialog); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); @@ -259,7 +270,9 @@ create_source_selector (ESource *source) if (suri) soup_uri_free (suri); - g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), dialog); + g_signal_connect ( + selection, "changed", + G_CALLBACK (selection_changed), dialog); g_object_set_data (G_OBJECT (dialog), "treeview", treeview); text = gtk_cell_renderer_text_new (); @@ -296,7 +309,8 @@ build_location_path (GtkTreeIter *iter) } static void -location_clicked (GtkButton *button, ESource *source) +location_clicked (GtkButton *button, + ESource *source) { GtkDialog *dialog = create_source_selector (source); gint response; @@ -341,7 +355,8 @@ location_clicked (GtkButton *button, ESource *source) } GtkWidget * -e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data) +e_calendar_weather_location (EPlugin *epl, + EConfigHookItemFactoryData *data) { GtkWidget *button, *parent, *text, *label; guint row; @@ -366,10 +381,12 @@ e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data) label = gtk_label_new_with_mnemonic (_("_Location:")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); + gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); button = gtk_button_new (); - g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (location_clicked), source); + g_signal_connect ( + button, "clicked", + G_CALLBACK (location_clicked), source); gtk_widget_show (button); if (suri && suri->path && *suri->path) { @@ -387,13 +404,14 @@ e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data) soup_uri_free (suri); g_free (uri_text); - gtk_table_attach (GTK_TABLE (parent), button, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + gtk_table_attach (GTK_TABLE (parent), button, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0); return button; } GtkWidget * -e_calendar_weather_refresh (EPlugin *epl, EConfigHookItemFactoryData *data) +e_calendar_weather_refresh (EPlugin *epl, + EConfigHookItemFactoryData *data) { ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; @@ -404,7 +422,8 @@ e_calendar_weather_refresh (EPlugin *epl, EConfigHookItemFactoryData *data) } static void -set_units (ESource *source, GtkWidget *combobox) +set_units (ESource *source, + GtkWidget *combobox) { const gchar *format = e_source_get_property (source, "units"); if (format == NULL) { @@ -429,7 +448,8 @@ set_units (ESource *source, GtkWidget *combobox) } static void -units_changed (GtkComboBox *combobox, ECalConfigTargetSource *t) +units_changed (GtkComboBox *combobox, + ECalConfigTargetSource *t) { gint choice = gtk_combo_box_get_active (GTK_COMBO_BOX (combobox)); if (choice == 0) @@ -439,7 +459,8 @@ units_changed (GtkComboBox *combobox, ECalConfigTargetSource *t) } GtkWidget * -e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data) +e_calendar_weather_units (EPlugin *epl, + EConfigHookItemFactoryData *data) { GtkWidget *combobox, *parent, *label; guint row; @@ -456,7 +477,7 @@ e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data) label = gtk_label_new_with_mnemonic (_("_Units:")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); + gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); combobox = gtk_combo_box_text_new (); gtk_widget_show (combobox); @@ -468,14 +489,17 @@ e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data) _("Imperial (Fahrenheit, inches, etc)")); set_units (source, combobox); gtk_label_set_mnemonic_widget (GTK_LABEL (label), combobox); - g_signal_connect (G_OBJECT (combobox), "changed", G_CALLBACK (units_changed), t); - gtk_table_attach (GTK_TABLE (parent), combobox, 1, 2, row, row+1, GTK_FILL, 0, 0, 0); + g_signal_connect ( + combobox, "changed", + G_CALLBACK (units_changed), t); + gtk_table_attach (GTK_TABLE (parent), combobox, 1, 2, row, row + 1, GTK_FILL, 0, 0, 0); return combobox; } gboolean -e_calendar_weather_check (EPlugin *epl, EConfigHookPageCheckData *data) +e_calendar_weather_check (EPlugin *epl, + EConfigHookPageCheckData *data) { /* FIXME - check pageid */ ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c index 0a25169189..b838bdf953 100644 --- a/plugins/dbx-import/dbx-importer.c +++ b/plugins/dbx-import/dbx-importer.c @@ -100,8 +100,8 @@ gint e_plugin_lib_enable (EPlugin *ep, /* em-folder-selection-button.h is private, even though other internal * evo plugins use it! - so declare the functions here - TODO: sort out whether this should really be private + * so declare the functions here + * TODO: sort out whether this should really be private */ typedef struct { @@ -121,7 +121,6 @@ typedef struct { gchar *uri; gint dbx_fd; - // dbx_file dbx; CamelOperation *cancel; CamelFolder *folder; @@ -145,7 +144,8 @@ static guchar oe4_mbox_sig[8] = { }; gboolean -org_gnome_evolution_readdbx_supported (EPlugin *epl, EImportTarget *target) +org_gnome_evolution_readdbx_supported (EPlugin *epl, + EImportTarget *target) { gchar signature[16]; gboolean ret = FALSE; @@ -189,7 +189,8 @@ org_gnome_evolution_readdbx_supported (EPlugin *epl, EImportTarget *target) } static void -folder_selected (EMFolderSelectionButton *button, EImportTargetURI *target) +folder_selected (EMFolderSelectionButton *button, + EImportTargetURI *target) { g_free (target->uri_dest); target->uri_dest = g_strdup (em_folder_selection_button_get_folder_uri (button)); @@ -277,7 +278,8 @@ org_gnome_evolution_readdbx_getwidget (EImport *ei, } static gchar * -dbx_import_describe (DbxImporter *m, gint complete) +dbx_import_describe (DbxImporter *m, + gint complete) { return g_strdup (_("Importing Outlook Express data")); } @@ -437,10 +439,12 @@ static gboolean dbx_load_indices (DbxImporter *m) } static gboolean -dbx_read_mail_body (DbxImporter *m, guint32 offset, gint bodyfd) +dbx_read_mail_body (DbxImporter *m, + guint32 offset, + gint bodyfd) { /* FIXME: We really ought to set up CamelStream that we can feed to the - MIME parser, rather than using a temporary file */ + * MIME parser, rather than using a temporary file */ struct _dbx_block_hdrstruct hdr; guint32 buflen = 0x200; @@ -502,7 +506,10 @@ dbx_read_mail_body (DbxImporter *m, guint32 offset, gint bodyfd) } static gboolean -dbx_read_email (DbxImporter *m, guint32 offset, gint bodyfd, gint *flags) +dbx_read_email (DbxImporter *m, + guint32 offset, + gint bodyfd, + gint *flags) { struct _dbx_email_headerstruct hdr; guchar *buffer; @@ -538,8 +545,8 @@ dbx_read_email (DbxImporter *m, guint32 offset, gint bodyfd, gint *flags) } for (i = 0; i < hdr.count; i++) { - guchar type = buffer[i*4]; - gint val = buffer[i*4 + 1] + (buffer[i*4 + 2] << 8) + (buffer[i*4 + 3] << 16); + guchar type = buffer[i *4]; + gint val = buffer[i *4 + 1] + (buffer[i *4 + 2] << 8) + (buffer[i *4 + 3] << 16); switch (type) { case 0x01: @@ -551,7 +558,7 @@ dbx_read_email (DbxImporter *m, guint32 offset, gint bodyfd, gint *flags) d(printf("Got type 0x81 flags %02x\n", *flags)); break; case 0x04: - dataptr = GUINT32_FROM_LE (*(guint32 *)(buffer + hdr.count*4 + val)); + dataptr = GUINT32_FROM_LE (*(guint32 *)(buffer + hdr.count *4 + val)); d(printf("Got type 0x04 data pointer %x\n", dataptr)); break; case 0x84: @@ -766,7 +773,10 @@ dbx_status_timeout (gpointer data) } static void -dbx_status (CamelOperation *op, const gchar *what, gint pc, gpointer data) +dbx_status (CamelOperation *op, + const gchar *what, + gint pc, + gpointer data) { DbxImporter *importer = data; @@ -820,7 +830,8 @@ org_gnome_evolution_readdbx_cancel (EImport *ei, } gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c index 02a0d42baa..26cb305413 100644 --- a/plugins/default-source/default-source.c +++ b/plugins/default-source/default-source.c @@ -44,13 +44,15 @@ void commit_default_book (EPlugin *epl, EConfigTarget *target); gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } void -commit_default_calendar (EPlugin *epl, EConfigTarget *target) +commit_default_calendar (EPlugin *epl, + EConfigTarget *target) { ECalConfigTargetSource *cal_target; ESource *source; @@ -62,7 +64,8 @@ commit_default_calendar (EPlugin *epl, EConfigTarget *target) } void -commit_default_book (EPlugin *epl, EConfigTarget *target) +commit_default_book (EPlugin *epl, + EConfigTarget *target) { EABConfigTargetSource *book_target; ESource *source; @@ -75,7 +78,8 @@ commit_default_book (EPlugin *epl, EConfigTarget *target) } GtkWidget * -org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data) +org_gnome_default_book (EPlugin *epl, + EConfigHookItemFactoryData *data) { EABConfigTargetSource *book_target; @@ -88,7 +92,8 @@ org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data) } GtkWidget * -org_gnome_autocomplete_book (EPlugin *epl, EConfigHookItemFactoryData *data) +org_gnome_autocomplete_book (EPlugin *epl, + EConfigHookItemFactoryData *data) { EABConfigTargetSource *book_target; @@ -118,7 +123,8 @@ get_calendar_option_caption (ECalClientSourceType source_type) GtkWidget *org_gnome_default_cal (EPlugin *epl, EConfigHookItemFactoryData *data); GtkWidget * -org_gnome_default_cal (EPlugin *epl, EConfigHookItemFactoryData *data) +org_gnome_default_cal (EPlugin *epl, + EConfigHookItemFactoryData *data) { ECalConfigTargetSource *cal_target; diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index eb0ab3fb2f..ab352d61d2 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -78,10 +78,11 @@ static void commit_changes (ConfigData *cd); gint e_plugin_lib_enable (EPlugin *ep, gint enable); GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl); gboolean e_plugin_ui_init (GtkUIManager *ui_manager, EMsgComposer *composer); -GtkWidget *org_gnome_email_custom_header_config_option (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); +GtkWidget *org_gnome_email_custom_header_config_option (EPlugin *epl, struct _EConfigHookItemFactoryData *data); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } @@ -138,7 +139,7 @@ epech_fill_widgets_with_data (CustomHeaderOptionsDialog *mch) priv->help_section = g_strdup ("usage-mail"); for (set_index_column = 0; - set_index_column < priv->email_custom_header_details->len;set_index_column++) { + set_index_column < priv->email_custom_header_details->len; set_index_column++) { sub_combo_box_fill = &g_array_index (priv->combo_box_header_value, HeaderValueComboBox,set_index_column); if (priv->flag == 0) { @@ -187,7 +188,9 @@ epech_dialog_get_type (void) } static void -epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) +epech_header_options_cb (GtkDialog *dialog, + gint state, + gpointer func_data) { EmailCustomHeaderOptionsDialogPrivate *priv; CustomHeaderOptionsDialog *mch; @@ -214,7 +217,8 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) } static gboolean -epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent) +epech_dialog_run (CustomHeaderOptionsDialog *mch, + GtkWidget *parent) { EmailCustomHeaderOptionsDialogPrivate *priv; GtkWidget *toplevel; @@ -259,7 +263,9 @@ epech_get_header_list (CustomHeaderOptionsDialog *mch) } static void -epech_load_from_gconf (GConfClient *client,const gchar *path,CustomHeaderOptionsDialog *mch) +epech_load_from_gconf (GConfClient *client, + const gchar *path, + CustomHeaderOptionsDialog *mch) { EmailCustomHeaderOptionsDialogPrivate *priv; EmailCustomHeaderDetails temp_header_details= {-1, -1, NULL, NULL}; @@ -284,11 +290,11 @@ epech_load_from_gconf (GConfClient *client,const gchar *path,CustomHeaderOptions g_string_assign (temp_header_details.header_type_value, parse_header_list[0]); } - for (index = 0; parse_header_list[index+1] ; ++index) { + for (index = 0; parse_header_list[index + 1] ; ++index) { temp_header_value_details.sub_header_string_value = g_string_new(""); if (temp_header_value_details.sub_header_string_value) { - g_string_assign (temp_header_value_details.sub_header_string_value, parse_header_list[index+1]); + g_string_assign (temp_header_value_details.sub_header_string_value, parse_header_list[index + 1]); } g_array_append_val (temp_header_details.sub_header_type_value, temp_header_value_details); @@ -375,7 +381,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) } /* Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer, - indicating the header will not be added to a mail message */ + * indicating the header will not be added to a mail message */ gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT ( sub_combo_box_ptr->header_value_combo_box), @@ -453,7 +459,9 @@ epech_dialog_dispose (GObject *object) } static void -epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gpointer data) +epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, + gint state, + gpointer data) { EMsgComposer *composer; EmailCustomHeaderOptionsDialogPrivate *priv; @@ -483,7 +491,8 @@ epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gp } static void -epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data) +epech_custom_header_options_commit (EMsgComposer *comp, + gpointer user_data) { EMsgComposer *composer; EmailCustomHeaderWindow *new_email_custom_header_window = NULL; @@ -512,7 +521,8 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data) } static gint -epech_check_existing_composer_window (gconstpointer compowindow, gconstpointer other_compowindow) +epech_check_existing_composer_window (gconstpointer compowindow, + gconstpointer other_compowindow) { if ((compowindow) && (other_compowindow)) { if (((EmailCustomHeaderWindow *) compowindow)->epech_window == (GdkWindow *) other_compowindow) { @@ -682,7 +692,8 @@ cell_value_edited_cb (GtkCellRendererText *cell, } static void -header_add_clicked (GtkButton *button, ConfigData *cd) +header_add_clicked (GtkButton *button, + ConfigData *cd) { GtkTreeModel *model; GtkTreeView *tree_view; @@ -703,7 +714,8 @@ header_add_clicked (GtkButton *button, ConfigData *cd) } static void -header_remove_clicked (GtkButton *button, ConfigData *cd) +header_remove_clicked (GtkButton *button, + ConfigData *cd) { GtkTreeSelection *selection; GtkTreeModel *model; @@ -746,7 +758,8 @@ header_remove_clicked (GtkButton *button, ConfigData *cd) } static void -header_edit_clicked (GtkButton *button, ConfigData *cd) +header_edit_clicked (GtkButton *button, + ConfigData *cd) { GtkTreeSelection *selection; GtkTreeModel *model; @@ -768,7 +781,8 @@ header_edit_clicked (GtkButton *button, ConfigData *cd) } static void -selection_changed (GtkTreeSelection *selection, ConfigData *cd) +selection_changed (GtkTreeSelection *selection, + ConfigData *cd) { GtkTreeModel *model; GtkTreeIter iter; @@ -891,7 +905,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) gtk_tree_view_column_set_reorderable (col, TRUE); g_object_set (col, "min-width", 50, NULL); - g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); + g_object_set (renderer, "editable", TRUE, NULL); g_signal_connect ( renderer, "edited", G_CALLBACK (cell_edited_cb), cd); @@ -905,7 +919,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) col = gtk_tree_view_get_column (GTK_TREE_VIEW (cd->treeview), col_pos -1); gtk_tree_view_column_set_resizable (col, TRUE); gtk_tree_view_column_set_reorderable (col, TRUE); - g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); + g_object_set (renderer, "editable", TRUE, NULL); g_signal_connect ( renderer, "edited", @@ -913,18 +927,26 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cd->treeview)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); - g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), cd); + g_signal_connect ( + selection, "changed", + G_CALLBACK (selection_changed), cd); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (cd->treeview), TRUE); cd->header_add = header_add; - g_signal_connect (G_OBJECT (cd->header_add), "clicked", G_CALLBACK (header_add_clicked), cd); + g_signal_connect ( + cd->header_add, "clicked", + G_CALLBACK (header_add_clicked), cd); cd->header_remove = header_remove; - g_signal_connect (G_OBJECT (cd->header_remove), "clicked", G_CALLBACK (header_remove_clicked), cd); + g_signal_connect ( + cd->header_remove, "clicked", + G_CALLBACK (header_remove_clicked), cd); gtk_widget_set_sensitive (cd->header_remove, FALSE); cd->header_edit = header_edit; - g_signal_connect (G_OBJECT (cd->header_edit), "clicked", G_CALLBACK (header_edit_clicked), cd); + g_signal_connect ( + cd->header_edit, "clicked", + G_CALLBACK (header_edit_clicked), cd); gtk_widget_set_sensitive (cd->header_edit, FALSE); /* Populate tree view with values from gconf */ @@ -940,8 +962,8 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) gtk_list_store_set (cd->store, &iter, HEADER_KEY_COLUMN, parse_header_list[0], -1); - for (index = 0; parse_header_list[index+1] ; ++index) { - gtk_list_store_set (cd->store, &iter, HEADER_VALUE_COLUMN, parse_header_list[index+1], -1); + for (index = 0; parse_header_list[index + 1] ; ++index) { + gtk_list_store_set (cd->store, &iter, HEADER_VALUE_COLUMN, parse_header_list[index + 1], -1); } } @@ -965,7 +987,8 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) /* Configuration in Mail Prefs Page goes here */ GtkWidget * -org_gnome_email_custom_header_config_option (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) +org_gnome_email_custom_header_config_option (EPlugin *epl, + struct _EConfigHookItemFactoryData *data) { /* This function and the hook needs to be removed, once the configure code is thoroughly tested */ diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 938215945e..b9386caa87 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -72,7 +72,8 @@ static GThread *editor_thread; gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } @@ -153,7 +154,8 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) } static void -enable_disable_composer (EMsgComposer *composer, gboolean enable) +enable_disable_composer (EMsgComposer *composer, + gboolean enable) { GtkhtmlEditor *editor; GtkAction *action; @@ -233,7 +235,8 @@ run_error_dialog (struct run_error_dialog_data *data) } static gint -numlines (const gchar *text, gint pos) +numlines (const gchar *text, + gint pos) { gint ctr = 0; gint lineno = 0; @@ -292,8 +295,8 @@ async_external_editor (EMsgComposer *composer) if (!editor_cmd) { if (!(editor_cmd = g_strdup (g_getenv ("EDITOR"))) ) /* Make gedit the default external editor, - if the default schemas are not installed - and no $EDITOR is set. */ + * if the default schemas are not installed + * and no $EDITOR is set. */ editor_cmd = g_strdup ("gedit"); } g_object_unref (gconf); @@ -403,7 +406,9 @@ static GtkActionEntry entries[] = { }; static gboolean -key_press_cb (GtkWidget * widget, GdkEventKey * event, EMsgComposer *composer) +key_press_cb (GtkWidget *widget, + GdkEventKey *event, + EMsgComposer *composer) { GConfClient *gconf; gboolean immediately; @@ -433,7 +438,8 @@ key_press_cb (GtkWidget * widget, GdkEventKey * event, EMsgComposer *composer) } static void -editor_running_thread_func (GThread *thread, gpointer running) +editor_running_thread_func (GThread *thread, + gpointer running) { if (thread == editor_thread) *(gboolean*)running = TRUE; @@ -451,7 +457,8 @@ editor_running (void) } static gboolean -delete_cb (GtkWidget *widget, EMsgComposer *composer) +delete_cb (GtkWidget *widget, + EMsgComposer *composer) { if (editor_running ()) { e_alert_run_dialog_for_args ( @@ -464,7 +471,8 @@ delete_cb (GtkWidget *widget, EMsgComposer *composer) } gboolean -e_plugin_ui_init (GtkUIManager *manager, EMsgComposer *composer) +e_plugin_ui_init (GtkUIManager *manager, + EMsgComposer *composer) { GtkhtmlEditor *editor; EWebView *web_view; diff --git a/plugins/face/face.c b/plugins/face/face.c index 8f50f16d68..df9eafcd5a 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -90,7 +90,8 @@ get_face_base64 (void) } static void -set_face_raw (gchar *content, gsize length) +set_face_raw (gchar *content, + gsize length) { gchar *filename = get_filename (); @@ -150,7 +151,11 @@ get_active_face (void) } static gboolean -prepare_image (const gchar *image_filename, gchar **file_contents, gsize *length, GdkPixbuf **use_pixbuf, gboolean can_claim) +prepare_image (const gchar *image_filename, + gchar **file_contents, + gsize *length, + GdkPixbuf **use_pixbuf, + gboolean can_claim) { gboolean res = FALSE; @@ -249,7 +254,8 @@ prepare_image (const gchar *image_filename, gchar **file_contents, gsize *length } static void -update_preview_cb (GtkFileChooser *file_chooser, gpointer data) +update_preview_cb (GtkFileChooser *file_chooser, + gpointer data) { GtkWidget *preview; gchar *filename, *file_contents = NULL; @@ -322,7 +328,8 @@ choose_new_face (void) } static void -toggled_check_include_by_default_cb (GtkWidget *widget, gpointer data) +toggled_check_include_by_default_cb (GtkWidget *widget, + gpointer data) { set_include_face_by_default (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))); } @@ -373,7 +380,8 @@ get_cfg_widget (void) } static void -action_toggle_face_cb (GtkToggleAction *action, EMsgComposer *composer) +action_toggle_face_cb (GtkToggleAction *action, + EMsgComposer *composer) { if (gtk_toggle_action_get_active (action)) { gchar *face = get_face_base64 (); @@ -403,14 +411,15 @@ void face_handle_send (EPlugin *ep, EMEventTargetComposer *target); /* ----------------------------------------------------------------- */ gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } gboolean e_plugin_ui_init (GtkUIManager *ui_manager, - EMsgComposer *composer) + EMsgComposer *composer) { GtkhtmlEditor *editor; @@ -450,7 +459,8 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) } void -face_handle_send (EPlugin *ep, EMEventTargetComposer *target) +face_handle_send (EPlugin *ep, + EMEventTargetComposer *target) { GtkhtmlEditor *editor; GtkAction *action; diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c index 1516082b05..c9127d6861 100644 --- a/plugins/google-account-setup/google-contacts-source.c +++ b/plugins/google-account-setup/google-contacts-source.c @@ -85,7 +85,8 @@ remove_google_contacts_source_group (void) } static void -on_username_entry_changed (GtkEntry *entry, gpointer user_data) +on_username_entry_changed (GtkEntry *entry, + gpointer user_data) { ESource *source = user_data; const gchar *text; @@ -108,7 +109,8 @@ on_username_entry_changed (GtkEntry *entry, gpointer user_data) } static void -on_ssl_cb_toggled (GtkToggleButton *tb, gpointer user_data) +on_ssl_cb_toggled (GtkToggleButton *tb, + gpointer user_data) { ESource *source = user_data; @@ -127,7 +129,9 @@ typedef enum { } IntervalType; static void -seconds_to_interval (guint seconds, IntervalType *type, gint *time) +seconds_to_interval (guint seconds, + IntervalType *type, + gint *time) { gint minutes = seconds / 60; @@ -146,7 +150,8 @@ seconds_to_interval (guint seconds, IntervalType *type, gint *time) } static guint -interval_to_seconds (IntervalType type, gint time) +interval_to_seconds (IntervalType type, + gint time) { switch (type) { case MINUTES: @@ -165,7 +170,8 @@ interval_to_seconds (IntervalType type, gint time) } static void -on_interval_sb_value_changed (GtkSpinButton *sb, gpointer user_data) +on_interval_sb_value_changed (GtkSpinButton *sb, + gpointer user_data) { ESource *source = user_data; gdouble time; @@ -187,7 +193,8 @@ on_interval_sb_value_changed (GtkSpinButton *sb, gpointer user_data) } static void -on_interval_combo_changed (GtkComboBox *combo, gpointer user_data) +on_interval_combo_changed (GtkComboBox *combo, + gpointer user_data) { ESource *source = user_data; gdouble time; @@ -234,7 +241,8 @@ check_username_filled (ESource *source) } gpointer -plugin_google_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data) +plugin_google_contacts_check (EPlugin *epl, + EConfigHookPageCheckData *data) { EABConfigTargetSource *t; diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index 5b12759f08..e8d3f5a410 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -89,7 +89,8 @@ ensure_google_source_group (void) } gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { if (enable) { @@ -125,7 +126,7 @@ static gboolean is_email (const gchar *address) { /* This is supposed to check if the address's domain could be - an FQDN but alas, it's not worth the pain and suffering. */ + * an FQDN but alas, it's not worth the pain and suffering. */ const gchar *at; at = strchr (address, '@'); @@ -159,7 +160,8 @@ sanitize_user_mail (const gchar *user) } static gchar * -construct_default_uri (const gchar *username, gboolean is_ssl) +construct_default_uri (const gchar *username, + gboolean is_ssl) { gchar *user, *uri; @@ -172,7 +174,8 @@ construct_default_uri (const gchar *username, gboolean is_ssl) /* checks whether the given_uri is pointing to the default user's calendar or not */ static gboolean -is_default_uri (const gchar *given_uri, const gchar *username) +is_default_uri (const gchar *given_uri, + const gchar *username) { gchar *uri, *at; gint ats, i; @@ -217,7 +220,8 @@ is_default_uri (const gchar *given_uri, const gchar *username) } static void -update_source_uris (ESource *source, const gchar *uri) +update_source_uris (ESource *source, + const gchar *uri) { gchar *abs_uri, *tmp, *user_sanitized, *slash; const gchar *user, *feeds; @@ -255,7 +259,8 @@ update_source_uris (ESource *source, const gchar *uri) static void init_combo_values (GtkComboBox *combo, const gchar *deftitle, const gchar *defuri); static void -update_user_in_source (ESource *source, const gchar *new_user) +update_user_in_source (ESource *source, + const gchar *new_user) { gchar *uri, *eml, *user; const gchar *ssl; @@ -264,8 +269,8 @@ update_user_in_source (ESource *source, const gchar *new_user) user = g_strdup (new_user); /* two reasons why set readonly to FALSE: - a) the e_source_set_relative_uri does nothing for readonly sources - b) we are going to set default uri, which should be always writeable */ + * a) the e_source_set_relative_uri does nothing for readonly sources + * b) we are going to set default uri, which should be always writeable */ e_source_set_readonly (source, FALSE); if (user && *user) { @@ -287,7 +292,7 @@ update_user_in_source (ESource *source, const gchar *new_user) g_free (uri); /* "setup-username" is used to this plugin only, to keep what user wrote, - not what uses the backend */ + * not what uses the backend */ e_source_set_property (source, "setup-username", user); e_source_set_property (source, "auth", (user && *user) ? "1" : NULL); e_source_set_property (source, "googlename", NULL); @@ -301,12 +306,13 @@ update_user_in_source (ESource *source, const gchar *new_user) } static void -user_changed (GtkEntry *editable, ESource *source) +user_changed (GtkEntry *editable, + ESource *source) { update_user_in_source (source, gtk_entry_get_text (GTK_ENTRY (editable))); /* we changed user, thus reset the chosen calendar combo too, because - other user means other calendars subscribed */ + * other user means other calendars subscribed */ init_combo_values (GTK_COMBO_BOX (g_object_get_data (G_OBJECT (editable), "CalendarCombo")), _("Default"), NULL); } @@ -319,7 +325,9 @@ enum { }; static void -init_combo_values (GtkComboBox *combo, const gchar *deftitle, const gchar *defuri) +init_combo_values (GtkComboBox *combo, + const gchar *deftitle, + const gchar *defuri) { GtkTreeIter iter; GtkListStore *store; @@ -343,7 +351,8 @@ init_combo_values (GtkComboBox *combo, const gchar *deftitle, const gchar *defur } static void -cal_combo_changed (GtkComboBox *combo, ESource *source) +cal_combo_changed (GtkComboBox *combo, + ESource *source) { GtkListStore *store; GtkTreeIter iter; @@ -386,7 +395,8 @@ cal_combo_changed (GtkComboBox *combo, ESource *source) } static void -claim_error (GtkWindow *parent, const gchar *error) +claim_error (GtkWindow *parent, + const gchar *error) { GtkWidget *dialog; @@ -401,7 +411,8 @@ claim_error (GtkWindow *parent, const gchar *error) } static void -update_proxy_settings (GDataService *service, const gchar *uri) +update_proxy_settings (GDataService *service, + const gchar *uri) { EProxy *proxy; SoupURI *proxy_uri = NULL; @@ -419,7 +430,8 @@ update_proxy_settings (GDataService *service, const gchar *uri) } static void -retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) +retrieve_list_clicked (GtkButton *button, + GtkComboBox *combo) { ESource *source; #ifdef HAVE_LIBGDATA_0_9 @@ -591,7 +603,8 @@ retrieve_list_sensitize (GtkEntry *username_entry, } gpointer -plugin_google_check (EPlugin *epl, EConfigHookPageCheckData *data) +plugin_google_check (EPlugin *epl, + EConfigHookPageCheckData *data) { ECalConfigTargetSource *t; @@ -605,8 +618,8 @@ plugin_google_check (EPlugin *epl, EConfigHookPageCheckData *data) } GtkWidget * -plugin_google (EPlugin *epl, - EConfigHookItemFactoryData *data) +plugin_google (EPlugin *epl, + EConfigHookItemFactoryData *data) { ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; ESource *source; @@ -655,10 +668,9 @@ plugin_google (EPlugin *epl, user = e_plugin_util_add_entry (parent, _("User_name:"), NULL, NULL); gtk_entry_set_text (GTK_ENTRY (user), username ? username : ""); - g_signal_connect (G_OBJECT (user), - "changed", - G_CALLBACK (user_changed), - source); + g_signal_connect ( + user, "changed", + G_CALLBACK (user_changed), source); e_plugin_util_add_refresh (parent, _("Re_fresh:"), source, "refresh"); @@ -713,7 +725,8 @@ plugin_google (EPlugin *epl, } void -e_calendar_google_migrate (EPlugin *epl, ECalEventTargetBackend *data) +e_calendar_google_migrate (EPlugin *epl, + ECalEventTargetBackend *data) { ESourceList *source_list; ESourceGroup *google = NULL; diff --git a/plugins/image-inline/image-inline.c b/plugins/image-inline/image-inline.c index 73a630a259..cfb05a1b00 100644 --- a/plugins/image-inline/image-inline.c +++ b/plugins/image-inline/image-inline.c @@ -444,7 +444,8 @@ org_gnome_image_inline_embed (EMFormatHTML *format, } void -org_gnome_image_inline_format (gpointer ep, EMFormatHookTarget *target) +org_gnome_image_inline_format (gpointer ep, + EMFormatHookTarget *target) { ImageInlinePObject *image_object; gchar *classid; diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index 5e079086da..a496106372 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -61,19 +61,22 @@ GtkWidget * org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *da gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } void -imap_headers_abort (EPlugin *efp, EConfigHookItemFactoryData *data) +imap_headers_abort (EPlugin *efp, + EConfigHookItemFactoryData *data) { /* Nothing to do here */ } void -imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data) +imap_headers_commit (EPlugin *efp, + EConfigHookItemFactoryData *data) { EMConfigTargetAccount *target_account; CamelFetchHeadersType fetch_headers; @@ -178,7 +181,8 @@ epif_add_sensitivity (EPImapFeaturesData *ui) } static void -epif_add_header (GtkButton *button, EPImapFeaturesData *ui) +epif_add_header (GtkButton *button, + EPImapFeaturesData *ui) { GtkTreeModel *model; GtkTreeIter iter; @@ -196,7 +200,8 @@ epif_add_header (GtkButton *button, EPImapFeaturesData *ui) } static void -epif_tv_selection_changed (GtkTreeSelection *selection, GtkWidget *button) +epif_tv_selection_changed (GtkTreeSelection *selection, + GtkWidget *button) { g_return_if_fail (selection != NULL); g_return_if_fail (button != NULL); @@ -205,7 +210,8 @@ epif_tv_selection_changed (GtkTreeSelection *selection, GtkWidget *button) } static void -epif_remove_header_clicked (GtkButton *button, EPImapFeaturesData *ui) +epif_remove_header_clicked (GtkButton *button, + EPImapFeaturesData *ui) { GtkTreeSelection *select; GtkTreeModel *model; @@ -233,13 +239,15 @@ epif_remove_header_clicked (GtkButton *button, EPImapFeaturesData *ui) } static void -epif_entry_changed (GtkWidget *entry, EPImapFeaturesData *ui) +epif_entry_changed (GtkWidget *entry, + EPImapFeaturesData *ui) { epif_add_sensitivity (ui); } GtkWidget * -org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data) +org_gnome_imap_headers (EPlugin *epl, + EConfigHookItemFactoryData *data) { EMConfigTargetAccount *target_account; CamelSettings *settings; diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 09f59a7919..189362c102 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -155,13 +155,15 @@ typedef struct { static gboolean check_is_instance (icalcomponent *icalcomp); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } static icalproperty * -find_attendee (icalcomponent *ical_comp, const gchar *address) +find_attendee (icalcomponent *ical_comp, + const gchar *address) { icalproperty *prop; @@ -194,7 +196,8 @@ find_attendee (icalcomponent *ical_comp, const gchar *address) } static icalproperty * -find_attendee_if_sentby (icalcomponent *ical_comp, const gchar *address) +find_attendee_if_sentby (icalcomponent *ical_comp, + const gchar *address) { icalproperty *prop; @@ -230,7 +233,9 @@ find_attendee_if_sentby (icalcomponent *ical_comp, const gchar *address) } static void -find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparameter_partstat *status) +find_to_address (struct _itip_puri *pitip, + icalcomponent *ical_comp, + icalparameter_partstat *status) { EIterator *it; @@ -352,7 +357,8 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet } static void -find_from_address (struct _itip_puri *pitip, icalcomponent *ical_comp) +find_from_address (struct _itip_puri *pitip, + icalcomponent *ical_comp) { EIterator *it; icalproperty *prop; @@ -439,7 +445,8 @@ get_real_item (struct _itip_puri *pitip) } static void -adjust_item (struct _itip_puri *pitip, ECalComponent *comp) +adjust_item (struct _itip_puri *pitip, + ECalComponent *comp) { ECalComponent *real_comp; @@ -477,7 +484,9 @@ set_buttons_sensitive (struct _itip_puri *pitip) } static void -add_failed_to_load_msg (ItipView *view, ESource *source, const GError *error) +add_failed_to_load_msg (ItipView *view, + ESource *source, + const GError *error) { gchar *msg; @@ -486,7 +495,7 @@ add_failed_to_load_msg (ItipView *view, ESource *source, const GError *error) g_return_if_fail (error != NULL); /* Translators: The first '%s' is replaced with a calendar name, - the second '%s' with an error message */ + * the second '%s' with an error message */ msg = g_strdup_printf (_("Failed to load the calendar '%s' (%s)"), e_source_peek_name (source), error->message); itip_view_add_lower_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_WARNING, msg); @@ -595,7 +604,9 @@ start_calendar_server (struct _itip_puri *pitip, } static void -start_calendar_server_by_uid (struct _itip_puri *pitip, const gchar *uid, ECalClientSourceType type) +start_calendar_server_by_uid (struct _itip_puri *pitip, + const gchar *uid, + ECalClientSourceType type) { gint i; @@ -613,7 +624,9 @@ start_calendar_server_by_uid (struct _itip_puri *pitip, const gchar *uid, ECalCl } static void -source_selected_cb (ItipView *view, ESource *source, gpointer data) +source_selected_cb (ItipView *view, + ESource *source, + gpointer data) { struct _itip_puri *pitip = data; @@ -625,7 +638,8 @@ source_selected_cb (ItipView *view, ESource *source, gpointer data) } static void -find_cal_update_ui (FormatItipFindData *fd, ECalClient *cal_client) +find_cal_update_ui (FormatItipFindData *fd, + ECalClient *cal_client) { struct _itip_puri *pitip; ESource *source; @@ -711,8 +725,8 @@ decrease_find_data (FormatItipFindData *fd) /* * Only allow replies if backend doesn't do that automatically. - * Only enable it for forwarded invitiations (PUBLISH) or direct - * invitiations (REQUEST), but not replies (REPLY). + * * Only enable it for forwarded invitiations (PUBLISH) or direct + * * invitiations (REQUEST), but not replies (REPLY). * Replies only make sense for events with an organizer. */ if (pitip->current_client && !e_cal_client_check_save_schedules (pitip->current_client) && @@ -1003,7 +1017,8 @@ find_cal_opened_cb (GObject *source_object, } static void -find_server (struct _itip_puri *pitip, ECalComponent *comp) +find_server (struct _itip_puri *pitip, + ECalComponent *comp) { FormatItipFindData *fd = NULL; GSList *groups, *l, *sources_conflict = NULL, *all_sources = NULL; @@ -1115,7 +1130,9 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp) } static gboolean -change_status (icalcomponent *ical_comp, const gchar *address, icalparameter_partstat status) +change_status (icalcomponent *ical_comp, + const gchar *address, + icalparameter_partstat status) { icalproperty *prop; @@ -1161,7 +1178,8 @@ change_status (icalcomponent *ical_comp, const gchar *address, icalparameter_par } static void -message_foreach_part (CamelMimePart *part, GSList **part_list) +message_foreach_part (CamelMimePart *part, + GSList **part_list) { CamelDataWrapper *containee; gint parts, i; @@ -1294,7 +1312,8 @@ get_uri_for_part (CamelMimePart *mime_part) } static gboolean -update_item (struct _itip_puri *pitip, ItipViewResponse response) +update_item (struct _itip_puri *pitip, + ItipViewResponse response) { struct icaltimetype stamp; icalproperty *prop; @@ -1473,7 +1492,8 @@ update_item (struct _itip_puri *pitip, ItipViewResponse response) /* TODO These operations should be available in e-cal-component.c */ static void -set_attendee (ECalComponent *comp, const gchar *address) +set_attendee (ECalComponent *comp, + const gchar *address) { icalproperty *prop; icalcomponent *icalcomp; @@ -1517,7 +1537,11 @@ set_attendee (ECalComponent *comp, const gchar *address) } static gboolean -send_comp_to_attendee (ECalComponentItipMethod method, ECalComponent *comp, const gchar *user, ECalClient *client, const gchar *comment) +send_comp_to_attendee (ECalComponentItipMethod method, + ECalComponent *comp, + const gchar *user, + ECalClient *client, + const gchar *comment) { gboolean status; ECalComponent *send_comp = e_cal_component_clone (comp); @@ -1546,7 +1570,10 @@ send_comp_to_attendee (ECalComponentItipMethod method, ECalComponent *comp, cons } static void -remove_delegate (struct _itip_puri *pitip, const gchar *delegate, const gchar *delegator, ECalComponent *comp) +remove_delegate (struct _itip_puri *pitip, + const gchar *delegate, + const gchar *delegator, + ECalComponent *comp) { gboolean status; gchar *comment = g_strdup_printf (_("Organizer has removed the delegate %s "), itip_strip_mailto (delegate)); @@ -1565,7 +1592,8 @@ remove_delegate (struct _itip_puri *pitip, const gchar *delegate, const gchar *d } static void -update_x (ECalComponent *pitip_comp, ECalComponent *comp) +update_x (ECalComponent *pitip_comp, + ECalComponent *comp) { icalcomponent *itip_icalcomp = e_cal_component_get_icalcomponent (pitip_comp); icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp); @@ -1800,7 +1828,8 @@ attachment_load_finish (EAttachment *attachment, } static void -save_vcalendar_cb (GtkWidget *button, struct _itip_puri *pitip) +save_vcalendar_cb (GtkWidget *button, + struct _itip_puri *pitip) { EAttachment *attachment; EShell *shell; @@ -1832,7 +1861,10 @@ save_vcalendar_cb (GtkWidget *button, struct _itip_puri *pitip) } static GtkWidget * -set_itip_error (struct _itip_puri *pitip, GtkContainer *container, const gchar *primary, const gchar *secondary) +set_itip_error (struct _itip_puri *pitip, + GtkContainer *container, + const gchar *primary, + const gchar *secondary) { GtkWidget *vbox, *label; gchar *message; @@ -1859,7 +1891,9 @@ set_itip_error (struct _itip_puri *pitip, GtkContainer *container, const gchar * } static gboolean -extract_itip_data (struct _itip_puri *pitip, GtkContainer *container, gboolean *have_alarms) +extract_itip_data (struct _itip_puri *pitip, + GtkContainer *container, + gboolean *have_alarms) { EShell *shell; EShellSettings *shell_settings; @@ -2130,7 +2164,8 @@ struct _opencal_msg { }; static gchar * -open_calendar__desc (struct _opencal_msg *m, gint complete) +open_calendar__desc (struct _opencal_msg *m, + gint complete) { return g_strdup (_("Opening calendar")); } @@ -2180,7 +2215,9 @@ idle_open_cb (gpointer data) } static void -view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) +view_response_cb (GtkWidget *widget, + ItipViewResponse response, + gpointer data) { struct _itip_puri *pitip = data; gboolean status = FALSE, delete_invitation_from_cache = FALSE; @@ -2473,7 +2510,9 @@ in_proper_folder (CamelFolder *folder) } static gboolean -format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject) +format_itip_object (EMFormatHTML *efh, + GtkHTMLEmbedded *eb, + EMFormatHTMLPObject *pobject) { EShell *shell; EShellSettings *shell_settings; @@ -2516,7 +2555,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject gtk_container_add (GTK_CONTAINER (eb), info->view); gtk_widget_show (info->view); - response_enabled = in_proper_folder (((EMFormat*) efh)->folder); + response_enabled = in_proper_folder (((EMFormat *) efh)->folder); if (!response_enabled) { itip_view_set_mode (ITIP_VIEW (info->view), ITIP_VIEW_MODE_HIDE_ALL); @@ -2746,7 +2785,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject if (datetime.value->is_date) { /* RFC says the DTEND is not inclusive, thus subtract one day - if we have a date */ + * if we have a date */ icaltime_adjust (datetime.value, -1, 0, 0, 0); } @@ -2797,7 +2836,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject static void puri_free (EMFormatPURI *puri) { - struct _itip_puri *pitip = (struct _itip_puri*) puri; + struct _itip_puri *pitip = (struct _itip_puri *) puri; gint i; g_cancellable_cancel (pitip->cancellable); @@ -2852,7 +2891,8 @@ puri_free (EMFormatPURI *puri) } void -format_itip (EPlugin *ep, EMFormatHookTarget *target) +format_itip (EPlugin *ep, + EMFormatHookTarget *target) { GConfClient *gconf; gchar *classid; @@ -2913,7 +2953,8 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) } static void -delete_toggled_cb (GtkWidget *widget, gpointer data) +delete_toggled_cb (GtkWidget *widget, + gpointer data) { EMConfigTargetPrefs *target = data; @@ -2921,7 +2962,8 @@ delete_toggled_cb (GtkWidget *widget, gpointer data) } static void -initialize_selection (ESourceSelector *selector, ESourceList *source_list) +initialize_selection (ESourceSelector *selector, + ESourceList *source_list) { GSList *groups; @@ -2938,7 +2980,8 @@ initialize_selection (ESourceSelector *selector, ESourceList *source_list) } static void -source_selection_changed (ESourceSelector *selector, gpointer data) +source_selection_changed (ESourceSelector *selector, + gpointer data) { ESourceList *source_list = data; GSList *selection; @@ -2957,7 +3000,7 @@ source_selection_changed (ESourceSelector *selector, gpointer data) } /* then we loop over the selector's selection, setting the - property on those sources */ + * property on those sources */ selection = e_source_selector_get_selection (selector); for (l = selection; l; l = l->next) { e_source_set_property (E_SOURCE (l->data), "conflict", "true"); @@ -2969,7 +3012,8 @@ source_selection_changed (ESourceSelector *selector, gpointer data) } GtkWidget * -itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) +itip_formatter_page_factory (EPlugin *ep, + EConfigHookItemFactoryData *hook_data) { EMConfigTargetPrefs *target = (EMConfigTargetPrefs *) hook_data->config->target; GtkWidget *page; diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 86dc15b1b6..149e01b185 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -139,14 +139,14 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; static void -format_date_and_time_x (struct tm *date_tm, - struct tm *current_tm, - gboolean use_24_hour_format, - gboolean show_midnight, - gboolean show_zero_seconds, - gboolean is_date, - gchar *buffer, - gint buffer_size) +format_date_and_time_x (struct tm *date_tm, + struct tm *current_tm, + gboolean use_24_hour_format, + gboolean show_midnight, + gboolean show_zero_seconds, + gboolean is_date, + gchar *buffer, + gint buffer_size) { gchar *format; struct tm tomorrow_tm, week_tm; @@ -192,20 +192,20 @@ format_date_and_time_x (struct tm *date_tm, } else if (use_24_hour_format) { if (!show_zero_seconds && date_tm->tm_sec == 0) /* strftime format of a time, - in 24-hour format, without seconds. */ + * in 24-hour format, without seconds. */ format = _("Today %H:%M"); else /* strftime format of a time, - in 24-hour format. */ + * in 24-hour format. */ format = _("Today %H:%M:%S"); } else { if (!show_zero_seconds && date_tm->tm_sec == 0) /* strftime format of a time, - in 12-hour format, without seconds. */ + * in 12-hour format, without seconds. */ format = _("Today %l:%M %p"); else /* strftime format of a time, - in 12-hour format. */ + * in 12-hour format. */ format = _("Today %l:%M:%S %p"); } @@ -220,20 +220,20 @@ format_date_and_time_x (struct tm *date_tm, } else if (use_24_hour_format) { if (!show_zero_seconds && date_tm->tm_sec == 0) /* strftime format of a time, - in 24-hour format, without seconds. */ + * in 24-hour format, without seconds. */ format = _("Tomorrow %H:%M"); else /* strftime format of a time, - in 24-hour format. */ + * in 24-hour format. */ format = _("Tomorrow %H:%M:%S"); } else { if (!show_zero_seconds && date_tm->tm_sec == 0) /* strftime format of a time, - in 12-hour format, without seconds. */ + * in 12-hour format, without seconds. */ format = _("Tomorrow %l:%M %p"); else /* strftime format of a time, - in 12-hour format. */ + * in 12-hour format. */ format = _("Tomorrow %l:%M:%S %p"); } @@ -257,20 +257,20 @@ format_date_and_time_x (struct tm *date_tm, } else if (use_24_hour_format) { if (!show_zero_seconds && date_tm->tm_sec == 0) /* strftime format of a weekday and a - time, in 24-hour format, without seconds. */ + * time, in 24-hour format, without seconds. */ format = _("%A %H:%M"); else /* strftime format of a weekday and a - time, in 24-hour format. */ + * time, in 24-hour format. */ format = _("%A %H:%M:%S"); } else { if (!show_zero_seconds && date_tm->tm_sec == 0) /* strftime format of a weekday and a - time, in 12-hour format, without seconds. */ + * time, in 12-hour format, without seconds. */ format = _("%A %l:%M %p"); else /* strftime format of a weekday and a - time, in 12-hour format. */ + * time, in 12-hour format. */ format = _("%A %l:%M:%S %p"); } @@ -279,26 +279,26 @@ format_date_and_time_x (struct tm *date_tm, if (is_date || (!show_midnight && date_tm->tm_hour == 0 && date_tm->tm_min == 0 && date_tm->tm_sec == 0)) { /* strftime format of a weekday and a date - without a year. */ + * without a year. */ format = _("%A, %B %e"); } else if (use_24_hour_format) { if (!show_zero_seconds && date_tm->tm_sec == 0) /* strftime format of a weekday, a date - without a year and a time, - in 24-hour format, without seconds. */ + * without a year and a time, + * in 24-hour format, without seconds. */ format = _("%A, %B %e %H:%M"); else /* strftime format of a weekday, a date without a year - and a time, in 24-hour format. */ + * and a time, in 24-hour format. */ format = _("%A, %B %e %H:%M:%S"); } else { if (!show_zero_seconds && date_tm->tm_sec == 0) /* strftime format of a weekday, a date without a year - and a time, in 12-hour format, without seconds. */ + * and a time, in 12-hour format, without seconds. */ format = _("%A, %B %e %l:%M %p"); else /* strftime format of a weekday, a date without a year - and a time, in 12-hour format. */ + * and a time, in 12-hour format. */ format = _("%A, %B %e %l:%M:%S %p"); } } else { @@ -309,32 +309,34 @@ format_date_and_time_x (struct tm *date_tm, } else if (use_24_hour_format) { if (!show_zero_seconds && date_tm->tm_sec == 0) /* strftime format of a weekday, a date and a - time, in 24-hour format, without seconds. */ + * time, in 24-hour format, without seconds. */ format = _("%A, %B %e, %Y %H:%M"); else /* strftime format of a weekday, a date and a - time, in 24-hour format. */ + * time, in 24-hour format. */ format = _("%A, %B %e, %Y %H:%M:%S"); } else { if (!show_zero_seconds && date_tm->tm_sec == 0) /* strftime format of a weekday, a date and a - time, in 12-hour format, without seconds. */ + * time, in 12-hour format, without seconds. */ format = _("%A, %B %e, %Y %l:%M %p"); else /* strftime format of a weekday, a date and a - time, in 12-hour format. */ + * time, in 12-hour format. */ format = _("%A, %B %e, %Y %l:%M:%S %p"); } } /* strftime returns 0 if the string doesn't fit, and leaves the buffer - undefined, so we set it to the empty string in that case. */ + * undefined, so we set it to the empty string in that case. */ if (e_utf8_strftime_fix_am_pm (buffer, buffer_size, format, date_tm) == 0) buffer[0] = '\0'; } static gchar * -dupe_first_bold (const gchar *format, const gchar *first, const gchar *second) +dupe_first_bold (const gchar *format, + const gchar *first, + const gchar *second) { gchar *f, *s, *res; @@ -721,7 +723,8 @@ update_start_end_times (ItipView *view) } static void -set_info_items (GtkWidget *info_box, GSList *info_items) +set_info_items (GtkWidget *info_box, + GSList *info_items) { GSList *l; @@ -790,7 +793,8 @@ set_lower_info_items (ItipView *view) #define DATA_RESPONSE_KEY "ItipView::button_response" static void -button_clicked_cb (GtkWidget *widget, gpointer data) +button_clicked_cb (GtkWidget *widget, + gpointer data) { ItipViewResponse response; @@ -949,7 +953,8 @@ itip_view_class_init (ItipViewClass *klass) } static void -rsvp_toggled_cb (GtkWidget *widget, gpointer data) +rsvp_toggled_cb (GtkWidget *widget, + gpointer data) { ItipView *view = data; ItipViewPrivate *priv; @@ -964,7 +969,8 @@ rsvp_toggled_cb (GtkWidget *widget, gpointer data) } static void -recur_toggled_cb (GtkWidget *widget, gpointer data) +recur_toggled_cb (GtkWidget *widget, + gpointer data) { ItipView *view = data; ItipViewPrivate *priv; @@ -979,7 +985,8 @@ recur_toggled_cb (GtkWidget *widget, gpointer data) check1 was changed, so make the second available based on state of the first check. */ static void -alarm_check_toggled_cb (GtkWidget *check1, GtkWidget *check2) +alarm_check_toggled_cb (GtkWidget *check1, + GtkWidget *check2) { g_return_if_fail (check1 != NULL); g_return_if_fail (check2 != NULL); @@ -1204,7 +1211,8 @@ itip_view_new (void) } void -itip_view_set_mode (ItipView *view, ItipViewMode mode) +itip_view_set_mode (ItipView *view, + ItipViewMode mode) { ItipViewPrivate *priv; @@ -1233,7 +1241,8 @@ itip_view_get_mode (ItipView *view) } void -itip_view_set_item_type (ItipView *view, ECalClientSourceType type) +itip_view_set_item_type (ItipView *view, + ECalClientSourceType type) { ItipViewPrivate *priv; @@ -1261,7 +1270,8 @@ itip_view_get_item_type (ItipView *view) } void -itip_view_set_organizer (ItipView *view, const gchar *organizer) +itip_view_set_organizer (ItipView *view, + const gchar *organizer) { ItipViewPrivate *priv; @@ -1292,7 +1302,8 @@ itip_view_get_organizer (ItipView *view) } void -itip_view_set_organizer_sentby (ItipView *view, const gchar *sentby) +itip_view_set_organizer_sentby (ItipView *view, + const gchar *sentby) { ItipViewPrivate *priv; @@ -1323,7 +1334,8 @@ itip_view_get_organizer_sentby (ItipView *view) } void -itip_view_set_attendee (ItipView *view, const gchar *attendee) +itip_view_set_attendee (ItipView *view, + const gchar *attendee) { ItipViewPrivate *priv; @@ -1354,7 +1366,8 @@ itip_view_get_attendee (ItipView *view) } void -itip_view_set_attendee_sentby (ItipView *view, const gchar *sentby) +itip_view_set_attendee_sentby (ItipView *view, + const gchar *sentby) { ItipViewPrivate *priv; @@ -1385,7 +1398,8 @@ itip_view_get_attendee_sentby (ItipView *view) } void -itip_view_set_proxy (ItipView *view, const gchar *proxy) +itip_view_set_proxy (ItipView *view, + const gchar *proxy) { ItipViewPrivate *priv; @@ -1416,7 +1430,8 @@ itip_view_get_proxy (ItipView *view) } void -itip_view_set_delegator (ItipView *view, const gchar *delegator) +itip_view_set_delegator (ItipView *view, + const gchar *delegator) { ItipViewPrivate *priv; @@ -1447,7 +1462,8 @@ itip_view_get_delegator (ItipView *view) } void -itip_view_set_summary (ItipView *view, const gchar *summary) +itip_view_set_summary (ItipView *view, + const gchar *summary) { ItipViewPrivate *priv; @@ -1478,7 +1494,8 @@ itip_view_get_summary (ItipView *view) } void -itip_view_set_location (ItipView *view, const gchar *location) +itip_view_set_location (ItipView *view, + const gchar *location) { ItipViewPrivate *priv; @@ -1509,7 +1526,8 @@ itip_view_get_location (ItipView *view) } void -itip_view_set_status (ItipView *view, const gchar *status) +itip_view_set_status (ItipView *view, + const gchar *status) { ItipViewPrivate *priv; @@ -1540,7 +1558,8 @@ itip_view_get_status (ItipView *view) } void -itip_view_set_comment (ItipView *view, const gchar *comment) +itip_view_set_comment (ItipView *view, + const gchar *comment) { ItipViewPrivate *priv; @@ -1571,7 +1590,8 @@ itip_view_get_comment (ItipView *view) } void -itip_view_set_description (ItipView *view, const gchar *description) +itip_view_set_description (ItipView *view, + const gchar *description) { ItipViewPrivate *priv; @@ -1602,7 +1622,9 @@ itip_view_get_description (ItipView *view) } void -itip_view_set_start (ItipView *view, struct tm *start, gboolean is_date) +itip_view_set_start (ItipView *view, + struct tm *start, + gboolean is_date) { ItipViewPrivate *priv; @@ -1627,7 +1649,8 @@ itip_view_set_start (ItipView *view, struct tm *start, gboolean is_date) } const struct tm * -itip_view_get_start (ItipView *view, gboolean *is_date) +itip_view_get_start (ItipView *view, + gboolean *is_date) { ItipViewPrivate *priv; @@ -1643,7 +1666,9 @@ itip_view_get_start (ItipView *view, gboolean *is_date) } void -itip_view_set_end (ItipView *view, struct tm *end, gboolean is_date) +itip_view_set_end (ItipView *view, + struct tm *end, + gboolean is_date) { ItipViewPrivate *priv; @@ -1668,7 +1693,8 @@ itip_view_set_end (ItipView *view, struct tm *end, gboolean is_date) } const struct tm * -itip_view_get_end (ItipView *view, gboolean *is_date) +itip_view_get_end (ItipView *view, + gboolean *is_date) { ItipViewPrivate *priv; @@ -1684,7 +1710,9 @@ itip_view_get_end (ItipView *view, gboolean *is_date) } guint -itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const gchar *message) +itip_view_add_upper_info_item (ItipView *view, + ItipViewInfoItemType type, + const gchar *message) { ItipViewPrivate *priv; ItipViewInfoItem *item; @@ -1708,7 +1736,10 @@ itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const } guint -itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType type, const gchar *format, ...) +itip_view_add_upper_info_item_printf (ItipView *view, + ItipViewInfoItemType type, + const gchar *format, + ...) { va_list args; gchar *message; @@ -1728,7 +1759,8 @@ itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType type, } void -itip_view_remove_upper_info_item (ItipView *view, guint id) +itip_view_remove_upper_info_item (ItipView *view, + guint id) { ItipViewPrivate *priv; GSList *l; @@ -1779,7 +1811,9 @@ itip_view_clear_upper_info_items (ItipView *view) } guint -itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const gchar *message) +itip_view_add_lower_info_item (ItipView *view, + ItipViewInfoItemType type, + const gchar *message) { ItipViewPrivate *priv; ItipViewInfoItem *item; @@ -1803,7 +1837,10 @@ itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const } guint -itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type, const gchar *format, ...) +itip_view_add_lower_info_item_printf (ItipView *view, + ItipViewInfoItemType type, + const gchar *format, + ...) { va_list args; gchar *message; @@ -1823,7 +1860,8 @@ itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type, } void -itip_view_remove_lower_info_item (ItipView *view, guint id) +itip_view_remove_lower_info_item (ItipView *view, + guint id) { ItipViewPrivate *priv; GSList *l; @@ -1874,7 +1912,8 @@ itip_view_clear_lower_info_items (ItipView *view) } static void -source_changed_cb (ESourceComboBox *escb, ItipView *view) +source_changed_cb (ESourceComboBox *escb, + ItipView *view) { ESource *source; @@ -1884,7 +1923,8 @@ source_changed_cb (ESourceComboBox *escb, ItipView *view) } void -itip_view_set_source_list (ItipView *view, ESourceList *source_list) +itip_view_set_source_list (ItipView *view, + ESourceList *source_list) { ItipViewPrivate *priv; @@ -1949,7 +1989,8 @@ itip_view_get_source_list (ItipView *view) } void -itip_view_set_source (ItipView *view, ESource *source) +itip_view_set_source (ItipView *view, + ESource *source) { ItipViewPrivate *priv; @@ -1983,7 +2024,8 @@ itip_view_get_source (ItipView *view) } void -itip_view_set_rsvp (ItipView *view, gboolean rsvp) +itip_view_set_rsvp (ItipView *view, + gboolean rsvp) { ItipViewPrivate *priv; @@ -2012,7 +2054,8 @@ itip_view_get_rsvp (ItipView *view) } void -itip_view_set_show_rsvp (ItipView *view, gboolean rsvp) +itip_view_set_show_rsvp (ItipView *view, + gboolean rsvp) { ItipViewPrivate *priv; @@ -2040,7 +2083,8 @@ itip_view_get_show_rsvp (ItipView *view) } void -itip_view_set_update (ItipView *view, gboolean update) +itip_view_set_update (ItipView *view, + gboolean update) { ItipViewPrivate *priv; @@ -2066,7 +2110,8 @@ itip_view_get_update (ItipView *view) } void -itip_view_set_show_update (ItipView *view, gboolean update) +itip_view_set_show_update (ItipView *view, + gboolean update) { ItipViewPrivate *priv; @@ -2094,7 +2139,8 @@ itip_view_get_show_update (ItipView *view) } void -itip_view_set_rsvp_comment (ItipView *view, const gchar *comment) +itip_view_set_rsvp_comment (ItipView *view, + const gchar *comment) { ItipViewPrivate *priv; @@ -2120,7 +2166,8 @@ itip_view_get_rsvp_comment (ItipView *view) } void -itip_view_set_needs_decline (ItipView *view, gboolean needs_decline) +itip_view_set_needs_decline (ItipView *view, + gboolean needs_decline) { ItipViewPrivate *priv; @@ -2133,7 +2180,8 @@ itip_view_set_needs_decline (ItipView *view, gboolean needs_decline) } void -itip_view_set_buttons_sensitive (ItipView *view, gboolean sensitive) +itip_view_set_buttons_sensitive (ItipView *view, + gboolean sensitive) { ItipViewPrivate *priv; @@ -2167,7 +2215,8 @@ itip_view_get_recur_check_state (ItipView *view) } void -itip_view_set_show_recur_check (ItipView *view, gboolean show) +itip_view_set_show_recur_check (ItipView *view, + gboolean show) { g_return_if_fail (view != NULL); g_return_if_fail (ITIP_IS_VIEW (view)); @@ -2181,7 +2230,8 @@ itip_view_set_show_recur_check (ItipView *view, gboolean show) } void -itip_view_set_show_free_time_check (ItipView *view, gboolean show) +itip_view_set_show_free_time_check (ItipView *view, + gboolean show) { g_return_if_fail (view != NULL); g_return_if_fail (ITIP_IS_VIEW (view)); @@ -2203,7 +2253,8 @@ itip_view_get_free_time_check_state (ItipView *view) } void -itip_view_set_show_keep_alarm_check (ItipView *view, gboolean show) +itip_view_set_show_keep_alarm_check (ItipView *view, + gboolean show) { g_return_if_fail (view != NULL); g_return_if_fail (ITIP_IS_VIEW (view)); @@ -2226,7 +2277,8 @@ itip_view_get_keep_alarm_check_state (ItipView *view) } void -itip_view_set_show_inherit_alarm_check (ItipView *view, gboolean show) +itip_view_set_show_inherit_alarm_check (ItipView *view, + gboolean show) { g_return_if_fail (view != NULL); g_return_if_fail (ITIP_IS_VIEW (view)); diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 99224eb288..9639bc6908 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -512,7 +512,9 @@ static ca_context *mailnotification = NULL; #endif static void -do_play_sound (gboolean beep, gboolean use_theme, const gchar *file) +do_play_sound (gboolean beep, + gboolean use_theme, + const gchar *file) { if (!beep) { #ifdef HAVE_CANBERRA @@ -537,7 +539,8 @@ struct _SoundConfigureWidgets { }; static void -sound_file_set_cb (GtkFileChooser *file_chooser, gpointer data) +sound_file_set_cb (GtkFileChooser *file_chooser, + gpointer data) { gchar *file; GConfClient *client; @@ -828,7 +831,8 @@ gint e_plugin_lib_enable (EPlugin *ep, gint enable); GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl); void -org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t) +org_gnome_mail_new_notify (EPlugin *ep, + EMEventTargetFolder *t) { g_return_if_fail (t != NULL); @@ -852,7 +856,8 @@ org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t) } void -org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t) +org_gnome_mail_read_notify (EPlugin *ep, + EMEventTargetMessage *t) { g_return_if_fail (t != NULL); @@ -875,7 +880,8 @@ org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t) } gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { if (enable) { enable_dbus (enable); diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 61eb5fb2f3..eb9e762b75 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -70,7 +70,7 @@ gboolean mail_browser_init (GtkUIManager *ui_manager, gboolean mail_shell_view_init (GtkUIManager *ui_manager, EShellView *shell_view); -static CompEditor* +static CompEditor * get_component_editor (EShell *shell, ECalClient *client, ECalComponent *comp, @@ -144,7 +144,9 @@ get_component_editor (EShell *shell, } static void -set_attendees (ECalComponent *comp, CamelMimeMessage *message, const gchar *organizer) +set_attendees (ECalComponent *comp, + CamelMimeMessage *message, + const gchar *organizer) { GSList *attendees = NULL, *to_free = NULL; ECalComponentAttendee *ca; @@ -214,7 +216,8 @@ set_attendees (ECalComponent *comp, CamelMimeMessage *message, const gchar *orga } static const gchar * -prepend_from (CamelMimeMessage *message, gchar **text) +prepend_from (CamelMimeMessage *message, + gchar **text) { gchar *res, *tmp, *addr = NULL; const gchar *name = NULL, *eml = NULL; @@ -245,7 +248,8 @@ prepend_from (CamelMimeMessage *message, gchar **text) } static void -set_description (ECalComponent *comp, CamelMimeMessage *message) +set_description (ECalComponent *comp, + CamelMimeMessage *message) { CamelDataWrapper *content; CamelStream *stream; @@ -308,7 +312,8 @@ set_description (ECalComponent *comp, CamelMimeMessage *message) } static gchar * -set_organizer (ECalComponent *comp, CamelFolder *folder) +set_organizer (ECalComponent *comp, + CamelFolder *folder) { EAccount *account = NULL; const gchar *str, *name; @@ -380,7 +385,9 @@ attachment_save_finished (EAttachmentStore *store, } static void -set_attachments (ECalClient *client, ECalComponent *comp, CamelMimeMessage *message) +set_attachments (ECalClient *client, + ECalComponent *comp, + CamelMimeMessage *message) { /* XXX Much of this is copied from CompEditor::get_attachment_list(). * Perhaps it should be split off as a separate utility? */ @@ -480,7 +487,8 @@ set_attachments (ECalClient *client, ECalComponent *comp, CamelMimeMessage *mess } static void -set_priority (ECalComponent *comp, CamelMimePart *part) +set_priority (ECalComponent *comp, + CamelMimePart *part) { const gchar *prio; @@ -515,7 +523,8 @@ do_report_error (struct _report_error *err) } static void -report_error_idle (const gchar *format, const gchar *param) +report_error_idle (const gchar *format, + const gchar *param) { struct _report_error *err = g_new (struct _report_error, 1); @@ -559,7 +568,8 @@ free_manage_comp_struct (struct _manage_comp *mc) } static gint -do_ask (const gchar *text, gboolean is_create_edit_add) +do_ask (const gchar *text, + gboolean is_create_edit_add) { gint res; GtkWidget *dialog = gtk_message_dialog_new (NULL, @@ -631,8 +641,8 @@ get_question_add_all_mails (ECalClientSourceType source_type) static void comp_editor_closed (CompEditor *editor, - gboolean accepted, - struct _manage_comp *mc) + gboolean accepted, + struct _manage_comp *mc) { if (!mc) return; @@ -641,7 +651,7 @@ comp_editor_closed (CompEditor *editor, mc->can_continue = (do_ask (_("Do you wish to continue converting remaining mails?"), FALSE) == GTK_RESPONSE_YES); /* Signal the do_mail_to_event thread that editor was closed and editor - for next event can be displayed (if any) */ + * for next event can be displayed (if any) */ g_cond_signal (mc->cond); } @@ -653,8 +663,8 @@ comp_editor_closed (CompEditor *editor, */ static void comp_editor_title_changed (GtkWidget *widget, - GParamSpec *pspec, - struct _manage_comp *mc) + GParamSpec *pspec, + struct _manage_comp *mc) { GtkWindow *editor = GTK_WINDOW (widget); const gchar *title = gtk_window_get_title (editor); @@ -679,8 +689,8 @@ comp_editor_title_changed (GtkWidget *widget, comp_name, mc->mails_done, mc->mails_count, task_name); /* Remember the new title, so that when gtk_window_set_title() causes - this handler to be recursively called, we can recognize that and - prevent endless recursion */ + * this handler to be recursively called, we can recognize that and + * prevent endless recursion */ if (mc->editor_title) g_free (mc->editor_title); mc->editor_title = new_title; @@ -996,12 +1006,13 @@ do_mail_to_event (AsyncData *data) } static gboolean -text_contains_nonwhitespace (const gchar *text, gint len) +text_contains_nonwhitespace (const gchar *text, + gint len) { const gchar *p; gunichar c = 0; - if (!text || len<=0) + if (!text || len <= 0) return FALSE; p = text; diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index 1a34608150..e9d2dda7ee 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -92,7 +92,8 @@ gboolean mail_shell_view_init (GtkUIManager *ui_manager, gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index 81e220c19d..4fe19cf71b 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -59,7 +59,8 @@ enum { gboolean e_plugin_ui_init (GtkUIManager *ui_manager, EShellView *shell_view); -gint e_plugin_lib_enable (EPlugin *ep, gint enable); +gint e_plugin_lib_enable (EPlugin *ep, + gint enable); static void async_context_free (AsyncContext *context) @@ -75,7 +76,8 @@ async_context_free (AsyncContext *context) } gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } @@ -207,8 +209,8 @@ prompt_user (gboolean has_subfolders) gtk_widget_show (widget); /* To Translators: It's a response button caption on a question - "Do you want to mark messages as read in the current folder - only, or in the current folder as well as all subfolders?" */ + * "Do you want to mark messages as read in the current folder + * only, or in the current folder as well as all subfolders?" */ widget = gtk_button_new_with_mnemonic ( _("In Current Folder and _Subfolders")); g_object_set_data ( @@ -221,8 +223,8 @@ prompt_user (gboolean has_subfolders) gtk_widget_show (widget); /* To Translators: It's a response button caption on a question - "Do you want to mark messages as read in the current folder - only, or in the current folder as well as all subfolders?" */ + * "Do you want to mark messages as read in the current folder + * only, or in the current folder as well as all subfolders?" */ widget = gtk_button_new_with_mnemonic ( _("In Current _Folder Only")); g_object_set_data ( @@ -252,7 +254,7 @@ static gboolean scan_folder_tree_for_unread_helper (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path, - gboolean is_first_node, + gboolean is_first_node, gint initial_depth, gint *relative_depth) { diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index ce51ffeefd..55f62f8e3d 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -36,7 +36,7 @@ void org_gnome_prefer_plain_multipart_alternative (gpointer ep, EMFormatHookTarget *t); void org_gnome_prefer_plain_text_html (gpointer ep, EMFormatHookTarget *t); -GtkWidget *org_gnome_prefer_plain_config_mode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); +GtkWidget *org_gnome_prefer_plain_config_mode (EPlugin *epl, struct _EConfigHookItemFactoryData *data); enum { EPP_NORMAL, @@ -49,7 +49,10 @@ static gint epp_mode = -1; static gboolean epp_show_suppressed = TRUE; static void -make_part_attachment (EMFormat *format, CamelStream *stream, CamelMimePart *part, gint i) +make_part_attachment (EMFormat *format, + CamelStream *stream, + CamelMimePart *part, + gint i) { gint partidlen = format->part_id->len; @@ -72,7 +75,7 @@ make_part_attachment (EMFormat *format, CamelStream *stream, CamelMimePart *part "application/octet-stream", NULL); } else if (i == -1 && CAMEL_IS_MIME_MESSAGE (part)) { /* message was asked to be formatted as text/html; - might be for cases where message itself is a text/html part */ + * might be for cases where message itself is a text/html part */ CamelMimePart *new_part; CamelDataWrapper *content; @@ -94,7 +97,8 @@ make_part_attachment (EMFormat *format, CamelStream *stream, CamelMimePart *part } void -org_gnome_prefer_plain_text_html (gpointer ep, EMFormatHookTarget *t) +org_gnome_prefer_plain_text_html (gpointer ep, + EMFormatHookTarget *t) { /* In text-only mode, all html output is suppressed for the first processing */ if (epp_mode != EPP_TEXT @@ -109,7 +113,10 @@ org_gnome_prefer_plain_text_html (gpointer ep, EMFormatHookTarget *t) } static void -export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream, CamelMimePart *except) +export_as_attachments (CamelMultipart *mp, + EMFormat *format, + CamelStream *stream, + CamelMimePart *except) { gint i, nparts; CamelMimePart *part; @@ -134,7 +141,8 @@ export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream } void -org_gnome_prefer_plain_multipart_alternative (gpointer ep, EMFormatHookTarget *t) +org_gnome_prefer_plain_multipart_alternative (gpointer ep, + EMFormatHookTarget *t) { CamelMultipart *mp = (CamelMultipart *) camel_medium_get_content ((CamelMedium *) t->part); CamelMimePart *part, *display_part = NULL, *calendar_part = NULL; @@ -146,11 +154,12 @@ org_gnome_prefer_plain_multipart_alternative (gpointer ep, EMFormatHookTarget *t if (epp_mode == EPP_NORMAL) { gboolean have_plain = FALSE; - /* Try to find text/html part even when not as last and force to show it. - Old handler will show the last part of multipart/alternate, but if we - can offer HTML, then offer it, regardless of position in multipart. - But do this when have only text/plain and text/html parts, not more. - */ + /* Try to find text/html part even when not as last and force + * to show it. Old handler will show the last part of + * multipart/alternate, but if we can offer HTML, then + * offer it, regardless of position in multipart. But do + * this when have only text/plain and text/html parts, + * not more. */ nparts = camel_multipart_get_number (mp); for (i = 0; i < nparts; i++) { CamelContentType *content_type; @@ -196,7 +205,7 @@ org_gnome_prefer_plain_multipart_alternative (gpointer ep, EMFormatHookTarget *t } nparts = camel_multipart_get_number (mp); - for (i=0; i<nparts; i++) { + for (i = 0; i < nparts; i++) { CamelContentType *ct; part = camel_multipart_get_part (mp, i); @@ -238,13 +247,24 @@ static struct { const gchar *label; const gchar *description; } epp_options[] = { - { "normal", N_("Show HTML if present"), N_("Let Evolution choose the best part to show.") }, - { "prefer_plain", N_("Show plain text if present"), N_("Show plain text part, if present, otherwise let Evolution choose the best part to show.") }, - { "only_plain", N_("Only ever show plain text"), N_("Always show plain text part and make attachments from other parts, if requested.") }, + { "normal", + N_("Show HTML if present"), + N_("Let Evolution choose the best part to show.") }, + + { "prefer_plain", + N_("Show plain text if present"), + N_("Show plain text part, if present, otherwise " + "let Evolution choose the best part to show.") }, + + { "only_plain", + N_("Only ever show plain text"), + N_("Always show plain text part and make attachments " + "from other parts, if requested.") }, }; static void -update_info_label (GtkWidget *info_label, guint mode) +update_info_label (GtkWidget *info_label, + guint mode) { gchar *str = g_strconcat ("<i>", _(epp_options[mode > 2 ? 0 : mode].description), "</i>", NULL); @@ -254,7 +274,8 @@ update_info_label (GtkWidget *info_label, guint mode) } static void -epp_mode_changed (GtkComboBox *dropdown, GtkWidget *info_label) +epp_mode_changed (GtkComboBox *dropdown, + GtkWidget *info_label) { epp_mode = gtk_combo_box_get_active (dropdown); if (epp_mode > 2) @@ -265,7 +286,8 @@ epp_mode_changed (GtkComboBox *dropdown, GtkWidget *info_label) } static void -epp_show_suppressed_toggled (GtkToggleButton *check, gpointer data) +epp_show_suppressed_toggled (GtkToggleButton *check, + gpointer data) { g_return_if_fail (check != NULL); @@ -274,7 +296,8 @@ epp_show_suppressed_toggled (GtkToggleButton *check, gpointer data) } GtkWidget * -org_gnome_prefer_plain_config_mode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) +org_gnome_prefer_plain_config_mode (EPlugin *epl, + struct _EConfigHookItemFactoryData *data) { /*EMConfigTargetPrefs *ep = (EMConfigTargetPrefs *)data->target;*/ GtkComboBox *dropdown; @@ -334,7 +357,8 @@ org_gnome_prefer_plain_config_mode (struct _EPlugin *epl, struct _EConfigHookIte gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { gchar *key; gint i; diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 3f14ce0f9b..b330a371ba 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -103,8 +103,8 @@ void org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target, gint e_plugin_lib_enable (EPlugin *ep, gint enable); /* em-folder-selection-button.h is private, even though other internal evo plugins use it! - so declare the functions here - TODO: sort out whether this should really be private + * so declare the functions here + * TODO: sort out whether this should really be private */ static guchar pst_signature[] = { '!', 'B', 'D', 'N' }; @@ -141,7 +141,8 @@ struct _PstImporter { }; gboolean -org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target) +org_credativ_evolution_readpst_supported (EPlugin *epl, + EImportTarget *target) { gchar signature[sizeof (pst_signature)]; gboolean ret = FALSE; @@ -177,37 +178,43 @@ org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target) } static void -checkbox_mail_toggle_cb (GtkToggleButton *tb, EImportTarget *target) +checkbox_mail_toggle_cb (GtkToggleButton *tb, + EImportTarget *target) { g_datalist_set_data (&target->data, "pst-do-mail", GINT_TO_POINTER (gtk_toggle_button_get_active (tb))); } static void -checkbox_addr_toggle_cb (GtkToggleButton *tb, EImportTarget *target) +checkbox_addr_toggle_cb (GtkToggleButton *tb, + EImportTarget *target) { g_datalist_set_data (&target->data, "pst-do-addr", GINT_TO_POINTER (gtk_toggle_button_get_active (tb))); } static void -checkbox_appt_toggle_cb (GtkToggleButton *tb, EImportTarget *target) +checkbox_appt_toggle_cb (GtkToggleButton *tb, + EImportTarget *target) { g_datalist_set_data (&target->data, "pst-do-appt", GINT_TO_POINTER (gtk_toggle_button_get_active (tb))); } static void -checkbox_task_toggle_cb (GtkToggleButton *tb, EImportTarget *target) +checkbox_task_toggle_cb (GtkToggleButton *tb, + EImportTarget *target) { g_datalist_set_data (&target->data, "pst-do-task", GINT_TO_POINTER (gtk_toggle_button_get_active (tb))); } static void -checkbox_journal_toggle_cb (GtkToggleButton *tb, EImportTarget *target) +checkbox_journal_toggle_cb (GtkToggleButton *tb, + EImportTarget *target) { g_datalist_set_data (&target->data, "pst-do-journal", GINT_TO_POINTER (gtk_toggle_button_get_active (tb))); } static void -folder_selected (EMFolderSelectionButton *button, EImportTargetURI *target) +folder_selected (EMFolderSelectionButton *button, + EImportTargetURI *target) { g_free (target->uri_dest); target->uri_dest = g_strdup (em_folder_selection_button_get_folder_uri (button)); @@ -276,12 +283,12 @@ get_suggested_foldername (EImportTargetURI *target) if (!foldername) { /* Suggest a folder that is in the same mail storage as the users' inbox, - with a name derived from the .PST file */ + * with a name derived from the .PST file */ inbox = e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_INBOX); delim = g_strrstr (inbox, "#"); if (delim != NULL) { - foldername = g_string_new_len (inbox, delim-inbox); + foldername = g_string_new_len (inbox, delim - inbox); } else { foldername = g_string_new (inbox); } @@ -317,7 +324,7 @@ get_suggested_foldername (EImportTargetURI *target) gint i, len; len = foldername->len; - for (i=1; i<10000; i++) { + for (i = 1; i < 10000; i++) { g_string_truncate (foldername, len); g_string_append_printf (foldername, "_%d", i); /* FIXME Not passing a GCancellable or GError here. */ @@ -338,7 +345,8 @@ get_suggested_foldername (EImportTargetURI *target) } static void -widget_sanitizer_cb (GtkToggleButton *button, GtkWidget *source_combo) +widget_sanitizer_cb (GtkToggleButton *button, + GtkWidget *source_combo) { g_return_if_fail (button != NULL); g_return_if_fail (source_combo != NULL); @@ -372,7 +380,11 @@ get_source_combo_key (EClientSourceType source_type) } static void -add_source_list_with_check (GtkWidget *frame, const gchar *caption, EClientSourceType source_type, GCallback toggle_callback, EImportTarget *target) +add_source_list_with_check (GtkWidget *frame, + const gchar *caption, + EClientSourceType source_type, + GCallback toggle_callback, + EImportTarget *target) { GtkWidget *check, *hbox; ESourceList *source_list = NULL; @@ -416,7 +428,9 @@ add_source_list_with_check (GtkWidget *frame, const gchar *caption, EClientSourc } GtkWidget * -org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im) +org_credativ_evolution_readpst_getwidget (EImport *ei, + EImportTarget *target, + EImportImporter *im) { EShell *shell; EShellBackend *shell_backend; @@ -471,7 +485,9 @@ org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EI } static void -client_opened_cb (GObject *source_object, GAsyncResult *result, gpointer user_data) +client_opened_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { PstImporter *m = user_data; GError *error = NULL; @@ -520,7 +536,8 @@ client_opened_cb (GObject *source_object, GAsyncResult *result, gpointer user_da } static void -open_client (PstImporter *m, EClientSourceType source_type) +open_client (PstImporter *m, + EClientSourceType source_type) { ESourceComboBox *combo; ESource *source; @@ -562,7 +579,8 @@ pst_prepare_run (PstImporter *m) } static gchar * -pst_import_describe (PstImporter *m, gint complete) +pst_import_describe (PstImporter *m, + gint complete) { return g_strdup (_("Importing Outlook data")); } @@ -576,7 +594,8 @@ pst_import_import (PstImporter *m, } static void -count_items (PstImporter *m, pst_desc_tree *topitem) +count_items (PstImporter *m, + pst_desc_tree *topitem) { pst_desc_tree *d_ptr; @@ -671,7 +690,8 @@ pst_import_file (PstImporter *m) } static void -pst_import_folders (PstImporter *m, pst_desc_tree *topitem) +pst_import_folders (PstImporter *m, + pst_desc_tree *topitem) { CamelOperation *co = CAMEL_OPERATION (m->cancellable); GHashTable *node_to_folderuri; /* pointers of hierarchy nodes, to them associated folder uris */ @@ -744,7 +764,9 @@ pst_import_folders (PstImporter *m, pst_desc_tree *topitem) } static void -pst_process_item (PstImporter *m, pst_desc_tree *d_ptr, gchar **previous_folder) +pst_process_item (PstImporter *m, + pst_desc_tree *d_ptr, + gchar **previous_folder) { pst_item *item = NULL; @@ -851,7 +873,8 @@ foldername_to_utf8 (const gchar *pstname) } static void -pst_process_folder (PstImporter *m, pst_item *item) +pst_process_folder (PstImporter *m, + pst_item *item) { gchar *uri; g_free (m->folder_name); @@ -951,7 +974,8 @@ pst_create_folder (PstImporter *m) * Returns: #CamelMimePart containing data and mime type */ static CamelMimePart * -attachment_to_part (PstImporter *m, pst_item_attach *attach) +attachment_to_part (PstImporter *m, + pst_item_attach *attach) { CamelMimePart *part; const gchar *mimetype; @@ -986,7 +1010,8 @@ attachment_to_part (PstImporter *m, pst_item_attach *attach) } static void -pst_process_email (PstImporter *m, pst_item *item) +pst_process_email (PstImporter *m, + pst_item *item) { CamelMimeMessage *msg; CamelInternetAddress *addr; @@ -1222,7 +1247,9 @@ pst_process_email (PstImporter *m, pst_item *item) } static void -contact_set_string (EContact *contact, EContactField id, gchar *string) +contact_set_string (EContact *contact, + EContactField id, + gchar *string) { if (string != NULL) { e_contact_set (contact, id, string); @@ -1230,7 +1257,10 @@ contact_set_string (EContact *contact, EContactField id, gchar *string) } static void -unknown_field (EContact *contact, GString *notes, const gchar *name, gchar *string) +unknown_field (EContact *contact, + GString *notes, + const gchar *name, + gchar *string) { /* Field could not be mapped directly so add to notes field */ if (string != NULL) { @@ -1239,7 +1269,15 @@ unknown_field (EContact *contact, GString *notes, const gchar *name, gchar *stri } static void -contact_set_address (EContact *contact, EContactField id, gchar *address, gchar *city, gchar *country, gchar *po_box, gchar *postal_code, gchar *state, gchar *street) +contact_set_address (EContact *contact, + EContactField id, + gchar *address, + gchar *city, + gchar *country, + gchar *po_box, + gchar *postal_code, + gchar *state, + gchar *street) { EContactAddress *eaddress; @@ -1275,7 +1313,9 @@ contact_set_address (EContact *contact, EContactField id, gchar *address, gchar } void -contact_set_date (EContact *contact, EContactField id, FILETIME *date) +contact_set_date (EContact *contact, + EContactField id, + FILETIME *date) { if (date && (date->dwLowDateTime || date->dwHighDateTime) ) { time_t t1; @@ -1295,7 +1335,8 @@ contact_set_date (EContact *contact, EContactField id, FILETIME *date) } static void -pst_process_contact (PstImporter *m, pst_item *item) +pst_process_contact (PstImporter *m, + pst_item *item) { pst_item_contact *c; EContact *ec; @@ -1462,7 +1503,8 @@ pst_process_contact (PstImporter *m, pst_item *item) * Returns: converted date */ struct icaltimetype -get_ical_date (FILETIME *date, gboolean is_date) +get_ical_date (FILETIME *date, + gboolean is_date) { if (date && (date->dwLowDateTime || date->dwHighDateTime) ) { time_t t; @@ -1475,7 +1517,10 @@ get_ical_date (FILETIME *date, gboolean is_date) } static void -set_cal_attachments (ECalClient *cal, ECalComponent *ec, PstImporter *m, pst_item_attach *attach) +set_cal_attachments (ECalClient *cal, + ECalComponent *ec, + PstImporter *m, + pst_item_attach *attach) { GSList *list = NULL; const gchar *uid; @@ -1572,7 +1617,10 @@ set_cal_attachments (ECalClient *cal, ECalComponent *ec, PstImporter *m, pst_ite } static void -fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const gchar *type) +fill_calcomponent (PstImporter *m, + pst_item *item, + ECalComponent *ec, + const gchar *type) { pst_item_appointment *a; pst_item_email *e; @@ -1683,7 +1731,7 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const gcha if (a->alarm_minutes) { trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START; - trigger.u.rel_duration = icaldurationtype_from_int (- (a->alarm_minutes)*60); + trigger.u.rel_duration = icaldurationtype_from_int (- (a->alarm_minutes) * 60); e_cal_component_alarm_set_trigger (alarm, trigger); } @@ -1773,7 +1821,10 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const gcha } static void -pst_process_component (PstImporter *m, pst_item *item, const gchar *comp_type, ECalClient *cal) +pst_process_component (PstImporter *m, + pst_item *item, + const gchar *comp_type, + ECalClient *cal) { ECalComponent *ec; gchar *uid = NULL; @@ -1799,26 +1850,30 @@ pst_process_component (PstImporter *m, pst_item *item, const gchar *comp_type, E } static void -pst_process_appointment (PstImporter *m, pst_item *item) +pst_process_appointment (PstImporter *m, + pst_item *item) { pst_process_component (m, item, "appointment", m->calendar); } static void -pst_process_task (PstImporter *m, pst_item *item) +pst_process_task (PstImporter *m, + pst_item *item) { pst_process_component (m, item, "task", m->tasks); } static void -pst_process_journal (PstImporter *m, pst_item *item) +pst_process_journal (PstImporter *m, + pst_item *item) { pst_process_component (m, item, "journal", m->journal); } /* Print an error message - maybe later bring up an error dialog? */ static void -pst_error_msg (const gchar *fmt, ...) +pst_error_msg (const gchar *fmt, + ...) { va_list ap; @@ -1889,7 +1944,10 @@ pst_status_timeout (gpointer data) } static void -pst_status (CamelOperation *op, const gchar *what, gint pc, gpointer data) +pst_status (CamelOperation *op, + const gchar *what, + gint pc, + gpointer data) { PstImporter *importer = data; @@ -1901,7 +1959,8 @@ pst_status (CamelOperation *op, const gchar *what, gint pc, gpointer data) } static void -pst_import (EImport *ei, EImportTarget *target) +pst_import (EImport *ei, + EImportTarget *target) { PstImporter *m; @@ -1934,7 +1993,9 @@ pst_import (EImport *ei, EImportTarget *target) /* Start the main import operation */ void -org_credativ_evolution_readpst_import (EImport *ei, EImportTarget *target, EImportImporter *im) +org_credativ_evolution_readpst_import (EImport *ei, + EImportTarget *target, + EImportImporter *im) { if (GPOINTER_TO_INT (g_datalist_get_data (&target->data, "pst-do-mail")) || GPOINTER_TO_INT (g_datalist_get_data (&target->data, "pst-do-addr")) @@ -1948,7 +2009,9 @@ org_credativ_evolution_readpst_import (EImport *ei, EImportTarget *target, EImpo } void -org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target, EImportImporter *im) +org_credativ_evolution_readpst_cancel (EImport *ei, + EImportTarget *target, + EImportImporter *im) { PstImporter *m = g_datalist_get_data (&target->data, "pst-msg"); @@ -1958,7 +2021,8 @@ org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target, EImpo } gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } @@ -1973,7 +2037,8 @@ e_plugin_lib_enable (EPlugin *ep, gint enable) * Returns: 0 for sucess, -1 for failure */ gint -pst_init (pst_file *pst, gchar *filename) +pst_init (pst_file *pst, + gchar *filename) { #if 0 @@ -2013,7 +2078,8 @@ pst_init (pst_file *pst, gchar *filename) * or %NULL if error */ gchar * -get_pst_rootname (pst_file *pst, gchar *filename) +get_pst_rootname (pst_file *pst, + gchar *filename) { pst_item *item = NULL; gchar *rootname = NULL; diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 8fad76f79f..c55782985c 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -97,7 +97,8 @@ remove_notification (gpointer data) } static void -update_publish_notification (GtkMessageType msg_type, const gchar *msg_text) +update_publish_notification (GtkMessageType msg_type, + const gchar *msg_text) { static GString *actual_msg = NULL; #ifdef HAVE_LIBNOTIFY @@ -194,7 +195,10 @@ publish_uri_async (EPublishUri *uri) } static void -publish_online (EPublishUri *uri, GFile *file, GError **perror, gboolean can_report_success) +publish_online (EPublishUri *uri, + GFile *file, + GError **perror, + gboolean can_report_success) { GOutputStream *stream; GError *error = NULL; @@ -242,14 +246,16 @@ publish_online (EPublishUri *uri, GFile *file, GError **perror, gboolean can_rep } static void -unmount_done_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) +unmount_done_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { GError *error = NULL; #if GLIB_CHECK_VERSION(2,21,3) - g_mount_unmount_with_operation_finish (G_MOUNT (source_object), res, &error); + g_mount_unmount_with_operation_finish (G_MOUNT (source_object), result, &error); #else - g_mount_unmount_finish (G_MOUNT (source_object), res, &error); + g_mount_unmount_finish (G_MOUNT (source_object), result, &error); #endif if (error) { @@ -268,13 +274,15 @@ struct mnt_struct { }; static void -mount_ready_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) +mount_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { struct mnt_struct *ms = (struct mnt_struct *) user_data; GError *error = NULL; GMount *mount; - g_file_mount_enclosing_volume_finish (G_FILE (source_object), res, &error); + g_file_mount_enclosing_volume_finish (G_FILE (source_object), result, &error); if (error) { error_queue_add (g_strdup_printf (_("Mount of %s failed:"), ms->uri->location), error); @@ -307,7 +315,12 @@ mount_ready_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) } static void -ask_password (GMountOperation *op, const gchar *message, const gchar *default_user, const gchar *default_domain, GAskPasswordFlags flags, gpointer user_data) +ask_password (GMountOperation *op, + const gchar *message, + const gchar *default_user, + const gchar *default_domain, + GAskPasswordFlags flags, + gpointer user_data) { struct mnt_struct *ms = (struct mnt_struct *) user_data; gchar *username, *password; @@ -330,7 +343,7 @@ ask_password (GMountOperation *op, const gchar *message, const gchar *default_us gboolean remember = FALSE; password = e_passwords_ask_password (_("Enter password"), NULL, ms->uri->location, message, - E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE, + E_PASSWORDS_REMEMBER_FOREVER | E_PASSWORDS_SECRET | E_PASSWORDS_ONLINE, &remember, NULL); @@ -357,7 +370,9 @@ ask_password (GMountOperation *op, const gchar *message, const gchar *default_us } static void -ask_question (GMountOperation *op, const gchar *message, const gchar *choices[]) +ask_question (GMountOperation *op, + const gchar *message, + const gchar *choices[]) { /* this has been stolen from file-chooser */ GtkWidget *dialog; @@ -408,7 +423,9 @@ ask_question (GMountOperation *op, const gchar *message, const gchar *choices[]) } static void -mount_first (EPublishUri *uri, GFile *file, gboolean can_report_success) +mount_first (EPublishUri *uri, + GFile *file, + gboolean can_report_success) { struct mnt_struct *ms = g_malloc (sizeof (struct mnt_struct)); @@ -424,7 +441,8 @@ mount_first (EPublishUri *uri, GFile *file, gboolean can_report_success) } static void -publish (EPublishUri *uri, gboolean can_report_success) +publish (EPublishUri *uri, + gboolean can_report_success) { if (online) { GError *error = NULL; @@ -592,7 +610,8 @@ url_list_changed (PublishUIData *ui) } static void -update_url_enable_button (EPublishUri *url, GtkWidget *url_enable) +update_url_enable_button (EPublishUri *url, + GtkWidget *url_enable) { g_return_if_fail (url_enable != NULL); g_return_if_fail (GTK_IS_BUTTON (url_enable)); @@ -602,8 +621,8 @@ update_url_enable_button (EPublishUri *url, GtkWidget *url_enable) static void url_list_enable_toggled (GtkCellRendererToggle *renderer, - const gchar *path_string, - PublishUIData *ui) + const gchar *path_string, + PublishUIData *ui) { EPublishUri *url = NULL; GtkTreeModel *model; @@ -629,7 +648,8 @@ url_list_enable_toggled (GtkCellRendererToggle *renderer, } static void -selection_changed (GtkTreeSelection *selection, PublishUIData *ui) +selection_changed (GtkTreeSelection *selection, + PublishUIData *ui) { GtkTreeModel *model; GtkTreeIter iter; @@ -650,7 +670,8 @@ selection_changed (GtkTreeSelection *selection, PublishUIData *ui) } static void -url_add_clicked (GtkButton *button, PublishUIData *ui) +url_add_clicked (GtkButton *button, + PublishUIData *ui) { GtkTreeModel *model; GtkTreeIter iter; @@ -664,10 +685,11 @@ url_add_clicked (GtkButton *button, PublishUIData *ui) uri = URL_EDITOR_DIALOG (url_editor)->uri; if (uri->location) { gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - URL_LIST_ENABLED_COLUMN, uri->enabled, - URL_LIST_LOCATION_COLUMN, uri->location, - URL_LIST_URL_COLUMN, uri, -1); + gtk_list_store_set ( + GTK_LIST_STORE (model), &iter, + URL_LIST_ENABLED_COLUMN, uri->enabled, + URL_LIST_LOCATION_COLUMN, uri->location, + URL_LIST_URL_COLUMN, uri, -1); url_list_changed (ui); publish_uris = g_slist_prepend (publish_uris, uri); add_timeout (uri); @@ -680,7 +702,8 @@ url_add_clicked (GtkButton *button, PublishUIData *ui) } static void -url_edit_clicked (GtkButton *button, PublishUIData *ui) +url_edit_clicked (GtkButton *button, + PublishUIData *ui) { GtkTreeSelection *selection; GtkTreeModel *model; @@ -714,16 +737,17 @@ url_edit_clicked (GtkButton *button, PublishUIData *ui) } static void -url_list_double_click (GtkTreeView *treeview, - GtkTreePath *path, - GtkTreeViewColumn *column, - PublishUIData *ui) +url_list_double_click (GtkTreeView *treeview, + GtkTreePath *path, + GtkTreeViewColumn *column, + PublishUIData *ui) { url_edit_clicked (NULL, ui); } static void -url_remove_clicked (GtkButton *button, PublishUIData *ui) +url_remove_clicked (GtkButton *button, + PublishUIData *ui) { EPublishUri *url = NULL; GtkTreeSelection *selection; @@ -775,7 +799,8 @@ url_remove_clicked (GtkButton *button, PublishUIData *ui) } static void -url_enable_clicked (GtkButton *button, PublishUIData *ui) +url_enable_clicked (GtkButton *button, + PublishUIData *ui) { EPublishUri *url = NULL; GtkTreeSelection *selection; @@ -805,7 +830,8 @@ online_state_changed (EShell *shell) } GtkWidget * -publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) +publish_calendar_locations (EPlugin *epl, + EConfigHookItemFactoryData *data) { GtkBuilder *builder; GtkCellRenderer *renderer; @@ -827,28 +853,42 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) gtk_tree_view_set_model (GTK_TREE_VIEW (ui->treeview), GTK_TREE_MODEL (store)); renderer = gtk_cell_renderer_toggle_new (); - g_object_set (G_OBJECT (renderer), "activatable", TRUE, NULL); + g_object_set (renderer, "activatable", TRUE, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Enabled"), renderer, "active", URL_LIST_ENABLED_COLUMN, NULL); - g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (url_list_enable_toggled), ui); + g_signal_connect ( + renderer, "toggled", + G_CALLBACK (url_list_enable_toggled), ui); renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Location"), renderer, "text", URL_LIST_LOCATION_COLUMN, NULL); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); - g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), ui); + g_signal_connect ( + selection, "changed", + G_CALLBACK (selection_changed), ui); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ui->treeview), TRUE); - g_signal_connect (G_OBJECT (ui->treeview), "row-activated", G_CALLBACK (url_list_double_click), ui); + g_signal_connect ( + ui->treeview, "row-activated", + G_CALLBACK (url_list_double_click), ui); ui->url_add = e_builder_get_widget (builder, "url add"); ui->url_edit = e_builder_get_widget (builder, "url edit"); ui->url_remove = e_builder_get_widget (builder, "url remove"); ui->url_enable = e_builder_get_widget (builder, "url enable"); update_url_enable_button (NULL, ui->url_enable); - g_signal_connect (G_OBJECT (ui->url_add), "clicked", G_CALLBACK (url_add_clicked), ui); - g_signal_connect (G_OBJECT (ui->url_edit), "clicked", G_CALLBACK (url_edit_clicked), ui); - g_signal_connect (G_OBJECT (ui->url_remove), "clicked", G_CALLBACK (url_remove_clicked), ui); - g_signal_connect (G_OBJECT (ui->url_enable), "clicked", G_CALLBACK (url_enable_clicked), ui); + g_signal_connect ( + ui->url_add, "clicked", + G_CALLBACK (url_add_clicked), ui); + g_signal_connect ( + ui->url_edit, "clicked", + G_CALLBACK (url_edit_clicked), ui); + g_signal_connect ( + ui->url_remove, "clicked", + G_CALLBACK (url_remove_clicked), ui); + g_signal_connect ( + ui->url_enable, "clicked", + G_CALLBACK (url_enable_clicked), ui); gtk_widget_set_sensitive (GTK_WIDGET (ui->url_edit), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (ui->url_remove), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (ui->url_enable), FALSE); @@ -926,7 +966,8 @@ publish_uris_set_timeout (GSList *uris) } gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { GSList *uris; GConfClient *client; @@ -1024,7 +1065,8 @@ error_queue_show_idle (gpointer user_data) } void -error_queue_add (gchar *description, GError *error) +error_queue_add (gchar *description, + GError *error) { struct eq_data *data; @@ -1052,8 +1094,8 @@ action_calendar_publish_cb (GtkAction *action, thread = g_thread_create ((GThreadFunc) publish_urls, NULL, FALSE, &error); if (!thread) { /* To Translators: This is shown to a user when creation of a new thread, - where the publishing should be done, fails. Basically, this shouldn't - ever happen, and if so, then something is really wrong. */ + * where the publishing should be done, fails. Basically, this shouldn't + * ever happen, and if so, then something is really wrong. */ error_queue_add (g_strdup (_("Could not create publish thread.")), error); } } diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index 65762e0c8a..1059e1d5be 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -37,7 +37,9 @@ #include "publish-format-fb.h" static void -free_busy_data_cb (ECalClient *client, const GSList *free_busy_ecalcomps, GSList **pobjects) +free_busy_data_cb (ECalClient *client, + const GSList *free_busy_ecalcomps, + GSList **pobjects) { const GSList *iter; @@ -52,7 +54,12 @@ free_busy_data_cb (ECalClient *client, const GSList *free_busy_ecalcomps, GSList } static gboolean -write_calendar (const gchar *uid, ESourceList *source_list, GOutputStream *stream, gint dur_type, gint dur_value, GError **error) +write_calendar (const gchar *uid, + ESourceList *source_list, + GOutputStream *stream, + gint dur_type, + gint dur_value, + GError **error) { ESource *source; ECalClient *client = NULL; @@ -133,7 +140,9 @@ write_calendar (const gchar *uid, ESourceList *source_list, GOutputStream *strea } void -publish_calendar_as_fb (GOutputStream *stream, EPublishUri *uri, GError **error) +publish_calendar_as_fb (GOutputStream *stream, + EPublishUri *uri, + GError **error) { GSList *l; ESourceList *source_list; diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c index de6b342c3d..b28a57aceb 100644 --- a/plugins/publish-calendar/publish-format-ical.c +++ b/plugins/publish-calendar/publish-format-ical.c @@ -40,7 +40,8 @@ typedef struct { } CompTzData; static void -insert_tz_comps (icalparameter *param, gpointer cb_data) +insert_tz_comps (icalparameter *param, + gpointer cb_data) { const gchar *tzid; CompTzData *tdata = cb_data; @@ -64,13 +65,18 @@ insert_tz_comps (icalparameter *param, gpointer cb_data) } static void -append_tz_to_comp (gpointer key, gpointer value, icalcomponent *toplevel) +append_tz_to_comp (gpointer key, + gpointer value, + icalcomponent *toplevel) { icalcomponent_add_component (toplevel, (icalcomponent *) value); } static gboolean -write_calendar (const gchar *uid, ESourceList *source_list, GOutputStream *stream, GError **error) +write_calendar (const gchar *uid, + ESourceList *source_list, + GOutputStream *stream, + GError **error) { ESource *source; ECalClient *client = NULL; @@ -128,7 +134,9 @@ write_calendar (const gchar *uid, ESourceList *source_list, GOutputStream *strea } void -publish_calendar_as_ical (GOutputStream *stream, EPublishUri *uri, GError **error) +publish_calendar_as_ical (GOutputStream *stream, + EPublishUri *uri, + GError **error) { GSList *l; ESourceList *source_list; diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c index f864d8a9ae..4bb4271037 100644 --- a/plugins/publish-calendar/publish-location.c +++ b/plugins/publish-calendar/publish-location.c @@ -33,7 +33,8 @@ #include <string.h> static EPublishUri * -migrateURI (const gchar *xml, xmlDocPtr doc) +migrateURI (const gchar *xml, + xmlDocPtr doc) { GConfClient *client; GSList *uris, *l, *events = NULL; diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index c2e68b9069..9467705040 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -151,13 +151,15 @@ fail: } static void -source_selection_changed (ESourceSelector *selector, UrlEditorDialog *dialog) +source_selection_changed (ESourceSelector *selector, + UrlEditorDialog *dialog) { check_input (dialog); } static void -publish_service_changed (GtkComboBox *combo, UrlEditorDialog *dialog) +publish_service_changed (GtkComboBox *combo, + UrlEditorDialog *dialog) { gint selected = gtk_combo_box_get_active (combo); EPublishUri *uri; @@ -226,7 +228,8 @@ publish_service_changed (GtkComboBox *combo, UrlEditorDialog *dialog) } static void -type_selector_changed (GtkComboBox *combo, UrlEditorDialog *dialog) +type_selector_changed (GtkComboBox *combo, + UrlEditorDialog *dialog) { gint selected = gtk_combo_box_get_active (combo); EPublishUri *uri; @@ -238,7 +241,8 @@ type_selector_changed (GtkComboBox *combo, UrlEditorDialog *dialog) } static void -frequency_changed_cb (GtkComboBox *combo, UrlEditorDialog *dialog) +frequency_changed_cb (GtkComboBox *combo, + UrlEditorDialog *dialog) { gint selected = gtk_combo_box_get_active (combo); @@ -249,34 +253,40 @@ frequency_changed_cb (GtkComboBox *combo, UrlEditorDialog *dialog) } static void -server_entry_changed (GtkEntry *entry, UrlEditorDialog *dialog) +server_entry_changed (GtkEntry *entry, + UrlEditorDialog *dialog) { check_input (dialog); } static void -file_entry_changed (GtkEntry *entry, UrlEditorDialog *dialog) +file_entry_changed (GtkEntry *entry, + UrlEditorDialog *dialog) { check_input (dialog); } static void -port_entry_changed (GtkEntry *entry, UrlEditorDialog *dialog) +port_entry_changed (GtkEntry *entry, + UrlEditorDialog *dialog) { } static void -username_entry_changed (GtkEntry *entry, UrlEditorDialog *dialog) +username_entry_changed (GtkEntry *entry, + UrlEditorDialog *dialog) { } static void -password_entry_changed (GtkEntry *entry, UrlEditorDialog *dialog) +password_entry_changed (GtkEntry *entry, + UrlEditorDialog *dialog) { } static void -remember_pw_toggled (GtkToggleButton *toggle, UrlEditorDialog *dialog) +remember_pw_toggled (GtkToggleButton *toggle, + UrlEditorDialog *dialog) { } @@ -455,17 +465,37 @@ url_editor_dialog_construct (UrlEditorDialog *dialog) frequency_changed_cb (GTK_COMBO_BOX (dialog->publish_frequency), dialog); publish_service_changed (GTK_COMBO_BOX (dialog->publish_service), dialog); - g_signal_connect (G_OBJECT (dialog->publish_service), "changed", G_CALLBACK (publish_service_changed), dialog); - g_signal_connect (G_OBJECT (dialog->type_selector), "changed", G_CALLBACK (type_selector_changed), dialog); - g_signal_connect (G_OBJECT (dialog->publish_frequency), "changed", G_CALLBACK (frequency_changed_cb), dialog); - g_signal_connect (G_OBJECT (dialog->events_selector), "selection_changed", G_CALLBACK (source_selection_changed), dialog); - - g_signal_connect (G_OBJECT (dialog->server_entry), "changed", G_CALLBACK (server_entry_changed), dialog); - g_signal_connect (G_OBJECT (dialog->file_entry), "changed", G_CALLBACK (file_entry_changed), dialog); - g_signal_connect (G_OBJECT (dialog->port_entry), "changed", G_CALLBACK (port_entry_changed), dialog); - g_signal_connect (G_OBJECT (dialog->username_entry), "changed", G_CALLBACK (username_entry_changed), dialog); - g_signal_connect (G_OBJECT (dialog->password_entry), "changed", G_CALLBACK (password_entry_changed), dialog); - g_signal_connect (G_OBJECT (dialog->remember_pw), "toggled", G_CALLBACK (remember_pw_toggled), dialog); + g_signal_connect ( + dialog->publish_service, "changed", + G_CALLBACK (publish_service_changed), dialog); + g_signal_connect ( + dialog->type_selector, "changed", + G_CALLBACK (type_selector_changed), dialog); + g_signal_connect ( + dialog->publish_frequency, "changed", + G_CALLBACK (frequency_changed_cb), dialog); + g_signal_connect ( + dialog->events_selector, "selection_changed", + G_CALLBACK (source_selection_changed), dialog); + + g_signal_connect ( + dialog->server_entry, "changed", + G_CALLBACK (server_entry_changed), dialog); + g_signal_connect ( + dialog->file_entry, "changed", + G_CALLBACK (file_entry_changed), dialog); + g_signal_connect ( + dialog->port_entry, "changed", + G_CALLBACK (port_entry_changed), dialog); + g_signal_connect ( + dialog->username_entry, "changed", + G_CALLBACK (username_entry_changed), dialog); + g_signal_connect ( + dialog->password_entry,"changed", + G_CALLBACK (password_entry_changed), dialog); + g_signal_connect ( + dialog->remember_pw, "toggled", + G_CALLBACK (remember_pw_toggled), dialog); g_object_unref (gconf); @@ -475,7 +505,8 @@ url_editor_dialog_construct (UrlEditorDialog *dialog) } GtkWidget * -url_editor_dialog_new (GtkTreeModel *url_list_model, EPublishUri *uri) +url_editor_dialog_new (GtkTreeModel *url_list_model, + EPublishUri *uri) { UrlEditorDialog *dialog; diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index b4e95bbef7..d80ee25753 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -53,7 +53,8 @@ struct _CsvPluginData }; static void -display_error_message (GtkWidget *parent, GError *error) +display_error_message (GtkWidget *parent, + GError *error) { GtkWidget *dialog; @@ -73,7 +74,10 @@ enum { /* CSV helper enum */ /* Some helpers for the csv stuff */ static GString * -add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type) +add_list_to_csv (GString *line, + GSList *list_in, + CsvConfig *config, + gint type) { /* @@ -87,7 +91,7 @@ add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type) gboolean needquotes = FALSE; GSList *list = list_in; GString *tmp = NULL; - gint cnt=0; + gint cnt = 0; while (list) { const gchar *str = NULL; if (cnt == 0) @@ -96,10 +100,10 @@ add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type) needquotes = TRUE; switch (type) { case ECALCOMPONENTATTENDEE: - str = ((ECalComponentAttendee*) list->data)->value; + str = ((ECalComponentAttendee *) list->data)->value; break; case ECALCOMPONENTTEXT: - str = ((ECalComponentText*) list->data)->value; + str = ((ECalComponentText *) list->data)->value; break; case CONSTCHAR: default: @@ -128,7 +132,9 @@ add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type) } static GString * -add_nummeric_to_csv (GString *line, gint *nummeric, CsvConfig *config) +add_nummeric_to_csv (GString *line, + gint *nummeric, + CsvConfig *config) { /* @@ -146,7 +152,9 @@ add_nummeric_to_csv (GString *line, gint *nummeric, CsvConfig *config) } static GString * -add_time_to_csv (GString *line, icaltimetype *time, CsvConfig *config) +add_time_to_csv (GString *line, + icaltimetype *time, + CsvConfig *config) { if (time) { @@ -179,7 +187,8 @@ add_time_to_csv (GString *line, icaltimetype *time, CsvConfig *config) } static gboolean -string_needsquotes (const gchar *value, CsvConfig *config) +string_needsquotes (const gchar *value, + CsvConfig *config) { /* This is the actual need for quotes-checker */ @@ -191,12 +200,12 @@ string_needsquotes (const gchar *value, CsvConfig *config) * Will be written as {"Mom, can you please do that for me?"} */ - gboolean needquotes = strstr (value, config->delimiter) ? TRUE:FALSE; + gboolean needquotes = strstr (value, config->delimiter) ? TRUE : FALSE; if (!needquotes) { - needquotes = strstr (value, config->newline) ? TRUE:FALSE; + needquotes = strstr (value, config->newline) ? TRUE : FALSE; if (!needquotes) - needquotes = strstr (value, config->quote) ? TRUE:FALSE; + needquotes = strstr (value, config->quote) ? TRUE : FALSE; } /* @@ -217,16 +226,16 @@ string_needsquotes (const gchar *value, CsvConfig *config) if (!needquotes) { gint len = strlen (config->delimiter); if ((len == 2) && (config->delimiter[1] == ' ')) { - needquotes = strchr (value, config->delimiter[0])?TRUE:FALSE; + needquotes = strchr (value, config->delimiter[0]) ? TRUE : FALSE; if (!needquotes) { len = strlen (config->newline); if ((len == 2) && (config->newline[1] == ' ')) { - needquotes = strchr (value, config->newline[0])?TRUE:FALSE; + needquotes = strchr (value, config->newline[0]) ? TRUE : FALSE; if (!needquotes) { len = strlen (config->quote); if ((len == 2) && (config->quote[1] == ' ')) { needquotes = strchr - (value, config->quote[0])?TRUE:FALSE; + (value, config->quote[0]) ? TRUE : FALSE; } } } @@ -238,11 +247,13 @@ string_needsquotes (const gchar *value, CsvConfig *config) } static GString * -add_string_to_csv (GString *line, const gchar *value, CsvConfig *config) +add_string_to_csv (GString *line, + const gchar *value, + CsvConfig *config) { /* Will add a string to the record and will check for the need for quotes */ - if ((value) && (strlen (value)>0)) { + if ((value) && (strlen (value) > 0)) { gboolean needquotes = string_needsquotes (value, config); if (needquotes) @@ -260,13 +271,13 @@ static gchar * userstring_to_systemstring (const gchar *userstring) { const gchar *text = userstring; - gint i=0, len = strlen (text); + gint i = 0, len = strlen (text); GString *str = g_string_new (""); gchar *retval = NULL; while (i < len) { if (text[i] == '\\') { - switch (text[i+1]) { + switch (text[i + 1]) { case 'n': str = g_string_append_c (str, '\n'); i++; @@ -365,7 +376,7 @@ do_save_calendar_csv (FormatHandler *handler, if (config->header) { - gint i=0; + gint i = 0; static const gchar *labels[] = { N_("UID"), @@ -388,8 +399,8 @@ do_save_calendar_csv (FormatHandler *handler, }; line = g_string_new (""); - for (i=0;i<G_N_ELEMENTS (labels);i++) { - if (i>0) + for (i = 0; i < G_N_ELEMENTS (labels); i++) { + if (i > 0) g_string_append (line, config->delimiter); g_string_append (line, _(labels[i])); } diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index 039fdd8d55..f323fed99a 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -37,7 +37,8 @@ #include "format-handler.h" static void -display_error_message (GtkWidget *parent, const gchar *message) +display_error_message (GtkWidget *parent, + const gchar *message) { GtkWidget *dialog; @@ -52,7 +53,8 @@ typedef struct { } CompTzData; static void -insert_tz_comps (icalparameter *param, gpointer cb_data) +insert_tz_comps (icalparameter *param, + gpointer cb_data) { const gchar *tzid; CompTzData *tdata = cb_data; @@ -76,13 +78,18 @@ insert_tz_comps (icalparameter *param, gpointer cb_data) } static void -append_tz_to_comp (gpointer key, gpointer value, icalcomponent *toplevel) +append_tz_to_comp (gpointer key, + gpointer value, + icalcomponent *toplevel) { icalcomponent_add_component (toplevel, (icalcomponent *) value); } static void -do_save_calendar_ical (FormatHandler *handler, ESourceSelector *selector, ECalClientSourceType type, gchar *dest_uri) +do_save_calendar_ical (FormatHandler *handler, + ESourceSelector *selector, + ECalClientSourceType type, + gchar *dest_uri) { ESource *primary_source; ECalClient *source_client; diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index 37a936c132..c93eb1fb59 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -41,8 +41,9 @@ #include "format-handler.h" -static void -add_string_to_rdf (xmlNodePtr node, const gchar *tag, const gchar *value); +static void add_string_to_rdf (xmlNodePtr node, + const gchar *tag, + const gchar *value); /* Use { */ @@ -79,7 +80,8 @@ enum { /* XML helper enum */ }; static void -display_error_message (GtkWidget *parent, GError *error) +display_error_message (GtkWidget *parent, + GError *error) { GtkWidget *dialog; @@ -91,7 +93,10 @@ display_error_message (GtkWidget *parent, GError *error) /* Some helpers for the xml stuff */ static void -add_list_to_rdf (xmlNodePtr node, const gchar *tag, GSList *list_in, gint type) +add_list_to_rdf (xmlNodePtr node, + const gchar *tag, + GSList *list_in, + gint type) { if (list_in) { GSList *list = list_in; @@ -101,10 +106,10 @@ add_list_to_rdf (xmlNodePtr node, const gchar *tag, GSList *list_in, gint type) switch (type) { case ECALCOMPONENTATTENDEE: - str = ((ECalComponentAttendee*) list->data)->value; + str = ((ECalComponentAttendee *) list->data)->value; break; case ECALCOMPONENTTEXT: - str = ((ECalComponentText*) list->data)->value; + str = ((ECalComponentText *) list->data)->value; break; case CONSTCHAR: default: @@ -120,7 +125,9 @@ add_list_to_rdf (xmlNodePtr node, const gchar *tag, GSList *list_in, gint type) } static void -add_nummeric_to_rdf (xmlNodePtr node, const gchar *tag, gint *nummeric) +add_nummeric_to_rdf (xmlNodePtr node, + const gchar *tag, + gint *nummeric) { if (nummeric) { gchar *value = g_strdup_printf ("%d", *nummeric); @@ -131,7 +138,9 @@ add_nummeric_to_rdf (xmlNodePtr node, const gchar *tag, gint *nummeric) } static void -add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time) +add_time_to_rdf (xmlNodePtr node, + const gchar *tag, + icaltimetype *time) { if (time) { xmlNodePtr cur_node = NULL; @@ -159,7 +168,9 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time) } static void -add_string_to_rdf (xmlNodePtr node, const gchar *tag, const gchar *value) +add_string_to_rdf (xmlNodePtr node, + const gchar *tag, + const gchar *value) { if (value) { xmlNodePtr cur_node = NULL; @@ -169,7 +180,10 @@ add_string_to_rdf (xmlNodePtr node, const gchar *tag, const gchar *value) } static void -do_save_calendar_rdf (FormatHandler *handler, ESourceSelector *selector, ECalClientSourceType type, gchar *dest_uri) +do_save_calendar_rdf (FormatHandler *handler, + ESourceSelector *selector, + ECalClientSourceType type, + gchar *dest_uri) { /* @@ -211,7 +225,7 @@ do_save_calendar_rdf (FormatHandler *handler, ESourceSelector *selector, ECalCli if (stream && e_cal_client_get_object_list_as_comps_sync (source_client, "#t", &objects, NULL, NULL)) { GSList *iter; - xmlBufferPtr buffer=xmlBufferCreate (); + xmlBufferPtr buffer = xmlBufferCreate (); xmlDocPtr doc = xmlNewDoc((xmlChar *) "1.0"); xmlNodePtr fnode; diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index a1a48be7cf..40ec512131 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -54,7 +54,8 @@ gboolean task_list_save_as_init (GtkUIManager *ui_manager, gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } @@ -67,14 +68,16 @@ enum { /* GtkComboBox enum */ }; static void -extra_widget_foreach_hide (GtkWidget *widget, gpointer data) +extra_widget_foreach_hide (GtkWidget *widget, + gpointer data) { if (widget != data) gtk_widget_hide (widget); } static void -on_type_combobox_changed (GtkComboBox *combobox, gpointer data) +on_type_combobox_changed (GtkComboBox *combobox, + gpointer data) { FormatHandler *handler = NULL; GtkWidget *extra_widget = data; @@ -99,7 +102,8 @@ on_type_combobox_changed (GtkComboBox *combobox, gpointer data) } static void -format_handlers_foreach_free (gpointer data, gpointer user_data) +format_handlers_foreach_free (gpointer data, + gpointer user_data) { FormatHandler *handler = data; @@ -113,7 +117,8 @@ format_handlers_foreach_free (gpointer data, gpointer user_data) } static void -ask_destination_and_save (ESourceSelector *selector, ECalClientSourceType type) +ask_destination_and_save (ESourceSelector *selector, + ECalClientSourceType type) { FormatHandler *handler = NULL; @@ -123,7 +128,7 @@ ask_destination_and_save (ESourceSelector *selector, ECalClientSourceType type) GtkComboBox *combo = GTK_COMBO_BOX (gtk_combo_box_new ()); GtkTreeModel *model = GTK_TREE_MODEL (gtk_list_store_new (N_DEST_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER)); - GtkCellRenderer *renderer=NULL; + GtkCellRenderer *renderer = NULL; GtkListStore *store = GTK_LIST_STORE (model); GtkTreeIter iter; GtkWidget *dialog = NULL; @@ -176,7 +181,8 @@ ask_destination_and_save (ESourceSelector *selector, ECalClientSourceType type) format_handlers = g_list_next (format_handlers); } - g_signal_connect (G_OBJECT(combo), "changed", + g_signal_connect ( + combo, "changed", G_CALLBACK (on_type_combobox_changed), extra_widget); g_object_set_data (G_OBJECT (combo), "format-box", hbox); @@ -229,11 +235,13 @@ ask_destination_and_save (ESourceSelector *selector, ECalClientSourceType type) } /* Returns output stream for the uri, or NULL on any error. - When done with the stream, just g_output_stream_close and g_object_unref it. - It will ask for overwrite if file already exists. + * When done with the stream, just g_output_stream_close and g_object_unref it. + * It will ask for overwrite if file already exists. */ GOutputStream * -open_for_writing (GtkWindow *parent, const gchar *uri, GError **error) +open_for_writing (GtkWindow *parent, + const gchar *uri, + GError **error) { GFile *file; GFileOutputStream *fostream; diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 71343e8536..f68cfc1b26 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -126,7 +126,8 @@ async_context_free (AsyncContext *context) } static void -selection_changed (GtkTreeSelection *selection, UIData *ui) +selection_changed (GtkTreeSelection *selection, + UIData *ui) { GtkTreeModel *model; GtkTreeIter iter; @@ -186,7 +187,10 @@ commit_changes (UIData *ui) } static void -clue_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, UIData *ui) +clue_check_isempty (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + UIData *ui) { GtkTreeSelection *selection; gchar *keyword = NULL; @@ -216,7 +220,10 @@ clue_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, U } static gboolean -clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, UIData *ui) +clue_foreach_check_isempty (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + UIData *ui) { gboolean valid; @@ -238,9 +245,9 @@ clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter static void key_cell_edited_callback (GtkCellRendererText *cell, - gchar *path_string, - gchar *new_text, - UIData *ui) + gchar *path_string, + gchar *new_text, + UIData *ui) { GtkTreeModel *model; GtkTreeIter iter; @@ -259,9 +266,9 @@ key_cell_edited_callback (GtkCellRendererText *cell, static void value_cell_edited_callback (GtkCellRendererText *cell, - gchar *path_string, - gchar *new_text, - UIData *ui) + gchar *path_string, + gchar *new_text, + UIData *ui) { GtkTreeModel *model; GtkTreeIter iter; @@ -280,7 +287,8 @@ value_cell_edited_callback (GtkCellRendererText *cell, } static void -clue_add_clicked (GtkButton *button, UIData *ui) +clue_add_clicked (GtkButton *button, + UIData *ui) { GtkTreeModel *model; GtkTreeIter iter; @@ -310,11 +318,14 @@ clue_add_clicked (GtkButton *button, UIData *ui) } /* We have done our job, connect back to the signal */ - g_signal_connect(G_OBJECT(model), "row-changed", G_CALLBACK(clue_check_isempty), ui); + g_signal_connect ( + model, "row-changed", + G_CALLBACK (clue_check_isempty), ui); } static void -clue_remove_clicked (GtkButton *button, UIData *ui) +clue_remove_clicked (GtkButton *button, + UIData *ui) { GtkTreeSelection *selection; GtkTreeModel *model; @@ -357,7 +368,8 @@ clue_remove_clicked (GtkButton *button, UIData *ui) } static void -clue_edit_clicked (GtkButton *button, UIData *ui) +clue_edit_clicked (GtkButton *button, + UIData *ui) { GtkTreeSelection *selection; GtkTreeModel *model; @@ -449,33 +461,43 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) renderer_key = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Keywords"), renderer_key, "text", CLUE_KEYWORD_COLUMN, NULL); - g_object_set (G_OBJECT (renderer_key), "editable", TRUE, NULL); - g_signal_connect(renderer_key, "edited", (GCallback) key_cell_edited_callback, ui); + g_object_set (renderer_key, "editable", TRUE, NULL); + g_signal_connect (renderer_key, "edited", (GCallback) key_cell_edited_callback, ui); renderer_value = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Values"), renderer_value, "text", CLUE_VALUE_COLUMN, NULL); - g_object_set (G_OBJECT (renderer_value), "editable", TRUE, NULL); - g_signal_connect(renderer_value, "edited", (GCallback) value_cell_edited_callback, ui); + g_object_set (renderer_value, "editable", TRUE, NULL); + g_signal_connect (renderer_value, "edited", (GCallback) value_cell_edited_callback, ui); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); - g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), ui); + g_signal_connect ( + selection, "changed", + G_CALLBACK (selection_changed), ui); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ui->treeview), TRUE); ui->clue_add = clue_add; - g_signal_connect (G_OBJECT (ui->clue_add), "clicked", G_CALLBACK (clue_add_clicked), ui); + g_signal_connect ( + ui->clue_add, "clicked", + G_CALLBACK (clue_add_clicked), ui); ui->clue_remove = clue_remove; - g_signal_connect (G_OBJECT (ui->clue_remove), "clicked", G_CALLBACK (clue_remove_clicked), ui); + g_signal_connect ( + ui->clue_remove, "clicked", + G_CALLBACK (clue_remove_clicked), ui); gtk_widget_set_sensitive (ui->clue_remove, FALSE); ui->clue_edit = clue_edit; - g_signal_connect (G_OBJECT (ui->clue_edit), "clicked", G_CALLBACK (clue_edit_clicked), ui); + g_signal_connect ( + ui->clue_edit, "clicked", + G_CALLBACK (clue_edit_clicked), ui); gtk_widget_set_sensitive (ui->clue_edit, FALSE); model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview)); - g_signal_connect(G_OBJECT(model), "row-changed", G_CALLBACK(clue_check_isempty), ui); + g_signal_connect ( + model, "row-changed", + G_CALLBACK (clue_check_isempty), ui); /* Populate tree view with values from gconf */ clue_list = gconf_client_get_list ( gconf, GCONF_KEY_TEMPLATE_PLACEHOLDERS, GCONF_VALUE_STRING, NULL ); @@ -506,7 +528,8 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) /* Case insensitive version of strstr */ static gchar * -strstr_nocase (const gchar * haystack, const gchar *needle) +strstr_nocase (const gchar *haystack, + const gchar *needle) { /* When _GNU_SOURCE is available, use the nonstandard extension of libc */ #ifdef _GNU_SOURCE @@ -528,7 +551,7 @@ strstr_nocase (const gchar * haystack, const gchar *needle) pos = strstr (l_haystack, l_needle); /* Get actual position of the needle in the haystack instead of l_haystack or - leave it NULL */ + * leave it NULL */ if (pos) pos = (gchar *)(haystack + (pos - l_haystack)); @@ -541,7 +564,9 @@ strstr_nocase (const gchar * haystack, const gchar *needle) /* Replaces $ORIG[variable] in given template by given replacement from the original message */ static void -replace_template_variable (GString *text, const gchar *variable, const gchar *replacement) +replace_template_variable (GString *text, + const gchar *variable, + const gchar *replacement) { const gchar *p, *next; GString *str; @@ -573,7 +598,9 @@ replace_template_variable (GString *text, const gchar *variable, const gchar *re } static void -replace_email_addresses (GString *template, CamelInternetAddress *internet_address, const gchar *variable) +replace_email_addresses (GString *template, + CamelInternetAddress *internet_address, + const gchar *variable) { gint address_index = 0; GString *emails = g_string_new (""); @@ -598,8 +625,9 @@ replace_email_addresses (GString *template, CamelInternetAddress *internet_addre g_string_free (emails, TRUE); } -static CamelMimePart* -fill_template (CamelMimeMessage *message, CamelMimePart *template) +static CamelMimePart * +fill_template (CamelMimeMessage *message, + CamelMimePart *template) { struct _camel_header_raw *header; CamelContentType *ct; @@ -666,7 +694,7 @@ fill_template (CamelMimeMessage *message, CamelMimePart *template) } /* Now manually replace the *subject* header. The header->value for subject header could be - base64 encoded, so let camel_mime_message to decode it for us if needed */ + * base64 encoded, so let camel_mime_message to decode it for us if needed */ replace_template_variable (template_body, "subject", camel_mime_message_get_subject (message)); /* Replace TO and FROM modifiers. */ @@ -783,7 +811,7 @@ create_new_message (CamelFolder *folder, dw = camel_medium_get_content (CAMEL_MEDIUM (template)); /* If template is a multipart, then try to use HTML. When no HTML part is available, use plaintext. Every other - add as an attachment */ + * add as an attachment */ if (CAMEL_IS_MULTIPART (dw)) { for (i = 0; i < camel_multipart_get_number (CAMEL_MULTIPART (dw)); i++) { CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (dw), i); @@ -815,14 +843,14 @@ create_new_message (CamelFolder *folder, out_part = fill_template (message, template_part); /* Assigning part directly to mime_message causes problem with "Content-type" header displaying - in the HTML message (camel parsing bug?) */ + * in the HTML message (camel parsing bug?) */ camel_multipart_add_part (new_multipart, out_part); g_object_unref (out_part); camel_medium_set_content (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (new_multipart)); /* Add the headers from the message we are replying to, so CC and that - stuff is preserved. Also replace any $ORIG[header-name] modifiers ignoring - 'content-*' headers */ + * stuff is preserved. Also replace any $ORIG[header-name] modifiers ignoring + * 'content-*' headers */ header = CAMEL_MIME_PART (message)->headers; while (header) { if (g_ascii_strncasecmp (header->name, "content-", 8) != 0) { @@ -1017,7 +1045,7 @@ build_template_menus_recurse (GtkUIManager *ui_manager, action_name, GTK_UI_MANAGER_MENU, FALSE); /* Disconnect previous connection to avoid possible multiple calls because - folder is a persistent structure */ + * folder is a persistent structure */ g_signal_handlers_disconnect_by_func (folder, G_CALLBACK (templates_folder_msg_changed_cb), shell_window); g_signal_connect (folder, "changed", G_CALLBACK (templates_folder_msg_changed_cb), shell_window); @@ -1172,7 +1200,7 @@ static GtkActionEntry composer_entries[] = { static void build_menu (EShellWindow *shell_window, - GtkActionGroup *action_group) + GtkActionGroup *action_group) { EShellView *shell_view; CamelFolder *folder; @@ -1210,7 +1238,8 @@ build_menu (EShellWindow *shell_window, } static void -update_actions_cb (EShellView *shell_view, GtkActionGroup *action_group) +update_actions_cb (EShellView *shell_view, + GtkActionGroup *action_group) { GList *list; gint length; @@ -1269,16 +1298,16 @@ rebuild_template_menu (EShellWindow *shell_window) static void templates_folder_msg_changed_cb (CamelFolder *folder, - CamelFolderChangeInfo *change_info, - EShellWindow *shell_window) + CamelFolderChangeInfo *change_info, + EShellWindow *shell_window) { rebuild_template_menu (shell_window); } static void templates_folder_changed_cb (CamelStore *store, - CamelFolderInfo *folder_info, - EShellWindow *shell_window) + CamelFolderInfo *folder_info, + EShellWindow *shell_window) { if (folder_info->full_name && strstr (folder_info->full_name, _("Templates")) != NULL) rebuild_template_menu (shell_window); @@ -1286,9 +1315,9 @@ templates_folder_changed_cb (CamelStore *store, static void templates_folder_renamed_cb (CamelStore *store, - const gchar *old_name, - CamelFolderInfo *folder_info, - EShellWindow *shell_window) + const gchar *old_name, + CamelFolderInfo *folder_info, + EShellWindow *shell_window) { if (folder_info->full_name && strstr (folder_info->full_name, _("Templates")) != NULL) rebuild_template_menu (shell_window); diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index 1e600ff405..5ef2f270b4 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -82,7 +82,8 @@ sanitize_filename (const gchar *filename) } void -org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t) +org_gnome_format_tnef (gpointer ep, + EMFormatHookTarget *t) { gchar *tmpdir, *name; CamelStream *out; @@ -100,7 +101,7 @@ org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t) name = g_build_filename(tmpdir, ".evo-attachment.tnef", NULL); - out = camel_stream_fs_new_with_name (name, O_RDWR|O_CREAT, 0666, NULL); + out = camel_stream_fs_new_with_name (name, O_RDWR | O_CREAT, 0666, NULL); if (out == NULL) goto fail; content = camel_medium_get_content ((CamelMedium *) t->part); @@ -210,7 +211,8 @@ org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t) gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { if (loaded) return 0; @@ -220,7 +222,10 @@ e_plugin_lib_enable (EPlugin *ep, gint enable) return 0; } -void processTnef (TNEFStruct *tnef, const gchar *tmpdir) { +void +processTnef (TNEFStruct *tnef, + const gchar *tmpdir) +{ variableLength *filename; variableLength *filedata; Attachment *p; @@ -229,7 +234,7 @@ void processTnef (TNEFStruct *tnef, const gchar *tmpdir) { gchar *ifilename = NULL; gchar *absfilename, *file; gint count; - gint foundCal=0; + gint foundCal = 0; FILE *fptr; @@ -237,55 +242,55 @@ void processTnef (TNEFStruct *tnef, const gchar *tmpdir) { /* ie: it's a Contact Card, Task, or Meeting request (vCal/vCard) */ if (tnef->messageClass[0] != 0) { if (strcmp(tnef->messageClass, "IPM.Contact") == 0) { - saveVCard (tnef, tmpdir); - } + saveVCard (tnef, tmpdir); + } if (strcmp(tnef->messageClass, "IPM.Task") == 0) { - saveVTask (tnef, tmpdir); - } + saveVTask (tnef, tmpdir); + } if (strcmp(tnef->messageClass, "IPM.Appointment") == 0) { - saveVCalendar (tnef, tmpdir); - foundCal = 1; - } + saveVCalendar (tnef, tmpdir); + foundCal = 1; + } } if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), - PROP_TAG (PT_STRING8,0x24))) != MAPI_UNDEFINED) { + PROP_TAG (PT_STRING8,0x24))) != MAPI_UNDEFINED) { if (strcmp(filename->data, "IPM.Appointment") == 0) { /* If it's "indicated" twice, we don't want to save 2 calendar entries. */ - if (foundCal == 0) { - saveVCalendar (tnef, tmpdir); - } - } + if (foundCal == 0) { + saveVCalendar (tnef, tmpdir); + } + } } if (strcmp(tnef->messageClass, "IPM.Microsoft Mail.Note") == 0) { - if ((saveRTF == 1) && (tnef->subject.size > 0)) { + if ((saveRTF == 1) && (tnef->subject.size > 0)) { /* Description */ - if ((filename=MAPIFindProperty (&(tnef->MapiProperties), + if ((filename = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_BINARY, PR_RTF_COMPRESSED))) - != MAPI_UNDEFINED) { - variableLength buf; - if ((buf.data = (gchar *) DecompressRTF (filename, &buf.size)) != NULL) { - file = sanitize_filename (tnef->subject.data); + != MAPI_UNDEFINED) { + variableLength buf; + if ((buf.data = (gchar *) DecompressRTF (filename, &buf.size)) != NULL) { + file = sanitize_filename (tnef->subject.data); if (!file) return; absfilename = g_strconcat (file, ".rtf", NULL); - ifilename = g_build_filename (tmpdir, file, NULL); + ifilename = g_build_filename (tmpdir, file, NULL); g_free (absfilename); g_free (file); if ((fptr = fopen(ifilename, "wb"))==NULL) { printf("ERROR: Error writing file to disk!"); - } else { - fwrite (buf.data, - sizeof (BYTE), - buf.size, - fptr); - fclose (fptr); - } - free (buf.data); - } - } + } else { + fwrite (buf.data, + sizeof (BYTE), + buf.size, + fptr); + fclose (fptr); + } + free (buf.data); + } + } } } @@ -293,82 +298,82 @@ void processTnef (TNEFStruct *tnef, const gchar *tmpdir) { p = tnef->starting_attach.next; count = 0; while (p != NULL) { - count++; + count++; /* Make sure it has a size. */ - if (p->FileData.size > 0) { - object = 1; + if (p->FileData.size > 0) { + object = 1; /* See if the contents are stored as "attached data" */ /* Inside the MAPI blocks. */ - if ((filedata = MAPIFindProperty (&(p->MAPI), - PROP_TAG (PT_OBJECT, PR_ATTACH_DATA_OBJ))) - == MAPI_UNDEFINED) { - if ((filedata = MAPIFindProperty (&(p->MAPI), - PROP_TAG (PT_BINARY, PR_ATTACH_DATA_OBJ))) + if ((filedata = MAPIFindProperty (&(p->MAPI), + PROP_TAG (PT_OBJECT, PR_ATTACH_DATA_OBJ))) + == MAPI_UNDEFINED) { + if ((filedata = MAPIFindProperty (&(p->MAPI), + PROP_TAG (PT_BINARY, PR_ATTACH_DATA_OBJ))) == MAPI_UNDEFINED) { /* Nope, standard TNEF stuff. */ - filedata = &(p->FileData); - object = 0; - } - } + filedata = &(p->FileData); + object = 0; + } + } /* See if this is an embedded TNEF stream. */ - RealAttachment = 1; - if (object == 1) { + RealAttachment = 1; + if (object == 1) { /* This is an "embedded object", so skip the */ /* 16-byte identifier first. */ - TNEFStruct emb_tnef; - DWORD signature; - memcpy (&signature, filedata->data+16, sizeof (DWORD)); - if (TNEFCheckForSignature (signature) == 0) { + TNEFStruct emb_tnef; + DWORD signature; + memcpy (&signature, filedata->data + 16, sizeof (DWORD)); + if (TNEFCheckForSignature (signature) == 0) { /* Has a TNEF signature, so process it. */ - TNEFInitialize (&emb_tnef); - emb_tnef.Debug = tnef->Debug; - if (TNEFParseMemory ((guchar *) filedata->data+16, - filedata->size-16, &emb_tnef) != -1) { - processTnef (&emb_tnef, tmpdir); - RealAttachment = 0; - } - TNEFFree (&emb_tnef); - } - } else { - TNEFStruct emb_tnef; - DWORD signature; - memcpy (&signature, filedata->data, sizeof (DWORD)); - if (TNEFCheckForSignature (signature) == 0) { + TNEFInitialize (&emb_tnef); + emb_tnef.Debug = tnef->Debug; + if (TNEFParseMemory ((guchar *) filedata->data + 16, + filedata->size - 16, &emb_tnef) != -1) { + processTnef (&emb_tnef, tmpdir); + RealAttachment = 0; + } + TNEFFree (&emb_tnef); + } + } else { + TNEFStruct emb_tnef; + DWORD signature; + memcpy (&signature, filedata->data, sizeof (DWORD)); + if (TNEFCheckForSignature (signature) == 0) { /* Has a TNEF signature, so process it. */ - TNEFInitialize (&emb_tnef); - emb_tnef.Debug = tnef->Debug; - if (TNEFParseMemory ((guchar *) filedata->data, - filedata->size, &emb_tnef) != -1) { - processTnef (&emb_tnef, tmpdir); - RealAttachment = 0; - } - TNEFFree (&emb_tnef); - } - } - if ((RealAttachment == 1) || (saveintermediate == 1)) { + TNEFInitialize (&emb_tnef); + emb_tnef.Debug = tnef->Debug; + if (TNEFParseMemory ((guchar *) filedata->data, + filedata->size, &emb_tnef) != -1) { + processTnef (&emb_tnef, tmpdir); + RealAttachment = 0; + } + TNEFFree (&emb_tnef); + } + } + if ((RealAttachment == 1) || (saveintermediate == 1)) { gchar tmpname[20]; /* Ok, it's not an embedded stream, so now we */ /* process it. */ - if ((filename = MAPIFindProperty (&(p->MAPI), - PROP_TAG (PT_STRING8, PR_ATTACH_LONG_FILENAME))) - == MAPI_UNDEFINED) { - if ((filename = MAPIFindProperty (&(p->MAPI), - PROP_TAG (PT_STRING8, PR_DISPLAY_NAME))) - == MAPI_UNDEFINED) { - filename = &(p->Title); - } - } - if (filename->size == 1) { - filename->size = 20; + if ((filename = MAPIFindProperty (&(p->MAPI), + PROP_TAG (PT_STRING8, PR_ATTACH_LONG_FILENAME))) + == MAPI_UNDEFINED) { + if ((filename = MAPIFindProperty (&(p->MAPI), + PROP_TAG (PT_STRING8, PR_DISPLAY_NAME))) + == MAPI_UNDEFINED) { + filename = &(p->Title); + } + } + if (filename->size == 1) { + filename->size = 20; g_sprintf(tmpname, "file_%03i.dat", count); - filename->data = tmpname; - } - absfilename = sanitize_filename (filename->data); + filename->data = tmpname; + } + absfilename = sanitize_filename (filename->data); if (!absfilename) return; ifilename = g_build_filename (tmpdir, absfilename, NULL); - g_free (absfilename); + g_free (absfilename); if ((fptr = fopen(ifilename, "wb"))==NULL) { printf("ERROR: Error writing file to disk!"); @@ -386,16 +391,19 @@ void processTnef (TNEFStruct *tnef, const gchar *tmpdir) { } fclose (fptr); } - } - } /* if size>0 */ - p=p->next; + } + } /* if size>0 */ + p = p->next; } /* while p!= null */ g_free (ifilename); } -void saveVCard (TNEFStruct *tnef, const gchar *tmpdir) { +void +saveVCard (TNEFStruct *tnef, + const gchar *tmpdir) +{ gchar *ifilename; - gchar *absfilename, *file=NULL; + gchar *absfilename, *file = NULL; FILE *fptr; variableLength *vl; variableLength *pobox, *street, *city, *state, *zip, *country; @@ -403,22 +411,22 @@ void saveVCard (TNEFStruct *tnef, const gchar *tmpdir) { gint boolean; if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_DISPLAY_NAME))) == MAPI_UNDEFINED) { - if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COMPANY_NAME))) == MAPI_UNDEFINED) { - if (tnef->subject.size > 0) { + if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COMPANY_NAME))) == MAPI_UNDEFINED) { + if (tnef->subject.size > 0) { file = sanitize_filename (tnef->subject.data); if (!file) return; absfilename = g_strconcat (file, ".vcard", NULL); - } else + } else absfilename = g_strdup ("unknown.vcard"); } else { - file = sanitize_filename (vl->data); + file = sanitize_filename (vl->data); if (!file) return; absfilename = g_strconcat (file, ".vcard", NULL); - } + } } else { - file = sanitize_filename (vl->data); + file = sanitize_filename (vl->data); if (!file) return; absfilename = g_strconcat (file, ".vcard", NULL); @@ -433,9 +441,9 @@ void saveVCard (TNEFStruct *tnef, const gchar *tmpdir) { } else { fprintf(fptr, "BEGIN:VCARD\n"); fprintf(fptr, "VERSION:2.1\n"); - if (vl != MAPI_UNDEFINED) { + if (vl != MAPI_UNDEFINED) { fprintf(fptr, "FN:%s\n", vl->data); - } + } fprintProperty(tnef, fptr, PT_STRING8, PR_NICKNAME, "NICKNAME:%s\n"); fprintUserProp(tnef, fptr, PT_STRING8, 0x8554, "MAILER:Microsoft Outlook %s\n"); fprintProperty(tnef, fptr, PT_STRING8, PR_SPOUSE_NAME, "X-EVOLUTION-SPOUSE:%s\n"); @@ -443,182 +451,182 @@ void saveVCard (TNEFStruct *tnef, const gchar *tmpdir) { fprintProperty(tnef, fptr, PT_STRING8, PR_ASSISTANT, "X-EVOLUTION-ASSISTANT:%s\n"); /* Organizational */ - if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COMPANY_NAME))) != MAPI_UNDEFINED) { - if (vl->size > 0) { - if ((vl->size == 1) && (vl->data[0] == 0)) { - } else { + if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COMPANY_NAME))) != MAPI_UNDEFINED) { + if (vl->size > 0) { + if ((vl->size == 1) && (vl->data[0] == 0)) { + } else { fprintf(fptr,"ORG:%s", vl->data); - if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_DEPARTMENT_NAME))) != MAPI_UNDEFINED) { + if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_DEPARTMENT_NAME))) != MAPI_UNDEFINED) { fprintf(fptr,";%s", vl->data); - } + } fprintf(fptr, "\n"); - } - } - } + } + } + } fprintProperty(tnef, fptr, PT_STRING8, PR_OFFICE_LOCATION, "X-EVOLUTION-OFFICE:%s\n"); fprintProperty(tnef, fptr, PT_STRING8, PR_TITLE, "TITLE:%s\n"); fprintProperty(tnef, fptr, PT_STRING8, PR_PROFESSION, "ROLE:%s\n"); fprintProperty(tnef, fptr, PT_STRING8, PR_BODY, "NOTE:%s\n"); - if (tnef->body.size > 0) { + if (tnef->body.size > 0) { fprintf(fptr, "NOTE;QUOTED-PRINTABLE:"); - quotedfprint (fptr, &(tnef->body)); + quotedfprint (fptr, &(tnef->body)); fprintf(fptr,"\n"); - } + } /* Business Address */ - boolean = 0; - if ((pobox = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((street = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_STREET_ADDRESS))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((city = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_LOCALITY))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((state = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_STATE_OR_PROVINCE))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((zip = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_POSTAL_CODE))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((country = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COUNTRY))) != MAPI_UNDEFINED) { - boolean = 1; - } - if (boolean == 1) { + boolean = 0; + if ((pobox = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((street = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_STREET_ADDRESS))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((city = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_LOCALITY))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((state = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_STATE_OR_PROVINCE))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((zip = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_POSTAL_CODE))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((country = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COUNTRY))) != MAPI_UNDEFINED) { + boolean = 1; + } + if (boolean == 1) { fprintf(fptr, "ADR;QUOTED-PRINTABLE;WORK:"); - if (pobox != MAPI_UNDEFINED) { - quotedfprint (fptr, pobox); - } + if (pobox != MAPI_UNDEFINED) { + quotedfprint (fptr, pobox); + } fprintf(fptr, ";;"); - if (street != MAPI_UNDEFINED) { - quotedfprint (fptr, street); - } + if (street != MAPI_UNDEFINED) { + quotedfprint (fptr, street); + } fprintf(fptr, ";"); - if (city != MAPI_UNDEFINED) { - quotedfprint (fptr, city); - } + if (city != MAPI_UNDEFINED) { + quotedfprint (fptr, city); + } fprintf(fptr, ";"); - if (state != MAPI_UNDEFINED) { - quotedfprint (fptr, state); - } + if (state != MAPI_UNDEFINED) { + quotedfprint (fptr, state); + } fprintf(fptr, ";"); - if (zip != MAPI_UNDEFINED) { - quotedfprint (fptr, zip); - } + if (zip != MAPI_UNDEFINED) { + quotedfprint (fptr, zip); + } fprintf(fptr, ";"); - if (country != MAPI_UNDEFINED) { - quotedfprint (fptr, country); - } + if (country != MAPI_UNDEFINED) { + quotedfprint (fptr, country); + } fprintf(fptr,"\n"); - if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x801b))) != MAPI_UNDEFINED) { + if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x801b))) != MAPI_UNDEFINED) { fprintf(fptr, "LABEL;QUOTED-PRINTABLE;WORK:"); - quotedfprint (fptr, vl); + quotedfprint (fptr, vl); fprintf(fptr,"\n"); - } - } + } + } /* Home Address */ - boolean = 0; - if ((pobox = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((street = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_STREET))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((city = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_CITY))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((state = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_STATE_OR_PROVINCE))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((zip = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_POSTAL_CODE))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((country = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_COUNTRY))) != MAPI_UNDEFINED) { - boolean = 1; - } - if (boolean == 1) { + boolean = 0; + if ((pobox = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((street = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_STREET))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((city = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_CITY))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((state = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_STATE_OR_PROVINCE))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((zip = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_POSTAL_CODE))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((country = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_COUNTRY))) != MAPI_UNDEFINED) { + boolean = 1; + } + if (boolean == 1) { fprintf(fptr, "ADR;QUOTED-PRINTABLE;HOME:"); - if (pobox != MAPI_UNDEFINED) { - quotedfprint (fptr, pobox); - } + if (pobox != MAPI_UNDEFINED) { + quotedfprint (fptr, pobox); + } fprintf(fptr, ";;"); - if (street != MAPI_UNDEFINED) { - quotedfprint (fptr, street); - } + if (street != MAPI_UNDEFINED) { + quotedfprint (fptr, street); + } fprintf(fptr, ";"); - if (city != MAPI_UNDEFINED) { - quotedfprint (fptr, city); - } + if (city != MAPI_UNDEFINED) { + quotedfprint (fptr, city); + } fprintf(fptr, ";"); - if (state != MAPI_UNDEFINED) { - quotedfprint (fptr, state); - } + if (state != MAPI_UNDEFINED) { + quotedfprint (fptr, state); + } fprintf(fptr, ";"); - if (zip != MAPI_UNDEFINED) { - quotedfprint (fptr, zip); - } + if (zip != MAPI_UNDEFINED) { + quotedfprint (fptr, zip); + } fprintf(fptr, ";"); - if (country != MAPI_UNDEFINED) { - quotedfprint (fptr, country); - } + if (country != MAPI_UNDEFINED) { + quotedfprint (fptr, country); + } fprintf(fptr,"\n"); - if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x801a))) != MAPI_UNDEFINED) { + if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x801a))) != MAPI_UNDEFINED) { fprintf(fptr, "LABEL;QUOTED-PRINTABLE;WORK:"); - quotedfprint (fptr, vl); + quotedfprint (fptr, vl); fprintf(fptr,"\n"); - } - } + } + } /* Other Address */ - boolean = 0; - if ((pobox = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((street = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_STREET))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((city = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_CITY))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((state = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_STATE_OR_PROVINCE))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((zip = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_POSTAL_CODE))) != MAPI_UNDEFINED) { - boolean = 1; - } - if ((country = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_COUNTRY))) != MAPI_UNDEFINED) { - boolean = 1; - } - if (boolean == 1) { + boolean = 0; + if ((pobox = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((street = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_STREET))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((city = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_CITY))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((state = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_STATE_OR_PROVINCE))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((zip = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_POSTAL_CODE))) != MAPI_UNDEFINED) { + boolean = 1; + } + if ((country = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_COUNTRY))) != MAPI_UNDEFINED) { + boolean = 1; + } + if (boolean == 1) { fprintf(fptr, "ADR;QUOTED-PRINTABLE;OTHER:"); - if (pobox != MAPI_UNDEFINED) { - quotedfprint (fptr, pobox); - } + if (pobox != MAPI_UNDEFINED) { + quotedfprint (fptr, pobox); + } fprintf(fptr, ";;"); - if (street != MAPI_UNDEFINED) { - quotedfprint (fptr, street); - } + if (street != MAPI_UNDEFINED) { + quotedfprint (fptr, street); + } fprintf(fptr, ";"); - if (city != MAPI_UNDEFINED) { - quotedfprint (fptr, city); - } + if (city != MAPI_UNDEFINED) { + quotedfprint (fptr, city); + } fprintf(fptr, ";"); - if (state != MAPI_UNDEFINED) { - quotedfprint (fptr, state); - } + if (state != MAPI_UNDEFINED) { + quotedfprint (fptr, state); + } fprintf(fptr, ";"); - if (zip != MAPI_UNDEFINED) { - quotedfprint (fptr, zip); - } + if (zip != MAPI_UNDEFINED) { + quotedfprint (fptr, zip); + } fprintf(fptr, ";"); - if (country != MAPI_UNDEFINED) { - quotedfprint (fptr, country); - } + if (country != MAPI_UNDEFINED) { + quotedfprint (fptr, country); + } fprintf(fptr,"\n"); - } + } fprintProperty(tnef, fptr, PT_STRING8, PR_CALLBACK_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-CALLBACK:%s\n"); fprintProperty(tnef, fptr, PT_STRING8, PR_PRIMARY_TELEPHONE_NUMBER, "TEL;PREF:%s\n"); @@ -641,46 +649,46 @@ void saveVCard (TNEFStruct *tnef, const gchar *tmpdir) { fprintProperty(tnef, fptr, PT_STRING8, PR_HOME_FAX_NUMBER, "TEL;HOME;FAX:%s\n"); /* Email addresses */ - if ((vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8083))) == MAPI_UNDEFINED) { - vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8084)); - } - if (vl != MAPI_UNDEFINED) { - if (vl->size > 0) + if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8083))) == MAPI_UNDEFINED) { + vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8084)); + } + if (vl != MAPI_UNDEFINED) { + if (vl->size > 0) fprintf(fptr, "EMAIL:%s\n", vl->data); - } - if ((vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8093))) == MAPI_UNDEFINED) { - vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8094)); - } - if (vl != MAPI_UNDEFINED) { - if (vl->size > 0) + } + if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8093))) == MAPI_UNDEFINED) { + vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8094)); + } + if (vl != MAPI_UNDEFINED) { + if (vl->size > 0) fprintf(fptr, "EMAIL:%s\n", vl->data); - } - if ((vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x80a3))) == MAPI_UNDEFINED) { - vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x80a4)); - } - if (vl != MAPI_UNDEFINED) { - if (vl->size > 0) + } + if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x80a3))) == MAPI_UNDEFINED) { + vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x80a4)); + } + if (vl != MAPI_UNDEFINED) { + if (vl->size > 0) fprintf(fptr, "EMAIL:%s\n", vl->data); - } + } fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_HOME_PAGE, "URL:%s\n"); fprintUserProp(tnef, fptr, PT_STRING8, 0x80d8, "FBURL:%s\n"); /* Birthday */ - if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, PR_BIRTHDAY))) != MAPI_UNDEFINED) { + if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, PR_BIRTHDAY))) != MAPI_UNDEFINED) { fprintf(fptr, "BDAY:"); - MAPISysTimetoDTR ((guchar *) vl->data, &thedate); + MAPISysTimetoDTR ((guchar *) vl->data, &thedate); fprintf(fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay); - } + } /* Anniversary */ - if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, PR_WEDDING_ANNIVERSARY))) != MAPI_UNDEFINED) { + if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, PR_WEDDING_ANNIVERSARY))) != MAPI_UNDEFINED) { fprintf(fptr, "X-EVOLUTION-ANNIVERSARY:"); - MAPISysTimetoDTR ((guchar *) vl->data, &thedate); + MAPISysTimetoDTR ((guchar *) vl->data, &thedate); fprintf(fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay); - } + } fprintf(fptr, "END:VCARD\n"); - fclose (fptr); + fclose (fptr); } g_free (ifilename); } @@ -808,7 +816,7 @@ void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) if (recur_data[0x16] == 0x23 || recur_data[0x16] == 0x22 || recur_data[0x16] == 0x21) { - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_I2, 0x0011))) != MAPI_UNDEFINED) { fprintf(fptr, ";INTERVAL=%d", *(filename->data)); } @@ -884,8 +892,8 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { } else { fprintf(fptr, "BEGIN:VCALENDAR\n"); if (tnef->messageClass[0] != 0) { - charptr2=tnef->messageClass; - charptr=charptr2; + charptr2 = tnef->messageClass; + charptr = charptr2; while (*charptr != 0) { if (*charptr == '.') { charptr2 = charptr; @@ -904,23 +912,23 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { fprintf(fptr, "BEGIN:VEVENT\n"); /* UID - After alot of comparisons, I'm reasonably sure this is totally - wrong. But it's not really necessary. */ + * After alot of comparisons, I'm reasonably sure this is totally + * wrong. But it's not really necessary. */ /* I think it only exists to connect future modification entries to - this entry. so as long as it's incorrectly interpreted the same way - every time, it should be ok :) */ + * this entry. so as long as it's incorrectly interpreted the same way + * every time, it should be ok :) */ filename = NULL; - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_BINARY, 0x3))) == MAPI_UNDEFINED) { - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_BINARY, 0x23))) == MAPI_UNDEFINED) { filename = NULL; } } - if (filename!=NULL) { + if (filename != NULL) { fprintf(fptr, "UID:"); - for (index=0;index<filename->size;index++) { + for (index = 0; index < filename->size; index++) { fprintf(fptr,"%02X", (guchar)filename->data[index]); } fprintf(fptr,"\n"); @@ -928,12 +936,12 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { /* Sequence */ filename = NULL; - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_LONG, 0x8201))) != MAPI_UNDEFINED) { - dword_ptr = (DWORD*) filename->data; + dword_ptr = (DWORD *) filename->data; fprintf(fptr, "SEQUENCE:%i\n", (gint) *dword_ptr); } - if ((filename=MAPIFindProperty (&(tnef->MapiProperties), + if ((filename = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_BINARY, PR_SENDER_SEARCH_KEY))) != MAPI_UNDEFINED) { charptr = filename->data; @@ -952,7 +960,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { /* We have a list of required participants, so write them out. */ if (filename->size > 1) { - charptr = filename->data-1; + charptr = filename->data - 1; while (charptr != NULL) { charptr++; charptr2 = strstr(charptr, ";"); @@ -973,7 +981,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { PROP_TAG (PT_STRING8, 0x823c))) != MAPI_UNDEFINED) { /* The list of optional participants */ if (filename->size > 1) { - charptr = filename->data-1; + charptr = filename->data - 1; while (charptr != NULL) { charptr++; charptr2 = strstr(charptr, ";"); @@ -993,7 +1001,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { } else if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8238))) != MAPI_UNDEFINED) { if (filename->size > 1) { - charptr = filename->data-1; + charptr = filename->data - 1; while (charptr != NULL) { charptr++; charptr2 = strstr(charptr, ";"); @@ -1013,7 +1021,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { } /* Summary */ filename = NULL; - if ((filename=MAPIFindProperty (&(tnef->MapiProperties), + if ((filename = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_CONVERSATION_TOPIC))) != MAPI_UNDEFINED) { fprintf(fptr, "SUMMARY:"); @@ -1022,7 +1030,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { } /* Description */ - if ((filename=MAPIFindProperty (&(tnef->MapiProperties), + if ((filename = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_BINARY, PR_RTF_COMPRESSED))) != MAPI_UNDEFINED) { variableLength buf; @@ -1036,9 +1044,9 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { /* Location */ filename = NULL; - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x0002))) == MAPI_UNDEFINED) { - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8208))) == MAPI_UNDEFINED) { filename = NULL; } @@ -1048,11 +1056,11 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { } /* Date Start */ filename = NULL; - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, 0x820d))) == MAPI_UNDEFINED) { - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, 0x8516))) == MAPI_UNDEFINED) { - filename=NULL; + filename = NULL; } } if (filename != NULL) { @@ -1064,11 +1072,11 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { } /* Date End */ filename = NULL; - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, 0x820e))) == MAPI_UNDEFINED) { - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, 0x8517))) == MAPI_UNDEFINED) { - filename=NULL; + filename = NULL; } } if (filename != NULL) { @@ -1080,7 +1088,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { } /* Date Stamp */ filename = NULL; - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, 0x8202))) != MAPI_UNDEFINED) { fprintf(fptr, "CREATED:"); MAPISysTimetoDTR ((guchar *) filename->data, &thedate); @@ -1090,9 +1098,9 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { } /* Class */ filename = NULL; - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_BOOLEAN, 0x8506))) != MAPI_UNDEFINED) { - dword_ptr = (DWORD*) filename->data; + dword_ptr = (DWORD *) filename->data; fprintf(fptr, "CLASS:" ); if (*dword_ptr == 1) { fprintf(fptr,"PRIVATE\n"); @@ -1102,7 +1110,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { } /* Recurrence */ filename = NULL; - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_BINARY, 0x8216))) != MAPI_UNDEFINED) { printRrule (fptr, filename->data, filename->size, tnef); } @@ -1168,7 +1176,7 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) { filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x811f)); } if ((filename != MAPI_UNDEFINED) && (filename->size > 1)) { - charptr = filename->data-1; + charptr = filename->data - 1; while (charptr != NULL) { charptr++; charptr2 = strstr(charptr, ";"); @@ -1226,7 +1234,7 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) { filename = MAPIFindUserProp (&(tnef->MapiProperties), \ PROP_TAG (PT_BOOLEAN, 0x8506)); if (filename != MAPI_UNDEFINED) { - dword_ptr = (DWORD*) filename->data; + dword_ptr = (DWORD *) filename->data; fprintf(fptr, "CLASS:" ); if (*dword_ptr == 1) { fprintf(fptr,"PRIVATE\n"); @@ -1243,7 +1251,7 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) { void fprintProperty (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]) { variableLength *vl; - if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (proptype, propid))) != MAPI_UNDEFINED) { + if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (proptype, propid))) != MAPI_UNDEFINED) { if (vl->size > 0) { if ((vl->size == 1) && (vl->data[0] == 0)) { } else { @@ -1255,7 +1263,7 @@ void fprintProperty (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, void fprintUserProp (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]) { variableLength *vl; - if ((vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (proptype, propid))) != MAPI_UNDEFINED) { + if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (proptype, propid))) != MAPI_UNDEFINED) { if (vl->size > 0) { if ((vl->size == 1) && (vl->data[0] == 0)) { } else { @@ -1268,7 +1276,7 @@ void fprintUserProp (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, void quotedfprint (FILE *fptr, variableLength *vl) { gint index; - for (index=0;index<vl->size-1; index++) { + for (index = 0; index < vl->size - 1; index++) { if (vl->data[index] == '\n') { fprintf(fptr, "=0A"); } else if (vl->data[index] == '\r') { @@ -1281,7 +1289,7 @@ void quotedfprint (FILE *fptr, variableLength *vl) { void cstylefprint (FILE *fptr, variableLength *vl) { gint index; - for (index=0;index<vl->size-1; index++) { + for (index = 0; index < vl->size - 1; index++) { if (vl->data[index] == '\n') { fprintf(fptr, "\\n"); } else if (vl->data[index] == '\r') { @@ -1307,7 +1315,7 @@ void printRtf (FILE *fptr, variableLength *vl) { key = 0; brace_ct = 0; - for (index = 0, byte=vl->data; index < vl->size; index++, byte++) { + for (index = 0, byte = vl->data; index < vl->size; index++, byte++) { if (*byte == '}') { brace_ct--; key = 0; diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index 24e551afe9..1b72958712 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -54,7 +54,8 @@ void org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target); gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } @@ -161,7 +162,7 @@ org_gnome_vcard_inline_save_cb (VCardInlinePObject *vcard_object) { ESource *source; GSList *contact_list; - GtkWidget*dialog; + GtkWidget *dialog; g_return_if_fail (vcard_object->source_list != NULL); @@ -315,7 +316,8 @@ org_gnome_vcard_inline_embed (EMFormatHTML *format, } void -org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target) +org_gnome_vcard_inline_format (gpointer ep, + EMFormatHookTarget *target) { VCardInlinePObject *vcard_object; gchar *classid; diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c index ed716d3e89..a71eac36f1 100644 --- a/plugins/webdav-account-setup/webdav-contacts-source.c +++ b/plugins/webdav-account-setup/webdav-contacts-source.c @@ -47,11 +47,12 @@ typedef struct { GtkToggleButton *avoid_ifmatch_toggle; } ui_data; -GtkWidget * -plugin_webdav_contacts (EPlugin *epl, EConfigHookItemFactoryData *data); +GtkWidget * plugin_webdav_contacts (EPlugin *epl, + EConfigHookItemFactoryData *data); gint -e_plugin_lib_enable (EPlugin *ep, gint enable); +e_plugin_lib_enable (EPlugin *ep, + gint enable); static void ensure_webdav_contacts_source_group (void) @@ -204,7 +205,8 @@ destroy_ui_data (gpointer data) } GtkWidget * -plugin_webdav_contacts (EPlugin *epl, EConfigHookItemFactoryData *data) +plugin_webdav_contacts (EPlugin *epl, + EConfigHookItemFactoryData *data) { EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; ESource *source; @@ -298,7 +300,8 @@ plugin_webdav_contacts (EPlugin *epl, EConfigHookItemFactoryData *data) } gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { if (enable) { ensure_webdav_contacts_source_group (); |