diff options
127 files changed, 2875 insertions, 2821 deletions
diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h index 30f00e7f8d..b806d5207d 100644 --- a/a11y/ea-factory.h +++ b/a11y/ea-factory.h @@ -46,7 +46,7 @@ type_as_function ## _factory_create_accessible (GObject *obj) \ { \ GtkWidget *widget; \ AtkObject *accessible; \ - \ + \ g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL); \ \ widget = GTK_WIDGET (obj); \ @@ -105,11 +105,11 @@ type_as_function ## _factory_get_type (void) \ #define EA_SET_FACTORY(obj_type, type_as_function) \ { \ - if (atk_get_root ()) { \ - atk_registry_set_factory_type (atk_get_default_registry (), \ - obj_type, \ - type_as_function ## _factory_get_type ());\ - } \ + if (atk_get_root ()) { \ + atk_registry_set_factory_type (atk_get_default_registry (), \ + obj_type, \ + type_as_function ## _factory_get_type ());\ + } \ } #endif /* _EA_FACTORY_H__ */ diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 2ef0fd0ee9..55709ed081 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -71,17 +71,17 @@ enum { NUM_IM_COLUMNS }; -static void e_contact_editor_init (EContactEditor *editor); -static void e_contact_editor_class_init (EContactEditorClass *klass); +static void e_contact_editor_init (EContactEditor *editor); +static void e_contact_editor_class_init (EContactEditorClass *klass); static void e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void e_contact_editor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void e_contact_editor_dispose (GObject *object); -static void e_contact_editor_raise (EABEditor *editor); -static void e_contact_editor_show (EABEditor *editor); -static void e_contact_editor_save_contact (EABEditor *editor, gboolean should_close); -static void e_contact_editor_close (EABEditor *editor); -static gboolean e_contact_editor_is_valid (EABEditor *editor); +static void e_contact_editor_raise (EABEditor *editor); +static void e_contact_editor_show (EABEditor *editor); +static void e_contact_editor_save_contact (EABEditor *editor, gboolean should_close); +static void e_contact_editor_close (EABEditor *editor); +static gboolean e_contact_editor_is_valid (EABEditor *editor); static gboolean e_contact_editor_is_changed (EABEditor *editor); static GtkWindow* e_contact_editor_get_window (EABEditor *editor); @@ -290,61 +290,85 @@ e_contact_editor_class_init (EContactEditorClass *klass) editor_class->contact_deleted = e_contact_editor_contact_deleted; editor_class->editor_closed = e_contact_editor_closed; - g_object_class_install_property (object_class, PROP_SOURCE_BOOK, - g_param_spec_object ("source_book", - "Source Book", - NULL, - E_TYPE_BOOK, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_TARGET_BOOK, - g_param_spec_object ("target_book", - "Target Book", - NULL, - E_TYPE_BOOK, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_CONTACT, - g_param_spec_object ("contact", - "Contact", - NULL, - E_TYPE_CONTACT, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_IS_NEW_CONTACT, - g_param_spec_boolean ("is_new_contact", - "Is New Contact", - NULL, - FALSE, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_WRITABLE_FIELDS, - g_param_spec_object ("writable_fields", - "Writable Fields", - NULL, - E_TYPE_LIST, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_REQUIRED_FIELDS, - g_param_spec_object ("required_fields", - "Required Fields", - NULL, - E_TYPE_LIST, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_EDITABLE, - g_param_spec_boolean ("editable", - "Editable", - NULL, - FALSE, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_CHANGED, - g_param_spec_boolean ("changed", - "Changed", - NULL, - FALSE, - G_PARAM_READWRITE)); + g_object_class_install_property ( + object_class, + PROP_SOURCE_BOOK, + g_param_spec_object ( + "source_book", + "Source Book", + NULL, + E_TYPE_BOOK, + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, + PROP_TARGET_BOOK, + g_param_spec_object ( + "target_book", + "Target Book", + NULL, + E_TYPE_BOOK, + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, + PROP_CONTACT, + g_param_spec_object ( + "contact", + "Contact", + NULL, + E_TYPE_CONTACT, + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, + PROP_IS_NEW_CONTACT, + g_param_spec_boolean ( + "is_new_contact", + "Is New Contact", + NULL, + FALSE, + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, + PROP_WRITABLE_FIELDS, + g_param_spec_object ( + "writable_fields", + "Writable Fields", + NULL, + E_TYPE_LIST, + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, + PROP_REQUIRED_FIELDS, + g_param_spec_object ( + "required_fields", + "Required Fields", + NULL, + E_TYPE_LIST, + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, + PROP_EDITABLE, + g_param_spec_boolean ( + "editable", + "Editable", + NULL, + FALSE, + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, + PROP_CHANGED, + g_param_spec_boolean ( + "changed", + "Changed", + NULL, + FALSE, + G_PARAM_READWRITE)); } static void @@ -392,13 +416,13 @@ style_makes_sense (const EContactName *name, const gchar *company, gint style) case 0: /* Fall Through */ case 1: return TRUE; - case 2: - if (name) { - if (name->additional && *name->additional) - return TRUE; - else - return FALSE; - } + case 2: + if (name) { + if (name->additional && *name->additional) + return TRUE; + else + return FALSE; + } case 3: if (company && *company) return TRUE; @@ -420,7 +444,7 @@ name_to_style (const EContactName *name, const gchar *company, gint style) { gchar *string; gchar *strings[4], **stringptr; - gchar *midstring[4], **midstrptr; + gchar *midstring[4], **midstrptr; gchar *substring; switch (style) { case 0: @@ -445,17 +469,17 @@ name_to_style (const EContactName *name, const gchar *company, gint style) *stringptr = NULL; string = g_strjoinv(" ", strings); break; - case 2: - midstrptr=midstring; - if (name) { - if (name->family && *name->family) + case 2: + midstrptr=midstring; + if (name) { + if (name->family && *name->family) *(midstrptr++) = name->family; - if (name->given && *name->given) + if (name->given && *name->given) *(midstrptr++) = name->given; - } - *midstrptr = NULL; - stringptr = strings; - *(stringptr++) = g_strjoinv(", ", midstring); + } + *midstrptr = NULL; + stringptr = strings; + *(stringptr++) = g_strjoinv(", ", midstring); if (name) { if (name->additional && *name->additional) *(stringptr++) = name->additional; @@ -709,22 +733,22 @@ set_entry_text (EContactEditor *editor, GtkEntry *entry, const gchar *string) string = ""; if (strcmp (string, oldstring)) { - g_signal_handlers_block_matched (entry, G_SIGNAL_MATCH_DATA, - 0, 0, NULL, NULL, editor); + g_signal_handlers_block_matched ( + entry, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor); gtk_entry_set_text (entry, string); - g_signal_handlers_unblock_matched (entry, G_SIGNAL_MATCH_DATA, - 0, 0, NULL, NULL, editor); + g_signal_handlers_unblock_matched ( + entry, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor); } } static void set_combo_box_active (EContactEditor *editor, GtkComboBox *combo_box, gint active) { - g_signal_handlers_block_matched (combo_box, G_SIGNAL_MATCH_DATA, - 0, 0, NULL, NULL, editor); + g_signal_handlers_block_matched ( + combo_box, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor); gtk_combo_box_set_active (combo_box, active); - g_signal_handlers_unblock_matched (combo_box, G_SIGNAL_MATCH_DATA, - 0, 0, NULL, NULL, editor); + g_signal_handlers_unblock_matched ( + combo_box, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor); } static void @@ -776,8 +800,9 @@ fill_in_email_record (EContactEditor *editor, gint record, const gchar *address, email_entry = e_builder_get_widget (editor->builder, widget_name); g_free (widget_name); - set_combo_box_active (editor, GTK_COMBO_BOX (location_combo_box), - location >= 0 ? location : email_default[2]); + set_combo_box_active ( + editor, GTK_COMBO_BOX (location_combo_box), + location >= 0 ? location : email_default[2]); set_entry_text (editor, GTK_ENTRY (email_entry), address ? address : ""); } @@ -854,7 +879,8 @@ get_phone_type (EVCardAttribute *attr) for (i = 0; i < G_N_ELEMENTS (phones); i++) { if (e_vcard_attribute_has_type (attr, phones[i].type_1) && - (phones[i].type_2 == NULL || e_vcard_attribute_has_type (attr, phones[i].type_2))) + (phones[i].type_2 == NULL || + e_vcard_attribute_has_type (attr, phones[i].type_2))) return i; } @@ -997,8 +1023,9 @@ fill_in_email (EContactEditor *editor) if (slot < 1) break; - fill_in_email_record (editor, slot, email_address, - get_email_location (attr)); + fill_in_email_record ( + editor, slot, email_address, + get_email_location (attr)); record_n++; } @@ -1109,10 +1136,9 @@ init_item_sensitiveable_combo_box (GtkComboBox *combo) cell = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), cell, - "text", 0, - "sensitive", 1, - NULL); + gtk_cell_layout_set_attributes ( + GTK_CELL_LAYOUT (combo), cell, + "text", 0, "sensitive", 1, NULL); } /* EContact can get attributes by field ID only, and there is none for TEL, so we need this */ @@ -1156,8 +1182,8 @@ set_attributes_named (EVCard *vcard, const gchar *attr_name, GList *attr_list) static void set_arrow_image (EContactEditor *editor, - const gchar *arrow_widget, - gboolean expanded) + const gchar *arrow_widget, + gboolean expanded) { GtkWidget *arrow; @@ -1170,8 +1196,8 @@ set_arrow_image (EContactEditor *editor, static void expand_widget_list (EContactEditor *editor, - const gchar **widget_names, - gboolean expanded) + const gchar **widget_names, + gboolean expanded) { gint i; for (i = 0; widget_names[i]; i++) @@ -1261,9 +1287,9 @@ fill_in_phone_record (EContactEditor *editor, gint record, const gchar *phone, g phone_entry = e_builder_get_widget (editor->builder, widget_name); g_free (widget_name); - set_combo_box_active (editor, GTK_COMBO_BOX (phone_type_combo_box), - phone_type >= 0 ? phone_type : - phones_default[record - 1]); + set_combo_box_active ( + editor, GTK_COMBO_BOX (phone_type_combo_box), + phone_type >= 0 ? phone_type : phones_default[record - 1]); set_entry_text (editor, GTK_ENTRY (phone_entry), phone ? phone : ""); if (phone && *phone && record >= 5) @@ -1316,8 +1342,8 @@ fill_in_phone (EContactEditor *editor) if (slot < 1) break; - fill_in_phone_record (editor, slot, phone, - get_phone_type (attr)); + fill_in_phone_record ( + editor, slot, phone, get_phone_type (attr)); record_n++; } @@ -1604,11 +1630,13 @@ fill_in_im_record (EContactEditor *editor, gint record, gint service, const gcha g_free (widget_name); #ifdef ENABLE_IM_LOCATION - set_combo_box_active (editor, GTK_COMBO_BOX (location_combo_box), - location >= 0 ? location : 0); + set_combo_box_active ( + editor, GTK_COMBO_BOX (location_combo_box), + location >= 0 ? location : 0); #endif - set_combo_box_active (editor, GTK_COMBO_BOX (service_combo_box), - service >= 0 ? service : im_service_default[record - 1]); + set_combo_box_active ( + editor, GTK_COMBO_BOX (service_combo_box), + service >= 0 ? service : im_service_default[record - 1]); set_entry_text (editor, GTK_ENTRY (name_entry), name ? name : ""); } @@ -1641,8 +1669,9 @@ fill_in_im (EContactEditor *editor) if (slot < 1) break; - fill_in_im_record (editor, slot, i, im_name, - get_im_location (attr)); + fill_in_im_record ( + editor, slot, i, im_name, + get_im_location (attr)); record_n++; } @@ -1738,8 +1767,10 @@ extract_im (EContactEditor *editor) old_service_attr_list = l; service_attr_list[i] = g_list_concat (service_attr_list[i], old_service_attr_list); - e_contact_set_attributes (editor->contact, im_service[i].field, - service_attr_list[i]); + e_contact_set_attributes ( + editor->contact, + im_service[i].field, + service_attr_list[i]); free_attr_list (service_attr_list[i]); } @@ -1832,8 +1863,8 @@ static void init_personal (EContactEditor *editor) { gtk_expander_set_expanded ( - GTK_EXPANDER (e_builder_get_widget (editor->builder, - "expander-personal-misc")), + GTK_EXPANDER (e_builder_get_widget ( + editor->builder, "expander-personal-misc")), !editor->compress_ui); expand_web (editor, !editor->compress_ui); @@ -1888,8 +1919,8 @@ init_address (EContactEditor *editor) init_address_record (editor, i); gtk_expander_set_expanded ( - GTK_EXPANDER (e_builder_get_widget (editor->builder, - "expander-address-other")), + GTK_EXPANDER (e_builder_get_widget ( + editor->builder, "expander-address-other")), !editor->compress_ui); } @@ -1935,8 +1966,10 @@ fill_in_address_label_textview (EContactEditor *editor, gint record, const gchar } static void -fill_in_address_field (EContactEditor *editor, gint record, const gchar *widget_field_name, - const gchar *string) +fill_in_address_field (EContactEditor *editor, + gint record, + const gchar *widget_field_name, + const gchar *string) { gchar *entry_name; GtkWidget *entry; @@ -2140,8 +2173,10 @@ sensitize_address_textview (EContactEditor *editor, gint record, gboolean enable } static void -sensitize_address_field (EContactEditor *editor, gint record, const gchar *widget_field_name, - gboolean enabled) +sensitize_address_field (EContactEditor *editor, + gint record, + const gchar *widget_field_name, + gboolean enabled) { gchar *widget_name; GtkWidget *entry; @@ -2286,8 +2321,9 @@ init_simple_field (EContactEditor *editor, GtkWidget *widget) } else if (E_IS_URL_ENTRY (widget)) { changed_object = G_OBJECT (e_url_entry_get_entry (E_URL_ENTRY (widget))); - g_signal_connect_swapped (GTK_WIDGET (changed_object), "activate", - G_CALLBACK (entry_activated), editor); + g_signal_connect_swapped ( + changed_object, "activate", + G_CALLBACK (entry_activated), editor); } else if (E_IS_DATE_EDIT (widget)) { changed_object = G_OBJECT (widget); @@ -2311,8 +2347,8 @@ fill_in_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) contact = editor->contact; - g_signal_handlers_block_matched (widget, G_SIGNAL_MATCH_DATA, - 0, 0, NULL, NULL, editor); + g_signal_handlers_block_matched ( + widget, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor); if (GTK_IS_ENTRY (widget)) { gchar *text = e_contact_get (contact, field_id); @@ -2339,10 +2375,9 @@ fill_in_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) else if (E_IS_DATE_EDIT (widget)) { EContactDate *date = e_contact_get (contact, field_id); if (date) - e_date_edit_set_date (E_DATE_EDIT (widget), - date->year, - date->month, - date->day); + e_date_edit_set_date ( + E_DATE_EDIT (widget), + date->year, date->month, date->day); else e_date_edit_set_time (E_DATE_EDIT (widget), -1); @@ -2374,8 +2409,8 @@ fill_in_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) g_warning (G_STRLOC ": Unhandled widget class in mappings!"); } - g_signal_handlers_unblock_matched (widget, G_SIGNAL_MATCH_DATA, - 0, 0, NULL, NULL, editor); + g_signal_handlers_unblock_matched ( + widget, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor); } static void @@ -2430,10 +2465,11 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) } else if (E_IS_DATE_EDIT (widget)) { EContactDate date; - if (e_date_edit_get_date (E_DATE_EDIT (widget), - (gint *)&date.year, - (gint *)&date.month, - (gint *)&date.day)) + if (e_date_edit_get_date ( + E_DATE_EDIT (widget), + (gint *)&date.year, + (gint *)&date.month, + (gint *)&date.day)) e_contact_set (contact, field_id, &date); else e_contact_set (contact, field_id, NULL); @@ -2446,8 +2482,9 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) { gchar *img_buff = NULL; if (editor->image_set && - e_image_chooser_get_image_data (E_IMAGE_CHOOSER (widget), - &img_buff, &photo.data.inlined.length)) { + e_image_chooser_get_image_data ( + E_IMAGE_CHOOSER (widget), + &img_buff, &photo.data.inlined.length)) { GdkPixbuf *pixbuf, *new; GdkPixbufLoader *loader = gdk_pixbuf_loader_new (); @@ -2596,9 +2633,7 @@ fill_in_simple (EContactEditor *editor) /* Update broken-up name */ - g_object_get (editor->contact, - "name", &name, - NULL); + g_object_get (editor->contact, "name", &name, NULL); if (editor->name) e_contact_name_free (editor->name); @@ -2717,7 +2752,7 @@ init_all (EContactEditor *editor) init_address (editor); /* with so many scrolled windows, we need to - do some manual sizing */ + * do some manual sizing */ gtk_widget_get_preferred_size ( e_builder_get_widget (editor->builder, "vbox-size-leader"), &tab_req, NULL); gtk_widget_set_size_request ( @@ -2808,14 +2843,10 @@ full_name_response (GtkDialog *dialog, gint response, EContactEditor *editor) gint style = 0; gboolean editable = FALSE; - g_object_get (dialog, - "editable", &editable, - NULL); + g_object_get (dialog, "editable", &editable, NULL); if (editable && response == GTK_RESPONSE_OK) { - g_object_get (dialog, - "name", &name, - NULL); + g_object_get (dialog, "name", &name, NULL); style = file_as_get_style (editor); @@ -2862,16 +2893,17 @@ full_name_clicked (GtkWidget *button, EContactEditor *editor) dialog = GTK_DIALOG (e_contact_editor_fullname_new (editor->name)); fullname_supported = is_field_supported (editor, E_CONTACT_FULL_NAME); - g_object_set (dialog, - "editable", fullname_supported & editor->target_editable, - NULL); + g_object_set ( + dialog, "editable", + fullname_supported & editor->target_editable, NULL); g_signal_connect(dialog, "response", G_CALLBACK (full_name_response), editor); /* Close the fullname dialog if the editor is closed */ - g_signal_connect_swapped (EAB_EDITOR (editor), "editor_closed", - G_CALLBACK (full_name_editor_delete_event_cb), GTK_WIDGET (dialog)); + g_signal_connect_swapped ( + editor, "editor_closed", + G_CALLBACK (full_name_editor_delete_event_cb), dialog); gtk_widget_show (GTK_WIDGET (dialog)); editor->fullname_dialog = GTK_WIDGET (dialog); @@ -2921,9 +2953,9 @@ categories_clicked (GtkWidget *button, EContactEditor *editor) g_free (categories); return; }else if (!(dialog = GTK_DIALOG (e_categories_dialog_new (categories)))) { - e_alert_run_dialog_for_args (GTK_WINDOW (editor->app), - "addressbook:edit-categories", - NULL); + e_alert_run_dialog_for_args ( + GTK_WINDOW (editor->app), + "addressbook:edit-categories", NULL); g_free (categories); return; } @@ -2932,8 +2964,9 @@ categories_clicked (GtkWidget *button, EContactEditor *editor) G_CALLBACK (categories_response), editor); /* Close the category dialog if the editor is closed*/ - g_signal_connect_swapped (EAB_EDITOR (editor), "editor_closed", - G_CALLBACK (categories_editor_delete_event_cb), GTK_WIDGET (dialog)); + g_signal_connect_swapped ( + editor, "editor_closed", + G_CALLBACK (categories_editor_delete_event_cb), dialog); gtk_widget_show (GTK_WIDGET (dialog)); g_free (categories); @@ -3039,27 +3072,30 @@ image_clicked (GtkWidget *button, EContactEditor *editor) GtkImage *preview; if (!editor->file_selector) { - editor->file_selector = gtk_file_chooser_dialog_new (title, - GTK_WINDOW (editor->app), - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - no_image, GTK_RESPONSE_NO, - NULL); + editor->file_selector = gtk_file_chooser_dialog_new ( + title, GTK_WINDOW (editor->app), + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + no_image, GTK_RESPONSE_NO, + NULL); preview = GTK_IMAGE (gtk_image_new ()); gtk_file_chooser_set_preview_widget ((GtkFileChooser *)editor->file_selector, GTK_WIDGET (preview)); - g_signal_connect (editor->file_selector, "update-preview", - G_CALLBACK (update_preview_cb), preview); + g_signal_connect ( + editor->file_selector, "update-preview", + G_CALLBACK (update_preview_cb), preview); gtk_dialog_set_default_response (GTK_DIALOG (editor->file_selector), GTK_RESPONSE_ACCEPT); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (editor->file_selector), g_get_home_dir ()); - g_signal_connect (editor->file_selector, "response", - G_CALLBACK (file_chooser_response), editor); + g_signal_connect ( + editor->file_selector, "response", + G_CALLBACK (file_chooser_response), editor); - g_signal_connect_after (editor->file_selector, - "delete-event", G_CALLBACK (file_selector_deleted), - editor->file_selector); + g_signal_connect_after ( + editor->file_selector, "delete-event", + G_CALLBACK (file_selector_deleted), + editor->file_selector); } /* Display the dialog */ @@ -3116,8 +3152,9 @@ contact_added_cb (EBook *book, const GError *error, const gchar *id, EditorClose if (ce->source_book != ce->target_book && e_book_is_writable (ce->source_book) && !error && ce->is_new_contact == FALSE) { ecs->new_id = g_strdup (id); - e_book_remove_contact_async (ce->source_book, ce->contact, - (EBookAsyncCallback) contact_moved_cb, ecs); + e_book_remove_contact_async ( + ce->source_book, ce->contact, + (EBookAsyncCallback) contact_moved_cb, ecs); return; } @@ -3186,15 +3223,18 @@ real_save_contact (EContactEditor *ce, gboolean should_close) if (ce->source_book != ce->target_book) { /* Two-step move; add to target, then remove from source */ - eab_merging_book_add_contact (ce->target_book, ce->contact, - (EBookIdAsyncCallback) contact_added_cb, ecs); + eab_merging_book_add_contact ( + ce->target_book, ce->contact, + (EBookIdAsyncCallback) contact_added_cb, ecs); } else { if (ce->is_new_contact) - eab_merging_book_add_contact (ce->target_book, ce->contact, - (EBookIdAsyncCallback) contact_added_cb, ecs); + eab_merging_book_add_contact ( + ce->target_book, ce->contact, + (EBookIdAsyncCallback) contact_added_cb, ecs); else - eab_merging_book_commit_contact (ce->target_book, ce->contact, - (EBookAsyncCallback) contact_modified_cb, ecs); + eab_merging_book_commit_contact ( + ce->target_book, ce->contact, + (EBookAsyncCallback) contact_modified_cb, ecs); } } @@ -3209,9 +3249,10 @@ save_contact (EContactEditor *ce, gboolean should_close) return; if (ce->target_editable && !e_book_is_writable (ce->source_book)) { - if (e_alert_run_dialog_for_args (GTK_WINDOW (ce->app), - "addressbook:prompt-move", - NULL) == GTK_RESPONSE_NO) + if (e_alert_run_dialog_for_args ( + GTK_WINDOW (ce->app), + "addressbook:prompt-move", + NULL) == GTK_RESPONSE_NO) return; } @@ -3357,10 +3398,10 @@ e_contact_editor_is_valid (EABEditor *editor) if (validation_error) { g_string_append (errmsg, "."); - e_alert_run_dialog_for_args (GTK_WINDOW (ce->app), - "addressbook:generic-error", - _("Invalid contact."), errmsg->str, - NULL); + e_alert_run_dialog_for_args ( + GTK_WINDOW (ce->app), + "addressbook:generic-error", + _("Invalid contact."), errmsg->str, NULL); g_string_free (errmsg, TRUE); return FALSE; } @@ -3625,8 +3666,9 @@ e_contact_editor_init (EContactEditor *e_contact_editor) /* Connect to the deletion of the dialog */ - g_signal_connect (e_contact_editor->app, "delete_event", - G_CALLBACK (app_delete_event_cb), e_contact_editor); + g_signal_connect ( + e_contact_editor->app, "delete_event", + G_CALLBACK (app_delete_event_cb), e_contact_editor); /* set the icon */ gtk_window_set_icon_name (GTK_WINDOW (e_contact_editor->app), "contact-editor"); @@ -3691,17 +3733,17 @@ e_contact_editor_dispose (GObject *object) } static void -supported_fields_cb (EBook *book, const GError *error, - EList *fields, EContactEditor *ce) +supported_fields_cb (EBook *book, + const GError *error, + EList *fields, + EContactEditor *ce) { if (!g_slist_find (eab_editor_get_all_editors (), ce)) { g_warning ("supported_fields_cb called for book that's still around, but contact editor that's been destroyed."); return; } - g_object_set (ce, - "writable_fields", fields, - NULL); + g_object_set (ce, "writable_fields", fields, NULL); eab_editor_show (EAB_EDITOR (ce)); @@ -3709,8 +3751,10 @@ supported_fields_cb (EBook *book, const GError *error, } static void -required_fields_cb (EBook *book, const GError *error, - EList *fields, EContactEditor *ce) +required_fields_cb (EBook *book, + const GError *error, + EList *fields, + EContactEditor *ce) { if (!g_slist_find (eab_editor_get_all_editors (), ce)) { @@ -3718,9 +3762,7 @@ required_fields_cb (EBook *book, const GError *error, return; } - g_object_set (ce, - "required_fields", fields, - NULL); + g_object_set (ce, "required_fields", fields, NULL); } @@ -3739,12 +3781,13 @@ e_contact_editor_new (EShell *shell, editor = g_object_new (E_TYPE_CONTACT_EDITOR, "shell", shell, NULL); - g_object_set (editor, - "source_book", book, - "contact", contact, - "is_new_contact", is_new_contact, - "editable", editable, - NULL); + g_object_set ( + editor, + "source_book", book, + "contact", contact, + "is_new_contact", is_new_contact, + "editable", editable, + NULL); if (book) e_book_get_supported_fields_async ( @@ -3798,13 +3841,18 @@ e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *val editor->target_book = editor->source_book; g_object_ref (editor->target_book); - editor->target_editable_id = g_signal_connect (editor->target_book, "writable_status", - G_CALLBACK (writable_changed), editor); - - e_book_get_supported_fields_async (editor->target_book, - (EBookEListAsyncCallback) supported_fields_cb, editor); - e_book_get_required_fields_async (editor->target_book, - (EBookEListAsyncCallback) required_fields_cb, editor); + editor->target_editable_id = g_signal_connect ( + editor->target_book, "writable_status", + G_CALLBACK (writable_changed), editor); + + e_book_get_supported_fields_async ( + editor->target_book, + (EBookEListAsyncCallback) + supported_fields_cb, editor); + e_book_get_required_fields_async ( + editor->target_book, + (EBookEListAsyncCallback) + required_fields_cb, editor); } writable = e_book_is_writable (editor->target_book); @@ -3837,14 +3885,19 @@ e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *val editor->target_book = target_book; g_object_ref (editor->target_book); - editor->target_editable_id = g_signal_connect (editor->target_book, "writable_status", - G_CALLBACK (writable_changed), editor); - - e_book_get_supported_fields_async (editor->target_book, - (EBookEListAsyncCallback) supported_fields_cb, editor); + editor->target_editable_id = g_signal_connect ( + editor->target_book, "writable_status", + G_CALLBACK (writable_changed), editor); - e_book_get_required_fields_async (editor->target_book, - (EBookEListAsyncCallback) required_fields_cb, editor); + e_book_get_supported_fields_async ( + editor->target_book, + (EBookEListAsyncCallback) + supported_fields_cb, editor); + + e_book_get_required_fields_async ( + editor->target_book, + (EBookEListAsyncCallback) + required_fields_cb, editor); if (!editor->is_new_contact) editor->changed = TRUE; diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index aa12810b84..1e88b50209 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -48,14 +48,10 @@ unlink_model (EAddressbookTableAdapter *adapter) { EAddressbookTableAdapterPrivate *priv = adapter->priv; - g_signal_handler_disconnect (priv->model, - priv->create_contact_id); - g_signal_handler_disconnect (priv->model, - priv->remove_contact_id); - g_signal_handler_disconnect (priv->model, - priv->modify_contact_id); - g_signal_handler_disconnect (priv->model, - priv->model_changed_id); + g_signal_handler_disconnect (priv->model, priv->create_contact_id); + g_signal_handler_disconnect (priv->model, priv->remove_contact_id); + g_signal_handler_disconnect (priv->model, priv->modify_contact_id); + g_signal_handler_disconnect (priv->model, priv->model_changed_id); priv->create_contact_id = 0; priv->remove_contact_id = 0; @@ -143,8 +139,9 @@ addressbook_value_at (ETableModel *etc, gint col, gint row) /* This function sets the value at a particular point in our ETableModel. */ static void -contact_modified_cb (EBook* book, const GError *error, - gpointer user_data) +contact_modified_cb (EBook* book, + const GError *error, + gpointer user_data) { if (error) eab_error_dialog (NULL, _("Error modifying card"), error); @@ -177,8 +174,9 @@ addressbook_set_value_at (ETableModel *etc, gint col, gint row, gconstpointer va } e_contact_set (contact, col, (gpointer) val); - eab_merging_book_commit_contact (e_addressbook_model_get_book (priv->model), - contact, contact_modified_cb, etc); + eab_merging_book_commit_contact ( + e_addressbook_model_get_book (priv->model), + contact, contact_modified_cb, etc); g_object_unref (contact); @@ -205,7 +203,7 @@ addressbook_is_cell_editable (ETableModel *etc, gint col, gint row) return FALSE; else if (contact && e_contact_get ((EContact *) contact, E_CONTACT_IS_LIST)) /* we only allow editing of the name and file as for - lists */ + * lists */ return col == E_CONTACT_FULL_NAME || col == E_CONTACT_FILE_AS; else return col < E_CONTACT_LAST_SIMPLE_STRING; @@ -343,7 +341,7 @@ modify_contact (EAddressbookModel *model, static void model_changed (EAddressbookModel *model, - EAddressbookTableAdapter *adapter) + EAddressbookTableAdapter *adapter) { /* clear whole cache */ g_hash_table_remove_all (adapter->priv->emails); @@ -378,31 +376,33 @@ eab_table_adapter_get_type (void) void eab_table_adapter_construct (EAddressbookTableAdapter *adapter, - EAddressbookModel *model) + EAddressbookModel *model) { EAddressbookTableAdapterPrivate *priv = adapter->priv; priv->model = model; g_object_ref (priv->model); - priv->create_contact_id = g_signal_connect (priv->model, - "contact_added", - G_CALLBACK (create_contact), - adapter); - priv->remove_contact_id = g_signal_connect (priv->model, - "contacts_removed", - G_CALLBACK (remove_contacts), - adapter); - priv->modify_contact_id = g_signal_connect (priv->model, - "contact_changed", - G_CALLBACK (modify_contact), - adapter); - priv->model_changed_id = g_signal_connect (priv->model, - "model_changed", - G_CALLBACK (model_changed), - adapter); - - priv->emails = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, (GDestroyNotify) g_free); + priv->create_contact_id = g_signal_connect ( + priv->model, "contact_added", + G_CALLBACK (create_contact), adapter); + + priv->remove_contact_id = g_signal_connect ( + priv->model, "contacts_removed", + G_CALLBACK (remove_contacts), adapter); + + priv->modify_contact_id = g_signal_connect ( + priv->model, "contact_changed", + G_CALLBACK (modify_contact), adapter); + + priv->model_changed_id = g_signal_connect ( + priv->model, "model_changed", + G_CALLBACK (model_changed), adapter); + + priv->emails = g_hash_table_new_full ( + g_str_hash, g_str_equal, + (GDestroyNotify) g_free, + (GDestroyNotify) g_free); } ETableModel * diff --git a/addressbook/gui/widgets/ea-addressbook.c b/addressbook/gui/widgets/ea-addressbook.c index 797d76d956..8ac2607232 100644 --- a/addressbook/gui/widgets/ea-addressbook.c +++ b/addressbook/gui/widgets/ea-addressbook.c @@ -72,7 +72,7 @@ ea_addressbook_focus_watcher (GSignalInvocationHint *ihint, event = g_value_get_boxed (param_values + 1); if (E_IS_MINICARD (object)) { - GnomeCanvasItem *item = GNOME_CANVAS_ITEM (object); + GnomeCanvasItem *item = GNOME_CANVAS_ITEM (object); ea_event = atk_gobject_accessible_for_object (object); if (event->type == GDK_FOCUS_CHANGE) { if ((event->focus_change.in) && (E_IS_MINICARD (item->canvas->focused_item))) diff --git a/addressbook/gui/widgets/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c index bb38b64ecc..cc35d577b0 100644 --- a/addressbook/gui/widgets/ea-minicard-view.c +++ b/addressbook/gui/widgets/ea-minicard-view.c @@ -371,7 +371,7 @@ static gboolean atk_action_interface_do_action (AtkAction *action, gint i) EMinicardView *card_view; AtkGObjectAccessible *atk_gobj= NULL; - EReflow *reflow = NULL; + EReflow *reflow = NULL; atk_gobj = ATK_GOBJECT_ACCESSIBLE (action); reflow = E_REFLOW (atk_gobject_accessible_get_object (atk_gobj)); diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index d78f29e0d7..d8d5e6e754 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -408,7 +408,7 @@ resolve_list_card (LDIFImporter *gci, EContact *contact) gchar *full_name; /* set file_as to full_name so we don't later try and figure - out a first/last name for the list. */ + out a first/last name for the list. */ full_name = e_contact_get (contact, E_CONTACT_FULL_NAME); if (full_name) e_contact_set (contact, E_CONTACT_FILE_AS, full_name); diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c index e0bbf10245..d5c6678cc4 100644 --- a/calendar/gui/alarm-notify/util.c +++ b/calendar/gui/alarm-notify/util.c @@ -61,7 +61,7 @@ calculate_time (time_t start, time_t end) gchar *joined; gint i; - i = 0; + i = 0; if (difference >= 3600) { hours = difference / 3600; difference %= 3600; diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 418bf8a704..6d4219c2b4 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -129,7 +129,7 @@ static const gint action_map[] = { static const gchar *action_map_cap[] = { CAL_STATIC_CAPABILITY_NO_DISPLAY_ALARMS, CAL_STATIC_CAPABILITY_NO_AUDIO_ALARMS, - CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS, + CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS, CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS }; @@ -499,46 +499,46 @@ malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) static void alarm_to_malarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm ) { - ENameSelectorModel *name_selector_model; - EDestinationStore *destination_store; - ECalComponentText description; - GtkTextBuffer *text_buffer; - GSList *attendee_list, *l; - gint len; - - /* Attendees */ - name_selector_model = e_name_selector_peek_model (dialog->name_selector); - e_name_selector_model_peek_section (name_selector_model, section_name, NULL, &destination_store); - - e_cal_component_alarm_get_attendee_list (alarm, &attendee_list); - len = g_slist_length (attendee_list); - if (len > 0) { - for (l = attendee_list; l; l = g_slist_next (l)) { - ECalComponentAttendee *a = l->data; - EDestination *dest; - - dest = e_destination_new (); - if (a->cn != NULL && *a->cn) - e_destination_set_name (dest, a->cn); - if (a->value != NULL && *a->value) { - if (!strncasecmp (a->value, "MAILTO:", 7)) - e_destination_set_email (dest, a->value + 7); - else - e_destination_set_email (dest, a->value); - } - e_destination_store_append_destination (destination_store, dest); - g_object_unref (G_OBJECT (dest)); - } - e_cal_component_free_attendee_list (attendee_list); - } - - /* Description */ - e_cal_component_alarm_get_description (alarm, &description); - if (description.value) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->malarm_message), TRUE); - text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description)); - gtk_text_buffer_set_text (text_buffer, description.value, -1); - } + ENameSelectorModel *name_selector_model; + EDestinationStore *destination_store; + ECalComponentText description; + GtkTextBuffer *text_buffer; + GSList *attendee_list, *l; + gint len; + + /* Attendees */ + name_selector_model = e_name_selector_peek_model (dialog->name_selector); + e_name_selector_model_peek_section (name_selector_model, section_name, NULL, &destination_store); + + e_cal_component_alarm_get_attendee_list (alarm, &attendee_list); + len = g_slist_length (attendee_list); + if (len > 0) { + for (l = attendee_list; l; l = g_slist_next (l)) { + ECalComponentAttendee *a = l->data; + EDestination *dest; + + dest = e_destination_new (); + if (a->cn != NULL && *a->cn) + e_destination_set_name (dest, a->cn); + if (a->value != NULL && *a->value) { + if (!strncasecmp (a->value, "MAILTO:", 7)) + e_destination_set_email (dest, a->value + 7); + else + e_destination_set_email (dest, a->value); + } + e_destination_store_append_destination (destination_store, dest); + g_object_unref (G_OBJECT (dest)); + } + e_cal_component_free_attendee_list (attendee_list); + } + + /* Description */ + e_cal_component_alarm_get_description (alarm, &description); + if (description.value) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->malarm_message), TRUE); + text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description)); + gtk_text_buffer_set_text (text_buffer, description.value, -1); + } } /* Fills the widgets from procedure alarm data */ @@ -634,8 +634,8 @@ populate_widgets_from_alarm (Dialog *dialog) case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END: e_dialog_combo_box_set (dialog->time_combo, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END, time_map); break; - default: - g_warning ("%s: Unexpected alarm type (%d)", G_STRLOC, trigger->type); + default: + g_warning ("%s: Unexpected alarm type (%d)", G_STRLOC, trigger->type); } switch (trigger->u.rel_duration.is_neg) { @@ -692,8 +692,8 @@ populate_widgets_from_alarm (Dialog *dialog) case E_CAL_COMPONENT_ALARM_PROCEDURE: alarm_to_palarm_widgets (dialog, dialog->alarm); break; - default: - g_warning ("%s: Unexpected alarm action (%d)", G_STRLOC, *action); + default: + g_warning ("%s: Unexpected alarm action (%d)", G_STRLOC, *action); } } @@ -1085,8 +1085,8 @@ check_custom_email (Dialog *dialog) } static void -malarm_addresses_changed_cb (GtkWidget *editable, - gpointer data) +malarm_addresses_changed_cb (GtkWidget *editable, + gpointer data) { Dialog *dialog = data; @@ -1241,8 +1241,9 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm) gtk_window_set_icon_name ( GTK_WINDOW (dialog.toplevel), "x-office-calendar"); - gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel), - GTK_WINDOW (parent)); + gtk_window_set_transient_for ( + GTK_WINDOW (dialog.toplevel), + GTK_WINDOW (parent)); response_id = gtk_dialog_run (GTK_DIALOG (dialog.toplevel)); diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index 0fb09c6c29..0dbf9f81d0 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -131,7 +131,7 @@ add_clicked_cb (GtkButton *button, gpointer data) icalcomp = e_cal_component_alarm_get_icalcomponent (alarm); icalprop = icalproperty_new_x ("1"); icalproperty_set_x_name (icalprop, "X-EVOLUTION-NEEDS-DESCRIPTION"); - icalcomponent_add_property (icalcomp, icalprop); + icalcomponent_add_property (icalcomp, icalprop); if (alarm_dialog_run (dialog->toplevel, dialog->ecal, alarm)) { e_alarm_list_append (dialog->list_store, &iter, alarm); diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 0115f85a0e..7628f7f1bb 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -229,7 +229,7 @@ static void attachment_store_changed_cb (CompEditor *editor) { /* Mark the editor as changed so it prompts about unsaved - changes on close */ + changes on close */ comp_editor_set_changed (editor, TRUE); } diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index b0ccb953b2..850728449e 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -88,7 +88,7 @@ delete_component_dialog (ECalComponent *comp, switch (vtype) { case E_CAL_COMPONENT_EVENT: - attendees = e_cal_component_has_attendees (comp); + attendees = e_cal_component_has_attendees (comp); if (arg0) { if (attendees) id = "calendar:prompt-delete-titled-meeting"; diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 5bf870e512..7d7e1d4859 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -847,7 +847,7 @@ sensitize_widgets (EventPage *epage) gtk_combo_box_set_active (GTK_COMBO_BOX (priv->end_time_combo), 1); else gtk_combo_box_set_active (GTK_COMBO_BOX (priv->end_time_combo), 0); - } else + } else gtk_combo_box_set_active (GTK_COMBO_BOX (priv->end_time_combo), 1); gtk_widget_set_sensitive (priv->hour_selector, sensitize); @@ -1673,16 +1673,16 @@ void update_end_time_combo (EventPage *epage) priv = epage->priv; e_date_edit_get_date (E_DATE_EDIT (priv->start_time), - &start_tt.year, - &start_tt.month, - &start_tt.day); - e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time), + &start_tt.year, + &start_tt.month, + &start_tt.day); + e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time), &start_tt.hour, &start_tt.minute); e_date_edit_get_date (E_DATE_EDIT (priv->end_time), - &end_tt.year, - &end_tt.month, - &end_tt.day); + &end_tt.year, + &end_tt.month, + &end_tt.day); e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time), &end_tt.hour, &end_tt.minute); @@ -1720,12 +1720,12 @@ hour_minute_changed (EventPage *epage) priv = epage->priv; e_date_edit_get_date (E_DATE_EDIT (priv->start_time), - &end_tt.year, - &end_tt.month, - &end_tt.day); - e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time), - &end_tt.hour, - &end_tt.minute); + &end_tt.year, + &end_tt.month, + &end_tt.day); + e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time), + &end_tt.hour, + &end_tt.minute); for_hours = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->hour_selector)); for_minutes = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->minute_selector)); diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c index e517819c6b..79905d5f01 100644 --- a/calendar/gui/dialogs/select-source-dialog.c +++ b/calendar/gui/dialogs/select-source-dialog.c @@ -48,7 +48,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type, ESource *excep gconf_key = "/apps/evolution/calendar/sources"; else if (obj_type == E_CAL_SOURCE_TYPE_TODO) gconf_key = "/apps/evolution/tasks/sources"; - else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL) + else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL) gconf_key = "/apps/evolution/memos/sources"; else return NULL; @@ -63,7 +63,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type, ESource *excep icon_name = "x-office-calendar"; else if (obj_type == E_CAL_SOURCE_TYPE_TODO) icon_name = "stock_todo"; - else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL) + else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL) icon_name = "stock_journal"; if (icon_name) diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index dc23153997..636e734d82 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -134,8 +134,8 @@ timet_to_str_with_zone (ECalComponentDateTime *dt, { struct icaltimetype itt; icaltimezone *zone; - struct tm tm; - gchar buf[256]; + struct tm tm; + gchar buf[256]; if (dt->tzid) { /* If we can't find the zone, we'll guess its "local" */ @@ -150,9 +150,9 @@ timet_to_str_with_zone (ECalComponentDateTime *dt, itt = *dt->value; if (zone) icaltimezone_convert_time (&itt, zone, default_zone); - tm = icaltimetype_to_tm (&itt); + tm = icaltimetype_to_tm (&itt); - e_time_format_date_and_time ( + e_time_format_date_and_time ( &tm, use_24_hour_format, FALSE, FALSE, buf, sizeof (buf)); diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index b4a7cf2d16..b6efb3e0e1 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -819,7 +819,7 @@ static ECellDateEditValue* get_dtstart (ECalModel *model, ECalModelComponent *comp_data) { ECalModelPrivate *priv; - struct icaltimetype tt_start; + struct icaltimetype tt_start; priv = model->priv; @@ -867,7 +867,7 @@ static ECellDateEditValue* get_datetime_from_utc (ECalModel *model, ECalModelComponent *comp_data, icalproperty_kind propkind, struct icaltimetype (*get_value)(const icalproperty* prop), ECellDateEditValue **buffer) { ECalModelPrivate *priv; - struct icaltimetype tt_value; + struct icaltimetype tt_value; icalproperty *prop; ECellDateEditValue *res; @@ -3234,15 +3234,15 @@ e_cal_model_component_get_type (void) if (!e_cal_model_component_type) { static GTypeInfo info = { - sizeof (ECalModelComponentClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) e_cal_model_component_class_init, - NULL, NULL, - sizeof (ECalModelComponent), - 0, - (GInstanceInitFunc) e_cal_model_component_init - }; + sizeof (ECalModelComponentClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) e_cal_model_component_class_init, + NULL, NULL, + sizeof (ECalModelComponent), + 0, + (GInstanceInitFunc) e_cal_model_component_init + }; e_cal_model_component_type = g_type_register_static (G_TYPE_OBJECT, "ECalModelComponent", &info, 0); } diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 132f9cc29d..181d4a19f4 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -1717,7 +1717,7 @@ tooltip_grab (GtkWidget *tooltip, GdkEventKey *event, ECalendarView *view) static gchar * get_label (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone) { - struct tm tmp_tm; + struct tm tmp_tm; tmp_tm = icaltimetype_to_tm_with_zone (tt, f_zone, t_zone); diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 7e5fed0275..838295c6d6 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -251,7 +251,7 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, column of the day, we might not want to paint over the vertical bar, since that is used for multiple events. But then you can't see where the event in the first column finishes. The border is drawn - along with the event using cairo*/ + along with the event using cairo*/ red = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].red; green = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green; diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index def481ea2a..d6faa6151c 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -309,7 +309,7 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item, time_width = e_day_view_get_time_string_width (day_view); - gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]); + gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]); if (event->start > day_view->day_starts[start_day]) { offset = day_view->first_hour_shown * 60 @@ -329,23 +329,23 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item, display_hour, minute, suffix); } - cairo_save (cr); + cairo_save (cr); - cairo_rectangle (cr, - item_x - x, item_y - y, + cairo_rectangle (cr, + item_x - x, item_y - y, item_w - E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH, item_h); - cairo_clip (cr); + cairo_clip (cr); time_x = item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x; if (display_hour < 10) time_x += day_view->digit_width; layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer); - cairo_move_to (cr, - time_x, - item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + - E_DAY_VIEW_LONG_EVENT_Y_PAD - y); - pango_cairo_show_layout (cr, layout); + cairo_move_to (cr, + time_x, + item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + + E_DAY_VIEW_LONG_EVENT_Y_PAD - y); + pango_cairo_show_layout (cr, layout); g_object_unref (layout); cairo_restore (cr); @@ -386,9 +386,9 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item, time_x += day_view->digit_width; layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer); - cairo_move_to (cr, - time_x, - item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD + 1 - y); + cairo_move_to (cr, + time_x, + item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD + 1 - y); pango_cairo_show_layout (cr, layout); g_object_unref (layout); @@ -458,12 +458,12 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item, if (icon_x <= max_icon_x) { gdk_cairo_set_source_pixbuf (cr, pixbuf, - icon_x, icon_y); - cairo_rectangle (cr, - icon_x, icon_y, + icon_x, icon_y); + cairo_rectangle (cr, + icon_x, icon_y, E_DAY_VIEW_ICON_WIDTH, E_DAY_VIEW_ICON_HEIGHT); - cairo_fill (cr); + cairo_fill (cr); icon_x -= icon_x_inc; } } @@ -675,21 +675,21 @@ day_view_top_item_draw (GnomeCanvasItem *canvas_item, clip_rect.width = day_view->day_widths[day]; clip_rect.height = item_height - 2; - cairo_save (cr); + cairo_save (cr); - gdk_cairo_rectangle (cr, &clip_rect); - cairo_clip (cr); + gdk_cairo_rectangle (cr, &clip_rect); + cairo_clip (cr); layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer); pango_layout_get_pixel_size (layout, &date_width, NULL); date_x = day_view->day_offsets[day] + (clip_rect.width - date_width) / 2; - gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]); - cairo_move_to (cr, date_x - x, 3 - y); - pango_cairo_show_layout (cr, layout); + gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]); + cairo_move_to (cr, date_x - x, 3 - y); + pango_cairo_show_layout (cr, layout); g_object_unref (layout); - cairo_restore (cr); + cairo_restore (cr); /* Draw the lines down the left and right of the date cols. */ if (day != 0) { diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index f881fc99e7..52d34f511e 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -5065,7 +5065,7 @@ e_day_view_add_new_event_in_selected_range (EDayView *day_view, GdkEventKey *key time_t dtstart, dtend; ECalComponentDateTime start_dt, end_dt; struct icaltimetype start_tt, end_tt; - const gchar *uid; + const gchar *uid; AddEventData add_event_data; gboolean read_only = TRUE; @@ -6018,10 +6018,10 @@ e_day_view_start_editing_event (EDayView *day_view, e_canvas_item_grab_focus (event->canvas_item, TRUE); if (key_event) { - if (gtk_im_context_filter_keypress (((EText *)(event->canvas_item))->im_context, key_event)) { - ((EText *)(event->canvas_item))->need_im_reset = TRUE; - } - else { + if (gtk_im_context_filter_keypress (((EText *)(event->canvas_item))->im_context, key_event)) { + ((EText *)(event->canvas_item))->need_im_reset = TRUE; + } + else { gchar *initial_text; initial_text = e_utf8_from_gtk_event_key (GTK_WIDGET (day_view), key_event->keyval, key_event->string); @@ -6171,18 +6171,18 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item, /* focus should go to day view when stop editing */ gtk_widget_grab_focus (GTK_WIDGET (day_view)); return TRUE; - } else if ((event->key.keyval == GDK_KEY_Up) - && (event->key.state & GDK_SHIFT_MASK) - && (event->key.state & GDK_CONTROL_MASK) - && !(event->key.state & GDK_MOD1_MASK)) { - e_day_view_change_event_end_time_up (day_view); - return TRUE; - } else if ((event->key.keyval == GDK_KEY_Down) - && (event->key.state & GDK_SHIFT_MASK) - && (event->key.state & GDK_CONTROL_MASK) - && !(event->key.state & GDK_MOD1_MASK)) { - e_day_view_change_event_end_time_down (day_view); - return TRUE; + } else if ((event->key.keyval == GDK_KEY_Up) + && (event->key.state & GDK_SHIFT_MASK) + && (event->key.state & GDK_CONTROL_MASK) + && !(event->key.state & GDK_MOD1_MASK)) { + e_day_view_change_event_end_time_up (day_view); + return TRUE; + } else if ((event->key.keyval == GDK_KEY_Down) + && (event->key.state & GDK_SHIFT_MASK) + && (event->key.state & GDK_CONTROL_MASK) + && !(event->key.state & GDK_MOD1_MASK)) { + e_day_view_change_event_end_time_down (day_view); + return TRUE; } break; case GDK_2BUTTON_PRESS: diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index f3c5cb8b49..b72662ce8f 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -613,21 +613,21 @@ change_edit_cols_for_user (gpointer key, gpointer value, gpointer user_data) gint key_val = GPOINTER_TO_INT (key); switch (key_val) { - case E_MEETING_STORE_ATTENDEE_COL: + case E_MEETING_STORE_ATTENDEE_COL: g_object_set (G_OBJECT (renderer), "editable", FALSE, NULL); - break; - case E_MEETING_STORE_ROLE_COL: + break; + case E_MEETING_STORE_ROLE_COL: g_object_set (G_OBJECT (renderer), "editable", FALSE, NULL); - break; - case E_MEETING_STORE_TYPE_COL: + break; + case E_MEETING_STORE_TYPE_COL: g_object_set (G_OBJECT (renderer), "editable", FALSE, NULL); - break; - case E_MEETING_STORE_RSVP_COL: + break; + case E_MEETING_STORE_RSVP_COL: g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); - break; - case E_MEETING_STORE_STATUS_COL: + break; + case E_MEETING_STORE_STATUS_COL: g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); - break; + break; } } @@ -654,9 +654,9 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view) priv = view->priv; if (!(paths = gtk_tree_selection_get_selected_rows (selection, &model))) - return; + return; if (g_list_length (paths) > 1) - return; + return; path = g_list_nth_data (paths, 0); if (!path) return; @@ -667,20 +667,20 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view) switch (el) { - case E_MEETING_ATTENDEE_EDIT_NONE: - edit_level = FALSE; - g_hash_table_foreach (priv->renderers, change_edit_cols_for_organizer, GINT_TO_POINTER (edit_level)); - break; - - case E_MEETING_ATTENDEE_EDIT_FULL: - edit_level = TRUE; - g_hash_table_foreach (priv->renderers, change_edit_cols_for_organizer, GINT_TO_POINTER (edit_level)); - break; - - case E_MEETING_ATTENDEE_EDIT_STATUS: - edit_level = FALSE; - g_hash_table_foreach (priv->renderers, change_edit_cols_for_user, GINT_TO_POINTER (edit_level)); - break; + case E_MEETING_ATTENDEE_EDIT_NONE: + edit_level = FALSE; + g_hash_table_foreach (priv->renderers, change_edit_cols_for_organizer, GINT_TO_POINTER (edit_level)); + break; + + case E_MEETING_ATTENDEE_EDIT_FULL: + edit_level = TRUE; + g_hash_table_foreach (priv->renderers, change_edit_cols_for_organizer, GINT_TO_POINTER (edit_level)); + break; + + case E_MEETING_ATTENDEE_EDIT_STATUS: + edit_level = FALSE; + g_hash_table_foreach (priv->renderers, change_edit_cols_for_user, GINT_TO_POINTER (edit_level)); + break; } } diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index d694a4a6fe..ef221c4288 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -909,12 +909,12 @@ e_meeting_time_selector_draw_key_color (GtkWidget *darea, cairo_t *cr, GdkColor if (color) { gdk_cairo_set_source_color (cr, color); } else { - cairo_set_source (cr, mts->no_info_pattern); + cairo_set_source (cr, mts->no_info_pattern); } - cairo_rectangle (cr, - 1, 1, - allocation.width - 2, allocation.height - 2); - cairo_fill (cr); + cairo_rectangle (cr, + 1, 1, + allocation.width - 2, allocation.height - 2); + cairo_fill (cr); return TRUE; } @@ -1032,35 +1032,35 @@ e_meeting_time_selector_set_week_start_day (EMeetingTimeSelector *mts, static cairo_pattern_t * e_meeting_time_selector_create_no_info_pattern (EMeetingTimeSelector *mts) { - cairo_surface_t *surface; - cairo_pattern_t *pattern; - GdkColor color; - cairo_t *cr; + cairo_surface_t *surface; + cairo_pattern_t *pattern; + GdkColor color; + cairo_t *cr; - surface = gdk_window_create_similar_surface (gtk_widget_get_window (GTK_WIDGET (mts)), - CAIRO_CONTENT_COLOR, 8, 8); - cr = cairo_create (surface); + surface = gdk_window_create_similar_surface (gtk_widget_get_window (GTK_WIDGET (mts)), + CAIRO_CONTENT_COLOR, 8, 8); + cr = cairo_create (surface); gdk_color_parse ("white", &color); - gdk_cairo_set_source_color (cr, &color); - cairo_paint (cr); + gdk_cairo_set_source_color (cr, &color); + cairo_paint (cr); - gdk_cairo_set_source_color (cr, &mts->grid_color); - cairo_set_line_width (cr, 1.0); - cairo_move_to (cr, -1, 5); - cairo_line_to (cr, 9, -5); - cairo_move_to (cr, -1, 13); - cairo_line_to (cr, 9, 3); - cairo_stroke (cr); + gdk_cairo_set_source_color (cr, &mts->grid_color); + cairo_set_line_width (cr, 1.0); + cairo_move_to (cr, -1, 5); + cairo_line_to (cr, 9, -5); + cairo_move_to (cr, -1, 13); + cairo_line_to (cr, 9, 3); + cairo_stroke (cr); - cairo_destroy (cr); + cairo_destroy (cr); - pattern = cairo_pattern_create_for_surface (surface); - cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); + pattern = cairo_pattern_create_for_surface (surface); + cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); - cairo_surface_destroy (surface); + cairo_surface_destroy (surface); - return pattern; + return pattern; } static void @@ -1075,7 +1075,7 @@ e_meeting_time_selector_realize (GtkWidget *widget) mts = E_MEETING_TIME_SELECTOR (widget); window = gtk_widget_get_window (widget); - mts->no_info_pattern = e_meeting_time_selector_create_no_info_pattern (mts); + mts->no_info_pattern = e_meeting_time_selector_create_no_info_pattern (mts); } static void @@ -1085,8 +1085,8 @@ e_meeting_time_selector_unrealize (GtkWidget *widget) mts = E_MEETING_TIME_SELECTOR (widget); - cairo_pattern_destroy (mts->no_info_pattern); - mts->no_info_pattern = NULL; + cairo_pattern_destroy (mts->no_info_pattern); + mts->no_info_pattern = NULL; if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize) (*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize)(widget); diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c index 6f16d7b2e4..632ff89c91 100644 --- a/calendar/gui/e-select-names-renderer.c +++ b/calendar/gui/e-select-names-renderer.c @@ -126,7 +126,7 @@ e_select_names_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, G g_signal_connect (editable, "editing_done", G_CALLBACK (e_select_names_renderer_editing_done), sn_cell); /* Removed focus-out-event. focus out event already listen by base class. - We don't need to listen for the focus out event any more */ + We don't need to listen for the focus out event any more */ sn_cell->priv->editable = g_object_ref (editable); sn_cell->priv->path = g_strdup (path); diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 57f859b7df..84615760c3 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -301,7 +301,7 @@ week_view_draw_time (EWeekView *week_view, PangoLayout *layout; PangoFontDescription *small_font_desc; - cairo_save (cr); + cairo_save (cr); model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)); @@ -326,16 +326,16 @@ week_view_draw_time (EWeekView *week_view, /* Draw the hour. */ if (hour_to_display < 10) { pango_layout_set_text (layout, buffer + 1, 1); - cairo_move_to (cr, - time_x + week_view->digit_width, - time_y_normal_font); - pango_cairo_show_layout (cr, layout); + cairo_move_to (cr, + time_x + week_view->digit_width, + time_y_normal_font); + pango_cairo_show_layout (cr, layout); } else { pango_layout_set_text (layout, buffer, 2); - cairo_move_to (cr, - time_x, - time_y_normal_font); - pango_cairo_show_layout (cr, layout); + cairo_move_to (cr, + time_x, + time_y_normal_font); + pango_cairo_show_layout (cr, layout); } time_x += week_view->digit_width * 2; @@ -343,10 +343,10 @@ week_view_draw_time (EWeekView *week_view, /* Draw the start minute, in the small font. */ pango_layout_set_font_description (layout, week_view->small_font_desc); pango_layout_set_text (layout, buffer + 3, 2); - cairo_move_to (cr, - time_x, - time_y_small_font); - pango_cairo_show_layout (cr, layout); + cairo_move_to (cr, + time_x, + time_y_small_font); + pango_cairo_show_layout (cr, layout); pango_layout_set_font_description (layout, style->font_desc); @@ -356,10 +356,10 @@ week_view_draw_time (EWeekView *week_view, if (!e_cal_model_get_use_24_hour_format (model)) { pango_layout_set_text (layout, suffix, -1); - cairo_move_to (cr, - time_x, - time_y_normal_font); - pango_cairo_show_layout (cr, layout); + cairo_move_to (cr, + time_x, + time_y_normal_font); + pango_cairo_show_layout (cr, layout); } } else { /* Draw the start time in one go. */ @@ -367,22 +367,22 @@ week_view_draw_time (EWeekView *week_view, hour_to_display, minute, suffix); if (hour_to_display < 10) { pango_layout_set_text (layout, buffer + 1, -1); - cairo_move_to (cr, - time_x + week_view->digit_width, - time_y_normal_font); - pango_cairo_show_layout (cr, layout); + cairo_move_to (cr, + time_x + week_view->digit_width, + time_y_normal_font); + pango_cairo_show_layout (cr, layout); } else { pango_layout_set_text (layout, buffer, -1); - cairo_move_to (cr, - time_x, - time_y_normal_font); - pango_cairo_show_layout (cr, layout); + cairo_move_to (cr, + time_x, + time_y_normal_font); + pango_cairo_show_layout (cr, layout); } } g_object_unref (layout); - cairo_restore (cr); + cairo_restore (cr); } static void @@ -1017,20 +1017,20 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item, + E_WEEK_VIEW_EVENT_BORDER_WIDTH + E_WEEK_VIEW_EVENT_EDGE_X_PAD; - cairo_save (cr); + cairo_save (cr); - cairo_rectangle (cr, - x1, y1, + cairo_rectangle (cr, + x1, y1, x2 - x1 - E_WEEK_VIEW_EVENT_R_PAD - E_WEEK_VIEW_EVENT_BORDER_WIDTH + 1, y2 - y1 + 1); - cairo_clip (cr); + cairo_clip (cr); week_view_draw_time ( week_view, cr, time_x, time_y, start_hour, start_minute); - cairo_restore (cr); + cairo_restore (cr); /* We don't want the end time to be drawn over the start time, so we increase the minimum position. */ diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c index 7ea7b1ffdc..fab2007954 100644 --- a/calendar/gui/e-week-view-titles-item.c +++ b/calendar/gui/e-week-view-titles-item.c @@ -136,7 +136,7 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item, g_return_if_fail (week_view != NULL); cairo_save (cr); - cairo_set_line_width (cr, 1.0); + cairo_set_line_width (cr, 1.0); gtk_widget_get_allocation ( GTK_WIDGET (canvas_item->canvas), &allocation); @@ -145,16 +145,16 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item, layout = gtk_widget_create_pango_layout (GTK_WIDGET (week_view), NULL); /* Draw the shadow around the dates. */ - gdk_cairo_set_source_color (cr, &style->light[GTK_STATE_NORMAL]); - cairo_move_to (cr, 1.5 - x, 1.5 - y); - cairo_rel_line_to (cr, allocation.width - 1, 0); - cairo_move_to (cr, 1.5 - x, 2.5 - y); - cairo_rel_line_to (cr, 0, allocation.height - 1); - cairo_stroke (cr); + gdk_cairo_set_source_color (cr, &style->light[GTK_STATE_NORMAL]); + cairo_move_to (cr, 1.5 - x, 1.5 - y); + cairo_rel_line_to (cr, allocation.width - 1, 0); + cairo_move_to (cr, 1.5 - x, 2.5 - y); + cairo_rel_line_to (cr, 0, allocation.height - 1); + cairo_stroke (cr); - gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]); - cairo_rectangle (cr, 0.5 - x, 0.5 - y, allocation.width - 1, allocation.height); - cairo_stroke (cr); + gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]); + cairo_rectangle (cr, 0.5 - x, 0.5 - y, allocation.width - 1, allocation.height); + cairo_stroke (cr); /* Determine the format to use. */ col_width = allocation.width / week_view->columns; @@ -178,12 +178,12 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item, buffer, sizeof (buffer), "%s", e_get_weekday_name (weekday + 1, abbreviated)); - cairo_save (cr); + cairo_save (cr); - cairo_rectangle (cr, - week_view->col_offsets[col] - x, 2 - y, - week_view->col_widths[col], allocation.height - 2); - cairo_clip (cr); + cairo_rectangle (cr, + week_view->col_offsets[col] - x, 2 - y, + week_view->col_widths[col], allocation.height - 2); + cairo_clip (cr); if (weekday == 5 && week_view->compress_weekend) date_width = week_view->abbr_day_widths[5] @@ -199,29 +199,29 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item, date_x = MAX (date_x, week_view->col_offsets[col]); pango_layout_set_text (layout, buffer, -1); - cairo_move_to (cr, date_x - x, 3 - y); + cairo_move_to (cr, date_x - x, 3 - y); pango_cairo_show_layout (cr, layout); - cairo_restore (cr); + cairo_restore (cr); /* Draw the lines down the left and right of the date cols. */ if (col != 0) { - gdk_cairo_set_source_color (cr, &style->light[GTK_STATE_NORMAL]); - cairo_move_to (cr, week_view->col_offsets[col] - x + 0.5, 4.5 - y); - cairo_rel_line_to (cr, 0, allocation.height - 8); - cairo_stroke (cr); - - gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]); - cairo_move_to (cr, week_view->col_offsets[col] - x - 0.5, 4.5 - y); - cairo_rel_line_to (cr, 0, allocation.height - 8); - cairo_stroke (cr); + gdk_cairo_set_source_color (cr, &style->light[GTK_STATE_NORMAL]); + cairo_move_to (cr, week_view->col_offsets[col] - x + 0.5, 4.5 - y); + cairo_rel_line_to (cr, 0, allocation.height - 8); + cairo_stroke (cr); + + gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]); + cairo_move_to (cr, week_view->col_offsets[col] - x - 0.5, 4.5 - y); + cairo_rel_line_to (cr, 0, allocation.height - 8); + cairo_stroke (cr); } /* Draw the lines between each column. */ if (col != 0) { - cairo_set_source_rgb (cr, 0, 0, 0); - cairo_rectangle (cr, week_view->col_offsets[col] - x, allocation.height - y, 1, 1); - cairo_fill (cr); + cairo_set_source_rgb (cr, 0, 0, 0); + cairo_rectangle (cr, week_view->col_offsets[col] - x, allocation.height - y, 1, 1); + cairo_fill (cr); } if (weekday == 5 && week_view->compress_weekend) diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 6497ec7694..560ed09343 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -4429,18 +4429,18 @@ static gint e_week_view_get_adjust_days_for_move_up (EWeekView *week_view,gint current_day) { if (week_view->multi_week_view) - return -7; + return -7; else - return 0; + return 0; } static gint e_week_view_get_adjust_days_for_move_down (EWeekView *week_view,gint current_day) { if (week_view->multi_week_view) - return 7; + return 7; else - return 0; + return 0; } static gint diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c index 229d3822d5..b3d35c90a6 100644 --- a/calendar/gui/ea-cal-view-event.c +++ b/calendar/gui/ea-cal-view-event.c @@ -96,11 +96,11 @@ ea_cal_view_event_get_type (void) NULL }; - static const GInterfaceInfo atk_action_info = { - (GInterfaceInitFunc) atk_action_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; + static const GInterfaceInfo atk_action_info = { + (GInterfaceInitFunc) atk_action_interface_init, + (GInterfaceFinalizeFunc) NULL, + NULL + }; /* * Figure out the size of the class and instance @@ -120,8 +120,8 @@ ea_cal_view_event_get_type (void) "EaCalViewEvent", &tinfo, 0); g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info); - g_type_add_interface_static (type, ATK_TYPE_ACTION, - &atk_action_info); + g_type_add_interface_static (type, ATK_TYPE_ACTION, + &atk_action_info); } @@ -152,13 +152,13 @@ ea_cal_view_event_class_init (EaCalViewEventClass *klass) static void ea_cal_view_event_init (EaCalViewEvent *a11y) { - a11y->state_set = atk_state_set_new (); - atk_state_set_add_state (a11y->state_set, ATK_STATE_TRANSIENT); - atk_state_set_add_state (a11y->state_set, ATK_STATE_ENABLED); - atk_state_set_add_state (a11y->state_set, ATK_STATE_SENSITIVE); - atk_state_set_add_state (a11y->state_set, ATK_STATE_SELECTABLE); - atk_state_set_add_state (a11y->state_set, ATK_STATE_SHOWING); - atk_state_set_add_state (a11y->state_set, ATK_STATE_FOCUSABLE); + a11y->state_set = atk_state_set_new (); + atk_state_set_add_state (a11y->state_set, ATK_STATE_TRANSIENT); + atk_state_set_add_state (a11y->state_set, ATK_STATE_ENABLED); + atk_state_set_add_state (a11y->state_set, ATK_STATE_SENSITIVE); + atk_state_set_add_state (a11y->state_set, ATK_STATE_SELECTABLE); + atk_state_set_add_state (a11y->state_set, ATK_STATE_SHOWING); + atk_state_set_add_state (a11y->state_set, ATK_STATE_FOCUSABLE); } #ifdef ACC_DEBUG @@ -246,15 +246,15 @@ ea_cal_view_event_new (GObject *obj) static void ea_cal_view_event_dispose (GObject *object) { - EaCalViewEvent *a11y = EA_CAL_VIEW_EVENT (object); + EaCalViewEvent *a11y = EA_CAL_VIEW_EVENT (object); - if (a11y->state_set) { - g_object_unref (a11y->state_set); - a11y->state_set = NULL; - } + if (a11y->state_set) { + g_object_unref (a11y->state_set); + a11y->state_set = NULL; + } - if (G_OBJECT_CLASS (parent_class)->dispose) - G_OBJECT_CLASS (parent_class)->dispose (object); + if (G_OBJECT_CLASS (parent_class)->dispose) + G_OBJECT_CLASS (parent_class)->dispose (object); } static G_CONST_RETURN gchar * @@ -268,7 +268,7 @@ ea_cal_view_event_get_name (AtkObject *accessible) const gchar *recur_string; const gchar *meeting_string; gchar *summary_string; - const gchar *summary; + const gchar *summary; g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL); @@ -421,13 +421,13 @@ ea_cal_view_event_get_index_in_parent (AtkObject *accessible) static AtkStateSet * ea_cal_view_event_ref_state_set (AtkObject *accessible) { - EaCalViewEvent *atk_event = EA_CAL_VIEW_EVENT (accessible); + EaCalViewEvent *atk_event = EA_CAL_VIEW_EVENT (accessible); - g_return_val_if_fail (atk_event->state_set, NULL); + g_return_val_if_fail (atk_event->state_set, NULL); - g_object_ref (atk_event->state_set); + g_object_ref (atk_event->state_set); - return atk_event->state_set; + return atk_event->state_set; } /* Atk Component Interface */ @@ -554,41 +554,41 @@ static const gchar * action_name[CAL_VIEW_EVENT_ACTION_NUM] = { static void atk_action_interface_init (AtkActionIface *iface) { - g_return_if_fail (iface != NULL); + g_return_if_fail (iface != NULL); - iface->do_action = ea_cal_view_event_do_action; - iface->get_n_actions = ea_cal_view_event_get_n_actions; - iface->get_name = ea_cal_view_event_action_get_name; + iface->do_action = ea_cal_view_event_do_action; + iface->get_n_actions = ea_cal_view_event_get_n_actions; + iface->get_name = ea_cal_view_event_action_get_name; } static gboolean ea_cal_view_event_do_action (AtkAction *action, gint i) { - AtkGObjectAccessible *atk_gobj; - AtkComponent *atk_comp; + AtkGObjectAccessible *atk_gobj; + AtkComponent *atk_comp; - atk_gobj = ATK_GOBJECT_ACCESSIBLE (action); + atk_gobj = ATK_GOBJECT_ACCESSIBLE (action); - if (i == 0) { - atk_comp = (AtkComponent *)atk_gobj; - return atk_component_grab_focus (atk_comp); - } + if (i == 0) { + atk_comp = (AtkComponent *)atk_gobj; + return atk_component_grab_focus (atk_comp); + } - return FALSE; + return FALSE; } static gint ea_cal_view_event_get_n_actions (AtkAction *action) { - return CAL_VIEW_EVENT_ACTION_NUM; + return CAL_VIEW_EVENT_ACTION_NUM; } static G_CONST_RETURN gchar * ea_cal_view_event_action_get_name (AtkAction *action, gint i) { - if (i >= 0 && i < CAL_VIEW_EVENT_ACTION_NUM) - return action_name[i]; - return NULL; + if (i >= 0 && i < CAL_VIEW_EVENT_ACTION_NUM) + return action_name[i]; + return NULL; } diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c index 1be3b3dd77..71b1c52be0 100644 --- a/calendar/gui/ea-cal-view.c +++ b/calendar/gui/ea-cal-view.c @@ -142,7 +142,7 @@ ea_cal_view_real_initialize (AtkObject *accessible, gpointer data) g_return_if_fail (EA_IS_CAL_VIEW (accessible)); g_return_if_fail (E_IS_CALENDAR_VIEW (data)); - ATK_OBJECT_CLASS (parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (parent_class)->initialize (accessible, data); if (role == ATK_ROLE_INVALID) role = atk_role_register ("Calendar View"); accessible->role = role; diff --git a/calendar/gui/ea-calendar-helpers.c b/calendar/gui/ea-calendar-helpers.c index be8565414a..b9c6c2415f 100644 --- a/calendar/gui/ea-calendar-helpers.c +++ b/calendar/gui/ea-calendar-helpers.c @@ -52,15 +52,15 @@ ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item) */ atk_obj = g_object_get_data (g_obj, "accessible-object"); if (!atk_obj) { - if (E_IS_TEXT (canvas_item)) { + if (E_IS_TEXT (canvas_item)) { atk_obj = ea_cal_view_event_new (g_obj); - } - else if (GNOME_IS_CANVAS_PIXBUF (canvas_item)) { - atk_obj = ea_jump_button_new (g_obj); - } - else - return NULL; - } + } + else if (GNOME_IS_CANVAS_PIXBUF (canvas_item)) { + atk_obj = ea_jump_button_new (g_obj); + } + else + return NULL; + } return atk_obj; } diff --git a/calendar/gui/ea-calendar.c b/calendar/gui/ea-calendar.c index 59158b3275..44b63a9c0b 100644 --- a/calendar/gui/ea-calendar.c +++ b/calendar/gui/ea-calendar.c @@ -73,8 +73,8 @@ gnome_calendar_a11y_init (void) 0, ea_calendar_focus_watcher, NULL, (GDestroyNotify) NULL); g_signal_add_emission_hook (g_signal_lookup ("event", GNOME_TYPE_CANVAS_PIXBUF), - 0, ea_calendar_focus_watcher, - NULL, (GDestroyNotify) NULL); + 0, ea_calendar_focus_watcher, + NULL, (GDestroyNotify) NULL); g_signal_add_emission_hook (g_signal_lookup ("event-after", e_day_view_get_type ()), 0, ea_calendar_focus_watcher, @@ -133,7 +133,7 @@ ea_calendar_focus_watcher (GSignalInvocationHint *ihint, { GObject *object; GdkEvent *event; - AtkObject *ea_event = NULL; + AtkObject *ea_event = NULL; object = g_value_get_object (param_values + 0); event = g_value_get_boxed (param_values + 1); diff --git a/calendar/gui/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c index 84f0c4d115..6a8489f47d 100644 --- a/calendar/gui/ea-day-view-cell.c +++ b/calendar/gui/ea-day-view-cell.c @@ -363,35 +363,35 @@ component_interface_get_extents (AtkComponent *component, static gboolean component_interface_grab_focus (AtkComponent *comp) { - GObject *g_obj; - EDayViewCell *cell; - EDayView *day_view; - GtkWidget *toplevel; + GObject *g_obj; + EDayViewCell *cell; + EDayView *day_view; + GtkWidget *toplevel; - g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (comp), FALSE); + g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (comp), FALSE); - g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (comp)); - if (!g_obj) - return FALSE; + g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (comp)); + if (!g_obj) + return FALSE; - cell = E_DAY_VIEW_CELL (g_obj); - day_view = cell->day_view; + cell = E_DAY_VIEW_CELL (g_obj); + day_view = cell->day_view; - day_view->selection_start_day = cell->column; - day_view->selection_end_day = cell->column; - day_view->selection_start_row = cell->row; - day_view->selection_end_row = cell->row; + day_view->selection_start_day = cell->column; + day_view->selection_end_day = cell->column; + day_view->selection_start_row = cell->row; + day_view->selection_end_row = cell->row; - e_day_view_ensure_rows_visible (day_view, - day_view->selection_start_row, - day_view->selection_end_row); - e_day_view_update_calendar_selection_time (day_view); - gtk_widget_queue_draw (day_view->main_canvas); + e_day_view_ensure_rows_visible (day_view, + day_view->selection_start_row, + day_view->selection_end_row); + e_day_view_update_calendar_selection_time (day_view); + gtk_widget_queue_draw (day_view->main_canvas); - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (day_view)); - if (gtk_widget_is_toplevel (toplevel)) - gtk_window_present (GTK_WINDOW (toplevel)); + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (day_view)); + if (gtk_widget_is_toplevel (toplevel)) + gtk_window_present (GTK_WINDOW (toplevel)); - return TRUE; + return TRUE; } diff --git a/calendar/gui/ea-day-view-main-item.c b/calendar/gui/ea-day-view-main-item.c index 7d95e8f4b3..4d36044b5e 100644 --- a/calendar/gui/ea-day-view-main-item.c +++ b/calendar/gui/ea-day-view-main-item.c @@ -460,8 +460,8 @@ ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data) item_cell); g_signal_emit_by_name (data, "selection_changed"); - atk_focus_tracker_notify (item_cell); - g_object_unref (item_cell); + atk_focus_tracker_notify (item_cell); + g_object_unref (item_cell); } } diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c index 32f5fb1f75..ff77e60f07 100644 --- a/calendar/gui/ea-week-view-cell.c +++ b/calendar/gui/ea-week-view-cell.c @@ -188,7 +188,7 @@ ea_week_view_cell_new (GObject *obj) #ifdef ACC_DEBUG static void ea_week_view_cell_finalize (GObject *object) { - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (parent_class)->finalize (object); ++n_ea_week_view_cell_destroyed; printf ("ACC_DEBUG: n_ea_week_view_cell_destroyed = %d\n", @@ -210,8 +210,8 @@ ea_week_view_cell_get_name (AtkObject *accessible) GnomeCanvasItem *main_item; gchar *new_name; const gchar *row_label, *column_label; - gint new_column, new_row; - gint start_day; + gint new_column, new_row; + gint start_day; atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible); g_obj = atk_gobject_accessible_get_object (atk_gobj); @@ -222,14 +222,14 @@ ea_week_view_cell_get_name (AtkObject *accessible) main_item = cell->week_view->main_canvas_item; ea_main_item = atk_gobject_accessible_for_object (G_OBJECT (main_item)); - start_day = cell->week_view->display_start_day; - if (cell->column + start_day >= 7) { - new_column = cell->column + start_day - 7; - new_row = cell->row + 1; - } else { - new_column = cell->column + start_day; - new_row = cell->row; - } + start_day = cell->week_view->display_start_day; + if (cell->column + start_day >= 7) { + new_column = cell->column + start_day - 7; + new_row = cell->row + 1; + } else { + new_column = cell->column + start_day; + new_row = cell->row; + } column_label = atk_table_get_column_description (ATK_TABLE (ea_main_item), new_column); @@ -327,7 +327,7 @@ atk_component_interface_init (AtkComponentIface *iface) g_return_if_fail (iface != NULL); iface->get_extents = component_interface_get_extents; - iface->grab_focus = component_interface_grab_focus; + iface->grab_focus = component_interface_grab_focus; } static void @@ -342,7 +342,7 @@ component_interface_get_extents (AtkComponent *component, GtkWidget *main_canvas; gint week_view_width, week_view_height; gint scroll_x, scroll_y; - gint start_day; + gint start_day; *x = *y = *width = *height = 0; @@ -364,114 +364,114 @@ component_interface_get_extents (AtkComponent *component, coord_type); gnome_canvas_get_scroll_offsets (GNOME_CANVAS (week_view->main_canvas), &scroll_x, &scroll_y); - start_day = week_view->display_start_day; - if (week_view->multi_week_view) { - if (week_view->compress_weekend && (cell->column == (5 - start_day))) { + start_day = week_view->display_start_day; + if (week_view->multi_week_view) { + if (week_view->compress_weekend && (cell->column == (5 - start_day))) { *height = week_view->row_heights[cell->row*2]; *width = week_view->col_widths[cell->column]; *x += week_view->col_offsets[cell->column] - scroll_x; *y += week_view->row_offsets[cell->row*2]- scroll_y; - } else if (week_view->compress_weekend && (cell->column == (6 - start_day))) { + } else if (week_view->compress_weekend && (cell->column == (6 - start_day))) { *height = week_view->row_heights[cell->row*2]; *width = week_view->col_widths[cell->column - 1]; *x += week_view->col_offsets[cell->column - 1]- scroll_x; *y += week_view->row_offsets[cell->row*2 + 1]- scroll_y; - } else if (week_view->compress_weekend && (cell->column > (6 - start_day))) { + } else if (week_view->compress_weekend && (cell->column > (6 - start_day))) { *height = week_view->row_heights[cell->row*2]*2; *width = week_view->col_widths[cell->column - 1]; *x += week_view->col_offsets[cell->column - 1] - scroll_x; *y += week_view->row_offsets[cell->row*2]- scroll_y; - } else { + } else { *height = week_view->row_heights[cell->row*2]*2; *width = week_view->col_widths[cell->column]; *x += week_view->col_offsets[cell->column] - scroll_x; *y += week_view->row_offsets[cell->row*2]- scroll_y; - } - } else { - if (start_day < 3) { - if (cell->column < 3) { + } + } else { + if (start_day < 3) { + if (cell->column < 3) { *height = week_view->row_heights[cell->column*2]*2; *width = week_view->col_widths[0]; *x += week_view->col_offsets[0] - scroll_x; *y += week_view->row_offsets[cell->column*2]- scroll_y; - } else { - if (cell->column == 5 - start_day) { + } else { + if (cell->column == 5 - start_day) { *height = week_view->row_heights[(cell->column - 3)*2]; *width = week_view->col_widths[1]; *x += week_view->col_offsets[1] - scroll_x; *y += week_view->row_offsets[(cell->column - 3)*2]- scroll_y; - } else if (cell->column == 6 - start_day) { + } else if (cell->column == 6 - start_day) { *height = week_view->row_heights[(cell->column - 4)*2]; *width = week_view->col_widths[1]; *x += week_view->col_offsets[1] - scroll_x; *y += week_view->row_offsets[(cell->column - 3)*2 - 1]- scroll_y; - } else if (cell->column > 6 - start_day) { + } else if (cell->column > 6 - start_day) { *height = week_view->row_heights[(cell->column - 4)*2]*2; *width = week_view->col_widths[1]; *x += week_view->col_offsets[1] - scroll_x; *y += week_view->row_offsets[(cell->column - 4)*2]- scroll_y; - } else { + } else { *height = week_view->row_heights[(cell->column - 3)*2]*2; *width = week_view->col_widths[1]; *x += week_view->col_offsets[1] - scroll_x; *y += week_view->row_offsets[(cell->column - 3)*2]- scroll_y; - } - } - } else if (cell->column < 4) { - if (cell->column == 5 - start_day) { + } + } + } else if (cell->column < 4) { + if (cell->column == 5 - start_day) { *height = week_view->row_heights[cell->column*2]; *width = week_view->col_widths[0]; *x += week_view->col_offsets[0] - scroll_x; *y += week_view->row_offsets[cell->column*2]- scroll_y; - } else if (cell->column == 6 - start_day) { + } else if (cell->column == 6 - start_day) { *height = week_view->row_heights[(cell->column - 1)*2]; *width = week_view->col_widths[0]; *x += week_view->col_offsets[0] - scroll_x; *y += week_view->row_offsets[cell->column*2 - 1]- scroll_y; - } else if (cell->column > 6 - start_day) { + } else if (cell->column > 6 - start_day) { *height = week_view->row_heights[(cell->column - 1)*2]*2; *width = week_view->col_widths[0]; *x += week_view->col_offsets[0] - scroll_x; *y += week_view->row_offsets[(cell->column - 1)*2]- scroll_y; - } else { + } else { *height = week_view->row_heights[(cell->column)*2]*2; *width = week_view->col_widths[0]; *x += week_view->col_offsets[0] - scroll_x; *y += week_view->row_offsets[cell->column*2]- scroll_y; - } - } else { + } + } else { *height = week_view->row_heights[(cell->column - 4)*2]*2; *width = week_view->col_widths[1]; *x += week_view->col_offsets[1] - scroll_x; *y += week_view->row_offsets[(cell->column - 4)*2]- scroll_y; - } - } + } + } } static gboolean component_interface_grab_focus (AtkComponent *comp) { - GObject *g_obj; - EWeekViewCell *cell; - EWeekView *week_view; - GtkWidget *toplevel; + GObject *g_obj; + EWeekViewCell *cell; + EWeekView *week_view; + GtkWidget *toplevel; - g_return_val_if_fail (EA_IS_WEEK_VIEW_CELL (comp), FALSE); + g_return_val_if_fail (EA_IS_WEEK_VIEW_CELL (comp), FALSE); - g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (comp)); - if (!g_obj) - return FALSE; + g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (comp)); + if (!g_obj) + return FALSE; - cell = E_WEEK_VIEW_CELL (g_obj); - week_view = cell->week_view; + cell = E_WEEK_VIEW_CELL (g_obj); + week_view = cell->week_view; - week_view->selection_start_day = cell->row * 7 + cell->column; - week_view->selection_end_day = cell->row * 7 + cell->column; - gtk_widget_queue_draw (week_view->main_canvas); + week_view->selection_start_day = cell->row * 7 + cell->column; + week_view->selection_end_day = cell->row * 7 + cell->column; + gtk_widget_queue_draw (week_view->main_canvas); - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (week_view)); - if (gtk_widget_is_toplevel (toplevel)) - gtk_window_present (GTK_WINDOW (toplevel)); + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (week_view)); + if (gtk_widget_is_toplevel (toplevel)) + gtk_window_present (GTK_WINDOW (toplevel)); - return TRUE; + return TRUE; } diff --git a/calendar/gui/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c index 84a4ea1191..433d1aa30d 100644 --- a/calendar/gui/ea-week-view-main-item.c +++ b/calendar/gui/ea-week-view-main-item.c @@ -278,7 +278,7 @@ ea_week_view_main_item_new (GObject *obj) NULL)); atk_object_initialize (accessible, obj); - accessible->role = ATK_ROLE_TABLE; + accessible->role = ATK_ROLE_TABLE; #ifdef ACC_DEBUG ++n_ea_week_view_main_item_created; @@ -494,8 +494,8 @@ ea_week_view_main_item_time_change_cb (EWeekView *week_view, gpointer data) "active-descendant-changed", item_cell); g_signal_emit_by_name (data, "selection_changed"); - atk_focus_tracker_notify (item_cell); - g_object_unref (item_cell); + atk_focus_tracker_notify (item_cell); + g_object_unref (item_cell); } } diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c index f922985819..456327bd39 100644 --- a/calendar/gui/ea-week-view.c +++ b/calendar/gui/ea-week-view.c @@ -218,8 +218,8 @@ ea_week_view_get_n_children (AtkObject *accessible) EWeekViewEventSpan *span; /* If week_view->spans == NULL, there is no visible events. */ - if (!week_view->spans) - break; + if (!week_view->spans) + break; event = &g_array_index (week_view->events, EWeekViewEvent, event_index); diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 7b50de9cf1..0981b1c164 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -803,23 +803,23 @@ comp_description (ECalComponent *comp, gboolean use_24_hour_format) { gchar *description; - ECalComponentDateTime dt; - gchar *start = NULL, *end = NULL; + ECalComponentDateTime dt; + gchar *start = NULL, *end = NULL; - switch (e_cal_component_get_vtype (comp)) { - case E_CAL_COMPONENT_EVENT: + switch (e_cal_component_get_vtype (comp)) { + case E_CAL_COMPONENT_EVENT: description = g_strdup (_("Event information")); break; - case E_CAL_COMPONENT_TODO: + case E_CAL_COMPONENT_TODO: description = g_strdup (_("Task information")); break; - case E_CAL_COMPONENT_JOURNAL: + case E_CAL_COMPONENT_JOURNAL: description = g_strdup (_("Memo information")); break; - case E_CAL_COMPONENT_FREEBUSY: - e_cal_component_get_dtstart (comp, &dt); - if (dt.value) - start = get_label (dt.value, use_24_hour_format); + case E_CAL_COMPONENT_FREEBUSY: + e_cal_component_get_dtstart (comp, &dt); + if (dt.value) + start = get_label (dt.value, use_24_hour_format); e_cal_component_free_datetime (&dt); e_cal_component_get_dtend (comp, &dt); @@ -827,19 +827,19 @@ comp_description (ECalComponent *comp, end = get_label (dt.value, use_24_hour_format); e_cal_component_free_datetime (&dt); - if (start != NULL && end != NULL) + if (start != NULL && end != NULL) description = g_strdup_printf ( _("Free/Busy information (%s to %s)"), start, end); - else + else description = g_strdup (_("Free/Busy information")); - g_free (start); - g_free (end); + g_free (start); + g_free (end); break; - default: + default: description = g_strdup (_("iCalendar information")); break; - } + } return description; } diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c index 36490c5463..29de491df8 100644 --- a/calendar/gui/misc.c +++ b/calendar/gui/misc.c @@ -108,7 +108,7 @@ calculate_time (time_t start, time_t end) gchar *joined; gint i; - i = 0; + i = 0; if (difference >= 3600) { hours = difference / 3600; difference %= 3600; diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 804330cac0..631e026cd7 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -2285,7 +2285,7 @@ print_day_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) print_text_size_bold (context, buf, PANGO_ALIGN_LEFT, 4, todo, 4, - 4 + 24); + 4 + 24); /* Print the day, e.g. 'Tuesday'. */ format_date (&tm, DATE_DAYNAME, buf, 100); @@ -2788,7 +2788,7 @@ print_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) /* Print the border around the header area. */ print_border (context, 0.0, width, - 0.0, HEADER_HEIGHT + 2.0 + 20, 1.0, 0.9); + 0.0, HEADER_HEIGHT + 2.0 + 20, 1.0, 0.9); /* Print the 2 mini calendar-months. */ l = width - SMALL_MONTH_PAD - (small_month_width + week_numbers_inc) * 2 @@ -2866,7 +2866,7 @@ print_month_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) format_date (&tm, DATE_MONTH | DATE_YEAR, buf, 100); print_text_size_bold (context, buf, PANGO_ALIGN_CENTER, 3, width - 3, - 3, 3 + 24); + 3, 3 + 24); } @@ -3110,7 +3110,7 @@ print_calendar (GnomeCalendar *gcal, operation = e_print_operation_new (); gtk_print_operation_set_n_pages (operation, 1); - g_signal_connect ( + g_signal_connect ( operation, "draw_page", G_CALLBACK (print_calendar_draw_page), &pcali); diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 8e20e19bcf..ea7f7d5015 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -129,7 +129,7 @@ prepare_events (icalcomponent *icalcomp, GList **vtodos) if (child_kind == ICAL_VTODO_COMPONENT && vtodos) *vtodos = g_list_prepend (*vtodos, subcomp); else - icalcomponent_free (subcomp); + icalcomponent_free (subcomp); } else { icalcompiter_next (&iter); } diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 234b6ee770..9c75e6b9ee 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -200,7 +200,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, '@'); diff --git a/capplet/settings/mail-decoration.c b/capplet/settings/mail-decoration.c index 999567e962..51a71d11ef 100644 --- a/capplet/settings/mail-decoration.c +++ b/capplet/settings/mail-decoration.c @@ -91,7 +91,7 @@ md_translate_position (GdkWindow *w, double ex, double ey, gint *x, gint *y, Gtk gdk_window_get_geometry (w, &cx, &cy, &cw, &ch); *x += cx; *y += cy; - w = gdk_window_get_parent (w); + w = gdk_window_get_parent (w); } } @@ -254,18 +254,18 @@ md_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_d gint y_root = (gint) event->y_root; gint x, y; - if (!md->priv->can_resize) { - return FALSE; - } + if (!md->priv->can_resize) { + return FALSE; + } md_translate_position (event->window, event->x, event->y, &x, &y, (GtkWidget *)md->window); - update_cursor (md, x, y, TRUE); - if (md->priv->resizing && event->button == 1 && event->type != GDK_2BUTTON_PRESS) { + update_cursor (md, x, y, TRUE); + if (md->priv->resizing && event->button == 1 && event->type != GDK_2BUTTON_PRESS) { gtk_window_begin_resize_drag ((GtkWindow *)widget, md->priv->last_edge, 1, x_root, y_root, event->time); - } else if ((md->priv->resizing && event->button == 2 && event->type != GDK_2BUTTON_PRESS) || - (event->button == 1 && y <= md->priv->top_height && event->type != GDK_2BUTTON_PRESS)) { - gtk_window_begin_move_drag ((GtkWindow *)widget, event->button, x_root, y_root, event->time); + } else if ((md->priv->resizing && event->button == 2 && event->type != GDK_2BUTTON_PRESS) || + (event->button == 1 && y <= md->priv->top_height && event->type != GDK_2BUTTON_PRESS)) { + gtk_window_begin_move_drag ((GtkWindow *)widget, event->button, x_root, y_root, event->time); } else if (y <= md->priv->top_height && event->type == GDK_2BUTTON_PRESS) { if (md->priv->full_screen) gtk_window_unfullscreen (md->window); diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c index cb2010f948..afe65fd448 100644 --- a/capplet/settings/mail-view.c +++ b/capplet/settings/mail-view.c @@ -314,7 +314,7 @@ mail_view_add_folder (MailView *mv, gpointer data, gboolean block) mv->priv->children = block ? g_list_append (mv->priv->children, mfv) : g_list_prepend (mv->priv->children, mfv); position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mfv, mfv->tab_label); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mfv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mfv, FALSE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mfv, FALSE); g_signal_connect (mfv, "view-close", G_CALLBACK(mv_close_mcv), mv); if (!block) @@ -355,7 +355,7 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block) } gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position); if (!block) @@ -382,7 +382,7 @@ mail_view_add_message (MailView *mv, gpointer data, gboolean block) position = gtk_notebook_get_current_page ((GtkNotebook *)mv); gtk_notebook_insert_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mail_conv_view_get_tab_widget (mcv), position+1); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE); if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position+1); if (!block) @@ -417,7 +417,7 @@ mail_view_add_settings (MailView *mv, gpointer data, gboolean block) g_signal_connect (msv, "view-close", G_CALLBACK(mv_close_mcv), mv); g_signal_connect (msv, "show-account", G_CALLBACK(mv_show_acc_mcv), mv); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position); if (!block) @@ -453,7 +453,7 @@ mail_view_add_account (MailView *mv, position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)msv, mail_account_view_get_tab_widget (msv)); g_signal_connect_after (msv, "view-close", G_CALLBACK(mv_close_mcv), mv); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, TRUE); - gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE); if (!block) gtk_notebook_set_current_page ((GtkNotebook *)mv, position); if (!block) diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 33e62a842a..a374a6dcfe 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -110,14 +110,14 @@ e_icon_factory_get_icon (const gchar *icon_name, g_clear_error (&error); /* Fallback to missing image */ - pixbuf = gtk_icon_theme_load_icon ( - icon_theme, GTK_STOCK_MISSING_IMAGE, + pixbuf = gtk_icon_theme_load_icon ( + icon_theme, GTK_STOCK_MISSING_IMAGE, height, 0, &error); - if (error != NULL) { + if (error != NULL) { g_error ("%s", error->message); g_clear_error (&error); - } + } } return pixbuf; @@ -164,8 +164,8 @@ gchar * e_icon_factory_create_thumbnail (const gchar *filename) { static GnomeDesktopThumbnailFactory *thumbnail_factory = NULL; - struct stat file_stat; - gchar *thumbnail = NULL; + struct stat file_stat; + gchar *thumbnail = NULL; g_return_val_if_fail (filename != NULL, NULL); diff --git a/e-util/e-signature.c b/e-util/e-signature.c index 1ac5616eef..07e4b2ea33 100644 --- a/e-util/e-signature.c +++ b/e-util/e-signature.c @@ -117,7 +117,7 @@ xml_set_content (xmlNodePtr node, gchar *buf, *new_val; buf = (gchar *)xmlNodeGetContent (node); - new_val = g_strdup (buf); + new_val = g_strdup (buf); xmlFree (buf); /* We can use strcmp here whether the value is UTF8 or diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index e2e83246a5..ee2f33e231 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -114,10 +114,10 @@ static GConfBridge *bridge = NULL; /* Global GConfBridge object */ static void destroy_bridge (void) { - g_hash_table_destroy (bridge->bindings); - g_object_unref (bridge->client); + g_hash_table_destroy (bridge->bindings); + g_object_unref (bridge->client); - g_free (bridge); + g_free (bridge); } /** @@ -130,20 +130,20 @@ destroy_bridge (void) GConfBridge * gconf_bridge_get (void) { - if (bridge) - return bridge; + if (bridge) + return bridge; - gconf_bridge_install_default_error_handler (); + gconf_bridge_install_default_error_handler (); - bridge = g_new (GConfBridge, 1); + bridge = g_new (GConfBridge, 1); - bridge->client = gconf_client_get_default (); - bridge->bindings = g_hash_table_new_full (NULL, NULL, NULL, - (GDestroyNotify) unbind); + bridge->client = gconf_client_get_default (); + bridge->bindings = g_hash_table_new_full (NULL, NULL, NULL, + (GDestroyNotify) unbind); - g_atexit (destroy_bridge); + g_atexit (destroy_bridge); - return bridge; + return bridge; } /** @@ -158,20 +158,20 @@ gconf_bridge_get (void) GConfClient * gconf_bridge_get_client (GConfBridge *bridge) { - g_return_val_if_fail (bridge != NULL, NULL); + g_return_val_if_fail (bridge != NULL, NULL); - return bridge->client; + return bridge->client; } /* Generate an ID for a new binding */ static guint new_id (void) { - static guint id_counter = 0; + static guint id_counter = 0; - id_counter++; + id_counter++; - return id_counter; + return id_counter; } /* @@ -183,186 +183,186 @@ static void prop_binding_sync_pref_to_prop (PropBinding *binding, GConfValue *pref_value) { - GValue src_value, value; + GValue src_value, value; /* Make sure we don't enter an infinite synchronizing loop */ - g_signal_handler_block (binding->object, binding->prop_notify_id); + g_signal_handler_block (binding->object, binding->prop_notify_id); - memset (&src_value, 0, sizeof (GValue)); + memset (&src_value, 0, sizeof (GValue)); /* First, convert GConfValue to GValue */ - switch (pref_value->type) { - case GCONF_VALUE_STRING: - g_value_init (&src_value, G_TYPE_STRING); - g_value_set_string (&src_value, - gconf_value_get_string (pref_value)); - break; - case GCONF_VALUE_INT: - g_value_init (&src_value, G_TYPE_INT); - g_value_set_int (&src_value, - gconf_value_get_int (pref_value)); - break; - case GCONF_VALUE_BOOL: - g_value_init (&src_value, G_TYPE_BOOLEAN); - g_value_set_boolean (&src_value, - gconf_value_get_bool (pref_value)); - break; - case GCONF_VALUE_FLOAT: - g_value_init (&src_value, G_TYPE_FLOAT); - g_value_set_float (&src_value, - gconf_value_get_float (pref_value)); - break; - default: + switch (pref_value->type) { + case GCONF_VALUE_STRING: + g_value_init (&src_value, G_TYPE_STRING); + g_value_set_string (&src_value, + gconf_value_get_string (pref_value)); + break; + case GCONF_VALUE_INT: + g_value_init (&src_value, G_TYPE_INT); + g_value_set_int (&src_value, + gconf_value_get_int (pref_value)); + break; + case GCONF_VALUE_BOOL: + g_value_init (&src_value, G_TYPE_BOOLEAN); + g_value_set_boolean (&src_value, + gconf_value_get_bool (pref_value)); + break; + case GCONF_VALUE_FLOAT: + g_value_init (&src_value, G_TYPE_FLOAT); + g_value_set_float (&src_value, + gconf_value_get_float (pref_value)); + break; + default: g_warning ("prop_binding_sync_pref_to_prop: Unhandled value " "type '%d'.\n", pref_value->type); - return; - } + return; + } /* Then convert to the type expected by the object, if necessary */ - memset (&value, 0, sizeof (GValue)); - g_value_init (&value, - G_PARAM_SPEC_VALUE_TYPE (binding->prop)); + memset (&value, 0, sizeof (GValue)); + g_value_init (&value, + G_PARAM_SPEC_VALUE_TYPE (binding->prop)); - if (src_value.g_type != value.g_type) { - if (!g_value_transform (&src_value, &value)) { + if (src_value.g_type != value.g_type) { + if (!g_value_transform (&src_value, &value)) { g_warning ("prop_binding_sync_pref_to_prop: Failed to " "transform a \"%s\" to a \"%s\".", - g_type_name (src_value.g_type), - g_type_name (value.g_type)); + g_type_name (src_value.g_type), + g_type_name (value.g_type)); - goto done; - } + goto done; + } - g_object_set_property (binding->object, - binding->prop->name, &value); - } else { - g_object_set_property (binding->object, - binding->prop->name, &src_value); - } + g_object_set_property (binding->object, + binding->prop->name, &value); + } else { + g_object_set_property (binding->object, + binding->prop->name, &src_value); + } done: - g_value_unset (&src_value); - g_value_unset (&value); + g_value_unset (&src_value); + g_value_unset (&value); - g_signal_handler_unblock (binding->object, binding->prop_notify_id); + g_signal_handler_unblock (binding->object, binding->prop_notify_id); } /* Syncs an object property to GConf */ static void prop_binding_sync_prop_to_pref (PropBinding *binding) { - GValue value; - GConfValue *gconf_value; - - memset (&value, 0, sizeof (GValue)); - - g_value_init (&value, - G_PARAM_SPEC_VALUE_TYPE (binding->prop)); - g_object_get_property (binding->object, - binding->prop->name, - &value); - - switch (value.g_type) { - case G_TYPE_STRING: - gconf_value = gconf_value_new (GCONF_VALUE_STRING); - gconf_value_set_string (gconf_value, - g_value_get_string (&value)); - break; - case G_TYPE_INT: - gconf_value = gconf_value_new (GCONF_VALUE_INT); - gconf_value_set_int (gconf_value, - g_value_get_int (&value)); - break; - case G_TYPE_UINT: - gconf_value = gconf_value_new (GCONF_VALUE_INT); - gconf_value_set_int (gconf_value, - g_value_get_uint (&value)); - break; - case G_TYPE_LONG: - gconf_value = gconf_value_new (GCONF_VALUE_INT); - gconf_value_set_int (gconf_value, - g_value_get_long (&value)); - break; - case G_TYPE_ULONG: - gconf_value = gconf_value_new (GCONF_VALUE_INT); - gconf_value_set_int (gconf_value, - g_value_get_ulong (&value)); - break; - case G_TYPE_INT64: - gconf_value = gconf_value_new (GCONF_VALUE_INT); - gconf_value_set_int (gconf_value, - g_value_get_int64 (&value)); - break; - case G_TYPE_UINT64: - gconf_value = gconf_value_new (GCONF_VALUE_INT); - gconf_value_set_int (gconf_value, - g_value_get_uint64 (&value)); - break; - case G_TYPE_CHAR: - gconf_value = gconf_value_new (GCONF_VALUE_INT); - gconf_value_set_int (gconf_value, - g_value_get_char (&value)); - break; - case G_TYPE_UCHAR: - gconf_value = gconf_value_new (GCONF_VALUE_INT); - gconf_value_set_int (gconf_value, - g_value_get_uchar (&value)); - break; - case G_TYPE_ENUM: - gconf_value = gconf_value_new (GCONF_VALUE_INT); - gconf_value_set_int (gconf_value, - g_value_get_enum (&value)); - break; - case G_TYPE_BOOLEAN: - gconf_value = gconf_value_new (GCONF_VALUE_BOOL); - gconf_value_set_bool (gconf_value, - g_value_get_boolean (&value)); - break; - case G_TYPE_DOUBLE: - gconf_value = gconf_value_new (GCONF_VALUE_FLOAT); + GValue value; + GConfValue *gconf_value; + + memset (&value, 0, sizeof (GValue)); + + g_value_init (&value, + G_PARAM_SPEC_VALUE_TYPE (binding->prop)); + g_object_get_property (binding->object, + binding->prop->name, + &value); + + switch (value.g_type) { + case G_TYPE_STRING: + gconf_value = gconf_value_new (GCONF_VALUE_STRING); + gconf_value_set_string (gconf_value, + g_value_get_string (&value)); + break; + case G_TYPE_INT: + gconf_value = gconf_value_new (GCONF_VALUE_INT); + gconf_value_set_int (gconf_value, + g_value_get_int (&value)); + break; + case G_TYPE_UINT: + gconf_value = gconf_value_new (GCONF_VALUE_INT); + gconf_value_set_int (gconf_value, + g_value_get_uint (&value)); + break; + case G_TYPE_LONG: + gconf_value = gconf_value_new (GCONF_VALUE_INT); + gconf_value_set_int (gconf_value, + g_value_get_long (&value)); + break; + case G_TYPE_ULONG: + gconf_value = gconf_value_new (GCONF_VALUE_INT); + gconf_value_set_int (gconf_value, + g_value_get_ulong (&value)); + break; + case G_TYPE_INT64: + gconf_value = gconf_value_new (GCONF_VALUE_INT); + gconf_value_set_int (gconf_value, + g_value_get_int64 (&value)); + break; + case G_TYPE_UINT64: + gconf_value = gconf_value_new (GCONF_VALUE_INT); + gconf_value_set_int (gconf_value, + g_value_get_uint64 (&value)); + break; + case G_TYPE_CHAR: + gconf_value = gconf_value_new (GCONF_VALUE_INT); + gconf_value_set_int (gconf_value, + g_value_get_char (&value)); + break; + case G_TYPE_UCHAR: + gconf_value = gconf_value_new (GCONF_VALUE_INT); + gconf_value_set_int (gconf_value, + g_value_get_uchar (&value)); + break; + case G_TYPE_ENUM: + gconf_value = gconf_value_new (GCONF_VALUE_INT); + gconf_value_set_int (gconf_value, + g_value_get_enum (&value)); + break; + case G_TYPE_BOOLEAN: + gconf_value = gconf_value_new (GCONF_VALUE_BOOL); + gconf_value_set_bool (gconf_value, + g_value_get_boolean (&value)); + break; + case G_TYPE_DOUBLE: + gconf_value = gconf_value_new (GCONF_VALUE_FLOAT); #ifdef HAVE_CORBA_GCONF /* FIXME we cast to a gfloat explicitly as CORBA GConf * uses doubles in its API, but treats them as floats * when transporting them over CORBA. See #322837 */ - gconf_value_set_float (gconf_value, - (gfloat) g_value_get_double (&value)); + gconf_value_set_float (gconf_value, + (gfloat) g_value_get_double (&value)); #else - gconf_value_set_float (gconf_value, - g_value_get_double (&value)); + gconf_value_set_float (gconf_value, + g_value_get_double (&value)); #endif - break; - case G_TYPE_FLOAT: - gconf_value = gconf_value_new (GCONF_VALUE_FLOAT); - gconf_value_set_float (gconf_value, - g_value_get_float (&value)); - break; - default: - if (g_type_is_a (value.g_type, G_TYPE_ENUM)) { - gconf_value = gconf_value_new (GCONF_VALUE_INT); - gconf_value_set_int (gconf_value, - g_value_get_enum (&value)); - } else { + break; + case G_TYPE_FLOAT: + gconf_value = gconf_value_new (GCONF_VALUE_FLOAT); + gconf_value_set_float (gconf_value, + g_value_get_float (&value)); + break; + default: + if (g_type_is_a (value.g_type, G_TYPE_ENUM)) { + gconf_value = gconf_value_new (GCONF_VALUE_INT); + gconf_value_set_int (gconf_value, + g_value_get_enum (&value)); + } else { g_warning ("prop_binding_sync_prop_to_pref: " "Unhandled value type '%s'.\n", - g_type_name (value.g_type)); + g_type_name (value.g_type)); - goto done; - } + goto done; + } - break; - } + break; + } /* Set to GConf */ - gconf_client_set (bridge->client, binding->key, gconf_value, NULL); + gconf_client_set (bridge->client, binding->key, gconf_value, NULL); /* Store until change notification comes in, so that we are able * to ignore it */ - binding->val_changes = g_slist_append (binding->val_changes, - gconf_value); + binding->val_changes = g_slist_append (binding->val_changes, + gconf_value); done: - g_value_unset (&value); + g_value_unset (&value); } /* Called when a GConf value bound to an object property has changed */ @@ -372,30 +372,30 @@ prop_binding_pref_changed (GConfClient *client, GConfEntry *entry, gpointer user_data) { - GConfValue *gconf_value; - PropBinding *binding; - GSList *l; + GConfValue *gconf_value; + PropBinding *binding; + GSList *l; - gconf_value = gconf_entry_get_value (entry); - if (!gconf_value) - return; /* NULL means that the value has been unset */ + gconf_value = gconf_entry_get_value (entry); + if (!gconf_value) + return; /* NULL means that the value has been unset */ - binding = (PropBinding *) user_data; + binding = (PropBinding *) user_data; /* Check that this notification is not caused by sync_prop_to_pref() */ - l = g_slist_find_custom (binding->val_changes, - gconf_value, - (GCompareFunc) gconf_value_compare); - if (l) { - gconf_value_free (l->data); + l = g_slist_find_custom (binding->val_changes, + gconf_value, + (GCompareFunc) gconf_value_compare); + if (l) { + gconf_value_free (l->data); - binding->val_changes = g_slist_delete_link - (binding->val_changes, l); + binding->val_changes = g_slist_delete_link + (binding->val_changes, l); - return; - } + return; + } - prop_binding_sync_pref_to_prop (binding, gconf_value); + prop_binding_sync_pref_to_prop (binding, gconf_value); } /* Performs a scheduled prop-to-pref sync for a prop binding in @@ -403,13 +403,13 @@ prop_binding_pref_changed (GConfClient *client, static gboolean prop_binding_perform_scheduled_sync (PropBinding *binding) { - prop_binding_sync_prop_to_pref (binding); + prop_binding_sync_prop_to_pref (binding); - binding->sync_timeout_id = 0; + binding->sync_timeout_id = 0; - g_object_unref (binding->object); + g_object_unref (binding->object); - return FALSE; + return FALSE; } #define PROP_BINDING_SYNC_DELAY 100 /* Delay for bindings with "delayed" @@ -421,25 +421,25 @@ prop_binding_prop_changed (GObject *object, GParamSpec *param_spec, PropBinding *binding) { - if (binding->delayed_mode) { + if (binding->delayed_mode) { /* Just schedule a sync */ - if (binding->sync_timeout_id == 0) { + if (binding->sync_timeout_id == 0) { /* We keep a reference on the object as long as * we haven't synced yet to make sure we don't * lose any data */ - g_object_ref (binding->object); - - binding->sync_timeout_id = - g_timeout_add - (PROP_BINDING_SYNC_DELAY, - (GSourceFunc) - prop_binding_perform_scheduled_sync, - binding); - } - } else { + g_object_ref (binding->object); + + binding->sync_timeout_id = + g_timeout_add + (PROP_BINDING_SYNC_DELAY, + (GSourceFunc) + prop_binding_perform_scheduled_sync, + binding); + } + } else { /* Directly sync */ - prop_binding_sync_prop_to_pref (binding); - } + prop_binding_sync_prop_to_pref (binding); + } } /* Called when an object is destroyed */ @@ -447,14 +447,14 @@ static void prop_binding_object_destroyed (gpointer user_data, GObject *where_the_object_was) { - PropBinding *binding; + PropBinding *binding; - binding = (PropBinding *) user_data; - binding->object = NULL; /* Don't do anything with the object + binding = (PropBinding *) user_data; + binding->object = NULL; /* Don't do anything with the object * at unbind() */ - g_hash_table_remove (bridge->bindings, - GUINT_TO_POINTER (binding->id)); + g_hash_table_remove (bridge->bindings, + GUINT_TO_POINTER (binding->id)); } /** @@ -485,70 +485,70 @@ gconf_bridge_bind_property_full (GConfBridge *bridge, const gchar *prop, gboolean delayed_sync) { - GParamSpec *pspec; - PropBinding *binding; - gchar *signal; - GConfValue *val; + GParamSpec *pspec; + PropBinding *binding; + gchar *signal; + GConfValue *val; - g_return_val_if_fail (bridge != NULL, 0); - g_return_val_if_fail (key != NULL, 0); - g_return_val_if_fail (G_IS_OBJECT (object), 0); - g_return_val_if_fail (prop != NULL, 0); + g_return_val_if_fail (bridge != NULL, 0); + g_return_val_if_fail (key != NULL, 0); + g_return_val_if_fail (G_IS_OBJECT (object), 0); + g_return_val_if_fail (prop != NULL, 0); /* First, try to fetch the propertys GParamSpec off the object */ - pspec = g_object_class_find_property - (G_OBJECT_GET_CLASS (object), prop); - if (G_UNLIKELY (pspec == NULL)) { + pspec = g_object_class_find_property + (G_OBJECT_GET_CLASS (object), prop); + if (G_UNLIKELY (pspec == NULL)) { g_warning ("gconf_bridge_bind_property_full: A property \"%s\" " "was not found. Please make sure you are passing " "the right property name.", prop); - return 0; - } + return 0; + } /* GParamSpec found: All good, create new binding. */ - binding = g_new (PropBinding, 1); + binding = g_new (PropBinding, 1); - binding->type = BINDING_PROP; - binding->id = new_id (); - binding->delayed_mode = delayed_sync; - binding->val_changes = NULL; - binding->key = g_strdup (key); - binding->object = object; - binding->prop = pspec; - binding->sync_timeout_id = 0; + binding->type = BINDING_PROP; + binding->id = new_id (); + binding->delayed_mode = delayed_sync; + binding->val_changes = NULL; + binding->key = g_strdup (key); + binding->object = object; + binding->prop = pspec; + binding->sync_timeout_id = 0; /* Watch GConf key */ - binding->val_notify_id = - gconf_client_notify_add (bridge->client, key, - prop_binding_pref_changed, - binding, NULL, NULL); + binding->val_notify_id = + gconf_client_notify_add (bridge->client, key, + prop_binding_pref_changed, + binding, NULL, NULL); /* Connect to property change notifications */ signal = g_strconcat ("notify::", prop, NULL); - binding->prop_notify_id = - g_signal_connect (object, signal, - G_CALLBACK (prop_binding_prop_changed), - binding); - g_free (signal); + binding->prop_notify_id = + g_signal_connect (object, signal, + G_CALLBACK (prop_binding_prop_changed), + binding); + g_free (signal); /* Sync object to value from GConf, if set */ - val = gconf_client_get (bridge->client, key, NULL); - if (val) { - prop_binding_sync_pref_to_prop (binding, val); - gconf_value_free (val); - } + val = gconf_client_get (bridge->client, key, NULL); + if (val) { + prop_binding_sync_pref_to_prop (binding, val); + gconf_value_free (val); + } /* Handle case where watched object gets destroyed */ - g_object_weak_ref (object, - prop_binding_object_destroyed, binding); + g_object_weak_ref (object, + prop_binding_object_destroyed, binding); /* Insert binding */ - g_hash_table_insert (bridge->bindings, - GUINT_TO_POINTER (binding->id), binding); + g_hash_table_insert (bridge->bindings, + GUINT_TO_POINTER (binding->id), binding); /* Done */ - return binding->id; + return binding->id; } static void @@ -556,13 +556,13 @@ prop_binding_block_cb (gpointer hkey, PropBinding *binding, const gchar *key) { - g_return_if_fail (binding != NULL); - g_return_if_fail (key != NULL); + g_return_if_fail (binding != NULL); + g_return_if_fail (key != NULL); - if (binding->type == BINDING_PROP && binding->key && - g_ascii_strcasecmp (binding->key, key) == 0) - g_signal_handler_block ( - binding->object, binding->prop_notify_id); + if (binding->type == BINDING_PROP && binding->key && + g_ascii_strcasecmp (binding->key, key) == 0) + g_signal_handler_block ( + binding->object, binding->prop_notify_id); } static void @@ -570,71 +570,71 @@ prop_binding_unblock_cb (gpointer hkey, PropBinding *binding, const gchar *key) { - g_return_if_fail (binding != NULL); - g_return_if_fail (key != NULL); + g_return_if_fail (binding != NULL); + g_return_if_fail (key != NULL); - if (binding->type == BINDING_PROP && binding->key && - g_ascii_strcasecmp (binding->key, key) == 0) - g_signal_handler_unblock ( - binding->object, binding->prop_notify_id); + if (binding->type == BINDING_PROP && binding->key && + g_ascii_strcasecmp (binding->key, key) == 0) + g_signal_handler_unblock ( + binding->object, binding->prop_notify_id); } void gconf_bridge_block_property_bindings (GConfBridge *bridge, const gchar *key) { - g_return_if_fail (bridge != NULL); - g_return_if_fail (key != NULL); + g_return_if_fail (bridge != NULL); + g_return_if_fail (key != NULL); - g_hash_table_foreach ( - bridge->bindings, (GHFunc) - prop_binding_block_cb, (gpointer)key); + g_hash_table_foreach ( + bridge->bindings, (GHFunc) + prop_binding_block_cb, (gpointer)key); } void gconf_bridge_unblock_property_bindings (GConfBridge *bridge, const gchar *key) { - g_return_if_fail (bridge != NULL); - g_return_if_fail (key != NULL); + g_return_if_fail (bridge != NULL); + g_return_if_fail (key != NULL); - g_hash_table_foreach ( - bridge->bindings, (GHFunc) - prop_binding_unblock_cb, (gpointer)key); + g_hash_table_foreach ( + bridge->bindings, (GHFunc) + prop_binding_unblock_cb, (gpointer)key); } /* Unbinds a property binding */ static void prop_binding_unbind (PropBinding *binding) { - if (binding->delayed_mode && binding->sync_timeout_id > 0) { + if (binding->delayed_mode && binding->sync_timeout_id > 0) { /* Perform any scheduled syncs */ - g_source_remove (binding->sync_timeout_id); + g_source_remove (binding->sync_timeout_id); /* The object will still be around as we have * a reference */ - prop_binding_perform_scheduled_sync (binding); - } + prop_binding_perform_scheduled_sync (binding); + } - gconf_client_notify_remove (bridge->client, - binding->val_notify_id); - g_free (binding->key); + gconf_client_notify_remove (bridge->client, + binding->val_notify_id); + g_free (binding->key); - while (binding->val_changes) { - gconf_value_free (binding->val_changes->data); + while (binding->val_changes) { + gconf_value_free (binding->val_changes->data); - binding->val_changes = g_slist_delete_link - (binding->val_changes, binding->val_changes); - } + binding->val_changes = g_slist_delete_link + (binding->val_changes, binding->val_changes); + } /* The object might have been destroyed .. */ - if (binding->object) { - g_signal_handler_disconnect (binding->object, - binding->prop_notify_id); + if (binding->object) { + g_signal_handler_disconnect (binding->object, + binding->prop_notify_id); - g_object_weak_unref (binding->object, - prop_binding_object_destroyed, binding); - } + g_object_weak_unref (binding->object, + prop_binding_object_destroyed, binding); + } } /* @@ -645,54 +645,54 @@ prop_binding_unbind (PropBinding *binding) static gboolean window_binding_perform_scheduled_sync (WindowBinding *binding) { - if (binding->bind_size) { - gint width, height; - gchar *key; - GdkWindowState state; - GdkWindow *window; + if (binding->bind_size) { + gint width, height; + gchar *key; + GdkWindowState state; + GdkWindow *window; - window = gtk_widget_get_window (GTK_WIDGET (binding->window)); - state = gdk_window_get_state (window); + window = gtk_widget_get_window (GTK_WIDGET (binding->window)); + state = gdk_window_get_state (window); - if (state & GDK_WINDOW_STATE_MAXIMIZED) { + if (state & GDK_WINDOW_STATE_MAXIMIZED) { key = g_strconcat (binding->key_prefix, "_maximized", NULL); - gconf_client_set_bool (bridge->client, key, TRUE, NULL); - g_free (key); - } else { - gtk_window_get_size (binding->window, &width, &height); + gconf_client_set_bool (bridge->client, key, TRUE, NULL); + g_free (key); + } else { + gtk_window_get_size (binding->window, &width, &height); key = g_strconcat (binding->key_prefix, "_width", NULL); - gconf_client_set_int (bridge->client, key, width, NULL); - g_free (key); + gconf_client_set_int (bridge->client, key, width, NULL); + g_free (key); key = g_strconcat (binding->key_prefix, "_height", NULL); - gconf_client_set_int (bridge->client, key, height, NULL); - g_free (key); + gconf_client_set_int (bridge->client, key, height, NULL); + g_free (key); key = g_strconcat (binding->key_prefix, "_maximized", NULL); - gconf_client_set_bool (bridge->client, key, FALSE, NULL); - g_free (key); - } - } + gconf_client_set_bool (bridge->client, key, FALSE, NULL); + g_free (key); + } + } - if (binding->bind_pos) { - gint x, y; - gchar *key; + if (binding->bind_pos) { + gint x, y; + gchar *key; - gtk_window_get_position (binding->window, &x, &y); + gtk_window_get_position (binding->window, &x, &y); key = g_strconcat (binding->key_prefix, "_x", NULL); - gconf_client_set_int (bridge->client, key, x, NULL); - g_free (key); + gconf_client_set_int (bridge->client, key, x, NULL); + g_free (key); key = g_strconcat (binding->key_prefix, "_y", NULL); - gconf_client_set_int (bridge->client, key, y, NULL); - g_free (key); - } + gconf_client_set_int (bridge->client, key, y, NULL); + g_free (key); + } - binding->sync_timeout_id = 0; + binding->sync_timeout_id = 0; - return FALSE; + return FALSE; } #define WINDOW_BINDING_SYNC_DELAY 1 /* Delay before syncing new window @@ -705,15 +705,15 @@ window_binding_configure_event_cb (GtkWindow *window, WindowBinding *binding) { /* re-postpone by cancel of the previous request */ - if (binding->sync_timeout_id > 0) - g_source_remove (binding->sync_timeout_id); + if (binding->sync_timeout_id > 0) + g_source_remove (binding->sync_timeout_id); /* Schedule a sync */ - binding->sync_timeout_id = g_timeout_add_seconds (WINDOW_BINDING_SYNC_DELAY, - (GSourceFunc) window_binding_perform_scheduled_sync, - binding); + binding->sync_timeout_id = g_timeout_add_seconds (WINDOW_BINDING_SYNC_DELAY, + (GSourceFunc) window_binding_perform_scheduled_sync, + binding); - return FALSE; + return FALSE; } /* Called when the window state is being changed */ @@ -722,12 +722,12 @@ window_binding_state_event_cb (GtkWindow *window, GdkEventWindowState *event, WindowBinding *binding) { - if (binding->sync_timeout_id > 0) - g_source_remove (binding->sync_timeout_id); + if (binding->sync_timeout_id > 0) + g_source_remove (binding->sync_timeout_id); - window_binding_perform_scheduled_sync (binding); + window_binding_perform_scheduled_sync (binding); - return FALSE; + return FALSE; } /* Called when the window is being unmapped */ @@ -736,16 +736,16 @@ window_binding_unmap_cb (GtkWindow *window, WindowBinding *binding) { /* Force sync */ - if (binding->sync_timeout_id > 0) - g_source_remove (binding->sync_timeout_id); + if (binding->sync_timeout_id > 0) + g_source_remove (binding->sync_timeout_id); /* XXX It's too late to record the window position. * gtk_window_get_position() will report (0, 0). */ - binding->bind_pos = FALSE; + binding->bind_pos = FALSE; - window_binding_perform_scheduled_sync (binding); + window_binding_perform_scheduled_sync (binding); - return FALSE; + return FALSE; } /* Called when a window is destroyed */ @@ -753,17 +753,17 @@ static void window_binding_window_destroyed (gpointer user_data, GObject *where_the_object_was) { - WindowBinding *binding; + WindowBinding *binding; - binding = (WindowBinding *) user_data; - binding->window = NULL; /* Don't do anything with the window + binding = (WindowBinding *) user_data; + binding->window = NULL; /* Don't do anything with the window * at unbind() */ - if (binding->sync_timeout_id > 0) - g_source_remove (binding->sync_timeout_id); + if (binding->sync_timeout_id > 0) + g_source_remove (binding->sync_timeout_id); - g_hash_table_remove (bridge->bindings, - GUINT_TO_POINTER (binding->id)); + g_hash_table_remove (bridge->bindings, + GUINT_TO_POINTER (binding->id)); } /** @@ -791,140 +791,140 @@ gconf_bridge_bind_window (GConfBridge *bridge, gboolean bind_size, gboolean bind_pos) { - WindowBinding *binding; + WindowBinding *binding; - g_return_val_if_fail (bridge != NULL, 0); - g_return_val_if_fail (key_prefix != NULL, 0); - g_return_val_if_fail (GTK_IS_WINDOW (window), 0); + g_return_val_if_fail (bridge != NULL, 0); + g_return_val_if_fail (key_prefix != NULL, 0); + g_return_val_if_fail (GTK_IS_WINDOW (window), 0); /* Create new binding. */ - binding = g_new (WindowBinding, 1); + binding = g_new (WindowBinding, 1); - binding->type = BINDING_WINDOW; - binding->id = new_id (); - binding->bind_size = bind_size; - binding->bind_pos = bind_pos; - binding->key_prefix = g_strdup (key_prefix); - binding->window = window; - binding->sync_timeout_id = 0; + binding->type = BINDING_WINDOW; + binding->id = new_id (); + binding->bind_size = bind_size; + binding->bind_pos = bind_pos; + binding->key_prefix = g_strdup (key_prefix); + binding->window = window; + binding->sync_timeout_id = 0; /* Set up GConf keys & sync window to GConf values */ - if (bind_size) { - gchar *key; - GConfValue *width_val, *height_val, *maximized_val; + if (bind_size) { + gchar *key; + GConfValue *width_val, *height_val, *maximized_val; key = g_strconcat (key_prefix, "_width", NULL); - width_val = gconf_client_get (bridge->client, key, NULL); - g_free (key); + width_val = gconf_client_get (bridge->client, key, NULL); + g_free (key); key = g_strconcat (key_prefix, "_height", NULL); - height_val = gconf_client_get (bridge->client, key, NULL); - g_free (key); + height_val = gconf_client_get (bridge->client, key, NULL); + g_free (key); key = g_strconcat (key_prefix, "_maximized", NULL); - maximized_val = gconf_client_get (bridge->client, key, NULL); - g_free (key); - - if (width_val && height_val) { - gtk_window_resize (window, - gconf_value_get_int (width_val), - gconf_value_get_int (height_val)); - - gconf_value_free (width_val); - gconf_value_free (height_val); - } else if (width_val) { - gconf_value_free (width_val); - } else if (height_val) { - gconf_value_free (height_val); - } - - if (maximized_val) { - if (gconf_value_get_bool (maximized_val)) { - gtk_window_maximize (window); - } - gconf_value_free (maximized_val); - } - } - - if (bind_pos) { - gchar *key; - GConfValue *x_val, *y_val; + maximized_val = gconf_client_get (bridge->client, key, NULL); + g_free (key); + + if (width_val && height_val) { + gtk_window_resize (window, + gconf_value_get_int (width_val), + gconf_value_get_int (height_val)); + + gconf_value_free (width_val); + gconf_value_free (height_val); + } else if (width_val) { + gconf_value_free (width_val); + } else if (height_val) { + gconf_value_free (height_val); + } + + if (maximized_val) { + if (gconf_value_get_bool (maximized_val)) { + gtk_window_maximize (window); + } + gconf_value_free (maximized_val); + } + } + + if (bind_pos) { + gchar *key; + GConfValue *x_val, *y_val; key = g_strconcat (key_prefix, "_x", NULL); - x_val = gconf_client_get (bridge->client, key, NULL); - g_free (key); + x_val = gconf_client_get (bridge->client, key, NULL); + g_free (key); key = g_strconcat (key_prefix, "_y", NULL); - y_val = gconf_client_get (bridge->client, key, NULL); - g_free (key); - - if (x_val && y_val) { - gtk_window_move (window, - gconf_value_get_int (x_val), - gconf_value_get_int (y_val)); - - gconf_value_free (x_val); - gconf_value_free (y_val); - } else if (x_val) { - gconf_value_free (x_val); - } else if (y_val) { - gconf_value_free (y_val); - } - } + y_val = gconf_client_get (bridge->client, key, NULL); + g_free (key); + + if (x_val && y_val) { + gtk_window_move (window, + gconf_value_get_int (x_val), + gconf_value_get_int (y_val)); + + gconf_value_free (x_val); + gconf_value_free (y_val); + } else if (x_val) { + gconf_value_free (x_val); + } else if (y_val) { + gconf_value_free (y_val); + } + } /* Connect to window size change notifications */ - binding->configure_event_id = - g_signal_connect (window, + binding->configure_event_id = + g_signal_connect (window, "configure-event", - G_CALLBACK - (window_binding_configure_event_cb), - binding); + G_CALLBACK + (window_binding_configure_event_cb), + binding); - binding->window_state_event_id = - g_signal_connect (window, + binding->window_state_event_id = + g_signal_connect (window, "window_state_event", - G_CALLBACK - (window_binding_state_event_cb), - binding); - binding->unmap_id = - g_signal_connect (window, + G_CALLBACK + (window_binding_state_event_cb), + binding); + binding->unmap_id = + g_signal_connect (window, "unmap", - G_CALLBACK (window_binding_unmap_cb), - binding); + G_CALLBACK (window_binding_unmap_cb), + binding); /* Handle case where window gets destroyed */ - g_object_weak_ref (G_OBJECT (window), - window_binding_window_destroyed, binding); + g_object_weak_ref (G_OBJECT (window), + window_binding_window_destroyed, binding); /* Insert binding */ - g_hash_table_insert (bridge->bindings, - GUINT_TO_POINTER (binding->id), binding); + g_hash_table_insert (bridge->bindings, + GUINT_TO_POINTER (binding->id), binding); /* Done */ - return binding->id; + return binding->id; } /* Unbinds a window binding */ static void window_binding_unbind (WindowBinding *binding) { - if (binding->sync_timeout_id > 0) - g_source_remove (binding->sync_timeout_id); + if (binding->sync_timeout_id > 0) + g_source_remove (binding->sync_timeout_id); - g_free (binding->key_prefix); + g_free (binding->key_prefix); /* The window might have been destroyed .. */ - if (binding->window) { - g_signal_handler_disconnect (binding->window, - binding->configure_event_id); - g_signal_handler_disconnect (binding->window, - binding->window_state_event_id); - g_signal_handler_disconnect (binding->window, - binding->unmap_id); - - g_object_weak_unref (G_OBJECT (binding->window), - window_binding_window_destroyed, binding); - } + if (binding->window) { + g_signal_handler_disconnect (binding->window, + binding->configure_event_id); + g_signal_handler_disconnect (binding->window, + binding->window_state_event_id); + g_signal_handler_disconnect (binding->window, + binding->unmap_id); + + g_object_weak_unref (G_OBJECT (binding->window), + window_binding_window_destroyed, binding); + } } /* @@ -936,85 +936,85 @@ static void list_store_binding_sync_pref_to_store (ListStoreBinding *binding, GConfValue *value) { - GSList *list, *l; - GtkTreeIter iter; + GSList *list, *l; + GtkTreeIter iter; /* Make sure we don't enter an infinite synchronizing loop */ - g_signal_handler_block (binding->list_store, - binding->row_inserted_id); - g_signal_handler_block (binding->list_store, - binding->row_deleted_id); - - gtk_list_store_clear (binding->list_store); - - list = gconf_value_get_list (value); - for (l = list; l; l = l->next) { - GConfValue *l_value; - const gchar *string; - - l_value = (GConfValue *) l->data; - string = gconf_value_get_string (l_value); - - gtk_list_store_insert_with_values (binding->list_store, - &iter, -1, - 0, string, - -1); - } - - g_signal_handler_unblock (binding->list_store, - binding->row_inserted_id); - g_signal_handler_unblock (binding->list_store, - binding->row_deleted_id); + g_signal_handler_block (binding->list_store, + binding->row_inserted_id); + g_signal_handler_block (binding->list_store, + binding->row_deleted_id); + + gtk_list_store_clear (binding->list_store); + + list = gconf_value_get_list (value); + for (l = list; l; l = l->next) { + GConfValue *l_value; + const gchar *string; + + l_value = (GConfValue *) l->data; + string = gconf_value_get_string (l_value); + + gtk_list_store_insert_with_values (binding->list_store, + &iter, -1, + 0, string, + -1); + } + + g_signal_handler_unblock (binding->list_store, + binding->row_inserted_id); + g_signal_handler_unblock (binding->list_store, + binding->row_deleted_id); } /* Sets a GConf value to the contents of a GtkListStore */ static gboolean list_store_binding_sync_store_to_pref (ListStoreBinding *binding) { - GtkTreeModel *tree_model; - GtkTreeIter iter; - GSList *list; - gint res; - GConfValue *gconf_value; + GtkTreeModel *tree_model; + GtkTreeIter iter; + GSList *list; + gint res; + GConfValue *gconf_value; - tree_model = GTK_TREE_MODEL (binding->list_store); + tree_model = GTK_TREE_MODEL (binding->list_store); /* Build list */ - list = NULL; - res = gtk_tree_model_get_iter_first (tree_model, &iter); - while (res) { - gchar *string; - GConfValue *tmp_value; + list = NULL; + res = gtk_tree_model_get_iter_first (tree_model, &iter); + while (res) { + gchar *string; + GConfValue *tmp_value; - gtk_tree_model_get (tree_model, &iter, - 0, &string, -1); + gtk_tree_model_get (tree_model, &iter, + 0, &string, -1); - tmp_value = gconf_value_new (GCONF_VALUE_STRING); - gconf_value_set_string (tmp_value, string); + tmp_value = gconf_value_new (GCONF_VALUE_STRING); + gconf_value_set_string (tmp_value, string); - list = g_slist_append (list, tmp_value); + list = g_slist_append (list, tmp_value); - res = gtk_tree_model_iter_next (tree_model, &iter); - } + res = gtk_tree_model_iter_next (tree_model, &iter); + } /* Create value */ - gconf_value = gconf_value_new (GCONF_VALUE_LIST); - gconf_value_set_list_type (gconf_value, GCONF_VALUE_STRING); - gconf_value_set_list_nocopy (gconf_value, list); + gconf_value = gconf_value_new (GCONF_VALUE_LIST); + gconf_value_set_list_type (gconf_value, GCONF_VALUE_STRING); + gconf_value_set_list_nocopy (gconf_value, list); /* Set */ - gconf_client_set (bridge->client, binding->key, gconf_value, NULL); + gconf_client_set (bridge->client, binding->key, gconf_value, NULL); /* Store until change notification comes in, so that we are able * to ignore it */ - binding->val_changes = g_slist_append (binding->val_changes, - gconf_value); + binding->val_changes = g_slist_append (binding->val_changes, + gconf_value); - binding->sync_idle_id = 0; + binding->sync_idle_id = 0; - g_object_unref (binding->list_store); + g_object_unref (binding->list_store); - return FALSE; + return FALSE; } /* Pref changed: sync */ @@ -1024,31 +1024,31 @@ list_store_binding_pref_changed (GConfClient *client, GConfEntry *entry, gpointer user_data) { - GConfValue *gconf_value; - ListStoreBinding *binding; - GSList *l; + GConfValue *gconf_value; + ListStoreBinding *binding; + GSList *l; - gconf_value = gconf_entry_get_value (entry); - if (!gconf_value) - return; /* NULL means that the value has been unset */ + gconf_value = gconf_entry_get_value (entry); + if (!gconf_value) + return; /* NULL means that the value has been unset */ - binding = (ListStoreBinding *) user_data; + binding = (ListStoreBinding *) user_data; /* Check that this notification is not caused by * sync_store_to_pref() */ - l = g_slist_find_custom (binding->val_changes, - gconf_value, - (GCompareFunc) gconf_value_compare); - if (l) { - gconf_value_free (l->data); + l = g_slist_find_custom (binding->val_changes, + gconf_value, + (GCompareFunc) gconf_value_compare); + if (l) { + gconf_value_free (l->data); - binding->val_changes = g_slist_delete_link - (binding->val_changes, l); + binding->val_changes = g_slist_delete_link + (binding->val_changes, l); - return; - } + return; + } - list_store_binding_sync_pref_to_store (binding, gconf_value); + list_store_binding_sync_pref_to_store (binding, gconf_value); } /* Called when an object is destroyed */ @@ -1056,27 +1056,27 @@ static void list_store_binding_store_destroyed (gpointer user_data, GObject *where_the_object_was) { - ListStoreBinding *binding; + ListStoreBinding *binding; - binding = (ListStoreBinding *) user_data; - binding->list_store = NULL; /* Don't do anything with the store + binding = (ListStoreBinding *) user_data; + binding->list_store = NULL; /* Don't do anything with the store * at unbind() */ - g_hash_table_remove (bridge->bindings, - GUINT_TO_POINTER (binding->id)); + g_hash_table_remove (bridge->bindings, + GUINT_TO_POINTER (binding->id)); } /* List store changed: Sync */ static void list_store_binding_store_changed_cb (ListStoreBinding *binding) { - if (binding->sync_idle_id == 0) { - g_object_ref (binding->list_store); + if (binding->sync_idle_id == 0) { + g_object_ref (binding->list_store); - binding->sync_idle_id = g_idle_add - ((GSourceFunc) list_store_binding_sync_store_to_pref, - binding); - } + binding->sync_idle_id = g_idle_add + ((GSourceFunc) list_store_binding_sync_store_to_pref, + binding); + } } /** @@ -1097,83 +1097,83 @@ gconf_bridge_bind_string_list_store (GConfBridge *bridge, const gchar *key, GtkListStore *list_store) { - GtkTreeModel *tree_model; - gboolean have_one_column, is_string_column; - ListStoreBinding *binding; - GConfValue *val; + GtkTreeModel *tree_model; + gboolean have_one_column, is_string_column; + ListStoreBinding *binding; + GConfValue *val; - g_return_val_if_fail (bridge != NULL, 0); - g_return_val_if_fail (key != NULL, 0); - g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), 0); + g_return_val_if_fail (bridge != NULL, 0); + g_return_val_if_fail (key != NULL, 0); + g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), 0); /* Check list store suitability */ - tree_model = GTK_TREE_MODEL (list_store); - have_one_column = (gtk_tree_model_get_n_columns (tree_model) == 1); - is_string_column = (gtk_tree_model_get_column_type - (tree_model, 0) == G_TYPE_STRING); - if (G_UNLIKELY (!have_one_column || !is_string_column)) { + tree_model = GTK_TREE_MODEL (list_store); + have_one_column = (gtk_tree_model_get_n_columns (tree_model) == 1); + is_string_column = (gtk_tree_model_get_column_type + (tree_model, 0) == G_TYPE_STRING); + if (G_UNLIKELY (!have_one_column || !is_string_column)) { g_warning ("gconf_bridge_bind_string_list_store: Only " "GtkListStores with exactly one string column are " "supported."); - return 0; - } + return 0; + } /* Create new binding. */ - binding = g_new (ListStoreBinding, 1); + binding = g_new (ListStoreBinding, 1); - binding->type = BINDING_LIST_STORE; - binding->id = new_id (); - binding->key = g_strdup (key); - binding->val_changes = NULL; - binding->list_store = list_store; - binding->sync_idle_id = 0; + binding->type = BINDING_LIST_STORE; + binding->id = new_id (); + binding->key = g_strdup (key); + binding->val_changes = NULL; + binding->list_store = list_store; + binding->sync_idle_id = 0; /* Watch GConf key */ - binding->val_notify_id = - gconf_client_notify_add (bridge->client, key, - list_store_binding_pref_changed, - binding, NULL, NULL); + binding->val_notify_id = + gconf_client_notify_add (bridge->client, key, + list_store_binding_pref_changed, + binding, NULL, NULL); /* Connect to ListStore change notifications */ - binding->row_inserted_id = + binding->row_inserted_id = g_signal_connect_swapped (list_store, "row-inserted", - G_CALLBACK - (list_store_binding_store_changed_cb), - binding); - binding->row_changed_id = + G_CALLBACK + (list_store_binding_store_changed_cb), + binding); + binding->row_changed_id = g_signal_connect_swapped (list_store, "row-changed", - G_CALLBACK - (list_store_binding_store_changed_cb), - binding); - binding->row_deleted_id = + G_CALLBACK + (list_store_binding_store_changed_cb), + binding); + binding->row_deleted_id = g_signal_connect_swapped (list_store, "row-deleted", - G_CALLBACK - (list_store_binding_store_changed_cb), - binding); - binding->rows_reordered_id = + G_CALLBACK + (list_store_binding_store_changed_cb), + binding); + binding->rows_reordered_id = g_signal_connect_swapped (list_store, "rows-reordered", - G_CALLBACK - (list_store_binding_store_changed_cb), - binding); + G_CALLBACK + (list_store_binding_store_changed_cb), + binding); /* Sync object to value from GConf, if set */ - val = gconf_client_get (bridge->client, key, NULL); - if (val) { - list_store_binding_sync_pref_to_store (binding, val); - gconf_value_free (val); - } + val = gconf_client_get (bridge->client, key, NULL); + if (val) { + list_store_binding_sync_pref_to_store (binding, val); + gconf_value_free (val); + } /* Handle case where watched object gets destroyed */ - g_object_weak_ref (G_OBJECT (list_store), - list_store_binding_store_destroyed, binding); + g_object_weak_ref (G_OBJECT (list_store), + list_store_binding_store_destroyed, binding); /* Insert binding */ - g_hash_table_insert (bridge->bindings, - GUINT_TO_POINTER (binding->id), binding); + g_hash_table_insert (bridge->bindings, + GUINT_TO_POINTER (binding->id), binding); /* Done */ - return binding->id; + return binding->id; } /* Unbinds a list store binding */ @@ -1181,37 +1181,37 @@ static void list_store_binding_unbind (ListStoreBinding *binding) { /* Perform any scheduled syncs */ - if (binding->sync_idle_id > 0) { - g_source_remove (binding->sync_idle_id); + if (binding->sync_idle_id > 0) { + g_source_remove (binding->sync_idle_id); /* The store will still be around as we added a reference */ - list_store_binding_sync_store_to_pref (binding); - } + list_store_binding_sync_store_to_pref (binding); + } - g_free (binding->key); + g_free (binding->key); - while (binding->val_changes) { - gconf_value_free (binding->val_changes->data); + while (binding->val_changes) { + gconf_value_free (binding->val_changes->data); - binding->val_changes = g_slist_delete_link - (binding->val_changes, binding->val_changes); - } + binding->val_changes = g_slist_delete_link + (binding->val_changes, binding->val_changes); + } /* The store might have been destroyed .. */ - if (binding->list_store) { - g_signal_handler_disconnect (binding->list_store, - binding->row_inserted_id); - g_signal_handler_disconnect (binding->list_store, - binding->row_changed_id); - g_signal_handler_disconnect (binding->list_store, - binding->row_deleted_id); - g_signal_handler_disconnect (binding->list_store, - binding->rows_reordered_id); - - g_object_weak_unref (G_OBJECT (binding->list_store), - list_store_binding_store_destroyed, - binding); - } + if (binding->list_store) { + g_signal_handler_disconnect (binding->list_store, + binding->row_inserted_id); + g_signal_handler_disconnect (binding->list_store, + binding->row_changed_id); + g_signal_handler_disconnect (binding->list_store, + binding->row_deleted_id); + g_signal_handler_disconnect (binding->list_store, + binding->rows_reordered_id); + + g_object_weak_unref (G_OBJECT (binding->list_store), + list_store_binding_store_destroyed, + binding); + } } /* @@ -1223,22 +1223,22 @@ static void unbind (Binding *binding) { /* Call specialized unbinding function */ - switch (binding->type) { - case BINDING_PROP: - prop_binding_unbind ((PropBinding *) binding); - break; - case BINDING_WINDOW: - window_binding_unbind ((WindowBinding *) binding); - break; - case BINDING_LIST_STORE: - list_store_binding_unbind ((ListStoreBinding *) binding); - break; - default: + switch (binding->type) { + case BINDING_PROP: + prop_binding_unbind ((PropBinding *) binding); + break; + case BINDING_WINDOW: + window_binding_unbind ((WindowBinding *) binding); + break; + case BINDING_LIST_STORE: + list_store_binding_unbind ((ListStoreBinding *) binding); + break; + default: g_warning ("Unknown binding type '%d'\n", binding->type); - break; - } + break; + } - g_free (binding); + g_free (binding); } /** @@ -1252,13 +1252,13 @@ void gconf_bridge_unbind (GConfBridge *bridge, guint binding_id) { - g_return_if_fail (bridge != NULL); - g_return_if_fail (binding_id > 0); + g_return_if_fail (bridge != NULL); + g_return_if_fail (binding_id > 0); /* This will trigger the hash tables value destruction * function, which will take care of further cleanup */ - g_hash_table_remove (bridge->bindings, - GUINT_TO_POINTER (binding_id)); + g_hash_table_remove (bridge->bindings, + GUINT_TO_POINTER (binding_id)); } /* @@ -1270,34 +1270,34 @@ static void error_handler (GConfClient *client, GError *error) { - static gboolean shown_dialog = FALSE; + static gboolean shown_dialog = FALSE; g_warning ("GConf error:\n %s", error->message); - if (!shown_dialog) { - gchar *message; - GtkWidget *dlg; + if (!shown_dialog) { + gchar *message; + GtkWidget *dlg; message = g_strdup_printf (_("GConf error: %s"), - error->message); - dlg = gtk_message_dialog_new (NULL, 0, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, + error->message); + dlg = gtk_message_dialog_new (NULL, 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, "%s", - message); - g_free (message); + message); + g_free (message); - gtk_message_dialog_format_secondary_text - (GTK_MESSAGE_DIALOG (dlg), + gtk_message_dialog_format_secondary_text + (GTK_MESSAGE_DIALOG (dlg), _("All further errors shown only on terminal.")); gtk_window_set_title (GTK_WINDOW (dlg), ""); - gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_dialog_run (GTK_DIALOG (dlg)); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dlg); - shown_dialog = TRUE; - } + shown_dialog = TRUE; + } } /** @@ -1309,5 +1309,5 @@ error_handler (GConfClient *client, void gconf_bridge_install_default_error_handler (void) { - gconf_client_set_global_default_error_handler (error_handler); + gconf_client_set_global_default_error_handler (error_handler); } diff --git a/filter/e-filter-input.c b/filter/e-filter-input.c index ec92030333..84a9ad83c4 100644 --- a/filter/e-filter-input.c +++ b/filter/e-filter-input.c @@ -167,7 +167,7 @@ filter_input_xml_encode (EFilterElement *element) xmlChar *str = link->data; xmlNodePtr cur; - cur = xmlNewChild (value, NULL, (xmlChar *)type, NULL); + cur = xmlNewChild (value, NULL, (xmlChar *)type, NULL); str = xmlEncodeEntitiesReentrant (NULL, str); xmlNodeSetContent (cur, str); diff --git a/filter/e-filter-int.c b/filter/e-filter-int.c index dc0fbdb5a8..d82b36efda 100644 --- a/filter/e-filter-int.c +++ b/filter/e-filter-int.c @@ -53,7 +53,7 @@ filter_int_finalize (GObject *object) g_free (filter_int->type); /* Chain up to parent's finalize() method. */ - G_OBJECT_CLASS (e_filter_int_parent_class)->finalize (object); + G_OBJECT_CLASS (e_filter_int_parent_class)->finalize (object); } static gint diff --git a/filter/e-rule-editor.c b/filter/e-rule-editor.c index 59f12de672..10126bc42c 100644 --- a/filter/e-rule-editor.c +++ b/filter/e-rule-editor.c @@ -70,20 +70,20 @@ rule_editor_add_undo (ERuleEditor *editor, gint rank, gint newrank) { - ERuleEditorUndo *undo; - - if (!editor->undo_active && enable_undo) { - undo = g_malloc0 (sizeof (*undo)); - undo->rule = rule; - undo->type = type; - undo->rank = rank; - undo->newrank = newrank; - - undo->next = editor->undo_log; - editor->undo_log = undo; - } else { - g_object_unref (rule); - } + ERuleEditorUndo *undo; + + if (!editor->undo_active && enable_undo) { + undo = g_malloc0 (sizeof (*undo)); + undo->rule = rule; + undo->type = type; + undo->rank = rank; + undo->newrank = newrank; + + undo->next = editor->undo_log; + editor->undo_log = undo; + } else { + g_object_unref (rule); + } } static void diff --git a/libgnomecanvas/gailcanvas.c b/libgnomecanvas/gailcanvas.c index 881916ac5a..41e8852d83 100644 --- a/libgnomecanvas/gailcanvas.c +++ b/libgnomecanvas/gailcanvas.c @@ -90,16 +90,16 @@ gail_canvas_get_type (void) GTypeQuery query; static GTypeInfo tinfo = { - 0, /* class size */ - (GBaseInitFunc) NULL, /* base init */ - (GBaseFinalizeFunc) NULL, /* base finalize */ - (GClassInitFunc) gail_canvas_class_init, /* class init */ - (GClassFinalizeFunc) NULL, /* class finalize */ - NULL, /* class data */ - 0, /* instance size */ - 0, /* nb preallocs */ - (GInstanceInitFunc) NULL, /* instance init */ - NULL /* value table */ + 0, /* class size */ + (GBaseInitFunc) NULL, /* base init */ + (GBaseFinalizeFunc) NULL, /* base finalize */ + (GClassInitFunc) gail_canvas_class_init, /* class init */ + (GClassFinalizeFunc) NULL, /* class finalize */ + NULL, /* class data */ + 0, /* instance size */ + 0, /* nb preallocs */ + (GInstanceInitFunc) NULL, /* instance init */ + NULL /* value table */ }; g_type_query (atkobject_parent_type, &query); tinfo.class_size = query.class_size; @@ -182,14 +182,14 @@ gail_canvas_real_initialize (AtkObject *obj, adj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (canvas)); g_signal_connect (adj, "value_changed", - G_CALLBACK (adjustment_changed), - canvas); + G_CALLBACK (adjustment_changed), + canvas); adj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (canvas)); g_signal_connect (adj, "value_changed", - G_CALLBACK (adjustment_changed), - canvas); + G_CALLBACK (adjustment_changed), + canvas); obj->role = ATK_ROLE_LAYERED_PANE; } diff --git a/libgnomecanvas/gailcanvasgroupfactory.c b/libgnomecanvas/gailcanvasgroupfactory.c index 79b687584f..612dccfd54 100644 --- a/libgnomecanvas/gailcanvasgroupfactory.c +++ b/libgnomecanvas/gailcanvasgroupfactory.c @@ -48,7 +48,7 @@ gail_canvas_group_factory_get_type (void) NULL /* value table */ }; type = g_type_register_static ( - ATK_TYPE_OBJECT_FACTORY, + ATK_TYPE_OBJECT_FACTORY, "GailCanvasGroupFactory" , &tinfo, 0); } diff --git a/libgnomecanvas/gailcanvasitem.c b/libgnomecanvas/gailcanvasitem.c index 4527191991..e676447693 100644 --- a/libgnomecanvas/gailcanvasitem.c +++ b/libgnomecanvas/gailcanvasitem.c @@ -84,7 +84,7 @@ gail_canvas_item_initialize (AtkObject *obj, ATK_OBJECT_CLASS (parent_class)->initialize (obj, data); g_object_set_data (G_OBJECT (obj), "atk-component-layer", - GINT_TO_POINTER (ATK_LAYER_MDI)); + GINT_TO_POINTER (ATK_LAYER_MDI)); } static void @@ -138,17 +138,17 @@ gail_canvas_item_get_index_in_parent (AtkObject *obj) n_children = atk_object_get_n_accessible_children (obj->accessible_parent); for (i = 0; i < n_children; i++) - { - AtkObject *child; + { + AtkObject *child; - child = atk_object_ref_accessible_child (obj->accessible_parent, i); - if (child == obj) - found = TRUE; + child = atk_object_ref_accessible_child (obj->accessible_parent, i); + if (child == obj) + found = TRUE; - g_object_unref (child); - if (found) - return i; - } + g_object_unref (child); + if (found) + return i; + } return -1; } @@ -194,22 +194,22 @@ gail_canvas_item_ref_state_set (AtkObject *obj) item = GNOME_CANVAS_ITEM (g_obj); if (item->flags & GNOME_CANVAS_ITEM_VISIBLE) - { - atk_state_set_add_state (state_set, ATK_STATE_VISIBLE); - if (is_item_on_screen (item)) - { - atk_state_set_add_state (state_set, ATK_STATE_SHOWING); - } - } + { + atk_state_set_add_state (state_set, ATK_STATE_VISIBLE); + if (is_item_on_screen (item)) + { + atk_state_set_add_state (state_set, ATK_STATE_SHOWING); + } + } if (gtk_widget_get_can_focus (GTK_WIDGET (item->canvas))) - { - atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE); - - if (item->canvas->focused_item == item) - { - atk_state_set_add_state (state_set, ATK_STATE_FOCUSED); - } - } + { + atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE); + + if (item->canvas->focused_item == item) + { + atk_state_set_add_state (state_set, ATK_STATE_FOCUSED); + } + } } return state_set; @@ -239,15 +239,15 @@ gail_canvas_item_add_focus_handler (AtkComponent *component, signal_id = g_signal_lookup ("focus-event", ATK_TYPE_OBJECT); ret = g_signal_handler_find (component, match_type, signal_id, 0, NULL, - (gpointer) handler, NULL); + (gpointer) handler, NULL); if (!ret) { return g_signal_connect_closure_by_id (component, - signal_id, 0, - g_cclosure_new ( - G_CALLBACK (handler), NULL, - (GClosureNotify) NULL), - FALSE); + signal_id, 0, + g_cclosure_new ( + G_CALLBACK (handler), NULL, + (GClosureNotify) NULL), + FALSE); } else { @@ -295,7 +295,7 @@ gail_canvas_item_get_extents (AtkComponent *component, } gail_misc_get_origins (GTK_WIDGET (item->canvas), &window_x, &window_y, - &toplevel_x, &toplevel_y); + &toplevel_x, &toplevel_y); *x = extents.x + window_x - toplevel_x; *y = extents.y + window_y - toplevel_y; diff --git a/libgnomecanvas/gailcanvastext.c b/libgnomecanvas/gailcanvastext.c index bffc806c8a..0cbecac010 100644 --- a/libgnomecanvas/gailcanvastext.c +++ b/libgnomecanvas/gailcanvastext.c @@ -195,8 +195,8 @@ gail_canvas_text_get_text_after_offset (AtkText *text, gint *end_offset) { return get_text_near_offset (text, GAIL_AFTER_OFFSET, - boundary_type, offset, - start_offset, end_offset); + boundary_type, offset, + start_offset, end_offset); } static gchar * @@ -207,8 +207,8 @@ gail_canvas_text_get_text_at_offset (AtkText *text, gint *end_offset) { return get_text_near_offset (text, GAIL_AT_OFFSET, - boundary_type, offset, - start_offset, end_offset); + boundary_type, offset, + start_offset, end_offset); } static gchar * @@ -219,8 +219,8 @@ gail_canvas_text_get_text_before_offset (AtkText *text, gint *end_offset) { return get_text_near_offset (text, GAIL_BEFORE_OFFSET, - boundary_type, offset, - start_offset, end_offset); + boundary_type, offset, + start_offset, end_offset); } static gunichar @@ -331,7 +331,7 @@ gail_canvas_text_get_run_attributes (AtkText *text, g_return_val_if_fail (gail_text->textutil, NULL); return gail_misc_buffer_get_run_attributes (gail_text->textutil->buffer, - offset, start_offset, end_offset); + offset, start_offset, end_offset); } static AtkAttributeSet* @@ -515,6 +515,6 @@ get_text_near_offset (AtkText *text, gint *end_offset) { return gail_text_util_get_text (GAIL_CANVAS_TEXT (text)->textutil, NULL, - function, boundary_type, offset, - start_offset, end_offset); + function, boundary_type, offset, + start_offset, end_offset); } diff --git a/libgnomecanvas/gnome-canvas-pixbuf.c b/libgnomecanvas/gnome-canvas-pixbuf.c index 82152bd629..3565610b47 100644 --- a/libgnomecanvas/gnome-canvas-pixbuf.c +++ b/libgnomecanvas/gnome-canvas-pixbuf.c @@ -70,21 +70,21 @@ G_DEFINE_TYPE (GnomeCanvasPixbuf, gnome_canvas_pixbuf, GNOME_TYPE_CANVAS_ITEM) static void gnome_canvas_pixbuf_class_init (GnomeCanvasPixbufClass *class) { - GObjectClass *gobject_class; + GObjectClass *gobject_class; GnomeCanvasItemClass *item_class; - gobject_class = (GObjectClass *) class; + gobject_class = (GObjectClass *) class; item_class = (GnomeCanvasItemClass *) class; gobject_class->set_property = gnome_canvas_pixbuf_set_property; gobject_class->get_property = gnome_canvas_pixbuf_get_property; - g_object_class_install_property - (gobject_class, - PROP_PIXBUF, + g_object_class_install_property + (gobject_class, + PROP_PIXBUF, g_param_spec_object ("pixbuf", NULL, NULL, - GDK_TYPE_PIXBUF, - (G_PARAM_READABLE | G_PARAM_WRITABLE))); + GDK_TYPE_PIXBUF, + (G_PARAM_READABLE | G_PARAM_WRITABLE))); item_class->dispose = gnome_canvas_pixbuf_dispose; item_class->update = gnome_canvas_pixbuf_update; @@ -92,7 +92,7 @@ gnome_canvas_pixbuf_class_init (GnomeCanvasPixbufClass *class) item_class->point = gnome_canvas_pixbuf_point; item_class->bounds = gnome_canvas_pixbuf_bounds; - g_type_class_add_private (class, sizeof (GnomeCanvasPixbufPrivate)); + g_type_class_add_private (class, sizeof (GnomeCanvasPixbufPrivate)); } /* Object initialization function for the pixbuf canvas item */ @@ -102,8 +102,8 @@ gnome_canvas_pixbuf_init (GnomeCanvasPixbuf *gcp) GnomeCanvasPixbufPrivate *priv; priv = gcp->priv = G_TYPE_INSTANCE_GET_PRIVATE (gcp, - GNOME_TYPE_CANVAS_PIXBUF, - GnomeCanvasPixbufPrivate); + GNOME_TYPE_CANVAS_PIXBUF, + GnomeCanvasPixbufPrivate); } /* Dispose handler for the pixbuf canvas item */ @@ -211,7 +211,7 @@ recompute_bounding_box (GnomeCanvasPixbuf *gcp) GnomeCanvasItem *item; GnomeCanvasPixbufPrivate *priv; cairo_matrix_t i2c; - double x1, x2, y1, y2; + double x1, x2, y1, y2; item = GNOME_CANVAS_ITEM (gcp); priv = gcp->priv; @@ -256,10 +256,10 @@ gnome_canvas_pixbuf_update (GnomeCanvasItem *item, update (item, i2c, flags); /* ordinary update logic */ - gnome_canvas_request_redraw ( + gnome_canvas_request_redraw ( item->canvas, item->x1, item->y1, item->x2, item->y2); - recompute_bounding_box (gcp); - gnome_canvas_request_redraw ( + recompute_bounding_box (gcp); + gnome_canvas_request_redraw ( item->canvas, item->x1, item->y1, item->x2, item->y2); } @@ -272,7 +272,7 @@ gnome_canvas_pixbuf_draw (GnomeCanvasItem *item, cairo_t *cr, { GnomeCanvasPixbuf *gcp; GnomeCanvasPixbufPrivate *priv; - cairo_matrix_t matrix; + cairo_matrix_t matrix; gcp = GNOME_CANVAS_PIXBUF (item); priv = gcp->priv; @@ -280,13 +280,13 @@ gnome_canvas_pixbuf_draw (GnomeCanvasItem *item, cairo_t *cr, if (!priv->pixbuf) return; - gnome_canvas_item_i2c_matrix (item, &matrix); + gnome_canvas_item_i2c_matrix (item, &matrix); cairo_save (cr); - cairo_transform (cr, &matrix); + cairo_transform (cr, &matrix); - gdk_cairo_set_source_pixbuf (cr, priv->pixbuf, 0, 0); - cairo_paint (cr); + gdk_cairo_set_source_pixbuf (cr, priv->pixbuf, 0, 0); + cairo_paint (cr); cairo_restore (cr); } @@ -302,9 +302,9 @@ gnome_canvas_pixbuf_point (GnomeCanvasItem *item, { GnomeCanvasPixbuf *gcp; GnomeCanvasPixbufPrivate *priv; - GdkPixbuf *pixbuf; - gint px, py; - guchar *src; + GdkPixbuf *pixbuf; + gint px, py; + guchar *src; gcp = GNOME_CANVAS_PIXBUF (item); priv = gcp->priv; @@ -313,8 +313,8 @@ gnome_canvas_pixbuf_point (GnomeCanvasItem *item, if (!priv->pixbuf) return NULL; - px = x; - py = y; + px = x; + py = y; if (px < 0 || px >= gdk_pixbuf_get_width (pixbuf) || py < 0 || py >= gdk_pixbuf_get_height (pixbuf)) diff --git a/libgnomecanvas/gnome-canvas-rich-text.c b/libgnomecanvas/gnome-canvas-rich-text.c index f252266980..f836c12f1c 100644 --- a/libgnomecanvas/gnome-canvas-rich-text.c +++ b/libgnomecanvas/gnome-canvas-rich-text.c @@ -1832,9 +1832,9 @@ gnome_canvas_rich_text_get_iter_at_location (GnomeCanvasRichText *text, g_return_if_fail (text->_priv->layout != NULL); gtk_text_layout_get_iter_at_pixel (text->_priv->layout, - iter, - x, - y); + iter, + x, + y); } static void @@ -2016,7 +2016,7 @@ gnome_canvas_rich_text_point (GnomeCanvasItem *item, gdouble x, gdouble y, if ((x > x1) && (y > y1) && (x < x2) && (y < y2)) return item; - return NULL; + return NULL; } /* gnome_canvas_rich_text_point */ static void diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c index a9e546a883..d21c9b9c97 100644 --- a/libgnomecanvas/gnome-canvas-text.c +++ b/libgnomecanvas/gnome-canvas-text.c @@ -185,50 +185,50 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) gobject_class->get_property = gnome_canvas_text_get_property; /* Text */ - g_object_class_install_property - (gobject_class, - PROP_TEXT, + g_object_class_install_property + (gobject_class, + PROP_TEXT, g_param_spec_string ("text", "Text", "Text to render", - NULL, - (G_PARAM_READABLE | G_PARAM_WRITABLE))); + NULL, + (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_MARKUP, + g_object_class_install_property + (gobject_class, + PROP_MARKUP, g_param_spec_string ("markup", "Markup", "Marked up text to render", NULL, - (G_PARAM_WRITABLE))); + (G_PARAM_WRITABLE))); /* Position */ - g_object_class_install_property - (gobject_class, - PROP_X, + g_object_class_install_property + (gobject_class, + PROP_X, g_param_spec_double ("x", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_Y, + g_object_class_install_property + (gobject_class, + PROP_Y, g_param_spec_double ("y", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); /* Font */ g_object_class_install_property - (gobject_class, - PROP_FONT, + (gobject_class, + PROP_FONT, g_param_spec_string ("font", "Font", "Font description as a string", - NULL, - (G_PARAM_READABLE | G_PARAM_WRITABLE))); + NULL, + (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property + g_object_class_install_property (gobject_class, PROP_FONT_DESC, g_param_spec_boxed ("font_desc", @@ -247,9 +247,9 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) (G_PARAM_READABLE | G_PARAM_WRITABLE))); /* Style */ - g_object_class_install_property - (gobject_class, - PROP_ATTRIBUTES, + g_object_class_install_property + (gobject_class, + PROP_ATTRIBUTES, g_param_spec_boxed ("attributes", NULL, NULL, PANGO_TYPE_ATTR_LIST, (G_PARAM_READABLE | G_PARAM_WRITABLE))); @@ -359,78 +359,78 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) 1.0, G_PARAM_READABLE | G_PARAM_WRITABLE)); - g_object_class_install_property - (gobject_class, - PROP_JUSTIFICATION, + g_object_class_install_property + (gobject_class, + PROP_JUSTIFICATION, g_param_spec_enum ("justification", NULL, NULL, - GTK_TYPE_JUSTIFICATION, - GTK_JUSTIFY_LEFT, - (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_CLIP_WIDTH, + GTK_TYPE_JUSTIFICATION, + GTK_JUSTIFY_LEFT, + (G_PARAM_READABLE | G_PARAM_WRITABLE))); + g_object_class_install_property + (gobject_class, + PROP_CLIP_WIDTH, g_param_spec_double ("clip_width", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_CLIP_HEIGHT, + g_object_class_install_property + (gobject_class, + PROP_CLIP_HEIGHT, g_param_spec_double ("clip_height", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_CLIP, + g_object_class_install_property + (gobject_class, + PROP_CLIP, g_param_spec_boolean ("clip", NULL, NULL, FALSE, (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_X_OFFSET, + g_object_class_install_property + (gobject_class, + PROP_X_OFFSET, g_param_spec_double ("x_offset", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_Y_OFFSET, + g_object_class_install_property + (gobject_class, + PROP_Y_OFFSET, g_param_spec_double ("y_offset", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_FILL_COLOR, + g_object_class_install_property + (gobject_class, + PROP_FILL_COLOR, g_param_spec_string ("fill_color", "Color", "Text color, as string", - NULL, - G_PARAM_WRITABLE)); - g_object_class_install_property - (gobject_class, - PROP_FILL_COLOR_GDK, + NULL, + G_PARAM_WRITABLE)); + g_object_class_install_property + (gobject_class, + PROP_FILL_COLOR_GDK, g_param_spec_boxed ("fill_color_gdk", "Color", "Text color, as a GdkColor", GDK_TYPE_COLOR, G_PARAM_WRITABLE)); - g_object_class_install_property - (gobject_class, - PROP_FILL_COLOR_RGBA, + g_object_class_install_property + (gobject_class, + PROP_FILL_COLOR_RGBA, g_param_spec_uint ("fill_color_rgba", "Color", "Text color, as an R/G/B/A combined integer", 0, G_MAXUINT, 0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_TEXT_WIDTH, + g_object_class_install_property + (gobject_class, + PROP_TEXT_WIDTH, g_param_spec_double ("text_width", "Text width", "Width of the rendered text", 0.0, G_MAXDOUBLE, 0.0, G_PARAM_READABLE)); - g_object_class_install_property - (gobject_class, - PROP_TEXT_HEIGHT, + g_object_class_install_property + (gobject_class, + PROP_TEXT_HEIGHT, g_param_spec_double ("text_height", "Text height", "Height of the rendered text", @@ -637,7 +637,7 @@ gnome_canvas_text_set_property (GObject *object, text = GNOME_CANVAS_TEXT (object); if (!text->layout) - text->layout = pango_layout_new ( + text->layout = pango_layout_new ( gtk_widget_get_pango_context ( GTK_WIDGET (item->canvas))); @@ -842,12 +842,12 @@ gnome_canvas_text_set_property (GObject *object, text->yofs = g_value_get_double (value); break; - case PROP_FILL_COLOR: { + case PROP_FILL_COLOR: { const gchar *color_name; color_name = g_value_get_string (value); if (color_name) { - GdkColor color; + GdkColor color; gdk_color_parse (color_name, &color); text->rgba = ((color.red & 0xff00) << 16 | @@ -861,16 +861,16 @@ gnome_canvas_text_set_property (GObject *object, case PROP_FILL_COLOR_GDK: pcolor = g_value_get_boxed (value); if (pcolor) { - text->rgba = ((pcolor->red & 0xff00) << 16 | - (pcolor->green & 0xff00) << 8| - (pcolor->blue & 0xff00) | - 0xff); - } else { - text->rgba = 0; - } + text->rgba = ((pcolor->red & 0xff00) << 16 | + (pcolor->green & 0xff00) << 8| + (pcolor->blue & 0xff00) | + 0xff); + } else { + text->rgba = 0; + } break; - case PROP_FILL_COLOR_RGBA: + case PROP_FILL_COLOR_RGBA: text->rgba = g_value_get_uint (value); break; @@ -1203,23 +1203,23 @@ gnome_canvas_text_draw (GnomeCanvasItem *item, cairo_t *cr, cairo_save (cr); - if (text->clip) { - cairo_rectangle (cr, - text->clip_cx - x, - text->clip_cy - y, - text->clip_cwidth, - text->clip_cheight); - cairo_clip (cr); + if (text->clip) { + cairo_rectangle (cr, + text->clip_cx - x, + text->clip_cy - y, + text->clip_cwidth, + text->clip_cheight); + cairo_clip (cr); } - cairo_set_source_rgba (cr, - ((text->rgba >> 24) & 0xff) / 255.0, - ((text->rgba >> 16) & 0xff) / 255.0, - ((text->rgba >> 8) & 0xff) / 255.0, - ( text->rgba & 0xff) / 255.0); + cairo_set_source_rgba (cr, + ((text->rgba >> 24) & 0xff) / 255.0, + ((text->rgba >> 16) & 0xff) / 255.0, + ((text->rgba >> 8) & 0xff) / 255.0, + ( text->rgba & 0xff) / 255.0); - cairo_move_to (cr, text->cx - x, text->cy - y); - pango_cairo_show_layout (cr, text->layout); + cairo_move_to (cr, text->cx - x, text->cy - y); + pango_cairo_show_layout (cr, text->layout); cairo_restore (cr); } diff --git a/libgnomecanvas/gnome-canvas-util.c b/libgnomecanvas/gnome-canvas-util.c index d05171b4e4..5ca5979442 100644 --- a/libgnomecanvas/gnome-canvas-util.c +++ b/libgnomecanvas/gnome-canvas-util.c @@ -94,14 +94,14 @@ gnome_canvas_update_bbox (GnomeCanvasItem *item, gint x1, gint y1, gint x2, gint cairo_t * gnome_canvas_cairo_create_scratch (void) { - cairo_surface_t *surface; - cairo_t *cr; + cairo_surface_t *surface; + cairo_t *cr; - surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 0, 0); - cr = cairo_create (surface); - cairo_surface_destroy (surface); + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 0, 0); + cr = cairo_create (surface); + cairo_surface_destroy (surface); - return cr; + return cr; } /** @@ -119,38 +119,38 @@ void gnome_canvas_matrix_transform_rect (const cairo_matrix_t *matrix, double *x1, double *y1, double *x2, double *y2) { - double maxx, maxy, minx, miny; - double tmpx, tmpy; - - tmpx = *x1; - tmpy = *y1; - cairo_matrix_transform_point (matrix, &tmpx, &tmpy); - minx = maxx = tmpx; - miny = maxy = tmpy; - - tmpx = *x2; - tmpy = *y1; - cairo_matrix_transform_point (matrix, &tmpx, &tmpy); - minx = MIN (minx, tmpx); - maxx = MAX (maxx, tmpx); - miny = MIN (miny, tmpy); - maxy = MAX (maxy, tmpy); - - tmpx = *x2; - tmpy = *y2; - cairo_matrix_transform_point (matrix, &tmpx, &tmpy); - minx = MIN (minx, tmpx); - maxx = MAX (maxx, tmpx); - miny = MIN (miny, tmpy); - maxy = MAX (maxy, tmpy); - - tmpx = *x1; - tmpy = *y2; - cairo_matrix_transform_point (matrix, &tmpx, &tmpy); - minx = MIN (minx, tmpx); - maxx = MAX (maxx, tmpx); - miny = MIN (miny, tmpy); - maxy = MAX (maxy, tmpy); + double maxx, maxy, minx, miny; + double tmpx, tmpy; + + tmpx = *x1; + tmpy = *y1; + cairo_matrix_transform_point (matrix, &tmpx, &tmpy); + minx = maxx = tmpx; + miny = maxy = tmpy; + + tmpx = *x2; + tmpy = *y1; + cairo_matrix_transform_point (matrix, &tmpx, &tmpy); + minx = MIN (minx, tmpx); + maxx = MAX (maxx, tmpx); + miny = MIN (miny, tmpy); + maxy = MAX (maxy, tmpy); + + tmpx = *x2; + tmpy = *y2; + cairo_matrix_transform_point (matrix, &tmpx, &tmpy); + minx = MIN (minx, tmpx); + maxx = MAX (maxx, tmpx); + miny = MIN (miny, tmpy); + maxy = MAX (maxy, tmpy); + + tmpx = *x1; + tmpy = *y2; + cairo_matrix_transform_point (matrix, &tmpx, &tmpy); + minx = MIN (minx, tmpx); + maxx = MAX (maxx, tmpx); + miny = MIN (miny, tmpy); + maxy = MAX (maxy, tmpy); *x1 = minx; *x2 = maxx; diff --git a/libgnomecanvas/gnome-canvas-widget.c b/libgnomecanvas/gnome-canvas-widget.c index c6dd99f476..5fe04ba12b 100644 --- a/libgnomecanvas/gnome-canvas-widget.c +++ b/libgnomecanvas/gnome-canvas-widget.c @@ -121,39 +121,39 @@ gnome_canvas_widget_class_init (GnomeCanvasWidgetClass *class) gobject_class->set_property = gnome_canvas_widget_set_property; gobject_class->get_property = gnome_canvas_widget_get_property; - g_object_class_install_property - (gobject_class, - PROP_WIDGET, + g_object_class_install_property + (gobject_class, + PROP_WIDGET, g_param_spec_object ("widget", NULL, NULL, - GTK_TYPE_WIDGET, - (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_X, + GTK_TYPE_WIDGET, + (G_PARAM_READABLE | G_PARAM_WRITABLE))); + g_object_class_install_property + (gobject_class, + PROP_X, g_param_spec_double ("x", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_Y, + g_object_class_install_property + (gobject_class, + PROP_Y, g_param_spec_double ("y", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_WIDTH, + g_object_class_install_property + (gobject_class, + PROP_WIDTH, g_param_spec_double ("width", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_HEIGHT, + g_object_class_install_property + (gobject_class, + PROP_HEIGHT, g_param_spec_double ("height", NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (G_PARAM_READABLE | G_PARAM_WRITABLE))); - g_object_class_install_property - (gobject_class, - PROP_SIZE_PIXELS, + g_object_class_install_property + (gobject_class, + PROP_SIZE_PIXELS, g_param_spec_boolean ("size_pixels", NULL, NULL, FALSE, (G_PARAM_READABLE | G_PARAM_WRITABLE))); @@ -436,7 +436,7 @@ gnome_canvas_widget_point (GnomeCanvasItem *item, gdouble x, gdouble y, return item; /* Point is outside widget bounds */ - return NULL; + return NULL; } static void diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c index 86624f2b99..30f703bd5e 100644 --- a/libgnomecanvas/gnome-canvas.c +++ b/libgnomecanvas/gnome-canvas.c @@ -174,7 +174,7 @@ gnome_canvas_item_init (GnomeCanvasItem *item) { item->flags |= GNOME_CANVAS_ITEM_VISIBLE; - cairo_matrix_init_identity (&item->matrix); + cairo_matrix_init_identity (&item->matrix); } /** @@ -435,7 +435,7 @@ gnome_canvas_item_invoke_update (GnomeCanvasItem *item, /* Calculate actual item transformation matrix */ - cairo_matrix_multiply (&i2c, &item->matrix, p2c); + cairo_matrix_multiply (&i2c, &item->matrix, p2c); /* apply object flags to child flags */ @@ -473,14 +473,14 @@ gnome_canvas_item_invoke_point (GnomeCanvasItem *item, gint cx, gint cy) { - cairo_matrix_t inverse; + cairo_matrix_t inverse; /* Calculate x & y in item local coordinates */ - inverse = item->matrix; - if (cairo_matrix_invert (&inverse) != CAIRO_STATUS_SUCCESS) - return NULL; + inverse = item->matrix; + if (cairo_matrix_invert (&inverse) != CAIRO_STATUS_SUCCESS) + return NULL; - cairo_matrix_transform_point (&inverse, &x, &y); + cairo_matrix_transform_point (&inverse, &x, &y); if (GNOME_CANVAS_ITEM_GET_CLASS (item)->point) return GNOME_CANVAS_ITEM_GET_CLASS (item)->point (item, x, y, cx, cy); @@ -565,9 +565,9 @@ gnome_canvas_item_set_matrix (GnomeCanvasItem *item, const cairo_matrix_t *matri g_return_if_fail (GNOME_IS_CANVAS_ITEM (item)); if (matrix) { - item->matrix = *matrix; + item->matrix = *matrix; } else { - cairo_matrix_init_identity (&item->matrix); + cairo_matrix_init_identity (&item->matrix); } if (!(item->flags & GNOME_CANVAS_ITEM_NEED_AFFINE)) { @@ -913,7 +913,7 @@ gnome_canvas_item_i2w_matrix (GnomeCanvasItem *item, cairo_matrix_t *matrix) cairo_matrix_init_identity (matrix); while (item) { - cairo_matrix_multiply (matrix, matrix, &item->matrix); + cairo_matrix_multiply (matrix, matrix, &item->matrix); item = item->parent; } @@ -944,14 +944,14 @@ gnome_canvas_item_w2i_matrix (GnomeCanvasItem *item, cairo_matrix_t *matrix) void gnome_canvas_item_w2i (GnomeCanvasItem *item, gdouble *x, gdouble *y) { - cairo_matrix_t matrix; + cairo_matrix_t matrix; g_return_if_fail (GNOME_IS_CANVAS_ITEM (item)); g_return_if_fail (x != NULL); g_return_if_fail (y != NULL); gnome_canvas_item_w2i_matrix (item, &matrix); - cairo_matrix_transform_point (&matrix, x, y); + cairo_matrix_transform_point (&matrix, x, y); } /** @@ -966,14 +966,14 @@ gnome_canvas_item_w2i (GnomeCanvasItem *item, gdouble *x, gdouble *y) void gnome_canvas_item_i2w (GnomeCanvasItem *item, gdouble *x, gdouble *y) { - cairo_matrix_t matrix; + cairo_matrix_t matrix; g_return_if_fail (GNOME_IS_CANVAS_ITEM (item)); g_return_if_fail (x != NULL); g_return_if_fail (y != NULL); gnome_canvas_item_i2w_matrix (item, &matrix); - cairo_matrix_transform_point (&matrix, x, y); + cairo_matrix_transform_point (&matrix, x, y); } /** @@ -1129,7 +1129,7 @@ gnome_canvas_item_get_bounds (GnomeCanvasItem *item, (* GNOME_CANVAS_ITEM_GET_CLASS (item)->bounds) (item, &tx1, &ty1, &tx2, &ty2); /* Make the bounds relative to the item's parent coordinate system */ - gnome_canvas_matrix_transform_rect (&item->matrix, &tx1, &ty1, &tx2, &ty2); + gnome_canvas_matrix_transform_rect (&item->matrix, &tx1, &ty1, &tx2, &ty2); /* Return the values */ @@ -1373,7 +1373,7 @@ gnome_canvas_group_update (GnomeCanvasItem *item, GnomeCanvasGroup *group; GList *list; GnomeCanvasItem *i; - double x1, y1, x2, y2; + double x1, y1, x2, y2; group = GNOME_CANVAS_GROUP (item); @@ -1389,19 +1389,19 @@ gnome_canvas_group_update (GnomeCanvasItem *item, gnome_canvas_item_invoke_update (i, i2c, flags); - x1 = MIN (x1, i->x1); - x2 = MAX (x2, i->x2); - y1 = MIN (y1, i->y1); - y2 = MAX (y2, i->y2); + x1 = MIN (x1, i->x1); + x2 = MAX (x2, i->x2); + y1 = MIN (y1, i->y1); + y2 = MAX (y2, i->y2); + } + if (x1 >= x2 || y1 >= y2) { + item->x1 = item->x2 = item->y1 = item->y2 = 0; + } else { + item->x1 = x1; + item->y1 = y1; + item->x2 = x2; + item->y2 = y2; } - if (x1 >= x2 || y1 >= y2) { - item->x1 = item->x2 = item->y1 = item->y2 = 0; - } else { - item->x1 = x1; - item->y1 = y1; - item->x2 = x2; - item->y2 = y2; - } } /* Realize handler for canvas groups */ @@ -1538,11 +1538,11 @@ gnome_canvas_group_point (GnomeCanvasItem *item, continue; if (!(child->flags & GNOME_CANVAS_ITEM_VISIBLE)) - continue; + continue; point_item = gnome_canvas_item_invoke_point (child, x, y, cx, cy); if (point_item) - return point_item; + return point_item; } return NULL; @@ -2253,14 +2253,14 @@ gnome_canvas_draw (GtkWidget *widget, GnomeCanvas *canvas = GNOME_CANVAS (widget); cairo_rectangle_int_t rect; - gdk_cairo_get_clip_rectangle (cr, &rect); + gdk_cairo_get_clip_rectangle (cr, &rect); - if (canvas->need_update) { - gnome_canvas_request_redraw (canvas, - rect.x, rect.y, - rect.x + rect.width, - rect.y + rect.height); - } else { + if (canvas->need_update) { + gnome_canvas_request_redraw (canvas, + rect.x, rect.y, + rect.x + rect.width, + rect.y + rect.height); + } else { GtkLayout *layout; GtkAdjustment *hadjustment; GtkAdjustment *vadjustment; @@ -2274,25 +2274,25 @@ gnome_canvas_draw (GtkWidget *widget, hadjustment_value = gtk_adjustment_get_value (hadjustment); vadjustment_value = gtk_adjustment_get_value (vadjustment); - cairo_save (cr); - cairo_translate (cr, - -canvas->zoom_xofs + rect.x, - -canvas->zoom_yofs + rect.y); + cairo_save (cr); + cairo_translate (cr, + -canvas->zoom_xofs + rect.x, + -canvas->zoom_yofs + rect.y); rect.x += hadjustment_value; rect.y += vadjustment_value; /* No pending updates, draw exposed area immediately */ - gnome_canvas_paint_rect (canvas, cr, - rect.x, rect.y, - rect.x + rect.width, - rect.y + rect.height); - cairo_restore (cr); + gnome_canvas_paint_rect (canvas, cr, + rect.x, rect.y, + rect.x + rect.width, + rect.y + rect.height); + cairo_restore (cr); /* And call expose on parent container class */ - GTK_WIDGET_CLASS (canvas_parent_class)-> - draw (widget, cr); - } + GTK_WIDGET_CLASS (canvas_parent_class)-> + draw (widget, cr); + } return FALSE; } @@ -2319,7 +2319,7 @@ emit_event (GnomeCanvas *canvas, GdkEvent *event) */ /* g_warning ("emit_event() returning FALSE!\n");*/ return FALSE; - } + } if (canvas->grabbed_item) { switch (event->type) { @@ -2373,7 +2373,7 @@ emit_event (GnomeCanvas *canvas, GdkEvent *event) ev = gdk_event_copy (event); switch (ev->type) - { + { case GDK_ENTER_NOTIFY: case GDK_LEAVE_NOTIFY: gnome_canvas_window_to_world (canvas, @@ -2386,10 +2386,10 @@ emit_event (GnomeCanvas *canvas, GdkEvent *event) case GDK_2BUTTON_PRESS: case GDK_3BUTTON_PRESS: case GDK_BUTTON_RELEASE: - gnome_canvas_window_to_world (canvas, - ev->motion.x, ev->motion.y, - &ev->motion.x, &ev->motion.y); - break; + gnome_canvas_window_to_world (canvas, + ev->motion.x, ev->motion.y, + &ev->motion.x, &ev->motion.y); + break; default: break; @@ -2792,10 +2792,10 @@ do_update (GnomeCanvas *canvas) update_again: if (canvas->need_update) { - cairo_matrix_t w2c; + cairo_matrix_t w2c; /* We start updating root with w2c matrix */ - gnome_canvas_w2c_matrix (canvas, &w2c); + gnome_canvas_w2c_matrix (canvas, &w2c); gnome_canvas_item_invoke_update (canvas->root, &w2c, 0); @@ -3098,24 +3098,24 @@ get_visible_rect (GnomeCanvas *canvas, GdkRectangle *visible) void gnome_canvas_request_redraw (GnomeCanvas *canvas, gint x1, gint y1, gint x2, gint y2) { - GdkRectangle area, clip; + GdkRectangle area, clip; g_return_if_fail (GNOME_IS_CANVAS (canvas)); if (!gtk_widget_is_drawable (GTK_WIDGET (canvas)) || (x1 >= x2) || (y1 >= y2)) return; - area.x = x1; - area.y = y1; - area.width = x2 - x1; - area.height = y2 - y1; + area.x = x1; + area.y = y1; + area.width = x2 - x1; + area.height = y2 - y1; get_visible_rect (canvas, &clip); - if (!gdk_rectangle_intersect (&area, &clip, &area)) - return; + if (!gdk_rectangle_intersect (&area, &clip, &area)) + return; gdk_window_invalidate_rect (gtk_layout_get_bin_window (GTK_LAYOUT (canvas)), - &area, FALSE); + &area, FALSE); } /** @@ -3172,7 +3172,7 @@ gnome_canvas_w2c (GnomeCanvas *canvas, gdouble wx, gdouble wy, gint *cx, gint *c g_return_if_fail (GNOME_IS_CANVAS (canvas)); gnome_canvas_w2c_matrix (canvas, &w2c); - cairo_matrix_transform_point (&w2c, &wx, &wy); + cairo_matrix_transform_point (&w2c, &wx, &wy); if (cx) *cx = floor (wx + 0.5); @@ -3204,7 +3204,7 @@ gnome_canvas_w2c_d (GnomeCanvas *canvas, g_return_if_fail (GNOME_IS_CANVAS (canvas)); gnome_canvas_w2c_matrix (canvas, &w2c); - cairo_matrix_transform_point (&w2c, &wx, &wy); + cairo_matrix_transform_point (&w2c, &wx, &wy); if (cx) *cx = wx; @@ -3226,14 +3226,14 @@ void gnome_canvas_c2w (GnomeCanvas *canvas, gint cx, gint cy, gdouble *wx, gdouble *wy) { cairo_matrix_t c2w; - double x, y; + double x, y; g_return_if_fail (GNOME_IS_CANVAS (canvas)); - x = cx; - y = cy; + x = cx; + y = cy; gnome_canvas_c2w_matrix (canvas, &c2w); - cairo_matrix_transform_point (&c2w, &x, &y); + cairo_matrix_transform_point (&c2w, &x, &y); if (wx) *wx = x; diff --git a/mail/e-mail-tab-picker.c b/mail/e-mail-tab-picker.c index 5137a0c5ed..e97bc742df 100644 --- a/mail/e-mail-tab-picker.c +++ b/mail/e-mail-tab-picker.c @@ -146,30 +146,30 @@ e_mail_tab_picker_drop (MxDroppable *droppable, /* Ignore docked tabs */ if (!props->docked) - { + { /* If the tab is beyond the dragged tab and not draggable, * we don't want to drag past it. */ - if ((event_x >= props->position + priv->scroll_offset) && - (tab->position + tab->width <= props->position) && - !mx_draggable_is_enabled (MX_DRAGGABLE (props->tab))) - { - new_position--; - break; - } + if ((event_x >= props->position + priv->scroll_offset) && + (tab->position + tab->width <= props->position) && + !mx_draggable_is_enabled (MX_DRAGGABLE (props->tab))) + { + new_position--; + break; + } /* The same check for dragging left instead of right */ - if ((event_x < props->position + props->width + priv->scroll_offset)&& - (tab->position >= props->position) && - !mx_draggable_is_enabled (MX_DRAGGABLE (props->tab))) - break; + if ((event_x < props->position + props->width + priv->scroll_offset)&& + (tab->position >= props->position) && + !mx_draggable_is_enabled (MX_DRAGGABLE (props->tab))) + break; /* If the tab-end position is after the drop position, * break - we want to drop before here. */ - if (props->position + props->width + priv->scroll_offset > event_x) - break; - } + if (props->position + props->width + priv->scroll_offset > event_x) + break; + } /* Increment the position */ new_position++; @@ -309,14 +309,14 @@ e_mail_tab_picker_paint (ClutterActor *actor) EMailTabPickerProps *props = t->data; if (props->docked) - continue; + continue; if (props->position + props->width < offset) - continue; + continue; if (props->position > width + offset) - break; + break; if (CLUTTER_ACTOR_IS_MAPPED (props->tab)) - clutter_actor_paint (CLUTTER_ACTOR (props->tab)); + clutter_actor_paint (CLUTTER_ACTOR (props->tab)); } cogl_translate (priv->scroll_offset, 0, 0); @@ -325,15 +325,15 @@ e_mail_tab_picker_paint (ClutterActor *actor) if (priv->docked_tabs) { for (t = priv->tabs; t; t = t->next) - { - EMailTabPickerProps *props = t->data; + { + EMailTabPickerProps *props = t->data; - if (!props->docked) - continue; + if (!props->docked) + continue; - if (CLUTTER_ACTOR_IS_MAPPED (props->tab)) - clutter_actor_paint (CLUTTER_ACTOR (props->tab)); - } + if (CLUTTER_ACTOR_IS_MAPPED (props->tab)) + clutter_actor_paint (CLUTTER_ACTOR (props->tab)); + } } cogl_clip_pop (); @@ -347,16 +347,16 @@ e_mail_tab_picker_paint (ClutterActor *actor) { gfloat height; clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->close_button), - -1, NULL, &height); + -1, NULL, &height); height *= priv->preview_progress; if (height >= 1.0) - { - cogl_clip_push_rectangle (0, 0, width, height); - if (CLUTTER_ACTOR_IS_MAPPED (priv->close_button)) - clutter_actor_paint (CLUTTER_ACTOR (priv->close_button)); - clutter_actor_paint (CLUTTER_ACTOR (priv->scroll_bar)); - cogl_clip_pop (); - } + { + cogl_clip_push_rectangle (0, 0, width, height); + if (CLUTTER_ACTOR_IS_MAPPED (priv->close_button)) + clutter_actor_paint (CLUTTER_ACTOR (priv->close_button)); + clutter_actor_paint (CLUTTER_ACTOR (priv->scroll_bar)); + cogl_clip_pop (); + } } } @@ -385,7 +385,7 @@ e_mail_tab_picker_get_preferred_width (ClutterActor *actor, EMailTabPickerPrivate *priv = E_MAIL_TAB_PICKER (actor)->priv; clutter_actor_get_preferred_width (CLUTTER_ACTOR (priv->chooser_button), - for_height, min_width_p, natural_width_p); + for_height, min_width_p, natural_width_p); mx_widget_get_padding (MX_WIDGET (actor), &padding); if (min_width_p) @@ -400,7 +400,7 @@ e_mail_tab_picker_get_preferred_width (ClutterActor *actor, EMailTabPickerProps *props = t->data; clutter_actor_get_preferred_width (CLUTTER_ACTOR (props->tab), for_height, - &min_width, &natural_width); + &min_width, &natural_width); if (min_width_p && !t->prev) *min_width_p += min_width; @@ -422,7 +422,7 @@ e_mail_tab_picker_get_preferred_height (EMailTabPicker *tab_picker, EMailTabPickerPrivate *priv = tab_picker->priv; clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->chooser_button), - for_width, min_height_p, natural_height_p); + for_width, min_height_p, natural_height_p); if (priv->tabs) { @@ -434,25 +434,25 @@ e_mail_tab_picker_get_preferred_height (EMailTabPicker *tab_picker, * fixed height. */ if (with_previews) - { - clutter_actor_get_preferred_height (CLUTTER_ACTOR (props->tab), - for_width, - &min_height, - &natural_height); - if (CLUTTER_ACTOR_IS_VISIBLE (priv->scroll_bar)) - { + { + clutter_actor_get_preferred_height (CLUTTER_ACTOR (props->tab), + for_width, + &min_height, + &natural_height); + if (CLUTTER_ACTOR_IS_VISIBLE (priv->scroll_bar)) + { /* Add the height of the scrollbar-section */ - clutter_actor_get_preferred_height ( - CLUTTER_ACTOR (priv->close_button), -1, NULL, &scroll_height); - scroll_height *= priv->preview_progress; - - min_height += scroll_height; - natural_height += scroll_height; - } - } + clutter_actor_get_preferred_height ( + CLUTTER_ACTOR (priv->close_button), -1, NULL, &scroll_height); + scroll_height *= priv->preview_progress; + + min_height += scroll_height; + natural_height += scroll_height; + } + } else - e_mail_tab_get_height_no_preview (props->tab, for_width, - &min_height, &natural_height); + e_mail_tab_get_height_no_preview (props->tab, for_width, + &min_height, &natural_height); if (min_height_p && (*min_height_p < min_height)) *min_height_p = min_height; @@ -474,7 +474,7 @@ _e_mail_tab_picker_get_preferred_height (ClutterActor *actor, gfloat *natural_height_p) { e_mail_tab_picker_get_preferred_height (E_MAIL_TAB_PICKER (actor), for_width, - min_height_p, natural_height_p, TRUE); + min_height_p, natural_height_p, TRUE); } static void @@ -493,13 +493,13 @@ e_mail_tab_picker_allocate_docked (EMailTabPicker *tab_picker, if (!picker_box_p) { clutter_actor_get_allocation_box (CLUTTER_ACTOR (tab_picker), - &picker_box); + &picker_box); picker_box_p = &picker_box; } if (!chooser_box_p) { clutter_actor_get_allocation_box (CLUTTER_ACTOR (priv->chooser_button), - &chooser_box); + &chooser_box); chooser_box_p = &chooser_box; } @@ -528,31 +528,31 @@ e_mail_tab_picker_allocate_docked (EMailTabPicker *tab_picker, props->docked = FALSE; if (!props->docking) - continue; + continue; if (props->position < offset) - { + { /* Dock left */ - priv->docked_tabs = TRUE; - props->docked = TRUE; - child_box.x1 = left; - child_box.x2 = child_box.x1 + props->width; - left += props->width; - } + priv->docked_tabs = TRUE; + props->docked = TRUE; + child_box.x1 = left; + child_box.x2 = child_box.x1 + props->width; + left += props->width; + } else if (props->position + props->width > width + offset) - { + { /* Dock right */ - priv->docked_tabs = TRUE; - props->docked = TRUE; - child_box.x2 = right; - child_box.x1 = child_box.x2 - props->width; - right -= props->width; - } + priv->docked_tabs = TRUE; + props->docked = TRUE; + child_box.x2 = right; + child_box.x1 = child_box.x2 - props->width; + right -= props->width; + } else - { - child_box.x1 = props->position; - child_box.x2 = child_box.x1 + props->width; - } + { + child_box.x1 = props->position; + child_box.x2 = child_box.x1 + props->width; + } clutter_actor_allocate (CLUTTER_ACTOR (props->tab), &child_box, flags); } @@ -567,7 +567,7 @@ e_mail_tab_picker_scroll_new_frame_cb (ClutterTimeline *timeline, gdouble alpha = clutter_alpha_get_alpha (priv->scroll_alpha); priv->scroll_offset = (priv->scroll_start * (1.0 - alpha)) + - (priv->scroll_end * alpha); + (priv->scroll_end * alpha); mx_adjustment_set_value (priv->scroll_adjustment, priv->scroll_offset); e_mail_tab_picker_allocate_docked (tab_picker, NULL, NULL, 0); clutter_actor_queue_redraw (CLUTTER_ACTOR (tab_picker)); @@ -609,17 +609,17 @@ e_mail_tab_picker_scroll_to (EMailTabPicker *tab_picker, else { if (priv->scroll_end == priv->scroll_offset) - return; + return; priv->scroll_timeline = clutter_timeline_new (duration); priv->scroll_alpha = clutter_alpha_new_full (priv->scroll_timeline, - CLUTTER_EASE_OUT_QUAD); + CLUTTER_EASE_OUT_QUAD); g_signal_connect (priv->scroll_timeline, "new_frame", - G_CALLBACK (e_mail_tab_picker_scroll_new_frame_cb), - tab_picker); + G_CALLBACK (e_mail_tab_picker_scroll_new_frame_cb), + tab_picker); g_signal_connect (priv->scroll_timeline, "completed", - G_CALLBACK (e_mail_tab_picker_scroll_completed_cb), - tab_picker); + G_CALLBACK (e_mail_tab_picker_scroll_completed_cb), + tab_picker); } clutter_timeline_start (priv->scroll_timeline); @@ -643,14 +643,14 @@ e_mail_tab_picker_allocate (ClutterActor *actor, /* Allocate for scroll-bar and close button */ clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->close_button), - NULL, NULL, &width, &height); + NULL, NULL, &width, &height); child_box.x1 = 0; child_box.x2 = box->x2 - box->x1 - padding.right; child_box.y1 = 0; child_box.y2 = child_box.y1 + height; clutter_actor_allocate (CLUTTER_ACTOR (priv->close_button), - &child_box, - flags); + &child_box, + flags); /* FIXME: Make this a property */ #define SPACING 4.0 @@ -685,9 +685,9 @@ e_mail_tab_picker_allocate (ClutterActor *actor, /* Don't stretch tabs without a preview to fit tabs with a preview */ if (e_mail_tab_get_preview_actor (props->tab)) - child_box.y2 = box->y2 - box->y1 - padding.bottom; + child_box.y2 = box->y2 - box->y1 - padding.bottom; else - child_box.y2 = child_box.y1 + height; + child_box.y2 = child_box.y1 + height; child_box.x2 = child_box.x1 + width; clutter_actor_allocate (actor, &child_box, flags); @@ -697,14 +697,14 @@ e_mail_tab_picker_allocate (ClutterActor *actor, /* Allocate for the chooser button */ clutter_actor_get_preferred_width (CLUTTER_ACTOR (priv->chooser_button), - box->y2 - box->y1, NULL, &width); + box->y2 - box->y1, NULL, &width); child_box.x2 = box->x2 - box->x1 - padding.right; child_box.x1 = child_box.x2 - width; child_box.y1 = 0; child_box.y2 = child_box.y1 + height; clutter_actor_allocate (CLUTTER_ACTOR (priv->chooser_button), - &child_box, flags); + &child_box, flags); /* Cache some useful size values */ priv->width = (gint)(box->x2 - box->x1); @@ -713,7 +713,7 @@ e_mail_tab_picker_allocate (ClutterActor *actor, old_max_offset = priv->max_offset; priv->max_offset = priv->total_width - priv->width + - (gint)(child_box.x2 - child_box.x1); + (gint)(child_box.x2 - child_box.x1); if (priv->max_offset < 0) priv->max_offset = 0; @@ -731,12 +731,12 @@ e_mail_tab_picker_allocate (ClutterActor *actor, "page-increment", (gdouble)(box->x2 - box->x1), "page-size", (gdouble)(box->x2 - box->x1), "upper", (gdouble)total_width, - NULL); + NULL); if ((priv->max_offset != old_max_offset) || (priv->scroll_offset != old_scroll_offset)) mx_adjustment_set_value (priv->scroll_adjustment, - (gdouble)priv->scroll_offset); + (gdouble)priv->scroll_offset); /* Allocate for scroll-bar */ clutter_actor_allocate (CLUTTER_ACTOR (priv->scroll_bar), &scroll_box, flags); @@ -745,11 +745,11 @@ e_mail_tab_picker_allocate (ClutterActor *actor, if (priv->keep_current_visible) { EMailTabPickerProps *current = - g_list_nth_data (priv->tabs, priv->current_tab); + g_list_nth_data (priv->tabs, priv->current_tab); if ((current->position < priv->scroll_offset) || - (current->position + current->width >= priv->max_offset)) - e_mail_tab_picker_scroll_to (tab_picker, current->position, 150); + (current->position + current->width >= priv->max_offset)) + e_mail_tab_picker_scroll_to (tab_picker, current->position, 150); } } @@ -813,38 +813,38 @@ e_mail_tab_picker_class_init (EMailTabPickerClass *klass) actor_class->unmap = e_mail_tab_picker_unmap; g_object_class_install_property (object_class, - PROP_PREVIEW_MODE, + PROP_PREVIEW_MODE, g_param_spec_boolean ("preview-mode", "Preview mode", "Whether to display " "in preview mode.", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + FALSE, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_override_property (object_class, - PROP_DROP_ENABLED, + PROP_DROP_ENABLED, "drop-enabled"); signals[TAB_ACTIVATED] = g_signal_new ("tab-activated", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EMailTabPickerClass, tab_activated), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, E_MAIL_TYPE_TAB); + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EMailTabPickerClass, tab_activated), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, E_MAIL_TYPE_TAB); signals[CHOOSER_CLICKED] = g_signal_new ("chooser-clicked", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EMailTabPickerClass, chooser_clicked), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EMailTabPickerClass, chooser_clicked), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); } static void @@ -907,28 +907,28 @@ e_mail_tab_picker_init (EMailTabPicker *self) clutter_actor_set_name (CLUTTER_ACTOR (priv->chooser_button), "chooser-button"); clutter_actor_set_parent (CLUTTER_ACTOR (priv->chooser_button), - CLUTTER_ACTOR (self)); + CLUTTER_ACTOR (self)); priv->close_button = mx_button_new (); clutter_actor_set_name (CLUTTER_ACTOR (priv->close_button), "chooser-close-button"); clutter_actor_set_parent (CLUTTER_ACTOR (priv->close_button), - CLUTTER_ACTOR (self)); + CLUTTER_ACTOR (self)); clutter_actor_hide (CLUTTER_ACTOR (priv->close_button)); priv->scroll_adjustment = mx_adjustment_new_with_values (0, 0, 0, 100, 200, 200); priv->scroll_bar = mx_scroll_bar_new_with_adjustment (priv->scroll_adjustment); g_object_unref (priv->scroll_adjustment); clutter_actor_set_parent (CLUTTER_ACTOR (priv->scroll_bar), - CLUTTER_ACTOR (self)); + CLUTTER_ACTOR (self)); clutter_actor_hide (CLUTTER_ACTOR (priv->scroll_bar)); g_signal_connect (priv->chooser_button, "clicked", - G_CALLBACK (e_mail_tab_picker_chooser_clicked_cb), self); + G_CALLBACK (e_mail_tab_picker_chooser_clicked_cb), self); g_signal_connect (priv->close_button, "clicked", - G_CALLBACK (e_mail_tab_picker_chooser_clicked_cb), self); + G_CALLBACK (e_mail_tab_picker_chooser_clicked_cb), self); g_signal_connect (self, "scroll-event", - G_CALLBACK (e_mail_tab_picker_scroll_event_cb), NULL); + G_CALLBACK (e_mail_tab_picker_scroll_event_cb), NULL); } static gint @@ -950,7 +950,7 @@ e_mail_tab_picker_tab_clicked_cb (EMailTab *tab, EMailTabPicker *self) EMailTab *old_tab = ((EMailTabPickerProps *)g_list_nth_data (priv->tabs, priv->current_tab))->tab; GList *new_tab_link = g_list_find_custom (priv->tabs, tab, - e_mail_tab_picker_find_tab_cb); + e_mail_tab_picker_find_tab_cb); if (!new_tab_link) return; @@ -962,7 +962,7 @@ e_mail_tab_picker_tab_clicked_cb (EMailTab *tab, EMailTabPicker *self) { e_mail_tab_set_active (tab, TRUE); if (priv->preview_mode) - g_signal_emit (self, signals[TAB_ACTIVATED], 0, tab); + g_signal_emit (self, signals[TAB_ACTIVATED], 0, tab); return; } @@ -1032,11 +1032,11 @@ e_mail_tab_picker_add_tab (EMailTabPicker *picker, EMailTab *tab, gint position) mx_draggable_set_axis (MX_DRAGGABLE (tab), MX_DRAG_AXIS_X); g_signal_connect_after (tab, "clicked", - G_CALLBACK (e_mail_tab_picker_tab_clicked_cb), picker); + G_CALLBACK (e_mail_tab_picker_tab_clicked_cb), picker); g_signal_connect (tab, "drag-begin", - G_CALLBACK (e_mail_tab_picker_tab_drag_begin_cb), picker); + G_CALLBACK (e_mail_tab_picker_tab_drag_begin_cb), picker); g_signal_connect (tab, "drag-end", - G_CALLBACK (e_mail_tab_picker_tab_drag_end_cb), picker); + G_CALLBACK (e_mail_tab_picker_tab_drag_end_cb), picker); e_mail_tab_set_preview_mode (tab, priv->preview_mode); clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); @@ -1054,14 +1054,14 @@ e_mail_tab_picker_remove_tab (EMailTabPicker *picker, EMailTab *tab) return; g_signal_handlers_disconnect_by_func (tab, - e_mail_tab_picker_tab_clicked_cb, - picker); + e_mail_tab_picker_tab_clicked_cb, + picker); g_signal_handlers_disconnect_by_func (tab, - e_mail_tab_picker_tab_drag_begin_cb, - picker); + e_mail_tab_picker_tab_drag_begin_cb, + picker); g_signal_handlers_disconnect_by_func (tab, - e_mail_tab_picker_tab_drag_end_cb, - picker); + e_mail_tab_picker_tab_drag_end_cb, + picker); /* We don't want to do this during dispose, checking if chooser_button * exists is a way of checking if we're in dispose without keeping an @@ -1071,17 +1071,17 @@ e_mail_tab_picker_remove_tab (EMailTabPicker *picker, EMailTab *tab) { gint position = g_list_position (priv->tabs, tab_link); if (priv->current_tab) - { - if (priv->current_tab > position) - priv->current_tab--; - else if (priv->current_tab == position) - e_mail_tab_picker_set_current_tab (picker, priv->current_tab - 1); - } + { + if (priv->current_tab > position) + priv->current_tab--; + else if (priv->current_tab == position) + e_mail_tab_picker_set_current_tab (picker, priv->current_tab - 1); + } else if (priv->tabs->next && (position == 0)) - { - e_mail_tab_picker_set_current_tab (picker, priv->current_tab + 1); - priv->current_tab--; - } + { + e_mail_tab_picker_set_current_tab (picker, priv->current_tab + 1); + priv->current_tab--; + } } g_slice_free (EMailTabPickerProps, tab_link->data); @@ -1120,7 +1120,7 @@ gint e_mail_tab_picker_get_tab_no (EMailTabPicker *picker, EMailTab *tab) { GList *tab_link = g_list_find_custom (picker->priv->tabs, tab, - e_mail_tab_picker_find_tab_cb); + e_mail_tab_picker_find_tab_cb); return g_list_position (picker->priv->tabs, tab_link); } @@ -1178,15 +1178,15 @@ e_mail_tab_picker_reorder (EMailTabPicker *picker, if (priv->current_tab == old_position) { if (new_position < 0) - priv->current_tab = priv->n_tabs - 1; + priv->current_tab = priv->n_tabs - 1; else - priv->current_tab = CLAMP (new_position, 0, priv->n_tabs - 1); + priv->current_tab = CLAMP (new_position, 0, priv->n_tabs - 1); } else if ((priv->current_tab > old_position) && - (new_position >= priv->current_tab)) + (new_position >= priv->current_tab)) priv->current_tab--; else if ((priv->current_tab < old_position) && - (new_position <= priv->current_tab)) + (new_position <= priv->current_tab)) priv->current_tab++; clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); @@ -1219,16 +1219,16 @@ preview_completed_cb (ClutterTimeline *timeline, priv->preview_timeline = NULL; if (priv->preview_mode) - { - priv->preview_progress = 1.0; - clutter_actor_hide (CLUTTER_ACTOR (priv->chooser_button)); - } + { + priv->preview_progress = 1.0; + clutter_actor_hide (CLUTTER_ACTOR (priv->chooser_button)); + } else - { - priv->preview_progress = 0.0; - clutter_actor_hide (CLUTTER_ACTOR (priv->scroll_bar)); - clutter_actor_hide (CLUTTER_ACTOR (priv->close_button)); - } + { + priv->preview_progress = 0.0; + clutter_actor_hide (CLUTTER_ACTOR (priv->scroll_bar)); + clutter_actor_hide (CLUTTER_ACTOR (priv->close_button)); + } clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); } } @@ -1256,35 +1256,35 @@ e_mail_tab_picker_set_preview_mode (EMailTabPicker *picker, gboolean preview) if (!priv->preview_timeline) { if (preview) - clutter_actor_show (CLUTTER_ACTOR (priv->scroll_bar)); + clutter_actor_show (CLUTTER_ACTOR (priv->scroll_bar)); priv->preview_timeline = clutter_timeline_new (150); g_signal_connect (priv->preview_timeline, "new-frame", - G_CALLBACK (preview_new_frame_cb), picker); + G_CALLBACK (preview_new_frame_cb), picker); g_signal_connect (priv->preview_timeline, "completed", - G_CALLBACK (preview_completed_cb), picker); + G_CALLBACK (preview_completed_cb), picker); clutter_timeline_start (priv->preview_timeline); } clutter_timeline_set_direction (priv->preview_timeline, - preview ? CLUTTER_TIMELINE_FORWARD : - CLUTTER_TIMELINE_BACKWARD); + preview ? CLUTTER_TIMELINE_FORWARD : + CLUTTER_TIMELINE_BACKWARD); /* Connect/disconnect the scrollbar */ if (preview) g_signal_connect (priv->scroll_adjustment, "notify::value", - G_CALLBACK (e_mail_tab_picker_scroll_value_cb), picker); + G_CALLBACK (e_mail_tab_picker_scroll_value_cb), picker); else g_signal_handlers_disconnect_by_func (priv->scroll_adjustment, - e_mail_tab_picker_scroll_value_cb, - picker); + e_mail_tab_picker_scroll_value_cb, + picker); if (preview) { /* Fade out the chooser button show close button */ clutter_actor_animate (CLUTTER_ACTOR (priv->chooser_button), - CLUTTER_EASE_IN_OUT_QUAD, 150, + CLUTTER_EASE_IN_OUT_QUAD, 150, "opacity", 0x00, - NULL); + NULL); clutter_actor_show (CLUTTER_ACTOR (priv->close_button)); } else @@ -1292,16 +1292,16 @@ e_mail_tab_picker_set_preview_mode (EMailTabPicker *picker, gboolean preview) /* Fade in the chooser button */ clutter_actor_show (CLUTTER_ACTOR (priv->chooser_button)); clutter_actor_animate (CLUTTER_ACTOR (priv->chooser_button), - CLUTTER_EASE_IN_OUT_QUAD, 150, + CLUTTER_EASE_IN_OUT_QUAD, 150, "opacity", 0xff, - NULL); + NULL); } clutter_actor_set_reactive (CLUTTER_ACTOR (priv->chooser_button), !preview); /* Remove the hover state, which likely got stuck when we clicked it */ if (!preview) mx_stylable_set_style_pseudo_class (MX_STYLABLE (priv->chooser_button), - NULL); + NULL); g_object_notify (G_OBJECT (picker), "preview-mode"); } diff --git a/mail/e-mail-tab.c b/mail/e-mail-tab.c index d5909ce1cb..cbbe8a83f6 100644 --- a/mail/e-mail-tab.c +++ b/mail/e-mail-tab.c @@ -148,7 +148,7 @@ e_mail_tab_drag_begin (MxDraggable *draggable, clutter_actor_set_opacity (actor, 0x00); clutter_actor_animate (actor, CLUTTER_LINEAR, 150, "opacity", 0xff, - NULL); + NULL); } clutter_container_add_actor (CLUTTER_CONTAINER (stage), actor); } @@ -188,24 +188,24 @@ e_mail_tab_drag_end (MxDraggable *draggable, { ClutterActor *parent = clutter_actor_get_parent (priv->drag_actor); if (parent) - { + { /* Animate drop */ - if (CLUTTER_IS_TEXTURE (priv->drag_actor)) - { + if (CLUTTER_IS_TEXTURE (priv->drag_actor)) + { /* TODO: Some neat deformation effect? */ - clutter_container_remove_actor (CLUTTER_CONTAINER (parent), - priv->drag_actor); - } - else - { - clutter_actor_animate (priv->drag_actor, CLUTTER_LINEAR, 150, + clutter_container_remove_actor (CLUTTER_CONTAINER (parent), + priv->drag_actor); + } + else + { + clutter_actor_animate (priv->drag_actor, CLUTTER_LINEAR, 150, "opacity", 0x00, "signal::completed", - G_CALLBACK (e_mail_tab_drag_end_anim_cb), - self, - NULL); - } - } + G_CALLBACK (e_mail_tab_drag_end_anim_cb), + self, + NULL); + } + } g_object_unref (priv->drag_actor); priv->drag_actor = NULL; } @@ -294,21 +294,21 @@ e_mail_tab_get_property (GObject *object, guint property_id, case PROP_DRAG_ACTOR: if (!priv->drag_actor) - { - ClutterActor *fbo = + { + ClutterActor *fbo = /*clutter_texture_new_from_actor (CLUTTER_ACTOR (tab));*/ - NULL; - if (fbo) - { + NULL; + if (fbo) + { /* This is where we'd setup deformations, or something along * those lines. */ - priv->drag_actor = g_object_ref_sink (fbo); - } - else - priv->drag_actor = - g_object_ref_sink (clutter_clone_new (CLUTTER_ACTOR (tab))); - } + priv->drag_actor = g_object_ref_sink (fbo); + } + else + priv->drag_actor = + g_object_ref_sink (clutter_clone_new (CLUTTER_ACTOR (tab))); + } g_value_set_object (value, priv->drag_actor); break; @@ -347,7 +347,7 @@ e_mail_tab_set_property (GObject *object, guint property_id, case PROP_PREVIEW: e_mail_tab_set_preview_actor (tab, - CLUTTER_ACTOR (g_value_get_object (value))); + CLUTTER_ACTOR (g_value_get_object (value))); break; case PROP_PREVIEW_MODE: @@ -383,14 +383,14 @@ e_mail_tab_set_property (GObject *object, guint property_id, case PROP_DRAG_CONTAINMENT_AREA: { - ClutterActorBox *box = g_value_get_boxed (value); + ClutterActorBox *box = g_value_get_boxed (value); - if (box) - priv->drag_area = *box; - else - memset (&priv->drag_area, 0, sizeof (ClutterActorBox)); + if (box) + priv->drag_area = *box; + else + memset (&priv->drag_area, 0, sizeof (ClutterActorBox)); - break; + break; } case PROP_DRAG_ENABLED: @@ -399,25 +399,25 @@ e_mail_tab_set_property (GObject *object, guint property_id, case PROP_DRAG_ACTOR: { - ClutterActor *new_actor = g_value_get_object (value); + ClutterActor *new_actor = g_value_get_object (value); - if (priv->drag_actor) - { - ClutterActor *parent = clutter_actor_get_parent (priv->drag_actor); + if (priv->drag_actor) + { + ClutterActor *parent = clutter_actor_get_parent (priv->drag_actor); /* We know it's a container because we added it ourselves */ - if (parent) - clutter_container_remove_actor (CLUTTER_CONTAINER (parent), - priv->drag_actor); + if (parent) + clutter_container_remove_actor (CLUTTER_CONTAINER (parent), + priv->drag_actor); - g_object_unref (priv->drag_actor); - priv->drag_actor = NULL; - } + g_object_unref (priv->drag_actor); + priv->drag_actor = NULL; + } - if (new_actor) - priv->drag_actor = g_object_ref_sink (new_actor); + if (new_actor) + priv->drag_actor = g_object_ref_sink (new_actor); - break; + break; } default: @@ -433,7 +433,7 @@ e_mail_tab_dispose_old_bg (EMailTab *tab) if (priv->old_bg) { if (clutter_actor_get_parent (priv->old_bg) == (ClutterActor *)tab) - clutter_actor_unparent (priv->old_bg); + clutter_actor_unparent (priv->old_bg); g_object_unref (priv->old_bg); priv->old_bg = NULL; } @@ -487,8 +487,8 @@ e_mail_tab_dispose (GObject *object) { ClutterActor *parent = clutter_actor_get_parent (priv->drag_actor); if (parent) - clutter_container_remove_actor (CLUTTER_CONTAINER (parent), - priv->drag_actor); + clutter_container_remove_actor (CLUTTER_CONTAINER (parent), + priv->drag_actor); g_object_unref (priv->drag_actor); priv->drag_actor = NULL; } @@ -496,7 +496,7 @@ e_mail_tab_dispose (GObject *object) if (priv->drag_threshold_handler) { g_signal_handler_disconnect (gtk_settings_get_default (), - priv->drag_threshold_handler); + priv->drag_threshold_handler); priv->drag_threshold_handler = 0; } @@ -537,38 +537,38 @@ e_mail_tab_get_preferred_width (ClutterActor *actor, acc_min_width = acc_nat_width = 0; if (priv->has_text) - clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->label), - &acc_min_width, NULL, - &acc_nat_width, NULL); + clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->label), + &acc_min_width, NULL, + &acc_nat_width, NULL); if (priv->icon) - { - clutter_actor_get_preferred_size (priv->icon, - &min_width, NULL, - &nat_width, NULL); - acc_min_width += min_width; - acc_nat_width += nat_width; - } + { + clutter_actor_get_preferred_size (priv->icon, + &min_width, NULL, + &nat_width, NULL); + acc_min_width += min_width; + acc_nat_width += nat_width; + } if (priv->can_close) - { - clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->close_button), - &min_width, NULL, - &nat_width, NULL); - acc_min_width += min_width; - acc_nat_width += nat_width; - } + { + clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->close_button), + &min_width, NULL, + &nat_width, NULL); + acc_min_width += min_width; + acc_nat_width += nat_width; + } if (priv->preview && priv->preview_mode) - { - clutter_actor_get_preferred_size (priv->preview, - &min_width, NULL, - &nat_width, NULL); - if (min_width > acc_min_width) - acc_min_width = min_width; - if (nat_width > acc_nat_width) - acc_nat_width = nat_width; - } + { + clutter_actor_get_preferred_size (priv->preview, + &min_width, NULL, + &nat_width, NULL); + if (min_width > acc_min_width) + acc_min_width = min_width; + if (nat_width > acc_nat_width) + acc_nat_width = nat_width; + } if (min_width_p) *min_width_p += acc_min_width; @@ -599,26 +599,26 @@ e_mail_tab_get_height_no_preview (EMailTab *tab, min_height = nat_height = 0; if (priv->has_text) clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->label), -1, - &min_height, &nat_height); + &min_height, &nat_height); if (priv->icon) { clutter_actor_get_preferred_height (priv->icon, -1, - &tmp_min_height, &tmp_nat_height); + &tmp_min_height, &tmp_nat_height); if (tmp_min_height > min_height) - min_height = tmp_min_height; + min_height = tmp_min_height; if (tmp_nat_height > nat_height) - nat_height = tmp_nat_height; + nat_height = tmp_nat_height; } if (priv->can_close) { clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->close_button), - -1, &tmp_min_height, &tmp_nat_height); + -1, &tmp_min_height, &tmp_nat_height); if (tmp_min_height > min_height) - min_height = tmp_min_height; + min_height = tmp_min_height; if (tmp_nat_height > nat_height) - nat_height = tmp_nat_height; + nat_height = tmp_nat_height; } if (min_height_p) @@ -637,7 +637,7 @@ e_mail_tab_get_preferred_height (ClutterActor *actor, EMailTabPrivate *priv = tab->priv; e_mail_tab_get_height_no_preview (tab, for_width, - min_height_p, natural_height_p); + min_height_p, natural_height_p); if (priv->preview) { @@ -648,20 +648,20 @@ e_mail_tab_get_preferred_height (ClutterActor *actor, mx_widget_get_padding (MX_WIDGET (actor), &padding); clutter_actor_get_preferred_height (priv->preview, - (gfloat)priv->width, - &min_height, - &nat_height); + (gfloat)priv->width, + &min_height, + &nat_height); /* Add label height */ clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->label), -1, - &label_min_height, &label_nat_height); + &label_min_height, &label_nat_height); min_height = (min_height * priv->preview_height_progress) + - padding.top + padding.bottom + priv->spacing + - label_min_height; + padding.top + padding.bottom + priv->spacing + + label_min_height; nat_height = (nat_height * priv->preview_height_progress) + - padding.top + padding.bottom + priv->spacing + - label_nat_height; + padding.top + padding.bottom + priv->spacing + + label_nat_height; /* Sometimes the preview's natural height will be nan due to * keeping of the aspect ratio. This guards against that and stops @@ -669,7 +669,7 @@ e_mail_tab_get_preferred_height (ClutterActor *actor, * minimum height. */ if (isnan (nat_height)) - nat_height = min_height; + nat_height = min_height; if (min_height_p && (min_height > *min_height_p)) *min_height_p = min_height; @@ -686,7 +686,7 @@ e_mail_tab_allocate (ClutterActor *actor, MxPadding padding; ClutterActorBox child_box; gfloat icon_width, icon_height, label_width, label_height, - close_width, close_height, preview_width, preview_height; + close_width, close_height, preview_width, preview_height; EMailTabPrivate *priv = E_MAIL_TAB (actor)->priv; @@ -697,26 +697,26 @@ e_mail_tab_allocate (ClutterActor *actor, if (priv->in_drag) { ClutterActor *drag_actor = - mx_draggable_get_drag_actor (MX_DRAGGABLE (actor)); + mx_draggable_get_drag_actor (MX_DRAGGABLE (actor)); if (drag_actor) - { - gfloat x, y; - clutter_actor_get_transformed_position (actor, &x, &y); - switch (mx_draggable_get_axis (MX_DRAGGABLE (actor))) - { - case MX_DRAG_AXIS_X : + { + gfloat x, y; + clutter_actor_get_transformed_position (actor, &x, &y); + switch (mx_draggable_get_axis (MX_DRAGGABLE (actor))) + { + case MX_DRAG_AXIS_X : /* Synchronise y axis */ - clutter_actor_set_y (drag_actor, y); - break; - case MX_DRAG_AXIS_Y : + clutter_actor_set_y (drag_actor, y); + break; + case MX_DRAG_AXIS_Y : /* Synchronise x axis */ - clutter_actor_set_x (drag_actor, x); - break; - default : - break; - } - } + clutter_actor_set_x (drag_actor, x); + break; + default : + break; + } + } } /* Allocate old background texture */ @@ -734,12 +734,12 @@ e_mail_tab_allocate (ClutterActor *actor, /* Get the preferred width/height of the icon, label and close-button first */ if (priv->icon) clutter_actor_get_preferred_size (priv->icon, NULL, NULL, - &icon_width, &icon_height); + &icon_width, &icon_height); clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->label), NULL, NULL, - &label_width, &label_height); + &label_width, &label_height); if (priv->can_close) clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->close_button), - NULL, NULL, &close_width, &close_height); + NULL, NULL, &close_width, &close_height); /* Allocate for icon */ if (priv->icon) @@ -759,8 +759,8 @@ e_mail_tab_allocate (ClutterActor *actor, child_box.y1 = E_MAIL_PIXBOUND ((box->y2 - box->y1)/2 - close_height/2); child_box.y2 = child_box.y1 + close_height; clutter_actor_allocate (CLUTTER_ACTOR (priv->close_button), - &child_box, - flags); + &child_box, + flags); } /* Allocate for preview widget */ @@ -769,7 +769,7 @@ e_mail_tab_allocate (ClutterActor *actor, { preview_width = (box->x2 - box->x1 - padding.left - padding.right); preview_height = (box->y2 - box->y1 - padding.top - padding.bottom - - priv->spacing - label_height); + priv->spacing - label_height); child_box.x1 = E_MAIL_PIXBOUND (padding.left); child_box.y1 = E_MAIL_PIXBOUND (padding.top); @@ -782,16 +782,16 @@ e_mail_tab_allocate (ClutterActor *actor, if ((priv->preview_height_progress <= TAB_S1_ANIM) || (!priv->preview)) { if (priv->icon) - child_box.x1 = E_MAIL_PIXBOUND (padding.left + icon_width + priv->spacing); + child_box.x1 = E_MAIL_PIXBOUND (padding.left + icon_width + priv->spacing); else - child_box.x1 = E_MAIL_PIXBOUND (padding.left); + child_box.x1 = E_MAIL_PIXBOUND (padding.left); child_box.x2 = (box->x2 - box->x1 - padding.right); child_box.y1 = E_MAIL_PIXBOUND ((box->y2 - box->y1)/2 - label_height/2); child_box.y2 = child_box.y1 + label_height; /* If close button is visible, don't overlap it */ if (priv->can_close) - child_box.x2 -= close_width + priv->spacing; + child_box.x2 -= close_width + priv->spacing; } else { @@ -799,7 +799,7 @@ e_mail_tab_allocate (ClutterActor *actor, child_box.x1 = E_MAIL_PIXBOUND (padding.left); child_box.x2 = (box->x2 - box->x1 - padding.right); child_box.y1 = E_MAIL_PIXBOUND (padding.top + preview_height + - priv->spacing); + priv->spacing); child_box.y2 = child_box.y1 + label_height; } @@ -812,23 +812,23 @@ e_mail_tab_allocate (ClutterActor *actor, { gfloat max_height = padding.top + padding.bottom + preview_height; if (box->y2 - box->y1 > max_height) - { - MxWidget *widget = MX_WIDGET (actor); - ClutterActor *background = mx_widget_get_border_image (widget); - - if (!background) - background = mx_widget_get_background_image (widget); - - child_box.x1 = 0; - child_box.x2 = box->x2 - box->x1; - child_box.y1 = 0; - child_box.y2 = max_height; - - if (background) - clutter_actor_allocate (background, &child_box, flags); - if (priv->old_bg && (priv->old_bg != background)) - clutter_actor_allocate (priv->old_bg, &child_box, flags); - } + { + MxWidget *widget = MX_WIDGET (actor); + ClutterActor *background = mx_widget_get_border_image (widget); + + if (!background) + background = mx_widget_get_background_image (widget); + + child_box.x1 = 0; + child_box.x2 = box->x2 - box->x1; + child_box.y1 = 0; + child_box.y2 = max_height; + + if (background) + clutter_actor_allocate (background, &child_box, flags); + if (priv->old_bg && (priv->old_bg != background)) + clutter_actor_allocate (priv->old_bg, &child_box, flags); + } } } @@ -934,12 +934,12 @@ e_mail_tab_button_release_event (ClutterActor *actor, * in being set active. */ if (priv->hover) - { - if (!priv->active) - e_mail_tab_set_active (tab, TRUE); + { + if (!priv->active) + e_mail_tab_set_active (tab, TRUE); - g_signal_emit (actor, signals[CLICKED], 0); - } + g_signal_emit (actor, signals[CLICKED], 0); + } } return FALSE; @@ -955,20 +955,20 @@ e_mail_tab_motion_event (ClutterActor *actor, if (priv->pressed && priv->drag_enabled) { if ((ABS (event->x - priv->press_x) >= priv->drag_threshold) || - (ABS (event->y - priv->press_y) >= priv->drag_threshold)) - { + (ABS (event->y - priv->press_y) >= priv->drag_threshold)) + { /* Ungrab the pointer so that the MxDraggable code can take over */ - clutter_ungrab_pointer (); - priv->pressed = FALSE; - if (!priv->active) - { - if (priv->hover) - mx_stylable_set_style_pseudo_class (MX_STYLABLE (actor), + clutter_ungrab_pointer (); + priv->pressed = FALSE; + if (!priv->active) + { + if (priv->hover) + mx_stylable_set_style_pseudo_class (MX_STYLABLE (actor), "hover"); - else - mx_stylable_set_style_pseudo_class (MX_STYLABLE (actor), NULL); - } - } + else + mx_stylable_set_style_pseudo_class (MX_STYLABLE (actor), NULL); + } + } } return FALSE; @@ -1038,182 +1038,182 @@ e_mail_tab_class_init (EMailTabClass *klass) actor_class->unmap = e_mail_tab_unmap; g_object_class_install_property (object_class, - PROP_ICON, + PROP_ICON, g_param_spec_object ("icon", "Icon", "Icon actor.", - CLUTTER_TYPE_ACTOR, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + CLUTTER_TYPE_ACTOR, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_install_property (object_class, - PROP_TEXT, + PROP_TEXT, g_param_spec_string ("text", "Text", "Tab text.", "", - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_install_property (object_class, - PROP_CAN_CLOSE, + PROP_CAN_CLOSE, g_param_spec_boolean ("can-close", "Can close", "Whether the tab can " "close.", - TRUE, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + TRUE, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_install_property (object_class, - PROP_TAB_WIDTH, + PROP_TAB_WIDTH, g_param_spec_int ("tab-width", "Tab width", "Tab width.", - -1, G_MAXINT, -1, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + -1, G_MAXINT, -1, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_install_property (object_class, - PROP_DOCKING, + PROP_DOCKING, g_param_spec_boolean ("docking", "Docking", "Whether the tab " "should dock to edges " "when scrolled.", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + FALSE, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_install_property (object_class, - PROP_PREVIEW, + PROP_PREVIEW, g_param_spec_object ("preview", "Preview actor", "ClutterActor used " "when in preview mode.", - CLUTTER_TYPE_ACTOR, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + CLUTTER_TYPE_ACTOR, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_install_property (object_class, - PROP_PREVIEW_MODE, + PROP_PREVIEW_MODE, g_param_spec_boolean ("preview-mode", "Preview mode", "Whether to display " "in preview mode.", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + FALSE, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_install_property (object_class, - PROP_PREVIEW_DURATION, + PROP_PREVIEW_DURATION, g_param_spec_uint ("preview-duration", "Preview duration", "How long the transition " "between preview mode " "states lasts, in ms.", - 0, G_MAXUINT, 200, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + 0, G_MAXUINT, 200, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_install_property (object_class, - PROP_SPACING, + PROP_SPACING, g_param_spec_float ("spacing", "Spacing", "Spacing between " "tab elements.", - 0, G_MAXFLOAT, - 6.0, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + 0, G_MAXFLOAT, + 6.0, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_install_property (object_class, - PROP_PRIVATE, + PROP_PRIVATE, g_param_spec_boolean ("private", "Private", "Set if the tab is " "'private'.", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + FALSE, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_install_property (object_class, - PROP_ACTIVE, + PROP_ACTIVE, g_param_spec_boolean ("active", "Active", "Set if the tab is " "active.", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + FALSE, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); g_object_class_override_property (object_class, - PROP_DRAG_THRESHOLD, + PROP_DRAG_THRESHOLD, "drag-threshold"); g_object_class_override_property (object_class, - PROP_DRAG_AXIS, + PROP_DRAG_AXIS, "axis"); // g_object_class_override_property (object_class, // PROP_DRAG_CONTAINMENT_TYPE, // "containment-type"); g_object_class_override_property (object_class, - PROP_DRAG_CONTAINMENT_AREA, + PROP_DRAG_CONTAINMENT_AREA, "containment-area"); g_object_class_override_property (object_class, - PROP_DRAG_ENABLED, + PROP_DRAG_ENABLED, "drag-enabled"); g_object_class_override_property (object_class, - PROP_DRAG_ACTOR, + PROP_DRAG_ACTOR, "drag-actor"); signals[CLICKED] = g_signal_new ("clicked", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EMailTabClass, clicked), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EMailTabClass, clicked), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); signals[CLOSED] = g_signal_new ("closed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EMailTabClass, closed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EMailTabClass, closed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); signals[TRANSITION_COMPLETE] = g_signal_new ("transition-complete", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EMailTabClass, transition_complete), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EMailTabClass, transition_complete), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); } static void @@ -1242,42 +1242,42 @@ e_mail_tab_style_changed_cb (MxWidget *widget) if (priv->old_bg) { if (!clutter_actor_get_parent (priv->old_bg)) - { - ClutterActorBox box; - ClutterActor *background; - ClutterActor *actor = CLUTTER_ACTOR (widget); + { + ClutterActorBox box; + ClutterActor *background; + ClutterActor *actor = CLUTTER_ACTOR (widget); - clutter_actor_set_parent (priv->old_bg, actor); + clutter_actor_set_parent (priv->old_bg, actor); /* Try to allocate the same size as the background widget, * otherwise allocate the same size as the widget itself. */ - background = mx_widget_get_border_image (widget); - if (!background) - background = mx_widget_get_background_image (widget); - - if (background) - clutter_actor_get_allocation_box (background, &box); - else - { - clutter_actor_get_allocation_box (actor, &box); - box.x2 -= box.x1; - box.y2 -= box.y1; - box.x1 = 0; - box.y1 = 0; - } - - clutter_actor_allocate (priv->old_bg, &box, 0); - } + background = mx_widget_get_border_image (widget); + if (!background) + background = mx_widget_get_background_image (widget); + + if (background) + clutter_actor_get_allocation_box (background, &box); + else + { + clutter_actor_get_allocation_box (actor, &box); + box.x2 -= box.x1; + box.y2 -= box.y1; + box.x1 = 0; + box.y1 = 0; + } + + clutter_actor_allocate (priv->old_bg, &box, 0); + } clutter_actor_animate (priv->old_bg, - CLUTTER_LINEAR, - 150, + CLUTTER_LINEAR, + 150, "opacity", 0, "signal::completed", - G_CALLBACK (e_mail_tab_anim_completed_cb), - widget, - NULL); + G_CALLBACK (e_mail_tab_anim_completed_cb), + widget, + NULL); } } @@ -1301,7 +1301,7 @@ e_mail_tab_dnd_notify_cb (GObject *settings, { g_object_get (settings, "gtk-dnd-drag-threshold", &tab->priv->drag_threshold, - NULL); + NULL); } static void @@ -1322,32 +1322,32 @@ e_mail_tab_init (EMailTab *self) text = mx_label_get_clutter_text (MX_LABEL (priv->label)); clutter_text_set_ellipsize (CLUTTER_TEXT (text), PANGO_ELLIPSIZE_END); clutter_actor_set_parent (CLUTTER_ACTOR (priv->label), - CLUTTER_ACTOR (self)); + CLUTTER_ACTOR (self)); priv->close_button = mx_button_new (); clutter_actor_set_name (CLUTTER_ACTOR (priv->close_button), "tab-close-button"); clutter_actor_set_parent (CLUTTER_ACTOR (priv->close_button), - CLUTTER_ACTOR (self)); + CLUTTER_ACTOR (self)); g_signal_connect (priv->close_button, "clicked", - G_CALLBACK (e_mail_tab_close_clicked_cb), self); + G_CALLBACK (e_mail_tab_close_clicked_cb), self); /* Connect up styling signals */ g_signal_connect (self, "style-changed", - G_CALLBACK (e_mail_tab_style_changed_cb), NULL); + G_CALLBACK (e_mail_tab_style_changed_cb), NULL); g_signal_connect (self, "stylable-changed", - G_CALLBACK (e_mail_tab_stylable_changed_cb), NULL); + G_CALLBACK (e_mail_tab_stylable_changed_cb), NULL); clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE); settings = gtk_settings_get_default (); priv->drag_threshold_handler = g_signal_connect (settings, "notify::gtk-dnd-drag-threshold", - G_CALLBACK (e_mail_tab_dnd_notify_cb), self); + G_CALLBACK (e_mail_tab_dnd_notify_cb), self); g_object_get (G_OBJECT (settings), "gtk-dnd-drag-threshold", &priv->drag_threshold, - NULL); + NULL); } ClutterActor * @@ -1526,7 +1526,7 @@ e_mail_tab_set_preview_actor (EMailTab *tab, ClutterActor *actor) clutter_actor_set_opacity (actor, priv->preview_mode ? 0xff : 0x00); if (!priv->preview_mode) - clutter_actor_hide (actor); + clutter_actor_hide (actor); } clutter_actor_queue_relayout (CLUTTER_ACTOR (tab)); @@ -1550,7 +1550,7 @@ preview_new_frame_cb (ClutterTimeline *timeline, EMailTabPrivate *priv = tab->priv; forwards = (clutter_timeline_get_direction (timeline) == - CLUTTER_TIMELINE_FORWARD) ? TRUE : FALSE; + CLUTTER_TIMELINE_FORWARD) ? TRUE : FALSE; if (priv->preview_mode) forwards = !forwards; @@ -1575,32 +1575,32 @@ preview_completed_cb (ClutterTimeline *timeline, priv->preview_timeline = NULL; if (priv->preview_mode) - priv->preview_height_progress = 1.0; + priv->preview_height_progress = 1.0; else - { - priv->preview_height_progress = 0.0; - if (priv->preview) - clutter_actor_hide (priv->preview); - if (priv->can_close) - clutter_actor_set_reactive (CLUTTER_ACTOR (priv->close_button), - TRUE); - } + { + priv->preview_height_progress = 0.0; + if (priv->preview) + clutter_actor_hide (priv->preview); + if (priv->can_close) + clutter_actor_set_reactive (CLUTTER_ACTOR (priv->close_button), + TRUE); + } /* Remove style hint if we're not in preview mode */ if (priv->preview) - { - if (!priv->preview_mode) - clutter_actor_set_name (CLUTTER_ACTOR (tab), + { + if (!priv->preview_mode) + clutter_actor_set_name (CLUTTER_ACTOR (tab), priv->private ? "private-tab" : NULL); - } + } else - { + { /* If there's no preview actor, disable the tab */ - clutter_actor_set_reactive (CLUTTER_ACTOR (tab), !priv->preview_mode); - } + clutter_actor_set_reactive (CLUTTER_ACTOR (tab), !priv->preview_mode); + } if (priv->preview) - clutter_actor_queue_relayout (CLUTTER_ACTOR (tab)); + clutter_actor_queue_relayout (CLUTTER_ACTOR (tab)); g_signal_emit (tab, signals[TRANSITION_COMPLETE], 0); } @@ -1614,10 +1614,10 @@ preview_s1_started_cb (ClutterTimeline *timeline, if (!priv->preview) clutter_actor_animate_with_timeline (CLUTTER_ACTOR (priv->label), - CLUTTER_EASE_IN_OUT_QUAD, - timeline, + CLUTTER_EASE_IN_OUT_QUAD, + timeline, "opacity", 0xff, - NULL); + NULL); } static void @@ -1628,10 +1628,10 @@ preview_s2_started_cb (ClutterTimeline *timeline, if (priv->preview) clutter_actor_animate_with_timeline (CLUTTER_ACTOR (priv->label), - CLUTTER_EASE_IN_OUT_QUAD, - timeline, + CLUTTER_EASE_IN_OUT_QUAD, + timeline, "opacity", 0xff, - NULL); + NULL); } void @@ -1648,87 +1648,87 @@ e_mail_tab_set_preview_mode (EMailTab *tab, gboolean preview) /* Disable the close button in preview mode */ if (preview && priv->can_close) - clutter_actor_set_reactive (CLUTTER_ACTOR (priv->close_button), FALSE); + clutter_actor_set_reactive (CLUTTER_ACTOR (priv->close_button), FALSE); #define DEBUG_MULT 1 if (priv->preview_timeline) - { - progress = 1.0 - - clutter_timeline_get_progress (priv->preview_timeline); - clutter_timeline_stop (priv->preview_timeline); - g_object_unref (priv->preview_timeline); - } + { + progress = 1.0 - + clutter_timeline_get_progress (priv->preview_timeline); + clutter_timeline_stop (priv->preview_timeline); + g_object_unref (priv->preview_timeline); + } else - progress = 0.0; + progress = 0.0; total_duration = priv->anim_length * (1.0 - progress) * DEBUG_MULT; duration1 = total_duration * TAB_S1_ANIM; duration2 = total_duration * TAB_S2_ANIM; priv->preview_timeline = - clutter_timeline_new (priv->anim_length * DEBUG_MULT); + clutter_timeline_new (priv->anim_length * DEBUG_MULT); clutter_timeline_skip (priv->preview_timeline, - clutter_timeline_get_duration (priv->preview_timeline) * progress); + clutter_timeline_get_duration (priv->preview_timeline) * progress); g_signal_connect (priv->preview_timeline, "completed", - G_CALLBACK (preview_completed_cb), tab); + G_CALLBACK (preview_completed_cb), tab); clutter_timeline_start (priv->preview_timeline); if (!priv->preview) - { - clutter_actor_animate_with_timeline (CLUTTER_ACTOR (tab), - CLUTTER_EASE_IN_OUT_QUAD, - priv->preview_timeline, + { + clutter_actor_animate_with_timeline (CLUTTER_ACTOR (tab), + CLUTTER_EASE_IN_OUT_QUAD, + priv->preview_timeline, "opacity", preview ? 0x00 : 0xff, - NULL); - return; - } + NULL); + return; + } g_signal_connect (priv->preview_timeline, "new-frame", - G_CALLBACK (preview_new_frame_cb), tab); + G_CALLBACK (preview_new_frame_cb), tab); timeline = clutter_timeline_new ((guint)duration1); timeline2 = clutter_timeline_new ((guint)duration2); g_signal_connect (timeline, "started", - G_CALLBACK (preview_s1_started_cb), tab); + G_CALLBACK (preview_s1_started_cb), tab); g_signal_connect (timeline2, "started", - G_CALLBACK (preview_s2_started_cb), tab); + G_CALLBACK (preview_s2_started_cb), tab); if (preview) - clutter_timeline_set_delay (timeline2, duration1); + clutter_timeline_set_delay (timeline2, duration1); else - clutter_timeline_set_delay (timeline, duration2); + clutter_timeline_set_delay (timeline, duration2); /* clutter_actor_animate_with_timeline will start the timelines */ clutter_actor_animate_with_timeline (CLUTTER_ACTOR (priv->label), - CLUTTER_EASE_IN_OUT_QUAD, - preview ? timeline : timeline2, + CLUTTER_EASE_IN_OUT_QUAD, + preview ? timeline : timeline2, "opacity", 0x00, - NULL); + NULL); if (priv->icon) - clutter_actor_animate_with_timeline (priv->icon, - CLUTTER_EASE_IN_OUT_QUAD, - timeline, + clutter_actor_animate_with_timeline (priv->icon, + CLUTTER_EASE_IN_OUT_QUAD, + timeline, "opacity", preview ? 0x00 : 0xff, - NULL); + NULL); if (priv->can_close) - clutter_actor_animate_with_timeline (CLUTTER_ACTOR (priv->close_button), - CLUTTER_EASE_IN_OUT_QUAD, - timeline, + clutter_actor_animate_with_timeline (CLUTTER_ACTOR (priv->close_button), + CLUTTER_EASE_IN_OUT_QUAD, + timeline, "opacity", preview ? 0x00 : 0xff, - NULL); + NULL); if (priv->preview) - { - clutter_actor_show (priv->preview); - clutter_actor_animate_with_timeline (priv->preview, - CLUTTER_EASE_IN_OUT_QUAD, - timeline2, + { + clutter_actor_show (priv->preview); + clutter_actor_animate_with_timeline (priv->preview, + CLUTTER_EASE_IN_OUT_QUAD, + timeline2, "opacity", preview ? 0xff : 0x00, - NULL); - } + NULL); + } /* The animations have references on these, drop ours */ g_object_unref (timeline); @@ -1830,7 +1830,7 @@ e_mail_tab_set_active (EMailTab *tab, gboolean active) if (priv->hover) mx_stylable_set_style_pseudo_class (MX_STYLABLE (tab), "hover"); else - mx_stylable_set_style_pseudo_class (MX_STYLABLE (tab), NULL); + mx_stylable_set_style_pseudo_class (MX_STYLABLE (tab), NULL); } } @@ -1878,10 +1878,10 @@ e_mail_tab_alert (EMailTab *tab) if (!priv->alert_source) priv->alert_source = g_timeout_add_full (G_PRIORITY_HIGH, - 500, - (GSourceFunc)e_mail_tab_alert_cb, - tab, - NULL); + 500, + (GSourceFunc)e_mail_tab_alert_cb, + tab, + NULL); } void diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index cf33586453..54c298a3e9 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -579,7 +579,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, '@'); @@ -1410,36 +1410,36 @@ emae_uri_changed (EMAccountEditorService *service, CamelURL *url) static void emae_service_url_changed (EMAccountEditorService *service, void (*setval)(CamelURL *, const gchar *), GtkEntry *entry) { - GtkComboBox *dropdown; - gint id; - GtkTreeModel *model; - GtkTreeIter iter; - CamelServiceAuthType *authtype; + GtkComboBox *dropdown; + gint id; + GtkTreeModel *model; + GtkTreeIter iter; + CamelServiceAuthType *authtype; - CamelURL *url = emae_account_url (service->emae, emae_service_info[service->type].account_uri_key); - gchar *text = g_strdup (gtk_entry_get_text (entry)); + CamelURL *url = emae_account_url (service->emae, emae_service_info[service->type].account_uri_key); + gchar *text = g_strdup (gtk_entry_get_text (entry)); g_strstrip (text); - setval (url, (text && text[0])?text:NULL); - - if (text && text[0] && setval == camel_url_set_user) { - dropdown = service->authtype; - if (dropdown) { - id = gtk_combo_box_get_active (dropdown); - if (id != -1) { - model = gtk_combo_box_get_model (dropdown); - if (gtk_tree_model_iter_nth_child (model, &iter, NULL, id)) { - gtk_tree_model_get (model, &iter, 1, &authtype, -1); - if (authtype) - camel_url_set_authmech (url, authtype->authproto); - } - } - } - } - - emae_uri_changed (service, url); - camel_url_free (url); + setval (url, (text && text[0])?text:NULL); + + if (text && text[0] && setval == camel_url_set_user) { + dropdown = service->authtype; + if (dropdown) { + id = gtk_combo_box_get_active (dropdown); + if (id != -1) { + model = gtk_combo_box_get_model (dropdown); + if (gtk_tree_model_iter_nth_child (model, &iter, NULL, id)) { + gtk_tree_model_get (model, &iter, 1, &authtype, -1); + if (authtype) + camel_url_set_authmech (url, authtype->authproto); + } + } + } + } + + emae_uri_changed (service, url); + camel_url_free (url); g_free (text); } diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c index 9ad4cacc39..4daf441ead 100644 --- a/mail/em-filter-folder-element.c +++ b/mail/em-filter-folder-element.c @@ -143,7 +143,7 @@ filter_folder_element_finalize (GObject *object) g_free (priv->uri); /* Chain up to parent's finalize() method. */ - G_OBJECT_CLASS (em_filter_folder_element_parent_class)->finalize (object); + G_OBJECT_CLASS (em_filter_folder_element_parent_class)->finalize (object); } static void diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index 714822bcde..545eb1fce4 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -116,7 +116,7 @@ em_filter_rule_finalise (GObject *obj) unref_list (ff->actions); g_list_free (ff->actions); - G_OBJECT_CLASS (parent_class)->finalize (obj); + G_OBJECT_CLASS (parent_class)->finalize (obj); } /** @@ -209,7 +209,7 @@ list_eq (GList *al, GList *bl) static gint filter_eq (EFilterRule *fr, EFilterRule *cm) { - return E_FILTER_RULE_CLASS (parent_class)->eq (fr, cm) + return E_FILTER_RULE_CLASS (parent_class)->eq (fr, cm) && list_eq (((EMFilterRule *)fr)->actions,((EMFilterRule *)cm)->actions); } @@ -220,7 +220,7 @@ xml_encode (EFilterRule *fr) xmlNodePtr node, set, work; GList *l; - node = E_FILTER_RULE_CLASS (parent_class)->xml_encode (fr); + node = E_FILTER_RULE_CLASS (parent_class)->xml_encode (fr); g_return_val_if_fail (node != NULL, NULL); set = xmlNewNode(NULL, (const guchar *)"actionset"); xmlAddChild (node, set); @@ -269,7 +269,7 @@ xml_decode (EFilterRule *fr, xmlNodePtr node, ERuleContext *rc) xmlNodePtr work; gint result; - result = E_FILTER_RULE_CLASS (parent_class)->xml_decode (fr, node, rc); + result = E_FILTER_RULE_CLASS (parent_class)->xml_decode (fr, node, rc); if (result != 0) return result; @@ -313,7 +313,7 @@ rule_copy (EFilterRule *dest, EFilterRule *src) /*static void build_code(EFilterRule *fr, GString *out) { - return FILTER_RULE_CLASS (parent_class)->build_code (fr, out); + return FILTER_RULE_CLASS (parent_class)->build_code (fr, out); }*/ struct _part_data { @@ -530,7 +530,7 @@ get_widget (EFilterRule *fr, ERuleContext *rc) gint rows, i = 0; gchar *msg; - widget = E_FILTER_RULE_CLASS (parent_class)->get_widget (fr, rc); + widget = E_FILTER_RULE_CLASS (parent_class)->get_widget (fr, rc); /* and now for the action area */ msg = g_strdup_printf("<b>%s</b>", _("Then")); diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index 088c6c761f..1d11a72c2d 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -333,7 +333,7 @@ list_eq (GList *al, GList *bl) static gint vfolder_eq (EFilterRule *fr, EFilterRule *cm) { - return E_FILTER_RULE_CLASS (em_vfolder_rule_parent_class)->eq (fr, cm) + return E_FILTER_RULE_CLASS (em_vfolder_rule_parent_class)->eq (fr, cm) && list_eq (((EMVFolderRule *)fr)->sources, ((EMVFolderRule *)cm)->sources); } @@ -344,7 +344,7 @@ xml_encode (EFilterRule *fr) xmlNodePtr node, set, work; GList *l; - node = E_FILTER_RULE_CLASS (em_vfolder_rule_parent_class)->xml_encode (fr); + node = E_FILTER_RULE_CLASS (em_vfolder_rule_parent_class)->xml_encode (fr); g_return_val_if_fail (node != NULL, NULL); g_return_val_if_fail (vr->with < G_N_ELEMENTS (with_names), NULL); diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 1c17024f39..3ca7b23d58 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -418,7 +418,7 @@ build_dialog (GtkWindow *parent, GList *list = NULL; struct _send_data *data; GtkWidget *container; - GtkWidget *send_icon; + GtkWidget *send_icon; GtkWidget *recv_icon; GtkWidget *scrolled_window; GtkWidget *label; diff --git a/mail/message-list.c b/mail/message-list.c index ef1eac2278..cd72098397 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -4664,8 +4664,8 @@ regen_list_done (struct _regen_list_msg *m) } else build_flat (m->ml, m->summary, m->changes); - if (m->ml->search && m->ml->search != m->search) - g_free (m->ml->search); + if (m->ml->search && m->ml->search != m->search) + g_free (m->ml->search); m->ml->search = m->search; m->search = NULL; diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index 571f35506a..0a20ea2000 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -427,7 +427,7 @@ system_timezone_monitor_changed (GFileMonitor *handle, GFileMonitorEvent event, gpointer user_data) { - ECalShellView *view = E_CAL_SHELL_VIEW (user_data); + ECalShellView *view = E_CAL_SHELL_VIEW (user_data); ECalShellViewPrivate *priv = view->priv; ECalShellContent *cal_shell_content; icaltimezone *timezone = NULL, *current_zone = NULL; @@ -649,7 +649,7 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view) init_timezone_monitors (cal_shell_view); e_cal_shell_view_actions_init (cal_shell_view); e_cal_shell_view_update_sidebar (cal_shell_view); - e_cal_shell_view_update_search_filter (cal_shell_view); + e_cal_shell_view_update_search_filter (cal_shell_view); e_cal_shell_view_update_timezone (cal_shell_view); /* Keep the ECalModel in sync with the sidebar. */ diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c index c64b8b086f..a41c4e1985 100644 --- a/modules/calendar/e-memo-shell-migrate.c +++ b/modules/calendar/e-memo-shell-migrate.c @@ -274,5 +274,5 @@ e_memo_shell_backend_migrate (EShellBackend *shell_backend, if (personal_source) g_object_unref (personal_source); - return retval; + return retval; } diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index e0dd2f17fd..0c28c24297 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -138,7 +138,7 @@ composer_prefs_finalize (GObject *object) g_object_unref (prefs->builder); /* Chain up to parent's finalize() method. */ - G_OBJECT_CLASS (em_composer_prefs_parent_class)->finalize (object); + G_OBJECT_CLASS (em_composer_prefs_parent_class)->finalize (object); } static void diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index 870e5ec037..6147328aed 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -298,8 +298,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, @@ -1057,7 +1057,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, renderer = gtk_cell_renderer_toggle_new (); g_object_set (renderer, "activatable", TRUE, NULL); g_signal_connect (renderer, "toggled", G_CALLBACK (emmp_header_list_enabled_toggled), prefs); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (prefs->header_list), -1, + gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (prefs->header_list), -1, "Enabled", renderer, "active", HEADER_LIST_ENABLED_COLUMN, NULL); diff --git a/modules/plugin-python/e-plugin-python.c b/modules/plugin-python/e-plugin-python.c index 8837432db2..1b8057c6b7 100644 --- a/modules/plugin-python/e-plugin-python.c +++ b/modules/plugin-python/e-plugin-python.c @@ -162,7 +162,7 @@ plugin_python_invoke (EPlugin *plugin, } if (pValue) { - Py_DECREF (pValue); + Py_DECREF (pValue); /* Fixme */ return NULL; } else diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c index 0adcf9a701..cb742588e3 100644 --- a/plugins/addressbook-file/addressbook-file.c +++ b/plugins/addressbook-file/addressbook-file.c @@ -43,7 +43,7 @@ e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data) gchar *uri_text; const gchar *relative_uri; - uri_text = e_source_get_uri (source); + uri_text = e_source_get_uri (source); if (strncmp (uri_text, "file", 4)) { g_free (uri_text); diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 3aebff938e..a454709757 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -244,9 +244,9 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob } } - gst_element_get_state (po->playbin, &cur_state, NULL, 0); + gst_element_get_state (po->playbin, &cur_state, NULL, 0); - if (cur_state >= GST_STATE_PAUSED) { + if (cur_state >= GST_STATE_PAUSED) { gst_element_set_state (po->playbin, GST_STATE_READY); } diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index ddaf200af2..7d479ce611 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -401,7 +401,7 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac g_object_get (data->parent, "n-rows", &n_rows, NULL); if (data->old) - return data->old; + return data->old; check = gtk_check_button_new_with_mnemonic (_("Convert message text to _Unicode")); diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index 6f50ae4dcb..ec15c70453 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -248,7 +248,7 @@ oge_caldav (EPlugin *epl, user, "changed", G_CALLBACK (user_changed_cb), source); - g_free (uri); + g_free (uri); g_free (username); mail = e_plugin_util_add_entry (parent, _("User e-_mail:"), source, "usermail"); diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 24e76e3d6c..23f474c5ef 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -83,7 +83,7 @@ GtkWidget *org_gnome_email_custom_header_config_option (struct _EPlugin *epl, st gint e_plugin_lib_enable (EPlugin *ep, gint enable) { - return 0; + return 0; } static void @@ -335,8 +335,8 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) /* To create an empty label widget. Text will be added dynamically. */ priv->header_type_name_label = gtk_label_new (""); temp_header_ptr = &g_array_index (priv->email_custom_header_details, EmailCustomHeaderDetails,header_section_id); - str = (temp_header_ptr->header_type_value)->str; - if (strcmp (str, security_field) == 0) + str = (temp_header_ptr->header_type_value)->str; + if (strcmp (str, security_field) == 0) str = g_dpgettext2 (GETTEXT_PACKAGE, "email-custom-header-Security", security_field); gtk_label_set_markup (GTK_LABEL (priv->header_type_name_label), str); @@ -351,7 +351,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) } for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len; - sub_index++,row_combo++,column_combo++) { + sub_index++,row_combo++,column_combo++) { temp = &g_array_index (priv->email_custom_header_details, EmailCustomHeaderDetails,sub_index); sub_combo_box_ptr = &g_array_index (priv->combo_box_header_value, HeaderValueComboBox,sub_index); @@ -485,25 +485,25 @@ epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gp static void epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data) { - EMsgComposer *composer; - EmailCustomHeaderWindow *new_email_custom_header_window = NULL; - CustomHeaderOptionsDialog *current_dialog = NULL; + EMsgComposer *composer; + EmailCustomHeaderWindow *new_email_custom_header_window = NULL; + CustomHeaderOptionsDialog *current_dialog = NULL; - composer = (EMsgComposer *) user_data; + composer = (EMsgComposer *) user_data; - if (!user_data || !EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (user_data)) + if (!user_data || !EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (user_data)) return; new_email_custom_header_window = g_object_get_data ((GObject *) composer, "compowindow"); - if (new_email_custom_header_window) { + if (new_email_custom_header_window) { current_dialog = new_email_custom_header_window->epech_dialog; - } + } - if (current_dialog) { + if (current_dialog) { g_free (current_dialog); current_dialog = NULL; - } + } if (new_email_custom_header_window) { g_free (new_email_custom_header_window); @@ -526,12 +526,12 @@ epech_check_existing_composer_window (gconstpointer compowindow, gconstpointer o static void destroy_compo_data (gpointer data) { - EmailCustomHeaderWindow *compo_data = (EmailCustomHeaderWindow *) data; + EmailCustomHeaderWindow *compo_data = (EmailCustomHeaderWindow *) data; - if (!compo_data) - return; + if (!compo_data) + return; - g_free (compo_data); + g_free (compo_data); } static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *composer) @@ -554,10 +554,10 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp } else { dialog = epech_dialog_new (); if (dialog) { - EmailCustomHeaderWindow *new_email_custom_header_window; - new_email_custom_header_window = g_new0 (EmailCustomHeaderWindow, 1); - new_email_custom_header_window->epech_window = window; - new_email_custom_header_window->epech_dialog = dialog; + EmailCustomHeaderWindow *new_email_custom_header_window; + new_email_custom_header_window = g_new0 (EmailCustomHeaderWindow, 1); + new_email_custom_header_window->epech_window = window; + new_email_custom_header_window->epech_dialog = dialog; g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data); } } @@ -613,12 +613,12 @@ commit_changes (ConfigData *cd) -1); /* Check if the keyword is not empty */ - if ((keyword) && (g_utf8_strlen (g_strstrip (keyword), -1) > 0)) { - if ((value) && (g_utf8_strlen (g_strstrip (value), -1) > 0)) { + if ((keyword) && (g_utf8_strlen (g_strstrip (keyword), -1) > 0)) { + if ((value) && (g_utf8_strlen (g_strstrip (value), -1) > 0)) { keyword = g_strconcat (keyword, "=", value, NULL); - } - header_config_list = g_slist_append (header_config_list, g_strdup (keyword)); - } + } + header_config_list = g_slist_append (header_config_list, g_strdup (keyword)); + } g_free (keyword); g_free (value); diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h index ac2b8f1204..00fa2ef763 100644 --- a/plugins/email-custom-header/email-custom-header.h +++ b/plugins/email-custom-header/email-custom-header.h @@ -65,8 +65,8 @@ struct _CustomHeaderOptionsDialogClass { typedef struct _EmailCustomHeaderWindow { - GdkWindow *epech_window; - CustomHeaderOptionsDialog *epech_dialog; + GdkWindow *epech_window; + CustomHeaderOptionsDialog *epech_dialog; }EmailCustomHeaderWindow; enum { diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index b5865c7780..335aece2e5 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -119,7 +119,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, '@'); diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c index fff8af3dd1..ff00f50913 100644 --- a/plugins/groupwise-features/camel-gw-listener.c +++ b/plugins/groupwise-features/camel-gw-listener.c @@ -143,17 +143,17 @@ static GwAccountInfo* lookup_account_info (const gchar *key) { GList *list; - GwAccountInfo *info; + GwAccountInfo *info; gint found = 0; - if (!key) - return NULL; + if (!key) + return NULL; info = NULL; - for (list = g_list_first (groupwise_accounts); list; list = g_list_next (list)) { - info = (GwAccountInfo *) (list->data); - found = (strcmp (info->uid, key) == 0); + for (list = g_list_first (groupwise_accounts); list; list = g_list_next (list)) { + info = (GwAccountInfo *) (list->data); + found = (strcmp (info->uid, key) == 0); if (found) break; } @@ -175,7 +175,7 @@ add_esource (const gchar *conf_key, GwAccountInfo *info, const gchar *source_na ESourceList *source_list; ESourceGroup *group; ESource *source; - GConfClient* client; + GConfClient* client; GSList *ids, *temp; const gchar *source_selection_key; gchar *relative_uri; @@ -268,15 +268,15 @@ static void remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_name, const gchar * relative_uri) { ESourceList *list; - GSList *groups; + GSList *groups; gboolean found_group; GConfClient* client; GSList *ids; GSList *node_tobe_deleted; const gchar *source_selection_key; - client = gconf_client_get_default (); - list = e_source_list_new_for_gconf (client, conf_key); + client = gconf_client_get_default (); + list = e_source_list_new_for_gconf (client, conf_key); groups = e_source_list_peek_groups (list); found_group = FALSE; @@ -339,7 +339,7 @@ static void modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccount *a, CamelURL *new_url) { ESourceList *list; - GSList *groups; + GSList *groups; gchar *old_relative_uri; CamelURL *url; gboolean found_group; @@ -356,7 +356,7 @@ modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccoun old_relative_uri = g_strdup_printf ("%s@%s/", url->user, poa_address); client = gconf_client_get_default (); - list = e_source_list_new_for_gconf (client, conf_key); + list = e_source_list_new_for_gconf (client, conf_key); groups = e_source_list_peek_groups (list); found_group = FALSE; @@ -456,7 +456,7 @@ static GList* get_addressbook_names_from_server (gchar *source_url) { gchar *key; - EGwConnection *cnc; + EGwConnection *cnc; gchar *password; GList *book_list = NULL; gint status, count = 0; @@ -472,15 +472,15 @@ get_addressbook_names_from_server (gchar *source_url) guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET; url = camel_url_new (source_url, NULL); - if (url == NULL) { - return NULL; - } + if (url == NULL) { + return NULL; + } poa_address = url->host; if (!poa_address || strlen (poa_address) ==0) return NULL; soap_port = camel_url_get_param (url, "soap_port"); - if (!soap_port || strlen (soap_port) == 0) + if (!soap_port || strlen (soap_port) == 0) soap_port = "7191"; use_ssl = camel_url_get_param (url, "use_ssl"); @@ -571,8 +571,8 @@ add_addressbook_sources (EAccount *account) { CamelURL *url; ESourceList *list; - ESourceGroup *group; - ESource *source; + ESourceGroup *group; + ESource *source; gchar *base_uri; const gchar *soap_port; GList *books_list, *temp_list; @@ -581,7 +581,7 @@ add_addressbook_sources (EAccount *account) const gchar *poa_address; gboolean is_frequent_contacts = FALSE, is_writable = FALSE; - url = camel_url_new (account->source->url, NULL); + url = camel_url_new (account->source->url, NULL); if (url == NULL) { return FALSE; } @@ -663,7 +663,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_ { CamelURL *url; ESourceList *list; - ESourceGroup *group; + ESourceGroup *group; GSList *groups; gboolean found_group; gboolean delete_group; @@ -746,7 +746,7 @@ static void remove_addressbook_sources (GwAccountInfo *existing_account_info) { ESourceList *list; - ESourceGroup *group; + ESourceGroup *group; GSList *groups; gboolean found_group; CamelURL *url; @@ -841,7 +841,7 @@ account_removed (EAccountList *account_listener, EAccount *account) g_free (info->uid); g_free (info->name); g_free (info->source_url); - g_free (info); + g_free (info); } static void @@ -1014,15 +1014,15 @@ camel_gw_listener_get_type (void) if (!camel_gw_listener_type) { static GTypeInfo info = { - sizeof (CamelGwListenerClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) camel_gw_listener_class_init, - NULL, NULL, - sizeof (CamelGwListener), - 0, - (GInstanceInitFunc) camel_gw_listener_init - }; + sizeof (CamelGwListenerClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) camel_gw_listener_class_init, + NULL, NULL, + sizeof (CamelGwListener), + 0, + (GInstanceInitFunc) camel_gw_listener_init + }; camel_gw_listener_type = g_type_register_static (PARENT_TYPE, "CamelGwListener", &info, 0); } diff --git a/plugins/groupwise-features/groupwise-account-setup.c b/plugins/groupwise-features/groupwise-account-setup.c index 4cd8c3ca56..335a3b525e 100644 --- a/plugins/groupwise-features/groupwise-account-setup.c +++ b/plugins/groupwise-features/groupwise-account-setup.c @@ -50,9 +50,9 @@ static void set_esource_props (const gchar *path, EAccount *a, GConfClient *client, const gchar *name) { ESourceList *list; - GSList *groups; + GSList *groups; - list = e_source_list_new_for_gconf (client, path); + list = e_source_list_new_for_gconf (client, path); groups = e_source_list_peek_groups (list); for (; groups != NULL; groups = g_slist_next (groups)) { @@ -84,7 +84,7 @@ set_esource_props (const gchar *path, EAccount *a, GConfClient *client, const gc void ensure_mandatory_esource_properties (EPlugin *ep, ESEventTargetUpgrade *target) { - GConfClient* client; + GConfClient* client; EAccountList *al; EIterator *it; diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index e40771295b..61e32216a4 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -159,7 +159,7 @@ proxy_login_get_type (void) }; type = g_type_register_static (G_TYPE_OBJECT, "proxyLoginType", - &info, 0); + &info, 0); } return type; @@ -192,7 +192,7 @@ proxy_get_password (EAccount *account, gchar **user_name, gchar **password) return 0; soap_port = camel_url_get_param (url, "soap_port"); - if (!soap_port || strlen (soap_port) == 0) + if (!soap_port || strlen (soap_port) == 0) soap_port = "7191"; use_ssl = camel_url_get_param (url, "use_ssl"); @@ -235,7 +235,7 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent) return NULL; soap_port = camel_url_get_param (url, "soap_port"); - if (!soap_port || strlen (soap_port) == 0) + if (!soap_port || strlen (soap_port) == 0) soap_port = "7191"; use_ssl = camel_url_get_param (url, "use_ssl"); diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 3d350232db..555d3f716b 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -233,7 +233,7 @@ proxy_dialog_get_type (void) type = g_type_register_static (G_TYPE_OBJECT, "proxyDialogType", - &info, 0); + &info, 0); } return type; @@ -477,7 +477,7 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window) return NULL; soap_port = camel_url_get_param (url, "soap_port"); - if (!soap_port || strlen (soap_port) == 0) + if (!soap_port || strlen (soap_port) == 0) soap_port = "7191"; use_ssl = camel_url_get_param (url, "use_ssl"); @@ -853,7 +853,7 @@ static void proxy_remove_account (GtkWidget *button, EAccount *account) { GtkTreeIter iter; - GtkTreeModel *model; + GtkTreeModel *model; proxyDialogPrivate *priv; proxyHandler *deleted; GtkTreeSelection* account_select; @@ -864,8 +864,8 @@ proxy_remove_account (GtkWidget *button, EAccount *account) priv = prd->priv; account_select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree)); - if (gtk_tree_selection_get_selected (account_select, &model, &iter)) { - gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1); + if (gtk_tree_selection_get_selected (account_select, &model, &iter)) { + gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1); account_mailid = g_strrstr (account_mailid, "\n") + 1; deleted = proxy_get_item_from_list (account, account_mailid); @@ -873,7 +873,7 @@ proxy_remove_account (GtkWidget *button, EAccount *account) deleted->flags |= E_GW_PROXY_DELETED; proxy_update_tree_view (account); - } + } } static void @@ -998,7 +998,7 @@ static void proxy_edit_account (GtkWidget *button, EAccount *account) { GtkTreeIter iter; - GtkTreeModel *model; + GtkTreeModel *model; proxyDialogPrivate *priv; GtkTreeSelection* account_select; proxyHandler *edited; @@ -1014,8 +1014,8 @@ proxy_edit_account (GtkWidget *button, EAccount *account) account_select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree)); - if (gtk_tree_selection_get_selected (account_select, &model, &iter)) { - gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1); + if (gtk_tree_selection_get_selected (account_select, &model, &iter)) { + gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1); account_mailid = g_strrstr (account_mailid, "\n") + 1; edited = proxy_get_item_from_list (account, account_mailid); if (edited) { @@ -1034,5 +1034,5 @@ proxy_edit_account (GtkWidget *button, EAccount *account) gtk_widget_hide (contacts); gtk_widget_show (GTK_WIDGET (priv->main)); } - } + } } diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index a3c08ca90c..8b0aa48b55 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -67,7 +67,7 @@ get_cnc (GtkWindow *parent_window) return NULL; soap_port = camel_url_get_param (url, "soap_port"); - if (!soap_port || strlen (soap_port) == 0) + if (!soap_port || strlen (soap_port) == 0) soap_port = "7191"; use_ssl = camel_url_get_param (url, "use_ssl"); @@ -350,7 +350,7 @@ send_options_copy_check_changed (EGwSendOptions *n_opts) e_send_options_copy_status_options (sod->data->copts, gcopts); e_send_options_copy_status_options (sod->data->topts, gtopts); - if (check_general_changed (ggopts, o_gopts)) + if (check_general_changed (ggopts, o_gopts)) changed = TRUE; if (check_status_options_changed (gmopts, o_gmopts)) changed = TRUE; diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 149d1652c7..a401865c0e 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -730,7 +730,7 @@ find_cal_opened_cb (ECal *ecal, const GError *error, gpointer data) * Replies only make sense for events with an organizer. */ if (!e_cal_get_static_capability (ecal, CAL_STATIC_CAPABILITY_SAVE_SCHEDULES) && - (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) && + (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) && pitip->has_organizer) { rsvp_enabled = TRUE; } @@ -848,7 +848,7 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp) sources = e_source_group_peek_sources (group); for (m = sources; m; m = m->next) { - gchar *source_uri = NULL; + gchar *source_uri = NULL; source = m->data; @@ -2036,7 +2036,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) /*FIXME Save schedules is misused here, remove it */ save_schedules = e_cal_get_static_capability (pitip->current_ecal, - CAL_STATIC_CAPABILITY_SAVE_SCHEDULES); + CAL_STATIC_CAPABILITY_SAVE_SCHEDULES); switch (response) { case ITIP_VIEW_RESPONSE_ACCEPT: @@ -2153,40 +2153,40 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) if (!save_schedules && pitip->delete_message && pitip->folder) camel_folder_delete_message (pitip->folder, pitip->uid); - if (itip_view_get_rsvp (ITIP_VIEW (pitip->view)) && status) { - ECalComponent *comp = NULL; - icalcomponent *ical_comp; - icalvalue *value; - const gchar *attendee, *comment; - GSList *l, *list = NULL; + if (itip_view_get_rsvp (ITIP_VIEW (pitip->view)) && status) { + ECalComponent *comp = NULL; + icalcomponent *ical_comp; + icalvalue *value; + const gchar *attendee, *comment; + GSList *l, *list = NULL; gboolean found; - comp = e_cal_component_clone (pitip->comp); - if (comp == NULL) - return; + comp = e_cal_component_clone (pitip->comp); + if (comp == NULL) + return; - if (pitip->to_address == NULL) - find_to_address (pitip, pitip->ical_comp, NULL); - g_assert (pitip->to_address != NULL); + if (pitip->to_address == NULL) + find_to_address (pitip, pitip->ical_comp, NULL); + g_assert (pitip->to_address != NULL); - ical_comp = e_cal_component_get_icalcomponent (comp); + ical_comp = e_cal_component_get_icalcomponent (comp); /* Remove all attendees except the one we are responding as */ found = FALSE; - for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY); - prop != NULL; - prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) - { - gchar *text; - - value = icalproperty_get_value (prop); - if (!value) - continue; + for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY); + prop != NULL; + prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) + { + gchar *text; + + value = icalproperty_get_value (prop); + if (!value) + continue; - attendee = icalvalue_get_string (value); + attendee = icalvalue_get_string (value); - text = g_strdup (itip_strip_mailto (attendee)); - text = g_strstrip (text); + text = g_strdup (itip_strip_mailto (attendee)); + text = g_strstrip (text); /* We do this to ensure there is at most one * attendee in the response */ @@ -2194,15 +2194,15 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) list = g_slist_prepend (list, prop); else if (!g_ascii_strcasecmp (pitip->to_address, text)) found = TRUE; - g_free (text); - } + g_free (text); + } - for (l = list; l; l = l->next) { - prop = l->data; - icalcomponent_remove_property (ical_comp, prop); - icalproperty_free (prop); - } - g_slist_free (list); + for (l = list; l; l = l->next) { + prop = l->data; + icalcomponent_remove_property (ical_comp, prop); + icalproperty_free (prop); + } + g_slist_free (list); /* Add a comment if there user set one */ comment = itip_view_get_rsvp_comment (ITIP_VIEW (pitip->view)); @@ -2219,17 +2219,17 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) e_cal_component_set_comment_list (comp, &comments); } - e_cal_component_rescan (comp); - if (itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, pitip->current_ecal, pitip->top_level, NULL, NULL, TRUE, FALSE) && pitip->folder) { + e_cal_component_rescan (comp); + if (itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, pitip->current_ecal, pitip->top_level, NULL, NULL, TRUE, FALSE) && pitip->folder) { camel_folder_set_message_flags ( pitip->folder, pitip->uid, CAMEL_MESSAGE_ANSWERED, CAMEL_MESSAGE_ANSWERED); } - g_object_unref (comp); + g_object_unref (comp); - } + } } static gboolean diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 830a10563b..ed52242ade 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -942,7 +942,7 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact g_object_get (data->parent, "n-rows", &n_rows, NULL); if (data->old) - return data->old; + return data->old; check = gtk_check_button_new_with_mnemonic (_("I_nclude remote tests")); label = gtk_label_new (NULL); diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 6b147d88a2..a91c813799 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -281,9 +281,9 @@ userstring_to_systemstring (const gchar *userstring) i++; break; case 't': - str = g_string_append_c (str, '\t'); - i++; - break; + str = g_string_append_c (str, '\t'); + i++; + break; } } else { str = g_string_append_c (str, text[i]); diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index 9828b60e7d..e25bff8afc 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -100,14 +100,14 @@ org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t) g_object_unref (out); /* Extracting the winmail.dat */ - TNEFInitialize (&tnef); + TNEFInitialize (&tnef); tnef.Debug = verbose; - if (TNEFParseFile (name, &tnef) == -1) { + if (TNEFParseFile (name, &tnef) == -1) { printf("ERROR processing file\n"); - } + } processTnef (&tnef, tmpdir); - TNEFFree (&tnef); + TNEFFree (&tnef); /* Extraction done */ dir = opendir (tmpdir); @@ -772,7 +772,7 @@ void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) variableLength *filename; if (size < 0x1F) { - return; + return; } fprintf(fptr, "RRULE:FREQ="); @@ -780,63 +780,63 @@ void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) if (recur_data[0x04] == 0x0A) { fprintf(fptr, "DAILY"); - if (recur_data[0x16] == 0x23 || recur_data[0x16] == 0x22 || - recur_data[0x16] == 0x21) { - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), - PROP_TAG (PT_I2, 0x0011))) != MAPI_UNDEFINED) { + if (recur_data[0x16] == 0x23 || recur_data[0x16] == 0x22 || + recur_data[0x16] == 0x21) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_I2, 0x0011))) != MAPI_UNDEFINED) { fprintf(fptr, ";INTERVAL=%d", *(filename->data)); - } - if (recur_data[0x16] == 0x22 || recur_data[0x16] == 0x21) { + } + if (recur_data[0x16] == 0x22 || recur_data[0x16] == 0x21) { fprintf(fptr, ";COUNT=%d", - getRruleCount (recur_data[0x1B], recur_data[0x1A])); - } - } else if (recur_data[0x16] == 0x3E) { + getRruleCount (recur_data[0x1B], recur_data[0x1A])); + } + } else if (recur_data[0x16] == 0x3E) { fprintf(fptr, ";BYDAY=MO,TU,WE,TH,FR"); - if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) { + if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) { fprintf(fptr, ";COUNT=%d", - getRruleCount (recur_data[0x1F], recur_data[0x1E])); - } - } + getRruleCount (recur_data[0x1F], recur_data[0x1E])); + } + } } else if (recur_data[0x04] == 0x0B) { fprintf(fptr, "WEEKLY;INTERVAL=%d;BYDAY=%s", - recur_data[0x0E], getRruleDayname (recur_data[0x16])); - if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) { + recur_data[0x0E], getRruleDayname (recur_data[0x16])); + if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) { fprintf(fptr, ";COUNT=%d", - getRruleCount (recur_data[0x1F], recur_data[0x1E])); - } + getRruleCount (recur_data[0x1F], recur_data[0x1E])); + } } else if (recur_data[0x04] == 0x0C) { fprintf(fptr, "MONTHLY"); - if (recur_data[0x06] == 0x02) { + if (recur_data[0x06] == 0x02) { fprintf(fptr, ";INTERVAL=%d;BYMONTHDAY=%d", recur_data[0x0E], - recur_data[0x16]); - if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) { + recur_data[0x16]); + if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) { fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x1F], - recur_data[0x1E])); - } - } else if (recur_data[0x06] == 0x03) { + recur_data[0x1E])); + } + } else if (recur_data[0x06] == 0x03) { fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d;INTERVAL=%d", - getRruleDayname (recur_data[0x16]), - recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A], - recur_data[0x0E]); - if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) { + getRruleDayname (recur_data[0x16]), + recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A], + recur_data[0x0E]); + if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) { fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x23], - recur_data[0x22])); - } - } + recur_data[0x22])); + } + } } else if (recur_data[0x04] == 0x0D) { fprintf(fptr, "YEARLY;BYMONTH=%d", - getRruleMonthNum (recur_data[0x0A], recur_data[0x0B])); - if (recur_data[0x06] == 0x02) { + getRruleMonthNum (recur_data[0x0A], recur_data[0x0B])); + if (recur_data[0x06] == 0x02) { fprintf(fptr, ";BYMONTHDAY=%d", recur_data[0x16]); - } else if (recur_data[0x06] == 0x03) { + } else if (recur_data[0x06] == 0x03) { fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d", - getRruleDayname (recur_data[0x16]), - recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A]); - } - if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) { + getRruleDayname (recur_data[0x16]), + recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A]); + } + if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) { fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x23], - recur_data[0x22])); - } + recur_data[0x22])); + } } fprintf(fptr, "\n"); } diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c index 586b706859..ccd121fa48 100644 --- a/shell/e-shell-content.c +++ b/shell/e-shell-content.c @@ -218,8 +218,8 @@ shell_content_get_preferred_width (GtkWidget *widget, gint *natural) { EShellContentPrivate *priv; - gint min, nat; - gint child_min, child_nat; + gint min, nat; + gint child_min, child_nat; GtkWidget *child; priv = E_SHELL_CONTENT_GET_PRIVATE (widget); @@ -227,8 +227,8 @@ shell_content_get_preferred_width (GtkWidget *widget, *minimum = *natural = 0; child = gtk_bin_get_child (GTK_BIN (widget)); - gtk_widget_get_preferred_width (child, &child_min, &child_nat); - gtk_widget_get_preferred_width (priv->alert_bar, &min, &nat); + gtk_widget_get_preferred_width (child, &child_min, &child_nat); + gtk_widget_get_preferred_width (priv->alert_bar, &min, &nat); *minimum = MAX (min, child_min); *natural = MAX (nat, child_nat); @@ -236,7 +236,7 @@ shell_content_get_preferred_width (GtkWidget *widget, if (priv->searchbar == NULL) return; - gtk_widget_get_preferred_width (priv->searchbar, &min, &nat); + gtk_widget_get_preferred_width (priv->searchbar, &min, &nat); *minimum = MAX (*minimum, min); *natural = MAX (*natural, nat); } @@ -247,7 +247,7 @@ shell_content_get_preferred_height (GtkWidget *widget, gint *natural) { EShellContentPrivate *priv; - gint min, nat; + gint min, nat; GtkWidget *child; priv = E_SHELL_CONTENT_GET_PRIVATE (widget); @@ -421,8 +421,8 @@ e_shell_content_class_init (EShellContentClass *class) object_class->constructed = shell_content_constructed; widget_class = GTK_WIDGET_CLASS (class); - widget_class->get_preferred_width = shell_content_get_preferred_width; - widget_class->get_preferred_height = shell_content_get_preferred_height; + widget_class->get_preferred_width = shell_content_get_preferred_width; + widget_class->get_preferred_height = shell_content_get_preferred_height; widget_class->size_allocate = shell_content_size_allocate; container_class = GTK_CONTAINER_CLASS (class); diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c index 3860a498c4..3e60096fc8 100644 --- a/shell/e-shell-sidebar.c +++ b/shell/e-shell-sidebar.c @@ -230,7 +230,7 @@ shell_sidebar_get_preferred_width (GtkWidget *widget, priv = E_SHELL_SIDEBAR_GET_PRIVATE (widget); child = gtk_bin_get_child (GTK_BIN (widget)); - gtk_widget_get_preferred_width (child, minimum, natural); + gtk_widget_get_preferred_width (child, minimum, natural); /* do not use priv->event_box here, otherwise it'll not ellipsize */ } @@ -241,7 +241,7 @@ shell_sidebar_get_preferred_height (GtkWidget *widget, gint *natural) { EShellSidebarPrivate *priv; - gint child_min, child_nat; + gint child_min, child_nat; GtkWidget *child; priv = E_SHELL_SIDEBAR_GET_PRIVATE (widget); @@ -323,8 +323,8 @@ e_shell_sidebar_class_init (EShellSidebarClass *class) object_class->constructed = shell_sidebar_constructed; widget_class = GTK_WIDGET_CLASS (class); - widget_class->get_preferred_width = shell_sidebar_get_preferred_width; - widget_class->get_preferred_height = shell_sidebar_get_preferred_height; + widget_class->get_preferred_width = shell_sidebar_get_preferred_width; + widget_class->get_preferred_height = shell_sidebar_get_preferred_height; widget_class->size_allocate = shell_sidebar_size_allocate; container_class = GTK_CONTAINER_CLASS (class); diff --git a/smclient/eggdesktopfile.c b/smclient/eggdesktopfile.c index b546978d05..21f2e38209 100644 --- a/smclient/eggdesktopfile.c +++ b/smclient/eggdesktopfile.c @@ -1033,13 +1033,13 @@ array_putenv (GPtrArray *env, gchar *variable) envp = g_listenv (); for (i = 0; envp[i]; i++) - { - const gchar *value; + { + const gchar *value; - value = g_getenv (envp[i]); + value = g_getenv (envp[i]); g_ptr_array_add (env, g_strdup_printf ("%s=%s", envp[i], value ? value : "")); - } + } g_strfreev (envp); } @@ -1424,10 +1424,10 @@ egg_set_desktop_file_internal (const gchar *desktop_file_path, g_set_application_name (egg_desktop_file->name); if (egg_desktop_file->icon) { - if (g_path_is_absolute (egg_desktop_file->icon)) - gtk_window_set_default_icon_from_file (egg_desktop_file->icon, NULL); - else - gtk_window_set_default_icon_name (egg_desktop_file->icon); + if (g_path_is_absolute (egg_desktop_file->icon)) + gtk_window_set_default_icon_from_file (egg_desktop_file->icon, NULL); + else + gtk_window_set_default_icon_name (egg_desktop_file->icon); } } diff --git a/smclient/eggsmclient.c b/smclient/eggsmclient.c index 335da4b88e..e7dda1226c 100644 --- a/smclient/eggsmclient.c +++ b/smclient/eggsmclient.c @@ -90,13 +90,13 @@ egg_sm_client_class_init (EggSMClientClass *klass) **/ signals[SAVE_STATE] = g_signal_new ("save_state", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EggSMClientClass, save_state), - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, - 1, G_TYPE_POINTER); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EggSMClientClass, save_state), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, G_TYPE_POINTER); /** * EggSMClient::quit_requested: @@ -124,13 +124,13 @@ egg_sm_client_class_init (EggSMClientClass *klass) **/ signals[QUIT_REQUESTED] = g_signal_new ("quit_requested", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EggSMClientClass, quit_requested), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EggSMClientClass, quit_requested), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); /** * EggSMClient::quit_cancelled: @@ -143,13 +143,13 @@ egg_sm_client_class_init (EggSMClientClass *klass) **/ signals[QUIT_CANCELLED] = g_signal_new ("quit_cancelled", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EggSMClientClass, quit_cancelled), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EggSMClientClass, quit_cancelled), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); /** * EggSMClient::quit: @@ -168,13 +168,13 @@ egg_sm_client_class_init (EggSMClientClass *klass) **/ signals[QUIT] = g_signal_new ("quit", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EggSMClientClass, quit), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EggSMClientClass, quit), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); } static gboolean sm_client_disable = FALSE; @@ -197,7 +197,7 @@ sm_client_post_parse_func (GOptionContext *context, desktop_autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID"); if (desktop_autostart_id != NULL) - sm_client_id = g_strdup (desktop_autostart_id); + sm_client_id = g_strdup (desktop_autostart_id); } /* Unset DESKTOP_AUTOSTART_ID in order to avoid child processes to diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index cf5a41eabf..ca77c5af5c 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -491,7 +491,7 @@ on_map_timeout (gpointer data) if (!priv->point_selected) return TRUE; - if (e_map_point_get_color_rgba (priv->point_selected) + if (e_map_point_get_color_rgba (priv->point_selected) == E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_1_RGBA) e_map_point_set_color_rgba (priv->map, priv->point_selected, E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_2_RGBA); diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index 66b055dca6..b2a8196c06 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -259,7 +259,7 @@ gal_define_views_dialog_init (GalDefineViewsDialog *dialog) NULL); dialog->treeview = GTK_TREE_VIEW (e_builder_get_widget (dialog->builder, "treeview1")); - gtk_tree_view_set_reorderable (GTK_TREE_VIEW (dialog->treeview), FALSE); + gtk_tree_view_set_reorderable (GTK_TREE_VIEW (dialog->treeview), FALSE); gtk_tree_view_set_headers_visible (dialog->treeview, TRUE); gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); diff --git a/widgets/misc/e-buffer-tagger.c b/widgets/misc/e-buffer-tagger.c index feef06c21e..cc2444d607 100644 --- a/widgets/misc/e-buffer-tagger.c +++ b/widgets/misc/e-buffer-tagger.c @@ -480,8 +480,8 @@ textview_motion_notify_event (GtkTextView *textview, GdkEventMotion *event) g_return_val_if_fail (GTK_IS_TEXT_VIEW (textview), FALSE); gtk_text_view_window_to_buffer_coords (textview, - GTK_TEXT_WINDOW_WIDGET, - event->x, event->y, &x, &y); + GTK_TEXT_WINDOW_WIDGET, + event->x, event->y, &x, &y); update_mouse_cursor (textview, x, y); diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index df5dba165e..c76a9fa62e 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -1218,12 +1218,12 @@ e_calendar_item_draw_month (ECalendarItem *calitem, start_weekday = (tmp_tm.tm_wday + 6) % 7; if (month_x + max_x - clip_rect.x > 0) { - cairo_save (cr); + cairo_save (cr); clip_rect.width = month_x + max_x - clip_rect.x; clip_rect.height = text_y + char_height - clip_rect.y; - gdk_cairo_rectangle (cr, &clip_rect); - cairo_clip (cr); + gdk_cairo_rectangle (cr, &clip_rect); + cairo_clip (cr); /* This is a strftime() format. %B = Month name, %Y = Year. */ e_utf8_strftime (buffer, sizeof (buffer), _("%B %Y"), &tmp_tm); @@ -1237,13 +1237,13 @@ e_calendar_item_draw_month (ECalendarItem *calitem, text_x = (calitem->month_width - text_width) / 2; text_x = MAX (min_x, text_x); - gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]); - cairo_move_to (cr, - month_x + text_x, - text_y); + gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]); + cairo_move_to (cr, + month_x + text_x, + text_y); pango_cairo_show_layout (cr, layout); - cairo_restore (cr); + cairo_restore (cr); } /* Set the clip rectangle for the main month display. */ @@ -1262,8 +1262,8 @@ e_calendar_item_draw_month (ECalendarItem *calitem, cairo_save (cr); - gdk_cairo_rectangle (cr, &clip_rect); - cairo_clip (cr); + gdk_cairo_rectangle (cr, &clip_rect); + cairo_clip (cr); /* Draw the day initials across the top of the month. */ min_cell_width = MAX (calitem->max_day_width, (calitem->max_digit_width * 2)) @@ -1298,14 +1298,14 @@ e_calendar_item_draw_month (ECalendarItem *calitem, pango_layout_set_font_description (layout, font_desc); if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) text_x += (7-1) * calitem->cell_width; - gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_ACTIVE]); + gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_ACTIVE]); for (day = 0; day < 7; day++) { cairo_save (cr); layout_set_day_text (calitem, layout, day_index); - cairo_move_to (cr, - text_x - calitem->day_widths[day_index], - text_y); - pango_cairo_show_layout (cr, layout); + cairo_move_to (cr, + text_x - calitem->day_widths[day_index], + text_y); + pango_cairo_show_layout (cr, layout); text_x += (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? -calitem->cell_width : calitem->cell_width; day_index++; diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index 59d72f6692..adf2cdc83c 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -106,7 +106,7 @@ ecb_dispose (GObject *object) } if (G_OBJECT_CLASS (ecb_parent_class)->dispose) - G_OBJECT_CLASS (ecb_parent_class)->dispose (object); + G_OBJECT_CLASS (ecb_parent_class)->dispose (object); } static void @@ -150,7 +150,7 @@ ecb_set_property (GObject *object, color_changed = TRUE; break; - case PROP_FILL_COLOR_RGBA: + case PROP_FILL_COLOR_RGBA: ecb->priv->rgba = g_value_get_uint (value); color_changed = TRUE; break; @@ -171,7 +171,7 @@ ecb_get_property (GObject *object, ecb = E_CANVAS_BACKGROUND (object); switch (prop_id) { - case PROP_FILL_COLOR_RGBA: + case PROP_FILL_COLOR_RGBA: g_value_set_uint (value, ecb->priv->rgba); break; default: @@ -197,12 +197,12 @@ ecb_draw (GnomeCanvasItem *item, ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item); cairo_save (cr); - cairo_set_source_rgba (cr, - ((ecb->priv->rgba >> 24) & 0xff) / 255.0, - ((ecb->priv->rgba >> 16) & 0xff) / 255.0, - ((ecb->priv->rgba >> 8) & 0xff) / 255.0, - ( ecb->priv->rgba & 0xff) / 255.0); - cairo_paint (cr); + cairo_set_source_rgba (cr, + ((ecb->priv->rgba >> 24) & 0xff) / 255.0, + ((ecb->priv->rgba >> 16) & 0xff) / 255.0, + ((ecb->priv->rgba >> 8) & 0xff) / 255.0, + ( ecb->priv->rgba & 0xff) / 255.0); + cairo_paint (cr); cairo_restore (cr); } diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index cca6d92670..5bb51f6bfc 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -172,14 +172,14 @@ gnome_canvas_item_invoke_point (GnomeCanvasItem *item, gint cx, gint cy) { - cairo_matrix_t inverse; + cairo_matrix_t inverse; /* Calculate x & y in item local coordinates */ - inverse = item->matrix; - if (cairo_matrix_invert (&inverse) != CAIRO_STATUS_SUCCESS) - return NULL; + inverse = item->matrix; + if (cairo_matrix_invert (&inverse) != CAIRO_STATUS_SUCCESS) + return NULL; - cairo_matrix_transform_point (&inverse, &x, &y); + cairo_matrix_transform_point (&inverse, &x, &y); if (GNOME_CANVAS_ITEM_GET_CLASS (item)->point) return GNOME_CANVAS_ITEM_GET_CLASS (item)->point (item, x, y, cx, cy); @@ -452,7 +452,7 @@ canvas_button_event (GtkWidget *widget, canvas->current_item)); /* dispatch normally regardless of the event's window if an item has - has a pointer grab in effect */ + has a pointer grab in effect */ if (!canvas->grabbed_item && event->window != bin_window) return retval; diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index d2c7dc200a..ae962081d6 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -641,7 +641,7 @@ create_children (EDateEdit *dedit) vbox = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (frame), vbox); - gtk_widget_show (vbox); + gtk_widget_show (vbox); priv->calendar = e_calendar_new (); calendar = E_CALENDAR (priv->calendar); @@ -655,23 +655,23 @@ create_children (EDateEdit *dedit) G_CALLBACK (on_date_popup_date_selected), dedit); gtk_box_pack_start (GTK_BOX (vbox), priv->calendar, FALSE, FALSE, 0); - gtk_widget_show (priv->calendar); + gtk_widget_show (priv->calendar); bbox = gtk_hbutton_box_new (); gtk_container_set_border_width (GTK_CONTAINER (bbox), 4); gtk_box_set_spacing (GTK_BOX (bbox), 2); gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); - gtk_widget_show (bbox); + gtk_widget_show (bbox); priv->now_button = gtk_button_new_with_mnemonic (_("No_w")); gtk_container_add (GTK_CONTAINER (bbox), priv->now_button); - gtk_widget_show (priv->now_button); + gtk_widget_show (priv->now_button); g_signal_connect (priv->now_button, "clicked", G_CALLBACK (on_date_popup_now_button_clicked), dedit); priv->today_button = gtk_button_new_with_mnemonic (_("_Today")); gtk_container_add (GTK_CONTAINER (bbox), priv->today_button); - gtk_widget_show (priv->today_button); + gtk_widget_show (priv->today_button); g_signal_connect (priv->today_button, "clicked", G_CALLBACK (on_date_popup_today_button_clicked), dedit); @@ -1803,8 +1803,8 @@ on_date_entry_focus_out (GtkEntry *entry, GtkWidget *msg_dialog; tmp_tm.tm_year = 0; - tmp_tm.tm_mon = 0; - tmp_tm.tm_mday = 0; + tmp_tm.tm_mon = 0; + tmp_tm.tm_mday = 0; e_date_edit_check_date_changed (dedit); diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c index 00bb57d13d..ba8be2669e 100644 --- a/widgets/misc/e-printable.c +++ b/widgets/misc/e-printable.c @@ -139,7 +139,7 @@ e_printable_print_page (EPrintable *e_printable, gboolean e_printable_data_left (EPrintable *e_printable) { - gboolean ret_val; + gboolean ret_val; g_return_val_if_fail (e_printable != NULL, FALSE); g_return_val_if_fail (E_IS_PRINTABLE (e_printable), FALSE); @@ -168,7 +168,7 @@ e_printable_height (EPrintable *e_printable, gdouble max_height, gboolean quantized) { - gdouble ret_val; + gdouble ret_val; g_return_val_if_fail (e_printable != NULL, -1); g_return_val_if_fail (E_IS_PRINTABLE (e_printable), -1); @@ -191,7 +191,7 @@ e_printable_will_fit (EPrintable *e_printable, gdouble max_height, gboolean quantized) { - gboolean ret_val; + gboolean ret_val; g_return_val_if_fail (e_printable != NULL, FALSE); g_return_val_if_fail (E_IS_PRINTABLE (e_printable), FALSE); diff --git a/widgets/misc/ea-calendar-cell.c b/widgets/misc/ea-calendar-cell.c index ecd7179e0e..2915a6cd04 100644 --- a/widgets/misc/ea-calendar-cell.c +++ b/widgets/misc/ea-calendar-cell.c @@ -201,7 +201,7 @@ ea_calendar_cell_new (GObject *obj) #ifdef ACC_DEBUG static void ea_calendar_cell_finalize (GObject *object) { - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (parent_class)->finalize (object); ++n_ea_calendar_cell_destroyed; g_print ("ACC_DEBUG: n_ea_calendar_cell_destroyed = %d\n", diff --git a/widgets/misc/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c index 97528a5639..e9977bf01e 100644 --- a/widgets/misc/ea-calendar-item.c +++ b/widgets/misc/ea-calendar-item.c @@ -203,7 +203,7 @@ ea_calendar_item_class_init (EaCalendarItemClass *klass) class->get_name = ea_calendar_item_get_name; class->get_description = ea_calendar_item_get_description; - class->ref_state_set = ea_calendar_item_ref_state_set; + class->ref_state_set = ea_calendar_item_ref_state_set; class->get_n_children = ea_calendar_item_get_n_children; class->ref_child = ea_calendar_item_ref_child; @@ -310,7 +310,7 @@ ea_calendar_item_get_name (AtkObject *accessible) name_str = g_strdup_printf ( _("Calendar: from %s to %s"), buffer_start, buffer_end); - } + } #if 0 if (e_calendar_item_get_selection (calitem, &select_start, &select_end)) { diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c index 770ac77f0a..fc81d59cfd 100644 --- a/widgets/table/e-cell-date-edit.c +++ b/widgets/table/e-cell-date-edit.c @@ -234,11 +234,11 @@ e_cell_date_edit_init (ECellDateEdit *ecde) vbox = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (frame), vbox); - gtk_widget_show (vbox); + gtk_widget_show (vbox); hbox = gtk_hbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); + gtk_widget_show (hbox); ecde->calendar = e_calendar_new (); gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (ecde->calendar)->calitem), @@ -249,7 +249,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde) vbox2 = gtk_vbox_new (FALSE, 2); gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0); - gtk_widget_show (vbox2); + gtk_widget_show (vbox2); ecde->time_entry = gtk_entry_new (); gtk_widget_set_size_request (ecde->time_entry, 50, -1); @@ -295,11 +295,11 @@ e_cell_date_edit_init (ECellDateEdit *ecde) gtk_container_set_border_width (GTK_CONTAINER (bbox), 4); gtk_box_set_spacing (GTK_BOX (bbox), 2); gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); - gtk_widget_show (bbox); + gtk_widget_show (bbox); now_button = gtk_button_new_with_label (_("Now")); gtk_container_add (GTK_CONTAINER (bbox), now_button); - gtk_widget_show (now_button); + gtk_widget_show (now_button); g_signal_connect((now_button), "clicked", G_CALLBACK (e_cell_date_edit_on_now_clicked), ecde); @@ -307,7 +307,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde) today_button = gtk_button_new_with_label (_("Today")); gtk_container_add (GTK_CONTAINER (bbox), today_button); - gtk_widget_show (today_button); + gtk_widget_show (today_button); g_signal_connect((today_button), "clicked", G_CALLBACK (e_cell_date_edit_on_today_clicked), ecde); @@ -316,7 +316,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde) /* Translators: "None" as a label of a button to unset date in a date table cell */ none_button = gtk_button_new_with_label (C_("table-date", "None")); gtk_container_add (GTK_CONTAINER (bbox), none_button); - gtk_widget_show (none_button); + gtk_widget_show (none_button); g_signal_connect((none_button), "clicked", G_CALLBACK (e_cell_date_edit_on_none_clicked), ecde); @@ -324,7 +324,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde) ok_button = gtk_button_new_with_label (_("OK")); gtk_container_add (GTK_CONTAINER (bbox), ok_button); - gtk_widget_show (ok_button); + gtk_widget_show (ok_button); g_signal_connect((ok_button), "clicked", G_CALLBACK (e_cell_date_edit_on_ok_clicked), ecde); diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c index 48547e037b..6710f60bd5 100644 --- a/widgets/table/e-cell-hbox.c +++ b/widgets/table/e-cell-hbox.c @@ -57,8 +57,8 @@ ecv_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view hbox_view->cell_view.ecell = ecell; hbox_view->cell_view.e_table_model = table_model; hbox_view->cell_view.e_table_item_view = e_table_item_view; - hbox_view->cell_view.kill_view_cb = NULL; - hbox_view->cell_view.kill_view_cb_data = NULL; + hbox_view->cell_view.kill_view_cb = NULL; + hbox_view->cell_view.kill_view_cb_data = NULL; /* create our subcell view */ hbox_view->subcell_view_count = ecv->subcell_count; @@ -84,11 +84,11 @@ ecv_kill_view (ECellView *ecv) ECellHboxView *hbox_view = (ECellHboxView *) ecv; gint i; - if (hbox_view->cell_view.kill_view_cb) - (hbox_view->cell_view.kill_view_cb)(ecv, hbox_view->cell_view.kill_view_cb_data); + if (hbox_view->cell_view.kill_view_cb) + (hbox_view->cell_view.kill_view_cb)(ecv, hbox_view->cell_view.kill_view_cb_data); - if (hbox_view->cell_view.kill_view_cb_data) - g_list_free (hbox_view->cell_view.kill_view_cb_data); + if (hbox_view->cell_view.kill_view_cb_data) + g_list_free (hbox_view->cell_view.kill_view_cb_data); /* kill our subcell view */ for (i = 0; i < hbox_view->subcell_view_count; i++) diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index e25cb2dc63..9687e7d392 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -87,11 +87,11 @@ pixbuf_kill_view (ECellView *ecell_view) ECellPixbufView *pixbuf_view = (ECellPixbufView *) ecell_view; if (pixbuf_view->cell_view.kill_view_cb) - pixbuf_view->cell_view.kill_view_cb ( - ecell_view, pixbuf_view->cell_view.kill_view_cb_data); + pixbuf_view->cell_view.kill_view_cb ( + ecell_view, pixbuf_view->cell_view.kill_view_cb_data); if (pixbuf_view->cell_view.kill_view_cb_data) - g_list_free (pixbuf_view->cell_view.kill_view_cb_data); + g_list_free (pixbuf_view->cell_view.kill_view_cb_data); g_free (pixbuf_view); } @@ -111,7 +111,7 @@ pixbuf_draw (ECellView *ecell_view, cairo_t *cr, /* we can't make sure we really got a pixbuf since, well, it's a Gdk thing */ if (x2 - x1 == 0) - return; + return; if (!cell_pixbuf) return; @@ -121,17 +121,17 @@ pixbuf_draw (ECellView *ecell_view, cairo_t *cr, /* We center the pixbuf within our allocated space */ if (x2 - x1 > pix_w) { - gint diff = (x2 - x1) - pix_w; - real_x = x1 + diff/2; + gint diff = (x2 - x1) - pix_w; + real_x = x1 + diff/2; } else { - real_x = x1; + real_x = x1; } if (y2 - y1 > pix_h) { - gint diff = (y2 - y1) - pix_h; - real_y = y1 + diff/2; + gint diff = (y2 - y1) - pix_h; + real_y = y1 + diff/2; } else { - real_y = y1; + real_y = y1; } cairo_save (cr); @@ -156,7 +156,7 @@ pixbuf_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) GdkPixbuf *pixbuf; if (row == -1) { if (e_table_model_row_count (ecell_view->e_table_model) > 0) { - row = 0; + row = 0; } else { return 6; } @@ -164,7 +164,7 @@ pixbuf_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) pixbuf = (GdkPixbuf *) e_table_model_value_at (ecell_view->e_table_model, 1, row); if (!pixbuf) - return 0; + return 0; /* We give ourselves 3 pixels of padding on either side */ return gdk_pixbuf_get_height (pixbuf) + 6; @@ -225,21 +225,21 @@ pixbuf_max_width (ECellView *ecell_view, gint model_col, gint view_col) gint max_width = -1; if (model_col == 0) { - num_rows = e_table_model_row_count (ecell_view->e_table_model); - - for (i = 0; i <= num_rows; i++) { - GdkPixbuf *pixbuf = (GdkPixbuf *) e_table_model_value_at - (ecell_view->e_table_model, - 1, - i); - if (!pixbuf) - continue; - pw = gdk_pixbuf_get_width (pixbuf); - if (max_width < pw) - max_width = pw; - } + num_rows = e_table_model_row_count (ecell_view->e_table_model); + + for (i = 0; i <= num_rows; i++) { + GdkPixbuf *pixbuf = (GdkPixbuf *) e_table_model_value_at + (ecell_view->e_table_model, + 1, + i); + if (!pixbuf) + continue; + pw = gdk_pixbuf_get_width (pixbuf); + if (max_width < pw) + max_width = pw; + } } else { - return -1; + return -1; } return max_width; diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index abfe61e206..334e6be77a 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -130,8 +130,8 @@ e_cell_popup_class_init (ECellPopupClass *class) ecc->get_bg_color = ecp_get_bg_color; gal_a11y_e_cell_registry_add_cell_type (NULL, - E_TYPE_CELL_POPUP, - gal_a11y_e_cell_popup_new); + E_TYPE_CELL_POPUP, + gal_a11y_e_cell_popup_new); } static void @@ -183,8 +183,8 @@ ecp_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view ecp_view->cell_view.ecell = ecell; ecp_view->cell_view.e_table_model = table_model; ecp_view->cell_view.e_table_item_view = e_table_item_view; - ecp_view->cell_view.kill_view_cb = NULL; - ecp_view->cell_view.kill_view_cb_data = NULL; + ecp_view->cell_view.kill_view_cb = NULL; + ecp_view->cell_view.kill_view_cb_data = NULL; ecp_view->child_view = e_cell_new_view (ecp->child, table_model, e_table_item_view); diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 245f894067..d79c826b5c 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -326,7 +326,7 @@ ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view text_view->cell_view.e_table_model = table_model; text_view->cell_view.e_table_item_view = e_table_item_view; text_view->cell_view.kill_view_cb = NULL; - text_view->cell_view.kill_view_cb_data = NULL; + text_view->cell_view.kill_view_cb_data = NULL; text_view->canvas = canvas; @@ -345,7 +345,7 @@ ect_kill_view (ECellView *ecv) ECellTextView *text_view = (ECellTextView *) ecv; if (text_view->cell_view.kill_view_cb) - (text_view->cell_view.kill_view_cb)(ecv, text_view->cell_view.kill_view_cb_data); + (text_view->cell_view.kill_view_cb)(ecv, text_view->cell_view.kill_view_cb_data); if (text_view->cell_view.kill_view_cb_data) g_list_free (text_view->cell_view.kill_view_cb_data); @@ -722,8 +722,8 @@ ect_draw (ECellView *ecell_view, cairo_t *cr, x_origin = x1 + ect->x + text_view->xofs - (edit ? edit->xofs_edit : 0); y_origin = y1 + ect->y + text_view->yofs - (edit ? edit->yofs_edit : 0); - cairo_rectangle (cr, x1, y1, x2 - x1, y2 - y1); - cairo_clip (cr); + cairo_rectangle (cr, x1, y1, x2 - x1, y2 - y1); + cairo_clip (cr); layout = generate_layout (text_view, model_col, view_col, row, x2 - x1); @@ -731,33 +731,33 @@ ect_draw (ECellView *ecell_view, cairo_t *cr, layout = layout_with_preedit (text_view, row, edit->text ? edit->text : "?", x2 - x1); } - cairo_move_to (cr, x_origin, y_origin); + cairo_move_to (cr, x_origin, y_origin); pango_cairo_show_layout (cr, layout); if (edit && edit->view_col == view_col && edit->row == row) { if (edit->selection_start != edit->selection_end) { cairo_region_t *clip_region; - gint indices[2]; - GtkStateType state; + gint indices[2]; + GtkStateType state; - state = edit->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE; + state = edit->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE; indices[0] = MIN (edit->selection_start, edit->selection_end); indices[1] = MAX (edit->selection_start, edit->selection_end); - clip_region = gdk_pango_layout_get_clip_region (layout, - x_origin, y_origin, - indices, 1); - gdk_cairo_region (cr, clip_region); - cairo_clip (cr); + clip_region = gdk_pango_layout_get_clip_region (layout, + x_origin, y_origin, + indices, 1); + gdk_cairo_region (cr, clip_region); + cairo_clip (cr); cairo_region_destroy (clip_region); - gdk_cairo_set_source_color (cr, &style->base[state]); - cairo_paint (cr); + gdk_cairo_set_source_color (cr, &style->base[state]); + cairo_paint (cr); - gdk_cairo_set_source_color (cr, &style->text[state]); - cairo_move_to (cr, x_origin, y_origin); - pango_cairo_show_layout (cr, layout); + gdk_cairo_set_source_color (cr, &style->text[state]); + cairo_move_to (cr, x_origin, y_origin); + pango_cairo_show_layout (cr, layout); } else { if (edit->show_cursor) { PangoRectangle strong_pos, weak_pos; diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index 1a4b00bb4c..e75c973d57 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -742,7 +742,7 @@ e_cell_tree_class_init (ECellTreeClass *class) ecc->max_width = ect_max_width; ecc->get_bg_color = ect_get_bg_color; - gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_TREE, gal_a11y_e_cell_tree_new); + gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_TREE, gal_a11y_e_cell_tree_new); } static void diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index 1e5875b2b1..5d0c5989a5 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -53,8 +53,8 @@ ecv_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view vbox_view->cell_view.ecell = ecell; vbox_view->cell_view.e_table_model = table_model; vbox_view->cell_view.e_table_item_view = e_table_item_view; - vbox_view->cell_view.kill_view_cb = NULL; - vbox_view->cell_view.kill_view_cb_data = NULL; + vbox_view->cell_view.kill_view_cb = NULL; + vbox_view->cell_view.kill_view_cb_data = NULL; /* create our subcell view */ vbox_view->subcell_view_count = ecv->subcell_count; @@ -78,11 +78,11 @@ ecv_kill_view (ECellView *ecv) ECellVboxView *vbox_view = (ECellVboxView *) ecv; gint i; - if (vbox_view->cell_view.kill_view_cb) + if (vbox_view->cell_view.kill_view_cb) (vbox_view->cell_view.kill_view_cb)(ecv, vbox_view->cell_view.kill_view_cb_data); - if (vbox_view->cell_view.kill_view_cb_data) - g_list_free (vbox_view->cell_view.kill_view_cb_data); + if (vbox_view->cell_view.kill_view_cb_data) + g_list_free (vbox_view->cell_view.kill_view_cb_data); /* kill our subcell view */ for (i = 0; i < vbox_view->subcell_view_count; i++) diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 91a77c83c5..dafd0b79fe 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -190,7 +190,7 @@ etfci_update (GnomeCanvasItem *item, x2 = etfci->width; y2 = etfci->height; - gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2); + gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2); if (item->x1 != x1 || item->y1 != y1 || diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index f9c12b2a9a..7f4352a6d5 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -1032,7 +1032,7 @@ etgc_reflow (GnomeCanvasItem *item, gint flags) ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (item); gboolean frozen; - g_object_get (etgc, + g_object_get (etgc, "frozen", &frozen, NULL); diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 0c56b59ea2..e6371b01b6 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -176,7 +176,7 @@ ethi_update (GnomeCanvasItem *item, gint flags) { ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item); - double x1, y1, x2, y2; + double x1, y1, x2, y2; if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update) GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update ( @@ -197,7 +197,7 @@ ethi_update (GnomeCanvasItem *item, x2 = ethi->width; y2 = ethi->height; - gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2); + gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2); if (item->x1 != x1 || item->y1 != y1 || diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 75a8f44d5d..f51c741127 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -439,7 +439,7 @@ eti_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdoubl *y2 = eti->height; gnome_canvas_item_i2c_matrix (GNOME_CANVAS_ITEM (eti), &i2c); - gnome_canvas_matrix_transform_rect (&i2c, x1, y1, x2, y2); + gnome_canvas_matrix_transform_rect (&i2c, x1, y1, x2, y2); } static void @@ -477,7 +477,7 @@ static void eti_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gint flags) { ETableItem *eti = E_TABLE_ITEM (item); - double x1, x2, y1, y2; + double x1, x2, y1, y2; if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->update) (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->update)(item, i2c, flags); @@ -1324,7 +1324,7 @@ eti_add_selection_model (ETableItem *eti, ESelectionModel *selection) G_CALLBACK (eti_cursor_activated), eti); eti_selection_change (selection, eti); - g_signal_emit_by_name (G_OBJECT (eti), + g_signal_emit_by_name (G_OBJECT (eti), "selection_model_added", eti->selection); } @@ -1640,7 +1640,7 @@ eti_realize (GnomeCanvasItem *item) GtkStyle *style; if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize) - (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item); + (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item); eti->rows = e_table_model_row_count (eti->table_model); @@ -1707,23 +1707,23 @@ eti_unrealize (GnomeCanvasItem *item) eti->height = 0; if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize) - (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)(item); + (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)(item); } static void eti_draw_grid_line (ETableItem *eti, cairo_t *cr, GtkStyle *style, gint x1, gint y1, gint x2, gint y2) { - cairo_save (cr); + cairo_save (cr); - cairo_set_line_width (cr, 1.0); - gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]); + cairo_set_line_width (cr, 1.0); + gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]); - cairo_move_to (cr, x1 + 0.5, y1 + 0.5); - cairo_line_to (cr, x2 + 0.5, y2 + 0.5); - cairo_stroke (cr); + cairo_move_to (cr, x1 + 0.5, y1 + 0.5); + cairo_line_to (cr, x2 + 0.5, y2 + 0.5); + cairo_stroke (cr); - cairo_restore (cr); + cairo_restore (cr); } static void @@ -1741,7 +1741,7 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h cairo_matrix_t i2c; gdouble eti_base_x, eti_base_y, lower_right_y, lower_right_x; GtkWidget *canvas = GTK_WIDGET (item->canvas); - GtkStyle *style = gtk_widget_get_style (canvas); + GtkStyle *style = gtk_widget_get_style (canvas); gint height_extra = eti->horizontal_draw_grid ? 1 : 0; /* @@ -1750,11 +1750,11 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h gnome_canvas_item_i2c_matrix (item, &i2c); eti_base_x = 0; eti_base_y = 0; - cairo_matrix_transform_point (&i2c, &eti_base_x, &eti_base_y); + cairo_matrix_transform_point (&i2c, &eti_base_x, &eti_base_y); lower_right_x = eti->width; lower_right_y = eti->height; - cairo_matrix_transform_point (&i2c, &lower_right_x, &lower_right_y); + cairo_matrix_transform_point (&i2c, &lower_right_x, &lower_right_y); /* * First column to draw, last column to draw @@ -2005,18 +2005,18 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h * Draw focus */ if (eti->draw_focus && f_found) { - static const double dash[] = { 1.0, 1.0 }; - cairo_set_line_width (cr, 1.0); - cairo_rectangle (cr, - f_x1 + 0.5, f_x2 + 0.5, - f_x2 - f_x1 - 1, f_y2 - f_y1); + static const double dash[] = { 1.0, 1.0 }; + cairo_set_line_width (cr, 1.0); + cairo_rectangle (cr, + f_x1 + 0.5, f_x2 + 0.5, + f_x2 - f_x1 - 1, f_y2 - f_y1); - gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]); - cairo_stroke_preserve (cr); + gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]); + cairo_stroke_preserve (cr); - cairo_set_dash (cr, dash, G_N_ELEMENTS (dash), 0.0); - gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]); - cairo_stroke (cr); + cairo_set_dash (cr, dash, G_N_ELEMENTS (dash), 0.0); + gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]); + cairo_stroke (cr); } } @@ -3239,7 +3239,7 @@ e_table_item_compute_location (ETableItem *eti, gint *col) { /* Save the grabbed row but make sure that we don't get flawed - results because the cursor is grabbed. */ + results because the cursor is grabbed. */ gint grabbed_row = eti->grabbed_row; eti->grabbed_row = -1; @@ -3264,7 +3264,7 @@ e_table_item_compute_mouse_over (ETableItem *eti, { gdouble realx, realy; /* Save the grabbed row but make sure that we don't get flawed - results because the cursor is grabbed. */ + results because the cursor is grabbed. */ gint grabbed_row = eti->grabbed_row; eti->grabbed_row = -1; diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 5028a48a6b..c7e955efba 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -1381,9 +1381,9 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h g_signal_connect ( G_OBJECT (e_table->click_to_add), "event", G_CALLBACK (click_to_add_event), e_table); - g_signal_connect ( + g_signal_connect ( G_OBJECT (e_table->click_to_add), "cursor_change", - G_CALLBACK (click_to_add_cursor_change), e_table); + G_CALLBACK (click_to_add_cursor_change), e_table); } } @@ -3269,8 +3269,8 @@ e_table_class_init (ETableClass *class) widget_class->grab_focus = et_grab_focus; widget_class->unrealize = et_unrealize; - widget_class->get_preferred_width = et_get_preferred_width; - widget_class->get_preferred_height = et_get_preferred_height; + widget_class->get_preferred_width = et_get_preferred_width; + widget_class->get_preferred_height = et_get_preferred_height; widget_class->focus = et_focus; diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index cc8a1fcd6a..cd438a77e2 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -501,7 +501,7 @@ static void etsm_invert_selection (ESelectionModel *selection) { ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (selection); - gint count = etsm_row_count (selection); + gint count = etsm_row_count (selection); gint i; for (i = 0; i < count; i++) { diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index d529a6e045..4ca80d97a0 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -116,10 +116,10 @@ lookup_gnode (ETreeTableAdapter *etta, ETreePath path) static void resize_map (ETreeTableAdapter *etta, gint size) { - if (size > etta->priv->n_vals_allocated) { - etta->priv->n_vals_allocated = MAX (etta->priv->n_vals_allocated + INCREMENT_AMOUNT, size); - etta->priv->map_table = g_renew (node_t *, etta->priv->map_table, etta->priv->n_vals_allocated); - } + if (size > etta->priv->n_vals_allocated) { + etta->priv->n_vals_allocated = MAX (etta->priv->n_vals_allocated + INCREMENT_AMOUNT, size); + etta->priv->map_table = g_renew (node_t *, etta->priv->map_table, etta->priv->n_vals_allocated); + } etta->priv->n_map = size; } diff --git a/widgets/table/gal-a11y-e-cell-toggle.c b/widgets/table/gal-a11y-e-cell-toggle.c index 660a0ebd9a..c57d7083e6 100644 --- a/widgets/table/gal-a11y-e-cell-toggle.c +++ b/widgets/table/gal-a11y-e-cell-toggle.c @@ -57,16 +57,16 @@ gal_a11y_e_cell_toggle_get_type (void) { static const GTypeInfo tinfo = { - sizeof (GalA11yECellToggleClass), - (GBaseInitFunc) NULL, /* base init */ - (GBaseFinalizeFunc) NULL, /* base finalize */ - (GClassInitFunc) gal_a11y_e_cell_toggle_class_init, /* class init */ - (GClassFinalizeFunc) NULL, /* class finalize */ - NULL, /* class data */ - sizeof (GalA11yECellToggle), /* instance size */ - 0, /* nb preallocs */ - NULL, /* instance init */ - NULL /* value table */ + sizeof (GalA11yECellToggleClass), + (GBaseInitFunc) NULL, /* base init */ + (GBaseFinalizeFunc) NULL, /* base finalize */ + (GClassInitFunc) gal_a11y_e_cell_toggle_class_init, /* class init */ + (GClassFinalizeFunc) NULL, /* class finalize */ + NULL, /* class data */ + sizeof (GalA11yECellToggle), /* instance size */ + 0, /* nb preallocs */ + NULL, /* instance init */ + NULL /* value table */ }; type = g_type_register_static (GAL_A11Y_TYPE_E_CELL, @@ -108,10 +108,10 @@ toggle_cell_action (GalA11yECell *cell) event.type = GDK_BUTTON_PRESS; event.window = gtk_layout_get_bin_window (layout); - event.button = 1; - event.send_event = TRUE; - event.time = GDK_CURRENT_TIME; - event.axes = NULL; + event.button = 1; + event.send_event = TRUE; + event.time = GDK_CURRENT_TIME; + event.axes = NULL; g_signal_emit_by_name (cell->item, "event", &event, &finished); } @@ -130,7 +130,7 @@ model_change_cb (ETableModel *etm, e_table_model_value_at (cell->cell_view->e_table_model, cell->model_col, cell->row)); /* Cheat gnopernicus, or it will ignore the state change signal */ - atk_focus_tracker_notify (ATK_OBJECT (cell)); + atk_focus_tracker_notify (ATK_OBJECT (cell)); if (value) gal_a11y_e_cell_add_state (cell, ATK_STATE_CHECKED, TRUE); @@ -160,13 +160,13 @@ gal_a11y_e_cell_toggle_new (ETableItem *item, toggle_cell = GAL_A11Y_E_CELL_TOGGLE (a11y); a11y->role = ATK_ROLE_TABLE_CELL; - gal_a11y_e_cell_construct (a11y, - item, - cell_view, - parent, - model_col, - view_col, - row); + gal_a11y_e_cell_construct (a11y, + item, + cell_view, + parent, + model_col, + view_col, + row); gal_a11y_e_cell_add_action (cell, "toggle", @@ -182,7 +182,7 @@ gal_a11y_e_cell_toggle_new (ETableItem *item, value = GPOINTER_TO_INT ( e_table_model_value_at (cell->cell_view->e_table_model, - cell->model_col, cell->row)); + cell->model_col, cell->row)); if (value) gal_a11y_e_cell_add_state (cell, ATK_STATE_CHECKED, FALSE); else diff --git a/widgets/table/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c index 1a95c46a90..ee06f6e025 100644 --- a/widgets/table/gal-a11y-e-cell-tree.c +++ b/widgets/table/gal-a11y-e-cell-tree.c @@ -69,28 +69,28 @@ static void kill_view_cb (ECellView *subcell_view, gpointer psubcell_a11ies) { - GList *node; + GList *node; GList *subcell_a11ies = (GList *) psubcell_a11ies; - GalA11yECell *subcell; + GalA11yECell *subcell; - for (node = subcell_a11ies; node != NULL; node = g_list_next (node)) - { - subcell = GAL_A11Y_E_CELL (node->data); - if (subcell && subcell->cell_view == subcell_view) - { + for (node = subcell_a11ies; node != NULL; node = g_list_next (node)) + { + subcell = GAL_A11Y_E_CELL (node->data); + if (subcell && subcell->cell_view == subcell_view) + { d(fprintf(stderr, "subcell_view %p deleted before the a11y object %p\n", subcell_view, subcell)); - subcell->cell_view = NULL; - } - } + subcell->cell_view = NULL; + } + } } static void ectr_subcell_weak_ref (GalA11yECellTree *a11y, GalA11yECell *subcell_a11y) { - ECellView *subcell_view = subcell_a11y ? subcell_a11y->cell_view : NULL; - if (subcell_a11y && subcell_view && subcell_view->kill_view_cb_data) - subcell_view->kill_view_cb_data = g_list_remove (subcell_view->kill_view_cb_data, subcell_a11y); + ECellView *subcell_view = subcell_a11y ? subcell_a11y->cell_view : NULL; + if (subcell_a11y && subcell_view && subcell_view->kill_view_cb_data) + subcell_view->kill_view_cb_data = g_list_remove (subcell_view->kill_view_cb_data, subcell_a11y); g_signal_handler_disconnect (GAL_A11Y_E_CELL (a11y)->item->table_model, a11y->model_row_changed_id); @@ -102,11 +102,11 @@ ectr_do_action_expand (AtkAction *action) { GalA11yECell *a11y; ETableModel *table_model; - ETreePath node; + ETreePath node; ETreeModel *tree_model; - ETreeTableAdapter *tree_table_adapter; + ETreeTableAdapter *tree_table_adapter; - a11y = GAL_A11Y_E_CELL (action); + a11y = GAL_A11Y_E_CELL (action); table_model = a11y->item->table_model; node = e_table_model_value_at (table_model, -1, a11y->row); tree_model = e_table_model_value_at (table_model, -2, a11y->row); @@ -125,15 +125,15 @@ ectr_do_action_collapse (AtkAction *action) { GalA11yECell *a11y; ETableModel *table_model; - ETreePath node; + ETreePath node; ETreeModel *tree_model; - ETreeTableAdapter *tree_table_adapter; + ETreeTableAdapter *tree_table_adapter; - a11y = GAL_A11Y_E_CELL (action); + a11y = GAL_A11Y_E_CELL (action); table_model = a11y->item->table_model; - node = e_table_model_value_at (table_model, -1, a11y->row); + node = e_table_model_value_at (table_model, -1, a11y->row); tree_model = e_table_model_value_at (table_model, -2, a11y->row); - tree_table_adapter = e_table_model_value_at (table_model, -3, a11y->row); + tree_table_adapter = e_table_model_value_at (table_model, -3, a11y->row); if (e_tree_model_node_is_expandable (tree_model, node)) { e_tree_table_adapter_node_set_expanded (tree_table_adapter, @@ -191,9 +191,9 @@ gal_a11y_e_cell_tree_new (ETableItem *item, AtkObject *subcell_a11y; GalA11yECellTree *a11y; - ETreePath node; - ETreeModel *tree_model; - ETreeTableAdapter *tree_table_adapter; + ETreePath node; + ETreeModel *tree_model; + ETreeTableAdapter *tree_table_adapter; ECellView *subcell_view; subcell_view = e_cell_tree_view_get_subcell_view (cell_view); @@ -249,12 +249,12 @@ gal_a11y_e_cell_tree_new (ETableItem *item, G_CALLBACK (ectr_model_row_changed_cb), subcell_a11y); - if (subcell_a11y && subcell_view) - { - subcell_view->kill_view_cb = kill_view_cb; - if (!g_list_find (subcell_view->kill_view_cb_data, subcell_a11y)) - subcell_view->kill_view_cb_data = g_list_append (subcell_view->kill_view_cb_data, subcell_a11y); - } + if (subcell_a11y && subcell_view) + { + subcell_view->kill_view_cb = kill_view_cb; + if (!g_list_find (subcell_view->kill_view_cb_data, subcell_a11y)) + subcell_view->kill_view_cb_data = g_list_append (subcell_view->kill_view_cb_data, subcell_a11y); + } g_object_weak_ref (G_OBJECT (subcell_a11y), (GWeakNotify) ectr_subcell_weak_ref, a11y); diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c index 65a1fe9759..17f9b8f166 100644 --- a/widgets/table/gal-a11y-e-cell.c +++ b/widgets/table/gal-a11y-e-cell.c @@ -105,7 +105,7 @@ static G_CONST_RETURN gchar * gal_a11y_e_cell_get_name (AtkObject * a11y) { GalA11yECell *cell = GAL_A11Y_E_CELL (a11y); - ETableCol *ecol; + ETableCol *ecol; if (a11y->name != NULL && strcmp (a11y->name, "")) return a11y->name; diff --git a/widgets/table/gal-a11y-e-table-click-to-add-factory.c b/widgets/table/gal-a11y-e-table-click-to-add-factory.c index e13e6599b4..9c9390a9c2 100644 --- a/widgets/table/gal-a11y-e-table-click-to-add-factory.c +++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.c @@ -40,7 +40,7 @@ static AtkObjectFactoryClass *parent_class; static GType gal_a11y_e_table_click_to_add_factory_get_accessible_type (void) { - return GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD; + return GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD; } static AtkObject* diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c index 05f145f6ed..1b7ce531e2 100644 --- a/widgets/table/gal-a11y-e-table-click-to-add.c +++ b/widgets/table/gal-a11y-e-table-click-to-add.c @@ -188,9 +188,9 @@ etcta_class_init (GalA11yETableClickToAddClass *class) parent_class = g_type_class_ref (PARENT_TYPE); atk_object_class->get_name = etcta_get_name; - atk_object_class->get_n_children = etcta_get_n_children; - atk_object_class->ref_child = etcta_ref_child; - atk_object_class->ref_state_set = etcta_ref_state_set; + atk_object_class->get_n_children = etcta_get_n_children; + atk_object_class->ref_child = etcta_ref_child; + atk_object_class->ref_state_set = etcta_ref_state_set; } static void @@ -234,14 +234,14 @@ gal_a11y_e_table_click_to_add_get_type (void) NULL }; - factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM); + factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM); parent_type = atk_object_factory_get_accessible_type (factory); - type = gal_a11y_type_register_static_with_private (PARENT_TYPE, + type = gal_a11y_type_register_static_with_private (PARENT_TYPE, "GalA11yETableClickToAdd", &info, 0, sizeof (GalA11yETableClickToAddPrivate), &priv_offset); - g_type_add_interface_static (type, ATK_TYPE_ACTION, &atk_action_info); + g_type_add_interface_static (type, ATK_TYPE_ACTION, &atk_action_info); } @@ -251,7 +251,7 @@ gal_a11y_e_table_click_to_add_get_type (void) static gboolean etcta_event (GnomeCanvasItem *item, GdkEvent *e, gpointer data) { - ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item); + ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item); GalA11yETableClickToAdd *a11y; GalA11yETableClickToAddPrivate *priv; diff --git a/widgets/table/gal-a11y-e-table-factory.c b/widgets/table/gal-a11y-e-table-factory.c index face3ad06b..5d9c4bbdb8 100644 --- a/widgets/table/gal-a11y-e-table-factory.c +++ b/widgets/table/gal-a11y-e-table-factory.c @@ -34,7 +34,7 @@ static AtkObjectFactoryClass *parent_class; static GType gal_a11y_e_table_factory_get_accessible_type (void) { - return GAL_A11Y_TYPE_E_TABLE; + return GAL_A11Y_TYPE_E_TABLE; } static AtkObject* diff --git a/widgets/table/gal-a11y-e-table-item-factory.c b/widgets/table/gal-a11y-e-table-item-factory.c index c987b0068a..fb1b3a9966 100644 --- a/widgets/table/gal-a11y-e-table-item-factory.c +++ b/widgets/table/gal-a11y-e-table-item-factory.c @@ -40,7 +40,7 @@ static AtkObjectFactoryClass *parent_class; static GType gal_a11y_e_table_item_factory_get_accessible_type (void) { - return GAL_A11Y_TYPE_E_TABLE_ITEM; + return GAL_A11Y_TYPE_E_TABLE_ITEM; } static AtkObject* diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c index 218265ecdd..eb0c9be127 100644 --- a/widgets/table/gal-a11y-e-table-item.c +++ b/widgets/table/gal-a11y-e-table-item.c @@ -87,9 +87,9 @@ eti_ref_state_set (AtkObject *accessible) { GalA11yETableItemPrivate *priv = GET_PRIVATE (accessible); - g_object_ref (priv->state_set); + g_object_ref (priv->state_set); - return priv->state_set; + return priv->state_set; } inline static gint @@ -329,10 +329,10 @@ cell_destroyed (gpointer data) g_return_if_fail (cell->item && G_IS_OBJECT (cell->item)); - if (cell->item) { - g_object_unref (cell->item); - cell->item = NULL; - } + if (cell->item) { + g_object_unref (cell->item); + cell->item = NULL; + } } @@ -693,7 +693,7 @@ eti_rows_inserted (ETableModel * model, gint row, gint count, g_return_if_fail (table_item); item_a11y = GAL_A11Y_E_TABLE_ITEM (table_item); - n_cols = atk_table_get_n_columns (ATK_TABLE (table_item)); + n_cols = atk_table_get_n_columns (ATK_TABLE (table_item)); n_rows = atk_table_get_n_rows (ATK_TABLE (table_item)); old_nrows = GET_PRIVATE (item_a11y)->rows; @@ -706,13 +706,13 @@ eti_rows_inserted (ETableModel * model, gint row, gint count, g_signal_emit_by_name (table_item, "row-inserted", row, count, NULL); - for (i = row; i < (row + count); i++) { - for (j = 0; j < n_cols; j++) { + for (i = row; i < (row + count); i++) { + for (j = 0; j < n_cols; j++) { g_signal_emit_by_name (table_item, "children_changed::add", - ( ((i + 1)*n_cols) + j), NULL, NULL); + ( ((i + 1)*n_cols) + j), NULL, NULL); } - } + } g_signal_emit_by_name (table_item, "visible-data-changed"); } @@ -727,7 +727,7 @@ eti_rows_deleted (ETableModel * model, gint row, gint count, ATK_GOBJECT_ACCESSIBLE (table_item))); n_rows = atk_table_get_n_rows (ATK_TABLE (table_item)); - n_cols = atk_table_get_n_columns (ATK_TABLE (table_item)); + n_cols = atk_table_get_n_columns (ATK_TABLE (table_item)); old_nrows = GET_PRIVATE (table_item)->rows; @@ -738,13 +738,13 @@ eti_rows_deleted (ETableModel * model, gint row, gint count, g_signal_emit_by_name (table_item, "row-deleted", row, count, NULL); - for (i = row; i < (row + count); i++) { - for (j = 0; j < n_cols; j++) { + for (i = row; i < (row + count); i++) { + for (j = 0; j < n_cols; j++) { g_signal_emit_by_name (table_item, "children_changed::remove", - ( ((i + 1)*n_cols) + j), NULL, NULL); + ( ((i + 1)*n_cols) + j), NULL, NULL); } - } + } g_signal_emit_by_name (table_item, "visible-data-changed"); eti_a11y_reset_focus_object ((GalA11yETableItem *)table_item, item, TRUE); } @@ -781,67 +781,67 @@ static void eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) { - gboolean reorder_found=FALSE, added_found=FALSE, removed_found=FALSE; - GalA11yETableItem * a11y_item; - ETableCol ** cols, **prev_cols; - GalA11yETableItemPrivate *priv; - gint *state = NULL, *prev_state = NULL, *reorder = NULL; - gint i,j,n_rows,n_cols, prev_n_cols; + gboolean reorder_found=FALSE, added_found=FALSE, removed_found=FALSE; + GalA11yETableItem * a11y_item; + ETableCol ** cols, **prev_cols; + GalA11yETableItemPrivate *priv; + gint *state = NULL, *prev_state = NULL, *reorder = NULL; + gint i,j,n_rows,n_cols, prev_n_cols; - a11y_item = GAL_A11Y_E_TABLE_ITEM (a11y); - priv = GET_PRIVATE (a11y_item); + a11y_item = GAL_A11Y_E_TABLE_ITEM (a11y); + priv = GET_PRIVATE (a11y_item); /* Assume rows do not changed. */ - n_rows = priv->rows; + n_rows = priv->rows; - prev_n_cols = priv->cols; - prev_cols = priv->columns; + prev_n_cols = priv->cols; + prev_cols = priv->columns; - cols = e_table_header_get_columns (eth); + cols = e_table_header_get_columns (eth); n_cols = eth->col_count; - g_return_if_fail (cols && prev_cols && n_cols > 0); + g_return_if_fail (cols && prev_cols && n_cols > 0); /* Init to ETI_HEADER_UNCHANGED. */ - state = g_malloc0 (sizeof (gint) * n_cols); - prev_state = g_malloc0 (sizeof (gint) * prev_n_cols); - reorder = g_malloc0 (sizeof (gint) * n_cols); + state = g_malloc0 (sizeof (gint) * n_cols); + prev_state = g_malloc0 (sizeof (gint) * prev_n_cols); + reorder = g_malloc0 (sizeof (gint) * n_cols); /* Compare with previously saved column headers. */ - for (i = 0; i < n_cols && cols[i]; i++) { - for (j = 0; j < prev_n_cols && prev_cols[j]; j++) { - if (prev_cols[j] == cols[i] && i != j) { + for (i = 0; i < n_cols && cols[i]; i++) { + for (j = 0; j < prev_n_cols && prev_cols[j]; j++) { + if (prev_cols[j] == cols[i] && i != j) { - reorder_found = TRUE; - state[i] = ETI_HEADER_REORDERED; + reorder_found = TRUE; + state[i] = ETI_HEADER_REORDERED; reorder[i] = j; - break; - } else if (prev_cols[j] == cols[i]) { + break; + } else if (prev_cols[j] == cols[i]) { /* OK, this column is not changed. */ - break; - } - } + break; + } + } /* cols[i] is new added column. */ - if (j == prev_n_cols) { + if (j == prev_n_cols) { added_found = TRUE; - state[i] = ETI_HEADER_NEW_ADDED; - } - } + state[i] = ETI_HEADER_NEW_ADDED; + } + } /* Now try to find if there are removed columns. */ - for (i = 0; i < prev_n_cols && prev_cols[i]; i++) { - for (j = 0; j < n_cols && cols[j]; j++) - if (prev_cols[j] == cols[i]) + for (i = 0; i < prev_n_cols && prev_cols[i]; i++) { + for (j = 0; j < n_cols && cols[j]; j++) + if (prev_cols[j] == cols[i]) break; /* Removed columns found. */ - if (j == n_cols) { + if (j == n_cols) { removed_found = TRUE; prev_state[j] = ETI_HEADER_REMOVED; - } - } + } + } /* If nothing interesting just return. */ if (!reorder_found && !added_found && !removed_found) @@ -1064,9 +1064,9 @@ gal_a11y_e_table_item_new (ETableItem *item) GET_PRIVATE (a11y)->cols = item->cols; GET_PRIVATE (a11y)->rows = item->rows; - GET_PRIVATE (a11y)->columns = e_table_header_get_columns (item->header); - if ( GET_PRIVATE (a11y)->columns == NULL) - return NULL; + GET_PRIVATE (a11y)->columns = e_table_header_get_columns (item->header); + if ( GET_PRIVATE (a11y)->columns == NULL) + return NULL; if (item) { g_signal_connect (G_OBJECT(item), "selection_model_removed", diff --git a/widgets/table/gal-a11y-e-tree-factory.c b/widgets/table/gal-a11y-e-tree-factory.c index cf864ca283..8d1951580d 100644 --- a/widgets/table/gal-a11y-e-tree-factory.c +++ b/widgets/table/gal-a11y-e-tree-factory.c @@ -33,7 +33,7 @@ static AtkObjectFactoryClass *parent_class; static GType gal_a11y_e_tree_factory_get_accessible_type (void) { - return GAL_A11Y_TYPE_E_TREE; + return GAL_A11Y_TYPE_E_TREE; } static AtkObject* diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c index 04572d9cce..8adbace707 100644 --- a/widgets/text/e-reflow.c +++ b/widgets/text/e-reflow.c @@ -1252,12 +1252,12 @@ e_reflow_draw (GnomeCanvasItem *item, if (running_width > x + width) break; x_rect = running_width; - cairo_rectangle (cr, + cairo_rectangle (cr, x_rect - x, y_rect - y, width_rect - 1, height_rect - 1); - cairo_fill (cr); + cairo_fill (cr); running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH; } cairo_restore (cr); @@ -1358,7 +1358,7 @@ static GnomeCanvasItem * e_reflow_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy) { - GnomeCanvasItem *child; + GnomeCanvasItem *child; if (GNOME_CANVAS_ITEM_CLASS (e_reflow_parent_class)->point) child = GNOME_CANVAS_ITEM_CLASS (e_reflow_parent_class)->point (item, x, y, cx, cy); diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index edd0a74fcc..5277031a06 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -766,7 +766,7 @@ e_text_set_property (GObject *object, needs_update = 1; break; - case PROP_FILL_COLOR: + case PROP_FILL_COLOR: if (g_value_get_string (value)) gdk_color_parse (g_value_get_string (value), &color); @@ -792,7 +792,7 @@ e_text_set_property (GObject *object, needs_update = 1; break; - case PROP_FILL_COLOR_RGBA: + case PROP_FILL_COLOR_RGBA: text->rgba = g_value_get_uint (value); color.red = ((text->rgba >> 24) & 0xff) * 0x101; color.green = ((text->rgba >> 16) & 0xff) * 0x101; @@ -1306,11 +1306,11 @@ e_text_draw (GnomeCanvasItem *item, cairo_t *cr, if (text->draw_background || text->draw_button) { gdk_cairo_set_source_color (cr, &style->fg[state]); } else { - cairo_set_source_rgba (cr, - ((text->rgba >> 24) & 0xff) / 255.0, - ((text->rgba >> 16) & 0xff) / 255.0, - ((text->rgba >> 8) & 0xff) / 255.0, - ( text->rgba & 0xff) / 255.0); + cairo_set_source_rgba (cr, + ((text->rgba >> 24) & 0xff) / 255.0, + ((text->rgba >> 16) & 0xff) / 255.0, + ((text->rgba >> 8) & 0xff) / 255.0, + ( text->rgba & 0xff) / 255.0); } if (text->draw_borders || text->draw_background) { diff --git a/widgets/text/gal-a11y-e-text-factory.c b/widgets/text/gal-a11y-e-text-factory.c index d68e2ce549..0c933c2245 100644 --- a/widgets/text/gal-a11y-e-text-factory.c +++ b/widgets/text/gal-a11y-e-text-factory.c @@ -33,7 +33,7 @@ static AtkObjectFactoryClass *parent_class; static GType gal_a11y_e_text_factory_get_accessible_type (void) { - return GAL_A11Y_TYPE_E_TEXT; + return GAL_A11Y_TYPE_E_TEXT; } static AtkObject* diff --git a/widgets/text/gal-a11y-e-text.c b/widgets/text/gal-a11y-e-text.c index 45bd9341ec..75e3307373 100644 --- a/widgets/text/gal-a11y-e-text.c +++ b/widgets/text/gal-a11y-e-text.c @@ -121,14 +121,14 @@ et_get_text (AtkText *text, gint start_offset, gint end_offset) { - gint start, end, real_start, real_end, len; + gint start, end, real_start, real_end, len; const gchar *full_text = et_get_full_text (text); - if (full_text == NULL) - return NULL; - len = g_utf8_strlen (full_text, -1); + if (full_text == NULL) + return NULL; + len = g_utf8_strlen (full_text, -1); - start = MIN (MAX (0, start_offset), len); - end = MIN (MAX (-1, end_offset), len); + start = MIN (MAX (0, start_offset), len); + end = MIN (MAX (-1, end_offset), len); if (end_offset == -1) end = strlen (full_text); @@ -236,23 +236,23 @@ find_sentence_end (const gchar *text, gint begin_offset, gint step) { - gint offset; - gchar *at_offset; - gunichar previous; - gint len; - - offset = begin_offset; - len = g_utf8_strlen (text, -1); - - while (offset > 0 && offset < len) { - at_offset = g_utf8_offset_to_pointer (text, offset - 1); - previous = g_utf8_get_char_validated (at_offset, -1); - if (previous == '.' || previous == '!' || previous == '?') - break; - offset += step; - } - - return offset; + gint offset; + gchar *at_offset; + gunichar previous; + gint len; + + offset = begin_offset; + len = g_utf8_strlen (text, -1); + + while (offset > 0 && offset < len) { + at_offset = g_utf8_offset_to_pointer (text, offset - 1); + previous = g_utf8_get_char_validated (at_offset, -1); + if (previous == '.' || previous == '!' || previous == '?') + break; + offset += step; + } + + return offset; } static gint @@ -260,23 +260,23 @@ find_line_start (const gchar *text, gint begin_offset, gint step) { - gint offset; - gchar *at_offset; - gunichar previous; - gint len; - - offset = begin_offset; - len = g_utf8_strlen (text, -1); - - while (offset > 0 && offset < len) { - at_offset = g_utf8_offset_to_pointer (text, offset - 1); - previous = g_utf8_get_char_validated (at_offset, -1); - if (previous == '\n' || previous == '\r') - break; - offset += step; - } - - return offset; + gint offset; + gchar *at_offset; + gunichar previous; + gint len; + + offset = begin_offset; + len = g_utf8_strlen (text, -1); + + while (offset > 0 && offset < len) { + at_offset = g_utf8_offset_to_pointer (text, offset - 1); + previous = g_utf8_get_char_validated (at_offset, -1); + if (previous == '\n' || previous == '\r') + break; + offset += step; + } + + return offset; } static gint @@ -284,23 +284,23 @@ find_line_end (const gchar *text, gint begin_offset, gint step) { - gint offset; - gchar *at_offset; - gunichar current; - gint len; - - offset = begin_offset; - len = g_utf8_strlen (text, -1); - - while (offset >= 0 && offset < len) { - at_offset = g_utf8_offset_to_pointer (text, offset); - current = g_utf8_get_char_validated (at_offset, -1); - if (current == '\n' || current == '\r') - break; - offset += step; - } - - return offset; + gint offset; + gchar *at_offset; + gunichar current; + gint len; + + offset = begin_offset; + len = g_utf8_strlen (text, -1); + + while (offset >= 0 && offset < len) { + at_offset = g_utf8_offset_to_pointer (text, offset); + current = g_utf8_get_char_validated (at_offset, -1); + if (current == '\n' || current == '\r') + break; + offset += step; + } + + return offset; } static gchar * @@ -310,9 +310,9 @@ et_get_text_after_offset (AtkText *text, gint *start_offset, gint *end_offset) { - gint start, end, len; - const gchar *full_text = et_get_full_text (text); - g_return_val_if_fail (full_text, NULL); + gint start, end, len; + const gchar *full_text = et_get_full_text (text); + g_return_val_if_fail (full_text, NULL); switch (boundary_type) { @@ -364,8 +364,8 @@ et_get_text_at_offset (AtkText *text, gint *end_offset) { gint start, end, len; - const gchar *full_text = et_get_full_text (text); - g_return_val_if_fail (full_text, NULL); + const gchar *full_text = et_get_full_text (text); + g_return_val_if_fail (full_text, NULL); switch (boundary_type) { @@ -383,19 +383,19 @@ et_get_text_at_offset (AtkText *text, break; case ATK_TEXT_BOUNDARY_SENTENCE_START: start = find_sentence_start (full_text, offset - 1, -1); - end = find_sentence_start (full_text, offset, 1); + end = find_sentence_start (full_text, offset, 1); break; case ATK_TEXT_BOUNDARY_SENTENCE_END: start = find_sentence_end (full_text, offset, -1); - end = find_sentence_end (full_text, offset + 1, 1); + end = find_sentence_end (full_text, offset + 1, 1); break; case ATK_TEXT_BOUNDARY_LINE_START: start = find_line_start (full_text, offset - 1, -1); - end = find_line_start (full_text, offset, 1); + end = find_line_start (full_text, offset, 1); break; case ATK_TEXT_BOUNDARY_LINE_END: start = find_line_end (full_text, offset, -1); - end = find_line_end (full_text, offset + 1, 1); + end = find_line_end (full_text, offset + 1, 1); break; default: return NULL; @@ -427,9 +427,9 @@ et_get_text_before_offset (AtkText *text, gint *start_offset, gint *end_offset) { - gint start, end, len; - const gchar *full_text = et_get_full_text (text); - g_return_val_if_fail (full_text, NULL); + gint start, end, len; + const gchar *full_text = et_get_full_text (text); + g_return_val_if_fail (full_text, NULL); switch (boundary_type) { @@ -451,15 +451,15 @@ et_get_text_before_offset (AtkText *text, break; case ATK_TEXT_BOUNDARY_SENTENCE_END: end = find_sentence_end (full_text, offset, -1); - start = find_sentence_end (full_text, end - 1, -1); + start = find_sentence_end (full_text, end - 1, -1); break; case ATK_TEXT_BOUNDARY_LINE_START: end = find_line_start (full_text, offset, -1); - start = find_line_start (full_text, end - 1, -1); + start = find_line_start (full_text, end - 1, -1); break; case ATK_TEXT_BOUNDARY_LINE_END: end = find_line_end (full_text, offset, -1); - start = find_line_end (full_text, end - 1, -1); + start = find_line_end (full_text, end - 1, -1); break; default: return NULL; @@ -518,24 +518,24 @@ et_get_character_extents (AtkText *text, gint *height, AtkCoordType coords) { - GObject *obj; - EText *etext; - GnomeCanvas *canvas; - gint x_widget, y_widget, x_window, y_window; - GdkWindow *window; - GtkWidget *widget; + GObject *obj; + EText *etext; + GnomeCanvas *canvas; + gint x_widget, y_widget, x_window, y_window; + GdkWindow *window; + GtkWidget *widget; PangoRectangle pango_pos; - g_return_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text)); - obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)); - if (obj == NULL) - return; - g_return_if_fail (E_IS_TEXT (obj)); - etext = E_TEXT (obj); - canvas = GNOME_CANVAS_ITEM (etext)->canvas; - widget = GTK_WIDGET (canvas); - window = gtk_widget_get_window (widget); - gdk_window_get_origin (window, &x_widget, &y_widget); + g_return_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text)); + obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)); + if (obj == NULL) + return; + g_return_if_fail (E_IS_TEXT (obj)); + etext = E_TEXT (obj); + canvas = GNOME_CANVAS_ITEM (etext)->canvas; + widget = GTK_WIDGET (canvas); + window = gtk_widget_get_window (widget); + gdk_window_get_origin (window, &x_widget, &y_widget); pango_layout_index_to_pos (etext->layout, offset, &pango_pos); pango_pos.x = PANGO_PIXELS (pango_pos.x); @@ -549,18 +549,18 @@ et_get_character_extents (AtkText *text, *width = pango_pos.width; *height = pango_pos.height; - if (etext->draw_borders) { + if (etext->draw_borders) { *x += 3; /*BORDER_INDENT;*/ *y += 3; /*BORDER_INDENT;*/ - } + } *x += etext->xofs; *y += etext->yofs; - if (etext->editing) { + if (etext->editing) { *x -= etext->xofs_edit; *y -= etext->yofs_edit; - } + } *x += etext->cx; *y += etext->cy; @@ -595,23 +595,23 @@ et_get_offset_at_point (AtkText *text, gint y, AtkCoordType coords) { - GObject *obj; - EText *etext; - GnomeCanvas *canvas; + GObject *obj; + EText *etext; + GnomeCanvas *canvas; gint x_widget, y_widget, x_window, y_window; GdkWindow *window; - GtkWidget *widget; - gint index; - gint trailing; - - g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), -1); - obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)); - if (obj == NULL) - return -1; - g_return_val_if_fail (E_IS_TEXT (obj), -1); - etext = E_TEXT (obj); - canvas = GNOME_CANVAS_ITEM (etext)->canvas; - widget = GTK_WIDGET (canvas); + GtkWidget *widget; + gint index; + gint trailing; + + g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), -1); + obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)); + if (obj == NULL) + return -1; + g_return_val_if_fail (E_IS_TEXT (obj), -1); + etext = E_TEXT (obj); + canvas = GNOME_CANVAS_ITEM (etext)->canvas; + widget = GTK_WIDGET (canvas); window = gtk_widget_get_window (widget); gdk_window_get_origin (window, &x_widget, &y_widget); @@ -628,29 +628,29 @@ et_get_offset_at_point (AtkText *text, else return -1; - if (etext->draw_borders) { - x -= 3; /*BORDER_INDENT;*/ - y -= 3; /*BORDER_INDENT;*/ - } + if (etext->draw_borders) { + x -= 3; /*BORDER_INDENT;*/ + y -= 3; /*BORDER_INDENT;*/ + } - x -= etext->xofs; - y -= etext->yofs; + x -= etext->xofs; + y -= etext->yofs; - if (etext->editing) { - x += etext->xofs_edit; - y += etext->yofs_edit; - } + if (etext->editing) { + x += etext->xofs_edit; + y += etext->yofs_edit; + } - x -= etext->cx; - y -= etext->cy; + x -= etext->cx; + y -= etext->cy; - pango_layout_xy_to_index (etext->layout, + pango_layout_xy_to_index (etext->layout, x * PANGO_SCALE - PANGO_SCALE / 2, y * PANGO_SCALE - PANGO_SCALE / 2, &index, &trailing); - return g_utf8_pointer_to_offset (etext->text, etext->text + index + trailing); + return g_utf8_pointer_to_offset (etext->text, etext->text + index + trailing); } static gint @@ -772,8 +772,8 @@ et_set_selection (AtkText *text, return FALSE; g_return_val_if_fail (E_IS_TEXT (obj), FALSE); if (selection_num == 0) - return et_add_selection (text, start_offset, end_offset); - return FALSE; + return et_add_selection (text, start_offset, end_offset); + return FALSE; } static gboolean |