diff options
207 files changed, 1717 insertions, 1592 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index 6850797cb0..cec35aad47 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -322,9 +322,9 @@ extract_info (EContactEditorFullname *editor) editor->name = name; } - name->prefixes = extract_field (editor, "comboentry-title"); - name->given = extract_field (editor, "entry-first"); + name->prefixes = extract_field (editor, "comboentry-title"); + name->given = extract_field (editor, "entry-first"); name->additional = extract_field (editor, "entry-middle"); - name->family = extract_field (editor, "entry-last"); - name->suffixes = extract_field (editor, "comboentry-suffix"); + name->family = extract_field (editor, "entry-last"); + name->suffixes = extract_field (editor, "comboentry-suffix"); } diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 7f3aaa17b6..aa02ab0eb6 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -1369,7 +1369,7 @@ set_arrow_image (EContactEditor *editor, { GtkWidget *arrow; - arrow = e_builder_get_widget (editor->priv->builder, arrow_widget); + arrow = e_builder_get_widget (editor->priv->builder, arrow_widget); if (expanded) gtk_arrow_set ( GTK_ARROW (arrow), GTK_ARROW_DOWN, GTK_SHADOW_NONE); @@ -2432,10 +2432,10 @@ extract_address_record (EContactEditor *editor, extract_address_textview (editor, record, address); address->locality = extract_address_field (editor, record, "city"); - address->region = extract_address_field (editor, record, "state"); - address->code = extract_address_field (editor, record, "zip"); - address->country = extract_address_field (editor, record, "country"); - address->po = extract_address_field (editor, record, "pobox"); + address->region = extract_address_field (editor, record, "state"); + address->code = extract_address_field (editor, record, "zip"); + address->country = extract_address_field (editor, record, "country"); + address->po = extract_address_field (editor, record, "pobox"); if (!STRING_IS_EMPTY (address->street) || !STRING_IS_EMPTY (address->ext) || @@ -2695,7 +2695,7 @@ fill_in_simple_field (EContactEditor *editor, } else if (GTK_IS_TEXT_VIEW (widget)) { GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)); - gchar *text = e_contact_get (contact, field_id); + gchar *text = e_contact_get (contact, field_id); gtk_text_buffer_set_text (buffer, STRING_MAKE_NON_NULL (text), -1); g_free (text); @@ -2830,7 +2830,7 @@ extract_simple_field (EContactEditor *editor, g_free (text); } else if (E_IS_URL_ENTRY (widget)) { - const gchar *text = gtk_entry_get_text (GTK_ENTRY (widget)); + const gchar *text = gtk_entry_get_text (GTK_ENTRY (widget)); e_contact_set (contact, field_id, (gchar *) text); } else if (E_IS_DATE_EDIT (widget)) { @@ -4177,8 +4177,8 @@ expand_mail_toggle (EContactEditor *ce) static void contact_editor_focus_widget_changed_cb (EFocusTracker *focus_tracker, - GParamSpec *param, - EContactEditor *editor) + GParamSpec *param, + EContactEditor *editor) { GtkWidget *widget; @@ -4350,7 +4350,8 @@ e_contact_editor_constructed (GObject *object) GTK_WINDOW (editor->priv->app), gtk_ui_manager_get_accel_group (editor->priv->ui_manager)); - g_signal_connect (editor->priv->focus_tracker, "notify::focus", + g_signal_connect ( + editor->priv->focus_tracker, "notify::focus", G_CALLBACK (contact_editor_focus_widget_changed_cb), editor); action_group = gtk_action_group_new ("undo"); diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index 5136f18d4b..7c848087be 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/contact-editor/test-editor.c @@ -53,7 +53,7 @@ read_file (gchar *name) if (f == NULL) g_error ("Unable to open %s!\n", name); - len = 0; + len = 0; while (fgets (line, sizeof (line), f) != NULL) { strcpy (buff + len, line); len += strlen (line); diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index d116ec4f8f..95fc3afd2e 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -54,9 +54,9 @@ struct _EAddressbookModelPrivate { gulong view_complete_id; guint remove_status_id; - guint search_in_progress : 1; - guint editable : 1; - guint first_get_view : 1; + guint search_in_progress : 1; + guint editable : 1; + guint first_get_view : 1; }; enum { diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 3cd21deca2..97c46db83c 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -217,7 +217,7 @@ addressbook_create_cmp_cache (EReflowModel *erm) for (ii = 0; ii < count; ii++) { EContact *contact; - contact = (EContact *) + contact = (EContact *) e_addressbook_model_contact_at (priv->model, ii); if (contact != NULL) { const gchar *file_as; diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c index 2a1af0b8f0..4b044867c9 100644 --- a/addressbook/gui/widgets/e-addressbook-selector.c +++ b/addressbook/gui/widgets/e-addressbook-selector.c @@ -48,7 +48,7 @@ struct _MergeContext { gboolean pending_adds; gint remove_from_source : 1; - gint copy_done : 1; + gint copy_done : 1; }; enum { diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 4e3d0e9aa5..2fedce3dea 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -173,8 +173,8 @@ e_minicard_label_class_init (EMinicardLabelClass *class) GTK_TYPE_STYLE); /* GnomeCanvasItem method overrides */ - item_class->realize = e_minicard_label_realize; - item_class->event = e_minicard_label_event; + item_class->realize = e_minicard_label_realize; + item_class->event = e_minicard_label_event; } static void diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 7d7628fdba..023c71d6e9 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -487,9 +487,9 @@ e_minicard_view_class_init (EMinicardViewClass *class) item_class = (GnomeCanvasItemClass *) class; reflow_class = (EReflowClass *) class; - object_class->set_property = e_minicard_view_set_property; - object_class->get_property = e_minicard_view_get_property; - object_class->dispose = e_minicard_view_dispose; + object_class->set_property = e_minicard_view_set_property; + object_class->get_property = e_minicard_view_get_property; + object_class->dispose = e_minicard_view_dispose; g_object_class_install_property ( object_class, @@ -557,7 +557,7 @@ e_minicard_view_class_init (EMinicardViewClass *class) G_TYPE_INT, 1, G_TYPE_POINTER); - item_class->event = e_minicard_view_event; + item_class->event = e_minicard_view_event; reflow_class->selection_event = e_minicard_view_selection_event; /* GnomeCanvasItem method overrides */ diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 1ef150f471..e48c5321a6 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -237,21 +237,21 @@ e_minicard_class_init (EMinicardClass *class) static void e_minicard_init (EMinicard *minicard) { - minicard->rect = NULL; - minicard->fields = NULL; - minicard->width = 10; - minicard->height = 10; - minicard->has_focus = FALSE; - minicard->selected = FALSE; - minicard->editable = FALSE; - minicard->has_cursor = FALSE; + minicard->rect = NULL; + minicard->fields = NULL; + minicard->width = 10; + minicard->height = 10; + minicard->has_focus = FALSE; + minicard->selected = FALSE; + minicard->editable = FALSE; + minicard->has_cursor = FALSE; - minicard->contact = NULL; + minicard->contact = NULL; minicard->list_icon_pixbuf = e_icon_factory_get_icon (LIST_ICON_NAME, GTK_ICON_SIZE_MENU); - minicard->list_icon_size = gdk_pixbuf_get_height (minicard->list_icon_pixbuf); + minicard->list_icon_size = gdk_pixbuf_get_height (minicard->list_icon_pixbuf); - minicard->changed = FALSE; + minicard->changed = FALSE; e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM (minicard), e_minicard_reflow); } diff --git a/addressbook/gui/widgets/ea-addressbook-view.c b/addressbook/gui/widgets/ea-addressbook-view.c index 0cb5f09996..f7324e5086 100644 --- a/addressbook/gui/widgets/ea-addressbook-view.c +++ b/addressbook/gui/widgets/ea-addressbook-view.c @@ -40,7 +40,7 @@ ea_ab_view_get_type (void) GType derived_atk_type; if (!type) { - static GTypeInfo tinfo = { + static GTypeInfo tinfo = { sizeof (EAddressbookViewClass), (GBaseInitFunc) NULL, /* base_init */ (GBaseFinalizeFunc) NULL, /* base_finalize */ diff --git a/addressbook/gui/widgets/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c index 96e1403064..1f3ca9e8d7 100644 --- a/addressbook/gui/widgets/ea-minicard-view.c +++ b/addressbook/gui/widgets/ea-minicard-view.c @@ -78,7 +78,7 @@ ea_minicard_view_get_type (void) GType derived_atk_type; if (!type) { - static GTypeInfo tinfo = { + static GTypeInfo tinfo = { sizeof (EaMinicardViewClass), (GBaseInitFunc) NULL, /* base_init */ (GBaseFinalizeFunc) NULL, /* base_finalize */ diff --git a/addressbook/gui/widgets/ea-minicard.c b/addressbook/gui/widgets/ea-minicard.c index e797a6ef1e..389e8e8f65 100644 --- a/addressbook/gui/widgets/ea-minicard.c +++ b/addressbook/gui/widgets/ea-minicard.c @@ -72,7 +72,7 @@ ea_minicard_get_type (void) GType derived_atk_type; if (!type) { - static GTypeInfo tinfo = { + static GTypeInfo tinfo = { sizeof (EaMinicardClass), (GBaseInitFunc) NULL, /* base_init */ (GBaseFinalizeFunc) NULL, /* base_finalize */ diff --git a/addressbook/gui/widgets/eab-contact-compare.c b/addressbook/gui/widgets/eab-contact-compare.c index aac0cc5ee6..776e26d2c7 100644 --- a/addressbook/gui/widgets/eab-contact-compare.c +++ b/addressbook/gui/widgets/eab-contact-compare.c @@ -150,7 +150,7 @@ eab_contact_compare_name_to_string_full (EContact *contact, *s = ' '; ++s; } - namev = g_strsplit (str_cpy, " ", 0); + namev = g_strsplit (str_cpy, " ", 0); g_free (str_cpy); contact_name = e_contact_get (contact, E_CONTACT_NAME); diff --git a/addressbook/gui/widgets/eab-contact-compare.h b/addressbook/gui/widgets/eab-contact-compare.h index c19285ff57..ebc60e0c19 100644 --- a/addressbook/gui/widgets/eab-contact-compare.h +++ b/addressbook/gui/widgets/eab-contact-compare.h @@ -29,18 +29,18 @@ typedef enum { EAB_CONTACT_MATCH_NOT_APPLICABLE = 0, - EAB_CONTACT_MATCH_NONE = 1, - EAB_CONTACT_MATCH_VAGUE = 2, - EAB_CONTACT_MATCH_PARTIAL = 3, - EAB_CONTACT_MATCH_EXACT = 4 + EAB_CONTACT_MATCH_NONE = 1, + EAB_CONTACT_MATCH_VAGUE = 2, + EAB_CONTACT_MATCH_PARTIAL = 3, + EAB_CONTACT_MATCH_EXACT = 4 } EABContactMatchType; typedef enum { - EAB_CONTACT_MATCH_PART_NOT_APPLICABLE = -1, - EAB_CONTACT_MATCH_PART_NONE = 0, - EAB_CONTACT_MATCH_PART_GIVEN_NAME = 1 << 0, - EAB_CONTACT_MATCH_PART_ADDITIONAL_NAME = 1 << 2, - EAB_CONTACT_MATCH_PART_FAMILY_NAME = 1 << 3 + EAB_CONTACT_MATCH_PART_NOT_APPLICABLE = -1, + EAB_CONTACT_MATCH_PART_NONE = 0, + EAB_CONTACT_MATCH_PART_GIVEN_NAME = 1 << 0, + EAB_CONTACT_MATCH_PART_ADDITIONAL_NAME = 1 << 2, + EAB_CONTACT_MATCH_PART_FAMILY_NAME = 1 << 3 } EABContactMatchPart; typedef void (*EABContactMatchQueryCallback) (EContact *contact, diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c index 539a8e5131..5b61bcde19 100644 --- a/addressbook/gui/widgets/eab-contact-formatter.c +++ b/addressbook/gui/widgets/eab-contact-formatter.c @@ -48,7 +48,7 @@ #define MAX_COMPACT_IMAGE_DIMENSION 48 -#define HTML_HEADER "<!doctype html public \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<html>\n" \ +#define HTML_HEADER "<!doctype html public \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<html>\n" \ "<head>\n<meta name=\"generator\" content=\"Evolution Addressbook Component\">\n" \ "<link type=\"text/css\" rel=\"stylesheet\" href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview.css\">" \ "<style type=\"text/css\">\n" \ @@ -952,15 +952,15 @@ render_compact (EABContactFormatter *formatter, g_free (html); } - #define print_email() { \ - html = eab_parse_qp_email_to_html (str); \ - \ - if (!html) \ - html = e_text_to_html (str, 0); \ - \ - g_string_append_printf (buffer, "%s%s", comma ? ", " : "", html); \ - g_free (html); \ - comma = TRUE; \ + #define print_email() { \ + html = eab_parse_qp_email_to_html (str); \ + \ + if (!html) \ + html = e_text_to_html (str, 0); \ + \ + g_string_append_printf (buffer, "%s%s", comma ? ", " : "", html); \ + g_free (html); \ + comma = TRUE; \ } g_string_append_printf (buffer, "<b>%s:</b> ", _ ("Email")); diff --git a/addressbook/gui/widgets/eab-contact-merging.c b/addressbook/gui/widgets/eab-contact-merging.c index f516eb33dd..c788d4003a 100644 --- a/addressbook/gui/widgets/eab-contact-merging.c +++ b/addressbook/gui/widgets/eab-contact-merging.c @@ -599,9 +599,9 @@ check_if_same (EContact *contact, static GtkWidget * create_duplicate_contact_detected_dialog (EContact *old_contact, - EContact *new_contact, - gboolean disable_merge, - gboolean is_for_commit) + EContact *new_contact, + gboolean disable_merge, + gboolean is_for_commit) { GtkWidget *widget, *scrolled; GtkContainer *container; @@ -611,7 +611,8 @@ create_duplicate_contact_detected_dialog (EContact *old_contact, widget = gtk_dialog_new (); dialog = GTK_DIALOG (widget); - g_object_set (G_OBJECT (dialog), + g_object_set ( + G_OBJECT (dialog), "title", _("Duplicate Contact Detected"), "default-width", 500, "default-height", 400, @@ -632,7 +633,8 @@ create_duplicate_contact_detected_dialog (EContact *old_contact, container = GTK_CONTAINER (gtk_dialog_get_content_area (dialog)); widget = gtk_grid_new (); - g_object_set (G_OBJECT (widget), + g_object_set ( + G_OBJECT (widget), "orientation", GTK_ORIENTATION_HORIZONTAL, "hexpand", TRUE, "halign", GTK_ALIGN_FILL, @@ -645,7 +647,8 @@ create_duplicate_contact_detected_dialog (EContact *old_contact, container = GTK_CONTAINER (widget); widget = gtk_image_new_from_icon_name ("avatar-default", GTK_ICON_SIZE_BUTTON); - g_object_set (G_OBJECT (widget), + g_object_set ( + G_OBJECT (widget), "hexpand", FALSE, "halign", GTK_ALIGN_START, "vexpand", FALSE, @@ -655,7 +658,8 @@ create_duplicate_contact_detected_dialog (EContact *old_contact, gtk_container_add (container, widget); widget = gtk_grid_new (); - g_object_set (G_OBJECT (widget), + g_object_set ( + G_OBJECT (widget), "orientation", GTK_ORIENTATION_VERTICAL, "hexpand", TRUE, "halign", GTK_ALIGN_FILL, @@ -674,7 +678,8 @@ create_duplicate_contact_detected_dialog (EContact *old_contact, "in this folder. Would you like to add it anyway?"); widget = gtk_label_new (text); - g_object_set (G_OBJECT (widget), + g_object_set ( + G_OBJECT (widget), "hexpand", FALSE, "halign", GTK_ALIGN_START, "vexpand", FALSE, @@ -689,7 +694,8 @@ create_duplicate_contact_detected_dialog (EContact *old_contact, text = _("New Contact:"); widget = gtk_label_new (text); - g_object_set (G_OBJECT (widget), + g_object_set ( + G_OBJECT (widget), "hexpand", FALSE, "halign", GTK_ALIGN_START, "vexpand", FALSE, @@ -699,7 +705,8 @@ create_duplicate_contact_detected_dialog (EContact *old_contact, gtk_container_add (container, widget); scrolled = gtk_scrolled_window_new (NULL, NULL); - g_object_set (G_OBJECT (scrolled), + g_object_set ( + G_OBJECT (scrolled), "hexpand", TRUE, "halign", GTK_ALIGN_FILL, "hscrollbar-policy", GTK_POLICY_AUTOMATIC, @@ -711,7 +718,8 @@ create_duplicate_contact_detected_dialog (EContact *old_contact, gtk_container_add (container, scrolled); widget = eab_contact_display_new (); - g_object_set (G_OBJECT (widget), + g_object_set ( + G_OBJECT (widget), "hexpand", TRUE, "halign", GTK_ALIGN_FILL, "vexpand", TRUE, @@ -727,7 +735,8 @@ create_duplicate_contact_detected_dialog (EContact *old_contact, text = _("Old Contact:"); widget = gtk_label_new (text); - g_object_set (G_OBJECT (widget), + g_object_set ( + G_OBJECT (widget), "hexpand", FALSE, "halign", GTK_ALIGN_START, "vexpand", FALSE, @@ -737,7 +746,8 @@ create_duplicate_contact_detected_dialog (EContact *old_contact, gtk_container_add (container, widget); scrolled = gtk_scrolled_window_new (NULL, NULL); - g_object_set (G_OBJECT (scrolled), + g_object_set ( + G_OBJECT (scrolled), "hexpand", TRUE, "halign", GTK_ALIGN_FILL, "hscrollbar-policy", GTK_POLICY_AUTOMATIC, @@ -748,7 +758,8 @@ create_duplicate_contact_detected_dialog (EContact *old_contact, gtk_container_add (container, scrolled); widget = eab_contact_display_new (); - g_object_set (G_OBJECT (widget), + g_object_set ( + G_OBJECT (widget), "hexpand", TRUE, "halign", GTK_ALIGN_FILL, "vexpand", TRUE, diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 78b26fb11e..8718cda9d0 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -182,7 +182,7 @@ eab_load_error_dialog (GtkWidget *parent, } else { GtkWidget *dialog; - dialog = e_alert_dialog_new_for_args ( + dialog = e_alert_dialog_new_for_args ( (GtkWindow *) parent, "addressbook:load-error", e_source_get_display_name (source), @@ -674,7 +674,7 @@ get_locales_str (void) ret = g_strdup ("C"); else if (loc[0] && loc[1]) { if (*loc[0]) - ret = g_strconcat (loc[LOCALES_COUNTRY], "_", loc[LOCALES_LANGUAGE], NULL); + ret = g_strconcat (loc[LOCALES_COUNTRY], "_", loc[LOCALES_LANGUAGE], NULL); else ret = g_strdup (loc[LOCALES_COUNTRY]); } @@ -1053,7 +1053,7 @@ eab_format_address (EContact *contact, return NULL; if (!addr->po && !addr->ext && !addr->street && !addr->locality && !addr->region && - !addr->code && !addr->country) { + !addr->code && !addr->country) { e_contact_address_free (addr); return NULL; } diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index e2e131847b..5e1eb331a2 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -623,7 +623,7 @@ parseLine (CSVImporter *gci, other_address->code || other_address->region || other_address->street) e_contact_set (contact, E_CONTACT_ADDRESS_OTHER, other_address); - if (importer != OUTLOOK_IMPORTER) { + if (importer != OUTLOOK_IMPORTER) { if (bday->day || bday->year || bday->month) e_contact_set (contact, E_CONTACT_BIRTH_DATE, bday); } diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index 07bd20bce6..7268a1a1bf 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -197,7 +197,7 @@ populate_contact_address (EContactAddress *address, !g_ascii_strcasecmp (attr, "homepostalAddress")) { gchar *c, *i, *addr_field; - addr_field = g_strdup (value); + addr_field = g_strdup (value); i = addr_field; for (c = addr_field; *c != '\0'; c++) { i++; diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index 8f1f4adb60..636210f732 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -781,13 +781,13 @@ preview_contact (EWebViewPreview *preview, if (addr) { gboolean have = FALSE; - #define add_it(_what) \ - if (addr->_what && *addr->_what) { \ + #define add_it(_what) \ + if (addr->_what && *addr->_what) { \ e_web_view_preview_add_section ( \ preview, have ? NULL : \ - e_contact_pretty_name (field), addr->_what); \ - have = TRUE; \ - had_value = TRUE; \ + e_contact_pretty_name (field), addr->_what); \ + have = TRUE; \ + had_value = TRUE; \ } add_it (po); diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c index 8fa75d1ae5..3faf245859 100644 --- a/addressbook/tools/evolution-addressbook-export-list-cards.c +++ b/addressbook/tools/evolution-addressbook-export-list-cards.c @@ -385,7 +385,7 @@ e_contact_csv_get (EContact *contact, /*checking to avoid the NULL pointer */ if (field_value == NULL) - field_value = g_strdup (""); + field_value = g_strdup (""); quoted_field_value = escape_string (field_value); g_free (field_value); diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c index 444ddf1b68..6c0b35d277 100644 --- a/addressbook/util/eab-book-util.c +++ b/addressbook/util/eab-book-util.c @@ -266,7 +266,7 @@ eab_parse_qp_email (const gchar *string, return FALSE; /* report success only when we have filled both name and email address */ - if (address->type == CAMEL_HEADER_ADDRESS_NAME && address->name && *address->name && address->v.addr && *address->v.addr) { + if (address->type == CAMEL_HEADER_ADDRESS_NAME && address->name && *address->name && address->v.addr && *address->v.addr) { *name = g_strdup (address->name); *email = g_strdup (address->v.addr); res = TRUE; diff --git a/calendar/alarm-notify/alarm-notify-dialog.c b/calendar/alarm-notify/alarm-notify-dialog.c index 77da377dfc..c28d361481 100644 --- a/calendar/alarm-notify/alarm-notify-dialog.c +++ b/calendar/alarm-notify/alarm-notify-dialog.c @@ -101,7 +101,7 @@ an_update_minutes_label (GtkSpinButton *sb, an = (AlarmNotify *) data; - snooze_timeout_min = gtk_spin_button_get_value_as_int (sb); + snooze_timeout_min = gtk_spin_button_get_value_as_int (sb); gtk_label_set_text (GTK_LABEL (an->minutes_label), ngettext ("minute", "minutes", snooze_timeout_min)); } @@ -114,7 +114,7 @@ an_update_hrs_label (GtkSpinButton *sb, an = (AlarmNotify *) data; - snooze_timeout_hrs = gtk_spin_button_get_value_as_int (sb); + snooze_timeout_hrs = gtk_spin_button_get_value_as_int (sb); gtk_label_set_text (GTK_LABEL (an->hrs_label), ngettext ("hour", "hours", snooze_timeout_hrs)); } @@ -127,7 +127,7 @@ an_update_days_label (GtkSpinButton *sb, an = (AlarmNotify *) data; - snooze_timeout_days = gtk_spin_button_get_value_as_int (sb); + snooze_timeout_days = gtk_spin_button_get_value_as_int (sb); gtk_label_set_text (GTK_LABEL (an->days_label), ngettext ("day", "days", snooze_timeout_days)); } @@ -540,7 +540,7 @@ fill_in_labels (AlarmNotify *an, time_t occur_end) { GtkTextTagTable *table = gtk_text_tag_table_new (); - GtkTextBuffer *buffer = gtk_text_buffer_new (table); + GtkTextBuffer *buffer = gtk_text_buffer_new (table); gtk_text_buffer_set_text (buffer, description, -1); e_buffer_tagger_disconnect (GTK_TEXT_VIEW (an->description)); gtk_text_view_set_buffer (GTK_TEXT_VIEW (an->description), buffer); diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c index bcdaa08e0b..011b78794c 100644 --- a/calendar/alarm-notify/alarm-queue.c +++ b/calendar/alarm-notify/alarm-queue.c @@ -1742,7 +1742,7 @@ display_notification (time_t trigger, if (g_list_length (tray_icons_list) > 1) { gchar *tip; - tip = g_strdup_printf (ngettext ( + tip = g_strdup_printf (ngettext ( "You have %d reminder", "You have %d reminders", g_list_length (tray_icons_list)), g_list_length (tray_icons_list)); diff --git a/calendar/alarm-notify/config-data.h b/calendar/alarm-notify/config-data.h index e9ae052692..e1af223d57 100644 --- a/calendar/alarm-notify/config-data.h +++ b/calendar/alarm-notify/config-data.h @@ -47,14 +47,14 @@ void config_data_init_debugging (void); gboolean config_data_start_debugging (void); void config_data_stop_debugging (void); -#define debug(x) G_STMT_START { \ - if (config_data_start_debugging ()) { \ - g_print ("%s (%s): ", G_STRFUNC, G_STRLOC); \ - g_print x; \ - g_print ("\n"); \ - \ - config_data_stop_debugging (); \ - } \ +#define debug(x) G_STMT_START { \ + if (config_data_start_debugging ()) { \ + g_print ("%s (%s): ", G_STRFUNC, G_STRLOC); \ + g_print x; \ + g_print ("\n"); \ + \ + config_data_stop_debugging (); \ + } \ } G_STMT_END #endif diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 79be6fd20e..459af8c3c0 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -156,12 +156,12 @@ comp_editor_get_current_time (EDateEdit *date_edit, tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone); /* Now copy it to the struct tm and return it. */ - tmp_tm.tm_year = tt.year - 1900; - tmp_tm.tm_mon = tt.month - 1; - tmp_tm.tm_mday = tt.day; - tmp_tm.tm_hour = tt.hour; - tmp_tm.tm_min = tt.minute; - tmp_tm.tm_sec = tt.second; + tmp_tm.tm_year = tt.year - 1900; + tmp_tm.tm_mon = tt.month - 1; + tmp_tm.tm_mday = tt.day; + tmp_tm.tm_hour = tt.hour; + tmp_tm.tm_min = tt.minute; + tmp_tm.tm_sec = tt.second; tmp_tm.tm_isdst = -1; return tmp_tm; diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 86c7993ea2..b50f2068d0 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -1308,7 +1308,6 @@ static GtkActionEntry core_entries[] = { N_("Redo"), NULL }, /* Handled by EFocusTracker */ - /* Menus */ { "classification-menu", diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index a8d8a6667c..58a2e38429 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -644,7 +644,7 @@ sensitize_widgets (EventPage *epage) alarm = e_dialog_combo_box_get (priv->alarm_time_combo, priv->alarm_map) != ALARM_NONE; custom = is_custom_alarm_store (priv->alarm_list_store, priv->old_summary, priv->alarm_units, priv->alarm_interval, NULL) || - e_dialog_combo_box_get (priv->alarm_time_combo, priv->alarm_map) == ALARM_CUSTOM ? TRUE : FALSE; + e_dialog_combo_box_get (priv->alarm_time_combo, priv->alarm_map) == ALARM_CUSTOM ? TRUE : FALSE; if (alarm && !priv->alarm_icon) { priv->alarm_icon = create_alarm_image_button ("stock_bell", _("This event has reminders"), epage); @@ -685,11 +685,11 @@ sensitize_widgets (EventPage *epage) } gtk_widget_set_sensitive (priv->organizer, !read_only); - gtk_widget_set_sensitive (priv->add, (!read_only && sens) || delegate); + gtk_widget_set_sensitive (priv->add, (!read_only && sens) || delegate); gtk_widget_set_sensitive (priv->edit, (!read_only && sens) || delegate); e_meeting_list_view_set_editable (priv->list_view, (!read_only && sens) || delegate); - gtk_widget_set_sensitive (priv->remove, (!read_only && sens) || delegate); - gtk_widget_set_sensitive (priv->invite, (!read_only && sens) || delegate); + gtk_widget_set_sensitive (priv->remove, (!read_only && sens) || delegate); + gtk_widget_set_sensitive (priv->invite, (!read_only && sens) || delegate); gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only); action_group = comp_editor_get_action_group (editor, "editable"); @@ -2406,16 +2406,16 @@ event_page_set_all_day_event (EventPage *epage, if (all_day) { /* Round down to the start of the day. */ start_tt.hour = 0; - start_tt.minute = 0; - start_tt.second = 0; + start_tt.minute = 0; + start_tt.second = 0; start_tt.is_date = TRUE; /* Round down to the start of the day, or the start of the * previous day if it is midnight. */ icaltime_adjust (&end_tt, 0, 0, 0, -1); end_tt.hour = 0; - end_tt.minute = 0; - end_tt.second = 0; + end_tt.minute = 0; + end_tt.second = 0; end_tt.is_date = TRUE; } else { icaltimezone *start_zone; @@ -2430,7 +2430,7 @@ event_page_set_all_day_event (EventPage *epage, comp_editor_get_work_day_start_hour (editor); start_tt.minute = comp_editor_get_work_day_start_minute (editor); - start_tt.second = 0; + start_tt.second = 0; end_tt = start_tt; icaltime_adjust (&end_tt, 0, 1, 0, 0); diff --git a/calendar/gui/dialogs/goto-dialog.c b/calendar/gui/dialogs/goto-dialog.c index 4d52ca0e90..0fee6622c4 100644 --- a/calendar/gui/dialogs/goto-dialog.c +++ b/calendar/gui/dialogs/goto-dialog.c @@ -146,12 +146,12 @@ get_current_time (ECalendarItem *calitem, tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone); /* Now copy it to the struct tm and return it. */ - tmp_tm.tm_year = tt.year - 1900; - tmp_tm.tm_mon = tt.month - 1; - tmp_tm.tm_mday = tt.day; - tmp_tm.tm_hour = tt.hour; - tmp_tm.tm_min = tt.minute; - tmp_tm.tm_sec = tt.second; + tmp_tm.tm_year = tt.year - 1900; + tmp_tm.tm_mon = tt.month - 1; + tmp_tm.tm_mday = tt.day; + tmp_tm.tm_hour = tt.hour; + tmp_tm.tm_min = tt.minute; + tmp_tm.tm_sec = tt.second; tmp_tm.tm_isdst = -1; return tmp_tm; diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index f4f76d6fc9..1a791728c9 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -401,11 +401,11 @@ sensitize_widgets (TaskPage *tpage) GTK_EDITABLE (priv->web_page_entry), !read_only); gtk_widget_set_sensitive (priv->organizer, !read_only); - gtk_widget_set_sensitive (priv->add, (!read_only && sens)); + gtk_widget_set_sensitive (priv->add, (!read_only && sens)); gtk_widget_set_sensitive (priv->edit, (!read_only && sens)); e_meeting_list_view_set_editable (priv->list_view, (!read_only && sens)); - gtk_widget_set_sensitive (priv->remove, (!read_only && sens)); - gtk_widget_set_sensitive (priv->invite, (!read_only && sens)); + gtk_widget_set_sensitive (priv->remove, (!read_only && sens)); + gtk_widget_set_sensitive (priv->invite, (!read_only && sens)); gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only); action_group = comp_editor_get_action_group (editor, "editable"); diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c index 456cc2b53d..687e4968c1 100644 --- a/calendar/gui/e-alarm-list.c +++ b/calendar/gui/e-alarm-list.c @@ -103,9 +103,9 @@ e_alarm_list_tree_model_init (GtkTreeModelIface *iface) static void e_alarm_list_init (EAlarmList *alarm_list) { - alarm_list->stamp = g_random_int (); + alarm_list->stamp = g_random_int (); alarm_list->columns_dirty = FALSE; - alarm_list->list = NULL; + alarm_list->list = NULL; } EAlarmList * @@ -265,7 +265,7 @@ e_alarm_list_append (EAlarmList *alarm_list, if (iter) { iter->user_data = g_list_last (alarm_list->list); - iter->stamp = alarm_list->stamp; + iter->stamp = alarm_list->stamp; } } @@ -321,7 +321,7 @@ e_alarm_list_get_iter (GtkTreeModel *tree_model, return FALSE; iter->user_data = l; - iter->stamp = alarm_list->stamp; + iter->stamp = alarm_list->stamp; return TRUE; } @@ -589,7 +589,7 @@ e_alarm_list_iter_children (GtkTreeModel *tree_model, if (!alarm_list->list) return FALSE; - iter->stamp = E_ALARM_LIST (tree_model)->stamp; + iter->stamp = E_ALARM_LIST (tree_model)->stamp; iter->user_data = alarm_list->list; return TRUE; } @@ -637,7 +637,7 @@ e_alarm_list_iter_nth_child (GtkTreeModel *tree_model, if (!l) return FALSE; - iter->stamp = alarm_list->stamp; + iter->stamp = alarm_list->stamp; iter->user_data = l; return TRUE; } diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index 03fa44d80a..cdfaeeaf17 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -55,7 +55,7 @@ struct _ECalComponentPreviewPrivate { gboolean use_24_hour_format; }; -#define HTML_HEADER "<!doctype html public \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<html>\n" \ +#define HTML_HEADER "<!doctype html public \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<html>\n" \ "<head>\n<meta name=\"generator\" content=\"Evolution Calendar Component\">\n" \ "<link type=\"text/css\" rel=\"stylesheet\" href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview.css\">\n" \ "<style>\n" \ diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index efba6df907..c4b982984d 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -101,8 +101,8 @@ e_cal_list_view_class_init (ECalListViewClass *class) view_class = (ECalendarViewClass *) class; /* Method override */ - object_class->dispose = e_cal_list_view_dispose; - object_class->get_property = e_cal_list_view_get_property; + object_class->dispose = e_cal_list_view_dispose; + object_class->get_property = e_cal_list_view_get_property; widget_class->popup_menu = e_cal_list_view_popup_menu; @@ -138,12 +138,12 @@ get_current_time_cb (ECellDateEdit *ecde, tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone); /* Now copy it to the struct tm and return it. */ - tmp_tm.tm_year = tt.year - 1900; - tmp_tm.tm_mon = tt.month - 1; - tmp_tm.tm_mday = tt.day; - tmp_tm.tm_hour = tt.hour; - tmp_tm.tm_min = tt.minute; - tmp_tm.tm_sec = tt.second; + tmp_tm.tm_year = tt.year - 1900; + tmp_tm.tm_mon = tt.month - 1; + tmp_tm.tm_mday = tt.day; + tmp_tm.tm_hour = tt.hour; + tmp_tm.tm_min = tt.minute; + tmp_tm.tm_sec = tt.second; tmp_tm.tm_isdst = -1; return tmp_tm; diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index 746839ea33..6711c815e5 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -90,7 +90,7 @@ typedef enum { } ECalModelField; typedef enum { - E_CAL_MODEL_FLAGS_INVALID = -1, + E_CAL_MODEL_FLAGS_INVALID = -1, E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES = 0x01 } ECalModelFlags; diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index ce6cfaede4..05ef5a5077 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -2377,14 +2377,14 @@ get_today_background (const GdkColor base_background) if (res.red > 0x7FFF) { /* light yellow for a light theme */ - res.red = 0xFFFF; + res.red = 0xFFFF; res.green = 0xFFFF; - res.blue = 0xC0C0; + res.blue = 0xC0C0; } else { /* dark yellow for a dark theme */ - res.red = 0x3F3F; + res.red = 0x3F3F; res.green = 0x3F3F; - res.blue = 0x0000; + res.blue = 0x0000; } return res; diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 2a8b3005ea..857ef04081 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -77,7 +77,7 @@ typedef enum { guint16 start_minute; \ guint16 end_minute; \ guint different_timezone : 1; \ - gboolean is_editable; \ + gboolean is_editable; \ GtkWidget *tooltip; \ gint timeout; \ GdkColor *color; \ diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c index 37890da402..5ceca0be3c 100644 --- a/calendar/gui/e-cell-date-edit-text.c +++ b/calendar/gui/e-cell-date-edit-text.c @@ -204,10 +204,10 @@ cell_date_edit_text_set_value (ECellText *cell, } else { dv.tt = icaltime_null_time (); - dv.tt.year = tmp_tm.tm_year + 1900; - dv.tt.month = tmp_tm.tm_mon + 1; - dv.tt.day = tmp_tm.tm_mday; - dv.tt.hour = tmp_tm.tm_hour; + dv.tt.year = tmp_tm.tm_year + 1900; + dv.tt.month = tmp_tm.tm_mon + 1; + dv.tt.day = tmp_tm.tm_mday; + dv.tt.hour = tmp_tm.tm_hour; dv.tt.minute = tmp_tm.tm_min; dv.tt.second = tmp_tm.tm_sec; dv.tt.is_date = is_date; @@ -239,7 +239,7 @@ e_cell_date_edit_text_class_init (ECellDateEditTextClass *class) object_class->get_property = cell_date_edit_text_get_property; cell_text_class = E_CELL_TEXT_CLASS (class); - cell_text_class->get_text = cell_date_edit_text_get_text; + cell_text_class->get_text = cell_date_edit_text_get_text; cell_text_class->free_text = cell_date_edit_text_free_text; cell_text_class->set_value = cell_date_edit_text_set_value; diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c index 9b4e70d74e..43ee00dbd6 100644 --- a/calendar/gui/e-date-time-list.c +++ b/calendar/gui/e-date-time-list.c @@ -69,7 +69,7 @@ copy_datetime (const ECalComponentDateTime *datetime) ECalComponentDateTime *datetime_copy; datetime_copy = g_new0 (ECalComponentDateTime, 1); - datetime_copy->value = g_new (struct icaltimetype, 1); + datetime_copy->value = g_new (struct icaltimetype, 1); *datetime_copy->value = *datetime->value; if (datetime->tzid) @@ -162,12 +162,12 @@ get_exception_string (EDateTimeList *date_time_list, use_24_hour_format = e_date_time_list_get_use_24_hour_format (date_time_list); - tmp_tm.tm_year = dt->value->year - 1900; - tmp_tm.tm_mon = dt->value->month - 1; - tmp_tm.tm_mday = dt->value->day; - tmp_tm.tm_hour = dt->value->hour; - tmp_tm.tm_min = dt->value->minute; - tmp_tm.tm_sec = dt->value->second; + tmp_tm.tm_year = dt->value->year - 1900; + tmp_tm.tm_mon = dt->value->month - 1; + tmp_tm.tm_mday = dt->value->day; + tmp_tm.tm_hour = dt->value->hour; + tmp_tm.tm_min = dt->value->minute; + tmp_tm.tm_sec = dt->value->second; tmp_tm.tm_isdst = -1; tmp_tm.tm_wday = time_day_of_week ( @@ -273,7 +273,7 @@ date_time_list_get_iter (GtkTreeModel *tree_model, return FALSE; iter->user_data = l; - iter->stamp = date_time_list->stamp; + iter->stamp = date_time_list->stamp; return TRUE; } @@ -315,7 +315,7 @@ date_time_list_get_value (GtkTreeModel *tree_model, if (!date_time_list->list) return; - l = iter->user_data; + l = iter->user_data; datetime = l->data; if (!datetime) @@ -368,7 +368,7 @@ date_time_list_iter_children (GtkTreeModel *tree_model, if (!date_time_list->list) return FALSE; - iter->stamp = E_DATE_TIME_LIST (tree_model)->stamp; + iter->stamp = E_DATE_TIME_LIST (tree_model)->stamp; iter->user_data = date_time_list->list; return TRUE; } @@ -416,7 +416,7 @@ date_time_list_iter_nth_child (GtkTreeModel *tree_model, if (!l) return FALSE; - iter->stamp = date_time_list->stamp; + iter->stamp = date_time_list->stamp; iter->user_data = l; return TRUE; } @@ -550,7 +550,7 @@ e_date_time_list_append (EDateTimeList *date_time_list, if (iter) { iter->user_data = g_list_last (date_time_list->list); - iter->stamp = date_time_list->stamp; + iter->stamp = date_time_list->stamp; } } diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 162436bbd6..be2f96f663 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -368,8 +368,8 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, /* Black border */ cairo_save (cr); - x0 = item_x + E_DAY_VIEW_BAR_WIDTH + 9; - y0 = item_y + 10; + x0 = item_x + E_DAY_VIEW_BAR_WIDTH + 9; + y0 = item_y + 10; rect_width = MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 7, 0); rect_height = item_h - 7; @@ -384,9 +384,9 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, /* Extra Grid lines when clicked */ cairo_save (cr); - x0 = item_x + E_DAY_VIEW_BAR_WIDTH + 1; - y0 = item_y + 2; - rect_width = MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 3, 0); + x0 = item_x + E_DAY_VIEW_BAR_WIDTH + 1; + y0 = item_y + 2; + rect_width = MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 3, 0); rect_height = item_h - 4.; radius = 16; @@ -420,9 +420,9 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, /* Draw the background of the event with white to play with transparency */ cairo_save (cr); - x0 = item_x + E_DAY_VIEW_BAR_WIDTH + 1; - y0 = item_y + 2; - rect_width = MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 3, 0); + x0 = item_x + E_DAY_VIEW_BAR_WIDTH + 1; + y0 = item_y + 2; + rect_width = MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 3, 0); rect_height = item_h - 4.; radius = 16; @@ -437,9 +437,9 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, /* Here we draw the border in event color */ cairo_save (cr); - x0 = item_x + E_DAY_VIEW_BAR_WIDTH; - y0 = item_y + 1.; - rect_width = MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 1., 0); + x0 = item_x + E_DAY_VIEW_BAR_WIDTH; + y0 = item_y + 1.; + rect_width = MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 1., 0); rect_height = item_h - 2.; radius = 16; @@ -454,9 +454,9 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, cairo_save (cr); - x0 = item_x + E_DAY_VIEW_BAR_WIDTH + 1.75; - y0 = item_y + 2.75; - rect_width = item_w - E_DAY_VIEW_BAR_WIDTH - 4.5; + x0 = item_x + E_DAY_VIEW_BAR_WIDTH + 1.75; + y0 = item_y + 2.75; + rect_width = item_w - E_DAY_VIEW_BAR_WIDTH - 4.5; rect_height = item_h - 5.5; radius = 14; @@ -536,7 +536,7 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, end_minute = event->end_minute; - end_hour = end_minute / 60; + end_hour = end_minute / 60; end_minute = end_minute % 60; e_day_view_convert_time_to_display ( @@ -670,22 +670,22 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, } #define fit_in_event() (icon_x + icon_x_inc < item_x + item_w && icon_y + icon_y_inc < item_y + item_h) - #define draw_pixbuf(pf) \ - max_icon_w = item_x + item_w - icon_x - E_DAY_VIEW_EVENT_BORDER_WIDTH; \ - max_icon_h = item_y + item_h - icon_y - E_DAY_VIEW_EVENT_BORDER_HEIGHT; \ - \ - if (can_draw_in_region (draw_region, icon_x, icon_y, max_icon_w, max_icon_h)) { \ - cairo_save (cr); \ - cairo_rectangle (cr, icon_x, icon_y, max_icon_w, max_icon_h); \ - cairo_clip (cr); \ - cairo_new_path (cr); \ - gdk_cairo_set_source_pixbuf (cr, pf, icon_x, icon_y); \ - cairo_paint (cr); \ - cairo_close_path (cr); \ - cairo_restore (cr); \ - } \ - \ - icon_x += icon_x_inc; \ + #define draw_pixbuf(pf) \ + max_icon_w = item_x + item_w - icon_x - E_DAY_VIEW_EVENT_BORDER_WIDTH; \ + max_icon_h = item_y + item_h - icon_y - E_DAY_VIEW_EVENT_BORDER_HEIGHT; \ + \ + if (can_draw_in_region (draw_region, icon_x, icon_y, max_icon_w, max_icon_h)) { \ + cairo_save (cr); \ + cairo_rectangle (cr, icon_x, icon_y, max_icon_w, max_icon_h); \ + cairo_clip (cr); \ + cairo_new_path (cr); \ + gdk_cairo_set_source_pixbuf (cr, pf, icon_x, icon_y); \ + cairo_paint (cr); \ + cairo_close_path (cr); \ + cairo_restore (cr); \ + } \ + \ + icon_x += icon_x_inc; \ icon_y += icon_y_inc; if (draw_reminder_icon && fit_in_event ()) { @@ -1092,7 +1092,7 @@ day_view_main_item_draw (GnomeCanvasItem *canvas_item, if (days_shown > 1) { /* Check if we are drawing today */ - today = day_start_tt.year == today_tt.year + today = day_start_tt.year == today_tt.year && day_start_tt.month == today_tt.month && day_start_tt.day == today_tt.day; } else { @@ -1256,9 +1256,9 @@ day_view_main_item_draw (GnomeCanvasItem *canvas_item, for (day = 0; day < days_shown; day++) { day_start = icaltime_from_timet_with_zone (day_view->day_starts[day], FALSE, zone); - if ((day_start.year == time_now.year) && + if ((day_start.year == time_now.year) && (day_start.month == time_now.month) && - (day_start.day == time_now.day)) { + (day_start.day == time_now.day)) { grid_x1 = day_view->day_offsets[day] - x + E_DAY_VIEW_BAR_WIDTH; grid_x2 = day_view->day_offsets[day + 1] - x - 1; diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index 9a999520b2..6e836c6822 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -202,9 +202,9 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item, /* Fill the background with white to play with transparency */ cairo_save (cr); - x0 = item_x - x + 4; - y0 = item_y + 1 - y; - rect_width = item_w - 8; + x0 = item_x - x + 4; + y0 = item_y + 1 - y; + rect_width = item_w - 8; rect_height = item_h - 2; radius = 12; @@ -219,9 +219,9 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item, /* Draw the border around the event */ cairo_save (cr); - x0 = item_x - x + 4; - y0 = item_y + 1 - y; - rect_width = item_w - 8; + x0 = item_x - x + 4; + y0 = item_y + 1 - y; + rect_width = item_w - 8; rect_height = item_h - 2; radius = 12; @@ -237,9 +237,9 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item, cairo_save (cr); - x0 = item_x - x + 5.5; - y0 = item_y + 2.5 - y; - rect_width = item_w - 11; + x0 = item_x - x + 5.5; + y0 = item_y + 2.5 - y; + rect_width = item_w - 11; rect_height = item_h - 5; radius = 10; diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index d9fba01f8b..f6f187eb3c 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -117,11 +117,11 @@ G_BEGIN_DECLS /* These are used to specify the type of an appointment. They match those * used in EMeetingTimeSelector. */ typedef enum { - E_DAY_VIEW_BUSY_TENTATIVE = 0, - E_DAY_VIEW_BUSY_OUT_OF_OFFICE = 1, - E_DAY_VIEW_BUSY_BUSY = 2, + E_DAY_VIEW_BUSY_TENTATIVE = 0, + E_DAY_VIEW_BUSY_OUT_OF_OFFICE = 1, + E_DAY_VIEW_BUSY_BUSY = 2, - E_DAY_VIEW_BUSY_LAST = 3 + E_DAY_VIEW_BUSY_LAST = 3 } EDayViewBusyType; /* This is used to specify the format used when displaying the dates. diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index 2fd8ccc208..7101fa8cf3 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -1373,7 +1373,7 @@ process_free_busy_comp (EMeetingAttendee *attendee, fb = icalproperty_get_freebusy (ip); param = icalproperty_get_first_parameter (ip, ICAL_FBTYPE_PARAMETER); if (param != NULL) - fbtype = icalparameter_get_fbtype (param); + fbtype = icalparameter_get_fbtype (param); switch (fbtype) { case ICAL_FBTYPE_BUSY: diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 21eb97ea8a..a7474681f8 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -1813,7 +1813,7 @@ e_meeting_time_selector_autopick (EMeetingTimeSelector *mts, /* Step through each attendee, checking if the meeting time * intersects one of the attendees busy periods. */ - for (row = 0; row < e_meeting_store_count_actual_attendees (mts->model); row++) { + for (row = 0; row < e_meeting_store_count_actual_attendees (mts->model); row++) { attendee = e_meeting_store_find_attendee_at_row (mts->model, row); /* Skip optional people if they don't matter. */ diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h index 796f070496..a5768ff078 100644 --- a/calendar/gui/e-meeting-types.h +++ b/calendar/gui/e-meeting-types.h @@ -44,12 +44,12 @@ typedef struct _EMeetingXfbData EMeetingXfbData; * used as for loop counters, so they should start at 0 and be ordered. */ typedef enum { - E_MEETING_FREE_BUSY_TENTATIVE = 0, - E_MEETING_FREE_BUSY_OUT_OF_OFFICE = 1, - E_MEETING_FREE_BUSY_BUSY = 2, - E_MEETING_FREE_BUSY_FREE = 3, + E_MEETING_FREE_BUSY_TENTATIVE = 0, + E_MEETING_FREE_BUSY_OUT_OF_OFFICE = 1, + E_MEETING_FREE_BUSY_BUSY = 2, + E_MEETING_FREE_BUSY_FREE = 3, - E_MEETING_FREE_BUSY_LAST = 4 + E_MEETING_FREE_BUSY_LAST = 4 } EMeetingFreeBusyType; /* This is our representation of a time. We use a GDate to store the day, diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index ed39b43642..c71c22c233 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -140,12 +140,12 @@ memo_table_get_current_time (ECellDateEdit *ecde, tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone); /* Now copy it to the struct tm and return it. */ - tmp_tm.tm_year = tt.year - 1900; - tmp_tm.tm_mon = tt.month - 1; - tmp_tm.tm_mday = tt.day; - tmp_tm.tm_hour = tt.hour; - tmp_tm.tm_min = tt.minute; - tmp_tm.tm_sec = tt.second; + tmp_tm.tm_year = tt.year - 1900; + tmp_tm.tm_mon = tt.month - 1; + tmp_tm.tm_mday = tt.day; + tmp_tm.tm_hour = tt.hour; + tmp_tm.tm_min = tt.minute; + tmp_tm.tm_sec = tt.second; tmp_tm.tm_isdst = -1; return tmp_tm; diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c index 085b1b4c04..ee2b614630 100644 --- a/calendar/gui/e-task-table.c +++ b/calendar/gui/e-task-table.c @@ -1859,12 +1859,12 @@ e_task_table_get_current_time (ECellDateEdit *ecde, tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone); /* Now copy it to the struct tm and return it. */ - tmp_tm.tm_year = tt.year - 1900; - tmp_tm.tm_mon = tt.month - 1; - tmp_tm.tm_mday = tt.day; - tmp_tm.tm_hour = tt.hour; - tmp_tm.tm_min = tt.minute; - tmp_tm.tm_sec = tt.second; + tmp_tm.tm_year = tt.year - 1900; + tmp_tm.tm_mon = tt.month - 1; + tmp_tm.tm_mday = tt.day; + tmp_tm.tm_hour = tt.hour; + tmp_tm.tm_min = tt.minute; + tmp_tm.tm_sec = tt.second; tmp_tm.tm_isdst = -1; return tmp_tm; diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index a1af59c8d6..1f7db1f9b6 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -310,7 +310,7 @@ e_timezone_entry_init (ETimezoneEntry *timezone_entry) gtk_widget_set_can_focus (GTK_WIDGET (timezone_entry), TRUE); - widget = gtk_entry_new (); + widget = gtk_entry_new (); gtk_editable_set_editable (GTK_EDITABLE (widget), FALSE); gtk_box_pack_start (GTK_BOX (timezone_entry), widget, TRUE, TRUE, 0); timezone_entry->priv->entry = widget; diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 203eff38c9..481daff2e3 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -473,15 +473,15 @@ week_view_event_item_draw_icons (EWeekViewEventItem *event_item, if (right_align) icon_x -= icon_x_inc * num_icons; - #define draw_pixbuf(pf) \ - if (can_draw_in_region (draw_region, icon_x, icon_y, \ - E_WEEK_VIEW_ICON_WIDTH, E_WEEK_VIEW_ICON_HEIGHT)) { \ - cairo_save (cr); \ - gdk_cairo_set_source_pixbuf (cr, pf, icon_x, icon_y); \ - cairo_paint (cr); \ - cairo_restore (cr); \ - } \ - \ + #define draw_pixbuf(pf) \ + if (can_draw_in_region (draw_region, icon_x, icon_y, \ + E_WEEK_VIEW_ICON_WIDTH, E_WEEK_VIEW_ICON_HEIGHT)) { \ + cairo_save (cr); \ + gdk_cairo_set_source_pixbuf (cr, pf, icon_x, icon_y); \ + cairo_paint (cr); \ + cairo_restore (cr); \ + } \ + \ icon_x += icon_x_inc; if (draw_reminder_icon && icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) { @@ -823,9 +823,9 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item, rect_w = x2 - x1 - E_WEEK_VIEW_EVENT_L_PAD - E_WEEK_VIEW_EVENT_R_PAD + 1; /* Here we draw the border around the event*/ - cx0 = rect_x; - cy0 = y1 + 1; - rect_width = rect_w; + cx0 = rect_x; + cy0 = y1 + 1; + rect_width = rect_w; rect_height = y2 - y1 - 1; radius = 12; @@ -841,9 +841,9 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item, /* Fill it in the Event */ - cx0 = rect_x + 1.5; - cy0 = y1 + 2.75; - rect_width = rect_w - 3.; + cx0 = rect_x + 1.5; + cy0 = y1 + 2.75; + rect_width = rect_w - 3.; rect_height = y2 - y1 - 4.5; radius = 8; @@ -940,9 +940,9 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item, /* Here we draw the border around the event */ - cx0 = rect_x; - cy0 = y1 + 1; - rect_width = rect_w; + cx0 = rect_x; + cy0 = y1 + 1; + rect_width = rect_w; rect_height = y2 - y1 - 1; radius = 12; @@ -958,9 +958,9 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item, /* Here we fill it in the event*/ - cx0 = rect_x + 1.5; - cy0 = y1 + 2.75; - rect_width = rect_w - 3.; + cx0 = rect_x + 1.5; + cy0 = y1 + 2.75; + rect_width = rect_w - 3.; rect_height = y2 - y1 - 4.5; radius = 8; diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 0191c0ce24..22b6e4ea69 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -1659,13 +1659,13 @@ static GdkColor color_inc (GdkColor c, gint amount) { - #define dec(x) \ - if (x + amount >= 0 \ - && x + amount <= 0xFFFF) \ - x += amount; \ - else if (amount <= 0) \ - x = 0; \ - else \ + #define dec(x) \ + if (x + amount >= 0 \ + && x + amount <= 0xFFFF) \ + x += amount; \ + else if (amount <= 0) \ + x = 0; \ + else \ x = 0xFFFF; dec (c.red); @@ -2681,7 +2681,7 @@ e_week_view_on_button_press (GtkWidget *widget, guint32 event_time; /* Start the selection drag. */ - if (!gtk_widget_has_focus (GTK_WIDGET (week_view)) && !gtk_widget_has_focus (GTK_WIDGET (week_view->main_canvas))) + if (!gtk_widget_has_focus (GTK_WIDGET (week_view)) && !gtk_widget_has_focus (GTK_WIDGET (week_view->main_canvas))) gtk_widget_grab_focus (GTK_WIDGET (week_view)); window = gtk_layout_get_bin_window (GTK_LAYOUT (widget)); @@ -3535,7 +3535,7 @@ e_week_view_reshape_event_span (EWeekView *week_view, * still use the border height to position the events * vertically so they still line up neatly (see above), * we don't use the border width or edge padding at all. */ - text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD; + text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD; switch (week_view->time_format) { case E_WEEK_VIEW_TIME_BOTH_SMALL_MIN: diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 5e0dfc8e5c..8b03105651 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -1019,7 +1019,7 @@ get_times_for_views (GnomeCalendar *gcal, switch (view_type) { case GNOME_CAL_DAY_VIEW: day_view = E_DAY_VIEW (priv->views[view_type]); - shown = e_day_view_get_days_shown (day_view); + shown = e_day_view_get_days_shown (day_view); *start_time = time_day_begin_with_zone (*start_time, timezone); *end_time = time_add_day_with_zone (*start_time, shown, timezone); break; diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 3bbe54e9a1..82c0392794 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -1744,7 +1744,7 @@ itip_send_comp (ESourceRegistry *registry, /* Recipients */ destinations = comp_to_list ( registry, method, comp, users, FALSE, - only_new_attendees ? g_object_get_data ( + only_new_attendees ? g_object_get_data ( G_OBJECT (send_comp), "new-attendees") : NULL); if (method != E_CAL_COMPONENT_METHOD_PUBLISH) { if (destinations == NULL) { diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 6ec8818a80..d4f8752a62 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -624,7 +624,7 @@ titled_box (GtkPrintContext *context, gdouble size; size = evo_calendar_print_renderer_get_height (context, font, text); - print_border (context, *x1, *x2, *y1, *y1 + size + 2, linewidth, 0.9); + print_border (context, *x1, *x2, *y1, *y1 + size + 2, linewidth, 0.9); print_border (context, *x1, *x2, *y1 + size + 2, *y2, linewidth, -1.0); *x1 += 2; *x2 -= 2; @@ -650,10 +650,10 @@ get_show_week_numbers (void) } enum datefmt { - DATE_MONTH = 1 << 0, - DATE_DAY = 1 << 1, - DATE_DAYNAME = 1 << 2, - DATE_YEAR = 1 << 3 + DATE_MONTH = 1 << 0, + DATE_DAY = 1 << 1, + DATE_DAYNAME = 1 << 2, + DATE_YEAR = 1 << 3 }; static const gchar *days[] = { diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c index e5e6208b16..dda34cde64 100644 --- a/composer/e-composer-header.c +++ b/composer/e-composer-header.c @@ -38,7 +38,7 @@ struct _EComposerHeaderPrivate { ESourceRegistry *registry; guint sensitive : 1; - guint visible : 1; + guint visible : 1; }; #define E_COMPOSER_HEADER_GET_PRIVATE(obj) \ diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h index 9c3fc48d2e..b09e025e0c 100644 --- a/composer/e-composer-private.h +++ b/composer/e-composer-private.h @@ -90,10 +90,10 @@ struct _EMsgComposerPrivate { gchar *mime_body; gchar *charset; - guint32 autosaved : 1; - guint32 mode_post : 1; - guint32 in_signature_insert : 1; - guint32 application_exiting : 1; + guint32 autosaved : 1; + guint32 mode_post : 1; + guint32 in_signature_insert : 1; + guint32 application_exiting : 1; CamelMimeMessage *redirect; diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index dddd59a89c..55e78814de 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -62,25 +62,25 @@ struct _AsyncContext { GPtrArray *recipients; - guint skip_content : 1; - guint need_thread : 1; - guint pgp_sign : 1; - guint pgp_encrypt : 1; - guint smime_sign : 1; + guint skip_content : 1; + guint need_thread : 1; + guint pgp_sign : 1; + guint pgp_encrypt : 1; + guint smime_sign : 1; guint smime_encrypt : 1; }; /* Flags for building a message. */ typedef enum { - COMPOSER_FLAG_HTML_CONTENT = 1 << 0, - COMPOSER_FLAG_SAVE_OBJECT_DATA = 1 << 1, - COMPOSER_FLAG_PRIORITIZE_MESSAGE = 1 << 2, - COMPOSER_FLAG_REQUEST_READ_RECEIPT = 1 << 3, - COMPOSER_FLAG_PGP_SIGN = 1 << 4, - COMPOSER_FLAG_PGP_ENCRYPT = 1 << 5, - COMPOSER_FLAG_SMIME_SIGN = 1 << 6, - COMPOSER_FLAG_SMIME_ENCRYPT = 1 << 7, - COMPOSER_FLAG_DRAFT = 1 << 8 + COMPOSER_FLAG_HTML_CONTENT = 1 << 0, + COMPOSER_FLAG_SAVE_OBJECT_DATA = 1 << 1, + COMPOSER_FLAG_PRIORITIZE_MESSAGE = 1 << 2, + COMPOSER_FLAG_REQUEST_READ_RECEIPT = 1 << 3, + COMPOSER_FLAG_PGP_SIGN = 1 << 4, + COMPOSER_FLAG_PGP_ENCRYPT = 1 << 5, + COMPOSER_FLAG_SMIME_SIGN = 1 << 6, + COMPOSER_FLAG_SMIME_ENCRYPT = 1 << 7, + COMPOSER_FLAG_DRAFT = 1 << 8 } ComposerFlags; enum { @@ -465,8 +465,8 @@ set_recipients_from_destv (CamelMimeMessage *msg, gboolean seen_hidden_list = FALSE; gint i; - to_addr = camel_internet_address_new (); - cc_addr = camel_internet_address_new (); + to_addr = camel_internet_address_new (); + cc_addr = camel_internet_address_new (); bcc_addr = camel_internet_address_new (); for (i = 0; to_destv != NULL && to_destv[i] != NULL; ++i) { @@ -1493,7 +1493,7 @@ use_top_signature (EMsgComposer *composer) return top_signature; } -#define NO_SIGNATURE_TEXT \ +#define NO_SIGNATURE_TEXT \ "<!--+GtkHTML:<DATA class=\"ClueFlow\" " \ " key=\"signature\" " \ " value=\"1\">-->" \ @@ -4139,8 +4139,8 @@ handle_mailto (EMsgComposer *composer, merge_always_cc_and_bcc (table, to, &cc, &bcc); - tov = destination_list_to_vector (to); - ccv = destination_list_to_vector (cc); + tov = destination_list_to_vector (to); + ccv = destination_list_to_vector (cc); bccv = destination_list_to_vector (bcc); g_list_free (to); diff --git a/e-util/e-attachment-button.c b/e-util/e-attachment-button.c index a04b85db38..5d38a213d8 100644 --- a/e-util/e-attachment-button.c +++ b/e-util/e-attachment-button.c @@ -45,7 +45,7 @@ struct _EAttachmentButtonPrivate { GtkWidget *popup_menu; guint expandable : 1; - guint expanded : 1; + guint expanded : 1; }; enum { diff --git a/e-util/e-attachment.c b/e-util/e-attachment.c index b7c59779e1..06018e8130 100644 --- a/e-util/e-attachment.c +++ b/e-util/e-attachment.c @@ -69,9 +69,9 @@ struct _EAttachmentPrivate { gint64 last_percent_notify; /* to avoid excessive notifications */ guint can_show : 1; - guint loading : 1; - guint saving : 1; - guint shown : 1; + guint loading : 1; + guint saving : 1; + guint shown : 1; camel_cipher_validity_encrypt_t encrypted; camel_cipher_validity_sign_t signed_; diff --git a/e-util/e-buffer-tagger.c b/e-util/e-buffer-tagger.c index d79ef2f32e..7866c88296 100644 --- a/e-util/e-buffer-tagger.c +++ b/e-util/e-buffer-tagger.c @@ -33,21 +33,19 @@ #include "e-misc-utils.h" -enum EBufferTaggerState -{ - E_BUFFER_TAGGER_STATE_NONE = 0, - E_BUFFER_TAGGER_STATE_INSDEL = 1 << 0, /* set when was called insert or delete of a text */ - E_BUFFER_TAGGER_STATE_CHANGED = 1 << 1, /* remark of the buffer is scheduled */ - E_BUFFER_TAGGER_STATE_IS_HOVERING = 1 << 2, /* mouse is over the link */ +enum EBufferTaggerState { + E_BUFFER_TAGGER_STATE_NONE = 0, + E_BUFFER_TAGGER_STATE_INSDEL = 1 << 0, /* set when was called insert or delete of a text */ + E_BUFFER_TAGGER_STATE_CHANGED = 1 << 1, /* remark of the buffer is scheduled */ + E_BUFFER_TAGGER_STATE_IS_HOVERING = 1 << 2, /* mouse is over the link */ E_BUFFER_TAGGER_STATE_IS_HOVERING_TOOLTIP = 1 << 3, /* mouse is over the link and the tooltip can be shown */ - E_BUFFER_TAGGER_STATE_CTRL_DOWN = 1 << 4 /* Ctrl key is down */ + E_BUFFER_TAGGER_STATE_CTRL_DOWN = 1 << 4 /* Ctrl key is down */ }; #define E_BUFFER_TAGGER_DATA_STATE "EBufferTagger::state" #define E_BUFFER_TAGGER_LINK_TAG "EBufferTagger::link" -struct _MagicInsertMatch -{ +struct _MagicInsertMatch { const gchar *regex; regex_t *preg; const gchar *prefix; diff --git a/e-util/e-calendar-item.c b/e-util/e-calendar-item.c index 2d5f895251..8f58b6d1e6 100644 --- a/e-util/e-calendar-item.c +++ b/e-util/e-calendar-item.c @@ -1957,7 +1957,7 @@ e_calendar_item_selection_add_days (ECalendarItem *calitem, g_date_compare (calitem->selecting_axis, &gdate_end) == 0) || (days_between == 0 && n_days < 0)) { if (days_between - n_days > calitem->max_days_selected - 1) - n_days = days_between + 1 - calitem->max_days_selected; + n_days = days_between + 1 - calitem->max_days_selected; g_date_add_days (&gdate_start, n_days); } else { diff --git a/e-util/e-calendar.c b/e-util/e-calendar.c index 14bc4c141c..cb989bf72f 100644 --- a/e-util/e-calendar.c +++ b/e-util/e-calendar.c @@ -40,9 +40,9 @@ #define E_CALENDAR_SMALL_FONT_PTSIZE 6 -#define E_CALENDAR_SMALL_FONT \ +#define E_CALENDAR_SMALL_FONT \ "-adobe-utopia-regular-r-normal-*-*-100-*-*-p-*-iso8859-*" -#define E_CALENDAR_SMALL_FONT_FALLBACK \ +#define E_CALENDAR_SMALL_FONT_FALLBACK \ "-adobe-helvetica-medium-r-normal-*-*-80-*-*-p-*-iso8859-*" /* The space between the arrow buttons and the edge of the widget. */ @@ -125,14 +125,14 @@ e_calendar_class_init (ECalendarClass *class) object_class->dispose = e_calendar_dispose; - widget_class->realize = e_calendar_realize; - widget_class->style_set = e_calendar_style_set; - widget_class->get_preferred_width = e_calendar_get_preferred_width; + widget_class->realize = e_calendar_realize; + widget_class->style_set = e_calendar_style_set; + widget_class->get_preferred_width = e_calendar_get_preferred_width; widget_class->get_preferred_height = e_calendar_get_preferred_height; - widget_class->size_allocate = e_calendar_size_allocate; - widget_class->drag_motion = e_calendar_drag_motion; - widget_class->drag_leave = e_calendar_drag_leave; - widget_class->focus = e_calendar_focus; + widget_class->size_allocate = e_calendar_size_allocate; + widget_class->drag_motion = e_calendar_drag_motion; + widget_class->drag_leave = e_calendar_drag_leave; + widget_class->focus = e_calendar_focus; } static void diff --git a/e-util/e-canvas-background.c b/e-util/e-canvas-background.c index d2ba1d0763..af0ddb688a 100644 --- a/e-util/e-canvas-background.c +++ b/e-util/e-canvas-background.c @@ -191,8 +191,8 @@ ecb_draw (GnomeCanvasItem *item, 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); + ((ecb->priv->rgba >> 8) & 0xff) / 255.0, + ( ecb->priv->rgba & 0xff) / 255.0); cairo_paint (cr); cairo_restore (cr); } @@ -225,15 +225,15 @@ ecb_class_init (ECanvasBackgroundClass *ecb_class) g_type_class_add_private (ecb_class, sizeof (ECanvasBackgroundPrivate)); - object_class->set_property = ecb_set_property; - object_class->get_property = ecb_get_property; + object_class->set_property = ecb_set_property; + object_class->get_property = ecb_get_property; - item_class->update = ecb_update; - item_class->draw = ecb_draw; - item_class->point = ecb_point; - item_class->bounds = ecb_bounds; + item_class->update = ecb_update; + item_class->draw = ecb_draw; + item_class->point = ecb_point; + item_class->bounds = ecb_bounds; - ecb_class->style_set = ecb_style_set; + ecb_class->style_set = ecb_style_set; g_object_class_install_property ( object_class, diff --git a/e-util/e-canvas-vbox.c b/e-util/e-canvas-vbox.c index c6b319ec6c..a7bcbc967c 100644 --- a/e-util/e-canvas-vbox.c +++ b/e-util/e-canvas-vbox.c @@ -69,16 +69,16 @@ e_canvas_vbox_class_init (ECanvasVboxClass *class) object_class = (GObjectClass *) class; item_class = (GnomeCanvasItemClass *) class; - class->add_item = e_canvas_vbox_real_add_item; + class->add_item = e_canvas_vbox_real_add_item; class->add_item_start = e_canvas_vbox_real_add_item_start; object_class->set_property = e_canvas_vbox_set_property; object_class->get_property = e_canvas_vbox_get_property; - object_class->dispose = e_canvas_vbox_dispose; + object_class->dispose = e_canvas_vbox_dispose; /* GnomeCanvasItem method overrides */ - item_class->event = e_canvas_vbox_event; - item_class->realize = e_canvas_vbox_realize; + item_class->event = e_canvas_vbox_event; + item_class->realize = e_canvas_vbox_realize; g_object_class_install_property ( object_class, @@ -386,7 +386,7 @@ e_canvas_vbox_reflow (GnomeCanvasItem *item, e_canvas_vbox->height = running_height; e_canvas_vbox->width = max_width; if (old_height != e_canvas_vbox->height || - old_width != e_canvas_vbox->width) + old_width != e_canvas_vbox->width) e_canvas_item_request_parent_reflow (item); } } diff --git a/e-util/e-canvas.c b/e-util/e-canvas.c index 2b3b3a3d4b..2183b3d628 100644 --- a/e-util/e-canvas.c +++ b/e-util/e-canvas.c @@ -223,16 +223,16 @@ pick_current_item (GnomeCanvas *canvas, (event->type == GDK_BUTTON_RELEASE)) { /* these fields have the same offsets in both types of events */ - canvas->pick_event.crossing.type = GDK_ENTER_NOTIFY; - canvas->pick_event.crossing.window = event->motion.window; + canvas->pick_event.crossing.type = GDK_ENTER_NOTIFY; + canvas->pick_event.crossing.window = event->motion.window; canvas->pick_event.crossing.send_event = event->motion.send_event; - canvas->pick_event.crossing.subwindow = NULL; - canvas->pick_event.crossing.x = event->motion.x; - canvas->pick_event.crossing.y = event->motion.y; - canvas->pick_event.crossing.mode = GDK_CROSSING_NORMAL; - canvas->pick_event.crossing.detail = GDK_NOTIFY_NONLINEAR; - canvas->pick_event.crossing.focus = FALSE; - canvas->pick_event.crossing.state = event->motion.state; + canvas->pick_event.crossing.subwindow = NULL; + canvas->pick_event.crossing.x = event->motion.x; + canvas->pick_event.crossing.y = event->motion.y; + canvas->pick_event.crossing.mode = GDK_CROSSING_NORMAL; + canvas->pick_event.crossing.detail = GDK_NOTIFY_NONLINEAR; + canvas->pick_event.crossing.focus = FALSE; + canvas->pick_event.crossing.state = event->motion.state; /* these fields don't have the same offsets in both types of events */ diff --git a/e-util/e-canvas.h b/e-util/e-canvas.h index 23f502dbd6..3666958cb7 100644 --- a/e-util/e-canvas.h +++ b/e-util/e-canvas.h @@ -71,7 +71,7 @@ typedef struct _ECanvasClass ECanvasClass; /* Object flags for items */ enum { - E_CANVAS_ITEM_NEEDS_REFLOW = 1 << 13, + E_CANVAS_ITEM_NEEDS_REFLOW = 1 << 13, E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW = 1 << 14 }; diff --git a/e-util/e-cell-combo.c b/e-util/e-cell-combo.c index e761869232..34384293c7 100644 --- a/e-util/e-cell-combo.c +++ b/e-util/e-cell-combo.c @@ -480,7 +480,7 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc, canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas); /* This code is practically copied from GtkCombo. */ - popup = GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window); + popup = GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window); popwin = GTK_BIN (ecc->popup_window); window = gtk_widget_get_window (canvas); diff --git a/e-util/e-cell-date-edit.c b/e-util/e-cell-date-edit.c index 52414013a0..6efe6f8204 100644 --- a/e-util/e-cell-date-edit.c +++ b/e-util/e-cell-date-edit.c @@ -773,7 +773,7 @@ e_cell_date_edit_rebuild_time_list (ECellDateEdit *ecde) tmp_tm.tm_year = 2000; tmp_tm.tm_mon = 0; tmp_tm.tm_mday = 1; - tmp_tm.tm_sec = 0; + tmp_tm.tm_sec = 0; tmp_tm.tm_isdst = 0; for (hour = ecde->lower_hour; hour <= ecde->upper_hour; hour++) { @@ -789,7 +789,7 @@ e_cell_date_edit_rebuild_time_list (ECellDateEdit *ecde) GtkTreeIter iter; tmp_tm.tm_hour = hour; - tmp_tm.tm_min = min; + tmp_tm.tm_min = min; e_time_format_time (&tmp_tm, ecde->use_24_hour_format, FALSE, buffer, sizeof (buffer)); diff --git a/e-util/e-cell-date.c b/e-util/e-cell-date.c index 77dd7b6bea..e6c4d33505 100644 --- a/e-util/e-cell-date.c +++ b/e-util/e-cell-date.c @@ -72,7 +72,7 @@ e_cell_date_class_init (ECellDateClass *class) { ECellTextClass *ectc = E_CELL_TEXT_CLASS (class); - ectc->get_text = ecd_get_text; + ectc->get_text = ecd_get_text; ectc->free_text = ecd_free_text; } diff --git a/e-util/e-cell-hbox.c b/e-util/e-cell-hbox.c index ca11158a74..74a78717b3 100644 --- a/e-util/e-cell-hbox.c +++ b/e-util/e-cell-hbox.c @@ -296,15 +296,15 @@ e_cell_hbox_class_init (ECellHboxClass *class) object_class->dispose = ecv_dispose; - ecc->new_view = ecv_new_view; - ecc->kill_view = ecv_kill_view; - ecc->realize = ecv_realize; - ecc->unrealize = ecv_unrealize; - ecc->draw = ecv_draw; - ecc->event = ecv_event; - ecc->height = ecv_height; + ecc->new_view = ecv_new_view; + ecc->kill_view = ecv_kill_view; + ecc->realize = ecv_realize; + ecc->unrealize = ecv_unrealize; + ecc->draw = ecv_draw; + ecc->event = ecv_event; + ecc->height = ecv_height; - ecc->max_width = ecv_max_width; + ecc->max_width = ecv_max_width; /* gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_HBOX, gal_a11y_e_cell_hbox_new); */ } @@ -339,9 +339,9 @@ e_cell_hbox_append (ECellHbox *hbox, { hbox->subcell_count++; - hbox->subcells = g_renew (ECell *, hbox->subcells, hbox->subcell_count); - hbox->model_cols = g_renew (int, hbox->model_cols, hbox->subcell_count); - hbox->def_size_cols = g_renew (int, hbox->def_size_cols, hbox->subcell_count); + hbox->subcells = g_renew (ECell *, hbox->subcells, hbox->subcell_count); + hbox->model_cols = g_renew (int, hbox->model_cols, hbox->subcell_count); + hbox->def_size_cols = g_renew (int, hbox->def_size_cols, hbox->subcell_count); hbox->subcells[hbox->subcell_count - 1] = subcell; hbox->model_cols[hbox->subcell_count - 1] = model_col; diff --git a/e-util/e-cell-number.c b/e-util/e-cell-number.c index 43f9c6437d..c83063a324 100644 --- a/e-util/e-cell-number.c +++ b/e-util/e-cell-number.c @@ -59,7 +59,7 @@ e_cell_number_class_init (ECellNumberClass *class) { ECellTextClass *ectc = E_CELL_TEXT_CLASS (class); - ectc->get_text = ecn_get_text; + ectc->get_text = ecn_get_text; ectc->free_text = ecn_free_text; } diff --git a/e-util/e-cell-percent.c b/e-util/e-cell-percent.c index 9d1b278e8e..668899ad88 100644 --- a/e-util/e-cell-percent.c +++ b/e-util/e-cell-percent.c @@ -124,7 +124,7 @@ e_cell_percent_class_init (ECellPercentClass *ecpc) { ECellTextClass *ectc = (ECellTextClass *) ecpc; - ectc->get_text = ecp_get_text; + ectc->get_text = ecp_get_text; ectc->free_text = ecp_free_text; ectc->set_value = ecp_set_value; } diff --git a/e-util/e-cell-popup.c b/e-util/e-cell-popup.c index bfbfcabfaa..1b311d26bd 100644 --- a/e-util/e-cell-popup.c +++ b/e-util/e-cell-popup.c @@ -114,18 +114,18 @@ e_cell_popup_class_init (ECellPopupClass *class) G_OBJECT_CLASS (class)->dispose = e_cell_popup_dispose; - ecc->new_view = ecp_new_view; - ecc->kill_view = ecp_kill_view; - ecc->realize = ecp_realize; - ecc->unrealize = ecp_unrealize; - ecc->draw = ecp_draw; - ecc->event = ecp_event; - ecc->height = ecp_height; - ecc->enter_edit = ecp_enter_edit; - ecc->leave_edit = ecp_leave_edit; - ecc->print = ecp_print; + ecc->new_view = ecp_new_view; + ecc->kill_view = ecp_kill_view; + ecc->realize = ecp_realize; + ecc->unrealize = ecp_unrealize; + ecc->draw = ecp_draw; + ecc->event = ecp_event; + ecc->height = ecp_height; + ecc->enter_edit = ecp_enter_edit; + ecc->leave_edit = ecp_leave_edit; + ecc->print = ecp_print; ecc->print_height = ecp_print_height; - ecc->max_width = ecp_max_width; + ecc->max_width = ecp_max_width; ecc->get_bg_color = ecp_get_bg_color; gal_a11y_e_cell_registry_add_cell_type ( diff --git a/e-util/e-cell-renderer-color.c b/e-util/e-cell-renderer-color.c index 4105fe7cee..dad3992c0b 100644 --- a/e-util/e-cell-renderer-color.c +++ b/e-util/e-cell-renderer-color.c @@ -52,7 +52,7 @@ cell_renderer_color_get_size (GtkCellRenderer *cell, gint *width, gint *height) { - gint color_width = 16; + gint color_width = 16; gint color_height = 16; gint calc_width; gint calc_height; @@ -65,7 +65,7 @@ cell_renderer_color_get_size (GtkCellRenderer *cell, cell, "xalign", &xalign, "yalign", &yalign, "xpad", &xpad, "ypad", &ypad, NULL); - calc_width = (gint) xpad * 2 + color_width; + calc_width = (gint) xpad * 2 + color_width; calc_height = (gint) ypad * 2 + color_height; if (cell_area && color_width > 0 && color_height > 0) { diff --git a/e-util/e-cell-size.c b/e-util/e-cell-size.c index 4fe2b00765..19bd49177e 100644 --- a/e-util/e-cell-size.c +++ b/e-util/e-cell-size.c @@ -64,7 +64,7 @@ e_cell_size_class_init (ECellSizeClass *class) { ECellTextClass *ectc = E_CELL_TEXT_CLASS (class); - ectc->get_text = ecd_get_text; + ectc->get_text = ecd_get_text; ectc->free_text = ecd_free_text; } diff --git a/e-util/e-cell-text.c b/e-util/e-cell-text.c index 9e97e4916f..5a05da5128 100644 --- a/e-util/e-cell-text.c +++ b/e-util/e-cell-text.c @@ -1096,7 +1096,7 @@ ect_enter_edit (ECellView *ecell_view, edit = g_new0 (CellEdit, 1); text_view->edit = edit; - edit->im_context = E_CANVAS (text_view->canvas)->im_context; + edit->im_context = E_CANVAS (text_view->canvas)->im_context; edit->need_im_reset = FALSE; edit->im_context_signals_registered = FALSE; edit->view_col = -1; @@ -1336,7 +1336,7 @@ ect_print (ECellView *ecell_view, font_metrics = pango_context_get_metrics ( pango_context, style->font_desc, pango_context_get_language (pango_context)); - ty = (gdouble)(text_height - + ty = (gdouble)(text_height - pango_font_metrics_get_ascent (font_metrics) - pango_font_metrics_get_descent (font_metrics)) / 2.0 /(gdouble) PANGO_SCALE; @@ -1579,19 +1579,19 @@ e_cell_text_class_init (ECellTextClass *class) object_class->finalize = ect_finalize; - ecc->new_view = ect_new_view; - ecc->kill_view = ect_kill_view; - ecc->realize = ect_realize; - ecc->unrealize = ect_unrealize; - ecc->draw = ect_draw; - ecc->event = ect_event; - ecc->height = ect_height; + ecc->new_view = ect_new_view; + ecc->kill_view = ect_kill_view; + ecc->realize = ect_realize; + ecc->unrealize = ect_unrealize; + ecc->draw = ect_draw; + ecc->event = ect_event; + ecc->height = ect_height; ecc->enter_edit = ect_enter_edit; ecc->leave_edit = ect_leave_edit; ecc->save_state = ect_save_state; ecc->load_state = ect_load_state; ecc->free_state = ect_free_state; - ecc->print = ect_print; + ecc->print = ect_print; ecc->print_height = ect_print_height; ecc->max_width = ect_max_width; ecc->max_width_by_row = ect_max_width_by_row; diff --git a/e-util/e-cell-tree.c b/e-util/e-cell-tree.c index 477d470a24..ba5b132568 100644 --- a/e-util/e-cell-tree.c +++ b/e-util/e-cell-tree.c @@ -776,19 +776,19 @@ e_cell_tree_class_init (ECellTreeClass *class) object_class->dispose = ect_dispose; - ecc->new_view = ect_new_view; - ecc->kill_view = ect_kill_view; - ecc->realize = ect_realize; - ecc->unrealize = ect_unrealize; - ecc->draw = ect_draw; - ecc->event = ect_event; - ecc->height = ect_height; - ecc->enter_edit = ect_enter_edit; - ecc->leave_edit = ect_leave_edit; - ecc->print = ect_print; - ecc->print_height = ect_print_height; - ecc->max_width = ect_max_width; - ecc->get_bg_color = ect_get_bg_color; + ecc->new_view = ect_new_view; + ecc->kill_view = ect_kill_view; + ecc->realize = ect_realize; + ecc->unrealize = ect_unrealize; + ecc->draw = ect_draw; + ecc->event = ect_event; + ecc->height = ect_height; + ecc->enter_edit = ect_enter_edit; + ecc->leave_edit = ect_leave_edit; + ecc->print = ect_print; + ecc->print_height = ect_print_height; + 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); } diff --git a/e-util/e-cell-vbox.c b/e-util/e-cell-vbox.c index e877063e91..49265e3e8b 100644 --- a/e-util/e-cell-vbox.c +++ b/e-util/e-cell-vbox.c @@ -288,14 +288,14 @@ e_cell_vbox_class_init (ECellVboxClass *class) object_class->dispose = ecv_dispose; object_class->finalize = ecv_finalize; - ecc->new_view = ecv_new_view; - ecc->kill_view = ecv_kill_view; - ecc->realize = ecv_realize; - ecc->unrealize = ecv_unrealize; - ecc->draw = ecv_draw; - ecc->event = ecv_event; - ecc->height = ecv_height; - ecc->max_width = ecv_max_width; + ecc->new_view = ecv_new_view; + ecc->kill_view = ecv_kill_view; + ecc->realize = ecv_realize; + ecc->unrealize = ecv_unrealize; + ecc->draw = ecv_draw; + ecc->event = ecv_event; + ecc->height = ecv_height; + ecc->max_width = ecv_max_width; gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_VBOX, gal_a11y_e_cell_vbox_new); } @@ -329,7 +329,7 @@ e_cell_vbox_append (ECellVbox *vbox, { vbox->subcell_count++; - vbox->subcells = g_renew (ECell *, vbox->subcells, vbox->subcell_count); + vbox->subcells = g_renew (ECell *, vbox->subcells, vbox->subcell_count); vbox->model_cols = g_renew (int, vbox->model_cols, vbox->subcell_count); vbox->subcells[vbox->subcell_count - 1] = subcell; diff --git a/e-util/e-cell.h b/e-util/e-cell.h index 67ac731db7..8d5e306c79 100644 --- a/e-util/e-cell.h +++ b/e-util/e-cell.h @@ -63,29 +63,29 @@ typedef gboolean (*ETableSearchFunc) (gconstpointer haystack, const gchar *needle); typedef enum { - E_CELL_SELECTED = 1 << 0, + E_CELL_SELECTED = 1 << 0, - E_CELL_JUSTIFICATION = 3 << 1, + E_CELL_JUSTIFICATION = 3 << 1, E_CELL_JUSTIFY_CENTER = 0 << 1, - E_CELL_JUSTIFY_LEFT = 1 << 1, - E_CELL_JUSTIFY_RIGHT = 2 << 1, - E_CELL_JUSTIFY_FILL = 3 << 1, + E_CELL_JUSTIFY_LEFT = 1 << 1, + E_CELL_JUSTIFY_RIGHT = 2 << 1, + E_CELL_JUSTIFY_FILL = 3 << 1, - E_CELL_ALIGN_LEFT = 1 << 1, - E_CELL_ALIGN_RIGHT = 1 << 2, + E_CELL_ALIGN_LEFT = 1 << 1, + E_CELL_ALIGN_RIGHT = 1 << 2, - E_CELL_FOCUSED = 1 << 3, + E_CELL_FOCUSED = 1 << 3, - E_CELL_EDITING = 1 << 4, + E_CELL_EDITING = 1 << 4, - E_CELL_CURSOR = 1 << 5, + E_CELL_CURSOR = 1 << 5, - E_CELL_PREEDIT = 1 << 6 + E_CELL_PREEDIT = 1 << 6 } ECellFlags; typedef enum { - E_CELL_GRAB = 1 << 0, - E_CELL_UNGRAB = 1 << 1 + E_CELL_GRAB = 1 << 0, + E_CELL_UNGRAB = 1 << 1 } ECellActions; struct _ECellView { diff --git a/e-util/e-charset-combo-box.c b/e-util/e-charset-combo-box.c index ececac3c1a..240c28582f 100644 --- a/e-util/e-charset-combo-box.c +++ b/e-util/e-charset-combo-box.c @@ -220,32 +220,6 @@ charset_combo_box_get_property (GObject *object, } static void -charset_combo_box_constructed (GObject *object) -{ - ECharsetComboBoxPrivate *priv; - GtkRadioAction *radio_action; - GSList *group; - - priv = E_CHARSET_COMBO_BOX_GET_PRIVATE (object); - - /* Chain up to parent's constructed() method. */ - G_OBJECT_CLASS (e_charset_combo_box_parent_class)->constructed (object); - - radio_action = priv->other_action; - group = gtk_radio_action_get_group (radio_action); - - e_action_combo_box_set_action ( - E_ACTION_COMBO_BOX (object), radio_action); - - e_action_combo_box_add_separator_after ( - E_ACTION_COMBO_BOX (object), g_slist_length (group)); - - g_signal_connect ( - object, "notify::charset", - G_CALLBACK (charset_combo_box_notify_charset_cb), NULL); -} - -static void charset_combo_box_dispose (GObject *object) { ECharsetComboBoxPrivate *priv; @@ -282,6 +256,32 @@ charset_combo_box_finalize (GObject *object) } static void +charset_combo_box_constructed (GObject *object) +{ + ECharsetComboBoxPrivate *priv; + GtkRadioAction *radio_action; + GSList *group; + + priv = E_CHARSET_COMBO_BOX_GET_PRIVATE (object); + + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_charset_combo_box_parent_class)->constructed (object); + + radio_action = priv->other_action; + group = gtk_radio_action_get_group (radio_action); + + e_action_combo_box_set_action ( + E_ACTION_COMBO_BOX (object), radio_action); + + e_action_combo_box_add_separator_after ( + E_ACTION_COMBO_BOX (object), g_slist_length (group)); + + g_signal_connect ( + object, "notify::charset", + G_CALLBACK (charset_combo_box_notify_charset_cb), NULL); +} + +static void charset_combo_box_changed (GtkComboBox *combo_box) { ECharsetComboBoxPrivate *priv; @@ -308,9 +308,9 @@ e_charset_combo_box_class_init (ECharsetComboBoxClass *class) object_class = G_OBJECT_CLASS (class); object_class->set_property = charset_combo_box_set_property; object_class->get_property = charset_combo_box_get_property; - object_class->constructed = charset_combo_box_constructed; object_class->dispose = charset_combo_box_dispose; object_class->finalize = charset_combo_box_finalize; + object_class->constructed = charset_combo_box_constructed; combo_box_class = GTK_COMBO_BOX_CLASS (class); combo_box_class->changed = charset_combo_box_changed; diff --git a/e-util/e-contact-store.c b/e-util/e-contact-store.c index 68dd1d09d9..b2b36db527 100644 --- a/e-util/e-contact-store.c +++ b/e-util/e-contact-store.c @@ -189,18 +189,18 @@ e_contact_store_class_init (EContactStoreClass *class) static void e_contact_store_tree_model_init (GtkTreeModelIface *iface) { - iface->get_flags = e_contact_store_get_flags; - iface->get_n_columns = e_contact_store_get_n_columns; + iface->get_flags = e_contact_store_get_flags; + iface->get_n_columns = e_contact_store_get_n_columns; iface->get_column_type = e_contact_store_get_column_type; - iface->get_iter = e_contact_store_get_iter; - iface->get_path = e_contact_store_get_path; - iface->get_value = e_contact_store_get_value; - iface->iter_next = e_contact_store_iter_next; - iface->iter_children = e_contact_store_iter_children; - iface->iter_has_child = e_contact_store_iter_has_child; + iface->get_iter = e_contact_store_get_iter; + iface->get_path = e_contact_store_get_path; + iface->get_value = e_contact_store_get_value; + iface->iter_next = e_contact_store_iter_next; + iface->iter_children = e_contact_store_iter_children; + iface->iter_has_child = e_contact_store_iter_has_child; iface->iter_n_children = e_contact_store_iter_n_children; - iface->iter_nth_child = e_contact_store_iter_nth_child; - iface->iter_parent = e_contact_store_iter_parent; + iface->iter_nth_child = e_contact_store_iter_nth_child; + iface->iter_parent = e_contact_store_iter_parent; } static void @@ -428,7 +428,7 @@ find_contact_by_view_and_uid (EContactStore *contact_store, for (i = 0; i < contacts->len; i++) { EContact *contact = g_ptr_array_index (contacts, i); - const gchar *uid = e_contact_get_const (contact, E_CONTACT_UID); + const gchar *uid = e_contact_get_const (contact, E_CONTACT_UID); if (uid && !strcmp (find_uid, uid)) return i; @@ -452,7 +452,7 @@ find_contact_by_uid (EContactStore *contact_store, for (j = 0; j < source->contacts->len; j++) { EContact *contact = g_ptr_array_index (source->contacts, j); - const gchar *uid = e_contact_get_const (contact, E_CONTACT_UID); + const gchar *uid = e_contact_get_const (contact, E_CONTACT_UID); if (!strcmp (find_uid, uid)) return get_contact_source_offset (contact_store, i) + j; @@ -573,7 +573,7 @@ view_contacts_removed (EContactStore *contact_store, for (l = uids; l; l = g_slist_next (l)) { const gchar *uid = l->data; - gint n = find_contact_by_view_and_uid (contact_store, client_view, uid); + gint n = find_contact_by_view_and_uid (contact_store, client_view, uid); EContact *contact; if (n < 0) { @@ -619,8 +619,8 @@ view_contacts_modified (EContactStore *contact_store, for (l = contacts; l; l = g_slist_next (l)) { EContact *cached_contact; EContact *contact = l->data; - const gchar *uid = e_contact_get_const (contact, E_CONTACT_UID); - gint n = find_contact_by_view_and_uid (contact_store, client_view, uid); + const gchar *uid = e_contact_get_const (contact, E_CONTACT_UID); + gint n = find_contact_by_view_and_uid (contact_store, client_view, uid); if (n < 0) { g_warning ("EContactStore got change notification on unknown contact!"); @@ -671,7 +671,7 @@ view_complete (EContactStore *contact_store, /* Deletions */ for (i = 0; i < source->contacts->len; i++) { EContact *old_contact = g_ptr_array_index (source->contacts, i); - const gchar *old_uid = e_contact_get_const (old_contact, E_CONTACT_UID); + const gchar *old_uid = e_contact_get_const (old_contact, E_CONTACT_UID); gint result; result = find_contact_by_view_and_uid (contact_store, source->client_view_pending, old_uid); @@ -687,7 +687,7 @@ view_complete (EContactStore *contact_store, /* Insertions */ for (i = 0; i < source->contacts_pending->len; i++) { EContact *new_contact = g_ptr_array_index (source->contacts_pending, i); - const gchar *new_uid = e_contact_get_const (new_contact, E_CONTACT_UID); + const gchar *new_uid = e_contact_get_const (new_contact, E_CONTACT_UID); gint result; result = find_contact_by_view_and_uid (contact_store, source->client_view, new_uid); @@ -837,7 +837,7 @@ clear_contact_source (EContactStore *contact_store, free_contact_ptrarray (source->contacts_pending); source->client_view_pending = NULL; - source->contacts_pending = NULL; + source->contacts_pending = NULL; } } diff --git a/e-util/e-dateedit.c b/e-util/e-dateedit.c index 63e19c80ee..d9decd353f 100644 --- a/e-util/e-dateedit.c +++ b/e-util/e-dateedit.c @@ -543,7 +543,7 @@ create_children (EDateEdit *dedit) priv = dedit->priv; - priv->date_entry = gtk_entry_new (); + priv->date_entry = gtk_entry_new (); a11y = gtk_widget_get_accessible (priv->date_entry); atk_object_set_description (a11y, _("Text entry to input date")); atk_object_set_name (a11y, _("Date")); @@ -1688,8 +1688,8 @@ hide_date_popup (EDateEdit *dedit) } /* some locales may not define am/pm equivalents for '%p', - thus force 24 hour format for these, otherwise the am/pm - time clashes */ + * thus force 24 hour format for these, otherwise the am/pm + * time clashes */ static gboolean date_edit_use_24_hour_format (gboolean use_24_hour_format) { @@ -1703,16 +1703,16 @@ date_edit_use_24_hour_format (gboolean use_24_hour_format) tmp_tm.tm_year = 2000; tmp_tm.tm_mon = 0; tmp_tm.tm_mday = 1; - tmp_tm.tm_sec = 0; + tmp_tm.tm_sec = 0; tmp_tm.tm_isdst = 0; tmp_tm.tm_hour = 1; - tmp_tm.tm_min = 0; + tmp_tm.tm_min = 0; if (e_utf8_strftime (buffer, sizeof (buffer), "%p", &tmp_tm) == 0) return TRUE; tmp_tm.tm_hour = 13; - tmp_tm.tm_min = 0; + tmp_tm.tm_min = 0; if (e_utf8_strftime (buffer, sizeof (buffer), "%p", &tmp_tm) == 0) return TRUE; @@ -1744,7 +1744,7 @@ rebuild_time_popup (EDateEdit *dedit) tmp_tm.tm_year = 2000; tmp_tm.tm_mon = 0; tmp_tm.tm_mday = 1; - tmp_tm.tm_sec = 0; + tmp_tm.tm_sec = 0; tmp_tm.tm_isdst = 0; use_24_hour_format = date_edit_use_24_hour_format (priv->use_24_hour_format); @@ -1761,7 +1761,7 @@ rebuild_time_popup (EDateEdit *dedit) min == 0 || (min < 60 && hour != priv->upper_hour); min += 30) { tmp_tm.tm_hour = hour; - tmp_tm.tm_min = min; + tmp_tm.tm_min = min; e_time_format_time ( &tmp_tm, use_24_hour_format, 0, diff --git a/e-util/e-destination-store.c b/e-util/e-destination-store.c index 7a983cf1ce..0b705e1190 100644 --- a/e-util/e-destination-store.c +++ b/e-util/e-destination-store.c @@ -139,18 +139,18 @@ e_destination_store_class_init (EDestinationStoreClass *class) static void e_destination_store_tree_model_init (GtkTreeModelIface *iface) { - iface->get_flags = e_destination_store_get_flags; - iface->get_n_columns = e_destination_store_get_n_columns; + iface->get_flags = e_destination_store_get_flags; + iface->get_n_columns = e_destination_store_get_n_columns; iface->get_column_type = e_destination_store_get_column_type; - iface->get_iter = e_destination_store_get_iter; - iface->get_path = e_destination_store_get_path; - iface->get_value = e_destination_store_get_value; - iface->iter_next = e_destination_store_iter_next; - iface->iter_children = e_destination_store_iter_children; - iface->iter_has_child = e_destination_store_iter_has_child; + iface->get_iter = e_destination_store_get_iter; + iface->get_path = e_destination_store_get_path; + iface->get_value = e_destination_store_get_value; + iface->iter_next = e_destination_store_iter_next; + iface->iter_children = e_destination_store_iter_children; + iface->iter_has_child = e_destination_store_iter_has_child; iface->iter_n_children = e_destination_store_iter_n_children; - iface->iter_nth_child = e_destination_store_iter_nth_child; - iface->iter_parent = e_destination_store_iter_parent; + iface->iter_nth_child = e_destination_store_iter_nth_child; + iface->iter_parent = e_destination_store_iter_parent; } static void diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c index 1a64b4b1b9..1386002973 100644 --- a/e-util/e-dialog-widgets.c +++ b/e-util/e-dialog-widgets.c @@ -147,7 +147,7 @@ e_dialog_combo_box_get (GtkWidget *widget, **/ GtkWidget * e_dialog_button_new_with_icon (const gchar *icon_name, - const gchar *label) + const gchar *label) { GtkIconSize icon_size = GTK_ICON_SIZE_BUTTON; GtkWidget *button; @@ -160,7 +160,8 @@ e_dialog_button_new_with_icon (const gchar *icon_name, } if (icon_name) - gtk_button_set_image (GTK_BUTTON (button), + gtk_button_set_image ( + GTK_BUTTON (button), gtk_image_new_from_icon_name (icon_name, icon_size)); gtk_widget_show (button); diff --git a/e-util/e-filter-input.c b/e-util/e-filter-input.c index 512cf2dce1..6dbcc7e88a 100644 --- a/e-util/e-filter-input.c +++ b/e-util/e-filter-input.c @@ -169,7 +169,7 @@ filter_input_eq (EFilterElement *element_a, static void filter_input_xml_create (EFilterElement *element, - xmlNodePtr node) + xmlNodePtr node) { EFilterInput *input = E_FILTER_INPUT (element); gchar *allow_empty; diff --git a/e-util/e-focus-tracker.c b/e-util/e-focus-tracker.c index 42cd634202..0879a16c1d 100644 --- a/e-util/e-focus-tracker.c +++ b/e-util/e-focus-tracker.c @@ -100,8 +100,8 @@ focus_tracker_disable_actions (EFocusTracker *focus_tracker) static void focus_tracker_update_undo_redo (EFocusTracker *focus_tracker, - GtkWidget *widget, - gboolean can_edit_text) + GtkWidget *widget, + gboolean can_edit_text) { GtkAction *action; gboolean sensitive; @@ -198,12 +198,11 @@ focus_tracker_editable_update_actions (EFocusTracker *focus_tracker, focus_tracker_update_undo_redo (focus_tracker, GTK_WIDGET (editable), can_edit_text); } - static void focus_tracker_text_view_update_actions (EFocusTracker *focus_tracker, - GtkTextView *text_view, - GdkAtom *targets, - gint n_targets) + GtkTextView *text_view, + GdkAtom *targets, + gint n_targets) { GtkAction *action; GtkTextBuffer *buffer; @@ -332,7 +331,6 @@ focus_tracker_targets_received_cb (GtkClipboard *clipboard, focus_tracker, GTK_TEXT_VIEW (focus), targets, n_targets); - g_object_unref (focus_tracker); } @@ -973,7 +971,7 @@ e_focus_tracker_get_undo_action (EFocusTracker *focus_tracker) void e_focus_tracker_set_undo_action (EFocusTracker *focus_tracker, - GtkAction *undo) + GtkAction *undo) { g_return_if_fail (E_IS_FOCUS_TRACKER (focus_tracker)); @@ -1011,7 +1009,7 @@ e_focus_tracker_get_redo_action (EFocusTracker *focus_tracker) void e_focus_tracker_set_redo_action (EFocusTracker *focus_tracker, - GtkAction *redo) + GtkAction *redo) { g_return_if_fail (E_IS_FOCUS_TRACKER (focus_tracker)); @@ -1065,20 +1063,26 @@ e_focus_tracker_cut_clipboard (EFocusTracker *focus_tracker) focus = e_focus_tracker_get_focus (focus_tracker); - if (E_IS_SELECTABLE (focus)) + if (E_IS_SELECTABLE (focus)) { e_selectable_cut_clipboard (E_SELECTABLE (focus)); - else if (GTK_IS_EDITABLE (focus)) + } else if (GTK_IS_EDITABLE (focus)) { gtk_editable_cut_clipboard (GTK_EDITABLE (focus)); - else if (GTK_IS_TEXT_VIEW (focus)) { - GtkTextView *text_view = GTK_TEXT_VIEW (focus); - GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view); - gboolean is_editable = gtk_text_view_get_editable (text_view); + } else if (GTK_IS_TEXT_VIEW (focus)) { + GtkClipboard *clipboard; + GtkTextView *text_view; + GtkTextBuffer *buffer; + gboolean is_editable; - gtk_text_buffer_cut_clipboard (buffer, - gtk_widget_get_clipboard (focus, GDK_SELECTION_CLIPBOARD), - is_editable); + clipboard = gtk_widget_get_clipboard ( + focus, GDK_SELECTION_CLIPBOARD); + + text_view = GTK_TEXT_VIEW (focus); + buffer = gtk_text_view_get_buffer (text_view); + is_editable = gtk_text_view_get_editable (text_view); + + gtk_text_buffer_cut_clipboard (buffer, clipboard, is_editable); } } @@ -1091,17 +1095,24 @@ e_focus_tracker_copy_clipboard (EFocusTracker *focus_tracker) focus = e_focus_tracker_get_focus (focus_tracker); - if (E_IS_SELECTABLE (focus)) + if (E_IS_SELECTABLE (focus)) { e_selectable_copy_clipboard (E_SELECTABLE (focus)); - else if (GTK_IS_EDITABLE (focus)) + } else if (GTK_IS_EDITABLE (focus)) { gtk_editable_copy_clipboard (GTK_EDITABLE (focus)); - else if (GTK_IS_TEXT_VIEW (focus)) { - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focus)); + } else if (GTK_IS_TEXT_VIEW (focus)) { + GtkClipboard *clipboard; + GtkTextView *text_view; + GtkTextBuffer *buffer; + + clipboard = gtk_widget_get_clipboard ( + focus, GDK_SELECTION_CLIPBOARD); + + text_view = GTK_TEXT_VIEW (focus); + buffer = gtk_text_view_get_buffer (text_view); - gtk_text_buffer_copy_clipboard (buffer, - gtk_widget_get_clipboard (focus, GDK_SELECTION_CLIPBOARD)); + gtk_text_buffer_copy_clipboard (buffer, clipboard); } } @@ -1114,20 +1125,27 @@ e_focus_tracker_paste_clipboard (EFocusTracker *focus_tracker) focus = e_focus_tracker_get_focus (focus_tracker); - if (E_IS_SELECTABLE (focus)) + if (E_IS_SELECTABLE (focus)) { e_selectable_paste_clipboard (E_SELECTABLE (focus)); - else if (GTK_IS_EDITABLE (focus)) + } else if (GTK_IS_EDITABLE (focus)) { gtk_editable_paste_clipboard (GTK_EDITABLE (focus)); - else if (GTK_IS_TEXT_VIEW (focus)) { + } else if (GTK_IS_TEXT_VIEW (focus)) { + GtkClipboard *clipboard; GtkTextView *text_view = GTK_TEXT_VIEW (focus); GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view); gboolean is_editable = gtk_text_view_get_editable (text_view); - gtk_text_buffer_paste_clipboard (buffer, - gtk_widget_get_clipboard (focus, GDK_SELECTION_CLIPBOARD), - NULL, is_editable); + clipboard = gtk_widget_get_clipboard ( + focus, GDK_SELECTION_CLIPBOARD); + + text_view = GTK_TEXT_VIEW (focus); + buffer = gtk_text_view_get_buffer (text_view); + is_editable = gtk_text_view_get_editable (text_view); + + gtk_text_buffer_paste_clipboard ( + buffer, clipboard, NULL, is_editable); } } @@ -1140,16 +1158,20 @@ e_focus_tracker_delete_selection (EFocusTracker *focus_tracker) focus = e_focus_tracker_get_focus (focus_tracker); - if (E_IS_SELECTABLE (focus)) + if (E_IS_SELECTABLE (focus)) { e_selectable_delete_selection (E_SELECTABLE (focus)); - else if (GTK_IS_EDITABLE (focus)) + } else if (GTK_IS_EDITABLE (focus)) { gtk_editable_delete_selection (GTK_EDITABLE (focus)); - else if (GTK_IS_TEXT_VIEW (focus)) { - GtkTextView *text_view = GTK_TEXT_VIEW (focus); - GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view); - gboolean is_editable = gtk_text_view_get_editable (text_view); + } else if (GTK_IS_TEXT_VIEW (focus)) { + GtkTextView *text_view; + GtkTextBuffer *buffer; + gboolean is_editable; + + text_view = GTK_TEXT_VIEW (focus); + buffer = gtk_text_view_get_buffer (text_view); + is_editable = gtk_text_view_get_editable (text_view); gtk_text_buffer_delete_selection (buffer, TRUE, is_editable); } @@ -1164,16 +1186,20 @@ e_focus_tracker_select_all (EFocusTracker *focus_tracker) focus = e_focus_tracker_get_focus (focus_tracker); - if (E_IS_SELECTABLE (focus)) + if (E_IS_SELECTABLE (focus)) { e_selectable_select_all (E_SELECTABLE (focus)); - else if (GTK_IS_EDITABLE (focus)) + } else if (GTK_IS_EDITABLE (focus)) { gtk_editable_select_region (GTK_EDITABLE (focus), 0, -1); - else if (GTK_IS_TEXT_VIEW (focus)) { - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focus)); + } else if (GTK_IS_TEXT_VIEW (focus)) { + GtkTextView *text_view; + GtkTextBuffer *buffer; GtkTextIter start, end; + text_view = GTK_TEXT_VIEW (focus); + buffer = gtk_text_view_get_buffer (text_view); + gtk_text_buffer_get_bounds (buffer, &start, &end); gtk_text_buffer_select_range (buffer, &start, &end); } diff --git a/e-util/e-map.c b/e-util/e-map.c index 2451e4bd6a..ae472eb863 100644 --- a/e-util/e-map.c +++ b/e-util/e-map.c @@ -1308,8 +1308,8 @@ update_render_point (EMap *map, cr, ((point->rgba >> 24) & 0xff) / 255.0, ((point->rgba >> 16) & 0xff) / 255.0, - ((point->rgba >> 8) & 0xff) / 255.0, - ( point->rgba & 0xff) / 255.0); + ((point->rgba >> 8) & 0xff) / 255.0, + ( point->rgba & 0xff) / 255.0); mask = cairo_image_surface_create_for_data (mask2, CAIRO_FORMAT_A8, 3, 3, 4); cairo_mask_surface (cr, mask, px - 1, py - 1); cairo_surface_destroy (mask); diff --git a/e-util/e-menu-tool-action.c b/e-util/e-menu-tool-action.c index 29fe4d5a74..bc4e9b23c9 100644 --- a/e-util/e-menu-tool-action.c +++ b/e-util/e-menu-tool-action.c @@ -52,6 +52,8 @@ e_menu_tool_action_new (const gchar *name, return g_object_new ( E_TYPE_MENU_TOOL_ACTION, - "name", name, "label", label, "tooltip", - tooltip, NULL); + "name", name, + "label", label, + "tooltip", tooltip, + NULL); } diff --git a/e-util/e-misc-utils.h b/e-util/e-misc-utils.h index 54c8d157dc..cb262c7f76 100644 --- a/e-util/e-misc-utils.h +++ b/e-util/e-misc-utils.h @@ -45,7 +45,7 @@ typedef enum { } EFocus; typedef enum { - E_RESTORE_WINDOW_SIZE = 1 << 0, + E_RESTORE_WINDOW_SIZE = 1 << 0, E_RESTORE_WINDOW_POSITION = 1 << 1 } ERestoreWindowFlags; diff --git a/e-util/e-name-selector-dialog.c b/e-util/e-name-selector-dialog.c index e045a067e1..8bc9131594 100644 --- a/e-util/e-name-selector-dialog.c +++ b/e-util/e-name-selector-dialog.c @@ -946,8 +946,8 @@ add_section (ENameSelectorDialog *name_selector_dialog, "valign", GTK_ALIGN_FILL, NULL); section.label = GTK_LABEL (gtk_label_new_with_mnemonic (pretty_name)); - section.transfer_button = GTK_BUTTON (gtk_button_new ()); - section.remove_button = GTK_BUTTON (gtk_button_new ()); + section.transfer_button = GTK_BUTTON (gtk_button_new ()); + section.remove_button = GTK_BUTTON (gtk_button_new ()); section.destination_view = make_tree_view_for_section (name_selector_dialog, destination_store); gtk_label_set_mnemonic_widget (GTK_LABEL (section.label), GTK_WIDGET (section.destination_view)); diff --git a/e-util/e-name-selector-entry.c b/e-util/e-name-selector-entry.c index b45e16efcb..0f872e718f 100644 --- a/e-util/e-name-selector-entry.c +++ b/e-util/e-name-selector-entry.c @@ -93,10 +93,10 @@ G_DEFINE_TYPE_WITH_CODE ( /* 1/20 of a second to wait until show the completion results */ #define SHOW_RESULT_TIMEOUT 50 -#define re_set_timeout(id,func,ptr,tout) G_STMT_START { \ - if (id) \ - g_source_remove (id); \ - id = e_named_timeout_add (tout, func, ptr); \ +#define re_set_timeout(id,func,ptr,tout) G_STMT_START { \ + if (id) \ + g_source_remove (id); \ + id = e_named_timeout_add (tout, func, ptr); \ } G_STMT_END static void destination_row_inserted (ENameSelectorEntry *name_selector_entry, GtkTreePath *path, GtkTreeIter *iter); @@ -459,9 +459,9 @@ get_range_at_position (const gchar *string, gint *end_pos) { const gchar *p; - gboolean quoted = FALSE; + gboolean quoted = FALSE; gint local_start_pos = 0; - gint local_end_pos = 0; + gint local_end_pos = 0; gint i; if (!string || !*string) @@ -523,7 +523,7 @@ get_index_at_position (const gchar *string, { const gchar *p; gboolean quoted = FALSE; - gint n = 0; + gint n = 0; gint i; for (p = string, i = 0; *p && i < pos; p = g_utf8_next_char (p), i++) { @@ -577,7 +577,7 @@ get_address_at_position (const gchar *string, return NULL; start_p = g_utf8_offset_to_pointer (string, start_pos); - end_p = g_utf8_offset_to_pointer (string, end_pos); + end_p = g_utf8_offset_to_pointer (string, end_pos); return g_strndup (start_p, end_p - start_p); } @@ -766,10 +766,10 @@ set_completion_query (ENameSelectorEntry *name_selector_entry, return; } - encoded_cue_str = escape_sexp_string (cue_str); + encoded_cue_str = escape_sexp_string (cue_str); full_name_query_str = name_style_query ("full_name", cue_str); - file_as_query_str = name_style_query ("file_as", cue_str); - user_fields_str = ens_util_populate_user_query_fields (priv->user_query_fields, cue_str, encoded_cue_str); + file_as_query_str = name_style_query ("file_as", cue_str); + user_fields_str = ens_util_populate_user_query_fields (priv->user_query_fields, cue_str, encoded_cue_str); query_str = g_strdup_printf ( "(or " @@ -834,7 +834,7 @@ static gchar * build_textrep_for_contact (EContact *contact, EContactField cue_field) { - gchar *name = NULL; + gchar *name = NULL; gchar *email = NULL; gchar *textrep; @@ -842,7 +842,7 @@ build_textrep_for_contact (EContact *contact, case E_CONTACT_FULL_NAME: case E_CONTACT_NICKNAME: case E_CONTACT_FILE_AS: - name = e_contact_get (contact, cue_field); + name = e_contact_get (contact, cue_field); email = e_contact_get (contact, E_CONTACT_EMAIL_1); break; @@ -947,7 +947,7 @@ find_existing_completion (ENameSelectorEntry *name_selector_entry, EBookClient **book_client) { GtkTreeIter iter; - EContact *best_contact = NULL; + EContact *best_contact = NULL; gint best_field_rank = G_MAXINT; EContactField best_field = 0; EBookClient *best_book_client = NULL; @@ -974,9 +974,9 @@ find_existing_completion (ENameSelectorEntry *name_selector_entry, matches = contact_match_cue (name_selector_entry, current_contact, cue_str, ¤t_field, ¤t_field_rank); if (matches && current_field_rank < best_field_rank) { - best_contact = current_contact; + best_contact = current_contact; best_field_rank = current_field_rank; - best_field = current_field; + best_field = current_field; best_book_client = e_contact_store_get_client (name_selector_entry->priv->contact_store, &iter); } } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (name_selector_entry->priv->contact_store), &iter)); @@ -1062,8 +1062,8 @@ type_ahead_complete (ENameSelectorEntry *name_selector_entry) EDestination *destination; gint cursor_pos; gint range_start = 0; - gint range_end = 0; - gint pos = 0; + gint range_end = 0; + gint pos = 0; gchar *textrep; gint textrep_len; gint range_len; @@ -1098,7 +1098,7 @@ type_ahead_complete (ENameSelectorEntry *name_selector_entry) textrep = temp_str; textrep_len = g_utf8_strlen (textrep, -1); - pos = range_start; + pos = range_start; g_signal_handlers_block_by_func ( name_selector_entry, @@ -1171,9 +1171,9 @@ update_completion_model (ENameSelectorEntry *name_selector_entry) const gchar *text; gint cursor_pos; gint range_start = 0; - gint range_end = 0; + gint range_end = 0; - text = gtk_entry_get_text (GTK_ENTRY (name_selector_entry)); + text = gtk_entry_get_text (GTK_ENTRY (name_selector_entry)); cursor_pos = gtk_editable_get_position (GTK_EDITABLE (name_selector_entry)); if (cursor_pos >= 0) @@ -1423,7 +1423,7 @@ insert_unichar (ENameSelectorEntry *name_selector_entry, gint start_pos; gint end_pos; gboolean at_start = FALSE; - gboolean at_end = FALSE; + gboolean at_end = FALSE; if (str_context[1] == ',' || str_context[1] == '\0') return 0; @@ -1579,7 +1579,7 @@ user_delete_text (ENameSelectorEntry *name_selector_entry, } index_start = get_index_at_position (text, start_pos); - index_end = get_index_at_position (text, end_pos); + index_end = get_index_at_position (text, end_pos); g_signal_stop_emission_by_name (name_selector_entry, "delete_text"); @@ -1631,7 +1631,7 @@ user_delete_text (ENameSelectorEntry *name_selector_entry, /* Do the actual deletion */ - if (end_pos == start_pos +1 && index_end == index_start) { + if (end_pos == start_pos +1 && index_end == index_start) { /* We could be just deleting the empty text */ gchar *c; @@ -1643,7 +1643,7 @@ user_delete_text (ENameSelectorEntry *name_selector_entry, del_space = TRUE; } g_free (c); - } else if (end_pos == start_pos +1 && index_end == index_start + 1) { + } else if (end_pos == start_pos +1 && index_end == index_start + 1) { /* We could be just deleting the empty text */ gchar *c; @@ -1663,9 +1663,9 @@ user_delete_text (ENameSelectorEntry *name_selector_entry, /* If we have deleted the last comma, let us autocomplete normally */ - if (dest && len - end_pos != 0) { + if (dest && len - end_pos != 0) { - EDestination *destination1 = find_destination_by_index (name_selector_entry, index_start); + EDestination *destination1 = find_destination_by_index (name_selector_entry, index_start); gchar *ttext; const gchar *email = NULL; @@ -2061,7 +2061,7 @@ contact_layout_pixbuffer (GtkCellLayout *cell_layout, return; } - photo = e_contact_get (contact, E_CONTACT_PHOTO); + photo = e_contact_get (contact, E_CONTACT_PHOTO); if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) { guint max_height = entry_height (GTK_WIDGET (name_selector_entry)); GdkPixbufLoader *loader; @@ -2378,7 +2378,7 @@ destination_row_inserted (ENameSelectorEntry *name_selector_entry, const gchar *entry_text; gchar *text; gboolean comma_before = FALSE; - gboolean comma_after = FALSE; + gboolean comma_after = FALSE; gint range_start, range_end; gint insert_pos; gint n; @@ -2676,7 +2676,7 @@ eab_parse_qp_email (const gchar *string, return FALSE; /* report success only when we have filled both name and email address */ - if (address->type == CAMEL_HEADER_ADDRESS_NAME && address->name && *address->name && address->v.addr && *address->v.addr) { + if (address->type == CAMEL_HEADER_ADDRESS_NAME && address->name && *address->name && address->v.addr && *address->v.addr) { *name = g_strdup (address->name); *email = g_strdup (address->v.addr); res = TRUE; diff --git a/e-util/e-name-selector-list.c b/e-util/e-name-selector-list.c index f2d2a064bc..7375c47d4e 100644 --- a/e-util/e-name-selector-list.c +++ b/e-util/e-name-selector-list.c @@ -294,7 +294,7 @@ enl_entry_key_press_event (ENameSelectorList *list, entry = E_NAME_SELECTOR_ENTRY (list); store = e_name_selector_entry_peek_destination_store (entry); - if ( (event->state & GDK_CONTROL_MASK) && (event->keyval == GDK_KEY_Down)) { + if ( (event->state & GDK_CONTROL_MASK) && (event->keyval == GDK_KEY_Down)) { enl_popup_position (list); gtk_widget_show_all (GTK_WIDGET (list->priv->popup)); enl_popup_grab (list, (GdkEvent *) event); @@ -751,7 +751,7 @@ e_name_selector_list_init (ENameSelectorList *list) gtk_widget_set_vexpand (scroll, TRUE); gtk_widget_set_valign (scroll, GTK_ALIGN_FILL); - list->priv->popup = GTK_WINDOW (gtk_window_new (GTK_WINDOW_POPUP)); + list->priv->popup = GTK_WINDOW (gtk_window_new (GTK_WINDOW_POPUP)); gtk_window_set_resizable (GTK_WINDOW (list->priv->popup), FALSE); popup_frame = gtk_frame_new (NULL); diff --git a/e-util/e-name-selector-model.c b/e-util/e-name-selector-model.c index 48d79e8923..5b3690d6e4 100644 --- a/e-util/e-name-selector-model.c +++ b/e-util/e-name-selector-model.c @@ -75,8 +75,8 @@ e_name_selector_model_init (ENameSelectorModel *name_selector_model) name_selector_model->priv = E_NAME_SELECTOR_MODEL_GET_PRIVATE (name_selector_model); - name_selector_model->priv->sections = g_array_new (FALSE, FALSE, sizeof (Section)); - name_selector_model->priv->contact_store = e_contact_store_new (); + name_selector_model->priv->sections = g_array_new (FALSE, FALSE, sizeof (Section)); + name_selector_model->priv->contact_store = e_contact_store_new (); name_selector_model->priv->contact_filter = e_tree_model_generator_new (GTK_TREE_MODEL (name_selector_model->priv->contact_store)); @@ -478,8 +478,8 @@ e_name_selector_model_add_section (ENameSelectorModel *name_selector_model, memset (§ion, 0, sizeof (Section)); - section.name = g_strdup (name); - section.pretty_name = g_strdup (pretty_name); + section.name = g_strdup (name); + section.pretty_name = g_strdup (pretty_name); if (destination_store) section.destination_store = g_object_ref (destination_store); diff --git a/e-util/e-paned.c b/e-util/e-paned.c index c52c5455fe..f56a06796c 100644 --- a/e-util/e-paned.c +++ b/e-util/e-paned.c @@ -41,9 +41,9 @@ struct _EPanedPrivate { gulong wse_handler_id; - guint fixed_resize : 1; - guint sync_request : 2; - guint toplevel_ready : 1; + guint fixed_resize : 1; + guint sync_request : 2; + guint toplevel_ready : 1; }; enum { diff --git a/e-util/e-reflow-model.c b/e-util/e-reflow-model.c index dcb543a07a..6af3c46f06 100644 --- a/e-util/e-reflow-model.c +++ b/e-util/e-reflow-model.c @@ -214,17 +214,17 @@ e_reflow_model_class_init (EReflowModelClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - class->set_width = NULL; - class->count = NULL; - class->height = NULL; - class->incarnate = NULL; - class->reincarnate = NULL; - - class->model_changed = NULL; - class->comparison_changed = NULL; + class->set_width = NULL; + class->count = NULL; + class->height = NULL; + class->incarnate = NULL; + class->reincarnate = NULL; + + class->model_changed = NULL; + class->comparison_changed = NULL; class->model_items_inserted = NULL; - class->model_item_removed = NULL; - class->model_item_changed = NULL; + class->model_item_removed = NULL; + class->model_item_changed = NULL; signals[MODEL_CHANGED] = g_signal_new ( "model_changed", diff --git a/e-util/e-reflow.c b/e-util/e-reflow.c index d0707c1eac..0d0be54d80 100644 --- a/e-util/e-reflow.c +++ b/e-util/e-reflow.c @@ -619,12 +619,12 @@ disconnect_model (EReflow *reflow) reflow->model_item_changed_id); g_object_unref (reflow->model); - reflow->model_changed_id = 0; - reflow->comparison_changed_id = 0; + reflow->model_changed_id = 0; + reflow->comparison_changed_id = 0; reflow->model_items_inserted_id = 0; - reflow->model_item_removed_id = 0; - reflow->model_item_changed_id = 0; - reflow->model = NULL; + reflow->model_item_removed_id = 0; + reflow->model_item_changed_id = 0; + reflow->model = NULL; } static void @@ -647,7 +647,7 @@ disconnect_selection (EReflow *reflow) reflow->selection_changed_id = 0; reflow->selection_row_changed_id = 0; reflow->cursor_changed_id = 0; - reflow->selection = NULL; + reflow->selection = NULL; } static void @@ -879,10 +879,10 @@ e_reflow_dispose (GObject *object) g_free (reflow->heights); g_free (reflow->columns); - reflow->items = NULL; - reflow->heights = NULL; - reflow->columns = NULL; - reflow->count = 0; + reflow->items = NULL; + reflow->heights = NULL; + reflow->columns = NULL; + reflow->count = 0; reflow->allocated_count = 0; if (reflow->incarnate_idle_id) @@ -1571,17 +1571,17 @@ e_reflow_class_init (EReflowClass *class) object_class = (GObjectClass *) class; item_class = (GnomeCanvasItemClass *) class; - object_class->set_property = e_reflow_set_property; - object_class->get_property = e_reflow_get_property; - object_class->dispose = e_reflow_dispose; + object_class->set_property = e_reflow_set_property; + object_class->get_property = e_reflow_get_property; + object_class->dispose = e_reflow_dispose; /* GnomeCanvasItem method overrides */ - item_class->event = e_reflow_event; - item_class->realize = e_reflow_realize; - item_class->unrealize = e_reflow_unrealize; - item_class->draw = e_reflow_draw; - item_class->update = e_reflow_update; - item_class->point = e_reflow_point; + item_class->event = e_reflow_event; + item_class->realize = e_reflow_realize; + item_class->unrealize = e_reflow_unrealize; + item_class->draw = e_reflow_draw; + item_class->update = e_reflow_update; + item_class->point = e_reflow_point; class->selection_event = e_reflow_selection_event_real; class->column_width_changed = NULL; @@ -1671,44 +1671,44 @@ e_reflow_class_init (EReflowClass *class) static void e_reflow_init (EReflow *reflow) { - reflow->model = NULL; - reflow->items = NULL; - reflow->heights = NULL; - reflow->count = 0; + reflow->model = NULL; + reflow->items = NULL; + reflow->heights = NULL; + reflow->count = 0; - reflow->columns = NULL; - reflow->column_count = 0; + reflow->columns = NULL; + reflow->column_count = 0; - reflow->empty_text = NULL; - reflow->empty_message = NULL; + reflow->empty_text = NULL; + reflow->empty_message = NULL; - reflow->minimum_width = 10; - reflow->width = 10; - reflow->height = 10; + reflow->minimum_width = 10; + reflow->width = 10; + reflow->height = 10; - reflow->column_width = 150; + reflow->column_width = 150; - reflow->column_drag = FALSE; + reflow->column_drag = FALSE; - reflow->need_height_update = FALSE; - reflow->need_column_resize = FALSE; - reflow->need_reflow_columns = FALSE; + reflow->need_height_update = FALSE; + reflow->need_column_resize = FALSE; + reflow->need_reflow_columns = FALSE; - reflow->maybe_did_something = FALSE; - reflow->maybe_in_drag = FALSE; + reflow->maybe_did_something = FALSE; + reflow->maybe_in_drag = FALSE; - reflow->default_cursor_shown = TRUE; - reflow->arrow_cursor = NULL; - reflow->default_cursor = NULL; + reflow->default_cursor_shown = TRUE; + reflow->arrow_cursor = NULL; + reflow->default_cursor = NULL; - reflow->cursor_row = -1; + reflow->cursor_row = -1; - reflow->incarnate_idle_id = 0; - reflow->do_adjustment_idle_id = 0; + reflow->incarnate_idle_id = 0; + reflow->do_adjustment_idle_id = 0; reflow->set_scroll_adjustments_id = 0; - reflow->selection = E_SELECTION_MODEL (e_selection_model_simple_new ()); - reflow->sorter = e_sorter_array_new (er_create_cmp_cache, er_compare, reflow); + reflow->selection = E_SELECTION_MODEL (e_selection_model_simple_new ()); + reflow->sorter = e_sorter_array_new (er_create_cmp_cache, er_compare, reflow); g_object_set ( reflow->selection, diff --git a/e-util/e-rule-context.h b/e-util/e-rule-context.h index 604b49eb24..0c35958449 100644 --- a/e-util/e-rule-context.h +++ b/e-util/e-rule-context.h @@ -60,7 +60,7 @@ typedef struct _ERuleContextPrivate ERuleContextPrivate; /* backend capabilities, this is a hack since we don't support nested rules */ enum { - E_RULE_CONTEXT_GROUPING = 1 << 0, + E_RULE_CONTEXT_GROUPING = 1 << 0, E_RULE_CONTEXT_THREADING = 1 << 1 }; diff --git a/e-util/e-selection-model-array.c b/e-util/e-selection-model-array.c index 71ecfa9f81..05b570d2fa 100644 --- a/e-util/e-selection-model-array.c +++ b/e-util/e-selection-model-array.c @@ -537,24 +537,24 @@ e_selection_model_array_class_init (ESelectionModelArrayClass *class) object_class->get_property = esma_get_property; object_class->set_property = esma_set_property; - esm_class->is_row_selected = esma_is_row_selected; - esm_class->foreach = esma_foreach; - esm_class->clear = esma_clear; - esm_class->selected_count = esma_selected_count; - esm_class->select_all = esma_select_all; - esm_class->row_count = esma_row_count; - - esm_class->change_one_row = esma_change_one_row; - esm_class->change_cursor = esma_change_cursor; - esm_class->cursor_row = esma_cursor_row; - esm_class->cursor_col = esma_cursor_col; - - esm_class->select_single_row = esma_select_single_row; - esm_class->toggle_single_row = esma_toggle_single_row; + esm_class->is_row_selected = esma_is_row_selected; + esm_class->foreach = esma_foreach; + esm_class->clear = esma_clear; + esm_class->selected_count = esma_selected_count; + esm_class->select_all = esma_select_all; + esm_class->row_count = esma_row_count; + + esm_class->change_one_row = esma_change_one_row; + esm_class->change_cursor = esma_change_cursor; + esm_class->cursor_row = esma_cursor_row; + esm_class->cursor_col = esma_cursor_col; + + esm_class->select_single_row = esma_select_single_row; + esm_class->toggle_single_row = esma_toggle_single_row; esm_class->move_selection_end = esma_move_selection_end; - esm_class->set_selection_end = esma_set_selection_end; + esm_class->set_selection_end = esma_set_selection_end; - class->get_row_count = NULL; + class->get_row_count = NULL; g_object_class_install_property ( object_class, diff --git a/e-util/e-send-options.c b/e-util/e-send-options.c index 0b56969167..ab6ba3da55 100644 --- a/e-util/e-send-options.c +++ b/e-util/e-send-options.c @@ -684,7 +684,7 @@ e_send_options_dialog_run (ESendOptionsDialog *sod, setup_widgets (sod, type); - toplevel = gtk_widget_get_toplevel (priv->main); + toplevel = gtk_widget_get_toplevel (priv->main); if (parent) gtk_window_set_transient_for (GTK_WINDOW (toplevel), GTK_WINDOW (parent)); diff --git a/e-util/e-source-selector.c b/e-util/e-source-selector.c index 5d180acb75..e540248047 100644 --- a/e-util/e-source-selector.c +++ b/e-util/e-source-selector.c @@ -103,16 +103,16 @@ typedef GtkCellRendererToggle ECellRendererSafeToggle; typedef GtkCellRendererToggleClass ECellRendererSafeToggleClass; /* Forward Declarations */ -GType e_cell_renderer_safe_toggle_get_type (void); +GType e_cell_renderer_safe_toggle_get_type + (void) G_GNUC_CONST; +static void selection_changed_callback (GtkTreeSelection *selection, + ESourceSelector *selector); G_DEFINE_TYPE ( ECellRendererSafeToggle, e_cell_renderer_safe_toggle, GTK_TYPE_CELL_RENDERER_TOGGLE) -static void selection_changed_callback (GtkTreeSelection *selection, - ESourceSelector *selector); - static gboolean safe_toggle_activate (GtkCellRenderer *cell, GdkEvent *event, @@ -365,7 +365,8 @@ source_selector_build_model (ESourceSelector *selector) selected = e_source_selector_ref_primary_selection (selector); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (selector)); - /* Signal is blocked to avoid "primary-selection-changed" signal on model clear */ + /* Signal is blocked to avoid "primary-selection-changed" signal + * on model clear. */ g_signal_handlers_block_matched ( selection, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, selection_changed_callback, NULL); @@ -414,8 +415,9 @@ source_selector_build_model (ESourceSelector *selector) g_object_unref (selected); } - /* If the first succeeded, then there is no selection change, thus no need - for notification; notify about the change in ay other cases */ + /* If the first succeeded, then there is no selection change, + * thus no need for notification; notify about the change in + * any other cases. */ g_signal_handlers_unblock_matched ( selection, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, selection_changed_callback, NULL); @@ -464,7 +466,11 @@ source_selector_source_added_cb (ESourceRegistry *registry, const gchar *extension_name; extension_name = e_source_selector_get_extension_name (selector); - if (!extension_name || !e_source_has_extension (source, extension_name)) + + if (extension_name == NULL) + return; + + if (!e_source_has_extension (source, extension_name)) return; source_selector_build_model (selector); @@ -480,7 +486,11 @@ source_selector_source_changed_cb (ESourceRegistry *registry, const gchar *extension_name; extension_name = e_source_selector_get_extension_name (selector); - if (!extension_name || !e_source_has_extension (source, extension_name)) + + if (extension_name == NULL) + return; + + if (!e_source_has_extension (source, extension_name)) return; source_selector_cancel_write (selector, source); @@ -496,7 +506,11 @@ source_selector_source_removed_cb (ESourceRegistry *registry, const gchar *extension_name; extension_name = e_source_selector_get_extension_name (selector); - if (!extension_name || !e_source_has_extension (source, extension_name)) + + if (extension_name == NULL) + return; + + if (!e_source_has_extension (source, extension_name)) return; source_selector_build_model (selector); @@ -510,7 +524,11 @@ source_selector_source_enabled_cb (ESourceRegistry *registry, const gchar *extension_name; extension_name = e_source_selector_get_extension_name (selector); - if (!extension_name || !e_source_has_extension (source, extension_name)) + + if (extension_name == NULL) + return; + + if (!e_source_has_extension (source, extension_name)) return; source_selector_build_model (selector); @@ -526,7 +544,11 @@ source_selector_source_disabled_cb (ESourceRegistry *registry, const gchar *extension_name; extension_name = e_source_selector_get_extension_name (selector); - if (!extension_name || !e_source_has_extension (source, extension_name)) + + if (extension_name == NULL) + return; + + if (!e_source_has_extension (source, extension_name)) return; source_selector_build_model (selector); @@ -938,7 +960,7 @@ source_selector_button_press_event (GtkWidget *widget, gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); } - if (path) + if (path != NULL) gtk_tree_path_free (path); if (source == NULL) @@ -1279,7 +1301,7 @@ e_source_selector_class_init (ESourceSelectorClass *class) object_class = G_OBJECT_CLASS (class); object_class->set_property = source_selector_set_property; object_class->get_property = source_selector_get_property; - object_class->dispose = source_selector_dispose; + object_class->dispose = source_selector_dispose; object_class->finalize = source_selector_finalize; object_class->constructed = source_selector_constructed; diff --git a/e-util/e-table-click-to-add.c b/e-util/e-table-click-to-add.c index 34766ddbe3..b0af6eaac6 100644 --- a/e-util/e-table-click-to-add.c +++ b/e-util/e-table-click-to-add.c @@ -552,15 +552,15 @@ e_table_click_to_add_class_init (ETableClickToAddClass *class) GObjectClass *object_class = G_OBJECT_CLASS (class); class->cursor_change = NULL; - class->style_set = etcta_style_set; + class->style_set = etcta_style_set; - object_class->dispose = etcta_dispose; + object_class->dispose = etcta_dispose; object_class->set_property = etcta_set_property; object_class->get_property = etcta_get_property; - item_class->realize = etcta_realize; - item_class->unrealize = etcta_unrealize; - item_class->event = etcta_event; + item_class->realize = etcta_realize; + item_class->unrealize = etcta_unrealize; + item_class->event = etcta_event; g_object_class_install_property ( object_class, diff --git a/e-util/e-table-column-specification.c b/e-util/e-table-column-specification.c index 186c123578..befde720f4 100644 --- a/e-util/e-table-column-specification.c +++ b/e-util/e-table-column-specification.c @@ -70,20 +70,20 @@ e_table_column_specification_class_init (ETableColumnSpecificationClass *class) static void e_table_column_specification_init (ETableColumnSpecification *specification) { - specification->model_col = 0; - specification->compare_col = 0; - specification->title = g_strdup (""); - specification->pixbuf = NULL; + specification->model_col = 0; + specification->compare_col = 0; + specification->title = g_strdup (""); + specification->pixbuf = NULL; - specification->expansion = 0; + specification->expansion = 0; specification->minimum_width = 0; - specification->resizable = FALSE; - specification->disabled = FALSE; + specification->resizable = FALSE; + specification->disabled = FALSE; - specification->cell = NULL; - specification->compare = NULL; - specification->search = NULL; - specification->priority = 0; + specification->cell = NULL; + specification->compare = NULL; + specification->search = NULL; + specification->priority = 0; } ETableColumnSpecification * diff --git a/e-util/e-table-config.c b/e-util/e-table-config.c index 4d6be20531..73f4e2e0a2 100644 --- a/e-util/e-table-config.c +++ b/e-util/e-table-config.c @@ -124,7 +124,7 @@ e_table_config_class_init (ETableConfigClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - class->changed = NULL; + class->changed = NULL; object_class->finalize = config_finalize; object_class->get_property = config_get_property; @@ -966,7 +966,7 @@ setup_gui (ETableConfig *config) GTK_WINDOW (config->dialog_toplevel), config->header); - config->dialog_group_by = e_builder_get_widget ( + config->dialog_group_by = e_builder_get_widget ( builder, "dialog-group-by"); config->dialog_sort = e_builder_get_widget ( builder, "dialog-sort"); diff --git a/e-util/e-table-extras.c b/e-util/e-table-extras.c index b8c2c61fbd..b631dbd6e9 100644 --- a/e-util/e-table-extras.c +++ b/e-util/e-table-extras.c @@ -174,15 +174,15 @@ e_table_str_case_compare (gconstpointer x, return x ? -1 : 1; } - #define prepare_value(_z, _cz) \ - _cz = e_table_sorting_utils_lookup_cmp_cache (cmp_cache, _z); \ - if (!_cz) { \ - gchar *tmp = g_utf8_casefold (_z, -1); \ - _cz = g_utf8_collate_key (tmp, -1); \ - g_free (tmp); \ - \ - e_table_sorting_utils_add_to_cmp_cache ( \ - cmp_cache, _z, (gchar *) _cz); \ + #define prepare_value(_z, _cz) \ + _cz = e_table_sorting_utils_lookup_cmp_cache (cmp_cache, _z); \ + if (!_cz) { \ + gchar *tmp = g_utf8_casefold (_z, -1); \ + _cz = g_utf8_collate_key (tmp, -1); \ + g_free (tmp); \ + \ + e_table_sorting_utils_add_to_cmp_cache ( \ + cmp_cache, _z, (gchar *) _cz); \ } prepare_value (x, cx); @@ -210,13 +210,13 @@ e_table_collate_compare (gconstpointer x, return x ? -1 : 1; } - #define prepare_value(_z, _cz) \ - _cz = e_table_sorting_utils_lookup_cmp_cache (cmp_cache, _z); \ - if (!_cz) { \ - _cz = g_utf8_collate_key (_z, -1); \ - \ - e_table_sorting_utils_add_to_cmp_cache ( \ - cmp_cache, _z, (gchar *) _cz); \ + #define prepare_value(_z, _cz) \ + _cz = e_table_sorting_utils_lookup_cmp_cache (cmp_cache, _z); \ + if (!_cz) { \ + _cz = g_utf8_collate_key (_z, -1); \ + \ + e_table_sorting_utils_add_to_cmp_cache ( \ + cmp_cache, _z, (gchar *) _cz); \ } prepare_value (x, cx); diff --git a/e-util/e-table-field-chooser-item.c b/e-util/e-table-field-chooser-item.c index 3d2aaa8a9a..a12ddc6ff7 100644 --- a/e-util/e-table-field-chooser-item.c +++ b/e-util/e-table-field-chooser-item.c @@ -670,12 +670,12 @@ e_table_field_chooser_item_class_init (ETableFieldChooserItemClass *class) object_class->set_property = etfci_set_property; object_class->get_property = etfci_get_property; - item_class->update = etfci_update; - item_class->realize = etfci_realize; - item_class->unrealize = etfci_unrealize; - item_class->draw = etfci_draw; - item_class->point = etfci_point; - item_class->event = etfci_event; + item_class->update = etfci_update; + item_class->realize = etfci_realize; + item_class->unrealize = etfci_unrealize; + item_class->draw = etfci_draw; + item_class->point = etfci_point; + item_class->event = etfci_event; g_object_class_install_property ( object_class, diff --git a/e-util/e-table-field-chooser.c b/e-util/e-table-field-chooser.c index 2dd37c0479..feebe8b267 100644 --- a/e-util/e-table-field-chooser.c +++ b/e-util/e-table-field-chooser.c @@ -58,7 +58,7 @@ e_table_field_chooser_class_init (ETableFieldChooserClass *class) object_class->set_property = e_table_field_chooser_set_property; object_class->get_property = e_table_field_chooser_get_property; - object_class->dispose = e_table_field_chooser_dispose; + object_class->dispose = e_table_field_chooser_dispose; g_object_class_install_property ( object_class, diff --git a/e-util/e-table-group-container.c b/e-util/e-table-group-container.c index 4be28d6379..aa8366a8e4 100644 --- a/e-util/e-table-group-container.c +++ b/e-util/e-table-group-container.c @@ -230,36 +230,36 @@ etgc_event (GnomeCanvasItem *item, event->key.keyval == GDK_KEY_KP_Tab || event->key.keyval == GDK_KEY_ISO_Left_Tab) { change_focus = TRUE; - use_col = TRUE; - start_col = (event->key.state & GDK_SHIFT_MASK) ? -1 : 0; - direction = (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START; + use_col = TRUE; + start_col = (event->key.state & GDK_SHIFT_MASK) ? -1 : 0; + direction = (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START; } else if (event->key.keyval == GDK_KEY_Left || event->key.keyval == GDK_KEY_KP_Left) { change_focus = TRUE; - use_col = TRUE; - start_col = -1; - direction = E_FOCUS_END; + use_col = TRUE; + start_col = -1; + direction = E_FOCUS_END; } else if (event->key.keyval == GDK_KEY_Right || event->key.keyval == GDK_KEY_KP_Right) { change_focus = TRUE; - use_col = TRUE; + use_col = TRUE; start_col = 0; direction = E_FOCUS_START; } else if (event->key.keyval == GDK_KEY_Down || event->key.keyval == GDK_KEY_KP_Down) { change_focus = TRUE; - use_col = FALSE; - direction = E_FOCUS_START; + use_col = FALSE; + direction = E_FOCUS_START; } else if (event->key.keyval == GDK_KEY_Up || event->key.keyval == GDK_KEY_KP_Up) { change_focus = TRUE; - use_col = FALSE; - direction = E_FOCUS_END; + use_col = FALSE; + direction = E_FOCUS_END; } else if (event->key.keyval == GDK_KEY_Return || event->key.keyval == GDK_KEY_KP_Enter) { change_focus = TRUE; - use_col = FALSE; - direction = E_FOCUS_START; + use_col = FALSE; + direction = E_FOCUS_START; } if (change_focus) { GList *list; @@ -268,7 +268,7 @@ etgc_event (GnomeCanvasItem *item, ETableGroup *child; child_node = (ETableGroupContainerChildNode *) list->data; - child = child_node->child; + child = child_node->child; if (e_table_group_get_focus (child)) { old_col = e_table_group_get_focus_column (child); @@ -1033,10 +1033,10 @@ e_table_group_container_class_init (ETableGroupContainerClass *class) e_group_class->add_array = etgc_add_array; e_group_class->add_all = etgc_add_all; e_group_class->remove = etgc_remove; - e_group_class->increment = etgc_increment; - e_group_class->decrement = etgc_decrement; - e_group_class->row_count = etgc_row_count; - e_group_class->set_focus = etgc_set_focus; + e_group_class->increment = etgc_increment; + e_group_class->decrement = etgc_decrement; + e_group_class->row_count = etgc_row_count; + e_group_class->set_focus = etgc_set_focus; e_group_class->get_focus_column = etgc_get_focus_column; e_group_class->get_printable = etgc_get_printable; e_group_class->compute_location = etgc_compute_location; diff --git a/e-util/e-table-group-leaf.c b/e-util/e-table-group-leaf.c index fb6b3268d7..4cb5f18374 100644 --- a/e-util/e-table-group-leaf.c +++ b/e-util/e-table-group-leaf.c @@ -695,10 +695,10 @@ e_table_group_leaf_class_init (ETableGroupLeafClass *class) e_group_class->add_array = etgl_add_array; e_group_class->add_all = etgl_add_all; e_group_class->remove = etgl_remove; - e_group_class->increment = etgl_increment; - e_group_class->decrement = etgl_decrement; - e_group_class->row_count = etgl_row_count; - e_group_class->set_focus = etgl_set_focus; + e_group_class->increment = etgl_increment; + e_group_class->decrement = etgl_decrement; + e_group_class->row_count = etgl_row_count; + e_group_class->set_focus = etgl_set_focus; e_group_class->get_focus_column = etgl_get_focus_column; e_group_class->get_printable = etgl_get_printable; e_group_class->compute_location = etgl_compute_location; diff --git a/e-util/e-table-group.c b/e-util/e-table-group.c index 013967c9ca..32c4aaead4 100644 --- a/e-util/e-table-group.c +++ b/e-util/e-table-group.c @@ -678,10 +678,10 @@ e_table_group_class_init (ETableGroupClass *class) class->add_array = NULL; class->add_all = NULL; class->remove = NULL; - class->row_count = NULL; - class->increment = NULL; - class->decrement = NULL; - class->set_focus = NULL; + class->row_count = NULL; + class->increment = NULL; + class->decrement = NULL; + class->set_focus = NULL; class->get_focus = etg_get_focus; class->get_printable = NULL; class->compute_location = NULL; diff --git a/e-util/e-table-header-item.c b/e-util/e-table-header-item.c index 06c3f7e784..1f139a67f7 100644 --- a/e-util/e-table-header-item.c +++ b/e-util/e-table-header-item.c @@ -501,7 +501,7 @@ ethi_add_drop_marker (ETableHeaderItem *ethi, x += ethi->group_indent_width; if (!arrow_up) { - arrow_up = make_shaped_window_from_xpm (arrow_up_xpm); + arrow_up = make_shaped_window_from_xpm (arrow_up_xpm); arrow_down = make_shaped_window_from_xpm (arrow_down_xpm); } @@ -685,9 +685,9 @@ context_destroyed (gpointer data) { ETableHeaderItem *ethi = data; - ethi->last_drop_x = 0; - ethi->last_drop_y = 0; - ethi->last_drop_time = 0; + ethi->last_drop_x = 0; + ethi->last_drop_y = 0; + ethi->last_drop_time = 0; ethi->last_drop_context = NULL; scroll_off (ethi); @@ -817,7 +817,7 @@ ethi_drag_data_received (GtkWidget *canvas, for (i = 0; i < count; i++) { ETableCol *ecol; - ecol = e_table_header_get_column ( + ecol = e_table_header_get_column ( ethi->full_header, i); if (ecol->spec->model_col == column) { @@ -2130,12 +2130,12 @@ ethi_class_init (ETableHeaderItemClass *class) object_class->set_property = ethi_set_property; object_class->get_property = ethi_get_property; - item_class->update = ethi_update; - item_class->realize = ethi_realize; - item_class->unrealize = ethi_unrealize; - item_class->draw = ethi_draw; - item_class->point = ethi_point; - item_class->event = ethi_event; + item_class->update = ethi_update; + item_class->realize = ethi_realize; + item_class->unrealize = ethi_unrealize; + item_class->draw = ethi_draw; + item_class->point = ethi_point; + item_class->event = ethi_event; g_object_class_install_property ( object_class, diff --git a/e-util/e-table-header.c b/e-util/e-table-header.c index 8fc4496df7..f9c50b5553 100644 --- a/e-util/e-table-header.c +++ b/e-util/e-table-header.c @@ -350,18 +350,18 @@ e_table_header_class_init (ETableHeaderClass *class) static void e_table_header_init (ETableHeader *eth) { - eth->col_count = 0; - eth->width = 0; + eth->col_count = 0; + eth->width = 0; - eth->sort_info = NULL; + eth->sort_info = NULL; eth->sort_info_group_change_id = 0; - eth->columns = NULL; + eth->columns = NULL; - eth->change_queue = NULL; - eth->change_tail = NULL; + eth->change_queue = NULL; + eth->change_tail = NULL; - eth->width_extras = 0; + eth->width_extras = 0; } /** diff --git a/e-util/e-table-item.c b/e-util/e-table-item.c index 936cf69509..c265c98125 100644 --- a/e-util/e-table-item.c +++ b/e-util/e-table-item.c @@ -134,9 +134,9 @@ e_hsv_tweak (GdkColor *color, { gdouble h, s, v, r, g, b; - r = color->red / 65535.0f; + r = color->red / 65535.0f; g = color->green / 65535.0f; - b = color->blue / 65535.0f; + b = color->blue / 65535.0f; gtk_rgb_to_hsv (r, g, b, &h, &s, &v); @@ -160,9 +160,9 @@ e_hsv_tweak (GdkColor *color, gtk_hsv_to_rgb (h, s, v, &r, &g, &b); - color->red = r * 65535.0f; + color->red = r * 65535.0f; color->green = g * 65535.0f; - color->blue = b * 65535.0f; + color->blue = b * 65535.0f; } inline static gint @@ -1372,9 +1372,9 @@ e_table_item_redraw_range (ETableItem *eti, NULL); if ((start_col == cursor_col) || - (end_col == cursor_col) || + (end_col == cursor_col) || (view_to_model_row (eti, start_row) == cursor_row) || - (view_to_model_row (eti, end_row) == cursor_row)) + (view_to_model_row (eti, end_row) == cursor_row)) border = 2; else border = 0; @@ -1712,69 +1712,69 @@ eti_get_property (GObject *object, static void e_table_item_init (ETableItem *eti) { - eti->motion_row = -1; - eti->motion_col = -1; - eti->editing_col = -1; - eti->editing_row = -1; - eti->height = 0; - eti->width = 0; - eti->minimum_width = 0; + eti->motion_row = -1; + eti->motion_col = -1; + eti->editing_col = -1; + eti->editing_row = -1; + eti->height = 0; + eti->width = 0; + eti->minimum_width = 0; - eti->save_col = -1; - eti->save_row = -1; - eti->save_state = NULL; + eti->save_col = -1; + eti->save_row = -1; + eti->save_state = NULL; - eti->click_count = 0; + eti->click_count = 0; - eti->height_cache = NULL; - eti->height_cache_idle_id = 0; - eti->height_cache_idle_count = 0; + eti->height_cache = NULL; + eti->height_cache_idle_id = 0; + eti->height_cache_idle_count = 0; - eti->length_threshold = -1; - eti->uniform_row_height = FALSE; + eti->length_threshold = -1; + eti->uniform_row_height = FALSE; - eti->uses_source_model = 0; - eti->source_model = NULL; + eti->uses_source_model = 0; + eti->source_model = NULL; - eti->row_guess = -1; - eti->cursor_mode = E_CURSOR_SIMPLE; + eti->row_guess = -1; + eti->cursor_mode = E_CURSOR_SIMPLE; - eti->selection_change_id = 0; - eti->selection_row_change_id = 0; - eti->cursor_change_id = 0; - eti->cursor_activated_id = 0; - eti->selection = NULL; + eti->selection_change_id = 0; + eti->selection_row_change_id = 0; + eti->cursor_change_id = 0; + eti->cursor_activated_id = 0; + eti->selection = NULL; - eti->old_cursor_row = -1; + eti->old_cursor_row = -1; - eti->needs_redraw = 0; - eti->needs_compute_height = 0; + eti->needs_redraw = 0; + eti->needs_compute_height = 0; - eti->in_key_press = 0; + eti->in_key_press = 0; - eti->maybe_did_something = TRUE; + eti->maybe_did_something = TRUE; - eti->grabbed_count = 0; - eti->gtk_grabbed = 0; + eti->grabbed_count = 0; + eti->gtk_grabbed = 0; - eti->in_drag = 0; - eti->maybe_in_drag = 0; - eti->grabbed = 0; + eti->in_drag = 0; + eti->maybe_in_drag = 0; + eti->grabbed = 0; - eti->grabbed_col = -1; - eti->grabbed_row = -1; + eti->grabbed_col = -1; + eti->grabbed_row = -1; - eti->cursor_on_screen = FALSE; - eti->cursor_x1 = -1; - eti->cursor_y1 = -1; - eti->cursor_x2 = -1; - eti->cursor_y2 = -1; + eti->cursor_on_screen = FALSE; + eti->cursor_x1 = -1; + eti->cursor_y1 = -1; + eti->cursor_x2 = -1; + eti->cursor_y2 = -1; - eti->rows = -1; - eti->cols = -1; + eti->rows = -1; + eti->cols = -1; - eti->frozen_count = 0; - eti->queue_show_cursor = FALSE; + eti->frozen_count = 0; + eti->queue_show_cursor = FALSE; e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM (eti), eti_reflow); } @@ -1955,8 +1955,8 @@ eti_draw (GnomeCanvasItem *item, * Compute row span. */ if (eti->uniform_row_height) { - first_row = (y - floor (eti_base_y) - height_extra) / (ETI_ROW_HEIGHT (eti, -1) + height_extra); - last_row = (y + height - floor (eti_base_y) ) / (ETI_ROW_HEIGHT (eti, -1) + height_extra) + 1; + first_row = (y - floor (eti_base_y) - height_extra) / (ETI_ROW_HEIGHT (eti, -1) + height_extra); + last_row = (y + height - floor (eti_base_y) ) / (ETI_ROW_HEIGHT (eti, -1) + height_extra) + 1; if (first_row > last_row) return; y_offset = floor (eti_base_y) - y + height_extra + first_row * (ETI_ROW_HEIGHT (eti, -1) + height_extra); @@ -2511,12 +2511,12 @@ eti_event (GnomeCanvasItem *item, event_device = gdk_event_get_device (event); eti->maybe_in_drag = TRUE; - eti->drag_row = new_cursor_row; - eti->drag_col = new_cursor_col; - eti->drag_x = event_x_item; - eti->drag_y = event_y_item; - eti->drag_state = event_state; - eti->grabbed = TRUE; + eti->drag_row = new_cursor_row; + eti->drag_col = new_cursor_col; + eti->drag_x = event_x_item; + eti->drag_y = event_y_item; + eti->drag_state = event_state; + eti->grabbed = TRUE; d (g_print ("%s: eti_grab\n", G_STRFUNC)); eti_grab (eti, event_device, event_time); } @@ -3067,8 +3067,8 @@ eti_event (GnomeCanvasItem *item, if (eti_editing (eti)) { eti_free_save_state (eti); - eti->save_row = eti->editing_row; - eti->save_col = eti->editing_col; + eti->save_row = eti->editing_row; + eti->save_col = eti->editing_col; eti->save_state = e_cell_save_state ( eti->cell_views[eti->editing_col], view_to_model_col (eti, eti->editing_col), eti->editing_col, eti->editing_row, eti->edit_ctx); @@ -3121,25 +3121,25 @@ e_table_item_class_init (ETableItemClass *class) GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class); - object_class->dispose = eti_dispose; - object_class->set_property = eti_set_property; - object_class->get_property = eti_get_property; + object_class->dispose = eti_dispose; + object_class->set_property = eti_set_property; + object_class->get_property = eti_get_property; - item_class->update = eti_update; - item_class->realize = eti_realize; - item_class->unrealize = eti_unrealize; - item_class->draw = eti_draw; - item_class->point = eti_point; - item_class->event = eti_event; + item_class->update = eti_update; + item_class->realize = eti_realize; + item_class->unrealize = eti_unrealize; + item_class->draw = eti_draw; + item_class->point = eti_point; + item_class->event = eti_event; - class->cursor_change = NULL; + class->cursor_change = NULL; class->cursor_activated = NULL; - class->double_click = NULL; - class->right_click = NULL; - class->click = NULL; - class->key_press = NULL; - class->start_drag = NULL; - class->style_set = eti_style_set; + class->double_click = NULL; + class->right_click = NULL; + class->click = NULL; + class->key_press = NULL; + class->start_drag = NULL; + class->style_set = eti_style_set; class->selection_model_removed = NULL; class->selection_model_added = NULL; diff --git a/e-util/e-table-selection-model.c b/e-util/e-table-selection-model.c index fd661771e8..56cc1b398b 100644 --- a/e-util/e-table-selection-model.c +++ b/e-util/e-table-selection-model.c @@ -331,10 +331,10 @@ e_table_selection_model_class_init (ETableSelectionModelClass *class) GObjectClass *object_class; ESelectionModelArrayClass *esma_class; - object_class = G_OBJECT_CLASS (class); - esma_class = E_SELECTION_MODEL_ARRAY_CLASS (class); + object_class = G_OBJECT_CLASS (class); + esma_class = E_SELECTION_MODEL_ARRAY_CLASS (class); - object_class->dispose = etsm_dispose; + object_class->dispose = etsm_dispose; object_class->get_property = etsm_get_property; object_class->set_property = etsm_set_property; diff --git a/e-util/e-table-specification.c b/e-util/e-table-specification.c index cff94d28e0..d6a35071a2 100644 --- a/e-util/e-table-specification.c +++ b/e-util/e-table-specification.c @@ -574,18 +574,18 @@ e_table_specification_init (ETableSpecification *specification) (GDestroyNotify) g_object_unref); specification->alternating_row_colors = TRUE; - specification->no_headers = FALSE; - specification->click_to_add = FALSE; - specification->click_to_add_end = FALSE; - specification->horizontal_draw_grid = FALSE; - specification->vertical_draw_grid = FALSE; - specification->draw_focus = TRUE; - specification->horizontal_scrolling = FALSE; - specification->horizontal_resize = FALSE; - specification->allow_grouping = TRUE; - - specification->cursor_mode = E_CURSOR_SIMPLE; - specification->selection_mode = GTK_SELECTION_MULTIPLE; + specification->no_headers = FALSE; + specification->click_to_add = FALSE; + specification->click_to_add_end = FALSE; + specification->horizontal_draw_grid = FALSE; + specification->vertical_draw_grid = FALSE; + specification->draw_focus = TRUE; + specification->horizontal_scrolling = FALSE; + specification->horizontal_resize = FALSE; + specification->allow_grouping = TRUE; + + specification->cursor_mode = E_CURSOR_SIMPLE; + specification->selection_mode = GTK_SELECTION_MULTIPLE; } /** diff --git a/e-util/e-table-state.c b/e-util/e-table-state.c index 4df6e488f4..98a429725c 100644 --- a/e-util/e-table-state.c +++ b/e-util/e-table-state.c @@ -111,7 +111,7 @@ table_state_parser_start_column (GMarkupParseContext *context, g_return_if_fail (index_str != NULL); index = g_ascii_strtoll (index_str, NULL, 10); - if (expansion_str != NULL) + if (expansion_str != NULL) expansion = g_ascii_strtod (expansion_str, NULL); g_variant_builder_add ( diff --git a/e-util/e-table-subset-variable.c b/e-util/e-table-subset-variable.c index f6f8f33c54..e88ec3dd12 100644 --- a/e-util/e-table-subset-variable.c +++ b/e-util/e-table-subset-variable.c @@ -134,10 +134,10 @@ etssv_remove (ETableSubsetVariable *etssv, static void e_table_subset_variable_class_init (ETableSubsetVariableClass *class) { - class->add = etssv_add; + class->add = etssv_add; class->add_array = etssv_add_array; class->add_all = etssv_add_all; - class->remove = etssv_remove; + class->remove = etssv_remove; } static void diff --git a/e-util/e-table.c b/e-util/e-table.c index 4a28656dea..e32ba3a1a0 100644 --- a/e-util/e-table.c +++ b/e-util/e-table.c @@ -537,7 +537,7 @@ init_search (ETable *e_table) if (e_table->search != NULL) return; - e_table->search = e_table_search_new (); + e_table->search = e_table_search_new (); e_table->search_search_id = g_signal_connect ( e_table->search, "search", @@ -568,55 +568,55 @@ e_table_init (ETable *e_table) gtk_table_set_homogeneous (GTK_TABLE (e_table), FALSE); - e_table->sort_info = NULL; - e_table->group_info_change_id = 0; - e_table->sort_info_change_id = 0; - e_table->structure_change_id = 0; - e_table->expansion_change_id = 0; - e_table->dimension_change_id = 0; - e_table->reflow_idle_id = 0; - e_table->scroll_idle_id = 0; + e_table->sort_info = NULL; + e_table->group_info_change_id = 0; + e_table->sort_info_change_id = 0; + e_table->structure_change_id = 0; + e_table->expansion_change_id = 0; + e_table->dimension_change_id = 0; + e_table->reflow_idle_id = 0; + e_table->scroll_idle_id = 0; e_table->alternating_row_colors = 1; - e_table->horizontal_draw_grid = 1; - e_table->vertical_draw_grid = 1; - e_table->draw_focus = 1; - e_table->cursor_mode = E_CURSOR_SIMPLE; - e_table->length_threshold = 200; - e_table->uniform_row_height = FALSE; + e_table->horizontal_draw_grid = 1; + e_table->vertical_draw_grid = 1; + e_table->draw_focus = 1; + e_table->cursor_mode = E_CURSOR_SIMPLE; + e_table->length_threshold = 200; + e_table->uniform_row_height = FALSE; - e_table->need_rebuild = 0; - e_table->rebuild_idle_id = 0; + e_table->need_rebuild = 0; + e_table->rebuild_idle_id = 0; - e_table->horizontal_scrolling = FALSE; - e_table->horizontal_resize = FALSE; + e_table->horizontal_scrolling = FALSE; + e_table->horizontal_resize = FALSE; - e_table->click_to_add_message = NULL; - e_table->domain = NULL; + e_table->click_to_add_message = NULL; + e_table->domain = NULL; - e_table->drop_row = -1; - e_table->drop_col = -1; - e_table->site = NULL; + e_table->drop_row = -1; + e_table->drop_col = -1; + e_table->site = NULL; - e_table->do_drag = 0; + e_table->do_drag = 0; - e_table->sorter = NULL; - e_table->selection = e_table_selection_model_new (); - e_table->cursor_loc = E_TABLE_CURSOR_LOC_NONE; - e_table->spec = NULL; + e_table->sorter = NULL; + e_table->selection = e_table_selection_model_new (); + e_table->cursor_loc = E_TABLE_CURSOR_LOC_NONE; + e_table->spec = NULL; - e_table->always_search = g_getenv ("GAL_ALWAYS_SEARCH") ? TRUE : FALSE; + e_table->always_search = g_getenv ("GAL_ALWAYS_SEARCH") ? TRUE : FALSE; - e_table->search = NULL; - e_table->search_search_id = 0; - e_table->search_accept_id = 0; + e_table->search = NULL; + e_table->search_search_id = 0; + e_table->search_accept_id = 0; - e_table->current_search_col = NULL; + e_table->current_search_col = NULL; - e_table->header_width = 0; + e_table->header_width = 0; - e_table->state_changed = FALSE; - e_table->state_change_freeze = 0; + e_table->state_changed = FALSE; + e_table->state_change_freeze = 0; } /* Grab_focus handler for the ETable */ @@ -3001,9 +3001,9 @@ context_destroyed (gpointer data) /* if (!G_OBJECT_DESTROYED (et)) */ /* FIXME: */ { - et->last_drop_x = 0; - et->last_drop_y = 0; - et->last_drop_time = 0; + et->last_drop_x = 0; + et->last_drop_y = 0; + et->last_drop_time = 0; et->last_drop_context = NULL; scroll_off (et); } @@ -3134,40 +3134,40 @@ e_table_class_init (ETableClass *class) GObjectClass *object_class; GtkWidgetClass *widget_class; - object_class = (GObjectClass *) class; - widget_class = (GtkWidgetClass *) class; + object_class = (GObjectClass *) class; + widget_class = (GtkWidgetClass *) class; - object_class->dispose = et_dispose; - object_class->finalize = et_finalize; - object_class->set_property = et_set_property; - object_class->get_property = et_get_property; + object_class->dispose = et_dispose; + object_class->finalize = et_finalize; + object_class->set_property = et_set_property; + object_class->get_property = et_get_property; - widget_class->grab_focus = et_grab_focus; - widget_class->unrealize = et_unrealize; + 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->focus = et_focus; - - class->cursor_change = NULL; - class->cursor_activated = NULL; - class->selection_change = NULL; - class->double_click = NULL; - class->right_click = NULL; - class->click = NULL; - class->key_press = NULL; - class->start_drag = et_real_start_drag; - class->state_change = NULL; - class->white_space_event = NULL; - - class->table_drag_begin = NULL; - class->table_drag_end = NULL; - class->table_drag_data_get = NULL; - class->table_drag_data_delete = NULL; - - class->table_drag_leave = NULL; - class->table_drag_motion = NULL; - class->table_drag_drop = NULL; + widget_class->focus = et_focus; + + class->cursor_change = NULL; + class->cursor_activated = NULL; + class->selection_change = NULL; + class->double_click = NULL; + class->right_click = NULL; + class->click = NULL; + class->key_press = NULL; + class->start_drag = et_real_start_drag; + class->state_change = NULL; + class->white_space_event = NULL; + + class->table_drag_begin = NULL; + class->table_drag_end = NULL; + class->table_drag_data_get = NULL; + class->table_drag_data_delete = NULL; + + class->table_drag_leave = NULL; + class->table_drag_motion = NULL; + class->table_drag_drop = NULL; class->table_drag_data_received = NULL; et_signals[CURSOR_CHANGE] = g_signal_new ( diff --git a/e-util/e-text-model.c b/e-util/e-text-model.c index 0920f83335..a6fecdbf0b 100644 --- a/e-util/e-text-model.c +++ b/e-util/e-text-model.c @@ -137,23 +137,23 @@ e_text_model_class_init (ETextModelClass *class) G_TYPE_NONE, 0); /* No default signal handlers. */ - class->changed = NULL; - class->reposition = NULL; + class->changed = NULL; + class->reposition = NULL; class->object_activated = NULL; - class->validate_pos = e_text_model_real_validate_position; + class->validate_pos = e_text_model_real_validate_position; - class->get_text = e_text_model_real_get_text; - class->get_text_len = e_text_model_real_get_text_length; - class->set_text = e_text_model_real_set_text; - class->insert = e_text_model_real_insert; + class->get_text = e_text_model_real_get_text; + class->get_text_len = e_text_model_real_get_text_length; + class->set_text = e_text_model_real_set_text; + class->insert = e_text_model_real_insert; class->insert_length = e_text_model_real_insert_length; - class->delete = e_text_model_real_delete; + class->delete = e_text_model_real_delete; /* We explicitly don't define default handlers for these. */ - class->objectify = NULL; - class->obj_count = NULL; - class->get_nth_obj = NULL; + class->objectify = NULL; + class->obj_count = NULL; + class->get_nth_obj = NULL; } static void @@ -291,8 +291,8 @@ e_text_model_real_delete (ETextModel *model, e_text_model_changed (model); repos.model = model; - repos.pos = position; - repos.len = length; + repos.pos = position; + repos.len = length; e_text_model_reposition (model, e_repos_delete_shift, &repos); } diff --git a/e-util/e-text.c b/e-util/e-text.c index b1c1af6c42..a6dfc9d870 100644 --- a/e-util/e-text.c +++ b/e-util/e-text.c @@ -434,7 +434,7 @@ e_text_text_model_changed (ETextModel *model, /* Make sure our selection doesn't extend past the bounds of our text. */ text->selection_start = CLAMP (text->selection_start, 0, model_len); - text->selection_end = CLAMP (text->selection_end, 0, model_len); + text->selection_end = CLAMP (text->selection_end, 0, model_len); text->needs_reset_layout = 1; text->needs_split_into_lines = 1; @@ -455,12 +455,12 @@ e_text_text_model_reposition (ETextModel *model, gint model_len = e_text_model_get_text_length (model); text->selection_start = fn (text->selection_start, repos_data); - text->selection_end = fn (text->selection_end, repos_data); + text->selection_end = fn (text->selection_end, repos_data); /* Our repos function should make sure we don't overrun the buffer, but it never * hurts to be paranoid. */ text->selection_start = CLAMP (text->selection_start, 0, model_len); - text->selection_end = CLAMP (text->selection_end, 0, model_len); + text->selection_end = CLAMP (text->selection_end, 0, model_len); if (text->selection_start > text->selection_end) { gint tmp = text->selection_start; @@ -1232,8 +1232,8 @@ e_text_draw (GnomeCanvasItem *item, cr, ((text->rgba >> 24) & 0xff) / 255.0, ((text->rgba >> 16) & 0xff) / 255.0, - ((text->rgba >> 8) & 0xff) / 255.0, - ( text->rgba & 0xff) / 255.0); + ((text->rgba >> 8) & 0xff) / 255.0, + ( text->rgba & 0xff) / 255.0); } /* Insert preedit text only when im_context signals are connected & @@ -1880,7 +1880,7 @@ e_text_delete_selection (EText *text) gint sel_start, sel_end; sel_start = MIN (text->selection_start, text->selection_end); - sel_end = MAX (text->selection_start, text->selection_end); + sel_end = MAX (text->selection_start, text->selection_end); if (sel_start != sel_end) e_text_model_delete (text->model, sel_start, sel_end - sel_start); @@ -1928,7 +1928,7 @@ primary_get_cb (GtkClipboard *clipboard, gint sel_start, sel_end; sel_start = MIN (text->selection_start, text->selection_end); - sel_end = MAX (text->selection_start, text->selection_end); + sel_end = MAX (text->selection_start, text->selection_end); /* convert sel_start/sel_end to byte indices */ sel_start = g_utf8_offset_to_pointer (text->text, sel_start) - text->text; @@ -2069,7 +2069,8 @@ popup_targets_received (GtkClipboard *clipboard, /* cut menu item */ menuitem = gtk_image_menu_item_new_with_mnemonic (_("Cu_t")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menuitem), gtk_image_new_from_icon_name ("edit-cut", GTK_ICON_SIZE_MENU)); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menuitem); @@ -2082,7 +2083,8 @@ popup_targets_received (GtkClipboard *clipboard, /* copy menu item */ menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Copy")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menuitem), gtk_image_new_from_icon_name ("edit-copy", GTK_ICON_SIZE_MENU)); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menuitem); @@ -2093,7 +2095,8 @@ popup_targets_received (GtkClipboard *clipboard, /* paste menu item */ menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Paste")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menuitem), gtk_image_new_from_icon_name ("edit-paste", GTK_ICON_SIZE_MENU)); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menuitem); @@ -2565,7 +2568,7 @@ _get_position (EText *text, while (p && *p) { unival = g_utf8_get_char (p); if (g_unichar_isspace (unival)) { - new_pos = g_utf8_pointer_to_offset (text->text, p); + new_pos = g_utf8_pointer_to_offset (text->text, p); break; } else p = g_utf8_next_char (p); @@ -3277,13 +3280,13 @@ e_text_class_init (ETextClass *class) static void e_text_init (EText *text) { - text->model = e_text_model_new (); - text->text = e_text_model_get_text (text->model); - text->preedit_len = 0; - text->preedit_pos = 0; - text->layout = NULL; + text->model = e_text_model_new (); + text->text = e_text_model_get_text (text->model); + text->preedit_len = 0; + text->preedit_pos = 0; + text->layout = NULL; - text->revert = NULL; + text->revert = NULL; text->model_changed_signal_id = g_signal_connect ( text->model, "changed", @@ -3293,62 +3296,62 @@ e_text_init (EText *text) text->model, "reposition", G_CALLBACK (e_text_text_model_reposition), text); - text->justification = GTK_JUSTIFY_LEFT; - text->clip_width = -1.0; - text->clip_height = -1.0; - text->xofs = 0.0; - text->yofs = 0.0; + text->justification = GTK_JUSTIFY_LEFT; + text->clip_width = -1.0; + text->clip_height = -1.0; + text->xofs = 0.0; + text->yofs = 0.0; - text->ellipsis = NULL; - text->use_ellipsis = FALSE; - text->ellipsis_width = 0; + text->ellipsis = NULL; + text->use_ellipsis = FALSE; + text->ellipsis_width = 0; - text->editable = FALSE; - text->editing = FALSE; - text->xofs_edit = 0; - text->yofs_edit = 0; + text->editable = FALSE; + text->editing = FALSE; + text->xofs_edit = 0; + text->yofs_edit = 0; - text->selection_start = 0; - text->selection_end = 0; - text->select_by_word = FALSE; + text->selection_start = 0; + text->selection_end = 0; + text->select_by_word = FALSE; - text->timeout_id = 0; - text->timer = NULL; + text->timeout_id = 0; + text->timer = NULL; - text->lastx = 0; - text->lasty = 0; - text->last_state = 0; + text->lastx = 0; + text->lasty = 0; + text->last_state = 0; - text->scroll_start = 0; - text->show_cursor = TRUE; - text->button_down = FALSE; + text->scroll_start = 0; + text->show_cursor = TRUE; + text->button_down = FALSE; - text->tep = NULL; - text->tep_command_id = 0; + text->tep = NULL; + text->tep_command_id = 0; - text->pointer_in = FALSE; - text->default_cursor_shown = TRUE; - text->line_wrap = FALSE; - text->break_characters = NULL; - text->max_lines = -1; - text->dbl_timeout = 0; - text->tpl_timeout = 0; + text->pointer_in = FALSE; + text->default_cursor_shown = TRUE; + text->line_wrap = FALSE; + text->break_characters = NULL; + text->max_lines = -1; + text->dbl_timeout = 0; + text->tpl_timeout = 0; - text->bold = FALSE; - text->strikeout = FALSE; + text->bold = FALSE; + text->strikeout = FALSE; - text->allow_newlines = TRUE; + text->allow_newlines = TRUE; - text->last_type_request = -1; - text->last_time_request = 0; - text->queued_requests = NULL; + text->last_type_request = -1; + text->last_time_request = 0; + text->queued_requests = NULL; - text->im_context = NULL; - text->need_im_reset = FALSE; + text->im_context = NULL; + text->need_im_reset = FALSE; text->im_context_signals_registered = FALSE; - text->handle_popup = FALSE; - text->rgba_set = FALSE; + text->handle_popup = FALSE; + text->rgba_set = FALSE; e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM (text), e_text_reflow); } diff --git a/e-util/e-timezone-dialog.c b/e-util/e-timezone-dialog.c index acf9f70000..bb2aa21fcf 100644 --- a/e-util/e-timezone-dialog.c +++ b/e-util/e-timezone-dialog.c @@ -123,7 +123,7 @@ e_timezone_dialog_class_init (ETimezoneDialogClass *class) g_type_class_add_private (class, sizeof (ETimezoneDialogPrivate)); object_class = G_OBJECT_CLASS (class); - object_class->dispose = e_timezone_dialog_dispose; + object_class->dispose = e_timezone_dialog_dispose; } /* Object initialization function for the event editor */ diff --git a/e-util/e-tree-model-generator.c b/e-util/e-tree-model-generator.c index 7e88f30009..f035d120f6 100644 --- a/e-util/e-tree-model-generator.c +++ b/e-util/e-tree-model-generator.c @@ -225,18 +225,18 @@ e_tree_model_generator_class_init (ETreeModelGeneratorClass *class) static void e_tree_model_generator_tree_model_init (GtkTreeModelIface *iface) { - iface->get_flags = e_tree_model_generator_get_flags; - iface->get_n_columns = e_tree_model_generator_get_n_columns; + iface->get_flags = e_tree_model_generator_get_flags; + iface->get_n_columns = e_tree_model_generator_get_n_columns; iface->get_column_type = e_tree_model_generator_get_column_type; - iface->get_iter = e_tree_model_generator_get_iter; - iface->get_path = e_tree_model_generator_get_path; - iface->get_value = e_tree_model_generator_get_value; - iface->iter_next = e_tree_model_generator_iter_next; - iface->iter_children = e_tree_model_generator_iter_children; - iface->iter_has_child = e_tree_model_generator_iter_has_child; + iface->get_iter = e_tree_model_generator_get_iter; + iface->get_path = e_tree_model_generator_get_path; + iface->get_value = e_tree_model_generator_get_value; + iface->iter_next = e_tree_model_generator_iter_next; + iface->iter_children = e_tree_model_generator_iter_children; + iface->iter_has_child = e_tree_model_generator_iter_has_child; iface->iter_n_children = e_tree_model_generator_iter_n_children; - iface->iter_nth_child = e_tree_model_generator_iter_nth_child; - iface->iter_parent = e_tree_model_generator_iter_parent; + iface->iter_nth_child = e_tree_model_generator_iter_nth_child; + iface->iter_parent = e_tree_model_generator_iter_parent; } static void @@ -245,7 +245,7 @@ e_tree_model_generator_init (ETreeModelGenerator *tree_model_generator) tree_model_generator->priv = E_TREE_MODEL_GENERATOR_GET_PRIVATE (tree_model_generator); - tree_model_generator->priv->stamp = g_random_int (); + tree_model_generator->priv->stamp = g_random_int (); tree_model_generator->priv->root_nodes = g_array_new (FALSE, FALSE, sizeof (Node)); } @@ -304,7 +304,7 @@ generated_offset_to_child_offset (GArray *group, gint offset, gint *internal_offset) { - gboolean success = FALSE; + gboolean success = FALSE; gint accum_offset = 0; gint i; @@ -549,8 +549,8 @@ create_node_at_child_path (ETreeModelGenerator *tree_model_generator, node = &g_array_index (group, Node, index); node->parent_group = parent_group; node->parent_index = parent_index; - node->n_generated = 0; - node->child_nodes = NULL; + node->n_generated = 0; + node->child_nodes = NULL; ETMG_DEBUG ( g_print ("Created node at offset %d, parent_group = %p, parent_index = %d\n", @@ -791,7 +791,7 @@ e_tree_model_generator_set_generate_func (ETreeModelGenerator *tree_model_genera { g_return_if_fail (E_IS_TREE_MODEL_GENERATOR (tree_model_generator)); - tree_model_generator->priv->generate_func = func; + tree_model_generator->priv->generate_func = func; tree_model_generator->priv->generate_func_data = data; } @@ -815,7 +815,7 @@ e_tree_model_generator_set_modify_func (ETreeModelGenerator *tree_model_generato { g_return_if_fail (E_IS_TREE_MODEL_GENERATOR (tree_model_generator)); - tree_model_generator->priv->modify_func = func; + tree_model_generator->priv->modify_func = func; tree_model_generator->priv->modify_func_data = data; } diff --git a/e-util/e-tree-table-adapter.c b/e-util/e-tree-table-adapter.c index 7fd12bb317..b7efb05996 100644 --- a/e-util/e-tree-table-adapter.c +++ b/e-util/e-tree-table-adapter.c @@ -394,7 +394,7 @@ generate_tree (ETreeTableAdapter *etta, resort_node (etta, gnode, TRUE); etta->priv->root = gnode; - size = etta->priv->root_visible ? node->num_visible_children + 1 : node->num_visible_children; + size = etta->priv->root_visible ? node->num_visible_children + 1 : node->num_visible_children; resize_map (etta, size); fill_map (etta, 0, gnode); e_table_model_changed (E_TABLE_MODEL (etta)); diff --git a/e-util/e-tree.c b/e-util/e-tree.c index 8c5744d093..fbcdbe91f2 100644 --- a/e-util/e-tree.c +++ b/e-util/e-tree.c @@ -2595,9 +2595,9 @@ context_destroyed (gpointer data, { ETree *tree = data; if (tree->priv) { - tree->priv->last_drop_x = 0; - tree->priv->last_drop_y = 0; - tree->priv->last_drop_time = 0; + tree->priv->last_drop_x = 0; + tree->priv->last_drop_y = 0; + tree->priv->last_drop_time = 0; tree->priv->last_drop_context = NULL; collapse_drag (tree, NULL); scroll_off (tree); diff --git a/e-util/e-util-enums.h b/e-util/e-util-enums.h index 5a50e2741a..9913e4d938 100644 --- a/e-util/e-util-enums.h +++ b/e-util/e-util-enums.h @@ -95,13 +95,13 @@ typedef enum { /* XXX Be pedantic with the value assignments to ensure compatibility. */ typedef enum { E_DATE_BAD_WEEKDAY = G_DATE_BAD_WEEKDAY, - E_DATE_MONDAY = G_DATE_MONDAY, - E_DATE_TUESDAY = G_DATE_TUESDAY, - E_DATE_WEDNESDAY = G_DATE_WEDNESDAY, - E_DATE_THURSDAY = G_DATE_THURSDAY, - E_DATE_FRIDAY = G_DATE_FRIDAY, - E_DATE_SATURDAY = G_DATE_SATURDAY, - E_DATE_SUNDAY = G_DATE_SUNDAY + E_DATE_MONDAY = G_DATE_MONDAY, + E_DATE_TUESDAY = G_DATE_TUESDAY, + E_DATE_WEDNESDAY = G_DATE_WEDNESDAY, + E_DATE_THURSDAY = G_DATE_THURSDAY, + E_DATE_FRIDAY = G_DATE_FRIDAY, + E_DATE_SATURDAY = G_DATE_SATURDAY, + E_DATE_SUNDAY = G_DATE_SUNDAY } EDateWeekday; /** diff --git a/e-util/e-web-view-gtkhtml.c b/e-util/e-web-view-gtkhtml.c index 0dd6bce99b..5b6db0d504 100644 --- a/e-util/e-web-view-gtkhtml.c +++ b/e-util/e-web-view-gtkhtml.c @@ -54,7 +54,7 @@ struct _EWebViewGtkHTMLPrivate { GtkTargetList *paste_target_list; /* Lockdown Options */ - guint disable_printing : 1; + guint disable_printing : 1; guint disable_save_to_disk : 1; }; diff --git a/e-util/e-widget-undo.c b/e-util/e-widget-undo.c index 4cb933f544..f2a3ec7d17 100644 --- a/e-util/e-widget-undo.c +++ b/e-util/e-widget-undo.c @@ -111,7 +111,7 @@ reset_redos (EUndoData *data) static void push_undo (EUndoData *data, - EUndoInfo *info) + EUndoInfo *info) { gint index; @@ -130,9 +130,9 @@ push_undo (EUndoData *data, static gboolean can_merge_insert_undos (EUndoInfo *current_info, - const gchar *text, - gint text_len, - gint position) + const gchar *text, + gint text_len, + gint position) { gint len; @@ -158,9 +158,9 @@ can_merge_insert_undos (EUndoInfo *current_info, static void push_insert_undo (GObject *object, - const gchar *text, - gint text_len, - gint position) + const gchar *text, + gint text_len, + gint position) { EUndoData *data; EUndoInfo *info; @@ -195,9 +195,9 @@ push_insert_undo (GObject *object, static void push_delete_undo (GObject *object, - gchar *text, /* takes ownership of the 'text' */ - gint position_start, - gint position_end) + gchar *text, /* takes ownership of the 'text' */ + gint position_start, + gint position_end) { EUndoData *data; EUndoInfo *info; @@ -250,27 +250,27 @@ push_delete_undo (GObject *object, static void editable_undo_insert_text_cb (GtkEditable *editable, - gchar *text, - gint text_length, - gint *position, - gpointer user_data) + gchar *text, + gint text_length, + gint *position, + gpointer user_data) { push_insert_undo (G_OBJECT (editable), text, text_length, *position); } static void editable_undo_delete_text_cb (GtkEditable *editable, - gint start_pos, - gint end_pos, - gpointer user_data) + gint start_pos, + gint end_pos, + gpointer user_data) { push_delete_undo (G_OBJECT (editable), gtk_editable_get_chars (editable, start_pos, end_pos), start_pos, end_pos); } static void editable_undo_insert_text (GObject *object, - const gchar *text, - gint position) + const gchar *text, + gint position) { g_return_if_fail (GTK_IS_EDITABLE (object)); @@ -279,8 +279,8 @@ editable_undo_insert_text (GObject *object, static void editable_undo_delete_text (GObject *object, - gint position_start, - gint position_end) + gint position_start, + gint position_end) { g_return_if_fail (GTK_IS_EDITABLE (object)); @@ -289,21 +289,22 @@ editable_undo_delete_text (GObject *object, static void text_buffer_undo_insert_text_cb (GtkTextBuffer *text_buffer, - GtkTextIter *location, - gchar *text, - gint text_length, - gpointer user_data) + GtkTextIter *location, + gchar *text, + gint text_length, + gpointer user_data) { push_insert_undo (G_OBJECT (text_buffer), text, text_length, gtk_text_iter_get_offset (location)); } static void text_buffer_undo_delete_range_cb (GtkTextBuffer *text_buffer, - GtkTextIter *start, - GtkTextIter *end, - gpointer user_data) + GtkTextIter *start, + GtkTextIter *end, + gpointer user_data) { - push_delete_undo (G_OBJECT (text_buffer), + push_delete_undo ( + G_OBJECT (text_buffer), gtk_text_iter_get_text (start, end), gtk_text_iter_get_offset (start), gtk_text_iter_get_offset (end)); @@ -311,8 +312,8 @@ text_buffer_undo_delete_range_cb (GtkTextBuffer *text_buffer, static void text_buffer_undo_insert_text (GObject *object, - const gchar *text, - gint position) + const gchar *text, + gint position) { GtkTextBuffer *text_buffer; GtkTextIter iter; @@ -327,8 +328,8 @@ text_buffer_undo_insert_text (GObject *object, static void text_buffer_undo_delete_text (GObject *object, - gint position_start, - gint position_end) + gint position_start, + gint position_end) { GtkTextBuffer *text_buffer; GtkTextIter start_iter, end_iter; @@ -344,7 +345,7 @@ text_buffer_undo_delete_text (GObject *object, static void widget_undo_place_cursor_at (GObject *object, - gint char_pos) + gint char_pos) { if (GTK_IS_EDITABLE (object)) gtk_editable_set_position (GTK_EDITABLE (object), char_pos); @@ -361,9 +362,13 @@ widget_undo_place_cursor_at (GObject *object, static void undo_do_something (GObject *object, - EUndoDoType todo, - void (* insert_func) (GObject *object, const gchar *text, gint position), - void (* delete_func) (GObject *object, gint position_start, gint position_end)) + EUndoDoType todo, + void (* insert_func) (GObject *object, + const gchar *text, + gint position), + void (* delete_func) (GObject *object, + gint position_start, + gint position_end)) { EUndoData *data; EUndoInfo *info = NULL; @@ -394,12 +399,12 @@ undo_do_something (GObject *object, widget_undo_place_cursor_at (object, info->position_start); } else { insert_func (object, info->text, info->position_start); - widget_undo_place_cursor_at (object, info->position_start + g_utf8_strlen (info->text, -1)); + widget_undo_place_cursor_at (object, info->position_start + g_utf8_strlen (info->text, -1)); } } else if (info->type == E_UNDO_DELETE) { if (todo == E_UNDO_DO_UNDO) { insert_func (object, info->text, info->position_start); - widget_undo_place_cursor_at (object, info->position_start + g_utf8_strlen (info->text, -1)); + widget_undo_place_cursor_at (object, info->position_start + g_utf8_strlen (info->text, -1)); } else { delete_func (object, info->position_start, info->position_end); widget_undo_place_cursor_at (object, info->position_start); @@ -414,7 +419,7 @@ undo_do_something (GObject *object, static gchar * undo_describe_info (EUndoInfo *info, - EUndoDoType undo_type) + EUndoDoType undo_type) { if (!info) return NULL; @@ -430,7 +435,7 @@ undo_describe_info (EUndoInfo *info, else return g_strdup_printf (_("Redo 'Insert '%.12s...''"), info->text); } - + * if (undo_type == E_UNDO_DO_UNDO) return g_strdup_printf (_("Undo 'Insert '%s''"), info->text); else @@ -446,7 +451,7 @@ undo_describe_info (EUndoInfo *info, else return g_strdup_printf (_("Redo 'Delete '%.12s...''"), info->text); } - + * if (undo_type == E_UNDO_DO_UNDO) return g_strdup_printf (_("Undo 'Delete '%s''"), info->text); else @@ -458,7 +463,7 @@ undo_describe_info (EUndoInfo *info, static gboolean undo_check_undo (GObject *object, - gchar **description) + gchar **description) { EUndoData *data; @@ -477,7 +482,7 @@ undo_check_undo (GObject *object, static gboolean undo_check_redo (GObject *object, - gchar **description) + gchar **description) { EUndoData *data; @@ -509,7 +514,7 @@ undo_reset (GObject *object) static void widget_undo_popup_activate_cb (GObject *menu_item, - GtkWidget *widget) + GtkWidget *widget) { EUndoDoType undo_type = GPOINTER_TO_INT (g_object_get_data (menu_item, UNDO_DATA_KEY)); @@ -521,9 +526,9 @@ widget_undo_popup_activate_cb (GObject *menu_item, static gboolean widget_undo_prepend_popup (GtkWidget *widget, - GtkMenuShell *menu, - EUndoDoType undo_type, - gboolean already_added) + GtkMenuShell *menu, + EUndoDoType undo_type, + gboolean already_added) { gchar *description = NULL; const gchar *icon_name = NULL; @@ -565,8 +570,8 @@ widget_undo_prepend_popup (GtkWidget *widget, static void widget_undo_populate_popup_cb (GtkWidget *widget, - GtkWidget *popup, - gpointer user_data) + GtkWidget *popup, + gpointer user_data) { GtkMenuShell *menu; gboolean added = FALSE; @@ -600,7 +605,7 @@ widget_undo_populate_popup_cb (GtkWidget *widget, **/ void e_widget_undo_attach (GtkWidget *widget, - EFocusTracker *focus_tracker) + EFocusTracker *focus_tracker) { EUndoData *data; @@ -614,17 +619,21 @@ e_widget_undo_attach (GtkWidget *widget, g_object_set_data_full (G_OBJECT (widget), UNDO_DATA_KEY, data, free_undo_data); - data->insert_handler_id = g_signal_connect (widget, "insert-text", + data->insert_handler_id = g_signal_connect ( + widget, "insert-text", G_CALLBACK (editable_undo_insert_text_cb), NULL); - data->delete_handler_id = g_signal_connect (widget, "delete-text", + data->delete_handler_id = g_signal_connect ( + widget, "delete-text", G_CALLBACK (editable_undo_delete_text_cb), NULL); if (focus_tracker) - g_signal_connect_swapped (widget, "changed", + g_signal_connect_swapped ( + widget, "changed", G_CALLBACK (e_focus_tracker_update_actions), focus_tracker); if (GTK_IS_ENTRY (widget)) - g_signal_connect (widget, "populate-popup", + g_signal_connect ( + widget, "populate-popup", G_CALLBACK (widget_undo_populate_popup_cb), NULL); } else if (GTK_IS_TEXT_VIEW (widget)) { GtkTextBuffer *text_buffer; @@ -637,16 +646,20 @@ e_widget_undo_attach (GtkWidget *widget, g_object_set_data_full (G_OBJECT (text_buffer), UNDO_DATA_KEY, data, free_undo_data); - data->insert_handler_id = g_signal_connect (text_buffer, "insert-text", + data->insert_handler_id = g_signal_connect ( + text_buffer, "insert-text", G_CALLBACK (text_buffer_undo_insert_text_cb), NULL); - data->delete_handler_id = g_signal_connect (text_buffer, "delete-range", + data->delete_handler_id = g_signal_connect ( + text_buffer, "delete-range", G_CALLBACK (text_buffer_undo_delete_range_cb), NULL); if (focus_tracker) - g_signal_connect_swapped (text_buffer, "changed", + g_signal_connect_swapped ( + text_buffer, "changed", G_CALLBACK (e_focus_tracker_update_actions), focus_tracker); - g_signal_connect (widget, "populate-popup", + g_signal_connect ( + widget, "populate-popup", G_CALLBACK (widget_undo_populate_popup_cb), NULL); } } @@ -817,7 +830,8 @@ void e_widget_undo_do_undo (GtkWidget *widget) { if (GTK_IS_EDITABLE (widget)) { - undo_do_something (G_OBJECT (widget), + undo_do_something ( + G_OBJECT (widget), E_UNDO_DO_UNDO, editable_undo_insert_text, editable_undo_delete_text); @@ -826,7 +840,8 @@ e_widget_undo_do_undo (GtkWidget *widget) text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)); - undo_do_something (G_OBJECT (text_buffer), + undo_do_something ( + G_OBJECT (text_buffer), E_UNDO_DO_UNDO, text_buffer_undo_insert_text, text_buffer_undo_delete_text); @@ -850,7 +865,8 @@ void e_widget_undo_do_redo (GtkWidget *widget) { if (GTK_IS_EDITABLE (widget)) { - undo_do_something (G_OBJECT (widget), + undo_do_something ( + G_OBJECT (widget), E_UNDO_DO_REDO, editable_undo_insert_text, editable_undo_delete_text); @@ -859,7 +875,8 @@ e_widget_undo_do_redo (GtkWidget *widget) text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)); - undo_do_something (G_OBJECT (text_buffer), + undo_do_something ( + G_OBJECT (text_buffer), E_UNDO_DO_REDO, text_buffer_undo_insert_text, text_buffer_undo_delete_text); diff --git a/e-util/ea-calendar-cell.c b/e-util/ea-calendar-cell.c index 500b2c9c60..38c68b38c0 100644 --- a/e-util/ea-calendar-cell.c +++ b/e-util/ea-calendar-cell.c @@ -318,7 +318,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 diff --git a/e-util/ea-calendar-item.c b/e-util/ea-calendar-item.c index fad2b7ce4d..fe52134891 100644 --- a/e-util/ea-calendar-item.c +++ b/e-util/ea-calendar-item.c @@ -333,11 +333,11 @@ ea_calendar_item_get_name (AtkObject *accessible) gint year1, year2, month1, month2, day1, day2; year1 = g_date_get_year (&select_start); - month1 = g_date_get_month (&select_start); + month1 = g_date_get_month (&select_start); day1 = g_date_get_day (&select_start); year2 = g_date_get_year (&select_end); - month2 = g_date_get_month (&select_end); + month2 = g_date_get_month (&select_end); day2 = g_date_get_day (&select_end); sprintf ( diff --git a/e-util/ea-factory.h b/e-util/ea-factory.h index 3264c3f9d3..72cb7689ba 100644 --- a/e-util/ea-factory.h +++ b/e-util/ea-factory.h @@ -32,86 +32,86 @@ #include <atk/atkobject.h> -#define EA_FACTORY_PARTA_GOBJECT(type, type_as_function, opt_create_accessible) \ -static AtkObject * \ -type_as_function ## _factory_create_accessible (GObject *obj) \ -{ \ - AtkObject *accessible; \ - g_return_val_if_fail (G_IS_OBJECT (obj), NULL); \ - accessible = opt_create_accessible (G_OBJECT (obj)); \ - return accessible; \ +#define EA_FACTORY_PARTA_GOBJECT(type, type_as_function, opt_create_accessible) \ +static AtkObject * \ +type_as_function ## _factory_create_accessible (GObject *obj) \ +{ \ + AtkObject *accessible; \ + g_return_val_if_fail (G_IS_OBJECT (obj), NULL); \ + accessible = opt_create_accessible (G_OBJECT (obj)); \ + return accessible; \ } -#define EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible) \ -static AtkObject * \ -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); \ - \ - accessible = opt_create_accessible (widget); \ - return accessible; \ +#define EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible) \ +static AtkObject * \ +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); \ + \ + accessible = opt_create_accessible (widget); \ + return accessible; \ } -#define EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible) \ - \ -static GType \ -type_as_function ## _factory_get_accessible_type (void) \ -{ \ - return type; \ -} \ - \ - \ -static void \ -type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass) \ -{ \ - klass->create_accessible = type_as_function ## _factory_create_accessible; \ +#define EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible) \ + \ +static GType \ +type_as_function ## _factory_get_accessible_type (void) \ +{ \ + return type; \ +} \ + \ + \ +static void \ +type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass) \ +{ \ + klass->create_accessible = type_as_function ## _factory_create_accessible; \ klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\ -} \ - \ -static GType \ -type_as_function ## _factory_get_type (void) \ -{ \ - static GType t = 0; \ - \ - if (!t) \ - { \ - gchar *name; \ - static const GTypeInfo tinfo = \ - { \ - sizeof (AtkObjectFactoryClass), \ - NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init, \ - NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL \ - }; \ - \ - name = g_strconcat (g_type_name (type), "Factory", NULL); \ - t = g_type_register_static ( \ - ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0); \ - g_free (name); \ - } \ - \ - return t; \ +} \ + \ +static GType \ +type_as_function ## _factory_get_type (void) \ +{ \ + static GType t = 0; \ + \ + if (!t) \ + { \ + gchar *name; \ + static const GTypeInfo tinfo = \ + { \ + sizeof (AtkObjectFactoryClass), \ + NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init, \ + NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL \ + }; \ + \ + name = g_strconcat (g_type_name (type), "Factory", NULL); \ + t = g_type_register_static ( \ + ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0); \ + g_free (name); \ + } \ + \ + return t; \ } -#define EA_FACTORY(type, type_as_function, opt_create_accessible) \ - EA_FACTORY_PARTA (type, type_as_function, opt_create_accessible) \ +#define EA_FACTORY(type, type_as_function, opt_create_accessible) \ + EA_FACTORY_PARTA (type, type_as_function, opt_create_accessible) \ EA_FACTORY_PARTB (type, type_as_function, opt_create_accessible) -#define EA_FACTORY_GOBJECT(type, type_as_function, opt_create_accessible) \ - EA_FACTORY_PARTA_GOBJECT (type, type_as_function, opt_create_accessible) \ +#define EA_FACTORY_GOBJECT(type, type_as_function, opt_create_accessible) \ + EA_FACTORY_PARTA_GOBJECT (type, type_as_function, opt_create_accessible) \ EA_FACTORY_PARTB (type, type_as_function, opt_create_accessible) -#define EA_SET_FACTORY(obj_type, type_as_function) \ -{ \ - if (atk_get_root ()) { \ - atk_registry_set_factory_type (atk_get_default_registry (), \ - obj_type, \ +#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 ());\ - } \ + } \ } #endif /* _EA_FACTORY_H__ */ diff --git a/e-util/gal-a11y-e-cell-popup.c b/e-util/gal-a11y-e-cell-popup.c index df05ea4f84..2744a1cbc5 100644 --- a/e-util/gal-a11y-e-cell-popup.c +++ b/e-util/gal-a11y-e-cell-popup.c @@ -128,7 +128,7 @@ gal_a11y_e_cell_popup_new (ETableItem *item, "<Alt>Down", /* action keybinding */ popup_cell_action); - a11y->role = ATK_ROLE_TABLE_CELL; + a11y->role = ATK_ROLE_TABLE_CELL; return a11y; } diff --git a/e-util/gal-a11y-e-cell-toggle.c b/e-util/gal-a11y-e-cell-toggle.c index 8c26d45391..88e2716f90 100644 --- a/e-util/gal-a11y-e-cell-toggle.c +++ b/e-util/gal-a11y-e-cell-toggle.c @@ -85,8 +85,8 @@ gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - object_class->dispose = gal_a11y_e_cell_toggle_dispose; - parent_class = g_type_class_ref (PARENT_TYPE); + object_class->dispose = gal_a11y_e_cell_toggle_dispose; + parent_class = g_type_class_ref (PARENT_TYPE); } static void @@ -161,7 +161,7 @@ gal_a11y_e_cell_toggle_new (ETableItem *item, cell = GAL_A11Y_E_CELL (a11y); toggle_cell = GAL_A11Y_E_CELL_TOGGLE (a11y); - a11y->role = ATK_ROLE_TABLE_CELL; + a11y->role = ATK_ROLE_TABLE_CELL; gal_a11y_e_cell_construct ( a11y, diff --git a/e-util/gal-a11y-e-cell-tree.c b/e-util/gal-a11y-e-cell-tree.c index 69ea7cd0d7..ce32ed3748 100644 --- a/e-util/gal-a11y-e-cell-tree.c +++ b/e-util/gal-a11y-e-cell-tree.c @@ -146,7 +146,7 @@ ectr_do_action_collapse (AtkAction *action) static void ectr_class_init (GalA11yECellTreeClass *class) { - a11y_parent_class = g_type_class_ref (A11Y_PARENT_TYPE); + a11y_parent_class = g_type_class_ref (A11Y_PARENT_TYPE); } static void diff --git a/e-util/gal-a11y-e-cell-vbox.c b/e-util/gal-a11y-e-cell-vbox.c index 1f05d34a3f..c998eedb9d 100644 --- a/e-util/gal-a11y-e-cell-vbox.c +++ b/e-util/gal-a11y-e-cell-vbox.c @@ -155,12 +155,12 @@ ecv_class_init (GalA11yECellVboxClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); AtkObjectClass *a11y_class = ATK_OBJECT_CLASS (class); - parent_class = g_type_class_ref (PARENT_TYPE); + parent_class = g_type_class_ref (PARENT_TYPE); - object_class->dispose = ecv_dispose; + object_class->dispose = ecv_dispose; a11y_class->get_n_children = ecv_get_n_children; - a11y_class->ref_child = ecv_ref_child; + a11y_class->ref_child = ecv_ref_child; } static void @@ -171,7 +171,7 @@ ecv_init (GalA11yECellVbox *a11y) static void ecv_atk_component_iface_init (AtkComponentIface *iface) { - component_parent_iface = g_type_interface_peek_parent (iface); + component_parent_iface = g_type_interface_peek_parent (iface); iface->ref_accessible_at_point = ecv_ref_accessible_at_point; } diff --git a/e-util/gal-a11y-e-cell.c b/e-util/gal-a11y-e-cell.c index c4d84268a8..3d21f732ad 100644 --- a/e-util/gal-a11y-e-cell.c +++ b/e-util/gal-a11y-e-cell.c @@ -230,7 +230,7 @@ static void gal_a11y_e_cell_atk_component_iface_init (AtkComponentIface *iface) { iface->get_extents = gal_a11y_e_cell_get_extents; - iface->grab_focus = gal_a11y_e_cell_grab_focus; + iface->grab_focus = gal_a11y_e_cell_grab_focus; } static void @@ -239,14 +239,14 @@ gal_a11y_e_cell_class_init (GalA11yECellClass *class) AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class); - parent_class = g_type_class_ref (PARENT_TYPE); + parent_class = g_type_class_ref (PARENT_TYPE); - object_class->dispose = gal_a11y_e_cell_dispose; + object_class->dispose = gal_a11y_e_cell_dispose; - atk_object_class->get_parent = gal_a11y_e_cell_get_parent; + atk_object_class->get_parent = gal_a11y_e_cell_get_parent; atk_object_class->get_index_in_parent = gal_a11y_e_cell_get_index_in_parent; - atk_object_class->ref_state_set = gal_a11y_e_cell_ref_state_set; - atk_object_class->get_name = gal_a11y_e_cell_get_name; + atk_object_class->ref_state_set = gal_a11y_e_cell_ref_state_set; + atk_object_class->get_name = gal_a11y_e_cell_get_name; } static void @@ -628,13 +628,13 @@ gal_a11y_e_cell_construct (AtkObject *object, gint row) { GalA11yECell *a11y = GAL_A11Y_E_CELL (object); - a11y->item = item; + a11y->item = item; a11y->cell_view = cell_view; - a11y->parent = parent; + a11y->parent = parent; a11y->model_col = model_col; - a11y->view_col = view_col; - a11y->row = row; - ATK_OBJECT (a11y) ->role = ATK_ROLE_TABLE_CELL; + a11y->view_col = view_col; + a11y->row = row; + ATK_OBJECT (a11y) ->role = ATK_ROLE_TABLE_CELL; if (item) g_object_ref (item); diff --git a/e-util/gal-a11y-e-table-click-to-add-factory.c b/e-util/gal-a11y-e-table-click-to-add-factory.c index 3630474c92..e3c0b38355 100644 --- a/e-util/gal-a11y-e-table-click-to-add-factory.c +++ b/e-util/gal-a11y-e-table-click-to-add-factory.c @@ -63,7 +63,7 @@ gal_a11y_e_table_click_to_add_factory_class_init (GalA11yETableClickToAddFactory parent_class = g_type_class_ref (PARENT_TYPE); - factory_class->create_accessible = gal_a11y_e_table_click_to_add_factory_create_accessible; + factory_class->create_accessible = gal_a11y_e_table_click_to_add_factory_create_accessible; factory_class->get_accessible_type = gal_a11y_e_table_click_to_add_factory_get_accessible_type; } diff --git a/e-util/gal-a11y-e-table-click-to-add.c b/e-util/gal-a11y-e-table-click-to-add.c index 8139e699de..6fabe31627 100644 --- a/e-util/gal-a11y-e-table-click-to-add.c +++ b/e-util/gal-a11y-e-table-click-to-add.c @@ -158,7 +158,7 @@ etcta_ref_child (AtkObject *accessible, if (i != 0) return NULL; - etcta = E_TABLE_CLICK_TO_ADD ( + etcta = E_TABLE_CLICK_TO_ADD ( atk_gobject_accessible_get_object ( ATK_GOBJECT_ACCESSIBLE (accessible))); diff --git a/e-util/gal-a11y-e-table-column-header.c b/e-util/gal-a11y-e-table-column-header.c index 9977843f77..7fb225005a 100644 --- a/e-util/gal-a11y-e-table-column-header.c +++ b/e-util/gal-a11y-e-table-column-header.c @@ -223,7 +223,7 @@ gal_a11y_e_table_column_header_new (ETableCol *ecol, g_return_val_if_fail (E_IS_TABLE_COL (ecol), NULL); a11y = g_object_new (gal_a11y_e_table_column_header_get_type (), NULL); - accessible = ATK_OBJECT (a11y); + accessible = ATK_OBJECT (a11y); atk_object_initialize (accessible, ecol); GET_PRIVATE (a11y)->item = item; diff --git a/e-util/gal-a11y-e-table-factory.c b/e-util/gal-a11y-e-table-factory.c index dd4d843606..f6885c12e0 100644 --- a/e-util/gal-a11y-e-table-factory.c +++ b/e-util/gal-a11y-e-table-factory.c @@ -55,7 +55,7 @@ gal_a11y_e_table_factory_class_init (GalA11yETableFactoryClass *class) parent_class = g_type_class_ref (PARENT_TYPE); - factory_class->create_accessible = gal_a11y_e_table_factory_create_accessible; + factory_class->create_accessible = gal_a11y_e_table_factory_create_accessible; factory_class->get_accessible_type = gal_a11y_e_table_factory_get_accessible_type; } diff --git a/e-util/gal-a11y-e-table-item-factory.c b/e-util/gal-a11y-e-table-item-factory.c index 604fe94bef..65b449a98a 100644 --- a/e-util/gal-a11y-e-table-item-factory.c +++ b/e-util/gal-a11y-e-table-item-factory.c @@ -62,7 +62,7 @@ gal_a11y_e_table_item_factory_class_init (GalA11yETableItemFactoryClass *class) parent_class = g_type_class_ref (PARENT_TYPE); - factory_class->create_accessible = gal_a11y_e_table_item_factory_create_accessible; + factory_class->create_accessible = gal_a11y_e_table_item_factory_create_accessible; factory_class->get_accessible_type = gal_a11y_e_table_item_factory_get_accessible_type; } diff --git a/e-util/gal-a11y-e-table-item.c b/e-util/gal-a11y-e-table-item.c index b703b07317..bcdd585974 100644 --- a/e-util/gal-a11y-e-table-item.c +++ b/e-util/gal-a11y-e-table-item.c @@ -737,10 +737,10 @@ eti_atk_table_iface_init (AtkTableIface *iface) static void eti_atk_component_iface_init (AtkComponentIface *iface) { - component_parent_iface = g_type_interface_peek_parent (iface); + component_parent_iface = g_type_interface_peek_parent (iface); iface->ref_accessible_at_point = eti_ref_accessible_at_point; - iface->get_extents = eti_get_extents; + iface->get_extents = eti_get_extents; } static void @@ -1129,7 +1129,7 @@ gal_a11y_e_table_item_new (ETableItem *item) atk_state_set_add_state (GET_PRIVATE (a11y)->state_set, ATK_STATE_SHOWING); atk_state_set_add_state (GET_PRIVATE (a11y)->state_set, ATK_STATE_VISIBLE); - accessible = ATK_OBJECT (a11y); + accessible = ATK_OBJECT (a11y); GET_PRIVATE (a11y)->item = item; /* Initialize cell data. */ diff --git a/e-util/gal-a11y-e-table.c b/e-util/gal-a11y-e-table.c index de430fd19c..dc79f5f0f8 100644 --- a/e-util/gal-a11y-e-table.c +++ b/e-util/gal-a11y-e-table.c @@ -93,7 +93,7 @@ init_child_item (GalA11yETable *a11y) table = E_TABLE (gtk_accessible_get_widget (GTK_ACCESSIBLE (a11y))); if (table && gtk_widget_get_mapped (GTK_WIDGET (table)) && table->group && E_IS_TABLE_GROUP_CONTAINER (table->group)) { - ETableGroupContainer *etgc = (ETableGroupContainer *) table->group; + ETableGroupContainer *etgc = (ETableGroupContainer *) table->group; GList *list; for (list = etgc->children; list; list = g_list_next (list)) { @@ -168,12 +168,12 @@ et_ref_child (AtkObject *accessible, return aeti; } else if (E_IS_TABLE_GROUP_CONTAINER (et->group)) { - ETableGroupContainer *etgc = (ETableGroupContainer *) et->group; + ETableGroupContainer *etgc = (ETableGroupContainer *) et->group; ETableGroupContainerChildNode *child_node = g_list_nth_data (etgc->children, i); if (child_node) { ETableGroup *child = child_node->child; ETableItem * eti = find_first_table_item (child); - AtkObject *aeti = eti_get_accessible (eti, accessible); + AtkObject *aeti = eti_get_accessible (eti, accessible); if (aeti) g_object_ref (aeti); return aeti; @@ -205,10 +205,10 @@ et_class_init (GalA11yETableClass *class) { AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (class); - parent_class = g_type_class_ref (PARENT_TYPE); + parent_class = g_type_class_ref (PARENT_TYPE); - atk_object_class->get_n_children = et_get_n_children; - atk_object_class->ref_child = et_ref_child; + atk_object_class->get_n_children = et_get_n_children; + atk_object_class->ref_child = et_ref_child; } static void diff --git a/e-util/gal-a11y-e-text-factory.c b/e-util/gal-a11y-e-text-factory.c index 0c0e24d2c2..9b7d3fc6a3 100644 --- a/e-util/gal-a11y-e-text-factory.c +++ b/e-util/gal-a11y-e-text-factory.c @@ -58,7 +58,7 @@ gal_a11y_e_text_factory_class_init (GalA11yETextFactoryClass *class) parent_class = g_type_class_ref (PARENT_TYPE); - factory_class->create_accessible = gal_a11y_e_text_factory_create_accessible; + factory_class->create_accessible = gal_a11y_e_text_factory_create_accessible; factory_class->get_accessible_type = gal_a11y_e_text_factory_get_accessible_type; } diff --git a/e-util/gal-a11y-e-text.c b/e-util/gal-a11y-e-text.c index 3dc8e3b77e..950b923f88 100644 --- a/e-util/gal-a11y-e-text.c +++ b/e-util/gal-a11y-e-text.c @@ -660,7 +660,7 @@ static gint et_get_n_selections (AtkText *text) { EText *etext; - GObject *obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)); + GObject *obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)); if (obj == NULL) return -1; @@ -940,35 +940,35 @@ et_atk_component_iface_init (AtkComponentIface *iface) static void et_atk_text_iface_init (AtkTextIface *iface) { - iface->get_text = et_get_text; - iface->get_text_after_offset = et_get_text_after_offset; - iface->get_text_at_offset = et_get_text_at_offset; + iface->get_text = et_get_text; + iface->get_text_after_offset = et_get_text_after_offset; + iface->get_text_at_offset = et_get_text_at_offset; iface->get_character_at_offset = et_get_character_at_offset; - iface->get_text_before_offset = et_get_text_before_offset; - iface->get_caret_offset = et_get_caret_offset; - iface->get_run_attributes = et_get_run_attributes; - iface->get_default_attributes = et_get_default_attributes; - iface->get_character_extents = et_get_character_extents; - iface->get_character_count = et_get_character_count; - iface->get_offset_at_point = et_get_offset_at_point; - iface->get_n_selections = et_get_n_selections; - iface->get_selection = et_get_selection; - iface->add_selection = et_add_selection; - iface->remove_selection = et_remove_selection; - iface->set_selection = et_set_selection; - iface->set_caret_offset = et_set_caret_offset; + iface->get_text_before_offset = et_get_text_before_offset; + iface->get_caret_offset = et_get_caret_offset; + iface->get_run_attributes = et_get_run_attributes; + iface->get_default_attributes = et_get_default_attributes; + iface->get_character_extents = et_get_character_extents; + iface->get_character_count = et_get_character_count; + iface->get_offset_at_point = et_get_offset_at_point; + iface->get_n_selections = et_get_n_selections; + iface->get_selection = et_get_selection; + iface->add_selection = et_add_selection; + iface->remove_selection = et_remove_selection; + iface->set_selection = et_set_selection; + iface->set_caret_offset = et_set_caret_offset; } static void et_atk_editable_text_iface_init (AtkEditableTextIface *iface) { iface->set_run_attributes = et_set_run_attributes; - iface->set_text_contents = et_set_text_contents; - iface->insert_text = et_insert_text; - iface->copy_text = et_copy_text; - iface->cut_text = et_cut_text; - iface->delete_text = et_delete_text; - iface->paste_text = et_paste_text; + iface->set_text_contents = et_set_text_contents; + iface->insert_text = et_insert_text; + iface->copy_text = et_copy_text; + iface->cut_text = et_cut_text; + iface->delete_text = et_delete_text; + iface->paste_text = et_paste_text; } static void diff --git a/e-util/gal-a11y-e-tree-factory.c b/e-util/gal-a11y-e-tree-factory.c index 7410191da6..f218052b11 100644 --- a/e-util/gal-a11y-e-tree-factory.c +++ b/e-util/gal-a11y-e-tree-factory.c @@ -54,7 +54,7 @@ gal_a11y_e_tree_factory_class_init (GalA11yETreeFactoryClass *class) parent_class = g_type_class_ref (PARENT_TYPE); - factory_class->create_accessible = gal_a11y_e_tree_factory_create_accessible; + factory_class->create_accessible = gal_a11y_e_tree_factory_create_accessible; factory_class->get_accessible_type = gal_a11y_e_tree_factory_get_accessible_type; } diff --git a/e-util/gal-a11y-e-tree.c b/e-util/gal-a11y-e-tree.c index 60f7efb920..6b40b05841 100644 --- a/e-util/gal-a11y-e-tree.c +++ b/e-util/gal-a11y-e-tree.c @@ -100,10 +100,10 @@ et_class_init (GalA11yETreeClass *class) { AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (class); - parent_class = g_type_class_ref (PARENT_TYPE); + parent_class = g_type_class_ref (PARENT_TYPE); - atk_object_class->get_n_children = et_get_n_children; - atk_object_class->ref_child = et_ref_child; + atk_object_class->get_n_children = et_get_n_children; + atk_object_class->ref_child = et_ref_child; } static void diff --git a/e-util/gal-a11y-factory.h b/e-util/gal-a11y-factory.h index a261c308ac..191a9e4296 100644 --- a/e-util/gal-a11y-factory.h +++ b/e-util/gal-a11y-factory.h @@ -31,58 +31,58 @@ #include <atk/atkobject.h> #include <atk/atkobjectfactory.h> -#define GAL_A11Y_FACTORY(type, type_as_function, opt_create_accessible) \ - \ -static GType \ -type_as_function ## _factory_get_accessible_type (void) \ -{ \ - return type; \ -} \ - \ -static AtkObject * \ -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); \ - \ - accessible = opt_create_accessible (widget); \ - \ - return accessible; \ -} \ - \ -static void \ -type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass) \ -{ \ - klass->create_accessible = type_as_function ## _factory_create_accessible; \ +#define GAL_A11Y_FACTORY(type, type_as_function, opt_create_accessible) \ + \ +static GType \ +type_as_function ## _factory_get_accessible_type (void) \ +{ \ + return type; \ +} \ + \ +static AtkObject * \ +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); \ + \ + accessible = opt_create_accessible (widget); \ + \ + return accessible; \ +} \ + \ +static void \ +type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass) \ +{ \ + klass->create_accessible = type_as_function ## _factory_create_accessible; \ klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\ -} \ - \ -static GType \ -type_as_function ## _factory_get_type (void) \ -{ \ - static GType t = 0; \ - \ - if (!t) \ - { \ - gchar *name; \ - static const GTypeInfo tinfo = \ - { \ - sizeof (AtkObjectFactoryClass), \ - NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init, \ - NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL \ - }; \ - \ - name = g_strconcat (g_type_name (type), "Factory", NULL); \ - t = g_type_register_static ( \ - ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0); \ - g_free (name); \ - } \ - \ - return t; \ +} \ + \ +static GType \ +type_as_function ## _factory_get_type (void) \ +{ \ + static GType t = 0; \ + \ + if (!t) \ + { \ + gchar *name; \ + static const GTypeInfo tinfo = \ + { \ + sizeof (AtkObjectFactoryClass), \ + NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init, \ + NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL \ + }; \ + \ + name = g_strconcat (g_type_name (type), "Factory", NULL); \ + t = g_type_register_static ( \ + ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0); \ + g_free (name); \ + } \ + \ + return t; \ } #endif /* _GAL_A11Y_FACTORY_H__ */ diff --git a/e-util/gal-view-collection.c b/e-util/gal-view-collection.c index 6d8ccf896c..98b7e2eab5 100644 --- a/e-util/gal-view-collection.c +++ b/e-util/gal-view-collection.c @@ -404,7 +404,7 @@ gal_view_collection_dispose (GObject *object) for (ii = 0; ii < priv->removed_view_count; ii++) gal_view_collection_item_free (priv->removed_view_data[ii]); g_free (priv->removed_view_data); - priv->removed_view_data = NULL; + priv->removed_view_data = NULL; priv->removed_view_count = 0; /* Chain up to parent's dispose() method. */ diff --git a/e-util/gal-view-etable.c b/e-util/gal-view-etable.c index de73a0204b..06e80093d8 100644 --- a/e-util/gal-view-etable.c +++ b/e-util/gal-view-etable.c @@ -114,7 +114,7 @@ gal_view_etable_clone (GalView *view) gve = GAL_VIEW_ETABLE (view); /* do this before setting state_filename, to not overwrite current - state changes in the 'attach' function */ + * state changes in the 'attach' function */ if (gve->priv->table) gal_view_etable_attach_table (GAL_VIEW_ETABLE (clone), gve->priv->table); else if (gve->priv->tree) diff --git a/e-util/gal-view-instance-save-as-dialog.c b/e-util/gal-view-instance-save-as-dialog.c index d5febb4acc..c29d719a56 100644 --- a/e-util/gal-view-instance-save-as-dialog.c +++ b/e-util/gal-view-instance-save-as-dialog.c @@ -229,7 +229,7 @@ gal_view_instance_save_as_dialog_class_init (GalViewInstanceSaveAsDialogClass *c object_class->set_property = gal_view_instance_save_as_dialog_set_property; object_class->get_property = gal_view_instance_save_as_dialog_get_property; - object_class->dispose = gal_view_instance_save_as_dialog_dispose; + object_class->dispose = gal_view_instance_save_as_dialog_dispose; g_object_class_install_property ( object_class, diff --git a/e-util/gal-view-instance.c b/e-util/gal-view-instance.c index a645150a08..d74dc8db9f 100644 --- a/e-util/gal-view-instance.c +++ b/e-util/gal-view-instance.c @@ -218,25 +218,25 @@ gal_view_instance_class_init (GalViewInstanceClass *class) G_TYPE_NONE, 0); class->display_view = NULL; - class->changed = NULL; + class->changed = NULL; } static void gal_view_instance_init (GalViewInstance *instance) { - instance->collection = NULL; + instance->collection = NULL; - instance->instance_id = NULL; - instance->custom_filename = NULL; + instance->instance_id = NULL; + instance->custom_filename = NULL; instance->current_view_filename = NULL; - instance->current_title = NULL; - instance->current_type = NULL; - instance->current_id = NULL; - instance->current_view = NULL; + instance->current_title = NULL; + instance->current_type = NULL; + instance->current_id = NULL; + instance->current_view = NULL; - instance->view_changed_id = 0; - instance->collection_changed_id = 0; + instance->view_changed_id = 0; + instance->collection_changed_id = 0; instance->loaded = FALSE; instance->default_view = NULL; diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c index ea0bcd70f1..c076d80085 100644 --- a/em-format/e-mail-formatter-attachment.c +++ b/em-format/e-mail-formatter-attachment.c @@ -405,7 +405,7 @@ static void e_mail_formatter_attachment_class_init (EMailFormatterExtensionClass *class) { class->display_name = _("Attachment"); - class->description = _("Display as attachment"); + class->description = _("Display as attachment"); class->mime_types = formatter_mime_types; class->priority = G_PRIORITY_LOW; class->format = emfe_attachment_format; diff --git a/em-format/e-mail-formatter-enums.h b/em-format/e-mail-formatter-enums.h index e5b7d5e489..862d66e4fa 100644 --- a/em-format/e-mail-formatter-enums.h +++ b/em-format/e-mail-formatter-enums.h @@ -33,20 +33,20 @@ typedef enum { } EMailFormatterColor; typedef enum { /*< flags >*/ - E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSABLE = 1 << 0, - E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSED = 1 << 1, - E_MAIL_FORMATTER_HEADER_FLAG_HTML = 1 << 2, - E_MAIL_FORMATTER_HEADER_FLAG_NOCOLUMNS = 1 << 3, - E_MAIL_FORMATTER_HEADER_FLAG_BOLD = 1 << 4, - E_MAIL_FORMATTER_HEADER_FLAG_NODEC = 1 << 5, - E_MAIL_FORMATTER_HEADER_FLAG_HIDDEN = 1 << 6, - E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS = 1 << 7, - E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE = 1 << 8 + E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSABLE = 1 << 0, + E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSED = 1 << 1, + E_MAIL_FORMATTER_HEADER_FLAG_HTML = 1 << 2, + E_MAIL_FORMATTER_HEADER_FLAG_NOCOLUMNS = 1 << 3, + E_MAIL_FORMATTER_HEADER_FLAG_BOLD = 1 << 4, + E_MAIL_FORMATTER_HEADER_FLAG_NODEC = 1 << 5, + E_MAIL_FORMATTER_HEADER_FLAG_HIDDEN = 1 << 6, + E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS = 1 << 7, + E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE = 1 << 8 } EMailFormatterHeaderFlags; typedef enum { - E_MAIL_FORMATTER_MODE_INVALID = -1, - E_MAIL_FORMATTER_MODE_NORMAL = 0, + E_MAIL_FORMATTER_MODE_INVALID = -1, + E_MAIL_FORMATTER_MODE_NORMAL = 0, E_MAIL_FORMATTER_MODE_SOURCE, E_MAIL_FORMATTER_MODE_RAW, E_MAIL_FORMATTER_MODE_CID, @@ -55,8 +55,8 @@ typedef enum { } EMailFormatterMode; typedef enum { /*< flags >*/ - E_MAIL_FORMATTER_QUOTE_FLAG_CITE = 1 << 0, - E_MAIL_FORMATTER_QUOTE_FLAG_HEADERS = 1 << 1, + E_MAIL_FORMATTER_QUOTE_FLAG_CITE = 1 << 0, + E_MAIL_FORMATTER_QUOTE_FLAG_HEADERS = 1 << 1, E_MAIL_FORMATTER_QUOTE_FLAG_KEEP_SIG = 1 << 2 /* do not strip signature */ } EMailFormatterQuoteFlags; @@ -88,17 +88,17 @@ typedef enum { * Always check what's inside. **/ typedef enum { /*< flags >*/ - E_MAIL_PARSER_EXTENSION_INLINE = 1 << 0, - E_MAIL_PARSER_EXTENSION_INLINE_DISPOSITION = 1 << 1, - E_MAIL_PARSER_EXTENSION_COMPOUND_TYPE = 1 << 2 + E_MAIL_PARSER_EXTENSION_INLINE = 1 << 0, + E_MAIL_PARSER_EXTENSION_INLINE_DISPOSITION = 1 << 1, + E_MAIL_PARSER_EXTENSION_COMPOUND_TYPE = 1 << 2 } EMailParserExtensionFlags; typedef enum { /*< flags >*/ - E_MAIL_PART_VALIDITY_NONE = 0, - E_MAIL_PART_VALIDITY_PGP = 1 << 0, - E_MAIL_PART_VALIDITY_SMIME = 1 << 1, - E_MAIL_PART_VALIDITY_SIGNED = 1 << 2, - E_MAIL_PART_VALIDITY_ENCRYPTED = 1 << 3 + E_MAIL_PART_VALIDITY_NONE = 0, + E_MAIL_PART_VALIDITY_PGP = 1 << 0, + E_MAIL_PART_VALIDITY_SMIME = 1 << 1, + E_MAIL_PART_VALIDITY_SIGNED = 1 << 2, + E_MAIL_PART_VALIDITY_ENCRYPTED = 1 << 3 } EMailPartValidityFlags; G_END_DECLS diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c index 1feb8e1bc9..374f2213aa 100644 --- a/em-format/e-mail-formatter.c +++ b/em-format/e-mail-formatter.c @@ -1181,9 +1181,9 @@ e_mail_formatter_set_color (EMailFormatter *formatter, if (gdk_rgba_equal (color, format_color)) return; - format_color->red = color->red; + format_color->red = color->red; format_color->green = color->green; - format_color->blue = color->blue; + format_color->blue = color->blue; switch (type) { case E_MAIL_FORMATTER_COLOR_BODY: diff --git a/em-format/e-mail-part-attachment-bar.c b/em-format/e-mail-part-attachment-bar.c index 604581e9f6..6a0a07c378 100644 --- a/em-format/e-mail-part-attachment-bar.c +++ b/em-format/e-mail-part-attachment-bar.c @@ -82,10 +82,10 @@ e_mail_part_attachment_bar_get_store (EMailPartAttachmentBar *part) GtkTreeModel *tree_model; /* Create the store only on demand. The EMailParser runs in a dedicated - thread, but the EAttachmentStore is a GtkWidget descendant, which should - be manipulated only from the main/UI thread, thus postpone its creating - until it's really needed, which might be during the EMailFormatter run, - which runs from the main/UI thread. */ + * thread, but the EAttachmentStore is a GtkWidget descendant, which should + * be manipulated only from the main/UI thread, thus postpone its creating + * until it's really needed, which might be during the EMailFormatter run, + * which runs from the main/UI thread. */ tree_model = e_attachment_store_new (); part->priv->store = E_ATTACHMENT_STORE (tree_model); } diff --git a/em-format/e-mail-part-utils.c b/em-format/e-mail-part-utils.c index f3b853d77d..7fb38ac199 100644 --- a/em-format/e-mail-part-utils.c +++ b/em-format/e-mail-part-utils.c @@ -538,14 +538,18 @@ gboolean e_mail_part_is_inline (CamelMimePart *mime_part, GQueue *extensions) { - const gchar *disposition; EMailParserExtension *extension; EMailParserExtensionClass *class; + const gchar *disposition; + gboolean is_inline = FALSE; disposition = camel_mime_part_get_disposition (mime_part); + if (disposition != NULL) + is_inline = (g_ascii_strcasecmp (disposition, "inline") == 0); + if ((extensions == NULL) || g_queue_is_empty (extensions)) - return disposition && g_ascii_strcasecmp (disposition, "inline") == 0; + return is_inline; extension = g_queue_peek_head (extensions); class = E_MAIL_PARSER_EXTENSION_GET_CLASS (extension); @@ -556,7 +560,7 @@ e_mail_part_is_inline (CamelMimePart *mime_part, return TRUE; if (disposition != NULL) - return g_ascii_strcasecmp (disposition, "inline") == 0; + return is_inline; /* Otherwise, use the default for this handler type. */ return (class->flags & E_MAIL_PARSER_EXTENSION_INLINE) != 0; diff --git a/libgnomecanvas/gailcanvas.c b/libgnomecanvas/gailcanvas.c index 23cf894149..6af1a0745a 100644 --- a/libgnomecanvas/gailcanvas.c +++ b/libgnomecanvas/gailcanvas.c @@ -186,7 +186,7 @@ gail_canvas_real_initialize (AtkObject *obj, adj, "value_changed", G_CALLBACK (adjustment_changed), canvas); - obj->role = ATK_ROLE_LAYERED_PANE; + obj->role = ATK_ROLE_LAYERED_PANE; } static gint diff --git a/libgnomecanvas/gailcanvastext.c b/libgnomecanvas/gailcanvastext.c index a8d04f3ae3..6a658d6388 100644 --- a/libgnomecanvas/gailcanvastext.c +++ b/libgnomecanvas/gailcanvastext.c @@ -130,7 +130,7 @@ gail_canvas_text_new (GObject *obj) GNOME_CANVAS_TEXT (obj)->text); } - atk_object->role = ATK_ROLE_TEXT; + atk_object->role = ATK_ROLE_TEXT; return atk_object; } diff --git a/libgnomecanvas/gnome-canvas-rect.c b/libgnomecanvas/gnome-canvas-rect.c index fde76b70be..eefdb12118 100644 --- a/libgnomecanvas/gnome-canvas-rect.c +++ b/libgnomecanvas/gnome-canvas-rect.c @@ -105,8 +105,8 @@ gnome_canvas_rect_setup_for_fill (GnomeCanvasRect *rect, cr, ((rect->priv->fill_rgba >> 24) & 0xff) / 255.0, ((rect->priv->fill_rgba >> 16) & 0xff) / 255.0, - ((rect->priv->fill_rgba >> 8) & 0xff) / 255.0, - ( rect->priv->fill_rgba & 0xff) / 255.0); + ((rect->priv->fill_rgba >> 8) & 0xff) / 255.0, + ( rect->priv->fill_rgba & 0xff) / 255.0); cairo_set_fill_rule (cr, rect->priv->wind); return TRUE; @@ -123,8 +123,8 @@ gnome_canvas_rect_setup_for_stroke (GnomeCanvasRect *rect, cr, ((rect->priv->outline_rgba >> 24) & 0xff) / 255.0, ((rect->priv->outline_rgba >> 16) & 0xff) / 255.0, - ((rect->priv->outline_rgba >> 8) & 0xff) / 255.0, - ( rect->priv->outline_rgba & 0xff) / 255.0); + ((rect->priv->outline_rgba >> 8) & 0xff) / 255.0, + ( rect->priv->outline_rgba & 0xff) / 255.0); cairo_set_line_width (cr, rect->priv->line_width); cairo_set_line_cap (cr, rect->priv->cap); cairo_set_line_join (cr, rect->priv->join); diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c index f0c5308aed..e030b9b73b 100644 --- a/libgnomecanvas/gnome-canvas-text.c +++ b/libgnomecanvas/gnome-canvas-text.c @@ -583,13 +583,13 @@ gnome_canvas_text_init (GnomeCanvasText *text) text->font_desc = NULL; - text->underline = PANGO_UNDERLINE_NONE; + text->underline = PANGO_UNDERLINE_NONE; text->strikethrough = FALSE; - text->rise = 0; + text->rise = 0; text->underline_set = FALSE; - text->strike_set = FALSE; - text->rise_set = FALSE; + text->strike_set = FALSE; + text->rise_set = FALSE; } /* Dispose handler for the text item */ @@ -1330,8 +1330,8 @@ gnome_canvas_text_draw (GnomeCanvasItem *item, cr, ((text->rgba >> 24) & 0xff) / 255.0, ((text->rgba >> 16) & 0xff) / 255.0, - ((text->rgba >> 8) & 0xff) / 255.0, - ( text->rgba & 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); diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c index 60a05681d0..a9688d90f3 100644 --- a/libgnomecanvas/gnome-canvas.c +++ b/libgnomecanvas/gnome-canvas.c @@ -1862,7 +1862,7 @@ gnome_canvas_class_init (GnomeCanvasClass *class) GtkWidgetClass *widget_class; object_class = (GObjectClass *) class; - widget_class = (GtkWidgetClass *) class; + widget_class = (GtkWidgetClass *) class; object_class->set_property = gnome_canvas_set_property; object_class->get_property = gnome_canvas_get_property; @@ -2491,16 +2491,16 @@ pick_current_item (GnomeCanvas *canvas, (event->type == GDK_BUTTON_RELEASE)) { /* these fields have the same offsets in both types of events */ - canvas->pick_event.crossing.type = GDK_ENTER_NOTIFY; - canvas->pick_event.crossing.window = event->motion.window; + canvas->pick_event.crossing.type = GDK_ENTER_NOTIFY; + canvas->pick_event.crossing.window = event->motion.window; canvas->pick_event.crossing.send_event = event->motion.send_event; - canvas->pick_event.crossing.subwindow = NULL; - canvas->pick_event.crossing.x = event->motion.x; - canvas->pick_event.crossing.y = event->motion.y; - canvas->pick_event.crossing.mode = GDK_CROSSING_NORMAL; - canvas->pick_event.crossing.detail = GDK_NOTIFY_NONLINEAR; - canvas->pick_event.crossing.focus = FALSE; - canvas->pick_event.crossing.state = event->motion.state; + canvas->pick_event.crossing.subwindow = NULL; + canvas->pick_event.crossing.x = event->motion.x; + canvas->pick_event.crossing.y = event->motion.y; + canvas->pick_event.crossing.mode = GDK_CROSSING_NORMAL; + canvas->pick_event.crossing.detail = GDK_NOTIFY_NONLINEAR; + canvas->pick_event.crossing.focus = FALSE; + canvas->pick_event.crossing.state = event->motion.state; /* these fields don't have the same offsets in both types of events */ diff --git a/libgnomecanvas/gnome-canvas.h b/libgnomecanvas/gnome-canvas.h index 9e6b5bc3df..f24c929f95 100644 --- a/libgnomecanvas/gnome-canvas.h +++ b/libgnomecanvas/gnome-canvas.h @@ -46,14 +46,14 @@ G_BEGIN_DECLS * [0, 255]. */ -#define GNOME_CANVAS_COLOR(r, g, b) ((((guint) (r) & 0xff) << 24) \ - | (((guint) (g) & 0xff) << 16) \ - | (((guint) (b) & 0xff) << 8) \ +#define GNOME_CANVAS_COLOR(r, g, b) ((((guint) (r) & 0xff) << 24) \ + | (((guint) (g) & 0xff) << 16) \ + | (((guint) (b) & 0xff) << 8) \ | 0xff) -#define GNOME_CANVAS_COLOR_A(r, g, b, a) ((((guint) (r) & 0xff) << 24) \ - | (((guint) (g) & 0xff) << 16) \ - | (((guint) (b) & 0xff) << 8) \ +#define GNOME_CANVAS_COLOR_A(r, g, b, a) ((((guint) (r) & 0xff) << 24) \ + | (((guint) (g) & 0xff) << 16) \ + | (((guint) (b) & 0xff) << 8) \ | ((guint) (a) & 0xff)) typedef struct _GnomeCanvas GnomeCanvas; @@ -79,20 +79,20 @@ typedef struct _GnomeCanvasGroupClass GnomeCanvasGroupClass; /* Object flags for items */ typedef enum { - GNOME_CANVAS_ITEM_REALIZED = 1 << 0, - GNOME_CANVAS_ITEM_MAPPED = 1 << 1, - GNOME_CANVAS_ITEM_VISIBLE = 1 << 2, - GNOME_CANVAS_ITEM_NEED_UPDATE = 1 << 3, - GNOME_CANVAS_ITEM_NEED_AFFINE = 1 << 4, - GNOME_CANVAS_ITEM_NEED_CLIP = 1 << 5, - GNOME_CANVAS_ITEM_NEED_VIS = 1 << 6 + GNOME_CANVAS_ITEM_REALIZED = 1 << 0, + GNOME_CANVAS_ITEM_MAPPED = 1 << 1, + GNOME_CANVAS_ITEM_VISIBLE = 1 << 2, + GNOME_CANVAS_ITEM_NEED_UPDATE = 1 << 3, + GNOME_CANVAS_ITEM_NEED_AFFINE = 1 << 4, + GNOME_CANVAS_ITEM_NEED_CLIP = 1 << 5, + GNOME_CANVAS_ITEM_NEED_VIS = 1 << 6 } GnomeCanvasItemFlags; /* Update flags for items */ enum { - GNOME_CANVAS_UPDATE_REQUESTED = 1 << 0, - GNOME_CANVAS_UPDATE_AFFINE = 1 << 1, - GNOME_CANVAS_UPDATE_CLIP = 1 << 2, + GNOME_CANVAS_UPDATE_REQUESTED = 1 << 0, + GNOME_CANVAS_UPDATE_AFFINE = 1 << 1, + GNOME_CANVAS_UPDATE_CLIP = 1 << 2, GNOME_CANVAS_UPDATE_VISIBILITY = 1 << 3, GNOME_CANVAS_UPDATE_IS_VISIBLE = 1 << 4 /* Deprecated. FIXME: remove this */ }; diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index 8e45ae101f..4d80c6371a 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -112,24 +112,27 @@ static gboolean mail_backend_any_store_requires_downsync (EMailAccountStore *account_store) { GQueue queue = G_QUEUE_INIT; - gboolean any_requires_downsync = FALSE; g_return_val_if_fail (E_IS_MAIL_ACCOUNT_STORE (account_store), FALSE); e_mail_account_store_queue_enabled_services (account_store, &queue); + while (!g_queue_is_empty (&queue)) { CamelService *service; + CamelOfflineStore *offline_store; service = g_queue_pop_head (&queue); - if (service == NULL) + + if (!CAMEL_IS_OFFLINE_STORE (service)) continue; - if (CAMEL_IS_OFFLINE_STORE (service)) - any_requires_downsync = any_requires_downsync || - camel_offline_store_requires_downsync (CAMEL_OFFLINE_STORE (service)); + offline_store = CAMEL_OFFLINE_STORE (service); + + if (camel_offline_store_requires_downsync (offline_store)) + return TRUE; } - return any_requires_downsync; + return FALSE; } /* Callback for various asynchronous CamelStore operations where @@ -148,25 +151,28 @@ mail_backend_store_operation_done_cb (CamelStore *store, static void mail_backend_local_trash_expunge_done_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { CamelFolder *folder = CAMEL_FOLDER (source_object); EActivity *activity = user_data; - GError *error = NULL; + GError *local_error = NULL; - if (!e_mail_folder_expunge_finish (folder, result, &error)) { - g_warning ("%s: Failed to expunge local trash: %s", G_STRFUNC, error ? error->message : "Unknown error"); - } + e_mail_folder_expunge_finish (folder, result, &local_error); - g_clear_error (&error); + if (local_error != NULL) { + g_warning ( + "%s: Failed to expunge local trash: %s", + G_STRFUNC, local_error->message); + g_error_free (local_error); + } g_object_unref (activity); } static void mail_backend_set_session_offline_cb (gpointer user_data, - GObject *object) + GObject *object) { CamelSession *session = user_data; @@ -197,12 +203,17 @@ mail_backend_prepare_for_offline_cb (EShell *shell, camel_session_set_online (CAMEL_SESSION (session), FALSE); if (e_shell_backend_is_started (shell_backend)) { + gboolean ask_to_synchronize; gboolean synchronize = FALSE; - if (e_shell_get_network_available (shell) && - mail_backend_any_store_requires_downsync (account_store)) + ask_to_synchronize = + e_shell_get_network_available (shell) && + mail_backend_any_store_requires_downsync (account_store); + + if (ask_to_synchronize) { synchronize = em_utils_prompt_user ( window, NULL, "mail:ask-quick-offline", NULL); + } if (!synchronize) { e_shell_backend_cancel_all (shell_backend); @@ -220,7 +231,10 @@ mail_backend_prepare_for_offline_cb (EShell *shell, e_shell_backend_add_activity (shell_backend, activity); } - g_object_weak_ref (G_OBJECT (activity), mail_backend_set_session_offline_cb, g_object_ref (session)); + g_object_weak_ref ( + G_OBJECT (activity), + mail_backend_set_session_offline_cb, + g_object_ref (session)); e_mail_account_store_queue_enabled_services (account_store, &queue); while (!g_queue_is_empty (&queue)) { @@ -385,24 +399,36 @@ mail_backend_prepare_for_quit_cb (EShell *shell, for (link = list; link != NULL; link = g_list_next (link)) { CamelService *service; + gboolean store_is_local; + const gchar *uid; service = CAMEL_SERVICE (link->data); - if (!CAMEL_IS_STORE (service) || - !mail_backend_service_is_enabled (registry, service)) + if (!CAMEL_IS_STORE (service)) + continue; + + if (!mail_backend_service_is_enabled (registry, service)) continue; - if (empty_trash && g_strcmp0 (camel_service_get_uid (service), E_MAIL_SESSION_LOCAL_UID) == 0) { + uid = camel_service_get_uid (service); + store_is_local = g_strcmp0 (uid, E_MAIL_SESSION_LOCAL_UID); + + if (empty_trash && store_is_local) { /* local trash requires special handling, - due to POP3's "delete-expunged" option */ + * due to POP3's "delete-expunged" option */ CamelFolder *local_trash; - GCancellable *cancellable = e_activity_get_cancellable (activity); + GCancellable *cancellable; + + cancellable = e_activity_get_cancellable (activity); - /* This should be lightning-fast, it's a local trash folder */ - local_trash = camel_store_get_trash_folder_sync (CAMEL_STORE (service), cancellable, NULL); + /* This should be lightning-fast since + * it's just the local trash folder. */ + local_trash = camel_store_get_trash_folder_sync ( + CAMEL_STORE (service), cancellable, NULL); - if (local_trash) { - e_mail_folder_expunge (local_trash, + if (local_trash != NULL) { + e_mail_folder_expunge ( + local_trash, G_PRIORITY_DEFAULT, cancellable, mail_backend_local_trash_expunge_done_cb, g_object_ref (activity)); diff --git a/mail/e-mail-config-assistant.c b/mail/e-mail-config-assistant.c index e847493c6b..df5799ee6c 100644 --- a/mail/e-mail-config-assistant.c +++ b/mail/e-mail-config-assistant.c @@ -380,6 +380,7 @@ mail_config_assistant_select_account_node (const gchar *account_uid) EShellSidebar *shell_sidebar; EMFolderTree *folder_tree = NULL; GtkWindow *active_window; + const gchar *active_view; g_return_if_fail (account_uid != NULL); @@ -390,8 +391,9 @@ mail_config_assistant_select_account_node (const gchar *account_uid) return; shell_window = E_SHELL_WINDOW (active_window); + active_view = e_shell_window_get_active_view (shell_window); - if (g_strcmp0 (e_shell_window_get_active_view (shell_window), "mail") != 0) + if (g_strcmp0 (active_view, "mail") != 0) return; shell_view = e_shell_window_get_shell_view (shell_window, "mail"); @@ -437,11 +439,15 @@ mail_config_assistant_close_cb (GObject *object, g_error_free (error); } else { - ESource *account; + ESource *source; + + source = e_mail_config_assistant_get_account_source (assistant); + if (source != NULL) { + const gchar *uid; - account = e_mail_config_assistant_get_account_source (assistant); - if (account) - mail_config_assistant_select_account_node (e_source_get_uid (account)); + uid = e_source_get_uid (source); + mail_config_assistant_select_account_node (uid); + } gtk_widget_destroy (GTK_WIDGET (assistant)); } diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 4b6f91cc8b..f063fd237b 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -473,7 +473,7 @@ mail_display_attachment_count_changed (EAttachmentStore *store, GList *children; children = gtk_container_get_children (GTK_CONTAINER (box)); - g_return_if_fail (children && children->data); + g_return_if_fail (children && children->data); element = g_object_get_data (children->data, "parent_element"); g_list_free (children); diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index b3dadcf6d5..d0a851296c 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -85,14 +85,14 @@ struct _EMailReaderPrivate { * restoration after a folder switch from automatically * marking the message as read. We only want that to * happen when the -user- selects a message. */ - guint folder_was_just_selected : 1; + guint folder_was_just_selected : 1; guint restoring_message_selection : 1; - guint avoid_next_mark_as_seen : 1; + guint avoid_next_mark_as_seen : 1; guint group_by_threads : 1; /* to be able to start the mark_seen timeout only after - the message is loaded into the EMailDisplay */ + * the message is loaded into the EMailDisplay */ gboolean schedule_mark_seen; guint schedule_mark_seen_interval; }; @@ -385,7 +385,7 @@ action_mail_delete_cb (GtkAction *action, EMailReader *reader) { guint32 mask = CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED; - guint32 set = CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED; + guint32 set = CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED; if (!e_mail_reader_confirm_delete (reader)) return; @@ -649,7 +649,7 @@ action_mail_mark_important_cb (GtkAction *action, EMailReader *reader) { guint32 mask = CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_DELETED; - guint32 set = CAMEL_MESSAGE_FLAGGED; + guint32 set = CAMEL_MESSAGE_FLAGGED; e_mail_reader_mark_selected (reader, mask, set); } @@ -717,7 +717,7 @@ action_mail_mark_read_cb (GtkAction *action, EMailReader *reader) { guint32 mask = CAMEL_MESSAGE_SEEN; - guint32 set = CAMEL_MESSAGE_SEEN; + guint32 set = CAMEL_MESSAGE_SEEN; e_mail_reader_mark_selected (reader, mask, set); } @@ -727,7 +727,7 @@ action_mail_mark_unimportant_cb (GtkAction *action, EMailReader *reader) { guint32 mask = CAMEL_MESSAGE_FLAGGED; - guint32 set = 0; + guint32 set = 0; e_mail_reader_mark_selected (reader, mask, set); } @@ -740,7 +740,7 @@ action_mail_mark_unread_cb (GtkAction *action, EMFolderTreeModel *model; CamelFolder *folder; guint32 mask = CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED; - guint32 set = 0; + guint32 set = 0; guint n_marked; message_list = e_mail_reader_get_message_list (reader); @@ -894,7 +894,7 @@ action_mail_next_cb (GtkAction *action, direction = MESSAGE_LIST_SELECT_NEXT; flags = 0; - mask = 0; + mask = 0; message_list = e_mail_reader_get_message_list (reader); @@ -912,7 +912,7 @@ action_mail_next_important_cb (GtkAction *action, direction = MESSAGE_LIST_SELECT_NEXT | MESSAGE_LIST_SELECT_WRAP; flags = CAMEL_MESSAGE_FLAGGED; - mask = CAMEL_MESSAGE_FLAGGED; + mask = CAMEL_MESSAGE_FLAGGED; message_list = e_mail_reader_get_message_list (reader); @@ -941,7 +941,7 @@ action_mail_next_unread_cb (GtkAction *action, direction = MESSAGE_LIST_SELECT_NEXT | MESSAGE_LIST_SELECT_WRAP; flags = 0; - mask = CAMEL_MESSAGE_SEEN; + mask = CAMEL_MESSAGE_SEEN; message_list = e_mail_reader_get_message_list (reader); @@ -959,7 +959,7 @@ action_mail_previous_cb (GtkAction *action, direction = MESSAGE_LIST_SELECT_PREVIOUS; flags = 0; - mask = 0; + mask = 0; message_list = e_mail_reader_get_message_list (reader); @@ -977,7 +977,7 @@ action_mail_previous_important_cb (GtkAction *action, direction = MESSAGE_LIST_SELECT_PREVIOUS | MESSAGE_LIST_SELECT_WRAP; flags = CAMEL_MESSAGE_FLAGGED; - mask = CAMEL_MESSAGE_FLAGGED; + mask = CAMEL_MESSAGE_FLAGGED; message_list = e_mail_reader_get_message_list (reader); @@ -1006,7 +1006,7 @@ action_mail_previous_unread_cb (GtkAction *action, direction = MESSAGE_LIST_SELECT_PREVIOUS | MESSAGE_LIST_SELECT_WRAP; flags = 0; - mask = CAMEL_MESSAGE_SEEN; + mask = CAMEL_MESSAGE_SEEN; message_list = e_mail_reader_get_message_list (reader); @@ -1735,7 +1735,7 @@ action_mail_undelete_cb (GtkAction *action, EMailReader *reader) { guint32 mask = CAMEL_MESSAGE_DELETED; - guint32 set = 0; + guint32 set = 0; e_mail_reader_mark_selected (reader, mask, set); } @@ -2649,8 +2649,8 @@ schedule_timeout_mark_seen (EMailReader *reader) static void mail_reader_load_status_changed_cb (EMailReader *reader, - GParamSpec *pspec, - EMailDisplay *display) + GParamSpec *pspec, + EMailDisplay *display) { EMailReaderPrivate *priv; @@ -3196,7 +3196,7 @@ mail_reader_message_seen (EMailReader *reader, guint32 mask, set; mask = CAMEL_MESSAGE_SEEN; - set = CAMEL_MESSAGE_SEEN; + set = CAMEL_MESSAGE_SEEN; folder = e_mail_reader_ref_folder (reader); camel_folder_set_message_flags (folder, message_uid, mask, set); diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h index 2094da9692..90e86f425c 100644 --- a/mail/e-mail-reader.h +++ b/mail/e-mail-reader.h @@ -69,24 +69,24 @@ typedef enum { } EMailReaderActionGroup; enum { - E_MAIL_READER_HAVE_ENABLED_ACCOUNT = 1 << 0, - E_MAIL_READER_SELECTION_SINGLE = 1 << 1, - E_MAIL_READER_SELECTION_MULTIPLE = 1 << 2, - E_MAIL_READER_SELECTION_CAN_ADD_SENDER = 1 << 3, - E_MAIL_READER_SELECTION_FLAG_CLEAR = 1 << 4, - E_MAIL_READER_SELECTION_FLAG_COMPLETED = 1 << 5, - E_MAIL_READER_SELECTION_FLAG_FOLLOWUP = 1 << 6, - E_MAIL_READER_SELECTION_HAS_DELETED = 1 << 7, - E_MAIL_READER_SELECTION_HAS_IMPORTANT = 1 << 8, - E_MAIL_READER_SELECTION_HAS_JUNK = 1 << 9, - E_MAIL_READER_SELECTION_HAS_NOT_JUNK = 1 << 10, - E_MAIL_READER_SELECTION_HAS_READ = 1 << 11, - E_MAIL_READER_SELECTION_HAS_UNDELETED = 1 << 12, - E_MAIL_READER_SELECTION_HAS_UNIMPORTANT = 1 << 13, - E_MAIL_READER_SELECTION_HAS_UNREAD = 1 << 14, - E_MAIL_READER_SELECTION_HAS_ATTACHMENTS = 1 << 15, - E_MAIL_READER_SELECTION_IS_MAILING_LIST = 1 << 16, - E_MAIL_READER_FOLDER_IS_JUNK = 1 << 17 + E_MAIL_READER_HAVE_ENABLED_ACCOUNT = 1 << 0, + E_MAIL_READER_SELECTION_SINGLE = 1 << 1, + E_MAIL_READER_SELECTION_MULTIPLE = 1 << 2, + E_MAIL_READER_SELECTION_CAN_ADD_SENDER = 1 << 3, + E_MAIL_READER_SELECTION_FLAG_CLEAR = 1 << 4, + E_MAIL_READER_SELECTION_FLAG_COMPLETED = 1 << 5, + E_MAIL_READER_SELECTION_FLAG_FOLLOWUP = 1 << 6, + E_MAIL_READER_SELECTION_HAS_DELETED = 1 << 7, + E_MAIL_READER_SELECTION_HAS_IMPORTANT = 1 << 8, + E_MAIL_READER_SELECTION_HAS_JUNK = 1 << 9, + E_MAIL_READER_SELECTION_HAS_NOT_JUNK = 1 << 10, + E_MAIL_READER_SELECTION_HAS_READ = 1 << 11, + E_MAIL_READER_SELECTION_HAS_UNDELETED = 1 << 12, + E_MAIL_READER_SELECTION_HAS_UNIMPORTANT = 1 << 13, + E_MAIL_READER_SELECTION_HAS_UNREAD = 1 << 14, + E_MAIL_READER_SELECTION_HAS_ATTACHMENTS = 1 << 15, + E_MAIL_READER_SELECTION_IS_MAILING_LIST = 1 << 16, + E_MAIL_READER_FOLDER_IS_JUNK = 1 << 17 }; struct _EMailReaderInterface { diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c index 8c1bbc19bb..898a3e54b5 100644 --- a/mail/e-mail-request.c +++ b/mail/e-mail-request.c @@ -367,9 +367,9 @@ mail_request_send_async (SoupRequest *request, G_PRIORITY_DEFAULT, cancellable); } else { /* Process e-mail mail requests in this thread, which should be - the main/UI thread, because any EMailFormatter can create - GtkWidget-s, or manipulate with them, which should be always - done in the main/UI thread. */ + * the main/UI thread, because any EMailFormatter can create + * GtkWidget-s, or manipulate with them, which should be always + * done in the main/UI thread. */ handle_mail_request (simple, G_OBJECT (request), cancellable); g_simple_async_result_complete_in_idle (simple); } diff --git a/mail/e-mail-sidebar.h b/mail/e-mail-sidebar.h index 2e3fa215cd..a85c609243 100644 --- a/mail/e-mail-sidebar.h +++ b/mail/e-mail-sidebar.h @@ -51,16 +51,16 @@ typedef struct _EMailSidebarPrivate EMailSidebarPrivate; /* Flags describing the selected folder. */ enum { - E_MAIL_SIDEBAR_FOLDER_ALLOWS_CHILDREN = 1 << 0, - E_MAIL_SIDEBAR_FOLDER_CAN_DELETE = 1 << 1, - E_MAIL_SIDEBAR_FOLDER_IS_JUNK = 1 << 2, - E_MAIL_SIDEBAR_FOLDER_IS_OUTBOX = 1 << 3, - E_MAIL_SIDEBAR_FOLDER_IS_STORE = 1 << 4, - E_MAIL_SIDEBAR_FOLDER_IS_TRASH = 1 << 5, - E_MAIL_SIDEBAR_FOLDER_IS_VIRTUAL = 1 << 6, - E_MAIL_SIDEBAR_STORE_IS_BUILTIN = 1 << 7, - E_MAIL_SIDEBAR_STORE_IS_SUBSCRIBABLE = 1 << 8, - E_MAIL_SIDEBAR_STORE_CAN_BE_DISABLED = 1 << 9 + E_MAIL_SIDEBAR_FOLDER_ALLOWS_CHILDREN = 1 << 0, + E_MAIL_SIDEBAR_FOLDER_CAN_DELETE = 1 << 1, + E_MAIL_SIDEBAR_FOLDER_IS_JUNK = 1 << 2, + E_MAIL_SIDEBAR_FOLDER_IS_OUTBOX = 1 << 3, + E_MAIL_SIDEBAR_FOLDER_IS_STORE = 1 << 4, + E_MAIL_SIDEBAR_FOLDER_IS_TRASH = 1 << 5, + E_MAIL_SIDEBAR_FOLDER_IS_VIRTUAL = 1 << 6, + E_MAIL_SIDEBAR_STORE_IS_BUILTIN = 1 << 7, + E_MAIL_SIDEBAR_STORE_IS_SUBSCRIBABLE = 1 << 8, + E_MAIL_SIDEBAR_STORE_CAN_BE_DISABLED = 1 << 9 }; struct _EMailSidebar { diff --git a/mail/e-mail-tag-editor.c b/mail/e-mail-tag-editor.c index 9a0fe04c14..ad2eff357d 100644 --- a/mail/e-mail-tag-editor.c +++ b/mail/e-mail-tag-editor.c @@ -237,7 +237,8 @@ e_mail_tag_editor_init (EMailTagEditor *editor) gtk_window_set_title (window, _("Flag to Follow Up")); gtk_window_set_icon_name (window, "stock_mail-flag-for-followup"); - gtk_dialog_add_buttons (dialog, + gtk_dialog_add_buttons ( + dialog, _("_Cancel"), GTK_RESPONSE_CANCEL, _("_OK"), GTK_RESPONSE_OK, NULL); diff --git a/mail/e-mail-view.c b/mail/e-mail-view.c index 2408e1a963..36b9d69026 100644 --- a/mail/e-mail-view.c +++ b/mail/e-mail-view.c @@ -37,7 +37,7 @@ struct _EMailViewPrivate { EMailView *previous_view; guint preview_visible : 1; - guint show_deleted : 1; + guint show_deleted : 1; }; enum { diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index e6a8cb2f91..969f194953 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1164,8 +1164,8 @@ em_utils_get_composer_recipients_as_message (EMsgComposer *composer) message = camel_mime_message_new (); - to_addr = camel_internet_address_new (); - cc_addr = camel_internet_address_new (); + to_addr = camel_internet_address_new (); + cc_addr = camel_internet_address_new (); bcc_addr = camel_internet_address_new (); /* To */ @@ -2373,7 +2373,7 @@ get_reply_recipient (CamelMimeMessage *message, CamelInternetAddress *address) { CamelMedium *medium; - const gchar *posthdr = NULL; + const gchar *posthdr = NULL; medium = CAMEL_MEDIUM (message); diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index be0bc766f8..460fb9cb23 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -563,17 +563,20 @@ folder_tree_maybe_expand_row (EMFolderTreeModel *model, static void folder_tree_row_changed_cb (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - EMFolderTree *folder_tree) + GtkTreePath *path, + GtkTreeIter *iter, + EMFolderTree *folder_tree) { - gboolean is_store = FALSE; CamelService *service = NULL; + gboolean is_store = FALSE; + gboolean select_store = FALSE; g_return_if_fail (EM_IS_FOLDER_TREE (folder_tree)); - if (!folder_tree->priv->select_store_uid_when_added || - gtk_tree_path_get_depth (path) != 1) + if (!folder_tree->priv->select_store_uid_when_added) + return; + + if (gtk_tree_path_get_depth (path) != 1) return; gtk_tree_model_get (model, iter, @@ -581,19 +584,29 @@ folder_tree_row_changed_cb (GtkTreeModel *model, COL_BOOL_IS_STORE, &is_store, -1); - if (is_store && service && - g_strcmp0 (folder_tree->priv->select_store_uid_when_added, camel_service_get_uid (service)) == 0) { + if (is_store && service != NULL) { + const gchar *uid1; + const gchar *uid2; + + uid1 = camel_service_get_uid (service); + uid2 = folder_tree->priv->select_store_uid_when_added; + select_store = (g_strcmp0 (uid1, uid2) == 0); + } + + if (select_store) { + GtkTreeView *tree_view; GtkTreeSelection *selection; g_free (folder_tree->priv->select_store_uid_when_added); folder_tree->priv->select_store_uid_when_added = NULL; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_tree)); + tree_view = GTK_TREE_VIEW (folder_tree); + selection = gtk_tree_view_get_selection (tree_view); gtk_tree_selection_select_iter (selection, iter); - gtk_tree_view_set_cursor (GTK_TREE_VIEW (folder_tree), path, NULL, FALSE); + gtk_tree_view_set_cursor (tree_view, path, NULL, FALSE); folder_tree->priv->cursor_set = TRUE; - gtk_tree_view_expand_row (GTK_TREE_VIEW (folder_tree), path, FALSE); + gtk_tree_view_expand_row (tree_view, path, FALSE); } g_clear_object (&service); @@ -604,8 +617,9 @@ folder_tree_clear_selected_list (EMFolderTree *folder_tree) { EMFolderTreePrivate *priv = folder_tree->priv; - g_slist_foreach (priv->select_uris, (GFunc) folder_tree_free_select_uri, NULL); - g_slist_free (priv->select_uris); + g_slist_free_full ( + priv->select_uris, + (GDestroyNotify) folder_tree_free_select_uri); g_hash_table_destroy (priv->select_uris_table); priv->select_uris = NULL; priv->select_uris_table = g_hash_table_new (g_str_hash, g_str_equal); @@ -1184,21 +1198,14 @@ folder_tree_finalize (GObject *object) priv = EM_FOLDER_TREE_GET_PRIVATE (object); - if (priv->select_uris != NULL) { - g_slist_foreach ( - priv->select_uris, - (GFunc) folder_tree_free_select_uri, NULL); - g_slist_free (priv->select_uris); - priv->select_uris = NULL; - } + g_slist_free_full ( + priv->select_uris, + (GDestroyNotify) folder_tree_free_select_uri); - if (priv->select_uris_table) { + if (priv->select_uris_table != NULL) g_hash_table_destroy (priv->select_uris_table); - priv->select_uris_table = NULL; - } g_free (priv->select_store_uid_when_added); - priv->select_store_uid_when_added = NULL; /* Chain up to parent's finalize() method. */ G_OBJECT_CLASS (em_folder_tree_parent_class)->finalize (object); @@ -3172,7 +3179,7 @@ em_folder_tree_select_next_path (EMFolderTree *folder_tree, break; } else { if (has_parent) { - iter = parent; + iter = parent; } else { /* Reached end. Wrapup*/ if (gtk_tree_model_get_iter_first (model, &iter)) diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h index 0972888613..98fcf56081 100644 --- a/mail/em-folder-tree.h +++ b/mail/em-folder-tree.h @@ -38,7 +38,7 @@ (G_TYPE_CHECK_CLASS_CAST \ ((cls), EM_TYPE_FOLDER_TREE, EMFolderTreeClass)) #define EM_IS_FOLDER_TREE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ + (G_TYPE_CHECK_INSTANCE_TYPE \ ((obj), EM_TYPE_FOLDER_TREE)) #define EM_IS_FOLDER_TREE_CLASS(cls) \ (G_TYPE_CHECK_CLASS_TYPE \ diff --git a/mail/message-list.c b/mail/message-list.c index 28296f4e5d..4cb5fa4f14 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -1550,8 +1550,8 @@ get_trimmed_subject (CamelMessageInfo *info) if (mlist_len && *subject == '[' && - !g_ascii_strncasecmp ((gchar *) subject + 1, mlist, mlist_len) && - subject[1 + mlist_len] == ']') { + !g_ascii_strncasecmp ((gchar *) subject + 1, mlist, mlist_len) && + subject[1 + mlist_len] == ']') { subject += 1 + mlist_len + 1; /* jump over "[mailing-list]" */ found_mlist = TRUE; @@ -3891,7 +3891,7 @@ build_tree (MessageList *message_list, } /* Do not update cursor on folder change signal, to not lose user's - scroll bar position */ + * scroll bar position */ if (!folder_changed || !table_item) { /* We need to set the cursor before we freeze, as * the thaw will restore it to the pre-freeze value. */ @@ -4131,7 +4131,7 @@ build_subtree_diff (MessageList *message_list, static void build_flat (MessageList *message_list, GPtrArray *summary, - gboolean folder_changed) + gboolean folder_changed) { gchar *saveuid = NULL; gint i; @@ -4285,7 +4285,8 @@ message_list_folder_changed (CamelFolder *folder, hide_junk = message_list_get_hide_junk (message_list, folder); hide_deleted = message_list_get_hide_deleted (message_list, folder); - d (printf ("%s: changes:%p added:%d removed:%d changed:%d recent:%d for '%s'\n", G_STRFUNC, changes, + d ( + printf ("%s: changes:%p added:%d removed:%d changed:%d recent:%d for '%s'\n", G_STRFUNC, changes, changes ? changes->uid_added->len : -1, changes ? changes->uid_removed->len : -1, changes ? changes->uid_changed->len : -1, diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c index 2802e8e14b..b92930d2b9 100644 --- a/modules/addressbook/e-book-shell-content.c +++ b/modules/addressbook/e-book-shell-content.c @@ -41,7 +41,7 @@ struct _EBookShellContentPrivate { GtkOrientation orientation; gboolean preview_show_maps; - guint preview_visible : 1; + guint preview_visible : 1; }; enum { diff --git a/modules/addressbook/e-book-shell-content.h b/modules/addressbook/e-book-shell-content.h index 5eabd0670c..0fbbf38898 100644 --- a/modules/addressbook/e-book-shell-content.h +++ b/modules/addressbook/e-book-shell-content.h @@ -56,12 +56,12 @@ typedef struct _EBookShellContentClass EBookShellContentClass; typedef struct _EBookShellContentPrivate EBookShellContentPrivate; enum { - E_BOOK_SHELL_CONTENT_SELECTION_SINGLE = 1 << 0, - E_BOOK_SHELL_CONTENT_SELECTION_MULTIPLE = 1 << 1, - E_BOOK_SHELL_CONTENT_SELECTION_HAS_EMAIL = 1 << 2, - E_BOOK_SHELL_CONTENT_SELECTION_IS_CONTACT_LIST = 1 << 3, - E_BOOK_SHELL_CONTENT_SOURCE_IS_BUSY = 1 << 4, - E_BOOK_SHELL_CONTENT_SOURCE_IS_EDITABLE = 1 << 5 + E_BOOK_SHELL_CONTENT_SELECTION_SINGLE = 1 << 0, + E_BOOK_SHELL_CONTENT_SELECTION_MULTIPLE = 1 << 1, + E_BOOK_SHELL_CONTENT_SELECTION_HAS_EMAIL = 1 << 2, + E_BOOK_SHELL_CONTENT_SELECTION_IS_CONTACT_LIST = 1 << 3, + E_BOOK_SHELL_CONTENT_SOURCE_IS_BUSY = 1 << 4, + E_BOOK_SHELL_CONTENT_SOURCE_IS_EDITABLE = 1 << 5 }; struct _EBookShellContent { diff --git a/modules/addressbook/e-book-shell-sidebar.h b/modules/addressbook/e-book-shell-sidebar.h index c0007a7617..75f999cff7 100644 --- a/modules/addressbook/e-book-shell-sidebar.h +++ b/modules/addressbook/e-book-shell-sidebar.h @@ -50,13 +50,13 @@ typedef struct _EBookShellSidebarClass EBookShellSidebarClass; typedef struct _EBookShellSidebarPrivate EBookShellSidebarPrivate; enum { - E_BOOK_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE = 1 << 0, - E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE = 1 << 1, - E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE = 1 << 2, - E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE = 1 << 3, - E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE = 1 << 4, - E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION = 1 << 5, - E_BOOK_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH = 1 << 6 + E_BOOK_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE = 1 << 0, + E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE = 1 << 1, + E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE = 1 << 2, + E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE = 1 << 3, + E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE = 1 << 4, + E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION = 1 << 5, + E_BOOK_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH = 1 << 6 }; struct _EBookShellSidebar { diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h index ba11ee1460..a7d943b868 100644 --- a/modules/addressbook/e-book-shell-view-private.h +++ b/modules/addressbook/e-book-shell-view-private.h @@ -65,7 +65,7 @@ G_BEGIN_DECLS * Positive values are reserved for categories. */ enum { CONTACT_FILTER_ANY_CATEGORY = -2, - CONTACT_FILTER_UNMATCHED = -1 + CONTACT_FILTER_UNMATCHED = -1 }; /* List these in the order to be displayed. */ diff --git a/modules/backup-restore/e-mail-config-restore-page.c b/modules/backup-restore/e-mail-config-restore-page.c index e39c2dfe8c..4751a2e0a8 100644 --- a/modules/backup-restore/e-mail-config-restore-page.c +++ b/modules/backup-restore/e-mail-config-restore-page.c @@ -359,7 +359,7 @@ evolution_backup_restore_validate_backup_file (const gchar *filename) quotedfname = g_shell_quote (filename); toolfname = g_build_filename (basedir, "evolution-backup", NULL); - command = g_strdup_printf ("%s --check %s", toolfname, quotedfname); + command = g_strdup_printf ("%s --check %s", toolfname, quotedfname); result = system (command); g_free (command); diff --git a/modules/backup-restore/evolution-backup-restore.c b/modules/backup-restore/evolution-backup-restore.c index 88f1e71b07..12a11193e6 100644 --- a/modules/backup-restore/evolution-backup-restore.c +++ b/modules/backup-restore/evolution-backup-restore.c @@ -86,7 +86,7 @@ G_DEFINE_DYNAMIC_TYPE ( E_TYPE_EXTENSION) enum { - BR_OK = 1 << 0, + BR_OK = 1 << 0, BR_START = 1 << 1 }; diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c index 65e525c696..4b75f8a790 100644 --- a/modules/backup-restore/evolution-backup-tool.c +++ b/modules/backup-restore/evolution-backup-tool.c @@ -166,11 +166,11 @@ replace_variables (const gchar *str, strip_datadir = strip_home_dir (e_get_user_data_dir ()); strip_configdir = strip_home_dir (e_get_user_config_dir ()); - #define repl(_find, _replace) \ - use = replace_string (res ? res->str : str, _find, _replace); \ - g_return_val_if_fail (use != NULL, NULL); \ - if (res) \ - g_string_free (res, TRUE); \ + #define repl(_find, _replace) \ + use = replace_string (res ? res->str : str, _find, _replace); \ + g_return_val_if_fail (use != NULL, NULL); \ + if (res) \ + g_string_free (res, TRUE); \ res = use; repl ("$HOME", g_get_home_dir ()); diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c index 2c4f4110b5..c0a96ec183 100644 --- a/modules/cal-config-caldav/e-caldav-chooser.c +++ b/modules/cal-config-caldav/e-caldav-chooser.c @@ -78,10 +78,10 @@ enum { }; typedef enum { - SUPPORTS_VEVENT = 1 << 0, - SUPPORTS_VTODO = 1 << 1, + SUPPORTS_VEVENT = 1 << 0, + SUPPORTS_VTODO = 1 << 1, SUPPORTS_VJOURNAL = 1 << 2, - SUPPORTS_ALL = 0x7 + SUPPORTS_ALL = 0x7 } SupportedComponentSet; enum { diff --git a/modules/calendar/e-cal-shell-content.h b/modules/calendar/e-cal-shell-content.h index d5aabd8d1e..489d8b69c0 100644 --- a/modules/calendar/e-cal-shell-content.h +++ b/modules/calendar/e-cal-shell-content.h @@ -55,14 +55,14 @@ typedef struct _ECalShellContentClass ECalShellContentClass; typedef struct _ECalShellContentPrivate ECalShellContentPrivate; enum { - E_CAL_SHELL_CONTENT_SELECTION_SINGLE = 1 << 0, - E_CAL_SHELL_CONTENT_SELECTION_MULTIPLE = 1 << 1, - E_CAL_SHELL_CONTENT_SELECTION_IS_EDITABLE = 1 << 2, - E_CAL_SHELL_CONTENT_SELECTION_IS_INSTANCE = 1 << 3, - E_CAL_SHELL_CONTENT_SELECTION_IS_MEETING = 1 << 4, - E_CAL_SHELL_CONTENT_SELECTION_IS_ORGANIZER = 1 << 5, - E_CAL_SHELL_CONTENT_SELECTION_IS_RECURRING = 1 << 6, - E_CAL_SHELL_CONTENT_SELECTION_CAN_DELEGATE = 1 << 7 + E_CAL_SHELL_CONTENT_SELECTION_SINGLE = 1 << 0, + E_CAL_SHELL_CONTENT_SELECTION_MULTIPLE = 1 << 1, + E_CAL_SHELL_CONTENT_SELECTION_IS_EDITABLE = 1 << 2, + E_CAL_SHELL_CONTENT_SELECTION_IS_INSTANCE = 1 << 3, + E_CAL_SHELL_CONTENT_SELECTION_IS_MEETING = 1 << 4, + E_CAL_SHELL_CONTENT_SELECTION_IS_ORGANIZER = 1 << 5, + E_CAL_SHELL_CONTENT_SELECTION_IS_RECURRING = 1 << 6, + E_CAL_SHELL_CONTENT_SELECTION_CAN_DELEGATE = 1 << 7 }; struct _ECalShellContent { diff --git a/modules/calendar/e-cal-shell-sidebar.h b/modules/calendar/e-cal-shell-sidebar.h index a243245d3a..f927aa7a69 100644 --- a/modules/calendar/e-cal-shell-sidebar.h +++ b/modules/calendar/e-cal-shell-sidebar.h @@ -52,13 +52,13 @@ typedef struct _ECalShellSidebarClass ECalShellSidebarClass; typedef struct _ECalShellSidebarPrivate ECalShellSidebarPrivate; enum { - E_CAL_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE = 1 << 0, - E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE = 1 << 1, - E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE = 1 << 2, - E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE = 1 << 3, - E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE = 1 << 4, - E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION = 1 << 5, - E_CAL_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH = 1 << 6 + E_CAL_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE = 1 << 0, + E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE = 1 << 1, + E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE = 1 << 2, + E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE = 1 << 3, + E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE = 1 << 4, + E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION = 1 << 5, + E_CAL_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH = 1 << 6 }; struct _ECalShellSidebar { diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h index e9da71050d..d0c29c6319 100644 --- a/modules/calendar/e-cal-shell-view-private.h +++ b/modules/calendar/e-cal-shell-view-private.h @@ -70,11 +70,11 @@ G_BEGIN_DECLS /* Filter items are displayed in ascending order. * Non-negative values are reserved for categories. */ enum { - CALENDAR_FILTER_ANY_CATEGORY = -5, - CALENDAR_FILTER_UNMATCHED = -4, - CALENDAR_FILTER_ACTIVE_APPOINTMENTS = -3, - CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS = -2, - CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES = -1 + CALENDAR_FILTER_ANY_CATEGORY = -5, + CALENDAR_FILTER_UNMATCHED = -4, + CALENDAR_FILTER_ACTIVE_APPOINTMENTS = -3, + CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS = -2, + CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES = -1 }; /* Search items are displayed in ascending order. */ diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c index dca724df13..95be0dc7db 100644 --- a/modules/calendar/e-memo-shell-content.c +++ b/modules/calendar/e-memo-shell-content.c @@ -47,7 +47,7 @@ struct _EMemoShellContentPrivate { gchar *current_uid; - guint preview_visible : 1; + guint preview_visible : 1; }; enum { diff --git a/modules/calendar/e-memo-shell-content.h b/modules/calendar/e-memo-shell-content.h index 7e5dfc2a32..d283e9e8be 100644 --- a/modules/calendar/e-memo-shell-content.h +++ b/modules/calendar/e-memo-shell-content.h @@ -53,10 +53,10 @@ typedef struct _EMemoShellContentClass EMemoShellContentClass; typedef struct _EMemoShellContentPrivate EMemoShellContentPrivate; enum { - E_MEMO_SHELL_CONTENT_SELECTION_SINGLE = 1 << 0, - E_MEMO_SHELL_CONTENT_SELECTION_MULTIPLE = 1 << 1, - E_MEMO_SHELL_CONTENT_SELECTION_CAN_EDIT = 1 << 2, - E_MEMO_SHELL_CONTENT_SELECTION_HAS_URL = 1 << 3 + E_MEMO_SHELL_CONTENT_SELECTION_SINGLE = 1 << 0, + E_MEMO_SHELL_CONTENT_SELECTION_MULTIPLE = 1 << 1, + E_MEMO_SHELL_CONTENT_SELECTION_CAN_EDIT = 1 << 2, + E_MEMO_SHELL_CONTENT_SELECTION_HAS_URL = 1 << 3 }; struct _EMemoShellContent { diff --git a/modules/calendar/e-memo-shell-sidebar.h b/modules/calendar/e-memo-shell-sidebar.h index 6fc7336845..bbc84b6476 100644 --- a/modules/calendar/e-memo-shell-sidebar.h +++ b/modules/calendar/e-memo-shell-sidebar.h @@ -52,13 +52,13 @@ typedef struct _EMemoShellSidebarClass EMemoShellSidebarClass; typedef struct _EMemoShellSidebarPrivate EMemoShellSidebarPrivate; enum { - E_MEMO_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE = 1 << 0, - E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE = 1 << 1, - E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE = 1 << 2, - E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE = 1 << 3, - E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE = 1 << 4, - E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION = 1 << 5, - E_MEMO_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH = 1 << 6 + E_MEMO_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE = 1 << 0, + E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE = 1 << 1, + E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE = 1 << 2, + E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE = 1 << 3, + E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE = 1 << 4, + E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION = 1 << 5, + E_MEMO_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH = 1 << 6 }; struct _EMemoShellSidebar { diff --git a/modules/calendar/e-memo-shell-view-private.h b/modules/calendar/e-memo-shell-view-private.h index be02336dc5..c1f5463382 100644 --- a/modules/calendar/e-memo-shell-view-private.h +++ b/modules/calendar/e-memo-shell-view-private.h @@ -58,8 +58,8 @@ G_BEGIN_DECLS /* Filter items are displayed in ascending order. * Non-negative values are reserved for categories. */ enum { - MEMO_FILTER_ANY_CATEGORY = -2, - MEMO_FILTER_UNMATCHED = -1 + MEMO_FILTER_ANY_CATEGORY = -2, + MEMO_FILTER_UNMATCHED = -1 }; /* Search items are displayed in ascending order. */ diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c index 66f5ec248a..a7c2981849 100644 --- a/modules/calendar/e-task-shell-content.c +++ b/modules/calendar/e-task-shell-content.c @@ -46,7 +46,7 @@ struct _ETaskShellContentPrivate { gchar *current_uid; - guint preview_visible : 1; + guint preview_visible : 1; }; enum { diff --git a/modules/calendar/e-task-shell-content.h b/modules/calendar/e-task-shell-content.h index 9b3ab6cb86..bc02302ce6 100644 --- a/modules/calendar/e-task-shell-content.h +++ b/modules/calendar/e-task-shell-content.h @@ -54,13 +54,13 @@ typedef struct _ETaskShellContentClass ETaskShellContentClass; typedef struct _ETaskShellContentPrivate ETaskShellContentPrivate; enum { - E_TASK_SHELL_CONTENT_SELECTION_SINGLE = 1 << 0, - E_TASK_SHELL_CONTENT_SELECTION_MULTIPLE = 1 << 1, - E_TASK_SHELL_CONTENT_SELECTION_CAN_ASSIGN = 1 << 2, - E_TASK_SHELL_CONTENT_SELECTION_CAN_EDIT = 1 << 3, - E_TASK_SHELL_CONTENT_SELECTION_HAS_COMPLETE = 1 << 4, - E_TASK_SHELL_CONTENT_SELECTION_HAS_INCOMPLETE = 1 << 5, - E_TASK_SHELL_CONTENT_SELECTION_HAS_URL = 1 << 6 + E_TASK_SHELL_CONTENT_SELECTION_SINGLE = 1 << 0, + E_TASK_SHELL_CONTENT_SELECTION_MULTIPLE = 1 << 1, + E_TASK_SHELL_CONTENT_SELECTION_CAN_ASSIGN = 1 << 2, + E_TASK_SHELL_CONTENT_SELECTION_CAN_EDIT = 1 << 3, + E_TASK_SHELL_CONTENT_SELECTION_HAS_COMPLETE = 1 << 4, + E_TASK_SHELL_CONTENT_SELECTION_HAS_INCOMPLETE = 1 << 5, + E_TASK_SHELL_CONTENT_SELECTION_HAS_URL = 1 << 6 }; struct _ETaskShellContent { diff --git a/modules/calendar/e-task-shell-sidebar.h b/modules/calendar/e-task-shell-sidebar.h index 0196d1f2ea..ccb4c9d6cd 100644 --- a/modules/calendar/e-task-shell-sidebar.h +++ b/modules/calendar/e-task-shell-sidebar.h @@ -52,13 +52,13 @@ typedef struct _ETaskShellSidebarClass ETaskShellSidebarClass; typedef struct _ETaskShellSidebarPrivate ETaskShellSidebarPrivate; enum { - E_TASK_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE = 1 << 0, - E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE = 1 << 1, - E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE = 1 << 2, - E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE = 1 << 3, + E_TASK_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE = 1 << 0, + E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE = 1 << 1, + E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE = 1 << 2, + E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE = 1 << 3, E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE = 1 << 4, - E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION = 1 << 5, - E_TASK_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH = 1 << 6 + E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION = 1 << 5, + E_TASK_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH = 1 << 6 }; struct _ETaskShellSidebar { diff --git a/modules/calendar/e-task-shell-view-private.h b/modules/calendar/e-task-shell-view-private.h index 5e39dda8c7..b2a1511c9a 100644 --- a/modules/calendar/e-task-shell-view-private.h +++ b/modules/calendar/e-task-shell-view-private.h @@ -61,13 +61,13 @@ G_BEGIN_DECLS /* Filter items are displayed in ascending order. * Non-negative values are reserved for categories. */ enum { - TASK_FILTER_ANY_CATEGORY = -7, - TASK_FILTER_UNMATCHED = -6, - TASK_FILTER_NEXT_7_DAYS_TASKS = -5, - TASK_FILTER_ACTIVE_TASKS = -4, - TASK_FILTER_OVERDUE_TASKS = -3, - TASK_FILTER_COMPLETED_TASKS = -2, - TASK_FILTER_TASKS_WITH_ATTACHMENTS = -1 + TASK_FILTER_ANY_CATEGORY = -7, + TASK_FILTER_UNMATCHED = -6, + TASK_FILTER_NEXT_7_DAYS_TASKS = -5, + TASK_FILTER_ACTIVE_TASKS = -4, + TASK_FILTER_OVERDUE_TASKS = -3, + TASK_FILTER_COMPLETED_TASKS = -2, + TASK_FILTER_TASKS_WITH_ATTACHMENTS = -1 }; /* Search items are displayed in ascending order. */ diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c index 8ef8f81c17..f19c418923 100644 --- a/modules/itip-formatter/itip-view.c +++ b/modules/itip-formatter/itip-view.c @@ -3799,7 +3799,7 @@ find_cal_update_ui (FormatItipFindData *fd, * Replies only make sense for events with an organizer. */ if ((!pitip->current_client || !e_cal_client_check_save_schedules (pitip->current_client)) && - (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; } @@ -3859,7 +3859,7 @@ decrease_find_data (FormatItipFindData *fd) * Replies only make sense for events with an organizer. */ if ((!pitip->current_client || !e_cal_client_check_save_schedules (pitip->current_client)) && - (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; } @@ -3868,7 +3868,7 @@ decrease_find_data (FormatItipFindData *fd) /* default is chosen in extract_itip_data() based on content of the VEVENT */ itip_view_set_rsvp (view, !pitip->no_reply_wanted); - if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) + if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) && !pitip->current_client) { /* Reuse already declared one or rename? */ ESource *source = NULL; @@ -3970,7 +3970,7 @@ get_object_without_rid_ready_cb (GObject *source_object, ECalComponent *comp; fd->puri->current_client = cal_client; - fd->keep_alarm_check = (fd->puri->method == ICAL_METHOD_PUBLISH || fd->puri->method == ICAL_METHOD_REQUEST) && + fd->keep_alarm_check = (fd->puri->method == ICAL_METHOD_PUBLISH || fd->puri->method == ICAL_METHOD_REQUEST) && (icalcomponent_get_first_component (icalcomp, ICAL_VALARM_COMPONENT) || icalcomponent_get_first_component (icalcomp, ICAL_XAUDIOALARM_COMPONENT) || icalcomponent_get_first_component (icalcomp, ICAL_XDISPLAYALARM_COMPONENT) || @@ -4019,7 +4019,7 @@ get_object_with_rid_ready_cb (GObject *source_object, ECalComponent *comp; fd->puri->current_client = cal_client; - fd->keep_alarm_check = (fd->puri->method == ICAL_METHOD_PUBLISH || fd->puri->method == ICAL_METHOD_REQUEST) && + fd->keep_alarm_check = (fd->puri->method == ICAL_METHOD_PUBLISH || fd->puri->method == ICAL_METHOD_REQUEST) && (icalcomponent_get_first_component (icalcomp, ICAL_VALARM_COMPONENT) || icalcomponent_get_first_component (icalcomp, ICAL_XAUDIOALARM_COMPONENT) || icalcomponent_get_first_component (icalcomp, ICAL_XDISPLAYALARM_COMPONENT) || @@ -5753,7 +5753,7 @@ view_response_cb (ItipView *view, return; } - if (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) { + if (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) { if (itip_view_get_free_time_check_state (view)) e_cal_component_set_transparency (pitip->comp, E_CAL_COMPONENT_TRANSP_TRANSPARENT); else @@ -5893,7 +5893,7 @@ in_proper_folder (CamelFolder *folder) if (have_flags) { /* it should be neither trash nor junk folder, */ - res = ((flags & CAMEL_FOLDER_TYPE_MASK) != CAMEL_FOLDER_TYPE_TRASH && + res = ((flags & CAMEL_FOLDER_TYPE_MASK) != CAMEL_FOLDER_TYPE_TRASH && (flags & CAMEL_FOLDER_TYPE_MASK) != CAMEL_FOLDER_TYPE_JUNK && /* it can be Inbox */ ((flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_INBOX || @@ -5957,7 +5957,7 @@ itip_view_init_view (ItipView *view) } else { itip_view_set_show_inherit_alarm_check ( view, - have_alarms && (info->method == ICAL_METHOD_PUBLISH || info->method == ICAL_METHOD_REQUEST)); + have_alarms && (info->method == ICAL_METHOD_PUBLISH || info->method == ICAL_METHOD_REQUEST)); switch (info->method) { case ICAL_METHOD_PUBLISH: @@ -6264,7 +6264,7 @@ itip_view_init_view (ItipView *view) G_CALLBACK (view_response_cb), info); if (response_enabled) { - itip_view_set_show_free_time_check (view, info->type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS && (info->method == ICAL_METHOD_PUBLISH || info->method == ICAL_METHOD_REQUEST)); + itip_view_set_show_free_time_check (view, info->type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS && (info->method == ICAL_METHOD_PUBLISH || info->method == ICAL_METHOD_REQUEST)); if (info->calendar_uid) { start_calendar_server_by_uid (info, view, info->calendar_uid, info->type); diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index 7b0460d2cb..1c1035d69e 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -515,7 +515,7 @@ mail_shell_view_prepare_for_quit_cb (EMailShellView *mail_shell_view, message_list_save_state (MESSAGE_LIST (message_list)); /* Do not sync folder content here, it's duty of EMailBackend, - which does it for all accounts */ + * which does it for all accounts */ } static void diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h index c2c6614084..377ebd8025 100644 --- a/modules/mail/e-mail-shell-view-private.h +++ b/modules/mail/e-mail-shell-view-private.h @@ -76,15 +76,15 @@ G_BEGIN_DECLS * sufficiently large values. Unfortunately this introduces an * arbitrary upper bound on labels. */ enum { - MAIL_FILTER_ALL_MESSAGES = -3, - MAIL_FILTER_UNREAD_MESSAGES = -2, - MAIL_FILTER_NO_LABEL = -1, + MAIL_FILTER_ALL_MESSAGES = -3, + MAIL_FILTER_UNREAD_MESSAGES = -2, + MAIL_FILTER_NO_LABEL = -1, /* Labels go here */ - MAIL_FILTER_READ_MESSAGES = 5000, - MAIL_FILTER_LAST_5_DAYS_MESSAGES = 5001, - MAIL_FILTER_MESSAGES_WITH_ATTACHMENTS = 5002, - MAIL_FILTER_IMPORTANT_MESSAGES = 5003, - MAIL_FILTER_MESSAGES_NOT_JUNK = 5004 + MAIL_FILTER_READ_MESSAGES = 5000, + MAIL_FILTER_LAST_5_DAYS_MESSAGES = 5001, + MAIL_FILTER_MESSAGES_WITH_ATTACHMENTS = 5002, + MAIL_FILTER_IMPORTANT_MESSAGES = 5003, + MAIL_FILTER_MESSAGES_NOT_JUNK = 5004 }; /* Search items are displayed in ascending order. */ diff --git a/modules/settings/e-settings-deprecated.c b/modules/settings/e-settings-deprecated.c index faba3dbee3..b34e791b0d 100644 --- a/modules/settings/e-settings-deprecated.c +++ b/modules/settings/e-settings-deprecated.c @@ -51,13 +51,13 @@ struct _ESettingsDeprecatedPrivate { /* Flag values used in the "working-days" key. */ enum { - DEPRECATED_WORKING_DAYS_SUNDAY = 1 << 0, - DEPRECATED_WORKING_DAYS_MONDAY = 1 << 1, - DEPRECATED_WORKING_DAYS_TUESDAY = 1 << 2, + DEPRECATED_WORKING_DAYS_SUNDAY = 1 << 0, + DEPRECATED_WORKING_DAYS_MONDAY = 1 << 1, + DEPRECATED_WORKING_DAYS_TUESDAY = 1 << 2, DEPRECATED_WORKING_DAYS_WEDNESDAY = 1 << 3, - DEPRECATED_WORKING_DAYS_THURSDAY = 1 << 4, - DEPRECATED_WORKING_DAYS_FRIDAY = 1 << 5, - DEPRECATED_WORKING_DAYS_SATURDAY = 1 << 6 + DEPRECATED_WORKING_DAYS_THURSDAY = 1 << 4, + DEPRECATED_WORKING_DAYS_FRIDAY = 1 << 5, + DEPRECATED_WORKING_DAYS_SATURDAY = 1 << 6 }; G_DEFINE_DYNAMIC_TYPE ( diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 1642ea5ea7..d933e1ae82 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -126,7 +126,7 @@ epech_get_widgets (CustomHeaderOptionsDialog *mch) if (!priv->main) return FALSE; - priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); + priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); #undef EMAIL_CUSTOM_HEADER @@ -219,7 +219,7 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch, } epech_setup_widgets (mch); - toplevel = gtk_widget_get_toplevel (priv->main); + toplevel = gtk_widget_get_toplevel (priv->main); if (parent) gtk_window_set_transient_for (GTK_WINDOW (toplevel),GTK_WINDOW (parent)); @@ -240,7 +240,7 @@ epech_load_from_settings (GSettings *settings, { CustomHeaderOptionsDialogPrivate *priv; EmailCustomHeaderDetails temp_header_details= {-1, -1, NULL, NULL}; - CustomSubHeader temp_header_value_details = {NULL}; + CustomSubHeader temp_header_value_details = {NULL}; gchar **headers; gint index,pos; diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index bb2eed56d8..f374e46e0b 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -136,12 +136,12 @@ send_dbus_message (const gchar *name, g_variant_builder_add (builder, "(u)", new_count); } - #define add_named_param(name, value) \ - if (value) { \ - gchar *val; \ - val = g_strconcat (name, ":", value, NULL); \ - g_variant_builder_add (builder, "(s)", val); \ - g_free (val); \ + #define add_named_param(name, value) \ + if (value) { \ + gchar *val; \ + val = g_strconcat (name, ":", value, NULL); \ + g_variant_builder_add (builder, "(s)", val); \ + g_free (val); \ } add_named_param ("msg_uid", msg_uid); @@ -431,7 +431,7 @@ new_notify_status (EMEventTargetFolder *t) if (!notify_init ("evolution-mail-notification")) fprintf (stderr,"notify init error"); - notify = notify_notification_new ( + notify = notify_notification_new ( summary, escaped_text, icon_name); notify_notification_set_urgency ( diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index a93848c850..71105d8fd6 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -871,10 +871,10 @@ do_mail_to_event (AsyncData *data) struct icaltimetype tt, tt2; struct _manage_comp *oldmc = NULL; - #define cache_backend_prop(prop) { \ - gchar *val = NULL; \ - e_client_get_backend_property_sync (E_CLIENT (client), prop, &val, NULL, NULL); \ - g_free (val); \ + #define cache_backend_prop(prop) { \ + gchar *val = NULL; \ + e_client_get_backend_property_sync (E_CLIENT (client), prop, &val, NULL, NULL); \ + g_free (val); \ } /* precache backend properties, thus editor have them ready when needed */ diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index fcaa5098fe..b108cf7590 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -144,7 +144,7 @@ update_publish_notification (GtkMessageType msg_type, return; } - notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, icon_name); + notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, icon_name); notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT); notify_notification_set_hint ( diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index dfbbe69413..582e85d2cb 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -53,9 +53,9 @@ create_uri (UrlEditorDialog *dialog) const gchar *method = "file"; gchar *server, *file, *port, *username, *password; - server = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->server_entry))); - file = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->file_entry))); - port = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->port_entry))); + server = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->server_entry))); + file = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->file_entry))); + port = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->port_entry))); username = g_uri_escape_string (gtk_entry_get_text (GTK_ENTRY (dialog->username_entry)), "", FALSE); password = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->password_entry))); @@ -105,7 +105,7 @@ create_uri (UrlEditorDialog *dialog) } uri->fb_duration_value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (dialog->fb_duration_spin)); - uri->fb_duration_type = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->fb_duration_combo)); + uri->fb_duration_type = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->fb_duration_combo)); } static void diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index e720f71729..990c27b70a 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -151,7 +151,7 @@ add_time_to_csv (GString *line, if (time) { gboolean needquotes = FALSE; - struct tm mytm = icaltimetype_to_tm (time); + struct tm mytm = icaltimetype_to_tm (time); gchar *str = (gchar *) g_malloc (sizeof (gchar) * 200); /* Translators: the %F %T is the third argument for a diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index 49eb365d9b..f89b770e5f 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -135,7 +135,7 @@ add_time_to_rdf (xmlNodePtr node, { if (time) { xmlNodePtr cur_node = NULL; - struct tm mytm = icaltimetype_to_tm (time); + struct tm mytm = icaltimetype_to_tm (time); gchar *str = (gchar *) g_malloc (sizeof (gchar) * 200); gchar *tmp = NULL; gchar *timezone; diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index fbe20d0adc..358a683dce 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -687,7 +687,7 @@ fill_template (CamelMimeMessage *message, } } } else - message_part = CAMEL_MIME_PART (message); + message_part = CAMEL_MIME_PART (message); /* Get content of the template */ stream = camel_stream_mem_new (); @@ -1318,7 +1318,7 @@ update_actions_cb (EShellView *shell_view, length = g_list_length (list); if (!length) { - EShellWindow *shell_window = e_shell_view_get_shell_window (shell_view); + EShellWindow *shell_window = e_shell_view_get_shell_window (shell_view); build_menu (shell_window, action_group); } diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c index bb91f7379e..a0b0e59d84 100644 --- a/shell/e-shell-backend.c +++ b/shell/e-shell-backend.c @@ -62,7 +62,7 @@ struct _EShellBackendPrivate { /* This is set to delay shutdown. */ gulong notify_busy_handler_id; - guint started : 1; + guint started : 1; }; enum { diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h index 95d541058a..777957ec37 100644 --- a/shell/e-shell-window-private.h +++ b/shell/e-shell-window-private.h @@ -89,11 +89,11 @@ struct _EShellWindowPrivate { gchar *geometry; guint destroyed : 1; /* XXX Do we still need this? */ - guint safe_mode : 1; - guint sidebar_visible : 1; + guint safe_mode : 1; + guint sidebar_visible : 1; guint switcher_visible : 1; - guint taskbar_visible : 1; - guint toolbar_visible : 1; + guint taskbar_visible : 1; + guint toolbar_visible : 1; }; void e_shell_window_private_init (EShellWindow *shell_window); diff --git a/shell/e-shell.c b/shell/e-shell.c index 9f4c9ecc3f..b1a8e7e125 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -67,15 +67,15 @@ struct _EShellPrivate { gulong backend_died_handler_id; - guint auto_reconnect : 1; - guint express_mode : 1; - guint modules_loaded : 1; - guint network_available : 1; - guint network_available_set : 1; - guint network_available_locked : 1; - guint online : 1; - guint quit_cancelled : 1; - guint safe_mode : 1; + guint auto_reconnect : 1; + guint express_mode : 1; + guint modules_loaded : 1; + guint network_available : 1; + guint network_available_set : 1; + guint network_available_locked : 1; + guint online : 1; + guint quit_cancelled : 1; + guint safe_mode : 1; }; enum { diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index 3cf2cb6479..98fe181345 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -160,7 +160,7 @@ prompt_for_password (gchar *title, SECITEM_AllocItem (NULL, pwd, sizeof (gunichar2) * (len + 1)); - outptr = pwd->data; + outptr = pwd->data; while (inptr && (c = (gunichar2) (g_utf8_get_char (inptr) & 0xffff))) { inptr = g_utf8_next_char (inptr); c = GUINT16_TO_BE (c); @@ -358,7 +358,7 @@ nickname_collision (SECItem *oldNick, new_nick = PR_Malloc (sizeof (SECItem)); new_nick->type = siAsciiString; new_nick->data = (guchar *) nickname; - new_nick->len = strlen ((gchar *) new_nick->data); + new_nick->len = strlen ((gchar *) new_nick->data); return new_nick; } |