From f575a7626a769b0a99e080944749958d644d4aef Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 24 May 2009 11:54:43 -0400 Subject: Eliminate redundant E_ICON_SIZE_* enumeration. --- addressbook/gui/component/addressbook-view.c | 34 +++++++++++------------ addressbook/gui/contact-editor/e-contact-editor.c | 2 +- addressbook/gui/widgets/e-minicard.c | 2 +- addressbook/gui/widgets/eab-contact-display.c | 2 +- addressbook/gui/widgets/eab-gui-util.c | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 2f77fc4e50..756c6bf96e 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -599,23 +599,23 @@ static BonoboUIVerb verbs [] = { }; static EPixmap pixmaps [] = { - E_PIXMAP ("/commands/ChangeFolderProperties", "document-properties", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactDelete", "edit-delete", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsCopy", "edit-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsCut", "edit-cut", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsPaste", "edit-paste", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsPrint", "document-print", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsSaveAsVCard", "document-save-as", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsSendContactToOther", "mail-forward", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/ContactsSendMessageToContact", "mail-message-new", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderCopy", "edit-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderDelete", "edit-delete", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderMove", "folder-move", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderSave", "document-save-as", E_ICON_SIZE_MENU), - - E_PIXMAP ("/Toolbar/ContactsPrint", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/ContactDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/commands/ChangeFolderProperties", "document-properties", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactDelete", "edit-delete", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsCopy", "edit-copy", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsCut", "edit-cut", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsPaste", "edit-paste", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsPrint", "document-print", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsPrintPreview", "document-print-preview", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsSaveAsVCard", "document-save-as", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsSendContactToOther", "mail-forward", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ContactsSendMessageToContact", "mail-message-new", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderCopy", "edit-copy", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderDelete", "edit-delete", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderMove", "folder-move", GTK_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderSave", "document-save-as", GTK_ICON_SIZE_MENU), + + E_PIXMAP ("/Toolbar/ContactsPrint", "document-print", GTK_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/ContactDelete", "edit-delete", GTK_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 9eaf9897ba..e3c149ac85 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2815,7 +2815,7 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data) pixbuf = gdk_pixbuf_new_from_file_at_size (filename, 128, 128, NULL); if (!pixbuf) { gchar *alternate_file; - alternate_file = e_icon_factory_get_icon_filename ("stock_person",E_ICON_SIZE_DIALOG); + alternate_file = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG); if (alternate_file) { pixbuf = gdk_pixbuf_new_from_file_at_size (alternate_file, 128, 128, NULL); g_free (alternate_file); diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index cbbcc80d5c..c2cf1d7a41 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -246,7 +246,7 @@ e_minicard_init (EMinicard *minicard) minicard->contact = NULL; - minicard->list_icon_pixbuf = e_icon_factory_get_icon (LIST_ICON_NAME, E_ICON_SIZE_MENU); + minicard->list_icon_pixbuf = e_icon_factory_get_icon (LIST_ICON_NAME, GTK_ICON_SIZE_MENU); minicard->list_icon_size = gdk_pixbuf_get_height (minicard->list_icon_pixbuf); minicard->editor = NULL; diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 4e7418dc5c..cb605ecf05 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -241,7 +241,7 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle, gsize data_length; gchar *filename; - filename = e_icon_factory_get_icon_filename (url + strlen ("evo-icon:"), E_ICON_SIZE_MENU); + filename = e_icon_factory_get_icon_filename (url + strlen ("evo-icon:"), GTK_ICON_SIZE_MENU); if (g_file_get_contents (filename, &data, &data_length, NULL)) { gtk_html_stream_write (handle, data, data_length); g_free (data); diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 49bcde21f6..15f03c6c8b 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -1023,7 +1023,7 @@ eab_create_image_chooser_widget(gchar *name, gtk_widget_show_all (w); if (string1) { - filename = e_icon_factory_get_icon_filename (string1, E_ICON_SIZE_DIALOG); + filename = e_icon_factory_get_icon_filename (string1, GTK_ICON_SIZE_DIALOG); e_image_chooser_set_from_file (E_IMAGE_CHOOSER (w), filename); -- cgit v1.2.3 From f8730610042229f275a5a294df4c2eb5f225118e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 09:18:54 -0400 Subject: Fix compiler warnings in addressbook. --- addressbook/gui/component/addressbook-component.c | 12 +++--- addressbook/gui/component/addressbook-config.c | 44 +++++++++---------- addressbook/gui/component/addressbook-view.c | 18 ++++---- addressbook/gui/component/addressbook.c | 2 +- .../gui/contact-editor/e-contact-editor-fullname.c | 9 ++-- addressbook/gui/contact-editor/e-contact-editor.c | 12 +++--- .../gui/contact-editor/e-contact-quick-add.c | 4 +- .../contact-list-editor/e-contact-list-editor.c | 2 +- addressbook/gui/merging/eab-contact-compare.c | 2 +- addressbook/gui/widgets/e-addressbook-view.c | 50 +++++++++++----------- addressbook/gui/widgets/e-minicard-view.c | 4 +- addressbook/gui/widgets/e-minicard.c | 4 +- addressbook/gui/widgets/eab-contact-display.c | 15 ++++--- addressbook/gui/widgets/eab-gui-util.c | 2 +- 14 files changed, 92 insertions(+), 88 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 3ec3f5ca08..e580fb2844 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -204,28 +204,28 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_sequence_set_release (list, FALSE); - list->_buffer[0].id = "contact"; + list->_buffer[0].id = (char *) "contact"; list->_buffer[0].description = _("New Contact"); list->_buffer[0].menuDescription = (char *) C_("New", "_Contact"); list->_buffer[0].tooltip = _("Create a new contact"); list->_buffer[0].menuShortcut = 'c'; - list->_buffer[0].iconName = "contact-new"; + list->_buffer[0].iconName = (char *) "contact-new"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[1].id = "contact_list"; + list->_buffer[1].id = (char *) "contact_list"; list->_buffer[1].description = _("New Contact List"); list->_buffer[1].menuDescription = (char *) C_("New", "Contact _List"); list->_buffer[1].tooltip = _("Create a new contact list"); list->_buffer[1].menuShortcut = 'l'; - list->_buffer[1].iconName = "stock_contact-list"; + list->_buffer[1].iconName = (char *) "stock_contact-list"; list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[2].id = "address_book"; + list->_buffer[2].id = (char *) "address_book"; list->_buffer[2].description = _("New Address Book"); list->_buffer[2].menuDescription = (char *) C_("New", "Address _Book"); list->_buffer[2].tooltip = _("Create a new address book"); list->_buffer[2].menuShortcut = '\0'; - list->_buffer[2].iconName = "address-book-new"; + list->_buffer[2].iconName = (char *) "address-book-new"; list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER; return list; diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 1f0fa57847..87e018796b 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -136,7 +136,7 @@ struct _AddressbookSourceDialog { #ifdef HAVE_LDAP -static char * +static const gchar * ldap_unparse_auth (AddressbookLDAPAuthType auth_type) { switch (auth_type) { @@ -165,7 +165,7 @@ ldap_parse_auth (const char *auth) return ADDRESSBOOK_LDAP_AUTH_NONE; } -static char * +static const gchar * ldap_unparse_scope (AddressbookLDAPScopeType scope_type) { switch (scope_type) { @@ -180,7 +180,7 @@ ldap_unparse_scope (AddressbookLDAPScopeType scope_type) } } -static char * +static const gchar * ldap_unparse_ssl (AddressbookLDAPSSLType ssl_type) { switch (ssl_type) { @@ -308,7 +308,7 @@ addressbook_ldap_auth (GtkWidget *window, LDAP *ldap) static int addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap, - char **attrs, LDAPMessage **resp) + const gchar **attrs, LDAPMessage **resp) { int ldap_error; struct timeval timeout; @@ -319,7 +319,7 @@ addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap, ldap_error = ldap_search_ext_s (ldap, LDAP_ROOT_DSE, LDAP_SCOPE_BASE, "(objectclass=*)", - attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, resp); + (gchar **) attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, resp); if (LDAP_SUCCESS != ldap_error) e_error_run (GTK_WINDOW (dialog->window), "addressbook:ldap-search-base", NULL); @@ -358,7 +358,7 @@ static gboolean do_ldap_root_dse_query (AddressbookSourceDialog *sdialog, GtkListStore *model, ESource *source) { LDAP *ldap; - char *attrs[2]; + const gchar *attrs[2]; int ldap_error; char **values; LDAPMessage *resp; @@ -1018,29 +1018,29 @@ eabc_details_limit(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st #endif static EConfigItem eabc_items[] = { - { E_CONFIG_BOOK, "", }, - { E_CONFIG_PAGE, "00.general", N_("General") }, - { E_CONFIG_SECTION, "00.general/10.display", N_("Address Book") }, - { E_CONFIG_ITEM, "00.general/10.display/10.name", "hbox122", eabc_general_name }, - { E_CONFIG_ITEM, "00.general/10.display/20.offline", NULL, eabc_general_offline }, + { E_CONFIG_BOOK, (gchar *) (gchar *) "", }, + { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) N_("General") }, + { E_CONFIG_SECTION, (gchar *) "00.general/10.display", (gchar *) N_("Address Book") }, + { E_CONFIG_ITEM, (gchar *) "00.general/10.display/10.name", (gchar *) "hbox122", eabc_general_name }, + { E_CONFIG_ITEM, (gchar *) "00.general/10.display/20.offline", NULL, eabc_general_offline }, #ifdef HAVE_LDAP - { E_CONFIG_SECTION, "00.general/20.server", N_("Server Information") }, - { E_CONFIG_ITEM, "00.general/20.server/00.host", "table31", eabc_general_host }, - { E_CONFIG_SECTION, "00.general/30.auth", N_("Authentication") }, - { E_CONFIG_ITEM, "00.general/30.auth/00.auth", "table32", eabc_general_auth }, - - { E_CONFIG_PAGE, "10.details", N_("Details") }, - { E_CONFIG_SECTION, "10.details/00.search", N_("Searching") }, - { E_CONFIG_ITEM, "10.details/00.search/00.search", "table33", eabc_details_search }, - { E_CONFIG_SECTION, "10.details/10.limit", N_("Downloading") }, - { E_CONFIG_ITEM, "10.details/10.limit/00.limit", "table34", eabc_details_limit }, + { E_CONFIG_SECTION, (gchar *) "00.general/20.server", (gchar *) N_("Server Information") }, + { E_CONFIG_ITEM, (gchar *) "00.general/20.server/00.host", (gchar *) "table31", eabc_general_host }, + { E_CONFIG_SECTION, (gchar *) "00.general/30.auth", (gchar *) N_("Authentication") }, + { E_CONFIG_ITEM, (gchar *) "00.general/30.auth/00.auth", (gchar *) "table32", eabc_general_auth }, + + { E_CONFIG_PAGE, (gchar *) "10.details", (gchar *) N_("Details") }, + { E_CONFIG_SECTION, (gchar *) "10.details/00.search", (gchar *) N_("Searching") }, + { E_CONFIG_ITEM, (gchar *) "10.details/00.search/00.search", (gchar *) "table33", eabc_details_search }, + { E_CONFIG_SECTION, (gchar *) "10.details/10.limit", (gchar *) N_("Downloading") }, + { E_CONFIG_ITEM, (gchar *) "10.details/10.limit/00.limit", (gchar *) "table34", eabc_details_limit }, #endif { 0 }, }; /* items needed for the 'new addressbook' window */ static EConfigItem eabc_new_items[] = { - { E_CONFIG_ITEM, "00.general/10.display/00.type", NULL, eabc_general_type }, + { E_CONFIG_ITEM, (gchar *) "00.general/10.display/00.type", NULL, eabc_general_type }, { 0 }, }; diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 756c6bf96e..9759b3fdf2 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -96,8 +96,8 @@ enum DndTargetType { #define VCARD_TYPE "text/x-vcard" #define SOURCE_VCARD_TYPE "text/x-source-vcard" static GtkTargetEntry drag_types[] = { - { SOURCE_VCARD_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST }, - { VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST } + { (gchar *) SOURCE_VCARD_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST }, + { (gchar *) VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST } }; static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]); @@ -946,15 +946,15 @@ primary_source_selection_changed_callback (ESourceSelector *selector, } static EPopupItem abv_source_popups[] = { - { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "address-book-new", 0, 0 }, - { E_POPUP_ITEM, "20.saveasvcard", N_("Save As vCard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, "25.rename", N_("_Rename..."), rename_addressbook_cb, NULL, NULL, 0, EAB_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Address Book"), new_addressbook_cb, NULL, (gchar *) "address-book-new", 0, 0 }, + { E_POPUP_ITEM, (gchar *) "20.saveasvcard", (gchar *) N_("Save As vCard..."), save_addressbook_cb, NULL, (gchar *) "document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "25.rename", (gchar *) N_("_Rename..."), rename_addressbook_cb, NULL, NULL, 0, EAB_POPUP_SOURCE_PRIMARY }, - { E_POPUP_BAR, "30.bar" }, - { E_POPUP_ITEM, "30.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY }, + { E_POPUP_BAR, (gchar *) "30.bar" }, + { E_POPUP_ITEM, (gchar *) "30.delete", (gchar *) N_("_Delete"), delete_addressbook_cb, NULL, (gchar *) "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY }, - { E_POPUP_BAR, "99.bar" }, - { E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_addressbook_cb, NULL,"document-properties", 0, EAB_POPUP_SOURCE_PRIMARY }, + { E_POPUP_BAR, (gchar *) "99.bar" }, + { E_POPUP_ITEM, (gchar *) "99.properties", (gchar *) N_("_Properties"), edit_addressbook_cb, NULL, (gchar *) "document-properties", 0, EAB_POPUP_SOURCE_PRIMARY }, }; static void diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index c8285d8171..9bb726e17e 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -200,7 +200,7 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *sourc char *prompt; char *password_prompt; gboolean remember; - char *failed_auth; + const gchar *failed_auth; guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE; if (previous_failure) { diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index bbe9ece7ba..c2194e8b8c 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -190,7 +190,7 @@ e_contact_editor_fullname_set_property (GObject *object, guint prop_id, break; case PROP_EDITABLE: { int i; - char *widget_names[] = { + const gchar *widget_names[] = { "comboentry-title", "comboentry-suffix", "entry-first", @@ -250,7 +250,9 @@ e_contact_editor_fullname_get_property (GObject *object, guint prop_id, } static void -fill_in_field(EContactEditorFullname *editor, char *field, char *string) +fill_in_field (EContactEditorFullname *editor, + const gchar *field, + const gchar *string) { GtkWidget *widget = glade_xml_get_widget (editor->gui, field); GtkEntry *entry = NULL; @@ -282,7 +284,8 @@ fill_in_info(EContactEditorFullname *editor) } static char * -extract_field(EContactEditorFullname *editor, char *field) +extract_field (EContactEditorFullname *editor, + const gchar *field) { GtkWidget *widget = glade_xml_get_widget(editor->gui, field); GtkEntry *entry = NULL; diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index e3c149ac85..c8a427a253 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -164,8 +164,8 @@ static const gchar *address_name [] = { }; static struct { - EContactField field; - gchar *pretty_name; + EContactField field; + const gchar *pretty_name; } im_service [] = { @@ -183,8 +183,8 @@ im_service [] = static const gint im_service_default [] = { 0, 2, 4, 5 }; static struct { - gchar *name; - gchar *pretty_name; + const gchar *name; + const gchar *pretty_name; } common_location [] = { @@ -2032,7 +2032,7 @@ sensitize_address (EContactEditor *editor) } typedef struct { - char *widget_name; + const gchar *widget_name; gint field_id; /* EContactField or -1 */ gboolean process_data; /* If we should extract/fill in contents */ gboolean desensitize_for_read_only; @@ -3237,7 +3237,7 @@ show_help_cb (GtkWidget *widget, gpointer data) } static GList * -add_to_tab_order(GList *list, GladeXML *gui, char *name) +add_to_tab_order(GList *list, GladeXML *gui, const gchar *name) { GtkWidget *widget = glade_xml_get_widget(gui, name); return g_list_prepend(list, widget); diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 418bdbc1ae..926d369b5a 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -250,8 +250,8 @@ clicked_cb (GtkWidget *w, gint button, gpointer closure) email = tmp; } - e_contact_set (qa->contact, E_CONTACT_FULL_NAME, (char *) name ? name : ""); - e_contact_set (qa->contact, E_CONTACT_EMAIL_1, (char *) email ? email : ""); + e_contact_set (qa->contact, E_CONTACT_FULL_NAME, (gpointer) (name ? name : "")); + e_contact_set (qa->contact, E_CONTACT_EMAIL_1, (gpointer) (email ? email : "")); g_free (name); g_free (email); 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 80fb7514a1..212c1bbd7a 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -130,7 +130,7 @@ enum { }; static GtkTargetEntry targets[] = { - { VCARD_TYPE, 0, TARGET_TYPE_VCARD }, + { (gchar *) VCARD_TYPE, 0, TARGET_TYPE_VCARD }, }; static gpointer parent_class; diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c index adc6938c8d..7747669f24 100644 --- a/addressbook/gui/merging/eab-contact-compare.c +++ b/addressbook/gui/merging/eab-contact-compare.c @@ -46,7 +46,7 @@ combine_comparisons (EABContactMatchType prev, sucky way like this. But it can be fixed later. */ /* This is very Anglocentric. */ -static gchar *name_synonyms[][2] = { +static const gchar *name_synonyms[][2] = { { "jon", "john" }, /* Ah, the hacker's perogative */ { "joseph", "joe" }, { "robert", "bob" }, diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 9fdb15eac9..fe39c029e0 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -135,8 +135,8 @@ typedef struct EABSearchBarItem { }EABSearchBarItem; static GtkTargetEntry drag_types[] = { - { SOURCE_VCARD_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD }, - { VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD } + { (gchar *) SOURCE_VCARD_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD }, + { (gchar *) VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD } }; static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]); @@ -929,29 +929,29 @@ new_list (EPopup *ep, EPopupItem *pitem, void *data) } static EPopupItem eabv_popup_items[] = { - { E_POPUP_ITEM, "05.open", N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, - { E_POPUP_BAR, "10.bar" }, - { E_POPUP_ITEM, "10.new", N_("_New Contact..."), new_card, NULL, "contact-new", 0, EAB_POPUP_SELECT_EDITABLE}, - { E_POPUP_ITEM, "15.newlist", N_("New Contact _List..."), new_list, NULL, "stock_contact-list", 0, EAB_POPUP_SELECT_EDITABLE }, - - { E_POPUP_BAR, "20.bar" }, - { E_POPUP_ITEM, "30.saveas", N_("_Save as vCard..."), save_as, NULL, "document-save-as", 0, EAB_POPUP_SELECT_ANY }, - { E_POPUP_ITEM, "40.forward", N_("_Forward Contact"), send_as, NULL, "mail-forward", EAB_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "40.forward", N_("_Forward Contacts"), send_as, NULL, "mail-forward", EAB_POPUP_SELECT_MANY }, - { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contact"), send_to, NULL, "mail-message-new", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT }, - { E_POPUP_ITEM, "50.mailto", N_("Send _Message to List"), send_to, NULL, "mail-message-new", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST }, - { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contacts"), send_to, NULL, "mail-message-new", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL }, - { E_POPUP_ITEM, "60.print", N_("_Print"), print, NULL, "document-print", 0, EAB_POPUP_SELECT_ANY }, - - { E_POPUP_BAR, "70.bar" }, - { E_POPUP_ITEM, "80.copyto", N_("Cop_y to Address Book..."), copy_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY }, - { E_POPUP_ITEM, "90.moveto", N_("Mo_ve to Address Book..."), move_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, - - { E_POPUP_BAR, "a0.bar" }, - { E_POPUP_ITEM, "b0.cut", N_("Cu_t"), cut, NULL, "edit-cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "c0.copy", N_("_Copy"), copy, NULL, "edit-copy", 0, EAB_POPUP_SELECT_ANY }, - { E_POPUP_ITEM, "d0.paste", N_("P_aste"), paste, NULL, "edit-paste", 0, EAB_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "e0.delete", N_("_Delete"), delete, NULL, "edit-delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY }, + { E_POPUP_ITEM, (gchar *) "05.open", (gchar *) N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, + { E_POPUP_BAR, (gchar *) "10.bar" }, + { E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Contact..."), new_card, NULL, (gchar *) "contact-new", 0, EAB_POPUP_SELECT_EDITABLE}, + { E_POPUP_ITEM, (gchar *) "15.newlist", (gchar *) N_("New Contact _List..."), new_list, NULL, (gchar *) "stock_contact-list", 0, EAB_POPUP_SELECT_EDITABLE }, + + { E_POPUP_BAR, (gchar *) "20.bar" }, + { E_POPUP_ITEM, (gchar *) "30.saveas", (gchar *) N_("_Save as vCard..."), save_as, NULL, (gchar *) "document-save-as", 0, EAB_POPUP_SELECT_ANY }, + { E_POPUP_ITEM, (gchar *) "40.forward", (gchar *) N_("_Forward Contact"), send_as, NULL, (gchar *) "mail-forward", EAB_POPUP_SELECT_ONE }, + { E_POPUP_ITEM, (gchar *) "40.forward", (gchar *) N_("_Forward Contacts"), send_as, NULL, (gchar *) "mail-forward", EAB_POPUP_SELECT_MANY }, + { E_POPUP_ITEM, (gchar *) "50.mailto", (gchar *) N_("Send _Message to Contact"), send_to, NULL, (gchar *) "mail-message-new", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT }, + { E_POPUP_ITEM, (gchar *) "50.mailto", (gchar *) N_("Send _Message to List"), send_to, NULL, (gchar *) "mail-message-new", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST }, + { E_POPUP_ITEM, (gchar *) "50.mailto", (gchar *) N_("Send _Message to Contacts"), send_to, NULL, (gchar *) "mail-message-new", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL }, + { E_POPUP_ITEM, (gchar *) "60.print", (gchar *) N_("_Print"), print, NULL, (gchar *) "document-print", 0, EAB_POPUP_SELECT_ANY }, + + { E_POPUP_BAR, (gchar *) "70.bar" }, + { E_POPUP_ITEM, (gchar *) "80.copyto", (gchar *) N_("Cop_y to Address Book..."), copy_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY }, + { E_POPUP_ITEM, (gchar *) "90.moveto", (gchar *) N_("Mo_ve to Address Book..."), move_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, + + { E_POPUP_BAR, (gchar *) "a0.bar" }, + { E_POPUP_ITEM, (gchar *) "b0.cut", (gchar *) N_("Cu_t"), cut, NULL, (gchar *) "edit-cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "c0.copy", (gchar *) N_("_Copy"), copy, NULL, (gchar *) "edit-copy", 0, EAB_POPUP_SELECT_ANY }, + { E_POPUP_ITEM, (gchar *) "d0.paste", (gchar *) N_("P_aste"), paste, NULL, (gchar *) "edit-paste", 0, EAB_POPUP_SELECT_EDITABLE }, + { E_POPUP_ITEM, (gchar *) "e0.delete", (gchar *) N_("_Delete"), delete, NULL, (gchar *) "edit-delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY }, }; static void diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index ccf3ecc6f9..756a019d9f 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -69,8 +69,8 @@ enum DndTargetType { #define VCARD_LIST_TYPE "text/x-vcard" #define SOURCE_VCARD_LIST_TYPE "text/x-source-vcard" static GtkTargetEntry drag_types[] = { - { SOURCE_VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST }, - { VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST } + { (gchar *) SOURCE_VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST }, + { (gchar *) VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST } }; static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]); diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index c2cf1d7a41..10a406edbf 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -91,8 +91,8 @@ enum { }; static struct { - gchar *name; - gchar *pretty_name; + const gchar *name; + const gchar *pretty_name; } common_location [] = { diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index cb605ecf05..6cec0b9eb7 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -49,8 +49,8 @@ struct _EABContactDisplayPrivate { }; static struct { - gchar *name; - gchar *pretty_name; + const gchar *name; + const gchar *pretty_name; } common_location [] = { @@ -166,10 +166,10 @@ eab_selection_clear_event(GtkWidget *widget, GdkEventSelection *event, EABContac } static EPopupItem eab_uri_popups[] = { - { E_POPUP_ITEM, "05.open", N_("_Open Link in Browser"), eab_uri_popup_link_open, NULL, NULL, EAB_POPUP_URI_NOT_MAILTO }, - { E_POPUP_ITEM, "10.copy", N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, "edit-copy", EAB_POPUP_URI_NOT_MAILTO }, - { E_POPUP_ITEM, "15.send", N_("_Send New Message To..."), eab_uri_popup_address_send, NULL, "mail-message-new", EAB_POPUP_URI_MAILTO}, - { E_POPUP_ITEM, "20.copy", N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, "edit-copy", EAB_POPUP_URI_MAILTO}, + { E_POPUP_ITEM, (gchar *) "05.open", (gchar *) N_("_Open Link in Browser"), eab_uri_popup_link_open, NULL, NULL, EAB_POPUP_URI_NOT_MAILTO }, + { E_POPUP_ITEM, (gchar *) "10.copy", (gchar *) N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, (gchar *) "edit-copy", EAB_POPUP_URI_NOT_MAILTO }, + { E_POPUP_ITEM, (gchar *) "15.send", (gchar *) N_("_Send New Message To..."), eab_uri_popup_address_send, NULL, (gchar *) "mail-message-new", EAB_POPUP_URI_MAILTO}, + { E_POPUP_ITEM, (gchar *) "20.copy", (gchar *) N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, (gchar *) "edit-copy", EAB_POPUP_URI_MAILTO}, }; @@ -528,7 +528,8 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact) #ifdef HANDLE_MAILTO_INTERNALLY int email_num = 0; #endif - char *nl, *nick=NULL; + const gchar *nl; + char *nick=NULL; gtk_html_stream_printf (html_stream, ""); diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 15f03c6c8b..14285cf9b1 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -85,7 +85,7 @@ eab_error_dialog (const char *msg, EBookStatus status) { const char *status_str; - if (status < 0 || status >= G_N_ELEMENTS (status_to_string)) + if (status >= G_N_ELEMENTS (status_to_string)) status_str = "Other error"; else status_str = status_to_string [status]; -- 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. --- 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 +- addressbook/gui/contact-editor/e-contact-quick-add.c | 2 +- addressbook/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 +- .../gui/contact-list-editor/e-contact-list-editor.c | 16 ++++++++-------- .../gui/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 +- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 2 +- addressbook/gui/widgets/e-addressbook-reflow-adapter.h | 2 +- addressbook/gui/widgets/e-addressbook-table-adapter.c | 2 +- addressbook/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 +- addressbook/gui/widgets/gal-view-factory-minicard.c | 2 +- addressbook/gui/widgets/gal-view-factory-minicard.h | 2 +- addressbook/gui/widgets/gal-view-minicard.c | 2 +- addressbook/gui/widgets/gal-view-minicard.h | 2 +- 62 files changed, 74 insertions(+), 74 deletions(-) (limited to 'addressbook/gui') 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, "", icon); - else + else g_string_append_printf (gstr, ""); } else { g_string_append_printf (gstr, "
"); if (icon) 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: -- cgit v1.2.3