diff options
Diffstat (limited to 'modules')
27 files changed, 381 insertions, 257 deletions
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c index a41651459a..f075372540 100644 --- a/modules/addressbook/addressbook-config.c +++ b/modules/addressbook/addressbook-config.c @@ -215,7 +215,12 @@ ldap_get_ssl_tooltip (AddressbookLDAPSSLType ssl_type) } static gboolean -source_to_uri_parts (ESource *source, gchar **host, gchar **rootdn, AddressbookLDAPScopeType *scope, gchar **search_filter, gint *port) +source_to_uri_parts (ESource *source, + gchar **host, + gchar **rootdn, + AddressbookLDAPScopeType *scope, + gchar **search_filter, + gint *port) { gchar *uri; LDAPURLDesc *lud; @@ -256,7 +261,8 @@ source_group_is_remote (ESourceGroup *group) /* ldap api foo */ static LDAP * -addressbook_ldap_init (GtkWidget *window, ESource *source) +addressbook_ldap_init (GtkWidget *window, + ESource *source) { LDAP *ldap; gchar *host; @@ -284,7 +290,8 @@ addressbook_ldap_init (GtkWidget *window, ESource *source) } static gint -addressbook_ldap_auth (GtkWidget *window, LDAP *ldap) +addressbook_ldap_auth (GtkWidget *window, + LDAP *ldap) { gint ldap_error; @@ -297,8 +304,10 @@ addressbook_ldap_auth (GtkWidget *window, LDAP *ldap) } static gint -addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap, - const gchar **attrs, LDAPMessage **resp) +addressbook_root_dse_query (AddressbookSourceDialog *dialog, + LDAP *ldap, + const gchar **attrs, + LDAPMessage **resp) { GtkAdjustment *adjustment; GtkRange *range; @@ -322,7 +331,9 @@ addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap, } static gboolean -do_ldap_root_dse_query (AddressbookSourceDialog *sdialog, GtkListStore *model, ESource *source) +do_ldap_root_dse_query (AddressbookSourceDialog *sdialog, + GtkListStore *model, + ESource *source) { LDAP *ldap; const gchar *attrs[2]; @@ -369,7 +380,8 @@ do_ldap_root_dse_query (AddressbookSourceDialog *sdialog, GtkListStore *model, E } static void -search_base_selection_model_changed (GtkTreeSelection *selection, GtkWidget *dialog) +search_base_selection_model_changed (GtkTreeSelection *selection, + GtkWidget *dialog) { gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, @@ -377,7 +389,8 @@ search_base_selection_model_changed (GtkTreeSelection *selection, GtkWidget *dia } static void -query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog) +query_for_supported_bases (GtkWidget *button, + AddressbookSourceDialog *sdialog) { GtkTreeSelection *selection; GtkTreeModel *model; @@ -427,7 +440,7 @@ query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog) #endif /* HAVE_LDAP */ -GtkWidget* +GtkWidget * addressbook_config_create_new_source (GtkWidget *parent) { return addressbook_config_edit_source (parent, NULL); @@ -436,7 +449,8 @@ addressbook_config_create_new_source (GtkWidget *parent) /* ********************************************************************** */ static void -eabc_type_changed (GtkComboBox *dropdown, AddressbookSourceDialog *sdialog) +eabc_type_changed (GtkComboBox *dropdown, + AddressbookSourceDialog *sdialog) { gint id = gtk_combo_box_get_active (dropdown); GtkTreeModel *model; @@ -454,7 +468,7 @@ eabc_type_changed (GtkComboBox *dropdown, AddressbookSourceDialog *sdialog) e_source_set_group (sdialog->source, sdialog->source_group); /* BIG HACK: We load the defaults for each type here. - I guess plugins will have to use the do it in their factory callbacks */ + * I guess plugins will have to use the do it in their factory callbacks */ if (!strncmp(e_source_group_peek_base_uri(sdialog->source_group), "groupwise:", 10)) { GSList *l; ESource *source; @@ -520,7 +534,7 @@ eabc_general_type (EConfig *ec, cell = gtk_cell_renderer_text_new (); store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER); i = 0; - for (l=sdialog->menu_source_groups;l;l=g_slist_next (l)) { + for (l = sdialog->menu_source_groups; l; l = g_slist_next (l)) { ESourceGroup *group = l->data; gtk_list_store_append (store, &iter); @@ -535,7 +549,7 @@ eabc_general_type (EConfig *ec, gtk_combo_box_set_model (dropdown, (GtkTreeModel *) store); gtk_combo_box_set_active (dropdown, -1); gtk_combo_box_set_active (dropdown, row); - g_signal_connect(dropdown, "changed", G_CALLBACK(eabc_type_changed), sdialog); + g_signal_connect (dropdown, "changed", G_CALLBACK(eabc_type_changed), sdialog); gtk_widget_show ((GtkWidget *) dropdown); gtk_box_pack_start ((GtkBox *) w, (GtkWidget *) dropdown, TRUE, TRUE, 0); gtk_label_set_mnemonic_widget ((GtkLabel *) label, (GtkWidget *) dropdown); @@ -548,7 +562,8 @@ eabc_general_type (EConfig *ec, } static void -name_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) +name_changed_cb (GtkWidget *w, + AddressbookSourceDialog *sdialog) { const gchar *text; gchar *stripped_name; @@ -583,7 +598,7 @@ eabc_general_name (EConfig *ec, gtk_box_pack_start ((GtkBox *) parent, w, FALSE, FALSE, 0); sdialog->display_name = e_builder_get_widget (builder, "account-editor-display-name-entry"); - g_signal_connect(sdialog->display_name, "changed", G_CALLBACK(name_changed_cb), sdialog); + g_signal_connect (sdialog->display_name, "changed", G_CALLBACK(name_changed_cb), sdialog); gtk_entry_set_text ((GtkEntry *) sdialog->display_name, e_source_peek_name (sdialog->source)); /* Hardcoded: groupwise can't edit the name (or anything else) */ @@ -601,7 +616,8 @@ eabc_general_name (EConfig *ec, /* TODO: This should be moved to plugins if B&A calendar setup is moved there */ static void -use_in_cal_changed_cb (GtkWidget *widget, AddressbookSourceDialog *sdialog) +use_in_cal_changed_cb (GtkWidget *widget, + AddressbookSourceDialog *sdialog) { e_source_set_property (sdialog->source, "use-in-contacts-calendar", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) ? "1" : "0"); } @@ -640,7 +656,8 @@ eabc_general_use_in_cal (EConfig *ec, } static void -offline_status_changed_cb (GtkWidget *widget, AddressbookSourceDialog *sdialog) +offline_status_changed_cb (GtkWidget *widget, + AddressbookSourceDialog *sdialog) { e_source_set_property (sdialog->source, "offline_sync", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) ? "1" : "0"); } @@ -684,7 +701,7 @@ form_ldap_search_filter (GtkWidget *w) const gchar *search_filter = gtk_entry_get_text ((GtkEntry *) w); /* this function can be used to format the search filter entered */ - if ((strlen (search_filter) !=0) && *search_filter != '(' && *(search_filter + (strlen (search_filter-1))) != ')') + if ((strlen (search_filter) !=0) && *search_filter != '(' && *(search_filter + (strlen (search_filter - 1))) != ')') filter = g_strdup_printf ("(%s)", search_filter); else filter = g_strdup_printf ("%s", search_filter); @@ -710,13 +727,15 @@ url_changed (AddressbookSourceDialog *sdialog) } static void -host_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) +host_changed_cb (GtkWidget *w, + AddressbookSourceDialog *sdialog) { url_changed (sdialog); } static void -port_entry_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) +port_entry_changed_cb (GtkWidget *w, + AddressbookSourceDialog *sdialog) { const gchar *port = gtk_entry_get_text ((GtkEntry *) w); @@ -732,7 +751,8 @@ port_entry_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) } static void -ssl_combobox_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) +ssl_combobox_changed_cb (GtkWidget *w, + AddressbookSourceDialog *sdialog) { sdialog->ssl = gtk_combo_box_get_active (GTK_COMBO_BOX (w)); e_source_set_property (sdialog->source, "ssl", ldap_unparse_ssl (sdialog->ssl)); @@ -798,7 +818,8 @@ eabc_general_host (EConfig *ec, } static void -auth_entry_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) +auth_entry_changed_cb (GtkWidget *w, + AddressbookSourceDialog *sdialog) { const gchar *principal = gtk_entry_get_text ((GtkEntry *) w); @@ -821,7 +842,8 @@ auth_entry_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) } static void -auth_combobox_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) +auth_combobox_changed_cb (GtkWidget *w, + AddressbookSourceDialog *sdialog) { sdialog->auth = gtk_combo_box_get_active (GTK_COMBO_BOX (w)); e_source_set_property (sdialog->source, "auth", ldap_unparse_auth (sdialog->auth)); @@ -882,19 +904,22 @@ eabc_general_auth (EConfig *ec, } static void -rootdn_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) +rootdn_changed_cb (GtkWidget *w, + AddressbookSourceDialog *sdialog) { url_changed (sdialog); } static void -search_filter_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) +search_filter_changed_cb (GtkWidget *w, + AddressbookSourceDialog *sdialog) { url_changed (sdialog); } static void -scope_combobox_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) +scope_combobox_changed_cb (GtkWidget *w, + AddressbookSourceDialog *sdialog) { sdialog->scope = gtk_combo_box_get_active (GTK_COMBO_BOX (w)); url_changed (sdialog); @@ -968,7 +993,8 @@ eabc_details_search (EConfig *ec, } static void -timeout_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) +timeout_changed_cb (GtkWidget *w, + AddressbookSourceDialog *sdialog) { GtkAdjustment *adjustment; GtkRange *range; @@ -982,7 +1008,8 @@ timeout_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) } static void -limit_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) +limit_changed_cb (GtkWidget *w, + AddressbookSourceDialog *sdialog) { gchar limit[16]; @@ -991,7 +1018,8 @@ limit_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) } static void -canbrowse_toggled_cb (GtkWidget *toggle_button, ESource *source) +canbrowse_toggled_cb (GtkWidget *toggle_button, + ESource *source) { if (!source || !toggle_button) return; @@ -1027,14 +1055,14 @@ eabc_details_limit (EConfig *ec, range = GTK_RANGE (sdialog->timeout_scale); adjustment = gtk_range_get_adjustment (range); tmp = e_source_get_property(sdialog->source, "timeout"); - gtk_adjustment_set_value (adjustment, tmp?g_strtod (tmp, NULL):3.0); + gtk_adjustment_set_value (adjustment, tmp ? g_strtod (tmp, NULL) : 3.0); g_signal_connect ( adjustment, "value_changed", G_CALLBACK (timeout_changed_cb), sdialog); sdialog->limit_spinbutton = e_builder_get_widget (builder, "download-limit-spinbutton"); tmp = e_source_get_property(sdialog->source, "limit"); - gtk_spin_button_set_value ((GtkSpinButton *) sdialog->limit_spinbutton, tmp?g_strtod (tmp, NULL):100.0); + gtk_spin_button_set_value ((GtkSpinButton *) sdialog->limit_spinbutton, tmp ? g_strtod (tmp, NULL) : 100.0); g_signal_connect (sdialog->limit_spinbutton, "value_changed", G_CALLBACK (limit_changed_cb), sdialog); sdialog->canbrowsecheck = e_builder_get_widget (builder, "canbrowsecheck"); @@ -1110,7 +1138,9 @@ eabc_commit (EConfig *ec, } static void -eabc_free (EConfig *ec, GSList *items, gpointer data) +eabc_free (EConfig *ec, + GSList *items, + gpointer data) { AddressbookSourceDialog *sdialog = data; @@ -1129,7 +1159,9 @@ eabc_free (EConfig *ec, GSList *items, gpointer data) } static gboolean -eabc_check_complete (EConfig *ec, const gchar *pageid, gpointer data) +eabc_check_complete (EConfig *ec, + const gchar *pageid, + gpointer data) { AddressbookSourceDialog *sdialog = data; gint valid = TRUE; @@ -1187,7 +1219,8 @@ eabc_check_complete (EConfig *ec, const gchar *pageid, gpointer data) /* debug only: */ #if d(!)0 static void -source_changed (ESource *source, AddressbookSourceDialog *sdialog) +source_changed (ESource *source, + AddressbookSourceDialog *sdialog) { gchar *xml; @@ -1197,8 +1230,9 @@ source_changed (ESource *source, AddressbookSourceDialog *sdialog) } #endif -GtkWidget* -addressbook_config_edit_source (GtkWidget *parent, ESource *source) +GtkWidget * +addressbook_config_edit_source (GtkWidget *parent, + ESource *source) { AddressbookSourceDialog *sdialog = g_new0 (AddressbookSourceDialog, 1); EABConfig *ec; @@ -1234,12 +1268,12 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source) sdialog->menu_source_groups = g_slist_copy (l); #ifndef HAVE_LDAP - for (;l;l = g_slist_next (l)) + for (; l; l = g_slist_next (l)) if (!strncmp("ldap:", e_source_group_peek_base_uri(l->data), 5)) sdialog->menu_source_groups = g_slist_remove (sdialog->menu_source_groups, l->data); #endif sdialog->source_group = (ESourceGroup *) sdialog->menu_source_groups->data; - for (i=0;eabc_new_items[i].path;i++) + for (i = 0; eabc_new_items[i].path; i++) items = g_slist_prepend (items, &eabc_new_items[i]); g_object_unref (gconf); } @@ -1251,12 +1285,12 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source) xml = e_source_to_standalone_xml (sdialog->source); printf("but working standalone xml: %s\n", xml); g_free (xml); - g_signal_connect(sdialog->source, "changed", source_changed, sdialog); + g_signal_connect (sdialog->source, "changed", source_changed, sdialog); #endif sdialog->config = ec = eab_config_new(E_CONFIG_BOOK, "com.novell.evolution.addressbook.config.accountEditor"); - for (i=0;eabc_items[i].path;i++) { + for (i = 0; eabc_items[i].path; i++) { if (eabc_items[i].label) eabc_items[i].label = gettext (eabc_items[i].label); items = g_slist_prepend (items, &eabc_items[i]); diff --git a/modules/addressbook/addressbook-config.h b/modules/addressbook/addressbook-config.h index d9fefb7e82..e316392497 100644 --- a/modules/addressbook/addressbook-config.h +++ b/modules/addressbook/addressbook-config.h @@ -47,7 +47,7 @@ typedef enum { ADDRESSBOOK_LDAP_SSL_NEVER /* No encryption */ } AddressbookLDAPSSLType; -GtkWidget* addressbook_config_edit_source (GtkWidget *parent, ESource *source); -GtkWidget* addressbook_config_create_new_source (GtkWidget *parent); +GtkWidget * addressbook_config_edit_source (GtkWidget *parent, ESource *source); +GtkWidget * addressbook_config_create_new_source (GtkWidget *parent); #endif /* __ADDRESSBOOK_CONFIG_H__ */ diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c index d4124193a6..020ad1dc81 100644 --- a/modules/addressbook/autocompletion-config.c +++ b/modules/addressbook/autocompletion-config.c @@ -61,7 +61,7 @@ source_selection_changed_cb (ESourceSelector *source_selector) } /* then we loop over the selector's selection, setting the - property on those sources */ + * property on those sources */ selection = e_source_selector_get_selection (source_selector); for (l = selection; l; l = l->next) { ESource *source = E_SOURCE (l->data); @@ -134,7 +134,12 @@ add_section (GtkWidget *container, } static GtkWidget * -acc_get_toplevel_notebook (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gint position, gpointer data) +acc_get_toplevel_notebook (EConfig *ec, + EConfigItem *item, + GtkWidget *parent, + GtkWidget *old, + gint position, + gpointer data) { if (old) return old; @@ -146,7 +151,12 @@ acc_get_toplevel_notebook (EConfig *ec, EConfigItem *item, GtkWidget *parent, Gt } static GtkWidget * -acc_get_general_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gint position, gpointer data) +acc_get_general_page (EConfig *ec, + EConfigItem *item, + GtkWidget *parent, + GtkWidget *old, + gint position, + gpointer data) { EShellSettings *shell_settings; ESourceList *source_list; @@ -227,7 +237,9 @@ static EConfigItem acc_items[] = { }; static void -acc_free (EConfig *ec, GSList *items, gpointer data) +acc_free (EConfig *ec, + GSList *items, + gpointer data) { g_slist_free (items); } diff --git a/modules/addressbook/e-book-shell-migrate.c b/modules/addressbook/e-book-shell-migrate.c index a88219348a..9b3c52c52b 100644 --- a/modules/addressbook/e-book-shell-migrate.c +++ b/modules/addressbook/e-book-shell-migrate.c @@ -53,8 +53,8 @@ typedef struct { /* this hash table maps old folder uris to new uids. It's - build in migrate_contact_folder and it's used in - migrate_completion_folders. */ + * build in migrate_contact_folder and it's used in + * migrate_completion_folders. */ GHashTable *folder_uid_map; ESourceList *source_list; @@ -73,9 +73,9 @@ typedef struct { static void create_groups (MigrationContext *context, - ESourceGroup **on_this_computer, - ESourceGroup **on_ldap_servers, - ESource **personal_source) + ESourceGroup **on_this_computer, + ESourceGroup **on_ldap_servers, + ESource **personal_source) { GSList *groups; ESourceGroup *group; @@ -115,7 +115,7 @@ create_groups (MigrationContext *context, if (*on_this_computer) { /* make sure "Personal" shows up as a source under - this group */ + * this group */ GSList *sources = e_source_group_peek_sources (*on_this_computer); GSList *s; for (s = sources; s; s = s->next) { @@ -207,8 +207,8 @@ e_book_shell_backend_migrate (EShellBackend *shell_backend, context = migration_context_new (data_dir); /* we call this unconditionally now - create_groups either - creates the groups/sources or it finds the necessary - groups/sources. */ + * creates the groups/sources or it finds the necessary + * groups/sources. */ create_groups (context, &on_this_computer, &on_ldap_servers, &personal_source); if (on_this_computer) diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c index 52d8243ead..a6aebe08a2 100644 --- a/modules/addressbook/e-book-shell-view-actions.c +++ b/modules/addressbook/e-book-shell-view-actions.c @@ -218,9 +218,9 @@ action_address_book_properties_cb (GtkAction *action, #ifdef WITH_CONTACT_MAPS static void contact_editor_contact_modified_cb (EABEditor *editor, - const GError *error, - EContact *contact, - gpointer user_data) + const GError *error, + EContact *contact, + gpointer user_data) { EContactMapWindow *window = user_data; EContactMap *map; @@ -241,8 +241,8 @@ contact_editor_contact_modified_cb (EABEditor *editor, static void map_window_show_contact_editor_cb (EContactMapWindow *window, - const gchar *contact_uid, - gpointer user_data) + const gchar *contact_uid, + gpointer user_data) { EShell *shell = e_shell_get_default (); EBookShellView *book_shell_view = user_data; @@ -291,7 +291,7 @@ map_window_show_contact_editor_cb (EContactMapWindow *window, /* We need this function to he defined all the time. */ static void action_address_book_map_cb (GtkAction *action, - EBookShellView *book_shell_view) + EBookShellView *book_shell_view) { #ifdef WITH_CONTACT_MAPS EContactMapWindow *map_window; diff --git a/modules/addressbook/eab-composer-util.c b/modules/addressbook/eab-composer-util.c index 215dacea05..9f17dd34d5 100644 --- a/modules/addressbook/eab-composer-util.c +++ b/modules/addressbook/eab-composer-util.c @@ -95,7 +95,9 @@ eab_send_as_to (EShell *shell, } static const gchar * -get_email (EContact *contact, EContactField field_id, gchar **to_free) +get_email (EContact *contact, + EContactField field_id, + gchar **to_free) { gchar *name = NULL, *mail = NULL; const gchar *value = e_contact_get_const (contact, field_id); diff --git a/modules/addressbook/openldap-extract.h b/modules/addressbook/openldap-extract.h index eb8457fe0e..d838e8b49b 100644 --- a/modules/addressbook/openldap-extract.h +++ b/modules/addressbook/openldap-extract.h @@ -193,12 +193,12 @@ get_token (const gchar **sp, (*sp)++; if (**sp == '\'') { q = *sp; - res = LDAP_MALLOC (q-p+1); + res = LDAP_MALLOC (q - p + 1); if (!res) { kind = TK_OUTOFMEM; } else { - strncpy (res,p,q-p); - res[q-p] = '\0'; + strncpy (res,p,q - p); + res[q - p] = '\0'; *token_val = res; } (*sp)++; @@ -217,12 +217,12 @@ get_token (const gchar **sp, **sp != '\0') (*sp)++; q = *sp; - res = LDAP_MALLOC (q-p+1); + res = LDAP_MALLOC (q - p + 1); if (!res) { kind = TK_OUTOFMEM; } else { - strncpy (res,p,q-p); - res[q-p] = '\0'; + strncpy (res,p,q - p); + res[q - p] = '\0'; *token_val = res; } break; @@ -287,7 +287,7 @@ ldap_int_parse_numericoid (const gchar **sp, gint *code, const gint flags) if (flags & LDAP_SCHEMA_SKIP) { res = (gchar *) start; } else { - res = LDAP_MALLOC (len+1); + res = LDAP_MALLOC (len + 1); if (!res) { *code = LDAP_SCHERR_OUTOFMEM; return (NULL); @@ -326,9 +326,9 @@ parse_qdescrs (const gchar **sp, gint *code) if (kind == TK_RIGHTPAREN) break; if (kind == TK_QDESCR) { - if (pos == size-2) { + if (pos == size - 2) { size++; - res1 = LDAP_REALLOC (res,size*sizeof (gchar *)); + res1 = LDAP_REALLOC (res,size *sizeof (gchar *)); if (!res1) { LDAP_VFREE (res); LDAP_FREE (sval); @@ -417,9 +417,9 @@ parse_oids (const gchar **sp, gint *code, const gint allow_quoted) if (kind == TK_BAREWORD || (allow_quoted && kind == TK_QDSTRING)) { - if (pos == size-2) { + if (pos == size - 2) { size++; - res1 = LDAP_REALLOC (res,size*sizeof (gchar *)); + res1 = LDAP_REALLOC (res,size *sizeof (gchar *)); if (!res1) { LDAP_FREE (sval); LDAP_VFREE (res); @@ -551,8 +551,8 @@ ldap_str2objectclass (LDAP_CONST gchar *s, } else if (flags & LDAP_SCHEMA_ALLOW_OID_MACRO) { /* Non-numerical OID, ignore */ - gint len = ss-savepos; - oc->oc_oid = LDAP_MALLOC (len+1); + gint len = ss - savepos; + oc->oc_oid = LDAP_MALLOC (len + 1); strncpy (oc->oc_oid, savepos, len); oc->oc_oid[len] = 0; } @@ -1124,7 +1124,7 @@ ldap_url_parse_ext (LDAP_CONST gchar *url_in, } if (enclosed) { - p = &url[strlen (url)-1]; + p = &url[strlen (url) - 1]; if (*p != '>') { LDAP_FREE (url); @@ -1391,7 +1391,7 @@ ldap_url_parse_ext (LDAP_CONST gchar *url_in, return LDAP_URL_ERR_BADEXTS; } - for (i=0; ludp->lud_exts[i] != NULL; i++) { + for (i = 0; ludp->lud_exts[i] != NULL; i++) { ldap_pvt_hex_unescape (ludp->lud_exts[i]); if (*ludp->lud_exts[i] == '!') { diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c index b4297b9fcd..81fc76b3cb 100644 --- a/modules/calendar/e-cal-shell-content.c +++ b/modules/calendar/e-cal-shell-content.c @@ -303,7 +303,8 @@ cal_shell_content_dispose (GObject *object) } static time_t -gc_get_default_time (ECalModel *model, gpointer user_data) +gc_get_default_time (ECalModel *model, + gpointer user_data) { GnomeCalendar *gcal = user_data; time_t res = 0, end; @@ -321,8 +322,8 @@ cal_shell_content_constructed (GObject *object) { ECalShellContentPrivate *priv; ECalendarView *calendar_view; - ECalModel *memo_model=NULL; - ECalModel *task_model=NULL; + ECalModel *memo_model = NULL; + ECalModel *task_model = NULL; EShell *shell; EShellContent *shell_content; EShellView *shell_view; diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c index 3c9f79a309..dd76049171 100644 --- a/modules/calendar/e-cal-shell-migrate.c +++ b/modules/calendar/e-cal-shell-migrate.c @@ -75,11 +75,11 @@ create_calendar_contact_source (ESourceList *source_list) static void create_calendar_sources (EShellBackend *shell_backend, - ESourceList *source_list, - ESourceGroup **on_this_computer, - ESource **personal_source, - ESourceGroup **on_the_web, - ESourceGroup **contacts) + ESourceList *source_list, + ESourceGroup **on_this_computer, + ESource **personal_source, + ESourceGroup **on_the_web, + ESourceGroup **contacts) { EShell *shell; EShellSettings *shell_settings; @@ -134,7 +134,7 @@ create_calendar_sources (EShellBackend *shell_backend, if (*on_this_computer) { /* make sure "Personal" shows up as a source under - this group */ + * this group */ GSList *sources = e_source_group_peek_sources (*on_this_computer); GSList *s; for (s = sources; s; s = s->next) { @@ -224,8 +224,8 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend, g_object_get (shell_backend, "source-list", &source_list, NULL); /* we call this unconditionally now - create_groups either - creates the groups/sources or it finds the necessary - groups/sources. */ + * creates the groups/sources or it finds the necessary + * groups/sources. */ create_calendar_sources ( shell_backend, source_list, &on_this_computer, &personal_source, &on_the_web, &contacts); diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index 53b2a0e6c7..21472453ef 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -1205,7 +1205,8 @@ exit: } static void -edit_event_as (ECalShellView *cal_shell_view, gboolean as_meeting) +edit_event_as (ECalShellView *cal_shell_view, + gboolean as_meeting) { ECalShellContent *cal_shell_content; GnomeCalendarViewType view_type; diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index 7a9fdaac69..c2f39c5f9b 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -828,7 +828,8 @@ struct ForeachTzidData }; static void -add_timezone_to_cal_cb (icalparameter *param, gpointer data) +add_timezone_to_cal_cb (icalparameter *param, + gpointer data) { struct ForeachTzidData *ftd = data; icaltimezone *tz = NULL; diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c index 03914f1793..61a2d9c27a 100644 --- a/modules/calendar/e-cal-shell-view.c +++ b/modules/calendar/e-cal-shell-view.c @@ -227,7 +227,8 @@ cal_shell_view_execute_search (EShellView *shell_view) } static icalproperty * -get_attendee_prop (icalcomponent *icalcomp, const gchar *address) +get_attendee_prop (icalcomponent *icalcomp, + const gchar *address) { icalproperty *prop; @@ -252,7 +253,8 @@ get_attendee_prop (icalcomponent *icalcomp, const gchar *address) } static gboolean -is_delegated (icalcomponent *icalcomp, const gchar *user_email) +is_delegated (icalcomponent *icalcomp, + const gchar *user_email) { icalproperty *prop; icalparameter *param; diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c index 115226dcf3..85eddd9736 100644 --- a/modules/calendar/e-calendar-preferences.c +++ b/modules/calendar/e-calendar-preferences.c @@ -191,7 +191,8 @@ update_day_second_zone_caption (ECalendarPreferences *prefs) } static void -on_set_day_second_zone (GtkWidget *item, ECalendarPreferences *prefs) +on_set_day_second_zone (GtkWidget *item, + ECalendarPreferences *prefs) { if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item))) return; @@ -201,7 +202,8 @@ on_set_day_second_zone (GtkWidget *item, ECalendarPreferences *prefs) } static void -on_select_day_second_zone (GtkWidget *item, ECalendarPreferences *prefs) +on_select_day_second_zone (GtkWidget *item, + ECalendarPreferences *prefs) { g_return_if_fail (prefs != NULL); @@ -210,7 +212,8 @@ on_select_day_second_zone (GtkWidget *item, ECalendarPreferences *prefs) } static void -day_second_zone_clicked (GtkWidget *widget, ECalendarPreferences *prefs) +day_second_zone_clicked (GtkWidget *widget, + ECalendarPreferences *prefs) { GtkWidget *menu, *item; GSList *group = NULL, *recent_zones, *s; @@ -263,7 +266,8 @@ day_second_zone_clicked (GtkWidget *widget, ECalendarPreferences *prefs) } static void -start_of_day_changed (GtkWidget *widget, ECalendarPreferences *prefs) +start_of_day_changed (GtkWidget *widget, + ECalendarPreferences *prefs) { gint start_hour, start_minute, end_hour, end_minute; EDateEdit *start, *end; @@ -292,7 +296,8 @@ start_of_day_changed (GtkWidget *widget, ECalendarPreferences *prefs) } static void -end_of_day_changed (GtkWidget *widget, ECalendarPreferences *prefs) +end_of_day_changed (GtkWidget *widget, + ECalendarPreferences *prefs) { gint start_hour, start_minute, end_hour, end_minute; EDateEdit *start, *end; @@ -321,7 +326,8 @@ end_of_day_changed (GtkWidget *widget, ECalendarPreferences *prefs) } static void -notify_with_tray_toggled (GtkToggleButton *toggle, ECalendarPreferences *prefs) +notify_with_tray_toggled (GtkToggleButton *toggle, + ECalendarPreferences *prefs) { GConfClient *gconf; @@ -333,7 +339,8 @@ notify_with_tray_toggled (GtkToggleButton *toggle, ECalendarPreferences *prefs) } static void -alarms_selection_changed (ESourceSelector *selector, ECalendarPreferences *prefs) +alarms_selection_changed (ESourceSelector *selector, + ECalendarPreferences *prefs) { ESourceList *source_list = prefs->alarms_list; GSList *selection; @@ -358,7 +365,7 @@ alarms_selection_changed (ESourceSelector *selector, ECalendarPreferences *prefs } /* 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) { source = E_SOURCE (l->data); @@ -402,17 +409,30 @@ update_system_tz_widgets (EShellSettings *shell_settings, static void setup_changes (ECalendarPreferences *prefs) { - g_signal_connect (G_OBJECT (prefs->day_second_zone), "clicked", G_CALLBACK (day_second_zone_clicked), prefs); + g_signal_connect ( + prefs->day_second_zone, "clicked", + G_CALLBACK (day_second_zone_clicked), prefs); - g_signal_connect (G_OBJECT (prefs->start_of_day), "changed", G_CALLBACK (start_of_day_changed), prefs); - g_signal_connect (G_OBJECT (prefs->end_of_day), "changed", G_CALLBACK (end_of_day_changed), prefs); + g_signal_connect ( + prefs->start_of_day, "changed", + G_CALLBACK (start_of_day_changed), prefs); - g_signal_connect (G_OBJECT (prefs->notify_with_tray), "toggled", G_CALLBACK (notify_with_tray_toggled), prefs); - g_signal_connect (G_OBJECT (prefs->alarm_list_widget), "selection_changed", G_CALLBACK (alarms_selection_changed), prefs); + g_signal_connect ( + prefs->end_of_day, "changed", + G_CALLBACK (end_of_day_changed), prefs); + + g_signal_connect ( + prefs->notify_with_tray, "toggled", + G_CALLBACK (notify_with_tray_toggled), prefs); + + g_signal_connect ( + prefs->alarm_list_widget, "selection_changed", + G_CALLBACK (alarms_selection_changed), prefs); } static void -initialize_selection (ESourceSelector *selector, ESourceList *source_list) +initialize_selection (ESourceSelector *selector, + ESourceList *source_list) { GSList *groups; @@ -497,7 +517,9 @@ static ECalConfigItem eccp_items[] = { }; static void -eccp_free (EConfig *ec, GSList *items, gpointer data) +eccp_free (EConfig *ec, + GSList *items, + gpointer data) { g_slist_free (items); } diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c index 55f57996cb..6402cf1e0a 100644 --- a/modules/calendar/e-memo-shell-migrate.c +++ b/modules/calendar/e-memo-shell-migrate.c @@ -89,7 +89,7 @@ create_memo_sources (EShellBackend *shell_backend, if (*on_this_computer) { /* make sure "Personal" shows up as a source under - this group */ + * this group */ GSList *sources = e_source_group_peek_sources (*on_this_computer); GSList *s; for (s = sources; s; s = s->next) { @@ -172,8 +172,8 @@ e_memo_shell_backend_migrate (EShellBackend *shell_backend, g_object_get (shell_backend, "source-list", &source_list, NULL); /* we call this unconditionally now - create_groups either - creates the groups/sources or it finds the necessary - groups/sources. */ + * creates the groups/sources or it finds the necessary + * groups/sources. */ create_memo_sources ( shell_backend, source_list, &on_this_computer, &on_the_web, &personal_source); diff --git a/modules/calendar/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c index bf2d07ed8b..60499d673f 100644 --- a/modules/calendar/e-task-shell-migrate.c +++ b/modules/calendar/e-task-shell-migrate.c @@ -101,7 +101,7 @@ create_task_sources (EShellBackend *shell_backend, if (*on_this_computer) { /* make sure "Personal" shows up as a source under - this group */ + * this group */ GSList *sources = e_source_group_peek_sources (*on_this_computer); GSList *s; for (s = sources; s; s = s->next) { @@ -183,8 +183,8 @@ e_task_shell_backend_migrate (EShellBackend *shell_backend, g_object_get (shell_backend, "source-list", &source_list, NULL); /* we call this unconditionally now - create_groups either - creates the groups/sources or it finds the necessary - groups/sources. */ + * creates the groups/sources or it finds the necessary + * groups/sources. */ create_task_sources ( shell_backend, source_list, &on_this_computer, &on_the_web, &personal_source); diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 93500279e7..5eb5ce9f53 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -709,7 +709,8 @@ e_mail_labels_get_filter_options (void) /* utility functions for mbox importer */ static void -mbox_create_preview_cb (GObject *preview, GtkWidget **preview_widget) +mbox_create_preview_cb (GObject *preview, + GtkWidget **preview_widget) { EMFormatHTMLDisplay *format; EWebView *web_view; @@ -726,7 +727,8 @@ mbox_create_preview_cb (GObject *preview, GtkWidget **preview_widget) } static void -mbox_fill_preview_cb (GObject *preview, CamelMimeMessage *msg) +mbox_fill_preview_cb (GObject *preview, + CamelMimeMessage *msg) { EMFormatHTMLDisplay *format; diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index 72994449b3..a7309904bd 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -487,8 +487,8 @@ mail_shell_view_reader_changed_cb (EMailShellView *mail_shell_view, static void mail_shell_view_reader_update_actions_cb (EMailReader *reader, - guint32 state, - EMailShellView *mail_shell_view) + guint32 state, + EMailShellView *mail_shell_view) { EMailShellContent *mail_shell_content; @@ -722,7 +722,7 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view) mail_shell_view, G_CONNECT_SWAPPED); g_signal_connect_object ( - e_mail_shell_content_get_mail_view (mail_shell_content), "update-actions", + mail_view, "update-actions", G_CALLBACK (mail_shell_view_reader_update_actions_cb), mail_shell_view, 0); diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index d5b1c6697d..fb49352357 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -303,7 +303,9 @@ static EMConfigItem emcp_items[] = { }; static void -emcp_free (EConfig *ec, GSList *items, gpointer data) +emcp_free (EConfig *ec, + GSList *items, + gpointer data) { /* the prefs data is freed automagically */ g_slist_free (items); diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index 6d7322803b..290e189e4b 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -164,7 +164,8 @@ jh_tree_refill (EMMailerPrefs *prefs) } static void -jh_dialog_entry_changed_cb (GtkEntry *entry, gpointer user_data) +jh_dialog_entry_changed_cb (GtkEntry *entry, + gpointer user_data) { GtkBuilder *builder = GTK_BUILDER (user_data); GtkWidget *ok_button, *entry1, *entry2; @@ -181,7 +182,8 @@ jh_dialog_entry_changed_cb (GtkEntry *entry, gpointer user_data) } static void -jh_add_cb (GtkWidget *widget, gpointer user_data) +jh_add_cb (GtkWidget *widget, + gpointer user_data) { GtkWidget *dialog; GtkWidget *entry; @@ -222,7 +224,8 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) } static void -jh_remove_cb (GtkWidget *widget, gpointer user_data) +jh_remove_cb (GtkWidget *widget, + gpointer user_data) { EMMailerPrefs *prefs = user_data; GtkTreeSelection *selection; @@ -233,14 +236,14 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (prefs->junk_header_tree)); if (gtk_tree_selection_get_selected (selection, &model, &iter)) { - gchar *name=NULL, *value=NULL; + gchar *name = NULL, *value = NULL; GSList *prev = NULL, *node, *list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); gtk_tree_model_get (model, &iter, JH_LIST_COLUMN_NAME, &name, JH_LIST_COLUMN_VALUE, &value, -1); node = list; while (node) { gchar *test; gint len = strlen (name); - test = strncmp (node->data, name, len) == 0 ? (gchar *) node->data+len:NULL; + test = strncmp (node->data, name, len) == 0 ? (gchar *) node->data + len : NULL; if (test) { test++; @@ -274,7 +277,8 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data) } static GtkListStore * -init_junk_tree (GtkWidget *label_tree, EMMailerPrefs *prefs) +init_junk_tree (GtkWidget *label_tree, + EMMailerPrefs *prefs) { GtkListStore *store; GtkCellRenderer *renderer; @@ -287,11 +291,11 @@ init_junk_tree (GtkWidget *label_tree, EMMailerPrefs *prefs) renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (label_tree), -1, _("Header"), renderer, "text", JH_LIST_COLUMN_NAME, NULL); - g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); + g_object_set (renderer, "editable", TRUE, NULL); renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (label_tree), -1, _("Contains Value"), renderer, "text", JH_LIST_COLUMN_VALUE, NULL); - g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); + g_object_set (renderer, "editable", TRUE, NULL); return store; } @@ -304,8 +308,8 @@ emmp_header_remove_sensitivity (EMMailerPrefs *prefs) gboolean is_default; /* remove button should be sensitive if the currenlty selected entry in the list view - is not a default header. if there are no entries, or none is selected, it should be - disabled + * is not a default header. if there are no entries, or none is selected, it should be + * disabled */ if (gtk_tree_selection_get_selected (selection, NULL, &iter)) { gtk_tree_model_get (GTK_TREE_MODEL (prefs->header_list_store), &iter, @@ -341,8 +345,8 @@ emmp_header_add_sensitivity (EMMailerPrefs *prefs) gboolean valid; /* the add header button should be sensitive if the text box contains - a valid header string, that is not a duplicate with something already - in the list view + * a valid header string, that is not a duplicate with something already + * in the list view */ entry_contents = gtk_entry_get_text (GTK_ENTRY (prefs->entry_header)); if (!emmp_header_is_valid (entry_contents)) { @@ -402,7 +406,9 @@ emmp_save_headers (EMMailerPrefs *prefs) } static void -emmp_header_list_enabled_toggled (GtkCellRendererToggle *cell, const gchar *path_string, EMMailerPrefs *prefs) +emmp_header_list_enabled_toggled (GtkCellRendererToggle *cell, + const gchar *path_string, + EMMailerPrefs *prefs) { GtkTreeModel *model = GTK_TREE_MODEL (prefs->header_list_store); GtkTreePath *path = gtk_tree_path_new_from_string (path_string); @@ -420,7 +426,8 @@ emmp_header_list_enabled_toggled (GtkCellRendererToggle *cell, const gchar *path } static void -emmp_header_add_header (GtkWidget *widget, EMMailerPrefs *prefs) +emmp_header_add_header (GtkWidget *widget, + EMMailerPrefs *prefs) { GtkTreeModel *model = GTK_TREE_MODEL (prefs->header_list_store); GtkTreeIter iter; @@ -428,7 +435,7 @@ emmp_header_add_header (GtkWidget *widget, EMMailerPrefs *prefs) g_strstrip ((gchar *) text); - if (text && (strlen (text)>0)) { + if (text && (strlen (text) > 0)) { gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, HEADER_LIST_NAME_COLUMN, text, @@ -445,7 +452,8 @@ emmp_header_add_header (GtkWidget *widget, EMMailerPrefs *prefs) } static void -emmp_header_remove_header (GtkWidget *button, gpointer user_data) +emmp_header_remove_header (GtkWidget *button, + gpointer user_data) { EMMailerPrefs *prefs = (EMMailerPrefs *) user_data; GtkTreeModel *model = GTK_TREE_MODEL (prefs->header_list_store); @@ -462,7 +470,8 @@ emmp_header_remove_header (GtkWidget *button, gpointer user_data) } static void -emmp_header_list_row_selected (GtkTreeSelection *selection, gpointer user_data) +emmp_header_list_row_selected (GtkTreeSelection *selection, + gpointer user_data) { EMMailerPrefs *prefs = (EMMailerPrefs *) user_data; @@ -470,7 +479,8 @@ emmp_header_list_row_selected (GtkTreeSelection *selection, gpointer user_data) } static void -emmp_header_entry_changed (GtkWidget *entry, gpointer user_data) +emmp_header_entry_changed (GtkWidget *entry, + gpointer user_data) { EMMailerPrefs *prefs = (EMMailerPrefs *) user_data; @@ -478,7 +488,8 @@ emmp_header_entry_changed (GtkWidget *entry, gpointer user_data) } static void -toggle_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) +toggle_button_toggled (GtkToggleButton *toggle, + EMMailerPrefs *prefs) { const gchar *key; @@ -487,14 +498,16 @@ toggle_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) } static void -junk_book_lookup_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) +junk_book_lookup_button_toggled (GtkToggleButton *toggle, + EMMailerPrefs *prefs) { toggle_button_toggled (toggle, prefs); gtk_widget_set_sensitive (GTK_WIDGET (prefs->junk_lookup_local_only), gtk_toggle_button_get_active (toggle)); } static void -custom_junk_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) +custom_junk_button_toggled (GtkToggleButton *toggle, + EMMailerPrefs *prefs) { toggle_button_toggled (toggle, prefs); if (gtk_toggle_button_get_active (toggle)) { @@ -510,7 +523,11 @@ custom_junk_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) } static void -toggle_button_init (EMMailerPrefs *prefs, GtkToggleButton *toggle, gint not, const gchar *key, GCallback toggled) +toggle_button_init (EMMailerPrefs *prefs, + GtkToggleButton *toggle, + gint not, + const gchar *key, + GCallback toggled) { gboolean bool; @@ -623,7 +640,8 @@ emmp_empty_junk_init (EMMailerPrefs *prefs, } static void -http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs) +http_images_changed (GtkWidget *widget, + EMMailerPrefs *prefs) { EMailImageLoadingPolicy policy; @@ -669,7 +687,9 @@ static EMConfigItem emmp_items[] = { }; static void -emmp_free (EConfig *ec, GSList *items, gpointer data) +emmp_free (EConfig *ec, + GSList *items, + gpointer data) { /* the prefs data is freed automagically */ @@ -957,8 +977,8 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, NULL); /* populated the listview with entries; firstly we add all the default headers, and then - we add read header configuration out of gconf. If a header in gconf is a default header, - we update the enabled flag accordingly + * we add read header configuration out of gconf. If a header in gconf is a default header, + * we update the enabled flag accordingly */ header_add_list = NULL; default_header_hash = g_hash_table_new (g_str_hash, g_str_equal); @@ -1086,8 +1106,12 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, custom_junk_button_toggled (prefs->junk_header_check, prefs); jh_tree_refill (prefs); - g_signal_connect (G_OBJECT (prefs->junk_header_add), "clicked", G_CALLBACK (jh_add_cb), prefs); - g_signal_connect (G_OBJECT (prefs->junk_header_remove), "clicked", G_CALLBACK (jh_remove_cb), prefs); + g_signal_connect ( + prefs->junk_header_add, "clicked", + G_CALLBACK (jh_add_cb), prefs); + g_signal_connect ( + prefs->junk_header_remove, "clicked", + G_CALLBACK (jh_remove_cb), prefs); /* get our toplevel widget */ target = em_config_target_new_prefs (ec, prefs->gconf); diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c index e12bb3c9c2..242c84993e 100644 --- a/modules/mail/em-network-prefs.c +++ b/modules/mail/em-network-prefs.c @@ -77,7 +77,8 @@ em_network_prefs_init (EMNetworkPrefs *prefs) } static void -toggle_button_toggled (GtkToggleButton *toggle, EMNetworkPrefs *prefs) +toggle_button_toggled (GtkToggleButton *toggle, + EMNetworkPrefs *prefs) { const gchar *key; @@ -93,7 +94,9 @@ toggle_button_toggled (GtkToggleButton *toggle, EMNetworkPrefs *prefs) } static void -toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const gchar *key) +toggle_button_init (EMNetworkPrefs *prefs, + GtkToggleButton *toggle, + const gchar *key) { gboolean bool; @@ -121,7 +124,9 @@ emnp_widget_glade (EConfig *ec, } static void -emnp_set_sensitiveness (EMNetworkPrefs *prefs, NetworkConfigProxyType type, gboolean sensitivity) +emnp_set_sensitiveness (EMNetworkPrefs *prefs, + NetworkConfigProxyType type, + gboolean sensitivity) { #if 0 if (type == NETWORK_PROXY_AUTOCONFIG) { @@ -160,7 +165,8 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs, NetworkConfigProxyType type, gboo } static void -notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs) +notify_proxy_type_changed (GtkWidget *widget, + EMNetworkPrefs *prefs) { gint type; @@ -199,7 +205,8 @@ notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs) } static void -widget_entry_changed_cb (GtkWidget *widget, gpointer data) +widget_entry_changed_cb (GtkWidget *widget, + gpointer data) { const gchar *value; gint port = -1; @@ -208,8 +215,8 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data) client = gconf_client_get_default (); /* - Do not change the order of comparison - - GtkSpinButton is an extended form of GtkEntry + * Do not change the order of comparison - + * GtkSpinButton is an extended form of GtkEntry */ if (GTK_IS_SPIN_BUTTON (widget)) { port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget)); @@ -225,7 +232,8 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data) } static void -ignore_hosts_entry_changed_cb (GtkWidget *widget, const gchar *key) +ignore_hosts_entry_changed_cb (GtkWidget *widget, + const gchar *key) { const gchar *value; GSList *lst = NULL; @@ -280,7 +288,9 @@ static EMConfigItem emnp_items[] = { }; static void -emnp_free (EConfig *ec, GSList *items, gpointer data) +emnp_free (EConfig *ec, + GSList *items, + gpointer data) { /* the prefs data is freed automagically */ @@ -369,7 +379,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) gtk_toggle_button_set_active (prefs->auto_proxy, val == NETWORK_PROXY_AUTOCONFIG); - g_signal_connect(prefs->auto_proxy_url, "changed", G_CALLBACK(widget_entry_changed_cb), GCONF_E_AUTOCONFIG_URL_KEY); + g_signal_connect (prefs->auto_proxy_url, "changed", G_CALLBACK(widget_entry_changed_cb), GCONF_E_AUTOCONFIG_URL_KEY); if (locked) gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy, FALSE); #endif diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c index 797b4297f3..fdc3841f38 100644 --- a/modules/mailto-handler/evolution-mailto-handler.c +++ b/modules/mailto-handler/evolution-mailto-handler.c @@ -68,7 +68,7 @@ mailto_handler_get_shell (EMailtoHandler *extension) } static gboolean -mailto_handler_is_evolution (/*const*/ GAppInfo *app_info) +mailto_handler_is_evolution (/*const */ GAppInfo *app_info) { gint argc; gchar **argv; diff --git a/modules/plugin-lib/e-plugin-lib.c b/modules/plugin-lib/e-plugin-lib.c index e962835ca2..8ca0fed570 100644 --- a/modules/plugin-lib/e-plugin-lib.c +++ b/modules/plugin-lib/e-plugin-lib.c @@ -35,15 +35,15 @@ static gpointer parent_class; static GType plugin_lib_type; /* TODO: - We need some way to manage lifecycle. - We need some way to manage state. - - Maybe just the g module init method will do, or we could add - another which returns context. - - There is also the question of per-instance context, e.g. for config - pages. -*/ + * We need some way to manage lifecycle. + * We need some way to manage state. + * + * Maybe just the g module init method will do, or we could add + * another which returns context. + * + * There is also the question of per-instance context, e.g. for config + * pages. + */ static gint plugin_lib_loadmodule (EPlugin *plugin) @@ -93,7 +93,8 @@ plugin_lib_loadmodule (EPlugin *plugin) } static gpointer -plugin_lib_get_symbol (EPlugin *plugin, const gchar *name) +plugin_lib_get_symbol (EPlugin *plugin, + const gchar *name) { EPluginLib *plugin_lib = E_PLUGIN_LIB (plugin); gpointer symbol; @@ -108,7 +109,9 @@ plugin_lib_get_symbol (EPlugin *plugin, const gchar *name) } static gpointer -plugin_lib_invoke (EPlugin *plugin, const gchar *name, gpointer data) +plugin_lib_invoke (EPlugin *plugin, + const gchar *name, + gpointer data) { EPluginLib *plugin_lib = E_PLUGIN_LIB (plugin); EPluginLibFunc func; @@ -131,7 +134,8 @@ plugin_lib_invoke (EPlugin *plugin, const gchar *name, gpointer data) } static gint -plugin_lib_construct (EPlugin *plugin, xmlNodePtr root) +plugin_lib_construct (EPlugin *plugin, + xmlNodePtr root) { EPluginLib *plugin_lib = E_PLUGIN_LIB (plugin); @@ -191,7 +195,8 @@ plugin_lib_get_configure_widget (EPlugin *plugin) } static void -plugin_lib_enable (EPlugin *plugin, gint state) +plugin_lib_enable (EPlugin *plugin, + gint state) { EPluginLib *plugin_lib = E_PLUGIN_LIB (plugin); EPluginLibEnableFunc enable; diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c index 582f1736c6..29dba6c160 100644 --- a/modules/plugin-manager/evolution-plugin-manager.c +++ b/modules/plugin-manager/evolution-plugin-manager.c @@ -96,7 +96,8 @@ GType e_plugin_manager_get_type (void); G_DEFINE_DYNAMIC_TYPE (EPluginManager, e_plugin_manager, E_TYPE_EXTENSION) static void -eppm_set_label (GtkLabel *l, const gchar *v) +eppm_set_label (GtkLabel *l, + const gchar *v) { gtk_label_set_label(l, v?v:_("Unknown")); } @@ -171,7 +172,8 @@ eppm_show_plugin (Manager *m, } static void -eppm_selection_changed (GtkTreeSelection *selection, Manager *m) +eppm_selection_changed (GtkTreeSelection *selection, + Manager *m) { GtkTreeModel *model; GtkTreeIter iter; diff --git a/modules/plugin-mono/e-plugin-mono.c b/modules/plugin-mono/e-plugin-mono.c index bd5424921d..1c4113504d 100644 --- a/modules/plugin-mono/e-plugin-mono.c +++ b/modules/plugin-mono/e-plugin-mono.c @@ -50,7 +50,8 @@ static gpointer parent_class; static GType plugin_mono_type; static gchar * -get_xml_prop (xmlNodePtr node, const gchar *id) +get_xml_prop (xmlNodePtr node, + const gchar *id) { xmlChar *prop; gchar *out = NULL; @@ -82,7 +83,8 @@ plugin_mono_finalize (GObject *object) } static gint -plugin_mono_construct (EPlugin *plugin, xmlNodePtr root) +plugin_mono_construct (EPlugin *plugin, + xmlNodePtr root) { EPluginMono *plugin_mono; @@ -99,11 +101,11 @@ plugin_mono_construct (EPlugin *plugin, xmlNodePtr root) /* Two approaches: - You can have a Evolution.Plugin implementation which has every - callback as methods on it. Or you can just use static methods - for everything. - - All methods take a single (structured) argument. + * You can have a Evolution.Plugin implementation which has every + * callback as methods on it. Or you can just use static methods + * for everything. + * + * All methods take a single (structured) argument. */ static gpointer @@ -155,7 +157,7 @@ plugin_mono_invoke (EPlugin *plugin, if (m == NULL) { if (priv->class) { /* class method */ - MonoMethod* mono_method; + MonoMethod * mono_method; gpointer iter = NULL; d = mono_method_desc_new (name, FALSE); @@ -194,7 +196,7 @@ plugin_mono_invoke (EPlugin *plugin, g_hash_table_insert (priv->methods, g_strdup (name), m); } - params = g_malloc0 (sizeof (*params)*1); + params = g_malloc0 (sizeof (*params) * 1); params[0] = &data; res = mono_runtime_invoke (m, priv->plugin, params, &x); /* do i need to free params?? */ diff --git a/modules/plugin-python/e-plugin-python.c b/modules/plugin-python/e-plugin-python.c index aaa6fb2b66..a00e629068 100644 --- a/modules/plugin-python/e-plugin-python.c +++ b/modules/plugin-python/e-plugin-python.c @@ -44,7 +44,8 @@ static gpointer parent_class; static GType plugin_python_type; static gchar * -get_xml_prop (xmlNodePtr node, const gchar *id) +get_xml_prop (xmlNodePtr node, + const gchar *id) { xmlChar *prop; gchar *out = NULL; @@ -77,7 +78,8 @@ plugin_python_finalize (GObject *object) } static gint -plugin_python_construct (EPlugin *plugin, xmlNodePtr root) +plugin_python_construct (EPlugin *plugin, + xmlNodePtr root) { EPluginPython *plugin_python; @@ -124,7 +126,7 @@ plugin_python_invoke (EPlugin *plugin, priv->pModule = PyImport_Import (pModuleName); - Py_DECREF (pModuleName); //Free + Py_DECREF (pModuleName); if (priv->pModule == NULL) { PyErr_Print (); diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c index 3cfca9318a..75ef5d8d99 100644 --- a/modules/startup-wizard/evolution-startup-wizard.c +++ b/modules/startup-wizard/evolution-startup-wizard.c @@ -82,7 +82,8 @@ GType e_startup_wizard_get_type (void); G_DEFINE_DYNAMIC_TYPE (EStartupWizard, e_startup_wizard, E_TYPE_EXTENSION) G_GNUC_NORETURN static void -startup_wizard_terminate (void) { +startup_wizard_terminate (void) +{ gtk_main_quit (); _exit (0); } diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c index d974422cd5..d2154590b1 100644 --- a/modules/windows-sens/evolution-windows-sens.c +++ b/modules/windows-sens/evolution-windows-sens.c @@ -257,22 +257,22 @@ typedef struct ESensNetworkListener { EWindowsSENS *ews_ptr; } ESensNetworkListener; -static void e_sens_network_listener_init (ESensNetworkListener**,EWindowsSENS*); +static void e_sens_network_listener_init (ESensNetworkListener **,EWindowsSENS *); /* Functions to implement ISensNetwork interface */ -static HRESULT WINAPI e_sens_network_listener_queryinterface (ISensNetwork*,REFIID,PVOID *); -static ULONG WINAPI e_sens_network_listener_addref (ISensNetwork*); -static ULONG WINAPI e_sens_network_listener_release (ISensNetwork*); -static HRESULT WINAPI e_sens_network_listener_gettypeinfocount (ISensNetwork*, UINT*); -static HRESULT WINAPI e_sens_network_listener_gettypeinfo (ISensNetwork*,UINT,LCID,ITypeInfo**); -static HRESULT WINAPI e_sens_network_listener_getidsofnames (ISensNetwork*,REFIID,LPOLESTR*,UINT,LCID, DISPID*); -static HRESULT WINAPI e_sens_network_listener_invoke (ISensNetwork*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*); -static HRESULT WINAPI e_sens_network_listener_connectionmade (ISensNetwork*,BSTR,ULONG,LPSENS_QOCINFO); -static HRESULT WINAPI e_sens_network_listener_connectionmadenoqocinfo (ISensNetwork*,BSTR,ULONG); -static HRESULT WINAPI e_sens_network_listener_connectionlost (ISensNetwork*,BSTR,ULONG); -static HRESULT WINAPI e_sens_network_listener_destinationreachable (ISensNetwork*,BSTR,BSTR,ULONG,LPSENS_QOCINFO); -static HRESULT WINAPI e_sens_network_listener_destinationreachablenoqocinfo (ISensNetwork*,BSTR,BSTR,ULONG); +static HRESULT WINAPI e_sens_network_listener_queryinterface (ISensNetwork *,REFIID,PVOID *); +static ULONG WINAPI e_sens_network_listener_addref (ISensNetwork *); +static ULONG WINAPI e_sens_network_listener_release (ISensNetwork *); +static HRESULT WINAPI e_sens_network_listener_gettypeinfocount (ISensNetwork *, UINT *); +static HRESULT WINAPI e_sens_network_listener_gettypeinfo (ISensNetwork *,UINT,LCID,ITypeInfo **); +static HRESULT WINAPI e_sens_network_listener_getidsofnames (ISensNetwork *,REFIID,LPOLESTR *,UINT,LCID, DISPID *); +static HRESULT WINAPI e_sens_network_listener_invoke (ISensNetwork *,DISPID,REFIID,LCID,WORD,DISPPARAMS *,VARIANT *,EXCEPINFO *,UINT *); +static HRESULT WINAPI e_sens_network_listener_connectionmade (ISensNetwork *,BSTR,ULONG,LPSENS_QOCINFO); +static HRESULT WINAPI e_sens_network_listener_connectionmadenoqocinfo (ISensNetwork *,BSTR,ULONG); +static HRESULT WINAPI e_sens_network_listener_connectionlost (ISensNetwork *,BSTR,ULONG); +static HRESULT WINAPI e_sens_network_listener_destinationreachable (ISensNetwork *,BSTR,BSTR,ULONG,LPSENS_QOCINFO); +static HRESULT WINAPI e_sens_network_listener_destinationreachablenoqocinfo (ISensNetwork *,BSTR,BSTR,ULONG); /* Initializing the VTable of our ESensNetworkListener object */ @@ -293,12 +293,12 @@ static ISensNetworkVtbl ESensNetworkListenerVtbl = { static HRESULT WINAPI e_sens_network_listener_queryinterface (ISensNetwork *This, - REFIID iid, - void **ppv) + REFIID iid, + gpointer *ppv) { if (IsEqualIID (iid, &IID_IUnknown) || IsEqualIID (iid, &IID_IDispatch) || IsEqualIID (iid, &IID_ISensNetwork)) { *ppv = This; - ((LPUNKNOWN)*ppv)->lpVtbl->AddRef ((LPUNKNOWN)*ppv); + ((LPUNKNOWN) * ppv)->lpVtbl->AddRef ((LPUNKNOWN) * ppv); return S_OK; } *ppv = NULL; @@ -308,67 +308,67 @@ e_sens_network_listener_queryinterface (ISensNetwork *This, static ULONG WINAPI e_sens_network_listener_addref (ISensNetwork *This) { - ESensNetworkListener *esnl_ptr=(ESensNetworkListener*) This; + ESensNetworkListener *esnl_ptr = (ESensNetworkListener *) This; return InterlockedIncrement (&(esnl_ptr->ref)); } static ULONG WINAPI e_sens_network_listener_release (ISensNetwork *This) { - ESensNetworkListener *esnl_ptr=(ESensNetworkListener*) This; + ESensNetworkListener *esnl_ptr = (ESensNetworkListener *) This; ULONG tmp = InterlockedDecrement (&(esnl_ptr->ref)); return tmp; } static HRESULT WINAPI e_sens_network_listener_gettypeinfocount (ISensNetwork *This, - UINT *pctinfo) + UINT *pctinfo) { return E_NOTIMPL; } static HRESULT WINAPI e_sens_network_listener_gettypeinfo (ISensNetwork *This, - UINT iTInfo, - LCID lcid, - ITypeInfo **ppTInfo) + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo) { return E_NOTIMPL; } static HRESULT WINAPI e_sens_network_listener_getidsofnames (ISensNetwork *This, - REFIID riid, - LPOLESTR *rgszNames, - UINT cNames, - LCID lcid, - DISPID *rgDispId) + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId) { return E_NOTIMPL; } static HRESULT WINAPI e_sens_network_listener_invoke (ISensNetwork *This, - DISPID dispIdMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS *pDispParams, - VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, - UINT *puArgErr) + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr) { return E_NOTIMPL; } static HRESULT WINAPI -e_sens_network_listener_connectionmade (ISensNetwork *This, - BSTR bstrConnection, - ULONG ulType, +e_sens_network_listener_connectionmade (ISensNetwork *This, + BSTR bstrConnection, + ULONG ulType, LPSENS_QOCINFO lpQOCInfo) { if (ulType) { - ESensNetworkListener *esnl_ptr=(ESensNetworkListener*) This; + ESensNetworkListener *esnl_ptr = (ESensNetworkListener *) This; EShell *shell = windows_sens_get_shell (esnl_ptr->ews_ptr); /* Wait a second so that the connection stabilizes */ g_usleep (G_USEC_PER_SEC); @@ -379,20 +379,19 @@ e_sens_network_listener_connectionmade (ISensNetwork *This, static HRESULT WINAPI e_sens_network_listener_connectionmadenoqocinfo (ISensNetwork *This, - BSTR bstrConnection, - ULONG ulType) + BSTR bstrConnection, + ULONG ulType) { - //Always followed by ConnectionMade return S_OK; } static HRESULT WINAPI e_sens_network_listener_connectionlost (ISensNetwork *This, - BSTR bstrConnection, - ULONG ulType) + BSTR bstrConnection, + ULONG ulType) { if (ulType) { - ESensNetworkListener *esnl_ptr=(ESensNetworkListener*) This; + ESensNetworkListener *esnl_ptr = (ESensNetworkListener *) This; EShell *shell = windows_sens_get_shell (esnl_ptr->ews_ptr); e_shell_set_network_available (shell, FALSE); } @@ -400,14 +399,14 @@ e_sens_network_listener_connectionlost (ISensNetwork *This, } static HRESULT WINAPI -e_sens_network_listener_destinationreachable (ISensNetwork *This, - BSTR bstrDestination, - BSTR bstrConnection, - ULONG ulType, +e_sens_network_listener_destinationreachable (ISensNetwork *This, + BSTR bstrDestination, + BSTR bstrConnection, + ULONG ulType, LPSENS_QOCINFO lpQOCInfo) { if (ulType) { - ESensNetworkListener *esnl_ptr=(ESensNetworkListener*) This; + ESensNetworkListener *esnl_ptr = (ESensNetworkListener *) This; EShell *shell = windows_sens_get_shell (esnl_ptr->ews_ptr); /* Wait a second so that the connection stabilizes */ g_usleep (G_USEC_PER_SEC); @@ -418,16 +417,16 @@ e_sens_network_listener_destinationreachable (ISensNetwork *This, static HRESULT WINAPI e_sens_network_listener_destinationreachablenoqocinfo (ISensNetwork *This, - BSTR bstrDestination, - BSTR bstrConnection, - ULONG ulType) + BSTR bstrDestination, + BSTR bstrConnection, + ULONG ulType) { return S_OK; } static void e_sens_network_listener_init (ESensNetworkListener **esnl_ptr, - EWindowsSENS *ews) + EWindowsSENS *ews) { (*esnl_ptr) = g_new0 (ESensNetworkListener,1); (*esnl_ptr)->lpVtbl = &ESensNetworkListenerVtbl; @@ -436,7 +435,7 @@ e_sens_network_listener_init (ESensNetworkListener **esnl_ptr, } static BSTR -_mb2wchar (const gchar * a) +_mb2wchar (const gchar *a) { static WCHAR b[64]; MultiByteToWideChar (0, 0, a, -1, b, 64); @@ -451,7 +450,7 @@ static const gchar * add_curly_braces_to_uuid (const gchar * string_uuid) return NULL; lstrcpy(curly_braced_uuid_string,"{"); i = strlen (curly_braced_uuid_string); - lstrcat (curly_braced_uuid_string+i,string_uuid); + lstrcat (curly_braced_uuid_string + i,string_uuid); i = strlen (curly_braced_uuid_string); lstrcat(curly_braced_uuid_string+i,"}"); return curly_braced_uuid_string; @@ -464,7 +463,7 @@ windows_sens_constructed (GObject *object) { HRESULT res; static IEventSystem *pEventSystem =0; - static IEventSubscription* pEventSubscription = 0; + static IEventSubscription * pEventSubscription = 0; static ESensNetworkListener *pESensNetworkListener = 0; static const gchar * eventclassid="{D5978620-5B9F-11D1-8DD2-00AA004ABD5E}"; static const gchar * methods[]={ @@ -488,51 +487,51 @@ windows_sens_constructed (GObject *object) CoInitialize (0); - res=CoCreateInstance (&CLSID_CEventSystem, 0,CLSCTX_SERVER,&IID_IEventSystem,(LPVOID*)&pEventSystem); + res = CoCreateInstance (&CLSID_CEventSystem, 0,CLSCTX_SERVER,&IID_IEventSystem,(LPVOID *) &pEventSystem); if (res == S_OK && pEventSystem) { - unsigned i; + guint i; - for (i=0; i<G_N_ELEMENTS (methods); i++) { + for (i = 0; i < G_N_ELEMENTS (methods); i++) { - res=CoCreateInstance (&CLSID_CEventSubscription, 0, CLSCTX_SERVER, &IID_IEventSubscription, (LPVOID*)&pEventSubscription); + res = CoCreateInstance (&CLSID_CEventSubscription, 0, CLSCTX_SERVER, &IID_IEventSubscription, (LPVOID *) &pEventSubscription); if (res == S_OK && pEventSubscription) { UUID tmp_uuid; UuidCreate (&tmp_uuid); UuidToString (&tmp_uuid, &subids[i]); - res=pEventSubscription->lpVtbl->put_SubscriptionID (pEventSubscription, _mb2wchar (add_curly_braces_to_uuid ((gchar *) subids[i]))); + res = pEventSubscription->lpVtbl->put_SubscriptionID (pEventSubscription, _mb2wchar (add_curly_braces_to_uuid ((gchar *) subids[i]))); if (res) { RpcStringFree (&subids[i]); break; } RpcStringFree (&subids[i]); - res=pEventSubscription->lpVtbl->put_SubscriptionName (pEventSubscription, _mb2wchar (names[i])); + res = pEventSubscription->lpVtbl->put_SubscriptionName (pEventSubscription, _mb2wchar (names[i])); if (res) break; - res=pEventSubscription->lpVtbl->put_MethodName (pEventSubscription, _mb2wchar (methods[i])); + res = pEventSubscription->lpVtbl->put_MethodName (pEventSubscription, _mb2wchar (methods[i])); if (res) break; - res=pEventSubscription->lpVtbl->put_EventClassID (pEventSubscription, _mb2wchar (eventclassid)); + res = pEventSubscription->lpVtbl->put_EventClassID (pEventSubscription, _mb2wchar (eventclassid)); if (res) break; - res=pEventSubscription->lpVtbl->put_SubscriberInterface (pEventSubscription, (IUnknown*) pESensNetworkListener); + res = pEventSubscription->lpVtbl->put_SubscriberInterface (pEventSubscription, (IUnknown *) pESensNetworkListener); if (res) break; /* Make the subscription receive the event only if the owner of the subscription * is logged on to the same computer as the publisher. This makes this module * work with normal user account without administrative privileges. */ - res=pEventSubscription->lpVtbl->put_PerUser (pEventSubscription, TRUE); + res = pEventSubscription->lpVtbl->put_PerUser (pEventSubscription, TRUE); if (res) break; - res=pEventSystem->lpVtbl->Store (pEventSystem, (BSTR) PROGID_EventSubscription, (IUnknown*) pEventSubscription); + res = pEventSystem->lpVtbl->Store (pEventSystem, (BSTR) PROGID_EventSubscription, (IUnknown *) pEventSubscription); if (res) break; pEventSubscription->lpVtbl->Release (pEventSubscription); - pEventSubscription=0; + pEventSubscription = 0; } } if (pEventSubscription) @@ -545,7 +544,7 @@ windows_sens_constructed (GObject *object) */ if (res == S_OK) { - typedef BOOL (WINAPI* IsNetworkAlive_t) (LPDWORD); + typedef BOOL (WINAPI * IsNetworkAlive_t) (LPDWORD); BOOL alive = TRUE; EShell *shell = windows_sens_get_shell (extension); @@ -571,11 +570,11 @@ windows_sens_constructed (GObject *object) strcat (buf, G_DIR_SEPARATOR_S); strcat (buf, SENSAPI_DLL); - hDLL=LoadLibrary (buf); + hDLL = LoadLibrary (buf); if ((pIsNetworkAlive=(IsNetworkAlive_t) GetProcAddress (hDLL, "IsNetworkAlive"))) { DWORD Network; - alive=pIsNetworkAlive (&Network); + alive = pIsNetworkAlive (&Network); } FreeLibrary (hDLL); |