From ff25805086bbd20226e4684f028912bdb29f0ae1 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Fri, 22 May 2009 17:07:09 +0530 Subject: Filter/Search bar changes for Anjal. --- widgets/misc/Makefile.am | 5 +- widgets/misc/e-filter-bar.c | 16 +++++ widgets/misc/e-filter-bar.h | 6 ++ widgets/misc/e-search-bar.c | 153 +++++++++++++++++++++++++++++--------------- widgets/misc/e-search-bar.h | 3 + widgets/misc/e-spinner.c | 7 +- 6 files changed, 134 insertions(+), 56 deletions(-) (limited to 'widgets') diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 261a45f934..e40664be05 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -19,6 +19,7 @@ privsolib_LTLIBRARIES = \ libefilterbar.la widgetsincludedir = $(privincludedir)/misc +filterbarincludedir = $(privincludedir)/misc if ENABLE_PILOT_CONDUITS pilot_sources = e-pilot-settings.c @@ -157,9 +158,11 @@ libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ $(EVOLUTON_MAIL_LIBS) \ $(ICONV_LIBS) +filterbarinclude_HEADERS = e-filter-bar.h + libefilterbar_la_SOURCES = \ e-filter-bar.c \ - e-filter-bar.h + $(filterbarinclude_HEADERS) libefilterbar_la_LDFLAGS = $(NO_UNDEFINED) diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index aeb4fa36f3..ad688d3305 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -960,12 +960,28 @@ e_filter_bar_new (RuleContext *context, EFilterBar *bar; bar = g_object_new (e_filter_bar_get_type (), NULL); + ((ESearchBar *)bar)->lite = FALSE; e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar); return bar; } +EFilterBar * +e_filter_bar_lite_new (RuleContext *context, + const char *systemrules, + const char *userrules, + EFilterBarConfigRule config, + void *data) +{ + EFilterBar *bar; + + bar = g_object_new (e_filter_bar_get_type (), NULL); + ((ESearchBar *)bar)->lite = TRUE; + e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar); + + return bar; +} void e_filter_bar_new_construct (RuleContext *context, diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index 41e3bde4ba..6d1b082e0f 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -124,6 +124,12 @@ EFilterBar *e_filter_bar_new (RuleContext *context, const char *userrules, EFilterBarConfigRule config, void *data); +EFilterBar *e_filter_bar_lite_new (RuleContext *context, + const char *systemrules, + const char *userrules, + EFilterBarConfigRule config, + void *data); + void e_filter_bar_new_construct (RuleContext *context, const char *systemrules, diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 9cf158021c..d3d579178d 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -101,7 +101,8 @@ clear_button_state_changed (GtkWidget *clear_button, GtkStateType state, ESearch { g_return_if_fail (clear_button != NULL && search_bar != NULL); - update_clear_menuitem_sensitive (search_bar); + if (!search_bar->lite) + update_clear_menuitem_sensitive (search_bar); } static char * @@ -156,7 +157,8 @@ static void emit_query_changed (ESearchBar *esb) { g_signal_emit (esb, esb_signals [QUERY_CHANGED], 0); - update_clear_menuitem_sensitive (esb); + if (!esb->lite) + update_clear_menuitem_sensitive (esb); } static void @@ -169,8 +171,10 @@ emit_search_activated(ESearchBar *esb) g_signal_emit (esb, esb_signals [SEARCH_ACTIVATED], 0); - set_find_now_sensitive (esb, FALSE); - update_clear_menuitem_sensitive (esb); + if (!esb->lite) { + set_find_now_sensitive (esb, FALSE); + update_clear_menuitem_sensitive (esb); + } } static void @@ -368,12 +372,14 @@ entry_activated_cb (GtkWidget *widget, gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED])); gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); - gtk_widget_modify_base (esb->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); + if (!esb->lite) + gtk_widget_modify_base (esb->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); } else { gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, NULL); - gtk_widget_set_sensitive (esb->clear_button, FALSE); + if (!esb->lite) + gtk_widget_set_sensitive (esb->clear_button, FALSE); } emit_search_activated (esb); @@ -665,7 +671,7 @@ set_menu (ESearchBar *esb, esb->menu_items = g_slist_append (esb->menu_items, new_item); } - if (esb->ui_component != NULL) + if (!esb->lite && esb->ui_component != NULL) update_bonobo_menus (esb); } @@ -818,7 +824,7 @@ impl_dispose (GObject *object) /* These three we do need to unref, because we explicitly hold references to them. */ - if (esb->ui_component != NULL) { + if (!esb->lite && esb->ui_component != NULL) { bonobo_object_unref (BONOBO_OBJECT (esb->ui_component)); esb->ui_component = NULL; } @@ -989,60 +995,76 @@ e_search_bar_construct (ESearchBar *search_bar, g_signal_connect (G_OBJECT (search_bar->option_button), "button-press-event", G_CALLBACK(option_button_clicked_cb), search_bar); e_icon_entry_pack_widget (E_ICON_ENTRY (search_bar->icon_entry), search_bar->option_button, TRUE); - gtk_box_pack_start (GTK_BOX(search_bar->entry_box), search_bar->icon_entry, FALSE, FALSE, 0); + if (!search_bar->lite) + gtk_box_pack_start (GTK_BOX(search_bar->entry_box), search_bar->icon_entry, FALSE, FALSE, 0); + else + gtk_box_pack_start (GTK_BOX(search_bar->entry_box), search_bar->icon_entry, TRUE, TRUE, 0); + gtk_widget_show_all (search_bar->entry_box); gtk_widget_set_sensitive (search_bar->clear_button, FALSE); - /* Current View filter */ - search_bar->viewoption_box = gtk_hbox_new (0, FALSE); + if (!search_bar->lite) { + /* Current View filter */ + search_bar->viewoption_box = gtk_hbox_new (0, FALSE); - /* To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose - to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on... */ - label = gtk_label_new_with_mnemonic (_("Sho_w: ")); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX(search_bar->viewoption_box), label, FALSE, FALSE, 0); + /* To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose + to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on... */ + label = gtk_label_new_with_mnemonic (_("Sho_w: ")); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX(search_bar->viewoption_box), label, FALSE, FALSE, 0); - search_bar->viewoption = gtk_option_menu_new (); - gtk_label_set_mnemonic_widget ((GtkLabel *)label, search_bar->viewoption); - gtk_box_pack_start (GTK_BOX(search_bar->viewoption_box), search_bar->viewoption, FALSE, TRUE, 0); - gtk_widget_show_all (search_bar->viewoption_box); - gtk_box_pack_start (GTK_BOX(search_bar), search_bar->viewoption_box, FALSE, FALSE, 0); + search_bar->viewoption = gtk_option_menu_new (); + gtk_label_set_mnemonic_widget ((GtkLabel *)label, search_bar->viewoption); + gtk_box_pack_start (GTK_BOX(search_bar->viewoption_box), search_bar->viewoption, FALSE, TRUE, 0); + gtk_widget_show_all (search_bar->viewoption_box); + gtk_box_pack_start (GTK_BOX(search_bar), search_bar->viewoption_box, FALSE, FALSE, 0); - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX(search_bar), hbox, FALSE, FALSE, 0); + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX(search_bar), hbox, FALSE, FALSE, 0); + } /* Search entry */ hbox = gtk_hbox_new (FALSE, 0); /* To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters the term to search for */ - label = gtk_label_new_with_mnemonic (_("Sear_ch: ")); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(hbox), search_bar->entry_box, FALSE, FALSE, 0); + if (!search_bar->lite) { + label = gtk_label_new_with_mnemonic (_("Sear_ch: ")); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(hbox), search_bar->entry_box, FALSE, FALSE, 0); + gtk_label_set_mnemonic_widget ((GtkLabel *)label, search_bar->entry); + } else { + gtk_box_pack_start (GTK_BOX(hbox), search_bar->entry_box, TRUE, TRUE, 0); + } gtk_widget_show (search_bar->entry_box); - gtk_label_set_mnemonic_widget ((GtkLabel *)label, search_bar->entry); - - /* Search Scope Widgets */ - search_bar->scopeoption_box = gtk_hbox_new (0, FALSE); - gtk_box_set_spacing (GTK_BOX (search_bar->scopeoption_box), 3); - /* To Translators: The " in " label is part of the Quick Search Bar, example: - Search: | | in | Current Folder/All Accounts/Current Account */ - label = gtk_label_new_with_mnemonic (_(" i_n ")); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), label, FALSE, FALSE, 0); - - search_bar->scopeoption = gtk_option_menu_new (); -/* g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */ - gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), search_bar->scopeoption, FALSE, FALSE, 0); - gtk_widget_show_all (search_bar->scopeoption_box); - gtk_widget_hide (hbox); - gtk_label_set_mnemonic_widget ((GtkLabel *)label, search_bar->scopeoption); - - gtk_box_pack_end (GTK_BOX(hbox), search_bar->scopeoption_box, FALSE, FALSE, 0); - gtk_widget_hide (search_bar->scopeoption_box); - - gtk_box_pack_end (GTK_BOX(search_bar), hbox, FALSE, FALSE, 0); + + if (!search_bar->lite) { + /* Search Scope Widgets */ + search_bar->scopeoption_box = gtk_hbox_new (0, FALSE); + gtk_box_set_spacing (GTK_BOX (search_bar->scopeoption_box), 3); + /* To Translators: The " in " label is part of the Quick Search Bar, example: + Search: | | in | Current Folder/All Accounts/Current Account */ + label = gtk_label_new_with_mnemonic (_(" i_n ")); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), label, FALSE, FALSE, 0); + + search_bar->scopeoption = gtk_option_menu_new (); + /* g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */ + gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), search_bar->scopeoption, FALSE, FALSE, 0); + gtk_widget_show_all (search_bar->scopeoption_box); + gtk_widget_hide (hbox); + gtk_label_set_mnemonic_widget ((GtkLabel *)label, search_bar->scopeoption); + + gtk_box_pack_end (GTK_BOX(hbox), search_bar->scopeoption_box, FALSE, FALSE, 0); + gtk_widget_hide (search_bar->scopeoption_box); + + } + if (!search_bar->lite) + gtk_box_pack_end (GTK_BOX(search_bar), hbox, FALSE, FALSE, 0); + else + gtk_box_pack_end (GTK_BOX(search_bar), hbox, TRUE, TRUE, 0); + gtk_widget_show (hbox); /* Set the menu */ @@ -1056,8 +1078,8 @@ e_search_bar_construct (ESearchBar *search_bar, * so we can't emit here. Thus we launch a one-shot idle function that will * emit the changed signal, so that the proper callback will get invoked. */ - - search_bar->pending_activate = g_idle_add (idle_activate_hack, search_bar); + if (!search_bar->lite) + search_bar->pending_activate = g_idle_add (idle_activate_hack, search_bar); } void @@ -1268,12 +1290,31 @@ e_search_bar_new (ESearchBarItem *menu_items, return widget; } +GtkWidget * +e_search_bar_lite_new (ESearchBarItem *menu_items, + ESearchBarItem *option_items) +{ + GtkWidget *widget; + + g_return_val_if_fail (option_items != NULL, NULL); + + widget = g_object_new (e_search_bar_get_type (), NULL); + E_SEARCH_BAR(widget)->lite = TRUE; + + e_search_bar_construct (E_SEARCH_BAR (widget), menu_items, option_items); + + return widget; +} + void e_search_bar_set_ui_component (ESearchBar *search_bar, BonoboUIComponent *ui_component) { g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); + if (search_bar->lite) + return; + if (search_bar->ui_component != NULL) { remove_bonobo_menus (search_bar); bonobo_object_unref (BONOBO_OBJECT (search_bar->ui_component)); @@ -1293,6 +1334,9 @@ e_search_bar_set_menu_sensitive (ESearchBar *search_bar, int id, gboolean state) char *verb_name; char *path; + if (search_bar->lite) + return; + verb_name = verb_name_from_id (id); path = g_strconcat ("/commands/", verb_name, NULL); g_free (verb_name); @@ -1334,6 +1378,8 @@ e_search_bar_set_viewitem_id (ESearchBar *search_bar, int id) int row; g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); + if (!search_bar->viewoption_menu) + return; row = find_id (search_bar->viewoption_menu, id, "EsbItemId", NULL); if (row == -1) @@ -1358,6 +1404,8 @@ e_search_bar_set_item_id (ESearchBar *search_bar, int id) g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); + if (!search_bar->option_menu) + return; row = find_id (search_bar->option_menu, id, "EsbItemId", NULL); if (row == -1) return; @@ -1370,7 +1418,8 @@ e_search_bar_set_item_id (ESearchBar *search_bar, int id) if (!search_bar->block_search) emit_query_changed (search_bar); - update_clear_menuitem_sensitive (search_bar); + if (!search_bar->lite) + update_clear_menuitem_sensitive (search_bar); } void diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h index 105777311c..2d01598541 100644 --- a/widgets/misc/e-search-bar.h +++ b/widgets/misc/e-search-bar.h @@ -105,6 +105,7 @@ struct _ESearchBar int last_search_option; gboolean block_search; + gboolean lite; }; struct _ESearchBarClass @@ -133,6 +134,8 @@ void e_search_bar_construct (ESearchBar *search_bar, ESearchBarItem *option_items); GtkWidget *e_search_bar_new (ESearchBarItem *menu_items, ESearchBarItem *option_items); +GtkWidget *e_search_bar_lite_new (ESearchBarItem *menu_items, + ESearchBarItem *option_items); void e_search_bar_set_ui_component (ESearchBar *search_bar, BonoboUIComponent *ui_component); diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c index 56990d71a1..d980991b03 100644 --- a/widgets/misc/e-spinner.c +++ b/widgets/misc/e-spinner.c @@ -888,9 +888,10 @@ e_spinner_dispose (GObject *object) { ESpinner *spinner = E_SPINNER (object); - g_signal_handlers_disconnect_by_func - (spinner->details->icon_theme, - G_CALLBACK (icon_theme_changed_cb), spinner); + if (spinner->details->icon_theme) + g_signal_handlers_disconnect_by_func + (spinner->details->icon_theme, + G_CALLBACK (icon_theme_changed_cb), spinner); G_OBJECT_CLASS (parent_class)->dispose (object); } -- cgit v1.2.3 From 04a042ee01dba30ba231c48ec7d172b6be1a6fca Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 25 May 2009 23:07:23 -0400 Subject: Fix compiler warnings in widgets. --- widgets/e-timezone-dialog/e-timezone-dialog.c | 4 +- widgets/menus/gal-define-views-dialog.c | 4 +- widgets/menus/gal-view-instance.c | 4 +- widgets/menus/gal-view-menus.c | 2 +- widgets/menus/gal-view-new-dialog.c | 2 - widgets/misc/e-attachment-view.c | 6 +-- widgets/misc/e-calendar-item.h | 9 +--- widgets/misc/e-canvas-vbox.c | 2 - widgets/misc/e-canvas.c | 2 - widgets/misc/e-cell-date-edit.c | 4 +- widgets/misc/e-charset-picker.c | 15 +++--- widgets/misc/e-cursors.c | 8 ++-- widgets/misc/e-filter-bar.c | 2 +- widgets/misc/e-image-chooser.c | 2 +- widgets/misc/e-multi-config-dialog.c | 2 +- widgets/misc/e-popup-menu.h | 68 +++++++++------------------ widgets/misc/e-search-bar.h | 6 +-- widgets/misc/e-selection-model-simple.c | 4 +- widgets/misc/e-spinner.c | 6 +-- widgets/misc/e-unicode.c | 4 +- widgets/misc/e-unicode.h | 1 - widgets/misc/pixmaps/cursor_cross.xpm | 2 +- widgets/misc/pixmaps/cursor_hand_closed.xpm | 2 +- widgets/misc/pixmaps/cursor_hand_open.xpm | 2 +- widgets/misc/pixmaps/cursor_zoom_in.xpm | 2 +- widgets/misc/pixmaps/cursor_zoom_out.xpm | 2 +- widgets/misc/test-calendar.c | 2 +- widgets/misc/test-dateedit.c | 18 +++---- widgets/misc/test-dropdown-button.c | 14 +++--- widgets/table/add-col.xpm | 2 +- widgets/table/e-cell-combo.c | 2 - widgets/table/e-cell-popup.c | 2 - widgets/table/e-cell-popup.h | 4 -- widgets/table/e-cell-text.c | 6 +-- widgets/table/e-cell.c | 8 ++-- widgets/table/e-table-config.c | 5 +- widgets/table/e-table-extras.c | 6 +-- widgets/table/e-table-extras.h | 6 +-- widgets/table/e-table-field-chooser-dialog.c | 2 - widgets/table/e-table-field-chooser-item.c | 2 +- widgets/table/e-table-field-chooser.c | 2 - widgets/table/e-table-header-item.c | 28 +++++------ widgets/table/e-table-model.c | 4 +- widgets/table/e-table-model.h | 2 +- widgets/table/e-table-selection-model.c | 6 +-- widgets/table/e-table-selection-model.h | 2 +- widgets/table/e-table-specification.c | 2 +- widgets/table/remove-col.xpm | 2 +- widgets/table/tree-expanded.xpm | 2 +- widgets/table/tree-unexpanded.xpm | 2 +- widgets/text/e-text-model.c | 2 - widgets/text/e-text.c | 12 ++--- 52 files changed, 131 insertions(+), 181 deletions(-) (limited to 'widgets') diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index f0879a41ae..cff74204f1 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -81,8 +81,6 @@ extern long timezone; extern int daylight; #endif -static void e_timezone_dialog_class_init (ETimezoneDialogClass *class); -static void e_timezone_dialog_init (ETimezoneDialog *etd); static void e_timezone_dialog_dispose (GObject *object); static void e_timezone_dialog_finalize (GObject *object); @@ -406,7 +404,7 @@ static void format_utc_offset (int utc_offset, char *buffer) { - char *sign = "+"; + const gchar *sign = "+"; int hours, minutes, seconds; if (utc_offset < 0) { diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index 4e252e1622..69778e4f3d 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -32,8 +32,6 @@ #include "gal-define-views-model.h" #include "gal-view-new-dialog.h" -static void gal_define_views_dialog_init (GalDefineViewsDialog *card); -static void gal_define_views_dialog_class_init (GalDefineViewsDialogClass *klass); static void gal_define_views_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void gal_define_views_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void gal_define_views_dialog_dispose (GObject *object); @@ -221,7 +219,7 @@ gdvd_cursor_changed_callback (GtkWidget *widget, GalDefineViewsDialog *dialog) } static void -gdvd_connect_signal(GalDefineViewsDialog *dialog, char *widget_name, char *signal, GCallback handler) +gdvd_connect_signal(GalDefineViewsDialog *dialog, const char *widget_name, const char *signal, GCallback handler) { GtkWidget *widget; diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index a1eac04b6c..3b0e02c064 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -486,7 +486,7 @@ view_item_cb (GtkWidget *widget, static void add_popup_radio_item (EPopupMenu *menu_item, - gchar *title, + const gchar *title, GCallback fn, gpointer closure, gboolean value) @@ -504,7 +504,7 @@ add_popup_radio_item (EPopupMenu *menu_item, static void add_popup_menu_item (EPopupMenu *menu_item, - gchar *title, + const gchar *title, GCallback fn, gpointer closure) { diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index 7305ff0534..e663c6e4e4 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -414,7 +414,7 @@ static BonoboUIVerb verbs [] = { }; static void -set_state (GalViewMenus *gvm, char *path, CORBA_Environment *ev) +set_state (GalViewMenus *gvm, const gchar *path, CORBA_Environment *ev) { char *full_path = g_strdup_printf ("/commands/%s", path); diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index 061c04b71a..0822d83e2b 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -32,8 +32,6 @@ #include "gal-define-views-model.h" #include "gal-view-new-dialog.h" -static void gal_view_new_dialog_init (GalViewNewDialog *card); -static void gal_view_new_dialog_class_init (GalViewNewDialogClass *klass); static void gal_view_new_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void gal_view_new_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void gal_view_new_dialog_dispose (GObject *object); diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index 48292cfbc3..d2b676993d 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -39,9 +39,9 @@ enum { /* Note: Do not use the info field. */ static GtkTargetEntry target_table[] = { - { "_NETSCAPE_URL", 0, 0 }, - { "text/x-vcard", 0, 0 }, - { "text/calendar", 0, 0 } + { (gchar *) "_NETSCAPE_URL", 0, 0 }, + { (gchar *) "text/x-vcard", 0, 0 }, + { (gchar *) "text/calendar", 0, 0 } }; static const gchar *ui = diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h index b93ec9518d..0032e12a6c 100644 --- a/widgets/misc/e-calendar-item.h +++ b/widgets/misc/e-calendar-item.h @@ -287,7 +287,7 @@ void e_calendar_item_set_max_days_sel (ECalendarItem *calitem, /* Get the maximum number of days selectable */ gint e_calendar_item_get_days_start_week_sel(ECalendarItem *calitem); -/* Get the maximum number of days before whole weeks are selected */ +/* Set the maximum number of days selectable */ void e_calendar_item_set_days_start_week_sel(ECalendarItem *calitem, gint days); @@ -298,13 +298,6 @@ gboolean e_calendar_item_get_display_popup (ECalendarItem *calitem); void e_calendar_item_set_display_popup (ECalendarItem *calitem, gboolean display); -/* Set the maximum number of days before whole weeks are selected */ -gint e_calendar_item_get_days_start_week_sel(ECalendarItem *calitem); - -/* Set the maximum number of days selectable */ -void e_calendar_item_set_days_start_week_sel(ECalendarItem *calitem, - gint days); - /* Gets the range of dates actually shown. Months are 0 to 11. This also includes the last days of the previous month and the first days of the following month, which are normally shown in gray. diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c index dfdfaf64dc..377a7a2605 100644 --- a/widgets/misc/e-canvas-vbox.c +++ b/widgets/misc/e-canvas-vbox.c @@ -34,8 +34,6 @@ #include "e-canvas-utils.h" #include "e-canvas-vbox.h" -static void e_canvas_vbox_init (ECanvasVbox *CanvasVbox); -static void e_canvas_vbox_class_init (ECanvasVboxClass *klass); static void e_canvas_vbox_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void e_canvas_vbox_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void e_canvas_vbox_dispose (GObject *object); diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 903331576e..40aaf7d510 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -28,9 +28,7 @@ #include "e-canvas.h" -static void e_canvas_init (ECanvas *card); static void e_canvas_dispose (GObject *object); -static void e_canvas_class_init (ECanvasClass *klass); static void e_canvas_realize (GtkWidget *widget); static void e_canvas_unrealize (GtkWidget *widget); static gint e_canvas_key (GtkWidget *widget, diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index 97947980d9..76450b8f5f 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -95,7 +95,7 @@ static void e_cell_date_edit_on_none_clicked (GtkWidget *button, static void e_cell_date_edit_on_today_clicked (GtkWidget *button, ECellDateEdit *ecde); static void e_cell_date_edit_update_cell (ECellDateEdit *ecde, - char *text); + const gchar *text); static void e_cell_date_edit_on_time_selected (GtkTreeSelection *selection, ECellDateEdit *ecde); static void e_cell_date_edit_hide_popup (ECellDateEdit *ecde); @@ -932,7 +932,7 @@ e_cell_date_edit_on_today_clicked (GtkWidget *button, static void e_cell_date_edit_update_cell (ECellDateEdit *ecde, - char *text) + const gchar *text) { ECellPopup *ecp = E_CELL_POPUP (ecde); ECellText *ecell_text = E_CELL_TEXT (ecp->child); diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index 87652974cb..6c7233ab9f 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -71,9 +71,9 @@ static const char *classnames[] = { }; typedef struct { - char *name; + const gchar *name; ECharsetClass class; - char *subclass; + const gchar *subclass; } ECharset; /* This list is based on what other mailers/browsers support. There's @@ -146,7 +146,7 @@ add_charset (GtkWidget *menu, ECharset *charset, gboolean free_name) item = gtk_menu_item_new_with_label (label); g_object_set_data_full ((GObject *) item, "charset", - charset->name, free_name ? g_free : NULL); + (gpointer) charset->name, free_name ? g_free : NULL); g_free (label); gtk_widget_show (item); @@ -605,13 +605,14 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, g_free (label); for (i = 0; i < num_charsets; i++) { - char *command; - char *charset_name, *u; + gchar *charset_name; + gchar *command, *u; /* escape _'s in the charset name so that it doesn't become an underline in a GtkLabel */ if ((u = strchr (charsets[i].name, '_'))) { int extra = 1; - char *s, *d; + const gchar *s; + gchar *d; while ((u = strchr (u + 1, '_'))) extra++; @@ -625,7 +626,7 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, } *d = '\0'; } else { - charset_name = charsets[i].name; + charset_name = (gchar *) charsets[i].name; } if (charsets[i].subclass) { diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c index ac03e18e70..f0b9ca6843 100644 --- a/widgets/misc/e-cursors.c +++ b/widgets/misc/e-cursors.c @@ -39,8 +39,8 @@ typedef struct { GdkCursor *cursor; - int hot_x, hot_y; - char **xpm; + gint hot_x, hot_y; + const gchar **xpm; } CursorDef; static CursorDef cursors [] = { @@ -63,7 +63,7 @@ static CursorDef cursors [] = { static void -create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, gchar **xpm) +create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, const gchar **xpm) { int height, width, colors; char pixmap_buffer [(32 * 32)/8]; @@ -155,7 +155,7 @@ e_cursors_shutdown (void) GdkCursor * e_cursor_get (ECursorType type) { - g_return_val_if_fail (type >= 0 && type < E_CURSOR_NUM_CURSORS, NULL); + g_return_val_if_fail (type < E_CURSOR_NUM_CURSORS, NULL); return cursors [type].cursor; } diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index ad688d3305..2dffb39cac 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -373,7 +373,7 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA int id = 0, i; GArray *menu = g_array_new (FALSE, FALSE, sizeof (ESearchBarItem)); ESearchBarItem item = { NULL, -1, 2 }; - char *source; + const gchar *source; GSList *gtksux = NULL; int num; diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 20252f1b92..7d504685a5 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -85,7 +85,7 @@ enum DndTargetType { #define URI_LIST_TYPE "text/uri-list" static GtkTargetEntry image_drag_types[] = { - { URI_LIST_TYPE, 0, DND_TARGET_TYPE_URI_LIST }, + { (gchar *) URI_LIST_TYPE, 0, DND_TARGET_TYPE_URI_LIST }, }; static const int num_image_drag_types = sizeof (image_drag_types) / sizeof (image_drag_types[0]); diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index 0d5594cf66..6cee26e75c 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -52,7 +52,7 @@ G_DEFINE_TYPE (EMultiConfigDialog, e_multi_config_dialog, GTK_TYPE_DIALOG) /* ETable stuff. */ -static char *list_e_table_spec = +static const gchar *list_e_table_spec = "get_row_count = esms_get_row_count; } -G_DEFINE_TYPE (ESelectionModelSimple, e_selection_model_simple, e_selection_model_array_get_type()) - /** * e_selection_model_simple_new * diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c index d980991b03..6e18410018 100644 --- a/widgets/misc/e-spinner.c +++ b/widgets/misc/e-spinner.c @@ -422,7 +422,7 @@ e_spinner_cache_get_images (ESpinnerCache *cache, LOG ("Getting animation images for screen %p at size %d", screen, icon_size); - g_return_val_if_fail (icon_size >= 0 && icon_size < LAST_ICON_SIZE, NULL); + g_return_val_if_fail (icon_size < LAST_ICON_SIZE, NULL); /* Backward compat: "invalid" meant "native" size which doesn't exist anymore */ if (icon_size == GTK_ICON_SIZE_INVALID) @@ -665,8 +665,8 @@ e_spinner_expose (GtkWidget *widget, /* Otherwise |images| will be NULL anyway */ g_return_val_if_fail (images->n_animation_pixbufs > 0, FALSE); - g_return_val_if_fail (details->current_image >= 0 && - details->current_image < images->n_animation_pixbufs, FALSE); + g_return_val_if_fail ( + details->current_image < images->n_animation_pixbufs, FALSE); pixbuf = images->animation_pixbufs[details->current_image]; diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index 9d660b6600..cc50b39d95 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -665,8 +665,8 @@ e_unicode_get_utf8 (const gchar *text, gunichar *out) typedef struct { - unsigned short ch; - char *expansion; + gushort ch; + const gchar *expansion; } e_decomposition; static e_decomposition e_decomp_table[] = diff --git a/widgets/misc/e-unicode.h b/widgets/misc/e-unicode.h index b745876b6d..b0319b0f25 100644 --- a/widgets/misc/e-unicode.h +++ b/widgets/misc/e-unicode.h @@ -102,7 +102,6 @@ gint e_unichar_to_utf8 (gint c, gchar *outbuf); gchar *e_unicode_get_utf8 (const gchar *text, gunichar *out); -guint32 gdk_keyval_to_unicode (guint keysym); gchar *e_xml_get_translated_utf8_string_prop_by_name (const xmlNode *parent, const xmlChar *prop_name); diff --git a/widgets/misc/pixmaps/cursor_cross.xpm b/widgets/misc/pixmaps/cursor_cross.xpm index cf9d0aca33..6a865148fb 100644 --- a/widgets/misc/pixmaps/cursor_cross.xpm +++ b/widgets/misc/pixmaps/cursor_cross.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * cursor_cross_xpm[] = { +static const gchar *cursor_cross_xpm[] = { "32 32 3 1", " c None", ". c #000000", diff --git a/widgets/misc/pixmaps/cursor_hand_closed.xpm b/widgets/misc/pixmaps/cursor_hand_closed.xpm index 61a6de4b88..24450ed2a5 100644 --- a/widgets/misc/pixmaps/cursor_hand_closed.xpm +++ b/widgets/misc/pixmaps/cursor_hand_closed.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * cursor_hand_closed_xpm[] = { +static const gchar *cursor_hand_closed_xpm[] = { "32 32 3 1", " c None", ". c #000000", diff --git a/widgets/misc/pixmaps/cursor_hand_open.xpm b/widgets/misc/pixmaps/cursor_hand_open.xpm index 048acc8054..2491b18e3b 100644 --- a/widgets/misc/pixmaps/cursor_hand_open.xpm +++ b/widgets/misc/pixmaps/cursor_hand_open.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * cursor_hand_open_xpm[] = { +static const gchar *cursor_hand_open_xpm[] = { "32 32 3 1", " c None", ". c #000000", diff --git a/widgets/misc/pixmaps/cursor_zoom_in.xpm b/widgets/misc/pixmaps/cursor_zoom_in.xpm index 1caf9e3e2a..19e483fd65 100644 --- a/widgets/misc/pixmaps/cursor_zoom_in.xpm +++ b/widgets/misc/pixmaps/cursor_zoom_in.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * cursor_zoom_in_xpm[] = { +static const gchar *cursor_zoom_in_xpm[] = { "32 32 2 1", " c None", ". c #000000", diff --git a/widgets/misc/pixmaps/cursor_zoom_out.xpm b/widgets/misc/pixmaps/cursor_zoom_out.xpm index af1b698521..9748fa1143 100644 --- a/widgets/misc/pixmaps/cursor_zoom_out.xpm +++ b/widgets/misc/pixmaps/cursor_zoom_out.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * cursor_zoom_out_xpm[] = { +static const gchar *cursor_zoom_out_xpm[] = { "32 32 2 1", " c None", ". c #000000", diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c index 117def6190..10a463de12 100644 --- a/widgets/misc/test-calendar.c +++ b/widgets/misc/test-calendar.c @@ -38,7 +38,7 @@ enum { }; static GtkTargetEntry target_table[] = { - { "E-SHORTCUT", 0, TARGET_SHORTCUT } + { (gchar *) "E-SHORTCUT", 0, TARGET_SHORTCUT } }; static guint n_targets = sizeof(target_table) / sizeof(target_table[0]); diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c index 8c340ed45b..d359d120c4 100644 --- a/widgets/misc/test-dateedit.c +++ b/widgets/misc/test-dateedit.c @@ -82,12 +82,12 @@ main (int argc, char **argv) #if 0 g_signal_connect (dedit, "date_changed", - G_CALLBACK (on_date_changed), "1"); + G_CALLBACK (on_date_changed), (gpointer) "1"); g_signal_connect (dedit, "time_changed", - G_CALLBACK (on_time_changed), "1"); + G_CALLBACK (on_time_changed), (gpointer) "1"); #else g_signal_connect (dedit, "changed", - G_CALLBACK (on_changed), "1"); + G_CALLBACK (on_changed), (gpointer) "1"); #endif button = gtk_button_new_with_label ("Print Date"); @@ -110,12 +110,12 @@ main (int argc, char **argv) #if 0 g_signal_connect (dedit, "date_changed", - G_CALLBACK (on_date_changed), "2"); + G_CALLBACK (on_date_changed), (gpointer) "2"); g_signal_connect (dedit, "time_changed", - G_CALLBACK (on_time_changed), "2"); + G_CALLBACK (on_time_changed), (gpointer) "2"); #else g_signal_connect (dedit, "changed", - G_CALLBACK (on_changed), "2"); + G_CALLBACK (on_changed), (gpointer) "2"); #endif button = gtk_button_new_with_label ("Print Date"); @@ -138,12 +138,12 @@ main (int argc, char **argv) #if 0 g_signal_connect (dedit, "date_changed", - G_CALLBACK (on_date_changed), "3"); + G_CALLBACK (on_date_changed), (gpointer) "3"); g_signal_connect (dedit, "time_changed", - G_CALLBACK (on_time_changed), "3"); + G_CALLBACK (on_time_changed), (gpointer) "3"); #else g_signal_connect (dedit, "changed", - G_CALLBACK (on_changed), "3"); + G_CALLBACK (on_changed), (gpointer) "3"); #endif button = gtk_button_new_with_label ("Print Date"); diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c index f0a7ca4d0e..51143ff560 100644 --- a/widgets/misc/test-dropdown-button.c +++ b/widgets/misc/test-dropdown-button.c @@ -45,25 +45,25 @@ item_activated (GtkWidget *widget, } static GnomeUIInfo ui_info[] = { - { GNOME_APP_UI_ITEM, "_New", "Create a new file", item_activated, "file/new", NULL, + { GNOME_APP_UI_ITEM, "_New", "Create a new file", item_activated, (gpointer) "file/new", NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_NEW, 'n', GDK_CONTROL_MASK, NULL }, - { GNOME_APP_UI_ITEM, "_Open...", "Open an existing file", item_activated, "file/open", NULL, + { GNOME_APP_UI_ITEM, "_Open...", "Open an existing file", item_activated, (gpointer) "file/open", NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_OPEN, 'o', GDK_CONTROL_MASK, NULL }, - { GNOME_APP_UI_ITEM, "_Save", "Save the current file", item_activated, "file/save", NULL, + { GNOME_APP_UI_ITEM, "_Save", "Save the current file", item_activated, (gpointer) "file/save", NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_SAVE, 's', GDK_CONTROL_MASK, NULL }, - { GNOME_APP_UI_ITEM, "Save _as...", "Save the current file with a new name", item_activated, "file/save as", NULL, + { GNOME_APP_UI_ITEM, "Save _as...", "Save the current file with a new name", item_activated, (gpointer) "file/save as", NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_SAVE_AS, 0, 0, NULL }, GNOMEUIINFO_SEPARATOR, - { GNOME_APP_UI_ITEM, "_Print...", "Print the current file", item_activated, "file/print", NULL, + { GNOME_APP_UI_ITEM, "_Print...", "Print the current file", item_activated, (gpointer) "file/print", NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_PRINT, 'p', GDK_CONTROL_MASK, NULL }, GNOMEUIINFO_SEPARATOR, - { GNOME_APP_UI_ITEM, "_Close", "Close the current file", item_activated, "file/close", NULL, + { GNOME_APP_UI_ITEM, "_Close", "Close the current file", item_activated, (gpointer) "file/close", NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_CLOSE, 0, 0, NULL }, - { GNOME_APP_UI_ITEM, "E_xit", "Exit the program", item_activated, "file/exit", NULL, + { GNOME_APP_UI_ITEM, "E_xit", "Exit the program", item_activated, (gpointer) "file/exit", NULL, GNOME_APP_PIXMAP_STOCK, GTK_STOCK_QUIT, 'q', GDK_CONTROL_MASK, NULL }, GNOMEUIINFO_END }; diff --git a/widgets/table/add-col.xpm b/widgets/table/add-col.xpm index 9c5f314c8e..6dadad6fcc 100644 --- a/widgets/table/add-col.xpm +++ b/widgets/table/add-col.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * add_col_xpm[] = { +static const gchar *add_col_xpm[] = { "16 16 3 1", " c None", ". c #000000", diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 84d58200d2..83c17d3c2f 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -74,8 +74,6 @@ /* The height to make the popup list if there aren't any items in it. */ #define E_CELL_COMBO_LIST_EMPTY_HEIGHT 15 -static void e_cell_combo_class_init (ECellComboClass *klass); -static void e_cell_combo_init (ECellCombo *ecc); static void e_cell_combo_dispose (GObject *object); static gint e_cell_combo_do_popup (ECellPopup *ecp, diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index 92e03d79a1..c291571c73 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -46,8 +46,6 @@ #define E_CELL_POPUP_ARROW_YPAD 3 -static void e_cell_popup_class_init (ECellPopupClass *klass); -static void e_cell_popup_init (ECellPopup *ecp); static void e_cell_popup_dispose (GObject *object); diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h index 5c462b9490..12e44cb8dc 100644 --- a/widgets/table/e-cell-popup.h +++ b/widgets/table/e-cell-popup.h @@ -94,8 +94,4 @@ void e_cell_popup_set_shown (ECellPopup *ecp, gboolean shown); void e_cell_popup_queue_cell_redraw (ECellPopup *ecp); -void e_cell_popup_set_shown (ECellPopup *ecp, - gboolean shown); -void e_cell_popup_queue_cell_redraw (ECellPopup *ecp); - #endif /* _E_CELL_POPUP_H_ */ diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index e50d3d7ae7..b86d709bca 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -213,7 +213,7 @@ static void e_cell_text_preedit_changed_cb (GtkIMContext *context, ECellTextView static void e_cell_text_commit_cb (GtkIMContext *context, const gchar *str, ECellTextView *text_view); static gboolean e_cell_text_retrieve_surrounding_cb (GtkIMContext *context, ECellTextView *text_view); static gboolean e_cell_text_delete_surrounding_cb (GtkIMContext *context, gint offset, gint n_chars, ECellTextView *text_view); -static void _insert (ECellTextView *text_view, char *string, int value); +static void _insert (ECellTextView *text_view, const gchar *string, int value); static void _delete_selection (ECellTextView *text_view); static PangoAttrList* build_attr_list (ECellTextView *text_view, int row, int text_length); static void update_im_cursor_location (ECellTextView *tv); @@ -1029,7 +1029,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, _get_tep (edit); return_val = e_text_event_processor_handle_event (edit->tep, &e_tep_event); if (e_tep_event.key.string) - g_free (e_tep_event.key.string); + g_free ((gpointer) e_tep_event.key.string); break; } } @@ -2360,7 +2360,7 @@ _delete_selection (ECellTextView *text_view) /* NB! We expect value to be length IN BYTES */ static void -_insert (ECellTextView *text_view, char *string, int value) +_insert (ECellTextView *text_view, const gchar *string, int value) { CellEdit *edit = text_view->edit; char *temp; diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c index e76e073dd1..1de405feff 100644 --- a/widgets/table/e-cell.c +++ b/widgets/table/e-cell.c @@ -58,20 +58,22 @@ ec_draw (ECellView *ecell_view, GdkDrawable *drawable, int model_col, int view_col, int row, ECellFlags flags, int x1, int y1, int x2, int y2) { - g_error ("e-cell-draw invoked\n"); + g_critical ("e-cell-draw invoked"); } static gint ec_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions) { - g_error ("e-cell-event invoked\n"); + g_critical ("e-cell-event invoked"); + return 0; } static gint ec_height (ECellView *ecell_view, int model_col, int view_col, int row) { - g_error ("e-cell-height invoked\n"); + g_critical ("e-cell-height invoked"); + return 0; } diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 510b5074f6..1c40798720 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -282,7 +282,7 @@ update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) for (i = 0; i < 4; i++){ gboolean sensitive = (i <= count); - char *text = ""; + const gchar *text = ""; gtk_widget_set_sensitive (widgets [i].frames, sensitive); @@ -619,7 +619,8 @@ create_global_store (ETableConfig *config) } } -static char *spec = "" "" " " diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index 2fa6e5cecf..acbd479a43 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -194,7 +194,7 @@ e_table_extras_new (void) void e_table_extras_add_cell (ETableExtras *extras, - char *id, + const gchar *id, ECell *cell) { if (cell) @@ -211,7 +211,7 @@ e_table_extras_get_cell (ETableExtras *extras, void e_table_extras_add_compare (ETableExtras *extras, - char *id, + const gchar *id, GCompareFunc compare) { g_hash_table_insert(extras->compares, g_strdup(id), (gpointer) compare); @@ -226,7 +226,7 @@ e_table_extras_get_compare (ETableExtras *extras, void e_table_extras_add_search (ETableExtras *extras, - char *id, + const gchar *id, ETableSearchFunc search) { g_hash_table_insert(extras->searches, g_strdup(id), search); diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h index 986d9b9208..9ab8bc2395 100644 --- a/widgets/table/e-table-extras.h +++ b/widgets/table/e-table-extras.h @@ -54,19 +54,19 @@ GType e_table_extras_get_type (void); ETableExtras *e_table_extras_new (void); void e_table_extras_add_cell (ETableExtras *extras, - char *id, + const gchar *id, ECell *cell); ECell *e_table_extras_get_cell (ETableExtras *extras, char *id); void e_table_extras_add_compare (ETableExtras *extras, - char *id, + const gchar *id, GCompareFunc compare); GCompareFunc e_table_extras_get_compare (ETableExtras *extras, char *id); void e_table_extras_add_search (ETableExtras *extras, - char *id, + const gchar *id, ETableSearchFunc search); ETableSearchFunc e_table_extras_get_search (ETableExtras *extras, char *id); diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c index e92428d5f8..5b504496c7 100644 --- a/widgets/table/e-table-field-chooser-dialog.c +++ b/widgets/table/e-table-field-chooser-dialog.c @@ -30,8 +30,6 @@ #include "e-table-field-chooser-dialog.h" -static void e_table_field_chooser_dialog_init (ETableFieldChooserDialog *card); -static void e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass); static void e_table_field_chooser_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void e_table_field_chooser_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void e_table_field_chooser_dialog_dispose (GObject *object); diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index d29dcbfa5f..4b4c6b16a7 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -527,7 +527,7 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, double x, doub int button_height; GtkTargetEntry etfci_drag_types [] = { - { TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER }, + { (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER }, }; if (etfci->combined_header == NULL) diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c index 2a343e9915..60a0b40e9d 100644 --- a/widgets/table/e-table-field-chooser.c +++ b/widgets/table/e-table-field-chooser.c @@ -32,8 +32,6 @@ #include "e-table-field-chooser.h" #include "e-table-field-chooser-item.h" -static void e_table_field_chooser_init (ETableFieldChooser *card); -static void e_table_field_chooser_class_init (ETableFieldChooserClass *klass); static void e_table_field_chooser_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void e_table_field_chooser_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void e_table_field_chooser_dispose (GObject *object); diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index e6c20b1796..028fd9b93e 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -871,7 +871,7 @@ ethi_realize (GnomeCanvasItem *item) { ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item); GtkTargetEntry ethi_drop_types [] = { - { TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER }, + { (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER }, }; @@ -1131,7 +1131,7 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) GHashTable *arrows = g_hash_table_new (NULL, NULL); GtkTargetEntry ethi_drag_types [] = { - { TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER }, + { (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER }, }; ethi->drag_col = ethi_find_col_by_x (ethi, event->motion.x); @@ -1468,19 +1468,19 @@ free_popup_info (GtkWidget *w, EthiHeaderInfo *info) /* Bit 2 is disabled if not "sortable". */ /* Bit 4 is disabled if we don't have a pointer to our table object. */ static EPopupMenu ethi_context_menu [] = { - E_POPUP_ITEM (N_("Sort _Ascending"), G_CALLBACK(ethi_popup_sort_ascending), 2), - E_POPUP_ITEM (N_("Sort _Descending"), G_CALLBACK(ethi_popup_sort_descending), 2), - E_POPUP_ITEM (N_("_Unsort"), G_CALLBACK(ethi_popup_unsort), 0), + E_POPUP_ITEM (N_("Sort _Ascending"), G_CALLBACK(ethi_popup_sort_ascending), 2), + E_POPUP_ITEM (N_("Sort _Descending"), G_CALLBACK(ethi_popup_sort_descending), 2), + E_POPUP_ITEM (N_("_Unsort"), G_CALLBACK(ethi_popup_unsort), 0), E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("Group By This _Field"), G_CALLBACK(ethi_popup_group_field), 16), - E_POPUP_ITEM (N_("Group By _Box"), G_CALLBACK(ethi_popup_group_box), 128), + E_POPUP_ITEM (N_("Group By This _Field"), G_CALLBACK(ethi_popup_group_field), 16), + E_POPUP_ITEM (N_("Group By _Box"), G_CALLBACK(ethi_popup_group_box), 128), E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("Remove This _Column"), G_CALLBACK(ethi_popup_remove_column), 8), - E_POPUP_ITEM (N_("Add a C_olumn..."), G_CALLBACK(ethi_popup_field_chooser), 0), + E_POPUP_ITEM (N_("Remove This _Column"), G_CALLBACK(ethi_popup_remove_column), 8), + E_POPUP_ITEM (N_("Add a C_olumn..."), G_CALLBACK(ethi_popup_field_chooser), 0), E_POPUP_SEPARATOR, - E_POPUP_ITEM (N_("A_lignment"), G_CALLBACK(ethi_popup_alignment), 128), - E_POPUP_ITEM (N_("B_est Fit"), G_CALLBACK(ethi_popup_best_fit), 2), - E_POPUP_ITEM (N_("Format Column_s..."), G_CALLBACK(ethi_popup_format_columns), 128), + E_POPUP_ITEM (N_("A_lignment"), G_CALLBACK(ethi_popup_alignment), 128), + E_POPUP_ITEM (N_("B_est Fit"), G_CALLBACK(ethi_popup_best_fit), 2), + E_POPUP_ITEM (N_("Format Column_s..."), G_CALLBACK(ethi_popup_format_columns), 128), E_POPUP_SEPARATOR, E_POPUP_ITEM (N_("Custo_mize Current View..."), G_CALLBACK(ethi_popup_customize_view), 4), E_POPUP_TERMINATOR @@ -1935,11 +1935,11 @@ ethi_class_init (ETableHeaderItemClass *klass) dnd_colormap = gtk_widget_get_default_colormap (); remove_col_pixmap = gdk_pixmap_colormap_create_from_xpm_d ( NULL, dnd_colormap, - &remove_col_mask, NULL, remove_col_xpm); + &remove_col_mask, NULL, (gchar **) remove_col_xpm); add_col_pixmap = gdk_pixmap_colormap_create_from_xpm_d ( NULL, dnd_colormap, - &add_col_mask, NULL, add_col_xpm); + &add_col_mask, NULL, (gchar **) add_col_xpm); ethi_signals [BUTTON_PRESSED] = g_signal_new ("button_pressed", diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index 41664e4757..f88f3bf215 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -209,8 +209,8 @@ e_table_model_has_save_id (ETableModel *e_table_model) char * e_table_model_get_save_id (ETableModel *e_table_model, int row) { - g_return_val_if_fail (e_table_model != NULL, "/"); - g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), "/"); + g_return_val_if_fail (e_table_model != NULL, NULL); + g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL); if (ETM_CLASS (e_table_model)->get_save_id) return ETM_CLASS (e_table_model)->get_save_id (e_table_model, row); diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h index 337da0758e..f639d77374 100644 --- a/widgets/table/e-table-model.h +++ b/widgets/table/e-table-model.h @@ -54,7 +54,7 @@ typedef struct { gboolean (*is_cell_editable) (ETableModel *etm, int col, int row); gboolean (*has_save_id) (ETableModel *etm); - char *(*get_save_id) (ETableModel *etm, int row); + gchar *(*get_save_id) (ETableModel *etm, int row); gboolean (*has_change_pending) (ETableModel *etm); diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c index 75ae0f92c8..2fdef3f88a 100644 --- a/widgets/table/e-table-selection-model.c +++ b/widgets/table/e-table-selection-model.c @@ -45,9 +45,9 @@ static void save_to_hash(int model_row, gpointer closure) { ETableSelectionModel *etsm = closure; - gchar *key = e_table_model_get_save_id(etsm->model, model_row); + const gchar *key = e_table_model_get_save_id(etsm->model, model_row); - g_hash_table_insert(etsm->hash, key, key); + g_hash_table_insert(etsm->hash, (gpointer) key, (gpointer) key); } static void @@ -101,7 +101,7 @@ model_changed_idle(ETableSelectionModel *etsm) int i; e_selection_model_array_confirm_row_count(E_SELECTION_MODEL_ARRAY(etsm)); for (i = 0; i < row_count; i++) { - char *save_id = e_table_model_get_save_id(etm, i); + gchar *save_id = e_table_model_get_save_id(etm, i); if (g_hash_table_lookup(etsm->hash, save_id)) e_selection_model_change_one_row(E_SELECTION_MODEL(etsm), i, TRUE); diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h index c1549513db..5d7d831205 100644 --- a/widgets/table/e-table-selection-model.h +++ b/widgets/table/e-table-selection-model.h @@ -58,7 +58,7 @@ typedef struct { guint group_info_changed : 1; GHashTable *hash; - char *cursor_id; + gchar *cursor_id; } ETableSelectionModel; typedef struct { diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c index 6860d2f275..ff170dfce5 100644 --- a/widgets/table/e-table-specification.c +++ b/widgets/table/e-table-specification.c @@ -351,7 +351,7 @@ e_table_specification_save_to_node (ETableSpecification *specification, xmlDoc *doc) { xmlNode *node; - char *s; + const gchar *s; g_return_val_if_fail (doc != NULL, NULL); g_return_val_if_fail (specification != NULL, NULL); diff --git a/widgets/table/remove-col.xpm b/widgets/table/remove-col.xpm index ff1024f0c9..570d1862d1 100644 --- a/widgets/table/remove-col.xpm +++ b/widgets/table/remove-col.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * remove_col_xpm[] = { +static const gchar *remove_col_xpm[] = { "16 16 3 1", " c None", ". c #000000", diff --git a/widgets/table/tree-expanded.xpm b/widgets/table/tree-expanded.xpm index d9bda3694d..94d162d40b 100644 --- a/widgets/table/tree-expanded.xpm +++ b/widgets/table/tree-expanded.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * tree_expanded_xpm[] = { +static const gchar *tree_expanded_xpm[] = { "16 16 4 1", " c None", ". c #FFFFFF", diff --git a/widgets/table/tree-unexpanded.xpm b/widgets/table/tree-unexpanded.xpm index e1b48448ba..d20ec5aa33 100644 --- a/widgets/table/tree-unexpanded.xpm +++ b/widgets/table/tree-unexpanded.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * tree_unexpanded_xpm[] = { +static const gchar *tree_unexpanded_xpm[] = { "16 16 4 1", " c None", ". c #FFFFFF", diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index 207ac6ce50..663cdd6e30 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -48,8 +48,6 @@ struct _ETextModelPrivate { GString *text; }; -static void e_text_model_class_init (ETextModelClass *class); -static void e_text_model_init (ETextModel *model); static void e_text_model_dispose (GObject *object); static gint e_text_model_real_validate_position (ETextModel *, gint pos); diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 0890b46243..bd79c0ad7b 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -2350,7 +2350,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) if (e_tep_event.key.string) - g_free (e_tep_event.key.string); + g_free ((gpointer) e_tep_event.key.string); return ret; @@ -2603,11 +2603,11 @@ static void e_text_update_primary_selection (EText *text) { static const GtkTargetEntry targets[] = { - { "UTF8_STRING", 0, 0 }, - { "UTF-8", 0, 0 }, - { "STRING", 0, 0 }, - { "TEXT", 0, 0 }, - { "COMPOUND_TEXT", 0, 0 } + { (gchar *) "UTF8_STRING", 0, 0 }, + { (gchar *) "UTF-8", 0, 0 }, + { (gchar *) "STRING", 0, 0 }, + { (gchar *) "TEXT", 0, 0 }, + { (gchar *) "COMPOUND_TEXT", 0, 0 } }; GtkClipboard *clipboard; -- cgit v1.2.3 From 1868c9e675073dfa824dc12e1c2fa3cc1929f70b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 25 May 2009 23:29:43 -0400 Subject: Fix compiler warnings in smime. --- mail/em-migrate.c | 1 + smime/lib/e-cert-db.c | 4 ++-- widgets/table/e-tree-table-adapter.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'widgets') diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 1c58b6ca99..315ed208f0 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -56,6 +56,7 @@ #include #include +#include #include #include diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index 73bfc72131..ae8a79ae23 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -259,7 +259,7 @@ install_loadable_roots (void) XXX yes this is gross. *sigh* */ - char *paths_to_check[] = { + const gchar *paths_to_check[] = { #ifdef MOZILLA_NSS_LIB_DIR MOZILLA_NSS_LIB_DIR, #endif @@ -872,7 +872,7 @@ default_nickname (CERTCertificate *cert) char *nickname = NULL; char *tmp = NULL; int count; - char *nickFmt=NULL; + const char *nickFmt=NULL; CERTCertificate *dummycert; PK11SlotInfo *slot=NULL; CK_OBJECT_HANDLE keyHandle; diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 416f8aa026..8e583ec8a8 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" -- cgit v1.2.3 From e4c6ad873bd50f7ad99fb8e9bbf5dd6c78ac76ed Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 08:24:35 -0400 Subject: Fix compiler warnings in calendar. --- art/jump.xpm | 4 +- calendar/gui/alarm-notify/alarm-queue.c | 5 +-- calendar/gui/cal-search-bar.c | 14 +++--- calendar/gui/calendar-commands.c | 2 +- calendar/gui/calendar-component.c | 63 +++++++++++++------------- calendar/gui/dialogs/cal-prefs-dialog.c | 22 +++++----- calendar/gui/dialogs/calendar-setup.c | 42 +++++++++--------- calendar/gui/dialogs/comp-editor-util.c | 8 +++- calendar/gui/dialogs/e-send-options-utils.c | 2 +- calendar/gui/dialogs/e-send-options-utils.h | 2 +- calendar/gui/dialogs/event-page.c | 16 +++---- calendar/gui/dialogs/task-page.c | 4 +- calendar/gui/e-cal-model-calendar.c | 6 +-- calendar/gui/e-cal-model-memos.c | 4 +- calendar/gui/e-cal-model-tasks.c | 34 +++++++-------- calendar/gui/e-cal-model.c | 18 ++++---- calendar/gui/e-calendar-table.c | 46 ++++++++++--------- calendar/gui/e-calendar-view.c | 68 ++++++++++++++--------------- calendar/gui/e-day-view-main-item.c | 7 ++- calendar/gui/e-day-view-time-item.c | 3 +- calendar/gui/e-day-view-top-item.c | 4 +- calendar/gui/e-day-view.c | 12 ++--- calendar/gui/e-day-view.h | 2 +- calendar/gui/e-itip-control.c | 2 +- calendar/gui/e-meeting-attendee.c | 1 - calendar/gui/e-meeting-list-view.c | 11 ++--- calendar/gui/e-meeting-store.c | 2 +- calendar/gui/e-memo-table.c | 32 +++++++------- calendar/gui/e-memos.c | 4 +- calendar/gui/e-tasks.c | 4 +- calendar/gui/e-week-view-event-item.c | 3 +- calendar/gui/e-week-view.c | 2 +- calendar/gui/e-week-view.h | 2 +- calendar/gui/gnome-cal.c | 6 +-- calendar/gui/gnome-cal.h | 4 -- calendar/gui/itip-utils.c | 6 +-- calendar/gui/main.c | 3 +- calendar/gui/memos-component.c | 46 +++++++++---------- calendar/gui/print.c | 27 +++++++----- calendar/gui/tasks-component.c | 46 +++++++++---------- calendar/gui/tasks-control.c | 2 +- calendar/gui/weekday-picker.c | 2 - calendar/importers/icalendar-importer.c | 10 +++-- e-util/e-folder-map.c | 2 +- e-util/e-folder-map.h | 3 +- e-util/e-logger.c | 2 +- e-util/e-logger.h | 2 +- widgets/misc/e-filter-bar.h | 12 ++--- widgets/table/e-table-extras.c | 8 ++-- widgets/table/e-table-extras.h | 8 ++-- 50 files changed, 324 insertions(+), 316 deletions(-) (limited to 'widgets') diff --git a/art/jump.xpm b/art/jump.xpm index 7c289e738f..1254a53a1b 100644 --- a/art/jump.xpm +++ b/art/jump.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * jump_xpm[] = { +static const gchar *jump_xpm[] = { "16 8 3 1", " c None", ". c #000000", @@ -13,7 +13,7 @@ static char * jump_xpm[] = { ".++++++++++++++.", "................"}; -static char * jump_xpm_focused[] = { +static const gchar *jump_xpm_focused[] = { "16 8 3 1", " c None", ". c #0000FF", diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index e7be5554b8..887cf7f249 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -150,7 +150,6 @@ static void popup_notification (time_t trigger, CompQueuedAlarms *cqa, static void query_objects_changed_cb (ECal *client, GList *objects, gpointer data); static void query_objects_removed_cb (ECal *client, GList *objects, gpointer data); -static void remove_client_alarms (ClientAlarms *ca); static void update_cqa (CompQueuedAlarms *cqa, ECalComponent *comp); static void update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa); static void tray_list_remove_cqa (CompQueuedAlarms *cqa); @@ -921,8 +920,8 @@ edit_component (ECal *client, ECalComponent *comp) /* Get the factory */ CORBA_exception_init (&ev); - factory = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:" BASE_VERSION, - 0, NULL, &ev); + factory = bonobo_activation_activate_from_id ( + (Bonobo_ActivationID) "OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:" BASE_VERSION, 0, NULL, &ev); if (BONOBO_EX (&ev)) { e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL); diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index 9ea91f8350..aab5d98d30 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -72,12 +72,12 @@ enum { /* Comments are disabled because they are kind of useless right now, see bug 33247 */ static ESearchBarItem search_option_items[] = { - { N_("Summary contains"), SEARCH_SUMMARY_CONTAINS, ESB_ITEMTYPE_RADIO }, - { N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS, ESB_ITEMTYPE_RADIO }, - { N_("Category is"), SEARCH_CATEGORY_IS, ESB_ITEMTYPE_RADIO }, - { N_("Comment contains"), SEARCH_COMMENT_CONTAINS, ESB_ITEMTYPE_RADIO }, - { N_("Location contains"), SEARCH_LOCATION_CONTAINS, ESB_ITEMTYPE_RADIO }, - { N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS, ESB_ITEMTYPE_RADIO }, + { (gchar *) N_("Summary contains"), SEARCH_SUMMARY_CONTAINS, ESB_ITEMTYPE_RADIO }, + { (gchar *) N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS, ESB_ITEMTYPE_RADIO }, + { (gchar *) N_("Category is"), SEARCH_CATEGORY_IS, ESB_ITEMTYPE_RADIO }, + { (gchar *) N_("Comment contains"), SEARCH_COMMENT_CONTAINS, ESB_ITEMTYPE_RADIO }, + { (gchar *) N_("Location contains"), SEARCH_LOCATION_CONTAINS, ESB_ITEMTYPE_RADIO }, + { (gchar *) N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS, ESB_ITEMTYPE_RADIO }, }; /* IDs for the categories suboptions */ @@ -408,7 +408,7 @@ static void notify_e_cal_view_contains (CalSearchBar *cal_search, const char *field, const char *view) { char *text = NULL; - char *sexp = " "; + char *sexp; text = e_search_bar_get_text (E_SEARCH_BAR (cal_search)); diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index c0c60dbbf9..94a35f3e65 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -345,7 +345,7 @@ purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path) } struct _sensitize_item { - char *command; + const gchar *command; guint32 enable; }; diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 078c854b98..53abc5632a 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -78,8 +78,8 @@ enum DndTargetType { #define CALENDAR_TYPE "text/calendar" #define XCALENDAR_TYPE "text/x-calendar" static GtkTargetEntry drag_types[] = { - { CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }, - { XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST } + { (gchar *) CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }, + { (gchar *) XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST } }; static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]); #define CALENDAR_COMPONENT_DEFAULT(cc) if (cc == NULL) cc = calendar_component_peek() @@ -460,8 +460,9 @@ update_task_memo_selection (CalendarComponentView *component_view, ECalSourceTyp ESource *source; source = e_source_list_peek_source_by_uid (source_list, uid); - if (source && !gnome_calendar_add_source (component_view->calendar, type, source)) + if (source && !gnome_calendar_add_source (component_view->calendar, type, source)) { /* FIXME do something */; + } } if (type == E_CAL_SOURCE_TYPE_TODO) @@ -623,17 +624,17 @@ mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) } static EPopupItem ecc_source_popups[] = { - { E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "x-office-calendar", 0, 0 }, - { E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_calendar_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, "18.rename", N_("_Rename..."), rename_calendar_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Calendar"), new_calendar_cb, NULL, (gchar *) "x-office-calendar", 0, 0 }, + { E_POPUP_ITEM, (gchar *) "15.copy", (gchar *) N_("_Copy..."), copy_calendar_cb, NULL, (gchar *) "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_calendar_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_BAR, "20.bar" }, - { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "edit-delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, - { E_POPUP_ITEM, "30.mark_calendar_offline", N_("_Make available for offline use"), mark_offline_cb, NULL, "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE }, - { E_POPUP_ITEM, "40.mark_calendar_no_offline", N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE }, + { E_POPUP_BAR, (gchar *) "20.bar" }, + { E_POPUP_ITEM, (gchar *) "20.delete", (gchar *) N_("_Delete"), delete_calendar_cb, NULL, (gchar *) "edit-delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, + { E_POPUP_ITEM, (gchar *) "30.mark_calendar_offline", (gchar *) N_("_Make available for offline use"), mark_offline_cb, NULL, (gchar *) "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE }, + { E_POPUP_ITEM, (gchar *) "40.mark_calendar_no_offline", (gchar *) N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, (gchar *) "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE }, - { E_POPUP_BAR, "99.bar" }, - { E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_calendar_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_BAR, (gchar *) "99.bar" }, + { E_POPUP_ITEM, (gchar *) "99.properties", (gchar *) N_("_Properties"), edit_calendar_cb, NULL, (gchar *) "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, }; static void @@ -1433,36 +1434,36 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_sequence_set_release (list, FALSE); - list->_buffer[0].id = CREATE_EVENT_ID; - list->_buffer[0].description = _("New appointment"); + list->_buffer[0].id = (char *) CREATE_EVENT_ID; + list->_buffer[0].description = (char *) _("New appointment"); list->_buffer[0].menuDescription = (char *) C_("New", "_Appointment"); - list->_buffer[0].tooltip = _("Create a new appointment"); + list->_buffer[0].tooltip = (char *) _("Create a new appointment"); list->_buffer[0].menuShortcut = 'a'; - list->_buffer[0].iconName = "appointment-new"; + list->_buffer[0].iconName = (char *) "appointment-new"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[1].id = CREATE_MEETING_ID; - list->_buffer[1].description = _("New meeting"); + list->_buffer[1].id = (char *) CREATE_MEETING_ID; + list->_buffer[1].description = (char *) _("New meeting"); list->_buffer[1].menuDescription = (char *) C_("New", "M_eeting"); - list->_buffer[1].tooltip = _("Create a new meeting request"); + list->_buffer[1].tooltip = (char *) _("Create a new meeting request"); list->_buffer[1].menuShortcut = 'e'; - list->_buffer[1].iconName = "stock_new-meeting"; + list->_buffer[1].iconName = (char *) "stock_new-meeting"; list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[2].id = CREATE_ALLDAY_EVENT_ID; - list->_buffer[2].description = _("New all day appointment"); + list->_buffer[2].id = (char *) CREATE_ALLDAY_EVENT_ID; + list->_buffer[2].description = (char *) _("New all day appointment"); list->_buffer[2].menuDescription = (char *) C_("New", "All Day A_ppointment"); - list->_buffer[2].tooltip = _("Create a new all-day appointment"); + list->_buffer[2].tooltip = (char *) _("Create a new all-day appointment"); list->_buffer[2].menuShortcut = '\0'; - list->_buffer[2].iconName = "stock_new-24h-appointment"; + list->_buffer[2].iconName = (char *) "stock_new-24h-appointment"; list->_buffer[2].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[3].id = CREATE_CALENDAR_ID; - list->_buffer[3].description = _("New calendar"); + list->_buffer[3].id = (char *) CREATE_CALENDAR_ID; + list->_buffer[3].description = (char *) _("New calendar"); list->_buffer[3].menuDescription = (char *) C_("New", "Cale_ndar"); - list->_buffer[3].tooltip = _("Create a new calendar"); + list->_buffer[3].tooltip = (char *) _("Create a new calendar"); list->_buffer[3].menuShortcut = '\0'; - list->_buffer[3].iconName = "x-office-calendar"; + list->_buffer[3].iconName = (char *) "x-office-calendar"; list->_buffer[3].type = GNOME_Evolution_CREATABLE_FOLDER; return list; @@ -1609,10 +1610,8 @@ calendar_component_init (CalendarComponent *component) component->priv = priv; ensure_sources (component); - if (!e_cal_get_sources (&priv->task_source_list, E_CAL_SOURCE_TYPE_TODO, NULL)) - ; - if (!e_cal_get_sources (&priv->memo_source_list, E_CAL_SOURCE_TYPE_JOURNAL, NULL)) - ; + e_cal_get_sources (&priv->task_source_list, E_CAL_SOURCE_TYPE_TODO, NULL); + e_cal_get_sources (&priv->memo_source_list, E_CAL_SOURCE_TYPE_JOURNAL, NULL); } diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 0e1f0f05d1..b2763ca479 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -739,17 +739,17 @@ show_config (CalendarPrefsDialog *prefs) /* plugin meta-data */ static ECalConfigItem eccp_items[] = { - { E_CONFIG_BOOK, "", "toplevel-notebook", eccp_widget_glade }, - { E_CONFIG_PAGE, "00.general", "general", eccp_widget_glade }, - { E_CONFIG_SECTION_TABLE, "00.general/00.time", "time", eccp_widget_glade }, - { E_CONFIG_SECTION_TABLE, "00.general/10.workWeek", "workWeek", eccp_widget_glade }, - { E_CONFIG_SECTION, "00.general/20.alerts", "alerts", eccp_widget_glade }, - { E_CONFIG_PAGE, "10.display", "display", eccp_widget_glade }, - { E_CONFIG_SECTION, "10.display/00.general", "displayGeneral", eccp_widget_glade }, - { E_CONFIG_SECTION, "10.display/10.taskList", "taskList", eccp_widget_glade }, - { E_CONFIG_PAGE, "15.alarms", "alarms", eccp_widget_glade }, - { E_CONFIG_PAGE, "20.freeBusy", "freebusy", eccp_widget_glade }, - { E_CONFIG_SECTION, "20.freeBusy/00.defaultServer", "defaultFBServer", eccp_widget_glade }, + { E_CONFIG_BOOK, (gchar *) "", (gchar *) "toplevel-notebook", eccp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "general", eccp_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.time", (gchar *) "time", eccp_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/10.workWeek", (gchar *) "workWeek", eccp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/20.alerts", (gchar *) "alerts", eccp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "10.display", (gchar *) "display", eccp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.display/00.general", (gchar *) "displayGeneral", eccp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.display/10.taskList", (gchar *) "taskList", eccp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "15.alarms", (gchar *) "alarms", eccp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "20.freeBusy", (gchar *) "freebusy", eccp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "20.freeBusy/00.defaultServer", (gchar *) "defaultFBServer", eccp_widget_glade }, }; static void diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index b182f9cc78..3ee589406b 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -363,35 +363,35 @@ eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent } static ECalConfigItem eccp_items[] = { - { E_CONFIG_BOOK, "", NULL }, - { E_CONFIG_PAGE, "00.general", N_("General") }, - { E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Calendar") }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/00.type", NULL, eccp_get_source_type }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/10.name", NULL, eccp_get_source_name }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/20.color", NULL, eccp_get_source_color }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/30.offline", NULL, eccp_general_offline }, + { E_CONFIG_BOOK, (gchar *) "", NULL }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.source", (gchar *) N_("Calendar") }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/00.type", NULL, eccp_get_source_type }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/10.name", NULL, eccp_get_source_name }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/20.color", NULL, eccp_get_source_color }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/30.offline", NULL, eccp_general_offline }, { 0 }, }; static ECalConfigItem ectp_items[] = { - { E_CONFIG_BOOK, "", NULL }, - { E_CONFIG_PAGE, "00.general", N_("General") }, - { E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Task List") }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/00.type", NULL, eccp_get_source_type }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/10.name", NULL, eccp_get_source_name }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/20.color", NULL, eccp_get_source_color }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/30.offline", NULL, eccp_general_offline }, + { E_CONFIG_BOOK, (gchar *) "", NULL }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.source", (gchar *) N_("Task List") }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/00.type", NULL, eccp_get_source_type }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/10.name", NULL, eccp_get_source_name }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/20.color", NULL, eccp_get_source_color }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/30.offline", NULL, eccp_general_offline }, { 0 }, }; static ECalConfigItem ecmp_items[] = { - { E_CONFIG_BOOK, "", NULL }, - { E_CONFIG_PAGE, "00.general", N_("General") }, - { E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Memo List") }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/00.type", NULL, eccp_get_source_type }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/10.name", NULL, eccp_get_source_name }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/20.color", NULL, eccp_get_source_color }, - { E_CONFIG_ITEM_TABLE, "00.general/00.source/30.offline", NULL, eccp_general_offline }, + { E_CONFIG_BOOK, (gchar *) "", NULL }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.source", (gchar *) N_("Memo List") }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/00.type", NULL, eccp_get_source_type }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/10.name", NULL, eccp_get_source_name }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/20.color", NULL, eccp_get_source_color }, + { E_CONFIG_ITEM_TABLE, (gchar *) "00.general/00.source/30.offline", NULL, eccp_general_offline }, { 0 }, }; diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 6547731776..f09024eba0 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -112,8 +112,12 @@ comp_editor_free_dates (CompEditorPageDates *dates) /* dtstart is only passed in if tt is the dtend. */ static void -write_label_piece (struct icaltimetype *tt, char *buffer, int size, - char *stext, char *etext, struct icaltimetype *dtstart) +write_label_piece (struct icaltimetype *tt, + gchar *buffer, + gint size, + gchar *stext, + const gchar *etext, + struct icaltimetype *dtstart) { struct tm tmp_tm = { 0 }; struct icaltimetype tt_copy = *tt; diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c index 52f73aed02..d9a55ac47a 100644 --- a/calendar/gui/dialogs/e-send-options-utils.c +++ b/calendar/gui/dialogs/e-send-options-utils.c @@ -28,7 +28,7 @@ #include void -e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char * type) +e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type) { ESendOptionsGeneral *gopts = NULL; ESendOptionsStatusTracking *sopts; diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h index cae3131c00..568ef5be3b 100644 --- a/calendar/gui/dialogs/e-send-options-utils.h +++ b/calendar/gui/dialogs/e-send-options-utils.h @@ -29,6 +29,6 @@ #include #include -void e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char* type); +void e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type); void e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp); #endif diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index cd54c65c08..b225cdd6bd 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -1584,20 +1584,20 @@ void update_end_time_combo (EventPage *epage) gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->minute_selector), minutes); } -void -static hour_sel_changed (GtkSpinButton *widget, EventPage *epage) +static void +hour_sel_changed (GtkSpinButton *widget, EventPage *epage) { hour_minute_changed (epage); } -void -static minute_sel_changed (GtkSpinButton *widget, EventPage *epage) +static void +minute_sel_changed (GtkSpinButton *widget, EventPage *epage) { hour_minute_changed (epage); } -void -static hour_minute_changed ( EventPage *epage) +static void +hour_minute_changed (EventPage *epage) { EventPagePrivate *priv; gint for_hours, for_minutes; @@ -1889,8 +1889,8 @@ enum { }; static EPopupItem context_menu_items[] = { - { E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE }, - { E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD, ATTENDEE_CAN_ADD }, + { E_POPUP_ITEM, (gchar *) "10.delete", (gchar *) N_("_Remove"), popup_delete_cb, NULL, (gchar *) GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE }, + { E_POPUP_ITEM, (gchar *) "15.add", (gchar *) N_("_Add "), popup_add_cb, NULL, (gchar *) GTK_STOCK_ADD, ATTENDEE_CAN_ADD }, }; static void diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index fc0c2330bf..f371e60cdb 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -1199,8 +1199,8 @@ enum { }; static EPopupItem context_menu_items[] = { - { E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE }, - { E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD, ATTENDEE_CAN_ADD }, + { E_POPUP_ITEM, (gchar *) "10.delete", (gchar *) N_("_Remove"), popup_delete_cb, NULL, (gchar *) GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE }, + { E_POPUP_ITEM, (gchar *) "15.add", (gchar *) N_("_Add "), popup_add_cb, NULL, (gchar *) GTK_STOCK_ADD, ATTENDEE_CAN_ADD }, }; static void diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c index 7f5d7b55c6..db25bf23de 100644 --- a/calendar/gui/e-cal-model-calendar.c +++ b/calendar/gui/e-cal-model-calendar.c @@ -169,7 +169,7 @@ get_location (ECalModelComponent *comp_data) if (prop) return (void *) icalproperty_get_location (prop); - return ""; + return (void *) ""; } static void * @@ -209,7 +209,7 @@ ecmc_value_at (ETableModel *etm, int col, int row) comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row); if (!comp_data) - return ""; + return (void *) ""; switch (col) { case E_CAL_MODEL_CALENDAR_FIELD_DTEND : @@ -220,7 +220,7 @@ ecmc_value_at (ETableModel *etm, int col, int row) return get_transparency (comp_data); } - return ""; + return (void *) ""; } static void diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c index ffb1c8a488..0984827702 100644 --- a/calendar/gui/e-cal-model-memos.c +++ b/calendar/gui/e-cal-model-memos.c @@ -130,9 +130,9 @@ ecmm_value_at (ETableModel *etm, int col, int row) comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row); if (!comp_data) - return ""; + return (void *) ""; - return ""; + return (void *) ""; } diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 095cfabc4b..5827117f14 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -289,7 +289,7 @@ get_due (ECalModelComponent *comp_data) return comp_data->due; } -static char * +static void * get_geo (ECalModelComponent *comp_data) { icalproperty *prop; @@ -307,7 +307,7 @@ get_geo (ECalModelComponent *comp_data) return buf; } - return ""; + return (void *) ""; } static int @@ -322,7 +322,7 @@ get_percent (ECalModelComponent *comp_data) return 0; } -static char * +static void * get_priority (ECalModelComponent *comp_data) { icalproperty *prop; @@ -331,7 +331,7 @@ get_priority (ECalModelComponent *comp_data) if (prop) return e_cal_util_priority_to_string (icalproperty_get_priority (prop)); - return ""; + return (void *) ""; } static gboolean @@ -344,7 +344,7 @@ is_status_canceled (ECalModelComponent *comp_data) return prop && icalproperty_get_status (prop) == ICAL_STATUS_CANCELLED; } -static char * +static void * get_status (ECalModelComponent *comp_data) { icalproperty *prop; @@ -353,33 +353,33 @@ get_status (ECalModelComponent *comp_data) if (prop) { switch (icalproperty_get_status (prop)) { case ICAL_STATUS_NONE: - return ""; + return (void *) ""; case ICAL_STATUS_NEEDSACTION: - return _("Not Started"); + return (void *) _("Not Started"); case ICAL_STATUS_INPROCESS: - return _("In Progress"); + return (void *) _("In Progress"); case ICAL_STATUS_COMPLETED: - return _("Completed"); + return (void *) _("Completed"); case ICAL_STATUS_CANCELLED: - return _("Canceled"); + return (void *) _("Canceled"); default: - return ""; + return (void *) ""; } } - return ""; + return (void *) ""; } -static char * +static void * get_url (ECalModelComponent *comp_data) { icalproperty *prop; prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY); if (prop) - return (char *) icalproperty_get_url (prop); + return (void *) icalproperty_get_url (prop); - return ""; + return (void *) ""; } static gboolean @@ -499,7 +499,7 @@ ecmt_value_at (ETableModel *etm, int col, int row) comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row); if (!comp_data) - return ""; + return (void *) ""; switch (col) { case E_CAL_MODEL_TASKS_FIELD_COMPLETED : @@ -524,7 +524,7 @@ ecmt_value_at (ETableModel *etm, int col, int row) return get_url (comp_data); } - return ""; + return (void *) ""; } static void diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 20306b7128..736f6a8b56 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -317,16 +317,16 @@ ecm_row_count (ETableModel *etm) return priv->objects->len; } -static char * +static void * get_categories (ECalModelComponent *comp_data) { icalproperty *prop; prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_CATEGORIES_PROPERTY); if (prop) - return (char *) icalproperty_get_categories (prop); + return (void *) icalproperty_get_categories (prop); - return ""; + return (void *) ""; } static char * @@ -363,7 +363,7 @@ get_color (ECalModel *model, ECalModelComponent *comp_data) return e_cal_model_get_color_for_component (model, comp_data); } -static char * +static void * get_description (ECalModelComponent *comp_data) { icalproperty *prop; @@ -384,7 +384,7 @@ get_description (ECalModelComponent *comp_data) return str->str; } - return ""; + return (void *) ""; } static ECellDateEditValue* @@ -472,16 +472,16 @@ get_datetime_from_utc (ECalModel *model, ECalModelComponent *comp_data, icalprop return res; } -static char * +static void * get_summary (ECalModelComponent *comp_data) { icalproperty *prop; prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_SUMMARY_PROPERTY); if (prop) - return (char *) icalproperty_get_summary (prop); + return (void *) icalproperty_get_summary (prop); - return ""; + return (void *) ""; } static char * @@ -579,7 +579,7 @@ ecm_value_at (ETableModel *etm, int col, int row) return get_uid (comp_data); } - return ""; + return (void *) ""; } static void diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index e51918f06c..5eba596680 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -70,16 +70,14 @@ enum TargetType{ }; static GtkTargetEntry target_types[] = { - { "text/x-calendar", 0, TARGET_TYPE_VCALENDAR }, - { "text/calendar", 0, TARGET_TYPE_VCALENDAR } + { (gchar *) "text/x-calendar", 0, TARGET_TYPE_VCALENDAR }, + { (gchar *) "text/calendar", 0, TARGET_TYPE_VCALENDAR } }; static guint n_target_types = G_N_ELEMENTS (target_types); extern ECompEditorRegistry *comp_editor_registry; -static void e_calendar_table_class_init (ECalendarTableClass *class); -static void e_calendar_table_init (ECalendarTable *cal_table); static void e_calendar_table_destroy (GtkObject *object); static void e_calendar_table_on_double_click (ETable *table, @@ -1588,33 +1586,33 @@ delete_cb (EPopup *ep, EPopupItem *pitem, void *data) } static EPopupItem tasks_popup_items [] = { - { E_POPUP_ITEM, "00.newtask", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0}, - { E_POPUP_BAR, "01.bar" }, + { E_POPUP_ITEM, (gchar *) "00.newtask", (gchar *) N_("New _Task"), on_new_task, NULL, (gchar *) "stock_task", 0, 0}, + { E_POPUP_BAR, (gchar *) "01.bar" }, - { E_POPUP_ITEM, "03.open", N_("_Open"), e_calendar_table_on_open_task, NULL, GTK_STOCK_OPEN, E_CAL_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "05.openweb", N_("Open _Web Page"), open_url_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_HASURL }, - { E_POPUP_ITEM, "10.saveas", N_("_Save As..."), e_calendar_table_on_save_as, NULL, GTK_STOCK_SAVE_AS, E_CAL_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "20.print", N_("P_rint..."), e_calendar_table_on_print_task, NULL, GTK_STOCK_PRINT, E_CAL_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "03.open", (gchar *) N_("_Open"), e_calendar_table_on_open_task, NULL, (gchar *) GTK_STOCK_OPEN, E_CAL_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "05.openweb", (gchar *) N_("Open _Web Page"), open_url_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_HASURL }, + { E_POPUP_ITEM, (gchar *) "10.saveas", (gchar *) N_("_Save As..."), e_calendar_table_on_save_as, NULL, (gchar *) GTK_STOCK_SAVE_AS, E_CAL_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "20.print", (gchar *) N_("P_rint..."), e_calendar_table_on_print_task, NULL, (gchar *) GTK_STOCK_PRINT, E_CAL_POPUP_SELECT_ONE }, - { E_POPUP_BAR, "30.bar" }, + { E_POPUP_BAR, (gchar *) "30.bar" }, - { E_POPUP_ITEM, "40.cut", N_("C_ut"), e_calendar_table_on_cut, NULL, GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "50.copy", N_("_Copy"), e_calendar_table_on_copy, NULL, GTK_STOCK_COPY, 0, 0 }, - { E_POPUP_ITEM, "60.paste", N_("_Paste"), e_calendar_table_on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "40.cut", (gchar *) N_("C_ut"), e_calendar_table_on_cut, NULL, (gchar *) GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "50.copy", (gchar *) N_("_Copy"), e_calendar_table_on_copy, NULL, (gchar *) GTK_STOCK_COPY, 0, 0 }, + { E_POPUP_ITEM, (gchar *) "60.paste", (gchar *) N_("_Paste"), e_calendar_table_on_paste, NULL, (gchar *) GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_BAR, "70.bar" }, + { E_POPUP_BAR, (gchar *) "70.bar" }, - { E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE }, - { E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE}, - { E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE }, - { E_POPUP_ITEM, "c0.markoneincomplete", N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE}, - { E_POPUP_ITEM, "d0.markmanyincomplete", N_("_Mark Selected Tasks as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_COMPLETE }, + { E_POPUP_ITEM, (gchar *) "80.assign", (gchar *) N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE }, + { E_POPUP_ITEM, (gchar *) "90.forward", (gchar *) N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, (gchar *) "mail-forward", E_CAL_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "a0.markonecomplete", (gchar *) N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE}, + { E_POPUP_ITEM, (gchar *) "b0.markmanycomplete", (gchar *) N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE }, + { E_POPUP_ITEM, (gchar *) "c0.markoneincomplete", (gchar *) N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE}, + { E_POPUP_ITEM, (gchar *) "d0.markmanyincomplete", (gchar *) N_("_Mark Selected Tasks as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_COMPLETE }, - { E_POPUP_BAR, "e0.bar" }, + { E_POPUP_BAR, (gchar *) "e0.bar" }, - { E_POPUP_ITEM, "f0.delete", N_("_Delete"), delete_cb, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "g0.deletemany", N_("_Delete Selected Tasks"), delete_cb, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "f0.delete", (gchar *) N_("_Delete"), delete_cb, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "g0.deletemany", (gchar *) N_("_Delete Selected Tasks"), delete_cb, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE }, }; static void diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 4ceb8910c3..f88ae08244 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -109,8 +109,8 @@ enum TargetType{ }; static GtkTargetEntry target_types[] = { - { "text/x-calendar", 0, TARGET_TYPE_VCALENDAR }, - { "text/calendar", 0, TARGET_TYPE_VCALENDAR } + { (gchar *) "text/x-calendar", 0, TARGET_TYPE_VCALENDAR }, + { (gchar *) "text/calendar", 0, TARGET_TYPE_VCALENDAR } }; static guint n_target_types = G_N_ELEMENTS (target_types); @@ -1788,52 +1788,52 @@ on_paste (EPopup *ep, EPopupItem *pitem, void *data) } static EPopupItem ecv_main_items [] = { - { E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "appointment-new", 0, 0 }, - { E_POPUP_ITEM, "10.newallday", N_("New All Day _Event"), on_new_event, NULL, "stock_new-24h-appointment", 0, 0}, - { E_POPUP_ITEM, "20.meeting", N_("New _Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0}, - { E_POPUP_ITEM, "30.task", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0}, + { E_POPUP_ITEM, (gchar *) "00.new", (gchar *) N_("New _Appointment..."), on_new_appointment, NULL, (gchar *) "appointment-new", 0, 0 }, + { E_POPUP_ITEM, (gchar *) "10.newallday", (gchar *) N_("New All Day _Event"), on_new_event, NULL, (gchar *) "stock_new-24h-appointment", 0, 0}, + { E_POPUP_ITEM, (gchar *) "20.meeting", (gchar *) N_("New _Meeting"), on_new_meeting, NULL, (gchar *) "stock_new-meeting", 0, 0}, + { E_POPUP_ITEM, (gchar *) "30.task", (gchar *) N_("New _Task"), on_new_task, NULL, (gchar *) "stock_task", 0, 0}, - { E_POPUP_BAR, "40."}, - { E_POPUP_ITEM, "40.print", N_("P_rint..."), on_print, NULL, GTK_STOCK_PRINT, 0, 0 }, + { E_POPUP_BAR, (gchar *) "40."}, + { E_POPUP_ITEM, (gchar *) "40.print", (gchar *) N_("P_rint..."), on_print, NULL, (gchar *) GTK_STOCK_PRINT, 0, 0 }, - { E_POPUP_BAR, "50." }, - { E_POPUP_ITEM, "50.paste", N_("_Paste"), on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_BAR, (gchar *) "50." }, + { E_POPUP_ITEM, (gchar *) "50.paste", (gchar *) N_("_Paste"), on_paste, NULL, (gchar *) GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_BAR, "60." }, + { E_POPUP_BAR, (gchar *) "60." }, /* FIXME: hook in this somehow */ - { E_POPUP_SUBMENU, "60.view", N_("_Current View") }, + { E_POPUP_SUBMENU, (gchar *) "60.view", (gchar *) N_("_Current View") }, - { E_POPUP_ITEM, "61.today", N_("Select T_oday"), on_goto_today, NULL, "go-today" }, - { E_POPUP_ITEM, "62.todate", N_("_Select Date..."), on_goto_date, NULL, GTK_STOCK_JUMP_TO }, + { E_POPUP_ITEM, (gchar *) "61.today", (gchar *) N_("Select T_oday"), on_goto_today, NULL, (gchar *) "go-today" }, + { E_POPUP_ITEM, (gchar *) "62.todate", (gchar *) N_("_Select Date..."), on_goto_date, NULL, (gchar *) GTK_STOCK_JUMP_TO }, }; static EPopupItem ecv_child_items [] = { - { E_POPUP_ITEM, "00.open", N_("_Open"), on_edit_appointment, NULL, GTK_STOCK_OPEN, 0, E_CAL_POPUP_SELECT_NOTEDITING }, - { E_POPUP_ITEM, "10.saveas", N_("_Save As..."), on_save_as, NULL, GTK_STOCK_SAVE_AS, 0, E_CAL_POPUP_SELECT_NOTEDITING }, - { E_POPUP_ITEM, "20.print", N_("Pri_nt..."), on_print_event, NULL, GTK_STOCK_PRINT, 0, E_CAL_POPUP_SELECT_NOTEDITING }, + { E_POPUP_ITEM, (gchar *) "00.open", (gchar *) N_("_Open"), on_edit_appointment, NULL, (gchar *) GTK_STOCK_OPEN, 0, E_CAL_POPUP_SELECT_NOTEDITING }, + { E_POPUP_ITEM, (gchar *) "10.saveas", (gchar *) N_("_Save As..."), on_save_as, NULL, (gchar *) GTK_STOCK_SAVE_AS, 0, E_CAL_POPUP_SELECT_NOTEDITING }, + { E_POPUP_ITEM, (gchar *) "20.print", (gchar *) N_("Pri_nt..."), on_print_event, NULL, (gchar *) GTK_STOCK_PRINT, 0, E_CAL_POPUP_SELECT_NOTEDITING }, - { E_POPUP_BAR, "30." }, + { E_POPUP_BAR, (gchar *) "30." }, - { E_POPUP_ITEM, "31.cut", N_("C_ut"), on_cut, NULL, GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ORGANIZER }, - { E_POPUP_ITEM, "32.copy", N_("_Copy"), on_copy, NULL, GTK_STOCK_COPY, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_ORGANIZER }, - { E_POPUP_ITEM, "33.paste", N_("_Paste"), on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "31.cut", (gchar *) N_("C_ut"), on_cut, NULL, (gchar *) GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ORGANIZER }, + { E_POPUP_ITEM, (gchar *) "32.copy", (gchar *) N_("_Copy"), on_copy, NULL, (gchar *) GTK_STOCK_COPY, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_ORGANIZER }, + { E_POPUP_ITEM, (gchar *) "33.paste", (gchar *) N_("_Paste"), on_paste, NULL, (gchar *) GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_BAR, "40." }, + { E_POPUP_BAR, (gchar *) "40." }, - { E_POPUP_ITEM, "43.copyto", N_("Cop_y to Calendar..."), on_copy_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING }, - { E_POPUP_ITEM, "44.moveto", N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "45.delegate", N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING}, - { E_POPUP_ITEM, "46.schedule", N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING }, - { E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING }, - { E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, - { E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, + { E_POPUP_ITEM, (gchar *) "43.copyto", (gchar *) N_("Cop_y to Calendar..."), on_copy_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING }, + { E_POPUP_ITEM, (gchar *) "44.moveto", (gchar *) N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "45.delegate", (gchar *) N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING}, + { E_POPUP_ITEM, (gchar *) "46.schedule", (gchar *) N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING }, + { E_POPUP_ITEM, (gchar *) "47.forward", (gchar *) N_("_Forward as iCalendar..."), on_forward, NULL, (gchar *) "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING }, + { E_POPUP_ITEM, (gchar *) "48.reply", (gchar *) N_("_Reply"), on_reply, NULL, (gchar *) "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, + { E_POPUP_ITEM, (gchar *) "49.reply-all", (gchar *) N_("Reply to _All"), on_reply_all, NULL, (gchar *) "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, - { E_POPUP_BAR, "50." }, + { E_POPUP_BAR, (gchar *) "50." }, - { E_POPUP_ITEM, "51.delete", N_("_Delete"), on_delete_appointment, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_NONRECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "52.move", N_("Make this Occurrence _Movable"), on_unrecur_appointment, NULL, NULL, E_CAL_POPUP_SELECT_RECURRING | E_CAL_POPUP_SELECT_INSTANCE, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "53.delete", N_("Delete this _Occurrence"), on_delete_occurrence, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "54.delete", N_("Delete _All Occurrences"), on_delete_appointment, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "51.delete", (gchar *) N_("_Delete"), on_delete_appointment, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_NONRECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "52.move", (gchar *) N_("Make this Occurrence _Movable"), on_unrecur_appointment, NULL, NULL, E_CAL_POPUP_SELECT_RECURRING | E_CAL_POPUP_SELECT_INSTANCE, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "53.delete", (gchar *) N_("Delete this _Occurrence"), on_delete_occurrence, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "54.delete", (gchar *) N_("Delete _All Occurrences"), on_delete_appointment, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, }; static void diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 03d630c0f2..97f5ab59f6 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -617,12 +617,15 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, gdouble cc = 65535.0; gdouble date_fraction; gboolean short_event = FALSE, resize_flag = FALSE; - gchar *end_resize_time, *end_resize_suffix; + const gchar *end_resize_suffix; + gchar *end_resize_time; gint start_hour, start_display_hour, start_minute, start_suffix_width; gint end_hour, end_display_hour, end_minute, end_suffix_width; gboolean show_span = FALSE, format_time; gint offset, interval; - char *text = NULL, *start_suffix, *end_suffix; + const gchar *start_suffix; + const gchar *end_suffix; + char *text = NULL; int scroll_flag = 0; gint row_y; GConfClient *gconf; diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index dc3c2deba5..9d7ce44455 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -284,7 +284,8 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item, EDayView *day_view; EDayViewTimeItem *dvtmitem; GtkStyle *style; - gchar buffer[64], *suffix, *midnight_day = NULL, *midnight_month = NULL; + const gchar *suffix; + gchar buffer[64], *midnight_day = NULL, *midnight_month = NULL; gint hour, display_hour, minute, row; gint row_y, start_y, large_hour_y_offset, small_font_y_offset; gint long_line_x1, long_line_x2, short_line_x1; diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index 2f9bbf00fb..909379b3a6 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -375,7 +375,7 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem, gchar buffer[16]; gint hour, display_hour, minute, offset, time_width, time_x; gint min_end_time_x, suffix_width, max_icon_x; - gchar *suffix; + const gchar *suffix; gboolean draw_start_triangle, draw_end_triangle; GdkRectangle clip_rect; GSList *categories_list, *elem; @@ -831,7 +831,7 @@ e_day_view_top_item_get_day_label (EDayView *day_view, gint day, { struct icaltimetype day_start_tt; struct tm day_start = { 0 }; - gchar *format; + const gchar *format; day_start_tt = icaltime_from_timet_with_zone (day_view->day_starts[day], FALSE, diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index d1d1cb4353..c8c06e6b89 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -108,9 +108,9 @@ enum { TARGET_VCALENDAR }; static GtkTargetEntry target_table[] = { - { "application/x-e-calendar-event", 0, TARGET_CALENDAR_EVENT }, - { "text/x-calendar", 0, TARGET_VCALENDAR }, - { "text/calendar", 0, TARGET_VCALENDAR } + { (gchar *) "application/x-e-calendar-event", 0, TARGET_CALENDAR_EVENT }, + { (gchar *) "text/x-calendar", 0, TARGET_VCALENDAR }, + { (gchar *) "text/calendar", 0, TARGET_VCALENDAR } }; static guint n_targets = sizeof(target_table) / sizeof(target_table[0]); @@ -1838,9 +1838,9 @@ e_day_view_update_event_label (EDayView *day_view, gint event_num) { EDayViewEvent *event; - char *text; gboolean free_text = FALSE, editing_event = FALSE, short_event = FALSE; const gchar *summary; + char *text; gint interval; event = &g_array_index (day_view->events[day], EDayViewEvent, event_num); @@ -1850,7 +1850,7 @@ e_day_view_update_event_label (EDayView *day_view, return; summary = icalcomponent_get_summary (event->comp_data->icalcomp); - text = summary ? (char *) summary : ""; + text = summary ? (char *) summary : (char *) ""; if (day_view->editing_event_day == day && day_view->editing_event_num == event_num) @@ -7847,7 +7847,7 @@ void e_day_view_convert_time_to_display (EDayView *day_view, gint hour, gint *display_hour, - gchar **suffix, + const gchar **suffix, gint *suffix_width) { /* Calculate the actual hour number to display. For 12-hour diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index 1f518198fa..7cfb3c2dc6 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -595,7 +595,7 @@ void e_day_view_stop_auto_scroll (EDayView *day_view); void e_day_view_convert_time_to_display (EDayView *day_view, gint hour, gint *display_hour, - gchar **suffix, + const gchar **suffix, gint *suffix_width); gint e_day_view_get_time_string_width (EDayView *day_view); diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 5e6e62281e..bab36202d6 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -732,7 +732,7 @@ static const char *dayname[] = { N_("Saturday") }; -static inline char * +static const char * get_dayname (struct icalrecurrencetype *r, int i) { enum icalrecurrencetype_weekday day; diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c index 413c83894a..efa616535c 100644 --- a/calendar/gui/e-meeting-attendee.c +++ b/calendar/gui/e-meeting-attendee.c @@ -812,7 +812,6 @@ e_meeting_attendee_add_busy_period (EMeetingAttendee *ia, g_return_val_if_fail (ia != NULL, FALSE); g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), FALSE); - g_return_val_if_fail (busy_type >= 0, FALSE); g_return_val_if_fail (busy_type < E_MEETING_FREE_BUSY_LAST, FALSE); priv = ia->priv; diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index aea75d4bd7..2d8a532727 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -64,11 +64,12 @@ static guint e_meeting_list_view_signals[LAST_SIGNAL] = { 0 }; static void name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpointer data); -static char *sections[] = {N_("Chair Persons"), - N_("Required Participants"), - N_("Optional Participants"), - N_("Resources"), - NULL}; +static const gchar *sections[] = {N_("Chair Persons"), + N_("Required Participants"), + N_("Optional Participants"), + N_("Resources"), + NULL}; + static icalparameter_role roles[] = {ICAL_ROLE_CHAIR, ICAL_ROLE_REQPARTICIPANT, ICAL_ROLE_OPTPARTICIPANT, diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index d320198ec3..a5bbffb78b 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -1100,7 +1100,7 @@ process_free_busy (EMeetingStoreQueueData *qdata, char *text) * In the returned newly allocated string. */ static gchar * -replace_string (gchar *string, gchar *from_value, gchar *to_value) +replace_string (gchar *string, const gchar *from_value, gchar *to_value) { gchar *replaced; gchar **split_uri; diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index cc9f778568..35d6c2621b 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -64,8 +64,8 @@ enum TargetType{ }; static GtkTargetEntry target_types[] = { - { "text/x-calendar", 0, TARGET_TYPE_VCALENDAR }, - { "text/calendar", 0, TARGET_TYPE_VCALENDAR } + { (gchar *) "text/x-calendar", 0, TARGET_TYPE_VCALENDAR }, + { (gchar *) "text/calendar", 0, TARGET_TYPE_VCALENDAR } }; static guint n_target_types = G_N_ELEMENTS (target_types); @@ -73,8 +73,6 @@ static guint n_target_types = G_N_ELEMENTS (target_types); extern ECompEditorRegistry *comp_editor_registry; -static void e_memo_table_class_init (EMemoTableClass *klass); -static void e_memo_table_init (EMemoTable *memo_table); static void e_memo_table_destroy (GtkObject *object); static void e_memo_table_on_double_click (ETable *table, @@ -934,25 +932,25 @@ delete_cb (EPopup *ep, EPopupItem *pitem, void *data) } static EPopupItem memos_popup_items [] = { - { E_POPUP_ITEM, "00.open", N_("_Open"), e_memo_table_on_open_memo, NULL, GTK_STOCK_OPEN, E_CAL_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "05.openweb", N_("Open _Web Page"), open_url_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_HASURL }, - { E_POPUP_ITEM, "10.saveas", N_("_Save As..."), e_memo_table_on_save_as, NULL, GTK_STOCK_SAVE_AS, E_CAL_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "20.print", N_("P_rint..."), e_memo_table_on_print_memo, NULL, GTK_STOCK_PRINT, E_CAL_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "00.open", (gchar *) N_("_Open"), e_memo_table_on_open_memo, NULL, (gchar *) GTK_STOCK_OPEN, E_CAL_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "05.openweb", (gchar *) N_("Open _Web Page"), open_url_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_HASURL }, + { E_POPUP_ITEM, (gchar *) "10.saveas", (gchar *) N_("_Save As..."), e_memo_table_on_save_as, NULL, (gchar *) GTK_STOCK_SAVE_AS, E_CAL_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "20.print", (gchar *) N_("P_rint..."), e_memo_table_on_print_memo, NULL, (gchar *) GTK_STOCK_PRINT, E_CAL_POPUP_SELECT_ONE }, - { E_POPUP_BAR, "30.bar" }, + { E_POPUP_BAR, (gchar *) "30.bar" }, - { E_POPUP_ITEM, "40.cut", N_("C_ut"), e_memo_table_on_cut, NULL, GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "50.copy", N_("_Copy"), e_memo_table_on_copy, NULL, GTK_STOCK_COPY, 0, 0 }, - { E_POPUP_ITEM, "60.paste", N_("_Paste"), e_memo_table_on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "40.cut", (gchar *) N_("C_ut"), e_memo_table_on_cut, NULL, (gchar *) GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "50.copy", (gchar *) N_("_Copy"), e_memo_table_on_copy, NULL, (gchar *) GTK_STOCK_COPY, 0, 0 }, + { E_POPUP_ITEM, (gchar *) "60.paste", (gchar *) N_("_Paste"), e_memo_table_on_paste, NULL, (gchar *) GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_BAR, "70.bar" }, + { E_POPUP_BAR, (gchar *) "70.bar" }, - { E_POPUP_ITEM, "80.forward", N_("_Forward as iCalendar"), e_memo_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "80.forward", (gchar *) N_("_Forward as iCalendar"), e_memo_table_on_forward, NULL, (gchar *) "mail-forward", E_CAL_POPUP_SELECT_ONE }, - { E_POPUP_BAR, "90.bar" }, + { E_POPUP_BAR, (gchar *) "90.bar" }, - { E_POPUP_ITEM, "a0.delete", N_("_Delete"), delete_cb, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "b0.deletemany", N_("_Delete Selected Memos"), delete_cb, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "a0.delete", (gchar *) N_("_Delete"), delete_cb, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "b0.deletemany", (gchar *) N_("_Delete Selected Memos"), delete_cb, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE }, }; static void diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c index 384743184a..c9f4681bf9 100644 --- a/calendar/gui/e-memos.c +++ b/calendar/gui/e-memos.c @@ -108,8 +108,8 @@ enum DndTargetType { }; static GtkTargetEntry list_drag_types[] = { - { "text/calendar", 0, TARGET_VCALENDAR }, - { "text/x-calendar", 0, TARGET_VCALENDAR } + { (gchar *) "text/calendar", 0, TARGET_VCALENDAR }, + { (gchar *) "text/x-calendar", 0, TARGET_VCALENDAR } }; static const int num_list_drag_types = sizeof (list_drag_types) / sizeof (list_drag_types[0]); diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index 4efb688ae0..eabe4d72d2 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -113,8 +113,8 @@ enum DndTargetType { }; static GtkTargetEntry list_drag_types[] = { - { "text/calendar", 0, TARGET_VCALENDAR }, - { "text/x-calendar", 0, TARGET_VCALENDAR } + { (gchar *) "text/calendar", 0, TARGET_VCALENDAR }, + { (gchar *) "text/x-calendar", 0, TARGET_VCALENDAR } }; static const int num_list_drag_types = sizeof (list_drag_types) / sizeof (list_drag_types[0]); diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index dcb3dd96f5..49513e96e5 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -636,7 +636,8 @@ e_week_view_draw_time (EWeekView *week_view, GdkGC *gc; gint hour_to_display, suffix_width; gint time_y_normal_font, time_y_small_font; - gchar buffer[128], *suffix; + const gchar *suffix; + gchar buffer[128]; PangoLayout *layout; PangoFontDescription *small_font_desc; diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 316ba5effc..52fabef69e 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -4378,7 +4378,7 @@ void e_week_view_convert_time_to_display (EWeekView *week_view, gint hour, gint *display_hour, - gchar **suffix, + const gchar **suffix, gint *suffix_width) { /* Calculate the actual hour number to display. For 12-hour diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h index 2458efcdd1..e62b2f63cd 100644 --- a/calendar/gui/e-week-view.h +++ b/calendar/gui/e-week-view.h @@ -433,7 +433,7 @@ void e_week_view_show_popup_menu (EWeekView *week_view, void e_week_view_convert_time_to_display (EWeekView *week_view, gint hour, gint *display_hour, - gchar **suffix, + const gchar **suffix, gint *suffix_width); gint e_week_view_get_time_string_width (EWeekView *week_view); diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 87c61bb418..991df095b3 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -2645,13 +2645,13 @@ gc_define_views(EPopup *ep, EPopupItem *pitem, void *data) static EPopupItem gc_popups[] = { /* Code generates the path to fit */ { E_POPUP_BAR, NULL }, - { E_POPUP_RADIO|E_POPUP_ACTIVE, NULL, N_("_Custom View"), }, - { E_POPUP_ITEM, NULL, N_("_Save Custom View"), gc_save_custom_view }, + { E_POPUP_RADIO|E_POPUP_ACTIVE, NULL, (gchar *) N_("_Custom View"), }, + { E_POPUP_ITEM, NULL, (gchar *) N_("_Save Custom View"), gc_save_custom_view }, /* index == 3, when we have non-custom view */ { E_POPUP_BAR, NULL }, - { E_POPUP_ITEM, NULL, N_("_Define Views..."), gc_define_views }, + { E_POPUP_ITEM, NULL, (gchar *) N_("_Define Views..."), gc_define_views }, }; static void diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index e1a86dab25..1cf2005e3f 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -112,8 +112,6 @@ GtkWidget *gnome_calendar_new (void); void gnome_calendar_set_activity_handler (GnomeCalendar *cal, EActivityHandler *activity_handler); void gnome_calendar_set_ui_component (GnomeCalendar *cal, BonoboUIComponent *ui_component); -ECalendarTable *gnome_calendar_get_task_pad (GnomeCalendar *gcal); - ECalModel *gnome_calendar_get_calendar_model (GnomeCalendar *gcal); ECal *gnome_calendar_get_default_client (GnomeCalendar *gcal); @@ -201,8 +199,6 @@ void gnome_calendar_edit_appointment (GnomeCalendar *gcal, const char* comp_uid, const char* comp_rid); -GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal); - void gnome_calendar_emit_user_created_signal (gpointer instance, GnomeCalendar *gcal, ECal *calendar); G_END_DECLS diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 829ac287ce..30ad9822c7 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -40,7 +40,7 @@ #include #include -static gchar *itip_methods[] = { +static const gchar *itip_methods[] = { "PUBLISH", "REQUEST", "REPLY", @@ -1373,7 +1373,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method, GString *body; char *orig_from = NULL; - char *description = NULL; + const char *description = NULL; char *subject = NULL; const char *location = NULL; char *time = NULL; @@ -1390,7 +1390,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method, if (text_list){ ECalComponentText text = *((ECalComponentText *)text_list->data); if (text.value) - description = (char *)text.value; + description = text.value; else description = ""; } else { diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 2085bb20af..14b8267167 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -96,7 +96,8 @@ launch_alarm_daemon_cb (gpointer data) /* activate the alarm daemon */ CORBA_exception_init (&ev); - an = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify:" BASE_VERSION, 0, NULL, &ev); + an = bonobo_activation_activate_from_id ( + (Bonobo_ActivationID) "OAFIID:GNOME_Evolution_Calendar_AlarmNotify:" BASE_VERSION, 0, NULL, &ev); if (BONOBO_EX (&ev)) { g_message ("launch_alarm_daemon_cb(): %s", bonobo_exception_get_text (&ev)); diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index 66b6f6a2ec..1ed3fb1634 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -67,8 +67,8 @@ enum DndTargetType { #define PERSONAL_RELATIVE_URI "system" static GtkTargetEntry drag_types[] = { - { CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }, - { XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST } + { (gchar *) CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }, + { (gchar *) XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST } }; static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]); @@ -476,17 +476,17 @@ mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) } static EPopupItem emc_source_popups[] = { - { E_POPUP_ITEM, "10.new", N_("_New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 }, - { E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_memo_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, "18.rename", N_("_Rename..."), rename_memo_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Memo List"), new_memo_list_cb, NULL, (gchar *) "stock_notes", 0, 0 }, + { E_POPUP_ITEM, (gchar *) "15.copy", (gchar *) N_("_Copy..."), copy_memo_list_cb, NULL, (gchar *) "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_memo_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_BAR, "20.bar" }, - { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, "30.mark_memos_offline", N_("_Make available for offline use"), mark_offline_cb, NULL, "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE }, - { E_POPUP_ITEM, "40.mark_memos_no_offline", N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE }, + { E_POPUP_BAR, (gchar *) "20.bar" }, + { E_POPUP_ITEM, (gchar *) "20.delete", (gchar *) N_("_Delete"), delete_memo_list_cb, NULL, (gchar *) "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "30.mark_memos_offline", (gchar *) N_("_Make available for offline use"), mark_offline_cb, NULL, (gchar *) "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE }, + { E_POPUP_ITEM, (gchar *) "40.mark_memos_no_offline", (gchar *) N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, (gchar *) "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE }, - { E_POPUP_BAR, "99.bar" }, - { E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_memo_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_BAR, (gchar *) "99.bar" }, + { E_POPUP_ITEM, (gchar *) "99.properties", (gchar *) N_("_Properties"), edit_memo_list_cb, NULL, (gchar *) "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, }; static void @@ -1039,28 +1039,28 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_sequence_set_release (list, FALSE); - list->_buffer[0].id = CREATE_MEMO_ID; - list->_buffer[0].description = _("New memo"); + list->_buffer[0].id = (char *) CREATE_MEMO_ID; + list->_buffer[0].description = (char *) _("New memo"); list->_buffer[0].menuDescription = (char *) C_("New", "Mem_o"); - list->_buffer[0].tooltip = _("Create a new memo"); + list->_buffer[0].tooltip = (char *) _("Create a new memo"); list->_buffer[0].menuShortcut = 'o'; - list->_buffer[0].iconName = "stock_insert-note"; + list->_buffer[0].iconName = (char *) "stock_insert-note"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[1].id = CREATE_SHARED_MEMO_ID; - list->_buffer[1].description = _("New shared memo"); + list->_buffer[1].id = (char *) CREATE_SHARED_MEMO_ID; + list->_buffer[1].description = (char *) _("New shared memo"); list->_buffer[1].menuDescription = (char *) C_("New", "_Shared memo"); - list->_buffer[1].tooltip = _("Create a shared new memo"); + list->_buffer[1].tooltip = (char *) _("Create a shared new memo"); list->_buffer[1].menuShortcut = 'h'; - list->_buffer[1].iconName = "stock_insert-note"; + list->_buffer[1].iconName = (char *) "stock_insert-note"; list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[2].id = CREATE_MEMO_LIST_ID; - list->_buffer[2].description = _("New memo list"); + list->_buffer[2].id = (char *) CREATE_MEMO_LIST_ID; + list->_buffer[2].description = (char *) _("New memo list"); list->_buffer[2].menuDescription = (char *) C_("New", "Memo li_st"); - list->_buffer[2].tooltip = _("Create a new memo list"); + list->_buffer[2].tooltip = (char *) _("Create a new memo list"); list->_buffer[2].menuShortcut = '\0'; - list->_buffer[2].iconName = "stock_notes"; + list->_buffer[2].iconName = (char *) "stock_notes"; list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER; return list; diff --git a/calendar/gui/print.c b/calendar/gui/print.c index adbfc2cc77..943a4af2ee 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -510,7 +510,7 @@ enum datefmt { DATE_YEAR = 1 << 3 }; -static char *days[] = { +static const gchar *days[] = { N_("1st"), N_("2nd"), N_("3rd"), N_("4th"), N_("5th"), N_("6th"), N_("7th"), N_("8th"), N_("9th"), N_("10th"), N_("11th"), N_("12th"), N_("13th"), N_("14th"), N_("15th"), @@ -592,8 +592,9 @@ print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month, double cell_top, cell_bottom, cell_left, cell_right, text_right; /* Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday */ - char *daynames[] = { N_("Su"), N_("Mo"), N_("Tu"), N_("We"), - N_("Th"), N_("Fr"), N_("Sa") }; + const gchar *daynames[] = + { N_("Su"), N_("Mo"), N_("Tu"), N_("We"), + N_("Th"), N_("Fr"), N_("Sa") }; cairo_t *cr; /* Print the title, e.g. 'June 2001', in the top 16% of the area. */ @@ -1061,22 +1062,23 @@ print_attendees (GtkPrintContext *context, PangoFontDescription *font, cairo_t * return top; } -static char * +static gchar * get_summary_with_location (icalcomponent *icalcomp) { const gchar *summary, *location; - char *text; + gchar *text; g_return_val_if_fail (icalcomp != NULL, NULL); summary = icalcomponent_get_summary (icalcomp); - text = summary ? (char*) summary : ""; + if (summary == NULL) + summary = ""; location = icalcomponent_get_location (icalcomp); if (location && *location) { - text = g_strdup_printf ("%s (%s)", text, location); + text = g_strdup_printf ("%s (%s)", summary, location); } else { - text = g_strdup (text); + text = g_strdup (summary); } return text; @@ -1628,7 +1630,8 @@ print_week_view_background (GtkPrintContext *context, struct tm tm; int day, day_x, day_y, day_h; double x1, x2, y1, y2, font_size, fillcolor; - char *format_string, buffer[128]; + const gchar *format_string; + gchar buffer[128]; cairo_t *cr; font_size = get_font_size (font); @@ -2271,7 +2274,11 @@ print_year_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) #endif static void -write_label_piece (time_t t, char *buffer, int size, char *stext, char *etext) +write_label_piece (time_t t, + gchar *buffer, + gint size, + gchar *stext, + const gchar *etext) { icaltimezone *zone = calendar_config_get_icaltimezone (); struct tm *tmp_tm; diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 25bf06bda1..2d17f5783f 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -66,8 +66,8 @@ enum DndTargetType { #define PERSONAL_RELATIVE_URI "system" static GtkTargetEntry drag_types[] = { - { CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }, - { XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST } + { (gchar *) CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }, + { (gchar *) XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST } }; static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]); @@ -468,17 +468,17 @@ mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) } static EPopupItem etc_source_popups[] = { - { E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 }, - { E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_task_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, "18.rename", N_("_Rename..."), rename_task_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Task List"), new_task_list_cb, NULL, (gchar *) "stock_todo", 0, 0 }, + { E_POPUP_ITEM, (gchar *) "15.copy", (gchar *) N_("_Copy..."), copy_task_list_cb, NULL, (gchar *) "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_task_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_BAR, "20.bar" }, - { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, "30.mark_tasks_offline", N_("_Make available for offline use"), mark_offline_cb, NULL, "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE }, - { E_POPUP_ITEM, "40.mark_tasks_no_offline", N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE }, + { E_POPUP_BAR, (gchar *) "20.bar" }, + { E_POPUP_ITEM, (gchar *) "20.delete", (gchar *) N_("_Delete"), delete_task_list_cb, NULL, (gchar *) "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "30.mark_tasks_offline", (gchar *) N_("_Make available for offline use"), mark_offline_cb, NULL, (gchar *) "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE }, + { E_POPUP_ITEM, (gchar *) "40.mark_tasks_no_offline", (gchar *) N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, (gchar *) "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE }, - { E_POPUP_BAR, "99.bar" }, - { E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_task_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_BAR, (gchar *) "99.bar" }, + { E_POPUP_ITEM, (gchar *) "99.properties", (gchar *) N_("_Properties"), edit_task_list_cb, NULL, (gchar *) "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, }; static void @@ -1110,28 +1110,28 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_sequence_set_release (list, FALSE); - list->_buffer[0].id = CREATE_TASK_ID; - list->_buffer[0].description = _("New task"); + list->_buffer[0].id = (char *) CREATE_TASK_ID; + list->_buffer[0].description = (char *) _("New task"); list->_buffer[0].menuDescription = (char *) C_("New", "_Task"); - list->_buffer[0].tooltip = _("Create a new task"); + list->_buffer[0].tooltip = (char *) _("Create a new task"); list->_buffer[0].menuShortcut = 't'; - list->_buffer[0].iconName = "stock_task"; + list->_buffer[0].iconName = (char *) "stock_task"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[1].id = CREATE_TASK_ASSIGNED_ID; - list->_buffer[1].description = _("New assigned task"); + list->_buffer[1].id = (char *) CREATE_TASK_ASSIGNED_ID; + list->_buffer[1].description = (char *) _("New assigned task"); list->_buffer[1].menuDescription = (char *) C_("New", "Assigne_d Task"); - list->_buffer[1].tooltip = _("Create a new assigned task"); + list->_buffer[1].tooltip = (char *) _("Create a new assigned task"); list->_buffer[1].menuShortcut = '\0'; - list->_buffer[1].iconName = "stock_task"; + list->_buffer[1].iconName = (char *) "stock_task"; list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[2].id = CREATE_TASK_LIST_ID; - list->_buffer[2].description = _("New task list"); + list->_buffer[2].id = (char *) CREATE_TASK_LIST_ID; + list->_buffer[2].description = (char *) _("New task list"); list->_buffer[2].menuDescription = (char *) C_("New", "Tas_k list"); - list->_buffer[2].tooltip = _("Create a new task list"); + list->_buffer[2].tooltip = (char *) _("Create a new task list"); list->_buffer[2].menuShortcut = '\0'; - list->_buffer[2].iconName = "stock_todo"; + list->_buffer[2].iconName = (char *) "stock_todo"; list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER; return list; diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 0d83becf21..9732f2f7e7 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -154,7 +154,7 @@ tasks_control_activate_cb (BonoboControl *control, } struct _tasks_sensitize_item { - char *command; + const gchar *command; guint32 enable; }; diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c index 613e62c1ca..6681829afa 100644 --- a/calendar/gui/weekday-picker.c +++ b/calendar/gui/weekday-picker.c @@ -70,8 +70,6 @@ enum { LAST_SIGNAL }; -static void weekday_picker_class_init (WeekdayPickerClass *class); -static void weekday_picker_init (WeekdayPicker *wp); static void weekday_picker_destroy (GtkObject *object); static void weekday_picker_realize (GtkWidget *widget); diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 05e7a4ee04..a7ea5e7921 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -283,13 +283,15 @@ ivcal_import_items(void *d) switch (ici->source_type) { case E_CAL_SOURCE_TYPE_EVENT: prepare_events (ici->icalcomp, NULL); - if (!update_objects (ici->client, ici->icalcomp)) + if (!update_objects (ici->client, ici->icalcomp)) { /* FIXME: e_error ... */; + } break; case E_CAL_SOURCE_TYPE_TODO: prepare_tasks (ici->icalcomp, NULL); - if (!update_objects (ici->client, ici->icalcomp)) + if (!update_objects (ici->client, ici->icalcomp)) { /* FIXME: e_error ... */; + } break; default: g_return_val_if_reached (FALSE); @@ -525,8 +527,8 @@ load_vcalendar_file (const char *filename) defaults.alarm_audio_url = g_filename_to_uri (default_alarm_filename, NULL, NULL); g_free (default_alarm_filename); - defaults.alarm_audio_fmttype = "audio/x-wav"; - defaults.alarm_description = (char*) _("Reminder!"); + defaults.alarm_audio_fmttype = (char *) "audio/x-wav"; + defaults.alarm_description = (char *) _("Reminder!"); if (g_file_get_contents (filename, &contents, NULL, NULL)) { VObject *vcal; diff --git a/e-util/e-folder-map.c b/e-util/e-folder-map.c index 3475d61a70..157c4ca353 100644 --- a/e-util/e-folder-map.c +++ b/e-util/e-folder-map.c @@ -150,7 +150,7 @@ e_folder_map_dir (const char *dirname, const char *type, GSList **dir_list) } GSList * -e_folder_map_local_folders (char *local_dir, char *type) +e_folder_map_local_folders (const gchar *local_dir, const gchar *type) { const char *name; GDir *dir; diff --git a/e-util/e-folder-map.h b/e-util/e-folder-map.h index e61dc140ff..a939ea777f 100644 --- a/e-util/e-folder-map.h +++ b/e-util/e-folder-map.h @@ -28,7 +28,8 @@ G_BEGIN_DECLS -GSList *e_folder_map_local_folders (char *local_dir, char *type); +GSList * e_folder_map_local_folders (const gchar *local_dir, + const gchar *type); G_END_DECLS diff --git a/e-util/e-logger.c b/e-util/e-logger.c index 0a458b7444..3d3c88c384 100644 --- a/e-util/e-logger.c +++ b/e-util/e-logger.c @@ -198,7 +198,7 @@ e_logger_get_type (void) } ELogger * -e_logger_create (gchar *component) +e_logger_create (const gchar *component) { g_return_val_if_fail (component != NULL, NULL); diff --git a/e-util/e-logger.h b/e-util/e-logger.h index f7dfd8017e..186d918f12 100644 --- a/e-util/e-logger.h +++ b/e-util/e-logger.h @@ -70,7 +70,7 @@ struct _ELoggerClass { }; GType e_logger_get_type (void); -ELogger * e_logger_create (gchar *component); +ELogger * e_logger_create (const gchar *component); const gchar * e_logger_get_component (ELogger *logger); void e_logger_log (ELogger *logger, gint level, diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index 6d1b082e0f..4178070405 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -100,12 +100,12 @@ enum { E_FILTERBAR_ALL_ACCOUNTS_ID = -9 }; -#define E_FILTERBAR_SAVE { N_("_Save Search..."), E_FILTERBAR_SAVE_ID, 0 } -#define E_FILTERBAR_EDIT { N_("_Edit Saved Searches..."), E_FILTERBAR_EDIT_ID, 0 } -#define E_FILTERBAR_ADVANCED { N_("_Advanced Search..."), E_FILTERBAR_ADVANCED_ID, 0 } -#define E_FILTERBAR_ALL_ACCOUNTS { N_("All Accounts"), E_FILTERBAR_ALL_ACCOUNTS_ID, ESB_ITEMTYPE_RADIO } -#define E_FILTERBAR_CURRENT_ACCOUNT { N_("Current Account"), E_FILTERBAR_CURRENT_ACCOUNT_ID, ESB_ITEMTYPE_RADIO } -#define E_FILTERBAR_CURRENT_FOLDER { N_("Current Folder"), E_FILTERBAR_CURRENT_FOLDER_ID, ESB_ITEMTYPE_RADIO } +#define E_FILTERBAR_SAVE { (gchar *) N_("_Save Search..."), E_FILTERBAR_SAVE_ID, 0 } +#define E_FILTERBAR_EDIT { (gchar *) N_("_Edit Saved Searches..."), E_FILTERBAR_EDIT_ID, 0 } +#define E_FILTERBAR_ADVANCED { (gchar *) N_("_Advanced Search..."), E_FILTERBAR_ADVANCED_ID, 0 } +#define E_FILTERBAR_ALL_ACCOUNTS { (gchar *) N_("All Accounts"), E_FILTERBAR_ALL_ACCOUNTS_ID, ESB_ITEMTYPE_RADIO } +#define E_FILTERBAR_CURRENT_ACCOUNT { (gchar *) N_("Current Account"), E_FILTERBAR_CURRENT_ACCOUNT_ID, ESB_ITEMTYPE_RADIO } +#define E_FILTERBAR_CURRENT_FOLDER { (gchar *) N_("Current Folder"), E_FILTERBAR_CURRENT_FOLDER_ID, ESB_ITEMTYPE_RADIO } #define E_FILTERBAR_SEPARATOR { NULL, 0, 0 } #ifdef JUST_FOR_TRANSLATORS diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index acbd479a43..c2b23f6c3f 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -219,7 +219,7 @@ e_table_extras_add_compare (ETableExtras *extras, GCompareFunc e_table_extras_get_compare (ETableExtras *extras, - char *id) + const gchar *id) { return (GCompareFunc) g_hash_table_lookup(extras->compares, id); } @@ -234,14 +234,14 @@ e_table_extras_add_search (ETableExtras *extras, ETableSearchFunc e_table_extras_get_search (ETableExtras *extras, - char *id) + const gchar *id) { return g_hash_table_lookup(extras->searches, id); } void e_table_extras_add_pixbuf (ETableExtras *extras, - char *id, + const gchar *id, GdkPixbuf *pixbuf) { if (pixbuf) @@ -251,7 +251,7 @@ e_table_extras_add_pixbuf (ETableExtras *extras, GdkPixbuf * e_table_extras_get_pixbuf (ETableExtras *extras, - char *id) + const gchar *id) { return g_hash_table_lookup(extras->pixbufs, id); } diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h index 9ab8bc2395..e096e516f4 100644 --- a/widgets/table/e-table-extras.h +++ b/widgets/table/e-table-extras.h @@ -63,19 +63,19 @@ void e_table_extras_add_compare (ETableExtras *extras, const gchar *id, GCompareFunc compare); GCompareFunc e_table_extras_get_compare (ETableExtras *extras, - char *id); + const gchar *id); void e_table_extras_add_search (ETableExtras *extras, const gchar *id, ETableSearchFunc search); ETableSearchFunc e_table_extras_get_search (ETableExtras *extras, - char *id); + const gchar *id); void e_table_extras_add_pixbuf (ETableExtras *extras, - char *id, + const gchar *id, GdkPixbuf *pixbuf); GdkPixbuf *e_table_extras_get_pixbuf (ETableExtras *extras, - char *id); + const gchar *id); G_END_DECLS -- cgit v1.2.3 From 0cf607076dfc2c481ca1164a04cecdb0661e6bd0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 10:58:25 -0400 Subject: Fix compiler warnings in mail. --- art/empty.xpm | 2 +- e-util/e-bconf-map.h | 6 +- mail/Makefile.am | 1 - mail/e-attachment-handler-mail.c | 4 +- mail/e-searching-tokenizer.c | 5 +- mail/em-account-editor.c | 185 ++++++++++++++++++++------------------- mail/em-account-editor.h | 2 +- mail/em-composer-prefs.c | 20 ++--- mail/em-composer-utils.c | 5 +- mail/em-filter-editor.h | 4 +- mail/em-folder-browser.c | 34 ++++--- mail/em-folder-properties.c | 8 +- mail/em-folder-tree-model.c | 3 +- mail/em-folder-tree.c | 52 +++++------ mail/em-folder-utils.c | 2 +- mail/em-folder-view.c | 105 +++++++++++----------- mail/em-format-html-display.c | 50 +++++------ mail/em-format-html.c | 56 ++++++------ mail/em-format-quote.c | 22 ++--- mail/em-format.c | 42 ++++----- mail/em-format.h | 2 +- mail/em-mailer-prefs.c | 32 +++---- mail/em-migrate.c | 14 +-- mail/em-network-prefs.c | 27 +++--- mail/em-popup.c | 28 +++--- mail/em-subscribe-editor.c | 3 +- mail/em-vfolder-rule.c | 6 +- mail/importers/Makefile.am | 2 - mail/importers/mail-importer.h | 2 +- mail/mail-component.c | 15 ++-- mail/mail-config.c | 18 ++-- mail/mail-ops.c | 12 +-- mail/mail-ops.h | 4 +- mail/mail-send-recv.c | 6 +- mail/mail-vfolder.c | 3 +- mail/message-list.c | 34 +++---- mail/message-tag-followup.c | 2 +- widgets/table/e-table-extras.c | 2 +- widgets/table/e-table-extras.h | 2 +- 39 files changed, 419 insertions(+), 403 deletions(-) (limited to 'widgets') diff --git a/art/empty.xpm b/art/empty.xpm index aca06618b1..b6d9e9bada 100644 --- a/art/empty.xpm +++ b/art/empty.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * empty_xpm[] = { +static const gchar *empty_xpm[] = { "16 16 2 1", " c None", ". c #FFFFFF", diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h index e6e16de6d4..dfd015ec65 100644 --- a/e-util/e-bconf-map.h +++ b/e-util/e-bconf-map.h @@ -45,9 +45,9 @@ enum { }; typedef struct _e_bconf_map { - char *from; - char *to; - int type; + const gchar *from; + const gchar *to; + gint type; struct _e_bconf_map *child; } e_bconf_map_t; diff --git a/mail/Makefile.am b/mail/Makefile.am index d66eb6f944..e1b0da9475 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -4,7 +4,6 @@ mailincludedir = $(privincludedir)/mail INCLUDES = \ -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/widgets/e-text \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir) \ -I$(top_srcdir)/mail \ diff --git a/mail/e-attachment-handler-mail.c b/mail/e-attachment-handler-mail.c index df4c0a9e3e..790c7b9c7a 100644 --- a/mail/e-attachment-handler-mail.c +++ b/mail/e-attachment-handler-mail.c @@ -52,8 +52,8 @@ static const gchar *ui = /* Note: Do not use the info field. */ static GtkTargetEntry target_table[] = { - { "message/rfc822", 0, 0 }, - { "x-uid-list", 0, 0 } + { (gchar *) "message/rfc822", 0, 0 }, + { (gchar *) "x-uid-list", 0, 0 } }; static void diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index 3d98cdeb4f..e0edb9d389 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -154,7 +154,8 @@ loop: /* note: our tags of interest are 7 bit ascii, only, no need to do any fancy utf8 stuff */ /* tags should be upper case if this list gets longer than 10 entries, consider binary search */ -static char *ignored_tags[] = { "B", "I", "FONT", "TT", "EM", /* and more? */}; +static const gchar *ignored_tags[] = { + "B", "I", "FONT", "TT", "EM", /* and more? */}; static int ignore_tag (const char *tag) @@ -937,7 +938,7 @@ static struct _searcher * search_info_to_searcher(struct _search_info *si) { char *tags, *tage; - char *col; + const gchar *col; if (si->strv->len == 0) return NULL; diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 991add424d..fc61cdc84b 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -187,7 +187,7 @@ typedef struct _EMAccountEditorPrivate { } EMAccountEditorPrivate; static void emae_refresh_authtype(EMAccountEditor *emae, EMAccountEditorService *service); -static void em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, char *id); +static void em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, const gchar *id); static void emae_account_folder_changed(EMFolderSelectionButton *folder, EMAccountEditor *emae); static GtkVBoxClass *emae_parent; @@ -267,7 +267,7 @@ em_account_editor_get_type(void) * * Return value: **/ -EMAccountEditor *em_account_editor_new(EAccount *account, em_account_editor_t type, char *id) +EMAccountEditor *em_account_editor_new(EAccount *account, em_account_editor_t type, const gchar *id) { EMAccountEditor *emae = g_object_new(em_account_editor_get_type(), NULL); @@ -299,8 +299,8 @@ EMAccountEditor *em_account_editor_new_for_pages(EAccount *account, em_account_e /* ********************************************************************** */ static struct { - char *label; - char *value; + const gchar *label; + const gchar *value; } ssl_options[] = { /* Translators: This string is a "Use secure connection" option for the Mailer. It will not use an encrypted connection. */ @@ -774,7 +774,7 @@ emae_setup_receipt_policy (EMAccountEditor *emae, GladeXML *xml) EAccountReceiptPolicy current = emae->account->receipt_policy; static struct { EAccountReceiptPolicy policy; - char *label; + const gchar *label; } receipt_policies[] = { { E_ACCOUNT_RECEIPT_NEVER, N_("Never") }, { E_ACCOUNT_RECEIPT_ALWAYS, N_("Always") }, @@ -1072,34 +1072,34 @@ static struct _provider_host_info emae_transport_host_info[] = { i.e. the receiving (source) service, and the sending (transport) service. It is used throughout the following code to drive each page */ static struct _service_info { - int account_uri_key; - int save_passwd_key; + gint account_uri_key; + gint save_passwd_key; - char *frame; - char *type_dropdown; + const gchar *frame; + const gchar *type_dropdown; - char *container; - char *description; - char *hostname; - char *hostlabel; - char *username; - char *userlabel; - char *path; - char *pathlabel; - char *pathentry; + const gchar *container; + const gchar *description; + const gchar *hostname; + const gchar *hostlabel; + const gchar *username; + const gchar *userlabel; + const gchar *path; + const gchar *pathlabel; + const gchar *pathentry; - char *security_frame; - char *ssl_hbox; - char *use_ssl; - char *ssl_disabled; + const gchar *security_frame; + const gchar *ssl_hbox; + const gchar *use_ssl; + const gchar *ssl_disabled; - char *needs_auth; - char *auth_frame; + const gchar *needs_auth; + const gchar *auth_frame; - char *authtype; - char *authtype_check; + const gchar *authtype; + const gchar *authtype_check; - char *remember_password; + const gchar *remember_password; struct _provider_host_info *host_info; } emae_service_info[CAMEL_NUM_PROVIDER_TYPES] = { @@ -1402,7 +1402,8 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) int active = 0, i; struct _service_info *info = &emae_service_info[service->type]; const char *uri = e_account_get_string(account, info->account_uri_key); - char *current = NULL, *tmp; + const char *tmp; + char *current = NULL; CamelURL *url; dropdown = service->providers; @@ -1480,7 +1481,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) return; } - tmp = (char *)camel_url_get_param(url, "use_ssl"); + tmp = camel_url_get_param(url, "use_ssl"); if (tmp == NULL) tmp = "never"; for (i=0;ipriv->identity_entries[] */ static struct { - char *name; - int item; + const gchar *name; + gint item; } emae_identity_entries[] = { { "management_name", E_ACCOUNT_NAME }, { "identity_full_name", E_ACCOUNT_ID_NAME }, @@ -2520,34 +2521,34 @@ emae_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str /* plugin meta-data for "org.gnome.evolution.mail.config.accountEditor" */ static EMConfigItem emae_editor_items[] = { - { E_CONFIG_BOOK, "", }, - { E_CONFIG_PAGE, "00.identity", "vboxIdentityBorder", emae_identity_page }, - { E_CONFIG_SECTION, "00.identity/00.name", "account_vbox", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "00.identity/10.required", "identity_required_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "00.identity/20.info", "identity_optional_table", emae_widget_glade }, - - { E_CONFIG_PAGE, "10.receive", "vboxSourceBorder", emae_receive_page }, - { E_CONFIG_SECTION_TABLE, "10.receive/00.type", "source_type_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "10.receive/10.config", "table4", emae_widget_glade }, - { E_CONFIG_SECTION, "10.receive/20.security", "vbox181", emae_widget_glade }, - { E_CONFIG_SECTION, "10.receive/30.auth", "vbox179", emae_widget_glade }, - - /* Most sections for this is auto-generated fromt the camel config */ - { E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), }, - { E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Messages"), }, - { E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, - - { E_CONFIG_PAGE, "30.send", "vboxTransportBorder", emae_send_page }, - { E_CONFIG_SECTION_TABLE, "30.send/00.type", "transport_type_table", emae_widget_glade }, - { E_CONFIG_SECTION, "30.send/10.config", "vbox12", emae_widget_glade }, - { E_CONFIG_SECTION, "30.send/20.security", "vbox183", emae_widget_glade }, - { E_CONFIG_SECTION, "30.send/30.auth", "vbox61", emae_widget_glade }, - - { E_CONFIG_PAGE, "40.defaults", "vboxFoldersBorder", emae_defaults_page }, - { E_CONFIG_SECTION, "40.defaults/00.folders", "vbox184", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "40.defaults/10.composing", "table8", emae_widget_glade }, - - { E_CONFIG_PAGE, "50.security", "vboxSecurityBorder", emae_security_page }, + { E_CONFIG_BOOK, (gchar *) "" }, + { E_CONFIG_PAGE, (gchar *) "00.identity", (gchar *) "vboxIdentityBorder", emae_identity_page }, + { E_CONFIG_SECTION, (gchar *) "00.identity/00.name", (gchar *) "account_vbox", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity_required_table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity_optional_table", emae_widget_glade }, + + { E_CONFIG_PAGE, (gchar *) "10.receive", (gchar *) "vboxSourceBorder", emae_receive_page }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source_type_table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "table4", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.receive/20.security", (gchar *) "vbox181", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.receive/30.auth", (gchar *) "vbox179", emae_widget_glade }, + + /* Most sections for this is auto-generated from the camel config */ + { E_CONFIG_PAGE, (gchar *) "20.receive_options", (gchar *) N_("Receiving Options"), }, + { E_CONFIG_SECTION_TABLE, (gchar *) "20.receive_options/10.mailcheck", (gchar *) N_("Checking for New Messages"), }, + { E_CONFIG_ITEM_TABLE, (gchar *) "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, + + { E_CONFIG_PAGE, (gchar *) "30.send", (gchar *) "vboxTransportBorder", emae_send_page }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport_type_table", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "30.send/10.config", (gchar *) "vbox12", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "30.send/20.security", (gchar *) "vbox183", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "30.send/30.auth", (gchar *) "vbox61", emae_widget_glade }, + + { E_CONFIG_PAGE, (gchar *) "40.defaults", (gchar *) "vboxFoldersBorder", emae_defaults_page }, + { E_CONFIG_SECTION, (gchar *) "40.defaults/00.folders", (gchar *) "vbox184", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "table8", emae_widget_glade }, + + { E_CONFIG_PAGE, (gchar *) "50.security", (gchar *) "vboxSecurityBorder", emae_security_page }, /* 1x1 table(!) not vbox: { E_CONFIG_SECTION, "50.security/00.gpg", "table19", emae_widget_glade }, */ /* table not vbox: { E_CONFIG_SECTION, "50.security/10.smime", "smime_table", emae_widget_glade }, */ { 0 }, @@ -2613,34 +2614,34 @@ emae_widget_druid_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *paren /* plugin meta-data for "org.gnome.evolution.mail.config.accountDruid" */ static EMConfigItem emae_druid_items[] = { - { E_CONFIG_DRUID, "", }, - { E_CONFIG_PAGE_START, "0.start", "start_page", emae_widget_druid_glade }, + { E_CONFIG_DRUID, (gchar *) "" }, + { E_CONFIG_PAGE_START, (gchar *) "0.start", (gchar *) "start_page", emae_widget_druid_glade }, - { E_CONFIG_PAGE, "00.identity", "vboxIdentityBorder", emae_identity_page }, - { E_CONFIG_SECTION, "00.identity/00.name", "account_vbox", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "00.identity/10.required", "identity_required_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "00.identity/20.info", "identity_optional_table", emae_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "00.identity", (gchar *) "vboxIdentityBorder", emae_identity_page }, + { E_CONFIG_SECTION, (gchar *) "00.identity/00.name", (gchar *) "account_vbox", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity_required_table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity_optional_table", emae_widget_glade }, - { E_CONFIG_PAGE, "10.receive", "vboxSourceBorder", emae_receive_page }, - { E_CONFIG_SECTION_TABLE, "10.receive/00.type", "source_type_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, "10.receive/10.config", "table4", emae_widget_glade }, - { E_CONFIG_SECTION, "10.receive/20.security", "vbox181", emae_widget_glade }, - { E_CONFIG_SECTION, "10.receive/30.auth", "vbox179", emae_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "10.receive", (gchar *) "vboxSourceBorder", emae_receive_page }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source_type_table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "table4", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.receive/20.security", (gchar *) "vbox181", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.receive/30.auth", (gchar *) "vbox179", emae_widget_glade }, /* Most sections for this is auto-generated fromt the camel config */ - { E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), }, - { E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Messages"), }, - { E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, + { E_CONFIG_PAGE, (gchar *) "20.receive_options", (gchar *) N_("Receiving Options"), }, + { E_CONFIG_SECTION_TABLE, (gchar *) "20.receive_options/10.mailcheck", (gchar *) N_("Checking for New Messages"), }, + { E_CONFIG_ITEM_TABLE, (gchar *) "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, - { E_CONFIG_PAGE, "30.send", "vboxTransportBorder", emae_send_page }, - { E_CONFIG_SECTION_TABLE, "30.send/00.type", "transport_type_table", emae_widget_glade }, - { E_CONFIG_SECTION, "30.send/10.config", "vbox12", emae_widget_glade }, - { E_CONFIG_SECTION, "30.send/20.security", "vbox183", emae_widget_glade }, - { E_CONFIG_SECTION, "30.send/30.auth", "vbox61", emae_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "30.send", (gchar *) "vboxTransportBorder", emae_send_page }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport_type_table", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "30.send/10.config", (gchar *) "vbox12", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "30.send/20.security", (gchar *) "vbox183", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "30.send/30.auth", (gchar *) "vbox61", emae_widget_glade }, - { E_CONFIG_PAGE, "40.management", "management_frame", emae_management_page }, + { E_CONFIG_PAGE, (gchar *) "40.management", (gchar *) "management_frame", emae_management_page }, - { E_CONFIG_PAGE_FINISH, "999.end", "finish_page", emae_widget_druid_glade }, + { E_CONFIG_PAGE_FINISH, (gchar *) "999.end", (gchar *) "finish_page", emae_widget_druid_glade }, { 0 }, }; static gboolean emae_druid_items_translated = FALSE; @@ -2714,11 +2715,11 @@ enum { AOL }; struct _server_prefill { - char *key; - char *recv; - char *send; - char *proto; - char *ssl; + const gchar *key; + const gchar *recv; + const gchar *send; + const gchar *proto; + const gchar *ssl; } mail_servers [] = { {"gmail", "imap.gmail.com", "smtp.gmail.com", "imap", "always"}, {"yahoo", "pop3.yahoo.com", "smtp.yahoo.com", "pop", "never"}, @@ -2873,8 +2874,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) && ((tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_REPLY_TO)) == NULL || tmp[0] == 0 || is_email(tmp)); - if (!ok) + if (!ok) { d(printf("identity incomplete\n")); + } } if (ok && (pageid == NULL || !strcmp(pageid, "10.receive"))) { @@ -2882,8 +2884,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) emae_refresh_providers(emae, &emae->priv->source); } ok = emae_service_complete(emae, &emae->priv->source); - if (!ok) + if (!ok) { d(printf("receive page incomplete\n")); + } } if (ok && (pageid == NULL || !strcmp(pageid, "30.send"))) { @@ -2891,8 +2894,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) emae_refresh_providers(emae, &emae->priv->transport); } ok = emae_service_complete(emae, &emae->priv->transport); - if (!ok) + if (!ok) { d(printf("send page incomplete\n")); + } } if (ok && (pageid == NULL || !strcmp(pageid, "40.management"))) { @@ -2900,8 +2904,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) && tmp[0] && ((ea = mail_config_get_account_by_name(tmp)) == NULL || ea == emae->original); - if (!ok) + if (!ok) { d(printf("management page incomplete\n")); + } } return ok; @@ -2973,7 +2978,7 @@ emae_editor_destroyed(GtkWidget *dialog, EMAccountEditor *emae) } static void -em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, char *id) +em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, const gchar *id) { EMAccountEditorPrivate *gui = emae->priv; int i, index; diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index 41da661089..fdd25b8f78 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -66,7 +66,7 @@ struct _EMAccountEditorClass { GType em_account_editor_get_type(void); -EMAccountEditor *em_account_editor_new(struct _EAccount *account, em_account_editor_t type, char *id); +EMAccountEditor *em_account_editor_new(struct _EAccount *account, em_account_editor_t type, const char *id); EMAccountEditor *em_account_editor_new_for_pages(struct _EAccount *account, em_account_editor_t type, char *id, struct _GtkWidget **pages); void em_account_editor_commit (EMAccountEditor *emae); void em_account_editor_check (EMAccountEditor *emae, const char *page); diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index d9f3718cb0..c369bdc1e9 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -762,16 +762,16 @@ emcp_widget_glade (EConfig *ec, /* plugin meta-data */ static EMConfigItem emcp_items[] = { - { E_CONFIG_BOOK, "", "composer_toplevel", emcp_widget_glade }, - { E_CONFIG_PAGE, "00.general", "vboxGeneral", emcp_widget_glade }, - { E_CONFIG_SECTION, "00.general/00.behavior", "vboxBehavior", emcp_widget_glade }, - { E_CONFIG_SECTION, "00.general/10.alerts", "vboxAlerts", emcp_widget_glade }, - { E_CONFIG_PAGE, "10.signatures", "vboxSignatures", emcp_widget_glade }, + { E_CONFIG_BOOK, (gchar *) "", (gchar *) "composer_toplevel", emcp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxGeneral", emcp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/00.behavior", (gchar *) "vboxBehavior", emcp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/10.alerts", (gchar *) "vboxAlerts", emcp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "10.signatures", (gchar *) "vboxSignatures", emcp_widget_glade }, /* signature/signatures and signature/preview parts not usable */ - { E_CONFIG_PAGE, "20.spellcheck", "vboxSpellChecking", emcp_widget_glade }, - { E_CONFIG_SECTION, "20.spellcheck/00.languages", "vbox178", emcp_widget_glade }, - { E_CONFIG_SECTION, "20.spellcheck/00.options", "vboxOptions", emcp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "20.spellcheck", (gchar *) "vboxSpellChecking", emcp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "20.spellcheck/00.languages", (gchar *) "vbox178", emcp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "20.spellcheck/00.options", (gchar *) "vboxOptions", emcp_widget_glade }, }; static void @@ -959,12 +959,12 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) prefs->forward_style = GTK_COMBO_BOX (glade_xml_get_widget (gui, "comboboxForwardStyle")); style = gconf_client_get_int (client, "/apps/evolution/mail/format/forward_style", NULL); gtk_combo_box_set_active (prefs->forward_style, style); - g_signal_connect (prefs->forward_style, "changed", G_CALLBACK (style_changed), "/apps/evolution/mail/format/forward_style"); + g_signal_connect (prefs->forward_style, "changed", G_CALLBACK (style_changed), (gpointer) "/apps/evolution/mail/format/forward_style"); prefs->reply_style = GTK_COMBO_BOX (glade_xml_get_widget (gui, "comboboxReplyStyle")); style = gconf_client_get_int (client, "/apps/evolution/mail/format/reply_style", NULL); gtk_combo_box_set_active (prefs->reply_style, reply_style_new_order (style, TRUE)); - g_signal_connect (prefs->reply_style, "changed", G_CALLBACK (style_changed), "/apps/evolution/mail/format/reply_style"); + g_signal_connect (prefs->reply_style, "changed", G_CALLBACK (style_changed), (gpointer) "/apps/evolution/mail/format/reply_style"); /* Signatures */ dialog = (GtkDialog *) gtk_dialog_new (); diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 79dae420e8..9b3dbe6cf9 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1802,7 +1802,10 @@ guess_account (CamelMimeMessage *message, CamelFolder *folder) EAccount *account = NULL; const char *tmp; int i, j; - char *types[2] = { CAMEL_RECIPIENT_TYPE_TO, CAMEL_RECIPIENT_TYPE_CC }; + const gchar *types[2] = { + CAMEL_RECIPIENT_TYPE_TO, + CAMEL_RECIPIENT_TYPE_CC + }; /* check for newsgroup header */ if (folder diff --git a/mail/em-filter-editor.h b/mail/em-filter-editor.h index b0ee632779..f37536d1ee 100644 --- a/mail/em-filter-editor.h +++ b/mail/em-filter-editor.h @@ -40,8 +40,8 @@ typedef struct _EMFilterEditorClass EMFilterEditorClass; typedef struct _EMFilterSource EMFilterSource; struct _EMFilterSource { - char *source; - char *name; + const gchar *source; + const gchar *name; }; struct _EMFilterEditor { diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 0a68c1921a..201db814ec 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -136,7 +136,7 @@ struct _EMFolderBrowserPrivate { typedef struct EMFBSearchBarItem { ESearchBarItem search; - char *image; + const gchar *image; } EMFBSearchBarItem; static void emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int state); @@ -191,7 +191,7 @@ static ESearchBarItem emfb_search_items[] = { E_FILTERBAR_SAVE, E_FILTERBAR_EDIT, { NULL, 0, 0 }, - { N_("C_reate Search Folder From Search..."), ESB_SAVE, 0}, + { (gchar *) N_("C_reate Search Folder From Search..."), ESB_SAVE, 0}, { NULL, -1, 0 } }; @@ -216,24 +216,22 @@ enum { /* Options for View */ static EMFBSearchBarItem emfb_view_items[] = { - {{ N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL}, - {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"}, + {{ (gchar *) N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL}, + {{ (gchar *) N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"}, {{ NULL, 0, 0 }, NULL}, - {{ N_("No Label"),VIEW_NO_LABEL, 0 }, NULL}, + {{ (gchar *) N_("No Label"),VIEW_NO_LABEL, 0 }, NULL}, {{ NULL, -1, 0 }, NULL} }; /* TODO: Following options should be customizable */ static EMFBSearchBarItem temp_view_items[] = { {{ NULL, 0, 0 }, NULL}, - {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"}, - {{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, - {{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, - {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"}, - {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, - {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"}, -/* { NULL, 0, NULL }, */ -/* { N_("Customize"), NOT_IMPLEMENTED, NULL }, */ + {{ (gchar *) N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"}, + {{ (gchar *) N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, + {{ (gchar *) N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, + {{ (gchar *) N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"}, + {{ (gchar *) N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, + {{ (gchar *) N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"}, {{ NULL, -1, 0 }, NULL} }; @@ -915,10 +913,10 @@ emfb_search_config_search(EFilterBar *efb, FilterRule *rule, int id, const char e_mail_search_bar_changed (search_bar); } -static char * +static const gchar * get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) { - char *view_sexp = NULL; + const gchar *view_sexp = NULL; gint id; GtkWidget *menu_item; char *tag; @@ -1135,7 +1133,8 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) { EMFolderView *emfv = (EMFolderView *) emfb; EFilterBar *efb = (EFilterBar *)esb; - char *search_state = NULL, *view_sexp, *folder_uri=NULL; + const gchar *view_sexp; + char *search_state = NULL, *folder_uri=NULL; char *word = NULL, *storeuri = NULL, *search_word = NULL; gint id, i; CamelFolder *folder; @@ -1324,7 +1323,6 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) g_free (word); g_free (search_word); - g_free (view_sexp); camel_exception_free (ex); } @@ -2013,7 +2011,7 @@ static void emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) { EMFolderBrowser *emfb = (EMFolderBrowser *) emfv; - char *state; + const gchar *state; message_list_freeze(emfv->list); diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 89cf3c7070..56194b6af9 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -279,10 +279,10 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, #define EMFP_FOLDER_SECTION (2) static EMConfigItem emfp_items[] = { - { E_CONFIG_BOOK, "", NULL }, - { E_CONFIG_PAGE, "00.general", N_("General") }, - { E_CONFIG_SECTION, "00.general/00.folder", NULL /* set by code */ }, - { E_CONFIG_ITEM, "00.general/00.folder/00.info", NULL, emfp_get_folder_item }, + { E_CONFIG_BOOK, (gchar *) "", NULL }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") }, + { E_CONFIG_SECTION, (gchar *) "00.general/00.folder", NULL /* set by code */ }, + { E_CONFIG_ITEM, (gchar *) "00.general/00.folder/00.info", NULL, emfp_get_folder_item }, }; static gboolean emfp_items_translated = FALSE; diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 94b5e4f0bc..e3a2eda2bc 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -96,6 +96,8 @@ enum { LAST_SIGNAL }; +extern CamelStore *vfolder_store; + static guint signals[LAST_SIGNAL] = { 0, }; static GtkTreeStoreClass *parent_class = NULL; @@ -186,7 +188,6 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *klass) static int sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data) { - extern CamelStore *vfolder_store; char *aname, *bname; CamelStore *store; gboolean is_store; diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 14313385b4..f773068613 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -134,15 +134,15 @@ enum DndDropType { }; static GtkTargetEntry drag_types[] = { - { "x-folder", 0, DND_DRAG_TYPE_FOLDER }, - { "text/uri-list", 0, DND_DRAG_TYPE_TEXT_URI_LIST }, + { (gchar *) "x-folder", 0, DND_DRAG_TYPE_FOLDER }, + { (gchar *) "text/uri-list", 0, DND_DRAG_TYPE_TEXT_URI_LIST }, }; static GtkTargetEntry drop_types[] = { - { "x-uid-list" , 0, DND_DROP_TYPE_UID_LIST }, - { "x-folder", 0, DND_DROP_TYPE_FOLDER }, - { "message/rfc822", 0, DND_DROP_TYPE_MESSAGE_RFC822 }, - { "text/uri-list", 0, DND_DROP_TYPE_TEXT_URI_LIST }, + { (gchar *) "x-uid-list" , 0, DND_DROP_TYPE_UID_LIST }, + { (gchar *) "x-folder", 0, DND_DROP_TYPE_FOLDER }, + { (gchar *) "message/rfc822", 0, DND_DROP_TYPE_MESSAGE_RFC822 }, + { (gchar *) "text/uri-list", 0, DND_DROP_TYPE_TEXT_URI_LIST }, }; static GdkAtom drag_atoms[NUM_DRAG_TYPES]; @@ -151,6 +151,7 @@ static GdkAtom drop_atoms[NUM_DROP_TYPES]; static guint signals[LAST_SIGNAL] = { 0 }; extern CamelSession *session; +extern CamelStore *vfolder_store; static void em_folder_tree_class_init (EMFolderTreeClass *klass); static void em_folder_tree_init (EMFolderTree *emft); @@ -529,7 +530,6 @@ emft_expand_node (EMFolderTreeModel *model, const char *key, EMFolderTree *emft) { struct _EMFolderTreePrivate *priv = emft->priv; struct _EMFolderTreeModelStoreInfo *si; - extern CamelStore *vfolder_store; GtkTreeRowReference *row; GtkTreePath *path; EAccount *account; @@ -923,12 +923,12 @@ emft_drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data) } static EPopupItem emft_drop_popup_menu[] = { - { E_POPUP_ITEM, "00.emc.00", N_("_Copy to Folder"), emft_drop_popup_copy, NULL, NULL, 1 }, - { E_POPUP_ITEM, "00.emc.01", N_("_Move to Folder"), emft_drop_popup_move, NULL, NULL, 1 }, - { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "folder-copy", 2 }, - { E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "folder-move", 2 }, - { E_POPUP_BAR, "10.emc" }, - { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 }, + { E_POPUP_ITEM, (gchar *) "00.emc.00", (gchar *) N_("_Copy to Folder"), emft_drop_popup_copy, NULL, NULL, 1 }, + { E_POPUP_ITEM, (gchar *) "00.emc.01", (gchar *) N_("_Move to Folder"), emft_drop_popup_move, NULL, NULL, 1 }, + { E_POPUP_ITEM, (gchar *) "00.emc.02", (gchar *) N_("_Copy"), emft_drop_popup_copy, NULL, (gchar *) "folder-copy", 2 }, + { E_POPUP_ITEM, (gchar *) "00.emc.03", (gchar *) N_("_Move"), emft_drop_popup_move, NULL, (gchar *) "folder-move", 2 }, + { E_POPUP_BAR, (gchar *) "10.emc" }, + { E_POPUP_ITEM, (gchar *) "99.emc.00", (gchar *) N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, (gchar *) "dialog-cancel", 0 }, }; static void @@ -2042,25 +2042,25 @@ static EPopupItem emft_popup_items[] = { { E_POPUP_BAR, "10.emc" }, #endif /* FIXME: need to disable for nochildren folders */ - { E_POPUP_ITEM, "10.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }, + { E_POPUP_ITEM, (gchar *) "10.emc.00", (gchar *) N_("_New Folder..."), emft_popup_new_folder, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }, - { E_POPUP_ITEM, "10.emc.05", N_("_Copy..."), emft_popup_copy, NULL, "folder-copy", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }, - { E_POPUP_ITEM, "10.emc.06", N_("_Move..."), emft_popup_move, NULL, "folder-move", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + { E_POPUP_ITEM, (gchar *) "10.emc.05", (gchar *) N_("_Copy..."), emft_popup_copy, NULL, (gchar *) "folder-copy", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }, + { E_POPUP_ITEM, (gchar *) "10.emc.06", (gchar *) N_("_Move..."), emft_popup_move, NULL, (gchar *) "folder-move", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, /* FIXME: need to disable for undeletable folders */ - { E_POPUP_BAR, "20.emc" }, - { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + { E_POPUP_BAR, (gchar *) "20.emc" }, + { E_POPUP_ITEM, (gchar *) "20.emc.01", (gchar *) N_("_Delete"), emft_popup_delete_folder, NULL, (gchar *) "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, - { E_POPUP_BAR, "30.emc" }, - { E_POPUP_ITEM, "30.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, - { E_POPUP_ITEM, "30.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, - { E_POPUP_ITEM, "30.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, + { E_POPUP_BAR, (gchar *) "30.emc" }, + { E_POPUP_ITEM, (gchar *) "30.emc.02", (gchar *) N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + { E_POPUP_ITEM, (gchar *) "30.emc.03", (gchar *) N_("Re_fresh"), emft_popup_refresh_folder, NULL, (gchar *) "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, + { E_POPUP_ITEM, (gchar *) "30.emc.04", (gchar *) N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, (gchar *) "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, - { E_POPUP_BAR, "99.emc" }, - { E_POPUP_ITEM, "99.emc.00", N_("_Properties"), emft_popup_properties, NULL, "document-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } + { E_POPUP_BAR, (gchar *) "99.emc" }, + { E_POPUP_ITEM, (gchar *) "99.emc.00", (gchar *) N_("_Properties"), emft_popup_properties, NULL, (gchar *) "document-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } }; -static EPopupItem trash_popup_item = {E_POPUP_ITEM, "30.emc.05", N_("_Empty Trash"), emft_popup_empty_trash,NULL,NULL, 1, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}; +static EPopupItem trash_popup_item = {E_POPUP_ITEM, (gchar *) "30.emc.05", (gchar *) N_("_Empty Trash"), emft_popup_empty_trash,NULL,NULL, 1, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}; static void emft_popup_free(EPopup *ep, GSList *items, void *data) @@ -2162,7 +2162,7 @@ emft_popup (EMFolderTree *emft, GdkEvent *event) item->type = E_POPUP_TOGGLE | E_POPUP_ACTIVE; else item->type = E_POPUP_TOGGLE & ~E_POPUP_ACTIVE; - item->path = "99.emc.99"; + item->path = (gchar *) "99.emc.99"; item->label = _("_Unread Search Folder"); item->activate = emft_popup_uvfolder; item->visible = EM_POPUP_FOLDER_SELECT; diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 05dcdc7363..0555fb76cc 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -268,7 +268,7 @@ emfu_copy_folder_selected (const char *uri, void *data) { struct _copy_folder_data *cfd = data; CamelStore *fromstore = NULL, *tostore = NULL; - char *tobase = NULL; + const gchar *tobase = NULL; CamelException ex; CamelURL *url; diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index a433323bb2..b19057a720 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -241,6 +241,8 @@ enum { LAST_SIGNAL }; +extern CamelSession *session; + static guint signals[LAST_SIGNAL]; static void emfv_selection_get(GtkWidget *widget, GtkSelectionData *data, guint info, guint time_stamp, EMFolderView *emfv); @@ -259,7 +261,6 @@ emfv_init(GObject *o) { EMFolderView *emfv = (EMFolderView *)o; struct _EMFolderViewPrivate *p; - extern CamelSession *session; gtk_box_set_homogeneous (GTK_BOX (emfv), FALSE); @@ -1322,61 +1323,61 @@ EMFV_POPUP_AUTO_TYPE(filter_type_current, emfv_popup_filter_mlist, AUTO_MLIST) /* TODO: Move some of these to be 'standard' menu's */ static EPopupItem emfv_popup_items[] = { - { E_POPUP_ITEM, "00.emfv.00", N_("_Copy"), emfv_popup_copy_text, NULL, "edit-copy", EM_FOLDER_VIEW_SELECT_DISPLAY|EM_FOLDER_VIEW_SELECT_SELECTION }, + { E_POPUP_ITEM, (gchar *) "00.emfv.00", (gchar *) N_("_Copy"), emfv_popup_copy_text, NULL, (gchar *) "edit-copy", EM_FOLDER_VIEW_SELECT_DISPLAY|EM_FOLDER_VIEW_SELECT_SELECTION }, - { E_POPUP_BAR, "10.emfv", NULL, NULL, NULL, NULL }, + { E_POPUP_BAR, (gchar *) "10.emfv", NULL, NULL, NULL, NULL }, - { E_POPUP_ITEM, "10.emfv.00", N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, "mail-reply-sender", EM_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "10.emfv.01", N_("Reply to _All"), emfv_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "10.emfv.02", N_("_Forward"), emfv_popup_forward, NULL, "mail-forward", EM_POPUP_SELECT_MANY }, + { E_POPUP_ITEM, (gchar *) "10.emfv.00", (gchar *) N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, (gchar *) "mail-reply-sender", EM_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "10.emfv.01", (gchar *) N_("Reply to _All"), emfv_popup_reply_all, NULL, (gchar *) "mail-reply-all", EM_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "10.emfv.02", (gchar *) N_("_Forward"), emfv_popup_forward, NULL, (gchar *) "mail-forward", EM_POPUP_SELECT_MANY }, - { E_POPUP_BAR, "20.emfv", NULL, NULL, NULL, NULL }, + { E_POPUP_BAR, (gchar *) "20.emfv", NULL, NULL, NULL, NULL }, /* EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone */ - { E_POPUP_ITEM, "20.emfv.00", N_("_Edit as New Message..."), emfv_popup_edit, NULL, NULL, EM_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "20.emfv.01", N_("_Save As..."), emfv_popup_saveas, NULL, "document-save-as", EM_POPUP_SELECT_MANY }, - { E_POPUP_ITEM, "20.emfv.02", N_("_Print..."), emfv_popup_print, NULL, "document-print", EM_POPUP_SELECT_ONE }, - - { E_POPUP_BAR, "40.emfv", NULL, NULL, NULL, NULL }, - { E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "edit-delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - - { E_POPUP_BAR, "50.emfv", NULL, NULL, NULL, NULL }, - { E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "mail-mark-read", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "mail-mark-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.02", N_("Mark as _Important"), emfv_popup_mark_important, NULL, "mail-mark-important", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.03", N_("Mark as Un_important"), emfv_popup_mark_unimportant, NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.04", N_("Mark as _Junk"), emfv_popup_mark_junk, NULL, "mail-mark-junk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_JUNK }, - { E_POPUP_ITEM, "50.emfv.05", N_("Mark as _Not Junk"), emfv_popup_mark_nojunk, NULL, "mail-mark-notjunk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_NOT_JUNK }, - { E_POPUP_ITEM, "50.emfv.06", N_("Mark for Follo_w Up..."), emfv_popup_flag_followup, NULL, "stock_mail-flag-for-followup", EM_POPUP_SELECT_FLAG_FOLLOWUP|EM_FOLDER_VIEW_SELECT_LISTONLY }, - - { E_POPUP_SUBMENU, "60.label.00", N_("_Label"), NULL, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "60.label.00/00.label", N_("_None"), emfv_popup_label_clear, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_BAR, "60.label.00/00.label.00", NULL, NULL, NULL, NULL }, - { E_POPUP_BAR, "60.label.00/01.label", NULL, NULL, NULL, NULL }, - { E_POPUP_ITEM, "60.label.00/01.label.00", N_("_New Label"), emfv_popup_label_new, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - - { E_POPUP_BAR, "70.emfv.06", NULL, NULL, NULL, NULL }, - - { E_POPUP_ITEM, "70.emfv.07", N_("Fla_g Completed"), emfv_popup_flag_completed, NULL, "stock_mail-flag-for-followup-done", EM_POPUP_SELECT_FLAG_COMPLETED|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "70.emfv.08", N_("Cl_ear Flag"), emfv_popup_flag_clear, NULL, NULL, EM_POPUP_SELECT_FLAG_CLEAR|EM_FOLDER_VIEW_SELECT_LISTONLY }, - - { E_POPUP_BAR, "90.filter", NULL, NULL, NULL, NULL }, - { E_POPUP_SUBMENU, "90.filter.00", N_("Crea_te Rule From Message"), NULL, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "20.emfv.00", (gchar *) N_("_Edit as New Message..."), emfv_popup_edit, NULL, NULL, EM_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "20.emfv.01", (gchar *) N_("_Save As..."), emfv_popup_saveas, NULL, (gchar *) "document-save-as", EM_POPUP_SELECT_MANY }, + { E_POPUP_ITEM, (gchar *) "20.emfv.02", (gchar *) N_("_Print..."), emfv_popup_print, NULL, (gchar *) "document-print", EM_POPUP_SELECT_ONE }, + + { E_POPUP_BAR, (gchar *) "40.emfv", NULL, NULL, NULL, NULL }, + { E_POPUP_ITEM, (gchar *) "40.emfv.00", (gchar *) N_("_Delete"), emfv_popup_delete, NULL, (gchar *) "edit-delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "40.emfv.01", (gchar *) N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "40.emfv.02", (gchar *) N_("_Move to Folder..."), emfv_popup_move, NULL, (gchar *) "mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "40.emfv.03", (gchar *) N_("_Copy to Folder..."), emfv_popup_copy, NULL, (gchar *) "mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, + + { E_POPUP_BAR, (gchar *) "50.emfv", NULL, NULL, NULL, NULL }, + { E_POPUP_ITEM, (gchar *) "50.emfv.00", (gchar *) N_("Mar_k as Read"), emfv_popup_mark_read, NULL, (gchar *) "mail-mark-read", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "50.emfv.01", (gchar *) N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, (gchar *) "mail-mark-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "50.emfv.02", (gchar *) N_("Mark as _Important"), emfv_popup_mark_important, NULL, (gchar *) "mail-mark-important", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "50.emfv.03", (gchar *) N_("Mark as Un_important"), emfv_popup_mark_unimportant, NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "50.emfv.04", (gchar *) N_("Mark as _Junk"), emfv_popup_mark_junk, NULL, (gchar *) "mail-mark-junk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_JUNK }, + { E_POPUP_ITEM, (gchar *) "50.emfv.05", (gchar *) N_("Mark as _Not Junk"), emfv_popup_mark_nojunk, NULL, (gchar *) "mail-mark-notjunk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_NOT_JUNK }, + { E_POPUP_ITEM, (gchar *) "50.emfv.06", (gchar *) N_("Mark for Follo_w Up..."), emfv_popup_flag_followup, NULL, (gchar *) "stock_mail-flag-for-followup", EM_POPUP_SELECT_FLAG_FOLLOWUP|EM_FOLDER_VIEW_SELECT_LISTONLY }, + + { E_POPUP_SUBMENU, (gchar *) "60.label.00", (gchar *) N_("_Label"), NULL, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "60.label.00/00.label", (gchar *) N_("_None"), emfv_popup_label_clear, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_BAR, (gchar *) "60.label.00/00.label.00", NULL, NULL, NULL, NULL }, + { E_POPUP_BAR, (gchar *) "60.label.00/01.label", NULL, NULL, NULL, NULL }, + { E_POPUP_ITEM, (gchar *) "60.label.00/01.label.00", (gchar *) N_("_New Label"), emfv_popup_label_new, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, + + { E_POPUP_BAR, (gchar *) "70.emfv.06", NULL, NULL, NULL, NULL }, + + { E_POPUP_ITEM, (gchar *) "70.emfv.07", (gchar *) N_("Fla_g Completed"), emfv_popup_flag_completed, NULL, (gchar *) "stock_mail-flag-for-followup-done", EM_POPUP_SELECT_FLAG_COMPLETED|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "70.emfv.08", (gchar *) N_("Cl_ear Flag"), emfv_popup_flag_clear, NULL, NULL, EM_POPUP_SELECT_FLAG_CLEAR|EM_FOLDER_VIEW_SELECT_LISTONLY }, + + { E_POPUP_BAR, (gchar *) "90.filter", NULL, NULL, NULL, NULL }, + { E_POPUP_SUBMENU, (gchar *) "90.filter.00", (gchar *) N_("Crea_te Rule From Message"), NULL, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, /* Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on. */ - { E_POPUP_ITEM, "90.filter.00/00.00", N_("Search Folder based on _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "90.filter.00/00.01", N_("Search Folder based on Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "90.filter.00/00.02", N_("Search Folder based on _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "90.filter.00/00.03", N_("Search Folder based on Mailing _List"), + { E_POPUP_ITEM, (gchar *) "90.filter.00/00.00", (gchar *) N_("Search Folder based on _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "90.filter.00/00.01", (gchar *) N_("Search Folder based on Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "90.filter.00/00.02", (gchar *) N_("Search Folder based on _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "90.filter.00/00.03", (gchar *) N_("Search Folder based on Mailing _List"), emfv_popup_vfolder_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_BAR, "90.filter.00/10", NULL, NULL, NULL, NULL }, + { E_POPUP_BAR, (gchar *) "90.filter.00/10", NULL, NULL, NULL, NULL }, /* Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on. */ - { E_POPUP_ITEM, "90.filter.00/10.00", N_("Filter based on Sub_ject"), emfv_popup_filter_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "90.filter.00/10.01", N_("Filter based on Sen_der"), emfv_popup_filter_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "90.filter.00/10.02", N_("Filter based on Re_cipients"), emfv_popup_filter_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "90.filter.00/10.03", N_("Filter based on _Mailing List"), + { E_POPUP_ITEM, (gchar *) "90.filter.00/10.00", (gchar *) N_("Filter based on Sub_ject"), emfv_popup_filter_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "90.filter.00/10.01", (gchar *) N_("Filter based on Sen_der"), emfv_popup_filter_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "90.filter.00/10.02", (gchar *) N_("Filter based on Re_cipients"), emfv_popup_filter_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, (gchar *) "90.filter.00/10.03", (gchar *) N_("Filter based on _Mailing List"), emfv_popup_filter_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST|EM_FOLDER_VIEW_SELECT_LISTONLY }, }; @@ -2730,11 +2731,11 @@ emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data) } static EPopupItem emfv_uri_popups[] = { - { E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, "edit-copy", EM_POPUP_URI_NOT_MAILTO }, + { E_POPUP_ITEM, (gchar *) "00.uri.15", (gchar *) N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, (gchar *) "edit-copy", EM_POPUP_URI_NOT_MAILTO }, - { E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO }, - { E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO }, - { E_POPUP_ITEM, "99.uri.00/00.00", N_("_To this Address"), emp_uri_popup_vfolder_recipient, NULL, NULL, EM_POPUP_URI_MAILTO }, + { E_POPUP_SUBMENU, (gchar *) "99.uri.00", (gchar *) N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO }, + { E_POPUP_ITEM, (gchar *) "99.uri.00/00.10", (gchar *) N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO }, + { E_POPUP_ITEM, (gchar *) "99.uri.00/00.00", (gchar *) N_("_To this Address"), emp_uri_popup_vfolder_recipient, NULL, NULL, EM_POPUP_URI_MAILTO }, }; static void diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 1a56f21e48..8863bf7f08 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -889,31 +889,31 @@ efhd_image(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormat /* ********************************************************************** */ static EMFormatHandler type_builtin_table[] = { - { "image/gif", (EMFormatFunc)efhd_image }, - { "image/jpeg", (EMFormatFunc)efhd_image }, - { "image/png", (EMFormatFunc)efhd_image }, - { "image/x-png", (EMFormatFunc)efhd_image }, - { "image/tiff", (EMFormatFunc)efhd_image }, - { "image/x-bmp", (EMFormatFunc)efhd_image }, - { "image/bmp", (EMFormatFunc)efhd_image }, - { "image/svg", (EMFormatFunc)efhd_image }, - { "image/x-cmu-raster", (EMFormatFunc)efhd_image }, - { "image/x-ico", (EMFormatFunc)efhd_image }, - { "image/x-portable-anymap", (EMFormatFunc)efhd_image }, - { "image/x-portable-bitmap", (EMFormatFunc)efhd_image }, - { "image/x-portable-graymap", (EMFormatFunc)efhd_image }, - { "image/x-portable-pixmap", (EMFormatFunc)efhd_image }, - { "image/x-xpixmap", (EMFormatFunc)efhd_image }, + { (gchar *) "image/gif", (EMFormatFunc)efhd_image }, + { (gchar *) "image/jpeg", (EMFormatFunc)efhd_image }, + { (gchar *) "image/png", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-png", (EMFormatFunc)efhd_image }, + { (gchar *) "image/tiff", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-bmp", (EMFormatFunc)efhd_image }, + { (gchar *) "image/bmp", (EMFormatFunc)efhd_image }, + { (gchar *) "image/svg", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-cmu-raster", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-ico", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-portable-anymap", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-portable-bitmap", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-portable-graymap", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-portable-pixmap", (EMFormatFunc)efhd_image }, + { (gchar *) "image/x-xpixmap", (EMFormatFunc)efhd_image }, /* This is where one adds those busted, non-registered types, that some idiot mailer writers out there decide to pull out of their proverbials at random. */ - { "image/jpg", (EMFormatFunc)efhd_image }, - { "image/pjpeg", (EMFormatFunc)efhd_image }, + { (gchar *) "image/jpg", (EMFormatFunc)efhd_image }, + { (gchar *) "image/pjpeg", (EMFormatFunc)efhd_image }, - { "x-evolution/message/prefix", (EMFormatFunc)efhd_message_prefix }, - { "x-evolution/message/post-header", (EMFormatFunc)efhd_message_add_bar } + { (gchar *) "x-evolution/message/prefix", (EMFormatFunc)efhd_message_prefix }, + { (gchar *) "x-evolution/message/post-header", (EMFormatFunc)efhd_message_add_bar } }; static void @@ -1079,11 +1079,11 @@ efhd_image_unfit(EPopup *ep, EPopupItem *item, void *data) } static EPopupItem efhd_menu_items[] = { - { E_POPUP_BAR, "05.display", }, - { E_POPUP_ITEM, "05.display.00", N_("_View Inline"), efhd_attachment_show }, - { E_POPUP_ITEM, "05.display.00", N_("_Hide"), efhd_attachment_show }, - { E_POPUP_ITEM, "05.display.01", N_("_Fit to Width"), efhd_image_fit, NULL, NULL, EM_POPUP_PART_IMAGE }, - { E_POPUP_ITEM, "05.display.01", N_("Show _Original Size"), efhd_image_unfit, NULL, NULL, EM_POPUP_PART_IMAGE }, + { E_POPUP_BAR, (gchar *) "05.display" }, + { E_POPUP_ITEM, (gchar *) "05.display.00", (gchar *) N_("_View Inline"), efhd_attachment_show }, + { E_POPUP_ITEM, (gchar *) "05.display.00", (gchar *) N_("_Hide"), efhd_attachment_show }, + { E_POPUP_ITEM, (gchar *) "05.display.01", (gchar *) N_("_Fit to Width"), efhd_image_fit, NULL, NULL, EM_POPUP_PART_IMAGE }, + { E_POPUP_ITEM, (gchar *) "05.display.01", (gchar *) N_("Show _Original Size"), efhd_image_unfit, NULL, NULL, EM_POPUP_PART_IMAGE }, }; static void @@ -1343,7 +1343,7 @@ efhd_attachment_image(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObjec GdkPixbuf *pixbuf; GtkTargetEntry drag_types[] = { { NULL, 0, 0 }, - { "text/uri-list", 0, 1 }, + { (gchar *) "text/uri-list", 0, 1 }, }; char *simple_type; diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 6d116a69ba..d0172ea8ef 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1176,40 +1176,40 @@ efh_image(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormatH } static EMFormatHandler type_builtin_table[] = { - { "image/gif", (EMFormatFunc)efh_image }, - { "image/jpeg", (EMFormatFunc)efh_image }, - { "image/png", (EMFormatFunc)efh_image }, - { "image/x-png", (EMFormatFunc)efh_image }, - { "image/tiff", (EMFormatFunc)efh_image }, - { "image/x-bmp", (EMFormatFunc)efh_image }, - { "image/bmp", (EMFormatFunc)efh_image }, - { "image/svg", (EMFormatFunc)efh_image }, - { "image/x-cmu-raster", (EMFormatFunc)efh_image }, - { "image/x-ico", (EMFormatFunc)efh_image }, - { "image/x-portable-anymap", (EMFormatFunc)efh_image }, - { "image/x-portable-bitmap", (EMFormatFunc)efh_image }, - { "image/x-portable-graymap", (EMFormatFunc)efh_image }, - { "image/x-portable-pixmap", (EMFormatFunc)efh_image }, - { "image/x-xpixmap", (EMFormatFunc)efh_image }, - { "text/enriched", (EMFormatFunc)efh_text_enriched }, - { "text/plain", (EMFormatFunc)efh_text_plain }, - { "text/html", (EMFormatFunc)efh_text_html }, - { "text/richtext", (EMFormatFunc)efh_text_enriched }, - { "text/*", (EMFormatFunc)efh_text_plain }, - { "message/external-body", (EMFormatFunc)efh_message_external }, - { "message/delivery-status", (EMFormatFunc)efh_message_deliverystatus }, - { "multipart/related", (EMFormatFunc)efh_multipart_related }, + { (gchar *) "image/gif", (EMFormatFunc)efh_image }, + { (gchar *) "image/jpeg", (EMFormatFunc)efh_image }, + { (gchar *) "image/png", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-png", (EMFormatFunc)efh_image }, + { (gchar *) "image/tiff", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-bmp", (EMFormatFunc)efh_image }, + { (gchar *) "image/bmp", (EMFormatFunc)efh_image }, + { (gchar *) "image/svg", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-cmu-raster", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-ico", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-portable-anymap", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-portable-bitmap", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-portable-graymap", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-portable-pixmap", (EMFormatFunc)efh_image }, + { (gchar *) "image/x-xpixmap", (EMFormatFunc)efh_image }, + { (gchar *) "text/enriched", (EMFormatFunc)efh_text_enriched }, + { (gchar *) "text/plain", (EMFormatFunc)efh_text_plain }, + { (gchar *) "text/html", (EMFormatFunc)efh_text_html }, + { (gchar *) "text/richtext", (EMFormatFunc)efh_text_enriched }, + { (gchar *) "text/*", (EMFormatFunc)efh_text_plain }, + { (gchar *) "message/external-body", (EMFormatFunc)efh_message_external }, + { (gchar *) "message/delivery-status", (EMFormatFunc)efh_message_deliverystatus }, + { (gchar *) "multipart/related", (EMFormatFunc)efh_multipart_related }, /* This is where one adds those busted, non-registered types, that some idiot mailer writers out there decide to pull out of their proverbials at random. */ - { "image/jpg", (EMFormatFunc)efh_image }, - { "image/pjpeg", (EMFormatFunc)efh_image }, + { (gchar *) "image/jpg", (EMFormatFunc)efh_image }, + { (gchar *) "image/pjpeg", (EMFormatFunc)efh_image }, /* special internal types */ - { "x-evolution/message/rfc822", (EMFormatFunc)efh_format_message } + { (gchar *) "x-evolution/message/rfc822", (EMFormatFunc)efh_format_message } }; static void @@ -1547,7 +1547,7 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab g_free(mhtml); } -static char *addrspec_hdrs[] = { +static const gchar *addrspec_hdrs[] = { "Sender", "From", "Reply-To", "To", "Cc", "Bcc", "Resent-Sender", "Resent-From", "Resent-Reply-To", "Resent-To", "Resent-Cc", "Resent-Bcc", NULL @@ -1967,7 +1967,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) if (!use_header) use_header = header; - xmailer.name = "X-Evolution-Mailer"; + xmailer.name = (gchar *) "X-Evolution-Mailer"; xmailer.value = use_header->value; mailer_shown = TRUE; diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index 49c546863a..40e69022d1 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -197,7 +197,7 @@ emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const char *l g_free (mhtml); } -static char *addrspec_hdrs[] = { +static const gchar *addrspec_hdrs[] = { "Sender", "From", "Reply-To", "To", "Cc", "Bcc", "Resent-Sender", "Resent-from", "Resent-Reply-To", "Resent-To", "Resent-cc", "Resent-Bcc", NULL @@ -548,18 +548,18 @@ emfq_ignore(EMFormat *emf, CamelStream *stream, CamelMimePart *part, EMFormatHan } static EMFormatHandler type_builtin_table[] = { - { "text/plain",(EMFormatFunc)emfq_text_plain }, - { "text/enriched",(EMFormatFunc)emfq_text_enriched }, - { "text/richtext",(EMFormatFunc)emfq_text_enriched }, - { "text/html",(EMFormatFunc)emfq_text_html }, -/* { "multipart/related",(EMFormatFunc)emfq_multipart_related },*/ - { "message/external-body", (EMFormatFunc)emfq_ignore }, - { "multipart/appledouble", (EMFormatFunc)emfq_ignore }, + { (gchar *) "text/plain", (EMFormatFunc)emfq_text_plain }, + { (gchar *) "text/enriched", (EMFormatFunc)emfq_text_enriched }, + { (gchar *) "text/richtext", (EMFormatFunc)emfq_text_enriched }, + { (gchar *) "text/html", (EMFormatFunc)emfq_text_html }, +/* { (gchar *) "multipart/related",(EMFormatFunc)emfq_multipart_related },*/ + { (gchar *) "message/external-body", (EMFormatFunc)emfq_ignore }, + { (gchar *) "multipart/appledouble", (EMFormatFunc)emfq_ignore }, /* internal evolution types */ - { "x-evolution/evolution-rss-feed", (EMFormatFunc)emfq_text_html }, - { "x-evolution/message/rfc822", (EMFormatFunc)emfq_format_message }, - { "x-evolution/message/prefix", (EMFormatFunc)emfq_format_message_prefix }, + { (gchar *) "x-evolution/evolution-rss-feed", (EMFormatFunc)emfq_text_html }, + { (gchar *) "x-evolution/message/rfc822", (EMFormatFunc)emfq_format_message }, + { (gchar *) "x-evolution/message/prefix", (EMFormatFunc)emfq_format_message_prefix }, }; static void diff --git a/mail/em-format.c b/mail/em-format.c index 826ef11b63..b2360bb2fc 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -85,6 +85,8 @@ enum { EMF_LAST_SIGNAL }; +extern CamelSession *session; + static guint emf_signals[EMF_LAST_SIGNAL]; static GObjectClass *emf_parent; @@ -220,7 +222,7 @@ em_format_class_add_handler(EMFormatClass *emfc, EMFormatHandler *info) { d(printf("adding format handler to '%s' '%s'\n", g_type_name_from_class((GTypeClass *)emfc), info->mime_type)); info->old = g_hash_table_lookup(emfc->type_handlers, info->mime_type); - g_hash_table_insert(emfc->type_handlers, info->mime_type, info); + g_hash_table_insert(emfc->type_handlers, (gpointer) info->mime_type, info); } struct _class_handlers { @@ -274,7 +276,7 @@ em_format_class_remove_handler(EMFormatClass *emfc, EMFormatHandler *info) if (current == info) { current = info->old; if (current) - g_hash_table_insert(emfc->type_handlers, current->mime_type, current); + g_hash_table_insert(emfc->type_handlers, (gpointer) current->mime_type, current); else g_hash_table_remove(emfc->type_handlers, info->mime_type); } else { @@ -1213,7 +1215,6 @@ emf_application_xpkcs7mime(EMFormat *emf, CamelStream *stream, CamelMimePart *pa { CamelCipherContext *context; CamelException *ex; - extern CamelSession *session; CamelMimePart *opart; CamelCipherValidity *valid; struct _EMFormatCache *emfc; @@ -1494,8 +1495,9 @@ emf_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c if (puri->func == emf_write_related) { g_string_printf(emf->part_id, "%s", puri->part_id); em_format_part(emf, stream, puri->part); - } else + } else { d(printf("unreferenced uri generated by format code: %s\n", puri->uri?puri->uri:puri->cid)); + } } puri = purin; purin = purin->next; @@ -1732,28 +1734,28 @@ emf_inlinepgp_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart static EMFormatHandler type_builtin_table[] = { #ifdef ENABLE_SMIME - { "application/x-pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION }, + { (gchar *) "application/x-pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION }, #endif - { "multipart/alternative", emf_multipart_alternative }, - { "multipart/appledouble", emf_multipart_appledouble }, - { "multipart/encrypted", emf_multipart_encrypted }, - { "multipart/mixed", emf_multipart_mixed }, - { "multipart/signed", emf_multipart_signed }, - { "multipart/related", emf_multipart_related }, - { "multipart/*", emf_multipart_mixed }, - { "message/rfc822", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, - { "message/news", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, - { "message/delivery-status", emf_message_deliverystatus }, - { "message/*", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, + { (gchar *) "multipart/alternative", emf_multipart_alternative }, + { (gchar *) "multipart/appledouble", emf_multipart_appledouble }, + { (gchar *) "multipart/encrypted", emf_multipart_encrypted }, + { (gchar *) "multipart/mixed", emf_multipart_mixed }, + { (gchar *) "multipart/signed", emf_multipart_signed }, + { (gchar *) "multipart/related", emf_multipart_related }, + { (gchar *) "multipart/*", emf_multipart_mixed }, + { (gchar *) "message/rfc822", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, + { (gchar *) "message/news", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, + { (gchar *) "message/delivery-status", emf_message_deliverystatus }, + { (gchar *) "message/*", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, /* Insert brokenly-named parts here */ #ifdef ENABLE_SMIME - { "application/pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION }, + { (gchar *) "application/pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION }, #endif /* internal types */ - { "application/x-inlinepgp-signed", (EMFormatFunc)emf_inlinepgp_signed }, - { "application/x-inlinepgp-encrypted", (EMFormatFunc)emf_inlinepgp_encrypted }, + { (gchar *) "application/x-inlinepgp-signed", (EMFormatFunc)emf_inlinepgp_signed }, + { (gchar *) "application/x-inlinepgp-encrypted", (EMFormatFunc)emf_inlinepgp_encrypted }, }; static void @@ -1762,5 +1764,5 @@ emf_builtin_init(EMFormatClass *klass) int i; for (i=0;itype_handlers, type_builtin_table[i].mime_type, &type_builtin_table[i]); + g_hash_table_insert(klass->type_handlers, (gpointer) type_builtin_table[i].mime_type, &type_builtin_table[i]); } diff --git a/mail/em-format.h b/mail/em-format.h index f11e73937a..ce3d522ab0 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -85,7 +85,7 @@ typedef enum _em_format_mode_t { * **/ struct _EMFormatHandler { - char *mime_type; + gchar *mime_type; EMFormatFunc handler; guint32 flags; diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index 9784f480b8..bb786752e5 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -388,7 +388,7 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data) while (node) { char *test; int len = strlen (name); - test = strncmp (node->data, name, len) == 0 ? node->data+len:NULL; + test = strncmp (node->data, name, len) == 0 ? (gchar *) node->data+len:NULL; if (test) { test++; @@ -1020,22 +1020,22 @@ emmp_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str /* plugin meta-data */ static EMConfigItem emmp_items[] = { - { E_CONFIG_BOOK, "", "preferences_toplevel", emmp_widget_glade }, - { E_CONFIG_PAGE, "00.general", "vboxGeneral", emmp_widget_glade }, - { E_CONFIG_SECTION, "00.general/00.fonts", "vboxMessageFonts", emmp_widget_glade }, - { E_CONFIG_SECTION, "00.general/10.display", "vboxMessageDisplay", emmp_widget_glade }, - { E_CONFIG_SECTION, "00.general/20.delete", "vboxDeletingMail", emmp_widget_glade }, - { E_CONFIG_SECTION, "00.general/30.newmail", "vboxNewMailNotify", emmp_widget_glade }, - { E_CONFIG_PAGE, "10.html", "vboxHtmlMail", emmp_widget_glade }, - { E_CONFIG_SECTION, "10.html/00.general", "vbox173", emmp_widget_glade }, - { E_CONFIG_SECTION, "10.html/10.images", "vbox190", emmp_widget_glade }, - { E_CONFIG_PAGE, "20.labels", "frameColours", emmp_widget_glade }, + { E_CONFIG_BOOK, (gchar *) "", (gchar *) "preferences_toplevel", emmp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxGeneral", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/00.fonts", (gchar *) "vboxMessageFonts", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/10.display", (gchar *) "vboxMessageDisplay", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/20.delete", (gchar *) "vboxDeletingMail", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/30.newmail", (gchar *) "vboxNewMailNotify", emmp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "10.html", (gchar *) "vboxHtmlMail", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.html/00.general", (gchar *) "vbox173", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.html/10.images", (gchar *) "vbox190", emmp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "20.labels", (gchar *) "frameColours", emmp_widget_glade }, /* this is a table, so we can't use it { E_CONFIG_SECTION, "20.labels/00.labels", "tableColours", emmp_widget_glade }, */ - { E_CONFIG_PAGE, "30.headers", "vboxHeaderTab", emmp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "30.headers", (gchar *) "vboxHeaderTab", emmp_widget_glade }, /* no subvbox for section { E_CONFIG_PAGE, "30.headers/00.headers", "vbox199", emmp_widget_glade }, */ - { E_CONFIG_PAGE, "40.junk", "vbox161", emmp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "40.junk", (gchar *) "vbox161", emmp_widget_glade }, /* no subvbox for section { E_CONFIG_SECTION, "40.junk/00.general", xxx, emmp_widget_glade } */ - { E_CONFIG_SECTION, "40.junk/10.options", "vbox204", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "40.junk/10.options", (gchar *) "vbox204", emmp_widget_glade }, }; static void @@ -1261,7 +1261,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) prefs->font_fixed = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontFixed")); gtk_font_button_set_font_name (prefs->font_fixed, font); g_free (font); - g_object_set_data ((GObject *) prefs->font_fixed, "key", "/apps/evolution/mail/display/fonts/monospace"); + g_object_set_data ((GObject *) prefs->font_fixed, "key", (gpointer) "/apps/evolution/mail/display/fonts/monospace"); g_signal_connect (prefs->font_fixed, "font-set", G_CALLBACK (font_changed), prefs); if (!gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/display/fonts/monospace", NULL)) gtk_widget_set_sensitive ((GtkWidget *) prefs->font_fixed, FALSE); @@ -1270,7 +1270,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) prefs->font_variable = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontVariable")); gtk_font_button_set_font_name (prefs->font_variable, font); g_free (font); - g_object_set_data ((GObject *) prefs->font_variable, "key", "/apps/evolution/mail/display/fonts/variable"); + g_object_set_data ((GObject *) prefs->font_variable, "key", (gpointer) "/apps/evolution/mail/display/fonts/variable"); g_signal_connect (prefs->font_variable, "font-set", G_CALLBACK (font_changed), prefs); if (!gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/display/fonts/variable", NULL)) gtk_widget_set_sensitive ((GtkWidget *) prefs->font_variable, FALSE); diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 315ed208f0..974c8b97a8 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -359,7 +359,7 @@ parse_lsub (const char *lsub, char *dir_sep) static int comp; static regex_t pat; regmatch_t match[3]; - char *m = "^\\* LSUB \\([^)]*\\) \"?([^\" ]+)\"? \"?(.*)\"?$"; + const gchar *m = "^\\* LSUB \\([^)]*\\) \"?([^\" ]+)\"? \"?(.*)\"?$"; if (!comp) { if (regcomp (&pat, m, REG_EXTENDED|REG_ICASE) == -1) { @@ -952,8 +952,8 @@ static e_gconf_map_list_t gconf_remap_list[] = { }; static struct { - char *label; - char *colour; + const gchar *label; + const gchar *colour; } label_default[5] = { { N_("Important"), "#EF2929" }, /* red */ { N_("Work"), "#F57900" }, /* orange */ @@ -1285,7 +1285,7 @@ get_local_et_expanded (const char *dirname) static char * get_local_store_uri (const char *dirname, char **namep, int *indexp) { - char *protocol, *name, *metadata, *tmp; + gchar *name, *protocol, *metadata, *tmp; int index; struct stat st; xmlNodePtr node; @@ -1296,8 +1296,8 @@ get_local_store_uri (const char *dirname, char **namep, int *indexp) /* in 1.4, any errors are treated as defaults, this function cannot fail */ /* defaults */ - name = "mbox"; - protocol = "mbox"; + name = (gchar *) "mbox"; + protocol = (gchar *) "mbox"; index = TRUE; if (stat (metadata, &st) == -1 || !S_ISREG (st.st_mode)) @@ -1555,7 +1555,7 @@ em_migrate_folder(EMMigrateSession *session, const char *dirname, const char *fu /* Manually copy local mbox files, its much faster */ if (!strncmp (uri, "mbox:", 5)) { - static char *meta_ext[] = { ".summary", ".ibex.index", ".ibex.index.data" }; + static const gchar *meta_ext[] = { ".summary", ".ibex.index", ".ibex.index.data" }; size_t slen, dlen; FILE *fp; char *p; diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c index ef711ac251..01fbd87547 100644 --- a/mail/em-network-prefs.c +++ b/mail/em-network-prefs.c @@ -271,9 +271,9 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data) /* plugin meta-data */ static EMConfigItem emnp_items[] = { - { E_CONFIG_BOOK, "", "network_preferences_toplevel", emnp_widget_glade }, - { E_CONFIG_PAGE, "00.general", "vboxGeneral", emnp_widget_glade }, - { E_CONFIG_SECTION, "00.general/00.proxy", "frameProxy", emnp_widget_glade }, + { E_CONFIG_BOOK, (gchar *) "", (gchar *) "network_preferences_toplevel", emnp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxGeneral", emnp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/00.proxy", (gchar *) "frameProxy", emnp_widget_glade }, }; static void @@ -401,19 +401,26 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) /* Manual proxy options */ g_signal_connect (prefs->http_host, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTP_HOST_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_HTTP_HOST_KEY); g_signal_connect (prefs->https_host, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTPS_HOST_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_HTTPS_HOST_KEY); g_signal_connect (prefs->ignore_hosts, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_IGNORE_HOSTS_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_IGNORE_HOSTS_KEY); g_signal_connect (prefs->http_port, "value_changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTP_PORT_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_HTTP_PORT_KEY); g_signal_connect (prefs->https_port, "value_changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTPS_PORT_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_HTTPS_PORT_KEY); g_signal_connect (prefs->auth_user, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_AUTH_USER_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_AUTH_USER_KEY); g_signal_connect (prefs->auth_pwd, "changed", - G_CALLBACK(widget_entry_changed_cb), GCONF_E_AUTH_PWD_KEY); + G_CALLBACK(widget_entry_changed_cb), + (gpointer) GCONF_E_AUTH_PWD_KEY); gtk_toggle_button_set_active (prefs->manual_proxy, val == NETWORK_PROXY_MANUAL); g_signal_connect (prefs->sys_proxy, "toggled", G_CALLBACK (notify_proxy_type_changed), prefs); diff --git a/mail/em-popup.c b/mail/em-popup.c index 192ab7ac7b..88aadf7ba7 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -491,17 +491,17 @@ emp_part_popup_forward (EPopup *ep, EPopupItem *item, void *data) } static EMPopupItem emp_standard_object_popups[] = { - { E_POPUP_ITEM, "00.part.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "document-save-as", 0 }, - { E_POPUP_ITEM, "00.part.10", N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_PART_IMAGE }, - { E_POPUP_BAR, "10.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, - { E_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "mail-reply-sender" , EM_POPUP_PART_MESSAGE }, - { E_POPUP_ITEM, "10.part.01", N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_PART_MESSAGE}, - { E_POPUP_ITEM, "10.part.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_PART_MESSAGE}, - { E_POPUP_BAR, "20.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, - { E_POPUP_ITEM, "20.part.00", N_("_Forward"), emp_part_popup_forward, NULL, "mail-forward", EM_POPUP_PART_MESSAGE }, + { E_POPUP_ITEM, (gchar *) "00.part.00", (gchar *) N_("_Save As..."), emp_part_popup_saveas, NULL, (gchar *) "document-save-as", 0 }, + { E_POPUP_ITEM, (gchar *) "00.part.10", (gchar *) N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_PART_IMAGE }, + { E_POPUP_BAR, (gchar *) "10.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, + { E_POPUP_ITEM, (gchar *) "10.part.00", (gchar *) N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, (gchar *) "mail-reply-sender" , EM_POPUP_PART_MESSAGE }, + { E_POPUP_ITEM, (gchar *) "10.part.01", (gchar *) N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_PART_MESSAGE}, + { E_POPUP_ITEM, (gchar *) "10.part.03", (gchar *) N_("Reply to _All"), emp_part_popup_reply_all, NULL, (gchar *) "mail-reply-all", EM_POPUP_PART_MESSAGE}, + { E_POPUP_BAR, (gchar *) "20.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, + { E_POPUP_ITEM, (gchar *) "20.part.00", (gchar *) N_("_Forward"), emp_part_popup_forward, NULL, (gchar *) "mail-forward", EM_POPUP_PART_MESSAGE }, }; -static const EPopupItem emp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" }; +static const EPopupItem emp_standard_part_apps_bar = { E_POPUP_BAR, (gchar *) "99.object" }; /* ********************************************************************** */ @@ -542,9 +542,9 @@ emp_uri_popup_address_add(EPopup *ep, EPopupItem *item, void *data) } static EPopupItem emp_standard_uri_popups[] = { - { E_POPUP_ITEM, "00.uri.00", N_("_Open Link in Browser"), emp_uri_popup_link_open, NULL, NULL, EM_POPUP_URI_HTTP }, - { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "mail-message-new", EM_POPUP_URI_MAILTO }, - { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "contact-new", EM_POPUP_URI_MAILTO }, + { E_POPUP_ITEM, (gchar *) "00.uri.00", (gchar *) N_("_Open Link in Browser"), emp_uri_popup_link_open, NULL, NULL, EM_POPUP_URI_HTTP }, + { E_POPUP_ITEM, (gchar *) "00.uri.10", (gchar *) N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, (gchar *) "mail-message-new", EM_POPUP_URI_MAILTO }, + { E_POPUP_ITEM, (gchar *) "00.uri.20", (gchar *) N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, (gchar *) "contact-new", EM_POPUP_URI_MAILTO }, }; /* ********************************************************************** */ @@ -743,11 +743,11 @@ emp_standard_menu_factory(EPopup *emp, void *data) item = g_malloc0 (sizeof (*item)); item->type = E_POPUP_ITEM; - item->path = "00.00.vcf.00"; /* make it first item */ + item->path = (gchar *) "00.00.vcf.00"; /* make it first item */ item->label = _("_Add to Address Book"); item->activate = emp_add_vcard; item->user_data = NULL; - item->image = "contact-new"; + item->image = (gchar *) "contact-new"; e_popup_add_items (emp, g_slist_append (NULL, item), NULL, NULL, NULL); } diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 9842e32d0e..fa68af1776 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -210,8 +210,9 @@ sub_folder_done (struct _zsubscribe_msg *m) gtk_tree_model_get(model, &iter, 0, &subscribed, 2, &node, -1); if (node == m->node) gtk_tree_store_set((GtkTreeStore *)model, &iter, 0, issub, -1); - else + else { d(printf("node mismatch, or subscribe state changed failed\n")); + } } /* queue any further ones, or if out, update the ui */ diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index a777faaefe..bddb08f75e 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -260,7 +260,7 @@ xml_encode(FilterRule *fr) node = FILTER_RULE_CLASS(parent_class)->xml_encode(fr); g_return_val_if_fail (node != NULL, NULL); - g_return_val_if_fail (vr->with >= 0 && vr->with < sizeof(with_names)/sizeof(with_names[0]), NULL); + g_return_val_if_fail (vr->with < sizeof(with_names)/sizeof(with_names[0]), NULL); set = xmlNewNode(NULL, (const unsigned char *)"sources"); xmlAddChild(node, set); @@ -383,7 +383,7 @@ static void source_add(GtkWidget *widget, struct _source_data *data); static void source_remove(GtkWidget *widget, struct _source_data *data); static struct { - char *name; + const gchar *name; GCallback func; } edit_buttons[] = { { "source_add", G_CALLBACK(source_add) }, @@ -430,7 +430,7 @@ select_source_with_changed(GtkWidget *widget, struct _source_data *data) break; } - if ( with < EM_VFOLDER_RULE_WITH_SPECIFIC || with > EM_VFOLDER_RULE_WITH_LOCAL ) + if (with > EM_VFOLDER_RULE_WITH_LOCAL ) with = 0; gtk_widget_set_sensitive (data->source_selector, !with ); diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 25b5648949..9029d705a0 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -8,8 +8,6 @@ INCLUDES = -I.. \ -I$(srcdir)/.. \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-mail-importer\" \ - -I$(top_srcdir)/addressbook/backend \ - -I$(top_builddir)/addressbook/backend \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(IMPORTERS_CFLAGS) diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index 4144deba98..c01c3ab51f 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -85,7 +85,7 @@ int mail_importer_import_mbox(const char *path, const char *folderuri, struct _C void mail_importer_import_mbox_sync(const char *path, const char *folderuri, struct _CamelOperation *cancel); struct _MailImporterSpecial { - char *orig, *new; + const gchar *orig, *new; }; typedef struct _MailImporterSpecial MailImporterSpecial; diff --git a/mail/mail-component.c b/mail/mail-component.c index 7d7547cb53..2fd85ec5a5 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -104,6 +104,8 @@ static void view_changed_timeout_remove (EComponentView *component_view); #define MAIL_COMPONENT_DEFAULT(mc) if (mc == NULL) mc = mail_component_peek(); +extern int camel_application_is_exiting; + #define PARENT_TYPE evolution_component_get_type () static BonoboObjectClass *parent_class = NULL; const char *x_mailer = "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT; @@ -158,7 +160,7 @@ struct _MailComponentPrivate { /* indexed by _mail_component_folder_t */ static struct { - char *name; + const gchar *name; char *uri; CamelFolder *folder; } mc_default_folders[] = { @@ -863,7 +865,6 @@ impl_quit(PortableServer_Servant servant, CORBA_Environment *ev) mail_config_prune_proxies (); switch (mc->priv->quit_state) { case MC_QUIT_START: { - extern int camel_application_is_exiting; int now = time(NULL)/60/60/24, days; gboolean empty_junk; @@ -925,20 +926,20 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment CORBA_sequence_set_release (list, FALSE); - list->_buffer[0].id = "message"; + list->_buffer[0].id = (char *) "message"; list->_buffer[0].description = _("New Mail Message"); list->_buffer[0].menuDescription = (char *) C_("New", "_Mail Message"); list->_buffer[0].tooltip = _("Compose a new mail message"); list->_buffer[0].menuShortcut = 'm'; - list->_buffer[0].iconName = "mail-message-new"; + list->_buffer[0].iconName = (char *) "mail-message-new"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[1].id = "folder"; + list->_buffer[1].id = (char *) "folder"; list->_buffer[1].description = _("New Mail Folder"); list->_buffer[1].menuDescription = (char *) C_("New", "Mail _Folder"); list->_buffer[1].tooltip = _("Create a new mail folder"); list->_buffer[1].menuShortcut = '\0'; - list->_buffer[1].iconName = "folder-new"; + list->_buffer[1].iconName = (char *) "folder-new"; list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER; return list; @@ -1102,7 +1103,6 @@ mc_sync_store_done (CamelStore *store, void *data) static void mc_sync_store (gpointer key, gpointer value, gpointer user_data) { - extern int camel_application_is_exiting; MailComponent *mc = (MailComponent *) user_data; mc->priv->mail_sync_in_progress++; @@ -1116,7 +1116,6 @@ mc_sync_store (gpointer key, gpointer value, gpointer user_data) static gboolean call_mail_sync (gpointer user_data) { - extern int camel_application_is_exiting; MailComponent *mc = (MailComponent *)user_data; if (camel_application_is_exiting) diff --git a/mail/mail-config.c b/mail/mail-config.c index 5fa562e399..62f6ba6eb3 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -105,10 +105,11 @@ typedef struct { gboolean scripts_disabled; } MailConfig; +extern int camel_header_param_encode_filenames_in_rfc_2047; + static MailConfig *config = NULL; static guint config_write_timeout = 0; - void mail_config_save_accounts (void) { @@ -251,8 +252,6 @@ static void gconf_outlook_filenames_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data) { - extern int camel_header_param_encode_filenames_in_rfc_2047; - g_return_if_fail (client != NULL); /* pass option to the camel */ @@ -992,12 +991,13 @@ mail_config_uri_renamed (GCompareFunc uri_cmp, const char *old, const char *new) EIterator *iter; int i, work = 0; char *oldname, *newname; - char *cachenames[] = { "config/hidestate-", - "config/et-expanded-", - "config/et-header-", - "*views/current_view-", - "*views/custom_view-", - NULL }; + const gchar *cachenames[] = { + "config/hidestate-", + "config/et-expanded-", + "config/et-header-", + "*views/current_view-", + "*views/custom_view-", + NULL }; iter = e_list_get_iterator ((EList *) config->accounts); while (e_iterator_is_valid (iter)) { diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 24628a5f91..d2183dd7e3 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -97,7 +97,7 @@ struct _fetch_mail_msg { char *source_uri; - void (*done)(char *source, void *data); + void (*done)(const char *source, void *data); void *data; }; @@ -400,7 +400,7 @@ void mail_fetch_mail (const char *source, int keep, const char *type, CamelOperation *cancel, CamelFilterGetFolderFunc get_folder, void *get_data, CamelFilterStatusFunc *status, void *status_data, - void (*done)(char *source, void *data), void *data) + void (*done)(const char *source, void *data), void *data) { struct _fetch_mail_msg *m; struct _filter_mail_msg *fm; @@ -429,13 +429,13 @@ mail_fetch_mail (const char *source, int keep, const char *type, CamelOperation /* sending stuff */ /* ** SEND MAIL *********************************************************** */ -static char *normal_recipients[] = { +static const gchar *normal_recipients[] = { CAMEL_RECIPIENT_TYPE_TO, CAMEL_RECIPIENT_TYPE_CC, CAMEL_RECIPIENT_TYPE_BCC }; -static char *resent_recipients[] = { +static const gchar *resent_recipients[] = { CAMEL_RECIPIENT_TYPE_RESENT_TO, CAMEL_RECIPIENT_TYPE_RESENT_CC, CAMEL_RECIPIENT_TYPE_RESENT_BCC @@ -665,7 +665,7 @@ struct _send_queue_msg { CamelFilterStatusFunc *status; void *status_data; - void (*done)(char *destination, void *data); + void (*done)(const char *destination, void *data); void *data; }; @@ -832,7 +832,7 @@ mail_send_queue(CamelFolder *queue, const char *destination, const char *type, CamelOperation *cancel, CamelFilterGetFolderFunc get_folder, void *get_data, CamelFilterStatusFunc *status, void *status_data, - void (*done)(char *destination, void *data), void *data) + void (*done)(const char *destination, void *data), void *data) { struct _send_queue_msg *m; diff --git a/mail/mail-ops.h b/mail/mail-ops.h index 9ee3899242..df92df4e32 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -135,14 +135,14 @@ void mail_send_queue (CamelFolder *queue, const char *destination, const char *type, CamelOperation *cancel, CamelFilterGetFolderFunc get_folder, void *get_data, CamelFilterStatusFunc *status, void *status_data, - void (*done)(char *destination, void *data), + void (*done)(const char *destination, void *data), void *data); void mail_fetch_mail (const char *source, int keep, const char *type, CamelOperation *cancel, CamelFilterGetFolderFunc get_folder, void *get_data, CamelFilterStatusFunc *status, void *status_data, - void (*done)(char *source, void *data), + void (*done)(const char *source, void *data), void *data); void mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids, diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 0b81fca5ed..655f1dbf72 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -559,7 +559,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati info->state = SEND_ACTIVE; info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); - g_hash_table_insert (data->active, SEND_URI_KEY, info); + g_hash_table_insert (data->active, (gpointer) SEND_URI_KEY, info); list = g_list_prepend (list, info); } else if (info->timeout_id == 0) info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); @@ -673,7 +673,7 @@ receive_status (CamelFilterDriver *driver, enum camel_filter_status_t status, in /* when receive/send is complete */ static void -receive_done (char *uri, void *data) +receive_done (const gchar *uri, void *data) { struct _send_info *info = data; @@ -1204,7 +1204,7 @@ mail_send (void) d(printf("Adding new info %p\n", info)); - g_hash_table_insert (data->active, SEND_URI_KEY, info); + g_hash_table_insert (data->active, (gpointer) SEND_URI_KEY, info); /* todo, store the folder in info? */ outbox_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_OUTBOX); diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 5ba3f17427..d6b20580b2 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -966,8 +966,9 @@ vfolder_load_storage(void) if (rule->name) { d(printf("rule added: %s\n", rule->name)); context_rule_added((RuleContext *)context, rule); - } else + } else { d(printf("invalid rule (%p) encountered: rule->name is NULL\n", rule)); + } } g_free(storeuri); diff --git a/mail/message-list.c b/mail/message-list.c index 1fc0a9a09a..f9a0e9259b 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -114,7 +114,7 @@ struct _MessageListPrivate { }; static struct { - char *target; + const gchar *target; GdkAtom atom; guint32 actions; } ml_drag_info[] = { @@ -131,15 +131,15 @@ enum { /* What we send */ static GtkTargetEntry ml_drag_types[] = { - { "x-uid-list", 0, DND_X_UID_LIST }, - { "text/uri-list", 0, DND_TEXT_URI_LIST }, + { (gchar *) "x-uid-list", 0, DND_X_UID_LIST }, + { (gchar *) "text/uri-list", 0, DND_TEXT_URI_LIST }, }; /* What we accept */ static GtkTargetEntry ml_drop_types[] = { - { "x-uid-list", 0, DND_X_UID_LIST }, - { "message/rfc822", 0, DND_MESSAGE_RFC822 }, - { "text/uri-list", 0, DND_TEXT_URI_LIST }, + { (gchar *) "x-uid-list", 0, DND_X_UID_LIST }, + { (gchar *) "message/rfc822", 0, DND_MESSAGE_RFC822 }, + { (gchar *) "text/uri-list", 0, DND_TEXT_URI_LIST }, }; /* @@ -214,8 +214,8 @@ enum { static guint message_list_signals [LAST_SIGNAL] = {0, }; static struct { - char *icon_name; - GdkPixbuf *pixbuf; + const gchar *icon_name; + GdkPixbuf *pixbuf; } states_pixmaps[] = { { "mail-unread", NULL }, { "mail-read", NULL }, @@ -1189,7 +1189,7 @@ sanitize_recipients (const gchar *string) char **name; if (!string || !*string) - return ""; + return (gchar *) ""; gstring = g_string_new (""); @@ -2102,10 +2102,10 @@ ml_drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data) } static EPopupItem ml_drop_popup_menu[] = { - { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), ml_drop_popup_copy, NULL, "folder-copy", 0 }, - { E_POPUP_ITEM, "00.emc.03", N_("_Move"), ml_drop_popup_move, NULL, "folder-move", 0 }, - { E_POPUP_BAR, "10.emc" }, - { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), ml_drop_popup_cancel, NULL, NULL, 0 }, + { E_POPUP_ITEM, (gchar *) "00.emc.02", (gchar *) N_("_Copy"), ml_drop_popup_copy, NULL, (gchar *) "folder-copy", 0 }, + { E_POPUP_ITEM, (gchar *) "00.emc.03", (gchar *) N_("_Move"), ml_drop_popup_move, NULL, (gchar *) "folder-move", 0 }, + { E_POPUP_BAR, (gchar *) "10.emc" }, + { E_POPUP_ITEM, (gchar *) "99.emc.00", (gchar *) N_("Cancel _Drag"), ml_drop_popup_cancel, NULL, NULL, 0 }, }; static void @@ -3993,7 +3993,7 @@ regen_list_exec (struct _regen_list_msg *m) CamelMessageInfo *info; ETreePath cursor; int i; - char *expr = NULL; + gchar *expr = NULL; if (m->folder != m->ml->folder) return; @@ -4014,13 +4014,13 @@ regen_list_exec (struct _regen_list_msg *m) expr = alloca(strlen(m->search) + 92); sprintf(expr, "(and (match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\"))))\n %s)", m->search); } else - expr = "(match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\"))))"; + expr = (gchar *) "(match-all (and (not (system-flag \"deleted\")) (not (system-flag \"junk\"))))"; } else { if (m->search) { expr = alloca(strlen(m->search) + 64); sprintf(expr, "(and (match-all (not (system-flag \"deleted\")))\n %s)", m->search); } else - expr = "(match-all (not (system-flag \"deleted\")))"; + expr = (gchar *) "(match-all (not (system-flag \"deleted\")))"; } } else { if (m->hidejunk) { @@ -4028,7 +4028,7 @@ regen_list_exec (struct _regen_list_msg *m) expr = alloca(strlen(m->search) + 64); sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); } else - expr = "(match-all (not (system-flag \"junk\")))"; + expr = (gchar *) "(match-all (not (system-flag \"junk\")))"; } else { expr = m->search; } diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index 2ddd372257..46b6268cc3 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -51,7 +51,7 @@ static void set_tag_list (MessageTagEditor *editor, CamelTag *tags); #define DEFAULT_FLAG 2 /* Follow-Up */ -static char *available_flags[] = { +static const gchar *available_flags[] = { N_("Call"), N_("Do Not Forward"), N_("Follow-Up"), diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index c2b23f6c3f..107739e5bf 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -204,7 +204,7 @@ e_table_extras_add_cell (ETableExtras *extras, ECell * e_table_extras_get_cell (ETableExtras *extras, - char *id) + const gchar *id) { return g_hash_table_lookup(extras->cells, id); } diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h index e096e516f4..a7efcd8225 100644 --- a/widgets/table/e-table-extras.h +++ b/widgets/table/e-table-extras.h @@ -57,7 +57,7 @@ void e_table_extras_add_cell (ETableExtras *extras, const gchar *id, ECell *cell); ECell *e_table_extras_get_cell (ETableExtras *extras, - char *id); + const gchar *id); void e_table_extras_add_compare (ETableExtras *extras, const gchar *id, -- cgit v1.2.3 From ffa17ed195a6bbb40d386fb572b7941e22f47f8d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 13:20:45 -0400 Subject: Fix compiler warnings in plugins. --- a11y/calendar/ea-cal-view-event.c | 5 +- a11y/calendar/ea-day-view-main-item.c | 2 +- a11y/calendar/ea-jump-button.c | 2 +- devel-docs/camel/Makefile.am | 2 +- plugins/audio-inline/audio-inline.c | 2 +- plugins/backup-restore/backup.c | 25 +++++----- plugins/bbdb/bbdb.c | 1 - plugins/bbdb/gaimbuddies.c | 4 -- plugins/bogo-junk-plugin/bf-junk-filter.c | 20 ++++---- plugins/email-custom-header/Makefile.am | 1 - plugins/email-custom-header/email-custom-header.c | 4 +- .../exchange-operations/exchange-account-setup.c | 24 +++++----- .../exchange-operations/exchange-config-listener.c | 6 +-- .../exchange-operations/exchange-delegates-user.c | 13 +++-- .../exchange-folder-permission.c | 2 +- .../exchange-folder-subscription.c | 6 +-- .../exchange-folder-subscription.h | 2 +- plugins/exchange-operations/exchange-folder.c | 21 ++++---- plugins/exchange-operations/exchange-operations.c | 38 ++++++++------- plugins/face/Makefile.am | 1 - .../groupwise-account-setup/camel-gw-listener.c | 4 +- plugins/groupwise-features/Makefile.am | 1 - plugins/groupwise-features/junk-mail-settings.c | 2 +- plugins/groupwise-features/junk-settings.c | 17 +++++-- plugins/groupwise-features/mail-retract.c | 4 +- plugins/groupwise-features/process-meeting.c | 8 ++-- plugins/groupwise-features/proxy-login.c | 8 ++-- plugins/groupwise-features/proxy.c | 3 +- plugins/groupwise-features/proxy.h | 1 - plugins/groupwise-features/send-options.c | 7 ++- plugins/groupwise-features/share-folder-common.c | 4 +- plugins/groupwise-features/share-folder.c | 14 ++++-- plugins/groupwise-features/share-folder.h | 4 +- plugins/groupwise-features/status-track.c | 2 +- plugins/imap-features/Makefile.am | 1 - plugins/itip-formatter/itip-formatter.c | 3 +- plugins/itip-formatter/itip-view.c | 5 +- .../mail-account-disable/mail-account-disable.c | 4 +- plugins/mark-all-read/Makefile.am | 1 - plugins/publish-calendar/url-editor-dialog.c | 3 +- plugins/sa-junk-plugin/em-junk-filter.c | 56 ++++++++++++---------- plugins/save-calendar/csv-format.c | 2 +- plugins/startup-wizard/startup-wizard.c | 2 +- plugins/templates/templates.c | 4 +- widgets/e-timezone-dialog/e-timezone-dialog.c | 7 +-- 45 files changed, 186 insertions(+), 162 deletions(-) (limited to 'widgets') diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c index 49cf525511..7b7e8eaa92 100644 --- a/a11y/calendar/ea-cal-view-event.c +++ b/a11y/calendar/ea-cal-view-event.c @@ -247,7 +247,10 @@ ea_cal_view_event_get_name (AtkObject *accessible) GObject *g_obj; ECalendarViewEvent *event; gchar *name_string; - gchar *alarm_string, *recur_string, *meeting_string, *summary_string; + const gchar *alarm_string; + const gchar *recur_string; + const gchar *meeting_string; + gchar *summary_string; const char *summary; diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c index 55602e5d92..aeaf1d105c 100644 --- a/a11y/calendar/ea-day-view-main-item.c +++ b/a11y/calendar/ea-day-view-main-item.c @@ -543,7 +543,7 @@ ea_day_view_main_item_get_row_label (EaDayViewMainItem *ea_main_item, GObject *g_obj; EDayViewMainItem *main_item; EDayView *day_view; - gchar *suffix; + const gchar *suffix; gint hour, minute, suffix_width; g_return_val_if_fail (ea_main_item, 0); diff --git a/a11y/calendar/ea-jump-button.c b/a11y/calendar/ea-jump-button.c index cfe8e32cbb..3f9c72e33d 100644 --- a/a11y/calendar/ea-jump-button.c +++ b/a11y/calendar/ea-jump-button.c @@ -208,7 +208,7 @@ static G_CONST_RETURN gchar* jump_button_get_keybinding (AtkAction *action, gint i) { - gchar *return_value = NULL; + const gchar *return_value = NULL; switch (i) { diff --git a/devel-docs/camel/Makefile.am b/devel-docs/camel/Makefile.am index 806a6b4be5..0dffd9bb34 100644 --- a/devel-docs/camel/Makefile.am +++ b/devel-docs/camel/Makefile.am @@ -7,7 +7,7 @@ DOC_MODULE=camel DOC_MAIN_SGML_FILE=camel-docs.sgml # The directory containing the source code (if it contains documentation). -DOC_SOURCE_DIR=$(top_srcdir)/camel +DOC_SOURCE_DIR= CFLAGS=`gtk-config --cflags gtk` LDFLAGS="-lcamel `gtk-config --libs gtk` " diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 67280e54c4..5fa9133d72 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -198,7 +198,7 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob CamelDataWrapper *data; GError *error = NULL; int argc = 1; - char *argv [] = { "org_gnome_audio_inline", NULL }; + const gchar *argv [] = { "org_gnome_audio_inline", NULL }; /* FIXME this is ugly, we should stream this directly to gstreamer */ po->filename = e_mktemp ("org-gnome-audio-inline-file-XXXXXX"); diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 7d3c208a28..7e7cc50461 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -373,7 +373,7 @@ main (int argc, char **argv) g_thread_init (NULL); gtk_init_with_args ( - &argc, &argv, NULL, options, GETTEXT_PACKAGE, &error); + &argc, &argv, NULL, options, (gchar *) GETTEXT_PACKAGE, &error); if (error != NULL) { g_printerr ("%s\n", error->message); g_error_free (error); @@ -401,8 +401,9 @@ main (int argc, char **argv) if (gui_arg && !check_op) { GtkWidget *widget, *container; - char *str = NULL, *txt; - const char *txt2; + const gchar *txt, *txt2; + gchar *str = NULL; + gchar *markup; gtk_window_set_default_icon_name ("evolution"); @@ -454,34 +455,34 @@ main (int argc, char **argv) txt2 = "Should not be here now, really..."; } - txt = g_strconcat ("", txt, "", NULL); + markup = g_strconcat ("", txt, "", NULL); widget = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (widget), FALSE); - gtk_label_set_markup (GTK_LABEL (widget), txt); + gtk_label_set_markup (GTK_LABEL (widget), markup); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0); gtk_widget_show (widget); - g_free (txt); + g_free (markup); gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); - txt = g_strconcat (txt2, " ", _("This may take a while depending on the amount of data in your account."), NULL); + markup = g_strconcat (txt2, " ", _("This may take a while depending on the amount of data in your account."), NULL); widget = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); - gtk_label_set_markup (GTK_LABEL (widget), txt); + gtk_label_set_markup (GTK_LABEL (widget), markup); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); gtk_widget_show (widget); - g_free (txt); + g_free (markup); gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); pbar = gtk_progress_bar_new (); if (str) { - txt = g_strconcat ("", str, "", NULL); + markup = g_strconcat ("", str, "", NULL); widget = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (widget), txt); + gtk_label_set_markup (GTK_LABEL (widget), markup); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); - g_free (txt); + g_free (markup); g_free (str); gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); gtk_table_set_row_spacing (GTK_TABLE (container), 2, 6); diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index c642dd9130..a2499dfa98 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -45,7 +45,6 @@ int e_plugin_lib_enable (EPluginLib *ep, int enable); void bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target); GtkWidget *bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); -GtkWidget *bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); /* For internal use */ struct bbdb_stuff { diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index 1a336bc7bb..d0b6b180dd 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -56,11 +56,7 @@ typedef struct { char *icon; } GaimBuddy; -/* Defined in bbdb.c */ -EBook *bbdb_open_addressbook (int type); - /* Forward declarations for this file. */ -void bbdb_sync_buddy_list (void); static gboolean bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c); static GList *bbdb_get_gaim_buddy_list (void); static char *get_node_text (xmlNodePtr node); diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 848e4f4fb5..8f520bdff9 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -77,7 +77,7 @@ void *em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target); void em_junk_bf_report_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_bf_report_non_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target); -static gint pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error); +static gint pipe_to_bogofilter (CamelMimeMessage *msg, const gchar **argv, GError **error); /* eplugin stuff */ int e_plugin_lib_enable (EPluginLib *ep, int enable); @@ -93,7 +93,7 @@ init_db () CamelStream *stream = camel_stream_fs_new_with_name (WELCOME_MESSAGE, O_RDONLY, 0); CamelMimeParser *parser = camel_mime_parser_new (); CamelMimeMessage *msg = camel_mime_message_new (); - gchar *argv[] = { + const gchar *argv[] = { em_junk_bf_binary, "-n", NULL, @@ -113,13 +113,13 @@ init_db () argv[2] = "--unicode=yes"; } - pipe_to_bogofilter (msg, argv, NULL); + pipe_to_bogofilter (msg, argv, NULL); camel_object_unref (msg); } static gint -pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error) +pipe_to_bogofilter (CamelMimeMessage *msg, const gchar **argv, GError **error) { GPid child_pid; gint bf_in; @@ -142,7 +142,7 @@ retry: } if (!g_spawn_async_with_pipes (NULL, - argv, + (gchar **) argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_STDOUT_TO_DEV_NULL, @@ -249,7 +249,7 @@ em_junk_bf_check_junk (EPlugin *ep, EMJunkHookTarget *target) CamelMimeMessage *msg = target->m; int rv; - gchar *argv[] = { + const gchar *argv[] = { em_junk_bf_binary, NULL, NULL @@ -273,7 +273,7 @@ em_junk_bf_report_junk (EPlugin *ep, EMJunkHookTarget *target) { CamelMimeMessage *msg = target->m; - gchar *argv[] = { + const gchar *argv[] = { em_junk_bf_binary, "-s", NULL, @@ -294,7 +294,7 @@ em_junk_bf_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) { CamelMimeMessage *msg = target->m; - gchar *argv[] = { + const gchar *argv[] = { em_junk_bf_binary, "-n", NULL, @@ -318,7 +318,7 @@ em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target) void * em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target) { - return g_file_test (em_junk_bf_binary, G_FILE_TEST_EXISTS) ? "1" : NULL; + return g_file_test (em_junk_bf_binary, G_FILE_TEST_EXISTS) ? (void *) "1" : NULL; } int @@ -374,7 +374,7 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac check = gtk_check_button_new_with_mnemonic (_("Convert message text to _Unicode")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode); - g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), "/apps/evolution/mail/junk/bogofilter/unicode"); + g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), (gpointer) "/apps/evolution/mail/junk/bogofilter/unicode"); gtk_table_attach((GtkTable *)data->parent, check, 0, 1, i, i+1, 0, 0, 0, 0); gtk_widget_show (check); return (GtkWidget *)check; diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index 19539907fa..6d3b6b8967 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -3,7 +3,6 @@ INCLUDES = -I. \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/mail \ - -I$(top_srcdir)/camel \ -I$(top_builddir)/composer \ $(EVOLUTION_MAIL_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 85e275f2a0..abfd453197 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -331,9 +331,9 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) gint header_section_id,sub_type_index,row,column,label_row; gint i; gchar *str; - static gchar *security_field = N_("Security:"); + static const gchar *security_field = N_("Security:"); static struct _security_values { - char *value, *str; + const gchar *value, *str; } security_values[] = { { "Personal", N_("Personal") } , { "Unclassified", N_("Unclassified") }, diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index ccfb6afb71..6785585af8 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -59,25 +59,25 @@ void org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data); GtkWidget* org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactoryData *data); CamelServiceAuthType camel_exchange_ntlm_authtype = { - /* i18n: "Secure Password Authentication" is an Outlookism */ - N_("Secure Password"), + /* i18n: "Secure Password Authentication" is an Outlookism */ + (gchar *) N_("Secure Password"), - /* i18n: "NTLM" probably doesn't translate */ - N_("This option will connect to the Exchange server using " - "secure password (NTLM) authentication."), + /* i18n: "NTLM" probably doesn't translate */ + (gchar *) N_("This option will connect to the Exchange server " + "using secure password (NTLM) authentication."), - "NTLM", - TRUE + (gchar *) "NTLM", + TRUE }; CamelServiceAuthType camel_exchange_password_authtype = { - N_("Plaintext Password"), + (gchar *) N_("Plaintext Password"), - N_("This option will connect to the Exchange server using " - "standard plaintext password authentication."), + (gchar *) N_("This option will connect to the Exchange server " + "using standard plaintext password authentication."), - "Basic", - TRUE + (gchar *) "Basic", + TRUE }; diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index 308e73daaf..19d5846aa7 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -89,7 +89,7 @@ static void account_changed (EAccountList *account_listener, EAccount *account); static void account_removed (EAccountList *account_listener, EAccount *account); -#if LDEAD +#ifdef LDEAD static void exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *account); #endif @@ -229,7 +229,7 @@ add_defaults_for_account (ExchangeConfigListener *config_listener, EAccount *eaccount; gboolean save = FALSE; -#if LDEAD +#ifdef LDEAD exchange_add_autocompletion_folders (config_listener->priv->gconf, account); #endif @@ -1230,7 +1230,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl g_object_unref (a_source_list); } -#if LDEAD +#ifdef LDEAD /** * exchange_add_autocompletion_folders: * diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index 66a7e71014..635e82ade7 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -301,12 +301,13 @@ exchange_delegates_user_edit (ExchangeAccount *account, CamelMessageInfo *info; char *self_address, *delegate_mail_subject; char *role_name; - char *role_name_final = ""; + GString *role_name_final; const char *recipient_address; const char *delegate_exchange_dn; const char *msg_part1 = NULL, *msg_part2 = NULL; + role_name_final = g_string_new (""); self_address = g_strdup (exchange_account_get_email_id (account)); @@ -339,11 +340,13 @@ exchange_delegates_user_edit (ExchangeAccount *account, combobox = glade_xml_get_widget (xml, widget_names[i]); role = e_dialog_combo_box_get (combobox, exchange_perm_map); role_name = g_strdup (map_to_full_role_name(role)); - role_name_final = g_strconcat (role_name_final, "" , folder_names_for_display[i], - ":", role_name, " ", NULL); + g_string_append_printf ( + role_name_final, + "%s:%s", + folder_names_for_display[i], role_name); } - camel_stream_printf (stream, "%s", role_name_final); + camel_stream_printf (stream, "%s", role_name_final->str); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)) == TRUE) { /* To translators: This message is included if the delegatee has been given access @@ -360,7 +363,7 @@ exchange_delegates_user_edit (ExchangeAccount *account, "to see my private items.")); camel_data_wrapper_construct_from_stream (delegate_mail_text, stream); g_free (role_name); - g_free (role_name_final); + g_string_free (role_name_final, TRUE); camel_object_unref (stream); part = camel_mime_part_new (); diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c index ad36853cf1..11d9b84f5e 100644 --- a/plugins/exchange-operations/exchange-folder-permission.c +++ b/plugins/exchange-operations/exchange-folder-permission.c @@ -59,7 +59,7 @@ void org_gnome_exchange_menu_cal_permissions (EPlugin *ep, ECalMenuTargetSelect gchar *selected_exchange_folder_uri = NULL; static EPopupItem popup_items[] = { - { E_POPUP_ITEM, "30.emc.10", N_("Permissions..."), org_folder_permissions_cb, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, (gchar *) "30.emc.10", (gchar *) N_("Permissions..."), org_folder_permissions_cb, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; static void diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c index 05229c0838..ab63a5dd3e 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.c +++ b/plugins/exchange-operations/exchange-folder-subscription.c @@ -94,10 +94,10 @@ setup_name_selector (GladeXML *glade_xml, ENameSelector **name_selector_ret) } static void -setup_folder_name_combo (GladeXML *glade_xml, gchar *fname) +setup_folder_name_combo (GladeXML *glade_xml, const gchar *fname) { GtkComboBox *combo; - char *strings[] = { + const gchar *strings[] = { "Calendar", "Inbox", "Contacts", @@ -286,7 +286,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data) } gboolean -create_folder_subscription_dialog (ExchangeAccount *account, gchar *fname) +create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname) { ENameSelector *name_selector; GladeXML *glade_xml; diff --git a/plugins/exchange-operations/exchange-folder-subscription.h b/plugins/exchange-operations/exchange-folder-subscription.h index 26b4bc3642..f4a329c19a 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.h +++ b/plugins/exchange-operations/exchange-folder-subscription.h @@ -22,6 +22,6 @@ #define __EXCHANGE_FOLDER_SUBSCRIPTION_H__ gboolean -create_folder_subscription_dialog (ExchangeAccount *account, gchar *fname); +create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname); #endif diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index b2b53d1bb3..1c2334e2dc 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -44,7 +44,7 @@ #include "addressbook/gui/widgets/eab-popup.h" #include "exchange-folder-subscription.h" -void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, gchar *fname); +void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, const gchar *fname); void org_gnome_exchange_inbox_subscription (EPlugin *ep, EMMenuTargetSelect *target); void org_gnome_exchange_addressbook_subscription (EPlugin *ep, EMMenuTargetSelect *target); void org_gnome_exchange_calendar_subscription (EPlugin *ep, EMMenuTargetSelect *target); @@ -64,7 +64,7 @@ static void exchange_get_folder (char *uri, CamelFolder *folder, void *data); static EPopupItem popup_inbox_items[] = { - { E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, (gchar *) "29.inbox_unsubscribe", (gchar *) N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; void @@ -233,7 +233,7 @@ org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *tar } static EPopupItem popup_items[] = { - { E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, (gchar *) "29.calendar_unsubscribe", (gchar *) N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; void @@ -243,7 +243,7 @@ popup_free (EPopup *ep, GSList *items, void *data) } static EPopupItem popup_ab_items[] = { - { E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, (gchar *) "29.address_book_unsubscribe", (gchar *) N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; void @@ -541,7 +541,7 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data) void -org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, gchar *fname) +org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, const gchar *fname) { ExchangeAccount *account = NULL; gint mode; @@ -573,24 +573,27 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, void org_gnome_exchange_calendar_subscription (EPlugin *ep, EMMenuTargetSelect *target) { - gchar *folder_name = N_("Calendar"); + const gchar *folder_name = N_("Calendar"); org_gnome_exchange_folder_subscription (ep, target, folder_name); } + void org_gnome_exchange_addressbook_subscription (EPlugin *ep, EMMenuTargetSelect *target) { - gchar *folder_name = N_("Contacts"); + const gchar *folder_name = N_("Contacts"); org_gnome_exchange_folder_subscription (ep, target, folder_name); } + void org_gnome_exchange_tasks_subscription (EPlugin *ep, EMMenuTargetSelect *target) { - gchar *folder_name = N_("Tasks"); + const gchar *folder_name = N_("Tasks"); org_gnome_exchange_folder_subscription (ep, target, folder_name); } + void org_gnome_exchange_inbox_subscription (EPlugin *ep, EMMenuTargetSelect *target) { - gchar *folder_name = N_("Inbox"); + const gchar *folder_name = N_("Inbox"); org_gnome_exchange_folder_subscription (ep, target, folder_name); } diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c index 94240c051a..a42e867446 100644 --- a/plugins/exchange-operations/exchange-operations.c +++ b/plugins/exchange-operations/exchange-operations.c @@ -30,24 +30,26 @@ ExchangeConfigListener *exchange_global_config_listener=NULL; -static char *error_ids[] = { "config-error", - "password-weak-error", - "password-change-error", - "password-change-success", - "account-offline", - "password-incorrect", - "account-domain-error", - "account-mailbox-na", - "account-version-error", - "account-wss-error", - "account-no-mailbox", - "account-resolve-error", - "account-connect-error", - "password-expired", - "account-unknown-error", - "account-quota-error", - "account-quota-send-error", - "account-quota-warn" }; +static const gchar *error_ids[] = { + "config-error", + "password-weak-error", + "password-change-error", + "password-change-success", + "account-offline", + "password-incorrect", + "account-domain-error", + "account-mailbox-na", + "account-version-error", + "account-wss-error", + "account-no-mailbox", + "account-resolve-error", + "account-connect-error", + "password-expired", + "account-unknown-error", + "account-quota-error", + "account-quota-send-error", + "account-quota-warn" +}; static void free_exchange_listener (void) diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 2b6bfdb7be..59cf66e93e 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -3,7 +3,6 @@ INCLUDES = -I. \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/mail \ - -I$(top_srcdir)/camel \ -I$(top_builddir)/composer \ $(EVOLUTION_MAIL_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index 0cee4317a7..fd9091c5c2 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -176,7 +176,7 @@ add_esource (const char *conf_key, GwAccountInfo *info, const char *source_name ESource *source; GConfClient* client; GSList *ids, *temp ; - char *source_selection_key; + const gchar *source_selection_key; char *relative_uri; const char *soap_port; const char * use_ssl; @@ -274,7 +274,7 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name, GConfClient* client; GSList *ids; GSList *node_tobe_deleted; - char *source_selection_key; + const gchar *source_selection_key; client = gconf_client_get_default(); list = e_source_list_new_for_gconf (client, conf_key); diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index 3b0a83021d..c72cc89850 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -6,7 +6,6 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ - -I$(top_srcdir)/camel \ -I$(top_builddir)/composer \ -I$(top_builddir)/mail \ $(EVOLUTION_MAIL_CFLAGS) \ diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index 4cee3919f4..cdfffa5e7a 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -114,7 +114,7 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data) } static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "50.emfv.05", N_("Junk Mail Settings..."), junk_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY} + { E_POPUP_ITEM, (gchar *) "50.emfv.05", (gchar *) N_("Junk Mail Settings..."), junk_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY} }; static void diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index bff2abc35a..65eca141c6 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -48,7 +48,6 @@ static void free_all(JunkSettings *js); static void get_junk_list (JunkSettings *js); static void disable_clicked (GtkRadioButton *button, JunkSettings *js); static void enable_clicked (GtkRadioButton *button, JunkSettings *js); -GType junk_settings_get_type (void); static GtkVBoxClass *parent_class = NULL; @@ -243,24 +242,32 @@ commit_changes (JunkSettings *js) if (E_IS_GW_CONNECTION (js->cnc)) { if(js->flag_for_ok == 2 && js->enabled){ /* just turn off the bits*/ use_junk = use_pab = use_block = persistence = 0; - if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK) { + ; + } } if (js->flag_for_ok == 0 && !js->enabled) { use_block = use_pab =0; use_junk = 1; persistence = 14; /* We are setting the default persistence*/ - if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK) { + ; + } } while (new_list) { entry = new_list->data; - if (e_gw_connection_create_junk_entry (js->cnc, entry->match, "email", "junk") == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_create_junk_entry (js->cnc, entry->match, "email", "junk") == E_GW_CONNECTION_STATUS_OK) { + ; + } new_list = new_list->next; } while (remove_list) { entry = remove_list->data; - if (e_gw_connection_remove_junk_entry (js->cnc, entry->id) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_remove_junk_entry (js->cnc, entry->id) == E_GW_CONNECTION_STATUS_OK) { + ; + } remove_list = remove_list->next; } diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 928a780124..6396685cce 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -83,8 +83,8 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data) } static EPopupItem popup_items[] = { -{ E_POPUP_BAR, "20.emfv.03" }, -{ E_POPUP_ITEM, "20.emfv.04", N_("Retract Mail"), retract_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY} + { E_POPUP_BAR, (gchar *) "20.emfv.03" }, + { E_POPUP_ITEM, (gchar *) "20.emfv.04", (gchar *) N_("Retract Mail"), retract_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY} }; static void popup_free (EPopup *ep, GSList *items, void *data) diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index bc046c0a05..35057bfad2 100644 --- a/plugins/groupwise-features/process-meeting.c +++ b/plugins/groupwise-features/process-meeting.c @@ -50,9 +50,9 @@ static void on_decline_meeting (EPopup *ep, EPopupItem *pitem, void *data); static void on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data); static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "41.accept", N_("Accept"), on_accept_meeting, NULL, GTK_STOCK_APPLY, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE}, -{ E_POPUP_ITEM, "42.accept", N_("Accept Tentatively"), on_accept_meeting_tentative, NULL, GTK_STOCK_DIALOG_QUESTION, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE}, -{ E_POPUP_ITEM, "43.decline", N_("Decline"), on_decline_meeting, NULL, GTK_STOCK_CANCEL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} + { E_POPUP_ITEM, (gchar *) "41.accept", (gchar *) N_("Accept"), on_accept_meeting, NULL, (gchar *) GTK_STOCK_APPLY, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE}, + { E_POPUP_ITEM, (gchar *) "42.accept", (gchar *) N_("Accept Tentatively"), on_accept_meeting_tentative, NULL, (gchar *) GTK_STOCK_DIALOG_QUESTION, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE}, + { E_POPUP_ITEM, (gchar *) "43.decline", (gchar *) N_("Decline"), on_decline_meeting, NULL, (gchar *) GTK_STOCK_CANCEL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} }; static void @@ -319,7 +319,7 @@ typedef struct { } ThreadData; static EPopupItem retract_popup_items[] = { -{ E_POPUP_ITEM, "49.resend", N_("Rese_nd Meeting..."), on_resend_meeting, NULL, GTK_STOCK_EDIT, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} + { E_POPUP_ITEM, (gchar *) "49.resend", (gchar *) N_("Rese_nd Meeting..."), on_resend_meeting, NULL, (gchar *) GTK_STOCK_EDIT, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} }; void diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 9811c6fd6d..e7e39ba3d5 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -177,7 +177,8 @@ proxy_login_new (void) static int proxy_get_password (EAccount *account, char **user_name, char **password) { - char *uri, *failed_auth, *key, *prompt; + const gchar *failed_auth; + char *uri, *key, *prompt; CamelURL *url; const char *poa_address, *use_ssl = NULL, *soap_port; @@ -221,7 +222,8 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent) { EGwConnection *cnc; CamelURL *url; - char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL; + const gchar *failed_auth; + char *uri = NULL, *key = NULL, *prompt = NULL, *password = NULL; const char *use_ssl = NULL, *soap_port; gboolean remember; @@ -507,7 +509,7 @@ static EPopupItem popup_items[] = { /* To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise * feature by which one person can send/read mails/appointments using another person's identity * without knowing his password, for example if that other person is on vacation */ -{ E_POPUP_ITEM, "20.emc.04", N_("_Proxy Login..."), org_gnome_proxy_account_login, NULL, NULL, 0, EM_POPUP_FOLDER_STORE } + { E_POPUP_ITEM, (gchar *) "20.emc.04", (gchar *) N_("_Proxy Login..."), org_gnome_proxy_account_login, NULL, NULL, 0, EM_POPUP_FOLDER_STORE } }; static void diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 60be390eb3..f9588802df 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -459,7 +459,8 @@ static EGwConnection * proxy_get_cnc (EAccount *account, GtkWindow *parent_window) { EGwConnection *cnc; - char *uri, *failed_auth, *key, *prompt, *password = NULL; + const gchar *failed_auth; + char *uri, *key, *prompt, *password = NULL; CamelURL *url; const char *poa_address, *use_ssl, *soap_port; gboolean remember; diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h index 8c8d30368c..127b4cfaa0 100644 --- a/plugins/groupwise-features/proxy.h +++ b/plugins/groupwise-features/proxy.h @@ -52,7 +52,6 @@ struct _proxyDialogClass { GType proxy_dialog_get_type (void); proxyDialog *proxy_dialog_new (void); -void proxy_commit(GtkWidget *button, EConfigHookItemFactoryData *data); GtkWidget * org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data); static void proxy_add_account (GtkWidget *button, EAccount *account); static void proxy_remove_account (GtkWidget *button, EAccount *account); diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index ed8e6093a2..24dfb1b949 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -55,7 +55,8 @@ static EGwConnection * get_cnc (GtkWindow *parent_window) { EGwConnection *cnc; - char *uri, *failed_auth, *key, *prompt, *password = NULL; + const gchar *failed_auth; + char *uri, *key, *prompt, *password = NULL; CamelURL *url; const char *poa_address, *use_ssl, *soap_port; gboolean remember; @@ -393,7 +394,9 @@ get_source (ESourceList *list) } static void -add_return_value (EGwSendOptionsReturnNotify track, ESource *source, char *notify) +add_return_value (EGwSendOptionsReturnNotify track, + ESource *source, + const gchar *notify) { char *value; diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 3a850b2a55..8f38f2a23d 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -337,7 +337,7 @@ new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *mo } static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "20.emc.001", N_("New _Shared Folder..."), create_shared_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } + { E_POPUP_ITEM, (gchar *) "20.emc.001", (gchar *) N_("New _Shared Folder..."), create_shared_folder, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; static void @@ -497,7 +497,7 @@ get_cnc (CamelStore *store) } gchar * -get_container_id(EGwConnection *cnc, gchar *fname) +get_container_id(EGwConnection *cnc, const gchar *fname) { GList *container_list = NULL; gchar *id = NULL; diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 9b3062b1c3..a48cd10f2c 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -49,7 +49,6 @@ static void free_user_node(EShUsers *user); static void free_node(SharedUser *user); static void free_all(ShareFolder *sf); static SharedUser * find_node(GList *list, gchar *email); -static void free_all(ShareFolder *sf); static void get_container_list (ShareFolder *sf); static void user_selected(GtkTreeSelection *selection, ShareFolder *sf); static void not_shared_clicked (GtkRadioButton *button, ShareFolder *sf); @@ -58,7 +57,6 @@ static void add_clicked(GtkButton *button, ShareFolder *sf); static void remove_clicked(GtkButton *button, ShareFolder *sf); static void not_ok_clicked(GtkButton *button, ShareFolder *sf); static void not_cancel_clicked(GtkButton *button, GtkWidget *window); -static void not_cancel_clicked(GtkButton *button, GtkWidget *window); static void share_folder_construct (ShareFolder *sf); GType share_folder_get_type (void); @@ -453,18 +451,24 @@ share_folder (ShareFolder *sf) } else { if (new_list) { - if (e_gw_connection_share_folder (sf->cnc, sf->container_id, new_list, sf->sub, sf->mesg, 0) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_share_folder (sf->cnc, sf->container_id, new_list, sf->sub, sf->mesg, 0) == E_GW_CONNECTION_STATUS_OK) { + ; + } } if (update_list) { sf->sub = "Shared Folder rights updated"; - if (e_gw_connection_share_folder (sf->cnc, sf->container_id, update_list, sf->sub, sf->mesg, 2) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_share_folder (sf->cnc, sf->container_id, update_list, sf->sub, sf->mesg, 2) == E_GW_CONNECTION_STATUS_OK) { + ; + } } } if (remove_list) { sf->sub = "Shared Folder removed"; - if (e_gw_connection_share_folder (sf->cnc, sf->container_id, remove_list, sf->sub, sf->mesg, 1) == E_GW_CONNECTION_STATUS_OK); + if (e_gw_connection_share_folder (sf->cnc, sf->container_id, remove_list, sf->sub, sf->mesg, 1) == E_GW_CONNECTION_STATUS_OK) { + ; + } } } diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index 3acf595053..9801adce1b 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -93,7 +93,7 @@ struct _ShareFolder { gboolean is_shared; EGwConnection *cnc; gchar *container_id; - gchar *sub; + const gchar *sub; gchar *mesg; GList *container_list; GtkTreeIter iter; @@ -109,7 +109,7 @@ struct _ShareFolderClass { GType share_folderget_type (void); struct _ShareFolder * share_folder_new (EGwConnection *ccnc, gchar *id); void share_folder(struct _ShareFolder *sf); -gchar * get_container_id (EGwConnection *cnc, gchar *fname); +gchar * get_container_id (EGwConnection *cnc, const gchar *fname); EGwConnection * get_cnc (CamelStore *store); #ifdef __cplusplus diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index 65b66962c5..2b21b47616 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -238,7 +238,7 @@ track_status (EPopup *ep, EPopupItem *item, void *data) } static EPopupItem popup_items[] = { -{ E_POPUP_ITEM, "20.emfv.02", N_("Track Message Status..."), track_status, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY} + { E_POPUP_ITEM, (gchar * ) "20.emfv.02", (gchar *) N_("Track Message Status..."), track_status, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY} }; static void diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am index 3b73e2741d..69b94ffbb1 100644 --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -5,7 +5,6 @@ endif INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/mail \ - -I$(top_srcdir)/libedataserver \ $(EVOLUTION_MAIL_CFLAGS) \ $(CAMEL_IMAP_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 04049ef6d5..25d02b4f5d 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -2585,8 +2585,9 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_box_pack_start (GTK_BOX (inner_vbox), label, FALSE, FALSE, 0); - if (!e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_EVENT, NULL)) + if (!e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_EVENT, NULL)) { /* FIXME Error handling */; + } scrolledwin = gtk_scrolled_window_new (NULL, NULL); diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 32fa3104cc..2d714b4a1e 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -780,7 +780,10 @@ button_clicked_cb (GtkWidget *widget, gpointer data) } static void -set_one_button (ItipView *view, char *label, char *stock_id, ItipViewResponse response) +set_one_button (ItipView *view, + const gchar *label, + const gchar *stock_id, + ItipViewResponse response) { ItipViewPrivate *priv; GtkWidget *button; diff --git a/plugins/mail-account-disable/mail-account-disable.c b/plugins/mail-account-disable/mail-account-disable.c index 886b66a66f..552bea5a6d 100644 --- a/plugins/mail-account-disable/mail-account-disable.c +++ b/plugins/mail-account-disable/mail-account-disable.c @@ -42,8 +42,8 @@ void mail_account_disable (EPopup *ep, EPopupItem *p, void *data); void org_gnome_create_mail_account_disable (EPlugin *ep, EMPopupTargetFolder *t); static EPopupItem popup_items[] = { - { E_POPUP_ITEM, "40.emc.04", N_("_Disable"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }, - { E_POPUP_ITEM, "40.emc.04", N_("Proxy _Logout"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE } + { E_POPUP_ITEM, (gchar *) "40.emc.04", (gchar *) N_("_Disable"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }, + { E_POPUP_ITEM, (gchar *) "40.emc.04", (gchar *) N_("Proxy _Logout"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE } }; static void diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am index 352c2a0fab..724277826c 100644 --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -1,6 +1,5 @@ INCLUDES = \ -I$(top_srcdir)\ - -I$(top_srcdir)/camel \ $(EVOLUTION_MAIL_CFLAGS) @EVO_PLUGIN_RULE@ diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index ea03320ae8..de58a02b5e 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -42,7 +42,8 @@ create_uri (UrlEditorDialog *dialog) g_free (uri->location); uri->location = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->server_entry))); } else { - char *method = "", *server, *file, *port, *username, *password; + const gchar *method; + char *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))); diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 39efa2f5ac..888ee40289 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -81,7 +81,7 @@ static gboolean em_junk_sa_checked_spamassassin_version = FALSE; static guint em_junk_sa_spamassassin_version = 0; static char *em_junk_sa_socket_path = NULL; static char *em_junk_sa_spamd_pidfile = NULL; -static char *em_junk_sa_spamc_binary = NULL; +static const gchar *em_junk_sa_spamc_binary = NULL; static GConfClient *em_junk_sa_gconf = NULL; /* volatile so not cached between threads */ @@ -89,8 +89,8 @@ static volatile gboolean em_junk_sa_local_only; static volatile gboolean em_junk_sa_use_daemon; static char * em_junk_sa_preferred_socket_path; -static char *em_junk_sa_spamc_binaries [4] = {"spamc", "/usr/bin/spamc", "/usr/sbin/spamc", NULL}; -static char *em_junk_sa_spamd_binaries [4] = {"spamd", "/usr/bin/spamd", "/usr/sbin/spamd", NULL}; +static const gchar *em_junk_sa_spamc_binaries [4] = {"spamc", "/usr/bin/spamc", "/usr/sbin/spamc", NULL}; +static const gchar *em_junk_sa_spamd_binaries [4] = {"spamd", "/usr/bin/spamd", "/usr/sbin/spamd", NULL}; #define SPAMD_RESTARTS_SIZE 8 static time_t em_junk_sa_spamd_restarts [SPAMD_RESTARTS_SIZE] = {0, 0, 0, 0, 0, 0, 0, 0}; @@ -104,7 +104,7 @@ char *em_junk_sa_spamc_gconf_binary = NULL; char *em_junk_sa_spamd_gconf_binary = NULL; static int -pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer, GError **error) +pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer, GError **error) { int result, status, errnosav, fds[2], out_fds[2]; CamelStream *stream; @@ -169,7 +169,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, for (fd = 3; fd < maxfd; fd++) fcntl (fd, F_SETFD, FD_CLOEXEC); - execvp (argv[0], argv); + execvp (argv[0], (gchar * const *) argv); _exit (rv_err & 0377); } else if (pid < 0) { errnosav = errno; @@ -254,7 +254,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, } static int -pipe_to_sa (CamelMimeMessage *msg, const char *in, char **argv, GError **error) +pipe_to_sa (CamelMimeMessage *msg, const gchar *in, const gchar **argv, GError **error) { return pipe_to_sa_full (msg, in, argv, -1, 1, NULL, error); } @@ -269,9 +269,9 @@ em_junk_sa_get_socket_path () } static gboolean -em_junk_sa_test_spamd_running (char *binary, gboolean system) +em_junk_sa_test_spamd_running (const gchar *binary, gboolean system) { - char *argv[5]; + const gchar *argv[5]; int i = 0; gboolean rv; @@ -307,7 +307,7 @@ em_junk_sa_test_spamd_running (char *binary, gboolean system) static void em_junk_sa_test_allow_tell (void) { - char *argv [4] = { + const gchar *argv [4] = { "spamc", "-L", "forget", @@ -321,7 +321,7 @@ em_junk_sa_test_allow_tell (void) static void em_junk_sa_test_spamassassin (void) { - char *argv [3] = { + const gchar *argv [3] = { "spamassassin", "--version", NULL, @@ -338,9 +338,9 @@ em_junk_sa_test_spamassassin (void) #define MAX_SPAMD_PORTS 1 static gboolean -em_junk_sa_run_spamd (char *binary) +em_junk_sa_run_spamd (const gchar *binary) { - char *argv[8]; + const gchar *argv[8]; int i; gboolean rv = FALSE; @@ -431,7 +431,7 @@ em_junk_sa_find_spamc () static void em_junk_sa_test_spamd (void) { - char *argv[4]; + const gchar *argv[4]; int i, b; gboolean try_system_spamd = TRUE; @@ -577,7 +577,8 @@ gboolean em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target) { GByteArray *out = NULL; - char *argv[7], *to_free = NULL; + const gchar *argv[7]; + char *to_free = NULL; int i = 0, socket_i; gboolean rv; CamelMimeMessage *msg = target->m; @@ -644,7 +645,7 @@ get_spamassassin_version () GByteArray *out = NULL; int i; - char * argv[3] = { + const gchar *argv[3] = { "sa-learn", "--version", NULL @@ -680,8 +681,10 @@ get_spamassassin_version () void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target) { - char *sync_op = ((get_spamassassin_version () >= 3) ? "--no-sync": "--no-rebuild"); - char *argv[6] = { + const gchar *sync_op = + (get_spamassassin_version () >= 3) + ? "--no-sync": "--no-rebuild"; + const gchar *argv[6] = { "sa-learn", sync_op, "--spam", @@ -690,7 +693,7 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target) NULL }; /* Call setup for spamc */ - char *argv2[4] = { + const gchar *argv2[4] = { "spamc", "-L", "spam", @@ -718,8 +721,10 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target) void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) { - char *sync_op = ((get_spamassassin_version () >= 3) ? "--no-sync": "--no-rebuild"); - char *argv[6] = { + const char *sync_op = + (get_spamassassin_version () >= 3) + ? "--no-sync": "--no-rebuild"; + const gchar *argv[6] = { "sa-learn", sync_op, "--ham", @@ -728,7 +733,7 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) NULL }; /* Setup for spamc */ - char *argv2[4] = { + const gchar *argv2[4] = { "spamc", "-L", "ham", @@ -753,8 +758,9 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) void em_junk_sa_commit_reports (EPlugin *ep) { - char *sync_op = ((get_spamassassin_version () >= 3) ? "--sync": "--rebuild"); - char *argv[4] = { + const gchar *sync_op = + (get_spamassassin_version () >= 3) ? "--sync": "--rebuild"; + const gchar *argv[4] = { "sa-learn", sync_op, NULL, @@ -780,7 +786,7 @@ em_junk_sa_commit_reports (EPlugin *ep) void * em_junk_sa_validate_binary (EPlugin *ep) { - return em_junk_sa_is_available (NULL) ? "1" : NULL; + return em_junk_sa_is_available (NULL) ? (void *) "1" : NULL; } static void @@ -916,7 +922,7 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (label), FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !em_junk_sa_local_only); - g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), "/apps/evolution/mail/junk/sa/local_only"); + g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), (gpointer) "/apps/evolution/mail/junk/sa/local_only"); gtk_table_attach((GtkTable *)data->parent, vbox, 0, 1, i, i+1, 0, 0, 0, 0); gtk_widget_show_all (vbox); return (GtkWidget *)vbox; diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 2762dc5dfe..663ba12671 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -357,7 +357,7 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource gint i=0; - static gchar *labels[] = { + static const gchar *labels[] = { N_("UID"), N_("Summary"), N_("Description List"), diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 34d5961d4b..766f379c6c 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -38,7 +38,7 @@ void startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target); GtkWidget *startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data); gboolean startup_wizard_check (EPlugin *ep, EConfigHookPageCheckData *check_data); void startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target); -void startup_wizard_abort (EPlugin *ep, EMConfigTargetAccount *target); +void startup_wizard_abort (EPlugin *ep, EMConfigTargetAccount *target) G_GNUC_NORETURN; static EImport *import; static EImportTargetHome *import_target; diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 537b8822bc..02983f1f36 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -583,7 +583,7 @@ static GSList if (!g_str_has_suffix (folder->name, "Templates")) path = g_strdup_printf ("80.%s", folder->full_name); else - path = "80.Templates"; + path = g_strdup ("80.Templates"); /* If this uid is trashed, ignore it */ if (camel_folder_get_message_flags (folder, uid) & CAMEL_MESSAGE_DELETED) @@ -636,7 +636,7 @@ static GSList if (!g_str_has_suffix (folder->name, "Templates")) item->path = g_strdup_printf ("80.%s", folder->full_name); else - item->path = "80.Templates"; + item->path = g_strdup ("80.Templates"); list = g_slist_prepend (list, item); diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index cff74204f1..b60fdf4ca2 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -24,6 +24,7 @@ #include #endif +#include #include #include #include @@ -75,12 +76,6 @@ struct _ETimezoneDialogPrivate { GtkWidget *preview_label; }; -#ifndef G_OS_WIN32 /* Declared properly in time.h already */ -extern char *tzname[2]; -extern long timezone; -extern int daylight; -#endif - static void e_timezone_dialog_dispose (GObject *object); static void e_timezone_dialog_finalize (GObject *object); -- cgit v1.2.3 From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- a11y/addressbook/ea-addressbook-view.c | 2 +- a11y/addressbook/ea-addressbook-view.h | 2 +- a11y/addressbook/ea-addressbook.c | 2 +- a11y/addressbook/ea-addressbook.h | 2 +- a11y/addressbook/ea-minicard-view.c | 2 +- a11y/addressbook/ea-minicard-view.h | 2 +- a11y/addressbook/ea-minicard.c | 2 +- a11y/addressbook/ea-minicard.h | 2 +- a11y/calendar/ea-cal-view-event.c | 4 +- a11y/calendar/ea-cal-view-event.h | 2 +- a11y/calendar/ea-cal-view.c | 2 +- a11y/calendar/ea-cal-view.h | 2 +- a11y/calendar/ea-calendar-helpers.c | 2 +- a11y/calendar/ea-calendar-helpers.h | 2 +- a11y/calendar/ea-calendar.c | 2 +- a11y/calendar/ea-calendar.h | 2 +- a11y/calendar/ea-day-view-cell.c | 2 +- a11y/calendar/ea-day-view-cell.h | 2 +- a11y/calendar/ea-day-view-main-item.c | 2 +- a11y/calendar/ea-day-view-main-item.h | 2 +- a11y/calendar/ea-day-view.c | 2 +- a11y/calendar/ea-day-view.h | 2 +- a11y/calendar/ea-gnome-calendar.c | 2 +- a11y/calendar/ea-gnome-calendar.h | 2 +- a11y/calendar/ea-jump-button.c | 2 +- a11y/calendar/ea-jump-button.h | 2 +- a11y/calendar/ea-week-view-cell.c | 2 +- a11y/calendar/ea-week-view-cell.h | 2 +- a11y/calendar/ea-week-view-main-item.c | 2 +- a11y/calendar/ea-week-view-main-item.h | 2 +- a11y/calendar/ea-week-view.c | 2 +- a11y/calendar/ea-week-view.h | 2 +- a11y/e-table/gal-a11y-e-cell-popup.c | 2 +- a11y/e-table/gal-a11y-e-cell-popup.h | 2 +- a11y/e-table/gal-a11y-e-cell-registry.c | 2 +- a11y/e-table/gal-a11y-e-cell-registry.h | 2 +- a11y/e-table/gal-a11y-e-cell-text.c | 2 +- a11y/e-table/gal-a11y-e-cell-text.h | 2 +- a11y/e-table/gal-a11y-e-cell-toggle.c | 2 +- a11y/e-table/gal-a11y-e-cell-toggle.h | 2 +- a11y/e-table/gal-a11y-e-cell-tree.c | 2 +- a11y/e-table/gal-a11y-e-cell-tree.h | 2 +- a11y/e-table/gal-a11y-e-cell-vbox.c | 2 +- a11y/e-table/gal-a11y-e-cell-vbox.h | 2 +- a11y/e-table/gal-a11y-e-cell.c | 2 +- a11y/e-table/gal-a11y-e-cell.h | 2 +- .../gal-a11y-e-table-click-to-add-factory.c | 2 +- .../gal-a11y-e-table-click-to-add-factory.h | 2 +- a11y/e-table/gal-a11y-e-table-click-to-add.c | 2 +- a11y/e-table/gal-a11y-e-table-click-to-add.h | 2 +- a11y/e-table/gal-a11y-e-table-column-header.c | 2 +- a11y/e-table/gal-a11y-e-table-column-header.h | 2 +- a11y/e-table/gal-a11y-e-table-factory.c | 2 +- a11y/e-table/gal-a11y-e-table-factory.h | 2 +- a11y/e-table/gal-a11y-e-table-item-factory.c | 2 +- a11y/e-table/gal-a11y-e-table-item-factory.h | 2 +- a11y/e-table/gal-a11y-e-table-item.c | 2 +- a11y/e-table/gal-a11y-e-table-item.h | 2 +- a11y/e-table/gal-a11y-e-table.c | 2 +- a11y/e-table/gal-a11y-e-table.h | 2 +- a11y/e-table/gal-a11y-e-tree-factory.c | 2 +- a11y/e-table/gal-a11y-e-tree-factory.h | 2 +- a11y/e-table/gal-a11y-e-tree.c | 2 +- a11y/e-table/gal-a11y-e-tree.h | 2 +- a11y/e-text/gal-a11y-e-text-factory.c | 2 +- a11y/e-text/gal-a11y-e-text-factory.h | 2 +- a11y/e-text/gal-a11y-e-text.c | 2 +- a11y/e-text/gal-a11y-e-text.h | 2 +- a11y/ea-cell-table.c | 2 +- a11y/ea-cell-table.h | 2 +- a11y/ea-factory.h | 2 +- a11y/gal-a11y-factory.h | 2 +- a11y/gal-a11y-util.c | 2 +- a11y/gal-a11y-util.h | 2 +- a11y/widgets/ea-calendar-cell.c | 2 +- a11y/widgets/ea-calendar-cell.h | 2 +- a11y/widgets/ea-calendar-item.c | 4 +- a11y/widgets/ea-calendar-item.h | 2 +- a11y/widgets/ea-combo-button.c | 2 +- a11y/widgets/ea-combo-button.h | 2 +- a11y/widgets/ea-widgets.c | 2 +- a11y/widgets/ea-widgets.h | 2 +- addressbook/conduit/address-conduit.c | 2 +- addressbook/gui/component/addressbook-component.c | 2 +- addressbook/gui/component/addressbook-component.h | 2 +- addressbook/gui/component/addressbook-config.c | 2 +- addressbook/gui/component/addressbook-config.h | 2 +- addressbook/gui/component/addressbook-migrate.c | 2 +- addressbook/gui/component/addressbook-migrate.h | 2 +- addressbook/gui/component/addressbook-view.c | 2 +- addressbook/gui/component/addressbook-view.h | 2 +- addressbook/gui/component/addressbook.c | 2 +- addressbook/gui/component/addressbook.h | 2 +- addressbook/gui/component/autocompletion-config.c | 2 +- addressbook/gui/component/autocompletion-config.h | 2 +- addressbook/gui/component/component-factory.c | 2 +- .../gui/contact-editor/e-contact-editor-fullname.c | 2 +- .../gui/contact-editor/e-contact-editor-fullname.h | 2 +- addressbook/gui/contact-editor/e-contact-editor.c | 2 +- addressbook/gui/contact-editor/e-contact-editor.h | 2 +- .../gui/contact-editor/e-contact-quick-add.c | 2 +- .../gui/contact-editor/e-contact-quick-add.h | 2 +- addressbook/gui/contact-editor/eab-editor.c | 2 +- addressbook/gui/contact-editor/eab-editor.h | 2 +- addressbook/gui/contact-editor/test-editor.c | 2 +- .../contact-list-editor/e-contact-list-editor.c | 16 +- .../contact-list-editor/e-contact-list-editor.h | 2 +- .../gui/contact-list-editor/e-contact-list-model.c | 2 +- .../gui/contact-list-editor/e-contact-list-model.h | 2 +- addressbook/gui/merging/eab-contact-compare.c | 2 +- addressbook/gui/merging/eab-contact-compare.h | 2 +- addressbook/gui/merging/eab-contact-merging.c | 2 +- addressbook/gui/merging/eab-contact-merging.h | 2 +- addressbook/gui/widgets/e-addressbook-model.c | 2 +- addressbook/gui/widgets/e-addressbook-model.h | 2 +- .../gui/widgets/e-addressbook-reflow-adapter.c | 2 +- .../gui/widgets/e-addressbook-reflow-adapter.h | 2 +- .../gui/widgets/e-addressbook-table-adapter.c | 2 +- .../gui/widgets/e-addressbook-table-adapter.h | 2 +- addressbook/gui/widgets/e-addressbook-view.c | 2 +- addressbook/gui/widgets/e-addressbook-view.h | 2 +- addressbook/gui/widgets/e-minicard-label.c | 2 +- addressbook/gui/widgets/e-minicard-label.h | 2 +- addressbook/gui/widgets/e-minicard-view-widget.c | 2 +- addressbook/gui/widgets/e-minicard-view-widget.h | 2 +- addressbook/gui/widgets/e-minicard-view.c | 2 +- addressbook/gui/widgets/e-minicard-view.h | 2 +- addressbook/gui/widgets/e-minicard.c | 6 +- addressbook/gui/widgets/e-minicard.h | 2 +- addressbook/gui/widgets/eab-config.c | 2 +- addressbook/gui/widgets/eab-config.h | 2 +- addressbook/gui/widgets/eab-contact-display.c | 6 +- addressbook/gui/widgets/eab-contact-display.h | 2 +- addressbook/gui/widgets/eab-gui-util.c | 2 +- addressbook/gui/widgets/eab-gui-util.h | 4 +- addressbook/gui/widgets/eab-menu.c | 2 +- addressbook/gui/widgets/eab-menu.h | 2 +- addressbook/gui/widgets/eab-popup-control.c | 2 +- addressbook/gui/widgets/eab-popup-control.h | 2 +- addressbook/gui/widgets/eab-popup.c | 2 +- addressbook/gui/widgets/eab-popup.h | 2 +- .../gui/widgets/gal-view-factory-minicard.c | 2 +- .../gui/widgets/gal-view-factory-minicard.h | 2 +- addressbook/gui/widgets/gal-view-minicard.c | 2 +- addressbook/gui/widgets/gal-view-minicard.h | 2 +- .../importers/evolution-addressbook-importers.h | 2 +- addressbook/importers/evolution-csv-importer.c | 2 +- addressbook/importers/evolution-ldif-importer.c | 2 +- addressbook/importers/evolution-vcard-importer.c | 2 +- addressbook/printing/e-contact-print-types.h | 2 +- addressbook/printing/e-contact-print.c | 2 +- addressbook/printing/e-contact-print.h | 2 +- addressbook/printing/test-print.c | 2 +- .../evolution-addressbook-export-list-cards.c | 2 +- .../evolution-addressbook-export-list-folders.c | 2 +- addressbook/tools/evolution-addressbook-export.c | 2 +- addressbook/tools/evolution-addressbook-export.h | 2 +- addressbook/util/eab-book-util.c | 2 +- addressbook/util/eab-book-util.h | 2 +- calendar/common/authentication.c | 4 +- calendar/common/authentication.h | 2 +- calendar/conduits/calendar/calendar-conduit.c | 4 +- .../conduits/common/libecalendar-common-conduit.c | 2 +- .../conduits/common/libecalendar-common-conduit.h | 2 +- calendar/conduits/memo/memo-conduit.c | 2 +- calendar/conduits/todo/todo-conduit.c | 2 +- calendar/gui/alarm-notify/alarm-notify-dialog.c | 2 +- calendar/gui/alarm-notify/alarm-notify-dialog.h | 2 +- calendar/gui/alarm-notify/alarm-notify.c | 4 +- calendar/gui/alarm-notify/alarm-notify.h | 2 +- calendar/gui/alarm-notify/alarm-queue.c | 2 +- calendar/gui/alarm-notify/alarm-queue.h | 2 +- calendar/gui/alarm-notify/alarm.c | 2 +- calendar/gui/alarm-notify/alarm.h | 2 +- calendar/gui/alarm-notify/config-data.c | 2 +- calendar/gui/alarm-notify/config-data.h | 2 +- calendar/gui/alarm-notify/notify-main.c | 2 +- calendar/gui/alarm-notify/util.c | 2 +- calendar/gui/alarm-notify/util.h | 2 +- calendar/gui/cal-search-bar.c | 2 +- calendar/gui/cal-search-bar.h | 2 +- calendar/gui/calendar-commands.c | 2 +- calendar/gui/calendar-commands.h | 2 +- calendar/gui/calendar-component.c | 10 +- calendar/gui/calendar-component.h | 2 +- calendar/gui/calendar-config-keys.h | 2 +- calendar/gui/calendar-config.c | 2 +- calendar/gui/calendar-config.h | 2 +- calendar/gui/calendar-view-factory.c | 2 +- calendar/gui/calendar-view-factory.h | 2 +- calendar/gui/calendar-view.c | 2 +- calendar/gui/calendar-view.h | 2 +- calendar/gui/comp-editor-factory.c | 2 +- calendar/gui/comp-editor-factory.h | 2 +- calendar/gui/comp-util.c | 8 +- calendar/gui/comp-util.h | 2 +- calendar/gui/control-factory.c | 2 +- calendar/gui/control-factory.h | 2 +- calendar/gui/dialogs/alarm-dialog.c | 2 +- calendar/gui/dialogs/alarm-dialog.h | 2 +- calendar/gui/dialogs/alarm-list-dialog.c | 2 +- calendar/gui/dialogs/alarm-list-dialog.h | 2 +- calendar/gui/dialogs/cal-attachment-select-file.c | 2 +- calendar/gui/dialogs/cal-attachment-select-file.h | 2 +- calendar/gui/dialogs/cal-prefs-dialog.c | 2 +- calendar/gui/dialogs/cal-prefs-dialog.h | 2 +- calendar/gui/dialogs/calendar-setup.c | 4 +- calendar/gui/dialogs/calendar-setup.h | 2 +- calendar/gui/dialogs/cancel-comp.c | 2 +- calendar/gui/dialogs/cancel-comp.h | 2 +- calendar/gui/dialogs/changed-comp.c | 2 +- calendar/gui/dialogs/changed-comp.h | 2 +- calendar/gui/dialogs/comp-editor-page.c | 2 +- calendar/gui/dialogs/comp-editor-page.h | 2 +- calendar/gui/dialogs/comp-editor-util.c | 2 +- calendar/gui/dialogs/comp-editor-util.h | 2 +- calendar/gui/dialogs/comp-editor.c | 10 +- calendar/gui/dialogs/comp-editor.h | 2 +- calendar/gui/dialogs/copy-source-dialog.c | 2 +- calendar/gui/dialogs/copy-source-dialog.h | 2 +- calendar/gui/dialogs/delete-comp.c | 2 +- calendar/gui/dialogs/delete-comp.h | 2 +- calendar/gui/dialogs/delete-error.c | 2 +- calendar/gui/dialogs/delete-error.h | 2 +- calendar/gui/dialogs/e-delegate-dialog.c | 2 +- calendar/gui/dialogs/e-delegate-dialog.h | 2 +- calendar/gui/dialogs/e-send-options-utils.c | 2 +- calendar/gui/dialogs/e-send-options-utils.h | 2 +- calendar/gui/dialogs/event-editor.c | 2 +- calendar/gui/dialogs/event-editor.h | 4 +- calendar/gui/dialogs/event-page.c | 6 +- calendar/gui/dialogs/event-page.h | 2 +- calendar/gui/dialogs/memo-editor.c | 2 +- calendar/gui/dialogs/memo-editor.h | 2 +- calendar/gui/dialogs/memo-page.c | 2 +- calendar/gui/dialogs/memo-page.h | 2 +- calendar/gui/dialogs/recur-comp.c | 2 +- calendar/gui/dialogs/recur-comp.h | 2 +- calendar/gui/dialogs/recurrence-page.c | 2 +- calendar/gui/dialogs/recurrence-page.h | 2 +- calendar/gui/dialogs/save-comp.c | 2 +- calendar/gui/dialogs/save-comp.h | 4 +- calendar/gui/dialogs/schedule-page.c | 2 +- calendar/gui/dialogs/schedule-page.h | 2 +- calendar/gui/dialogs/select-source-dialog.c | 2 +- calendar/gui/dialogs/select-source-dialog.h | 2 +- calendar/gui/dialogs/send-comp.c | 2 +- calendar/gui/dialogs/send-comp.h | 2 +- calendar/gui/dialogs/task-details-page.c | 2 +- calendar/gui/dialogs/task-details-page.h | 2 +- calendar/gui/dialogs/task-editor.c | 2 +- calendar/gui/dialogs/task-editor.h | 2 +- calendar/gui/dialogs/task-page.c | 4 +- calendar/gui/dialogs/task-page.h | 2 +- calendar/gui/e-alarm-list.c | 2 +- calendar/gui/e-alarm-list.h | 4 +- calendar/gui/e-attachment-handler-calendar.c | 2 +- calendar/gui/e-attachment-handler-calendar.h | 2 +- calendar/gui/e-cal-component-memo-preview.c | 2 +- calendar/gui/e-cal-component-memo-preview.h | 2 +- calendar/gui/e-cal-component-preview.c | 2 +- calendar/gui/e-cal-component-preview.h | 2 +- calendar/gui/e-cal-config.c | 2 +- calendar/gui/e-cal-config.h | 2 +- calendar/gui/e-cal-event.c | 2 +- calendar/gui/e-cal-event.h | 2 +- calendar/gui/e-cal-list-view-config.c | 2 +- calendar/gui/e-cal-list-view-config.h | 2 +- calendar/gui/e-cal-list-view.c | 2 +- calendar/gui/e-cal-list-view.h | 2 +- calendar/gui/e-cal-menu.c | 2 +- calendar/gui/e-cal-menu.h | 2 +- calendar/gui/e-cal-model-calendar.c | 2 +- calendar/gui/e-cal-model-calendar.h | 2 +- calendar/gui/e-cal-model-memos.c | 2 +- calendar/gui/e-cal-model-memos.h | 2 +- calendar/gui/e-cal-model-tasks.c | 2 +- calendar/gui/e-cal-model-tasks.h | 2 +- calendar/gui/e-cal-model.c | 28 +-- calendar/gui/e-cal-model.h | 4 +- calendar/gui/e-cal-popup.c | 2 +- calendar/gui/e-cal-popup.h | 2 +- calendar/gui/e-calendar-table-config.c | 2 +- calendar/gui/e-calendar-table-config.h | 2 +- calendar/gui/e-calendar-table.c | 2 +- calendar/gui/e-calendar-table.h | 2 +- calendar/gui/e-calendar-view.c | 6 +- calendar/gui/e-calendar-view.h | 2 +- calendar/gui/e-cell-date-edit-config.c | 2 +- calendar/gui/e-cell-date-edit-config.h | 2 +- calendar/gui/e-cell-date-edit-text.c | 2 +- calendar/gui/e-cell-date-edit-text.h | 2 +- calendar/gui/e-comp-editor-registry.c | 2 +- calendar/gui/e-comp-editor-registry.h | 2 +- calendar/gui/e-date-edit-config.c | 2 +- calendar/gui/e-date-edit-config.h | 2 +- calendar/gui/e-date-time-list.c | 2 +- calendar/gui/e-date-time-list.h | 2 +- calendar/gui/e-day-view-config.c | 2 +- calendar/gui/e-day-view-config.h | 2 +- calendar/gui/e-day-view-layout.c | 2 +- calendar/gui/e-day-view-layout.h | 2 +- calendar/gui/e-day-view-main-item.c | 2 +- calendar/gui/e-day-view-main-item.h | 2 +- calendar/gui/e-day-view-time-item.c | 4 +- calendar/gui/e-day-view-time-item.h | 2 +- calendar/gui/e-day-view-top-item.c | 2 +- calendar/gui/e-day-view-top-item.h | 2 +- calendar/gui/e-day-view.c | 28 +-- calendar/gui/e-day-view.h | 2 +- calendar/gui/e-itip-control.c | 4 +- calendar/gui/e-itip-control.h | 2 +- calendar/gui/e-meeting-attendee.c | 4 +- calendar/gui/e-meeting-attendee.h | 2 +- calendar/gui/e-meeting-list-view.c | 2 +- calendar/gui/e-meeting-list-view.h | 2 +- calendar/gui/e-meeting-store.c | 2 +- calendar/gui/e-meeting-store.h | 2 +- calendar/gui/e-meeting-time-sel-item.c | 2 +- calendar/gui/e-meeting-time-sel-item.h | 2 +- calendar/gui/e-meeting-time-sel.c | 2 +- calendar/gui/e-meeting-time-sel.h | 2 +- calendar/gui/e-meeting-types.h | 2 +- calendar/gui/e-meeting-utils.c | 2 +- calendar/gui/e-meeting-utils.h | 2 +- calendar/gui/e-memo-table-config.c | 2 +- calendar/gui/e-memo-table-config.h | 2 +- calendar/gui/e-memo-table.c | 2 +- calendar/gui/e-memo-table.h | 2 +- calendar/gui/e-memos.c | 2 +- calendar/gui/e-memos.h | 2 +- calendar/gui/e-mini-calendar-config.c | 2 +- calendar/gui/e-mini-calendar-config.h | 2 +- calendar/gui/e-select-names-editable.c | 8 +- calendar/gui/e-select-names-editable.h | 2 +- calendar/gui/e-select-names-renderer.c | 4 +- calendar/gui/e-select-names-renderer.h | 2 +- calendar/gui/e-tasks.c | 4 +- calendar/gui/e-tasks.h | 2 +- calendar/gui/e-timezone-entry.c | 2 +- calendar/gui/e-timezone-entry.h | 2 +- calendar/gui/e-week-view-config.c | 2 +- calendar/gui/e-week-view-config.h | 2 +- calendar/gui/e-week-view-event-item.c | 2 +- calendar/gui/e-week-view-event-item.h | 2 +- calendar/gui/e-week-view-layout.c | 2 +- calendar/gui/e-week-view-layout.h | 2 +- calendar/gui/e-week-view-main-item.c | 2 +- calendar/gui/e-week-view-main-item.h | 2 +- calendar/gui/e-week-view-titles-item.c | 2 +- calendar/gui/e-week-view-titles-item.h | 2 +- calendar/gui/e-week-view.c | 32 +-- calendar/gui/e-week-view.h | 2 +- calendar/gui/gnome-cal.c | 38 ++-- calendar/gui/gnome-cal.h | 2 +- calendar/gui/goto.c | 2 +- calendar/gui/goto.h | 2 +- calendar/gui/itip-bonobo-control.c | 2 +- calendar/gui/itip-bonobo-control.h | 4 +- calendar/gui/itip-utils.c | 2 +- calendar/gui/itip-utils.h | 2 +- calendar/gui/main.c | 2 +- calendar/gui/memos-component.c | 8 +- calendar/gui/memos-component.h | 2 +- calendar/gui/memos-control.c | 2 +- calendar/gui/memos-control.h | 2 +- calendar/gui/migration.c | 2 +- calendar/gui/migration.h | 2 +- calendar/gui/misc.c | 2 +- calendar/gui/misc.h | 2 +- calendar/gui/print.c | 2 +- calendar/gui/print.h | 2 +- calendar/gui/tag-calendar.c | 2 +- calendar/gui/tag-calendar.h | 2 +- calendar/gui/tasks-component.c | 8 +- calendar/gui/tasks-component.h | 2 +- calendar/gui/tasks-control.c | 4 +- calendar/gui/tasks-control.h | 2 +- calendar/gui/weekday-picker.c | 2 +- calendar/gui/weekday-picker.h | 2 +- calendar/importers/evolution-calendar-importer.h | 2 +- calendar/importers/icalendar-importer.c | 2 +- calendar/importers/main.c | 2 +- calendar/zones.h | 2 +- composer/e-composer-actions.c | 2 +- composer/e-composer-actions.h | 2 +- composer/e-composer-autosave.c | 2 +- composer/e-composer-autosave.h | 2 +- composer/e-composer-common.h | 2 +- composer/e-composer-from-header.c | 2 +- composer/e-composer-from-header.h | 2 +- composer/e-composer-header-table.c | 4 +- composer/e-composer-header-table.h | 2 +- composer/e-composer-header.c | 2 +- composer/e-composer-header.h | 4 +- composer/e-composer-name-header.c | 4 +- composer/e-composer-name-header.h | 2 +- composer/e-composer-post-header.c | 2 +- composer/e-composer-post-header.h | 2 +- composer/e-composer-private.c | 4 +- composer/e-composer-private.h | 2 +- composer/e-composer-text-header.c | 4 +- composer/e-composer-text-header.h | 2 +- composer/e-msg-composer.c | 12 +- composer/e-msg-composer.h | 2 +- e-util/e-bconf-map.c | 2 +- e-util/e-bconf-map.h | 2 +- e-util/e-binding.c | 2 +- e-util/e-binding.h | 2 +- e-util/e-bit-array.c | 2 +- e-util/e-bit-array.h | 2 +- e-util/e-categories-config.c | 2 +- e-util/e-categories-config.h | 2 +- e-util/e-config-listener.c | 2 +- e-util/e-config-listener.h | 2 +- e-util/e-config.c | 2 +- e-util/e-config.h | 2 +- e-util/e-corba-utils.c | 2 +- e-util/e-corba-utils.h | 2 +- e-util/e-cursor.c | 2 +- e-util/e-cursor.h | 2 +- e-util/e-dialog-utils.c | 2 +- e-util/e-dialog-utils.h | 2 +- e-util/e-dialog-widgets.c | 2 +- e-util/e-dialog-widgets.h | 2 +- e-util/e-error.c | 6 +- e-util/e-error.h | 2 +- e-util/e-event.c | 2 +- e-util/e-event.h | 2 +- e-util/e-folder-map.c | 2 +- e-util/e-folder-map.h | 2 +- e-util/e-fsutils.c | 2 +- e-util/e-fsutils.h | 2 +- e-util/e-html-utils.c | 2 +- e-util/e-html-utils.h | 2 +- e-util/e-icon-factory.c | 2 +- e-util/e-icon-factory.h | 2 +- e-util/e-import.c | 2 +- e-util/e-import.h | 2 +- e-util/e-logger.c | 6 +- e-util/e-logger.h | 2 +- e-util/e-menu.c | 2 +- e-util/e-menu.h | 2 +- e-util/e-mktemp.c | 2 +- e-util/e-mktemp.h | 2 +- e-util/e-non-intrusive-error-dialog.c | 2 +- e-util/e-pilot-map.c | 2 +- e-util/e-pilot-map.h | 2 +- e-util/e-pilot-util.c | 2 +- e-util/e-pilot-util.h | 2 +- e-util/e-plugin-ui.c | 4 +- e-util/e-plugin-ui.h | 2 +- e-util/e-plugin.c | 4 +- e-util/e-plugin.h | 6 +- e-util/e-popup.c | 2 +- e-util/e-popup.h | 2 +- e-util/e-print.c | 2 +- e-util/e-print.h | 2 +- e-util/e-profile-event.c | 2 +- e-util/e-profile-event.h | 2 +- e-util/e-request.c | 2 +- e-util/e-request.h | 2 +- e-util/e-signature-list.c | 2 +- e-util/e-signature-list.h | 2 +- e-util/e-signature.c | 2 +- e-util/e-signature.h | 2 +- e-util/e-sorter-array.c | 2 +- e-util/e-sorter-array.h | 2 +- e-util/e-sorter.c | 2 +- e-util/e-sorter.h | 2 +- e-util/e-text-event-processor-emacs-like.c | 2 +- e-util/e-text-event-processor-emacs-like.h | 2 +- e-util/e-text-event-processor-types.h | 2 +- e-util/e-text-event-processor.c | 2 +- e-util/e-text-event-processor.h | 2 +- e-util/e-util-labels.c | 4 +- e-util/e-util-labels.h | 2 +- e-util/e-util-private.h | 2 +- e-util/e-util.c | 8 +- e-util/e-util.h | 2 +- e-util/e-win32-reloc.c | 2 +- e-util/e-xml-utils.c | 2 +- e-util/e-xml-utils.h | 2 +- e-util/gconf-bridge.c | 38 ++-- e-util/gconf-bridge.h | 6 +- filter/filter-code.c | 2 +- filter/filter-code.h | 2 +- filter/filter-colour.c | 2 +- filter/filter-colour.h | 2 +- filter/filter-datespec.c | 2 +- filter/filter-datespec.h | 2 +- filter/filter-element.c | 2 +- filter/filter-element.h | 2 +- filter/filter-file.c | 2 +- filter/filter-file.h | 2 +- filter/filter-input.c | 2 +- filter/filter-input.h | 2 +- filter/filter-int.c | 2 +- filter/filter-int.h | 2 +- filter/filter-option.c | 2 +- filter/filter-option.h | 2 +- filter/filter-part.c | 2 +- filter/filter-part.h | 2 +- filter/filter-rule.c | 6 +- filter/filter-rule.h | 2 +- filter/rule-context.c | 2 +- filter/rule-context.h | 2 +- filter/rule-editor.c | 2 +- filter/rule-editor.h | 2 +- iconv-detect.c | 2 +- mail/e-attachment-handler-mail.c | 2 +- mail/e-attachment-handler-mail.h | 2 +- mail/e-mail-attachment-bar.c | 2 +- mail/e-mail-attachment-bar.h | 2 +- mail/e-mail-search-bar.c | 2 +- mail/e-mail-search-bar.h | 2 +- mail/e-searching-tokenizer.c | 2 +- mail/e-searching-tokenizer.h | 2 +- mail/em-account-editor.c | 24 +-- mail/em-account-editor.h | 2 +- mail/em-account-prefs.c | 2 +- mail/em-account-prefs.h | 2 +- mail/em-composer-prefs.c | 4 +- mail/em-composer-prefs.h | 2 +- mail/em-composer-utils.c | 26 +-- mail/em-composer-utils.h | 4 +- mail/em-config.c | 2 +- mail/em-config.h | 2 +- mail/em-event.c | 2 +- mail/em-event.h | 2 +- mail/em-filter-context.c | 2 +- mail/em-filter-context.h | 2 +- mail/em-filter-editor.c | 4 +- mail/em-filter-editor.h | 2 +- mail/em-filter-folder-element.c | 2 +- mail/em-filter-folder-element.h | 2 +- mail/em-filter-rule.c | 4 +- mail/em-filter-rule.h | 2 +- mail/em-filter-source-element.c | 2 +- mail/em-filter-source-element.h | 2 +- mail/em-folder-browser.c | 6 +- mail/em-folder-browser.h | 2 +- mail/em-folder-properties.c | 6 +- mail/em-folder-properties.h | 2 +- mail/em-folder-selection-button.c | 2 +- mail/em-folder-selection-button.h | 2 +- mail/em-folder-selection.c | 2 +- mail/em-folder-selection.h | 2 +- mail/em-folder-selector.c | 2 +- mail/em-folder-selector.h | 2 +- mail/em-folder-tree-model.c | 2 +- mail/em-folder-tree-model.h | 2 +- mail/em-folder-tree.c | 4 +- mail/em-folder-tree.h | 2 +- mail/em-folder-utils.c | 6 +- mail/em-folder-utils.h | 2 +- mail/em-folder-view.c | 18 +- mail/em-folder-view.h | 2 +- mail/em-format-hook.c | 2 +- mail/em-format-hook.h | 2 +- mail/em-format-html-display.c | 6 +- mail/em-format-html-display.h | 2 +- mail/em-format-html-print.c | 2 +- mail/em-format-html-print.h | 2 +- mail/em-format-html.c | 70 +++--- mail/em-format-html.h | 2 +- mail/em-format-quote.c | 28 +-- mail/em-format-quote.h | 2 +- mail/em-format.c | 2 +- mail/em-format.h | 2 +- mail/em-html-stream.c | 2 +- mail/em-html-stream.h | 2 +- mail/em-icon-stream.c | 2 +- mail/em-icon-stream.h | 2 +- mail/em-inline-filter.c | 2 +- mail/em-inline-filter.h | 2 +- mail/em-junk-hook.c | 2 +- mail/em-junk-hook.h | 2 +- mail/em-mailer-prefs.c | 10 +- mail/em-mailer-prefs.h | 4 +- mail/em-menu.c | 2 +- mail/em-menu.h | 2 +- mail/em-message-browser.c | 2 +- mail/em-message-browser.h | 2 +- mail/em-migrate.c | 24 +-- mail/em-migrate.h | 2 +- mail/em-network-prefs.c | 62 +++--- mail/em-network-prefs.h | 12 +- mail/em-popup.c | 4 +- mail/em-popup.h | 2 +- mail/em-search-context.c | 2 +- mail/em-search-context.h | 2 +- mail/em-stripsig-filter.c | 2 +- mail/em-stripsig-filter.h | 2 +- mail/em-subscribe-editor.c | 10 +- mail/em-subscribe-editor.h | 2 +- mail/em-sync-stream.c | 2 +- mail/em-sync-stream.h | 2 +- mail/em-utils.c | 20 +- mail/em-utils.h | 2 +- mail/em-vfolder-context.c | 2 +- mail/em-vfolder-context.h | 2 +- mail/em-vfolder-editor.c | 2 +- mail/em-vfolder-editor.h | 2 +- mail/em-vfolder-rule.c | 2 +- mail/em-vfolder-rule.h | 2 +- mail/importers/elm-importer.c | 2 +- mail/importers/evolution-mbox-importer.c | 2 +- mail/importers/mail-importer.c | 2 +- mail/importers/mail-importer.h | 2 +- mail/importers/pine-importer.c | 2 +- mail/mail-autofilter.c | 2 +- mail/mail-autofilter.h | 2 +- mail/mail-component-factory.c | 2 +- mail/mail-component.c | 4 +- mail/mail-component.h | 2 +- mail/mail-config-factory.c | 2 +- mail/mail-config-factory.h | 2 +- mail/mail-config.c | 12 +- mail/mail-config.h | 2 +- mail/mail-crypto.c | 2 +- mail/mail-crypto.h | 2 +- mail/mail-folder-cache.c | 6 +- mail/mail-folder-cache.h | 2 +- mail/mail-mt.c | 2 +- mail/mail-mt.h | 2 +- mail/mail-ops.c | 12 +- mail/mail-ops.h | 2 +- mail/mail-send-recv.c | 8 +- mail/mail-send-recv.h | 2 +- mail/mail-session.c | 2 +- mail/mail-session.h | 2 +- mail/mail-signature-editor.c | 2 +- mail/mail-signature-editor.h | 2 +- mail/mail-tools.c | 2 +- mail/mail-tools.h | 2 +- mail/mail-types.h | 2 +- mail/mail-vfolder.c | 2 +- mail/mail-vfolder.h | 2 +- mail/message-list.c | 12 +- mail/message-list.h | 2 +- mail/message-tag-editor.c | 2 +- mail/message-tag-editor.h | 2 +- mail/message-tag-followup.c | 2 +- mail/message-tag-followup.h | 2 +- plugins/addressbook-file/addressbook-file.c | 2 +- plugins/attachment-reminder/attachment-reminder.c | 2 +- plugins/audio-inline/audio-inline.c | 2 +- plugins/backup-restore/backup-restore.c | 6 +- plugins/backup-restore/backup.c | 14 +- plugins/bbdb/bbdb.c | 4 +- plugins/bbdb/bbdb.h | 2 +- plugins/bbdb/gaimbuddies.c | 6 +- plugins/bbdb/test-evobuddy.c | 2 +- plugins/bogo-junk-plugin/bf-junk-filter.c | 10 +- plugins/caldav/caldav-source.c | 2 +- plugins/calendar-file/calendar-file.c | 2 +- plugins/copy-tool/copy-tool.c | 2 +- plugins/default-mailer/default-mailer.c | 2 +- plugins/default-source/default-source.c | 2 +- plugins/email-custom-header/email-custom-header.c | 88 ++++---- plugins/email-custom-header/email-custom-header.h | 4 +- .../exchange-operations/exchange-account-setup.c | 22 +- plugins/exchange-operations/exchange-calendar.c | 2 +- .../exchange-operations/exchange-change-password.c | 2 +- .../exchange-operations/exchange-change-password.h | 2 +- .../exchange-operations/exchange-config-listener.c | 2 +- .../exchange-operations/exchange-config-listener.h | 2 +- plugins/exchange-operations/exchange-contacts.c | 4 +- .../exchange-operations/exchange-delegates-user.c | 2 +- .../exchange-operations/exchange-delegates-user.h | 2 +- plugins/exchange-operations/exchange-delegates.c | 2 +- plugins/exchange-operations/exchange-delegates.h | 2 +- .../exchange-folder-permission.c | 2 +- .../exchange-folder-size-display.c | 2 +- .../exchange-folder-size-display.h | 2 +- .../exchange-folder-subscription.c | 2 +- .../exchange-folder-subscription.h | 2 +- plugins/exchange-operations/exchange-folder.c | 2 +- .../exchange-mail-send-options.c | 2 +- plugins/exchange-operations/exchange-operations.c | 2 +- plugins/exchange-operations/exchange-operations.h | 2 +- .../exchange-permissions-dialog.c | 2 +- .../exchange-permissions-dialog.h | 2 +- .../exchange-operations/exchange-send-options.c | 2 +- .../exchange-operations/exchange-send-options.h | 2 +- plugins/exchange-operations/exchange-user-dialog.c | 2 +- plugins/exchange-operations/exchange-user-dialog.h | 2 +- plugins/face/face.c | 2 +- plugins/folder-unsubscribe/folder-unsubscribe.c | 2 +- .../google-account-setup/google-contacts-source.c | 2 +- .../google-account-setup/google-contacts-source.h | 2 +- plugins/google-account-setup/google-source.c | 4 +- .../groupwise-account-setup/camel-gw-listener.c | 14 +- .../groupwise-account-setup/camel-gw-listener.h | 2 +- .../groupwise-account-setup.c | 6 +- plugins/groupwise-features/addressbook-groupwise.c | 2 +- plugins/groupwise-features/install-shared.c | 2 +- plugins/groupwise-features/junk-mail-settings.c | 2 +- plugins/groupwise-features/junk-settings.c | 2 +- plugins/groupwise-features/junk-settings.h | 2 +- plugins/groupwise-features/mail-retract.c | 8 +- plugins/groupwise-features/mail-send-options.c | 2 +- plugins/groupwise-features/mail-send-options.h | 2 +- plugins/groupwise-features/process-meeting.c | 30 +-- plugins/groupwise-features/proxy-login.c | 2 +- plugins/groupwise-features/proxy-login.h | 2 +- plugins/groupwise-features/proxy.c | 2 +- plugins/groupwise-features/proxy.h | 2 +- plugins/groupwise-features/send-options.c | 2 +- plugins/groupwise-features/share-folder-common.c | 2 +- plugins/groupwise-features/share-folder.c | 2 +- plugins/groupwise-features/share-folder.h | 2 +- plugins/groupwise-features/status-track.c | 2 +- plugins/hula-account-setup/camel-hula-listener.c | 2 +- plugins/hula-account-setup/camel-hula-listener.h | 2 +- plugins/hula-account-setup/hula-account-setup.c | 2 +- plugins/imap-features/imap-headers.c | 4 +- plugins/ipod-sync/evolution-ipod-sync.c | 2 +- plugins/ipod-sync/evolution-ipod-sync.h | 2 +- plugins/ipod-sync/format-handler.h | 2 +- plugins/ipod-sync/ical-format.c | 4 +- plugins/ipod-sync/ipod-sync.c | 4 +- plugins/ipod-sync/ipod.c | 2 +- plugins/ipod-sync/sync.c | 4 +- plugins/itip-formatter/itip-formatter.c | 16 +- plugins/itip-formatter/itip-view.c | 24 +-- plugins/itip-formatter/itip-view.h | 2 +- .../mail-account-disable/mail-account-disable.c | 2 +- plugins/mail-notification/mail-notification.c | 24 +-- plugins/mail-to-task/mail-to-task.c | 6 +- .../mailing-list-actions/mailing-list-actions.c | 2 +- plugins/mark-all-read/mark-all-read.c | 2 +- plugins/mono/mono-plugin.c | 8 +- plugins/mono/mono-plugin.h | 2 +- plugins/plugin-manager/plugin-manager.c | 6 +- plugins/prefer-plain/prefer-plain.c | 2 +- plugins/profiler/profiler.c | 2 +- plugins/pst-import/pst-importer.c | 240 ++++++++++----------- plugins/publish-calendar/publish-calendar.c | 14 +- plugins/publish-calendar/publish-format-fb.c | 2 +- plugins/publish-calendar/publish-format-fb.h | 2 +- plugins/publish-calendar/publish-format-ical.c | 2 +- plugins/publish-calendar/publish-format-ical.h | 2 +- plugins/publish-calendar/publish-location.c | 2 +- plugins/publish-calendar/publish-location.h | 2 +- plugins/publish-calendar/url-editor-dialog.c | 2 +- plugins/publish-calendar/url-editor-dialog.h | 2 +- plugins/python/python-plugin-loader.c | 12 +- plugins/python/python-plugin-loader.h | 2 +- plugins/sa-junk-plugin/em-junk-filter.c | 12 +- plugins/save-calendar/csv-format.c | 2 +- plugins/save-calendar/format-handler.h | 2 +- plugins/save-calendar/ical-format.c | 2 +- plugins/save-calendar/rdf-format.c | 2 +- plugins/save-calendar/save-calendar.c | 2 +- plugins/select-one-source/select-one-source.c | 2 +- plugins/startup-wizard/startup-wizard.c | 2 +- plugins/subject-thread/subject-thread.c | 2 +- plugins/templates/templates.c | 62 +++--- plugins/tnef-attachments/tnef-plugin.c | 4 +- plugins/vcard-inline/vcard-inline.c | 2 +- .../webdav-account-setup/webdav-contacts-source.c | 2 +- shell/e-component-registry.c | 2 +- shell/e-component-registry.h | 2 +- shell/e-component-view.c | 2 +- shell/e-component-view.h | 2 +- shell/e-config-upgrade.c | 2 +- shell/e-config-upgrade.h | 2 +- shell/e-corba-config-page.c | 2 +- shell/e-corba-config-page.h | 2 +- shell/e-shell-constants.h | 2 +- shell/e-shell-importer.c | 2 +- shell/e-shell-importer.h | 2 +- shell/e-shell-nm.c | 2 +- shell/e-shell-settings-dialog.c | 2 +- shell/e-shell-settings-dialog.h | 2 +- shell/e-shell-view.c | 2 +- shell/e-shell-view.h | 2 +- shell/e-shell-window-commands.c | 2 +- shell/e-shell-window-commands.h | 2 +- shell/e-shell-window.c | 8 +- shell/e-shell-window.h | 2 +- shell/e-shell.c | 2 +- shell/e-shell.h | 4 +- shell/e-sidebar.c | 2 +- shell/e-sidebar.h | 2 +- shell/e-user-creatable-items-handler.c | 2 +- shell/e-user-creatable-items-handler.h | 2 +- shell/es-event.c | 2 +- shell/es-event.h | 2 +- shell/es-menu.c | 2 +- shell/es-menu.h | 2 +- shell/evolution-component.c | 2 +- shell/evolution-component.h | 2 +- shell/evolution-config-control.c | 2 +- shell/evolution-config-control.h | 2 +- shell/evolution-listener.c | 2 +- shell/evolution-listener.h | 2 +- shell/evolution-shell-component-utils.c | 2 +- shell/evolution-shell-component-utils.h | 2 +- shell/importer/evolution-importer-client.c | 2 +- shell/importer/evolution-importer-client.h | 2 +- shell/importer/evolution-importer-listener.c | 2 +- shell/importer/evolution-importer-listener.h | 2 +- shell/importer/evolution-importer.c | 2 +- shell/importer/evolution-importer.h | 2 +- shell/importer/evolution-intelligent-importer.c | 2 +- shell/importer/evolution-intelligent-importer.h | 2 +- shell/importer/intelligent.c | 2 +- shell/importer/intelligent.h | 2 +- shell/main.c | 6 +- shell/test/evolution-test-component.c | 2 +- shell/test/evolution-test-component.h | 2 +- smime/gui/ca-trust-dialog.c | 2 +- smime/gui/ca-trust-dialog.h | 2 +- smime/gui/cert-trust-dialog.c | 2 +- smime/gui/cert-trust-dialog.h | 2 +- smime/gui/certificate-manager.c | 2 +- smime/gui/certificate-manager.h | 2 +- smime/gui/certificate-viewer.c | 2 +- smime/gui/certificate-viewer.h | 2 +- smime/gui/component.c | 2 +- smime/gui/component.h | 2 +- smime/gui/e-cert-selector.c | 2 +- smime/gui/e-cert-selector.h | 2 +- smime/lib/e-asn1-object.h | 2 +- smime/lib/e-cert-db.h | 2 +- smime/lib/e-cert-trust.h | 2 +- smime/lib/e-cert.h | 2 +- smime/lib/e-pkcs12.h | 2 +- smime/tests/import-cert.c | 2 +- tools/killev.c | 2 +- widgets/e-timezone-dialog/e-timezone-dialog.c | 16 +- widgets/e-timezone-dialog/e-timezone-dialog.h | 2 +- widgets/menus/gal-define-views-dialog.c | 2 +- widgets/menus/gal-define-views-dialog.h | 2 +- widgets/menus/gal-define-views-model.c | 2 +- widgets/menus/gal-define-views-model.h | 2 +- widgets/menus/gal-view-collection.c | 2 +- widgets/menus/gal-view-collection.h | 2 +- widgets/menus/gal-view-etable.c | 2 +- widgets/menus/gal-view-etable.h | 2 +- widgets/menus/gal-view-factory-etable.c | 2 +- widgets/menus/gal-view-factory-etable.h | 2 +- widgets/menus/gal-view-factory.c | 2 +- widgets/menus/gal-view-factory.h | 2 +- widgets/menus/gal-view-instance-save-as-dialog.c | 2 +- widgets/menus/gal-view-instance-save-as-dialog.h | 2 +- widgets/menus/gal-view-instance.c | 2 +- widgets/menus/gal-view-instance.h | 2 +- widgets/menus/gal-view-menus.c | 2 +- widgets/menus/gal-view-menus.h | 2 +- widgets/menus/gal-view-new-dialog.c | 2 +- widgets/menus/gal-view-new-dialog.h | 2 +- widgets/menus/gal-view.c | 2 +- widgets/menus/gal-view.h | 2 +- widgets/misc/e-account-combo-box.c | 2 +- widgets/misc/e-account-combo-box.h | 2 +- widgets/misc/e-activity-handler.c | 30 +-- widgets/misc/e-activity-handler.h | 2 +- widgets/misc/e-attachment-button.c | 2 +- widgets/misc/e-attachment-button.h | 2 +- widgets/misc/e-attachment-dialog.c | 2 +- widgets/misc/e-attachment-dialog.h | 2 +- widgets/misc/e-attachment-handler-image.c | 2 +- widgets/misc/e-attachment-handler-image.h | 2 +- widgets/misc/e-attachment-handler.c | 2 +- widgets/misc/e-attachment-handler.h | 2 +- widgets/misc/e-attachment-icon-view.c | 2 +- widgets/misc/e-attachment-icon-view.h | 2 +- widgets/misc/e-attachment-paned.c | 2 +- widgets/misc/e-attachment-paned.h | 2 +- widgets/misc/e-attachment-store.c | 2 +- widgets/misc/e-attachment-store.h | 2 +- widgets/misc/e-attachment-tree-view.c | 2 +- widgets/misc/e-attachment-tree-view.h | 2 +- widgets/misc/e-attachment-view.c | 2 +- widgets/misc/e-attachment-view.h | 2 +- widgets/misc/e-attachment.c | 2 +- widgets/misc/e-attachment.h | 2 +- widgets/misc/e-calendar-item.c | 8 +- widgets/misc/e-calendar-item.h | 2 +- widgets/misc/e-calendar.c | 2 +- widgets/misc/e-calendar.h | 2 +- widgets/misc/e-canvas-background.c | 2 +- widgets/misc/e-canvas-background.h | 2 +- widgets/misc/e-canvas-utils.c | 2 +- widgets/misc/e-canvas-utils.h | 2 +- widgets/misc/e-canvas-vbox.c | 2 +- widgets/misc/e-canvas-vbox.h | 2 +- widgets/misc/e-canvas.c | 2 +- widgets/misc/e-canvas.h | 2 +- widgets/misc/e-cell-date-edit.c | 2 +- widgets/misc/e-cell-date-edit.h | 2 +- widgets/misc/e-cell-percent.c | 2 +- widgets/misc/e-cell-percent.h | 2 +- widgets/misc/e-cell-renderer-combo.c | 2 +- widgets/misc/e-cell-renderer-combo.h | 2 +- widgets/misc/e-charset-picker.c | 4 +- widgets/misc/e-charset-picker.h | 2 +- widgets/misc/e-colors.c | 2 +- widgets/misc/e-colors.h | 2 +- widgets/misc/e-combo-button.c | 2 +- widgets/misc/e-combo-button.h | 2 +- widgets/misc/e-combo-cell-editable.c | 2 +- widgets/misc/e-combo-cell-editable.h | 2 +- widgets/misc/e-config-page.c | 2 +- widgets/misc/e-config-page.h | 2 +- widgets/misc/e-cursors.c | 2 +- widgets/misc/e-cursors.h | 2 +- widgets/misc/e-dateedit.c | 6 +- widgets/misc/e-dropdown-button.c | 2 +- widgets/misc/e-dropdown-button.h | 2 +- widgets/misc/e-filter-bar.c | 2 +- widgets/misc/e-filter-bar.h | 2 +- widgets/misc/e-gui-utils.c | 2 +- widgets/misc/e-gui-utils.h | 2 +- widgets/misc/e-image-chooser.c | 2 +- widgets/misc/e-image-chooser.h | 2 +- widgets/misc/e-info-label.c | 2 +- widgets/misc/e-info-label.h | 2 +- widgets/misc/e-map.c | 2 +- widgets/misc/e-map.h | 2 +- widgets/misc/e-multi-config-dialog.c | 2 +- widgets/misc/e-multi-config-dialog.h | 2 +- widgets/misc/e-online-button.c | 2 +- widgets/misc/e-online-button.h | 2 +- widgets/misc/e-pilot-settings.c | 2 +- widgets/misc/e-pilot-settings.h | 2 +- widgets/misc/e-popup-menu.c | 2 +- widgets/misc/e-popup-menu.h | 2 +- widgets/misc/e-printable.c | 2 +- widgets/misc/e-printable.h | 2 +- widgets/misc/e-reflow-model.c | 2 +- widgets/misc/e-reflow-model.h | 2 +- widgets/misc/e-reflow.c | 2 +- widgets/misc/e-reflow.h | 2 +- widgets/misc/e-search-bar.c | 4 +- widgets/misc/e-search-bar.h | 2 +- widgets/misc/e-selection-model-array.c | 2 +- widgets/misc/e-selection-model-array.h | 2 +- widgets/misc/e-selection-model-simple.c | 2 +- widgets/misc/e-selection-model-simple.h | 2 +- widgets/misc/e-selection-model.c | 2 +- widgets/misc/e-selection-model.h | 2 +- widgets/misc/e-send-options.c | 2 +- widgets/misc/e-send-options.h | 4 +- widgets/misc/e-signature-combo-box.c | 2 +- widgets/misc/e-signature-combo-box.h | 2 +- widgets/misc/e-task-bar.c | 8 +- widgets/misc/e-task-bar.h | 4 +- widgets/misc/e-task-widget.c | 4 +- widgets/misc/e-task-widget.h | 2 +- widgets/misc/e-unicode.c | 2 +- widgets/misc/e-unicode.h | 2 +- widgets/misc/e-url-entry.c | 2 +- widgets/misc/e-url-entry.h | 2 +- widgets/misc/test-calendar.c | 2 +- widgets/misc/test-dateedit.c | 2 +- widgets/misc/test-dropdown-button.c | 2 +- widgets/misc/test-error.c | 2 +- widgets/misc/test-info-label.c | 2 +- widgets/misc/test-multi-config-dialog.c | 2 +- widgets/table/e-cell-checkbox.c | 2 +- widgets/table/e-cell-checkbox.h | 2 +- widgets/table/e-cell-combo.c | 2 +- widgets/table/e-cell-combo.h | 2 +- widgets/table/e-cell-date.c | 4 +- widgets/table/e-cell-date.h | 2 +- widgets/table/e-cell-hbox.c | 2 +- widgets/table/e-cell-hbox.h | 2 +- widgets/table/e-cell-number.c | 2 +- widgets/table/e-cell-number.h | 2 +- widgets/table/e-cell-pixbuf.c | 6 +- widgets/table/e-cell-pixbuf.h | 2 +- widgets/table/e-cell-popup.c | 2 +- widgets/table/e-cell-popup.h | 2 +- widgets/table/e-cell-size.c | 2 +- widgets/table/e-cell-size.h | 2 +- widgets/table/e-cell-text.c | 2 +- widgets/table/e-cell-text.h | 2 +- widgets/table/e-cell-toggle.c | 10 +- widgets/table/e-cell-toggle.h | 2 +- widgets/table/e-cell-vbox.c | 2 +- widgets/table/e-cell-vbox.h | 2 +- widgets/table/e-cell.c | 2 +- widgets/table/e-cell.h | 2 +- widgets/table/e-table-click-to-add.c | 2 +- widgets/table/e-table-click-to-add.h | 2 +- widgets/table/e-table-col-dnd.h | 2 +- widgets/table/e-table-col.c | 2 +- widgets/table/e-table-col.h | 2 +- widgets/table/e-table-column-specification.c | 2 +- widgets/table/e-table-column-specification.h | 2 +- widgets/table/e-table-column.c | 2 +- widgets/table/e-table-config-field.c | 2 +- widgets/table/e-table-config-field.h | 2 +- widgets/table/e-table-config.c | 2 +- widgets/table/e-table-config.h | 2 +- widgets/table/e-table-defines.h | 2 +- widgets/table/e-table-example-1.c | 2 +- widgets/table/e-table-example-2.c | 2 +- widgets/table/e-table-extras.c | 2 +- widgets/table/e-table-extras.h | 2 +- widgets/table/e-table-field-chooser-dialog.c | 2 +- widgets/table/e-table-field-chooser-dialog.h | 2 +- widgets/table/e-table-field-chooser-item.c | 2 +- widgets/table/e-table-field-chooser-item.h | 2 +- widgets/table/e-table-field-chooser.c | 2 +- widgets/table/e-table-field-chooser.h | 2 +- widgets/table/e-table-group-container.c | 2 +- widgets/table/e-table-group-container.h | 2 +- widgets/table/e-table-group-leaf.c | 2 +- widgets/table/e-table-group-leaf.h | 2 +- widgets/table/e-table-group.c | 2 +- widgets/table/e-table-group.h | 2 +- widgets/table/e-table-header-item.c | 2 +- widgets/table/e-table-header-item.h | 2 +- widgets/table/e-table-header-utils.c | 2 +- widgets/table/e-table-header-utils.h | 2 +- widgets/table/e-table-header.c | 2 +- widgets/table/e-table-header.h | 2 +- widgets/table/e-table-item.c | 26 +-- widgets/table/e-table-item.h | 2 +- widgets/table/e-table-memory-callbacks.c | 2 +- widgets/table/e-table-memory-callbacks.h | 2 +- widgets/table/e-table-memory-store.c | 2 +- widgets/table/e-table-memory-store.h | 2 +- widgets/table/e-table-memory.c | 2 +- widgets/table/e-table-memory.h | 2 +- widgets/table/e-table-model.c | 2 +- widgets/table/e-table-model.h | 2 +- widgets/table/e-table-one.c | 2 +- widgets/table/e-table-one.h | 2 +- widgets/table/e-table-scrolled.c | 2 +- widgets/table/e-table-scrolled.h | 2 +- widgets/table/e-table-search.c | 2 +- widgets/table/e-table-search.h | 2 +- widgets/table/e-table-selection-model.c | 2 +- widgets/table/e-table-selection-model.h | 2 +- widgets/table/e-table-simple.c | 2 +- widgets/table/e-table-simple.h | 2 +- widgets/table/e-table-sort-info.c | 2 +- widgets/table/e-table-sort-info.h | 2 +- widgets/table/e-table-sorted-variable.c | 2 +- widgets/table/e-table-sorted-variable.h | 2 +- widgets/table/e-table-sorted.c | 2 +- widgets/table/e-table-sorted.h | 2 +- widgets/table/e-table-sorter.c | 2 +- widgets/table/e-table-sorter.h | 2 +- widgets/table/e-table-sorting-utils.c | 2 +- widgets/table/e-table-sorting-utils.h | 2 +- widgets/table/e-table-specification.c | 2 +- widgets/table/e-table-specification.h | 2 +- widgets/table/e-table-state.c | 2 +- widgets/table/e-table-state.h | 2 +- widgets/table/e-table-subset-variable.c | 2 +- widgets/table/e-table-subset-variable.h | 2 +- widgets/table/e-table-subset.c | 2 +- widgets/table/e-table-subset.h | 2 +- widgets/table/e-table-tooltip.h | 2 +- widgets/table/e-table-tree.h | 2 +- widgets/table/e-table-utils.c | 2 +- widgets/table/e-table-utils.h | 2 +- widgets/table/e-table-without.c | 2 +- widgets/table/e-table-without.h | 2 +- widgets/table/e-table.c | 2 +- widgets/table/e-table.h | 2 +- widgets/table/e-tree-memory-callbacks.c | 2 +- widgets/table/e-tree-memory-callbacks.h | 2 +- widgets/table/e-tree-memory.c | 2 +- widgets/table/e-tree-memory.h | 2 +- widgets/table/e-tree-model.c | 2 +- widgets/table/e-tree-model.h | 2 +- widgets/table/e-tree-scrolled.c | 2 +- widgets/table/e-tree-scrolled.h | 2 +- widgets/table/e-tree-selection-model.c | 2 +- widgets/table/e-tree-selection-model.h | 2 +- widgets/table/e-tree-simple.c | 2 +- widgets/table/e-tree-simple.h | 2 +- widgets/table/e-tree-sorted-variable.c | 2 +- widgets/table/e-tree-sorted-variable.h | 2 +- widgets/table/e-tree-sorted.c | 2 +- widgets/table/e-tree-sorted.h | 2 +- widgets/table/e-tree-table-adapter.c | 2 +- widgets/table/e-tree-table-adapter.h | 2 +- widgets/table/e-tree.c | 4 +- widgets/table/e-tree.h | 2 +- widgets/table/table-test.h | 2 +- widgets/text/e-text-model-repos.c | 2 +- widgets/text/e-text-model-repos.h | 2 +- widgets/text/e-text-model.c | 2 +- widgets/text/e-text-model.h | 2 +- widgets/text/e-text.c | 8 +- widgets/text/e-text.h | 2 +- 1096 files changed, 1795 insertions(+), 1795 deletions(-) (limited to 'widgets') diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c index 962e73e707..6c2da221b9 100644 --- a/a11y/addressbook/ea-addressbook-view.c +++ b/a11y/addressbook/ea-addressbook-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-addressbook-view.h b/a11y/addressbook/ea-addressbook-view.h index 86782ad737..f223f24a0c 100644 --- a/a11y/addressbook/ea-addressbook-view.h +++ b/a11y/addressbook/ea-addressbook-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-addressbook.c b/a11y/addressbook/ea-addressbook.c index b41a98434e..8ccff66a5b 100644 --- a/a11y/addressbook/ea-addressbook.c +++ b/a11y/addressbook/ea-addressbook.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-addressbook.h b/a11y/addressbook/ea-addressbook.h index 337f467760..97b691dc18 100644 --- a/a11y/addressbook/ea-addressbook.h +++ b/a11y/addressbook/ea-addressbook.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c index 944060b91a..dab53e6ce5 100644 --- a/a11y/addressbook/ea-minicard-view.c +++ b/a11y/addressbook/ea-minicard-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-minicard-view.h b/a11y/addressbook/ea-minicard-view.h index 922941cb7b..f20ef4487b 100644 --- a/a11y/addressbook/ea-minicard-view.h +++ b/a11y/addressbook/ea-minicard-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c index 258fcbd4bc..d77d591fcc 100644 --- a/a11y/addressbook/ea-minicard.c +++ b/a11y/addressbook/ea-minicard.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-minicard.h b/a11y/addressbook/ea-minicard.h index 9c0c8a2b56..15f89e19c3 100644 --- a/a11y/addressbook/ea-minicard.h +++ b/a11y/addressbook/ea-minicard.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c index 7b7e8eaa92..e0c0f8fdac 100644 --- a/a11y/calendar/ea-cal-view-event.c +++ b/a11y/calendar/ea-cal-view-event.c @@ -10,11 +10,11 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: - * Bolian Yin + * Bolian Yin * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/a11y/calendar/ea-cal-view-event.h b/a11y/calendar/ea-cal-view-event.h index c5000095f6..fccf023a82 100644 --- a/a11y/calendar/ea-cal-view-event.h +++ b/a11y/calendar/ea-cal-view-event.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c index e184b919b9..7e337ac16b 100644 --- a/a11y/calendar/ea-cal-view.c +++ b/a11y/calendar/ea-cal-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-cal-view.h b/a11y/calendar/ea-cal-view.h index e8ebb9eb37..9aa026ef6d 100644 --- a/a11y/calendar/ea-cal-view.h +++ b/a11y/calendar/ea-cal-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c index cc9474c0bc..f07cdfa086 100644 --- a/a11y/calendar/ea-calendar-helpers.c +++ b/a11y/calendar/ea-calendar-helpers.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-calendar-helpers.h b/a11y/calendar/ea-calendar-helpers.h index 3c980f2911..a4045cd7af 100644 --- a/a11y/calendar/ea-calendar-helpers.h +++ b/a11y/calendar/ea-calendar-helpers.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-calendar.c b/a11y/calendar/ea-calendar.c index bc37ab3079..26e73da6da 100644 --- a/a11y/calendar/ea-calendar.c +++ b/a11y/calendar/ea-calendar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-calendar.h b/a11y/calendar/ea-calendar.h index 36ef7d5ea0..b2238ffdbc 100644 --- a/a11y/calendar/ea-calendar.h +++ b/a11y/calendar/ea-calendar.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-day-view-cell.c b/a11y/calendar/ea-day-view-cell.c index 1b8e111e97..bc303f380f 100644 --- a/a11y/calendar/ea-day-view-cell.c +++ b/a11y/calendar/ea-day-view-cell.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-day-view-cell.h b/a11y/calendar/ea-day-view-cell.h index ca674e2451..e0394c639b 100644 --- a/a11y/calendar/ea-day-view-cell.h +++ b/a11y/calendar/ea-day-view-cell.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c index aeaf1d105c..783710dc61 100644 --- a/a11y/calendar/ea-day-view-main-item.c +++ b/a11y/calendar/ea-day-view-main-item.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-day-view-main-item.h b/a11y/calendar/ea-day-view-main-item.h index 79b166f39a..0ee7b5e0d1 100644 --- a/a11y/calendar/ea-day-view-main-item.h +++ b/a11y/calendar/ea-day-view-main-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c index b43ddbe56f..107f983bb0 100644 --- a/a11y/calendar/ea-day-view.c +++ b/a11y/calendar/ea-day-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-day-view.h b/a11y/calendar/ea-day-view.h index 5c4773d048..011064a764 100644 --- a/a11y/calendar/ea-day-view.h +++ b/a11y/calendar/ea-day-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c index b6eee2699c..4d6e752b8e 100644 --- a/a11y/calendar/ea-gnome-calendar.c +++ b/a11y/calendar/ea-gnome-calendar.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-gnome-calendar.h b/a11y/calendar/ea-gnome-calendar.h index 50c43072af..56e695a684 100644 --- a/a11y/calendar/ea-gnome-calendar.h +++ b/a11y/calendar/ea-gnome-calendar.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-jump-button.c b/a11y/calendar/ea-jump-button.c index 3f9c72e33d..7888196b8d 100644 --- a/a11y/calendar/ea-jump-button.c +++ b/a11y/calendar/ea-jump-button.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-jump-button.h b/a11y/calendar/ea-jump-button.h index 4fbd92022f..cb2bea315d 100644 --- a/a11y/calendar/ea-jump-button.h +++ b/a11y/calendar/ea-jump-button.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-week-view-cell.c b/a11y/calendar/ea-week-view-cell.c index 1d1b4d004f..4c7a591121 100644 --- a/a11y/calendar/ea-week-view-cell.c +++ b/a11y/calendar/ea-week-view-cell.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-week-view-cell.h b/a11y/calendar/ea-week-view-cell.h index b09d7d1789..4cd2971b80 100644 --- a/a11y/calendar/ea-week-view-cell.h +++ b/a11y/calendar/ea-week-view-cell.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c index 5bfb73306b..ae507df235 100644 --- a/a11y/calendar/ea-week-view-main-item.c +++ b/a11y/calendar/ea-week-view-main-item.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-week-view-main-item.h b/a11y/calendar/ea-week-view-main-item.h index 12687d26c0..2093de10bd 100644 --- a/a11y/calendar/ea-week-view-main-item.h +++ b/a11y/calendar/ea-week-view-main-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c index 6cf234c864..1d88e40c46 100644 --- a/a11y/calendar/ea-week-view.c +++ b/a11y/calendar/ea-week-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-week-view.h b/a11y/calendar/ea-week-view.h index b24fe72103..5a83276059 100644 --- a/a11y/calendar/ea-week-view.h +++ b/a11y/calendar/ea-week-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c index 1a40b23a21..5ae3cef686 100644 --- a/a11y/e-table/gal-a11y-e-cell-popup.c +++ b/a11y/e-table/gal-a11y-e-cell-popup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-popup.h b/a11y/e-table/gal-a11y-e-cell-popup.h index ebc16c1880..4bee17e8ce 100644 --- a/a11y/e-table/gal-a11y-e-cell-popup.h +++ b/a11y/e-table/gal-a11y-e-cell-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-registry.c b/a11y/e-table/gal-a11y-e-cell-registry.c index b88fb581fc..1da241fea9 100644 --- a/a11y/e-table/gal-a11y-e-cell-registry.c +++ b/a11y/e-table/gal-a11y-e-cell-registry.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-registry.h b/a11y/e-table/gal-a11y-e-cell-registry.h index f231567222..bc43a662cc 100644 --- a/a11y/e-table/gal-a11y-e-cell-registry.h +++ b/a11y/e-table/gal-a11y-e-cell-registry.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c index e77c0739a9..a2b9f715f8 100644 --- a/a11y/e-table/gal-a11y-e-cell-text.c +++ b/a11y/e-table/gal-a11y-e-cell-text.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-text.h b/a11y/e-table/gal-a11y-e-cell-text.h index c69b374100..fe404169a1 100644 --- a/a11y/e-table/gal-a11y-e-cell-text.h +++ b/a11y/e-table/gal-a11y-e-cell-text.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c index 23114b0373..c0425a0cbb 100644 --- a/a11y/e-table/gal-a11y-e-cell-toggle.c +++ b/a11y/e-table/gal-a11y-e-cell-toggle.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.h b/a11y/e-table/gal-a11y-e-cell-toggle.h index 56483aae6b..769e0b4200 100644 --- a/a11y/e-table/gal-a11y-e-cell-toggle.h +++ b/a11y/e-table/gal-a11y-e-cell-toggle.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c index 520a818a37..0a5f8e2019 100644 --- a/a11y/e-table/gal-a11y-e-cell-tree.c +++ b/a11y/e-table/gal-a11y-e-cell-tree.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-tree.h b/a11y/e-table/gal-a11y-e-cell-tree.h index f6f6d9dd70..43169c2f28 100644 --- a/a11y/e-table/gal-a11y-e-cell-tree.h +++ b/a11y/e-table/gal-a11y-e-cell-tree.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.c b/a11y/e-table/gal-a11y-e-cell-vbox.c index 08859d07ef..7a5eadba52 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.c +++ b/a11y/e-table/gal-a11y-e-cell-vbox.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.h b/a11y/e-table/gal-a11y-e-cell-vbox.h index 276a60177a..2055ac3195 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.h +++ b/a11y/e-table/gal-a11y-e-cell-vbox.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c index 6154fc0acd..3b74675ae5 100644 --- a/a11y/e-table/gal-a11y-e-cell.c +++ b/a11y/e-table/gal-a11y-e-cell.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h index cdae721112..af96c69d47 100644 --- a/a11y/e-table/gal-a11y-e-cell.h +++ b/a11y/e-table/gal-a11y-e-cell.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c index 9161b4d834..0ebb3c4621 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c +++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h index 0e4ac11f79..9f249f0178 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h +++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c index 85c896ccf3..ed417e1601 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add.c +++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.h b/a11y/e-table/gal-a11y-e-table-click-to-add.h index ccefc7a9b8..17d6940d08 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add.h +++ b/a11y/e-table/gal-a11y-e-table-click-to-add.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-column-header.c b/a11y/e-table/gal-a11y-e-table-column-header.c index a50a286940..4df75cc564 100644 --- a/a11y/e-table/gal-a11y-e-table-column-header.c +++ b/a11y/e-table/gal-a11y-e-table-column-header.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-column-header.h b/a11y/e-table/gal-a11y-e-table-column-header.h index 083f0af3de..d0b1ff5aeb 100644 --- a/a11y/e-table/gal-a11y-e-table-column-header.h +++ b/a11y/e-table/gal-a11y-e-table-column-header.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-factory.c b/a11y/e-table/gal-a11y-e-table-factory.c index 37c396aba8..f459f3b67c 100644 --- a/a11y/e-table/gal-a11y-e-table-factory.c +++ b/a11y/e-table/gal-a11y-e-table-factory.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-factory.h b/a11y/e-table/gal-a11y-e-table-factory.h index e3ef52c872..3439cf0bdc 100644 --- a/a11y/e-table/gal-a11y-e-table-factory.h +++ b/a11y/e-table/gal-a11y-e-table-factory.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.c b/a11y/e-table/gal-a11y-e-table-item-factory.c index 43508e4796..fa14652788 100644 --- a/a11y/e-table/gal-a11y-e-table-item-factory.c +++ b/a11y/e-table/gal-a11y-e-table-item-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.h b/a11y/e-table/gal-a11y-e-table-item-factory.h index a85c9e894f..f27c491a4d 100644 --- a/a11y/e-table/gal-a11y-e-table-item-factory.h +++ b/a11y/e-table/gal-a11y-e-table-item-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c index e28d0f6b83..935f53b83b 100644 --- a/a11y/e-table/gal-a11y-e-table-item.c +++ b/a11y/e-table/gal-a11y-e-table-item.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-item.h b/a11y/e-table/gal-a11y-e-table-item.h index e89f0824b3..27d6a8244b 100644 --- a/a11y/e-table/gal-a11y-e-table-item.h +++ b/a11y/e-table/gal-a11y-e-table-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c index 20261d4eab..1966fb29ee 100644 --- a/a11y/e-table/gal-a11y-e-table.c +++ b/a11y/e-table/gal-a11y-e-table.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table.h b/a11y/e-table/gal-a11y-e-table.h index ab133f5c71..d8f972df81 100644 --- a/a11y/e-table/gal-a11y-e-table.h +++ b/a11y/e-table/gal-a11y-e-table.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-tree-factory.c b/a11y/e-table/gal-a11y-e-tree-factory.c index cacb3fe082..8dc06e2936 100644 --- a/a11y/e-table/gal-a11y-e-tree-factory.c +++ b/a11y/e-table/gal-a11y-e-tree-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-tree-factory.h b/a11y/e-table/gal-a11y-e-tree-factory.h index 621d256c48..3d97c7a3b1 100644 --- a/a11y/e-table/gal-a11y-e-tree-factory.h +++ b/a11y/e-table/gal-a11y-e-tree-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c index 6fde32b8e7..4ecce81501 100644 --- a/a11y/e-table/gal-a11y-e-tree.c +++ b/a11y/e-table/gal-a11y-e-tree.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-tree.h b/a11y/e-table/gal-a11y-e-tree.h index 9fe482e1f8..d2aa8a0d2a 100644 --- a/a11y/e-table/gal-a11y-e-tree.h +++ b/a11y/e-table/gal-a11y-e-tree.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-text/gal-a11y-e-text-factory.c b/a11y/e-text/gal-a11y-e-text-factory.c index e1f835e912..2df9241014 100644 --- a/a11y/e-text/gal-a11y-e-text-factory.c +++ b/a11y/e-text/gal-a11y-e-text-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-text/gal-a11y-e-text-factory.h b/a11y/e-text/gal-a11y-e-text-factory.h index ce4d4d0a65..df7638f64f 100644 --- a/a11y/e-text/gal-a11y-e-text-factory.h +++ b/a11y/e-text/gal-a11y-e-text-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c index 4eeb7811fc..98484949ff 100644 --- a/a11y/e-text/gal-a11y-e-text.c +++ b/a11y/e-text/gal-a11y-e-text.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-text/gal-a11y-e-text.h b/a11y/e-text/gal-a11y-e-text.h index 5cebd0ff83..6a5bb80de0 100644 --- a/a11y/e-text/gal-a11y-e-text.h +++ b/a11y/e-text/gal-a11y-e-text.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/ea-cell-table.c b/a11y/ea-cell-table.c index 89724ffac0..8c0b9ee253 100644 --- a/a11y/ea-cell-table.c +++ b/a11y/ea-cell-table.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/ea-cell-table.h b/a11y/ea-cell-table.h index 6844abe9da..f8674ec42a 100644 --- a/a11y/ea-cell-table.h +++ b/a11y/ea-cell-table.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h index c7805c1ad3..dcf6a1382f 100644 --- a/a11y/ea-factory.h +++ b/a11y/ea-factory.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/gal-a11y-factory.h b/a11y/gal-a11y-factory.h index 884c94f31e..1ef8292eba 100644 --- a/a11y/gal-a11y-factory.h +++ b/a11y/gal-a11y-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/gal-a11y-util.c b/a11y/gal-a11y-util.c index c06b4efd6c..ec2a5061f8 100644 --- a/a11y/gal-a11y-util.c +++ b/a11y/gal-a11y-util.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/gal-a11y-util.h b/a11y/gal-a11y-util.h index 8354df9ac5..dedad9e049 100644 --- a/a11y/gal-a11y-util.h +++ b/a11y/gal-a11y-util.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-calendar-cell.c b/a11y/widgets/ea-calendar-cell.c index 9cd3a58622..5b4e9f1d8c 100644 --- a/a11y/widgets/ea-calendar-cell.c +++ b/a11y/widgets/ea-calendar-cell.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-calendar-cell.h b/a11y/widgets/ea-calendar-cell.h index a07b7e8bbc..be35c66312 100644 --- a/a11y/widgets/ea-calendar-cell.h +++ b/a11y/widgets/ea-calendar-cell.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c index a3da175df1..fdb109d5e6 100644 --- a/a11y/widgets/ea-calendar-item.c +++ b/a11y/widgets/ea-calendar-item.c @@ -10,11 +10,11 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: - * Bolian Yin + * Bolian Yin * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/a11y/widgets/ea-calendar-item.h b/a11y/widgets/ea-calendar-item.h index 87b825b479..b5f1b0ce81 100644 --- a/a11y/widgets/ea-calendar-item.h +++ b/a11y/widgets/ea-calendar-item.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-combo-button.c b/a11y/widgets/ea-combo-button.c index c44274e402..c5180c3927 100644 --- a/a11y/widgets/ea-combo-button.c +++ b/a11y/widgets/ea-combo-button.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-combo-button.h b/a11y/widgets/ea-combo-button.h index 37533fd1e5..2b5d0aa3ca 100644 --- a/a11y/widgets/ea-combo-button.h +++ b/a11y/widgets/ea-combo-button.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-widgets.c b/a11y/widgets/ea-widgets.c index 5befb44837..3dca419104 100644 --- a/a11y/widgets/ea-widgets.c +++ b/a11y/widgets/ea-widgets.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-widgets.h b/a11y/widgets/ea-widgets.h index 20c1c9698d..c07526f4fd 100644 --- a/a11y/widgets/ea-widgets.h +++ b/a11y/widgets/ea-widgets.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index ec89c9a34f..aa7bb74c6a 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index e580fb2844..2c1d5caa9b 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h index 83fbdf87ee..222ace82d7 100644 --- a/addressbook/gui/component/addressbook-component.h +++ b/addressbook/gui/component/addressbook-component.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 87e018796b..ebb2d18b5d 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h index 6ea33f1656..e06e98f887 100644 --- a/addressbook/gui/component/addressbook-config.h +++ b/addressbook/gui/component/addressbook-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index f0e106e14c..ca691761c9 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-migrate.h b/addressbook/gui/component/addressbook-migrate.h index ad3df6b26a..5727b3d0ab 100644 --- a/addressbook/gui/component/addressbook-migrate.h +++ b/addressbook/gui/component/addressbook-migrate.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 9759b3fdf2..e6b99c6405 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-view.h b/addressbook/gui/component/addressbook-view.h index f86ce46005..08bbbb3e99 100644 --- a/addressbook/gui/component/addressbook-view.h +++ b/addressbook/gui/component/addressbook-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 9bb726e17e..f36012ab94 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h index a56f088f7d..0dbd4d7a3d 100644 --- a/addressbook/gui/component/addressbook.h +++ b/addressbook/gui/component/addressbook.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c index 8c259c6a7a..f45f2228e1 100644 --- a/addressbook/gui/component/autocompletion-config.c +++ b/addressbook/gui/component/autocompletion-config.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/autocompletion-config.h b/addressbook/gui/component/autocompletion-config.h index 2f4f0184c4..0690604bc7 100644 --- a/addressbook/gui/component/autocompletion-config.h +++ b/addressbook/gui/component/autocompletion-config.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c index 52bc377115..4d02cc3e6b 100644 --- a/addressbook/gui/component/component-factory.c +++ b/addressbook/gui/component/component-factory.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index c2194e8b8c..3897d605e3 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h index 81b7182397..6ccd89ed9e 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index c8a427a253..c7ce449ec4 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index 02b837fb46..e9f40507ae 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 926d369b5a..e8d7b03e6c 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h index 0aaabdc69c..e58722b4a2 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.h +++ b/addressbook/gui/contact-editor/e-contact-quick-add.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c index b94dff2953..d052e42fd7 100644 --- a/addressbook/gui/contact-editor/eab-editor.c +++ b/addressbook/gui/contact-editor/eab-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h index ae13270fe0..18a11047be 100644 --- a/addressbook/gui/contact-editor/eab-editor.h +++ b/addressbook/gui/contact-editor/eab-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index 2f55e4777c..e624c97987 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/contact-editor/test-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 212c1bbd7a..7a492f0c52 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -252,9 +252,9 @@ contact_list_editor_cancel_load (EContactListEditor *editor) priv->load_book = NULL; } -static gboolean +static gboolean contact_list_editor_contact_exists (EContactListModel *model, - const gchar *email) + const gchar *email) { const gchar *tag = "addressbook:ask-list-add-exists"; @@ -639,7 +639,7 @@ contact_list_editor_email_entry_updated_cb (GtkWidget *widget, email = g_strdup (e_destination_get_address (destination)); store = e_name_selector_entry_peek_destination_store (entry); e_destination_store_remove_destination (store, destination); - gtk_entry_set_text (GTK_ENTRY (WIDGET (EMAIL_ENTRY)), ""); + gtk_entry_set_text (GTK_ENTRY (WIDGET (EMAIL_ENTRY)), ""); if (email && *email) { e_contact_list_model_add_email (model, email); @@ -1142,7 +1142,7 @@ contact_list_editor_class_init (EContactListEditorClass *class) g_object_class_install_property ( object_class, - PROP_BOOK, + PROP_BOOK, g_param_spec_object ( "book", _("Book"), @@ -1152,7 +1152,7 @@ contact_list_editor_class_init (EContactListEditorClass *class) g_object_class_install_property ( object_class, - PROP_CONTACT, + PROP_CONTACT, g_param_spec_object ( "contact", _("Contact"), @@ -1162,7 +1162,7 @@ contact_list_editor_class_init (EContactListEditorClass *class) g_object_class_install_property ( object_class, - PROP_IS_NEW_LIST, + PROP_IS_NEW_LIST, g_param_spec_boolean ( "is_new_list", _("Is New List"), @@ -1172,7 +1172,7 @@ contact_list_editor_class_init (EContactListEditorClass *class) g_object_class_install_property ( object_class, - PROP_EDITABLE, + PROP_EDITABLE, g_param_spec_boolean ( "editable", _("Editable"), diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h index deed3f60c0..fcee0b02ef 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c index f381e6754e..d43e895570 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h index f4fde83a4b..1f7c35a7be 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c index 7747669f24..86138efb14 100644 --- a/addressbook/gui/merging/eab-contact-compare.c +++ b/addressbook/gui/merging/eab-contact-compare.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h index ff8bfc1a85..d08461940b 100644 --- a/addressbook/gui/merging/eab-contact-compare.h +++ b/addressbook/gui/merging/eab-contact-compare.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 502fe381b6..895e8126c6 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/merging/eab-contact-merging.h index 4228fc1028..81528c6325 100644 --- a/addressbook/gui/merging/eab-contact-merging.h +++ b/addressbook/gui/merging/eab-contact-merging.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 73518fc0b2..9482a93744 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h index 6558d94812..ae1c5f4cb2 100644 --- a/addressbook/gui/widgets/e-addressbook-model.h +++ b/addressbook/gui/widgets/e-addressbook-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index d2c20722ef..237838141b 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h index fd7842684f..88ce1a7132 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index a4440155d9..9e3dfe5f5f 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h index c4182d2d2b..edfb1adf00 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index fe39c029e0..4cd151f19f 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 799e01a792..7f796415cd 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 696d42dcd9..a6090291bd 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h index 3d41e4cb87..f6b0607ca6 100644 --- a/addressbook/gui/widgets/e-minicard-label.h +++ b/addressbook/gui/widgets/e-minicard-label.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 0f9ae7c143..9c493afa61 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index 1c4323523f..ff9cddac24 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 756a019d9f..b716c86c80 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index 7d0a5b1842..4bda766254 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 10a406edbf..0c70b12da0 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -770,7 +770,7 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width) EMinicardField *minicard_field; char *name; char *string; - gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); + gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); group = GNOME_CANVAS_GROUP( e_minicard ); @@ -839,7 +839,7 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i char *name; GList *l, *le; int count =0; - gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); + gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); GList *emails = e_contact_get (e_minicard->contact, E_CONTACT_EMAIL); group = GNOME_CANVAS_GROUP( e_minicard ); diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index 71c976745f..fb8116cb9d 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-config.c b/addressbook/gui/widgets/eab-config.c index bb8eb63dd0..32ae07862f 100644 --- a/addressbook/gui/widgets/eab-config.c +++ b/addressbook/gui/widgets/eab-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index 6e593f1fb8..330df5141b 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 6cec0b9eb7..96050b2ca4 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -408,7 +408,7 @@ accum_name_value (GString *gstr, const char *label, const char *str, const char g_string_append_printf (gstr, ""); if (icon) g_string_append_printf (gstr, "", icon); - else + else g_string_append_printf (gstr, ""); } else { g_string_append_printf (gstr, ""); @@ -549,7 +549,7 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact) if (!eab_parse_qp_email (l->data, &name, &mail)) mail = e_text_to_html (l->data, 0); - g_string_append_printf (accum, "%s%s%s%s%s (%s)", + g_string_append_printf (accum, "%s%s%s%s%s (%s)", nl, name ? name : "", name ? " <" : "", diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h index c7b7f1a476..80acc5eefe 100644 --- a/addressbook/gui/widgets/eab-contact-display.h +++ b/addressbook/gui/widgets/eab-contact-display.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 14285cf9b1..58895c736c 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h index 4cab9b36b0..b5129d1637 100644 --- a/addressbook/gui/widgets/eab-gui-util.h +++ b/addressbook/gui/widgets/eab-gui-util.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -81,7 +81,7 @@ GtkWidget *eab_create_image_chooser_widget (gchar *name, gchar *string1, gchar * ESource *eab_select_source (const gchar *title, const gchar *message, const gchar *select_uid, GtkWindow *parent); -/* To parse quoted printable address & return email & name fields */ +/* To parse quoted printable address & return email & name fields */ gboolean eab_parse_qp_email (const gchar *string, gchar **name, gchar **email); char *eab_parse_qp_email_to_html (const gchar *string); diff --git a/addressbook/gui/widgets/eab-menu.c b/addressbook/gui/widgets/eab-menu.c index 603e93893c..e07489b003 100644 --- a/addressbook/gui/widgets/eab-menu.c +++ b/addressbook/gui/widgets/eab-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-menu.h b/addressbook/gui/widgets/eab-menu.h index 380346651b..7bea32efa4 100644 --- a/addressbook/gui/widgets/eab-menu.h +++ b/addressbook/gui/widgets/eab-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c index 6a702f3941..d520108db4 100644 --- a/addressbook/gui/widgets/eab-popup-control.c +++ b/addressbook/gui/widgets/eab-popup-control.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Jon Trowbridge diff --git a/addressbook/gui/widgets/eab-popup-control.h b/addressbook/gui/widgets/eab-popup-control.h index e8031a7fec..9eeedc8e00 100644 --- a/addressbook/gui/widgets/eab-popup-control.h +++ b/addressbook/gui/widgets/eab-popup-control.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-popup.c b/addressbook/gui/widgets/eab-popup.c index 17f979734b..1b5cde4b5c 100644 --- a/addressbook/gui/widgets/eab-popup.c +++ b/addressbook/gui/widgets/eab-popup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-popup.h b/addressbook/gui/widgets/eab-popup.h index b86cc12a99..86deff7f9c 100644 --- a/addressbook/gui/widgets/eab-popup.h +++ b/addressbook/gui/widgets/eab-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c index ccec1bf092..0240dddb60 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.c +++ b/addressbook/gui/widgets/gal-view-factory-minicard.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h index d1cf2de444..0aa6dc5ba9 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.h +++ b/addressbook/gui/widgets/gal-view-factory-minicard.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index 4645517bfc..0a2fac9262 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h index bb22cf8a57..cf3faaec56 100644 --- a/addressbook/gui/widgets/gal-view-minicard.h +++ b/addressbook/gui/widgets/gal-view-minicard.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/importers/evolution-addressbook-importers.h b/addressbook/importers/evolution-addressbook-importers.h index 94b0e3b023..747fe4281d 100644 --- a/addressbook/importers/evolution-addressbook-importers.h +++ b/addressbook/importers/evolution-addressbook-importers.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index b5c9f7f8ce..164f9f5fe2 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index b0380cf227..75f30a2359 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index bd526e37cc..1ec623d098 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h index 15d64e71e0..e21f3b7b16 100644 --- a/addressbook/printing/e-contact-print-types.h +++ b/addressbook/printing/e-contact-print-types.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index 0ba9dbb71a..cc3affeb2c 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h index c9cc40847e..1604693471 100644 --- a/addressbook/printing/e-contact-print.h +++ b/addressbook/printing/e-contact-print.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c index e871eb6270..c38d2129a0 100644 --- a/addressbook/printing/test-print.c +++ b/addressbook/printing/test-print.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c index b7ccf7c643..72fa8a07e3 100644 --- a/addressbook/tools/evolution-addressbook-export-list-cards.c +++ b/addressbook/tools/evolution-addressbook-export-list-cards.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c index 86affe41ff..e93748861d 100644 --- a/addressbook/tools/evolution-addressbook-export-list-folders.c +++ b/addressbook/tools/evolution-addressbook-export-list-folders.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c index bfcaca980c..1a7f86142b 100644 --- a/addressbook/tools/evolution-addressbook-export.c +++ b/addressbook/tools/evolution-addressbook-export.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/tools/evolution-addressbook-export.h b/addressbook/tools/evolution-addressbook-export.h index 210dc2c1d5..815f524300 100644 --- a/addressbook/tools/evolution-addressbook-export.h +++ b/addressbook/tools/evolution-addressbook-export.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c index af1324bf64..8d08a3e88f 100644 --- a/addressbook/util/eab-book-util.c +++ b/addressbook/util/eab-book-util.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h index 66c3a6c23e..0cded9c662 100644 --- a/addressbook/util/eab-book-util.h +++ b/addressbook/util/eab-book-util.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c index 85bde3d6fd..a33177874f 100644 --- a/calendar/common/authentication.c +++ b/calendar/common/authentication.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -72,7 +72,7 @@ build_pass_key (ECal *ecal) return euri_str; } -void +void auth_cal_forget_password (ECal *ecal) { ESource *source = NULL; diff --git a/calendar/common/authentication.h b/calendar/common/authentication.h index 147b67e831..696a36d2ff 100644 --- a/calendar/common/authentication.h +++ b/calendar/common/authentication.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index b9b6b3449c..5aef1aeb53 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -187,7 +187,7 @@ calconduit_save_configuration (ECalConduitCfg *c) g_snprintf (prefix, 255, "e-calendar-conduit/Pilot_%u", c->pilot_id); e_pilot_set_sync_source (c->source_list, c->source); - + e_pilot_setup_set_bool (prefix, "secret", c->secret); e_pilot_setup_set_bool (prefix, "multi_day_split", c->multi_day_split); e_pilot_setup_set_string (prefix, "last_uri", c->last_uri ? c->last_uri : ""); diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c index 59f411da69..cdb4a10d2d 100644 --- a/calendar/conduits/common/libecalendar-common-conduit.c +++ b/calendar/conduits/common/libecalendar-common-conduit.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/conduits/common/libecalendar-common-conduit.h b/calendar/conduits/common/libecalendar-common-conduit.h index 0641ec3e88..aab5a58b56 100644 --- a/calendar/conduits/common/libecalendar-common-conduit.h +++ b/calendar/conduits/common/libecalendar-common-conduit.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c index 4d599a6924..61e5c852e3 100644 --- a/calendar/conduits/memo/memo-conduit.c +++ b/calendar/conduits/memo/memo-conduit.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 7639291504..3a684e0751 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 7f54b6bf2d..089bf37552 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h index 7a94793eaa..17f9b3a61c 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.h +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index 38a3b49e9f..4085815bce 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -352,7 +352,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource priv = an->priv; str_uri = e_source_get_uri (source); e_uri = e_uri_new (str_uri); - if (e_source_get_property (source, "auth-type")) + if (e_source_get_property (source, "auth-type")) pass_key = e_uri_to_string (e_uri, FALSE); else pass_key = g_strdup (str_uri); diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h index 7fea501de9..a548716295 100644 --- a/calendar/gui/alarm-notify/alarm-notify.h +++ b/calendar/gui/alarm-notify/alarm-notify.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 887cf7f249..c293bf74a8 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h index 69fbafec02..9a2e11c472 100644 --- a/calendar/gui/alarm-notify/alarm-queue.h +++ b/calendar/gui/alarm-notify/alarm-queue.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c index 5dca49ae25..f2ab4bb23d 100644 --- a/calendar/gui/alarm-notify/alarm.c +++ b/calendar/gui/alarm-notify/alarm.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h index bbedf392c7..7a14db5d03 100644 --- a/calendar/gui/alarm-notify/alarm.h +++ b/calendar/gui/alarm-notify/alarm.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index 5a05cfd341..dba9099520 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h index 9dd6f0221c..63e6c7205e 100644 --- a/calendar/gui/alarm-notify/config-data.h +++ b/calendar/gui/alarm-notify/config-data.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c index 3504b0db77..a625bec0fa 100644 --- a/calendar/gui/alarm-notify/notify-main.c +++ b/calendar/gui/alarm-notify/notify-main.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c index 6a734a8660..640a8f5f99 100644 --- a/calendar/gui/alarm-notify/util.c +++ b/calendar/gui/alarm-notify/util.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/util.h b/calendar/gui/alarm-notify/util.h index c53f047953..b7b715ca9b 100644 --- a/calendar/gui/alarm-notify/util.h +++ b/calendar/gui/alarm-notify/util.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index aab5d98d30..6183d873ba 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h index 64e1b40b0c..26f3998c89 100644 --- a/calendar/gui/cal-search-bar.h +++ b/calendar/gui/cal-search-bar.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 94a35f3e65..e69cd463ea 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h index cfe2d24232..b1c093fb9e 100644 --- a/calendar/gui/calendar-commands.h +++ b/calendar/gui/calendar-commands.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 53abc5632a..bca0832bac 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -70,7 +70,7 @@ #define WEATHER_BASE_URI "weather://" #define PERSONAL_RELATIVE_URI "system" #define CALENDAR_ERROR_LEVEL_KEY "/apps/evolution/calendar/display/error_level" -#define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout" +#define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout" enum DndTargetType { DND_TARGET_TYPE_CALENDAR_LIST @@ -598,7 +598,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) calendar_setup_edit_calendar (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source, NULL); } -static void +static void set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value) { CalendarComponentView *component_view = data; @@ -614,13 +614,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char static void mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) { - set_offline_availability (ep, pitem, data, "0"); + set_offline_availability (ep, pitem, data, "0"); } static void mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) { - set_offline_availability (ep, pitem, data, "1"); + set_offline_availability (ep, pitem, data, "1"); } static EPopupItem ecc_source_popups[] = { diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h index ec3183726d..1fbcdbc487 100644 --- a/calendar/gui/calendar-component.h +++ b/calendar/gui/calendar-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h index 6277f46d31..37724a53e9 100644 --- a/calendar/gui/calendar-config-keys.h +++ b/calendar/gui/calendar-config-keys.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index 285490b8f4..ffd398bd69 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h index c28077c1ec..ff4e69d008 100644 --- a/calendar/gui/calendar-config.h +++ b/calendar/gui/calendar-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c index ce76578563..8d167f44de 100644 --- a/calendar/gui/calendar-view-factory.c +++ b/calendar/gui/calendar-view-factory.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h index 779e59809c..0f182a11e1 100644 --- a/calendar/gui/calendar-view-factory.h +++ b/calendar/gui/calendar-view-factory.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c index 331181e4cd..5415affdf2 100644 --- a/calendar/gui/calendar-view.c +++ b/calendar/gui/calendar-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h index 53c4ca6a39..51e3235c34 100644 --- a/calendar/gui/calendar-view.h +++ b/calendar/gui/calendar-view.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c index 908293a151..b98f7170ed 100644 --- a/calendar/gui/comp-editor-factory.c +++ b/calendar/gui/comp-editor-factory.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/comp-editor-factory.h b/calendar/gui/comp-editor-factory.h index fdab8a0a46..3e79992d67 100644 --- a/calendar/gui/comp-editor-factory.h +++ b/calendar/gui/comp-editor-factory.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index 53fdacefb9..153dc089ec 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -641,7 +641,7 @@ update_objects (ECal *client, icalcomponent *icalcomp) icalcomponent_kind kind; kind = icalcomponent_isa (icalcomp); - if (kind == ICAL_VTODO_COMPONENT || + if (kind == ICAL_VTODO_COMPONENT || kind == ICAL_VEVENT_COMPONENT || kind == ICAL_VJOURNAL_COMPONENT) return update_single_object (client, icalcomp, kind == ICAL_VJOURNAL_COMPONENT); @@ -803,7 +803,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client) ECalComponent *master = NULL; icalcomponent *icalcomp = NULL; ECalComponentRange rid; - ECalComponentDateTime sdt; + ECalComponentDateTime sdt; const char *uid; /* Get the master component */ @@ -839,7 +839,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client) e_cal_component_set_dtstart (comp, &sdt); e_cal_component_set_dtend (comp, &edt); - + e_cal_component_get_sequence (master, &sequence); e_cal_component_set_sequence (comp, sequence); diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h index b93384f40a..3faf9f49a8 100644 --- a/calendar/gui/comp-util.h +++ b/calendar/gui/comp-util.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c index 2fcb3e2688..3e7b7499cc 100644 --- a/calendar/gui/control-factory.c +++ b/calendar/gui/control-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h index 2103f458f1..c79d70b5ba 100644 --- a/calendar/gui/control-factory.h +++ b/calendar/gui/control-factory.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 3881c85106..73bfde30cc 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/alarm-dialog.h b/calendar/gui/dialogs/alarm-dialog.h index 0cdee744c9..b5560f9ff4 100644 --- a/calendar/gui/dialogs/alarm-dialog.h +++ b/calendar/gui/dialogs/alarm-dialog.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index 07395a4782..8520b3727b 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/alarm-list-dialog.h b/calendar/gui/dialogs/alarm-list-dialog.h index 6a55f03000..7d58fcb0af 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.h +++ b/calendar/gui/dialogs/alarm-list-dialog.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c index 5de8ea669b..9c502153d3 100644 --- a/calendar/gui/dialogs/cal-attachment-select-file.c +++ b/calendar/gui/dialogs/cal-attachment-select-file.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/cal-attachment-select-file.h b/calendar/gui/dialogs/cal-attachment-select-file.h index 3c39fed125..0f965e6c9b 100644 --- a/calendar/gui/dialogs/cal-attachment-select-file.h +++ b/calendar/gui/dialogs/cal-attachment-select-file.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index b2763ca479..f00adc0f0d 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h index 30b62440e5..647df417df 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.h +++ b/calendar/gui/dialogs/cal-prefs-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index 3ee589406b..95820b8247 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -258,7 +258,7 @@ eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, GtkWidget *offline_setting = NULL; const char *offline_sync; int row; - const char *base_uri = e_source_group_peek_base_uri (sdialog->source_group); + const char *base_uri = e_source_group_peek_base_uri (sdialog->source_group); gboolean is_local = base_uri && (g_str_has_prefix (base_uri, "file://") || g_str_has_prefix (base_uri, "contacts://")); offline_sync = e_source_get_property (sdialog->source, "offline_sync"); if (old) diff --git a/calendar/gui/dialogs/calendar-setup.h b/calendar/gui/dialogs/calendar-setup.h index 3898467595..4ec9980532 100644 --- a/calendar/gui/dialogs/calendar-setup.h +++ b/calendar/gui/dialogs/calendar-setup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index 2548d5ba2d..cddd4f8d8d 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h index 3566a7548e..5f1261f1f5 100644 --- a/calendar/gui/dialogs/cancel-comp.h +++ b/calendar/gui/dialogs/cancel-comp.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c index 9a0665d763..d1abc1724d 100644 --- a/calendar/gui/dialogs/changed-comp.c +++ b/calendar/gui/dialogs/changed-comp.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h index 7a8bcb30f5..6bb20210dd 100644 --- a/calendar/gui/dialogs/changed-comp.h +++ b/calendar/gui/dialogs/changed-comp.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c index a86465d5d7..93b9cd9304 100644 --- a/calendar/gui/dialogs/comp-editor-page.c +++ b/calendar/gui/dialogs/comp-editor-page.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h index f8b9db23f3..819ea74ccc 100644 --- a/calendar/gui/dialogs/comp-editor-page.h +++ b/calendar/gui/dialogs/comp-editor-page.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index f09024eba0..4666058b51 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h index 565feeaea5..5516fe4cc4 100644 --- a/calendar/gui/dialogs/comp-editor-util.h +++ b/calendar/gui/dialogs/comp-editor-util.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 545fca4448..cd2dac7a9e 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -238,7 +238,7 @@ get_attachment_list (CompEditor *editor) * calendar source */ utf8_safe_fname = camel_file_util_safe_filename (camel_mime_part_get_filename (mime_part)); - /* It is absolutely fine to get a NULL from the filename of + /* It is absolutely fine to get a NULL from the filename of * mime part. We assume that it is named "Attachment" * in mailer. I'll do that with a ticker */ if (!utf8_safe_fname) @@ -798,7 +798,7 @@ action_save_cb (GtkAction *action, priv->mod = CALOBJ_MOD_THIS; comp = comp_editor_get_current_comp (editor, &correct); - + e_cal_component_get_summary (comp, &text); g_object_unref (comp); @@ -817,7 +817,7 @@ action_save_cb (GtkAction *action, delegate = flags & COMP_EDITOR_DELEGATE; if (delegate && !remove_event_dialog (priv->client, priv->comp, GTK_WINDOW (editor))) { - const char *uid = NULL; + const char *uid = NULL; GError *error = NULL; e_cal_component_get_uid (priv->comp, &uid); @@ -2440,7 +2440,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str set_attendees_for_delegation (send_comp, address, method); } - if (!e_cal_component_has_attachments (priv->comp) + if (!e_cal_component_has_attachments (priv->comp) || e_cal_get_static_capability (priv->client, CAL_STATIC_CAPABILITY_CREATE_MESSAGES)) { if (itip_send_comp (method, send_comp, priv->client, NULL, NULL, users, strip_alarms)) { diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index ab277febf7..22167cb78f 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c index 5bb970433b..92444678be 100644 --- a/calendar/gui/dialogs/copy-source-dialog.c +++ b/calendar/gui/dialogs/copy-source-dialog.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/copy-source-dialog.h b/calendar/gui/dialogs/copy-source-dialog.h index ba3169a1b8..4c6f5b19c8 100644 --- a/calendar/gui/dialogs/copy-source-dialog.h +++ b/calendar/gui/dialogs/copy-source-dialog.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index e5ae1e6cdc..ae371aabb2 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h index bb4b5983d9..c619e28b98 100644 --- a/calendar/gui/dialogs/delete-comp.h +++ b/calendar/gui/dialogs/delete-comp.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c index b151ef8068..f8df587aa4 100644 --- a/calendar/gui/dialogs/delete-error.c +++ b/calendar/gui/dialogs/delete-error.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/delete-error.h b/calendar/gui/dialogs/delete-error.h index cb0a7d9294..dab620541f 100644 --- a/calendar/gui/dialogs/delete-error.h +++ b/calendar/gui/dialogs/delete-error.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index 31c4631ca9..8e060832df 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h index 553b7c1576..e4f474781a 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.h +++ b/calendar/gui/dialogs/e-delegate-dialog.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c index d9a55ac47a..fd6bf245c2 100644 --- a/calendar/gui/dialogs/e-send-options-utils.c +++ b/calendar/gui/dialogs/e-send-options-utils.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h index 568ef5be3b..01cf3ed2e9 100644 --- a/calendar/gui/dialogs/e-send-options-utils.h +++ b/calendar/gui/dialogs/e-send-options-utils.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 7755894f6c..cff9d75950 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h index c050b92dfb..03afd6448a 100644 --- a/calendar/gui/dialogs/event-editor.h +++ b/calendar/gui/dialogs/event-editor.h @@ -1,5 +1,5 @@ /* - * Evolution calendar - Event editor dialog + * Evolution calendar - Event editor dialog * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index b225cdd6bd..b2ac6b55db 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -3281,7 +3281,7 @@ event_page_add_attendee (EventPage *epage, EMeetingAttendee *attendee) g_return_if_fail (epage != NULL); g_return_if_fail (IS_EVENT_PAGE (epage)); - + priv = epage->priv; e_meeting_store_add_attendee (priv->model, attendee); @@ -3300,7 +3300,7 @@ event_page_remove_all_attendees (EventPage *epage) g_return_if_fail (epage != NULL); g_return_if_fail (IS_EVENT_PAGE (epage)); - + priv = epage->priv; e_meeting_store_remove_all_attendees (priv->model); diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h index 63c0bd2306..5bd377c075 100644 --- a/calendar/gui/dialogs/event-page.h +++ b/calendar/gui/dialogs/event-page.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c index b90bd6fb3c..cf3781a3c2 100644 --- a/calendar/gui/dialogs/memo-editor.c +++ b/calendar/gui/dialogs/memo-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/memo-editor.h b/calendar/gui/dialogs/memo-editor.h index b45edd18ce..2e431b507f 100644 --- a/calendar/gui/dialogs/memo-editor.h +++ b/calendar/gui/dialogs/memo-editor.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 4f8c37c0a3..957b8f695c 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/memo-page.h b/calendar/gui/dialogs/memo-page.h index cfe4cb0a17..115d8aafb7 100644 --- a/calendar/gui/dialogs/memo-page.h +++ b/calendar/gui/dialogs/memo-page.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c index e57c0c8aa7..8d8dabbaf2 100644 --- a/calendar/gui/dialogs/recur-comp.c +++ b/calendar/gui/dialogs/recur-comp.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/recur-comp.h b/calendar/gui/dialogs/recur-comp.h index e4666772f7..47236ef8cd 100644 --- a/calendar/gui/dialogs/recur-comp.h +++ b/calendar/gui/dialogs/recur-comp.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index c85a0ae0f2..f89993154f 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/recurrence-page.h b/calendar/gui/dialogs/recurrence-page.h index f3bff613ee..1dce00d2c9 100644 --- a/calendar/gui/dialogs/recurrence-page.h +++ b/calendar/gui/dialogs/recurrence-page.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c index cb178e0dce..3f47312d22 100644 --- a/calendar/gui/dialogs/save-comp.c +++ b/calendar/gui/dialogs/save-comp.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h index 123a4a8587..5105e4af7f 100644 --- a/calendar/gui/dialogs/save-comp.h +++ b/calendar/gui/dialogs/save-comp.h @@ -1,7 +1,7 @@ /* * * Evolution calendar - Delete calendar component dialog - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c index e1137be3a0..4baa22ab8a 100644 --- a/calendar/gui/dialogs/schedule-page.c +++ b/calendar/gui/dialogs/schedule-page.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h index 8ffbb43c71..71eec02763 100644 --- a/calendar/gui/dialogs/schedule-page.h +++ b/calendar/gui/dialogs/schedule-page.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c index e9fc7d0d9f..f73af156b0 100644 --- a/calendar/gui/dialogs/select-source-dialog.c +++ b/calendar/gui/dialogs/select-source-dialog.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/select-source-dialog.h b/calendar/gui/dialogs/select-source-dialog.h index 3ca3cec041..850eddd610 100644 --- a/calendar/gui/dialogs/select-source-dialog.h +++ b/calendar/gui/dialogs/select-source-dialog.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index a7d87c47f4..4eca089435 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/send-comp.h b/calendar/gui/dialogs/send-comp.h index 21b310947a..63644bd52a 100644 --- a/calendar/gui/dialogs/send-comp.h +++ b/calendar/gui/dialogs/send-comp.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 86a39aad24..7fb4679047 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/task-details-page.h b/calendar/gui/dialogs/task-details-page.h index 9fbfcd4af6..585ab0ba23 100644 --- a/calendar/gui/dialogs/task-details-page.h +++ b/calendar/gui/dialogs/task-details-page.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index eef1d64468..fbab8b0581 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h index 9376b4149a..57ab33b54f 100644 --- a/calendar/gui/dialogs/task-editor.h +++ b/calendar/gui/dialogs/task-editor.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index f371e60cdb..b088fb4ff1 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -2180,7 +2180,7 @@ task_page_add_attendee (TaskPage *tpage, EMeetingAttendee *attendee) g_return_if_fail (tpage != NULL); g_return_if_fail (IS_TASK_PAGE (tpage)); - + priv = tpage->priv; e_meeting_store_add_attendee (priv->model, attendee); diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h index 77ec68fa1d..b8a49f8286 100644 --- a/calendar/gui/dialogs/task-page.h +++ b/calendar/gui/dialogs/task-page.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c index 795d0437a0..d60fab913e 100644 --- a/calendar/gui/e-alarm-list.c +++ b/calendar/gui/e-alarm-list.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-alarm-list.h b/calendar/gui/e-alarm-list.h index 6819994af1..6dfb1c6515 100644 --- a/calendar/gui/e-alarm-list.h +++ b/calendar/gui/e-alarm-list.h @@ -1,7 +1,7 @@ /* * * EAlarmList - list of calendar alarms with GtkTreeModel interface. - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-attachment-handler-calendar.c b/calendar/gui/e-attachment-handler-calendar.c index 5beb6e07d3..601d1f5e3c 100644 --- a/calendar/gui/e-attachment-handler-calendar.c +++ b/calendar/gui/e-attachment-handler-calendar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/calendar/gui/e-attachment-handler-calendar.h b/calendar/gui/e-attachment-handler-calendar.h index b6788611f8..0b0ab737d4 100644 --- a/calendar/gui/e-attachment-handler-calendar.h +++ b/calendar/gui/e-attachment-handler-calendar.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c index f564538a59..18c47ebfcc 100644 --- a/calendar/gui/e-cal-component-memo-preview.c +++ b/calendar/gui/e-cal-component-memo-preview.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-component-memo-preview.h b/calendar/gui/e-cal-component-memo-preview.h index 7d77a0aa32..8dcab9d0f3 100644 --- a/calendar/gui/e-cal-component-memo-preview.h +++ b/calendar/gui/e-cal-component-memo-preview.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index 0c759a1591..a70bf5761f 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h index 73e8126a36..4faa7bd29b 100644 --- a/calendar/gui/e-cal-component-preview.h +++ b/calendar/gui/e-cal-component-preview.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c index 18ceee76ca..fb1d6c28e7 100644 --- a/calendar/gui/e-cal-config.c +++ b/calendar/gui/e-cal-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h index 8f27cbd2f2..15ad617a3d 100644 --- a/calendar/gui/e-cal-config.h +++ b/calendar/gui/e-cal-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-event.c b/calendar/gui/e-cal-event.c index 6e295ab9a8..db7e9abc89 100644 --- a/calendar/gui/e-cal-event.c +++ b/calendar/gui/e-cal-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h index a77d2a147f..0802640d2c 100644 --- a/calendar/gui/e-cal-event.h +++ b/calendar/gui/e-cal-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-list-view-config.c b/calendar/gui/e-cal-list-view-config.c index 6c930b1b61..543b5e8eb7 100644 --- a/calendar/gui/e-cal-list-view-config.c +++ b/calendar/gui/e-cal-list-view-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-list-view-config.h b/calendar/gui/e-cal-list-view-config.h index 021262e357..270228bed6 100644 --- a/calendar/gui/e-cal-list-view-config.h +++ b/calendar/gui/e-cal-list-view-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index 0702d3a297..6eab1f7aac 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Hans Petter Jansson diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h index 606997c17d..656a58261b 100644 --- a/calendar/gui/e-cal-list-view.h +++ b/calendar/gui/e-cal-list-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-menu.c b/calendar/gui/e-cal-menu.c index c6639b2816..b1f5ed91ca 100644 --- a/calendar/gui/e-cal-menu.c +++ b/calendar/gui/e-cal-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h index 9c37a6a9ae..5dda63f227 100644 --- a/calendar/gui/e-cal-menu.h +++ b/calendar/gui/e-cal-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c index db25bf23de..dac641ab4c 100644 --- a/calendar/gui/e-cal-model-calendar.c +++ b/calendar/gui/e-cal-model-calendar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model-calendar.h b/calendar/gui/e-cal-model-calendar.h index ec0cb4c75c..abe536399f 100644 --- a/calendar/gui/e-cal-model-calendar.h +++ b/calendar/gui/e-cal-model-calendar.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c index 0984827702..95fe5f1572 100644 --- a/calendar/gui/e-cal-model-memos.c +++ b/calendar/gui/e-cal-model-memos.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model-memos.h b/calendar/gui/e-cal-model-memos.h index 5417c9c09b..34b8e5a14d 100644 --- a/calendar/gui/e-cal-model-memos.h +++ b/calendar/gui/e-cal-model-memos.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 5827117f14..a2b9eb6f2f 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model-tasks.h b/calendar/gui/e-cal-model-tasks.h index 40d651e583..0900d1e155 100644 --- a/calendar/gui/e-cal-model-tasks.h +++ b/calendar/gui/e-cal-model-tasks.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 736f6a8b56..19844a7560 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1522,7 +1522,7 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data GSList *list = NULL; pos = get_position_in_array (priv->objects, comp_data); - + if (!g_ptr_array_remove (priv->objects, comp_data)) continue; @@ -1576,7 +1576,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d /* re-add only the recurrence objects */ for (l = objects; l != NULL; l = g_list_next (l)) { - if (!e_cal_util_component_is_instance (l->data) && e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) + if (!e_cal_util_component_is_instance (l->data) && e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) list = g_list_prepend (list, l->data); else { int pos; @@ -1639,7 +1639,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d e_cal_model_set_instance_times (comp_data, priv->zone); pos = get_position_in_array (priv->objects, comp_data); - + e_table_model_row_changed (E_TABLE_MODEL (model), pos); } } @@ -1676,7 +1676,7 @@ e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer user_data) g_slist_free (l); g_object_unref (comp_data); - + e_table_model_pre_change (E_TABLE_MODEL (model)); e_table_model_row_deleted (E_TABLE_MODEL (model), pos); } @@ -1739,15 +1739,15 @@ update_e_cal_view_for_client (ECalModel *model, ECalModelClient *client_data) if (!client_data->do_query) return; -try_again: +try_again: if (!e_cal_get_query (client_data->client, priv->full_sexp, &client_data->query, &error)) { if (error->code == E_CALENDAR_STATUS_BUSY && tries != 10) { tries++; /*TODO chose an optimal value */ g_usleep (500); g_clear_error (&error); - goto try_again; - } + goto try_again; + } g_warning (G_STRLOC ": Unable to get query, %s", error->message); @@ -1873,7 +1873,7 @@ remove_client_objects (ECalModel *model, ECalModelClient *client_data) GSList *l = NULL; g_ptr_array_remove (model->priv->objects, comp_data); - + l = g_slist_append (l, comp_data); g_signal_emit (G_OBJECT (model), signals[COMPS_DELETED], 0, l); @@ -2014,9 +2014,9 @@ redo_queries (ECalModel *model) slist = get_objects_as_list (model); g_ptr_array_set_size (priv->objects, 0); g_signal_emit (G_OBJECT (model), signals[COMPS_DELETED], 0, slist); - + e_table_model_rows_deleted (E_TABLE_MODEL (model), 0, len); - + g_slist_foreach (slist, (GFunc)g_object_unref, NULL); g_slist_free (slist); @@ -2342,7 +2342,7 @@ e_cal_model_component_class_init (ECalModelComponentClass *klass) static void -e_cal_model_component_finalize (GObject *object) +e_cal_model_component_finalize (GObject *object) { ECalModelComponent *comp_data = E_CAL_MODEL_COMPONENT(object); @@ -2382,7 +2382,7 @@ e_cal_model_component_finalize (GObject *object) g_free (comp_data->color); comp_data->color = NULL; } - + if (G_OBJECT_CLASS (parent_class)->finalize) (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -2440,7 +2440,7 @@ void e_cal_model_free_component_data (ECalModelComponent *comp_data) { g_return_if_fail (comp_data != NULL); - + g_object_unref (comp_data); } diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index 6ec66a3554..4b266b6a5e 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -81,7 +81,7 @@ struct _ECalModelComponent { icalcomponent *icalcomp; time_t instance_start; time_t instance_end; - + /* Private data used by ECalModelCalendar and ECalModelTasks */ /* keep these public to avoid many accessor functions */ ECellDateEditValue *dtstart; diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c index 0292f16c71..76dcb94e19 100644 --- a/calendar/gui/e-cal-popup.c +++ b/calendar/gui/e-cal-popup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h index 185e9877f0..5c68b4829b 100644 --- a/calendar/gui/e-cal-popup.h +++ b/calendar/gui/e-cal-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-calendar-table-config.c b/calendar/gui/e-calendar-table-config.c index f8a7af9c14..fb8d18c189 100644 --- a/calendar/gui/e-calendar-table-config.c +++ b/calendar/gui/e-calendar-table-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-calendar-table-config.h b/calendar/gui/e-calendar-table-config.h index 12cbc3e326..93588a6e57 100644 --- a/calendar/gui/e-calendar-table-config.h +++ b/calendar/gui/e-calendar-table-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 5eba596680..b8ce8d1c29 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h index e9906ad59b..d5dac7318e 100644 --- a/calendar/gui/e-calendar-table.h +++ b/calendar/gui/e-calendar-table.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index f88ae08244..91f9eded7a 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -2061,7 +2061,7 @@ e_calendar_view_new_appointment_full (ECalendarView *cal_view, gboolean all_day, int hours, mins; if (!time_div) /* Possible if your gconf values aren't so nice */ - time_div = 30; + time_div = 30; if (time_day_begin (now) == time_day_begin (dtstart)) { /* same day as today */ @@ -2657,7 +2657,7 @@ draw_curved_rectangle (cairo_t *cr, double x0, double y0, cairo_close_path (cr); } -static void +static void error_response(GtkWidget *widget, gint response, void *data) { gtk_widget_destroy (widget); diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index eedef31856..99d405d098 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cell-date-edit-config.c b/calendar/gui/e-cell-date-edit-config.c index 5be8569bd3..eb6c27420b 100644 --- a/calendar/gui/e-cell-date-edit-config.c +++ b/calendar/gui/e-cell-date-edit-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cell-date-edit-config.h b/calendar/gui/e-cell-date-edit-config.h index 6203aec1a4..455cca7287 100644 --- a/calendar/gui/e-cell-date-edit-config.h +++ b/calendar/gui/e-cell-date-edit-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c index b56d070559..8a43c628fc 100644 --- a/calendar/gui/e-cell-date-edit-text.c +++ b/calendar/gui/e-cell-date-edit-text.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h index 9bbbfb0fc4..c353ecd278 100644 --- a/calendar/gui/e-cell-date-edit-text.h +++ b/calendar/gui/e-cell-date-edit-text.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin diff --git a/calendar/gui/e-comp-editor-registry.c b/calendar/gui/e-comp-editor-registry.c index 31b46372b2..a4bed100b9 100644 --- a/calendar/gui/e-comp-editor-registry.c +++ b/calendar/gui/e-comp-editor-registry.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-comp-editor-registry.h b/calendar/gui/e-comp-editor-registry.h index 4f1444601c..5c2b4c4bc8 100644 --- a/calendar/gui/e-comp-editor-registry.h +++ b/calendar/gui/e-comp-editor-registry.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-date-edit-config.c b/calendar/gui/e-date-edit-config.c index d6fd6cf675..f93f2cf746 100644 --- a/calendar/gui/e-date-edit-config.c +++ b/calendar/gui/e-date-edit-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-date-edit-config.h b/calendar/gui/e-date-edit-config.h index c31899bb9e..4065ec74e7 100644 --- a/calendar/gui/e-date-edit-config.h +++ b/calendar/gui/e-date-edit-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c index defd013fce..2aaab0df4d 100644 --- a/calendar/gui/e-date-time-list.c +++ b/calendar/gui/e-date-time-list.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-date-time-list.h b/calendar/gui/e-date-time-list.h index b4f6a01a10..fe5e1fdc11 100644 --- a/calendar/gui/e-date-time-list.h +++ b/calendar/gui/e-date-time-list.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c index 44156bf18e..edd02bb7ee 100644 --- a/calendar/gui/e-day-view-config.c +++ b/calendar/gui/e-day-view-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-config.h b/calendar/gui/e-day-view-config.h index 6ca1f2717e..25d208b432 100644 --- a/calendar/gui/e-day-view-config.h +++ b/calendar/gui/e-day-view-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c index 949f4b7ce2..5b5536d391 100644 --- a/calendar/gui/e-day-view-layout.c +++ b/calendar/gui/e-day-view-layout.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h index 4ad1de64bd..f3d431ca20 100644 --- a/calendar/gui/e-day-view-layout.h +++ b/calendar/gui/e-day-view-layout.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 97f5ab59f6..e161477eec 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h index 650f139eb1..c9ce721341 100644 --- a/calendar/gui/e-day-view-main-item.h +++ b/calendar/gui/e-day-view-main-item.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index 9d7ce44455..f6ded1ec94 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin @@ -781,7 +781,7 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem, item = gtk_menu_item_new_with_label ("---"); gtk_widget_set_sensitive (item, FALSE); gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); - + item = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h index f3f2f64118..9d7bdcae9f 100644 --- a/calendar/gui/e-day-view-time-item.h +++ b/calendar/gui/e-day-view-time-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index 909379b3a6..dd91133243 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h index d45aa4e155..01a7c44842 100644 --- a/calendar/gui/e-day-view-top-item.h +++ b/calendar/gui/e-day-view-top-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index c8c06e6b89..ef8a33625d 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin @@ -681,10 +681,10 @@ timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone, g_return_if_fail (E_IS_DAY_VIEW (day_view)); - + if (!cal_view->in_focus) return; - + /* If our time hasn't been set yet, just return. */ if (day_view->lower == 0 && day_view->upper == 0) return; @@ -1812,7 +1812,7 @@ set_text_as_bold (EDayViewEvent *event) for (l = attendees; l; l = l->next) { ECalComponentAttendee *attendee = l->data; - if ((g_str_equal (itip_strip_mailto (attendee->value), address)) + if ((g_str_equal (itip_strip_mailto (attendee->value), address)) || (attendee->sentby && g_str_equal (itip_strip_mailto (attendee->sentby), address))) { at = attendee; break; @@ -1820,7 +1820,7 @@ set_text_as_bold (EDayViewEvent *event) } /* The attendee has not yet accepted the meeting, display the summary as bolded. - If the attendee is not present, it might have come through a mailing list. + If the attendee is not present, it might have come through a mailing list. In that case, we never show the meeting as bold even if it is unaccepted. */ if (at && (at->status == ICAL_PARTSTAT_NEEDSACTION)) gnome_canvas_item_set (event->canvas_item, "bold", TRUE, NULL); @@ -3077,10 +3077,10 @@ e_day_view_on_time_canvas_scroll (GtkWidget *widget, return TRUE; default: return FALSE; - } -} - -static gboolean + } +} + +static gboolean e_day_view_on_long_event_button_press (EDayView *day_view, gint event_num, GdkEventButton *event, @@ -3250,7 +3250,7 @@ e_day_view_on_event_click (EDayView *day_view, && (pos == E_CALENDAR_VIEW_POS_TOP_EDGE || pos == E_CALENDAR_VIEW_POS_BOTTOM_EDGE)) { gboolean read_only = FALSE; - + if (event && (!event->is_editable || (e_cal_is_read_only (event->comp_data->client, &read_only, NULL) && read_only))) { return; } @@ -4081,7 +4081,7 @@ e_day_view_finish_resize (EDayView *day_view) if (day_view->resize_event_num == -1) return; - + day = day_view->resize_event_day; event_num = day_view->resize_event_num; event = &g_array_index (day_view->events[day], EDayViewEvent, @@ -4137,7 +4137,7 @@ e_day_view_finish_resize (EDayView *day_view) gtk_widget_queue_draw (day_view->top_canvas); goto out; } - + if (mod == CALOBJ_MOD_ALL) comp_util_sanitize_recurrence_master (comp, client); @@ -4616,7 +4616,7 @@ e_day_view_reshape_day_events (EDayView *day_view, if (day_view->last_edited_comp_string == NULL) { g_free (current_comp_string); continue; - } + } if (strncmp (current_comp_string, day_view->last_edited_comp_string,50) == 0) { e_canvas_item_grab_focus (event->canvas_item, TRUE); @@ -7544,7 +7544,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget, g_object_unref (comp); return; } - + if (mod == CALOBJ_MOD_ALL) comp_util_sanitize_recurrence_master (comp, client); diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index 7cfb3c2dc6..d22201e3f3 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index bab36202d6..12442ba2c2 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -873,7 +873,7 @@ write_recurrence_piece (EItipControl *itip, ECalComponent *comp, dt.value = &r->until; dt.tzid = icaltimezone_get_tzid ((icaltimezone *)r->until.zone); - write_label_piece (itip, &dt, buffer, + write_label_piece (itip, &dt, buffer, /* For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'*/ _(", ending on "), NULL, TRUE); } diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h index 642eccfe8d..38dce21bf1 100644 --- a/calendar/gui/e-itip-control.h +++ b/calendar/gui/e-itip-control.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c index efa616535c..0b5e147407 100644 --- a/calendar/gui/e-meeting-attendee.c +++ b/calendar/gui/e-meeting-attendee.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -846,7 +846,7 @@ e_meeting_attendee_add_busy_period (EMeetingAttendee *ia, /* If the busy_type is FREE, then there is no need to render it in UI */ if (busy_type == E_MEETING_FREE_BUSY_FREE) - goto done; + goto done; /* If the busy range is not set elsewhere, track it as best we can */ if (!priv->start_busy_range_set) { diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h index a9f344484d..a259de6619 100644 --- a/calendar/gui/e-meeting-attendee.h +++ b/calendar/gui/e-meeting-attendee.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 2d8a532727..c903c97c23 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h index 12deb8a25d..50aad0c966 100644 --- a/calendar/gui/e-meeting-list-view.h +++ b/calendar/gui/e-meeting-list-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index a5bbffb78b..5e6270976a 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-store.h b/calendar/gui/e-meeting-store.h index d20c1224f3..8a237fc34b 100644 --- a/calendar/gui/e-meeting-store.h +++ b/calendar/gui/e-meeting-store.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c index 6687919a40..ae7eeb7937 100644 --- a/calendar/gui/e-meeting-time-sel-item.c +++ b/calendar/gui/e-meeting-time-sel-item.c @@ -15,7 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h index addb99e47a..310eb4c3a0 100644 --- a/calendar/gui/e-meeting-time-sel-item.h +++ b/calendar/gui/e-meeting-time-sel-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 4bf44eb6e1..c10a85e341 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h index deb91c2397..2cc82278f6 100644 --- a/calendar/gui/e-meeting-time-sel.h +++ b/calendar/gui/e-meeting-time-sel.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h index 4f7d41eabf..bfcdfc5854 100644 --- a/calendar/gui/e-meeting-types.h +++ b/calendar/gui/e-meeting-types.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-utils.c b/calendar/gui/e-meeting-utils.c index 30fbaf143b..ac11881bf4 100644 --- a/calendar/gui/e-meeting-utils.c +++ b/calendar/gui/e-meeting-utils.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h index d360471b20..c71efec135 100644 --- a/calendar/gui/e-meeting-utils.h +++ b/calendar/gui/e-meeting-utils.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-memo-table-config.c b/calendar/gui/e-memo-table-config.c index 21e6f036c1..d79dac7073 100644 --- a/calendar/gui/e-memo-table-config.c +++ b/calendar/gui/e-memo-table-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-memo-table-config.h b/calendar/gui/e-memo-table-config.h index 5242b5f7b7..68960d58dc 100644 --- a/calendar/gui/e-memo-table-config.h +++ b/calendar/gui/e-memo-table-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 35d6c2621b..ac43b39a5a 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 58f398bfb5..b593b9445b 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c index c9f4681bf9..f6f1cff91c 100644 --- a/calendar/gui/e-memos.c +++ b/calendar/gui/e-memos.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h index 1b3f0b8c72..0a000f0d73 100644 --- a/calendar/gui/e-memos.h +++ b/calendar/gui/e-memos.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-mini-calendar-config.c b/calendar/gui/e-mini-calendar-config.c index dfafc86fe6..ccd9a2078d 100644 --- a/calendar/gui/e-mini-calendar-config.c +++ b/calendar/gui/e-mini-calendar-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-mini-calendar-config.h b/calendar/gui/e-mini-calendar-config.h index 621d682e9d..60c88a1b9c 100644 --- a/calendar/gui/e-mini-calendar-config.h +++ b/calendar/gui/e-mini-calendar-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c index dea9dd469d..c177c5231b 100644 --- a/calendar/gui/e-select-names-editable.c +++ b/calendar/gui/e-select-names-editable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -142,7 +142,7 @@ e_select_names_editable_get_emails (ESelectNamesEditable *esne) for (l = destinations; l != NULL; l = l->next) { destination = l->data; - if (e_destination_is_evolution_list (destination)) { + if (e_destination_is_evolution_list (destination)) { const GList *list_dests, *l; list_dests = e_destination_list_get_dests (destination); @@ -205,7 +205,7 @@ e_select_names_editable_get_names (ESelectNamesEditable *esne) return NULL; for (l = destinations; l != NULL; l = l->next) { - destination = l->data; + destination = l->data; if (e_destination_is_evolution_list (destination)) { const GList *list_dests, *l; @@ -217,7 +217,7 @@ e_select_names_editable_get_names (ESelectNamesEditable *esne) result = g_list_append (result, g_strdup (e_destination_get_name (destination))); } } - + g_list_free (destinations); return result; diff --git a/calendar/gui/e-select-names-editable.h b/calendar/gui/e-select-names-editable.h index da961237e7..58b0ce3290 100644 --- a/calendar/gui/e-select-names-editable.h +++ b/calendar/gui/e-select-names-editable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c index 357eba4c5b..f1aa1ec45d 100644 --- a/calendar/gui/e-select-names-renderer.c +++ b/calendar/gui/e-select-names-renderer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -100,7 +100,7 @@ e_select_names_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, G g_signal_connect (editable, "editing_done", G_CALLBACK (e_select_names_renderer_editing_done), sn_cell); - /* Removed focus-out-event. focus out event already listen by base class. + /* Removed focus-out-event. focus out event already listen by base class. We don't need to listen for the focus out event any more */ sn_cell->priv->editable = g_object_ref (editable); diff --git a/calendar/gui/e-select-names-renderer.h b/calendar/gui/e-select-names-renderer.h index 21deec2cb5..6a2c4be102 100644 --- a/calendar/gui/e-select-names-renderer.h +++ b/calendar/gui/e-select-names-renderer.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index eabe4d72d2..16d8b7636a 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -951,7 +951,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks) priv = tasks->priv; source = e_cal_get_source (ecal); - + if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED || status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED) auth_cal_forget_password (ecal); diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h index 41fcd2d78a..67989ee021 100644 --- a/calendar/gui/e-tasks.h +++ b/calendar/gui/e-tasks.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index 391079a084..2be6548757 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h index f4780f0712..6c63fb8444 100644 --- a/calendar/gui/e-timezone-entry.h +++ b/calendar/gui/e-timezone-entry.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-config.c b/calendar/gui/e-week-view-config.c index 28224fb1db..8a0c0de984 100644 --- a/calendar/gui/e-week-view-config.c +++ b/calendar/gui/e-week-view-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-config.h b/calendar/gui/e-week-view-config.h index 32f32b0d75..e86e0fa968 100644 --- a/calendar/gui/e-week-view-config.h +++ b/calendar/gui/e-week-view-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 49513e96e5..458d8e7e3c 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h index 1e56a5d8a5..69d041f046 100644 --- a/calendar/gui/e-week-view-event-item.h +++ b/calendar/gui/e-week-view-event-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c index 6599a3f7db..37a2706f2a 100644 --- a/calendar/gui/e-week-view-layout.c +++ b/calendar/gui/e-week-view-layout.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h index d531435d11..0acd41d232 100644 --- a/calendar/gui/e-week-view-layout.h +++ b/calendar/gui/e-week-view-layout.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c index be69282a4a..e1c090b196 100644 --- a/calendar/gui/e-week-view-main-item.c +++ b/calendar/gui/e-week-view-main-item.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h index 818ba87d0f..34bdfa2e1f 100644 --- a/calendar/gui/e-week-view-main-item.h +++ b/calendar/gui/e-week-view-main-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c index d483473810..e23f2a675f 100644 --- a/calendar/gui/e-week-view-titles-item.c +++ b/calendar/gui/e-week-view-titles-item.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h index 89f33de6ef..0463c95cb0 100644 --- a/calendar/gui/e-week-view-titles-item.h +++ b/calendar/gui/e-week-view-titles-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 52fabef69e..57c0547af0 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -367,7 +367,7 @@ static void model_row_changed_cb (ETableModel *etm, int row, gpointer user_data) { EWeekView *week_view = E_WEEK_VIEW (user_data); - + if (!E_CALENDAR_VIEW (week_view)->in_focus) { return; } @@ -1931,7 +1931,7 @@ set_text_as_bold (EWeekViewEvent *event, EWeekViewEventSpan *span) for (l = attendees; l; l = l->next) { ECalComponentAttendee *attendee = l->data; - if ((g_str_equal (itip_strip_mailto (attendee->value), address)) + if ((g_str_equal (itip_strip_mailto (attendee->value), address)) || (attendee->sentby && g_str_equal (itip_strip_mailto (attendee->sentby), address))) { at = attendee; break; @@ -1939,7 +1939,7 @@ set_text_as_bold (EWeekViewEvent *event, EWeekViewEventSpan *span) } /* The attendee has not yet accepted the meeting, display the summary as bolded. - If the attendee is not present, it might have come through a mailing list. + If the attendee is not present, it might have come through a mailing list. In that case, we never show the meeting as bold even if it is unaccepted. */ if (at && (at->status == ICAL_PARTSTAT_NEEDSACTION)) gnome_canvas_item_set (span->text_item, "bold", TRUE, NULL); @@ -3625,7 +3625,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view, if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) { goto out; } - + if (mod == CALOBJ_MOD_ALL) comp_util_sanitize_recurrence_master (comp, client); @@ -3879,16 +3879,16 @@ e_month_view_do_cursor_key_up (EWeekView *week_view) /* no easy way to calculate new selection_start_day, therefore * calculate a time_t value and set_selected_time_range */ time_t current; - if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { - current = time_add_week(current,-1); + if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { + current = time_add_week(current,-1); e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP); - e_week_view_set_selected_time_range_visible(week_view,current,current); + e_week_view_set_selected_time_range_visible(week_view,current,current); } } else { week_view->selection_start_day -= 7; week_view->selection_end_day = week_view->selection_start_day; } - + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } @@ -3908,13 +3908,13 @@ e_month_view_do_cursor_key_down (EWeekView *week_view) if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { current = time_add_week(current,1); e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN); - e_week_view_set_selected_time_range_visible(week_view,current,current); + e_week_view_set_selected_time_range_visible(week_view,current,current); } } else { week_view->selection_start_day += 7; week_view->selection_end_day = week_view->selection_start_day; } - + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } @@ -3930,15 +3930,15 @@ e_month_view_do_cursor_key_left (EWeekView *week_view) * calculate a time_t value and set_selected_time_range */ time_t current; if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { - current = time_add_day(current,-1); + current = time_add_day(current,-1); e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP); - e_week_view_set_selected_time_range_visible(week_view,current,current); + e_week_view_set_selected_time_range_visible(week_view,current,current); } } else { week_view->selection_start_day--; week_view->selection_end_day = week_view->selection_start_day; } - + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } @@ -3958,13 +3958,13 @@ e_month_view_do_cursor_key_right (EWeekView *week_view) if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { current = time_add_day(current,1); e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN); - e_week_view_set_selected_time_range_visible(week_view,current,current); + e_week_view_set_selected_time_range_visible(week_view,current,current); } } else { week_view->selection_start_day++; week_view->selection_end_day = week_view->selection_start_day; } - + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h index e62b2f63cd..0936a1e6dc 100644 --- a/calendar/gui/e-week-view.h +++ b/calendar/gui/e-week-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 991df095b3..18f4a47276 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -856,8 +856,8 @@ struct _date_query_msg { GnomeCalendar *gcal; }; -static void -update_query_async (struct _date_query_msg *msg) +static void +update_query_async (struct _date_query_msg *msg) { GnomeCalendar *gcal = msg->gcal; GnomeCalendarPrivate *priv; @@ -866,7 +866,7 @@ update_query_async (struct _date_query_msg *msg) GList *l; priv = gcal->priv; - + /* free the previous queries */ for (l = priv->dn_queries; l != NULL; l = l->next) { old_query = l->data; @@ -889,7 +889,7 @@ update_query_async (struct _date_query_msg *msg) g_slice_free (struct _date_query_msg, msg); return; /* No time range is set, so don't start a query */ } - + /* create queries for each loaded client */ for (l = priv->clients_list[E_CAL_SOURCE_TYPE_EVENT]; l != NULL; l = l->next) { GError *error = NULL; @@ -899,7 +899,7 @@ update_query_async (struct _date_query_msg *msg) if (e_cal_get_load_state ((ECal *) l->data) != E_CAL_LOAD_LOADED) continue; -try_again: +try_again: old_query = NULL; if (!e_cal_get_query ((ECal *) l->data, real_sexp, &old_query, &error)) { /* If calendar is busy try again for 3 times. */ @@ -907,11 +907,11 @@ try_again: tries++; /*TODO chose an optimal value */ g_usleep (500); - + g_clear_error (&error); - goto try_again; - } - + goto try_again; + } + g_warning (G_STRLOC ": Could not create the query: %s ", error->message); g_clear_error (&error); @@ -943,7 +943,7 @@ try_again: /* Restarts a query for the date navigator in the calendar */ static void update_query (GnomeCalendar *gcal) -{ +{ struct _date_query_msg *msg; e_calendar_item_clear_marks (gcal->priv->date_navigator->calitem); @@ -1954,7 +1954,7 @@ gnome_calendar_destroy (GtkObject *object) } for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) { - if (priv->configs[i]) + if (priv->configs[i]) g_object_unref (priv->configs[i]); priv->configs[i] = NULL; } @@ -2423,7 +2423,7 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra continue; E_CALENDAR_VIEW (priv->views [i])->in_focus = FALSE; } - + if (grab_focus) focus_current_view (gcal); @@ -2475,7 +2475,7 @@ display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data) display_view (gcal, view_type, TRUE); - + if (!priv->base_view_time) update_view_times (gcal, time (NULL)); else @@ -2783,7 +2783,7 @@ add_mclient (ECalModel *model, ECal *client) message_push ((Message *) msg); } -static void +static void non_intrusive_error_remove(GtkWidget *w, void *data) { g_hash_table_remove(non_intrusive_error_table, data); @@ -2832,7 +2832,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal) return; case E_CALENDAR_STATUS_INVALID_SERVER_VERSION: id = g_strdup ("calendar:server-version"); - + if (g_hash_table_lookup(non_intrusive_error_table, id)) { /* We already have it */ g_message("Error occurred while existing dialog active:\n"); @@ -2978,7 +2978,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar g_hash_table_remove (priv->clients[source_type], e_source_peek_uid (source)); /* FIXME Is there a better way to handle this? */ - if (priv->default_client[source_type]) + if (priv->default_client[source_type]) g_object_unref (priv->default_client[source_type]); priv->default_client[source_type] = NULL; @@ -3073,7 +3073,7 @@ backend_error_cb (ECal *client, const char *message, gpointer data) g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(dialog)); g_signal_connect(GTK_WIDGET (dialog), "destroy", G_CALLBACK(non_intrusive_error_remove), id); - + g_free (uristr); } @@ -3675,7 +3675,7 @@ gnome_calendar_on_date_navigator_selection_changed (ECalendarItem *calitem, Gnom /* Make the views display things properly */ update_view_times (gcal, new_time); set_view (gcal, view_type, TRUE); - + gnome_calendar_notify_dates_shown_changed (gcal); } diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index 1cf2005e3f..947559bac5 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c index ac4100160a..d341245fec 100644 --- a/calendar/gui/goto.c +++ b/calendar/gui/goto.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/goto.h b/calendar/gui/goto.h index c1f51632f8..3b774d2e89 100644 --- a/calendar/gui/goto.h +++ b/calendar/gui/goto.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c index ccfb0254e8..f63e3e187a 100644 --- a/calendar/gui/itip-bonobo-control.c +++ b/calendar/gui/itip-bonobo-control.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/itip-bonobo-control.h b/calendar/gui/itip-bonobo-control.h index 7c2033656c..c79b8f7d09 100644 --- a/calendar/gui/itip-bonobo-control.h +++ b/calendar/gui/itip-bonobo-control.h @@ -1,7 +1,7 @@ /* * * Evolution calendar - Control for displaying iTIP mail messages - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 30ad9822c7..ae822c9b9c 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h index 9c8ffa1b60..8dce8266ab 100644 --- a/calendar/gui/itip-utils.h +++ b/calendar/gui/itip-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 14b8267167..1687328fa4 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index 1ed3fb1634..d14b350d1c 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -450,7 +450,7 @@ edit_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) calendar_setup_edit_memo_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source); } -static void +static void set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value) { MemosComponentView *component_view = data; @@ -466,13 +466,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char static void mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) { - set_offline_availability (ep, pitem, data, "0"); + set_offline_availability (ep, pitem, data, "0"); } static void mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) { - set_offline_availability (ep, pitem, data, "1"); + set_offline_availability (ep, pitem, data, "1"); } static EPopupItem emc_source_popups[] = { diff --git a/calendar/gui/memos-component.h b/calendar/gui/memos-component.h index b3995628ab..3ca01a50f7 100644 --- a/calendar/gui/memos-component.h +++ b/calendar/gui/memos-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c index 7b743a9378..2f7bd9b1bb 100644 --- a/calendar/gui/memos-control.c +++ b/calendar/gui/memos-control.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/memos-control.h b/calendar/gui/memos-control.h index 5861ae50e5..565ac160ed 100644 --- a/calendar/gui/memos-control.h +++ b/calendar/gui/memos-control.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index 8a68e4ffdc..97cc575b20 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/migration.h b/calendar/gui/migration.h index 4073e31fac..c16fd831b9 100644 --- a/calendar/gui/migration.h +++ b/calendar/gui/migration.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c index acae5d8e1e..ab657d8872 100644 --- a/calendar/gui/misc.c +++ b/calendar/gui/misc.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/misc.h b/calendar/gui/misc.h index 3e0fe04cb4..8c328652bb 100644 --- a/calendar/gui/misc.h +++ b/calendar/gui/misc.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 943a4af2ee..3fca566bf2 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/print.h b/calendar/gui/print.h index 35454f9224..39482b33f2 100644 --- a/calendar/gui/print.h +++ b/calendar/gui/print.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c index 9000060183..b57a50d6ce 100644 --- a/calendar/gui/tag-calendar.c +++ b/calendar/gui/tag-calendar.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h index 847aab12ea..e1d9fcf0b1 100644 --- a/calendar/gui/tag-calendar.h +++ b/calendar/gui/tag-calendar.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 2d17f5783f..68536b29cb 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -442,7 +442,7 @@ edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) calendar_setup_edit_task_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source); } -static void +static void set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value) { TasksComponentView *component_view = data; @@ -458,13 +458,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char static void mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) { - set_offline_availability (ep, pitem, data, "0"); + set_offline_availability (ep, pitem, data, "0"); } static void mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) { - set_offline_availability (ep, pitem, data, "1"); + set_offline_availability (ep, pitem, data, "1"); } static EPopupItem etc_source_popups[] = { diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h index cbb25d793e..0667fc2523 100644 --- a/calendar/gui/tasks-component.h +++ b/calendar/gui/tasks-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 9732f2f7e7..7ee468e768 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -484,7 +484,7 @@ confirm_purge (ETasks *tasks) GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, - "%s", + "%s", _("This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n\nReally erase these tasks?")); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_NO); diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h index a41783fe9a..9dd3a3946d 100644 --- a/calendar/gui/tasks-control.h +++ b/calendar/gui/tasks-control.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c index 6681829afa..56a7386d4b 100644 --- a/calendar/gui/weekday-picker.c +++ b/calendar/gui/weekday-picker.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h index c730ebbf4b..bd78201bd3 100644 --- a/calendar/gui/weekday-picker.h +++ b/calendar/gui/weekday-picker.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/importers/evolution-calendar-importer.h b/calendar/importers/evolution-calendar-importer.h index 9a3facc4d7..7874a809fd 100644 --- a/calendar/importers/evolution-calendar-importer.h +++ b/calendar/importers/evolution-calendar-importer.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index a7ea5e7921..a4e0fa7048 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/importers/main.c b/calendar/importers/main.c index b1a3a20501..dc91f378f5 100644 --- a/calendar/importers/main.c +++ b/calendar/importers/main.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/zones.h b/calendar/zones.h index ad485eb993..4489960698 100644 --- a/calendar/zones.h +++ b/calendar/zones.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c index 077c0c5ec0..3b40d270f0 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-actions.h b/composer/e-composer-actions.h index da3e470d81..5d49cde158 100644 --- a/composer/e-composer-actions.h +++ b/composer/e-composer-actions.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c index 842deae9c9..5da5842d8c 100644 --- a/composer/e-composer-autosave.c +++ b/composer/e-composer-autosave.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-autosave.h b/composer/e-composer-autosave.h index 7c97338019..fe03b7b0bc 100644 --- a/composer/e-composer-autosave.h +++ b/composer/e-composer-autosave.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-common.h b/composer/e-composer-common.h index 832b38001f..28affba2ad 100644 --- a/composer/e-composer-common.h +++ b/composer/e-composer-common.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c index 68b6c0c14a..4dadfa7ac7 100644 --- a/composer/e-composer-from-header.c +++ b/composer/e-composer-from-header.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-from-header.h b/composer/e-composer-from-header.h index f8c6dc6f18..d2603bd664 100644 --- a/composer/e-composer-from-header.h +++ b/composer/e-composer-from-header.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index 33041301b5..f25c3b722c 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ @@ -548,7 +548,7 @@ composer_header_table_constructor (GType type, priv->headers[ii]->input_widget, "right-attach", 2, NULL); - gtk_table_attach (GTK_TABLE (object), (GtkWidget *)priv->actions_container, 2, 4, E_COMPOSER_HEADER_TO, + gtk_table_attach (GTK_TABLE (object), (GtkWidget *)priv->actions_container, 2, 4, E_COMPOSER_HEADER_TO, E_COMPOSER_HEADER_TO + 1, GTK_FILL, 0, 0, 3); } diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h index 817863031c..91ad56da46 100644 --- a/composer/e-composer-header-table.h +++ b/composer/e-composer-header-table.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c index 674e7a6cee..7b7cb9bcf2 100644 --- a/composer/e-composer-header.c +++ b/composer/e-composer-header.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h index 126af5fb77..eb339d647c 100644 --- a/composer/e-composer-header.h +++ b/composer/e-composer-header.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ @@ -65,7 +65,7 @@ void e_composer_header_set_sensitive (EComposerHeader *header, gboolean e_composer_header_get_visible (EComposerHeader *header); void e_composer_header_set_visible (EComposerHeader *header, gboolean visible); -void e_composer_header_set_property (GObject *object, guint property_id, +void e_composer_header_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); void e_composer_header_set_title_tooltip (EComposerHeader *header, diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c index ed4e60c6f9..bfc9441fb7 100644 --- a/composer/e-composer-name-header.c +++ b/composer/e-composer-name-header.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -282,7 +282,7 @@ e_composer_name_header_new_with_action (const gchar *label, return g_object_new ( E_TYPE_COMPOSER_NAME_HEADER, "label", label, - "button", TRUE, "name-selector", name_selector, + "button", TRUE, "name-selector", name_selector, "addaction_text", action_label, "addaction", action_label != NULL, NULL); } diff --git a/composer/e-composer-name-header.h b/composer/e-composer-name-header.h index af38666d59..100d6c8980 100644 --- a/composer/e-composer-name-header.h +++ b/composer/e-composer-name-header.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c index bb971d53bf..59d81b80ac 100644 --- a/composer/e-composer-post-header.c +++ b/composer/e-composer-post-header.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-post-header.h b/composer/e-composer-post-header.h index 666d043df2..40dc5a8d58 100644 --- a/composer/e-composer-post-header.h +++ b/composer/e-composer-post-header.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c index 0a1a91f6c0..2a2cea6a4c 100644 --- a/composer/e-composer-private.c +++ b/composer/e-composer-private.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ @@ -101,7 +101,7 @@ e_composer_private_init (EMsgComposer *composer) widget = gtkhtml_editor_get_managed_widget (editor, "/main-menu"); gtk_widget_hide (widget); widget = gtkhtml_editor_get_managed_widget (editor, "/main-toolbar"); - gtk_toolbar_set_style ((GtkToolbar *)widget, GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_style ((GtkToolbar *)widget, GTK_TOOLBAR_BOTH_HORIZ); gtk_widget_hide (widget); } diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h index 8dc9b4be93..49d9ae6d74 100644 --- a/composer/e-composer-private.h +++ b/composer/e-composer-private.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c index e676ef941c..e765237a2d 100644 --- a/composer/e-composer-text-header.c +++ b/composer/e-composer-text-header.c @@ -14,7 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ @@ -122,7 +122,7 @@ e_composer_text_header_new_button (const gchar *label, const gchar *action_label { return g_object_new ( E_TYPE_COMPOSER_TEXT_HEADER, "label", label, - "button", TRUE, "addaction", action_label != NULL, + "button", TRUE, "addaction", action_label != NULL, "addaction_text", action_label, "visible", action_label == NULL, NULL); } diff --git a/composer/e-composer-text-header.h b/composer/e-composer-text-header.h index 79e972d3c6..74fb86f9b0 100644 --- a/composer/e-composer-text-header.h +++ b/composer/e-composer-text-header.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index a715774e0d..946bff28c1 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1434,7 +1434,7 @@ msg_composer_update_preferences (GConfClient *client, if (entry) { if (strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_INLINE_SPELLING_KEY) != 0 && - strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 && + strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 && strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_SMILEYS_KEY) != 0) return; } @@ -2928,13 +2928,13 @@ e_msg_composer_new_with_message (CamelMimeMessage *message) /* Remove any other X-Evolution-* headers that may have been set */ xev = mail_tool_remove_xevolution_headers (message); camel_header_raw_clear (&xev); - + /* Check for receipt request */ if (camel_medium_get_header (CAMEL_MEDIUM (message), "Disposition-Notification-To")) { action = GTK_TOGGLE_ACTION (ACTION (REQUEST_READ_RECEIPT)); gtk_toggle_action_set_active (action, TRUE); } - + /* Check for mail priority */ if (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Priority")) { action = GTK_TOGGLE_ACTION (ACTION (PRIORITIZE_MESSAGE)); @@ -3907,7 +3907,7 @@ e_msg_composer_request_close_all (void) /* Try to autosave before closing. If it fails for * some reason, the CLOSE action will still detect - * unsaved changes and prompt the user. + * unsaved changes and prompt the user. * * FIXME If it /does/ prompt the user, the Cancel * button will act the same as Discard Changes, @@ -4094,7 +4094,7 @@ e_load_spell_languages (void) const GtkhtmlSpellLanguage *language; language = gtkhtml_spell_language_lookup (NULL); - + if (language) { spell_languages = g_list_prepend ( spell_languages, (gpointer) language); diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h index bf712d2928..b9985f7f44 100644 --- a/composer/e-msg-composer.h +++ b/composer/e-msg-composer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c index 7d874b896b..9f97a441db 100644 --- a/e-util/e-bconf-map.c +++ b/e-util/e-bconf-map.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h index dfd015ec65..8c6ea6deec 100644 --- a/e-util/e-bconf-map.h +++ b/e-util/e-bconf-map.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-binding.c b/e-util/e-binding.c index 6a29166cc1..9d4e83fc3f 100644 --- a/e-util/e-binding.c +++ b/e-util/e-binding.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/e-util/e-binding.h b/e-util/e-binding.h index 676093bfad..12f4db8505 100644 --- a/e-util/e-binding.h +++ b/e-util/e-binding.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c index fdd3d3fe01..e2cf15af43 100644 --- a/e-util/e-bit-array.c +++ b/e-util/e-bit-array.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h index 4504f5afc6..34c8016094 100644 --- a/e-util/e-bit-array.h +++ b/e-util/e-bit-array.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c index 875b67974f..c01b98cde4 100644 --- a/e-util/e-categories-config.c +++ b/e-util/e-categories-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h index 9eff161375..bbd76f2a02 100644 --- a/e-util/e-categories-config.h +++ b/e-util/e-categories-config.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c index 83fb305347..7c1c6eb091 100644 --- a/e-util/e-config-listener.c +++ b/e-util/e-config-listener.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-config-listener.h b/e-util/e-config-listener.h index 655bc3c1ec..4449d8f22c 100644 --- a/e-util/e-config-listener.h +++ b/e-util/e-config-listener.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-config.c b/e-util/e-config.c index a2d68e1740..5d0a7090f7 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-config.h b/e-util/e-config.h index 1ee7e29b58..b128005c64 100644 --- a/e-util/e-config.h +++ b/e-util/e-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c index 0288602a7e..f673370bfc 100644 --- a/e-util/e-corba-utils.c +++ b/e-util/e-corba-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h index 979237929d..b6da7240e7 100644 --- a/e-util/e-corba-utils.h +++ b/e-util/e-corba-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-cursor.c b/e-util/e-cursor.c index 7d547e38ac..c5f77c7d62 100644 --- a/e-util/e-cursor.c +++ b/e-util/e-cursor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-cursor.h b/e-util/e-cursor.h index f0b78b3126..30ad722bbc 100644 --- a/e-util/e-cursor.h +++ b/e-util/e-cursor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 0546430512..978033541a 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h index 9d594122e2..6b9956ddf9 100644 --- a/e-util/e-dialog-utils.h +++ b/e-util/e-dialog-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c index f1777ca55d..98e1be7a74 100644 --- a/e-util/e-dialog-widgets.c +++ b/e-util/e-dialog-widgets.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h index f5ff123a4f..b7f838539d 100644 --- a/e-util/e-dialog-widgets.h +++ b/e-util/e-dialog-widgets.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-error.c b/e-util/e-error.c index 23e52bca8e..f2067950bc 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -529,7 +529,7 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) g_string_free (oerr, TRUE); } else perr = g_strdup (gtk_window_get_title (GTK_WINDOW (dialog))); - + if (e->secondary) { ee_build_label(out, e->secondary, args, TRUE); oerr = g_string_new(""); @@ -561,7 +561,7 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) gtk_box_pack_start((GtkBox *)dialog->vbox, hbox, TRUE, TRUE, 0); g_object_set_data_full ((GObject *) dialog, "primary", perr, g_free); g_object_set_data_full ((GObject *) dialog, "secondary", serr, g_free); - + return (GtkWidget *)dialog; } diff --git a/e-util/e-error.h b/e-util/e-error.h index 321957839f..014f74ee88 100644 --- a/e-util/e-error.h +++ b/e-util/e-error.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-event.c b/e-util/e-event.c index 73111229f9..ab96701abc 100644 --- a/e-util/e-event.c +++ b/e-util/e-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-event.h b/e-util/e-event.h index c97f1b30bc..5b4e3f44ab 100644 --- a/e-util/e-event.h +++ b/e-util/e-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-folder-map.c b/e-util/e-folder-map.c index 157c4ca353..d74817ecfe 100644 --- a/e-util/e-folder-map.c +++ b/e-util/e-folder-map.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-folder-map.h b/e-util/e-folder-map.h index a939ea777f..3f41838882 100644 --- a/e-util/e-folder-map.h +++ b/e-util/e-folder-map.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-fsutils.c b/e-util/e-fsutils.c index 28b434f291..27480959c4 100644 --- a/e-util/e-fsutils.c +++ b/e-util/e-fsutils.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-fsutils.h b/e-util/e-fsutils.h index 91ad9b9c4a..76a03f5441 100644 --- a/e-util/e-fsutils.h +++ b/e-util/e-fsutils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c index 4cdb0eefa3..4958f0806e 100644 --- a/e-util/e-html-utils.c +++ b/e-util/e-html-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h index fa70e55f7f..55e67ba915 100644 --- a/e-util/e-html-utils.h +++ b/e-util/e-html-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 299dfff6f5..5b1cd2f9bd 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h index c864b1be8e..b8a4df972f 100644 --- a/e-util/e-icon-factory.h +++ b/e-util/e-icon-factory.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-import.c b/e-util/e-import.c index 9e8c8a3fa7..ccc44d7daa 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-import.h b/e-util/e-import.h index 9a9994150b..4ca1ef1829 100644 --- a/e-util/e-import.h +++ b/e-util/e-import.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-logger.c b/e-util/e-logger.c index 3d3c88c384..19326d2d67 100644 --- a/e-util/e-logger.c +++ b/e-util/e-logger.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -243,7 +243,7 @@ e_logger_log (ELogger *logger, set_dirty (logger); } -void +void e_logger_get_logs (ELogger *logger, ELogFunction func, gpointer data) @@ -256,7 +256,7 @@ e_logger_get_logs (ELogger *logger, /* Flush everything before we get the logs */ if (logger->priv->fp) - fflush (logger->priv->fp); + fflush (logger->priv->fp); fp = g_fopen (logger->priv->logfile, "r"); if (!fp) { diff --git a/e-util/e-logger.h b/e-util/e-logger.h index 186d918f12..b3bd4f8919 100644 --- a/e-util/e-logger.h +++ b/e-util/e-logger.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-menu.c b/e-util/e-menu.c index cfbb215712..e5472d6bbc 100644 --- a/e-util/e-menu.c +++ b/e-util/e-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-menu.h b/e-util/e-menu.h index f844f80400..5df8f11b28 100644 --- a/e-util/e-menu.h +++ b/e-util/e-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c index ade1abc0b4..682563907c 100644 --- a/e-util/e-mktemp.c +++ b/e-util/e-mktemp.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-mktemp.h b/e-util/e-mktemp.h index 48e72235ee..01dbd18119 100644 --- a/e-util/e-mktemp.h +++ b/e-util/e-mktemp.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-non-intrusive-error-dialog.c b/e-util/e-non-intrusive-error-dialog.c index 070c1e9bef..bb24a2360e 100644 --- a/e-util/e-non-intrusive-error-dialog.c +++ b/e-util/e-non-intrusive-error-dialog.c @@ -169,7 +169,7 @@ eni_error_level_value_changed (GtkComboBox *w, gpointer *data) g_object_unref (gconf_client); } -void +void eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, const char *error_level_path) { GtkWidget *container; diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c index 877d60ac41..b2338ccead 100644 --- a/e-util/e-pilot-map.c +++ b/e-util/e-pilot-map.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-pilot-map.h b/e-util/e-pilot-map.h index d49d62cbb2..46eaf54199 100644 --- a/e-util/e-pilot-map.h +++ b/e-util/e-pilot-map.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c index 2273064ac3..582c9458e1 100644 --- a/e-util/e-pilot-util.c +++ b/e-util/e-pilot-util.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h index 8559918eb3..0d7aebbd87 100644 --- a/e-util/e-pilot-util.h +++ b/e-util/e-pilot-util.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c index c3ee13fe60..840dd67a0e 100644 --- a/e-util/e-plugin-ui.c +++ b/e-util/e-plugin-ui.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ @@ -29,7 +29,7 @@ struct _EPluginUIHookPrivate { - /* Table of GtkUIManager ID's to UI definitions. + /* Table of GtkUIManager ID's to UI definitions. * * For example: * diff --git a/e-util/e-plugin-ui.h b/e-util/e-plugin-ui.h index b8e795c4c4..cdefda5617 100644 --- a/e-util/e-plugin-ui.h +++ b/e-util/e-plugin-ui.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index d43238be0a..7516fb3f09 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -459,7 +459,7 @@ ep_load(const char *filename, int load_level) if (load_level == 1) e_plugin_invoke (ep, "load_plugin_type_register_function", NULL); } - } + } } else if (load_level == 2) { ep = ep_load_plugin(root, pdoc); } diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h index 0b31409c96..54855d0b95 100644 --- a/e-util/e-plugin.h +++ b/e-util/e-plugin.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -376,8 +376,8 @@ struct _EPluginTypeHookClass { GType e_plugin_type_hook_get_type(void); -/* README: Currently there is only one flag. - But we may need more in the future and hence makes +/* README: Currently there is only one flag. + But we may need more in the future and hence makes sense to keep as an enum */ typedef enum _EPluginFlags { diff --git a/e-util/e-popup.c b/e-util/e-popup.c index 41428c3c5a..bcd152713c 100644 --- a/e-util/e-popup.c +++ b/e-util/e-popup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-popup.h b/e-util/e-popup.h index 877f5dfce4..65c51ce65f 100644 --- a/e-util/e-popup.h +++ b/e-util/e-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-print.c b/e-util/e-print.c index 4cc3b8155e..8faeafc0f5 100644 --- a/e-util/e-print.c +++ b/e-util/e-print.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-print.h b/e-util/e-print.h index 93cbe2d10d..9469b63636 100644 --- a/e-util/e-print.h +++ b/e-util/e-print.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c index 4fdd5d958a..ee98ad8b75 100644 --- a/e-util/e-profile-event.c +++ b/e-util/e-profile-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h index dd84671902..c20a5f1044 100644 --- a/e-util/e-profile-event.h +++ b/e-util/e-profile-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-request.c b/e-util/e-request.c index 1977b9b0fe..2175c75b2a 100644 --- a/e-util/e-request.c +++ b/e-util/e-request.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-request.h b/e-util/e-request.h index a84da2941a..ae822db83e 100644 --- a/e-util/e-request.h +++ b/e-util/e-request.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c index d2b575c15a..eaedddaf50 100644 --- a/e-util/e-signature-list.c +++ b/e-util/e-signature-list.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h index cfaa64c28a..8d8caed0a8 100644 --- a/e-util/e-signature-list.h +++ b/e-util/e-signature-list.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-signature.c b/e-util/e-signature.c index 2d0df59579..1cbed6b66b 100644 --- a/e-util/e-signature.c +++ b/e-util/e-signature.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-signature.h b/e-util/e-signature.h index cc5309c7c1..cc8591b421 100644 --- a/e-util/e-signature.h +++ b/e-util/e-signature.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c index 582ed959ad..060c3f441a 100644 --- a/e-util/e-sorter-array.c +++ b/e-util/e-sorter-array.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h index f31d9b06cc..a02f5d9635 100644 --- a/e-util/e-sorter-array.h +++ b/e-util/e-sorter-array.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c index 6176b58715..f63e5e1172 100644 --- a/e-util/e-sorter.c +++ b/e-util/e-sorter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h index 365d66a461..d64851bc70 100644 --- a/e-util/e-sorter.h +++ b/e-util/e-sorter.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c index 4b99d897db..f44019165d 100644 --- a/e-util/e-text-event-processor-emacs-like.c +++ b/e-util/e-text-event-processor-emacs-like.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h index 87e3fa797d..99635e2341 100644 --- a/e-util/e-text-event-processor-emacs-like.h +++ b/e-util/e-text-event-processor-emacs-like.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h index c4c0efa424..6e9d155f8c 100644 --- a/e-util/e-text-event-processor-types.h +++ b/e-util/e-text-event-processor-types.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c index 48100de64a..6496a63294 100644 --- a/e-util/e-text-event-processor.c +++ b/e-util/e-text-event-processor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h index 1f88407823..a9d329c140 100644 --- a/e-util/e-text-event-processor.h +++ b/e-util/e-text-event-processor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c index a7d5913bbd..ba1d0113a0 100644 --- a/e-util/e-util-labels.c +++ b/e-util/e-util-labels.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -218,7 +218,7 @@ find_label (GSList *labels, const char *tag) for (l = labels; l; l = l->next) { EUtilLabel *label = l->data; - + if (label && label->tag && !strcmp (tag, label->tag)) return label; } diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h index ee06cccc99..725f740d89 100644 --- a/e-util/e-util-labels.h +++ b/e-util/e-util-labels.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h index cca11e2477..f7d84dea37 100644 --- a/e-util/e-util-private.h +++ b/e-util/e-util-private.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-util.c b/e-util/e-util.c index fc4f71f187..533dc2d740 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1297,7 +1297,7 @@ e_file_lock_destroy () } } -gboolean +gboolean e_file_lock_exists () { const char *fname = get_lock_filename (); @@ -1334,7 +1334,7 @@ e_util_guess_mime_type (const char *filename, gboolean localfile) fi = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL); if (fi) { mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (fi)); - + g_object_unref (fi); } @@ -1460,7 +1460,7 @@ e_util_read_file (const char *filename, gboolean filename_is_uri, char **buffer, if (err) res = FALSE; - + if (res) *buffer = buff; else diff --git a/e-util/e-util.h b/e-util/e-util.h index 480da24eac..e5126213f3 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c index 1c8c5d3f18..04c70afd75 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c index 653669b381..73dd415a6d 100644 --- a/e-util/e-xml-utils.c +++ b/e-util/e-xml-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h index ef8ae8ac8a..c327d61e17 100644 --- a/e-util/e-xml-utils.h +++ b/e-util/e-xml-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index ff880a12bd..1b844977f9 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -1,4 +1,4 @@ -/* +/* * (C) 2005 OpenedHand Ltd. * * Author: Jorn Baayen @@ -29,7 +29,7 @@ struct _GConfBridge { GConfClient *client; - + GHashTable *bindings; }; @@ -43,7 +43,7 @@ typedef enum { typedef struct { BindingType type; guint id; - + gboolean delayed_mode; char *key; @@ -149,7 +149,7 @@ gconf_bridge_get (void) * gconf_bridge_get_client * @bridge: A #GConfBridge * - * Returns the #GConfClient used by @bridge. This is the same #GConfClient + * Returns the #GConfClient used by @bridge. This is the same #GConfClient * as returned by gconf_client_get_default(). * * Return value: A #GConfClient. @@ -183,7 +183,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding, GConfValue *pref_value) { GValue src_value, value; - + /* Make sure we don't enter an infinite synchronizing loop */ g_signal_handler_block (binding->object, binding->prop_notify_id); @@ -229,7 +229,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding, "transform a \"%s\" to a \"%s\".", g_type_name (src_value.g_type), g_type_name (value.g_type)); - + goto done; } @@ -239,7 +239,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding, g_object_set_property (binding->object, binding->prop->name, &src_value); } - + done: g_value_unset (&src_value); g_value_unset (&value); @@ -397,7 +397,7 @@ prop_binding_pref_changed (GConfClient *client, prop_binding_sync_pref_to_prop (binding, gconf_value); } -/* Performs a scheduled prop-to-pref sync for a prop binding in +/* Performs a scheduled prop-to-pref sync for a prop binding in * delay mode */ static gboolean prop_binding_perform_scheduled_sync (PropBinding *binding) @@ -407,7 +407,7 @@ prop_binding_perform_scheduled_sync (PropBinding *binding) binding->sync_timeout_id = 0; g_object_unref (binding->object); - + return FALSE; } @@ -451,7 +451,7 @@ prop_binding_object_destroyed (gpointer user_data, binding = (PropBinding *) user_data; binding->object = NULL; /* Don't do anything with the object at unbind() */ - + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding->id)); } @@ -516,7 +516,7 @@ gconf_bridge_bind_property_full (GConfBridge *bridge, binding->object = object; binding->prop = pspec; binding->sync_timeout_id = 0; - + /* Watch GConf key */ binding->val_notify_id = gconf_client_notify_add (bridge->client, key, @@ -557,7 +557,7 @@ prop_binding_unbind (PropBinding *binding) if (binding->delayed_mode && binding->sync_timeout_id > 0) { /* Perform any scheduled syncs */ g_source_remove (binding->sync_timeout_id); - + /* The object will still be around as we have * a reference */ prop_binding_perform_scheduled_sync (binding); @@ -696,7 +696,7 @@ window_binding_window_destroyed (gpointer user_data, binding = (WindowBinding *) user_data; binding->window = NULL; /* Don't do anything with the window at unbind() */ - + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding->id)); } @@ -708,7 +708,7 @@ window_binding_window_destroyed (gpointer user_data, * @window: A #GtkWindow * @bind_size: TRUE to bind the size of @window * @bind_pos: TRUE to bind the position of @window - * + * * On calling this function @window will be resized to the values * specified by "@key_prefix_width" and "@key_prefix_height" * and maximixed if "@key_prefix_maximized is TRUE if @@ -784,7 +784,7 @@ gconf_bridge_bind_window (GConfBridge *bridge, if (bind_pos) { char *key; GConfValue *x_val, *y_val; - + key = g_strconcat (key_prefix, "_x", NULL); x_val = gconf_client_get (bridge->client, key, NULL); g_free (key); @@ -879,7 +879,7 @@ list_store_binding_sync_pref_to_store (ListStoreBinding *binding, binding->row_inserted_id); g_signal_handler_block (binding->list_store, binding->row_deleted_id); - + gtk_list_store_clear (binding->list_store); list = gconf_value_get_list (value); @@ -996,7 +996,7 @@ list_store_binding_store_destroyed (gpointer user_data, binding = (ListStoreBinding *) user_data; binding->list_store = NULL; /* Don't do anything with the store at unbind() */ - + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding->id)); } @@ -1019,7 +1019,7 @@ list_store_binding_store_changed_cb (ListStoreBinding *binding) * @bridge: A #GConfBridge * @key: A GConf key to be bound * @list_store: A #GtkListStore - * + * * On calling this function single string column #GtkListStore @list_store * will be kept synchronized with the GConf string list value pointed to by * @key. On calling this function @list_store will be populated with the @@ -1192,7 +1192,7 @@ gconf_bridge_unbind (GConfBridge *bridge, /* This will trigger the hash tables value destruction * function, which will take care of further cleanup */ - g_hash_table_remove (bridge->bindings, + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding_id)); } diff --git a/e-util/gconf-bridge.h b/e-util/gconf-bridge.h index ba67f4f8e6..7edd2476dd 100644 --- a/e-util/gconf-bridge.h +++ b/e-util/gconf-bridge.h @@ -1,4 +1,4 @@ -/* +/* * (C) 2005 OpenedHand Ltd. * * Author: Jorn Baayen @@ -81,7 +81,7 @@ guint gconf_bridge_bind_window (GConfBridge *bridge, * @bridge: A #GConfBridge * @key_prefix: The prefix of the GConf keys * @window: A #GtkWindow - * + * * On calling this function @window will be resized to the values specified by * "@key_prefix_width" and "@key_prefix_height". The respective * GConf values will be updated when the window is resized. See @@ -95,7 +95,7 @@ guint gconf_bridge_bind_window (GConfBridge *bridge, * @bridge: A #GConfBridge * @key_prefix: The prefix of the GConf keys * @window: A #GtkWindow - * + * * On calling this function @window will be moved to the values specified by * "@key_prefix_x" and "@key_prefix_y". The respective GConf * values will be updated when the window is moved. See diff --git a/filter/filter-code.c b/filter/filter-code.c index 1de9c3aba6..fb0880b260 100644 --- a/filter/filter-code.c +++ b/filter/filter-code.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-code.h b/filter/filter-code.h index 7199bcef68..38336fc450 100644 --- a/filter/filter-code.h +++ b/filter/filter-code.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-colour.c b/filter/filter-colour.c index 0d0388de94..a5cc3534ad 100644 --- a/filter/filter-colour.c +++ b/filter/filter-colour.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-colour.h b/filter/filter-colour.h index 1de46ab70b..ff19d66686 100644 --- a/filter/filter-colour.h +++ b/filter/filter-colour.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c index cf92b804f5..d0a7b591a5 100644 --- a/filter/filter-datespec.c +++ b/filter/filter-datespec.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-datespec.h b/filter/filter-datespec.h index cbb79a46c5..c8eee1bae7 100644 --- a/filter/filter-datespec.h +++ b/filter/filter-datespec.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-element.c b/filter/filter-element.c index c14365cc8a..1fa0a14ee8 100644 --- a/filter/filter-element.c +++ b/filter/filter-element.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-element.h b/filter/filter-element.h index 6124b364a2..76894542a2 100644 --- a/filter/filter-element.h +++ b/filter/filter-element.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-file.c b/filter/filter-file.c index e43a02b2ef..2c0ac87c7f 100644 --- a/filter/filter-file.c +++ b/filter/filter-file.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-file.h b/filter/filter-file.h index 81e6b8c1cd..02dabdb2e8 100644 --- a/filter/filter-file.h +++ b/filter/filter-file.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-input.c b/filter/filter-input.c index 693fea0bab..30d6ed9c45 100644 --- a/filter/filter-input.c +++ b/filter/filter-input.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-input.h b/filter/filter-input.h index b6c6019052..ac71847a76 100644 --- a/filter/filter-input.h +++ b/filter/filter-input.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-int.c b/filter/filter-int.c index 969a477331..170657e2dd 100644 --- a/filter/filter-int.c +++ b/filter/filter-int.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-int.h b/filter/filter-int.h index 06add3fd05..60e1b2bf85 100644 --- a/filter/filter-int.h +++ b/filter/filter-int.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-option.c b/filter/filter-option.c index 7c5bbe901c..f4b208c59d 100644 --- a/filter/filter-option.c +++ b/filter/filter-option.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-option.h b/filter/filter-option.h index 6cf56645b8..8a4931a009 100644 --- a/filter/filter-option.h +++ b/filter/filter-option.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-part.c b/filter/filter-part.c index 08434eadac..799e7fcb36 100644 --- a/filter/filter-part.c +++ b/filter/filter-part.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-part.h b/filter/filter-part.h index 6c83b1d734..1827433b1c 100644 --- a/filter/filter-part.h +++ b/filter/filter-part.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-rule.c b/filter/filter-rule.c index 7972de13d0..cdc9f374f1 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -635,7 +635,7 @@ part_combobox_changed (GtkComboBox *combobox, struct _part_data *data) g_return_if_fail (part != NULL); g_return_if_fail (i == index); - + /* dont update if we haven't changed */ if (!strcmp (part->title, data->part->title)) return; @@ -809,7 +809,7 @@ more_parts (GtkWidget *button, struct _rule_data *data) adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w)); if (adjustment) gtk_adjustment_set_value (adjustment, adjustment->upper); - + } } } diff --git a/filter/filter-rule.h b/filter/filter-rule.h index b1683e1c8b..24419fec09 100644 --- a/filter/filter-rule.h +++ b/filter/filter-rule.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/rule-context.c b/filter/rule-context.c index 0a7438b12c..4bd364f0b8 100644 --- a/filter/rule-context.c +++ b/filter/rule-context.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/rule-context.h b/filter/rule-context.h index ba7e47c381..539c5b3b56 100644 --- a/filter/rule-context.h +++ b/filter/rule-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/rule-editor.c b/filter/rule-editor.c index 066689a598..07ea3fd1e4 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/rule-editor.h b/filter/rule-editor.h index 555b5e8263..40cc90ef90 100644 --- a/filter/rule-editor.h +++ b/filter/rule-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/iconv-detect.c b/iconv-detect.c index cbc1a1e5ea..4eb6597225 100644 --- a/iconv-detect.c +++ b/iconv-detect.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/e-attachment-handler-mail.c b/mail/e-attachment-handler-mail.c index 790c7b9c7a..c17c97d8ca 100644 --- a/mail/e-attachment-handler-mail.c +++ b/mail/e-attachment-handler-mail.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-attachment-handler-mail.h b/mail/e-attachment-handler-mail.h index da4ff23d89..c62ea99cab 100644 --- a/mail/e-attachment-handler-mail.h +++ b/mail/e-attachment-handler-mail.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 92fc8272f7..e3656e1223 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-attachment-bar.h b/mail/e-mail-attachment-bar.h index e32f6e2ede..38a4a86fae 100644 --- a/mail/e-mail-attachment-bar.h +++ b/mail/e-mail-attachment-bar.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-search-bar.c b/mail/e-mail-search-bar.c index 4d555857ca..6dcddaf83b 100644 --- a/mail/e-mail-search-bar.c +++ b/mail/e-mail-search-bar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-search-bar.h b/mail/e-mail-search-bar.h index 7f19e176b7..f4748c77ad 100644 --- a/mail/e-mail-search-bar.h +++ b/mail/e-mail-search-bar.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index e0edb9d389..724cc3b74a 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/e-searching-tokenizer.h b/mail/e-searching-tokenizer.h index 37a0048c0c..f96c37ed49 100644 --- a/mail/e-searching-tokenizer.h +++ b/mail/e-searching-tokenizer.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index fc61cdc84b..2b13e7e015 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1422,7 +1422,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) } else { current = g_strdup("imap"); } - + store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); i = 0; @@ -1448,7 +1448,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, 0, provider->name, 1, provider, -1); - + /* find the displayed and set default */ if (i == 0 || (current && strcmp(provider->protocol, current) == 0)) { service->provider = provider; @@ -1480,10 +1480,10 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) if (!uri || (url = camel_url_new(uri, NULL)) == NULL) { return; } - + tmp = camel_url_get_param(url, "use_ssl"); if (tmp == NULL) - tmp = "never"; + tmp = "never"; for (i=0;iuse_ssl, i); @@ -2370,7 +2370,7 @@ emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct gtk_box_pack_start((GtkBox*)((GnomeDruidPageStandard *)page)->vbox, w, TRUE, TRUE, 0); w = page; g_object_unref(druidxml); - gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page); + gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page); } else { gtk_notebook_append_page((GtkNotebook *)parent, w, gtk_label_new(_("Sending Email"))); } @@ -2687,7 +2687,7 @@ emae_service_complete(EMAccountEditor *emae, EMAccountEditorService *service) if (CAMEL_PROVIDER_NEEDS(service->provider, CAMEL_URL_PART_HOST)) { if (url->host == NULL || url->host[0] == 0) ok = FALSE; - else + else gtk_entry_set_text(service->hostname, url->host); } /* We only need the user if the service needs auth as well, i think */ @@ -2802,14 +2802,14 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) } else { g_warning("buz1\n"); } - + } } else if (!strcmp(pageid, "30.send")) { CamelURL *url; char *at, *user; int index; char *uri = (char *)e_account_get_string(emae->account, E_ACCOUNT_TRANSPORT_URL); - + tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS); at = strchr(tmp, '@'); user = g_alloca(at-tmp+1); @@ -2831,8 +2831,8 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) } else { g_warning("buz2\n"); } - - + + } else if (!strcmp(pageid, "20.receive_options")) { if (emae->priv->source.provider && emae->priv->extra_provider != emae->priv->source.provider) { @@ -3095,5 +3095,5 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account g_signal_connect(emae->editor, "destroy", G_CALLBACK(emae_editor_destroyed), emae); } else { e_config_create_widget((EConfig *)ec); - } + } } diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index fdd25b8f78..e17236e865 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c index 56bb4ce1df..d2303aa73b 100644 --- a/mail/em-account-prefs.c +++ b/mail/em-account-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h index c63b9f562e..0dabc8a11a 100644 --- a/mail/em-account-prefs.h +++ b/mail/em-account-prefs.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index c369bdc1e9..8c704a2827 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -956,7 +956,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) spell_setup (prefs); /* Forwards and Replies */ - prefs->forward_style = GTK_COMBO_BOX (glade_xml_get_widget (gui, "comboboxForwardStyle")); + prefs->forward_style = GTK_COMBO_BOX (glade_xml_get_widget (gui, "comboboxForwardStyle")); style = gconf_client_get_int (client, "/apps/evolution/mail/format/forward_style", NULL); gtk_combo_box_set_active (prefs->forward_style, style); g_signal_connect (prefs->forward_style, "changed", G_CALLBACK (style_changed), (gpointer) "/apps/evolution/mail/format/forward_style"); diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h index 82c6ece51e..2e12c7ffb2 100644 --- a/mail/em-composer-prefs.h +++ b/mail/em-composer-prefs.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 9b3dbe6cf9..4ed3e70b8f 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -469,7 +469,7 @@ static void composer_set_no_change (EMsgComposer *composer, gboolean drop_undo, gboolean editor_changed) { GtkhtmlEditor *editor; - + g_return_if_fail (composer != NULL); editor = GTKHTML_EDITOR (composer); @@ -662,7 +662,7 @@ create_new_composer (const char *subject, const char *fromuri, gboolean use_defa if (lite) composer = e_msg_composer_lite_new (); else - composer = e_msg_composer_new (); + composer = e_msg_composer_new (); table = e_msg_composer_get_header_table (composer); if (fromuri != NULL) { @@ -773,7 +773,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) CamelMimePart *mime_part = CAMEL_MIME_PART (message); CamelDataWrapper *mail_text; CamelMultipart *body = camel_multipart_new (); - CamelStream *stream; + CamelStream *stream; CamelMimePart *part; int count1 = 0, string_changed = 0; const char *cur; @@ -863,8 +863,8 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) } g_strfreev(temp_str); - } - else + } + else cur++; } @@ -879,7 +879,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) mail_text = camel_data_wrapper_new (); camel_data_wrapper_set_mime_type_field (mail_text, type); - + camel_stream_printf (stream, "%s", g_strdup(str)); camel_data_wrapper_construct_from_stream (mail_text, stream); @@ -896,10 +896,10 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) camel_object_unref (body); } } - + composer = e_msg_composer_new_with_message (message); - - if (em_utils_folder_is_templates(drafts, NULL) == TRUE) + + if (em_utils_folder_is_templates(drafts, NULL) == TRUE) em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, NULL, NULL); else em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, drafts, uid); @@ -925,7 +925,7 @@ em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder) if (folder) edit_message (message, folder, NULL); else - edit_message (message, NULL, NULL); + edit_message (message, NULL, NULL); } static void @@ -1047,7 +1047,7 @@ forward_attached_cb (CamelFolder *folder, GPtrArray *messages, CamelMimePart *pa if (part) forward_attached (folder, fad->uids, messages, part, subject, fad->fromuri); - + g_free (fad->fromuri); g_free (fad); } @@ -2261,7 +2261,7 @@ em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source) char *text, *credits; ssize_t len = 0; gboolean start_bottom = 0; - + credits = attribution_format (ATTRIBUTION, message); text = em_utils_message_to_html (message, credits, EM_FORMAT_QUOTE_CITE, &len, source, start_bottom ? "
" : NULL); diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index bbdb73d9c1..60944cb840 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -50,7 +50,7 @@ void em_utils_composer_send_cb(struct _EMsgComposer *composer, gpointer user_dat void em_utils_composer_save_draft_cb(struct _EMsgComposer *composer, gpointer user_data); void em_utils_compose_new_message (const char *fromuri); -struct _EMsgComposer * em_utils_compose_lite_new_message (const char *fromuri); +struct _EMsgComposer * em_utils_compose_lite_new_message (const char *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ void em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri); diff --git a/mail/em-config.c b/mail/em-config.c index 94df437519..160cec851e 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-config.h b/mail/em-config.h index ba19bb1c37..5f895305b0 100644 --- a/mail/em-config.h +++ b/mail/em-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-event.c b/mail/em-event.c index 8a027cce98..b415d5f8a0 100644 --- a/mail/em-event.c +++ b/mail/em-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-event.h b/mail/em-event.h index 21df1df42d..7c2c4c639d 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c index b0f82a7dad..a2a699a36f 100644 --- a/mail/em-filter-context.c +++ b/mail/em-filter-context.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h index 6b2e4f18fd..56f11a3d81 100644 --- a/mail/em-filter-context.h +++ b/mail/em-filter-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c index 4a92a65c58..4f68cf47df 100644 --- a/mail/em-filter-editor.c +++ b/mail/em-filter-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -141,7 +141,7 @@ select_source (GtkComboBox *combobox, EMFilterEditor *fe) idx = gtk_combo_box_get_active (combobox); sources = g_object_get_data (G_OBJECT (combobox), "sources"); - + g_return_if_fail (idx >= 0 && idx < g_slist_length (sources)); source = (char *)g_slist_nth (sources, idx); diff --git a/mail/em-filter-editor.h b/mail/em-filter-editor.h index f37536d1ee..8d9926b873 100644 --- a/mail/em-filter-editor.h +++ b/mail/em-filter-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c index a95a4dd88d..b975b81089 100644 --- a/mail/em-filter-folder-element.c +++ b/mail/em-filter-folder-element.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-folder-element.h b/mail/em-filter-folder-element.h index 8f9a2d8b4e..0d7d3b50b2 100644 --- a/mail/em-filter-folder-element.h +++ b/mail/em-filter-folder-element.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index 45dd78c708..583f82977c 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -496,7 +496,7 @@ more_parts(GtkWidget *button, struct _rule_data *data) adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w)); if (adjustment) gtk_adjustment_set_value (adjustment, adjustment->upper); - + } } } diff --git a/mail/em-filter-rule.h b/mail/em-filter-rule.h index 49e71850d6..6ddaddc8d2 100644 --- a/mail/em-filter-rule.h +++ b/mail/em-filter-rule.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index e35871638f..23a1b762cd 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-source-element.h b/mail/em-filter-source-element.h index 3204b636a0..ac9a1ff911 100644 --- a/mail/em-filter-source-element.h +++ b/mail/em-filter-source-element.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 201db814ec..c835a1b593 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1476,8 +1476,8 @@ emfb_edit_select_all(BonoboUIComponent *uid, void *data, const char *path) emfb_expand_all_threads (uid, data, path); - /* The time out below is added so that the execution thread to - expand all conversations threads would've completed. + /* The time out below is added so that the execution thread to + expand all conversations threads would've completed. The timeout 505 is just to ensure that the value is a small delta more than the timeout value in expand_all_threads thread. */ diff --git a/mail/em-folder-browser.h b/mail/em-folder-browser.h index 75dbe975b5..e2c74ecf17 100644 --- a/mail/em-folder-browser.h +++ b/mail/em-folder-browser.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 56194b6af9..b0fbfc65d2 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -240,7 +240,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); gtk_widget_show (label); gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - + w = gtk_spin_button_new_with_range (G_MININT, G_MAXINT, 1.0); gtk_spin_button_set_value ((GtkSpinButton *) w, (double) prop_data->argv->argv[i].ca_int); gtk_spin_button_set_numeric ((GtkSpinButton *) w, TRUE); @@ -254,7 +254,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); gtk_widget_show (label); gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - + w = gtk_spin_button_new_with_range (G_MININT, G_MAXINT, 1.0); gtk_spin_button_set_value ((GtkSpinButton *) w, prop_data->argv->argv[i].ca_double); gtk_spin_button_set_numeric ((GtkSpinButton *) w, TRUE); diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h index 8bae3848e7..cd58a9eeb4 100644 --- a/mail/em-folder-properties.h +++ b/mail/em-folder-properties.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c index 9257c57b5d..ce97dcb85d 100644 --- a/mail/em-folder-selection-button.c +++ b/mail/em-folder-selection-button.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h index e9cd1c2a0e..c0ab32f88e 100644 --- a/mail/em-folder-selection-button.h +++ b/mail/em-folder-selection-button.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-selection.c b/mail/em-folder-selection.c index d56a470153..cfb244c2eb 100644 --- a/mail/em-folder-selection.c +++ b/mail/em-folder-selection.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-selection.h b/mail/em-folder-selection.h index 78cd300410..25c35d254b 100644 --- a/mail/em-folder-selection.h +++ b/mail/em-folder-selection.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 3762e05bf2..ae6a8965a4 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index 7b011f588c..12662ae5f7 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index e3a2eda2bc..d90bcbbacb 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h index 13114c8539..706e3895b3 100644 --- a/mail/em-folder-tree-model.h +++ b/mail/em-folder-tree-model.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index f773068613..77e62dfbcf 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1700,7 +1700,7 @@ emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) /* Traverse to the last valid iter */ titer = iter; - while (gtk_tree_model_iter_next((GtkTreeModel *) model, &iter)) + while (gtk_tree_model_iter_next((GtkTreeModel *) model, &iter)) titer = iter; /* Preserve the last valid iter */ iter = titer; diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h index b02a4d88cd..e76acf4df1 100644 --- a/mail/em-folder-tree.h +++ b/mail/em-folder-tree.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 0555fb76cc..ad60516bb1 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -408,8 +408,8 @@ em_folder_utils_delete_folder (CamelFolder *folder) em_utils_show_error_silent (dialog); return; } - - if (mail_folder_cache_get_folder_info_flags (folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM)) + + if (mail_folder_cache_get_folder_info_flags (folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM)) { e_error_run(NULL,"mail:no-delete-special-folder", folder->name, NULL); return; diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h index 4d03ce5762..c139a9e74c 100644 --- a/mail/em-folder-utils.h +++ b/mail/em-folder-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index b19057a720..d0f8289a15 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -168,7 +168,7 @@ static const EMFolderViewEnable emfv_enable_map[] = { { "MessageFilterJunk", EM_POPUP_SELECT_MANY }, { "MessageCopy", EM_POPUP_SELECT_MANY }, { "MessageDelete", EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_DELETE }, - { "MessageDeleteKey", EM_POPUP_SELECT_MANY}, + { "MessageDeleteKey", EM_POPUP_SELECT_MANY}, { "MessageForward", EM_POPUP_SELECT_MANY }, { "MessageForwardAttached", EM_POPUP_SELECT_MANY }, { "MessageForwardInline", EM_POPUP_SELECT_ONE }, @@ -511,7 +511,7 @@ em_folder_view_open_selected(EMFolderView *emfv) } if (em_utils_folder_is_drafts(emfv->folder, emfv->folder_uri) - || em_utils_folder_is_templates(emfv->folder, emfv->folder_uri) + || em_utils_folder_is_templates(emfv->folder, emfv->folder_uri) || em_utils_folder_is_outbox(emfv->folder, emfv->folder_uri)) { em_utils_edit_messages(emfv->folder, uids, TRUE); return uids->len; @@ -884,7 +884,7 @@ emfv_popup_source(EPopup *ep, EPopupItem *pitem, void *data) emmb = (EMMessageBrowser *)em_message_browser_window_new(); em_format_set_session((EMFormat *)((EMFolderView *)emmb)->preview, ((EMFormat *)emfv->preview)->session); - message_list_ensure_message (((EMFolderView *)emmb)->list, uids->pdata[0]); + message_list_ensure_message (((EMFolderView *)emmb)->list, uids->pdata[0]); em_folder_view_set_folder((EMFolderView *)emmb, emfv->folder, emfv->folder_uri); em_format_set_mode((EMFormat *)((EMFolderView *)emmb)->preview, EM_FORMAT_SOURCE); em_folder_view_set_message((EMFolderView *)emmb, uids->pdata[0], FALSE); @@ -1233,7 +1233,7 @@ emfv_popup_label_clear(EPopup *ep, EPopupItem *pitem, void *data) { EMFolderView *emfv = data; GSList *l; - EUtilLabel *label; + EUtilLabel *label; for (l = mail_config_get_labels (); l; l = l->next) { label = l->data; @@ -1365,7 +1365,7 @@ static EPopupItem emfv_popup_items[] = { { E_POPUP_BAR, (gchar *) "90.filter", NULL, NULL, NULL, NULL }, { E_POPUP_SUBMENU, (gchar *) "90.filter.00", (gchar *) N_("Crea_te Rule From Message"), NULL, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - /* Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on. */ + /* Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on. */ { E_POPUP_ITEM, (gchar *) "90.filter.00/00.00", (gchar *) N_("Search Folder based on _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, (gchar *) "90.filter.00/00.01", (gchar *) N_("Search Folder based on Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, (gchar *) "90.filter.00/00.02", (gchar *) N_("Search Folder based on _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, @@ -1373,7 +1373,7 @@ static EPopupItem emfv_popup_items[] = { emfv_popup_vfolder_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_BAR, (gchar *) "90.filter.00/10", NULL, NULL, NULL, NULL }, - /* Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on. */ + /* Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on. */ { E_POPUP_ITEM, (gchar *) "90.filter.00/10.00", (gchar *) N_("Filter based on Sub_ject"), emfv_popup_filter_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, (gchar *) "90.filter.00/10.01", (gchar *) N_("Filter based on Sen_der"), emfv_popup_filter_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, (gchar *) "90.filter.00/10.02", (gchar *) N_("Filter based on Re_cipients"), emfv_popup_filter_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, @@ -2610,7 +2610,7 @@ emfv_list_double_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent /* Ignore double-clicks on columns that handle thier own state */ if (MESSAGE_LIST_COLUMN_IS_ACTIVE (col)) return; - + em_folder_view_open_selected(emfv); } @@ -2931,7 +2931,7 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const if (!main_emp) main_emp = emp; } - + if (event == NULL) gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time()); else diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h index b69a4a1a05..3a7a153131 100644 --- a/mail/em-folder-view.h +++ b/mail/em-folder-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c index 60881396c2..9fec654ae5 100644 --- a/mail/em-format-hook.c +++ b/mail/em-format-hook.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h index 3665bbf0db..08d99dd63c 100644 --- a/mail/em-format-hook.h +++ b/mail/em-format-hook.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 8863bf7f08..8d25923658 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -186,13 +186,13 @@ efhd_gtkhtml_realise(GtkHTML *html, EMFormatHTMLDisplay *efhd) r = style->fg[state].red >> 8; g = style->fg[state].green >> 8; - b = style->fg[state].blue >> 8; + b = style->fg[state].blue >> 8; efhd->formathtml.header_colour = ((r<<16) | (g<< 8) | b) & 0xffffff; r = style->bg[state].red >> 8; g = style->bg[state].green >> 8; - b = style->bg[state].blue >> 8; + b = style->bg[state].blue >> 8; efhd->formathtml.body_colour = ((r<<16) | (g<< 8) | b) & 0xffffff; diff --git a/mail/em-format-html-display.h b/mail/em-format-html-display.h index 99234e9c1e..bd0ea0edd3 100644 --- a/mail/em-format-html-display.h +++ b/mail/em-format-html-display.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index 985828d2af..ef1bbb13c4 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format-html-print.h b/mail/em-format-html-print.h index ef25b63033..2abdc82178 100644 --- a/mail/em-format-html-print.h +++ b/mail/em-format-html-print.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/mail/em-format-html.c b/mail/em-format-html.c index d0172ea8ef..aa82851bc9 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1500,18 +1500,18 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab const char *fmt, *html; char *mhtml = NULL; gboolean is_rtl; - + if (value == NULL) return; while (*value == ' ') value++; - + if (!(flags & EM_FORMAT_HTML_HEADER_HTML)) html = mhtml = camel_text_to_html (value, emfh->text_html_flags, 0); - else + else html = value; - + is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; if (emfh->simple_headers) { fmt = "%s: %s
"; @@ -1528,7 +1528,7 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab else fmt = "%s %s"; } else { - + if (flags & EM_FORMAT_HEADER_BOLD) { if (is_rtl) fmt = "%2$s%1$s: "; @@ -1667,22 +1667,22 @@ static void canon_header_name (char *name) { char *inptr = name; - + /* canonicalise the header name... first letter is * capitalised and any letter following a '-' also gets * capitalised */ - + if (*inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; - + inptr++; - + while (*inptr) { if (inptr[-1] == '-' && *inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; else if (*inptr >= 'A' && *inptr <= 'Z') *inptr += 0x20; - + inptr++; } } @@ -1707,22 +1707,22 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct break; } } - + label = _(name); - + if (addrspec) { struct _camel_header_address *addrs; GString *html; char *img; - + buf = camel_header_unfold (header->value); if (!(addrs = camel_header_address_decode (buf, emf->charset ? emf->charset : emf->default_charset))) { g_free (buf); return; } - + g_free (buf); - + html = g_string_new(""); img = efh_format_address(efh, html, addrs, (char *)label); @@ -1732,7 +1732,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct flags |= EM_FORMAT_HTML_HEADER_NODEC; g_free (img); } - + camel_header_address_unref(addrs); txt = value = html->str; g_string_free(html, FALSE); @@ -1742,7 +1742,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct buf = camel_header_unfold (header->value); txt = value = camel_header_decode_string (buf, charset); g_free (buf); - + flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp(name, "X-evolution-mailer")) { /* pseudo-header */ @@ -1769,7 +1769,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct if (msg_offset) { char buf[256], *html; - + msg_offset += (local.tm_hour * 60) + local.tm_min; if (msg_offset >= (24 * 60) || msg_offset < 0) { /* translators: strftime format for local time equivalent in Date header display, with day */ @@ -1782,27 +1782,27 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct e_utf8_strftime(buf, sizeof(buf), msg, &local); g_free(msg); } - + html = camel_text_to_html(txt, efh->text_html_flags, 0); txt = value = g_strdup_printf("%s %s", html, buf); g_free(html); flags |= EM_FORMAT_HTML_HEADER_HTML; } - + flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp(name, "Newsgroups")) { struct _camel_header_newsgroup *ng, *scan; GString *html; - + buf = camel_header_unfold (header->value); - + if (!(ng = camel_header_newsgroups_decode (buf))) { g_free (buf); return; } - + g_free (buf); - + html = g_string_new(""); scan = ng; while (scan) { @@ -1811,9 +1811,9 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct if (scan) g_string_append_printf(html, ", "); } - + camel_header_newsgroups_free(ng); - + txt = html->str; g_string_free(html, FALSE); flags |= EM_FORMAT_HEADER_BOLD|EM_FORMAT_HTML_HEADER_HTML; @@ -1826,9 +1826,9 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct txt = value = camel_header_decode_string (buf, charset); g_free (buf); } - + efh_format_text_header(efh, stream, label, txt, flags); - + g_free (value); g_free (str_field); } @@ -1850,7 +1850,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) char *header_sender = NULL, *header_from = NULL, *name; gboolean mail_from_delegate = FALSE; const char *hdr_charset; - + if (!part) return; @@ -1863,9 +1863,9 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) "\n" "", efh->header_colour & 0xffffff); - + hdr_charset = emf->charset ? emf->charset : emf->default_charset; - + header = ((CamelMimePart *)part)->headers; while (header) { if (!g_ascii_strcasecmp (header->name, "Sender")) { @@ -1904,7 +1904,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) header = header->next; } - + if (header_sender && header_from && mail_from_delegate) { camel_stream_printf(stream, "
"); if(gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) @@ -1976,11 +1976,11 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) have_icon = TRUE; } else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) { char *cp = header->value; - + /* Skip over spaces */ while (*cp == ' ') cp++; - + face_header_value = g_base64_decode (cp, &face_header_len); face_header_value = g_realloc (face_header_value, face_header_len + 1); face_header_value[face_header_len] = 0; diff --git a/mail/em-format-html.h b/mail/em-format-html.h index 7cadd5e282..eb8aec96e9 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index 40e69022d1..85249a293c 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -271,22 +271,22 @@ static void canon_header_name (char *name) { char *inptr = name; - + /* canonicalise the header name... first letter is * capitalised and any letter following a '-' also gets * capitalised */ - + if (*inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; - + inptr++; - + while (*inptr) { if (inptr[-1] == '-' && *inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; else if (*inptr >= 'A' && *inptr <= 'Z') *inptr += 0x20; - + inptr++; } } @@ -312,24 +312,24 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const break; } } - + label = _(name); - + if (addrspec) { struct _camel_header_address *addrs; GString *html; if (!(txt = camel_medium_get_header (part, name))) return; - + buf = camel_header_unfold (txt); if (!(addrs = camel_header_address_decode (txt, emf->charset ? emf->charset : emf->default_charset))) { g_free (buf); return; } - + g_free (buf); - + html = g_string_new (""); emfq_format_address (html, addrs); camel_header_address_unref (addrs); @@ -347,15 +347,15 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const if (!(txt = camel_medium_get_header (part, "x-newsreader"))) if (!(txt = camel_medium_get_header (part, "x-mimeole"))) return; - + txt = value = camel_header_format_ctext (txt, charset); - + label = _("Mailer"); flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp (name, "Date") || !strcmp (name, "Resent-Date")) { if (!(txt = camel_medium_get_header (part, name))) return; - + flags |= EM_FORMAT_HEADER_BOLD; } else { txt = camel_medium_get_header (part, name); diff --git a/mail/em-format-quote.h b/mail/em-format-quote.h index 87f0151a50..86d277b26e 100644 --- a/mail/em-format-quote.h +++ b/mail/em-format-quote.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format.c b/mail/em-format.c index b2360bb2fc..3aa20b2b3e 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format.h b/mail/em-format.h index ce3d522ab0..e2363c2b8e 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c index daa81d356d..a1615d2d6a 100644 --- a/mail/em-html-stream.c +++ b/mail/em-html-stream.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-html-stream.h b/mail/em-html-stream.h index a8eabdda55..86baa5cfa6 100644 --- a/mail/em-html-stream.h +++ b/mail/em-html-stream.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c index 2e1a7ae2f6..b06145acc0 100644 --- a/mail/em-icon-stream.c +++ b/mail/em-icon-stream.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-icon-stream.h b/mail/em-icon-stream.h index f92bfefb54..321e0cacae 100644 --- a/mail/em-icon-stream.h +++ b/mail/em-icon-stream.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index f671159369..ffe9f676b3 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h index 062a590445..b6bc38502f 100644 --- a/mail/em-inline-filter.h +++ b/mail/em-inline-filter.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c index c4ea8b16f3..f95685e351 100644 --- a/mail/em-junk-hook.c +++ b/mail/em-junk-hook.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-junk-hook.h b/mail/em-junk-hook.h index 70926b2f11..0e467a20bd 100644 --- a/mail/em-junk-hook.h +++ b/mail/em-junk-hook.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index bb786752e5..27f27ca721 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -346,7 +346,7 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) gtk_box_pack_start ((GtkBox *)hbox, l2, FALSE, FALSE, 6); gtk_box_pack_start ((GtkBox *)hbox, entry2, FALSE, FALSE, 6); gtk_box_pack_start ((GtkBox *)vbox, hbox, FALSE, FALSE, 6); - + gtk_widget_show_all (vbox); gtk_container_add ((GtkContainer *)((GtkDialog *)dialog)->vbox, vbox); response = gtk_dialog_run ((GtkDialog *)dialog); @@ -355,9 +355,9 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) const char *value = gtk_entry_get_text ((GtkEntry *)entry2); char *tok; GSList *list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); - + /* FIXME: Validate the values */ - + tok = g_strdup_printf ("%s=%s", name, value); list = g_slist_append (list, tok); gconf_client_set_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, list, NULL); @@ -395,7 +395,7 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data) if (strcmp (test, value) == 0) break; } - + prev = node; node = node->next; } diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h index 3b52d9f40a..10503a8461 100644 --- a/mail/em-mailer-prefs.h +++ b/mail/em-mailer-prefs.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -123,7 +123,7 @@ struct _EMMailerPrefs { struct _GtkToggleButton *check_incoming; struct _GtkToggleButton *empty_junk; struct _GtkComboBox *empty_junk_days; - + struct _GtkToggleButton *sa_local_tests_only; struct _GtkToggleButton *sa_use_daemon; struct _GtkComboBox *default_junk_plugin; diff --git a/mail/em-menu.c b/mail/em-menu.c index fc2e43d455..b504bd3304 100644 --- a/mail/em-menu.c +++ b/mail/em-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-menu.h b/mail/em-menu.h index 08467fefd8..cdcc12bcae 100644 --- a/mail/em-menu.h +++ b/mail/em-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c index 973708bc2b..9299f3754f 100644 --- a/mail/em-message-browser.c +++ b/mail/em-message-browser.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-message-browser.h b/mail/em-message-browser.h index cf00a74a75..d394adc9ba 100644 --- a/mail/em-message-browser.h +++ b/mail/em-message-browser.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 974c8b97a8..3f5beb3f84 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1130,7 +1130,7 @@ em_migrate_setup_progress_dialog (const char *title, const char *desc) gtk_label_set_markup (GTK_LABEL (w), markup); gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0); g_free (markup); - + w = gtk_label_new (desc); gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0); gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); @@ -1139,7 +1139,7 @@ em_migrate_setup_progress_dialog (const char *title, const char *desc) /* Progress bar */ w = gtk_vbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0); - + label = GTK_LABEL (gtk_label_new ("")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); gtk_label_set_line_wrap (label, TRUE); @@ -2785,7 +2785,7 @@ migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const tmp = g_strdup_printf ("%s/%s", acc, fi->full_name); em_migrate_set_folder_name (tmp); g_free (tmp); - + progress = (double) (*nth_folder) / total_folders; g_idle_add ((GSourceFunc) update_progress_in_main_thread, &progress); @@ -2823,7 +2823,7 @@ setup_local_store (MailComponent *mc) CamelURL *url; char *tmp; CamelStore *store; - + url = camel_url_new("mbox:", NULL); tmp = g_build_filename (mail_component_peek_base_directory(mc), "local", NULL); camel_url_set_path(url, tmp); @@ -2833,7 +2833,7 @@ setup_local_store (MailComponent *mc) g_free(tmp); return store; - + } struct migrate_folders_to_db_structure { @@ -2844,13 +2844,13 @@ struct migrate_folders_to_db_structure { gboolean done; gboolean is_local_store; }; - + static void migrate_folders_to_db_thread (struct migrate_folders_to_db_structure *migrate_dbs) { int num_of_folders = 0, nth_folder = 0; count_folders (migrate_dbs->info, &num_of_folders); - migrate_folders (migrate_dbs->store, migrate_dbs->is_local_store, migrate_dbs->info, - migrate_dbs->account_name, &(migrate_dbs->ex), &(migrate_dbs->done), + migrate_folders (migrate_dbs->store, migrate_dbs->is_local_store, migrate_dbs->info, + migrate_dbs->account_name, &(migrate_dbs->ex), &(migrate_dbs->done), &nth_folder, num_of_folders); } @@ -2877,7 +2877,7 @@ migrate_to_db() "patient while Evolution migrates your folders...")); store = setup_local_store (component); - info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL); + info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL); if (info) { GThread *thread; @@ -2885,7 +2885,7 @@ migrate_to_db() if (g_str_has_suffix (((CamelService *)store)->url->path, ".evolution/mail/local")) migrate_dbs.is_local_store = TRUE; - else + else migrate_dbs.is_local_store = FALSE; camel_exception_init (&migrate_dbs.ex); migrate_dbs.account_name = _("On This Computer"); @@ -2941,7 +2941,7 @@ migrate_to_db() g_object_unref (iter); em_migrate_close_progress_dialog (); } - + int em_migrate (const char *evolution_dir, int major, int minor, int revision, CamelException *ex) diff --git a/mail/em-migrate.h b/mail/em-migrate.h index c755ef9b39..238f4fda1c 100644 --- a/mail/em-migrate.h +++ b/mail/em-migrate.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c index 01fbd87547..b0c51ed863 100644 --- a/mail/em-network-prefs.c +++ b/mail/em-network-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -76,7 +76,7 @@ GType em_network_prefs_get_type (void) { static GType type = 0; - + if (!type) { static const GTypeInfo info = { sizeof (EMNetworkPrefsClass), @@ -87,10 +87,10 @@ em_network_prefs_get_type (void) 0, (GInstanceInitFunc) em_network_prefs_init, }; - + type = g_type_register_static (gtk_vbox_get_type (), "EMNetworkPrefs", &info, 0); } - + return type; } @@ -99,9 +99,9 @@ em_network_prefs_class_init (EMNetworkPrefsClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass); - + parent_class = g_type_class_ref (gtk_vbox_get_type ()); - + object_class->destroy = em_network_prefs_destroy; gobject_class->finalize = em_network_prefs_finalise; } @@ -116,7 +116,7 @@ static void em_network_prefs_finalise (GObject *obj) { d(g_print ("Network preferences finalize is called\n")); - + /* do something here */ G_OBJECT_CLASS (parent_class)->finalize (obj); } @@ -133,7 +133,7 @@ static void toggle_button_toggled (GtkToggleButton *toggle, EMNetworkPrefs *prefs) { const char *key; - + key = g_object_get_data ((GObject *) toggle, "key"); gconf_client_set_bool (prefs->gconf, key, gtk_toggle_button_get_active (toggle), NULL); if (toggle == prefs->use_auth) { @@ -149,13 +149,13 @@ static void toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const char *key) { gboolean bool; - + bool = gconf_client_get_bool (prefs->gconf, key, NULL); gtk_toggle_button_set_active (toggle, bool); - + g_object_set_data ((GObject *) toggle, "key", (void *) key); g_signal_connect (toggle, "toggled", G_CALLBACK (toggle_button_toggled), prefs); - + if (!gconf_client_key_is_writable (prefs->gconf, key, NULL)) gtk_widget_set_sensitive ((GtkWidget *) toggle, FALSE); } @@ -176,9 +176,9 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs, NetworkConfigProxyType type, gboo gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy_url, sensitivity); d(g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity)); } else -#endif +#endif if (type == NETWORK_PROXY_MANUAL) { - gboolean state; + gboolean state; gtk_widget_set_sensitive ((GtkWidget *) prefs->http_host, sensitivity); gtk_widget_set_sensitive ((GtkWidget *) prefs->https_host, sensitivity); @@ -239,11 +239,11 @@ notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs) emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, TRUE); } - if (type != NETWORK_PROXY_DIRECT_CONNECTION) + if (type != NETWORK_PROXY_DIRECT_CONNECTION) gconf_client_set_bool (prefs->gconf, GCONF_E_USE_PROXY_KEY, TRUE, NULL); else if (type != NETWORK_PROXY_SYS_SETTINGS) gconf_client_set_bool (prefs->gconf, GCONF_E_USE_PROXY_KEY, FALSE, NULL); - + } static void @@ -253,8 +253,8 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data) int port = -1; GConfClient *gconf = mail_config_get_gconf_client (); - /* - Do not change the order of comparison - + /* + Do not change the order of comparison - GtkSpinButton is an extended form of GtkEntry */ if (GTK_IS_SPIN_BUTTON (widget)) { @@ -307,9 +307,9 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) gboolean locked; int i, val, port; char *gladefile; - + prefs->gconf = mail_config_get_gconf_client (); - + gladefile = g_build_filename (EVOLUTION_GLADEDIR, "mail-config.glade", NULL); @@ -393,32 +393,32 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) prefs->socks_port = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spnSocksPort")); prefs->lbl_socks_host = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksHost")); prefs->lbl_socks_port = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksPort")); - g_signal_connect (prefs->socks_host, "changed", + g_signal_connect (prefs->socks_host, "changed", G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_HOST_KEY); - g_signal_connect (prefs->socks_port, "value_changed", + g_signal_connect (prefs->socks_port, "value_changed", G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_PORT_KEY); #endif - + /* Manual proxy options */ - g_signal_connect (prefs->http_host, "changed", + g_signal_connect (prefs->http_host, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_HTTP_HOST_KEY); - g_signal_connect (prefs->https_host, "changed", + g_signal_connect (prefs->https_host, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_HTTPS_HOST_KEY); - g_signal_connect (prefs->ignore_hosts, "changed", + g_signal_connect (prefs->ignore_hosts, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_IGNORE_HOSTS_KEY); - g_signal_connect (prefs->http_port, "value_changed", + g_signal_connect (prefs->http_port, "value_changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_HTTP_PORT_KEY); - g_signal_connect (prefs->https_port, "value_changed", + g_signal_connect (prefs->https_port, "value_changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_HTTPS_PORT_KEY); - g_signal_connect (prefs->auth_user, "changed", + g_signal_connect (prefs->auth_user, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_AUTH_USER_KEY); - g_signal_connect (prefs->auth_pwd, "changed", + g_signal_connect (prefs->auth_pwd, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_AUTH_PWD_KEY); @@ -493,9 +493,9 @@ GtkWidget * em_network_prefs_new (void) { EMNetworkPrefs *new; - + new = (EMNetworkPrefs *) g_object_new (em_network_prefs_get_type (), NULL); em_network_prefs_construct (new); - + return (GtkWidget *) new; } diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h index 27c4e77685..3d933a7acc 100644 --- a/mail/em-network-prefs.h +++ b/mail/em-network-prefs.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -54,11 +54,11 @@ typedef enum { struct _EMNetworkPrefs { GtkVBox parent_object; - + struct _GConfClient *gconf; - + struct _GladeXML *gui; - + /* Default Behavior */ struct _GtkToggleButton *sys_proxy; struct _GtkToggleButton *no_proxy; @@ -97,9 +97,9 @@ struct _EMNetworkPrefs { struct _EMNetworkPrefsClass { GtkVBoxClass parent_class; - + /* signals */ - + }; GType em_network_prefs_get_type (void); diff --git a/mail/em-popup.c b/mail/em-popup.c index 88aadf7ba7..ad738fca57 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -624,7 +624,7 @@ emp_add_vcard (EPopup *ep, EPopupItem *item, void *data) CamelMimePart *part; CamelDataWrapper *content; CamelStreamMem *mem; - + part = ((EMPopupTargetPart *) target)->part; diff --git a/mail/em-popup.h b/mail/em-popup.h index 870055140b..cde903a4ec 100644 --- a/mail/em-popup.h +++ b/mail/em-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-search-context.c b/mail/em-search-context.c index 5bf98614c6..ac03d40a80 100644 --- a/mail/em-search-context.c +++ b/mail/em-search-context.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-search-context.h b/mail/em-search-context.h index 3df5c1d577..47dc6ea86a 100644 --- a/mail/em-search-context.h +++ b/mail/em-search-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c index 7dd8a87416..1600eeaed0 100644 --- a/mail/em-stripsig-filter.c +++ b/mail/em-stripsig-filter.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-stripsig-filter.h b/mail/em-stripsig-filter.h index be72cef3df..761d46691f 100644 --- a/mail/em-stripsig-filter.h +++ b/mail/em-stripsig-filter.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index fa68af1776..25c447d62e 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -112,7 +112,7 @@ struct _EMSubscribeNode { typedef struct _MailMsgListNode MailMsgListNode; struct _MailMsgListNode { - EDListNode node; + EDListNode node; MailMsg *msg; }; @@ -265,7 +265,7 @@ sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, int state, const d(printf("running subscribe folder '%s'\n", spath)); mail_msg_unordered_push (m); } else { - msgListNode = g_malloc0(sizeof(MailMsgListNode)); + msgListNode = g_malloc0(sizeof(MailMsgListNode)); msgListNode->msg = (MailMsg *) m; d(printf("queueing subscribe folder '%s'\n", spath)); e_dlist_addtail(&sub->subscribe, (EDListNode *)msgListNode); @@ -357,7 +357,7 @@ sub_folderinfo_exec (struct _emse_folderinfo_msg *m) if (m->seq == m->sub->seq) { camel_operation_register(m->base.cancel); - m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, + m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL | CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST, &m->base.ex); camel_operation_unregister(m->base.cancel); } @@ -560,7 +560,7 @@ static void sub_destroy(GtkWidget *w, EMSubscribe *sub) { struct _zsubscribe_msg *m; - MailMsgListNode *msgListNode; + MailMsgListNode *msgListNode; d(printf("subscribe closed\n")); sub->cancel = TRUE; diff --git a/mail/em-subscribe-editor.h b/mail/em-subscribe-editor.h index aa9c9a2c2d..36710ec0c5 100644 --- a/mail/em-subscribe-editor.h +++ b/mail/em-subscribe-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c index 311c2e1b7a..138932cfc7 100644 --- a/mail/em-sync-stream.c +++ b/mail/em-sync-stream.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h index af513e9594..fc687fa462 100644 --- a/mail/em-sync-stream.h +++ b/mail/em-sync-stream.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-utils.c b/mail/em-utils.c index 958864647d..ba180e5011 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -648,12 +648,12 @@ em_utils_save_messages (GtkWidget *parent, CamelFolder *folder, GPtrArray *uids) info = camel_folder_get_message_info (folder, uids->pdata[0]); if (info) { filename = g_strdup (camel_message_info_subject (info)); - e_filename_make_safe (filename); + e_filename_make_safe (filename); camel_message_info_free (info); } filesel = e_file_get_save_filesel (parent, _("Save Message..."), filename, GTK_FILE_CHOOSER_ACTION_SAVE); - if (filename) + if (filename) g_free (filename); camel_object_ref(folder); @@ -1386,15 +1386,15 @@ em_utils_folder_is_templates (CamelFolder *folder, const char *uri) if (folder == mail_component_get_folder (NULL, MAIL_COMPONENT_FOLDER_TEMPLATES)) return TRUE; - + if (uri == NULL) return FALSE; - + accounts = mail_config_get_accounts(); iter = e_list_get_iterator ((EList *)accounts); while (e_iterator_is_valid (iter)) { account = (EAccount *)e_iterator_get (iter); - + if (account->templates_folder_uri) { templates_uri = em_uri_to_camel (account->templates_folder_uri); if (camel_store_folder_uri_equal (folder->parent_store, templates_uri, uri)) { @@ -1404,15 +1404,15 @@ em_utils_folder_is_templates (CamelFolder *folder, const char *uri) } g_free (templates_uri); } - + e_iterator_next (iter); } - + g_object_unref (iter); - + return is; } - + /** * em_utils_folder_is_drafts: * @folder: folder diff --git a/mail/em-utils.h b/mail/em-utils.h index d64c411a5f..1b60205168 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-vfolder-context.c b/mail/em-vfolder-context.c index 88c97b0a0f..e317b5cabf 100644 --- a/mail/em-vfolder-context.c +++ b/mail/em-vfolder-context.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-vfolder-context.h b/mail/em-vfolder-context.h index 50ce239fb6..7f17f4e2b4 100644 --- a/mail/em-vfolder-context.h +++ b/mail/em-vfolder-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c index b0614d937f..dcc6f03e75 100644 --- a/mail/em-vfolder-editor.c +++ b/mail/em-vfolder-editor.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-vfolder-editor.h b/mail/em-vfolder-editor.h index bbdb6ffce8..58bcd566a1 100644 --- a/mail/em-vfolder-editor.h +++ b/mail/em-vfolder-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index bddb08f75e..03f46afff8 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h index bc6a330c4b..9274c94b5c 100644 --- a/mail/em-vfolder-rule.h +++ b/mail/em-vfolder-rule.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 156c8d08cb..39bfd7bc3f 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index 2943772b68..f42afec151 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index 44db11fb56..29a2dddd97 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index c01c3ab51f..f108967ebc 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index e040a4060e..3a4e6d9cc1 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index eb8caa78d9..53a0411f08 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Michael Zucchi diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h index bae8bd8313..c12539a9d2 100644 --- a/mail/mail-autofilter.h +++ b/mail/mail-autofilter.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c index 04d44e9725..268f0b5e3c 100644 --- a/mail/mail-component-factory.c +++ b/mail/mail-component-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-component.c b/mail/mail-component.c index 2fd85ec5a5..698cc940f8 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1317,7 +1317,7 @@ mail_component_init (MailComponent *component) priv->mail_sync_in_progress = 0; if (g_getenv("CAMEL_FLUSH_CHANGES")) priv->mail_sync_id = g_timeout_add_seconds (mail_config_get_sync_timeout (), call_mail_sync, component); - else + else priv->mail_sync_id = 0; } diff --git a/mail/mail-component.h b/mail/mail-component.h index c1215c61c4..9af5caa40f 100644 --- a/mail/mail-component.h +++ b/mail/mail-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c index 74c05ec8fc..f89383580c 100644 --- a/mail/mail-config-factory.c +++ b/mail/mail-config-factory.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-config-factory.h b/mail/mail-config-factory.h index f3a4b5fd29..430058364e 100644 --- a/mail/mail-config-factory.h +++ b/mail/mail-config-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-config.c b/mail/mail-config.c index 62f6ba6eb3..bcf8dd7854 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -423,7 +423,7 @@ mail_config_init (void) config->gconf, key, func, &config->error_time, NULL, NULL); config->error_time = - gconf_client_get_int (config->gconf, key, NULL); + gconf_client_get_int (config->gconf, key, NULL); key = "/apps/evolution/mail/display/error_level"; func = (GConfClientNotifyFunc) gconf_int_value_changed; @@ -431,7 +431,7 @@ mail_config_init (void) config->gconf, key, func, &config->error_level, NULL, NULL); config->error_level = - gconf_client_get_int (config->gconf, key, NULL); + gconf_client_get_int (config->gconf, key, NULL); key = "/apps/evolution/mail/display/force_message_limit"; func = (GConfClientNotifyFunc) gconf_bool_value_changed; @@ -678,7 +678,7 @@ mail_config_get_address_count (void) guint mail_config_get_error_timeout (void) -{ +{ if (!config) mail_config_init (); @@ -687,7 +687,7 @@ mail_config_get_error_timeout (void) guint mail_config_get_error_level (void) -{ +{ if (!config) mail_config_init (); @@ -1206,7 +1206,7 @@ mail_config_reload_junk_headers (void) /* It automatically sets in the session */ if (config == NULL) mail_config_init (); - else + else gconf_jh_check_changed (config->gconf, 0, NULL, config); } diff --git a/mail/mail-config.h b/mail/mail-config.h index 81f245170e..aea5c5da94 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c index d7350eaa2a..f484e0a5d8 100644 --- a/mail/mail-crypto.c +++ b/mail/mail-crypto.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h index dbe1e6f86b..a6ba393bf7 100644 --- a/mail/mail-crypto.h +++ b/mail/mail-crypto.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index ed3d583927..a84dfcbf74 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1045,7 +1045,7 @@ int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp) return fi.fi != NULL; } -gboolean +gboolean mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags) { char *uri = mail_tools_folder_to_url (folder); @@ -1061,7 +1061,7 @@ mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags) if (flags) { if (fi.fi) { *flags = fi.fi->flags; - } + } } UNLOCK(info_lock); diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h index c0f7e866cf..932f5c3f78 100644 --- a/mail/mail-folder-cache.h +++ b/mail/mail-folder-cache.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 6388a56938..ed7e257fba 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/mail/mail-mt.h b/mail/mail-mt.h index b95620a000..ed23c3beeb 100644 --- a/mail/mail-mt.h +++ b/mail/mail-mt.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-ops.c b/mail/mail-ops.c index d2183dd7e3..4f310db812 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -1,5 +1,5 @@ /* - * mail-ops.c: callbacks for the mail toolbar/menus + * mail-ops.c: callbacks for the mail toolbar/menus * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -721,7 +721,7 @@ send_queue_exec (struct _send_queue_msg *m) camel_operation_register (m->cancel); else camel_operation_register (m->base.cancel); - + if (!m->cancel) camel_operation_start (NULL, _("Sending message")); @@ -783,7 +783,7 @@ send_queue_exec (struct _send_queue_msg *m) camel_folder_sync (sent_folder, FALSE, &ex); camel_exception_clear (&ex); } - + if (!m->cancel) camel_operation_end (NULL); @@ -791,7 +791,7 @@ send_queue_exec (struct _send_queue_msg *m) camel_operation_unregister (m->cancel); else camel_operation_unregister (m->base.cancel); - + } static void @@ -2463,7 +2463,7 @@ prepare_offline_exec (struct _set_offline_msg *m) } else if (CAMEL_IS_OFFLINE_STORE (m->store)) { camel_offline_store_prepare_for_offline (CAMEL_OFFLINE_STORE (m->store), &m->base.ex); - } + } } static void diff --git a/mail/mail-ops.h b/mail/mail-ops.h index df92df4e32..39905fb06c 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 655f1dbf72..be834bb0d3 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -416,7 +416,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati g_object_unref (iter); /* Check to see if we have to send any mails --- if we don't, don't display the SMTP row in the table */ - if (outbox && destination + if (outbox && destination && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) == 0) num_sources--; @@ -545,7 +545,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target); /* Skip displaying the SMTP row if we've got no outbox, destination or unsent mails */ - if (outbox && destination + if (outbox && destination && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) != 0) { info = g_hash_table_lookup (data->active, SEND_URI_KEY); if (info == NULL) { @@ -1196,7 +1196,7 @@ mail_send (void) info->status_label = NULL; info->uri = g_strdup (transport->url); info->keep_on_server = FALSE; - info->cancel = NULL; + info->cancel = NULL; info->cancel_button = NULL; info->data = data; info->state = SEND_ACTIVE; diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h index 4fc4e991ec..a31abe79ed 100644 --- a/mail/mail-send-recv.h +++ b/mail/mail-send-recv.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-session.c b/mail/mail-session.c index 03277b4b6f..d9e34ccff4 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-session.h b/mail/mail-session.h index a2a5e9706f..60d6b9ab2a 100644 --- a/mail/mail-session.h +++ b/mail/mail-session.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c index daee1db92c..401f26feed 100644 --- a/mail/mail-signature-editor.c +++ b/mail/mail-signature-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-signature-editor.h b/mail/mail-signature-editor.h index 649504be18..82c786c90e 100644 --- a/mail/mail-signature-editor.h +++ b/mail/mail-signature-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-tools.c b/mail/mail-tools.c index 7278829501..a256e7e107 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-tools.h b/mail/mail-tools.h index 794c1d4735..1590636e5c 100644 --- a/mail/mail-tools.h +++ b/mail/mail-tools.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-types.h b/mail/mail-types.h index 1873dc8d00..6acbeaf43a 100644 --- a/mail/mail-types.h +++ b/mail/mail-types.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index d6b20580b2..aab8625807 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h index b0f684e721..002541371f 100644 --- a/mail/mail-vfolder.h +++ b/mail/mail-vfolder.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/message-list.c b/mail/message-list.c index f9a0e9259b..09f080cae0 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -2609,7 +2609,7 @@ clear_tree (MessageList *ml, gboolean tfree) ml->tree_root = e_tree_memory_node_insert (E_TREE_MEMORY(etm), NULL, 0, NULL); if (tfree) - e_tree_model_rebuilt (E_TREE_MODEL(etm)); + e_tree_model_rebuilt (E_TREE_MODEL(etm)); #ifdef TIMEIT gettimeofday(&end, NULL); diff = end.tv_sec * 1000 + end.tv_usec/1000; @@ -3573,7 +3573,7 @@ message_list_get_uids(MessageList *ml) ml, g_ptr_array_new() }; - + e_tree_path_foreach(ml->tree, ml_getselected_cb, &data); if (ml->folder && data.uids->len) @@ -3589,11 +3589,11 @@ message_list_get_selected(MessageList *ml) ml, g_ptr_array_new() }; - + e_tree_selected_path_foreach(ml->tree, ml_getselected_cb, &data); if (ml->folder && data.uids->len) - camel_folder_sort_uids (ml->folder, data.uids); + camel_folder_sort_uids (ml->folder, data.uids); return data.uids; } @@ -4282,7 +4282,7 @@ regen_list_done (struct _regen_list_msg *m) if (m->last_row >= e_table_model_row_count (E_TABLE_MODEL (etta))) m->last_row = e_table_model_row_count (E_TABLE_MODEL (etta)) - 1; - + if (m->last_row >= 0) { ETreePath path; diff --git a/mail/message-list.h b/mail/message-list.h index 15dae0fcb7..4d0866fe20 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c index 71d2ae41c8..d3a1d15bfe 100644 --- a/mail/message-tag-editor.c +++ b/mail/message-tag-editor.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h index 019c7e2e63..30d3ec1e9b 100644 --- a/mail/message-tag-editor.h +++ b/mail/message-tag-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index 46b6268cc3..827fc6813a 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h index 4b18865d89..5c229fe36e 100644 --- a/mail/message-tag-followup.h +++ b/mail/message-tag-followup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c index 0a9ee8b79e..3bccf0a229 100644 --- a/plugins/addressbook-file/addressbook-file.c +++ b/plugins/addressbook-file/addressbook-file.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index 08c1956303..ccf14beb30 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 5fa9133d72..c4c3c098ae 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index f9745e8972..59c04a605b 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -83,7 +83,7 @@ sanity_check (const char *filename) g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result); return WIFEXITED (result) && (WEXITSTATUS (result) == 0); -#else +#else return result; #endif } @@ -125,7 +125,7 @@ epbr_perform_pre_backup_checks (char* dir) #ifdef G_OS_WIN32 return TRUE; #else - return (g_access (dir, W_OK) == 0); + return (g_access (dir, W_OK) == 0); #endif } diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 7e7cc50461..19e9e98bb1 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -11,13 +11,13 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - + #ifdef HAVE_CONFIG_H #include #endif @@ -182,7 +182,7 @@ backup (const char *filename) g_return_if_fail (filename && *filename); quotedfname = g_shell_quote(filename); - + CANCEL (complete); txt = _("Shutting down Evolution"); /* FIXME Will the versioned setting always work? */ @@ -226,10 +226,10 @@ restore (const char *filename) { char *command; char *quotedfname; - + g_return_if_fail (filename && *filename); quotedfname = g_shell_quote(filename); - + /* FIXME Will the versioned setting always work? */ CANCEL (complete); txt = _("Shutting down Evolution"); @@ -281,7 +281,7 @@ check (const char *filename) g_return_if_fail (filename && *filename); quotedfname = g_shell_quote(filename); - + command = g_strdup_printf ("tar ztf %s | grep -e \"^\\.evolution/$\"", quotedfname); result = system (command); g_free (command); @@ -294,7 +294,7 @@ check (const char *filename) result = system (command); g_free (command); g_free (quotedfname); - + g_message ("Second result %d", result); } diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index a2499dfa98..72098cab56 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -239,7 +239,7 @@ bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target) enable = gconf_client_get_bool (gconf, GCONF_KEY_ENABLE, NULL); g_object_unref (G_OBJECT (gconf)); - if (!enable) + if (!enable) return; message = e_msg_composer_get_message(target->composer, 1); diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index 55c88709b0..62887a8ed0 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index d0b6b180dd..d23749de66 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -6,7 +6,7 @@ * don't already have a buddy icon defined for a person. * * This works today (25 October 2004), but is pretty sure to break - * later on as the Gaim buddylist file format shifts. + * later on as the Gaim buddylist file format shifts. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,7 +19,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -452,7 +452,7 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked) } - if (is_blocked) + if (is_blocked) free_gaim_body (gb); else *buddies = g_list_prepend (*buddies, gb); diff --git a/plugins/bbdb/test-evobuddy.c b/plugins/bbdb/test-evobuddy.c index f7739faea7..9d14aabebe 100644 --- a/plugins/bbdb/test-evobuddy.c +++ b/plugins/bbdb/test-evobuddy.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 8f520bdff9..77aa377751 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -103,7 +103,7 @@ init_db () camel_mime_parser_init_with_stream (parser, stream); camel_mime_parser_scan_from (parser, FALSE); camel_object_unref (stream); - + camel_mime_part_construct_from_parser ((CamelMimePart *) msg, parser); camel_object_unref (parser); @@ -130,7 +130,7 @@ pipe_to_bogofilter (CamelMimeMessage *msg, const gchar **argv, GError **error) gint res; static gboolean only_once = FALSE; -retry: +retry: if (camel_debug_start ("junk")) { int i; @@ -184,7 +184,7 @@ retry: sleep (1); waitres = waitpid (child_pid, &status, WNOHANG); g_set_error (error, EM_JUNK_ERROR, -2, _("Bogofilter child process does not respond, killing...")); - } else + } else g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for Bogofilter child process interrupted, terminating...")); } @@ -209,7 +209,7 @@ retry: goto retry; } g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to Bogofilter failed, error code: %d."), res); - + } return res; diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index e3d2c52ab4..1dd5ae35b5 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c index 33fef89cc4..6670d23293 100644 --- a/plugins/calendar-file/calendar-file.c +++ b/plugins/calendar-file/calendar-file.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/copy-tool/copy-tool.c b/plugins/copy-tool/copy-tool.c index 052722f4eb..1f33ba71db 100644 --- a/plugins/copy-tool/copy-tool.c +++ b/plugins/copy-tool/copy-tool.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/default-mailer/default-mailer.c b/plugins/default-mailer/default-mailer.c index f52bd30855..8d383639ff 100644 --- a/plugins/default-mailer/default-mailer.c +++ b/plugins/default-mailer/default-mailer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c index 132203cd38..a3611cc730 100644 --- a/plugins/default-source/default-source.c +++ b/plugins/default-source/default-source.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index abfd453197..7b065e0de5 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -92,7 +92,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable) return 0; } -static void +static void epech_get_widgets_data (CustomHeaderOptionsDialog *mch) { EmailCustomHeaderOptionsDialogPrivate *priv; @@ -115,8 +115,8 @@ epech_get_widgets_data (CustomHeaderOptionsDialog *mch) return; } -static gboolean -epech_get_widgets (CustomHeaderOptionsDialog *mch) +static gboolean +epech_get_widgets (CustomHeaderOptionsDialog *mch) { EmailCustomHeaderOptionsDialogPrivate *priv; priv = mch->priv; @@ -127,39 +127,39 @@ epech_get_widgets (CustomHeaderOptionsDialog *mch) if (!priv->main) return FALSE; - priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); - priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); + priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); + priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); #undef EMAIL_CUSTOM_HEADER return (priv->page &&priv->header_table); } -static void +static void epech_fill_widgets_with_data (CustomHeaderOptionsDialog *mch) { EmailCustomHeaderOptionsDialogPrivate *priv; HeaderValueComboBox *sub_combo_box_fill; - gint set_index_row,set_index_column; + gint set_index_row,set_index_column; priv = mch->priv; priv->help_section = g_strdup ("usage-mail"); - for (set_index_row = 0,set_index_column = 0; + for (set_index_row = 0,set_index_column = 0; set_index_column < priv->email_custom_header_details->len;set_index_column++) { sub_combo_box_fill = &g_array_index(priv->combo_box_header_value, HeaderValueComboBox,set_index_column); if (priv->flag == 0) { gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,0); } else { - gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box, + gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box, g_array_index(priv->header_index_type, gint, set_index_column)); } } } CustomHeaderOptionsDialog * -epech_dialog_new (void) +epech_dialog_new (void) { CustomHeaderOptionsDialog *mch; @@ -168,7 +168,7 @@ epech_dialog_new (void) return mch; } -GType +GType epech_dialog_get_type (void) { static GType type = 0; @@ -189,12 +189,12 @@ epech_dialog_get_type (void) type = g_type_register_static (G_TYPE_OBJECT, "CustomHeaderOptionsDialogType", &info, 0); - } + } return type; } -static void +static void epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) { EmailCustomHeaderOptionsDialogPrivate *priv; @@ -203,14 +203,14 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) mch = func_data; priv = mch->priv; - switch (state) { + switch (state) { case GTK_RESPONSE_OK: - epech_get_widgets_data (mch); + epech_get_widgets_data (mch); case GTK_RESPONSE_CANCEL: gtk_widget_hide (priv->main); gtk_widget_destroy (priv->main); g_object_unref (priv->xml); - break; + break; case GTK_RESPONSE_HELP: e_display_help ( GTK_WINDOW (priv->main), @@ -221,9 +221,9 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) g_signal_emit (G_OBJECT (func_data), signals[MCH_RESPONSE], 0, state); } -static gboolean +static gboolean epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent) -{ +{ EmailCustomHeaderOptionsDialogPrivate *priv; GtkWidget *toplevel; gchar *filename; @@ -260,12 +260,12 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent) return TRUE; } -static void +static void epech_get_header_list (CustomHeaderOptionsDialog *mch) { GConfClient *client; - client = gconf_client_get_default (); + client = gconf_client_get_default (); g_return_if_fail (GCONF_IS_CLIENT (client)); gconf_client_add_dir (client, GCONF_KEY_CUSTOM_HEADER, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); epech_load_from_gconf (client, "/apps/evolution/eplugin/email_custom_header/customHeader", mch); @@ -273,7 +273,7 @@ epech_get_header_list (CustomHeaderOptionsDialog *mch) return; } -static void +static void epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsDialog *mch) { EmailCustomHeaderOptionsDialogPrivate *priv; @@ -319,7 +319,7 @@ epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsD temp_header_details.number_of_header = pos; } -static void +static void epech_setup_widgets (CustomHeaderOptionsDialog *mch) { EmailCustomHeaderOptionsDialogPrivate *priv; @@ -345,9 +345,9 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) }; priv = mch->priv; - priv->combo_box_header_value = g_array_new (TRUE, FALSE, sizeof (HeaderValueComboBox)); + priv->combo_box_header_value = g_array_new (TRUE, FALSE, sizeof (HeaderValueComboBox)); - for (header_section_id = 0,label_row = 0,row = 0,column = 1; + for (header_section_id = 0,label_row = 0,row = 0,column = 1; header_section_id < priv->email_custom_header_details->len; header_section_id++,row++,column++) { /* To create an empty label widget. Text will be added dynamically. */ @@ -369,7 +369,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) g_array_append_val(priv->combo_box_header_value, sub_combo_box); } - for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len; + for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len; sub_index++,row_combo++,column_combo++) { temp = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,sub_index); @@ -380,7 +380,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) (GtkAttachOptions) (GTK_FILL), 0, 0); for (sub_type_index = 0; sub_type_index < temp->number_of_subtype_header; sub_type_index++) { - temp_header_value_ptr = &g_array_index(temp->sub_header_type_value, CustomSubHeader,sub_type_index); + temp_header_value_ptr = &g_array_index(temp->sub_header_type_value, CustomSubHeader,sub_type_index); str = (temp_header_value_ptr->sub_header_string_value)->str; for (i = 0; security_values[i].value != NULL; i++) { if (strcmp (str, security_values[i].value) == 0) { @@ -397,7 +397,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) } } -static void +static void epech_dialog_class_init (GObjectClass *object) { CustomHeaderOptionsDialogClass *klass; @@ -420,7 +420,7 @@ epech_dialog_class_init (GObjectClass *object) G_TYPE_INT); } -static void +static void epech_dialog_init (GObject *object) { CustomHeaderOptionsDialog *mch; @@ -435,7 +435,7 @@ epech_dialog_init (GObject *object) priv->header_table = NULL; } -static void +static void epech_dialog_finalize (GObject *object) { CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *)object; @@ -450,11 +450,11 @@ epech_dialog_finalize (GObject *object) mch->priv = NULL; } - if (parent_class->finalize) + if (parent_class->finalize) (* parent_class->finalize) (object); } -static void +static void epech_dialog_dispose (GObject *object) { CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *) object; @@ -463,9 +463,9 @@ epech_dialog_dispose (GObject *object) if (parent_class->dispose) (* parent_class->dispose) (object); -} +} -static void +static void epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gpointer data) { EMsgComposer *composer; @@ -487,15 +487,15 @@ epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gp temp_header_value_ptr = &g_array_index(temp_header_ptr->sub_header_type_value, CustomSubHeader,sub_type_index); if (sub_type_index == g_array_index(priv->header_index_type, gint, index_subtype)){ - e_msg_composer_modify_header (composer, (temp_header_ptr->header_type_value)->str, - (temp_header_value_ptr->sub_header_string_value)->str); + e_msg_composer_modify_header (composer, (temp_header_ptr->header_type_value)->str, + (temp_header_value_ptr->sub_header_string_value)->str); } } } } } -static void +static void epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data) { EMsgComposer *composer; @@ -503,7 +503,7 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data) CustomHeaderOptionsDialog *current_dialog = NULL; composer = (EMsgComposer *) user_data; - + if (!user_data || !EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (user_data)) return; @@ -515,16 +515,16 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data) if (current_dialog) { g_free (current_dialog); - current_dialog = NULL; + current_dialog = NULL; } if (new_email_custom_header_window) { g_free (new_email_custom_header_window); - new_email_custom_header_window = NULL; + new_email_custom_header_window = NULL; } } -static gint +static gint epech_check_existing_composer_window(gconstpointer compowindow, gconstpointer other_compowindow) { if ((compowindow) && (other_compowindow)){ @@ -570,7 +570,7 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp new_email_custom_header_window->epech_window = menuitem->window; new_email_custom_header_window->epech_dialog = dialog; g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data); - } + } } epech_dialog_run (dialog, GTK_WIDGET (composer)); @@ -944,7 +944,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) g_signal_connect(G_OBJECT(model), "row-changed", G_CALLBACK(header_isempty), cd); /* Populate tree view with values from gconf */ - header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL); + header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL); for (list = header_list; list; list = g_slist_next (list)) { gchar **parse_header_list; @@ -954,7 +954,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) parse_header_list = g_strsplit_set (buffer, "=,", -1); str_colon = g_strconcat (parse_header_list[0], "", NULL); gtk_list_store_set (cd->store, &iter, HEADER_KEY_COLUMN, str_colon, -1); - + for (index = 0; parse_header_list[index+1] ; ++index) { str1_colon = g_strconcat (parse_header_list[index+1], "", NULL); gtk_list_store_set (cd->store, &iter, HEADER_VALUE_COLUMN, str1_colon, -1); diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h index f828a53061..30e0f7061a 100644 --- a/plugins/email-custom-header/email-custom-header.h +++ b/plugins/email-custom-header/email-custom-header.h @@ -1,6 +1,6 @@ /* * Evolution Email custom header options - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 6785585af8..2c08341ef3 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -239,9 +239,9 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) &offline_status); if (offline_status == OFFLINE_MODE) { e_error_run (NULL, ERROR_DOMAIN ":exchange-settings-offline", NULL); - + return NULL; - } + } oof_data = g_new0 (OOFData, 1); @@ -637,7 +637,7 @@ want_mailbox_toggled (GtkWidget *toggle, EConfig *config) const char *mailbox; gtk_widget_set_sensitive (entry, is_active); - + target = (EMConfigTargetAccount *)config->target; mailbox = gtk_entry_get_text (GTK_ENTRY (entry)); @@ -898,14 +898,14 @@ org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data) } camel_url_free (url); - + exchange_config_listener_get_offline_status (exchange_global_config_listener, &offline_status); - + if (offline_status == OFFLINE_MODE) { return; } - + /* Set oof data in exchange account */ set_oof_info (); destroy_oof_data (); @@ -1122,10 +1122,10 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor if (!account) return NULL; - exchange_account_is_offline (account, &mode); - if (mode == OFFLINE_MODE) - return NULL; - + exchange_account_is_offline (account, &mode); + if (mode == OFFLINE_MODE) + return NULL; + folder_name = (char*) camel_folder_get_name (cml_folder); if (!folder_name) folder_name = g_strdup ("name"); diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c index ef0eaaef79..58af042c0c 100644 --- a/plugins/exchange-operations/exchange-calendar.c +++ b/plugins/exchange-operations/exchange-calendar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-change-password.c b/plugins/exchange-operations/exchange-change-password.c index e35ee38dee..539bd24d3a 100644 --- a/plugins/exchange-operations/exchange-change-password.c +++ b/plugins/exchange-operations/exchange-change-password.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-change-password.h b/plugins/exchange-operations/exchange-change-password.h index e2c40c0186..e320d89cf9 100644 --- a/plugins/exchange-operations/exchange-change-password.h +++ b/plugins/exchange-operations/exchange-change-password.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index 19d5846aa7..5ff53fb171 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -14,7 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h index d0048ee4a9..b5ceca2a27 100644 --- a/plugins/exchange-operations/exchange-config-listener.h +++ b/plugins/exchange-operations/exchange-config-listener.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c index f04c9d6076..1955f58eba 100644 --- a/plugins/exchange-operations/exchange-contacts.c +++ b/plugins/exchange-operations/exchange-contacts.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -503,7 +503,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target) if (authtype) { e_source_set_property (source, "auth-type", authtype); g_free (authtype); - authtype=NULL; + authtype=NULL; } e_source_set_property (source, "auth", "plain/password"); if (rename) { diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index 635e82ade7..7de3948814 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h index 56217981a8..251a09de9d 100644 --- a/plugins/exchange-operations/exchange-delegates-user.h +++ b/plugins/exchange-operations/exchange-delegates-user.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c index b1c94afb1c..4038ef0baf 100644 --- a/plugins/exchange-operations/exchange-delegates.c +++ b/plugins/exchange-operations/exchange-delegates.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-delegates.h b/plugins/exchange-operations/exchange-delegates.h index b0c6833ff7..77fc354c60 100644 --- a/plugins/exchange-operations/exchange-delegates.h +++ b/plugins/exchange-operations/exchange-delegates.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c index 11d9b84f5e..63874c793a 100644 --- a/plugins/exchange-operations/exchange-folder-permission.c +++ b/plugins/exchange-operations/exchange-folder-permission.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c index 4d3082e805..ff3634341a 100644 --- a/plugins/exchange-operations/exchange-folder-size-display.c +++ b/plugins/exchange-operations/exchange-folder-size-display.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-folder-size-display.h b/plugins/exchange-operations/exchange-folder-size-display.h index 9c10b93b5f..95c795686d 100644 --- a/plugins/exchange-operations/exchange-folder-size-display.h +++ b/plugins/exchange-operations/exchange-folder-size-display.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c index ab63a5dd3e..2f72552983 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.c +++ b/plugins/exchange-operations/exchange-folder-subscription.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-folder-subscription.h b/plugins/exchange-operations/exchange-folder-subscription.h index f4a329c19a..15323cad09 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.h +++ b/plugins/exchange-operations/exchange-folder-subscription.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index 1c2334e2dc..3362f0ae83 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c index 7b801b13e5..74d3af258e 100644 --- a/plugins/exchange-operations/exchange-mail-send-options.c +++ b/plugins/exchange-operations/exchange-mail-send-options.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c index a42e867446..553a41695e 100644 --- a/plugins/exchange-operations/exchange-operations.c +++ b/plugins/exchange-operations/exchange-operations.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h index 156339f437..c453b0b978 100644 --- a/plugins/exchange-operations/exchange-operations.h +++ b/plugins/exchange-operations/exchange-operations.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c index ddcec2d592..a83d54c517 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.c +++ b/plugins/exchange-operations/exchange-permissions-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-permissions-dialog.h b/plugins/exchange-operations/exchange-permissions-dialog.h index aa8d9bb043..18bdcd4371 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.h +++ b/plugins/exchange-operations/exchange-permissions-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c index 6ca64049ca..a9858d324a 100644 --- a/plugins/exchange-operations/exchange-send-options.c +++ b/plugins/exchange-operations/exchange-send-options.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h index 35ce50030f..b7bb9dd58b 100644 --- a/plugins/exchange-operations/exchange-send-options.h +++ b/plugins/exchange-operations/exchange-send-options.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c index e1de8f4797..9285b9680e 100644 --- a/plugins/exchange-operations/exchange-user-dialog.c +++ b/plugins/exchange-operations/exchange-user-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/plugins/exchange-operations/exchange-user-dialog.h b/plugins/exchange-operations/exchange-user-dialog.h index 453d4ca832..6bf191bc6e 100644 --- a/plugins/exchange-operations/exchange-user-dialog.h +++ b/plugins/exchange-operations/exchange-user-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/face/face.c b/plugins/face/face.c index ca3af16ab4..1b772863a4 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/folder-unsubscribe/folder-unsubscribe.c b/plugins/folder-unsubscribe/folder-unsubscribe.c index d2d83b6ec6..308aea35f0 100644 --- a/plugins/folder-unsubscribe/folder-unsubscribe.c +++ b/plugins/folder-unsubscribe/folder-unsubscribe.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c index 00b7ebc2a5..23314a44cc 100644 --- a/plugins/google-account-setup/google-contacts-source.c +++ b/plugins/google-account-setup/google-contacts-source.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/google-account-setup/google-contacts-source.h b/plugins/google-account-setup/google-contacts-source.h index 54c21d18a6..289ea0b40f 100644 --- a/plugins/google-account-setup/google-contacts-source.h +++ b/plugins/google-account-setup/google-contacts-source.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index c296ab687f..97d87c666d 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -420,7 +420,7 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) g_return_if_fail (username != NULL && *username != '\0'); tmp = g_strdup_printf (_("Enter password for user %s to access list of subscribed calendars."), username); - password = e_passwords_ask_password (_("Enter password"), "Calendar", "", tmp, + password = e_passwords_ask_password (_("Enter password"), "Calendar", "", tmp, E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_REPROMPT | E_PASSWORDS_SECRET | E_PASSWORDS_DISABLE_REMEMBER, NULL, parent); g_free (tmp); diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index fd9091c5c2..3d1fb15214 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -224,7 +224,7 @@ add_esource (const char *conf_key, GwAccountInfo *info, const char *source_name e_source_set_property (source, "refresh", str); g_free (str); - } else + } else e_source_set_property (source, "refresh", NULL); e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" ); @@ -349,7 +349,7 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, EAccount const char *poa_address; const char *new_poa_address; const char* new_group_name = a->name; - + url = camel_url_new (old_account_info->source_url, NULL); poa_address = url->host; if (!poa_address || strlen (poa_address) ==0) @@ -387,13 +387,13 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, EAccount e_source_set_property (source, "port", camel_url_get_param (new_url,"soap_port")); e_source_set_property (source, "use_ssl", camel_url_get_param (url, "use_ssl")); e_source_set_property (source, "offline_sync", camel_url_get_param (url, "offline_sync") ? "1" : "0"); - + if (a->source->auto_check) { char *str = g_strdup_printf ("%d", a->source->auto_check_time); - + e_source_set_property (source, "refresh", str); g_free (str); - } else + } else e_source_set_property (source, "refresh", NULL); e_source_list_sync (list, NULL); @@ -424,7 +424,7 @@ add_calendar_tasks_sources (GwAccountInfo *info) add_esource ("/apps/evolution/calendar/sources", info, _("Calendar"), url, NULL, FALSE); add_esource ("/apps/evolution/tasks/sources", info, _("Tasks"), url, NULL, FALSE); add_esource ("/apps/evolution/memos/sources", info, _("Notes"), url, NULL, TRUE); - + camel_url_free (url); diff --git a/plugins/groupwise-account-setup/camel-gw-listener.h b/plugins/groupwise-account-setup/camel-gw-listener.h index 16a3fbe83b..9682a6877b 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.h +++ b/plugins/groupwise-account-setup/camel-gw-listener.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c index fca171aab5..aee5e90623 100644 --- a/plugins/groupwise-account-setup/groupwise-account-setup.c +++ b/plugins/groupwise-account-setup/groupwise-account-setup.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -51,7 +51,7 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha { ESourceList *list; GSList *groups; - + list = e_source_list_new_for_gconf (client, path); groups = e_source_list_peek_groups (list); @@ -67,7 +67,7 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha if (a->source->auto_check) { char *str = g_strdup_printf ("%d",a->source->auto_check_time); - + e_source_set_property (source, "refresh", str); g_free (str); } else diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c index c5959249df..b6519c636e 100644 --- a/plugins/groupwise-features/addressbook-groupwise.c +++ b/plugins/groupwise-features/addressbook-groupwise.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index bfe295447f..29c5ed2855 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index cdfffa5e7a..3e7d522c19 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index 65eca141c6..3d66a1c518 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h index 9e3f60ce1a..43322de018 100644 --- a/plugins/groupwise-features/junk-settings.h +++ b/plugins/groupwise-features/junk-settings.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 6396685cce..cf039931a5 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -50,8 +50,8 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data) if (cnc && E_IS_GW_CONNECTION(cnc)) { id = (char *)item->user_data; - confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), NULL, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), NULL, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_YES, GTK_RESPONSE_YES, GTK_STOCK_NO, GTK_RESPONSE_NO, NULL); @@ -78,7 +78,7 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data) gtk_dialog_run (GTK_DIALOG(dialog)); gtk_widget_destroy (dialog); } - } + } } } diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c index 0e0663c801..7954f9e1a4 100644 --- a/plugins/groupwise-features/mail-send-options.c +++ b/plugins/groupwise-features/mail-send-options.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/mail-send-options.h b/plugins/groupwise-features/mail-send-options.h index 943614e995..71cacbff01 100644 --- a/plugins/groupwise-features/mail-send-options.h +++ b/plugins/groupwise-features/mail-send-options.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index 35057bfad2..67123decf4 100644 --- a/plugins/groupwise-features/process-meeting.c +++ b/plugins/groupwise-features/process-meeting.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -322,7 +322,7 @@ static EPopupItem retract_popup_items[] = { { E_POPUP_ITEM, (gchar *) "49.resend", (gchar *) N_("Rese_nd Meeting..."), on_resend_meeting, NULL, (gchar *) GTK_STOCK_EDIT, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} }; -void +void org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target) { GSList *menus = NULL; @@ -348,7 +348,7 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target) if (! g_strrstr (uri, "groupwise://")) return ; - + comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); @@ -394,7 +394,7 @@ add_retract_data (ECalComponent *comp, const char *retract_comment, CalObjModTyp icalcomponent_add_property (icalcomp, icalprop); } -static void +static void free_thread_data (ThreadData *data) { if (data == NULL) @@ -420,10 +420,10 @@ retract_object (gpointer val) GError *error = NULL; add_retract_data (data->comp, NULL, data->mod); - + icalcomp = e_cal_component_get_icalcomponent (data->comp); icalcomponent_set_method (icalcomp, ICAL_METHOD_CANCEL); - + if (!e_cal_send_objects (data->client, icalcomp, &users, &mod_comp, &error)) { /* FIXME report error */ @@ -434,15 +434,15 @@ retract_object (gpointer val) if (mod_comp) icalcomponent_free (mod_comp); - + if (users) { g_list_foreach (users, (GFunc) g_free, NULL); g_list_free (users); } - + rid = e_cal_component_get_recurid_as_string (data->comp); e_cal_component_get_uid (data->comp, &uid); - + if (!e_cal_remove_object_with_mod (data->client, uid, rid, data->mod, &error)) { g_warning ("Unable to remove the item \n"); @@ -461,7 +461,7 @@ object_created_cb (CompEditor *ce, gpointer data) GThread *thread = NULL; int response; GError *error = NULL; - + gtk_widget_hide (GTK_WIDGET (ce)); response = e_error_run (NULL, "org.gnome.evolution.process_meeting:resend-retract", NULL); @@ -507,18 +507,18 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data) response = e_error_run (NULL, msg, NULL); if (response == GTK_RESPONSE_YES) { - mod = CALOBJ_MOD_ALL; + mod = CALOBJ_MOD_ALL; } else if (response == GTK_RESPONSE_CANCEL) { g_object_unref (comp); return; } - + data = g_new0 (ThreadData, 1); data->client = g_object_ref (event->comp_data->client); data->comp = comp; data->mod = mod; - - if (resend) + + if (resend) { guint flags = 0; char *new_uid = NULL; @@ -535,7 +535,7 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data) e_cal_component_set_uid (new_comp, new_uid); icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (new_comp)); ce = e_calendar_view_open_event_with_flags (cal_view, data->client, icalcomp, flags); - + g_signal_connect (ce, "object_created", G_CALLBACK (object_created_cb), data); g_object_unref (new_comp); g_free (new_uid); diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index e7e39ba3d5..ebcf068bf0 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h index b36d31563b..24717f8cc7 100644 --- a/plugins/groupwise-features/proxy-login.h +++ b/plugins/groupwise-features/proxy-login.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index f9588802df..7ab0095dbf 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h index 127b4cfaa0..c2bd933db4 100644 --- a/plugins/groupwise-features/proxy.h +++ b/plugins/groupwise-features/proxy.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index 24dfb1b949..33f1dd2cb4 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 8f38f2a23d..74ca71fbb4 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index a48cd10f2c..382cf75124 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index 9801adce1b..fadf37bcfb 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index 2b21b47616..a465752c95 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index ee40a7bdb7..1094bec34b 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h index 3dfdff3b2b..9a0c3642eb 100644 --- a/plugins/hula-account-setup/camel-hula-listener.h +++ b/plugins/hula-account-setup/camel-hula-listener.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c index 6518d100c7..84a7a4127c 100644 --- a/plugins/hula-account-setup/hula-account-setup.c +++ b/plugins/hula-account-setup/hula-account-setup.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index e3d20334b9..c33a02bdef 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -260,7 +260,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data) GtkTreeViewColumn *column; GtkTreeIter first, iter; gboolean use_imap = g_getenv ("USE_IMAP") != NULL; - + ui = g_new0 (EPImapFeaturesData, 1); target_account = (EMConfigTargetAccount *)data->config->target; diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c index e0f4246220..487d9f14c5 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.c +++ b/plugins/ipod-sync/evolution-ipod-sync.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/ipod-sync/evolution-ipod-sync.h b/plugins/ipod-sync/evolution-ipod-sync.h index 6fbf1e985c..662b16eff0 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.h +++ b/plugins/ipod-sync/evolution-ipod-sync.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/ipod-sync/format-handler.h b/plugins/ipod-sync/format-handler.h index d061f4ce86..145bcb7d6d 100644 --- a/plugins/ipod-sync/format-handler.h +++ b/plugins/ipod-sync/format-handler.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c index 576c8651aa..49c042f705 100644 --- a/plugins/ipod-sync/ical-format.c +++ b/plugins/ipod-sync/ical-format.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -99,7 +99,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc if (stream) g_object_unref (stream); - } + } if (error) { display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error->message); diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c index f2d597becc..1f589bfdc0 100644 --- a/plugins/ipod-sync/ipod-sync.c +++ b/plugins/ipod-sync/ipod-sync.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -256,7 +256,7 @@ org_gnome_sync_memos (EPlugin *ep, ECalPopupTargetSource *target) { if (!ipod_check_status(FALSE)) return; - + destination_save_cal (ep, target, E_CAL_SOURCE_TYPE_JOURNAL); } diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c index 26e3d49475..5f399f23e6 100644 --- a/plugins/ipod-sync/ipod.c +++ b/plugins/ipod-sync/ipod.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c index 42f3bdfa0b..8fe83d1b5a 100644 --- a/plugins/ipod-sync/sync.c +++ b/plugins/ipod-sync/sync.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -425,7 +425,7 @@ export_memos (void) g_string_free (data, TRUE); free_uri_list (uris); - + pulse (); } diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index c777f6cbb5..293c4e3fca 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -695,7 +695,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) itip_view_remove_lower_info_item (ITIP_VIEW (pitip->view), pitip->progress_info_id); pitip->progress_info_id = 0; - + /* * Only allow replies if backend doesn't do that automatically. * Only enable it for forwarded invitiations (PUBLISH) or direct @@ -834,7 +834,7 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp) if (current_source) { l = sources_conflict; - + pitip->progress_info_id = itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS, _("Opening the calendar. Please wait..")); } else { @@ -1243,8 +1243,8 @@ remove_delegate (struct _itip_puri *pitip, const char *delegate, const char *del } -static void -update_x (ECalComponent *pitip_comp, ECalComponent *comp) +static void +update_x (ECalComponent *pitip_comp, ECalComponent *comp) { icalcomponent *itip_icalcomp = e_cal_component_get_icalcomponent (pitip_comp); icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp); @@ -2053,7 +2053,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject gboolean have_alarms = FALSE; info = (struct _itip_puri *) em_format_find_puri((EMFormat *)efh, pobject->classid); - + /* Accounts */ info->accounts = itip_addresses_get (); @@ -2441,10 +2441,10 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) if (((CamelStreamMem *) mem)->buffer->len == 0) puri->vcalendar = NULL; - else + else puri->vcalendar = g_strndup ((char *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); camel_object_unref (mem); - + camel_stream_printf (target->stream, "
"); camel_stream_printf (target->stream, "
", classid); diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 2d714b4a1e..30dbe135cc 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -737,7 +737,7 @@ set_info_items (GtkWidget *info_box, GSList *info_items) } label = gtk_label_new (item->message); - gtk_label_set_selectable (GTK_LABEL (label), TRUE); + gtk_label_set_selectable (GTK_LABEL (label), TRUE); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6); @@ -1034,7 +1034,7 @@ itip_view_init (ItipView *view) priv->start_header = gtk_label_new (_("Start time:")); priv->start_label = gtk_label_new (NULL); gtk_label_set_selectable (GTK_LABEL (priv->start_header), TRUE); - gtk_label_set_selectable (GTK_LABEL (priv->start_label), TRUE); + gtk_label_set_selectable (GTK_LABEL (priv->start_label), TRUE); gtk_misc_set_alignment (GTK_MISC (priv->start_header), 0, 0.5); gtk_misc_set_alignment (GTK_MISC (priv->start_label), 0, 0.5); gtk_widget_show (priv->start_header); @@ -1078,7 +1078,7 @@ itip_view_init (ItipView *view) /* Description */ priv->description_label = gtk_label_new (NULL); - gtk_label_set_selectable (GTK_LABEL (priv->description_label), TRUE); + gtk_label_set_selectable (GTK_LABEL (priv->description_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (priv->description_label), TRUE); gtk_misc_set_alignment (GTK_MISC (priv->description_label), 0, 0.5); gtk_box_pack_start (GTK_BOX (vbox), priv->description_label, FALSE, FALSE, 0); @@ -1112,12 +1112,12 @@ itip_view_init (ItipView *view) gtk_box_pack_start (GTK_BOX (priv->rsvp_box), hbox, FALSE, FALSE, 0); label = gtk_label_new (NULL); - gtk_label_set_selectable (GTK_LABEL (label), TRUE); + gtk_label_set_selectable (GTK_LABEL (label), TRUE); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); priv->rsvp_comment_header = gtk_label_new (_("Comment:")); - gtk_label_set_selectable (GTK_LABEL (priv->rsvp_comment_header), TRUE); + gtk_label_set_selectable (GTK_LABEL (priv->rsvp_comment_header), TRUE); gtk_widget_set_sensitive (priv->rsvp_comment_header, FALSE); gtk_widget_show (priv->rsvp_comment_header); gtk_box_pack_start (GTK_BOX (hbox), priv->rsvp_comment_header, FALSE, FALSE, 0); @@ -2174,8 +2174,8 @@ void itip_view_set_show_free_time_check (ItipView *view, gboolean show) { g_return_if_fail (view != NULL); - g_return_if_fail (ITIP_IS_VIEW (view)); - + g_return_if_fail (ITIP_IS_VIEW (view)); + if (show) gtk_widget_show (view->priv->free_time_check); else { @@ -2196,8 +2196,8 @@ void itip_view_set_show_keep_alarm_check (ItipView *view, gboolean show) { g_return_if_fail (view != NULL); - g_return_if_fail (ITIP_IS_VIEW (view)); - + g_return_if_fail (ITIP_IS_VIEW (view)); + if (show) gtk_widget_show (view->priv->keep_alarm_check); else @@ -2219,8 +2219,8 @@ void itip_view_set_show_inherit_alarm_check (ItipView *view, gboolean show) { g_return_if_fail (view != NULL); - g_return_if_fail (ITIP_IS_VIEW (view)); - + g_return_if_fail (ITIP_IS_VIEW (view)); + if (show) gtk_widget_show (view->priv->inherit_alarm_check); else { diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h index 736119ae04..88d01204fb 100644 --- a/plugins/itip-formatter/itip-view.h +++ b/plugins/itip-formatter/itip-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/mail-account-disable/mail-account-disable.c b/plugins/mail-account-disable/mail-account-disable.c index 552bea5a6d..d03e97d0f8 100644 --- a/plugins/mail-account-disable/mail-account-disable.c +++ b/plugins/mail-account-disable/mail-account-disable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 5bb65cef18..466648d80f 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -398,8 +398,8 @@ do_properties (GtkMenuItem *item, gpointer user_data) gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); dialog = gtk_dialog_new_with_buttons (_("Mail Notification Properties"), - NULL, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + NULL, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); @@ -427,7 +427,7 @@ popup_menu_status (GtkStatusIcon *status_icon, guint button, guint activate_time #endif gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - + item = gtk_separator_menu_item_new (); gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); @@ -443,11 +443,11 @@ popup_menu_status (GtkStatusIcon *status_icon, guint button, guint activate_time } #ifdef HAVE_LIBNOTIFY -static void +static void notifyActionCallback (NotifyNotification *n, gchar *label, gpointer a) { g_static_mutex_lock (&mlock); - + gtk_status_icon_set_visible (status_icon, FALSE); g_object_unref (status_icon); @@ -457,7 +457,7 @@ notifyActionCallback (NotifyNotification *n, gchar *label, gpointer a) } status_icon = NULL; - status_count = 0; + status_count = 0; g_static_mutex_unlock (&mlock); } #endif @@ -833,11 +833,11 @@ get_cfg_widget (void) gtk_widget_show (check); gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0); -#ifdef HAVE_DBUS +#ifdef HAVE_DBUS cfg = get_config_widget_dbus (); if (cfg) gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0); -#endif +#endif cfg = get_config_widget_status (); if (cfg) gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0); @@ -868,7 +868,7 @@ org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t) g_static_mutex_lock (&mlock); -#ifdef HAVE_DBUS +#ifdef HAVE_DBUS if (is_part_enabled (GCONF_KEY_ENABLED_DBUS)) new_notify_dbus (t); #endif @@ -908,7 +908,7 @@ int e_plugin_lib_enable (EPluginLib *ep, int enable) { if (enable) { -#ifdef HAVE_DBUS +#ifdef HAVE_DBUS if (is_part_enabled (GCONF_KEY_ENABLED_DBUS)) enable_dbus (enable); #endif @@ -922,7 +922,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable) } else { #ifdef HAVE_DBUS enable_dbus (enable); -#endif +#endif enable_status (enable); enable_sound (enable); diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 44a7d8b868..5560a4cabd 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -372,7 +372,7 @@ do_mail_to_event (AsyncData *data) dt.tzid = NULL; tt2 = tt; - icaltime_adjust (&tt2, 1, 0, 0, 0); + icaltime_adjust (&tt2, 1, 0, 0, 0); dt2.value = &tt2; dt2.tzid = NULL; @@ -581,7 +581,7 @@ mail_to_event (ECalSourceType source_type, gboolean with_attendees, GPtrArray *u } } } - + if (!source) { GtkWidget *dialog; diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index 9dd5c1c57e..7dc1895389 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index c9ea67ca61..dfcf75937b 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c index 5dd92e8609..0bc95619ce 100644 --- a/plugins/mono/mono-plugin.c +++ b/plugins/mono/mono-plugin.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -108,18 +108,18 @@ epm_invoke(EPlugin *ep, const char *name, void *data) if (p->klass) { d(printf("looking up method '%s' in class\n", name)); /* class method */ - + d = mono_method_desc_new(name, FALSE); /*if (d == NULL) { g_warning("Can't create method descriptor for '%s'", name); return NULL; }*/ - + gpointer iter = NULL; MonoMethod* mono_method; d(printf ("\n\a About to get methods in klass\n\a")); - + while ((mono_method = mono_class_get_methods (p->klass, &iter))) { g_print ("\n\a Method name is : <%s>\n\a", mono_method_get_name(mono_method)); } diff --git a/plugins/mono/mono-plugin.h b/plugins/mono/mono-plugin.h index 3c11072e83..9dd8facdb3 100644 --- a/plugins/mono/mono-plugin.h +++ b/plugins/mono/mono-plugin.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c index 19af3eeb7e..54d166065b 100644 --- a/plugins/plugin-manager/plugin-manager.c +++ b/plugins/plugin-manager/plugin-manager.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -314,7 +314,7 @@ org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t) GtkTreeIter iter; GtkWidget *cfg_widget; - if (!g_getenv ("EVO_SHOW_ALL_PLUGINS")) { + if (!g_getenv ("EVO_SHOW_ALL_PLUGINS")) { /* hide ourselves always */ if (ep->flags & E_PLUGIN_FLAGS_SYSTEM_PLUGIN) continue; @@ -338,7 +338,7 @@ org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t) COL_PLUGIN_DATA, ep, COL_PLUGIN_CFG_WIDGET, cfg_widget, -1); - + } /* setup the treeview */ diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index ed4b6dc363..13453b20f1 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c index 6f52759e82..08787fc1fc 100644 --- a/plugins/profiler/profiler.c +++ b/plugins/profiler/profiler.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 8cbf80eb50..4bfe66b41f 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -98,7 +98,7 @@ void org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target, int e_plugin_lib_enable (EPluginLib *ep, int enable); -/* em-folder-selection-button.h is private, even though other internal evo plugins use it! +/* em-folder-selection-button.h is private, even though other internal evo plugins use it! so declare the functions here TODO: sort out whether this should really be private */ @@ -123,7 +123,7 @@ struct _PstImporter { CamelException ex; pst_file pst; - + CamelOperation *cancel; CamelFolder *folder; gchar *parent_uri; @@ -152,7 +152,7 @@ org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target) } s = (EImportTargetURI *)target; - + if (s->uri_src == NULL) { return TRUE; } @@ -170,7 +170,7 @@ org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target) ret = n == sizeof (pst_signature) && memcmp (signature, pst_signature, sizeof (pst_signature)) == 0; close (fd); } - + return ret; } @@ -214,8 +214,8 @@ folder_selected (EMFolderSelectionButton *button, EImportTargetURI *target) /** * Suggest a folder to import data into - * @param target - * @return + * @param target + * @return */ static gchar* get_suggested_foldername (EImportTargetURI *target) @@ -244,7 +244,7 @@ get_suggested_foldername (EImportTargetURI *target) if (pst_init (&pst, filename) == 0) { rootname = get_pst_rootname (&pst, filename); } - + g_free (filename); if (rootname != NULL) { @@ -271,7 +271,7 @@ get_suggested_foldername (EImportTargetURI *target) break; } } - + if (folder != NULL) { pst_error_msg ("Error searching for an unused folder name. uri=%s", foldername); } @@ -301,17 +301,17 @@ org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EI gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE); g_signal_connect (w, "toggled", G_CALLBACK (checkbox_mail_toggle_cb), target); gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, FALSE, 0); - + w = em_folder_selection_button_new (_("Select folder"), _("Select folder to import into")); foldername = get_suggested_foldername ((EImportTargetURI *) target); ((EImportTargetURI *) target)->uri_dest = g_strdup (foldername); em_folder_selection_button_set_selection ((EMFolderSelectionButton *) w, foldername); g_signal_connect (w, "selected", G_CALLBACK (folder_selected), target); gtk_box_pack_end ((GtkBox *) hbox, w, FALSE, FALSE, 0); - + w = gtk_label_new (_("Destination folder:")); gtk_box_pack_end ((GtkBox *) hbox, w, FALSE, TRUE, 6); - + gtk_box_pack_start ((GtkBox *) framebox, hbox, FALSE, FALSE, 0); /* Address book */ @@ -320,19 +320,19 @@ org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EI /*gtk_widget_set_sensitive ((GtkWidget *)w, FALSE);*/ /* Disable until implemented */ g_signal_connect (w, "toggled", G_CALLBACK (checkbox_addr_toggle_cb), target); gtk_box_pack_start ((GtkBox *) framebox, w, FALSE, FALSE, 0); - + /* Appointments */ w = gtk_check_button_new_with_mnemonic (_("A_ppointments")); gtk_toggle_button_set_active ((GtkToggleButton *) w, FALSE); g_signal_connect (w, "toggled", G_CALLBACK (checkbox_appt_toggle_cb), target); gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0); - + /* Tasks */ w = gtk_check_button_new_with_mnemonic (_("_Tasks")); gtk_toggle_button_set_active ((GtkToggleButton *)w, FALSE); g_signal_connect (w, "toggled", G_CALLBACK (checkbox_task_toggle_cb), target); gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0); - + /* Journal */ w = gtk_check_button_new_with_mnemonic (_("_Journal entries")); gtk_toggle_button_set_active ((GtkToggleButton *)w, FALSE); @@ -360,24 +360,24 @@ open_ecal (ECalSourceType type, char *name) ESource *primary; ESourceList *source_list; ECal *cal; - + if ((e_cal_get_sources (&source_list, type, NULL)) == 0) { g_warning ("Could not get any sources of type %s.", name); return NULL; - } - + } + primary = e_source_list_peek_source_any (source_list); - + if ((cal = e_cal_new (primary, type)) == NULL) { g_warning ("Could not create %s.", name); g_object_unref (source_list); return NULL; } - + e_cal_open (cal, TRUE, NULL); g_object_unref (primary); g_object_unref (source_list); - + return cal; } @@ -385,18 +385,18 @@ static void pst_import_import (PstImporter *m) { CamelOperation *oldcancel = NULL; - + oldcancel = camel_operation_register (m->status); - + if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-addr"))) { /* Hack - grab the first address book we can find TODO - add a selection mechanism in get_widget */ ESource *primary; ESourceList *source_list; - + if (e_book_get_addressbooks (&source_list, NULL)) { primary = e_source_list_peek_source_any (source_list); - + if ((m->addressbook = e_book_new (primary,NULL))) { e_book_open (m->addressbook, TRUE, NULL); g_object_unref (primary); @@ -406,8 +406,8 @@ pst_import_import (PstImporter *m) } } else { g_warning ("Could not get address books."); - } - } + } + } if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-appt"))) { m->calendar = open_ecal (E_CAL_SOURCE_TYPE_EVENT, "calendar"); @@ -420,10 +420,10 @@ pst_import_import (PstImporter *m) if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-journal"))) { m->journal = open_ecal (E_CAL_SOURCE_TYPE_JOURNAL, "journal"); } - + pst_import_file (m); -/* FIXME: Crashes often in here. +/* FIXME: Crashes often in here. if (m->addressbook) { g_object_unref (m->addressbook); } @@ -478,7 +478,7 @@ pst_import_file (PstImporter *m) } camel_operation_progress_count (NULL, 2); - + if ((d_ptr = pst_getTopOfFolders (&m->pst, item)) == NULL) { pst_error_msg ("Top of folders record not found. Cannot continue"); return; @@ -505,7 +505,7 @@ pst_import_folders (PstImporter *m, pst_desc_ll *topitem) /* Walk through folder tree */ while (d_ptr != NULL && (camel_operation_cancel_check (NULL) == FALSE)) { - + pst_process_item (m, d_ptr); if (d_ptr->child != NULL) { @@ -555,9 +555,9 @@ pst_process_item (PstImporter *m, pst_desc_ll *d_ptr) if (item->message_store != NULL) { pst_error_msg ("A second message_store has been found - ignored"); pst_freeItem (item); - return; + return; } - + if (item->folder != NULL) { pst_process_folder (m, item); camel_operation_start (NULL, _("Importing `%s'"), item->file_as); @@ -567,7 +567,7 @@ pst_process_item (PstImporter *m, pst_desc_ll *d_ptr) } else { camel_operation_progress (NULL, 100); } - + if (item->email != NULL && (item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT)) { @@ -599,12 +599,12 @@ pst_process_item (PstImporter *m, pst_desc_ll *d_ptr) } } - + m->current_item++; } pst_freeItem (item); - + if (d_ptr->next == NULL) { camel_operation_end (NULL); } @@ -660,7 +660,7 @@ pst_process_folder (PstImporter *m, pst_item *item) gchar *uri; g_free (m->folder_name); g_free (m->folder_uri); - + if (item->file_as != NULL) { m->folder_name = foldername_to_utf8 (item->file_as); } else { @@ -670,7 +670,7 @@ pst_process_folder (PstImporter *m, pst_item *item) uri = g_strjoin ("/", m->parent_uri, m->folder_name, NULL); m->folder_uri = uri; - + if (m->folder) { camel_object_unref (m->folder); m->folder = NULL; @@ -721,7 +721,7 @@ pst_create_folder (PstImporter *m) } m->folder = mail_tool_uri_to_folder (m->folder_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); - + } /** @@ -757,7 +757,7 @@ attachment_to_part (PstImporter *m, pst_item_attach *attach) char *buf = NULL; size_t size; size = pst_attach_to_mem (&m->pst, attach, &buf); - + camel_mime_part_set_content (part, (char*) buf, size, mimetype); free(buf); } @@ -773,7 +773,7 @@ pst_process_email (PstImporter *m, pst_item *item) CamelMultipart *mp; CamelMimePart *part; CamelMessageInfo *info; - + if (m->folder == NULL) { pst_create_folder (m); } @@ -784,7 +784,7 @@ pst_process_email (PstImporter *m, pst_item *item) if (item->email->subject != NULL) { gchar *subj; - + subj = string_to_utf8 (item->email->subject->subj); if (subj == NULL) { g_warning ("Could not convert email subject to utf8: %s", item->email->subject->subj); @@ -796,7 +796,7 @@ pst_process_email (PstImporter *m, pst_item *item) } addr = camel_internet_address_new (); - + if (item->email->outlook_sender_name != NULL && item->email->outlook_sender != NULL) { camel_internet_address_add (addr, item->email->outlook_sender_name, item->email->outlook_sender); } else if (item->email->outlook_sender_name != NULL) { @@ -807,7 +807,7 @@ pst_process_email (PstImporter *m, pst_item *item) /* Evo prints a warning if no from is set, so supply an empty address */ camel_internet_address_add (addr, "", ""); } - + camel_mime_message_set_from (msg, addr); camel_object_unref (addr); @@ -830,7 +830,7 @@ pst_process_email (PstImporter *m, pst_item *item) g_warning ("Error reading headers, skipped"); } else { - + if (item->email->sentto_address != NULL) { addr = camel_internet_address_new (); @@ -849,9 +849,9 @@ pst_process_email (PstImporter *m, pst_item *item) camel_object_unref (addr); } } - + mp = camel_multipart_new (); - + if (item->attach != NULL) { camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/mixed"); @@ -909,7 +909,7 @@ pst_process_email (PstImporter *m, pst_item *item) } else if (item->email->body) { camel_mime_part_set_content (CAMEL_MIME_PART (msg), item->email->body, strlen (item->email->body), "text/plain"); } else { - g_warning ("Email without body. Subject:%s", + g_warning ("Email without body. Subject:%s", (item->email->subject->subj ? item->email->subject->subj : "(empty)")); camel_mime_part_set_content (CAMEL_MIME_PART (msg), "\n", 1, "text/plain"); } @@ -925,7 +925,7 @@ pst_process_email (PstImporter *m, pst_item *item) if(item->email->flag && 0x08) camel_message_info_set_flags (info, CAMEL_MESSAGE_DRAFT, ~0); - + camel_folder_append_message (m->folder, msg, info, NULL, &m->ex); camel_message_info_free (info); camel_object_unref (msg); @@ -962,34 +962,34 @@ static void contact_set_address (EContact *contact, EContactField id, char *address, char *city, char *country, char *po_box, char *postal_code, char *state, char *street) { EContactAddress *eaddress; - + if (address || city || country || po_box || postal_code || state || street) { eaddress = g_new0 (EContactAddress, 1); if (po_box) { eaddress->po = g_strdup (po_box); } - //eaddress->ext = - + //eaddress->ext = + if (street) { eaddress->street = g_strdup (street); } - + if (city) { eaddress->locality = g_strdup (city); } - + if (state) { eaddress->region = g_strdup (state); } - + if (postal_code) { eaddress->code = g_strdup (postal_code); } - + if (country) { eaddress->country = g_strdup (country); } - + e_contact_set (contact, id, eaddress); } } @@ -1002,14 +1002,14 @@ contact_set_date (EContact *contact, EContactField id, FILETIME *date) struct tm tm; EContactDate *bday; bday = e_contact_date_new (); - + t1 = fileTimeToUnixTime (date, 0); gmtime_r (&t1, &tm); - + bday->year = tm.tm_year + 1900; bday->month = tm.tm_mon + 1; bday->day = tm.tm_mday; - + e_contact_set (contact, id, bday); } } @@ -1021,7 +1021,7 @@ pst_process_contact (PstImporter *m, pst_item *item) EContact *ec; c = item->contact; GString *notes; - + notes = g_string_sized_new (2048); ec = e_contact_new (); @@ -1055,27 +1055,27 @@ pst_process_contact (PstImporter *m, pst_item *item) } else { contact_set_string (ec, E_CONTACT_FULL_NAME, c->fullname); } - + /* unknown_field (ec, notes, "initials", c->initials); */ - + contact_set_string (ec, E_CONTACT_NICKNAME, c->nickname); - + contact_set_string (ec, E_CONTACT_ORG, c->company_name); contact_set_string (ec, E_CONTACT_ORG_UNIT, c->department); contact_set_string (ec, E_CONTACT_TITLE, c->job_title); - contact_set_address (ec,E_CONTACT_ADDRESS_WORK, - c->business_address, c->business_city, c->business_country, + contact_set_address (ec,E_CONTACT_ADDRESS_WORK, + c->business_address, c->business_city, c->business_country, c->business_po_box, c->business_postal_code, c->business_state, c->business_street); - - contact_set_address (ec,E_CONTACT_ADDRESS_HOME, - c->home_address, c->home_city, c->home_country, + + contact_set_address (ec,E_CONTACT_ADDRESS_HOME, + c->home_address, c->home_city, c->home_country, c->home_po_box, c->home_postal_code, c->home_state, c->home_street); - - contact_set_address (ec,E_CONTACT_ADDRESS_OTHER, - c->other_address, c->other_city, c->other_country, + + contact_set_address (ec,E_CONTACT_ADDRESS_OTHER, + c->other_address, c->other_city, c->other_country, c->other_po_box, c->other_postal_code, c->other_state, c->other_street); - + contact_set_string (ec, E_CONTACT_PHONE_ASSISTANT, c->assistant_phone); contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_FAX, c->business_fax); contact_set_string (ec, E_CONTACT_PHONE_BUSINESS, c->business_phone); @@ -1100,11 +1100,11 @@ pst_process_contact (PstImporter *m, pst_item *item) unknown_field (ec, notes, "billing_information", c->billing_information); contact_set_date (ec, E_CONTACT_BIRTH_DATE, c->birthday); /* contact_set_string (ec, E_CONTACT_CATEGORIES, c->??); */ - + contact_set_string (ec, E_CONTACT_EMAIL_1 , c->address1); contact_set_string (ec, E_CONTACT_EMAIL_2 , c->address2); contact_set_string (ec, E_CONTACT_EMAIL_3 , c->address3); - + /*unknown_field (ec, notes, "address1_desc" , c->address1_desc); unknown_field (ec, notes, "address1_transport" , c->address1_transport); unknown_field (ec, notes, "address2_desc" , c->address2_desc); @@ -1120,9 +1120,9 @@ pst_process_contact (PstImporter *m, pst_item *item) unknown_field (ec, notes, "customer_id", c->customer_id); unknown_field (ec, notes, "hobbies", c->hobbies); unknown_field (ec, notes, "followup", c->followup); - + contact_set_string (ec, E_CONTACT_FREEBUSY_URL , c->free_busy_address); - + unknown_field (ec, notes, "keyword", c->keyword); unknown_field (ec, notes, "language", c->language); unknown_field (ec, notes, "location", c->location); @@ -1134,7 +1134,7 @@ pst_process_contact (PstImporter *m, pst_item *item) unknown_field (ec, notes, "mileage", c->mileage); unknown_field (ec, notes, "org_id", c->org_id); contact_set_string (ec, E_CONTACT_ROLE, c->profession); - + contact_set_string (ec, E_CONTACT_SPOUSE , c->spouse_name); if (c->personal_homepage) { @@ -1145,7 +1145,7 @@ pst_process_contact (PstImporter *m, pst_item *item) } else if (c->business_homepage) { contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->business_homepage); } - + if (item->comment) { g_string_append_printf (notes, "%s\n", item->comment); } @@ -1156,7 +1156,7 @@ pst_process_contact (PstImporter *m, pst_item *item) contact_set_string (ec, E_CONTACT_NOTE, notes->str); g_string_free (notes, TRUE); - + e_book_add_contact (m->addressbook, ec, NULL); g_object_unref (ec); @@ -1188,7 +1188,7 @@ char *rfc2445_datetime_format (FILETIME *ft) { if (buffer == NULL) { buffer = malloc (30); // should be enough } - + stm = fileTimeToStructTM (ft); strftime (buffer, 30, "%Y%m%dT%H%M%SZ", stm); return buffer; @@ -1219,7 +1219,7 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta part = attachment_to_part(m, attach); orig_filename = camel_mime_part_get_filename(part); - + if (orig_filename == NULL) { g_warning("Ignoring unnamed attachment"); attach = attach->next; @@ -1229,10 +1229,10 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta tmp = camel_file_util_safe_filename (orig_filename); filename = g_strdup_printf ("%s-%s", uid, tmp); path = g_build_filename (store_dir, filename, NULL); - + g_free (tmp); g_free (filename); - + dirname = g_path_get_dirname(path); if (g_mkdir_with_parents(dirname, 0777) == -1) { g_warning("Could not create directory %s: %s", dirname, g_strerror(errno)); @@ -1241,7 +1241,7 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta continue; } g_free(dirname); - + if (g_access(path, F_OK) == 0) { if (g_access(path, W_OK) != 0) { g_warning("Could not write file %s - file exists", path); @@ -1249,21 +1249,21 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta continue; } } - + if (g_stat(path, &st) != -1 && !S_ISREG(st.st_mode)) { g_warning("Could not write file %s - not a file", path); attach = attach->next; continue; } - + if (!(stream = camel_stream_fs_new_with_name (path, O_WRONLY | O_CREAT | O_TRUNC, 0666))) { g_warning ("Could not create stream for file %s - %s", path, g_strerror (errno)); attach = attach->next; continue; } - + content = camel_medium_get_content_object (CAMEL_MEDIUM (part)); - + if (camel_data_wrapper_decode_to_stream (content, stream) == -1 || camel_stream_flush (stream) == -1) { @@ -1272,18 +1272,18 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta attach = attach->next; continue; } - + camel_object_unref (stream); - + uri = g_filename_to_uri (path, NULL, NULL); list = g_slist_append (list, g_strdup (uri)); g_free (uri); - + camel_object_unref (part); g_free (path); attach = attach->next; - + } g_free (store_dir); @@ -1296,13 +1296,13 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char { pst_item_appointment *a; pst_item_email *e; - + a = item->appointment; e = item->email; ECalComponentText text; struct icaltimetype tt_start, tt_end; ECalComponentDateTime dt_start, dt_end; - + if (item->create_date) { struct icaltimetype tt; tt = get_ical_date (item->create_date, FALSE); @@ -1313,7 +1313,7 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char tt = get_ical_date (item->modify_date, FALSE); e_cal_component_set_last_modified (ec, &tt); } - + if (e) { if (e->subject || e->proc_subject) { if (e->subject) { @@ -1332,11 +1332,11 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char l.data = &text; l.next = NULL; e_cal_component_set_description_list (ec, &l); - } + } } else { g_warning ("%s without subject / body!", type); } - + if (a->location) { e_cal_component_set_location (ec, a->location); } @@ -1391,19 +1391,19 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char case PST_APP_LABEL_PHONE_CALL: e_cal_component_set_categories (ec, "Phone-call"); break; } - + if (a->alarm || a->alarm_minutes) { ECalComponentAlarm *alarm; ECalComponentAlarmTrigger trigger; - + alarm = e_cal_component_alarm_new (); - + if (a->alarm_minutes) { trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START; trigger.u.rel_duration = icaldurationtype_from_int (- (a->alarm_minutes)*60); e_cal_component_alarm_set_trigger (alarm, trigger); } - + if (a->alarm) { if (a->alarm_filename) { e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_AUDIO); @@ -1414,19 +1414,19 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char e_cal_component_add_alarm (ec, alarm); e_cal_component_alarm_free(alarm); - + } - + if (a->recurrence != PST_APP_RECUR_NONE) { struct icalrecurrencetype r; GSList recur_list; - + icalrecurrencetype_clear (&r); r.interval = 1; /* Interval not implemented in libpst */ if (a->recurrence_end) { r.until = get_ical_date (a->recurrence_end, FALSE); } - + switch (a->recurrence_type) { case PST_APP_RECUR_DAILY: r.freq = ICAL_DAILY_RECURRENCE; break; @@ -1444,7 +1444,7 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char recur_list.next = NULL; e_cal_component_set_rrule_list (ec, &recur_list); } - + } static void @@ -1454,7 +1454,7 @@ pst_process_appointment (PstImporter *m, pst_item *item) ec = e_cal_component_new (); e_cal_component_set_new_vtype (ec, E_CAL_COMPONENT_EVENT); - + fill_calcomponent (m, item, ec, "appointment"); set_cal_attachments (m->calendar, ec, m, item->attach); @@ -1464,7 +1464,7 @@ pst_process_appointment (PstImporter *m, pst_item *item) } g_object_unref (ec); - + } static void @@ -1474,19 +1474,19 @@ pst_process_task (PstImporter *m, pst_item *item) ec = e_cal_component_new (); e_cal_component_set_new_vtype (ec, E_CAL_COMPONENT_TODO); - + fill_calcomponent (m, item, ec, "task"); set_cal_attachments (m->tasks, ec, m, item->attach); /* Note - libpst is missing many fields. E.g. task status, start/completion date, % complete */ - + if (!e_cal_create_object (m->tasks, e_cal_component_get_icalcomponent (ec), NULL, NULL)) { g_warning("Creation of task failed"); g_free(ec); } - + g_object_unref (ec); - + } static void @@ -1507,7 +1507,7 @@ pst_process_journal (PstImporter *m, pst_item *item) ECalComponentText text; struct icaltimetype tt_start, tt_end; ECalComponentDateTime dt_start, dt_end; - + if (j->start) { tt_start = get_ical_date (j->start, FALSE); dt_start.value = &tt_start; @@ -1515,7 +1515,7 @@ pst_process_journal (PstImporter *m, pst_item *item) e_cal_component_set_dtstart (ec, &dt_start); g_message ("journal start:%s", rfc2445_datetime_format (j->start)); } - + if (j->end) { tt_end = get_ical_date (j->end, FALSE); dt_end.value = &tt_end; @@ -1532,7 +1532,7 @@ pst_process_journal (PstImporter *m, pst_item *item) } g_object_unref (ec); - + } /* Print an error message - maybe later bring up an error dialog? */ @@ -1540,7 +1540,7 @@ static void pst_error_msg (const char *fmt, ...) { va_list ap; - + va_start (ap, fmt); g_critical (fmt, ap); va_end (ap); @@ -1628,11 +1628,11 @@ pst_import (EImport *ei, EImportTarget *target) m->import = ei; g_object_ref (m->import); m->target = target; - + m->parent_uri = NULL; m->folder_name = NULL; m->folder_uri = NULL; - + m->addressbook = NULL; m->calendar = NULL; m->tasks = NULL; @@ -1644,7 +1644,7 @@ pst_import (EImport *ei, EImportTarget *target) m->status = camel_operation_new (pst_status, m); id = m->base.seq; - + mail_msg_unordered_push (m); return id; @@ -1705,7 +1705,7 @@ pst_init (pst_file *pst, gchar *filename) DEBUG_INIT (d_log); DEBUG_REGISTER_CLOSE (); #endif - + DEBUG_ENT ("main"); if (pst_open (pst, filename) < 0) { pst_error_msg ("Error opening PST file %s", filename); diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index a901317dfb..943f0ed933 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -156,7 +156,7 @@ mount_ready_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) g_file_mount_enclosing_volume_finish (G_FILE (source_object), res, &error); if (error) { - + error_queue_add (g_strdup_printf (_("Mount of %s failed:"), ms->uri->location), error); if (ms) @@ -258,14 +258,14 @@ ask_question (GMountOperation *op, const char *message, const char *choices[]) gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", secondary); } - + if (choices) { - /* First count the items in the list then + /* First count the items in the list then * add the buttons in reverse order */ for (len = 0; choices[len] != NULL; len++) { ; } - + for (cnt = len - 1; cnt >= 0; cnt--) { gtk_dialog_add_button (GTK_DIALOG (dialog), choices[cnt], cnt); } @@ -294,7 +294,7 @@ mount_first (EPublishUri *uri, GFile *file, gboolean can_report_success) ms->can_report_success = can_report_success; g_signal_connect (ms->mount_op, "ask-password", G_CALLBACK (ask_password), ms); - g_signal_connect (ms->mount_op, "ask-question", G_CALLBACK (ask_question), ms); + g_signal_connect (ms->mount_op, "ask-question", G_CALLBACK (ask_question), ms); g_file_mount_enclosing_volume (file, G_MOUNT_MOUNT_NONE, ms->mount_op, NULL, mount_ready_cb, ms); } @@ -843,7 +843,7 @@ error_queue_show_idle (gpointer user_data) gboolean has_error = FALSE, has_info = FALSE; g_static_mutex_lock (&error_queue_lock); - + for (l = error_queue; l; l = l->next) { struct eq_data *data = l->data; diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index a4b3a44544..b28444458e 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/publish-format-fb.h b/plugins/publish-calendar/publish-format-fb.h index 4975aa107d..6d758f1465 100644 --- a/plugins/publish-calendar/publish-format-fb.h +++ b/plugins/publish-calendar/publish-format-fb.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c index 13962fc849..04e70ca8a8 100644 --- a/plugins/publish-calendar/publish-format-ical.c +++ b/plugins/publish-calendar/publish-format-ical.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/publish-format-ical.h b/plugins/publish-calendar/publish-format-ical.h index 4c32310b99..d4955ca9dd 100644 --- a/plugins/publish-calendar/publish-format-ical.h +++ b/plugins/publish-calendar/publish-format-ical.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c index 1ebe2cfefb..71b82c8e07 100644 --- a/plugins/publish-calendar/publish-location.c +++ b/plugins/publish-calendar/publish-location.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/publish-location.h b/plugins/publish-calendar/publish-location.h index 327cd986fd..a6afc2c272 100644 --- a/plugins/publish-calendar/publish-location.h +++ b/plugins/publish-calendar/publish-location.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index de58a02b5e..08e59513e8 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h index 94a1a71f00..8f45807bd8 100644 --- a/plugins/publish-calendar/url-editor-dialog.h +++ b/plugins/publish-calendar/url-editor-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c index 5e7a83fb29..ea9ab4bfb0 100644 --- a/plugins/python/python-plugin-loader.c +++ b/plugins/python/python-plugin-loader.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -26,7 +26,7 @@ #include "python-plugin-loader.h" -#define d(x) +#define d(x) static void *epp_parent_class; @@ -84,17 +84,17 @@ epp_invoke(EPlugin *ep, const char *name, void *data) p->pDict = PyModule_GetDict(p->pModule); if (epp->pClass) { - p->pClass = PyDict_GetItemString(p->pDict, epp->pClass); + p->pClass = PyDict_GetItemString(p->pDict, epp->pClass); } } if (p->pClass) { - if (PyCallable_Check(p->pClass)) - pInstance = PyObject_CallObject(p->pClass, NULL); + if (PyCallable_Check(p->pClass)) + pInstance = PyObject_CallObject(p->pClass, NULL); pValue = PyObject_CallMethod(pInstance, name, NULL); - + } else { pFunc = PyDict_GetItemString(p->pDict, name); diff --git a/plugins/python/python-plugin-loader.h b/plugins/python/python-plugin-loader.h index 86e94d667b..4f9656e119 100644 --- a/plugins/python/python-plugin-loader.h +++ b/plugins/python/python-plugin-loader.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 888ee40289..8846e8b4be 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -303,7 +303,7 @@ em_junk_sa_test_spamd_running (const gchar *binary, gboolean system) One time test to see if spamd is running with --allow-tell. The call to spamc should return 0 if it is. (Thanks to Karsten Bräckelmann for the idea). -*/ +*/ static void em_junk_sa_test_allow_tell (void) { @@ -711,8 +711,8 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target) argv[4] = "--local"; pthread_mutex_lock (&em_junk_sa_report_lock); - pipe_to_sa (msg, NULL, - (no_allow_tell ? argv : argv2), + pipe_to_sa (msg, NULL, + (no_allow_tell ? argv : argv2), &target->error); pthread_mutex_unlock (&em_junk_sa_report_lock); } @@ -748,8 +748,8 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) if (no_allow_tell && em_junk_sa_local_only) argv[4] = "--local"; pthread_mutex_lock (&em_junk_sa_report_lock); - pipe_to_sa (msg, NULL, - (no_allow_tell ? argv : argv2), + pipe_to_sa (msg, NULL, + (no_allow_tell ? argv : argv2), &target->error); pthread_mutex_unlock (&em_junk_sa_report_lock); } diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 663ba12671..2f9c92d6f7 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/save-calendar/format-handler.h b/plugins/save-calendar/format-handler.h index 0174bfc078..a7bc2e8d85 100644 --- a/plugins/save-calendar/format-handler.h +++ b/plugins/save-calendar/format-handler.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index a537bf4641..f538a9e0a1 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index b1c8257a41..9c9f864a2a 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index 7e21b23f9e..e461821242 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/select-one-source/select-one-source.c b/plugins/select-one-source/select-one-source.c index e45ef2debf..c211814151 100644 --- a/plugins/select-one-source/select-one-source.c +++ b/plugins/select-one-source/select-one-source.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 766f379c6c..71fb4d4ff1 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/subject-thread/subject-thread.c b/plugins/subject-thread/subject-thread.c index 595f938414..6c008c71ae 100644 --- a/plugins/subject-thread/subject-thread.c +++ b/plugins/subject-thread/subject-thread.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 02983f1f36..a871399754 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -74,14 +74,14 @@ static void reply_with_template (EPopup *ep, EPopupItem *item, void *data); static void popup_free (EPopup *ep, GSList *l, void *data); -static GSList *fill_submenu (CamelStore *store, - CamelFolderInfo *info, - GSList *list, +static GSList *fill_submenu (CamelStore *store, + CamelFolderInfo *info, + GSList *list, EMPopupTargetSelect *t); -static GSList *append_to_menu (CamelFolder *folder, - GPtrArray *uids, - GSList *list, +static GSList *append_to_menu (CamelFolder *folder, + GPtrArray *uids, + GSList *list, EMPopupTargetSelect *t); void org_gnome_templates_popup (EPlugin *ep, EMPopupTargetSelect *t); @@ -98,7 +98,7 @@ static void key_cell_edited_callback (GtkCellRendererText *cell, gchar *path_st gchar *new_text,UIData *ui); static void value_cell_edited_callback (GtkCellRendererText *cell, gchar *path_string, - gchar *new_text,UIData *ui); + gchar *new_text,UIData *ui); static gboolean clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, UIData *ui); @@ -145,16 +145,16 @@ commit_changes (UIData *ui) while (valid) { char *keyword, *value; char *key; - + gtk_tree_model_get (model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1); gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1); /* Check if the keyword and value are not empty */ - if ((keyword) && (value) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0) + if ((keyword) && (value) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0) && (g_utf8_strlen(g_strstrip(value), -1) > 0)) { key = g_strdup_printf("%s=%s", keyword, value); clue_list = g_slist_append (clue_list, key); - } + } valid = gtk_tree_model_iter_next (model, &iter); } @@ -229,7 +229,7 @@ key_cell_edited_callback (GtkCellRendererText *cell, gtk_tree_model_get_iter_from_string (model, &iter, path_string); - gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1); + gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1); gtk_list_store_set (GTK_LIST_STORE (model), &iter, CLUE_KEYWORD_COLUMN, new_text, CLUE_VALUE_COLUMN, value, -1); @@ -249,7 +249,7 @@ value_cell_edited_callback (GtkCellRendererText *cell, model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview)); gtk_tree_model_get_iter_from_string (model, &iter, path_string); - + gtk_tree_model_get (model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1); gtk_list_store_set (GTK_LIST_STORE (model), &iter, @@ -491,9 +491,9 @@ get_content (CamelMimeMessage *message) g_free (str); return convert_str; } - else + else return str; - + } static void @@ -509,8 +509,8 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data) templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES); /* Get from the currently selected folder, the currently selected message */ - reply_to = camel_folder_get_message (userdata->t->folder, - g_ptr_array_index (userdata->t->uids, 0), + reply_to = camel_folder_get_message (userdata->t->folder, + g_ptr_array_index (userdata->t->uids, 0), NULL); /* The message we'll be using has been stored when building the menu */ @@ -525,8 +525,8 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data) header = ((CamelMimePart *)reply_to)->headers; while (header) { if (g_ascii_strncasecmp (header->name, "content-", 8) != 0) { - camel_medium_add_header((CamelMedium *) new, - header->name, + camel_medium_add_header((CamelMedium *) new, + header->name, header->value); } header = header->next; @@ -538,15 +538,15 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data) cont = get_content (template); /* Set the To: field to the same To: field of the message we are replying to. */ - camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_TO, + camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_TO, camel_mime_message_get_from (reply_to)); /* Copy the CC and BCC from the template.*/ - camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_CC, + camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_CC, camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_CC)); - camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_BCC, + camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_BCC, camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_BCC)); camel_mime_part_set_content((CamelMimePart *)new, @@ -558,7 +558,7 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data) camel_object_unref(new); } -static void +static void popup_free (EPopup *ep, GSList *l, void *data) { g_slist_free (l); @@ -588,10 +588,10 @@ static GSList /* If this uid is trashed, ignore it */ if (camel_folder_get_message_flags (folder, uid) & CAMEL_MESSAGE_DELETED) continue; - + /* Get the message for this uid */ - message = camel_folder_get_message (folder, - uid, + message = camel_folder_get_message (folder, + uid, NULL); subject = camel_mime_message_get_subject (message); @@ -617,7 +617,7 @@ static GSList return list; } -static GSList +static GSList *fill_submenu (CamelStore *store, CamelFolderInfo *info, GSList *list, EMPopupTargetSelect *t) { while (info) { @@ -629,7 +629,7 @@ static GSList item = g_slice_alloc0(sizeof(*item)); item->type = E_POPUP_SUBMENU; - item->label = folder->name; + item->label = folder->name; item->visible = EM_POPUP_SELECT_MANY | EM_POPUP_SELECT_ONE; /* To avoid having a Templates dir, we ignore the top level */ @@ -670,9 +670,9 @@ org_gnome_templates_popup (EPlugin *ep, EMPopupTargetSelect *t) templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES); - templates_info = camel_store_get_folder_info (store, - templates_folder->full_name, - CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST, + templates_info = camel_store_get_folder_info (store, + templates_folder->full_name, + CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST, NULL); /* Get subfolders and fill it */ diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index f0152862f3..ae0dc378da 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -38,7 +38,7 @@ #include #elif defined HAVE_LIBYTNEF_YTNEF_H #include -#endif +#endif #include #include diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index e2b9e17272..fa0077f807 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c index 012a541d27..79d4744c56 100644 --- a/plugins/webdav-account-setup/webdav-contacts-source.c +++ b/plugins/webdav-account-setup/webdav-contacts-source.c @@ -311,7 +311,7 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) uidata->username_entry = GTK_ENTRY(gtk_entry_new()); gtk_box_pack_start(hbox, GTK_WIDGET(uidata->username_entry), TRUE, TRUE, 0); - + hbox = GTK_BOX(gtk_hbox_new(FALSE, 10)); gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0); diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index cff9369aee..18092979d2 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h index 474dba871d..927fcf0120 100644 --- a/shell/e-component-registry.h +++ b/shell/e-component-registry.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-component-view.c b/shell/e-component-view.c index cbe59529c4..b87078e974 100644 --- a/shell/e-component-view.c +++ b/shell/e-component-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-component-view.h b/shell/e-component-view.h index 96a48d1e02..51004e489e 100644 --- a/shell/e-component-view.h +++ b/shell/e-component-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c index 09c9281ab7..9aa71d3278 100644 --- a/shell/e-config-upgrade.c +++ b/shell/e-config-upgrade.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-config-upgrade.h b/shell/e-config-upgrade.h index 27d9393058..f4580425bd 100644 --- a/shell/e-config-upgrade.h +++ b/shell/e-config-upgrade.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c index 603a8fd21f..f0fc89298c 100644 --- a/shell/e-corba-config-page.c +++ b/shell/e-corba-config-page.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-corba-config-page.h b/shell/e-corba-config-page.h index 9a6747cf22..8f0690ff69 100644 --- a/shell/e-corba-config-page.h +++ b/shell/e-corba-config-page.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-constants.h b/shell/e-shell-constants.h index 25aec79d6f..13beed8aec 100644 --- a/shell/e-shell-constants.h +++ b/shell/e-shell-constants.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index cb990f973b..74a89cc2ec 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-importer.h b/shell/e-shell-importer.h index f4489c3020..d9dffcfb0b 100644 --- a/shell/e-shell-importer.h +++ b/shell/e-shell-importer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index f7e4d3e63b..f51a565486 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 4d735eba7d..291a46c187 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-settings-dialog.h b/shell/e-shell-settings-dialog.h index 90c09627e2..55cce4a52f 100644 --- a/shell/e-shell-settings-dialog.h +++ b/shell/e-shell-settings-dialog.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 022e7ecca1..a6d071cc78 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index f284604d92..dd500efa94 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index cdd9e3b82e..6f180012cb 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-window-commands.h b/shell/e-shell-window-commands.h index 3d3843c8f0..0696a8a5d0 100644 --- a/shell/e-shell-window-commands.h +++ b/shell/e-shell-window-commands.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 548e987588..83e537c31b 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -321,7 +321,7 @@ switch_view (EShellWindow *window, ComponentView *component_view) } if (component_view->title == NULL) { - /* To translators: This is the window title and %s is the + /* To translators: This is the window title and %s is the component name. Most translators will want to keep it as is. */ title = g_strdup_printf (_("%s - Evolution"), info->button_label); gtk_window_set_title (GTK_WINDOW (window), title); @@ -343,7 +343,7 @@ switch_view (EShellWindow *window, ComponentView *component_view) /** @Event: Shell component activated or switched to. * @Id: component.activated * @Target: ESEventTargetComponent - * + * * This event is emitted whenever the shell successfully activates component * view. */ @@ -408,7 +408,7 @@ update_offline_toggle_status (EShellWindow *window) static void update_send_receive_sensitivity (EShellWindow *window) { - if (e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_OFFLINE || + if (e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_OFFLINE || e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_FORCED_OFFLINE) bonobo_ui_component_set_prop (window->priv->ui_component, "/commands/SendReceive", diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h index d94aef0f4f..869352b01c 100644 --- a/shell/e-shell-window.h +++ b/shell/e-shell-window.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell.c b/shell/e-shell.c index 061071efb8..9b4e6bc53a 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell.h b/shell/e-shell.h index ab16ea819e..e8451e3b5b 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -10,11 +10,11 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: - * Ettore Perazzoli + * Ettore Perazzoli * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index 7b8ba1a53a..d4c02e63ce 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-sidebar.h b/shell/e-sidebar.h index a3d3b43fee..2585592363 100644 --- a/shell/e-sidebar.h +++ b/shell/e-sidebar.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index ef58e3d659..a49d7dbdc4 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-user-creatable-items-handler.h b/shell/e-user-creatable-items-handler.h index 5d51612539..b9be272af1 100644 --- a/shell/e-user-creatable-items-handler.h +++ b/shell/e-user-creatable-items-handler.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/es-event.c b/shell/es-event.c index 8aeeb7b912..43a55c3fd5 100644 --- a/shell/es-event.c +++ b/shell/es-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/es-event.h b/shell/es-event.h index ed248d11df..5ac363b8c8 100644 --- a/shell/es-event.h +++ b/shell/es-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/es-menu.c b/shell/es-menu.c index ac2736b52a..3b459268a3 100644 --- a/shell/es-menu.c +++ b/shell/es-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/es-menu.h b/shell/es-menu.h index 89f60112c6..9e9e0613b0 100644 --- a/shell/es-menu.h +++ b/shell/es-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-component.c b/shell/evolution-component.c index 62cddb6a32..49824c9545 100644 --- a/shell/evolution-component.c +++ b/shell/evolution-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-component.h b/shell/evolution-component.h index 9202829708..302263a657 100644 --- a/shell/evolution-component.h +++ b/shell/evolution-component.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c index 35044c9dba..a0d3f473a2 100644 --- a/shell/evolution-config-control.c +++ b/shell/evolution-config-control.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-config-control.h b/shell/evolution-config-control.h index 10e320c4a8..59d7aba210 100644 --- a/shell/evolution-config-control.h +++ b/shell/evolution-config-control.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-listener.c b/shell/evolution-listener.c index 516c04abb2..4bf9a76376 100644 --- a/shell/evolution-listener.c +++ b/shell/evolution-listener.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-listener.h b/shell/evolution-listener.h index c85ae53613..7b79b3bab8 100644 --- a/shell/evolution-listener.h +++ b/shell/evolution-listener.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c index 9dc1c3323b..a8ce855268 100644 --- a/shell/evolution-shell-component-utils.c +++ b/shell/evolution-shell-component-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h index eb04edae52..ce4fa11229 100644 --- a/shell/evolution-shell-component-utils.h +++ b/shell/evolution-shell-component-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c index 5f32241b17..06d30d5733 100644 --- a/shell/importer/evolution-importer-client.c +++ b/shell/importer/evolution-importer-client.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h index 35cde858d6..3ae4b2f7b0 100644 --- a/shell/importer/evolution-importer-client.h +++ b/shell/importer/evolution-importer-client.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c index e8256971f1..8915202d30 100644 --- a/shell/importer/evolution-importer-listener.c +++ b/shell/importer/evolution-importer-listener.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h index 7e09ff2da8..63f480e4dd 100644 --- a/shell/importer/evolution-importer-listener.h +++ b/shell/importer/evolution-importer-listener.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c index 9fb7e66f5e..f8e6847891 100644 --- a/shell/importer/evolution-importer.c +++ b/shell/importer/evolution-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h index a684aecfb2..4925fad4fc 100644 --- a/shell/importer/evolution-importer.h +++ b/shell/importer/evolution-importer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c index bce7d75fa8..d867c120b8 100644 --- a/shell/importer/evolution-intelligent-importer.c +++ b/shell/importer/evolution-intelligent-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-intelligent-importer.h b/shell/importer/evolution-intelligent-importer.h index 35ad7d0010..2d36d498e9 100644 --- a/shell/importer/evolution-intelligent-importer.h +++ b/shell/importer/evolution-intelligent-importer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c index 6503fc8ad6..20927d2742 100644 --- a/shell/importer/intelligent.c +++ b/shell/importer/intelligent.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/intelligent.h b/shell/importer/intelligent.h index bbdf00cc18..5f5f7187f2 100644 --- a/shell/importer/intelligent.h +++ b/shell/importer/intelligent.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/main.c b/shell/main.c index 5ffe316c26..c6959d7663 100644 --- a/shell/main.c +++ b/shell/main.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -398,7 +398,7 @@ idle_cb (gchar **uris) bonobo_main_quit (); } - /* This must be done after Bonobo has created all the components. For + /* This must be done after Bonobo has created all the components. For * example the mail component makes the global variable `session` which * is being used by several EPlugins */ @@ -630,7 +630,7 @@ main (int argc, char **argv) client = gconf_client_get_default (); #ifdef DEVELOPMENT - + if (force_migrate) { destroy_config (client); } diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c index 16aed882d0..9fdeab7a3f 100644 --- a/shell/test/evolution-test-component.c +++ b/shell/test/evolution-test-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/test/evolution-test-component.h b/shell/test/evolution-test-component.h index 18a86f1baf..18dd40c7ff 100644 --- a/shell/test/evolution-test-component.h +++ b/shell/test/evolution-test-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c index f0d6cea90f..f3a47e1181 100644 --- a/smime/gui/ca-trust-dialog.c +++ b/smime/gui/ca-trust-dialog.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/ca-trust-dialog.h b/smime/gui/ca-trust-dialog.h index 1ebd05e780..ec7979d818 100644 --- a/smime/gui/ca-trust-dialog.h +++ b/smime/gui/ca-trust-dialog.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c index 0b82182972..0e4af90edc 100644 --- a/smime/gui/cert-trust-dialog.c +++ b/smime/gui/cert-trust-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/cert-trust-dialog.h b/smime/gui/cert-trust-dialog.h index a9c3e9ca8b..abdeb4d2ff 100644 --- a/smime/gui/cert-trust-dialog.h +++ b/smime/gui/cert-trust-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index 2d1c8c17c4..c5261e879b 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/certificate-manager.h b/smime/gui/certificate-manager.h index 6a0898d6e2..73d3688859 100644 --- a/smime/gui/certificate-manager.h +++ b/smime/gui/certificate-manager.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c index 5c587139a5..997bbace46 100644 --- a/smime/gui/certificate-viewer.c +++ b/smime/gui/certificate-viewer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/certificate-viewer.h b/smime/gui/certificate-viewer.h index 2f088dd6c3..6cfa7f63ab 100644 --- a/smime/gui/certificate-viewer.h +++ b/smime/gui/certificate-viewer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/component.c b/smime/gui/component.c index 339adabbbf..1096aa2a5e 100644 --- a/smime/gui/component.c +++ b/smime/gui/component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/component.h b/smime/gui/component.h index 5a7492a342..a41c4d1209 100644 --- a/smime/gui/component.h +++ b/smime/gui/component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c index 770f95c1cd..0ac946b5b8 100644 --- a/smime/gui/e-cert-selector.c +++ b/smime/gui/e-cert-selector.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h index 542a211745..85cfa0ba9f 100644 --- a/smime/gui/e-cert-selector.h +++ b/smime/gui/e-cert-selector.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/lib/e-asn1-object.h b/smime/lib/e-asn1-object.h index d0cdb05d27..0c976dd827 100644 --- a/smime/lib/e-asn1-object.h +++ b/smime/lib/e-asn1-object.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/lib/e-cert-db.h b/smime/lib/e-cert-db.h index b3a69632d1..f628ba2073 100644 --- a/smime/lib/e-cert-db.h +++ b/smime/lib/e-cert-db.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/lib/e-cert-trust.h b/smime/lib/e-cert-trust.h index 65a925d7bb..6b515b1a24 100644 --- a/smime/lib/e-cert-trust.h +++ b/smime/lib/e-cert-trust.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/lib/e-cert.h b/smime/lib/e-cert.h index e152031a5d..63125c1871 100644 --- a/smime/lib/e-cert.h +++ b/smime/lib/e-cert.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/lib/e-pkcs12.h b/smime/lib/e-pkcs12.h index 950a2d3899..5717edb14c 100644 --- a/smime/lib/e-pkcs12.h +++ b/smime/lib/e-pkcs12.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Chris Toshok diff --git a/smime/tests/import-cert.c b/smime/tests/import-cert.c index 420afe78b8..b202053e6d 100644 --- a/smime/tests/import-cert.c +++ b/smime/tests/import-cert.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/tools/killev.c b/tools/killev.c index 797e9230b5..d26093986f 100644 --- a/tools/killev.c +++ b/tools/killev.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index b60fdf4ca2..80a4485739 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -101,9 +101,9 @@ static void set_map_timezone (ETimezoneDialog *etd, static void on_combo_changed (GtkComboBox *combo, ETimezoneDialog *etd); -static void timezone_combo_get_active_text (GtkComboBox *combo, +static void timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name); -static gboolean timezone_combo_set_active_text (GtkComboBox *combo, +static gboolean timezone_combo_set_active_text (GtkComboBox *combo, const char *zone_name); static void map_destroy_cb (gpointer data, @@ -793,7 +793,7 @@ on_combo_changed (GtkComboBox *combo_box, ETimezoneDialog *etd) set_map_timezone (etd, map_zone); } -static void +static void timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name) { GtkTreeModel *list_store; @@ -802,13 +802,13 @@ timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name) list_store = gtk_combo_box_get_model (combo); /* Get the active iter in the list */ - if (gtk_combo_box_get_active_iter (combo, &iter)) + if (gtk_combo_box_get_active_iter (combo, &iter)) gtk_tree_model_get (list_store, &iter, 0, zone_name, -1); - else + else *zone_name = ""; } -static gboolean +static gboolean timezone_combo_set_active_text (GtkComboBox *combo, const char *zone_name) { GtkTreeModel *list_store; @@ -818,7 +818,7 @@ timezone_combo_set_active_text (GtkComboBox *combo, const char *zone_name) list_store = gtk_combo_box_get_model (combo); index = (GHashTable *) g_object_get_data (G_OBJECT (list_store), "index"); - if (zone_name && *zone_name) + if (zone_name && *zone_name) id = g_hash_table_lookup (index, zone_name); gtk_combo_box_set_active (combo, GPOINTER_TO_INT (id)); diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.h b/widgets/e-timezone-dialog/e-timezone-dialog.h index 0da1112276..8992d40c2d 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.h +++ b/widgets/e-timezone-dialog/e-timezone-dialog.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index 69778e4f3d..e820a51a6a 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h index 08be5de0f9..14112dfdb3 100644 --- a/widgets/menus/gal-define-views-dialog.h +++ b/widgets/menus/gal-define-views-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c index 737c800bca..9f67473c32 100644 --- a/widgets/menus/gal-define-views-model.c +++ b/widgets/menus/gal-define-views-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h index f1adb8038c..d0ccfb16b9 100644 --- a/widgets/menus/gal-define-views-model.h +++ b/widgets/menus/gal-define-views-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index 890ee3ea7f..c32e791809 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h index cf6871edd1..83e5217131 100644 --- a/widgets/menus/gal-view-collection.h +++ b/widgets/menus/gal-view-collection.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c index 780e430e88..89ce837686 100644 --- a/widgets/menus/gal-view-etable.c +++ b/widgets/menus/gal-view-etable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h index af03abb8e0..fdc34b2710 100644 --- a/widgets/menus/gal-view-etable.h +++ b/widgets/menus/gal-view-etable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c index 05cf09707e..52f759ab37 100644 --- a/widgets/menus/gal-view-factory-etable.c +++ b/widgets/menus/gal-view-factory-etable.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h index cd89717bde..440d6c6d22 100644 --- a/widgets/menus/gal-view-factory-etable.h +++ b/widgets/menus/gal-view-factory-etable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c index 7f740bc350..5b100654de 100644 --- a/widgets/menus/gal-view-factory.c +++ b/widgets/menus/gal-view-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h index a2f78098f7..d2c4b4aa45 100644 --- a/widgets/menus/gal-view-factory.h +++ b/widgets/menus/gal-view-factory.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index bad4c20bc6..02283c630e 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h index 5dbd43696e..2135bc560f 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.h +++ b/widgets/menus/gal-view-instance-save-as-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index 3b0e02c064..9e0e2eb7c9 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h index 37c8ad6869..787bc09713 100644 --- a/widgets/menus/gal-view-instance.h +++ b/widgets/menus/gal-view-instance.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index e663c6e4e4..4f76eb6cca 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-menus.h b/widgets/menus/gal-view-menus.h index 6124688f50..f565d07613 100644 --- a/widgets/menus/gal-view-menus.h +++ b/widgets/menus/gal-view-menus.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index 0822d83e2b..8bfc84fa15 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h index 75016bc589..d2acd5d301 100644 --- a/widgets/menus/gal-view-new-dialog.h +++ b/widgets/menus/gal-view-new-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c index 6509a7996d..fd3cdc2a5e 100644 --- a/widgets/menus/gal-view.c +++ b/widgets/menus/gal-view.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h index 0baba16761..b0ac4f3176 100644 --- a/widgets/menus/gal-view.h +++ b/widgets/menus/gal-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c index 21f30b697c..7663f0faee 100644 --- a/widgets/misc/e-account-combo-box.c +++ b/widgets/misc/e-account-combo-box.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-account-combo-box.h b/widgets/misc/e-account-combo-box.h index 87f7eb9704..b163278dcd 100644 --- a/widgets/misc/e-account-combo-box.h +++ b/widgets/misc/e-account-combo-box.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index e464353665..dd0bd60e9b 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -142,7 +142,7 @@ activity_info_new (const char *component_id, info->menu = NULL; info->error = NULL; info->cancel_func = NULL; - + return info; } @@ -209,7 +209,7 @@ setup_task_bar (EActivityHandler *activity_handler, g_object_set_data ((GObject *) task_widget, "activity-handler", activity_handler); g_object_set_data ((GObject *) task_widget, "activity", GINT_TO_POINTER(info->id)); g_object_set_data ((GObject *) task_widget, "error-type", GINT_TO_POINTER(info->error_type)); - g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget); + g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget); } } } @@ -360,14 +360,14 @@ e_activity_handler_attach_task_bar (EActivityHandler *activity_handler, } struct _cancel_wdata { - EActivityHandler *handler; + EActivityHandler *handler; ActivityInfo *info; guint id; void (*cancel)(gpointer); gpointer data; }; -static void +static void cancel_wrapper (gpointer pdata) { struct _cancel_wdata *data = (struct _cancel_wdata *) pdata; @@ -379,7 +379,7 @@ cancel_wrapper (gpointer pdata) int order, len; GSList *sp; GList *p = lookup_activity (handler->priv->activity_infos, data->id, &order); - e_logger_log (handler->priv->logger, E_LOG_ERROR, g_object_get_data (data->info->error, "primary"), + e_logger_log (handler->priv->logger, E_LOG_ERROR, g_object_get_data (data->info->error, "primary"), g_object_get_data (data->info->error, "secondary")); gtk_widget_destroy (data->info->error); data->info->error = NULL; @@ -388,7 +388,7 @@ cancel_wrapper (gpointer pdata) ETaskBar *task_bar; task_bar = E_TASK_BAR (sp->data); - e_task_bar_remove_task_from_id (task_bar, info->id); + e_task_bar_remove_task_from_id (task_bar, info->id); } activity_info_free (info); len = g_list_length (handler->priv->activity_infos); @@ -488,8 +488,8 @@ handle_error (ETaskWidget *task) id = GPOINTER_TO_UINT (g_object_get_data ((GObject *) task, "activity")); e_activity_handler_operation_finished (activity_handler, id); gtk_widget_show (error); - e_logger_log (activity_handler->priv->logger, error_type, - g_object_get_data ((GObject *) error, "primary"), + e_logger_log (activity_handler->priv->logger, error_type, + g_object_get_data ((GObject *) error, "primary"), g_object_get_data ((GObject *) error, "secondary")); } @@ -511,7 +511,7 @@ error_cleanup (EActivityHandler *activity_handler) berror = TRUE; if (info->error && info->error_time && (now - info->error_time) > 5 ) { /* Error older than wanted time. So cleanup */ - e_logger_log (priv->logger, info->error_type, g_object_get_data (info->error, "primary"), + e_logger_log (priv->logger, info->error_type, g_object_get_data (info->error, "primary"), g_object_get_data (info->error, "secondary")); if (GTK_IS_DIALOG (info->error)) @@ -530,7 +530,7 @@ error_cleanup (EActivityHandler *activity_handler) } activity_info_free (info); priv->activity_infos = g_list_remove_link (priv->activity_infos, node); - + } else p = p->next; } @@ -559,7 +559,7 @@ e_activity_handler_make_error (EActivityHandler *activity_handler, activity_info->error = error; activity_info->error_time = time (NULL); activity_info->error_type = error_type; - + img = error_type ? icon_data[1] : icon_data[0]; for (p = priv->task_bars; p != NULL; p = p->next) { ETaskBar *task_bar; @@ -567,17 +567,17 @@ e_activity_handler_make_error (EActivityHandler *activity_handler, GtkWidget *tool; task_bar = E_TASK_BAR (p->data); - task_widget = task_widget_new_from_activity_info (activity_info); + task_widget = task_widget_new_from_activity_info (activity_info); task_widget->id = activity_id; e_task_bar_prepend_task (E_TASK_BAR (p->data), task_widget); - + tool = e_task_widget_update_image (task_widget, (char *)img, information); g_object_set_data ((GObject *) task_widget, "tool", tool); g_object_set_data ((GObject *) task_widget, "error", error); g_object_set_data ((GObject *) task_widget, "activity-handler", activity_handler); g_object_set_data ((GObject *) task_widget, "activity", GINT_TO_POINTER(activity_id)); g_object_set_data ((GObject *) task_widget, "error-type", GINT_TO_POINTER(error_type)); - g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget); + g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget); } priv->activity_infos = g_list_prepend (priv->activity_infos, activity_info); diff --git a/widgets/misc/e-activity-handler.h b/widgets/misc/e-activity-handler.h index 5dc1820dd0..bf8d8e0095 100644 --- a/widgets/misc/e-activity-handler.h +++ b/widgets/misc/e-activity-handler.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c index a9c230bac7..d64dcafb4a 100644 --- a/widgets/misc/e-attachment-button.c +++ b/widgets/misc/e-attachment-button.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-button.h b/widgets/misc/e-attachment-button.h index 72592efefe..89ecccfe9b 100644 --- a/widgets/misc/e-attachment-button.h +++ b/widgets/misc/e-attachment-button.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c index e8c599aeea..e1037ae175 100644 --- a/widgets/misc/e-attachment-dialog.c +++ b/widgets/misc/e-attachment-dialog.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-dialog.h b/widgets/misc/e-attachment-dialog.h index e8ed583b18..503dcbbc67 100644 --- a/widgets/misc/e-attachment-dialog.h +++ b/widgets/misc/e-attachment-dialog.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-handler-image.c b/widgets/misc/e-attachment-handler-image.c index ba5f8d759c..a91b433c6e 100644 --- a/widgets/misc/e-attachment-handler-image.c +++ b/widgets/misc/e-attachment-handler-image.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-handler-image.h b/widgets/misc/e-attachment-handler-image.h index 44ff404a99..bade5cec5e 100644 --- a/widgets/misc/e-attachment-handler-image.h +++ b/widgets/misc/e-attachment-handler-image.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-handler.c b/widgets/misc/e-attachment-handler.c index 03af1eec9b..0a6ed0505d 100644 --- a/widgets/misc/e-attachment-handler.c +++ b/widgets/misc/e-attachment-handler.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-handler.h b/widgets/misc/e-attachment-handler.h index f95bc55123..e7e52c8c18 100644 --- a/widgets/misc/e-attachment-handler.h +++ b/widgets/misc/e-attachment-handler.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c index 0845f82a76..a7d8ad271c 100644 --- a/widgets/misc/e-attachment-icon-view.c +++ b/widgets/misc/e-attachment-icon-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-icon-view.h b/widgets/misc/e-attachment-icon-view.h index ab9360e42e..4aabf6c429 100644 --- a/widgets/misc/e-attachment-icon-view.h +++ b/widgets/misc/e-attachment-icon-view.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c index 3fed031473..a88f9fa8b2 100644 --- a/widgets/misc/e-attachment-paned.c +++ b/widgets/misc/e-attachment-paned.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-paned.h b/widgets/misc/e-attachment-paned.h index 076ab6033e..401ec581cb 100644 --- a/widgets/misc/e-attachment-paned.h +++ b/widgets/misc/e-attachment-paned.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c index 216a60d32a..2977be9593 100644 --- a/widgets/misc/e-attachment-store.c +++ b/widgets/misc/e-attachment-store.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-store.h b/widgets/misc/e-attachment-store.h index 9fdd74d493..46ca9e4aa6 100644 --- a/widgets/misc/e-attachment-store.h +++ b/widgets/misc/e-attachment-store.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c index f2c17cb078..42876e4bfb 100644 --- a/widgets/misc/e-attachment-tree-view.c +++ b/widgets/misc/e-attachment-tree-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-tree-view.h b/widgets/misc/e-attachment-tree-view.h index 7f16ba5ab2..4300ffa71f 100644 --- a/widgets/misc/e-attachment-tree-view.h +++ b/widgets/misc/e-attachment-tree-view.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index d2b676993d..41e0b302a2 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-view.h b/widgets/misc/e-attachment-view.h index 38480c30c4..89d2d28664 100644 --- a/widgets/misc/e-attachment-view.h +++ b/widgets/misc/e-attachment-view.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index e4e336e58b..e9df6024bc 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h index 934e1e04b6..d7cfb5be06 100644 --- a/widgets/misc/e-attachment.h +++ b/widgets/misc/e-attachment.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index 32e74dd535..be3751f852 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin @@ -1386,9 +1386,9 @@ get_digit_fomat () if (major > 2 || minor > 2 || (minor == 2 && revision > 2)) { return "%Id"; - } + } #endif - + return "%d"; } @@ -1984,7 +1984,7 @@ e_calendar_item_recalc_sizes (ECalendarItem *calitem) for (digit = 0; digit < 10; digit++) { gchar locale_digit[5]; int locale_digit_len; - + locale_digit_len = sprintf (locale_digit, get_digit_fomat (), digit); pango_layout_set_text (layout, locale_digit, locale_digit_len); diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h index 0032e12a6c..c0ee9a43bc 100644 --- a/widgets/misc/e-calendar-item.h +++ b/widgets/misc/e-calendar-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c index 824a79d4e0..88e59b87db 100644 --- a/widgets/misc/e-calendar.c +++ b/widgets/misc/e-calendar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h index aebc615cfc..7a3c8fd010 100644 --- a/widgets/misc/e-calendar.h +++ b/widgets/misc/e-calendar.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index 4d300f01d4..181d7887d4 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas-background.h b/widgets/misc/e-canvas-background.h index 5d75735c12..562987e7d7 100644 --- a/widgets/misc/e-canvas-background.h +++ b/widgets/misc/e-canvas-background.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c index c46f64c199..62ea6c54ef 100644 --- a/widgets/misc/e-canvas-utils.c +++ b/widgets/misc/e-canvas-utils.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h index fa09a86c25..cda34e99b5 100644 --- a/widgets/misc/e-canvas-utils.h +++ b/widgets/misc/e-canvas-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c index 377a7a2605..3d4e879c0c 100644 --- a/widgets/misc/e-canvas-vbox.c +++ b/widgets/misc/e-canvas-vbox.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h index 51602e77de..7fa38fa778 100644 --- a/widgets/misc/e-canvas-vbox.h +++ b/widgets/misc/e-canvas-vbox.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 40aaf7d510..055f0311f4 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h index e06bed7824..00692c457a 100644 --- a/widgets/misc/e-canvas.h +++ b/widgets/misc/e-canvas.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index 76450b8f5f..e994120b33 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cell-date-edit.h b/widgets/misc/e-cell-date-edit.h index 30dee535e8..2e125fece3 100644 --- a/widgets/misc/e-cell-date-edit.h +++ b/widgets/misc/e-cell-date-edit.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c index 94e33489e5..194a7bd6b6 100644 --- a/widgets/misc/e-cell-percent.c +++ b/widgets/misc/e-cell-percent.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cell-percent.h b/widgets/misc/e-cell-percent.h index 46a7ddc3e3..5e202dfa82 100644 --- a/widgets/misc/e-cell-percent.h +++ b/widgets/misc/e-cell-percent.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cell-renderer-combo.c b/widgets/misc/e-cell-renderer-combo.c index 96f474d0d9..ab03c73f2b 100644 --- a/widgets/misc/e-cell-renderer-combo.c +++ b/widgets/misc/e-cell-renderer-combo.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cell-renderer-combo.h b/widgets/misc/e-cell-renderer-combo.h index 547eca7e7a..515ed75256 100644 --- a/widgets/misc/e-cell-renderer-combo.h +++ b/widgets/misc/e-cell-renderer-combo.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index 6c7233ab9f..5d1f8c036a 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -444,7 +444,7 @@ e_charset_picker_dialog (const char *title, const char *prompt, * locale character set * @callback: a callback function for actions in the group, or %NULL * @user_data: user data to be passed to @callback, or %NULL - * + * * Adds a set of #GtkRadioActions for available character sets to * @action_group. The @default_charset (or locale character set if * @default_charset is %NULL) will be added first, and selected by diff --git a/widgets/misc/e-charset-picker.h b/widgets/misc/e-charset-picker.h index 7250b10dfb..88c89fb308 100644 --- a/widgets/misc/e-charset-picker.h +++ b/widgets/misc/e-charset-picker.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c index c9c72d06d7..74fbdbf58c 100644 --- a/widgets/misc/e-colors.c +++ b/widgets/misc/e-colors.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h index 30ddfd496a..710ee59f59 100644 --- a/widgets/misc/e-colors.h +++ b/widgets/misc/e-colors.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c index aabb7073f1..dc978af91a 100644 --- a/widgets/misc/e-combo-button.c +++ b/widgets/misc/e-combo-button.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-combo-button.h b/widgets/misc/e-combo-button.h index 0abe347a93..edeb1be9bd 100644 --- a/widgets/misc/e-combo-button.h +++ b/widgets/misc/e-combo-button.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c index 5502a83a0d..8cee128619 100644 --- a/widgets/misc/e-combo-cell-editable.c +++ b/widgets/misc/e-combo-cell-editable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-combo-cell-editable.h b/widgets/misc/e-combo-cell-editable.h index d3f64a36d3..c37e786f84 100644 --- a/widgets/misc/e-combo-cell-editable.h +++ b/widgets/misc/e-combo-cell-editable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-config-page.c b/widgets/misc/e-config-page.c index c9823a29e8..00fb991578 100644 --- a/widgets/misc/e-config-page.c +++ b/widgets/misc/e-config-page.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-config-page.h b/widgets/misc/e-config-page.h index 24317d3f9d..886d89d851 100644 --- a/widgets/misc/e-config-page.h +++ b/widgets/misc/e-config-page.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c index f0b9ca6843..ebc2f9bd78 100644 --- a/widgets/misc/e-cursors.c +++ b/widgets/misc/e-cursors.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h index c22e295c7b..7df3404092 100644 --- a/widgets/misc/e-cursors.h +++ b/widgets/misc/e-cursors.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 2120483abf..701cf69444 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin @@ -1471,7 +1471,7 @@ e_date_edit_parse_date (EDateEdit *dedit, if (date_tm->tm_year > today_tm->tm_year) date_tm->tm_year -= 100; } - + return TRUE; } @@ -1725,7 +1725,7 @@ e_date_edit_update_date_entry (EDateEdit *dedit) if (priv->date_set_to_none || !priv->date_is_valid) { gtk_entry_set_text (GTK_ENTRY (priv->date_entry), _("None")); } else { - /* This is a strftime() format for a short date. + /* This is a strftime() format for a short date. %x the preferred date representation for the current locale without the time, but has forced to use 4 digit year */ char *format = e_time_get_d_fmt_with_4digit_year (); diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c index 6008f64ad9..00b2695e5f 100644 --- a/widgets/misc/e-dropdown-button.c +++ b/widgets/misc/e-dropdown-button.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h index b10fd9a670..bd4fe6feb4 100644 --- a/widgets/misc/e-dropdown-button.h +++ b/widgets/misc/e-dropdown-button.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 2dffb39cac..9a67636939 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index 4178070405..8f06c867ae 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c index 4e0b099944..6acbe920ef 100644 --- a/widgets/misc/e-gui-utils.c +++ b/widgets/misc/e-gui-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h index d0a54f7c42..840a55289b 100644 --- a/widgets/misc/e-gui-utils.h +++ b/widgets/misc/e-gui-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 7d504685a5..d3b5a1ac07 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h index 0e78026683..b7f599f0c1 100644 --- a/widgets/misc/e-image-chooser.h +++ b/widgets/misc/e-image-chooser.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-info-label.c b/widgets/misc/e-info-label.c index e1959607fb..e6db111a74 100644 --- a/widgets/misc/e-info-label.c +++ b/widgets/misc/e-info-label.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-info-label.h b/widgets/misc/e-info-label.h index 905a39b0ca..d4dd16e395 100644 --- a/widgets/misc/e-info-label.h +++ b/widgets/misc/e-info-label.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index f9742b597f..c2c0806178 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-map.h b/widgets/misc/e-map.h index 4d65c7b47b..0c915fb5fa 100644 --- a/widgets/misc/e-map.h +++ b/widgets/misc/e-map.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index 6cee26e75c..f78f764f03 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-multi-config-dialog.h b/widgets/misc/e-multi-config-dialog.h index 462d593c81..e8d9896d55 100644 --- a/widgets/misc/e-multi-config-dialog.h +++ b/widgets/misc/e-multi-config-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-online-button.c b/widgets/misc/e-online-button.c index dec24a6587..114d76ac32 100644 --- a/widgets/misc/e-online-button.c +++ b/widgets/misc/e-online-button.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/widgets/misc/e-online-button.h b/widgets/misc/e-online-button.h index 6576035a9d..03f676d75c 100644 --- a/widgets/misc/e-online-button.h +++ b/widgets/misc/e-online-button.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/widgets/misc/e-pilot-settings.c b/widgets/misc/e-pilot-settings.c index 80ad52d083..1bed8630c5 100644 --- a/widgets/misc/e-pilot-settings.c +++ b/widgets/misc/e-pilot-settings.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-pilot-settings.h b/widgets/misc/e-pilot-settings.h index fbba3b2f71..0c4fbd7a81 100644 --- a/widgets/misc/e-pilot-settings.h +++ b/widgets/misc/e-pilot-settings.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c index 1581d3e409..143eaff327 100644 --- a/widgets/misc/e-popup-menu.c +++ b/widgets/misc/e-popup-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h index 37589f4243..ddf6ed04a9 100644 --- a/widgets/misc/e-popup-menu.h +++ b/widgets/misc/e-popup-menu.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c index 7f2db7ecc4..05a219f901 100644 --- a/widgets/misc/e-printable.c +++ b/widgets/misc/e-printable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-printable.h b/widgets/misc/e-printable.h index d0d3223dbf..32cbadddbd 100644 --- a/widgets/misc/e-printable.h +++ b/widgets/misc/e-printable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c index eae3d43324..d24b915e6e 100644 --- a/widgets/misc/e-reflow-model.c +++ b/widgets/misc/e-reflow-model.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-reflow-model.h b/widgets/misc/e-reflow-model.h index 7482e5079f..c772621d07 100644 --- a/widgets/misc/e-reflow-model.h +++ b/widgets/misc/e-reflow-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index f51a502a83..129046a89e 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h index 6d67369209..69f34d0fd9 100644 --- a/widgets/misc/e-reflow.h +++ b/widgets/misc/e-reflow.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index d3d579178d..2bbbc91a00 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1048,7 +1048,7 @@ e_search_bar_construct (ESearchBar *search_bar, label = gtk_label_new_with_mnemonic (_(" i_n ")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), label, FALSE, FALSE, 0); - + search_bar->scopeoption = gtk_option_menu_new (); /* g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */ gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), search_bar->scopeoption, FALSE, FALSE, 0); diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h index f2d9b0576b..fd91068ebd 100644 --- a/widgets/misc/e-search-bar.h +++ b/widgets/misc/e-search-bar.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c index f45923c1dd..7e82039d6e 100644 --- a/widgets/misc/e-selection-model-array.c +++ b/widgets/misc/e-selection-model-array.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h index abbf828374..9f297c1fed 100644 --- a/widgets/misc/e-selection-model-array.h +++ b/widgets/misc/e-selection-model-array.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c index f2856622ec..b9f1d33bfe 100644 --- a/widgets/misc/e-selection-model-simple.c +++ b/widgets/misc/e-selection-model-simple.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h index 2cd2ecabd3..7f11d3ac0e 100644 --- a/widgets/misc/e-selection-model-simple.h +++ b/widgets/misc/e-selection-model-simple.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c index 697bb68096..66187e6e7c 100644 --- a/widgets/misc/e-selection-model.c +++ b/widgets/misc/e-selection-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h index 18bbc2a115..24eccd304f 100644 --- a/widgets/misc/e-selection-model.h +++ b/widgets/misc/e-selection-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index 6c10a60c1c..8740f2d02e 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-send-options.h b/widgets/misc/e-send-options.h index 9a32357358..3ed5d6fd24 100644 --- a/widgets/misc/e-send-options.h +++ b/widgets/misc/e-send-options.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -20,7 +20,7 @@ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - + #ifndef __E_SENDOPTIONS_DIALOG_H__ #define __E_SENDOPTIONS_DIALOG_H__ diff --git a/widgets/misc/e-signature-combo-box.c b/widgets/misc/e-signature-combo-box.c index 9ebd20a0b2..cb11ba632f 100644 --- a/widgets/misc/e-signature-combo-box.c +++ b/widgets/misc/e-signature-combo-box.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-signature-combo-box.h b/widgets/misc/e-signature-combo-box.h index ec05c2b5d7..fac47518e1 100644 --- a/widgets/misc/e-signature-combo-box.h +++ b/widgets/misc/e-signature-combo-box.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c index 8400f298f7..c7a715decd 100644 --- a/widgets/misc/e-task-bar.c +++ b/widgets/misc/e-task-bar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -37,7 +37,7 @@ struct _ETaskBarPrivate G_DEFINE_TYPE (ETaskBar, e_task_bar, GTK_TYPE_HBOX) -#if 0 +#if 0 static void reduce_displayed_activities_per_component (ETaskBar *task_bar) { @@ -80,7 +80,7 @@ reduce_displayed_activities_per_component (ETaskBar *task_bar) g_hash_table_destroy (component_ids_hash); } -#endif +#endif static void impl_finalize (GObject *object); @@ -281,7 +281,7 @@ e_task_bar_get_task_widget_from_id (ETaskBar *task_bar, w = NULL; list = list->next; } - + return w; } diff --git a/widgets/misc/e-task-bar.h b/widgets/misc/e-task-bar.h index 363e062ee8..d36898ebb8 100644 --- a/widgets/misc/e-task-bar.h +++ b/widgets/misc/e-task-bar.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -66,7 +66,7 @@ void e_task_bar_prepend_task (ETaskBar *task_bar, ETaskWidget *task_widget); void e_task_bar_remove_task (ETaskBar *task_bar, int n); -ETaskWidget * e_task_bar_get_task_widget_from_id (ETaskBar *task_bar, +ETaskWidget * e_task_bar_get_task_widget_from_id (ETaskBar *task_bar, guint id); void e_task_bar_remove_task_from_id (ETaskBar *task_bar, diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c index d545613998..2569a46557 100644 --- a/widgets/misc/e-task-widget.c +++ b/widgets/misc/e-task-widget.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -106,7 +106,7 @@ prepare_popup (ETaskWidget *widget, GdkEventButton *event) if (event->button != 3) return FALSE; - + /* FIXME: Implement Cancel */ return TRUE; diff --git a/widgets/misc/e-task-widget.h b/widgets/misc/e-task-widget.h index e478e91145..4770b9d108 100644 --- a/widgets/misc/e-task-widget.h +++ b/widgets/misc/e-task-widget.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index cc50b39d95..2769001120 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-unicode.h b/widgets/misc/e-unicode.h index b0319b0f25..77d1a351cb 100644 --- a/widgets/misc/e-unicode.h +++ b/widgets/misc/e-unicode.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c index 32490f6590..6c8eab7c8b 100644 --- a/widgets/misc/e-url-entry.c +++ b/widgets/misc/e-url-entry.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-url-entry.h b/widgets/misc/e-url-entry.h index 1c051ac0e8..a4edc51df2 100644 --- a/widgets/misc/e-url-entry.h +++ b/widgets/misc/e-url-entry.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c index 10a463de12..6852010b24 100644 --- a/widgets/misc/test-calendar.c +++ b/widgets/misc/test-calendar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c index d359d120c4..7468053f31 100644 --- a/widgets/misc/test-dateedit.c +++ b/widgets/misc/test-dateedit.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c index 51143ff560..b76174fb0e 100644 --- a/widgets/misc/test-dropdown-button.c +++ b/widgets/misc/test-dropdown-button.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/test-error.c b/widgets/misc/test-error.c index c8b442b23a..e67e6985f5 100644 --- a/widgets/misc/test-error.c +++ b/widgets/misc/test-error.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/test-info-label.c b/widgets/misc/test-info-label.c index 2ef47483ed..31298ed7c1 100644 --- a/widgets/misc/test-info-label.c +++ b/widgets/misc/test-info-label.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/test-multi-config-dialog.c b/widgets/misc/test-multi-config-dialog.c index bc52f493c6..34a7624a39 100644 --- a/widgets/misc/test-multi-config-dialog.c +++ b/widgets/misc/test-multi-config-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c index 114c2b52a2..09e2187b82 100644 --- a/widgets/table/e-cell-checkbox.c +++ b/widgets/table/e-cell-checkbox.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-checkbox.h b/widgets/table/e-cell-checkbox.h index 79f55c371f..fa05ecbb06 100644 --- a/widgets/table/e-cell-checkbox.h +++ b/widgets/table/e-cell-checkbox.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 83c17d3c2f..80d6294b2d 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h index 2e801f3711..fafda30031 100644 --- a/widgets/table/e-cell-combo.h +++ b/widgets/table/e-cell-combo.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c index ac0274f183..92c0dd98b6 100644 --- a/widgets/table/e-cell-date.c +++ b/widgets/table/e-cell-date.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -54,7 +54,7 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) if (date == 0) { return g_strdup (_("?")); } - + tzset (); localtime_r (&date, &then); localtime_r (&nowdate, &now); diff --git a/widgets/table/e-cell-date.h b/widgets/table/e-cell-date.h index f7d24cf8a9..fece501726 100644 --- a/widgets/table/e-cell-date.h +++ b/widgets/table/e-cell-date.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c index f6cb11e509..f84d8761c7 100644 --- a/widgets/table/e-cell-hbox.c +++ b/widgets/table/e-cell-hbox.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h index d3cb84db6a..dc726960fa 100644 --- a/widgets/table/e-cell-hbox.h +++ b/widgets/table/e-cell-hbox.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c index 6d4e3925de..56754a05e5 100644 --- a/widgets/table/e-cell-number.c +++ b/widgets/table/e-cell-number.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-number.h b/widgets/table/e-cell-number.h index 006801d71d..75471f7a2c 100644 --- a/widgets/table/e-cell-number.h +++ b/widgets/table/e-cell-number.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index 4a2dde7f9b..ea141305b9 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -116,7 +116,7 @@ pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable, int real_x, real_y, real_w, real_h; int pix_w, pix_h; cairo_t *cr; - + cell_pixbuf = e_table_model_value_at (ecell_view->e_table_model, 1, row); @@ -155,7 +155,7 @@ pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable, gdk_cairo_set_source_pixbuf (cr, cell_pixbuf, real_x, real_y); cairo_paint_with_alpha (cr, 1); cairo_restore (cr); - cairo_destroy (cr); + cairo_destroy (cr); } static gint diff --git a/widgets/table/e-cell-pixbuf.h b/widgets/table/e-cell-pixbuf.h index 09918a4027..850e9d535d 100644 --- a/widgets/table/e-cell-pixbuf.h +++ b/widgets/table/e-cell-pixbuf.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index c291571c73..8a8918dc70 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h index 12e44cb8dc..c1262a1234 100644 --- a/widgets/table/e-cell-popup.h +++ b/widgets/table/e-cell-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c index 08a1c8aff9..ca4078512f 100644 --- a/widgets/table/e-cell-size.c +++ b/widgets/table/e-cell-size.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-size.h b/widgets/table/e-cell-size.h index 68ee4ebb7d..ed0d279f6b 100644 --- a/widgets/table/e-cell-size.h +++ b/widgets/table/e-cell-size.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index b86d709bca..3a03fe51e7 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h index c831b2edc2..d92b025aa5 100644 --- a/widgets/table/e-cell-text.h +++ b/widgets/table/e-cell-text.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 4fc6aca107..69dc1b27bb 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -141,7 +141,7 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable, image = toggle->images[value]; - + if ((x2 - x1) < gdk_pixbuf_get_width (image)){ x = x1; width = x2 - x1; @@ -149,7 +149,7 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable, x = x1 + ((x2 - x1) - gdk_pixbuf_get_width (image)) / 2; width = gdk_pixbuf_get_width (image); } - + if ((y2 - y1) < gdk_pixbuf_get_height (image)){ y = y1; height = y2 - y1; @@ -163,9 +163,9 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable, gdk_cairo_set_source_pixbuf (cr, image, x, y); cairo_paint_with_alpha (cr, 1); cairo_restore (cr); - cairo_destroy (cr); + cairo_destroy (cr); -} +} static void etog_set_value (ECellToggleView *toggle_view, int model_col, int view_col, int row, int value) diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h index 49e2afb018..97d16dc659 100644 --- a/widgets/table/e-cell-toggle.h +++ b/widgets/table/e-cell-toggle.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index af398ae872..1fd770ab6a 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h index 6292862ab8..ae774dbb7c 100644 --- a/widgets/table/e-cell-vbox.h +++ b/widgets/table/e-cell-vbox.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c index 1de405feff..41ffe86685 100644 --- a/widgets/table/e-cell.c +++ b/widgets/table/e-cell.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h index cb60cc8a2a..5a0005095e 100644 --- a/widgets/table/e-cell.h +++ b/widgets/table/e-cell.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index 4871b055eb..879b8c34af 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h index 1ddbe4e75b..31dded1989 100644 --- a/widgets/table/e-table-click-to-add.h +++ b/widgets/table/e-table-click-to-add.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-col-dnd.h b/widgets/table/e-table-col-dnd.h index 335b456e46..100a4d94d9 100644 --- a/widgets/table/e-table-col-dnd.h +++ b/widgets/table/e-table-col-dnd.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index 892ff7cc5d..d844f53c45 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h index 562e4fd7a7..f7d892d317 100644 --- a/widgets/table/e-table-col.h +++ b/widgets/table/e-table-col.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c index 3da9e28fdb..c48451587f 100644 --- a/widgets/table/e-table-column-specification.c +++ b/widgets/table/e-table-column-specification.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h index 775cbc3570..688e194825 100644 --- a/widgets/table/e-table-column-specification.h +++ b/widgets/table/e-table-column-specification.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c index 54909a079d..d2180d88e5 100644 --- a/widgets/table/e-table-column.c +++ b/widgets/table/e-table-column.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c index f5111d7ca2..6d3e5611da 100644 --- a/widgets/table/e-table-config-field.c +++ b/widgets/table/e-table-config-field.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h index 382ff941b1..9fbd21d694 100644 --- a/widgets/table/e-table-config-field.h +++ b/widgets/table/e-table-config-field.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 1c40798720..06f98066bb 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h index b265e32ba3..d5366bf999 100644 --- a/widgets/table/e-table-config.h +++ b/widgets/table/e-table-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h index d11ac3eb86..c2511c0a42 100644 --- a/widgets/table/e-table-defines.h +++ b/widgets/table/e-table-defines.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c index cacef107b7..b1eae4cc40 100644 --- a/widgets/table/e-table-example-1.c +++ b/widgets/table/e-table-example-1.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c index 4f3324d084..ac12886813 100644 --- a/widgets/table/e-table-example-2.c +++ b/widgets/table/e-table-example-2.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index 107739e5bf..0099b23656 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h index a7efcd8225..794cf4635e 100644 --- a/widgets/table/e-table-extras.h +++ b/widgets/table/e-table-extras.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c index 5b504496c7..61dedd4e12 100644 --- a/widgets/table/e-table-field-chooser-dialog.c +++ b/widgets/table/e-table-field-chooser-dialog.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h index 8467316317..e0bc591f25 100644 --- a/widgets/table/e-table-field-chooser-dialog.h +++ b/widgets/table/e-table-field-chooser-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 4b4c6b16a7..99b61f9ffa 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h index 96b5b28e02..3b9937bf3c 100644 --- a/widgets/table/e-table-field-chooser-item.h +++ b/widgets/table/e-table-field-chooser-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c index 60a0b40e9d..fb66d9618a 100644 --- a/widgets/table/e-table-field-chooser.c +++ b/widgets/table/e-table-field-chooser.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h index 01a54da822..71e17244f1 100644 --- a/widgets/table/e-table-field-chooser.h +++ b/widgets/table/e-table-field-chooser.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index c342c6ca7e..5af40532f8 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h index c4e0293edb..69791e376b 100644 --- a/widgets/table/e-table-group-container.h +++ b/widgets/table/e-table-group-container.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c index dc4c8ba11e..6076030737 100644 --- a/widgets/table/e-table-group-leaf.c +++ b/widgets/table/e-table-group-leaf.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h index 394c2dd778..e19bf8cdb8 100644 --- a/widgets/table/e-table-group-leaf.h +++ b/widgets/table/e-table-group-leaf.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index 257d23fb66..5cc03e90fc 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h index ee225c2471..36868f7d35 100644 --- a/widgets/table/e-table-group.h +++ b/widgets/table/e-table-group.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 028fd9b93e..62c00f94a4 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h index d9b3efce63..24a86939d8 100644 --- a/widgets/table/e-table-header-item.h +++ b/widgets/table/e-table-header-item.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index afcc0720e1..ae5ebf871f 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h index 33376f31c4..2ae1f79b1b 100644 --- a/widgets/table/e-table-header-utils.h +++ b/widgets/table/e-table-header-utils.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c index 3bd1409ade..6fd40ae0fa 100644 --- a/widgets/table/e-table-header.c +++ b/widgets/table/e-table-header.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h index 2c091ce20f..00b145ef87 100644 --- a/widgets/table/e-table-header.h +++ b/widgets/table/e-table-header.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 58d6c65f03..ce2484cafb 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1982,16 +1982,16 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, cairo_save (cr); pat = cairo_pattern_create_linear (0, y1, 0, y2); - cairo_pattern_add_color_stop_rgba (pat, 0.0, background->red/65535.0 , - background->green/65535.0, + cairo_pattern_add_color_stop_rgba (pat, 0.0, background->red/65535.0 , + background->green/65535.0, background->blue/65535.0, selected ? 0.8: 1.0); if (selected) - cairo_pattern_add_color_stop_rgba (pat, 0.5, background->red/65535.0 , - background->green/65535.0, + cairo_pattern_add_color_stop_rgba (pat, 0.5, background->red/65535.0 , + background->green/65535.0, background->blue/65535.0, 0.9); - cairo_pattern_add_color_stop_rgba (pat, 1, background->red/65535.0 , - background->green/65535.0, + cairo_pattern_add_color_stop_rgba (pat, 1, background->red/65535.0 , + background->green/65535.0, background->blue/65535.0, selected ? 0.8 : 1.0); cairo_rectangle (cr, x1, y1, ecol->width, height-1); cairo_set_source (cr, pat); @@ -2003,22 +2003,22 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, cairo_save (cr); cairo_set_line_width (cr, 1.0); - cairo_set_source_rgba (cr, background->red/65535.0 , - background->green/65535.0, + cairo_set_source_rgba (cr, background->red/65535.0 , + background->green/65535.0, background->blue/65535.0, 1); cairo_move_to (cr, x1, y1); cairo_line_to (cr, x2, y1); cairo_stroke (cr); cairo_set_line_width (cr, 1.0); - cairo_set_source_rgba (cr, background->red/65535.0 , - background->green/65535.0, + cairo_set_source_rgba (cr, background->red/65535.0 , + background->green/65535.0, background->blue/65535.0, 1); cairo_move_to (cr, x1, y2); cairo_line_to (cr, x2, y2); cairo_stroke (cr); - cairo_restore (cr); - + cairo_restore (cr); + if (free_background) gdk_color_free (background); diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index 48d6093b51..befadb77ca 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c index 071494ca25..b1833aa2e1 100644 --- a/widgets/table/e-table-memory-callbacks.c +++ b/widgets/table/e-table-memory-callbacks.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-memory-callbacks.h b/widgets/table/e-table-memory-callbacks.h index c9202ecfef..bfeacb284c 100644 --- a/widgets/table/e-table-memory-callbacks.h +++ b/widgets/table/e-table-memory-callbacks.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c index 5756402b54..284823bc3d 100644 --- a/widgets/table/e-table-memory-store.c +++ b/widgets/table/e-table-memory-store.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-memory-store.h b/widgets/table/e-table-memory-store.h index b16a18f8e5..f197e11fe6 100644 --- a/widgets/table/e-table-memory-store.h +++ b/widgets/table/e-table-memory-store.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c index 371261387e..3fb85a9553 100644 --- a/widgets/table/e-table-memory.c +++ b/widgets/table/e-table-memory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h index 37fc3449ff..889eec5d33 100644 --- a/widgets/table/e-table-memory.h +++ b/widgets/table/e-table-memory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index f88f3bf215..efe097c4e1 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h index f639d77374..d647eee4e1 100644 --- a/widgets/table/e-table-model.h +++ b/widgets/table/e-table-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c index 939733fea6..56cd8b6549 100644 --- a/widgets/table/e-table-one.c +++ b/widgets/table/e-table-one.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-one.h b/widgets/table/e-table-one.h index d5e0b6a431..2984aeaa76 100644 --- a/widgets/table/e-table-one.h +++ b/widgets/table/e-table-one.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c index 0fca40dfa0..42425efd9a 100644 --- a/widgets/table/e-table-scrolled.c +++ b/widgets/table/e-table-scrolled.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h index 2ff7332cc6..d2f5024495 100644 --- a/widgets/table/e-table-scrolled.h +++ b/widgets/table/e-table-scrolled.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c index 307d28de39..401e0fd33f 100644 --- a/widgets/table/e-table-search.c +++ b/widgets/table/e-table-search.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-search.h b/widgets/table/e-table-search.h index 94232bd757..9866d07f94 100644 --- a/widgets/table/e-table-search.h +++ b/widgets/table/e-table-search.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c index 2fdef3f88a..7f6ab4d782 100644 --- a/widgets/table/e-table-selection-model.c +++ b/widgets/table/e-table-selection-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h index 5d7d831205..cbd73901e0 100644 --- a/widgets/table/e-table-selection-model.h +++ b/widgets/table/e-table-selection-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c index d4ba8d8795..a220769ded 100644 --- a/widgets/table/e-table-simple.c +++ b/widgets/table/e-table-simple.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h index b8661fe3df..453a90a54d 100644 --- a/widgets/table/e-table-simple.h +++ b/widgets/table/e-table-simple.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c index e5e3da391c..8d722038e3 100644 --- a/widgets/table/e-table-sort-info.c +++ b/widgets/table/e-table-sort-info.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sort-info.h b/widgets/table/e-table-sort-info.h index 5a1874e9f3..4a0dde4d88 100644 --- a/widgets/table/e-table-sort-info.h +++ b/widgets/table/e-table-sort-info.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c index b181b4390f..02a2e8bf26 100644 --- a/widgets/table/e-table-sorted-variable.c +++ b/widgets/table/e-table-sorted-variable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h index 06d398077b..53744dce72 100644 --- a/widgets/table/e-table-sorted-variable.h +++ b/widgets/table/e-table-sorted-variable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c index 4cb1a6cca7..076863adfb 100644 --- a/widgets/table/e-table-sorted.c +++ b/widgets/table/e-table-sorted.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h index 1d93b2ae93..031d9c9647 100644 --- a/widgets/table/e-table-sorted.h +++ b/widgets/table/e-table-sorted.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c index dc63f74492..154d5a2581 100644 --- a/widgets/table/e-table-sorter.c +++ b/widgets/table/e-table-sorter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h index 81a7eb71f5..245539e36f 100644 --- a/widgets/table/e-table-sorter.h +++ b/widgets/table/e-table-sorter.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c index 479b920d74..d04144d5ad 100644 --- a/widgets/table/e-table-sorting-utils.c +++ b/widgets/table/e-table-sorting-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h index 4ab8714caf..a0f43fb232 100644 --- a/widgets/table/e-table-sorting-utils.h +++ b/widgets/table/e-table-sorting-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c index ff170dfce5..f966b3ca6f 100644 --- a/widgets/table/e-table-specification.c +++ b/widgets/table/e-table-specification.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h index 463bba6ef2..580cbc6ba3 100644 --- a/widgets/table/e-table-specification.h +++ b/widgets/table/e-table-specification.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index 69d33486a2..e9440ecd55 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h index f09baf7c4c..7a320c56ba 100644 --- a/widgets/table/e-table-state.h +++ b/widgets/table/e-table-state.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c index 50913ddaa9..b088d8302a 100644 --- a/widgets/table/e-table-subset-variable.c +++ b/widgets/table/e-table-subset-variable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-subset-variable.h b/widgets/table/e-table-subset-variable.h index 680d426e77..1aed0d3cb3 100644 --- a/widgets/table/e-table-subset-variable.h +++ b/widgets/table/e-table-subset-variable.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c index d1e9ee66b7..1cec532d03 100644 --- a/widgets/table/e-table-subset.c +++ b/widgets/table/e-table-subset.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-subset.h b/widgets/table/e-table-subset.h index e2bf5b46c6..83c9af4d99 100644 --- a/widgets/table/e-table-subset.h +++ b/widgets/table/e-table-subset.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-tooltip.h b/widgets/table/e-table-tooltip.h index 4c85c08a50..5b2acbf584 100644 --- a/widgets/table/e-table-tooltip.h +++ b/widgets/table/e-table-tooltip.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-tree.h b/widgets/table/e-table-tree.h index 13d6bf730d..864359bf33 100644 --- a/widgets/table/e-table-tree.h +++ b/widgets/table/e-table-tree.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c index d01d94ae28..6e87a2a6ce 100644 --- a/widgets/table/e-table-utils.c +++ b/widgets/table/e-table-utils.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-utils.h b/widgets/table/e-table-utils.h index 037a5f97d8..2c725f4bf9 100644 --- a/widgets/table/e-table-utils.h +++ b/widgets/table/e-table-utils.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index 2ee1734d69..7d9c5bfce7 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h index db40ded70f..c43bdab332 100644 --- a/widgets/table/e-table-without.h +++ b/widgets/table/e-table-without.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index f8321011b2..b48fd454f1 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index 6b2a698d5c..4894085330 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c index 3a6f7a8493..08d703b7ff 100644 --- a/widgets/table/e-tree-memory-callbacks.c +++ b/widgets/table/e-tree-memory-callbacks.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h index 89d3a0d756..f74a472642 100644 --- a/widgets/table/e-tree-memory-callbacks.h +++ b/widgets/table/e-tree-memory-callbacks.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index a7d266e0e6..99c9ef9895 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-memory.h b/widgets/table/e-tree-memory.h index 075f740de3..2c82d1c8d1 100644 --- a/widgets/table/e-tree-memory.h +++ b/widgets/table/e-tree-memory.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index b2e2d99a75..bd35358874 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h index 96828a8e0a..ed34933cb1 100644 --- a/widgets/table/e-tree-model.h +++ b/widgets/table/e-tree-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c index 7e40ef81d3..18267a42c3 100644 --- a/widgets/table/e-tree-scrolled.c +++ b/widgets/table/e-tree-scrolled.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-scrolled.h b/widgets/table/e-tree-scrolled.h index cbe725a162..5d4b8de36f 100644 --- a/widgets/table/e-tree-scrolled.h +++ b/widgets/table/e-tree-scrolled.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 2b903ca0bc..1d694f9b60 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h index e1541a661f..8652851dcc 100644 --- a/widgets/table/e-tree-selection-model.h +++ b/widgets/table/e-tree-selection-model.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c index be67a95cf8..3252a3db18 100644 --- a/widgets/table/e-tree-simple.c +++ b/widgets/table/e-tree-simple.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h index 95e0bfb486..bb64aa18a2 100644 --- a/widgets/table/e-tree-simple.h +++ b/widgets/table/e-tree-simple.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c index d30812da1f..432a7897e4 100644 --- a/widgets/table/e-tree-sorted-variable.c +++ b/widgets/table/e-tree-sorted-variable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-sorted-variable.h b/widgets/table/e-tree-sorted-variable.h index 6abed5e397..15f9d8e8af 100644 --- a/widgets/table/e-tree-sorted-variable.h +++ b/widgets/table/e-tree-sorted-variable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index dd326ec094..092fa87b9b 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-sorted.h b/widgets/table/e-tree-sorted.h index 1dc7f056fb..1e286b7e75 100644 --- a/widgets/table/e-tree-sorted.h +++ b/widgets/table/e-tree-sorted.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 8e583ec8a8..7cfeab33ed 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-table-adapter.h b/widgets/table/e-tree-table-adapter.h index d1296c2b1d..13ab5787c0 100644 --- a/widgets/table/e-tree-table-adapter.h +++ b/widgets/table/e-tree-table-adapter.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 2eba9d4a82..e58ac1bdd9 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -3415,7 +3415,7 @@ tree_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *tree) /** * e_tree_set_info_message: * @tree: #ETree instance - * @info_message: Message to set. Can be NULL. + * @info_message: Message to set. Can be NULL. * * Creates an info message in table area, or removes old. **/ diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h index 361ab5adc7..426cf9c44d 100644 --- a/widgets/table/e-tree.h +++ b/widgets/table/e-tree.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/table-test.h b/widgets/table/table-test.h index 3dc7d98162..8b179bafdf 100644 --- a/widgets/table/table-test.h +++ b/widgets/table/table-test.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/text/e-text-model-repos.c b/widgets/text/e-text-model-repos.c index 0b55930792..ef31f91def 100644 --- a/widgets/text/e-text-model-repos.c +++ b/widgets/text/e-text-model-repos.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/text/e-text-model-repos.h b/widgets/text/e-text-model-repos.h index 461a70f59d..6a185daa08 100644 --- a/widgets/text/e-text-model-repos.h +++ b/widgets/text/e-text-model-repos.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index 663cdd6e30..c7462e21a6 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h index 2a484f14b4..69c6f0c68e 100644 --- a/widgets/text/e-text-model.h +++ b/widgets/text/e-text-model.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index bd79c0ad7b..c225636885 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -386,10 +386,10 @@ reset_layout_attrs (EText *text) } pango_layout_set_attributes (text->layout, attrs); - + if (attrs) pango_attr_list_unref (attrs); - + calc_height (text); } @@ -1514,12 +1514,12 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, } } - /* Insert preedit text only when im_context signals are connected & + /* Insert preedit text only when im_context signals are connected & * text->preedit_len is not zero */ if (text->im_context_signals_registered && text->preedit_len) insert_preedit_text (text); - /* Need to reset the layout to cleanly clear the preedit buffer when + /* Need to reset the layout to cleanly clear the preedit buffer when * typing in CJK & using backspace on the preedit */ if(!text->preedit_len) reset_layout (text); diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index a426b2c64f..ebe5817285 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: -- cgit v1.2.3