diff options
227 files changed, 1243 insertions, 1253 deletions
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/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index c939b9cd27..ec89c9a34f 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -718,7 +718,7 @@ e_addr_context_destroy (EAddrConduitContext *ctxt) } /* Debug routines */ -static char * +static const gchar * print_local (EAddrLocalRecord *local) { static char buff[ 4096 ]; @@ -1532,12 +1532,12 @@ addressbook_authenticate (EBook *book, gpointer data) { gchar *auth; - gchar *user; + const gchar *user; gchar *passwd; gchar *str_uri; gchar *pass_key; gchar *auth_domain; - gchar *component_name; + const gchar *component_name; EUri *e_uri; ESource *source = (ESource *)data; @@ -1547,9 +1547,9 @@ addressbook_authenticate (EBook *book, component_name = auth_domain ? auth_domain : "Addressbook"; if (auth && !strcmp ("plain/password", auth)) - user = (gchar *)e_source_get_property (source, "user"); + user = e_source_get_property (source, "user"); else - user = (gchar *)e_source_get_property (source, "email_addr"); + user = e_source_get_property (source, "email_addr"); if (!user) user = ""; 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, "<table border=\"0\">"); 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]; diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index c699662b5c..b5c9f7f8ce 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -68,7 +68,7 @@ static char delimiter; static void csv_import_done(CSVImporter *gci); typedef struct { - char *csv_attribute; + const gchar *csv_attribute; EContactField contact_field; #define FLAG_HOME_ADDRESS 0x01 #define FLAG_WORK_ADDRESS 0x02 @@ -704,7 +704,7 @@ csv_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im) return vbox; } -static char *supported_extensions[4] = { +static const gchar *supported_extensions[4] = { ".csv", ".tab" , ".txt", NULL }; diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index 2f7b2cced9..b0380cf227 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -73,7 +73,7 @@ static void ldif_import_done(LDIFImporter *gci); static struct { - char *ldif_attribute; + const gchar *ldif_attribute; EContactField contact_field; #define FLAG_HOME_ADDRESS 0x01 #define FLAG_WORK_ADDRESS 0x02 @@ -556,7 +556,7 @@ ldif_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im) return vbox; } -static char *supported_extensions[2] = { +static const gchar *supported_extensions[2] = { ".ldif", NULL }; diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index c194f2705e..cd22b43380 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -7,8 +7,6 @@ ecps_DATA = \ INCLUDES = \ -DG_LOG_DOMAIN=\"addressbook-printing\" \ -I$(top_srcdir)/addressbook \ - -I$(top_srcdir)/addressbook/backend \ - -I$(top_builddir)/addressbook/backend \ -I$(top_srcdir) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c index 3c02834de3..e871eb6270 100644 --- a/addressbook/printing/test-print.c +++ b/addressbook/printing/test-print.c @@ -36,10 +36,10 @@ main (int argc, char *argv[]) glade_init (); - shown_fields = g_list_append (shown_fields, "First field"); - shown_fields = g_list_append (shown_fields, "Second field"); - shown_fields = g_list_append (shown_fields, "Third field"); - shown_fields = g_list_append (shown_fields, "Fourth field"); + shown_fields = g_list_append (shown_fields, (gpointer) "First field"); + shown_fields = g_list_append (shown_fields, (gpointer) "Second field"); + shown_fields = g_list_append (shown_fields, (gpointer) "Third field"); + shown_fields = g_list_append (shown_fields, (gpointer) "Fourth field"); /* does nothing */ e_contact_print (NULL, NULL, NULL, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG); diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c index 417214691b..b7ccf7c643 100644 --- a/addressbook/tools/evolution-addressbook-export-list-cards.c +++ b/addressbook/tools/evolution-addressbook-export-list-cards.c @@ -146,7 +146,7 @@ struct _EContactCSVFieldData { gint csv_field; gint contact_field; - gchar *csv_name; + const gchar *csv_name; EContactCSVDataType data_type; }; @@ -245,7 +245,6 @@ gchar *escape_string (gchar * orig); int output_n_cards_file (FILE * outputfile, GList *contacts, int size, int begin_no, CARD_FORMAT format); static void fork_to_background (void); void set_pre_defined_field (GSList ** pre_defined_fields); -guint action_list_cards_init (ActionContext * p_actctx); /* function declarations*/ diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index 0966284060..ce5d6c35d7 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -5,7 +5,6 @@ INCLUDES = \ -DLIBDIR=\"$(libdir)\" \ -DG_LOG_DOMAIN=\"EBook\" \ -I$(top_srcdir) \ - -I$(top_srcdir)/camel \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) diff --git a/art/broken-image-16.xpm b/art/broken-image-16.xpm index e96ee1aab0..b20b942bc5 100644 --- a/art/broken-image-16.xpm +++ b/art/broken-image-16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * broken_image_16_xpm[] = { +static const gchar *broken_image_16_xpm[] = { "16 16 42 1", " c None", ". c #000000", diff --git a/art/broken-image-24.xpm b/art/broken-image-24.xpm index ba6cc6854e..e6c31277a9 100644 --- a/art/broken-image-24.xpm +++ b/art/broken-image-24.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * broken_image_24_xpm[] = { +static const gchar *broken_image_24_xpm[] = { "24 24 142 2", " c None", ". c #000000", 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/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 <string.h> 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 <libecal/e-cal-component.h> #include <libedataserver/e-source-list.h> -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 <mail/em-composer-utils.h> #include <camel/camel-mime-filter-tohtml.h> -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/composer/e-composer-actions.c b/composer/e-composer-actions.c index 247ac7794f..077c0c5ec0 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -444,7 +444,7 @@ static GtkToggleActionEntry toggle_entries[] = { N_("S/MIME Sig_n"), NULL, N_("Sign this message with your S/MIME Signature Certificate"), - NULL, /* Handled by property bindings */ + G_CALLBACK (action_smime_sign_cb), FALSE }, { "view-bcc", diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index df96d763ba..ef03fb4f73 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -1025,7 +1025,6 @@ e_composer_header_table_get_header (EComposerHeaderTable *table, { g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); g_return_val_if_fail (type < E_COMPOSER_NUM_HEADERS, NULL); - g_return_val_if_fail (type >= 0, NULL); return table->priv->headers[type]; } diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c index 20967c6853..674e7a6cee 100644 --- a/composer/e-composer-header.c +++ b/composer/e-composer-header.c @@ -71,12 +71,6 @@ composer_header_addaction_clicked_cb (GtkButton *button, e_composer_header_set_visible (header, TRUE); } -static void -link_clicked_cb (GtkLinkButton *button, const gchar *link_, gpointer user_data) -{ - return; -} - static GObject * composer_header_constructor (GType type, guint n_construct_properties, 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/e-util/e-bconf-map.h b/e-util/e-bconf-map.h index 1d72119c8c..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; @@ -83,13 +83,13 @@ enum { }; typedef struct { - char *from; - char *to; - int type; + const gchar *from; + const gchar *to; + gint type; } e_gconf_map_t; typedef struct { - char *root; + const gchar *root; e_gconf_map_t *map; } e_gconf_map_list_t; diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h index ea8ed89797..4504f5afc6 100644 --- a/e-util/e-bit-array.h +++ b/e-util/e-bit-array.h @@ -66,7 +66,7 @@ void e_bit_array_clear (EBitArray *selection); gint e_bit_array_selected_count (EBitArray *selection); void e_bit_array_select_all (EBitArray *selection); void e_bit_array_invert_selection (EBitArray *selection); -int e_bit_array_bit_count (EBitArray *selection); +gint e_bit_array_bit_count (EBitArray *selection); void e_bit_array_change_one_row (EBitArray *selection, int row, gboolean grow); @@ -91,7 +91,6 @@ void e_bit_array_delete_single_mode (EBitArray *esm, void e_bit_array_move_row (EBitArray *esm, int old_row, int new_row); -gint e_bit_array_bit_count (EBitArray *esm); gboolean e_bit_array_cross_and (EBitArray *esm); gboolean e_bit_array_cross_or (EBitArray *esm); diff --git a/e-util/e-error.c b/e-util/e-error.c index 7c1248bb7b..23e52bca8e 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -41,27 +41,27 @@ struct _e_error_button { struct _e_error_button *next; - char *stock; - char *label; - int response; + const gchar *stock; + const gchar *label; + gint response; }; struct _e_error { guint32 flags; - char *id; - int type; - int default_response; - char *title; - char *primary; - char *secondary; - char *help_uri; + const gchar *id; + gint type; + gint default_response; + const gchar *title; + const gchar *primary; + const gchar *secondary; + const gchar *help_uri; gboolean scroll; struct _e_error_button *buttons; }; struct _e_error_table { - char *domain; - char *translation_domain; + const gchar *domain; + const gchar *translation_domain; GHashTable *errors; }; @@ -84,8 +84,8 @@ static struct _e_error default_errors[] = { /* ********************************************************************** */ static struct { - char *name; - int id; + const gchar *name; + gint id; } response_map[] = { { "GTK_RESPONSE_REJECT", GTK_RESPONSE_REJECT }, { "GTK_RESPONSE_ACCEPT", GTK_RESPONSE_ACCEPT }, @@ -111,9 +111,9 @@ map_response(const char *name) } static struct { - const char *name; - const char *icon; - const char *title; + const gchar *name; + const gchar *icon; + const gchar *title; } type_map[] = { { "info", GTK_STOCK_DIALOG_INFO, N_("Evolution Information") }, { "warning", GTK_STOCK_DIALOG_WARNING, N_("Evolution Warning") }, @@ -184,7 +184,7 @@ ee_load(const char *path) table = g_malloc0(sizeof(*table)); table->domain = g_strdup(tmp); table->errors = g_hash_table_new(g_str_hash, g_str_equal); - g_hash_table_insert(error_table, table->domain, table); + g_hash_table_insert(error_table, (gpointer) table->domain, table); tmp2 = (char *)xmlGetProp(root, (const unsigned char *)"translation-domain"); if (tmp2) { @@ -263,16 +263,20 @@ ee_load(const char *path) } } else if (!strcmp((char *)scan->name, "button")) { struct _e_error_button *b; + gchar *label = NULL; + gchar *stock = NULL; b = g_malloc0(sizeof(*b)); tmp = (char *)xmlGetProp(scan, (const unsigned char *)"stock"); if (tmp) { - b->stock = g_strdup(tmp); + stock = g_strdup(tmp); + b->stock = stock; xmlFree(tmp); } tmp = (char *)xmlGetProp(scan, (const unsigned char *)"label"); if (tmp) { - b->label = g_strdup(dgettext(table->translation_domain, tmp)); + label = g_strdup(dgettext(table->translation_domain, tmp)); + b->label = label; xmlFree(tmp); } tmp = (char *)xmlGetProp(scan, (const unsigned char *)"response"); @@ -281,10 +285,10 @@ ee_load(const char *path) xmlFree(tmp); } - if (b->stock == NULL && b->label == NULL) { + if (stock == NULL && label == NULL) { g_warning("Error file '%s': missing button details in error '%s'", path, e->id); - g_free(b->stock); - g_free(b->label); + g_free(stock); + g_free(label); g_free(b); } else { lastbutton->next = b; @@ -293,7 +297,7 @@ ee_load(const char *path) } } - g_hash_table_insert(table->errors, e->id, e); + g_hash_table_insert(table->errors, (gpointer) e->id, e); } } @@ -319,8 +323,8 @@ ee_load_tables(void) table->domain = "builtin"; table->errors = g_hash_table_new(g_str_hash, g_str_equal); for (i=0;i<sizeof(default_errors)/sizeof(default_errors[0]);i++) - g_hash_table_insert(table->errors, default_errors[i].id, &default_errors[i]); - g_hash_table_insert(error_table, table->domain, table); + g_hash_table_insert(table->errors, (gpointer) default_errors[i].id, &default_errors[i]); + g_hash_table_insert(error_table, (gpointer) table->domain, table); /* look for installed error tables */ base = g_build_filename (EVOLUTION_PRIVDATADIR, "errors", NULL); 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-html-utils.c b/e-util/e-html-utils.c index d634f5f6b0..4cdb0eefa3 100644 --- a/e-util/e-html-utils.c +++ b/e-util/e-html-utils.c @@ -246,7 +246,7 @@ e_text_to_html_full (const char *input, unsigned int flags, guint32 color) colored = TRUE; } } else if (colored) { - gchar *no_font = "</FONT>"; + const gchar *no_font = "</FONT>"; out = check_size (&buffer, &buffer_size, out, 9); out += sprintf (out, "%s", no_font); 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/e-util/e-non-intrusive-error-dialog.h b/e-util/e-non-intrusive-error-dialog.h index e801d47a52..827e17f868 100644 --- a/e-util/e-non-intrusive-error-dialog.h +++ b/e-util/e-non-intrusive-error-dialog.h @@ -31,10 +31,10 @@ G_BEGIN_DECLS struct _log_data { - int level; - char *key; - char *text; - char *stock_id; + gint level; + const gchar *key; + const gchar *text; + const gchar *stock_id; GdkPixbuf *pbuf; } ldata [] = { { E_LOG_ERROR, N_("Error"), N_("Errors"), GTK_STOCK_DIALOG_ERROR }, diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c index 60da48d375..4b99d897db 100644 --- a/e-util/e-text-event-processor-emacs-like.c +++ b/e-util/e-text-event-processor-emacs-like.c @@ -29,8 +29,6 @@ #include "e-text-event-processor-emacs-like.h" #include "e-util.h" -static void e_text_event_processor_emacs_like_init (ETextEventProcessorEmacsLike *card); -static void e_text_event_processor_emacs_like_class_init (ETextEventProcessorEmacsLikeClass *klass); static gint e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event); G_DEFINE_TYPE (ETextEventProcessorEmacsLike, e_text_event_processor_emacs_like, E_TEXT_EVENT_PROCESSOR_TYPE) diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h index 9caf2abe6d..c4c0efa424 100644 --- a/e-util/e-text-event-processor-types.h +++ b/e-util/e-text-event-processor-types.h @@ -83,8 +83,8 @@ typedef enum { typedef struct { ETextEventProcessorCommandPosition position; ETextEventProcessorCommandAction action; - int value; - char *string; + gint value; + const gchar *string; guint32 time; } ETextEventProcessorCommand; @@ -102,7 +102,7 @@ typedef struct { guint state; guint keyval; gint length; - gchar *string; + const gchar *string; } ETextEventProcessorEventKey; typedef struct { diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c index b515f33f57..48100de64a 100644 --- a/e-util/e-text-event-processor.c +++ b/e-util/e-text-event-processor.c @@ -27,9 +27,6 @@ #include "e-text-event-processor.h" #include "e-util.h" -static void e_text_event_processor_init (ETextEventProcessor *card); -static void e_text_event_processor_class_init (ETextEventProcessorClass *klass); - static void e_text_event_processor_set_property (GObject *object, guint prop_id, const GValue *value, diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c index 85984da59c..a7d5913bbd 100644 --- a/e-util/e-util-labels.c +++ b/e-util/e-util-labels.c @@ -34,8 +34,14 @@ #include "e-dialog-utils.h" #include "filter/filter-option.h" -/* Note, the first element of each EUtilLabel must NOT be translated */ -EUtilLabel label_defaults[LABEL_DEFAULTS_NUM] = { +typedef struct { + const gchar *tag; + const gchar *name; + const gchar *colour; +} DefaultLabel; + +/* Note, the first element of each DefaultLabel must NOT be translated */ +DefaultLabel label_defaults[] = { { "$Labelimportant", N_("I_mportant"), "#EF2929" }, /* red */ { "$Labelwork", N_("_Work"), "#F57900" }, /* orange */ { "$Labelpersonal", N_("_Personal"), "#4E9A06" }, /* green */ @@ -84,7 +90,7 @@ e_util_labels_parse (GConfClient *client) label = g_new (EUtilLabel, 1); /* Needed for Backward Compatibility */ - if (num < LABEL_DEFAULTS_NUM) { + if (num < G_N_ELEMENTS (label_defaults)) { label->name = g_strdup ((buf && *buf) ? buf : _(label_defaults[num].name)); label->tag = g_strdup (label_defaults[num].tag); num++; @@ -106,7 +112,7 @@ e_util_labels_parse (GConfClient *client) if (head) g_slist_free (head); - while (num < LABEL_DEFAULTS_NUM) { + while (num < G_N_ELEMENTS (label_defaults)) { /* complete the list with defaults */ label = g_new (EUtilLabel, 1); label->tag = g_strdup (label_defaults[num].tag); @@ -452,7 +458,7 @@ e_util_labels_is_system (const char *tag) if (!tag) return FALSE; - for (i = 0; i < LABEL_DEFAULTS_NUM; i++) { + for (i = 0; i < G_N_ELEMENTS (label_defaults); i++) { if (strcmp (tag, label_defaults[i].tag) == 0) return TRUE; } @@ -474,7 +480,7 @@ e_util_labels_get_new_tag (const char *old_tag) if (!old_tag) return NULL; - for (i = 0; i < LABEL_DEFAULTS_NUM; i++) { + for (i = 0; i < G_N_ELEMENTS (label_defaults); i++) { /* default labels have same name as those old, only with prefix "$Label" */ if (!strcmp (old_tag, label_defaults[i].tag + 6)) return label_defaults[i].tag; diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h index 26520ff226..ee06cccc99 100644 --- a/e-util/e-util-labels.h +++ b/e-util/e-util-labels.h @@ -27,16 +27,13 @@ struct _GtkWindow; struct _GConfClient; typedef struct { - char *tag; - char *name; - char *colour; + gchar *tag; + gchar *name; + gchar *colour; } EUtilLabel; #define E_UTIL_LABELS_GCONF_KEY "/apps/evolution/mail/labels" -#define LABEL_DEFAULTS_NUM 5 -extern EUtilLabel label_defaults[LABEL_DEFAULTS_NUM]; - GSList * e_util_labels_parse (struct _GConfClient *client); void e_util_labels_free (GSList *labels); diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h index 59d11c63fe..ef8ae8ac8a 100644 --- a/e-util/e-xml-utils.h +++ b/e-util/e-xml-utils.h @@ -92,8 +92,6 @@ void e_xml_set_string_prop_by_name (xmlNode *parent, gchar *e_xml_get_translated_string_prop_by_name (const xmlNode *parent, const xmlChar *prop_name); -int e_xml_save_file (const char *filename, xmlDocPtr doc); - G_END_DECLS #endif /* __E_XML_UTILS__ */ diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index 81fe08ef14..ff880a12bd 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -107,11 +107,6 @@ typedef union { static void unbind (Binding *binding); -#if !HAVE_DECL_GCONF_VALUE_COMPARE /* Not in headers in GConf < 2.13 */ -int gconf_value_compare (const GConfValue *value_a, - const GConfValue *value_b); -#endif - static GConfBridge *bridge = NULL; /* Global GConfBridge object */ /* Free up all resources allocated by the GConfBridge. Called on exit. */ diff --git a/filter/filter-file.c b/filter/filter-file.c index 4126c4b937..e43a02b2ef 100644 --- a/filter/filter-file.c +++ b/filter/filter-file.c @@ -208,7 +208,7 @@ xml_encode (FilterElement *fe) { FilterFile *file = (FilterFile *) fe; xmlNodePtr cur, value; - char *type; + const gchar *type; type = file->type ? file->type : "file"; diff --git a/filter/filter-input.c b/filter/filter-input.c index be88a06835..693fea0bab 100644 --- a/filter/filter-input.c +++ b/filter/filter-input.c @@ -237,7 +237,7 @@ xml_encode (FilterElement *fe) xmlNodePtr value; GList *l; FilterInput *fi = (FilterInput *)fe; - char *type; + const gchar *type; type = fi->type ? fi->type : "string"; diff --git a/filter/rule-editor.c b/filter/rule-editor.c index dc4c65a24c..066689a598 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -639,7 +639,7 @@ rule_bottom (GtkWidget *widget, RuleEditor *re) } static struct { - char *name; + const gchar *name; GCallback func; } edit_buttons[] = { { "rule_add", G_CALLBACK (rule_add) }, 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;i<num_ssl_options;i++) { @@ -1756,8 +1757,8 @@ emae_setup_service(EMAccountEditor *emae, EMAccountEditorService *service, Glade /* do not re-order these, the order is used by various code to look up emae->priv->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;i<sizeof(type_builtin_table)/sizeof(type_builtin_table[0]);i++) - g_hash_table_insert(klass->type_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 1c58b6ca99..974c8b97a8 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -56,6 +56,7 @@ #include <glib/gi18n.h> #include <e-util/e-util.h> +#include <libedataserver/e-xml-utils.h> #include <libedataserver/e-data-server-util.h> #include <e-util/e-xml-utils.h> @@ -358,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) { @@ -951,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 */ @@ -1284,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; @@ -1295,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)) @@ -1554,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/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 ("<b><big>", txt, "</big></b>", NULL); + markup = g_strconcat ("<b><big>", txt, "</big></b>", 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 ("<i>", str, "</i>", NULL); + markup = g_strconcat ("<i>", str, "</i>", 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, "<tr><td>" , folder_names_for_display[i], - ":</td><td>", role_name, "</td> </tr>", NULL); + g_string_append_printf ( + role_name_final, + "<tr><td>%s:</td><td>%s</td></tr>", + folder_names_for_display[i], role_name); } - camel_stream_printf (stream, "%s</table>", role_name_final); + camel_stream_printf (stream, "%s</table>", 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 6c1775a8b5..c777f6cbb5 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -2587,8 +2587,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/shell/e-shell-importer.c b/shell/e-shell-importer.c index 8bc3b12c5c..cb990f973b 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -121,8 +121,8 @@ typedef struct _ImportData { #endif static struct { - char *name; - char *text; + const gchar *name; + const gchar *text; } info[] = { { "type_html", N_("Choose the type of importer to run:") diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 3d148781f1..cdd9e3b82e 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -123,7 +123,7 @@ command_submit_bug (BonoboUIComponent *uih, EShellWindow *window, const char *path) { - gchar *command_line; + const gchar *command_line; GError *error = NULL; command_line = "bug-buddy --sm-disable --package=Evolution"; diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index abc4848663..ef58e3d659 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -158,7 +158,8 @@ get_components_from_bonobo (EUserCreatableItemsHandler *handler) Bonobo_ServerInfoList *info_list; Bonobo_ActivationProperty *property; CORBA_Environment ev; - char *iid, *alias; + const gchar *alias; + char *iid; GNOME_Evolution_Component corba_component; Component *component; int i; diff --git a/shell/main.c b/shell/main.c index 2abd30eec1..5ffe316c26 100644 --- a/shell/main.c +++ b/shell/main.c @@ -155,7 +155,8 @@ kill_old_dataserver (void) CORBA_exception_init (&ev); /* FIXME Should we really kill it off? We also shouldn't hard code the version */ - iface = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_DataServer_InterfaceCheck", 0, NULL, &ev); + iface = bonobo_activation_activate_from_id ( + (Bonobo_ActivationID) "OAFIID:GNOME_Evolution_DataServer_InterfaceCheck", 0, NULL, &ev); if (BONOBO_EX (&ev) || iface == CORBA_OBJECT_NIL) { kill_dataserver (); CORBA_exception_free (&ev); @@ -345,7 +346,8 @@ idle_cb (gchar **uris) break; case E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER: - corba_shell = bonobo_activation_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev); + corba_shell = bonobo_activation_activate_from_id ( + (Bonobo_ActivationID) E_SHELL_OAFIID, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION || corba_shell == CORBA_OBJECT_NIL) { e_error_run(NULL, "shell:noshell", NULL); CORBA_exception_free (&ev); 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/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index f0879a41ae..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 <config.h> #endif +#include <time.h> #include <string.h> #include <glib/gi18n.h> #include <glade/glade.h> @@ -75,14 +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_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 +399,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-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/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 = "<ETableSpecification cursor-mode=\"line\"" " selection-mode=\"browse\"" " no-headers=\"true\"" diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h index c297bde53f..37589f4243 100644 --- a/widgets/misc/e-popup-menu.h +++ b/widgets/misc/e-popup-menu.h @@ -29,65 +29,43 @@ G_BEGIN_DECLS -#define E_POPUP_SEPARATOR { "", NULL, (NULL), NULL, 0 } +#define E_POPUP_SEPARATOR { (gchar *) "", NULL, (NULL), NULL, 0 } #define E_POPUP_TERMINATOR { NULL, NULL, (NULL), NULL, 0 } /* In the following, CC = custom closure */ -#define E_POPUP_ITEM(name,fn,disable_mask) { (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 0, 0, 0, 0 } -#define E_POPUP_ITEM_CC(name,fn,closure,disable_mask) { (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 0, 0, 0, 1 } -#define E_POPUP_SUBMENU(name,submenu,disable_mask) { (name), NULL, NULL, (submenu), (disable_mask), NULL, NULL, 0, 0, 0, 0 } +#define E_POPUP_ITEM(name,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 0, 0, 0, 0 } +#define E_POPUP_ITEM_CC(name,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 0, 0, 0, 1 } +#define E_POPUP_SUBMENU(name,submenu,disable_mask) { (gchar *) (name), NULL, NULL, (submenu), (disable_mask), NULL, NULL, 0, 0, 0, 0 } -#define E_POPUP_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 0, 0, 0, 0 } -#define E_POPUP_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 0, 0, 0, 1 } -#define E_POPUP_PIXMAP_SUBMENU(name,pixmap,submenu,disable_mask) { (name), (pixmap), NULL, (submenu), (disable_mask), NULL, NULL, 0, 0, 0, 0 } +#define E_POPUP_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 0, 0, 0, 0 } +#define E_POPUP_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 0, 0, 0, 1 } +#define E_POPUP_PIXMAP_SUBMENU(name,pixmap,submenu,disable_mask) { (gchar *) (name), (pixmap), NULL, (submenu), (disable_mask), NULL, NULL, 0, 0, 0, 0 } -#define E_POPUP_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 0, 0, 0, 0 } -#define E_POPUP_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 0, 0, 1 } -#define E_POPUP_PIXMAP_WIDGET_SUBMENU(name,pixmap_widget,submenu,disable_mask) { (name), NULL, NULL, (submenu), (disable_mask), (pixmap_widget), NULL, 0, 0, 0, 0 } +#define E_POPUP_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 0, 0, 0, 0 } +#define E_POPUP_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 0, 0, 1 } +#define E_POPUP_PIXMAP_WIDGET_SUBMENU(name,pixmap_widget,submenu,disable_mask) { (gchar *) (name), NULL, NULL, (submenu), (disable_mask), (pixmap_widget), NULL, 0, 0, 0, 0 } -#define E_POPUP_TOGGLE_ITEM(name,fn,disable_mask,value) { (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 1, 0, value, 0 } -#define E_POPUP_TOGGLE_ITEM_CC(name,fn,closure,disable_mask,value) { (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 } +#define E_POPUP_TOGGLE_ITEM(name,fn,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 1, 0, value, 0 } +#define E_POPUP_TOGGLE_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 } +#define E_POPUP_TOGGLE_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 } -#define E_POPUP_SEPARATOR { "", NULL, (NULL), NULL, 0 } -#define E_POPUP_TERMINATOR { NULL, NULL, (NULL), NULL, 0 } - - -/* In the following, CC = custom closure */ - -#define E_POPUP_ITEM(name,fn,disable_mask) { (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 0, 0, 0, 0 } -#define E_POPUP_ITEM_CC(name,fn,closure,disable_mask) { (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 0, 0, 0, 1 } -#define E_POPUP_SUBMENU(name,submenu,disable_mask) { (name), NULL, NULL, (submenu), (disable_mask), NULL, NULL, 0, 0, 0, 0 } - -#define E_POPUP_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 0, 0, 0, 0 } -#define E_POPUP_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 0, 0, 0, 1 } -#define E_POPUP_PIXMAP_SUBMENU(name,pixmap,submenu,disable_mask) { (name), (pixmap), NULL, (submenu), (disable_mask), NULL, NULL, 0, 0, 0, 0 } - -#define E_POPUP_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 0, 0, 0, 0 } -#define E_POPUP_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 0, 0, 1 } -#define E_POPUP_PIXMAP_WIDGET_SUBMENU(name,pixmap_widget,submenu,disable_mask) { (name), NULL, NULL, (submenu), (disable_mask), (pixmap_widget), NULL, 0, 0, 0, 0 } - - -#define E_POPUP_TOGGLE_ITEM(name,fn,disable_mask,value) { (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 1, 0, value, 0 } -#define E_POPUP_TOGGLE_ITEM_CC(name,fn,closure,disable_mask,value) { (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 } - -#define E_POPUP_TOGGLE_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 1, 0, value, 0 } -#define E_POPUP_TOGGLE_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 } - -#define E_POPUP_TOGGLE_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 1, 0, value, 0 } -#define E_POPUP_TOGGLE_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 1, 0, value, 1 } +#define E_POPUP_TOGGLE_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 1, 0, value, 0 } +#define E_POPUP_TOGGLE_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 } +#define E_POPUP_TOGGLE_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 1, 0, value, 0 } +#define E_POPUP_TOGGLE_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 1, 0, value, 1 } -#define E_POPUP_RADIO_ITEM(name,fn,disable_mask,value) { (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 0, 1, value, 0 } -#define E_POPUP_RADIO_ITEM_CC(name,fn,closure,disable_mask,value) { (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 0, 1, value, 1 } +#define E_POPUP_RADIO_ITEM(name,fn,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 0, 1, value, 0 } +#define E_POPUP_RADIO_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 0, 1, value, 1 } -#define E_POPUP_RADIO_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 0, 1, value, 0 } -#define E_POPUP_RADIO_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 0, 1, value, 1 } +#define E_POPUP_RADIO_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 0, 1, value, 0 } +#define E_POPUP_RADIO_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 0, 1, value, 1 } -#define E_POPUP_RADIO_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 0, 1, value, 0 } -#define E_POPUP_RADIO_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 1, value, 1 } +#define E_POPUP_RADIO_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 0, 1, value, 0 } +#define E_POPUP_RADIO_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 1, value, 1 } typedef struct _EPopupMenu EPopupMenu; diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h index 2d01598541..f2d9b0576b 100644 --- a/widgets/misc/e-search-bar.h +++ b/widgets/misc/e-search-bar.h @@ -54,9 +54,9 @@ enum _ESearchBarItemType { typedef enum _ESearchBarItemType ESearchBarItemType; typedef struct { - char *text; - int id; - int type; + gchar *text; + gint id; + gint type; } ESearchBarItem; typedef struct _ESearchBar ESearchBar; diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c index 88fa6f857f..f2856622ec 100644 --- a/widgets/misc/e-selection-model-simple.c +++ b/widgets/misc/e-selection-model-simple.c @@ -30,6 +30,8 @@ static gint esms_get_row_count (ESelectionModelArray *esma); +G_DEFINE_TYPE (ESelectionModelSimple, e_selection_model_simple, e_selection_model_array_get_type()) + static void e_selection_model_simple_init (ESelectionModelSimple *selection) { @@ -46,8 +48,6 @@ e_selection_model_simple_class_init (ESelectionModelSimpleClass *klass) esma_class->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 = "<ETableSpecification gettext-domain=\"" GETTEXT_PACKAGE "\" no-headers=\"true\" cursor-mode=\"line\" " +static const gchar *spec = +"<ETableSpecification gettext-domain=\"" GETTEXT_PACKAGE "\" no-headers=\"true\" cursor-mode=\"line\" " " draw-grid=\"false\" draw-focus=\"true\" selection-mode=\"browse\">" "<ETableColumn model_col= \"0\" _title=\"Name\" minimum_width=\"30\" resizable=\"true\" cell=\"string\" compare=\"string\"/>" "<ETableState> <column source=\"0\"/>" diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index 2fa6e5cecf..107739e5bf 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) @@ -204,14 +204,14 @@ 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); } 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); @@ -219,14 +219,14 @@ 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); } 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); @@ -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 986d9b9208..a7efcd8225 100644 --- a/widgets/table/e-table-extras.h +++ b/widgets/table/e-table-extras.h @@ -54,28 +54,28 @@ 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); + const gchar *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); + const gchar *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); + 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 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/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 <glib/gstdio.h> #include <libxml/tree.h> #include <libxml/parser.h> +#include <libedataserver/e-xml-utils.h> #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" 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; |