From 5825d072d2ece1ec9ed98c42e146523dabce7288 Mon Sep 17 00:00:00 2001 From: Jorge Gonzalez Date: Wed, 27 May 2009 06:23:42 +0200 Subject: Updated Spanish translation --- po/es.po | 399 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 170 insertions(+), 229 deletions(-) diff --git a/po/es.po b/po/es.po index 8bb043f598..8c2ce4f3e9 100644 --- a/po/es.po +++ b/po/es.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: evolution.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=evolution\n" -"POT-Creation-Date: 2009-05-24 06:09+0000\n" -"PO-Revision-Date: 2009-05-24 13:46+0200\n" +"POT-Creation-Date: 2009-05-25 18:00+0000\n" +"PO-Revision-Date: 2009-05-27 06:20+0200\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -652,8 +652,8 @@ msgstr "Gestione sus certificados S/MIME aquí" #: ../calendar/gui/calendar-component.c:192 #: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:475 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091 -#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:200 -#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2890 +#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:203 +#: ../mail/em-folder-tree-model.c:205 ../mail/em-migrate.c:2890 #: ../mail/mail-component.c:318 ../mail/mail-vfolder.c:217 #: ../mail/message-list.c:1517 msgid "On This Computer" @@ -804,7 +804,7 @@ msgstr "" #: ../calendar/gui/dialogs/calendar-setup.c:378 #: ../calendar/gui/dialogs/calendar-setup.c:389 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95 -#: ../plugins/itip-formatter/itip-formatter.c:2543 +#: ../plugins/itip-formatter/itip-formatter.c:2545 #: ../smime/gui/smime-ui.glade.h:28 msgid "General" msgstr "General" @@ -906,18 +906,18 @@ msgstr "" "Tenga paciencia mientras Evolution migra sus datos Pilot Sync…" #: ../addressbook/gui/component/addressbook-view.c:422 -#: ../mail/em-folder-utils.c:455 +#: ../mail/em-folder-utils.c:453 #, c-format msgid "Rename the \"%s\" folder to:" msgstr "Renombrar la carpeta «%s» a:" #: ../addressbook/gui/component/addressbook-view.c:425 -#: ../mail/em-folder-utils.c:457 +#: ../mail/em-folder-utils.c:455 msgid "Rename Folder" msgstr "Renombrar carpeta" #: ../addressbook/gui/component/addressbook-view.c:430 -#: ../mail/em-folder-utils.c:463 +#: ../mail/em-folder-utils.c:461 msgid "Folder names cannot contain '/'" msgstr "Los nombres de carpetas no pueden contener el carácter «/»" @@ -932,7 +932,7 @@ msgstr "Guardar como vCard…" #: ../addressbook/gui/component/addressbook-view.c:951 #: ../calendar/gui/calendar-component.c:628 #: ../calendar/gui/memos-component.c:481 ../calendar/gui/tasks-component.c:473 -#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:39 +#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:39 msgid "_Rename..." msgstr "_Renombrar…" @@ -942,7 +942,7 @@ msgstr "_Renombrar…" #: ../calendar/gui/e-calendar-table.c:1616 #: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:954 #: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:476 -#: ../mail/em-folder-tree.c:2130 ../mail/em-folder-view.c:1340 +#: ../mail/em-folder-tree.c:2052 ../mail/em-folder-view.c:1340 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16 #: ../ui/evolution-tasks.xml.h:24 @@ -952,7 +952,7 @@ msgstr "_Borrar" #: ../addressbook/gui/component/addressbook-view.c:957 #: ../calendar/gui/calendar-component.c:636 #: ../calendar/gui/memos-component.c:489 ../calendar/gui/tasks-component.c:481 -#: ../mail/em-folder-tree.c:2139 ../ui/evolution-addressbook.xml.h:59 +#: ../mail/em-folder-tree.c:2061 ../ui/evolution-addressbook.xml.h:59 #: ../ui/evolution-mail-list.xml.h:38 msgid "_Properties" msgstr "_Propiedades" @@ -1238,7 +1238,7 @@ msgstr "tarjetas" #: ../addressbook/gui/component/ldap-config.glade.h:43 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10 #: ../calendar/gui/dialogs/event-page.glade.h:23 -#: ../plugins/caldav/caldav-source.c:411 +#: ../plugins/caldav/caldav-source.c:448 #: ../plugins/calendar-http/calendar-http.c:278 #: ../plugins/calendar-weather/calendar-weather.c:523 #: ../plugins/google-account-setup/google-source.c:653 @@ -1925,7 +1925,7 @@ msgstr "Cor_tar" #: ../addressbook/gui/widgets/e-addressbook-view.c:952 #: ../calendar/gui/e-calendar-table.c:1602 #: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:945 -#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-view.c:1325 +#: ../mail/em-folder-tree.c:928 ../mail/em-folder-view.c:1325 #: ../mail/message-list.c:2105 ../ui/evolution-addressbook.xml.h:46 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23 @@ -3280,7 +3280,7 @@ msgid "Could not write pilot's ToDo application block" msgstr "No es posible escribir el bloque de aplicación ToDo del Pilot" #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1 -#: ../plugins/itip-formatter/itip-formatter.c:2534 +#: ../plugins/itip-formatter/itip-formatter.c:2536 msgid "Calendar and Tasks" msgstr "Calendario y tareas" @@ -3372,7 +3372,7 @@ msgstr[1] "minutos" #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8 #: ../calendar/gui/dialogs/event-page.glade.h:22 -#: ../plugins/caldav/caldav-source.c:412 +#: ../plugins/caldav/caldav-source.c:449 #: ../plugins/calendar-http/calendar-http.c:279 #: ../plugins/calendar-weather/calendar-weather.c:524 #: ../plugins/google-account-setup/google-source.c:654 @@ -3794,7 +3794,7 @@ msgstr "Directorio donde guardar los sonidos de las alertas" #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54 msgid "Scroll Month View by a week" -msgstr "" +msgstr "Desplazar la vista mensual una semana" #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55 msgid "Show RSVP field in the event/task/meeting editor" @@ -3993,7 +3993,7 @@ msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas." #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93 msgid "Whether to scroll a Month View by a week, not by a month." -msgstr "" +msgstr "Indica si se debe desplazar la vista mensual una semana, no un mes." #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94 msgid "Whether to set a default reminder for appointments." @@ -4143,7 +4143,7 @@ msgid "Purge events older than" msgstr "Purgar acontecimientos anteriores a" #: ../calendar/gui/calendar-commands.c:326 -#: ../plugins/caldav/caldav-source.c:413 +#: ../plugins/caldav/caldav-source.c:450 #: ../plugins/calendar-http/calendar-http.c:280 #: ../plugins/calendar-weather/calendar-weather.c:525 #: ../plugins/google-account-setup/google-source.c:655 @@ -4177,7 +4177,7 @@ msgstr "Calendario _nuevo" #: ../calendar/gui/calendar-component.c:627 #: ../calendar/gui/memos-component.c:480 ../calendar/gui/tasks-component.c:472 -#: ../mail/em-folder-tree.c:2125 +#: ../mail/em-folder-tree.c:2047 msgid "_Copy..." msgstr "_Copiar…" @@ -4566,7 +4566,7 @@ msgstr "Adjuntar archivo(s)" #: ../plugins/calendar-weather/calendar-weather.c:387 #: ../plugins/email-custom-header/email-custom-header.c:395 #: ../plugins/exchange-operations/exchange-delegates-user.c:181 -#: ../plugins/itip-formatter/itip-formatter.c:2190 +#: ../plugins/itip-formatter/itip-formatter.c:2192 #: ../widgets/misc/e-cell-date-edit.c:316 ../widgets/misc/e-dateedit.c:1510 #: ../widgets/misc/e-dateedit.c:1726 #: ../widgets/misc/e-signature-combo-box.c:74 @@ -4696,7 +4696,7 @@ msgstr "sábado" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37 msgid "Sc_roll Month View by a week" -msgstr "" +msgstr "Desplazar la vista mens_ual una semana" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38 msgid "Se_cond zone:" @@ -4709,7 +4709,7 @@ msgstr "Seleccione los calendarios para las alertas de notificación" #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 msgid "Sh_ow a reminder" -msgstr "M_ostrar un recordatorio" +msgstr "Mos_\ttrar un recordatorio" #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 @@ -4723,7 +4723,7 @@ msgstr "Mostrar los _números de las semanas en el navegador de fechas" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45 msgid "Show week n_umber in Day and Work Week View" msgstr "" -"Mostrar los n_úmeros de las semanas en la Vista diaria y en la Vista de la " +"Mostrar los núme_ros de las semanas en la Vista diaria y en la Vista de la " "semana laboral" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46 @@ -4734,7 +4734,7 @@ msgstr "domingo" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47 msgid "T_asks due today:" -msgstr "Ta_reas que vencen hoy:" +msgstr "_Tareas que vencen hoy:" #. Thursday #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 @@ -4779,7 +4779,7 @@ msgstr "miércoles" #. A weekday like "Monday" follows #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58 msgid "Wee_k starts on:" -msgstr "La _semana empieza en:" +msgstr "La sema_na empieza en:" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59 msgid "Work days:" @@ -4795,7 +4795,7 @@ msgstr "_24 horas" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62 msgid "_Ask for confirmation when deleting items" -msgstr "Pedir confirm_ación al borrar elementos" +msgstr "Pedir con_firmación al borrar elementos" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63 msgid "_Compress weekends in month view" @@ -4803,12 +4803,12 @@ msgstr "_Comprimir fines de semana en la vista mensual" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64 msgid "_Day begins:" -msgstr "La jornada laboral _comienza a las:" +msgstr "La jornada laboral c_omienza a las:" #. Friday #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66 msgid "_Fri" -msgstr "_Vie" +msgstr "Vi_e" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67 msgid "_Hide completed tasks after" @@ -5084,7 +5084,7 @@ msgstr "_Insertar" msgid "_Options" msgstr "_Opciones" -#: ../calendar/gui/dialogs/comp-editor.c:1054 ../mail/em-folder-tree.c:2117 +#: ../calendar/gui/dialogs/comp-editor.c:1054 ../mail/em-folder-tree.c:2039 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30 #: ../ui/evolution.xml.h:55 @@ -5173,7 +5173,7 @@ msgid "Toggles whether the Attendee Type is displayed" msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»" #: ../calendar/gui/dialogs/comp-editor.c:1167 -#: ../composer/e-composer-private.c:67 +#: ../composer/e-composer-private.c:66 msgid "Recent _Documents" msgstr "_Documentos recientes" @@ -5492,7 +5492,7 @@ msgstr "_Hora:" #: ../calendar/gui/dialogs/event-page.glade.h:18 #: ../calendar/gui/dialogs/memo-page.glade.h:8 #: ../calendar/gui/dialogs/task-page.glade.h:10 -#: ../mail/mail-config.glade.h:193 ../mail/mail-dialogs.glade.h:24 +#: ../mail/mail-config.glade.h:193 ../mail/mail-dialogs.glade.h:21 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5 #: ../smime/gui/smime-ui.glade.h:49 msgid "" @@ -6082,7 +6082,7 @@ msgstr "Fecha de terminación" #: ../calendar/gui/e-calendar-table.etspec.h:9 #: ../calendar/gui/e-memo-table.etspec.h:4 msgid "Last modified" -msgstr "" +msgstr "Modificado por última vez" #: ../calendar/gui/e-cal-list-view.etspec.h:6 #: ../calendar/gui/e-memo-table.etspec.h:5 @@ -6134,7 +6134,7 @@ msgstr "No" #: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984 #: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342 #: ../plugins/itip-formatter/itip-formatter.c:448 -#: ../plugins/itip-formatter/itip-formatter.c:2215 +#: ../plugins/itip-formatter/itip-formatter.c:2217 #: ../plugins/plugin-manager/plugin-manager.c:89 #: ../widgets/misc/e-charset-picker.c:56 msgid "Unknown" @@ -6429,7 +6429,7 @@ msgstr "Borrar tod_as las repeticiones" #: ../calendar/gui/e-itip-control.c:1184 #: ../calendar/gui/e-meeting-list-view.c:202 #: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195 -#: ../plugins/itip-formatter/itip-formatter.c:2203 +#: ../plugins/itip-formatter/itip-formatter.c:2205 msgid "Accepted" msgstr "Aceptado" @@ -6437,7 +6437,7 @@ msgstr "Aceptado" #: ../calendar/gui/e-itip-control.c:1192 #: ../calendar/gui/e-meeting-list-view.c:203 #: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197 -#: ../plugins/itip-formatter/itip-formatter.c:2209 +#: ../plugins/itip-formatter/itip-formatter.c:2211 msgid "Declined" msgstr "Rehusado" @@ -6451,7 +6451,7 @@ msgstr "Provisional" #: ../calendar/gui/e-calendar-view.c:2294 #: ../calendar/gui/e-meeting-list-view.c:205 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201 -#: ../plugins/itip-formatter/itip-formatter.c:2212 +#: ../plugins/itip-formatter/itip-formatter.c:2214 msgid "Delegated" msgstr "Delegado" @@ -6643,7 +6643,7 @@ msgstr "" "abajo." #: ../calendar/gui/e-itip-control.c:1188 -#: ../plugins/itip-formatter/itip-formatter.c:2206 +#: ../plugins/itip-formatter/itip-formatter.c:2208 msgid "Tentatively Accepted" msgstr "Aceptado provisionalmente" @@ -6866,7 +6866,7 @@ msgid "Attendee status updated\n" msgstr "Estado del participante actualizado\n" #: ../calendar/gui/e-itip-control.c:2073 -#: ../plugins/itip-formatter/itip-formatter.c:1383 +#: ../plugins/itip-formatter/itip-formatter.c:1385 msgid "Attendee status can not be updated because the item no longer exists" msgstr "" "El estado del participante no pudo actualizarse porque ya no existe el " @@ -7834,7 +7834,7 @@ msgstr "Reuniones y citas" #: ../calendar/importers/icalendar-importer.c:333 #: ../calendar/importers/icalendar-importer.c:628 -#: ../plugins/itip-formatter/itip-formatter.c:1727 +#: ../plugins/itip-formatter/itip-formatter.c:1729 msgid "Opening calendar" msgstr "Apertura del calendario" @@ -9620,7 +9620,6 @@ msgstr "_Cc:" # #En conflicto con _Mensaje #: ../composer/e-composer-header-table.c:945 -#| msgid "Sho_w: " msgid "Show CC" msgstr "Mostrar Cc" @@ -9630,7 +9629,6 @@ msgstr "Cc_o:" # #En conflicto con _Mensaje #: ../composer/e-composer-header-table.c:950 -#| msgid "Sho_w: " msgid "Show BCC" msgstr "Mostrar Cco" @@ -9662,13 +9660,11 @@ msgstr "Elija las carpetas en las que publicar el mensaje." msgid "Click here to select folders to post to" msgstr "Pulse aquí para seleccionar carpetas en las que publicar" -#: ../composer/e-composer-private.c:168 -#| msgid "Save Draft" +#: ../composer/e-composer-private.c:169 msgid "Save draft" msgstr "Guardar borrador" -#: ../composer/e-composer-private.c:184 -#| msgid "Add Attachment" +#: ../composer/e-composer-private.c:186 msgid "Add attachment" msgstr "Añadir adjunto" @@ -10504,7 +10500,6 @@ msgid "Matches: %d" msgstr "Coincide con: %d" #: ../mail/e-mail-search-bar.c:520 -#| msgid "Close this window" msgid "Close the find bar" msgstr "Cerrar la barra de búsqueda" @@ -10513,7 +10508,6 @@ msgid "Fin_d:" msgstr "_Buscar:" #: ../mail/e-mail-search-bar.c:540 -#| msgid "Always search" msgid "Clear the search" msgstr "Limpiar la búsqueda" @@ -10534,7 +10528,6 @@ msgid "Find the next occurrence of the phrase" msgstr "Buscar la siguiente coincidencia de la frase" #: ../mail/e-mail-search-bar.c:587 -#| msgid "M_atch case" msgid "Mat_ch case" msgstr "_Coincidir con capitalización" @@ -11072,8 +11065,8 @@ msgid "Quota usage" msgstr "Uso de cuota" #. translators: standard local mailbox names -#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509 -#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:166 +#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:516 +#: ../mail/em-folder-tree.c:2524 ../mail/mail-component.c:166 #: ../mail/mail-component.c:587 #: ../plugins/exchange-operations/exchange-delegates-user.c:76 #: ../plugins/exchange-operations/exchange-folder.c:594 @@ -11098,34 +11091,34 @@ msgid "Folder _name:" msgstr "_Nombre de la carpeta:" #. load store to mail component -#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206 +#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209 #: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1028 msgid "Search Folders" msgstr "Carpetas de búsqueda" #. UNMATCHED is always last -#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212 +#: ../mail/em-folder-tree-model.c:213 ../mail/em-folder-tree-model.c:215 msgid "UNMATCHED" msgstr "NO COINCIDENTE" -#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:167 +#: ../mail/em-folder-tree-model.c:511 ../mail/mail-component.c:167 msgid "Drafts" msgstr "Borradores" -#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:170 +#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:170 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2 msgid "Templates" msgstr "Plantillas" -#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:168 +#: ../mail/em-folder-tree-model.c:519 ../mail/mail-component.c:168 msgid "Outbox" msgstr "Bandeja de salida" -#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:169 +#: ../mail/em-folder-tree-model.c:521 ../mail/mail-component.c:169 msgid "Sent" msgstr "Correo enviado" -#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843 +#: ../mail/em-folder-tree-model.c:550 ../mail/em-folder-tree-model.c:859 msgid "Loading..." msgstr "Cargando…" @@ -11144,120 +11137,120 @@ msgstr "Cargando…" #. * Do not translate the "folder-display|" part. Remove it #. * from your translation. #. -#: ../mail/em-folder-tree.c:380 +#: ../mail/em-folder-tree.c:299 #, c-format msgctxt "folder-display" msgid "%s (%u)" msgstr "%s (%u)" -#: ../mail/em-folder-tree.c:742 +#: ../mail/em-folder-tree.c:664 msgid "Mail Folder Tree" msgstr "Árbol de carpetas de correo" -#: ../mail/em-folder-tree.c:901 +#: ../mail/em-folder-tree.c:823 #, c-format msgid "Moving folder %s" msgstr "Moviendo la carpeta %s" -#: ../mail/em-folder-tree.c:903 +#: ../mail/em-folder-tree.c:825 #, c-format msgid "Copying folder %s" msgstr "Copiando la carpeta %s" -#: ../mail/em-folder-tree.c:910 ../mail/message-list.c:2014 +#: ../mail/em-folder-tree.c:832 ../mail/message-list.c:2014 #, c-format msgid "Moving messages into folder %s" msgstr "Moviendo los mensajes a la carpeta %s" -#: ../mail/em-folder-tree.c:912 ../mail/message-list.c:2016 +#: ../mail/em-folder-tree.c:834 ../mail/message-list.c:2016 #, c-format msgid "Copying messages into folder %s" msgstr "Copiando los mensajes a la carpeta %s" -#: ../mail/em-folder-tree.c:927 +#: ../mail/em-folder-tree.c:849 msgid "Cannot drop message(s) into toplevel store" msgstr "No se puede dejar el(los) mensaje(s) en el almacén de nivel superior" -#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:100 +#: ../mail/em-folder-tree.c:926 ../ui/evolution-mail-message.xml.h:100 msgid "_Copy to Folder" msgstr "_Copiar a la carpeta" -#: ../mail/em-folder-tree.c:1005 ../ui/evolution-mail-message.xml.h:113 +#: ../mail/em-folder-tree.c:927 ../ui/evolution-mail-message.xml.h:113 msgid "_Move to Folder" msgstr "_Mover a la carpeta" -#: ../mail/em-folder-tree.c:1007 ../mail/em-folder-utils.c:364 +#: ../mail/em-folder-tree.c:929 ../mail/em-folder-utils.c:362 #: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2106 msgid "_Move" msgstr "_Mover" -#: ../mail/em-folder-tree.c:1009 ../mail/message-list.c:2108 +#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:2108 msgid "Cancel _Drag" msgstr "Cancelar _arrastre" -#: ../mail/em-folder-tree.c:1719 ../mail/mail-ops.c:1065 +#: ../mail/em-folder-tree.c:1641 ../mail/mail-ops.c:1065 #, c-format msgid "Scanning folders in \"%s\"" msgstr "Analizando carpetas en «%s»" -#: ../mail/em-folder-tree.c:2118 +#: ../mail/em-folder-tree.c:2040 msgid "Open in _New Window" msgstr "Abrir en una ventana _nueva" #. FIXME: need to disable for nochildren folders -#: ../mail/em-folder-tree.c:2123 +#: ../mail/em-folder-tree.c:2045 msgid "_New Folder..." msgstr "Carpeta _nueva…" -#: ../mail/em-folder-tree.c:2126 +#: ../mail/em-folder-tree.c:2048 msgid "_Move..." msgstr "_Mover…" -#: ../mail/em-folder-tree.c:2134 ../ui/evolution-mail-list.xml.h:21 +#: ../mail/em-folder-tree.c:2056 ../ui/evolution-mail-list.xml.h:21 msgid "Re_fresh" msgstr "Actuali_zar" -#: ../mail/em-folder-tree.c:2135 +#: ../mail/em-folder-tree.c:2057 msgid "Fl_ush Outbox" msgstr "Enviar correos pe_ndientes" -#: ../mail/em-folder-tree.c:2141 ../mail/mail.error.xml.h:138 +#: ../mail/em-folder-tree.c:2063 ../mail/mail.error.xml.h:138 msgid "_Empty Trash" msgstr "_Vaciar papelera" -#: ../mail/em-folder-tree.c:2244 +#: ../mail/em-folder-tree.c:2166 msgid "_Unread Search Folder" msgstr "Carpeta de búsqueda de _no leídos" -#: ../mail/em-folder-utils.c:101 +#: ../mail/em-folder-utils.c:99 #, c-format msgid "Copying `%s' to `%s'" msgstr "Copiando «%s» a «%s»" -#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186 +#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186 #: ../mail/em-folder-view.c:1201 #: ../mail/importers/evolution-mbox-importer.c:82 #: ../plugins/pst-import/pst-importer.c:305 msgid "Select folder" msgstr "Seleccionar carpeta" -#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201 +#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201 msgid "C_opy" msgstr "C_opiar" -#: ../mail/em-folder-utils.c:539 +#: ../mail/em-folder-utils.c:537 #: ../plugins/groupwise-features/share-folder-common.c:144 #, c-format msgid "Creating folder `%s'" msgstr "Creando carpeta «%s»" -#: ../mail/em-folder-utils.c:698 +#: ../mail/em-folder-utils.c:696 #: ../plugins/groupwise-features/install-shared.c:169 #: ../plugins/groupwise-features/share-folder-common.c:386 msgid "Create folder" msgstr "Crear carpeta" -#: ../mail/em-folder-utils.c:698 +#: ../mail/em-folder-utils.c:696 #: ../plugins/groupwise-features/install-shared.c:169 #: ../plugins/groupwise-features/share-folder-common.c:386 msgid "Specify where to create the folder:" @@ -11302,7 +11295,7 @@ msgstr "Marcar como imp_ortante" #: ../mail/em-folder-view.c:1349 msgid "Mark as Un_important" -msgstr "Marcar como no _importante" +msgstr "Marcar como no imp_ortante" #: ../mail/em-folder-view.c:1350 msgid "Mark as _Junk" @@ -11310,7 +11303,7 @@ msgstr "Marcar como _SPAM" #: ../mail/em-folder-view.c:1351 msgid "Mark as _Not Junk" -msgstr "Marcar como _no SPAM" +msgstr "Marcar como no _SPAM" #: ../mail/em-folder-view.c:1352 msgid "Mark for Follo_w Up..." @@ -13668,7 +13661,7 @@ msgstr "_Usuario:" msgid "Use Authe_ntication" msgstr "Usar aute_nticación" -#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:368 +#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:405 #: ../plugins/google-account-setup/google-source.c:613 #: ../plugins/google-account-setup/google-contacts-source.c:280 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:308 @@ -13841,46 +13834,34 @@ msgid "All local folders" msgstr "Todas las carpetas locales" #: ../mail/mail-dialogs.glade.h:8 -msgid "Case _sensitive" -msgstr "_Discriminar según capitalización" - -#: ../mail/mail-dialogs.glade.h:9 msgid "Co_mpleted" msgstr "_Terminado" -#: ../mail/mail-dialogs.glade.h:10 -msgid "F_ind:" -msgstr "_Buscar:" - -#: ../mail/mail-dialogs.glade.h:11 -msgid "Find in Message" -msgstr "Buscar en el mensaje" - -#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:275 +#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:275 msgid "Flag to Follow Up" msgstr "Marcar para seguimiento" -#: ../mail/mail-dialogs.glade.h:13 +#: ../mail/mail-dialogs.glade.h:10 msgid "Folder Subscriptions" msgstr "Suscripciones de carpetas" -#: ../mail/mail-dialogs.glade.h:14 +#: ../mail/mail-dialogs.glade.h:11 msgid "License Agreement" msgstr "Acuerdo de licencia" -#: ../mail/mail-dialogs.glade.h:15 +#: ../mail/mail-dialogs.glade.h:12 msgid "S_erver:" msgstr "S_ervidor:" -#: ../mail/mail-dialogs.glade.h:16 +#: ../mail/mail-dialogs.glade.h:13 msgid "Security Information" msgstr "Información de seguridad" -#: ../mail/mail-dialogs.glade.h:17 +#: ../mail/mail-dialogs.glade.h:14 msgid "Specific folders" msgstr "Carpetas específicas" -#: ../mail/mail-dialogs.glade.h:18 +#: ../mail/mail-dialogs.glade.h:15 msgid "" "The messages you have selected for follow up are listed below.\n" "Please select a follow up action from the \"Flag\" menu." @@ -13888,19 +13869,19 @@ msgstr "" "Los mensajes que ha seleccionado para seguir se listan abajo.\n" "Por favor, seleccione una acción de seguimiento desde el menú «Marcar»." -#: ../mail/mail-dialogs.glade.h:20 +#: ../mail/mail-dialogs.glade.h:17 msgid "_Accept License" msgstr "_Aceptar licencia" -#: ../mail/mail-dialogs.glade.h:21 +#: ../mail/mail-dialogs.glade.h:18 msgid "_Due By:" msgstr "_Vence el:" -#: ../mail/mail-dialogs.glade.h:22 +#: ../mail/mail-dialogs.glade.h:19 msgid "_Flag:" msgstr "_Marca:" -#: ../mail/mail-dialogs.glade.h:23 +#: ../mail/mail-dialogs.glade.h:20 msgid "_Tick this to accept the license agreement" msgstr "_Marque esto para aceptar el acuerdo de licencia" @@ -15002,7 +14983,6 @@ msgid "Subject or Sender contains" msgstr "El asunto o el remitente contiene" #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1 -#| msgid "List local address book folders" msgid "Add local address books to Evolution." msgstr "Añadir las libretas de direcciones locales a Evolution." @@ -15062,7 +15042,6 @@ msgid "_Edit Message" msgstr "_Editar mensaje" #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1 -#| msgid "Audio inline plugin" msgid "Audio Inline" msgstr "Sonido en línea" @@ -15219,12 +15198,10 @@ msgstr "" #. the path to the shared library #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2 -#| msgid "Backup and restore plugin" msgid "Backup and Restore" msgstr "Respaldar y restaurar" #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3 -#| msgid "Backup and restore Evolution data and settings" msgid "Backup and restore your Evolution data and settings." msgstr "Respaldar y restaurar los datos y la configuración de Evolution" @@ -15335,10 +15312,6 @@ msgid "BBDB" msgstr "BBDB" #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3 -#| msgid "" -#| "Automatically fills your address book with names and email addresses as " -#| "you reply to messages. Also fills in IM contact information from your " -#| "buddy lists." msgid "" "Takes the gruntwork out of managing your address book.\n" "\n" @@ -15390,7 +15363,6 @@ msgstr "" "correo normal provenientes de diferentes juegos de caracteres." #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1 -#| msgid "Bogofilter junk plugin" msgid "Bogofilter Junk Filter" msgstr "Filtro de SPAM Bogofilter" @@ -15399,7 +15371,6 @@ msgid "Bogofilter Options" msgstr "Opciones de Bogofilter" #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3 -#| msgid "Filters junk messages using Bogofilter." msgid "Filter junk messages using Bogofilter." msgstr "Filtra mensajes SPAM usando Bogofilter." @@ -15407,19 +15378,19 @@ msgstr "Filtra mensajes SPAM usando Bogofilter." msgid "CalDAV" msgstr "CalDAV" -#: ../plugins/caldav/caldav-source.c:329 +#: ../plugins/caldav/caldav-source.c:366 #: ../plugins/calendar-http/calendar-http.c:126 msgid "_URL:" msgstr "_URL:" -#: ../plugins/caldav/caldav-source.c:353 +#: ../plugins/caldav/caldav-source.c:390 #: ../plugins/google-account-setup/google-source.c:606 #: ../plugins/google-account-setup/google-contacts-source.c:303 msgid "Use _SSL" msgstr "Usar _SSL" #. add refresh option -#: ../plugins/caldav/caldav-source.c:396 +#: ../plugins/caldav/caldav-source.c:433 #: ../plugins/calendar-http/calendar-http.c:263 #: ../plugins/calendar-weather/calendar-weather.c:508 #: ../plugins/google-account-setup/google-source.c:630 @@ -15427,7 +15398,7 @@ msgstr "Usar _SSL" msgid "Re_fresh:" msgstr "A_ctualizar:" -#: ../plugins/caldav/caldav-source.c:414 +#: ../plugins/caldav/caldav-source.c:451 #: ../plugins/calendar-http/calendar-http.c:281 #: ../plugins/calendar-weather/calendar-weather.c:526 #: ../plugins/google-account-setup/google-source.c:656 @@ -15440,7 +15411,6 @@ msgid "Add CalDAV support to Evolution." msgstr "Añadir soporte CalDAV a Evolution." #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2 -#| msgid "CalDAV sources" msgid "CalDAV Support" msgstr "Soporte CalDAV" @@ -15465,7 +15435,6 @@ msgid "Add web calendars to Evolution." msgstr "Añadir calendarios web a Evolution." #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2 -#| msgid "Calendars" msgid "Web Calendars" msgstr "Calendarios web" @@ -15530,12 +15499,10 @@ msgid "Weather Calendars" msgstr "Calendario meteorológico" #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1 -#| msgid "Copy tool" msgid "Copy Tool" msgstr "Herramienta de copia" #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3 -#| msgid "Copy selected messages to the clipboard" msgid "Copy things to the clipboard." msgstr "Copiar cosas al portapapeles." @@ -15551,13 +15518,11 @@ msgstr "" "predeterminado." #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1 -#| msgid "Checks whether Evolution is the default mail client on startup." msgid "Check whether Evolution is the default mail client on startup." msgstr "" "Comprueba al iniciar si Evolution es el cliente de correo predeterminado." #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2 -#| msgid "Default Mail Client " msgid "Default Mail Client" msgstr "Cliente de correo predeterminado" @@ -15645,7 +15610,6 @@ msgstr "Cabeceras personalizadas del correo-e" #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2 -#| msgid "Adds custom header to outgoing messages." msgid "Add custom headers to outgoing mail messages." msgstr "Añadir una cabecera personalizada a los mensajes salientes." @@ -16651,14 +16615,11 @@ msgid "External Editor" msgstr "Editor externo" #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2 -#, fuzzy #| msgid "" #| "A plugin for using an external editor as the composer. You can send only " #| "plain-text messages." msgid "Use an external editor to compose plain-text mail messages." -msgstr "" -"Un complemento para usar un editor externo como editor de mensajes. Sólo " -"puede enviar correos en texto plano." +msgstr "Usar un editor externo para editar mensajes de correo en texto plano." #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1 msgid "Cannot create Temporary File" @@ -16726,10 +16687,6 @@ msgid "_Face" msgstr "_Cara" #: ../plugins/face/org-gnome-face.eplug.xml.h:1 -#| msgid "" -#| "Attach Face header to outgoing messages. First time the user needs to " -#| "configure a 48*48 png image. It is base64 encoded and stored in ~/." -#| "evolution/faces This will be used in messages that are sent further." msgid "" "Attach a small picture of your face to outgoing messages.\n" "\n" @@ -16756,6 +16713,8 @@ msgstr "Desuscribirse de carpetas" msgid "" "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree." msgstr "" +"Desuscribirse de una carpeta IMAP pulsando sobre ella con el botón derecho " +"del ratón en la carpeta del árbol." #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3 msgid "_Unsubscribe" @@ -16800,7 +16759,6 @@ msgid "Add Google Calendars to Evolution." msgstr "Añadir un calendario de Google a Evolution." #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2 -#| msgid "Gnome Calendar" msgid "Google Calendars" msgstr "Calendarios de Google" @@ -16810,7 +16768,7 @@ msgstr "Lista de comprobación" #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1 msgid "Add Novell GroupWise support to Evolution." -msgstr "" +msgstr "Añadir soporte Novell GroupWise para Evolution." #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2 msgid "GroupWise Account Setup" @@ -16908,10 +16866,9 @@ msgid "Add Send Options to GroupWise messages" msgstr "Añadir opciones de envío a los mensajes de GroupWise" #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1 -#, fuzzy #| msgid "A plugin for the features in GroupWise accounts." msgid "Fine-tune your GroupWise accounts." -msgstr "Un complemento para las características en las cuentas GroupWise." +msgstr "Configurar las cuentas GroupWise." #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2 msgid "GroupWise Features" @@ -16983,10 +16940,9 @@ msgid "Accept Tentatively" msgstr "Aceptar provisionalmente" #: ../plugins/groupwise-features/process-meeting.c:322 -#, fuzzy #| msgid "_Delegate Meeting..." msgid "Rese_nd Meeting..." -msgstr "_Delegar reunión…" +msgstr "Reen_viar reunión…" #: ../plugins/groupwise-features/properties.glade.h:1 msgid "Users:" @@ -17199,11 +17155,11 @@ msgstr "Seguir el estado del mensaje…" #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1 msgid "Add Hula support to Evolution." -msgstr "" +msgstr "Añadir soporte Hula para Evolution." #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2 msgid "Hula Support" -msgstr "" +msgstr "Soporte Hula" #: ../plugins/imap-features/imap-headers.c:320 msgid "Custom Headers" @@ -17257,7 +17213,7 @@ msgstr "" #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1 msgid "Fine-tune your IMAP accounts." -msgstr "" +msgstr "Configurar sus cuentas IMAP." #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2 msgid "IMAP Features" @@ -17298,10 +17254,9 @@ msgid "Synchronize to iPod" msgstr "Sincronizar con iPod" #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2 -#, fuzzy #| msgid "Synchronize to iPod" msgid "Synchronize your data with your Apple iPod." -msgstr "Sincronizar con iPod" +msgstr "Sincronizar sus datos con su iPod de Apple." #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3 msgid "iPod Synchronization" @@ -17340,10 +17295,9 @@ msgid "Unable to find this memo in any memo list" msgstr "No se puede encontrar esta nota en ninguna lista de notas" #: ../plugins/itip-formatter/itip-formatter.c:839 -#, fuzzy #| msgid "Opening calendar" msgid "Opening the calendar. Please wait.." -msgstr "Apertura del calendario" +msgstr "Abriendo el calendario. Espere..." #: ../plugins/itip-formatter/itip-formatter.c:842 msgid "Searching for an existing version of this appointment" @@ -17391,52 +17345,52 @@ msgstr "Enviar una notificación de cancelación al delegado" msgid "Could not send the cancelation notice to the delegate" msgstr "No es posible enviar una notificación de cancelación al delegado" -#: ../plugins/itip-formatter/itip-formatter.c:1346 +#: ../plugins/itip-formatter/itip-formatter.c:1348 msgid "Attendee status could not be updated because the status is invalid" msgstr "" "El estado de asistencia no pudo actualizarse debido a que el estado es " "inválido" -#: ../plugins/itip-formatter/itip-formatter.c:1375 +#: ../plugins/itip-formatter/itip-formatter.c:1377 #, c-format msgid "Unable to update attendee. %s" msgstr "No es posible actualizar la asistencia. %s" -#: ../plugins/itip-formatter/itip-formatter.c:1379 +#: ../plugins/itip-formatter/itip-formatter.c:1381 msgid "Attendee status updated" msgstr "Estado de asistencia actualizado" -#: ../plugins/itip-formatter/itip-formatter.c:1405 +#: ../plugins/itip-formatter/itip-formatter.c:1407 msgid "Meeting information sent" msgstr "Información de reunión enviada" -#: ../plugins/itip-formatter/itip-formatter.c:1408 +#: ../plugins/itip-formatter/itip-formatter.c:1410 msgid "Task information sent" msgstr "Información de la tarea enviada" -#: ../plugins/itip-formatter/itip-formatter.c:1411 +#: ../plugins/itip-formatter/itip-formatter.c:1413 msgid "Memo information sent" msgstr "Información de la nota enviada" -#: ../plugins/itip-formatter/itip-formatter.c:1420 +#: ../plugins/itip-formatter/itip-formatter.c:1422 msgid "Unable to send meeting information, the meeting does not exist" msgstr "No se puede enviar la información de la reunión, la reunión no existe" -#: ../plugins/itip-formatter/itip-formatter.c:1423 +#: ../plugins/itip-formatter/itip-formatter.c:1425 msgid "Unable to send task information, the task does not exist" msgstr "No se puede enviar la información de la tarea, la tarea no existe" -#: ../plugins/itip-formatter/itip-formatter.c:1426 +#: ../plugins/itip-formatter/itip-formatter.c:1428 msgid "Unable to send memo information, the memo does not exist" msgstr "No se puede enviar la información de la nota, la nota no existe" -#: ../plugins/itip-formatter/itip-formatter.c:1495 -#: ../plugins/itip-formatter/itip-formatter.c:1506 +#: ../plugins/itip-formatter/itip-formatter.c:1497 +#: ../plugins/itip-formatter/itip-formatter.c:1508 msgid "The calendar attached is not valid" msgstr "El calendario adjunto no es válido" -#: ../plugins/itip-formatter/itip-formatter.c:1496 -#: ../plugins/itip-formatter/itip-formatter.c:1507 +#: ../plugins/itip-formatter/itip-formatter.c:1498 +#: ../plugins/itip-formatter/itip-formatter.c:1509 msgid "" "The message claims to contain a calendar, but the calendar is not a valid " "iCalendar." @@ -17444,15 +17398,15 @@ msgstr "" "El mensaje dice contener un calendario, pero el calendario no es un " "iCalendar válido." -#: ../plugins/itip-formatter/itip-formatter.c:1547 -#: ../plugins/itip-formatter/itip-formatter.c:1575 -#: ../plugins/itip-formatter/itip-formatter.c:1667 +#: ../plugins/itip-formatter/itip-formatter.c:1549 +#: ../plugins/itip-formatter/itip-formatter.c:1577 +#: ../plugins/itip-formatter/itip-formatter.c:1669 msgid "The item in the calendar is not valid" msgstr "El elemento en el calendario no es válido" -#: ../plugins/itip-formatter/itip-formatter.c:1548 -#: ../plugins/itip-formatter/itip-formatter.c:1576 -#: ../plugins/itip-formatter/itip-formatter.c:1668 +#: ../plugins/itip-formatter/itip-formatter.c:1550 +#: ../plugins/itip-formatter/itip-formatter.c:1578 +#: ../plugins/itip-formatter/itip-formatter.c:1670 msgid "" "The message does contain a calendar, but the calendar contains no events, " "tasks or free/busy information" @@ -17460,11 +17414,11 @@ msgstr "" "El mensaje contiene un calendario, pero el calendario no contiene ningún " "acontecimiento, tarea o información de disponibilidad" -#: ../plugins/itip-formatter/itip-formatter.c:1587 +#: ../plugins/itip-formatter/itip-formatter.c:1589 msgid "The calendar attached contains multiple items" msgstr "El calendario adjunto contiene elementos múltiples" -#: ../plugins/itip-formatter/itip-formatter.c:1588 +#: ../plugins/itip-formatter/itip-formatter.c:1590 msgid "" "To process all of these items, the file should be saved and the calendar " "imported" @@ -17472,31 +17426,31 @@ msgstr "" "Para procesar todos estos elementos, el archivo debería guardarse y el " "calendario importarse" -#: ../plugins/itip-formatter/itip-formatter.c:2317 +#: ../plugins/itip-formatter/itip-formatter.c:2319 msgid "This meeting recurs" msgstr "Esta reunión se repite" -#: ../plugins/itip-formatter/itip-formatter.c:2320 +#: ../plugins/itip-formatter/itip-formatter.c:2322 msgid "This task recurs" msgstr "Esta tarea se repite" -#: ../plugins/itip-formatter/itip-formatter.c:2323 +#: ../plugins/itip-formatter/itip-formatter.c:2325 msgid "This memo recurs" msgstr "Esta nota se repite" #. Delete message after acting #. FIXME Need a schema for this -#: ../plugins/itip-formatter/itip-formatter.c:2559 +#: ../plugins/itip-formatter/itip-formatter.c:2561 msgid "_Delete message after acting" msgstr "_Borrar el mensaje después de actuar" -#: ../plugins/itip-formatter/itip-formatter.c:2569 -#: ../plugins/itip-formatter/itip-formatter.c:2601 +#: ../plugins/itip-formatter/itip-formatter.c:2571 +#: ../plugins/itip-formatter/itip-formatter.c:2603 msgid "Conflict Search" msgstr "Búsqueda de conflictos" #. Source selector -#: ../plugins/itip-formatter/itip-formatter.c:2584 +#: ../plugins/itip-formatter/itip-formatter.c:2586 msgid "Select the calendars to search for meeting conflicts" msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones" @@ -17982,10 +17936,9 @@ msgid "_Memos:" msgstr "_Notas:" #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1 -#, fuzzy #| msgid "Displays text/calendar parts in messages." msgid "Display \"text/calendar\" MIME parts in mail messages." -msgstr "Mostrar las partes de texto/calendario en los mensajes." +msgstr "Mostrar las partes MIME de texto/calendario en los mensajes." #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2 msgid "Itip Formatter" @@ -18017,6 +17970,8 @@ msgstr "Desactivar cuenta" #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2 msgid "Disable an account by right-clicking on it in the folder tree." msgstr "" +"Desactivar una cuenta pulsando con el botón derecho sobre ella en la carpeta " +"del árbol." #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1 msgid "Beep or play sound file." @@ -18180,10 +18135,9 @@ msgid "Mail Notification" msgstr "Notificación de correo" #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2 -#, fuzzy #| msgid "Play sound when new messages arrive." msgid "Notifies you when new mail messages arrive." -msgstr "Reproducir un sonido cuando llegue correo nuevo." +msgstr "Le notifica cuando llega un mensaje de correo nuevo." #: ../plugins/mail-to-task/mail-to-task.c:343 #, c-format @@ -18225,24 +18179,21 @@ msgid "Cannot get source list. %s" msgstr "No se pudo obtener la lista de origen. %s" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1 -#, fuzzy #| msgid "Convert the selected message to a new task" msgid "Convert a mail message to a task." -msgstr "Convierte el mensaje seleccionado en una tarea nueva" +msgstr "Convertir el mensaje de correo en una tarea." #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5 -#, fuzzy #| msgid "Con_vert to Task" msgid "Convert to a Mem_o" -msgstr "Convertir en ta_rea" +msgstr "Convertir en _nota" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6 -#, fuzzy #| msgid "Con_vert to Meeting" msgid "Convert to a _Meeting" -msgstr "Convertir en _reunión" +msgstr "Convertir en re_unión" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7 @@ -18251,13 +18202,11 @@ msgstr "Convertir en ta_rea" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8 -#, fuzzy #| msgid "Con_vert to Meeting" msgid "Convert to an _Event" -msgstr "Convertir en _reunión" +msgstr "Convertir en ac_ontecimiento" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6 -#, fuzzy #| msgid "Mail to task" msgid "Mail-to-Task" msgstr "Correo a tarea" @@ -18300,14 +18249,12 @@ msgid "Mailing _List" msgstr "_Lista de correo" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6 -#, fuzzy #| msgid "" #| "Provide actions for common mailing list commands (subscribe, " #| "unsubscribe...)." msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)." msgstr "" -"Proporciona acciones para comandos comunes de listas de correo (suscribirse, " -"desuscribirse…)." +"Realizar acciones típicas de listas de correo (suscribirse, desuscribirse…)." #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7 msgid "_Post message to list" @@ -18483,10 +18430,9 @@ msgid "Mark Me_ssages as Read" msgstr "Marcar los mensajes como _leídos" #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3 -#, fuzzy #| msgid "Mark all messages in the folder as read" msgid "Mark all messages in a folder as read." -msgstr "Marcar todos los mensajes en la carpeta como leídos" +msgstr "Marcar todos los mensajes en una carpeta como leídos." #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1 msgid "Mono Loader" @@ -18494,13 +18440,12 @@ msgstr "Cargador de Mono" #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2 msgid "Support plugins written in Mono." -msgstr "" +msgstr "Soportar complementos escritos en Mono." #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1 -#, fuzzy #| msgid "Change Evolution's settings" msgid "Manage your Evolution plugins." -msgstr "Cambia la configuración de Evolution" +msgstr "Gestionar sus complementos de Evolution" #. Setup the ui #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2 @@ -18543,14 +18488,13 @@ msgid "Plain Text Mode" msgstr "Modo de texto sin formato" #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3 -#, fuzzy #| msgid "Prefer plain-text" msgid "Prefer Plain Text" -msgstr "Preferir texto sin formato" +msgstr "Preferir texto plano" #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4 msgid "View mail messages as plain text, even if they contain HTML content." -msgstr "" +msgstr "Ver los mensajes de correo en texto plano, incluso si contienen HTML." #: ../plugins/prefer-plain/prefer-plain.c:189 msgid "Show HTML if present" @@ -18574,7 +18518,7 @@ msgstr "Perfilador de Evolution" #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2 msgid "Profile data events in Evolution (for developers only)." -msgstr "" +msgstr "Perfiles de datos de eventos en Evolution (sólo para desarrolladores)." #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1 msgid "Import Outlook messages from PST file" @@ -18616,10 +18560,9 @@ msgid "Locations" msgstr "Lugares" #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3 -#, fuzzy #| msgid "Allows calendars to be published to the web" msgid "Publish calendars to the web." -msgstr "Permite publicar calendarios en la web" +msgstr "Publicar calendarios en la web." #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1 msgid "_Publish Calendar Information" @@ -18841,16 +18784,14 @@ msgid "I_nclude remote tests" msgstr "I_ncluir tests remotos" #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1 -#, fuzzy #| msgid "Filters junk messages using Bogofilter." msgid "Filter junk messages using SpamAssassin." -msgstr "Filtra mensajes SPAM usando Bogofilter." +msgstr "Filtrar mensajes SPAM usando SpamAssasin." #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2 -#, fuzzy #| msgid "SpamAssassin junk plugin" msgid "SpamAssassin Junk Filter" -msgstr "Complemento de filtro de SPAM SpamAssassin" +msgstr "Filtro de SPAM SpamAssassin" #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3 msgid "SpamAssassin Options" @@ -18937,10 +18878,9 @@ msgid "Save Selected" msgstr "Guardar seleccionados" #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2 -#, fuzzy #| msgid "Saves selected calendar or tasks list to disk." msgid "Save a calendar or task list to disk." -msgstr "Guarda el calendario o la lista de tareas seleccionada al disco." +msgstr "Guardar un calendario o una lista de tareas al disco." #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3 msgid "_Save to Disk" @@ -18964,16 +18904,14 @@ msgid "Select destination file" msgstr "Seleccione el archivo de destino" #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1 -#, fuzzy #| msgid "Selects a single calendar or task source for viewing." msgid "Quickly select a single calendar or task list for viewing." -msgstr "Selecciona un origen de calendario o tarea para verlo." +msgstr "Seleccionar rápidamente un sólo calendario o tarea para verlo." #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2 -#, fuzzy #| msgid "Select one source" msgid "Select One Source" -msgstr "Seleccione un origen" +msgstr "Seleccionar un origen" #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3 msgid "Show _only this Calendar" @@ -19043,10 +18981,9 @@ msgid "Please wait" msgstr "Por favor espere" #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1 -#, fuzzy #| msgid "Thread messages by subject" msgid "Sort mail message threads by subject." -msgstr "Agrupar mensajes según el asunto" +msgstr "Ordenar conversaciones de mensajes de correo por asunto." #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2 msgid "Subject Threading" @@ -19088,24 +19025,22 @@ msgstr "Borradores basados en el complemento de plantillas" #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook." msgstr "" +"Decodificar adjuntos TNEF (.dat de correo de Windows) de Microsoft Outlook." #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2 -#, fuzzy #| msgid "TNEF Attachment decoder" msgid "TNEF Decoder" -msgstr "Decodificador de adjuntos TNEF" +msgstr "Decodificador TNEF" #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1 -#, fuzzy #| msgid "Multiple vCards" msgid "Inline vCards" -msgstr "vCards múltiples" +msgstr "vCards en línea" #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2 -#, fuzzy #| msgid "Show \"Cc\" field when sending a mail message" msgid "Show vCards directly in mail messages." -msgstr "Mostrar el campo «Cc» al enviar un mensaje de correo" +msgstr "Mostrar vCards directamente en los mensajes de correo." #: ../plugins/vcard-inline/vcard-inline.c:155 #: ../plugins/vcard-inline/vcard-inline.c:239 @@ -19117,32 +19052,29 @@ msgid "Show Compact vCard" msgstr "Mostrar vCard compacta" #: ../plugins/vcard-inline/vcard-inline.c:218 -#, fuzzy #| msgid "There is one other contact." #| msgid_plural "There are %d other contacts." msgid "There is one other contact." msgstr "Hay otro contacto más." #: ../plugins/vcard-inline/vcard-inline.c:227 -#, fuzzy, c-format +#, c-format #| msgid "There is one other contact." #| msgid_plural "There are %d other contacts." msgid "There is %d other contact." msgid_plural "There are %d other contacts." -msgstr[0] "Hay otro contacto más." +msgstr[0] "Hay %d contacto más." msgstr[1] "Hay otros %d contactos." #: ../plugins/vcard-inline/vcard-inline.c:248 -#, fuzzy #| msgid "Save in address book" msgid "Save in Address Book" msgstr "Guardar en la libreta de direcciones" #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1 -#, fuzzy #| msgid "WebDAV contacts" msgid "Add WebDAV contacts to Evolution." -msgstr "Contactos WebDAV" +msgstr "Añadir contactos WebDAV a Evolution." #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2 msgid "WebDAV contacts" @@ -23062,6 +22994,15 @@ msgstr "Contexto IM" msgid "Handle Popup" msgstr "Tirador emergente" +#~ msgid "Case _sensitive" +#~ msgstr "_Discriminar según capitalización" + +#~ msgid "F_ind:" +#~ msgstr "_Buscar:" + +#~ msgid "Find in Message" +#~ msgstr "Buscar en el mensaje" + #~ msgid "Provides core functionality for local address books." #~ msgstr "" #~ "Proporciona funcionalidad básica para libretas de direcciones locales." -- cgit v1.2.3 From b9149e4e89d6fc56505b75de1e3e0c13dada4b3e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 27 May 2009 15:15:28 +0200 Subject: Bug #540269 - Do not crash in em_format_is_attachment Check if part contains data wrapper before accessing its members. --- mail/em-format.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mail/em-format.c b/mail/em-format.c index b2360bb2fc..83f0d4acfe 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -991,6 +991,9 @@ int em_format_is_attachment(EMFormat *emf, CamelMimePart *part) /*CamelContentType *ct = camel_mime_part_get_content_type(part);*/ CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)part); + if (!dw) + return 0; + /*printf("checking is attachment %s/%s\n", ct->type, ct->subtype);*/ return !(camel_content_type_is (dw->mime_type, "multipart", "*") || camel_content_type_is(dw->mime_type, "application", "x-pkcs7-mime") -- cgit v1.2.3 From b33ce8f2a6dfab4a17eacd15e296035b4e2cfa49 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 28 May 2009 14:47:27 +0200 Subject: Bug #535516 - Crash in GConf Bridge while replying A test patch, maybe not fixing the bug fully, but let's try it. --- e-util/gconf-bridge.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index ff880a12bd..ca130ee2a3 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -649,16 +649,16 @@ window_binding_configure_event_cb (GtkWindow *window, GdkEventConfigure *event, WindowBinding *binding) { - /* Schedule a sync */ - if (binding->sync_timeout_id == 0) { - binding->sync_timeout_id = - g_timeout_add_seconds (WINDOW_BINDING_SYNC_DELAY, - (GSourceFunc) - window_binding_perform_scheduled_sync, - binding); - } + /* re-postpone by cancel of the previous request */ + if (binding->sync_timeout_id > 0) + g_source_remove (binding->sync_timeout_id); - return FALSE; + /* Schedule a sync */ + binding->sync_timeout_id = g_timeout_add_seconds (WINDOW_BINDING_SYNC_DELAY, + (GSourceFunc) window_binding_perform_scheduled_sync, + binding); + + return FALSE; } /* Called when the window state is being changed */ @@ -667,6 +667,9 @@ window_binding_state_event_cb (GtkWindow *window, GdkEventWindowState *event, WindowBinding *binding) { + if (binding->sync_timeout_id > 0) + g_source_remove (binding->sync_timeout_id); + window_binding_perform_scheduled_sync (binding); return FALSE; @@ -696,7 +699,10 @@ window_binding_window_destroyed (gpointer user_data, binding = (WindowBinding *) user_data; binding->window = NULL; /* Don't do anything with the window at unbind() */ - + + if (binding->sync_timeout_id > 0) + g_source_remove (binding->sync_timeout_id); + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding->id)); } -- cgit v1.2.3 From e61e5e2325f8bb84fbb550d602aed000ae805a4e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 28 May 2009 15:00:16 +0200 Subject: Bug #583441 - bbdb plugin is getting information from composer now It used to ask composer for a message, a generated one, which asks for a password to the signing twice, once here and once when composer itself generates message for sending. bbdb crashed when user canceled password prompt for a key, as it didn't check for NULL returned. --- plugins/bbdb/bbdb.c | 58 ++++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index a2499dfa98..679f30466d 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -227,43 +227,47 @@ bbdb_do_thread (const char *name, const char *email) G_UNLOCK (todo); } +static void +walk_destinations_and_free (EDestination **dests) +{ + gint i; + + if (!dests) + return; + + for (i = 0; dests[i] != NULL; i++) { + const char *name, *addr; + + name = e_destination_get_name (dests[i]); + addr = e_destination_get_email (dests[i]); + + if (name || addr) + bbdb_do_thread (name, addr); + } + + e_destination_freev (dests); +} + void bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target) { + EComposerHeaderTable *table; GConfClient *gconf; - CamelMimeMessage *message = NULL; - const CamelInternetAddress *to, *cc; - gint i, len, enable; - gconf = gconf_client_get_default (); + gboolean enable; + gconf = gconf_client_get_default (); enable = gconf_client_get_bool (gconf, GCONF_KEY_ENABLE, NULL); - g_object_unref (G_OBJECT (gconf)); + g_object_unref (gconf); - if (!enable) + if (!enable) return; - message = e_msg_composer_get_message(target->composer, 1); - - to = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO); - - len = CAMEL_ADDRESS (to)->addresses->len; - for (i = 0; i < len; i++) { - const gchar *name, *addr; - if (!(camel_internet_address_get (to, i, &name, &addr))) - continue; - bbdb_do_thread (name, addr); - } - - - cc = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC); + table = e_msg_composer_get_header_table (target->composer); + g_return_if_fail (table); - len = CAMEL_ADDRESS (cc)->addresses->len; - for (i = 0; i < len; i++) { - const gchar *name, *addr; - if (!(camel_internet_address_get (cc, i, &name, &addr))) - continue; - bbdb_do_thread (name, addr); - } + /* read information from the composer, not from a generated message */ + walk_destinations_and_free (e_composer_header_table_get_destinations_to (table)); + walk_destinations_and_free (e_composer_header_table_get_destinations_cc (table)); } static void -- cgit v1.2.3 From 6f5464f34ceec9e5701e3e3e651a40f9e6b3a072 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- a11y/addressbook/ea-addressbook-view.c | 2 +- a11y/addressbook/ea-addressbook-view.h | 2 +- a11y/addressbook/ea-addressbook.c | 2 +- a11y/addressbook/ea-addressbook.h | 2 +- a11y/addressbook/ea-minicard-view.c | 2 +- a11y/addressbook/ea-minicard-view.h | 2 +- a11y/addressbook/ea-minicard.c | 2 +- a11y/addressbook/ea-minicard.h | 2 +- a11y/calendar/ea-cal-view-event.c | 4 +- a11y/calendar/ea-cal-view-event.h | 2 +- a11y/calendar/ea-cal-view.c | 2 +- a11y/calendar/ea-cal-view.h | 2 +- a11y/calendar/ea-calendar-helpers.c | 2 +- a11y/calendar/ea-calendar-helpers.h | 2 +- a11y/calendar/ea-calendar.c | 2 +- a11y/calendar/ea-calendar.h | 2 +- a11y/calendar/ea-day-view-cell.c | 2 +- a11y/calendar/ea-day-view-cell.h | 2 +- a11y/calendar/ea-day-view-main-item.c | 2 +- a11y/calendar/ea-day-view-main-item.h | 2 +- a11y/calendar/ea-day-view.c | 2 +- a11y/calendar/ea-day-view.h | 2 +- a11y/calendar/ea-gnome-calendar.c | 2 +- a11y/calendar/ea-gnome-calendar.h | 2 +- a11y/calendar/ea-jump-button.c | 2 +- a11y/calendar/ea-jump-button.h | 2 +- a11y/calendar/ea-week-view-cell.c | 2 +- a11y/calendar/ea-week-view-cell.h | 2 +- a11y/calendar/ea-week-view-main-item.c | 2 +- a11y/calendar/ea-week-view-main-item.h | 2 +- a11y/calendar/ea-week-view.c | 2 +- a11y/calendar/ea-week-view.h | 2 +- a11y/e-table/gal-a11y-e-cell-popup.c | 2 +- a11y/e-table/gal-a11y-e-cell-popup.h | 2 +- a11y/e-table/gal-a11y-e-cell-registry.c | 2 +- a11y/e-table/gal-a11y-e-cell-registry.h | 2 +- a11y/e-table/gal-a11y-e-cell-text.c | 2 +- a11y/e-table/gal-a11y-e-cell-text.h | 2 +- a11y/e-table/gal-a11y-e-cell-toggle.c | 2 +- a11y/e-table/gal-a11y-e-cell-toggle.h | 2 +- a11y/e-table/gal-a11y-e-cell-tree.c | 2 +- a11y/e-table/gal-a11y-e-cell-tree.h | 2 +- a11y/e-table/gal-a11y-e-cell-vbox.c | 2 +- a11y/e-table/gal-a11y-e-cell-vbox.h | 2 +- a11y/e-table/gal-a11y-e-cell.c | 2 +- a11y/e-table/gal-a11y-e-cell.h | 2 +- .../gal-a11y-e-table-click-to-add-factory.c | 2 +- .../gal-a11y-e-table-click-to-add-factory.h | 2 +- a11y/e-table/gal-a11y-e-table-click-to-add.c | 2 +- a11y/e-table/gal-a11y-e-table-click-to-add.h | 2 +- a11y/e-table/gal-a11y-e-table-column-header.c | 2 +- a11y/e-table/gal-a11y-e-table-column-header.h | 2 +- a11y/e-table/gal-a11y-e-table-factory.c | 2 +- a11y/e-table/gal-a11y-e-table-factory.h | 2 +- a11y/e-table/gal-a11y-e-table-item-factory.c | 2 +- a11y/e-table/gal-a11y-e-table-item-factory.h | 2 +- a11y/e-table/gal-a11y-e-table-item.c | 2 +- a11y/e-table/gal-a11y-e-table-item.h | 2 +- a11y/e-table/gal-a11y-e-table.c | 2 +- a11y/e-table/gal-a11y-e-table.h | 2 +- a11y/e-table/gal-a11y-e-tree-factory.c | 2 +- a11y/e-table/gal-a11y-e-tree-factory.h | 2 +- a11y/e-table/gal-a11y-e-tree.c | 2 +- a11y/e-table/gal-a11y-e-tree.h | 2 +- a11y/e-text/gal-a11y-e-text-factory.c | 2 +- a11y/e-text/gal-a11y-e-text-factory.h | 2 +- a11y/e-text/gal-a11y-e-text.c | 2 +- a11y/e-text/gal-a11y-e-text.h | 2 +- a11y/ea-cell-table.c | 2 +- a11y/ea-cell-table.h | 2 +- a11y/ea-factory.h | 2 +- a11y/gal-a11y-factory.h | 2 +- a11y/gal-a11y-util.c | 2 +- a11y/gal-a11y-util.h | 2 +- a11y/widgets/ea-calendar-cell.c | 2 +- a11y/widgets/ea-calendar-cell.h | 2 +- a11y/widgets/ea-calendar-item.c | 4 +- a11y/widgets/ea-calendar-item.h | 2 +- a11y/widgets/ea-combo-button.c | 2 +- a11y/widgets/ea-combo-button.h | 2 +- a11y/widgets/ea-widgets.c | 2 +- a11y/widgets/ea-widgets.h | 2 +- addressbook/conduit/address-conduit.c | 2 +- addressbook/gui/component/addressbook-component.c | 2 +- addressbook/gui/component/addressbook-component.h | 2 +- addressbook/gui/component/addressbook-config.c | 2 +- addressbook/gui/component/addressbook-config.h | 2 +- addressbook/gui/component/addressbook-migrate.c | 2 +- addressbook/gui/component/addressbook-migrate.h | 2 +- addressbook/gui/component/addressbook-view.c | 2 +- addressbook/gui/component/addressbook-view.h | 2 +- addressbook/gui/component/addressbook.c | 2 +- addressbook/gui/component/addressbook.h | 2 +- addressbook/gui/component/autocompletion-config.c | 2 +- addressbook/gui/component/autocompletion-config.h | 2 +- addressbook/gui/component/component-factory.c | 2 +- .../gui/contact-editor/e-contact-editor-fullname.c | 2 +- .../gui/contact-editor/e-contact-editor-fullname.h | 2 +- addressbook/gui/contact-editor/e-contact-editor.c | 2 +- addressbook/gui/contact-editor/e-contact-editor.h | 2 +- .../gui/contact-editor/e-contact-quick-add.c | 2 +- .../gui/contact-editor/e-contact-quick-add.h | 2 +- addressbook/gui/contact-editor/eab-editor.c | 2 +- addressbook/gui/contact-editor/eab-editor.h | 2 +- addressbook/gui/contact-editor/test-editor.c | 2 +- .../contact-list-editor/e-contact-list-editor.c | 16 +- .../contact-list-editor/e-contact-list-editor.h | 2 +- .../gui/contact-list-editor/e-contact-list-model.c | 2 +- .../gui/contact-list-editor/e-contact-list-model.h | 2 +- addressbook/gui/merging/eab-contact-compare.c | 2 +- addressbook/gui/merging/eab-contact-compare.h | 2 +- addressbook/gui/merging/eab-contact-merging.c | 2 +- addressbook/gui/merging/eab-contact-merging.h | 2 +- addressbook/gui/widgets/e-addressbook-model.c | 2 +- addressbook/gui/widgets/e-addressbook-model.h | 2 +- .../gui/widgets/e-addressbook-reflow-adapter.c | 2 +- .../gui/widgets/e-addressbook-reflow-adapter.h | 2 +- .../gui/widgets/e-addressbook-table-adapter.c | 2 +- .../gui/widgets/e-addressbook-table-adapter.h | 2 +- addressbook/gui/widgets/e-addressbook-view.c | 2 +- addressbook/gui/widgets/e-addressbook-view.h | 2 +- addressbook/gui/widgets/e-minicard-label.c | 2 +- addressbook/gui/widgets/e-minicard-label.h | 2 +- addressbook/gui/widgets/e-minicard-view-widget.c | 2 +- addressbook/gui/widgets/e-minicard-view-widget.h | 2 +- addressbook/gui/widgets/e-minicard-view.c | 2 +- addressbook/gui/widgets/e-minicard-view.h | 2 +- addressbook/gui/widgets/e-minicard.c | 6 +- addressbook/gui/widgets/e-minicard.h | 2 +- addressbook/gui/widgets/eab-config.c | 2 +- addressbook/gui/widgets/eab-config.h | 2 +- addressbook/gui/widgets/eab-contact-display.c | 6 +- addressbook/gui/widgets/eab-contact-display.h | 2 +- addressbook/gui/widgets/eab-gui-util.c | 2 +- addressbook/gui/widgets/eab-gui-util.h | 4 +- addressbook/gui/widgets/eab-menu.c | 2 +- addressbook/gui/widgets/eab-menu.h | 2 +- addressbook/gui/widgets/eab-popup-control.c | 2 +- addressbook/gui/widgets/eab-popup-control.h | 2 +- addressbook/gui/widgets/eab-popup.c | 2 +- addressbook/gui/widgets/eab-popup.h | 2 +- .../gui/widgets/gal-view-factory-minicard.c | 2 +- .../gui/widgets/gal-view-factory-minicard.h | 2 +- addressbook/gui/widgets/gal-view-minicard.c | 2 +- addressbook/gui/widgets/gal-view-minicard.h | 2 +- .../importers/evolution-addressbook-importers.h | 2 +- addressbook/importers/evolution-csv-importer.c | 2 +- addressbook/importers/evolution-ldif-importer.c | 2 +- addressbook/importers/evolution-vcard-importer.c | 2 +- addressbook/printing/e-contact-print-types.h | 2 +- addressbook/printing/e-contact-print.c | 2 +- addressbook/printing/e-contact-print.h | 2 +- addressbook/printing/test-print.c | 2 +- .../evolution-addressbook-export-list-cards.c | 2 +- .../evolution-addressbook-export-list-folders.c | 2 +- addressbook/tools/evolution-addressbook-export.c | 2 +- addressbook/tools/evolution-addressbook-export.h | 2 +- addressbook/util/eab-book-util.c | 2 +- addressbook/util/eab-book-util.h | 2 +- calendar/common/authentication.c | 4 +- calendar/common/authentication.h | 2 +- calendar/conduits/calendar/calendar-conduit.c | 4 +- .../conduits/common/libecalendar-common-conduit.c | 2 +- .../conduits/common/libecalendar-common-conduit.h | 2 +- calendar/conduits/memo/memo-conduit.c | 2 +- calendar/conduits/todo/todo-conduit.c | 2 +- calendar/gui/alarm-notify/alarm-notify-dialog.c | 2 +- calendar/gui/alarm-notify/alarm-notify-dialog.h | 2 +- calendar/gui/alarm-notify/alarm-notify.c | 4 +- calendar/gui/alarm-notify/alarm-notify.h | 2 +- calendar/gui/alarm-notify/alarm-queue.c | 2 +- calendar/gui/alarm-notify/alarm-queue.h | 2 +- calendar/gui/alarm-notify/alarm.c | 2 +- calendar/gui/alarm-notify/alarm.h | 2 +- calendar/gui/alarm-notify/config-data.c | 2 +- calendar/gui/alarm-notify/config-data.h | 2 +- calendar/gui/alarm-notify/notify-main.c | 2 +- calendar/gui/alarm-notify/util.c | 2 +- calendar/gui/alarm-notify/util.h | 2 +- calendar/gui/cal-search-bar.c | 2 +- calendar/gui/cal-search-bar.h | 2 +- calendar/gui/calendar-commands.c | 2 +- calendar/gui/calendar-commands.h | 2 +- calendar/gui/calendar-component.c | 10 +- calendar/gui/calendar-component.h | 2 +- calendar/gui/calendar-config-keys.h | 2 +- calendar/gui/calendar-config.c | 2 +- calendar/gui/calendar-config.h | 2 +- calendar/gui/calendar-view-factory.c | 2 +- calendar/gui/calendar-view-factory.h | 2 +- calendar/gui/calendar-view.c | 2 +- calendar/gui/calendar-view.h | 2 +- calendar/gui/comp-editor-factory.c | 2 +- calendar/gui/comp-editor-factory.h | 2 +- calendar/gui/comp-util.c | 8 +- calendar/gui/comp-util.h | 2 +- calendar/gui/control-factory.c | 2 +- calendar/gui/control-factory.h | 2 +- calendar/gui/dialogs/alarm-dialog.c | 2 +- calendar/gui/dialogs/alarm-dialog.h | 2 +- calendar/gui/dialogs/alarm-list-dialog.c | 2 +- calendar/gui/dialogs/alarm-list-dialog.h | 2 +- calendar/gui/dialogs/cal-attachment-select-file.c | 2 +- calendar/gui/dialogs/cal-attachment-select-file.h | 2 +- calendar/gui/dialogs/cal-prefs-dialog.c | 2 +- calendar/gui/dialogs/cal-prefs-dialog.h | 2 +- calendar/gui/dialogs/calendar-setup.c | 4 +- calendar/gui/dialogs/calendar-setup.h | 2 +- calendar/gui/dialogs/cancel-comp.c | 2 +- calendar/gui/dialogs/cancel-comp.h | 2 +- calendar/gui/dialogs/changed-comp.c | 2 +- calendar/gui/dialogs/changed-comp.h | 2 +- calendar/gui/dialogs/comp-editor-page.c | 2 +- calendar/gui/dialogs/comp-editor-page.h | 2 +- calendar/gui/dialogs/comp-editor-util.c | 2 +- calendar/gui/dialogs/comp-editor-util.h | 2 +- calendar/gui/dialogs/comp-editor.c | 10 +- calendar/gui/dialogs/comp-editor.h | 2 +- calendar/gui/dialogs/copy-source-dialog.c | 2 +- calendar/gui/dialogs/copy-source-dialog.h | 2 +- calendar/gui/dialogs/delete-comp.c | 2 +- calendar/gui/dialogs/delete-comp.h | 2 +- calendar/gui/dialogs/delete-error.c | 2 +- calendar/gui/dialogs/delete-error.h | 2 +- calendar/gui/dialogs/e-delegate-dialog.c | 2 +- calendar/gui/dialogs/e-delegate-dialog.h | 2 +- calendar/gui/dialogs/e-send-options-utils.c | 2 +- calendar/gui/dialogs/e-send-options-utils.h | 2 +- calendar/gui/dialogs/event-editor.c | 2 +- calendar/gui/dialogs/event-editor.h | 4 +- calendar/gui/dialogs/event-page.c | 6 +- calendar/gui/dialogs/event-page.h | 2 +- calendar/gui/dialogs/memo-editor.c | 2 +- calendar/gui/dialogs/memo-editor.h | 2 +- calendar/gui/dialogs/memo-page.c | 2 +- calendar/gui/dialogs/memo-page.h | 2 +- calendar/gui/dialogs/recur-comp.c | 2 +- calendar/gui/dialogs/recur-comp.h | 2 +- calendar/gui/dialogs/recurrence-page.c | 2 +- calendar/gui/dialogs/recurrence-page.h | 2 +- calendar/gui/dialogs/save-comp.c | 2 +- calendar/gui/dialogs/save-comp.h | 4 +- calendar/gui/dialogs/schedule-page.c | 2 +- calendar/gui/dialogs/schedule-page.h | 2 +- calendar/gui/dialogs/select-source-dialog.c | 2 +- calendar/gui/dialogs/select-source-dialog.h | 2 +- calendar/gui/dialogs/send-comp.c | 2 +- calendar/gui/dialogs/send-comp.h | 2 +- calendar/gui/dialogs/task-details-page.c | 2 +- calendar/gui/dialogs/task-details-page.h | 2 +- calendar/gui/dialogs/task-editor.c | 2 +- calendar/gui/dialogs/task-editor.h | 2 +- calendar/gui/dialogs/task-page.c | 4 +- calendar/gui/dialogs/task-page.h | 2 +- calendar/gui/e-alarm-list.c | 2 +- calendar/gui/e-alarm-list.h | 4 +- calendar/gui/e-attachment-handler-calendar.c | 2 +- calendar/gui/e-attachment-handler-calendar.h | 2 +- calendar/gui/e-cal-component-memo-preview.c | 2 +- calendar/gui/e-cal-component-memo-preview.h | 2 +- calendar/gui/e-cal-component-preview.c | 2 +- calendar/gui/e-cal-component-preview.h | 2 +- calendar/gui/e-cal-config.c | 2 +- calendar/gui/e-cal-config.h | 2 +- calendar/gui/e-cal-event.c | 2 +- calendar/gui/e-cal-event.h | 2 +- calendar/gui/e-cal-list-view-config.c | 2 +- calendar/gui/e-cal-list-view-config.h | 2 +- calendar/gui/e-cal-list-view.c | 2 +- calendar/gui/e-cal-list-view.h | 2 +- calendar/gui/e-cal-menu.c | 2 +- calendar/gui/e-cal-menu.h | 2 +- calendar/gui/e-cal-model-calendar.c | 2 +- calendar/gui/e-cal-model-calendar.h | 2 +- calendar/gui/e-cal-model-memos.c | 2 +- calendar/gui/e-cal-model-memos.h | 2 +- calendar/gui/e-cal-model-tasks.c | 2 +- calendar/gui/e-cal-model-tasks.h | 2 +- calendar/gui/e-cal-model.c | 28 +-- calendar/gui/e-cal-model.h | 4 +- calendar/gui/e-cal-popup.c | 2 +- calendar/gui/e-cal-popup.h | 2 +- calendar/gui/e-calendar-table-config.c | 2 +- calendar/gui/e-calendar-table-config.h | 2 +- calendar/gui/e-calendar-table.c | 2 +- calendar/gui/e-calendar-table.h | 2 +- calendar/gui/e-calendar-view.c | 6 +- calendar/gui/e-calendar-view.h | 2 +- calendar/gui/e-cell-date-edit-config.c | 2 +- calendar/gui/e-cell-date-edit-config.h | 2 +- calendar/gui/e-cell-date-edit-text.c | 2 +- calendar/gui/e-cell-date-edit-text.h | 2 +- calendar/gui/e-comp-editor-registry.c | 2 +- calendar/gui/e-comp-editor-registry.h | 2 +- calendar/gui/e-date-edit-config.c | 2 +- calendar/gui/e-date-edit-config.h | 2 +- calendar/gui/e-date-time-list.c | 2 +- calendar/gui/e-date-time-list.h | 2 +- calendar/gui/e-day-view-config.c | 2 +- calendar/gui/e-day-view-config.h | 2 +- calendar/gui/e-day-view-layout.c | 2 +- calendar/gui/e-day-view-layout.h | 2 +- calendar/gui/e-day-view-main-item.c | 2 +- calendar/gui/e-day-view-main-item.h | 2 +- calendar/gui/e-day-view-time-item.c | 4 +- calendar/gui/e-day-view-time-item.h | 2 +- calendar/gui/e-day-view-top-item.c | 2 +- calendar/gui/e-day-view-top-item.h | 2 +- calendar/gui/e-day-view.c | 28 +-- calendar/gui/e-day-view.h | 2 +- calendar/gui/e-itip-control.c | 4 +- calendar/gui/e-itip-control.h | 2 +- calendar/gui/e-meeting-attendee.c | 4 +- calendar/gui/e-meeting-attendee.h | 2 +- calendar/gui/e-meeting-list-view.c | 2 +- calendar/gui/e-meeting-list-view.h | 2 +- calendar/gui/e-meeting-store.c | 2 +- calendar/gui/e-meeting-store.h | 2 +- calendar/gui/e-meeting-time-sel-item.c | 2 +- calendar/gui/e-meeting-time-sel-item.h | 2 +- calendar/gui/e-meeting-time-sel.c | 2 +- calendar/gui/e-meeting-time-sel.h | 2 +- calendar/gui/e-meeting-types.h | 2 +- calendar/gui/e-meeting-utils.c | 2 +- calendar/gui/e-meeting-utils.h | 2 +- calendar/gui/e-memo-table-config.c | 2 +- calendar/gui/e-memo-table-config.h | 2 +- calendar/gui/e-memo-table.c | 2 +- calendar/gui/e-memo-table.h | 2 +- calendar/gui/e-memos.c | 2 +- calendar/gui/e-memos.h | 2 +- calendar/gui/e-mini-calendar-config.c | 2 +- calendar/gui/e-mini-calendar-config.h | 2 +- calendar/gui/e-select-names-editable.c | 8 +- calendar/gui/e-select-names-editable.h | 2 +- calendar/gui/e-select-names-renderer.c | 4 +- calendar/gui/e-select-names-renderer.h | 2 +- calendar/gui/e-tasks.c | 4 +- calendar/gui/e-tasks.h | 2 +- calendar/gui/e-timezone-entry.c | 2 +- calendar/gui/e-timezone-entry.h | 2 +- calendar/gui/e-week-view-config.c | 2 +- calendar/gui/e-week-view-config.h | 2 +- calendar/gui/e-week-view-event-item.c | 2 +- calendar/gui/e-week-view-event-item.h | 2 +- calendar/gui/e-week-view-layout.c | 2 +- calendar/gui/e-week-view-layout.h | 2 +- calendar/gui/e-week-view-main-item.c | 2 +- calendar/gui/e-week-view-main-item.h | 2 +- calendar/gui/e-week-view-titles-item.c | 2 +- calendar/gui/e-week-view-titles-item.h | 2 +- calendar/gui/e-week-view.c | 32 +-- calendar/gui/e-week-view.h | 2 +- calendar/gui/gnome-cal.c | 38 ++-- calendar/gui/gnome-cal.h | 2 +- calendar/gui/goto.c | 2 +- calendar/gui/goto.h | 2 +- calendar/gui/itip-bonobo-control.c | 2 +- calendar/gui/itip-bonobo-control.h | 4 +- calendar/gui/itip-utils.c | 2 +- calendar/gui/itip-utils.h | 2 +- calendar/gui/main.c | 2 +- calendar/gui/memos-component.c | 8 +- calendar/gui/memos-component.h | 2 +- calendar/gui/memos-control.c | 2 +- calendar/gui/memos-control.h | 2 +- calendar/gui/migration.c | 2 +- calendar/gui/migration.h | 2 +- calendar/gui/misc.c | 2 +- calendar/gui/misc.h | 2 +- calendar/gui/print.c | 2 +- calendar/gui/print.h | 2 +- calendar/gui/tag-calendar.c | 2 +- calendar/gui/tag-calendar.h | 2 +- calendar/gui/tasks-component.c | 8 +- calendar/gui/tasks-component.h | 2 +- calendar/gui/tasks-control.c | 4 +- calendar/gui/tasks-control.h | 2 +- calendar/gui/weekday-picker.c | 2 +- calendar/gui/weekday-picker.h | 2 +- calendar/importers/evolution-calendar-importer.h | 2 +- calendar/importers/icalendar-importer.c | 2 +- calendar/importers/main.c | 2 +- calendar/zones.h | 2 +- composer/e-composer-actions.c | 2 +- composer/e-composer-actions.h | 2 +- composer/e-composer-autosave.c | 2 +- composer/e-composer-autosave.h | 2 +- composer/e-composer-common.h | 2 +- composer/e-composer-from-header.c | 2 +- composer/e-composer-from-header.h | 2 +- composer/e-composer-header-table.c | 4 +- composer/e-composer-header-table.h | 2 +- composer/e-composer-header.c | 2 +- composer/e-composer-header.h | 4 +- composer/e-composer-name-header.c | 4 +- composer/e-composer-name-header.h | 2 +- composer/e-composer-post-header.c | 2 +- composer/e-composer-post-header.h | 2 +- composer/e-composer-private.c | 4 +- composer/e-composer-private.h | 2 +- composer/e-composer-text-header.c | 4 +- composer/e-composer-text-header.h | 2 +- composer/e-msg-composer.c | 12 +- composer/e-msg-composer.h | 2 +- e-util/e-bconf-map.c | 2 +- e-util/e-bconf-map.h | 2 +- e-util/e-binding.c | 2 +- e-util/e-binding.h | 2 +- e-util/e-bit-array.c | 2 +- e-util/e-bit-array.h | 2 +- e-util/e-categories-config.c | 2 +- e-util/e-categories-config.h | 2 +- e-util/e-config-listener.c | 2 +- e-util/e-config-listener.h | 2 +- e-util/e-config.c | 2 +- e-util/e-config.h | 2 +- e-util/e-corba-utils.c | 2 +- e-util/e-corba-utils.h | 2 +- e-util/e-cursor.c | 2 +- e-util/e-cursor.h | 2 +- e-util/e-dialog-utils.c | 2 +- e-util/e-dialog-utils.h | 2 +- e-util/e-dialog-widgets.c | 2 +- e-util/e-dialog-widgets.h | 2 +- e-util/e-error.c | 6 +- e-util/e-error.h | 2 +- e-util/e-event.c | 2 +- e-util/e-event.h | 2 +- e-util/e-folder-map.c | 2 +- e-util/e-folder-map.h | 2 +- e-util/e-fsutils.c | 2 +- e-util/e-fsutils.h | 2 +- e-util/e-html-utils.c | 2 +- e-util/e-html-utils.h | 2 +- e-util/e-icon-factory.c | 2 +- e-util/e-icon-factory.h | 2 +- e-util/e-import.c | 2 +- e-util/e-import.h | 2 +- e-util/e-logger.c | 6 +- e-util/e-logger.h | 2 +- e-util/e-menu.c | 2 +- e-util/e-menu.h | 2 +- e-util/e-mktemp.c | 2 +- e-util/e-mktemp.h | 2 +- e-util/e-non-intrusive-error-dialog.c | 2 +- e-util/e-pilot-map.c | 2 +- e-util/e-pilot-map.h | 2 +- e-util/e-pilot-util.c | 2 +- e-util/e-pilot-util.h | 2 +- e-util/e-plugin-ui.c | 4 +- e-util/e-plugin-ui.h | 2 +- e-util/e-plugin.c | 4 +- e-util/e-plugin.h | 6 +- e-util/e-popup.c | 2 +- e-util/e-popup.h | 2 +- e-util/e-print.c | 2 +- e-util/e-print.h | 2 +- e-util/e-profile-event.c | 2 +- e-util/e-profile-event.h | 2 +- e-util/e-request.c | 2 +- e-util/e-request.h | 2 +- e-util/e-signature-list.c | 2 +- e-util/e-signature-list.h | 2 +- e-util/e-signature.c | 2 +- e-util/e-signature.h | 2 +- e-util/e-sorter-array.c | 2 +- e-util/e-sorter-array.h | 2 +- e-util/e-sorter.c | 2 +- e-util/e-sorter.h | 2 +- e-util/e-text-event-processor-emacs-like.c | 2 +- e-util/e-text-event-processor-emacs-like.h | 2 +- e-util/e-text-event-processor-types.h | 2 +- e-util/e-text-event-processor.c | 2 +- e-util/e-text-event-processor.h | 2 +- e-util/e-util-labels.c | 4 +- e-util/e-util-labels.h | 2 +- e-util/e-util-private.h | 2 +- e-util/e-util.c | 8 +- e-util/e-util.h | 2 +- e-util/e-win32-reloc.c | 2 +- e-util/e-xml-utils.c | 2 +- e-util/e-xml-utils.h | 2 +- e-util/gconf-bridge.c | 36 ++-- e-util/gconf-bridge.h | 6 +- filter/filter-code.c | 2 +- filter/filter-code.h | 2 +- filter/filter-colour.c | 2 +- filter/filter-colour.h | 2 +- filter/filter-datespec.c | 2 +- filter/filter-datespec.h | 2 +- filter/filter-element.c | 2 +- filter/filter-element.h | 2 +- filter/filter-file.c | 2 +- filter/filter-file.h | 2 +- filter/filter-input.c | 2 +- filter/filter-input.h | 2 +- filter/filter-int.c | 2 +- filter/filter-int.h | 2 +- filter/filter-option.c | 2 +- filter/filter-option.h | 2 +- filter/filter-part.c | 2 +- filter/filter-part.h | 2 +- filter/filter-rule.c | 6 +- filter/filter-rule.h | 2 +- filter/rule-context.c | 2 +- filter/rule-context.h | 2 +- filter/rule-editor.c | 2 +- filter/rule-editor.h | 2 +- iconv-detect.c | 2 +- mail/e-attachment-handler-mail.c | 2 +- mail/e-attachment-handler-mail.h | 2 +- mail/e-mail-attachment-bar.c | 2 +- mail/e-mail-attachment-bar.h | 2 +- mail/e-mail-search-bar.c | 2 +- mail/e-mail-search-bar.h | 2 +- mail/e-searching-tokenizer.c | 2 +- mail/e-searching-tokenizer.h | 2 +- mail/em-account-editor.c | 24 +-- mail/em-account-editor.h | 2 +- mail/em-account-prefs.c | 2 +- mail/em-account-prefs.h | 2 +- mail/em-composer-prefs.c | 4 +- mail/em-composer-prefs.h | 2 +- mail/em-composer-utils.c | 26 +-- mail/em-composer-utils.h | 4 +- mail/em-config.c | 2 +- mail/em-config.h | 2 +- mail/em-event.c | 2 +- mail/em-event.h | 2 +- mail/em-filter-context.c | 2 +- mail/em-filter-context.h | 2 +- mail/em-filter-editor.c | 4 +- mail/em-filter-editor.h | 2 +- mail/em-filter-folder-element.c | 2 +- mail/em-filter-folder-element.h | 2 +- mail/em-filter-rule.c | 4 +- mail/em-filter-rule.h | 2 +- mail/em-filter-source-element.c | 2 +- mail/em-filter-source-element.h | 2 +- mail/em-folder-browser.c | 6 +- mail/em-folder-browser.h | 2 +- mail/em-folder-properties.c | 6 +- mail/em-folder-properties.h | 2 +- mail/em-folder-selection-button.c | 2 +- mail/em-folder-selection-button.h | 2 +- mail/em-folder-selection.c | 2 +- mail/em-folder-selection.h | 2 +- mail/em-folder-selector.c | 2 +- mail/em-folder-selector.h | 2 +- mail/em-folder-tree-model.c | 2 +- mail/em-folder-tree-model.h | 2 +- mail/em-folder-tree.c | 4 +- mail/em-folder-tree.h | 2 +- mail/em-folder-utils.c | 6 +- mail/em-folder-utils.h | 2 +- mail/em-folder-view.c | 18 +- mail/em-folder-view.h | 2 +- mail/em-format-hook.c | 2 +- mail/em-format-hook.h | 2 +- mail/em-format-html-display.c | 6 +- mail/em-format-html-display.h | 2 +- mail/em-format-html-print.c | 2 +- mail/em-format-html-print.h | 2 +- mail/em-format-html.c | 70 +++--- mail/em-format-html.h | 2 +- mail/em-format-quote.c | 28 +-- mail/em-format-quote.h | 2 +- mail/em-format.c | 2 +- mail/em-format.h | 2 +- mail/em-html-stream.c | 2 +- mail/em-html-stream.h | 2 +- mail/em-icon-stream.c | 2 +- mail/em-icon-stream.h | 2 +- mail/em-inline-filter.c | 2 +- mail/em-inline-filter.h | 2 +- mail/em-junk-hook.c | 2 +- mail/em-junk-hook.h | 2 +- mail/em-mailer-prefs.c | 10 +- mail/em-mailer-prefs.h | 4 +- mail/em-menu.c | 2 +- mail/em-menu.h | 2 +- mail/em-message-browser.c | 2 +- mail/em-message-browser.h | 2 +- mail/em-migrate.c | 24 +-- mail/em-migrate.h | 2 +- mail/em-network-prefs.c | 62 +++--- mail/em-network-prefs.h | 12 +- mail/em-popup.c | 4 +- mail/em-popup.h | 2 +- mail/em-search-context.c | 2 +- mail/em-search-context.h | 2 +- mail/em-stripsig-filter.c | 2 +- mail/em-stripsig-filter.h | 2 +- mail/em-subscribe-editor.c | 10 +- mail/em-subscribe-editor.h | 2 +- mail/em-sync-stream.c | 2 +- mail/em-sync-stream.h | 2 +- mail/em-utils.c | 20 +- mail/em-utils.h | 2 +- mail/em-vfolder-context.c | 2 +- mail/em-vfolder-context.h | 2 +- mail/em-vfolder-editor.c | 2 +- mail/em-vfolder-editor.h | 2 +- mail/em-vfolder-rule.c | 2 +- mail/em-vfolder-rule.h | 2 +- mail/importers/elm-importer.c | 2 +- mail/importers/evolution-mbox-importer.c | 2 +- mail/importers/mail-importer.c | 2 +- mail/importers/mail-importer.h | 2 +- mail/importers/pine-importer.c | 2 +- mail/mail-autofilter.c | 2 +- mail/mail-autofilter.h | 2 +- mail/mail-component-factory.c | 2 +- mail/mail-component.c | 4 +- mail/mail-component.h | 2 +- mail/mail-config-factory.c | 2 +- mail/mail-config-factory.h | 2 +- mail/mail-config.c | 12 +- mail/mail-config.h | 2 +- mail/mail-crypto.c | 2 +- mail/mail-crypto.h | 2 +- mail/mail-folder-cache.c | 6 +- mail/mail-folder-cache.h | 2 +- mail/mail-mt.c | 2 +- mail/mail-mt.h | 2 +- mail/mail-ops.c | 12 +- mail/mail-ops.h | 2 +- mail/mail-send-recv.c | 8 +- mail/mail-send-recv.h | 2 +- mail/mail-session.c | 2 +- mail/mail-session.h | 2 +- mail/mail-signature-editor.c | 2 +- mail/mail-signature-editor.h | 2 +- mail/mail-tools.c | 2 +- mail/mail-tools.h | 2 +- mail/mail-types.h | 2 +- mail/mail-vfolder.c | 2 +- mail/mail-vfolder.h | 2 +- mail/message-list.c | 12 +- mail/message-list.h | 2 +- mail/message-tag-editor.c | 2 +- mail/message-tag-editor.h | 2 +- mail/message-tag-followup.c | 2 +- mail/message-tag-followup.h | 2 +- plugins/addressbook-file/addressbook-file.c | 2 +- plugins/attachment-reminder/attachment-reminder.c | 2 +- plugins/audio-inline/audio-inline.c | 2 +- plugins/backup-restore/backup-restore.c | 6 +- plugins/backup-restore/backup.c | 14 +- plugins/bbdb/bbdb.c | 2 +- plugins/bbdb/bbdb.h | 2 +- plugins/bbdb/gaimbuddies.c | 6 +- plugins/bbdb/test-evobuddy.c | 2 +- plugins/bogo-junk-plugin/bf-junk-filter.c | 10 +- plugins/caldav/caldav-source.c | 2 +- plugins/calendar-file/calendar-file.c | 2 +- plugins/copy-tool/copy-tool.c | 2 +- plugins/default-mailer/default-mailer.c | 2 +- plugins/default-source/default-source.c | 2 +- plugins/email-custom-header/email-custom-header.c | 88 ++++---- plugins/email-custom-header/email-custom-header.h | 4 +- .../exchange-operations/exchange-account-setup.c | 22 +- plugins/exchange-operations/exchange-calendar.c | 2 +- .../exchange-operations/exchange-change-password.c | 2 +- .../exchange-operations/exchange-change-password.h | 2 +- .../exchange-operations/exchange-config-listener.c | 2 +- .../exchange-operations/exchange-config-listener.h | 2 +- plugins/exchange-operations/exchange-contacts.c | 4 +- .../exchange-operations/exchange-delegates-user.c | 2 +- .../exchange-operations/exchange-delegates-user.h | 2 +- plugins/exchange-operations/exchange-delegates.c | 2 +- plugins/exchange-operations/exchange-delegates.h | 2 +- .../exchange-folder-permission.c | 2 +- .../exchange-folder-size-display.c | 2 +- .../exchange-folder-size-display.h | 2 +- .../exchange-folder-subscription.c | 2 +- .../exchange-folder-subscription.h | 2 +- plugins/exchange-operations/exchange-folder.c | 2 +- .../exchange-mail-send-options.c | 2 +- plugins/exchange-operations/exchange-operations.c | 2 +- plugins/exchange-operations/exchange-operations.h | 2 +- .../exchange-permissions-dialog.c | 2 +- .../exchange-permissions-dialog.h | 2 +- .../exchange-operations/exchange-send-options.c | 2 +- .../exchange-operations/exchange-send-options.h | 2 +- plugins/exchange-operations/exchange-user-dialog.c | 2 +- plugins/exchange-operations/exchange-user-dialog.h | 2 +- plugins/face/face.c | 2 +- plugins/folder-unsubscribe/folder-unsubscribe.c | 2 +- .../google-account-setup/google-contacts-source.c | 2 +- .../google-account-setup/google-contacts-source.h | 2 +- plugins/google-account-setup/google-source.c | 4 +- .../groupwise-account-setup/camel-gw-listener.c | 14 +- .../groupwise-account-setup/camel-gw-listener.h | 2 +- .../groupwise-account-setup.c | 6 +- plugins/groupwise-features/addressbook-groupwise.c | 2 +- plugins/groupwise-features/install-shared.c | 2 +- plugins/groupwise-features/junk-mail-settings.c | 2 +- plugins/groupwise-features/junk-settings.c | 2 +- plugins/groupwise-features/junk-settings.h | 2 +- plugins/groupwise-features/mail-retract.c | 8 +- plugins/groupwise-features/mail-send-options.c | 2 +- plugins/groupwise-features/mail-send-options.h | 2 +- plugins/groupwise-features/process-meeting.c | 30 +-- plugins/groupwise-features/proxy-login.c | 2 +- plugins/groupwise-features/proxy-login.h | 2 +- plugins/groupwise-features/proxy.c | 2 +- plugins/groupwise-features/proxy.h | 2 +- plugins/groupwise-features/send-options.c | 2 +- plugins/groupwise-features/share-folder-common.c | 2 +- plugins/groupwise-features/share-folder.c | 2 +- plugins/groupwise-features/share-folder.h | 2 +- plugins/groupwise-features/status-track.c | 2 +- plugins/hula-account-setup/camel-hula-listener.c | 2 +- plugins/hula-account-setup/camel-hula-listener.h | 2 +- plugins/hula-account-setup/hula-account-setup.c | 2 +- plugins/imap-features/imap-headers.c | 4 +- plugins/ipod-sync/evolution-ipod-sync.c | 2 +- plugins/ipod-sync/evolution-ipod-sync.h | 2 +- plugins/ipod-sync/format-handler.h | 2 +- plugins/ipod-sync/ical-format.c | 4 +- plugins/ipod-sync/ipod-sync.c | 4 +- plugins/ipod-sync/ipod.c | 2 +- plugins/ipod-sync/sync.c | 4 +- plugins/itip-formatter/itip-formatter.c | 16 +- plugins/itip-formatter/itip-view.c | 24 +-- plugins/itip-formatter/itip-view.h | 2 +- .../mail-account-disable/mail-account-disable.c | 2 +- plugins/mail-notification/mail-notification.c | 24 +-- plugins/mail-to-task/mail-to-task.c | 6 +- .../mailing-list-actions/mailing-list-actions.c | 2 +- plugins/mark-all-read/mark-all-read.c | 2 +- plugins/mono/mono-plugin.c | 8 +- plugins/mono/mono-plugin.h | 2 +- plugins/plugin-manager/plugin-manager.c | 6 +- plugins/prefer-plain/prefer-plain.c | 2 +- plugins/profiler/profiler.c | 2 +- plugins/pst-import/pst-importer.c | 240 ++++++++++----------- plugins/publish-calendar/publish-calendar.c | 14 +- plugins/publish-calendar/publish-format-fb.c | 2 +- plugins/publish-calendar/publish-format-fb.h | 2 +- plugins/publish-calendar/publish-format-ical.c | 2 +- plugins/publish-calendar/publish-format-ical.h | 2 +- plugins/publish-calendar/publish-location.c | 2 +- plugins/publish-calendar/publish-location.h | 2 +- plugins/publish-calendar/url-editor-dialog.c | 2 +- plugins/publish-calendar/url-editor-dialog.h | 2 +- plugins/python/python-plugin-loader.c | 12 +- plugins/python/python-plugin-loader.h | 2 +- plugins/sa-junk-plugin/em-junk-filter.c | 12 +- plugins/save-calendar/csv-format.c | 2 +- plugins/save-calendar/format-handler.h | 2 +- plugins/save-calendar/ical-format.c | 2 +- plugins/save-calendar/rdf-format.c | 2 +- plugins/save-calendar/save-calendar.c | 2 +- plugins/select-one-source/select-one-source.c | 2 +- plugins/startup-wizard/startup-wizard.c | 2 +- plugins/subject-thread/subject-thread.c | 2 +- plugins/templates/templates.c | 62 +++--- plugins/tnef-attachments/tnef-plugin.c | 4 +- plugins/vcard-inline/vcard-inline.c | 2 +- .../webdav-account-setup/webdav-contacts-source.c | 2 +- shell/e-component-registry.c | 2 +- shell/e-component-registry.h | 2 +- shell/e-component-view.c | 2 +- shell/e-component-view.h | 2 +- shell/e-config-upgrade.c | 2 +- shell/e-config-upgrade.h | 2 +- shell/e-corba-config-page.c | 2 +- shell/e-corba-config-page.h | 2 +- shell/e-shell-constants.h | 2 +- shell/e-shell-importer.c | 2 +- shell/e-shell-importer.h | 2 +- shell/e-shell-nm.c | 2 +- shell/e-shell-settings-dialog.c | 2 +- shell/e-shell-settings-dialog.h | 2 +- shell/e-shell-view.c | 2 +- shell/e-shell-view.h | 2 +- shell/e-shell-window-commands.c | 2 +- shell/e-shell-window-commands.h | 2 +- shell/e-shell-window.c | 8 +- shell/e-shell-window.h | 2 +- shell/e-shell.c | 2 +- shell/e-shell.h | 4 +- shell/e-sidebar.c | 2 +- shell/e-sidebar.h | 2 +- shell/e-user-creatable-items-handler.c | 2 +- shell/e-user-creatable-items-handler.h | 2 +- shell/es-event.c | 2 +- shell/es-event.h | 2 +- shell/es-menu.c | 2 +- shell/es-menu.h | 2 +- shell/evolution-component.c | 2 +- shell/evolution-component.h | 2 +- shell/evolution-config-control.c | 2 +- shell/evolution-config-control.h | 2 +- shell/evolution-listener.c | 2 +- shell/evolution-listener.h | 2 +- shell/evolution-shell-component-utils.c | 2 +- shell/evolution-shell-component-utils.h | 2 +- shell/importer/evolution-importer-client.c | 2 +- shell/importer/evolution-importer-client.h | 2 +- shell/importer/evolution-importer-listener.c | 2 +- shell/importer/evolution-importer-listener.h | 2 +- shell/importer/evolution-importer.c | 2 +- shell/importer/evolution-importer.h | 2 +- shell/importer/evolution-intelligent-importer.c | 2 +- shell/importer/evolution-intelligent-importer.h | 2 +- shell/importer/intelligent.c | 2 +- shell/importer/intelligent.h | 2 +- shell/main.c | 6 +- shell/test/evolution-test-component.c | 2 +- shell/test/evolution-test-component.h | 2 +- smime/gui/ca-trust-dialog.c | 2 +- smime/gui/ca-trust-dialog.h | 2 +- smime/gui/cert-trust-dialog.c | 2 +- smime/gui/cert-trust-dialog.h | 2 +- smime/gui/certificate-manager.c | 2 +- smime/gui/certificate-manager.h | 2 +- smime/gui/certificate-viewer.c | 2 +- smime/gui/certificate-viewer.h | 2 +- smime/gui/component.c | 2 +- smime/gui/component.h | 2 +- smime/gui/e-cert-selector.c | 2 +- smime/gui/e-cert-selector.h | 2 +- smime/lib/e-asn1-object.h | 2 +- smime/lib/e-cert-db.h | 2 +- smime/lib/e-cert-trust.h | 2 +- smime/lib/e-cert.h | 2 +- smime/lib/e-pkcs12.h | 2 +- smime/tests/import-cert.c | 2 +- tools/killev.c | 2 +- widgets/e-timezone-dialog/e-timezone-dialog.c | 16 +- widgets/e-timezone-dialog/e-timezone-dialog.h | 2 +- widgets/menus/gal-define-views-dialog.c | 2 +- widgets/menus/gal-define-views-dialog.h | 2 +- widgets/menus/gal-define-views-model.c | 2 +- widgets/menus/gal-define-views-model.h | 2 +- widgets/menus/gal-view-collection.c | 2 +- widgets/menus/gal-view-collection.h | 2 +- widgets/menus/gal-view-etable.c | 2 +- widgets/menus/gal-view-etable.h | 2 +- widgets/menus/gal-view-factory-etable.c | 2 +- widgets/menus/gal-view-factory-etable.h | 2 +- widgets/menus/gal-view-factory.c | 2 +- widgets/menus/gal-view-factory.h | 2 +- widgets/menus/gal-view-instance-save-as-dialog.c | 2 +- widgets/menus/gal-view-instance-save-as-dialog.h | 2 +- widgets/menus/gal-view-instance.c | 2 +- widgets/menus/gal-view-instance.h | 2 +- widgets/menus/gal-view-menus.c | 2 +- widgets/menus/gal-view-menus.h | 2 +- widgets/menus/gal-view-new-dialog.c | 2 +- widgets/menus/gal-view-new-dialog.h | 2 +- widgets/menus/gal-view.c | 2 +- widgets/menus/gal-view.h | 2 +- widgets/misc/e-account-combo-box.c | 2 +- widgets/misc/e-account-combo-box.h | 2 +- widgets/misc/e-activity-handler.c | 30 +-- widgets/misc/e-activity-handler.h | 2 +- widgets/misc/e-attachment-button.c | 2 +- widgets/misc/e-attachment-button.h | 2 +- widgets/misc/e-attachment-dialog.c | 2 +- widgets/misc/e-attachment-dialog.h | 2 +- widgets/misc/e-attachment-handler-image.c | 2 +- widgets/misc/e-attachment-handler-image.h | 2 +- widgets/misc/e-attachment-handler.c | 2 +- widgets/misc/e-attachment-handler.h | 2 +- widgets/misc/e-attachment-icon-view.c | 2 +- widgets/misc/e-attachment-icon-view.h | 2 +- widgets/misc/e-attachment-paned.c | 2 +- widgets/misc/e-attachment-paned.h | 2 +- widgets/misc/e-attachment-store.c | 2 +- widgets/misc/e-attachment-store.h | 2 +- widgets/misc/e-attachment-tree-view.c | 2 +- widgets/misc/e-attachment-tree-view.h | 2 +- widgets/misc/e-attachment-view.c | 2 +- widgets/misc/e-attachment-view.h | 2 +- widgets/misc/e-attachment.c | 2 +- widgets/misc/e-attachment.h | 2 +- widgets/misc/e-calendar-item.c | 8 +- widgets/misc/e-calendar-item.h | 2 +- widgets/misc/e-calendar.c | 2 +- widgets/misc/e-calendar.h | 2 +- widgets/misc/e-canvas-background.c | 2 +- widgets/misc/e-canvas-background.h | 2 +- widgets/misc/e-canvas-utils.c | 2 +- widgets/misc/e-canvas-utils.h | 2 +- widgets/misc/e-canvas-vbox.c | 2 +- widgets/misc/e-canvas-vbox.h | 2 +- widgets/misc/e-canvas.c | 2 +- widgets/misc/e-canvas.h | 2 +- widgets/misc/e-cell-date-edit.c | 2 +- widgets/misc/e-cell-date-edit.h | 2 +- widgets/misc/e-cell-percent.c | 2 +- widgets/misc/e-cell-percent.h | 2 +- widgets/misc/e-cell-renderer-combo.c | 2 +- widgets/misc/e-cell-renderer-combo.h | 2 +- widgets/misc/e-charset-picker.c | 4 +- widgets/misc/e-charset-picker.h | 2 +- widgets/misc/e-colors.c | 2 +- widgets/misc/e-colors.h | 2 +- widgets/misc/e-combo-button.c | 2 +- widgets/misc/e-combo-button.h | 2 +- widgets/misc/e-combo-cell-editable.c | 2 +- widgets/misc/e-combo-cell-editable.h | 2 +- widgets/misc/e-config-page.c | 2 +- widgets/misc/e-config-page.h | 2 +- widgets/misc/e-cursors.c | 2 +- widgets/misc/e-cursors.h | 2 +- widgets/misc/e-dateedit.c | 6 +- widgets/misc/e-dropdown-button.c | 2 +- widgets/misc/e-dropdown-button.h | 2 +- widgets/misc/e-filter-bar.c | 2 +- widgets/misc/e-filter-bar.h | 2 +- widgets/misc/e-gui-utils.c | 2 +- widgets/misc/e-gui-utils.h | 2 +- widgets/misc/e-image-chooser.c | 2 +- widgets/misc/e-image-chooser.h | 2 +- widgets/misc/e-info-label.c | 2 +- widgets/misc/e-info-label.h | 2 +- widgets/misc/e-map.c | 2 +- widgets/misc/e-map.h | 2 +- widgets/misc/e-multi-config-dialog.c | 2 +- widgets/misc/e-multi-config-dialog.h | 2 +- widgets/misc/e-online-button.c | 2 +- widgets/misc/e-online-button.h | 2 +- widgets/misc/e-pilot-settings.c | 2 +- widgets/misc/e-pilot-settings.h | 2 +- widgets/misc/e-popup-menu.c | 2 +- widgets/misc/e-popup-menu.h | 2 +- widgets/misc/e-printable.c | 2 +- widgets/misc/e-printable.h | 2 +- widgets/misc/e-reflow-model.c | 2 +- widgets/misc/e-reflow-model.h | 2 +- widgets/misc/e-reflow.c | 2 +- widgets/misc/e-reflow.h | 2 +- widgets/misc/e-search-bar.c | 4 +- widgets/misc/e-search-bar.h | 2 +- widgets/misc/e-selection-model-array.c | 2 +- widgets/misc/e-selection-model-array.h | 2 +- widgets/misc/e-selection-model-simple.c | 2 +- widgets/misc/e-selection-model-simple.h | 2 +- widgets/misc/e-selection-model.c | 2 +- widgets/misc/e-selection-model.h | 2 +- widgets/misc/e-send-options.c | 2 +- widgets/misc/e-send-options.h | 4 +- widgets/misc/e-signature-combo-box.c | 2 +- widgets/misc/e-signature-combo-box.h | 2 +- widgets/misc/e-task-bar.c | 8 +- widgets/misc/e-task-bar.h | 4 +- widgets/misc/e-task-widget.c | 4 +- widgets/misc/e-task-widget.h | 2 +- widgets/misc/e-unicode.c | 2 +- widgets/misc/e-unicode.h | 2 +- widgets/misc/e-url-entry.c | 2 +- widgets/misc/e-url-entry.h | 2 +- widgets/misc/test-calendar.c | 2 +- widgets/misc/test-dateedit.c | 2 +- widgets/misc/test-dropdown-button.c | 2 +- widgets/misc/test-error.c | 2 +- widgets/misc/test-info-label.c | 2 +- widgets/misc/test-multi-config-dialog.c | 2 +- widgets/table/e-cell-checkbox.c | 2 +- widgets/table/e-cell-checkbox.h | 2 +- widgets/table/e-cell-combo.c | 2 +- widgets/table/e-cell-combo.h | 2 +- widgets/table/e-cell-date.c | 4 +- widgets/table/e-cell-date.h | 2 +- widgets/table/e-cell-hbox.c | 2 +- widgets/table/e-cell-hbox.h | 2 +- widgets/table/e-cell-number.c | 2 +- widgets/table/e-cell-number.h | 2 +- widgets/table/e-cell-pixbuf.c | 6 +- widgets/table/e-cell-pixbuf.h | 2 +- widgets/table/e-cell-popup.c | 2 +- widgets/table/e-cell-popup.h | 2 +- widgets/table/e-cell-size.c | 2 +- widgets/table/e-cell-size.h | 2 +- widgets/table/e-cell-text.c | 2 +- widgets/table/e-cell-text.h | 2 +- widgets/table/e-cell-toggle.c | 10 +- widgets/table/e-cell-toggle.h | 2 +- widgets/table/e-cell-vbox.c | 2 +- widgets/table/e-cell-vbox.h | 2 +- widgets/table/e-cell.c | 2 +- widgets/table/e-cell.h | 2 +- widgets/table/e-table-click-to-add.c | 2 +- widgets/table/e-table-click-to-add.h | 2 +- widgets/table/e-table-col-dnd.h | 2 +- widgets/table/e-table-col.c | 2 +- widgets/table/e-table-col.h | 2 +- widgets/table/e-table-column-specification.c | 2 +- widgets/table/e-table-column-specification.h | 2 +- widgets/table/e-table-column.c | 2 +- widgets/table/e-table-config-field.c | 2 +- widgets/table/e-table-config-field.h | 2 +- widgets/table/e-table-config.c | 2 +- widgets/table/e-table-config.h | 2 +- widgets/table/e-table-defines.h | 2 +- widgets/table/e-table-example-1.c | 2 +- widgets/table/e-table-example-2.c | 2 +- widgets/table/e-table-extras.c | 2 +- widgets/table/e-table-extras.h | 2 +- widgets/table/e-table-field-chooser-dialog.c | 2 +- widgets/table/e-table-field-chooser-dialog.h | 2 +- widgets/table/e-table-field-chooser-item.c | 2 +- widgets/table/e-table-field-chooser-item.h | 2 +- widgets/table/e-table-field-chooser.c | 2 +- widgets/table/e-table-field-chooser.h | 2 +- widgets/table/e-table-group-container.c | 2 +- widgets/table/e-table-group-container.h | 2 +- widgets/table/e-table-group-leaf.c | 2 +- widgets/table/e-table-group-leaf.h | 2 +- widgets/table/e-table-group.c | 2 +- widgets/table/e-table-group.h | 2 +- widgets/table/e-table-header-item.c | 2 +- widgets/table/e-table-header-item.h | 2 +- widgets/table/e-table-header-utils.c | 2 +- widgets/table/e-table-header-utils.h | 2 +- widgets/table/e-table-header.c | 2 +- widgets/table/e-table-header.h | 2 +- widgets/table/e-table-item.c | 26 +-- widgets/table/e-table-item.h | 2 +- widgets/table/e-table-memory-callbacks.c | 2 +- widgets/table/e-table-memory-callbacks.h | 2 +- widgets/table/e-table-memory-store.c | 2 +- widgets/table/e-table-memory-store.h | 2 +- widgets/table/e-table-memory.c | 2 +- widgets/table/e-table-memory.h | 2 +- widgets/table/e-table-model.c | 2 +- widgets/table/e-table-model.h | 2 +- widgets/table/e-table-one.c | 2 +- widgets/table/e-table-one.h | 2 +- widgets/table/e-table-scrolled.c | 2 +- widgets/table/e-table-scrolled.h | 2 +- widgets/table/e-table-search.c | 2 +- widgets/table/e-table-search.h | 2 +- widgets/table/e-table-selection-model.c | 2 +- widgets/table/e-table-selection-model.h | 2 +- widgets/table/e-table-simple.c | 2 +- widgets/table/e-table-simple.h | 2 +- widgets/table/e-table-sort-info.c | 2 +- widgets/table/e-table-sort-info.h | 2 +- widgets/table/e-table-sorted-variable.c | 2 +- widgets/table/e-table-sorted-variable.h | 2 +- widgets/table/e-table-sorted.c | 2 +- widgets/table/e-table-sorted.h | 2 +- widgets/table/e-table-sorter.c | 2 +- widgets/table/e-table-sorter.h | 2 +- widgets/table/e-table-sorting-utils.c | 2 +- widgets/table/e-table-sorting-utils.h | 2 +- widgets/table/e-table-specification.c | 2 +- widgets/table/e-table-specification.h | 2 +- widgets/table/e-table-state.c | 2 +- widgets/table/e-table-state.h | 2 +- widgets/table/e-table-subset-variable.c | 2 +- widgets/table/e-table-subset-variable.h | 2 +- widgets/table/e-table-subset.c | 2 +- widgets/table/e-table-subset.h | 2 +- widgets/table/e-table-tooltip.h | 2 +- widgets/table/e-table-tree.h | 2 +- widgets/table/e-table-utils.c | 2 +- widgets/table/e-table-utils.h | 2 +- widgets/table/e-table-without.c | 2 +- widgets/table/e-table-without.h | 2 +- widgets/table/e-table.c | 2 +- widgets/table/e-table.h | 2 +- widgets/table/e-tree-memory-callbacks.c | 2 +- widgets/table/e-tree-memory-callbacks.h | 2 +- widgets/table/e-tree-memory.c | 2 +- widgets/table/e-tree-memory.h | 2 +- widgets/table/e-tree-model.c | 2 +- widgets/table/e-tree-model.h | 2 +- widgets/table/e-tree-scrolled.c | 2 +- widgets/table/e-tree-scrolled.h | 2 +- widgets/table/e-tree-selection-model.c | 2 +- widgets/table/e-tree-selection-model.h | 2 +- widgets/table/e-tree-simple.c | 2 +- widgets/table/e-tree-simple.h | 2 +- widgets/table/e-tree-sorted-variable.c | 2 +- widgets/table/e-tree-sorted-variable.h | 2 +- widgets/table/e-tree-sorted.c | 2 +- widgets/table/e-tree-sorted.h | 2 +- widgets/table/e-tree-table-adapter.c | 2 +- widgets/table/e-tree-table-adapter.h | 2 +- widgets/table/e-tree.c | 4 +- widgets/table/e-tree.h | 2 +- widgets/table/table-test.h | 2 +- widgets/text/e-text-model-repos.c | 2 +- widgets/text/e-text-model-repos.h | 2 +- widgets/text/e-text-model.c | 2 +- widgets/text/e-text-model.h | 2 +- widgets/text/e-text.c | 8 +- widgets/text/e-text.h | 2 +- 1096 files changed, 1793 insertions(+), 1793 deletions(-) diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c index 962e73e707..6c2da221b9 100644 --- a/a11y/addressbook/ea-addressbook-view.c +++ b/a11y/addressbook/ea-addressbook-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-addressbook-view.h b/a11y/addressbook/ea-addressbook-view.h index 86782ad737..f223f24a0c 100644 --- a/a11y/addressbook/ea-addressbook-view.h +++ b/a11y/addressbook/ea-addressbook-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-addressbook.c b/a11y/addressbook/ea-addressbook.c index b41a98434e..8ccff66a5b 100644 --- a/a11y/addressbook/ea-addressbook.c +++ b/a11y/addressbook/ea-addressbook.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-addressbook.h b/a11y/addressbook/ea-addressbook.h index 337f467760..97b691dc18 100644 --- a/a11y/addressbook/ea-addressbook.h +++ b/a11y/addressbook/ea-addressbook.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c index 944060b91a..dab53e6ce5 100644 --- a/a11y/addressbook/ea-minicard-view.c +++ b/a11y/addressbook/ea-minicard-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-minicard-view.h b/a11y/addressbook/ea-minicard-view.h index 922941cb7b..f20ef4487b 100644 --- a/a11y/addressbook/ea-minicard-view.h +++ b/a11y/addressbook/ea-minicard-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c index 258fcbd4bc..d77d591fcc 100644 --- a/a11y/addressbook/ea-minicard.c +++ b/a11y/addressbook/ea-minicard.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/addressbook/ea-minicard.h b/a11y/addressbook/ea-minicard.h index 9c0c8a2b56..15f89e19c3 100644 --- a/a11y/addressbook/ea-minicard.h +++ b/a11y/addressbook/ea-minicard.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c index 7b7e8eaa92..e0c0f8fdac 100644 --- a/a11y/calendar/ea-cal-view-event.c +++ b/a11y/calendar/ea-cal-view-event.c @@ -10,11 +10,11 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: - * Bolian Yin + * Bolian Yin * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/a11y/calendar/ea-cal-view-event.h b/a11y/calendar/ea-cal-view-event.h index c5000095f6..fccf023a82 100644 --- a/a11y/calendar/ea-cal-view-event.h +++ b/a11y/calendar/ea-cal-view-event.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c index e184b919b9..7e337ac16b 100644 --- a/a11y/calendar/ea-cal-view.c +++ b/a11y/calendar/ea-cal-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-cal-view.h b/a11y/calendar/ea-cal-view.h index e8ebb9eb37..9aa026ef6d 100644 --- a/a11y/calendar/ea-cal-view.h +++ b/a11y/calendar/ea-cal-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c index cc9474c0bc..f07cdfa086 100644 --- a/a11y/calendar/ea-calendar-helpers.c +++ b/a11y/calendar/ea-calendar-helpers.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-calendar-helpers.h b/a11y/calendar/ea-calendar-helpers.h index 3c980f2911..a4045cd7af 100644 --- a/a11y/calendar/ea-calendar-helpers.h +++ b/a11y/calendar/ea-calendar-helpers.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-calendar.c b/a11y/calendar/ea-calendar.c index bc37ab3079..26e73da6da 100644 --- a/a11y/calendar/ea-calendar.c +++ b/a11y/calendar/ea-calendar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-calendar.h b/a11y/calendar/ea-calendar.h index 36ef7d5ea0..b2238ffdbc 100644 --- a/a11y/calendar/ea-calendar.h +++ b/a11y/calendar/ea-calendar.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-day-view-cell.c b/a11y/calendar/ea-day-view-cell.c index 1b8e111e97..bc303f380f 100644 --- a/a11y/calendar/ea-day-view-cell.c +++ b/a11y/calendar/ea-day-view-cell.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-day-view-cell.h b/a11y/calendar/ea-day-view-cell.h index ca674e2451..e0394c639b 100644 --- a/a11y/calendar/ea-day-view-cell.h +++ b/a11y/calendar/ea-day-view-cell.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c index aeaf1d105c..783710dc61 100644 --- a/a11y/calendar/ea-day-view-main-item.c +++ b/a11y/calendar/ea-day-view-main-item.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-day-view-main-item.h b/a11y/calendar/ea-day-view-main-item.h index 79b166f39a..0ee7b5e0d1 100644 --- a/a11y/calendar/ea-day-view-main-item.h +++ b/a11y/calendar/ea-day-view-main-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c index b43ddbe56f..107f983bb0 100644 --- a/a11y/calendar/ea-day-view.c +++ b/a11y/calendar/ea-day-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-day-view.h b/a11y/calendar/ea-day-view.h index 5c4773d048..011064a764 100644 --- a/a11y/calendar/ea-day-view.h +++ b/a11y/calendar/ea-day-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c index b6eee2699c..4d6e752b8e 100644 --- a/a11y/calendar/ea-gnome-calendar.c +++ b/a11y/calendar/ea-gnome-calendar.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-gnome-calendar.h b/a11y/calendar/ea-gnome-calendar.h index 50c43072af..56e695a684 100644 --- a/a11y/calendar/ea-gnome-calendar.h +++ b/a11y/calendar/ea-gnome-calendar.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-jump-button.c b/a11y/calendar/ea-jump-button.c index 3f9c72e33d..7888196b8d 100644 --- a/a11y/calendar/ea-jump-button.c +++ b/a11y/calendar/ea-jump-button.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-jump-button.h b/a11y/calendar/ea-jump-button.h index 4fbd92022f..cb2bea315d 100644 --- a/a11y/calendar/ea-jump-button.h +++ b/a11y/calendar/ea-jump-button.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-week-view-cell.c b/a11y/calendar/ea-week-view-cell.c index 1d1b4d004f..4c7a591121 100644 --- a/a11y/calendar/ea-week-view-cell.c +++ b/a11y/calendar/ea-week-view-cell.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-week-view-cell.h b/a11y/calendar/ea-week-view-cell.h index b09d7d1789..4cd2971b80 100644 --- a/a11y/calendar/ea-week-view-cell.h +++ b/a11y/calendar/ea-week-view-cell.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c index 5bfb73306b..ae507df235 100644 --- a/a11y/calendar/ea-week-view-main-item.c +++ b/a11y/calendar/ea-week-view-main-item.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-week-view-main-item.h b/a11y/calendar/ea-week-view-main-item.h index 12687d26c0..2093de10bd 100644 --- a/a11y/calendar/ea-week-view-main-item.h +++ b/a11y/calendar/ea-week-view-main-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c index 6cf234c864..1d88e40c46 100644 --- a/a11y/calendar/ea-week-view.c +++ b/a11y/calendar/ea-week-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/calendar/ea-week-view.h b/a11y/calendar/ea-week-view.h index b24fe72103..5a83276059 100644 --- a/a11y/calendar/ea-week-view.h +++ b/a11y/calendar/ea-week-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c index 1a40b23a21..5ae3cef686 100644 --- a/a11y/e-table/gal-a11y-e-cell-popup.c +++ b/a11y/e-table/gal-a11y-e-cell-popup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-popup.h b/a11y/e-table/gal-a11y-e-cell-popup.h index ebc16c1880..4bee17e8ce 100644 --- a/a11y/e-table/gal-a11y-e-cell-popup.h +++ b/a11y/e-table/gal-a11y-e-cell-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-registry.c b/a11y/e-table/gal-a11y-e-cell-registry.c index b88fb581fc..1da241fea9 100644 --- a/a11y/e-table/gal-a11y-e-cell-registry.c +++ b/a11y/e-table/gal-a11y-e-cell-registry.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-registry.h b/a11y/e-table/gal-a11y-e-cell-registry.h index f231567222..bc43a662cc 100644 --- a/a11y/e-table/gal-a11y-e-cell-registry.h +++ b/a11y/e-table/gal-a11y-e-cell-registry.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c index e77c0739a9..a2b9f715f8 100644 --- a/a11y/e-table/gal-a11y-e-cell-text.c +++ b/a11y/e-table/gal-a11y-e-cell-text.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-text.h b/a11y/e-table/gal-a11y-e-cell-text.h index c69b374100..fe404169a1 100644 --- a/a11y/e-table/gal-a11y-e-cell-text.h +++ b/a11y/e-table/gal-a11y-e-cell-text.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c index 23114b0373..c0425a0cbb 100644 --- a/a11y/e-table/gal-a11y-e-cell-toggle.c +++ b/a11y/e-table/gal-a11y-e-cell-toggle.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.h b/a11y/e-table/gal-a11y-e-cell-toggle.h index 56483aae6b..769e0b4200 100644 --- a/a11y/e-table/gal-a11y-e-cell-toggle.h +++ b/a11y/e-table/gal-a11y-e-cell-toggle.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c index 520a818a37..0a5f8e2019 100644 --- a/a11y/e-table/gal-a11y-e-cell-tree.c +++ b/a11y/e-table/gal-a11y-e-cell-tree.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-tree.h b/a11y/e-table/gal-a11y-e-cell-tree.h index f6f6d9dd70..43169c2f28 100644 --- a/a11y/e-table/gal-a11y-e-cell-tree.h +++ b/a11y/e-table/gal-a11y-e-cell-tree.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.c b/a11y/e-table/gal-a11y-e-cell-vbox.c index 08859d07ef..7a5eadba52 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.c +++ b/a11y/e-table/gal-a11y-e-cell-vbox.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.h b/a11y/e-table/gal-a11y-e-cell-vbox.h index 276a60177a..2055ac3195 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.h +++ b/a11y/e-table/gal-a11y-e-cell-vbox.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c index 6154fc0acd..3b74675ae5 100644 --- a/a11y/e-table/gal-a11y-e-cell.c +++ b/a11y/e-table/gal-a11y-e-cell.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h index cdae721112..af96c69d47 100644 --- a/a11y/e-table/gal-a11y-e-cell.h +++ b/a11y/e-table/gal-a11y-e-cell.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c index 9161b4d834..0ebb3c4621 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c +++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h index 0e4ac11f79..9f249f0178 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h +++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c index 85c896ccf3..ed417e1601 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add.c +++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.h b/a11y/e-table/gal-a11y-e-table-click-to-add.h index ccefc7a9b8..17d6940d08 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add.h +++ b/a11y/e-table/gal-a11y-e-table-click-to-add.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-column-header.c b/a11y/e-table/gal-a11y-e-table-column-header.c index a50a286940..4df75cc564 100644 --- a/a11y/e-table/gal-a11y-e-table-column-header.c +++ b/a11y/e-table/gal-a11y-e-table-column-header.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-column-header.h b/a11y/e-table/gal-a11y-e-table-column-header.h index 083f0af3de..d0b1ff5aeb 100644 --- a/a11y/e-table/gal-a11y-e-table-column-header.h +++ b/a11y/e-table/gal-a11y-e-table-column-header.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-factory.c b/a11y/e-table/gal-a11y-e-table-factory.c index 37c396aba8..f459f3b67c 100644 --- a/a11y/e-table/gal-a11y-e-table-factory.c +++ b/a11y/e-table/gal-a11y-e-table-factory.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-factory.h b/a11y/e-table/gal-a11y-e-table-factory.h index e3ef52c872..3439cf0bdc 100644 --- a/a11y/e-table/gal-a11y-e-table-factory.h +++ b/a11y/e-table/gal-a11y-e-table-factory.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.c b/a11y/e-table/gal-a11y-e-table-item-factory.c index 43508e4796..fa14652788 100644 --- a/a11y/e-table/gal-a11y-e-table-item-factory.c +++ b/a11y/e-table/gal-a11y-e-table-item-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.h b/a11y/e-table/gal-a11y-e-table-item-factory.h index a85c9e894f..f27c491a4d 100644 --- a/a11y/e-table/gal-a11y-e-table-item-factory.h +++ b/a11y/e-table/gal-a11y-e-table-item-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c index e28d0f6b83..935f53b83b 100644 --- a/a11y/e-table/gal-a11y-e-table-item.c +++ b/a11y/e-table/gal-a11y-e-table-item.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table-item.h b/a11y/e-table/gal-a11y-e-table-item.h index e89f0824b3..27d6a8244b 100644 --- a/a11y/e-table/gal-a11y-e-table-item.h +++ b/a11y/e-table/gal-a11y-e-table-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c index 20261d4eab..1966fb29ee 100644 --- a/a11y/e-table/gal-a11y-e-table.c +++ b/a11y/e-table/gal-a11y-e-table.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-table.h b/a11y/e-table/gal-a11y-e-table.h index ab133f5c71..d8f972df81 100644 --- a/a11y/e-table/gal-a11y-e-table.h +++ b/a11y/e-table/gal-a11y-e-table.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-tree-factory.c b/a11y/e-table/gal-a11y-e-tree-factory.c index cacb3fe082..8dc06e2936 100644 --- a/a11y/e-table/gal-a11y-e-tree-factory.c +++ b/a11y/e-table/gal-a11y-e-tree-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-tree-factory.h b/a11y/e-table/gal-a11y-e-tree-factory.h index 621d256c48..3d97c7a3b1 100644 --- a/a11y/e-table/gal-a11y-e-tree-factory.h +++ b/a11y/e-table/gal-a11y-e-tree-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c index 6fde32b8e7..4ecce81501 100644 --- a/a11y/e-table/gal-a11y-e-tree.c +++ b/a11y/e-table/gal-a11y-e-tree.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-table/gal-a11y-e-tree.h b/a11y/e-table/gal-a11y-e-tree.h index 9fe482e1f8..d2aa8a0d2a 100644 --- a/a11y/e-table/gal-a11y-e-tree.h +++ b/a11y/e-table/gal-a11y-e-tree.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-text/gal-a11y-e-text-factory.c b/a11y/e-text/gal-a11y-e-text-factory.c index e1f835e912..2df9241014 100644 --- a/a11y/e-text/gal-a11y-e-text-factory.c +++ b/a11y/e-text/gal-a11y-e-text-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-text/gal-a11y-e-text-factory.h b/a11y/e-text/gal-a11y-e-text-factory.h index ce4d4d0a65..df7638f64f 100644 --- a/a11y/e-text/gal-a11y-e-text-factory.h +++ b/a11y/e-text/gal-a11y-e-text-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c index 4eeb7811fc..98484949ff 100644 --- a/a11y/e-text/gal-a11y-e-text.c +++ b/a11y/e-text/gal-a11y-e-text.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/e-text/gal-a11y-e-text.h b/a11y/e-text/gal-a11y-e-text.h index 5cebd0ff83..6a5bb80de0 100644 --- a/a11y/e-text/gal-a11y-e-text.h +++ b/a11y/e-text/gal-a11y-e-text.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/ea-cell-table.c b/a11y/ea-cell-table.c index 89724ffac0..8c0b9ee253 100644 --- a/a11y/ea-cell-table.c +++ b/a11y/ea-cell-table.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/ea-cell-table.h b/a11y/ea-cell-table.h index 6844abe9da..f8674ec42a 100644 --- a/a11y/ea-cell-table.h +++ b/a11y/ea-cell-table.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h index c7805c1ad3..dcf6a1382f 100644 --- a/a11y/ea-factory.h +++ b/a11y/ea-factory.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/gal-a11y-factory.h b/a11y/gal-a11y-factory.h index 884c94f31e..1ef8292eba 100644 --- a/a11y/gal-a11y-factory.h +++ b/a11y/gal-a11y-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/gal-a11y-util.c b/a11y/gal-a11y-util.c index c06b4efd6c..ec2a5061f8 100644 --- a/a11y/gal-a11y-util.c +++ b/a11y/gal-a11y-util.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/gal-a11y-util.h b/a11y/gal-a11y-util.h index 8354df9ac5..dedad9e049 100644 --- a/a11y/gal-a11y-util.h +++ b/a11y/gal-a11y-util.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-calendar-cell.c b/a11y/widgets/ea-calendar-cell.c index 9cd3a58622..5b4e9f1d8c 100644 --- a/a11y/widgets/ea-calendar-cell.c +++ b/a11y/widgets/ea-calendar-cell.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-calendar-cell.h b/a11y/widgets/ea-calendar-cell.h index a07b7e8bbc..be35c66312 100644 --- a/a11y/widgets/ea-calendar-cell.h +++ b/a11y/widgets/ea-calendar-cell.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c index a3da175df1..fdb109d5e6 100644 --- a/a11y/widgets/ea-calendar-item.c +++ b/a11y/widgets/ea-calendar-item.c @@ -10,11 +10,11 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: - * Bolian Yin + * Bolian Yin * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/a11y/widgets/ea-calendar-item.h b/a11y/widgets/ea-calendar-item.h index 87b825b479..b5f1b0ce81 100644 --- a/a11y/widgets/ea-calendar-item.h +++ b/a11y/widgets/ea-calendar-item.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-combo-button.c b/a11y/widgets/ea-combo-button.c index c44274e402..c5180c3927 100644 --- a/a11y/widgets/ea-combo-button.c +++ b/a11y/widgets/ea-combo-button.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-combo-button.h b/a11y/widgets/ea-combo-button.h index 37533fd1e5..2b5d0aa3ca 100644 --- a/a11y/widgets/ea-combo-button.h +++ b/a11y/widgets/ea-combo-button.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-widgets.c b/a11y/widgets/ea-widgets.c index 5befb44837..3dca419104 100644 --- a/a11y/widgets/ea-widgets.c +++ b/a11y/widgets/ea-widgets.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/a11y/widgets/ea-widgets.h b/a11y/widgets/ea-widgets.h index 20c1c9698d..c07526f4fd 100644 --- a/a11y/widgets/ea-widgets.h +++ b/a11y/widgets/ea-widgets.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index ec89c9a34f..aa7bb74c6a 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index e580fb2844..2c1d5caa9b 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h index 83fbdf87ee..222ace82d7 100644 --- a/addressbook/gui/component/addressbook-component.h +++ b/addressbook/gui/component/addressbook-component.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 87e018796b..ebb2d18b5d 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h index 6ea33f1656..e06e98f887 100644 --- a/addressbook/gui/component/addressbook-config.h +++ b/addressbook/gui/component/addressbook-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index f0e106e14c..ca691761c9 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-migrate.h b/addressbook/gui/component/addressbook-migrate.h index ad3df6b26a..5727b3d0ab 100644 --- a/addressbook/gui/component/addressbook-migrate.h +++ b/addressbook/gui/component/addressbook-migrate.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 9759b3fdf2..e6b99c6405 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook-view.h b/addressbook/gui/component/addressbook-view.h index f86ce46005..08bbbb3e99 100644 --- a/addressbook/gui/component/addressbook-view.h +++ b/addressbook/gui/component/addressbook-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 9bb726e17e..f36012ab94 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h index a56f088f7d..0dbd4d7a3d 100644 --- a/addressbook/gui/component/addressbook.h +++ b/addressbook/gui/component/addressbook.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c index 8c259c6a7a..f45f2228e1 100644 --- a/addressbook/gui/component/autocompletion-config.c +++ b/addressbook/gui/component/autocompletion-config.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/autocompletion-config.h b/addressbook/gui/component/autocompletion-config.h index 2f4f0184c4..0690604bc7 100644 --- a/addressbook/gui/component/autocompletion-config.h +++ b/addressbook/gui/component/autocompletion-config.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c index 52bc377115..4d02cc3e6b 100644 --- a/addressbook/gui/component/component-factory.c +++ b/addressbook/gui/component/component-factory.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index c2194e8b8c..3897d605e3 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h index 81b7182397..6ccd89ed9e 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index c8a427a253..c7ce449ec4 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index 02b837fb46..e9f40507ae 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 926d369b5a..e8d7b03e6c 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h index 0aaabdc69c..e58722b4a2 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.h +++ b/addressbook/gui/contact-editor/e-contact-quick-add.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c index b94dff2953..d052e42fd7 100644 --- a/addressbook/gui/contact-editor/eab-editor.c +++ b/addressbook/gui/contact-editor/eab-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h index ae13270fe0..18a11047be 100644 --- a/addressbook/gui/contact-editor/eab-editor.h +++ b/addressbook/gui/contact-editor/eab-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index 2f55e4777c..e624c97987 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/contact-editor/test-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 212c1bbd7a..7a492f0c52 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -252,9 +252,9 @@ contact_list_editor_cancel_load (EContactListEditor *editor) priv->load_book = NULL; } -static gboolean +static gboolean contact_list_editor_contact_exists (EContactListModel *model, - const gchar *email) + const gchar *email) { const gchar *tag = "addressbook:ask-list-add-exists"; @@ -639,7 +639,7 @@ contact_list_editor_email_entry_updated_cb (GtkWidget *widget, email = g_strdup (e_destination_get_address (destination)); store = e_name_selector_entry_peek_destination_store (entry); e_destination_store_remove_destination (store, destination); - gtk_entry_set_text (GTK_ENTRY (WIDGET (EMAIL_ENTRY)), ""); + gtk_entry_set_text (GTK_ENTRY (WIDGET (EMAIL_ENTRY)), ""); if (email && *email) { e_contact_list_model_add_email (model, email); @@ -1142,7 +1142,7 @@ contact_list_editor_class_init (EContactListEditorClass *class) g_object_class_install_property ( object_class, - PROP_BOOK, + PROP_BOOK, g_param_spec_object ( "book", _("Book"), @@ -1152,7 +1152,7 @@ contact_list_editor_class_init (EContactListEditorClass *class) g_object_class_install_property ( object_class, - PROP_CONTACT, + PROP_CONTACT, g_param_spec_object ( "contact", _("Contact"), @@ -1162,7 +1162,7 @@ contact_list_editor_class_init (EContactListEditorClass *class) g_object_class_install_property ( object_class, - PROP_IS_NEW_LIST, + PROP_IS_NEW_LIST, g_param_spec_boolean ( "is_new_list", _("Is New List"), @@ -1172,7 +1172,7 @@ contact_list_editor_class_init (EContactListEditorClass *class) g_object_class_install_property ( object_class, - PROP_EDITABLE, + PROP_EDITABLE, g_param_spec_boolean ( "editable", _("Editable"), diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h index deed3f60c0..fcee0b02ef 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c index f381e6754e..d43e895570 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h index f4fde83a4b..1f7c35a7be 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c index 7747669f24..86138efb14 100644 --- a/addressbook/gui/merging/eab-contact-compare.c +++ b/addressbook/gui/merging/eab-contact-compare.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h index ff8bfc1a85..d08461940b 100644 --- a/addressbook/gui/merging/eab-contact-compare.h +++ b/addressbook/gui/merging/eab-contact-compare.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 502fe381b6..895e8126c6 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/merging/eab-contact-merging.h index 4228fc1028..81528c6325 100644 --- a/addressbook/gui/merging/eab-contact-merging.h +++ b/addressbook/gui/merging/eab-contact-merging.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 73518fc0b2..9482a93744 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h index 6558d94812..ae1c5f4cb2 100644 --- a/addressbook/gui/widgets/e-addressbook-model.h +++ b/addressbook/gui/widgets/e-addressbook-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index d2c20722ef..237838141b 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h index fd7842684f..88ce1a7132 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index a4440155d9..9e3dfe5f5f 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h index c4182d2d2b..edfb1adf00 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index fe39c029e0..4cd151f19f 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 799e01a792..7f796415cd 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 696d42dcd9..a6090291bd 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h index 3d41e4cb87..f6b0607ca6 100644 --- a/addressbook/gui/widgets/e-minicard-label.h +++ b/addressbook/gui/widgets/e-minicard-label.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 0f9ae7c143..9c493afa61 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index 1c4323523f..ff9cddac24 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 756a019d9f..b716c86c80 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index 7d0a5b1842..4bda766254 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 10a406edbf..0c70b12da0 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -770,7 +770,7 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width) EMinicardField *minicard_field; char *name; char *string; - gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); + gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); group = GNOME_CANVAS_GROUP( e_minicard ); @@ -839,7 +839,7 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i char *name; GList *l, *le; int count =0; - gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); + gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); GList *emails = e_contact_get (e_minicard->contact, E_CONTACT_EMAIL); group = GNOME_CANVAS_GROUP( e_minicard ); diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index 71c976745f..fb8116cb9d 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-config.c b/addressbook/gui/widgets/eab-config.c index bb8eb63dd0..32ae07862f 100644 --- a/addressbook/gui/widgets/eab-config.c +++ b/addressbook/gui/widgets/eab-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index 6e593f1fb8..330df5141b 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 6cec0b9eb7..96050b2ca4 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -408,7 +408,7 @@ accum_name_value (GString *gstr, const char *label, const char *str, const char g_string_append_printf (gstr, ""); if (icon) g_string_append_printf (gstr, "", icon); - else + else g_string_append_printf (gstr, ""); } else { g_string_append_printf (gstr, ""); @@ -549,7 +549,7 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact) if (!eab_parse_qp_email (l->data, &name, &mail)) mail = e_text_to_html (l->data, 0); - g_string_append_printf (accum, "%s%s%s%s%s (%s)", + g_string_append_printf (accum, "%s%s%s%s%s (%s)", nl, name ? name : "", name ? " <" : "", diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h index c7b7f1a476..80acc5eefe 100644 --- a/addressbook/gui/widgets/eab-contact-display.h +++ b/addressbook/gui/widgets/eab-contact-display.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 14285cf9b1..58895c736c 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h index 4cab9b36b0..b5129d1637 100644 --- a/addressbook/gui/widgets/eab-gui-util.h +++ b/addressbook/gui/widgets/eab-gui-util.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -81,7 +81,7 @@ GtkWidget *eab_create_image_chooser_widget (gchar *name, gchar *string1, gchar * ESource *eab_select_source (const gchar *title, const gchar *message, const gchar *select_uid, GtkWindow *parent); -/* To parse quoted printable address & return email & name fields */ +/* To parse quoted printable address & return email & name fields */ gboolean eab_parse_qp_email (const gchar *string, gchar **name, gchar **email); char *eab_parse_qp_email_to_html (const gchar *string); diff --git a/addressbook/gui/widgets/eab-menu.c b/addressbook/gui/widgets/eab-menu.c index 603e93893c..e07489b003 100644 --- a/addressbook/gui/widgets/eab-menu.c +++ b/addressbook/gui/widgets/eab-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-menu.h b/addressbook/gui/widgets/eab-menu.h index 380346651b..7bea32efa4 100644 --- a/addressbook/gui/widgets/eab-menu.h +++ b/addressbook/gui/widgets/eab-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c index 6a702f3941..d520108db4 100644 --- a/addressbook/gui/widgets/eab-popup-control.c +++ b/addressbook/gui/widgets/eab-popup-control.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Jon Trowbridge diff --git a/addressbook/gui/widgets/eab-popup-control.h b/addressbook/gui/widgets/eab-popup-control.h index e8031a7fec..9eeedc8e00 100644 --- a/addressbook/gui/widgets/eab-popup-control.h +++ b/addressbook/gui/widgets/eab-popup-control.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-popup.c b/addressbook/gui/widgets/eab-popup.c index 17f979734b..1b5cde4b5c 100644 --- a/addressbook/gui/widgets/eab-popup.c +++ b/addressbook/gui/widgets/eab-popup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/eab-popup.h b/addressbook/gui/widgets/eab-popup.h index b86cc12a99..86deff7f9c 100644 --- a/addressbook/gui/widgets/eab-popup.h +++ b/addressbook/gui/widgets/eab-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c index ccec1bf092..0240dddb60 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.c +++ b/addressbook/gui/widgets/gal-view-factory-minicard.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h index d1cf2de444..0aa6dc5ba9 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.h +++ b/addressbook/gui/widgets/gal-view-factory-minicard.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index 4645517bfc..0a2fac9262 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h index bb22cf8a57..cf3faaec56 100644 --- a/addressbook/gui/widgets/gal-view-minicard.h +++ b/addressbook/gui/widgets/gal-view-minicard.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/importers/evolution-addressbook-importers.h b/addressbook/importers/evolution-addressbook-importers.h index 94b0e3b023..747fe4281d 100644 --- a/addressbook/importers/evolution-addressbook-importers.h +++ b/addressbook/importers/evolution-addressbook-importers.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index b5c9f7f8ce..164f9f5fe2 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index b0380cf227..75f30a2359 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index bd526e37cc..1ec623d098 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h index 15d64e71e0..e21f3b7b16 100644 --- a/addressbook/printing/e-contact-print-types.h +++ b/addressbook/printing/e-contact-print-types.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index 0ba9dbb71a..cc3affeb2c 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h index c9cc40847e..1604693471 100644 --- a/addressbook/printing/e-contact-print.h +++ b/addressbook/printing/e-contact-print.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c index e871eb6270..c38d2129a0 100644 --- a/addressbook/printing/test-print.c +++ b/addressbook/printing/test-print.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c index b7ccf7c643..72fa8a07e3 100644 --- a/addressbook/tools/evolution-addressbook-export-list-cards.c +++ b/addressbook/tools/evolution-addressbook-export-list-cards.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c index 86affe41ff..e93748861d 100644 --- a/addressbook/tools/evolution-addressbook-export-list-folders.c +++ b/addressbook/tools/evolution-addressbook-export-list-folders.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c index bfcaca980c..1a7f86142b 100644 --- a/addressbook/tools/evolution-addressbook-export.c +++ b/addressbook/tools/evolution-addressbook-export.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/tools/evolution-addressbook-export.h b/addressbook/tools/evolution-addressbook-export.h index 210dc2c1d5..815f524300 100644 --- a/addressbook/tools/evolution-addressbook-export.h +++ b/addressbook/tools/evolution-addressbook-export.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c index af1324bf64..8d08a3e88f 100644 --- a/addressbook/util/eab-book-util.c +++ b/addressbook/util/eab-book-util.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h index 66c3a6c23e..0cded9c662 100644 --- a/addressbook/util/eab-book-util.h +++ b/addressbook/util/eab-book-util.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c index 85bde3d6fd..a33177874f 100644 --- a/calendar/common/authentication.c +++ b/calendar/common/authentication.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -72,7 +72,7 @@ build_pass_key (ECal *ecal) return euri_str; } -void +void auth_cal_forget_password (ECal *ecal) { ESource *source = NULL; diff --git a/calendar/common/authentication.h b/calendar/common/authentication.h index 147b67e831..696a36d2ff 100644 --- a/calendar/common/authentication.h +++ b/calendar/common/authentication.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index b9b6b3449c..5aef1aeb53 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -187,7 +187,7 @@ calconduit_save_configuration (ECalConduitCfg *c) g_snprintf (prefix, 255, "e-calendar-conduit/Pilot_%u", c->pilot_id); e_pilot_set_sync_source (c->source_list, c->source); - + e_pilot_setup_set_bool (prefix, "secret", c->secret); e_pilot_setup_set_bool (prefix, "multi_day_split", c->multi_day_split); e_pilot_setup_set_string (prefix, "last_uri", c->last_uri ? c->last_uri : ""); diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c index 59f411da69..cdb4a10d2d 100644 --- a/calendar/conduits/common/libecalendar-common-conduit.c +++ b/calendar/conduits/common/libecalendar-common-conduit.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/conduits/common/libecalendar-common-conduit.h b/calendar/conduits/common/libecalendar-common-conduit.h index 0641ec3e88..aab5a58b56 100644 --- a/calendar/conduits/common/libecalendar-common-conduit.h +++ b/calendar/conduits/common/libecalendar-common-conduit.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c index 4d599a6924..61e5c852e3 100644 --- a/calendar/conduits/memo/memo-conduit.c +++ b/calendar/conduits/memo/memo-conduit.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 7639291504..3a684e0751 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 7f54b6bf2d..089bf37552 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h index 7a94793eaa..17f9b3a61c 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.h +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index 38a3b49e9f..4085815bce 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -352,7 +352,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource priv = an->priv; str_uri = e_source_get_uri (source); e_uri = e_uri_new (str_uri); - if (e_source_get_property (source, "auth-type")) + if (e_source_get_property (source, "auth-type")) pass_key = e_uri_to_string (e_uri, FALSE); else pass_key = g_strdup (str_uri); diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h index 7fea501de9..a548716295 100644 --- a/calendar/gui/alarm-notify/alarm-notify.h +++ b/calendar/gui/alarm-notify/alarm-notify.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 887cf7f249..c293bf74a8 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h index 69fbafec02..9a2e11c472 100644 --- a/calendar/gui/alarm-notify/alarm-queue.h +++ b/calendar/gui/alarm-notify/alarm-queue.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c index 5dca49ae25..f2ab4bb23d 100644 --- a/calendar/gui/alarm-notify/alarm.c +++ b/calendar/gui/alarm-notify/alarm.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h index bbedf392c7..7a14db5d03 100644 --- a/calendar/gui/alarm-notify/alarm.h +++ b/calendar/gui/alarm-notify/alarm.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index 5a05cfd341..dba9099520 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h index 9dd6f0221c..63e6c7205e 100644 --- a/calendar/gui/alarm-notify/config-data.h +++ b/calendar/gui/alarm-notify/config-data.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c index 3504b0db77..a625bec0fa 100644 --- a/calendar/gui/alarm-notify/notify-main.c +++ b/calendar/gui/alarm-notify/notify-main.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c index 6a734a8660..640a8f5f99 100644 --- a/calendar/gui/alarm-notify/util.c +++ b/calendar/gui/alarm-notify/util.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/alarm-notify/util.h b/calendar/gui/alarm-notify/util.h index c53f047953..b7b715ca9b 100644 --- a/calendar/gui/alarm-notify/util.h +++ b/calendar/gui/alarm-notify/util.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index aab5d98d30..6183d873ba 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h index 64e1b40b0c..26f3998c89 100644 --- a/calendar/gui/cal-search-bar.h +++ b/calendar/gui/cal-search-bar.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 94a35f3e65..e69cd463ea 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h index cfe2d24232..b1c093fb9e 100644 --- a/calendar/gui/calendar-commands.h +++ b/calendar/gui/calendar-commands.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 53abc5632a..bca0832bac 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -70,7 +70,7 @@ #define WEATHER_BASE_URI "weather://" #define PERSONAL_RELATIVE_URI "system" #define CALENDAR_ERROR_LEVEL_KEY "/apps/evolution/calendar/display/error_level" -#define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout" +#define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout" enum DndTargetType { DND_TARGET_TYPE_CALENDAR_LIST @@ -598,7 +598,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) calendar_setup_edit_calendar (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source, NULL); } -static void +static void set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value) { CalendarComponentView *component_view = data; @@ -614,13 +614,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char static void mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) { - set_offline_availability (ep, pitem, data, "0"); + set_offline_availability (ep, pitem, data, "0"); } static void mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) { - set_offline_availability (ep, pitem, data, "1"); + set_offline_availability (ep, pitem, data, "1"); } static EPopupItem ecc_source_popups[] = { diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h index ec3183726d..1fbcdbc487 100644 --- a/calendar/gui/calendar-component.h +++ b/calendar/gui/calendar-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h index 6277f46d31..37724a53e9 100644 --- a/calendar/gui/calendar-config-keys.h +++ b/calendar/gui/calendar-config-keys.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index 285490b8f4..ffd398bd69 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h index c28077c1ec..ff4e69d008 100644 --- a/calendar/gui/calendar-config.h +++ b/calendar/gui/calendar-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c index ce76578563..8d167f44de 100644 --- a/calendar/gui/calendar-view-factory.c +++ b/calendar/gui/calendar-view-factory.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h index 779e59809c..0f182a11e1 100644 --- a/calendar/gui/calendar-view-factory.h +++ b/calendar/gui/calendar-view-factory.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c index 331181e4cd..5415affdf2 100644 --- a/calendar/gui/calendar-view.c +++ b/calendar/gui/calendar-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h index 53c4ca6a39..51e3235c34 100644 --- a/calendar/gui/calendar-view.h +++ b/calendar/gui/calendar-view.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c index 908293a151..b98f7170ed 100644 --- a/calendar/gui/comp-editor-factory.c +++ b/calendar/gui/comp-editor-factory.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/comp-editor-factory.h b/calendar/gui/comp-editor-factory.h index fdab8a0a46..3e79992d67 100644 --- a/calendar/gui/comp-editor-factory.h +++ b/calendar/gui/comp-editor-factory.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index 53fdacefb9..153dc089ec 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -641,7 +641,7 @@ update_objects (ECal *client, icalcomponent *icalcomp) icalcomponent_kind kind; kind = icalcomponent_isa (icalcomp); - if (kind == ICAL_VTODO_COMPONENT || + if (kind == ICAL_VTODO_COMPONENT || kind == ICAL_VEVENT_COMPONENT || kind == ICAL_VJOURNAL_COMPONENT) return update_single_object (client, icalcomp, kind == ICAL_VJOURNAL_COMPONENT); @@ -803,7 +803,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client) ECalComponent *master = NULL; icalcomponent *icalcomp = NULL; ECalComponentRange rid; - ECalComponentDateTime sdt; + ECalComponentDateTime sdt; const char *uid; /* Get the master component */ @@ -839,7 +839,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client) e_cal_component_set_dtstart (comp, &sdt); e_cal_component_set_dtend (comp, &edt); - + e_cal_component_get_sequence (master, &sequence); e_cal_component_set_sequence (comp, sequence); diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h index b93384f40a..3faf9f49a8 100644 --- a/calendar/gui/comp-util.h +++ b/calendar/gui/comp-util.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c index 2fcb3e2688..3e7b7499cc 100644 --- a/calendar/gui/control-factory.c +++ b/calendar/gui/control-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h index 2103f458f1..c79d70b5ba 100644 --- a/calendar/gui/control-factory.h +++ b/calendar/gui/control-factory.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 3881c85106..73bfde30cc 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/alarm-dialog.h b/calendar/gui/dialogs/alarm-dialog.h index 0cdee744c9..b5560f9ff4 100644 --- a/calendar/gui/dialogs/alarm-dialog.h +++ b/calendar/gui/dialogs/alarm-dialog.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index 07395a4782..8520b3727b 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/alarm-list-dialog.h b/calendar/gui/dialogs/alarm-list-dialog.h index 6a55f03000..7d58fcb0af 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.h +++ b/calendar/gui/dialogs/alarm-list-dialog.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c index 5de8ea669b..9c502153d3 100644 --- a/calendar/gui/dialogs/cal-attachment-select-file.c +++ b/calendar/gui/dialogs/cal-attachment-select-file.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/cal-attachment-select-file.h b/calendar/gui/dialogs/cal-attachment-select-file.h index 3c39fed125..0f965e6c9b 100644 --- a/calendar/gui/dialogs/cal-attachment-select-file.h +++ b/calendar/gui/dialogs/cal-attachment-select-file.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index b2763ca479..f00adc0f0d 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h index 30b62440e5..647df417df 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.h +++ b/calendar/gui/dialogs/cal-prefs-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index 3ee589406b..95820b8247 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -258,7 +258,7 @@ eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, GtkWidget *offline_setting = NULL; const char *offline_sync; int row; - const char *base_uri = e_source_group_peek_base_uri (sdialog->source_group); + const char *base_uri = e_source_group_peek_base_uri (sdialog->source_group); gboolean is_local = base_uri && (g_str_has_prefix (base_uri, "file://") || g_str_has_prefix (base_uri, "contacts://")); offline_sync = e_source_get_property (sdialog->source, "offline_sync"); if (old) diff --git a/calendar/gui/dialogs/calendar-setup.h b/calendar/gui/dialogs/calendar-setup.h index 3898467595..4ec9980532 100644 --- a/calendar/gui/dialogs/calendar-setup.h +++ b/calendar/gui/dialogs/calendar-setup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index 2548d5ba2d..cddd4f8d8d 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h index 3566a7548e..5f1261f1f5 100644 --- a/calendar/gui/dialogs/cancel-comp.h +++ b/calendar/gui/dialogs/cancel-comp.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c index 9a0665d763..d1abc1724d 100644 --- a/calendar/gui/dialogs/changed-comp.c +++ b/calendar/gui/dialogs/changed-comp.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h index 7a8bcb30f5..6bb20210dd 100644 --- a/calendar/gui/dialogs/changed-comp.h +++ b/calendar/gui/dialogs/changed-comp.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c index a86465d5d7..93b9cd9304 100644 --- a/calendar/gui/dialogs/comp-editor-page.c +++ b/calendar/gui/dialogs/comp-editor-page.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h index f8b9db23f3..819ea74ccc 100644 --- a/calendar/gui/dialogs/comp-editor-page.h +++ b/calendar/gui/dialogs/comp-editor-page.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index f09024eba0..4666058b51 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h index 565feeaea5..5516fe4cc4 100644 --- a/calendar/gui/dialogs/comp-editor-util.h +++ b/calendar/gui/dialogs/comp-editor-util.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 545fca4448..cd2dac7a9e 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -238,7 +238,7 @@ get_attachment_list (CompEditor *editor) * calendar source */ utf8_safe_fname = camel_file_util_safe_filename (camel_mime_part_get_filename (mime_part)); - /* It is absolutely fine to get a NULL from the filename of + /* It is absolutely fine to get a NULL from the filename of * mime part. We assume that it is named "Attachment" * in mailer. I'll do that with a ticker */ if (!utf8_safe_fname) @@ -798,7 +798,7 @@ action_save_cb (GtkAction *action, priv->mod = CALOBJ_MOD_THIS; comp = comp_editor_get_current_comp (editor, &correct); - + e_cal_component_get_summary (comp, &text); g_object_unref (comp); @@ -817,7 +817,7 @@ action_save_cb (GtkAction *action, delegate = flags & COMP_EDITOR_DELEGATE; if (delegate && !remove_event_dialog (priv->client, priv->comp, GTK_WINDOW (editor))) { - const char *uid = NULL; + const char *uid = NULL; GError *error = NULL; e_cal_component_get_uid (priv->comp, &uid); @@ -2440,7 +2440,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str set_attendees_for_delegation (send_comp, address, method); } - if (!e_cal_component_has_attachments (priv->comp) + if (!e_cal_component_has_attachments (priv->comp) || e_cal_get_static_capability (priv->client, CAL_STATIC_CAPABILITY_CREATE_MESSAGES)) { if (itip_send_comp (method, send_comp, priv->client, NULL, NULL, users, strip_alarms)) { diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index ab277febf7..22167cb78f 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c index 5bb970433b..92444678be 100644 --- a/calendar/gui/dialogs/copy-source-dialog.c +++ b/calendar/gui/dialogs/copy-source-dialog.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/copy-source-dialog.h b/calendar/gui/dialogs/copy-source-dialog.h index ba3169a1b8..4c6f5b19c8 100644 --- a/calendar/gui/dialogs/copy-source-dialog.h +++ b/calendar/gui/dialogs/copy-source-dialog.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index e5ae1e6cdc..ae371aabb2 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h index bb4b5983d9..c619e28b98 100644 --- a/calendar/gui/dialogs/delete-comp.h +++ b/calendar/gui/dialogs/delete-comp.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c index b151ef8068..f8df587aa4 100644 --- a/calendar/gui/dialogs/delete-error.c +++ b/calendar/gui/dialogs/delete-error.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/delete-error.h b/calendar/gui/dialogs/delete-error.h index cb0a7d9294..dab620541f 100644 --- a/calendar/gui/dialogs/delete-error.h +++ b/calendar/gui/dialogs/delete-error.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index 31c4631ca9..8e060832df 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h index 553b7c1576..e4f474781a 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.h +++ b/calendar/gui/dialogs/e-delegate-dialog.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c index d9a55ac47a..fd6bf245c2 100644 --- a/calendar/gui/dialogs/e-send-options-utils.c +++ b/calendar/gui/dialogs/e-send-options-utils.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h index 568ef5be3b..01cf3ed2e9 100644 --- a/calendar/gui/dialogs/e-send-options-utils.h +++ b/calendar/gui/dialogs/e-send-options-utils.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 7755894f6c..cff9d75950 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h index c050b92dfb..03afd6448a 100644 --- a/calendar/gui/dialogs/event-editor.h +++ b/calendar/gui/dialogs/event-editor.h @@ -1,5 +1,5 @@ /* - * Evolution calendar - Event editor dialog + * Evolution calendar - Event editor dialog * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index b225cdd6bd..b2ac6b55db 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -3281,7 +3281,7 @@ event_page_add_attendee (EventPage *epage, EMeetingAttendee *attendee) g_return_if_fail (epage != NULL); g_return_if_fail (IS_EVENT_PAGE (epage)); - + priv = epage->priv; e_meeting_store_add_attendee (priv->model, attendee); @@ -3300,7 +3300,7 @@ event_page_remove_all_attendees (EventPage *epage) g_return_if_fail (epage != NULL); g_return_if_fail (IS_EVENT_PAGE (epage)); - + priv = epage->priv; e_meeting_store_remove_all_attendees (priv->model); diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h index 63c0bd2306..5bd377c075 100644 --- a/calendar/gui/dialogs/event-page.h +++ b/calendar/gui/dialogs/event-page.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c index b90bd6fb3c..cf3781a3c2 100644 --- a/calendar/gui/dialogs/memo-editor.c +++ b/calendar/gui/dialogs/memo-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/memo-editor.h b/calendar/gui/dialogs/memo-editor.h index b45edd18ce..2e431b507f 100644 --- a/calendar/gui/dialogs/memo-editor.h +++ b/calendar/gui/dialogs/memo-editor.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 4f8c37c0a3..957b8f695c 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/memo-page.h b/calendar/gui/dialogs/memo-page.h index cfe4cb0a17..115d8aafb7 100644 --- a/calendar/gui/dialogs/memo-page.h +++ b/calendar/gui/dialogs/memo-page.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c index e57c0c8aa7..8d8dabbaf2 100644 --- a/calendar/gui/dialogs/recur-comp.c +++ b/calendar/gui/dialogs/recur-comp.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/recur-comp.h b/calendar/gui/dialogs/recur-comp.h index e4666772f7..47236ef8cd 100644 --- a/calendar/gui/dialogs/recur-comp.h +++ b/calendar/gui/dialogs/recur-comp.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index c85a0ae0f2..f89993154f 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/recurrence-page.h b/calendar/gui/dialogs/recurrence-page.h index f3bff613ee..1dce00d2c9 100644 --- a/calendar/gui/dialogs/recurrence-page.h +++ b/calendar/gui/dialogs/recurrence-page.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c index cb178e0dce..3f47312d22 100644 --- a/calendar/gui/dialogs/save-comp.c +++ b/calendar/gui/dialogs/save-comp.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h index 123a4a8587..5105e4af7f 100644 --- a/calendar/gui/dialogs/save-comp.h +++ b/calendar/gui/dialogs/save-comp.h @@ -1,7 +1,7 @@ /* * * Evolution calendar - Delete calendar component dialog - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c index e1137be3a0..4baa22ab8a 100644 --- a/calendar/gui/dialogs/schedule-page.c +++ b/calendar/gui/dialogs/schedule-page.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h index 8ffbb43c71..71eec02763 100644 --- a/calendar/gui/dialogs/schedule-page.h +++ b/calendar/gui/dialogs/schedule-page.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c index e9fc7d0d9f..f73af156b0 100644 --- a/calendar/gui/dialogs/select-source-dialog.c +++ b/calendar/gui/dialogs/select-source-dialog.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/select-source-dialog.h b/calendar/gui/dialogs/select-source-dialog.h index 3ca3cec041..850eddd610 100644 --- a/calendar/gui/dialogs/select-source-dialog.h +++ b/calendar/gui/dialogs/select-source-dialog.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index a7d87c47f4..4eca089435 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/send-comp.h b/calendar/gui/dialogs/send-comp.h index 21b310947a..63644bd52a 100644 --- a/calendar/gui/dialogs/send-comp.h +++ b/calendar/gui/dialogs/send-comp.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 86a39aad24..7fb4679047 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/task-details-page.h b/calendar/gui/dialogs/task-details-page.h index 9fbfcd4af6..585ab0ba23 100644 --- a/calendar/gui/dialogs/task-details-page.h +++ b/calendar/gui/dialogs/task-details-page.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index eef1d64468..fbab8b0581 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h index 9376b4149a..57ab33b54f 100644 --- a/calendar/gui/dialogs/task-editor.h +++ b/calendar/gui/dialogs/task-editor.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index f371e60cdb..b088fb4ff1 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -2180,7 +2180,7 @@ task_page_add_attendee (TaskPage *tpage, EMeetingAttendee *attendee) g_return_if_fail (tpage != NULL); g_return_if_fail (IS_TASK_PAGE (tpage)); - + priv = tpage->priv; e_meeting_store_add_attendee (priv->model, attendee); diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h index 77ec68fa1d..b8a49f8286 100644 --- a/calendar/gui/dialogs/task-page.h +++ b/calendar/gui/dialogs/task-page.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c index 795d0437a0..d60fab913e 100644 --- a/calendar/gui/e-alarm-list.c +++ b/calendar/gui/e-alarm-list.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-alarm-list.h b/calendar/gui/e-alarm-list.h index 6819994af1..6dfb1c6515 100644 --- a/calendar/gui/e-alarm-list.h +++ b/calendar/gui/e-alarm-list.h @@ -1,7 +1,7 @@ /* * * EAlarmList - list of calendar alarms with GtkTreeModel interface. - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-attachment-handler-calendar.c b/calendar/gui/e-attachment-handler-calendar.c index 5beb6e07d3..601d1f5e3c 100644 --- a/calendar/gui/e-attachment-handler-calendar.c +++ b/calendar/gui/e-attachment-handler-calendar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/calendar/gui/e-attachment-handler-calendar.h b/calendar/gui/e-attachment-handler-calendar.h index b6788611f8..0b0ab737d4 100644 --- a/calendar/gui/e-attachment-handler-calendar.h +++ b/calendar/gui/e-attachment-handler-calendar.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c index f564538a59..18c47ebfcc 100644 --- a/calendar/gui/e-cal-component-memo-preview.c +++ b/calendar/gui/e-cal-component-memo-preview.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-component-memo-preview.h b/calendar/gui/e-cal-component-memo-preview.h index 7d77a0aa32..8dcab9d0f3 100644 --- a/calendar/gui/e-cal-component-memo-preview.h +++ b/calendar/gui/e-cal-component-memo-preview.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index 0c759a1591..a70bf5761f 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h index 73e8126a36..4faa7bd29b 100644 --- a/calendar/gui/e-cal-component-preview.h +++ b/calendar/gui/e-cal-component-preview.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c index 18ceee76ca..fb1d6c28e7 100644 --- a/calendar/gui/e-cal-config.c +++ b/calendar/gui/e-cal-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h index 8f27cbd2f2..15ad617a3d 100644 --- a/calendar/gui/e-cal-config.h +++ b/calendar/gui/e-cal-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-event.c b/calendar/gui/e-cal-event.c index 6e295ab9a8..db7e9abc89 100644 --- a/calendar/gui/e-cal-event.c +++ b/calendar/gui/e-cal-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h index a77d2a147f..0802640d2c 100644 --- a/calendar/gui/e-cal-event.h +++ b/calendar/gui/e-cal-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-list-view-config.c b/calendar/gui/e-cal-list-view-config.c index 6c930b1b61..543b5e8eb7 100644 --- a/calendar/gui/e-cal-list-view-config.c +++ b/calendar/gui/e-cal-list-view-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-list-view-config.h b/calendar/gui/e-cal-list-view-config.h index 021262e357..270228bed6 100644 --- a/calendar/gui/e-cal-list-view-config.h +++ b/calendar/gui/e-cal-list-view-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index 0702d3a297..6eab1f7aac 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Hans Petter Jansson diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h index 606997c17d..656a58261b 100644 --- a/calendar/gui/e-cal-list-view.h +++ b/calendar/gui/e-cal-list-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-menu.c b/calendar/gui/e-cal-menu.c index c6639b2816..b1f5ed91ca 100644 --- a/calendar/gui/e-cal-menu.c +++ b/calendar/gui/e-cal-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h index 9c37a6a9ae..5dda63f227 100644 --- a/calendar/gui/e-cal-menu.h +++ b/calendar/gui/e-cal-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c index db25bf23de..dac641ab4c 100644 --- a/calendar/gui/e-cal-model-calendar.c +++ b/calendar/gui/e-cal-model-calendar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model-calendar.h b/calendar/gui/e-cal-model-calendar.h index ec0cb4c75c..abe536399f 100644 --- a/calendar/gui/e-cal-model-calendar.h +++ b/calendar/gui/e-cal-model-calendar.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c index 0984827702..95fe5f1572 100644 --- a/calendar/gui/e-cal-model-memos.c +++ b/calendar/gui/e-cal-model-memos.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model-memos.h b/calendar/gui/e-cal-model-memos.h index 5417c9c09b..34b8e5a14d 100644 --- a/calendar/gui/e-cal-model-memos.h +++ b/calendar/gui/e-cal-model-memos.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 5827117f14..a2b9eb6f2f 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model-tasks.h b/calendar/gui/e-cal-model-tasks.h index 40d651e583..0900d1e155 100644 --- a/calendar/gui/e-cal-model-tasks.h +++ b/calendar/gui/e-cal-model-tasks.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 736f6a8b56..19844a7560 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1522,7 +1522,7 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data GSList *list = NULL; pos = get_position_in_array (priv->objects, comp_data); - + if (!g_ptr_array_remove (priv->objects, comp_data)) continue; @@ -1576,7 +1576,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d /* re-add only the recurrence objects */ for (l = objects; l != NULL; l = g_list_next (l)) { - if (!e_cal_util_component_is_instance (l->data) && e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) + if (!e_cal_util_component_is_instance (l->data) && e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) list = g_list_prepend (list, l->data); else { int pos; @@ -1639,7 +1639,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d e_cal_model_set_instance_times (comp_data, priv->zone); pos = get_position_in_array (priv->objects, comp_data); - + e_table_model_row_changed (E_TABLE_MODEL (model), pos); } } @@ -1676,7 +1676,7 @@ e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer user_data) g_slist_free (l); g_object_unref (comp_data); - + e_table_model_pre_change (E_TABLE_MODEL (model)); e_table_model_row_deleted (E_TABLE_MODEL (model), pos); } @@ -1739,15 +1739,15 @@ update_e_cal_view_for_client (ECalModel *model, ECalModelClient *client_data) if (!client_data->do_query) return; -try_again: +try_again: if (!e_cal_get_query (client_data->client, priv->full_sexp, &client_data->query, &error)) { if (error->code == E_CALENDAR_STATUS_BUSY && tries != 10) { tries++; /*TODO chose an optimal value */ g_usleep (500); g_clear_error (&error); - goto try_again; - } + goto try_again; + } g_warning (G_STRLOC ": Unable to get query, %s", error->message); @@ -1873,7 +1873,7 @@ remove_client_objects (ECalModel *model, ECalModelClient *client_data) GSList *l = NULL; g_ptr_array_remove (model->priv->objects, comp_data); - + l = g_slist_append (l, comp_data); g_signal_emit (G_OBJECT (model), signals[COMPS_DELETED], 0, l); @@ -2014,9 +2014,9 @@ redo_queries (ECalModel *model) slist = get_objects_as_list (model); g_ptr_array_set_size (priv->objects, 0); g_signal_emit (G_OBJECT (model), signals[COMPS_DELETED], 0, slist); - + e_table_model_rows_deleted (E_TABLE_MODEL (model), 0, len); - + g_slist_foreach (slist, (GFunc)g_object_unref, NULL); g_slist_free (slist); @@ -2342,7 +2342,7 @@ e_cal_model_component_class_init (ECalModelComponentClass *klass) static void -e_cal_model_component_finalize (GObject *object) +e_cal_model_component_finalize (GObject *object) { ECalModelComponent *comp_data = E_CAL_MODEL_COMPONENT(object); @@ -2382,7 +2382,7 @@ e_cal_model_component_finalize (GObject *object) g_free (comp_data->color); comp_data->color = NULL; } - + if (G_OBJECT_CLASS (parent_class)->finalize) (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -2440,7 +2440,7 @@ void e_cal_model_free_component_data (ECalModelComponent *comp_data) { g_return_if_fail (comp_data != NULL); - + g_object_unref (comp_data); } diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index 6ec66a3554..4b266b6a5e 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -81,7 +81,7 @@ struct _ECalModelComponent { icalcomponent *icalcomp; time_t instance_start; time_t instance_end; - + /* Private data used by ECalModelCalendar and ECalModelTasks */ /* keep these public to avoid many accessor functions */ ECellDateEditValue *dtstart; diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c index 0292f16c71..76dcb94e19 100644 --- a/calendar/gui/e-cal-popup.c +++ b/calendar/gui/e-cal-popup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h index 185e9877f0..5c68b4829b 100644 --- a/calendar/gui/e-cal-popup.h +++ b/calendar/gui/e-cal-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-calendar-table-config.c b/calendar/gui/e-calendar-table-config.c index f8a7af9c14..fb8d18c189 100644 --- a/calendar/gui/e-calendar-table-config.c +++ b/calendar/gui/e-calendar-table-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-calendar-table-config.h b/calendar/gui/e-calendar-table-config.h index 12cbc3e326..93588a6e57 100644 --- a/calendar/gui/e-calendar-table-config.h +++ b/calendar/gui/e-calendar-table-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 5eba596680..b8ce8d1c29 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h index e9906ad59b..d5dac7318e 100644 --- a/calendar/gui/e-calendar-table.h +++ b/calendar/gui/e-calendar-table.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index f88ae08244..91f9eded7a 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -2061,7 +2061,7 @@ e_calendar_view_new_appointment_full (ECalendarView *cal_view, gboolean all_day, int hours, mins; if (!time_div) /* Possible if your gconf values aren't so nice */ - time_div = 30; + time_div = 30; if (time_day_begin (now) == time_day_begin (dtstart)) { /* same day as today */ @@ -2657,7 +2657,7 @@ draw_curved_rectangle (cairo_t *cr, double x0, double y0, cairo_close_path (cr); } -static void +static void error_response(GtkWidget *widget, gint response, void *data) { gtk_widget_destroy (widget); diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index eedef31856..99d405d098 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cell-date-edit-config.c b/calendar/gui/e-cell-date-edit-config.c index 5be8569bd3..eb6c27420b 100644 --- a/calendar/gui/e-cell-date-edit-config.c +++ b/calendar/gui/e-cell-date-edit-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cell-date-edit-config.h b/calendar/gui/e-cell-date-edit-config.h index 6203aec1a4..455cca7287 100644 --- a/calendar/gui/e-cell-date-edit-config.h +++ b/calendar/gui/e-cell-date-edit-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c index b56d070559..8a43c628fc 100644 --- a/calendar/gui/e-cell-date-edit-text.c +++ b/calendar/gui/e-cell-date-edit-text.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h index 9bbbfb0fc4..c353ecd278 100644 --- a/calendar/gui/e-cell-date-edit-text.h +++ b/calendar/gui/e-cell-date-edit-text.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin diff --git a/calendar/gui/e-comp-editor-registry.c b/calendar/gui/e-comp-editor-registry.c index 31b46372b2..a4bed100b9 100644 --- a/calendar/gui/e-comp-editor-registry.c +++ b/calendar/gui/e-comp-editor-registry.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-comp-editor-registry.h b/calendar/gui/e-comp-editor-registry.h index 4f1444601c..5c2b4c4bc8 100644 --- a/calendar/gui/e-comp-editor-registry.h +++ b/calendar/gui/e-comp-editor-registry.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-date-edit-config.c b/calendar/gui/e-date-edit-config.c index d6fd6cf675..f93f2cf746 100644 --- a/calendar/gui/e-date-edit-config.c +++ b/calendar/gui/e-date-edit-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-date-edit-config.h b/calendar/gui/e-date-edit-config.h index c31899bb9e..4065ec74e7 100644 --- a/calendar/gui/e-date-edit-config.h +++ b/calendar/gui/e-date-edit-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c index defd013fce..2aaab0df4d 100644 --- a/calendar/gui/e-date-time-list.c +++ b/calendar/gui/e-date-time-list.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-date-time-list.h b/calendar/gui/e-date-time-list.h index b4f6a01a10..fe5e1fdc11 100644 --- a/calendar/gui/e-date-time-list.h +++ b/calendar/gui/e-date-time-list.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c index 44156bf18e..edd02bb7ee 100644 --- a/calendar/gui/e-day-view-config.c +++ b/calendar/gui/e-day-view-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-config.h b/calendar/gui/e-day-view-config.h index 6ca1f2717e..25d208b432 100644 --- a/calendar/gui/e-day-view-config.h +++ b/calendar/gui/e-day-view-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c index 949f4b7ce2..5b5536d391 100644 --- a/calendar/gui/e-day-view-layout.c +++ b/calendar/gui/e-day-view-layout.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h index 4ad1de64bd..f3d431ca20 100644 --- a/calendar/gui/e-day-view-layout.h +++ b/calendar/gui/e-day-view-layout.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 97f5ab59f6..e161477eec 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h index 650f139eb1..c9ce721341 100644 --- a/calendar/gui/e-day-view-main-item.h +++ b/calendar/gui/e-day-view-main-item.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index 9d7ce44455..f6ded1ec94 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin @@ -781,7 +781,7 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem, item = gtk_menu_item_new_with_label ("---"); gtk_widget_set_sensitive (item, FALSE); gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); - + item = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h index f3f2f64118..9d7bdcae9f 100644 --- a/calendar/gui/e-day-view-time-item.h +++ b/calendar/gui/e-day-view-time-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index 909379b3a6..dd91133243 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h index d45aa4e155..01a7c44842 100644 --- a/calendar/gui/e-day-view-top-item.h +++ b/calendar/gui/e-day-view-top-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index c8c06e6b89..ef8a33625d 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin @@ -681,10 +681,10 @@ timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone, g_return_if_fail (E_IS_DAY_VIEW (day_view)); - + if (!cal_view->in_focus) return; - + /* If our time hasn't been set yet, just return. */ if (day_view->lower == 0 && day_view->upper == 0) return; @@ -1812,7 +1812,7 @@ set_text_as_bold (EDayViewEvent *event) for (l = attendees; l; l = l->next) { ECalComponentAttendee *attendee = l->data; - if ((g_str_equal (itip_strip_mailto (attendee->value), address)) + if ((g_str_equal (itip_strip_mailto (attendee->value), address)) || (attendee->sentby && g_str_equal (itip_strip_mailto (attendee->sentby), address))) { at = attendee; break; @@ -1820,7 +1820,7 @@ set_text_as_bold (EDayViewEvent *event) } /* The attendee has not yet accepted the meeting, display the summary as bolded. - If the attendee is not present, it might have come through a mailing list. + If the attendee is not present, it might have come through a mailing list. In that case, we never show the meeting as bold even if it is unaccepted. */ if (at && (at->status == ICAL_PARTSTAT_NEEDSACTION)) gnome_canvas_item_set (event->canvas_item, "bold", TRUE, NULL); @@ -3077,10 +3077,10 @@ e_day_view_on_time_canvas_scroll (GtkWidget *widget, return TRUE; default: return FALSE; - } -} - -static gboolean + } +} + +static gboolean e_day_view_on_long_event_button_press (EDayView *day_view, gint event_num, GdkEventButton *event, @@ -3250,7 +3250,7 @@ e_day_view_on_event_click (EDayView *day_view, && (pos == E_CALENDAR_VIEW_POS_TOP_EDGE || pos == E_CALENDAR_VIEW_POS_BOTTOM_EDGE)) { gboolean read_only = FALSE; - + if (event && (!event->is_editable || (e_cal_is_read_only (event->comp_data->client, &read_only, NULL) && read_only))) { return; } @@ -4081,7 +4081,7 @@ e_day_view_finish_resize (EDayView *day_view) if (day_view->resize_event_num == -1) return; - + day = day_view->resize_event_day; event_num = day_view->resize_event_num; event = &g_array_index (day_view->events[day], EDayViewEvent, @@ -4137,7 +4137,7 @@ e_day_view_finish_resize (EDayView *day_view) gtk_widget_queue_draw (day_view->top_canvas); goto out; } - + if (mod == CALOBJ_MOD_ALL) comp_util_sanitize_recurrence_master (comp, client); @@ -4616,7 +4616,7 @@ e_day_view_reshape_day_events (EDayView *day_view, if (day_view->last_edited_comp_string == NULL) { g_free (current_comp_string); continue; - } + } if (strncmp (current_comp_string, day_view->last_edited_comp_string,50) == 0) { e_canvas_item_grab_focus (event->canvas_item, TRUE); @@ -7544,7 +7544,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget, g_object_unref (comp); return; } - + if (mod == CALOBJ_MOD_ALL) comp_util_sanitize_recurrence_master (comp, client); diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index 7cfb3c2dc6..d22201e3f3 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index bab36202d6..12442ba2c2 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -873,7 +873,7 @@ write_recurrence_piece (EItipControl *itip, ECalComponent *comp, dt.value = &r->until; dt.tzid = icaltimezone_get_tzid ((icaltimezone *)r->until.zone); - write_label_piece (itip, &dt, buffer, + write_label_piece (itip, &dt, buffer, /* For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'*/ _(", ending on "), NULL, TRUE); } diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h index 642eccfe8d..38dce21bf1 100644 --- a/calendar/gui/e-itip-control.h +++ b/calendar/gui/e-itip-control.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c index efa616535c..0b5e147407 100644 --- a/calendar/gui/e-meeting-attendee.c +++ b/calendar/gui/e-meeting-attendee.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -846,7 +846,7 @@ e_meeting_attendee_add_busy_period (EMeetingAttendee *ia, /* If the busy_type is FREE, then there is no need to render it in UI */ if (busy_type == E_MEETING_FREE_BUSY_FREE) - goto done; + goto done; /* If the busy range is not set elsewhere, track it as best we can */ if (!priv->start_busy_range_set) { diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h index a9f344484d..a259de6619 100644 --- a/calendar/gui/e-meeting-attendee.h +++ b/calendar/gui/e-meeting-attendee.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 2d8a532727..c903c97c23 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h index 12deb8a25d..50aad0c966 100644 --- a/calendar/gui/e-meeting-list-view.h +++ b/calendar/gui/e-meeting-list-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index a5bbffb78b..5e6270976a 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-store.h b/calendar/gui/e-meeting-store.h index d20c1224f3..8a237fc34b 100644 --- a/calendar/gui/e-meeting-store.h +++ b/calendar/gui/e-meeting-store.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c index 6687919a40..ae7eeb7937 100644 --- a/calendar/gui/e-meeting-time-sel-item.c +++ b/calendar/gui/e-meeting-time-sel-item.c @@ -15,7 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h index addb99e47a..310eb4c3a0 100644 --- a/calendar/gui/e-meeting-time-sel-item.h +++ b/calendar/gui/e-meeting-time-sel-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 4bf44eb6e1..c10a85e341 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h index deb91c2397..2cc82278f6 100644 --- a/calendar/gui/e-meeting-time-sel.h +++ b/calendar/gui/e-meeting-time-sel.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h index 4f7d41eabf..bfcdfc5854 100644 --- a/calendar/gui/e-meeting-types.h +++ b/calendar/gui/e-meeting-types.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-utils.c b/calendar/gui/e-meeting-utils.c index 30fbaf143b..ac11881bf4 100644 --- a/calendar/gui/e-meeting-utils.c +++ b/calendar/gui/e-meeting-utils.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h index d360471b20..c71efec135 100644 --- a/calendar/gui/e-meeting-utils.h +++ b/calendar/gui/e-meeting-utils.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-memo-table-config.c b/calendar/gui/e-memo-table-config.c index 21e6f036c1..d79dac7073 100644 --- a/calendar/gui/e-memo-table-config.c +++ b/calendar/gui/e-memo-table-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-memo-table-config.h b/calendar/gui/e-memo-table-config.h index 5242b5f7b7..68960d58dc 100644 --- a/calendar/gui/e-memo-table-config.h +++ b/calendar/gui/e-memo-table-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 35d6c2621b..ac43b39a5a 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 58f398bfb5..b593b9445b 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c index c9f4681bf9..f6f1cff91c 100644 --- a/calendar/gui/e-memos.c +++ b/calendar/gui/e-memos.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h index 1b3f0b8c72..0a000f0d73 100644 --- a/calendar/gui/e-memos.h +++ b/calendar/gui/e-memos.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-mini-calendar-config.c b/calendar/gui/e-mini-calendar-config.c index dfafc86fe6..ccd9a2078d 100644 --- a/calendar/gui/e-mini-calendar-config.c +++ b/calendar/gui/e-mini-calendar-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-mini-calendar-config.h b/calendar/gui/e-mini-calendar-config.h index 621d682e9d..60c88a1b9c 100644 --- a/calendar/gui/e-mini-calendar-config.h +++ b/calendar/gui/e-mini-calendar-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c index dea9dd469d..c177c5231b 100644 --- a/calendar/gui/e-select-names-editable.c +++ b/calendar/gui/e-select-names-editable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -142,7 +142,7 @@ e_select_names_editable_get_emails (ESelectNamesEditable *esne) for (l = destinations; l != NULL; l = l->next) { destination = l->data; - if (e_destination_is_evolution_list (destination)) { + if (e_destination_is_evolution_list (destination)) { const GList *list_dests, *l; list_dests = e_destination_list_get_dests (destination); @@ -205,7 +205,7 @@ e_select_names_editable_get_names (ESelectNamesEditable *esne) return NULL; for (l = destinations; l != NULL; l = l->next) { - destination = l->data; + destination = l->data; if (e_destination_is_evolution_list (destination)) { const GList *list_dests, *l; @@ -217,7 +217,7 @@ e_select_names_editable_get_names (ESelectNamesEditable *esne) result = g_list_append (result, g_strdup (e_destination_get_name (destination))); } } - + g_list_free (destinations); return result; diff --git a/calendar/gui/e-select-names-editable.h b/calendar/gui/e-select-names-editable.h index da961237e7..58b0ce3290 100644 --- a/calendar/gui/e-select-names-editable.h +++ b/calendar/gui/e-select-names-editable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c index 357eba4c5b..f1aa1ec45d 100644 --- a/calendar/gui/e-select-names-renderer.c +++ b/calendar/gui/e-select-names-renderer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -100,7 +100,7 @@ e_select_names_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, G g_signal_connect (editable, "editing_done", G_CALLBACK (e_select_names_renderer_editing_done), sn_cell); - /* Removed focus-out-event. focus out event already listen by base class. + /* Removed focus-out-event. focus out event already listen by base class. We don't need to listen for the focus out event any more */ sn_cell->priv->editable = g_object_ref (editable); diff --git a/calendar/gui/e-select-names-renderer.h b/calendar/gui/e-select-names-renderer.h index 21deec2cb5..6a2c4be102 100644 --- a/calendar/gui/e-select-names-renderer.h +++ b/calendar/gui/e-select-names-renderer.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index eabe4d72d2..16d8b7636a 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -951,7 +951,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks) priv = tasks->priv; source = e_cal_get_source (ecal); - + if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED || status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED) auth_cal_forget_password (ecal); diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h index 41fcd2d78a..67989ee021 100644 --- a/calendar/gui/e-tasks.h +++ b/calendar/gui/e-tasks.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index 391079a084..2be6548757 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h index f4780f0712..6c63fb8444 100644 --- a/calendar/gui/e-timezone-entry.h +++ b/calendar/gui/e-timezone-entry.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-config.c b/calendar/gui/e-week-view-config.c index 28224fb1db..8a0c0de984 100644 --- a/calendar/gui/e-week-view-config.c +++ b/calendar/gui/e-week-view-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-config.h b/calendar/gui/e-week-view-config.h index 32f32b0d75..e86e0fa968 100644 --- a/calendar/gui/e-week-view-config.h +++ b/calendar/gui/e-week-view-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 49513e96e5..458d8e7e3c 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h index 1e56a5d8a5..69d041f046 100644 --- a/calendar/gui/e-week-view-event-item.h +++ b/calendar/gui/e-week-view-event-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c index 6599a3f7db..37a2706f2a 100644 --- a/calendar/gui/e-week-view-layout.c +++ b/calendar/gui/e-week-view-layout.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h index d531435d11..0acd41d232 100644 --- a/calendar/gui/e-week-view-layout.h +++ b/calendar/gui/e-week-view-layout.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c index be69282a4a..e1c090b196 100644 --- a/calendar/gui/e-week-view-main-item.c +++ b/calendar/gui/e-week-view-main-item.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h index 818ba87d0f..34bdfa2e1f 100644 --- a/calendar/gui/e-week-view-main-item.h +++ b/calendar/gui/e-week-view-main-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c index d483473810..e23f2a675f 100644 --- a/calendar/gui/e-week-view-titles-item.c +++ b/calendar/gui/e-week-view-titles-item.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h index 89f33de6ef..0463c95cb0 100644 --- a/calendar/gui/e-week-view-titles-item.h +++ b/calendar/gui/e-week-view-titles-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 52fabef69e..57c0547af0 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -367,7 +367,7 @@ static void model_row_changed_cb (ETableModel *etm, int row, gpointer user_data) { EWeekView *week_view = E_WEEK_VIEW (user_data); - + if (!E_CALENDAR_VIEW (week_view)->in_focus) { return; } @@ -1931,7 +1931,7 @@ set_text_as_bold (EWeekViewEvent *event, EWeekViewEventSpan *span) for (l = attendees; l; l = l->next) { ECalComponentAttendee *attendee = l->data; - if ((g_str_equal (itip_strip_mailto (attendee->value), address)) + if ((g_str_equal (itip_strip_mailto (attendee->value), address)) || (attendee->sentby && g_str_equal (itip_strip_mailto (attendee->sentby), address))) { at = attendee; break; @@ -1939,7 +1939,7 @@ set_text_as_bold (EWeekViewEvent *event, EWeekViewEventSpan *span) } /* The attendee has not yet accepted the meeting, display the summary as bolded. - If the attendee is not present, it might have come through a mailing list. + If the attendee is not present, it might have come through a mailing list. In that case, we never show the meeting as bold even if it is unaccepted. */ if (at && (at->status == ICAL_PARTSTAT_NEEDSACTION)) gnome_canvas_item_set (span->text_item, "bold", TRUE, NULL); @@ -3625,7 +3625,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view, if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) { goto out; } - + if (mod == CALOBJ_MOD_ALL) comp_util_sanitize_recurrence_master (comp, client); @@ -3879,16 +3879,16 @@ e_month_view_do_cursor_key_up (EWeekView *week_view) /* no easy way to calculate new selection_start_day, therefore * calculate a time_t value and set_selected_time_range */ time_t current; - if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { - current = time_add_week(current,-1); + if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { + current = time_add_week(current,-1); e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP); - e_week_view_set_selected_time_range_visible(week_view,current,current); + e_week_view_set_selected_time_range_visible(week_view,current,current); } } else { week_view->selection_start_day -= 7; week_view->selection_end_day = week_view->selection_start_day; } - + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } @@ -3908,13 +3908,13 @@ e_month_view_do_cursor_key_down (EWeekView *week_view) if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { current = time_add_week(current,1); e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN); - e_week_view_set_selected_time_range_visible(week_view,current,current); + e_week_view_set_selected_time_range_visible(week_view,current,current); } } else { week_view->selection_start_day += 7; week_view->selection_end_day = week_view->selection_start_day; } - + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } @@ -3930,15 +3930,15 @@ e_month_view_do_cursor_key_left (EWeekView *week_view) * calculate a time_t value and set_selected_time_range */ time_t current; if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { - current = time_add_day(current,-1); + current = time_add_day(current,-1); e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP); - e_week_view_set_selected_time_range_visible(week_view,current,current); + e_week_view_set_selected_time_range_visible(week_view,current,current); } } else { week_view->selection_start_day--; week_view->selection_end_day = week_view->selection_start_day; } - + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } @@ -3958,13 +3958,13 @@ e_month_view_do_cursor_key_right (EWeekView *week_view) if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { current = time_add_day(current,1); e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN); - e_week_view_set_selected_time_range_visible(week_view,current,current); + e_week_view_set_selected_time_range_visible(week_view,current,current); } } else { week_view->selection_start_day++; week_view->selection_end_day = week_view->selection_start_day; } - + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h index e62b2f63cd..0936a1e6dc 100644 --- a/calendar/gui/e-week-view.h +++ b/calendar/gui/e-week-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 991df095b3..18f4a47276 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -856,8 +856,8 @@ struct _date_query_msg { GnomeCalendar *gcal; }; -static void -update_query_async (struct _date_query_msg *msg) +static void +update_query_async (struct _date_query_msg *msg) { GnomeCalendar *gcal = msg->gcal; GnomeCalendarPrivate *priv; @@ -866,7 +866,7 @@ update_query_async (struct _date_query_msg *msg) GList *l; priv = gcal->priv; - + /* free the previous queries */ for (l = priv->dn_queries; l != NULL; l = l->next) { old_query = l->data; @@ -889,7 +889,7 @@ update_query_async (struct _date_query_msg *msg) g_slice_free (struct _date_query_msg, msg); return; /* No time range is set, so don't start a query */ } - + /* create queries for each loaded client */ for (l = priv->clients_list[E_CAL_SOURCE_TYPE_EVENT]; l != NULL; l = l->next) { GError *error = NULL; @@ -899,7 +899,7 @@ update_query_async (struct _date_query_msg *msg) if (e_cal_get_load_state ((ECal *) l->data) != E_CAL_LOAD_LOADED) continue; -try_again: +try_again: old_query = NULL; if (!e_cal_get_query ((ECal *) l->data, real_sexp, &old_query, &error)) { /* If calendar is busy try again for 3 times. */ @@ -907,11 +907,11 @@ try_again: tries++; /*TODO chose an optimal value */ g_usleep (500); - + g_clear_error (&error); - goto try_again; - } - + goto try_again; + } + g_warning (G_STRLOC ": Could not create the query: %s ", error->message); g_clear_error (&error); @@ -943,7 +943,7 @@ try_again: /* Restarts a query for the date navigator in the calendar */ static void update_query (GnomeCalendar *gcal) -{ +{ struct _date_query_msg *msg; e_calendar_item_clear_marks (gcal->priv->date_navigator->calitem); @@ -1954,7 +1954,7 @@ gnome_calendar_destroy (GtkObject *object) } for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) { - if (priv->configs[i]) + if (priv->configs[i]) g_object_unref (priv->configs[i]); priv->configs[i] = NULL; } @@ -2423,7 +2423,7 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra continue; E_CALENDAR_VIEW (priv->views [i])->in_focus = FALSE; } - + if (grab_focus) focus_current_view (gcal); @@ -2475,7 +2475,7 @@ display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data) display_view (gcal, view_type, TRUE); - + if (!priv->base_view_time) update_view_times (gcal, time (NULL)); else @@ -2783,7 +2783,7 @@ add_mclient (ECalModel *model, ECal *client) message_push ((Message *) msg); } -static void +static void non_intrusive_error_remove(GtkWidget *w, void *data) { g_hash_table_remove(non_intrusive_error_table, data); @@ -2832,7 +2832,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal) return; case E_CALENDAR_STATUS_INVALID_SERVER_VERSION: id = g_strdup ("calendar:server-version"); - + if (g_hash_table_lookup(non_intrusive_error_table, id)) { /* We already have it */ g_message("Error occurred while existing dialog active:\n"); @@ -2978,7 +2978,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar g_hash_table_remove (priv->clients[source_type], e_source_peek_uid (source)); /* FIXME Is there a better way to handle this? */ - if (priv->default_client[source_type]) + if (priv->default_client[source_type]) g_object_unref (priv->default_client[source_type]); priv->default_client[source_type] = NULL; @@ -3073,7 +3073,7 @@ backend_error_cb (ECal *client, const char *message, gpointer data) g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(dialog)); g_signal_connect(GTK_WIDGET (dialog), "destroy", G_CALLBACK(non_intrusive_error_remove), id); - + g_free (uristr); } @@ -3675,7 +3675,7 @@ gnome_calendar_on_date_navigator_selection_changed (ECalendarItem *calitem, Gnom /* Make the views display things properly */ update_view_times (gcal, new_time); set_view (gcal, view_type, TRUE); - + gnome_calendar_notify_dates_shown_changed (gcal); } diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index 1cf2005e3f..947559bac5 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c index ac4100160a..d341245fec 100644 --- a/calendar/gui/goto.c +++ b/calendar/gui/goto.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/goto.h b/calendar/gui/goto.h index c1f51632f8..3b774d2e89 100644 --- a/calendar/gui/goto.h +++ b/calendar/gui/goto.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c index ccfb0254e8..f63e3e187a 100644 --- a/calendar/gui/itip-bonobo-control.c +++ b/calendar/gui/itip-bonobo-control.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/itip-bonobo-control.h b/calendar/gui/itip-bonobo-control.h index 7c2033656c..c79b8f7d09 100644 --- a/calendar/gui/itip-bonobo-control.h +++ b/calendar/gui/itip-bonobo-control.h @@ -1,7 +1,7 @@ /* * * Evolution calendar - Control for displaying iTIP mail messages - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 30ad9822c7..ae822c9b9c 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h index 9c8ffa1b60..8dce8266ab 100644 --- a/calendar/gui/itip-utils.h +++ b/calendar/gui/itip-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 14b8267167..1687328fa4 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index 1ed3fb1634..d14b350d1c 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -450,7 +450,7 @@ edit_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) calendar_setup_edit_memo_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source); } -static void +static void set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value) { MemosComponentView *component_view = data; @@ -466,13 +466,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char static void mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) { - set_offline_availability (ep, pitem, data, "0"); + set_offline_availability (ep, pitem, data, "0"); } static void mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) { - set_offline_availability (ep, pitem, data, "1"); + set_offline_availability (ep, pitem, data, "1"); } static EPopupItem emc_source_popups[] = { diff --git a/calendar/gui/memos-component.h b/calendar/gui/memos-component.h index b3995628ab..3ca01a50f7 100644 --- a/calendar/gui/memos-component.h +++ b/calendar/gui/memos-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c index 7b743a9378..2f7bd9b1bb 100644 --- a/calendar/gui/memos-control.c +++ b/calendar/gui/memos-control.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/memos-control.h b/calendar/gui/memos-control.h index 5861ae50e5..565ac160ed 100644 --- a/calendar/gui/memos-control.h +++ b/calendar/gui/memos-control.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index 8a68e4ffdc..97cc575b20 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/migration.h b/calendar/gui/migration.h index 4073e31fac..c16fd831b9 100644 --- a/calendar/gui/migration.h +++ b/calendar/gui/migration.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c index acae5d8e1e..ab657d8872 100644 --- a/calendar/gui/misc.c +++ b/calendar/gui/misc.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/misc.h b/calendar/gui/misc.h index 3e0fe04cb4..8c328652bb 100644 --- a/calendar/gui/misc.h +++ b/calendar/gui/misc.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 943a4af2ee..3fca566bf2 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/print.h b/calendar/gui/print.h index 35454f9224..39482b33f2 100644 --- a/calendar/gui/print.h +++ b/calendar/gui/print.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c index 9000060183..b57a50d6ce 100644 --- a/calendar/gui/tag-calendar.c +++ b/calendar/gui/tag-calendar.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h index 847aab12ea..e1d9fcf0b1 100644 --- a/calendar/gui/tag-calendar.h +++ b/calendar/gui/tag-calendar.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 2d17f5783f..68536b29cb 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -442,7 +442,7 @@ edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) calendar_setup_edit_task_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source); } -static void +static void set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value) { TasksComponentView *component_view = data; @@ -458,13 +458,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char static void mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) { - set_offline_availability (ep, pitem, data, "0"); + set_offline_availability (ep, pitem, data, "0"); } static void mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) { - set_offline_availability (ep, pitem, data, "1"); + set_offline_availability (ep, pitem, data, "1"); } static EPopupItem etc_source_popups[] = { diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h index cbb25d793e..0667fc2523 100644 --- a/calendar/gui/tasks-component.h +++ b/calendar/gui/tasks-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 9732f2f7e7..7ee468e768 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -484,7 +484,7 @@ confirm_purge (ETasks *tasks) GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, - "%s", + "%s", _("This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n\nReally erase these tasks?")); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_NO); diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h index a41783fe9a..9dd3a3946d 100644 --- a/calendar/gui/tasks-control.h +++ b/calendar/gui/tasks-control.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c index 6681829afa..56a7386d4b 100644 --- a/calendar/gui/weekday-picker.c +++ b/calendar/gui/weekday-picker.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h index c730ebbf4b..bd78201bd3 100644 --- a/calendar/gui/weekday-picker.h +++ b/calendar/gui/weekday-picker.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/importers/evolution-calendar-importer.h b/calendar/importers/evolution-calendar-importer.h index 9a3facc4d7..7874a809fd 100644 --- a/calendar/importers/evolution-calendar-importer.h +++ b/calendar/importers/evolution-calendar-importer.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index a7ea5e7921..a4e0fa7048 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/importers/main.c b/calendar/importers/main.c index b1a3a20501..dc91f378f5 100644 --- a/calendar/importers/main.c +++ b/calendar/importers/main.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/calendar/zones.h b/calendar/zones.h index ad485eb993..4489960698 100644 --- a/calendar/zones.h +++ b/calendar/zones.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c index 077c0c5ec0..3b40d270f0 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-actions.h b/composer/e-composer-actions.h index da3e470d81..5d49cde158 100644 --- a/composer/e-composer-actions.h +++ b/composer/e-composer-actions.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c index 842deae9c9..5da5842d8c 100644 --- a/composer/e-composer-autosave.c +++ b/composer/e-composer-autosave.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-autosave.h b/composer/e-composer-autosave.h index 7c97338019..fe03b7b0bc 100644 --- a/composer/e-composer-autosave.h +++ b/composer/e-composer-autosave.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-common.h b/composer/e-composer-common.h index 832b38001f..28affba2ad 100644 --- a/composer/e-composer-common.h +++ b/composer/e-composer-common.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c index 68b6c0c14a..4dadfa7ac7 100644 --- a/composer/e-composer-from-header.c +++ b/composer/e-composer-from-header.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-from-header.h b/composer/e-composer-from-header.h index f8c6dc6f18..d2603bd664 100644 --- a/composer/e-composer-from-header.h +++ b/composer/e-composer-from-header.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index 33041301b5..f25c3b722c 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ @@ -548,7 +548,7 @@ composer_header_table_constructor (GType type, priv->headers[ii]->input_widget, "right-attach", 2, NULL); - gtk_table_attach (GTK_TABLE (object), (GtkWidget *)priv->actions_container, 2, 4, E_COMPOSER_HEADER_TO, + gtk_table_attach (GTK_TABLE (object), (GtkWidget *)priv->actions_container, 2, 4, E_COMPOSER_HEADER_TO, E_COMPOSER_HEADER_TO + 1, GTK_FILL, 0, 0, 3); } diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h index 817863031c..91ad56da46 100644 --- a/composer/e-composer-header-table.h +++ b/composer/e-composer-header-table.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c index 674e7a6cee..7b7cb9bcf2 100644 --- a/composer/e-composer-header.c +++ b/composer/e-composer-header.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h index 126af5fb77..eb339d647c 100644 --- a/composer/e-composer-header.h +++ b/composer/e-composer-header.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ @@ -65,7 +65,7 @@ void e_composer_header_set_sensitive (EComposerHeader *header, gboolean e_composer_header_get_visible (EComposerHeader *header); void e_composer_header_set_visible (EComposerHeader *header, gboolean visible); -void e_composer_header_set_property (GObject *object, guint property_id, +void e_composer_header_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); void e_composer_header_set_title_tooltip (EComposerHeader *header, diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c index ed4e60c6f9..bfc9441fb7 100644 --- a/composer/e-composer-name-header.c +++ b/composer/e-composer-name-header.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -282,7 +282,7 @@ e_composer_name_header_new_with_action (const gchar *label, return g_object_new ( E_TYPE_COMPOSER_NAME_HEADER, "label", label, - "button", TRUE, "name-selector", name_selector, + "button", TRUE, "name-selector", name_selector, "addaction_text", action_label, "addaction", action_label != NULL, NULL); } diff --git a/composer/e-composer-name-header.h b/composer/e-composer-name-header.h index af38666d59..100d6c8980 100644 --- a/composer/e-composer-name-header.h +++ b/composer/e-composer-name-header.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c index bb971d53bf..59d81b80ac 100644 --- a/composer/e-composer-post-header.c +++ b/composer/e-composer-post-header.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-post-header.h b/composer/e-composer-post-header.h index 666d043df2..40dc5a8d58 100644 --- a/composer/e-composer-post-header.h +++ b/composer/e-composer-post-header.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c index 0a1a91f6c0..2a2cea6a4c 100644 --- a/composer/e-composer-private.c +++ b/composer/e-composer-private.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ @@ -101,7 +101,7 @@ e_composer_private_init (EMsgComposer *composer) widget = gtkhtml_editor_get_managed_widget (editor, "/main-menu"); gtk_widget_hide (widget); widget = gtkhtml_editor_get_managed_widget (editor, "/main-toolbar"); - gtk_toolbar_set_style ((GtkToolbar *)widget, GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_style ((GtkToolbar *)widget, GTK_TOOLBAR_BOTH_HORIZ); gtk_widget_hide (widget); } diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h index 8dc9b4be93..49d9ae6d74 100644 --- a/composer/e-composer-private.h +++ b/composer/e-composer-private.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c index e676ef941c..e765237a2d 100644 --- a/composer/e-composer-text-header.c +++ b/composer/e-composer-text-header.c @@ -14,7 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ @@ -122,7 +122,7 @@ e_composer_text_header_new_button (const gchar *label, const gchar *action_label { return g_object_new ( E_TYPE_COMPOSER_TEXT_HEADER, "label", label, - "button", TRUE, "addaction", action_label != NULL, + "button", TRUE, "addaction", action_label != NULL, "addaction_text", action_label, "visible", action_label == NULL, NULL); } diff --git a/composer/e-composer-text-header.h b/composer/e-composer-text-header.h index 79e972d3c6..74fb86f9b0 100644 --- a/composer/e-composer-text-header.h +++ b/composer/e-composer-text-header.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index a715774e0d..946bff28c1 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1434,7 +1434,7 @@ msg_composer_update_preferences (GConfClient *client, if (entry) { if (strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_INLINE_SPELLING_KEY) != 0 && - strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 && + strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 && strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_SMILEYS_KEY) != 0) return; } @@ -2928,13 +2928,13 @@ e_msg_composer_new_with_message (CamelMimeMessage *message) /* Remove any other X-Evolution-* headers that may have been set */ xev = mail_tool_remove_xevolution_headers (message); camel_header_raw_clear (&xev); - + /* Check for receipt request */ if (camel_medium_get_header (CAMEL_MEDIUM (message), "Disposition-Notification-To")) { action = GTK_TOGGLE_ACTION (ACTION (REQUEST_READ_RECEIPT)); gtk_toggle_action_set_active (action, TRUE); } - + /* Check for mail priority */ if (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Priority")) { action = GTK_TOGGLE_ACTION (ACTION (PRIORITIZE_MESSAGE)); @@ -3907,7 +3907,7 @@ e_msg_composer_request_close_all (void) /* Try to autosave before closing. If it fails for * some reason, the CLOSE action will still detect - * unsaved changes and prompt the user. + * unsaved changes and prompt the user. * * FIXME If it /does/ prompt the user, the Cancel * button will act the same as Discard Changes, @@ -4094,7 +4094,7 @@ e_load_spell_languages (void) const GtkhtmlSpellLanguage *language; language = gtkhtml_spell_language_lookup (NULL); - + if (language) { spell_languages = g_list_prepend ( spell_languages, (gpointer) language); diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h index bf712d2928..b9985f7f44 100644 --- a/composer/e-msg-composer.h +++ b/composer/e-msg-composer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c index 7d874b896b..9f97a441db 100644 --- a/e-util/e-bconf-map.c +++ b/e-util/e-bconf-map.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h index dfd015ec65..8c6ea6deec 100644 --- a/e-util/e-bconf-map.h +++ b/e-util/e-bconf-map.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-binding.c b/e-util/e-binding.c index 6a29166cc1..9d4e83fc3f 100644 --- a/e-util/e-binding.c +++ b/e-util/e-binding.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/e-util/e-binding.h b/e-util/e-binding.h index 676093bfad..12f4db8505 100644 --- a/e-util/e-binding.h +++ b/e-util/e-binding.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c index fdd3d3fe01..e2cf15af43 100644 --- a/e-util/e-bit-array.c +++ b/e-util/e-bit-array.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h index 4504f5afc6..34c8016094 100644 --- a/e-util/e-bit-array.h +++ b/e-util/e-bit-array.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c index 875b67974f..c01b98cde4 100644 --- a/e-util/e-categories-config.c +++ b/e-util/e-categories-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h index 9eff161375..bbd76f2a02 100644 --- a/e-util/e-categories-config.h +++ b/e-util/e-categories-config.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c index 83fb305347..7c1c6eb091 100644 --- a/e-util/e-config-listener.c +++ b/e-util/e-config-listener.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-config-listener.h b/e-util/e-config-listener.h index 655bc3c1ec..4449d8f22c 100644 --- a/e-util/e-config-listener.h +++ b/e-util/e-config-listener.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-config.c b/e-util/e-config.c index a2d68e1740..5d0a7090f7 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-config.h b/e-util/e-config.h index 1ee7e29b58..b128005c64 100644 --- a/e-util/e-config.h +++ b/e-util/e-config.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c index 0288602a7e..f673370bfc 100644 --- a/e-util/e-corba-utils.c +++ b/e-util/e-corba-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h index 979237929d..b6da7240e7 100644 --- a/e-util/e-corba-utils.h +++ b/e-util/e-corba-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-cursor.c b/e-util/e-cursor.c index 7d547e38ac..c5f77c7d62 100644 --- a/e-util/e-cursor.c +++ b/e-util/e-cursor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-cursor.h b/e-util/e-cursor.h index f0b78b3126..30ad722bbc 100644 --- a/e-util/e-cursor.h +++ b/e-util/e-cursor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 0546430512..978033541a 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h index 9d594122e2..6b9956ddf9 100644 --- a/e-util/e-dialog-utils.h +++ b/e-util/e-dialog-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c index f1777ca55d..98e1be7a74 100644 --- a/e-util/e-dialog-widgets.c +++ b/e-util/e-dialog-widgets.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h index f5ff123a4f..b7f838539d 100644 --- a/e-util/e-dialog-widgets.h +++ b/e-util/e-dialog-widgets.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-error.c b/e-util/e-error.c index 23e52bca8e..f2067950bc 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -529,7 +529,7 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) g_string_free (oerr, TRUE); } else perr = g_strdup (gtk_window_get_title (GTK_WINDOW (dialog))); - + if (e->secondary) { ee_build_label(out, e->secondary, args, TRUE); oerr = g_string_new(""); @@ -561,7 +561,7 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) gtk_box_pack_start((GtkBox *)dialog->vbox, hbox, TRUE, TRUE, 0); g_object_set_data_full ((GObject *) dialog, "primary", perr, g_free); g_object_set_data_full ((GObject *) dialog, "secondary", serr, g_free); - + return (GtkWidget *)dialog; } diff --git a/e-util/e-error.h b/e-util/e-error.h index 321957839f..014f74ee88 100644 --- a/e-util/e-error.h +++ b/e-util/e-error.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-event.c b/e-util/e-event.c index 73111229f9..ab96701abc 100644 --- a/e-util/e-event.c +++ b/e-util/e-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-event.h b/e-util/e-event.h index c97f1b30bc..5b4e3f44ab 100644 --- a/e-util/e-event.h +++ b/e-util/e-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-folder-map.c b/e-util/e-folder-map.c index 157c4ca353..d74817ecfe 100644 --- a/e-util/e-folder-map.c +++ b/e-util/e-folder-map.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-folder-map.h b/e-util/e-folder-map.h index a939ea777f..3f41838882 100644 --- a/e-util/e-folder-map.h +++ b/e-util/e-folder-map.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-fsutils.c b/e-util/e-fsutils.c index 28b434f291..27480959c4 100644 --- a/e-util/e-fsutils.c +++ b/e-util/e-fsutils.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-fsutils.h b/e-util/e-fsutils.h index 91ad9b9c4a..76a03f5441 100644 --- a/e-util/e-fsutils.h +++ b/e-util/e-fsutils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c index 4cdb0eefa3..4958f0806e 100644 --- a/e-util/e-html-utils.c +++ b/e-util/e-html-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h index fa70e55f7f..55e67ba915 100644 --- a/e-util/e-html-utils.h +++ b/e-util/e-html-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 299dfff6f5..5b1cd2f9bd 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h index c864b1be8e..b8a4df972f 100644 --- a/e-util/e-icon-factory.h +++ b/e-util/e-icon-factory.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-import.c b/e-util/e-import.c index 9e8c8a3fa7..ccc44d7daa 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-import.h b/e-util/e-import.h index 9a9994150b..4ca1ef1829 100644 --- a/e-util/e-import.h +++ b/e-util/e-import.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-logger.c b/e-util/e-logger.c index 3d3c88c384..19326d2d67 100644 --- a/e-util/e-logger.c +++ b/e-util/e-logger.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -243,7 +243,7 @@ e_logger_log (ELogger *logger, set_dirty (logger); } -void +void e_logger_get_logs (ELogger *logger, ELogFunction func, gpointer data) @@ -256,7 +256,7 @@ e_logger_get_logs (ELogger *logger, /* Flush everything before we get the logs */ if (logger->priv->fp) - fflush (logger->priv->fp); + fflush (logger->priv->fp); fp = g_fopen (logger->priv->logfile, "r"); if (!fp) { diff --git a/e-util/e-logger.h b/e-util/e-logger.h index 186d918f12..b3bd4f8919 100644 --- a/e-util/e-logger.h +++ b/e-util/e-logger.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-menu.c b/e-util/e-menu.c index cfbb215712..e5472d6bbc 100644 --- a/e-util/e-menu.c +++ b/e-util/e-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-menu.h b/e-util/e-menu.h index f844f80400..5df8f11b28 100644 --- a/e-util/e-menu.h +++ b/e-util/e-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c index ade1abc0b4..682563907c 100644 --- a/e-util/e-mktemp.c +++ b/e-util/e-mktemp.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-mktemp.h b/e-util/e-mktemp.h index 48e72235ee..01dbd18119 100644 --- a/e-util/e-mktemp.h +++ b/e-util/e-mktemp.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-non-intrusive-error-dialog.c b/e-util/e-non-intrusive-error-dialog.c index 070c1e9bef..bb24a2360e 100644 --- a/e-util/e-non-intrusive-error-dialog.c +++ b/e-util/e-non-intrusive-error-dialog.c @@ -169,7 +169,7 @@ eni_error_level_value_changed (GtkComboBox *w, gpointer *data) g_object_unref (gconf_client); } -void +void eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, const char *error_level_path) { GtkWidget *container; diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c index 877d60ac41..b2338ccead 100644 --- a/e-util/e-pilot-map.c +++ b/e-util/e-pilot-map.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-pilot-map.h b/e-util/e-pilot-map.h index d49d62cbb2..46eaf54199 100644 --- a/e-util/e-pilot-map.h +++ b/e-util/e-pilot-map.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c index 2273064ac3..582c9458e1 100644 --- a/e-util/e-pilot-util.c +++ b/e-util/e-pilot-util.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h index 8559918eb3..0d7aebbd87 100644 --- a/e-util/e-pilot-util.h +++ b/e-util/e-pilot-util.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c index c3ee13fe60..840dd67a0e 100644 --- a/e-util/e-plugin-ui.c +++ b/e-util/e-plugin-ui.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ @@ -29,7 +29,7 @@ struct _EPluginUIHookPrivate { - /* Table of GtkUIManager ID's to UI definitions. + /* Table of GtkUIManager ID's to UI definitions. * * For example: * diff --git a/e-util/e-plugin-ui.h b/e-util/e-plugin-ui.h index b8e795c4c4..cdefda5617 100644 --- a/e-util/e-plugin-ui.h +++ b/e-util/e-plugin-ui.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index d43238be0a..7516fb3f09 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -459,7 +459,7 @@ ep_load(const char *filename, int load_level) if (load_level == 1) e_plugin_invoke (ep, "load_plugin_type_register_function", NULL); } - } + } } else if (load_level == 2) { ep = ep_load_plugin(root, pdoc); } diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h index 0b31409c96..54855d0b95 100644 --- a/e-util/e-plugin.h +++ b/e-util/e-plugin.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -376,8 +376,8 @@ struct _EPluginTypeHookClass { GType e_plugin_type_hook_get_type(void); -/* README: Currently there is only one flag. - But we may need more in the future and hence makes +/* README: Currently there is only one flag. + But we may need more in the future and hence makes sense to keep as an enum */ typedef enum _EPluginFlags { diff --git a/e-util/e-popup.c b/e-util/e-popup.c index 41428c3c5a..bcd152713c 100644 --- a/e-util/e-popup.c +++ b/e-util/e-popup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-popup.h b/e-util/e-popup.h index 877f5dfce4..65c51ce65f 100644 --- a/e-util/e-popup.h +++ b/e-util/e-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-print.c b/e-util/e-print.c index 4cc3b8155e..8faeafc0f5 100644 --- a/e-util/e-print.c +++ b/e-util/e-print.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-print.h b/e-util/e-print.h index 93cbe2d10d..9469b63636 100644 --- a/e-util/e-print.h +++ b/e-util/e-print.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c index 4fdd5d958a..ee98ad8b75 100644 --- a/e-util/e-profile-event.c +++ b/e-util/e-profile-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h index dd84671902..c20a5f1044 100644 --- a/e-util/e-profile-event.h +++ b/e-util/e-profile-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-request.c b/e-util/e-request.c index 1977b9b0fe..2175c75b2a 100644 --- a/e-util/e-request.c +++ b/e-util/e-request.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-request.h b/e-util/e-request.h index a84da2941a..ae822db83e 100644 --- a/e-util/e-request.h +++ b/e-util/e-request.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c index d2b575c15a..eaedddaf50 100644 --- a/e-util/e-signature-list.c +++ b/e-util/e-signature-list.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h index cfaa64c28a..8d8caed0a8 100644 --- a/e-util/e-signature-list.h +++ b/e-util/e-signature-list.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-signature.c b/e-util/e-signature.c index 2d0df59579..1cbed6b66b 100644 --- a/e-util/e-signature.c +++ b/e-util/e-signature.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-signature.h b/e-util/e-signature.h index cc5309c7c1..cc8591b421 100644 --- a/e-util/e-signature.h +++ b/e-util/e-signature.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c index 582ed959ad..060c3f441a 100644 --- a/e-util/e-sorter-array.c +++ b/e-util/e-sorter-array.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h index f31d9b06cc..a02f5d9635 100644 --- a/e-util/e-sorter-array.h +++ b/e-util/e-sorter-array.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c index 6176b58715..f63e5e1172 100644 --- a/e-util/e-sorter.c +++ b/e-util/e-sorter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h index 365d66a461..d64851bc70 100644 --- a/e-util/e-sorter.h +++ b/e-util/e-sorter.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c index 4b99d897db..f44019165d 100644 --- a/e-util/e-text-event-processor-emacs-like.c +++ b/e-util/e-text-event-processor-emacs-like.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h index 87e3fa797d..99635e2341 100644 --- a/e-util/e-text-event-processor-emacs-like.h +++ b/e-util/e-text-event-processor-emacs-like.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h index c4c0efa424..6e9d155f8c 100644 --- a/e-util/e-text-event-processor-types.h +++ b/e-util/e-text-event-processor-types.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c index 48100de64a..6496a63294 100644 --- a/e-util/e-text-event-processor.c +++ b/e-util/e-text-event-processor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h index 1f88407823..a9d329c140 100644 --- a/e-util/e-text-event-processor.h +++ b/e-util/e-text-event-processor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c index a7d5913bbd..ba1d0113a0 100644 --- a/e-util/e-util-labels.c +++ b/e-util/e-util-labels.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -218,7 +218,7 @@ find_label (GSList *labels, const char *tag) for (l = labels; l; l = l->next) { EUtilLabel *label = l->data; - + if (label && label->tag && !strcmp (tag, label->tag)) return label; } diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h index ee06cccc99..725f740d89 100644 --- a/e-util/e-util-labels.h +++ b/e-util/e-util-labels.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h index cca11e2477..f7d84dea37 100644 --- a/e-util/e-util-private.h +++ b/e-util/e-util-private.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-util.c b/e-util/e-util.c index fc4f71f187..533dc2d740 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1297,7 +1297,7 @@ e_file_lock_destroy () } } -gboolean +gboolean e_file_lock_exists () { const char *fname = get_lock_filename (); @@ -1334,7 +1334,7 @@ e_util_guess_mime_type (const char *filename, gboolean localfile) fi = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL); if (fi) { mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (fi)); - + g_object_unref (fi); } @@ -1460,7 +1460,7 @@ e_util_read_file (const char *filename, gboolean filename_is_uri, char **buffer, if (err) res = FALSE; - + if (res) *buffer = buff; else diff --git a/e-util/e-util.h b/e-util/e-util.h index 480da24eac..e5126213f3 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c index 1c8c5d3f18..04c70afd75 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c index 653669b381..73dd415a6d 100644 --- a/e-util/e-xml-utils.c +++ b/e-util/e-xml-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h index ef8ae8ac8a..c327d61e17 100644 --- a/e-util/e-xml-utils.h +++ b/e-util/e-xml-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index ca130ee2a3..f0fd2ed3e2 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -1,4 +1,4 @@ -/* +/* * (C) 2005 OpenedHand Ltd. * * Author: Jorn Baayen @@ -29,7 +29,7 @@ struct _GConfBridge { GConfClient *client; - + GHashTable *bindings; }; @@ -43,7 +43,7 @@ typedef enum { typedef struct { BindingType type; guint id; - + gboolean delayed_mode; char *key; @@ -149,7 +149,7 @@ gconf_bridge_get (void) * gconf_bridge_get_client * @bridge: A #GConfBridge * - * Returns the #GConfClient used by @bridge. This is the same #GConfClient + * Returns the #GConfClient used by @bridge. This is the same #GConfClient * as returned by gconf_client_get_default(). * * Return value: A #GConfClient. @@ -183,7 +183,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding, GConfValue *pref_value) { GValue src_value, value; - + /* Make sure we don't enter an infinite synchronizing loop */ g_signal_handler_block (binding->object, binding->prop_notify_id); @@ -229,7 +229,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding, "transform a \"%s\" to a \"%s\".", g_type_name (src_value.g_type), g_type_name (value.g_type)); - + goto done; } @@ -239,7 +239,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding, g_object_set_property (binding->object, binding->prop->name, &src_value); } - + done: g_value_unset (&src_value); g_value_unset (&value); @@ -397,7 +397,7 @@ prop_binding_pref_changed (GConfClient *client, prop_binding_sync_pref_to_prop (binding, gconf_value); } -/* Performs a scheduled prop-to-pref sync for a prop binding in +/* Performs a scheduled prop-to-pref sync for a prop binding in * delay mode */ static gboolean prop_binding_perform_scheduled_sync (PropBinding *binding) @@ -407,7 +407,7 @@ prop_binding_perform_scheduled_sync (PropBinding *binding) binding->sync_timeout_id = 0; g_object_unref (binding->object); - + return FALSE; } @@ -451,7 +451,7 @@ prop_binding_object_destroyed (gpointer user_data, binding = (PropBinding *) user_data; binding->object = NULL; /* Don't do anything with the object at unbind() */ - + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding->id)); } @@ -516,7 +516,7 @@ gconf_bridge_bind_property_full (GConfBridge *bridge, binding->object = object; binding->prop = pspec; binding->sync_timeout_id = 0; - + /* Watch GConf key */ binding->val_notify_id = gconf_client_notify_add (bridge->client, key, @@ -557,7 +557,7 @@ prop_binding_unbind (PropBinding *binding) if (binding->delayed_mode && binding->sync_timeout_id > 0) { /* Perform any scheduled syncs */ g_source_remove (binding->sync_timeout_id); - + /* The object will still be around as we have * a reference */ prop_binding_perform_scheduled_sync (binding); @@ -714,7 +714,7 @@ window_binding_window_destroyed (gpointer user_data, * @window: A #GtkWindow * @bind_size: TRUE to bind the size of @window * @bind_pos: TRUE to bind the position of @window - * + * * On calling this function @window will be resized to the values * specified by "@key_prefix_width" and "@key_prefix_height" * and maximixed if "@key_prefix_maximized is TRUE if @@ -790,7 +790,7 @@ gconf_bridge_bind_window (GConfBridge *bridge, if (bind_pos) { char *key; GConfValue *x_val, *y_val; - + key = g_strconcat (key_prefix, "_x", NULL); x_val = gconf_client_get (bridge->client, key, NULL); g_free (key); @@ -885,7 +885,7 @@ list_store_binding_sync_pref_to_store (ListStoreBinding *binding, binding->row_inserted_id); g_signal_handler_block (binding->list_store, binding->row_deleted_id); - + gtk_list_store_clear (binding->list_store); list = gconf_value_get_list (value); @@ -1002,7 +1002,7 @@ list_store_binding_store_destroyed (gpointer user_data, binding = (ListStoreBinding *) user_data; binding->list_store = NULL; /* Don't do anything with the store at unbind() */ - + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding->id)); } @@ -1025,7 +1025,7 @@ list_store_binding_store_changed_cb (ListStoreBinding *binding) * @bridge: A #GConfBridge * @key: A GConf key to be bound * @list_store: A #GtkListStore - * + * * On calling this function single string column #GtkListStore @list_store * will be kept synchronized with the GConf string list value pointed to by * @key. On calling this function @list_store will be populated with the @@ -1198,7 +1198,7 @@ gconf_bridge_unbind (GConfBridge *bridge, /* This will trigger the hash tables value destruction * function, which will take care of further cleanup */ - g_hash_table_remove (bridge->bindings, + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding_id)); } diff --git a/e-util/gconf-bridge.h b/e-util/gconf-bridge.h index ba67f4f8e6..7edd2476dd 100644 --- a/e-util/gconf-bridge.h +++ b/e-util/gconf-bridge.h @@ -1,4 +1,4 @@ -/* +/* * (C) 2005 OpenedHand Ltd. * * Author: Jorn Baayen @@ -81,7 +81,7 @@ guint gconf_bridge_bind_window (GConfBridge *bridge, * @bridge: A #GConfBridge * @key_prefix: The prefix of the GConf keys * @window: A #GtkWindow - * + * * On calling this function @window will be resized to the values specified by * "@key_prefix_width" and "@key_prefix_height". The respective * GConf values will be updated when the window is resized. See @@ -95,7 +95,7 @@ guint gconf_bridge_bind_window (GConfBridge *bridge, * @bridge: A #GConfBridge * @key_prefix: The prefix of the GConf keys * @window: A #GtkWindow - * + * * On calling this function @window will be moved to the values specified by * "@key_prefix_x" and "@key_prefix_y". The respective GConf * values will be updated when the window is moved. See diff --git a/filter/filter-code.c b/filter/filter-code.c index 1de9c3aba6..fb0880b260 100644 --- a/filter/filter-code.c +++ b/filter/filter-code.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-code.h b/filter/filter-code.h index 7199bcef68..38336fc450 100644 --- a/filter/filter-code.h +++ b/filter/filter-code.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-colour.c b/filter/filter-colour.c index 0d0388de94..a5cc3534ad 100644 --- a/filter/filter-colour.c +++ b/filter/filter-colour.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-colour.h b/filter/filter-colour.h index 1de46ab70b..ff19d66686 100644 --- a/filter/filter-colour.h +++ b/filter/filter-colour.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c index cf92b804f5..d0a7b591a5 100644 --- a/filter/filter-datespec.c +++ b/filter/filter-datespec.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-datespec.h b/filter/filter-datespec.h index cbb79a46c5..c8eee1bae7 100644 --- a/filter/filter-datespec.h +++ b/filter/filter-datespec.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-element.c b/filter/filter-element.c index c14365cc8a..1fa0a14ee8 100644 --- a/filter/filter-element.c +++ b/filter/filter-element.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-element.h b/filter/filter-element.h index 6124b364a2..76894542a2 100644 --- a/filter/filter-element.h +++ b/filter/filter-element.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-file.c b/filter/filter-file.c index e43a02b2ef..2c0ac87c7f 100644 --- a/filter/filter-file.c +++ b/filter/filter-file.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-file.h b/filter/filter-file.h index 81e6b8c1cd..02dabdb2e8 100644 --- a/filter/filter-file.h +++ b/filter/filter-file.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-input.c b/filter/filter-input.c index 693fea0bab..30d6ed9c45 100644 --- a/filter/filter-input.c +++ b/filter/filter-input.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-input.h b/filter/filter-input.h index b6c6019052..ac71847a76 100644 --- a/filter/filter-input.h +++ b/filter/filter-input.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-int.c b/filter/filter-int.c index 969a477331..170657e2dd 100644 --- a/filter/filter-int.c +++ b/filter/filter-int.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-int.h b/filter/filter-int.h index 06add3fd05..60e1b2bf85 100644 --- a/filter/filter-int.h +++ b/filter/filter-int.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-option.c b/filter/filter-option.c index 7c5bbe901c..f4b208c59d 100644 --- a/filter/filter-option.c +++ b/filter/filter-option.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-option.h b/filter/filter-option.h index 6cf56645b8..8a4931a009 100644 --- a/filter/filter-option.h +++ b/filter/filter-option.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-part.c b/filter/filter-part.c index 08434eadac..799e7fcb36 100644 --- a/filter/filter-part.c +++ b/filter/filter-part.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-part.h b/filter/filter-part.h index 6c83b1d734..1827433b1c 100644 --- a/filter/filter-part.h +++ b/filter/filter-part.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/filter-rule.c b/filter/filter-rule.c index 7972de13d0..cdc9f374f1 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -635,7 +635,7 @@ part_combobox_changed (GtkComboBox *combobox, struct _part_data *data) g_return_if_fail (part != NULL); g_return_if_fail (i == index); - + /* dont update if we haven't changed */ if (!strcmp (part->title, data->part->title)) return; @@ -809,7 +809,7 @@ more_parts (GtkWidget *button, struct _rule_data *data) adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w)); if (adjustment) gtk_adjustment_set_value (adjustment, adjustment->upper); - + } } } diff --git a/filter/filter-rule.h b/filter/filter-rule.h index b1683e1c8b..24419fec09 100644 --- a/filter/filter-rule.h +++ b/filter/filter-rule.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/rule-context.c b/filter/rule-context.c index 0a7438b12c..4bd364f0b8 100644 --- a/filter/rule-context.c +++ b/filter/rule-context.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/rule-context.h b/filter/rule-context.h index ba7e47c381..539c5b3b56 100644 --- a/filter/rule-context.h +++ b/filter/rule-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/rule-editor.c b/filter/rule-editor.c index 066689a598..07ea3fd1e4 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/filter/rule-editor.h b/filter/rule-editor.h index 555b5e8263..40cc90ef90 100644 --- a/filter/rule-editor.h +++ b/filter/rule-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/iconv-detect.c b/iconv-detect.c index cbc1a1e5ea..4eb6597225 100644 --- a/iconv-detect.c +++ b/iconv-detect.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/e-attachment-handler-mail.c b/mail/e-attachment-handler-mail.c index 790c7b9c7a..c17c97d8ca 100644 --- a/mail/e-attachment-handler-mail.c +++ b/mail/e-attachment-handler-mail.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-attachment-handler-mail.h b/mail/e-attachment-handler-mail.h index da4ff23d89..c62ea99cab 100644 --- a/mail/e-attachment-handler-mail.h +++ b/mail/e-attachment-handler-mail.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 92fc8272f7..e3656e1223 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-attachment-bar.h b/mail/e-mail-attachment-bar.h index e32f6e2ede..38a4a86fae 100644 --- a/mail/e-mail-attachment-bar.h +++ b/mail/e-mail-attachment-bar.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-search-bar.c b/mail/e-mail-search-bar.c index 4d555857ca..6dcddaf83b 100644 --- a/mail/e-mail-search-bar.c +++ b/mail/e-mail-search-bar.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-mail-search-bar.h b/mail/e-mail-search-bar.h index 7f19e176b7..f4748c77ad 100644 --- a/mail/e-mail-search-bar.h +++ b/mail/e-mail-search-bar.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index e0edb9d389..724cc3b74a 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/e-searching-tokenizer.h b/mail/e-searching-tokenizer.h index 37a0048c0c..f96c37ed49 100644 --- a/mail/e-searching-tokenizer.h +++ b/mail/e-searching-tokenizer.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index fc61cdc84b..2b13e7e015 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1422,7 +1422,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) } else { current = g_strdup("imap"); } - + store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); i = 0; @@ -1448,7 +1448,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, 0, provider->name, 1, provider, -1); - + /* find the displayed and set default */ if (i == 0 || (current && strcmp(provider->protocol, current) == 0)) { service->provider = provider; @@ -1480,10 +1480,10 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) if (!uri || (url = camel_url_new(uri, NULL)) == NULL) { return; } - + tmp = camel_url_get_param(url, "use_ssl"); if (tmp == NULL) - tmp = "never"; + tmp = "never"; for (i=0;iuse_ssl, i); @@ -2370,7 +2370,7 @@ emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct gtk_box_pack_start((GtkBox*)((GnomeDruidPageStandard *)page)->vbox, w, TRUE, TRUE, 0); w = page; g_object_unref(druidxml); - gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page); + gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page); } else { gtk_notebook_append_page((GtkNotebook *)parent, w, gtk_label_new(_("Sending Email"))); } @@ -2687,7 +2687,7 @@ emae_service_complete(EMAccountEditor *emae, EMAccountEditorService *service) if (CAMEL_PROVIDER_NEEDS(service->provider, CAMEL_URL_PART_HOST)) { if (url->host == NULL || url->host[0] == 0) ok = FALSE; - else + else gtk_entry_set_text(service->hostname, url->host); } /* We only need the user if the service needs auth as well, i think */ @@ -2802,14 +2802,14 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) } else { g_warning("buz1\n"); } - + } } else if (!strcmp(pageid, "30.send")) { CamelURL *url; char *at, *user; int index; char *uri = (char *)e_account_get_string(emae->account, E_ACCOUNT_TRANSPORT_URL); - + tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS); at = strchr(tmp, '@'); user = g_alloca(at-tmp+1); @@ -2831,8 +2831,8 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) } else { g_warning("buz2\n"); } - - + + } else if (!strcmp(pageid, "20.receive_options")) { if (emae->priv->source.provider && emae->priv->extra_provider != emae->priv->source.provider) { @@ -3095,5 +3095,5 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account g_signal_connect(emae->editor, "destroy", G_CALLBACK(emae_editor_destroyed), emae); } else { e_config_create_widget((EConfig *)ec); - } + } } diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index fdd25b8f78..e17236e865 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c index 56bb4ce1df..d2303aa73b 100644 --- a/mail/em-account-prefs.c +++ b/mail/em-account-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h index c63b9f562e..0dabc8a11a 100644 --- a/mail/em-account-prefs.h +++ b/mail/em-account-prefs.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index c369bdc1e9..8c704a2827 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -956,7 +956,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) spell_setup (prefs); /* Forwards and Replies */ - prefs->forward_style = GTK_COMBO_BOX (glade_xml_get_widget (gui, "comboboxForwardStyle")); + prefs->forward_style = GTK_COMBO_BOX (glade_xml_get_widget (gui, "comboboxForwardStyle")); style = gconf_client_get_int (client, "/apps/evolution/mail/format/forward_style", NULL); gtk_combo_box_set_active (prefs->forward_style, style); g_signal_connect (prefs->forward_style, "changed", G_CALLBACK (style_changed), (gpointer) "/apps/evolution/mail/format/forward_style"); diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h index 82c6ece51e..2e12c7ffb2 100644 --- a/mail/em-composer-prefs.h +++ b/mail/em-composer-prefs.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 9b3dbe6cf9..4ed3e70b8f 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -469,7 +469,7 @@ static void composer_set_no_change (EMsgComposer *composer, gboolean drop_undo, gboolean editor_changed) { GtkhtmlEditor *editor; - + g_return_if_fail (composer != NULL); editor = GTKHTML_EDITOR (composer); @@ -662,7 +662,7 @@ create_new_composer (const char *subject, const char *fromuri, gboolean use_defa if (lite) composer = e_msg_composer_lite_new (); else - composer = e_msg_composer_new (); + composer = e_msg_composer_new (); table = e_msg_composer_get_header_table (composer); if (fromuri != NULL) { @@ -773,7 +773,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) CamelMimePart *mime_part = CAMEL_MIME_PART (message); CamelDataWrapper *mail_text; CamelMultipart *body = camel_multipart_new (); - CamelStream *stream; + CamelStream *stream; CamelMimePart *part; int count1 = 0, string_changed = 0; const char *cur; @@ -863,8 +863,8 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) } g_strfreev(temp_str); - } - else + } + else cur++; } @@ -879,7 +879,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) mail_text = camel_data_wrapper_new (); camel_data_wrapper_set_mime_type_field (mail_text, type); - + camel_stream_printf (stream, "%s", g_strdup(str)); camel_data_wrapper_construct_from_stream (mail_text, stream); @@ -896,10 +896,10 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) camel_object_unref (body); } } - + composer = e_msg_composer_new_with_message (message); - - if (em_utils_folder_is_templates(drafts, NULL) == TRUE) + + if (em_utils_folder_is_templates(drafts, NULL) == TRUE) em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, NULL, NULL); else em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, drafts, uid); @@ -925,7 +925,7 @@ em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder) if (folder) edit_message (message, folder, NULL); else - edit_message (message, NULL, NULL); + edit_message (message, NULL, NULL); } static void @@ -1047,7 +1047,7 @@ forward_attached_cb (CamelFolder *folder, GPtrArray *messages, CamelMimePart *pa if (part) forward_attached (folder, fad->uids, messages, part, subject, fad->fromuri); - + g_free (fad->fromuri); g_free (fad); } @@ -2261,7 +2261,7 @@ em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source) char *text, *credits; ssize_t len = 0; gboolean start_bottom = 0; - + credits = attribution_format (ATTRIBUTION, message); text = em_utils_message_to_html (message, credits, EM_FORMAT_QUOTE_CITE, &len, source, start_bottom ? "
" : NULL); diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index bbdb73d9c1..60944cb840 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -50,7 +50,7 @@ void em_utils_composer_send_cb(struct _EMsgComposer *composer, gpointer user_dat void em_utils_composer_save_draft_cb(struct _EMsgComposer *composer, gpointer user_data); void em_utils_compose_new_message (const char *fromuri); -struct _EMsgComposer * em_utils_compose_lite_new_message (const char *fromuri); +struct _EMsgComposer * em_utils_compose_lite_new_message (const char *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ void em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri); diff --git a/mail/em-config.c b/mail/em-config.c index 94df437519..160cec851e 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-config.h b/mail/em-config.h index ba19bb1c37..5f895305b0 100644 --- a/mail/em-config.h +++ b/mail/em-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-event.c b/mail/em-event.c index 8a027cce98..b415d5f8a0 100644 --- a/mail/em-event.c +++ b/mail/em-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-event.h b/mail/em-event.h index 21df1df42d..7c2c4c639d 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c index b0f82a7dad..a2a699a36f 100644 --- a/mail/em-filter-context.c +++ b/mail/em-filter-context.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h index 6b2e4f18fd..56f11a3d81 100644 --- a/mail/em-filter-context.h +++ b/mail/em-filter-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c index 4a92a65c58..4f68cf47df 100644 --- a/mail/em-filter-editor.c +++ b/mail/em-filter-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -141,7 +141,7 @@ select_source (GtkComboBox *combobox, EMFilterEditor *fe) idx = gtk_combo_box_get_active (combobox); sources = g_object_get_data (G_OBJECT (combobox), "sources"); - + g_return_if_fail (idx >= 0 && idx < g_slist_length (sources)); source = (char *)g_slist_nth (sources, idx); diff --git a/mail/em-filter-editor.h b/mail/em-filter-editor.h index f37536d1ee..8d9926b873 100644 --- a/mail/em-filter-editor.h +++ b/mail/em-filter-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c index a95a4dd88d..b975b81089 100644 --- a/mail/em-filter-folder-element.c +++ b/mail/em-filter-folder-element.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-folder-element.h b/mail/em-filter-folder-element.h index 8f9a2d8b4e..0d7d3b50b2 100644 --- a/mail/em-filter-folder-element.h +++ b/mail/em-filter-folder-element.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index 45dd78c708..583f82977c 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -496,7 +496,7 @@ more_parts(GtkWidget *button, struct _rule_data *data) adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w)); if (adjustment) gtk_adjustment_set_value (adjustment, adjustment->upper); - + } } } diff --git a/mail/em-filter-rule.h b/mail/em-filter-rule.h index 49e71850d6..6ddaddc8d2 100644 --- a/mail/em-filter-rule.h +++ b/mail/em-filter-rule.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index e35871638f..23a1b762cd 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-filter-source-element.h b/mail/em-filter-source-element.h index 3204b636a0..ac9a1ff911 100644 --- a/mail/em-filter-source-element.h +++ b/mail/em-filter-source-element.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 201db814ec..c835a1b593 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1476,8 +1476,8 @@ emfb_edit_select_all(BonoboUIComponent *uid, void *data, const char *path) emfb_expand_all_threads (uid, data, path); - /* The time out below is added so that the execution thread to - expand all conversations threads would've completed. + /* The time out below is added so that the execution thread to + expand all conversations threads would've completed. The timeout 505 is just to ensure that the value is a small delta more than the timeout value in expand_all_threads thread. */ diff --git a/mail/em-folder-browser.h b/mail/em-folder-browser.h index 75dbe975b5..e2c74ecf17 100644 --- a/mail/em-folder-browser.h +++ b/mail/em-folder-browser.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 56194b6af9..b0fbfc65d2 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -240,7 +240,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); gtk_widget_show (label); gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - + w = gtk_spin_button_new_with_range (G_MININT, G_MAXINT, 1.0); gtk_spin_button_set_value ((GtkSpinButton *) w, (double) prop_data->argv->argv[i].ca_int); gtk_spin_button_set_numeric ((GtkSpinButton *) w, TRUE); @@ -254,7 +254,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); gtk_widget_show (label); gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - + w = gtk_spin_button_new_with_range (G_MININT, G_MAXINT, 1.0); gtk_spin_button_set_value ((GtkSpinButton *) w, prop_data->argv->argv[i].ca_double); gtk_spin_button_set_numeric ((GtkSpinButton *) w, TRUE); diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h index 8bae3848e7..cd58a9eeb4 100644 --- a/mail/em-folder-properties.h +++ b/mail/em-folder-properties.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c index 9257c57b5d..ce97dcb85d 100644 --- a/mail/em-folder-selection-button.c +++ b/mail/em-folder-selection-button.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h index e9cd1c2a0e..c0ab32f88e 100644 --- a/mail/em-folder-selection-button.h +++ b/mail/em-folder-selection-button.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-selection.c b/mail/em-folder-selection.c index d56a470153..cfb244c2eb 100644 --- a/mail/em-folder-selection.c +++ b/mail/em-folder-selection.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-selection.h b/mail/em-folder-selection.h index 78cd300410..25c35d254b 100644 --- a/mail/em-folder-selection.h +++ b/mail/em-folder-selection.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 3762e05bf2..ae6a8965a4 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index 7b011f588c..12662ae5f7 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index e3a2eda2bc..d90bcbbacb 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h index 13114c8539..706e3895b3 100644 --- a/mail/em-folder-tree-model.h +++ b/mail/em-folder-tree-model.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index f773068613..77e62dfbcf 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1700,7 +1700,7 @@ emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) /* Traverse to the last valid iter */ titer = iter; - while (gtk_tree_model_iter_next((GtkTreeModel *) model, &iter)) + while (gtk_tree_model_iter_next((GtkTreeModel *) model, &iter)) titer = iter; /* Preserve the last valid iter */ iter = titer; diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h index b02a4d88cd..e76acf4df1 100644 --- a/mail/em-folder-tree.h +++ b/mail/em-folder-tree.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 0555fb76cc..ad60516bb1 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -408,8 +408,8 @@ em_folder_utils_delete_folder (CamelFolder *folder) em_utils_show_error_silent (dialog); return; } - - if (mail_folder_cache_get_folder_info_flags (folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM)) + + if (mail_folder_cache_get_folder_info_flags (folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM)) { e_error_run(NULL,"mail:no-delete-special-folder", folder->name, NULL); return; diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h index 4d03ce5762..c139a9e74c 100644 --- a/mail/em-folder-utils.h +++ b/mail/em-folder-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index b19057a720..d0f8289a15 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -168,7 +168,7 @@ static const EMFolderViewEnable emfv_enable_map[] = { { "MessageFilterJunk", EM_POPUP_SELECT_MANY }, { "MessageCopy", EM_POPUP_SELECT_MANY }, { "MessageDelete", EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_DELETE }, - { "MessageDeleteKey", EM_POPUP_SELECT_MANY}, + { "MessageDeleteKey", EM_POPUP_SELECT_MANY}, { "MessageForward", EM_POPUP_SELECT_MANY }, { "MessageForwardAttached", EM_POPUP_SELECT_MANY }, { "MessageForwardInline", EM_POPUP_SELECT_ONE }, @@ -511,7 +511,7 @@ em_folder_view_open_selected(EMFolderView *emfv) } if (em_utils_folder_is_drafts(emfv->folder, emfv->folder_uri) - || em_utils_folder_is_templates(emfv->folder, emfv->folder_uri) + || em_utils_folder_is_templates(emfv->folder, emfv->folder_uri) || em_utils_folder_is_outbox(emfv->folder, emfv->folder_uri)) { em_utils_edit_messages(emfv->folder, uids, TRUE); return uids->len; @@ -884,7 +884,7 @@ emfv_popup_source(EPopup *ep, EPopupItem *pitem, void *data) emmb = (EMMessageBrowser *)em_message_browser_window_new(); em_format_set_session((EMFormat *)((EMFolderView *)emmb)->preview, ((EMFormat *)emfv->preview)->session); - message_list_ensure_message (((EMFolderView *)emmb)->list, uids->pdata[0]); + message_list_ensure_message (((EMFolderView *)emmb)->list, uids->pdata[0]); em_folder_view_set_folder((EMFolderView *)emmb, emfv->folder, emfv->folder_uri); em_format_set_mode((EMFormat *)((EMFolderView *)emmb)->preview, EM_FORMAT_SOURCE); em_folder_view_set_message((EMFolderView *)emmb, uids->pdata[0], FALSE); @@ -1233,7 +1233,7 @@ emfv_popup_label_clear(EPopup *ep, EPopupItem *pitem, void *data) { EMFolderView *emfv = data; GSList *l; - EUtilLabel *label; + EUtilLabel *label; for (l = mail_config_get_labels (); l; l = l->next) { label = l->data; @@ -1365,7 +1365,7 @@ static EPopupItem emfv_popup_items[] = { { E_POPUP_BAR, (gchar *) "90.filter", NULL, NULL, NULL, NULL }, { E_POPUP_SUBMENU, (gchar *) "90.filter.00", (gchar *) N_("Crea_te Rule From Message"), NULL, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - /* Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on. */ + /* Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on. */ { E_POPUP_ITEM, (gchar *) "90.filter.00/00.00", (gchar *) N_("Search Folder based on _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, (gchar *) "90.filter.00/00.01", (gchar *) N_("Search Folder based on Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, (gchar *) "90.filter.00/00.02", (gchar *) N_("Search Folder based on _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, @@ -1373,7 +1373,7 @@ static EPopupItem emfv_popup_items[] = { emfv_popup_vfolder_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_BAR, (gchar *) "90.filter.00/10", NULL, NULL, NULL, NULL }, - /* Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on. */ + /* Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on. */ { E_POPUP_ITEM, (gchar *) "90.filter.00/10.00", (gchar *) N_("Filter based on Sub_ject"), emfv_popup_filter_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, (gchar *) "90.filter.00/10.01", (gchar *) N_("Filter based on Sen_der"), emfv_popup_filter_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, (gchar *) "90.filter.00/10.02", (gchar *) N_("Filter based on Re_cipients"), emfv_popup_filter_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY }, @@ -2610,7 +2610,7 @@ emfv_list_double_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent /* Ignore double-clicks on columns that handle thier own state */ if (MESSAGE_LIST_COLUMN_IS_ACTIVE (col)) return; - + em_folder_view_open_selected(emfv); } @@ -2931,7 +2931,7 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const if (!main_emp) main_emp = emp; } - + if (event == NULL) gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time()); else diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h index b69a4a1a05..3a7a153131 100644 --- a/mail/em-folder-view.h +++ b/mail/em-folder-view.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c index 60881396c2..9fec654ae5 100644 --- a/mail/em-format-hook.c +++ b/mail/em-format-hook.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h index 3665bbf0db..08d99dd63c 100644 --- a/mail/em-format-hook.h +++ b/mail/em-format-hook.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 8863bf7f08..8d25923658 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -186,13 +186,13 @@ efhd_gtkhtml_realise(GtkHTML *html, EMFormatHTMLDisplay *efhd) r = style->fg[state].red >> 8; g = style->fg[state].green >> 8; - b = style->fg[state].blue >> 8; + b = style->fg[state].blue >> 8; efhd->formathtml.header_colour = ((r<<16) | (g<< 8) | b) & 0xffffff; r = style->bg[state].red >> 8; g = style->bg[state].green >> 8; - b = style->bg[state].blue >> 8; + b = style->bg[state].blue >> 8; efhd->formathtml.body_colour = ((r<<16) | (g<< 8) | b) & 0xffffff; diff --git a/mail/em-format-html-display.h b/mail/em-format-html-display.h index 99234e9c1e..bd0ea0edd3 100644 --- a/mail/em-format-html-display.h +++ b/mail/em-format-html-display.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index 985828d2af..ef1bbb13c4 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format-html-print.h b/mail/em-format-html-print.h index ef25b63033..2abdc82178 100644 --- a/mail/em-format-html-print.h +++ b/mail/em-format-html-print.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/mail/em-format-html.c b/mail/em-format-html.c index d0172ea8ef..aa82851bc9 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1500,18 +1500,18 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab const char *fmt, *html; char *mhtml = NULL; gboolean is_rtl; - + if (value == NULL) return; while (*value == ' ') value++; - + if (!(flags & EM_FORMAT_HTML_HEADER_HTML)) html = mhtml = camel_text_to_html (value, emfh->text_html_flags, 0); - else + else html = value; - + is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; if (emfh->simple_headers) { fmt = "%s: %s
"; @@ -1528,7 +1528,7 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab else fmt = "%s %s"; } else { - + if (flags & EM_FORMAT_HEADER_BOLD) { if (is_rtl) fmt = "%2$s%1$s: "; @@ -1667,22 +1667,22 @@ static void canon_header_name (char *name) { char *inptr = name; - + /* canonicalise the header name... first letter is * capitalised and any letter following a '-' also gets * capitalised */ - + if (*inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; - + inptr++; - + while (*inptr) { if (inptr[-1] == '-' && *inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; else if (*inptr >= 'A' && *inptr <= 'Z') *inptr += 0x20; - + inptr++; } } @@ -1707,22 +1707,22 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct break; } } - + label = _(name); - + if (addrspec) { struct _camel_header_address *addrs; GString *html; char *img; - + buf = camel_header_unfold (header->value); if (!(addrs = camel_header_address_decode (buf, emf->charset ? emf->charset : emf->default_charset))) { g_free (buf); return; } - + g_free (buf); - + html = g_string_new(""); img = efh_format_address(efh, html, addrs, (char *)label); @@ -1732,7 +1732,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct flags |= EM_FORMAT_HTML_HEADER_NODEC; g_free (img); } - + camel_header_address_unref(addrs); txt = value = html->str; g_string_free(html, FALSE); @@ -1742,7 +1742,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct buf = camel_header_unfold (header->value); txt = value = camel_header_decode_string (buf, charset); g_free (buf); - + flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp(name, "X-evolution-mailer")) { /* pseudo-header */ @@ -1769,7 +1769,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct if (msg_offset) { char buf[256], *html; - + msg_offset += (local.tm_hour * 60) + local.tm_min; if (msg_offset >= (24 * 60) || msg_offset < 0) { /* translators: strftime format for local time equivalent in Date header display, with day */ @@ -1782,27 +1782,27 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct e_utf8_strftime(buf, sizeof(buf), msg, &local); g_free(msg); } - + html = camel_text_to_html(txt, efh->text_html_flags, 0); txt = value = g_strdup_printf("%s %s", html, buf); g_free(html); flags |= EM_FORMAT_HTML_HEADER_HTML; } - + flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp(name, "Newsgroups")) { struct _camel_header_newsgroup *ng, *scan; GString *html; - + buf = camel_header_unfold (header->value); - + if (!(ng = camel_header_newsgroups_decode (buf))) { g_free (buf); return; } - + g_free (buf); - + html = g_string_new(""); scan = ng; while (scan) { @@ -1811,9 +1811,9 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct if (scan) g_string_append_printf(html, ", "); } - + camel_header_newsgroups_free(ng); - + txt = html->str; g_string_free(html, FALSE); flags |= EM_FORMAT_HEADER_BOLD|EM_FORMAT_HTML_HEADER_HTML; @@ -1826,9 +1826,9 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct txt = value = camel_header_decode_string (buf, charset); g_free (buf); } - + efh_format_text_header(efh, stream, label, txt, flags); - + g_free (value); g_free (str_field); } @@ -1850,7 +1850,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) char *header_sender = NULL, *header_from = NULL, *name; gboolean mail_from_delegate = FALSE; const char *hdr_charset; - + if (!part) return; @@ -1863,9 +1863,9 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) "\n" "", efh->header_colour & 0xffffff); - + hdr_charset = emf->charset ? emf->charset : emf->default_charset; - + header = ((CamelMimePart *)part)->headers; while (header) { if (!g_ascii_strcasecmp (header->name, "Sender")) { @@ -1904,7 +1904,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) header = header->next; } - + if (header_sender && header_from && mail_from_delegate) { camel_stream_printf(stream, "
"); if(gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) @@ -1976,11 +1976,11 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) have_icon = TRUE; } else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) { char *cp = header->value; - + /* Skip over spaces */ while (*cp == ' ') cp++; - + face_header_value = g_base64_decode (cp, &face_header_len); face_header_value = g_realloc (face_header_value, face_header_len + 1); face_header_value[face_header_len] = 0; diff --git a/mail/em-format-html.h b/mail/em-format-html.h index 7cadd5e282..eb8aec96e9 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index 40e69022d1..85249a293c 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -271,22 +271,22 @@ static void canon_header_name (char *name) { char *inptr = name; - + /* canonicalise the header name... first letter is * capitalised and any letter following a '-' also gets * capitalised */ - + if (*inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; - + inptr++; - + while (*inptr) { if (inptr[-1] == '-' && *inptr >= 'a' && *inptr <= 'z') *inptr -= 0x20; else if (*inptr >= 'A' && *inptr <= 'Z') *inptr += 0x20; - + inptr++; } } @@ -312,24 +312,24 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const break; } } - + label = _(name); - + if (addrspec) { struct _camel_header_address *addrs; GString *html; if (!(txt = camel_medium_get_header (part, name))) return; - + buf = camel_header_unfold (txt); if (!(addrs = camel_header_address_decode (txt, emf->charset ? emf->charset : emf->default_charset))) { g_free (buf); return; } - + g_free (buf); - + html = g_string_new (""); emfq_format_address (html, addrs); camel_header_address_unref (addrs); @@ -347,15 +347,15 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const if (!(txt = camel_medium_get_header (part, "x-newsreader"))) if (!(txt = camel_medium_get_header (part, "x-mimeole"))) return; - + txt = value = camel_header_format_ctext (txt, charset); - + label = _("Mailer"); flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp (name, "Date") || !strcmp (name, "Resent-Date")) { if (!(txt = camel_medium_get_header (part, name))) return; - + flags |= EM_FORMAT_HEADER_BOLD; } else { txt = camel_medium_get_header (part, name); diff --git a/mail/em-format-quote.h b/mail/em-format-quote.h index 87f0151a50..86d277b26e 100644 --- a/mail/em-format-quote.h +++ b/mail/em-format-quote.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format.c b/mail/em-format.c index 83f0d4acfe..6b12fedae4 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-format.h b/mail/em-format.h index ce3d522ab0..e2363c2b8e 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c index daa81d356d..a1615d2d6a 100644 --- a/mail/em-html-stream.c +++ b/mail/em-html-stream.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-html-stream.h b/mail/em-html-stream.h index a8eabdda55..86baa5cfa6 100644 --- a/mail/em-html-stream.h +++ b/mail/em-html-stream.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c index 2e1a7ae2f6..b06145acc0 100644 --- a/mail/em-icon-stream.c +++ b/mail/em-icon-stream.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-icon-stream.h b/mail/em-icon-stream.h index f92bfefb54..321e0cacae 100644 --- a/mail/em-icon-stream.h +++ b/mail/em-icon-stream.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index f671159369..ffe9f676b3 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h index 062a590445..b6bc38502f 100644 --- a/mail/em-inline-filter.h +++ b/mail/em-inline-filter.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c index c4ea8b16f3..f95685e351 100644 --- a/mail/em-junk-hook.c +++ b/mail/em-junk-hook.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-junk-hook.h b/mail/em-junk-hook.h index 70926b2f11..0e467a20bd 100644 --- a/mail/em-junk-hook.h +++ b/mail/em-junk-hook.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index bb786752e5..27f27ca721 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -346,7 +346,7 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) gtk_box_pack_start ((GtkBox *)hbox, l2, FALSE, FALSE, 6); gtk_box_pack_start ((GtkBox *)hbox, entry2, FALSE, FALSE, 6); gtk_box_pack_start ((GtkBox *)vbox, hbox, FALSE, FALSE, 6); - + gtk_widget_show_all (vbox); gtk_container_add ((GtkContainer *)((GtkDialog *)dialog)->vbox, vbox); response = gtk_dialog_run ((GtkDialog *)dialog); @@ -355,9 +355,9 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) const char *value = gtk_entry_get_text ((GtkEntry *)entry2); char *tok; GSList *list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); - + /* FIXME: Validate the values */ - + tok = g_strdup_printf ("%s=%s", name, value); list = g_slist_append (list, tok); gconf_client_set_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, list, NULL); @@ -395,7 +395,7 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data) if (strcmp (test, value) == 0) break; } - + prev = node; node = node->next; } diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h index 3b52d9f40a..10503a8461 100644 --- a/mail/em-mailer-prefs.h +++ b/mail/em-mailer-prefs.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -123,7 +123,7 @@ struct _EMMailerPrefs { struct _GtkToggleButton *check_incoming; struct _GtkToggleButton *empty_junk; struct _GtkComboBox *empty_junk_days; - + struct _GtkToggleButton *sa_local_tests_only; struct _GtkToggleButton *sa_use_daemon; struct _GtkComboBox *default_junk_plugin; diff --git a/mail/em-menu.c b/mail/em-menu.c index fc2e43d455..b504bd3304 100644 --- a/mail/em-menu.c +++ b/mail/em-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-menu.h b/mail/em-menu.h index 08467fefd8..cdcc12bcae 100644 --- a/mail/em-menu.h +++ b/mail/em-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c index 973708bc2b..9299f3754f 100644 --- a/mail/em-message-browser.c +++ b/mail/em-message-browser.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-message-browser.h b/mail/em-message-browser.h index cf00a74a75..d394adc9ba 100644 --- a/mail/em-message-browser.h +++ b/mail/em-message-browser.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 974c8b97a8..3f5beb3f84 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1130,7 +1130,7 @@ em_migrate_setup_progress_dialog (const char *title, const char *desc) gtk_label_set_markup (GTK_LABEL (w), markup); gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0); g_free (markup); - + w = gtk_label_new (desc); gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0); gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); @@ -1139,7 +1139,7 @@ em_migrate_setup_progress_dialog (const char *title, const char *desc) /* Progress bar */ w = gtk_vbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0); - + label = GTK_LABEL (gtk_label_new ("")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); gtk_label_set_line_wrap (label, TRUE); @@ -2785,7 +2785,7 @@ migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const tmp = g_strdup_printf ("%s/%s", acc, fi->full_name); em_migrate_set_folder_name (tmp); g_free (tmp); - + progress = (double) (*nth_folder) / total_folders; g_idle_add ((GSourceFunc) update_progress_in_main_thread, &progress); @@ -2823,7 +2823,7 @@ setup_local_store (MailComponent *mc) CamelURL *url; char *tmp; CamelStore *store; - + url = camel_url_new("mbox:", NULL); tmp = g_build_filename (mail_component_peek_base_directory(mc), "local", NULL); camel_url_set_path(url, tmp); @@ -2833,7 +2833,7 @@ setup_local_store (MailComponent *mc) g_free(tmp); return store; - + } struct migrate_folders_to_db_structure { @@ -2844,13 +2844,13 @@ struct migrate_folders_to_db_structure { gboolean done; gboolean is_local_store; }; - + static void migrate_folders_to_db_thread (struct migrate_folders_to_db_structure *migrate_dbs) { int num_of_folders = 0, nth_folder = 0; count_folders (migrate_dbs->info, &num_of_folders); - migrate_folders (migrate_dbs->store, migrate_dbs->is_local_store, migrate_dbs->info, - migrate_dbs->account_name, &(migrate_dbs->ex), &(migrate_dbs->done), + migrate_folders (migrate_dbs->store, migrate_dbs->is_local_store, migrate_dbs->info, + migrate_dbs->account_name, &(migrate_dbs->ex), &(migrate_dbs->done), &nth_folder, num_of_folders); } @@ -2877,7 +2877,7 @@ migrate_to_db() "patient while Evolution migrates your folders...")); store = setup_local_store (component); - info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL); + info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL); if (info) { GThread *thread; @@ -2885,7 +2885,7 @@ migrate_to_db() if (g_str_has_suffix (((CamelService *)store)->url->path, ".evolution/mail/local")) migrate_dbs.is_local_store = TRUE; - else + else migrate_dbs.is_local_store = FALSE; camel_exception_init (&migrate_dbs.ex); migrate_dbs.account_name = _("On This Computer"); @@ -2941,7 +2941,7 @@ migrate_to_db() g_object_unref (iter); em_migrate_close_progress_dialog (); } - + int em_migrate (const char *evolution_dir, int major, int minor, int revision, CamelException *ex) diff --git a/mail/em-migrate.h b/mail/em-migrate.h index c755ef9b39..238f4fda1c 100644 --- a/mail/em-migrate.h +++ b/mail/em-migrate.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c index 01fbd87547..b0c51ed863 100644 --- a/mail/em-network-prefs.c +++ b/mail/em-network-prefs.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -76,7 +76,7 @@ GType em_network_prefs_get_type (void) { static GType type = 0; - + if (!type) { static const GTypeInfo info = { sizeof (EMNetworkPrefsClass), @@ -87,10 +87,10 @@ em_network_prefs_get_type (void) 0, (GInstanceInitFunc) em_network_prefs_init, }; - + type = g_type_register_static (gtk_vbox_get_type (), "EMNetworkPrefs", &info, 0); } - + return type; } @@ -99,9 +99,9 @@ em_network_prefs_class_init (EMNetworkPrefsClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass); - + parent_class = g_type_class_ref (gtk_vbox_get_type ()); - + object_class->destroy = em_network_prefs_destroy; gobject_class->finalize = em_network_prefs_finalise; } @@ -116,7 +116,7 @@ static void em_network_prefs_finalise (GObject *obj) { d(g_print ("Network preferences finalize is called\n")); - + /* do something here */ G_OBJECT_CLASS (parent_class)->finalize (obj); } @@ -133,7 +133,7 @@ static void toggle_button_toggled (GtkToggleButton *toggle, EMNetworkPrefs *prefs) { const char *key; - + key = g_object_get_data ((GObject *) toggle, "key"); gconf_client_set_bool (prefs->gconf, key, gtk_toggle_button_get_active (toggle), NULL); if (toggle == prefs->use_auth) { @@ -149,13 +149,13 @@ static void toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const char *key) { gboolean bool; - + bool = gconf_client_get_bool (prefs->gconf, key, NULL); gtk_toggle_button_set_active (toggle, bool); - + g_object_set_data ((GObject *) toggle, "key", (void *) key); g_signal_connect (toggle, "toggled", G_CALLBACK (toggle_button_toggled), prefs); - + if (!gconf_client_key_is_writable (prefs->gconf, key, NULL)) gtk_widget_set_sensitive ((GtkWidget *) toggle, FALSE); } @@ -176,9 +176,9 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs, NetworkConfigProxyType type, gboo gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy_url, sensitivity); d(g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity)); } else -#endif +#endif if (type == NETWORK_PROXY_MANUAL) { - gboolean state; + gboolean state; gtk_widget_set_sensitive ((GtkWidget *) prefs->http_host, sensitivity); gtk_widget_set_sensitive ((GtkWidget *) prefs->https_host, sensitivity); @@ -239,11 +239,11 @@ notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs) emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, TRUE); } - if (type != NETWORK_PROXY_DIRECT_CONNECTION) + if (type != NETWORK_PROXY_DIRECT_CONNECTION) gconf_client_set_bool (prefs->gconf, GCONF_E_USE_PROXY_KEY, TRUE, NULL); else if (type != NETWORK_PROXY_SYS_SETTINGS) gconf_client_set_bool (prefs->gconf, GCONF_E_USE_PROXY_KEY, FALSE, NULL); - + } static void @@ -253,8 +253,8 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data) int port = -1; GConfClient *gconf = mail_config_get_gconf_client (); - /* - Do not change the order of comparison - + /* + Do not change the order of comparison - GtkSpinButton is an extended form of GtkEntry */ if (GTK_IS_SPIN_BUTTON (widget)) { @@ -307,9 +307,9 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) gboolean locked; int i, val, port; char *gladefile; - + prefs->gconf = mail_config_get_gconf_client (); - + gladefile = g_build_filename (EVOLUTION_GLADEDIR, "mail-config.glade", NULL); @@ -393,32 +393,32 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) prefs->socks_port = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spnSocksPort")); prefs->lbl_socks_host = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksHost")); prefs->lbl_socks_port = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksPort")); - g_signal_connect (prefs->socks_host, "changed", + g_signal_connect (prefs->socks_host, "changed", G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_HOST_KEY); - g_signal_connect (prefs->socks_port, "value_changed", + g_signal_connect (prefs->socks_port, "value_changed", G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_PORT_KEY); #endif - + /* Manual proxy options */ - g_signal_connect (prefs->http_host, "changed", + g_signal_connect (prefs->http_host, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_HTTP_HOST_KEY); - g_signal_connect (prefs->https_host, "changed", + g_signal_connect (prefs->https_host, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_HTTPS_HOST_KEY); - g_signal_connect (prefs->ignore_hosts, "changed", + g_signal_connect (prefs->ignore_hosts, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_IGNORE_HOSTS_KEY); - g_signal_connect (prefs->http_port, "value_changed", + g_signal_connect (prefs->http_port, "value_changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_HTTP_PORT_KEY); - g_signal_connect (prefs->https_port, "value_changed", + g_signal_connect (prefs->https_port, "value_changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_HTTPS_PORT_KEY); - g_signal_connect (prefs->auth_user, "changed", + g_signal_connect (prefs->auth_user, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_AUTH_USER_KEY); - g_signal_connect (prefs->auth_pwd, "changed", + g_signal_connect (prefs->auth_pwd, "changed", G_CALLBACK(widget_entry_changed_cb), (gpointer) GCONF_E_AUTH_PWD_KEY); @@ -493,9 +493,9 @@ GtkWidget * em_network_prefs_new (void) { EMNetworkPrefs *new; - + new = (EMNetworkPrefs *) g_object_new (em_network_prefs_get_type (), NULL); em_network_prefs_construct (new); - + return (GtkWidget *) new; } diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h index 27c4e77685..3d933a7acc 100644 --- a/mail/em-network-prefs.h +++ b/mail/em-network-prefs.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -54,11 +54,11 @@ typedef enum { struct _EMNetworkPrefs { GtkVBox parent_object; - + struct _GConfClient *gconf; - + struct _GladeXML *gui; - + /* Default Behavior */ struct _GtkToggleButton *sys_proxy; struct _GtkToggleButton *no_proxy; @@ -97,9 +97,9 @@ struct _EMNetworkPrefs { struct _EMNetworkPrefsClass { GtkVBoxClass parent_class; - + /* signals */ - + }; GType em_network_prefs_get_type (void); diff --git a/mail/em-popup.c b/mail/em-popup.c index 88aadf7ba7..ad738fca57 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -624,7 +624,7 @@ emp_add_vcard (EPopup *ep, EPopupItem *item, void *data) CamelMimePart *part; CamelDataWrapper *content; CamelStreamMem *mem; - + part = ((EMPopupTargetPart *) target)->part; diff --git a/mail/em-popup.h b/mail/em-popup.h index 870055140b..cde903a4ec 100644 --- a/mail/em-popup.h +++ b/mail/em-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-search-context.c b/mail/em-search-context.c index 5bf98614c6..ac03d40a80 100644 --- a/mail/em-search-context.c +++ b/mail/em-search-context.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-search-context.h b/mail/em-search-context.h index 3df5c1d577..47dc6ea86a 100644 --- a/mail/em-search-context.h +++ b/mail/em-search-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c index 7dd8a87416..1600eeaed0 100644 --- a/mail/em-stripsig-filter.c +++ b/mail/em-stripsig-filter.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-stripsig-filter.h b/mail/em-stripsig-filter.h index be72cef3df..761d46691f 100644 --- a/mail/em-stripsig-filter.h +++ b/mail/em-stripsig-filter.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index fa68af1776..25c447d62e 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -112,7 +112,7 @@ struct _EMSubscribeNode { typedef struct _MailMsgListNode MailMsgListNode; struct _MailMsgListNode { - EDListNode node; + EDListNode node; MailMsg *msg; }; @@ -265,7 +265,7 @@ sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, int state, const d(printf("running subscribe folder '%s'\n", spath)); mail_msg_unordered_push (m); } else { - msgListNode = g_malloc0(sizeof(MailMsgListNode)); + msgListNode = g_malloc0(sizeof(MailMsgListNode)); msgListNode->msg = (MailMsg *) m; d(printf("queueing subscribe folder '%s'\n", spath)); e_dlist_addtail(&sub->subscribe, (EDListNode *)msgListNode); @@ -357,7 +357,7 @@ sub_folderinfo_exec (struct _emse_folderinfo_msg *m) if (m->seq == m->sub->seq) { camel_operation_register(m->base.cancel); - m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, + m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL | CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST, &m->base.ex); camel_operation_unregister(m->base.cancel); } @@ -560,7 +560,7 @@ static void sub_destroy(GtkWidget *w, EMSubscribe *sub) { struct _zsubscribe_msg *m; - MailMsgListNode *msgListNode; + MailMsgListNode *msgListNode; d(printf("subscribe closed\n")); sub->cancel = TRUE; diff --git a/mail/em-subscribe-editor.h b/mail/em-subscribe-editor.h index aa9c9a2c2d..36710ec0c5 100644 --- a/mail/em-subscribe-editor.h +++ b/mail/em-subscribe-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c index 311c2e1b7a..138932cfc7 100644 --- a/mail/em-sync-stream.c +++ b/mail/em-sync-stream.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h index af513e9594..fc687fa462 100644 --- a/mail/em-sync-stream.h +++ b/mail/em-sync-stream.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-utils.c b/mail/em-utils.c index 958864647d..ba180e5011 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -648,12 +648,12 @@ em_utils_save_messages (GtkWidget *parent, CamelFolder *folder, GPtrArray *uids) info = camel_folder_get_message_info (folder, uids->pdata[0]); if (info) { filename = g_strdup (camel_message_info_subject (info)); - e_filename_make_safe (filename); + e_filename_make_safe (filename); camel_message_info_free (info); } filesel = e_file_get_save_filesel (parent, _("Save Message..."), filename, GTK_FILE_CHOOSER_ACTION_SAVE); - if (filename) + if (filename) g_free (filename); camel_object_ref(folder); @@ -1386,15 +1386,15 @@ em_utils_folder_is_templates (CamelFolder *folder, const char *uri) if (folder == mail_component_get_folder (NULL, MAIL_COMPONENT_FOLDER_TEMPLATES)) return TRUE; - + if (uri == NULL) return FALSE; - + accounts = mail_config_get_accounts(); iter = e_list_get_iterator ((EList *)accounts); while (e_iterator_is_valid (iter)) { account = (EAccount *)e_iterator_get (iter); - + if (account->templates_folder_uri) { templates_uri = em_uri_to_camel (account->templates_folder_uri); if (camel_store_folder_uri_equal (folder->parent_store, templates_uri, uri)) { @@ -1404,15 +1404,15 @@ em_utils_folder_is_templates (CamelFolder *folder, const char *uri) } g_free (templates_uri); } - + e_iterator_next (iter); } - + g_object_unref (iter); - + return is; } - + /** * em_utils_folder_is_drafts: * @folder: folder diff --git a/mail/em-utils.h b/mail/em-utils.h index d64c411a5f..1b60205168 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-vfolder-context.c b/mail/em-vfolder-context.c index 88c97b0a0f..e317b5cabf 100644 --- a/mail/em-vfolder-context.c +++ b/mail/em-vfolder-context.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-vfolder-context.h b/mail/em-vfolder-context.h index 50ce239fb6..7f17f4e2b4 100644 --- a/mail/em-vfolder-context.h +++ b/mail/em-vfolder-context.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c index b0614d937f..dcc6f03e75 100644 --- a/mail/em-vfolder-editor.c +++ b/mail/em-vfolder-editor.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-vfolder-editor.h b/mail/em-vfolder-editor.h index bbdb6ffce8..58bcd566a1 100644 --- a/mail/em-vfolder-editor.h +++ b/mail/em-vfolder-editor.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index bddb08f75e..03f46afff8 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h index bc6a330c4b..9274c94b5c 100644 --- a/mail/em-vfolder-rule.h +++ b/mail/em-vfolder-rule.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 156c8d08cb..39bfd7bc3f 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index 2943772b68..f42afec151 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index 44db11fb56..29a2dddd97 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index c01c3ab51f..f108967ebc 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index e040a4060e..3a4e6d9cc1 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index eb8caa78d9..53a0411f08 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Michael Zucchi diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h index bae8bd8313..c12539a9d2 100644 --- a/mail/mail-autofilter.h +++ b/mail/mail-autofilter.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c index 04d44e9725..268f0b5e3c 100644 --- a/mail/mail-component-factory.c +++ b/mail/mail-component-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-component.c b/mail/mail-component.c index 2fd85ec5a5..698cc940f8 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1317,7 +1317,7 @@ mail_component_init (MailComponent *component) priv->mail_sync_in_progress = 0; if (g_getenv("CAMEL_FLUSH_CHANGES")) priv->mail_sync_id = g_timeout_add_seconds (mail_config_get_sync_timeout (), call_mail_sync, component); - else + else priv->mail_sync_id = 0; } diff --git a/mail/mail-component.h b/mail/mail-component.h index c1215c61c4..9af5caa40f 100644 --- a/mail/mail-component.h +++ b/mail/mail-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c index 74c05ec8fc..f89383580c 100644 --- a/mail/mail-config-factory.c +++ b/mail/mail-config-factory.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-config-factory.h b/mail/mail-config-factory.h index f3a4b5fd29..430058364e 100644 --- a/mail/mail-config-factory.h +++ b/mail/mail-config-factory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-config.c b/mail/mail-config.c index 62f6ba6eb3..bcf8dd7854 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -423,7 +423,7 @@ mail_config_init (void) config->gconf, key, func, &config->error_time, NULL, NULL); config->error_time = - gconf_client_get_int (config->gconf, key, NULL); + gconf_client_get_int (config->gconf, key, NULL); key = "/apps/evolution/mail/display/error_level"; func = (GConfClientNotifyFunc) gconf_int_value_changed; @@ -431,7 +431,7 @@ mail_config_init (void) config->gconf, key, func, &config->error_level, NULL, NULL); config->error_level = - gconf_client_get_int (config->gconf, key, NULL); + gconf_client_get_int (config->gconf, key, NULL); key = "/apps/evolution/mail/display/force_message_limit"; func = (GConfClientNotifyFunc) gconf_bool_value_changed; @@ -678,7 +678,7 @@ mail_config_get_address_count (void) guint mail_config_get_error_timeout (void) -{ +{ if (!config) mail_config_init (); @@ -687,7 +687,7 @@ mail_config_get_error_timeout (void) guint mail_config_get_error_level (void) -{ +{ if (!config) mail_config_init (); @@ -1206,7 +1206,7 @@ mail_config_reload_junk_headers (void) /* It automatically sets in the session */ if (config == NULL) mail_config_init (); - else + else gconf_jh_check_changed (config->gconf, 0, NULL, config); } diff --git a/mail/mail-config.h b/mail/mail-config.h index 81f245170e..aea5c5da94 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c index d7350eaa2a..f484e0a5d8 100644 --- a/mail/mail-crypto.c +++ b/mail/mail-crypto.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h index dbe1e6f86b..a6ba393bf7 100644 --- a/mail/mail-crypto.h +++ b/mail/mail-crypto.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index ed3d583927..a84dfcbf74 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1045,7 +1045,7 @@ int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp) return fi.fi != NULL; } -gboolean +gboolean mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags) { char *uri = mail_tools_folder_to_url (folder); @@ -1061,7 +1061,7 @@ mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags) if (flags) { if (fi.fi) { *flags = fi.fi->flags; - } + } } UNLOCK(info_lock); diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h index c0f7e866cf..932f5c3f78 100644 --- a/mail/mail-folder-cache.h +++ b/mail/mail-folder-cache.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 6388a56938..ed7e257fba 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/mail/mail-mt.h b/mail/mail-mt.h index b95620a000..ed23c3beeb 100644 --- a/mail/mail-mt.h +++ b/mail/mail-mt.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-ops.c b/mail/mail-ops.c index d2183dd7e3..4f310db812 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -1,5 +1,5 @@ /* - * mail-ops.c: callbacks for the mail toolbar/menus + * mail-ops.c: callbacks for the mail toolbar/menus * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -721,7 +721,7 @@ send_queue_exec (struct _send_queue_msg *m) camel_operation_register (m->cancel); else camel_operation_register (m->base.cancel); - + if (!m->cancel) camel_operation_start (NULL, _("Sending message")); @@ -783,7 +783,7 @@ send_queue_exec (struct _send_queue_msg *m) camel_folder_sync (sent_folder, FALSE, &ex); camel_exception_clear (&ex); } - + if (!m->cancel) camel_operation_end (NULL); @@ -791,7 +791,7 @@ send_queue_exec (struct _send_queue_msg *m) camel_operation_unregister (m->cancel); else camel_operation_unregister (m->base.cancel); - + } static void @@ -2463,7 +2463,7 @@ prepare_offline_exec (struct _set_offline_msg *m) } else if (CAMEL_IS_OFFLINE_STORE (m->store)) { camel_offline_store_prepare_for_offline (CAMEL_OFFLINE_STORE (m->store), &m->base.ex); - } + } } static void diff --git a/mail/mail-ops.h b/mail/mail-ops.h index df92df4e32..39905fb06c 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 655f1dbf72..be834bb0d3 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -416,7 +416,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati g_object_unref (iter); /* Check to see if we have to send any mails --- if we don't, don't display the SMTP row in the table */ - if (outbox && destination + if (outbox && destination && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) == 0) num_sources--; @@ -545,7 +545,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target); /* Skip displaying the SMTP row if we've got no outbox, destination or unsent mails */ - if (outbox && destination + if (outbox && destination && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) != 0) { info = g_hash_table_lookup (data->active, SEND_URI_KEY); if (info == NULL) { @@ -1196,7 +1196,7 @@ mail_send (void) info->status_label = NULL; info->uri = g_strdup (transport->url); info->keep_on_server = FALSE; - info->cancel = NULL; + info->cancel = NULL; info->cancel_button = NULL; info->data = data; info->state = SEND_ACTIVE; diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h index 4fc4e991ec..a31abe79ed 100644 --- a/mail/mail-send-recv.h +++ b/mail/mail-send-recv.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-session.c b/mail/mail-session.c index 03277b4b6f..d9e34ccff4 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-session.h b/mail/mail-session.h index a2a5e9706f..60d6b9ab2a 100644 --- a/mail/mail-session.h +++ b/mail/mail-session.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c index daee1db92c..401f26feed 100644 --- a/mail/mail-signature-editor.c +++ b/mail/mail-signature-editor.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-signature-editor.h b/mail/mail-signature-editor.h index 649504be18..82c786c90e 100644 --- a/mail/mail-signature-editor.h +++ b/mail/mail-signature-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-tools.c b/mail/mail-tools.c index 7278829501..a256e7e107 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-tools.h b/mail/mail-tools.h index 794c1d4735..1590636e5c 100644 --- a/mail/mail-tools.h +++ b/mail/mail-tools.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-types.h b/mail/mail-types.h index 1873dc8d00..6acbeaf43a 100644 --- a/mail/mail-types.h +++ b/mail/mail-types.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index d6b20580b2..aab8625807 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h index b0f684e721..002541371f 100644 --- a/mail/mail-vfolder.h +++ b/mail/mail-vfolder.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/message-list.c b/mail/message-list.c index f9a0e9259b..09f080cae0 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -2609,7 +2609,7 @@ clear_tree (MessageList *ml, gboolean tfree) ml->tree_root = e_tree_memory_node_insert (E_TREE_MEMORY(etm), NULL, 0, NULL); if (tfree) - e_tree_model_rebuilt (E_TREE_MODEL(etm)); + e_tree_model_rebuilt (E_TREE_MODEL(etm)); #ifdef TIMEIT gettimeofday(&end, NULL); diff = end.tv_sec * 1000 + end.tv_usec/1000; @@ -3573,7 +3573,7 @@ message_list_get_uids(MessageList *ml) ml, g_ptr_array_new() }; - + e_tree_path_foreach(ml->tree, ml_getselected_cb, &data); if (ml->folder && data.uids->len) @@ -3589,11 +3589,11 @@ message_list_get_selected(MessageList *ml) ml, g_ptr_array_new() }; - + e_tree_selected_path_foreach(ml->tree, ml_getselected_cb, &data); if (ml->folder && data.uids->len) - camel_folder_sort_uids (ml->folder, data.uids); + camel_folder_sort_uids (ml->folder, data.uids); return data.uids; } @@ -4282,7 +4282,7 @@ regen_list_done (struct _regen_list_msg *m) if (m->last_row >= e_table_model_row_count (E_TABLE_MODEL (etta))) m->last_row = e_table_model_row_count (E_TABLE_MODEL (etta)) - 1; - + if (m->last_row >= 0) { ETreePath path; diff --git a/mail/message-list.h b/mail/message-list.h index 15dae0fcb7..4d0866fe20 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c index 71d2ae41c8..d3a1d15bfe 100644 --- a/mail/message-tag-editor.c +++ b/mail/message-tag-editor.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h index 019c7e2e63..30d3ec1e9b 100644 --- a/mail/message-tag-editor.h +++ b/mail/message-tag-editor.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index 46b6268cc3..827fc6813a 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h index 4b18865d89..5c229fe36e 100644 --- a/mail/message-tag-followup.h +++ b/mail/message-tag-followup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c index 0a9ee8b79e..3bccf0a229 100644 --- a/plugins/addressbook-file/addressbook-file.c +++ b/plugins/addressbook-file/addressbook-file.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index 08c1956303..ccf14beb30 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 5fa9133d72..c4c3c098ae 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index f9745e8972..59c04a605b 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -83,7 +83,7 @@ sanity_check (const char *filename) g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result); return WIFEXITED (result) && (WEXITSTATUS (result) == 0); -#else +#else return result; #endif } @@ -125,7 +125,7 @@ epbr_perform_pre_backup_checks (char* dir) #ifdef G_OS_WIN32 return TRUE; #else - return (g_access (dir, W_OK) == 0); + return (g_access (dir, W_OK) == 0); #endif } diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 7e7cc50461..19e9e98bb1 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -11,13 +11,13 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - + #ifdef HAVE_CONFIG_H #include #endif @@ -182,7 +182,7 @@ backup (const char *filename) g_return_if_fail (filename && *filename); quotedfname = g_shell_quote(filename); - + CANCEL (complete); txt = _("Shutting down Evolution"); /* FIXME Will the versioned setting always work? */ @@ -226,10 +226,10 @@ restore (const char *filename) { char *command; char *quotedfname; - + g_return_if_fail (filename && *filename); quotedfname = g_shell_quote(filename); - + /* FIXME Will the versioned setting always work? */ CANCEL (complete); txt = _("Shutting down Evolution"); @@ -281,7 +281,7 @@ check (const char *filename) g_return_if_fail (filename && *filename); quotedfname = g_shell_quote(filename); - + command = g_strdup_printf ("tar ztf %s | grep -e \"^\\.evolution/$\"", quotedfname); result = system (command); g_free (command); @@ -294,7 +294,7 @@ check (const char *filename) result = system (command); g_free (command); g_free (quotedfname); - + g_message ("Second result %d", result); } diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 679f30466d..2f375ac43b 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index 55c88709b0..62887a8ed0 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index d0b6b180dd..d23749de66 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -6,7 +6,7 @@ * don't already have a buddy icon defined for a person. * * This works today (25 October 2004), but is pretty sure to break - * later on as the Gaim buddylist file format shifts. + * later on as the Gaim buddylist file format shifts. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,7 +19,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -452,7 +452,7 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked) } - if (is_blocked) + if (is_blocked) free_gaim_body (gb); else *buddies = g_list_prepend (*buddies, gb); diff --git a/plugins/bbdb/test-evobuddy.c b/plugins/bbdb/test-evobuddy.c index f7739faea7..9d14aabebe 100644 --- a/plugins/bbdb/test-evobuddy.c +++ b/plugins/bbdb/test-evobuddy.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 8f520bdff9..77aa377751 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -103,7 +103,7 @@ init_db () camel_mime_parser_init_with_stream (parser, stream); camel_mime_parser_scan_from (parser, FALSE); camel_object_unref (stream); - + camel_mime_part_construct_from_parser ((CamelMimePart *) msg, parser); camel_object_unref (parser); @@ -130,7 +130,7 @@ pipe_to_bogofilter (CamelMimeMessage *msg, const gchar **argv, GError **error) gint res; static gboolean only_once = FALSE; -retry: +retry: if (camel_debug_start ("junk")) { int i; @@ -184,7 +184,7 @@ retry: sleep (1); waitres = waitpid (child_pid, &status, WNOHANG); g_set_error (error, EM_JUNK_ERROR, -2, _("Bogofilter child process does not respond, killing...")); - } else + } else g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for Bogofilter child process interrupted, terminating...")); } @@ -209,7 +209,7 @@ retry: goto retry; } g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to Bogofilter failed, error code: %d."), res); - + } return res; diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index e3d2c52ab4..1dd5ae35b5 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c index 33fef89cc4..6670d23293 100644 --- a/plugins/calendar-file/calendar-file.c +++ b/plugins/calendar-file/calendar-file.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/copy-tool/copy-tool.c b/plugins/copy-tool/copy-tool.c index 052722f4eb..1f33ba71db 100644 --- a/plugins/copy-tool/copy-tool.c +++ b/plugins/copy-tool/copy-tool.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/default-mailer/default-mailer.c b/plugins/default-mailer/default-mailer.c index f52bd30855..8d383639ff 100644 --- a/plugins/default-mailer/default-mailer.c +++ b/plugins/default-mailer/default-mailer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c index 132203cd38..a3611cc730 100644 --- a/plugins/default-source/default-source.c +++ b/plugins/default-source/default-source.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index abfd453197..7b065e0de5 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -92,7 +92,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable) return 0; } -static void +static void epech_get_widgets_data (CustomHeaderOptionsDialog *mch) { EmailCustomHeaderOptionsDialogPrivate *priv; @@ -115,8 +115,8 @@ epech_get_widgets_data (CustomHeaderOptionsDialog *mch) return; } -static gboolean -epech_get_widgets (CustomHeaderOptionsDialog *mch) +static gboolean +epech_get_widgets (CustomHeaderOptionsDialog *mch) { EmailCustomHeaderOptionsDialogPrivate *priv; priv = mch->priv; @@ -127,39 +127,39 @@ epech_get_widgets (CustomHeaderOptionsDialog *mch) if (!priv->main) return FALSE; - priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); - priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); + priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); + priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); #undef EMAIL_CUSTOM_HEADER return (priv->page &&priv->header_table); } -static void +static void epech_fill_widgets_with_data (CustomHeaderOptionsDialog *mch) { EmailCustomHeaderOptionsDialogPrivate *priv; HeaderValueComboBox *sub_combo_box_fill; - gint set_index_row,set_index_column; + gint set_index_row,set_index_column; priv = mch->priv; priv->help_section = g_strdup ("usage-mail"); - for (set_index_row = 0,set_index_column = 0; + for (set_index_row = 0,set_index_column = 0; set_index_column < priv->email_custom_header_details->len;set_index_column++) { sub_combo_box_fill = &g_array_index(priv->combo_box_header_value, HeaderValueComboBox,set_index_column); if (priv->flag == 0) { gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,0); } else { - gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box, + gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box, g_array_index(priv->header_index_type, gint, set_index_column)); } } } CustomHeaderOptionsDialog * -epech_dialog_new (void) +epech_dialog_new (void) { CustomHeaderOptionsDialog *mch; @@ -168,7 +168,7 @@ epech_dialog_new (void) return mch; } -GType +GType epech_dialog_get_type (void) { static GType type = 0; @@ -189,12 +189,12 @@ epech_dialog_get_type (void) type = g_type_register_static (G_TYPE_OBJECT, "CustomHeaderOptionsDialogType", &info, 0); - } + } return type; } -static void +static void epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) { EmailCustomHeaderOptionsDialogPrivate *priv; @@ -203,14 +203,14 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) mch = func_data; priv = mch->priv; - switch (state) { + switch (state) { case GTK_RESPONSE_OK: - epech_get_widgets_data (mch); + epech_get_widgets_data (mch); case GTK_RESPONSE_CANCEL: gtk_widget_hide (priv->main); gtk_widget_destroy (priv->main); g_object_unref (priv->xml); - break; + break; case GTK_RESPONSE_HELP: e_display_help ( GTK_WINDOW (priv->main), @@ -221,9 +221,9 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) g_signal_emit (G_OBJECT (func_data), signals[MCH_RESPONSE], 0, state); } -static gboolean +static gboolean epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent) -{ +{ EmailCustomHeaderOptionsDialogPrivate *priv; GtkWidget *toplevel; gchar *filename; @@ -260,12 +260,12 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent) return TRUE; } -static void +static void epech_get_header_list (CustomHeaderOptionsDialog *mch) { GConfClient *client; - client = gconf_client_get_default (); + client = gconf_client_get_default (); g_return_if_fail (GCONF_IS_CLIENT (client)); gconf_client_add_dir (client, GCONF_KEY_CUSTOM_HEADER, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); epech_load_from_gconf (client, "/apps/evolution/eplugin/email_custom_header/customHeader", mch); @@ -273,7 +273,7 @@ epech_get_header_list (CustomHeaderOptionsDialog *mch) return; } -static void +static void epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsDialog *mch) { EmailCustomHeaderOptionsDialogPrivate *priv; @@ -319,7 +319,7 @@ epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsD temp_header_details.number_of_header = pos; } -static void +static void epech_setup_widgets (CustomHeaderOptionsDialog *mch) { EmailCustomHeaderOptionsDialogPrivate *priv; @@ -345,9 +345,9 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) }; priv = mch->priv; - priv->combo_box_header_value = g_array_new (TRUE, FALSE, sizeof (HeaderValueComboBox)); + priv->combo_box_header_value = g_array_new (TRUE, FALSE, sizeof (HeaderValueComboBox)); - for (header_section_id = 0,label_row = 0,row = 0,column = 1; + for (header_section_id = 0,label_row = 0,row = 0,column = 1; header_section_id < priv->email_custom_header_details->len; header_section_id++,row++,column++) { /* To create an empty label widget. Text will be added dynamically. */ @@ -369,7 +369,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) g_array_append_val(priv->combo_box_header_value, sub_combo_box); } - for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len; + for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len; sub_index++,row_combo++,column_combo++) { temp = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,sub_index); @@ -380,7 +380,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) (GtkAttachOptions) (GTK_FILL), 0, 0); for (sub_type_index = 0; sub_type_index < temp->number_of_subtype_header; sub_type_index++) { - temp_header_value_ptr = &g_array_index(temp->sub_header_type_value, CustomSubHeader,sub_type_index); + temp_header_value_ptr = &g_array_index(temp->sub_header_type_value, CustomSubHeader,sub_type_index); str = (temp_header_value_ptr->sub_header_string_value)->str; for (i = 0; security_values[i].value != NULL; i++) { if (strcmp (str, security_values[i].value) == 0) { @@ -397,7 +397,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) } } -static void +static void epech_dialog_class_init (GObjectClass *object) { CustomHeaderOptionsDialogClass *klass; @@ -420,7 +420,7 @@ epech_dialog_class_init (GObjectClass *object) G_TYPE_INT); } -static void +static void epech_dialog_init (GObject *object) { CustomHeaderOptionsDialog *mch; @@ -435,7 +435,7 @@ epech_dialog_init (GObject *object) priv->header_table = NULL; } -static void +static void epech_dialog_finalize (GObject *object) { CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *)object; @@ -450,11 +450,11 @@ epech_dialog_finalize (GObject *object) mch->priv = NULL; } - if (parent_class->finalize) + if (parent_class->finalize) (* parent_class->finalize) (object); } -static void +static void epech_dialog_dispose (GObject *object) { CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *) object; @@ -463,9 +463,9 @@ epech_dialog_dispose (GObject *object) if (parent_class->dispose) (* parent_class->dispose) (object); -} +} -static void +static void epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gpointer data) { EMsgComposer *composer; @@ -487,15 +487,15 @@ epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gp temp_header_value_ptr = &g_array_index(temp_header_ptr->sub_header_type_value, CustomSubHeader,sub_type_index); if (sub_type_index == g_array_index(priv->header_index_type, gint, index_subtype)){ - e_msg_composer_modify_header (composer, (temp_header_ptr->header_type_value)->str, - (temp_header_value_ptr->sub_header_string_value)->str); + e_msg_composer_modify_header (composer, (temp_header_ptr->header_type_value)->str, + (temp_header_value_ptr->sub_header_string_value)->str); } } } } } -static void +static void epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data) { EMsgComposer *composer; @@ -503,7 +503,7 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data) CustomHeaderOptionsDialog *current_dialog = NULL; composer = (EMsgComposer *) user_data; - + if (!user_data || !EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (user_data)) return; @@ -515,16 +515,16 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data) if (current_dialog) { g_free (current_dialog); - current_dialog = NULL; + current_dialog = NULL; } if (new_email_custom_header_window) { g_free (new_email_custom_header_window); - new_email_custom_header_window = NULL; + new_email_custom_header_window = NULL; } } -static gint +static gint epech_check_existing_composer_window(gconstpointer compowindow, gconstpointer other_compowindow) { if ((compowindow) && (other_compowindow)){ @@ -570,7 +570,7 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp new_email_custom_header_window->epech_window = menuitem->window; new_email_custom_header_window->epech_dialog = dialog; g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data); - } + } } epech_dialog_run (dialog, GTK_WIDGET (composer)); @@ -944,7 +944,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) g_signal_connect(G_OBJECT(model), "row-changed", G_CALLBACK(header_isempty), cd); /* Populate tree view with values from gconf */ - header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL); + header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL); for (list = header_list; list; list = g_slist_next (list)) { gchar **parse_header_list; @@ -954,7 +954,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) parse_header_list = g_strsplit_set (buffer, "=,", -1); str_colon = g_strconcat (parse_header_list[0], "", NULL); gtk_list_store_set (cd->store, &iter, HEADER_KEY_COLUMN, str_colon, -1); - + for (index = 0; parse_header_list[index+1] ; ++index) { str1_colon = g_strconcat (parse_header_list[index+1], "", NULL); gtk_list_store_set (cd->store, &iter, HEADER_VALUE_COLUMN, str1_colon, -1); diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h index f828a53061..30e0f7061a 100644 --- a/plugins/email-custom-header/email-custom-header.h +++ b/plugins/email-custom-header/email-custom-header.h @@ -1,6 +1,6 @@ /* * Evolution Email custom header options - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 6785585af8..2c08341ef3 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -239,9 +239,9 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) &offline_status); if (offline_status == OFFLINE_MODE) { e_error_run (NULL, ERROR_DOMAIN ":exchange-settings-offline", NULL); - + return NULL; - } + } oof_data = g_new0 (OOFData, 1); @@ -637,7 +637,7 @@ want_mailbox_toggled (GtkWidget *toggle, EConfig *config) const char *mailbox; gtk_widget_set_sensitive (entry, is_active); - + target = (EMConfigTargetAccount *)config->target; mailbox = gtk_entry_get_text (GTK_ENTRY (entry)); @@ -898,14 +898,14 @@ org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data) } camel_url_free (url); - + exchange_config_listener_get_offline_status (exchange_global_config_listener, &offline_status); - + if (offline_status == OFFLINE_MODE) { return; } - + /* Set oof data in exchange account */ set_oof_info (); destroy_oof_data (); @@ -1122,10 +1122,10 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor if (!account) return NULL; - exchange_account_is_offline (account, &mode); - if (mode == OFFLINE_MODE) - return NULL; - + exchange_account_is_offline (account, &mode); + if (mode == OFFLINE_MODE) + return NULL; + folder_name = (char*) camel_folder_get_name (cml_folder); if (!folder_name) folder_name = g_strdup ("name"); diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c index ef0eaaef79..58af042c0c 100644 --- a/plugins/exchange-operations/exchange-calendar.c +++ b/plugins/exchange-operations/exchange-calendar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-change-password.c b/plugins/exchange-operations/exchange-change-password.c index e35ee38dee..539bd24d3a 100644 --- a/plugins/exchange-operations/exchange-change-password.c +++ b/plugins/exchange-operations/exchange-change-password.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-change-password.h b/plugins/exchange-operations/exchange-change-password.h index e2c40c0186..e320d89cf9 100644 --- a/plugins/exchange-operations/exchange-change-password.h +++ b/plugins/exchange-operations/exchange-change-password.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index 19d5846aa7..5ff53fb171 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -14,7 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h index d0048ee4a9..b5ceca2a27 100644 --- a/plugins/exchange-operations/exchange-config-listener.h +++ b/plugins/exchange-operations/exchange-config-listener.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c index f04c9d6076..1955f58eba 100644 --- a/plugins/exchange-operations/exchange-contacts.c +++ b/plugins/exchange-operations/exchange-contacts.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -503,7 +503,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target) if (authtype) { e_source_set_property (source, "auth-type", authtype); g_free (authtype); - authtype=NULL; + authtype=NULL; } e_source_set_property (source, "auth", "plain/password"); if (rename) { diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index 635e82ade7..7de3948814 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h index 56217981a8..251a09de9d 100644 --- a/plugins/exchange-operations/exchange-delegates-user.h +++ b/plugins/exchange-operations/exchange-delegates-user.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c index b1c94afb1c..4038ef0baf 100644 --- a/plugins/exchange-operations/exchange-delegates.c +++ b/plugins/exchange-operations/exchange-delegates.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-delegates.h b/plugins/exchange-operations/exchange-delegates.h index b0c6833ff7..77fc354c60 100644 --- a/plugins/exchange-operations/exchange-delegates.h +++ b/plugins/exchange-operations/exchange-delegates.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c index 11d9b84f5e..63874c793a 100644 --- a/plugins/exchange-operations/exchange-folder-permission.c +++ b/plugins/exchange-operations/exchange-folder-permission.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c index 4d3082e805..ff3634341a 100644 --- a/plugins/exchange-operations/exchange-folder-size-display.c +++ b/plugins/exchange-operations/exchange-folder-size-display.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-folder-size-display.h b/plugins/exchange-operations/exchange-folder-size-display.h index 9c10b93b5f..95c795686d 100644 --- a/plugins/exchange-operations/exchange-folder-size-display.h +++ b/plugins/exchange-operations/exchange-folder-size-display.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c index ab63a5dd3e..2f72552983 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.c +++ b/plugins/exchange-operations/exchange-folder-subscription.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-folder-subscription.h b/plugins/exchange-operations/exchange-folder-subscription.h index f4a329c19a..15323cad09 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.h +++ b/plugins/exchange-operations/exchange-folder-subscription.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index 1c2334e2dc..3362f0ae83 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c index 7b801b13e5..74d3af258e 100644 --- a/plugins/exchange-operations/exchange-mail-send-options.c +++ b/plugins/exchange-operations/exchange-mail-send-options.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c index a42e867446..553a41695e 100644 --- a/plugins/exchange-operations/exchange-operations.c +++ b/plugins/exchange-operations/exchange-operations.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h index 156339f437..c453b0b978 100644 --- a/plugins/exchange-operations/exchange-operations.h +++ b/plugins/exchange-operations/exchange-operations.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c index ddcec2d592..a83d54c517 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.c +++ b/plugins/exchange-operations/exchange-permissions-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-permissions-dialog.h b/plugins/exchange-operations/exchange-permissions-dialog.h index aa8d9bb043..18bdcd4371 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.h +++ b/plugins/exchange-operations/exchange-permissions-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c index 6ca64049ca..a9858d324a 100644 --- a/plugins/exchange-operations/exchange-send-options.c +++ b/plugins/exchange-operations/exchange-send-options.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h index 35ce50030f..b7bb9dd58b 100644 --- a/plugins/exchange-operations/exchange-send-options.h +++ b/plugins/exchange-operations/exchange-send-options.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c index e1de8f4797..9285b9680e 100644 --- a/plugins/exchange-operations/exchange-user-dialog.c +++ b/plugins/exchange-operations/exchange-user-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/plugins/exchange-operations/exchange-user-dialog.h b/plugins/exchange-operations/exchange-user-dialog.h index 453d4ca832..6bf191bc6e 100644 --- a/plugins/exchange-operations/exchange-user-dialog.h +++ b/plugins/exchange-operations/exchange-user-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/face/face.c b/plugins/face/face.c index ca3af16ab4..1b772863a4 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/folder-unsubscribe/folder-unsubscribe.c b/plugins/folder-unsubscribe/folder-unsubscribe.c index d2d83b6ec6..308aea35f0 100644 --- a/plugins/folder-unsubscribe/folder-unsubscribe.c +++ b/plugins/folder-unsubscribe/folder-unsubscribe.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c index 00b7ebc2a5..23314a44cc 100644 --- a/plugins/google-account-setup/google-contacts-source.c +++ b/plugins/google-account-setup/google-contacts-source.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/google-account-setup/google-contacts-source.h b/plugins/google-account-setup/google-contacts-source.h index 54c21d18a6..289ea0b40f 100644 --- a/plugins/google-account-setup/google-contacts-source.h +++ b/plugins/google-account-setup/google-contacts-source.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index c296ab687f..97d87c666d 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -420,7 +420,7 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) g_return_if_fail (username != NULL && *username != '\0'); tmp = g_strdup_printf (_("Enter password for user %s to access list of subscribed calendars."), username); - password = e_passwords_ask_password (_("Enter password"), "Calendar", "", tmp, + password = e_passwords_ask_password (_("Enter password"), "Calendar", "", tmp, E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_REPROMPT | E_PASSWORDS_SECRET | E_PASSWORDS_DISABLE_REMEMBER, NULL, parent); g_free (tmp); diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index fd9091c5c2..3d1fb15214 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -224,7 +224,7 @@ add_esource (const char *conf_key, GwAccountInfo *info, const char *source_name e_source_set_property (source, "refresh", str); g_free (str); - } else + } else e_source_set_property (source, "refresh", NULL); e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" ); @@ -349,7 +349,7 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, EAccount const char *poa_address; const char *new_poa_address; const char* new_group_name = a->name; - + url = camel_url_new (old_account_info->source_url, NULL); poa_address = url->host; if (!poa_address || strlen (poa_address) ==0) @@ -387,13 +387,13 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, EAccount e_source_set_property (source, "port", camel_url_get_param (new_url,"soap_port")); e_source_set_property (source, "use_ssl", camel_url_get_param (url, "use_ssl")); e_source_set_property (source, "offline_sync", camel_url_get_param (url, "offline_sync") ? "1" : "0"); - + if (a->source->auto_check) { char *str = g_strdup_printf ("%d", a->source->auto_check_time); - + e_source_set_property (source, "refresh", str); g_free (str); - } else + } else e_source_set_property (source, "refresh", NULL); e_source_list_sync (list, NULL); @@ -424,7 +424,7 @@ add_calendar_tasks_sources (GwAccountInfo *info) add_esource ("/apps/evolution/calendar/sources", info, _("Calendar"), url, NULL, FALSE); add_esource ("/apps/evolution/tasks/sources", info, _("Tasks"), url, NULL, FALSE); add_esource ("/apps/evolution/memos/sources", info, _("Notes"), url, NULL, TRUE); - + camel_url_free (url); diff --git a/plugins/groupwise-account-setup/camel-gw-listener.h b/plugins/groupwise-account-setup/camel-gw-listener.h index 16a3fbe83b..9682a6877b 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.h +++ b/plugins/groupwise-account-setup/camel-gw-listener.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c index fca171aab5..aee5e90623 100644 --- a/plugins/groupwise-account-setup/groupwise-account-setup.c +++ b/plugins/groupwise-account-setup/groupwise-account-setup.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -51,7 +51,7 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha { ESourceList *list; GSList *groups; - + list = e_source_list_new_for_gconf (client, path); groups = e_source_list_peek_groups (list); @@ -67,7 +67,7 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha if (a->source->auto_check) { char *str = g_strdup_printf ("%d",a->source->auto_check_time); - + e_source_set_property (source, "refresh", str); g_free (str); } else diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c index c5959249df..b6519c636e 100644 --- a/plugins/groupwise-features/addressbook-groupwise.c +++ b/plugins/groupwise-features/addressbook-groupwise.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index bfe295447f..29c5ed2855 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index cdfffa5e7a..3e7d522c19 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index 65eca141c6..3d66a1c518 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h index 9e3f60ce1a..43322de018 100644 --- a/plugins/groupwise-features/junk-settings.h +++ b/plugins/groupwise-features/junk-settings.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 6396685cce..cf039931a5 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -50,8 +50,8 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data) if (cnc && E_IS_GW_CONNECTION(cnc)) { id = (char *)item->user_data; - confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), NULL, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), NULL, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_YES, GTK_RESPONSE_YES, GTK_STOCK_NO, GTK_RESPONSE_NO, NULL); @@ -78,7 +78,7 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data) gtk_dialog_run (GTK_DIALOG(dialog)); gtk_widget_destroy (dialog); } - } + } } } diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c index 0e0663c801..7954f9e1a4 100644 --- a/plugins/groupwise-features/mail-send-options.c +++ b/plugins/groupwise-features/mail-send-options.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/mail-send-options.h b/plugins/groupwise-features/mail-send-options.h index 943614e995..71cacbff01 100644 --- a/plugins/groupwise-features/mail-send-options.h +++ b/plugins/groupwise-features/mail-send-options.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index 35057bfad2..67123decf4 100644 --- a/plugins/groupwise-features/process-meeting.c +++ b/plugins/groupwise-features/process-meeting.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -322,7 +322,7 @@ static EPopupItem retract_popup_items[] = { { E_POPUP_ITEM, (gchar *) "49.resend", (gchar *) N_("Rese_nd Meeting..."), on_resend_meeting, NULL, (gchar *) GTK_STOCK_EDIT, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING} }; -void +void org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target) { GSList *menus = NULL; @@ -348,7 +348,7 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target) if (! g_strrstr (uri, "groupwise://")) return ; - + comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); @@ -394,7 +394,7 @@ add_retract_data (ECalComponent *comp, const char *retract_comment, CalObjModTyp icalcomponent_add_property (icalcomp, icalprop); } -static void +static void free_thread_data (ThreadData *data) { if (data == NULL) @@ -420,10 +420,10 @@ retract_object (gpointer val) GError *error = NULL; add_retract_data (data->comp, NULL, data->mod); - + icalcomp = e_cal_component_get_icalcomponent (data->comp); icalcomponent_set_method (icalcomp, ICAL_METHOD_CANCEL); - + if (!e_cal_send_objects (data->client, icalcomp, &users, &mod_comp, &error)) { /* FIXME report error */ @@ -434,15 +434,15 @@ retract_object (gpointer val) if (mod_comp) icalcomponent_free (mod_comp); - + if (users) { g_list_foreach (users, (GFunc) g_free, NULL); g_list_free (users); } - + rid = e_cal_component_get_recurid_as_string (data->comp); e_cal_component_get_uid (data->comp, &uid); - + if (!e_cal_remove_object_with_mod (data->client, uid, rid, data->mod, &error)) { g_warning ("Unable to remove the item \n"); @@ -461,7 +461,7 @@ object_created_cb (CompEditor *ce, gpointer data) GThread *thread = NULL; int response; GError *error = NULL; - + gtk_widget_hide (GTK_WIDGET (ce)); response = e_error_run (NULL, "org.gnome.evolution.process_meeting:resend-retract", NULL); @@ -507,18 +507,18 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data) response = e_error_run (NULL, msg, NULL); if (response == GTK_RESPONSE_YES) { - mod = CALOBJ_MOD_ALL; + mod = CALOBJ_MOD_ALL; } else if (response == GTK_RESPONSE_CANCEL) { g_object_unref (comp); return; } - + data = g_new0 (ThreadData, 1); data->client = g_object_ref (event->comp_data->client); data->comp = comp; data->mod = mod; - - if (resend) + + if (resend) { guint flags = 0; char *new_uid = NULL; @@ -535,7 +535,7 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data) e_cal_component_set_uid (new_comp, new_uid); icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (new_comp)); ce = e_calendar_view_open_event_with_flags (cal_view, data->client, icalcomp, flags); - + g_signal_connect (ce, "object_created", G_CALLBACK (object_created_cb), data); g_object_unref (new_comp); g_free (new_uid); diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index e7e39ba3d5..ebcf068bf0 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h index b36d31563b..24717f8cc7 100644 --- a/plugins/groupwise-features/proxy-login.h +++ b/plugins/groupwise-features/proxy-login.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index f9588802df..7ab0095dbf 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h index 127b4cfaa0..c2bd933db4 100644 --- a/plugins/groupwise-features/proxy.h +++ b/plugins/groupwise-features/proxy.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index 24dfb1b949..33f1dd2cb4 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 8f38f2a23d..74ca71fbb4 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index a48cd10f2c..382cf75124 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index 9801adce1b..fadf37bcfb 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index 2b21b47616..a465752c95 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index ee40a7bdb7..1094bec34b 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h index 3dfdff3b2b..9a0c3642eb 100644 --- a/plugins/hula-account-setup/camel-hula-listener.h +++ b/plugins/hula-account-setup/camel-hula-listener.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c index 6518d100c7..84a7a4127c 100644 --- a/plugins/hula-account-setup/hula-account-setup.c +++ b/plugins/hula-account-setup/hula-account-setup.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index e3d20334b9..c33a02bdef 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -260,7 +260,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data) GtkTreeViewColumn *column; GtkTreeIter first, iter; gboolean use_imap = g_getenv ("USE_IMAP") != NULL; - + ui = g_new0 (EPImapFeaturesData, 1); target_account = (EMConfigTargetAccount *)data->config->target; diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c index e0f4246220..487d9f14c5 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.c +++ b/plugins/ipod-sync/evolution-ipod-sync.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/ipod-sync/evolution-ipod-sync.h b/plugins/ipod-sync/evolution-ipod-sync.h index 6fbf1e985c..662b16eff0 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.h +++ b/plugins/ipod-sync/evolution-ipod-sync.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/ipod-sync/format-handler.h b/plugins/ipod-sync/format-handler.h index d061f4ce86..145bcb7d6d 100644 --- a/plugins/ipod-sync/format-handler.h +++ b/plugins/ipod-sync/format-handler.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c index 576c8651aa..49c042f705 100644 --- a/plugins/ipod-sync/ical-format.c +++ b/plugins/ipod-sync/ical-format.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -99,7 +99,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc if (stream) g_object_unref (stream); - } + } if (error) { display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error->message); diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c index f2d597becc..1f589bfdc0 100644 --- a/plugins/ipod-sync/ipod-sync.c +++ b/plugins/ipod-sync/ipod-sync.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -256,7 +256,7 @@ org_gnome_sync_memos (EPlugin *ep, ECalPopupTargetSource *target) { if (!ipod_check_status(FALSE)) return; - + destination_save_cal (ep, target, E_CAL_SOURCE_TYPE_JOURNAL); } diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c index 26e3d49475..5f399f23e6 100644 --- a/plugins/ipod-sync/ipod.c +++ b/plugins/ipod-sync/ipod.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c index 42f3bdfa0b..8fe83d1b5a 100644 --- a/plugins/ipod-sync/sync.c +++ b/plugins/ipod-sync/sync.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -425,7 +425,7 @@ export_memos (void) g_string_free (data, TRUE); free_uri_list (uris); - + pulse (); } diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index c777f6cbb5..293c4e3fca 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -695,7 +695,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) itip_view_remove_lower_info_item (ITIP_VIEW (pitip->view), pitip->progress_info_id); pitip->progress_info_id = 0; - + /* * Only allow replies if backend doesn't do that automatically. * Only enable it for forwarded invitiations (PUBLISH) or direct @@ -834,7 +834,7 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp) if (current_source) { l = sources_conflict; - + pitip->progress_info_id = itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS, _("Opening the calendar. Please wait..")); } else { @@ -1243,8 +1243,8 @@ remove_delegate (struct _itip_puri *pitip, const char *delegate, const char *del } -static void -update_x (ECalComponent *pitip_comp, ECalComponent *comp) +static void +update_x (ECalComponent *pitip_comp, ECalComponent *comp) { icalcomponent *itip_icalcomp = e_cal_component_get_icalcomponent (pitip_comp); icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp); @@ -2053,7 +2053,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject gboolean have_alarms = FALSE; info = (struct _itip_puri *) em_format_find_puri((EMFormat *)efh, pobject->classid); - + /* Accounts */ info->accounts = itip_addresses_get (); @@ -2441,10 +2441,10 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) if (((CamelStreamMem *) mem)->buffer->len == 0) puri->vcalendar = NULL; - else + else puri->vcalendar = g_strndup ((char *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); camel_object_unref (mem); - + camel_stream_printf (target->stream, "
"); camel_stream_printf (target->stream, "", html_label, _("(map)"), html); @@ -312,9 +312,9 @@ This shoul g_free (html); #endif static void -render_name_value (GtkHTMLStream *html_stream, const char *label, const char *str, const char *icon, unsigned int html_flags) +render_name_value (GtkHTMLStream *html_stream, const gchar *label, const gchar *str, const gchar *icon, guint html_flags) { - char *value = e_text_to_html (str, html_flags); + gchar *value = e_text_to_html (str, html_flags); if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) { gtk_html_stream_printf (html_stream, "", value, label); @@ -334,9 +334,9 @@ render_name_value (GtkHTMLStream *html_stream, const char *label, const char *st } static void -render_attribute (GtkHTMLStream *html_stream, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags) +render_attribute (GtkHTMLStream *html_stream, EContact *contact, const gchar *html_label, EContactField field, const gchar *icon, guint html_flags) { - const char *str; + const gchar *str; str = e_contact_get_const (contact, field); @@ -346,15 +346,15 @@ render_attribute (GtkHTMLStream *html_stream, EContact *contact, const char *htm } static void -accum_address (GString *gstr, EContact *contact, const char *html_label, EContactField adr_field, EContactField label_field) +accum_address (GString *gstr, EContact *contact, const gchar *html_label, EContactField adr_field, EContactField label_field) { EContactAddress *adr; - const char *label; + const gchar *label; gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); label = e_contact_get_const (contact, label_field); if (label) { - char *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL); + gchar *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL); #ifdef mapping_works if (is_rtl) @@ -399,9 +399,9 @@ accum_address (GString *gstr, EContact *contact, const char *html_label, EContac } static void -accum_name_value (GString *gstr, const char *label, const char *str, const char *icon, unsigned int html_flags) +accum_name_value (GString *gstr, const gchar *label, const gchar *str, const gchar *icon, guint html_flags) { - char *value = e_text_to_html (str, html_flags); + gchar *value = e_text_to_html (str, html_flags); if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) { g_string_append_printf (gstr, "", value, label); @@ -422,9 +422,9 @@ accum_name_value (GString *gstr, const char *label, const char *str, const char static void -accum_attribute (GString *gstr, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags) +accum_attribute (GString *gstr, EContact *contact, const gchar *html_label, EContactField field, const gchar *icon, guint html_flags) { - const char *str; + const gchar *str; str = e_contact_get_const (contact, field); @@ -434,11 +434,11 @@ accum_attribute (GString *gstr, EContact *contact, const char *html_label, ECont } static void -accum_time_attribute (GString *gstr, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags) +accum_time_attribute (GString *gstr, EContact *contact, const gchar *html_label, EContactField field, const gchar *icon, guint html_flags) { EContactDate *date; GDate *gdate = NULL; - char sdate[100]; + gchar sdate[100]; date = e_contact_get (contact, field); if (date) { @@ -453,13 +453,13 @@ accum_time_attribute (GString *gstr, EContact *contact, const char *html_label, } static void -accum_multival_attribute (GString *gstr, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags) +accum_multival_attribute (GString *gstr, EContact *contact, const gchar *html_label, EContactField field, const gchar *icon, guint html_flags) { GList *val_list, *l; val_list = e_contact_get (contact, field); for (l = val_list; l; l = l->next) { - const char *str = (const char *) l->data; + const gchar *str = (const gchar *) l->data; accum_name_value (gstr, html_label, str, icon, html_flags); } g_list_foreach (val_list, (GFunc) g_free, NULL); @@ -495,7 +495,7 @@ render_contact_list (GtkHTMLStream *html_stream, EContact *contact) } static void -start_block (GtkHTMLStream *html_stream, const char *label) +start_block (GtkHTMLStream *html_stream, const gchar *label) { gtk_html_stream_printf (html_stream, "", label); } @@ -506,7 +506,7 @@ end_block (GtkHTMLStream *html_stream) gtk_html_stream_printf (html_stream, ""); } -static const char * +static const gchar * get_email_location (EVCardAttribute *attr) { gint i; @@ -526,10 +526,10 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact) GList *email_list, *l, *email_attr_list, *al; gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); #ifdef HANDLE_MAILTO_INTERNALLY - int email_num = 0; + gint email_num = 0; #endif const gchar *nl; - char *nick=NULL; + gchar *nick=NULL; gtk_html_stream_printf (html_stream, "
", classid); diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 2d714b4a1e..30dbe135cc 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -737,7 +737,7 @@ set_info_items (GtkWidget *info_box, GSList *info_items) } label = gtk_label_new (item->message); - gtk_label_set_selectable (GTK_LABEL (label), TRUE); + gtk_label_set_selectable (GTK_LABEL (label), TRUE); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6); @@ -1034,7 +1034,7 @@ itip_view_init (ItipView *view) priv->start_header = gtk_label_new (_("Start time:")); priv->start_label = gtk_label_new (NULL); gtk_label_set_selectable (GTK_LABEL (priv->start_header), TRUE); - gtk_label_set_selectable (GTK_LABEL (priv->start_label), TRUE); + gtk_label_set_selectable (GTK_LABEL (priv->start_label), TRUE); gtk_misc_set_alignment (GTK_MISC (priv->start_header), 0, 0.5); gtk_misc_set_alignment (GTK_MISC (priv->start_label), 0, 0.5); gtk_widget_show (priv->start_header); @@ -1078,7 +1078,7 @@ itip_view_init (ItipView *view) /* Description */ priv->description_label = gtk_label_new (NULL); - gtk_label_set_selectable (GTK_LABEL (priv->description_label), TRUE); + gtk_label_set_selectable (GTK_LABEL (priv->description_label), TRUE); gtk_label_set_line_wrap (GTK_LABEL (priv->description_label), TRUE); gtk_misc_set_alignment (GTK_MISC (priv->description_label), 0, 0.5); gtk_box_pack_start (GTK_BOX (vbox), priv->description_label, FALSE, FALSE, 0); @@ -1112,12 +1112,12 @@ itip_view_init (ItipView *view) gtk_box_pack_start (GTK_BOX (priv->rsvp_box), hbox, FALSE, FALSE, 0); label = gtk_label_new (NULL); - gtk_label_set_selectable (GTK_LABEL (label), TRUE); + gtk_label_set_selectable (GTK_LABEL (label), TRUE); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); priv->rsvp_comment_header = gtk_label_new (_("Comment:")); - gtk_label_set_selectable (GTK_LABEL (priv->rsvp_comment_header), TRUE); + gtk_label_set_selectable (GTK_LABEL (priv->rsvp_comment_header), TRUE); gtk_widget_set_sensitive (priv->rsvp_comment_header, FALSE); gtk_widget_show (priv->rsvp_comment_header); gtk_box_pack_start (GTK_BOX (hbox), priv->rsvp_comment_header, FALSE, FALSE, 0); @@ -2174,8 +2174,8 @@ void itip_view_set_show_free_time_check (ItipView *view, gboolean show) { g_return_if_fail (view != NULL); - g_return_if_fail (ITIP_IS_VIEW (view)); - + g_return_if_fail (ITIP_IS_VIEW (view)); + if (show) gtk_widget_show (view->priv->free_time_check); else { @@ -2196,8 +2196,8 @@ void itip_view_set_show_keep_alarm_check (ItipView *view, gboolean show) { g_return_if_fail (view != NULL); - g_return_if_fail (ITIP_IS_VIEW (view)); - + g_return_if_fail (ITIP_IS_VIEW (view)); + if (show) gtk_widget_show (view->priv->keep_alarm_check); else @@ -2219,8 +2219,8 @@ void itip_view_set_show_inherit_alarm_check (ItipView *view, gboolean show) { g_return_if_fail (view != NULL); - g_return_if_fail (ITIP_IS_VIEW (view)); - + g_return_if_fail (ITIP_IS_VIEW (view)); + if (show) gtk_widget_show (view->priv->inherit_alarm_check); else { diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h index 736119ae04..88d01204fb 100644 --- a/plugins/itip-formatter/itip-view.h +++ b/plugins/itip-formatter/itip-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/mail-account-disable/mail-account-disable.c b/plugins/mail-account-disable/mail-account-disable.c index 552bea5a6d..d03e97d0f8 100644 --- a/plugins/mail-account-disable/mail-account-disable.c +++ b/plugins/mail-account-disable/mail-account-disable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 5bb65cef18..466648d80f 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -398,8 +398,8 @@ do_properties (GtkMenuItem *item, gpointer user_data) gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); dialog = gtk_dialog_new_with_buttons (_("Mail Notification Properties"), - NULL, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + NULL, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); @@ -427,7 +427,7 @@ popup_menu_status (GtkStatusIcon *status_icon, guint button, guint activate_time #endif gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - + item = gtk_separator_menu_item_new (); gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); @@ -443,11 +443,11 @@ popup_menu_status (GtkStatusIcon *status_icon, guint button, guint activate_time } #ifdef HAVE_LIBNOTIFY -static void +static void notifyActionCallback (NotifyNotification *n, gchar *label, gpointer a) { g_static_mutex_lock (&mlock); - + gtk_status_icon_set_visible (status_icon, FALSE); g_object_unref (status_icon); @@ -457,7 +457,7 @@ notifyActionCallback (NotifyNotification *n, gchar *label, gpointer a) } status_icon = NULL; - status_count = 0; + status_count = 0; g_static_mutex_unlock (&mlock); } #endif @@ -833,11 +833,11 @@ get_cfg_widget (void) gtk_widget_show (check); gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0); -#ifdef HAVE_DBUS +#ifdef HAVE_DBUS cfg = get_config_widget_dbus (); if (cfg) gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0); -#endif +#endif cfg = get_config_widget_status (); if (cfg) gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0); @@ -868,7 +868,7 @@ org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t) g_static_mutex_lock (&mlock); -#ifdef HAVE_DBUS +#ifdef HAVE_DBUS if (is_part_enabled (GCONF_KEY_ENABLED_DBUS)) new_notify_dbus (t); #endif @@ -908,7 +908,7 @@ int e_plugin_lib_enable (EPluginLib *ep, int enable) { if (enable) { -#ifdef HAVE_DBUS +#ifdef HAVE_DBUS if (is_part_enabled (GCONF_KEY_ENABLED_DBUS)) enable_dbus (enable); #endif @@ -922,7 +922,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable) } else { #ifdef HAVE_DBUS enable_dbus (enable); -#endif +#endif enable_status (enable); enable_sound (enable); diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 44a7d8b868..5560a4cabd 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -372,7 +372,7 @@ do_mail_to_event (AsyncData *data) dt.tzid = NULL; tt2 = tt; - icaltime_adjust (&tt2, 1, 0, 0, 0); + icaltime_adjust (&tt2, 1, 0, 0, 0); dt2.value = &tt2; dt2.tzid = NULL; @@ -581,7 +581,7 @@ mail_to_event (ECalSourceType source_type, gboolean with_attendees, GPtrArray *u } } } - + if (!source) { GtkWidget *dialog; diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index 9dd5c1c57e..7dc1895389 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index c9ea67ca61..dfcf75937b 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c index 5dd92e8609..0bc95619ce 100644 --- a/plugins/mono/mono-plugin.c +++ b/plugins/mono/mono-plugin.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -108,18 +108,18 @@ epm_invoke(EPlugin *ep, const char *name, void *data) if (p->klass) { d(printf("looking up method '%s' in class\n", name)); /* class method */ - + d = mono_method_desc_new(name, FALSE); /*if (d == NULL) { g_warning("Can't create method descriptor for '%s'", name); return NULL; }*/ - + gpointer iter = NULL; MonoMethod* mono_method; d(printf ("\n\a About to get methods in klass\n\a")); - + while ((mono_method = mono_class_get_methods (p->klass, &iter))) { g_print ("\n\a Method name is : <%s>\n\a", mono_method_get_name(mono_method)); } diff --git a/plugins/mono/mono-plugin.h b/plugins/mono/mono-plugin.h index 3c11072e83..9dd8facdb3 100644 --- a/plugins/mono/mono-plugin.h +++ b/plugins/mono/mono-plugin.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c index 19af3eeb7e..54d166065b 100644 --- a/plugins/plugin-manager/plugin-manager.c +++ b/plugins/plugin-manager/plugin-manager.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -314,7 +314,7 @@ org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t) GtkTreeIter iter; GtkWidget *cfg_widget; - if (!g_getenv ("EVO_SHOW_ALL_PLUGINS")) { + if (!g_getenv ("EVO_SHOW_ALL_PLUGINS")) { /* hide ourselves always */ if (ep->flags & E_PLUGIN_FLAGS_SYSTEM_PLUGIN) continue; @@ -338,7 +338,7 @@ org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t) COL_PLUGIN_DATA, ep, COL_PLUGIN_CFG_WIDGET, cfg_widget, -1); - + } /* setup the treeview */ diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index ed4b6dc363..13453b20f1 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c index 6f52759e82..08787fc1fc 100644 --- a/plugins/profiler/profiler.c +++ b/plugins/profiler/profiler.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 8cbf80eb50..4bfe66b41f 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -98,7 +98,7 @@ void org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target, int e_plugin_lib_enable (EPluginLib *ep, int enable); -/* em-folder-selection-button.h is private, even though other internal evo plugins use it! +/* em-folder-selection-button.h is private, even though other internal evo plugins use it! so declare the functions here TODO: sort out whether this should really be private */ @@ -123,7 +123,7 @@ struct _PstImporter { CamelException ex; pst_file pst; - + CamelOperation *cancel; CamelFolder *folder; gchar *parent_uri; @@ -152,7 +152,7 @@ org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target) } s = (EImportTargetURI *)target; - + if (s->uri_src == NULL) { return TRUE; } @@ -170,7 +170,7 @@ org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target) ret = n == sizeof (pst_signature) && memcmp (signature, pst_signature, sizeof (pst_signature)) == 0; close (fd); } - + return ret; } @@ -214,8 +214,8 @@ folder_selected (EMFolderSelectionButton *button, EImportTargetURI *target) /** * Suggest a folder to import data into - * @param target - * @return + * @param target + * @return */ static gchar* get_suggested_foldername (EImportTargetURI *target) @@ -244,7 +244,7 @@ get_suggested_foldername (EImportTargetURI *target) if (pst_init (&pst, filename) == 0) { rootname = get_pst_rootname (&pst, filename); } - + g_free (filename); if (rootname != NULL) { @@ -271,7 +271,7 @@ get_suggested_foldername (EImportTargetURI *target) break; } } - + if (folder != NULL) { pst_error_msg ("Error searching for an unused folder name. uri=%s", foldername); } @@ -301,17 +301,17 @@ org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EI gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE); g_signal_connect (w, "toggled", G_CALLBACK (checkbox_mail_toggle_cb), target); gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, FALSE, 0); - + w = em_folder_selection_button_new (_("Select folder"), _("Select folder to import into")); foldername = get_suggested_foldername ((EImportTargetURI *) target); ((EImportTargetURI *) target)->uri_dest = g_strdup (foldername); em_folder_selection_button_set_selection ((EMFolderSelectionButton *) w, foldername); g_signal_connect (w, "selected", G_CALLBACK (folder_selected), target); gtk_box_pack_end ((GtkBox *) hbox, w, FALSE, FALSE, 0); - + w = gtk_label_new (_("Destination folder:")); gtk_box_pack_end ((GtkBox *) hbox, w, FALSE, TRUE, 6); - + gtk_box_pack_start ((GtkBox *) framebox, hbox, FALSE, FALSE, 0); /* Address book */ @@ -320,19 +320,19 @@ org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EI /*gtk_widget_set_sensitive ((GtkWidget *)w, FALSE);*/ /* Disable until implemented */ g_signal_connect (w, "toggled", G_CALLBACK (checkbox_addr_toggle_cb), target); gtk_box_pack_start ((GtkBox *) framebox, w, FALSE, FALSE, 0); - + /* Appointments */ w = gtk_check_button_new_with_mnemonic (_("A_ppointments")); gtk_toggle_button_set_active ((GtkToggleButton *) w, FALSE); g_signal_connect (w, "toggled", G_CALLBACK (checkbox_appt_toggle_cb), target); gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0); - + /* Tasks */ w = gtk_check_button_new_with_mnemonic (_("_Tasks")); gtk_toggle_button_set_active ((GtkToggleButton *)w, FALSE); g_signal_connect (w, "toggled", G_CALLBACK (checkbox_task_toggle_cb), target); gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0); - + /* Journal */ w = gtk_check_button_new_with_mnemonic (_("_Journal entries")); gtk_toggle_button_set_active ((GtkToggleButton *)w, FALSE); @@ -360,24 +360,24 @@ open_ecal (ECalSourceType type, char *name) ESource *primary; ESourceList *source_list; ECal *cal; - + if ((e_cal_get_sources (&source_list, type, NULL)) == 0) { g_warning ("Could not get any sources of type %s.", name); return NULL; - } - + } + primary = e_source_list_peek_source_any (source_list); - + if ((cal = e_cal_new (primary, type)) == NULL) { g_warning ("Could not create %s.", name); g_object_unref (source_list); return NULL; } - + e_cal_open (cal, TRUE, NULL); g_object_unref (primary); g_object_unref (source_list); - + return cal; } @@ -385,18 +385,18 @@ static void pst_import_import (PstImporter *m) { CamelOperation *oldcancel = NULL; - + oldcancel = camel_operation_register (m->status); - + if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-addr"))) { /* Hack - grab the first address book we can find TODO - add a selection mechanism in get_widget */ ESource *primary; ESourceList *source_list; - + if (e_book_get_addressbooks (&source_list, NULL)) { primary = e_source_list_peek_source_any (source_list); - + if ((m->addressbook = e_book_new (primary,NULL))) { e_book_open (m->addressbook, TRUE, NULL); g_object_unref (primary); @@ -406,8 +406,8 @@ pst_import_import (PstImporter *m) } } else { g_warning ("Could not get address books."); - } - } + } + } if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-appt"))) { m->calendar = open_ecal (E_CAL_SOURCE_TYPE_EVENT, "calendar"); @@ -420,10 +420,10 @@ pst_import_import (PstImporter *m) if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-journal"))) { m->journal = open_ecal (E_CAL_SOURCE_TYPE_JOURNAL, "journal"); } - + pst_import_file (m); -/* FIXME: Crashes often in here. +/* FIXME: Crashes often in here. if (m->addressbook) { g_object_unref (m->addressbook); } @@ -478,7 +478,7 @@ pst_import_file (PstImporter *m) } camel_operation_progress_count (NULL, 2); - + if ((d_ptr = pst_getTopOfFolders (&m->pst, item)) == NULL) { pst_error_msg ("Top of folders record not found. Cannot continue"); return; @@ -505,7 +505,7 @@ pst_import_folders (PstImporter *m, pst_desc_ll *topitem) /* Walk through folder tree */ while (d_ptr != NULL && (camel_operation_cancel_check (NULL) == FALSE)) { - + pst_process_item (m, d_ptr); if (d_ptr->child != NULL) { @@ -555,9 +555,9 @@ pst_process_item (PstImporter *m, pst_desc_ll *d_ptr) if (item->message_store != NULL) { pst_error_msg ("A second message_store has been found - ignored"); pst_freeItem (item); - return; + return; } - + if (item->folder != NULL) { pst_process_folder (m, item); camel_operation_start (NULL, _("Importing `%s'"), item->file_as); @@ -567,7 +567,7 @@ pst_process_item (PstImporter *m, pst_desc_ll *d_ptr) } else { camel_operation_progress (NULL, 100); } - + if (item->email != NULL && (item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT)) { @@ -599,12 +599,12 @@ pst_process_item (PstImporter *m, pst_desc_ll *d_ptr) } } - + m->current_item++; } pst_freeItem (item); - + if (d_ptr->next == NULL) { camel_operation_end (NULL); } @@ -660,7 +660,7 @@ pst_process_folder (PstImporter *m, pst_item *item) gchar *uri; g_free (m->folder_name); g_free (m->folder_uri); - + if (item->file_as != NULL) { m->folder_name = foldername_to_utf8 (item->file_as); } else { @@ -670,7 +670,7 @@ pst_process_folder (PstImporter *m, pst_item *item) uri = g_strjoin ("/", m->parent_uri, m->folder_name, NULL); m->folder_uri = uri; - + if (m->folder) { camel_object_unref (m->folder); m->folder = NULL; @@ -721,7 +721,7 @@ pst_create_folder (PstImporter *m) } m->folder = mail_tool_uri_to_folder (m->folder_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); - + } /** @@ -757,7 +757,7 @@ attachment_to_part (PstImporter *m, pst_item_attach *attach) char *buf = NULL; size_t size; size = pst_attach_to_mem (&m->pst, attach, &buf); - + camel_mime_part_set_content (part, (char*) buf, size, mimetype); free(buf); } @@ -773,7 +773,7 @@ pst_process_email (PstImporter *m, pst_item *item) CamelMultipart *mp; CamelMimePart *part; CamelMessageInfo *info; - + if (m->folder == NULL) { pst_create_folder (m); } @@ -784,7 +784,7 @@ pst_process_email (PstImporter *m, pst_item *item) if (item->email->subject != NULL) { gchar *subj; - + subj = string_to_utf8 (item->email->subject->subj); if (subj == NULL) { g_warning ("Could not convert email subject to utf8: %s", item->email->subject->subj); @@ -796,7 +796,7 @@ pst_process_email (PstImporter *m, pst_item *item) } addr = camel_internet_address_new (); - + if (item->email->outlook_sender_name != NULL && item->email->outlook_sender != NULL) { camel_internet_address_add (addr, item->email->outlook_sender_name, item->email->outlook_sender); } else if (item->email->outlook_sender_name != NULL) { @@ -807,7 +807,7 @@ pst_process_email (PstImporter *m, pst_item *item) /* Evo prints a warning if no from is set, so supply an empty address */ camel_internet_address_add (addr, "", ""); } - + camel_mime_message_set_from (msg, addr); camel_object_unref (addr); @@ -830,7 +830,7 @@ pst_process_email (PstImporter *m, pst_item *item) g_warning ("Error reading headers, skipped"); } else { - + if (item->email->sentto_address != NULL) { addr = camel_internet_address_new (); @@ -849,9 +849,9 @@ pst_process_email (PstImporter *m, pst_item *item) camel_object_unref (addr); } } - + mp = camel_multipart_new (); - + if (item->attach != NULL) { camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/mixed"); @@ -909,7 +909,7 @@ pst_process_email (PstImporter *m, pst_item *item) } else if (item->email->body) { camel_mime_part_set_content (CAMEL_MIME_PART (msg), item->email->body, strlen (item->email->body), "text/plain"); } else { - g_warning ("Email without body. Subject:%s", + g_warning ("Email without body. Subject:%s", (item->email->subject->subj ? item->email->subject->subj : "(empty)")); camel_mime_part_set_content (CAMEL_MIME_PART (msg), "\n", 1, "text/plain"); } @@ -925,7 +925,7 @@ pst_process_email (PstImporter *m, pst_item *item) if(item->email->flag && 0x08) camel_message_info_set_flags (info, CAMEL_MESSAGE_DRAFT, ~0); - + camel_folder_append_message (m->folder, msg, info, NULL, &m->ex); camel_message_info_free (info); camel_object_unref (msg); @@ -962,34 +962,34 @@ static void contact_set_address (EContact *contact, EContactField id, char *address, char *city, char *country, char *po_box, char *postal_code, char *state, char *street) { EContactAddress *eaddress; - + if (address || city || country || po_box || postal_code || state || street) { eaddress = g_new0 (EContactAddress, 1); if (po_box) { eaddress->po = g_strdup (po_box); } - //eaddress->ext = - + //eaddress->ext = + if (street) { eaddress->street = g_strdup (street); } - + if (city) { eaddress->locality = g_strdup (city); } - + if (state) { eaddress->region = g_strdup (state); } - + if (postal_code) { eaddress->code = g_strdup (postal_code); } - + if (country) { eaddress->country = g_strdup (country); } - + e_contact_set (contact, id, eaddress); } } @@ -1002,14 +1002,14 @@ contact_set_date (EContact *contact, EContactField id, FILETIME *date) struct tm tm; EContactDate *bday; bday = e_contact_date_new (); - + t1 = fileTimeToUnixTime (date, 0); gmtime_r (&t1, &tm); - + bday->year = tm.tm_year + 1900; bday->month = tm.tm_mon + 1; bday->day = tm.tm_mday; - + e_contact_set (contact, id, bday); } } @@ -1021,7 +1021,7 @@ pst_process_contact (PstImporter *m, pst_item *item) EContact *ec; c = item->contact; GString *notes; - + notes = g_string_sized_new (2048); ec = e_contact_new (); @@ -1055,27 +1055,27 @@ pst_process_contact (PstImporter *m, pst_item *item) } else { contact_set_string (ec, E_CONTACT_FULL_NAME, c->fullname); } - + /* unknown_field (ec, notes, "initials", c->initials); */ - + contact_set_string (ec, E_CONTACT_NICKNAME, c->nickname); - + contact_set_string (ec, E_CONTACT_ORG, c->company_name); contact_set_string (ec, E_CONTACT_ORG_UNIT, c->department); contact_set_string (ec, E_CONTACT_TITLE, c->job_title); - contact_set_address (ec,E_CONTACT_ADDRESS_WORK, - c->business_address, c->business_city, c->business_country, + contact_set_address (ec,E_CONTACT_ADDRESS_WORK, + c->business_address, c->business_city, c->business_country, c->business_po_box, c->business_postal_code, c->business_state, c->business_street); - - contact_set_address (ec,E_CONTACT_ADDRESS_HOME, - c->home_address, c->home_city, c->home_country, + + contact_set_address (ec,E_CONTACT_ADDRESS_HOME, + c->home_address, c->home_city, c->home_country, c->home_po_box, c->home_postal_code, c->home_state, c->home_street); - - contact_set_address (ec,E_CONTACT_ADDRESS_OTHER, - c->other_address, c->other_city, c->other_country, + + contact_set_address (ec,E_CONTACT_ADDRESS_OTHER, + c->other_address, c->other_city, c->other_country, c->other_po_box, c->other_postal_code, c->other_state, c->other_street); - + contact_set_string (ec, E_CONTACT_PHONE_ASSISTANT, c->assistant_phone); contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_FAX, c->business_fax); contact_set_string (ec, E_CONTACT_PHONE_BUSINESS, c->business_phone); @@ -1100,11 +1100,11 @@ pst_process_contact (PstImporter *m, pst_item *item) unknown_field (ec, notes, "billing_information", c->billing_information); contact_set_date (ec, E_CONTACT_BIRTH_DATE, c->birthday); /* contact_set_string (ec, E_CONTACT_CATEGORIES, c->??); */ - + contact_set_string (ec, E_CONTACT_EMAIL_1 , c->address1); contact_set_string (ec, E_CONTACT_EMAIL_2 , c->address2); contact_set_string (ec, E_CONTACT_EMAIL_3 , c->address3); - + /*unknown_field (ec, notes, "address1_desc" , c->address1_desc); unknown_field (ec, notes, "address1_transport" , c->address1_transport); unknown_field (ec, notes, "address2_desc" , c->address2_desc); @@ -1120,9 +1120,9 @@ pst_process_contact (PstImporter *m, pst_item *item) unknown_field (ec, notes, "customer_id", c->customer_id); unknown_field (ec, notes, "hobbies", c->hobbies); unknown_field (ec, notes, "followup", c->followup); - + contact_set_string (ec, E_CONTACT_FREEBUSY_URL , c->free_busy_address); - + unknown_field (ec, notes, "keyword", c->keyword); unknown_field (ec, notes, "language", c->language); unknown_field (ec, notes, "location", c->location); @@ -1134,7 +1134,7 @@ pst_process_contact (PstImporter *m, pst_item *item) unknown_field (ec, notes, "mileage", c->mileage); unknown_field (ec, notes, "org_id", c->org_id); contact_set_string (ec, E_CONTACT_ROLE, c->profession); - + contact_set_string (ec, E_CONTACT_SPOUSE , c->spouse_name); if (c->personal_homepage) { @@ -1145,7 +1145,7 @@ pst_process_contact (PstImporter *m, pst_item *item) } else if (c->business_homepage) { contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->business_homepage); } - + if (item->comment) { g_string_append_printf (notes, "%s\n", item->comment); } @@ -1156,7 +1156,7 @@ pst_process_contact (PstImporter *m, pst_item *item) contact_set_string (ec, E_CONTACT_NOTE, notes->str); g_string_free (notes, TRUE); - + e_book_add_contact (m->addressbook, ec, NULL); g_object_unref (ec); @@ -1188,7 +1188,7 @@ char *rfc2445_datetime_format (FILETIME *ft) { if (buffer == NULL) { buffer = malloc (30); // should be enough } - + stm = fileTimeToStructTM (ft); strftime (buffer, 30, "%Y%m%dT%H%M%SZ", stm); return buffer; @@ -1219,7 +1219,7 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta part = attachment_to_part(m, attach); orig_filename = camel_mime_part_get_filename(part); - + if (orig_filename == NULL) { g_warning("Ignoring unnamed attachment"); attach = attach->next; @@ -1229,10 +1229,10 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta tmp = camel_file_util_safe_filename (orig_filename); filename = g_strdup_printf ("%s-%s", uid, tmp); path = g_build_filename (store_dir, filename, NULL); - + g_free (tmp); g_free (filename); - + dirname = g_path_get_dirname(path); if (g_mkdir_with_parents(dirname, 0777) == -1) { g_warning("Could not create directory %s: %s", dirname, g_strerror(errno)); @@ -1241,7 +1241,7 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta continue; } g_free(dirname); - + if (g_access(path, F_OK) == 0) { if (g_access(path, W_OK) != 0) { g_warning("Could not write file %s - file exists", path); @@ -1249,21 +1249,21 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta continue; } } - + if (g_stat(path, &st) != -1 && !S_ISREG(st.st_mode)) { g_warning("Could not write file %s - not a file", path); attach = attach->next; continue; } - + if (!(stream = camel_stream_fs_new_with_name (path, O_WRONLY | O_CREAT | O_TRUNC, 0666))) { g_warning ("Could not create stream for file %s - %s", path, g_strerror (errno)); attach = attach->next; continue; } - + content = camel_medium_get_content_object (CAMEL_MEDIUM (part)); - + if (camel_data_wrapper_decode_to_stream (content, stream) == -1 || camel_stream_flush (stream) == -1) { @@ -1272,18 +1272,18 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta attach = attach->next; continue; } - + camel_object_unref (stream); - + uri = g_filename_to_uri (path, NULL, NULL); list = g_slist_append (list, g_strdup (uri)); g_free (uri); - + camel_object_unref (part); g_free (path); attach = attach->next; - + } g_free (store_dir); @@ -1296,13 +1296,13 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char { pst_item_appointment *a; pst_item_email *e; - + a = item->appointment; e = item->email; ECalComponentText text; struct icaltimetype tt_start, tt_end; ECalComponentDateTime dt_start, dt_end; - + if (item->create_date) { struct icaltimetype tt; tt = get_ical_date (item->create_date, FALSE); @@ -1313,7 +1313,7 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char tt = get_ical_date (item->modify_date, FALSE); e_cal_component_set_last_modified (ec, &tt); } - + if (e) { if (e->subject || e->proc_subject) { if (e->subject) { @@ -1332,11 +1332,11 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char l.data = &text; l.next = NULL; e_cal_component_set_description_list (ec, &l); - } + } } else { g_warning ("%s without subject / body!", type); } - + if (a->location) { e_cal_component_set_location (ec, a->location); } @@ -1391,19 +1391,19 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char case PST_APP_LABEL_PHONE_CALL: e_cal_component_set_categories (ec, "Phone-call"); break; } - + if (a->alarm || a->alarm_minutes) { ECalComponentAlarm *alarm; ECalComponentAlarmTrigger trigger; - + alarm = e_cal_component_alarm_new (); - + if (a->alarm_minutes) { trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START; trigger.u.rel_duration = icaldurationtype_from_int (- (a->alarm_minutes)*60); e_cal_component_alarm_set_trigger (alarm, trigger); } - + if (a->alarm) { if (a->alarm_filename) { e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_AUDIO); @@ -1414,19 +1414,19 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char e_cal_component_add_alarm (ec, alarm); e_cal_component_alarm_free(alarm); - + } - + if (a->recurrence != PST_APP_RECUR_NONE) { struct icalrecurrencetype r; GSList recur_list; - + icalrecurrencetype_clear (&r); r.interval = 1; /* Interval not implemented in libpst */ if (a->recurrence_end) { r.until = get_ical_date (a->recurrence_end, FALSE); } - + switch (a->recurrence_type) { case PST_APP_RECUR_DAILY: r.freq = ICAL_DAILY_RECURRENCE; break; @@ -1444,7 +1444,7 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char recur_list.next = NULL; e_cal_component_set_rrule_list (ec, &recur_list); } - + } static void @@ -1454,7 +1454,7 @@ pst_process_appointment (PstImporter *m, pst_item *item) ec = e_cal_component_new (); e_cal_component_set_new_vtype (ec, E_CAL_COMPONENT_EVENT); - + fill_calcomponent (m, item, ec, "appointment"); set_cal_attachments (m->calendar, ec, m, item->attach); @@ -1464,7 +1464,7 @@ pst_process_appointment (PstImporter *m, pst_item *item) } g_object_unref (ec); - + } static void @@ -1474,19 +1474,19 @@ pst_process_task (PstImporter *m, pst_item *item) ec = e_cal_component_new (); e_cal_component_set_new_vtype (ec, E_CAL_COMPONENT_TODO); - + fill_calcomponent (m, item, ec, "task"); set_cal_attachments (m->tasks, ec, m, item->attach); /* Note - libpst is missing many fields. E.g. task status, start/completion date, % complete */ - + if (!e_cal_create_object (m->tasks, e_cal_component_get_icalcomponent (ec), NULL, NULL)) { g_warning("Creation of task failed"); g_free(ec); } - + g_object_unref (ec); - + } static void @@ -1507,7 +1507,7 @@ pst_process_journal (PstImporter *m, pst_item *item) ECalComponentText text; struct icaltimetype tt_start, tt_end; ECalComponentDateTime dt_start, dt_end; - + if (j->start) { tt_start = get_ical_date (j->start, FALSE); dt_start.value = &tt_start; @@ -1515,7 +1515,7 @@ pst_process_journal (PstImporter *m, pst_item *item) e_cal_component_set_dtstart (ec, &dt_start); g_message ("journal start:%s", rfc2445_datetime_format (j->start)); } - + if (j->end) { tt_end = get_ical_date (j->end, FALSE); dt_end.value = &tt_end; @@ -1532,7 +1532,7 @@ pst_process_journal (PstImporter *m, pst_item *item) } g_object_unref (ec); - + } /* Print an error message - maybe later bring up an error dialog? */ @@ -1540,7 +1540,7 @@ static void pst_error_msg (const char *fmt, ...) { va_list ap; - + va_start (ap, fmt); g_critical (fmt, ap); va_end (ap); @@ -1628,11 +1628,11 @@ pst_import (EImport *ei, EImportTarget *target) m->import = ei; g_object_ref (m->import); m->target = target; - + m->parent_uri = NULL; m->folder_name = NULL; m->folder_uri = NULL; - + m->addressbook = NULL; m->calendar = NULL; m->tasks = NULL; @@ -1644,7 +1644,7 @@ pst_import (EImport *ei, EImportTarget *target) m->status = camel_operation_new (pst_status, m); id = m->base.seq; - + mail_msg_unordered_push (m); return id; @@ -1705,7 +1705,7 @@ pst_init (pst_file *pst, gchar *filename) DEBUG_INIT (d_log); DEBUG_REGISTER_CLOSE (); #endif - + DEBUG_ENT ("main"); if (pst_open (pst, filename) < 0) { pst_error_msg ("Error opening PST file %s", filename); diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index a901317dfb..943f0ed933 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -156,7 +156,7 @@ mount_ready_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) g_file_mount_enclosing_volume_finish (G_FILE (source_object), res, &error); if (error) { - + error_queue_add (g_strdup_printf (_("Mount of %s failed:"), ms->uri->location), error); if (ms) @@ -258,14 +258,14 @@ ask_question (GMountOperation *op, const char *message, const char *choices[]) gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", secondary); } - + if (choices) { - /* First count the items in the list then + /* First count the items in the list then * add the buttons in reverse order */ for (len = 0; choices[len] != NULL; len++) { ; } - + for (cnt = len - 1; cnt >= 0; cnt--) { gtk_dialog_add_button (GTK_DIALOG (dialog), choices[cnt], cnt); } @@ -294,7 +294,7 @@ mount_first (EPublishUri *uri, GFile *file, gboolean can_report_success) ms->can_report_success = can_report_success; g_signal_connect (ms->mount_op, "ask-password", G_CALLBACK (ask_password), ms); - g_signal_connect (ms->mount_op, "ask-question", G_CALLBACK (ask_question), ms); + g_signal_connect (ms->mount_op, "ask-question", G_CALLBACK (ask_question), ms); g_file_mount_enclosing_volume (file, G_MOUNT_MOUNT_NONE, ms->mount_op, NULL, mount_ready_cb, ms); } @@ -843,7 +843,7 @@ error_queue_show_idle (gpointer user_data) gboolean has_error = FALSE, has_info = FALSE; g_static_mutex_lock (&error_queue_lock); - + for (l = error_queue; l; l = l->next) { struct eq_data *data = l->data; diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index a4b3a44544..b28444458e 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/publish-format-fb.h b/plugins/publish-calendar/publish-format-fb.h index 4975aa107d..6d758f1465 100644 --- a/plugins/publish-calendar/publish-format-fb.h +++ b/plugins/publish-calendar/publish-format-fb.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c index 13962fc849..04e70ca8a8 100644 --- a/plugins/publish-calendar/publish-format-ical.c +++ b/plugins/publish-calendar/publish-format-ical.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/publish-format-ical.h b/plugins/publish-calendar/publish-format-ical.h index 4c32310b99..d4955ca9dd 100644 --- a/plugins/publish-calendar/publish-format-ical.h +++ b/plugins/publish-calendar/publish-format-ical.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c index 1ebe2cfefb..71b82c8e07 100644 --- a/plugins/publish-calendar/publish-location.c +++ b/plugins/publish-calendar/publish-location.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/publish-location.h b/plugins/publish-calendar/publish-location.h index 327cd986fd..a6afc2c272 100644 --- a/plugins/publish-calendar/publish-location.h +++ b/plugins/publish-calendar/publish-location.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index de58a02b5e..08e59513e8 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h index 94a1a71f00..8f45807bd8 100644 --- a/plugins/publish-calendar/url-editor-dialog.h +++ b/plugins/publish-calendar/url-editor-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c index 5e7a83fb29..ea9ab4bfb0 100644 --- a/plugins/python/python-plugin-loader.c +++ b/plugins/python/python-plugin-loader.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -26,7 +26,7 @@ #include "python-plugin-loader.h" -#define d(x) +#define d(x) static void *epp_parent_class; @@ -84,17 +84,17 @@ epp_invoke(EPlugin *ep, const char *name, void *data) p->pDict = PyModule_GetDict(p->pModule); if (epp->pClass) { - p->pClass = PyDict_GetItemString(p->pDict, epp->pClass); + p->pClass = PyDict_GetItemString(p->pDict, epp->pClass); } } if (p->pClass) { - if (PyCallable_Check(p->pClass)) - pInstance = PyObject_CallObject(p->pClass, NULL); + if (PyCallable_Check(p->pClass)) + pInstance = PyObject_CallObject(p->pClass, NULL); pValue = PyObject_CallMethod(pInstance, name, NULL); - + } else { pFunc = PyDict_GetItemString(p->pDict, name); diff --git a/plugins/python/python-plugin-loader.h b/plugins/python/python-plugin-loader.h index 86e94d667b..4f9656e119 100644 --- a/plugins/python/python-plugin-loader.h +++ b/plugins/python/python-plugin-loader.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 888ee40289..8846e8b4be 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -303,7 +303,7 @@ em_junk_sa_test_spamd_running (const gchar *binary, gboolean system) One time test to see if spamd is running with --allow-tell. The call to spamc should return 0 if it is. (Thanks to Karsten Brckelmann for the idea). -*/ +*/ static void em_junk_sa_test_allow_tell (void) { @@ -711,8 +711,8 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target) argv[4] = "--local"; pthread_mutex_lock (&em_junk_sa_report_lock); - pipe_to_sa (msg, NULL, - (no_allow_tell ? argv : argv2), + pipe_to_sa (msg, NULL, + (no_allow_tell ? argv : argv2), &target->error); pthread_mutex_unlock (&em_junk_sa_report_lock); } @@ -748,8 +748,8 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) if (no_allow_tell && em_junk_sa_local_only) argv[4] = "--local"; pthread_mutex_lock (&em_junk_sa_report_lock); - pipe_to_sa (msg, NULL, - (no_allow_tell ? argv : argv2), + pipe_to_sa (msg, NULL, + (no_allow_tell ? argv : argv2), &target->error); pthread_mutex_unlock (&em_junk_sa_report_lock); } diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 663ba12671..2f9c92d6f7 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/save-calendar/format-handler.h b/plugins/save-calendar/format-handler.h index 0174bfc078..a7bc2e8d85 100644 --- a/plugins/save-calendar/format-handler.h +++ b/plugins/save-calendar/format-handler.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index a537bf4641..f538a9e0a1 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index b1c8257a41..9c9f864a2a 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index 7e21b23f9e..e461821242 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/select-one-source/select-one-source.c b/plugins/select-one-source/select-one-source.c index e45ef2debf..c211814151 100644 --- a/plugins/select-one-source/select-one-source.c +++ b/plugins/select-one-source/select-one-source.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 766f379c6c..71fb4d4ff1 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/subject-thread/subject-thread.c b/plugins/subject-thread/subject-thread.c index 595f938414..6c008c71ae 100644 --- a/plugins/subject-thread/subject-thread.c +++ b/plugins/subject-thread/subject-thread.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 02983f1f36..a871399754 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -74,14 +74,14 @@ static void reply_with_template (EPopup *ep, EPopupItem *item, void *data); static void popup_free (EPopup *ep, GSList *l, void *data); -static GSList *fill_submenu (CamelStore *store, - CamelFolderInfo *info, - GSList *list, +static GSList *fill_submenu (CamelStore *store, + CamelFolderInfo *info, + GSList *list, EMPopupTargetSelect *t); -static GSList *append_to_menu (CamelFolder *folder, - GPtrArray *uids, - GSList *list, +static GSList *append_to_menu (CamelFolder *folder, + GPtrArray *uids, + GSList *list, EMPopupTargetSelect *t); void org_gnome_templates_popup (EPlugin *ep, EMPopupTargetSelect *t); @@ -98,7 +98,7 @@ static void key_cell_edited_callback (GtkCellRendererText *cell, gchar *path_st gchar *new_text,UIData *ui); static void value_cell_edited_callback (GtkCellRendererText *cell, gchar *path_string, - gchar *new_text,UIData *ui); + gchar *new_text,UIData *ui); static gboolean clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, UIData *ui); @@ -145,16 +145,16 @@ commit_changes (UIData *ui) while (valid) { char *keyword, *value; char *key; - + gtk_tree_model_get (model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1); gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1); /* Check if the keyword and value are not empty */ - if ((keyword) && (value) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0) + if ((keyword) && (value) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0) && (g_utf8_strlen(g_strstrip(value), -1) > 0)) { key = g_strdup_printf("%s=%s", keyword, value); clue_list = g_slist_append (clue_list, key); - } + } valid = gtk_tree_model_iter_next (model, &iter); } @@ -229,7 +229,7 @@ key_cell_edited_callback (GtkCellRendererText *cell, gtk_tree_model_get_iter_from_string (model, &iter, path_string); - gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1); + gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1); gtk_list_store_set (GTK_LIST_STORE (model), &iter, CLUE_KEYWORD_COLUMN, new_text, CLUE_VALUE_COLUMN, value, -1); @@ -249,7 +249,7 @@ value_cell_edited_callback (GtkCellRendererText *cell, model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview)); gtk_tree_model_get_iter_from_string (model, &iter, path_string); - + gtk_tree_model_get (model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1); gtk_list_store_set (GTK_LIST_STORE (model), &iter, @@ -491,9 +491,9 @@ get_content (CamelMimeMessage *message) g_free (str); return convert_str; } - else + else return str; - + } static void @@ -509,8 +509,8 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data) templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES); /* Get from the currently selected folder, the currently selected message */ - reply_to = camel_folder_get_message (userdata->t->folder, - g_ptr_array_index (userdata->t->uids, 0), + reply_to = camel_folder_get_message (userdata->t->folder, + g_ptr_array_index (userdata->t->uids, 0), NULL); /* The message we'll be using has been stored when building the menu */ @@ -525,8 +525,8 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data) header = ((CamelMimePart *)reply_to)->headers; while (header) { if (g_ascii_strncasecmp (header->name, "content-", 8) != 0) { - camel_medium_add_header((CamelMedium *) new, - header->name, + camel_medium_add_header((CamelMedium *) new, + header->name, header->value); } header = header->next; @@ -538,15 +538,15 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data) cont = get_content (template); /* Set the To: field to the same To: field of the message we are replying to. */ - camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_TO, + camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_TO, camel_mime_message_get_from (reply_to)); /* Copy the CC and BCC from the template.*/ - camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_CC, + camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_CC, camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_CC)); - camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_BCC, + camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_BCC, camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_BCC)); camel_mime_part_set_content((CamelMimePart *)new, @@ -558,7 +558,7 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data) camel_object_unref(new); } -static void +static void popup_free (EPopup *ep, GSList *l, void *data) { g_slist_free (l); @@ -588,10 +588,10 @@ static GSList /* If this uid is trashed, ignore it */ if (camel_folder_get_message_flags (folder, uid) & CAMEL_MESSAGE_DELETED) continue; - + /* Get the message for this uid */ - message = camel_folder_get_message (folder, - uid, + message = camel_folder_get_message (folder, + uid, NULL); subject = camel_mime_message_get_subject (message); @@ -617,7 +617,7 @@ static GSList return list; } -static GSList +static GSList *fill_submenu (CamelStore *store, CamelFolderInfo *info, GSList *list, EMPopupTargetSelect *t) { while (info) { @@ -629,7 +629,7 @@ static GSList item = g_slice_alloc0(sizeof(*item)); item->type = E_POPUP_SUBMENU; - item->label = folder->name; + item->label = folder->name; item->visible = EM_POPUP_SELECT_MANY | EM_POPUP_SELECT_ONE; /* To avoid having a Templates dir, we ignore the top level */ @@ -670,9 +670,9 @@ org_gnome_templates_popup (EPlugin *ep, EMPopupTargetSelect *t) templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES); - templates_info = camel_store_get_folder_info (store, - templates_folder->full_name, - CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST, + templates_info = camel_store_get_folder_info (store, + templates_folder->full_name, + CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST, NULL); /* Get subfolders and fill it */ diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index f0152862f3..ae0dc378da 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) @@ -38,7 +38,7 @@ #include #elif defined HAVE_LIBYTNEF_YTNEF_H #include -#endif +#endif #include #include diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index e2b9e17272..fa0077f807 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c index 012a541d27..79d4744c56 100644 --- a/plugins/webdav-account-setup/webdav-contacts-source.c +++ b/plugins/webdav-account-setup/webdav-contacts-source.c @@ -311,7 +311,7 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) uidata->username_entry = GTK_ENTRY(gtk_entry_new()); gtk_box_pack_start(hbox, GTK_WIDGET(uidata->username_entry), TRUE, TRUE, 0); - + hbox = GTK_BOX(gtk_hbox_new(FALSE, 10)); gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0); diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index cff9369aee..18092979d2 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h index 474dba871d..927fcf0120 100644 --- a/shell/e-component-registry.h +++ b/shell/e-component-registry.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-component-view.c b/shell/e-component-view.c index cbe59529c4..b87078e974 100644 --- a/shell/e-component-view.c +++ b/shell/e-component-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-component-view.h b/shell/e-component-view.h index 96a48d1e02..51004e489e 100644 --- a/shell/e-component-view.h +++ b/shell/e-component-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c index 09c9281ab7..9aa71d3278 100644 --- a/shell/e-config-upgrade.c +++ b/shell/e-config-upgrade.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-config-upgrade.h b/shell/e-config-upgrade.h index 27d9393058..f4580425bd 100644 --- a/shell/e-config-upgrade.h +++ b/shell/e-config-upgrade.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c index 603a8fd21f..f0fc89298c 100644 --- a/shell/e-corba-config-page.c +++ b/shell/e-corba-config-page.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-corba-config-page.h b/shell/e-corba-config-page.h index 9a6747cf22..8f0690ff69 100644 --- a/shell/e-corba-config-page.h +++ b/shell/e-corba-config-page.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-constants.h b/shell/e-shell-constants.h index 25aec79d6f..13beed8aec 100644 --- a/shell/e-shell-constants.h +++ b/shell/e-shell-constants.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index cb990f973b..74a89cc2ec 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-importer.h b/shell/e-shell-importer.h index f4489c3020..d9dffcfb0b 100644 --- a/shell/e-shell-importer.h +++ b/shell/e-shell-importer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index f7e4d3e63b..f51a565486 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 4d735eba7d..291a46c187 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-settings-dialog.h b/shell/e-shell-settings-dialog.h index 90c09627e2..55cce4a52f 100644 --- a/shell/e-shell-settings-dialog.h +++ b/shell/e-shell-settings-dialog.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 022e7ecca1..a6d071cc78 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index f284604d92..dd500efa94 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index cdd9e3b82e..6f180012cb 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-window-commands.h b/shell/e-shell-window-commands.h index 3d3843c8f0..0696a8a5d0 100644 --- a/shell/e-shell-window-commands.h +++ b/shell/e-shell-window-commands.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 548e987588..83e537c31b 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -321,7 +321,7 @@ switch_view (EShellWindow *window, ComponentView *component_view) } if (component_view->title == NULL) { - /* To translators: This is the window title and %s is the + /* To translators: This is the window title and %s is the component name. Most translators will want to keep it as is. */ title = g_strdup_printf (_("%s - Evolution"), info->button_label); gtk_window_set_title (GTK_WINDOW (window), title); @@ -343,7 +343,7 @@ switch_view (EShellWindow *window, ComponentView *component_view) /** @Event: Shell component activated or switched to. * @Id: component.activated * @Target: ESEventTargetComponent - * + * * This event is emitted whenever the shell successfully activates component * view. */ @@ -408,7 +408,7 @@ update_offline_toggle_status (EShellWindow *window) static void update_send_receive_sensitivity (EShellWindow *window) { - if (e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_OFFLINE || + if (e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_OFFLINE || e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_FORCED_OFFLINE) bonobo_ui_component_set_prop (window->priv->ui_component, "/commands/SendReceive", diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h index d94aef0f4f..869352b01c 100644 --- a/shell/e-shell-window.h +++ b/shell/e-shell-window.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell.c b/shell/e-shell.c index 061071efb8..9b4e6bc53a 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-shell.h b/shell/e-shell.h index ab16ea819e..e8451e3b5b 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -10,11 +10,11 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: - * Ettore Perazzoli + * Ettore Perazzoli * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index 7b8ba1a53a..d4c02e63ce 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-sidebar.h b/shell/e-sidebar.h index a3d3b43fee..2585592363 100644 --- a/shell/e-sidebar.h +++ b/shell/e-sidebar.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index ef58e3d659..a49d7dbdc4 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/e-user-creatable-items-handler.h b/shell/e-user-creatable-items-handler.h index 5d51612539..b9be272af1 100644 --- a/shell/e-user-creatable-items-handler.h +++ b/shell/e-user-creatable-items-handler.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/es-event.c b/shell/es-event.c index 8aeeb7b912..43a55c3fd5 100644 --- a/shell/es-event.c +++ b/shell/es-event.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/es-event.h b/shell/es-event.h index ed248d11df..5ac363b8c8 100644 --- a/shell/es-event.h +++ b/shell/es-event.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/es-menu.c b/shell/es-menu.c index ac2736b52a..3b459268a3 100644 --- a/shell/es-menu.c +++ b/shell/es-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/es-menu.h b/shell/es-menu.h index 89f60112c6..9e9e0613b0 100644 --- a/shell/es-menu.h +++ b/shell/es-menu.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-component.c b/shell/evolution-component.c index 62cddb6a32..49824c9545 100644 --- a/shell/evolution-component.c +++ b/shell/evolution-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-component.h b/shell/evolution-component.h index 9202829708..302263a657 100644 --- a/shell/evolution-component.h +++ b/shell/evolution-component.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c index 35044c9dba..a0d3f473a2 100644 --- a/shell/evolution-config-control.c +++ b/shell/evolution-config-control.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-config-control.h b/shell/evolution-config-control.h index 10e320c4a8..59d7aba210 100644 --- a/shell/evolution-config-control.h +++ b/shell/evolution-config-control.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-listener.c b/shell/evolution-listener.c index 516c04abb2..4bf9a76376 100644 --- a/shell/evolution-listener.c +++ b/shell/evolution-listener.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-listener.h b/shell/evolution-listener.h index c85ae53613..7b79b3bab8 100644 --- a/shell/evolution-listener.h +++ b/shell/evolution-listener.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c index 9dc1c3323b..a8ce855268 100644 --- a/shell/evolution-shell-component-utils.c +++ b/shell/evolution-shell-component-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h index eb04edae52..ce4fa11229 100644 --- a/shell/evolution-shell-component-utils.h +++ b/shell/evolution-shell-component-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c index 5f32241b17..06d30d5733 100644 --- a/shell/importer/evolution-importer-client.c +++ b/shell/importer/evolution-importer-client.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h index 35cde858d6..3ae4b2f7b0 100644 --- a/shell/importer/evolution-importer-client.h +++ b/shell/importer/evolution-importer-client.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c index e8256971f1..8915202d30 100644 --- a/shell/importer/evolution-importer-listener.c +++ b/shell/importer/evolution-importer-listener.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h index 7e09ff2da8..63f480e4dd 100644 --- a/shell/importer/evolution-importer-listener.h +++ b/shell/importer/evolution-importer-listener.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c index 9fb7e66f5e..f8e6847891 100644 --- a/shell/importer/evolution-importer.c +++ b/shell/importer/evolution-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h index a684aecfb2..4925fad4fc 100644 --- a/shell/importer/evolution-importer.h +++ b/shell/importer/evolution-importer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c index bce7d75fa8..d867c120b8 100644 --- a/shell/importer/evolution-intelligent-importer.c +++ b/shell/importer/evolution-intelligent-importer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/evolution-intelligent-importer.h b/shell/importer/evolution-intelligent-importer.h index 35ad7d0010..2d36d498e9 100644 --- a/shell/importer/evolution-intelligent-importer.h +++ b/shell/importer/evolution-intelligent-importer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c index 6503fc8ad6..20927d2742 100644 --- a/shell/importer/intelligent.c +++ b/shell/importer/intelligent.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/importer/intelligent.h b/shell/importer/intelligent.h index bbdf00cc18..5f5f7187f2 100644 --- a/shell/importer/intelligent.h +++ b/shell/importer/intelligent.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/main.c b/shell/main.c index 5ffe316c26..c6959d7663 100644 --- a/shell/main.c +++ b/shell/main.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -398,7 +398,7 @@ idle_cb (gchar **uris) bonobo_main_quit (); } - /* This must be done after Bonobo has created all the components. For + /* This must be done after Bonobo has created all the components. For * example the mail component makes the global variable `session` which * is being used by several EPlugins */ @@ -630,7 +630,7 @@ main (int argc, char **argv) client = gconf_client_get_default (); #ifdef DEVELOPMENT - + if (force_migrate) { destroy_config (client); } diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c index 16aed882d0..9fdeab7a3f 100644 --- a/shell/test/evolution-test-component.c +++ b/shell/test/evolution-test-component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/shell/test/evolution-test-component.h b/shell/test/evolution-test-component.h index 18a86f1baf..18dd40c7ff 100644 --- a/shell/test/evolution-test-component.h +++ b/shell/test/evolution-test-component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c index f0d6cea90f..f3a47e1181 100644 --- a/smime/gui/ca-trust-dialog.c +++ b/smime/gui/ca-trust-dialog.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/ca-trust-dialog.h b/smime/gui/ca-trust-dialog.h index 1ebd05e780..ec7979d818 100644 --- a/smime/gui/ca-trust-dialog.h +++ b/smime/gui/ca-trust-dialog.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c index 0b82182972..0e4af90edc 100644 --- a/smime/gui/cert-trust-dialog.c +++ b/smime/gui/cert-trust-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/cert-trust-dialog.h b/smime/gui/cert-trust-dialog.h index a9c3e9ca8b..abdeb4d2ff 100644 --- a/smime/gui/cert-trust-dialog.h +++ b/smime/gui/cert-trust-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index 2d1c8c17c4..c5261e879b 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/certificate-manager.h b/smime/gui/certificate-manager.h index 6a0898d6e2..73d3688859 100644 --- a/smime/gui/certificate-manager.h +++ b/smime/gui/certificate-manager.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c index 5c587139a5..997bbace46 100644 --- a/smime/gui/certificate-viewer.c +++ b/smime/gui/certificate-viewer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/certificate-viewer.h b/smime/gui/certificate-viewer.h index 2f088dd6c3..6cfa7f63ab 100644 --- a/smime/gui/certificate-viewer.h +++ b/smime/gui/certificate-viewer.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/component.c b/smime/gui/component.c index 339adabbbf..1096aa2a5e 100644 --- a/smime/gui/component.c +++ b/smime/gui/component.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/component.h b/smime/gui/component.h index 5a7492a342..a41c4d1209 100644 --- a/smime/gui/component.h +++ b/smime/gui/component.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c index 770f95c1cd..0ac946b5b8 100644 --- a/smime/gui/e-cert-selector.c +++ b/smime/gui/e-cert-selector.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h index 542a211745..85cfa0ba9f 100644 --- a/smime/gui/e-cert-selector.h +++ b/smime/gui/e-cert-selector.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/lib/e-asn1-object.h b/smime/lib/e-asn1-object.h index d0cdb05d27..0c976dd827 100644 --- a/smime/lib/e-asn1-object.h +++ b/smime/lib/e-asn1-object.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/lib/e-cert-db.h b/smime/lib/e-cert-db.h index b3a69632d1..f628ba2073 100644 --- a/smime/lib/e-cert-db.h +++ b/smime/lib/e-cert-db.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/lib/e-cert-trust.h b/smime/lib/e-cert-trust.h index 65a925d7bb..6b515b1a24 100644 --- a/smime/lib/e-cert-trust.h +++ b/smime/lib/e-cert-trust.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/lib/e-cert.h b/smime/lib/e-cert.h index e152031a5d..63125c1871 100644 --- a/smime/lib/e-cert.h +++ b/smime/lib/e-cert.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/smime/lib/e-pkcs12.h b/smime/lib/e-pkcs12.h index 950a2d3899..5717edb14c 100644 --- a/smime/lib/e-pkcs12.h +++ b/smime/lib/e-pkcs12.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Chris Toshok diff --git a/smime/tests/import-cert.c b/smime/tests/import-cert.c index 420afe78b8..b202053e6d 100644 --- a/smime/tests/import-cert.c +++ b/smime/tests/import-cert.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/tools/killev.c b/tools/killev.c index 797e9230b5..d26093986f 100644 --- a/tools/killev.c +++ b/tools/killev.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index b60fdf4ca2..80a4485739 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -101,9 +101,9 @@ static void set_map_timezone (ETimezoneDialog *etd, static void on_combo_changed (GtkComboBox *combo, ETimezoneDialog *etd); -static void timezone_combo_get_active_text (GtkComboBox *combo, +static void timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name); -static gboolean timezone_combo_set_active_text (GtkComboBox *combo, +static gboolean timezone_combo_set_active_text (GtkComboBox *combo, const char *zone_name); static void map_destroy_cb (gpointer data, @@ -793,7 +793,7 @@ on_combo_changed (GtkComboBox *combo_box, ETimezoneDialog *etd) set_map_timezone (etd, map_zone); } -static void +static void timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name) { GtkTreeModel *list_store; @@ -802,13 +802,13 @@ timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name) list_store = gtk_combo_box_get_model (combo); /* Get the active iter in the list */ - if (gtk_combo_box_get_active_iter (combo, &iter)) + if (gtk_combo_box_get_active_iter (combo, &iter)) gtk_tree_model_get (list_store, &iter, 0, zone_name, -1); - else + else *zone_name = ""; } -static gboolean +static gboolean timezone_combo_set_active_text (GtkComboBox *combo, const char *zone_name) { GtkTreeModel *list_store; @@ -818,7 +818,7 @@ timezone_combo_set_active_text (GtkComboBox *combo, const char *zone_name) list_store = gtk_combo_box_get_model (combo); index = (GHashTable *) g_object_get_data (G_OBJECT (list_store), "index"); - if (zone_name && *zone_name) + if (zone_name && *zone_name) id = g_hash_table_lookup (index, zone_name); gtk_combo_box_set_active (combo, GPOINTER_TO_INT (id)); diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.h b/widgets/e-timezone-dialog/e-timezone-dialog.h index 0da1112276..8992d40c2d 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.h +++ b/widgets/e-timezone-dialog/e-timezone-dialog.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index 69778e4f3d..e820a51a6a 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h index 08be5de0f9..14112dfdb3 100644 --- a/widgets/menus/gal-define-views-dialog.h +++ b/widgets/menus/gal-define-views-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c index 737c800bca..9f67473c32 100644 --- a/widgets/menus/gal-define-views-model.c +++ b/widgets/menus/gal-define-views-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h index f1adb8038c..d0ccfb16b9 100644 --- a/widgets/menus/gal-define-views-model.h +++ b/widgets/menus/gal-define-views-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index 890ee3ea7f..c32e791809 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h index cf6871edd1..83e5217131 100644 --- a/widgets/menus/gal-view-collection.h +++ b/widgets/menus/gal-view-collection.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c index 780e430e88..89ce837686 100644 --- a/widgets/menus/gal-view-etable.c +++ b/widgets/menus/gal-view-etable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h index af03abb8e0..fdc34b2710 100644 --- a/widgets/menus/gal-view-etable.h +++ b/widgets/menus/gal-view-etable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c index 05cf09707e..52f759ab37 100644 --- a/widgets/menus/gal-view-factory-etable.c +++ b/widgets/menus/gal-view-factory-etable.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h index cd89717bde..440d6c6d22 100644 --- a/widgets/menus/gal-view-factory-etable.h +++ b/widgets/menus/gal-view-factory-etable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c index 7f740bc350..5b100654de 100644 --- a/widgets/menus/gal-view-factory.c +++ b/widgets/menus/gal-view-factory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h index a2f78098f7..d2c4b4aa45 100644 --- a/widgets/menus/gal-view-factory.h +++ b/widgets/menus/gal-view-factory.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index bad4c20bc6..02283c630e 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h index 5dbd43696e..2135bc560f 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.h +++ b/widgets/menus/gal-view-instance-save-as-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index 3b0e02c064..9e0e2eb7c9 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h index 37c8ad6869..787bc09713 100644 --- a/widgets/menus/gal-view-instance.h +++ b/widgets/menus/gal-view-instance.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index e663c6e4e4..4f76eb6cca 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-menus.h b/widgets/menus/gal-view-menus.h index 6124688f50..f565d07613 100644 --- a/widgets/menus/gal-view-menus.h +++ b/widgets/menus/gal-view-menus.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index 0822d83e2b..8bfc84fa15 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h index 75016bc589..d2acd5d301 100644 --- a/widgets/menus/gal-view-new-dialog.h +++ b/widgets/menus/gal-view-new-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c index 6509a7996d..fd3cdc2a5e 100644 --- a/widgets/menus/gal-view.c +++ b/widgets/menus/gal-view.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h index 0baba16761..b0ac4f3176 100644 --- a/widgets/menus/gal-view.h +++ b/widgets/menus/gal-view.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c index 21f30b697c..7663f0faee 100644 --- a/widgets/misc/e-account-combo-box.c +++ b/widgets/misc/e-account-combo-box.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-account-combo-box.h b/widgets/misc/e-account-combo-box.h index 87f7eb9704..b163278dcd 100644 --- a/widgets/misc/e-account-combo-box.h +++ b/widgets/misc/e-account-combo-box.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index e464353665..dd0bd60e9b 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -142,7 +142,7 @@ activity_info_new (const char *component_id, info->menu = NULL; info->error = NULL; info->cancel_func = NULL; - + return info; } @@ -209,7 +209,7 @@ setup_task_bar (EActivityHandler *activity_handler, g_object_set_data ((GObject *) task_widget, "activity-handler", activity_handler); g_object_set_data ((GObject *) task_widget, "activity", GINT_TO_POINTER(info->id)); g_object_set_data ((GObject *) task_widget, "error-type", GINT_TO_POINTER(info->error_type)); - g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget); + g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget); } } } @@ -360,14 +360,14 @@ e_activity_handler_attach_task_bar (EActivityHandler *activity_handler, } struct _cancel_wdata { - EActivityHandler *handler; + EActivityHandler *handler; ActivityInfo *info; guint id; void (*cancel)(gpointer); gpointer data; }; -static void +static void cancel_wrapper (gpointer pdata) { struct _cancel_wdata *data = (struct _cancel_wdata *) pdata; @@ -379,7 +379,7 @@ cancel_wrapper (gpointer pdata) int order, len; GSList *sp; GList *p = lookup_activity (handler->priv->activity_infos, data->id, &order); - e_logger_log (handler->priv->logger, E_LOG_ERROR, g_object_get_data (data->info->error, "primary"), + e_logger_log (handler->priv->logger, E_LOG_ERROR, g_object_get_data (data->info->error, "primary"), g_object_get_data (data->info->error, "secondary")); gtk_widget_destroy (data->info->error); data->info->error = NULL; @@ -388,7 +388,7 @@ cancel_wrapper (gpointer pdata) ETaskBar *task_bar; task_bar = E_TASK_BAR (sp->data); - e_task_bar_remove_task_from_id (task_bar, info->id); + e_task_bar_remove_task_from_id (task_bar, info->id); } activity_info_free (info); len = g_list_length (handler->priv->activity_infos); @@ -488,8 +488,8 @@ handle_error (ETaskWidget *task) id = GPOINTER_TO_UINT (g_object_get_data ((GObject *) task, "activity")); e_activity_handler_operation_finished (activity_handler, id); gtk_widget_show (error); - e_logger_log (activity_handler->priv->logger, error_type, - g_object_get_data ((GObject *) error, "primary"), + e_logger_log (activity_handler->priv->logger, error_type, + g_object_get_data ((GObject *) error, "primary"), g_object_get_data ((GObject *) error, "secondary")); } @@ -511,7 +511,7 @@ error_cleanup (EActivityHandler *activity_handler) berror = TRUE; if (info->error && info->error_time && (now - info->error_time) > 5 ) { /* Error older than wanted time. So cleanup */ - e_logger_log (priv->logger, info->error_type, g_object_get_data (info->error, "primary"), + e_logger_log (priv->logger, info->error_type, g_object_get_data (info->error, "primary"), g_object_get_data (info->error, "secondary")); if (GTK_IS_DIALOG (info->error)) @@ -530,7 +530,7 @@ error_cleanup (EActivityHandler *activity_handler) } activity_info_free (info); priv->activity_infos = g_list_remove_link (priv->activity_infos, node); - + } else p = p->next; } @@ -559,7 +559,7 @@ e_activity_handler_make_error (EActivityHandler *activity_handler, activity_info->error = error; activity_info->error_time = time (NULL); activity_info->error_type = error_type; - + img = error_type ? icon_data[1] : icon_data[0]; for (p = priv->task_bars; p != NULL; p = p->next) { ETaskBar *task_bar; @@ -567,17 +567,17 @@ e_activity_handler_make_error (EActivityHandler *activity_handler, GtkWidget *tool; task_bar = E_TASK_BAR (p->data); - task_widget = task_widget_new_from_activity_info (activity_info); + task_widget = task_widget_new_from_activity_info (activity_info); task_widget->id = activity_id; e_task_bar_prepend_task (E_TASK_BAR (p->data), task_widget); - + tool = e_task_widget_update_image (task_widget, (char *)img, information); g_object_set_data ((GObject *) task_widget, "tool", tool); g_object_set_data ((GObject *) task_widget, "error", error); g_object_set_data ((GObject *) task_widget, "activity-handler", activity_handler); g_object_set_data ((GObject *) task_widget, "activity", GINT_TO_POINTER(activity_id)); g_object_set_data ((GObject *) task_widget, "error-type", GINT_TO_POINTER(error_type)); - g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget); + g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget); } priv->activity_infos = g_list_prepend (priv->activity_infos, activity_info); diff --git a/widgets/misc/e-activity-handler.h b/widgets/misc/e-activity-handler.h index 5dc1820dd0..bf8d8e0095 100644 --- a/widgets/misc/e-activity-handler.h +++ b/widgets/misc/e-activity-handler.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c index a9c230bac7..d64dcafb4a 100644 --- a/widgets/misc/e-attachment-button.c +++ b/widgets/misc/e-attachment-button.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-button.h b/widgets/misc/e-attachment-button.h index 72592efefe..89ecccfe9b 100644 --- a/widgets/misc/e-attachment-button.h +++ b/widgets/misc/e-attachment-button.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c index e8c599aeea..e1037ae175 100644 --- a/widgets/misc/e-attachment-dialog.c +++ b/widgets/misc/e-attachment-dialog.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-dialog.h b/widgets/misc/e-attachment-dialog.h index e8ed583b18..503dcbbc67 100644 --- a/widgets/misc/e-attachment-dialog.h +++ b/widgets/misc/e-attachment-dialog.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-handler-image.c b/widgets/misc/e-attachment-handler-image.c index ba5f8d759c..a91b433c6e 100644 --- a/widgets/misc/e-attachment-handler-image.c +++ b/widgets/misc/e-attachment-handler-image.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-handler-image.h b/widgets/misc/e-attachment-handler-image.h index 44ff404a99..bade5cec5e 100644 --- a/widgets/misc/e-attachment-handler-image.h +++ b/widgets/misc/e-attachment-handler-image.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-handler.c b/widgets/misc/e-attachment-handler.c index 03af1eec9b..0a6ed0505d 100644 --- a/widgets/misc/e-attachment-handler.c +++ b/widgets/misc/e-attachment-handler.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-handler.h b/widgets/misc/e-attachment-handler.h index f95bc55123..e7e52c8c18 100644 --- a/widgets/misc/e-attachment-handler.h +++ b/widgets/misc/e-attachment-handler.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c index 0845f82a76..a7d8ad271c 100644 --- a/widgets/misc/e-attachment-icon-view.c +++ b/widgets/misc/e-attachment-icon-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-icon-view.h b/widgets/misc/e-attachment-icon-view.h index ab9360e42e..4aabf6c429 100644 --- a/widgets/misc/e-attachment-icon-view.h +++ b/widgets/misc/e-attachment-icon-view.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c index 3fed031473..a88f9fa8b2 100644 --- a/widgets/misc/e-attachment-paned.c +++ b/widgets/misc/e-attachment-paned.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-paned.h b/widgets/misc/e-attachment-paned.h index 076ab6033e..401ec581cb 100644 --- a/widgets/misc/e-attachment-paned.h +++ b/widgets/misc/e-attachment-paned.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c index 216a60d32a..2977be9593 100644 --- a/widgets/misc/e-attachment-store.c +++ b/widgets/misc/e-attachment-store.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-store.h b/widgets/misc/e-attachment-store.h index 9fdd74d493..46ca9e4aa6 100644 --- a/widgets/misc/e-attachment-store.h +++ b/widgets/misc/e-attachment-store.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c index f2c17cb078..42876e4bfb 100644 --- a/widgets/misc/e-attachment-tree-view.c +++ b/widgets/misc/e-attachment-tree-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-tree-view.h b/widgets/misc/e-attachment-tree-view.h index 7f16ba5ab2..4300ffa71f 100644 --- a/widgets/misc/e-attachment-tree-view.h +++ b/widgets/misc/e-attachment-tree-view.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index d2b676993d..41e0b302a2 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment-view.h b/widgets/misc/e-attachment-view.h index 38480c30c4..89d2d28664 100644 --- a/widgets/misc/e-attachment-view.h +++ b/widgets/misc/e-attachment-view.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index e4e336e58b..e9df6024bc 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h index 934e1e04b6..d7cfb5be06 100644 --- a/widgets/misc/e-attachment.h +++ b/widgets/misc/e-attachment.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index 32e74dd535..be3751f852 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin @@ -1386,9 +1386,9 @@ get_digit_fomat () if (major > 2 || minor > 2 || (minor == 2 && revision > 2)) { return "%Id"; - } + } #endif - + return "%d"; } @@ -1984,7 +1984,7 @@ e_calendar_item_recalc_sizes (ECalendarItem *calitem) for (digit = 0; digit < 10; digit++) { gchar locale_digit[5]; int locale_digit_len; - + locale_digit_len = sprintf (locale_digit, get_digit_fomat (), digit); pango_layout_set_text (layout, locale_digit, locale_digit_len); diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h index 0032e12a6c..c0ee9a43bc 100644 --- a/widgets/misc/e-calendar-item.h +++ b/widgets/misc/e-calendar-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c index 824a79d4e0..88e59b87db 100644 --- a/widgets/misc/e-calendar.c +++ b/widgets/misc/e-calendar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h index aebc615cfc..7a3c8fd010 100644 --- a/widgets/misc/e-calendar.h +++ b/widgets/misc/e-calendar.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index 4d300f01d4..181d7887d4 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas-background.h b/widgets/misc/e-canvas-background.h index 5d75735c12..562987e7d7 100644 --- a/widgets/misc/e-canvas-background.h +++ b/widgets/misc/e-canvas-background.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c index c46f64c199..62ea6c54ef 100644 --- a/widgets/misc/e-canvas-utils.c +++ b/widgets/misc/e-canvas-utils.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h index fa09a86c25..cda34e99b5 100644 --- a/widgets/misc/e-canvas-utils.h +++ b/widgets/misc/e-canvas-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c index 377a7a2605..3d4e879c0c 100644 --- a/widgets/misc/e-canvas-vbox.c +++ b/widgets/misc/e-canvas-vbox.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h index 51602e77de..7fa38fa778 100644 --- a/widgets/misc/e-canvas-vbox.h +++ b/widgets/misc/e-canvas-vbox.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 40aaf7d510..055f0311f4 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h index e06bed7824..00692c457a 100644 --- a/widgets/misc/e-canvas.h +++ b/widgets/misc/e-canvas.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index 76450b8f5f..e994120b33 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cell-date-edit.h b/widgets/misc/e-cell-date-edit.h index 30dee535e8..2e125fece3 100644 --- a/widgets/misc/e-cell-date-edit.h +++ b/widgets/misc/e-cell-date-edit.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c index 94e33489e5..194a7bd6b6 100644 --- a/widgets/misc/e-cell-percent.c +++ b/widgets/misc/e-cell-percent.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cell-percent.h b/widgets/misc/e-cell-percent.h index 46a7ddc3e3..5e202dfa82 100644 --- a/widgets/misc/e-cell-percent.h +++ b/widgets/misc/e-cell-percent.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cell-renderer-combo.c b/widgets/misc/e-cell-renderer-combo.c index 96f474d0d9..ab03c73f2b 100644 --- a/widgets/misc/e-cell-renderer-combo.c +++ b/widgets/misc/e-cell-renderer-combo.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cell-renderer-combo.h b/widgets/misc/e-cell-renderer-combo.h index 547eca7e7a..515ed75256 100644 --- a/widgets/misc/e-cell-renderer-combo.h +++ b/widgets/misc/e-cell-renderer-combo.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index 6c7233ab9f..5d1f8c036a 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -444,7 +444,7 @@ e_charset_picker_dialog (const char *title, const char *prompt, * locale character set * @callback: a callback function for actions in the group, or %NULL * @user_data: user data to be passed to @callback, or %NULL - * + * * Adds a set of #GtkRadioActions for available character sets to * @action_group. The @default_charset (or locale character set if * @default_charset is %NULL) will be added first, and selected by diff --git a/widgets/misc/e-charset-picker.h b/widgets/misc/e-charset-picker.h index 7250b10dfb..88c89fb308 100644 --- a/widgets/misc/e-charset-picker.h +++ b/widgets/misc/e-charset-picker.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c index c9c72d06d7..74fbdbf58c 100644 --- a/widgets/misc/e-colors.c +++ b/widgets/misc/e-colors.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h index 30ddfd496a..710ee59f59 100644 --- a/widgets/misc/e-colors.h +++ b/widgets/misc/e-colors.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c index aabb7073f1..dc978af91a 100644 --- a/widgets/misc/e-combo-button.c +++ b/widgets/misc/e-combo-button.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-combo-button.h b/widgets/misc/e-combo-button.h index 0abe347a93..edeb1be9bd 100644 --- a/widgets/misc/e-combo-button.h +++ b/widgets/misc/e-combo-button.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c index 5502a83a0d..8cee128619 100644 --- a/widgets/misc/e-combo-cell-editable.c +++ b/widgets/misc/e-combo-cell-editable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-combo-cell-editable.h b/widgets/misc/e-combo-cell-editable.h index d3f64a36d3..c37e786f84 100644 --- a/widgets/misc/e-combo-cell-editable.h +++ b/widgets/misc/e-combo-cell-editable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-config-page.c b/widgets/misc/e-config-page.c index c9823a29e8..00fb991578 100644 --- a/widgets/misc/e-config-page.c +++ b/widgets/misc/e-config-page.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-config-page.h b/widgets/misc/e-config-page.h index 24317d3f9d..886d89d851 100644 --- a/widgets/misc/e-config-page.h +++ b/widgets/misc/e-config-page.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c index f0b9ca6843..ebc2f9bd78 100644 --- a/widgets/misc/e-cursors.c +++ b/widgets/misc/e-cursors.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h index c22e295c7b..7df3404092 100644 --- a/widgets/misc/e-cursors.h +++ b/widgets/misc/e-cursors.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 2120483abf..701cf69444 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Authors: * Damon Chaplin @@ -1471,7 +1471,7 @@ e_date_edit_parse_date (EDateEdit *dedit, if (date_tm->tm_year > today_tm->tm_year) date_tm->tm_year -= 100; } - + return TRUE; } @@ -1725,7 +1725,7 @@ e_date_edit_update_date_entry (EDateEdit *dedit) if (priv->date_set_to_none || !priv->date_is_valid) { gtk_entry_set_text (GTK_ENTRY (priv->date_entry), _("None")); } else { - /* This is a strftime() format for a short date. + /* This is a strftime() format for a short date. %x the preferred date representation for the current locale without the time, but has forced to use 4 digit year */ char *format = e_time_get_d_fmt_with_4digit_year (); diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c index 6008f64ad9..00b2695e5f 100644 --- a/widgets/misc/e-dropdown-button.c +++ b/widgets/misc/e-dropdown-button.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h index b10fd9a670..bd4fe6feb4 100644 --- a/widgets/misc/e-dropdown-button.h +++ b/widgets/misc/e-dropdown-button.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 2dffb39cac..9a67636939 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index 4178070405..8f06c867ae 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c index 4e0b099944..6acbe920ef 100644 --- a/widgets/misc/e-gui-utils.c +++ b/widgets/misc/e-gui-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h index d0a54f7c42..840a55289b 100644 --- a/widgets/misc/e-gui-utils.h +++ b/widgets/misc/e-gui-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 7d504685a5..d3b5a1ac07 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h index 0e78026683..b7f599f0c1 100644 --- a/widgets/misc/e-image-chooser.h +++ b/widgets/misc/e-image-chooser.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-info-label.c b/widgets/misc/e-info-label.c index e1959607fb..e6db111a74 100644 --- a/widgets/misc/e-info-label.c +++ b/widgets/misc/e-info-label.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-info-label.h b/widgets/misc/e-info-label.h index 905a39b0ca..d4dd16e395 100644 --- a/widgets/misc/e-info-label.h +++ b/widgets/misc/e-info-label.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index f9742b597f..c2c0806178 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-map.h b/widgets/misc/e-map.h index 4d65c7b47b..0c915fb5fa 100644 --- a/widgets/misc/e-map.h +++ b/widgets/misc/e-map.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index 6cee26e75c..f78f764f03 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-multi-config-dialog.h b/widgets/misc/e-multi-config-dialog.h index 462d593c81..e8d9896d55 100644 --- a/widgets/misc/e-multi-config-dialog.h +++ b/widgets/misc/e-multi-config-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-online-button.c b/widgets/misc/e-online-button.c index dec24a6587..114d76ac32 100644 --- a/widgets/misc/e-online-button.c +++ b/widgets/misc/e-online-button.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/widgets/misc/e-online-button.h b/widgets/misc/e-online-button.h index 6576035a9d..03f676d75c 100644 --- a/widgets/misc/e-online-button.h +++ b/widgets/misc/e-online-button.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ diff --git a/widgets/misc/e-pilot-settings.c b/widgets/misc/e-pilot-settings.c index 80ad52d083..1bed8630c5 100644 --- a/widgets/misc/e-pilot-settings.c +++ b/widgets/misc/e-pilot-settings.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-pilot-settings.h b/widgets/misc/e-pilot-settings.h index fbba3b2f71..0c4fbd7a81 100644 --- a/widgets/misc/e-pilot-settings.h +++ b/widgets/misc/e-pilot-settings.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c index 1581d3e409..143eaff327 100644 --- a/widgets/misc/e-popup-menu.c +++ b/widgets/misc/e-popup-menu.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h index 37589f4243..ddf6ed04a9 100644 --- a/widgets/misc/e-popup-menu.h +++ b/widgets/misc/e-popup-menu.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c index 7f2db7ecc4..05a219f901 100644 --- a/widgets/misc/e-printable.c +++ b/widgets/misc/e-printable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-printable.h b/widgets/misc/e-printable.h index d0d3223dbf..32cbadddbd 100644 --- a/widgets/misc/e-printable.h +++ b/widgets/misc/e-printable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c index eae3d43324..d24b915e6e 100644 --- a/widgets/misc/e-reflow-model.c +++ b/widgets/misc/e-reflow-model.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-reflow-model.h b/widgets/misc/e-reflow-model.h index 7482e5079f..c772621d07 100644 --- a/widgets/misc/e-reflow-model.h +++ b/widgets/misc/e-reflow-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index f51a502a83..129046a89e 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h index 6d67369209..69f34d0fd9 100644 --- a/widgets/misc/e-reflow.h +++ b/widgets/misc/e-reflow.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index d3d579178d..2bbbc91a00 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1048,7 +1048,7 @@ e_search_bar_construct (ESearchBar *search_bar, label = gtk_label_new_with_mnemonic (_(" i_n ")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), label, FALSE, FALSE, 0); - + search_bar->scopeoption = gtk_option_menu_new (); /* g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */ gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), search_bar->scopeoption, FALSE, FALSE, 0); diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h index f2d9b0576b..fd91068ebd 100644 --- a/widgets/misc/e-search-bar.h +++ b/widgets/misc/e-search-bar.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c index f45923c1dd..7e82039d6e 100644 --- a/widgets/misc/e-selection-model-array.c +++ b/widgets/misc/e-selection-model-array.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h index abbf828374..9f297c1fed 100644 --- a/widgets/misc/e-selection-model-array.h +++ b/widgets/misc/e-selection-model-array.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c index f2856622ec..b9f1d33bfe 100644 --- a/widgets/misc/e-selection-model-simple.c +++ b/widgets/misc/e-selection-model-simple.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h index 2cd2ecabd3..7f11d3ac0e 100644 --- a/widgets/misc/e-selection-model-simple.h +++ b/widgets/misc/e-selection-model-simple.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c index 697bb68096..66187e6e7c 100644 --- a/widgets/misc/e-selection-model.c +++ b/widgets/misc/e-selection-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h index 18bbc2a115..24eccd304f 100644 --- a/widgets/misc/e-selection-model.h +++ b/widgets/misc/e-selection-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index 6c10a60c1c..8740f2d02e 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-send-options.h b/widgets/misc/e-send-options.h index 9a32357358..3ed5d6fd24 100644 --- a/widgets/misc/e-send-options.h +++ b/widgets/misc/e-send-options.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -20,7 +20,7 @@ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - + #ifndef __E_SENDOPTIONS_DIALOG_H__ #define __E_SENDOPTIONS_DIALOG_H__ diff --git a/widgets/misc/e-signature-combo-box.c b/widgets/misc/e-signature-combo-box.c index 9ebd20a0b2..cb11ba632f 100644 --- a/widgets/misc/e-signature-combo-box.c +++ b/widgets/misc/e-signature-combo-box.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-signature-combo-box.h b/widgets/misc/e-signature-combo-box.h index ec05c2b5d7..fac47518e1 100644 --- a/widgets/misc/e-signature-combo-box.h +++ b/widgets/misc/e-signature-combo-box.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c index 8400f298f7..c7a715decd 100644 --- a/widgets/misc/e-task-bar.c +++ b/widgets/misc/e-task-bar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -37,7 +37,7 @@ struct _ETaskBarPrivate G_DEFINE_TYPE (ETaskBar, e_task_bar, GTK_TYPE_HBOX) -#if 0 +#if 0 static void reduce_displayed_activities_per_component (ETaskBar *task_bar) { @@ -80,7 +80,7 @@ reduce_displayed_activities_per_component (ETaskBar *task_bar) g_hash_table_destroy (component_ids_hash); } -#endif +#endif static void impl_finalize (GObject *object); @@ -281,7 +281,7 @@ e_task_bar_get_task_widget_from_id (ETaskBar *task_bar, w = NULL; list = list->next; } - + return w; } diff --git a/widgets/misc/e-task-bar.h b/widgets/misc/e-task-bar.h index 363e062ee8..d36898ebb8 100644 --- a/widgets/misc/e-task-bar.h +++ b/widgets/misc/e-task-bar.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -66,7 +66,7 @@ void e_task_bar_prepend_task (ETaskBar *task_bar, ETaskWidget *task_widget); void e_task_bar_remove_task (ETaskBar *task_bar, int n); -ETaskWidget * e_task_bar_get_task_widget_from_id (ETaskBar *task_bar, +ETaskWidget * e_task_bar_get_task_widget_from_id (ETaskBar *task_bar, guint id); void e_task_bar_remove_task_from_id (ETaskBar *task_bar, diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c index d545613998..2569a46557 100644 --- a/widgets/misc/e-task-widget.c +++ b/widgets/misc/e-task-widget.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -106,7 +106,7 @@ prepare_popup (ETaskWidget *widget, GdkEventButton *event) if (event->button != 3) return FALSE; - + /* FIXME: Implement Cancel */ return TRUE; diff --git a/widgets/misc/e-task-widget.h b/widgets/misc/e-task-widget.h index e478e91145..4770b9d108 100644 --- a/widgets/misc/e-task-widget.h +++ b/widgets/misc/e-task-widget.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index cc50b39d95..2769001120 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-unicode.h b/widgets/misc/e-unicode.h index b0319b0f25..77d1a351cb 100644 --- a/widgets/misc/e-unicode.h +++ b/widgets/misc/e-unicode.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c index 32490f6590..6c8eab7c8b 100644 --- a/widgets/misc/e-url-entry.c +++ b/widgets/misc/e-url-entry.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/e-url-entry.h b/widgets/misc/e-url-entry.h index 1c051ac0e8..a4edc51df2 100644 --- a/widgets/misc/e-url-entry.h +++ b/widgets/misc/e-url-entry.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c index 10a463de12..6852010b24 100644 --- a/widgets/misc/test-calendar.c +++ b/widgets/misc/test-calendar.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c index d359d120c4..7468053f31 100644 --- a/widgets/misc/test-dateedit.c +++ b/widgets/misc/test-dateedit.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c index 51143ff560..b76174fb0e 100644 --- a/widgets/misc/test-dropdown-button.c +++ b/widgets/misc/test-dropdown-button.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/test-error.c b/widgets/misc/test-error.c index c8b442b23a..e67e6985f5 100644 --- a/widgets/misc/test-error.c +++ b/widgets/misc/test-error.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/test-info-label.c b/widgets/misc/test-info-label.c index 2ef47483ed..31298ed7c1 100644 --- a/widgets/misc/test-info-label.c +++ b/widgets/misc/test-info-label.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/misc/test-multi-config-dialog.c b/widgets/misc/test-multi-config-dialog.c index bc52f493c6..34a7624a39 100644 --- a/widgets/misc/test-multi-config-dialog.c +++ b/widgets/misc/test-multi-config-dialog.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c index 114c2b52a2..09e2187b82 100644 --- a/widgets/table/e-cell-checkbox.c +++ b/widgets/table/e-cell-checkbox.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-checkbox.h b/widgets/table/e-cell-checkbox.h index 79f55c371f..fa05ecbb06 100644 --- a/widgets/table/e-cell-checkbox.h +++ b/widgets/table/e-cell-checkbox.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 83c17d3c2f..80d6294b2d 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h index 2e801f3711..fafda30031 100644 --- a/widgets/table/e-cell-combo.h +++ b/widgets/table/e-cell-combo.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c index ac0274f183..92c0dd98b6 100644 --- a/widgets/table/e-cell-date.c +++ b/widgets/table/e-cell-date.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -54,7 +54,7 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) if (date == 0) { return g_strdup (_("?")); } - + tzset (); localtime_r (&date, &then); localtime_r (&nowdate, &now); diff --git a/widgets/table/e-cell-date.h b/widgets/table/e-cell-date.h index f7d24cf8a9..fece501726 100644 --- a/widgets/table/e-cell-date.h +++ b/widgets/table/e-cell-date.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c index f6cb11e509..f84d8761c7 100644 --- a/widgets/table/e-cell-hbox.c +++ b/widgets/table/e-cell-hbox.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h index d3cb84db6a..dc726960fa 100644 --- a/widgets/table/e-cell-hbox.h +++ b/widgets/table/e-cell-hbox.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c index 6d4e3925de..56754a05e5 100644 --- a/widgets/table/e-cell-number.c +++ b/widgets/table/e-cell-number.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-number.h b/widgets/table/e-cell-number.h index 006801d71d..75471f7a2c 100644 --- a/widgets/table/e-cell-number.h +++ b/widgets/table/e-cell-number.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index 4a2dde7f9b..ea141305b9 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -116,7 +116,7 @@ pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable, int real_x, real_y, real_w, real_h; int pix_w, pix_h; cairo_t *cr; - + cell_pixbuf = e_table_model_value_at (ecell_view->e_table_model, 1, row); @@ -155,7 +155,7 @@ pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable, gdk_cairo_set_source_pixbuf (cr, cell_pixbuf, real_x, real_y); cairo_paint_with_alpha (cr, 1); cairo_restore (cr); - cairo_destroy (cr); + cairo_destroy (cr); } static gint diff --git a/widgets/table/e-cell-pixbuf.h b/widgets/table/e-cell-pixbuf.h index 09918a4027..850e9d535d 100644 --- a/widgets/table/e-cell-pixbuf.h +++ b/widgets/table/e-cell-pixbuf.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index c291571c73..8a8918dc70 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h index 12e44cb8dc..c1262a1234 100644 --- a/widgets/table/e-cell-popup.h +++ b/widgets/table/e-cell-popup.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c index 08a1c8aff9..ca4078512f 100644 --- a/widgets/table/e-cell-size.c +++ b/widgets/table/e-cell-size.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-size.h b/widgets/table/e-cell-size.h index 68ee4ebb7d..ed0d279f6b 100644 --- a/widgets/table/e-cell-size.h +++ b/widgets/table/e-cell-size.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index b86d709bca..3a03fe51e7 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h index c831b2edc2..d92b025aa5 100644 --- a/widgets/table/e-cell-text.h +++ b/widgets/table/e-cell-text.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 4fc6aca107..69dc1b27bb 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -141,7 +141,7 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable, image = toggle->images[value]; - + if ((x2 - x1) < gdk_pixbuf_get_width (image)){ x = x1; width = x2 - x1; @@ -149,7 +149,7 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable, x = x1 + ((x2 - x1) - gdk_pixbuf_get_width (image)) / 2; width = gdk_pixbuf_get_width (image); } - + if ((y2 - y1) < gdk_pixbuf_get_height (image)){ y = y1; height = y2 - y1; @@ -163,9 +163,9 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable, gdk_cairo_set_source_pixbuf (cr, image, x, y); cairo_paint_with_alpha (cr, 1); cairo_restore (cr); - cairo_destroy (cr); + cairo_destroy (cr); -} +} static void etog_set_value (ECellToggleView *toggle_view, int model_col, int view_col, int row, int value) diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h index 49e2afb018..97d16dc659 100644 --- a/widgets/table/e-cell-toggle.h +++ b/widgets/table/e-cell-toggle.h @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index af398ae872..1fd770ab6a 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h index 6292862ab8..ae774dbb7c 100644 --- a/widgets/table/e-cell-vbox.h +++ b/widgets/table/e-cell-vbox.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c index 1de405feff..41ffe86685 100644 --- a/widgets/table/e-cell.c +++ b/widgets/table/e-cell.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h index cb60cc8a2a..5a0005095e 100644 --- a/widgets/table/e-cell.h +++ b/widgets/table/e-cell.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index 4871b055eb..879b8c34af 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h index 1ddbe4e75b..31dded1989 100644 --- a/widgets/table/e-table-click-to-add.h +++ b/widgets/table/e-table-click-to-add.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-col-dnd.h b/widgets/table/e-table-col-dnd.h index 335b456e46..100a4d94d9 100644 --- a/widgets/table/e-table-col-dnd.h +++ b/widgets/table/e-table-col-dnd.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index 892ff7cc5d..d844f53c45 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h index 562e4fd7a7..f7d892d317 100644 --- a/widgets/table/e-table-col.h +++ b/widgets/table/e-table-col.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c index 3da9e28fdb..c48451587f 100644 --- a/widgets/table/e-table-column-specification.c +++ b/widgets/table/e-table-column-specification.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h index 775cbc3570..688e194825 100644 --- a/widgets/table/e-table-column-specification.h +++ b/widgets/table/e-table-column-specification.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c index 54909a079d..d2180d88e5 100644 --- a/widgets/table/e-table-column.c +++ b/widgets/table/e-table-column.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c index f5111d7ca2..6d3e5611da 100644 --- a/widgets/table/e-table-config-field.c +++ b/widgets/table/e-table-config-field.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h index 382ff941b1..9fbd21d694 100644 --- a/widgets/table/e-table-config-field.h +++ b/widgets/table/e-table-config-field.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 1c40798720..06f98066bb 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h index b265e32ba3..d5366bf999 100644 --- a/widgets/table/e-table-config.h +++ b/widgets/table/e-table-config.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h index d11ac3eb86..c2511c0a42 100644 --- a/widgets/table/e-table-defines.h +++ b/widgets/table/e-table-defines.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c index cacef107b7..b1eae4cc40 100644 --- a/widgets/table/e-table-example-1.c +++ b/widgets/table/e-table-example-1.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c index 4f3324d084..ac12886813 100644 --- a/widgets/table/e-table-example-2.c +++ b/widgets/table/e-table-example-2.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index 107739e5bf..0099b23656 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h index a7efcd8225..794cf4635e 100644 --- a/widgets/table/e-table-extras.h +++ b/widgets/table/e-table-extras.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c index 5b504496c7..61dedd4e12 100644 --- a/widgets/table/e-table-field-chooser-dialog.c +++ b/widgets/table/e-table-field-chooser-dialog.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h index 8467316317..e0bc591f25 100644 --- a/widgets/table/e-table-field-chooser-dialog.h +++ b/widgets/table/e-table-field-chooser-dialog.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 4b4c6b16a7..99b61f9ffa 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h index 96b5b28e02..3b9937bf3c 100644 --- a/widgets/table/e-table-field-chooser-item.h +++ b/widgets/table/e-table-field-chooser-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c index 60a0b40e9d..fb66d9618a 100644 --- a/widgets/table/e-table-field-chooser.c +++ b/widgets/table/e-table-field-chooser.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h index 01a54da822..71e17244f1 100644 --- a/widgets/table/e-table-field-chooser.h +++ b/widgets/table/e-table-field-chooser.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index c342c6ca7e..5af40532f8 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h index c4e0293edb..69791e376b 100644 --- a/widgets/table/e-table-group-container.h +++ b/widgets/table/e-table-group-container.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c index dc4c8ba11e..6076030737 100644 --- a/widgets/table/e-table-group-leaf.c +++ b/widgets/table/e-table-group-leaf.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h index 394c2dd778..e19bf8cdb8 100644 --- a/widgets/table/e-table-group-leaf.h +++ b/widgets/table/e-table-group-leaf.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index 257d23fb66..5cc03e90fc 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h index ee225c2471..36868f7d35 100644 --- a/widgets/table/e-table-group.h +++ b/widgets/table/e-table-group.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 028fd9b93e..62c00f94a4 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h index d9b3efce63..24a86939d8 100644 --- a/widgets/table/e-table-header-item.h +++ b/widgets/table/e-table-header-item.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index afcc0720e1..ae5ebf871f 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h index 33376f31c4..2ae1f79b1b 100644 --- a/widgets/table/e-table-header-utils.h +++ b/widgets/table/e-table-header-utils.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c index 3bd1409ade..6fd40ae0fa 100644 --- a/widgets/table/e-table-header.c +++ b/widgets/table/e-table-header.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h index 2c091ce20f..00b145ef87 100644 --- a/widgets/table/e-table-header.h +++ b/widgets/table/e-table-header.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 58d6c65f03..ce2484cafb 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -13,7 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1982,16 +1982,16 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, cairo_save (cr); pat = cairo_pattern_create_linear (0, y1, 0, y2); - cairo_pattern_add_color_stop_rgba (pat, 0.0, background->red/65535.0 , - background->green/65535.0, + cairo_pattern_add_color_stop_rgba (pat, 0.0, background->red/65535.0 , + background->green/65535.0, background->blue/65535.0, selected ? 0.8: 1.0); if (selected) - cairo_pattern_add_color_stop_rgba (pat, 0.5, background->red/65535.0 , - background->green/65535.0, + cairo_pattern_add_color_stop_rgba (pat, 0.5, background->red/65535.0 , + background->green/65535.0, background->blue/65535.0, 0.9); - cairo_pattern_add_color_stop_rgba (pat, 1, background->red/65535.0 , - background->green/65535.0, + cairo_pattern_add_color_stop_rgba (pat, 1, background->red/65535.0 , + background->green/65535.0, background->blue/65535.0, selected ? 0.8 : 1.0); cairo_rectangle (cr, x1, y1, ecol->width, height-1); cairo_set_source (cr, pat); @@ -2003,22 +2003,22 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, cairo_save (cr); cairo_set_line_width (cr, 1.0); - cairo_set_source_rgba (cr, background->red/65535.0 , - background->green/65535.0, + cairo_set_source_rgba (cr, background->red/65535.0 , + background->green/65535.0, background->blue/65535.0, 1); cairo_move_to (cr, x1, y1); cairo_line_to (cr, x2, y1); cairo_stroke (cr); cairo_set_line_width (cr, 1.0); - cairo_set_source_rgba (cr, background->red/65535.0 , - background->green/65535.0, + cairo_set_source_rgba (cr, background->red/65535.0 , + background->green/65535.0, background->blue/65535.0, 1); cairo_move_to (cr, x1, y2); cairo_line_to (cr, x2, y2); cairo_stroke (cr); - cairo_restore (cr); - + cairo_restore (cr); + if (free_background) gdk_color_free (background); diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index 48d6093b51..befadb77ca 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c index 071494ca25..b1833aa2e1 100644 --- a/widgets/table/e-table-memory-callbacks.c +++ b/widgets/table/e-table-memory-callbacks.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-memory-callbacks.h b/widgets/table/e-table-memory-callbacks.h index c9202ecfef..bfeacb284c 100644 --- a/widgets/table/e-table-memory-callbacks.h +++ b/widgets/table/e-table-memory-callbacks.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c index 5756402b54..284823bc3d 100644 --- a/widgets/table/e-table-memory-store.c +++ b/widgets/table/e-table-memory-store.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-memory-store.h b/widgets/table/e-table-memory-store.h index b16a18f8e5..f197e11fe6 100644 --- a/widgets/table/e-table-memory-store.h +++ b/widgets/table/e-table-memory-store.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c index 371261387e..3fb85a9553 100644 --- a/widgets/table/e-table-memory.c +++ b/widgets/table/e-table-memory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h index 37fc3449ff..889eec5d33 100644 --- a/widgets/table/e-table-memory.h +++ b/widgets/table/e-table-memory.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index f88f3bf215..efe097c4e1 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h index f639d77374..d647eee4e1 100644 --- a/widgets/table/e-table-model.h +++ b/widgets/table/e-table-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c index 939733fea6..56cd8b6549 100644 --- a/widgets/table/e-table-one.c +++ b/widgets/table/e-table-one.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-one.h b/widgets/table/e-table-one.h index d5e0b6a431..2984aeaa76 100644 --- a/widgets/table/e-table-one.h +++ b/widgets/table/e-table-one.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c index 0fca40dfa0..42425efd9a 100644 --- a/widgets/table/e-table-scrolled.c +++ b/widgets/table/e-table-scrolled.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h index 2ff7332cc6..d2f5024495 100644 --- a/widgets/table/e-table-scrolled.h +++ b/widgets/table/e-table-scrolled.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c index 307d28de39..401e0fd33f 100644 --- a/widgets/table/e-table-search.c +++ b/widgets/table/e-table-search.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-search.h b/widgets/table/e-table-search.h index 94232bd757..9866d07f94 100644 --- a/widgets/table/e-table-search.h +++ b/widgets/table/e-table-search.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c index 2fdef3f88a..7f6ab4d782 100644 --- a/widgets/table/e-table-selection-model.c +++ b/widgets/table/e-table-selection-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h index 5d7d831205..cbd73901e0 100644 --- a/widgets/table/e-table-selection-model.h +++ b/widgets/table/e-table-selection-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c index d4ba8d8795..a220769ded 100644 --- a/widgets/table/e-table-simple.c +++ b/widgets/table/e-table-simple.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h index b8661fe3df..453a90a54d 100644 --- a/widgets/table/e-table-simple.h +++ b/widgets/table/e-table-simple.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c index e5e3da391c..8d722038e3 100644 --- a/widgets/table/e-table-sort-info.c +++ b/widgets/table/e-table-sort-info.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sort-info.h b/widgets/table/e-table-sort-info.h index 5a1874e9f3..4a0dde4d88 100644 --- a/widgets/table/e-table-sort-info.h +++ b/widgets/table/e-table-sort-info.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c index b181b4390f..02a2e8bf26 100644 --- a/widgets/table/e-table-sorted-variable.c +++ b/widgets/table/e-table-sorted-variable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h index 06d398077b..53744dce72 100644 --- a/widgets/table/e-table-sorted-variable.h +++ b/widgets/table/e-table-sorted-variable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c index 4cb1a6cca7..076863adfb 100644 --- a/widgets/table/e-table-sorted.c +++ b/widgets/table/e-table-sorted.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h index 1d93b2ae93..031d9c9647 100644 --- a/widgets/table/e-table-sorted.h +++ b/widgets/table/e-table-sorted.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c index dc63f74492..154d5a2581 100644 --- a/widgets/table/e-table-sorter.c +++ b/widgets/table/e-table-sorter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h index 81a7eb71f5..245539e36f 100644 --- a/widgets/table/e-table-sorter.h +++ b/widgets/table/e-table-sorter.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c index 479b920d74..d04144d5ad 100644 --- a/widgets/table/e-table-sorting-utils.c +++ b/widgets/table/e-table-sorting-utils.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h index 4ab8714caf..a0f43fb232 100644 --- a/widgets/table/e-table-sorting-utils.h +++ b/widgets/table/e-table-sorting-utils.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c index ff170dfce5..f966b3ca6f 100644 --- a/widgets/table/e-table-specification.c +++ b/widgets/table/e-table-specification.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h index 463bba6ef2..580cbc6ba3 100644 --- a/widgets/table/e-table-specification.h +++ b/widgets/table/e-table-specification.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index 69d33486a2..e9440ecd55 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h index f09baf7c4c..7a320c56ba 100644 --- a/widgets/table/e-table-state.h +++ b/widgets/table/e-table-state.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c index 50913ddaa9..b088d8302a 100644 --- a/widgets/table/e-table-subset-variable.c +++ b/widgets/table/e-table-subset-variable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-subset-variable.h b/widgets/table/e-table-subset-variable.h index 680d426e77..1aed0d3cb3 100644 --- a/widgets/table/e-table-subset-variable.h +++ b/widgets/table/e-table-subset-variable.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c index d1e9ee66b7..1cec532d03 100644 --- a/widgets/table/e-table-subset.c +++ b/widgets/table/e-table-subset.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-subset.h b/widgets/table/e-table-subset.h index e2bf5b46c6..83c9af4d99 100644 --- a/widgets/table/e-table-subset.h +++ b/widgets/table/e-table-subset.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-tooltip.h b/widgets/table/e-table-tooltip.h index 4c85c08a50..5b2acbf584 100644 --- a/widgets/table/e-table-tooltip.h +++ b/widgets/table/e-table-tooltip.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-tree.h b/widgets/table/e-table-tree.h index 13d6bf730d..864359bf33 100644 --- a/widgets/table/e-table-tree.h +++ b/widgets/table/e-table-tree.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c index d01d94ae28..6e87a2a6ce 100644 --- a/widgets/table/e-table-utils.c +++ b/widgets/table/e-table-utils.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-utils.h b/widgets/table/e-table-utils.h index 037a5f97d8..2c725f4bf9 100644 --- a/widgets/table/e-table-utils.h +++ b/widgets/table/e-table-utils.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index 2ee1734d69..7d9c5bfce7 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h index db40ded70f..c43bdab332 100644 --- a/widgets/table/e-table-without.h +++ b/widgets/table/e-table-without.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index f8321011b2..b48fd454f1 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index 6b2a698d5c..4894085330 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c index 3a6f7a8493..08d703b7ff 100644 --- a/widgets/table/e-tree-memory-callbacks.c +++ b/widgets/table/e-tree-memory-callbacks.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h index 89d3a0d756..f74a472642 100644 --- a/widgets/table/e-tree-memory-callbacks.h +++ b/widgets/table/e-tree-memory-callbacks.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index a7d266e0e6..99c9ef9895 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-memory.h b/widgets/table/e-tree-memory.h index 075f740de3..2c82d1c8d1 100644 --- a/widgets/table/e-tree-memory.h +++ b/widgets/table/e-tree-memory.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index b2e2d99a75..bd35358874 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h index 96828a8e0a..ed34933cb1 100644 --- a/widgets/table/e-tree-model.h +++ b/widgets/table/e-tree-model.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c index 7e40ef81d3..18267a42c3 100644 --- a/widgets/table/e-tree-scrolled.c +++ b/widgets/table/e-tree-scrolled.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-scrolled.h b/widgets/table/e-tree-scrolled.h index cbe725a162..5d4b8de36f 100644 --- a/widgets/table/e-tree-scrolled.h +++ b/widgets/table/e-tree-scrolled.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 2b903ca0bc..1d694f9b60 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h index e1541a661f..8652851dcc 100644 --- a/widgets/table/e-tree-selection-model.h +++ b/widgets/table/e-tree-selection-model.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c index be67a95cf8..3252a3db18 100644 --- a/widgets/table/e-tree-simple.c +++ b/widgets/table/e-tree-simple.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h index 95e0bfb486..bb64aa18a2 100644 --- a/widgets/table/e-tree-simple.h +++ b/widgets/table/e-tree-simple.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c index d30812da1f..432a7897e4 100644 --- a/widgets/table/e-tree-sorted-variable.c +++ b/widgets/table/e-tree-sorted-variable.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-sorted-variable.h b/widgets/table/e-tree-sorted-variable.h index 6abed5e397..15f9d8e8af 100644 --- a/widgets/table/e-tree-sorted-variable.h +++ b/widgets/table/e-tree-sorted-variable.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index dd326ec094..092fa87b9b 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-sorted.h b/widgets/table/e-tree-sorted.h index 1dc7f056fb..1e286b7e75 100644 --- a/widgets/table/e-tree-sorted.h +++ b/widgets/table/e-tree-sorted.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 8e583ec8a8..7cfeab33ed 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree-table-adapter.h b/widgets/table/e-tree-table-adapter.h index d1296c2b1d..13ab5787c0 100644 --- a/widgets/table/e-tree-table-adapter.h +++ b/widgets/table/e-tree-table-adapter.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 2eba9d4a82..e58ac1bdd9 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -3415,7 +3415,7 @@ tree_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *tree) /** * e_tree_set_info_message: * @tree: #ETree instance - * @info_message: Message to set. Can be NULL. + * @info_message: Message to set. Can be NULL. * * Creates an info message in table area, or removes old. **/ diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h index 361ab5adc7..426cf9c44d 100644 --- a/widgets/table/e-tree.h +++ b/widgets/table/e-tree.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/table/table-test.h b/widgets/table/table-test.h index 3dc7d98162..8b179bafdf 100644 --- a/widgets/table/table-test.h +++ b/widgets/table/table-test.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/text/e-text-model-repos.c b/widgets/text/e-text-model-repos.c index 0b55930792..ef31f91def 100644 --- a/widgets/text/e-text-model-repos.c +++ b/widgets/text/e-text-model-repos.c @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/text/e-text-model-repos.h b/widgets/text/e-text-model-repos.h index 461a70f59d..6a185daa08 100644 --- a/widgets/text/e-text-model-repos.h +++ b/widgets/text/e-text-model-repos.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index 663cdd6e30..c7462e21a6 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h index 2a484f14b4..69c6f0c68e 100644 --- a/widgets/text/e-text-model.h +++ b/widgets/text/e-text-model.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index bd79c0ad7b..c225636885 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -386,10 +386,10 @@ reset_layout_attrs (EText *text) } pango_layout_set_attributes (text->layout, attrs); - + if (attrs) pango_attr_list_unref (attrs); - + calc_height (text); } @@ -1514,12 +1514,12 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, } } - /* Insert preedit text only when im_context signals are connected & + /* Insert preedit text only when im_context signals are connected & * text->preedit_len is not zero */ if (text->im_context_signals_registered && text->preedit_len) insert_preedit_text (text); - /* Need to reset the layout to cleanly clear the preedit buffer when + /* Need to reset the layout to cleanly clear the preedit buffer when * typing in CJK & using backspace on the preedit */ if(!text->preedit_len) reset_layout (text); diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index a426b2c64f..ebe5817285 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: -- cgit v1.2.3 From fad4af8a3d4c6f50f7bcceca8d545eb17d6fd056 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 27 May 2009 11:13:25 -0400 Subject: Prefer GLib basic types over C types. --- a11y/addressbook/ea-addressbook-view.c | 8 +- a11y/addressbook/ea-minicard-view.c | 18 +- a11y/addressbook/ea-minicard.c | 18 +- a11y/calendar/ea-cal-view-event.c | 18 +- a11y/calendar/ea-cal-view.c | 18 +- a11y/calendar/ea-calendar.c | 4 +- a11y/calendar/ea-day-view-cell.c | 10 +- a11y/calendar/ea-day-view-main-item.c | 16 +- a11y/calendar/ea-day-view.c | 10 +- a11y/calendar/ea-gnome-calendar.c | 16 +- a11y/calendar/ea-jump-button.c | 12 +- a11y/calendar/ea-week-view-cell.c | 10 +- a11y/calendar/ea-week-view-main-item.c | 16 +- a11y/calendar/ea-week-view.c | 14 +- a11y/e-table/gal-a11y-e-cell-popup.c | 6 +- a11y/e-table/gal-a11y-e-cell-popup.h | 6 +- a11y/e-table/gal-a11y-e-cell-registry.c | 6 +- a11y/e-table/gal-a11y-e-cell-registry.h | 12 +- a11y/e-table/gal-a11y-e-cell-text.c | 18 +- a11y/e-table/gal-a11y-e-cell-text.h | 6 +- a11y/e-table/gal-a11y-e-cell-toggle.c | 6 +- a11y/e-table/gal-a11y-e-cell-toggle.h | 6 +- a11y/e-table/gal-a11y-e-cell-tree.c | 6 +- a11y/e-table/gal-a11y-e-cell-tree.h | 8 +- a11y/e-table/gal-a11y-e-cell-vbox.c | 8 +- a11y/e-table/gal-a11y-e-cell-vbox.h | 8 +- a11y/e-table/gal-a11y-e-cell.c | 22 +- a11y/e-table/gal-a11y-e-cell.h | 18 +- a11y/e-table/gal-a11y-e-table-click-to-add.c | 6 +- a11y/e-table/gal-a11y-e-table-column-header.c | 4 +- a11y/e-table/gal-a11y-e-table-item.c | 40 +- a11y/e-table/gal-a11y-e-table.c | 4 +- a11y/e-table/gal-a11y-e-tree.c | 2 +- a11y/e-text/gal-a11y-e-text.c | 68 ++-- a11y/ea-cell-table.c | 8 +- a11y/ea-cell-table.h | 4 +- a11y/ea-factory.h | 2 +- a11y/gal-a11y-factory.h | 2 +- a11y/gal-a11y-util.h | 2 +- a11y/widgets/ea-calendar-cell.c | 10 +- a11y/widgets/ea-calendar-item.c | 16 +- a11y/widgets/ea-combo-button.c | 2 +- addressbook/conduit/address-conduit.c | 170 ++++----- addressbook/gui/component/addressbook-component.c | 42 +-- addressbook/gui/component/addressbook-component.h | 2 +- addressbook/gui/component/addressbook-config.c | 106 +++--- addressbook/gui/component/addressbook-migrate.c | 132 +++---- addressbook/gui/component/addressbook-migrate.h | 2 +- addressbook/gui/component/addressbook-view.c | 104 +++--- addressbook/gui/component/addressbook-view.h | 4 +- addressbook/gui/component/addressbook.c | 12 +- addressbook/gui/component/autocompletion-config.c | 4 +- addressbook/gui/component/component-factory.c | 4 +- addressbook/gui/component/openldap-extract.h | 190 +++++----- .../gui/contact-editor/e-contact-editor-fullname.c | 6 +- addressbook/gui/contact-editor/e-contact-editor.c | 104 +++--- addressbook/gui/contact-editor/e-contact-editor.h | 2 +- .../gui/contact-editor/e-contact-quick-add.c | 2 +- addressbook/gui/contact-editor/eab-editor.c | 4 +- addressbook/gui/contact-editor/eab-editor.h | 2 +- addressbook/gui/contact-editor/test-editor.c | 16 +- .../contact-list-editor/e-contact-list-editor.c | 2 +- addressbook/gui/merging/eab-contact-compare.c | 8 +- addressbook/gui/merging/eab-contact-merging.c | 40 +- addressbook/gui/widgets/e-addressbook-model.c | 28 +- addressbook/gui/widgets/e-addressbook-model.h | 18 +- .../gui/widgets/e-addressbook-reflow-adapter.c | 34 +- .../gui/widgets/e-addressbook-reflow-adapter.h | 2 +- .../gui/widgets/e-addressbook-table-adapter.c | 48 +-- addressbook/gui/widgets/e-addressbook-view.c | 104 +++--- addressbook/gui/widgets/e-addressbook-view.h | 2 +- addressbook/gui/widgets/e-minicard-label.c | 4 +- addressbook/gui/widgets/e-minicard-view-widget.c | 4 +- addressbook/gui/widgets/e-minicard-view-widget.h | 2 +- addressbook/gui/widgets/e-minicard-view.c | 24 +- addressbook/gui/widgets/e-minicard.c | 66 ++-- addressbook/gui/widgets/e-minicard.h | 6 +- addressbook/gui/widgets/eab-config.c | 4 +- addressbook/gui/widgets/eab-config.h | 2 +- addressbook/gui/widgets/eab-contact-display.c | 98 ++--- addressbook/gui/widgets/eab-gui-util.c | 76 ++-- addressbook/gui/widgets/eab-gui-util.h | 8 +- addressbook/gui/widgets/eab-menu.c | 16 +- addressbook/gui/widgets/eab-menu.h | 4 +- addressbook/gui/widgets/eab-popup-control.c | 2 +- addressbook/gui/widgets/eab-popup.c | 18 +- addressbook/gui/widgets/eab-popup.h | 12 +- .../gui/widgets/gal-view-factory-minicard.c | 6 +- addressbook/gui/widgets/gal-view-minicard.c | 18 +- addressbook/gui/widgets/gal-view-minicard.h | 2 +- addressbook/importers/evolution-csv-importer.c | 34 +- addressbook/importers/evolution-ldif-importer.c | 44 +-- addressbook/importers/evolution-vcard-importer.c | 32 +- addressbook/printing/e-contact-print.c | 60 +-- addressbook/printing/test-print.c | 4 +- .../evolution-addressbook-export-list-cards.c | 14 +- .../evolution-addressbook-export-list-folders.c | 4 +- addressbook/tools/evolution-addressbook-export.c | 12 +- addressbook/util/eab-book-util.c | 54 +-- addressbook/util/eab-book-util.h | 18 +- calendar/common/authentication.c | 20 +- calendar/common/authentication.h | 2 +- calendar/conduits/calendar/calendar-conduit.c | 116 +++--- .../conduits/common/libecalendar-common-conduit.c | 62 ++-- .../conduits/common/libecalendar-common-conduit.h | 18 +- calendar/conduits/memo/memo-conduit.c | 86 ++--- calendar/conduits/todo/todo-conduit.c | 106 +++--- calendar/gui/alarm-notify/alarm-notify-dialog.c | 16 +- calendar/gui/alarm-notify/alarm-notify-dialog.h | 6 +- calendar/gui/alarm-notify/alarm-notify.c | 28 +- calendar/gui/alarm-notify/alarm-notify.h | 2 +- calendar/gui/alarm-notify/alarm-queue.c | 58 +-- calendar/gui/alarm-notify/config-data.c | 18 +- calendar/gui/alarm-notify/config-data.h | 8 +- calendar/gui/alarm-notify/notify-main.c | 8 +- calendar/gui/alarm-notify/util.c | 16 +- calendar/gui/alarm-notify/util.h | 4 +- calendar/gui/cal-search-bar.c | 60 +-- calendar/gui/cal-search-bar.h | 6 +- calendar/gui/calendar-commands.c | 30 +- calendar/gui/calendar-component.c | 116 +++--- calendar/gui/calendar-component.h | 4 +- calendar/gui/calendar-config.c | 62 ++-- calendar/gui/calendar-config.h | 36 +- calendar/gui/calendar-view-factory.c | 12 +- calendar/gui/calendar-view.c | 28 +- calendar/gui/calendar-view.h | 4 +- calendar/gui/comp-editor-factory.c | 14 +- calendar/gui/comp-util.c | 44 +-- calendar/gui/comp-util.h | 2 +- calendar/gui/dialogs/alarm-dialog.c | 62 ++-- calendar/gui/dialogs/alarm-list-dialog.c | 6 +- calendar/gui/dialogs/cal-attachment-select-file.c | 10 +- calendar/gui/dialogs/cal-attachment-select-file.h | 4 +- calendar/gui/dialogs/cal-prefs-dialog.c | 46 +-- calendar/gui/dialogs/calendar-setup.c | 46 +-- calendar/gui/dialogs/cancel-comp.c | 2 +- calendar/gui/dialogs/changed-comp.c | 2 +- calendar/gui/dialogs/comp-editor-page.c | 2 +- calendar/gui/dialogs/comp-editor-page.h | 4 +- calendar/gui/dialogs/comp-editor-util.c | 20 +- calendar/gui/dialogs/comp-editor-util.h | 2 +- calendar/gui/dialogs/comp-editor.c | 50 +-- calendar/gui/dialogs/copy-source-dialog.c | 6 +- calendar/gui/dialogs/delete-comp.c | 12 +- calendar/gui/dialogs/delete-comp.h | 4 +- calendar/gui/dialogs/delete-error.c | 2 +- calendar/gui/dialogs/e-delegate-dialog.c | 16 +- calendar/gui/dialogs/e-delegate-dialog.h | 14 +- calendar/gui/dialogs/e-send-options-utils.c | 24 +- calendar/gui/dialogs/event-editor.c | 4 +- calendar/gui/dialogs/event-page.c | 88 ++--- calendar/gui/dialogs/memo-page.c | 40 +- calendar/gui/dialogs/recur-comp.c | 2 +- calendar/gui/dialogs/recurrence-page.c | 58 +-- calendar/gui/dialogs/schedule-page.c | 2 +- calendar/gui/dialogs/select-source-dialog.c | 6 +- calendar/gui/dialogs/send-comp.c | 6 +- calendar/gui/dialogs/task-details-page.c | 18 +- calendar/gui/dialogs/task-editor.c | 2 +- calendar/gui/dialogs/task-page.c | 54 +-- calendar/gui/e-alarm-list.c | 10 +- calendar/gui/e-cal-component-memo-preview.c | 24 +- calendar/gui/e-cal-component-memo-preview.h | 2 +- calendar/gui/e-cal-component-preview.c | 32 +- calendar/gui/e-cal-component-preview.h | 4 +- calendar/gui/e-cal-config.c | 4 +- calendar/gui/e-cal-config.h | 2 +- calendar/gui/e-cal-event.c | 4 +- calendar/gui/e-cal-list-view.c | 6 +- calendar/gui/e-cal-menu.c | 12 +- calendar/gui/e-cal-menu.h | 2 +- calendar/gui/e-cal-model-calendar.c | 72 ++-- calendar/gui/e-cal-model-memos.c | 48 +-- calendar/gui/e-cal-model-tasks.c | 116 +++--- calendar/gui/e-cal-model.c | 152 ++++---- calendar/gui/e-cal-model.h | 10 +- calendar/gui/e-cal-popup.c | 32 +- calendar/gui/e-cal-popup.h | 2 +- calendar/gui/e-calendar-table.c | 178 ++++----- calendar/gui/e-calendar-table.h | 2 +- calendar/gui/e-calendar-view.c | 150 ++++---- calendar/gui/e-calendar-view.h | 16 +- calendar/gui/e-cell-date-edit-config.c | 2 +- calendar/gui/e-cell-date-edit-text.c | 16 +- calendar/gui/e-cell-date-edit-text.h | 2 +- calendar/gui/e-comp-editor-registry.c | 6 +- calendar/gui/e-comp-editor-registry.h | 2 +- calendar/gui/e-date-edit-config.c | 2 +- calendar/gui/e-date-time-list.c | 4 +- calendar/gui/e-day-view-config.c | 14 +- calendar/gui/e-day-view-main-item.c | 56 +-- calendar/gui/e-day-view-time-item.c | 20 +- calendar/gui/e-day-view-top-item.c | 8 +- calendar/gui/e-day-view.c | 92 ++--- calendar/gui/e-day-view.h | 8 +- calendar/gui/e-itip-control.c | 108 +++--- calendar/gui/e-meeting-attendee.c | 4 +- calendar/gui/e-meeting-list-view.c | 78 ++-- calendar/gui/e-meeting-store.c | 78 ++-- calendar/gui/e-meeting-store.h | 4 +- calendar/gui/e-meeting-time-sel-item.c | 44 +-- calendar/gui/e-meeting-time-sel.c | 26 +- calendar/gui/e-meeting-time-sel.h | 6 +- calendar/gui/e-memo-table.c | 56 +-- calendar/gui/e-memos.c | 52 +-- calendar/gui/e-memos.h | 2 +- calendar/gui/e-mini-calendar-config.c | 2 +- calendar/gui/e-tasks.c | 80 ++-- calendar/gui/e-tasks.h | 8 +- calendar/gui/e-timezone-entry.c | 4 +- calendar/gui/e-week-view-config.c | 2 +- calendar/gui/e-week-view-event-item.c | 6 +- calendar/gui/e-week-view-layout.c | 4 +- calendar/gui/e-week-view-main-item.c | 2 +- calendar/gui/e-week-view-titles-item.c | 2 +- calendar/gui/e-week-view.c | 60 +-- calendar/gui/gnome-cal.c | 116 +++--- calendar/gui/gnome-cal.h | 10 +- calendar/gui/goto.c | 4 +- calendar/gui/itip-bonobo-control.c | 12 +- calendar/gui/itip-utils.c | 98 ++--- calendar/gui/itip-utils.h | 14 +- calendar/gui/main.c | 4 +- calendar/gui/memos-component.c | 82 ++--- calendar/gui/memos-component.h | 4 +- calendar/gui/memos-control.c | 18 +- calendar/gui/memos-control.h | 2 +- calendar/gui/migration.c | 102 +++--- calendar/gui/migration.h | 6 +- calendar/gui/misc.c | 22 +- calendar/gui/misc.h | 6 +- calendar/gui/print.c | 140 +++---- calendar/gui/tag-calendar.c | 2 +- calendar/gui/tasks-component.c | 96 ++--- calendar/gui/tasks-component.h | 4 +- calendar/gui/tasks-control.c | 38 +- calendar/gui/tasks-control.h | 2 +- calendar/gui/weekday-picker.c | 44 +-- calendar/gui/weekday-picker.h | 4 +- calendar/importers/icalendar-importer.c | 42 +-- calendar/importers/main.c | 2 +- composer/e-composer-header.c | 2 +- composer/e-msg-composer.c | 14 +- e-util/e-bconf-map.c | 154 ++++---- e-util/e-bconf-map.h | 24 +- e-util/e-bit-array.c | 72 ++-- e-util/e-bit-array.h | 30 +- e-util/e-categories-config.c | 10 +- e-util/e-categories-config.h | 2 +- e-util/e-config-listener.c | 48 +-- e-util/e-config-listener.h | 36 +- e-util/e-config.c | 78 ++-- e-util/e-config.h | 52 +-- e-util/e-corba-utils.c | 4 +- e-util/e-corba-utils.h | 4 +- e-util/e-dialog-utils.c | 48 +-- e-util/e-dialog-utils.h | 14 +- e-util/e-dialog-widgets.c | 64 ++-- e-util/e-dialog-widgets.h | 16 +- e-util/e-error.c | 98 ++--- e-util/e-error.h | 8 +- e-util/e-event.c | 46 +-- e-util/e-event.h | 28 +- e-util/e-folder-map.c | 22 +- e-util/e-fsutils.c | 10 +- e-util/e-fsutils.h | 4 +- e-util/e-html-utils.c | 106 +++--- e-util/e-html-utils.h | 4 +- e-util/e-icon-factory.c | 24 +- e-util/e-import.c | 36 +- e-util/e-import.h | 52 +-- e-util/e-menu.c | 64 ++-- e-util/e-menu.h | 54 +-- e-util/e-mktemp.c | 28 +- e-util/e-mktemp.h | 6 +- e-util/e-non-intrusive-error-dialog.c | 24 +- e-util/e-non-intrusive-error-dialog.h | 6 +- e-util/e-pilot-map.c | 74 ++-- e-util/e-pilot-map.h | 14 +- e-util/e-pilot-util.c | 16 +- e-util/e-pilot-util.h | 4 +- e-util/e-plugin.c | 168 ++++----- e-util/e-plugin.h | 74 ++-- e-util/e-popup.c | 50 +-- e-util/e-popup.h | 34 +- e-util/e-profile-event.c | 10 +- e-util/e-profile-event.h | 8 +- e-util/e-request.c | 10 +- e-util/e-request.h | 8 +- e-util/e-signature-list.c | 14 +- e-util/e-signature-list.h | 2 +- e-util/e-signature.c | 66 ++-- e-util/e-signature.h | 14 +- e-util/e-sorter-array.c | 40 +- e-util/e-sorter-array.h | 14 +- e-util/e-sorter.c | 24 +- e-util/e-sorter.h | 24 +- e-util/e-util-labels.c | 58 +-- e-util/e-util-labels.h | 18 +- e-util/e-util-private.h | 40 +- e-util/e-util.c | 42 +-- e-util/e-util.h | 6 +- e-util/e-win32-reloc.c | 52 +-- e-util/e-xml-utils.c | 48 +-- e-util/gconf-bridge.c | 36 +- e-util/gconf-bridge.h | 8 +- filter/filter-code.c | 6 +- filter/filter-colour.c | 30 +- filter/filter-datespec.c | 56 +-- filter/filter-element.c | 16 +- filter/filter-element.h | 8 +- filter/filter-file.c | 32 +- filter/filter-file.h | 8 +- filter/filter-input.c | 44 +-- filter/filter-input.h | 6 +- filter/filter-int.c | 30 +- filter/filter-int.h | 12 +- filter/filter-option.c | 54 +-- filter/filter-option.h | 16 +- filter/filter-part.c | 48 +-- filter/filter-part.h | 18 +- filter/filter-rule.c | 98 ++--- filter/filter-rule.h | 26 +- filter/rule-context.c | 112 +++--- filter/rule-context.h | 52 +-- filter/rule-editor.c | 52 +-- filter/rule-editor.h | 18 +- iconv-detect.c | 18 +- mail/e-searching-tokenizer.c | 150 ++++---- mail/e-searching-tokenizer.h | 10 +- mail/em-account-editor.c | 346 +++++++++--------- mail/em-account-editor.h | 8 +- mail/em-account-prefs.c | 26 +- mail/em-composer-prefs.c | 10 +- mail/em-composer-utils.c | 228 ++++++------ mail/em-composer-utils.h | 30 +- mail/em-config.c | 10 +- mail/em-config.h | 6 +- mail/em-event.c | 12 +- mail/em-event.h | 18 +- mail/em-filter-context.c | 24 +- mail/em-filter-context.h | 4 +- mail/em-filter-editor.c | 10 +- mail/em-filter-folder-element.c | 34 +- mail/em-filter-folder-element.h | 4 +- mail/em-filter-i18n.h | 148 ++++---- mail/em-filter-rule.c | 30 +- mail/em-filter-source-element.c | 46 +-- mail/em-filter-source-element.h | 2 +- mail/em-folder-browser.c | 164 ++++----- mail/em-folder-properties.c | 42 +-- mail/em-folder-properties.h | 2 +- mail/em-folder-selection-button.c | 22 +- mail/em-folder-selection-button.h | 6 +- mail/em-folder-selection.c | 12 +- mail/em-folder-selection.h | 6 +- mail/em-folder-selector.c | 40 +- mail/em-folder-selector.h | 18 +- mail/em-folder-tree-model.c | 160 ++++---- mail/em-folder-tree-model.h | 48 +-- mail/em-folder-tree.c | 180 ++++----- mail/em-folder-tree.h | 16 +- mail/em-folder-utils.c | 70 ++-- mail/em-folder-utils.h | 4 +- mail/em-folder-view.c | 356 +++++++++--------- mail/em-folder-view.h | 30 +- mail/em-format-hook.c | 10 +- mail/em-format-hook.h | 4 +- mail/em-format-html-display.c | 120 +++--- mail/em-format-html-display.h | 18 +- mail/em-format-html-print.c | 4 +- mail/em-format-html.c | 180 ++++----- mail/em-format-html.h | 32 +- mail/em-format-quote.c | 52 +-- mail/em-format-quote.h | 2 +- mail/em-format.c | 104 +++--- mail/em-format.h | 52 +-- mail/em-html-stream.c | 8 +- mail/em-icon-stream.c | 40 +- mail/em-icon-stream.h | 10 +- mail/em-inline-filter.c | 36 +- mail/em-inline-filter.h | 4 +- mail/em-junk-hook.c | 20 +- mail/em-junk-hook.h | 14 +- mail/em-mailer-prefs.c | 126 +++---- mail/em-mailer-prefs.h | 6 +- mail/em-menu.c | 16 +- mail/em-menu.h | 6 +- mail/em-migrate.c | 398 ++++++++++---------- mail/em-migrate.h | 2 +- mail/em-network-prefs.c | 30 +- mail/em-popup.c | 68 ++-- mail/em-popup.h | 18 +- mail/em-search-context.c | 4 +- mail/em-stripsig-filter.c | 26 +- mail/em-subscribe-editor.c | 60 +-- mail/em-utils.c | 230 ++++++------ mail/em-utils.h | 40 +- mail/em-vfolder-context.c | 4 +- mail/em-vfolder-editor.c | 2 +- mail/em-vfolder-rule.c | 88 ++--- mail/em-vfolder-rule.h | 8 +- mail/importers/elm-importer.c | 38 +- mail/importers/evolution-mbox-importer.c | 26 +- mail/importers/mail-importer.c | 56 +-- mail/importers/mail-importer.h | 18 +- mail/importers/pine-importer.c | 28 +- mail/mail-autofilter.c | 86 ++--- mail/mail-autofilter.h | 12 +- mail/mail-component-factory.c | 6 +- mail/mail-component.c | 144 ++++---- mail/mail-component.h | 18 +- mail/mail-config-factory.c | 2 +- mail/mail-config-factory.h | 2 +- mail/mail-config.c | 114 +++--- mail/mail-config.h | 40 +- mail/mail-folder-cache.c | 108 +++--- mail/mail-folder-cache.h | 8 +- mail/mail-mt.c | 122 +++---- mail/mail-mt.h | 22 +- mail/mail-ops.c | 336 ++++++++--------- mail/mail-ops.h | 142 ++++---- mail/mail-send-recv.c | 76 ++-- mail/mail-session.c | 112 +++--- mail/mail-session.h | 24 +- mail/mail-tools.c | 54 +-- mail/mail-tools.h | 12 +- mail/mail-vfolder.c | 116 +++--- mail/mail-vfolder.h | 14 +- mail/message-list.c | 404 ++++++++++----------- mail/message-list.h | 34 +- mail/message-tag-followup.c | 22 +- mail/message-tag-followup.h | 4 +- plugins/addressbook-file/addressbook-file.c | 4 +- plugins/attachment-reminder/attachment-reminder.c | 18 +- plugins/audio-inline/audio-inline.c | 18 +- plugins/backup-restore/backup-restore.c | 38 +- plugins/backup-restore/backup.c | 58 +-- plugins/bbdb/bbdb.c | 34 +- plugins/bbdb/bbdb.h | 2 +- plugins/bbdb/gaimbuddies.c | 76 ++-- plugins/bbdb/test-evobuddy.c | 2 +- plugins/bogo-junk-plugin/bf-junk-filter.c | 18 +- plugins/caldav/caldav-source.c | 48 +-- plugins/calendar-file/calendar-file.c | 4 +- plugins/calendar-http/calendar-http.c | 38 +- plugins/calendar-weather/calendar-weather.c | 60 +-- plugins/copy-tool/copy-tool.c | 8 +- plugins/default-source/default-source.c | 6 +- plugins/email-custom-header/email-custom-header.c | 26 +- plugins/email-custom-header/email-custom-header.h | 2 +- .../exchange-operations/exchange-account-setup.c | 82 ++--- plugins/exchange-operations/exchange-calendar.c | 30 +- .../exchange-operations/exchange-change-password.c | 10 +- .../exchange-operations/exchange-change-password.h | 2 +- .../exchange-operations/exchange-config-listener.c | 96 ++--- .../exchange-operations/exchange-config-listener.h | 8 +- plugins/exchange-operations/exchange-contacts.c | 36 +- .../exchange-operations/exchange-delegates-user.c | 34 +- .../exchange-operations/exchange-delegates-user.h | 6 +- plugins/exchange-operations/exchange-delegates.c | 72 ++-- plugins/exchange-operations/exchange-delegates.h | 2 +- .../exchange-folder-permission.c | 28 +- .../exchange-folder-size-display.c | 12 +- .../exchange-folder-size-display.h | 2 +- .../exchange-folder-subscription.c | 14 +- plugins/exchange-operations/exchange-folder.c | 60 +-- .../exchange-mail-send-options.c | 10 +- plugins/exchange-operations/exchange-operations.c | 26 +- plugins/exchange-operations/exchange-operations.h | 10 +- .../exchange-permissions-dialog.c | 34 +- .../exchange-operations/exchange-send-options.c | 8 +- .../exchange-operations/exchange-send-options.h | 6 +- plugins/exchange-operations/exchange-user-dialog.c | 12 +- plugins/exchange-operations/exchange-user-dialog.h | 6 +- plugins/external-editor/external-editor.c | 8 +- plugins/face/face.c | 4 +- plugins/folder-unsubscribe/folder-unsubscribe.c | 4 +- .../google-account-setup/google-contacts-source.c | 24 +- plugins/google-account-setup/google-source.c | 78 ++-- .../groupwise-account-setup/camel-gw-listener.c | 106 +++--- .../groupwise-account-setup.c | 10 +- plugins/groupwise-features/addressbook-groupwise.c | 4 +- plugins/groupwise-features/install-shared.c | 24 +- plugins/groupwise-features/junk-mail-settings.c | 12 +- plugins/groupwise-features/junk-settings.c | 16 +- plugins/groupwise-features/mail-retract.c | 16 +- plugins/groupwise-features/mail-send-options.c | 8 +- plugins/groupwise-features/process-meeting.c | 60 +-- plugins/groupwise-features/proxy-login.c | 52 +-- plugins/groupwise-features/proxy-login.h | 10 +- plugins/groupwise-features/proxy.c | 38 +- plugins/groupwise-features/proxy.h | 2 +- plugins/groupwise-features/send-options.c | 22 +- plugins/groupwise-features/share-folder-common.c | 50 +-- plugins/groupwise-features/share-folder.c | 16 +- plugins/groupwise-features/status-track.c | 24 +- plugins/hula-account-setup/camel-hula-listener.c | 40 +- plugins/hula-account-setup/hula-account-setup.c | 6 +- plugins/imap-features/imap-headers.c | 12 +- plugins/ipod-sync/evolution-ipod-sync.c | 4 +- plugins/ipod-sync/evolution-ipod-sync.h | 6 +- plugins/ipod-sync/format-handler.h | 4 +- plugins/ipod-sync/ical-format.c | 6 +- plugins/ipod-sync/ipod-sync.c | 12 +- plugins/ipod-sync/ipod.c | 34 +- plugins/ipod-sync/sync.c | 16 +- plugins/itip-formatter/itip-formatter.c | 138 +++---- plugins/itip-formatter/itip-view.c | 112 +++--- plugins/itip-formatter/itip-view.h | 58 +-- .../mail-account-disable/mail-account-disable.c | 6 +- plugins/mail-notification/mail-notification.c | 26 +- plugins/mail-to-task/mail-to-task.c | 88 ++--- .../mailing-list-actions/mailing-list-actions.c | 20 +- plugins/mark-all-read/mark-all-read.c | 6 +- plugins/mono/mono-plugin.c | 24 +- plugins/mono/mono-plugin.h | 6 +- plugins/plugin-manager/plugin-manager.c | 30 +- plugins/prefer-plain/prefer-plain.c | 34 +- plugins/profiler/profiler.c | 2 +- plugins/pst-import/pst-importer.c | 92 ++--- plugins/publish-calendar/publish-calendar.c | 30 +- plugins/publish-calendar/publish-format-fb.c | 6 +- plugins/publish-calendar/publish-format-ical.c | 6 +- plugins/publish-calendar/publish-location.c | 82 ++--- plugins/publish-calendar/publish-location.h | 8 +- plugins/publish-calendar/url-editor-dialog.c | 18 +- plugins/python/python-plugin-loader.c | 20 +- plugins/python/python-plugin-loader.h | 8 +- plugins/sa-junk-plugin/em-junk-filter.c | 76 ++-- plugins/save-calendar/csv-format.c | 20 +- plugins/save-calendar/format-handler.h | 4 +- plugins/save-calendar/ical-format.c | 10 +- plugins/save-calendar/rdf-format.c | 58 +-- plugins/save-calendar/save-calendar.c | 8 +- plugins/startup-wizard/startup-wizard.c | 12 +- plugins/templates/templates.c | 42 +-- plugins/tnef-attachments/tnef-plugin.c | 94 ++--- plugins/vcard-inline/vcard-inline.c | 4 +- .../webdav-account-setup/webdav-contacts-source.c | 20 +- shell/e-component-registry.c | 52 +-- shell/e-component-registry.h | 20 +- shell/e-component-view.c | 8 +- shell/e-component-view.h | 10 +- shell/e-config-upgrade.c | 8 +- shell/e-config-upgrade.h | 2 +- shell/e-shell-importer.c | 36 +- shell/e-shell-nm.c | 4 +- shell/e-shell-settings-dialog.c | 40 +- shell/e-shell-settings-dialog.h | 2 +- shell/e-shell-view.c | 8 +- shell/e-shell-window-commands.c | 74 ++-- shell/e-shell-window.c | 58 +-- shell/e-shell-window.h | 10 +- shell/e-shell.c | 78 ++-- shell/e-shell.h | 8 +- shell/e-sidebar.c | 48 +-- shell/e-sidebar.h | 18 +- shell/e-user-creatable-items-handler.c | 90 ++--- shell/e-user-creatable-items-handler.h | 6 +- shell/es-event.c | 10 +- shell/es-event.h | 16 +- shell/es-menu.c | 6 +- shell/es-menu.h | 2 +- shell/evolution-listener.c | 2 +- shell/evolution-listener.h | 6 +- shell/evolution-shell-component-utils.c | 8 +- shell/evolution-shell-component-utils.h | 8 +- shell/importer/evolution-importer-client.c | 10 +- shell/importer/evolution-importer-client.h | 8 +- shell/importer/evolution-importer-listener.c | 6 +- shell/importer/evolution-importer-listener.h | 4 +- shell/importer/evolution-importer.c | 6 +- shell/importer/evolution-importer.h | 16 +- shell/importer/evolution-intelligent-importer.c | 18 +- shell/importer/evolution-intelligent-importer.h | 10 +- shell/importer/intelligent.c | 32 +- shell/main.c | 18 +- shell/test/evolution-test-component.c | 6 +- smime/gui/ca-trust-dialog.c | 4 +- smime/gui/cert-trust-dialog.c | 4 +- smime/gui/certificate-manager.c | 16 +- smime/gui/certificate-viewer.c | 12 +- smime/gui/component.c | 12 +- smime/gui/e-cert-selector.c | 8 +- smime/gui/e-cert-selector.h | 4 +- smime/lib/e-asn1-object.c | 36 +- smime/lib/e-asn1-object.h | 12 +- smime/lib/e-cert-db.c | 116 +++--- smime/lib/e-cert-db.h | 28 +- smime/lib/e-cert-trust.c | 10 +- smime/lib/e-cert-trust.h | 10 +- smime/lib/e-cert.c | 122 +++---- smime/lib/e-cert.h | 38 +- smime/lib/e-pkcs12.c | 46 +-- smime/lib/e-pkcs12.h | 4 +- smime/tests/import-cert.c | 4 +- tools/killev.c | 34 +- widgets/e-timezone-dialog/e-timezone-dialog.c | 38 +- widgets/menus/gal-define-views-dialog.c | 18 +- widgets/menus/gal-define-views-model.c | 36 +- widgets/menus/gal-define-views-model.h | 6 +- widgets/menus/gal-view-collection.c | 114 +++--- widgets/menus/gal-view-collection.h | 58 +-- widgets/menus/gal-view-etable.c | 10 +- widgets/menus/gal-view-etable.h | 2 +- widgets/menus/gal-view-factory-etable.c | 6 +- widgets/menus/gal-view-factory.c | 6 +- widgets/menus/gal-view-factory.h | 12 +- widgets/menus/gal-view-instance-save-as-dialog.c | 10 +- widgets/menus/gal-view-instance.c | 52 +-- widgets/menus/gal-view-instance.h | 26 +- widgets/menus/gal-view-menus.c | 46 +-- widgets/menus/gal-view-new-dialog.c | 2 +- widgets/menus/gal-view.c | 10 +- widgets/menus/gal-view.h | 20 +- widgets/misc/e-activity-handler.c | 68 ++-- widgets/misc/e-activity-handler.h | 18 +- widgets/misc/e-calendar-item.c | 22 +- widgets/misc/e-calendar-item.h | 2 +- widgets/misc/e-canvas-background.c | 10 +- widgets/misc/e-canvas-utils.c | 10 +- widgets/misc/e-canvas-vbox.c | 4 +- widgets/misc/e-canvas.c | 28 +- widgets/misc/e-canvas.h | 10 +- widgets/misc/e-cell-date-edit.c | 46 +-- widgets/misc/e-cell-percent.c | 20 +- widgets/misc/e-cell-percent.h | 2 +- widgets/misc/e-charset-picker.c | 54 +-- widgets/misc/e-charset-picker.h | 14 +- widgets/misc/e-colors.c | 2 +- widgets/misc/e-colors.h | 2 +- widgets/misc/e-combo-button.c | 16 +- widgets/misc/e-combo-button.h | 2 +- widgets/misc/e-combo-cell-editable.c | 2 +- widgets/misc/e-cursors.c | 16 +- widgets/misc/e-dateedit.c | 22 +- widgets/misc/e-dropdown-button.c | 14 +- widgets/misc/e-dropdown-button.h | 4 +- widgets/misc/e-filter-bar.c | 106 +++--- widgets/misc/e-filter-bar.h | 32 +- widgets/misc/e-gui-utils.c | 8 +- widgets/misc/e-gui-utils.h | 8 +- widgets/misc/e-icon-entry.c | 14 +- widgets/misc/e-icon-entry.h | 2 +- widgets/misc/e-image-chooser.c | 40 +- widgets/misc/e-image-chooser.h | 6 +- widgets/misc/e-info-label.c | 10 +- widgets/misc/e-info-label.h | 4 +- widgets/misc/e-map.c | 56 +-- widgets/misc/e-multi-config-dialog.c | 20 +- widgets/misc/e-multi-config-dialog.h | 6 +- widgets/misc/e-popup-menu.c | 18 +- widgets/misc/e-popup-menu.h | 8 +- widgets/misc/e-reflow-model.c | 24 +- widgets/misc/e-reflow-model.h | 44 +-- widgets/misc/e-reflow.c | 120 +++--- widgets/misc/e-reflow.h | 18 +- widgets/misc/e-search-bar.c | 112 +++--- widgets/misc/e-search-bar.h | 44 +-- widgets/misc/e-selection-model-array.c | 44 +-- widgets/misc/e-selection-model-array.h | 12 +- widgets/misc/e-selection-model-simple.c | 14 +- widgets/misc/e-selection-model-simple.h | 16 +- widgets/misc/e-selection-model.c | 58 +-- widgets/misc/e-selection-model.h | 60 +-- widgets/misc/e-send-options.c | 4 +- widgets/misc/e-spinner.c | 22 +- widgets/misc/e-task-bar.c | 16 +- widgets/misc/e-task-bar.h | 6 +- widgets/misc/e-task-widget.c | 24 +- widgets/misc/e-task-widget.h | 20 +- widgets/misc/e-unicode.c | 60 +-- widgets/misc/e-url-entry.c | 2 +- widgets/misc/test-calendar.c | 4 +- widgets/misc/test-dateedit.c | 4 +- widgets/misc/test-dropdown-button.c | 8 +- widgets/misc/test-error.c | 4 +- widgets/misc/test-info-label.c | 4 +- widgets/misc/test-multi-config-dialog.c | 14 +- widgets/table/e-cell-checkbox.c | 4 +- widgets/table/e-cell-combo.c | 30 +- widgets/table/e-cell-date.c | 14 +- widgets/table/e-cell-date.h | 2 +- widgets/table/e-cell-hbox.c | 50 +-- widgets/table/e-cell-hbox.h | 16 +- widgets/table/e-cell-number.c | 8 +- widgets/table/e-cell-number.h | 2 +- widgets/table/e-cell-pixbuf.c | 28 +- widgets/table/e-cell-pixbuf.h | 6 +- widgets/table/e-cell-popup.c | 56 +-- widgets/table/e-cell-popup.h | 2 +- widgets/table/e-cell-size.c | 8 +- widgets/table/e-cell-size.h | 2 +- widgets/table/e-cell-text.c | 246 ++++++------- widgets/table/e-cell-text.h | 38 +- widgets/table/e-cell-toggle.c | 48 +-- widgets/table/e-cell-toggle.h | 12 +- widgets/table/e-cell-tree.c | 78 ++-- widgets/table/e-cell-vbox.c | 76 ++-- widgets/table/e-cell-vbox.h | 10 +- widgets/table/e-cell.c | 74 ++-- widgets/table/e-cell.h | 146 ++++---- widgets/table/e-table-click-to-add.c | 4 +- widgets/table/e-table-click-to-add.h | 2 +- widgets/table/e-table-col.c | 8 +- widgets/table/e-table-col.h | 40 +- widgets/table/e-table-column-specification.c | 62 ++-- widgets/table/e-table-column-specification.h | 20 +- widgets/table/e-table-column.c | 42 +-- widgets/table/e-table-config-field.c | 10 +- widgets/table/e-table-config-field.h | 2 +- widgets/table/e-table-config.c | 78 ++-- widgets/table/e-table-config.h | 10 +- widgets/table/e-table-example-1.c | 46 +-- widgets/table/e-table-example-2.c | 50 +-- widgets/table/e-table-extras.c | 8 +- widgets/table/e-table-field-chooser-dialog.c | 2 +- widgets/table/e-table-field-chooser-item.c | 38 +- widgets/table/e-table-field-chooser-item.h | 8 +- widgets/table/e-table-group-container.c | 56 +-- widgets/table/e-table-group-container.h | 12 +- widgets/table/e-table-group-leaf.c | 6 +- widgets/table/e-table-group-leaf.h | 16 +- widgets/table/e-table-group.c | 22 +- widgets/table/e-table-group.h | 54 +-- widgets/table/e-table-header-item.c | 148 ++++---- widgets/table/e-table-header-item.h | 24 +- widgets/table/e-table-header-utils.c | 56 +-- widgets/table/e-table-header-utils.h | 12 +- widgets/table/e-table-header.c | 122 +++---- widgets/table/e-table-header.h | 54 +-- widgets/table/e-table-item.c | 294 +++++++-------- widgets/table/e-table-item.h | 146 ++++---- widgets/table/e-table-memory-callbacks.c | 30 +- widgets/table/e-table-memory-callbacks.h | 24 +- widgets/table/e-table-memory-store.c | 142 ++++---- widgets/table/e-table-memory-store.h | 22 +- widgets/table/e-table-memory.c | 10 +- widgets/table/e-table-memory.h | 8 +- widgets/table/e-table-model.c | 50 +-- widgets/table/e-table-model.h | 88 ++--- widgets/table/e-table-one.c | 42 +-- widgets/table/e-table-scrolled.c | 16 +- widgets/table/e-table-scrolled.h | 16 +- widgets/table/e-table-search.c | 10 +- widgets/table/e-table-search.h | 2 +- widgets/table/e-table-selection-model.c | 22 +- widgets/table/e-table-simple.c | 50 +-- widgets/table/e-table-simple.h | 40 +- widgets/table/e-table-sort-info.c | 62 ++-- widgets/table/e-table-sort-info.h | 12 +- widgets/table/e-table-sorted-variable.c | 8 +- widgets/table/e-table-sorted-variable.h | 4 +- widgets/table/e-table-sorted.c | 26 +- widgets/table/e-table-sorted.h | 4 +- widgets/table/e-table-sorter.c | 70 ++-- widgets/table/e-table-sorter.h | 20 +- widgets/table/e-table-sorting-utils.c | 92 ++--- widgets/table/e-table-sorting-utils.h | 34 +- widgets/table/e-table-specification.c | 102 +++--- widgets/table/e-table-specification.h | 14 +- widgets/table/e-table-state.c | 54 +-- widgets/table/e-table-state.h | 14 +- widgets/table/e-table-subset-variable.c | 14 +- widgets/table/e-table-subset-variable.h | 2 +- widgets/table/e-table-subset.c | 96 ++--- widgets/table/e-table-subset.h | 44 +-- widgets/table/e-table-tooltip.h | 8 +- widgets/table/e-table-tree.h | 6 +- widgets/table/e-table-utils.c | 16 +- widgets/table/e-table-without.c | 44 +-- widgets/table/e-table-without.h | 6 +- widgets/table/e-table.c | 152 ++++---- widgets/table/e-table.h | 144 ++++---- widgets/table/e-tree-memory-callbacks.c | 34 +- widgets/table/e-tree-memory-callbacks.h | 28 +- widgets/table/e-tree-memory.c | 20 +- widgets/table/e-tree-memory.h | 8 +- widgets/table/e-tree-model.c | 34 +- widgets/table/e-tree-model.h | 52 +-- widgets/table/e-tree-scrolled.c | 16 +- widgets/table/e-tree-scrolled.h | 16 +- widgets/table/e-tree-selection-model.c | 22 +- widgets/table/e-tree-simple.c | 26 +- widgets/table/e-tree-simple.h | 8 +- widgets/table/e-tree-sorted-variable.c | 44 +-- widgets/table/e-tree-sorted-variable.h | 10 +- widgets/table/e-tree-sorted.c | 120 +++--- widgets/table/e-tree-sorted.h | 4 +- widgets/table/e-tree-table-adapter.c | 140 +++---- widgets/table/e-tree-table-adapter.h | 10 +- widgets/table/e-tree.c | 168 ++++----- widgets/table/e-tree.h | 108 +++--- widgets/text/e-text-model.c | 14 +- widgets/text/e-text-model.h | 2 +- widgets/text/e-text.c | 160 ++++---- widgets/text/e-text.h | 28 +- 799 files changed, 13634 insertions(+), 13634 deletions(-) diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c index 6c2da221b9..75309daa14 100644 --- a/a11y/addressbook/ea-addressbook-view.c +++ b/a11y/addressbook/ea-addressbook-view.c @@ -25,8 +25,8 @@ #include #include "ea-addressbook-view.h" -static G_CONST_RETURN gchar* ea_ab_view_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_ab_view_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_ab_view_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_ab_view_get_description (AtkObject *accessible); static void ea_ab_view_class_init (EABViewClass *klass); @@ -84,7 +84,7 @@ ea_ab_view_class_init (EABViewClass *klass) class->get_description = ea_ab_view_get_description; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_ab_view_get_name (AtkObject *accessible) { g_return_val_if_fail (EA_IS_AB_VIEW(accessible), NULL); @@ -94,7 +94,7 @@ ea_ab_view_get_name (AtkObject *accessible) return _("evolution address book"); } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_ab_view_get_description (AtkObject *accessible) { if (accessible->description) diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c index dab53e6ce5..d13975b34a 100644 --- a/a11y/addressbook/ea-minicard-view.c +++ b/a11y/addressbook/ea-minicard-view.c @@ -29,14 +29,14 @@ #include "eab-gui-util.h" #include "e-addressbook-view.h" -static const char * action_name[] = { +static const gchar * action_name[] = { N_("New Contact"), N_("New Contact List") }; -static G_CONST_RETURN gchar* ea_minicard_view_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_minicard_view_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_minicard_view_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_minicard_view_get_description (AtkObject *accessible); static void ea_minicard_view_class_init (EaMinicardViewClass *klass); @@ -58,8 +58,8 @@ static gboolean selection_interface_is_child_selected (AtkSelection *selection, static void atk_action_interface_init (AtkActionIface *iface); static gboolean atk_action_interface_do_action (AtkAction *iface, gint i); static gint atk_action_interface_get_n_action (AtkAction *iface); -static G_CONST_RETURN gchar* atk_action_interface_get_description (AtkAction *iface, gint i); -static G_CONST_RETURN gchar* atk_action_interface_get_name (AtkAction *iface, gint i); +static G_CONST_RETURN gchar * atk_action_interface_get_description (AtkAction *iface, gint i); +static G_CONST_RETURN gchar * atk_action_interface_get_name (AtkAction *iface, gint i); static gpointer parent_class = NULL; @@ -135,7 +135,7 @@ ea_minicard_view_class_init (EaMinicardViewClass *klass) class->ref_child = ea_minicard_view_ref_child; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_minicard_view_get_name (AtkObject *accessible) { EReflow *reflow; @@ -169,7 +169,7 @@ ea_minicard_view_get_name (AtkObject *accessible) return accessible->name; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_minicard_view_get_description (AtkObject *accessible) { g_return_val_if_fail (EA_IS_MINICARD_VIEW(accessible), NULL); @@ -403,13 +403,13 @@ static gint atk_action_interface_get_n_action (AtkAction *iface) return G_N_ELEMENTS (action_name); } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * atk_action_interface_get_description (AtkAction *iface, gint i) { return atk_action_interface_get_name (iface, i); } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * atk_action_interface_get_name (AtkAction *iface, gint i) { if( i >= G_N_ELEMENTS (action_name) || i < 0) diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c index d77d591fcc..b1b1ebbe33 100644 --- a/a11y/addressbook/ea-minicard.c +++ b/a11y/addressbook/ea-minicard.c @@ -27,12 +27,12 @@ #include "ea-minicard-view.h" #include "e-minicard.h" -static const char * action_name[] = { +static const gchar * action_name[] = { N_("Open") }; -static G_CONST_RETURN gchar* ea_minicard_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_minicard_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_minicard_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_minicard_get_description (AtkObject *accessible); static void ea_minicard_class_init (EaMinicardClass *klass); @@ -44,8 +44,8 @@ static AtkStateSet *ea_minicard_ref_state_set (AtkObject *obj); static void atk_action_interface_init (AtkActionIface *iface); static gboolean atk_action_interface_do_action (AtkAction *iface, gint i); static gint atk_action_interface_get_n_action (AtkAction *iface); -static G_CONST_RETURN gchar* atk_action_interface_get_description (AtkAction *iface, gint i); -static G_CONST_RETURN gchar* atk_action_interface_get_name (AtkAction *iface, gint i); +static G_CONST_RETURN gchar * atk_action_interface_get_description (AtkAction *iface, gint i); +static G_CONST_RETURN gchar * atk_action_interface_get_name (AtkAction *iface, gint i); static gpointer parent_class = NULL; @@ -117,7 +117,7 @@ ea_minicard_class_init (EaMinicardClass *klass) * we access the main content of current minicard, including * header text, label(field, field name) */ -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_minicard_get_name (AtkObject *accessible) { #define BUFFERSIZE 500 @@ -159,7 +159,7 @@ ea_minicard_get_name (AtkObject *accessible) return accessible->name; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_minicard_get_description (AtkObject *accessible) { if (accessible->description) @@ -256,13 +256,13 @@ static gint atk_action_interface_get_n_action (AtkAction *iface) return G_N_ELEMENTS (action_name); } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * atk_action_interface_get_description (AtkAction *iface, gint i) { return atk_action_interface_get_name (iface, i); } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * atk_action_interface_get_name (AtkAction *iface, gint i) { if( i >= G_N_ELEMENTS (action_name) || i < 0) diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c index e0c0f8fdac..5da164323f 100644 --- a/a11y/calendar/ea-cal-view-event.c +++ b/a11y/calendar/ea-cal-view-event.c @@ -31,8 +31,8 @@ static void ea_cal_view_event_class_init (EaCalViewEventClass *klass); static void ea_cal_view_event_init (EaCalViewEvent *a11y); static void ea_cal_view_event_dispose (GObject *object); -static G_CONST_RETURN gchar* ea_cal_view_event_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_cal_view_event_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_cal_view_event_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_cal_view_event_get_description (AtkObject *accessible); static AtkObject* ea_cal_view_event_get_parent (AtkObject *accessible); static gint ea_cal_view_event_get_index_in_parent (AtkObject *accessible); static AtkStateSet *ea_cal_view_event_ref_state_set (AtkObject *accessible); @@ -46,7 +46,7 @@ static void ea_cal_view_get_extents (AtkComponent *component, static void atk_action_interface_init (AtkActionIface *iface); static gboolean ea_cal_view_event_do_action (AtkAction *action, gint i); static gint ea_cal_view_event_get_n_actions (AtkAction *action); -static G_CONST_RETURN gchar* ea_cal_view_event_action_get_name (AtkAction *action, gint i); +static G_CONST_RETURN gchar * ea_cal_view_event_action_get_name (AtkAction *action, gint i); #ifdef ACC_DEBUG @@ -240,7 +240,7 @@ ea_cal_view_event_dispose (GObject *object) G_OBJECT_CLASS(parent_class)->dispose (object); } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_cal_view_event_get_name (AtkObject *accessible) { AtkGObjectAccessible *atk_gobj; @@ -251,7 +251,7 @@ ea_cal_view_event_get_name (AtkObject *accessible) const gchar *recur_string; const gchar *meeting_string; gchar *summary_string; - const char *summary; + const gchar *summary; g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL); @@ -287,13 +287,13 @@ ea_cal_view_event_get_name (AtkObject *accessible) ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name_string); #ifdef ACC_DEBUG printf("EvoAcc: name for event accobj=%p, is %s\n", - (void *)accessible, new_name); + (gpointer)accessible, new_name); #endif g_free (name_string); return accessible->name; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_cal_view_event_get_description (AtkObject *accessible) { if (accessible->description) @@ -526,7 +526,7 @@ ea_cal_view_get_extents (AtkComponent *component, #define CAL_VIEW_EVENT_ACTION_NUM 1 -static const char * action_name [CAL_VIEW_EVENT_ACTION_NUM] = { +static const gchar * action_name [CAL_VIEW_EVENT_ACTION_NUM] = { N_("Grab Focus") }; @@ -563,7 +563,7 @@ ea_cal_view_event_get_n_actions (AtkAction *action) return CAL_VIEW_EVENT_ACTION_NUM; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_cal_view_event_action_get_name (AtkAction *action, gint i) { if (i >= 0 && i < CAL_VIEW_EVENT_ACTION_NUM) diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c index 7e337ac16b..952afcc791 100644 --- a/a11y/calendar/ea-cal-view.c +++ b/a11y/calendar/ea-cal-view.c @@ -45,11 +45,11 @@ static void ea_cal_view_dates_change_cb (GnomeCalendar *gcal, gpointer data); static void atk_action_interface_init (AtkActionIface *iface); static gboolean action_interface_do_action (AtkAction *action, gint i); static gint action_interface_get_n_actions (AtkAction *action); -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * action_interface_get_description(AtkAction *action, gint i); -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * action_interface_get_keybinding (AtkAction *action, gint i); -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * action_interface_action_get_name(AtkAction *action, gint i); static gpointer parent_class = NULL; @@ -212,7 +212,7 @@ ea_cal_view_event_changed_cb (ECalendarView *cal_view, ECalendarViewEvent *event } if (event_atk_obj) { #ifdef ACC_DEBUG - printf ("AccDebug: event=%p changed\n", (void *)event); + printf ("AccDebug: event=%p changed\n", (gpointer)event); #endif g_object_notify (G_OBJECT(event_atk_obj), "accessible-name"); g_signal_emit_by_name (event_atk_obj, "visible_data_changed"); @@ -254,7 +254,7 @@ ea_cal_view_event_added_cb (ECalendarView *cal_view, ECalendarViewEvent *event, if (index < 0) return; #ifdef ACC_DEBUG - printf ("AccDebug: event=%p added\n", (void *)event); + printf ("AccDebug: event=%p added\n", (gpointer)event); #endif g_signal_emit_by_name (atk_obj, "children_changed::add", index, event_atk_obj, NULL); @@ -295,7 +295,7 @@ ea_cal_view_dates_change_cb (GnomeCalendar *gcal, gpointer data) #define CAL_VIEW_ACTION_NUM 5 -static const char * action_name [CAL_VIEW_ACTION_NUM] = { +static const gchar * action_name [CAL_VIEW_ACTION_NUM] = { N_("New Appointment"), N_("New All Day Event"), N_("New Meeting"), @@ -374,13 +374,13 @@ action_interface_get_n_actions (AtkAction *action) return CAL_VIEW_ACTION_NUM; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * action_interface_get_description(AtkAction *action, gint index) { return action_interface_action_get_name (action, index); } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * action_interface_get_keybinding (AtkAction *action, gint index) { GtkWidget *widget; @@ -417,7 +417,7 @@ action_interface_get_keybinding (AtkAction *action, gint index) return NULL; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * action_interface_action_get_name(AtkAction *action, gint i) { if (i >= 0 && i < CAL_VIEW_ACTION_NUM) diff --git a/a11y/calendar/ea-calendar.c b/a11y/calendar/ea-calendar.c index 26e73da6da..fb8d523275 100644 --- a/a11y/calendar/ea-calendar.c +++ b/a11y/calendar/ea-calendar.c @@ -172,7 +172,7 @@ ea_calendar_focus_watcher (GSignalInvocationHint *ihint, /* focus out */ ea_event = NULL; #ifdef ACC_DEBUG - printf ("EvoAcc: focus notify on day main item %p\n", (void *)object); + printf ("EvoAcc: focus notify on day main item %p\n", (gpointer)object); #endif atk_focus_tracker_notify (ea_event); } @@ -195,7 +195,7 @@ ea_calendar_focus_watcher (GSignalInvocationHint *ihint, /* focus out */ ea_event = NULL; #ifdef ACC_DEBUG - printf ("EvoAcc: focus notify on week main item %p\n", (void *)object); + printf ("EvoAcc: focus notify on week main item %p\n", (gpointer)object); #endif atk_focus_tracker_notify (ea_event); } diff --git a/a11y/calendar/ea-day-view-cell.c b/a11y/calendar/ea-day-view-cell.c index bc303f380f..bbc92a192f 100644 --- a/a11y/calendar/ea-day-view-cell.c +++ b/a11y/calendar/ea-day-view-cell.c @@ -79,7 +79,7 @@ e_day_view_cell_new (EDayView *day_view, gint row, gint column) cell->column = column; #ifdef ACC_DEBUG - printf ("EvoAcc: e_day_view_cell created %p\n", (void *)cell); + printf ("EvoAcc: e_day_view_cell created %p\n", (gpointer)cell); #endif return cell; @@ -89,8 +89,8 @@ e_day_view_cell_new (EDayView *day_view, gint row, gint column) static void ea_day_view_cell_class_init (EaDayViewCellClass *klass); -static G_CONST_RETURN gchar* ea_day_view_cell_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_day_view_cell_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_day_view_cell_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_day_view_cell_get_description (AtkObject *accessible); static AtkStateSet* ea_day_view_cell_ref_state_set (AtkObject *obj); static AtkObject * ea_day_view_cell_get_parent (AtkObject *accessible); static gint ea_day_view_cell_get_index_in_parent (AtkObject *accessible); @@ -196,7 +196,7 @@ static void ea_day_view_cell_finalize (GObject *object) } #endif -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_day_view_cell_get_name (AtkObject *accessible) { AtkGObjectAccessible *atk_gobj; @@ -230,7 +230,7 @@ ea_day_view_cell_get_name (AtkObject *accessible) return accessible->name; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_day_view_cell_get_description (AtkObject *accessible) { return ea_day_view_cell_get_name (accessible); diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c index 783710dc61..c1176b4417 100644 --- a/a11y/calendar/ea-day-view-main-item.c +++ b/a11y/calendar/ea-day-view-main-item.c @@ -32,8 +32,8 @@ static void ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass); static void ea_day_view_main_item_finalize (GObject *object); -static G_CONST_RETURN gchar* ea_day_view_main_item_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_day_view_main_item_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_day_view_main_item_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_day_view_main_item_get_description (AtkObject *accessible); static gint ea_day_view_main_item_get_n_children (AtkObject *obj); static AtkObject* ea_day_view_main_item_ref_child (AtkObject *obj, @@ -95,10 +95,10 @@ static AtkObject* table_interface_get_column_header (AtkTable *table, gint in_col); static AtkObject* table_interface_get_caption (AtkTable *table); -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * table_interface_get_column_description (AtkTable *table, gint in_col); -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * table_interface_get_row_description (AtkTable *table, gint row); static AtkObject* table_interface_get_summary (AtkTable *table); @@ -282,7 +282,7 @@ ea_day_view_main_item_finalize (GObject *object) #endif } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_day_view_main_item_get_name (AtkObject *accessible) { AtkObject *parent; @@ -295,7 +295,7 @@ ea_day_view_main_item_get_name (AtkObject *accessible) return atk_object_get_name (parent); } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_day_view_main_item_get_description (AtkObject *accessible) { return _("a table to view and select the current time range"); @@ -1045,7 +1045,7 @@ table_interface_get_caption (AtkTable *table) return NULL; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * table_interface_get_column_description (AtkTable *table, gint in_col) { @@ -1081,7 +1081,7 @@ table_interface_get_column_description (AtkTable *table, return description; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * table_interface_get_row_description (AtkTable *table, gint row) { diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c index 107f983bb0..9eb3e343f3 100644 --- a/a11y/calendar/ea-day-view.c +++ b/a11y/calendar/ea-day-view.c @@ -31,8 +31,8 @@ static void ea_day_view_class_init (EaDayViewClass *klass); -static G_CONST_RETURN gchar* ea_day_view_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_day_view_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_day_view_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_day_view_get_description (AtkObject *accessible); static gint ea_day_view_get_n_children (AtkObject *obj); static AtkObject* ea_day_view_ref_child (AtkObject *obj, gint i); @@ -111,13 +111,13 @@ ea_day_view_new (GtkWidget *widget) atk_object_initialize (accessible, widget); #ifdef ACC_DEBUG - printf ("EvoAcc: ea_day_view created %p\n", (void *)accessible); + printf ("EvoAcc: ea_day_view created %p\n", (gpointer)accessible); #endif return accessible; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_day_view_get_name (AtkObject *accessible) { EDayView *day_view; @@ -172,7 +172,7 @@ ea_day_view_get_name (AtkObject *accessible) return accessible->name; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_day_view_get_description (AtkObject *accessible) { EDayView *day_view; diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c index 4d6e752b8e..e5d9654c1a 100644 --- a/a11y/calendar/ea-gnome-calendar.c +++ b/a11y/calendar/ea-gnome-calendar.c @@ -31,8 +31,8 @@ static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass); -static G_CONST_RETURN gchar* ea_gnome_calendar_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_gnome_calendar_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_gnome_calendar_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_gnome_calendar_get_description (AtkObject *accessible); static gint ea_gnome_calendar_get_n_children (AtkObject* obj); static AtkObject * ea_gnome_calendar_ref_child (AtkObject *obj, gint i); @@ -130,7 +130,7 @@ ea_gnome_calendar_new (GtkWidget *widget) } #ifdef ACC_DEBUG - printf ("EvoAcc: ea-gnome-calendar created: %p\n", (void *)accessible); + printf ("EvoAcc: ea-gnome-calendar created: %p\n", (gpointer)accessible); #endif return accessible; @@ -143,8 +143,8 @@ ea_gnome_calendar_get_label_description (GnomeCalendar *gcal) struct icaltimetype start_tt, end_tt; time_t start_time, end_time; struct tm start_tm, end_tm; - static char buffer[512]; - char end_buffer[256]; + static gchar buffer[512]; + gchar end_buffer[256]; GnomeCalendarViewType view; gnome_calendar_get_visible_time_range (gcal, &start_time, &end_time); @@ -237,7 +237,7 @@ ea_gnome_calendar_get_label_description (GnomeCalendar *gcal) return buffer; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_gnome_calendar_get_name (AtkObject *accessible) { if (accessible->name) @@ -245,7 +245,7 @@ ea_gnome_calendar_get_name (AtkObject *accessible) return _("Gnome Calendar"); } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_gnome_calendar_get_description (AtkObject *accessible) { if (accessible->description) @@ -328,7 +328,7 @@ ea_gcal_switch_view_cb (GtkNotebook *widget, GtkNotebookPage *page, #ifdef ACC_DEBUG printf ("AccDebug: view switch to widget %p (index=%d) \n", - (void *)new_widget, index); + (gpointer)new_widget, index); #endif } diff --git a/a11y/calendar/ea-jump-button.c b/a11y/calendar/ea-jump-button.c index 7888196b8d..eb24bea42c 100644 --- a/a11y/calendar/ea-jump-button.c +++ b/a11y/calendar/ea-jump-button.c @@ -30,15 +30,15 @@ static void ea_jump_button_class_init (EaJumpButtonClass *klass); -static G_CONST_RETURN gchar* ea_jump_button_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_jump_button_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_jump_button_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_jump_button_get_description (AtkObject *accessible); /* action interface */ static void atk_action_interface_init (AtkActionIface *iface); static gboolean jump_button_do_action (AtkAction *action, gint i); static gint jump_button_get_n_actions (AtkAction *action); -static G_CONST_RETURN gchar* jump_button_get_keybinding (AtkAction *action, +static G_CONST_RETURN gchar * jump_button_get_keybinding (AtkAction *action, gint i); static gpointer parent_class = NULL; @@ -137,7 +137,7 @@ ea_jump_button_new (GObject *obj) return atk_obj; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_jump_button_get_name (AtkObject *accessible) { g_return_val_if_fail (EA_IS_JUMP_BUTTON (accessible), NULL); @@ -147,7 +147,7 @@ ea_jump_button_get_name (AtkObject *accessible) return _("Jump button"); } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_jump_button_get_description (AtkObject *accessible) { if (accessible->description) @@ -204,7 +204,7 @@ jump_button_get_n_actions (AtkAction *action) return 1; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * jump_button_get_keybinding (AtkAction *action, gint i) { diff --git a/a11y/calendar/ea-week-view-cell.c b/a11y/calendar/ea-week-view-cell.c index 4c7a591121..f3f7183c55 100644 --- a/a11y/calendar/ea-week-view-cell.c +++ b/a11y/calendar/ea-week-view-cell.c @@ -79,7 +79,7 @@ e_week_view_cell_new (EWeekView *week_view, gint row, gint column) cell->column = column; #ifdef ACC_DEBUG - printf ("EvoAcc: e_week_view_cell created %p\n", (void *)cell); + printf ("EvoAcc: e_week_view_cell created %p\n", (gpointer)cell); #endif return cell; @@ -89,8 +89,8 @@ e_week_view_cell_new (EWeekView *week_view, gint row, gint column) static void ea_week_view_cell_class_init (EaWeekViewCellClass *klass); -static G_CONST_RETURN gchar* ea_week_view_cell_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_week_view_cell_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_week_view_cell_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_week_view_cell_get_description (AtkObject *accessible); static AtkStateSet* ea_week_view_cell_ref_state_set (AtkObject *obj); static AtkObject * ea_week_view_cell_get_parent (AtkObject *accessible); static gint ea_week_view_cell_get_index_in_parent (AtkObject *accessible); @@ -196,7 +196,7 @@ static void ea_week_view_cell_finalize (GObject *object) } #endif -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_week_view_cell_get_name (AtkObject *accessible) { AtkGObjectAccessible *atk_gobj; @@ -242,7 +242,7 @@ ea_week_view_cell_get_name (AtkObject *accessible) return accessible->name; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_week_view_cell_get_description (AtkObject *accessible) { return ea_week_view_cell_get_name (accessible); diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c index ae507df235..3ba4508ba3 100644 --- a/a11y/calendar/ea-week-view-main-item.c +++ b/a11y/calendar/ea-week-view-main-item.c @@ -31,8 +31,8 @@ static void ea_week_view_main_item_class_init (EaWeekViewMainItemClass *klass); static void ea_week_view_main_item_finalize (GObject *object); -static G_CONST_RETURN gchar* ea_week_view_main_item_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_week_view_main_item_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_week_view_main_item_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_week_view_main_item_get_description (AtkObject *accessible); static gint ea_week_view_main_item_get_n_children (AtkObject *obj); static AtkObject* ea_week_view_main_item_ref_child (AtkObject *obj, @@ -95,10 +95,10 @@ static AtkObject* table_interface_get_column_header (AtkTable *table, gint in_col); static AtkObject* table_interface_get_caption (AtkTable *table); -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * table_interface_get_column_description (AtkTable *table, gint in_col); -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * table_interface_get_row_description (AtkTable *table, gint row); static AtkObject* table_interface_get_summary (AtkTable *table); @@ -282,7 +282,7 @@ ea_week_view_main_item_finalize (GObject *object) #endif } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_week_view_main_item_get_name (AtkObject *accessible) { AtkObject *parent; @@ -292,7 +292,7 @@ ea_week_view_main_item_get_name (AtkObject *accessible) } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_week_view_main_item_get_description (AtkObject *accessible) { return _("a table to view and select the current time range"); @@ -1008,7 +1008,7 @@ table_interface_get_caption (AtkTable *table) return NULL; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * table_interface_get_column_description (AtkTable *table, gint in_col) { @@ -1065,7 +1065,7 @@ table_interface_get_column_description (AtkTable *table, return description; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * table_interface_get_row_description (AtkTable *table, gint row) { diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c index 1d88e40c46..734f09239a 100644 --- a/a11y/calendar/ea-week-view.c +++ b/a11y/calendar/ea-week-view.c @@ -30,8 +30,8 @@ static void ea_week_view_class_init (EaWeekViewClass *klass); -static G_CONST_RETURN gchar* ea_week_view_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_week_view_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_week_view_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_week_view_get_description (AtkObject *accessible); static gint ea_week_view_get_n_children (AtkObject *obj); static AtkObject* ea_week_view_ref_child (AtkObject *obj, gint i); @@ -112,13 +112,13 @@ ea_week_view_new (GtkWidget *widget) atk_object_initialize (accessible, widget); #ifdef ACC_DEBUG - printf ("EvoAcc: ea_week_view created %p\n", (void *)accessible); + printf ("EvoAcc: ea_week_view created %p\n", (gpointer)accessible); #endif return accessible; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_week_view_get_name (AtkObject *accessible) { EWeekView *week_view; @@ -165,7 +165,7 @@ ea_week_view_get_name (AtkObject *accessible) return accessible->name; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_week_view_get_description (AtkObject *accessible) { EWeekView *week_view; @@ -239,7 +239,7 @@ ea_week_view_get_n_children (AtkObject *accessible) count++; #ifdef ACC_DEBUG - printf("AccDebug: week view %p has %d children\n", (void *)week_view, count); + printf("AccDebug: week view %p has %d children\n", (gpointer)week_view, count); #endif return count; } @@ -315,7 +315,7 @@ ea_week_view_ref_child (AtkObject *accessible, gint index) #ifdef ACC_DEBUG printf ("EvoAcc: ea_week_view_ref_child [%d]=%p\n", - index, (void *)atk_object); + index, (gpointer)atk_object); #endif return atk_object; } diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c index 5ae3cef686..f76b2431b0 100644 --- a/a11y/e-table/gal-a11y-e-cell-popup.c +++ b/a11y/e-table/gal-a11y-e-cell-popup.c @@ -83,9 +83,9 @@ AtkObject * gal_a11y_e_cell_popup_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row) + gint model_col, + gint view_col, + gint row) { AtkObject *a11y; GalA11yECell *cell; diff --git a/a11y/e-table/gal-a11y-e-cell-popup.h b/a11y/e-table/gal-a11y-e-cell-popup.h index 4bee17e8ce..7fef5cf18d 100644 --- a/a11y/e-table/gal-a11y-e-cell-popup.h +++ b/a11y/e-table/gal-a11y-e-cell-popup.h @@ -55,8 +55,8 @@ GType gal_a11y_e_cell_popup_get_type (void); AtkObject *gal_a11y_e_cell_popup_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row); + gint model_col, + gint view_col, + gint row); #endif /* ! __GAL_A11Y_E_CELL_POPUP_H__ */ diff --git a/a11y/e-table/gal-a11y-e-cell-registry.c b/a11y/e-table/gal-a11y-e-cell-registry.c index 1da241fea9..9dc9598608 100644 --- a/a11y/e-table/gal-a11y-e-cell-registry.c +++ b/a11y/e-table/gal-a11y-e-cell-registry.c @@ -111,9 +111,9 @@ gal_a11y_e_cell_registry_get_object (GalA11yECellRegistry *registry, ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row) + gint model_col, + gint view_col, + gint row) { GalA11yECellRegistryFunc func = NULL; GType type; diff --git a/a11y/e-table/gal-a11y-e-cell-registry.h b/a11y/e-table/gal-a11y-e-cell-registry.h index bc43a662cc..0620fd1b9c 100644 --- a/a11y/e-table/gal-a11y-e-cell-registry.h +++ b/a11y/e-table/gal-a11y-e-cell-registry.h @@ -41,9 +41,9 @@ typedef struct _GalA11yECellRegistryPrivate GalA11yECellRegistryPrivate; typedef AtkObject *(*GalA11yECellRegistryFunc) (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row); + gint model_col, + gint view_col, + gint row); struct _GalA11yECellRegistry { GObject object; @@ -62,9 +62,9 @@ AtkObject *gal_a11y_e_cell_registry_get_object (GalA11yECellRegistry *re ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row); + gint model_col, + gint view_col, + gint row); void gal_a11y_e_cell_registry_add_cell_type (GalA11yECellRegistry *registry, GType type, GalA11yECellRegistryFunc func); diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c index a2b9f715f8..77823b0a7c 100644 --- a/a11y/e-table/gal-a11y-e-cell-text.c +++ b/a11y/e-table/gal-a11y-e-cell-text.c @@ -86,11 +86,11 @@ ect_check (gpointer a11y) return TRUE; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ect_get_name (AtkObject * a11y) { GalA11yECell *gaec; - char *name; + gchar *name; if (!ect_check (a11y)) return NULL; @@ -180,7 +180,7 @@ ect_get_character_at_offset (AtkText *text, } -static gchar* +static gchar * ect_get_text_before_offset (AtkText *text, gint offset, AtkTextBoundary boundary_type, @@ -294,7 +294,7 @@ ect_get_n_selections (AtkText *text) } -static gchar* +static gchar * ect_get_selection (AtkText *text, gint selection_num, gint *start_offset, @@ -543,7 +543,7 @@ ect_do_action_edit (AtkAction *action) /* text signal handlers */ static void -ect_text_inserted_cb (ECellText *text, ECellView *cell_view, int pos, int len, int row, int model_col, gpointer data) +ect_text_inserted_cb (ECellText *text, ECellView *cell_view, gint pos, gint len, gint row, gint model_col, gpointer data) { GalA11yECellText *gaet; GalA11yECell *gaec; @@ -560,7 +560,7 @@ ect_text_inserted_cb (ECellText *text, ECellView *cell_view, int pos, int len, i } static void -ect_text_deleted_cb (ECellText *text, ECellView *cell_view, int pos, int len, int row, int model_col, gpointer data) +ect_text_deleted_cb (ECellText *text, ECellView *cell_view, gint pos, gint len, gint row, gint model_col, gpointer data) { GalA11yECellText *gaet; GalA11yECell *gaec; @@ -692,9 +692,9 @@ AtkObject * gal_a11y_e_cell_text_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row) + gint model_col, + gint view_col, + gint row) { AtkObject *a11y; GalA11yECell *gaec; diff --git a/a11y/e-table/gal-a11y-e-cell-text.h b/a11y/e-table/gal-a11y-e-cell-text.h index fe404169a1..2e469d76f6 100644 --- a/a11y/e-table/gal-a11y-e-cell-text.h +++ b/a11y/e-table/gal-a11y-e-cell-text.h @@ -57,8 +57,8 @@ GType gal_a11y_e_cell_text_get_type (void); AtkObject *gal_a11y_e_cell_text_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row); + gint model_col, + gint view_col, + gint row); #endif /* ! __GAL_A11Y_E_CELL_TEXT_H__ */ diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c index c0425a0cbb..1101bac7ee 100644 --- a/a11y/e-table/gal-a11y-e-cell-toggle.c +++ b/a11y/e-table/gal-a11y-e-cell-toggle.c @@ -143,9 +143,9 @@ AtkObject* gal_a11y_e_cell_toggle_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row) + gint model_col, + gint view_col, + gint row) { AtkObject *a11y; GalA11yECell *cell; diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.h b/a11y/e-table/gal-a11y-e-cell-toggle.h index 769e0b4200..1f41ae1623 100644 --- a/a11y/e-table/gal-a11y-e-cell-toggle.h +++ b/a11y/e-table/gal-a11y-e-cell-toggle.h @@ -56,9 +56,9 @@ struct _GalA11yECellToggleClass AtkObject *gal_a11y_e_cell_toggle_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row); + gint model_col, + gint view_col, + gint row); #ifdef __cplusplus } diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c index 0a5f8e2019..aaf490c726 100644 --- a/a11y/e-table/gal-a11y-e-cell-tree.c +++ b/a11y/e-table/gal-a11y-e-cell-tree.c @@ -184,9 +184,9 @@ AtkObject * gal_a11y_e_cell_tree_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row) + gint model_col, + gint view_col, + gint row) { AtkObject *subcell_a11y; GalA11yECellTree *a11y; diff --git a/a11y/e-table/gal-a11y-e-cell-tree.h b/a11y/e-table/gal-a11y-e-cell-tree.h index 43169c2f28..497590b351 100644 --- a/a11y/e-table/gal-a11y-e-cell-tree.h +++ b/a11y/e-table/gal-a11y-e-cell-tree.h @@ -44,7 +44,7 @@ typedef struct _GalA11yECellTreePrivate GalA11yECellTreePrivate; struct _GalA11yECellTree { GalA11yECell object; - int model_row_changed_id; + gint model_row_changed_id; }; struct _GalA11yECellTreeClass { @@ -57,8 +57,8 @@ GType gal_a11y_e_cell_tree_get_type (void); AtkObject *gal_a11y_e_cell_tree_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row); + gint model_col, + gint view_col, + gint row); #endif /* ! __GAL_A11Y_E_CELL_TREE_H__ */ diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.c b/a11y/e-table/gal-a11y-e-cell-vbox.c index 7a5eadba52..b3f92a695a 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.c +++ b/a11y/e-table/gal-a11y-e-cell-vbox.c @@ -120,7 +120,7 @@ ecv_ref_accessible_at_point (AtkComponent *component, AtkCoordType coord_type) { gint x0, y0, width, height; - int subcell_height, i; + gint subcell_height, i; GalA11yECell *gaec = GAL_A11Y_E_CELL (component); ECellVboxView *ecvv = (ECellVboxView *) (gaec->cell_view); @@ -203,9 +203,9 @@ gal_a11y_e_cell_vbox_get_type (void) AtkObject *gal_a11y_e_cell_vbox_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row) + gint model_col, + gint view_col, + gint row) { AtkObject *a11y; GalA11yECell *gaec; diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.h b/a11y/e-table/gal-a11y-e-cell-vbox.h index 2055ac3195..cf6375a2be 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.h +++ b/a11y/e-table/gal-a11y-e-cell-vbox.h @@ -44,7 +44,7 @@ typedef struct _GalA11yECellVboxClass GalA11yECellVboxClass; struct _GalA11yECellVbox { GalA11yECell object; - int a11y_subcell_count; + gint a11y_subcell_count; gpointer *a11y_subcells; }; @@ -57,9 +57,9 @@ GType gal_a11y_e_cell_vbox_get_type (void); AtkObject *gal_a11y_e_cell_vbox_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row); + gint model_col, + gint view_col, + gint row); #ifdef __cplusplus } diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c index 3b74675ae5..a316500af7 100644 --- a/a11y/e-table/gal-a11y-e-cell.c +++ b/a11y/e-table/gal-a11y-e-cell.c @@ -103,7 +103,7 @@ gal_a11y_e_cell_dispose (GObject *object) } /* Static functions */ -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * gal_a11y_e_cell_get_name (AtkObject * a11y) { GalA11yECell *cell = GAL_A11Y_E_CELL (a11y); @@ -163,10 +163,10 @@ gal_a11y_e_cell_get_extents (AtkComponent *component, { GalA11yECell *a11y = GAL_A11Y_E_CELL (component); GtkWidget *tableOrTree; - int row; - int col; - int xval; - int yval; + gint row; + gint col; + gint xval; + gint yval; row = a11y->row; col = a11y->view_col; @@ -593,9 +593,9 @@ AtkObject * gal_a11y_e_cell_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row) + gint model_col, + gint view_col, + gint row) { AtkObject *a11y; @@ -616,9 +616,9 @@ gal_a11y_e_cell_construct (AtkObject *object, ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row) + gint model_col, + gint view_col, + gint row) { GalA11yECell *a11y = GAL_A11Y_E_CELL (object); a11y->item = item; diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h index af96c69d47..3ec3070a9b 100644 --- a/a11y/e-table/gal-a11y-e-cell.h +++ b/a11y/e-table/gal-a11y-e-cell.h @@ -49,9 +49,9 @@ struct _GalA11yECell { ETableItem *item; ECellView *cell_view; AtkObject *parent; - int model_col; - int view_col; - int row; + gint model_col; + gint view_col; + gint row; AtkStateSet *state_set; GList *action_list; gint action_idle_handler; @@ -76,16 +76,16 @@ GType gal_a11y_e_cell_get_type (void); AtkObject *gal_a11y_e_cell_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row); + gint model_col, + gint view_col, + gint row); void gal_a11y_e_cell_construct (AtkObject *object, ETableItem *item, ECellView *cell_view, AtkObject *parent, - int model_col, - int view_col, - int row); + gint model_col, + gint view_col, + gint row); void gal_a11y_e_cell_type_add_action_interface (GType type); diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c index ed417e1601..e36fe51a00 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add.c +++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c @@ -36,7 +36,7 @@ static AtkObjectClass *parent_class; static GType parent_type; static gint priv_offset; -#define GET_PRIVATE(object) ((GalA11yETableClickToAddPrivate *) (((char *) object) + priv_offset)) +#define GET_PRIVATE(object) ((GalA11yETableClickToAddPrivate *) (((gchar *) object) + priv_offset)) #define PARENT_TYPE (parent_type) struct _GalA11yETableClickToAddPrivate { @@ -51,7 +51,7 @@ etcta_get_n_actions (AtkAction *action) return 1; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * etcta_get_description (AtkAction *action, gint i) { @@ -61,7 +61,7 @@ etcta_get_description (AtkAction *action, return NULL; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * etcta_action_get_name (AtkAction *action, gint i) { if (i == 0) diff --git a/a11y/e-table/gal-a11y-e-table-column-header.c b/a11y/e-table/gal-a11y-e-table-column-header.c index 4df75cc564..41e6ab0fca 100644 --- a/a11y/e-table/gal-a11y-e-table-column-header.c +++ b/a11y/e-table/gal-a11y-e-table-column-header.c @@ -32,7 +32,7 @@ static GObjectClass *parent_class; static gint priv_offset; -#define GET_PRIVATE(object) ((GalA11yETableColumnHeaderPrivate *) (((char *) object) + priv_offset)) +#define GET_PRIVATE(object) ((GalA11yETableColumnHeaderPrivate *) (((gchar *) object) + priv_offset)) #define PARENT_TYPE (atk_gobject_accessible_get_type ()) struct _GalA11yETableColumnHeaderPrivate { @@ -141,7 +141,7 @@ gal_a11y_e_table_column_header_get_n_actions (AtkAction *action) return 1; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * gal_a11y_e_table_column_header_action_get_name (AtkAction *action, gint i) { diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c index 935f53b83b..912d055964 100644 --- a/a11y/e-table/gal-a11y-e-table-item.c +++ b/a11y/e-table/gal-a11y-e-table-item.c @@ -48,14 +48,14 @@ static AtkComponentIface *component_parent_iface; static GType parent_type; static gint priv_offset; static GQuark quark_accessible_object = 0; -#define GET_PRIVATE(object) ((GalA11yETableItemPrivate *) (((char *) object) + priv_offset)) +#define GET_PRIVATE(object) ((GalA11yETableItemPrivate *) (((gchar *) object) + priv_offset)) #define PARENT_TYPE (parent_type) struct _GalA11yETableItemPrivate { gint cols; gint rows; - int selection_change_id; - int cursor_change_id; + gint selection_change_id; + gint cursor_change_id; ETableCol ** columns; ESelectionModel *selection; AtkStateSet *state_set; @@ -93,7 +93,7 @@ eti_ref_state_set (AtkObject *accessible) } inline static gint -view_to_model_row(ETableItem *eti, int row) +view_to_model_row(ETableItem *eti, gint row) { if (eti->uses_source_model) { ETableSubset *etss = E_TABLE_SUBSET(eti->table_model); @@ -107,16 +107,16 @@ view_to_model_row(ETableItem *eti, int row) } inline static gint -view_to_model_col(ETableItem *eti, int col) +view_to_model_col(ETableItem *eti, gint col) { ETableCol *ecol = e_table_header_get_column (eti->header, col); return ecol ? ecol->col_idx : -1; } inline static gint -model_to_view_row(ETableItem *eti, int row) +model_to_view_row(ETableItem *eti, gint row) { - int i; + gint i; if (row == -1) return -1; if (eti->uses_source_model) { @@ -136,9 +136,9 @@ model_to_view_row(ETableItem *eti, int row) } inline static gint -model_to_view_col(ETableItem *eti, int col) +model_to_view_col(ETableItem *eti, gint col) { - int i; + gint i; if (col == -1) return -1; for (i = 0; i < eti->cols; i++) { @@ -159,7 +159,7 @@ static void eti_a11y_reset_focus_object (GalA11yETableItem *a11y, ETableItem *item, gboolean notify) { ESelectionModel * esm; - int cursor_row, cursor_col, view_row, view_col; + gint cursor_row, cursor_col, view_row, view_col; AtkObject *cell, *old_cell; esm = item->selection; @@ -284,9 +284,9 @@ eti_ref_accessible_at_point (AtkComponent *component, gint y, AtkCoordType coord_type) { - int row = -1; - int col = -1; - int x_origin, y_origin; + gint row = -1; + gint col = -1; + gint x_origin, y_origin; ETableItem *item; GtkWidget *tableOrTree; @@ -446,7 +446,7 @@ eti_get_column_extent_at (AtkTable *table, gint column) { ETableItem *item; - int width; + gint width; item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table))); if (!item) @@ -469,7 +469,7 @@ eti_get_row_extent_at (AtkTable *table, gint column) { ETableItem *item; - int height; + gint height; item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table))); if (!item) @@ -676,7 +676,7 @@ eti_atk_component_iface_init (AtkComponentIface *iface) } static void -eti_rows_inserted (ETableModel * model, int row, int count, +eti_rows_inserted (ETableModel * model, gint row, gint count, AtkObject * table_item) { gint n_cols,n_rows,i,j; @@ -711,7 +711,7 @@ eti_rows_inserted (ETableModel * model, int row, int count, } static void -eti_rows_deleted (ETableModel * model, int row, int count, +eti_rows_deleted (ETableModel * model, gint row, gint count, AtkObject * table_item) { gint i,j, n_rows, n_cols, old_nrows; @@ -949,7 +949,7 @@ static void eti_a11y_selection_model_added_cb (ETableItem *eti, static void eti_a11y_selection_changed_cb (ESelectionModel *selection, GalA11yETableItem *a11y); static void eti_a11y_cursor_changed_cb (ESelectionModel *selection, - int row, int col, + gint row, gint col, GalA11yETableItem *a11y); /** @@ -1021,7 +1021,7 @@ gal_a11y_e_table_item_new (ETableItem *item) AtkObject *accessible; ESelectionModel * esm; AtkObject *parent; - const char *name; + const gchar *name; g_return_val_if_fail (item && item->cols >= 0 && item->rows >= 0, NULL); a11y = g_object_new (gal_a11y_e_table_item_get_type (), NULL); @@ -1188,7 +1188,7 @@ eti_a11y_selection_changed_cb (ESelectionModel *selection, GalA11yETableItem *a1 static void eti_a11y_cursor_changed_cb (ESelectionModel *selection, - int row, int col, GalA11yETableItem *a11y) + gint row, gint col, GalA11yETableItem *a11y) { ETableItem *item; GalA11yETableItemPrivate *priv = GET_PRIVATE (a11y); diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c index 1966fb29ee..bf75227af4 100644 --- a/a11y/e-table/gal-a11y-e-table.c +++ b/a11y/e-table/gal-a11y-e-table.c @@ -37,7 +37,7 @@ static AtkObjectClass *parent_class; static GType parent_type; static gint priv_offset; -#define GET_PRIVATE(object) ((GalA11yETablePrivate *) (((char *) object) + priv_offset)) +#define GET_PRIVATE(object) ((GalA11yETablePrivate *) (((gchar *) object) + priv_offset)) #define PARENT_TYPE (parent_type) struct _GalA11yETablePrivate { @@ -125,7 +125,7 @@ et_get_n_children (AtkObject *accessible) { GalA11yETable *a11y = GAL_A11Y_E_TABLE (accessible); ETable * et; - int n = 0; + gint n = 0; et = E_TABLE(GTK_ACCESSIBLE (a11y)->widget); diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c index 4ecce81501..879b517aab 100644 --- a/a11y/e-table/gal-a11y-e-tree.c +++ b/a11y/e-table/gal-a11y-e-tree.c @@ -34,7 +34,7 @@ static AtkObjectClass *parent_class; static GType parent_type; static gint priv_offset; -#define GET_PRIVATE(object) ((GalA11yETreePrivate *) (((char *) object) + priv_offset)) +#define GET_PRIVATE(object) ((GalA11yETreePrivate *) (((gchar *) object) + priv_offset)) #define PARENT_TYPE (parent_type) struct _GalA11yETreePrivate { diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c index 98484949ff..6717f687b0 100644 --- a/a11y/e-text/gal-a11y-e-text.c +++ b/a11y/e-text/gal-a11y-e-text.c @@ -39,11 +39,11 @@ static AtkComponentIface *component_parent_iface; static GType parent_type; static gint priv_offset; static GQuark quark_accessible_object = 0; -#define GET_PRIVATE(object) ((GalA11yETextPrivate *) (((char *) object) + priv_offset)) +#define GET_PRIVATE(object) ((GalA11yETextPrivate *) (((gchar *) object) + priv_offset)) #define PARENT_TYPE (parent_type) struct _GalA11yETextPrivate { - int dummy; + gint dummy; }; static void @@ -66,8 +66,8 @@ et_get_extents (AtkComponent *component, EText *item = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (component))); double real_width; double real_height; - int fake_width; - int fake_height; + gint fake_width; + gint fake_height; if (component_parent_iface && component_parent_iface->get_extents) @@ -94,7 +94,7 @@ et_get_full_text (AtkText *text) { EText *etext = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text))); ETextModel *model; - const char *full_text; + const gchar *full_text; g_object_get (etext, "model", &model, NULL); @@ -105,7 +105,7 @@ et_get_full_text (AtkText *text) static void et_set_full_text (AtkEditableText *text, - const char *full_text) + const gchar *full_text) { EText *etext = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text))); ETextModel *model; @@ -121,7 +121,7 @@ et_get_text (AtkText *text, gint end_offset) { gint start, end, real_start, real_end, len; - const char *full_text = et_get_full_text (text); + const gchar *full_text = et_get_full_text (text); if (full_text == NULL) return NULL; len = g_utf8_strlen (full_text, -1); @@ -149,12 +149,12 @@ is_a_seperator (gunichar c) } static gint -find_word_start (const char *text, +find_word_start (const gchar *text, gint begin_offset, gint step) { gint offset; - char *at_offset; + gchar *at_offset; gunichar current, previous; gint len; @@ -175,12 +175,12 @@ find_word_start (const char *text, } static gint -find_word_end (const char *text, +find_word_end (const gchar *text, gint begin_offset, gint step) { gint offset; - char *at_offset; + gchar *at_offset; gunichar current, previous; gint len; @@ -201,14 +201,14 @@ find_word_end (const char *text, } static gint -find_sentence_start (const char *text, +find_sentence_start (const gchar *text, gint begin_offset, gint step) { gint offset, last_word_end, len; - char *at_offset; + gchar *at_offset; gunichar ch; - int i; + gint i; offset = find_word_start (text, begin_offset, step); len = g_utf8_strlen (text, -1); @@ -231,12 +231,12 @@ find_sentence_start (const char *text, } static gint -find_sentence_end (const char *text, +find_sentence_end (const gchar *text, gint begin_offset, gint step) { gint offset; - char *at_offset; + gchar *at_offset; gunichar previous; gint len; @@ -255,12 +255,12 @@ find_sentence_end (const char *text, } static gint -find_line_start (const char *text, +find_line_start (const gchar *text, gint begin_offset, gint step) { gint offset; - char *at_offset; + gchar *at_offset; gunichar previous; gint len; @@ -279,12 +279,12 @@ find_line_start (const char *text, } static gint -find_line_end (const char *text, +find_line_end (const gchar *text, gint begin_offset, gint step) { gint offset; - char *at_offset; + gchar *at_offset; gunichar current; gint len; @@ -310,7 +310,7 @@ et_get_text_after_offset (AtkText *text, gint *end_offset) { gint start, end, len; - const char *full_text = et_get_full_text (text); + const gchar *full_text = et_get_full_text (text); g_return_val_if_fail (full_text, NULL); switch (boundary_type) @@ -363,7 +363,7 @@ et_get_text_at_offset (AtkText *text, gint *end_offset) { gint start, end, len; - const char *full_text = et_get_full_text (text); + const gchar *full_text = et_get_full_text (text); g_return_val_if_fail (full_text, NULL); switch (boundary_type) @@ -412,15 +412,15 @@ static gunichar et_get_character_at_offset (AtkText *text, gint offset) { - const char *full_text = et_get_full_text (text); - char *at_offset; + const gchar *full_text = et_get_full_text (text); + gchar *at_offset; at_offset = g_utf8_offset_to_pointer (full_text, offset); return g_utf8_get_char_validated (at_offset, -1); } -static gchar* +static gchar * et_get_text_before_offset (AtkText *text, gint offset, AtkTextBoundary boundary_type, @@ -428,7 +428,7 @@ et_get_text_before_offset (AtkText *text, gint *end_offset) { gint start, end, len; - const char *full_text = et_get_full_text (text); + const gchar *full_text = et_get_full_text (text); g_return_val_if_fail (full_text, NULL); switch (boundary_type) @@ -478,7 +478,7 @@ et_get_caret_offset (AtkText *text) { GObject *obj; EText *etext; - int offset; + gint offset; g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE(text), -1); obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)); @@ -588,7 +588,7 @@ et_get_character_extents (AtkText *text, static gint et_get_character_count (AtkText *text) { - const char *full_text = et_get_full_text (text); + const gchar *full_text = et_get_full_text (text); return g_utf8_strlen (full_text, -1); } @@ -606,8 +606,8 @@ et_get_offset_at_point (AtkText *text, gint x_widget, y_widget, x_window, y_window; GdkWindow *window; GtkWidget *widget; - int index; - int trailing; + gint index; + gint trailing; g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE(text), -1); obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)); @@ -670,7 +670,7 @@ et_get_n_selections (AtkText *text) } -static gchar* +static gchar * et_get_selection (AtkText *text, gint selection_num, gint *start_offset, @@ -679,7 +679,7 @@ et_get_selection (AtkText *text, gint start, end, real_start, real_end, len; EText *etext; if (selection_num == 0) { - const char *full_text = et_get_full_text (text); + const gchar *full_text = et_get_full_text (text); if (full_text == NULL) return NULL; len = g_utf8_strlen (full_text, -1); @@ -842,9 +842,9 @@ et_insert_text (AtkEditableText *text, gint *position) { /* Utf8 unimplemented */ - char *result; + gchar *result; - const char *full_text = et_get_full_text (ATK_TEXT (text)); + const gchar *full_text = et_get_full_text (ATK_TEXT (text)); if (full_text == NULL) return; diff --git a/a11y/ea-cell-table.c b/a11y/ea-cell-table.c index 8c0b9ee253..95ae59dea4 100644 --- a/a11y/ea-cell-table.c +++ b/a11y/ea-cell-table.c @@ -36,11 +36,11 @@ ea_cell_table_create (gint rows, gint columns, gboolean column_first) cell_data->columns = columns; cell_data->rows = rows; - cell_data->column_labels = g_new0 (gchar*, columns); + cell_data->column_labels = g_new0 (gchar *, columns); for (index = columns -1; index >= 0; --index) cell_data->column_labels [index] = NULL; - cell_data->row_labels = g_new0 (gchar*, rows); + cell_data->row_labels = g_new0 (gchar *, rows); for (index = rows -1; index >= 0; --index) cell_data->row_labels [index] = NULL; @@ -142,7 +142,7 @@ ea_cell_table_set_cell_at_index (EaCellTable * cell_data, return TRUE; } -G_CONST_RETURN gchar* +G_CONST_RETURN gchar * ea_cell_table_get_column_label (EaCellTable * cell_data, gint column) { @@ -164,7 +164,7 @@ ea_cell_table_set_column_label (EaCellTable * cell_data, cell_data->column_labels[column] = g_strdup(label); } -G_CONST_RETURN gchar* +G_CONST_RETURN gchar * ea_cell_table_get_row_label (EaCellTable * cell_data, gint row) { diff --git a/a11y/ea-cell-table.h b/a11y/ea-cell-table.h index f8674ec42a..353bbd0634 100644 --- a/a11y/ea-cell-table.h +++ b/a11y/ea-cell-table.h @@ -48,11 +48,11 @@ gpointer ea_cell_table_get_cell_at_index (EaCellTable * cell_data, gboolean ea_cell_table_set_cell_at_index (EaCellTable * cell_data, gint index, gpointer cell); -G_CONST_RETURN gchar* +G_CONST_RETURN gchar * ea_cell_table_get_column_label (EaCellTable * cell_data, gint column); void ea_cell_table_set_column_label (EaCellTable * cell_data, gint column, const gchar *label); -G_CONST_RETURN gchar* +G_CONST_RETURN gchar * ea_cell_table_get_row_label (EaCellTable * cell_data, gint row); void ea_cell_table_set_row_label (EaCellTable * cell_data, gint row, const gchar *label); diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h index dcf6a1382f..2331f54a0b 100644 --- a/a11y/ea-factory.h +++ b/a11y/ea-factory.h @@ -78,7 +78,7 @@ type_as_function ## _factory_get_type (void) \ \ if (!t) \ { \ - char *name; \ + gchar *name; \ static const GTypeInfo tinfo = \ { \ sizeof (AtkObjectFactoryClass), \ diff --git a/a11y/gal-a11y-factory.h b/a11y/gal-a11y-factory.h index 1ef8292eba..678689c2a4 100644 --- a/a11y/gal-a11y-factory.h +++ b/a11y/gal-a11y-factory.h @@ -66,7 +66,7 @@ type_as_function ## _factory_get_type (void) \ \ if (!t) \ { \ - char *name; \ + gchar *name; \ static const GTypeInfo tinfo = \ { \ sizeof (AtkObjectFactoryClass), \ diff --git a/a11y/gal-a11y-util.h b/a11y/gal-a11y-util.h index dedad9e049..87a9f15981 100644 --- a/a11y/gal-a11y-util.h +++ b/a11y/gal-a11y-util.h @@ -30,7 +30,7 @@ GType gal_a11y_type_register_static_with_private (GType parent_type, const gchar *type_name, GTypeInfo *info, GTypeFlags flags, - int priv_size, + gint priv_size, gint *priv_offset); #endif /* ! __GAL_A11Y_UTIL_H__ */ diff --git a/a11y/widgets/ea-calendar-cell.c b/a11y/widgets/ea-calendar-cell.c index 5b4e9f1d8c..ab103bf1ef 100644 --- a/a11y/widgets/ea-calendar-cell.c +++ b/a11y/widgets/ea-calendar-cell.c @@ -80,7 +80,7 @@ e_calendar_cell_new (ECalendarItem *calitem, gint row, gint column) cell->column = column; #ifdef ACC_DEBUG - g_print ("EvoAcc: e_calendar_cell created %p\n", (void *)cell); + g_print ("EvoAcc: e_calendar_cell created %p\n", (gpointer)cell); #endif return cell; @@ -91,8 +91,8 @@ e_calendar_cell_new (ECalendarItem *calitem, gint row, gint column) static void ea_calendar_cell_class_init (EaCalendarCellClass *klass); static void ea_calendar_cell_init (EaCalendarCell *a11y); -static G_CONST_RETURN gchar* ea_calendar_cell_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_calendar_cell_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_calendar_cell_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_calendar_cell_get_description (AtkObject *accessible); static AtkObject * ea_calendar_cell_get_parent (AtkObject *accessible); static gint ea_calendar_cell_get_index_in_parent (AtkObject *accessible); static AtkStateSet *ea_calendar_cell_ref_state_set (AtkObject *accessible); @@ -209,7 +209,7 @@ static void ea_calendar_cell_finalize (GObject *object) } #endif -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_calendar_cell_get_name (AtkObject *accessible) { GObject *g_obj; @@ -243,7 +243,7 @@ ea_calendar_cell_get_name (AtkObject *accessible) return accessible->name; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_calendar_cell_get_description (AtkObject *accessible) { return ea_calendar_cell_get_name (accessible); diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c index fdb109d5e6..17795c51a5 100644 --- a/a11y/widgets/ea-calendar-item.c +++ b/a11y/widgets/ea-calendar-item.c @@ -38,8 +38,8 @@ static void ea_calendar_item_class_init (EaCalendarItemClass *klass); static void ea_calendar_item_finalize (GObject *object); -static G_CONST_RETURN gchar* ea_calendar_item_get_name (AtkObject *accessible); -static G_CONST_RETURN gchar* ea_calendar_item_get_description (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_calendar_item_get_name (AtkObject *accessible); +static G_CONST_RETURN gchar * ea_calendar_item_get_description (AtkObject *accessible); static gint ea_calendar_item_get_n_children (AtkObject *accessible); static AtkObject *ea_calendar_item_ref_child (AtkObject *accessible, gint index); static AtkStateSet* ea_calendar_item_ref_state_set (AtkObject *accessible); @@ -88,10 +88,10 @@ static AtkObject* table_interface_get_column_header (AtkTable *table, gint in_col); static AtkObject* table_interface_get_caption (AtkTable *table); -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * table_interface_get_column_description (AtkTable *table, gint in_col); -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * table_interface_get_row_description (AtkTable *table, gint row); static AtkObject* table_interface_get_summary (AtkTable *table); @@ -263,7 +263,7 @@ ea_calendar_item_finalize (GObject *object) #endif } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_calendar_item_get_name (AtkObject *accessible) { GObject *g_obj; @@ -329,7 +329,7 @@ ea_calendar_item_get_name (AtkObject *accessible) return accessible->name; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_calendar_item_get_description (AtkObject *accessible) { if (accessible->description) @@ -782,7 +782,7 @@ table_interface_get_caption (AtkTable *table) return NULL; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * table_interface_get_column_description (AtkTable *table, gint in_col) { AtkGObjectAccessible *atk_gobj; @@ -816,7 +816,7 @@ table_interface_get_column_description (AtkTable *table, gint in_col) return description; } -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * table_interface_get_row_description (AtkTable *table, gint row) { AtkGObjectAccessible *atk_gobj; diff --git a/a11y/widgets/ea-combo-button.c b/a11y/widgets/ea-combo-button.c index c5180c3927..e25aa7f377 100644 --- a/a11y/widgets/ea-combo-button.c +++ b/a11y/widgets/ea-combo-button.c @@ -37,7 +37,7 @@ enum { }; /* Static functions */ -static G_CONST_RETURN gchar* +static G_CONST_RETURN gchar * ea_combo_button_get_name (AtkObject *a11y) { GtkWidget *widget; diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index aa7bb74c6a..c82726276c 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -96,7 +96,7 @@ static EContactField priority [] = { E_CONTACT_FIELD_LAST }; -static int priority_label [] = { +static gint priority_label [] = { LABEL_WORK, LABEL_HOME, LABEL_FAX, @@ -168,10 +168,10 @@ struct _EAddrConduitCfg { * this function (see e_pilot_utf8_to_pchar() in e-pilot-util.c) */ static int -e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *category) +e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *category) { - int i, j; - int retval = 0; /* 0 is the Unfiled category */ + gint i, j; + gint retval = 0; /* 0 is the Unfiled category */ LOG(g_message("e_pilot_add_category_if_possible\n")); for(i=0; iname[i]) == 0){ - int cat_to_add_len; - int desktopUniqueID; + gint cat_to_add_len; + gint desktopUniqueID; cat_to_add_len = strlen(cat_to_add); retval = i; if(cat_to_add_len > 15){ - char tmpstr[16]; + gchar tmpstr[16]; strncpy(tmpstr, cat_to_add,16); tmpstr[16] = '\0'; /* Have to truncate the category name */ @@ -214,7 +214,7 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ * we don't have much use for it at present. */ for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) { - int found = 0; + gint found = 0; for(j=0; jID[j] == desktopUniqueID) { found = 1; @@ -252,22 +252,22 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ * is set to zero ("Unfiled"). */ static -void e_pilot_local_category_to_remote(int * pilotCategory, +void e_pilot_local_category_to_remote(gint * pilotCategory, EContact *contact, struct CategoryAppInfo *category) { GList *c_list = NULL, *l; - char * category_string, *first_category = NULL; - int i; + gchar * category_string, *first_category = NULL; + gint i; *pilotCategory = 0; /* default to "Unfiled" */ c_list = e_contact_get (contact, E_CONTACT_CATEGORY_LIST); if (c_list) { /* remember the first category */ - first_category = e_pilot_utf8_to_pchar((const char *)c_list->data); + first_category = e_pilot_utf8_to_pchar((const gchar *)c_list->data); } l = c_list; while(l && *pilotCategory == 0) { /* list != 0, so at least 1 category is assigned */ - category_string = e_pilot_utf8_to_pchar((const char *)l->data); + category_string = e_pilot_utf8_to_pchar((const gchar *)l->data); for (i=0; i < PILOT_MAX_CATEGORIES; i++) { /* only 15 chars + nul in palm category name */ if (strncmp(category_string,category->name[i], 15) == 0) { @@ -297,10 +297,10 @@ void e_pilot_local_category_to_remote(int * pilotCategory, * conversion from a palm category to an evolution category */ static -void e_pilot_remote_category_to_local(int pilotCategory, +void e_pilot_remote_category_to_local(gint pilotCategory, EContact *contact, struct CategoryAppInfo *category) { - char *category_string = NULL; + gchar *category_string = NULL; if (pilotCategory != 0) { /* pda has category assigned */ @@ -345,17 +345,17 @@ void e_pilot_remote_category_to_local(int pilotCategory, } } -static char * -build_setup_path (const char *path, const char *key) +static gchar * +build_setup_path (const gchar *path, const gchar *key) { return g_strconcat ("/apps/evolution/conduit", "/", path, "/", key, NULL); } static gboolean -e_pilot_setup_get_bool (const char *path, const char *key, gboolean def) +e_pilot_setup_get_bool (const gchar *path, const gchar *key, gboolean def) { gboolean res = def; - char *full_path; + gchar *full_path; GConfValue *value; GConfClient *gconf; @@ -380,10 +380,10 @@ e_pilot_setup_get_bool (const char *path, const char *key, gboolean def) } static void -e_pilot_setup_set_bool (const char *path, const char *key, gboolean value) +e_pilot_setup_set_bool (const gchar *path, const gchar *key, gboolean value) { GError *error = NULL; - char *full_path; + gchar *full_path; GConfClient *gconf; g_return_if_fail (path != NULL); @@ -403,11 +403,11 @@ e_pilot_setup_set_bool (const char *path, const char *key, gboolean value) } } -static char * -e_pilot_setup_get_string (const char *path, const char *key, const char *def) +static gchar * +e_pilot_setup_get_string (const gchar *path, const gchar *key, const gchar *def) { - char *res = g_strdup (def); - char *full_path; + gchar *res = g_strdup (def); + gchar *full_path; GConfValue *value; GConfClient *gconf; @@ -434,10 +434,10 @@ e_pilot_setup_get_string (const char *path, const char *key, const char *def) } static void -e_pilot_setup_set_string (const char *path, const char *key, const char *value) +e_pilot_setup_set_string (const gchar *path, const gchar *key, const gchar *value) { GError *error = NULL; - char *full_path; + gchar *full_path; GConfClient *gconf; g_return_if_fail (path != NULL); @@ -578,7 +578,7 @@ e_addr_gui_new (EPilotSettings *ps) EAddrConduitGui *gui; GtkWidget *lbl; gint rows, i; - static const char *items[] = {"Business", "Home", "Other", NULL}; + static const gchar *items[] = {"Business", "Home", "Other", NULL}; g_return_val_if_fail (ps != NULL, NULL); g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL); @@ -603,7 +603,7 @@ e_addr_gui_new (EPilotSettings *ps) return gui; } -static const int default_address_map[] = { +static const gint default_address_map[] = { E_CONTACT_ADDRESS_WORK, E_CONTACT_ADDRESS_HOME, E_CONTACT_ADDRESS_OTHER, @@ -721,7 +721,7 @@ e_addr_context_destroy (EAddrConduitContext *ctxt) static const gchar * print_local (EAddrLocalRecord *local) { - static char buff[ 4096 ]; + static gchar buff[ 4096 ]; if (local == NULL) { sprintf (buff, "[NULL]"); @@ -742,9 +742,9 @@ print_local (EAddrLocalRecord *local) return ""; } -static char *print_remote (GnomePilotRecord *remote) +static gchar *print_remote (GnomePilotRecord *remote) { - static char buff[ 4096 ]; + static gchar buff[ 4096 ]; struct Address addr; #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; @@ -786,10 +786,10 @@ static char *print_remote (GnomePilotRecord *remote) } /* Utility routines */ -static char * +static gchar * map_name (EAddrConduitContext *ctxt) { - char *filename = NULL; + gchar *filename = NULL; filename = g_strdup_printf ("%s/.evolution/addressbook/local/system/pilot-map-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id); @@ -951,15 +951,15 @@ is_syncable (EAddrConduitContext *ctxt, EAddrLocalRecord *local) EContactField next_mail, next_home, next_work, next_fax; EContactField next_other, next_main, next_pager, next_mobile; gboolean syncable = TRUE; - int i, l = 0; + gint i, l = 0; /* See if there are fields we can't sync or not in priority order */ get_next_init (&next_mail, &next_home, &next_work, &next_fax, &next_other, &next_main, &next_pager, &next_mobile); for (i = entryPhone1; i <= entryPhone5 && syncable; i++) { - int phonelabel = local->addr->phoneLabel[i - entryPhone1]; - const char *phone_str = local->addr->entry[i]; + gint phonelabel = local->addr->phoneLabel[i - entryPhone1]; + const gchar *phone_str = local->addr->entry[i]; gboolean empty = !(phone_str && *phone_str); if (empty) @@ -1029,9 +1029,9 @@ is_syncable (EAddrConduitContext *ctxt, EAddrLocalRecord *local) } static void -set_contact_text (EContact *contact, EContactField field, struct Address address, int entry) +set_contact_text (EContact *contact, EContactField field, struct Address address, gint entry) { - char *text = NULL; + gchar *text = NULL; if (address.entry[entry]) text = e_pilot_utf8_from_pchar (address.entry[entry]); @@ -1041,8 +1041,8 @@ set_contact_text (EContact *contact, EContactField field, struct Address address g_free (text); } -static char * -get_entry_text (struct Address address, int entry) +static gchar * +get_entry_text (struct Address address, gint entry) { if (address.entry[entry]) return e_pilot_utf8_from_pchar (address.entry[entry]); @@ -1051,7 +1051,7 @@ get_entry_text (struct Address address, int entry) } static void -clear_entry_text (struct Address address, int field) +clear_entry_text (struct Address address, gint field) { if (address.entry[field]) { free (address.entry[field]); @@ -1060,7 +1060,7 @@ clear_entry_text (struct Address address, int field) } static void -compute_status (EAddrConduitContext *ctxt, EAddrLocalRecord *local, const char *uid) +compute_status (EAddrConduitContext *ctxt, EAddrLocalRecord *local, const gchar *uid) { EBookChange *ebc; @@ -1095,7 +1095,7 @@ local_record_to_pilot_record (EAddrLocalRecord *local, #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; #else - static char record[0xffff]; + static gchar record[0xffff]; #endif g_assert (local->addr != NULL ); @@ -1127,7 +1127,7 @@ local_record_to_pilot_record (EAddrLocalRecord *local, pi_buffer_free(buffer); #else - p.record = (unsigned char *)record; + p.record = (guchar *)record; p.length = pack_Address (local->addr, p.record, 0xffff); #endif return p; @@ -1137,10 +1137,10 @@ static void local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrConduitContext *ctxt) { EContactAddress *address = NULL; - int phone = entryPhone1; + gint phone = entryPhone1; EContactField field; gboolean syncable; - int i; + gint i; g_return_if_fail (local != NULL); g_return_if_fail (contact != NULL); @@ -1157,7 +1157,7 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui */ if (local->local.ID != 0) { struct Address addr; - int cat = 0; + gint cat = 0; #ifdef PILOT_LINK_0_12 pi_buffer_t * record; record = pi_buffer_new(DLP_BUF_SIZE); @@ -1166,7 +1166,7 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui return; } #else - char record[0xffff]; + gchar record[0xffff]; #endif if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, @@ -1183,7 +1183,7 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui #ifdef PILOT_LINK_0_12 unpack_Address (&addr, record, address_v1); #else - unpack_Address (&addr, (unsigned char *)record, 0xffff); + unpack_Address (&addr, (guchar *)record, 0xffff); #endif for (i = 0; i < 5; i++) { if (addr.entry[entryPhone1 + i]) @@ -1224,7 +1224,7 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui } if (address) { - char *add; + gchar *add; /* If the address has 2 lines, make sure both get added */ if (address->ext != NULL && @@ -1258,7 +1258,7 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui /* Sync by priority */ for (i = 0, phone = entryPhone1; priority[i] != E_CONTACT_FIELD_LAST && phone <= entryPhone5; i++) { - const char *phone_str; + const gchar *phone_str; phone_str = e_contact_get_const (contact, priority[i]); if (phone_str && *phone_str) { @@ -1281,8 +1281,8 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui /* Not completely syncable, so do the best we can */ for (i = entryPhone1; i <= entryPhone5; i++) { - int phonelabel = local->addr->phoneLabel[i - entryPhone1]; - const char *phone_str = NULL; + gint phonelabel = local->addr->phoneLabel[i - entryPhone1]; + const gchar *phone_str = NULL; if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) { phone_str = e_contact_get_const (contact, next_mail); @@ -1323,11 +1323,11 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui static void local_record_from_uid (EAddrLocalRecord *local, - const char *uid, + const gchar *uid, EAddrConduitContext *ctxt) { EContact *contact = NULL; - const char *cuid; + const gchar *cuid; GList *l; g_assert (local != NULL); @@ -1362,10 +1362,10 @@ ecard_from_remote_record(EAddrConduitContext *ctxt, EContactName *name; EContactAddress *eaddress; EContactField mailing_address; - char *txt, *find, *full_name; + gchar *txt, *find, *full_name; EContactField next_mail, next_home, next_work, next_fax; EContactField next_other, next_main, next_pager, next_mobile; - int i; + gint i; #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; #endif @@ -1460,8 +1460,8 @@ ecard_from_remote_record(EAddrConduitContext *ctxt, &next_other, &next_main, &next_pager, &next_mobile); for (i = entryPhone1; i <= entryPhone5; i++) { - int phonelabel = address.phoneLabel[i - entryPhone1]; - char *phonenum = get_entry_text (address, i); + gint phonelabel = address.phoneLabel[i - entryPhone1]; + gchar *phonenum = get_entry_text (address, i); if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) { e_contact_set (contact, next_mail, phonenum); @@ -1504,8 +1504,8 @@ static void check_for_slow_setting (GnomePilotConduit *c, EAddrConduitContext *ctxt) { GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c); - int map_count; - const char *uri; + gint map_count; + const gchar *uri; map_count = g_hash_table_size (ctxt->map->pid_map); if (map_count == 0) @@ -1580,15 +1580,15 @@ pre_sync (GnomePilotConduit *conduit, GnomePilotConduitSyncAbs *abs_conduit; EBookQuery *query; GList *l; - int len; - char *filename; - char *change_id; - char *auth; + gint len; + gchar *filename; + gchar *change_id; + gchar *auth; gint num_records, add_records = 0, mod_records = 0, del_records = 0; #ifdef PILOT_LINK_0_12 pi_buffer_t *buffer; #else - unsigned char *buf; + guchar *buf; #endif abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit); @@ -1645,7 +1645,7 @@ pre_sync (GnomePilotConduit *conduit, for (l = ctxt->changed; l != NULL; l = l->next) { EBookChange *ebc = l->data; - const char *uid; + const gchar *uid; uid = e_contact_get_const (ebc->contact, E_CONTACT_UID); if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) { @@ -1684,9 +1684,9 @@ pre_sync (GnomePilotConduit *conduit, len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, DLP_BUF_SIZE, buffer); #else - buf = (unsigned char*)g_malloc (0xffff); + buf = (guchar *)g_malloc (0xffff); len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, - (unsigned char *)buf, 0xffff); + (guchar *)buf, 0xffff); #endif if (len < 0) { WARN (_("Could not read pilot's Address application block")); @@ -1717,18 +1717,18 @@ post_sync (GnomePilotConduit *conduit, { GList *changed; gchar *filename, *change_id; - unsigned char *buf; - int dlpRetVal, len; + guchar *buf; + gint dlpRetVal, len; LOG (g_message ( "post_sync: Address Conduit v.%s", CONDUIT_VERSION )); /* Write AppBlock to PDA - updates categories */ - buf = (unsigned char*)g_malloc (0xffff); + buf = (guchar *)g_malloc (0xffff); len = pack_AddressAppInfo (&(ctxt->ai), buf, 0xffff); dlpRetVal = dlp_WriteAppBlock (dbi->pilot_socket, dbi->db_handle, - (unsigned char *)buf, len); + (guchar *)buf, len); g_free (buf); @@ -1779,7 +1779,7 @@ set_status_cleared (GnomePilotConduitSyncAbs *conduit, EAddrLocalRecord *local, EAddrConduitContext *ctxt) { - const char *uid; + const gchar *uid; LOG (g_message ( "set_status_cleared: clearing status\n" )); @@ -1795,7 +1795,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, EAddrConduitContext *ctxt) { static GList *cards, *iterator; - static int count; + static gint count; g_return_val_if_fail (local != NULL, -1); @@ -1845,7 +1845,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, EAddrConduitContext *ctxt) { static GList *iterator; - static int count; + static gint count; g_return_val_if_fail (local != NULL, 0); @@ -1899,7 +1899,7 @@ compare (GnomePilotConduitSyncAbs *conduit, EAddrConduitContext *ctxt) { GnomePilotRecord local_pilot; - int retval = 0; + gint retval = 0; LOG (g_message ("compare: local=%s remote=%s...\n", print_local (local), print_remote (remote))); @@ -1927,7 +1927,7 @@ add_record (GnomePilotConduitSyncAbs *conduit, EAddrConduitContext *ctxt) { EContact *contact; - int retval = 0; + gint retval = 0; g_return_val_if_fail (remote != NULL, -1); @@ -1958,8 +1958,8 @@ replace_record (GnomePilotConduitSyncAbs *conduit, { EContact *new_contact; EBookChange *ebc; - char *old_id; - int retval = 0; + gchar *old_id; + gint retval = 0; g_return_val_if_fail (remote != NULL, -1); @@ -1990,7 +1990,7 @@ replace_record (GnomePilotConduitSyncAbs *conduit, /* Adding a record causes wombat to assign a new uid so we must tidy */ if (ebc && ebc->change_type == E_BOOK_CHANGE_CARD_DELETED) { - const char *uid = e_contact_get_const (local->contact, E_CONTACT_UID); + const gchar *uid = e_contact_get_const (local->contact, E_CONTACT_UID); gboolean arch; arch = e_pilot_map_uid_is_archived (ctxt->map, uid); @@ -2016,7 +2016,7 @@ delete_record (GnomePilotConduitSyncAbs *conduit, EAddrConduitContext *ctxt) { GError *error = NULL; - int retval = 0; + gint retval = 0; g_return_val_if_fail (local != NULL, -1); g_return_val_if_fail (local->contact != NULL, -1); @@ -2040,7 +2040,7 @@ archive_record (GnomePilotConduitSyncAbs *conduit, gboolean archive, EAddrConduitContext *ctxt) { - int retval = 0; + gint retval = 0; g_return_val_if_fail (local != NULL, -1); @@ -2057,7 +2057,7 @@ match (GnomePilotConduitSyncAbs *conduit, EAddrLocalRecord **local, EAddrConduitContext *ctxt) { - const char *uid; + const gchar *uid; LOG (g_message ("match: looking for local copy of %s\n", print_remote (remote))); diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 2c1d5caa9b..ec715b7cb9 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -61,7 +61,7 @@ static BonoboObjectClass *parent_class = NULL; struct _AddressbookComponentPrivate { GConfClient *gconf_client; - char *base_directory; + gchar *base_directory; GList *views; }; @@ -71,7 +71,7 @@ ensure_sources (AddressbookComponent *component) ESourceList *source_list; ESourceGroup *on_this_computer; ESource *personal_source; - char *base_uri, *base_uri_proto, base_uri_proto_seventh; + gchar *base_uri, *base_uri_proto, base_uri_proto_seventh; const gchar *base_dir; personal_source = NULL; @@ -204,28 +204,28 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_sequence_set_release (list, FALSE); - list->_buffer[0].id = (char *) "contact"; + list->_buffer[0].id = (gchar *) "contact"; list->_buffer[0].description = _("New Contact"); - list->_buffer[0].menuDescription = (char *) C_("New", "_Contact"); + list->_buffer[0].menuDescription = (gchar *) C_("New", "_Contact"); list->_buffer[0].tooltip = _("Create a new contact"); list->_buffer[0].menuShortcut = 'c'; - list->_buffer[0].iconName = (char *) "contact-new"; + list->_buffer[0].iconName = (gchar *) "contact-new"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[1].id = (char *) "contact_list"; + list->_buffer[1].id = (gchar *) "contact_list"; list->_buffer[1].description = _("New Contact List"); - list->_buffer[1].menuDescription = (char *) C_("New", "Contact _List"); + list->_buffer[1].menuDescription = (gchar *) C_("New", "Contact _List"); list->_buffer[1].tooltip = _("Create a new contact list"); list->_buffer[1].menuShortcut = 'l'; - list->_buffer[1].iconName = (char *) "stock_contact-list"; + list->_buffer[1].iconName = (gchar *) "stock_contact-list"; list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[2].id = (char *) "address_book"; + list->_buffer[2].id = (gchar *) "address_book"; list->_buffer[2].description = _("New Address Book"); - list->_buffer[2].menuDescription = (char *) C_("New", "Address _Book"); + list->_buffer[2].menuDescription = (gchar *) C_("New", "Address _Book"); list->_buffer[2].tooltip = _("Create a new address book"); list->_buffer[2].menuShortcut = '\0'; - list->_buffer[2].iconName = (char *) "address-book-new"; + list->_buffer[2].iconName = (gchar *) "address-book-new"; list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER; return list; @@ -235,7 +235,7 @@ static void book_loaded_cb (EBook *book, EBookStatus status, gpointer data) { EContact *contact; - char *item_type_name = data; + gchar *item_type_name = data; if (status != E_BOOK_ERROR_OK) { /* XXX we really need a dialog here, but we don't have @@ -267,7 +267,7 @@ impl_requestCreateItem (PortableServer_Servant servant, EBook *book; GConfClient *gconf_client; ESourceList *source_list; - char *uid; + gchar *uid; if (!item_type_name || (strcmp (item_type_name, "address_book") && @@ -310,7 +310,7 @@ impl_requestCreateItem (PortableServer_Servant servant, static void impl_handleURI (PortableServer_Servant servant, - const char* uri, + const gchar * uri, CORBA_Environment *ev) { AddressbookComponent *addressbook_component = ADDRESSBOOK_COMPONENT (bonobo_object_from_servant (servant)); @@ -318,8 +318,8 @@ impl_handleURI (PortableServer_Servant servant, AddressbookView *view = NULL; GList *l; - char *src_uid = NULL; - char *contact_uid = NULL; + gchar *src_uid = NULL; + gchar *contact_uid = NULL; priv = addressbook_component->priv; l = g_list_last (priv->views); @@ -330,8 +330,8 @@ impl_handleURI (PortableServer_Servant servant, if (!strncmp (uri, "contacts:", 9)) { EUri *euri = e_uri_new (uri); - const char *p; - char *header, *content; + const gchar *p; + gchar *header, *content; size_t len, clen; p = euri->query; @@ -343,7 +343,7 @@ impl_handleURI (PortableServer_Servant servant, if (p[len] != '=') break; - header = (char *) p; + header = (gchar *) p; header[len] = '\0'; p += len + 1; @@ -462,7 +462,7 @@ static void addressbook_component_init (AddressbookComponent *component) { AddressbookComponentPrivate *priv; - static int first = TRUE; + static gint first = TRUE; priv = g_new0 (AddressbookComponentPrivate, 1); @@ -518,7 +518,7 @@ addressbook_component_peek_gconf_client (AddressbookComponent *component) return component->priv->gconf_client; } -const char * +const gchar * addressbook_component_peek_base_directory (AddressbookComponent *component) { g_return_val_if_fail (ADDRESSBOOK_IS_COMPONENT (component), NULL); diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h index 222ace82d7..4208994117 100644 --- a/addressbook/gui/component/addressbook-component.h +++ b/addressbook/gui/component/addressbook-component.h @@ -59,6 +59,6 @@ GType addressbook_component_get_type (void); AddressbookComponent *addressbook_component_peek (void); GConfClient *addressbook_component_peek_gconf_client (AddressbookComponent *component); -const char *addressbook_component_peek_base_directory (AddressbookComponent *component); +const gchar *addressbook_component_peek_base_directory (AddressbookComponent *component); #endif /* _ADDRESSBOOK_COMPONENT_H_ */ diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index ebb2d18b5d..46ab002ecb 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -75,8 +75,8 @@ #define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory:" BASE_VERSION #define LDAP_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl:" BASE_VERSION -GtkWidget* supported_bases_create_table (char *name, char *string1, char *string2, - int num1, int num2); +GtkWidget* supported_bases_create_table (gchar *name, gchar *string1, gchar *string2, + gint num1, gint num2); /* default objectclasses */ #define TOP "top" @@ -152,7 +152,7 @@ ldap_unparse_auth (AddressbookLDAPAuthType auth_type) } static AddressbookLDAPAuthType -ldap_parse_auth (const char *auth) +ldap_parse_auth (const gchar *auth) { if (!auth) return ADDRESSBOOK_LDAP_AUTH_NONE; @@ -196,7 +196,7 @@ ldap_unparse_ssl (AddressbookLDAPSSLType ssl_type) } static AddressbookLDAPSSLType -ldap_parse_ssl (const char *ssl) +ldap_parse_ssl (const gchar *ssl) { if (!ssl) return ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE; /* XXX good default? */ @@ -209,7 +209,7 @@ ldap_parse_ssl (const char *ssl) return ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE; } -static const char * +static const gchar * ldap_get_ssl_tooltip (AddressbookLDAPSSLType ssl_type) { switch (ssl_type) { @@ -271,8 +271,8 @@ addressbook_ldap_init (GtkWidget *window, ESource *source) LDAP *ldap; gchar *host; gint port; - int ldap_error; - int protocol_version = LDAP_VERSION3; + gint ldap_error; + gint protocol_version = LDAP_VERSION3; if (!source_to_uri_parts (source, &host, NULL, NULL, NULL, &port)) return NULL; @@ -310,7 +310,7 @@ static int addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap, const gchar **attrs, LDAPMessage **resp) { - int ldap_error; + gint ldap_error; struct timeval timeout; timeout.tv_sec = (gint) gtk_adjustment_get_value (GTK_RANGE(dialog->timeout_scale)->adjustment); @@ -328,7 +328,7 @@ addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap, /* searching page */ GtkWidget* -supported_bases_create_table (char *name, char *string1, char *string2, int num1, int num2) +supported_bases_create_table (gchar *name, gchar *string1, gchar *string2, gint num1, gint num2) { GtkWidget *table, *scrolled; GtkTreeSelection *selection; @@ -359,10 +359,10 @@ do_ldap_root_dse_query (AddressbookSourceDialog *sdialog, GtkListStore *model, E { LDAP *ldap; const gchar *attrs[2]; - int ldap_error; - char **values; + gint ldap_error; + gchar **values; LDAPMessage *resp; - int i; + gint i; ldap = addressbook_ldap_init (sdialog->window, source); if (!ldap) @@ -419,7 +419,7 @@ query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog) GtkWidget *supported_bases_table; GladeXML *gui; GtkTreeIter iter; - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, GLADE_FILE_NAME, @@ -450,7 +450,7 @@ query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog) if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK && gtk_tree_selection_get_selected (selection, &model, &iter)) { - char *dn; + gchar *dn; gtk_tree_model_get (model, &iter, 0, &dn, -1); gtk_entry_set_text((GtkEntry *)sdialog->rootdn, dn); @@ -474,7 +474,7 @@ addressbook_config_create_new_source (GtkWidget *parent) static void eabc_type_changed(GtkComboBox *dropdown, AddressbookSourceDialog *sdialog) { - int id = gtk_combo_box_get_active(dropdown); + gint id = gtk_combo_box_get_active(dropdown); GtkTreeModel *model; GtkTreeIter iter; @@ -494,7 +494,7 @@ eabc_type_changed(GtkComboBox *dropdown, AddressbookSourceDialog *sdialog) if (!strncmp(e_source_group_peek_base_uri(sdialog->source_group), "groupwise:", 10)) { GSList *l; ESource *source; - char *tmp; + gchar *tmp; l = e_source_group_peek_sources(sdialog->source_group); if (l && l->data ) { @@ -510,7 +510,7 @@ eabc_type_changed(GtkComboBox *dropdown, AddressbookSourceDialog *sdialog) g_free (tmp); #ifdef HAVE_LDAP } else if (!strncmp(e_source_group_peek_base_uri(sdialog->source_group), "ldap:", 5)) { - char *tmp; + gchar *tmp; tmp = g_strdup_printf ("%s:%s/%s?" /* trigraph prevention */ "?%s", "", LDAP_PORT_STRING, @@ -529,7 +529,7 @@ eabc_type_changed(GtkComboBox *dropdown, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_general_type(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +eabc_general_type(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; GtkComboBox *dropdown; @@ -538,7 +538,7 @@ eabc_general_type(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str GtkTreeIter iter; GSList *l; GtkWidget *w, *label; - int i, row = 0; + gint i, row = 0; if (old) return old; @@ -595,13 +595,13 @@ offline_status_changed_cb (GtkWidget *widget, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_general_name(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +eabc_general_name(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; - const char *uri; + const gchar *uri; GtkWidget *w; GladeXML *gui; - char *gladefile; + gchar *gladefile; if (old) return old; @@ -634,11 +634,11 @@ eabc_general_name(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str static GtkWidget * -eabc_general_offline(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +eabc_general_offline(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; GtkWidget *offline_setting; - const char *offline_sync; + const gchar *offline_sync; gboolean is_local_book; is_local_book = g_str_has_prefix (e_source_group_peek_base_uri (sdialog->source_group), "file:"); @@ -701,7 +701,7 @@ host_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) static void port_entry_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) { - const char *port = gtk_entry_get_text((GtkEntry *)w); + const gchar *port = gtk_entry_get_text((GtkEntry *)w); if (!strcmp (port, LDAPS_PORT_STRING)) { sdialog->ssl = ADDRESSBOOK_LDAP_SSL_ALWAYS; @@ -725,15 +725,15 @@ ssl_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) static GtkWidget * -eabc_general_host(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +eabc_general_host(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; - const char *tmp; + const gchar *tmp; GtkWidget *w; - char *uri, port[16]; + gchar *uri, port[16]; LDAPURLDesc *lud; GladeXML *gui; - char *gladefile; + gchar *gladefile; if (!source_group_is_remote(sdialog->source_group)) return NULL; @@ -783,7 +783,7 @@ eabc_general_host(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str static void auth_entry_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) { - const char *principal = gtk_entry_get_text((GtkEntry *)w); + const gchar *principal = gtk_entry_get_text((GtkEntry *)w); /* seems messy ... but the api is */ switch (sdialog->auth) { @@ -814,13 +814,13 @@ auth_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_general_auth(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +eabc_general_auth(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; GtkWidget *w; - const char *tmp; + const gchar *tmp; GladeXML *gui; - char *gladefile; + gchar *gladefile; if (!source_group_is_remote(sdialog->source_group)) return NULL; @@ -883,14 +883,14 @@ scope_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) } static GtkWidget * -eabc_details_search(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +eabc_details_search(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; GtkWidget *w; LDAPURLDesc *lud; - char *uri; + gchar *uri; GladeXML *gui; - char *gladefile; + gchar *gladefile; if (!source_group_is_remote(sdialog->source_group)) return NULL; @@ -951,7 +951,7 @@ eabc_details_search(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, s static void timeout_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) { - char *timeout; + gchar *timeout; timeout = g_strdup_printf("%f", gtk_adjustment_get_value(((GtkRange *)sdialog->timeout_scale)->adjustment)); e_source_set_property(sdialog->source, "timeout", timeout); @@ -961,7 +961,7 @@ timeout_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) static void limit_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) { - char limit[16]; + gchar limit[16]; sprintf(limit, "%d", gtk_spin_button_get_value_as_int((GtkSpinButton *)sdialog->limit_spinbutton)); e_source_set_property(sdialog->source, "limit", limit); @@ -977,13 +977,13 @@ canbrowse_toggled_cb (GtkWidget *toggle_button, ESource *source) } static GtkWidget * -eabc_details_limit(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +eabc_details_limit(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { AddressbookSourceDialog *sdialog = data; GtkWidget *w; - const char *tmp; + const gchar *tmp; GladeXML *gui; - char *gladefile; + gchar *gladefile; if (!source_group_is_remote(sdialog->source_group)) return NULL; @@ -1045,18 +1045,18 @@ static EConfigItem eabc_new_items[] = { }; static void -eabc_commit(EConfig *ec, GSList *items, void *data) +eabc_commit(EConfig *ec, GSList *items, gpointer data) { AddressbookSourceDialog *sdialog = data; xmlNodePtr xml; #if d(!)0 - char *txt; + gchar *txt; #endif if (sdialog->original_source) { d(printf("committing addressbook changes\n")); /* these api's kinda suck */ - xml = xmlNewNode(NULL, (const unsigned char *)"dummy"); + xml = xmlNewNode(NULL, (const guchar *)"dummy"); e_source_dump_to_xml_node(sdialog->source, xml); e_source_update_from_xml_node(sdialog->original_source, xml->children, NULL); xmlFreeNode(xml); @@ -1079,7 +1079,7 @@ eabc_commit(EConfig *ec, GSList *items, void *data) } static void -eabc_free(EConfig *ec, GSList *items, void *data) +eabc_free(EConfig *ec, GSList *items, gpointer data) { AddressbookSourceDialog *sdialog = data; @@ -1098,11 +1098,11 @@ eabc_free(EConfig *ec, GSList *items, void *data) } static gboolean -eabc_check_complete(EConfig *ec, const char *pageid, void *data) +eabc_check_complete(EConfig *ec, const gchar *pageid, gpointer data) { AddressbookSourceDialog *sdialog = data; - int valid = TRUE; - const char *tmp; + gint valid = TRUE; + const gchar *tmp; ESource *source; d(printf("check complete, pageid = '%s'\n", pageid?pageid:"")); @@ -1114,7 +1114,7 @@ eabc_check_complete(EConfig *ec, const char *pageid, void *data) #ifdef HAVE_LDAP if (valid && source_group_is_remote(sdialog->source_group)) { - char *uri = e_source_get_uri(sdialog->source); + gchar *uri = e_source_get_uri(sdialog->source); LDAPURLDesc *lud; /* check host and port set */ @@ -1158,7 +1158,7 @@ eabc_check_complete(EConfig *ec, const char *pageid, void *data) static void source_changed(ESource *source, AddressbookSourceDialog *sdialog) { - char *xml; + gchar *xml; xml = e_source_to_standalone_xml(source); printf("source changed:\n%s\n", xml); @@ -1171,11 +1171,11 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source) { AddressbookSourceDialog *sdialog = g_new0 (AddressbookSourceDialog, 1); EABConfig *ec; - int i; + gint i; GSList *items = NULL; EABConfigTargetSource *target; - char *xml; - char *gladefile; + gchar *xml; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, GLADE_FILE_NAME, diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index ca691761c9..8017e8979f 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -106,7 +106,7 @@ dialog_close (MigrationContext *context) } static void -dialog_set_label (MigrationContext *context, const char *str) +dialog_set_label (MigrationContext *context, const gchar *str) { gtk_label_set_text (GTK_LABEL (context->label), str); @@ -119,9 +119,9 @@ dialog_set_label (MigrationContext *context, const char *str) } static void -dialog_set_folder_name (MigrationContext *context, const char *folder_name) +dialog_set_folder_name (MigrationContext *context, const gchar *folder_name) { - char *text; + gchar *text; text = g_strdup_printf (_("Migrating '%s':"), folder_name); gtk_label_set_text (GTK_LABEL (context->folder_label), text); @@ -140,7 +140,7 @@ dialog_set_folder_name (MigrationContext *context, const char *folder_name) static void dialog_set_progress (MigrationContext *context, double percent) { - char text[5]; + gchar text[5]; snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f)); @@ -156,7 +156,7 @@ dialog_set_progress (MigrationContext *context, double percent) } static gboolean -check_for_conflict (ESourceGroup *group, char *name) +check_for_conflict (ESourceGroup *group, gchar *name) { GSList *sources; GSList *s; @@ -173,16 +173,16 @@ check_for_conflict (ESourceGroup *group, char *name) return FALSE; } -static char * -get_source_name (ESourceGroup *group, const char *path) +static gchar * +get_source_name (ESourceGroup *group, const gchar *path) { #ifndef G_OS_WIN32 - char **p = g_strsplit (path, "/", 0); + gchar **p = g_strsplit (path, "/", 0); #else - char **p = g_strsplit_set (path, "\\/", 0); + gchar **p = g_strsplit_set (path, "\\/", 0); #endif - int i, j, starting_index; - int num_elements; + gint i, j, starting_index; + gint num_elements; gboolean conflict; GString *s = g_string_new (""); @@ -227,8 +227,8 @@ migrate_contacts (MigrationContext *context, EBook *old_book, EBook *new_book) { EBookQuery *query = e_book_query_any_field_contains (""); GList *l, *contacts; - int num_added = 0; - int num_contacts; + gint num_added = 0; + gint num_contacts; /* both books are loaded, start the actual migration */ e_book_get_contacts (old_book, query, &contacts, NULL); @@ -341,7 +341,7 @@ migrate_contacts (MigrationContext *context, EBook *old_book, EBook *new_book) "OTHER"); if (v && v->data) { - if (!strncmp ((char*)v->data, "data, "next) { - char *source_name; + gchar *source_name; /* we handle the system folder differently */ - if (personal_source && !strcmp ((char*)l->data, local_contact_folder)) { + if (personal_source && !strcmp ((gchar *)l->data, local_contact_folder)) { g_hash_table_insert (context->folder_uid_map, g_strdup (l->data), g_strdup (e_source_peek_uid (personal_source))); migrate_contact_folder_to_source (context, local_contact_folder, personal_source); continue; } - source_name = get_source_name (on_this_computer, (char*)l->data); + source_name = get_source_name (on_this_computer, (gchar *)l->data); migrate_contact_folder (context, l->data, on_this_computer, source_name); g_free (source_name); } @@ -563,13 +563,13 @@ migrate_local_folders (MigrationContext *context, ESourceGroup *on_this_computer return TRUE; } -static char * +static gchar * get_string_child (xmlNode *node, - const char *name) + const gchar *name) { xmlNode *p; xmlChar *xml_string; - char *retval; + gchar *retval; p = e_xml_get_child_by_name (node, (xmlChar *) name); if (p == NULL) @@ -580,7 +580,7 @@ get_string_child (xmlNode *node, return g_strdup(""); xml_string = xmlNodeListGetString (node->doc, p, 1); - retval = g_strdup ((char *) xml_string); + retval = g_strdup ((gchar *) xml_string); xmlFree (xml_string); return retval; @@ -588,12 +588,12 @@ get_string_child (xmlNode *node, static int get_integer_child (xmlNode *node, - const char *name, - int defval) + const gchar *name, + gint defval) { xmlNode *p; xmlChar *xml_string; - int retval; + gint retval; p = e_xml_get_child_by_name (node, (xmlChar *) name); if (p == NULL) @@ -604,7 +604,7 @@ get_integer_child (xmlNode *node, return defval; xml_string = xmlNodeListGetString (node->doc, p, 1); - retval = atoi ((char *)xml_string); + retval = atoi ((gchar *)xml_string); xmlFree (xml_string); return retval; @@ -613,7 +613,7 @@ get_integer_child (xmlNode *node, static gboolean migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers) { - char *sources_xml = g_strdup_printf ("%s/evolution/addressbook-sources.xml", + gchar *sources_xml = g_strdup_printf ("%s/evolution/addressbook-sources.xml", g_get_home_dir ()); printf ("trying to migrate from %s\n", sources_xml); @@ -622,14 +622,14 @@ migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers) xmlDoc *doc = xmlParseFile (sources_xml); xmlNode *root; xmlNode *child; - int num_contactservers; - int servernum; + gint num_contactservers; + gint servernum; if (!doc) return FALSE; root = xmlDocGetRootElement (doc); - if (root == NULL || strcmp ((const char *)root->name, "addressbooks") != 0) { + if (root == NULL || strcmp ((const gchar *)root->name, "addressbooks") != 0) { xmlFreeDoc (doc); return FALSE; } @@ -637,7 +637,7 @@ migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers) /* count the number of servers, so we can give progress */ num_contactservers = 0; for (child = root->children; child; child = child->next) { - if (!strcmp ((const char *)child->name, "contactserver")) { + if (!strcmp ((const gchar *)child->name, "contactserver")) { num_contactservers++; } } @@ -647,11 +647,11 @@ migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers) servernum = 0; for (child = root->children; child; child = child->next) { - if (!strcmp ((const char *)child->name, "contactserver")) { - char *port, *host, *rootdn, *scope, *authmethod, *ssl; - char *emailaddr, *binddn, *limitstr; - int limit; - char *name, *description; + if (!strcmp ((const gchar *)child->name, "contactserver")) { + gchar *port, *host, *rootdn, *scope, *authmethod, *ssl; + gchar *emailaddr, *binddn, *limitstr; + gint limit; + gchar *name, *description; GString *uri = g_string_new (""); ESource *source; @@ -711,7 +711,7 @@ migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers) } static ESource* -get_source_by_name (ESourceList *source_list, const char *name) +get_source_by_name (ESourceList *source_list, const gchar *name) { GSList *groups; GSList *g; @@ -731,7 +731,7 @@ get_source_by_name (ESourceList *source_list, const char *name) for (s = sources; s; s = s->next) { ESource *source = E_SOURCE (s->data); - const char *source_name = e_source_peek_name (source); + const gchar *source_name = e_source_peek_name (source); if (!strcmp (name, source_name)) return source; @@ -744,7 +744,7 @@ get_source_by_name (ESourceList *source_list, const char *name) static gboolean migrate_completion_folders (MigrationContext *context) { - char *uris_xml = gconf_client_get_string (addressbook_component_peek_gconf_client (context->component), + gchar *uris_xml = gconf_client_get_string (addressbook_component_peek_gconf_client (context->component), "/apps/evolution/addressbook/completion/uris", NULL); @@ -761,14 +761,14 @@ migrate_completion_folders (MigrationContext *context) dialog_set_folder_name (context, _("Autocompletion Settings")); root = xmlDocGetRootElement (doc); - if (root == NULL || strcmp ((const char *)root->name, "EvolutionFolderList") != 0) { + if (root == NULL || strcmp ((const gchar *)root->name, "EvolutionFolderList") != 0) { xmlFreeDoc (doc); return FALSE; } for (child = root->children; child; child = child->next) { - if (!strcmp ((const char *)child->name, "folder")) { - char *physical_uri = e_xml_get_string_prop_by_name (child, (const unsigned char *)"physical-uri"); + if (!strcmp ((const gchar *)child->name, "folder")) { + gchar *physical_uri = e_xml_get_string_prop_by_name (child, (const guchar *)"physical-uri"); ESource *source = NULL; /* if the physical uri is file://... @@ -783,8 +783,8 @@ migrate_completion_folders (MigrationContext *context) for the uri. */ if (!strncmp (physical_uri, "file://", 7)) { - char *filename = g_filename_from_uri (physical_uri, NULL, NULL); - char *uid = NULL; + gchar *filename = g_filename_from_uri (physical_uri, NULL, NULL); + gchar *uid = NULL; if (filename) uid = g_hash_table_lookup (context->folder_uid_map, @@ -794,7 +794,7 @@ migrate_completion_folders (MigrationContext *context) source = e_source_list_peek_source_by_uid (context->source_list, uid); } else { - char *name = e_xml_get_string_prop_by_name (child, (const unsigned char *)"display-name"); + gchar *name = e_xml_get_string_prop_by_name (child, (const guchar *)"display-name"); source = get_source_by_name (context->source_list, name); @@ -833,14 +833,14 @@ migrate_contact_lists_for_local_folders (MigrationContext *context, ESourceGroup EBook *book; EBookQuery *query; GList *l, *contacts; - int num_contacts, num_converted; + gint num_contacts, num_converted; dialog_set_folder_name (context, e_source_peek_name (source)); book = e_book_new (source, NULL); if (!book || !e_book_open (book, TRUE, NULL)) { - char *uri = e_source_get_uri (source); + gchar *uri = e_source_get_uri (source); g_warning ("failed to migrate contact lists for source %s", uri); g_free (uri); continue; @@ -864,8 +864,8 @@ migrate_contact_lists_for_local_folders (MigrationContext *context, ESourceGroup GList *v = e_vcard_attribute_get_values (a); if (v && v->data) { - if (!strncmp ((char*)v->data, "data); + if (!strncmp ((gchar *)v->data, "data); e_destination_export_to_vcard_attribute (dest, a); @@ -908,14 +908,14 @@ migrate_company_phone_for_local_folders (MigrationContext *context, ESourceGroup EBook *book; EBookQuery *query; GList *l, *contacts; - int num_contacts, num_converted; + gint num_contacts, num_converted; dialog_set_folder_name (context, e_source_peek_name (source)); book = e_book_new (source, NULL); if (!book || !e_book_open (book, TRUE, NULL)) { - char *uri = e_source_get_uri (source); + gchar *uri = e_source_get_uri (source); g_warning ("failed to migrate company phone numbers for source %s", uri); g_free (uri); continue; @@ -932,7 +932,7 @@ migrate_company_phone_for_local_folders (MigrationContext *context, ESourceGroup GError *e = NULL; GList *attrs, *attr; gboolean converted = FALSE; - int num_work_voice = 0; + gint num_work_voice = 0; attrs = e_vcard_get_attributes (E_VCARD (contact)); for (attr = attrs; attr;) { @@ -1001,11 +1001,11 @@ migrate_company_phone_for_local_folders (MigrationContext *context, ESourceGroup } static void -migrate_pilot_data (const char *old_path, const char *new_path) +migrate_pilot_data (const gchar *old_path, const gchar *new_path) { - const char *dent; - const char *ext; - char *filename; + const gchar *dent; + const gchar *ext; + gchar *filename; GDir *dir; if (!(dir = g_dir_open (old_path, 0, NULL))) @@ -1017,9 +1017,9 @@ migrate_pilot_data (const char *old_path, const char *new_path) (!strncmp (dent, "pilot-sync-evolution-addressbook-", 33) && ((ext = strrchr (dent, '.')) && !strcmp (ext, ".db")))) { /* src and dest file formats are identical for both map and changelog files */ - unsigned char inbuf[4096]; + guchar inbuf[4096]; size_t nread, nwritten; - int fd0, fd1; + gint fd0, fd1; ssize_t n; filename = g_build_filename (old_path, dent, NULL); @@ -1103,8 +1103,8 @@ migration_context_free (MigrationContext *context) g_free (context); } -int -addressbook_migrate (AddressbookComponent *component, int major, int minor, int revision, GError **err) +gint +addressbook_migrate (AddressbookComponent *component, gint major, gint minor, gint revision, GError **err) { ESourceGroup *on_this_computer; ESourceGroup *on_ldap_servers; @@ -1165,7 +1165,7 @@ addressbook_migrate (AddressbookComponent *component, int major, int minor, int } if (minor < 5 || (minor == 5 && revision <= 10)) { - char *old_path, *new_path; + gchar *old_path, *new_path; dialog_set_label (context, _("Evolution's Palm Sync changelog and map files have changed.\n\n" "Please be patient while Evolution migrates your Pilot Sync data...")); diff --git a/addressbook/gui/component/addressbook-migrate.h b/addressbook/gui/component/addressbook-migrate.h index 5727b3d0ab..c10f29cfdd 100644 --- a/addressbook/gui/component/addressbook-migrate.h +++ b/addressbook/gui/component/addressbook-migrate.h @@ -28,6 +28,6 @@ struct _GError; -int addressbook_migrate (AddressbookComponent *component, int major, int minor, int revision, struct _GError **err); +gint addressbook_migrate (AddressbookComponent *component, gint major, gint minor, gint revision, struct _GError **err); #endif /* _ADDRESSBOOK_MIGRATE_H_ */ diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index e6b99c6405..379660c993 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -83,7 +83,7 @@ struct _AddressbookViewPrivate { EBook *book; guint activity_id; ESourceList *source_list; - char *passwd; + gchar *passwd; EUserCreatableItemsHandler *creatable_items_handler; EABMenu *menu; @@ -101,7 +101,7 @@ static GtkTargetEntry drag_types[] = { }; static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]); -static void set_status_message (EABView *eav, const char *message, AddressbookView *view); +static void set_status_message (EABView *eav, const gchar *message, AddressbookView *view); static void search_result (EABView *eav, EBookViewStatus status, AddressbookView *view); static void activate_source (AddressbookView *view, ESource *source); @@ -115,7 +115,7 @@ static ESource *get_primary_source (AddressbookView *view); typedef struct { GtkWidget *editor; - char *uid; + gchar *uid; AddressbookView *view; } EditorUidClosure; @@ -139,7 +139,7 @@ get_current_view (AddressbookView *view) } static void -save_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path) +save_all_contacts_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -149,7 +149,7 @@ save_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -save_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path) +save_contact_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -158,7 +158,7 @@ save_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -view_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path) +view_contact_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -167,7 +167,7 @@ view_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path) +delete_contact_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -176,7 +176,7 @@ delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -print_cb (BonoboUIComponent *uih, void *user_data, const char *path) +print_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -185,7 +185,7 @@ print_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -print_preview_cb (BonoboUIComponent *uih, void *user_data, const char *path) +print_preview_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -194,7 +194,7 @@ print_preview_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path) +stop_loading_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -203,7 +203,7 @@ stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -cut_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path) +cut_contacts_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -212,7 +212,7 @@ cut_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -copy_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path) +copy_contacts_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -221,7 +221,7 @@ copy_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -paste_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path) +paste_contacts_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -230,7 +230,7 @@ paste_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -select_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path) +select_all_contacts_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -239,7 +239,7 @@ select_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *pat } static void -send_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path) +send_contact_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -248,7 +248,7 @@ send_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -send_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path) +send_contact_to_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -257,7 +257,7 @@ send_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -copy_all_contacts_to_cb (BonoboUIComponent *uih, void *user_data, const char *path) +copy_all_contacts_to_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -267,7 +267,7 @@ copy_all_contacts_to_cb (BonoboUIComponent *uih, void *user_data, const char *pa } static void -copy_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path) +copy_contact_to_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -276,7 +276,7 @@ copy_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -move_all_contacts_to_cb (BonoboUIComponent *uih, void *user_data, const char *path) +move_all_contacts_to_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -285,7 +285,7 @@ move_all_contacts_to_cb (BonoboUIComponent *uih, void *user_data, const char *pa } static void -move_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path) +move_contact_to_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); @@ -294,7 +294,7 @@ move_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path) } static void -forget_passwords_cb (BonoboUIComponent *uih, void *user_data, const char *path) +forget_passwords_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { e_passwords_forget_passwords(); } @@ -307,7 +307,7 @@ new_addressbook_folder (AddressbookView *view) } static void -new_folder_cb (BonoboUIComponent *uih, void *user_data, const char *path) +new_folder_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; new_addressbook_folder (view); @@ -356,7 +356,7 @@ delete_addressbook_folder (AddressbookView *view) } static void -delete_folder_cb (BonoboUIComponent *uih, void *user_data, const char *path) +delete_folder_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; if (view) @@ -369,7 +369,7 @@ edit_addressbook_folder (AddressbookView *view) { AddressbookViewPrivate *priv = view->priv; ESource *selected_source; - const char *uid; + const gchar *uid; EditorUidClosure *closure; selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->selector)); @@ -380,7 +380,7 @@ edit_addressbook_folder (AddressbookView *view) closure = g_hash_table_lookup (priv->uid_to_editor, uid); if (!closure) { - char *uid_copy = g_strdup (uid); + gchar *uid_copy = g_strdup (uid); closure = g_new (EditorUidClosure, 1); closure->editor = addressbook_config_edit_source (gtk_widget_get_toplevel(priv->notebook), selected_source); @@ -400,7 +400,7 @@ edit_addressbook_folder (AddressbookView *view) } static void -edit_folder_cb (BonoboUIComponent *uih, void *user_data, const char *path) +edit_folder_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; if (view) @@ -413,8 +413,8 @@ rename_addressbook_folder (AddressbookView *view) { AddressbookViewPrivate *priv = view->priv; ESource *source; - const char *old_name; - char *prompt, *new_name; + const gchar *old_name; + gchar *prompt, *new_name; gboolean done = FALSE; source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->selector)); @@ -441,7 +441,7 @@ rename_addressbook_folder (AddressbookView *view) } static void -rename_folder_cb (BonoboUIComponent *uih, void *user_data, const char *path) +rename_folder_cb (BonoboUIComponent *uih, gpointer user_data, const gchar *path) { AddressbookView *view = (AddressbookView *) user_data; if (view) @@ -453,7 +453,7 @@ folder_can_delete (AddressbookView *view) { AddressbookViewPrivate *priv = view->priv; ESource *source ; - const char *source_uri; + const gchar *source_uri; source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->selector)); if(source) { @@ -468,7 +468,7 @@ folder_can_delete (AddressbookView *view) } static void -set_status_message (EABView *eav, const char *message, AddressbookView *view) +set_status_message (EABView *eav, const gchar *message, AddressbookView *view) { AddressbookViewPrivate *priv = view->priv; EActivityHandler *activity_handler = priv->activity_handler; @@ -479,7 +479,7 @@ set_status_message (EABView *eav, const char *message, AddressbookView *view) priv->activity_id = 0; } } else if (priv->activity_id == 0) { - char *clientid = g_strdup_printf ("%p", (gpointer) view); + gchar *clientid = g_strdup_printf ("%p", (gpointer) view); priv->activity_id = e_activity_handler_operation_started ( activity_handler, clientid, message, TRUE); @@ -492,7 +492,7 @@ set_status_message (EABView *eav, const char *message, AddressbookView *view) } static void -set_folder_bar_message (EABView *eav, const char *message, AddressbookView *view) +set_folder_bar_message (EABView *eav, const gchar *message, AddressbookView *view) { AddressbookViewPrivate *priv = view->priv; EABView *current_view = get_current_view (view); @@ -501,7 +501,7 @@ set_folder_bar_message (EABView *eav, const char *message, AddressbookView *view ESource *source = eav->source; if (source) { - const char *name = e_source_peek_name (source); + const gchar *name = e_source_peek_name (source); e_info_label_set_info((EInfoLabel*)priv->info_widget, name, message); } @@ -628,7 +628,7 @@ control_activate (BonoboControl *control, AddressbookViewPrivate *priv = view->priv; Bonobo_UIContainer remote_ui_container; EABView *v = get_current_view (view); - char *xmlfile; + gchar *xmlfile; remote_ui_container = bonobo_control_get_remote_ui_container (control, NULL); bonobo_ui_component_set_container (uic, remote_ui_container, NULL); @@ -684,7 +684,7 @@ control_activate_cb (BonoboControl *control, } static void -gather_uids_foreach (char *key, +gather_uids_foreach (gchar *key, gpointer value, GList **list) { @@ -701,7 +701,7 @@ source_list_changed_cb (ESourceList *source_list, AddressbookView *view) uids = NULL; g_hash_table_foreach (priv->uid_to_view, (GHFunc)gather_uids_foreach, &uids); for (l = uids; l; l = l->next) { - char *uid = l->data; + gchar *uid = l->data; if (e_source_list_peek_source_by_uid (source_list, uid)) { /* the source still exists, do nothing */ } @@ -721,7 +721,7 @@ source_list_changed_cb (ESourceList *source_list, AddressbookView *view) uids = NULL; g_hash_table_foreach (priv->uid_to_editor, (GHFunc)gather_uids_foreach, &uids); for (l = uids; l; l = l->next) { - char *uid = l->data; + gchar *uid = l->data; if (e_source_list_peek_source_by_uid (source_list, uid)) { /* the source still exists, do nothing */ } @@ -801,7 +801,7 @@ get_primary_source (AddressbookView *view) { AddressbookViewPrivate *priv = view->priv; ESource *source; - char *uid; + gchar *uid; uid = gconf_client_get_string (priv->gconf_client, "/apps/evolution/addressbook/display/primary_addressbook", @@ -867,7 +867,7 @@ book_removed (EBook *book, EBookStatus status, gpointer data) } static void -delete_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data) +delete_addressbook_cb(EPopup *ep, EPopupItem *pitem, gpointer data) { AddressbookView *view = data; AddressbookViewPrivate *priv = view->priv; @@ -903,13 +903,13 @@ delete_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data) } static void -new_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data) +new_addressbook_cb(EPopup *ep, EPopupItem *pitem, gpointer data) { addressbook_config_create_new_source (gtk_widget_get_toplevel(ep->target->widget)); } static void -rename_addressbook_cb (EPopup *ep, EPopupItem *pitem, void *data) +rename_addressbook_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { AddressbookView *view = data; ESourceSelector *selector; @@ -919,7 +919,7 @@ rename_addressbook_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -save_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data) +save_addressbook_cb(EPopup *ep, EPopupItem *pitem, gpointer data) { AddressbookView *view = data; EABView *v = get_current_view (view); @@ -928,7 +928,7 @@ save_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data) } static void -edit_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data) +edit_addressbook_cb(EPopup *ep, EPopupItem *pitem, gpointer data) { AddressbookView *view = data; if (view) @@ -958,7 +958,7 @@ static EPopupItem abv_source_popups[] = { }; static void -abv_source_popup_free(EPopup *ep, GSList *list, void *data) +abv_source_popup_free(EPopup *ep, GSList *list, gpointer data) { g_slist_free(list); } @@ -969,7 +969,7 @@ popup_event_callback(ESourceSelector *selector, ESource *source, GdkEventButton EABPopup *ep; EABPopupTargetSource *t; GSList *menus = NULL; - int i; + gint i; GtkMenu *menu; /** @HookPoint-EABPopup:Addressbook Source Selector Context Menu @@ -1035,7 +1035,7 @@ removed_contact_cb (EBook *book, EBookStatus status, gpointer closure) } static void -merged_contact_cb (EBook *book, EBookStatus status, const char *id, gpointer closure) +merged_contact_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure) { MergeContext *merge_context = closure; @@ -1088,7 +1088,7 @@ selector_tree_data_dropped (ESourceSelector *selector, } e_book_open (target_book, FALSE, NULL); - eab_book_and_contact_list_from_string ((char *)data->data, &source_book, &contactlist); + eab_book_and_contact_list_from_string ((gchar *)data->data, &source_book, &contactlist); v = get_current_view (view); g_object_get (v->model, "book",&source_book, NULL); @@ -1252,7 +1252,7 @@ addressbook_view_init (AddressbookView *view) } static void -destroy_editor (char *key, +destroy_editor (gchar *key, gpointer value, gpointer nada) { @@ -1342,7 +1342,7 @@ activate_source (AddressbookView *view, ESource *source) { AddressbookViewPrivate *priv = view->priv; - const char *uid; + const gchar *uid; GtkWidget *uid_view; EBook *book; BookOpenData *data; @@ -1496,8 +1496,8 @@ addressbook_view_peek_folder_view (AddressbookView *view) void addressbook_view_edit_contact (AddressbookView* view, - const char* source_uid, - const char* contact_uid) + const gchar * source_uid, + const gchar * contact_uid) { AddressbookViewPrivate *priv = view->priv; diff --git a/addressbook/gui/component/addressbook-view.h b/addressbook/gui/component/addressbook-view.h index 08bbbb3e99..bdb37e021a 100644 --- a/addressbook/gui/component/addressbook-view.h +++ b/addressbook/gui/component/addressbook-view.h @@ -59,7 +59,7 @@ GtkWidget *addressbook_view_peek_statusbar (AddressbookView *view BonoboControl *addressbook_view_peek_folder_view (AddressbookView *view); void addressbook_view_edit_contact (AddressbookView* view, - const char* source_id, - const char* contact_id); + const gchar * source_id, + const gchar * contact_id); #endif /* _ADDRESSBOOK_VIEW_H_ */ diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index f36012ab94..45790e15c0 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -57,10 +57,10 @@ free_load_source_data (LoadSourceData *data) /*this function removes of anything present after semicolon in uri*/ -static gchar* +static gchar * remove_parameters_from_uri (const gchar *uri) { - char *euri_str; + gchar *euri_str; EUri *euri; euri = e_uri_new (uri); @@ -167,8 +167,8 @@ static void addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *source, EBookCallback cb, gpointer closure) { - const char *password = NULL; - char *pass_dup = NULL; + const gchar *password = NULL; + gchar *pass_dup = NULL; const gchar *auth; const gchar *user; gchar *uri = remove_parameters_from_uri(e_book_get_uri (book)); @@ -197,8 +197,8 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *sourc user = ""; if (!password) { - char *prompt; - char *password_prompt; + gchar *prompt; + gchar *password_prompt; gboolean remember; const gchar *failed_auth; guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE; diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c index f45f2228e1..9773f5bd5b 100644 --- a/addressbook/gui/component/autocompletion-config.c +++ b/addressbook/gui/component/autocompletion-config.c @@ -80,7 +80,7 @@ source_selection_changed (ESourceSelector *selector, } static void -config_control_destroy_notify (void *data, +config_control_destroy_notify (gpointer data, GObject *where_the_config_control_was) { AutocompletionConfig *ac = (AutocompletionConfig *) data; @@ -101,7 +101,7 @@ initialize_selection (AutocompletionConfig *ac) GSList *sources; for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) { ESource *source = E_SOURCE (sources->data); - const char *completion = e_source_get_property (source, "completion"); + const gchar *completion = e_source_get_property (source, "completion"); if (completion && !g_ascii_strcasecmp (completion, "true")) e_source_selector_select_source (E_SOURCE_SELECTOR (ac->control_widget), source); diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c index 4d02cc3e6b..eddabd7b48 100644 --- a/addressbook/gui/component/component-factory.c +++ b/addressbook/gui/component/component-factory.c @@ -49,8 +49,8 @@ static BonoboObject * factory (BonoboGenericFactory *factory, - const char *component_id, - void *closure) + const gchar *component_id, + gpointer closure) { d(printf ("asked to activate component_id `%s'\n", component_id)); diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h index 010589da1e..083fc0d162 100644 --- a/addressbook/gui/component/openldap-extract.h +++ b/addressbook/gui/component/openldap-extract.h @@ -48,7 +48,7 @@ #define LDAP_CALLOC(n,s) calloc((n),(s)) #define LDAP_REALLOC(p,s) realloc((p),(s)) #define LDAP_FREE(p) free((p)) -#define LDAP_VFREE(p) vfree((void **)(p)) +#define LDAP_VFREE(p) vfree((gpointer *)(p)) #define LDAP_STRDUP(s) strdup((s)) #define LDAP_RANGE(n,x,y) (((x) <= (n)) && ((n) <= (y))) @@ -87,21 +87,21 @@ #define LDAP_SCHEMA_SKIP 0x80U /* Don't malloc any result */ typedef struct ldap_objectclass { - char *oc_oid; /* REQUIRED */ - char **oc_names; /* OPTIONAL */ - char *oc_desc; /* OPTIONAL */ - int oc_obsolete; /* 0=no, 1=yes */ - char **oc_sup_oids; /* OPTIONAL */ - int oc_kind; /* 0=ABSTRACT, 1=STRUCTURAL, 2=AUXILIARY */ - char **oc_at_oids_must; /* OPTIONAL */ - char **oc_at_oids_may; /* OPTIONAL */ + gchar *oc_oid; /* REQUIRED */ + gchar **oc_names; /* OPTIONAL */ + gchar *oc_desc; /* OPTIONAL */ + gint oc_obsolete; /* 0=no, 1=yes */ + gchar **oc_sup_oids; /* OPTIONAL */ + gint oc_kind; /* 0=ABSTRACT, 1=STRUCTURAL, 2=AUXILIARY */ + gchar **oc_at_oids_must; /* OPTIONAL */ + gchar **oc_at_oids_may; /* OPTIONAL */ } LDAPObjectClass; static void -vfree(void **vec) +vfree(gpointer *vec) { - int i; + gint i; for (i = 0; vec[i] != NULL; i++) free(vec[i]); @@ -143,17 +143,17 @@ vfree(void **vec) #define TK_QDESCR TK_QDSTRING struct token { - int type; - char *sval; + gint type; + gchar *sval; }; static int -get_token( const char ** sp, char ** token_val ) +get_token( const gchar ** sp, gchar ** token_val ) { - int kind; - const char * p; - const char * q; - char * res; + gint kind; + const gchar * p; + const gchar * q; + gchar * res; *token_val = NULL; switch (**sp) { @@ -223,20 +223,20 @@ get_token( const char ** sp, char ** token_val ) /* Gobble optional whitespace */ static void -parse_whsp(const char **sp) +parse_whsp(const gchar **sp) { while (LDAP_SPACE(**sp)) (*sp)++; } /* Parse a sequence of dot-separated decimal strings */ -static char * -ldap_int_parse_numericoid(const char **sp, int *code, const int flags) +static gchar * +ldap_int_parse_numericoid(const gchar **sp, gint *code, const gint flags) { - char * res = NULL; - const char * start = *sp; - int len; - int quoted = 0; + gchar * res = NULL; + const gchar * start = *sp; + gint len; + gint quoted = 0; /* Netscape puts the SYNTAX value in quotes (incorrectly) */ if ( flags & LDAP_SCHEMA_ALLOW_QUOTED && **sp == '\'' ) { @@ -248,7 +248,7 @@ ldap_int_parse_numericoid(const char **sp, int *code, const int flags) while (**sp) { if ( !LDAP_DIGIT(**sp) ) { /* - * Initial char is not a digit or char after dot is + * Initial gchar is not a digit or gchar after dot is * not a digit */ *code = LDAP_SCHERR_NODIGIT; @@ -262,7 +262,7 @@ ldap_int_parse_numericoid(const char **sp, int *code, const int flags) /* Otherwise, gobble the dot and loop again */ (*sp)++; } - /* Now *sp points at the char past the numericoid. Perfect. */ + /* Now *sp points at the gchar past the numericoid. Perfect. */ len = *sp - start; if ( flags & LDAP_SCHEMA_ALLOW_QUOTED && quoted ) { if ( **sp == '\'' ) { @@ -273,7 +273,7 @@ ldap_int_parse_numericoid(const char **sp, int *code, const int flags) } } if (flags & LDAP_SCHEMA_SKIP) { - res = (char *)start; + res = (gchar *)start; } else { res = LDAP_MALLOC(len+1); if (!res) { @@ -287,22 +287,22 @@ ldap_int_parse_numericoid(const char **sp, int *code, const int flags) } /* Parse a qdescr or a list of them enclosed in () */ -static char ** -parse_qdescrs(const char **sp, int *code) +static gchar ** +parse_qdescrs(const gchar **sp, gint *code) { - char ** res; - char ** res1; - int kind; - char * sval; - int size; - int pos; + gchar ** res; + gchar ** res1; + gint kind; + gchar * sval; + gint size; + gint pos; parse_whsp(sp); kind = get_token(sp,&sval); if ( kind == TK_LEFTPAREN ) { /* Let's presume there will be at least 2 entries */ size = 3; - res = LDAP_CALLOC(3,sizeof(char *)); + res = LDAP_CALLOC(3,sizeof(gchar *)); if ( !res ) { *code = LDAP_SCHERR_OUTOFMEM; return NULL; @@ -316,7 +316,7 @@ parse_qdescrs(const char **sp, int *code) if ( kind == TK_QDESCR ) { if ( pos == size-2 ) { size++; - res1 = LDAP_REALLOC(res,size*sizeof(char *)); + res1 = LDAP_REALLOC(res,size*sizeof(gchar *)); if ( !res1 ) { LDAP_VFREE(res); LDAP_FREE(sval); @@ -338,7 +338,7 @@ parse_qdescrs(const char **sp, int *code) parse_whsp(sp); return(res); } else if ( kind == TK_QDESCR ) { - res = LDAP_CALLOC(2,sizeof(char *)); + res = LDAP_CALLOC(2,sizeof(gchar *)); if ( !res ) { *code = LDAP_SCHERR_OUTOFMEM; return NULL; @@ -355,15 +355,15 @@ parse_qdescrs(const char **sp, int *code) } /* Parse a woid or a $-separated list of them enclosed in () */ -static char ** -parse_oids(const char **sp, int *code, const int allow_quoted) +static gchar ** +parse_oids(const gchar **sp, gint *code, const gint allow_quoted) { - char ** res; - char ** res1; - int kind; - char * sval; - int size; - int pos; + gchar ** res; + gchar ** res1; + gint kind; + gchar * sval; + gint size; + gint pos; /* * Strictly speaking, doing this here accepts whsp before the @@ -376,7 +376,7 @@ parse_oids(const char **sp, int *code, const int allow_quoted) if ( kind == TK_LEFTPAREN ) { /* Let's presume there will be at least 2 entries */ size = 3; - res = LDAP_CALLOC(3,sizeof(char *)); + res = LDAP_CALLOC(3,sizeof(gchar *)); if ( !res ) { *code = LDAP_SCHERR_OUTOFMEM; return NULL; @@ -407,7 +407,7 @@ parse_oids(const char **sp, int *code, const int allow_quoted) kind == TK_QDSTRING ) ) { if ( pos == size-2 ) { size++; - res1 = LDAP_REALLOC(res,size*sizeof(char *)); + res1 = LDAP_REALLOC(res,size*sizeof(gchar *)); if ( !res1 ) { LDAP_FREE(sval); LDAP_VFREE(res); @@ -436,7 +436,7 @@ parse_oids(const char **sp, int *code, const int allow_quoted) return(res); } else if ( kind == TK_BAREWORD || ( allow_quoted && kind == TK_QDSTRING ) ) { - res = LDAP_CALLOC(2,sizeof(char *)); + res = LDAP_CALLOC(2,sizeof(gchar *)); if ( !res ) { LDAP_FREE(sval); *code = LDAP_SCHERR_OUTOFMEM; @@ -466,24 +466,24 @@ ldap_objectclass_free(LDAPObjectClass * oc) } static LDAPObjectClass * -ldap_str2objectclass( LDAP_CONST char * s, - int * code, - LDAP_CONST char ** errp, +ldap_str2objectclass( LDAP_CONST gchar * s, + gint * code, + LDAP_CONST gchar ** errp, LDAP_CONST unsigned flags ) { - int kind; - const char * ss = s; - char * sval; - int seen_name = 0; - int seen_desc = 0; - int seen_obsolete = 0; - int seen_sup = 0; - int seen_kind = 0; - int seen_must = 0; - int seen_may = 0; + gint kind; + const gchar * ss = s; + gchar * sval; + gint seen_name = 0; + gint seen_desc = 0; + gint seen_obsolete = 0; + gint seen_sup = 0; + gint seen_kind = 0; + gint seen_must = 0; + gint seen_may = 0; LDAPObjectClass * oc; - char ** ext_vals; - const char * savepos; + gchar ** ext_vals; + const gchar * savepos; if ( !s ) { *code = LDAP_SCHERR_EMPTY; @@ -539,7 +539,7 @@ ldap_str2objectclass( LDAP_CONST char * s, } else if ( flags & LDAP_SCHEMA_ALLOW_OID_MACRO ) { /* Non-numerical OID, ignore */ - int len = ss-savepos; + gint len = ss-savepos; oc->oc_oid = LDAP_MALLOC(len+1); strncpy(oc->oc_oid, savepos, len); oc->oc_oid[len] = 0; @@ -741,21 +741,21 @@ ldap_str2objectclass( LDAP_CONST char * s, #define LDAP_UTF8_INCR(p) ((p)=LDAP_UTF8_NEXT((p))) #define ldap_x_utf8_to_ucs4(str) g_utf8_get_char(str) -static char *ldap_utf8_strchr( const char *str, const char *chr ) +static gchar *ldap_utf8_strchr( const gchar *str, const gchar *chr ) { for( ; *str != '\0'; LDAP_UTF8_INCR(str) ) { if( ldap_x_utf8_to_ucs4( str ) == ldap_x_utf8_to_ucs4( chr ) ) { - return (char *) str; + return (gchar *) str; } } return NULL; } -static size_t ldap_utf8_strcspn( const char *str, const char *set ) +static size_t ldap_utf8_strcspn( const gchar *str, const gchar *set ) { - const char *cstr; - const char *cset; + const gchar *cstr; + const gchar *cset; for( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) { for( cset = set; *cset != '\0'; LDAP_UTF8_INCR(cset) ) { @@ -768,10 +768,10 @@ static size_t ldap_utf8_strcspn( const char *str, const char *set ) return cstr - str; } -static size_t ldap_utf8_strspn( const char *str, const char *set ) +static size_t ldap_utf8_strspn( const gchar *str, const gchar *set ) { - const char *cstr; - const char *cset; + const gchar *cstr; + const gchar *cset; for( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) { for( cset = set; ; LDAP_UTF8_INCR(cset) ) { @@ -788,10 +788,10 @@ static size_t ldap_utf8_strspn( const char *str, const char *set ) return cstr - str; } -static char *ldap_utf8_strtok(char *str, const char *sep, char **last) +static gchar *ldap_utf8_strtok(gchar *str, const gchar *sep, gchar **last) { - char *begin; - char *end; + gchar *begin; + gchar *end; if( last == NULL ) return NULL; @@ -807,7 +807,7 @@ static char *ldap_utf8_strtok(char *str, const char *sep, char **last) end = &begin[ ldap_utf8_strcspn( begin, sep ) ]; if( *end != '\0' ) { - char *next = LDAP_UTF8_NEXT( end ); + gchar *next = LDAP_UTF8_NEXT( end ); *end = '\0'; end = next; } @@ -856,17 +856,17 @@ typedef struct ldap_url_desc { /* from url.c */ -static const char* +static const gchar * skip_url_prefix( - const char *url, - int *enclosedp, - const char **scheme ) + const gchar *url, + gint *enclosedp, + const gchar **scheme ) { /* * return non-zero if this looks like a LDAP URL; zero if not * if non-zero returned, *urlp will be moved past "ldap://" part of URL */ - const char *p; + const gchar *p; if ( url == NULL ) { return( NULL ); @@ -924,7 +924,7 @@ skip_url_prefix( return( NULL ); } -static int str2scope( const char *p ) +static gint str2scope( const gchar *p ) { if ( strcasecmp( p, "one" ) == 0 ) { return LDAP_SCOPE_ONELEVEL; @@ -980,7 +980,7 @@ ldap_free_urldesc( LDAPURLDesc *ludp ) } static int -ldap_int_unhex( int c ) +ldap_int_unhex( gint c ) { return( c >= '0' && c <= '9' ? c - '0' : c >= 'A' && c <= 'F' ? c - 'A' + 10 @@ -988,7 +988,7 @@ ldap_int_unhex( int c ) } static void -ldap_pvt_hex_unescape( char *s ) +ldap_pvt_hex_unescape( gchar *s ) { /* * Remove URL hex escapes from s... done in place. The basic concept for @@ -1014,8 +1014,8 @@ ldap_pvt_hex_unescape( char *s ) *p = '\0'; } -static char ** -ldap_str2charray( const char *str_in, const char *brkstr ) +static gchar ** +ldap_str2charray( const gchar *str_in, const gchar *brkstr ) { char **res; char *str, *s; @@ -1035,7 +1035,7 @@ ldap_str2charray( const char *str_in, const char *brkstr ) } } - res = (char **) LDAP_MALLOC( (i + 1) * sizeof(char *) ); + res = (gchar **) LDAP_MALLOC( (i + 1) * sizeof(gchar *) ); if( res == NULL ) { LDAP_FREE( str ); @@ -1069,7 +1069,7 @@ ldap_str2charray( const char *str_in, const char *brkstr ) } static int -ldap_url_parse_ext( LDAP_CONST char *url_in, LDAPURLDesc **ludpp ) +ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp ) { /* * Pick apart the pieces of an LDAP URL. @@ -1078,9 +1078,9 @@ ldap_url_parse_ext( LDAP_CONST char *url_in, LDAPURLDesc **ludpp ) LDAPURLDesc *ludp; char *p, *q, *r; int i, enclosed; - const char *scheme = NULL; - const char *url_tmp; - char *url; + const gchar *scheme = NULL; + const gchar *url_tmp; + gchar *url; if( url_in == NULL || ludpp == NULL ) { return LDAP_URL_ERR_PARAM; @@ -1393,9 +1393,9 @@ ldap_url_parse_ext( LDAP_CONST char *url_in, LDAPURLDesc **ludpp ) } static int -ldap_url_parse( LDAP_CONST char *url_in, LDAPURLDesc **ludpp ) +ldap_url_parse( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp ) { - int rc = ldap_url_parse_ext( url_in, ludpp ); + gint rc = ldap_url_parse_ext( url_in, ludpp ); if( rc != LDAP_URL_SUCCESS ) { return rc; diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index 3897d605e3..5040b96570 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -99,7 +99,7 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam { GladeXML *gui; GtkWidget *widget; - char *gladefile; + gchar *gladefile; gtk_widget_realize (GTK_WIDGET (e_contact_editor_fullname)); gtk_dialog_set_has_separator (GTK_DIALOG (e_contact_editor_fullname), @@ -189,7 +189,7 @@ e_contact_editor_fullname_set_property (GObject *object, guint prop_id, } break; case PROP_EDITABLE: { - int i; + gint i; const gchar *widget_names[] = { "comboentry-title", "comboentry-suffix", @@ -283,7 +283,7 @@ fill_in_info(EContactEditorFullname *editor) } } -static char * +static gchar * extract_field (EContactEditorFullname *editor, const gchar *field) { diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index c7ce449ec4..305511d5d5 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -93,7 +93,7 @@ static GtkWindow* e_contact_editor_get_window (EABEditor *editor); static void save_contact (EContactEditor *ce, gboolean should_close); static void entry_activated (EContactEditor *editor); -static void set_entry_text(EContactEditor *editor, GtkEntry *entry, const char *string); +static void set_entry_text(EContactEditor *editor, GtkEntry *entry, const gchar *string); static void sensitize_ok (EContactEditor *ce); static EABEditorClass *parent_class = NULL; @@ -339,7 +339,7 @@ is_field_supported (EContactEditor *editor, EContactField field_id) /* This function tells you whether name_to_style will make sense. */ static gboolean -style_makes_sense (const EContactName *name, const gchar *company, int style) +style_makes_sense (const EContactName *name, const gchar *company, gint style) { switch (style) { case 0: /* Fall Through */ @@ -368,13 +368,13 @@ style_makes_sense (const EContactName *name, const gchar *company, int style) } } -static char * -name_to_style (const EContactName *name, const gchar *company, int style) +static gchar * +name_to_style (const EContactName *name, const gchar *company, gint style) { - char *string; - char *strings[4], **stringptr; - char *midstring[4], **midstrptr; - char *substring; + gchar *string; + gchar *strings[4], **stringptr; + gchar *midstring[4], **midstrptr; + gchar *substring; switch (style) { case 0: stringptr = strings; @@ -449,11 +449,11 @@ file_as_get_style (EContactEditor *editor) { GtkEntry *file_as = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (glade_xml_get_widget(editor->gui, "combo-file-as")))); GtkEntry *company_w = GTK_ENTRY (glade_xml_get_widget (editor->gui, "entry-company")); - char *filestring; - char *trystring; + gchar *filestring; + gchar *trystring; EContactName *name = editor->name; const gchar *company; - int i; + gint i; if (!(file_as && GTK_IS_ENTRY(file_as))) return -1; @@ -475,10 +475,10 @@ file_as_get_style (EContactEditor *editor) } static void -file_as_set_style (EContactEditor *editor, int style) +file_as_set_style (EContactEditor *editor, gint style) { - char *string; - int i; + gchar *string; + gint i; GList *strings = NULL; GtkComboBox *combo_file_as = GTK_COMBO_BOX (glade_xml_get_widget (editor->gui, "combo-file-as")); GtkEntry *company_w = GTK_ENTRY (glade_xml_get_widget (editor->gui, "entry-company")); @@ -496,7 +496,7 @@ file_as_set_style (EContactEditor *editor, int style) for (i = 0; i < 6; i++) { if (style_makes_sense (editor->name, company, i)) { - char *u; + gchar *u; u = name_to_style (editor->name, company, i); if (!STRING_IS_EMPTY (u)) strings = g_list_append (strings, u); @@ -528,8 +528,8 @@ file_as_set_style (EContactEditor *editor, int style) static void name_entry_changed (GtkWidget *widget, EContactEditor *editor) { - int style = 0; - const char *string; + gint style = 0; + const gchar *string; style = file_as_get_style (editor); e_contact_name_free (editor->name); @@ -545,7 +545,7 @@ name_entry_changed (GtkWidget *widget, EContactEditor *editor) static void file_as_combo_changed (GtkWidget *widget, EContactEditor *editor) { - char *string = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget)); + gchar *string = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget)); if (string && *string) { gchar *title; @@ -564,7 +564,7 @@ file_as_combo_changed (GtkWidget *widget, EContactEditor *editor) static void company_entry_changed (GtkWidget *widget, EContactEditor *editor) { - int style = 0; + gint style = 0; style = file_as_get_style (editor); file_as_set_style (editor, style); @@ -600,9 +600,9 @@ sensitize_ok (EContactEditor *ce) GtkWidget *entry_fullname = glade_xml_get_widget (ce->gui, "entry-fullname" ); GtkWidget *entry_file_as = gtk_bin_get_child (GTK_BIN (glade_xml_get_widget (ce->gui, "combo-file-as"))); GtkWidget *company_name = glade_xml_get_widget (ce->gui, "entry-company"); - const char *name_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_fullname)); - const char *file_as_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_file_as)); - const char *company_name_string = gtk_entry_get_text (GTK_ENTRY (company_name)); + const gchar *name_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_fullname)); + const gchar *file_as_entry_string = gtk_entry_get_text (GTK_ENTRY (entry_file_as)); + const gchar *company_name_string = gtk_entry_get_text (GTK_ENTRY (company_name)); allow_save = ce->target_editable && ce->changed ? TRUE : FALSE; @@ -641,7 +641,7 @@ image_chooser_changed (GtkWidget *widget, EContactEditor *editor) static void set_entry_text (EContactEditor *editor, GtkEntry *entry, const gchar *string) { - const char *oldstring = gtk_entry_get_text (entry); + const gchar *oldstring = gtk_entry_get_text (entry); if (!string) string = ""; @@ -2197,7 +2197,7 @@ fill_in_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) EContactPhoto *photo = e_contact_get (contact, field_id); if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) { e_image_chooser_set_image_data (E_IMAGE_CHOOSER (widget), - (char *)photo->data.inlined.data, + (gchar *)photo->data.inlined.data, photo->data.inlined.length); editor->image_set = TRUE; } @@ -2235,7 +2235,7 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) e_contact_set (contact, field_id, (gchar *) text); } else if (GTK_IS_COMBO_BOX_ENTRY (widget)) { - char *text = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget)); + gchar *text = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget)); e_contact_set (contact, field_id, text); @@ -2260,9 +2260,9 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) else if (E_IS_DATE_EDIT (widget)) { EContactDate date; if (e_date_edit_get_date (E_DATE_EDIT (widget), - (int *)&date.year, - (int *)&date.month, - (int *)&date.day)) + (gint *)&date.year, + (gint *)&date.month, + (gint *)&date.day)) e_contact_set (contact, field_id, &date); else e_contact_set (contact, field_id, NULL); @@ -2280,14 +2280,14 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) GdkPixbuf *pixbuf, *new; GdkPixbufLoader *loader = gdk_pixbuf_loader_new(); - photo.data.inlined.data = (unsigned char *)img_buff; + photo.data.inlined.data = (guchar *)img_buff; img_buff = NULL; gdk_pixbuf_loader_write (loader, photo.data.inlined.data, photo.data.inlined.length, NULL); gdk_pixbuf_loader_close (loader, NULL); pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); if (pixbuf) { - int width, height, prompt_response; + gint width, height, prompt_response; g_object_ref (pixbuf); @@ -2314,7 +2314,7 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) gdk_pixbuf_save_to_buffer (new, &img_buff, &photo.data.inlined.length, format_name, NULL, NULL); - photo.data.inlined.data = (unsigned char *)img_buff; + photo.data.inlined.data = (guchar *)img_buff; img_buff = NULL; g_free (format_name); g_object_unref (new); @@ -2345,7 +2345,7 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) else if (GTK_IS_TOGGLE_BUTTON (widget)) { gboolean val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); - e_contact_set (contact, field_id, val?(void *)1:NULL); + e_contact_set (contact, field_id, val?(gpointer)1:NULL); } else { g_warning (G_STRLOC ": Unhandled widget class in mappings!"); @@ -2599,11 +2599,11 @@ source_changed (ESourceComboBox *source_combo_box, EContactEditor *editor) } static void -full_name_response (GtkDialog *dialog, int response, EContactEditor *editor) +full_name_response (GtkDialog *dialog, gint response, EContactEditor *editor) { EContactName *name; GtkWidget *fname_widget; - int style = 0; + gint style = 0; gboolean editable = FALSE; g_object_get (dialog, @@ -2619,8 +2619,8 @@ full_name_response (GtkDialog *dialog, int response, EContactEditor *editor) fname_widget = glade_xml_get_widget(editor->gui, "entry-fullname"); if (fname_widget && GTK_IS_ENTRY (fname_widget)) { - char *full_name = e_contact_name_to_string(name); - const char *old_full_name = gtk_entry_get_text (GTK_ENTRY(fname_widget)); + gchar *full_name = e_contact_name_to_string(name); + const gchar *old_full_name = gtk_entry_get_text (GTK_ENTRY(fname_widget)); if (strcmp (full_name, old_full_name)) gtk_entry_set_text (GTK_ENTRY (fname_widget), full_name); @@ -2677,9 +2677,9 @@ full_name_clicked (GtkWidget *button, EContactEditor *editor) static void -categories_response (GtkDialog *dialog, int response, EContactEditor *editor) +categories_response (GtkDialog *dialog, gint response, EContactEditor *editor) { - const char *categories; + const gchar *categories; GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories"); if (response == GTK_RESPONSE_OK) { @@ -2687,7 +2687,7 @@ categories_response (GtkDialog *dialog, int response, EContactEditor *editor) if (entry && GTK_IS_ENTRY(entry)) gtk_entry_set_text (GTK_ENTRY (entry), categories); else - e_contact_set (editor->contact, E_CONTACT_CATEGORIES, (char *)categories); + e_contact_set (editor->contact, E_CONTACT_CATEGORIES, (gchar *)categories); } gtk_widget_destroy(GTK_WIDGET(dialog)); editor->categories_dialog = NULL; @@ -2706,7 +2706,7 @@ categories_editor_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer static void categories_clicked (GtkWidget *button, EContactEditor *editor) { - char *categories = NULL; + gchar *categories = NULL; GtkDialog *dialog; GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories"); @@ -2803,7 +2803,7 @@ static void update_preview_cb (GtkFileChooser *file_chooser, gpointer data) { GtkWidget *preview; - char *filename = NULL; + gchar *filename = NULL; GdkPixbuf *pixbuf; gtk_file_chooser_set_preview_widget_active (file_chooser, TRUE); @@ -2905,7 +2905,7 @@ contact_moved_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs) } static void -contact_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruct *ecs) +contact_added_cb (EBook *book, EBookStatus status, const gchar *id, EditorCloseStruct *ecs) { EContactEditor *ce = ecs->ce; gboolean should_close = ecs->should_close; @@ -2921,7 +2921,7 @@ contact_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseSt gtk_widget_set_sensitive (ce->app, TRUE); ce->in_async_call = FALSE; - e_contact_set (ce->contact, E_CONTACT_UID, (char *) id); + e_contact_set (ce->contact, E_CONTACT_UID, (gchar *) id); eab_editor_contact_added (EAB_EDITOR (ce), status, ce->contact); @@ -2998,8 +2998,8 @@ real_save_contact (EContactEditor *ce, gboolean should_close) static void save_contact (EContactEditor *ce, gboolean should_close) { - char *uid; - const char *name_entry_string, *file_as_entry_string, *company_name_string; + gchar *uid; + const gchar *name_entry_string, *file_as_entry_string, *company_name_string; GtkWidget *entry_fullname, *entry_file_as, *company_name; if (!ce->target_book) @@ -3088,8 +3088,8 @@ static const EContactField non_string_fields [] = { static gboolean is_non_string_field (EContactField id) { - int count = sizeof (non_string_fields) / sizeof (EContactField); - int i; + gint count = sizeof (non_string_fields) / sizeof (EContactField); + gint i; for (i = 0; i < count; i++) if (id == non_string_fields[i]) return TRUE; @@ -3127,7 +3127,7 @@ e_contact_editor_is_valid (EABEditor *editor) for (e_iterator_last (iter); e_iterator_is_valid (iter); e_iterator_prev (iter)) { - const char *field_name = e_iterator_get (iter); + const gchar *field_name = e_iterator_get (iter); EContactField field_id = e_contact_field_id (field_name); if (is_non_string_field (field_id)) { @@ -3140,7 +3140,7 @@ e_contact_editor_is_valid (EABEditor *editor) } } else { - const char *text = e_contact_get_const (ce->contact, field_id); + const gchar *text = e_contact_get_const (ce->contact, field_id); if (STRING_IS_EMPTY (text)) { g_string_append_printf (errmsg, _("%s'%s' is empty"), @@ -3331,7 +3331,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) GladeXML *gui; GtkWidget *widget, *label; GtkEntryCompletion *completion; - char *gladefile; + gchar *gladefile; e_contact_editor->name = e_contact_name_new(); @@ -3495,7 +3495,7 @@ required_fields_cb (EBook *book, EBookStatus status, static void -contact_editor_destroy_notify (void *data, +contact_editor_destroy_notify (gpointer data, GObject *where_the_object_was) { eab_editor_remove (EAB_EDITOR (data)); @@ -3533,7 +3533,7 @@ e_contact_editor_new (EBook *book, static void writable_changed (EBook *book, gboolean writable, EContactEditor *ce) { - int new_target_editable; + gint new_target_editable; gboolean changed = FALSE; new_target_editable = e_book_is_writable (ce->target_book); diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index e9f40507ae..c5940d96d0 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -100,7 +100,7 @@ struct _EContactEditor EBook *load_book; /* signal ids for "writable_status" */ - int target_editable_id; + gint target_editable_id; GtkWidget *fullname_dialog; GtkWidget *categories_dialog; diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index e8d7b03e6c..17ef4fb16d 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -586,7 +586,7 @@ e_contact_quick_add_vcard (const gchar *vcard, EContactQuickAddCallback cb, gpoi if (contact) { GList *emails; - char *name; + gchar *name; EContactName *contact_name; g_object_unref (qa->contact); diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c index d052e42fd7..6257e3972b 100644 --- a/addressbook/gui/contact-editor/eab-editor.c +++ b/addressbook/gui/contact-editor/eab-editor.c @@ -311,11 +311,11 @@ eab_editor_get_all_editors (void) } gboolean -eab_editor_confirm_delete (GtkWindow *parent, gboolean plural, gboolean is_list, char *name) +eab_editor_confirm_delete (GtkWindow *parent, gboolean plural, gboolean is_list, gchar *name) { GtkWidget *dialog; gint result; - char *msg; + gchar *msg; if (is_list) { /* contact list(s) */ diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h index 18a11047be..6959d25801 100644 --- a/addressbook/gui/contact-editor/eab-editor.h +++ b/addressbook/gui/contact-editor/eab-editor.h @@ -91,7 +91,7 @@ gboolean eab_editor_is_changed (EABEditor *editor); GtkWindow* eab_editor_get_window (EABEditor *editor); gboolean eab_editor_prompt_to_save_changes (EABEditor *editor, GtkWindow *window); -gboolean eab_editor_confirm_delete (GtkWindow *parent, gboolean plural, gboolean is_list, char *name); +gboolean eab_editor_confirm_delete (GtkWindow *parent, gboolean plural, gboolean is_list, gchar *name); /* these four generate EABEditor signals */ void eab_editor_contact_added (EABEditor *editor, EBookStatus status, EContact *contact); diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index e624c97987..6c3349eada 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/contact-editor/test-editor.c @@ -54,12 +54,12 @@ " " -static char * -read_file (char *name) +static gchar * +read_file (gchar *name) { - int len; - char buff[65536]; - char line[1024]; + gint len; + gchar buff[65536]; + gchar line[1024]; FILE *f; f = fopen (name, "r"); @@ -81,7 +81,7 @@ read_file (char *name) static void editor_closed_cb (EContactEditor *ce, gpointer data) { - static int count = 2; + static gint count = 2; count--; g_object_unref (ce); @@ -90,9 +90,9 @@ editor_closed_cb (EContactEditor *ce, gpointer data) exit (0); } -int main( int argc, char *argv[] ) +gint main( gint argc, gchar *argv[] ) { - char *cardstr; + gchar *cardstr; EContactEditor *ce; gtk_init (&argc, &argv); 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 7a492f0c52..e62958a72e 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -1397,7 +1397,7 @@ contact_list_editor_add_destination (EVCardAttribute *attr, gint email_num = -1; GList *list, *iter; GList *values; - char *value; + gchar *value; destination = e_destination_new (); diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c index 86138efb14..6c343be46b 100644 --- a/addressbook/gui/merging/eab-contact-compare.c +++ b/addressbook/gui/merging/eab-contact-compare.c @@ -476,11 +476,11 @@ eab_contact_compare_email (EContact *contact1, EContact *contact2) we find an exact match, there is no reason to keep checking. */ while (i1 && match != EAB_CONTACT_MATCH_EXACT) { - char *addr1 = (char *) i1->data; + gchar *addr1 = (gchar *) i1->data; i2 = contact2_email; while (i2 && match != EAB_CONTACT_MATCH_EXACT) { - char *addr2 = (char *) i2->data; + gchar *addr2 = (gchar *) i2->data; match = combine_comparisons (match, compare_email_addresses (addr1, addr2)); @@ -640,7 +640,7 @@ use_common_book_cb (EBook *book, gpointer closure) gint p=0; gchar *contact_file_as, *qj; EBookQuery *query = NULL; - int i; + gint i; if (book == NULL) { info->cb (info->contact, NULL, EAB_CONTACT_MATCH_NONE, info->closure); @@ -699,7 +699,7 @@ use_common_book_cb (EBook *book, gpointer closure) for(i = 0; query_parts[i] != NULL; i++) g_free(query_parts[i]); if (p > 1) { - char *s; + gchar *s; s = g_strdup_printf ("(or %s)", qj); query = e_book_query_from_string (s); g_free (s); diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 895e8126c6..0805ca3110 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -62,7 +62,7 @@ static void match_query_callback (EContact *contact, EContact *match, EABContact #define SIMULTANEOUS_MERGING_REQUESTS 20 static GList *merging_queue = NULL; -static int running_merge_requests = 0; +static gint running_merge_requests = 0; static void @@ -109,7 +109,7 @@ free_lookup (EContactMergingLookup *lookup) } static void -final_id_cb (EBook *book, EBookStatus status, const char *id, gpointer closure) +final_id_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure) { EContactMergingLookup *lookup = closure; @@ -156,7 +156,7 @@ cancelit (EContactMergingLookup *lookup) static void dialog_map (GtkWidget *window, GdkEvent *event, GtkWidget *table) { - int h, w; + gint h, w; /* Spacing around the table */ w = table->allocation.width + 30; @@ -173,7 +173,7 @@ dialog_map (GtkWidget *window, GdkEvent *event, GtkWidget *table) static void dropdown_changed (GtkWidget *dropdown, dropdown_data *data) { - char *str; + gchar *str; str = gtk_combo_box_get_active_text (GTK_COMBO_BOX (dropdown)); if (g_ascii_strcasecmp(str, "")) @@ -190,11 +190,11 @@ mergeit (EContactMergingLookup *lookup) GtkDialog *dialog; GtkTable *table; EContactField field; - char *str = NULL, *string = NULL, *string1 = NULL; - int num_of_email; + gchar *str = NULL, *string = NULL, *string1 = NULL; + gint num_of_email; GList *email_attr_list; - int row = -1; - int value = 0, result; + gint row = -1; + gint value = 0, result; dialog = (GtkDialog *)(gtk_dialog_new_with_buttons (_("Merge Contact"), NULL, GTK_DIALOG_NO_SEPARATOR, NULL)); gtk_container_set_border_width (GTK_CONTAINER(dialog), 5); @@ -220,8 +220,8 @@ mergeit (EContactMergingLookup *lookup) /*we match all the string fields of the already existing contact and the new contact.*/ for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) ; field++) { dropdown_data *data = NULL; - string = (char *)e_contact_get_const (lookup->contact, field); - string1 = (char *)e_contact_get_const (lookup->match, field); + string = (gchar *)e_contact_get_const (lookup->contact, field); + string1 = (gchar *)e_contact_get_const (lookup->match, field); /*the field must exist in the new as well as the duplicate contact*/ if (string && *string) { @@ -230,7 +230,7 @@ mergeit (EContactMergingLookup *lookup) if ((field == E_CONTACT_EMAIL_1 || field == E_CONTACT_EMAIL_2 || field == E_CONTACT_EMAIL_3 || field == E_CONTACT_EMAIL_4) && (num_of_email < 4)) { row++; - str = (char *)e_contact_get_const (lookup->contact, field); + str = (gchar *)e_contact_get_const (lookup->contact, field); switch(num_of_email) { case 0: @@ -366,8 +366,8 @@ check_if_same (EContact *contact, EContact *match) { EContactField field; GList *email_attr_list; - int num_of_email; - char *str = NULL, *string = NULL, *string1 = NULL; + gint num_of_email; + gchar *str = NULL, *string = NULL, *string1 = NULL; for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) ; field++) { email_attr_list = e_contact_get_attributes (match, E_CONTACT_EMAIL); @@ -375,7 +375,7 @@ check_if_same (EContact *contact, EContact *match) if ((field == E_CONTACT_EMAIL_1 || field == E_CONTACT_EMAIL_2 || field == E_CONTACT_EMAIL_3 || field == E_CONTACT_EMAIL_4) && (num_of_email<4)) { - str = (char *)e_contact_get_const (contact, field); + str = (gchar *)e_contact_get_const (contact, field); switch(num_of_email) { case 0: @@ -395,8 +395,8 @@ check_if_same (EContact *contact, EContact *match) } } else { - string = (char *)e_contact_get_const (contact, field); - string1 = (char *)e_contact_get_const (match, field); + string = (gchar *)e_contact_get_const (contact, field); + string1 = (gchar *)e_contact_get_const (match, field); if ((string && *string) && (string1 && *string1) && (g_ascii_strcasecmp(string1,string))) return FALSE; /*if the field entry exist in either of the contacts,we'll have to give the choice and thus merge button should be sensitive*/ @@ -409,9 +409,9 @@ check_if_same (EContact *contact, EContact *match) } static void -response (GtkWidget *dialog, int response, EContactMergingLookup *lookup) +response (GtkWidget *dialog, gint response, EContactMergingLookup *lookup) { - static int merge_response; + static gint merge_response; switch (response) { case 0: @@ -437,8 +437,8 @@ static void match_query_callback (EContact *contact, EContact *match, EABContactMatchType type, gpointer closure) { EContactMergingLookup *lookup = closure; - char *gladefile; - int flag; + gchar *gladefile; + gint flag; if ((gint) type <= (gint) EAB_CONTACT_MATCH_VAGUE) { doit (lookup); diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 9482a93744..2176fc3915 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -71,7 +71,7 @@ static void free_data (EABModel *model) { if (model->data) { - int i; + gint i; for ( i = 0; i < model->data_count; i++ ) { g_object_unref (model->data[i]); @@ -153,8 +153,8 @@ addressbook_dispose(GObject *object) static void update_folder_bar_message (EABModel *model) { - int count; - char *message; + gint count; + gchar *message; count = model->data_count; @@ -179,8 +179,8 @@ create_contact(EBookView *book_view, const GList *contacts, EABModel *model) { - int old_count = model->data_count; - int length = g_list_length ((GList *)contacts); + gint old_count = model->data_count; + gint length = g_list_length ((GList *)contacts); if (model->data_count + length > model->allocated_count) { while (model->data_count + length > model->allocated_count) @@ -212,7 +212,7 @@ remove_contact(EBookView *book_view, indices = g_array_new (FALSE, FALSE, sizeof (gint)); for (l = ids; l; l = l->next) { - char *id = l->data; + gchar *id = l->data; for ( i = 0; i < model->data_count; i++) { if ( !strcmp(e_contact_get_const (model->data[i], E_CONTACT_UID), id) ) { g_object_unref (model->data[i]); @@ -236,7 +236,7 @@ modify_contact(EBookView *book_view, EABModel *model) { for ( ; contacts; contacts = contacts->next) { - int i; + gint i; for ( i = 0; i < model->data_count; i++) { if ( !strcmp(e_contact_get_const(model->data[i], E_CONTACT_UID), e_contact_get_const(E_CONTACT(contacts->data), E_CONTACT_UID)) ) { @@ -253,7 +253,7 @@ modify_contact(EBookView *book_view, static void status_message (EBookView *book_view, - char* status, + gchar * status, EABModel *model) { g_signal_emit (model, @@ -508,8 +508,8 @@ get_view (EABModel *model) if (model->book && model->query) { ESource *source; - const char *limit_str; - int limit = -1; + const gchar *limit_str; + gint limit = -1; source = e_book_get_source (model->book); @@ -552,7 +552,7 @@ get_view_idle (EABModel *model) EContact * eab_model_get_contact(EABModel *model, - int row) + gint row) { if (model->data && 0 <= row && row < model->data_count) { return e_contact_duplicate (model->data[row]); @@ -643,7 +643,7 @@ eab_model_get_property (GObject *object, guint prop_id, GValue *value, GParamSpe g_value_set_object (value, eab_model->book); break; case PROP_QUERY: { - char *query_string = e_book_query_to_string (eab_model->query); + gchar *query_string = e_book_query_to_string (eab_model->query); g_value_set_string (value, query_string); break; } @@ -712,14 +712,14 @@ eab_model_force_folder_bar_message (EABModel *model) update_folder_bar_message (model); } -int +gint eab_model_contact_count (EABModel *model) { return model->data_count; } const EContact * -eab_model_contact_at (EABModel *model, int index) +eab_model_contact_at (EABModel *model, gint index) { return model->data[index]; } diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h index ae1c5f4cb2..f8b448a6be 100644 --- a/addressbook/gui/widgets/e-addressbook-model.h +++ b/addressbook/gui/widgets/e-addressbook-model.h @@ -43,15 +43,15 @@ struct _EABModel { EBookQuery *query; EBookView *book_view; - int book_view_idle_id; + gint book_view_idle_id; EContact **data; - int data_count; - int allocated_count; + gint data_count; + gint allocated_count; - int create_contact_id, remove_contact_id, modify_contact_id; - int status_message_id, writable_status_id, sequence_complete_id; - int backend_died_id; + gint create_contact_id, remove_contact_id, modify_contact_id; + gint status_message_id, writable_status_id, sequence_complete_id; + gint backend_died_id; guint search_in_progress : 1; guint editable : 1; @@ -85,7 +85,7 @@ EABModel *eab_model_new (void); /* Returns object with ref count of 1. */ EContact *eab_model_get_contact (EABModel *model, - int row); + gint row); EBook *eab_model_get_ebook (EABModel *model); void eab_model_stop (EABModel *model); @@ -93,9 +93,9 @@ gboolean eab_model_can_stop (EABModel *model); void eab_model_force_folder_bar_message (EABModel *model); -int eab_model_contact_count (EABModel *model); +gint eab_model_contact_count (EABModel *model); const EContact *eab_model_contact_at (EABModel *model, - int index); + gint index); gboolean eab_model_editable (EABModel *model); #endif /* _EAB_MODEL_H_ */ diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 237838141b..6258ed28ca 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -36,8 +36,8 @@ struct _EAddressbookReflowAdapterPrivate { gboolean loading; - int create_contact_id, remove_contact_id, modify_contact_id, model_changed_id; - int search_started_id, search_result_id; + gint create_contact_id, remove_contact_id, modify_contact_id, model_changed_id; + gint search_started_id, search_result_id; }; #define PARENT_TYPE e_reflow_model_get_type() @@ -101,7 +101,7 @@ unlink_model(EAddressbookReflowAdapter *adapter) static int text_height (PangoLayout *layout, const gchar *text) { - int height; + gint height; pango_layout_set_text (layout, text, -1); @@ -119,7 +119,7 @@ addressbook_dispose(GObject *object) } static void -addressbook_set_width (EReflowModel *erm, int width) +addressbook_set_width (EReflowModel *erm, gint width) { } @@ -135,16 +135,16 @@ addressbook_count (EReflowModel *erm) /* This function returns the height of the minicontact in question */ static int -addressbook_height (EReflowModel *erm, int i, GnomeCanvasGroup *parent) +addressbook_height (EReflowModel *erm, gint i, GnomeCanvasGroup *parent) { EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm); EAddressbookReflowAdapterPrivate *priv = adapter->priv; EContactField field; - int count = 0; - char *string; + gint count = 0; + gchar *string; EContact *contact = (EContact*)eab_model_contact_at (priv->model, i); PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (GNOME_CANVAS_ITEM (parent)->canvas), ""); - int height; + gint height; string = e_contact_get(contact, E_CONTACT_FILE_AS); height = text_height (layout, string ? string : "") + 10.0; @@ -157,8 +157,8 @@ addressbook_height (EReflowModel *erm, int i, GnomeCanvasGroup *parent) string = e_contact_get(contact, field); if (string && *string) { - int this_height; - int field_text_height; + gint this_height; + gint field_text_height; this_height = text_height (layout, e_contact_pretty_name(field)); @@ -181,7 +181,7 @@ addressbook_height (EReflowModel *erm, int i, GnomeCanvasGroup *parent) } static int -addressbook_compare (EReflowModel *erm, int n1, int n2) +addressbook_compare (EReflowModel *erm, gint n1, gint n2) { EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm); EAddressbookReflowAdapterPrivate *priv = adapter->priv; @@ -195,8 +195,8 @@ addressbook_compare (EReflowModel *erm, int n1, int n2) contact2 = (EContact*)eab_model_contact_at (priv->model, n2); if (contact1 && contact2) { - const char *file_as1, *file_as2; - const char *uid1, *uid2; + const gchar *file_as1, *file_as2; + const gchar *uid1, *uid2; file_as1 = e_contact_get_const (contact1, E_CONTACT_FILE_AS); file_as2 = e_contact_get_const (contact2, E_CONTACT_FILE_AS); if (file_as1 && file_as2) @@ -235,7 +235,7 @@ adapter_drag_begin (EMinicard *card, GdkEvent *event, EAddressbookReflowAdapter } static GnomeCanvasItem * -addressbook_incarnate (EReflowModel *erm, int i, GnomeCanvasGroup *parent) +addressbook_incarnate (EReflowModel *erm, gint i, GnomeCanvasGroup *parent) { EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm); EAddressbookReflowAdapterPrivate *priv = adapter->priv; @@ -259,7 +259,7 @@ addressbook_incarnate (EReflowModel *erm, int i, GnomeCanvasGroup *parent) } static void -addressbook_reincarnate (EReflowModel *erm, int i, GnomeCanvasItem *item) +addressbook_reincarnate (EReflowModel *erm, gint i, GnomeCanvasItem *item) { EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm); EAddressbookReflowAdapterPrivate *priv = adapter->priv; @@ -285,7 +285,7 @@ remove_contacts (EABModel *model, EAddressbookReflowAdapter *adapter) { GArray *indices = (GArray *) data; - int count = indices->len; + gint count = indices->len; if (count == 1) e_reflow_model_item_removed (E_REFLOW_MODEL (adapter), g_array_index (indices, gint, 0)); @@ -536,7 +536,7 @@ e_addressbook_reflow_adapter_new (EABModel *model) EContact * e_addressbook_reflow_adapter_get_contact (EAddressbookReflowAdapter *adapter, - int index) + gint index) { EAddressbookReflowAdapterPrivate *priv = adapter->priv; diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h index 88ce1a7132..14803e945c 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h @@ -59,5 +59,5 @@ EReflowModel *e_addressbook_reflow_adapter_new (EABModel * /* Returns object with ref count of 1. */ EContact *e_addressbook_reflow_adapter_get_contact (EAddressbookReflowAdapter *adapter, - int index); + gint index); #endif /* _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ */ diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index 9e3dfe5f5f..59e670e772 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -33,7 +33,7 @@ struct _EAddressbookTableAdapterPrivate { EABModel *model; - int create_contact_id, remove_contact_id, modify_contact_id, model_changed_id; + gint create_contact_id, remove_contact_id, modify_contact_id, model_changed_id; GHashTable *emails; }; @@ -104,12 +104,12 @@ addressbook_row_count (ETableModel *etc) } /* This function returns the value at a particular point in our ETableModel. */ -static void * -addressbook_value_at (ETableModel *etc, int col, int row) +static gpointer +addressbook_value_at (ETableModel *etc, gint col, gint row) { EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etc); EAddressbookTableAdapterPrivate *priv = adapter->priv; - const char *value; + const gchar *value; if ( col >= COLS || row >= eab_model_contact_count (priv->model) ) return NULL; @@ -117,13 +117,13 @@ addressbook_value_at (ETableModel *etc, int col, int row) value = e_contact_get_const((EContact*)eab_model_contact_at (priv->model, row), col); if (value && *value && (col == E_CONTACT_EMAIL_1 || col == E_CONTACT_EMAIL_2 || col == E_CONTACT_EMAIL_3)) { - char *val = g_hash_table_lookup (priv->emails, value); + gchar *val = g_hash_table_lookup (priv->emails, value); if (val) { /* we have this already cached, so use value from the cache */ value = val; } else { - char *name = NULL, *mail = NULL; + gchar *name = NULL, *mail = NULL; if (eab_parse_qp_email (value, &name, &mail)) val = g_strdup_printf ("%s <%s>", name, mail); @@ -138,7 +138,7 @@ addressbook_value_at (ETableModel *etc, int col, int row) } } - return (void *)(value ? value : ""); + return (gpointer)(value ? value : ""); } /* This function sets the value at a particular point in our ETableModel. */ @@ -151,7 +151,7 @@ contact_modified_cb (EBook* book, EBookStatus status, } static void -addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val) +addressbook_set_value_at (ETableModel *etc, gint col, gint row, gconstpointer val) { EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etc); EAddressbookTableAdapterPrivate *priv = adapter->priv; @@ -169,14 +169,14 @@ addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val) e_table_model_pre_change(etc); if (col == E_CONTACT_EMAIL_1 || col == E_CONTACT_EMAIL_2 || col == E_CONTACT_EMAIL_3) { - const char *old_value = e_contact_get_const (contact, col); + const gchar *old_value = e_contact_get_const (contact, col); /* remove old value from cache and use new one */ if (old_value && *old_value) g_hash_table_remove (priv->emails, old_value); } - e_contact_set(contact, col, (void *) val); + e_contact_set(contact, col, (gpointer) val); eab_merging_book_commit_contact (eab_model_get_ebook (priv->model), contact, contact_modified_cb, etc); @@ -189,7 +189,7 @@ addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val) /* This function returns whether a particular cell is editable. */ static gboolean -addressbook_is_cell_editable (ETableModel *etc, int col, int row) +addressbook_is_cell_editable (ETableModel *etc, gint col, gint row) { #if 0 EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etc); @@ -220,13 +220,13 @@ addressbook_append_row (ETableModel *etm, ETableModel *source, gint row) EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etm); EAddressbookTableAdapterPrivate *priv = adapter->priv; EContact *contact; - int col; + gint col; contact = e_contact_new (); for (col = 1; col < E_CONTACT_LAST_SIMPLE_STRING; col++) { - const void *val = e_table_model_value_at (source, col, row); - e_contact_set (contact, col, (void *) val); + gconstpointer val = e_table_model_value_at (source, col, row); + e_contact_set (contact, col, (gpointer) val); } eab_merging_book_add_contact (eab_model_get_ebook (priv->model), contact, NULL, NULL); @@ -235,33 +235,33 @@ addressbook_append_row (ETableModel *etm, ETableModel *source, gint row) } /* This function duplicates the value passed to it. */ -static void * -addressbook_duplicate_value (ETableModel *etc, int col, const void *value) +static gpointer +addressbook_duplicate_value (ETableModel *etc, gint col, gconstpointer value) { return g_strdup(value); } /* This function frees the value passed to it. */ static void -addressbook_free_value (ETableModel *etc, int col, void *value) +addressbook_free_value (ETableModel *etc, gint col, gpointer value) { g_free(value); } -static void * -addressbook_initialize_value (ETableModel *etc, int col) +static gpointer +addressbook_initialize_value (ETableModel *etc, gint col) { return g_strdup(""); } static gboolean -addressbook_value_is_empty (ETableModel *etc, int col, const void *value) +addressbook_value_is_empty (ETableModel *etc, gint col, gconstpointer value) { - return !(value && *(char *)value); + return !(value && *(gchar *)value); } -static char * -addressbook_value_to_string (ETableModel *etc, int col, const void *value) +static gchar * +addressbook_value_to_string (ETableModel *etc, gint col, gconstpointer value) { return g_strdup(value); } @@ -318,7 +318,7 @@ remove_contacts (EABModel *model, EAddressbookTableAdapter *adapter) { GArray *indices = (GArray *) data; - int count = indices->len; + gint count = indices->len; /* clear whole cache */ g_hash_table_remove_all (adapter->priv->emails); diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 4cd151f19f..cda5c5f27c 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -100,7 +100,7 @@ static void categories_changed_cb (gpointer object, gpointer user_data); static void make_suboptions (EABView *view); static void query_changed (ESearchBar *esb, EABView *view); static void search_activated (ESearchBar *esb, EABView *view); -static void search_menu_activated (ESearchBar *esb, int id, EABView *view); +static void search_menu_activated (ESearchBar *esb, gint id, EABView *view); static GList *get_master_list (gboolean force_rebuild); static gpointer parent_class; @@ -131,14 +131,14 @@ enum DndTargetType { typedef struct EABSearchBarItem { ESearchBarItem search; - char *image; + gchar *image; }EABSearchBarItem; static GtkTargetEntry drag_types[] = { { (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]); +static const gint num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]); static guint eab_view_signals [LAST_SIGNAL] = {0, }; @@ -412,8 +412,8 @@ eab_view_new (void) GtkWidget *widget = GTK_WIDGET (g_object_new (E_TYPE_AB_VIEW, NULL)); EABView *eav = EAB_VIEW (widget); FilterPart *part; - char *xmlfile; - char *userfile; + gchar *xmlfile; + gchar *userfile; /* create our model */ eav->model = eab_model_new (); @@ -543,9 +543,9 @@ init_collection (void) { GalViewFactory *factory; ETableSpecification *spec; - char *galview; - char *addressbookdir; - char *etspecfile; + gchar *galview; + gchar *addressbookdir; + gchar *etspecfile; if (collection == NULL) { collection = gal_view_collection_new(); @@ -626,7 +626,7 @@ display_view(GalViewInstance *instance, } static void -view_preview(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +view_preview(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data) { /* XXX this should use the addressbook's global gconf client */ GConfClient *gconf_client; @@ -793,7 +793,7 @@ static GList * get_contact_list (EABPopupTargetSelect *t) { GList *list = NULL; - int i; + gint i; for (i=0;icards->len;i++) list = g_list_prepend(list, t->cards->pdata[i]); @@ -802,7 +802,7 @@ get_contact_list (EABPopupTargetSelect *t) } static void -save_as (EPopup *ep, EPopupItem *pitem, void *data) +save_as (EPopup *ep, EPopupItem *pitem, gpointer data) { /*ContactAndBook *contact_and_book = data;*/ GList *contacts = get_contact_list ((EABPopupTargetSelect *)ep->target); @@ -814,7 +814,7 @@ save_as (EPopup *ep, EPopupItem *pitem, void *data) } static void -send_as (EPopup *ep, EPopupItem *pitem, void *data) +send_as (EPopup *ep, EPopupItem *pitem, gpointer data) { /*ContactAndBook *contact_and_book = data;*/ GList *contacts = get_contact_list ((EABPopupTargetSelect *)ep->target); @@ -826,7 +826,7 @@ send_as (EPopup *ep, EPopupItem *pitem, void *data) } static void -send_to (EPopup *ep, EPopupItem *pitem, void *data) +send_to (EPopup *ep, EPopupItem *pitem, gpointer data) { /*ContactAndBook *contact_and_book = data;*/ GList *contacts = get_contact_list ((EABPopupTargetSelect *)ep->target); @@ -838,7 +838,7 @@ send_to (EPopup *ep, EPopupItem *pitem, void *data) } static void -print (EPopup *ep, EPopupItem *pitem, void *data) +print (EPopup *ep, EPopupItem *pitem, gpointer data) { /*ContactAndBook *contact_and_book = data;*/ EABPopupTargetSelect *t = (EABPopupTargetSelect *)ep->target; @@ -852,7 +852,7 @@ print (EPopup *ep, EPopupItem *pitem, void *data) } static void -copy (EPopup *ep, EPopupItem *pitem, void *data) +copy (EPopup *ep, EPopupItem *pitem, gpointer data) { ContactAndBook *contact_and_book = data; @@ -860,7 +860,7 @@ copy (EPopup *ep, EPopupItem *pitem, void *data) } static void -paste (EPopup *ep, EPopupItem *pitem, void *data) +paste (EPopup *ep, EPopupItem *pitem, gpointer data) { ContactAndBook *contact_and_book = data; @@ -868,7 +868,7 @@ paste (EPopup *ep, EPopupItem *pitem, void *data) } static void -cut (EPopup *ep, EPopupItem *pitem, void *data) +cut (EPopup *ep, EPopupItem *pitem, gpointer data) { ContactAndBook *contact_and_book = data; @@ -876,7 +876,7 @@ cut (EPopup *ep, EPopupItem *pitem, void *data) } static void -delete (EPopup *ep, EPopupItem *pitem, void *data) +delete (EPopup *ep, EPopupItem *pitem, gpointer data) { ContactAndBook *contact_and_book = data; @@ -884,7 +884,7 @@ delete (EPopup *ep, EPopupItem *pitem, void *data) } static void -copy_to_folder (EPopup *ep, EPopupItem *pitem, void *data) +copy_to_folder (EPopup *ep, EPopupItem *pitem, gpointer data) { ContactAndBook *contact_and_book = data; @@ -892,7 +892,7 @@ copy_to_folder (EPopup *ep, EPopupItem *pitem, void *data) } static void -move_to_folder (EPopup *ep, EPopupItem *pitem, void *data) +move_to_folder (EPopup *ep, EPopupItem *pitem, gpointer data) { ContactAndBook *contact_and_book = data; @@ -900,7 +900,7 @@ move_to_folder (EPopup *ep, EPopupItem *pitem, void *data) } static void -open_contact (EPopup *ep, EPopupItem *pitem, void *data) +open_contact (EPopup *ep, EPopupItem *pitem, gpointer data) { ContactAndBook *contact_and_book = data; @@ -909,7 +909,7 @@ open_contact (EPopup *ep, EPopupItem *pitem, void *data) static void -new_card (EPopup *ep, EPopupItem *pitem, void *data) +new_card (EPopup *ep, EPopupItem *pitem, gpointer data) { /*ContactAndBook *contact_and_book = data;*/ EContact *contact = e_contact_new(); @@ -919,7 +919,7 @@ new_card (EPopup *ep, EPopupItem *pitem, void *data) } static void -new_list (EPopup *ep, EPopupItem *pitem, void *data) +new_list (EPopup *ep, EPopupItem *pitem, gpointer data) { /*ContactAndBook *contact_and_book = data;*/ EContact *contact = e_contact_new (); @@ -955,7 +955,7 @@ static EPopupItem eabv_popup_items[] = { }; static void -get_card_1(gint model_row, void *data) +get_card_1(gint model_row, gpointer data) { ContactAndBook *contact_and_book = data; EContact *contact; @@ -966,7 +966,7 @@ get_card_1(gint model_row, void *data) } static void -eabv_popup_free(EPopup *ep, GSList *list, void *data) +eabv_popup_free(EPopup *ep, GSList *list, gpointer data) { ContactAndBook *cab = data; ESelectionModel *selection; @@ -987,7 +987,7 @@ do_popup_menu(EABView *view, GdkEvent *event) EABPopup *ep; EABPopupTargetSelect *t; GSList *menus = NULL; - int i; + gint i; GtkMenu *menu; GPtrArray *cards = g_ptr_array_new(); ContactAndBook *contact_and_book; @@ -1025,7 +1025,7 @@ do_popup_menu(EABView *view, GdkEvent *event) } static void -render_contact (int row, EABView *view) +render_contact (gint row, EABView *view) { EContact *contact = eab_model_get_contact (view->model, row); @@ -1099,8 +1099,8 @@ table_white_space_event(ETableScrolled *table, GdkEvent *event, EABView *view) static void table_drag_data_get (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, GtkSelectionData *selection_data, guint info, @@ -1117,7 +1117,7 @@ table_drag_data_get (ETable *table, switch (info) { case DND_TARGET_TYPE_VCARD: { - char *value; + gchar *value; value = eab_contact_list_to_string (contact_list); @@ -1129,7 +1129,7 @@ table_drag_data_get (ETable *table, break; } case DND_TARGET_TYPE_SOURCE_VCARD: { - char *value; + gchar *value; value = eab_book_and_contact_list_to_string (view->book, contact_list); @@ -1221,7 +1221,7 @@ static void contacts_removed (EABModel *model, gpointer data, EABView *eav) { GArray *indices = (GArray *) data; - int count = indices->len; + gint count = indices->len; gint i; for (i = 0; i < count; i ++) { @@ -1284,7 +1284,7 @@ create_table_view (EABView *view) { ETableModel *adapter; GtkWidget *table; - char *etspecfile; + gchar *etspecfile; adapter = eab_table_adapter_new(view->model); @@ -1358,9 +1358,9 @@ static void search_activated (ESearchBar *esb, EABView *v) { GList *master_list; - char *search_word, *search_query, *view_sexp; - const char *category_name; - int search_type, subid; + gchar *search_word, *search_query, *view_sexp; + const gchar *category_name; + gint search_type, subid; g_object_get(esb, "text", &search_word, @@ -1427,7 +1427,7 @@ search_activated (ESearchBar *esb, EABView *v) } static void -search_menu_activated (ESearchBar *esb, int id, EABView *view) +search_menu_activated (ESearchBar *esb, gint id, EABView *view) { if (id == E_FILTERBAR_ADVANCED_ID) e_search_bar_set_item_id (esb, id); @@ -1436,8 +1436,8 @@ search_menu_activated (ESearchBar *esb, int id, EABView *view) static void query_changed (ESearchBar *esb, EABView *view) { - int search_type; - char *query; + gint search_type; + gchar *query; search_type = e_search_bar_get_item_id(esb); if (search_type == E_FILTERBAR_ADVANCED_ID) { @@ -1448,12 +1448,12 @@ query_changed (ESearchBar *esb, EABView *view) } static int -compare_subitems (const void *a, const void *b) +compare_subitems (gconstpointer a, gconstpointer b) { const ESearchBarItem *subitem_a = a; const ESearchBarItem *subitem_b = b; - char *collate_a, *collate_b; - int ret; + gchar *collate_a, *collate_b; + gint ret; collate_a = g_utf8_collate_key (subitem_a->text, -1); collate_b = g_utf8_collate_key (subitem_b->text, -1); @@ -1476,7 +1476,7 @@ generate_viewoption_menu (EABSearchBarItem *subitems) for (i = 0; subitems[i].search.id != -1; ++i) { if (subitems[i].search.text) { - char *str = NULL; + gchar *str = NULL; str = e_str_without_underscores (subitems[i].search.text); menu_item = gtk_image_menu_item_new_with_label (str); if (subitems[i].image) { @@ -1536,10 +1536,10 @@ make_suboptions (EABView *view) subitems[2].image = NULL; for (i=0; inext) { - if (e_categories_is_searchable ((const char *) l->data)) + if (e_categories_is_searchable ((const gchar *) l->data)) category_list = g_list_prepend (category_list, l->data); } @@ -1756,7 +1756,7 @@ eab_view_delete_selection(EABView *view, gboolean is_delete) ETable *etable = NULL; EMinicardView *card_view; ESelectionModel *selection_model = NULL; - char *name = NULL; + gchar *name = NULL; gint row = 0, select; list = get_selected_contacts (view); @@ -1797,7 +1797,7 @@ eab_view_delete_selection(EABView *view, gboolean is_delete) for (l=list;l;l=g_list_next(l)) { contact = l->data; - ids = g_list_prepend (ids, (char*)e_contact_get_const (contact, E_CONTACT_UID)); + ids = g_list_prepend (ids, (gchar *)e_contact_get_const (contact, E_CONTACT_UID)); } /* Remove the cards all at once. */ @@ -1864,7 +1864,7 @@ selection_get (GtkWidget *invisible, guint time_stamp, EABView *view) { - char *value; + gchar *value; value = eab_contact_list_to_string (view->clipboard_contacts); @@ -1896,14 +1896,14 @@ selection_received (GtkWidget *invisible, } else { GList *contact_list; GList *l; - char *str = NULL; + gchar *str = NULL; if (selection_data->data [selection_data->length - 1] != 0) { str = g_malloc0 (selection_data->length + 1); memcpy (str, selection_data->data, selection_data->length); contact_list = eab_contact_list_from_string (str); } else - contact_list = eab_contact_list_from_string ((char *)selection_data->data); + contact_list = eab_contact_list_from_string ((gchar *)selection_data->data); for (l = contact_list; l; l = l->next) { EContact *contact = l->data; @@ -1919,7 +1919,7 @@ selection_received (GtkWidget *invisible, } static void -add_to_list (int model_row, gpointer closure) +add_to_list (gint model_row, gpointer closure) { GList **list = closure; *list = g_list_prepend (*list, GINT_TO_POINTER (model_row)); diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 7f796415cd..72bafaa535 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -76,7 +76,7 @@ struct _EABView EBook *book; ESource *source; - char *query; + gchar *query; guint editable : 1; gint displayed_contact; diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index a6090291bd..52110bb169 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -40,7 +40,7 @@ static void e_minicard_label_get_property (GObject *object, guint prop_id, GVal static gboolean e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event); static void e_minicard_label_realize (GnomeCanvasItem *item); static void e_minicard_label_unrealize (GnomeCanvasItem *item); -static void e_minicard_label_reflow(GnomeCanvasItem *item, int flags); +static void e_minicard_label_reflow(GnomeCanvasItem *item, gint flags); static void e_minicard_label_style_set (EMinicardLabel *label, GtkStyle *previous_style); static void e_minicard_label_resize_children( EMinicardLabel *e_minicard_label ); @@ -455,7 +455,7 @@ e_minicard_label_style_set (EMinicardLabel *label, GtkStyle *previous_style) } static void -e_minicard_label_reflow(GnomeCanvasItem *item, int flags) +e_minicard_label_reflow(GnomeCanvasItem *item, gint flags) { EMinicardLabel *e_minicard_label = E_MINICARD_LABEL(item); diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 9c493afa61..a48e45ca52 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -303,7 +303,7 @@ selection_change (ESelectionModel *esm, EMinicardViewWidget *widget) } static void -selection_row_change (ESelectionModel *esm, int row, EMinicardViewWidget *widget) +selection_row_change (ESelectionModel *esm, gint row, EMinicardViewWidget *widget) { selection_change (esm, widget); } @@ -447,7 +447,7 @@ e_minicard_view_widget_real_focus_in_event(GtkWidget *widget, GdkEventFocus *eve if (!canvas->focused_item) { EReflow *reflow = E_REFLOW (view->emv); if (reflow->count) { - int unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), 0); + gint unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), 0); if (unsorted != -1) canvas->focused_item = reflow->items [unsorted]; diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index ff9cddac24..29b8904797 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -49,7 +49,7 @@ struct _EMinicardViewWidget EAddressbookReflowAdapter *adapter; EBook *book; - char *query; + gchar *query; guint editable : 1; double column_width; diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index b716c86c80..2e9ef12507 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -87,20 +87,20 @@ e_minicard_view_drag_data_get(GtkWidget *widget, switch (info) { case DND_TARGET_TYPE_VCARD_LIST: { - char *value; + gchar *value; value = eab_contact_list_to_string (view->drag_list); gtk_selection_data_set (selection_data, selection_data->target, 8, - (unsigned char *)value, strlen (value)); + (guchar *)value, strlen (value)); g_free (value); break; } case DND_TARGET_TYPE_SOURCE_VCARD_LIST: { EBook *book; - char *value; + gchar *value; g_object_get (view->adapter, "book", &book, NULL); value = eab_book_and_contact_list_to_string (book, view->drag_list); @@ -108,7 +108,7 @@ e_minicard_view_drag_data_get(GtkWidget *widget, gtk_selection_data_set (selection_data, selection_data->target, 8, - (unsigned char *)value, strlen (value)); + (guchar *)value, strlen (value)); g_free (value); break; } @@ -155,7 +155,7 @@ e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, static void set_empty_message (EMinicardView *view) { - char *empty_message; + gchar *empty_message; gboolean editable = FALSE, perform_initial_query = FALSE, searching = FALSE; EBook *book; @@ -417,7 +417,7 @@ static gint e_minicard_view_selection_event (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event) { EMinicardView *view; - int return_val = FALSE; + gint return_val = FALSE; view = E_MINICARD_VIEW (reflow); if (parent_class->selection_event) { @@ -427,7 +427,7 @@ e_minicard_view_selection_event (EReflow *reflow, GnomeCanvasItem *item, GdkEven switch (event->type) { case GDK_FOCUS_CHANGE: if (event->focus_change.in) { - int i; + gint i; for (i = 0; i < reflow->count; i++) { if (reflow->items[i] == item) { e_selection_model_maybe_do_something(reflow->selection, i, 0, 0); @@ -456,7 +456,7 @@ typedef struct { } ViewCbClosure; static void -do_remove (int i, gpointer user_data) +do_remove (gint i, gpointer user_data) { EBook *book; EContact *contact; @@ -478,7 +478,7 @@ do_remove (int i, gpointer user_data) #if 0 static int -compare_to_utf_str (EMinicard *card, const char *utf_str) +compare_to_utf_str (EMinicard *card, const gchar *utf_str) { g_return_val_if_fail(card != NULL, 0); g_return_val_if_fail(E_IS_MINICARD(card), 0); @@ -488,7 +488,7 @@ compare_to_utf_str (EMinicard *card, const char *utf_str) } if (card->card) { - char *file_as; + gchar *file_as; g_object_get(card->card, "file_as", &file_as, NULL); @@ -621,7 +621,7 @@ e_minicard_view_jump_to_letter (EMinicardView *view, gunichar letter) { #if 0 - char uft_str[6 + 1]; + gchar uft_str[6 + 1]; utf_str [g_unichar_to_utf8 (letter, utf_str)] = '\0'; e_reflow_sorted_jump (E_REFLOW_SORTED (view), @@ -636,7 +636,7 @@ typedef struct { } ModelAndList; static void -add_to_list (int index, gpointer closure) +add_to_list (gint index, gpointer closure) { ModelAndList *mal = closure; mal->list = g_list_prepend (mal->list, e_addressbook_reflow_adapter_get_contact (mal->adapter, index)); diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 0c70b12da0..da85e5fd83 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -50,7 +50,7 @@ static void e_minicard_finalize (GObject *object); static gboolean e_minicard_event (GnomeCanvasItem *item, GdkEvent *event); static void e_minicard_realize (GnomeCanvasItem *item); static void e_minicard_unrealize (GnomeCanvasItem *item); -static void e_minicard_reflow ( GnomeCanvasItem *item, int flags ); +static void e_minicard_reflow ( GnomeCanvasItem *item, gint flags ); static void e_minicard_style_set (EMinicard *minicard, GtkStyle *previous_style); static void e_minicard_resize_children( EMinicard *e_minicard ); @@ -600,7 +600,7 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) break; case GDK_BUTTON_PRESS: { if (1 <= event->button.button && event->button.button <= 2) { - int ret_val = e_minicard_selected(e_minicard, event); + gint ret_val = e_minicard_selected(e_minicard, event); GdkEventMask mask = ((1 << (4 + event->button.button)) | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | @@ -619,7 +619,7 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) e_minicard->drag_button_down = TRUE; return ret_val; } else if (event->button.button == 3) { - int ret_val = e_minicard_selected(e_minicard, event); + gint ret_val = e_minicard_selected(e_minicard, event); if (ret_val != 0) return ret_val; } @@ -675,9 +675,9 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) return FALSE; } else { - int row_count = e_selection_model_row_count (reflow->selection); - int model_index = e_selection_model_cursor_row (reflow->selection); - int view_index = e_sorter_model_to_sorted (reflow->selection->sorter, model_index); + gint row_count = e_selection_model_row_count (reflow->selection); + gint model_index = e_selection_model_cursor_row (reflow->selection); + gint view_index = e_sorter_model_to_sorted (reflow->selection->sorter, model_index); if (view_index == 0) view_index = row_count-1; @@ -701,9 +701,9 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) return FALSE; } else { - int row_count = e_selection_model_row_count(reflow->selection); - int model_index = e_selection_model_cursor_row (reflow->selection); - int view_index = e_sorter_model_to_sorted (reflow->selection->sorter, model_index); + gint row_count = e_selection_model_row_count(reflow->selection); + gint model_index = e_selection_model_cursor_row (reflow->selection); + gint view_index = e_sorter_model_to_sorted (reflow->selection->sorter, model_index); if (view_index == row_count-1) view_index = 0; @@ -768,8 +768,8 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width) GnomeCanvasItem *new_item; GnomeCanvasGroup *group; EMinicardField *minicard_field; - char *name; - char *string; + gchar *name; + gchar *string; gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); group = GNOME_CANVAS_GROUP( e_minicard ); @@ -817,7 +817,7 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width) } -static const char * +static const gchar * get_email_location (EVCardAttribute *attr) { gint i; @@ -831,28 +831,28 @@ get_email_location (EVCardAttribute *attr) } static void -add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, int limit, gboolean is_list) +add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, gint limit, gboolean is_list) { GnomeCanvasItem *new_item; GnomeCanvasGroup *group; EMinicardField *minicard_field; - char *name; + gchar *name; GList *l, *le; - int count =0; + gint count =0; gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); GList *emails = e_contact_get (e_minicard->contact, E_CONTACT_EMAIL); group = GNOME_CANVAS_GROUP( e_minicard ); for (l=email_list, le=emails; l!=NULL && count < limit && le!=NULL; l = l->next, le=le->next) { const gchar *tmp; - char *email = NULL; - char *string = NULL; - char *parsed_name = NULL; + gchar *email = NULL; + gchar *string = NULL; + gchar *parsed_name = NULL; gboolean parser_check; /* do not use name for fields in the contact list */ if (is_list) { - name = (char *)""; + name = (gchar *)""; } else { tmp = get_email_location ((EVCardAttribute *) l->data); name = g_strdup_printf ("%s:", tmp); @@ -908,7 +908,7 @@ get_left_width (EMinicard *e_minicard, gboolean is_list) { gchar *name; EContactField field; - int width = -1; + gint width = -1; PangoLayout *layout; if (is_list) @@ -916,7 +916,7 @@ get_left_width (EMinicard *e_minicard, gboolean is_list) layout = gtk_widget_create_pango_layout (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas), ""); for(field = E_CONTACT_FULL_NAME; field != E_CONTACT_LAST_SIMPLE_STRING; field++) { - int this_width; + gint this_width; if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME) continue; @@ -935,14 +935,14 @@ get_left_width (EMinicard *e_minicard, gboolean is_list) static void remodel( EMinicard *e_minicard ) { - int count = 0; + gint count = 0; if ( !(GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED) ) return; if (e_minicard->contact) { EContactField field; GList *list; - char *file_as; - int left_width = -1; + gchar *file_as; + gint left_width = -1; gboolean is_list = FALSE; gboolean email_rendered = FALSE; @@ -985,7 +985,7 @@ remodel( EMinicard *e_minicard ) minicard_field = list->data; if (minicard_field && minicard_field->field == field) { GList *this_list = list; - char *string; + gchar *string; string = e_contact_get(e_minicard->contact, field); if (string && *string) { @@ -1000,14 +1000,14 @@ remodel( EMinicard *e_minicard ) list = g_list_delete_link(list, this_list); g_free(string); } else { - char *string; + gchar *string; if (left_width == -1) { left_width = get_left_width (e_minicard, is_list); } if (is_email) { GList *email; - int limit; + gint limit; limit = 5 - count; email = e_contact_get_attributes (e_minicard->contact, E_CONTACT_EMAIL); @@ -1035,7 +1035,7 @@ remodel( EMinicard *e_minicard ) } static void -e_minicard_reflow(GnomeCanvasItem *item, int flags) +e_minicard_reflow(GnomeCanvasItem *item, gint flags) { EMinicard *e_minicard = E_MINICARD(item); if (GTK_OBJECT_FLAGS (e_minicard) & GNOME_CANVAS_ITEM_REALIZED) { @@ -1080,7 +1080,7 @@ e_minicard_reflow(GnomeCanvasItem *item, int flags) } } -const char * +const gchar * e_minicard_get_card_id (EMinicard *minicard) { g_return_val_if_fail(minicard != NULL, NULL); @@ -1093,10 +1093,10 @@ e_minicard_get_card_id (EMinicard *minicard) } } -int +gint e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2) { - int cmp = 0; + gint cmp = 0; g_return_val_if_fail(minicard1 != NULL, 0); g_return_val_if_fail(E_IS_MINICARD(minicard1), 0); @@ -1104,7 +1104,7 @@ e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2) g_return_val_if_fail(E_IS_MINICARD(minicard2), 0); if (minicard1->contact && minicard2->contact) { - char *file_as1, *file_as2; + gchar *file_as1, *file_as2; g_object_get(minicard1->contact, "file_as", &file_as1, NULL); @@ -1128,7 +1128,7 @@ e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2) return cmp; } -int +gint e_minicard_selected (EMinicard *minicard, GdkEvent *event) { gint ret_val = 0; diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index fb8116cb9d..9ab025185c 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -119,11 +119,11 @@ struct _EMinicardField { #define E_MINICARD_FIELD(field) ((EMinicardField *)(field)) GType e_minicard_get_type (void); -const char *e_minicard_get_card_id (EMinicard *minicard); -int e_minicard_compare (EMinicard *minicard1, +const gchar *e_minicard_get_card_id (EMinicard *minicard); +gint e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2); -int e_minicard_selected (EMinicard *minicard, +gint e_minicard_selected (EMinicard *minicard, GdkEvent *event); gboolean e_minicard_activate_editor (EMinicard *minicard); diff --git a/addressbook/gui/widgets/eab-config.c b/addressbook/gui/widgets/eab-config.c index 32ae07862f..91056e0544 100644 --- a/addressbook/gui/widgets/eab-config.c +++ b/addressbook/gui/widgets/eab-config.c @@ -126,7 +126,7 @@ eab_config_get_type (void) } EABConfig * -eab_config_new (int type, const char *menuid) +eab_config_new (gint type, const gchar *menuid) { EABConfig *ecp = g_object_new (eab_config_get_type(), NULL); e_config_construct (&ecp->config, type, menuid); @@ -156,7 +156,7 @@ static const EConfigHookTargetMap ecph_targets[] = { static void ecph_class_init (EPluginHookClass *klass) { - int i; + gint i; klass->id = "org.gnome.evolution.addressbook.config:1.0"; diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index 330df5141b..edc13bbb1b 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -59,7 +59,7 @@ struct _EABConfigTargetSource { typedef struct _EConfigItem EABConfigItem; GType eab_config_get_type (void); -EABConfig *eab_config_new (int type, const char *menuid); +EABConfig *eab_config_new (gint type, const gchar *menuid); EABConfigTargetSource *eab_config_target_new_source (EABConfig *ecp, struct _ESource *source); diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 96050b2ca4..197a91e89c 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -45,7 +45,7 @@ struct _EABContactDisplayPrivate { EContact *contact; GtkWidget *invisible; - char *selection_uri; + gchar *selection_uri; }; static struct { @@ -78,7 +78,7 @@ common_location [] = #define MAX_COMPACT_IMAGE_DIMENSION 48 static void -eab_uri_popup_link_open(EPopup *ep, EPopupItem *item, void *data) +eab_uri_popup_link_open(EPopup *ep, EPopupItem *item, gpointer data) { EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target; @@ -87,16 +87,16 @@ eab_uri_popup_link_open(EPopup *ep, EPopupItem *item, void *data) } static void -eab_uri_popup_email_address_copy(EPopup *ep, EPopupItem *item, void *data) +eab_uri_popup_email_address_copy(EPopup *ep, EPopupItem *item, gpointer data) { EABContactDisplay *display = data; struct _EABContactDisplayPrivate *p = display->priv; EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target; - const char *url = t->uri; - char *html=NULL; - int i=0; + const gchar *url = t->uri; + gchar *html=NULL; + gint i=0; GList *email_list, *l; - int email_num = atoi (url + strlen ("internal-mailto:")); + gint email_num = atoi (url + strlen ("internal-mailto:")); email_list = e_contact_get (p->contact, E_CONTACT_EMAIL); for (l = email_list; l; l=l->next) { @@ -114,7 +114,7 @@ eab_uri_popup_email_address_copy(EPopup *ep, EPopupItem *item, void *data) } static void -eab_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data) +eab_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, gpointer data) { EABContactDisplay *display = data; struct _EABContactDisplayPrivate *p = display->priv; @@ -127,14 +127,14 @@ eab_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data) } static void -eab_uri_popup_address_send(EPopup *ep, EPopupItem *item, void *data) +eab_uri_popup_address_send(EPopup *ep, EPopupItem *item, gpointer data) { EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target; - const char *url = t->uri; + const gchar *url = t->uri; EABContactDisplay *display = data; struct _EABContactDisplayPrivate *p = display->priv; - int mail_num = atoi (url + strlen ("internal-mailto:")); + gint mail_num = atoi (url + strlen ("internal-mailto:")); if (mail_num == -1) return; @@ -174,7 +174,7 @@ static EPopupItem eab_uri_popups[] = { static void -eab_uri_popup_free(EPopup *ep, GSList *list, void *data) +eab_uri_popup_free(EPopup *ep, GSList *list, gpointer data) { while (list){ GSList *n = list->next; @@ -189,13 +189,13 @@ eab_uri_popup_free(EPopup *ep, GSList *list, void *data) } static int -eab_uri_popup_event(EABContactDisplay *display, GdkEvent *event, const char *uri) +eab_uri_popup_event(EABContactDisplay *display, GdkEvent *event, const gchar *uri) { EABPopup *emp; EABPopupTargetURI *t ; GtkMenu *menu; GSList *menus = NULL; - int i; + gint i; emp = eab_popup_new("org.gnome.evolution.addressbook.contactdisplay.popup"); @@ -220,7 +220,7 @@ eab_uri_popup_event(EABContactDisplay *display, GdkEvent *event, const char *uri } static void -on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle, +on_url_requested (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, EABContactDisplay *display) { if (!strcmp (url, "internal-contact-photo:")) { @@ -230,7 +230,7 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle, if (!photo) photo = e_contact_get (display->priv->contact, E_CONTACT_LOGO); - gtk_html_stream_write (handle, (char *)photo->data.inlined.data, photo->data.inlined.length); + gtk_html_stream_write (handle, (gchar *)photo->data.inlined.data, photo->data.inlined.length); gtk_html_end (html, handle, GTK_HTML_STREAM_OK); @@ -254,11 +254,11 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle, } static void -on_link_clicked (GtkHTML *html, const char *uri, EABContactDisplay *display) +on_link_clicked (GtkHTML *html, const gchar *uri, EABContactDisplay *display) { #ifdef HANDLE_MAILTO_INTERNALLY if (!strncmp (uri, "internal-mailto:", strlen ("internal-mailto:"))) { - int mail_num = atoi (uri + strlen ("internal-mailto:")); + gint mail_num = atoi (uri + strlen ("internal-mailto:")); if (mail_num == -1) return; @@ -275,14 +275,14 @@ on_link_clicked (GtkHTML *html, const char *uri, EABContactDisplay *display) #if 0 static void -render_address (GtkHTMLStream *html_stream, EContact *contact, const char *html_label, EContactField adr_field, EContactField label_field) +render_address (GtkHTMLStream *html_stream, EContact *contact, const gchar *html_label, EContactField adr_field, EContactField label_field) { EContactAddress *adr; - const char *label; + const gchar *label; label = e_contact_get_const (contact, label_field); if (label) { - char *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL); + gchar *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL); gtk_html_stream_printf (html_stream, "
%s:
%s		%s
%s %s:
%s %s:
%s
 
"); @@ -542,8 +542,8 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact) email_attr_list = e_contact_get_attributes (contact, E_CONTACT_EMAIL); for (l = email_list, al=email_attr_list; l && al; l = l->next, al = al->next) { - char *html = NULL, *name = NULL, *mail = NULL; - char *attr_str = (char *)get_email_location ((EVCardAttribute *) al->data); + gchar *html = NULL, *name = NULL, *mail = NULL; + gchar *attr_str = (gchar *)get_email_location ((EVCardAttribute *) al->data); #ifdef HANDLE_MAILTO_INTERNALLY if (!eab_parse_qp_email (l->data, &name, &mail)) @@ -681,8 +681,8 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact gtk_html_stream_printf (html_stream, "
"); if (photo_name) { - char *classid; + gchar *classid; CamelMimePart *photopart; cia = camel_internet_address_new(); - camel_address_decode((CamelAddress *) cia, (const char *) photo_name); + camel_address_decode((CamelAddress *) cia, (const gchar *) photo_name); photopart = em_utils_contact_photo (cia, emf->photo_local); if (photopart) { @@ -2024,11 +2024,11 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) } if (!contact_has_photo && face_decoded) { - char *classid; + gchar *classid; CamelMimePart *part; part = camel_mime_part_new (); - camel_mime_part_set_content ((CamelMimePart *) part, (const char *) face_header_value, face_header_len, "image/png"); + camel_mime_part_set_content ((CamelMimePart *) part, (const gchar *) face_header_value, face_header_len, "image/png"); classid = g_strdup_printf("icon:///em-format-html/face/photo/header"); camel_stream_printf(stream, "", classid); em_format_add_puri(emf, sizeof(EMFormatPURI), classid, part, efh_write_image); @@ -2037,7 +2037,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) if (have_icon && efh->show_icon) { GtkIconInfo *icon_info; - char *classid; + gchar *classid; CamelMimePart *iconpart = NULL; classid = g_strdup_printf("icon:///em-format-html/%s/icon/header", emf->part_id->str); @@ -2117,9 +2117,9 @@ static void efh_format_source(EMFormat *emf, CamelStream *stream, CamelMimePart } static void -efh_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const char *mime_type, const EMFormatHandler *handle) +efh_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const gchar *mime_type, const EMFormatHandler *handle) { - char *text, *html; + gchar *text, *html; /* we display all inlined attachments only */ diff --git a/mail/em-format-html.h b/mail/em-format-html.h index eb8aec96e9..776a5fb9c9 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -114,13 +114,13 @@ struct _EMFormatHTMLJob { struct _EMFormatPURITree *puri_level; CamelURL *base; - void (*callback)(EMFormatHTMLJob *job, int cancelled); + void (*callback)(EMFormatHTMLJob *job, gint cancelled); union { - char *uri; + gchar *uri; CamelMedium *msg; EMFormatPURI *puri; struct _EMFormatPURITree *puri_level; - void *data; + gpointer data; } u; }; @@ -154,7 +154,7 @@ struct _EMFormatHTMLPObject { void (*free)(EMFormatHTMLPObject *); EMFormatHTML *format; - char *classid; + gchar *classid; EMFormatHTMLPObjectFunc func; CamelMimePart *part; @@ -213,12 +213,12 @@ struct _EMFormatHTML { guint32 frame_colour; guint32 content_colour; guint32 citation_colour; - unsigned int load_http:2; - unsigned int load_http_now:1; - unsigned int mark_citations:1; - unsigned int simple_headers:1; /* simple header format, no box/table */ - unsigned int hide_headers:1; /* no headers at all */ - unsigned int show_icon:1; /* show an icon when the sender used Evo */ + guint load_http:2; + guint load_http_now:1; + guint mark_citations:1; + guint simple_headers:1; /* simple header format, no box/table */ + guint hide_headers:1; /* no headers at all */ + guint show_icon:1; /* show an icon when the sender used Evo */ guint32 header_wrap_flags; EMFormatHTMLState state; /* actual state of the object */ @@ -233,10 +233,10 @@ EMFormatHTML * em_format_html_new (void); void em_format_html_load_http (EMFormatHTML *efh); void em_format_html_set_load_http (EMFormatHTML *efh, - int style); + gint style); void em_format_html_set_mark_citations (EMFormatHTML *efh, - int state, + gint state, guint32 citation_colour); /* retrieves a pseudo-part icon wrapper for a file */ @@ -248,12 +248,12 @@ CamelMimePart * em_format_html_file_part (EMFormatHTML *efh, EMFormatHTMLPObject * em_format_html_add_pobject (EMFormatHTML *efh, size_t size, - const char *classid, + const gchar *classid, CamelMimePart *part, EMFormatHTMLPObjectFunc func); EMFormatHTMLPObject * em_format_html_find_pobject (EMFormatHTML *efh, - const char *classid); + const gchar *classid); EMFormatHTMLPObject * em_format_html_find_pobject_func(EMFormatHTML *efh, CamelMimePart *part, @@ -264,8 +264,8 @@ void em_format_html_clear_pobject (EMFormatHTML *efh); EMFormatHTMLJob * em_format_html_job_new (EMFormatHTML *efh, - void (*callback)(EMFormatHTMLJob *job, int cancelled), - void *data); + void (*callback)(EMFormatHTMLJob *job, gint cancelled), + gpointer data); void em_format_html_job_queue (EMFormatHTML *efh, EMFormatHTMLJob *job); diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index 85249a293c..a61c3f26f5 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -44,14 +44,14 @@ #include "mail-config.h" struct _EMFormatQuotePrivate { - int dummy; + gint dummy; }; -static void emfq_format_clone(EMFormat *, CamelFolder *, const char *, CamelMimeMessage *, EMFormat *); -static void emfq_format_error(EMFormat *emf, CamelStream *stream, const char *txt); +static void emfq_format_clone(EMFormat *, CamelFolder *, const gchar *, CamelMimeMessage *, EMFormat *); +static void emfq_format_error(EMFormat *emf, CamelStream *stream, const gchar *txt); static void emfq_format_message(EMFormat *, CamelStream *, CamelMimePart *, const EMFormatHandler *); static void emfq_format_source(EMFormat *, CamelStream *, CamelMimePart *); -static void emfq_format_attachment(EMFormat *, CamelStream *, CamelMimePart *, const char *, const EMFormatHandler *); +static void emfq_format_attachment(EMFormat *, CamelStream *, CamelMimePart *, const gchar *, const EMFormatHandler *); static void emfq_builtin_init(EMFormatQuoteClass *efhc); @@ -122,7 +122,7 @@ em_format_quote_get_type(void) } EMFormatQuote * -em_format_quote_new(const char *credits, CamelStream *stream, guint32 flags) +em_format_quote_new(const gchar *credits, CamelStream *stream, guint32 flags) { EMFormatQuote *emfq; @@ -143,7 +143,7 @@ emfq_format_empty_line(EMFormat *emf, CamelStream *stream, CamelMimePart *part, } static void -emfq_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeMessage *msg, EMFormat *src) +emfq_format_clone(EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, EMFormat *src) { EMFormatQuote *emfq = (EMFormatQuote *) emf; const EMFormatHandler *handle; @@ -166,16 +166,16 @@ emfq_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMime } static void -emfq_format_error(EMFormat *emf, CamelStream *stream, const char *txt) +emfq_format_error(EMFormat *emf, CamelStream *stream, const gchar *txt) { /* FIXME: should we even bother writing error text for quoting? probably not... */ } static void -emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const char *label, const char *value, guint32 flags, int is_html) +emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const gchar *label, const gchar *value, guint32 flags, gint is_html) { - const char *fmt, *html; - char *mhtml = NULL; + const gchar *fmt, *html; + gchar *mhtml = NULL; if (value == NULL) return; @@ -206,7 +206,7 @@ static const gchar *addrspec_hdrs[] = { #if 0 /* FIXME: include Sender and Resent-* headers too? */ /* For Translators only: The following strings are used in the header table in the preview pane */ -static char *i18n_hdrs[] = { +static gchar *i18n_hdrs[] = { N_("From"), N_("Reply-To"), N_("To"), N_("Cc"), N_("Bcc") }; #endif @@ -215,7 +215,7 @@ static void emfq_format_address (GString *out, struct _camel_header_address *a) { guint32 flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES; - char *name, *mailto, *addr; + gchar *name, *mailto, *addr; while (a) { if (a->name) @@ -226,11 +226,11 @@ emfq_format_address (GString *out, struct _camel_header_address *a) switch (a->type) { case CAMEL_HEADER_ADDRESS_NAME: if (name && *name) { - char *real, *mailaddr; + gchar *real, *mailaddr; g_string_append_printf (out, "%s <", name); /* rfc2368 for mailto syntax and url encoding extras */ - if ((real = camel_header_encode_phrase ((unsigned char *)a->name))) { + if ((real = camel_header_encode_phrase ((guchar *)a->name))) { mailaddr = g_strdup_printf ("%s <%s>", real, a->v.addr); g_free (real); mailto = camel_url_encode (mailaddr, "?=&()"); @@ -268,9 +268,9 @@ emfq_format_address (GString *out, struct _camel_header_address *a) } static void -canon_header_name (char *name) +canon_header_name (gchar *name) { - char *inptr = name; + gchar *inptr = name; /* canonicalise the header name... first letter is * capitalised and any letter following a '-' also gets @@ -292,15 +292,15 @@ canon_header_name (char *name) } static void -emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const char *namein, guint32 flags, const char *charset) +emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const gchar *namein, guint32 flags, const gchar *charset) { CamelMimeMessage *msg = (CamelMimeMessage *) part; EMFormatQuote *emfq = (EMFormatQuote *) emf; - char *name, *buf, *value = NULL; - const char *txt, *label; + gchar *name, *buf, *value = NULL; + const gchar *txt, *label; gboolean addrspec = FALSE; - int is_html = FALSE; - int i; + gint is_html = FALSE; + gint i; name = g_alloca (strlen (namein) + 1); strcpy (name, namein); @@ -374,7 +374,7 @@ emfq_format_headers (EMFormatQuote *emfq, CamelStream *stream, CamelMedium *part { EMFormat *emf = (EMFormat *) emfq; CamelContentType *ct; - const char *charset; + const gchar *charset; EMFormatHeader *h; if (!part) @@ -442,10 +442,10 @@ emfq_format_source(EMFormat *emf, CamelStream *stream, CamelMimePart *part) } static void -emfq_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const char *mime_type, const EMFormatHandler *handle) +emfq_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const gchar *mime_type, const EMFormatHandler *handle) { if (handle && em_format_is_inline(emf, emf->part_id->str, part, handle)) { - char *text, *html; + gchar *text, *html; camel_stream_write_string(stream, "
\n", is_rtl ? " align=\"right\" " : ""); if (contact) { - const char *str; - char *html; + const gchar *str; + gchar *html; EContactPhoto *photo; gtk_html_stream_printf (html_stream, "", _("Web Page:")); gtk_html_stream_printf (stream, "", str, str); diff --git a/calendar/gui/e-cal-component-memo-preview.h b/calendar/gui/e-cal-component-memo-preview.h index 8dcab9d0f3..3f310cce03 100644 --- a/calendar/gui/e-cal-component-memo-preview.h +++ b/calendar/gui/e-cal-component-memo-preview.h @@ -50,7 +50,7 @@ struct _ECalComponentMemoPreviewClass { GtkTableClass parent_class; /* Notification signals */ - void (* selection_changed) (ECalComponentMemoPreview *preview, int n_selected); + void (* selection_changed) (ECalComponentMemoPreview *preview, gint n_selected); }; diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index a70bf5761f..0cee29614d 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -50,17 +50,17 @@ struct _ECalComponentPreviewPrivate { G_DEFINE_TYPE (ECalComponentPreview, e_cal_component_preview, GTK_TYPE_TABLE) static void -on_link_clicked (GtkHTML *html, const char *url, gpointer data) +on_link_clicked (GtkHTML *html, const gchar *url, gpointer data) { /* FIXME Pass a parent window. */ e_show_uri (NULL, url); } static void -on_url_cb (GtkHTML *html, const char *url, gpointer data) +on_url_cb (GtkHTML *html, const gchar *url, gpointer data) { #if 0 - char *msg; + gchar *msg; ECalComponentPreview *preview = data; if (url && *url) { @@ -74,20 +74,20 @@ on_url_cb (GtkHTML *html, const char *url, gpointer data) /* Callback used when the user selects a URL in the HTML widget */ void -e_cal_comp_preview_url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *html_stream, gpointer data) +e_cal_comp_preview_url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *html_stream, gpointer data) { - int len = strlen ("file:///"); + gint len = strlen ("file:///"); if (!strncmp ("file:///", url, len)) { GFile *file; - const char *path = url + len - 1; + const gchar *path = url + len - 1; g_return_if_fail (html_stream != NULL); g_return_if_fail (path != NULL); file = g_file_new_for_path (path); if (file) { - char buffer[4096]; + gchar buffer[4096]; GInputStream *stream; /* ignore errors here */ @@ -115,13 +115,13 @@ e_cal_comp_preview_url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStre } /* Converts a time_t to a string, relative to the specified timezone */ -static char * +static gchar * timet_to_str_with_zone (ECalComponentDateTime *dt, ECal *ecal, icaltimezone *default_zone) { struct icaltimetype itt; icaltimezone *zone; struct tm tm; - char buf[256]; + gchar buf[256]; if (dt->tzid) { /* If we can't find the zone, we'll guess its "local" */ @@ -153,8 +153,8 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone gchar *str; GSList *l; icalproperty_status status; - const char *location; - int *priority_value; + const gchar *location; + gint *priority_value; g_return_if_fail (E_IS_CAL_COMPONENT (comp)); @@ -177,13 +177,13 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone GSList *node; for (node = l; node != NULL; node = node->next) { - const char *icon_file; + const gchar *icon_file; - icon_file = e_categories_get_icon_file_for ((const char *) node->data); + icon_file = e_categories_get_icon_file_for ((const gchar *) node->data); if (icon_file) { gchar *icon_file_uri = g_filename_to_uri (icon_file, NULL, NULL); gtk_html_stream_printf (stream, "\"%s\"", - (const char *) node->data, icon_file_uri); + (const gchar *) node->data, icon_file_uri); g_free (icon_file_uri); } } @@ -289,7 +289,7 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone gtk_html_stream_printf (stream, "", _("Web Page:")); gtk_html_stream_printf (stream, "", str, str); diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h index 4faa7bd29b..86aa99ffc0 100644 --- a/calendar/gui/e-cal-component-preview.h +++ b/calendar/gui/e-cal-component-preview.h @@ -52,7 +52,7 @@ struct _ECalComponentPreviewClass { GtkTableClass parent_class; /* Notification signals */ - void (* selection_changed) (ECalComponentPreview *preview, int n_selected); + void (* selection_changed) (ECalComponentPreview *preview, gint n_selected); }; @@ -66,7 +66,7 @@ void e_cal_component_preview_display (ECalComponentPreview *preview, void e_cal_component_preview_clear (ECalComponentPreview *preview); /* Callback used when GtkHTML widget requests URL */ -void e_cal_comp_preview_url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *html_stream, gpointer data); +void e_cal_comp_preview_url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *html_stream, gpointer data); GtkWidget *e_cal_component_preview_get_html (ECalComponentPreview *preview); diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c index fb1d6c28e7..33b6bc9c46 100644 --- a/calendar/gui/e-cal-config.c +++ b/calendar/gui/e-cal-config.c @@ -137,7 +137,7 @@ e_cal_config_get_type (void) } ECalConfig * -e_cal_config_new (int type, const char *menuid) +e_cal_config_new (gint type, const gchar *menuid) { ECalConfig *ecp = g_object_new (e_cal_config_get_type(), NULL); e_config_construct (&ecp->config, type, menuid); @@ -180,7 +180,7 @@ static const EConfigHookTargetMap ecph_targets[] = { static void ecph_class_init (EPluginHookClass *klass) { - int i; + gint i; klass->id = "org.gnome.evolution.calendar.config:1.0"; diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h index 15ad617a3d..f9876e7adf 100644 --- a/calendar/gui/e-cal-config.h +++ b/calendar/gui/e-cal-config.h @@ -69,7 +69,7 @@ struct _ECalConfigTargetPrefs { typedef struct _EConfigItem ECalConfigItem; GType e_cal_config_get_type (void); -ECalConfig *e_cal_config_new (int type, const char *menuid); +ECalConfig *e_cal_config_new (gint type, const gchar *menuid); ECalConfigTargetSource *e_cal_config_target_new_source (ECalConfig *ecp, struct _ESource *source); ECalConfigTargetPrefs *e_cal_config_target_new_prefs (ECalConfig *ecp, struct _GConfClient *gconf); diff --git a/calendar/gui/e-cal-event.c b/calendar/gui/e-cal-event.c index db7e9abc89..86bd20e4e7 100644 --- a/calendar/gui/e-cal-event.c +++ b/calendar/gui/e-cal-event.c @@ -105,7 +105,7 @@ e_cal_event_target_new_component (ECalEvent *ece, struct _CalendarComponent *com /* ********************************************************************** */ -static void *eceh_parent_class; +static gpointer eceh_parent_class; static const EEventHookTargetMask eceh_component_masks[] = { { "migration", E_CAL_EVENT_COMPONENT_MIGRATION }, @@ -126,7 +126,7 @@ eceh_finalize (GObject *o) static void eceh_class_init (EPluginHookClass *klass) { - int i; + gint i; ((GObjectClass *)klass)->finalize = eceh_finalize; ((EPluginHookClass *)klass)->id = "org.gnome.evolution.calendar.events:1.0"; diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index 6eab1f7aac..f62db91985 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -243,9 +243,9 @@ setup_e_table (ECalListView *cal_list_view) g_object_unref (cell); strings = NULL; - strings = g_list_append (strings, (char*) _("Public")); - strings = g_list_append (strings, (char*) _("Private")); - strings = g_list_append (strings, (char*) _("Confidential")); + strings = g_list_append (strings, (gchar *) _("Public")); + strings = g_list_append (strings, (gchar *) _("Private")); + strings = g_list_append (strings, (gchar *) _("Confidential")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); diff --git a/calendar/gui/e-cal-menu.c b/calendar/gui/e-cal-menu.c index b1f5ed91ca..30d287ff6b 100644 --- a/calendar/gui/e-cal-menu.c +++ b/calendar/gui/e-cal-menu.c @@ -33,7 +33,7 @@ #include "gui/e-cal-model.h" #include "itip-utils.h" -static void ecalm_standard_menu_factory(EMenu *emp, void *data); +static void ecalm_standard_menu_factory(EMenu *emp, gpointer data); static GObjectClass *ecalm_parent; @@ -55,7 +55,7 @@ ecalm_target_free(EMenu *ep, EMenuTarget *t) switch (t->type) { case E_CAL_MENU_TARGET_SELECT: { ECalMenuTargetSelect *s = (ECalMenuTargetSelect *)t; - int i; + gint i; for (i=0;ievents->len;i++) e_cal_model_free_component_data(s->events->pdata[i]); @@ -97,7 +97,7 @@ e_cal_menu_get_type(void) return type; } -ECalMenu *e_cal_menu_new(const char *menuid) +ECalMenu *e_cal_menu_new(const gchar *menuid) { ECalMenu *emp = g_object_new(e_cal_menu_get_type(), NULL); @@ -194,7 +194,7 @@ e_cal_menu_target_new_select(ECalMenu *eabp, struct _ECalModel *model, GPtrArray } static void -ecalm_standard_menu_factory(EMenu *emp, void *data) +ecalm_standard_menu_factory(EMenu *emp, gpointer data) { /* noop */ } @@ -227,7 +227,7 @@ ecalm_standard_menu_factory(EMenu *emp, void *data) */ -static void *ecalph_parent_class; +static gpointer ecalph_parent_class; #define ecalph ((ECalMenuHook *)eph) static const EMenuHookTargetMask ecalph_select_masks[] = { @@ -262,7 +262,7 @@ ecalph_finalise(GObject *o) static void ecalph_class_init(EPluginHookClass *klass) { - int i; + gint i; ((GObjectClass *)klass)->finalize = ecalph_finalise; ((EPluginHookClass *)klass)->id = "org.gnome.evolution.calendar.bonobomenu:1.0"; diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h index 5dda63f227..f1d9f4b729 100644 --- a/calendar/gui/e-cal-menu.h +++ b/calendar/gui/e-cal-menu.h @@ -100,7 +100,7 @@ struct _ECalMenuClass { GType e_cal_menu_get_type(void); -ECalMenu *e_cal_menu_new(const char *menuid); +ECalMenu *e_cal_menu_new(const gchar *menuid); ECalMenuTargetSelect *e_cal_menu_target_new_select(ECalMenu *emp, struct _ECalModel *model, GPtrArray *events); diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c index dac641ab4c..25bb9364d3 100644 --- a/calendar/gui/e-cal-model-calendar.c +++ b/calendar/gui/e-cal-model-calendar.c @@ -40,15 +40,15 @@ struct _ECalModelCalendarPrivate { }; static void e_cal_model_calendar_finalize (GObject *object); -static int ecmc_column_count (ETableModel *etm); -static void *ecmc_value_at (ETableModel *etm, int col, int row); -static void ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value); -static gboolean ecmc_is_cell_editable (ETableModel *etm, int col, int row); -static void *ecmc_duplicate_value (ETableModel *etm, int col, const void *value); -static void ecmc_free_value (ETableModel *etm, int col, void *value); -static void *ecmc_initialize_value (ETableModel *etm, int col); -static gboolean ecmc_value_is_empty (ETableModel *etm, int col, const void *value); -static char *ecmc_value_to_string (ETableModel *etm, int col, const void *value); +static gint ecmc_column_count (ETableModel *etm); +static gpointer ecmc_value_at (ETableModel *etm, gint col, gint row); +static void ecmc_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value); +static gboolean ecmc_is_cell_editable (ETableModel *etm, gint col, gint row); +static gpointer ecmc_duplicate_value (ETableModel *etm, gint col, gconstpointer value); +static void ecmc_free_value (ETableModel *etm, gint col, gpointer value); +static gpointer ecmc_initialize_value (ETableModel *etm, gint col); +static gboolean ecmc_value_is_empty (ETableModel *etm, gint col, gconstpointer value); +static gchar *ecmc_value_to_string (ETableModel *etm, gint col, gconstpointer value); static void ecmc_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data, ETableModel *source_model, gint row); @@ -160,19 +160,19 @@ get_dtend (ECalModelCalendar *model, ECalModelComponent *comp_data) return comp_data->dtend; } -static void * +static gpointer get_location (ECalModelComponent *comp_data) { icalproperty *prop; prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_LOCATION_PROPERTY); if (prop) - return (void *) icalproperty_get_location (prop); + return (gpointer) icalproperty_get_location (prop); - return (void *) ""; + return (gpointer) ""; } -static void * +static gpointer get_transparency (ECalModelComponent *comp_data) { icalproperty *prop; @@ -193,8 +193,8 @@ get_transparency (ECalModelComponent *comp_data) return NULL; } -static void * -ecmc_value_at (ETableModel *etm, int col, int row) +static gpointer +ecmc_value_at (ETableModel *etm, gint col, gint row) { ECalModelComponent *comp_data; ECalModelCalendar *model = (ECalModelCalendar *) etm; @@ -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 (void *) ""; + return (gpointer) ""; switch (col) { case E_CAL_MODEL_CALENDAR_FIELD_DTEND : @@ -220,16 +220,16 @@ ecmc_value_at (ETableModel *etm, int col, int row) return get_transparency (comp_data); } - return (void *) ""; + return (gpointer) ""; } static void -set_dtend (ECalModelComponent *comp_data, const void *value) +set_dtend (ECalModelComponent *comp_data, gconstpointer value) { ECellDateEditValue *dv = (ECellDateEditValue *) value; icalproperty *prop; icalparameter *param; - const char *tzid; + const gchar *tzid; prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTEND_PROPERTY); if (prop) @@ -265,9 +265,9 @@ set_dtend (ECalModelComponent *comp_data, const void *value) /* If the TZID is set to "UTC", we don't want to save the TZID. */ if (tzid && strcmp (tzid, "UTC")) { if (param) { - icalparameter_set_tzid (param, (char *) tzid); + icalparameter_set_tzid (param, (gchar *) tzid); } else { - param = icalparameter_new_tzid ((char *) tzid); + param = icalparameter_new_tzid ((gchar *) tzid); icalproperty_add_parameter (prop, param); } } else if (param) { @@ -276,7 +276,7 @@ set_dtend (ECalModelComponent *comp_data, const void *value) } static void -set_location (ECalModelComponent *comp_data, const void *value) +set_location (ECalModelComponent *comp_data, gconstpointer value) { icalproperty *prop; @@ -289,16 +289,16 @@ set_location (ECalModelComponent *comp_data, const void *value) } } else { if (prop) - icalproperty_set_location (prop, (const char *) value); + icalproperty_set_location (prop, (const gchar *) value); else { - prop = icalproperty_new_location ((const char *) value); + prop = icalproperty_new_location ((const gchar *) value); icalcomponent_add_property (comp_data->icalcomp, prop); } } } static void -set_transparency (ECalModelComponent *comp_data, const void *value) +set_transparency (ECalModelComponent *comp_data, gconstpointer value) { icalproperty *prop; @@ -335,7 +335,7 @@ set_transparency (ECalModelComponent *comp_data, const void *value) } static void -ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value) +ecmc_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value) { ECalModelComponent *comp_data; CalObjModType mod = CALOBJ_MOD_ALL; @@ -391,7 +391,7 @@ ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value) if (mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (comp)) { /* Ensure we send the master object, not the instance only */ icalcomponent *icalcomp = NULL; - const char *uid = NULL; + const gchar *uid = NULL; e_cal_component_get_uid (comp, &uid); if (e_cal_get_object (comp_data->client, uid, NULL, &icalcomp, NULL) && icalcomp) { @@ -420,7 +420,7 @@ ecmc_set_value_at (ETableModel *etm, int col, int row, const void *value) } static gboolean -ecmc_is_cell_editable (ETableModel *etm, int col, int row) +ecmc_is_cell_editable (ETableModel *etm, gint col, gint row) { ECalModelCalendar *model = (ECalModelCalendar *) etm; @@ -444,8 +444,8 @@ ecmc_is_cell_editable (ETableModel *etm, int col, int row) return FALSE; } -static void * -ecmc_duplicate_value (ETableModel *etm, int col, const void *value) +static gpointer +ecmc_duplicate_value (ETableModel *etm, gint col, gconstpointer value) { g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, NULL); @@ -473,7 +473,7 @@ ecmc_duplicate_value (ETableModel *etm, int col, const void *value) } static void -ecmc_free_value (ETableModel *etm, int col, void *value) +ecmc_free_value (ETableModel *etm, gint col, gpointer value) { g_return_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST); @@ -492,8 +492,8 @@ ecmc_free_value (ETableModel *etm, int col, void *value) } } -static void * -ecmc_initialize_value (ETableModel *etm, int col) +static gpointer +ecmc_initialize_value (ETableModel *etm, gint col) { g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, NULL); @@ -512,7 +512,7 @@ ecmc_initialize_value (ETableModel *etm, int col) } static gboolean -ecmc_value_is_empty (ETableModel *etm, int col, const void *value) +ecmc_value_is_empty (ETableModel *etm, gint col, gconstpointer value) { g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, TRUE); @@ -530,8 +530,8 @@ ecmc_value_is_empty (ETableModel *etm, int col, const void *value) return TRUE; } -static char * -ecmc_value_to_string (ETableModel *etm, int col, const void *value) +static gchar * +ecmc_value_to_string (ETableModel *etm, gint col, gconstpointer value) { g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, g_strdup ("")); diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c index 95fe5f1572..904868adfe 100644 --- a/calendar/gui/e-cal-model-memos.c +++ b/calendar/gui/e-cal-model-memos.c @@ -36,20 +36,20 @@ #define d(x) (x) struct _ECalModelMemosPrivate { - int dummy; + gint dummy; }; static void e_cal_model_memos_finalize (GObject *object); -static int ecmm_column_count (ETableModel *etm); -static void *ecmm_value_at (ETableModel *etm, int col, int row); -static void ecmm_set_value_at (ETableModel *etm, int col, int row, const void *value); -static gboolean ecmm_is_cell_editable (ETableModel *etm, int col, int row); -static void *ecmm_duplicate_value (ETableModel *etm, int col, const void *value); -static void ecmm_free_value (ETableModel *etm, int col, void *value); -static void *ecmm_initialize_value (ETableModel *etm, int col); -static gboolean ecmm_value_is_empty (ETableModel *etm, int col, const void *value); -static char *ecmm_value_to_string (ETableModel *etm, int col, const void *value); +static gint ecmm_column_count (ETableModel *etm); +static gpointer ecmm_value_at (ETableModel *etm, gint col, gint row); +static void ecmm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value); +static gboolean ecmm_is_cell_editable (ETableModel *etm, gint col, gint row); +static gpointer ecmm_duplicate_value (ETableModel *etm, gint col, gconstpointer value); +static void ecmm_free_value (ETableModel *etm, gint col, gpointer value); +static gpointer ecmm_initialize_value (ETableModel *etm, gint col); +static gboolean ecmm_value_is_empty (ETableModel *etm, gint col, gconstpointer value); +static gchar *ecmm_value_to_string (ETableModel *etm, gint col, gconstpointer value); static void ecmm_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data, ETableModel *source_model, gint row); @@ -114,8 +114,8 @@ ecmm_column_count (ETableModel *etm) return E_CAL_MODEL_MEMOS_FIELD_LAST; } -static void * -ecmm_value_at (ETableModel *etm, int col, int row) +static gpointer +ecmm_value_at (ETableModel *etm, gint col, gint row) { ECalModelComponent *comp_data; ECalModelMemos *model = (ECalModelMemos *) etm; @@ -130,14 +130,14 @@ 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 (void *) ""; + return (gpointer) ""; - return (void *) ""; + return (gpointer) ""; } static void -ecmm_set_value_at (ETableModel *etm, int col, int row, const void *value) +ecmm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value) { ECalModelComponent *comp_data; ECalModelMemos *model = (ECalModelMemos *) etm; @@ -166,7 +166,7 @@ ecmm_set_value_at (ETableModel *etm, int col, int row, const void *value) } static gboolean -ecmm_is_cell_editable (ETableModel *etm, int col, int row) +ecmm_is_cell_editable (ETableModel *etm, gint col, gint row) { ECalModelMemos *model = (ECalModelMemos *) etm; gboolean retval = FALSE; @@ -184,8 +184,8 @@ ecmm_is_cell_editable (ETableModel *etm, int col, int row) return retval; } -static void * -ecmm_duplicate_value (ETableModel *etm, int col, const void *value) +static gpointer +ecmm_duplicate_value (ETableModel *etm, gint col, gconstpointer value) { g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_MEMOS_FIELD_LAST, NULL); @@ -196,7 +196,7 @@ ecmm_duplicate_value (ETableModel *etm, int col, const void *value) } static void -ecmm_free_value (ETableModel *etm, int col, void *value) +ecmm_free_value (ETableModel *etm, gint col, gpointer value) { g_return_if_fail (col >= 0 && col < E_CAL_MODEL_MEMOS_FIELD_LAST); @@ -206,8 +206,8 @@ ecmm_free_value (ETableModel *etm, int col, void *value) } } -static void * -ecmm_initialize_value (ETableModel *etm, int col) +static gpointer +ecmm_initialize_value (ETableModel *etm, gint col) { g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_MEMOS_FIELD_LAST, NULL); @@ -218,7 +218,7 @@ ecmm_initialize_value (ETableModel *etm, int col) } static gboolean -ecmm_value_is_empty (ETableModel *etm, int col, const void *value) +ecmm_value_is_empty (ETableModel *etm, gint col, gconstpointer value) { g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_MEMOS_FIELD_LAST, TRUE); @@ -228,8 +228,8 @@ ecmm_value_is_empty (ETableModel *etm, int col, const void *value) return TRUE; } -static char * -ecmm_value_to_string (ETableModel *etm, int col, const void *value) +static gchar * +ecmm_value_to_string (ETableModel *etm, gint col, gconstpointer value) { g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_MEMOS_FIELD_LAST, g_strdup ("")); diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index a2b9eb6f2f..3ec7626d77 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -42,17 +42,17 @@ struct _ECalModelTasksPrivate { static void e_cal_model_tasks_finalize (GObject *object); -static int ecmt_column_count (ETableModel *etm); -static void *ecmt_value_at (ETableModel *etm, int col, int row); -static void ecmt_set_value_at (ETableModel *etm, int col, int row, const void *value); -static gboolean ecmt_is_cell_editable (ETableModel *etm, int col, int row); -static void *ecmt_duplicate_value (ETableModel *etm, int col, const void *value); -static void ecmt_free_value (ETableModel *etm, int col, void *value); -static void *ecmt_initialize_value (ETableModel *etm, int col); -static gboolean ecmt_value_is_empty (ETableModel *etm, int col, const void *value); -static char *ecmt_value_to_string (ETableModel *etm, int col, const void *value); - -static const char *ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data); +static gint ecmt_column_count (ETableModel *etm); +static gpointer ecmt_value_at (ETableModel *etm, gint col, gint row); +static void ecmt_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value); +static gboolean ecmt_is_cell_editable (ETableModel *etm, gint col, gint row); +static gpointer ecmt_duplicate_value (ETableModel *etm, gint col, gconstpointer value); +static void ecmt_free_value (ETableModel *etm, gint col, gpointer value); +static gpointer ecmt_initialize_value (ETableModel *etm, gint col); +static gboolean ecmt_value_is_empty (ETableModel *etm, gint col, gconstpointer value); +static gchar *ecmt_value_to_string (ETableModel *etm, gint col, gconstpointer value); + +static const gchar *ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data); static void ecmt_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data, ETableModel *source_model, gint row); static void commit_component_changes (ECalModelComponent *comp_data); @@ -289,7 +289,7 @@ get_due (ECalModelComponent *comp_data) return comp_data->due; } -static void * +static gpointer get_geo (ECalModelComponent *comp_data) { icalproperty *prop; @@ -307,7 +307,7 @@ get_geo (ECalModelComponent *comp_data) return buf; } - return (void *) ""; + return (gpointer) ""; } static int @@ -322,7 +322,7 @@ get_percent (ECalModelComponent *comp_data) return 0; } -static void * +static gpointer 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 (void *) ""; + return (gpointer) ""; } static gboolean @@ -344,7 +344,7 @@ is_status_canceled (ECalModelComponent *comp_data) return prop && icalproperty_get_status (prop) == ICAL_STATUS_CANCELLED; } -static void * +static gpointer 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 (void *) ""; + return (gpointer) ""; case ICAL_STATUS_NEEDSACTION: - return (void *) _("Not Started"); + return (gpointer) _("Not Started"); case ICAL_STATUS_INPROCESS: - return (void *) _("In Progress"); + return (gpointer) _("In Progress"); case ICAL_STATUS_COMPLETED: - return (void *) _("Completed"); + return (gpointer) _("Completed"); case ICAL_STATUS_CANCELLED: - return (void *) _("Canceled"); + return (gpointer) _("Canceled"); default: - return (void *) ""; + return (gpointer) ""; } } - return (void *) ""; + return (gpointer) ""; } -static void * +static gpointer get_url (ECalModelComponent *comp_data) { icalproperty *prop; prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY); if (prop) - return (void *) icalproperty_get_url (prop); + return (gpointer) icalproperty_get_url (prop); - return (void *) ""; + return (gpointer) ""; } static gboolean @@ -431,7 +431,7 @@ get_due_status (ECalModelTasks *model, ECalModelComponent *comp_data) /* Third, are we overdue as of right now? */ due_tt = icalproperty_get_due (prop); if (due_tt.is_date) { - int cmp; + gint cmp; now_tt = icaltime_current_time_with_zone (e_cal_model_get_timezone (E_CAL_MODEL (model))); cmp = icaltime_compare_date_only (due_tt, now_tt); @@ -444,7 +444,7 @@ get_due_status (ECalModelTasks *model, ECalModelComponent *comp_data) return E_CAL_MODEL_TASKS_DUE_FUTURE; } else { icalparameter *param; - const char *tzid; + const gchar *tzid; if(!(param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER))) return E_CAL_MODEL_TASKS_DUE_FUTURE; @@ -483,8 +483,8 @@ is_overdue (ECalModelTasks *model, ECalModelComponent *comp_data) return FALSE; } -static void * -ecmt_value_at (ETableModel *etm, int col, int row) +static gpointer +ecmt_value_at (ETableModel *etm, gint col, gint row) { ECalModelComponent *comp_data; ECalModelTasks *model = (ECalModelTasks *) etm; @@ -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 (void *) ""; + return (gpointer) ""; switch (col) { case E_CAL_MODEL_TASKS_FIELD_COMPLETED : @@ -524,11 +524,11 @@ ecmt_value_at (ETableModel *etm, int col, int row) return get_url (comp_data); } - return (void *) ""; + return (gpointer) ""; } static void -set_completed (ECalModelTasks *model, ECalModelComponent *comp_data, const void *value) +set_completed (ECalModelTasks *model, ECalModelComponent *comp_data, gconstpointer value) { ECellDateEditValue *dv = (ECellDateEditValue *) value; @@ -553,7 +553,7 @@ set_completed (ECalModelTasks *model, ECalModelComponent *comp_data, const void } static void -set_complete (ECalModelComponent *comp_data, const void *value) +set_complete (ECalModelComponent *comp_data, gconstpointer value) { gint state = GPOINTER_TO_INT (value); @@ -564,12 +564,12 @@ set_complete (ECalModelComponent *comp_data, const void *value) } static void -set_due (ECalModelComponent *comp_data, const void *value) +set_due (ECalModelComponent *comp_data, gconstpointer value) { ECellDateEditValue *dv = (ECellDateEditValue *) value; icalproperty *prop; icalparameter *param; - const char *tzid; + const gchar *tzid; prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DUE_PROPERTY); if (prop) @@ -605,9 +605,9 @@ set_due (ECalModelComponent *comp_data, const void *value) /* If the TZID is set to "UTC", we don't want to save the TZID. */ if (tzid && strcmp (tzid, "UTC")) { if (param) { - icalparameter_set_tzid (param, (char *) tzid); + icalparameter_set_tzid (param, (gchar *) tzid); } else { - param = icalparameter_new_tzid ((char *) tzid); + param = icalparameter_new_tzid ((gchar *) tzid); icalproperty_add_parameter (prop, param); } } else if (param) { @@ -630,10 +630,10 @@ show_geo_warning (void) } static void -set_geo (ECalModelComponent *comp_data, const char *value) +set_geo (ECalModelComponent *comp_data, const gchar *value) { double latitude, longitude; - int matched; + gint matched; struct icalgeotype geo; icalproperty *prop; @@ -662,7 +662,7 @@ set_geo (ECalModelComponent *comp_data, const char *value) } static void -set_status (ECalModelComponent *comp_data, const char *value) +set_status (ECalModelComponent *comp_data, const gchar *value) { icalproperty_status status; icalproperty *prop; @@ -716,7 +716,7 @@ set_status (ECalModelComponent *comp_data, const char *value) } static void -set_percent (ECalModelComponent *comp_data, const void *value) +set_percent (ECalModelComponent *comp_data, gconstpointer value) { icalproperty *prop; gint percent = GPOINTER_TO_INT (value); @@ -758,10 +758,10 @@ set_percent (ECalModelComponent *comp_data, const void *value) } static void -set_priority (ECalModelComponent *comp_data, const char *value) +set_priority (ECalModelComponent *comp_data, const gchar *value) { icalproperty *prop; - int priority; + gint priority; prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PRIORITY_PROPERTY); @@ -780,7 +780,7 @@ set_priority (ECalModelComponent *comp_data, const char *value) } static void -set_url (ECalModelComponent *comp_data, const char *value) +set_url (ECalModelComponent *comp_data, const gchar *value) { icalproperty *prop; @@ -802,7 +802,7 @@ set_url (ECalModelComponent *comp_data, const char *value) } static void -ecmt_set_value_at (ETableModel *etm, int col, int row, const void *value) +ecmt_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value) { ECalModelComponent *comp_data; ECalModelTasks *model = (ECalModelTasks *) etm; @@ -852,7 +852,7 @@ ecmt_set_value_at (ETableModel *etm, int col, int row, const void *value) } static gboolean -ecmt_is_cell_editable (ETableModel *etm, int col, int row) +ecmt_is_cell_editable (ETableModel *etm, gint col, gint row) { ECalModelTasks *model = (ECalModelTasks *) etm; @@ -882,8 +882,8 @@ ecmt_is_cell_editable (ETableModel *etm, int col, int row) return FALSE; } -static void * -ecmt_duplicate_value (ETableModel *etm, int col, const void *value) +static gpointer +ecmt_duplicate_value (ETableModel *etm, gint col, gconstpointer value) { g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST, NULL); @@ -912,14 +912,14 @@ ecmt_duplicate_value (ETableModel *etm, int col, const void *value) case E_CAL_MODEL_TASKS_FIELD_COMPLETE : case E_CAL_MODEL_TASKS_FIELD_PERCENT : case E_CAL_MODEL_TASKS_FIELD_OVERDUE : - return (void *) value; + return (gpointer) value; } return NULL; } static void -ecmt_free_value (ETableModel *etm, int col, void *value) +ecmt_free_value (ETableModel *etm, gint col, gpointer value) { g_return_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST); @@ -945,8 +945,8 @@ ecmt_free_value (ETableModel *etm, int col, void *value) } } -static void * -ecmt_initialize_value (ETableModel *etm, int col) +static gpointer +ecmt_initialize_value (ETableModel *etm, gint col) { ECalModelTasks *model = (ECalModelTasks *) etm; @@ -975,7 +975,7 @@ ecmt_initialize_value (ETableModel *etm, int col) } static gboolean -ecmt_value_is_empty (ETableModel *etm, int col, const void *value) +ecmt_value_is_empty (ETableModel *etm, gint col, gconstpointer value) { ECalModelTasks *model = (ECalModelTasks *) etm; @@ -1004,8 +1004,8 @@ ecmt_value_is_empty (ETableModel *etm, int col, const void *value) return TRUE; } -static char * -ecmt_value_to_string (ETableModel *etm, int col, const void *value) +static gchar * +ecmt_value_to_string (ETableModel *etm, gint col, gconstpointer value) { ECalModelTasks *model = (ECalModelTasks *) etm; @@ -1039,7 +1039,7 @@ ecmt_value_to_string (ETableModel *etm, int col, const void *value) /* ECalModel class methods */ -static const char * +static const gchar * ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) { static gchar color_spec[16]; @@ -1077,7 +1077,7 @@ static void ecmt_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data, ETableModel *source_model, gint row) { - void *value; + gpointer value; g_return_if_fail (E_IS_CAL_MODEL_TASKS (model)); g_return_if_fail (comp_data != NULL); diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 19844a7560..df41fa5fae 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -90,19 +90,19 @@ struct _ECalModelPrivate { static void e_cal_model_dispose (GObject *object); static void e_cal_model_finalize (GObject *object); -static int ecm_column_count (ETableModel *etm); -static int ecm_row_count (ETableModel *etm); -static void *ecm_value_at (ETableModel *etm, int col, int row); -static void ecm_set_value_at (ETableModel *etm, int col, int row, const void *value); -static gboolean ecm_is_cell_editable (ETableModel *etm, int col, int row); -static void ecm_append_row (ETableModel *etm, ETableModel *source, int row); -static void *ecm_duplicate_value (ETableModel *etm, int col, const void *value); -static void ecm_free_value (ETableModel *etm, int col, void *value); -static void *ecm_initialize_value (ETableModel *etm, int col); -static gboolean ecm_value_is_empty (ETableModel *etm, int col, const void *value); -static char *ecm_value_to_string (ETableModel *etm, int col, const void *value); - -static const char *ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data); +static gint ecm_column_count (ETableModel *etm); +static gint ecm_row_count (ETableModel *etm); +static gpointer ecm_value_at (ETableModel *etm, gint col, gint row); +static void ecm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value); +static gboolean ecm_is_cell_editable (ETableModel *etm, gint col, gint row); +static void ecm_append_row (ETableModel *etm, ETableModel *source, gint row); +static gpointer ecm_duplicate_value (ETableModel *etm, gint col, gconstpointer value); +static void ecm_free_value (ETableModel *etm, gint col, gpointer value); +static gpointer ecm_initialize_value (ETableModel *etm, gint col); +static gboolean ecm_value_is_empty (ETableModel *etm, gint col, gconstpointer value); +static gchar *ecm_value_to_string (ETableModel *etm, gint col, gconstpointer value); + +static const gchar *ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data); static ECalModelClient *add_new_client (ECalModel *model, ECal *client, gboolean do_query); static ECalModelClient *find_client_data (ECalModel *model, ECal *client); @@ -317,19 +317,19 @@ ecm_row_count (ETableModel *etm) return priv->objects->len; } -static void * +static gpointer get_categories (ECalModelComponent *comp_data) { icalproperty *prop; prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_CATEGORIES_PROPERTY); if (prop) - return (void *) icalproperty_get_categories (prop); + return (gpointer) icalproperty_get_categories (prop); - return (void *) ""; + return (gpointer) ""; } -static char * +static gchar * get_classification (ECalModelComponent *comp_data) { icalproperty *prop; @@ -355,7 +355,7 @@ get_classification (ECalModelComponent *comp_data) } } -static const char * +static const gchar * get_color (ECalModel *model, ECalModelComponent *comp_data) { g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL); @@ -363,7 +363,7 @@ get_color (ECalModel *model, ECalModelComponent *comp_data) return e_cal_model_get_color_for_component (model, comp_data); } -static void * +static gpointer get_description (ECalModelComponent *comp_data) { icalproperty *prop; @@ -384,7 +384,7 @@ get_description (ECalModelComponent *comp_data) return str->str; } - return (void *) ""; + return (gpointer) ""; } static ECellDateEditValue* @@ -472,26 +472,26 @@ get_datetime_from_utc (ECalModel *model, ECalModelComponent *comp_data, icalprop return res; } -static void * +static gpointer get_summary (ECalModelComponent *comp_data) { icalproperty *prop; prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_SUMMARY_PROPERTY); if (prop) - return (void *) icalproperty_get_summary (prop); + return (gpointer) icalproperty_get_summary (prop); - return (void *) ""; + return (gpointer) ""; } -static char * +static gchar * get_uid (ECalModelComponent *comp_data) { - return (char *) icalcomponent_get_uid (comp_data->icalcomp); + return (gchar *) icalcomponent_get_uid (comp_data->icalcomp); } -static void * -ecm_value_at (ETableModel *etm, int col, int row) +static gpointer +ecm_value_at (ETableModel *etm, gint col, gint row) { ECalModelPrivate *priv; ECalModelComponent *comp_data; @@ -514,17 +514,17 @@ ecm_value_at (ETableModel *etm, int col, int row) case E_CAL_MODEL_FIELD_CLASSIFICATION : return get_classification (comp_data); case E_CAL_MODEL_FIELD_COLOR : - return (void *) get_color (model, comp_data); + return (gpointer) get_color (model, comp_data); case E_CAL_MODEL_FIELD_COMPONENT : return comp_data->icalcomp; case E_CAL_MODEL_FIELD_DESCRIPTION : return get_description (comp_data); case E_CAL_MODEL_FIELD_DTSTART : - return (void *) get_dtstart (model, comp_data); + return (gpointer) get_dtstart (model, comp_data); case E_CAL_MODEL_FIELD_CREATED : - return (void *) get_datetime_from_utc (model, comp_data, ICAL_CREATED_PROPERTY, icalproperty_get_created, &comp_data->created); + return (gpointer) get_datetime_from_utc (model, comp_data, ICAL_CREATED_PROPERTY, icalproperty_get_created, &comp_data->created); case E_CAL_MODEL_FIELD_LASTMODIFIED : - return (void *) get_datetime_from_utc (model, comp_data, ICAL_LASTMODIFIED_PROPERTY, icalproperty_get_lastmodified, &comp_data->lastmodified); + return (gpointer) get_datetime_from_utc (model, comp_data, ICAL_LASTMODIFIED_PROPERTY, icalproperty_get_lastmodified, &comp_data->lastmodified); case E_CAL_MODEL_FIELD_HAS_ALARMS : return GINT_TO_POINTER ((icalcomponent_get_first_component (comp_data->icalcomp, ICAL_VALARM_COMPONENT) != NULL)); @@ -552,7 +552,7 @@ ecm_value_at (ETableModel *etm, int col, int row) e_cal_component_get_attendee_list (comp, &attendees); for (sl = attendees; sl != NULL; sl = sl->next) { ECalComponentAttendee *ca = sl->data; - const char *text; + const gchar *text; text = itip_strip_mailto (ca->value); if (e_account_list_find (priv->accounts, E_ACCOUNT_FIND_ID_ADDRESS, text) != NULL) { @@ -579,11 +579,11 @@ ecm_value_at (ETableModel *etm, int col, int row) return get_uid (comp_data); } - return (void *) ""; + return (gpointer) ""; } static void -set_categories (ECalModelComponent *comp_data, const char *value) +set_categories (ECalModelComponent *comp_data, const gchar *value) { icalproperty *prop; @@ -603,7 +603,7 @@ set_categories (ECalModelComponent *comp_data, const char *value) } static void -set_classification (ECalModelComponent *comp_data, const char *value) +set_classification (ECalModelComponent *comp_data, const gchar *value) { icalproperty *prop; @@ -634,7 +634,7 @@ set_classification (ECalModelComponent *comp_data, const char *value) } static void -set_description (ECalModelComponent *comp_data, const char *value) +set_description (ECalModelComponent *comp_data, const gchar *value) { icalproperty *prop; @@ -660,12 +660,12 @@ set_description (ECalModelComponent *comp_data, const char *value) } static void -set_dtstart (ECalModel *model, ECalModelComponent *comp_data, const void *value) +set_dtstart (ECalModel *model, ECalModelComponent *comp_data, gconstpointer value) { ECellDateEditValue *dv = (ECellDateEditValue *) value; icalproperty *prop; icalparameter *param; - const char *tzid; + const gchar *tzid; prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTSTART_PROPERTY); if (prop) @@ -701,9 +701,9 @@ set_dtstart (ECalModel *model, ECalModelComponent *comp_data, const void *value) /* If the TZID is set to "UTC", we don't want to save the TZID. */ if (tzid && strcmp (tzid, "UTC")) { if (param) { - icalparameter_set_tzid (param, (char *) tzid); + icalparameter_set_tzid (param, (gchar *) tzid); } else { - param = icalparameter_new_tzid ((char *) tzid); + param = icalparameter_new_tzid ((gchar *) tzid); icalproperty_add_parameter (prop, param); } } else if (param) { @@ -712,7 +712,7 @@ set_dtstart (ECalModel *model, ECalModelComponent *comp_data, const void *value) } static void -set_summary (ECalModelComponent *comp_data, const char *value) +set_summary (ECalModelComponent *comp_data, const gchar *value) { icalproperty *prop; @@ -734,7 +734,7 @@ set_summary (ECalModelComponent *comp_data, const char *value) } static void -ecm_set_value_at (ETableModel *etm, int col, int row, const void *value) +ecm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value) { ECalModelPrivate *priv; ECalModelComponent *comp_data; @@ -785,7 +785,7 @@ ecm_set_value_at (ETableModel *etm, int col, int row, const void *value) * @return Whether row is editable or not. **/ gboolean -e_cal_model_test_row_editable (ECalModel *model, int row) +e_cal_model_test_row_editable (ECalModel *model, gint row) { gboolean readonly; ECal *cal = NULL; @@ -812,7 +812,7 @@ e_cal_model_test_row_editable (ECalModel *model, int row) } static gboolean -ecm_is_cell_editable (ETableModel *etm, int col, int row) +ecm_is_cell_editable (ETableModel *etm, gint col, gint row) { ECalModelPrivate *priv; ECalModel *model = (ECalModel *) etm; @@ -840,7 +840,7 @@ ecm_is_cell_editable (ETableModel *etm, int col, int row) } static void -ecm_append_row (ETableModel *etm, ETableModel *source, int row) +ecm_append_row (ETableModel *etm, ETableModel *source, gint row) { ECalModelClass *model_class; ECalModelComponent comp_data; @@ -901,8 +901,8 @@ ecm_append_row (ETableModel *etm, ETableModel *source, int row) g_signal_emit (G_OBJECT (model), signals[ROW_APPENDED], 0); } -static void * -ecm_duplicate_value (ETableModel *etm, int col, const void *value) +static gpointer +ecm_duplicate_value (ETableModel *etm, gint col, gconstpointer value) { g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST, NULL); @@ -915,7 +915,7 @@ ecm_duplicate_value (ETableModel *etm, int col, const void *value) case E_CAL_MODEL_FIELD_HAS_ALARMS : case E_CAL_MODEL_FIELD_ICON : case E_CAL_MODEL_FIELD_COLOR : - return (void *) value; + return (gpointer) value; case E_CAL_MODEL_FIELD_COMPONENT : return icalcomponent_new_clone ((icalcomponent *) value); case E_CAL_MODEL_FIELD_DTSTART : @@ -937,7 +937,7 @@ ecm_duplicate_value (ETableModel *etm, int col, const void *value) } static void -ecm_free_value (ETableModel *etm, int col, void *value) +ecm_free_value (ETableModel *etm, gint col, gpointer value) { g_return_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST); @@ -966,8 +966,8 @@ ecm_free_value (ETableModel *etm, int col, void *value) } } -static void * -ecm_initialize_value (ETableModel *etm, int col) +static gpointer +ecm_initialize_value (ETableModel *etm, gint col) { ECalModelPrivate *priv; ECalModel *model = (ECalModel *) etm; @@ -998,7 +998,7 @@ ecm_initialize_value (ETableModel *etm, int col) } static gboolean -ecm_value_is_empty (ETableModel *etm, int col, const void *value) +ecm_value_is_empty (ETableModel *etm, gint col, gconstpointer value) { ECalModelPrivate *priv; ECalModel *model = (ECalModel *) etm; @@ -1038,8 +1038,8 @@ ecm_value_is_empty (ETableModel *etm, int col, const void *value) return TRUE; } -static char * -ecm_value_to_string (ETableModel *etm, int col, const void *value) +static gchar * +ecm_value_to_string (ETableModel *etm, gint col, gconstpointer value) { g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_FIELD_LAST, g_strdup ("")); @@ -1077,7 +1077,7 @@ typedef struct { GList *uris; } AssignedColorData; -static const char * +static const gchar * ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) { ESource *source; @@ -1115,7 +1115,7 @@ ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) } for (l = assigned_colors[i].uris; l != NULL; l = l->next) { - if (!strcmp ((const char *) l->data, + if (!strcmp ((const gchar *) l->data, e_cal_get_uri (comp_data->client))) { return assigned_colors[i].color; @@ -1341,7 +1341,7 @@ e_cal_model_get_client_list (ECalModel *model) * @uri: Uri for the client to get. */ ECal * -e_cal_model_get_client_for_uri (ECalModel *model, const char *uri) +e_cal_model_get_client_for_uri (ECalModel *model, const gchar *uri) { GList *l; @@ -1385,8 +1385,8 @@ search_by_id_and_client (ECalModelPrivate *priv, ECal *client, const ECalCompone ECalModelComponent *comp_data = g_ptr_array_index (priv->objects, i); if (comp_data) { - const char *uid; - char *rid = NULL; + const gchar *uid; + gchar *rid = NULL; struct icaltimetype icalrid; gboolean has_rid = (id->rid && *id->rid); @@ -1518,7 +1518,7 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data /* remove the components if they are already present and re-add them */ while ((comp_data = search_by_id_and_client (priv, client, id))) { - int pos; + gint pos; GSList *list = NULL; pos = get_position_in_array (priv->objects, comp_data); @@ -1579,7 +1579,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d if (!e_cal_util_component_is_instance (l->data) && e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) list = g_list_prepend (list, l->data); else { - int pos; + gint pos; ECalModelComponent *comp_data; ECalComponentId *id; ECalComponent *comp = e_cal_component_new (); @@ -1660,7 +1660,7 @@ e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer user_data) for (l = ids; l; l = l->next) { ECalModelComponent *comp_data = NULL; ECalComponentId *id = l->data; - int pos; + gint pos; /* make sure we remove all objects with this UID */ while ((comp_data = search_by_id_and_client (priv, e_cal_view_get_client (query), id))) { @@ -1687,7 +1687,7 @@ e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer user_data) } static void -e_cal_view_progress_cb (ECalView *query, const char *message, int percent, gpointer user_data) +e_cal_view_progress_cb (ECalView *query, const gchar *message, gint percent, gpointer user_data) { ECalModel *model = (ECalModel *) user_data; ECal *client = e_cal_view_get_client (query); @@ -1861,7 +1861,7 @@ e_cal_model_add_client (ECalModel *model, ECal *client) static void remove_client_objects (ECalModel *model, ECalModelClient *client_data) { - int i; + gint i; /* remove all objects belonging to this client */ for (i = model->priv->objects->len; i > 0; i--) { @@ -1981,7 +1981,7 @@ redo_queries (ECalModel *model) ECalModelPrivate *priv; GList *l; GSList *slist; - int len; + gint len; priv = model->priv; @@ -1989,7 +1989,7 @@ redo_queries (ECalModel *model) g_free (priv->full_sexp); if (priv->start != -1 && priv->end != -1) { - char *iso_start, *iso_end; + gchar *iso_start, *iso_end; iso_start = isodate_from_time_t (priv->start); iso_end = isodate_from_time_t (priv->end); @@ -2068,7 +2068,7 @@ e_cal_model_set_time_range (ECalModel *model, time_t start, time_t end) redo_queries (model); } -const char * +const gchar * e_cal_model_get_search_query (ECalModel *model) { ECalModelPrivate *priv; @@ -2085,7 +2085,7 @@ e_cal_model_get_search_query (ECalModel *model) * e_cal_model_set_query */ void -e_cal_model_set_search_query (ECalModel *model, const char *sexp) +e_cal_model_set_search_query (ECalModel *model, const gchar *sexp) { ECalModelPrivate *priv; @@ -2108,7 +2108,7 @@ e_cal_model_set_search_query (ECalModel *model, const char *sexp) * e_cal_model_set_query */ void -e_cal_model_set_search_query_with_time_range (ECalModel *model, const char *sexp, time_t start, time_t end) +e_cal_model_set_search_query_with_time_range (ECalModel *model, const gchar *sexp, time_t start, time_t end) { ECalModelPrivate *priv; gboolean do_query = FALSE; @@ -2178,7 +2178,7 @@ e_cal_model_create_component_with_defaults (ECalModel *model) /* make sure the component has an UID */ if (!icalcomponent_get_uid (icalcomp)) { - char *uid; + gchar *uid; uid = e_cal_component_gen_uid (); icalcomponent_set_uid (icalcomp, uid); @@ -2268,14 +2268,14 @@ e_cal_model_get_component_for_uid (ECalModel *model, const ECalComponentId *id) /** * e_cal_model_date_value_to_string */ -gchar* -e_cal_model_date_value_to_string (ECalModel *model, const void *value) +gchar * +e_cal_model_date_value_to_string (ECalModel *model, gconstpointer value) { ECalModelPrivate *priv; ECellDateEditValue *dv = (ECellDateEditValue *) value; struct icaltimetype tt; struct tm tmp_tm; - char buffer[64]; + gchar buffer[64]; g_return_val_if_fail (E_IS_CAL_MODEL (model), g_strdup ("")); @@ -2320,7 +2320,7 @@ copy_ecdv (ECellDateEditValue *ecdv) struct _ECalModelComponentPrivate { - char nouse; + gchar nouse; }; static void e_cal_model_component_finalize (GObject *object); @@ -2517,7 +2517,7 @@ e_cal_model_set_instance_times (ECalModelComponent *comp_data, const icaltimezon param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER); if (param) { - const char *tzid = NULL; + const gchar *tzid = NULL; icaltimezone *st_zone = NULL; tzid = icalparameter_get_tzid (param); @@ -2541,7 +2541,7 @@ e_cal_model_set_instance_times (ECalModelComponent *comp_data, const icaltimezon param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER); if (param) { - const char *tzid = NULL; + const gchar *tzid = NULL; icaltimezone *end_zone = NULL; tzid = icalparameter_get_tzid (param); diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index 4b266b6a5e..2c470840c8 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -121,7 +121,7 @@ typedef struct { void (* time_range_changed) (ECalModel *model, time_t start, time_t end); void (* row_appended) (ECalModel *model); void (* comps_deleted) (ECalModel *model, gpointer list); - void (* cal_view_progress) (ECalModel *model, const char *message, int progress, ECalSourceType type); + void (* cal_view_progress) (ECalModel *model, const gchar *message, gint progress, ECalSourceType type); void (* cal_view_done) (ECalModel *model, ECalendarStatus status, ECalSourceType type); } ECalModelClass; @@ -148,7 +148,7 @@ void e_cal_model_set_default_client (ECalModel ECal *client); GList *e_cal_model_get_client_list (ECalModel *model); ECal *e_cal_model_get_client_for_uri (ECalModel *model, - const char *uri); + const gchar *uri); void e_cal_model_add_client (ECalModel *model, ECal *client); void e_cal_model_remove_client (ECalModel *model, @@ -160,7 +160,7 @@ void e_cal_model_get_time_range (ECalModel void e_cal_model_set_time_range (ECalModel *model, time_t start, time_t end); -const char *e_cal_model_get_search_query (ECalModel *model); +const gchar *e_cal_model_get_search_query (ECalModel *model); void e_cal_model_set_search_query (ECalModel *model, const gchar *sexp); icalcomponent *e_cal_model_create_component_with_defaults (ECalModel *model); @@ -186,9 +186,9 @@ void e_cal_model_generate_instances (ECalModel gpointer cb_data); GPtrArray * e_cal_model_get_object_array (ECalModel *model); void e_cal_model_set_instance_times (ECalModelComponent *comp_data, const icaltimezone *zone); -void e_cal_model_set_search_query_with_time_range (ECalModel *model, const char *sexp, time_t start, time_t end); +void e_cal_model_set_search_query_with_time_range (ECalModel *model, const gchar *sexp, time_t start, time_t end); -gboolean e_cal_model_test_row_editable (ECalModel *model, int row); +gboolean e_cal_model_test_row_editable (ECalModel *model, gint row); void e_cal_model_set_default_time_func (ECalModel *model, ECalModelDefaultTimeFunc func, gpointer user_data); diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c index 76dcb94e19..ef94eb8ab2 100644 --- a/calendar/gui/e-cal-popup.c +++ b/calendar/gui/e-cal-popup.c @@ -67,7 +67,7 @@ ecalp_target_free(EPopup *ep, EPopupTarget *t) switch (t->type) { case E_CAL_POPUP_TARGET_SELECT: { ECalPopupTargetSelect *s = (ECalPopupTargetSelect *)t; - int i; + gint i; for (i=0;ievents->len;i++) e_cal_model_free_component_data(s->events->pdata[i]); @@ -114,7 +114,7 @@ e_cal_popup_get_type(void) return type; } -ECalPopup *e_cal_popup_new(const char *menuid) +ECalPopup *e_cal_popup_new(const gchar *menuid) { ECalPopup *eabp = g_object_new(e_cal_popup_get_type(), NULL); @@ -124,7 +124,7 @@ ECalPopup *e_cal_popup_new(const char *menuid) } static icalproperty * -get_attendee_prop (icalcomponent *icalcomp, const char *address) +get_attendee_prop (icalcomponent *icalcomp, const gchar *address) { icalproperty *prop; @@ -135,7 +135,7 @@ get_attendee_prop (icalcomponent *icalcomp, const char *address) for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY); prop; prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY)) { - const char *attendee = icalproperty_get_attendee (prop); + const gchar *attendee = icalproperty_get_attendee (prop); if (g_str_equal (itip_strip_mailto (attendee), address)) { return prop; @@ -145,11 +145,11 @@ get_attendee_prop (icalcomponent *icalcomp, const char *address) } static gboolean -is_delegated (icalcomponent *icalcomp, char *user_email) +is_delegated (icalcomponent *icalcomp, gchar *user_email) { icalproperty *prop; icalparameter *param; - const char *delto = NULL; + const gchar *delto = NULL; prop = get_attendee_prop (icalcomp, user_email); @@ -163,7 +163,7 @@ is_delegated (icalcomponent *icalcomp, char *user_email) prop = get_attendee_prop (icalcomp, itip_strip_mailto (delto)); if (prop) { - const char *delfrom = NULL; + const gchar *delfrom = NULL; icalparameter_partstat status = ICAL_PARTSTAT_NONE; param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER); @@ -181,7 +181,7 @@ is_delegated (icalcomponent *icalcomp, char *user_email) } static gboolean -needs_to_accept (icalcomponent *icalcomp, char *user_email) +needs_to_accept (icalcomponent *icalcomp, gchar *user_email) { icalproperty *prop; icalparameter *param; @@ -233,7 +233,7 @@ e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArr } else { ECalModelComponent *comp_data = (ECalModelComponent *)t->events->pdata[0]; ECalComponent *comp; - char *user_email = NULL; + gchar *user_email = NULL; comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (comp_data->icalcomp)); @@ -243,7 +243,7 @@ e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArr if (t->events->len == 1) mask &= ~E_CAL_POPUP_SELECT_ONE; else { - int i=0; + gint i=0; mask &= ~E_CAL_POPUP_SELECT_MANY; /* Now check for any incomplete tasks and set the flags*/ @@ -334,11 +334,11 @@ e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector) { ECalPopupTargetSource *t = e_popup_target_new(&eabp->popup, E_CAL_POPUP_TARGET_SOURCE, sizeof(*t)); guint32 mask = ~0; - const char *relative_uri; - char *uri; + const gchar *relative_uri; + gchar *uri; ESource *source; - const char *offline = NULL; - const char *delete = NULL; + const gchar *offline = NULL; + const gchar *delete = NULL; /* TODO: this is duplicated for addressbook too */ @@ -410,7 +410,7 @@ e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector) */ -static void *ecalph_parent_class; +static gpointer ecalph_parent_class; #define ecalph ((ECalPopupHook *)eph) static const EPopupHookTargetMask ecalph_select_masks[] = { @@ -473,7 +473,7 @@ ecalph_finalise(GObject *o) static void ecalph_class_init(EPluginHookClass *klass) { - int i; + gint i; ((GObjectClass *)klass)->finalize = ecalph_finalise; ((EPluginHookClass *)klass)->id = "org.gnome.evolution.calendar.popup:1.0"; diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h index 5c68b4829b..9887c66366 100644 --- a/calendar/gui/e-cal-popup.h +++ b/calendar/gui/e-cal-popup.h @@ -191,7 +191,7 @@ struct _ECalPopupClass { GType e_cal_popup_get_type(void); -ECalPopup *e_cal_popup_new(const char *menuid); +ECalPopup *e_cal_popup_new(const gchar *menuid); ECalPopupTargetSelect *e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArray *events); ECalPopupTargetSource *e_cal_popup_target_new_source(ECalPopup *eabp, struct _ESourceSelector *selector); diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index b8ce8d1c29..27cf7dbfeb 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -105,10 +105,10 @@ static gint e_calendar_table_on_key_press (ETable *table, static struct tm e_calendar_table_get_current_time (ECellDateEdit *ecde, gpointer data); -static void mark_as_complete_cb (EPopup *ep, EPopupItem *pitem, void *data); +static void mark_as_complete_cb (EPopup *ep, EPopupItem *pitem, gpointer data); -static void hide_completed_rows (ECalModel *model, GList *clients_list, char *hide_sexp, GPtrArray *comp_objects); -static void show_completed_rows (ECalModel *model, GList *clients_list, char *show_sexp, GPtrArray *comp_objects); +static void hide_completed_rows (ECalModel *model, GList *clients_list, gchar *hide_sexp, GPtrArray *comp_objects); +static void show_completed_rows (ECalModel *model, GList *clients_list, gchar *show_sexp, GPtrArray *comp_objects); /* Signal IDs */ enum { @@ -120,7 +120,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; /* The icons to represent the task. */ #define E_CALENDAR_MODEL_NUM_ICONS 4 -static const char* icon_names[E_CALENDAR_MODEL_NUM_ICONS] = { +static const gchar * icon_names[E_CALENDAR_MODEL_NUM_ICONS] = { "stock_task", "stock_task-recurring", "stock_task-assigned", "stock_task-assigned-to" }; static GdkPixbuf* icon_pixbufs[E_CALENDAR_MODEL_NUM_ICONS] = { NULL }; @@ -184,9 +184,9 @@ date_compare_cb (gconstpointer a, gconstpointer b) static gint percent_compare_cb (gconstpointer a, gconstpointer b) { - int percent1 = GPOINTER_TO_INT (a); - int percent2 = GPOINTER_TO_INT (b); - int retval; + gint percent1 = GPOINTER_TO_INT (a); + gint percent2 = GPOINTER_TO_INT (b); + gint retval; if (percent1 > percent2) retval = 1; @@ -201,10 +201,10 @@ percent_compare_cb (gconstpointer a, gconstpointer b) static gint priority_compare_cb (gconstpointer a, gconstpointer b) { - int priority1, priority2; + gint priority1, priority2; - priority1 = e_cal_util_priority_from_string ((const char*) a); - priority2 = e_cal_util_priority_from_string ((const char*) b); + priority1 = e_cal_util_priority_from_string ((const gchar *) a); + priority2 = e_cal_util_priority_from_string ((const gchar *) b); /* We change undefined priorities so they appear after 'Low'. */ if (priority1 <= 0) @@ -222,9 +222,9 @@ priority_compare_cb (gconstpointer a, gconstpointer b) } static gint -status_from_string (const char *str) +status_from_string (const gchar *str) { - int status = -2; + gint status = -2; if (!str || !str[0]) status = -1; @@ -243,8 +243,8 @@ status_from_string (const char *str) static gint status_compare_cb (gconstpointer a, gconstpointer b) { - int sa = status_from_string ((const char *)a); - int sb = status_from_string ((const char *)b); + gint sa = status_from_string ((const gchar *)a); + gint sb = status_from_string ((const gchar *)b); if (sa < sb) return -1; @@ -261,7 +261,7 @@ row_appended_cb (ECalModel *model, ECalendarTable *cal_table) } static void -get_time_as_text (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone, char *buff, int buff_len) +get_time_as_text (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone, gchar *buff, gint buff_len) { struct tm tmp_tm; @@ -278,20 +278,20 @@ gboolean ec_query_tooltip (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, GtkWidget *etable_wgt, ECalModel *model) { ECalModelComponent *comp; - int row = -1, col = -1; + gint row = -1, col = -1; GtkWidget *box, *l, *w; GtkStyle *style = gtk_widget_get_default_style (); - char *tmp; - const char *str; + gchar *tmp; + const gchar *str; GString *tmp2; - char buff[1001]; + gchar buff[1001]; gboolean free_text = FALSE; ECalComponent *new_comp; ECalComponentOrganizer organizer; ECalComponentDateTime dtstart, dtdue; icaltimezone *zone, *default_zone; GSList *desc, *p; - int len; + gint len; ETable *etable; ESelectionModel *esm; @@ -329,7 +329,7 @@ ec_query_tooltip (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, Gtk str = e_calendar_view_get_icalcomponent_summary (comp->client, comp->icalcomp, &free_text); if (!(str && *str)) { if (free_text) - g_free ((char *)str); + g_free ((gchar *)str); free_text = FALSE; str = _("* No Summary *"); } @@ -348,7 +348,7 @@ ec_query_tooltip (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, Gtk g_free (tmp); if (free_text) - g_free ((char *)str); + g_free ((gchar *)str); free_text = FALSE; w = gtk_event_box_new (); @@ -361,7 +361,7 @@ ec_query_tooltip (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, Gtk e_cal_component_get_organizer (new_comp, &organizer); if (organizer.cn) { - char *ptr ; + gchar *ptr ; ptr = strchr( organizer.value, ':'); if (ptr) { @@ -496,7 +496,7 @@ e_calendar_table_init (ECalendarTable *cal_table) GdkPixbuf *pixbuf; GList *strings; AtkObject *a11y; - char *etspecfile; + gchar *etspecfile; /* Create the model */ @@ -561,9 +561,9 @@ e_calendar_table_init (ECalendarTable *cal_table) g_object_unref (cell); strings = NULL; - strings = g_list_append (strings, (char*) _("Public")); - strings = g_list_append (strings, (char*) _("Private")); - strings = g_list_append (strings, (char*) _("Confidential")); + strings = g_list_append (strings, (gchar *) _("Public")); + strings = g_list_append (strings, (gchar *) _("Private")); + strings = g_list_append (strings, (gchar *) _("Confidential")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); @@ -583,10 +583,10 @@ e_calendar_table_init (ECalendarTable *cal_table) g_object_unref (cell); strings = NULL; - strings = g_list_append (strings, (char*) _("High")); - strings = g_list_append (strings, (char*) _("Normal")); - strings = g_list_append (strings, (char*) _("Low")); - strings = g_list_append (strings, (char*) _("Undefined")); + strings = g_list_append (strings, (gchar *) _("High")); + strings = g_list_append (strings, (gchar *) _("Normal")); + strings = g_list_append (strings, (gchar *) _("Low")); + strings = g_list_append (strings, (gchar *) _("Undefined")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); @@ -605,17 +605,17 @@ e_calendar_table_init (ECalendarTable *cal_table) g_object_unref (cell); strings = NULL; - strings = g_list_append (strings, (char*) _("0%")); - strings = g_list_append (strings, (char*) _("10%")); - strings = g_list_append (strings, (char*) _("20%")); - strings = g_list_append (strings, (char*) _("30%")); - strings = g_list_append (strings, (char*) _("40%")); - strings = g_list_append (strings, (char*) _("50%")); - strings = g_list_append (strings, (char*) _("60%")); - strings = g_list_append (strings, (char*) _("70%")); - strings = g_list_append (strings, (char*) _("80%")); - strings = g_list_append (strings, (char*) _("90%")); - strings = g_list_append (strings, (char*) _("100%")); + strings = g_list_append (strings, (gchar *) _("0%")); + strings = g_list_append (strings, (gchar *) _("10%")); + strings = g_list_append (strings, (gchar *) _("20%")); + strings = g_list_append (strings, (gchar *) _("30%")); + strings = g_list_append (strings, (gchar *) _("40%")); + strings = g_list_append (strings, (gchar *) _("50%")); + strings = g_list_append (strings, (gchar *) _("60%")); + strings = g_list_append (strings, (gchar *) _("70%")); + strings = g_list_append (strings, (gchar *) _("80%")); + strings = g_list_append (strings, (gchar *) _("90%")); + strings = g_list_append (strings, (gchar *) _("100%")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); @@ -635,8 +635,8 @@ e_calendar_table_init (ECalendarTable *cal_table) g_object_unref (cell); strings = NULL; - strings = g_list_append (strings, (char*) _("Free")); - strings = g_list_append (strings, (char*) _("Busy")); + strings = g_list_append (strings, (gchar *) _("Free")); + strings = g_list_append (strings, (gchar *) _("Busy")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); @@ -656,10 +656,10 @@ e_calendar_table_init (ECalendarTable *cal_table) g_object_unref (cell); strings = NULL; - strings = g_list_append (strings, (char*) _("Not Started")); - strings = g_list_append (strings, (char*) _("In Progress")); - strings = g_list_append (strings, (char*) _("Completed")); - strings = g_list_append (strings, (char*) _("Canceled")); + strings = g_list_append (strings, (gchar *) _("Not Started")); + strings = g_list_append (strings, (gchar *) _("In Progress")); + strings = g_list_append (strings, (gchar *) _("Completed")); + strings = g_list_append (strings, (gchar *) _("Canceled")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); @@ -820,12 +820,12 @@ e_calendar_table_complete_selected (ECalendarTable *cal_table) } /* Used from e_table_selected_row_foreach(); puts the selected row number in an - * int pointed to by the closure data. + * gint pointed to by the closure data. */ static void -get_selected_row_cb (int model_row, gpointer data) +get_selected_row_cb (gint model_row, gpointer data) { - int *row; + gint *row; row = data; *row = model_row; @@ -838,7 +838,7 @@ ECalModelComponent * e_calendar_table_get_selected_comp (ECalendarTable *cal_table) { ETable *etable; - int row; + gint row; etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table->etable)); if (e_table_selected_count (etable) != 1) @@ -860,7 +860,7 @@ struct get_selected_uids_closure { /* Used from e_table_selected_row_foreach(), builds a list of the selected UIDs */ static void -add_uid_cb (int model_row, gpointer data) +add_uid_cb (gint model_row, gpointer data) { struct get_selected_uids_closure *closure; ECalModelComponent *comp_data; @@ -912,7 +912,7 @@ delete_selected_components (ECalendarTable *cal_table) g_slist_free (objs); } static void -add_retract_data (ECalComponent *comp, const char *retract_comment) +add_retract_data (ECalComponent *comp, const gchar *retract_comment) { icalcomponent *icalcomp = NULL; icalproperty *icalprop = NULL; @@ -930,8 +930,8 @@ static gboolean check_for_retract (ECalComponent *comp, ECal *client) { ECalComponentOrganizer org; - char *email = NULL; - const char *strip = NULL; + gchar *email = NULL; + const gchar *strip = NULL; gboolean ret_val = FALSE; if (!(e_cal_component_has_attendees (comp) && @@ -959,7 +959,7 @@ void e_calendar_table_delete_selected (ECalendarTable *cal_table) { ETable *etable; - int n_selected; + gint n_selected; ECalModelComponent *comp_data; ECalComponent *comp = NULL; gboolean delete = FALSE; @@ -987,7 +987,7 @@ e_calendar_table_delete_selected (ECalendarTable *cal_table) } if ((n_selected == 1) && comp && check_for_retract (comp, comp_data->client)) { - char *retract_comment = NULL; + gchar *retract_comment = NULL; gboolean retract = FALSE; delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_table), &retract); @@ -1079,7 +1079,7 @@ clipboard_get_calendar_cb (GtkClipboard *clipboard, /* callback for e_table_selected_row_foreach */ static void -copy_row_cb (int model_row, gpointer data) +copy_row_cb (gint model_row, gpointer data) { ECalendarTable *cal_table; ECalModelComponent *comp_data; @@ -1119,7 +1119,7 @@ e_calendar_table_copy_clipboard (ECalendarTable *cal_table) { ETable *etable; GtkClipboard *clipboard; - char *comp_str; + gchar *comp_str; g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table)); @@ -1149,7 +1149,7 @@ static void clipboard_get_calendar_data (ECalendarTable *cal_table, const gchar *text) { icalcomponent *icalcomp; - char *uid; + gchar *uid; ECalComponent *comp; ECal *client; icalcomponent_kind kind; @@ -1211,7 +1211,7 @@ clipboard_get_calendar_data (ECalendarTable *cal_table, const gchar *text) comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomp); uid = e_cal_component_gen_uid (); - e_cal_component_set_uid (comp, (const char *) uid); + e_cal_component_set_uid (comp, (const gchar *) uid); free (uid); e_cal_create_object (client, e_cal_component_get_icalcomponent (comp), NULL, NULL); @@ -1278,7 +1278,7 @@ void e_calendar_table_open_task (ECalendarTable *cal_table, ECal *client, icalcomponent *icalcomp, gboolean assign) { CompEditor *tedit; - const char *uid; + const gchar *uid; guint32 flags = 0; uid = icalcomponent_get_uid (icalcomp); @@ -1312,7 +1312,7 @@ e_calendar_table_open_task (ECalendarTable *cal_table, ECal *client, icalcompone /* Opens the task in the specified row */ static void -open_task_by_row (ECalendarTable *cal_table, int row) +open_task_by_row (ECalendarTable *cal_table, gint row) { ECalModelComponent *comp_data; icalproperty *prop; @@ -1335,7 +1335,7 @@ e_calendar_table_on_double_click (ETable *table, /* popup menu callbacks */ static void -e_calendar_table_on_open_task (EPopup *ep, EPopupItem *pitem, void *data) +e_calendar_table_on_open_task (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarTable *cal_table = data; ECalModelComponent *comp_data; @@ -1351,12 +1351,12 @@ e_calendar_table_on_open_task (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_calendar_table_on_save_as (EPopup *ep, EPopupItem *pitem, void *data) +e_calendar_table_on_save_as (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarTable *cal_table = data; ECalModelComponent *comp_data; - char *filename; - char *ical_string; + gchar *filename; + gchar *ical_string; comp_data = e_calendar_table_get_selected_comp (cal_table); if (comp_data == NULL) @@ -1378,7 +1378,7 @@ e_calendar_table_on_save_as (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_calendar_table_on_print_task (EPopup *ep, EPopupItem *pitem, void *data) +e_calendar_table_on_print_task (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarTable *cal_table = data; ECalModelComponent *comp_data; @@ -1396,7 +1396,7 @@ e_calendar_table_on_print_task (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_calendar_table_on_cut (EPopup *ep, EPopupItem *pitem, void *data) +e_calendar_table_on_cut (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarTable *cal_table = data; @@ -1404,7 +1404,7 @@ e_calendar_table_on_cut (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_calendar_table_on_copy (EPopup *ep, EPopupItem *pitem, void *data) +e_calendar_table_on_copy (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarTable *cal_table = data; @@ -1412,7 +1412,7 @@ e_calendar_table_on_copy (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_calendar_table_on_paste (EPopup *ep, EPopupItem *pitem, void *data) +e_calendar_table_on_paste (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarTable *cal_table = data; @@ -1420,7 +1420,7 @@ e_calendar_table_on_paste (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_calendar_table_on_assign (EPopup *ep, EPopupItem *pitem, void *data) +e_calendar_table_on_assign (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarTable *cal_table = data; ECalModelComponent *comp_data; @@ -1431,7 +1431,7 @@ e_calendar_table_on_assign (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_calendar_table_on_forward (EPopup *ep, EPopupItem *pitem, void *data) +e_calendar_table_on_forward (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarTable *cal_table = data; ECalModelComponent *comp_data; @@ -1459,7 +1459,7 @@ struct AffectedComponents { * This function is called from e_table_selected_row_foreach. **/ static void -get_selected_components_cb (int model_row, gpointer data) +get_selected_components_cb (gint model_row, gpointer data) { struct AffectedComponents *ac = (struct AffectedComponents *) data; @@ -1530,21 +1530,21 @@ mark_comp_incomplete_cb (gpointer data, gpointer user_data) /* Callback used for the "mark tasks as incomplete" menu item */ static void -mark_as_incomplete_cb (EPopup *ep, EPopupItem *pitem, void *data) +mark_as_incomplete_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { do_for_selected_components (data, mark_comp_incomplete_cb); } /* Callback used for the "mark tasks as complete" menu item */ static void -mark_as_complete_cb (EPopup *ep, EPopupItem *pitem, void *data) +mark_as_complete_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { do_for_selected_components (data, mark_comp_complete_cb); } /* Opens the URL of the task */ static void -open_url_cb (EPopup *ep, EPopupItem *pitem, void *data) +open_url_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarTable *cal_table = data; ECalModelComponent *comp_data; @@ -1564,7 +1564,7 @@ open_url_cb (EPopup *ep, EPopupItem *pitem, void *data) /* Opens a new task editor */ static void -on_new_task (EPopup *ep, EPopupItem *pitem, void *data) +on_new_task (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarTable *cal_table = data; ETasks *tasks = g_object_get_data (G_OBJECT (cal_table), "tasks"); @@ -1578,7 +1578,7 @@ on_new_task (EPopup *ep, EPopupItem *pitem, void *data) /* Callback for the "delete tasks" menu item */ static void -delete_cb (EPopup *ep, EPopupItem *pitem, void *data) +delete_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarTable *cal_table = data; @@ -1616,7 +1616,7 @@ static EPopupItem tasks_popup_items [] = { }; static void -ect_popup_free(EPopup *ep, GSList *items, void *data) +ect_popup_free(EPopup *ep, GSList *items, gpointer data) { g_slist_free(items); } @@ -1631,7 +1631,7 @@ e_calendar_table_show_popup_menu (ETable *table, GPtrArray *events; ECalPopup *ep; ECalPopupTargetSelect *t; - int i; + gint i; selection = get_selected_objects (cal_table); if (!selection) @@ -1706,11 +1706,11 @@ e_calendar_table_on_key_press (ETable *table, } static void -hide_completed_rows (ECalModel *model, GList *clients_list, char *hide_sexp, GPtrArray *comp_objects) +hide_completed_rows (ECalModel *model, GList *clients_list, gchar *hide_sexp, GPtrArray *comp_objects) { GList *l, *m, *objects; ECal *client; - int pos; + gint pos; for (l = clients_list; l != NULL; l = l->next) { client = l->data; @@ -1750,7 +1750,7 @@ hide_completed_rows (ECalModel *model, GList *clients_list, char *hide_sexp, GPt } static void -show_completed_rows (ECalModel *model, GList *clients_list, char *show_sexp, GPtrArray *comp_objects) +show_completed_rows (ECalModel *model, GList *clients_list, gchar *show_sexp, GPtrArray *comp_objects) { GList *l, *m, *objects; ECal *client; @@ -1848,7 +1848,7 @@ e_calendar_table_get_current_time (ECellDateEdit *ecde, gpointer data) #ifdef TRANSLATORS_ONLY -static char *test[] = { +static gchar *test[] = { N_("Click to add a task") }; @@ -1863,7 +1863,7 @@ e_calendar_table_set_activity_handler (ECalendarTable *cal_table, EActivityHandl } void -e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *message, int percent) +e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *message, gint percent) { g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table)); @@ -1876,7 +1876,7 @@ e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *mes cal_table->activity_id = 0; } } else if (cal_table->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", (gpointer) cal_table); + gchar *client_id = g_strdup_printf ("%p", (gpointer) cal_table); cal_table->activity_id = e_activity_handler_operation_started ( cal_table->activity_handler, client_id, message, TRUE); @@ -1908,7 +1908,7 @@ e_calendar_table_process_completed_tasks (ECalendarTable *table, GList *clients_ { ECalModel *model; static GMutex *mutex = NULL; - char *hide_sexp, *show_sexp; + gchar *hide_sexp, *show_sexp; GPtrArray *comp_objects = NULL; if (!mutex) diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h index d5dac7318e..50f2bb5995 100644 --- a/calendar/gui/e-calendar-table.h +++ b/calendar/gui/e-calendar-table.h @@ -106,7 +106,7 @@ void e_calendar_table_set_activity_handler (ECalendarTable *cal_table, EActivityHandler *activity_handler); void e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *message, - int percent); + gint percent); void e_calendar_table_open_task (ECalendarTable *cal_table, ECal *client, icalcomponent *icalcomp, diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 91f9eded7a..9644259198 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -72,7 +72,7 @@ struct _ECalendarViewPrivate { guint activity_id; /* The default category */ - char *default_category; + gchar *default_category; }; static void e_calendar_view_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); @@ -267,7 +267,7 @@ e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart struct icaltimetype itime, old_dtstart, old_dtend; time_t tt_start, tt_end, new_dtstart = 0; struct icaldurationtype ic_dur, ic_oneday; - char *uid; + gchar *uid; gint start_offset, end_offset; gboolean all_day_event = FALSE; GnomeCalendarViewType view_type; @@ -304,7 +304,7 @@ e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart } else if (icaldurationtype_as_int (ic_dur) >= 60*60*24 && !in_top_canvas) { /* copy & paste from top canvas to main canvas */ - int time_divisions; + gint time_divisions; time_divisions = calendar_config_get_time_divisions (); ic_dur = icaldurationtype_from_int (time_divisions * 60); @@ -479,11 +479,11 @@ e_calendar_view_set_timezone (ECalendarView *cal_view, icaltimezone *zone) old_zone, zone); } -const char * +const gchar * e_calendar_view_get_default_category (ECalendarView *cal_view) { g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), NULL); - return (const char *) cal_view->priv->default_category; + return (const gchar *) cal_view->priv->default_category; } /** @@ -495,7 +495,7 @@ e_calendar_view_get_default_category (ECalendarView *cal_view) * components from the given calendar view. */ void -e_calendar_view_set_default_category (ECalendarView *cal_view, const char *category) +e_calendar_view_set_default_category (ECalendarView *cal_view, const gchar *category) { g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); @@ -549,7 +549,7 @@ e_calendar_view_set_activity_handler (ECalendarView *cal_view, EActivityHandler } void -e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message, int percent) +e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message, gint percent) { ECalendarViewPrivate *priv; @@ -566,7 +566,7 @@ e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *messag priv->activity_id = 0; } } else if (priv->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", (gpointer) cal_view); + gchar *client_id = g_strdup_printf ("%p", (gpointer) cal_view); priv->activity_id = e_activity_handler_operation_started ( priv->activity_handler, client_id, message, TRUE); @@ -647,7 +647,7 @@ void e_calendar_view_cut_clipboard (ECalendarView *cal_view) { GList *selected, *l; - const char *uid; + const gchar *uid; g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view)); @@ -677,7 +677,7 @@ e_calendar_view_cut_clipboard (ECalendarView *cal_view) e_cal_component_get_uid (comp, &uid); if (e_cal_component_is_instance (comp)) { - char *rid = NULL; + gchar *rid = NULL; icalcomponent *icalcomp; /* when cutting detached instances, only cut that instance */ @@ -741,7 +741,7 @@ add_related_timezones (icalcomponent *des_icalcomp, icalcomponent *src_icalcomp, ICAL_DTEND_PROPERTY, ICAL_NO_PROPERTY }; - int i; + gint i; g_return_if_fail (des_icalcomp != NULL); g_return_if_fail (src_icalcomp != NULL); @@ -754,7 +754,7 @@ add_related_timezones (icalcomponent *des_icalcomp, icalcomponent *src_icalcomp, icalparameter *par = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER); if (par) { - const char *tzid = icalparameter_get_tzid (par); + const gchar *tzid = icalparameter_get_tzid (par); if (tzid) { GError *error = NULL; @@ -856,7 +856,7 @@ clipboard_get_calendar_data (ECalendarView *cal_view, const gchar *text) if (!text || !*text) return; - icalcomp = icalparser_parse_string ((const char *) text); + icalcomp = icalparser_parse_string ((const gchar *) text); if (!icalcomp) return; @@ -965,7 +965,7 @@ e_calendar_view_paste_clipboard (ECalendarView *cal_view) } static void -add_retract_data (ECalComponent *comp, const char *retract_comment, CalObjModType mod) +add_retract_data (ECalComponent *comp, const gchar *retract_comment, CalObjModType mod) { icalcomponent *icalcomp = NULL; icalproperty *icalprop = NULL; @@ -990,8 +990,8 @@ static gboolean check_for_retract (ECalComponent *comp, ECal *client) { ECalComponentOrganizer org; - char *email = NULL; - const char *strip = NULL; + gchar *email = NULL; + const gchar *strip = NULL; gboolean ret_val = FALSE; if (!(e_cal_component_has_attendees (comp) && @@ -1027,7 +1027,7 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event) /*FIXME Retract should be moved to Groupwise features plugin */ if (check_for_retract (comp, event->comp_data->client)) { - char *retract_comment = NULL; + gchar *retract_comment = NULL; gboolean retract = FALSE; delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view), &retract); @@ -1058,8 +1058,8 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event) delete = delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view)); if (delete) { - const char *uid; - char *rid = NULL; + const gchar *uid; + gchar *rid = NULL; if ((itip_organizer_is_user (comp, event->comp_data->client) || itip_sentby_is_user (comp, event->comp_data->client)) && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)), @@ -1144,7 +1144,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view) /*FIXME Retract should be moved to Groupwise features plugin */ if (check_for_retract (comp, event->comp_data->client)) { - char *retract_comment = NULL; + gchar *retract_comment = NULL; gboolean retract = FALSE; delete = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view), &retract); @@ -1173,8 +1173,8 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view) delete = delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view)); if (delete) { - const char *uid; - char *rid = NULL; + const gchar *uid; + gchar *rid = NULL; ECalComponentDateTime dt; icaltimezone *zone = NULL; gboolean is_instance = FALSE; @@ -1242,7 +1242,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view) } static void -on_new_appointment (EPopup *ep, EPopupItem *pitem, void *data) +on_new_appointment (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1250,7 +1250,7 @@ on_new_appointment (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_new_event (EPopup *ep, EPopupItem *pitem, void *data) +on_new_event (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1258,7 +1258,7 @@ on_new_event (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_new_meeting (EPopup *ep, EPopupItem *pitem, void *data) +on_new_meeting (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1266,7 +1266,7 @@ on_new_meeting (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_new_task (EPopup *ep, EPopupItem *pitem, void *data) +on_new_task (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; time_t dtstart, dtend; @@ -1276,7 +1276,7 @@ on_new_task (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_goto_date (EPopup *ep, EPopupItem *pitem, void *data) +on_goto_date (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1284,7 +1284,7 @@ on_goto_date (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_goto_today (EPopup *ep, EPopupItem *pitem, void *data) +on_goto_today (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1292,7 +1292,7 @@ on_goto_today (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_edit_appointment (EPopup *ep, EPopupItem *pitem, void *data) +on_edit_appointment (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; GList *selected; @@ -1311,7 +1311,7 @@ on_edit_appointment (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_print (EPopup *ep, EPopupItem *pitem, void *data) +on_print (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1319,12 +1319,12 @@ on_print (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_save_as (EPopup *ep, EPopupItem *pitem, void *data) +on_save_as (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; GList *selected; - char *filename; - char *ical_string; + gchar *filename; + gchar *ical_string; ECalendarViewEvent *event; selected = e_calendar_view_get_selected_events (cal_view); @@ -1349,7 +1349,7 @@ on_save_as (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_print_event (EPopup *ep, EPopupItem *pitem, void *data) +on_print_event (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; GList *selected; @@ -1373,8 +1373,8 @@ on_print_event (EPopup *ep, EPopupItem *pitem, void *data) static void transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_item) { - const char *uid; - char *new_uid; + const gchar *uid; + gchar *new_uid; icalcomponent *orig_icalcomp; icalproperty *icalprop; @@ -1437,7 +1437,7 @@ transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_ /* remove the item from the source calendar */ if (remove_item) { if (e_cal_util_component_is_instance (event->comp_data->icalcomp) || e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) { - char *rid = NULL; + gchar *rid = NULL; struct icaltimetype recur_id = icalcomponent_get_recurrenceid (event->comp_data->icalcomp); if (!icaltime_is_null_time (recur_id)) @@ -1493,7 +1493,7 @@ transfer_selected_items (ECalendarView *cal_view, gboolean remove_item) } static void -on_copy_to (EPopup *ep, EPopupItem *pitem, void *data) +on_copy_to (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1501,7 +1501,7 @@ on_copy_to (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_move_to (EPopup *ep, EPopupItem *pitem, void *data) +on_move_to (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1509,7 +1509,7 @@ on_move_to (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_meeting (EPopup *ep, EPopupItem *pitem, void *data) +on_meeting (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; GList *selected; @@ -1528,7 +1528,7 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client) { icalproperty *prop; icalparameter *param; - char *address = NULL; + gchar *address = NULL; ECalComponent *comp; gboolean found = FALSE; @@ -1541,7 +1541,7 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client) for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY); prop; prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY)) { - const char *attendee = icalproperty_get_attendee (prop); + const gchar *attendee = icalproperty_get_attendee (prop); if (!g_ascii_strcasecmp (itip_strip_mailto (attendee), address)) { param = icalparameter_new_role (ICAL_ROLE_NONPARTICIPANT); @@ -1558,9 +1558,9 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client) /* We couldn find the attendee in the component, so add a new attendee */ if (!found) { - char *temp = g_strdup_printf ("MAILTO:%s", address); + gchar *temp = g_strdup_printf ("MAILTO:%s", address); - prop = icalproperty_new_attendee ((const char *) temp); + prop = icalproperty_new_attendee ((const gchar *) temp); icalcomponent_add_property (icalcomp, prop); param = icalparameter_new_partstat (ICAL_PARTSTAT_DELEGATED); @@ -1584,7 +1584,7 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client) } static void -on_delegate (EPopup *ep, EPopupItem *pitem, void *data) +on_delegate (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; GList *selected; @@ -1608,7 +1608,7 @@ on_delegate (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_forward (EPopup *ep, EPopupItem *pitem, void *data) +on_forward (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; GList *selected; @@ -1628,7 +1628,7 @@ on_forward (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_reply (EPopup *ep, EPopupItem *pitem, void *data) +on_reply (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; GList *selected; @@ -1649,7 +1649,7 @@ on_reply (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_reply_all (EPopup *ep, EPopupItem *pitem, void *data) +on_reply_all (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; GList *selected; @@ -1670,7 +1670,7 @@ on_reply_all (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_delete_appointment (EPopup *ep, EPopupItem *pitem, void *data) +on_delete_appointment (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1678,7 +1678,7 @@ on_delete_appointment (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, void *data) +on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; ECalendarViewEvent *event; @@ -1687,7 +1687,7 @@ on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, void *data) struct icaltimetype itt; GList *selected; ECal *client; - char *new_uid; + gchar *new_uid; ECalComponentId *id = NULL; selected = e_calendar_view_get_selected_events (cal_view); @@ -1756,7 +1756,7 @@ on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_delete_occurrence (EPopup *ep, EPopupItem *pitem, void *data) +on_delete_occurrence (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1764,7 +1764,7 @@ on_delete_occurrence (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_cut (EPopup *ep, EPopupItem *pitem, void *data) +on_cut (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1772,7 +1772,7 @@ on_cut (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_copy (EPopup *ep, EPopupItem *pitem, void *data) +on_copy (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1780,7 +1780,7 @@ on_copy (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_paste (EPopup *ep, EPopupItem *pitem, void *data) +on_paste (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = data; @@ -1837,7 +1837,7 @@ static EPopupItem ecv_child_items [] = { }; static void -ecv_popup_free (EPopup *ep, GSList *list, void *data) +ecv_popup_free (EPopup *ep, GSList *list, gpointer data) { g_slist_free(list); } @@ -1848,7 +1848,7 @@ e_calendar_view_create_popup_menu (ECalendarView *cal_view) ECalPopup *ep; GSList *menus = NULL; GList *selected, *l; - int i; + gint i; ECalPopupTargetSelect *t; ECalModel *model; GPtrArray *events; @@ -2057,8 +2057,8 @@ e_calendar_view_new_appointment_full (ECalendarView *cal_view, gboolean all_day, /* time in this cases; dtstart should be a midnight in this case */ if (do_rounding || (!all_day && (dtend - dtstart) == (60 * 60 * 24))) { struct tm local = *localtime (&now); - int time_div = calendar_config_get_time_divisions (); - int hours, mins; + gint time_div = calendar_config_get_time_divisions (); + gint hours, mins; if (!time_div) /* Possible if your gconf values aren't so nice */ time_div = 30; @@ -2104,7 +2104,7 @@ CompEditor * e_calendar_view_open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags) { CompEditor *ce; - const char *uid; + const gchar *uid; ECalComponent *comp; @@ -2184,7 +2184,7 @@ e_calendar_view_modify_and_send (ECalComponent *comp, if (mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (comp)) { /* Ensure we send the master object, not the instance only */ icalcomponent *icalcomp = NULL; - const char *uid = NULL; + const gchar *uid = NULL; e_cal_component_get_uid (comp, &uid); if (e_cal_get_object (client, uid, NULL, &icalcomp, NULL) && icalcomp) { @@ -2222,10 +2222,10 @@ tooltip_grab (GtkWidget *tooltip, GdkEventKey *event, ECalendarView *view) return FALSE; } -static char * +static gchar * get_label (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone) { - char buffer[1000]; + gchar buffer[1000]; struct tm tmp_tm; tmp_tm = icaltimetype_to_tm_with_zone (tt, f_zone, t_zone); @@ -2238,7 +2238,7 @@ get_label (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone) } void -e_calendar_view_move_tip (GtkWidget *widget, int x, int y) +e_calendar_view_move_tip (GtkWidget *widget, gint x, gint y) { GtkRequisition requisition; gint w, h; @@ -2280,13 +2280,13 @@ e_calendar_view_move_tip (GtkWidget *widget, int x, int y) * The information is like "Status: Accepted: X Declined: Y ...". * Free returned pointer with g_free. **/ -char * +gchar * e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client) { struct _values { icalparameter_partstat status; - const char *caption; - int count; + const gchar *caption; + gint count; } values[] = { { ICAL_PARTSTAT_ACCEPTED, N_("Accepted"), 0 }, { ICAL_PARTSTAT_DECLINED, N_("Declined"), 0 }, @@ -2299,8 +2299,8 @@ e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client) GSList *attendees = NULL, *a; gboolean have = FALSE; - char *res = NULL; - int i; + gchar *res = NULL; + gint i; if (!comp || !e_cal_component_has_attendees (comp) || !itip_organizer_is_user_ex (comp, client, TRUE)) return NULL; @@ -2366,8 +2366,8 @@ gboolean e_calendar_view_get_tooltips (ECalendarViewEventData *data) { GtkWidget *label, *box, *hbox, *ebox, *frame; - const char *str; - char *tmp, *tmp1, *tmp2; + const gchar *str; + gchar *tmp, *tmp1, *tmp2; ECalComponentOrganizer organiser; ECalComponentDateTime dtstart, dtend; icalcomponent *clone_comp; @@ -2411,7 +2411,7 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data) gtk_label_set_markup ((GtkLabel *)label, tmp); if (free_text) { - g_free ((char*)str); + g_free ((gchar *)str); str = NULL; } @@ -2427,7 +2427,7 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data) e_cal_component_get_organizer (newcomp, &organiser); if (organiser.cn) { - char *ptr ; + gchar *ptr ; ptr = strchr(organiser.value, ':'); if (ptr) { @@ -2555,7 +2555,7 @@ icalcomp_contains_category (icalcomponent *icalcomp, const gchar *category) for (property = icalcomponent_get_first_property (icalcomp, ICAL_CATEGORIES_PROPERTY); property != NULL; property = icalcomponent_get_next_property (icalcomp, ICAL_CATEGORIES_PROPERTY)) { - char *value = icalproperty_get_value_as_string_r (property); + gchar *value = icalproperty_get_value_as_string_r (property); if (value && strcmp (category, value) == 0){ g_free (value); @@ -2658,7 +2658,7 @@ draw_curved_rectangle (cairo_t *cr, double x0, double y0, } static void -error_response(GtkWidget *widget, gint response, void *data) +error_response(GtkWidget *widget, gint response, gpointer data) { gtk_widget_destroy (widget); } diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 99d405d098..453ec1ff52 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -90,10 +90,10 @@ struct _ECalendarView { }; typedef struct { - ECalendarViewEvent * (* get_view_event) (ECalendarView *view, int day, int event_num); + ECalendarViewEvent * (* get_view_event) (ECalendarView *view, gint day, gint event_num); ECalendarView *cal_view; - int day; - int event_num; + gint day; + gint event_num; } ECalendarViewEventData; struct _ECalendarViewClass { @@ -125,13 +125,13 @@ ECalModel *e_calendar_view_get_model (ECalendarView *cal_view); void e_calendar_view_set_model (ECalendarView *cal_view, ECalModel *model); icaltimezone *e_calendar_view_get_timezone (ECalendarView *cal_view); void e_calendar_view_set_timezone (ECalendarView *cal_view, icaltimezone *zone); -const char *e_calendar_view_get_default_category (ECalendarView *cal_view); -void e_calendar_view_set_default_category (ECalendarView *cal_view, const char *category); +const gchar *e_calendar_view_get_default_category (ECalendarView *cal_view); +void e_calendar_view_set_default_category (ECalendarView *cal_view, const gchar *category); gboolean e_calendar_view_get_use_24_hour_format (ECalendarView *view); void e_calendar_view_set_use_24_hour_format (ECalendarView *view, gboolean use_24_hour); void e_calendar_view_set_activity_handler (ECalendarView *cal_view, EActivityHandler *activity_handler); -void e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message, int percent); +void e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message, gint percent); GList *e_calendar_view_get_selected_events (ECalendarView *cal_view); gboolean e_calendar_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time); @@ -176,10 +176,10 @@ void e_calendar_utils_show_info_silent(struct _GtkWidget *widget); gboolean e_calendar_view_get_tooltips (ECalendarViewEventData *data); -void e_calendar_view_move_tip (GtkWidget *widget, int x, int y); +void e_calendar_view_move_tip (GtkWidget *widget, gint x, gint y); const gchar *e_calendar_view_get_icalcomponent_summary (ECal *ecal, icalcomponent *icalcomp, gboolean *free_text); -char *e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client); +gchar *e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client); void draw_curved_rectangle (cairo_t *cr, double x0, diff --git a/calendar/gui/e-cell-date-edit-config.c b/calendar/gui/e-cell-date-edit-config.c index eb6c27420b..5b04791412 100644 --- a/calendar/gui/e-cell-date-edit-config.c +++ b/calendar/gui/e-cell-date-edit-config.c @@ -205,7 +205,7 @@ twentyfour_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gp static void set_range (ECellDateEdit *cell) { - int start_hour, end_hour; + gint start_hour, end_hour; start_hour = calendar_config_get_day_start_hour (); end_hour = calendar_config_get_day_end_hour (); diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c index 8a43c628fc..efe251aa0f 100644 --- a/calendar/gui/e-cell-date-edit-text.c +++ b/calendar/gui/e-cell-date-edit-text.c @@ -59,13 +59,13 @@ e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd, } -static char * -ecd_get_text (ECellText *cell, ETableModel *model, int col, int row) +static gchar * +ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row) { ECellDateEditText *ecd = E_CELL_DATE_EDIT_TEXT (cell); ECellDateEditValue *dv = e_table_model_value_at (model, col, row); struct tm tmp_tm; - char buffer[64]; + gchar buffer[64]; if (!dv) return g_strdup (""); @@ -84,7 +84,7 @@ ecd_get_text (ECellText *cell, ETableModel *model, int col, int row) static void -ecd_free_text (ECellText *cell, char *text) +ecd_free_text (ECellText *cell, gchar *text) { g_free (text); } @@ -95,7 +95,7 @@ static void show_date_warning (ECellDateEditText *ecd) { GtkWidget *dialog; - char buffer[64], *format; + gchar buffer[64], *format; time_t t; struct tm *tmp_tm; @@ -125,8 +125,8 @@ show_date_warning (ECellDateEditText *ecd) static void -ecd_set_value (ECellText *cell, ETableModel *model, int col, int row, - const char *text) +ecd_set_value (ECellText *cell, ETableModel *model, gint col, gint row, + const gchar *text) { ECellDateEditText *ecd = E_CELL_DATE_EDIT_TEXT (cell); ETimeParseStatus status; @@ -206,7 +206,7 @@ e_cell_date_edit_text_init (ECellDateEditText *ecd) * Returns: an ECell object that can be used to render dates. */ ECell * -e_cell_date_edit_text_new (const char *fontname, +e_cell_date_edit_text_new (const gchar *fontname, GtkJustification justify) { ECellDateEditText *ecd = g_object_new (e_cell_date_edit_text_get_type (), NULL); diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h index c353ecd278..0f557afade 100644 --- a/calendar/gui/e-cell-date-edit-text.h +++ b/calendar/gui/e-cell-date-edit-text.h @@ -56,7 +56,7 @@ typedef struct { } ECellDateEditTextClass; GType e_cell_date_edit_text_get_type (void); -ECell *e_cell_date_edit_text_new (const char *fontname, +ECell *e_cell_date_edit_text_new (const gchar *fontname, GtkJustification justify); diff --git a/calendar/gui/e-comp-editor-registry.c b/calendar/gui/e-comp-editor-registry.c index a4bed100b9..cdbffd4ee4 100644 --- a/calendar/gui/e-comp-editor-registry.c +++ b/calendar/gui/e-comp-editor-registry.c @@ -34,7 +34,7 @@ struct _ECompEditorRegistryData { ECompEditorRegistry *registry; CompEditor *editor; - char *uid; + gchar *uid; }; typedef struct _ECompEditorRegistryData ECompEditorRegistryData; @@ -120,7 +120,7 @@ e_comp_editor_registry_add (ECompEditorRegistry *reg, CompEditor *editor, gboole ECompEditorRegistryPrivate *priv; ECompEditorRegistryData *rdata; ECalComponent *comp; - const char *uid; + const gchar *uid; g_return_if_fail (reg != NULL); g_return_if_fail (E_IS_COMP_EDITOR_REGISTRY (reg)); @@ -145,7 +145,7 @@ e_comp_editor_registry_add (ECompEditorRegistry *reg, CompEditor *editor, gboole } CompEditor * -e_comp_editor_registry_find (ECompEditorRegistry *reg, const char *uid) +e_comp_editor_registry_find (ECompEditorRegistry *reg, const gchar *uid) { ECompEditorRegistryPrivate *priv; ECompEditorRegistryData *rdata; diff --git a/calendar/gui/e-comp-editor-registry.h b/calendar/gui/e-comp-editor-registry.h index 5c2b4c4bc8..0b45a53cbc 100644 --- a/calendar/gui/e-comp-editor-registry.h +++ b/calendar/gui/e-comp-editor-registry.h @@ -64,7 +64,7 @@ void e_comp_editor_registry_add (ECompEditorRegistry *reg, CompEditor *editor, gboolean remote); CompEditor *e_comp_editor_registry_find (ECompEditorRegistry *reg, - const char *uid); + const gchar *uid); gboolean e_comp_editor_registry_close_all (ECompEditorRegistry *reg); G_END_DECLS diff --git a/calendar/gui/e-date-edit-config.c b/calendar/gui/e-date-edit-config.c index f93f2cf746..bead58f5d2 100644 --- a/calendar/gui/e-date-edit-config.c +++ b/calendar/gui/e-date-edit-config.c @@ -146,7 +146,7 @@ e_date_edit_config_get_edit (EDateEditConfig *edit_config) static void set_week_start (EDateEdit *date_edit) { - int week_start_day; + gint week_start_day; week_start_day = calendar_config_get_week_start_day (); diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c index 2aaab0df4d..bf75f5ff04 100644 --- a/calendar/gui/e-date-time-list.c +++ b/calendar/gui/e-date-time-list.c @@ -398,10 +398,10 @@ e_date_time_list_get_path (GtkTreeModel *tree_model, } /* Builds a static string out of an exception date */ -static char * +static gchar * get_exception_string (ECalComponentDateTime *dt) { - static char buf [256]; + static gchar buf [256]; struct tm tmp_tm; tmp_tm.tm_year = dt->value->year - 1900; diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c index edd02bb7ee..682c99e6b7 100644 --- a/calendar/gui/e-day-view-config.c +++ b/calendar/gui/e-day-view-config.c @@ -146,7 +146,7 @@ e_day_view_config_get_view (EDayViewConfig *view_config) static void set_week_start (EDayView *day_view) { - int week_start_day; + gint week_start_day; week_start_day = calendar_config_get_week_start_day (); @@ -215,7 +215,7 @@ working_days_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpoin static void set_day_start_hour (EDayView *day_view) { - int start_hour, start_minute, end_hour, end_minute; + gint start_hour, start_minute, end_hour, end_minute; e_day_view_get_working_day (day_view, &start_hour, &start_minute, &end_hour, &end_minute); @@ -238,7 +238,7 @@ day_start_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpo static void set_day_start_minute (EDayView *day_view) { - int start_hour, start_minute, end_hour, end_minute; + gint start_hour, start_minute, end_hour, end_minute; e_day_view_get_working_day (day_view, &start_hour, &start_minute, &end_hour, &end_minute); @@ -261,7 +261,7 @@ day_start_minute_changed_cb (GConfClient *client, guint id, GConfEntry *entry, g static void set_day_end_hour (EDayView *day_view) { - int start_hour, start_minute, end_hour, end_minute; + gint start_hour, start_minute, end_hour, end_minute; e_day_view_get_working_day (day_view, &start_hour, &start_minute, &end_hour, &end_minute); @@ -285,7 +285,7 @@ day_end_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpoin static void set_day_end_minute (EDayView *day_view) { - int start_hour, start_minute, end_hour, end_minute; + gint start_hour, start_minute, end_hour, end_minute; e_day_view_get_working_day (day_view, &start_hour, &start_minute, &end_hour, &end_minute); @@ -308,7 +308,7 @@ day_end_minute_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpo static void set_time_divisions (EDayView *day_view) { - int time_divisions; + gint time_divisions; time_divisions = calendar_config_get_time_divisions (); @@ -330,7 +330,7 @@ static void set_marcus_bains (EDayView *day_view) { gboolean show_marcus_bains_line; - const char *dayview_color, *timebar_color; + const gchar *dayview_color, *timebar_color; calendar_config_get_marcus_bains (&show_marcus_bains_line, &dayview_color, &timebar_color); diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index e161477eec..f3ad280cae 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -44,38 +44,38 @@ static void e_day_view_main_item_set_property (GObject *object, GParamSpec *pspec); static void e_day_view_main_item_update (GnomeCanvasItem *item, double *affine, - ArtSVP *clip_path, int flags); + ArtSVP *clip_path, gint flags); static void e_day_view_main_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, - int x, int y, - int width, int height); + gint x, gint y, + gint width, gint height); static double e_day_view_main_item_point (GnomeCanvasItem *item, double x, double y, - int cx, int cy, + gint cx, gint cy, GnomeCanvasItem **actual_item); static gint e_day_view_main_item_event (GnomeCanvasItem *item, GdkEvent *event); static void e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem, GdkDrawable *drawable, - int x, - int y, - int width, - int height); + gint x, + gint y, + gint width, + gint height); static void e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem, GdkDrawable *drawable, - int x, int y, - int width, int height, + gint x, gint y, + gint width, gint height, gint day); static void e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem, GdkDrawable *drawable, - int x, int y, - int width, int height, + gint x, gint y, + gint width, gint height, gint day); static void e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, GdkDrawable *drawable, - int x, int y, - int width, int height, + gint x, gint y, + gint width, gint height, gint day, gint event_num); /* The arguments we take */ @@ -146,7 +146,7 @@ static void e_day_view_main_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags) + gint flags) { if (GNOME_CANVAS_ITEM_CLASS (e_day_view_main_item_parent_class)->update) (* GNOME_CANVAS_ITEM_CLASS (e_day_view_main_item_parent_class)->update) (item, affine, clip_path, flags); @@ -164,7 +164,7 @@ e_day_view_main_item_update (GnomeCanvasItem *item, */ static void e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable, - int x, int y, int width, int height) + gint x, gint y, gint width, gint height) { EDayViewMainItem *dvmitem; EDayView *day_view; @@ -360,7 +360,7 @@ e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable, if (e_day_view_get_show_marcus_bains (day_view)) { icaltimezone *zone; struct icaltimetype time_now, day_start; - int marcus_bains_y; + gint marcus_bains_y; GdkColor mb_color; cairo_save (cr); @@ -402,8 +402,8 @@ e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable, static void e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem, GdkDrawable *drawable, - int x, int y, - int width, int height, + gint x, gint y, + gint width, gint height, gint day) { EDayView *day_view; @@ -483,8 +483,8 @@ e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem, static void e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem, GdkDrawable *drawable, - int x, int y, - int width, int height) + gint x, gint y, + gint width, gint height) { EDayView *day_view; EDayViewEvent *event; @@ -572,7 +572,7 @@ e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem, static void e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem, GdkDrawable *drawable, - int x, int y, int width, int height, + gint x, gint y, gint width, gint height, gint day) { EDayView *day_view; @@ -591,7 +591,7 @@ e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem, static void e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, GdkDrawable *drawable, - int x, int y, int width, int height, + gint x, gint y, gint width, gint height, gint day, gint event_num) { EDayView *day_view; @@ -625,8 +625,8 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, gint offset, interval; const gchar *start_suffix; const gchar *end_suffix; - char *text = NULL; - int scroll_flag = 0; + gchar *text = NULL; + gint scroll_flag = 0; gint row_y; GConfClient *gconf; @@ -1174,11 +1174,11 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, /* draw categories icons */ for (elem = categories_list; elem; elem = elem->next) { - char *category; + gchar *category; GdkPixmap *pixmap = NULL; GdkBitmap *mask = NULL; - category = (char *) elem->data; + category = (gchar *) elem->data; if (!e_categories_config_get_icon_for (category, &pixmap, &mask)) continue; @@ -1315,7 +1315,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, This is needed so that we get button/motion events. */ static double e_day_view_main_item_point (GnomeCanvasItem *item, double x, double y, - int cx, int cy, + gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index f6ded1ec94..4cbfadd9da 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -65,14 +65,14 @@ static void e_day_view_time_item_finalize (GObject *object); static void e_day_view_time_item_update (GnomeCanvasItem *item, double *affine, - ArtSVP *clip_path, int flags); + ArtSVP *clip_path, gint flags); static void e_day_view_time_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, - int x, int y, - int width, int height); + gint x, gint y, + gint width, gint height); static double e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y, - int cx, int cy, + gint cx, gint cy, GnomeCanvasItem **actual_item); static gint e_day_view_time_item_event (GnomeCanvasItem *item, GdkEvent *event); @@ -131,7 +131,7 @@ e_day_view_time_item_class_init (EDayViewTimeItemClass *class) static void e_day_view_time_item_init (EDayViewTimeItem *dvtmitem) { - char *last; + gchar *last; dvtmitem->dragging_selection = FALSE; dvtmitem->second_zone = NULL; @@ -185,7 +185,7 @@ static void e_day_view_time_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags) + gint flags) { if (GNOME_CANVAS_ITEM_CLASS (e_day_view_time_item_parent_class)->update) (* GNOME_CANVAS_ITEM_CLASS (e_day_view_time_item_parent_class)->update) (item, affine, clip_path, flags); @@ -358,7 +358,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item, /* shift time with a difference between local time and the other timezone */ icaltimezone *cal_zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)); struct icaltimetype tt; - int diff; + gint diff; struct tm mn; tt = icaltime_today (); @@ -416,7 +416,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item, /* Draw the Marcus Bains Line first, so it appears under other elements. */ if (e_day_view_get_show_marcus_bains (day_view)) { struct icaltimetype time_now; - int marcus_bains_y; + gint marcus_bains_y; cairo_save (cr); gdk_cairo_set_source_color (cr, &day_view->colors[E_DAY_VIEW_COLOR_MARCUS_BAINS_LINE]); @@ -645,7 +645,7 @@ e_day_view_time_item_increment_time (gint *hour, static double e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y, - int cx, int cy, + gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; @@ -691,7 +691,7 @@ static void edvti_second_zone_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data) { EDayViewTimeItem *dvtmitem = user_data; - char *location; + gchar *location; g_return_if_fail (user_data != NULL); g_return_if_fail (E_IS_DAY_VIEW_TIME_ITEM (dvtmitem)); diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index dd91133243..de9a542ef6 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -687,11 +687,11 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem, /* draw categories icons */ e_cal_component_get_categories_list (comp, &categories_list); for (elem = categories_list; elem; elem = elem->next) { - char *category; - const char *file; + gchar *category; + const gchar *file; GdkPixbuf *pixbuf; - category = (char *) elem->data; + category = (gchar *) elem->data; file = e_categories_get_icon_file_for (category); if (!file) continue; @@ -800,7 +800,7 @@ e_day_view_top_item_draw_triangle (EDayViewTopItem *dvtitem, This is needed so that we get button/motion events. */ static double e_day_view_top_item_point (GnomeCanvasItem *item, double x, double y, - int cx, int cy, + gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index ef8a33625d..5d6dd15563 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -306,7 +306,7 @@ static void e_day_view_foreach_event_with_uid (EDayView *day_view, static void e_day_view_free_events (EDayView *day_view); static void e_day_view_free_event_array (EDayView *day_view, GArray *array); -static int e_day_view_add_event (ECalComponent *comp, +static gint e_day_view_add_event (ECalComponent *comp, time_t start, time_t end, gpointer data); @@ -509,8 +509,8 @@ time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpo static void process_component (EDayView *day_view, ECalModelComponent *comp_data) { - const char *uid; - char *rid = NULL; + const gchar *uid; + gchar *rid = NULL; ECalComponent *comp; AddEventData add_event_data; @@ -543,13 +543,13 @@ process_component (EDayView *day_view, ECalModelComponent *comp_data) } static void -update_row (EDayView *day_view, int row) +update_row (EDayView *day_view, gint row) { ECalModelComponent *comp_data; ECalModel *model; gint day, event_num; - const char *uid = NULL; - char *rid = NULL; + const gchar *uid = NULL; + gchar *rid = NULL; e_day_view_stop_editing_event (day_view); @@ -579,7 +579,7 @@ update_row (EDayView *day_view, int row) } static void -model_row_changed_cb (ETableModel *etm, int row, gpointer user_data) +model_row_changed_cb (ETableModel *etm, gint row, gpointer user_data) { EDayView *day_view = E_DAY_VIEW (user_data); @@ -591,7 +591,7 @@ model_row_changed_cb (ETableModel *etm, int row, gpointer user_data) } static void -model_cell_changed_cb (ETableModel *etm, int col, int row, gpointer user_data) +model_cell_changed_cb (ETableModel *etm, gint col, gint row, gpointer user_data) { EDayView *day_view = E_DAY_VIEW (user_data); @@ -603,11 +603,11 @@ model_cell_changed_cb (ETableModel *etm, int col, int row, gpointer user_data) } static void -model_rows_inserted_cb (ETableModel *etm, int row, int count, gpointer user_data) +model_rows_inserted_cb (ETableModel *etm, gint row, gint count, gpointer user_data) { EDayView *day_view = E_DAY_VIEW (user_data); ECalModel *model; - int i; + gint i; if (!E_CALENDAR_VIEW (day_view)->in_focus) { return; @@ -648,8 +648,8 @@ model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data) for (l = list; l != NULL; l = g_slist_next (l)) { ECalModelComponent *comp_data = l->data; gint day, event_num; - const char *uid = NULL; - char *rid = NULL; + const gchar *uid = NULL; + gchar *rid = NULL; uid = icalcomponent_get_uid (comp_data->icalcomp); if (e_cal_util_component_is_instance (comp_data->icalcomp)) { @@ -1527,12 +1527,12 @@ e_day_view_recalc_cell_sizes (EDayView *day_view) { /* An array of dates, one for each month in the year 2000. They must all be Sundays. */ - static const int days[12] = { 23, 20, 19, 23, 21, 18, + static const gint days[12] = { 23, 20, 19, 23, 21, 18, 23, 20, 17, 22, 19, 24 }; gfloat width, offset; gint day, max_width; struct tm date_tm; - char buffer[128]; + gchar buffer[128]; PangoContext *pango_context; PangoLayout *layout; gint pango_width; @@ -1713,7 +1713,7 @@ e_day_view_foreach_event_with_uid (EDayView *day_view, { EDayViewEvent *event; gint day, event_num; - const char *u; + const gchar *u; for (day = 0; day < day_view->days_shown; day++) { for (event_num = day_view->events[day]->len - 1; @@ -1840,7 +1840,7 @@ e_day_view_update_event_label (EDayView *day_view, EDayViewEvent *event; gboolean free_text = FALSE, editing_event = FALSE, short_event = FALSE; const gchar *summary; - char *text; + gchar *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 : (char *) ""; + text = summary ? (gchar *) summary : (gchar *) ""; if (day_view->editing_event_day == day && day_view->editing_event_num == event_num) @@ -1908,7 +1908,7 @@ e_day_view_update_long_event_label (EDayView *day_view, NULL); if (free_text) - g_free ((gchar*)summary); + g_free ((gchar *)summary); if (e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING) && e_cal_util_component_has_attendee (event->comp_data->icalcomp)) @@ -1973,8 +1973,8 @@ e_day_view_find_event_from_uid (EDayView *day_view, { EDayViewEvent *event; gint day, event_num; - const char *u; - char *r = NULL; + const gchar *u; + gchar *r = NULL; if (!uid) return FALSE; @@ -2296,7 +2296,7 @@ e_day_view_recalc_day_starts (EDayView *day_view, time_t start_time) { gint day; - char *str; + gchar *str; struct icaltimetype tt; GDate dt; @@ -2579,8 +2579,8 @@ e_day_view_update_marcus_bains (EDayView *day_view) void e_day_view_set_marcus_bains (EDayView *day_view, gboolean show_line, - const char *dayview_color, - const char *timebar_color) + const gchar *dayview_color, + const gchar *timebar_color) { g_return_if_fail (E_IS_DAY_VIEW (day_view)); @@ -3969,7 +3969,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view) ECal *client; CalObjModType mod = CALOBJ_MOD_ALL; GtkWindow *toplevel; - int is_date; + gint is_date; event_num = day_view->resize_event_num; event = &g_array_index (day_view->long_events, EDayViewEvent, @@ -4798,8 +4798,8 @@ e_day_view_ensure_events_sorted (EDayView *day_view) gint -e_day_view_event_sort_func (const void *arg1, - const void *arg2) +e_day_view_event_sort_func (gconstpointer arg1, + gconstpointer arg2) { EDayViewEvent *event1, *event2; @@ -4830,7 +4830,7 @@ e_day_view_add_new_event_in_selected_range (EDayView *day_view, GdkEventKey *key time_t dtstart, dtend; ECalComponentDateTime start_dt, end_dt; struct icaltimetype start_tt, end_tt; - const char *uid; + const gchar *uid; AddEventData add_event_data; gboolean read_only = TRUE; @@ -5743,7 +5743,7 @@ e_day_view_start_editing_event (EDayView *day_view, ((EText *)(event->canvas_item))->need_im_reset = TRUE; } else { - char *initial_text; + gchar *initial_text; initial_text = e_utf8_from_gtk_event_key (GTK_WIDGET (day_view), key_event->keyval, key_event->string); gnome_canvas_item_set (event->canvas_item, @@ -5789,7 +5789,7 @@ e_day_view_stop_editing_event (EDayView *day_view) static void cancel_editing (EDayView *day_view) { - int day, event_num; + gint day, event_num; EDayViewEvent *event; const gchar *summary; @@ -5815,7 +5815,7 @@ cancel_editing (EDayView *day_view) } static EDayViewEvent * -tooltip_get_view_event (EDayView *day_view, int day, int event_num) +tooltip_get_view_event (EDayView *day_view, gint day, gint event_num) { EDayViewEvent *pevent; @@ -5834,8 +5834,8 @@ static void tooltip_destroy (EDayView *day_view, GnomeCanvasItem *item) { EDayViewEvent *pevent; - int event_num = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-num")); - int day = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-day")); + gint event_num = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-num")); + gint day = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-day")); pevent = tooltip_get_view_event (day_view, day, event_num); if (pevent) { @@ -5954,7 +5954,7 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item, &day, &row, &event_num); } else { - int tmp; + gint tmp; pos = e_day_view_convert_position_in_top_canvas (day_view, event_x, event_y, @@ -5993,8 +5993,8 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item, case GDK_MOTION_NOTIFY: { EDayViewEvent *pevent; - int event_num = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-num")); - int day = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-day")); + gint event_num = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-num")); + gint day = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-day")); pevent = tooltip_get_view_event (day_view, day, event_num); @@ -6343,7 +6343,7 @@ e_day_view_on_editing_stopped (EDayView *day_view, on_server = cal_comp_is_on_server (comp, client); if (string_is_empty (text) && !on_server) { - const char *uid; + const gchar *uid; e_cal_component_get_uid (comp, &uid); @@ -7380,7 +7380,7 @@ e_day_view_on_drag_data_get (GtkWidget *widget, if (info == TARGET_CALENDAR_EVENT || info == TARGET_VCALENDAR) { /* we will pass an icalcalendar component for both types */ - char *comp_str; + gchar *comp_str; icalcomponent *vcal; vcal = e_cal_util_new_top_level (); @@ -7390,15 +7390,15 @@ e_day_view_on_drag_data_get (GtkWidget *widget, comp_str = icalcomponent_as_ical_string_r (vcal); if (comp_str) { ESource *source = e_cal_get_source (event->comp_data->client); - const char *source_uid = e_source_peek_uid (source); - char *tmp; + const gchar *source_uid = e_source_peek_uid (source); + gchar *tmp; if (!source_uid) source_uid = ""; tmp = g_strconcat (source_uid, "\n", comp_str, NULL); gtk_selection_data_set (selection_data, selection_data->target, - 8, (unsigned char *)tmp, strlen (tmp)); + 8, (guchar *)tmp, strlen (tmp)); g_free (tmp); } @@ -7570,7 +7570,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget, && !drag_from_same_window) { /* We are dragging between different window */ - char *comp_str; + gchar *comp_str; icalcomponent *icalcomp; icalcomponent_kind kind; time_t dtstart; @@ -7582,8 +7582,8 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget, if (pos == E_CALENDAR_VIEW_POS_OUTSIDE) goto error; - comp_str = (char *) data->data; - icalcomp = icalparser_parse_string ((const char *) comp_str); + comp_str = (gchar *) data->data; + icalcomp = icalparser_parse_string ((const gchar *) comp_str); if (!icalcomp) goto error; @@ -7776,7 +7776,7 @@ e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget, && !drag_from_same_window) { /* We are dragging between different window */ - char *comp_str; + gchar *comp_str; icalcomponent *icalcomp; icalcomponent_kind kind; time_t dtstart; @@ -7788,8 +7788,8 @@ e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget, if (pos == E_CALENDAR_VIEW_POS_OUTSIDE) goto error; - comp_str = (char *) data->data; - icalcomp = icalparser_parse_string ((const char *) comp_str); + comp_str = (gchar *) data->data; + icalcomp = icalparser_parse_string ((const gchar *) comp_str); if (!icalcomp) goto error; diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index d22201e3f3..8fde1e9ad7 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -299,8 +299,8 @@ struct _EDayView /* Whether we show the Marcus Bains Line in the main canvas and time canvas. */ gboolean show_marcus_bains_line; - char *marcus_bains_day_view_color; - char *marcus_bains_time_bar_color; + gchar *marcus_bains_day_view_color; + gchar *marcus_bains_time_bar_color; /* Whether we use show event end times in the main canvas. */ gboolean show_event_end_times; @@ -530,8 +530,8 @@ void e_day_view_set_working_day (EDayView *day_view, gboolean e_day_view_get_show_marcus_bains (EDayView *day_view); void e_day_view_set_marcus_bains (EDayView *day_view, gboolean show_line, - const char *dayview_color, - const char *timebar_color); + const gchar *dayview_color, + const gchar *timebar_color); /* Whether we display event end times in the main canvas. */ gboolean e_day_view_get_show_event_end_times (EDayView *day_view); diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 12442ba2c2..1876d36832 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -62,7 +62,7 @@ struct _EItipControlPrivate { ECal *current_ecal; ECalSourceType type; - char action; + gchar action; gboolean rsvp; /* Use the gpointer variants for weak pointers. */ @@ -79,7 +79,7 @@ struct _EItipControlPrivate { gpointer pointer; } vbox; - char *vcalendar; + gchar *vcalendar; ECalComponent *comp; icalcomponent *main_comp; icalcomponent *ical_comp; @@ -87,8 +87,8 @@ struct _EItipControlPrivate { icalcompiter iter; icalproperty_method method; - int current; - int total; + gint current; + gint total; gchar *calendar_uid; @@ -201,10 +201,10 @@ start_calendar_server (EItipControl *itip, ESource *source, ECalSourceType type, } static ECal * -start_calendar_server_by_uid (EItipControl *itip, const char *uid, ECalSourceType type) +start_calendar_server_by_uid (EItipControl *itip, const gchar *uid, ECalSourceType type) { EItipControlPrivate *priv; - int i; + gint i; priv = itip->priv; @@ -221,8 +221,8 @@ start_calendar_server_by_uid (EItipControl *itip, const char *uid, ECalSourceTyp typedef struct { EItipControl *itip; - char *uid; - int count; + gchar *uid; + gint count; gboolean show_selector; } EItipControlFindData; @@ -275,7 +275,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) if (fd->count == 0) { if (fd->show_selector && !priv->current_ecal && priv->vbox.widget) { GtkWidget *escb; - char *uid; + gchar *uid; switch (priv->type) { case E_CAL_SOURCE_TYPE_EVENT: @@ -324,7 +324,7 @@ find_server (EItipControl *itip, ECalComponent *comp, gboolean show_selector) EItipControlPrivate *priv; EItipControlFindData *fd = NULL; GSList *groups, *l; - const char *uid; + const gchar *uid; priv = itip->priv; @@ -358,7 +358,7 @@ find_server (EItipControl *itip, ECalComponent *comp, gboolean show_selector) } static void -cleanup_ecal (void *data) +cleanup_ecal (gpointer data) { ECal *ecal = data; @@ -385,7 +385,7 @@ e_itip_control_init (EItipControl *itip) { EItipControlPrivate *priv; GtkWidget *scrolled_window; - int i; + gint i; priv = g_new0 (EItipControlPrivate, 1); itip->priv = priv; @@ -489,7 +489,7 @@ e_itip_control_destroy (GtkObject *obj) priv = itip->priv; if (priv) { - int i; + gint i; clean_up (itip); @@ -525,7 +525,7 @@ find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_par { EItipControlPrivate *priv; icalproperty *prop; - char *my_alt_address = NULL; + gchar *my_alt_address = NULL; priv = itip->priv; @@ -534,8 +534,8 @@ find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_par prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) { icalvalue *value; icalparameter *param; - const char *attendee, *name; - char *attendee_clean, *name_clean; + const gchar *attendee, *name; + gchar *attendee_clean, *name_clean; EIterator *it; value = icalproperty_get_value (prop); @@ -559,7 +559,7 @@ find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_par } if (priv->delegator_address) { - char *delegator_clean; + gchar *delegator_clean; delegator_clean = g_strdup (itip_strip_mailto (attendee)); delegator_clean = g_strstrip (delegator_clean); @@ -617,7 +617,7 @@ find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_par } static icalproperty * -find_attendee (icalcomponent *ical_comp, const char *address) +find_attendee (icalcomponent *ical_comp, const gchar *address) { icalproperty *prop; @@ -628,8 +628,8 @@ find_attendee (icalcomponent *ical_comp, const char *address) prop != NULL; prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) { icalvalue *value; - const char *attendee; - char *text; + const gchar *attendee; + gchar *text; value = icalproperty_get_value (prop); if (!value) @@ -652,14 +652,14 @@ find_attendee (icalcomponent *ical_comp, const char *address) static void write_label_piece (EItipControl *itip, ECalComponentDateTime *dt, GString *buffer, - const char *stext, const char *etext, + const gchar *stext, const gchar *etext, gboolean just_date) { EItipControlPrivate *priv; struct tm tmp_tm; - char time_buf[64]; + gchar time_buf[64]; icaltimezone *zone = NULL; - const char *display_name; + const gchar *display_name; priv = itip->priv; @@ -711,8 +711,8 @@ write_label_piece (EItipControl *itip, ECalComponentDateTime *dt, g_string_append (buffer, etext); } -static const char * -nth (int n) +static const gchar * +nth (gint n) { if (n == -1) return "last"; @@ -722,7 +722,7 @@ nth (int n) return e_cal_recur_nth[n]; } -static const char *dayname[] = { +static const gchar *dayname[] = { N_("Sunday"), N_("Monday"), N_("Tuesday"), @@ -732,8 +732,8 @@ static const char *dayname[] = { N_("Saturday") }; -static const char * -get_dayname (struct icalrecurrencetype *r, int i) +static const gchar * +get_dayname (struct icalrecurrencetype *r, gint i) { enum icalrecurrencetype_weekday day; @@ -749,7 +749,7 @@ write_recurrence_piece (EItipControl *itip, ECalComponent *comp, { GSList *rrules; struct icalrecurrencetype *r; - int i; + gint i; g_string_append_len (buffer, "Recurring: ", 18); @@ -815,7 +815,7 @@ write_recurrence_piece (EItipControl *itip, ECalComponent *comp, buffer, _("The %s day of "), nth (r->by_month_day[0])); } else { - int pos; + gint pos; /* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not accept BYDAY=2TU. So we now use the same as Outlook @@ -1035,7 +1035,7 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title, ECalComponentOrganizer organizer; ECalComponentAttendee *attendee; GSList *attendees, *l = NULL; - const char *string; + const gchar *string; gchar *html; const gchar *const_html; gchar *filename; @@ -1237,37 +1237,37 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title, } -static char* +static gchar * get_publish_options (void) { return g_strdup_printf (""); } -static char* +static gchar * get_request_options (void) { return g_strdup_printf (""); } -static char* +static gchar * get_request_fb_options (void) { return g_strdup_printf (""); } -static char* +static gchar * get_reply_options (void) { return g_strdup_printf (""); } -static char* +static gchar * get_refresh_options (void) { return g_strdup_printf (""); } -static char* +static gchar * get_cancel_options (gboolean found, icalcomponent_kind kind) { if (!found) { @@ -1292,7 +1292,7 @@ get_real_item (EItipControl *itip) ECalComponent *comp; icalcomponent *icalcomp; gboolean found = FALSE; - const char *uid; + const gchar *uid; priv = itip->priv; @@ -1320,7 +1320,7 @@ adjust_item (EItipControl *itip, ECalComponent *comp) real_comp = get_real_item (itip); if (real_comp != NULL) { ECalComponentText text; - const char *string; + const gchar *string; GSList *l; e_cal_component_get_summary (real_comp, &text); @@ -1344,7 +1344,7 @@ show_current_event (EItipControl *itip) { EItipControlPrivate *priv; const gchar *itip_title, *itip_desc; - char *options; + gchar *options; gboolean show_selector = FALSE; priv = itip->priv; @@ -1420,7 +1420,7 @@ show_current_todo (EItipControl *itip) { EItipControlPrivate *priv; const gchar *itip_title, *itip_desc; - char *options; + gchar *options; gboolean show_selector = FALSE; priv = itip->priv; @@ -1497,7 +1497,7 @@ show_current_freebusy (EItipControl *itip) { EItipControlPrivate *priv; const gchar *itip_title, *itip_desc; - char *options; + gchar *options; priv = itip->priv; @@ -1567,7 +1567,7 @@ show_current (EItipControl *itip) /* Determine any delegate sections */ prop = icalcomponent_get_first_property (priv->ical_comp, ICAL_X_PROPERTY); while (prop) { - const char *x_name, *x_val; + const gchar *x_name, *x_val; x_name = icalproperty_get_x_name (prop); x_val = icalproperty_get_x (prop); @@ -1605,7 +1605,7 @@ show_current (EItipControl *itip) /* Add default reminder if the config says so */ if (calendar_config_get_use_default_reminder ()) { ECalComponentAlarm *acomp; - int interval; + gint interval; CalUnits units; ECalComponentAlarmTrigger trigger; @@ -1880,7 +1880,7 @@ e_itip_control_get_calendar_uid (EItipControl *itip) static gboolean -change_status (icalcomponent *ical_comp, const char *address, icalparameter_partstat status) +change_status (icalcomponent *ical_comp, const gchar *address, icalparameter_partstat status) { icalproperty *prop; @@ -1930,7 +1930,7 @@ update_item (EItipControl *itip) { EItipControlPrivate *priv; struct icaltimetype stamp; - char *str; + gchar *str; icalproperty *prop; icalcomponent *clone; GtkWidget *dialog; @@ -1985,7 +1985,7 @@ update_attendee_status (EItipControl *itip) EItipControlPrivate *priv; ECalComponent *comp = NULL; icalcomponent *icalcomp = NULL; - const char *uid; + const gchar *uid; GtkWidget *dialog; GError *error = NULL; @@ -2174,8 +2174,8 @@ send_freebusy (EItipControl *itip) static void url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data) -{ unsigned char buffer[4096]; - int len, fd; +{ guchar buffer[4096]; + gint len, fd; if ((fd = g_open (url, O_RDONLY|O_BINARY, 0)) == -1) { g_warning ("%s", g_strerror (errno)); @@ -2183,7 +2183,7 @@ url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpoint } while ((len = read (fd, buffer, 4096)) > 0) { - gtk_html_write (html, handle, (char *)buffer, len); + gtk_html_write (html, handle, (gchar *)buffer, len); } if (len < 0) { @@ -2239,7 +2239,7 @@ option_activated_cb (GtkWidget *widget, gpointer data) } static void -add_option (EItipControl *itip, GtkWidget *combo, const char *text, char action) +add_option (EItipControl *itip, GtkWidget *combo, const gchar *text, gchar action) { GtkTreeIter iter; GtkListStore *store; @@ -2282,7 +2282,7 @@ static void insert_label (GtkWidget *hbox) { GtkWidget *label; - char *text; + gchar *text; text = g_strdup_printf ("%s", _("Choose an action:")); label = gtk_label_new (NULL); @@ -2570,7 +2570,7 @@ ok_clicked_cb (GtkWidget *widget, gpointer data) icalcomponent *ical_comp; icalproperty *prop; icalvalue *value; - const char *attendee; + const gchar *attendee; GSList *l, *list = NULL; comp = e_cal_component_clone (priv->comp); @@ -2587,7 +2587,7 @@ ok_clicked_cb (GtkWidget *widget, gpointer data) prop != NULL; prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) { - char *text; + gchar *text; value = icalproperty_get_value (prop); if (!value) diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c index 0b5e147407..52d5860e29 100644 --- a/calendar/gui/e-meeting-attendee.c +++ b/calendar/gui/e-meeting-attendee.c @@ -669,8 +669,8 @@ compare_times (EMeetingTime *time1, } static gint -compare_period_starts (const void *arg1, - const void *arg2) +compare_period_starts (gconstpointer arg1, + gconstpointer arg2) { EMeetingFreeBusyPeriod *period1, *period2; diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index c903c97c23..8567aa07fa 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -122,7 +122,7 @@ e_meeting_list_view_class_init (EMeetingListViewClass *klass) static void -add_section (ENameSelector *name_selector, const char *name) +add_section (ENameSelector *name_selector, const gchar *name) { ENameSelectorModel *name_selector_model; @@ -160,11 +160,11 @@ get_type_strings (void) { GList *strings = NULL; - strings = g_list_append (strings, (char*) _("Individual")); - strings = g_list_append (strings, (char*) _("Group")); - strings = g_list_append (strings, (char*) _("Resource")); - strings = g_list_append (strings, (char*) _("Room")); - strings = g_list_append (strings, (char*) _("Unknown")); + strings = g_list_append (strings, (gchar *) _("Individual")); + strings = g_list_append (strings, (gchar *) _("Group")); + strings = g_list_append (strings, (gchar *) _("Resource")); + strings = g_list_append (strings, (gchar *) _("Room")); + strings = g_list_append (strings, (gchar *) _("Unknown")); return strings; } @@ -174,11 +174,11 @@ get_role_strings (void) { GList *strings = NULL; - strings = g_list_append (strings, (char*) _("Chair")); - strings = g_list_append (strings, (char*) _("Required Participant")); - strings = g_list_append (strings, (char*) _("Optional Participant")); - strings = g_list_append (strings, (char*) _("Non-Participant")); - strings = g_list_append (strings, (char*) _("Unknown")); + strings = g_list_append (strings, (gchar *) _("Chair")); + strings = g_list_append (strings, (gchar *) _("Required Participant")); + strings = g_list_append (strings, (gchar *) _("Optional Participant")); + strings = g_list_append (strings, (gchar *) _("Non-Participant")); + strings = g_list_append (strings, (gchar *) _("Unknown")); return strings; } @@ -188,8 +188,8 @@ get_rsvp_strings (void) { GList *strings = NULL; - strings = g_list_append (strings, (char*) _("Yes")); - strings = g_list_append (strings, (char*) _("No")); + strings = g_list_append (strings, (gchar *) _("Yes")); + strings = g_list_append (strings, (gchar *) _("No")); return strings; } @@ -199,11 +199,11 @@ get_status_strings (void) { GList *strings = NULL; - strings = g_list_append (strings, (char*) _("Needs Action")); - strings = g_list_append (strings, (char*) _("Accepted")); - strings = g_list_append (strings, (char*) _("Declined")); - strings = g_list_append (strings, (char*) _("Tentative")); - strings = g_list_append (strings, (char*) _("Delegated")); + strings = g_list_append (strings, (gchar *) _("Needs Action")); + strings = g_list_append (strings, (gchar *) _("Accepted")); + strings = g_list_append (strings, (gchar *) _("Declined")); + strings = g_list_append (strings, (gchar *) _("Tentative")); + strings = g_list_append (strings, (gchar *) _("Delegated")); return strings; } @@ -213,7 +213,7 @@ value_edited (GtkTreeView *view, gint col, const gchar *path, const gchar *text) { EMeetingStore *model = E_MEETING_STORE (gtk_tree_view_get_model (view)); GtkTreePath *treepath = gtk_tree_path_new_from_string (path); - int row = gtk_tree_path_get_indices (treepath)[0]; + gint row = gtk_tree_path_get_indices (treepath)[0]; e_meeting_store_set_value (model, row, col, text); gtk_tree_path_free (treepath); @@ -264,7 +264,7 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view, GList *destinations, *l; EDestinationStore *destination_store; ENameSelectorModel *name_selector_model; - const char *madd = NULL; + const gchar *madd = NULL; EMeetingListViewPrivate *priv; guint i = 1; @@ -278,7 +278,7 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view, madd = itip_strip_mailto (e_meeting_attendee_get_address (ma)); for (l = destinations; l; l = g_list_next (l)) { - const char *attendee = NULL; + const gchar *attendee = NULL; EDestination *des = l->data; @@ -354,7 +354,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address { EMeetingStore *model = E_MEETING_STORE (gtk_tree_view_get_model (view)); GtkTreePath *treepath = gtk_tree_path_new_from_string (path); - int row = gtk_tree_path_get_indices (treepath)[0]; + gint row = gtk_tree_path_get_indices (treepath)[0]; EMeetingAttendee *existing_attendee; gboolean removed = FALSE, address_changed = FALSE; @@ -365,7 +365,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address GList *l, *m; for (l = addresses, m = names; l && m; l = l->next, m = m->next) { - char *name = m->data, *email = l->data; + gchar *name = m->data, *email = l->data; if (!((name && *name) || (email && *email))) continue; @@ -374,7 +374,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address continue; attendee = e_meeting_store_add_attendee_with_defaults (model); - e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (char *)l->data)); + e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (gchar *)l->data)); e_meeting_attendee_set_cn (attendee, g_strdup (m->data)); if (existing_attendee) { /* FIXME Should we copy anything else? */ @@ -395,8 +395,8 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address } } else if (g_list_length (addresses) == 1) { - char *name = names->data, *email = addresses->data; - int existing_row; + gchar *name = names->data, *email = addresses->data; + gint existing_row; if (!((name && *name) || (email && *email)) || ((e_meeting_store_find_attendee (model, email, &existing_row) != NULL) && existing_row != row)){ if (existing_attendee) { @@ -430,7 +430,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address } } else { if (existing_attendee) { - const char *address = e_meeting_attendee_get_address (existing_attendee); + const gchar *address = e_meeting_attendee_get_address (existing_attendee); if (!(address && *address)) { removed = TRUE; @@ -456,7 +456,7 @@ attendee_editing_canceled_cb (GtkCellRenderer *renderer, GtkTreeView *view) EMeetingStore *model = E_MEETING_STORE (gtk_tree_view_get_model (view)); GtkTreePath *path; EMeetingAttendee *existing_attendee; - int row; + gint row; /* This is for newly added attendees when the editing is cancelled */ gtk_tree_view_get_cursor (view, &path, NULL); @@ -534,7 +534,7 @@ build_table (EMeetingListView *lview) EMeetingListViewPrivate *priv; GHashTable *edit_table; GtkTreeViewColumn *col; - int pos; + gint pos; priv = lview->priv; edit_table = priv->renderers; @@ -618,7 +618,7 @@ static void change_edit_cols_for_user (gpointer key, gpointer value, gpointer user_data) { GtkCellRenderer *renderer = (GtkCellRenderer *) value; - int key_val = GPOINTER_TO_INT (key); + gint key_val = GPOINTER_TO_INT (key); switch (key_val) { case E_MEETING_STORE_ATTENDEE_COL: @@ -652,7 +652,7 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view) { EMeetingAttendee *existing_attendee; EMeetingListViewPrivate *priv; - int row; + gint row; EMeetingAttendeeEditLevel el; gint edit_level; GtkTreeModel *model; @@ -776,7 +776,7 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role ENameSelectorDialog *dialog; EContactStore *c_store; GList *books, *l; - char *uri = e_contact_get (contact, E_CONTACT_BOOK_URI); + gchar *uri = e_contact_get (contact, E_CONTACT_BOOK_URI); dialog = e_name_selector_peek_dialog (view->priv->name_selector); c_store = dialog->name_selector_model->contact_store; @@ -793,11 +793,11 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role if (book) { GList *contacts; EContact *n_con = NULL; - char *qu; + gchar *qu; EBookQuery *query; qu = g_strdup_printf ("(is \"full_name\" \"%s\")", - (char *) e_contact_get (contact, E_CONTACT_FULL_NAME)); + (gchar *) e_contact_get (contact, E_CONTACT_FULL_NAME)); query = e_book_query_from_string (qu); if (!e_book_get_contacts (book, query, &contacts, NULL)) { @@ -829,8 +829,8 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role for (l = list_dests; l; l = l->next) { EDestination *dest = l->data; EContact *contact; - const char *name, *attendee = NULL; - char *attr = NULL, *fburi = NULL; + const gchar *name, *attendee = NULL; + gchar *attr = NULL, *fburi = NULL; name = e_destination_get_name (dest); @@ -907,7 +907,7 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin ENameSelectorModel *name_selector_model; EMeetingStore *store; const GPtrArray *attendees; - int i; + gint i; GSList *la = NULL, *l; name_selector_model = e_name_selector_peek_model (view->priv->name_selector); @@ -936,8 +936,8 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin /* remove the deleted attendees from name selector */ for (l = la; l != NULL; l = l->next) { EMeetingAttendee *ma = NULL; - const char *email = l->data; - int i; + const gchar *email = l->data; + gint i; ma = e_meeting_store_find_attendee (store, email, &i); diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index 5e6270976a..e843bee2f5 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -46,7 +46,7 @@ struct _EMeetingStorePrivate { ECal *client; icaltimezone *zone; - char *fb_uri; + gchar *fb_uri; GPtrArray *refresh_queue; GHashTable *refresh_data; @@ -69,7 +69,7 @@ struct _EMeetingStoreQueueData { EMeetingTime start; EMeetingTime end; - char buffer[BUF_SIZE]; + gchar buffer[BUF_SIZE]; GString *string; GPtrArray *call_backs; @@ -80,7 +80,7 @@ struct _EMeetingStoreQueueData { static GObjectClass *parent_class = NULL; static icalparameter_cutype -text_to_type (const char *type) +text_to_type (const gchar *type) { if (!e_util_utf8_strcasecmp (type, _("Individual"))) return ICAL_CUTYPE_INDIVIDUAL; @@ -94,7 +94,7 @@ text_to_type (const char *type) return ICAL_CUTYPE_NONE; } -static char * +static gchar * type_to_text (icalparameter_cutype type) { switch (type) { @@ -115,7 +115,7 @@ type_to_text (icalparameter_cutype type) } static icalparameter_role -text_to_role (const char *role) +text_to_role (const gchar *role) { if (!e_util_utf8_strcasecmp (role, _("Chair"))) return ICAL_ROLE_CHAIR; @@ -129,7 +129,7 @@ text_to_role (const char *role) return ICAL_ROLE_NONE; } -static char * +static gchar * role_to_text (icalparameter_role role) { switch (role) { @@ -147,7 +147,7 @@ role_to_text (icalparameter_role role) } static gboolean -text_to_boolean (const char *role) +text_to_boolean (const gchar *role) { if (!e_util_utf8_strcasecmp (role, _("Yes"))) return TRUE; @@ -155,7 +155,7 @@ text_to_boolean (const char *role) return FALSE; } -static char * +static gchar * boolean_to_text (gboolean b) { if (b) @@ -165,7 +165,7 @@ boolean_to_text (gboolean b) } static icalparameter_partstat -text_to_partstat (const char *partstat) +text_to_partstat (const gchar *partstat) { if (!e_util_utf8_strcasecmp (partstat, _("Needs Action"))) return ICAL_PARTSTAT_NEEDSACTION; @@ -185,7 +185,7 @@ text_to_partstat (const char *partstat) return ICAL_PARTSTAT_NONE; } -static char * +static gchar * partstat_to_text (icalparameter_partstat partstat) { switch (partstat) { @@ -226,7 +226,7 @@ get_n_columns (GtkTreeModel *model) } static GType -get_column_type (GtkTreeModel *model, int col) +get_column_type (GtkTreeModel *model, gint col) { g_return_val_if_fail (E_IS_MEETING_STORE (model), G_TYPE_INVALID); @@ -253,7 +253,7 @@ get_column_type (GtkTreeModel *model, int col) static gboolean get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path) { - int row; + gint row; g_return_val_if_fail (E_IS_MEETING_STORE (model), FALSE); g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE); @@ -272,7 +272,7 @@ get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path) static GtkTreePath * get_path (GtkTreeModel *model, GtkTreeIter *iter) { - int row; + gint row; GtkTreePath *result; g_return_val_if_fail (E_IS_MEETING_STORE (model), NULL); @@ -288,12 +288,12 @@ get_path (GtkTreeModel *model, GtkTreeIter *iter) } static void -get_value (GtkTreeModel *model, GtkTreeIter *iter, int col, GValue *value) +get_value (GtkTreeModel *model, GtkTreeIter *iter, gint col, GValue *value) { EMeetingStore *store; EMeetingAttendee *attendee; const gchar *cn; - int row; + gint row; g_return_if_fail (E_IS_MEETING_STORE (model)); g_return_if_fail (col >= 0 && col < E_MEETING_STORE_COLUMN_COUNT); @@ -365,7 +365,7 @@ get_value (GtkTreeModel *model, GtkTreeIter *iter, int col, GValue *value) static gboolean iter_next (GtkTreeModel *model, GtkTreeIter *iter) { - int row; + gint row; g_return_val_if_fail (E_IS_MEETING_STORE (model), FALSE); g_return_val_if_fail (iter->stamp == E_MEETING_STORE (model)->priv->stamp, FALSE); @@ -414,7 +414,7 @@ iter_n_children (GtkTreeModel *model, GtkTreeIter *iter) } static gboolean -iter_nth_child (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent, int n) +iter_nth_child (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent, gint n) { EMeetingStore *store; @@ -455,15 +455,15 @@ ems_tree_model_init (GtkTreeModelIface *iface) } void -e_meeting_store_set_value (EMeetingStore *store, int row, int col, const gchar *val) +e_meeting_store_set_value (EMeetingStore *store, gint row, gint col, const gchar *val) { icalparameter_cutype type; EMeetingAttendee *attendee = g_ptr_array_index (store->priv->attendees, row); switch (col) { case E_MEETING_STORE_ADDRESS_COL: - if (val != NULL && *((char *)val)) - e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (char *) val)); + if (val != NULL && *((gchar *)val)) + e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (gchar *) val)); break; case E_MEETING_STORE_MEMBER_COL: e_meeting_attendee_set_member (attendee, g_strdup (val)); @@ -528,7 +528,7 @@ ems_finalize (GObject *obj) { EMeetingStore *store = E_MEETING_STORE (obj); EMeetingStorePrivate *priv; - int i; + gint i; priv = store->priv; @@ -729,7 +729,7 @@ EMeetingAttendee * e_meeting_store_add_attendee_with_defaults (EMeetingStore *store) { EMeetingAttendee *attendee; - char *str; + gchar *str; attendee = E_MEETING_ATTENDEE (e_meeting_attendee_new ()); @@ -808,7 +808,7 @@ EMeetingAttendee * e_meeting_store_find_attendee (EMeetingStore *store, const gchar *address, gint *row) { EMeetingAttendee *attendee; - int i; + gint i; if (address == NULL) return NULL; @@ -882,7 +882,7 @@ find_zone (icalproperty *ip, icalcomponent *tz_top_level) { icalparameter *param; icalcomponent *sub_comp; - const char *tzid; + const gchar *tzid; icalcompiter iter; if (tz_top_level == NULL) @@ -897,7 +897,7 @@ find_zone (icalproperty *ip, icalcomponent *tz_top_level) while ((sub_comp = icalcompiter_deref (&iter)) != NULL) { icalcomponent *clone; icalproperty *prop; - const char *tz_tzid; + const gchar *tz_tzid; prop = icalcomponent_get_first_property (sub_comp, ICAL_TZID_PROPERTY); tz_tzid = icalproperty_get_tzid (prop); @@ -921,7 +921,7 @@ static void process_callbacks (EMeetingStoreQueueData *qdata) { EMeetingStore *store; - int i; + gint i; store = qdata->store; @@ -1046,7 +1046,7 @@ process_free_busy_comp (EMeetingAttendee *attendee, } static void -process_free_busy (EMeetingStoreQueueData *qdata, char *text) +process_free_busy (EMeetingStoreQueueData *qdata, gchar *text) { EMeetingStore *store = qdata->store; EMeetingStorePrivate *priv; @@ -1112,7 +1112,7 @@ replace_string (gchar *string, const gchar *from_value, gchar *to_value) return replaced; } -static void start_async_read (const char *uri, gpointer data); +static void start_async_read (const gchar *uri, gpointer data); typedef struct { ECal *client; @@ -1120,8 +1120,8 @@ typedef struct { time_t endt; GList *users; GList *fb_data; - char *fb_uri; - char *email; + gchar *fb_uri; + gchar *email; EMeetingAttendee *attendee; EMeetingStoreQueueData *qdata; EMeetingStore *store; @@ -1136,7 +1136,7 @@ freebusy_async (gpointer data) FreeBusyAsyncData *fbd = data; EMeetingAttendee *attendee = fbd->attendee; gchar *default_fb_uri = NULL; - char *fburi = NULL; + gchar *fburi = NULL; static GStaticMutex mutex = G_STATIC_MUTEX_INIT; EMeetingStorePrivate *priv = fbd->store->priv; @@ -1154,7 +1154,7 @@ freebusy_async (gpointer data) if (fbd->fb_data != NULL) { ECalComponent *comp = fbd->fb_data->data; - char *comp_str; + gchar *comp_str; comp_str = e_cal_component_get_as_string (comp); process_free_busy (fbd->qdata, comp_str); @@ -1211,7 +1211,7 @@ refresh_busy_periods (gpointer data) EMeetingStorePrivate *priv; EMeetingAttendee *attendee = NULL; EMeetingStoreQueueData *qdata = NULL; - int i; + gint i; GThread *thread; GError *error = NULL; FreeBusyAsyncData *fbd; @@ -1304,7 +1304,7 @@ refresh_busy_periods (gpointer data) } static void -refresh_queue_add (EMeetingStore *store, int row, +refresh_queue_add (EMeetingStore *store, gint row, EMeetingTime *start, EMeetingTime *end, EMeetingStoreRefreshCallback call_back, @@ -1313,7 +1313,7 @@ refresh_queue_add (EMeetingStore *store, int row, EMeetingStorePrivate *priv; EMeetingAttendee *attendee; EMeetingStoreQueueData *qdata; - int i; + gint i; priv = store->priv; @@ -1349,7 +1349,7 @@ refresh_queue_add (EMeetingStore *store, int row, g_ptr_array_add (qdata->call_backs, call_back); g_ptr_array_add (qdata->data, data); - g_hash_table_insert (priv->refresh_data, (void *)itip_strip_mailto (e_meeting_attendee_get_address (attendee)), qdata); + g_hash_table_insert (priv->refresh_data, (gpointer)itip_strip_mailto (e_meeting_attendee_get_address (attendee)), qdata); } else { if (e_meeting_time_compare_times (start, &qdata->start) == -1) qdata->start = *start; @@ -1407,7 +1407,7 @@ async_read (GObject *source_object, GAsyncResult *res, gpointer data) } static void -start_async_read (const char *uri, gpointer data) +start_async_read (const gchar *uri, gpointer data) { EMeetingStoreQueueData *qdata = data; GError *error = NULL; @@ -1444,7 +1444,7 @@ e_meeting_store_refresh_all_busy_periods (EMeetingStore *store, EMeetingStoreRefreshCallback call_back, gpointer data) { - int i; + gint i; g_return_if_fail (E_IS_MEETING_STORE (store)); @@ -1454,7 +1454,7 @@ e_meeting_store_refresh_all_busy_periods (EMeetingStore *store, void e_meeting_store_refresh_busy_periods (EMeetingStore *store, - int row, + gint row, EMeetingTime *start, EMeetingTime *end, EMeetingStoreRefreshCallback call_back, diff --git a/calendar/gui/e-meeting-store.h b/calendar/gui/e-meeting-store.h index 8a237fc34b..f67ad92ddd 100644 --- a/calendar/gui/e-meeting-store.h +++ b/calendar/gui/e-meeting-store.h @@ -70,7 +70,7 @@ typedef gboolean (* EMeetingStoreRefreshCallback) (gpointer data); GType e_meeting_store_get_type (void); GObject *e_meeting_store_new (void); -void e_meeting_store_set_value (EMeetingStore *im, int row, int col, const gchar *val); +void e_meeting_store_set_value (EMeetingStore *im, gint row, gint col, const gchar *val); ECal *e_meeting_store_get_e_cal (EMeetingStore *im); void e_meeting_store_set_e_cal (EMeetingStore *im, ECal *client); @@ -100,7 +100,7 @@ void e_meeting_store_refresh_all_busy_periods (EMeetingStore *im, EMeetingStoreRefreshCallback call_back, gpointer data); void e_meeting_store_refresh_busy_periods (EMeetingStore *im, - int row, + gint row, EMeetingTime *start, EMeetingTime *end, EMeetingStoreRefreshCallback call_back, diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c index ae7eeb7937..95a1738057 100644 --- a/calendar/gui/e-meeting-time-sel-item.c +++ b/calendar/gui/e-meeting-time-sel-item.c @@ -49,14 +49,14 @@ static void e_meeting_time_selector_item_realize (GnomeCanvasItem *item); static void e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item); static void e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, - ArtSVP *clip_path, int flags); + ArtSVP *clip_path, gint flags); static void e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, - int x, int y, - int width, int height); + gint x, gint y, + gint width, gint height); static double e_meeting_time_selector_item_point (GnomeCanvasItem *item, double x, double y, - int cx, int cy, + gint cx, gint cy, GnomeCanvasItem **actual_item); static gint e_meeting_time_selector_item_event (GnomeCanvasItem *item, GdkEvent *event); @@ -70,17 +70,17 @@ static gint e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem static void e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, - int x, int scroll_y, - int width, int height); -static void e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int y, int width, int height); + gint x, gint scroll_y, + gint width, gint height); +static void e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, gint x, gint y, gint width, gint height); static void e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, - int x, int scroll_y, - int width, int height); -static void e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height); + gint x, gint scroll_y, + gint width, gint height); +static void e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, gint x, gint scroll_y, gint width, gint height); static gint e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *mts_item, GDate *date, gint row); -static void e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, int row, int x, int y, int width, int first_period, EMeetingFreeBusyType busy_type, cairo_t *cr); +static void e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, gint row, gint x, gint y, gint width, gint first_period, EMeetingFreeBusyType busy_type, cairo_t *cr); static EMeetingTimeSelectorPosition e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item, gint x, gint y); static gboolean e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts, @@ -232,7 +232,7 @@ e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item) static void -e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) +e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags) { if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->update) (* GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->update) (item, affine, clip_path, flags); @@ -250,7 +250,7 @@ e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtS */ static void -e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height) +e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint width, gint height) { EMeetingTimeSelector *mts; EMeetingTimeSelectorItem *mts_item; @@ -418,8 +418,8 @@ e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, static void e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, - int x, int scroll_y, - int width, int height) + gint x, gint scroll_y, + gint width, gint height) { EMeetingTimeSelector *mts; GdkGC *gc; @@ -515,7 +515,7 @@ e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item, list of attendees. For now we just paint the bars for each attendee of each other. If we want to speed it up we could optimise it later. */ static void -e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height) +e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, gint x, gint scroll_y, gint width, gint height) { EMeetingTimeSelector *mts; EMeetingAttendee *ia; @@ -565,8 +565,8 @@ e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelec static void e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, - int x, int scroll_y, - int width, int height) + gint x, gint scroll_y, + gint width, gint height) { EMeetingTimeSelector *mts; GdkGC *gc; @@ -639,7 +639,7 @@ e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item, /* This paints the colored bars representing busy periods for the individual attendees. */ static void -e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height) +e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, gint x, gint scroll_y, gint width, gint height) { EMeetingTimeSelector *mts; EMeetingFreeBusyType busy_type; @@ -722,7 +722,7 @@ e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *m busy type, e.g out of office. It is passed the index of the first visible busy period of the attendee and continues until it runs off the screen. */ static void -e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, int x, int y, int width, int row, int first_period, EMeetingFreeBusyType busy_type, cairo_t *cr) +e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, gint x, gint y, gint width, gint row, gint first_period, EMeetingFreeBusyType busy_type, cairo_t *cr) { EMeetingTimeSelector *mts; EMeetingAttendee *ia; @@ -799,7 +799,7 @@ e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorIt This is needed so that we get button/motion events. */ static double e_meeting_time_selector_item_point (GnomeCanvasItem *item, double x, double y, - int cx, int cy, + gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; @@ -875,7 +875,7 @@ e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item, if (!mts->all_day) { gint astart_year, astart_month, astart_day, astart_hour, astart_minute; gint aend_year, aend_month, aend_day, aend_hour, aend_minute; - int hdiff, mdiff; + gint hdiff, mdiff; GDate asdate, aedate; e_meeting_time_selector_get_meeting_time (mts_item->mts, diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index c10a85e341..09e1994908 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -87,7 +87,7 @@ static gint mts_signals [LAST_SIGNAL] = { 0 }; static void e_meeting_time_selector_destroy (GtkObject *object); static void e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts, - const char *name, GdkColor *c); + const gchar *name, GdkColor *c); static void e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts, GtkWidget *hbox, gchar *label_text, @@ -656,7 +656,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em e_meeting_time_selector_alloc_named_color (mts, "orange4", &mts->busy_colors[E_MEETING_FREE_BUSY_OUT_OF_OFFICE]); /* Create the stipple, for attendees with no data. */ - mts->stipple = gdk_bitmap_create_from_data (NULL, (gchar*)stipple_bits, + mts->stipple = gdk_bitmap_create_from_data (NULL, (gchar *)stipple_bits, 8, 8); /* Connect handlers to the adjustments scroll the other items. */ @@ -743,7 +743,7 @@ e_meeting_time_selector_expose_key_color (GtkWidget *darea, static void e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts, - const char *name, GdkColor *c) + const gchar *name, GdkColor *c) { GdkColormap *colormap; @@ -876,7 +876,7 @@ static int get_cell_height (GtkTreeView *tree) { GtkTreeViewColumn *column; - int height = -1; + gint height = -1; column = gtk_tree_view_get_column (tree, 0); gtk_tree_view_column_cell_get_size (column, NULL, @@ -891,7 +891,7 @@ style_change_idle_func (gpointer widget) { EMeetingTimeSelector *mts; EMeetingTime saved_time; - int hour, max_hour_width; + gint hour, max_hour_width; /*int maxheight; */ PangoFontDescription *font_desc; PangoContext *pango_context; @@ -1234,7 +1234,7 @@ e_meeting_time_selector_refresh_cb (gpointer data) } void -e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, int row, gboolean all) +e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, gint row, gboolean all) { EMeetingTime start, end; @@ -1258,7 +1258,7 @@ e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, int row, g /* FIXME We should really have a mechanism to unqueue the * notification */ if (all) { - int i; + gint i; for (i = 0; i < e_meeting_store_count_actual_attendees (mts->model); i++) g_object_ref (GTK_OBJECT (mts)); @@ -1395,7 +1395,7 @@ e_meeting_time_selector_dump (EMeetingTimeSelector *mts) /* This formats a EMeetingTimein a string and returns it. Note that it uses a static buffer. */ -gchar* +gchar * e_meeting_time_selector_dump_time (EMeetingTime*mtstime) { static gchar buffer[128]; @@ -1415,7 +1415,7 @@ e_meeting_time_selector_dump_time (EMeetingTime*mtstime) /* This formats a GDate in a string and returns it. Note that it uses a static buffer. */ -gchar* +gchar * e_meeting_time_selector_dump_date (GDate *date) { static gchar buffer[128]; @@ -2068,7 +2068,7 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts) { /* An array of dates, one for each month in the year 2000. They must all be Sundays. */ - static const int days[12] = { 23, 20, 19, 23, 21, 18, + static const gint days[12] = { 23, 20, 19, 23, 21, 18, 23, 20, 17, 22, 19, 24 }; GDate date; gint max_date_width, longest_weekday_width, longest_month_width, width; @@ -2881,7 +2881,7 @@ static void row_inserted_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) { EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data); - int row = gtk_tree_path_get_indices (path) [0]; + gint row = gtk_tree_path_get_indices (path) [0]; /* Update the scroll region. */ e_meeting_time_selector_update_main_canvas_scroll_region (mts); @@ -2897,7 +2897,7 @@ static void row_changed_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) { EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data); - int row = gtk_tree_path_get_indices (path) [0]; + gint row = gtk_tree_path_get_indices (path) [0]; /* Get the latest free/busy info */ e_meeting_time_selector_refresh_free_busy (mts, row, FALSE); @@ -2922,7 +2922,7 @@ row_deleted_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data) static gboolean free_busy_timeout_refresh (gpointer data) { - char *fb_uri; + gchar *fb_uri; EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data); diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h index 2cc82278f6..97be769917 100644 --- a/calendar/gui/e-meeting-time-sel.h +++ b/calendar/gui/e-meeting-time-sel.h @@ -382,13 +382,13 @@ void e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts, EMeetingTime*time); gint e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts, EMeetingTime *mtstime); -void e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, int row, gboolean all); +void e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, gint row, gboolean all); /* Debugging function to dump information on all attendees. */ #ifdef E_MEETING_TIME_SELECTOR_DEBUG void e_meeting_time_selector_dump (EMeetingTimeSelector *mts); -gchar* e_meeting_time_selector_dump_time (EMeetingTime*mtstime); -gchar* e_meeting_time_selector_dump_date (GDate *date); +gchar * e_meeting_time_selector_dump_time (EMeetingTime*mtstime); +gchar * e_meeting_time_selector_dump_date (GDate *date); #endif /* E_MEETING_TIME_SELECTOR_DEBUG */ G_END_DECLS diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index ac43b39a5a..cbc66c44d0 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -112,7 +112,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; /* The icons to represent the task. */ #define E_MEMO_MODEL_NUM_ICONS 2 -static const char* icon_names[E_MEMO_MODEL_NUM_ICONS] = { +static const gchar * icon_names[E_MEMO_MODEL_NUM_ICONS] = { "stock_notes", "stock_insert-note" }; static GdkPixbuf* icon_pixbufs[E_MEMO_MODEL_NUM_ICONS] = { NULL }; @@ -371,12 +371,12 @@ e_memo_table_open_selected (EMemoTable *memo_table) } /* Used from e_table_selected_row_foreach(); puts the selected row number in an - * int pointed to by the closure data. + * gint pointed to by the closure data. */ static void -get_selected_row_cb (int model_row, gpointer data) +get_selected_row_cb (gint model_row, gpointer data) { - int *row; + gint *row; row = data; *row = model_row; @@ -390,7 +390,7 @@ static ECalModelComponent * get_selected_comp (EMemoTable *memo_table) { ETable *etable; - int row; + gint row; etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (memo_table->etable)); if (e_table_selected_count (etable) != 1) @@ -412,7 +412,7 @@ struct get_selected_uids_closure { /* Used from e_table_selected_row_foreach(), builds a list of the selected UIDs */ static void -add_uid_cb (int model_row, gpointer data) +add_uid_cb (gint model_row, gpointer data) { struct get_selected_uids_closure *closure; ECalModelComponent *comp_data; @@ -489,7 +489,7 @@ void e_memo_table_delete_selected (EMemoTable *memo_table) { ETable *etable; - int n_selected; + gint n_selected; ECalModelComponent *comp_data; ECalComponent *comp = NULL; @@ -540,7 +540,7 @@ e_memo_table_cut_clipboard (EMemoTable *memo_table) /* callback for e_table_selected_row_foreach */ static void -copy_row_cb (int model_row, gpointer data) +copy_row_cb (gint model_row, gpointer data) { EMemoTable *memo_table; ECalModelComponent *comp_data; @@ -600,7 +600,7 @@ e_memo_table_copy_clipboard (EMemoTable *memo_table) { ETable *etable; GtkClipboard *clipboard; - char *comp_str; + gchar *comp_str; g_return_if_fail (E_IS_MEMO_TABLE (memo_table)); @@ -629,7 +629,7 @@ static void clipboard_get_calendar_data (EMemoTable *memo_table, const gchar *text) { icalcomponent *icalcomp; - char *uid; + gchar *uid; ECalComponent *comp; ECal *client; icalcomponent_kind kind; @@ -687,7 +687,7 @@ clipboard_get_calendar_data (EMemoTable *memo_table, const gchar *text) comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomp); uid = e_cal_component_gen_uid (); - e_cal_component_set_uid (comp, (const char *) uid); + e_cal_component_set_uid (comp, (const gchar *) uid); free (uid); e_cal_create_object (client, e_cal_component_get_icalcomponent (comp), NULL, NULL); @@ -755,7 +755,7 @@ static void open_memo (EMemoTable *memo_table, ECalModelComponent *comp_data) { CompEditor *medit; - const char *uid; + const gchar *uid; uid = icalcomponent_get_uid (comp_data->icalcomp); @@ -786,7 +786,7 @@ open_memo (EMemoTable *memo_table, ECalModelComponent *comp_data) /* Opens the task in the specified row */ static void -open_memo_by_row (EMemoTable *memo_table, int row) +open_memo_by_row (EMemoTable *memo_table, gint row) { ECalModelComponent *comp_data; @@ -806,7 +806,7 @@ e_memo_table_on_double_click (ETable *table, static void -e_memo_table_on_open_memo (EPopup *ep, EPopupItem *pitem, void *data) +e_memo_table_on_open_memo (EPopup *ep, EPopupItem *pitem, gpointer data) { EMemoTable *memo_table = E_MEMO_TABLE (data); ECalModelComponent *comp_data; @@ -817,12 +817,12 @@ e_memo_table_on_open_memo (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_memo_table_on_save_as (EPopup *ep, EPopupItem *pitem, void *data) +e_memo_table_on_save_as (EPopup *ep, EPopupItem *pitem, gpointer data) { EMemoTable *memo_table = E_MEMO_TABLE (data); ECalModelComponent *comp_data; - char *filename; - char *ical_string; + gchar *filename; + gchar *ical_string; comp_data = get_selected_comp (memo_table); if (comp_data == NULL) @@ -843,7 +843,7 @@ e_memo_table_on_save_as (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_memo_table_on_print_memo (EPopup *ep, EPopupItem *pitem, void *data) +e_memo_table_on_print_memo (EPopup *ep, EPopupItem *pitem, gpointer data) { EMemoTable *memo_table = E_MEMO_TABLE (data); ECalModelComponent *comp_data; @@ -861,7 +861,7 @@ e_memo_table_on_print_memo (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_memo_table_on_cut (EPopup *ep, EPopupItem *pitem, void *data) +e_memo_table_on_cut (EPopup *ep, EPopupItem *pitem, gpointer data) { EMemoTable *memo_table = E_MEMO_TABLE (data); @@ -869,7 +869,7 @@ e_memo_table_on_cut (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_memo_table_on_copy (EPopup *ep, EPopupItem *pitem, void *data) +e_memo_table_on_copy (EPopup *ep, EPopupItem *pitem, gpointer data) { EMemoTable *memo_table = E_MEMO_TABLE (data); @@ -877,7 +877,7 @@ e_memo_table_on_copy (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_memo_table_on_paste (EPopup *ep, EPopupItem *pitem, void *data) +e_memo_table_on_paste (EPopup *ep, EPopupItem *pitem, gpointer data) { EMemoTable *memo_table = E_MEMO_TABLE (data); @@ -885,7 +885,7 @@ e_memo_table_on_paste (EPopup *ep, EPopupItem *pitem, void *data) } static void -e_memo_table_on_forward (EPopup *ep, EPopupItem *pitem, void *data) +e_memo_table_on_forward (EPopup *ep, EPopupItem *pitem, gpointer data) { EMemoTable *memo_table = E_MEMO_TABLE (data); ECalModelComponent *comp_data; @@ -904,7 +904,7 @@ e_memo_table_on_forward (EPopup *ep, EPopupItem *pitem, void *data) /* Opens the URL of the memo */ static void -open_url_cb (EPopup *ep, EPopupItem *pitem, void *data) +open_url_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { EMemoTable *memo_table = E_MEMO_TABLE (data); ECalModelComponent *comp_data; @@ -924,7 +924,7 @@ open_url_cb (EPopup *ep, EPopupItem *pitem, void *data) /* Callback for the "delete tasks" menu item */ static void -delete_cb (EPopup *ep, EPopupItem *pitem, void *data) +delete_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { EMemoTable *memo_table = E_MEMO_TABLE (data); @@ -954,7 +954,7 @@ static EPopupItem memos_popup_items [] = { }; static void -emt_popup_free(EPopup *ep, GSList *items, void *data) +emt_popup_free(EPopup *ep, GSList *items, gpointer data) { g_slist_free(items); } @@ -969,7 +969,7 @@ e_memo_table_show_popup_menu (ETable *table, GPtrArray *events; ECalPopup *ep; ECalPopupTargetSelect *t; - int i; + gint i; selection = get_selected_objects (memo_table); if (!selection) @@ -1100,7 +1100,7 @@ e_memo_table_get_current_time (ECellDateEdit *ecde, gpointer data) #ifdef TRANSLATORS_ONLY -static char *test[] = { +static gchar *test[] = { N_("Click to add a memo") }; @@ -1128,7 +1128,7 @@ e_memo_table_set_status_message (EMemoTable *memo_table, const gchar *message) memo_table->activity_id = 0; } } else if (memo_table->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", (gpointer) memo_table); + gchar *client_id = g_strdup_printf ("%p", (gpointer) memo_table); memo_table->activity_id = e_activity_handler_operation_started ( memo_table->activity_handler, client_id, message, TRUE); diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c index f6f1cff91c..4b8d234cee 100644 --- a/calendar/gui/e-memos.c +++ b/calendar/gui/e-memos.c @@ -79,7 +79,7 @@ struct _EMemosPrivate { GtkWidget *preview; gchar *current_uid; - char *sexp; + gchar *sexp; /* View instance and the view menus handler */ GalViewInstance *view_instance; @@ -93,7 +93,7 @@ static void e_memos_destroy (GtkObject *object); static void update_view (EMemos *memos); static void categories_changed_cb (gpointer object, gpointer user_data); -static void backend_error_cb (ECal *client, const char *message, gpointer data); +static void backend_error_cb (ECal *client, const gchar *message, gpointer data); /* Signal IDs */ enum { @@ -111,7 +111,7 @@ static GtkTargetEntry list_drag_types[] = { { (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]); +static const gint num_list_drag_types = sizeof (list_drag_types) / sizeof (list_drag_types[0]); static guint e_memos_signals[LAST_SIGNAL] = { 0 }; @@ -119,16 +119,16 @@ G_DEFINE_TYPE (EMemos, e_memos, GTK_TYPE_TABLE) /* Callback used when the cursor changes in the table */ static void -table_cursor_change_cb (ETable *etable, int row, gpointer data) +table_cursor_change_cb (ETable *etable, gint row, gpointer data) { EMemos *memos; EMemosPrivate *priv; ECalModel *model; ECalModelComponent *comp_data; ECalComponent *comp; - const char *uid; + const gchar *uid; - int n_selected; + gint n_selected; memos = E_MEMOS (data); priv = memos->priv; @@ -163,7 +163,7 @@ static void table_selection_change_cb (ETable *etable, gpointer data) { EMemos *memos; - int n_selected; + gint n_selected; memos = E_MEMOS (data); @@ -199,7 +199,7 @@ user_created_cb (GtkWidget *view, EMemos *memos) /* Callback used when the sexp in the search bar changes */ static void -search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data) +search_bar_sexp_changed_cb (CalSearchBar *cal_search, const gchar *sexp, gpointer data) { EMemos *memos; EMemosPrivate *priv; @@ -217,7 +217,7 @@ search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer /* Callback used when the selected category in the search bar changes */ static void -search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data) +search_bar_category_changed_cb (CalSearchBar *cal_search, const gchar *category, gpointer data) { EMemos *memos; EMemosPrivate *priv; @@ -288,7 +288,7 @@ update_view (EMemos *memos) } static void -model_row_changed_cb (ETableModel *etm, int row, gpointer data) +model_row_changed_cb (ETableModel *etm, gint row, gpointer data) { EMemos *memos; EMemosPrivate *priv; @@ -298,7 +298,7 @@ model_row_changed_cb (ETableModel *etm, int row, gpointer data) priv = memos->priv; if (priv->current_uid) { - const char *uid; + const gchar *uid; comp_data = e_cal_model_get_component_at (E_CAL_MODEL (etm), row); if (comp_data) { @@ -340,7 +340,7 @@ struct AffectedComponents { * This function is called from e_table_selected_row_foreach. **/ static void -get_selected_components_cb (int model_row, gpointer data) +get_selected_components_cb (gint model_row, gpointer data) { struct AffectedComponents *ac = (struct AffectedComponents *) data; @@ -397,7 +397,7 @@ obtain_list_of_components (gpointer data, gpointer user_data) comp_data = (ECalModelComponent *) data; if (list && comp_data) { - char *comp_str; + gchar *comp_str; icalcomponent *vcal; vcal = e_cal_util_new_top_level (); @@ -407,7 +407,7 @@ obtain_list_of_components (gpointer data, gpointer user_data) comp_str = icalcomponent_as_ical_string_r (vcal); if (comp_str) { ESource *source = e_cal_get_source (comp_data->client); - const char *source_uid = e_source_peek_uid (source); + const gchar *source_uid = e_source_peek_uid (source); *list = g_slist_prepend (*list, g_strdup_printf ("%s\n%s", source_uid, comp_str)); @@ -422,8 +422,8 @@ obtain_list_of_components (gpointer data, gpointer user_data) static void table_drag_data_get (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, GtkSelectionData *selection_data, guint info, @@ -451,8 +451,8 @@ table_drag_data_get (ETable *table, static void table_drag_data_delete (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, EMemos *memos) { @@ -607,7 +607,7 @@ categories_changed_cb (gpointer object, gpointer user_data) cat_array = g_ptr_array_new (); cat_list = e_categories_get_list (); while (cat_list != NULL) { - if (e_categories_is_searchable ((const char *) cat_list->data)) + if (e_categories_is_searchable ((const gchar *) cat_list->data)) g_ptr_array_add (cat_array, cat_list->data); cat_list = g_list_remove (cat_list, cat_list->data); } @@ -721,11 +721,11 @@ e_memos_destroy (GtkObject *object) } static void -set_status_message (EMemos *memos, const char *message, ...) +set_status_message (EMemos *memos, const gchar *message, ...) { EMemosPrivate *priv; va_list args; - char sz[2048], *msg_string = NULL; + gchar sz[2048], *msg_string = NULL; if (message) { va_start (args, message); @@ -741,11 +741,11 @@ set_status_message (EMemos *memos, const char *message, ...) /* Callback from the calendar client when an error occurs in the backend */ static void -backend_error_cb (ECal *client, const char *message, gpointer data) +backend_error_cb (ECal *client, const gchar *message, gpointer data) { EMemos *memos; GtkWidget *dialog; - char *urinopwd; + gchar *urinopwd; memos = E_MEMOS (data); @@ -927,7 +927,7 @@ e_memos_add_memo_source (EMemos *memos, ESource *source) { EMemosPrivate *priv; ECal *client; - const char *uid; + const gchar *uid; g_return_val_if_fail (memos != NULL, FALSE); g_return_val_if_fail (E_IS_MEMOS (memos), FALSE); @@ -980,7 +980,7 @@ e_memos_remove_memo_source (EMemos *memos, ESource *source) EMemosPrivate *priv; ECal *client; ECalModel *model; - const char *uid; + const gchar *uid; g_return_val_if_fail (memos != NULL, FALSE); g_return_val_if_fail (E_IS_MEMOS (memos), FALSE); @@ -1109,7 +1109,7 @@ e_memos_setup_view_menus (EMemos *memos, BonoboUIComponent *uic) EMemosPrivate *priv; GalViewFactory *factory; ETableSpecification *spec; - char *dir0, *dir1, *filename; + gchar *dir0, *dir1, *filename; static GalViewCollection *collection = NULL; g_return_if_fail (memos != NULL); diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h index 0a000f0d73..12aeea858e 100644 --- a/calendar/gui/e-memos.h +++ b/calendar/gui/e-memos.h @@ -53,7 +53,7 @@ struct _EMemosClass { GtkTableClass parent_class; /* Notification signals */ - void (* selection_changed) (EMemos *memos, int n_selected); + void (* selection_changed) (EMemos *memos, gint n_selected); void (* source_added) (EMemos *memos, ESource *source); void (* source_removed) (EMemos *memos, ESource *source); }; diff --git a/calendar/gui/e-mini-calendar-config.c b/calendar/gui/e-mini-calendar-config.c index ccd9a2078d..d9b2192ad2 100644 --- a/calendar/gui/e-mini-calendar-config.c +++ b/calendar/gui/e-mini-calendar-config.c @@ -146,7 +146,7 @@ e_mini_calendar_config_get_calendar (EMiniCalendarConfig *mini_config) static void set_week_start (ECalendar *mini_cal) { - int week_start_day; + gint week_start_day; week_start_day = calendar_config_get_week_start_day (); diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index 16d8b7636a..5acdcc0f65 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -83,7 +83,7 @@ struct _ETasksPrivate { GtkWidget *preview; gchar *current_uid; - char *sexp; + gchar *sexp; guint update_timeout; /* View instance and the view menus handler */ @@ -98,7 +98,7 @@ static void e_tasks_destroy (GtkObject *object); static void update_view (ETasks *tasks); static void categories_changed_cb (gpointer object, gpointer user_data); -static void backend_error_cb (ECal *client, const char *message, gpointer data); +static void backend_error_cb (ECal *client, const gchar *message, gpointer data); /* Signal IDs */ enum { @@ -116,7 +116,7 @@ static GtkTargetEntry list_drag_types[] = { { (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]); +static const gint num_list_drag_types = sizeof (list_drag_types) / sizeof (list_drag_types[0]); static guint e_tasks_signals[LAST_SIGNAL] = { 0 }; @@ -124,16 +124,16 @@ G_DEFINE_TYPE (ETasks, e_tasks, GTK_TYPE_TABLE) /* Callback used when the cursor changes in the table */ static void -table_cursor_change_cb (ETable *etable, int row, gpointer data) +table_cursor_change_cb (ETable *etable, gint row, gpointer data) { ETasks *tasks; ETasksPrivate *priv; ECalModel *model; ECalModelComponent *comp_data; ECalComponent *comp; - const char *uid; + const gchar *uid; - int n_selected; + gint n_selected; tasks = E_TASKS (data); priv = tasks->priv; @@ -177,7 +177,7 @@ static void table_selection_change_cb (ETable *etable, gpointer data) { ETasks *tasks; - int n_selected; + gint n_selected; tasks = E_TASKS (data); @@ -212,7 +212,7 @@ user_created_cb (GtkWidget *view, ETasks *tasks) /* Callback used when the sexp in the search bar changes */ static void -search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data) +search_bar_sexp_changed_cb (CalSearchBar *cal_search, const gchar *sexp, gpointer data) { ETasks *tasks; ETasksPrivate *priv; @@ -230,7 +230,7 @@ search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer /* Callback used when the selected category in the search bar changes */ static void -search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data) +search_bar_category_changed_cb (CalSearchBar *cal_search, const gchar *category, gpointer data) { ETasks *tasks; ETasksPrivate *priv; @@ -288,8 +288,8 @@ update_view (ETasks *tasks) { ETasksPrivate *priv; ECalModel *model; - char *real_sexp = NULL; - char *new_sexp = NULL; + gchar *real_sexp = NULL; + gchar *new_sexp = NULL; priv = tasks->priv; @@ -340,7 +340,7 @@ config_hide_completed_tasks_changed_cb (GConfClient *client, guint id, GConfEntr } static void -model_row_changed_cb (ETableModel *etm, int row, gpointer data) +model_row_changed_cb (ETableModel *etm, gint row, gpointer data) { ETasks *tasks; ETasksPrivate *priv; @@ -350,7 +350,7 @@ model_row_changed_cb (ETableModel *etm, int row, gpointer data) priv = tasks->priv; if (priv->current_uid) { - const char *uid; + const gchar *uid; comp_data = e_cal_model_get_component_at (E_CAL_MODEL (etm), row); if (comp_data) { @@ -367,7 +367,7 @@ model_row_changed_cb (ETableModel *etm, int row, gpointer data) } static void -view_progress_cb (ECalModel *model, const char *message, int percent, ECalSourceType type, ETasks *tasks) +view_progress_cb (ECalModel *model, const gchar *message, gint percent, ECalSourceType type, ETasks *tasks) { e_calendar_table_set_status_message (E_CALENDAR_TABLE (e_tasks_get_calendar_table (tasks)), message, percent); @@ -437,7 +437,7 @@ struct AffectedComponents { * This function is called from e_table_selected_row_foreach. **/ static void -get_selected_components_cb (int model_row, gpointer data) +get_selected_components_cb (gint model_row, gpointer data) { struct AffectedComponents *ac = (struct AffectedComponents *) data; @@ -494,7 +494,7 @@ obtain_list_of_components (gpointer data, gpointer user_data) comp_data = (ECalModelComponent *) data; if (list && comp_data) { - char *comp_str; + gchar *comp_str; icalcomponent *vcal; vcal = e_cal_util_new_top_level (); @@ -504,7 +504,7 @@ obtain_list_of_components (gpointer data, gpointer user_data) comp_str = icalcomponent_as_ical_string_r (vcal); if (comp_str) { ESource *source = e_cal_get_source (comp_data->client); - const char *source_uid = e_source_peek_uid (source); + const gchar *source_uid = e_source_peek_uid (source); *list = g_slist_prepend (*list, g_strdup_printf ("%s\n%s", source_uid, comp_str)); @@ -519,8 +519,8 @@ obtain_list_of_components (gpointer data, gpointer user_data) static void table_drag_data_get (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, GtkSelectionData *selection_data, guint info, @@ -549,8 +549,8 @@ table_drag_data_get (ETable *table, /* static void table_drag_begin (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, ETasks *tasks) { @@ -560,8 +560,8 @@ table_drag_begin (ETable *table, static void table_drag_end (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, ETasks *tasks) { @@ -571,8 +571,8 @@ table_drag_end (ETable *table, static void table_drag_data_delete (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, ETasks *tasks) { @@ -751,7 +751,7 @@ categories_changed_cb (gpointer object, gpointer user_data) cat_array = g_ptr_array_new (); cat_list = e_categories_get_list (); while (cat_list != NULL) { - if (e_categories_is_searchable ((const char *) cat_list->data)) + if (e_categories_is_searchable ((const gchar *) cat_list->data)) g_ptr_array_add (cat_array, cat_list->data); cat_list = g_list_remove (cat_list, cat_list->data); } @@ -871,11 +871,11 @@ e_tasks_destroy (GtkObject *object) } static void -set_status_message (ETasks *tasks, const char *message, ...) +set_status_message (ETasks *tasks, const gchar *message, ...) { ETasksPrivate *priv; va_list args; - char sz[2048], *msg_string = NULL; + gchar sz[2048], *msg_string = NULL; if (message) { va_start (args, message); @@ -891,11 +891,11 @@ set_status_message (ETasks *tasks, const char *message, ...) /* Callback from the calendar client when an error occurs in the backend */ static void -backend_error_cb (ECal *client, const char *message, gpointer data) +backend_error_cb (ECal *client, const gchar *message, gpointer data) { ETasks *tasks; GtkWidget *dialog; - char *urinopwd; + gchar *urinopwd; tasks = E_TASKS (data); @@ -1080,7 +1080,7 @@ e_tasks_new_task (ETasks *tasks) ETasksPrivate *priv; CompEditor *editor; ECalComponent *comp; - const char *category; + const gchar *category; ECal *ecal; guint32 flags = 0; @@ -1121,8 +1121,8 @@ e_tasks_show_preview (ETasks *tasks, gboolean state) ECalModelComponent *comp_data; ECalComponent *comp; ETable *etable; - const char *uid; - int n_selected; + const gchar *uid; + gint n_selected; etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (E_CALENDAR_TABLE (priv->tasks_view)->etable)); n_selected = e_table_selected_count (etable); @@ -1158,7 +1158,7 @@ e_tasks_add_todo_source (ETasks *tasks, ESource *source) { ETasksPrivate *priv; ECal *client; - const char *uid; + const gchar *uid; g_return_val_if_fail (tasks != NULL, FALSE); g_return_val_if_fail (E_IS_TASKS (tasks), FALSE); @@ -1211,7 +1211,7 @@ e_tasks_remove_todo_source (ETasks *tasks, ESource *source) ETasksPrivate *priv; ECal *client; ECalModel *model; - const char *uid; + const gchar *uid; g_return_val_if_fail (tasks != NULL, FALSE); g_return_val_if_fail (E_IS_TASKS (tasks), FALSE); @@ -1342,7 +1342,7 @@ void e_tasks_delete_completed (ETasks *tasks) { ETasksPrivate *priv; - char *sexp; + gchar *sexp; GList *l; g_return_if_fail (tasks != NULL); @@ -1413,7 +1413,7 @@ e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic) ETasksPrivate *priv; GalViewFactory *factory; ETableSpecification *spec; - char *dir0, *dir1, *filename; + gchar *dir0, *dir1, *filename; static GalViewCollection *collection = NULL; g_return_if_fail (tasks != NULL); @@ -1505,9 +1505,9 @@ e_tasks_discard_view_menus (ETasks *tasks) void e_tasks_open_task_id (ETasks *tasks, - const char *src_uid, - const char *comp_uid, - const char *comp_rid) + const gchar *src_uid, + const gchar *comp_uid, + const gchar *comp_rid) { ECal *client = NULL; GList *l; diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h index 67989ee021..47e38c8a5b 100644 --- a/calendar/gui/e-tasks.h +++ b/calendar/gui/e-tasks.h @@ -52,7 +52,7 @@ struct _ETasksClass { GtkTableClass parent_class; /* Notification signals */ - void (* selection_changed) (ETasks *tasks, int n_selected); + void (* selection_changed) (ETasks *tasks, gint n_selected); void (* source_added) (ETasks *tasks, ESource *source); void (* source_removed) (ETasks *tasks, ESource *source); }; @@ -73,9 +73,9 @@ ECal *e_tasks_get_default_client (ETasks *tasks); void e_tasks_open_task (ETasks *tasks); void e_tasks_open_task_id (ETasks *tasks, - const char *src_uid, - const char *comp_uid, - const char *comp_rid); + const gchar *src_uid, + const gchar *comp_uid, + const gchar *comp_rid); void e_tasks_new_task (ETasks *tasks); void e_tasks_complete_selected (ETasks *tasks); void e_tasks_delete_selected (ETasks *tasks); diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index 2be6548757..2d0cf1ab5d 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -296,8 +296,8 @@ static void e_timezone_entry_set_entry (ETimezoneEntry *tentry) { ETimezoneEntryPrivate *priv; - const char *display_name; - char *name_buffer; + const gchar *display_name; + gchar *name_buffer; priv = tentry->priv; diff --git a/calendar/gui/e-week-view-config.c b/calendar/gui/e-week-view-config.c index 8a0c0de984..c981be8f53 100644 --- a/calendar/gui/e-week-view-config.c +++ b/calendar/gui/e-week-view-config.c @@ -146,7 +146,7 @@ e_week_view_config_get_view (EWeekViewConfig *view_config) static void set_week_start (EWeekView *week_view) { - int week_start_week; + gint week_start_week; week_start_week = calendar_config_get_week_start_day (); diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 458d8e7e3c..a8123bdf53 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -828,11 +828,11 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem, /* draw categories icons */ for (elem = categories_list; elem; elem = elem->next) { - char *category; + gchar *category; GdkPixmap *pixmap = NULL; GdkBitmap *mask = NULL; - category = (char *) elem->data; + category = (gchar *) elem->data; if (!e_categories_config_get_icon_for (category, &pixmap, &mask)) continue; @@ -944,7 +944,7 @@ e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem, This is needed so that we get button/motion events. */ static double e_week_view_event_item_point (GnomeCanvasItem *item, double x, double y, - int cx, int cy, + gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c index 37a2706f2a..134b318118 100644 --- a/calendar/gui/e-week-view-layout.c +++ b/calendar/gui/e-week-view-layout.c @@ -334,8 +334,8 @@ e_week_view_layout_get_day_position (gint day, #define wk(x) ( ( working_days & (days [ ((x) + display_start_day) % 7 ]) ) ? 1 : 0) CalWeekdays days [] = {CAL_MONDAY, CAL_TUESDAY, CAL_WEDNESDAY, CAL_THURSDAY, CAL_FRIDAY, CAL_SATURDAY, CAL_SUNDAY}; CalWeekdays working_days; - int arr[4] = {1, 1, 1, 1}; - int edge, i, wd, m, M; + gint arr[4] = {1, 1, 1, 1}; + gint edge, i, wd, m, M; gboolean any = TRUE; g_return_if_fail (day < 7); diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c index e1c090b196..67e9574a16 100644 --- a/calendar/gui/e-week-view-main-item.c +++ b/calendar/gui/e-week-view-main-item.c @@ -419,7 +419,7 @@ e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem, This is needed so that we get button/motion events. */ static double e_week_view_main_item_point (GnomeCanvasItem *item, double x, double y, - int cx, int cy, + gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c index e23f2a675f..7a5ae4bf9b 100644 --- a/calendar/gui/e-week-view-titles-item.c +++ b/calendar/gui/e-week-view-titles-item.c @@ -269,7 +269,7 @@ e_week_view_titles_item_draw (GnomeCanvasItem *canvas_item, This is needed so that we get button/motion events. */ static double e_week_view_titles_item_point (GnomeCanvasItem *item, double x, double y, - int cx, int cy, + gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 57c0547af0..dac03a274e 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -300,8 +300,8 @@ process_component (EWeekView *week_view, ECalModelComponent *comp_data) ECalComponent *comp = NULL; AddEventData add_event_data; /* rid is never used in this function? */ - const char *uid; - char *rid = NULL; + const gchar *uid; + gchar *rid = NULL; /* If we don't have a valid date set yet, just return. */ if (!g_date_valid (&week_view->first_day_shown)) @@ -331,13 +331,13 @@ process_component (EWeekView *week_view, ECalModelComponent *comp_data) } static void -update_row (EWeekView *week_view, int row) +update_row (EWeekView *week_view, gint row) { ECalModelComponent *comp_data; ECalModel *model; gint event_num; - const char *uid; - char *rid = NULL; + const gchar *uid; + gchar *rid = NULL; model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)); comp_data = e_cal_model_get_component_at (model, row); @@ -364,7 +364,7 @@ update_row (EWeekView *week_view, int row) } static void -model_row_changed_cb (ETableModel *etm, int row, gpointer user_data) +model_row_changed_cb (ETableModel *etm, gint row, gpointer user_data) { EWeekView *week_view = E_WEEK_VIEW (user_data); @@ -377,7 +377,7 @@ model_row_changed_cb (ETableModel *etm, int row, gpointer user_data) } static void -model_cell_changed_cb (ETableModel *etm, int col, int row, gpointer user_data) +model_cell_changed_cb (ETableModel *etm, gint col, gint row, gpointer user_data) { EWeekView *week_view = E_WEEK_VIEW (user_data); @@ -389,11 +389,11 @@ model_cell_changed_cb (ETableModel *etm, int col, int row, gpointer user_data) } static void -model_rows_inserted_cb (ETableModel *etm, int row, int count, gpointer user_data) +model_rows_inserted_cb (ETableModel *etm, gint row, gint count, gpointer user_data) { EWeekView *week_view = E_WEEK_VIEW (user_data); ECalModel *model; - int i; + gint i; if (!E_CALENDAR_VIEW (week_view)->in_focus) { return; @@ -429,8 +429,8 @@ model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data) for (l = list; l != NULL; l = g_slist_next (l)) { gint event_num; - const char *uid; - char *rid = NULL; + const gchar *uid; + gchar *rid = NULL; ECalModelComponent *comp_data = l->data; uid = icalcomponent_get_uid (comp_data->icalcomp); @@ -591,7 +591,7 @@ e_week_view_init (EWeekView *week_view) G_CALLBACK (e_week_view_on_motion), week_view); /* Create the buttons to jump to each days. */ - pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm); + pixbuf = gdk_pixbuf_new_from_xpm_data ((const gchar **) jump_xpm); for (i = 0; i < E_WEEK_VIEW_MAX_WEEKS * 7; i++) { week_view->jump_buttons[i] = gnome_canvas_item_new @@ -1964,7 +1964,7 @@ e_week_view_foreach_event_with_uid (EWeekView *week_view, for (event_num = week_view->events->len - 1; event_num >= 0; event_num--) { - const char *u; + const gchar *u; event = &g_array_index (week_view->events, EWeekViewEvent, event_num); @@ -2563,8 +2563,8 @@ e_week_view_ensure_events_sorted (EWeekView *week_view) gint -e_week_view_event_sort_func (const void *arg1, - const void *arg2) +e_week_view_event_sort_func (gconstpointer arg1, + gconstpointer arg2) { EWeekViewEvent *event1, *event2; @@ -2650,7 +2650,7 @@ e_week_view_reshape_events (EWeekView *week_view) } static EWeekViewEvent * -tooltip_get_view_event (EWeekView *week_view, int day, int event_num) +tooltip_get_view_event (EWeekView *week_view, gint day, gint event_num) { EWeekViewEvent *pevent; @@ -2662,7 +2662,7 @@ tooltip_get_view_event (EWeekView *week_view, int day, int event_num) static void tooltip_destroy (EWeekView *week_view, GnomeCanvasItem *item) { - int event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num")); + gint event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num")); EWeekViewEvent *pevent; guint timeout; @@ -2688,7 +2688,7 @@ tooltip_event_cb (GnomeCanvasItem *item, GdkEvent *event, EWeekView *view) { - int event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num")); + gint event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num")); EWeekViewEvent *pevent; pevent = tooltip_get_view_event (view, -1, event_num); @@ -2850,7 +2850,7 @@ e_week_view_reshape_event_span (EWeekView *week_view, NULL); if (free_text) - g_free ((gchar*)summary); + g_free ((gchar *)summary); if (e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING) && e_cal_util_component_has_attendee (event->comp_data->icalcomp)) { @@ -3107,7 +3107,7 @@ e_week_view_stop_editing_event (EWeekView *week_view) static void cancel_editing (EWeekView *week_view) { - int event_num, span_num; + gint event_num, span_num; EWeekViewEvent *event; EWeekViewEventSpan *span; const gchar *summary; @@ -3127,7 +3127,7 @@ cancel_editing (EWeekView *week_view) g_object_set (G_OBJECT (span->text_item), "text", summary ? summary : "", NULL); if (free_text) - g_free ((gchar*)summary); + g_free ((gchar *)summary); /* Stop editing */ e_week_view_stop_editing_event (week_view); @@ -3140,7 +3140,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item, { EWeekViewEvent *event; gint event_num, span_num; - int nevent = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num")); + gint nevent = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num")); EWeekViewEvent *pevent; pevent = tooltip_get_view_event (week_view, -1, nevent); @@ -3269,7 +3269,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item, case GDK_ENTER_NOTIFY: { ECalendarViewEventData *data; - int nspan; + gint nspan; if (!e_week_view_find_event_from_item (week_view, item, @@ -3550,7 +3550,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view, ECalComponent *comp; ECalComponentText summary; ECal *client; - const char *uid; + const gchar *uid; gboolean on_server; /* Note: the item we are passed here isn't reliable, so we just stop @@ -3632,7 +3632,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view, if (mod == CALOBJ_MOD_THIS) { ECalComponentDateTime dt; struct icaltimetype tt; - char *tzid; + gchar *tzid; e_cal_component_get_dtstart (comp, &dt); if (dt.value->zone) { @@ -3749,8 +3749,8 @@ e_week_view_find_event_from_uid (EWeekView *week_view, num_events = week_view->events->len; for (event_num = 0; event_num < num_events; event_num++) { - const char *u; - char *r = NULL; + const gchar *u; + gchar *r = NULL; event = &g_array_index (week_view->events, EWeekViewEvent, event_num); @@ -4040,7 +4040,7 @@ e_week_view_add_new_event_in_selected_range (EWeekView *week_view, const gchar * ECalComponentDateTime date; struct icaltimetype itt; time_t dtstart, dtend; - const char *uid; + const gchar *uid; AddEventData add_event_data; gboolean read_only = TRUE; EWeekViewEvent *wvevent; @@ -4352,14 +4352,14 @@ e_week_view_on_jump_button_event (GnomeCanvasItem *item, if (focus_event->in) { week_view->focused_jump_button = day; - pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm_focused); + pixbuf = gdk_pixbuf_new_from_xpm_data ((const gchar **) jump_xpm_focused); gnome_canvas_item_set (week_view->jump_buttons[day], "GnomeCanvasPixbuf::pixbuf", pixbuf, NULL); } else { week_view->focused_jump_button = E_WEEK_VIEW_JUMP_BUTTON_NO_FOCUS; - pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm); + pixbuf = gdk_pixbuf_new_from_xpm_data ((const gchar **) jump_xpm); gnome_canvas_item_set (week_view->jump_buttons[day], "GnomeCanvasPixbuf::pixbuf", pixbuf, NULL); diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 18f4a47276..951f01bfa9 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -140,9 +140,9 @@ struct _GnomeCalendarPrivate { /* Calendar query for the date navigator */ GList *dn_queries; /* list of CalQueries */ - char *sexp; - char *todo_sexp; - char *memo_sexp; + gchar *sexp; + gchar *todo_sexp; + gchar *memo_sexp; guint update_timeout; guint update_marcus_bains_line_timeout; @@ -172,7 +172,7 @@ struct _GnomeCalendarPrivate { GalViewMenus *view_menus; /* Our current week start */ - int week_start; + gint week_start; /* Our current timezone. */ icaltimezone *zone; @@ -631,7 +631,7 @@ static void get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_t *start_time, time_t *end_time) { GnomeCalendarPrivate *priv; - int shown, display_start; + gint shown, display_start; GDate date; gint weekday, first_day, last_day, days_shown, i; gboolean has_working_days = FALSE; @@ -826,12 +826,12 @@ get_date_navigator_range (GnomeCalendar *gcal, time_t *start_time, time_t *end_t } /* Adjusts a given query sexp with the time range of the date navigator */ -static char * -adjust_e_cal_view_sexp (GnomeCalendar *gcal, const char *sexp) +static gchar * +adjust_e_cal_view_sexp (GnomeCalendar *gcal, const gchar *sexp) { time_t start_time, end_time; - char *start, *end; - char *new_sexp; + gchar *start, *end; + gchar *new_sexp; get_date_navigator_range (gcal, &start_time, &end_time); if (start_time == -1 || end_time == -1) @@ -862,7 +862,7 @@ update_query_async (struct _date_query_msg *msg) GnomeCalendar *gcal = msg->gcal; GnomeCalendarPrivate *priv; ECalView *old_query; - char *real_sexp; + gchar *real_sexp; GList *l; priv = gcal->priv; @@ -956,10 +956,10 @@ update_query (GnomeCalendar *gcal) } static void -set_search_query (GnomeCalendar *gcal, const char *sexp) +set_search_query (GnomeCalendar *gcal, const gchar *sexp) { GnomeCalendarPrivate *priv; - int i; + gint i; time_t start, end; g_return_if_fail (gcal != NULL); @@ -1024,10 +1024,10 @@ get_current_time (ECalendarItem *calitem, gpointer data) /* Callback used when the sexp changes in the calendar search bar */ static void -search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data) +search_bar_sexp_changed_cb (CalSearchBar *cal_search, const gchar *sexp, gpointer data) { GnomeCalendar *gcal; - const char *d_sexp = "occur-in-time-range?"; + const gchar *d_sexp = "occur-in-time-range?"; gcal = GNOME_CALENDAR (data); @@ -1046,12 +1046,12 @@ search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer /* Callback used when the selected category in the search bar changes */ static void -search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data) +search_bar_category_changed_cb (CalSearchBar *cal_search, const gchar *category, gpointer data) { GnomeCalendar *gcal; GnomeCalendarPrivate *priv; ECalModel *model; - int i; + gint i; gcal = GNOME_CALENDAR (data); priv = gcal->priv; @@ -1271,7 +1271,7 @@ static void set_timezone (GnomeCalendar *calendar) { GnomeCalendarPrivate *priv; - int i; + gint i; priv = calendar->priv; @@ -1317,7 +1317,7 @@ update_todo_view_async (struct _mupdate_todo_msg *msg) GnomeCalendar *gcal; GnomeCalendarPrivate *priv; ECalModel *model; - char *sexp = NULL; + gchar *sexp = NULL; g_return_if_fail (msg != NULL); @@ -1368,7 +1368,7 @@ update_memo_view (GnomeCalendar *gcal) GnomeCalendarPrivate *priv; ECalModel *model, *view_model; time_t start, end; - char *iso_start, *iso_end; + gchar *iso_start, *iso_end; priv = gcal->priv; @@ -1553,7 +1553,7 @@ categories_changed_cb (gpointer object, gpointer user_data) cat_array = g_ptr_array_new (); cat_list = e_categories_get_list (); while (cat_list != NULL) { - if (e_categories_is_searchable ((const char *) cat_list->data)) + if (e_categories_is_searchable ((const gchar *) cat_list->data)) g_ptr_array_add (cat_array, cat_list->data); cat_list = g_list_remove (cat_list, cat_list->data); } @@ -1565,7 +1565,7 @@ categories_changed_cb (gpointer object, gpointer user_data) static void -view_progress_cb (ECalModel *model, const char *message, int percent, ECalSourceType type, GnomeCalendar *gcal) +view_progress_cb (ECalModel *model, const gchar *message, gint percent, ECalSourceType type, GnomeCalendar *gcal) { if (type == E_CAL_SOURCE_TYPE_EVENT) { e_calendar_view_set_status_message (E_CALENDAR_VIEW (gcal->priv->week_view), message, percent); @@ -1621,8 +1621,8 @@ setup_widgets (GnomeCalendar *gcal) GtkWidget *vbox; GtkWidget *label; ECalModel *cal_model; - int i; - char *tmp; + gint i; + gchar *tmp; priv = gcal->priv; @@ -1861,7 +1861,7 @@ static void gnome_calendar_init (GnomeCalendar *gcal) { GnomeCalendarPrivate *priv; - int i; + gint i; priv = g_new0 (GnomeCalendarPrivate, 1); gcal->priv = priv; @@ -1916,7 +1916,7 @@ gnome_calendar_destroy (GtkObject *object) if (priv) { GList *l; - int i; + gint i; e_categories_unregister_change_listener (G_CALLBACK (categories_changed_cb), gcal); @@ -2077,7 +2077,7 @@ static void notify_selected_time_changed (GnomeCalendar *gcal) { GnomeCalendarPrivate *priv; - int i; + gint i; priv = gcal->priv; for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) { @@ -2158,7 +2158,7 @@ void gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time) { GnomeCalendarPrivate *priv; - int i; + gint i; g_return_if_fail (gcal != NULL); g_return_if_fail (GNOME_IS_CALENDAR (gcal)); @@ -2199,7 +2199,7 @@ update_view_times (GnomeCalendar *gcal, time_t start_time) } static void -gnome_calendar_direction (GnomeCalendar *gcal, int direction) +gnome_calendar_direction (GnomeCalendar *gcal, gint direction) { GnomeCalendarPrivate *priv; @@ -2301,7 +2301,7 @@ static void set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean range_selected) { GnomeCalendarPrivate *priv; - const char *view_id; + const gchar *view_id; g_return_if_fail (gcal != NULL); g_return_if_fail (GNOME_IS_CALENDAR (gcal)); @@ -2369,7 +2369,7 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra { GnomeCalendarPrivate *priv; gboolean preserve_day; - int i; + gint i; priv = gcal->priv; @@ -2499,7 +2499,7 @@ void gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic) { GnomeCalendarPrivate *priv; - char *path0, *path1, *etspecfile; + gchar *path0, *path1, *etspecfile; CalendarViewFactory *factory; GalViewFactory *gal_factory; static GalViewCollection *collection = NULL; @@ -2607,16 +2607,16 @@ gnome_calendar_discard_view_menus (GnomeCalendar *gcal) /* This is copied/moved from gal-view-instance, only the calendar uses this for a popup menu */ static void -gc_set_view(EPopup *ep, EPopupItem *pitem, void *data) +gc_set_view(EPopup *ep, EPopupItem *pitem, gpointer data) { GnomeCalendar *gcal = data; if (pitem->type & E_POPUP_ACTIVE) - gal_view_instance_set_current_view_id(gcal->priv->view_instance, (char *)pitem->user_data); + gal_view_instance_set_current_view_id(gcal->priv->view_instance, (gchar *)pitem->user_data); } static void -gc_save_custom_view(EPopup *ep, EPopupItem *pitem, void *data) +gc_save_custom_view(EPopup *ep, EPopupItem *pitem, gpointer data) { GnomeCalendar *gcal = data; @@ -2624,7 +2624,7 @@ gc_save_custom_view(EPopup *ep, EPopupItem *pitem, void *data) } static void -gc_define_views_response(GtkWidget *d, int id, GnomeCalendar *gcal) +gc_define_views_response(GtkWidget *d, gint id, GnomeCalendar *gcal) { if (id == GTK_RESPONSE_OK) gal_view_collection_save(gcal->priv->view_instance->collection); @@ -2633,7 +2633,7 @@ gc_define_views_response(GtkWidget *d, int id, GnomeCalendar *gcal) } static void -gc_define_views(EPopup *ep, EPopupItem *pitem, void *data) +gc_define_views(EPopup *ep, EPopupItem *pitem, gpointer data) { GnomeCalendar *gcal = data; GtkWidget *dialog = gal_define_views_dialog_new(gcal->priv->view_instance->collection); @@ -2655,7 +2655,7 @@ static EPopupItem gc_popups[] = { }; static void -gc_popup_free (EPopup *ep, GSList *list, void *data) +gc_popup_free (EPopup *ep, GSList *list, gpointer data) { while (list) { GSList *n = list->next; @@ -2671,7 +2671,7 @@ gc_popup_free (EPopup *ep, GSList *list, void *data) } static void -gc_popup_free_static (EPopup *ep, GSList *list, void *data) +gc_popup_free_static (EPopup *ep, GSList *list, gpointer data) { while (list) { GSList *n = list->next; @@ -2685,13 +2685,13 @@ gc_popup_free_static (EPopup *ep, GSList *list, void *data) } void -gnome_calendar_view_popup_factory (GnomeCalendar *gcal, EPopup *ep, const char *prefix) +gnome_calendar_view_popup_factory (GnomeCalendar *gcal, EPopup *ep, const gchar *prefix) { GnomeCalendarPrivate *priv; - int length; - int i; + gint length; + gint i; gboolean found = FALSE; - char *id; + gchar *id; GSList *menus = NULL; EPopupItem *pitem; @@ -2784,7 +2784,7 @@ add_mclient (ECalModel *model, ECal *client) } static void -non_intrusive_error_remove(GtkWidget *w, void *data) +non_intrusive_error_remove(GtkWidget *w, gpointer data) { g_hash_table_remove(non_intrusive_error_table, data); } @@ -2797,7 +2797,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal) ESource *source; ECalModel *model; ECalLoadState state; - char *msg; + gchar *msg; GtkWidget *w = NULL; gchar *id; @@ -3016,7 +3016,7 @@ static gboolean open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of) { GnomeCalendarPrivate *priv; - char *msg; + gchar *msg; icaltimezone *zone; priv = gcal->priv; @@ -3050,11 +3050,11 @@ open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of /* Callback when we get an error message from the backend */ static void -backend_error_cb (ECal *client, const char *message, gpointer data) +backend_error_cb (ECal *client, const gchar *message, gpointer data) { GnomeCalendar *gcal; GtkDialog *dialog; - char *uristr; + gchar *uristr; gchar *id; gcal = GNOME_CALENDAR (data); @@ -3085,7 +3085,7 @@ backend_died_cb (ECal *ecal, gpointer data) GnomeCalendarPrivate *priv; ECalSourceType source_type; ESource *source; - const char *id; + const gchar *id; GtkWidget *w = NULL; gcal = GNOME_CALENDAR (data); @@ -3175,7 +3175,7 @@ void gnome_calendar_set_activity_handler (GnomeCalendar *cal, EActivityHandler *activity_handler) { GnomeCalendarPrivate *priv; - int i; + gint i; g_return_if_fail (cal != NULL); g_return_if_fail (GNOME_IS_CALENDAR (cal)); @@ -3324,7 +3324,7 @@ gnome_calendar_remove_source (GnomeCalendar *gcal, ECalSourceType source_type, E } gboolean -gnome_calendar_remove_source_by_uid (GnomeCalendar *gcal, ECalSourceType source_type, const char *uid) +gnome_calendar_remove_source_by_uid (GnomeCalendar *gcal, ECalSourceType source_type, const gchar *uid) { GnomeCalendarPrivate *priv; ECal *client; @@ -3481,7 +3481,7 @@ gnome_calendar_new_task (GnomeCalendar *gcal, time_t *dtstart, time_t *dtend) CompEditor *editor; ECalComponent *comp; icalcomponent *icalcomp; - const char *category; + const gchar *category; guint32 flags = 0; ECalComponentDateTime dt; struct icaltimetype itt; @@ -3979,7 +3979,7 @@ void gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than) { GnomeCalendarPrivate *priv; - char *sexp, *start, *end; + gchar *sexp, *start, *end; GList *l; g_return_if_fail (GNOME_IS_CALENDAR (gcal)); @@ -4014,7 +4014,7 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than) /* FIXME write occur-before and occur-after * sexp funcs so we don't have to use the max - * int */ + * gint */ if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) e_cal_generate_instances_for_object (client, m->data, older_than, G_MAXINT32, @@ -4023,11 +4023,11 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than) /* FIXME Better error handling */ if (remove) { - const char *uid = icalcomponent_get_uid (m->data); + const gchar *uid = icalcomponent_get_uid (m->data); GError *error = NULL; if (e_cal_util_component_is_instance (m->data) || e_cal_util_component_has_recurrences (m->data)) { - char *rid = NULL; + gchar *rid = NULL; struct icaltimetype recur_id = icalcomponent_get_recurrenceid (m->data); if (!icaltime_is_null_time (recur_id) ) @@ -4114,9 +4114,9 @@ ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal) void gnome_calendar_edit_appointment (GnomeCalendar *gcal, - const char* src_uid, - const char* comp_uid, - const char* comp_rid) + const gchar * src_uid, + const gchar * comp_uid, + const gchar * comp_rid) { ECal *client = NULL; GList *l; diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index 947559bac5..5d7ca5f031 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -117,7 +117,7 @@ ECal *gnome_calendar_get_default_client (GnomeCalendar *gcal); gboolean gnome_calendar_add_source (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source); gboolean gnome_calendar_remove_source (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source); -gboolean gnome_calendar_remove_source_by_uid (GnomeCalendar *gcal, ECalSourceType source_type, const char *uid); +gboolean gnome_calendar_remove_source_by_uid (GnomeCalendar *gcal, ECalSourceType source_type, const gchar *uid); gboolean gnome_calendar_set_default_source (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source); void gnome_calendar_next (GnomeCalendar *gcal); @@ -147,7 +147,7 @@ struct _ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal); void gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic); void gnome_calendar_discard_view_menus (GnomeCalendar *gcal); -void gnome_calendar_view_popup_factory (GnomeCalendar *gcal, struct _EPopup *ep, const char *prefix); +void gnome_calendar_view_popup_factory (GnomeCalendar *gcal, struct _EPopup *ep, const gchar *prefix); void gnome_calendar_set_selected_time_range (GnomeCalendar *gcal, time_t start_time, @@ -195,9 +195,9 @@ void gnome_calendar_purge (GnomeCalendar *gcal, /* Direct calendar component operations */ void gnome_calendar_edit_appointment (GnomeCalendar *gcal, - const char* src_uid, - const char* comp_uid, - const char* comp_rid); + const gchar * src_uid, + const gchar * comp_uid, + const gchar * comp_rid); void gnome_calendar_emit_user_created_signal (gpointer instance, GnomeCalendar *gcal, ECal *calendar); diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c index d341245fec..06986efdd6 100644 --- a/calendar/gui/goto.c +++ b/calendar/gui/goto.c @@ -203,8 +203,8 @@ goto_dialog (GnomeCalendar *gcal) { time_t start_time; struct icaltimetype tt; - int b; - char *gladefile; + gint b; + gchar *gladefile; if (dlg) { return; diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c index f63e3e187a..c58e5ab27b 100644 --- a/calendar/gui/itip-bonobo-control.c +++ b/calendar/gui/itip-bonobo-control.c @@ -52,7 +52,7 @@ enum E_ITIP_BONOBO_ARGS { * BonoboObject. */ -static char * +static gchar * stream_read (Bonobo_Stream stream) { Bonobo_Stream_iobuf *buffer; @@ -97,7 +97,7 @@ stream_read (Bonobo_Stream stream) */ typedef struct { EItipControl *itip; - char *text; + gchar *text; } idle_data; static gboolean @@ -115,7 +115,7 @@ set_data_idle_cb (gpointer data) static void pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream, - Bonobo_Persist_ContentType type, void *data, + Bonobo_Persist_ContentType type, gpointer data, CORBA_Environment *ev) { EItipControl *itip = data; @@ -143,7 +143,7 @@ pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream, */ static void pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream, - Bonobo_Persist_ContentType type, void *data, + Bonobo_Persist_ContentType type, gpointer data, CORBA_Environment *ev) { EItipControl *itip = data; @@ -164,7 +164,7 @@ pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream, } /* pstream_save */ /* static CORBA_long */ -/* pstream_get_max_size (BonoboPersistStream *ps, void *data, */ +/* pstream_get_max_size (BonoboPersistStream *ps, gpointer data, */ /* CORBA_Environment *ev) */ /* { */ /* EItipControl *itip = data; */ @@ -179,7 +179,7 @@ pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream, /* } */ static Bonobo_Persist_ContentTypeList * -pstream_get_content_types (BonoboPersistStream *ps, void *closure, +pstream_get_content_types (BonoboPersistStream *ps, gpointer closure, CORBA_Environment *ev) { return bonobo_persist_generate_content_types (2, "text/calendar", "text/x-calendar"); diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index ae822c9b9c..5cfa2cf378 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -86,7 +86,7 @@ gboolean itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_test) { ECalComponentOrganizer organizer; - const char *strip; + const gchar *strip; gboolean user_org = FALSE; if (!e_cal_component_has_organizer (comp) || (!skip_cap_test && e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_ORGANIZER))) @@ -98,7 +98,7 @@ itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_ strip = itip_strip_mailto (organizer.value); if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) { - char *email = NULL; + gchar *email = NULL; if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) { g_free (email); @@ -126,7 +126,7 @@ gboolean itip_sentby_is_user (ECalComponent *comp, ECal *client) { ECalComponentOrganizer organizer; - const char *strip; + const gchar *strip; gboolean user_sentby = FALSE; if (!e_cal_component_has_organizer (comp) ||e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_ORGANIZER)) @@ -142,7 +142,7 @@ itip_sentby_is_user (ECalComponent *comp, ECal *client) } static ECalComponentAttendee * -get_attendee (GSList *attendees, char *address) +get_attendee (GSList *attendees, gchar *address) { GSList *l; @@ -161,7 +161,7 @@ get_attendee (GSList *attendees, char *address) } static ECalComponentAttendee * -get_attendee_if_attendee_sentby_is_user (GSList *attendees, char *address) +get_attendee_if_attendee_sentby_is_user (GSList *attendees, gchar *address) { GSList *l; @@ -176,8 +176,8 @@ get_attendee_if_attendee_sentby_is_user (GSList *attendees, char *address) return NULL; } -static char * -html_new_lines_for (const char *string) +static gchar * +html_new_lines_for (const gchar *string) { gchar **lines; gchar *joined; @@ -189,7 +189,7 @@ html_new_lines_for (const char *string) return joined; } -char * +gchar * itip_get_comp_attendee (ECalComponent *comp, ECal *client) { GSList *attendees; @@ -197,7 +197,7 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client) EAccount *a; EIterator *it; ECalComponentAttendee *attendee = NULL; - char *address = NULL; + gchar *address = NULL; e_cal_component_get_attendee_list (comp, &attendees); al = itip_addresses_get (); @@ -209,7 +209,7 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client) attendee = get_attendee (attendees, address); if (attendee) { - char *user_email = g_strdup (itip_strip_mailto (attendee->value)); + gchar *user_email = g_strdup (itip_strip_mailto (attendee->value)); e_cal_component_free_attendee_list (attendees); g_free (address); @@ -219,7 +219,7 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client) attendee = get_attendee_if_attendee_sentby_is_user (attendees, address); if (attendee) { - char *user_email = g_strdup (itip_strip_mailto (attendee->sentby)); + gchar *user_email = g_strdup (itip_strip_mailto (attendee->sentby)); e_cal_component_free_attendee_list (attendees); g_free (address); @@ -240,7 +240,7 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client) attendee = get_attendee (attendees, a->id->address); if (attendee) { - char *user_email = g_strdup (itip_strip_mailto (attendee->value)); + gchar *user_email = g_strdup (itip_strip_mailto (attendee->value)); e_cal_component_free_attendee_list (attendees); return user_email; @@ -250,7 +250,7 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client) check the 'sentby' fields of the attendees if we can find the account */ attendee = get_attendee_if_attendee_sentby_is_user (attendees, a->id->address); if (attendee) { - char *user_email = g_strdup (itip_strip_mailto (attendee->sentby)); + gchar *user_email = g_strdup (itip_strip_mailto (attendee->sentby)); e_cal_component_free_attendee_list (attendees); return user_email; @@ -279,10 +279,10 @@ itip_strip_mailto (const gchar *address) return address; } -static char * +static gchar * get_label (struct icaltimetype *tt) { - char buffer[1000]; + gchar buffer[1000]; struct tm tmp_tm; tmp_tm = icaltimetype_to_tm (tt); @@ -306,7 +306,7 @@ static void foreach_tzid_callback (icalparameter *param, gpointer data) { ItipUtilTZData *tz_data = data; - const char *tzid; + const gchar *tzid; icaltimezone *zone = NULL; icalcomponent *vtimezone_comp; @@ -331,7 +331,7 @@ foreach_tzid_callback (icalparameter *param, gpointer data) return; icalcomponent_add_component (tz_data->icomp, icalcomponent_new_clone (vtimezone_comp)); - g_hash_table_insert (tz_data->tzids, (char *)tzid, (char *)tzid); + g_hash_table_insert (tz_data->tzids, (gchar *)tzid, (gchar *)tzid); } static icalcomponent * @@ -365,7 +365,7 @@ comp_toplevel_with_zones (ECalComponentItipMethod method, ECalComponent *comp, E } static gboolean -users_has_attendee (GList *users, const char *address) +users_has_attendee (GList *users, const gchar *address) { GList *l; @@ -384,7 +384,7 @@ comp_from (ECalComponentItipMethod method, ECalComponent *comp) ECalComponentAttendee *attendee; GSList *attendees; gchar *from; - char *sender = NULL; + gchar *sender = NULL; switch (method) { case E_CAL_COMPONENT_METHOD_PUBLISH: @@ -437,7 +437,7 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users, GPtrArray *array = NULL; EDestination *destination; gint len; - char *sender = NULL; + gchar *sender = NULL; union { gpointer *pdata; @@ -617,10 +617,10 @@ static gchar * comp_subject (ECalComponentItipMethod method, ECalComponent *comp) { ECalComponentText caltext; - const char *description, *prefix = NULL; + const gchar *description, *prefix = NULL; GSList *alist, *l; gchar *subject; - char *sender; + gchar *sender; ECalComponentAttendee *a = NULL; e_cal_component_get_summary (comp, &caltext); @@ -771,7 +771,7 @@ comp_description (ECalComponent *comp) { gchar *description; ECalComponentDateTime dt; - char *start = NULL, *end = NULL; + gchar *start = NULL, *end = NULL; switch (e_cal_component_get_vtype (comp)) { case E_CAL_COMPONENT_EVENT: @@ -853,11 +853,11 @@ comp_limit_attendees (ECalComponent *comp) prop != NULL; prop = icalcomponent_get_next_property (icomp, ICAL_ATTENDEE_PROPERTY)) { - char *attendee; - char *attendee_text; + gchar *attendee; + gchar *attendee_text; icalparameter *param; - const char *attendee_sentby; - char *attendee_sentby_text = NULL; + const gchar *attendee_sentby; + gchar *attendee_sentby_text = NULL; /* If we've already found something, just erase the rest */ if (found) { @@ -908,7 +908,7 @@ comp_sentby (ECalComponent *comp, ECal *client) { ECalComponentOrganizer organizer; GSList * attendees, *l; - char *user = NULL; + gchar *user = NULL; e_cal_component_get_organizer (comp, &organizer); if (!organizer.value) { @@ -920,7 +920,7 @@ comp_sentby (ECalComponent *comp, ECal *client) organizer.language = NULL; e_cal_component_set_organizer (comp, &organizer); - g_free ((char *) organizer.value); + g_free ((gchar *) organizer.value); return; } @@ -946,10 +946,10 @@ comp_sentby (ECalComponent *comp, ECal *client) e_cal_component_set_organizer (comp, &organizer); - g_free ((char *)organizer.value); - g_free ((char *)organizer.sentby); - g_free ((char *)organizer.cn); - g_free ((char *)organizer.language); + g_free ((gchar *)organizer.value); + g_free ((gchar *)organizer.sentby); + g_free ((gchar *)organizer.cn); + g_free ((gchar *)organizer.language); } } static ECalComponent * @@ -959,7 +959,7 @@ comp_minimal (ECalComponent *comp, gboolean attendee) icalcomponent *icomp, *icomp_clone; icalproperty *prop; ECalComponentOrganizer organizer; - const char *uid; + const gchar *uid; GSList *comments; struct icaltimetype itt; ECalComponentRange recur_id; @@ -1100,13 +1100,13 @@ comp_compliant (ECalComponentItipMethod method, ECalComponent *comp, ECal *clien ECalComponentAlarm *alarm; ECalComponentAlarmAction action = E_CAL_COMPONENT_ALARM_UNKNOWN; - alarm = e_cal_component_get_alarm (clone, (const char *)l->data); + alarm = e_cal_component_get_alarm (clone, (const gchar *)l->data); if (alarm) { e_cal_component_alarm_get_action (alarm, &action); e_cal_component_alarm_free (alarm); if (action == E_CAL_COMPONENT_ALARM_PROCEDURE) - e_cal_component_remove_alarm (clone, (const char *)l->data); + e_cal_component_remove_alarm (clone, (const gchar *)l->data); } } @@ -1201,7 +1201,7 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp, EDestination **destinations; ECalComponent *comp = NULL; icalcomponent *top_level = NULL; - char *ical_string = NULL; + gchar *ical_string = NULL; gchar *from = NULL; gchar *content_type = NULL; gchar *subject = NULL; @@ -1339,7 +1339,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method, GList *users = NULL; gchar *from; gchar *subject; - char *ical_string = NULL; + gchar *ical_string = NULL; gboolean retval = FALSE; /* Tidy up the comp */ @@ -1372,12 +1372,12 @@ reply_to_calendar_comp (ECalComponentItipMethod method, if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_EVENT){ GString *body; - char *orig_from = NULL; - const char *description = NULL; - char *subject = NULL; - const char *location = NULL; - char *time = NULL; - char *html_description = NULL; + gchar *orig_from = NULL; + const gchar *description = NULL; + gchar *subject = NULL; + const gchar *location = NULL; + gchar *time = NULL; + gchar *html_description = NULL; GSList *text_list = NULL; ECalComponentOrganizer organizer; ECalComponentText text; @@ -1521,9 +1521,9 @@ itip_publish_begin (ECalComponent *pub_comp, ECal *client, } static void -fb_sort (struct icalperiodtype *ipt, int fb_count) +fb_sort (struct icalperiodtype *ipt, gint fb_count) { - int i,j; + gint i,j; if (ipt == NULL || fb_count == 0) return; @@ -1552,9 +1552,9 @@ comp_fb_normalize (icalcomponent *icomp) { icalcomponent *iclone; icalproperty *prop, *p; - const char *uid, *comment; + const gchar *uid, *comment; struct icaltimetype itt; - int fb_count, i = 0, j; + gint fb_count, i = 0, j; struct icalperiodtype *ipt; iclone = icalcomponent_new (ICAL_VFREEBUSY_COMPONENT); @@ -1641,7 +1641,7 @@ itip_publish_comp (ECal *client, gchar *uri, gchar *username, SoupSession *session; SoupMessage *msg; SoupURI *real_uri; - char *ical_string = NULL; + gchar *ical_string = NULL; toplevel = e_cal_util_new_top_level (); icalcomponent_set_method (toplevel, ICAL_METHOD_PUBLISH); diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h index 8dce8266ab..c01fdbc676 100644 --- a/calendar/gui/itip-utils.h +++ b/calendar/gui/itip-utils.h @@ -39,10 +39,10 @@ typedef enum { } ECalComponentItipMethod; struct CalMimeAttach { - char *filename; - char *content_type; - char *description; - char *encoded_data; + gchar *filename; + gchar *content_type; + gchar *description; + gchar *encoded_data; gboolean disposition; guint length; }; @@ -56,13 +56,13 @@ gboolean itip_sentby_is_user (ECalComponent *comp, ECal *client); const gchar *itip_strip_mailto (const gchar *address); -char *itip_get_comp_attendee (ECalComponent *comp, ECal *client); +gchar *itip_get_comp_attendee (ECalComponent *comp, ECal *client); gboolean itip_send_comp (ECalComponentItipMethod method, ECalComponent *comp, ECal *client, icalcomponent *zones, GSList *attachments_list, GList *users, gboolean strip_alarms); -gboolean itip_publish_comp (ECal *client, gchar* uri, gchar* username, - gchar* password, ECalComponent **pub_comp); +gboolean itip_publish_comp (ECal *client, gchar * uri, gchar * username, + gchar * password, ECalComponent **pub_comp); gboolean itip_publish_begin (ECalComponent *pub_comp, ECal *client, gboolean cloned, ECalComponent **clone); diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 1687328fa4..a3a3a3339e 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -153,8 +153,8 @@ initialize (void) static BonoboObject * factory (BonoboGenericFactory *factory, - const char *component_id, - void *closure) + const gchar *component_id, + gpointer closure) { static gboolean initialized = FALSE; diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index d14b350d1c..ff540bbab7 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -105,8 +105,8 @@ typedef struct _MemosComponentView } MemosComponentView; struct _MemosComponentPrivate { - char *base_directory; - char *config_directory; + gchar *base_directory; + gchar *config_directory; ESourceList *source_list; GSList *source_selection; @@ -126,7 +126,7 @@ ensure_sources (MemosComponent *component) ESourceList *source_list; ESourceGroup *on_this_computer; ESource *personal_source; - char *base_uri, *base_uri_proto, base_uri_proto_seventh; + gchar *base_uri, *base_uri_proto, base_uri_proto_seventh; const gchar *base_dir; personal_source = NULL; @@ -246,7 +246,7 @@ is_in_uids (GSList *uids, ESource *source) GSList *l; for (l = uids; l; l = l->next) { - const char *uid = l->data; + const gchar *uid = l->data; if (!strcmp (uid, e_source_peek_uid (source))) return TRUE; @@ -273,7 +273,7 @@ update_uris_for_selection (MemosComponentView *component_view) ESource *selected_source = l->data; e_memos_add_memo_source (component_view->memos, selected_source); - uids_selected = g_slist_append (uids_selected, (char *)e_source_peek_uid (selected_source)); + uids_selected = g_slist_append (uids_selected, (gchar *)e_source_peek_uid (selected_source)); } e_source_selector_free_selection (component_view->source_selection); @@ -331,7 +331,7 @@ update_selection (MemosComponentView *component_view) /* Make sure the whole selection is there */ for (l = uids_selected; l; l = l->next) { - char *uid = l->data; + gchar *uid = l->data; ESource *source; source = e_source_list_peek_source_by_uid (component_view->source_list, uid); @@ -347,7 +347,7 @@ static void update_primary_selection (MemosComponentView *component_view) { ESource *source = NULL; - char *uid; + gchar *uid; uid = calendar_config_get_primary_memos (); if (uid) { @@ -370,7 +370,7 @@ update_primary_selection (MemosComponentView *component_view) /* Callbacks. */ /* TODO: doesn't work! */ static void -copy_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) +copy_memo_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { MemosComponentView *component_view = data; ESource *selected_source; @@ -383,12 +383,12 @@ copy_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -delete_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) +delete_memo_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { MemosComponentView *component_view = data; ESource *selected_source; ECal *cal; - char *uri; + gchar *uri; selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector)); if (!selected_source) @@ -422,13 +422,13 @@ delete_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -new_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) +new_memo_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { calendar_setup_new_memo_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget))); } static void -rename_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) +rename_memo_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { MemosComponentView *component_view = data; ESourceSelector *selector; @@ -438,7 +438,7 @@ rename_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -edit_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) +edit_memo_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { MemosComponentView *component_view = data; ESource *selected_source; @@ -451,7 +451,7 @@ edit_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value) +set_offline_availability (EPopup *ep, EPopupItem *pitem, gpointer data, const gchar *value) { MemosComponentView *component_view = data; ESource *selected_source; @@ -464,13 +464,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char } static void -mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) +mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { set_offline_availability (ep, pitem, data, "0"); } static void -mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) +mark_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { set_offline_availability (ep, pitem, data, "1"); } @@ -490,7 +490,7 @@ static EPopupItem emc_source_popups[] = { }; static void -emc_source_popup_free(EPopup *ep, GSList *list, void *data) +emc_source_popup_free(EPopup *ep, GSList *list, gpointer data) { g_slist_free(list); } @@ -501,7 +501,7 @@ popup_event_cb(ESourceSelector *selector, ESource *insource, GdkEventButton *eve ECalPopup *ep; ECalPopupTargetSource *t; GSList *menus = NULL; - int i; + gint i; GtkMenu *menu; /** @HookPoint-ECalPopup: Memos Source Selector Context Menu @@ -554,7 +554,7 @@ static void set_info (MemosComponentView *component_view) { GString *message = g_string_new (NULL); - int rows, selected_rows; + gint rows, selected_rows; rows = e_table_model_row_count (component_view->model); selected_rows = e_table_selected_count (component_view->table); @@ -581,13 +581,13 @@ model_changed_cb (ETableModel *etm, MemosComponentView *component_view) } static void -model_rows_inserted_cb (ETableModel *etm, int row, int count, MemosComponentView *component_view) +model_rows_inserted_cb (ETableModel *etm, gint row, gint count, MemosComponentView *component_view) { set_info (component_view); } static void -model_rows_deleted_cb (ETableModel *etm, int row, int count, MemosComponentView *component_view) +model_rows_deleted_cb (ETableModel *etm, gint row, gint count, MemosComponentView *component_view) { set_info (component_view); } @@ -639,7 +639,7 @@ selector_tree_data_dropped (ESourceSelector *selector, components = cal_comp_selection_get_string_list (data); success = components != NULL; for (p = components; p && success; p = p->next) { - char *comp_str; /* do not free this! */ + gchar *comp_str; /* do not free this! */ /* p->data is "source_uid\ncomponent_string" */ comp_str = strchr (p->data, '\n'); @@ -699,7 +699,7 @@ setup_create_ecal (MemosComponent *component, MemosComponentView *component_view { MemosComponentPrivate *priv; ESource *source = NULL; - char *uid; + gchar *uid; guint not; priv = component->priv; @@ -813,7 +813,7 @@ create_new_memo (MemosComponent *memo_component, gboolean is_assigned, MemosComp } static void -create_local_item_cb (EUserCreatableItemsHandler *handler, const char *item_type_name, void *data) +create_local_item_cb (EUserCreatableItemsHandler *handler, const gchar *item_type_name, gpointer data) { MemosComponent *memos_component = data; MemosComponentPrivate *priv; @@ -1039,28 +1039,28 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_sequence_set_release (list, FALSE); - 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 = (char *) _("Create a new memo"); + list->_buffer[0].id = (gchar *) CREATE_MEMO_ID; + list->_buffer[0].description = (gchar *) _("New memo"); + list->_buffer[0].menuDescription = (gchar *) C_("New", "Mem_o"); + list->_buffer[0].tooltip = (gchar *) _("Create a new memo"); list->_buffer[0].menuShortcut = 'o'; - list->_buffer[0].iconName = (char *) "stock_insert-note"; + list->_buffer[0].iconName = (gchar *) "stock_insert-note"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - 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 = (char *) _("Create a shared new memo"); + list->_buffer[1].id = (gchar *) CREATE_SHARED_MEMO_ID; + list->_buffer[1].description = (gchar *) _("New shared memo"); + list->_buffer[1].menuDescription = (gchar *) C_("New", "_Shared memo"); + list->_buffer[1].tooltip = (gchar *) _("Create a shared new memo"); list->_buffer[1].menuShortcut = 'h'; - list->_buffer[1].iconName = (char *) "stock_insert-note"; + list->_buffer[1].iconName = (gchar *) "stock_insert-note"; list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT; - 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 = (char *) _("Create a new memo list"); + list->_buffer[2].id = (gchar *) CREATE_MEMO_LIST_ID; + list->_buffer[2].description = (gchar *) _("New memo list"); + list->_buffer[2].menuDescription = (gchar *) C_("New", "Memo li_st"); + list->_buffer[2].tooltip = (gchar *) _("Create a new memo list"); list->_buffer[2].menuShortcut = '\0'; - list->_buffer[2].iconName = (char *) "stock_notes"; + list->_buffer[2].iconName = (gchar *) "stock_notes"; list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER; return list; @@ -1203,13 +1203,13 @@ memos_component_peek (void) return component; } -const char * +const gchar * memos_component_peek_base_directory (MemosComponent *component) { return component->priv->base_directory; } -const char * +const gchar * memos_component_peek_config_directory (MemosComponent *component) { return component->priv->config_directory; diff --git a/calendar/gui/memos-component.h b/calendar/gui/memos-component.h index 3ca01a50f7..bba81a44f2 100644 --- a/calendar/gui/memos-component.h +++ b/calendar/gui/memos-component.h @@ -57,8 +57,8 @@ struct _MemosComponentClass { GType memos_component_get_type (void); MemosComponent *memos_component_peek (void); -const char *memos_component_peek_base_directory (MemosComponent *component); -const char *memos_component_peek_config_directory (MemosComponent *component); +const gchar *memos_component_peek_base_directory (MemosComponent *component); +const gchar *memos_component_peek_config_directory (MemosComponent *component); ESourceList *memos_component_peek_source_list (MemosComponent *component); #endif /* _MEMOS_COMPONENT_H_ */ diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c index 2f7bd9b1bb..45e31a37da 100644 --- a/calendar/gui/memos-control.c +++ b/calendar/gui/memos-control.c @@ -136,7 +136,7 @@ memos_control_activate_cb (BonoboControl *control, * selected memos. */ void -memos_control_sensitize_commands (BonoboControl *control, EMemos *memos, int n_selected) +memos_control_sensitize_commands (BonoboControl *control, EMemos *memos, gint n_selected) { BonoboUIComponent *uic; gboolean read_only = TRUE, preview_active; @@ -177,7 +177,7 @@ memos_control_sensitize_commands (BonoboControl *control, EMemos *memos, int n_s /* Callback used when the selection in the table changes */ static void -selection_changed_cb (EMemos *memos, int n_selected, gpointer data) +selection_changed_cb (EMemos *memos, gint n_selected, gpointer data) { BonoboControl *control; @@ -231,10 +231,10 @@ memos_control_activate (BonoboControl *control, EMemos *memos) { Bonobo_UIContainer remote_uih; BonoboUIComponent *uic; - int n_selected; + gint n_selected; EMemoTable *cal_table; ETable *etable; - char *xmlfile; + gchar *xmlfile; uic = bonobo_control_get_ui_component (control); g_return_if_fail (uic != NULL); @@ -318,7 +318,7 @@ memos_control_new_memo_cmd (BonoboUIComponent *uic, static void memos_control_cut_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { EMemos *memos; EMemoTable *cal_table; @@ -331,7 +331,7 @@ memos_control_cut_cmd (BonoboUIComponent *uic, static void memos_control_copy_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { EMemos *memos; EMemoTable *cal_table; @@ -352,7 +352,7 @@ memos_control_copy_cmd (BonoboUIComponent *uic, static void memos_control_paste_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { EMemos *memos; EMemoTable *cal_table; @@ -377,7 +377,7 @@ memos_control_delete_cmd (BonoboUIComponent *uic, static void memos_control_print_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { EMemos *memos = E_MEMOS (data); ETable *table; @@ -393,7 +393,7 @@ memos_control_print_cmd (BonoboUIComponent *uic, static void memos_control_print_preview_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { EMemos *memos = E_MEMOS (data); ETable *table; diff --git a/calendar/gui/memos-control.h b/calendar/gui/memos-control.h index 565ac160ed..854f5f9d9b 100644 --- a/calendar/gui/memos-control.h +++ b/calendar/gui/memos-control.h @@ -31,6 +31,6 @@ BonoboControl *memos_control_new (void); void memos_control_activate (BonoboControl *control, EMemos *memos); void memos_control_deactivate (BonoboControl *control, EMemos *memos); -void memos_control_sensitize_commands (BonoboControl *control, EMemos *memos, int n_selected); +void memos_control_sensitize_commands (BonoboControl *control, EMemos *memos, gint n_selected); #endif /* _MEMOS_CONTROL_H_ */ diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index 97cc575b20..b2552a5a27 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -188,9 +188,9 @@ dialog_close (void) } static void -dialog_set_folder_name (const char *folder_name) +dialog_set_folder_name (const gchar *folder_name) { - char *text; + gchar *text; text = g_strdup_printf (_("Migrating '%s':"), folder_name); gtk_label_set_text (label, text); @@ -205,7 +205,7 @@ dialog_set_folder_name (const char *folder_name) static void dialog_set_progress (double percent) { - char text[5]; + gchar text[5]; snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f)); @@ -217,7 +217,7 @@ dialog_set_progress (double percent) } static gboolean -check_for_conflict (ESourceGroup *group, char *name) +check_for_conflict (ESourceGroup *group, gchar *name) { GSList *sources; GSList *s; @@ -234,12 +234,12 @@ check_for_conflict (ESourceGroup *group, char *name) return FALSE; } -static char * -get_source_name (ESourceGroup *group, const char *path) +static gchar * +get_source_name (ESourceGroup *group, const gchar *path) { - char **p = g_strsplit (path, "/", 0); - int i, j, starting_index; - int num_elements; + gchar **p = g_strsplit (path, "/", 0); + gint i, j, starting_index; + gint num_elements; gboolean conflict; GString *s = g_string_new (NULL); @@ -281,8 +281,8 @@ static gboolean migrate_ical (ECal *old_ecal, ECal *new_ecal) { GList *l, *objects; - int num_added = 0; - int num_objects; + gint num_added = 0; + gint num_objects; gboolean retval = TRUE; /* both ecals are loaded, start the actual migration */ @@ -312,12 +312,12 @@ migrate_ical (ECal *old_ecal, ECal *new_ecal) } static gboolean -migrate_ical_folder_to_source (char *old_path, ESource *new_source, ECalSourceType type) +migrate_ical_folder_to_source (gchar *old_path, ESource *new_source, ECalSourceType type) { ECal *old_ecal = NULL, *new_ecal = NULL; ESource *old_source; ESourceGroup *group; - char *old_uri = g_filename_to_uri (old_path, NULL, NULL); + gchar *old_uri = g_filename_to_uri (old_path, NULL, NULL); GError *error = NULL; gboolean retval = FALSE; @@ -362,7 +362,7 @@ finish: } static gboolean -migrate_ical_folder (char *old_path, ESourceGroup *dest_group, char *source_name, ECalSourceType type) +migrate_ical_folder (gchar *old_path, ESourceGroup *dest_group, gchar *source_name, ECalSourceType type) { ESource *new_source; gboolean retval; @@ -416,7 +416,7 @@ create_calendar_sources (CalendarComponent *component, { GSList *groups; ESourceGroup *group; - char *base_uri, *base_uri_proto; + gchar *base_uri, *base_uri_proto; const gchar *base_dir; *on_this_computer = NULL; @@ -479,7 +479,7 @@ create_calendar_sources (CalendarComponent *component, } if (!*personal_source) { - char *primary_calendar = calendar_config_get_primary_calendar (); + gchar *primary_calendar = calendar_config_get_primary_calendar (); /* Create the default Person calendar */ ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI); @@ -527,7 +527,7 @@ create_task_sources (TasksComponent *component, { GSList *groups; ESourceGroup *group; - char *base_uri, *base_uri_proto; + gchar *base_uri, *base_uri_proto; const gchar *base_dir; *on_this_computer = NULL; @@ -614,7 +614,7 @@ create_task_sources (TasksComponent *component, #ifndef G_OS_WIN32 static void -migrate_pilot_db_key (const char *key, gpointer user_data) +migrate_pilot_db_key (const gchar *key, gpointer user_data) { EXmlHash *xmlhash = user_data; @@ -622,12 +622,12 @@ migrate_pilot_db_key (const char *key, gpointer user_data) } static void -migrate_pilot_data (const char *component, const char *conduit, const char *old_path, const char *new_path) +migrate_pilot_data (const gchar *component, const gchar *conduit, const gchar *old_path, const gchar *new_path) { - char *changelog, *map; - const char *dent; - const char *ext; - char *filename; + gchar *changelog, *map; + const gchar *dent; + const gchar *ext; + gchar *filename; GDir *dir; if (!(dir = g_dir_open (old_path, 0, NULL))) @@ -643,9 +643,9 @@ migrate_pilot_data (const char *component, const char *conduit, const char *old_ if (!strncmp (dent, map, strlen (map)) && ((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) { /* pilot map file - src and dest file formats are identical */ - unsigned char inbuf[4096]; + guchar inbuf[4096]; size_t nread, nwritten; - int fd0, fd1; + gint fd0, fd1; ssize_t n; filename = g_build_filename (old_path, dent, NULL); @@ -733,7 +733,7 @@ migrate_pilot_data (const char *component, const char *conduit, const char *old_ #endif gboolean -migrate_calendars (CalendarComponent *component, int major, int minor, int revision, GError **err) +migrate_calendars (CalendarComponent *component, gint major, gint minor, gint revision, GError **err) { ESourceGroup *on_this_computer = NULL, *on_the_web = NULL, *contacts = NULL; ESource *personal_source = NULL; @@ -749,7 +749,7 @@ migrate_calendars (CalendarComponent *component, int major, int minor, int revis #ifndef G_OS_WIN32 if (major == 1) { xmlDocPtr config_doc = NULL; - char *conf_file; + gchar *conf_file; struct stat st; conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL); @@ -759,7 +759,7 @@ migrate_calendars (CalendarComponent *component, int major, int minor, int revis if (config_doc && minor <= 2) { GConfClient *gconf; - int res = 0; + gint res = 0; /* move bonobo config to gconf */ gconf = gconf_client_get_default (); @@ -779,7 +779,7 @@ migrate_calendars (CalendarComponent *component, int major, int minor, int revis if (minor <= 4) { GSList *migration_dirs, *l; - char *path, *local_cal_folder; + gchar *path, *local_cal_folder; setup_progress_dialog (FALSE); @@ -792,12 +792,12 @@ migrate_calendars (CalendarComponent *component, int major, int minor, int revis migrate_ical_folder_to_source (local_cal_folder, personal_source, E_CAL_SOURCE_TYPE_EVENT); for (l = migration_dirs; l; l = l->next) { - char *source_name; + gchar *source_name; - if (personal_source && !strcmp ((char*)l->data, local_cal_folder)) + if (personal_source && !strcmp ((gchar *)l->data, local_cal_folder)) continue; - source_name = get_source_name (on_this_computer, (char*)l->data); + source_name = get_source_name (on_this_computer, (gchar *)l->data); if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_EVENT)) { /* FIXME: domain/code */ @@ -817,8 +817,8 @@ migrate_calendars (CalendarComponent *component, int major, int minor, int revis if (minor <= 4 || (minor == 5 && revision < 5)) { GConfClient *gconf; GConfValue *gconf_val; - int i; - const char *keys[] = { + gint i; + const gchar *keys[] = { CALENDAR_CONFIG_HPANE_POS, CALENDAR_CONFIG_VPANE_POS, CALENDAR_CONFIG_MONTH_HPANE_POS, @@ -841,7 +841,7 @@ migrate_calendars (CalendarComponent *component, int major, int minor, int revis } if (minor < 5 || (minor == 5 && revision <= 10)) { - char *old_path, *new_path; + gchar *old_path, *new_path; old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Calendar", NULL); new_path = g_build_filename (calendar_component_peek_base_directory (component), @@ -904,7 +904,7 @@ fail: } gboolean -migrate_tasks (TasksComponent *component, int major, int minor, int revision, GError **err) +migrate_tasks (TasksComponent *component, gint major, gint minor, gint revision, GError **err) { ESourceGroup *on_this_computer = NULL; ESourceGroup *on_the_web = NULL; @@ -919,7 +919,7 @@ migrate_tasks (TasksComponent *component, int major, int minor, int revision, GE #ifndef G_OS_WIN32 if (major == 1) { xmlDocPtr config_doc = NULL; - char *conf_file; + gchar *conf_file; conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL); if (g_file_test (conf_file, G_FILE_TEST_IS_REGULAR)) @@ -928,7 +928,7 @@ migrate_tasks (TasksComponent *component, int major, int minor, int revision, GE if (config_doc && minor <= 2) { GConfClient *gconf; - int res = 0; + gint res = 0; /* move bonobo config to gconf */ gconf = gconf_client_get_default (); @@ -947,7 +947,7 @@ migrate_tasks (TasksComponent *component, int major, int minor, int revision, GE if (minor <= 4) { GSList *migration_dirs, *l; - char *path, *local_task_folder; + gchar *path, *local_task_folder; setup_progress_dialog (TRUE); @@ -960,12 +960,12 @@ migrate_tasks (TasksComponent *component, int major, int minor, int revision, GE migrate_ical_folder_to_source (local_task_folder, personal_source, E_CAL_SOURCE_TYPE_TODO); for (l = migration_dirs; l; l = l->next) { - char *source_name; + gchar *source_name; - if (personal_source && !strcmp ((char*)l->data, local_task_folder)) + if (personal_source && !strcmp ((gchar *)l->data, local_task_folder)) continue; - source_name = get_source_name (on_this_computer, (char*)l->data); + source_name = get_source_name (on_this_computer, (gchar *)l->data); if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_TODO)) { /* FIXME: domain/code */ @@ -983,7 +983,7 @@ migrate_tasks (TasksComponent *component, int major, int minor, int revision, GE } if (minor < 5 || (minor == 5 && revision <= 10)) { - char *old_path, *new_path; + gchar *old_path, *new_path; old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Tasks", NULL); new_path = g_build_filename (tasks_component_peek_base_directory (component), @@ -1041,7 +1041,7 @@ create_memo_sources (MemosComponent *component, { GSList *groups; ESourceGroup *group; - char *base_uri, *base_uri_proto; + gchar *base_uri, *base_uri_proto; const gchar *base_dir; *on_this_computer = NULL; @@ -1136,17 +1136,17 @@ is_groupwise_account (EAccount *account) } static void -add_gw_esource (ESourceList *source_list, const char *group_name, const char *source_name, CamelURL *url, GConfClient *client) +add_gw_esource (ESourceList *source_list, const gchar *group_name, const gchar *source_name, CamelURL *url, GConfClient *client) { ESourceGroup *group; ESource *source; GSList *ids, *temp ; GError *error = NULL; - char *relative_uri; - const char *soap_port; - const char * use_ssl; - const char *poa_address; - const char *offline_sync; + gchar *relative_uri; + const gchar *soap_port; + const gchar * use_ssl; + const gchar *poa_address; + const gchar *offline_sync; poa_address = url->host; @@ -1194,7 +1194,7 @@ add_gw_esource (ESourceList *source_list, const char *group_name, const char *s } gboolean -migrate_memos (MemosComponent *component, int major, int minor, int revision, struct _GError **err) +migrate_memos (MemosComponent *component, gint major, gint minor, gint revision, struct _GError **err) { ESourceGroup *on_this_computer = NULL; ESourceGroup *on_the_web = NULL; diff --git a/calendar/gui/migration.h b/calendar/gui/migration.h index c16fd831b9..d4bb33c448 100644 --- a/calendar/gui/migration.h +++ b/calendar/gui/migration.h @@ -31,7 +31,7 @@ struct _GError; -gboolean migrate_calendars (CalendarComponent *component, int major, int minor, int revision, struct _GError **err); -gboolean migrate_tasks (TasksComponent *component, int major, int minor, int revision, struct _GError **err); -gboolean migrate_memos (MemosComponent *component, int major, int minor, int revision, struct _GError **err); +gboolean migrate_calendars (CalendarComponent *component, gint major, gint minor, gint revision, struct _GError **err); +gboolean migrate_tasks (TasksComponent *component, gint major, gint minor, gint revision, struct _GError **err); +gboolean migrate_memos (MemosComponent *component, gint major, gint minor, gint revision, struct _GError **err); #endif diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c index ab657d8872..9fdf6f971b 100644 --- a/calendar/gui/misc.c +++ b/calendar/gui/misc.c @@ -45,9 +45,9 @@ * Return value: TRUE if the string is empty, FALSE otherwise. **/ gboolean -string_is_empty (const char *value) +string_is_empty (const gchar *value) { - const char *p; + const gchar *p; gboolean empty; empty = TRUE; @@ -69,11 +69,11 @@ string_is_empty (const char *value) /** * get_uri_without_password */ -char * -get_uri_without_password (const char *full_uri) +gchar * +get_uri_without_password (const gchar *full_uri) { EUri *uri; - char *uristr; + gchar *uristr; uri = e_uri_new (full_uri); if (!uri) @@ -98,15 +98,15 @@ get_position_in_array (GPtrArray *objects, gpointer item) return -1; } -char * +gchar * calculate_time (time_t start, time_t end) { time_t difference = end - start; - char *str; - int hours, minutes; - char *times[4]; - char *joined; - int i; + gchar *str; + gint hours, minutes; + gchar *times[4]; + gchar *joined; + gint i; i = 0; if (difference >= 3600) { diff --git a/calendar/gui/misc.h b/calendar/gui/misc.h index 8c328652bb..6d3133b58d 100644 --- a/calendar/gui/misc.h +++ b/calendar/gui/misc.h @@ -29,8 +29,8 @@ #include #include -gboolean string_is_empty (const char *value); -char *get_uri_without_password (const char *uri); +gboolean string_is_empty (const gchar *value); +gchar *get_uri_without_password (const gchar *uri); gint get_position_in_array (GPtrArray *objects, gpointer item); -char * calculate_time (time_t start, time_t end); +gchar * calculate_time (time_t start, time_t end); #endif diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 3fca566bf2..7abe2f5da7 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -73,7 +73,7 @@ struct PrintCalItem { static double evo_calendar_print_renderer_get_width (GtkPrintContext *context, PangoFontDescription *font, - const char *text) + const gchar *text) { PangoLayout *layout; gint layout_width, layout_height; @@ -153,7 +153,7 @@ get_font_size (PangoFontDescription *font) /* The weird month of September 1752, where 3 Sep through 13 Sep were eliminated due to the Gregorian reformation. */ -static const int sept_1752[42] = { +static const gint sept_1752[42] = { 0, 0, 1, 2, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, @@ -190,12 +190,12 @@ struct psinfo GArray *events; - int rows_per_cell; - int rows_per_compressed_cell; - int display_start_weekday; + gint rows_per_cell; + gint rows_per_compressed_cell; + gint display_start_weekday; gboolean multi_week_view; - int weeks_shown; - int month; + gint weeks_shown; + gint month; gboolean compress_weekend; gboolean use_24_hour_format; double row_height; @@ -233,10 +233,10 @@ convert_timet_to_struct_tm (time_t time, icaltimezone *zone) * returned in the start and end arguments. */ static void -build_month (int month, int year, int *days, int *start, int *end) +build_month (gint month, gint year, gint *days, gint *start, gint *end) { - int i; - int d_month, d_week, week_start_day; + gint i; + gint d_month, d_week, week_start_day; /* Note that months are zero-based, so September is month 8 */ @@ -412,7 +412,7 @@ print_rectangle (GtkPrintContext *context, or PANGO_ALIGN_CENTER. */ static double print_text (GtkPrintContext *context, PangoFontDescription *desc, - const char *text, PangoAlignment alignment, + const gchar *text, PangoAlignment alignment, gdouble x1, gdouble x2, gdouble y1, gdouble y2) { PangoLayout *layout; @@ -455,7 +455,7 @@ print_text (GtkPrintContext *context, PangoFontDescription *desc, /* gets/frees the font for you, as a normal font */ static double -print_text_size (GtkPrintContext *context, const char *text, +print_text_size (GtkPrintContext *context, const gchar *text, PangoAlignment alignment, gdouble x1, gdouble x2, gdouble y1, gdouble y2) { @@ -471,7 +471,7 @@ print_text_size (GtkPrintContext *context, const char *text, /* gets/frees the font for you, as a bold font */ static double -print_text_size_bold (GtkPrintContext *context, const char *text, +print_text_size_bold (GtkPrintContext *context, const gchar *text, PangoAlignment alignment, gdouble x1, gdouble x2, gdouble y1, gdouble y2) { @@ -486,7 +486,7 @@ print_text_size_bold (GtkPrintContext *context, const char *text, } static void -titled_box (GtkPrintContext *context, const char *text, +titled_box (GtkPrintContext *context, const gchar *text, PangoFontDescription *font, PangoAlignment alignment, gdouble *x1, gdouble *y1, gdouble *x2, gdouble *y2, gdouble linewidth) @@ -523,11 +523,11 @@ static const gchar *days[] = { /* format the date 'nicely' and consistently for various headers */ -static char * -format_date(time_t time, int flags, char *buffer, int bufflen) +static gchar * +format_date(time_t time, gint flags, gchar *buffer, gint bufflen) { icaltimezone *zone = calendar_config_get_icaltimezone (); - char fmt[64]; + gchar fmt[64]; struct tm tm; tm = *convert_timet_to_struct_tm (time, zone); @@ -576,16 +576,16 @@ instance_cb (ECalComponent *comp, time_t instance_start, time_t instance_end, gp static void print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month, gdouble x1, gdouble y1, gdouble x2, gdouble y2, - int titleflags, time_t greystart, time_t greyend, - int bordertitle) + gint titleflags, time_t greystart, time_t greyend, + gint bordertitle) { icaltimezone *zone = calendar_config_get_icaltimezone (); PangoFontDescription *font, *font_bold, *font_normal; time_t now, next; - int x, y; - int days[42]; - int day, weekday, week_start_day; - char buf[100]; + gint x, y; + gint days[42]; + gint day, weekday, week_start_day; + gchar buf[100]; struct tm tm; double font_size, max_font_size; double header_size, col_width, row_height, text_xpad, w; @@ -772,10 +772,10 @@ print_day_background (GtkPrintContext *context, GnomeCalendar *gcal, double yinc, y; double width = DAY_VIEW_TIME_COLUMN_WIDTH; double font_size, max_font_size, hour_font_size, minute_font_size; - char buf[20]; - const char *minute; + gchar buf[20]; + const gchar *minute; gboolean use_24_hour; - int i, hour, row; + gint i, hour, row; double hour_minute_x; cairo_t *cr; @@ -971,10 +971,10 @@ free_event_array (GArray *array) g_array_set_size (array, 0); } -static const char * +static const gchar * get_type_as_string (icalparameter_cutype cutype) { - const char *res; + const gchar *res; switch (cutype) { case ICAL_CUTYPE_NONE: res = NULL; break; @@ -988,10 +988,10 @@ get_type_as_string (icalparameter_cutype cutype) return res; } -static const char * +static const gchar * get_role_as_string (icalparameter_role role) { - const char *res; + const gchar *res; switch (role) { case ICAL_ROLE_NONE: res = NULL; break; @@ -1023,7 +1023,7 @@ print_attendees (GtkPrintContext *context, PangoFontDescription *font, cairo_t * if (attendee && attendee->value && *attendee->value) { GString *text; - const char *tmp; + const gchar *tmp; tmp = get_type_as_string (attendee->cutype); text = g_string_new (tmp ? tmp : ""); @@ -1092,8 +1092,8 @@ print_day_long_event (GtkPrintContext *context, PangoFontDescription *font, { double x1, x2, y1, y2; double left_triangle_width = -1.0, right_triangle_width = -1.0; - char *text; - char buffer[32]; + gchar *text; + gchar buffer[32]; struct tm date_tm; double red, green, blue; @@ -1171,8 +1171,8 @@ print_day_event (GtkPrintContext *context, PangoFontDescription *font, EDayViewEvent *event, struct pdinfo *pdi, ECalModel *model) { double x1, x2, y1, y2, col_width, row_height; - int start_offset, end_offset, start_row, end_row; - char *text, start_buffer[32], end_buffer[32]; + gint start_offset, end_offset, start_row, end_row; + gchar *text, start_buffer[32], end_buffer[32]; gboolean display_times = FALSE; struct tm date_tm; double red, green, blue; @@ -1392,11 +1392,11 @@ print_week_long_event (GtkPrintContext *context, PangoFontDescription *font, struct psinfo *psi, double x1, double x2, double y1, double y2, EWeekViewEvent *event, EWeekViewEventSpan *span, - char *text, double red, double green, double blue) + gchar *text, double red, double green, double blue) { double left_triangle_width = -1.0, right_triangle_width = -1.0; struct tm date_tm; - char buffer[32]; + gchar buffer[32]; /* If the event starts before the first day of the span, draw a triangle to indicate it continues. */ @@ -1459,10 +1459,10 @@ print_week_day_event (GtkPrintContext *context, PangoFontDescription *font, struct psinfo *psi, double x1, double x2, double y1, double y2, EWeekViewEvent *event, EWeekViewEventSpan *span, - char *text, double red, double green, double blue) + gchar *text, double red, double green, double blue) { struct tm date_tm; - char buffer[32]; + gchar buffer[32]; date_tm.tm_year = 2001; date_tm.tm_mon = 0; @@ -1503,8 +1503,8 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font, { EWeekViewEventSpan *span; gint span_num; - char *text; - int num_days, start_x, start_y, start_h, end_x, end_y, end_h; + gchar *text; + gint num_days, start_x, start_y, start_h, end_x, end_y, end_h; double x1, x2, y1, y2; double red, green, blue; GdkPixbuf *pixbuf = NULL; @@ -1594,12 +1594,12 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font, } if (!pixbuf) { - const char **xpm = (const char **)jump_xpm; + const gchar **xpm = (const gchar **)jump_xpm; /* this ugly thing is here only to get rid of compiler warning about unused 'jump_xpm_focused' */ if (pixbuf) - xpm = (const char **)jump_xpm_focused; + xpm = (const gchar **)jump_xpm_focused; pixbuf = gdk_pixbuf_new_from_xpm_data (xpm); } @@ -1628,7 +1628,7 @@ print_week_view_background (GtkPrintContext *context, { icaltimezone *zone = calendar_config_get_icaltimezone (); struct tm tm; - int day, day_x, day_y, day_h; + gint day, day_x, day_y, day_h; double x1, x2, y1, y2, font_size, fillcolor; const gchar *format_string; gchar buffer[128]; @@ -1737,8 +1737,8 @@ print_week_summary_cb (ECalComponent *comp, static void print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal, - time_t whence, gboolean multi_week_view, int weeks_shown, - int month, double font_size, + time_t whence, gboolean multi_week_view, gint weeks_shown, + gint month, double font_size, double left, double right, double top, double bottom) { icaltimezone *zone = calendar_config_get_icaltimezone (); @@ -1842,12 +1842,12 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal, static void print_year_summary (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence, double left, double right, double top, double bottom, - int morerows) + gint morerows) { icaltimezone *zone = calendar_config_get_icaltimezone (); double row_height, col_width, l, r, t, b; time_t now; - int col, row, rows, cols; + gint col, row, rows, cols; l = left; t = top; @@ -1891,10 +1891,10 @@ print_month_summary (GtkPrintContext *context, GnomeCalendar *gcal, time_t whenc time_t date; struct tm tm; struct icaltimetype tt; - char buffer[100]; + gchar buffer[100]; PangoFontDescription *font; gboolean compress_weekend; - int columns, col, weekday, month; + gint columns, col, weekday, month; double font_size, cell_width, x1, x2, y1, y2; weekday = calendar_config_get_week_start_day (); @@ -1999,7 +1999,7 @@ print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal, ECalModelComponent *comp_data; ECalComponent *comp; ECalComponentText summary; - int model_row; + gint model_row; model_row = e_table_view_to_model_row (table, row); comp_data = e_cal_model_get_component_at (model, model_row); @@ -2061,9 +2061,9 @@ print_day_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) { GtkPageSetup *setup; icaltimezone *zone = calendar_config_get_icaltimezone (); - int i, days = 1; + gint i, days = 1; double todo, l; - char buf[100]; + gchar buf[100]; cairo_t *cr; gdouble width, height; @@ -2131,7 +2131,7 @@ print_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) GtkPageSetup *setup; icaltimezone *zone = calendar_config_get_icaltimezone (); double l; - char buf[100]; + gchar buf[100]; time_t when; gint week_start_day; struct tm tm; @@ -2205,7 +2205,7 @@ print_month_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) { GtkPageSetup *setup; icaltimezone *zone = calendar_config_get_icaltimezone (); - char buf[100]; + gchar buf[100]; gdouble width, height; double l; @@ -2247,7 +2247,7 @@ static void print_year_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) { GtkPageSetup *setup; - char buf[100]; + gchar buf[100]; cairo_t *cr; gdouble width, height; @@ -2282,7 +2282,7 @@ write_label_piece (time_t t, { icaltimezone *zone = calendar_config_get_icaltimezone (); struct tm *tmp_tm; - int len; + gint len; tmp_tm = convert_timet_to_struct_tm (t, zone); @@ -2299,7 +2299,7 @@ write_label_piece (time_t t, } static icaltimezone* -get_zone_from_tzid (ECal *client, const char *tzid) +get_zone_from_tzid (ECal *client, const gchar *tzid) { icaltimezone *zone; @@ -2323,7 +2323,7 @@ print_date_label (GtkPrintContext *context, ECalComponent *comp, ECal *client, icaltimezone *start_zone, *end_zone, *due_zone, *completed_zone; ECalComponentDateTime datetime; time_t start = 0, end = 0, complete = 0, due = 0; - static char buffer[1024]; + static gchar buffer[1024]; e_cal_component_get_dtstart (comp, &datetime); if (datetime.value) { @@ -2452,8 +2452,8 @@ print_comp_draw_real (GtkPrintOperation *operation, GSList *desc, *l; GSList *contact_list, *elem; - const char *title, *categories, *location; - char *categories_string, *location_string, *summary_string; + const gchar *title, *categories, *location; + gchar *categories_string, *location_string, *summary_string; double header_size; cairo_t *cr; gdouble width, height, page_start; @@ -2549,10 +2549,10 @@ print_comp_draw_real (GtkPrintOperation *operation, /* For a VTODO we print the Status, Priority, % Complete and URL. */ if (vtype == E_CAL_COMPONENT_TODO) { icalproperty_status status; - const char *status_string = NULL; - int *percent; - int *priority; - const char *url; + const gchar *status_string = NULL; + gint *percent; + gint *priority; + const gchar *url; /* Status */ e_cal_component_get_status (comp, &status); @@ -2575,7 +2575,7 @@ print_comp_draw_real (GtkPrintOperation *operation, } if (status_string) { - char *status_text = g_strdup_printf (_("Status: %s"), + gchar *status_text = g_strdup_printf (_("Status: %s"), status_string); top = bound_text (context, font, status_text, -1, 0.0, top, width, height, FALSE, &page_start, &pages); @@ -2587,7 +2587,7 @@ print_comp_draw_real (GtkPrintOperation *operation, /* Priority */ e_cal_component_get_priority (comp, &priority); if (priority && *priority >= 0) { - char *priority_string, *pri_text; + gchar *priority_string, *pri_text; priority_string = e_cal_util_priority_to_string (*priority); @@ -2604,7 +2604,7 @@ print_comp_draw_real (GtkPrintOperation *operation, /* Percent Complete */ e_cal_component_get_percent (comp, &percent); if (percent) { - char *percent_string; + gchar *percent_string; percent_string = g_strdup_printf (_("Percent Complete: %i"), *percent); e_cal_component_free_percent (percent); @@ -2618,7 +2618,7 @@ print_comp_draw_real (GtkPrintOperation *operation, /* URL */ e_cal_component_get_url (comp, &url); if (url && url[0]) { - char *url_string = g_strdup_printf (_("URL: %s"), + gchar *url_string = g_strdup_printf (_("URL: %s"), url); top = bound_text (context, font, url_string, -1, @@ -2663,7 +2663,7 @@ print_comp_draw_real (GtkPrintOperation *operation, e_cal_component_get_description_list (comp, &desc); for (l = desc; l != NULL; l = l->next) { ECalComponentText *ptext = l->data; - const char *line, *next_line; + const gchar *line, *next_line; for (line = ptext->value; line != NULL; line = next_line) { next_line = strchr (line, '\n'); diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c index b57a50d6ce..272d822a2c 100644 --- a/calendar/gui/tag-calendar.c +++ b/calendar/gui/tag-calendar.c @@ -160,7 +160,7 @@ tag_calendar_by_client (ECalendar *ecal, ECal *client) the server. We need to try to use builtin timezones first, as they may not be added to the server yet. */ static icaltimezone* -resolve_tzid_cb (const char *tzid, gpointer data) +resolve_tzid_cb (const gchar *tzid, gpointer data) { ECal *client; icaltimezone *zone = NULL; diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 68536b29cb..e848b9b468 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -104,8 +104,8 @@ typedef struct } TasksComponentView; struct _TasksComponentPrivate { - char *base_directory; - char *config_directory; + gchar *base_directory; + gchar *config_directory; ESourceList *source_list; GSList *source_selection; @@ -123,7 +123,7 @@ ensure_sources (TasksComponent *component) ESourceList *source_list; ESourceGroup *on_this_computer; ESource *personal_source; - char *base_uri, *base_uri_proto, base_uri_proto_seventh; + gchar *base_uri, *base_uri_proto, base_uri_proto_seventh; const gchar *base_dir; personal_source = NULL; @@ -243,7 +243,7 @@ is_in_uids (GSList *uids, ESource *source) GSList *l; for (l = uids; l; l = l->next) { - const char *uid = l->data; + const gchar *uid = l->data; if (!strcmp (uid, e_source_peek_uid (source))) return TRUE; @@ -270,7 +270,7 @@ update_uris_for_selection (TasksComponentView *component_view) ESource *selected_source = l->data; e_tasks_add_todo_source (component_view->tasks, selected_source); - uids_selected = g_slist_append (uids_selected, (char *)e_source_peek_uid (selected_source)); + uids_selected = g_slist_append (uids_selected, (gchar *)e_source_peek_uid (selected_source)); } e_source_selector_free_selection (component_view->source_selection); @@ -326,7 +326,7 @@ update_selection (TasksComponentView *component_view) /* Make sure the whole selection is there */ for (l = uids_selected; l; l = l->next) { - char *uid = l->data; + gchar *uid = l->data; ESource *source; source = e_source_list_peek_source_by_uid (component_view->source_list, uid); @@ -342,7 +342,7 @@ static void update_primary_selection (TasksComponentView *component_view) { ESource *source = NULL; - char *uid; + gchar *uid; uid = calendar_config_get_primary_tasks (); if (uid) { @@ -362,7 +362,7 @@ update_primary_selection (TasksComponentView *component_view) /* Callbacks. */ static void -copy_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) +copy_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { TasksComponentView *component_view = data; ESource *selected_source; @@ -375,12 +375,12 @@ copy_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -delete_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) +delete_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { TasksComponentView *component_view = data; ESource *selected_source; ECal *cal; - char *uri; + gchar *uri; selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector)); if (!selected_source) @@ -414,13 +414,13 @@ delete_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -new_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) +new_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { calendar_setup_new_task_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget))); } static void -rename_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) +rename_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { TasksComponentView *component_view = data; ESourceSelector *selector; @@ -430,7 +430,7 @@ rename_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) +edit_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { TasksComponentView *component_view = data; ESource *selected_source; @@ -443,7 +443,7 @@ edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value) +set_offline_availability (EPopup *ep, EPopupItem *pitem, gpointer data, const gchar *value) { TasksComponentView *component_view = data; ESource *selected_source; @@ -456,13 +456,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char } static void -mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) +mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { set_offline_availability (ep, pitem, data, "0"); } static void -mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) +mark_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { set_offline_availability (ep, pitem, data, "1"); } @@ -482,7 +482,7 @@ static EPopupItem etc_source_popups[] = { }; static void -etc_source_popup_free(EPopup *ep, GSList *list, void *data) +etc_source_popup_free(EPopup *ep, GSList *list, gpointer data) { g_slist_free(list); } @@ -493,7 +493,7 @@ popup_event_cb(ESourceSelector *selector, ESource *insource, GdkEventButton *eve ECalPopup *ep; ECalPopupTargetSource *t; GSList *menus = NULL; - int i; + gint i; GtkMenu *menu; /** @HookPoint-ECalPopup: Tasks Source Selector Context Menu @@ -546,7 +546,7 @@ static void set_info (TasksComponentView *component_view) { GString *message = g_string_new (NULL); - int rows, selected_rows; + gint rows, selected_rows; rows = e_table_model_row_count (component_view->model); selected_rows = e_table_selected_count (component_view->table); @@ -573,13 +573,13 @@ model_changed_cb (ETableModel *etm, TasksComponentView *component_view) } static void -model_rows_inserted_cb (ETableModel *etm, int row, int count, TasksComponentView *component_view) +model_rows_inserted_cb (ETableModel *etm, gint row, gint count, TasksComponentView *component_view) { set_info (component_view); } static void -model_rows_deleted_cb (ETableModel *etm, int row, int count, TasksComponentView *component_view) +model_rows_deleted_cb (ETableModel *etm, gint row, gint count, TasksComponentView *component_view) { set_info (component_view); } @@ -631,7 +631,7 @@ selector_tree_data_dropped (ESourceSelector *selector, components = cal_comp_selection_get_string_list (data); success = components != NULL; for (p = components; p && success; p = p->next) { - char *comp_str; /* do not free this! */ + gchar *comp_str; /* do not free this! */ /* p->data is "source_uid\ncomponent_string" */ comp_str = strchr (p->data, '\n'); @@ -690,7 +690,7 @@ setup_create_ecal (TasksComponent *component, TasksComponentView *component_view { TasksComponentPrivate *priv; ESource *source = NULL; - char *uid; + gchar *uid; guint not; priv = component->priv; @@ -809,7 +809,7 @@ create_new_todo (TasksComponent *task_component, gboolean is_assigned, TasksComp } static void -create_local_item_cb (EUserCreatableItemsHandler *handler, const char *item_type_name, void *data) +create_local_item_cb (EUserCreatableItemsHandler *handler, const gchar *item_type_name, gpointer data) { TasksComponent *tasks_component = data; TasksComponentPrivate *priv; @@ -1026,16 +1026,16 @@ impl_createView (PortableServer_Servant servant, } static void -impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environment *ev) +impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environment *ev) { TasksComponent *tasks_component = TASKS_COMPONENT (bonobo_object_from_servant (servant)); TasksComponentPrivate *priv; GList *l; TasksComponentView *view = NULL; - char *src_uid = NULL; - char *uid = NULL; - char *rid = NULL; + gchar *src_uid = NULL; + gchar *uid = NULL; + gchar *rid = NULL; priv = tasks_component->priv; @@ -1047,8 +1047,8 @@ impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environme if (!strncmp (uri, "task:", 5)) { EUri *euri = e_uri_new (uri); - const char *p; - char *header, *content; + const gchar *p; + gchar *header, *content; size_t len, clen; p = euri->query; @@ -1060,7 +1060,7 @@ impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environme if (p[len] != '=') break; - header = (char *) p; + header = (gchar *) p; header[len] = '\0'; p += len + 1; @@ -1110,28 +1110,28 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_sequence_set_release (list, FALSE); - 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 = (char *) _("Create a new task"); + list->_buffer[0].id = (gchar *) CREATE_TASK_ID; + list->_buffer[0].description = (gchar *) _("New task"); + list->_buffer[0].menuDescription = (gchar *) C_("New", "_Task"); + list->_buffer[0].tooltip = (gchar *) _("Create a new task"); list->_buffer[0].menuShortcut = 't'; - list->_buffer[0].iconName = (char *) "stock_task"; + list->_buffer[0].iconName = (gchar *) "stock_task"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - 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 = (char *) _("Create a new assigned task"); + list->_buffer[1].id = (gchar *) CREATE_TASK_ASSIGNED_ID; + list->_buffer[1].description = (gchar *) _("New assigned task"); + list->_buffer[1].menuDescription = (gchar *) C_("New", "Assigne_d Task"); + list->_buffer[1].tooltip = (gchar *) _("Create a new assigned task"); list->_buffer[1].menuShortcut = '\0'; - list->_buffer[1].iconName = (char *) "stock_task"; + list->_buffer[1].iconName = (gchar *) "stock_task"; list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT; - 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 = (char *) _("Create a new task list"); + list->_buffer[2].id = (gchar *) CREATE_TASK_LIST_ID; + list->_buffer[2].description = (gchar *) _("New task list"); + list->_buffer[2].menuDescription = (gchar *) C_("New", "Tas_k list"); + list->_buffer[2].tooltip = (gchar *) _("Create a new task list"); list->_buffer[2].menuShortcut = '\0'; - list->_buffer[2].iconName = (char *) "stock_todo"; + list->_buffer[2].iconName = (gchar *) "stock_todo"; list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER; return list; @@ -1273,13 +1273,13 @@ tasks_component_peek (void) return component; } -const char * +const gchar * tasks_component_peek_base_directory (TasksComponent *component) { return component->priv->base_directory; } -const char * +const gchar * tasks_component_peek_config_directory (TasksComponent *component) { return component->priv->config_directory; diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h index 0667fc2523..2a48209896 100644 --- a/calendar/gui/tasks-component.h +++ b/calendar/gui/tasks-component.h @@ -56,8 +56,8 @@ struct _TasksComponentClass { GType tasks_component_get_type (void); TasksComponent *tasks_component_peek (void); -const char *tasks_component_peek_base_directory (TasksComponent *component); -const char *tasks_component_peek_config_directory (TasksComponent *component); +const gchar *tasks_component_peek_base_directory (TasksComponent *component); +const gchar *tasks_component_peek_config_directory (TasksComponent *component); ESourceList *tasks_component_peek_source_list (TasksComponent *component); #endif /* _TASKS_COMPONENT_H_ */ diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 7ee468e768..5e57456bd3 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -85,17 +85,17 @@ static void tasks_control_print_preview_cmd (BonoboUIComponent *uic, const char *path); static void tasks_control_assign_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void tasks_control_forward_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void tasks_control_view_preview (BonoboUIComponent *uic, - const char *path, + const gchar *path, Bonobo_UIComponent_EventType type, - const char *state, - void *data); + const gchar *state, + gpointer data); struct focus_changed_data { BonoboControl *control; @@ -162,7 +162,7 @@ static void sensitize_items(BonoboUIComponent *uic, struct _tasks_sensitize_item *items, guint32 mask) { while (items->command) { - char command[32]; + gchar command[32]; if (strlen(items->command)>=21) { g_warning ("Size more than 21: %s\n", items->command); @@ -197,7 +197,7 @@ static struct _tasks_sensitize_item tasks_sensitize_table[] = { * selected tasks. */ void -tasks_control_sensitize_commands (BonoboControl *control, ETasks *tasks, int n_selected) +tasks_control_sensitize_commands (BonoboControl *control, ETasks *tasks, gint n_selected) { BonoboUIComponent *uic; gboolean read_only = TRUE; @@ -247,7 +247,7 @@ tasks_control_sensitize_commands (BonoboControl *control, ETasks *tasks, int n_s /* Callback used when the selection in the table changes */ static void -selection_changed_cb (ETasks *tasks, int n_selected, gpointer data) +selection_changed_cb (ETasks *tasks, gint n_selected, gpointer data) { BonoboControl *control; @@ -304,11 +304,11 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks) { Bonobo_UIContainer remote_uih; BonoboUIComponent *uic; - int n_selected; + gint n_selected; ECalendarTable *cal_table; ETable *etable; gboolean state; - char *xmlfile; + gchar *xmlfile; uic = bonobo_control_get_ui_component (control); g_return_if_fail (uic != NULL); @@ -399,7 +399,7 @@ tasks_control_new_task_cmd (BonoboUIComponent *uic, static void tasks_control_cut_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { ETasks *tasks; ECalendarTable *cal_table; @@ -412,7 +412,7 @@ tasks_control_cut_cmd (BonoboUIComponent *uic, static void tasks_control_copy_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { ETasks *tasks; ECalendarTable *cal_table; @@ -434,7 +434,7 @@ tasks_control_copy_cmd (BonoboUIComponent *uic, static void tasks_control_paste_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { ETasks *tasks; ECalendarTable *cal_table; @@ -473,7 +473,7 @@ static gboolean confirm_purge (ETasks *tasks) { GtkWidget *dialog, *checkbox, *parent; - int button; + gint button; if (!calendar_config_get_confirm_purge ()) return TRUE; @@ -516,7 +516,7 @@ tasks_control_purge_cmd (BonoboUIComponent *uic, static void tasks_control_print_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { ETasks *tasks = E_TASKS (data); ETable *table; @@ -532,7 +532,7 @@ tasks_control_print_cmd (BonoboUIComponent *uic, static void tasks_control_print_preview_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { ETasks *tasks = E_TASKS (data); ETable *table; @@ -548,7 +548,7 @@ tasks_control_print_preview_cmd (BonoboUIComponent *uic, static void tasks_control_assign_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { ETasks *tasks; ECalendarTable *cal_table; @@ -564,7 +564,7 @@ tasks_control_assign_cmd (BonoboUIComponent *uic, static void tasks_control_forward_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { ETasks *tasks; ECalendarTable *cal_table; @@ -583,7 +583,7 @@ tasks_control_forward_cmd (BonoboUIComponent *uic, } static void -tasks_control_view_preview (BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +tasks_control_view_preview (BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data) { ETasks *tasks; diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h index 9dd3a3946d..de98914e40 100644 --- a/calendar/gui/tasks-control.h +++ b/calendar/gui/tasks-control.h @@ -30,6 +30,6 @@ BonoboControl *tasks_control_new (void); void tasks_control_activate (BonoboControl *control, ETasks *tasks); void tasks_control_deactivate (BonoboControl *control, ETasks *tasks); -void tasks_control_sensitize_commands (BonoboControl *control, ETasks *tasks, int n_selected); +void tasks_control_sensitize_commands (BonoboControl *control, ETasks *tasks, gint n_selected); #endif /* _TASKS_CONTROL_H_ */ diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c index 56a7386d4b..913144d4a7 100644 --- a/calendar/gui/weekday-picker.c +++ b/calendar/gui/weekday-picker.c @@ -48,14 +48,14 @@ struct _WeekdayPickerPrivate { guint8 blocked_day_mask; /* Day that defines the start of the week; 0 = Sunday, ..., 6 = Saturday */ - int week_start_day; + gint week_start_day; /* Current keyboard focus day */ - int focus_day; + gint focus_day; /* Metrics */ - int font_ascent, font_descent; - int max_letter_width; + gint font_ascent, font_descent; + gint max_letter_width; /* Components */ GnomeCanvasItem *boxes[7]; @@ -114,7 +114,7 @@ weekday_picker_class_init (WeekdayPickerClass *class) } static void -day_clicked (WeekdayPicker *wp, int index) +day_clicked (WeekdayPicker *wp, gint index) { WeekdayPickerPrivate *priv = wp->priv; guint8 day_mask; @@ -172,7 +172,7 @@ day_event_cb (GnomeCanvasItem *item, GdkEvent *event, gpointer data) { WeekdayPicker *wp; WeekdayPickerPrivate *priv; - int i; + gint i; wp = WEEKDAY_PICKER (data); priv = wp->priv; @@ -210,7 +210,7 @@ create_items (WeekdayPicker *wp) { WeekdayPickerPrivate *priv; GnomeCanvasGroup *parent; - int i; + gint i; priv = wp->priv; @@ -270,7 +270,7 @@ colorize_items (WeekdayPicker *wp) GdkColor *outline, *focus_outline; GdkColor *fill, *sel_fill; GdkColor *text_fill, *sel_text_fill; - int i; + gint i; priv = wp->priv; @@ -284,7 +284,7 @@ colorize_items (WeekdayPicker *wp) sel_text_fill = >K_WIDGET (wp)->style->fg[GTK_STATE_SELECTED]; for (i = 0; i < 7; i++) { - int day; + gint day; GdkColor *f, *t, *o; day = i + priv->week_start_day; @@ -316,8 +316,8 @@ colorize_items (WeekdayPicker *wp) } /* Configures the items in the weekday picker by setting their attributes. */ -static char * -get_day_text (int day_index) +static gchar * +get_day_text (gint day_index) { GDateWeekday weekday; @@ -331,9 +331,9 @@ static void configure_items (WeekdayPicker *wp) { WeekdayPickerPrivate *priv; - int width, height; - int box_width; - int i; + gint width, height; + gint box_width; + gint i; priv = wp->priv; @@ -343,8 +343,8 @@ configure_items (WeekdayPicker *wp) box_width = (width - 1) / 7; for (i = 0; i < 7; i++) { - char *c; - int day; + gchar *c; + gint day; day = i + priv->week_start_day; if (day >= 7) @@ -422,8 +422,8 @@ weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style) { WeekdayPicker *wp; WeekdayPickerPrivate *priv; - int max_width; - int i; + gint max_width; + gint i; PangoFontDescription *font_desc; PangoContext *pango_context; PangoFontMetrics *font_metrics; @@ -445,8 +445,8 @@ weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style) max_width = 0; for (i = 0; i < 7; i++) { - char *c; - int w; + gchar *c; + gint w; c = get_day_text (i); pango_layout_set_text (layout, c, strlen (c)); @@ -580,7 +580,7 @@ weekday_picker_get_blocked_days (WeekdayPicker *wp) * Sets the day that defines the start of the week for a weekday picker. **/ void -weekday_picker_set_week_start_day (WeekdayPicker *wp, int week_start_day) +weekday_picker_set_week_start_day (WeekdayPicker *wp, gint week_start_day) { WeekdayPickerPrivate *priv; @@ -603,7 +603,7 @@ weekday_picker_set_week_start_day (WeekdayPicker *wp, int week_start_day) * Return value: Index of the day that defines the start of the week. See * weekday_picker_set_week_start_day() to see how this is represented. **/ -int +gint weekday_picker_get_week_start_day (WeekdayPicker *wp) { WeekdayPickerPrivate *priv; diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h index bd78201bd3..f92eb3764e 100644 --- a/calendar/gui/weekday-picker.h +++ b/calendar/gui/weekday-picker.h @@ -64,8 +64,8 @@ guint8 weekday_picker_get_days (WeekdayPicker *wp); void weekday_picker_set_blocked_days (WeekdayPicker *wp, guint8 blocked_day_mask); guint weekday_picker_get_blocked_days (WeekdayPicker *wp); -void weekday_picker_set_week_start_day (WeekdayPicker *wp, int week_start_day); -int weekday_picker_get_week_start_day (WeekdayPicker *wp); +void weekday_picker_set_week_start_day (WeekdayPicker *wp, gint week_start_day); +gint weekday_picker_get_week_start_day (WeekdayPicker *wp); diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index a4e0fa7048..caa7a8a87c 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -65,13 +65,13 @@ typedef struct { guint cancelled:1; } ICalIntelligentImporter; -static const int import_type_map[] = { +static const gint import_type_map[] = { E_CAL_SOURCE_TYPE_EVENT, E_CAL_SOURCE_TYPE_TODO, -1 }; -static const char *import_type_strings[] = { +static const gchar *import_type_strings[] = { N_("Appointments and Meetings"), N_("Tasks"), NULL @@ -184,7 +184,7 @@ struct _selector_data { EImportTarget *target; GtkWidget *selector; GtkWidget *notebook; - int page; + gint page; }; static void @@ -210,7 +210,7 @@ ivcal_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im) { GtkWidget *vbox, *hbox, *first = NULL; GSList *group = NULL; - int i; + gint i; GtkWidget *nb; vbox = gtk_vbox_new (FALSE, FALSE); @@ -276,7 +276,7 @@ ivcal_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im) } static gboolean -ivcal_import_items(void *d) +ivcal_import_items(gpointer d) { ICalImporter *ici = d; @@ -359,8 +359,8 @@ ivcal_cancel(EImport *ei, EImportTarget *target, EImportImporter *im) static gboolean ical_supported(EImport *ei, EImportTarget *target, EImportImporter *im) { - char *filename; - char *contents; + gchar *filename; + gchar *contents; gboolean ret = FALSE; EImportTargetURI *s; @@ -400,8 +400,8 @@ ical_supported(EImport *ei, EImportTarget *target, EImportImporter *im) static void ical_import(EImport *ei, EImportTarget *target, EImportImporter *im) { - char *filename; - char *contents; + gchar *filename; + gchar *contents; icalcomponent *icalcomp; EImportTargetURI *s = (EImportTargetURI *)target; @@ -453,8 +453,8 @@ ical_importer_peek(void) static gboolean vcal_supported(EImport *ei, EImportTarget *target, EImportImporter *im) { - char *filename; - char *contents; + gchar *filename; + gchar *contents; gboolean ret = FALSE; EImportTargetURI *s; @@ -514,12 +514,12 @@ vcal_supported(EImport *ei, EImportTarget *target, EImportImporter *im) /* This tries to load in a vCalendar file and convert it to an icalcomponent. It returns NULL on failure. */ static icalcomponent* -load_vcalendar_file (const char *filename) +load_vcalendar_file (const gchar *filename) { icalvcal_defaults defaults = { NULL }; icalcomponent *icalcomp = NULL; - char *contents; - char *default_alarm_filename; + gchar *contents; + gchar *default_alarm_filename; default_alarm_filename = g_build_filename (EVOLUTION_SOUNDDIR, "default_alarm.wav", @@ -527,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 = (char *) "audio/x-wav"; - defaults.alarm_description = (char *) _("Reminder!"); + defaults.alarm_audio_fmttype = (gchar *) "audio/x-wav"; + defaults.alarm_description = (gchar *) _("Reminder!"); if (g_file_get_contents (filename, &contents, NULL, NULL)) { VObject *vcal; @@ -550,7 +550,7 @@ load_vcalendar_file (const char *filename) static void vcal_import(EImport *ei, EImportTarget *target, EImportImporter *im) { - char *filename; + gchar *filename; icalcomponent *icalcomp; EImportTargetURI *s = (EImportTargetURI *)target; @@ -591,7 +591,7 @@ vcal_importer_peek(void) static gboolean gnome_calendar_supported(EImport *ei, EImportTarget *target, EImportImporter *im) { - char *filename; + gchar *filename; gboolean res; EImportTargetHome *s = (EImportTargetHome *)target; @@ -609,11 +609,11 @@ static void gnome_calendar_import(EImport *ei, EImportTarget *target, EImportImporter *im) { icalcomponent *icalcomp = NULL; - char *filename; + gchar *filename; GList *vtodos; ECal *calendar_client = NULL, *tasks_client = NULL; - int t; - int do_calendar, do_tasks; + gint t; + gint do_calendar, do_tasks; EImportTargetHome *s = (EImportTargetHome *)target; ICalIntelligentImporter *ici; diff --git a/calendar/importers/main.c b/calendar/importers/main.c index dc91f378f5..cfb4e0c0bd 100644 --- a/calendar/importers/main.c +++ b/calendar/importers/main.c @@ -37,7 +37,7 @@ #define GNOME_CALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer:" BASE_VERSION static BonoboObject * -importer_factory_fn (BonoboGenericFactory *factory, const char *id, void *closure) +importer_factory_fn (BonoboGenericFactory *factory, const gchar *id, gpointer closure) { BonoboObject *object = NULL; diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c index 7b7cb9bcf2..d679bdd263 100644 --- a/composer/e-composer-header.c +++ b/composer/e-composer-header.c @@ -101,7 +101,7 @@ composer_header_constructor (GType type, if (header->priv->addaction) { GtkWidget *box, *tmp; - char *str; + gchar *str; header->action_widget = gtk_button_new (); box = gtk_hbox_new (FALSE, 0); diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 946bff28c1..7f1cb69504 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -235,7 +235,7 @@ best_charset (GByteArray *buf, const gchar *default_charset, CamelTransferEncodi return charset; /* Try to find something that will work */ - if (!(charset = (char *) camel_charset_best ((const gchar *)buf->data, buf->len))) { + if (!(charset = (gchar *) camel_charset_best ((const gchar *)buf->data, buf->len))) { *encoding = CAMEL_TRANSFER_ENCODING_7BIT; return NULL; } @@ -995,7 +995,7 @@ get_file_content (EMsgComposer *composer, camel_object_unref (memstream); g_byte_array_append (buffer, (const guint8 *)"", 1); - content = (char*)buffer->data; + content = (gchar *)buffer->data; g_byte_array_free (buffer, FALSE); return content; @@ -1478,9 +1478,9 @@ struct _drop_data { guint info; guint time; - unsigned int move:1; - unsigned int moved:1; - unsigned int aborted:1; + guint move:1; + guint moved:1; + guint aborted:1; }; static void @@ -2753,7 +2753,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message) } /* Restore the Account preference */ - account_name = (char *) camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Account"); + account_name = (gchar *) camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Account"); if (account_name) { account_name = g_strdup (account_name); g_strstrip (account_name); @@ -3154,7 +3154,7 @@ handle_mailto (EMsgComposer *composer, const gchar *mailto) if (p[len] != '=') break; - header = (char *) p; + header = (gchar *) p; header[len] = '\0'; p += len + 1; diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c index 9f97a441db..3e44526071 100644 --- a/e-util/e-bconf-map.c +++ b/e-util/e-bconf-map.c @@ -41,7 +41,7 @@ #define d(x) -static signed char hexnib[256] = { +static gchar hexnib[256] = { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, @@ -53,25 +53,25 @@ static signed char hexnib[256] = { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, }; -char * -e_bconf_hex_decode (const char *val) +gchar * +e_bconf_hex_decode (const gchar *val) { - const unsigned char *p = (const unsigned char *) val; - char *o, *res; + const guchar *p = (const guchar *) val; + gchar *o, *res; o = res = g_malloc (strlen (val) / 2 + 1); - for (p = (const unsigned char *)val; (p[0] && p[1]); p += 2) + for (p = (const guchar *)val; (p[0] && p[1]); p += 2) *o++ = (hexnib[p[0]] << 4) | hexnib[p[1]]; *o = 0; return res; } -char * -e_bconf_url_decode (const char *val) +gchar * +e_bconf_url_decode (const gchar *val) { - const unsigned char *p = (const unsigned char *) val; - char *o, *res, c; + const guchar *p = (const guchar *) val; + gchar *o, *res, c; o = res = g_malloc (strlen (val) + 1); while (*p) { @@ -90,22 +90,22 @@ e_bconf_url_decode (const char *val) xmlNodePtr -e_bconf_get_path (xmlDocPtr doc, const char *path) +e_bconf_get_path (xmlDocPtr doc, const gchar *path) { xmlNodePtr root; - char *val; - int found; + gchar *val; + gint found; root = doc->children; - if (strcmp ((char *)root->name, "bonobo-config") != 0) { + if (strcmp ((gchar *)root->name, "bonobo-config") != 0) { g_warning ("not bonobo-config xml file"); return NULL; } root = root->children; while (root) { - if (!strcmp ((char *)root->name, "section")) { - val = (char *)xmlGetProp (root, (const unsigned char *)"path"); + if (!strcmp ((gchar *)root->name, "section")) { + val = (gchar *)xmlGetProp (root, (const guchar *)"path"); found = val && strcmp (val, path) == 0; xmlFree (val); if (found) @@ -118,15 +118,15 @@ e_bconf_get_path (xmlDocPtr doc, const char *path) } xmlNodePtr -e_bconf_get_entry (xmlNodePtr root, const char *name) +e_bconf_get_entry (xmlNodePtr root, const gchar *name) { xmlNodePtr node = root->children; - int found; - char *val; + gint found; + gchar *val; while (node) { - if (!strcmp ((char *)node->name, "entry")) { - val = (char *)xmlGetProp (node, (const unsigned char *)"name"); + if (!strcmp ((gchar *)node->name, "entry")) { + val = (gchar *)xmlGetProp (node, (const guchar *)"name"); found = val && strcmp (val, name) == 0; xmlFree (val); if (found) @@ -138,13 +138,13 @@ e_bconf_get_entry (xmlNodePtr root, const char *name) return node; } -char * -e_bconf_get_value (xmlNodePtr root, const char *name) +gchar * +e_bconf_get_value (xmlNodePtr root, const gchar *name) { xmlNodePtr node = e_bconf_get_entry (root, name); - char *prop, *val = NULL; + gchar *prop, *val = NULL; - if (node && (prop = (char *)xmlGetProp (node, (const unsigned char *)"value"))) { + if (node && (prop = (gchar *)xmlGetProp (node, (const guchar *)"value"))) { val = g_strdup (prop); xmlFree (prop); } @@ -152,10 +152,10 @@ e_bconf_get_value (xmlNodePtr root, const char *name) return val; } -char * -e_bconf_get_bool (xmlNodePtr root, const char *name) +gchar * +e_bconf_get_bool (xmlNodePtr root, const gchar *name) { - char *val, *res; + gchar *val, *res; if ((val = e_bconf_get_value (root, name))) { res = g_strdup (val[0] == '1' ? "true" : "false"); @@ -166,10 +166,10 @@ e_bconf_get_bool (xmlNodePtr root, const char *name) return res; } -char * -e_bconf_get_long (xmlNodePtr root, const char *name) +gchar * +e_bconf_get_long (xmlNodePtr root, const gchar *name) { - char *val, *res; + gchar *val, *res; if ((val = e_bconf_get_value (root, name))) { res = g_strdup (val); @@ -180,10 +180,10 @@ e_bconf_get_long (xmlNodePtr root, const char *name) return res; } -char * -e_bconf_get_string (xmlNodePtr root, const char *name) +gchar * +e_bconf_get_string (xmlNodePtr root, const gchar *name) { - char *val, *res; + gchar *val, *res; if ((val = e_bconf_get_value (root, name))) { res = e_bconf_hex_decode (val); @@ -196,31 +196,31 @@ e_bconf_get_string (xmlNodePtr root, const char *name) /* lookup functions */ -typedef char * (* bconf_lookup_func) (xmlNodePtr root, const char *name, e_bconf_map_t *nap); +typedef gchar * (* bconf_lookup_func) (xmlNodePtr root, const gchar *name, e_bconf_map_t *nap); -static char * -bconf_lookup_bool (xmlNodePtr root, const char *name, e_bconf_map_t *map) +static gchar * +bconf_lookup_bool (xmlNodePtr root, const gchar *name, e_bconf_map_t *map) { return e_bconf_get_bool (root, name); } -static char * -bconf_lookup_long (xmlNodePtr root, const char *name, e_bconf_map_t *map) +static gchar * +bconf_lookup_long (xmlNodePtr root, const gchar *name, e_bconf_map_t *map) { return e_bconf_get_long (root, name); } -static char * -bconf_lookup_string (xmlNodePtr root, const char *name, e_bconf_map_t *map) +static gchar * +bconf_lookup_string (xmlNodePtr root, const gchar *name, e_bconf_map_t *map) { return e_bconf_get_string (root, name); } -static char * -bconf_lookup_enum (xmlNodePtr root, const char *name, e_bconf_map_t *map) +static gchar * +bconf_lookup_enum (xmlNodePtr root, const gchar *name, e_bconf_map_t *map) { - int index = 0, i; - char *val; + gint index = 0, i; + gchar *val; if ((val = e_bconf_get_value (root, name))) { index = atoi (val); @@ -240,11 +240,11 @@ static bconf_lookup_func lookup_table[] = { bconf_lookup_bool, bconf_lookup_long, bconf_lookup_string, bconf_lookup_enum }; -static char * -get_name (const char *in, int index) +static gchar * +get_name (const gchar *in, gint index) { GString *out = g_string_new (""); - char c, *res; + gchar c, *res; while ((c = *in++)) { if (c == '%') { @@ -269,14 +269,14 @@ get_name (const char *in, int index) } static void -build_xml (xmlNodePtr root, e_bconf_map_t *map, int index, xmlNodePtr source) +build_xml (xmlNodePtr root, e_bconf_map_t *map, gint index, xmlNodePtr source) { - char *name, *value; + gchar *name, *value; xmlNodePtr node; while (map->type != E_BCONF_MAP_END) { if ((map->type & E_BCONF_MAP_MASK) == E_BCONF_MAP_CHILD) { - node = xmlNewChild (root, NULL, (unsigned char *)map->to, NULL); + node = xmlNewChild (root, NULL, (guchar *)map->to, NULL); build_xml (node, map->child, index, source); } else { name = get_name (map->from, index); @@ -286,9 +286,9 @@ build_xml (xmlNodePtr root, e_bconf_map_t *map, int index, xmlNodePtr source) if (map->type & E_BCONF_MAP_CONTENT) { if (value && value[0]) - xmlNewTextChild (root, NULL, (unsigned char *)map->to, (unsigned char *)value); + xmlNewTextChild (root, NULL, (guchar *)map->to, (guchar *)value); } else { - xmlSetProp (root, (unsigned char *)map->to, (unsigned char *)value); + xmlSetProp (root, (guchar *)map->to, (guchar *)value); } g_free (value); @@ -299,15 +299,15 @@ build_xml (xmlNodePtr root, e_bconf_map_t *map, int index, xmlNodePtr source) } -int +gint e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map_t *map, - const char *bconf_path, const char *gconf_path, - const char *name, const char *idparam) + const gchar *bconf_path, const gchar *gconf_path, + const gchar *name, const gchar *idparam) { xmlNodePtr source; - int count = 0, i; + gint count = 0, i; GSList *list, *l; - char *val; + gchar *val; source = e_bconf_get_path (config_xmldb, bconf_path); if (source) { @@ -323,18 +323,18 @@ e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map xmlDocPtr doc; xmlNodePtr root; xmlChar *xmlbuf; - int n; + gint n; - doc = xmlNewDoc ((const unsigned char *)"1.0"); - root = xmlNewDocNode (doc, NULL, (unsigned char *)name, NULL); + doc = xmlNewDoc ((const guchar *)"1.0"); + root = xmlNewDocNode (doc, NULL, (guchar *)name, NULL); xmlDocSetRootElement (doc, root); /* This could be set with a MAP_UID type ... */ if (idparam) { - char buf[16]; + gchar buf[16]; sprintf (buf, "%d", i); - xmlSetProp (root, (unsigned char *)idparam, (unsigned char *)buf); + xmlSetProp (root, (guchar *)idparam, (guchar *)buf); } build_xml (root, map, i, source); @@ -361,17 +361,17 @@ e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map } -static int gconf_type[] = { GCONF_VALUE_BOOL, GCONF_VALUE_BOOL, GCONF_VALUE_INT, GCONF_VALUE_STRING, GCONF_VALUE_STRING }; +static gint gconf_type[] = { GCONF_VALUE_BOOL, GCONF_VALUE_BOOL, GCONF_VALUE_INT, GCONF_VALUE_STRING, GCONF_VALUE_STRING }; -int +gint e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *remap_list) { - char *path, *val, *tmp; + gchar *path, *val, *tmp; e_gconf_map_t *map; xmlNodePtr source; GSList *list, *l; - char buf[32]; - int i, j, k; + gchar buf[32]; + gint i, j, k; /* process all flat config */ for (i = 0; remap_list[i].root; i++) { @@ -453,8 +453,8 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * gconf_client_set_float (gconf, path, strtod (val, NULL), NULL); break; case E_GCONF_MAP_STRLIST: { - char *v = e_bconf_hex_decode (val); - char **t = g_strsplit (v, " !<-->!", 8196); + gchar *v = e_bconf_hex_decode (val); + gchar **t = g_strsplit (v, " !<-->!", 8196); list = NULL; for (k = 0; t[k]; k++) { @@ -473,11 +473,11 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * /* find the entry node */ while (node) { - if (!strcmp ((char *)node->name, "entry")) { - int found; + if (!strcmp ((gchar *)node->name, "entry")) { + gint found; - if ((tmp = (char *)xmlGetProp (node, (const unsigned char *)"name"))) { - found = strcmp ((char *)tmp, map[j].from) == 0; + if ((tmp = (gchar *)xmlGetProp (node, (const guchar *)"name"))) { + found = strcmp ((gchar *)tmp, map[j].from) == 0; xmlFree (tmp); if (found) break; @@ -491,7 +491,7 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * if (node) { node = node->children; while (node) { - if (strcmp ((char *)node->name, "any") == 0) + if (strcmp ((gchar *)node->name, "any") == 0) break; node = node->next; } @@ -501,7 +501,7 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * if (node) { node = node->children; while (node) { - if (strcmp ((char *)node->name, "value") == 0) + if (strcmp ((gchar *)node->name, "value") == 0) break; node = node->next; } @@ -510,7 +510,7 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t * if (node) { node = node->children; while (node) { - if (strcmp ((char *)node->name, "value") == 0) + if (strcmp ((gchar *)node->name, "value") == 0) list = g_slist_append (list, xmlNodeGetContent (node)); node = node->next; } diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h index 8c6ea6deec..57ba17e169 100644 --- a/e-util/e-bconf-map.h +++ b/e-util/e-bconf-map.h @@ -52,20 +52,20 @@ typedef struct _e_bconf_map { } e_bconf_map_t; -char *e_bconf_hex_decode (const char *val); -char *e_bconf_url_decode (const char *val); +gchar *e_bconf_hex_decode (const gchar *val); +gchar *e_bconf_url_decode (const gchar *val); -xmlNodePtr e_bconf_get_path (xmlDocPtr doc, const char *path); -xmlNodePtr e_bconf_get_entry (xmlNodePtr root, const char *name); +xmlNodePtr e_bconf_get_path (xmlDocPtr doc, const gchar *path); +xmlNodePtr e_bconf_get_entry (xmlNodePtr root, const gchar *name); -char *e_bconf_get_value (xmlNodePtr root, const char *name); -char *e_bconf_get_bool (xmlNodePtr root, const char *name); -char *e_bconf_get_long (xmlNodePtr root, const char *name); -char *e_bconf_get_string (xmlNodePtr root, const char *name); +gchar *e_bconf_get_value (xmlNodePtr root, const gchar *name); +gchar *e_bconf_get_bool (xmlNodePtr root, const gchar *name); +gchar *e_bconf_get_long (xmlNodePtr root, const gchar *name); +gchar *e_bconf_get_string (xmlNodePtr root, const gchar *name); -int e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map_t *map, - const char *bconf_path, const char *gconf_path, - const char *name, const char *idparam); +gint e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map_t *map, + const gchar *bconf_path, const gchar *gconf_path, + const gchar *name, const gchar *idparam); enum { @@ -93,7 +93,7 @@ typedef struct { e_gconf_map_t *map; } e_gconf_map_list_t; -int e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *remap_list); +gint e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *remap_list); #ifdef __cplusplus } diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c index e2cf15af43..551ffe2143 100644 --- a/e-util/e-bit-array.c +++ b/e-util/e-bit-array.c @@ -39,10 +39,10 @@ G_DEFINE_TYPE (EBitArray, e_bit_array, G_TYPE_OBJECT) static void -e_bit_array_insert_real(EBitArray *eba, int row) +e_bit_array_insert_real(EBitArray *eba, gint row) { - int box; - int i; + gint box; + gint i; if(eba->bit_count >= 0) { /* Add another word if needed. */ if ((eba->bit_count & 0x1f) == 0) { @@ -64,12 +64,12 @@ e_bit_array_insert_real(EBitArray *eba, int row) } static void -e_bit_array_delete_real(EBitArray *eba, int row, gboolean move_selection_mode) +e_bit_array_delete_real(EBitArray *eba, gint row, gboolean move_selection_mode) { - int box; - int i; - int last; - int selected = FALSE; + gint box; + gint i; + gint last; + gint selected = FALSE; if(eba->bit_count >= 0) { guint32 bitmask; box = row >> 5; @@ -105,34 +105,34 @@ e_bit_array_delete_real(EBitArray *eba, int row, gboolean move_selection_mode) /* FIXME : Improve efficiency here. */ void -e_bit_array_delete(EBitArray *eba, int row, int count) +e_bit_array_delete(EBitArray *eba, gint row, gint count) { - int i; + gint i; for (i = 0; i < count; i++) e_bit_array_delete_real(eba, row, FALSE); } /* FIXME : Improve efficiency here. */ void -e_bit_array_delete_single_mode(EBitArray *eba, int row, int count) +e_bit_array_delete_single_mode(EBitArray *eba, gint row, gint count) { - int i; + gint i; for (i = 0; i < count; i++) e_bit_array_delete_real(eba, row, TRUE); } /* FIXME : Improve efficiency here. */ void -e_bit_array_insert(EBitArray *eba, int row, int count) +e_bit_array_insert(EBitArray *eba, gint row, gint count) { - int i; + gint i; for (i = 0; i < count; i++) e_bit_array_insert_real(eba, row); } /* FIXME: Implement this more efficiently. */ void -e_bit_array_move_row(EBitArray *eba, int old_row, int new_row) +e_bit_array_move_row(EBitArray *eba, gint old_row, gint new_row) { e_bit_array_delete_real(eba, old_row, FALSE); e_bit_array_insert_real(eba, new_row); @@ -186,11 +186,11 @@ e_bit_array_foreach (EBitArray *eba, EForeachFunc callback, gpointer closure) { - int i; - int last = (eba->bit_count + 31) / 32; + gint i; + gint last = (eba->bit_count + 31) / 32; for (i = 0; i < last; i++) { if (eba->data[i]) { - int j; + gint j; guint32 value = eba->data[i]; for (j = 0; j < 32; j++) { if (value & 0x80000000) { @@ -231,8 +231,8 @@ gint e_bit_array_selected_count (EBitArray *eba) { gint count; - int i; - int last; + gint i; + gint last; if (!eba->data) return 0; @@ -242,7 +242,7 @@ e_bit_array_selected_count (EBitArray *eba) last = BOX(eba->bit_count - 1); for (i = 0; i <= last; i++) { - int j; + gint j; guint32 thiscount = 0; for (j = 0; j < 8; j++) thiscount += PART(eba->data[i], j); @@ -263,7 +263,7 @@ e_bit_array_selected_count (EBitArray *eba) void e_bit_array_select_all (EBitArray *eba) { - int i; + gint i; if (!eba->data) eba->data = g_new0 (guint32, (eba->bit_count + 31) / 32); @@ -275,8 +275,8 @@ e_bit_array_select_all (EBitArray *eba) /* need to zero out the bits corresponding to the rows not selected in the last full 32 bit mask */ if (eba->bit_count % 32) { - int unselected_mask = 0; - int num_unselected_in_last_byte = 32 - eba->bit_count % 32; + gint unselected_mask = 0; + gint num_unselected_in_last_byte = 32 - eba->bit_count % 32; for (i = 0; i < num_unselected_in_last_byte; i ++) unselected_mask |= 1 << i; @@ -295,7 +295,7 @@ e_bit_array_select_all (EBitArray *eba) void e_bit_array_invert_selection (EBitArray *eba) { - int i; + gint i; if (!eba->data) eba->data = g_new0 (guint32, (eba->bit_count + 31) / 32); @@ -305,7 +305,7 @@ e_bit_array_invert_selection (EBitArray *eba) } } -int +gint e_bit_array_bit_count (EBitArray *eba) { return eba->bit_count; @@ -314,7 +314,7 @@ e_bit_array_bit_count (EBitArray *eba) gboolean e_bit_array_cross_and (EBitArray *eba) { - int i; + gint i; for (i = 0; i < eba->bit_count / 32; i++) { if (eba->data[i] != ONES) return FALSE; @@ -327,7 +327,7 @@ e_bit_array_cross_and (EBitArray *eba) gboolean e_bit_array_cross_or (EBitArray *eba) { - int i; + gint i; for (i = 0; i < eba->bit_count / 32; i++) { if (eba->data[i] != 0) return TRUE; @@ -340,18 +340,18 @@ e_bit_array_cross_or (EBitArray *eba) #define OPERATE(object, i,mask,grow) ((grow) ? (((object)->data[(i)]) |= ((guint32) ~(mask))) : (((object)->data[(i)]) &= (mask))) void -e_bit_array_change_one_row(EBitArray *eba, int row, gboolean grow) +e_bit_array_change_one_row(EBitArray *eba, gint row, gboolean grow) { - int i; + gint i; i = BOX(row); OPERATE(eba, i, ~BITMASK(row), grow); } void -e_bit_array_change_range(EBitArray *eba, int start, int end, gboolean grow) +e_bit_array_change_range(EBitArray *eba, gint start, gint end, gboolean grow) { - int i, last; + gint i, last; if (start != end) { i = BOX(start); last = BOX(end); @@ -372,9 +372,9 @@ e_bit_array_change_range(EBitArray *eba, int start, int end, gboolean grow) } void -e_bit_array_select_single_row (EBitArray *eba, int row) +e_bit_array_select_single_row (EBitArray *eba, gint row) { - int i; + gint i; for (i = 0; i < ((eba->bit_count + 31) / 32); i++) { if (!((i == BOX(row) && eba->data[i] == BITMASK(row)) || (i != BOX(row) && eba->data[i] == 0))) { @@ -388,7 +388,7 @@ e_bit_array_select_single_row (EBitArray *eba, int row) } void -e_bit_array_toggle_single_row (EBitArray *eba, int row) +e_bit_array_toggle_single_row (EBitArray *eba, gint row) { if (eba->data[BOX(row)] & BITMASK(row)) eba->data[BOX(row)] &= ~BITMASK(row); @@ -415,7 +415,7 @@ e_bit_array_class_init (EBitArrayClass *klass) } EBitArray * -e_bit_array_new (int count) +e_bit_array_new (gint count) { EBitArray *eba = g_object_new (E_BIT_ARRAY_TYPE, NULL); eba->bit_count = count; diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h index 34c8016094..a9bf113d5f 100644 --- a/e-util/e-bit-array.h +++ b/e-util/e-bit-array.h @@ -38,7 +38,7 @@ extern "C" { #ifndef _E_FOREACH_FUNC_H_ #define _E_FOREACH_FUNC_H_ -typedef void (*EForeachFunc) (int model_row, +typedef void (*EForeachFunc) (gint model_row, gpointer closure); #endif @@ -55,7 +55,7 @@ typedef struct { GType e_bit_array_get_type (void); -EBitArray *e_bit_array_new (int count); +EBitArray *e_bit_array_new (gint count); gboolean e_bit_array_value_at (EBitArray *selection, gint n); @@ -68,29 +68,29 @@ void e_bit_array_select_all (EBitArray *selection); void e_bit_array_invert_selection (EBitArray *selection); gint e_bit_array_bit_count (EBitArray *selection); void e_bit_array_change_one_row (EBitArray *selection, - int row, + gint row, gboolean grow); void e_bit_array_change_range (EBitArray *selection, - int start, - int end, + gint start, + gint end, gboolean grow); void e_bit_array_select_single_row (EBitArray *eba, - int row); + gint row); void e_bit_array_toggle_single_row (EBitArray *eba, - int row); + gint row); void e_bit_array_insert (EBitArray *esm, - int row, - int count); + gint row, + gint count); void e_bit_array_delete (EBitArray *esm, - int row, - int count); + gint row, + gint count); void e_bit_array_delete_single_mode (EBitArray *esm, - int row, - int count); + gint row, + gint count); void e_bit_array_move_row (EBitArray *esm, - int old_row, - int new_row); + gint old_row, + gint new_row); gboolean e_bit_array_cross_and (EBitArray *esm); gboolean e_bit_array_cross_or (EBitArray *esm); diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c index c01b98cde4..14c8eae189 100644 --- a/e-util/e-categories-config.c +++ b/e-util/e-categories-config.c @@ -37,15 +37,15 @@ * given category. */ gboolean -e_categories_config_get_icon_for (const char *category, GdkPixmap **pixmap, GdkBitmap **mask) +e_categories_config_get_icon_for (const gchar *category, GdkPixmap **pixmap, GdkBitmap **mask) { - char *icon_file; + gchar *icon_file; GdkPixbuf *pixbuf; GdkBitmap *tmp_mask; g_return_val_if_fail (pixmap != NULL, FALSE); - icon_file = (char *) e_categories_get_icon_file_for (category); + icon_file = (gchar *) e_categories_get_icon_file_for (category); if (!icon_file) { *pixmap = NULL; if (mask != NULL) @@ -87,8 +87,8 @@ void e_categories_config_open_dialog_for_entry (GtkEntry *entry) { GtkDialog *dialog; - const char *text; - int result; + const gchar *text; + gint result; g_return_if_fail (entry != NULL); g_return_if_fail (GTK_IS_ENTRY (entry)); diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h index bbd76f2a02..81ae0161a0 100644 --- a/e-util/e-categories-config.h +++ b/e-util/e-categories-config.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS -gboolean e_categories_config_get_icon_for (const char *category, +gboolean e_categories_config_get_icon_for (const gchar *category, GdkPixmap **icon, GdkBitmap **mask); void e_categories_config_open_dialog_for_entry (GtkEntry *entry); diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c index 7c1c6eb091..97360a7552 100644 --- a/e-util/e-config-listener.c +++ b/e-util/e-config-listener.c @@ -31,13 +31,13 @@ typedef struct { EConfigListener *cl; guint lid; - char *key; + gchar *key; GConfValueType type; union { gboolean v_bool; float v_float; long v_long; - char *v_str; + gchar *v_str; } value; gboolean used_default; } KeyData; @@ -215,7 +215,7 @@ property_change_cb (GConfEngine *engine, } static KeyData * -add_key (EConfigListener *cl, const char *key, GConfValueType type, +add_key (EConfigListener *cl, const gchar *key, GConfValueType type, gpointer value, gboolean used_default) { KeyData *kd; @@ -236,7 +236,7 @@ add_key (EConfigListener *cl, const char *key, GConfValueType type, memcpy (&kd->value.v_long, value, sizeof (long)); break; case GCONF_VALUE_STRING : - kd->value.v_str = g_strdup ((const char *) value); + kd->value.v_str = g_strdup ((const gchar *) value); break; default : break; @@ -256,14 +256,14 @@ add_key (EConfigListener *cl, const char *key, GConfValueType type, } gboolean -e_config_listener_get_boolean (EConfigListener *cl, const char *key) +e_config_listener_get_boolean (EConfigListener *cl, const gchar *key) { return e_config_listener_get_boolean_with_default (cl, key, FALSE, NULL); } gboolean e_config_listener_get_boolean_with_default (EConfigListener *cl, - const char *key, + const gchar *key, gboolean def, gboolean *used_default) { @@ -306,14 +306,14 @@ e_config_listener_get_boolean_with_default (EConfigListener *cl, } float -e_config_listener_get_float (EConfigListener *cl, const char *key) +e_config_listener_get_float (EConfigListener *cl, const gchar *key) { return e_config_listener_get_float_with_default (cl, key, 0.0, NULL); } float e_config_listener_get_float_with_default (EConfigListener *cl, - const char *key, + const gchar *key, float def, gboolean *used_default) { @@ -356,14 +356,14 @@ e_config_listener_get_float_with_default (EConfigListener *cl, } long -e_config_listener_get_long (EConfigListener *cl, const char *key) +e_config_listener_get_long (EConfigListener *cl, const gchar *key) { return e_config_listener_get_long_with_default (cl, key, 0, NULL); } long e_config_listener_get_long_with_default (EConfigListener *cl, - const char *key, + const gchar *key, long def, gboolean *used_default) { @@ -405,20 +405,20 @@ e_config_listener_get_long_with_default (EConfigListener *cl, return value; } -char * -e_config_listener_get_string (EConfigListener *cl, const char *key) +gchar * +e_config_listener_get_string (EConfigListener *cl, const gchar *key) { return e_config_listener_get_string_with_default (cl, key, NULL, NULL); } -char * +gchar * e_config_listener_get_string_with_default (EConfigListener *cl, - const char *key, - const char *def, + const gchar *key, + const gchar *def, gboolean *used_default) { GConfValue *conf_value; - char *str; + gchar *str; KeyData *kd; g_return_val_if_fail (E_IS_CONFIG_LISTENER (cl), NULL); @@ -456,7 +456,7 @@ e_config_listener_get_string_with_default (EConfigListener *cl, } void -e_config_listener_set_boolean (EConfigListener *cl, const char *key, gboolean value) +e_config_listener_set_boolean (EConfigListener *cl, const gchar *key, gboolean value) { KeyData *kd; GError *err = NULL; @@ -481,7 +481,7 @@ e_config_listener_set_boolean (EConfigListener *cl, const char *key, gboolean va } void -e_config_listener_set_float (EConfigListener *cl, const char *key, float value) +e_config_listener_set_float (EConfigListener *cl, const gchar *key, float value) { KeyData *kd; GError *err = NULL; @@ -506,7 +506,7 @@ e_config_listener_set_float (EConfigListener *cl, const char *key, float value) } void -e_config_listener_set_long (EConfigListener *cl, const char *key, long value) +e_config_listener_set_long (EConfigListener *cl, const gchar *key, long value) { KeyData *kd; GError *err = NULL; @@ -531,9 +531,9 @@ e_config_listener_set_long (EConfigListener *cl, const char *key, long value) } void -e_config_listener_set_string (EConfigListener *cl, const char *key, const char *value) +e_config_listener_set_string (EConfigListener *cl, const gchar *key, const gchar *value) { - char *s1, *s2; + gchar *s1, *s2; KeyData *kd; GError *err = NULL; @@ -541,7 +541,7 @@ e_config_listener_set_string (EConfigListener *cl, const char *key, const char * g_return_if_fail (key != NULL); /* check that the value is not the same */ - s1 = (char *) value; + s1 = (gchar *) value; s2 = e_config_listener_get_string_with_default (cl, key, NULL, NULL); if (!strcmp (s1 ? s1 : "", s2 ? s2 : "")) { g_free (s2); @@ -565,7 +565,7 @@ e_config_listener_set_string (EConfigListener *cl, const char *key, const char * } void -e_config_listener_remove_value (EConfigListener *cl, const char *key) +e_config_listener_remove_value (EConfigListener *cl, const gchar *key) { g_return_if_fail (E_IS_CONFIG_LISTENER (cl)); g_return_if_fail (key != NULL); @@ -575,7 +575,7 @@ e_config_listener_remove_value (EConfigListener *cl, const char *key) } void -e_config_listener_remove_dir (EConfigListener *cl, const char *dir) +e_config_listener_remove_dir (EConfigListener *cl, const gchar *dir) { GSList *slist, *iter; const gchar *key; diff --git a/e-util/e-config-listener.h b/e-util/e-config-listener.h index 4449d8f22c..47eb9c2e80 100644 --- a/e-util/e-config-listener.h +++ b/e-util/e-config-listener.h @@ -45,49 +45,49 @@ typedef struct { typedef struct { GObjectClass parent_class; - void (* key_changed) (EConfigListener *cl, const char *key); + void (* key_changed) (EConfigListener *cl, const gchar *key); } EConfigListenerClass; GType e_config_listener_get_type (void); EConfigListener *e_config_listener_new (void); -gboolean e_config_listener_get_boolean (EConfigListener *cl, const char *key); +gboolean e_config_listener_get_boolean (EConfigListener *cl, const gchar *key); gboolean e_config_listener_get_boolean_with_default (EConfigListener *cl, - const char *key, + const gchar *key, gboolean def, gboolean *used_default); -float e_config_listener_get_float (EConfigListener *cl, const char *key); +float e_config_listener_get_float (EConfigListener *cl, const gchar *key); float e_config_listener_get_float_with_default (EConfigListener *cl, - const char *key, + const gchar *key, float def, gboolean *used_default); -long e_config_listener_get_long (EConfigListener *cl, const char *key); +long e_config_listener_get_long (EConfigListener *cl, const gchar *key); long e_config_listener_get_long_with_default (EConfigListener *cl, - const char *key, + const gchar *key, long def, gboolean *used_default); -char *e_config_listener_get_string (EConfigListener *cl, const char *key); -char *e_config_listener_get_string_with_default (EConfigListener *cl, - const char *key, - const char *def, +gchar *e_config_listener_get_string (EConfigListener *cl, const gchar *key); +gchar *e_config_listener_get_string_with_default (EConfigListener *cl, + const gchar *key, + const gchar *def, gboolean *used_default); void e_config_listener_set_boolean (EConfigListener *cl, - const char *key, + const gchar *key, gboolean value); void e_config_listener_set_float (EConfigListener *cl, - const char *key, + const gchar *key, float value); void e_config_listener_set_long (EConfigListener *cl, - const char *key, + const gchar *key, long value); void e_config_listener_set_string (EConfigListener *cl, - const char *key, - const char *value); + const gchar *key, + const gchar *value); void e_config_listener_remove_value (EConfigListener *cl, - const char *key); + const gchar *key); void e_config_listener_remove_dir (EConfigListener *cl, - const char *dir); + const gchar *dir); G_END_DECLS diff --git a/e-util/e-config.c b/e-util/e-config.c index 5d0a7090f7..36f42451ae 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -43,9 +43,9 @@ struct _EConfigFactory { struct _EConfigFactory *next, *prev; - char *id; + gchar *id; EConfigFactoryFunc factory; - void *factory_data; + gpointer factory_data; }; struct _menu_node { @@ -55,7 +55,7 @@ struct _menu_node { EConfigItemsFunc free; EConfigItemsFunc abort; EConfigItemsFunc commit; - void *data; + gpointer data; }; struct _widget_node { @@ -74,9 +74,9 @@ struct _widget_node { struct _check_node { struct _check_node *next, *prev; - char *pageid; + gchar *pageid; EConfigCheckFunc check; - void *data; + gpointer data; }; struct _EConfigPrivate { @@ -211,7 +211,7 @@ e_config_get_type(void) * * Return value: @ep is returned. **/ -EConfig *e_config_construct(EConfig *ep, int type, const char *id) +EConfig *e_config_construct(EConfig *ep, gint type, const gchar *id) { g_return_val_if_fail (type == E_CONFIG_BOOK || type == E_CONFIG_DRUID, NULL); @@ -240,7 +240,7 @@ EConfig *e_config_construct(EConfig *ep, int type, const char *id) * TODO: perhaps commit and abort should just be signals. **/ void -e_config_add_items(EConfig *ec, GSList *items, EConfigItemsFunc commitfunc, EConfigItemsFunc abortfunc, EConfigItemsFunc freefunc, void *data) +e_config_add_items(EConfig *ec, GSList *items, EConfigItemsFunc commitfunc, EConfigItemsFunc abortfunc, EConfigItemsFunc freefunc, gpointer data) { struct _menu_node *node; @@ -272,7 +272,7 @@ e_config_add_items(EConfig *ec, GSList *items, EConfigItemsFunc commitfunc, ECon * the druid to continue or the notebook to close. **/ void -e_config_add_page_check(EConfig *ec, const char *pageid, EConfigCheckFunc check, void *data) +e_config_add_page_check(EConfig *ec, const gchar *pageid, EConfigCheckFunc check, gpointer data) { struct _check_node *cn; @@ -301,10 +301,10 @@ ec_add_static_items(EConfig *ec) } static int -ep_cmp(const void *ap, const void *bp) +ep_cmp(gconstpointer ap, gconstpointer bp) { - struct _widget_node *a = *((void **)ap); - struct _widget_node *b = *((void **)bp); + struct _widget_node *a = *((gpointer *)ap); + struct _widget_node *b = *((gpointer *)bp); return strcmp(a->item->path, b->item->path); } @@ -412,7 +412,7 @@ ec_rebuild(EConfig *emp) struct _EConfigPrivate *p = emp->priv; struct _widget_node *wn, *sectionnode = NULL, *pagenode = NULL; GtkWidget *book = NULL, *page = NULL, *section = NULL, *root = NULL, *druid = NULL; - int pageno = 0, sectionno = 0, itemno = 0; + gint pageno = 0, sectionno = 0, itemno = 0; d(printf("target changed, rebuilding:\n")); @@ -550,7 +550,7 @@ ec_rebuild(EConfig *emp) sectionno = 1; /* never want to hide these */ break; case E_CONFIG_PAGE: { - int connect = 0; /* connect druid signals */ + gint connect = 0; /* connect druid signals */ /* CONFIG_PAGEs depend on the config type. E_CONFIG_BOOK: @@ -662,7 +662,7 @@ ec_rebuild(EConfig *emp) } if (translated_label != NULL) { - char *txt = g_strdup_printf("%s", translated_label); + gchar *txt = g_strdup_printf("%s", translated_label); label = g_object_new(gtk_label_get_type(), "label", txt, @@ -824,7 +824,7 @@ e_config_create_widget(EConfig *emp) GPtrArray *items = g_ptr_array_new(); GSList *l; /*char *domain = NULL;*/ - int i; + gint i; g_return_val_if_fail (emp->target != NULL, NULL); @@ -864,7 +864,7 @@ e_config_create_widget(EConfig *emp) } static void -ec_dialog_response(GtkWidget *d, int id, EConfig *ec) +ec_dialog_response(GtkWidget *d, gint id, EConfig *ec) { if (id == GTK_RESPONSE_OK) e_config_commit(ec); @@ -892,7 +892,7 @@ ec_dialog_response(GtkWidget *d, int id, EConfig *ec) * Return value: The window widget. This is also stored in @emp.window. **/ GtkWidget * -e_config_create_window(EConfig *emp, struct _GtkWindow *parent, const char *title) +e_config_create_window(EConfig *emp, struct _GtkWindow *parent, const gchar *title) { GtkWidget *w; @@ -1037,7 +1037,7 @@ void e_config_commit(EConfig *ec) * * Return value: FALSE if the data is inconsistent/incomplete. **/ -gboolean e_config_page_check(EConfig *ec, const char *pageid) +gboolean e_config_page_check(EConfig *ec, const gchar *pageid) { struct _EConfigPrivate *p = ec->priv; struct _check_node *mnode; @@ -1062,7 +1062,7 @@ gboolean e_config_page_check(EConfig *ec, const char *pageid) * Return value: The page widget. It will be the root GtkNotebook * container or the GnomeDruidPage object. **/ -GtkWidget *e_config_page_get(EConfig *ec, const char *pageid) +GtkWidget *e_config_page_get(EConfig *ec, const gchar *pageid) { struct _widget_node *wn; @@ -1088,10 +1088,10 @@ GtkWidget *e_config_page_get(EConfig *ec, const char *pageid) * Return value: The path of the next page, or @NULL if @pageid was the * last configured and visible page. **/ -const char *e_config_page_next(EConfig *ec, const char *pageid) +const gchar *e_config_page_next(EConfig *ec, const gchar *pageid) { struct _widget_node *wn; - int found; + gint found; found = pageid == NULL ? 1:0; for (wn = (struct _widget_node *)ec->priv->widgets.head;wn->next;wn=wn->next) @@ -1119,10 +1119,10 @@ const char *e_config_page_next(EConfig *ec, const char *pageid) * Return value: The path of the previous page, or @NULL if @pageid was the * first configured and visible page. **/ -const char *e_config_page_prev(EConfig *ec, const char *pageid) +const gchar *e_config_page_prev(EConfig *ec, const gchar *pageid) { struct _widget_node *wn; - int found; + gint found; found = pageid == NULL ? 1:0; for (wn = (struct _widget_node *)ec->priv->widgets.tailpred;wn->prev;wn=wn->prev) @@ -1158,7 +1158,7 @@ const char *e_config_page_prev(EConfig *ec, const char *pageid) * Return value: A handle to the factory. **/ EConfigFactory * -e_config_class_add_factory(EConfigClass *klass, const char *id, EConfigFactoryFunc func, void *data) +e_config_class_add_factory(EConfigClass *klass, const gchar *id, EConfigFactoryFunc func, gpointer data) { struct _EConfigFactory *f = g_malloc0(sizeof(*f)); @@ -1193,7 +1193,7 @@ e_config_class_remove_factory(EConfigClass *klass, EConfigFactory *f) * Allocate a new config target suitable for this class. Implementing * classes will define the actual content of the target. **/ -void *e_config_target_new(EConfig *ep, int type, size_t size) +gpointer e_config_target_new(EConfig *ep, gint type, size_t size) { EConfigTarget *t; @@ -1219,7 +1219,7 @@ void *e_config_target_new(EConfig *ep, int type, size_t size) * free custom targets. **/ void -e_config_target_free(EConfig *ep, void *o) +e_config_target_free(EConfig *ep, gpointer o) { EConfigTarget *t = o; @@ -1253,7 +1253,7 @@ e_config_target_free(EConfig *ep, void *o) */ -static void *emph_parent_class; +static gpointer emph_parent_class; #define emph ((EConfigHook *)eph) static const EPluginHookTargetKey ech_item_types[] = { @@ -1271,7 +1271,7 @@ static const EPluginHookTargetKey ech_item_types[] = { }; static void -ech_commit(EConfig *ec, GSList *items, void *data) +ech_commit(EConfig *ec, GSList *items, gpointer data) { struct _EConfigHookGroup *group = data; @@ -1280,7 +1280,7 @@ ech_commit(EConfig *ec, GSList *items, void *data) } static void -ech_abort(EConfig *ec, GSList *items, void *data) +ech_abort(EConfig *ec, GSList *items, gpointer data) { struct _EConfigHookGroup *group = data; @@ -1289,7 +1289,7 @@ ech_abort(EConfig *ec, GSList *items, void *data) } static gboolean -ech_check(EConfig *ec, const char *pageid, void *data) +ech_check(EConfig *ec, const gchar *pageid, gpointer data) { struct _EConfigHookGroup *group = data; EConfigHookPageCheckData hdata; @@ -1305,7 +1305,7 @@ ech_check(EConfig *ec, const char *pageid, void *data) } static void -ech_config_factory(EConfig *emp, void *data) +ech_config_factory(EConfig *emp, gpointer data) { struct _EConfigHookGroup *group = data; @@ -1342,7 +1342,7 @@ emph_free_group(struct _EConfigHookGroup *group) } static struct _GtkWidget * -ech_config_widget_factory(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, void *data) +ech_config_widget_factory(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { struct _EConfigHookGroup *group = data; @@ -1355,7 +1355,7 @@ ech_config_widget_factory(EConfig *ec, EConfigItem *item, GtkWidget *parent, Gtk hdata.parent = parent; hdata.old = old; - return (struct _GtkWidget *)e_plugin_invoke(group->hook->hook.plugin, (char *)item->user_data, &hdata); + return (struct _GtkWidget *)e_plugin_invoke(group->hook->hook.plugin, (gchar *)item->user_data, &hdata); } else return NULL; } @@ -1380,7 +1380,7 @@ emph_construct_item(EPluginHook *eph, EConfigHookGroup *menu, xmlNodePtr root, E if (item->user_data) item->factory = ech_config_widget_factory; - d(printf(" path=%s label=%s factory=%s\n", item->path, item->label, (char *)item->user_data)); + d(printf(" path=%s label=%s factory=%s\n", item->path, item->label, (gchar *)item->user_data)); return item; error: @@ -1396,12 +1396,12 @@ emph_construct_menu(EPluginHook *eph, xmlNodePtr root) xmlNodePtr node; EConfigHookTargetMap *map; EConfigHookClass *klass = (EConfigHookClass *)G_OBJECT_GET_CLASS(eph); - char *tmp; + gchar *tmp; d(printf(" loading menu\n")); menu = g_malloc0(sizeof(*menu)); - tmp = (char *)xmlGetProp(root, (const unsigned char *)"target"); + tmp = (gchar *)xmlGetProp(root, (const guchar *)"target"); if (tmp == NULL) goto error; map = g_hash_table_lookup(klass->target_map, tmp); @@ -1422,7 +1422,7 @@ emph_construct_menu(EPluginHook *eph, xmlNodePtr root) menu->hook = (EConfigHook *)eph; node = root->children; while (node) { - if (0 == strcmp((char *)node->name, "item")) { + if (0 == strcmp((gchar *)node->name, "item")) { struct _EConfigItem *item; item = emph_construct_item(eph, menu, node, map); @@ -1453,7 +1453,7 @@ emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) node = root->children; while (node) { - if (strcmp((char *)node->name, "group") == 0) { + if (strcmp((gchar *)node->name, "group") == 0) { struct _EConfigHookGroup *group; group = emph_construct_menu(eph, node); @@ -1534,5 +1534,5 @@ e_config_hook_get_type(void) **/ void e_config_hook_class_add_target_map(EConfigHookClass *klass, const EConfigHookTargetMap *map) { - g_hash_table_insert(klass->target_map, (void *)map->type, (void *)map); + g_hash_table_insert(klass->target_map, (gpointer)map->type, (gpointer)map); } diff --git a/e-util/e-config.h b/e-util/e-config.h index b128005c64..afb897477f 100644 --- a/e-util/e-config.h +++ b/e-util/e-config.h @@ -44,13 +44,13 @@ typedef struct _EConfigItem EConfigItem; typedef struct _EConfigFactory EConfigFactory; typedef struct _EConfigTarget EConfigTarget; -typedef void (*EConfigFactoryFunc)(EConfig *ec, void *data); +typedef void (*EConfigFactoryFunc)(EConfig *ec, gpointer data); -typedef gboolean (*EConfigCheckFunc)(EConfig *ec, const char *pageid, void *data); +typedef gboolean (*EConfigCheckFunc)(EConfig *ec, const gchar *pageid, gpointer data); -typedef void (*EConfigItemsFunc)(EConfig *ec, GSList *items, void *data); +typedef void (*EConfigItemsFunc)(EConfig *ec, GSList *items, gpointer data); -typedef struct _GtkWidget * (*EConfigItemFactoryFunc)(EConfig *ec, EConfigItem *, struct _GtkWidget *parent, struct _GtkWidget *old, void *data); +typedef struct _GtkWidget * (*EConfigItemFactoryFunc)(EConfig *ec, EConfigItem *, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data); /* ok so this is all a bit bogussy we need to map to glade stuff instead */ @@ -144,10 +144,10 @@ enum _e_config_t { **/ struct _EConfigItem { enum _e_config_t type; - char *path; /* absolute path, must sort ascii-lexographically into the right spot */ - char *label; + gchar *path; /* absolute path, must sort ascii-lexographically into the right spot */ + gchar *label; EConfigItemFactoryFunc factory; - void *user_data; + gpointer user_data; }; /** @@ -194,9 +194,9 @@ struct _EConfig { struct _EConfigPrivate *priv; - int type; /* E_CONFIG_BOOK or E_CONFIG_DRUID */ + gint type; /* E_CONFIG_BOOK or E_CONFIG_DRUID */ - char *id; + gchar *id; EConfigTarget *target; @@ -230,31 +230,31 @@ struct _EConfigClass { GType e_config_get_type(void); /* Static class methods */ -EConfigFactory *e_config_class_add_factory(EConfigClass *klass, const char *id, EConfigFactoryFunc func, void *data); +EConfigFactory *e_config_class_add_factory(EConfigClass *klass, const gchar *id, EConfigFactoryFunc func, gpointer data); void e_config_class_remove_factory(EConfigClass *klass, EConfigFactory *f); -EConfig *e_config_construct(EConfig *, int type, const char *id); +EConfig *e_config_construct(EConfig *, gint type, const gchar *id); -void e_config_add_items(EConfig *, GSList *items, EConfigItemsFunc commitfunc, EConfigItemsFunc abortfunc, EConfigItemsFunc freefunc, void *data); -void e_config_add_page_check(EConfig *, const char *pageid, EConfigCheckFunc, void *data); +void e_config_add_items(EConfig *, GSList *items, EConfigItemsFunc commitfunc, EConfigItemsFunc abortfunc, EConfigItemsFunc freefunc, gpointer data); +void e_config_add_page_check(EConfig *, const gchar *pageid, EConfigCheckFunc, gpointer data); void e_config_set_target(EConfig *emp, EConfigTarget *target); struct _GtkWidget *e_config_create_widget(EConfig *); -struct _GtkWidget *e_config_create_window(EConfig *emp, struct _GtkWindow *parent, const char *title); +struct _GtkWidget *e_config_create_window(EConfig *emp, struct _GtkWindow *parent, const gchar *title); void e_config_target_changed(EConfig *emp, e_config_target_change_t how); -gboolean e_config_page_check(EConfig *, const char *); +gboolean e_config_page_check(EConfig *, const gchar *); -struct _GtkWidget *e_config_page_get(EConfig *ec, const char *pageid); -const char *e_config_page_next(EConfig *ec, const char *pageid); -const char *e_config_page_prev(EConfig *ec, const char *pageid); +struct _GtkWidget *e_config_page_get(EConfig *ec, const gchar *pageid); +const gchar *e_config_page_next(EConfig *ec, const gchar *pageid); +const gchar *e_config_page_prev(EConfig *ec, const gchar *pageid); void e_config_abort(EConfig *); void e_config_commit(EConfig *); -void *e_config_target_new(EConfig *, int type, size_t size); -void e_config_target_free(EConfig *, void *); +gpointer e_config_target_new(EConfig *, gint type, size_t size); +void e_config_target_free(EConfig *, gpointer ); /* ********************************************************************** */ @@ -314,7 +314,7 @@ struct _EConfigHookItemFactoryData { struct _EConfigHookPageCheckData { EConfig *config; EConfigTarget *target; - const char *pageid; + const gchar *pageid; }; /** @@ -336,12 +336,12 @@ struct _EConfigHookPageCheckData { **/ struct _EConfigHookGroup { struct _EConfigHook *hook; /* parent pointer */ - char *id; /* target menu id for these config items */ - int target_type; /* target type of this group */ + gchar *id; /* target menu id for these config items */ + gint target_type; /* target type of this group */ GSList *items; /* items to add to group */ - char *check; /* validate handler, if set */ - char *commit; /* commit handler, if set */ - char *abort; /* abort handler, if set */ + gchar *check; /* validate handler, if set */ + gchar *commit; /* commit handler, if set */ + gchar *abort; /* abort handler, if set */ }; /** diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c index f673370bfc..338b88efee 100644 --- a/e-util/e-corba-utils.c +++ b/e-util/e-corba-utils.c @@ -28,7 +28,7 @@ const CORBA_char * -e_safe_corba_string (const char *s) +e_safe_corba_string (const gchar *s) { if (s == NULL) return (CORBA_char *) ""; @@ -37,7 +37,7 @@ e_safe_corba_string (const char *s) } CORBA_char * -e_safe_corba_string_dup (const char *s) +e_safe_corba_string_dup (const gchar *s) { return CORBA_string_dup (e_safe_corba_string (s)); } diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h index b6da7240e7..c7527ebe26 100644 --- a/e-util/e-corba-utils.h +++ b/e-util/e-corba-utils.h @@ -25,7 +25,7 @@ #include -const CORBA_char *e_safe_corba_string (const char *s); -CORBA_char *e_safe_corba_string_dup (const char *s); +const CORBA_char *e_safe_corba_string (const gchar *s); +CORBA_char *e_safe_corba_string_dup (const gchar *s); #endif diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 978033541a..b209c84633 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -53,11 +53,11 @@ * button. **/ void -e_notice (gpointer parent, GtkMessageType type, const char *format, ...) +e_notice (gpointer parent, GtkMessageType type, const gchar *format, ...) { GtkWidget *dialog; va_list args; - char *str; + gchar *str; va_start (args, format); str = g_strdup_vprintf (format, args); @@ -87,11 +87,11 @@ e_notice (gpointer parent, GtkMessageType type, const char *format, ...) * window argument. **/ void -e_notice_with_xid (GdkNativeWindow parent, GtkMessageType type, const char *format, ...) +e_notice_with_xid (GdkNativeWindow parent, GtkMessageType type, const gchar *format, ...) { GtkWidget *dialog; va_list args; - char *str; + gchar *str; va_start (args, format); str = g_strdup_vprintf (format, args); @@ -121,9 +121,9 @@ window_is_wm_toplevel (Display *display, Window window) { static Atom WM_STATE = None; unsigned long nitems, after; - unsigned char *data = NULL; + guchar *data = NULL; Atom type = None; - int format; + gint format; if (!WM_STATE) WM_STATE = XInternAtom (display, "WM_STATE", False); @@ -132,7 +132,7 @@ window_is_wm_toplevel (Display *display, Window window) AnyPropertyType, &type, &format, &nitems, &after, &data) == Success) { if (data) - XFree((char*)data); + XFree((gchar *)data); if (type) return TRUE; } @@ -160,7 +160,7 @@ e_dialog_set_transient_for (GtkWindow *dialog, GtkWidget *toplevel; #ifdef GDK_WINDOWING_X11 Window parent, root_ret, *children; - unsigned int numchildren; + guint numchildren; Display *display; Status status; #endif @@ -248,8 +248,8 @@ static void save_ok (GtkWidget *widget, gpointer data) { GtkWidget *fs; - char **filename = data; - char *uri; + gchar **filename = data; + gchar *uri; fs = gtk_widget_get_toplevel (widget); uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fs)); @@ -271,11 +271,11 @@ filechooser_response (GtkWidget *fc, gint response_id, gpointer data) gtk_widget_destroy (fc); } -char * -e_file_dialog_save (const char *title, const char *fname) +gchar * +e_file_dialog_save (const gchar *title, const gchar *fname) { GtkWidget *selection; - char *filename = NULL; + gchar *filename = NULL; selection = e_file_get_save_filesel(NULL, title, fname, GTK_FILE_CHOOSER_ACTION_SAVE); @@ -294,8 +294,8 @@ static void save_folder_ok (GtkWidget *widget, gpointer data) { GtkWidget *fs; - char **filename = data; - char *uri; + gchar **filename = data; + gchar *uri; fs = gtk_widget_get_toplevel (widget); uri = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (fs)); @@ -315,11 +315,11 @@ folderchooser_response (GtkWidget *fc, gint response_id, gpointer data) gtk_widget_destroy (fc); } -char * -e_file_dialog_save_folder (const char *title) +gchar * +e_file_dialog_save_folder (const gchar *title) { GtkWidget *selection; - char *filename = NULL; + gchar *filename = NULL; selection = e_file_get_save_filesel(NULL, title, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); g_signal_connect (G_OBJECT (selection), "response", G_CALLBACK (folderchooser_response), &filename); @@ -344,10 +344,10 @@ e_file_dialog_save_folder (const char *title) * no signals connected and is not shown. **/ GtkWidget * -e_file_get_save_filesel (GtkWidget *parent, const char *title, const char *name, GtkFileChooserAction action) +e_file_get_save_filesel (GtkWidget *parent, const gchar *title, const gchar *name, GtkFileChooserAction action) { GtkWidget *filesel; - char *uri; + gchar *uri; filesel = gtk_file_chooser_dialog_new (title, NULL, @@ -382,10 +382,10 @@ e_file_get_save_filesel (GtkWidget *parent, const char *title, const char *name, * it. Returns the users choice. **/ gboolean -e_file_can_save(GtkWindow *parent, const char *uri) +e_file_can_save(GtkWindow *parent, const gchar *uri) { struct stat st; - char *path; + gchar *path; gboolean res; if (!uri || uri[0] == 0) @@ -421,9 +421,9 @@ e_file_can_save(GtkWindow *parent, const char *uri) } gboolean -e_file_check_local (const char *name) +e_file_check_local (const gchar *name) { - char *uri; + gchar *uri; uri = e_util_uri_to_filename (name); if (uri) { diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h index 6b9956ddf9..153c018918 100644 --- a/e-util/e-dialog-utils.h +++ b/e-util/e-dialog-utils.h @@ -27,11 +27,11 @@ void e_notice (gpointer parent, GtkMessageType type, - const char *format, + const gchar *format, ...); void e_notice_with_xid (GdkNativeWindow parent, GtkMessageType type, - const char *format, + const gchar *format, ...); void e_dialog_set_transient_for (GtkWindow *dialog, @@ -39,14 +39,14 @@ void e_dialog_set_transient_for (GtkWindow *dialog, void e_dialog_set_transient_for_xid (GtkWindow *dialog, GdkNativeWindow xid); -char *e_file_dialog_save (const char *title, const char *fname); +gchar *e_file_dialog_save (const gchar *title, const gchar *fname); -char *e_file_dialog_save_folder (const char *title); +gchar *e_file_dialog_save_folder (const gchar *title); -GtkWidget * e_file_get_save_filesel (GtkWidget *parent, const char *title, const char *name, GtkFileChooserAction action); +GtkWidget * e_file_get_save_filesel (GtkWidget *parent, const gchar *title, const gchar *name, GtkFileChooserAction action); -gboolean e_file_can_save(GtkWindow *parent, const char *uri); -gboolean e_file_check_local(const char *name); +gboolean e_file_can_save(GtkWindow *parent, const gchar *uri); +gboolean e_file_check_local(const gchar *name); #endif diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c index 98e1be7a74..ae53a17ca7 100644 --- a/e-util/e-dialog-widgets.c +++ b/e-util/e-dialog-widgets.c @@ -80,9 +80,9 @@ get_dialog_hooks (GtkWidget *dialog) * values for the items are provided as a -1-terminated array. */ static int -value_to_index (const int *value_map, int value) +value_to_index (const gint *value_map, gint value) { - int i; + gint i; for (i = 0; value_map[i] != -1; i++) if (value_map[i] == value) @@ -95,9 +95,9 @@ value_to_index (const int *value_map, int value) * function above. */ static int -index_to_value (const int *value_map, int index) +index_to_value (const gint *value_map, gint index) { - int i; + gint i; /* We do this the hard way, i.e. not as a simple array reference, to * check for correctness. @@ -114,13 +114,13 @@ index_to_value (const int *value_map, int index) static void hook_radio (GtkWidget *dialog, GtkRadioButton *radio, gpointer value_var, gpointer info) { - const int *value_map; - int *value; + const gint *value_map; + gint *value; /* Set the value */ - value = (int *) value_var; - value_map = (const int *) info; + value = (gint *) value_var; + value_map = (const gint *) info; e_dialog_radio_set (GTK_WIDGET (radio), *value, value_map); } @@ -129,11 +129,11 @@ hook_radio (GtkWidget *dialog, GtkRadioButton *radio, gpointer value_var, gpoint static void get_radio_value (GtkRadioButton *radio, gpointer value_var, gpointer info) { - int *value; - const int *value_map; + gint *value; + const gint *value_map; - value = (int *) value_var; - value_map = (const int *) info; + value = (gint *) value_var; + value_map = (const gint *) info; *value = e_dialog_radio_get (GTK_WIDGET (radio), value_map); } @@ -191,11 +191,11 @@ get_spin_button_value (GtkSpinButton *spin, gpointer value_var, gpointer info) static void hook_editable (GtkWidget *dialog, GtkEditable *editable, gpointer value_var, gpointer info) { - char **value; + gchar **value; /* Set the value */ - value = (char **) value_var; + value = (gchar **) value_var; e_dialog_editable_set (GTK_WIDGET (editable), *value); } @@ -204,9 +204,9 @@ hook_editable (GtkWidget *dialog, GtkEditable *editable, gpointer value_var, gpo static void get_editable_value (GtkEditable *editable, gpointer value_var, gpointer data) { - char **value; + gchar **value; - value = (char **) value_var; + value = (gchar **) value_var; if (*value) g_free (*value); @@ -221,9 +221,9 @@ get_editable_value (GtkEditable *editable, gpointer value_var, gpointer data) * Sets the string value inside a #GtkEditable-derived widget. **/ void -e_dialog_editable_set (GtkWidget *widget, const char *value) +e_dialog_editable_set (GtkWidget *widget, const gchar *value) { - int pos = 0; + gint pos = 0; g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_EDITABLE (widget)); @@ -244,7 +244,7 @@ e_dialog_editable_set (GtkWidget *widget, const char *value) * This function can return NULL if the string could not be converted from * GTK+'s encoding into UTF8. **/ -char * +gchar * e_dialog_editable_get (GtkWidget *widget) { g_return_val_if_fail (widget != NULL, NULL); @@ -268,10 +268,10 @@ e_dialog_editable_get (GtkWidget *widget) * specified as { NEAREST_NEIGHBOR, BILINEAR, HYPERBOLIC, -1 }. **/ void -e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map) +e_dialog_radio_set (GtkWidget *widget, gint value, const gint *value_map) { GSList *group, *l; - int i; + gint i; g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_RADIO_BUTTON (widget)); @@ -307,11 +307,11 @@ e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map) * Return value: Enumeration value which corresponds to the selected item in the * radio group. **/ -int -e_dialog_radio_get (GtkWidget *widget, const int *value_map) +gint +e_dialog_radio_get (GtkWidget *widget, const gint *value_map) { GSList *group, *l; - int i, v; + gint i, v; g_return_val_if_fail (widget != NULL, -1); g_return_val_if_fail (GTK_IS_RADIO_BUTTON (widget), -1); @@ -428,7 +428,7 @@ e_dialog_spin_get_double (GtkWidget *widget) * * Return value: Numeric value. **/ -int +gint e_dialog_spin_get_int (GtkWidget *widget) { double value; @@ -451,9 +451,9 @@ e_dialog_spin_get_int (GtkWidget *widget) * indices. **/ void -e_dialog_combo_box_set (GtkWidget *widget, int value, const int *value_map) +e_dialog_combo_box_set (GtkWidget *widget, gint value, const gint *value_map) { - int i; + gint i; g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_COMBO_BOX (widget)); @@ -480,10 +480,10 @@ e_dialog_combo_box_set (GtkWidget *widget, int value, const int *value_map) * Return value: Enumeration value which corresponds to the selected item in the * combo box. **/ -int -e_dialog_combo_box_get (GtkWidget *widget, const int *value_map) +gint +e_dialog_combo_box_get (GtkWidget *widget, const gint *value_map) { - int i; + gint i; g_return_val_if_fail (widget != NULL, -1); g_return_val_if_fail (GTK_IS_COMBO_BOX (widget), -1); @@ -506,7 +506,7 @@ e_dialog_combo_box_get (GtkWidget *widget, const int *value_map) * e_dialog_radio_set() for details). * * Hooks a widget from a dialog box to the variable it will modify. Supported - * widgets are: #GtkEditable (char *), #GtkRadioButton (int/value_map pair; see + * widgets are: #GtkEditable (gchar *), #GtkRadioButton (int/value_map pair; see * e_dialog_radio_set() for more information), #GtkTogglebutton (gboolean), * #GtkSpinButton (double), #GtkOptionMenu (int/value_map pair), and * #GnomeDateEdit (time_t). @@ -615,7 +615,7 @@ e_dialog_get_values (GtkWidget *dialog) * otherwise. **/ gboolean -e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const char *widget_name, +e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const gchar *widget_name, gpointer value_var, gpointer info) { GtkWidget *widget; diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h index b7f838539d..b40edc832a 100644 --- a/e-util/e-dialog-widgets.h +++ b/e-util/e-dialog-widgets.h @@ -30,28 +30,28 @@ -void e_dialog_editable_set (GtkWidget *widget, const char *value); -char *e_dialog_editable_get (GtkWidget *widget); +void e_dialog_editable_set (GtkWidget *widget, const gchar *value); +gchar *e_dialog_editable_get (GtkWidget *widget); -void e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map); -int e_dialog_radio_get (GtkWidget *widget, const int *value_map); +void e_dialog_radio_set (GtkWidget *widget, gint value, const gint *value_map); +gint e_dialog_radio_get (GtkWidget *widget, const gint *value_map); void e_dialog_toggle_set (GtkWidget *widget, gboolean value); gboolean e_dialog_toggle_get (GtkWidget *widget); void e_dialog_spin_set (GtkWidget *widget, double value); double e_dialog_spin_get_double (GtkWidget *widget); -int e_dialog_spin_get_int (GtkWidget *widget); +gint e_dialog_spin_get_int (GtkWidget *widget); -void e_dialog_combo_box_set (GtkWidget *widget, int value, const int *value_map); -int e_dialog_combo_box_get (GtkWidget *widget, const int *value_map); +void e_dialog_combo_box_set (GtkWidget *widget, gint value, const gint *value_map); +gint e_dialog_combo_box_get (GtkWidget *widget, const gint *value_map); gboolean e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget, gpointer value_var, gpointer info); void e_dialog_get_values (GtkWidget *dialog); -gboolean e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const char *widget_name, +gboolean e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const gchar *widget_name, gpointer value_var, gpointer info); diff --git a/e-util/e-error.c b/e-util/e-error.c index f2067950bc..c35e8b2dde 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -99,9 +99,9 @@ static struct { }; static int -map_response(const char *name) +map_response(const gchar *name) { - int i; + gint i; for (i=0;iname, "error-list") != 0 - || (tmp = (char *)xmlGetProp(root, (const unsigned char *)"domain")) == NULL) { + || strcmp((gchar *)root->name, "error-list") != 0 + || (tmp = (gchar *)xmlGetProp(root, (const guchar *)"domain")) == NULL) { g_warning("Error file '%s' invalid format", path); xmlFreeDoc(doc); return; @@ -179,19 +179,19 @@ ee_load(const char *path) table = g_hash_table_lookup(error_table, tmp); if (table == NULL) { - char *tmp2; + gchar *tmp2; 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, (gpointer) table->domain, table); - tmp2 = (char *)xmlGetProp(root, (const unsigned char *)"translation-domain"); + tmp2 = (gchar *)xmlGetProp(root, (const guchar *)"translation-domain"); if (tmp2) { table->translation_domain = g_strdup(tmp2); xmlFree(tmp2); - tmp2 = (char *)xmlGetProp(root, (const unsigned char *)"translation-localedir"); + tmp2 = (gchar *)xmlGetProp(root, (const guchar *)"translation-localedir"); if (tmp2) { bindtextdomain(table->translation_domain, tmp2); xmlFree(tmp2); @@ -202,8 +202,8 @@ ee_load(const char *path) xmlFree(tmp); for (error = root->children;error;error = error->next) { - if (!strcmp((char *)error->name, "error")) { - tmp = (char *)xmlGetProp(error, (const unsigned char *)"id"); + if (!strcmp((gchar *)error->name, "error")) { + tmp = (gchar *)xmlGetProp(error, (const guchar *)"id"); if (tmp == NULL) continue; @@ -214,25 +214,25 @@ ee_load(const char *path) xmlFree(tmp); lastbutton = (struct _e_error_button *)&e->buttons; - tmp = (char *)xmlGetProp(error, (const unsigned char *)"modal"); + tmp = (gchar *)xmlGetProp(error, (const guchar *)"modal"); if (tmp) { if (!strcmp(tmp, "true")) e->flags |= GTK_DIALOG_MODAL; xmlFree(tmp); } - tmp = (char *)xmlGetProp(error, (const unsigned char *)"type"); + tmp = (gchar *)xmlGetProp(error, (const guchar *)"type"); e->type = map_type(tmp); if (tmp) xmlFree(tmp); - tmp = (char *)xmlGetProp(error, (const unsigned char *)"default"); + tmp = (gchar *)xmlGetProp(error, (const guchar *)"default"); if (tmp) { e->default_response = map_response(tmp); xmlFree(tmp); } - tmp = (char *)xmlGetProp(error, (const unsigned char *)"scroll"); + tmp = (gchar *)xmlGetProp(error, (const guchar *)"scroll"); if (tmp) { if (!strcmp(tmp, "yes")) e->scroll = TRUE; @@ -240,46 +240,46 @@ ee_load(const char *path) } for (scan = error->children;scan;scan=scan->next) { - if (!strcmp((char *)scan->name, "primary")) { - if ((tmp = (char *)xmlNodeGetContent(scan))) { + if (!strcmp((gchar *)scan->name, "primary")) { + if ((tmp = (gchar *)xmlNodeGetContent(scan))) { e->primary = g_strdup(dgettext(table->translation_domain, tmp)); xmlFree(tmp); } - } else if (!strcmp((char *)scan->name, "secondary")) { - if ((tmp = (char *)xmlNodeGetContent(scan))) { + } else if (!strcmp((gchar *)scan->name, "secondary")) { + if ((tmp = (gchar *)xmlNodeGetContent(scan))) { e->secondary = g_strdup(dgettext(table->translation_domain, tmp)); xmlFree(tmp); } - } else if (!strcmp((char *)scan->name, "title")) { - if ((tmp = (char *)xmlNodeGetContent(scan))) { + } else if (!strcmp((gchar *)scan->name, "title")) { + if ((tmp = (gchar *)xmlNodeGetContent(scan))) { e->title = g_strdup(dgettext(table->translation_domain, tmp)); xmlFree(tmp); } - } else if (!strcmp((char *)scan->name, "help")) { - tmp = (char *)xmlGetProp(scan, (const unsigned char *)"uri"); + } else if (!strcmp((gchar *)scan->name, "help")) { + tmp = (gchar *)xmlGetProp(scan, (const guchar *)"uri"); if (tmp) { e->help_uri = g_strdup(tmp); xmlFree(tmp); } - } else if (!strcmp((char *)scan->name, "button")) { + } else if (!strcmp((gchar *)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"); + tmp = (gchar *)xmlGetProp(scan, (const guchar *)"stock"); if (tmp) { stock = g_strdup(tmp); b->stock = stock; xmlFree(tmp); } - tmp = (char *)xmlGetProp(scan, (const unsigned char *)"label"); + tmp = (gchar *)xmlGetProp(scan, (const guchar *)"label"); if (tmp) { label = g_strdup(dgettext(table->translation_domain, tmp)); b->label = label; xmlFree(tmp); } - tmp = (char *)xmlGetProp(scan, (const unsigned char *)"response"); + tmp = (gchar *)xmlGetProp(scan, (const guchar *)"response"); if (tmp) { b->response = map_response(tmp); xmlFree(tmp); @@ -308,10 +308,10 @@ static void ee_load_tables(void) { GDir *dir; - const char *d; - char *base; + const gchar *d; + gchar *base; struct _e_error_table *table; - int i; + gint i; if (error_table != NULL) return; @@ -335,7 +335,7 @@ ee_load_tables(void) } while ( (d = g_dir_read_name(dir)) ) { - char *path; + gchar *path; if (d[0] == '.') continue; @@ -351,9 +351,9 @@ ee_load_tables(void) /* unfortunately, gmarkup_escape doesn't expose its gstring based api :( */ static void -ee_append_text(GString *out, const char *text) +ee_append_text(GString *out, const gchar *text) { - char c; + gchar c; while ( (c=*text++) ) { if (c == '<') @@ -372,11 +372,11 @@ ee_append_text(GString *out, const char *text) } static void -ee_build_label(GString *out, const char *fmt, GPtrArray *args, +ee_build_label(GString *out, const gchar *fmt, GPtrArray *args, gboolean escape_args) { - const char *end, *newstart; - int id; + const gchar *end, *newstart; + gint id; while (fmt && (newstart = strchr(fmt, '{')) @@ -406,13 +406,13 @@ ee_response(GtkWidget *w, guint button, struct _e_error *e) } GtkWidget * -e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) +e_error_newv(GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap) { struct _e_error_table *table; struct _e_error *e; struct _e_error_button *b; GtkWidget *hbox, *w, *scroll=NULL; - char *tmp, *domain, *id; + gchar *tmp, *domain, *id; GString *out, *oerr; GPtrArray *args; GtkDialog *dialog; @@ -503,10 +503,10 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) gtk_box_pack_start((GtkBox *)hbox, w, FALSE, FALSE, 12); args = g_ptr_array_new(); - tmp = (char *)arg0; + tmp = (gchar *)arg0; while (tmp) { g_ptr_array_add(args, tmp); - tmp = va_arg(ap, char *); + tmp = va_arg(ap, gchar *); } out = g_string_new(""); @@ -581,7 +581,7 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) * dialog asynchronously. **/ struct _GtkWidget * -e_error_new(struct _GtkWindow *parent, const char *tag, const char *arg0, ...) +e_error_new(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, ...) { GtkWidget *w; va_list ap; @@ -593,11 +593,11 @@ e_error_new(struct _GtkWindow *parent, const char *tag, const char *arg0, ...) return w; } -int -e_error_runv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) +gint +e_error_runv(GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap) { GtkWidget *w; - int res; + gint res; w = e_error_newv(parent, tag, arg0, ap); @@ -618,12 +618,12 @@ e_error_runv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) * * Return value: The response id of the button pressed. **/ -int -e_error_run(GtkWindow *parent, const char *tag, const char *arg0, ...) +gint +e_error_run(GtkWindow *parent, const gchar *tag, const gchar *arg0, ...) { GtkWidget *w; va_list ap; - int res; + gint res; va_start(ap, arg0); w = e_error_newv(parent, tag, arg0, ap); diff --git a/e-util/e-error.h b/e-util/e-error.h index 014f74ee88..6b66a6da31 100644 --- a/e-util/e-error.h +++ b/e-util/e-error.h @@ -50,11 +50,11 @@ struct _GtkWindow; #define E_ERROR_NO_LOAD_FILE "system:no-save-file" /* Note that all errors returned are standard GtkDialoge's */ -struct _GtkWidget *e_error_new(struct _GtkWindow *parent, const char *tag, const char *arg0, ...); -struct _GtkWidget *e_error_newv(struct _GtkWindow *parent, const char *tag, const char *arg0, va_list ap); +struct _GtkWidget *e_error_new(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, ...); +struct _GtkWidget *e_error_newv(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap); -int e_error_run(struct _GtkWindow *parent, const char *tag, const char *arg0, ...); -int e_error_runv(struct _GtkWindow *parent, const char *tag, const char *arg0, va_list ap); +gint e_error_run(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, ...); +gint e_error_runv(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap); guint e_error_count_buttons (GtkDialog *dialog); diff --git a/e-util/e-event.c b/e-util/e-event.c index ab96701abc..d449030c0b 100644 --- a/e-util/e-event.c +++ b/e-util/e-event.c @@ -39,16 +39,16 @@ struct _EEventFactory { struct _EEventFactory *next, *prev; - char *menuid; + gchar *menuid; EEventFactoryFunc factory; - void *factory_data; + gpointer factory_data; }; struct _event_node { struct _event_node *next, *prev; GSList *events; - void *data; + gpointer data; EEventItemsFunc freefunc; }; @@ -155,7 +155,7 @@ e_event_get_type(void) * * Return value: Returns @ep. **/ -EEvent *e_event_construct(EEvent *ep, const char *id) +EEvent *e_event_construct(EEvent *ep, const gchar *id) { ep->id = g_strdup(id); @@ -173,8 +173,8 @@ EEvent *e_event_construct(EEvent *ep, const char *id) * * Return value: An opaque key which can later be passed to remove_items. **/ -void * -e_event_add_items(EEvent *emp, GSList *items, EEventItemsFunc freefunc, void *data) +gpointer +e_event_add_items(EEvent *emp, GSList *items, EEventItemsFunc freefunc, gpointer data) { struct _event_node *node; @@ -190,7 +190,7 @@ e_event_add_items(EEvent *emp, GSList *items, EEventItemsFunc freefunc, void *da emp->priv->sorted = NULL; } - return (void *)node; + return (gpointer)node; } /** @@ -202,7 +202,7 @@ e_event_add_items(EEvent *emp, GSList *items, EEventItemsFunc freefunc, void *da * added, and may only be removed once. **/ void -e_event_remove_items(EEvent *emp, void *handle) +e_event_remove_items(EEvent *emp, gpointer handle) { struct _event_node *node = handle; @@ -219,10 +219,10 @@ e_event_remove_items(EEvent *emp, void *handle) } static int -ee_cmp(const void *ap, const void *bp) +ee_cmp(gconstpointer ap, gconstpointer bp) { - int a = ((struct _event_info **)ap)[0]->item->priority; - int b = ((struct _event_info **)bp)[0]->item->priority; + gint a = ((struct _event_info **)ap)[0]->item->priority; + gint b = ((struct _event_info **)bp)[0]->item->priority; if (a < b) return 1; @@ -242,7 +242,7 @@ ee_cmp(const void *ap, const void *bp) * emission is complete. **/ void -e_event_emit(EEvent *emp, const char *id, EEventTarget *target) +e_event_emit(EEvent *emp, const gchar *id, EEventTarget *target) { struct _EEventPrivate *p = emp->priv; GSList *events; @@ -306,7 +306,7 @@ e_event_emit(EEvent *emp, const char *id, EEventTarget *target) * the implementation to define the available target types and their * structure. **/ -void *e_event_target_new(EEvent *ep, int type, size_t size) +gpointer e_event_target_new(EEvent *ep, gint type, size_t size) { EEventTarget *t; @@ -331,7 +331,7 @@ void *e_event_target_new(EEvent *ep, int type, size_t size) * Free a target. This invokes the virtual free method on the EEventClass. **/ void -e_event_target_free(EEvent *ep, void *o) +e_event_target_free(EEvent *ep, gpointer o) { EEventTarget *t = o; @@ -380,7 +380,7 @@ e_event_target_free(EEvent *ep, void *o) */ -static void *emph_parent_class; +static gpointer emph_parent_class; #define emph ((EEventHook *)eph) /* must have 1:1 correspondence with e-event types in order */ @@ -391,7 +391,7 @@ static const EPluginHookTargetKey emph_item_types[] = { }; static void -emph_event_handle(EEvent *ee, EEventItem *item, void *data) +emph_event_handle(EEvent *ee, EEventItem *item, gpointer data) { struct _EEventHook *hook = data; @@ -399,19 +399,19 @@ emph_event_handle(EEvent *ee, EEventItem *item, void *data) if (!hook->hook.plugin->enabled) return; - e_plugin_invoke(hook->hook.plugin, (char *)item->user_data, ee->target); + e_plugin_invoke(hook->hook.plugin, (gchar *)item->user_data, ee->target); } static void emph_free_item(struct _EEventItem *item) { - g_free((char *)item->id); + g_free((gchar *)item->id); g_free(item->user_data); g_free(item); } static void -emph_free_items(EEvent *ee, GSList *items, void *data) +emph_free_items(EEvent *ee, GSList *items, gpointer data) { /*EPluginHook *eph = data;*/ @@ -424,11 +424,11 @@ emph_construct_item(EPluginHook *eph, xmlNodePtr root, EEventHookClass *klass) { struct _EEventItem *item; EEventHookTargetMap *map; - char *tmp; + gchar *tmp; item = g_malloc0(sizeof(*item)); - tmp = (char *)xmlGetProp(root, (const unsigned char *)"target"); + tmp = (gchar *)xmlGetProp(root, (const guchar *)"target"); if (tmp == NULL) goto error; map = g_hash_table_lookup(klass->target_map, tmp); @@ -473,7 +473,7 @@ emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) node = root->children; while (node) { - if (strcmp((char *)node->name, "event") == 0) { + if (strcmp((gchar *)node->name, "event") == 0) { struct _EEventItem *item; item = emph_construct_item(eph, node, klass); @@ -551,5 +551,5 @@ e_event_hook_get_type(void) **/ void e_event_hook_class_add_target_map(EEventHookClass *klass, const EEventHookTargetMap *map) { - g_hash_table_insert(klass->target_map, (void *)map->type, (void *)map); + g_hash_table_insert(klass->target_map, (gpointer)map->type, (gpointer)map); } diff --git a/e-util/e-event.h b/e-util/e-event.h index 5b4e3f44ab..5ae3b61d1b 100644 --- a/e-util/e-event.h +++ b/e-util/e-event.h @@ -44,9 +44,9 @@ typedef struct _EEventItem EEventItem; typedef struct _EEventFactory EEventFactory; /* anonymous type */ typedef struct _EEventTarget EEventTarget; -typedef void (*EEventItemsFunc)(EEvent *ee, GSList *items, void *data); -typedef void (*EEventFunc)(EEvent *ee, EEventItem *item, void *data); -typedef void (*EEventFactoryFunc)(EEvent *ee, void *); +typedef void (*EEventItemsFunc)(EEvent *ee, GSList *items, gpointer data); +typedef void (*EEventFunc)(EEvent *ee, EEventItem *item, gpointer data); +typedef void (*EEventFactoryFunc)(EEvent *ee, gpointer ); /** * enum _e_event_t - Event type. @@ -86,11 +86,11 @@ enum _e_event_t { **/ struct _EEventItem { enum _e_event_t type; - int priority; /* priority of event */ - const char *id; /* event id */ - int target_type; + gint priority; /* priority of event */ + const gchar *id; /* event id */ + gint target_type; EEventFunc handle; - void *user_data; + gpointer user_data; guint32 enable; /* enable mask */ }; @@ -133,7 +133,7 @@ struct _EEvent { GObject object; struct _EEventPrivate *priv; - char *id; + gchar *id; EEventTarget *target; /* current target during event emission */ }; @@ -156,15 +156,15 @@ struct _EEventClass { GType e_event_get_type(void); -EEvent *e_event_construct(EEvent *, const char *id); +EEvent *e_event_construct(EEvent *, const gchar *id); -void *e_event_add_items(EEvent *emp, GSList *items, EEventItemsFunc freefunc, void *data); -void e_event_remove_items(EEvent *emp, void *handle); +gpointer e_event_add_items(EEvent *emp, GSList *items, EEventItemsFunc freefunc, gpointer data); +void e_event_remove_items(EEvent *emp, gpointer handle); -void e_event_emit(EEvent *, const char *id, EEventTarget *); +void e_event_emit(EEvent *, const gchar *id, EEventTarget *); -void *e_event_target_new(EEvent *, int type, size_t size); -void e_event_target_free(EEvent *, void *); +gpointer e_event_target_new(EEvent *, gint type, size_t size); +void e_event_target_free(EEvent *, gpointer ); /* ********************************************************************** */ diff --git a/e-util/e-folder-map.c b/e-util/e-folder-map.c index d74817ecfe..c77772f289 100644 --- a/e-util/e-folder-map.c +++ b/e-util/e-folder-map.c @@ -41,11 +41,11 @@ #define d(x) static gboolean -is_type_folder (const char *metadata, const char *search_type) +is_type_folder (const gchar *metadata, const gchar *search_type) { xmlNodePtr node; xmlDocPtr doc; - char *type; + gchar *type; doc = e_xml_parse_file (metadata); if (!doc) { @@ -59,7 +59,7 @@ is_type_folder (const char *metadata, const char *search_type) return FALSE; } - if (!node->name || strcmp ((char *)node->name, "efolder") != 0) { + if (!node->name || strcmp ((gchar *)node->name, "efolder") != 0) { g_warning ("`%s' corrupt: root node is not 'efolder'", metadata); xmlFreeDoc (doc); return FALSE; @@ -67,8 +67,8 @@ is_type_folder (const char *metadata, const char *search_type) node = node->children; while (node != NULL) { - if (node->name && !strcmp ((char *)node->name, "type")) { - type = (char *)xmlNodeGetContent (node); + if (node->name && !strcmp ((gchar *)node->name, "type")) { + type = (gchar *)xmlNodeGetContent (node); if (!strcmp (type, search_type)) { xmlFreeDoc (doc); xmlFree (type); @@ -90,10 +90,10 @@ is_type_folder (const char *metadata, const char *search_type) } static void -e_folder_map_dir (const char *dirname, const char *type, GSList **dir_list) +e_folder_map_dir (const gchar *dirname, const gchar *type, GSList **dir_list) { - char *path; - const char *name; + gchar *path; + const gchar *name; GDir *dir; GError *error = NULL; @@ -129,7 +129,7 @@ e_folder_map_dir (const char *dirname, const char *type, GSList **dir_list) } while ((name = g_dir_read_name (dir))) { - char *full_path; + gchar *full_path; if (*name == '.') continue; @@ -152,7 +152,7 @@ e_folder_map_dir (const char *dirname, const char *type, GSList **dir_list) GSList * e_folder_map_local_folders (const gchar *local_dir, const gchar *type) { - const char *name; + const gchar *name; GDir *dir; GSList *dir_list = NULL; GError *error = NULL; @@ -164,7 +164,7 @@ e_folder_map_local_folders (const gchar *local_dir, const gchar *type) } while ((name = g_dir_read_name (dir))) { - char *full_path; + gchar *full_path; if (*name == '.') continue; diff --git a/e-util/e-fsutils.c b/e-util/e-fsutils.c index 27480959c4..335fad4aff 100644 --- a/e-util/e-fsutils.c +++ b/e-util/e-fsutils.c @@ -60,10 +60,10 @@ * Return value: The number of 1024 byte blocks used by the * filesystem. **/ -long e_fsutils_usage(const char *inpath) +long e_fsutils_usage(const gchar *inpath) { GDir *dir; - const char *d; + const gchar *d; long size = 0; GSList *paths; @@ -71,7 +71,7 @@ long e_fsutils_usage(const char *inpath) paths = g_slist_prepend(NULL, g_strdup(inpath)); while (paths) { - char *path = paths->data; + gchar *path = paths->data; paths = g_slist_remove_link(paths, paths); @@ -82,7 +82,7 @@ long e_fsutils_usage(const char *inpath) } while ((d = g_dir_read_name(dir))) { - char *full_path; + gchar *full_path; struct stat st; full_path = g_build_filename(path, d, NULL); @@ -129,7 +129,7 @@ fail: * blocks. **/ long -e_fsutils_avail(const char *path) +e_fsutils_avail(const gchar *path) { #if defined(HAVE_STATVFS) struct statvfs stfs; diff --git a/e-util/e-fsutils.h b/e-util/e-fsutils.h index 76a03f5441..d675b39e80 100644 --- a/e-util/e-fsutils.h +++ b/e-util/e-fsutils.h @@ -27,8 +27,8 @@ G_BEGIN_DECLS -long e_fsutils_usage(const char *path); -long e_fsutils_avail(const char *path); +long e_fsutils_usage(const gchar *path); +long e_fsutils_avail(const gchar *path); G_END_DECLS diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c index 4958f0806e..619cb6599e 100644 --- a/e-util/e-html-utils.c +++ b/e-util/e-html-utils.c @@ -27,11 +27,11 @@ #include "e-html-utils.h" -static char * -check_size (char **buffer, int *buffer_size, char *out, int len) +static gchar * +check_size (gchar **buffer, gint *buffer_size, gchar *out, gint len) { if (out + len + 1> *buffer + *buffer_size) { - int index = out - *buffer; + gint index = out - *buffer; *buffer_size = MAX (index + len + 1, *buffer_size * 2); *buffer = g_realloc (*buffer, *buffer_size); @@ -49,7 +49,7 @@ check_size (char **buffer, int *buffer_size, char *out, int len) * 4 = allowed dns chars * 8 = non-url chars: "| */ -static int special_chars[] = { +static gint special_chars[] = { 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, /* nul - 0x0f */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, /* 0x10 - 0x1f */ 9, 2, 9, 0, 0, 0, 0, 3, 1, 3, 0, 0, 3, 6, 6, 0, /* sp - / */ @@ -68,11 +68,11 @@ static int special_chars[] = { /* (http|https|ftp|nntp)://[^ "|/]+\.([^ "|]*[^ ,.!?;:>)\]}`'"|_-])+ */ /* www\.[A-Za-z0-9.-]+(/([^ "|]*[^ ,.!?;:>)\]}`'"|_-])+) */ -static char * -url_extract (const unsigned char **text, gboolean full_url) +static gchar * +url_extract (const guchar **text, gboolean full_url) { - const unsigned char *end = *text, *p; - char *out; + const guchar *end = *text, *p; + gchar *out; while (*end && is_url_char (*end)) end++; @@ -96,16 +96,16 @@ url_extract (const unsigned char **text, gboolean full_url) return NULL; } - out = g_strndup ((char *)*text, end - *text); + out = g_strndup ((gchar *)*text, end - *text); *text = end; return out; } -static char * -email_address_extract (const unsigned char **cur, char **out, const unsigned char *linestart) +static gchar * +email_address_extract (const guchar **cur, gchar **out, const guchar *linestart) { - const unsigned char *start, *end, *dot; - char *addr; + const guchar *start, *end, *dot; + gchar *addr; /* *cur points to the '@'. Look backward for a valid local-part */ for (start = *cur; start - 1 >= linestart && is_addr_char (*(start - 1)); start--) @@ -130,7 +130,7 @@ email_address_extract (const unsigned char **cur, char **out, const unsigned cha if (dot > end) return NULL; - addr = g_strndup ((char *)start, end - start); + addr = g_strndup ((gchar *)start, end - start); *out -= *cur - start; *cur = end; @@ -138,9 +138,9 @@ email_address_extract (const unsigned char **cur, char **out, const unsigned cha } static gboolean -is_citation (const unsigned char *c, gboolean saw_citation) +is_citation (const guchar *c, gboolean saw_citation) { - const unsigned char *p; + const guchar *p; if (*c != '>') return FALSE; @@ -148,7 +148,7 @@ is_citation (const unsigned char *c, gboolean saw_citation) /* A line that starts with a ">" is a citation, unless it's * just mbox From-mangling... */ - if (strncmp ((const char *)c, ">From ", 6) != 0) + if (strncmp ((const gchar *)c, ">From ", 6) != 0) return TRUE; /* If the previous line was a citation, then say this @@ -158,7 +158,7 @@ is_citation (const unsigned char *c, gboolean saw_citation) return TRUE; /* Same if the next line is */ - p = (const unsigned char *)strchr ((const char *)c, '\n'); + p = (const guchar *)strchr ((const gchar *)c, '\n'); if (p && *++p == '>') return TRUE; @@ -211,13 +211,13 @@ is_citation (const unsigned char *c, gboolean saw_citation) * - E_TEXT_TO_HTML_CITE: quote the text with "> " at the start of each * line. **/ -char * -e_text_to_html_full (const char *input, unsigned int flags, guint32 color) +gchar * +e_text_to_html_full (const gchar *input, guint flags, guint32 color) { - const unsigned char *cur, *next, *linestart; - char *buffer = NULL; - char *out = NULL; - int buffer_size = 0, col; + const guchar *cur, *next, *linestart; + gchar *buffer = NULL; + gchar *out = NULL; + gint buffer_size = 0, col; gboolean colored = FALSE, saw_citation = FALSE; /* Allocate a translation buffer. */ @@ -230,7 +230,7 @@ e_text_to_html_full (const char *input, unsigned int flags, guint32 color) col = 0; - for (cur = linestart = (const unsigned char *)input; cur && *cur; cur = next) { + for (cur = linestart = (const guchar *)input; cur && *cur; cur = next) { gunichar u; if (flags & E_TEXT_TO_HTML_MARK_CITATION && col == 0) { @@ -261,28 +261,28 @@ e_text_to_html_full (const char *input, unsigned int flags, guint32 color) out += sprintf (out, "> "); } - u = g_utf8_get_char ((char *)cur); + u = g_utf8_get_char ((gchar *)cur); if (g_unichar_isalpha (u) && (flags & E_TEXT_TO_HTML_CONVERT_URLS)) { - char *tmpurl = NULL, *refurl = NULL, *dispurl = NULL; - - if (!g_ascii_strncasecmp ((char *)cur, "http://", 7) || - !g_ascii_strncasecmp ((char *)cur, "https://", 8) || - !g_ascii_strncasecmp ((char *)cur, "ftp://", 6) || - !g_ascii_strncasecmp ((char *)cur, "nntp://", 7) || - !g_ascii_strncasecmp ((char *)cur, "mailto:", 7) || - !g_ascii_strncasecmp ((char *)cur, "news:", 5) || - !g_ascii_strncasecmp ((char *)cur, "file:", 5) || - !g_ascii_strncasecmp ((char *)cur, "callto:", 7) || - !g_ascii_strncasecmp ((char *)cur, "h323:", 5) || - !g_ascii_strncasecmp ((char *)cur, "sip:", 4) || - !g_ascii_strncasecmp ((char *)cur, "webcal:", 7)) { + gchar *tmpurl = NULL, *refurl = NULL, *dispurl = NULL; + + if (!g_ascii_strncasecmp ((gchar *)cur, "http://", 7) || + !g_ascii_strncasecmp ((gchar *)cur, "https://", 8) || + !g_ascii_strncasecmp ((gchar *)cur, "ftp://", 6) || + !g_ascii_strncasecmp ((gchar *)cur, "nntp://", 7) || + !g_ascii_strncasecmp ((gchar *)cur, "mailto:", 7) || + !g_ascii_strncasecmp ((gchar *)cur, "news:", 5) || + !g_ascii_strncasecmp ((gchar *)cur, "file:", 5) || + !g_ascii_strncasecmp ((gchar *)cur, "callto:", 7) || + !g_ascii_strncasecmp ((gchar *)cur, "h323:", 5) || + !g_ascii_strncasecmp ((gchar *)cur, "sip:", 4) || + !g_ascii_strncasecmp ((gchar *)cur, "webcal:", 7)) { tmpurl = url_extract (&cur, TRUE); if (tmpurl) { refurl = e_text_to_html (tmpurl, 0); dispurl = g_strdup (refurl); } - } else if (!g_ascii_strncasecmp ((char *)cur, "www.", 4) && + } else if (!g_ascii_strncasecmp ((gchar *)cur, "www.", 4) && is_url_char (*(cur + 4))) { tmpurl = url_extract (&cur, FALSE); if (tmpurl) { @@ -307,11 +307,11 @@ e_text_to_html_full (const char *input, unsigned int flags, guint32 color) if (!*cur) break; - u = g_utf8_get_char ((char *)cur); + u = g_utf8_get_char ((gchar *)cur); } if (u == '@' && (flags & E_TEXT_TO_HTML_CONVERT_ADDRESSES)) { - char *addr, *dispaddr, *outaddr; + gchar *addr, *dispaddr, *outaddr; addr = email_address_extract (&cur, &out, linestart); if (addr) { @@ -327,7 +327,7 @@ e_text_to_html_full (const char *input, unsigned int flags, guint32 color) if (!*cur) break; - u = g_utf8_get_char ((char *)cur); + u = g_utf8_get_char ((gchar *)cur); } } @@ -338,7 +338,7 @@ e_text_to_html_full (const char *input, unsigned int flags, guint32 color) u = *cur; next = cur + 1; } else - next = (const unsigned char *)g_utf8_next_char (cur); + next = (const guchar *)g_utf8_next_char (cur); out = check_size (&buffer, &buffer_size, out, 10); @@ -393,7 +393,7 @@ e_text_to_html_full (const char *input, unsigned int flags, guint32 color) case ' ': if (flags & E_TEXT_TO_HTML_CONVERT_SPACES) { - if (cur == (const unsigned char *)input || + if (cur == (const guchar *)input || *(cur + 1) == ' ' || *(cur + 1) == '\t' || *(cur - 1) == '\n') { strcpy (out, " "); @@ -429,8 +429,8 @@ e_text_to_html_full (const char *input, unsigned int flags, guint32 color) return buffer; } -char * -e_text_to_html (const char *input, unsigned int flags) +gchar * +e_text_to_html (const gchar *input, guint flags) { return e_text_to_html_full (input, flags, 0); } @@ -439,7 +439,7 @@ e_text_to_html (const char *input, unsigned int flags) #ifdef E_HTML_UTILS_TEST struct { - char *text, *url; + gchar *text, *url; } url_tests[] = { { "bob@foo.com", "mailto:bob@foo.com" }, { "Ends with bob@foo.com", "mailto:bob@foo.com" }, @@ -487,13 +487,13 @@ struct { { "Ewwwwww.Gross.", NULL }, }; -int num_url_tests = G_N_ELEMENTS (url_tests); +gint num_url_tests = G_N_ELEMENTS (url_tests); -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { - int i, errors = 0; - char *html, *url, *p; + gint i, errors = 0; + gchar *html, *url, *p; for (i = 0; i < num_url_tests; i++) { html = e_text_to_html (url_tests[i].text, E_TEXT_TO_HTML_CONVERT_URLS | E_TEXT_TO_HTML_CONVERT_ADDRESSES); diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h index 55e67ba915..f87e82f9b1 100644 --- a/e-util/e-html-utils.h +++ b/e-util/e-html-utils.h @@ -34,7 +34,7 @@ #define E_TEXT_TO_HTML_ESCAPE_8BIT (1 << 6) #define E_TEXT_TO_HTML_CITE (1 << 7) -char *e_text_to_html_full (const char *input, unsigned int flags, guint32 color); -char *e_text_to_html (const char *input, unsigned int flags); +gchar *e_text_to_html_full (const gchar *input, guint flags, guint32 color); +gchar *e_text_to_html (const gchar *input, guint flags); #endif /* __E_HTML_UTILS__ */ diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 5b1cd2f9bd..dddd4fa431 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -44,7 +44,7 @@ #define d(x) typedef struct { - char *name; + gchar *name; GdkPixbuf *pixbuf; } Icon; @@ -58,7 +58,7 @@ static GStaticMutex mutex = G_STATIC_MUTEX_INIT; /* Note: takes ownership of the pixbufs (eg. does not ref them) */ static Icon * -icon_new (const char *name, GdkPixbuf *pixbuf) +icon_new (const gchar *name, GdkPixbuf *pixbuf) { Icon *icon; @@ -79,10 +79,10 @@ icon_free (Icon *icon) } static Icon * -load_icon (const char *icon_key, const char *icon_name, int size, int scale) +load_icon (const gchar *icon_key, const gchar *icon_name, gint size, gint scale) { GdkPixbuf *pixbuf, *unscaled = NULL; - char *basename, *filename = NULL; + gchar *basename, *filename = NULL; if (g_path_is_absolute (icon_name)) filename = g_strdup (icon_name); @@ -100,10 +100,10 @@ load_icon (const char *icon_key, const char *icon_name, int size, int scale) if (!filename || !(unscaled = gdk_pixbuf_new_from_file (filename, NULL))) { if (scale) { - const char *dent; - int width; + const gchar *dent; + gint width; GDir *dir; - char *x; + gchar *x; if (!(dir = g_dir_open (EVOLUTION_ICONSDIR, 0, NULL))) { goto done; @@ -203,9 +203,9 @@ e_icon_factory_init (void) G_CALLBACK (icon_theme_changed_cb), NULL); broken16_pixbuf = gdk_pixbuf_new_from_xpm_data ( - (const char **) broken_image_16_xpm); + (const gchar **) broken_image_16_xpm); broken24_pixbuf = gdk_pixbuf_new_from_xpm_data ( - (const char **) broken_image_24_xpm); + (const gchar **) broken_image_24_xpm); } /** @@ -281,9 +281,9 @@ e_icon_factory_get_icon (const gchar *icon_name, GtkIconSize icon_size) { GdkPixbuf *pixbuf; - char *icon_key; + gchar *icon_key; Icon *icon; - int size, width, height; + gint size, width, height; g_return_val_if_fail (icon_name != NULL, NULL); @@ -325,7 +325,7 @@ e_icon_factory_get_icon (const gchar *icon_name, * @return Scaled pixbuf. **/ GdkPixbuf * -e_icon_factory_pixbuf_scale (GdkPixbuf *pixbuf, int width, int height) +e_icon_factory_pixbuf_scale (GdkPixbuf *pixbuf, gint width, gint height) { g_return_val_if_fail (pixbuf != NULL, NULL); diff --git a/e-util/e-import.c b/e-util/e-import.c index ccc44d7daa..84c8a24605 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -46,11 +46,11 @@ struct _EImportImporters { EImportImporter *importer; EImportImporterFunc free; - void *data; + gpointer data; }; struct _EImportPrivate { - int dummy; + gint dummy; }; static GObjectClass *ep_parent; @@ -149,14 +149,14 @@ e_import_get_type(void) * * Return value: @ep is returned. **/ -EImport *e_import_construct(EImport *ep, const char *id) +EImport *e_import_construct(EImport *ep, const gchar *id) { ep->id = g_strdup(id); return ep; } -EImport *e_import_new(const char *id) +EImport *e_import_new(const gchar *id) { EImport *ei = g_object_new(e_import_get_type(), NULL); @@ -180,7 +180,7 @@ EImport *e_import_new(const char *id) * When complete, the @done callback will be called. **/ void -e_import_import(EImport *ei, EImportTarget *t, EImportImporter *im, EImportStatusFunc status, EImportCompleteFunc done, void *data) +e_import_import(EImport *ei, EImportTarget *t, EImportImporter *im, EImportStatusFunc status, EImportCompleteFunc done, gpointer data) { g_return_if_fail(im != NULL); g_return_if_fail(im != NULL); @@ -234,7 +234,7 @@ void e_import_complete(EImport *ei, EImportTarget *target) ei->done(ei, ei->done_data); } -void e_import_status(EImport *ei, EImportTarget *target, const char *what, int pc) +void e_import_status(EImport *ei, EImportTarget *target, const gchar *what, gint pc) { if (ei->status) ei->status(ei, what, pc, ei->done_data); @@ -285,7 +285,7 @@ e_import_get_importers(EImport *emp, EImportTarget *target) * **/ void -e_import_class_add_importer(EImportClass *klass, EImportImporter *importer, EImportImporterFunc freefunc, void *data) +e_import_class_add_importer(EImportClass *klass, EImportImporter *importer, EImportImporterFunc freefunc, gpointer data) { struct _EImportImporters *node, *ei, *en; @@ -337,7 +337,7 @@ void e_import_class_remove_importer(EImportClass *klass, EImportImporter *f) * Allocate a new import target suitable for this class. Implementing * classes will define the actual content of the target. **/ -void *e_import_target_new(EImport *ep, int type, size_t size) +gpointer e_import_target_new(EImport *ep, gint type, size_t size) { EImportTarget *t; @@ -364,14 +364,14 @@ void *e_import_target_new(EImport *ep, int type, size_t size) * free custom targets. **/ void -e_import_target_free(EImport *ep, void *o) +e_import_target_free(EImport *ep, gpointer o) { EImportTarget *t = o; ((EImportClass *)G_OBJECT_GET_CLASS(ep))->target_free(ep, t); } -EImportTargetURI *e_import_target_new_uri(EImport *ei, const char *suri, const char *duri) +EImportTargetURI *e_import_target_new_uri(EImport *ei, const gchar *suri, const gchar *duri) { EImportTargetURI *t = e_import_target_new(ei, E_IMPORT_TARGET_URI, sizeof(*t)); @@ -381,7 +381,7 @@ EImportTargetURI *e_import_target_new_uri(EImport *ei, const char *suri, const c return t; } -EImportTargetHome *e_import_target_new_home(EImport *ei, const char *home) +EImportTargetHome *e_import_target_new_home(EImport *ei, const gchar *home) { EImportTargetHome *t = e_import_target_new(ei, E_IMPORT_TARGET_HOME, sizeof(*t)); @@ -417,7 +417,7 @@ EImportTargetHome *e_import_target_new_home(EImport *ei, const char *home) */ -static void *emph_parent_class; +static gpointer emph_parent_class; #define emph ((EImportHook *)eph) static const EImportHookTargetMask eih_no_masks[] = { @@ -463,7 +463,7 @@ static void eih_cancel(EImport *ei, EImportTarget *target, EImportImporter *im) } static void -eih_free_importer(EImportImporter *im, void *data) +eih_free_importer(EImportImporter *im, gpointer data) { EImportHookImporter *ihook = (EImportHookImporter *)im; @@ -479,12 +479,12 @@ emph_construct_importer(EPluginHook *eph, xmlNodePtr root) struct _EImportHookImporter *item; EImportHookTargetMap *map; EImportHookClass *klass = (EImportHookClass *)G_OBJECT_GET_CLASS(eph); - char *tmp; + gchar *tmp; d(printf(" loading import item\n")); item = g_malloc0(sizeof(*item)); - tmp = (char *)xmlGetProp(root, (const unsigned char *)"target"); + tmp = (gchar *)xmlGetProp(root, (const guchar *)"target"); if (tmp == NULL) goto error; map = g_hash_table_lookup(klass->target_map, tmp); @@ -535,7 +535,7 @@ emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) node = root->children; while (node) { - if (strcmp((char *)node->name, "importer") == 0) { + if (strcmp((gchar *)node->name, "importer") == 0) { struct _EImportHookImporter *ihook; ihook = emph_construct_importer(eph, node); @@ -565,7 +565,7 @@ emph_finalise(GObject *o) static void emph_class_init(EPluginHookClass *klass) { - int i; + gint i; ((GObjectClass *)klass)->finalize = emph_finalise; klass->construct = emph_construct; @@ -626,5 +626,5 @@ e_import_hook_get_type(void) **/ void e_import_hook_class_add_target_map(EImportHookClass *klass, const EImportHookTargetMap *map) { - g_hash_table_insert(klass->target_map, (void *)map->type, (void *)map); + g_hash_table_insert(klass->target_map, (gpointer)map->type, (gpointer)map); } diff --git a/e-util/e-import.h b/e-util/e-import.h index 4ca1ef1829..760544667d 100644 --- a/e-util/e-import.h +++ b/e-util/e-import.h @@ -44,11 +44,11 @@ typedef struct _EImportImporter EImportImporter; typedef struct _EImportFactory EImportFactory; typedef struct _EImportTarget EImportTarget; -typedef void (*EImportCompleteFunc)(EImport *ei, void *data); -typedef void (*EImportStatusFunc)(EImport *ei, const char *what, int pc, void *data); +typedef void (*EImportCompleteFunc)(EImport *ei, gpointer data); +typedef void (*EImportStatusFunc)(EImport *ei, const gchar *what, gint pc, gpointer data); -typedef void (*EImportFactoryFunc)(EImport *ei, void *data); -typedef void (*EImportImporterFunc)(EImportImporter *importer, void *data); +typedef void (*EImportFactoryFunc)(EImport *ei, gpointer data); +typedef void (*EImportImporterFunc)(EImportImporter *importer, gpointer data); typedef gboolean (*EImportSupportedFunc)(EImport *ei, EImportTarget *, EImportImporter *im); typedef struct _GtkWidget *(*EImportWidgetFunc)(EImport *ei, EImportTarget *, EImportImporter *im); typedef void (*EImportImportFunc)(EImport *ei, EImportTarget *, EImportImporter *im); @@ -75,18 +75,18 @@ enum _e_import_target_t { struct _EImportImporter { enum _e_import_target_t type; - int pri; + gint pri; EImportSupportedFunc supported; EImportWidgetFunc get_widget; EImportImportFunc import; EImportImportFunc cancel; - void *user_data; + gpointer user_data; /* ?? */ - char *name; - char *description; + gchar *name; + gchar *description; }; /** @@ -117,14 +117,14 @@ typedef struct _EImportTargetHome EImportTargetHome; struct _EImportTargetURI { struct _EImportTarget target; - char *uri_src; - char *uri_dest; + gchar *uri_src; + gchar *uri_dest; }; struct _EImportTargetHome { struct _EImportTarget target; - char *homedir; + gchar *homedir; }; /** @@ -140,11 +140,11 @@ struct _EImportTargetHome { struct _EImport { GObject object; - char *id; + gchar *id; EImportStatusFunc status; EImportCompleteFunc done; - void *done_data; + gpointer done_data; }; /** @@ -170,29 +170,29 @@ struct _EImportClass { GType e_import_get_type(void); -EImport *e_import_new(const char *id); +EImport *e_import_new(const gchar *id); /* Static class methods */ -void e_import_class_add_importer(EImportClass *klass, EImportImporter *importer, EImportImporterFunc freefunc, void *data); +void e_import_class_add_importer(EImportClass *klass, EImportImporter *importer, EImportImporterFunc freefunc, gpointer data); void e_import_class_remove_importer(EImportClass *klass, EImportImporter *f); GSList *e_import_get_importers(EImport *emp, EImportTarget *target); -EImport *e_import_construct(EImport *, const char *id); +EImport *e_import_construct(EImport *, const gchar *id); -void e_import_import(EImport *ei, EImportTarget *, EImportImporter *, EImportStatusFunc status, EImportCompleteFunc done, void *data); +void e_import_import(EImport *ei, EImportTarget *, EImportImporter *, EImportStatusFunc status, EImportCompleteFunc done, gpointer data); void e_import_cancel(EImport *, EImportTarget *, EImportImporter *); struct _GtkWidget *e_import_get_widget(EImport *ei, EImportTarget *, EImportImporter *); -void e_import_status(EImport *, EImportTarget *, const char *what, int pc); +void e_import_status(EImport *, EImportTarget *, const gchar *what, gint pc); void e_import_complete(EImport *, EImportTarget *); -void *e_import_target_new(EImport *ep, int type, size_t size); -void e_import_target_free(EImport *ep, void *o); +gpointer e_import_target_new(EImport *ep, gint type, size_t size); +void e_import_target_free(EImport *ep, gpointer o); -EImportTargetURI *e_import_target_new_uri(EImport *ei, const char *suri, const char *duri); -EImportTargetHome *e_import_target_new_home(EImport *ei, const char *home); +EImportTargetURI *e_import_target_new_uri(EImport *ei, const gchar *suri, const gchar *duri); +EImportTargetHome *e_import_target_new_home(EImport *ei, const gchar *home); /* ********************************************************************** */ @@ -216,10 +216,10 @@ struct _EImportHookImporter { /* user_data == EImportHook */ - char *supported; - char *get_widget; - char *import; - char *cancel; + gchar *supported; + gchar *get_widget; + gchar *import; + gchar *cancel; }; /** diff --git a/e-util/e-menu.c b/e-util/e-menu.c index e5472d6bbc..4687e97fb1 100644 --- a/e-util/e-menu.c +++ b/e-util/e-menu.c @@ -42,9 +42,9 @@ struct _EMenuFactory { struct _EMenuFactory *next, *prev; - char *menuid; + gchar *menuid; EMenuFactoryFunc factory; - void *factory_data; + gpointer factory_data; }; struct _item_node { @@ -64,7 +64,7 @@ struct _menu_node { GSList *pixmaps; EMenuItemsFunc freefunc; - void *data; + gpointer data; /* a copy of items wrapped in an item_node, for bonobo * callback mapping */ @@ -183,7 +183,7 @@ e_menu_get_type(void) * * Return value: Returns @em. **/ -EMenu *e_menu_construct(EMenu *em, const char *menuid) +EMenu *e_menu_construct(EMenu *em, const gchar *menuid) { struct _EMenuFactory *f; EMenuClass *klass; @@ -232,8 +232,8 @@ EMenu *e_menu_construct(EMenu *em, const char *menuid) * * Return value: A handle that can be passed to remove_items as required. **/ -void * -e_menu_add_items(EMenu *emp, GSList *items, GSList *uifiles, GSList *pixmaps, EMenuItemsFunc freefunc, void *data) +gpointer +e_menu_add_items(EMenu *emp, GSList *items, GSList *uifiles, GSList *pixmaps, EMenuItemsFunc freefunc, gpointer data) { struct _menu_node *node; GSList *l; @@ -276,7 +276,7 @@ e_menu_add_items(EMenu *emp, GSList *items, GSList *uifiles, GSList *pixmaps, EM /* FIXME: add the menu's to a running menu if it is there? */ - return (void *)node; + return (gpointer)node; } /** @@ -287,7 +287,7 @@ e_menu_add_items(EMenu *emp, GSList *items, GSList *uifiles, GSList *pixmaps, EM * Remove menu items previously added. **/ void -e_menu_remove_items(EMenu *emp, void *handle) +e_menu_remove_items(EMenu *emp, gpointer handle) { struct _menu_node *node = handle; struct _item_node *inode; @@ -318,7 +318,7 @@ e_menu_remove_items(EMenu *emp, void *handle) } static void -em_activate_toggle(BonoboUIComponent *component, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +em_activate_toggle(BonoboUIComponent *component, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data) { struct _item_node *inode = data; @@ -329,7 +329,7 @@ em_activate_toggle(BonoboUIComponent *component, const char *path, Bonobo_UIComp } static void -em_activate(BonoboUIComponent *uic, void *data, const char *cname) +em_activate(BonoboUIComponent *uic, gpointer data, const gchar *cname) { struct _item_node *inode = data; @@ -350,7 +350,7 @@ em_activate(BonoboUIComponent *uic, void *data, const char *cname) * This should always be called in the strict sequence of activate, then * deactivate, repeated any number of times. **/ -void e_menu_activate(EMenu *em, struct _BonoboUIComponent *uic, int act) +void e_menu_activate(EMenu *em, struct _BonoboUIComponent *uic, gint act) { struct _EMenuPrivate *p = em->priv; struct _menu_node *mw; @@ -358,7 +358,7 @@ void e_menu_activate(EMenu *em, struct _BonoboUIComponent *uic, int act) if (act) { GArray *verbs; - int i; + gint i; em->uic = uic; @@ -432,7 +432,7 @@ void e_menu_activate(EMenu *em, struct _BonoboUIComponent *uic, int act) * This is used by the owner of the menu and view to update the menu * system based on user input or changed system state. **/ -void e_menu_update_target(EMenu *em, void *tp) +void e_menu_update_target(EMenu *em, gpointer tp) { struct _EMenuPrivate *p = em->priv; EMenuTarget *t = tp; @@ -457,7 +457,7 @@ void e_menu_update_target(EMenu *em, void *tp) for (mw = (struct _menu_node *)p->menus.head;mw->next;mw=mw->next) { for (l = mw->items;l;l=g_slist_next(l)) { EMenuItem *item = l->data; - int state; + gint state; d(printf("checking item '%s' mask %08x against target %08x\n", item->verb, item->enable, mask)); @@ -487,7 +487,7 @@ void e_menu_update_target(EMenu *em, void *tp) * Return value: A handle to the factory. **/ EMenuFactory * -e_menu_class_add_factory(EMenuClass *klass, const char *menuid, EMenuFactoryFunc func, void *data) +e_menu_class_add_factory(EMenuClass *klass, const gchar *menuid, EMenuFactoryFunc func, gpointer data) { struct _EMenuFactory *f = g_malloc0(sizeof(*f)); @@ -538,7 +538,7 @@ e_menu_class_remove_factory(EMenuClass *klass, EMenuFactory *f) * to specify the actual target size, which may vary depending on the * implementing class. **/ -void *e_menu_target_new(EMenu *ep, int type, size_t size) +gpointer e_menu_target_new(EMenu *ep, gint type, size_t size) { EMenuTarget *t; @@ -563,7 +563,7 @@ void *e_menu_target_new(EMenu *ep, int type, size_t size) * Free a target. **/ void -e_menu_target_free(EMenu *ep, void *o) +e_menu_target_free(EMenu *ep, gpointer o) { EMenuTarget *t = o; @@ -601,7 +601,7 @@ e_menu_target_free(EMenu *ep, void *o) */ -static void *emph_parent_class; +static gpointer emph_parent_class; #define emph ((EMenuHook *)eph) /* must have 1:1 correspondence with e-menu types in order */ @@ -624,28 +624,28 @@ static const EPluginHookTargetKey emph_pixmap_sizes[] = { }; static void -emph_menu_activate(EMenu *em, EMenuItem *item, void *data) +emph_menu_activate(EMenu *em, EMenuItem *item, gpointer data) { EMenuHook *hook = data; - d(printf("invoking plugin hook '%s' %p\n", (char *)item->user_data, em->target)); + d(printf("invoking plugin hook '%s' %p\n", (gchar *)item->user_data, em->target)); e_plugin_invoke(hook->hook.plugin, item->user_data, em->target); } static void -emph_menu_toggle_activate(EMenu *em, EMenuItem *item, int state, void *data) +emph_menu_toggle_activate(EMenu *em, EMenuItem *item, gint state, gpointer data) { EMenuHook *hook = data; /* FIXME: where does the toggle state go? */ - d(printf("invoking plugin hook '%s' %p\n", (char *)item->user_data, em->target)); + d(printf("invoking plugin hook '%s' %p\n", (gchar *)item->user_data, em->target)); e_plugin_invoke(hook->hook.plugin, item->user_data, em->target); } static void -emph_menu_factory(EMenu *emp, void *data) +emph_menu_factory(EMenu *emp, gpointer data) { struct _EMenuHookMenu *menu = data; @@ -754,13 +754,13 @@ emph_construct_menu(EPluginHook *eph, xmlNodePtr root) xmlNodePtr node; EMenuHookTargetMap *map; EMenuHookClass *klass = (EMenuHookClass *)G_OBJECT_GET_CLASS(eph); - char *tmp; + gchar *tmp; d(printf(" loading menu\n")); menu = g_malloc0(sizeof(*menu)); menu->hook = (EMenuHook *)eph; - tmp = (char *)xmlGetProp(root, (const unsigned char *)"target"); + tmp = (gchar *)xmlGetProp(root, (const guchar *)"target"); if (tmp == NULL) goto error; map = g_hash_table_lookup(klass->target_map, tmp); @@ -777,14 +777,14 @@ emph_construct_menu(EPluginHook *eph, xmlNodePtr root) } node = root->children; while (node) { - if (0 == strcmp((char *)node->name, "item")) { + if (0 == strcmp((gchar *)node->name, "item")) { struct _EMenuItem *item; item = emph_construct_item(eph, menu, node, map); if (item) menu->items = g_slist_append(menu->items, item); - } else if (0 == strcmp((char *)node->name, "ui")) { - tmp = (char *)xmlGetProp(node, (const unsigned char *)"file"); + } else if (0 == strcmp((gchar *)node->name, "ui")) { + tmp = (gchar *)xmlGetProp(node, (const guchar *)"file"); if (tmp) { EMenuUIFile *ui = g_malloc0(sizeof(*ui)); @@ -792,7 +792,7 @@ emph_construct_menu(EPluginHook *eph, xmlNodePtr root) xmlFree(tmp); #ifdef G_OS_WIN32 { - char *mapped_location = + gchar *mapped_location = e_util_replace_prefix (EVOLUTION_PREFIX, e_util_get_prefix (), ui->filename); @@ -804,7 +804,7 @@ emph_construct_menu(EPluginHook *eph, xmlNodePtr root) ui->appname = g_strdup("Evolution"); menu->uis = g_slist_append(menu->uis, ui); } - } else if (0 == strcmp((char *)node->name, "pixmap")) { + } else if (0 == strcmp((gchar *)node->name, "pixmap")) { struct _EMenuPixmap *pixmap; pixmap = emph_construct_pixmap(eph, menu, node); @@ -839,7 +839,7 @@ emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) node = root->children; while (node) { - if (strcmp((char *)node->name, "menu") == 0) { + if (strcmp((gchar *)node->name, "menu") == 0) { struct _EMenuHookMenu *menu; menu = emph_construct_menu(eph, node); @@ -921,5 +921,5 @@ e_menu_hook_get_type(void) **/ void e_menu_hook_class_add_target_map(EMenuHookClass *klass, const EMenuHookTargetMap *map) { - g_hash_table_insert(klass->target_map, (void *)map->type, (void *)map); + g_hash_table_insert(klass->target_map, (gpointer)map->type, (gpointer)map); } diff --git a/e-util/e-menu.h b/e-util/e-menu.h index 5df8f11b28..42e03572ae 100644 --- a/e-util/e-menu.h +++ b/e-util/e-menu.h @@ -47,10 +47,10 @@ typedef struct _EMenuPixmap EMenuPixmap; typedef struct _EMenuFactory EMenuFactory; /* anonymous type */ typedef struct _EMenuTarget EMenuTarget; -typedef void (*EMenuFactoryFunc)(EMenu *emp, void *data); -typedef void (*EMenuActivateFunc)(EMenu *, EMenuItem *, void *data); -typedef void (*EMenuToggleActivateFunc)(EMenu *, EMenuItem *, int state, void *data); -typedef void (*EMenuItemsFunc)(EMenu *, GSList *items, GSList *uifiles, GSList *pixmaps, void *data); +typedef void (*EMenuFactoryFunc)(EMenu *emp, gpointer data); +typedef void (*EMenuActivateFunc)(EMenu *, EMenuItem *, gpointer data); +typedef void (*EMenuToggleActivateFunc)(EMenu *, EMenuItem *, gint state, gpointer data); +typedef void (*EMenuItemsFunc)(EMenu *, GSList *items, GSList *uifiles, GSList *pixmaps, gpointer data); /** * enum _e_menu_t - Menu item type. @@ -90,10 +90,10 @@ enum _e_menu_t { **/ struct _EMenuItem { enum _e_menu_t type; - char *path; /* full path? can we just create it from verb? */ - char *verb; /* command verb */ + gchar *path; /* full path? can we just create it from verb? */ + gchar *verb; /* command verb */ GCallback activate; /* depends on type, the bonobo activate callback */ - void *user_data; /* up to caller to use */ + gpointer user_data; /* up to caller to use */ guint32 visible; /* is visible mask */ guint32 enable; /* is enable mask */ }; @@ -112,10 +112,10 @@ struct _EMenuItem { * supplied separately from the menu definition. **/ struct _EMenuPixmap { - char *command; - char *name; - int size; - char *pixmap; + gchar *command; + gchar *name; + gint size; + gchar *pixmap; }; /** @@ -129,9 +129,9 @@ struct _EMenuPixmap { * the menu is activated. **/ struct _EMenuUIFile { - char *appdir; - char *appname; - char *filename; + gchar *appdir; + gchar *appname; + gchar *filename; }; /** @@ -178,7 +178,7 @@ struct _EMenu { GObject object; struct _EMenuPrivate *priv; - char *menuid; + gchar *menuid; struct _BonoboUIComponent *uic; EMenuTarget *target; }; @@ -208,22 +208,22 @@ struct _EMenuClass { GType e_menu_get_type(void); /* Static class methods */ -EMenuFactory *e_menu_class_add_factory(EMenuClass *klass, const char *menuid, EMenuFactoryFunc func, void *data); +EMenuFactory *e_menu_class_add_factory(EMenuClass *klass, const gchar *menuid, EMenuFactoryFunc func, gpointer data); void e_menu_class_remove_factory(EMenuClass *klass, EMenuFactory *f); -EMenu *e_menu_construct(EMenu *menu, const char *menuid); +EMenu *e_menu_construct(EMenu *menu, const gchar *menuid); -void e_menu_add_ui(EMenu *, const char *appdir, const char *appname, const char *filename); -void e_menu_add_pixmap(EMenu *, const char *cmd, const char *name, int size); +void e_menu_add_ui(EMenu *, const gchar *appdir, const gchar *appname, const gchar *filename); +void e_menu_add_pixmap(EMenu *, const gchar *cmd, const gchar *name, gint size); -void *e_menu_add_items(EMenu *emp, GSList *items, GSList *uifiles, GSList *pixmaps, EMenuItemsFunc freefunc, void *data); -void e_menu_remove_items(EMenu *emp, void *handle); +gpointer e_menu_add_items(EMenu *emp, GSList *items, GSList *uifiles, GSList *pixmaps, EMenuItemsFunc freefunc, gpointer data); +void e_menu_remove_items(EMenu *emp, gpointer handle); -void e_menu_activate(EMenu *, struct _BonoboUIComponent *uic, int act); -void e_menu_update_target(EMenu *, void *); +void e_menu_activate(EMenu *, struct _BonoboUIComponent *uic, gint act); +void e_menu_update_target(EMenu *, gpointer ); -void *e_menu_target_new(EMenu *, int type, size_t size); -void e_menu_target_free(EMenu *, void *); +gpointer e_menu_target_new(EMenu *, gint type, size_t size); +void e_menu_target_free(EMenu *, gpointer ); /* ********************************************************************** */ @@ -263,8 +263,8 @@ typedef void (*EMenuHookFunc)(struct _EPlugin *plugin, EMenuTarget *target); **/ struct _EMenuHookMenu { struct _EMenuHook *hook; /* parent pointer */ - char *id; /* target menu id for these menu items */ - int target_type; /* target type, not used */ + gchar *id; /* target menu id for these menu items */ + gint target_type; /* target type, not used */ GSList *items; /* items to add to menu */ GSList *uis; /* ui files */ GSList *pixmaps; /* pixmap descriptors */ diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c index 682563907c..0044b2e085 100644 --- a/e-util/e-mktemp.c +++ b/e-util/e-mktemp.c @@ -51,14 +51,14 @@ #define TEMP_SCAN (60) static int -expire_dir_rec(const char *base, time_t now) +expire_dir_rec(const gchar *base, time_t now) { GDir *dir; - const char *d; + const gchar *d; GString *path; size_t len; struct stat st; - int count = 0; + gint count = 0; d(printf("expire dir '%s'\n", base)); @@ -109,7 +109,7 @@ get_dir (gboolean make) static time_t last = 0; #ifdef TEMP_HOME - char *tmpdir = NULL; + gchar *tmpdir = NULL; tmpdir = g_build_filename(e_get_user_data_dir (), "cache", "tmp", NULL); path = g_string_new(tmpdir); @@ -122,7 +122,7 @@ get_dir (gboolean make) path = g_string_new("/tmp/evolution-"); g_string_append_printf (path, "%d", (int) getuid ()); if (make) { - int ret; + gint ret; /* shoot now, ask questions later */ ret = g_mkdir (path->str, S_IRWXU); @@ -163,11 +163,11 @@ get_dir (gboolean make) return path; } -char * -e_mktemp (const char *template) +gchar * +e_mktemp (const gchar *template) { GString *path; - char *ret; + gchar *ret; path = get_dir (TRUE); if (!path) @@ -186,11 +186,11 @@ e_mktemp (const char *template) } -int -e_mkstemp (const char *template) +gint +e_mkstemp (const gchar *template) { GString *path; - int fd; + gint fd; path = get_dir (TRUE); if (!path) @@ -209,11 +209,11 @@ e_mkstemp (const char *template) } -char * -e_mkdtemp (const char *template) +gchar * +e_mkdtemp (const gchar *template) { GString *path; - char *tmpdir; + gchar *tmpdir; path = get_dir (TRUE); if (!path) diff --git a/e-util/e-mktemp.h b/e-util/e-mktemp.h index 01dbd18119..c9b1d55b18 100644 --- a/e-util/e-mktemp.h +++ b/e-util/e-mktemp.h @@ -24,10 +24,10 @@ #ifndef __E_MKTEMP_H__ #define __E_MKTEMP_H__ -char *e_mktemp (const char *template); +gchar *e_mktemp (const gchar *template); -int e_mkstemp (const char *template); +gint e_mkstemp (const gchar *template); -char *e_mkdtemp (const char *template); +gchar *e_mkdtemp (const gchar *template); #endif /* __E_MKTEMP_H__ */ diff --git a/e-util/e-non-intrusive-error-dialog.c b/e-util/e-non-intrusive-error-dialog.c index bb24a2360e..9e874524e4 100644 --- a/e-util/e-non-intrusive-error-dialog.c +++ b/e-util/e-non-intrusive-error-dialog.c @@ -89,7 +89,7 @@ eni_render_date (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) { time_t t; - char sdt[100]; /* Should be sufficient? */ + gchar sdt[100]; /* Should be sufficient? */ gtk_tree_model_get (model, iter, COL_TIME, &t, -1); strftime (sdt, 100, "%x %X", localtime (&t)); @@ -97,9 +97,9 @@ eni_render_date (GtkTreeViewColumn *column, GtkCellRenderer *renderer, } static void -eni_append_logs (const char *txt, GtkListStore *store) +eni_append_logs (const gchar *txt, GtkListStore *store) { - char **str; + gchar **str; str = g_strsplit (txt, ":", 3); if (str[0] && str[1] && str[2]) { @@ -119,7 +119,7 @@ eni_append_logs (const char *txt, GtkListStore *store) } static guint -eni_config_get_error_level (const char *path) +eni_config_get_error_level (const gchar *path) { GConfClient *gconf_client; guint error_level; @@ -132,7 +132,7 @@ eni_config_get_error_level (const char *path) } guint -eni_config_get_error_timeout (const char *path) +eni_config_get_error_timeout (const gchar *path) { GConfClient *gconf_client; guint error_time; @@ -145,14 +145,14 @@ eni_config_get_error_timeout (const char *path) } static void -eni_error_timeout_changed (GtkSpinButton *b, void *data) +eni_error_timeout_changed (GtkSpinButton *b, gpointer data) { GConfClient *gconf_client; - int value = gtk_spin_button_get_value_as_int (b); + gint value = gtk_spin_button_get_value_as_int (b); gconf_client = gconf_client_get_default (); - gconf_client_set_int (gconf_client, (char *) data, value, NULL); + gconf_client_set_int (gconf_client, (gchar *) data, value, NULL); g_object_unref (gconf_client); } @@ -160,17 +160,17 @@ static void eni_error_level_value_changed (GtkComboBox *w, gpointer *data) { GConfClient *gconf_client; - int value = gtk_combo_box_get_active (w); + gint value = gtk_combo_box_get_active (w); gconf_client = gconf_client_get_default (); - gconf_client_set_int (gconf_client, (char *) data, value, NULL); + gconf_client_set_int (gconf_client, (gchar *) data, value, NULL); g_object_unref (gconf_client); } void -eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, const char *error_level_path) +eni_show_logger(ELogger *logger, GtkWidget *top,const gchar *error_timeout_path, const gchar *error_level_path) { GtkWidget *container; GtkWidget *label; @@ -181,7 +181,7 @@ eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, GtkListStore *store; GtkCellRenderer *renderer; GtkTreeViewColumn *column; - int i; + gint i; toplevel = gtk_widget_get_toplevel (top); diff --git a/e-util/e-non-intrusive-error-dialog.h b/e-util/e-non-intrusive-error-dialog.h index 827e17f868..7b93ba1098 100644 --- a/e-util/e-non-intrusive-error-dialog.h +++ b/e-util/e-non-intrusive-error-dialog.h @@ -50,11 +50,11 @@ enum }; /* eni - error non intrusive*/ -guint eni_config_get_error_timeout (const char *path); +guint eni_config_get_error_timeout (const gchar *path); void eni_show_logger (ELogger *logger, GtkWidget *widget, - const char *error_timeout_path, - const char *error_level_path); + const gchar *error_timeout_path, + const gchar *error_level_path); G_END_DECLS diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c index b2338ccead..80eb361027 100644 --- a/e-util/e-pilot-map.c +++ b/e-util/e-pilot-map.c @@ -34,7 +34,7 @@ typedef struct { - char *uid; + gchar *uid; gboolean archived; gboolean touched; } EPilotMapPidNode; @@ -53,9 +53,9 @@ typedef struct } EPilotMapWriteData; static void -real_e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived, gboolean touch) +real_e_pilot_map_insert (EPilotMap *map, guint32 pid, const gchar *uid, gboolean archived, gboolean touch) { - char *new_uid; + gchar *new_uid; guint32 *new_pid; EPilotMapPidNode *pnode; EPilotMapUidNode *unode; @@ -92,35 +92,35 @@ real_e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean } static void -map_set_node_timet (xmlNodePtr node, const char *name, time_t t) +map_set_node_timet (xmlNodePtr node, const gchar *name, time_t t) { - char *tstring; + gchar *tstring; tstring = g_strdup_printf ("%ld", t); - xmlSetProp (node, (unsigned char *)name, (unsigned char *)tstring); + xmlSetProp (node, (guchar *)name, (guchar *)tstring); g_free (tstring); } static void -map_sax_start_element (void *data, const xmlChar *name, +map_sax_start_element (gpointer data, const xmlChar *name, const xmlChar **attrs) { EPilotMap *map = (EPilotMap *)data; - if (!strcmp ((char *)name, "PilotMap")) { + if (!strcmp ((gchar *)name, "PilotMap")) { while (attrs && *attrs != NULL) { const xmlChar **val = attrs; val++; - if (!strcmp ((char *)*attrs, "timestamp")) - map->since = (time_t)strtoul ((char *)*val, NULL, 0); + if (!strcmp ((gchar *)*attrs, "timestamp")) + map->since = (time_t)strtoul ((gchar *)*val, NULL, 0); attrs = ++val; } } - if (!strcmp ((char *)name, "map")) { - const char *uid = NULL; + if (!strcmp ((gchar *)name, "map")) { + const gchar *uid = NULL; guint32 pid = 0; gboolean archived = FALSE; @@ -128,14 +128,14 @@ map_sax_start_element (void *data, const xmlChar *name, const xmlChar **val = attrs; val++; - if (!strcmp ((char *)*attrs, "uid")) - uid = (char *)*val; + if (!strcmp ((gchar *)*attrs, "uid")) + uid = (gchar *)*val; - if (!strcmp ((char *)*attrs, "pilot_id")) - pid = strtoul ((char *)*val, NULL, 0); + if (!strcmp ((gchar *)*attrs, "pilot_id")) + pid = strtoul ((gchar *)*val, NULL, 0); - if (!strcmp ((char *)*attrs, "archived")) - archived = strtoul ((char *)*val, NULL, 0)== 1 ? TRUE : FALSE; + if (!strcmp ((gchar *)*attrs, "archived")) + archived = strtoul ((gchar *)*val, NULL, 0)== 1 ? TRUE : FALSE; attrs = ++val; } @@ -152,25 +152,25 @@ map_write_foreach (gpointer key, gpointer value, gpointer data) { EPilotMapWriteData *wd = data; xmlNodePtr root = wd->root; - char *uid = key; + gchar *uid = key; EPilotMapUidNode *unode = value; xmlNodePtr mnode; if (wd->touched_only && !unode->touched) return; - mnode = xmlNewChild (root, NULL, (const unsigned char *)"map", NULL); - xmlSetProp (mnode, (const unsigned char *)"uid", (unsigned char *)uid); + mnode = xmlNewChild (root, NULL, (const guchar *)"map", NULL); + xmlSetProp (mnode, (const guchar *)"uid", (guchar *)uid); if (unode->archived) { - xmlSetProp (mnode, (const unsigned char *)"archived", (const unsigned char *)"1"); + xmlSetProp (mnode, (const guchar *)"archived", (const guchar *)"1"); } else { - char *pidstr; + gchar *pidstr; pidstr = g_strdup_printf ("%d", unode->pid); - xmlSetProp (mnode, (const unsigned char *)"pilot_id", (unsigned char *)pidstr); + xmlSetProp (mnode, (const guchar *)"pilot_id", (guchar *)pidstr); g_free (pidstr); - xmlSetProp (mnode, (const unsigned char *)"archived", (const unsigned char *)"0"); + xmlSetProp (mnode, (const guchar *)"archived", (const guchar *)"0"); } } @@ -190,7 +190,7 @@ e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid) } gboolean -e_pilot_map_uid_is_archived (EPilotMap *map, const char *uid) +e_pilot_map_uid_is_archived (EPilotMap *map, const gchar *uid) { EPilotMapUidNode *unode; @@ -206,7 +206,7 @@ e_pilot_map_uid_is_archived (EPilotMap *map, const char *uid) } void -e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived) +e_pilot_map_insert (EPilotMap *map, guint32 pid, const gchar *uid, gboolean archived) { EPilotMapPidNode *pnode; EPilotMapUidNode *unode; @@ -250,7 +250,7 @@ e_pilot_map_remove_by_pid (EPilotMap *map, guint32 pid) } void -e_pilot_map_remove_by_uid (EPilotMap *map, const char *uid) +e_pilot_map_remove_by_uid (EPilotMap *map, const gchar *uid) { EPilotMapPidNode *pnode; EPilotMapUidNode *unode; @@ -270,7 +270,7 @@ e_pilot_map_remove_by_uid (EPilotMap *map, const char *uid) guint32 -e_pilot_map_lookup_pid (EPilotMap *map, const char *uid, gboolean touch) +e_pilot_map_lookup_pid (EPilotMap *map, const gchar *uid, gboolean touch) { EPilotMapUidNode *unode = NULL; @@ -294,7 +294,7 @@ e_pilot_map_lookup_pid (EPilotMap *map, const char *uid, gboolean touch) return unode->pid; } -const char * +const gchar * e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid, gboolean touch) { EPilotMapPidNode *pnode = NULL; @@ -319,8 +319,8 @@ e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid, gboolean touch) return pnode->uid; } -int -e_pilot_map_read (const char *filename, EPilotMap **map) +gint +e_pilot_map_read (const gchar *filename, EPilotMap **map) { xmlSAXHandler handler; EPilotMap *new_map; @@ -357,22 +357,22 @@ e_pilot_map_read (const char *filename, EPilotMap **map) return 0; } -int -e_pilot_map_write (const char *filename, EPilotMap *map) +gint +e_pilot_map_write (const gchar *filename, EPilotMap *map) { EPilotMapWriteData wd; xmlDocPtr doc; - int ret; + gint ret; g_return_val_if_fail (filename != NULL, -1); g_return_val_if_fail (map != NULL, -1); - doc = xmlNewDoc ((const unsigned char *)"1.0"); + doc = xmlNewDoc ((const guchar *)"1.0"); if (doc == NULL) { g_warning ("Pilot map file could not be created\n"); return -1; } - xmlDocSetRootElement (doc, xmlNewDocNode(doc, NULL, (const unsigned char *)"PilotMap", NULL)); + xmlDocSetRootElement (doc, xmlNewDocNode(doc, NULL, (const guchar *)"PilotMap", NULL)); map->since = time (NULL); map_set_node_timet (xmlDocGetRootElement (doc), "timestamp", map->since); diff --git a/e-util/e-pilot-map.h b/e-util/e-pilot-map.h index 46eaf54199..32bcc942bf 100644 --- a/e-util/e-pilot-map.h +++ b/e-util/e-pilot-map.h @@ -41,17 +41,17 @@ struct _EPilotMap }; gboolean e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid); -gboolean e_pilot_map_uid_is_archived (EPilotMap *map, const char *uid); +gboolean e_pilot_map_uid_is_archived (EPilotMap *map, const gchar *uid); -void e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived); +void e_pilot_map_insert (EPilotMap *map, guint32 pid, const gchar *uid, gboolean archived); void e_pilot_map_remove_by_pid (EPilotMap *map, guint32 pid); -void e_pilot_map_remove_by_uid (EPilotMap *map, const char *uid); +void e_pilot_map_remove_by_uid (EPilotMap *map, const gchar *uid); -guint32 e_pilot_map_lookup_pid (EPilotMap *map, const char *uid, gboolean touch); -const char * e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid, gboolean touch); +guint32 e_pilot_map_lookup_pid (EPilotMap *map, const gchar *uid, gboolean touch); +const gchar * e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid, gboolean touch); -int e_pilot_map_read (const char *filename, EPilotMap **map); -int e_pilot_map_write (const char *filename, EPilotMap *map); +gint e_pilot_map_read (const gchar *filename, EPilotMap **map); +gint e_pilot_map_write (const gchar *filename, EPilotMap *map); void e_pilot_map_clear (EPilotMap *map); diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c index 582c9458e1..94c86a1084 100644 --- a/e-util/e-pilot-util.c +++ b/e-util/e-pilot-util.c @@ -30,11 +30,11 @@ #include "e-pilot-util.h" -char * -e_pilot_utf8_to_pchar (const char *string) +gchar * +e_pilot_utf8_to_pchar (const gchar *string) { - char *pstring = NULL; - int res; + gchar *pstring = NULL; + gint res; if (!string) return NULL; @@ -47,11 +47,11 @@ e_pilot_utf8_to_pchar (const char *string) return pstring; } -char * -e_pilot_utf8_from_pchar (const char *string) +gchar * +e_pilot_utf8_from_pchar (const gchar *string) { - char *ustring = NULL; - int res; + gchar *ustring = NULL; + gint res; if (!string) return NULL; diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h index 0d7aebbd87..476320c58b 100644 --- a/e-util/e-pilot-util.h +++ b/e-util/e-pilot-util.h @@ -29,8 +29,8 @@ #ifndef E_PILOT_UTIL_H #define E_PILOT_UTIL_H -char *e_pilot_utf8_to_pchar (const char *string); -char *e_pilot_utf8_from_pchar (const char *string); +gchar *e_pilot_utf8_to_pchar (const gchar *string); +gchar *e_pilot_utf8_from_pchar (const gchar *string); ESource *e_pilot_get_sync_source (ESourceList *source_list); void e_pilot_set_sync_source (ESourceList *source_list, ESource *source); diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index 7516fb3f09..61cf2c5e9f 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -88,7 +88,7 @@ struct _plugin_doc { struct _plugin_doc *next; struct _plugin_doc *prev; - char *filename; + gchar *filename; xmlDocPtr doc; GSList *plugin_hooks; /* EPlugin objects with pending hooks */ @@ -101,14 +101,14 @@ enum { }; static gboolean -ep_check_enabled (const char *id) +ep_check_enabled (const gchar *id) { /* Return TRUE if 'id' is NOT in the disabled list. */ return !g_slist_find_custom (ep_disabled, id, (GCompareFunc) strcmp); } static void -ep_set_enabled (const char *id, int state) +ep_set_enabled (const gchar *id, gint state) { /* Bail out if no change to state, when expressed as a boolean: */ if ((state == 0) == (ep_check_enabled(id) == 0)) @@ -135,14 +135,14 @@ static int ep_construct (EPlugin *ep, xmlNodePtr root) { xmlNodePtr node; - int res = -1; - char *localedir; + gint res = -1; + gchar *localedir; ep->domain = e_plugin_xml_prop(root, "domain"); if (ep->domain && (localedir = e_plugin_xml_prop(root, "localedir"))) { #ifdef G_OS_WIN32 - char *mapped_localedir = + gchar *mapped_localedir = e_util_replace_prefix (EVOLUTION_PREFIX, e_util_get_prefix (), localedir); @@ -159,10 +159,10 @@ ep_construct (EPlugin *ep, xmlNodePtr root) node = root->children; while (node) { - if (strcmp((char *)node->name, "hook") == 0) { + if (strcmp((gchar *)node->name, "hook") == 0) { struct _EPluginHook *hook; EPluginHookClass *type; - char *class = e_plugin_xml_prop(node, "class"); + gchar *class = e_plugin_xml_prop(node, "class"); if (class == NULL) { g_warning("Plugin '%s' load failed in '%s', missing class property for hook", ep->id, ep->path); @@ -198,11 +198,11 @@ ep_construct (EPlugin *ep, xmlNodePtr root) g_hash_table_insert (ep_plugins_pending_hooks, oldclass, l); ep->hooks_pending = g_slist_prepend (ep->hooks_pending, node); } - } else if (strcmp((char *)node->name, "description") == 0) { + } else if (strcmp((gchar *)node->name, "description") == 0) { ep->description = e_plugin_xml_content_domain(node, ep->domain); - } else if (strcmp((char *)node->name, "author") == 0) { - char *name = e_plugin_xml_prop(node, "name"); - char *email = e_plugin_xml_prop(node, "email"); + } else if (strcmp((gchar *)node->name, "author") == 0) { + gchar *name = e_plugin_xml_prop(node, "name"); + gchar *email = e_plugin_xml_prop(node, "email"); if (name || email) { EPluginAuthor *epa = g_malloc0(sizeof(*epa)); @@ -220,7 +220,7 @@ fail: } static void -ep_enable (EPlugin *ep, int state) +ep_enable (EPlugin *ep, gint state) { GSList *iter; @@ -331,7 +331,7 @@ e_plugin_get_type (void) static GType type = 0; if (G_UNLIKELY (type == 0)) { - char *path, *col, *p; + gchar *path, *col, *p; static const GTypeInfo type_info = { sizeof (EPluginClass), @@ -375,7 +375,7 @@ e_plugin_get_type (void) static EPlugin * ep_load_plugin(xmlNodePtr root, struct _plugin_doc *pdoc) { - char *prop, *id; + gchar *prop, *id; EPluginClass *class; EPlugin *ep; @@ -391,7 +391,7 @@ ep_load_plugin(xmlNodePtr root, struct _plugin_doc *pdoc) return NULL; } - prop = (char *)xmlGetProp(root, (const unsigned char *)"type"); + prop = (gchar *)xmlGetProp(root, (const guchar *)"type"); if (prop == NULL) { g_free(id); g_warning("Invalid e-plugin entry in '%s': no type", pdoc->filename); @@ -421,13 +421,13 @@ ep_load_plugin(xmlNodePtr root, struct _plugin_doc *pdoc) } static int -ep_load(const char *filename, int load_level) +ep_load(const gchar *filename, gint load_level) { xmlDocPtr doc; xmlNodePtr root; - int res = -1; + gint res = -1; EPlugin *ep = NULL; - int cache = FALSE; + gint cache = FALSE; struct _plugin_doc *pdoc; doc = e_xml_parse_file (filename); @@ -435,7 +435,7 @@ ep_load(const char *filename, int load_level) return -1; root = xmlDocGetRootElement(doc); - if (strcmp((char *)root->name, "e-plugin-list") != 0) { + if (strcmp((gchar *)root->name, "e-plugin-list") != 0) { g_warning("No root element: %s", filename); xmlFreeDoc(doc); return -1; @@ -446,8 +446,8 @@ ep_load(const char *filename, int load_level) pdoc->filename = g_strdup(filename); for (root = root->children; root ; root = root->next) { - if (strcmp((char *)root->name, "e-plugin") == 0) { - char *plugin_load_level, *is_system_plugin; + if (strcmp((gchar *)root->name, "e-plugin") == 0) { + gchar *plugin_load_level, *is_system_plugin; plugin_load_level = NULL; plugin_load_level = e_plugin_xml_prop (root, "load_level"); @@ -506,7 +506,7 @@ ep_load(const char *filename, int load_level) static int ep_load_pending(EPlugin *ep, EPluginHookClass *type) { - int res = 0; + gint res = 0; GSList *l, *p; phd(printf("New hook type registered '%s', loading pending hooks on plugin '%s'\n", type->id, ep->id)); @@ -516,7 +516,7 @@ ep_load_pending(EPlugin *ep, EPluginHookClass *type) while (l) { GSList *n = l->next; xmlNodePtr node = l->data; - char *class = (char *)xmlGetProp(node, (const unsigned char *)"class"); + gchar *class = (gchar *)xmlGetProp(node, (const guchar *)"class"); EPluginHook *hook; phd(printf(" checking pending hook '%s'\n", class?class:"")); @@ -569,7 +569,7 @@ ep_load_pending(EPlugin *ep, EPluginHookClass *type) * Plugin definitions are XML files ending in the extension ".eplug". **/ void -e_plugin_add_load_path(const char *path) +e_plugin_add_load_path(const gchar *path) { ep_path = g_slist_append(ep_path, g_strdup(path)); } @@ -582,11 +582,11 @@ e_plugin_add_load_path(const char *path) * * Return value: Returns -1 if an error occurred. **/ -int +gint e_plugin_load_plugins(void) { GSList *l; - int i; + gint i; if (ep_types == NULL) { g_warning("no plugin types defined"); @@ -596,8 +596,8 @@ e_plugin_load_plugins(void) for (i=0; i < 3; i++) { for (l = ep_path;l;l = g_slist_next(l)) { GDir *dir; - const char *d; - char *path = l->data; + const gchar *d; + gchar *path = l->data; pd(printf("scanning plugin dir '%s'\n", path)); @@ -609,7 +609,7 @@ e_plugin_load_plugins(void) while ( (d = g_dir_read_name(dir)) ) { if (g_str_has_suffix (d, ".eplug")) { - char * name = g_build_filename(path, d, NULL); + gchar * name = g_build_filename(path, d, NULL); ep_load(name, i); g_free(name); @@ -649,7 +649,7 @@ e_plugin_register_type(GType type) pd(printf("register plugin type '%s'\n", class->type)); - g_hash_table_insert(ep_types, (void *)class->type, class); + g_hash_table_insert(ep_types, (gpointer)class->type, class); /* check for pending plugins */ pdoc = (struct _plugin_doc *)ep_plugin_docs.head; @@ -660,9 +660,9 @@ e_plugin_register_type(GType type) for (l=pdoc->plugins;l;l=g_slist_next(l)) { xmlNodePtr root = l->data; - char *prop_type; + gchar *prop_type; - prop_type = (char *)xmlGetProp(root, (const unsigned char *)"type"); + prop_type = (gchar *)xmlGetProp(root, (const guchar *)"type"); if (!strcmp(prop_type, class->type)) add = g_slist_append(add, l->data); xmlFree(prop_type); @@ -688,7 +688,7 @@ e_plugin_register_type(GType type) } static void -ep_list_plugin(void *key, void *val, void *dat) +ep_list_plugin(gpointer key, gpointer val, gpointer dat) { GSList **l = (GSList **)dat; @@ -725,7 +725,7 @@ e_plugin_list_plugins(void) * * Return value: The return from the construct virtual method. **/ -int +gint e_plugin_construct(EPlugin *ep, xmlNodePtr root) { EPluginClass *class; @@ -751,8 +751,8 @@ e_plugin_construct(EPlugin *ep, xmlNodePtr root) * * Return value: The return of the plugin invocation. **/ -void * -e_plugin_invoke(EPlugin *ep, const char *name, void *data) +gpointer +e_plugin_invoke(EPlugin *ep, const gchar *name, gpointer data) { EPluginClass *class; @@ -778,8 +778,8 @@ e_plugin_invoke(EPlugin *ep, const char *name, void *data) * * Return value: the symbol value, or %NULL if not found **/ -void * -e_plugin_get_symbol(EPlugin *ep, const char *name) +gpointer +e_plugin_get_symbol(EPlugin *ep, const gchar *name) { EPluginClass *class; @@ -801,7 +801,7 @@ e_plugin_get_symbol(EPlugin *ep, const char *name) * THIS IS NOT FULLY IMPLEMENTED YET **/ void -e_plugin_enable(EPlugin *ep, int state) +e_plugin_enable(EPlugin *ep, gint state) { EPluginClass *class; @@ -852,15 +852,15 @@ e_plugin_get_configure_widget (EPlugin *ep) * Return value: The property, allocated in GLib memory, or NULL if no * such property exists. **/ -char * -e_plugin_xml_prop(xmlNodePtr node, const char *id) +gchar * +e_plugin_xml_prop(xmlNodePtr node, const gchar *id) { - char *p = (char *)xmlGetProp(node, (const unsigned char *)id); + gchar *p = (gchar *)xmlGetProp(node, (const guchar *)id); if (g_mem_is_system_malloc()) { return p; } else { - char * out = g_strdup(p); + gchar * out = g_strdup(p); if (p) xmlFree(p); @@ -880,12 +880,12 @@ e_plugin_xml_prop(xmlNodePtr node, const char *id) * Return value: The property, allocated in GLib memory, or NULL if no * such property exists. **/ -char * -e_plugin_xml_prop_domain(xmlNodePtr node, const char *id, const char *domain) +gchar * +e_plugin_xml_prop_domain(xmlNodePtr node, const gchar *id, const gchar *domain) { - char *p, *out; + gchar *p, *out; - p = (char *)xmlGetProp(node, (const unsigned char *)id); + p = (gchar *)xmlGetProp(node, (const guchar *)id); if (p == NULL) return NULL; @@ -908,10 +908,10 @@ e_plugin_xml_prop_domain(xmlNodePtr node, const char *id, const char *domain) * * Return value: The value if set, or @def if not. **/ -int -e_plugin_xml_int(xmlNodePtr node, const char *id, int def) +gint +e_plugin_xml_int(xmlNodePtr node, const gchar *id, gint def) { - char *p = (char *)xmlGetProp(node, (const unsigned char *)id); + gchar *p = (gchar *)xmlGetProp(node, (const guchar *)id); if (p) return atoi(p); @@ -929,15 +929,15 @@ e_plugin_xml_int(xmlNodePtr node, const char *id, int def) * * Return value: The node content, allocated in GLib memory. **/ -char * +gchar * e_plugin_xml_content(xmlNodePtr node) { - char *p = (char *)xmlNodeGetContent(node); + gchar *p = (gchar *)xmlNodeGetContent(node); if (g_mem_is_system_malloc()) { return p; } else { - char * out = g_strdup(p); + gchar * out = g_strdup(p); if (p) xmlFree(p); @@ -956,12 +956,12 @@ e_plugin_xml_content(xmlNodePtr node) * * Return value: The node content, allocated in GLib memory. **/ -char * -e_plugin_xml_content_domain(xmlNodePtr node, const char *domain) +gchar * +e_plugin_xml_content_domain(xmlNodePtr node, const gchar *domain) { - char *p, *out; + gchar *p, *out; - p = (char *)xmlNodeGetContent(node); + p = (gchar *)xmlNodeGetContent(node); if (p == NULL) return NULL; @@ -1005,7 +1005,7 @@ epl_loadmodule(EPlugin *ep, gboolean fatal) return -1; } - if (g_module_symbol(epl->module, "e_plugin_lib_enable", (void *)&enable)) { + if (g_module_symbol(epl->module, "e_plugin_lib_enable", (gpointer)&enable)) { if (enable(epl, TRUE) != 0) { ep->enabled = FALSE; g_module_close(epl->module); @@ -1033,8 +1033,8 @@ e_plugin_load_plugins_with_missing_symbols (void) missing_symbols = NULL; } -static void * -epl_invoke(EPlugin *ep, const char *name, void *data) +static gpointer +epl_invoke(EPlugin *ep, const gchar *name, gpointer data) { EPluginLib *epl = E_PLUGIN_LIB (ep); EPluginLibFunc cb; @@ -1047,7 +1047,7 @@ epl_invoke(EPlugin *ep, const char *name, void *data) if (epl_loadmodule(ep, FALSE) != 0) return NULL; - if (!g_module_symbol(epl->module, name, (void *)&cb)) { + if (!g_module_symbol(epl->module, name, (gpointer)&cb)) { g_warning("Cannot resolve symbol '%s' in plugin '%s' (not exported?)", name, epl->location); return NULL; } @@ -1055,7 +1055,7 @@ epl_invoke(EPlugin *ep, const char *name, void *data) return cb(epl, data); } -static void * +static gpointer epl_get_symbol(EPlugin *ep, const gchar *name) { EPluginLib *epl = E_PLUGIN_LIB (ep); @@ -1086,7 +1086,7 @@ epl_construct(EPlugin *ep, xmlNodePtr root) } #ifdef G_OS_WIN32 { - char *mapped_location = + gchar *mapped_location = e_util_replace_prefix (EVOLUTION_PREFIX, e_util_get_prefix (), epl->location); @@ -1098,9 +1098,9 @@ epl_construct(EPlugin *ep, xmlNodePtr root) if (ep->enabled) { xmlChar *tmp; - tmp = xmlGetProp(root, (const unsigned char *)"load-on-startup"); + tmp = xmlGetProp(root, (const guchar *)"load-on-startup"); if (tmp) { - if (strcmp ((const char *)tmp, "after-ui") == 0) { + if (strcmp ((const gchar *)tmp, "after-ui") == 0) { missing_symbols = g_list_prepend (missing_symbols, g_object_ref (ep)); } else { if (epl_loadmodule(ep, FALSE) != 0) { @@ -1128,7 +1128,7 @@ epl_get_configure_widget (EPlugin *ep) return NULL; } - if (g_module_symbol (epl->module, "e_plugin_lib_get_configure_widget", (void *)&get_configure_widget)) { + if (g_module_symbol (epl->module, "e_plugin_lib_get_configure_widget", (gpointer)&get_configure_widget)) { pd (printf ("\n g_module_symbol is loaded\n")); return (GtkWidget*) get_configure_widget (epl); } @@ -1136,7 +1136,7 @@ epl_get_configure_widget (EPlugin *ep) } static void -epl_enable(EPlugin *ep, int state) +epl_enable(EPlugin *ep, gint state) { EPluginLib *epl = E_PLUGIN_LIB (ep); EPluginLibEnableFunc enable; @@ -1151,7 +1151,7 @@ epl_enable(EPlugin *ep, int state) if (epl_loadmodule(ep, FALSE) != 0) return; - if (g_module_symbol(epl->module, "e_plugin_lib_enable", (void *)&enable)) { + if (g_module_symbol(epl->module, "e_plugin_lib_enable", (gpointer)&enable)) { if (enable(epl, state) != 0) return; } @@ -1243,7 +1243,7 @@ eph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) } static void -eph_enable(EPluginHook *eph, int state) +eph_enable(EPluginHook *eph, gint state) { /* NOOP */ } @@ -1302,7 +1302,7 @@ e_plugin_hook_get_type(void) * THIS IS NOT FULY IMEPLEMENTED YET **/ void -e_plugin_hook_enable (EPluginHook *eph, int state) +e_plugin_hook_enable (EPluginHook *eph, gint state) { EPluginHookClass *class; @@ -1336,7 +1336,7 @@ e_plugin_hook_register_type(GType type) klass = g_type_class_ref(type); - oldklass = g_hash_table_lookup(eph_types, (void *)klass->id); + oldklass = g_hash_table_lookup(eph_types, (gpointer)klass->id); if (oldklass == klass) { g_type_class_unref(klass); return; @@ -1346,7 +1346,7 @@ e_plugin_hook_register_type(GType type) } phd(printf("register plugin hook type '%s'\n", klass->id)); - g_hash_table_insert(eph_types, (void *)klass->id, klass); + g_hash_table_insert(eph_types, (gpointer)klass->id, klass); /* if we've already loaded a plugin that needed this hook but it didn't exist, re-load it now */ @@ -1371,7 +1371,7 @@ e_plugin_hook_register_type(GType type) ndoc = pdoc->next; while (ndoc) { if (pdoc->doc) { - int cache = pdoc->plugins != NULL; + gint cache = pdoc->plugins != NULL; for (l=pdoc->plugin_hooks;!cache && l;l=g_slist_next(l)) cache |= (((EPlugin *)l->data)->hooks_pending != NULL); @@ -1407,12 +1407,12 @@ e_plugin_hook_register_type(GType type) * integer values of the corresponding string id's stored in the @map. **/ guint32 -e_plugin_hook_mask(xmlNodePtr root, const struct _EPluginHookTargetKey *map, const char *prop) +e_plugin_hook_mask(xmlNodePtr root, const struct _EPluginHookTargetKey *map, const gchar *prop) { - char *val, *p, *start, c; + gchar *val, *p, *start, c; guint32 mask = 0; - val = (char *)xmlGetProp(root, (const unsigned char *)prop); + val = (gchar *)xmlGetProp(root, (const guchar *)prop); if (val == NULL) return 0; @@ -1424,7 +1424,7 @@ e_plugin_hook_mask(xmlNodePtr root, const struct _EPluginHookTargetKey *map, con c = *p; *p = 0; if (start != p) { - int i; + gint i; for (i=0;map[i].key;i++) { if (!strcmp(map[i].key, start)) { @@ -1458,12 +1458,12 @@ e_plugin_hook_mask(xmlNodePtr root, const struct _EPluginHookTargetKey *map, con * integer value, if not, then ~0. **/ guint32 -e_plugin_hook_id(xmlNodePtr root, const struct _EPluginHookTargetKey *map, const char *prop) +e_plugin_hook_id(xmlNodePtr root, const struct _EPluginHookTargetKey *map, const gchar *prop) { - char *val; - int i; + gchar *val; + gint i; - val = (char *)xmlGetProp(root, (const unsigned char *)prop); + val = (gchar *)xmlGetProp(root, (const guchar *)prop); if (val == NULL) return ~0; @@ -1485,7 +1485,7 @@ e_plugin_hook_id(xmlNodePtr root, const struct _EPluginHookTargetKey *map, const static gpointer epth_parent_class; static int -epth_load_plugin(void *d) +epth_load_plugin(gpointer d) { EPluginHook *eph = d; EPluginTypeHook *epth = d; @@ -1513,7 +1513,7 @@ epth_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) node = root->children; while (node) { - if (strcmp((char *)node->name, "plugin-type") == 0) { + if (strcmp((gchar *)node->name, "plugin-type") == 0) { epth->get_type = e_plugin_xml_prop(node, "get-type"); /* We need to run this in an idle handler, * since at this point the parent EPlugin wont diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h index 54855d0b95..64f4ccd2e5 100644 --- a/e-util/e-plugin.h +++ b/e-util/e-plugin.h @@ -54,8 +54,8 @@ typedef struct _EPluginClass EPluginClass; /* Structure to define the author(s) names and addresses */ typedef struct _EPluginAuthor EPluginAuthor; struct _EPluginAuthor { - char *name; - char *email; + gchar *name; + gchar *email; }; /** @@ -80,13 +80,13 @@ struct _EPluginAuthor { struct _EPlugin { GObject object; - char *id; - char *path; + gchar *id; + gchar *path; GSList *hooks_pending; - char *description; - char *name; - char *domain; + gchar *description; + gchar *name; + gchar *domain; GSList *hooks; GSList *authors; /* EPluginAuthor structures */ @@ -120,38 +120,38 @@ struct _EPlugin { struct _EPluginClass { GObjectClass parent_class; - const char *type; + const gchar *type; - int (*construct)(EPlugin *, xmlNodePtr root); - void *(*get_symbol)(EPlugin *, const char *name); - void *(*invoke)(EPlugin *, const char *name, void *data); - void (*enable)(EPlugin *, int state); + gint (*construct)(EPlugin *, xmlNodePtr root); + gpointer (*get_symbol)(EPlugin *, const gchar *name); + gpointer (*invoke)(EPlugin *, const gchar *name, gpointer data); + void (*enable)(EPlugin *, gint state); GtkWidget *(*get_configure_widget)(EPlugin *); }; GType e_plugin_get_type(void); -int e_plugin_construct(EPlugin *ep, xmlNodePtr root); -void e_plugin_add_load_path(const char *); -int e_plugin_load_plugins(void); +gint e_plugin_construct(EPlugin *ep, xmlNodePtr root); +void e_plugin_add_load_path(const gchar *); +gint e_plugin_load_plugins(void); void e_plugin_load_plugins_with_missing_symbols(void); GSList * e_plugin_list_plugins(void); void e_plugin_register_type(GType type); -void *e_plugin_get_symbol(EPlugin *ep, const char *name); -void *e_plugin_invoke(EPlugin *ep, const char *name, void *data); -void e_plugin_enable(EPlugin *eph, int state); +gpointer e_plugin_get_symbol(EPlugin *ep, const gchar *name); +gpointer e_plugin_invoke(EPlugin *ep, const gchar *name, gpointer data); +void e_plugin_enable(EPlugin *eph, gint state); GtkWidget *e_plugin_get_configure_widget (EPlugin *ep); /* static helpers */ /* maps prop or content to 'g memory' */ -char *e_plugin_xml_prop(xmlNodePtr node, const char *id); -char *e_plugin_xml_prop_domain(xmlNodePtr node, const char *id, const char *domain); -int e_plugin_xml_int(xmlNodePtr node, const char *id, int def); -char *e_plugin_xml_content(xmlNodePtr node); -char *e_plugin_xml_content_domain(xmlNodePtr node, const char *domain); +gchar *e_plugin_xml_prop(xmlNodePtr node, const gchar *id); +gchar *e_plugin_xml_prop_domain(xmlNodePtr node, const gchar *id, const gchar *domain); +gint e_plugin_xml_int(xmlNodePtr node, const gchar *id, gint def); +gchar *e_plugin_xml_content(xmlNodePtr node); +gchar *e_plugin_xml_content_domain(xmlNodePtr node, const gchar *domain); /* ********************************************************************** */ #include @@ -179,12 +179,12 @@ typedef struct _EPluginLib EPluginLib; typedef struct _EPluginLibClass EPluginLibClass; /* The callback signature used for epluginlib methods */ -typedef void *(*EPluginLibFunc)(EPluginLib *ep, void *data); +typedef gpointer (*EPluginLibFunc)(EPluginLib *ep, gpointer data); /* The setup method, this will be called when the plugin is * initialised. In the future it may also be called when the plugin * is disabled. */ -typedef int (*EPluginLibEnableFunc)(EPluginLib *ep, int enable); -typedef void *(*EPluginLibGetConfigureWidgetFunc)(EPluginLib *ep); +typedef gint (*EPluginLibEnableFunc)(EPluginLib *ep, gint enable); +typedef gpointer (*EPluginLibGetConfigureWidgetFunc)(EPluginLib *ep); /** * struct _EPluginLib - @@ -203,7 +203,7 @@ typedef void *(*EPluginLibGetConfigureWidgetFunc)(EPluginLib *ep); struct _EPluginLib { EPlugin plugin; - char *location; + gchar *location; GModule *module; }; @@ -258,7 +258,7 @@ typedef struct _EPluginHookTargetKey EPluginHookTargetKey; * helper functions to simplify plugin hook subclassing. **/ struct _EPluginHookTargetKey { - const char *key; + const gchar *key; guint32 value; }; @@ -275,8 +275,8 @@ struct _EPluginHookTargetKey { * when reading the XML plugin hook definitions. **/ struct _EPluginHookTargetMap { - const char *type; - int id; + const gchar *type; + gint id; const struct _EPluginHookTargetKey *mask_bits; /* null terminated array */ }; @@ -315,10 +315,10 @@ struct _EPluginHook { struct _EPluginHookClass { GObjectClass parent_class; - const char *id; + const gchar *id; - int (*construct)(EPluginHook *eph, EPlugin *ep, xmlNodePtr root); - void (*enable)(EPluginHook *eph, int state); + gint (*construct)(EPluginHook *eph, EPlugin *ep, xmlNodePtr root); + void (*enable)(EPluginHook *eph, gint state); }; GType e_plugin_hook_get_type(void); @@ -326,11 +326,11 @@ GType e_plugin_hook_get_type(void); void e_plugin_hook_register_type(GType type); EPluginHook * e_plugin_hook_new(EPlugin *ep, xmlNodePtr root); -void e_plugin_hook_enable(EPluginHook *eph, int state); +void e_plugin_hook_enable(EPluginHook *eph, gint state); /* static methods */ -guint32 e_plugin_hook_mask(xmlNodePtr root, const struct _EPluginHookTargetKey *map, const char *prop); -guint32 e_plugin_hook_id(xmlNodePtr root, const struct _EPluginHookTargetKey *map, const char *prop); +guint32 e_plugin_hook_mask(xmlNodePtr root, const struct _EPluginHookTargetKey *map, const gchar *prop); +guint32 e_plugin_hook_id(xmlNodePtr root, const struct _EPluginHookTargetKey *map, const gchar *prop); /* ********************************************************************** */ @@ -365,7 +365,7 @@ typedef struct _EPluginTypeHookClass EPluginTypeHookClass; struct _EPluginTypeHook { EPluginHook hook; - char *get_type; + gchar *get_type; guint idle; }; diff --git a/e-util/e-popup.c b/e-util/e-popup.c index bcd152713c..9bb63748dd 100644 --- a/e-util/e-popup.c +++ b/e-util/e-popup.c @@ -38,9 +38,9 @@ struct _EPopupFactory { struct _EPopupFactory *next, *prev; - char *menuid; + gchar *menuid; EPopupFactoryFunc factory; - void *factory_data; + gpointer factory_data; }; /* Used for the "activate" signal callback data to re-map to the api */ @@ -63,9 +63,9 @@ struct _menu_node { EPopup *popup; GSList *menu; - char *domain; + gchar *domain; EPopupItemsFunc freefunc; - void *data; + gpointer data; struct _item_node *items; }; @@ -188,7 +188,7 @@ e_popup_get_type(void) * * Return value: A new EPopup. **/ -EPopup *e_popup_new(const char *menuid) +EPopup *e_popup_new(const gchar *menuid) { EPopup *ep = g_object_new(e_popup_get_type(), NULL); @@ -206,7 +206,7 @@ EPopup *e_popup_new(const char *menuid) * * Return value: Returns @ep. **/ -EPopup *e_popup_construct(EPopup *ep, const char *menuid) +EPopup *e_popup_construct(EPopup *ep, const gchar *menuid) { ep->menuid = g_strdup(menuid); @@ -229,7 +229,7 @@ EPopup *e_popup_construct(EPopup *ep, const char *menuid) * built to create a complex heirarchy of menus. **/ void -e_popup_add_items(EPopup *emp, GSList *items, const char *domain, EPopupItemsFunc freefunc, void *data) +e_popup_add_items(EPopup *emp, GSList *items, const gchar *domain, EPopupItemsFunc freefunc, gpointer data) { struct _menu_node *node; @@ -264,10 +264,10 @@ ep_add_static_items(EPopup *emp) } static int -ep_cmp(const void *ap, const void *bp) +ep_cmp(gconstpointer ap, gconstpointer bp) { - struct _item_node *a = *((void **)ap); - struct _item_node *b = *((void **)bp); + struct _item_node *a = *((gpointer *)ap); + struct _item_node *b = *((gpointer *)bp); return strcmp(a->item->path, b->item->path); } @@ -375,7 +375,7 @@ ep_build_tree(struct _item_node *inode, guint32 mask) gtk_widget_show (item->image); break; case E_POPUP_RADIO: { - char *ppath = inode->parent?inode->parent->item->path:NULL; + gchar *ppath = inode->parent?inode->parent->item->path:NULL; menuitem = (GtkMenuItem *)gtk_radio_menu_item_new(g_hash_table_lookup(group_hash, ppath)); g_hash_table_insert(group_hash, ppath, gtk_radio_menu_item_get_group((GtkRadioMenuItem *)menuitem)); @@ -459,7 +459,7 @@ e_popup_create_menu(EPopup *emp, EPopupTarget *target, guint32 mask) GString *ppath = g_string_new(""); GHashTable *tree_hash = g_hash_table_new(g_str_hash, g_str_equal); EDList head = E_DLIST_INITIALISER(head); - int i; + gint i; emp->target = target; ep_add_static_items(emp); @@ -510,7 +510,7 @@ e_popup_create_menu(EPopup *emp, EPopupTarget *target, guint32 mask) struct _item_node *inode = items->pdata[i], *pnode; struct _item_node *nextnode = (i + 1 < items->len) ? items->pdata[i+1] : NULL; struct _EPopupItem *item = inode->item; - const char *tmp; + const gchar *tmp; if (nextnode && !strcmp (nextnode->item->path, item->path)) { d(printf ("skipping item %s\n", item->path)); @@ -607,7 +607,7 @@ e_popup_create_menu_once(EPopup *emp, EPopupTarget *target, guint32 mask) * it later. **/ EPopupFactory * -e_popup_class_add_factory(EPopupClass *klass, const char *menuid, EPopupFactoryFunc func, void *data) +e_popup_class_add_factory(EPopupClass *klass, const gchar *menuid, EPopupFactoryFunc func, gpointer data) { struct _EPopupFactory *f = g_malloc0(sizeof(*f)); @@ -648,7 +648,7 @@ e_popup_class_remove_factory(EPopupClass *klass, EPopupFactory *f) * * Allocate a new popup target suitable for this popup type. **/ -void *e_popup_target_new(EPopup *ep, int type, size_t size) +gpointer e_popup_target_new(EPopup *ep, gint type, size_t size) { EPopupTarget *t; @@ -675,7 +675,7 @@ void *e_popup_target_new(EPopup *ep, int type, size_t size) * only required if you are using the target for other purposes. **/ void -e_popup_target_free(EPopup *ep, void *o) +e_popup_target_free(EPopup *ep, gpointer o) { EPopupTarget *t = o; @@ -710,7 +710,7 @@ e_popup_target_free(EPopup *ep, void *o) */ -static void *emph_parent_class; +static gpointer emph_parent_class; #define emph ((EPopupHook *)eph) /* must have 1:1 correspondence with e-popup types in order */ @@ -725,15 +725,15 @@ static const EPluginHookTargetKey emph_item_types[] = { }; static void -emph_popup_activate(EPopup *ep, EPopupItem *item, void *data) +emph_popup_activate(EPopup *ep, EPopupItem *item, gpointer data) { EPopupHook *hook = data; - e_plugin_invoke(hook->hook.plugin, (char *)item->user_data, ep->target); + e_plugin_invoke(hook->hook.plugin, (gchar *)item->user_data, ep->target); } static void -emph_popup_factory(EPopup *emp, void *data) +emph_popup_factory(EPopup *emp, gpointer data) { struct _EPopupHookMenu *menu = data; @@ -811,13 +811,13 @@ emph_construct_menu(EPluginHook *eph, xmlNodePtr root) xmlNodePtr node; EPopupHookTargetMap *map; EPopupHookClass *klass = (EPopupHookClass *)G_OBJECT_GET_CLASS(eph); - char *tmp; + gchar *tmp; d(printf(" loading menu\n")); menu = g_malloc0(sizeof(*menu)); menu->hook = (EPopupHook *)eph; - tmp = (char *)xmlGetProp(root, (const unsigned char *)"target"); + tmp = (gchar *)xmlGetProp(root, (const guchar *)"target"); if (tmp == NULL) goto error; map = g_hash_table_lookup(klass->target_map, tmp); @@ -837,7 +837,7 @@ emph_construct_menu(EPluginHook *eph, xmlNodePtr root) node = root->children; while (node) { - if (0 == strcmp((char *)node->name, "item")) { + if (0 == strcmp((gchar *)node->name, "item")) { struct _EPopupItem *item; item = emph_construct_item(eph, menu, node, map); @@ -868,7 +868,7 @@ emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) node = root->children; while (node) { - if (strcmp((char *)node->name, "menu") == 0) { + if (strcmp((gchar *)node->name, "menu") == 0) { struct _EPopupHookMenu *menu; menu = emph_construct_menu(eph, node); @@ -949,5 +949,5 @@ e_popup_hook_get_type(void) **/ void e_popup_hook_class_add_target_map(EPopupHookClass *klass, const EPopupHookTargetMap *map) { - g_hash_table_insert(klass->target_map, (void *)map->type, (void *)map); + g_hash_table_insert(klass->target_map, (gpointer)map->type, (gpointer)map); } diff --git a/e-util/e-popup.h b/e-util/e-popup.h index 65c51ce65f..0f430af801 100644 --- a/e-util/e-popup.h +++ b/e-util/e-popup.h @@ -44,9 +44,9 @@ typedef struct _EPopupItem EPopupItem; typedef struct _EPopupFactory EPopupFactory; /* anonymous type */ typedef struct _EPopupTarget EPopupTarget; -typedef void (*EPopupActivateFunc)(EPopup *ep, EPopupItem *item, void *data); -typedef void (*EPopupFactoryFunc)(EPopup *emp, void *data); -typedef void (*EPopupItemsFunc)(EPopup *ep, GSList *items, void *data); +typedef void (*EPopupActivateFunc)(EPopup *ep, EPopupItem *item, gpointer data); +typedef void (*EPopupFactoryFunc)(EPopup *emp, gpointer data); +typedef void (*EPopupItemsFunc)(EPopup *ep, GSList *items, gpointer data); /** * enum _e_popup_t - Popup item type enumeration. @@ -116,11 +116,11 @@ enum _e_popup_t { */ struct _EPopupItem { enum _e_popup_t type; - char *path; /* absolute path! must sort ascii-lexographically into the right spot */ - char *label; + gchar *path; /* absolute path! must sort ascii-lexographically into the right spot */ + gchar *label; EPopupActivateFunc activate; - void *user_data; /* user data, not passed directly to @activate */ - void *image; /* char* for item type, GtkWidget * for image type */ + gpointer user_data; /* user data, not passed directly to @activate */ + gpointer image; /* gchar * for item type, GtkWidget * for image type */ guint32 visible; /* visibility mask */ guint32 enable; /* sensitivity mask */ }; @@ -168,7 +168,7 @@ struct _EPopup { struct _EPopupPrivate *priv; - char *menuid; + gchar *menuid; EPopupTarget *target; }; @@ -198,23 +198,23 @@ struct _EPopupClass { GType e_popup_get_type(void); -EPopup *e_popup_new(const char *menuid); +EPopup *e_popup_new(const gchar *menuid); /* Static class methods */ -EPopupFactory *e_popup_class_add_factory(EPopupClass *klass, const char *menuid, EPopupFactoryFunc func, void *data); +EPopupFactory *e_popup_class_add_factory(EPopupClass *klass, const gchar *menuid, EPopupFactoryFunc func, gpointer data); void e_popup_class_remove_factory(EPopupClass *klass, EPopupFactory *f); -EPopup *e_popup_construct(EPopup *, const char *menuid); +EPopup *e_popup_construct(EPopup *, const gchar *menuid); -void e_popup_add_items(EPopup *, GSList *items, const char *domain, EPopupItemsFunc freefunc, void *data); +void e_popup_add_items(EPopup *, GSList *items, const gchar *domain, EPopupItemsFunc freefunc, gpointer data); void e_popup_add_static_items(EPopup *emp, EPopupTarget *target); /* do not call e_popup_create_menu, it can leak structures if not used right */ struct _GtkMenu *e_popup_create_menu(EPopup *, EPopupTarget *, guint32 mask); struct _GtkMenu *e_popup_create_menu_once(EPopup *emp, EPopupTarget *, guint32 mask); -void *e_popup_target_new(EPopup *, int type, size_t size); -void e_popup_target_free(EPopup *, void *); +gpointer e_popup_target_new(EPopup *, gint type, size_t size); +void e_popup_target_free(EPopup *, gpointer ); /* ********************************************************************** */ @@ -250,10 +250,10 @@ typedef void (*EPopupHookFunc)(struct _EPlugin *plugin, EPopupTarget *target); */ struct _EPopupHookMenu { struct _EPopupHook *hook; /* parent pointer */ - char *id; /* target menu id for these menu items */ - int target_type; /* target type of this menu */ + gchar *id; /* target menu id for these menu items */ + gint target_type; /* target type of this menu */ GSList *items; /* items to add to menu */ - char *factory; /* optional factory to call for adding menu items */ + gchar *factory; /* optional factory to call for adding menu items */ }; /** diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c index ee98ad8b75..297fcf5739 100644 --- a/e-util/e-profile-event.c +++ b/e-util/e-profile-event.c @@ -109,7 +109,7 @@ EProfileEvent *e_profile_event_peek(void) } EProfileEventTarget * -e_profile_event_target_new(EProfileEvent *eme, const char *id, const char *uid, guint32 flags) +e_profile_event_target_new(EProfileEvent *eme, const gchar *id, const gchar *uid, guint32 flags) { EProfileEventTarget *t = e_event_target_new(&eme->popup, E_PROFILE_EVENT_TARGET, sizeof(*t)); GTimeVal tv; @@ -126,7 +126,7 @@ e_profile_event_target_new(EProfileEvent *eme, const char *id, const char *uid, #ifdef ENABLE_PROFILING void -e_profile_event_emit(const char *id, const char *uid, guint32 flags) +e_profile_event_emit(const gchar *id, const gchar *uid, guint32 flags) { EProfileEvent *epe = e_profile_event_peek(); EProfileEventTarget *t = e_profile_event_target_new(epe, id, uid, flags); @@ -137,14 +137,14 @@ e_profile_event_emit(const char *id, const char *uid, guint32 flags) /* simply keep macro from header file expand to "nothing". #undef e_profile_event_emit static void -e_profile_event_emit(const char *id, const char *uid, guint32 flags) +e_profile_event_emit(const gchar *id, const gchar *uid, guint32 flags) { }*/ #endif /* ********************************************************************** */ -static void *emeh_parent_class; +static gpointer emeh_parent_class; #define emeh ((EProfileEventHook *)eph) static const EEventHookTargetMask emeh_profile_masks[] = { @@ -170,7 +170,7 @@ emeh_finalise(GObject *o) static void emeh_class_init(EPluginHookClass *klass) { - int i; + gint i; ((GObjectClass *)klass)->finalize = emeh_finalise; ((EPluginHookClass *)klass)->id = "org.gnome.evolution.profile.events:1.0"; diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h index c20a5f1044..5caa50cf4d 100644 --- a/e-util/e-profile-event.h +++ b/e-util/e-profile-event.h @@ -58,8 +58,8 @@ struct _EProfileEventTarget { EEventTarget target; struct timeval tv; - char *id; /* id of event */ - char *uid; /* uid of event (folder/message, etc) */ + gchar *id; /* id of event */ + gchar *uid; /* uid of event (folder/message, etc) */ }; typedef struct _EEventItem EProfileEventItem; @@ -79,11 +79,11 @@ GType e_profile_event_get_type(void); EProfileEvent *e_profile_event_peek(void); -EProfileEventTarget *e_profile_event_target_new(EProfileEvent *emp, const char *id, const char *uid, guint32 flags); +EProfileEventTarget *e_profile_event_target_new(EProfileEvent *emp, const gchar *id, const gchar *uid, guint32 flags); /* we don't want ANY rubbish code lying around if we have profiling off */ #ifdef ENABLE_PROFILING -void e_profile_event_emit(const char *id, const char *uid, guint32 flags); +void e_profile_event_emit(const gchar *id, const gchar *uid, guint32 flags); #else #define e_profile_event_emit(a, b, c) #endif diff --git a/e-util/e-request.c b/e-util/e-request.c index 2175c75b2a..3cd23968b2 100644 --- a/e-util/e-request.c +++ b/e-util/e-request.c @@ -39,14 +39,14 @@ * Return value: %NULL if the user cancelled the dialog, the inserted * string (in UTF8) otherwise. The string must be freed by the caller. **/ -char * +gchar * e_request_string (GtkWindow *parent, - const char *title, - const char *prompt, - const char *default_string) + const gchar *title, + const gchar *prompt, + const gchar *default_string) { GtkWidget *prompt_label; - char *text; + gchar *text; GtkWidget *dialog; GtkWidget *entry; GtkWidget *vbox; diff --git a/e-util/e-request.h b/e-util/e-request.h index ae822db83e..63eacdf8bb 100644 --- a/e-util/e-request.h +++ b/e-util/e-request.h @@ -25,9 +25,9 @@ #include -char *e_request_string (GtkWindow *parent, - const char *title, - const char *prompt, - const char *default_string); +gchar *e_request_string (GtkWindow *parent, + const gchar *title, + const gchar *prompt, + const gchar *default_string); #endif diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c index eaedddaf50..1480f37e68 100644 --- a/e-util/e-signature-list.c +++ b/e-util/e-signature-list.c @@ -175,7 +175,7 @@ gconf_signatures_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry, EList *old_sigs; EIterator *iter; gboolean found; - char *uid; + gchar *uid; old_sigs = e_list_duplicate (E_LIST (signature_list)); @@ -252,8 +252,8 @@ gconf_signatures_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry, signature_list->priv->resave = resave; } -static void * -copy_func (const void *data, void *closure) +static gpointer +copy_func (gconstpointer data, gpointer closure) { GObject *object = (GObject *)data; @@ -263,7 +263,7 @@ copy_func (const void *data, void *closure) } static void -free_func (void *data, void *closure) +free_func (gpointer data, gpointer closure) { g_object_unref (data); } @@ -338,7 +338,7 @@ e_signature_list_save (ESignatureList *signature_list) GSList *list = NULL; ESignature *signature; EIterator *iter; - char *xmlbuf; + gchar *xmlbuf; for (iter = e_list_get_iterator (E_LIST (signature_list)); e_iterator_is_valid (iter); @@ -430,7 +430,7 @@ e_signature_list_remove (ESignatureList *signatures, ESignature *signature) * Return value: The signature or NULL if it doesn't exist. **/ const ESignature * -e_signature_list_find (ESignatureList *signatures, e_signature_find_t type, const char *key) +e_signature_list_find (ESignatureList *signatures, e_signature_find_t type, const gchar *key) { const ESignature *signature = NULL; EIterator *it; @@ -444,7 +444,7 @@ e_signature_list_find (ESignatureList *signatures, e_signature_find_t type, cons for (it = e_list_get_iterator ((EList *) signatures); e_iterator_is_valid (it); e_iterator_next (it)) { - int found = 0; + gint found = 0; signature = (const ESignature *) e_iterator_get (it); diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h index 8d8caed0a8..1c27a12453 100644 --- a/e-util/e-signature-list.h +++ b/e-util/e-signature-list.h @@ -71,6 +71,6 @@ void e_signature_list_add (ESignatureList *signature_list, ESignature *signature void e_signature_list_change (ESignatureList *signature_list, ESignature *signature); void e_signature_list_remove (ESignatureList *signature_list, ESignature *signature); -const ESignature *e_signature_list_find (ESignatureList *signature_list, e_signature_find_t type, const char *key); +const ESignature *e_signature_list_find (ESignatureList *signature_list, e_signature_find_t type, const gchar *key); #endif /* __E_SIGNATURE_LIST__ */ diff --git a/e-util/e-signature.c b/e-util/e-signature.c index 1cbed6b66b..60659f8c55 100644 --- a/e-util/e-signature.c +++ b/e-util/e-signature.c @@ -124,7 +124,7 @@ e_signature_new (void) * if @xml could not be parsed as valid signature data. **/ ESignature * -e_signature_new_from_xml (const char *xml) +e_signature_new_from_xml (const gchar *xml) { ESignature *signature; @@ -139,12 +139,12 @@ e_signature_new_from_xml (const char *xml) static gboolean -xml_set_bool (xmlNodePtr node, const char *name, gboolean *val) +xml_set_bool (xmlNodePtr node, const gchar *name, gboolean *val) { gboolean bool; - char *buf; + gchar *buf; - if ((buf = (char *)xmlGetProp (node, (const unsigned char *)name))) { + if ((buf = (gchar *)xmlGetProp (node, (const guchar *)name))) { bool = (!strcmp (buf, "true") || !strcmp (buf, "yes")); xmlFree (buf); @@ -158,11 +158,11 @@ xml_set_bool (xmlNodePtr node, const char *name, gboolean *val) } static gboolean -xml_set_prop (xmlNodePtr node, const char *name, char **val) +xml_set_prop (xmlNodePtr node, const gchar *name, gchar **val) { - char *buf, *new_val; + gchar *buf, *new_val; - buf = (char *)xmlGetProp (node, (const unsigned char *)name); + buf = (gchar *)xmlGetProp (node, (const guchar *)name); new_val = g_strdup (buf); xmlFree (buf); @@ -180,11 +180,11 @@ xml_set_prop (xmlNodePtr node, const char *name, char **val) } static gboolean -xml_set_content (xmlNodePtr node, char **val) +xml_set_content (xmlNodePtr node, gchar **val) { - char *buf, *new_val; + gchar *buf, *new_val; - buf = (char *)xmlNodeGetContent (node); + buf = (gchar *)xmlNodeGetContent (node); new_val = g_strdup (buf); xmlFree (buf); @@ -210,18 +210,18 @@ xml_set_content (xmlNodePtr node, char **val) * (or %NULL if @xml could not be parsed or did not contain a uid). * The caller must free this string. **/ -char * -e_signature_uid_from_xml (const char *xml) +gchar * +e_signature_uid_from_xml (const gchar *xml) { xmlNodePtr node; xmlDocPtr doc; - char *uid = NULL; + gchar *uid = NULL; - if (!(doc = xmlParseDoc ((unsigned char *) xml))) + if (!(doc = xmlParseDoc ((guchar *) xml))) return NULL; node = doc->children; - if (strcmp ((char *)node->name, "signature") != 0) { + if (strcmp ((gchar *)node->name, "signature") != 0) { xmlFreeDoc (doc); return NULL; } @@ -243,19 +243,19 @@ e_signature_uid_from_xml (const char *xml) * Returns %TRUE if the signature was loaded or %FALSE otherwise. **/ gboolean -e_signature_set_from_xml (ESignature *signature, const char *xml) +e_signature_set_from_xml (ESignature *signature, const gchar *xml) { gboolean changed = FALSE; xmlNodePtr node, cur; xmlDocPtr doc; gboolean bool; - char *buf; + gchar *buf; - if (!(doc = xmlParseDoc ((unsigned char *) xml))) + if (!(doc = xmlParseDoc ((guchar *) xml))) return FALSE; node = doc->children; - if (strcmp ((char *)node->name, "signature") != 0) { + if (strcmp ((gchar *)node->name, "signature") != 0) { xmlFreeDoc (doc); return FALSE; } @@ -292,11 +292,11 @@ e_signature_set_from_xml (ESignature *signature, const char *xml) cur = node->children; while (cur) { - if (!strcmp ((char *)cur->name, "filename")) { + if (!strcmp ((gchar *)cur->name, "filename")) { changed |= xml_set_content (cur, &signature->filename); changed |= xml_set_bool (cur, "script", &signature->script); break; - } else if (!strcmp ((char *)cur->name, "script")) { + } else if (!strcmp ((gchar *)cur->name, "script")) { /* this is for handling 1.4 signature script definitions */ changed |= xml_set_content (cur, &signature->filename); if (!signature->script) { @@ -322,35 +322,35 @@ e_signature_set_from_xml (ESignature *signature, const char *xml) * Return value: an XML representation of @signature, which the caller * must free. **/ -char * +gchar * e_signature_to_xml (ESignature *signature) { xmlChar *xmlbuf; - char *tmp; + gchar *tmp; xmlNodePtr root, node; xmlDocPtr doc; - int n; + gint n; - doc = xmlNewDoc ((const unsigned char *)"1.0"); + doc = xmlNewDoc ((const guchar *)"1.0"); - root = xmlNewDocNode (doc, NULL, (const unsigned char *)"signature", NULL); + root = xmlNewDocNode (doc, NULL, (const guchar *)"signature", NULL); xmlDocSetRootElement (doc, root); - xmlSetProp (root, (const unsigned char *)"name", (unsigned char *)signature->name); - xmlSetProp (root, (const unsigned char *)"uid", (unsigned char *)signature->uid); - xmlSetProp (root, (const unsigned char *)"auto", (const unsigned char *)(signature->autogen ? "true" : "false")); + xmlSetProp (root, (const guchar *)"name", (guchar *)signature->name); + xmlSetProp (root, (const guchar *)"uid", (guchar *)signature->uid); + xmlSetProp (root, (const guchar *)"auto", (const guchar *)(signature->autogen ? "true" : "false")); if (!signature->autogen) { - xmlSetProp (root, (const unsigned char *)"format", (const unsigned char *)(signature->html ? "text/html" : "text/plain")); + xmlSetProp (root, (const guchar *)"format", (const guchar *)(signature->html ? "text/html" : "text/plain")); if (signature->filename) { - node = xmlNewTextChild (root, NULL, (const unsigned char *)"filename", (unsigned char *)signature->filename); + node = xmlNewTextChild (root, NULL, (const guchar *)"filename", (guchar *)signature->filename); if (signature->script) - xmlSetProp (node, (const unsigned char *)"script", (const unsigned char *)"true"); + xmlSetProp (node, (const guchar *)"script", (const guchar *)"true"); } } else { /* this is to make Evolution-1.4 and older 1.5 versions happy */ - xmlSetProp (root, (const unsigned char *)"format", (const unsigned char *)"text/html"); + xmlSetProp (root, (const guchar *)"format", (const guchar *)"text/html"); } xmlDocDumpMemory (doc, &xmlbuf, &n); diff --git a/e-util/e-signature.h b/e-util/e-signature.h index cc8591b421..e965f9c65e 100644 --- a/e-util/e-signature.h +++ b/e-util/e-signature.h @@ -47,9 +47,9 @@ struct _ESignature { gboolean script; gboolean html; - char *filename; - char *name; - char *uid; + gchar *filename; + gchar *name; + gchar *uid; }; struct _ESignatureClass { @@ -61,13 +61,13 @@ struct _ESignatureClass { GType e_signature_get_type (void); ESignature *e_signature_new (void); -ESignature *e_signature_new_from_xml (const char *xml); +ESignature *e_signature_new_from_xml (const gchar *xml); -char *e_signature_uid_from_xml (const char *xml); +gchar *e_signature_uid_from_xml (const gchar *xml); -gboolean e_signature_set_from_xml (ESignature *sig, const char *xml); +gboolean e_signature_set_from_xml (ESignature *sig, const gchar *xml); -char *e_signature_to_xml (ESignature *sig); +gchar *e_signature_to_xml (ESignature *sig); #ifdef __cplusplus } diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c index 060c3f441a..a708550a12 100644 --- a/e-util/e-sorter-array.c +++ b/e-util/e-sorter-array.c @@ -37,23 +37,23 @@ G_DEFINE_TYPE (ESorterArray, e_sorter_array, E_SORTER_TYPE) static void esa_sort (ESorterArray *esa); static void esa_backsort (ESorterArray *esa); -static gint esa_model_to_sorted (ESorter *sorter, int row); -static gint esa_sorted_to_model (ESorter *sorter, int row); -static void esa_get_model_to_sorted_array (ESorter *sorter, int **array, int *count); -static void esa_get_sorted_to_model_array (ESorter *sorter, int **array, int *count); +static gint esa_model_to_sorted (ESorter *sorter, gint row); +static gint esa_sorted_to_model (ESorter *sorter, gint row); +static void esa_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count); +static void esa_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count); static gboolean esa_needs_sorting (ESorter *esa); #define ESA_NEEDS_SORTING(esa) (((ESorterArray *) (esa))->compare != NULL) static int -esort_callback(const void *data1, const void *data2, gpointer user_data) +esort_callback(gconstpointer data1, gconstpointer data2, gpointer user_data) { ESorterArray *esa = user_data; - int ret_val; - int int1, int2; + gint ret_val; + gint int1, int2; - int1 = *(int *)data1; - int2 = *(int *)data2; + int1 = *(gint *)data1; + int2 = *(gint *)data2; ret_val = esa->compare (int1, int2, esa->closure); if (ret_val != 0) @@ -69,8 +69,8 @@ esort_callback(const void *data1, const void *data2, gpointer user_data) static void esa_sort(ESorterArray *esa) { - int rows; - int i; + gint rows; + gint i; if (esa->sorted) return; @@ -90,7 +90,7 @@ esa_sort(ESorterArray *esa) static void esa_backsort(ESorterArray *esa) { - int i, rows; + gint i, rows; if (esa->backsorted) return; @@ -108,7 +108,7 @@ esa_backsort(ESorterArray *esa) static gint -esa_model_to_sorted (ESorter *es, int row) +esa_model_to_sorted (ESorter *es, gint row) { ESorterArray *esa = E_SORTER_ARRAY(es); @@ -125,7 +125,7 @@ esa_model_to_sorted (ESorter *es, int row) } static gint -esa_sorted_to_model (ESorter *es, int row) +esa_sorted_to_model (ESorter *es, gint row) { ESorterArray *esa = (ESorterArray *) es; @@ -142,7 +142,7 @@ esa_sorted_to_model (ESorter *es, int row) } static void -esa_get_model_to_sorted_array (ESorter *es, int **array, int *count) +esa_get_model_to_sorted_array (ESorter *es, gint **array, gint *count) { ESorterArray *esa = E_SORTER_ARRAY(es); if (array || count) { @@ -156,7 +156,7 @@ esa_get_model_to_sorted_array (ESorter *es, int **array, int *count) } static void -esa_get_sorted_to_model_array (ESorter *es, int **array, int *count) +esa_get_sorted_to_model_array (ESorter *es, gint **array, gint *count) { ESorterArray *esa = E_SORTER_ARRAY(es); if (array || count) { @@ -187,23 +187,23 @@ e_sorter_array_clean(ESorterArray *esa) } void -e_sorter_array_set_count (ESorterArray *esa, int count) +e_sorter_array_set_count (ESorterArray *esa, gint count) { e_sorter_array_clean (esa); esa->rows = count; } void -e_sorter_array_append (ESorterArray *esa, int count) +e_sorter_array_append (ESorterArray *esa, gint count) { - int i; + gint i; g_free(esa->backsorted); esa->backsorted = NULL; if (esa->sorted) { esa->sorted = g_renew(int, esa->sorted, esa->rows + count); for (i = 0; i < count; i++) { - int value = esa->rows; + gint value = esa->rows; size_t pos; e_bsearch (&value, esa->sorted, esa->rows, sizeof (int), esort_callback, esa, &pos, NULL); memmove (esa->sorted + pos + 1, esa->sorted + pos, sizeof (int) * (esa->rows - pos)); diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h index a02f5d9635..9a1d3fcfef 100644 --- a/e-util/e-sorter-array.h +++ b/e-util/e-sorter-array.h @@ -37,8 +37,8 @@ G_BEGIN_DECLS #ifndef _E_COMPARE_ROWS_FUNC_H_ #define _E_COMPARE_ROWS_FUNC_H_ -typedef int (*ECompareRowsFunc) (int row1, - int row2, +typedef gint (*ECompareRowsFunc) (gint row1, + gint row2, gpointer closure); #endif @@ -49,10 +49,10 @@ typedef struct { gpointer closure; /* If needs_sorting is 0, then model_to_sorted and sorted_to_model are no-ops. */ - int *sorted; - int *backsorted; + gint *sorted; + gint *backsorted; - int rows; + gint rows; } ESorterArray; typedef struct { @@ -67,9 +67,9 @@ ESorterArray *e_sorter_array_new (ECompareRowsFunc compare, gpointer closure); void e_sorter_array_clean (ESorterArray *esa); void e_sorter_array_set_count (ESorterArray *esa, - int count); + gint count); void e_sorter_array_append (ESorterArray *esa, - int count); + gint count); G_END_DECLS diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c index f63e5e1172..602b189075 100644 --- a/e-util/e-sorter.c +++ b/e-util/e-sorter.c @@ -34,10 +34,10 @@ G_DEFINE_TYPE (ESorter, e_sorter, G_TYPE_OBJECT) -static gint es_model_to_sorted (ESorter *es, int row); -static gint es_sorted_to_model (ESorter *es, int row); -static void es_get_model_to_sorted_array (ESorter *es, int **array, int *count); -static void es_get_sorted_to_model_array (ESorter *es, int **array, int *count); +static gint es_model_to_sorted (ESorter *es, gint row); +static gint es_sorted_to_model (ESorter *es, gint row); +static void es_get_model_to_sorted_array (ESorter *es, gint **array, gint *count); +static void es_get_sorted_to_model_array (ESorter *es, gint **array, gint *count); static gboolean es_needs_sorting(ESorter *es); static void @@ -65,25 +65,25 @@ e_sorter_new (void) static gint -es_model_to_sorted (ESorter *es, int row) +es_model_to_sorted (ESorter *es, gint row) { return row; } static gint -es_sorted_to_model (ESorter *es, int row) +es_sorted_to_model (ESorter *es, gint row) { return row; } static void -es_get_model_to_sorted_array (ESorter *es, int **array, int *count) +es_get_model_to_sorted_array (ESorter *es, gint **array, gint *count) { } static void -es_get_sorted_to_model_array (ESorter *es, int **array, int *count) +es_get_sorted_to_model_array (ESorter *es, gint **array, gint *count) { } @@ -95,7 +95,7 @@ es_needs_sorting(ESorter *es) } gint -e_sorter_model_to_sorted (ESorter *es, int row) +e_sorter_model_to_sorted (ESorter *es, gint row) { g_return_val_if_fail(es != NULL, -1); g_return_val_if_fail(row >= 0, -1); @@ -107,7 +107,7 @@ e_sorter_model_to_sorted (ESorter *es, int row) } gint -e_sorter_sorted_to_model (ESorter *es, int row) +e_sorter_sorted_to_model (ESorter *es, gint row) { g_return_val_if_fail(es != NULL, -1); g_return_val_if_fail(row >= 0, -1); @@ -120,7 +120,7 @@ e_sorter_sorted_to_model (ESorter *es, int row) void -e_sorter_get_model_to_sorted_array (ESorter *es, int **array, int *count) +e_sorter_get_model_to_sorted_array (ESorter *es, gint **array, gint *count) { g_return_if_fail(es != NULL); @@ -129,7 +129,7 @@ e_sorter_get_model_to_sorted_array (ESorter *es, int **array, int *count) } void -e_sorter_get_sorted_to_model_array (ESorter *es, int **array, int *count) +e_sorter_get_sorted_to_model_array (ESorter *es, gint **array, gint *count) { g_return_if_fail(es != NULL); diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h index d64851bc70..579d9bd36d 100644 --- a/e-util/e-sorter.h +++ b/e-util/e-sorter.h @@ -44,16 +44,16 @@ typedef struct { typedef struct { GObjectClass parent_class; gint (*model_to_sorted) (ESorter *sorter, - int row); + gint row); gint (*sorted_to_model) (ESorter *sorter, - int row); + gint row); void (*get_model_to_sorted_array) (ESorter *sorter, - int **array, - int *count); + gint **array, + gint *count); void (*get_sorted_to_model_array) (ESorter *sorter, - int **array, - int *count); + gint **array, + gint *count); gboolean (*needs_sorting) (ESorter *sorter); } ESorterClass; @@ -62,16 +62,16 @@ GType e_sorter_get_type (void); ESorter *e_sorter_new (void); gint e_sorter_model_to_sorted (ESorter *sorter, - int row); + gint row); gint e_sorter_sorted_to_model (ESorter *sorter, - int row); + gint row); void e_sorter_get_model_to_sorted_array (ESorter *sorter, - int **array, - int *count); + gint **array, + gint *count); void e_sorter_get_sorted_to_model_array (ESorter *sorter, - int **array, - int *count); + gint **array, + gint *count); gboolean e_sorter_needs_sorting (ESorter *sorter); diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c index ba1d0113a0..1241e7092f 100644 --- a/e-util/e-util-labels.c +++ b/e-util/e-util-labels.c @@ -62,8 +62,8 @@ e_util_labels_parse (GConfClient *client) { GSList *labels, *list, *head; EUtilLabel *label; - char *buf; - int num = 0; + gchar *buf; + gint num = 0; gboolean unref_client = client == NULL; labels = NULL; @@ -74,7 +74,7 @@ e_util_labels_parse (GConfClient *client) head = gconf_client_get_list (client, E_UTIL_LABELS_GCONF_KEY, GCONF_VALUE_STRING, NULL); for (list = head; list; list = list->next) { - char *color, *name, *tag; + gchar *color, *name, *tag; name = buf = list->data; color = strrchr (buf, ':'); if (color == NULL) { @@ -210,7 +210,7 @@ flush_labels_cache (GSList *labels, gboolean free_labels) * @return Pointer to cache data if label with such tag exists or NULL. Do not free it! **/ static EUtilLabel * -find_label (GSList *labels, const char *tag) +find_label (GSList *labels, const gchar *tag) { GSList *l; @@ -227,12 +227,12 @@ find_label (GSList *labels, const char *tag) } -static char * -tag_from_name (const char *name) +static gchar * +tag_from_name (const gchar *name) { /* this does thunderbird, just do not ask */ - char *s1, *s2, *p; - const char *bads = " ()/{%*<>\\\""; + gchar *s1, *s2, *p; + const gchar *bads = " ()/{%*<>\\\""; if (!name || !*name) return NULL; @@ -263,12 +263,12 @@ tag_from_name (const char *name) * It will return NULL when the tag will be same as already existed. * Tag name is generated in similar way as in Thunderbird. **/ -char * -e_util_labels_add (const char *name, const GdkColor *color) +gchar * +e_util_labels_add (const gchar *name, const GdkColor *color) { EUtilLabel *label; GSList *labels; - char *tag; + gchar *tag; g_return_val_if_fail (name != NULL, NULL); g_return_val_if_fail (color != NULL, NULL); @@ -303,14 +303,14 @@ e_util_labels_add (const char *name, const GdkColor *color) * @return Tag for newly added label or NULL, if something failed. * Returned value should be freed with g_free. **/ -char * -e_util_labels_add_with_dlg (GtkWindow *parent, const char *tag) +gchar * +e_util_labels_add_with_dlg (GtkWindow *parent, const gchar *tag) { GtkWidget *table, *dialog, *l, *e, *c; - const char *name; + const gchar *name; GdkColor color; gboolean is_edit = FALSE; - char *new_tag = NULL; + gchar *new_tag = NULL; GSList *labels; table = gtk_table_new (2, 2, FALSE); @@ -353,7 +353,7 @@ e_util_labels_add_with_dlg (GtkWindow *parent, const char *tag) gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); while (!new_tag) { - const char *error = NULL; + const gchar *error = NULL; if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { name = gtk_entry_get_text (GTK_ENTRY (e)); @@ -388,7 +388,7 @@ e_util_labels_add_with_dlg (GtkWindow *parent, const char *tag) * @return Whether was removed. **/ gboolean -e_util_labels_remove (const char *tag) +e_util_labels_remove (const gchar *tag) { EUtilLabel *label; GSList *labels; @@ -419,7 +419,7 @@ e_util_labels_remove (const char *tag) * @return Whether successfully saved. **/ gboolean -e_util_labels_set_data (const char *tag, const char *name, const GdkColor *color) +e_util_labels_set_data (const gchar *tag, const gchar *name, const GdkColor *color) { EUtilLabel *label; GSList *labels; @@ -451,9 +451,9 @@ e_util_labels_set_data (const char *tag, const char *name, const GdkColor *color * @return Whether the tag is one of default/system labels or not. **/ gboolean -e_util_labels_is_system (const char *tag) +e_util_labels_is_system (const gchar *tag) { - int i; + gint i; if (!tag) return FALSE; @@ -472,10 +472,10 @@ e_util_labels_is_system (const char *tag) * @param old_tag Tag of the label from old version of Evolution. * @return New tag name equivalent with the old tag, or NULL if no such name existed before. **/ -const char * -e_util_labels_get_new_tag (const char *old_tag) +const gchar * +e_util_labels_get_new_tag (const gchar *old_tag) { - int i; + gint i; if (!old_tag) return NULL; @@ -497,8 +497,8 @@ e_util_labels_get_new_tag (const char *old_tag) * @param tag Tag of the label of our interest. * @return Name of the label with that tag or NULL, if no such label exists. **/ -const char * -e_util_labels_get_name (GSList *labels, const char *tag) +const gchar * +e_util_labels_get_name (GSList *labels, const gchar *tag) { EUtilLabel *label; @@ -520,7 +520,7 @@ e_util_labels_get_name (GSList *labels, const char *tag) * @return Whether found such label and color has been set. **/ gboolean -e_util_labels_get_color (GSList *labels, const char *tag, GdkColor *color) +e_util_labels_get_color (GSList *labels, const gchar *tag, GdkColor *color) { EUtilLabel *label; @@ -542,8 +542,8 @@ e_util_labels_get_color (GSList *labels, const char *tag, GdkColor *color) * @param tag Tag of the label of our interest. * @return String representation of that label, or NULL, is no such label exists. **/ -const char * -e_util_labels_get_color_str (GSList *labels, const char *tag) +const gchar * +e_util_labels_get_color_str (GSList *labels, const gchar *tag) { EUtilLabel *label; @@ -568,7 +568,7 @@ e_util_labels_get_filter_options (void) for (l = known; l; l = l->next) { EUtilLabel *label = l->data; - const char *tag; + const gchar *tag; struct _filter_option *fo; if (!label) diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h index 725f740d89..16d67f11ef 100644 --- a/e-util/e-util-labels.h +++ b/e-util/e-util-labels.h @@ -37,17 +37,17 @@ typedef struct { GSList * e_util_labels_parse (struct _GConfClient *client); void e_util_labels_free (GSList *labels); -char * e_util_labels_add (const char *name, const GdkColor *color); -char * e_util_labels_add_with_dlg (struct _GtkWindow *parent, const char *tag); -gboolean e_util_labels_remove (const char *tag); -gboolean e_util_labels_set_data (const char *tag, const char *name, const GdkColor *color); +gchar * e_util_labels_add (const gchar *name, const GdkColor *color); +gchar * e_util_labels_add_with_dlg (struct _GtkWindow *parent, const gchar *tag); +gboolean e_util_labels_remove (const gchar *tag); +gboolean e_util_labels_set_data (const gchar *tag, const gchar *name, const GdkColor *color); -gboolean e_util_labels_is_system (const char *tag); -const char *e_util_labels_get_new_tag (const char *old_tag); +gboolean e_util_labels_is_system (const gchar *tag); +const gchar *e_util_labels_get_new_tag (const gchar *old_tag); -const char *e_util_labels_get_name (GSList *labels, const char *tag); -gboolean e_util_labels_get_color (GSList *labels, const char *tag, GdkColor *color); -const char *e_util_labels_get_color_str (GSList *labels, const char *tag); +const gchar *e_util_labels_get_name (GSList *labels, const gchar *tag); +gboolean e_util_labels_get_color (GSList *labels, const gchar *tag, GdkColor *color); +const gchar *e_util_labels_get_color_str (GSList *labels, const gchar *tag); GSList * e_util_labels_get_filter_options (void); diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h index f7d84dea37..7c77f12d27 100644 --- a/e-util/e-util-private.h +++ b/e-util/e-util-private.h @@ -35,26 +35,26 @@ #define fsync(fd) 0 -const char *_e_get_category_icons (void) G_GNUC_CONST; -const char *_e_get_datadir (void) G_GNUC_CONST; -const char *_e_get_ecpsdir (void) G_GNUC_CONST; -const char *_e_get_etspecdir (void) G_GNUC_CONST; -const char *_e_get_galviewsdir (void) G_GNUC_CONST; -const char *_e_get_gladedir (void) G_GNUC_CONST; -const char *_e_get_helpdir (void) G_GNUC_CONST; -const char *_e_get_iconsdir (void) G_GNUC_CONST; -const char *_e_get_imagesdir (void) G_GNUC_CONST; -const char *_e_get_libdir (void) G_GNUC_CONST; -const char *_e_get_libexecdir (void) G_GNUC_CONST; -const char *_e_get_localedir (void) G_GNUC_CONST; -const char *_e_get_plugindir (void) G_GNUC_CONST; -const char *_e_get_prefix (void) G_GNUC_CONST; -const char *_e_get_privdatadir (void) G_GNUC_CONST; -const char *_e_get_search_rule_dir (void) G_GNUC_CONST; -const char *_e_get_sounddir (void) G_GNUC_CONST; -const char *_e_get_sysconfdir (void) G_GNUC_CONST; -const char *_e_get_toolsdir (void) G_GNUC_CONST; -const char *_e_get_uidir (void) G_GNUC_CONST; +const gchar *_e_get_category_icons (void) G_GNUC_CONST; +const gchar *_e_get_datadir (void) G_GNUC_CONST; +const gchar *_e_get_ecpsdir (void) G_GNUC_CONST; +const gchar *_e_get_etspecdir (void) G_GNUC_CONST; +const gchar *_e_get_galviewsdir (void) G_GNUC_CONST; +const gchar *_e_get_gladedir (void) G_GNUC_CONST; +const gchar *_e_get_helpdir (void) G_GNUC_CONST; +const gchar *_e_get_iconsdir (void) G_GNUC_CONST; +const gchar *_e_get_imagesdir (void) G_GNUC_CONST; +const gchar *_e_get_libdir (void) G_GNUC_CONST; +const gchar *_e_get_libexecdir (void) G_GNUC_CONST; +const gchar *_e_get_localedir (void) G_GNUC_CONST; +const gchar *_e_get_plugindir (void) G_GNUC_CONST; +const gchar *_e_get_prefix (void) G_GNUC_CONST; +const gchar *_e_get_privdatadir (void) G_GNUC_CONST; +const gchar *_e_get_search_rule_dir (void) G_GNUC_CONST; +const gchar *_e_get_sounddir (void) G_GNUC_CONST; +const gchar *_e_get_sysconfdir (void) G_GNUC_CONST; +const gchar *_e_get_toolsdir (void) G_GNUC_CONST; +const gchar *_e_get_uidir (void) G_GNUC_CONST; #undef DATADIR #define DATADIR _e_get_datadir () diff --git a/e-util/e-util.c b/e-util/e-util.c index 533dc2d740..408a201c0a 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -378,12 +378,12 @@ e_action_group_remove_all_actions (GtkActionGroup *action_group) * Strips underscores from a string in the same way @gtk_label_new_with_mnemonis does. * The returned string should be freed. */ -char * -e_str_without_underscores (const char *s) +gchar * +e_str_without_underscores (const gchar *s) { - char *new_string; - const char *sp; - char *dp; + gchar *new_string; + const gchar *sp; + gchar *dp; new_string = g_malloc (strlen (s) + 1); @@ -1273,10 +1273,10 @@ get_lock_filename (void) gboolean e_file_lock_create () { - const char *fname = get_lock_filename (); + const gchar *fname = get_lock_filename (); gboolean status = FALSE; - int fd = g_creat (fname, S_IRUSR|S_IWUSR); + gint fd = g_creat (fname, S_IRUSR|S_IWUSR); if (fd == -1){ g_warning ("Lock file '%s' creation failed, error %d\n", fname, errno); } else { @@ -1290,7 +1290,7 @@ e_file_lock_create () void e_file_lock_destroy () { - const char *fname = get_lock_filename (); + const gchar *fname = get_lock_filename (); if (g_unlink (fname) == -1){ g_warning ("Lock destroy: failed to unlink file '%s'!",fname); @@ -1300,7 +1300,7 @@ e_file_lock_destroy () gboolean e_file_lock_exists () { - const char *fname = get_lock_filename (); + const gchar *fname = get_lock_filename (); return g_file_test (fname, G_FILE_TEST_EXISTS); } @@ -1313,10 +1313,10 @@ e_file_lock_exists () * * Guesses mime_type for the given filename. **/ -char * -e_util_guess_mime_type (const char *filename, gboolean localfile) +gchar * +e_util_guess_mime_type (const gchar *filename, gboolean localfile) { - char *mime_type = NULL; + gchar *mime_type = NULL; g_return_val_if_fail (filename != NULL, NULL); @@ -1364,11 +1364,11 @@ e_util_guess_mime_type (const char *filename, gboolean localfile) * * Converts local file name to URI. **/ -char * -e_util_filename_to_uri (const char *filename) +gchar * +e_util_filename_to_uri (const gchar *filename) { GFile *file; - char *uri = NULL; + gchar *uri = NULL; g_return_val_if_fail (filename != NULL, NULL); @@ -1389,11 +1389,11 @@ e_util_filename_to_uri (const char *filename) * * Converts URI to local file name. NULL indicates no such local file name exists. **/ -char * -e_util_uri_to_filename (const char *uri) +gchar * +e_util_uri_to_filename (const gchar *uri) { GFile *file; - char *filename = NULL; + gchar *filename = NULL; g_return_val_if_fail (uri != NULL, NULL); @@ -1420,7 +1420,7 @@ e_util_uri_to_filename (const char *uri) * Mount point should be already mounted when calling this function. **/ gboolean -e_util_read_file (const char *filename, gboolean filename_is_uri, char **buffer, gsize *read, GError **error) +e_util_read_file (const gchar *filename, gboolean filename_is_uri, gchar **buffer, gsize *read, GError **error) { GFile *file; GFileInfo *info; @@ -1445,7 +1445,7 @@ e_util_read_file (const char *filename, gboolean filename_is_uri, char **buffer, if (!err && info) { guint64 sz; - char *buff; + gchar *buff; sz = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); buff = g_malloc (sizeof (char) * sz); @@ -1495,7 +1495,7 @@ e_util_get_category_filter_options (void) clist = e_categories_get_list (); for (l = clist; l; l = l->next) { - const char *cname = l->data; + const gchar *cname = l->data; struct _filter_option *fo = g_new0 (struct _filter_option, 1); fo->title = g_strdup (cname); diff --git a/e-util/e-util.h b/e-util/e-util.h index e5126213f3..9cea65a6eb 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -58,7 +58,7 @@ gint e_action_compare_by_label (GtkAction *action1, void e_action_group_remove_all_actions (GtkActionGroup *action_group); -char * e_str_without_underscores (const char *s); +gchar * e_str_without_underscores (const gchar *s); gint e_str_compare (gconstpointer x, gconstpointer y); gint e_str_case_compare (gconstpointer x, @@ -113,8 +113,8 @@ gchar * e_ascii_dtostr (gchar *buffer, const gchar *format, gdouble d); -/* Alternating char * and int arguments with a NULL char * to end. - Less than 0 for the int means copy the whole string. */ +/* Alternating gchar * and gint arguments with a NULL gchar * to end. + Less than 0 for the gint means copy the whole string. */ gchar * e_strdup_append_strings (gchar *first_string, ...); diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c index 04c70afd75..a080518d4c 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -32,28 +32,28 @@ /* localedir uses system codepage as it is passed to the non-UTF8ified * gettext library */ -static const char *localedir = NULL; +static const gchar *localedir = NULL; /* The others are in UTF-8 */ -static const char *category_icons; -static const char *datadir; -static const char *ecpsdir; -static const char *etspecdir; -static const char *galviewsdir; -static const char *gladedir; -static const char *helpdir; -static const char *iconsdir; -static const char *imagesdir; -static const char *libdir; -static const char *libexecdir; -static const char *plugindir; -static const char *prefix; -static const char *privdatadir; -static const char *search_rule_dir; -static const char *sounddir; -static const char *sysconfdir; -static const char *toolsdir; -static const char *uidir; +static const gchar *category_icons; +static const gchar *datadir; +static const gchar *ecpsdir; +static const gchar *etspecdir; +static const gchar *galviewsdir; +static const gchar *gladedir; +static const gchar *helpdir; +static const gchar *iconsdir; +static const gchar *imagesdir; +static const gchar *libdir; +static const gchar *libexecdir; +static const gchar *plugindir; +static const gchar *prefix; +static const gchar *privdatadir; +static const gchar *search_rule_dir; +static const gchar *sounddir; +static const gchar *sysconfdir; +static const gchar *toolsdir; +static const gchar *uidir; static HMODULE hmodule; G_LOCK_DEFINE_STATIC (mutex); @@ -77,9 +77,9 @@ DllMain (HINSTANCE hinstDLL, return TRUE; } -static char * -replace_prefix (const char *runtime_prefix, - const char *configure_time_path) +static gchar * +replace_prefix (const gchar *runtime_prefix, + const gchar *configure_time_path) { if (runtime_prefix && strncmp (configure_time_path, EVOLUTION_PREFIX "/", @@ -94,8 +94,8 @@ replace_prefix (const char *runtime_prefix, static void setup (void) { - char *full_prefix; - char *cp_prefix; + gchar *full_prefix; + gchar *cp_prefix; G_LOCK (mutex); if (localedir != NULL) { @@ -150,7 +150,7 @@ setup (void) #include "e-util-private.h" /* For prototypes */ #define GETTER(varbl) \ -const char * \ +const gchar * \ _e_get_##varbl (void) \ { \ setup (); \ diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c index 73dd415a6d..3f651e99b4 100644 --- a/e-util/e-xml-utils.c +++ b/e-util/e-xml-utils.c @@ -75,7 +75,7 @@ e_xml_get_child_by_name_by_lang (const xmlNode *parent, } for (child = parent->xmlChildrenNode; child != NULL; child = child->next) { if (xmlStrcmp (child->name, child_name) == 0) { - xmlChar *this_lang = xmlGetProp (child, (const unsigned char *)"lang"); + xmlChar *this_lang = xmlGetProp (child, (const guchar *)"lang"); if (this_lang == NULL) { C = child; } else if (xmlStrcmp(this_lang, (xmlChar *)lang) == 0) { @@ -103,10 +103,10 @@ e_xml_get_child_by_name_by_lang_list_with_score (const xmlNode *parent, for (node = parent->xmlChildrenNode; node != NULL; node = node->next) { xmlChar *lang; - if (node->name == NULL || strcmp ((char *)node->name, name) != 0) { + if (node->name == NULL || strcmp ((gchar *)node->name, name) != 0) { continue; } - lang = xmlGetProp (node, (const unsigned char *)"xml:lang"); + lang = xmlGetProp (node, (const guchar *)"xml:lang"); if (lang != NULL) { const GList *l; gint i; @@ -114,7 +114,7 @@ e_xml_get_child_by_name_by_lang_list_with_score (const xmlNode *parent, for (l = lang_list, i = 0; l != NULL && i < *best_lang_score; l = l->next, i++) { - if (strcmp ((char *) l->data, (char *)lang) == 0) { + if (strcmp ((gchar *) l->data, (gchar *)lang) == 0) { best_node = node; *best_lang_score = i; } @@ -153,7 +153,7 @@ e_xml_get_child_by_name_by_lang_list (const xmlNode *parent, language_names = g_get_language_names (); while (*language_names != NULL) lang_list = g_list_append ( - (GList *)lang_list, (char *)*language_names++); + (GList *)lang_list, (gchar *)*language_names++); } return e_xml_get_child_by_name_by_lang_list_with_score (parent,name, @@ -176,10 +176,10 @@ e_xml_get_child_by_name_no_lang (const xmlNode *parent, const gchar *name) for (node = parent->xmlChildrenNode; node != NULL; node = node->next) { xmlChar *lang; - if (node->name == NULL || strcmp ((char *)node->name, name) != 0) { + if (node->name == NULL || strcmp ((gchar *)node->name, name) != 0) { continue; } - lang = xmlGetProp (node, (const unsigned char *)"xml:lang"); + lang = xmlGetProp (node, (const guchar *)"xml:lang"); if (lang == NULL) { return node; } @@ -211,7 +211,7 @@ e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent, prop = xmlGetProp ((xmlNode *) parent, prop_name); if (prop != NULL) { - (void) sscanf ((char *)prop, "%d", &ret_val); + (void) sscanf ((gchar *)prop, "%d", &ret_val); xmlFree (prop); } return ret_val; @@ -228,7 +228,7 @@ e_xml_set_integer_prop_by_name (xmlNode *parent, g_return_if_fail (prop_name != NULL); valuestr = g_strdup_printf ("%d", value); - xmlSetProp (parent, prop_name, (unsigned char *)valuestr); + xmlSetProp (parent, prop_name, (guchar *)valuestr); g_free (valuestr); } @@ -254,7 +254,7 @@ e_xml_get_uint_prop_by_name_with_default (const xmlNode *parent, prop = xmlGetProp ((xmlNode *) parent, prop_name); if (prop != NULL) { - (void) sscanf ((char *)prop, "%u", &ret_val); + (void) sscanf ((gchar *)prop, "%u", &ret_val); xmlFree (prop); } return ret_val; @@ -271,7 +271,7 @@ e_xml_set_uint_prop_by_name (xmlNode *parent, g_return_if_fail (prop_name != NULL); valuestr = g_strdup_printf ("%u", value); - xmlSetProp (parent, prop_name, (unsigned char *)valuestr); + xmlSetProp (parent, prop_name, (guchar *)valuestr); g_free (valuestr); } @@ -300,9 +300,9 @@ e_xml_get_bool_prop_by_name_with_default(const xmlNode *parent, prop = xmlGetProp ((xmlNode *) parent, prop_name); if (prop != NULL) { - if (g_ascii_strcasecmp ((char *)prop, "true") == 0) { + if (g_ascii_strcasecmp ((gchar *)prop, "true") == 0) { ret_val = TRUE; - } else if (g_ascii_strcasecmp ((char *)prop, "false") == 0) { + } else if (g_ascii_strcasecmp ((gchar *)prop, "false") == 0) { ret_val = FALSE; } xmlFree(prop); @@ -317,9 +317,9 @@ e_xml_set_bool_prop_by_name (xmlNode *parent, const xmlChar *prop_name, gboolean g_return_if_fail (prop_name != NULL); if (value) { - xmlSetProp (parent, prop_name, (const unsigned char *)"true"); + xmlSetProp (parent, prop_name, (const guchar *)"true"); } else { - xmlSetProp (parent, prop_name, (const unsigned char *)"false"); + xmlSetProp (parent, prop_name, (const guchar *)"false"); } } @@ -343,7 +343,7 @@ e_xml_get_double_prop_by_name_with_default (const xmlNode *parent, const xmlChar prop = xmlGetProp ((xmlNode *) parent, prop_name); if (prop != NULL) { - ret_val = e_flexible_strtod ((char *)prop, NULL); + ret_val = e_flexible_strtod ((gchar *)prop, NULL); xmlFree (prop); } return ret_val; @@ -352,8 +352,8 @@ e_xml_get_double_prop_by_name_with_default (const xmlNode *parent, const xmlChar void e_xml_set_double_prop_by_name(xmlNode *parent, const xmlChar *prop_name, gdouble value) { - char buffer[E_ASCII_DTOSTR_BUF_SIZE]; - char *format; + gchar buffer[E_ASCII_DTOSTR_BUF_SIZE]; + gchar *format; g_return_if_fail (parent != NULL); g_return_if_fail (prop_name != NULL); @@ -366,7 +366,7 @@ e_xml_set_double_prop_by_name(xmlNode *parent, const xmlChar *prop_name, gdouble e_ascii_dtostr (buffer, sizeof (buffer), format, value); g_free (format); - xmlSetProp (parent, prop_name, (const unsigned char *)buffer); + xmlSetProp (parent, prop_name, (const guchar *)buffer); } gchar * @@ -389,7 +389,7 @@ e_xml_get_string_prop_by_name_with_default (const xmlNode *parent, const xmlChar prop = xmlGetProp ((xmlNode *) parent, prop_name); if (prop != NULL) { - ret_val = g_strdup ((char *)prop); + ret_val = g_strdup ((gchar *)prop); xmlFree (prop); } else { ret_val = g_strdup (def); @@ -404,7 +404,7 @@ e_xml_set_string_prop_by_name (xmlNode *parent, const xmlChar *prop_name, const g_return_if_fail (prop_name != NULL); if (value != NULL) { - xmlSetProp (parent, prop_name, (unsigned char *)value); + xmlSetProp (parent, prop_name, (guchar *)value); } } @@ -420,15 +420,15 @@ e_xml_get_translated_string_prop_by_name (const xmlNode *parent, const xmlChar * prop = xmlGetProp ((xmlNode *) parent, prop_name); if (prop != NULL) { - ret_val = g_strdup ((char *)prop); + ret_val = g_strdup ((gchar *)prop); xmlFree (prop); return ret_val; } combined_name = g_strdup_printf("_%s", prop_name); - prop = xmlGetProp ((xmlNode *) parent, (unsigned char *)combined_name); + prop = xmlGetProp ((xmlNode *) parent, (guchar *)combined_name); if (prop != NULL) { - ret_val = g_strdup (gettext((char *)prop)); + ret_val = g_strdup (gettext((gchar *)prop)); xmlFree (prop); } g_free(combined_name); diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index f0fd2ed3e2..2c0f0f2d4f 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -46,7 +46,7 @@ typedef struct { gboolean delayed_mode; - char *key; + gchar *key; guint val_notify_id; GSList *val_changes; /* List of changes made to GConf value, that have not received change notification @@ -66,7 +66,7 @@ typedef struct { gboolean bind_size; gboolean bind_pos; - char *key_prefix; + gchar *key_prefix; GtkWindow *window; gulong configure_event_id; @@ -79,7 +79,7 @@ typedef struct { BindingType type; guint id; - char *key; + gchar *key; guint val_notify_id; GSList *val_changes; /* List of changes made to GConf value, that have not received change notification @@ -479,14 +479,14 @@ prop_binding_object_destroyed (gpointer user_data, **/ guint gconf_bridge_bind_property_full (GConfBridge *bridge, - const char *key, + const gchar *key, GObject *object, - const char *prop, + const gchar *prop, gboolean delayed_sync) { GParamSpec *pspec; PropBinding *binding; - char *signal; + gchar *signal; GConfValue *val; g_return_val_if_fail (bridge != NULL, 0); @@ -593,8 +593,8 @@ static gboolean window_binding_perform_scheduled_sync (WindowBinding *binding) { if (binding->bind_size) { - int width, height; - char *key; + gint width, height; + gchar *key; GdkWindowState state; state = gdk_window_get_state (GTK_WIDGET (binding->window)->window); @@ -621,8 +621,8 @@ window_binding_perform_scheduled_sync (WindowBinding *binding) } if (binding->bind_pos) { - int x, y; - char *key; + gint x, y; + gchar *key; gtk_window_get_position (binding->window, &x, &y); @@ -727,7 +727,7 @@ window_binding_window_destroyed (gpointer user_data, **/ guint gconf_bridge_bind_window (GConfBridge *bridge, - const char *key_prefix, + const gchar *key_prefix, GtkWindow *window, gboolean bind_size, gboolean bind_pos) @@ -751,7 +751,7 @@ gconf_bridge_bind_window (GConfBridge *bridge, /* Set up GConf keys & sync window to GConf values */ if (bind_size) { - char *key; + gchar *key; GConfValue *width_val, *height_val, *maximized_val; key = g_strconcat (key_prefix, "_width", NULL); @@ -788,7 +788,7 @@ gconf_bridge_bind_window (GConfBridge *bridge, } if (bind_pos) { - char *key; + gchar *key; GConfValue *x_val, *y_val; key = g_strconcat (key_prefix, "_x", NULL); @@ -891,7 +891,7 @@ list_store_binding_sync_pref_to_store (ListStoreBinding *binding, list = gconf_value_get_list (value); for (l = list; l; l = l->next) { GConfValue *l_value; - const char *string; + const gchar *string; l_value = (GConfValue *) l->data; string = gconf_value_get_string (l_value); @@ -915,7 +915,7 @@ list_store_binding_sync_store_to_pref (ListStoreBinding *binding) GtkTreeModel *tree_model; GtkTreeIter iter; GSList *list; - int res; + gint res; GConfValue *gconf_value; tree_model = GTK_TREE_MODEL (binding->list_store); @@ -924,7 +924,7 @@ list_store_binding_sync_store_to_pref (ListStoreBinding *binding) list = NULL; res = gtk_tree_model_get_iter_first (tree_model, &iter); while (res) { - char *string; + gchar *string; GConfValue *tmp_value; gtk_tree_model_get (tree_model, &iter, @@ -1035,7 +1035,7 @@ list_store_binding_store_changed_cb (ListStoreBinding *binding) **/ guint gconf_bridge_bind_string_list_store (GConfBridge *bridge, - const char *key, + const gchar *key, GtkListStore *list_store) { GtkTreeModel *tree_model; @@ -1216,7 +1216,7 @@ error_handler (GConfClient *client, g_warning ("GConf error:\n %s", error->message); if (!shown_dialog) { - char *message; + gchar *message; GtkWidget *dlg; message = g_strdup_printf (_("GConf error: %s"), diff --git a/e-util/gconf-bridge.h b/e-util/gconf-bridge.h index 7edd2476dd..b3cdd2bbeb 100644 --- a/e-util/gconf-bridge.h +++ b/e-util/gconf-bridge.h @@ -36,9 +36,9 @@ GConfBridge *gconf_bridge_get (void); GConfClient *gconf_bridge_get_client (GConfBridge *bridge); guint gconf_bridge_bind_property_full (GConfBridge *bridge, - const char *key, + const gchar *key, GObject *object, - const char *prop, + const gchar *prop, gboolean delayed_sync); /** @@ -71,7 +71,7 @@ guint gconf_bridge_bind_property_full (GConfBridge *bridge, (object), (prop), TRUE) guint gconf_bridge_bind_window (GConfBridge *bridge, - const char *key_prefix, + const gchar *key_prefix, GtkWindow *window, gboolean bind_size, gboolean bind_pos); @@ -105,7 +105,7 @@ guint gconf_bridge_bind_window (GConfBridge *bridge, gconf_bridge_bind_window ((bridge), (key_prefix), (window), FALSE, TRUE) guint gconf_bridge_bind_string_list_store (GConfBridge *bridge, - const char *key, + const gchar *key, GtkListStore *list_store); void gconf_bridge_unbind (GConfBridge *bridge, diff --git a/filter/filter-code.c b/filter/filter-code.c index fb0880b260..c0f0420d19 100644 --- a/filter/filter-code.c +++ b/filter/filter-code.c @@ -80,7 +80,7 @@ filter_code_class_init (FilterCodeClass *klass) static void filter_code_init (FilterCode *fc) { - ((FilterInput *) fc)->type = (char *)xmlStrdup ((const unsigned char *)"code"); + ((FilterInput *) fc)->type = (gchar *)xmlStrdup ((const guchar *)"code"); } static void @@ -104,7 +104,7 @@ filter_code_new (gboolean raw_code) if (fc && raw_code) { xmlFree (((FilterInput *) fc)->type); - ((FilterInput *) fc)->type = (char *)xmlStrdup ((const unsigned char *)"rawcode"); + ((FilterInput *) fc)->type = (gchar *)xmlStrdup ((const guchar *)"rawcode"); } return fc; @@ -123,7 +123,7 @@ build_code (FilterElement *fe, GString *out, struct _FilterPart *ff) l = fi->values; while (l) { - g_string_append(out, (char *)l->data); + g_string_append(out, (gchar *)l->data); l = g_list_next(l); } diff --git a/filter/filter-colour.c b/filter/filter-colour.c index a5cc3534ad..c175829a5e 100644 --- a/filter/filter-colour.c +++ b/filter/filter-colour.c @@ -32,10 +32,10 @@ #define d(x) -static int colour_eq (FilterElement *fe, FilterElement *cm); +static gint colour_eq (FilterElement *fe, FilterElement *cm); static void xml_create (FilterElement *fe, xmlNodePtr node); static xmlNodePtr xml_encode (FilterElement *fe); -static int xml_decode (FilterElement *fe, xmlNodePtr node); +static gint xml_decode (FilterElement *fe, xmlNodePtr node); static GtkWidget *get_widget (FilterElement *fe); static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff); static void format_sexp (FilterElement *, GString *); @@ -143,10 +143,10 @@ xml_encode (FilterElement *fe) g_snprintf (spec, sizeof (spec), "#%04x%04x%04x", fc->color.red, fc->color.green, fc->color.blue); - value = xmlNewNode(NULL, (const unsigned char *)"value"); - xmlSetProp(value, (const unsigned char *)"type", (const unsigned char *)"colour"); - xmlSetProp(value, (const unsigned char *)"name", (unsigned char *)fe->name); - xmlSetProp(value, (const unsigned char *)"spec", (unsigned char *)spec); + value = xmlNewNode(NULL, (const guchar *)"value"); + xmlSetProp(value, (const guchar *)"type", (const guchar *)"colour"); + xmlSetProp(value, (const guchar *)"name", (guchar *)fe->name); + xmlSetProp(value, (const guchar *)"spec", (guchar *)spec); return value; } @@ -158,22 +158,22 @@ xml_decode (FilterElement *fe, xmlNodePtr node) xmlChar *prop; xmlFree (fe->name); - fe->name = (char *)xmlGetProp(node, (const unsigned char *)"name"); + fe->name = (gchar *)xmlGetProp(node, (const guchar *)"name"); - prop = xmlGetProp(node, (const unsigned char *)"spec"); + prop = xmlGetProp(node, (const guchar *)"spec"); if (prop != NULL) { - gdk_color_parse((char *)prop, &fc->color); + gdk_color_parse((gchar *)prop, &fc->color); xmlFree (prop); } else { /* try reading the old RGB properties */ - prop = xmlGetProp(node, (const unsigned char *)"red"); - sscanf((char *)prop, "%" G_GINT16_MODIFIER "x", &fc->color.red); + prop = xmlGetProp(node, (const guchar *)"red"); + sscanf((gchar *)prop, "%" G_GINT16_MODIFIER "x", &fc->color.red); xmlFree (prop); - prop = xmlGetProp(node, (const unsigned char *)"green"); - sscanf((char *)prop, "%" G_GINT16_MODIFIER "x", &fc->color.green); + prop = xmlGetProp(node, (const guchar *)"green"); + sscanf((gchar *)prop, "%" G_GINT16_MODIFIER "x", &fc->color.green); xmlFree (prop); - prop = xmlGetProp(node, (const unsigned char *)"blue"); - sscanf((char *)prop, "%" G_GINT16_MODIFIER "x", &fc->color.blue); + prop = xmlGetProp(node, (const guchar *)"blue"); + sscanf((gchar *)prop, "%" G_GINT16_MODIFIER "x", &fc->color.blue); xmlFree (prop); } diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c index d0a7b591a5..4ab85d36bf 100644 --- a/filter/filter-datespec.c +++ b/filter/filter-datespec.c @@ -46,10 +46,10 @@ #define d(x) static gboolean validate (FilterElement *fe); -static int date_eq (FilterElement *fe, FilterElement *cm); +static gint date_eq (FilterElement *fe, FilterElement *cm); static void xml_create (FilterElement *fe, xmlNodePtr node); static xmlNodePtr xml_encode (FilterElement *fe); -static int xml_decode (FilterElement *fe, xmlNodePtr node); +static gint xml_decode (FilterElement *fe, xmlNodePtr node); static GtkWidget *get_widget (FilterElement *fe); static void build_code (FilterElement *fe, GString *out, struct _FilterPart *fds); static void format_sexp (FilterElement *, GString *); @@ -62,10 +62,10 @@ static void filter_datespec_finalise (GObject *obj); typedef struct _timespan { guint32 seconds; - const char *past_singular; - const char *past_plural; - const char *future_singular; - const char *future_plural; + const gchar *past_singular; + const gchar *past_plural; + const gchar *future_singular; + const gchar *future_plural; float max; } timespan; @@ -97,7 +97,7 @@ struct _FilterDatespecPrivate { GtkWidget *label_button; GtkWidget *notebook_type, *combobox_type, *calendar_specify, *spin_relative, *combobox_relative, *combobox_past_future; FilterDatespec_type type; - int span; + gint span; }; static FilterElementClass *parent_class; @@ -217,19 +217,19 @@ xml_encode (FilterElement *fe) { xmlNodePtr value, work; FilterDatespec *fds = (FilterDatespec *)fe; - char str[32]; + gchar str[32]; d(printf ("Encoding datespec as xml\n")); - value = xmlNewNode (NULL, (const unsigned char *)"value"); - xmlSetProp (value, (const unsigned char *)"name", (unsigned char *)fe->name); - xmlSetProp (value, (const unsigned char *)"type", (const unsigned char *)"datespec"); + value = xmlNewNode (NULL, (const guchar *)"value"); + xmlSetProp (value, (const guchar *)"name", (guchar *)fe->name); + xmlSetProp (value, (const guchar *)"type", (const guchar *)"datespec"); - work = xmlNewChild (value, NULL, (const unsigned char *)"datespec", NULL); + work = xmlNewChild (value, NULL, (const guchar *)"datespec", NULL); sprintf (str, "%d", fds->type); - xmlSetProp (work, (const unsigned char *)"type", (unsigned char *)str); + xmlSetProp (work, (const guchar *)"type", (guchar *)str); sprintf (str, "%d", (int)fds->value); - xmlSetProp (work, (const unsigned char *)"value", (unsigned char *)str); + xmlSetProp (work, (const guchar *)"value", (guchar *)str); return value; } @@ -244,16 +244,16 @@ xml_decode (FilterElement *fe, xmlNodePtr node) d(printf ("Decoding datespec from xml %p\n", fe)); xmlFree (fe->name); - fe->name = (char *)xmlGetProp (node, (const unsigned char *)"name"); + fe->name = (gchar *)xmlGetProp (node, (const guchar *)"name"); n = node->children; while (n) { - if (!strcmp ((char *)n->name, "datespec")) { - val = xmlGetProp (n, (const unsigned char *)"type"); - fds->type = atoi ((char *)val); + if (!strcmp ((gchar *)n->name, "datespec")) { + val = xmlGetProp (n, (const guchar *)"type"); + fds->type = atoi ((gchar *)val); xmlFree (val); - val = xmlGetProp (n, (const unsigned char *)"value"); - fds->value = atoi ((char *)val); + val = xmlGetProp (n, (const guchar *)"value"); + fds->value = atoi ((gchar *)val); xmlFree (val); break; } @@ -266,7 +266,7 @@ xml_decode (FilterElement *fe, xmlNodePtr node) static int get_best_span (time_t val) { - int i; + gint i; for (i=N_TIMESPANS-1;i>=0;i--) { if (val % timespans[i].seconds == 0) @@ -280,8 +280,8 @@ get_best_span (time_t val) static void set_button (FilterDatespec *fds) { - char buf[128]; - char *label = buf; + gchar buf[128]; + gchar *label = buf; switch (fds->type) { case FDST_UNKNOWN: @@ -301,7 +301,7 @@ set_button (FilterDatespec *fds) if (fds->value == 0) label = _("now"); else { - int span, count; + gint span, count; span = get_best_span(fds->value); count = fds->value / timespans[span].seconds; @@ -312,7 +312,7 @@ set_button (FilterDatespec *fds) if (fds->value == 0) label = _("now"); else { - int span, count; + gint span, count; span = get_best_span(fds->value); count = fds->value / timespans[span].seconds; @@ -344,7 +344,7 @@ get_values (FilterDatespec *fds) break; } case FDST_X_FUTURE: case FDST_X_AGO: { - int val; + gint val; val = gtk_spin_button_get_value_as_int((GtkSpinButton *)p->spin_relative); fds->value = timespans[p->span].seconds * val; @@ -360,7 +360,7 @@ get_values (FilterDatespec *fds) static void set_values (FilterDatespec *fds) { - int note_type; + gint note_type; struct _FilterDatespecPrivate *p = PRIV(fds); @@ -430,7 +430,7 @@ button_clicked (GtkButton *button, FilterDatespec *fds) GtkWidget *toplevel; GtkDialog *dialog; GladeXML *gui; - char *filter_glade = g_build_filename (EVOLUTION_GLADEDIR, + gchar *filter_glade = g_build_filename (EVOLUTION_GLADEDIR, "filter.glade", NULL); diff --git a/filter/filter-element.c b/filter/filter-element.c index 1fa0a14ee8..f2d65d63b4 100644 --- a/filter/filter-element.c +++ b/filter/filter-element.c @@ -31,14 +31,14 @@ #include "filter-element.h" struct _element_type { - char *name; + gchar *name; FilterElementFunc create; - void *data; + gpointer data; }; static gboolean validate (FilterElement *fe); -static int element_eq(FilterElement *fe, FilterElement *cm); +static gint element_eq(FilterElement *fe, FilterElement *cm); static void xml_create(FilterElement *fe, xmlNodePtr node); static FilterElement *clone(FilterElement *fe); static void copy_value(FilterElement *de, FilterElement *se); @@ -122,7 +122,7 @@ filter_element_validate (FilterElement *fe) return FILTER_ELEMENT_GET_CLASS (fe)->validate (fe); } -int +gint filter_element_eq (FilterElement *fe, FilterElement *cm) { FilterElementClass *klass; @@ -168,7 +168,7 @@ filter_element_xml_encode (FilterElement *fe) * * Return value: **/ -int +gint filter_element_xml_decode (FilterElement *fe, xmlNodePtr node) { return FILTER_ELEMENT_GET_CLASS (fe)->xml_decode (fe, node); @@ -254,7 +254,7 @@ element_eq (FilterElement *fe, FilterElement *cm) static void xml_create (FilterElement *fe, xmlNodePtr node) { - fe->name = (char *)xmlGetProp (node, (const unsigned char *)"name"); + fe->name = (gchar *)xmlGetProp (node, (const guchar *)"name"); } static FilterElement * @@ -288,7 +288,7 @@ copy_value(FilterElement *de, FilterElement *se) if (((FilterInput *)se)->values) filter_input_set_value((FilterInput*)de, ((FilterInput *)se)->values->data); } else if (IS_FILTER_INT(de)) { - ((FilterInt *)de)->val = atoi((char *) ((FilterInput *)se)->values->data); + ((FilterInt *)de)->val = atoi((gchar *) ((FilterInput *)se)->values->data); } } else if (IS_FILTER_COLOUR(se)) { if (IS_FILTER_COLOUR(de)) { @@ -312,7 +312,7 @@ copy_value(FilterElement *de, FilterElement *se) } else if (IS_FILTER_INPUT(de)) { FilterInt *s = (FilterInt *)se; FilterInput *d = (FilterInput *)de; - char *v; + gchar *v; v = g_strdup_printf("%d", s->val); filter_input_set_value(d, v); diff --git a/filter/filter-element.h b/filter/filter-element.h index 76894542a2..4c105a77c3 100644 --- a/filter/filter-element.h +++ b/filter/filter-element.h @@ -38,12 +38,12 @@ typedef struct _FilterElement FilterElement; typedef struct _FilterElementClass FilterElementClass; -typedef FilterElement *(*FilterElementFunc)(void *data); +typedef FilterElement *(*FilterElementFunc)(gpointer data); struct _FilterElement { GObject parent_object; - char *name; + gchar *name; gpointer data; }; @@ -54,11 +54,11 @@ struct _FilterElementClass { /* virtual methods */ gboolean (*validate) (FilterElement *fe); - int (*eq) (FilterElement *fe, FilterElement *cm); + gint (*eq) (FilterElement *fe, FilterElement *cm); void (*xml_create) (FilterElement *, xmlNodePtr); xmlNodePtr (*xml_encode) (FilterElement *); - int (*xml_decode) (FilterElement *, xmlNodePtr); + gint (*xml_decode) (FilterElement *, xmlNodePtr); FilterElement *(*clone) (FilterElement *fe); void (*copy_value)(FilterElement *fe, FilterElement *se); diff --git a/filter/filter-file.c b/filter/filter-file.c index 2c0ac87c7f..0d421042e6 100644 --- a/filter/filter-file.c +++ b/filter/filter-file.c @@ -38,10 +38,10 @@ #define d(x) static gboolean validate (FilterElement *fe); -static int file_eq (FilterElement *fe, FilterElement *cm); +static gint file_eq (FilterElement *fe, FilterElement *cm); static void xml_create (FilterElement *fe, xmlNodePtr node); static xmlNodePtr xml_encode (FilterElement *fe); -static int xml_decode (FilterElement *fe, xmlNodePtr node); +static gint xml_decode (FilterElement *fe, xmlNodePtr node); static GtkWidget *get_widget (FilterElement *fe); static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff); static void format_sexp (FilterElement *, GString *); @@ -131,18 +131,18 @@ filter_file_new (void) FilterFile * -filter_file_new_type_name (const char *type) +filter_file_new_type_name (const gchar *type) { FilterFile *file; file = filter_file_new (); - file->type = (char *)xmlStrdup ((xmlChar *)type); + file->type = (gchar *)xmlStrdup ((xmlChar *)type); return file; } void -filter_file_set_path (FilterFile *file, const char *path) +filter_file_set_path (FilterFile *file, const gchar *path) { g_free (file->path); file->path = g_strdup (path); @@ -214,12 +214,12 @@ xml_encode (FilterElement *fe) d(printf ("Encoding %s as xml\n", type)); - value = xmlNewNode (NULL, (const unsigned char *)"value"); - xmlSetProp (value, (const unsigned char *)"name", (unsigned char *)fe->name); - xmlSetProp (value, (const unsigned char *)"type", (unsigned char *)type); + value = xmlNewNode (NULL, (const guchar *)"value"); + xmlSetProp (value, (const guchar *)"name", (guchar *)fe->name); + xmlSetProp (value, (const guchar *)"type", (guchar *)type); - cur = xmlNewChild (value, NULL, (unsigned char *)type, NULL); - xmlNodeSetContent (cur, (unsigned char *)file->path); + cur = xmlNewChild (value, NULL, (guchar *)type, NULL); + xmlNodeSetContent (cur, (guchar *)file->path); return value; } @@ -228,11 +228,11 @@ static int xml_decode (FilterElement *fe, xmlNodePtr node) { FilterFile *file = (FilterFile *)fe; - char *name, *str, *type; + gchar *name, *str, *type; xmlNodePtr n; - name = (char *)xmlGetProp (node, (const unsigned char *)"name"); - type = (char *)xmlGetProp (node, (const unsigned char *)"type"); + name = (gchar *)xmlGetProp (node, (const guchar *)"name"); + type = (gchar *)xmlGetProp (node, (const guchar *)"type"); d(printf("Decoding %s from xml %p\n", type, fe)); d(printf ("Name = %s\n", name)); @@ -247,8 +247,8 @@ xml_decode (FilterElement *fe, xmlNodePtr node) n = node->children; while (n != NULL) { - if (!strcmp ((char *)n->name, type)) { - str = (char *)xmlNodeGetContent (n); + if (!strcmp ((gchar *)n->name, type)) { + str = (gchar *)xmlNodeGetContent (n); file->path = g_strdup (str ? str : ""); xmlFree (str); @@ -268,7 +268,7 @@ static void filename_changed (GtkWidget *widget, FilterElement *fe) { FilterFile *file = (FilterFile *) fe; - const char *new; + const gchar *new; new = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); g_free (file->path); diff --git a/filter/filter-file.h b/filter/filter-file.h index 02dabdb2e8..3aa30adbf1 100644 --- a/filter/filter-file.h +++ b/filter/filter-file.h @@ -44,8 +44,8 @@ typedef struct _FilterFileClass FilterFileClass; struct _FilterFile { FilterElement parent_object; - char *type; - char *path; + gchar *type; + gchar *path; }; struct _FilterFileClass { @@ -61,10 +61,10 @@ GType filter_file_get_type (void); FilterFile *filter_file_new (void); -FilterFile *filter_file_new_type_name (const char *type); +FilterFile *filter_file_new_type_name (const gchar *type); /* methods */ -void filter_file_set_path (FilterFile *file, const char *path); +void filter_file_set_path (FilterFile *file, const gchar *path); #ifdef __cplusplus } diff --git a/filter/filter-input.c b/filter/filter-input.c index 30d6ed9c45..5eeed60de7 100644 --- a/filter/filter-input.c +++ b/filter/filter-input.c @@ -39,10 +39,10 @@ #define d(x) static gboolean validate (FilterElement *fe); -static int input_eq (FilterElement *fe, FilterElement *cm); +static gint input_eq (FilterElement *fe, FilterElement *cm); static void xml_create (FilterElement *fe, xmlNodePtr node); static xmlNodePtr xml_encode (FilterElement *fe); -static int xml_decode (FilterElement *fe, xmlNodePtr node); +static gint xml_decode (FilterElement *fe, xmlNodePtr node); static GtkWidget *get_widget (FilterElement *fe); static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff); static void format_sexp (FilterElement *, GString *); @@ -132,12 +132,12 @@ filter_input_new (void) } FilterInput * -filter_input_new_type_name (const char *type) +filter_input_new_type_name (const gchar *type) { FilterInput *fi; fi = filter_input_new (); - fi->type = (char *)xmlStrdup ((xmlChar *)type); + fi->type = (gchar *)xmlStrdup ((xmlChar *)type); d(printf("new type %s = %p\n", type, fi)); @@ -145,7 +145,7 @@ filter_input_new_type_name (const char *type) } void -filter_input_set_value (FilterInput *fi, const char *value) +filter_input_set_value (FilterInput *fi, const gchar *value) { GList *l; @@ -168,15 +168,15 @@ validate (FilterElement *fe) gboolean valid = TRUE; if (fi->values && !strcmp (fi->type, "regex")) { - const char *pattern; + const gchar *pattern; regex_t regexpat; - int regerr; + gint regerr; pattern = fi->values->data; if ((regerr = regcomp (®expat, pattern, REG_EXTENDED | REG_NEWLINE | REG_ICASE))) { size_t reglen; - char *regmsg; + gchar *regmsg; /* regerror gets called twice to get the full error string length to do proper posix error reporting */ @@ -203,10 +203,10 @@ validate (FilterElement *fe) static int list_eq (GList *al, GList *bl) { - int truth = TRUE; + gint truth = TRUE; while (truth && al && bl) { - truth = strcmp ((char *) al->data, (char *) bl->data) == 0; + truth = strcmp ((gchar *) al->data, (gchar *) bl->data) == 0; al = al->next; bl = bl->next; } @@ -243,15 +243,15 @@ xml_encode (FilterElement *fe) d(printf ("Encoding %s as xml\n", type)); - value = xmlNewNode (NULL, (const unsigned char *)"value"); - xmlSetProp (value, (const unsigned char *)"name", (unsigned char *)fe->name); - xmlSetProp (value, (const unsigned char *)"type", (unsigned char *)type); + value = xmlNewNode (NULL, (const guchar *)"value"); + xmlSetProp (value, (const guchar *)"name", (guchar *)fe->name); + xmlSetProp (value, (const guchar *)"type", (guchar *)type); l = fi->values; while (l) { xmlNodePtr cur; xmlChar *str = l->data; - cur = xmlNewChild (value, NULL, (unsigned char *)type, NULL); + cur = xmlNewChild (value, NULL, (guchar *)type, NULL); str = xmlEncodeEntitiesReentrant (NULL, str); xmlNodeSetContent (cur, str); @@ -267,7 +267,7 @@ static int xml_decode (FilterElement *fe, xmlNodePtr node) { FilterInput *fi = (FilterInput *)fe; - char *name, *str, *type; + gchar *name, *str, *type; xmlNodePtr n; GList *l; @@ -279,8 +279,8 @@ xml_decode (FilterElement *fe, xmlNodePtr node) g_list_free (fi->values); fi->values = NULL; - name = (char *)xmlGetProp (node, (const unsigned char *)"name"); - type = (char *)xmlGetProp (node, (const unsigned char *)"type"); + name = (gchar *)xmlGetProp (node, (const guchar *)"name"); + type = (gchar *)xmlGetProp (node, (const guchar *)"type"); d(printf("Decoding %s from xml %p\n", type, fe)); d(printf ("Name = %s\n", name)); @@ -290,9 +290,9 @@ xml_decode (FilterElement *fe, xmlNodePtr node) fi->type = type; n = node->children; while (n) { - if (!strcmp ((char *)n->name, type)) { - if (!(str = (char *)xmlNodeGetContent (n))) - str = (char *)xmlStrdup ((const unsigned char *)""); + if (!strcmp ((gchar *)n->name, type)) { + if (!(str = (gchar *)xmlNodeGetContent (n))) + str = (gchar *)xmlStrdup ((const guchar *)""); d(printf (" '%s'\n", str)); fi->values = g_list_append (fi->values, g_strdup (str)); @@ -310,7 +310,7 @@ static void entry_changed (GtkEntry *entry, FilterElement *fe) { FilterInput *fi = (FilterInput *) fe; - const char *new; + const gchar *new; GList *l; new = gtk_entry_get_text (entry); @@ -337,7 +337,7 @@ get_widget (FilterElement *fe) entry = gtk_entry_new (); if (fi->values && fi->values->data) - gtk_entry_set_text (GTK_ENTRY (entry), (const char *) fi->values->data); + gtk_entry_set_text (GTK_ENTRY (entry), (const gchar *) fi->values->data); g_signal_connect (entry, "changed", G_CALLBACK (entry_changed), fe); diff --git a/filter/filter-input.h b/filter/filter-input.h index ac71847a76..9a5e181eaa 100644 --- a/filter/filter-input.h +++ b/filter/filter-input.h @@ -39,7 +39,7 @@ typedef struct _FilterInputClass FilterInputClass; struct _FilterInput { FilterElement parent_object; - char *type; /* name of type */ + gchar *type; /* name of type */ GList *values; /* strings */ }; @@ -54,9 +54,9 @@ struct _FilterInputClass { GType filter_input_get_type (void); FilterInput *filter_input_new (void); -FilterInput *filter_input_new_type_name (const char *type); +FilterInput *filter_input_new_type_name (const gchar *type); /* methods */ -void filter_input_set_value (FilterInput *fi, const char *value); +void filter_input_set_value (FilterInput *fi, const gchar *value); #endif /* ! _FILTER_INPUT_H */ diff --git a/filter/filter-int.c b/filter/filter-int.c index 170657e2dd..220e12fb38 100644 --- a/filter/filter-int.c +++ b/filter/filter-int.c @@ -32,11 +32,11 @@ #define d(x) -static int int_eq (FilterElement *fe, FilterElement *cm); +static gint int_eq (FilterElement *fe, FilterElement *cm); static FilterElement *int_clone(FilterElement *fe); static void xml_create (FilterElement *fe, xmlNodePtr node); static xmlNodePtr xml_encode (FilterElement *fe); -static int xml_decode (FilterElement *fe, xmlNodePtr node); +static gint xml_decode (FilterElement *fe, xmlNodePtr node); static GtkWidget *get_widget (FilterElement *fe); static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff); static void format_sexp (FilterElement *fe, GString *out); @@ -125,7 +125,7 @@ filter_int_new (void) } FilterInt * -filter_int_new_type (const char *type, int min, int max) +filter_int_new_type (const gchar *type, gint min, gint max) { FilterInt *fi; @@ -139,7 +139,7 @@ filter_int_new_type (const char *type, int min, int max) } void -filter_int_set_value (FilterInt *fi, int val) +filter_int_set_value (FilterInt *fi, gint val) { fi->val = val; } @@ -176,19 +176,19 @@ xml_encode (FilterElement *fe) { xmlNodePtr value; FilterInt *fs = (FilterInt *)fe; - char intval[32]; - const char *type; + gchar intval[32]; + const gchar *type; type = fs->type?fs->type:"integer"; d(printf("Encoding %s as xml\n", type)); - value = xmlNewNode (NULL, (const unsigned char *)"value"); - xmlSetProp (value, (const unsigned char *)"name", (unsigned char *)fe->name); - xmlSetProp (value, (const unsigned char *)"type", (unsigned char *)type); + value = xmlNewNode (NULL, (const guchar *)"value"); + xmlSetProp (value, (const guchar *)"name", (guchar *)fe->name); + xmlSetProp (value, (const guchar *)"type", (guchar *)type); sprintf(intval, "%d", fs->val); - xmlSetProp (value, (unsigned char *)type, (unsigned char *)intval); + xmlSetProp (value, (guchar *)type, (guchar *)intval); return value; } @@ -197,23 +197,23 @@ static int xml_decode (FilterElement *fe, xmlNodePtr node) { FilterInt *fs = (FilterInt *)fe; - char *name, *type; - char *intval; + gchar *name, *type; + gchar *intval; d(printf("Decoding integer from xml %p\n", fe)); - name = (char *)xmlGetProp (node, (const unsigned char *)"name"); + name = (gchar *)xmlGetProp (node, (const guchar *)"name"); d(printf ("Name = %s\n", name)); xmlFree (fe->name); fe->name = name; - type = (char *)xmlGetProp(node, (const unsigned char *)"type"); + type = (gchar *)xmlGetProp(node, (const guchar *)"type"); d(printf ("Type = %s\n", type)); g_free(fs->type); fs->type = g_strdup(type); xmlFree(type); - intval = (char *)xmlGetProp (node, (unsigned char *)(fs->type ? fs->type : "integer")); + intval = (gchar *)xmlGetProp (node, (guchar *)(fs->type ? fs->type : "integer")); if (intval) { d(printf ("Value = %s\n", intval)); fs->val = atoi (intval); diff --git a/filter/filter-int.h b/filter/filter-int.h index 60e1b2bf85..4167bc8cf3 100644 --- a/filter/filter-int.h +++ b/filter/filter-int.h @@ -38,10 +38,10 @@ typedef struct _FilterIntClass FilterIntClass; struct _FilterInt { FilterElement parent_object; - char *type; - int val; - int min; - int max; + gchar *type; + gint val; + gint min; + gint max; }; struct _FilterIntClass { @@ -54,8 +54,8 @@ struct _FilterIntClass { GType filter_int_get_type (void); FilterInt *filter_int_new (void); -FilterInt *filter_int_new_type (const char *type, int min, int max); -void filter_int_set_value (FilterInt *fi, int val); +FilterInt *filter_int_new_type (const gchar *type, gint min, gint max); +void filter_int_set_value (FilterInt *fi, gint val); /* methods */ diff --git a/filter/filter-option.c b/filter/filter-option.c index f4b208c59d..5341705986 100644 --- a/filter/filter-option.c +++ b/filter/filter-option.c @@ -37,10 +37,10 @@ #define d(x) -static int option_eq (FilterElement *fe, FilterElement *cm); +static gint option_eq (FilterElement *fe, FilterElement *cm); static void xml_create (FilterElement *fe, xmlNodePtr node); static xmlNodePtr xml_encode (FilterElement *fe); -static int xml_decode (FilterElement *fe, xmlNodePtr node); +static gint xml_decode (FilterElement *fe, xmlNodePtr node); static FilterElement *clone (FilterElement *fe); static GtkWidget *get_widget (FilterElement *fe); static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff); @@ -108,7 +108,7 @@ filter_option_init (FilterOption *fo) } static void -free_option (struct _filter_option *o, void *data) +free_option (struct _filter_option *o, gpointer data) { g_free (o->title); g_free (o->value); @@ -142,7 +142,7 @@ filter_option_new (void) } static struct _filter_option * -find_option (FilterOption *fo, const char *name) +find_option (FilterOption *fo, const gchar *name) { GList *l = fo->options; struct _filter_option *op; @@ -159,7 +159,7 @@ find_option (FilterOption *fo, const char *name) } void -filter_option_set_current (FilterOption *option, const char *name) +filter_option_set_current (FilterOption *option, const gchar *name) { g_return_if_fail (IS_FILTER_OPTION(option)); @@ -168,7 +168,7 @@ filter_option_set_current (FilterOption *option, const char *name) /* used by implementers to add additional options */ struct _filter_option * -filter_option_add(FilterOption *fo, const char *value, const char *title, const char *code, gboolean is_dynamic) +filter_option_add(FilterOption *fo, const gchar *value, const gchar *title, const gchar *code, gboolean is_dynamic) { struct _filter_option *op; @@ -188,7 +188,7 @@ filter_option_add(FilterOption *fo, const char *value, const char *title, const return op; } -const char * +const gchar * filter_option_get_current (FilterOption *option) { g_return_val_if_fail (IS_FILTER_OPTION (option), NULL); @@ -232,24 +232,24 @@ xml_create (FilterElement *fe, xmlNodePtr node) n = node->children; while (n) { - if (!strcmp ((char *)n->name, "option")) { - char *tmp, *value, *title = NULL, *code = NULL; + if (!strcmp ((gchar *)n->name, "option")) { + gchar *tmp, *value, *title = NULL, *code = NULL; - value = (char *)xmlGetProp (n, (const unsigned char *)"value"); + value = (gchar *)xmlGetProp (n, (const guchar *)"value"); work = n->children; while (work) { - if (!strcmp ((char *)work->name, "title") || !strcmp ((char *)work->name, "_title")) { + if (!strcmp ((gchar *)work->name, "title") || !strcmp ((gchar *)work->name, "_title")) { if (!title) { - if (!(tmp = (char *)xmlNodeGetContent (work))) - tmp = (char *)xmlStrdup ((const unsigned char *)""); + if (!(tmp = (gchar *)xmlNodeGetContent (work))) + tmp = (gchar *)xmlStrdup ((const guchar *)""); title = g_strdup (tmp); xmlFree (tmp); } - } else if (!strcmp ((char *)work->name, "code")) { + } else if (!strcmp ((gchar *)work->name, "code")) { if (!code) { - if (!(tmp = (char*)xmlNodeGetContent (work))) - tmp = (char *)xmlStrdup ((const unsigned char *)""); + if (!(tmp = (gchar *)xmlNodeGetContent (work))) + tmp = (gchar *)xmlStrdup ((const guchar *)""); code = g_strdup (tmp); xmlFree (tmp); @@ -262,7 +262,7 @@ xml_create (FilterElement *fe, xmlNodePtr node) xmlFree (value); g_free (title); g_free (code); - } else if (g_str_equal ((char *)n->name, "dynamic")) { + } else if (g_str_equal ((gchar *)n->name, "dynamic")) { if (fo->dynamic_func) { g_warning ("Only one 'dynamic' node is acceptable in the optionlist '%s'", fe->name); } else { @@ -274,12 +274,12 @@ xml_create (FilterElement *fe, xmlNodePtr node) */ xmlChar *fn; - fn = xmlGetProp (n, (const unsigned char *)"func"); + fn = xmlGetProp (n, (const guchar *)"func"); if (fn && *fn) { GSList *items, *i; struct _filter_option *op; - fo->dynamic_func = g_strdup ((const char *)fn); + fo->dynamic_func = g_strdup ((const gchar *)fn); /* get options now, to have them available when reading saved rules */ items = get_dynamic_options (fo); @@ -313,11 +313,11 @@ xml_encode (FilterElement *fe) FilterOption *fo = (FilterOption *)fe; d(printf ("Encoding option as xml\n")); - value = xmlNewNode (NULL, (const unsigned char *)"value"); - xmlSetProp (value, (const unsigned char *)"name", (unsigned char *)fe->name); - xmlSetProp (value, (const unsigned char *)"type", (unsigned char *)fo->type); + value = xmlNewNode (NULL, (const guchar *)"value"); + xmlSetProp (value, (const guchar *)"name", (guchar *)fe->name); + xmlSetProp (value, (const guchar *)"type", (guchar *)fo->type); if (fo->current) - xmlSetProp (value, (const unsigned char *)"value", (unsigned char *)fo->current->value); + xmlSetProp (value, (const guchar *)"value", (guchar *)fo->current->value); return value; } @@ -326,12 +326,12 @@ static int xml_decode (FilterElement *fe, xmlNodePtr node) { FilterOption *fo = (FilterOption *)fe; - char *value; + gchar *value; d(printf ("Decoding option from xml\n")); xmlFree (fe->name); - fe->name = (char *)xmlGetProp (node, (const unsigned char *)"name"); - value = (char *)xmlGetProp (node, (const unsigned char *)"value"); + fe->name = (gchar *)xmlGetProp (node, (const guchar *)"name"); + value = (gchar *)xmlGetProp (node, (const guchar *)"value"); if (value) { fo->current = find_option (fo, value); xmlFree (value); @@ -379,7 +379,7 @@ get_widget (FilterElement *fe) GtkWidget *combobox; GList *l; struct _filter_option *op; - int index = 0, current = 0; + gint index = 0, current = 0; if (fo->dynamic_func) { /* it is dynamically filled, thus remove all dynamics and put there the fresh ones */ diff --git a/filter/filter-option.h b/filter/filter-option.h index 8a4931a009..9fa1670951 100644 --- a/filter/filter-option.h +++ b/filter/filter-option.h @@ -37,9 +37,9 @@ typedef struct _FilterOption FilterOption; typedef struct _FilterOptionClass FilterOptionClass; struct _filter_option { - char *title; /* button title */ - char *value; /* value, if it has one */ - char *code; /* used to string code segments together */ + gchar *title; /* button title */ + gchar *value; /* value, if it has one */ + gchar *code; /* used to string code segments together */ gboolean is_dynamic; /* whether is the option dynamic, FALSE if static */ }; @@ -47,11 +47,11 @@ struct _filter_option { struct _FilterOption { FilterElement parent_object; - const char *type; /* static memory, type name written to xml */ + const gchar *type; /* static memory, type name written to xml */ GList *options; struct _filter_option *current; - char *dynamic_func; /* name of the dynamic fill func, called in get_widget */ + gchar *dynamic_func; /* name of the dynamic fill func, called in get_widget */ }; struct _FilterOptionClass { @@ -66,10 +66,10 @@ GType filter_option_get_type (void); FilterOption *filter_option_new (void); /* methods */ -void filter_option_set_current (FilterOption *option, const char *name); -const char *filter_option_get_current (FilterOption *option); +void filter_option_set_current (FilterOption *option, const gchar *name); +const gchar *filter_option_get_current (FilterOption *option); -struct _filter_option *filter_option_add (FilterOption *fo, const char *name, const char *title, const char *code, gboolean is_dynamic); +struct _filter_option *filter_option_add (FilterOption *fo, const gchar *name, const gchar *title, const gchar *code, gboolean is_dynamic); void filter_option_remove_all (FilterOption *fo); #endif /* ! _FILTER_OPTION_H */ diff --git a/filter/filter-part.c b/filter/filter-part.c index 799e7fcb36..2247810e6c 100644 --- a/filter/filter-part.c +++ b/filter/filter-part.c @@ -136,10 +136,10 @@ filter_part_validate (FilterPart *fp) return correct; } -int +gint filter_part_eq (FilterPart *fp, FilterPart *fc) { - int truth; + gint truth; GList *al, *bl; truth = ((fp->name && fc->name && strcmp(fp->name, fc->name) == 0) @@ -163,22 +163,22 @@ filter_part_eq (FilterPart *fp, FilterPart *fc) return truth && al == NULL && bl == NULL; } -int +gint filter_part_xml_create (FilterPart *ff, xmlNodePtr node, RuleContext *rc) { xmlNodePtr n; - char *type, *str; + gchar *type, *str; FilterElement *el; - str = (char *)xmlGetProp (node, (const unsigned char *)"name"); + str = (gchar *)xmlGetProp (node, (const guchar *)"name"); ff->name = g_strdup (str); if (str) xmlFree (str); n = node->children; while (n) { - if (!strcmp ((char *)n->name, "input")) { - type = (char *)xmlGetProp (n, (const unsigned char *)"type"); + if (!strcmp ((gchar *)n->name, "input")) { + type = (gchar *)xmlGetProp (n, (const guchar *)"type"); d(printf ("creating new element type input '%s'\n", type)); if (type != NULL && (el = rule_context_new_element(rc, type)) != NULL) { @@ -189,16 +189,16 @@ filter_part_xml_create (FilterPart *ff, xmlNodePtr node, RuleContext *rc) } else { g_warning ("Invalid xml format, missing/unknown input type"); } - } else if (!strcmp ((char *)n->name, "title") || !strcmp ((char *)n->name, "_title")) { + } else if (!strcmp ((gchar *)n->name, "title") || !strcmp ((gchar *)n->name, "_title")) { if (!ff->title) { - str = (char *)xmlNodeGetContent (n); + str = (gchar *)xmlNodeGetContent (n); ff->title = g_strdup (str); if (str) xmlFree (str); } - } else if (!strcmp ((char *)n->name, "code")) { + } else if (!strcmp ((gchar *)n->name, "code")) { if (!ff->code) { - str = (char *)xmlNodeGetContent (n); + str = (gchar *)xmlNodeGetContent (n); ff->code = g_strdup (str); if (str) xmlFree (str); @@ -221,8 +221,8 @@ filter_part_xml_encode (FilterPart *fp) g_return_val_if_fail (fp != NULL, NULL); - part = xmlNewNode (NULL, (const unsigned char *)"part"); - xmlSetProp (part, (const unsigned char *)"name", (unsigned char *)fp->name); + part = xmlNewNode (NULL, (const guchar *)"part"); + xmlSetProp (part, (const guchar *)"name", (guchar *)fp->name); l = fp->elements; while (l) { fe = l->data; @@ -235,20 +235,20 @@ filter_part_xml_encode (FilterPart *fp) } -int +gint filter_part_xml_decode (FilterPart *fp, xmlNodePtr node) { FilterElement *fe; xmlNodePtr n; - char *name; + gchar *name; g_return_val_if_fail (fp != NULL, -1); g_return_val_if_fail (node != NULL, -1); n = node->children; while (n) { - if (!strcmp ((char *)n->name, "value")) { - name = (char *)xmlGetProp (n, (const unsigned char *)"name"); + if (!strcmp ((gchar *)n->name, "value")) { + name = (gchar *)xmlGetProp (n, (const guchar *)"name"); d(printf ("finding element part %p %s = %p\n", name, name, fe)); fe = filter_part_find_element (fp, name); d(printf ("finding element part %p %s = %p\n", name, name, fe)); @@ -315,7 +315,7 @@ filter_part_copy_values (FilterPart *dst, FilterPart *src) } FilterElement * -filter_part_find_element (FilterPart *ff, const char *name) +filter_part_find_element (FilterPart *ff, const gchar *name) { GList *l = ff->elements; FilterElement *fe; @@ -412,7 +412,7 @@ filter_part_build_code_list (GList *l, GString *out) * Return value: **/ FilterPart * -filter_part_find_list (GList *l, const char *name) +filter_part_find_list (GList *l, const gchar *name) { FilterPart *part; @@ -469,11 +469,11 @@ filter_part_next_list (GList *l, FilterPart *last) * Expands the variables in string @str based on the values of the part. **/ void -filter_part_expand_code (FilterPart *ff, const char *source, GString *out) +filter_part_expand_code (FilterPart *ff, const gchar *source, GString *out) { - const char *newstart, *start, *end; - char *name = alloca (32); - int len, namelen = 32; + const gchar *newstart, *start, *end; + gchar *name = alloca (32); + gint len, namelen = 32; FilterElement *fe; start = source; @@ -505,7 +505,7 @@ filter_part_expand_code (FilterPart *ff, const char *source, GString *out) } #if 0 -int main(int argc, char **argv) +gint main(gint argc, gchar **argv) { GtkWidget *dialog, *w; xmlDocPtr system; diff --git a/filter/filter-part.h b/filter/filter-part.h index 1827433b1c..10337b95df 100644 --- a/filter/filter-part.h +++ b/filter/filter-part.h @@ -45,9 +45,9 @@ struct _FilterPart { GObject parent_object; struct _FilterPartPrivate *priv; - char *name; - char *title; - char *code; + gchar *name; + gchar *title; + gchar *code; GList *elements; }; @@ -64,25 +64,25 @@ FilterPart *filter_part_new (void); /* methods */ gboolean filter_part_validate (FilterPart *fp); -int filter_part_eq (FilterPart *fp, FilterPart *fc); +gint filter_part_eq (FilterPart *fp, FilterPart *fc); -int filter_part_xml_create (FilterPart *ff, xmlNodePtr node, struct _RuleContext *rc); +gint filter_part_xml_create (FilterPart *ff, xmlNodePtr node, struct _RuleContext *rc); xmlNodePtr filter_part_xml_encode (FilterPart *fe); -int filter_part_xml_decode (FilterPart *fe, xmlNodePtr node); +gint filter_part_xml_decode (FilterPart *fe, xmlNodePtr node); FilterPart *filter_part_clone (FilterPart *fp); void filter_part_copy_values (FilterPart *dfp, FilterPart *sfp); -FilterElement *filter_part_find_element (FilterPart *ff, const char *name); +FilterElement *filter_part_find_element (FilterPart *ff, const gchar *name); GtkWidget *filter_part_get_widget (FilterPart *ff); void filter_part_build_code (FilterPart *ff, GString *out); -void filter_part_expand_code (FilterPart *ff, const char *str, GString *out); +void filter_part_expand_code (FilterPart *ff, const gchar *str, GString *out); /* static functions */ void filter_part_build_code_list (GList *l, GString *out); -FilterPart *filter_part_find_list (GList *l, const char *name); +FilterPart *filter_part_find_list (GList *l, const gchar *name); FilterPart *filter_part_next_list (GList *l, FilterPart *last); #endif /* ! _FILTER_PART_H */ diff --git a/filter/filter-rule.c b/filter/filter-rule.c index cdc9f374f1..00610c48ea 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -36,10 +36,10 @@ #define d(x) -static int validate(FilterRule *); -static int rule_eq(FilterRule *fr, FilterRule *cm); +static gint validate(FilterRule *); +static gint rule_eq(FilterRule *fr, FilterRule *cm); static xmlNodePtr xml_encode (FilterRule *); -static int xml_decode (FilterRule *, xmlNodePtr, RuleContext *); +static gint xml_decode (FilterRule *, xmlNodePtr, RuleContext *); static void build_code (FilterRule *, GString * out); static void rule_copy (FilterRule *dest, FilterRule *src); static GtkWidget *get_widget (FilterRule * fr, struct _RuleContext *f); @@ -51,7 +51,7 @@ static void filter_rule_finalise (GObject *obj); #define _PRIVATE(x) (((FilterRule *)(x))->priv) struct _FilterRulePrivate { - int frozen; + gint frozen; }; static GObjectClass *parent_class = NULL; @@ -166,7 +166,7 @@ filter_rule_clone (FilterRule *base) } void -filter_rule_set_name (FilterRule *fr, const char *name) +filter_rule_set_name (FilterRule *fr, const gchar *name) { g_return_if_fail (IS_FILTER_RULE (fr)); @@ -181,7 +181,7 @@ filter_rule_set_name (FilterRule *fr, const char *name) } void -filter_rule_set_source (FilterRule *fr, const char *source) +filter_rule_set_source (FilterRule *fr, const gchar *source) { g_return_if_fail (IS_FILTER_RULE (fr)); @@ -195,7 +195,7 @@ filter_rule_set_source (FilterRule *fr, const char *source) filter_rule_emit_changed (fr); } -int +gint filter_rule_validate (FilterRule *fr) { g_return_val_if_fail (IS_FILTER_RULE (fr), 0); @@ -206,7 +206,7 @@ filter_rule_validate (FilterRule *fr) static int validate (FilterRule *fr) { - int valid = TRUE; + gint valid = TRUE; GList *parts; if (!fr->name || !*fr->name) { @@ -230,7 +230,7 @@ validate (FilterRule *fr) return valid; } -int +gint filter_rule_eq (FilterRule *fr, FilterRule *cm) { g_return_val_if_fail (IS_FILTER_RULE (fr), 0); @@ -243,7 +243,7 @@ filter_rule_eq (FilterRule *fr, FilterRule *cm) static int list_eq(GList *al, GList *bl) { - int truth = TRUE; + gint truth = TRUE; while (truth && al && bl) { FilterPart *a = al->data, *b = bl->data; @@ -283,16 +283,16 @@ xml_encode (FilterRule *fr) xmlNodePtr node, set, work; GList *l; - node = xmlNewNode (NULL, (const unsigned char *)"rule"); + node = xmlNewNode (NULL, (const guchar *)"rule"); - xmlSetProp (node, (const unsigned char *)"enabled", (const unsigned char *)(fr->enabled ? "true" : "false")); + xmlSetProp (node, (const guchar *)"enabled", (const guchar *)(fr->enabled ? "true" : "false")); switch (fr->grouping) { case FILTER_GROUP_ALL: - xmlSetProp (node, (const unsigned char *)"grouping", (const unsigned char *)"all"); + xmlSetProp (node, (const guchar *)"grouping", (const guchar *)"all"); break; case FILTER_GROUP_ANY: - xmlSetProp (node, (const unsigned char *)"grouping", (const unsigned char *)"any"); + xmlSetProp (node, (const guchar *)"grouping", (const guchar *)"any"); break; } @@ -300,37 +300,37 @@ xml_encode (FilterRule *fr) case FILTER_THREAD_NONE: break; case FILTER_THREAD_ALL: - xmlSetProp(node, (const unsigned char *)"threading", (const unsigned char *)"all"); + xmlSetProp(node, (const guchar *)"threading", (const guchar *)"all"); break; case FILTER_THREAD_REPLIES: - xmlSetProp(node, (const unsigned char *)"threading", (const unsigned char *)"replies"); + xmlSetProp(node, (const guchar *)"threading", (const guchar *)"replies"); break; case FILTER_THREAD_REPLIES_PARENTS: - xmlSetProp(node, (const unsigned char *)"threading", (const unsigned char *)"replies_parents"); + xmlSetProp(node, (const guchar *)"threading", (const guchar *)"replies_parents"); break; case FILTER_THREAD_SINGLE: - xmlSetProp(node, (const unsigned char *)"threading", (const unsigned char *)"single"); + xmlSetProp(node, (const guchar *)"threading", (const guchar *)"single"); break; } if (fr->source) { - xmlSetProp (node, (const unsigned char *)"source", (unsigned char *)fr->source); + xmlSetProp (node, (const guchar *)"source", (guchar *)fr->source); } else { /* set to the default filter type */ - xmlSetProp (node, (const unsigned char *)"source", (const unsigned char *)"incoming"); + xmlSetProp (node, (const guchar *)"source", (const guchar *)"incoming"); } if (fr->name) { - char *escaped = g_markup_escape_text (fr->name, -1); + gchar *escaped = g_markup_escape_text (fr->name, -1); - work = xmlNewNode (NULL, (const unsigned char *)"title"); - xmlNodeSetContent (work, (unsigned char *)escaped); + work = xmlNewNode (NULL, (const guchar *)"title"); + xmlNodeSetContent (work, (guchar *)escaped); xmlAddChild (node, work); g_free (escaped); } - set = xmlNewNode (NULL, (const unsigned char *)"partset"); + set = xmlNewNode (NULL, (const guchar *)"partset"); xmlAddChild (node, set); l = fr->parts; while (l) { @@ -346,13 +346,13 @@ static void load_set (xmlNodePtr node, FilterRule *fr, RuleContext *f) { xmlNodePtr work; - char *rulename; + gchar *rulename; FilterPart *part; work = node->children; while (work) { - if (!strcmp ((char *)work->name, "part")) { - rulename = (char *)xmlGetProp (work, (const unsigned char *)"name"); + if (!strcmp ((gchar *)work->name, "part")) { + rulename = (gchar *)xmlGetProp (work, (const guchar *)"name"); part = rule_context_find_part (f, rulename); if (part) { part = filter_part_clone (part); @@ -369,10 +369,10 @@ load_set (xmlNodePtr node, FilterRule *fr, RuleContext *f) } } -int +gint filter_rule_xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f) { - int res; + gint res; g_return_val_if_fail (IS_FILTER_RULE (fr), 0); g_return_val_if_fail (IS_RULE_CONTEXT (f), 0); @@ -391,15 +391,15 @@ static int xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f) { xmlNodePtr work; - char *grouping; - char *source; + gchar *grouping; + gchar *source; if (fr->name) { g_free (fr->name); fr->name = NULL; } - grouping = (char *)xmlGetProp (node, (const unsigned char *)"enabled"); + grouping = (gchar *)xmlGetProp (node, (const guchar *)"enabled"); if (!grouping) fr->enabled = TRUE; else { @@ -407,7 +407,7 @@ xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f) xmlFree (grouping); } - grouping = (char *)xmlGetProp (node, (const unsigned char *)"grouping"); + grouping = (gchar *)xmlGetProp (node, (const guchar *)"grouping"); if (!strcmp (grouping, "any")) fr->grouping = FILTER_GROUP_ANY; else @@ -416,7 +416,7 @@ xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f) fr->threading = FILTER_THREAD_NONE; if (f->flags & RULE_CONTEXT_THREADING - && (grouping = (char *)xmlGetProp (node, (const unsigned char *)"threading"))) { + && (grouping = (gchar *)xmlGetProp (node, (const guchar *)"threading"))) { if (!strcmp(grouping, "all")) fr->threading = FILTER_THREAD_ALL; else if (!strcmp(grouping, "replies")) @@ -429,7 +429,7 @@ xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f) } g_free (fr->source); - source = (char *)xmlGetProp (node, (const unsigned char *)"source"); + source = (gchar *)xmlGetProp (node, (const guchar *)"source"); if (source) { fr->source = g_strdup (source); xmlFree (source); @@ -440,13 +440,13 @@ xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f) work = node->children; while (work) { - if (!strcmp ((char *)work->name, "partset")) { + if (!strcmp ((gchar *)work->name, "partset")) { load_set (work, fr, f); - } else if (!strcmp ((char *)work->name, "title") || !strcmp ((char *)work->name, "_title")) { + } else if (!strcmp ((gchar *)work->name, "title") || !strcmp ((gchar *)work->name, "_title")) { if (!fr->name) { - char *str, *decstr = NULL; + gchar *str, *decstr = NULL; - str = (char *)xmlNodeGetContent (work); + str = (gchar *)xmlNodeGetContent (work); if (str) { decstr = g_strdup (_(str)); xmlFree (str); @@ -626,7 +626,7 @@ part_combobox_changed (GtkComboBox *combobox, struct _part_data *data) { FilterPart *part = NULL; FilterPart *newpart; - int index, i; + gint index, i; index = gtk_combo_box_get_active (combobox); for (i = 0, part = rule_context_next_part (data->f, part); part && i < index; i++, part = rule_context_next_part (data->f, part)) { @@ -662,7 +662,7 @@ get_rule_part_widget (RuleContext *f, FilterPart *newpart, FilterRule *fr) GtkWidget *combobox; GtkWidget *hbox; GtkWidget *p; - int index = 0, current = 0; + gint index = 0, current = 0; struct _part_data *data; data = g_malloc0 (sizeof (*data)); @@ -732,7 +732,7 @@ less_parts (GtkWidget *button, struct _rule_data *data) } static void -attach_rule (GtkWidget *rule, struct _rule_data *data, FilterPart *part, int row) +attach_rule (GtkWidget *rule, struct _rule_data *data, FilterPart *part, gint row) { GtkWidget *remove; @@ -784,7 +784,7 @@ more_parts (GtkWidget *button, struct _rule_data *data) new = rule_context_next_part (data->f, NULL); if (new) { GtkWidget *w; - int rows; + gint rows; new = filter_part_clone (new); filter_rule_add_part (data->fr, new); @@ -845,7 +845,7 @@ get_widget (FilterRule *fr, struct _RuleContext *f) gchar *text; FilterPart *part; struct _rule_data *data; - int rows, i; + gint rows, i; /* this stuff should probably be a table, but the rule parts need to be a vbox */ @@ -919,7 +919,7 @@ get_widget (FilterRule *fr, struct _RuleContext *f) gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 0); if (f->flags & RULE_CONTEXT_GROUPING) { - const char *thread_types[] = { N_("If all conditions are met"), N_("If any conditions are met") }; + const gchar *thread_types[] = { N_("If all conditions are met"), N_("If any conditions are met") }; label = gtk_label_new_with_mnemonic (_("_Find items:")); combobox = gtk_combo_box_new_text (); @@ -939,7 +939,7 @@ get_widget (FilterRule *fr, struct _RuleContext *f) } if (f->flags & RULE_CONTEXT_THREADING) { - const char *thread_types[] = { N_("None"), N_("All related"), N_("Replies"), N_("Replies and parents"), N_("No reply or parent") }; + const gchar *thread_types[] = { N_("None"), N_("All related"), N_("Replies"), N_("Replies and parents"), N_("No reply or parent") }; label = gtk_label_new_with_mnemonic (_("I_nclude threads")); combobox = gtk_combo_box_new_text (); @@ -989,7 +989,7 @@ get_widget (FilterRule *fr, struct _RuleContext *f) } FilterRule * -filter_rule_next_list (GList *l, FilterRule *last, const char *source) +filter_rule_next_list (GList *l, FilterRule *last, const gchar *source) { GList *node = l; @@ -1018,7 +1018,7 @@ filter_rule_next_list (GList *l, FilterRule *last, const char *source) } FilterRule * -filter_rule_find_list (GList * l, const char *name, const char *source) +filter_rule_find_list (GList * l, const gchar *name, const gchar *source) { while (l) { FilterRule *rule = l->data; @@ -1034,7 +1034,7 @@ filter_rule_find_list (GList * l, const char *name, const char *source) #ifdef FOR_TRANSLATIONS_ONLY -static char *list[] = { +static gchar *list[] = { N_("Incoming"), N_("Outgoing") }; #endif diff --git a/filter/filter-rule.h b/filter/filter-rule.h index 24419fec09..ecada873d1 100644 --- a/filter/filter-rule.h +++ b/filter/filter-rule.h @@ -65,13 +65,13 @@ struct _FilterRule { GObject parent_object; struct _FilterRulePrivate *priv; - char *name; - char *source; + gchar *name; + gchar *source; enum _filter_grouping_t grouping; enum _filter_threading_t threading; - unsigned int system:1; /* this is a system rule, cannot be edited/deleted */ + guint system:1; /* this is a system rule, cannot be edited/deleted */ GList *parts; gboolean enabled; @@ -81,11 +81,11 @@ struct _FilterRuleClass { GObjectClass parent_class; /* virtual methods */ - int (*validate) (FilterRule *); - int (*eq) (FilterRule *fr, FilterRule *cm); + gint (*validate) (FilterRule *); + gint (*eq) (FilterRule *fr, FilterRule *cm); xmlNodePtr (*xml_encode) (FilterRule *); - int (*xml_decode) (FilterRule *, xmlNodePtr, struct _RuleContext *); + gint (*xml_decode) (FilterRule *, xmlNodePtr, struct _RuleContext *); void (*build_code) (FilterRule *, GString *out); @@ -104,14 +104,14 @@ FilterRule *filter_rule_new (void); FilterRule *filter_rule_clone (FilterRule *base); /* methods */ -void filter_rule_set_name (FilterRule *fr, const char *name); -void filter_rule_set_source (FilterRule *fr, const char *source); +void filter_rule_set_name (FilterRule *fr, const gchar *name); +void filter_rule_set_source (FilterRule *fr, const gchar *source); -int filter_rule_validate (FilterRule *fr); -int filter_rule_eq (FilterRule *fr, FilterRule *cm); +gint filter_rule_validate (FilterRule *fr); +gint filter_rule_eq (FilterRule *fr, FilterRule *cm); xmlNodePtr filter_rule_xml_encode (FilterRule *fr); -int filter_rule_xml_decode (FilterRule *fr, xmlNodePtr node, struct _RuleContext *f); +gint filter_rule_xml_decode (FilterRule *fr, xmlNodePtr node, struct _RuleContext *f); void filter_rule_copy (FilterRule *dest, FilterRule *src); @@ -129,8 +129,8 @@ void filter_rule_build_action(FilterRule *fr, GString *out); void filter_rule_emit_changed (FilterRule *fr); /* static functions */ -FilterRule *filter_rule_next_list (GList *l, FilterRule *last, const char *source); -FilterRule *filter_rule_find_list (GList *l, const char *name, const char *source); +FilterRule *filter_rule_next_list (GList *l, FilterRule *last, const gchar *source); +FilterRule *filter_rule_find_list (GList *l, const gchar *name, const gchar *source); #endif /* ! _FILTER_RULE_H */ diff --git a/filter/rule-context.c b/filter/rule-context.c index 4bd364f0b8..e9dc71a150 100644 --- a/filter/rule-context.c +++ b/filter/rule-context.c @@ -54,12 +54,12 @@ #define d(x) -static int load(RuleContext *rc, const char *system, const char *user); -static int save(RuleContext *rc, const char *user); -static int revert(RuleContext *rc, const char *user); -static GList *rename_uri(RuleContext *rc, const char *olduri, const char *newuri, GCompareFunc cmp); -static GList *delete_uri(RuleContext *rc, const char *uri, GCompareFunc cmp); -static FilterElement *new_element(RuleContext *rc, const char *name); +static gint load(RuleContext *rc, const gchar *system, const gchar *user); +static gint save(RuleContext *rc, const gchar *user); +static gint revert(RuleContext *rc, const gchar *user); +static GList *rename_uri(RuleContext *rc, const gchar *olduri, const gchar *newuri, GCompareFunc cmp); +static GList *delete_uri(RuleContext *rc, const gchar *uri, GCompareFunc cmp); +static FilterElement *new_element(RuleContext *rc, const gchar *name); static void rule_context_class_init(RuleContextClass *klass); static void rule_context_init(RuleContext *rc); @@ -68,7 +68,7 @@ static void rule_context_finalise(GObject *obj); #define _PRIVATE(x)(((RuleContext *)(x))->priv) struct _RuleContextPrivate { - int frozen; + gint frozen; }; static GObjectClass *parent_class = NULL; @@ -168,14 +168,14 @@ rule_context_init(RuleContext *rc) } static void -free_part_set(struct _part_set_map *map, void *data) +free_part_set(struct _part_set_map *map, gpointer data) { g_free(map->name); g_free(map); } static void -free_rule_set(struct _rule_set_map *map, void *data) +free_rule_set(struct _rule_set_map *map, gpointer data) { g_free(map->name); g_free(map); @@ -220,7 +220,7 @@ rule_context_new(void) } void -rule_context_add_part_set(RuleContext *rc, const char *setname, GType part_type, RCPartFunc append, RCNextPartFunc next) +rule_context_add_part_set(RuleContext *rc, const gchar *setname, GType part_type, RCPartFunc append, RCNextPartFunc next) { struct _part_set_map *map; @@ -237,7 +237,7 @@ rule_context_add_part_set(RuleContext *rc, const char *setname, GType part_type, } void -rule_context_add_rule_set(RuleContext *rc, const char *setname, GType rule_type, RCRuleFunc append, RCNextRuleFunc next) +rule_context_add_rule_set(RuleContext *rc, const gchar *setname, GType rule_type, RCRuleFunc append, RCNextRuleFunc next) { struct _rule_set_map *map; @@ -261,7 +261,7 @@ rule_context_add_rule_set(RuleContext *rc, const char *setname, GType rule_type, * Set the text error for the context, or NULL to clear it. **/ static void -rule_context_set_error(RuleContext *rc, char *error) +rule_context_set_error(RuleContext *rc, gchar *error) { g_return_if_fail (rc); @@ -279,10 +279,10 @@ rule_context_set_error(RuleContext *rc, char *error) * * Return value: **/ -int -rule_context_load(RuleContext *rc, const char *system, const char *user) +gint +rule_context_load(RuleContext *rc, const gchar *system, const gchar *user) { - int res; + gint res; g_return_val_if_fail (rc, -1); @@ -296,7 +296,7 @@ rule_context_load(RuleContext *rc, const char *system, const char *user) } static int -load(RuleContext *rc, const char *system, const char *user) +load(RuleContext *rc, const gchar *system, const gchar *user) { xmlNodePtr set, rule, root; xmlDocPtr systemdoc, userdoc; @@ -315,7 +315,7 @@ load(RuleContext *rc, const char *system, const char *user) } root = xmlDocGetRootElement(systemdoc); - if (root == NULL || strcmp((char *)root->name, "filterdescription")) { + if (root == NULL || strcmp((gchar *)root->name, "filterdescription")) { rule_context_set_error(rc, g_strdup_printf("Unable to load system rules '%s': Invalid format", system)); xmlFreeDoc(systemdoc); return -1; @@ -335,7 +335,7 @@ load(RuleContext *rc, const char *system, const char *user) d(printf("loading parts ...\n")); rule = set->children; while (rule) { - if (!strcmp((char *)rule->name, "part")) { + if (!strcmp((gchar *)rule->name, "part")) { FilterPart *part = FILTER_PART(g_object_new(part_map->type, NULL, NULL)); if (filter_part_xml_create(part, rule, rc) == 0) { @@ -352,7 +352,7 @@ load(RuleContext *rc, const char *system, const char *user) rule = set->children; while (rule) { d(printf("checking node: %s\n", rule->name)); - if (!strcmp((char *)rule->name, "rule")) { + if (!strcmp((gchar *)rule->name, "rule")) { FilterRule *part = FILTER_RULE(g_object_new(rule_map->type, NULL, NULL)); if (filter_rule_xml_decode(part, rule, rc) == 0) { @@ -381,7 +381,7 @@ load(RuleContext *rc, const char *system, const char *user) rule = set->children; while (rule) { d(printf("checking node: %s\n", rule->name)); - if (!strcmp((char *)rule->name, "rule")) { + if (!strcmp((gchar *)rule->name, "rule")) { FilterRule *part = FILTER_RULE(g_object_new(rule_map->type, NULL, NULL)); if (filter_rule_xml_decode(part, rule, rc) == 0) { @@ -413,8 +413,8 @@ load(RuleContext *rc, const char *system, const char *user) * * Return value: **/ -int -rule_context_save(RuleContext *rc, const char *user) +gint +rule_context_save(RuleContext *rc, const gchar *user) { g_return_val_if_fail (rc, -1); g_return_val_if_fail (user, -1); @@ -423,23 +423,23 @@ rule_context_save(RuleContext *rc, const char *user) } static int -save(RuleContext *rc, const char *user) +save(RuleContext *rc, const gchar *user) { xmlDocPtr doc; xmlNodePtr root, rules, work; GList *l; FilterRule *rule; struct _rule_set_map *map; - int ret; + gint ret; - doc = xmlNewDoc((const unsigned char *)"1.0"); + doc = xmlNewDoc((const guchar *)"1.0"); /* FIXME: set character encoding to UTF-8? */ - root = xmlNewDocNode(doc, NULL, (const unsigned char *)"filteroptions", NULL); + root = xmlNewDocNode(doc, NULL, (const guchar *)"filteroptions", NULL); xmlDocSetRootElement(doc, root); l = rc->rule_set_list; while (l) { map = l->data; - rules = xmlNewDocNode(doc, NULL, (unsigned char *)map->name, NULL); + rules = xmlNewDocNode(doc, NULL, (guchar *)map->name, NULL); xmlAddChild(root, rules); rule = NULL; while ((rule = map->next(rc, rule, NULL))) { @@ -469,8 +469,8 @@ save(RuleContext *rc, const char *user) * * Return value: **/ -int -rule_context_revert(RuleContext *rc, const char *user) +gint +rule_context_revert(RuleContext *rc, const gchar *user) { g_return_val_if_fail (rc, 0); @@ -481,18 +481,18 @@ rule_context_revert(RuleContext *rc, const char *user) struct _revert_data { GHashTable *rules; - int rank; + gint rank; }; static void -revert_rule_remove(void *key, FilterRule *frule, RuleContext *rc) +revert_rule_remove(gpointer key, FilterRule *frule, RuleContext *rc) { rule_context_remove_rule(rc, frule); g_object_unref(frule); } static void -revert_source_remove(void *key, struct _revert_data *rest_data, RuleContext *rc) +revert_source_remove(gpointer key, struct _revert_data *rest_data, RuleContext *rc) { g_hash_table_foreach(rest_data->rules, (GHFunc)revert_rule_remove, rc); g_hash_table_destroy(rest_data->rules); @@ -500,7 +500,7 @@ revert_source_remove(void *key, struct _revert_data *rest_data, RuleContext *rc) } static guint -source_hashf(const char *a) +source_hashf(const gchar *a) { if (a) return g_str_hash(a); @@ -508,14 +508,14 @@ source_hashf(const char *a) } static int -source_eqf(const char *a, const char *b) +source_eqf(const gchar *a, const gchar *b) { return((a && b && strcmp(a, b) == 0)) || (a == NULL && b == NULL); } static int -revert(RuleContext *rc, const char *user) +revert(RuleContext *rc, const gchar *user) { xmlNodePtr set, rule; /*struct _part_set_map *part_map;*/ @@ -561,7 +561,7 @@ revert(RuleContext *rc, const char *user) rule = set->children; while (rule) { d(printf("checking node: %s\n", rule->name)); - if (!strcmp((char *)rule->name, "rule")) { + if (!strcmp((gchar *)rule->name, "rule")) { FilterRule *part = FILTER_RULE(g_object_new(rule_map->type, NULL, NULL)); if (filter_rule_xml_decode(part, rule, rc) == 0) { @@ -606,7 +606,7 @@ revert(RuleContext *rc, const char *user) } FilterPart * -rule_context_find_part(RuleContext *rc, const char *name) +rule_context_find_part(RuleContext *rc, const gchar *name) { g_return_val_if_fail (rc, NULL); g_return_val_if_fail (name, NULL); @@ -616,7 +616,7 @@ rule_context_find_part(RuleContext *rc, const char *name) } FilterPart * -rule_context_create_part(RuleContext *rc, const char *name) +rule_context_create_part(RuleContext *rc, const gchar *name) { FilterPart *part; @@ -638,7 +638,7 @@ rule_context_next_part(RuleContext *rc, FilterPart *last) } FilterRule * -rule_context_next_rule(RuleContext *rc, FilterRule *last, const char *source) +rule_context_next_rule(RuleContext *rc, FilterRule *last, const gchar *source) { g_return_val_if_fail (rc, NULL); @@ -646,7 +646,7 @@ rule_context_next_rule(RuleContext *rc, FilterRule *last, const char *source) } FilterRule * -rule_context_find_rule(RuleContext *rc, const char *name, const char *source) +rule_context_find_rule(RuleContext *rc, const gchar *name, const gchar *source) { g_return_val_if_fail (name, NULL); g_return_val_if_fail (rc, NULL); @@ -680,11 +680,11 @@ rule_context_add_rule(RuleContext *rc, FilterRule *new) } static void -new_rule_response(GtkWidget *dialog, int button, RuleContext *context) +new_rule_response(GtkWidget *dialog, gint button, RuleContext *context) { if (button == GTK_RESPONSE_OK) { FilterRule *rule = g_object_get_data((GObject *) dialog, "rule"); - char *user = g_object_get_data((GObject *) dialog, "path"); + gchar *user = g_object_get_data((GObject *) dialog, "path"); if (!filter_rule_validate(rule)) { /* no need to popup a dialog because the validate code does that. */ @@ -708,7 +708,7 @@ new_rule_response(GtkWidget *dialog, int button, RuleContext *context) /* add a rule, with a gui, asking for confirmation first ... optionally save to path */ void -rule_context_add_rule_gui(RuleContext *rc, FilterRule *rule, const char *title, const char *path) +rule_context_add_rule_gui(RuleContext *rc, FilterRule *rule, const gchar *title, const gchar *path) { GtkDialog *dialog; GtkWidget *widget; @@ -764,10 +764,10 @@ rule_context_remove_rule(RuleContext *rc, FilterRule *rule) } void -rule_context_rank_rule(RuleContext *rc, FilterRule *rule, const char *source, int rank) +rule_context_rank_rule(RuleContext *rc, FilterRule *rule, const gchar *source, gint rank) { GList *node; - int i = 0, index = 0; + gint i = 0, index = 0; g_return_if_fail (rc); g_return_if_fail (rule); @@ -800,11 +800,11 @@ rule_context_rank_rule(RuleContext *rc, FilterRule *rule, const char *source, in g_signal_emit(rc, signals[CHANGED], 0); } -int -rule_context_get_rank_rule(RuleContext *rc, FilterRule *rule, const char *source) +gint +rule_context_get_rank_rule(RuleContext *rc, FilterRule *rule, const gchar *source) { GList *node; - int i = 0; + gint i = 0; g_return_val_if_fail (rc, -1); g_return_val_if_fail (rule, -1); @@ -830,10 +830,10 @@ rule_context_get_rank_rule(RuleContext *rc, FilterRule *rule, const char *source } FilterRule * -rule_context_find_rank_rule(RuleContext *rc, int rank, const char *source) +rule_context_find_rank_rule(RuleContext *rc, gint rank, const gchar *source) { GList *node; - int i = 0; + gint i = 0; g_return_val_if_fail (rc, NULL); @@ -858,25 +858,25 @@ rule_context_find_rank_rule(RuleContext *rc, int rank, const char *source) } static GList * -delete_uri(RuleContext *rc, const char *uri, GCompareFunc cmp) +delete_uri(RuleContext *rc, const gchar *uri, GCompareFunc cmp) { return NULL; } GList * -rule_context_delete_uri(RuleContext *rc, const char *uri, GCompareFunc cmp) +rule_context_delete_uri(RuleContext *rc, const gchar *uri, GCompareFunc cmp) { return RULE_CONTEXT_GET_CLASS(rc)->delete_uri(rc, uri, cmp); } static GList * -rename_uri(RuleContext *rc, const char *olduri, const char *newuri, GCompareFunc cmp) +rename_uri(RuleContext *rc, const gchar *olduri, const gchar *newuri, GCompareFunc cmp) { return NULL; } GList * -rule_context_rename_uri(RuleContext *rc, const char *olduri, const char *newuri, GCompareFunc cmp) +rule_context_rename_uri(RuleContext *rc, const gchar *olduri, const gchar *newuri, GCompareFunc cmp) { return RULE_CONTEXT_GET_CLASS(rc)->rename_uri(rc, olduri, newuri, cmp); } @@ -897,7 +897,7 @@ rule_context_free_uri_list(RuleContext *rc, GList *uris) } static FilterElement * -new_element(RuleContext *rc, const char *type) +new_element(RuleContext *rc, const gchar *type) { if (!strcmp (type, "string")) { return (FilterElement *) filter_input_new (); @@ -941,7 +941,7 @@ new_element(RuleContext *rc, const char *type) * Return value: **/ FilterElement * -rule_context_new_element(RuleContext *rc, const char *name) +rule_context_new_element(RuleContext *rc, const gchar *name) { if (name == NULL) return NULL; diff --git a/filter/rule-context.h b/filter/rule-context.h index 539c5b3b56..63c9abaa67 100644 --- a/filter/rule-context.h +++ b/filter/rule-context.h @@ -52,7 +52,7 @@ struct _RuleContext { GObject parent_object; struct _RuleContextPrivate *priv; - char *error; /* string version of error */ + gchar *error; /* string version of error */ guint32 flags; /* capability flags */ @@ -71,14 +71,14 @@ struct _RuleContextClass { GObjectClass parent_class; /* virtual methods */ - int (*load) (RuleContext *rc, const char *system, const char *user); - int (*save) (RuleContext *rc, const char *user); - int (*revert) (RuleContext *rc, const char *user); + gint (*load) (RuleContext *rc, const gchar *system, const gchar *user); + gint (*save) (RuleContext *rc, const gchar *user); + gint (*revert) (RuleContext *rc, const gchar *user); - GList *(*delete_uri) (RuleContext *rc, const char *uri, GCompareFunc cmp); - GList *(*rename_uri) (RuleContext *rc, const char *olduri, const char *newuri, GCompareFunc cmp); + GList *(*delete_uri) (RuleContext *rc, const gchar *uri, GCompareFunc cmp); + GList *(*rename_uri) (RuleContext *rc, const gchar *olduri, const gchar *newuri, GCompareFunc cmp); - FilterElement *(*new_element)(RuleContext *rc, const char *name); + FilterElement *(*new_element)(RuleContext *rc, const gchar *name); /* signals */ void (*rule_added) (RuleContext *rc, FilterRule *rule); @@ -89,17 +89,17 @@ struct _RuleContextClass { typedef void (*RCPartFunc) (RuleContext *rc, FilterPart *part); typedef void (*RCRuleFunc) (RuleContext *rc, FilterRule *part); typedef FilterPart * (*RCNextPartFunc) (RuleContext *rc, FilterPart *part); -typedef FilterRule * (*RCNextRuleFunc) (RuleContext *rc, FilterRule *rule, const char *source); +typedef FilterRule * (*RCNextRuleFunc) (RuleContext *rc, FilterRule *rule, const gchar *source); struct _part_set_map { - char *name; + gchar *name; GType type; RCPartFunc append; RCNextPartFunc next; }; struct _rule_set_map { - char *name; + gchar *name; GType type; RCRuleFunc append; RCNextRuleFunc next; @@ -111,38 +111,38 @@ GType rule_context_get_type (void); RuleContext *rule_context_new (void); /* io */ -int rule_context_load (RuleContext *rc, const char *system, const char *user); -int rule_context_save (RuleContext *rc, const char *user); -int rule_context_revert (RuleContext *rc, const char *user); +gint rule_context_load (RuleContext *rc, const gchar *system, const gchar *user); +gint rule_context_save (RuleContext *rc, const gchar *user); +gint rule_context_revert (RuleContext *rc, const gchar *user); void rule_context_add_part (RuleContext *rc, FilterPart *new); -FilterPart *rule_context_find_part (RuleContext *rc, const char *name); -FilterPart *rule_context_create_part (RuleContext *rc, const char *name); +FilterPart *rule_context_find_part (RuleContext *rc, const gchar *name); +FilterPart *rule_context_create_part (RuleContext *rc, const gchar *name); FilterPart *rule_context_next_part (RuleContext *rc, FilterPart *last); -FilterRule *rule_context_next_rule (RuleContext *rc, FilterRule *last, const char *source); -FilterRule *rule_context_find_rule (RuleContext *rc, const char *name, const char *source); -FilterRule *rule_context_find_rank_rule (RuleContext *rc, int rank, const char *source); +FilterRule *rule_context_next_rule (RuleContext *rc, FilterRule *last, const gchar *source); +FilterRule *rule_context_find_rule (RuleContext *rc, const gchar *name, const gchar *source); +FilterRule *rule_context_find_rank_rule (RuleContext *rc, gint rank, const gchar *source); void rule_context_add_rule (RuleContext *rc, FilterRule *new); -void rule_context_add_rule_gui (RuleContext *rc, FilterRule *rule, const char *title, const char *path); +void rule_context_add_rule_gui (RuleContext *rc, FilterRule *rule, const gchar *title, const gchar *path); void rule_context_remove_rule (RuleContext *rc, FilterRule *rule); /* get/set the rank (position) of a rule */ -void rule_context_rank_rule (RuleContext *rc, FilterRule *rule, const char *source, int rank); -int rule_context_get_rank_rule (RuleContext *rc, FilterRule *rule, const char *source); +void rule_context_rank_rule (RuleContext *rc, FilterRule *rule, const gchar *source, gint rank); +gint rule_context_get_rank_rule (RuleContext *rc, FilterRule *rule, const gchar *source); /* setup type for set parts */ -void rule_context_add_part_set (RuleContext *rc, const char *setname, GType part_type, +void rule_context_add_part_set (RuleContext *rc, const gchar *setname, GType part_type, RCPartFunc append, RCNextPartFunc next); -void rule_context_add_rule_set (RuleContext *rc, const char *setname, GType rule_type, +void rule_context_add_rule_set (RuleContext *rc, const gchar *setname, GType rule_type, RCRuleFunc append, RCNextRuleFunc next); /* dynamic element types */ -FilterElement *rule_context_new_element(RuleContext *rc, const char *name); +FilterElement *rule_context_new_element(RuleContext *rc, const gchar *name); /* uri's disappear/renamed externally */ -GList *rule_context_delete_uri (RuleContext *rc, const char *uri, GCompareFunc cmp); -GList *rule_context_rename_uri (RuleContext *rc, const char *olduri, const char *newuri, GCompareFunc cmp); +GList *rule_context_delete_uri (RuleContext *rc, const gchar *uri, GCompareFunc cmp); +GList *rule_context_rename_uri (RuleContext *rc, const gchar *olduri, const gchar *newuri, GCompareFunc cmp); void rule_context_free_uri_list (RuleContext *rc, GList *uris); diff --git a/filter/rule-editor.c b/filter/rule-editor.c index 07ea3fd1e4..4a1e831451 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -35,11 +35,11 @@ #include "e-util/e-util-private.h" #include "rule-editor.h" -static int enable_undo = 0; +static gint enable_undo = 0; #define d(x) -static void set_source (RuleEditor *re, const char *source); +static void set_source (RuleEditor *re, const gchar *source); static void set_sensitive (RuleEditor *re); static FilterRule *create_rule (RuleEditor *re); @@ -164,11 +164,11 @@ rule_editor_destroy (GtkObject *obj) * Return value: A new #RuleEditor object. **/ RuleEditor * -rule_editor_new (RuleContext *rc, const char *source, const char *label) +rule_editor_new (RuleContext *rc, const gchar *source, const gchar *label) { RuleEditor *re = (RuleEditor *) g_object_new (RULE_TYPE_EDITOR, NULL); GladeXML *gui; - char *filter_glade = g_build_filename (EVOLUTION_GLADEDIR, + gchar *filter_glade = g_build_filename (EVOLUTION_GLADEDIR, "filter.glade", NULL); @@ -191,7 +191,7 @@ rule_editor_set_sensitive (RuleEditor *re) /* used internally by implementations */ void -rule_editor_set_source (RuleEditor *re, const char *source) +rule_editor_set_source (RuleEditor *re, const gchar *source) { RULE_EDITOR_GET_CLASS (re)->set_source (re, source); } @@ -231,7 +231,7 @@ editor_destroy (RuleEditor *re, GObject *deadbeef) } static void -rule_editor_add_undo (RuleEditor *re, int type, FilterRule *rule, int rank, int newrank) +rule_editor_add_undo (RuleEditor *re, gint type, FilterRule *rule, gint rank, gint newrank) { RuleEditorUndo *undo; @@ -299,7 +299,7 @@ rule_editor_play_undo (RuleEditor *re) } static void -editor_response (GtkWidget *dialog, int button, RuleEditor *re) +editor_response (GtkWidget *dialog, gint button, RuleEditor *re) { if (button == GTK_RESPONSE_CANCEL) { if (enable_undo) @@ -320,7 +320,7 @@ editor_response (GtkWidget *dialog, int button, RuleEditor *re) } static void -add_editor_response (GtkWidget *dialog, int button, RuleEditor *re) +add_editor_response (GtkWidget *dialog, gint button, RuleEditor *re) { GtkTreeSelection *selection; GtkTreePath *path; @@ -399,12 +399,12 @@ rule_add (GtkWidget *widget, RuleEditor *re) } static void -edit_editor_response (GtkWidget *dialog, int button, RuleEditor *re) +edit_editor_response (GtkWidget *dialog, gint button, RuleEditor *re) { FilterRule *rule; GtkTreePath *path; GtkTreeIter iter; - int pos; + gint pos; if (button == GTK_RESPONSE_OK) { if (!filter_rule_validate (re->edit)) { @@ -485,7 +485,7 @@ rule_delete (GtkWidget *widget, RuleEditor *re) GtkTreeSelection *selection; GtkTreePath *path; GtkTreeIter iter; - int pos, len; + gint pos, len; update_selected_rule(re); @@ -536,7 +536,7 @@ rule_delete (GtkWidget *widget, RuleEditor *re) } static void -rule_move (RuleEditor *re, int from, int to) +rule_move (RuleEditor *re, gint from, gint to) { GtkTreeSelection *selection; GtkTreePath *path; @@ -580,7 +580,7 @@ rule_move (RuleEditor *re, int from, int to) static void rule_top (GtkWidget *widget, RuleEditor *re) { - int pos; + gint pos; update_selected_rule(re); @@ -593,7 +593,7 @@ rule_top (GtkWidget *widget, RuleEditor *re) static void rule_up (GtkWidget *widget, RuleEditor *re) { - int pos; + gint pos; update_selected_rule(re); @@ -606,7 +606,7 @@ rule_up (GtkWidget *widget, RuleEditor *re) static void rule_down (GtkWidget *widget, RuleEditor *re) { - int pos; + gint pos; update_selected_rule(re); @@ -619,8 +619,8 @@ rule_down (GtkWidget *widget, RuleEditor *re) static void rule_bottom (GtkWidget *widget, RuleEditor *re) { - int pos; - int index = -1, count = 0; + gint pos; + gint index = -1, count = 0; FilterRule *rule = NULL; update_selected_rule(re); @@ -655,7 +655,7 @@ static void set_sensitive (RuleEditor *re) { FilterRule *rule = NULL; - int index = -1, count = 0; + gint index = -1, count = 0; while ((rule = rule_context_next_rule (re->context, rule, re->source))) { if (rule == re->current) @@ -725,7 +725,7 @@ double_click (GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *colum } static void -set_source (RuleEditor *re, const char *source) +set_source (RuleEditor *re, const gchar *source) { FilterRule *rule = NULL; GtkTreeIter iter; @@ -746,7 +746,7 @@ set_source (RuleEditor *re, const char *source) } static void -rule_able_toggled (GtkCellRendererToggle *renderer, char *arg1, gpointer user_data) +rule_able_toggled (GtkCellRendererToggle *renderer, gchar *arg1, gpointer user_data) { GtkWidget *table = user_data; GtkTreeSelection *selection; @@ -772,11 +772,11 @@ rule_able_toggled (GtkCellRendererToggle *renderer, char *arg1, gpointer user_da gtk_tree_path_free (path); } -GtkWidget *rule_editor_treeview_new (char *widget_name, char *string1, char *string2, - int int1, int int2); +GtkWidget *rule_editor_treeview_new (gchar *widget_name, gchar *string1, gchar *string2, + gint int1, gint int2); GtkWidget * -rule_editor_treeview_new (char *widget_name, char *string1, char *string2, int int1, int int2) +rule_editor_treeview_new (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2) { GtkWidget *table, *scrolled; GtkTreeSelection *selection; @@ -826,11 +826,11 @@ rule_editor_treeview_new (char *widget_name, char *string1, char *string2, int i } void -rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, const char *source, const char *label) +rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, const gchar *source, const gchar *label) { GtkWidget *w; - int i; - char *tmp; + gint i; + gchar *tmp; re->context = context; g_object_ref (context); diff --git a/filter/rule-editor.h b/filter/rule-editor.h index 40cc90ef90..e5017eac25 100644 --- a/filter/rule-editor.h +++ b/filter/rule-editor.h @@ -53,10 +53,10 @@ struct _RuleEditor { GtkWidget *dialog; - char *source; + gchar *source; struct _RuleEditorUndo *undo_log; /* cancel/undo log */ - unsigned int undo_active:1; /* we're performing undo */ + guint undo_active:1; /* we're performing undo */ struct _RuleEditorPrivate *priv; }; @@ -66,7 +66,7 @@ struct _RuleEditorClass { /* virtual methods */ void (*set_sensitive) (RuleEditor *); - void (*set_source) (RuleEditor *, const char *source); + void (*set_source) (RuleEditor *, const gchar *source); FilterRule *(*create_rule) (RuleEditor *); @@ -83,19 +83,19 @@ enum { struct _RuleEditorUndo { struct _RuleEditorUndo *next; - unsigned int type; + guint type; FilterRule *rule; - int rank; - int newrank; + gint rank; + gint newrank; }; GType rule_editor_get_type(void); -RuleEditor *rule_editor_new(RuleContext *rc, const char *source, const char *label); +RuleEditor *rule_editor_new(RuleContext *rc, const gchar *source, const gchar *label); -void rule_editor_construct(RuleEditor *re, RuleContext *context, GladeXML *gui, const char *source, const char *label); +void rule_editor_construct(RuleEditor *re, RuleContext *context, GladeXML *gui, const gchar *source, const gchar *label); /* methods */ -void rule_editor_set_source(RuleEditor *re, const char *source); +void rule_editor_set_source(RuleEditor *re, const gchar *source); /* calculates the sensitivity of the editor */ void rule_editor_set_sensitive(RuleEditor *re); /* used internally to create a new rule appropriate for the editor */ diff --git a/iconv-detect.c b/iconv-detect.c index 4eb6597225..7cd6bde85e 100644 --- a/iconv-detect.c +++ b/iconv-detect.c @@ -52,9 +52,9 @@ enum { typedef struct { - char *charset; - char *format; - int id; + gchar *charset; + gchar *format; + gint id; } CharInfo; @@ -67,7 +67,7 @@ static CharInfo iso8859_tests[] = { { "8859-1", "%d-%d", NO_ISO_D_DASH_D }, }; -static int num_iso8859_tests = sizeof (iso8859_tests) / sizeof (CharInfo); +static gint num_iso8859_tests = sizeof (iso8859_tests) / sizeof (CharInfo); static CharInfo iso2022_tests[] = { { "iso-2022-jp", "iso-%d-%s", ISO_DASH_D_DASH_S_LOWER }, @@ -75,7 +75,7 @@ static CharInfo iso2022_tests[] = { { "ISO2022-JP", "ISO%d-%s", ISO_D_DASH_S }, }; -static int num_iso2022_tests = sizeof (iso2022_tests) / sizeof (CharInfo); +static gint num_iso2022_tests = sizeof (iso2022_tests) / sizeof (CharInfo); static CharInfo iso10646_tests[] = { { "iso-10646-1", "iso-%d-%d", ISO_DASH_D_DASH_D_LOWER }, @@ -87,16 +87,16 @@ static CharInfo iso10646_tests[] = { { "UCS-4BE", "UCS-4BE", UCS4 }, }; -static int num_iso10646_tests = sizeof (iso10646_tests) / sizeof (CharInfo); +static gint num_iso10646_tests = sizeof (iso10646_tests) / sizeof (CharInfo); -int main (int argc, char **argv) +gint main (gint argc, gchar **argv) { - unsigned int iso8859, iso2022, iso10646; + guint iso8859, iso2022, iso10646; CharInfo *info; iconv_t cd; FILE *fp; - int i; + gint i; fp = fopen ("iconv-detect.h", "w"); if (fp == NULL) diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index 724cc3b74a..b0b1db1879 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -45,10 +45,10 @@ enum { static guint signals[LAST_SIGNAL] = { 0, }; -static void e_searching_tokenizer_begin (HTMLTokenizer *, const char *); +static void e_searching_tokenizer_begin (HTMLTokenizer *, const gchar *); static void e_searching_tokenizer_end (HTMLTokenizer *); -static char *e_searching_tokenizer_peek_token (HTMLTokenizer *); -static char *e_searching_tokenizer_next_token (HTMLTokenizer *); +static gchar *e_searching_tokenizer_peek_token (HTMLTokenizer *); +static gchar *e_searching_tokenizer_next_token (HTMLTokenizer *); static gboolean e_searching_tokenizer_has_more (HTMLTokenizer *); static HTMLTokenizer *e_searching_tokenizer_clone (HTMLTokenizer *); @@ -114,10 +114,10 @@ shared_state_unref (SharedState *shared) /* This is faster and safer than glib2's utf8 abomination, but isn't exported from camel as yet */ static inline guint32 -camel_utf8_getc(const unsigned char **ptr) +camel_utf8_getc(const guchar **ptr) { - register unsigned char *p = (unsigned char *)*ptr; - register unsigned char c, r; + register guchar *p = (guchar *)*ptr; + register guchar c, r; register guint32 v, m; again: @@ -158,11 +158,11 @@ static const gchar *ignored_tags[] = { "B", "I", "FONT", "TT", "EM", /* and more? */}; static int -ignore_tag (const char *tag) +ignore_tag (const gchar *tag) { - char *t = alloca(strlen(tag)+1), c, *out; - const char *in; - int i; + gchar *t = alloca(strlen(tag)+1), c, *out; + const gchar *in; + gint i; /* we could use a aho-corasick matcher here too ... but we wont */ @@ -206,7 +206,7 @@ struct _match { /* tree state node */ struct _state { struct _match *matches; - unsigned int final; /* max no of chars we just matched */ + guint final; /* max no of chars we just matched */ struct _state *fail; /* where to try next if we fail */ struct _state *next; /* next on this level? */ }; @@ -214,7 +214,7 @@ struct _state { /* base tree structure */ struct _trie { struct _state root; - int max_depth; + gint max_depth; EMemChunk *state_chunks; EMemChunk *match_chunks; @@ -223,9 +223,9 @@ struct _trie { /* will be enabled only if debug is enabled */ #if d(1) -1 != -1 static void -dump_trie(struct _state *s, int d) +dump_trie(struct _state *s, gint d) { - char *p = alloca(d*2+1); + gchar *p = alloca(d*2+1); struct _match *m; memset(p, ' ', d*2); @@ -259,15 +259,15 @@ g(struct _state *q, guint32 c) } static struct _trie * -build_trie(int nocase, int len, unsigned char **words) +build_trie(gint nocase, gint len, guchar **words) { struct _state *q, *qt, *r; - const unsigned char *word; + const guchar *word; struct _match *m, *n = NULL; - int i, depth; + gint i, depth; guint32 c; struct _trie *trie; - int state_depth_max, state_depth_size; + gint state_depth_max, state_depth_size; struct _state **state_depth; trie = g_malloc(sizeof(*trie)); @@ -385,14 +385,14 @@ free_trie(struct _trie *t) struct _token { struct _token *next; struct _token *prev; - unsigned int offset; + guint offset; /* we need to copy the token for memory management, so why not copy it whole */ - char tok[1]; + gchar tok[1]; }; /* stack of submatches currently being scanned, used for merging */ struct _submatch { - unsigned int offstart, offend; /* in bytes */ + guint offstart, offend; /* in bytes */ }; /* flags for new func */ @@ -402,17 +402,17 @@ struct _submatch { struct _searcher { struct _trie *t; - char *(*next_token)(); /* callbacks for more tokens */ - void *next_data; + gchar *(*next_token)(); /* callbacks for more tokens */ + gpointer next_data; - int words; /* how many words */ - char *tags, *tage; /* the tag we used to highlight */ + gint words; /* how many words */ + gchar *tags, *tage; /* the tag we used to highlight */ - int flags; /* case sensitive or not */ + gint flags; /* case sensitive or not */ struct _state *state; /* state is the current trie state */ - int matchcount; + gint matchcount; EDList input; /* pending 'input' tokens, processed but might match */ EDList output; /* output tokens ready for source */ @@ -422,25 +422,25 @@ struct _searcher { guint32 offset; /* current offset through searchable stream? */ guint32 offout; /* last output position */ - unsigned int lastp; /* current position in rotating last buffer */ + guint lastp; /* current position in rotating last buffer */ guint32 *last; /* buffer that goes back last 'n' positions */ guint32 last_mask; /* bitmask for efficient rotation calculation */ - unsigned int submatchp; /* submatch stack */ + guint submatchp; /* submatch stack */ struct _submatch *submatches; }; static void -searcher_set_tokenfunc(struct _searcher *s, char *(*next)(), void *data) +searcher_set_tokenfunc(struct _searcher *s, gchar *(*next)(), gpointer data) { s->next_token = next; s->next_data = data; } static struct _searcher * -searcher_new (int flags, int argc, unsigned char **argv, const char *tags, const char *tage) +searcher_new (gint flags, gint argc, guchar **argv, const gchar *tags, const gchar *tage) { - int i, m; + gint i, m; struct _searcher *s; s = g_malloc(sizeof(*s)); @@ -493,7 +493,7 @@ searcher_free(struct _searcher *s) g_free(s); } static struct _token * -append_token(EDList *list, const char *tok, int len) +append_token(EDList *list, const gchar *tok, gint len) { struct _token *token; @@ -513,8 +513,8 @@ append_token(EDList *list, const char *tok, int len) static void output_token(struct _searcher *s, struct _token *token) { - int offend; - int left, pre; + gint offend; + gint left, pre; if (token->tok[0] == TAG_ESCAPE) { if (token->offset >= s->offout) { @@ -542,7 +542,7 @@ output_token(struct _searcher *s, struct _token *token) } static struct _token * -find_token(struct _searcher *s, int start) +find_token(struct _searcher *s, gint start) { register struct _token *token; @@ -558,11 +558,11 @@ find_token(struct _searcher *s, int start) } static void -output_match(struct _searcher *s, unsigned int start, unsigned int end) +output_match(struct _searcher *s, guint start, guint end) { register struct _token *token; struct _token *starttoken, *endtoken; - char b[8]; + gchar b[8]; d(printf("output match: %d-%d at %d\n", start, end, s->offout)); @@ -630,7 +630,7 @@ output_match(struct _searcher *s, unsigned int start, unsigned int end) static void output_subpending(struct _searcher *s) { - int i; + gint i; for (i=s->submatchp-1;i>=0;i--) output_match(s, s->submatches[i].offstart, s->submatches[i].offend); @@ -639,9 +639,9 @@ output_subpending(struct _searcher *s) /* returns true if a merge took place */ static int -merge_subpending(struct _searcher *s, int offstart, int offend) +merge_subpending(struct _searcher *s, gint offstart, gint offend) { - int i; + gint i; /* merges overlapping or abutting match strings */ if (s->submatchp && @@ -664,7 +664,7 @@ merge_subpending(struct _searcher *s, int offstart, int offend) } static void -push_subpending(struct _searcher *s, int offstart, int offend) +push_subpending(struct _searcher *s, gint offstart, gint offend) { /* This is really an assertion, we just ignore the last pending match instead of crashing though */ if (s->submatchp >= s->words) { @@ -691,11 +691,11 @@ output_pending(struct _searcher *s) static void flush_extra(struct _searcher *s) { - unsigned int start; - int i; + guint start; + gint i; struct _token *starttoken, *token; - /* find earliest char that can be in contention */ + /* find earliest gchar that can be in contention */ start = s->offset - s->t->max_depth; for (i=0;isubmatchp;i++) if (s->submatches[i].offstart < start) @@ -712,20 +712,20 @@ flush_extra(struct _searcher *s) } } -static char * +static gchar * searcher_next_token(struct _searcher *s) { struct _token *token; - const unsigned char *tok, *stok, *pre_tok; + const guchar *tok, *stok, *pre_tok; struct _trie *t = s->t; struct _state *q = s->state; struct _match *m = NULL; - int offstart, offend; + gint offstart, offend; guint32 c; while (e_dlist_empty(&s->output)) { /* get next token */ - tok = (unsigned char *)s->next_token(s->next_data); + tok = (guchar *)s->next_token(s->next_data); if (tok == NULL) { output_subpending(s); output_pending(s); @@ -733,15 +733,15 @@ searcher_next_token(struct _searcher *s) } /* we dont always have to copy each token, e.g. if we dont match anything */ - token = append_token(&s->input, (char *)tok, -1); + token = append_token(&s->input, (gchar *)tok, -1); token->offset = s->offset; - tok = (unsigned char *)token->tok; + tok = (guchar *)token->tok; d(printf("new token %d '%s'\n", token->offset, token->tok[0]==TAG_ESCAPE?token->tok+1:token->tok)); /* tag test, reset state on unknown tags */ if (tok[0] == TAG_ESCAPE) { - if (!ignore_tag ((char *)tok)) { + if (!ignore_tag ((gchar *)tok)) { /* force reset */ output_subpending(s); output_pending(s); @@ -772,7 +772,7 @@ searcher_next_token(struct _searcher *s) if (q->final) { s->matchcount++; - /* use the last buffer to find the real offset of this char */ + /* use the last buffer to find the real offset of this gchar */ offstart = s->last[(s->lastp - q->final)&s->last_mask]; offend = s->offset + (tok - stok); @@ -815,10 +815,10 @@ searcher_next_token(struct _searcher *s) return token ? g_strdup (token->tok) : NULL; } -static char * +static gchar * searcher_peek_token(struct _searcher *s) { - char *tok; + gchar *tok; /* we just get it and then put it back, it's fast enuf */ tok = searcher_next_token(s); @@ -841,9 +841,9 @@ searcher_pending(struct _searcher *s) struct _search_info { GPtrArray *strv; - char *colour; - unsigned int size:8; - unsigned int flags:8; + gchar *colour; + guint size:8; + guint flags:8; }; /** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/ @@ -860,26 +860,26 @@ search_info_new(void) } static void -search_info_set_flags(struct _search_info *si, unsigned int flags, unsigned int mask) +search_info_set_flags(struct _search_info *si, guint flags, guint mask) { si->flags = (si->flags & ~mask) | (flags & mask); } static void -search_info_set_colour(struct _search_info *si, const char *colour) +search_info_set_colour(struct _search_info *si, const gchar *colour) { g_free(si->colour); si->colour = g_strdup(colour); } static void -search_info_add_string(struct _search_info *si, const char *s) +search_info_add_string(struct _search_info *si, const gchar *s) { - const unsigned char *start; + const guchar *start; guint32 c; if (s && s[0]) { - const unsigned char *us = (unsigned char *) s; + const guchar *us = (guchar *) s; /* strip leading whitespace */ start = us; while ((c = camel_utf8_getc (&us))) { @@ -890,14 +890,14 @@ search_info_add_string(struct _search_info *si, const char *s) } /* should probably also strip trailing, but i'm lazy today */ if (start[0]) - g_ptr_array_add(si->strv, g_strdup ((char *)start)); + g_ptr_array_add(si->strv, g_strdup ((gchar *)start)); } } static void search_info_clear(struct _search_info *si) { - int i; + gint i; for (i=0;istrv->len;i++) g_free(si->strv->pdata[i]); @@ -908,7 +908,7 @@ search_info_clear(struct _search_info *si) static void search_info_free(struct _search_info *si) { - int i; + gint i; for (i=0;istrv->len;i++) g_free(si->strv->pdata[i]); @@ -922,7 +922,7 @@ static struct _search_info * search_info_clone(struct _search_info *si) { struct _search_info *out; - int i; + gint i; out = search_info_new(); for (i=0;istrv->len;i++) @@ -937,7 +937,7 @@ search_info_clone(struct _search_info *si) static struct _searcher * search_info_to_searcher(struct _search_info *si) { - char *tags, *tage; + gchar *tags, *tage; const gchar *col; if (si->strv->len == 0) @@ -953,7 +953,7 @@ search_info_to_searcher(struct _search_info *si) tage = alloca(20); sprintf(tage, "%c", TAG_ESCAPE); - return searcher_new (si->flags, si->strv->len, (unsigned char **)si->strv->pdata, tags, tage); + return searcher_new (si->flags, si->strv->len, (guchar **)si->strv->pdata, tags, tage); } /* ********************************************************************** */ @@ -1063,7 +1063,7 @@ e_searching_tokenizer_new (void) /* blah blah the htmltokeniser doesn't like being asked for a token if it doens't hvae any! */ -static char *get_token(HTMLTokenizer *t) +static gchar *get_token(HTMLTokenizer *t) { HTMLTokenizerClass *klass = HTML_TOKENIZER_CLASS (parent_class); @@ -1071,7 +1071,7 @@ static char *get_token(HTMLTokenizer *t) } static void -e_searching_tokenizer_begin (HTMLTokenizer *t, const char *content_type) +e_searching_tokenizer_begin (HTMLTokenizer *t, const gchar *content_type) { ESearchingTokenizer *st = E_SEARCHING_TOKENIZER (t); struct _ESearchingTokenizerPrivate *p = st->priv; @@ -1113,7 +1113,7 @@ e_searching_tokenizer_end (HTMLTokenizer *t) HTML_TOKENIZER_CLASS (parent_class)->end (t); } -static char * +static gchar * e_searching_tokenizer_peek_token (HTMLTokenizer *tok) { ESearchingTokenizer *st = E_SEARCHING_TOKENIZER (tok); @@ -1125,12 +1125,12 @@ e_searching_tokenizer_peek_token (HTMLTokenizer *tok) return searcher_peek_token(st->priv->engine); } -static char * +static gchar * e_searching_tokenizer_next_token (HTMLTokenizer *tok) { ESearchingTokenizer *st = E_SEARCHING_TOKENIZER (tok); - int oldmatched; - char *token; + gint oldmatched; + gchar *token; /* If no search is active, just use the default method. */ if (st->priv->engine == NULL) diff --git a/mail/e-searching-tokenizer.h b/mail/e-searching-tokenizer.h index f96c37ed49..e9b1a94343 100644 --- a/mail/e-searching-tokenizer.h +++ b/mail/e-searching-tokenizer.h @@ -56,15 +56,15 @@ ESearchingTokenizer *e_searching_tokenizer_new (void); /* For now, just a simple API */ -void e_searching_tokenizer_set_primary_search_string (ESearchingTokenizer *, const char *); -void e_searching_tokenizer_add_primary_search_string (ESearchingTokenizer *, const char *); +void e_searching_tokenizer_set_primary_search_string (ESearchingTokenizer *, const gchar *); +void e_searching_tokenizer_add_primary_search_string (ESearchingTokenizer *, const gchar *); void e_searching_tokenizer_set_primary_case_sensitivity (ESearchingTokenizer *, gboolean is_case_sensitive); -void e_searching_tokenizer_set_secondary_search_string (ESearchingTokenizer *, const char *); -void e_searching_tokenizer_add_secondary_search_string (ESearchingTokenizer *st, const char *search_str); +void e_searching_tokenizer_set_secondary_search_string (ESearchingTokenizer *, const gchar *); +void e_searching_tokenizer_add_secondary_search_string (ESearchingTokenizer *st, const gchar *search_str); void e_searching_tokenizer_set_secondary_case_sensitivity (ESearchingTokenizer *, gboolean is_case_sensitive); -int e_searching_tokenizer_match_count (ESearchingTokenizer *); +gint e_searching_tokenizer_match_count (ESearchingTokenizer *); #endif /* __E_SEARCHING_TOKENIZER_H__ */ diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 2b13e7e015..570858cd68 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -117,13 +117,13 @@ typedef struct _EMAccountEditorService { struct _GtkToggleButton *needs_auth; struct _GtkWidget *check_dialog; - int check_id; + gint check_id; GList *authtypes; /* if "Check supported" */ CamelProvider *provider; CamelProviderType type; - int auth_changed_id; + gint auth_changed_id; } EMAccountEditorService; typedef struct _EMAccountEditorPrivate { @@ -135,7 +135,7 @@ typedef struct _EMAccountEditorPrivate { guint sig_added_id; guint sig_removed_id; guint sig_changed_id; - const char *sig_uid; + const gchar *sig_uid; /* incoming mail */ EMAccountEditorService source; @@ -177,13 +177,13 @@ typedef struct _EMAccountEditorPrivate { /* for e-config callbacks, each page sets up its widgets, then they are dealed out by the get_widget callback in order*/ GtkWidget *widgets[5]; - const char *widgets_name[5]; - int widgets_index; + const gchar *widgets_name[5]; + gint widgets_index; /* for druid page preparation */ - unsigned int identity_set:1; - unsigned int receive_set:1; - unsigned int management_set:1; + guint identity_set:1; + guint receive_set:1; + guint management_set:1; } EMAccountEditorPrivate; static void emae_refresh_authtype(EMAccountEditor *emae, EMAccountEditorService *service); @@ -287,7 +287,7 @@ EMAccountEditor *em_account_editor_new(EAccount *account, em_account_editor_t ty * * Return value: **/ -EMAccountEditor *em_account_editor_new_for_pages(EAccount *account, em_account_editor_t type, char *id, GtkWidget **pages) +EMAccountEditor *em_account_editor_new_for_pages(EAccount *account, em_account_editor_t type, gchar *id, GtkWidget **pages) { EMAccountEditor *emae = g_object_new(em_account_editor_get_type(), NULL); emae->pages = pages; @@ -318,14 +318,14 @@ static struct { #define num_ssl_options (sizeof (ssl_options) / sizeof (ssl_options[0])) static gboolean -is_email (const char *address) +is_email (const gchar *address) { /* This is supposed to check if the address's domain could be an FQDN but alas, it's not worth the pain and suffering. */ - const char *at; + const gchar *at; at = strchr (address, '@'); - /* make sure we have an '@' and that it's not the first or last char */ + /* make sure we have an '@' and that it's not the first or last gchar */ if (!at || at == address || *(at + 1) == '\0') return FALSE; @@ -333,10 +333,10 @@ is_email (const char *address) } static CamelURL * -emae_account_url(EMAccountEditor *emae, int urlid) +emae_account_url(EMAccountEditor *emae, gint urlid) { CamelURL *url = NULL; - const char *uri; + const gchar *uri; uri = e_account_get_string(emae->account, urlid); @@ -360,13 +360,13 @@ emae_license_state(GtkToggleButton *button, GtkDialog *dialog) } static gboolean -emae_load_text(GtkTextView *view, const char *filename) +emae_load_text(GtkTextView *view, const gchar *filename) { FILE *fd; - char filebuf[1024]; + gchar filebuf[1024]; GtkTextIter iter; GtkTextBuffer *buffer; - int count; + gint count; g_return_val_if_fail (filename != NULL , FALSE); @@ -391,9 +391,9 @@ emae_display_license(EMAccountEditor *emae, CamelProvider *prov) { GladeXML *xml; GtkWidget *w, *dialog; - char *tmp; + gchar *tmp; GtkResponseType response = GTK_RESPONSE_NONE; - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "mail-dialogs.glade", @@ -443,7 +443,7 @@ emae_check_license(EMAccountEditor *emae, CamelProvider *prov) providers_list = gconf_client_get_list (gconf, "/apps/evolution/mail/licenses", GCONF_VALUE_STRING, NULL); for (l = providers_list, accepted = FALSE; l && !accepted; l = g_slist_next(l)) - accepted = (strcmp((char *)l->data, prov->protocol) == 0); + accepted = (strcmp((gchar *)l->data, prov->protocol) == 0); if (!accepted && (accepted = emae_display_license(emae, prov)) == TRUE) { @@ -465,7 +465,7 @@ static void default_folders_clicked (GtkButton *button, gpointer user_data) { EMAccountEditor *emae = user_data; - const char *uri; + const gchar *uri; uri = mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_DRAFTS); em_folder_selection_button_set_selection((EMFolderSelectionButton *)emae->priv->drafts_folder_button, uri); @@ -477,31 +477,31 @@ default_folders_clicked (GtkButton *button, gpointer user_data) } /* custom widget factories */ -GtkWidget *em_account_editor_folder_selector_button_new (char *widget_name, char *string1, char *string2, int int1, int int2); +GtkWidget *em_account_editor_folder_selector_button_new (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2); GtkWidget * -em_account_editor_folder_selector_button_new (char *widget_name, char *string1, char *string2, int int1, int int2) +em_account_editor_folder_selector_button_new (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2) { return (GtkWidget *)em_folder_selection_button_new(string1 ? string1 : _("Select Folder"), NULL); } -GtkWidget *em_account_editor_dropdown_new(char *widget_name, char *string1, char *string2, int int1, int int2); +GtkWidget *em_account_editor_dropdown_new(gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2); GtkWidget * -em_account_editor_dropdown_new(char *widget_name, char *string1, char *string2, int int1, int int2) +em_account_editor_dropdown_new(gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2) { return (GtkWidget *)gtk_combo_box_new(); } -GtkWidget *em_account_editor_ssl_selector_new(char *widget_name, char *string1, char *string2, int int1, int int2); +GtkWidget *em_account_editor_ssl_selector_new(gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2); GtkWidget * -em_account_editor_ssl_selector_new(char *widget_name, char *string1, char *string2, int int1, int int2) +em_account_editor_ssl_selector_new(gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2) { GtkComboBox *dropdown = (GtkComboBox *)gtk_combo_box_new(); GtkCellRenderer *cell = gtk_cell_renderer_text_new(); GtkListStore *store; - int i; + gint i; GtkTreeIter iter; gtk_widget_show((GtkWidget *)dropdown); @@ -539,8 +539,8 @@ emae_auto_detect(EMAccountEditor *emae) GHashTable *auto_detected; GSList *l; CamelProviderConfEntry *entries; - char *value; - int i; + gchar *value; + gint i; CamelURL *url; if (service->provider == NULL @@ -615,7 +615,7 @@ static int emae_signature_get_iter(EMAccountEditor *emae, ESignature *sig, GtkTreeModel **modelp, GtkTreeIter *iter) { GtkTreeModel *model; - int found = 0; + gint found = 0; model = gtk_combo_box_get_model(emae->priv->signatures_dropdown); *modelp = model; @@ -623,7 +623,7 @@ emae_signature_get_iter(EMAccountEditor *emae, ESignature *sig, GtkTreeModel **m return FALSE; do { - char *uid; + gchar *uid; gtk_tree_model_get(model, iter, 1, &uid, -1); if (uid && !strcmp(uid, sig->uid)) @@ -657,10 +657,10 @@ emae_signature_changed(ESignatureList *signatures, ESignature *sig, EMAccountEdi static void emae_signaturetype_changed(GtkComboBox *dropdown, EMAccountEditor *emae) { - int id = gtk_combo_box_get_active(dropdown); + gint id = gtk_combo_box_get_active(dropdown); GtkTreeModel *model; GtkTreeIter iter; - char *uid = NULL; + gchar *uid = NULL; if (id != -1) { model = gtk_combo_box_get_model(dropdown); @@ -688,11 +688,11 @@ emae_setup_signatures(EMAccountEditor *emae, GladeXML *xml) GtkComboBox *dropdown = (GtkComboBox *)glade_xml_get_widget(xml, "signature_dropdown"); GtkCellRenderer *cell = gtk_cell_renderer_text_new(); GtkListStore *store; - int i, active=0; + gint i, active=0; GtkTreeIter iter; ESignatureList *signatures; EIterator *it; - const char *current = e_account_get_string(emae->account, E_ACCOUNT_ID_SIGNATURE); + const gchar *current = e_account_get_string(emae->account, E_ACCOUNT_ID_SIGNATURE); GtkWidget *button; emae->priv->signatures_dropdown = dropdown; @@ -749,7 +749,7 @@ emae_setup_signatures(EMAccountEditor *emae, GladeXML *xml) static void emae_receipt_policy_changed(GtkComboBox *dropdown, EMAccountEditor *emae) { - int id = gtk_combo_box_get_active(dropdown); + gint id = gtk_combo_box_get_active(dropdown); GtkTreeModel *model; GtkTreeIter iter; EAccountReceiptPolicy policy; @@ -769,7 +769,7 @@ emae_setup_receipt_policy (EMAccountEditor *emae, GladeXML *xml) { GtkComboBox *dropdown = (GtkComboBox *)glade_xml_get_widget(xml, "receipt_policy_dropdown"); GtkListStore *store; - int i = 0, active = 0; + gint i = 0, active = 0; GtkTreeIter iter; EAccountReceiptPolicy current = emae->account->receipt_policy; static struct { @@ -807,16 +807,16 @@ emae_setup_receipt_policy (EMAccountEditor *emae, GladeXML *xml) static void emae_account_entry_changed(GtkEntry *entry, EMAccountEditor *emae) { - int item = GPOINTER_TO_INT(g_object_get_data((GObject *)entry, "account-item")); + gint item = GPOINTER_TO_INT(g_object_get_data((GObject *)entry, "account-item")); e_account_set_string(emae->account, item, gtk_entry_get_text(entry)); } static GtkEntry * -emae_account_entry(EMAccountEditor *emae, const char *name, int item, GladeXML *xml) +emae_account_entry(EMAccountEditor *emae, const gchar *name, gint item, GladeXML *xml) { GtkEntry *entry; - const char *text; + const gchar *text; entry = (GtkEntry *)glade_xml_get_widget(xml, name); text = e_account_get_string(emae->account, item); @@ -832,13 +832,13 @@ emae_account_entry(EMAccountEditor *emae, const char *name, int item, GladeXML * static void emae_account_toggle_changed(GtkToggleButton *toggle, EMAccountEditor *emae) { - int item = GPOINTER_TO_INT(g_object_get_data((GObject *)toggle, "account-item")); + gint item = GPOINTER_TO_INT(g_object_get_data((GObject *)toggle, "account-item")); e_account_set_bool(emae->account, item, gtk_toggle_button_get_active(toggle)); } static void -emae_account_toggle_widget(EMAccountEditor *emae, GtkToggleButton *toggle, int item) +emae_account_toggle_widget(EMAccountEditor *emae, GtkToggleButton *toggle, gint item) { gtk_toggle_button_set_active(toggle, e_account_get_bool(emae->account, item)); g_object_set_data((GObject *)toggle, "account-item", GINT_TO_POINTER(item)); @@ -847,7 +847,7 @@ emae_account_toggle_widget(EMAccountEditor *emae, GtkToggleButton *toggle, int i } static GtkToggleButton * -emae_account_toggle(EMAccountEditor *emae, const char *name, int item, GladeXML *xml) +emae_account_toggle(EMAccountEditor *emae, const gchar *name, gint item, GladeXML *xml) { GtkToggleButton *toggle; @@ -860,13 +860,13 @@ emae_account_toggle(EMAccountEditor *emae, const char *name, int item, GladeXML static void emae_account_spinint_changed(GtkSpinButton *spin, EMAccountEditor *emae) { - int item = GPOINTER_TO_INT(g_object_get_data((GObject *)spin, "account-item")); + gint item = GPOINTER_TO_INT(g_object_get_data((GObject *)spin, "account-item")); e_account_set_int(emae->account, item, gtk_spin_button_get_value(spin)); } static void -emae_account_spinint_widget(EMAccountEditor *emae, GtkSpinButton *spin, int item) +emae_account_spinint_widget(EMAccountEditor *emae, GtkSpinButton *spin, gint item) { gtk_spin_button_set_value(spin, e_account_get_int(emae->account, item)); g_object_set_data((GObject *)spin, "account-item", GINT_TO_POINTER(item)); @@ -876,7 +876,7 @@ emae_account_spinint_widget(EMAccountEditor *emae, GtkSpinButton *spin, int item #if 0 static GtkSpinButton * -emae_account_spinint(EMAccountEditor *emae, const char *name, int item) +emae_account_spinint(EMAccountEditor *emae, const gchar *name, gint item) { GtkSpinButton *spin; @@ -890,21 +890,21 @@ emae_account_spinint(EMAccountEditor *emae, const char *name, int item) static void emae_account_folder_changed(EMFolderSelectionButton *folder, EMAccountEditor *emae) { - int item = GPOINTER_TO_INT(g_object_get_data((GObject *)folder, "account-item")); + gint item = GPOINTER_TO_INT(g_object_get_data((GObject *)folder, "account-item")); e_account_set_string(emae->account, item, em_folder_selection_button_get_selection(folder)); } static EMFolderSelectionButton * -emae_account_folder(EMAccountEditor *emae, const char *name, int item, int deffolder, GladeXML *xml) +emae_account_folder(EMAccountEditor *emae, const gchar *name, gint item, gint deffolder, GladeXML *xml) { EMFolderSelectionButton *folder; - const char *uri; + const gchar *uri; folder = (EMFolderSelectionButton *)glade_xml_get_widget(xml, name); uri = e_account_get_string(emae->account, item); if (uri) { - char *tmp = em_uri_to_camel(uri); + gchar *tmp = em_uri_to_camel(uri); em_folder_selection_button_set_selection(folder, tmp); g_free(tmp); @@ -927,8 +927,8 @@ static void smime_changed(EMAccountEditor *emae) { EMAccountEditorPrivate *gui = emae->priv; - int act; - const char *tmp; + gint act; + const gchar *tmp; tmp = gtk_entry_get_text(gui->smime_sign_key); act = tmp && tmp[0]; @@ -949,7 +949,7 @@ smime_changed(EMAccountEditor *emae) } static void -smime_sign_key_selected(GtkWidget *dialog, const char *key, EMAccountEditor *emae) +smime_sign_key_selected(GtkWidget *dialog, const gchar *key, EMAccountEditor *emae) { EMAccountEditorPrivate *gui = emae->priv; @@ -984,7 +984,7 @@ smime_sign_key_clear(GtkWidget *w, EMAccountEditor *emae) } static void -smime_encrypt_key_selected(GtkWidget *dialog, const char *key, EMAccountEditor *emae) +smime_encrypt_key_selected(GtkWidget *dialog, const gchar *key, EMAccountEditor *emae) { EMAccountEditorPrivate *gui = emae->priv; @@ -1020,10 +1020,10 @@ smime_encrypt_key_clear(GtkWidget *w, EMAccountEditor *emae) #endif static void -emae_url_set_hostport(CamelURL *url, const char *txt) +emae_url_set_hostport(CamelURL *url, const gchar *txt) { - const char *port; - char *host; + const gchar *port; + gchar *host; /* FIXME: what if this was a raw IPv6 address? */ if (txt && (port = strchr(txt, ':'))) { @@ -1049,7 +1049,7 @@ emae_url_set_hostport(CamelURL *url, const char *txt) We need our own function for host:port decoding, as above */ struct _provider_host_info { guint32 flag; - void (*setval)(CamelURL *, const char *); + void (*setval)(CamelURL *, const gchar *); glong widgets[3]; }; @@ -1126,7 +1126,7 @@ static struct _service_info { static void emae_uri_changed(EMAccountEditorService *service, CamelURL *url) { - char *uri; + gchar *uri; uri = camel_url_to_string(url, 0); @@ -1142,16 +1142,16 @@ emae_uri_changed(EMAccountEditorService *service, CamelURL *url) } static void -emae_service_url_changed(EMAccountEditorService *service, void (*setval)(CamelURL *, const char *), GtkEntry *entry) +emae_service_url_changed(EMAccountEditorService *service, void (*setval)(CamelURL *, const gchar *), GtkEntry *entry) { GtkComboBox *dropdown; - int id; + gint id; GtkTreeModel *model; GtkTreeIter iter; CamelServiceAuthType *authtype; CamelURL *url = emae_account_url(service->emae, emae_service_info[service->type].account_uri_key); - const char *text = gtk_entry_get_text(entry); + const gchar *text = gtk_entry_get_text(entry); setval(url, (text && text[0])?text:NULL); @@ -1175,16 +1175,16 @@ emae_service_url_changed(EMAccountEditorService *service, void (*setval)(CamelUR } static void -emae_service_url_path_changed(EMAccountEditorService *service, void (*setval)(CamelURL *, const char *), GtkWidget *widget) +emae_service_url_path_changed(EMAccountEditorService *service, void (*setval)(CamelURL *, const gchar *), GtkWidget *widget) { GtkComboBox *dropdown; - int id; + gint id; GtkTreeModel *model; GtkTreeIter iter; CamelServiceAuthType *authtype; CamelURL *url = emae_account_url(service->emae, emae_service_info[service->type].account_uri_key); - const char *text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); + const gchar *text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); setval(url, (text && text[0])?text:NULL); @@ -1228,10 +1228,10 @@ emae_path_changed(GtkWidget *widget, EMAccountEditorService *service) static int emae_ssl_update(EMAccountEditorService *service, CamelURL *url) { - int id = gtk_combo_box_get_active(service->use_ssl); + gint id = gtk_combo_box_get_active(service->use_ssl); GtkTreeModel *model; GtkTreeIter iter; - char *ssl; + gchar *ssl; if (id == -1) return 0; @@ -1261,12 +1261,12 @@ emae_ssl_changed(GtkComboBox *dropdown, EMAccountEditorService *service) static void emae_service_provider_changed(EMAccountEditorService *service) { - int i, j; + gint i, j; void (*show)(GtkWidget *); CamelURL *url = emae_account_url(service->emae, emae_service_info[service->type].account_uri_key); if (service->provider) { - int enable; + gint enable; GtkWidget *dwidget = NULL; camel_url_set_protocol(url, service->provider->protocol); @@ -1288,7 +1288,7 @@ emae_service_provider_changed(EMAccountEditorService *service) for (i=0;emae_service_info[service->type].host_info[i].flag;i++) { GtkWidget *w; - int hide; + gint hide; struct _provider_host_info *info = &emae_service_info[service->type].host_info[i]; enable = CAMEL_PROVIDER_ALLOWS(service->provider, info->flag); @@ -1369,7 +1369,7 @@ emae_service_provider_changed(EMAccountEditorService *service) static void emae_provider_changed(GtkComboBox *dropdown, EMAccountEditorService *service) { - int id = gtk_combo_box_get_active(dropdown); + gint id = gtk_combo_box_get_active(dropdown); GtkTreeModel *model; GtkTreeIter iter; @@ -1399,19 +1399,19 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) GList *l; GtkCellRenderer *cell = gtk_cell_renderer_text_new(); GtkComboBox *dropdown; - int active = 0, i; + gint active = 0, i; struct _service_info *info = &emae_service_info[service->type]; - const char *uri = e_account_get_string(account, info->account_uri_key); - const char *tmp; - char *current = NULL; + const gchar *uri = e_account_get_string(account, info->account_uri_key); + const gchar *tmp; + gchar *current = NULL; CamelURL *url; dropdown = service->providers; gtk_widget_show((GtkWidget *)dropdown); if (uri) { - const char *colon = strchr(uri, ':'); - int len; + const gchar *colon = strchr(uri, ':'); + gint len; if (colon) { len = colon-uri; @@ -1495,7 +1495,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) static void emae_authtype_changed(GtkComboBox *dropdown, EMAccountEditorService *service) { - int id = gtk_combo_box_get_active(dropdown); + gint id = gtk_combo_box_get_active(dropdown); GtkTreeModel *model; GtkTreeIter iter; CamelServiceAuthType *authtype; @@ -1525,7 +1525,7 @@ emae_authtype_changed(GtkComboBox *dropdown, EMAccountEditorService *service) static void emae_needs_auth(GtkToggleButton *toggle, EMAccountEditorService *service) { - int need = gtk_toggle_button_get_active(toggle); + gint need = gtk_toggle_button_get_active(toggle); gtk_widget_set_sensitive(service->auth_frame, need); @@ -1549,10 +1549,10 @@ emae_refresh_authtype (EMAccountEditor *emae, EMAccountEditorService *service) GtkListStore *store; GtkTreeIter iter; GtkComboBox *dropdown; - int active = 0; - int i; + gint active = 0; + gint i; struct _service_info *info = &emae_service_info[service->type]; - const char *uri = e_account_get_string(account, info->account_uri_key); + const gchar *uri = e_account_get_string(account, info->account_uri_key); GList *l, *ll; CamelURL *url = NULL; @@ -1567,7 +1567,7 @@ emae_refresh_authtype (EMAccountEditor *emae, EMAccountEditorService *service) if (service->provider) { for (i=0, l=service->provider->authtypes; l; l=l->next, i++) { CamelServiceAuthType *authtype = l->data; - int avail; + gint avail; /* if we have some already shown */ if (service->authtypes) { @@ -1606,7 +1606,7 @@ emae_refresh_authtype (EMAccountEditor *emae, EMAccountEditorService *service) camel_url_free(url); } -static void emae_check_authtype_done(const char *uri, CamelProviderType type, GList *types, void *data) +static void emae_check_authtype_done(const gchar *uri, CamelProviderType type, GList *types, gpointer data) { EMAccountEditorService *service = data; @@ -1626,7 +1626,7 @@ static void emae_check_authtype_done(const char *uri, CamelProviderType type, GL g_object_unref(service->emae); } -static void emae_check_authtype_response(GtkWidget *d, int button, EMAccountEditorService *service) +static void emae_check_authtype_response(GtkWidget *d, gint button, EMAccountEditorService *service) { mail_msg_cancel(service->check_id); gtk_widget_destroy(service->check_dialog); @@ -1639,7 +1639,7 @@ static void emae_check_authtype_response(GtkWidget *d, int button, EMAccountEdit static void emae_check_authtype(GtkWidget *w, EMAccountEditorService *service) { EMAccountEditor *emae = service->emae; - const char *uri; + const gchar *uri; /* TODO: do we need to remove the auth mechanism from the uri? */ uri = e_account_get_string(emae->account, emae_service_info[service->type].account_uri_key); @@ -1659,9 +1659,9 @@ emae_setup_service(EMAccountEditor *emae, EMAccountEditorService *service, Glade { struct _service_info *info = &emae_service_info[service->type]; CamelURL *url = emae_account_url(emae, info->account_uri_key); - const char *uri = e_account_get_string(emae->account, info->account_uri_key); - const char *tmp; - int i; + const gchar *uri = e_account_get_string(emae->account, info->account_uri_key); + const gchar *tmp; + gint i; service->provider = uri?camel_provider_get(uri, NULL):NULL; service->frame = glade_xml_get_widget(xml, info->frame); @@ -1685,7 +1685,7 @@ emae_setup_service(EMAccountEditor *emae, EMAccountEditorService *service, Glade /* configure ui for current settings */ if (url->host) { if (url->port) { - char *host = g_strdup_printf("%s:%d", url->host, url->port); + gchar *host = g_strdup_printf("%s:%d", url->host, url->port); gtk_entry_set_text(service->hostname, host); g_free(host); @@ -1769,16 +1769,16 @@ static struct { /* its a bit obtuse, but its simple */ static void -emae_queue_widgets(EMAccountEditor *emae, GladeXML *xml, const char *first, ...) +emae_queue_widgets(EMAccountEditor *emae, GladeXML *xml, const gchar *first, ...) { - int i = 0; + gint i = 0; va_list ap; va_start(ap, first); while (first) { emae->priv->widgets_name[i] = first; emae->priv->widgets[i++] = glade_xml_get_widget(xml, first); - first = va_arg(ap, const char *); + first = va_arg(ap, const gchar *); } va_end(ap); @@ -1789,15 +1789,15 @@ emae_queue_widgets(EMAccountEditor *emae, GladeXML *xml, const char *first, ...) } static GtkWidget * -emae_identity_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emae_identity_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; EMAccountEditorPrivate *gui = emae->priv; EAccount *account = emae->account; - int i; + gint i; GtkWidget *w; GladeXML *xml; - char *gladefile; + gchar *gladefile; /*if (old) return old;*/ @@ -1862,13 +1862,13 @@ emae_identity_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st } static GtkWidget * -emae_receive_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emae_receive_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; EMAccountEditorPrivate *gui = emae->priv; GtkWidget *w; GladeXML *xml; - char *gladefile; + gchar *gladefile; /*if (old) return old;*/ @@ -1915,9 +1915,9 @@ emae_receive_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str static void emae_option_toggle_changed(GtkToggleButton *toggle, EMAccountEditorService *service) { - const char *name = g_object_get_data((GObject *)toggle, "option-name"); + const gchar *name = g_object_get_data((GObject *)toggle, "option-name"); GSList *depl = g_object_get_data((GObject *)toggle, "dependent-list"); - int active = gtk_toggle_button_get_active(toggle); + gint active = gtk_toggle_button_get_active(toggle); CamelURL *url = emae_account_url(service->emae, emae_service_info[service->type].account_uri_key); for (;depl;depl = g_slist_next(depl)) @@ -1929,13 +1929,13 @@ emae_option_toggle_changed(GtkToggleButton *toggle, EMAccountEditorService *serv } static GtkWidget * -emae_option_toggle(EMAccountEditorService *service, CamelURL *url, const char *text, const char *name, int def) +emae_option_toggle(EMAccountEditorService *service, CamelURL *url, const gchar *text, const gchar *name, gint def) { GtkWidget *w; /* FIXME: how do we get the default value ever? */ w = gtk_check_button_new_with_mnemonic(text); - g_object_set_data((GObject *)w, "option-name", (void *)name); + g_object_set_data((GObject *)w, "option-name", (gpointer)name); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), camel_url_get_param (url, name) != NULL); g_signal_connect(w, "toggled", G_CALLBACK(emae_option_toggle_changed), service); gtk_widget_show(w); @@ -1946,8 +1946,8 @@ emae_option_toggle(EMAccountEditorService *service, CamelURL *url, const char *t static void emae_option_entry_changed(GtkEntry *entry, EMAccountEditorService *service) { - const char *name = g_object_get_data((GObject *)entry, "option-name"); - const char *text = gtk_entry_get_text(entry); + const gchar *name = g_object_get_data((GObject *)entry, "option-name"); + const gchar *text = gtk_entry_get_text(entry); CamelURL *url = emae_account_url(service->emae, emae_service_info[service->type].account_uri_key); camel_url_set_param(url, name, text && text[0]?text:NULL); @@ -1956,10 +1956,10 @@ emae_option_entry_changed(GtkEntry *entry, EMAccountEditorService *service) } static GtkWidget * -emae_option_entry(EMAccountEditorService *service, CamelURL *url, const char *name, const char *def, GtkWidget *l) +emae_option_entry(EMAccountEditorService *service, CamelURL *url, const gchar *name, const gchar *def, GtkWidget *l) { GtkWidget *w; - const char *val = camel_url_get_param(url, name); + const gchar *val = camel_url_get_param(url, name); if (val == NULL) { if (def) { @@ -1974,7 +1974,7 @@ emae_option_entry(EMAccountEditorService *service, CamelURL *url, const char *na "text", val, NULL); gtk_label_set_mnemonic_widget ((GtkLabel*)l, w); - g_object_set_data((GObject *)w, "option-name", (void *)name); + g_object_set_data((GObject *)w, "option-name", (gpointer)name); g_signal_connect(w, "changed", G_CALLBACK(emae_option_entry_changed), service); gtk_widget_show(w); @@ -1984,8 +1984,8 @@ emae_option_entry(EMAccountEditorService *service, CamelURL *url, const char *na static void emae_option_checkspin_changed(GtkSpinButton *spin, EMAccountEditorService *service) { - const char *name = g_object_get_data((GObject *)spin, "option-name"); - char value[16]; + const gchar *name = g_object_get_data((GObject *)spin, "option-name"); + gchar value[16]; CamelURL *url = emae_account_url(service->emae, emae_service_info[service->type].account_uri_key); sprintf(value, "%d", gtk_spin_button_get_value_as_int(spin)); @@ -1997,7 +1997,7 @@ emae_option_checkspin_changed(GtkSpinButton *spin, EMAccountEditorService *servi static void emae_option_checkspin_check_changed(GtkToggleButton *toggle, EMAccountEditorService *service) { - const char *name = g_object_get_data((GObject *)toggle, "option-name"); + const gchar *name = g_object_get_data((GObject *)toggle, "option-name"); GtkSpinButton *spin = g_object_get_data((GObject *)toggle, "option-target"); if (gtk_toggle_button_get_active(toggle)) { @@ -2015,14 +2015,14 @@ emae_option_checkspin_check_changed(GtkToggleButton *toggle, EMAccountEditorServ /* this is a fugly api */ static GtkWidget * -emae_option_checkspin(EMAccountEditorService *service, CamelURL *url, const char *name, const char *fmt, const char *info) +emae_option_checkspin(EMAccountEditorService *service, CamelURL *url, const gchar *name, const gchar *fmt, const gchar *info) { GtkWidget *hbox, *check, *spin, *label = NULL; double min, def, max; - char *pre, *post; - const char *val; - char on; - int enable; + gchar *pre, *post; + const gchar *val; + gchar on; + gint enable; pre = g_alloca(strlen(fmt)+1); strcpy(pre, fmt); @@ -2054,9 +2054,9 @@ emae_option_checkspin(EMAccountEditorService *service, CamelURL *url, const char if (label) gtk_box_pack_start((GtkBox *)hbox, label, FALSE, TRUE, 4); - g_object_set_data((GObject *)spin, "option-name", (void *)name); - g_object_set_data((GObject *)check, "option-name", (void *)name); - g_object_set_data((GObject *)check, "option-target", (void *)spin); + g_object_set_data((GObject *)spin, "option-name", (gpointer)name); + g_object_set_data((GObject *)check, "option-name", (gpointer)name); + g_object_set_data((GObject *)check, "option-target", (gpointer)spin); g_signal_connect(spin, "value_changed", G_CALLBACK(emae_option_checkspin_changed), service); g_signal_connect(check, "toggled", G_CALLBACK(emae_option_checkspin_check_changed), service); @@ -2069,10 +2069,10 @@ emae_option_checkspin(EMAccountEditorService *service, CamelURL *url, const char static void emae_option_options_changed (GtkComboBox *options, EMAccountEditorService *service) { - const char *name = g_object_get_data (G_OBJECT (options), "option-name"); - char *value = NULL; + const gchar *name = g_object_get_data (G_OBJECT (options), "option-name"); + gchar *value = NULL; CamelURL *url = emae_account_url (service->emae, emae_service_info[service->type].account_uri_key); - int id = gtk_combo_box_get_active (options); + gint id = gtk_combo_box_get_active (options); if (id != -1) { GtkTreeModel *model; @@ -2092,16 +2092,16 @@ emae_option_options_changed (GtkComboBox *options, EMAccountEditorService *servi /* 'values' is in format "value0:caption0:value2:caption2:...valueN:captionN" */ static GtkWidget * -emae_option_options (EMAccountEditorService *service, CamelURL *url, const char *name, const char *values, GtkWidget *l) +emae_option_options (EMAccountEditorService *service, CamelURL *url, const gchar *name, const gchar *values, GtkWidget *l) { GtkComboBox *w; GtkListStore *store; GtkTreeIter iter; - const char *p, *value, *caption; + const gchar *p, *value, *caption; GtkCellRenderer *cell; - int active = 0; /* the first item entered is always a default item */ - int i; - const char *val = camel_url_get_param (url, name); + gint active = 0; /* the first item entered is always a default item */ + gint i; + const gchar *val = camel_url_get_param (url, name); w = GTK_COMBO_BOX (gtk_combo_box_new ()); @@ -2110,7 +2110,7 @@ emae_option_options (EMAccountEditorService *service, CamelURL *url, const char p = values; for (p = values, i = 0; p; i++) { - char *vl, *cp; + gchar *vl, *cp; value = p; caption = strchr (p, ':'); @@ -2150,18 +2150,18 @@ emae_option_options (EMAccountEditorService *service, CamelURL *url, const char gtk_label_set_mnemonic_widget (GTK_LABEL (l), GTK_WIDGET (w)); - g_object_set_data (G_OBJECT (w), "option-name", (void *)name); + g_object_set_data (G_OBJECT (w), "option-name", (gpointer)name); g_signal_connect (w, "changed", G_CALLBACK (emae_option_options_changed), service); return GTK_WIDGET (w); } static GtkWidget * -emae_receive_options_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emae_receive_options_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; GtkWidget *w, *box, *spin; - int row; + gint row; if (emae->priv->source.provider == NULL || emae->priv->source.provider->extra_conf == NULL) @@ -2194,7 +2194,7 @@ emae_receive_options_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *par } static GtkWidget * -emae_receive_options_extra_item(EConfig *ec, EConfigItem *eitem, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emae_receive_options_extra_item(EConfig *ec, EConfigItem *eitem, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; struct _receive_options_item *item = (struct _receive_options_item *)eitem; @@ -2203,7 +2203,7 @@ emae_receive_options_extra_item(EConfig *ec, EConfigItem *eitem, struct _GtkWidg GtkWidget *depw; GSList *depl = NULL, *n; EMAccountEditorService *service = &emae->priv->source; - int row, i; + gint row, i; GHashTable *extra; CamelURL *url; @@ -2306,7 +2306,7 @@ section: } if (depw && depl) { - int act = gtk_toggle_button_get_active((GtkToggleButton *)depw); + gint act = gtk_toggle_button_get_active((GtkToggleButton *)depw); g_object_set_data_full((GObject *)depw, "dependent-list", depl, (GDestroyNotify)g_slist_free); for (n=depl;n;n=g_slist_next(n)) @@ -2328,17 +2328,17 @@ section: } static GtkWidget * -emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; EMAccountEditorPrivate *gui = emae->priv; GtkWidget *w; GladeXML *xml; - char *gladefile; + gchar *gladefile; /* no transport options page at all for these types of providers */ if (gui->source.provider && CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT(gui->source.provider)) { - memset(&gui->transport.frame, 0, ((char *)&gui->transport.check_dialog)-((char *)&gui->transport.frame)); + memset(&gui->transport.frame, 0, ((gchar *)&gui->transport.check_dialog)-((gchar *)&gui->transport.frame)); return NULL; } @@ -2383,13 +2383,13 @@ emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct } static GtkWidget * -emae_defaults_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emae_defaults_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; EMAccountEditorPrivate *gui = emae->priv; GtkWidget *w; GladeXML *xml; - char *gladefile; + gchar *gladefile; /*if (old) return old;*/ @@ -2441,7 +2441,7 @@ emae_defaults_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st } static GtkWidget * -emae_security_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emae_security_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; #if defined (HAVE_NSS) @@ -2449,7 +2449,7 @@ emae_security_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st #endif GtkWidget *w; GladeXML *xml; - char *gladefile; + gchar *gladefile; /*if (old) return old;*/ @@ -2505,10 +2505,10 @@ emae_security_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st } static GtkWidget * -emae_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emae_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; - int i; + gint i; for (i=0;emae->priv->widgets[i];i++) if (!strcmp(emae->priv->widgets_name[i], item->label)) @@ -2556,7 +2556,7 @@ static EMConfigItem emae_editor_items[] = { static gboolean emae_editor_items_translated = FALSE; static GtkWidget * -emae_management_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emae_management_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { EMAccountEditor *emae = data; EMAccountEditorPrivate *gui = emae->priv; @@ -2566,7 +2566,7 @@ emae_management_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, if (((EConfig *)gui->config)->type == E_CONFIG_DRUID) { GladeXML *druidxml; GtkWidget *page; - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "mail-config.glade", @@ -2586,11 +2586,11 @@ emae_management_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, } static GtkWidget * -emae_widget_druid_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emae_widget_druid_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { GladeXML *druidxml; GtkWidget *w; - char *gladefile; + gchar *gladefile; EMAccountEditor *emae = (EMAccountEditor *)data; if (emae->type == EMAE_PAGES) @@ -2647,13 +2647,13 @@ static EMConfigItem emae_druid_items[] = { static gboolean emae_druid_items_translated = FALSE; static void -emae_free(EConfig *ec, GSList *items, void *data) +emae_free(EConfig *ec, GSList *items, gpointer data) { g_slist_free(items); } static void -emae_free_auto(EConfig *ec, GSList *items, void *data) +emae_free_auto(EConfig *ec, GSList *items, gpointer data) { GSList *l, *n; @@ -2674,8 +2674,8 @@ static gboolean emae_service_complete(EMAccountEditor *emae, EMAccountEditorService *service) { CamelURL *url; - int ok = TRUE; - const char *uri; + gint ok = TRUE; + const gchar *uri; if (service->provider == NULL) return TRUE; @@ -2728,9 +2728,9 @@ struct _server_prefill { }; static int -check_servers (char *server) +check_servers (gchar *server) { - int len = G_N_ELEMENTS(mail_servers), i; + gint len = G_N_ELEMENTS(mail_servers), i; for (i=0; ipriv->config)->type == E_CONFIG_DRUID) { if (!strcmp(pageid, "00.identity")) { if (!emae->priv->identity_set) { - char *uname; + gchar *uname; emae->priv->identity_set = 1; #ifndef G_OS_WIN32 @@ -2770,13 +2770,13 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) } } else if (!strcmp(pageid, "10.receive")) { if (!emae->priv->receive_set) { - char *user, *at; - int index; - char *uri = (char *)e_account_get_string(emae->account, E_ACCOUNT_SOURCE_URL); + gchar *user, *at; + gint index; + gchar *uri = (gchar *)e_account_get_string(emae->account, E_ACCOUNT_SOURCE_URL); CamelURL *url; emae->priv->receive_set = 1; - tmp = (char *)e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS); + tmp = (gchar *)e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS); at = strchr(tmp, '@'); user = g_alloca(at-tmp+1); memcpy(user, tmp, at-tmp); @@ -2806,9 +2806,9 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) } } else if (!strcmp(pageid, "30.send")) { CamelURL *url; - char *at, *user; - int index; - char *uri = (char *)e_account_get_string(emae->account, E_ACCOUNT_TRANSPORT_URL); + gchar *at, *user; + gint index; + gchar *uri = (gchar *)e_account_get_string(emae->account, E_ACCOUNT_TRANSPORT_URL); tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS); at = strchr(tmp, '@'); @@ -2841,8 +2841,8 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) } } else if (!strcmp(pageid, "40.management")) { if (!emae->priv->management_set) { - char *template; - unsigned int i = 0, len; + gchar *template; + guint i = 0, len; emae->priv->management_set = 1; tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS); @@ -2913,14 +2913,14 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data) } void -em_account_editor_check (EMAccountEditor *emae, const char *page) +em_account_editor_check (EMAccountEditor *emae, const gchar *page) { emae_check_complete((EConfig *)emae->config, page, emae); } /* HACK: FIXME: the component should listen to the account object directly */ static void -add_new_store (char *uri, CamelStore *store, void *user_data) +add_new_store (gchar *uri, CamelStore *store, gpointer user_data) { MailComponent *component = mail_component_peek (); EAccount *account = user_data; @@ -2932,7 +2932,7 @@ add_new_store (char *uri, CamelStore *store, void *user_data) } static void -emae_commit(EConfig *ec, GSList *items, void *data) +emae_commit(EConfig *ec, GSList *items, gpointer data) { EMAccountEditor *emae = data; EAccountList *accounts = mail_config_get_accounts(); @@ -2981,7 +2981,7 @@ static void em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account_editor_t type, const gchar *id) { EMAccountEditorPrivate *gui = emae->priv; - int i, index; + gint i, index; GSList *l; GList *prov; EMConfig *ec; @@ -2992,7 +2992,7 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account emae->type = type; emae->original = account; if (emae->original) { - char *xml; + gchar *xml; g_object_ref(emae->original); xml = e_account_to_xml(emae->original); @@ -3050,8 +3050,8 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account for (i=0;entries && entries[i].type != CAMEL_PROVIDER_CONF_END;i++) { struct _receive_options_item *item; - char *name = entries[i].name; - int myindex = index; + gchar *name = entries[i].name; + gint myindex = index; if (entries[i].type != CAMEL_PROVIDER_CONF_SECTION_START || name == NULL diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index e17236e865..4567f36cbe 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -66,10 +66,10 @@ struct _EMAccountEditorClass { GType em_account_editor_get_type(void); -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); +EMAccountEditor *em_account_editor_new(struct _EAccount *account, em_account_editor_t type, const gchar *id); +EMAccountEditor *em_account_editor_new_for_pages(struct _EAccount *account, em_account_editor_t type, gchar *id, struct _GtkWidget **pages); void em_account_editor_commit (EMAccountEditor *emae); -void em_account_editor_check (EMAccountEditor *emae, const char *page); +void em_account_editor_check (EMAccountEditor *emae, const gchar *page); gboolean em_account_editor_save (EMAccountEditor *gui); void em_account_editor_destroy (EMAccountEditor *gui); @@ -79,7 +79,7 @@ gboolean em_account_editor_source_complete (EMAccountEditor *gui, struct _GtkWid gboolean em_account_editor_transport_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete); gboolean em_account_editor_management_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete); -void em_account_editor_build_extra_conf (EMAccountEditor *gui, const char *url); +void em_account_editor_build_extra_conf (EMAccountEditor *gui, const gchar *url); void em_account_editor_auto_detect_extra_conf (EMAccountEditor *gui); diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c index d2303aa73b..f5a86fe9b0 100644 --- a/mail/em-account-prefs.c +++ b/mail/em-account-prefs.c @@ -220,7 +220,7 @@ account_delete_clicked (GtkButton *button, gpointer user_data) EAccountList *accounts; GtkTreeModel *model; GtkTreeIter iter; - int ans; + gint ans; gboolean has_proxies = FALSE; selection = gtk_tree_view_get_selection (prefs->table); @@ -235,7 +235,7 @@ account_delete_clicked (GtkButton *button, gpointer user_data) ans = e_error_run(PREFS_WINDOW(prefs), has_proxies?"mail:ask-delete-account-with-proxies":"mail:ask-delete-account",NULL); if (ans == GTK_RESPONSE_YES) { - int len; + gint len; /* remove it from the folder-tree in the shell */ if (account->enabled && account->source && account->source->url) @@ -309,7 +309,7 @@ account_able_changed(EAccount *account) } static void -account_able_toggled (GtkCellRendererToggle *renderer, char *arg1, gpointer user_data) +account_able_toggled (GtkCellRendererToggle *renderer, gchar *arg1, gpointer user_data) { EMAccountPrefs *prefs = user_data; GtkTreeSelection *selection; @@ -326,7 +326,7 @@ account_able_toggled (GtkCellRendererToggle *renderer, char *arg1, gpointer user gtk_tree_model_get (model, &iter, 3, &account, -1); if (mail_config_has_proxies (account)) { - int ans; + gint ans; ans = e_error_run(PREFS_WINDOW(prefs), "mail:ask-delete-proxy-accounts",NULL); @@ -363,8 +363,8 @@ account_cursor_change (GtkTreeSelection *selection, EMAccountPrefs *prefs) EAccount *account = NULL; GtkTreeModel *model; GtkTreeIter iter; - const char *url = NULL; - int state; + const gchar *url = NULL; + gint state; EAccount *default_account; default_account = mail_config_get_default_account (); @@ -400,9 +400,9 @@ mail_accounts_load (EMAccountPrefs *prefs) EAccountList *accounts; GtkListStore *model; GtkTreeIter iter; - char *name, *val; + gchar *name, *val; EIterator *node; - int row = 0; + gint row = 0; GtkTreeSelection *selection; model = (GtkListStore *) gtk_tree_view_get_model (prefs->table); @@ -435,7 +435,7 @@ mail_accounts_load (EMAccountPrefs *prefs) gtk_list_store_set (model, &iter, 0, account->enabled, 1, val, - 2, url && url->protocol ? url->protocol : (char *) _("None"), + 2, url && url->protocol ? url->protocol : (gchar *) _("None"), 3, account, -1); g_free (name); @@ -457,11 +457,11 @@ mail_accounts_load (EMAccountPrefs *prefs) -GtkWidget *em_account_prefs_treeview_new (char *widget_name, char *string1, char *string2, - int int1, int int2); +GtkWidget *em_account_prefs_treeview_new (gchar *widget_name, gchar *string1, gchar *string2, + gint int1, gint int2); GtkWidget * -em_account_prefs_treeview_new (char *widget_name, char *string1, char *string2, int int1, int int2) +em_account_prefs_treeview_new (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2) { GtkWidget *table, *scrolled; GtkTreeSelection *selection; @@ -515,7 +515,7 @@ em_account_prefs_construct (EMAccountPrefs *prefs) GtkWidget *toplevel, *widget; GtkCellRenderer *renderer; GladeXML *gui; - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "mail-config.glade", diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index 8c704a2827..6c01dffa08 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -178,7 +178,7 @@ sig_load_preview (EMComposerPrefs *prefs, gtk_html_load_from_string (html, str, strlen (str)); } else { GtkHTMLStream *stream; - int len; + gint len; len = strlen (str); stream = gtk_html_begin_content (html, "text/html; charset=utf-8"); @@ -376,12 +376,12 @@ sig_add_cb (GtkWidget *widget, EMComposerPrefs *prefs) } static void -sig_add_script_response (GtkWidget *widget, int button, EMComposerPrefs *prefs) +sig_add_script_response (GtkWidget *widget, gint button, EMComposerPrefs *prefs) { gchar *script, **argv = NULL; GtkWidget *entry; const gchar *name; - int argc; + gint argc; if (button == GTK_RESPONSE_ACCEPT) { entry = glade_xml_get_widget (prefs->sig_script_gui, "filechooserbutton_add_script"); @@ -821,12 +821,12 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) GConfBridge *bridge; GConfClient *client; const gchar *key; - int style; + gint style; gchar *buf; EMConfig *ec; EMConfigTargetPrefs *target; GSList *l; - int i; + gint i; gchar *gladefile; gboolean sensitive; diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 4ed3e70b8f..e8abdd30b3 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -73,14 +73,14 @@ static EAccount * guess_account (CamelMimeMessage *message, CamelFolder *folder); struct emcs_t { - unsigned int ref_count; + guint ref_count; CamelFolder *drafts_folder; - char *drafts_uid; + gchar *drafts_uid; CamelFolder *folder; guint32 flags, set; - char *uid; + gchar *uid; }; static struct emcs_t * @@ -138,12 +138,12 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recip { gboolean res; GString *str; - int i; + gint i; str = g_string_new(""); for (i = 0; recipients[i] != NULL; ++i) { if (!e_destination_get_html_mail_pref (recipients[i])) { - const char *name; + const gchar *name; name = e_destination_get_textrep (recipients[i], FALSE); @@ -190,7 +190,7 @@ struct _send_data { static void composer_send_queued_cb (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, - int queued, const char *appended_uid, void *data) + gint queued, const gchar *appended_uid, gpointer data) { struct emcs_t *emcs; struct _send_data *send = data; @@ -257,12 +257,12 @@ composer_get_message (EMsgComposer *composer, gboolean save_html_object_data) EDestination **recipients, **recipients_bcc; gboolean html_mode, send_html, confirm_html; CamelInternetAddress *cia; - int hidden = 0, shown = 0; - int num = 0, num_bcc = 0, num_post = 0; - const char *subject; + gint hidden = 0, shown = 0; + gint num = 0, num_bcc = 0, num_post = 0; + const gchar *subject; GConfClient *gconf; EAccount *account; - int i; + gint i; GList *postlist; EMEvent *eme; EMEventTargetComposer *target; @@ -283,7 +283,7 @@ composer_get_message (EMsgComposer *composer, gboolean save_html_object_data) /* see which ones are visible/present, etc */ if (recipients) { for (i = 0; recipients[i] != NULL; i++) { - const char *addr = e_destination_get_address (recipients[i]); + const gchar *addr = e_destination_get_address (recipients[i]); if (addr && addr[0]) { camel_address_decode ((CamelAddress *) cia, addr); @@ -304,7 +304,7 @@ composer_get_message (EMsgComposer *composer, gboolean save_html_object_data) recipients_bcc = e_composer_header_table_get_destinations_bcc (table); if (recipients_bcc) { for (i = 0; recipients_bcc[i] != NULL; i++) { - const char *addr = e_destination_get_address (recipients_bcc[i]); + const gchar *addr = e_destination_get_address (recipients_bcc[i]); if (addr && addr[0]) { camel_address_decode ((CamelAddress *) cia, addr); @@ -400,9 +400,9 @@ composer_get_message (EMsgComposer *composer, gboolean save_html_object_data) camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Transport", account->transport->url); camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc", account->sent_folder_uri); if (account->id->organization && *account->id->organization) { - char *org; + gchar *org; - org = camel_header_encode_string ((const unsigned char *)account->id->organization); + org = camel_header_encode_string ((const guchar *)account->id->organization); camel_medium_set_header (CAMEL_MEDIUM (message), "Organization", org); g_free (org); } @@ -484,8 +484,8 @@ composer_set_no_change (EMsgComposer *composer, gboolean drop_undo, gboolean edi } static void -save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, - const char *appended_uid, void *user_data) +save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, gint ok, + const gchar *appended_uid, gpointer user_data) { struct _save_draft_info *sdi = user_data; struct emcs_t *emcs; @@ -547,7 +547,7 @@ save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *i } static void -save_draft_folder (char *uri, CamelFolder *folder, gpointer data) +save_draft_folder (gchar *uri, CamelFolder *folder, gpointer data) { CamelFolder **save = data; @@ -560,7 +560,7 @@ save_draft_folder (char *uri, CamelFolder *folder, gpointer data) void em_utils_composer_save_draft_cb (EMsgComposer *composer, gpointer user_data) { - const char *default_drafts_folder_uri = mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_DRAFTS); + const gchar *default_drafts_folder_uri = mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_DRAFTS); CamelFolder *drafts_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_DRAFTS); EComposerHeaderTable *table; struct _save_draft_info *sdi; @@ -586,7 +586,7 @@ em_utils_composer_save_draft_cb (EMsgComposer *composer, gpointer user_data) if (account && account->drafts_folder_uri && strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { - int id; + gint id; id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_msg_unordered_push); mail_msg_wait (id); @@ -620,11 +620,11 @@ em_utils_composer_save_draft_cb (EMsgComposer *composer, gpointer user_data) void em_composer_utils_setup_callbacks (EMsgComposer *composer, CamelFolder *folder, - const char *uid, + const gchar *uid, guint32 flags, guint32 set, CamelFolder *drafts, - const char *drafts_uid) + const gchar *drafts_uid) { struct emcs_t *emcs; @@ -653,7 +653,7 @@ em_composer_utils_setup_callbacks (EMsgComposer *composer, /* Composing messages... */ static EMsgComposer * -create_new_composer (const char *subject, const char *fromuri, gboolean use_default_callbacks, gboolean lite) +create_new_composer (const gchar *subject, const gchar *fromuri, gboolean use_default_callbacks, gboolean lite) { EMsgComposer *composer; EComposerHeaderTable *table; @@ -691,7 +691,7 @@ create_new_composer (const char *subject, const char *fromuri, gboolean use_defa * window. **/ void -em_utils_compose_new_message (const char *fromuri) +em_utils_compose_new_message (const gchar *fromuri) { GtkWidget *composer; @@ -711,7 +711,7 @@ em_utils_compose_new_message (const char *fromuri) * window. **/ struct _EMsgComposer * -em_utils_compose_lite_new_message (const char *fromuri) +em_utils_compose_lite_new_message (const gchar *fromuri) { GtkWidget *composer; @@ -733,7 +733,7 @@ em_utils_compose_lite_new_message (const char *fromuri) * according to the values in the mailto url. **/ void -em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri) +em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri) { EMsgComposer *composer; EComposerHeaderTable *table; @@ -760,7 +760,7 @@ em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri) /* Editing messages... */ static void -edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) +edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid) { EMsgComposer *composer; @@ -775,11 +775,11 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) CamelMultipart *body = camel_multipart_new (); CamelStream *stream; CamelMimePart *part; - int count1 = 0, string_changed = 0; - const char *cur; - int i; + gint count1 = 0, string_changed = 0; + const gchar *cur; + gint i; - char *str; + gchar *str; gint count = 2; content = camel_medium_get_content_object ((CamelMedium *) message); @@ -806,17 +806,17 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) mem = camel_stream_mem_new (); camel_data_wrapper_decode_to_stream (content, mem); - str = g_strndup ((const gchar*)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); + str = g_strndup ((const gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); camel_object_unref (mem); cur = str; for (i = 0; i < strlen(str); i++) { if (!g_ascii_strncasecmp (cur, "$", 1)) { - const char *end = cur, *check_env; - char *out; + const gchar *end = cur, *check_env; + gchar *out; GConfClient *gconf; GSList *clue_list = NULL, *list; - char **temp_str; + gchar **temp_str; gconf = gconf_client_get_default (); @@ -834,7 +834,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid) g_object_unref (gconf); for (list = clue_list; list; list = g_slist_next (list)) { - char **temp = g_strsplit (list->data, "=", 2); + gchar **temp = g_strsplit (list->data, "=", 2); if (!g_ascii_strcasecmp(temp[0], out+1)) { str = g_strdup_printf("%s%s%s", temp_str[0], temp[1], temp_str[1]); cur = str + i; @@ -929,10 +929,10 @@ em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder) } static void -edit_messages (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *user_data) +edit_messages (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, gpointer user_data) { gboolean replace = GPOINTER_TO_INT (user_data); - int i; + gint i; if (msgs == NULL) return; @@ -969,7 +969,7 @@ struct forward_attached_data { CamelFolder *folder; GPtrArray *uids; - char *fromuri; + gchar *fromuri; }; static void @@ -1021,7 +1021,7 @@ setup_forward_attached_callbacks (EMsgComposer *composer, CamelFolder *folder, G } static void -forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, CamelMimePart *part, char *subject, const char *fromuri) +forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, CamelMimePart *part, gchar *subject, const gchar *fromuri) { EMsgComposer *composer; @@ -1041,7 +1041,7 @@ forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, Cam } static void -forward_attached_cb (CamelFolder *folder, GPtrArray *messages, CamelMimePart *part, char *subject, void *user_data) +forward_attached_cb (CamelFolder *folder, GPtrArray *messages, CamelMimePart *part, gchar *subject, gpointer user_data) { struct forward_attached_data *fad = (struct forward_attached_data *) user_data; @@ -1065,7 +1065,7 @@ forward_attached_cb (CamelFolder *folder, GPtrArray *messages, CamelMimePart *pa * forwarded as a simple message/rfc822 attachment. **/ void -em_utils_forward_attached (CamelFolder *folder, GPtrArray *uids, const char *fromuri) +em_utils_forward_attached (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri) { struct forward_attached_data *fad; @@ -1080,12 +1080,12 @@ em_utils_forward_attached (CamelFolder *folder, GPtrArray *uids, const char *fro } static void -forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, int style, const char *fromuri) +forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, gint style, const gchar *fromuri) { CamelMimeMessage *message; EMsgComposer *composer; - char *subject, *text; - int i; + gchar *subject, *text; + gint i; guint32 flags; if (messages->len == 0) @@ -1127,9 +1127,9 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, } static void -forward_inline (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *user_data) +forward_inline (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, gpointer user_data) { - forward_non_attached (folder, uids, messages, MAIL_CONFIG_FORWARD_INLINE, (char *)user_data); + forward_non_attached (folder, uids, messages, MAIL_CONFIG_FORWARD_INLINE, (gchar *)user_data); g_free(user_data); } @@ -1142,7 +1142,7 @@ forward_inline (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void * Forwards each message in the 'inline' form, each in its own composer window. **/ void -em_utils_forward_inline (CamelFolder *folder, GPtrArray *uids, const char *fromuri) +em_utils_forward_inline (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri) { g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uids != NULL); @@ -1151,9 +1151,9 @@ em_utils_forward_inline (CamelFolder *folder, GPtrArray *uids, const char *fromu } static void -forward_quoted (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *user_data) +forward_quoted (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, gpointer user_data) { - forward_non_attached (folder, uids, messages, MAIL_CONFIG_FORWARD_QUOTED, (char *)user_data); + forward_non_attached (folder, uids, messages, MAIL_CONFIG_FORWARD_QUOTED, (gchar *)user_data); g_free(user_data); } @@ -1167,7 +1167,7 @@ forward_quoted (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void * a "> "), each in its own composer window. **/ void -em_utils_forward_quoted (CamelFolder *folder, GPtrArray *uids, const char *fromuri) +em_utils_forward_quoted (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri) { g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uids != NULL); @@ -1184,13 +1184,13 @@ em_utils_forward_quoted (CamelFolder *folder, GPtrArray *uids, const char *fromu * Forwards a message in the user's configured default style. **/ void -em_utils_forward_message (CamelMimeMessage *message, const char *fromuri) +em_utils_forward_message (CamelMimeMessage *message, const gchar *fromuri) { GPtrArray *messages; CamelMimePart *part; GConfClient *gconf; - char *subject; - int mode; + gchar *subject; + gint mode; messages = g_ptr_array_new (); g_ptr_array_add (messages, message); @@ -1229,10 +1229,10 @@ em_utils_forward_message (CamelMimeMessage *message, const char *fromuri) * style. **/ void -em_utils_forward_messages (CamelFolder *folder, GPtrArray *uids, const char *fromuri) +em_utils_forward_messages (CamelFolder *folder, GPtrArray *uids, const gchar *fromuri) { GConfClient *gconf; - int mode; + gint mode; gconf = mail_config_get_gconf_client (); mode = gconf_client_get_int (gconf, "/apps/evolution/mail/format/forward_style", NULL); @@ -1296,7 +1296,7 @@ em_utils_redirect_message (CamelMimeMessage *message) } static void -redirect_msg (CamelFolder *folder, const char *uid, CamelMimeMessage *message, void *user_data) +redirect_msg (CamelFolder *folder, const gchar *uid, CamelMimeMessage *message, gpointer user_data) { if (message == NULL) return; @@ -1313,7 +1313,7 @@ redirect_msg (CamelFolder *folder, const char *uid, CamelMimeMessage *message, v * be editable). Adds Resent-From/Resent-To/etc headers. **/ void -em_utils_redirect_message_by_uid (CamelFolder *folder, const char *uid) +em_utils_redirect_message_by_uid (CamelFolder *folder, const gchar *uid) { g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uid != NULL); @@ -1322,7 +1322,7 @@ em_utils_redirect_message_by_uid (CamelFolder *folder, const char *uid) } static void -emu_handle_receipt_message(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *ex) +emu_handle_receipt_message(CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data, CamelException *ex) { if (msg) em_utils_handle_receipt(folder, uid, msg); @@ -1333,10 +1333,10 @@ emu_handle_receipt_message(CamelFolder *folder, const char *uid, CamelMimeMessag /* Message disposition notifications, rfc 2298 */ void -em_utils_handle_receipt (CamelFolder *folder, const char *uid, CamelMimeMessage *msg) +em_utils_handle_receipt (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg) { EAccount *account; - const char *addr; + const gchar *addr; CamelMessageInfo *info; info = camel_folder_get_message_info(folder, uid); @@ -1379,7 +1379,7 @@ em_utils_handle_receipt (CamelFolder *folder, const char *uid, CamelMimeMessage static void em_utils_receipt_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, - int queued, const char *appended_uid, void *data) + gint queued, const gchar *appended_uid, gpointer data) { camel_message_info_free (info); mail_send (); @@ -1400,14 +1400,14 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message) CamelStream *stream; CamelFolder *out_folder; CamelMessageInfo *info; - const char *message_id = camel_medium_get_header (CAMEL_MEDIUM (message), "Message-ID"); - const char *message_date = camel_medium_get_header (CAMEL_MEDIUM (message), "Date"); - const char *message_subject = camel_mime_message_get_subject (message); - const char *receipt_address = camel_medium_get_header (CAMEL_MEDIUM (message), "Disposition-Notification-To"); - char *fake_msgid; - char *hostname; - char *self_address, *receipt_subject; - char *ua, *recipient; + const gchar *message_id = camel_medium_get_header (CAMEL_MEDIUM (message), "Message-ID"); + const gchar *message_date = camel_medium_get_header (CAMEL_MEDIUM (message), "Date"); + const gchar *message_subject = camel_mime_message_get_subject (message); + const gchar *receipt_address = camel_medium_get_header (CAMEL_MEDIUM (message), "Disposition-Notification-To"); + gchar *fake_msgid; + gchar *hostname; + gchar *self_address, *receipt_subject; + gchar *ua, *recipient; if (!receipt_address) return; @@ -1521,7 +1521,7 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message) static void emu_forward_raw_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, - int queued, const char *appended_uid, void *data) + gint queued, const gchar *appended_uid, gpointer data) { camel_message_info_free (info); /* do not call mail send, just pile them all in the outbox */ @@ -1537,7 +1537,7 @@ emu_forward_raw_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageIn * Forwards message to the address, in very similar way as redirect does. **/ void -em_utils_forward_message_raw (CamelFolder *folder, CamelMimeMessage *message, const char *address, CamelException *ex) +em_utils_forward_message_raw (CamelFolder *folder, CamelMimeMessage *message, const gchar *address, CamelException *ex) { EAccount *account; CamelMimeMessage *forward; @@ -1546,7 +1546,7 @@ em_utils_forward_message_raw (CamelFolder *folder, CamelMimeMessage *message, co CamelFolder *out_folder; CamelMessageInfo *info; struct _camel_header_raw *xev; - char *subject; + gchar *subject; g_return_if_fail (folder != NULL); g_return_if_fail (message != NULL); @@ -1650,7 +1650,7 @@ generate_account_hash (void) } if (!acnt) - g_hash_table_insert (account_hash, (char *) account->id->address, (void *) account); + g_hash_table_insert (account_hash, (gchar *) account->id->address, (gpointer) account); } e_iterator_next (iter); @@ -1660,7 +1660,7 @@ generate_account_hash (void) /* The default account has to be there if none of the enabled accounts are present */ if (g_hash_table_size (account_hash) == 0 && def && def->id->address) - g_hash_table_insert (account_hash, (char *) def->id->address, (void *) def); + g_hash_table_insert (account_hash, (gchar *) def->id->address, (gpointer) def); return account_hash; } @@ -1669,7 +1669,7 @@ EDestination ** em_utils_camel_address_to_destination (CamelInternetAddress *iaddr) { EDestination *dest, **destv; - int n, i, j; + gint n, i, j; if (iaddr == NULL) return NULL; @@ -1679,7 +1679,7 @@ em_utils_camel_address_to_destination (CamelInternetAddress *iaddr) destv = g_malloc (sizeof (EDestination *) * (n + 1)); for (i = 0, j = 0; i < n; i++) { - const char *name, *addr; + const gchar *name, *addr; if (camel_internet_address_get (iaddr, i, &name, &addr)) { dest = e_destination_new (); @@ -1705,11 +1705,11 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account, CamelInternetAddress *to, CamelInternetAddress *cc, CamelFolder *folder, CamelNNTPAddress *postto) { - const char *message_id, *references; + const gchar *message_id, *references; EDestination **tov, **ccv; EMsgComposer *composer; EComposerHeaderTable *table; - char *subject; + gchar *subject; g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL); g_return_val_if_fail (to == NULL || CAMEL_IS_INTERNET_ADDRESS (to), NULL); @@ -1722,7 +1722,7 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account, ccv = em_utils_camel_address_to_destination (cc); /* Set the subject of the new message. */ - if ((subject = (char *) camel_mime_message_get_subject (message))) { + if ((subject = (gchar *) camel_mime_message_get_subject (message))) { if (g_ascii_strncasecmp (subject, "Re: ", 4) != 0) subject = g_strdup_printf ("Re: %s", subject); else @@ -1744,8 +1744,8 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account, /* add post-to, if nessecary */ if (postto && camel_address_length((CamelAddress *)postto)) { - char *store_url = NULL; - char *post; + gchar *store_url = NULL; + gchar *post; if (folder) { store_url = camel_url_to_string (CAMEL_SERVICE (folder->parent_store)->url, CAMEL_URL_HIDE_ALL); @@ -1764,7 +1764,7 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account, message_id = camel_medium_get_header (CAMEL_MEDIUM (message), "Message-Id"); references = camel_medium_get_header (CAMEL_MEDIUM (message), "References"); if (message_id) { - char *reply_refs; + gchar *reply_refs; e_msg_composer_add_header (composer, "In-Reply-To", message_id); @@ -1786,7 +1786,7 @@ static EAccount * guess_account_folder(CamelFolder *folder) { EAccount *account; - char *tmp; + gchar *tmp; tmp = camel_url_to_string(CAMEL_SERVICE(folder->parent_store)->url, CAMEL_URL_HIDE_ALL); account = mail_config_get_account_by_source_url(tmp); @@ -1800,8 +1800,8 @@ guess_account (CamelMimeMessage *message, CamelFolder *folder) { GHashTable *account_hash = NULL; EAccount *account = NULL; - const char *tmp; - int i, j; + const gchar *tmp; + gint i, j; const gchar *types[2] = { CAMEL_RECIPIENT_TYPE_TO, CAMEL_RECIPIENT_TYPE_CC @@ -1851,8 +1851,8 @@ static void get_reply_sender (CamelMimeMessage *message, CamelInternetAddress *to, CamelNNTPAddress *postto) { const CamelInternetAddress *reply_to; - const char *name, *addr, *posthdr; - int i; + const gchar *name, *addr, *posthdr; + gint i; /* check whether there is a 'Newsgroups: ' header in there */ if (postto @@ -1881,8 +1881,8 @@ em_utils_get_reply_sender (CamelMimeMessage *message, CamelInternetAddress *to, static gboolean get_reply_list (CamelMimeMessage *message, CamelInternetAddress *to) { - const char *header, *p; - char *addr; + const gchar *header, *p; + gchar *addr; /* Examples: * @@ -1921,13 +1921,13 @@ get_reply_list (CamelMimeMessage *message, CamelInternetAddress *to) static void concat_unique_addrs (CamelInternetAddress *dest, const CamelInternetAddress *src, GHashTable *rcpt_hash) { - const char *name, *addr; - int i; + const gchar *name, *addr; + gint i; for (i = 0; camel_internet_address_get (src, i, &name, &addr); i++) { if (!g_hash_table_lookup (rcpt_hash, addr)) { camel_internet_address_add (dest, name, addr); - g_hash_table_insert (rcpt_hash, (char *) addr, GINT_TO_POINTER (1)); + g_hash_table_insert (rcpt_hash, (gchar *) addr, GINT_TO_POINTER (1)); } } } @@ -1936,9 +1936,9 @@ static void get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, CamelInternetAddress *cc, CamelNNTPAddress *postto) { const CamelInternetAddress *reply_to, *to_addrs, *cc_addrs; - const char *name, *addr, *posthdr; + const gchar *name, *addr, *posthdr; GHashTable *rcpt_hash; - int i; + gint i; /* check whether there is a 'Newsgroups: ' header in there */ if (postto) { @@ -1966,7 +1966,7 @@ get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, CamelInterne is kinda silly. */ camel_internet_address_add (to, name, addr); - g_hash_table_insert (rcpt_hash, (char *) addr, GINT_TO_POINTER (1)); + g_hash_table_insert (rcpt_hash, (gchar *) addr, GINT_TO_POINTER (1)); } } } @@ -2015,13 +2015,13 @@ enum { ATTRIB_TM_YDAY }; -typedef void (* AttribFormatter) (GString *str, const char *attr, CamelMimeMessage *message); +typedef void (* AttribFormatter) (GString *str, const gchar *attr, CamelMimeMessage *message); static void -format_sender (GString *str, const char *attr, CamelMimeMessage *message) +format_sender (GString *str, const gchar *attr, CamelMimeMessage *message) { const CamelInternetAddress *sender; - const char *name, *addr; + const gchar *name, *addr; sender = camel_mime_message_get_from (message); if (sender != NULL && camel_address_length (CAMEL_ADDRESS (sender)) > 0) { @@ -2042,10 +2042,10 @@ format_sender (GString *str, const char *attr, CamelMimeMessage *message) } static struct { - const char *name; - int type; + const gchar *name; + gint type; struct { - const char *format; /* strftime or printf format */ + const gchar *format; /* strftime or printf format */ AttribFormatter formatter; /* custom formatter */ } v; } attribvars[] = { @@ -2076,17 +2076,17 @@ static struct { * variables, see em-composer-utils.c:1514 */ #define ATTRIBUTION _("On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:") -static char * -attribution_format (const char *format, CamelMimeMessage *message) +static gchar * +attribution_format (const gchar *format, CamelMimeMessage *message) { - register const char *inptr; - const char *start; - int tzone, len, i; - char buf[64], *s; + register const gchar *inptr; + const gchar *start; + gint tzone, len, i; + gchar buf[64], *s; GString *str; struct tm tm; time_t date; - int type; + gint type; str = g_string_new (""); @@ -2197,7 +2197,7 @@ attribution_format (const char *format, CamelMimeMessage *message) static void composer_set_body (EMsgComposer *composer, CamelMimeMessage *message, EMFormat *source) { - char *text, *credits; + gchar *text, *credits; CamelMimePart *part; GConfClient *gconf; ssize_t len = 0; @@ -2252,13 +2252,13 @@ composer_set_body (EMsgComposer *composer, CamelMimeMessage *message, EMFormat * struct _reply_data { EMFormat *source; - int mode; + gint mode; }; -char * +gchar * em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source) { - char *text, *credits; + gchar *text, *credits; ssize_t len = 0; gboolean start_bottom = 0; @@ -2271,7 +2271,7 @@ em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source) static void -reply_to_message(CamelFolder *folder, const char *uid, CamelMimeMessage *message, void *user_data) +reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessage *message, gpointer user_data) { struct _reply_data *rd = user_data; @@ -2301,7 +2301,7 @@ reply_to_message(CamelFolder *folder, const char *uid, CamelMimeMessage *message * been replied to. **/ struct _EMsgComposer * -em_utils_reply_to_message(CamelFolder *folder, const char *uid, CamelMimeMessage *message, int mode, EMFormat *source) +em_utils_reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessage *message, gint mode, EMFormat *source) { CamelInternetAddress *to, *cc; CamelNNTPAddress *postto = NULL; diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index 60944cb840..2f78f2769f 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -41,36 +41,36 @@ struct _EMFormat; struct _EAccount; struct _EDestination; -void em_composer_utils_setup_callbacks (struct _EMsgComposer *composer, struct _CamelFolder *folder, const char *uid, - guint32 flags, guint32 set, struct _CamelFolder *drafts, const char *drafts_uid); +void em_composer_utils_setup_callbacks (struct _EMsgComposer *composer, struct _CamelFolder *folder, const gchar *uid, + guint32 flags, guint32 set, struct _CamelFolder *drafts, const gchar *drafts_uid); #define em_composer_utils_setup_default_callbacks(composer) em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, NULL, NULL) void em_utils_composer_send_cb(struct _EMsgComposer *composer, gpointer user_data); void em_utils_composer_save_draft_cb(struct _EMsgComposer *composer, gpointer user_data); -void em_utils_compose_new_message (const char *fromuri); -struct _EMsgComposer * em_utils_compose_lite_new_message (const char *fromuri); +void em_utils_compose_new_message (const gchar *fromuri); +struct _EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ -void em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri); +void em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); void em_utils_edit_message (struct _CamelMimeMessage *message, struct _CamelFolder *folder); void em_utils_edit_messages (struct _CamelFolder *folder, GPtrArray *uids, gboolean replace); -void em_utils_forward_attached (struct _CamelFolder *folder, GPtrArray *uids, const char *fromuri); -void em_utils_forward_inline (struct _CamelFolder *folder, GPtrArray *uids, const char *fromuri); -void em_utils_forward_quoted (struct _CamelFolder *folder, GPtrArray *uids, const char *fromuri); +void em_utils_forward_attached (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); +void em_utils_forward_inline (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); +void em_utils_forward_quoted (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); -void em_utils_forward_message (struct _CamelMimeMessage *msg, const char *fromuri); -void em_utils_forward_messages (struct _CamelFolder *folder, GPtrArray *uids, const char *fromuri); +void em_utils_forward_message (struct _CamelMimeMessage *msg, const gchar *fromuri); +void em_utils_forward_messages (struct _CamelFolder *folder, GPtrArray *uids, const gchar *fromuri); void em_utils_redirect_message (struct _CamelMimeMessage *message); -void em_utils_redirect_message_by_uid (struct _CamelFolder *folder, const char *uid); +void em_utils_redirect_message_by_uid (struct _CamelFolder *folder, const gchar *uid); -void em_utils_forward_message_raw (struct _CamelFolder *folder, struct _CamelMimeMessage *message, const char *address, struct _CamelException *ex); +void em_utils_forward_message_raw (struct _CamelFolder *folder, struct _CamelMimeMessage *message, const gchar *address, struct _CamelException *ex); -void em_utils_handle_receipt (struct _CamelFolder *folder, const char *uid, struct _CamelMimeMessage *msg); +void em_utils_handle_receipt (struct _CamelFolder *folder, const gchar *uid, struct _CamelMimeMessage *msg); void em_utils_send_receipt (struct _CamelFolder *folder, struct _CamelMimeMessage *message); enum { @@ -79,10 +79,10 @@ enum { REPLY_MODE_LIST }; -char *em_utils_construct_composer_text (struct _CamelMimeMessage *message, struct _EMFormat *source); +gchar *em_utils_construct_composer_text (struct _CamelMimeMessage *message, struct _EMFormat *source); void em_utils_get_reply_sender (struct _CamelMimeMessage *message, struct _CamelInternetAddress *to, struct _CamelNNTPAddress *postto); void em_utils_get_reply_all (struct _CamelMimeMessage *message, struct _CamelInternetAddress *to, struct _CamelInternetAddress *cc, struct _CamelNNTPAddress *postto); -struct _EMsgComposer * em_utils_reply_to_message (struct _CamelFolder *, const char *uid, struct _CamelMimeMessage *message, int mode, struct _EMFormat *source); +struct _EMsgComposer * em_utils_reply_to_message (struct _CamelFolder *, const gchar *uid, struct _CamelMimeMessage *message, gint mode, struct _EMFormat *source); struct _EDestination ** em_utils_camel_address_to_destination (struct _CamelInternetAddress *iaddr); #ifdef __cplusplus diff --git a/mail/em-config.c b/mail/em-config.c index 160cec851e..985a02d56c 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -124,7 +124,7 @@ emp_target_free(EConfig *ep, EConfigTarget *t) } static void -emp_account_changed(struct _EAccount *ea, int id, EMConfig *emc) +emp_account_changed(struct _EAccount *ea, gint id, EMConfig *emc) { e_config_target_changed((EConfig *)emc, E_CONFIG_TARGET_CHANGED_STATE); } @@ -180,7 +180,7 @@ em_config_get_type(void) return type; } -EMConfig *em_config_new(int type, const char *menuid) +EMConfig *em_config_new(gint type, const gchar *menuid) { EMConfig *emp = g_object_new(em_config_get_type(), NULL); @@ -190,7 +190,7 @@ EMConfig *em_config_new(int type, const char *menuid) } EMConfigTargetFolder * -em_config_target_new_folder(EMConfig *emp, struct _CamelFolder *folder, const char *uri) +em_config_target_new_folder(EMConfig *emp, struct _CamelFolder *folder, const gchar *uri) { EMConfigTargetFolder *t = e_config_target_new(&emp->config, EM_CONFIG_TARGET_FOLDER, sizeof(*t)); @@ -253,7 +253,7 @@ em_config_target_new_account(EMConfig *emp, struct _EAccount *account) */ -static void *emph_parent_class; +static gpointer emph_parent_class; #define emph ((EMConfigHook *)eph) static const EConfigHookTargetMask emph_no_masks[] = { @@ -278,7 +278,7 @@ emph_finalise(GObject *o) static void emph_class_init(EPluginHookClass *klass) { - int i; + gint i; ((GObjectClass *)klass)->finalize = emph_finalise; ((EPluginHookClass *)klass)->id = "org.gnome.evolution.mail.config:1.0"; diff --git a/mail/em-config.h b/mail/em-config.h index 5f895305b0..4ebfa05ad1 100644 --- a/mail/em-config.h +++ b/mail/em-config.h @@ -53,7 +53,7 @@ struct _EMConfigTargetFolder { EConfigTarget target; struct _CamelFolder *folder; - char *uri; + gchar *uri; }; struct _EMConfigTargetPrefs { @@ -86,9 +86,9 @@ struct _EMConfigClass { GType em_config_get_type(void); -EMConfig *em_config_new(int type, const char *menuid); +EMConfig *em_config_new(gint type, const gchar *menuid); -EMConfigTargetFolder *em_config_target_new_folder(EMConfig *emp, struct _CamelFolder *folder, const char *uri); +EMConfigTargetFolder *em_config_target_new_folder(EMConfig *emp, struct _CamelFolder *folder, const gchar *uri); EMConfigTargetPrefs *em_config_target_new_prefs(EMConfig *emp, struct _GConfClient *gconf); EMConfigTargetAccount *em_config_target_new_account(EMConfig *emp, struct _EAccount *account); diff --git a/mail/em-event.c b/mail/em-event.c index b415d5f8a0..852e319e1b 100644 --- a/mail/em-event.c +++ b/mail/em-event.c @@ -135,7 +135,7 @@ EMEvent *em_event_peek(void) } EMEventTargetFolder * -em_event_target_new_folder (EMEvent *eme, const char *uri, unsigned int new) +em_event_target_new_folder (EMEvent *eme, const gchar *uri, guint new) { EMEventTargetFolder *t = e_event_target_new(&eme->popup, EM_EVENT_TARGET_FOLDER, sizeof(*t)); guint32 flags = new ? EM_EVENT_FOLDER_NEWMAIL : 0; @@ -169,7 +169,7 @@ em_event_target_new_composer (EMEvent *eme, const EMsgComposer *composer, guint3 } EMEventTargetMessage * -em_event_target_new_message(EMEvent *eme, CamelFolder *folder, CamelMimeMessage *message, const char *uid, guint32 flags) +em_event_target_new_message(EMEvent *eme, CamelFolder *folder, CamelMimeMessage *message, const gchar *uid, guint32 flags) { EMEventTargetMessage *t = e_event_target_new(&eme->popup, EM_EVENT_TARGET_MESSAGE, sizeof(*t)); @@ -186,7 +186,7 @@ em_event_target_new_message(EMEvent *eme, CamelFolder *folder, CamelMimeMessage } EMEventTargetSendReceive * -em_event_target_new_send_receive(EMEvent *eme, GtkWidget *table, gpointer data, int row, guint32 flags) +em_event_target_new_send_receive(EMEvent *eme, GtkWidget *table, gpointer data, gint row, guint32 flags) { EMEventTargetSendReceive *t = e_event_target_new(&eme->popup, EM_EVENT_TARGET_SEND_RECEIVE, sizeof(*t)); @@ -199,7 +199,7 @@ em_event_target_new_send_receive(EMEvent *eme, GtkWidget *table, gpointer data, } EMEventTargetCustomIcon * -em_event_target_new_custom_icon(EMEvent *eme, GtkCellRenderer *renderer, const char *folder_name, guint32 flags) +em_event_target_new_custom_icon(EMEvent *eme, GtkCellRenderer *renderer, const gchar *folder_name, guint32 flags) { EMEventTargetCustomIcon *t = e_event_target_new(&eme->popup, EM_EVENT_TARGET_CUSTOM_ICON, sizeof(*t)); @@ -212,7 +212,7 @@ em_event_target_new_custom_icon(EMEvent *eme, GtkCellRenderer *renderer, const c /* ********************************************************************** */ -static void *emeh_parent_class; +static gpointer emeh_parent_class; #define emeh ((EMEventHook *)eph) static const EEventHookTargetMask emeh_folder_masks[] = { @@ -266,7 +266,7 @@ emeh_finalise(GObject *o) static void emeh_class_init(EPluginHookClass *klass) { - int i; + gint i; ((GObjectClass *)klass)->finalize = emeh_finalise; ((EPluginHookClass *)klass)->id = "org.gnome.evolution.mail.events:1.0"; diff --git a/mail/em-event.h b/mail/em-event.h index 7c2c4c639d..81173fe690 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -86,10 +86,10 @@ typedef struct _EMEventTargetFolder EMEventTargetFolder; struct _EMEventTargetFolder { EEventTarget target; - char *uri; + gchar *uri; guint new; gboolean is_inbox; - char *name; + gchar *name; }; typedef struct _EMEventTargetMessage EMEventTargetMessage; @@ -97,7 +97,7 @@ typedef struct _EMEventTargetMessage EMEventTargetMessage; struct _EMEventTargetMessage { EEventTarget target; struct _CamelFolder *folder; - char *uid; + gchar *uid; struct _CamelMimeMessage *message; }; @@ -125,7 +125,7 @@ struct _EMEventTargetSendReceive { struct _GtkWidget *table; gpointer data; - int row; + gint row; }; typedef struct _EMEventTargetCustomIcon EMEventTargetCustomIcon; @@ -134,7 +134,7 @@ struct _EMEventTargetCustomIcon { EEventTarget target; GtkCellRenderer *renderer; - const char *folder_name; + const gchar *folder_name; }; typedef struct _EEventItem EMEventItem; @@ -154,12 +154,12 @@ GType em_event_get_type(void); EMEvent *em_event_peek(void); -EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const char *uri, guint32 flags); +EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const gchar *uri, guint32 flags); EMEventTargetFolderBrowser *em_event_target_new_folder_browser (EMEvent *eme, EMFolderBrowser *emfb); EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const struct _EMsgComposer *composer, guint32 flags); -EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, struct _CamelFolder *folder, struct _CamelMimeMessage *message, const char *uid, guint32 flags); -EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, struct _GtkWidget *table, gpointer data, int row, guint32 flags); -EMEventTargetCustomIcon * em_event_target_new_custom_icon(EMEvent *eme, GtkCellRenderer *renderer, const char *uri, guint32 flags); +EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, struct _CamelFolder *folder, struct _CamelMimeMessage *message, const gchar *uid, guint32 flags); +EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, struct _GtkWidget *table, gpointer data, gint row, guint32 flags); +EMEventTargetCustomIcon * em_event_target_new_custom_icon(EMEvent *eme, GtkCellRenderer *renderer, const gchar *uri, guint32 flags); /* ********************************************************************** */ diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c index a2a699a36f..5a82c6ea9d 100644 --- a/mail/em-filter-context.c +++ b/mail/em-filter-context.c @@ -42,9 +42,9 @@ static void em_filter_context_class_init(EMFilterContextClass *klass); static void em_filter_context_init(EMFilterContext *fc); static void em_filter_context_finalise(GObject *obj); -static GList *filter_rename_uri(RuleContext *rc, const char *olduri, const char *newuri, GCompareFunc cmp); -static GList *filter_delete_uri(RuleContext *rc, const char *uri, GCompareFunc cmp); -static FilterElement *filter_new_element(RuleContext *rc, const char *name); +static GList *filter_rename_uri(RuleContext *rc, const gchar *olduri, const gchar *newuri, GCompareFunc cmp); +static GList *filter_delete_uri(RuleContext *rc, const gchar *uri, GCompareFunc cmp); +static FilterElement *filter_new_element(RuleContext *rc, const gchar *name); static RuleContextClass *parent_class = NULL; @@ -133,14 +133,14 @@ em_filter_context_add_action(EMFilterContext *fc, FilterPart *action) } FilterPart * -em_filter_context_find_action(EMFilterContext *fc, const char *name) +em_filter_context_find_action(EMFilterContext *fc, const gchar *name) { d(printf("find action : ")); return filter_part_find_list(fc->actions, name); } FilterPart * -em_filter_context_create_action(EMFilterContext *fc, const char *name) +em_filter_context_create_action(EMFilterContext *fc, const gchar *name) { FilterPart *part; @@ -158,13 +158,13 @@ em_filter_context_next_action(EMFilterContext *fc, FilterPart *last) /* We search for any folders in our actions list that need updating, update them */ static GList * -filter_rename_uri(RuleContext *rc, const char *olduri, const char *newuri, GCompareFunc cmp) +filter_rename_uri(RuleContext *rc, const gchar *olduri, const gchar *newuri, GCompareFunc cmp) { FilterRule *rule; GList *l, *el; FilterPart *action; FilterElement *element; - int count = 0; + gint count = 0; GList *changed = NULL; d(printf("uri '%s' renamed to '%s'\n", olduri, newuri)); @@ -173,7 +173,7 @@ filter_rename_uri(RuleContext *rc, const char *olduri, const char *newuri, GComp /* Yes we could do this inside each part itself, but not today */ rule = NULL; while ((rule = rule_context_next_rule(rc, rule, NULL))) { - int rulecount = 0; + gint rulecount = 0; d(printf("checking rule '%s'\n", rule->name)); @@ -218,7 +218,7 @@ filter_rename_uri(RuleContext *rc, const char *olduri, const char *newuri, GComp } static GList * -filter_delete_uri(RuleContext *rc, const char *uri, GCompareFunc cmp) +filter_delete_uri(RuleContext *rc, const gchar *uri, GCompareFunc cmp) { /* We basically do similar to above, but when we find it, Remove the action, and if thats the last action, this might create an empty rule? remove the rule? */ @@ -227,7 +227,7 @@ filter_delete_uri(RuleContext *rc, const char *uri, GCompareFunc cmp) GList *l, *el; FilterPart *action; FilterElement *element; - int count = 0; + gint count = 0; GList *deleted = NULL; d(printf("uri '%s' deleted\n", uri)); @@ -236,7 +236,7 @@ filter_delete_uri(RuleContext *rc, const char *uri, GCompareFunc cmp) /* Yes we could do this inside each part itself, but not today */ rule = NULL; while ((rule = rule_context_next_rule(rc, rule, NULL))) { - int recorded = 0; + gint recorded = 0; d(printf("checking rule '%s'\n", rule->name)); @@ -282,7 +282,7 @@ filter_delete_uri(RuleContext *rc, const char *uri, GCompareFunc cmp) } static FilterElement * -filter_new_element(RuleContext *rc, const char *type) +filter_new_element(RuleContext *rc, const gchar *type) { if (!strcmp(type, "folder")) { return (FilterElement *) em_filter_folder_element_new(); diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h index 56f11a3d81..31431b4a34 100644 --- a/mail/em-filter-context.h +++ b/mail/em-filter-context.h @@ -52,8 +52,8 @@ EMFilterContext *em_filter_context_new (void); /* methods */ void em_filter_context_add_action (EMFilterContext *fc, FilterPart *action); -FilterPart *em_filter_context_find_action (EMFilterContext *fc, const char *name); -FilterPart *em_filter_context_create_action (EMFilterContext *fc, const char *name); +FilterPart *em_filter_context_find_action (EMFilterContext *fc, const gchar *name); +FilterPart *em_filter_context_create_action (EMFilterContext *fc, const gchar *name); FilterPart *em_filter_context_next_action (EMFilterContext *fc, FilterPart *last); #endif /* ! _EM_FILTER_CONTEXT_H */ diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c index 4f68cf47df..378192a8da 100644 --- a/mail/em-filter-editor.c +++ b/mail/em-filter-editor.c @@ -107,7 +107,7 @@ em_filter_editor_new (EMFilterContext *fc, const EMFilterSource *source_names) { EMFilterEditor *fe = (EMFilterEditor *) g_object_new (em_filter_editor_get_type(), NULL); GladeXML *gui; - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "filter.glade", @@ -133,8 +133,8 @@ free_sources (gpointer data) static void select_source (GtkComboBox *combobox, EMFilterEditor *fe) { - char *source; - int idx; + gchar *source; + gint idx; GSList *sources; g_return_if_fail (GTK_IS_COMBO_BOX (combobox)); @@ -144,7 +144,7 @@ select_source (GtkComboBox *combobox, EMFilterEditor *fe) g_return_if_fail (idx >= 0 && idx < g_slist_length (sources)); - source = (char *)g_slist_nth (sources, idx); + source = (gchar *)g_slist_nth (sources, idx); g_return_if_fail (source); rule_editor_set_source ((RuleEditor *)fe, source); @@ -154,7 +154,7 @@ void em_filter_editor_construct (EMFilterEditor *fe, EMFilterContext *fc, GladeXML *gui, const EMFilterSource *source_names) { GtkWidget *combobox; - int i; + gint i; GtkTreeViewColumn *column; GSList *sources = NULL; diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c index b975b81089..553fba0895 100644 --- a/mail/em-filter-folder-element.c +++ b/mail/em-filter-folder-element.c @@ -41,10 +41,10 @@ #define d(x) static gboolean validate(FilterElement *fe); -static int folder_eq(FilterElement *fe, FilterElement *cm); +static gint folder_eq(FilterElement *fe, FilterElement *cm); static void xml_create(FilterElement *fe, xmlNodePtr node); static xmlNodePtr xml_encode(FilterElement *fe); -static int xml_decode(FilterElement *fe, xmlNodePtr node); +static gint xml_decode(FilterElement *fe, xmlNodePtr node); static GtkWidget *get_widget(FilterElement *fe); static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff); static void format_sexp(FilterElement *, GString *); @@ -132,7 +132,7 @@ em_filter_folder_element_new(void) } void -em_filter_folder_element_set_value(EMFilterFolderElement *ff, const char *uri) +em_filter_folder_element_set_value(EMFilterFolderElement *ff, const gchar *uri) { g_free(ff->uri); ff->uri = g_strdup(uri); @@ -178,15 +178,15 @@ xml_encode(FilterElement *fe) d(printf("Encoding folder as xml\n")); - value = xmlNewNode(NULL, (unsigned const char *)"value"); - xmlSetProp(value, (unsigned const char *)"name", (unsigned char *)fe->name); + value = xmlNewNode(NULL, (const guchar *)"value"); + xmlSetProp(value, (const guchar *)"name", (guchar *)fe->name); if (ff->store_camel_uri) - xmlSetProp(value, (unsigned const char *)"type", (unsigned const char *)"folder-curi"); + xmlSetProp(value, (const guchar *)"type", (const guchar *)"folder-curi"); else - xmlSetProp(value, (unsigned const char *)"type", (unsigned const char *)"folder"); + xmlSetProp(value, (const guchar *)"type", (const guchar *)"folder"); - work = xmlNewChild(value, NULL, (unsigned const char *)"folder", NULL); - xmlSetProp(work, (unsigned const char *)"uri", (unsigned const char *)ff->uri); + work = xmlNewChild(value, NULL, (const guchar *)"folder", NULL); + xmlSetProp(work, (const guchar *)"uri", (const guchar *)ff->uri); return value; } @@ -201,11 +201,11 @@ xml_decode(FilterElement *fe, xmlNodePtr node) d(printf("Decoding folder from xml %p\n", fe)); xmlFree(fe->name); - fe->name = (char *)xmlGetProp(node, (unsigned const char *)"name"); + fe->name = (gchar *)xmlGetProp(node, (const guchar *)"name"); - type = xmlGetProp (node, (unsigned const char *)"type"); + type = xmlGetProp (node, (const guchar *)"type"); if (type) { - ff->store_camel_uri = g_str_equal ((const char *)type, "folder-curi"); + ff->store_camel_uri = g_str_equal ((const gchar *)type, "folder-curi"); xmlFree (type); } else { ff->store_camel_uri = FALSE; @@ -213,10 +213,10 @@ xml_decode(FilterElement *fe, xmlNodePtr node) n = node->children; while(n) { - if (!strcmp((char *)n->name, "folder")) { - char *uri; + if (!strcmp((gchar *)n->name, "folder")) { + gchar *uri; - uri = (char *)xmlGetProp(n, (unsigned const char *)"uri"); + uri = (gchar *)xmlGetProp(n, (const guchar *)"uri"); g_free(ff->uri); ff->uri = g_strdup(uri); xmlFree(uri); @@ -231,7 +231,7 @@ xml_decode(FilterElement *fe, xmlNodePtr node) static void folder_selected(EMFolderSelectionButton *button, EMFilterFolderElement *ff) { - const char *uri; + const gchar *uri; uri = em_folder_selection_button_get_selection(button); g_free(ff->uri); @@ -249,7 +249,7 @@ get_widget(FilterElement *fe) { EMFilterFolderElement *ff = (EMFilterFolderElement *)fe; GtkWidget *button; - char *uri; + gchar *uri; if (ff->store_camel_uri) uri = ff->uri; diff --git a/mail/em-filter-folder-element.h b/mail/em-filter-folder-element.h index 0d7d3b50b2..149d0226e7 100644 --- a/mail/em-filter-folder-element.h +++ b/mail/em-filter-folder-element.h @@ -39,7 +39,7 @@ typedef struct _EMFilterFolderElementClass EMFilterFolderElementClass; struct _EMFilterFolderElement { FilterElement parent_object; - char *uri; + gchar *uri; gboolean store_camel_uri; /* true if uri should contain camel uri, otherwise contains evolution's uri with an Account ID */ }; @@ -51,6 +51,6 @@ GType em_filter_folder_element_get_type (void); EMFilterFolderElement *em_filter_folder_element_new (void); /* methods */ -void em_filter_folder_element_set_value (EMFilterFolderElement *ff, const char *uri); +void em_filter_folder_element_set_value (EMFilterFolderElement *ff, const gchar *uri); #endif /* ! _EM_FILTER_FOLDER_ELEMENT_H */ diff --git a/mail/em-filter-i18n.h b/mail/em-filter-i18n.h index c0b2925cc2..ba16ee3ebf 100644 --- a/mail/em-filter-i18n.h +++ b/mail/em-filter-i18n.h @@ -1,75 +1,75 @@ /* Automatically generated. Do not edit. */ -char *s = N_("Adjust Score"); -char *s = N_("Assign Color"); -char *s = N_("Assign Score"); -char *s = N_("Attachments"); -char *s = N_("BCC"); -char *s = N_("Beep"); -char *s = N_("CC"); -char *s = N_("Completed On"); -char *s = N_("contains"); -char *s = N_("Copy to Folder"); -char *s = N_("Date received"); -char *s = N_("Date sent"); -char *s = N_("Delete"); -char *s = N_("Deleted"); -char *s = N_("does not contain"); -char *s = N_("does not end with"); -char *s = N_("does not exist"); -char *s = N_("does not return"); -char *s = N_("does not sound like"); -char *s = N_("does not start with"); -char *s = N_("Do Not Exist"); -char *s = N_("Draft"); -char *s = N_("ends with"); -char *s = N_("Exist"); -char *s = N_("exists"); -char *s = N_("Expression"); -char *s = N_("Follow Up"); -char *s = N_("Forward to"); -char *s = N_("Important"); -char *s = N_("is"); -char *s = N_("is after"); -char *s = N_("is before"); -char *s = N_("is Flagged"); -char *s = N_("is greater than"); -char *s = N_("is less than"); -char *s = N_("is not"); -char *s = N_("is not Flagged"); -char *s = N_("is not set"); -char *s = N_("is set"); -char *s = N_("Junk"); -char *s = N_("Junk Test"); -char *s = N_("Label"); -char *s = N_("Mailing list"); -char *s = N_("Match All"); -char *s = N_("Message Body"); -char *s = N_("Message Header"); -char *s = N_("Message is Junk"); -char *s = N_("Message is not Junk"); -char *s = N_("Message Location"); -char *s = N_("Move to Folder"); -char *s = N_("Pipe to Program"); -char *s = N_("Play Sound"); -char *s = N_("Read"); -char *s = N_("Recipients"); -char *s = N_("Regex Match"); -char *s = N_("Replied to"); -char *s = N_("returns"); -char *s = N_("returns greater than"); -char *s = N_("returns less than"); -char *s = N_("Run Program"); -char *s = N_("Score"); -char *s = N_("Sender"); -char *s = N_("Sender or Recipients"); -char *s = N_("Set Label"); -char *s = N_("Set Status"); -char *s = N_("Size (kB)"); -char *s = N_("sounds like"); -char *s = N_("Source Account"); -char *s = N_("Specific header"); -char *s = N_("starts with"); -char *s = N_("Status"); -char *s = N_("Stop Processing"); -char *s = N_("Subject"); -char *s = N_("Unset Status"); +gchar *s = N_("Adjust Score"); +gchar *s = N_("Assign Color"); +gchar *s = N_("Assign Score"); +gchar *s = N_("Attachments"); +gchar *s = N_("BCC"); +gchar *s = N_("Beep"); +gchar *s = N_("CC"); +gchar *s = N_("Completed On"); +gchar *s = N_("contains"); +gchar *s = N_("Copy to Folder"); +gchar *s = N_("Date received"); +gchar *s = N_("Date sent"); +gchar *s = N_("Delete"); +gchar *s = N_("Deleted"); +gchar *s = N_("does not contain"); +gchar *s = N_("does not end with"); +gchar *s = N_("does not exist"); +gchar *s = N_("does not return"); +gchar *s = N_("does not sound like"); +gchar *s = N_("does not start with"); +gchar *s = N_("Do Not Exist"); +gchar *s = N_("Draft"); +gchar *s = N_("ends with"); +gchar *s = N_("Exist"); +gchar *s = N_("exists"); +gchar *s = N_("Expression"); +gchar *s = N_("Follow Up"); +gchar *s = N_("Forward to"); +gchar *s = N_("Important"); +gchar *s = N_("is"); +gchar *s = N_("is after"); +gchar *s = N_("is before"); +gchar *s = N_("is Flagged"); +gchar *s = N_("is greater than"); +gchar *s = N_("is less than"); +gchar *s = N_("is not"); +gchar *s = N_("is not Flagged"); +gchar *s = N_("is not set"); +gchar *s = N_("is set"); +gchar *s = N_("Junk"); +gchar *s = N_("Junk Test"); +gchar *s = N_("Label"); +gchar *s = N_("Mailing list"); +gchar *s = N_("Match All"); +gchar *s = N_("Message Body"); +gchar *s = N_("Message Header"); +gchar *s = N_("Message is Junk"); +gchar *s = N_("Message is not Junk"); +gchar *s = N_("Message Location"); +gchar *s = N_("Move to Folder"); +gchar *s = N_("Pipe to Program"); +gchar *s = N_("Play Sound"); +gchar *s = N_("Read"); +gchar *s = N_("Recipients"); +gchar *s = N_("Regex Match"); +gchar *s = N_("Replied to"); +gchar *s = N_("returns"); +gchar *s = N_("returns greater than"); +gchar *s = N_("returns less than"); +gchar *s = N_("Run Program"); +gchar *s = N_("Score"); +gchar *s = N_("Sender"); +gchar *s = N_("Sender or Recipients"); +gchar *s = N_("Set Label"); +gchar *s = N_("Set Status"); +gchar *s = N_("Size (kB)"); +gchar *s = N_("sounds like"); +gchar *s = N_("Source Account"); +gchar *s = N_("Specific header"); +gchar *s = N_("starts with"); +gchar *s = N_("Status"); +gchar *s = N_("Stop Processing"); +gchar *s = N_("Subject"); +gchar *s = N_("Unset Status"); diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index 583f82977c..03d0028b6e 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -35,10 +35,10 @@ #define d(x) -static int validate(FilterRule *fr); -static int filter_eq(FilterRule *fr, FilterRule *cm); +static gint validate(FilterRule *fr); +static gint filter_eq(FilterRule *fr, FilterRule *cm); static xmlNodePtr xml_encode(FilterRule *fr); -static int xml_decode(FilterRule *fr, xmlNodePtr, RuleContext *rc); +static gint xml_decode(FilterRule *fr, xmlNodePtr, RuleContext *rc); static void rule_copy(FilterRule *dest, FilterRule *src); /*static void build_code(FilterRule *, GString *out);*/ static GtkWidget *get_widget(FilterRule *fr, RuleContext *rc); @@ -176,7 +176,7 @@ validate(FilterRule *fr) { EMFilterRule *ff =(EMFilterRule *)fr; GList *parts; - int valid; + gint valid; valid = FILTER_RULE_CLASS(parent_class)->validate(fr); @@ -193,7 +193,7 @@ validate(FilterRule *fr) static int list_eq(GList *al, GList *bl) { - int truth = TRUE; + gint truth = TRUE; while (truth && al && bl) { FilterPart *a = al->data, *b = bl->data; @@ -222,7 +222,7 @@ xml_encode(FilterRule *fr) node = FILTER_RULE_CLASS(parent_class)->xml_encode(fr); g_return_val_if_fail (node != NULL, NULL); - set = xmlNewNode(NULL, (const unsigned char *)"actionset"); + set = xmlNewNode(NULL, (const guchar *)"actionset"); xmlAddChild(node, set); l = ff->actions; while (l) { @@ -239,13 +239,13 @@ static void load_set(xmlNodePtr node, EMFilterRule *ff, RuleContext *rc) { xmlNodePtr work; - char *rulename; + gchar *rulename; FilterPart *part; work = node->children; while (work) { - if (!strcmp((char *)work->name, "part")) { - rulename = (char *)xmlGetProp(work, (const unsigned char *)"name"); + if (!strcmp((gchar *)work->name, "part")) { + rulename = (gchar *)xmlGetProp(work, (const guchar *)"name"); part = em_filter_context_find_action((EMFilterContext *)rc, rulename); if (part) { part = filter_part_clone(part); @@ -267,7 +267,7 @@ xml_decode(FilterRule *fr, xmlNodePtr node, RuleContext *rc) { EMFilterRule *ff =(EMFilterRule *)fr; xmlNodePtr work; - int result; + gint result; result = FILTER_RULE_CLASS(parent_class)->xml_decode(fr, node, rc); if (result != 0) @@ -275,7 +275,7 @@ xml_decode(FilterRule *fr, xmlNodePtr node, RuleContext *rc) work = node->children; while (work) { - if (!strcmp((char *)work->name, "actionset")) { + if (!strcmp((gchar *)work->name, "actionset")) { load_set(work, ff, rc); } work = work->next; @@ -328,7 +328,7 @@ part_combobox_changed (GtkComboBox *combobox, struct _part_data *data) { FilterPart *part = NULL; FilterPart *newpart; - int index, i; + gint index, i; index = gtk_combo_box_get_active (combobox); for (i = 0, part = em_filter_context_next_action (data->f, part); part && i < index; i++, part = em_filter_context_next_action (data->f, part)) { @@ -364,7 +364,7 @@ get_rule_part_widget(EMFilterContext *f, FilterPart *newpart, FilterRule *fr) GtkWidget *combobox; GtkWidget *hbox; GtkWidget *p; - int index = 0, current = 0; + gint index = 0, current = 0; struct _part_data *data; data = g_malloc0(sizeof(*data)); @@ -431,7 +431,7 @@ less_parts(GtkWidget *button, struct _rule_data *data) } static void -attach_rule(GtkWidget *rule, struct _rule_data *data, FilterPart *part, int row) +attach_rule(GtkWidget *rule, struct _rule_data *data, FilterPart *part, gint row) { GtkWidget *remove; @@ -512,7 +512,7 @@ get_widget(FilterRule *fr, RuleContext *rc) FilterPart *part; struct _rule_data *data; EMFilterRule *ff =(EMFilterRule *)fr; - int rows, i = 0; + gint rows, i = 0; gchar *msg; widget = FILTER_RULE_CLASS(parent_class)->get_widget(fr, rc); diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index 23a1b762cd..126cbe2a50 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -39,29 +39,29 @@ static void em_filter_source_element_class_init(EMFilterSourceElementClass *klas static void em_filter_source_element_init(EMFilterSourceElement *fs); static void em_filter_source_element_finalize(GObject *obj); -static int source_eq(FilterElement *fe, FilterElement *cm); +static gint source_eq(FilterElement *fe, FilterElement *cm); static void xml_create(FilterElement *fe, xmlNodePtr node); static xmlNodePtr xml_encode(FilterElement *fe); -static int xml_decode(FilterElement *fe, xmlNodePtr node); +static gint xml_decode(FilterElement *fe, xmlNodePtr node); static FilterElement *clone(FilterElement *fe); static GtkWidget *get_widget(FilterElement *fe); static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff); static void format_sexp(FilterElement *, GString *); -static void em_filter_source_element_add_source (EMFilterSourceElement *fs, const char *account_name, const char *name, - const char *addr, const char *url); +static void em_filter_source_element_add_source (EMFilterSourceElement *fs, const gchar *account_name, const gchar *name, + const gchar *addr, const gchar *url); static void em_filter_source_element_get_sources(EMFilterSourceElement *fs); typedef struct _SourceInfo { - char *account_name; - char *name; - char *address; - char *url; + gchar *account_name; + gchar *name; + gchar *address; + gchar *url; } SourceInfo; struct _EMFilterSourceElementPrivate { GList *sources; - char *current_url; + gchar *current_url; }; @@ -176,12 +176,12 @@ xml_encode(FilterElement *fe) EMFilterSourceElement *fs = (EMFilterSourceElement *)fe; - value = xmlNewNode(NULL, (const unsigned char *)"value"); - xmlSetProp(value, (const unsigned char *)"name", (unsigned char *)fe->name); - xmlSetProp(value, (const unsigned char *)"type", (const unsigned char *)"uri"); + value = xmlNewNode(NULL, (const guchar *)"value"); + xmlSetProp(value, (const guchar *)"name", (guchar *)fe->name); + xmlSetProp(value, (const guchar *)"type", (const guchar *)"uri"); if (fs->priv->current_url) - xmlNewTextChild(value, NULL, (const unsigned char *)"uri", (unsigned char *)fs->priv->current_url); + xmlNewTextChild(value, NULL, (const guchar *)"uri", (guchar *)fs->priv->current_url); return value; } @@ -191,12 +191,12 @@ xml_decode(FilterElement *fe, xmlNodePtr node) { EMFilterSourceElement *fs = (EMFilterSourceElement *)fe; CamelURL *url; - char *uri; + gchar *uri; node = node->children; while (node != NULL) { - if (!strcmp((char *)node->name, "uri")) { - uri = (char *)xmlNodeGetContent(node); + if (!strcmp((gchar *)node->name, "uri")) { + uri = (gchar *)xmlNodeGetContent(node); url = camel_url_new(uri, NULL); xmlFree(uri); @@ -219,7 +219,7 @@ clone(FilterElement *fe) EMFilterSourceElement *cpy = em_filter_source_element_new(); GList *i; - ((FilterElement *)cpy)->name = (char *)xmlStrdup((unsigned char *)fe->name); + ((FilterElement *)cpy)->name = (gchar *)xmlStrdup((guchar *)fe->name); cpy->priv->current_url = g_strdup(fs->priv->current_url); @@ -235,7 +235,7 @@ static void source_changed(GtkComboBox *combobox, EMFilterSourceElement *fs) { SourceInfo *info; - int idx; + gint idx; idx = gtk_combo_box_get_active (combobox); g_return_if_fail (idx >= 0 && idx < g_list_length (fs->priv->sources)); @@ -254,7 +254,7 @@ get_widget(FilterElement *fe) GtkWidget *combobox; GList *i; SourceInfo *first = NULL; - int index, current_index; + gint index, current_index; if (fs->priv->sources == NULL) em_filter_source_element_get_sources(fs); @@ -266,7 +266,7 @@ get_widget(FilterElement *fe) for (i = fs->priv->sources; i != NULL; i = g_list_next(i)) { SourceInfo *info = (SourceInfo *)i->data; - char *label; + gchar *label; if (info->url != NULL) { if (first == NULL) @@ -321,8 +321,8 @@ format_sexp(FilterElement *fe, GString *out) static void -em_filter_source_element_add_source(EMFilterSourceElement *fs, const char *account_name, const char *name, - const char *addr, const char *url) +em_filter_source_element_add_source(EMFilterSourceElement *fs, const gchar *account_name, const gchar *name, + const gchar *addr, const gchar *url) { SourceInfo *info; @@ -344,7 +344,7 @@ em_filter_source_element_get_sources(EMFilterSourceElement *fs) const EAccount *account; GConfClient *gconf; EIterator *it; - char *uri; + gchar *uri; CamelURL *url; /* should this get the global object from mail? */ diff --git a/mail/em-filter-source-element.h b/mail/em-filter-source-element.h index ac9a1ff911..d4d6a75890 100644 --- a/mail/em-filter-source-element.h +++ b/mail/em-filter-source-element.h @@ -47,6 +47,6 @@ struct _EMFilterSourceElementClass { GType em_filter_source_element_get_type (void); EMFilterSourceElement *em_filter_source_element_new (void); -void em_filter_source_element_set_current (EMFilterSourceElement *src, const char *url); +void em_filter_source_element_set_current (EMFilterSourceElement *src, const gchar *url); #endif /* _EM_FILTER_SOURCE_ELEMENT_H */ diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index c835a1b593..0fc37b46bd 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -121,7 +121,7 @@ struct _EMFolderBrowserPrivate { guint vpane_resize_id; guint list_built_id; /* hook onto list-built for delayed 'select first unread' stuff */ - char *select_uid; + gchar *select_uid; guint folder_changed_id; guint show_wide:1; @@ -139,20 +139,20 @@ typedef struct EMFBSearchBarItem { const gchar *image; } EMFBSearchBarItem; -static void emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int state); -static void emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri); -static void emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri); +static void emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint state); +static void emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri); +static void emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri); /* FilterBar stuff ... */ -static void emfb_search_config_search(EFilterBar *efb, FilterRule *rule, int id, const char *query, void *data); -static void emfb_search_menu_activated(ESearchBar *esb, int id, EMFolderBrowser *emfb); +static void emfb_search_config_search(EFilterBar *efb, FilterRule *rule, gint id, const gchar *query, gpointer data); +static void emfb_search_menu_activated(ESearchBar *esb, gint id, EMFolderBrowser *emfb); static void emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb); static void emfb_search_search_cleared(ESearchBar *esb); -static int emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, EMFolderBrowser *emfb); -static void emfb_list_message_selected (MessageList *ml, const char *uid, EMFolderBrowser *emfb); +static gint emfb_list_key_press(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *ev, EMFolderBrowser *emfb); +static void emfb_list_message_selected (MessageList *ml, const gchar *uid, EMFolderBrowser *emfb); -static void emfb_expand_all_threads(BonoboUIComponent *uid, void *data, const char *path); +static void emfb_expand_all_threads(BonoboUIComponent *uid, gpointer data, const gchar *path); static const EMFolderViewEnable emfb_enable_map[] = { { "EditInvertSelection", EM_POPUP_SELECT_FOLDER }, @@ -294,7 +294,7 @@ generate_viewoption_menu (GtkWidget *emfv) for (i = 0; emfb_view_items[i].search.id != -1; ++i) { if (emfb_view_items[i].search.text) { - char *str; + gchar *str; str = e_str_without_underscores (_(emfb_view_items[i].search.text)); menu_item = gtk_image_menu_item_new_with_label (str); @@ -325,7 +325,7 @@ generate_viewoption_menu (GtkWidget *emfv) for (l = mail_config_get_labels (), i = 0; l; l = l->next, i++) { EUtilLabel *label = l->data; if (label->name && *(label->name)) { - char *str; + gchar *str; GdkPixmap *pixmap; GdkColor colour; GdkGC *gc; @@ -359,7 +359,7 @@ generate_viewoption_menu (GtkWidget *emfv) for (i = 0; temp_view_items[i].search.id != -1; ++i) { if (temp_view_items[i].search.text) { - char *str; + gchar *str; str = e_str_without_underscores (_(temp_view_items[i].search.text)); menu_item = gtk_image_menu_item_new_with_label (str); if (temp_view_items[i].image) { @@ -423,7 +423,7 @@ emfb_realize (GtkWidget *widget) { GtkWidget *menu; EMFolderBrowser *emfb = (EMFolderBrowser *)widget; - int id; + gint id; menu = generate_viewoption_menu (widget); id = e_search_bar_get_viewitem_id (E_SEARCH_BAR (emfb->search)); @@ -512,11 +512,11 @@ emfb_init(GObject *o) "evolution-mail-message.xml", NULL)); - emfb->view.enable_map = g_slist_prepend(emfb->view.enable_map, (void *)emfb_enable_map); + emfb->view.enable_map = g_slist_prepend(emfb->view.enable_map, (gpointer)emfb_enable_map); if (search_context) { - const char *systemrules = g_object_get_data (G_OBJECT (search_context), "system"); - const char *userrules = g_object_get_data (G_OBJECT (search_context), "user"); + const gchar *systemrules = g_object_get_data (G_OBJECT (search_context), "system"); + const gchar *userrules = g_object_get_data (G_OBJECT (search_context), "user"); EFilterBar *efb; GConfClient *gconf; @@ -736,7 +736,7 @@ void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state) if (state) { GConfClient *gconf = mail_config_get_gconf_client (); - int paned_size /*, y*/; + gint paned_size /*, y*/; paned_size = gconf_client_get_int(gconf, emfb->priv->show_wide ? "/apps/evolution/mail/display/hpaned_size":"/apps/evolution/mail/display/paned_size", NULL); @@ -745,7 +745,7 @@ void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state) gtk_widget_show (GTK_WIDGET (emfb->priv->preview)); if (emfb->view.list->cursor_uid) { - char *uid = g_alloca(strlen(emfb->view.list->cursor_uid)+1); + gchar *uid = g_alloca(strlen(emfb->view.list->cursor_uid)+1); emfb->priv->scope_restricted = FALSE; strcpy(uid, emfb->view.list->cursor_uid); @@ -779,7 +779,7 @@ gboolean em_folder_browser_get_wide (EMFolderBrowser *emfb) void em_folder_browser_show_wide(EMFolderBrowser *emfb, gboolean state) { GtkWidget *w; - int paned_size; + gint paned_size; if ((emfb->priv->show_wide && state) || emfb->view.list == NULL) { @@ -818,7 +818,7 @@ void em_folder_browser_show_wide(EMFolderBrowser *emfb, gboolean state) /* FIXME: Ugh! */ static void -emfb_search_menu_activated(ESearchBar *esb, int id, EMFolderBrowser *emfb) +emfb_search_menu_activated(ESearchBar *esb, gint id, EMFolderBrowser *emfb) { EFilterBar *efb = (EFilterBar *)esb; @@ -829,7 +829,7 @@ emfb_search_menu_activated(ESearchBar *esb, int id, EMFolderBrowser *emfb) d(printf("Save vfolder\n")); if (efb->current_query) { FilterRule *rule; - char *name, *text; + gchar *name, *text; /* ensures vfolder is running */ vfolder_load_storage (); @@ -850,14 +850,14 @@ emfb_search_menu_activated(ESearchBar *esb, int id, EMFolderBrowser *emfb) } static void -emfb_search_config_search(EFilterBar *efb, FilterRule *rule, int id, const char *query, void *data) +emfb_search_config_search(EFilterBar *efb, FilterRule *rule, gint id, const gchar *query, gpointer data) { EMFolderBrowser *emfb = data; EMailSearchBar *search_bar; ESearchingTokenizer *tokenizer; GList *partl; struct _camel_search_words *words; - int i; + gint i; GSList *strings = NULL; /* we scan the parts of a rule, and set all the types we know about to the query string */ @@ -874,7 +874,7 @@ emfb_search_config_search(EFilterBar *efb, FilterRule *rule, int id, const char if (input) filter_input_set_value(input, query); - words = camel_search_words_split((unsigned char *)query); + words = camel_search_words_split((guchar *)query); for (i=0;ilen;i++) strings = g_slist_prepend(strings, g_strdup(words->words[i]->word)); camel_search_words_free (words); @@ -914,12 +914,12 @@ emfb_search_config_search(EFilterBar *efb, FilterRule *rule, int id, const char } static const gchar * -get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) +get_view_query (ESearchBar *esb, CamelFolder *folder, const gchar *folder_uri) { const gchar *view_sexp = NULL; gint id; GtkWidget *menu_item; - char *tag; + gchar *tag; gboolean duplicate = TRUE; /* Get the current selected view */ @@ -985,7 +985,7 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const char *folder_uri) view_sexp = g_string_free (s, FALSE); } break; case VIEW_LABEL: - tag = (char *)g_object_get_data (G_OBJECT (menu_item), "LabelTag"); + tag = (gchar *)g_object_get_data (G_OBJECT (menu_item), "LabelTag"); view_sexp = g_strdup_printf ("(match-all (or (= (user-tag \"label\") \"%s\") (user-flag \"$Label%s\") (user-flag \"%s\")))", tag, tag, tag); duplicate = FALSE; break; @@ -1013,7 +1013,7 @@ struct _setup_msg { CamelFolder *folder; CamelOperation *cancel; - char *query; + gchar *query; GList *sources_uri; GList *sources_folder; }; @@ -1039,12 +1039,12 @@ vfolder_setup_exec(struct _setup_msg *m) l = m->sources_uri; while (l) { - d(printf(" Adding uri: %s\n", (char *)l->data)); + d(printf(" Adding uri: %s\n", (gchar *)l->data)); folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex); if (folder) { list = g_list_append(list, folder); } else { - g_warning("Could not open vfolder source: %s", (char *)l->data); + g_warning("Could not open vfolder source: %s", (gchar *)l->data); camel_exception_clear(&m->base.ex); } l = l->next; @@ -1106,10 +1106,10 @@ static MailMsgInfo vfolder_setup_info = { /* sources_uri should be camel uri's */ static int -vfolder_setup(CamelFolder *folder, const char *query, GList *sources_uri, GList *sources_folder, CamelOperation *cancel) +vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList *sources_folder, CamelOperation *cancel) { struct _setup_msg *m; - int id; + gint id; m = mail_msg_new(&vfolder_setup_info); m->folder = folder; @@ -1134,8 +1134,8 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) EMFolderView *emfv = (EMFolderView *) emfb; EFilterBar *efb = (EFilterBar *)esb; const gchar *view_sexp; - char *search_state = NULL, *folder_uri=NULL; - char *word = NULL, *storeuri = NULL, *search_word = NULL; + gchar *search_state = NULL, *folder_uri=NULL; + gchar *word = NULL, *storeuri = NULL, *search_word = NULL; gint id, i; CamelFolder *folder; CamelStore *store; @@ -1260,11 +1260,11 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) /* Add the local folders */ l = mail_vfolder_get_sources_local (); while (l) { - folder = mail_tool_uri_to_folder ((const char *)l->data, 0,ex); + folder = mail_tool_uri_to_folder ((const gchar *)l->data, 0,ex); if (folder) folder_list = g_list_append(folder_list, folder); else { - g_warning("Could not open vfolder source: %s", (char *)l->data); + g_warning("Could not open vfolder source: %s", (gchar *)l->data); camel_exception_clear(ex); } l = l->next; @@ -1273,11 +1273,11 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) /* Add the remote source folder */ l = mail_vfolder_get_sources_remote (); while (l) { - folder = mail_tool_uri_to_folder ((const char *)l->data, 0,ex); + folder = mail_tool_uri_to_folder ((const gchar *)l->data, 0,ex); if (folder) folder_list = g_list_append(folder_list, folder); else { - g_warning("Could not open vfolder source: %s", (char *)l->data); + g_warning("Could not open vfolder source: %s", (gchar *)l->data); camel_exception_clear(ex); } l = l->next; @@ -1337,7 +1337,7 @@ emfb_search_search_cleared(ESearchBar *esb) /* ********************************************************************** */ static int -emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, EMFolderBrowser *emfb) +emfb_list_key_press(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *ev, EMFolderBrowser *emfb) { gboolean state, folder_choose = TRUE; if ((ev->key.state & GDK_CONTROL_MASK) != 0) @@ -1391,7 +1391,7 @@ emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, } static void -emfb_list_message_selected (MessageList *ml, const char *uid, EMFolderBrowser *emfb) +emfb_list_message_selected (MessageList *ml, const gchar *uid, EMFolderBrowser *emfb) { EMFolderView *emfv = (EMFolderView *) emfb; @@ -1413,7 +1413,7 @@ emfb_list_message_selected (MessageList *ml, const char *uid, EMFolderBrowser *e /* ********************************************************************** */ static void -emfb_edit_cut(BonoboUIComponent *uid, void *data, const char *path) +emfb_edit_cut(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; @@ -1428,7 +1428,7 @@ emfb_edit_cut(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_edit_copy(BonoboUIComponent *uid, void *data, const char *path) +emfb_edit_copy(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; @@ -1441,7 +1441,7 @@ emfb_edit_copy(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_edit_paste(BonoboUIComponent *uid, void *data, const char *path) +emfb_edit_paste(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; @@ -1452,7 +1452,7 @@ emfb_edit_paste(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_edit_invert_selection(BonoboUIComponent *uid, void *data, const char *path) +emfb_edit_invert_selection(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1468,7 +1468,7 @@ emfb_select_all_daemon (MessageList *ml) } static void -emfb_edit_select_all(BonoboUIComponent *uid, void *data, const char *path) +emfb_edit_select_all(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1491,7 +1491,7 @@ emfb_edit_select_all(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_edit_select_thread(BonoboUIComponent *uid, void *data, const char *path) +emfb_edit_select_thread(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1499,7 +1499,7 @@ emfb_edit_select_thread(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_edit_select_subthread(BonoboUIComponent *uid, void *data, const char *path) +emfb_edit_select_subthread(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1507,7 +1507,7 @@ emfb_edit_select_subthread(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_folder_properties(BonoboUIComponent *uid, void *data, const char *path) +emfb_folder_properties(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; @@ -1517,7 +1517,7 @@ emfb_folder_properties(BonoboUIComponent *uid, void *data, const char *path) /* VIEWTHREADED*/ static void -emfb_expand_all_threads(BonoboUIComponent *uid, void *data, const char *path) +emfb_expand_all_threads(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1526,7 +1526,7 @@ emfb_expand_all_threads(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_collapse_all_threads(BonoboUIComponent *uid, void *data, const char *path) +emfb_collapse_all_threads(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1534,7 +1534,7 @@ emfb_collapse_all_threads(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_folder_copy(BonoboUIComponent *uid, void *data, const char *path) +emfb_folder_copy(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; CamelFolderInfo *fi = NULL; @@ -1557,7 +1557,7 @@ emfb_folder_copy(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_folder_move(BonoboUIComponent *uid, void *data, const char *path) +emfb_folder_move(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; CamelFolderInfo *fi = NULL; @@ -1580,7 +1580,7 @@ emfb_folder_move(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_folder_delete(BonoboUIComponent *uid, void *data, const char *path) +emfb_folder_delete(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; @@ -1590,7 +1590,7 @@ emfb_folder_delete(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_folder_refresh(BonoboUIComponent *uid, void *data, const char *path) +emfb_folder_refresh(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; EMFolderTree *tree = g_object_get_data (G_OBJECT (emfb), "foldertree"); @@ -1602,7 +1602,7 @@ emfb_folder_refresh(BonoboUIComponent *uid, void *data, const char *path) static void -emfb_folder_rename(BonoboUIComponent *uid, void *data, const char *path) +emfb_folder_rename(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; @@ -1612,7 +1612,7 @@ emfb_folder_rename(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_folder_create(BonoboUIComponent *uid, void *data, const char *path) +emfb_folder_create(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; CamelFolderInfo *fi = NULL; @@ -1633,7 +1633,7 @@ emfb_folder_create(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_folder_expunge(BonoboUIComponent *uid, void *data, const char *path) +emfb_folder_expunge(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; @@ -1642,12 +1642,12 @@ emfb_folder_expunge(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_mark_all_read(BonoboUIComponent *uid, void *data, const char *path) +emfb_mark_all_read(BonoboUIComponent *uid, gpointer data, const gchar *path) { /* FIXME: make a 'mark messages' function? */ EMFolderView *emfv = data; GPtrArray *uids; - int i; + gint i; if (emfv->folder == NULL) return; @@ -1662,7 +1662,7 @@ emfb_mark_all_read(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_view_hide_read(BonoboUIComponent *uid, void *data, const char *path) +emfb_view_hide_read(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1670,7 +1670,7 @@ emfb_view_hide_read(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_view_hide_selected(BonoboUIComponent *uid, void *data, const char *path) +emfb_view_hide_selected(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; GPtrArray *uids; @@ -1688,7 +1688,7 @@ emfb_view_hide_selected(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_view_show_all(BonoboUIComponent *uid, void *data, const char *path) +emfb_view_show_all(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1698,13 +1698,13 @@ emfb_view_show_all(BonoboUIComponent *uid, void *data, const char *path) /* ********************************************************************** */ static void -emfb_mail_stop(BonoboUIComponent *uid, void *data, const char *path) +emfb_mail_stop(BonoboUIComponent *uid, gpointer data, const gchar *path) { mail_cancel_all(); } static void -emfb_tools_filters(BonoboUIComponent *uid, void *data, const char *path) +emfb_tools_filters(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; @@ -1718,7 +1718,7 @@ emfb_subscribe_editor_destroy(GtkWidget *w, EMFolderBrowser *emfb) } static void -emfb_tools_subscriptions(BonoboUIComponent *uid, void *data, const char *path) +emfb_tools_subscriptions(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; @@ -1733,7 +1733,7 @@ emfb_tools_subscriptions(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_focus_search(BonoboUIComponent *uid, void *data, const char *path) +emfb_focus_search(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderBrowser *emfb = data; @@ -1741,13 +1741,13 @@ emfb_focus_search(BonoboUIComponent *uid, void *data, const char *path) } static void -emfb_help_debug (BonoboUIComponent *uid, void *data, const char *path) +emfb_help_debug (BonoboUIComponent *uid, gpointer data, const gchar *path) { mail_component_show_logger ((GtkWidget *) data); } static void -emfb_tools_vfolders(BonoboUIComponent *uid, void *data, const char *path) +emfb_tools_vfolders(BonoboUIComponent *uid, gpointer data, const gchar *path) { /* FIXME: rename/refactor this */ vfolder_edit(); @@ -1805,7 +1805,7 @@ static EPixmap emfb_pixmaps[] = { static void -emfb_hide_deleted(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +emfb_hide_deleted(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data) { GConfClient *gconf; EMFolderView *emfv = data; @@ -1819,7 +1819,7 @@ emfb_hide_deleted(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_E } static void -emfb_view_threaded(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +emfb_view_threaded(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data) { GConfClient *gconf; EMFolderView *emfv = data; @@ -1840,7 +1840,7 @@ emfb_view_threaded(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_ } static void -emfb_view_preview(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +emfb_view_preview(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data) { GConfClient *gconf; EMFolderView *emfv = data; @@ -1859,7 +1859,7 @@ emfb_view_preview(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_E } static void -emfb_show_next(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +emfb_show_next(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data) { GConfClient *gconf; EMFolderBrowser *emfb = data; @@ -1874,7 +1874,7 @@ emfb_show_next(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_Even } static void -emfb_show_below(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +emfb_show_below(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data) { GConfClient *gconf; EMFolderBrowser *emfb = data; @@ -1893,7 +1893,7 @@ emfb_list_scrolled (MessageList *ml, EMFolderBrowser *emfb) { EMFolderView *emfv = (EMFolderView *) emfb; double position; - char *state; + gchar *state; position = message_list_get_scrollbar_position (ml); state = g_strdup_printf ("%f", position); @@ -1909,7 +1909,7 @@ scroll_idle_cb (EMFolderBrowser *emfb) { EMFolderView *emfv = (EMFolderView *) emfb; double position; - char *state; + gchar *state; if ((state = camel_object_meta_get (emfv->folder, "evolution:list_scroll_position"))) { position = strtod (state, NULL); @@ -1928,7 +1928,7 @@ scroll_idle_cb (EMFolderBrowser *emfb) } static void -emfb_gui_folder_changed(CamelFolder *folder, void *dummy, EMFolderBrowser *emfb) +emfb_gui_folder_changed(CamelFolder *folder, gpointer dummy, EMFolderBrowser *emfb) { if (emfb->priv->select_uid) { CamelMessageInfo *mi; @@ -2008,7 +2008,7 @@ emfb_list_built (MessageList *ml, EMFolderBrowser *emfb) } static void -emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) +emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri) { EMFolderBrowser *emfb = (EMFolderBrowser *) emfv; const gchar *state; @@ -2045,7 +2045,7 @@ emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) static void -emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) +emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri) { EMFolderBrowser *emfb = (EMFolderBrowser *) emfv; struct _EMFolderBrowserPrivate *p = emfb->priv; @@ -2078,8 +2078,8 @@ emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) before the folder is open and need to override the defaults */ if (folder) { - char *sstate; - int state; + gchar *sstate; + gint state; gboolean safe; GConfClient *gconf = mail_config_get_gconf_client(); @@ -2178,12 +2178,12 @@ emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) } static void -emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act) +emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint act) { if (act) { GConfClient *gconf; gboolean state; - char *sstate; + gchar *sstate; EMFolderBrowser *emfb = (EMFolderBrowser *) emfv; gconf = mail_config_get_gconf_client (); diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index b0fbfc65d2..db8bff5315 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -46,20 +46,20 @@ #include "mail-config.h" struct _prop_data { - void *object; + gpointer object; CamelArgV *argv; GtkWidget **widgets; GSList *properties; - char *name; - int total; - int unread; + gchar *name; + gint total; + gint unread; EMConfig *config; CamelFolderQuotaInfo *quota; }; static void -emfp_dialog_response (GtkWidget *dialog, int response, struct _prop_data *prop_data) +emfp_dialog_response (GtkWidget *dialog, gint response, struct _prop_data *prop_data) { if (response == GTK_RESPONSE_OK) e_config_commit((EConfig *)prop_data->config); @@ -70,11 +70,11 @@ emfp_dialog_response (GtkWidget *dialog, int response, struct _prop_data *prop_d } static void -emfp_commit(EConfig *ec, GSList *items, void *data) +emfp_commit(EConfig *ec, GSList *items, gpointer data) { struct _prop_data *prop_data = data; CamelArgV *argv = prop_data->argv; - int i; + gint i; for (i = 0; i < argv->argc; i++) { CamelArg *arg = &argv->argv[i]; @@ -85,7 +85,7 @@ emfp_commit(EConfig *ec, GSList *items, void *data) break; case CAMEL_ARG_STR: g_free (arg->ca_str); - arg->ca_str = (char *) gtk_entry_get_text ((GtkEntry *) prop_data->widgets[i]); + arg->ca_str = (gchar *) gtk_entry_get_text ((GtkEntry *) prop_data->widgets[i]); break; case CAMEL_ARG_INT: arg->ca_int = gtk_spin_button_get_value_as_int ((GtkSpinButton *) prop_data->widgets[i]); @@ -103,10 +103,10 @@ emfp_commit(EConfig *ec, GSList *items, void *data) } static void -emfp_free(EConfig *ec, GSList *items, void *data) +emfp_free(EConfig *ec, GSList *items, gpointer data) { struct _prop_data *prop_data = data; - int i; + gint i; g_slist_free(items); @@ -127,9 +127,9 @@ emfp_free(EConfig *ec, GSList *items, void *data) } static int -add_numbered_row (GtkTable *table, int row, const char *description, const char *format, int num) +add_numbered_row (GtkTable *table, gint row, const gchar *description, const gchar *format, gint num) { - char *str; + gchar *str; GtkWidget *label; g_return_val_if_fail (table != NULL, row); @@ -154,11 +154,11 @@ add_numbered_row (GtkTable *table, int row, const char *description, const char } static GtkWidget * -emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { GtkWidget *w, *table, *label; struct _prop_data *prop_data = data; - int row = 0, i; + gint row = 0, i; GSList *l; if (old) @@ -182,8 +182,8 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, CamelFolderQuotaInfo *quota = prop_data->quota; for (info = quota; info; info = info->next) { - char *descr; - int procs; + gchar *descr; + gint procs; /* should not happen, but anyway... */ if (!info->total) @@ -287,7 +287,7 @@ static EMConfigItem emfp_items[] = { static gboolean emfp_items_translated = FALSE; static void -emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota, void *data) +emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota, gpointer data) { GtkWidget *dialog, *w; struct _prop_data *prop_data; @@ -300,7 +300,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota, gboolean hide_deleted; GConfClient *gconf; CamelStore *store; - char *uri = (char *)data; + gchar *uri = (gchar *)data; if (folder == NULL) { g_free (uri); @@ -426,7 +426,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota, } static void -emfp_dialog_got_folder (char *uri, CamelFolder *folder, void *data) +emfp_dialog_got_folder (gchar *uri, CamelFolder *folder, gpointer data) { /* this should be called in a thread too */ mail_get_folder_quota (folder, emfp_dialog_got_folder_quota, g_strdup (uri), mail_msg_unordered_push); @@ -442,7 +442,7 @@ emfp_dialog_got_folder (char *uri, CamelFolder *folder, void *data) * as NULL, then the folder @uri will be loaded first. **/ void -em_folder_properties_show(GtkWindow *parent, CamelFolder *folder, const char *uri) +em_folder_properties_show(GtkWindow *parent, CamelFolder *folder, const gchar *uri) { /* HACK: its the old behaviour, not very 'neat' but it works */ if (!strncmp(uri, "vfolder:", 8)) { @@ -464,5 +464,5 @@ em_folder_properties_show(GtkWindow *parent, CamelFolder *folder, const char *ur if (folder == NULL) mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_msg_unordered_push); else - emfp_dialog_got_folder((char *)uri, folder, NULL); + emfp_dialog_got_folder((gchar *)uri, folder, NULL); } diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h index cd58a9eeb4..cdaec27e4d 100644 --- a/mail/em-folder-properties.h +++ b/mail/em-folder-properties.h @@ -32,7 +32,7 @@ extern "C" { struct _CamelFolder; struct _GtkWindow; -void em_folder_properties_show(struct _GtkWindow *parent, struct _CamelFolder *folder, const char *uri); +void em_folder_properties_show(struct _GtkWindow *parent, struct _CamelFolder *folder, const gchar *uri); #ifdef __cplusplus } diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c index ce97dcb85d..a3a206fdcc 100644 --- a/mail/em-folder-selection-button.c +++ b/mail/em-folder-selection-button.c @@ -51,11 +51,11 @@ struct _EMFolderSelectionButtonPrivate { GtkWidget *selector; - char *uri; /* for single-select mode */ + gchar *uri; /* for single-select mode */ GList *uris; /* for multi-select mode */ - char *title; - char *caption; + gchar *title; + gchar *caption; gboolean multiple_select; }; @@ -124,13 +124,13 @@ static void set_contents (EMFolderSelectionButton *button) { struct _EMFolderSelectionButtonPrivate *priv = button->priv; - char *folder_name = em_utils_folder_name_from_uri (priv->uri); + gchar *folder_name = em_utils_folder_name_from_uri (priv->uri); if (folder_name) { EAccount *account = mail_config_get_account_by_source_url (priv->uri); if (account) { - char *tmp = folder_name; + gchar *tmp = folder_name; folder_name = g_strdup_printf ("%s/%s", e_account_get_string (account, E_ACCOUNT_NAME), _(folder_name)); g_free (tmp); gtk_label_set_text (GTK_LABEL (priv->label), folder_name); @@ -203,7 +203,7 @@ em_folder_selection_button_finalize (GObject *obj) } static void -emfsb_selector_response (EMFolderSelector *emfs, int response, EMFolderSelectionButton *button) +emfsb_selector_response (EMFolderSelector *emfs, gint response, EMFolderSelectionButton *button) { if (response == GTK_RESPONSE_OK) { if (button->priv->multiple_select) { @@ -212,7 +212,7 @@ emfsb_selector_response (EMFolderSelector *emfs, int response, EMFolderSelection em_folder_selection_button_set_selection_mult (button, uris); g_signal_emit (button, signals[SELECTED], 0); } else { - const char *uri = em_folder_selector_get_selected_uri (emfs); + const gchar *uri = em_folder_selector_get_selected_uri (emfs); em_folder_selection_button_set_selection (button, uri); g_signal_emit (button, signals[SELECTED], 0); @@ -255,7 +255,7 @@ em_folder_selection_button_clicked (GtkButton *button) } GtkWidget * -em_folder_selection_button_new (const char *title, const char *caption) +em_folder_selection_button_new (const gchar *title, const gchar *caption) { EMFolderSelectionButton *button = g_object_new (EM_TYPE_FOLDER_SELECTION_BUTTON, NULL); @@ -266,7 +266,7 @@ em_folder_selection_button_new (const char *title, const char *caption) } void -em_folder_selection_button_set_selection (EMFolderSelectionButton *button, const char *uri) +em_folder_selection_button_set_selection (EMFolderSelectionButton *button, const gchar *uri) { struct _EMFolderSelectionButtonPrivate *priv = button->priv; @@ -280,7 +280,7 @@ em_folder_selection_button_set_selection (EMFolderSelectionButton *button, const set_contents (button); } -const char * +const gchar * em_folder_selection_button_get_selection (EMFolderSelectionButton *button) { g_return_val_if_fail (EM_IS_FOLDER_SELECTION_BUTTON (button), NULL); @@ -292,7 +292,7 @@ void em_folder_selection_button_set_selection_mult (EMFolderSelectionButton *button, GList *uris) { struct _EMFolderSelectionButtonPrivate *priv = button->priv; - char *caption, *tmp, *tmp2; + gchar *caption, *tmp, *tmp2; g_return_if_fail (EM_IS_FOLDER_SELECTION_BUTTON (button)); diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h index c0ab32f88e..7b2a1b471d 100644 --- a/mail/em-folder-selection-button.h +++ b/mail/em-folder-selection-button.h @@ -57,10 +57,10 @@ struct _EMFolderSelectionButtonClass { GType em_folder_selection_button_get_type (void); -GtkWidget *em_folder_selection_button_new (const char *title, const char *caption); +GtkWidget *em_folder_selection_button_new (const gchar *title, const gchar *caption); -void em_folder_selection_button_set_selection (EMFolderSelectionButton *button, const char *uri); -const char *em_folder_selection_button_get_selection (EMFolderSelectionButton *button); +void em_folder_selection_button_set_selection (EMFolderSelectionButton *button, const gchar *uri); +const gchar *em_folder_selection_button_get_selection (EMFolderSelectionButton *button); void em_folder_selection_button_set_selection_mult (EMFolderSelectionButton *button, GList *uris); GList *em_folder_selection_button_get_selection_mult (EMFolderSelectionButton *button); diff --git a/mail/em-folder-selection.c b/mail/em-folder-selection.c index cfb244c2eb..8fe6292e32 100644 --- a/mail/em-folder-selection.c +++ b/mail/em-folder-selection.c @@ -37,15 +37,15 @@ /* TODO: rmeove this file, it could just go on em-folder-selection or em-utils */ struct _select_folder_data { - void (*done) (const char *uri, void *data); - void *data; + void (*done) (const gchar *uri, gpointer data); + gpointer data; }; static void -emfs_selector_response(EMFolderSelector *emfs, int response, struct _select_folder_data *d) +emfs_selector_response(EMFolderSelector *emfs, gint response, struct _select_folder_data *d) { if (response == GTK_RESPONSE_OK) { - const char *uri = em_folder_selector_get_selected_uri(emfs); + const gchar *uri = em_folder_selector_get_selected_uri(emfs); d->done(uri, d->data); } @@ -54,9 +54,9 @@ emfs_selector_response(EMFolderSelector *emfs, int response, struct _select_fold } void -em_select_folder (GtkWindow *parent_window, const char *title, const char *oklabel, const char *default_uri, +em_select_folder (GtkWindow *parent_window, const gchar *title, const gchar *oklabel, const gchar *default_uri, EMFTExcludeFunc exclude, - void (*done) (const char *uri, void *user_data), void *user_data) + void (*done) (const gchar *uri, gpointer user_data), gpointer user_data) { struct _select_folder_data *d; EMFolderTreeModel *model; diff --git a/mail/em-folder-selection.h b/mail/em-folder-selection.h index 25c35d254b..098fa2b227 100644 --- a/mail/em-folder-selection.h +++ b/mail/em-folder-selection.h @@ -33,10 +33,10 @@ extern "C" { struct _GtkWindow; -void em_select_folder (struct _GtkWindow *parent_window, const char *title, const char *oklabel, const char *default_uri, +void em_select_folder (struct _GtkWindow *parent_window, const gchar *title, const gchar *oklabel, const gchar *default_uri, EMFTExcludeFunc exclude, - void (*done)(const char *uri, void *data), - void *data); + void (*done)(const gchar *uri, gpointer data), + gpointer data); #ifdef __cplusplus } diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index ae6a8965a4..7a4f389482 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -126,7 +126,7 @@ em_folder_selector_finalize (GObject *obj) } static void -emfs_response (GtkWidget *dialog, int response, EMFolderSelector *emfs) +emfs_response (GtkWidget *dialog, gint response, EMFolderSelector *emfs) { if (response != EM_FOLDER_SELECTOR_RESPONSE_NEW) return; @@ -140,8 +140,8 @@ emfs_response (GtkWidget *dialog, int response, EMFolderSelector *emfs) static void emfs_create_name_changed (GtkEntry *entry, EMFolderSelector *emfs) { - char *path; - const char *text = NULL; + gchar *path; + const gchar *text = NULL; gboolean active; if (emfs->name_entry->text_length > 0) @@ -155,7 +155,7 @@ emfs_create_name_changed (GtkEntry *entry, EMFolderSelector *emfs) } static void -folder_selected_cb (EMFolderTree *emft, const char *path, const char *uri, guint32 flags, EMFolderSelector *emfs) +folder_selected_cb (EMFolderTree *emft, const gchar *path, const gchar *uri, guint32 flags, EMFolderSelector *emfs) { if (emfs->name_entry) emfs_create_name_changed (emfs->name_entry, emfs); @@ -164,13 +164,13 @@ folder_selected_cb (EMFolderTree *emft, const char *path, const char *uri, guint } static void -folder_activated_cb (EMFolderTree *emft, const char *path, const char *uri, EMFolderSelector *emfs) +folder_activated_cb (EMFolderTree *emft, const gchar *path, const gchar *uri, EMFolderSelector *emfs) { gtk_dialog_response ((GtkDialog *) emfs, GTK_RESPONSE_OK); } void -em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint32 flags, const char *title, const char *text, const char *oklabel) +em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint32 flags, const gchar *title, const gchar *text, const gchar *oklabel) { GtkWidget *label; @@ -213,7 +213,7 @@ em_folder_selector_construct (EMFolderSelector *emfs, EMFolderTree *emft, guint3 } GtkWidget * -em_folder_selector_new (EMFolderTree *emft, guint32 flags, const char *title, const char *text, const char *oklabel) +em_folder_selector_new (EMFolderTree *emft, guint32 flags, const gchar *title, const gchar *text, const gchar *oklabel) { EMFolderSelector *emfs; @@ -228,8 +228,8 @@ static void emfs_create_name_activate (GtkEntry *entry, EMFolderSelector *emfs) { if (emfs->name_entry->text_length > 0) { - char *path; - const char *text; + gchar *path; + const gchar *text; text = gtk_entry_get_text (emfs->name_entry); path = em_folder_tree_get_selected_uri(emfs->emft); @@ -241,7 +241,7 @@ emfs_create_name_activate (GtkEntry *entry, EMFolderSelector *emfs) } GtkWidget * -em_folder_selector_create_new (EMFolderTree *emft, guint32 flags, const char *title, const char *text) +em_folder_selector_create_new (EMFolderTree *emft, guint32 flags, const gchar *title, const gchar *text) { EMFolderSelector *emfs; GtkWidget *hbox, *w; @@ -273,7 +273,7 @@ em_folder_selector_create_new (EMFolderTree *emft, guint32 flags, const char *ti void -em_folder_selector_set_selected (EMFolderSelector *emfs, const char *uri) +em_folder_selector_set_selected (EMFolderSelector *emfs, const gchar *uri) { em_folder_tree_set_selected (emfs->emft, uri, FALSE); } @@ -284,11 +284,11 @@ em_folder_selector_set_selected_list (EMFolderSelector *emfs, GList *list) em_folder_tree_set_selected_list (emfs->emft, list, FALSE); } -const char * +const gchar * em_folder_selector_get_selected_uri (EMFolderSelector *emfs) { - char *uri; - const char *name; + gchar *uri; + const gchar *name; if (!(uri = em_folder_tree_get_selected_uri (emfs->emft))) { d(printf ("no selected folder?\n")); @@ -298,7 +298,7 @@ em_folder_selector_get_selected_uri (EMFolderSelector *emfs) if (uri && emfs->name_entry) { CamelProvider *provider; CamelURL *url; - char *newpath; + gchar *newpath; provider = camel_provider_get(uri, NULL); @@ -313,7 +313,7 @@ em_folder_selector_get_selected_uri (EMFolderSelector *emfs) camel_url_set_fragment (url, newpath); } else { - char *path; + gchar *path; path = g_strdup_printf("%s/%s", (url->path == NULL || strcmp(url->path, "/") == 0) ? "":url->path, name); camel_url_set_path(url, path); @@ -349,10 +349,10 @@ em_folder_selector_get_selected_paths (EMFolderSelector *emfs) return em_folder_tree_get_selected_paths (emfs->emft); } -const char * +const gchar * em_folder_selector_get_selected_path (EMFolderSelector *emfs) { - char *uri, *path; + gchar *uri, *path; if (emfs->selected_path) { /* already did the work in a previous call */ @@ -367,8 +367,8 @@ em_folder_selector_get_selected_path (EMFolderSelector *emfs) path = em_folder_tree_get_selected_path(emfs->emft); if (emfs->name_entry) { - const char *name; - char *newpath; + const gchar *name; + gchar *newpath; name = gtk_entry_get_text (emfs->name_entry); newpath = g_strdup_printf ("%s/%s", path?path:"", name); diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index 12662ae5f7..5ac7152d61 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -48,10 +48,10 @@ struct _EMFolderSelector { struct _EMFolderTree *emft; struct _GtkEntry *name_entry; - char *selected_path; - char *selected_uri; + gchar *selected_path; + gchar *selected_uri; - char *created_uri; + gchar *created_uri; guint created_id; }; @@ -70,19 +70,19 @@ enum { GType em_folder_selector_get_type (void); -void em_folder_selector_construct (EMFolderSelector *emfs, struct _EMFolderTree *emft, guint32 flags, const char *title, const char *text, const char *oklabel); +void em_folder_selector_construct (EMFolderSelector *emfs, struct _EMFolderTree *emft, guint32 flags, const gchar *title, const gchar *text, const gchar *oklabel); /* for selecting folders */ -GtkWidget *em_folder_selector_new (struct _EMFolderTree *emft, guint32 flags, const char *title, const char *text, const char *oklabel); +GtkWidget *em_folder_selector_new (struct _EMFolderTree *emft, guint32 flags, const gchar *title, const gchar *text, const gchar *oklabel); /* for creating folders */ -GtkWidget *em_folder_selector_create_new (struct _EMFolderTree *emft, guint32 flags, const char *title, const char *text); +GtkWidget *em_folder_selector_create_new (struct _EMFolderTree *emft, guint32 flags, const gchar *title, const gchar *text); -void em_folder_selector_set_selected (EMFolderSelector *emfs, const char *uri); +void em_folder_selector_set_selected (EMFolderSelector *emfs, const gchar *uri); void em_folder_selector_set_selected_list (EMFolderSelector *emfs, GList *list); -const char *em_folder_selector_get_selected_uri (EMFolderSelector *emfs); -const char *em_folder_selector_get_selected_path (EMFolderSelector *emfs); +const gchar *em_folder_selector_get_selected_uri (EMFolderSelector *emfs); +const gchar *em_folder_selector_get_selected_path (EMFolderSelector *emfs); GList *em_folder_selector_get_selected_uris (EMFolderSelector *emfs); GList *em_folder_selector_get_selected_paths (EMFolderSelector *emfs); diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index d90bcbbacb..2fedce05b3 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -188,11 +188,11 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *klass) static int sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data) { - char *aname, *bname; + gchar *aname, *bname; CamelStore *store; gboolean is_store; guint32 aflags, bflags; - int rv = -2; + gint rv = -2; gtk_tree_model_get (model, a, COL_BOOL_IS_STORE, &is_store, COL_POINTER_CAMEL_STORE, &store, @@ -336,7 +336,7 @@ tree_sortable_iface_init (GtkTreeSortableIface *iface) static void -em_folder_tree_model_load_state (EMFolderTreeModel *model, const char *filename) +em_folder_tree_model_load_state (EMFolderTreeModel *model, const gchar *filename) { xmlNodePtr root, node; @@ -345,7 +345,7 @@ em_folder_tree_model_load_state (EMFolderTreeModel *model, const char *filename) if ((model->state = e_xml_parse_file (filename)) != NULL) { node = xmlDocGetRootElement (model->state); - if (!node || strcmp ((char *)node->name, "tree-state") != 0) { + if (!node || strcmp ((gchar *)node->name, "tree-state") != 0) { /* it is not expected XML file, thus free it and use the default */ xmlFreeDoc (model->state); } else @@ -353,25 +353,25 @@ em_folder_tree_model_load_state (EMFolderTreeModel *model, const char *filename) } /* setup some defaults - expand "Local Folders" and "Search Folders" */ - model->state = xmlNewDoc ((const unsigned char *)"1.0"); - root = xmlNewDocNode (model->state, NULL, (const unsigned char *)"tree-state", NULL); + model->state = xmlNewDoc ((const guchar *)"1.0"); + root = xmlNewDocNode (model->state, NULL, (const guchar *)"tree-state", NULL); xmlDocSetRootElement (model->state, root); - node = xmlNewChild (root, NULL, (const unsigned char *)"node", NULL); - xmlSetProp (node, (const unsigned char *)"name", (const unsigned char *)"local"); - xmlSetProp (node, (const unsigned char *)"expand", (const unsigned char *)"true"); + node = xmlNewChild (root, NULL, (const guchar *)"node", NULL); + xmlSetProp (node, (const guchar *)"name", (const guchar *)"local"); + xmlSetProp (node, (const guchar *)"expand", (const guchar *)"true"); - node = xmlNewChild (root, NULL, (const unsigned char *)"node", NULL); - xmlSetProp (node, (const unsigned char *)"name", (const unsigned char *)"vfolder"); - xmlSetProp (node, (const unsigned char *)"expand", (const unsigned char *)"true"); + node = xmlNewChild (root, NULL, (const guchar *)"node", NULL); + xmlSetProp (node, (const guchar *)"name", (const guchar *)"vfolder"); + xmlSetProp (node, (const guchar *)"expand", (const guchar *)"true"); } EMFolderTreeModel * -em_folder_tree_model_new (const char *evolution_dir) +em_folder_tree_model_new (const gchar *evolution_dir) { EMFolderTreeModel *model; - char *filename; + gchar *filename; model = g_object_new (EM_TYPE_FOLDER_TREE_MODEL, NULL); gtk_tree_store_set_column_types ((GtkTreeStore *) model, NUM_COLUMNS, col_types); @@ -395,7 +395,7 @@ account_changed (EAccountList *accounts, EAccount *account, gpointer user_data) CamelProvider *provider; CamelStore *store; CamelException ex; - char *uri; + gchar *uri; if (!(si = g_hash_table_lookup (model->account_hash, account))) return; @@ -440,17 +440,17 @@ account_removed (EAccountList *accounts, EAccount *account, gpointer user_data) void em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *iter, struct _EMFolderTreeModelStoreInfo *si, - CamelFolderInfo *fi, int fully_loaded) + CamelFolderInfo *fi, gint fully_loaded) { GtkTreeRowReference *uri_row, *path_row; GtkTreeStore *tree_store; - unsigned int unread; + guint unread; GtkTreePath *path; GtkTreeIter sub; gboolean load = FALSE; struct _CamelFolder *folder; gboolean emitted = FALSE; - const char *name; + const gchar *name; const gchar *icon_name; guint32 flags; @@ -477,10 +477,10 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite unread = fi->unread; if (mail_note_get_folder_from_uri(fi->uri, &folder) && folder) { if (folder == mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_OUTBOX)) { - int total; + gint total; if ((total = camel_folder_get_message_count (folder)) > 0) { - int deleted = camel_folder_get_deleted_message_count (folder); + gint deleted = camel_folder_get_deleted_message_count (folder); if (deleted != -1) total -= deleted; @@ -489,10 +489,10 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite unread = total > 0 ? total : 0; } if (folder == mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_DRAFTS)) { - int total; + gint total; if ((total = camel_folder_get_message_count (folder)) > 0) { - int deleted = camel_folder_get_deleted_message_count (folder); + gint deleted = camel_folder_get_deleted_message_count (folder); if (deleted != -1) total -= deleted; @@ -599,7 +599,7 @@ folder_subscribed (CamelStore *store, CamelFolderInfo *fi, EMFolderTreeModel *mo GtkTreeIter parent, iter; GtkTreePath *path; gboolean load; - char *dirname, *p; + gchar *dirname, *p; if (!(si = g_hash_table_lookup (model->store_hash, store))) goto done; @@ -653,7 +653,7 @@ folder_subscribed (CamelStore *store, CamelFolderInfo *fi, EMFolderTreeModel *mo } static void -folder_subscribed_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model) +folder_subscribed_cb (CamelStore *store, gpointer event_data, EMFolderTreeModel *model) { CamelFolderInfo *fi; @@ -691,7 +691,7 @@ folder_unsubscribed (CamelStore *store, CamelFolderInfo *fi, EMFolderTreeModel * } static void -folder_unsubscribed_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model) +folder_unsubscribed_cb (CamelStore *store, gpointer event_data, EMFolderTreeModel *model) { CamelFolderInfo *fi; @@ -701,7 +701,7 @@ folder_unsubscribed_cb (CamelStore *store, void *event_data, EMFolderTreeModel * } static void -folder_created_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model) +folder_created_cb (CamelStore *store, gpointer event_data, EMFolderTreeModel *model) { CamelFolderInfo *fi; @@ -715,7 +715,7 @@ folder_created_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model } static void -folder_deleted_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model) +folder_deleted_cb (CamelStore *store, gpointer event_data, EMFolderTreeModel *model) { CamelFolderInfo *fi; @@ -735,7 +735,7 @@ folder_renamed (CamelStore *store, CamelRenameInfo *info, EMFolderTreeModel *mod GtkTreeRowReference *row; GtkTreeIter root, iter; GtkTreePath *path; - char *parent, *p; + gchar *parent, *p; if (!(si = g_hash_table_lookup (model->store_hash, store))) goto done; @@ -793,7 +793,7 @@ folder_renamed (CamelStore *store, CamelRenameInfo *info, EMFolderTreeModel *mod } static void -folder_renamed_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model) +folder_renamed_cb (CamelStore *store, gpointer event_data, EMFolderTreeModel *model) { CamelRenameInfo *rinfo, *info = event_data; @@ -807,14 +807,14 @@ folder_renamed_cb (CamelStore *store, void *event_data, EMFolderTreeModel *model } void -em_folder_tree_model_add_store (EMFolderTreeModel *model, CamelStore *store, const char *display_name) +em_folder_tree_model_add_store (EMFolderTreeModel *model, CamelStore *store, const gchar *display_name) { struct _EMFolderTreeModelStoreInfo *si; GtkTreeRowReference *row; GtkTreeIter root, iter; GtkTreePath *path; EAccount *account; - char *uri; + gchar *uri; g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model)); g_return_if_fail (CAMEL_IS_STORE (store)); @@ -881,7 +881,7 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model, CamelStore *store, con } static void -em_folder_tree_model_remove_uri (EMFolderTreeModel *model, const char *uri) +em_folder_tree_model_remove_uri (EMFolderTreeModel *model, const gchar *uri) { g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model)); g_return_if_fail (uri != NULL); @@ -910,7 +910,7 @@ em_folder_tree_model_remove_store_info (EMFolderTreeModel *model, CamelStore *st void em_folder_tree_model_remove_folders (EMFolderTreeModel *model, struct _EMFolderTreeModelStoreInfo *si, GtkTreeIter *toplevel) { - char *uri, *full_name; + gchar *uri, *full_name; gboolean is_store, go; GtkTreeIter iter; @@ -967,15 +967,15 @@ em_folder_tree_model_remove_store (EMFolderTreeModel *model, CamelStore *store) static xmlNodePtr -find_xml_node (xmlNodePtr root, const char *name) +find_xml_node (xmlNodePtr root, const gchar *name) { xmlNodePtr node; - char *nname; + gchar *nname; node = root->children; while (node != NULL) { - if (!strcmp ((char *)node->name, "node")) { - nname = (char *)xmlGetProp (node, (const unsigned char *)"name"); + if (!strcmp ((gchar *)node->name, "node")) { + nname = (gchar *)xmlGetProp (node, (const guchar *)"name"); if (nname && !strcmp (nname, name)) { xmlFree (nname); return node; @@ -991,18 +991,18 @@ find_xml_node (xmlNodePtr root, const char *name) } gboolean -em_folder_tree_model_get_expanded (EMFolderTreeModel *model, const char *key) +em_folder_tree_model_get_expanded (EMFolderTreeModel *model, const gchar *key) { xmlNodePtr node; - const char *name; - char *buf, *p; + const gchar *name; + gchar *buf, *p; /* This code needs to be rewritten. First it doesn't belong on the model Second, it shouldn't use an xml tree to store a bit table in memory! */ node = model->state ? model->state->children : NULL; - if (!node || strcmp ((char *)node->name, "tree-state") != 0) + if (!node || strcmp ((gchar *)node->name, "tree-state") != 0) return FALSE; name = buf = g_alloca (strlen (key) + 1); @@ -1018,8 +1018,8 @@ em_folder_tree_model_get_expanded (EMFolderTreeModel *model, const char *key) if ((node = find_xml_node (node, name))) { gboolean expanded; - buf = (char *)xmlGetProp (node, (const unsigned char *)"expand"); - expanded = buf && !strcmp ((char *)buf, "true"); + buf = (gchar *)xmlGetProp (node, (const guchar *)"expand"); + expanded = buf && !strcmp ((gchar *)buf, "true"); xmlFree (buf); if (!expanded || p == NULL) @@ -1034,17 +1034,17 @@ em_folder_tree_model_get_expanded (EMFolderTreeModel *model, const char *key) void -em_folder_tree_model_set_expanded (EMFolderTreeModel *model, const char *key, gboolean expanded) +em_folder_tree_model_set_expanded (EMFolderTreeModel *model, const gchar *key, gboolean expanded) { xmlNodePtr node, parent; - const char *name; - char *buf, *p; + const gchar *name; + gchar *buf, *p; if (model->state == NULL) - model->state = xmlNewDoc ((const unsigned char *)"1.0"); + model->state = xmlNewDoc ((const guchar *)"1.0"); if (!model->state->children) { - node = xmlNewDocNode (model->state, NULL, (const unsigned char *)"tree-state", NULL); + node = xmlNewDocNode (model->state, NULL, (const guchar *)"tree-state", NULL); xmlDocSetRootElement (model->state, node); } else { node = model->state->children; @@ -1068,11 +1068,11 @@ em_folder_tree_model_set_expanded (EMFolderTreeModel *model, const char *key, gb } /* node (or parent node) doesn't exist, need to add it */ - node = xmlNewChild (parent, NULL, (const unsigned char *)"node", NULL); - xmlSetProp (node, (const unsigned char *)"name", (unsigned char *)name); + node = xmlNewChild (parent, NULL, (const guchar *)"node", NULL); + xmlSetProp (node, (const guchar *)"name", (guchar *)name); } - xmlSetProp (node, (const unsigned char *)"expand", (const unsigned char *)(expanded || p ? "true" : "false")); + xmlSetProp (node, (const guchar *)"expand", (const guchar *)(expanded || p ? "true" : "false")); name = p ? p + 1 : NULL; } while (name); @@ -1085,7 +1085,7 @@ em_folder_tree_model_set_expanded (EMFolderTreeModel *model, const char *key, gb * @return Key of the uri or NULL, if failed. Returned value should be clear by g_free. **/ static gchar * -emftm_uri_to_key (const char *uri) +emftm_uri_to_key (const gchar *uri) { CamelException ex = { 0 }; CamelStore *store; @@ -1103,7 +1103,7 @@ emftm_uri_to_key (const char *uri) if (store == NULL || url == NULL) { key = NULL; } else { - const char *path; + const gchar *path; EAccount *account; if (((CamelService *)store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) @@ -1136,7 +1136,7 @@ emftm_uri_to_key (const char *uri) * Same as @ref em_folder_tree_model_get_expanded, but here we use uri, not key for node. **/ gboolean -em_folder_tree_model_get_expanded_uri (EMFolderTreeModel *model, const char *uri) +em_folder_tree_model_get_expanded_uri (EMFolderTreeModel *model, const gchar *uri) { gchar *key; gboolean expanded; @@ -1157,7 +1157,7 @@ em_folder_tree_model_get_expanded_uri (EMFolderTreeModel *model, const char *uri * Same as @ref em_folder_tree_model_set_expanded, but here we use uri, not key for node. **/ void -em_folder_tree_model_set_expanded_uri (EMFolderTreeModel *model, const char *uri, gboolean expanded) +em_folder_tree_model_set_expanded_uri (EMFolderTreeModel *model, const gchar *uri, gboolean expanded) { gchar *key; @@ -1174,7 +1174,7 @@ em_folder_tree_model_set_expanded_uri (EMFolderTreeModel *model, const char *uri void em_folder_tree_model_save_state (EMFolderTreeModel *model) { - char *dirname; + gchar *dirname; if (model->state == NULL) return; @@ -1192,17 +1192,17 @@ em_folder_tree_model_save_state (EMFolderTreeModel *model) static void -expand_foreach_r (EMFolderTreeModel *model, xmlNodePtr parent, const char *dirname, EMFTModelExpandFunc func, void *user_data) +expand_foreach_r (EMFolderTreeModel *model, xmlNodePtr parent, const gchar *dirname, EMFTModelExpandFunc func, gpointer user_data) { xmlNodePtr node = parent->children; - char *path, *name, *expand; + gchar *path, *name, *expand; while (node != NULL) { - if (!strcmp ((char *)node->name, "node")) { - name = (char *)xmlGetProp (node, (const unsigned char *)"name"); - expand = (char *)xmlGetProp (node, (const unsigned char *)"expand"); + if (!strcmp ((gchar *)node->name, "node")) { + name = (gchar *)xmlGetProp (node, (const guchar *)"name"); + expand = (gchar *)xmlGetProp (node, (const guchar *)"expand"); - if (expand && name && !strcmp ((char *)expand, "true")) { + if (expand && name && !strcmp ((gchar *)expand, "true")) { if (dirname) path = g_strdup_printf ("%s/%s", dirname, name); else @@ -1223,19 +1223,19 @@ expand_foreach_r (EMFolderTreeModel *model, xmlNodePtr parent, const char *dirna } void -em_folder_tree_model_expand_foreach (EMFolderTreeModel *model, EMFTModelExpandFunc func, void *user_data) +em_folder_tree_model_expand_foreach (EMFolderTreeModel *model, EMFTModelExpandFunc func, gpointer user_data) { xmlNodePtr root; root = model->state ? model->state->children : NULL; - if (!root || !root->children || strcmp ((char *)root->name, "tree-state") != 0) + if (!root || !root->children || strcmp ((gchar *)root->name, "tree-state") != 0) return; expand_foreach_r (model, root, NULL, func, user_data); } gboolean -em_folder_tree_model_is_type_inbox (EMFolderTreeModel *model, CamelStore *store, const char *full) +em_folder_tree_model_is_type_inbox (EMFolderTreeModel *model, CamelStore *store, const gchar *full) { struct _EMFolderTreeModelStoreInfo *si; GtkTreeRowReference *row; @@ -1275,14 +1275,14 @@ em_folder_tree_model_is_type_inbox (EMFolderTreeModel *model, CamelStore *store, return FALSE; } -char * -em_folder_tree_model_get_folder_name (EMFolderTreeModel *model, CamelStore *store, const char *full) +gchar * +em_folder_tree_model_get_folder_name (EMFolderTreeModel *model, CamelStore *store, const gchar *full) { struct _EMFolderTreeModelStoreInfo *si; GtkTreeRowReference *row; GtkTreePath *tree_path; GtkTreeIter iter; - char *name = NULL; + gchar *name = NULL; g_return_val_if_fail (EM_IS_FOLDER_TREE_MODEL (model), FALSE); g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE); @@ -1312,7 +1312,7 @@ em_folder_tree_model_get_folder_name (EMFolderTreeModel *model, CamelStore *stor } void -em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *store, const char *full, int unread) +em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *store, const gchar *full, gint unread) { struct _EMFolderTreeModelStoreInfo *si; GtkTreeRowReference *row; @@ -1353,19 +1353,19 @@ em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *sto } -char * +gchar * em_folder_tree_model_get_selected (EMFolderTreeModel *model) { xmlNodePtr node; - char *buf, *uri; + gchar *buf, *uri; node = model->state ? model->state->children : NULL; - if (!node || strcmp ((char *)node->name, "tree-state") != 0) + if (!node || strcmp ((gchar *)node->name, "tree-state") != 0) return NULL; node = node->children; while (node != NULL) { - if (!strcmp ((char *)node->name, "selected")) + if (!strcmp ((gchar *)node->name, "selected")) break; node = node->next; } @@ -1373,7 +1373,7 @@ em_folder_tree_model_get_selected (EMFolderTreeModel *model) if (node == NULL) return NULL; - buf = (char *)xmlGetProp (node, (unsigned char *)"uri"); + buf = (gchar *)xmlGetProp (node, (guchar *)"uri"); uri = g_strdup (buf); xmlFree (buf); @@ -1386,15 +1386,15 @@ em_folder_tree_model_get_selected (EMFolderTreeModel *model) void -em_folder_tree_model_set_selected (EMFolderTreeModel *model, const char *uri) +em_folder_tree_model_set_selected (EMFolderTreeModel *model, const gchar *uri) { xmlNodePtr root, node; if (model->state == NULL) - model->state = xmlNewDoc ((unsigned char *)"1.0"); + model->state = xmlNewDoc ((guchar *)"1.0"); if (!model->state->children) { - root = xmlNewDocNode (model->state, NULL, (const unsigned char *)"tree-state", NULL); + root = xmlNewDocNode (model->state, NULL, (const guchar *)"tree-state", NULL); xmlDocSetRootElement (model->state, root); } else { root = model->state->children; @@ -1402,13 +1402,13 @@ em_folder_tree_model_set_selected (EMFolderTreeModel *model, const char *uri) node = root->children; while (node != NULL) { - if (!strcmp ((char *)node->name, "selected")) + if (!strcmp ((gchar *)node->name, "selected")) break; node = node->next; } if (node == NULL) - node = xmlNewChild (root, NULL, (const unsigned char *)"selected", NULL); + node = xmlNewChild (root, NULL, (const guchar *)"selected", NULL); - xmlSetProp (node, (const unsigned char *)"uri", (unsigned char *)uri); + xmlSetProp (node, (const guchar *)"uri", (guchar *)uri); } diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h index 706e3895b3..3748da79a0 100644 --- a/mail/em-folder-tree-model.h +++ b/mail/em-folder-tree-model.h @@ -71,19 +71,19 @@ struct _EMFolderTreeModelStoreInfo { GHashTable *full_hash; /* maps CamelFolderInfo::full_name's to GtkTreeRowReferences */ EAccount *account; - char *display_name; + gchar *display_name; - unsigned int created_id; - unsigned int deleted_id; - unsigned int renamed_id; - unsigned int subscribed_id; - unsigned int unsubscribed_id; + guint created_id; + guint deleted_id; + guint renamed_id; + guint subscribed_id; + guint unsubscribed_id; }; struct _EMFolderTreeModel { GtkTreeStore parent_object; - char *filename; /* state filename */ + gchar *filename; /* state filename */ xmlDocPtr state; /* saved expanded state from previous session */ GHashTable *store_hash; /* maps CamelStore's to store-info's */ @@ -108,46 +108,46 @@ struct _EMFolderTreeModelClass { GtkTreeIter *iter); void (* folder_added) (EMFolderTreeModel *model, - const char *path, - const char *uri); + const gchar *path, + const gchar *uri); void (* store_added) (EMFolderTreeModel *model, - const char *uri); + const gchar *uri); }; GType em_folder_tree_model_get_type (void); -EMFolderTreeModel *em_folder_tree_model_new (const char *evolution_dir); +EMFolderTreeModel *em_folder_tree_model_new (const gchar *evolution_dir); void em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *iter, struct _EMFolderTreeModelStoreInfo *si, - CamelFolderInfo *fi, int fully_loaded); + CamelFolderInfo *fi, gint fully_loaded); -void em_folder_tree_model_add_store (EMFolderTreeModel *model, CamelStore *store, const char *display_name); +void em_folder_tree_model_add_store (EMFolderTreeModel *model, CamelStore *store, const gchar *display_name); void em_folder_tree_model_remove_store (EMFolderTreeModel *model, CamelStore *store); void em_folder_tree_model_remove_folders (EMFolderTreeModel *model, struct _EMFolderTreeModelStoreInfo *si, GtkTreeIter *toplevel); -char *em_folder_tree_model_get_selected (EMFolderTreeModel *model); -void em_folder_tree_model_set_selected (EMFolderTreeModel *model, const char *uri); +gchar *em_folder_tree_model_get_selected (EMFolderTreeModel *model); +void em_folder_tree_model_set_selected (EMFolderTreeModel *model, const gchar *uri); -gboolean em_folder_tree_model_get_expanded (EMFolderTreeModel *model, const char *key); -void em_folder_tree_model_set_expanded (EMFolderTreeModel *model, const char *key, gboolean expanded); +gboolean em_folder_tree_model_get_expanded (EMFolderTreeModel *model, const gchar *key); +void em_folder_tree_model_set_expanded (EMFolderTreeModel *model, const gchar *key, gboolean expanded); -gboolean em_folder_tree_model_get_expanded_uri (EMFolderTreeModel *model, const char *uri); -void em_folder_tree_model_set_expanded_uri (EMFolderTreeModel *model, const char *uri, gboolean expanded); +gboolean em_folder_tree_model_get_expanded_uri (EMFolderTreeModel *model, const gchar *uri); +void em_folder_tree_model_set_expanded_uri (EMFolderTreeModel *model, const gchar *uri, gboolean expanded); void em_folder_tree_model_save_state (EMFolderTreeModel *model); -typedef void (* EMFTModelExpandFunc) (EMFolderTreeModel *model, const char *path, void *user_data); -void em_folder_tree_model_expand_foreach (EMFolderTreeModel *model, EMFTModelExpandFunc func, void *user_data); +typedef void (* EMFTModelExpandFunc) (EMFolderTreeModel *model, const gchar *path, gpointer user_data); +void em_folder_tree_model_expand_foreach (EMFolderTreeModel *model, EMFTModelExpandFunc func, gpointer user_data); -void em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *store, const char *path, int unread); -gboolean em_folder_tree_model_is_type_inbox (EMFolderTreeModel *model, CamelStore *store, const char *full); -char * em_folder_tree_model_get_folder_name (EMFolderTreeModel *model, CamelStore *store, const char *full); +void em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *store, const gchar *path, gint unread); +gboolean em_folder_tree_model_is_type_inbox (EMFolderTreeModel *model, CamelStore *store, const gchar *full); +gchar * em_folder_tree_model_get_folder_name (EMFolderTreeModel *model, CamelStore *store, const gchar *full); #ifdef __cplusplus } diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 77e62dfbcf..3d1a8564f2 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -76,10 +76,10 @@ #define d(x) struct _selected_uri { - char *key; /* store:path or account/path */ - char *uri; + gchar *key; /* store:path or account/path */ + gchar *uri; CamelStore *store; - char *path; + gchar *path; }; struct _EMFolderTreePrivate { @@ -90,8 +90,8 @@ struct _EMFolderTreePrivate { GHashTable *select_uris_table; /*Removed as they're encountered, so use this to find uri's not presnet but selected */ guint32 excluded; - gboolean (*excluded_func)(EMFolderTree *emft, GtkTreeModel *model, GtkTreeIter *iter, void *data); - void *excluded_data; + gboolean (*excluded_func)(EMFolderTree *emft, GtkTreeModel *model, GtkTreeIter *iter, gpointer data); + gpointer excluded_data; guint do_multiselect:1; /* multiple select mode */ guint cursor_set:1; /* set to TRUE means we or something @@ -244,7 +244,7 @@ em_folder_tree_class_init (EMFolderTreeClass *klass) static gboolean subdirs_contain_unread (GtkTreeModel *model, GtkTreeIter *root) { - unsigned int unread; + guint unread; GtkTreeIter iter; if (!gtk_tree_model_iter_children (model, &iter, root)) @@ -268,9 +268,9 @@ render_display_name (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) { gboolean is_store, bold; - unsigned int unread; - char *display; - char *name; + guint unread; + gchar *display; + gchar *name; gtk_tree_model_get (model, iter, COL_STRING_DISPLAY_NAME, &name, COL_BOOL_IS_STORE, &is_store, @@ -335,7 +335,7 @@ emft_select_func(GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath * } static void -emft_free_select_uri(void *v, void *data) +emft_free_select_uri(gpointer v, gpointer data) { struct _selected_uri *u = v; @@ -522,11 +522,11 @@ emft_select_uri(EMFolderTree *emft, GtkTreePath *path, struct _selected_uri *u) gtk_tree_view_scroll_to_cell (priv->treeview, path, NULL, TRUE, 0.8f, 0.0f); g_hash_table_remove(priv->select_uris_table, u->key); priv->select_uris = g_slist_remove(priv->select_uris, u); - emft_free_select_uri((void *)u, NULL); + emft_free_select_uri((gpointer)u, NULL); } static void -emft_expand_node (EMFolderTreeModel *model, const char *key, EMFolderTree *emft) +emft_expand_node (EMFolderTreeModel *model, const gchar *key, EMFolderTree *emft) { struct _EMFolderTreePrivate *priv = emft->priv; struct _EMFolderTreeModelStoreInfo *si; @@ -534,8 +534,8 @@ emft_expand_node (EMFolderTreeModel *model, const char *key, EMFolderTree *emft) GtkTreePath *path; EAccount *account; CamelStore *store; - const char *p; - char *uid; + const gchar *p; + gchar *uid; size_t n; struct _selected_uri *u; @@ -602,8 +602,8 @@ emft_maybe_expand_row (EMFolderTreeModel *model, GtkTreePath *tree_path, GtkTree gboolean is_store; CamelStore *store; EAccount *account; - char *full_name; - char *key; + gchar *full_name; + gchar *key; struct _selected_uri *u; gboolean is_expanded; @@ -631,7 +631,7 @@ emft_maybe_expand_row (EMFolderTreeModel *model, GtkTreePath *tree_path, GtkTree gtk_tree_view_expand_to_path (priv->treeview, tree_path); gtk_tree_view_expand_row (priv->treeview, tree_path, FALSE); } else { - char *c = strrchr (key, '/'); + gchar *c = strrchr (key, '/'); *c = '\0'; emft_expand_node (model, key, emft); @@ -690,7 +690,7 @@ static void tree_drag_data_delete(GtkWidget *widget, GdkDragContext *context, EMFolderTree *emft) { struct _EMFolderTreePrivate *priv = emft->priv; - char *full_name = NULL; + gchar *full_name = NULL; GtkTreePath *src_path; gboolean is_store; CamelStore *store; @@ -724,7 +724,7 @@ static void tree_drag_data_get(GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection, guint info, guint time, EMFolderTree *emft) { struct _EMFolderTreePrivate *priv = emft->priv; - char *full_name = NULL, *uri = NULL; + gchar *full_name = NULL, *uri = NULL; GtkTreePath *src_path; CamelFolder *folder; CamelStore *store; @@ -751,7 +751,7 @@ tree_drag_data_get(GtkWidget *widget, GdkDragContext *context, GtkSelectionData switch (info) { case DND_DRAG_TYPE_FOLDER: /* dragging to a new location in the folder tree */ - gtk_selection_data_set(selection, drag_atoms[info], 8, (unsigned char *)uri, strlen (uri) + 1); + gtk_selection_data_set(selection, drag_atoms[info], 8, (guchar *)uri, strlen (uri) + 1); break; case DND_DRAG_TYPE_TEXT_URI_LIST: /* dragging to nautilus or something, probably */ @@ -787,13 +787,13 @@ struct _DragDataReceivedAsync { GtkSelectionData *selection; CamelStore *store; - char *full_name; + gchar *full_name; guint32 action; guint info; - unsigned int move:1; - unsigned int moved:1; - unsigned int aborted:1; + guint move:1; + guint moved:1; + guint aborted:1; }; static void @@ -803,7 +803,7 @@ emft_drop_folder(struct _DragDataReceivedAsync *m) d(printf(" * Drop folder '%s' onto '%s'\n", m->selection->data, m->full_name)); - if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->base.ex))) + if (!(src = mail_tool_uri_to_folder((gchar *)m->selection->data, 0, &m->base.ex))) return; em_folder_utils_copy_folders(src->parent_store, src->full_name, m->store, m->full_name?m->full_name:"", m->move); @@ -814,10 +814,10 @@ static gchar * emft_drop_async__desc (struct _DragDataReceivedAsync *m) { CamelURL *url; - char *buf; + gchar *buf; if (m->info == DND_DROP_TYPE_FOLDER) { - url = camel_url_new ((char *)m->selection->data, NULL); + url = camel_url_new ((gchar *)m->selection->data, NULL); if (m->move) buf = g_strdup_printf (_("Moving folder %s"), url->fragment ? url->fragment : url->path + 1); @@ -896,7 +896,7 @@ tree_drag_data_action(struct _DragDataReceivedAsync *m) } static void -emft_drop_popup_copy(EPopup *ep, EPopupItem *item, void *data) +emft_drop_popup_copy(EPopup *ep, EPopupItem *item, gpointer data) { struct _DragDataReceivedAsync *m = data; @@ -905,7 +905,7 @@ emft_drop_popup_copy(EPopup *ep, EPopupItem *item, void *data) } static void -emft_drop_popup_move(EPopup *ep, EPopupItem *item, void *data) +emft_drop_popup_move(EPopup *ep, EPopupItem *item, gpointer data) { struct _DragDataReceivedAsync *m = data; @@ -914,7 +914,7 @@ emft_drop_popup_move(EPopup *ep, EPopupItem *item, void *data) } static void -emft_drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data) +emft_drop_popup_cancel(EPopup *ep, EPopupItem *item, gpointer data) { struct _DragDataReceivedAsync *m = data; @@ -932,13 +932,13 @@ static EPopupItem emft_drop_popup_menu[] = { }; static void -emft_drop_popup_free(EPopup *ep, GSList *items, void *data) +emft_drop_popup_free(EPopup *ep, GSList *items, gpointer data) { g_slist_free(items); } static void -tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, int x, int y, GtkSelectionData *selection, guint info, guint time, EMFolderTree *emft) +tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, gint x, gint y, GtkSelectionData *selection, guint info, guint time, EMFolderTree *emft) { struct _EMFolderTreePrivate *priv = emft->priv; GtkTreeViewDropPosition pos; @@ -947,8 +947,8 @@ tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, int x, int y gboolean is_store; CamelStore *store; GtkTreeIter iter; - char *full_name; - int i; + gchar *full_name; + gint i; if (!gtk_tree_view_get_dest_row_at_pos (priv->treeview, x, y, &dest_path, &pos)) return; @@ -992,7 +992,7 @@ tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, int x, int y if (context->action == GDK_ACTION_ASK) { EMPopup *emp; - int mask; + gint mask; GSList *menus = NULL; GtkMenu *menu; @@ -1017,7 +1017,7 @@ tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, int x, int y } static gboolean -is_special_local_folder (const char *name) +is_special_local_folder (const gchar *name) { return (!strcmp (name, "Drafts") || !strcmp (name, "Inbox") || !strcmp (name, "Outbox") || !strcmp (name, "Sent") || !strcmp (name, "Templates")); } @@ -1026,7 +1026,7 @@ static GdkAtom emft_drop_target(EMFolderTree *emft, GdkDragContext *context, GtkTreePath *path) { struct _EMFolderTreePrivate *p = emft->priv; - char *full_name = NULL, *uri = NULL, *src_uri = NULL; + gchar *full_name = NULL, *uri = NULL, *src_uri = NULL; CamelStore *local, *sstore, *dstore; GdkAtom atom = GDK_NONE; gboolean is_store; @@ -1109,7 +1109,7 @@ emft_drop_target(EMFolderTree *emft, GdkDragContext *context, GtkTreePath *path) /* Check for special sources, and vfolder stuff */ if (src_uri) { CamelURL *url; - char *url_path; + gchar *url_path; /* FIXME: this is a total hack, but i think all we can do at present */ /* Check for dragging from special folders which can't be moved/copied */ @@ -1196,7 +1196,7 @@ emft_drop_target(EMFolderTree *emft, GdkDragContext *context, GtkTreePath *path) targets = targets->next; } } else { - int i; + gint i; while (targets != NULL) { for (i = 0; i < NUM_DROP_TYPES; i++) { @@ -1219,11 +1219,11 @@ emft_drop_target(EMFolderTree *emft, GdkDragContext *context, GtkTreePath *path) } static gboolean -tree_drag_drop (GtkWidget *widget, GdkDragContext *context, int x, int y, guint time, EMFolderTree *emft) +tree_drag_drop (GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint time, EMFolderTree *emft) { struct _EMFolderTreePrivate *priv = emft->priv; GtkTreeViewColumn *column; - int cell_x, cell_y; + gint cell_x, cell_y; GtkTreePath *path; GdkAtom target; @@ -1295,7 +1295,7 @@ tree_autoscroll (EMFolderTree *emft) GtkAdjustment *vadjustment; GdkRectangle rect; GdkWindow *window; - int offset, y; + gint offset, y; float value; /* get the y pointer position relative to the treeview */ @@ -1337,7 +1337,7 @@ tree_autoexpand (EMFolderTree *emft) } static gboolean -tree_drag_motion (GtkWidget *widget, GdkDragContext *context, int x, int y, guint time, EMFolderTree *emft) +tree_drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint time, EMFolderTree *emft) { struct _EMFolderTreePrivate *priv = emft->priv; GtkTreeModel *model = (GtkTreeModel *) priv->model; @@ -1346,7 +1346,7 @@ tree_drag_motion (GtkWidget *widget, GdkDragContext *context, int x, int y, guin GtkTreePath *path; GtkTreeIter iter; GdkAtom target; - int i; + gint i; if (!gtk_tree_view_get_dest_row_at_pos(priv->treeview, x, y, &path, &pos)) return FALSE; @@ -1415,8 +1415,8 @@ void em_folder_tree_enable_drag_and_drop (EMFolderTree *emft) { struct _EMFolderTreePrivate *priv; - static int setup = 0; - int i; + static gint setup = 0; + gint i; g_return_if_fail (EM_IS_FOLDER_TREE (emft)); @@ -1458,7 +1458,7 @@ void em_folder_tree_set_excluded(EMFolderTree *emft, guint32 flags) emft->priv->excluded = flags; } -void em_folder_tree_set_excluded_func(EMFolderTree *emft, EMFTExcludeFunc exclude, void *data) +void em_folder_tree_set_excluded_func(EMFolderTree *emft, EMFTExcludeFunc exclude, gpointer data) { emft->priv->excluded_func = exclude; emft->priv->excluded_data = data; @@ -1482,7 +1482,7 @@ em_folder_tree_get_selected_uris (EMFolderTree *emft) GtkTreePath *path = l->data; if (gtk_tree_model_get_iter(model, &iter, path)) { - char *uri; + gchar *uri; gtk_tree_model_get(model, &iter, COL_STRING_URI, &uri, -1); list = g_list_prepend (list, uri); @@ -1498,7 +1498,7 @@ static void get_selected_uris_path_iterate (GtkTreeModel *model, GtkTreePath *treepath, GtkTreeIter *iter, gpointer data) { GList **list = (GList **) data; - char *full_name; + gchar *full_name; gtk_tree_model_get (model, iter, COL_STRING_FULL_NAME, &full_name, -1); *list = g_list_append (*list, full_name); @@ -1532,7 +1532,7 @@ void em_folder_tree_set_selected_list (EMFolderTree *emft, GList *list, gboolean expand_only) { struct _EMFolderTreePrivate *priv = emft->priv; - int id = 0; + gint id = 0; /* FIXME: need to remove any currently selected stuff? */ if (!expand_only) @@ -1555,8 +1555,8 @@ em_folder_tree_set_selected_list (EMFolderTree *emft, GList *list, gboolean expa priv->select_uris = g_slist_append(priv->select_uris, u); } } else { - const char *path; - char *expand_key, *end; + const gchar *path; + gchar *expand_key, *end; EAccount *account; if (((CamelService *)u->store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) @@ -1600,9 +1600,9 @@ em_folder_tree_set_selected_list (EMFolderTree *emft, GList *list, gboolean expa #if 0 static void -dump_fi (CamelFolderInfo *fi, int depth) +dump_fi (CamelFolderInfo *fi, gint depth) { - int i; + gint i; while (fi != NULL) { for (i = 0; i < depth; i++) @@ -1626,7 +1626,7 @@ struct _EMFolderTreeGetFolderInfo { EMFolderTree *emft; CamelStore *store; guint32 flags; - char *top; + gchar *top; /* output data */ CamelFolderInfo *fi; @@ -1635,7 +1635,7 @@ struct _EMFolderTreeGetFolderInfo { static gchar * emft_get_folder_info__desc (struct _EMFolderTreeGetFolderInfo *m) { - char *ret, *name; + gchar *ret, *name; name = camel_service_get_name((CamelService *)m->store, TRUE); ret = g_strdup_printf(_("Scanning folders in \"%s\""), name); @@ -1728,7 +1728,7 @@ emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) return; } } else { - int fully_loaded = (m->flags & CAMEL_STORE_FOLDER_INFO_RECURSIVE) ? TRUE : FALSE; + gint fully_loaded = (m->flags & CAMEL_STORE_FOLDER_INFO_RECURSIVE) ? TRUE : FALSE; do { em_folder_tree_model_set_folder_info (priv->model, &iter, si, fi, fully_loaded); @@ -1768,8 +1768,8 @@ emft_update_model_expanded_state (struct _EMFolderTreePrivate *priv, GtkTreeIter gboolean is_store; CamelStore *store; EAccount *account; - char *full_name; - char *key; + gchar *full_name; + gchar *key; gtk_tree_model_get ((GtkTreeModel *) priv->model, iter, COL_STRING_FULL_NAME, &full_name, @@ -1800,7 +1800,7 @@ emft_tree_row_expanded (GtkTreeView *treeview, GtkTreeIter *root, GtkTreePath *t struct _EMFolderTreeGetFolderInfo *m; GtkTreeModel *model; CamelStore *store; - char *full_name; + gchar *full_name; gboolean load; model = gtk_tree_view_get_model (treeview); @@ -1859,7 +1859,7 @@ emft_tree_row_activated (GtkTreeView *treeview, GtkTreePath *tree_path, GtkTreeV { struct _EMFolderTreePrivate *priv = emft->priv; GtkTreeModel *model = (GtkTreeModel *) priv->model; - char *full_name, *uri; + gchar *full_name, *uri; GtkTreeIter iter; guint32 flags; @@ -1895,7 +1895,7 @@ emft_popup_open_new (GtkWidget *item, EMFolderTree *emft) #endif static void -emft_popup_copy(EPopup *ep, EPopupItem *item, void *data) +emft_popup_copy(EPopup *ep, EPopupItem *item, gpointer data) { EMFolderTree *emft = data; CamelFolderInfo *fi = NULL; @@ -1906,7 +1906,7 @@ emft_popup_copy(EPopup *ep, EPopupItem *item, void *data) } static void -emft_popup_move(EPopup *ep, EPopupItem *item, void *data) +emft_popup_move(EPopup *ep, EPopupItem *item, gpointer data) { EMFolderTree *emft = data; CamelFolderInfo *fi = NULL; @@ -1917,7 +1917,7 @@ emft_popup_move(EPopup *ep, EPopupItem *item, void *data) } static void -emft_popup_new_folder (EPopup *ep, EPopupItem *pitem, void *data) +emft_popup_new_folder (EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderTree *emft = data; CamelFolderInfo *fi; @@ -1955,7 +1955,7 @@ emft_selection_get_selected (GtkTreeSelection *selection, GtkTreeModel **model, } static void -emft_popup_delete_folder (EPopup *ep, EPopupItem *pitem, void *data) +emft_popup_delete_folder (EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderTree *emft = data; CamelFolder *folder; @@ -1966,7 +1966,7 @@ emft_popup_delete_folder (EPopup *ep, EPopupItem *pitem, void *data) } static void -emft_popup_rename_folder (EPopup *ep, EPopupItem *pitem, void *data) +emft_popup_rename_folder (EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderTree *emft = data; CamelFolder *folder; @@ -1977,7 +1977,7 @@ emft_popup_rename_folder (EPopup *ep, EPopupItem *pitem, void *data) } static void -emft_popup_refresh_folder (EPopup *ep, EPopupItem *pitem, void *data) +emft_popup_refresh_folder (EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderTree *emft = data; CamelFolder *folder; @@ -1987,26 +1987,26 @@ emft_popup_refresh_folder (EPopup *ep, EPopupItem *pitem, void *data) } static void -emft_popup_flush_outbox (EPopup *ep, EPopupItem *pitem, void *data) +emft_popup_flush_outbox (EPopup *ep, EPopupItem *pitem, gpointer data) { mail_send (); } static void -emft_popup_empty_trash (EPopup *ep, EPopupItem *pitem, void *data) +emft_popup_empty_trash (EPopup *ep, EPopupItem *pitem, gpointer data) { em_utils_empty_trash (data); } static void -emft_popup_properties (EPopup *ep, EPopupItem *pitem, void *data) +emft_popup_properties (EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderTree *emft = data; struct _EMFolderTreePrivate *priv = emft->priv; GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter; - char *uri; + gchar *uri; selection = gtk_tree_view_get_selection (priv->treeview); if (!emft_selection_get_selected (selection, &model, &iter)) @@ -2018,13 +2018,13 @@ emft_popup_properties (EPopup *ep, EPopupItem *pitem, void *data) } static void -emft_popup_uvfolder (EPopup *ep, EPopupItem *pitem, void *data) +emft_popup_uvfolder (EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderTree *emft = data; CamelFolder *folder; if ((folder = em_folder_tree_get_selected_folder (emft)) != NULL) { - char *meta = camel_object_meta_get(folder, "vfolder:unread"); + gchar *meta = camel_object_meta_get(folder, "vfolder:unread"); if (!meta || strcmp(meta, "false") == 0) camel_object_meta_set(folder, "vfolder:unread", "true"); else @@ -2063,7 +2063,7 @@ static EPopupItem emft_popup_items[] = { 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) +emft_popup_free(EPopup *ep, GSList *items, gpointer data) { g_slist_free(items); } @@ -2082,11 +2082,11 @@ emft_popup (EMFolderTree *emft, GdkEvent *event) guint32 flags = 0; guint32 folder_type_flags = 0; gboolean isstore; - char *uri, *full_name; + gchar *uri, *full_name; GtkMenu *menu; EMPopup *emp; CamelFolder *selfolder = NULL; - int i; + gint i; treeview = emft->priv->treeview; @@ -2154,7 +2154,7 @@ emft_popup (EMFolderTree *emft, GdkEvent *event) if (!isstore && strstr(uri, "vfolder")) { /* This is a vfolder, so lets add hacked up menu item. */ static EPopupItem *item = NULL; - char *meta = camel_object_meta_get (selfolder, "vfolder:unread"); + gchar *meta = camel_object_meta_get (selfolder, "vfolder:unread"); if (!item) item = g_malloc0(sizeof(*item)); @@ -2248,7 +2248,7 @@ emft_tree_user_event (GtkTreeView *treeview, GdkEvent *e, EMFolderTree *emft) static void emft_tree_selection_changed (GtkTreeSelection *selection, EMFolderTree *emft) { - char *full_name, *uri; + gchar *full_name, *uri; GtkTreeModel *model; GtkTreeIter iter; guint32 flags; @@ -2269,12 +2269,12 @@ emft_tree_selection_changed (GtkTreeSelection *selection, EMFolderTree *emft) } void -em_folder_tree_set_selected (EMFolderTree *emft, const char *uri, gboolean expand_only) +em_folder_tree_set_selected (EMFolderTree *emft, const gchar *uri, gboolean expand_only) { GList *l = NULL; if (uri && uri[0]) - l = g_list_append(l, (void *)uri); + l = g_list_append(l, (gpointer)uri); em_folder_tree_set_selected_list(emft, l, expand_only); g_list_free(l); @@ -2288,7 +2288,7 @@ em_folder_tree_select_next_path (EMFolderTree *emft, gboolean skip_read_folders) GtkTreeModel *model; GtkTreeIter iter, parent, child; GtkTreePath *current_path, *path = NULL; - unsigned int unread = 0; + guint unread = 0; struct _EMFolderTreePrivate *priv = emft->priv; g_return_if_fail (EM_IS_FOLDER_TREE (emft)); @@ -2352,7 +2352,7 @@ get_last_child (GtkTreeModel *model, GtkTreeIter *iter) return get_last_child (model, iter); } else if (has_child) { /* Pick the last one */ - int nchildren = gtk_tree_model_iter_n_children (model, iter); + gint nchildren = gtk_tree_model_iter_n_children (model, iter); gtk_tree_model_iter_nth_child ( model, child, iter, nchildren-1); return get_last_child (model, child); } @@ -2367,7 +2367,7 @@ em_folder_tree_select_prev_path (EMFolderTree *emft, gboolean skip_read_folders) GtkTreeModel *model; GtkTreeIter iter, child; GtkTreePath *path = NULL, *current_path = NULL; - unsigned int unread = 0; + guint unread = 0; struct _EMFolderTreePrivate *priv = emft->priv; g_return_if_fail (EM_IS_FOLDER_TREE (emft)); @@ -2391,7 +2391,7 @@ em_folder_tree_select_prev_path (EMFolderTree *emft, gboolean skip_read_folders) } else { gtk_tree_model_get_iter (model, &iter, path); if (gtk_tree_model_iter_has_child (model, &iter)) { - int nchildren = gtk_tree_model_iter_n_children (model, &iter); + gint nchildren = gtk_tree_model_iter_n_children (model, &iter); gtk_tree_model_iter_nth_child ( model, &child, &iter, nchildren-1); path = gtk_tree_model_get_path (model, &child); } @@ -2422,13 +2422,13 @@ em_folder_tree_select_prev_path (EMFolderTree *emft, gboolean skip_read_folders) } -char * +gchar * em_folder_tree_get_selected_uri (EMFolderTree *emft) { GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter; - char *uri = NULL; + gchar *uri = NULL; g_return_val_if_fail (EM_IS_FOLDER_TREE (emft), NULL); @@ -2439,13 +2439,13 @@ em_folder_tree_get_selected_uri (EMFolderTree *emft) return uri; } -char * +gchar * em_folder_tree_get_selected_path (EMFolderTree *emft) { GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter; - char *name = NULL; + gchar *name = NULL; g_return_val_if_fail (EM_IS_FOLDER_TREE (emft), NULL); @@ -2462,7 +2462,7 @@ em_folder_tree_get_selected_folder (EMFolderTree *emft) GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter; - char *full_name = NULL; + gchar *full_name = NULL; CamelException ex; CamelStore *store = NULL; CamelFolder *folder = NULL; @@ -2490,7 +2490,7 @@ em_folder_tree_get_selected_folder_info (EMFolderTree *emft) GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter; - char *full_name = NULL, *name = NULL, *uri = NULL; + gchar *full_name = NULL, *name = NULL, *uri = NULL; CamelException ex; CamelStore *store = NULL; CamelFolderInfo *fi = NULL; diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h index e76acf4df1..265616a00a 100644 --- a/mail/em-folder-tree.h +++ b/mail/em-folder-tree.h @@ -51,7 +51,7 @@ typedef struct _EMFolderTreeClass EMFolderTreeClass; #define EMFT_EXCLUDE_SYSTEM CAMEL_FOLDER_SYSTEM #define EMFT_EXCLUDE_VTRASH CAMEL_FOLDER_VTRASH -typedef gboolean (*EMFTExcludeFunc)(EMFolderTree *emft, GtkTreeModel *model, GtkTreeIter *iter, void *data); +typedef gboolean (*EMFTExcludeFunc)(EMFolderTree *emft, GtkTreeModel *model, GtkTreeIter *iter, gpointer data); struct _EMFolderTree { GtkVBox parent_object; @@ -63,8 +63,8 @@ struct _EMFolderTreeClass { GtkVBoxClass parent_class; /* signals */ - void (* folder_activated) (EMFolderTree *emft, const char *full_name, const char *uri); - void (* folder_selected) (EMFolderTree *emft, const char *full_name, const char *uri, guint32 flags); + void (* folder_activated) (EMFolderTree *emft, const gchar *full_name, const gchar *uri); + void (* folder_selected) (EMFolderTree *emft, const gchar *full_name, const gchar *uri, guint32 flags); }; GType em_folder_tree_get_type (void); @@ -76,24 +76,24 @@ void em_folder_tree_enable_drag_and_drop (EMFolderTree *emft); void em_folder_tree_set_multiselect (EMFolderTree *emft, gboolean mode); void em_folder_tree_set_excluded(EMFolderTree *emft, guint32 flags); -void em_folder_tree_set_excluded_func(EMFolderTree *emft, EMFTExcludeFunc exclude, void *data); +void em_folder_tree_set_excluded_func(EMFolderTree *emft, EMFTExcludeFunc exclude, gpointer data); void em_folder_tree_set_selected_list (EMFolderTree *emft, GList *list, gboolean expand_only); GList *em_folder_tree_get_selected_uris (EMFolderTree *emft); GList *em_folder_tree_get_selected_paths (EMFolderTree *emft); -void em_folder_tree_set_selected (EMFolderTree *emft, const char *uri, gboolean expand_only); +void em_folder_tree_set_selected (EMFolderTree *emft, const gchar *uri, gboolean expand_only); void em_folder_tree_select_next_path (EMFolderTree *emft, gboolean skip_read_folders); void em_folder_tree_select_prev_path (EMFolderTree *emft, gboolean skip_read_folders); -char *em_folder_tree_get_selected_uri (EMFolderTree *emft); -char *em_folder_tree_get_selected_path (EMFolderTree *emft); +gchar *em_folder_tree_get_selected_uri (EMFolderTree *emft); +gchar *em_folder_tree_get_selected_path (EMFolderTree *emft); CamelFolder *em_folder_tree_get_selected_folder (EMFolderTree *emft); CamelFolderInfo *em_folder_tree_get_selected_folder_info (EMFolderTree *emft); EMFolderTreeModel *em_folder_tree_get_model (EMFolderTree *emft); EMFolderTreeModelStoreInfo *em_folder_tree_get_model_storeinfo (EMFolderTree *emft, CamelStore *store); -gboolean em_folder_tree_create_folder (EMFolderTree *emft, const char *full_name, const char *uri); +gboolean em_folder_tree_create_folder (EMFolderTree *emft, const gchar *full_name, const gchar *uri); GtkWidget * em_folder_tree_get_tree_view (EMFolderTree *emft); void em_folder_tree_set_skip_double_click (EMFolderTree *emft, gboolean skip); diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index ad60516bb1..682ffc77c5 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -75,7 +75,7 @@ extern CamelSession *session; static gboolean -emfu_is_special_local_folder (const char *name) +emfu_is_special_local_folder (const gchar *name) { return (!strcmp (name, "Drafts") || !strcmp (name, "Inbox") || !strcmp (name, "Outbox") || !strcmp (name, "Sent") || !strcmp (name, "Templates")); } @@ -87,10 +87,10 @@ struct _EMCopyFolders { CamelStore *fromstore; CamelStore *tostore; - char *frombase; - char *tobase; + gchar *frombase; + gchar *tobase; - int delete; + gint delete; }; static gchar * @@ -106,8 +106,8 @@ emft_copy_folders__exec (struct _EMCopyFolders *m) GList *pending = NULL, *deleting = NULL, *l; GString *fromname, *toname; CamelFolderInfo *fi; - const char *tmp; - int fromlen; + const gchar *tmp; + gint fromlen; if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &m->base.ex))) return; @@ -132,7 +132,7 @@ emft_copy_folders__exec (struct _EMCopyFolders *m) while (info) { CamelFolder *fromfolder, *tofolder; GPtrArray *uids; - int deleted = 0; + gint deleted = 0; if (info->child) pending = g_list_append (pending, info->child); @@ -237,11 +237,11 @@ static MailMsgInfo copy_folders_info = { (MailMsgFreeFunc) emft_copy_folders__free }; -int -em_folder_utils_copy_folders(CamelStore *fromstore, const char *frombase, CamelStore *tostore, const char *tobase, int delete) +gint +em_folder_utils_copy_folders(CamelStore *fromstore, const gchar *frombase, CamelStore *tostore, const gchar *tobase, gint delete) { struct _EMCopyFolders *m; - int seq; + gint seq; m = mail_msg_new (©_folders_info); camel_object_ref (fromstore); @@ -264,7 +264,7 @@ struct _copy_folder_data { }; static void -emfu_copy_folder_selected (const char *uri, void *data) +emfu_copy_folder_selected (const gchar *uri, gpointer data) { struct _copy_folder_data *cfd = data; CamelStore *fromstore = NULL, *tostore = NULL; @@ -320,11 +320,11 @@ fail: /* tree here is the 'destination' selector, not 'self' */ static gboolean -emfu_copy_folder_exclude(EMFolderTree *tree, GtkTreeModel *model, GtkTreeIter *iter, void *data) +emfu_copy_folder_exclude(EMFolderTree *tree, GtkTreeModel *model, GtkTreeIter *iter, gpointer data) { struct _copy_folder_data *cfd = data; - int fromvfolder, tovfolder; - char *touri; + gint fromvfolder, tovfolder; + gchar *touri; guint flags; gboolean is_store; @@ -351,7 +351,7 @@ emfu_copy_folder_exclude(EMFolderTree *tree, GtkTreeModel *model, GtkTreeIter *i /* FIXME: this interface references the folderinfo without copying it */ /* FIXME: these functions must be documented */ void -em_folder_utils_copy_folder(CamelFolderInfo *folderinfo, int delete) +em_folder_utils_copy_folder(CamelFolderInfo *folderinfo, gint delete) { struct _copy_folder_data *cfd; @@ -365,7 +365,7 @@ em_folder_utils_copy_folder(CamelFolderInfo *folderinfo, int delete) } static void -emfu_delete_done (CamelFolder *folder, gboolean removed, CamelException *ex, void *data) +emfu_delete_done (CamelFolder *folder, gboolean removed, CamelException *ex, gpointer data) { GtkWidget *dialog = data; @@ -381,7 +381,7 @@ emfu_delete_done (CamelFolder *folder, gboolean removed, CamelException *ex, voi } static void -emfu_delete_response (GtkWidget *dialog, int response, gpointer data) +emfu_delete_response (GtkWidget *dialog, gint response, gpointer data) { if (response == GTK_RESPONSE_OK) { /* disable dialog until operation finishes */ @@ -399,7 +399,7 @@ em_folder_utils_delete_folder (CamelFolder *folder) { CamelStore *local; GtkWidget *dialog; - int flags = 0; + gint flags = 0; local = mail_component_peek_local_store (NULL); @@ -430,8 +430,8 @@ em_folder_utils_delete_folder (CamelFolder *folder) void em_folder_utils_rename_folder (CamelFolder *folder) { - char *prompt, *new_name; - const char *p; + gchar *prompt, *new_name; + const gchar *p; CamelStore *local; gboolean done = FALSE; size_t base_len; @@ -463,7 +463,7 @@ em_folder_utils_rename_folder (CamelFolder *folder) } else { CamelFolderInfo *fi; CamelException ex; - char *path, *tmp; + gchar *path, *tmp; if (base_len > 0) { path = g_malloc (base_len + strlen (new_name) + 2); @@ -481,7 +481,7 @@ em_folder_utils_rename_folder (CamelFolder *folder) e_error_run(NULL, "mail:no-rename-folder-exists", folder->name, new_name, NULL); } else { - const char *oldpath, *newpath; + const gchar *oldpath, *newpath; oldpath = folder->full_name; newpath = path; @@ -511,16 +511,16 @@ struct _EMCreateFolder { /* input data */ CamelStore *store; - char *full_name; - char *parent; - char *name; + gchar *full_name; + gchar *parent; + gchar *name; /* output data */ CamelFolderInfo *fi; /* callback data */ - void (* done) (CamelFolderInfo *fi, void *user_data); - void *user_data; + void (* done) (CamelFolderInfo *fi, gpointer user_data); + gpointer user_data; }; /* Temporary Structure to hold data to pass across function */ @@ -528,7 +528,7 @@ struct _EMCreateFolderTempData { EMFolderTree * emft; EMFolderSelector * emfs; - char *uri; + gchar *uri; }; static gchar * @@ -575,12 +575,12 @@ static MailMsgInfo create_folder_info = { static int -emfu_create_folder_real (CamelStore *store, const char *full_name, void (* done) (CamelFolderInfo *fi, void *user_data), void *user_data) +emfu_create_folder_real (CamelStore *store, const gchar *full_name, void (* done) (CamelFolderInfo *fi, gpointer user_data), gpointer user_data) { - char *name, *namebuf = NULL; + gchar *name, *namebuf = NULL; struct _EMCreateFolder *m; - const char *parent; - int id; + const gchar *parent; + gint id; namebuf = g_strdup (full_name); if (!(name = strrchr (namebuf, '/'))) { @@ -609,7 +609,7 @@ emfu_create_folder_real (CamelStore *store, const char *full_name, void (* done) } static void -new_folder_created_cb (CamelFolderInfo *fi, void *user_data) +new_folder_created_cb (CamelFolderInfo *fi, gpointer user_data) { struct _EMCreateFolderTempData *emcftd=user_data; if (fi){ @@ -625,10 +625,10 @@ new_folder_created_cb (CamelFolderInfo *fi, void *user_data) } static void -emfu_popup_new_folder_response (EMFolderSelector *emfs, int response, gpointer data) +emfu_popup_new_folder_response (EMFolderSelector *emfs, gint response, gpointer data) { EMFolderTreeModelStoreInfo *si; - const char *uri, *path; + const gchar *uri, *path; CamelException ex; CamelStore *store; struct _EMCreateFolderTempData *emcftd; diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h index c139a9e74c..d0c5e986c6 100644 --- a/mail/em-folder-utils.h +++ b/mail/em-folder-utils.h @@ -35,13 +35,13 @@ gint em_folder_utils_copy_folders (CamelStore *fromstore, const gchar *frombase, CamelStore *tostore, const gchar *tobase, - int delete); + gint delete); /* FIXME These API's are really busted. There is no consistency and * most rely on the wrong data. */ void em_folder_utils_copy_folder (CamelFolderInfo *folderinfo, - int delete); + gint delete); void em_folder_utils_delete_folder (CamelFolder *folder); void em_folder_utils_rename_folder (CamelFolder *folder); diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index d0f8289a15..5de430e34b 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -115,33 +115,33 @@ #include #endif -static void emfv_list_message_selected(MessageList *ml, const char *uid, EMFolderView *emfv); +static void emfv_list_message_selected(MessageList *ml, const gchar *uid, EMFolderView *emfv); static void emfv_list_built(MessageList *ml, EMFolderView *emfv); -static int emfv_list_right_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, EMFolderView *emfv); +static gint emfv_list_right_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, EMFolderView *emfv); static void emfv_list_double_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, EMFolderView *emfv); -static int emfv_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, EMFolderView *emfv); +static gint emfv_list_key_press(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *ev, EMFolderView *emfv); static void emfv_list_selection_change(ETree *tree, EMFolderView *emfv); -static void emfv_format_link_clicked(EMFormatHTMLDisplay *efhd, const char *uri, EMFolderView *); -static int emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const char *uri, CamelMimePart *part, EMFolderView *); +static void emfv_format_link_clicked(EMFormatHTMLDisplay *efhd, const gchar *uri, EMFolderView *); +static gint emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const gchar *uri, CamelMimePart *part, EMFolderView *); static void emfv_enable_menus(EMFolderView *emfv); -static void emfv_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri); -static void emfv_set_folder_uri(EMFolderView *emfv, const char *uri); -static void emfv_set_message(EMFolderView *emfv, const char *uid, int nomarkseen); -static void emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, int state); +static void emfv_set_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri); +static void emfv_set_folder_uri(EMFolderView *emfv, const gchar *uri); +static void emfv_set_message(EMFolderView *emfv, const gchar *uid, gint nomarkseen); +static void emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint state); -static void emfv_message_reply(EMFolderView *emfv, int mode); -static void vfolder_type_current (EMFolderView *emfv, int type); -static void filter_type_current (EMFolderView *emfv, int type); +static void emfv_message_reply(EMFolderView *emfv, gint mode); +static void vfolder_type_current (EMFolderView *emfv, gint type); +static void filter_type_current (EMFolderView *emfv, gint type); static void emfv_setting_setup(EMFolderView *emfv); -static void emfv_on_url_cb(GObject *emitter, const char *url, EMFolderView *emfv); -static void emfv_on_url(EMFolderView *emfv, const char *uri, const char *nice_uri); +static void emfv_on_url_cb(GObject *emitter, const gchar *url, EMFolderView *emfv); +static void emfv_on_url(EMFolderView *emfv, const gchar *uri, const gchar *nice_uri); -static void emfv_set_seen (EMFolderView *emfv, const char *uid); +static void emfv_set_seen (EMFolderView *emfv, const gchar *uid); static gboolean emfv_on_html_button_released_cb (GtkHTML *html, GdkEventButton *button, EMFolderView *emfv); static gboolean emfv_popup_menu (GtkWidget *widget); @@ -224,12 +224,12 @@ struct _EMFolderViewPrivate { guint destroyed:1; GtkWidget *invisible; - char *selection_uri; + gchar *selection_uri; GalViewInstance *view_instance; GalViewMenus *view_menus; - char *selected_uid; + gchar *selected_uid; }; static GtkVBoxClass *emfv_parent; @@ -276,7 +276,7 @@ emfv_init(GObject *o) emfv->ui_app_name = "evolution-mail"; - emfv->enable_map = g_slist_prepend(NULL, (void *)emfv_enable_map); + emfv->enable_map = g_slist_prepend(NULL, (gpointer)emfv_enable_map); emfv->list = (MessageList *)message_list_new(); g_signal_connect(emfv->list, "message_selected", G_CALLBACK(emfv_list_message_selected), emfv); @@ -464,11 +464,11 @@ GtkWidget *em_folder_view_new(void) /* flag all selected messages. Return number flagged */ /* FIXME: Should this be part of message-list instead? */ -int +gint em_folder_view_mark_selected(EMFolderView *emfv, guint32 mask, guint32 set) { GPtrArray *uids; - int i; + gint i; if (emfv->folder == NULL) return 0; @@ -488,17 +488,17 @@ em_folder_view_mark_selected(EMFolderView *emfv, guint32 mask, guint32 set) } /* should this be elsewhere/take a uid list? */ -int +gint em_folder_view_open_selected(EMFolderView *emfv) { GPtrArray *uids, *views; - int i = 0; + gint i = 0; uids = message_list_get_selected(emfv->list); if (uids->len >= 10) { - char *num = g_strdup_printf("%d", uids->len); - int doit; + gchar *num = g_strdup_printf("%d", uids->len); + gint doit; doit = em_utils_prompt_user((GtkWindow *)gtk_widget_get_toplevel((GtkWidget *)emfv), "/apps/evolution/mail/prompts/open_many", @@ -524,10 +524,10 @@ em_folder_view_open_selected(EMFolderView *emfv) CamelVeeMessageInfo *vinfo = (CamelVeeMessageInfo *)camel_folder_get_message_info(emfv->folder, uids->pdata[i]); if (vinfo) { - char *uid; + gchar *uid; /* TODO: get_location shouldn't strdup the uid */ CamelFolder *f = camel_vee_folder_get_location((CamelVeeFolder *)emfv->folder, vinfo, &uid); - char *uri = mail_tools_folder_to_url(f); + gchar *uri = mail_tools_folder_to_url(f); if (em_utils_folder_is_drafts(f, uri) || em_utils_folder_is_outbox(f, uri)) { GPtrArray *edits = g_ptr_array_new(); @@ -585,7 +585,7 @@ emfv_setup_view_instance(EMFolderView *emfv) static GalViewCollection *collection = NULL; struct _EMFolderViewPrivate *p = emfv->priv; gboolean outgoing, show_wide=FALSE; - char *id; + gchar *id; g_return_if_fail (emfv->folder); g_return_if_fail (emfv->folder_uri); @@ -593,10 +593,10 @@ emfv_setup_view_instance(EMFolderView *emfv) if (collection == NULL) { ETableSpecification *spec; GalViewFactory *factory; - const char *evolution_dir; - char *dir; - char *galviewsmaildir; - char *etspecfile; + const gchar *evolution_dir; + gchar *dir; + gchar *galviewsmaildir; + gchar *etspecfile; collection = gal_view_collection_new (); @@ -644,7 +644,7 @@ emfv_setup_view_instance(EMFolderView *emfv) show_wide = emfv->list_active ? em_folder_browser_get_wide ((EMFolderBrowser *) emfv):FALSE; if (show_wide) { - char *safe_id, *filename; + gchar *safe_id, *filename; /* Force to use the wide view */ g_free (p->view_instance->custom_filename); @@ -678,14 +678,14 @@ emfv_setup_view_instance(EMFolderView *emfv) if (!gal_view_instance_exists(p->view_instance)) { struct stat st; - char *path; + gchar *path; path = mail_config_folder_to_cachename (emfv->folder, "et-header-"); if (path && g_stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) { ETableSpecification *spec; ETableState *state; GalView *view; - char *etspecfile; + gchar *etspecfile; spec = e_table_specification_new (); etspecfile = g_build_filename (EVOLUTION_ETSPECDIR, @@ -725,9 +725,9 @@ void em_folder_view_setup_view_instance (EMFolderView *emfv) /* ********************************************************************** */ static void -emfv_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) +emfv_set_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri) { - int isout = (folder && uri + gint isout = (folder && uri && (em_utils_folder_is_drafts(folder, uri) || em_utils_folder_is_sent(folder, uri) || em_utils_folder_is_outbox(folder, uri))); @@ -766,7 +766,7 @@ emfv_set_folder(EMFolderView *emfv, CamelFolder *folder, const char *uri) } static void -emfv_got_folder(char *uri, CamelFolder *folder, void *data) +emfv_got_folder(gchar *uri, CamelFolder *folder, gpointer data) { EMFolderView *emfv = data; @@ -774,13 +774,13 @@ emfv_got_folder(char *uri, CamelFolder *folder, void *data) } static void -emfv_set_folder_uri(EMFolderView *emfv, const char *uri) +emfv_set_folder_uri(EMFolderView *emfv, const gchar *uri) { mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_msg_fast_ordered_push); } static void -emfv_set_message(EMFolderView *emfv, const char *uid, int nomarkseen) +emfv_set_message(EMFolderView *emfv, const gchar *uid, gint nomarkseen) { e_profile_event_emit("goto.uid", uid?uid:"", 0); @@ -801,7 +801,7 @@ emfv_selection_get(GtkWidget *widget, GtkSelectionData *data, guint info, guint if (p->selection_uri == NULL) return; - gtk_selection_data_set(data, data->target, 8, (unsigned char *)p->selection_uri, strlen(p->selection_uri)); + gtk_selection_data_set(data, data->target, 8, (guchar *)p->selection_uri, strlen(p->selection_uri)); } static void @@ -821,14 +821,14 @@ emfv_selection_clear_event(GtkWidget *widget, GdkEventSelection *event, EMFolder In many cases these are the functions called by the bonobo callbacks too */ static void -emfv_popup_open(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_open(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; em_folder_view_open_selected(emfv); } static void -emfv_popup_edit (EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_edit (EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; GPtrArray *uids; @@ -841,7 +841,7 @@ emfv_popup_edit (EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_saveas(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_saveas(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; GPtrArray *uids; @@ -851,7 +851,7 @@ emfv_popup_saveas(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_view_load_images(BonoboUIComponent *uic, void *data, const char *path) +emfv_view_load_images(BonoboUIComponent *uic, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -860,21 +860,21 @@ emfv_view_load_images(BonoboUIComponent *uic, void *data, const char *path) } static void -emfv_popup_print(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_print(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; em_folder_view_print(emfv, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG); } static void -emfv_popup_copy_text(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_copy_text(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; gtk_html_copy (((EMFormatHTML *)emfv->preview)->html); } static void -emfv_popup_source(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_source(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; EMMessageBrowser *emmb; @@ -894,7 +894,7 @@ emfv_popup_source(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_mail_compose(BonoboUIComponent *uid, void *data, const char *path) +emfv_mail_compose(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -905,28 +905,28 @@ emfv_mail_compose(BonoboUIComponent *uid, void *data, const char *path) } static void -emfv_popup_reply_sender(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_reply_sender(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; emfv_message_reply(emfv, REPLY_MODE_SENDER); } static void -emfv_popup_reply_list(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_reply_list(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; emfv_message_reply(emfv, REPLY_MODE_LIST); } static void -emfv_popup_reply_all(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_reply_all(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; emfv_message_reply(emfv, REPLY_MODE_ALL); } static void -emfv_popup_forward(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_forward(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; GPtrArray *uids; @@ -939,7 +939,7 @@ emfv_popup_forward(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_flag_followup(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_flag_followup(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; GPtrArray *uids = message_list_get_selected(emfv->list); @@ -948,7 +948,7 @@ emfv_popup_flag_followup(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_flag_completed(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_flag_completed(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; GPtrArray *uids; @@ -961,7 +961,7 @@ emfv_popup_flag_completed(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_flag_clear(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_flag_clear(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; GPtrArray *uids = message_list_get_selected(emfv->list); @@ -973,14 +973,14 @@ emfv_popup_flag_clear(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_mark_read(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_mark_read(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN); } static void -emfv_popup_mark_unread(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_mark_unread(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, 0); @@ -992,21 +992,21 @@ emfv_popup_mark_unread(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_mark_important(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_mark_important(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_FLAGGED|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_FLAGGED); } static void -emfv_popup_mark_unimportant(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_mark_unimportant(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_FLAGGED, 0); } static void -emfv_select_next_message (EMFolderView *emfv, int count, gboolean always_can_previous) +emfv_select_next_message (EMFolderView *emfv, gint count, gboolean always_can_previous) { if (emfv && count == 1) { if (!message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0) && (emfv->hide_deleted || always_can_previous)) @@ -1015,10 +1015,10 @@ emfv_select_next_message (EMFolderView *emfv, int count, gboolean always_can_pre } static void -emfv_popup_mark_junk (EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_mark_junk (EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; - int count; + gint count; count = em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN, @@ -1028,10 +1028,10 @@ emfv_popup_mark_junk (EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_mark_nojunk (EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_mark_nojunk (EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; - int count; + gint count; count = em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN, @@ -1044,11 +1044,11 @@ emfv_popup_mark_nojunk (EPopup *ep, EPopupItem *pitem, void *data) #define DelInVFolderKey "/apps/evolution/mail/prompts/delete_in_vfolder" static void -emfv_delete_msg_response (GtkWidget *dialog, int response, gpointer data) +emfv_delete_msg_response (GtkWidget *dialog, gint response, gpointer data) { if (response == GTK_RESPONSE_OK) { EMFolderView *emfv = data; - int count; + gint count; GPtrArray *uids; if (dialog) { @@ -1113,7 +1113,7 @@ emfv_delete_msg_response (GtkWidget *dialog, int response, gpointer data) } static void -emfv_popup_delete (EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_delete (EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; GConfClient *gconf = gconf_client_get_default (); @@ -1142,7 +1142,7 @@ emfv_popup_delete (EPopup *ep, EPopupItem *pitem, void *data) #undef DelInVFolderKey static void -emfv_popup_undelete(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_undelete(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_DELETED, 0); @@ -1151,13 +1151,13 @@ emfv_popup_undelete(EPopup *ep, EPopupItem *pitem, void *data) struct _move_data { EMFolderView *emfv; GPtrArray *uids; - int delete; + gint delete; }; -static char *default_xfer_messages_uri = NULL; +static gchar *default_xfer_messages_uri = NULL; static void -emfv_popup_move_cb(const char *uri, void *data) +emfv_popup_move_cb(const gchar *uri, gpointer data) { struct _move_data *d = data; @@ -1173,7 +1173,7 @@ emfv_popup_move_cb(const char *uri, void *data) } static void -emfv_popup_move(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_move(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; struct _move_data *d; @@ -1188,7 +1188,7 @@ emfv_popup_move(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_copy(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_copy(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; struct _move_data *d; @@ -1203,10 +1203,10 @@ emfv_popup_copy(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_set_label (EMFolderView *emfv, const char *label) +emfv_set_label (EMFolderView *emfv, const gchar *label) { GPtrArray *uids = message_list_get_selected (emfv->list); - int i; + gint i; for (i = 0; i < uids->len; i++) camel_folder_set_message_user_flag (emfv->folder, uids->pdata[i], label, TRUE); @@ -1215,10 +1215,10 @@ emfv_set_label (EMFolderView *emfv, const char *label) } static void -emfv_unset_label (EMFolderView *emfv, const char *label) +emfv_unset_label (EMFolderView *emfv, const gchar *label) { GPtrArray *uids = message_list_get_selected (emfv->list); - int i; + gint i; for (i = 0; i < uids->len; i++) { camel_folder_set_message_user_flag (emfv->folder, uids->pdata[i], label, FALSE); @@ -1229,7 +1229,7 @@ emfv_unset_label (EMFolderView *emfv, const char *label) } static void -emfv_popup_label_clear(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_label_clear(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; GSList *l; @@ -1242,7 +1242,7 @@ emfv_popup_label_clear(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_label_set(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_label_set(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; @@ -1253,10 +1253,10 @@ emfv_popup_label_set(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_label_new (EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_label_new (EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; - char *tag = e_util_labels_add_with_dlg (NULL, NULL); + gchar *tag = e_util_labels_add_with_dlg (NULL, NULL); if (tag) { emfv_set_label (emfv, tag); @@ -1265,12 +1265,12 @@ emfv_popup_label_new (EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_add_sender(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_add_sender(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; GPtrArray *uids = message_list_get_selected(emfv->list); CamelMessageInfo *info; - const char *addr; + const gchar *addr; if (uids->len == 1 && (info = camel_folder_get_message_info(emfv->folder, uids->pdata[0])) != NULL @@ -1282,7 +1282,7 @@ emfv_popup_add_sender(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_apply_filters(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_apply_filters(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; GPtrArray *uids = message_list_get_selected(emfv->list); @@ -1291,7 +1291,7 @@ emfv_popup_apply_filters(EPopup *ep, EPopupItem *pitem, void *data) } static void -emfv_popup_filter_junk(EPopup *ep, EPopupItem *pitem, void *data) +emfv_popup_filter_junk(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; GPtrArray *uids = message_list_get_selected(emfv->list); @@ -1304,7 +1304,7 @@ emfv_popup_filter_junk(EPopup *ep, EPopupItem *pitem, void *data) #define EMFV_POPUP_AUTO_TYPE(autotype, name, type) \ static void \ -name(EPopup *ep, EPopupItem *item, void *data) \ +name(EPopup *ep, EPopupItem *item, gpointer data) \ { \ EMFolderView *emfv = data; \ autotype(emfv, type); \ @@ -1382,10 +1382,10 @@ static EPopupItem emfv_popup_items[] = { }; static enum _e_popup_t -emfv_popup_labels_get_state_for_tag (EMFolderView *emfv, GPtrArray *uids, const char *label_tag) +emfv_popup_labels_get_state_for_tag (EMFolderView *emfv, GPtrArray *uids, const gchar *label_tag) { enum _e_popup_t state = 0; - int i; + gint i; gboolean exists = FALSE, not_exists = FALSE; g_return_val_if_fail (emfv != 0, state); @@ -1395,7 +1395,7 @@ emfv_popup_labels_get_state_for_tag (EMFolderView *emfv, GPtrArray *uids, const if (camel_folder_get_message_user_flag (emfv->folder, uids->pdata[i], label_tag)) exists = TRUE; else { - const char *label = e_util_labels_get_new_tag (camel_folder_get_message_user_tag (emfv->folder, uids->pdata[i], "label")); + const gchar *label = e_util_labels_get_new_tag (camel_folder_get_message_user_tag (emfv->folder, uids->pdata[i], "label")); /* backward compatibility... */ if (label && !strcmp (label, label_tag)) @@ -1414,7 +1414,7 @@ emfv_popup_labels_get_state_for_tag (EMFolderView *emfv, GPtrArray *uids, const } static void -emfv_popup_labels_free(EPopup *ep, GSList *l, void *data) +emfv_popup_labels_free(EPopup *ep, GSList *l, gpointer data) { while (l) { GSList *n = l->next; @@ -1429,19 +1429,19 @@ emfv_popup_labels_free(EPopup *ep, GSList *l, void *data) } static void -emfv_popup_items_free(EPopup *ep, GSList *items, void *data) +emfv_popup_items_free(EPopup *ep, GSList *items, gpointer data) { g_slist_free(items); } static void -emfv_popup(EMFolderView *emfv, GdkEvent *event, int on_display) +emfv_popup(EMFolderView *emfv, GdkEvent *event, gint on_display) { GSList *menus = NULL, *l, *label_list = NULL; GtkMenu *menu; EMPopup *emp; EMPopupTargetSelect *target; - int i; + gint i; /** @HookPoint-EMPopup: Message List Context Menu * @Id: org.gnome.evolution.mail.folderview.popup.select @@ -1515,7 +1515,7 @@ emfv_popup(EMFolderView *emfv, GdkEvent *event, int on_display) /* a lot of stuff maps directly to the popup menu equivalent */ #define EMFV_MAP_CALLBACK(from, to) \ static void \ -from(BonoboUIComponent *uid, void *data, const char *path) \ +from(BonoboUIComponent *uid, gpointer data, const gchar *path) \ { \ to(NULL, NULL, data); \ } @@ -1547,7 +1547,7 @@ EMFV_MAP_CALLBACK(emfv_print_message, emfv_popup_print) EMFV_MAP_CALLBACK(emfv_message_source, emfv_popup_source) static void -emfv_empty_trash(BonoboUIComponent *uid, void *data, const char *path) +emfv_empty_trash(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1555,7 +1555,7 @@ emfv_empty_trash(BonoboUIComponent *uid, void *data, const char *path) } static void -prepare_offline(void *key, void *value, void *data) +prepare_offline(gpointer key, gpointer value, gpointer data) { CamelService *service = key; @@ -1566,13 +1566,13 @@ prepare_offline(void *key, void *value, void *data) } static void -emfv_prepare_offline(BonoboUIComponent *uid, void *data, const char *path) +emfv_prepare_offline(BonoboUIComponent *uid, gpointer data, const gchar *path) { mail_component_stores_foreach(mail_component_peek(), prepare_offline, NULL); } static void -emfv_edit_cut(BonoboUIComponent *uid, void *data, const char *path) +emfv_edit_cut(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1583,7 +1583,7 @@ emfv_edit_cut(BonoboUIComponent *uid, void *data, const char *path) } static void -emfv_edit_copy(BonoboUIComponent *uid, void *data, const char *path) +emfv_edit_copy(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1594,7 +1594,7 @@ emfv_edit_copy(BonoboUIComponent *uid, void *data, const char *path) } static void -emfv_edit_paste(BonoboUIComponent *uid, void *data, const char *path) +emfv_edit_paste(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1602,7 +1602,7 @@ emfv_edit_paste(BonoboUIComponent *uid, void *data, const char *path) } static void -emfv_select_all_text(BonoboUIComponent *uid, void *data, const char *path) +emfv_select_all_text(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; gboolean selected; @@ -1614,7 +1614,7 @@ emfv_select_all_text(BonoboUIComponent *uid, void *data, const char *path) } static void -emfv_mail_next(BonoboUIComponent *uid, void *data, const char *path) +emfv_mail_next(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1624,7 +1624,7 @@ emfv_mail_next(BonoboUIComponent *uid, void *data, const char *path) } static void -emfv_mail_next_flagged(BonoboUIComponent *uid, void *data, const char *path) +emfv_mail_next_flagged(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1632,7 +1632,7 @@ emfv_mail_next_flagged(BonoboUIComponent *uid, void *data, const char *path) } static void -emfv_mail_next_unread(BonoboUIComponent *uid, void *data, const char *path) +emfv_mail_next_unread(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1641,7 +1641,7 @@ emfv_mail_next_unread(BonoboUIComponent *uid, void *data, const char *path) } static void -emfv_mail_next_thread(BonoboUIComponent *uid, void *data, const char *path) +emfv_mail_next_thread(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1649,7 +1649,7 @@ emfv_mail_next_thread(BonoboUIComponent *uid, void *data, const char *path) } static void -emfv_mail_previous(BonoboUIComponent *uid, void *data, const char *path) +emfv_mail_previous(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1657,7 +1657,7 @@ emfv_mail_previous(BonoboUIComponent *uid, void *data, const char *path) } static void -emfv_mail_previous_flagged(BonoboUIComponent *uid, void *data, const char *path) +emfv_mail_previous_flagged(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1665,7 +1665,7 @@ emfv_mail_previous_flagged(BonoboUIComponent *uid, void *data, const char *path) } static void -emfv_mail_previous_unread(BonoboUIComponent *uid, void *data, const char *path) +emfv_mail_previous_unread(BonoboUIComponent *uid, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1674,7 +1674,7 @@ emfv_mail_previous_unread(BonoboUIComponent *uid, void *data, const char *path) } static void -emfv_message_forward_attached (BonoboUIComponent *uic, void *data, const char *path) +emfv_message_forward_attached (BonoboUIComponent *uic, gpointer data, const gchar *path) { EMFolderView *emfv = data; GPtrArray *uids; @@ -1687,7 +1687,7 @@ emfv_message_forward_attached (BonoboUIComponent *uic, void *data, const char *p } static void -emfv_message_forward_inline (BonoboUIComponent *uic, void *data, const char *path) +emfv_message_forward_inline (BonoboUIComponent *uic, gpointer data, const gchar *path) { EMFolderView *emfv = data; GPtrArray *uids; @@ -1700,7 +1700,7 @@ emfv_message_forward_inline (BonoboUIComponent *uic, void *data, const char *pat } static void -emfv_message_forward_quoted (BonoboUIComponent *uic, void *data, const char *path) +emfv_message_forward_quoted (BonoboUIComponent *uic, gpointer data, const gchar *path) { EMFolderView *emfv = data; GPtrArray *uids; @@ -1713,7 +1713,7 @@ emfv_message_forward_quoted (BonoboUIComponent *uic, void *data, const char *pat } static void -emfv_message_redirect (BonoboUIComponent *uic, void *data, const char *path) +emfv_message_redirect (BonoboUIComponent *uic, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1727,9 +1727,9 @@ emfv_message_redirect (BonoboUIComponent *uic, void *data, const char *path) } static gboolean -html_contains_nonwhitespace (const char *html, gint len) +html_contains_nonwhitespace (const gchar *html, gint len) { - const char *p; + const gchar *p; gunichar c = 0; if (!html || len<=0) @@ -1765,9 +1765,9 @@ html_contains_nonwhitespace (const char *html, gint len) } static void -emfv_message_reply(EMFolderView *emfv, int mode) +emfv_message_reply(EMFolderView *emfv, gint mode) { - char *html = NULL; + gchar *html = NULL; gint len; if (emfv->list->cursor_uid == NULL) @@ -1805,7 +1805,7 @@ emfv_message_reply(EMFolderView *emfv, int mode) } static void -emfv_message_search(BonoboUIComponent *uic, void *data, const char *path) +emfv_message_search(BonoboUIComponent *uic, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1813,7 +1813,7 @@ emfv_message_search(BonoboUIComponent *uic, void *data, const char *path) } static void -emfv_print_preview_message(BonoboUIComponent *uic, void *data, const char *path) +emfv_print_preview_message(BonoboUIComponent *uic, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1821,7 +1821,7 @@ emfv_print_preview_message(BonoboUIComponent *uic, void *data, const char *path) } static void -emfv_text_zoom_in(BonoboUIComponent *uic, void *data, const char *path) +emfv_text_zoom_in(BonoboUIComponent *uic, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1830,7 +1830,7 @@ emfv_text_zoom_in(BonoboUIComponent *uic, void *data, const char *path) } static void -emfv_text_zoom_out(BonoboUIComponent *uic, void *data, const char *path) +emfv_text_zoom_out(BonoboUIComponent *uic, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1839,7 +1839,7 @@ emfv_text_zoom_out(BonoboUIComponent *uic, void *data, const char *path) } static void -emfv_text_zoom_reset(BonoboUIComponent *uic, void *data, const char *path) +emfv_text_zoom_reset(BonoboUIComponent *uic, gpointer data, const gchar *path) { EMFolderView *emfv = data; @@ -1850,9 +1850,9 @@ emfv_text_zoom_reset(BonoboUIComponent *uic, void *data, const char *path) /* ********************************************************************** */ struct _filter_data { - const char *source; - char *uri; - int type; + const gchar *source; + gchar *uri; + gint type; }; static void @@ -1863,7 +1863,7 @@ filter_data_free (struct _filter_data *fdata) } static void -filter_type_got_message (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *user_data) +filter_type_got_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer user_data) { struct _filter_data *data = user_data; @@ -1874,7 +1874,7 @@ filter_type_got_message (CamelFolder *folder, const char *uid, CamelMimeMessage } static void -filter_type_uid (CamelFolder *folder, const char *uid, const char *source, int type) +filter_type_uid (CamelFolder *folder, const gchar *uid, const gchar *source, gint type) { struct _filter_data *data; @@ -1886,9 +1886,9 @@ filter_type_uid (CamelFolder *folder, const char *uid, const char *source, int t } static void -filter_type_current (EMFolderView *emfv, int type) +filter_type_current (EMFolderView *emfv, gint type) { - const char *source; + const gchar *source; GPtrArray *uids; if (em_utils_folder_is_sent (emfv->folder, emfv->folder_uri) @@ -1900,7 +1900,7 @@ filter_type_current (EMFolderView *emfv, int type) uids = message_list_get_selected (emfv->list); if (uids->len == 1) - filter_type_uid (emfv->folder, (char *) uids->pdata[0], source, type); + filter_type_uid (emfv->folder, (gchar *) uids->pdata[0], source, type); em_utils_uids_free (uids); } @@ -1911,7 +1911,7 @@ EMFV_MAP_CALLBACK(emfv_tools_filter_recipient, emfv_popup_filter_recipients) EMFV_MAP_CALLBACK(emfv_tools_filter_mlist, emfv_popup_filter_mlist) static void -vfolder_type_got_message (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *user_data) +vfolder_type_got_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer user_data) { struct _filter_data *data = user_data; @@ -1922,7 +1922,7 @@ vfolder_type_got_message (CamelFolder *folder, const char *uid, CamelMimeMessage } static void -emp_uri_popup_vfolder_sender(EPopup *ep, EPopupItem *pitem, void *data) +emp_uri_popup_vfolder_sender(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; EMPopupTargetURI *t = (EMPopupTargetURI *)ep->target; @@ -1951,7 +1951,7 @@ emp_uri_popup_vfolder_sender(EPopup *ep, EPopupItem *pitem, void *data) static void -emp_uri_popup_vfolder_recipient(EPopup *ep, EPopupItem *pitem, void *data) +emp_uri_popup_vfolder_recipient(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; EMPopupTargetURI *t = (EMPopupTargetURI *)ep->target; @@ -1978,7 +1978,7 @@ emp_uri_popup_vfolder_recipient(EPopup *ep, EPopupItem *pitem, void *data) } static void -vfolder_type_uid (CamelFolder *folder, const char *uid, const char *uri, int type) +vfolder_type_uid (CamelFolder *folder, const gchar *uid, const gchar *uri, gint type) { struct _filter_data *data; @@ -1990,7 +1990,7 @@ vfolder_type_uid (CamelFolder *folder, const char *uid, const char *uri, int typ } static void -vfolder_type_current (EMFolderView *emfv, int type) +vfolder_type_current (EMFolderView *emfv, gint type) { GPtrArray *uids; @@ -2000,7 +2000,7 @@ vfolder_type_current (EMFolderView *emfv, int type) /* ensures vfolder is running */ vfolder_load_storage (); - vfolder_type_uid (emfv->folder, (char *) uids->pdata[0], emfv->folder_uri, type); + vfolder_type_uid (emfv->folder, (gchar *) uids->pdata[0], emfv->folder_uri, type); } em_utils_uids_free (uids); @@ -2170,10 +2170,10 @@ emfv_enable_menus(EMFolderView *emfv) name = g_string_new(""); for (l = emfv->enable_map; l; l = l->next) { EMFolderViewEnable *map = l->data; - int i; + gint i; for (i=0;map[i].name;i++) { - int state = (map[i].mask & disable_mask) == 0; + gint state = (map[i].mask & disable_mask) == 0; g_string_printf(name, "/commands/%s", map[i].name); bonobo_ui_component_set_prop(emfv->uic, name->str, "sensitive", state?"1":"0", NULL); @@ -2184,10 +2184,10 @@ emfv_enable_menus(EMFolderView *emfv) } static void -emfv_view_mode(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +emfv_view_mode(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data) { EMFolderView *emfv = data; - int i; + gint i; if (type != Bonobo_UIComponent_STATE_CHANGED) return; @@ -2208,7 +2208,7 @@ emfv_view_mode(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_Even } static void -emfv_caret_mode(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +emfv_caret_mode(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data) { EMFolderView *emfv = data; @@ -2221,7 +2221,7 @@ emfv_caret_mode(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_Eve } static void -emfv_charset_changed(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data) +emfv_charset_changed(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data) { EMFolderView *emfv = data; @@ -2240,7 +2240,7 @@ emfv_charset_changed(BonoboUIComponent *uic, const char *path, Bonobo_UIComponen } static void -emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act) +emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint act) { struct _EMFolderViewPrivate *p = emfv->priv; @@ -2252,7 +2252,7 @@ emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act) emfv->uic = uic; for (l = emfv->ui_files;l;l = l->next) - bonobo_ui_util_set_ui(uic, PREFIX, (char *)l->data, emfv->ui_app_name, NULL); + bonobo_ui_util_set_ui(uic, PREFIX, (gchar *)l->data, emfv->ui_app_name, NULL); bonobo_ui_component_add_verb_list_with_data(uic, emfv_message_verbs, emfv); e_pixmaps_update(uic, emfv_message_pixmaps); @@ -2311,7 +2311,7 @@ emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act) } } -int +gint em_folder_view_print (EMFolderView *emfv, GtkPrintOperationAction action) { EMFormatHTMLPrint *efhp; @@ -2343,7 +2343,7 @@ exit: } EMPopupTargetSelect * -em_folder_view_get_popup_target(EMFolderView *emfv, EMPopup *emp, int on_display) +em_folder_view_get_popup_target(EMFolderView *emfv, EMPopup *emp, gint on_display) { EMPopupTargetSelect *t; @@ -2413,7 +2413,7 @@ em_folder_view_set_hide_deleted(EMFolderView *emfv, gboolean status) struct mst_t { EMFolderView *emfv; - char *uid; + gchar *uid; }; static void @@ -2439,7 +2439,7 @@ do_mark_seen (gpointer user_data) } static void -emfv_list_done_message_selected(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *ex) +emfv_list_done_message_selected(CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data, CamelException *ex) { EMFolderView *emfv = data; EMEvent *eme; @@ -2533,7 +2533,7 @@ emfv_spin(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject) } static gboolean -emfv_message_selected_timeout(void *data) +emfv_message_selected_timeout(gpointer data) { EMFolderView *emfv = data; @@ -2576,7 +2576,7 @@ emfv_message_selected_timeout(void *data) } static void -emfv_list_message_selected(MessageList *ml, const char *uid, EMFolderView *emfv) +emfv_list_message_selected(MessageList *ml, const gchar *uid, EMFolderView *emfv) { e_profile_event_emit("goto.listuid", uid, 0); @@ -2623,10 +2623,10 @@ emfv_list_right_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent } static int -emfv_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, EMFolderView *emfv) +emfv_list_key_press(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *ev, EMFolderView *emfv) { GPtrArray *uids; - int i; + gint i; guint32 flags; if ((ev->key.state & GDK_CONTROL_MASK) != 0) @@ -2698,7 +2698,7 @@ emfv_list_selection_change(ETree *tree, EMFolderView *emfv) } static void -emfv_format_link_clicked(EMFormatHTMLDisplay *efhd, const char *uri, EMFolderView *emfv) +emfv_format_link_clicked(EMFormatHTMLDisplay *efhd, const gchar *uri, EMFolderView *emfv) { if (!strncmp (uri, "##", 2)) return; @@ -2718,7 +2718,7 @@ emfv_format_link_clicked(EMFormatHTMLDisplay *efhd, const char *uri, EMFolderVie } static void -emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data) +emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, gpointer data) { EMFolderView *emfv = data; struct _EMFolderViewPrivate *p = emfv->priv; @@ -2739,7 +2739,7 @@ static EPopupItem emfv_uri_popups[] = { }; static void -emfv_uri_popup_free(EPopup *ep, GSList *list, void *data) +emfv_uri_popup_free(EPopup *ep, GSList *list, gpointer data) { while (list) { GSList *n = list->next; @@ -2776,7 +2776,7 @@ emfv_append_menu (EMPopup *des_emp, GtkMenu *des_menu, EMPopup *src_emp, GtkMenu { GtkWidget *separator; GList *children, *p; - char *name; + gchar *name; if (!src_menu) return des_menu; @@ -2808,7 +2808,7 @@ emfv_append_menu (EMPopup *des_emp, GtkMenu *des_menu, EMPopup *src_emp, GtkMenu } static int -emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const char *uri, CamelMimePart *part, EMFolderView *emfv) +emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const gchar *uri, CamelMimePart *part, EMFolderView *emfv) { GtkMenu *menu = NULL; EMPopup *main_emp = NULL; @@ -2816,7 +2816,7 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const if (uri == NULL && part == NULL) { /* So we don't try and popup with nothing selected - rather odd result! */ GPtrArray *uids = message_list_get_selected(emfv->list); - int doit = uids->len > 0; + gint doit = uids->len > 0; message_list_free_uids(emfv->list, uids); if (doit) @@ -2848,10 +2848,10 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const if (uri) { gboolean have_more_uris = strchr (uri, '\n') != NULL; - const char *act, *next; + const gchar *act, *next; for (act = uri; act; act = next) { - char *u; + gchar *u; next = strchr (act, '\n'); if (next) { u = g_strndup (act, next - act); @@ -2861,7 +2861,7 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const if (u && *u) { GSList *menus = NULL; - int i; + gint i; EMPopupTargetURI *t; EMPopup *emp; EPopupTarget *target; @@ -2886,7 +2886,7 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const if (strlen (u) > 100) { GString *str; - char *c; + gchar *c; /* the url should be in the form of http://a.b.c/... and we want to see where the image comes from, so skip first 10 characters and @@ -2941,7 +2941,7 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const } static void -emfv_set_seen(EMFolderView *emfv, const char *uid) +emfv_set_seen(EMFolderView *emfv, const gchar *uid) { guint32 old_flags = camel_folder_get_message_flags(emfv->folder, uid); @@ -2974,7 +2974,7 @@ enum { }; /* IF these get too long, update key field */ -static const char * const emfv_display_keys[] = { +static const gchar * const emfv_display_keys[] = { "animate_images", "charset", "citation_colour", @@ -2999,7 +2999,7 @@ static void emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFolderView *emfv) { GConfValue *value; - char *tkey; + gchar *tkey; g_return_if_fail (gconf_entry_get_key (entry) != NULL); @@ -3017,7 +3017,7 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold em_format_set_default_charset((EMFormat *)emfv->preview, gconf_value_get_string (value)); break; case EMFV_CITATION_COLOUR: { - const char *s; + const gchar *s; GdkColor colour; guint32 rgb; @@ -3037,7 +3037,7 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold break; case EMFV_MESSAGE_STYLE: if (EM_FOLDER_VIEW_GET_CLASS (emfv)->update_message_style) { - int style = gconf_value_get_int (value); + gint style = gconf_value_get_int (value); if (style < EM_FORMAT_NORMAL || style > EM_FORMAT_SOURCE) style = EM_FORMAT_NORMAL; @@ -3062,7 +3062,7 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold p = header_config_list; while (p) { EMMailerPrefsHeader *h; - char *xml = (char *)p->data; + gchar *xml = (gchar *)p->data; h = em_mailer_prefs_header_from_xml(xml); if (h && h->enabled) { @@ -3093,7 +3093,7 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold break; } case EMFV_SHOW_PREVIEW: { gboolean state_gconf, state_camel; - char *ret; + gchar *ret; /* If emfv->folder hasn't been initialized, do nothing */ if (!emfv->folder) @@ -3128,7 +3128,7 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold break; } case EMFV_THREAD_LIST: { gboolean state_gconf, state_camel; - char *ret; + gchar *ret; /* If emfv->folder or emfv->list hasn't been initialized, do nothing */ if (!emfv->folder || !emfv->list) @@ -3149,7 +3149,7 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold break; } case EMFV_PANED_SIZE: { EMFolderBrowser *emfb = (EMFolderBrowser *)emfv; - int paned_size; + gint paned_size; if (!emfv->list_active || !emfb->vpane || !emfv->preview_active) return; @@ -3169,13 +3169,13 @@ emfv_setting_setup(EMFolderView *emfv) GConfClient *gconf = gconf_client_get_default(); GConfEntry *entry; GError *err = NULL; - int i; - char key[64]; + gint i; + gchar key[64]; if (emfv_setting_key == NULL) { emfv_setting_key = g_hash_table_new(g_str_hash, g_str_equal); for (i=1;istatusbar_active) { if (emfv->uic) { @@ -3215,15 +3215,15 @@ emfv_on_url (EMFolderView *emfv, const char *uri, const char *nice_uri) } static void -emfv_on_url_cb (GObject *emitter, const char *url, EMFolderView *emfv) +emfv_on_url_cb (GObject *emitter, const gchar *url, EMFolderView *emfv) { - char *nice_url = NULL; + gchar *nice_url = NULL; if (url) { if (strncmp (url, "mailto:", 7) == 0) { CamelInternetAddress *cia = camel_internet_address_new(); CamelURL *curl; - char *addr; + gchar *addr; curl = camel_url_new(url, NULL); camel_address_decode((CamelAddress *)cia, curl->path); @@ -3235,7 +3235,7 @@ emfv_on_url_cb (GObject *emitter, const char *url, EMFolderView *emfv) } else if (strncmp (url, "callto:", 7) == 0 || strncmp (url, "h323:", 5) == 0 || strncmp (url, "sip:", 4) == 0) { CamelInternetAddress *cia = camel_internet_address_new(); CamelURL *curl; - char *addr; + gchar *addr; curl = camel_url_new(url, NULL); camel_address_decode((CamelAddress *)cia, curl->path); diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h index 3a7a153131..c9202dcfa3 100644 --- a/mail/em-folder-view.h +++ b/mail/em-folder-view.h @@ -71,7 +71,7 @@ enum { }; struct _EMFolderViewEnable { - const char *name; /* bonobo name, relative to /commands/ */ + const gchar *name; /* bonobo name, relative to /commands/ */ guint32 mask; /* disable mask, see EM_FOLDER_VIEW_CAN* flags */ }; @@ -85,13 +85,13 @@ struct _EMFolderView { struct _EMFormatHTMLDisplay *preview; struct _CamelFolder *folder; - char *folder_uri; + gchar *folder_uri; - char *displayed_uid; /* only used to stop re-loads, don't use it to represent any selection state */ + gchar *displayed_uid; /* only used to stop re-loads, don't use it to represent any selection state */ /* used to load ui from base activate implementation */ - GSList *ui_files; /* const char * list, TODO: should this be on class? */ - const char *ui_app_name; + GSList *ui_files; /* const gchar * list, TODO: should this be on class? */ + const gchar *ui_app_name; /* used to manage some menus, particularly plugins */ struct _EMMenu *menu; @@ -103,7 +103,7 @@ struct _EMFolderView { GSList *enable_map; /* bonobo menu enable map, entries are 0-terminated EMFolderViewEnable arryas TODO: should this be on class? */ - int mark_seen_timeout; /* local copy of gconf stuff */ + gint mark_seen_timeout; /* local copy of gconf stuff */ guint mark_seen:1; guint preview_active:1; /* is preview being used */ guint statusbar_active:1; /* should we manage the statusbar messages ourselves? */ @@ -118,16 +118,16 @@ struct _EMFolderViewClass { guint update_message_style:1; /* if used as a control, used to activate/deactivate custom menu's */ - void (*activate)(EMFolderView *, struct _BonoboUIComponent *uic, int state); + void (*activate)(EMFolderView *, struct _BonoboUIComponent *uic, gint state); - void (*set_folder_uri)(EMFolderView *emfv, const char *uri); - void (*set_folder)(EMFolderView *emfv, struct _CamelFolder *folder, const char *uri); - void (*set_message)(EMFolderView *emfv, const char *uid, int nomarkseen); + void (*set_folder_uri)(EMFolderView *emfv, const gchar *uri); + void (*set_folder)(EMFolderView *emfv, struct _CamelFolder *folder, const gchar *uri); + void (*set_message)(EMFolderView *emfv, const gchar *uid, gint nomarkseen); void (*show_search_bar)(EMFolderView *emfv); /* Signals */ - void (*on_url)(EMFolderView *emfv, const char *uri, const char *nice_uri); + void (*on_url)(EMFolderView *emfv, const gchar *uri, const gchar *nice_uri); void (*loaded)(EMFolderView *emfv); void (*changed)(EMFolderView *emfv); @@ -142,12 +142,12 @@ GtkWidget *em_folder_view_new(void); #define em_folder_view_set_folder_uri(emfv, uri) EM_FOLDER_VIEW_GET_CLASS (emfv)->set_folder_uri((emfv), (uri)) #define em_folder_view_set_message(emfv, uid, nomarkseen) EM_FOLDER_VIEW_GET_CLASS (emfv)->set_message((emfv), (uid), (nomarkseen)) -EMPopupTargetSelect *em_folder_view_get_popup_target(EMFolderView *emfv, EMPopup *emp, int on_display); +EMPopupTargetSelect *em_folder_view_get_popup_target(EMFolderView *emfv, EMPopup *emp, gint on_display); -int em_folder_view_mark_selected(EMFolderView *emfv, guint32 mask, guint32 set); -int em_folder_view_open_selected(EMFolderView *emfv); +gint em_folder_view_mark_selected(EMFolderView *emfv, guint32 mask, guint32 set); +gint em_folder_view_open_selected(EMFolderView *emfv); -int em_folder_view_print(EMFolderView *emfv, GtkPrintOperationAction action); +gint em_folder_view_print(EMFolderView *emfv, GtkPrintOperationAction action); /* this could be on message-list */ guint32 em_folder_view_disable_mask(EMFolderView *emfv); diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c index 9fec654ae5..ad7cbd7144 100644 --- a/mail/em-format-hook.c +++ b/mail/em-format-hook.c @@ -52,7 +52,7 @@ static GHashTable *emfh_types; */ -static void *emfh_parent_class; +static gpointer emfh_parent_class; #define emfh ((EMFormatHook *)eph) #define d(x) @@ -141,7 +141,7 @@ emfh_construct_group(EPluginHook *eph, xmlNodePtr root) node = root->children; while (node) { - if (0 == strcmp((char *)node->name, "item")) { + if (0 == strcmp((gchar *)node->name, "item")) { struct _EMFormatHookItem *item; item = emfh_construct_item(eph, group, node); @@ -169,7 +169,7 @@ emfh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) node = root->children; while (node) { - if (strcmp((char *)node->name, "group") == 0) { + if (strcmp((gchar *)node->name, "group") == 0) { struct _EMFormatHookGroup *group; group = emfh_construct_group(eph, node); @@ -203,7 +203,7 @@ emfh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) } static void -emfh_enable(EPluginHook *eph, int state) +emfh_enable(EPluginHook *eph, gint state) { GSList *g, *l; EMFormatClass *klass; @@ -275,5 +275,5 @@ void em_format_hook_register_type(GType type) d(printf("registering formatter type '%s'\n", g_type_name(type))); klass = g_type_class_ref(type); - g_hash_table_insert(emfh_types, (void *)g_type_name(type), klass); + g_hash_table_insert(emfh_types, (gpointer)g_type_name(type), klass); } diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h index 08d99dd63c..553eb7adab 100644 --- a/mail/em-format-hook.h +++ b/mail/em-format-hook.h @@ -55,12 +55,12 @@ struct _EMFormatHookItem { EMFormatHandler handler; struct _EMFormatHook *hook; /* parent pointer */ - char *format; /* format handler */ + gchar *format; /* format handler */ }; struct _EMFormatHookGroup { struct _EMFormatHook *hook; /* parent pointer */ - char *id; /* target formatter id */ + gchar *id; /* target formatter id */ GSList *items; /* items to consider */ }; diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 8d25923658..044ffe598a 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -98,9 +98,9 @@ struct _EMFormatHTMLDisplayPrivate { GtkWidget *attachment_view; /* weak reference */ }; -static int efhd_html_button_press_event (GtkWidget *widget, GdkEventButton *event, EMFormatHTMLDisplay *efh); -static void efhd_html_link_clicked (GtkHTML *html, const char *url, EMFormatHTMLDisplay *efhd); -static void efhd_html_on_url (GtkHTML *html, const char *url, EMFormatHTMLDisplay *efhd); +static gint efhd_html_button_press_event (GtkWidget *widget, GdkEventButton *event, EMFormatHTMLDisplay *efh); +static void efhd_html_link_clicked (GtkHTML *html, const gchar *url, EMFormatHTMLDisplay *efhd); +static void efhd_html_on_url (GtkHTML *html, const gchar *url, EMFormatHTMLDisplay *efhd); static void efhd_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri); static gboolean efhd_attachment_image(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject); @@ -111,14 +111,14 @@ struct _attach_puri { const EMFormatHandler *handle; - const char *snoop_mime_type; + const gchar *snoop_mime_type; /* for the > and V buttons */ GtkWidget *forward, *down; /* currently no way to correlate this data to the frame :( */ GtkHTML *frame; CamelStream *output; - unsigned int shown:1; + guint shown:1; /* Embedded Frame */ GtkHTMLEmbedded *html; @@ -127,8 +127,8 @@ struct _attach_puri { EAttachment *attachment; /* image stuff */ - int fit_width; - int fit_height; + gint fit_width; + gint fit_height; GtkImage *image; GtkWidget *event_box; @@ -142,16 +142,16 @@ struct _attach_puri { static void efhd_iframe_created(GtkHTML *html, GtkHTML *iframe, EMFormatHTMLDisplay *efh); -/*static void efhd_url_requested(GtkHTML *html, const char *url, GtkHTMLStream *handle, EMFormatHTMLDisplay *efh); +/*static void efhd_url_requested(GtkHTML *html, const gchar *url, GtkHTMLStream *handle, EMFormatHTMLDisplay *efh); static gboolean efhd_object_requested(GtkHTML *html, GtkHTMLEmbedded *eb, EMFormatHTMLDisplay *efh);*/ static void efhd_message_prefix(EMFormat *emf, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info); -static const EMFormatHandler *efhd_find_handler(EMFormat *emf, const char *mime_type); -static void efhd_format_clone(EMFormat *, CamelFolder *folder, const char *, CamelMimeMessage *msg, EMFormat *); -static void efhd_format_error(EMFormat *emf, CamelStream *stream, const char *txt); +static const EMFormatHandler *efhd_find_handler(EMFormat *emf, const gchar *mime_type); +static void efhd_format_clone(EMFormat *, CamelFolder *folder, const gchar *, CamelMimeMessage *msg, EMFormat *); +static void efhd_format_error(EMFormat *emf, CamelStream *stream, const gchar *txt); static void efhd_format_source(EMFormat *, CamelStream *, CamelMimePart *); -static void efhd_format_attachment(EMFormat *, CamelStream *, CamelMimePart *, const char *, const EMFormatHandler *); +static void efhd_format_attachment(EMFormat *, CamelStream *, CamelMimePart *, const gchar *, const EMFormatHandler *); static void efhd_format_optional(EMFormat *, CamelStream *, CamelMimePart *, CamelStream *); static void efhd_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, CamelCipherValidity *valid); @@ -181,7 +181,7 @@ efhd_gtkhtml_realise(GtkHTML *html, EMFormatHTMLDisplay *efhd) when we are printing. */ style = gtk_widget_get_style((GtkWidget *)html); if (style) { - int state = GTK_WIDGET_STATE(html); + gint state = GTK_WIDGET_STATE(html); gushort r, g, b; r = style->fg[state].red >> 8; @@ -254,7 +254,7 @@ efhd_finalise(GObject *o) } static gboolean -efhd_bool_accumulator(GSignalInvocationHint *ihint, GValue *out, const GValue *in, void *data) +efhd_bool_accumulator(GSignalInvocationHint *ihint, GValue *out, const GValue *in, gpointer data) { gboolean val = g_value_get_boolean(in); @@ -364,7 +364,7 @@ EMFormatHTMLDisplay *em_format_html_display_new(void) return efhd; } -void em_format_html_display_goto_anchor(EMFormatHTMLDisplay *efhd, const char *name) +void em_format_html_display_goto_anchor(EMFormatHTMLDisplay *efhd, const gchar *name) { printf("FIXME: go to anchor '%s'\n", name); } @@ -430,9 +430,9 @@ efhd_iframe_created(GtkHTML *html, GtkHTML *iframe, EMFormatHTMLDisplay *efh) } static void -efhd_get_uri_puri (GtkWidget *html, GdkEventButton *event, EMFormatHTMLDisplay *efhd, char **uri, EMFormatPURI **puri) +efhd_get_uri_puri (GtkWidget *html, GdkEventButton *event, EMFormatHTMLDisplay *efhd, gchar **uri, EMFormatPURI **puri) { - char *url, *img_url; + gchar *url, *img_url; g_return_if_fail (html != NULL); g_return_if_fail (GTK_IS_HTML (html)); @@ -448,7 +448,7 @@ efhd_get_uri_puri (GtkWidget *html, GdkEventButton *event, EMFormatHTMLDisplay * if (img_url) { if (!(strstr (img_url, "://") || g_ascii_strncasecmp (img_url, "cid:", 4) == 0)) { - char *u = g_filename_to_uri (img_url, NULL, NULL); + gchar *u = g_filename_to_uri (img_url, NULL, NULL); g_free (img_url); img_url = u; } @@ -484,7 +484,7 @@ efhd_get_uri_puri (GtkWidget *html, GdkEventButton *event, EMFormatHTMLDisplay * static int efhd_html_button_press_event (GtkWidget *widget, GdkEventButton *event, EMFormatHTMLDisplay *efhd) { - char *uri = NULL; + gchar *uri = NULL; EMFormatPURI *puri = NULL; gboolean res = FALSE; @@ -511,7 +511,7 @@ gboolean em_format_html_display_popup_menu (EMFormatHTMLDisplay *efhd) { GtkHTML *html; - char *uri = NULL; + gchar *uri = NULL; EMFormatPURI *puri = NULL; gboolean res = FALSE; @@ -527,7 +527,7 @@ em_format_html_display_popup_menu (EMFormatHTMLDisplay *efhd) } static void -efhd_html_link_clicked (GtkHTML *html, const char *url, EMFormatHTMLDisplay *efhd) +efhd_html_link_clicked (GtkHTML *html, const gchar *url, EMFormatHTMLDisplay *efhd) { d(printf("link clicked event '%s'\n", url)); if (url && !strncmp(url, "##", 2)) { @@ -553,7 +553,7 @@ efhd_html_link_clicked (GtkHTML *html, const char *url, EMFormatHTMLDisplay *efh } static void -efhd_html_on_url (GtkHTML *html, const char *url, EMFormatHTMLDisplay *efhd) +efhd_html_on_url (GtkHTML *html, const gchar *url, EMFormatHTMLDisplay *efhd) { d(printf("on_url event '%s'\n", url)); @@ -565,7 +565,7 @@ efhd_html_on_url (GtkHTML *html, const char *url, EMFormatHTMLDisplay *efhd) /* TODO: move the dialogue elsehwere */ /* FIXME: also in em-format-html.c */ static const struct { - const char *icon, *shortdesc, *description; + const gchar *icon, *shortdesc, *description; } smime_sign_table[5] = { { "stock_signature-bad", N_("Unsigned"), N_("This message is not signed. There is no guarantee that this message is authentic.") }, { "stock_signature-ok", N_("Valid signature"), N_("This message is signed and is valid meaning that it is very likely that this message is authentic.") }, @@ -576,7 +576,7 @@ static const struct { }; static const struct { - const char *icon, *shortdesc, *description; + const gchar *icon, *shortdesc, *description; } smime_encrypt_table[4] = { { "stock_lock-broken", N_("Unencrypted"), N_("This message is not encrypted. Its content may be viewed in transit across the Internet.") }, { "stock_lock-ok", N_("Encrypted, weak"), N_("This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time.") }, @@ -584,14 +584,14 @@ static const struct { { "stock_lock-ok", N_("Encrypted, strong"), N_("This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time.") }, }; -static const char *smime_sign_colour[5] = { +static const gchar *smime_sign_colour[5] = { "", " bgcolor=\"#88bb88\"", " bgcolor=\"#bb8888\"", " bgcolor=\"#e8d122\"","" }; struct _smime_pobject { EMFormatHTMLPObject object; - int signature; + gint signature; CamelCipherValidity *valid; GtkWidget *widget; }; @@ -655,11 +655,11 @@ efhd_xpkcs7mime_add_cert_table(GtkWidget *vbox, CamelDList *certlist, struct _sm { CamelCipherCertInfo *info = (CamelCipherCertInfo *)certlist->head; GtkTable *table = (GtkTable *)gtk_table_new(camel_dlist_length(certlist), 2, FALSE); - int n = 0; + gint n = 0; while (info->next) { - char *la = NULL; - const char *l = NULL; + gchar *la = NULL; + const gchar *l = NULL; if (info->name) { if (info->email && strcmp(info->name, info->email) != 0) @@ -715,7 +715,7 @@ efhd_xpkcs7mime_validity_clicked(GtkWidget *button, EMFormatHTMLPObject *pobject struct _smime_pobject *po = (struct _smime_pobject *)pobject; GladeXML *xml; GtkWidget *vbox, *w; - char *gladefile; + gchar *gladefile; if (po->widget) /* FIXME: window raise? */ @@ -804,7 +804,7 @@ efhd_xpkcs7mime_button(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObje { GtkWidget *icon, *button; struct _smime_pobject *po = (struct _smime_pobject *)pobject; - const char *icon_name; + const gchar *icon_name; /* FIXME: need to have it based on encryption and signing too */ if (po->valid->sign.status != 0) @@ -835,7 +835,7 @@ efhd_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Came if (emf->valid == valid && (valid->encrypt.status != CAMEL_CIPHER_VALIDITY_ENCRYPT_NONE || valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE)) { - char *classid; + gchar *classid; struct _smime_pobject *pobj; camel_stream_printf (stream, "
", is_rtl ? " align=\"right\" " : ""); @@ -741,8 +741,8 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac gtk_html_stream_write (html_stream, "\n", 7); if (contact) { - const char *str; - char *html; + const gchar *str; + gchar *html; EContactPhoto *photo; guint bg_frame = 0x000000, bg_body = 0xEEEEEE; GtkStyle *style; @@ -776,7 +776,7 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac if (!photo) photo = e_contact_get (contact, E_CONTACT_LOGO); if (photo) { - int calced_width = MAX_COMPACT_IMAGE_DIMENSION, calced_height = MAX_COMPACT_IMAGE_DIMENSION; + gint calced_width = MAX_COMPACT_IMAGE_DIMENSION, calced_height = MAX_COMPACT_IMAGE_DIMENSION; GdkPixbufLoader *loader = gdk_pixbuf_loader_new (); GdkPixbuf *pixbuf; @@ -791,7 +791,7 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac g_object_ref (pixbuf); g_object_unref (loader); if (pixbuf) { - int max_dimension; + gint max_dimension; calced_width = gdk_pixbuf_get_width (pixbuf); calced_height = gdk_pixbuf_get_height (pixbuf); @@ -926,7 +926,7 @@ eab_contact_display_render (EABContactDisplay *display, EContact *contact, static int eab_html_press_event (GtkWidget *widget, GdkEvent *event,EABContactDisplay *display) { - char *uri; + gchar *uri; gboolean res = FALSE; diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 58895c736c..9b3b0c7730 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -54,7 +54,7 @@ /* the NULL's in this table correspond to the status codes that should *never* be generated by a backend */ -static const char *status_to_string[] = { +static const gchar *status_to_string[] = { /* E_BOOK_ERROR_OK */ N_("Success"), /* E_BOOK_ERROR_INVALID_ARG */ NULL, /* E_BOOK_ERROR_BUSY */ N_("Backend busy"), @@ -81,9 +81,9 @@ static const char *status_to_string[] = { }; void -eab_error_dialog (const char *msg, EBookStatus status) +eab_error_dialog (const gchar *msg, EBookStatus status) { - const char *status_str; + const gchar *status_str; if (status >= G_N_ELEMENTS (status_to_string)) status_str = "Other error"; @@ -97,7 +97,7 @@ eab_error_dialog (const char *msg, EBookStatus status) void eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status) { - char *label_string, *label = NULL, *uri; + gchar *label_string, *label = NULL, *uri; GtkWidget *dialog; gboolean can_detail_error = TRUE; @@ -114,7 +114,7 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status) } else if (!strncmp (uri, "file:", 5)) { - char *path = g_filename_from_uri (uri, NULL, NULL); + gchar *path = g_filename_from_uri (uri, NULL, NULL); label = g_strdup_printf ( _("This address book cannot be opened. Please check that the " "path %s exists and that permissions are set to access it."), path); @@ -162,7 +162,7 @@ void eab_search_result_dialog (GtkWidget *parent, EBookViewStatus status) { - char *str = NULL; + gchar *str = NULL; switch (status) { case E_BOOK_VIEW_STATUS_OK: @@ -304,7 +304,7 @@ eab_show_multiple_contacts (EBook *book, gboolean editable) { if (list) { - int length = g_list_length (list); + gint length = g_list_length (list); if (length > 5) { GtkWidget *dialog; gint response; @@ -336,11 +336,11 @@ eab_show_multiple_contacts (EBook *book, static gint -file_exists(GtkWindow *window, const char *filename) +file_exists(GtkWindow *window, const gchar *filename) { GtkWidget *dialog; gint response; - char * utf8_filename; + gchar * utf8_filename; utf8_filename = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL); dialog = gtk_message_dialog_new (window, @@ -362,15 +362,15 @@ file_exists(GtkWindow *window, const char *filename) typedef struct { GtkWidget *filesel; - char *vcard; + gchar *vcard; gboolean has_multiple_contacts; } SaveAsInfo; static void save_it(GtkWidget *widget, SaveAsInfo *info) { - const char *filename; - char *uri; + const gchar *filename; + gchar *uri; gint response = 0; @@ -388,7 +388,7 @@ save_it(GtkWidget *widget, SaveAsInfo *info) } if (!e_write_file_uri (uri, info->vcard)) { - char *err_str_ext; + gchar *err_str_ext; if (info->has_multiple_contacts) { /* more than one, finding the total number of contacts might * hit performance while saving large number of contacts @@ -419,7 +419,7 @@ close_it(GtkWidget *widget, SaveAsInfo *info) } static void -destroy_it(void *data, GObject *where_the_object_was) +destroy_it(gpointer data, GObject *where_the_object_was) { SaveAsInfo *info = data; g_free (info->vcard); @@ -435,10 +435,10 @@ filechooser_response (GtkWidget *widget, gint response_id, SaveAsInfo *info) close_it (widget, info); } -static char * -make_safe_filename (char *name) +static gchar * +make_safe_filename (gchar *name) { - char *safe; + gchar *safe; if (!name) { /* This is a filename. Translators take note. */ @@ -521,11 +521,11 @@ eab_select_source (const gchar *title, const gchar *message, const gchar *select } void -eab_contact_save (char *title, EContact *contact, GtkWindow *parent_window) +eab_contact_save (gchar *title, EContact *contact, GtkWindow *parent_window) { GtkWidget *filesel; - char *file; - char *name; + gchar *file; + gchar *name; SaveAsInfo *info = g_new(SaveAsInfo, 1); name = e_contact_get (contact, E_CONTACT_FILE_AS); @@ -563,11 +563,11 @@ eab_contact_save (char *title, EContact *contact, GtkWindow *parent_window) } void -eab_contact_list_save (char *title, GList *list, GtkWindow *parent_window) +eab_contact_list_save (gchar *title, GList *list, GtkWindow *parent_window) { GtkWidget *filesel; SaveAsInfo *info = g_new(SaveAsInfo, 1); - char *file; + gchar *file; filesel = gtk_file_chooser_dialog_new (title, parent_window, @@ -586,7 +586,7 @@ eab_contact_list_save (char *title, GList *list, GtkWindow *parent_window) /* This is a filename. Translators take note. */ if (list && list->data && list->next == NULL) { - char *name; + gchar *name; name = e_contact_get (E_CONTACT (list->data), E_CONTACT_FILE_AS); if (!name) name = e_contact_get (E_CONTACT (list->data), E_CONTACT_FULL_NAME); @@ -621,7 +621,7 @@ typedef struct ContactCopyProcess_ ContactCopyProcess; typedef void (*ContactCopyDone) (ContactCopyProcess *process); struct ContactCopyProcess_ { - int count; + gint count; gboolean book_status; GList *contacts; EBook *source; @@ -644,7 +644,7 @@ do_delete (gpointer data, gpointer user_data) { EBook *book = user_data; EContact *contact = data; - const char *id; + const gchar *id; id = e_contact_get_const (contact, E_CONTACT_UID); e_book_remove_contact(book, id, NULL); @@ -678,7 +678,7 @@ process_unref (ContactCopyProcess *process) } static void -contact_added_cb (EBook* book, EBookStatus status, const char *id, gpointer user_data) +contact_added_cb (EBook* book, EBookStatus status, const gchar *id, gpointer user_data) { ContactCopyProcess *process = user_data; @@ -733,9 +733,9 @@ eab_transfer_contacts (EBook *source, GList *contacts /* adopted */, gboolean de { EBook *dest; ESource *destination_source; - static char *last_uid = NULL; + static gchar *last_uid = NULL; ContactCopyProcess *process; - char *desc; + gchar *desc; if (contacts == NULL) return; @@ -785,7 +785,7 @@ eab_transfer_contacts (EBook *source, GList *contacts /* adopted */, gboolean de typedef struct { EContact *contact; - int email_num; /* if the contact is a person (not a list), the email address to use */ + gint email_num; /* if the contact is a person (not a list), the email address to use */ } ContactAndEmailNum; static void @@ -858,11 +858,11 @@ eab_send_to_contact_and_email_num_list (GList *contact_list) gtk_widget_show (GTK_WIDGET (composer)); } -static const char * +static const gchar * get_email (EContact *contact, EContactField field_id, gchar **to_free) { - char *name = NULL, *mail = NULL; - const char *value = e_contact_get_const (contact, field_id); + gchar *name = NULL, *mail = NULL; + const gchar *value = e_contact_get_const (contact, field_id); *to_free = NULL; @@ -986,7 +986,7 @@ eab_send_contact_list (GList *contacts, EABDisposition disposition) } void -eab_send_contact (EContact *contact, int email_num, EABDisposition disposition) +eab_send_contact (EContact *contact, gint email_num, EABDisposition disposition) { GList *list = NULL; @@ -1016,7 +1016,7 @@ eab_create_image_chooser_widget(gchar *name, gchar *string1, gchar *string2, gint int1, gint int2) { - char *filename; + gchar *filename; GtkWidget *w = NULL; w = e_image_chooser_new (); @@ -1064,12 +1064,12 @@ eab_parse_qp_email (const gchar *string, gchar **name, gchar **email) then makes one string and returns it, otherwise returns NULL. Returned string is usable to place directly into GtkHtml stream. Returned value should be freed with g_free. */ -char * +gchar * eab_parse_qp_email_to_html (const gchar *string) { - char *name = NULL, *mail = NULL; - char *html_name, *html_mail; - char *value; + gchar *name = NULL, *mail = NULL; + gchar *html_name, *html_mail; + gchar *value; if (!eab_parse_qp_email (string, &name, &mail)) return NULL; diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h index b5129d1637..f29f2292f8 100644 --- a/addressbook/gui/widgets/eab-gui-util.h +++ b/addressbook/gui/widgets/eab-gui-util.h @@ -56,11 +56,11 @@ void eab_transfer_contacts (EBook *source, gboolean delete_from_source, GtkWindow *parent_window); -void eab_contact_save (char *title, +void eab_contact_save (gchar *title, EContact *contact, GtkWindow *parent_window); -void eab_contact_list_save (char *title, +void eab_contact_list_save (gchar *title, GList *list, GtkWindow *parent_window); @@ -70,7 +70,7 @@ typedef enum { } EABDisposition; void eab_send_contact (EContact *contact, - int email_num, + gint email_num, EABDisposition disposition); void eab_send_contact_list (GList *contacts, EABDisposition disposition); @@ -83,7 +83,7 @@ ESource *eab_select_source (const gchar *title, const gch /* To parse quoted printable address & return email & name fields */ gboolean eab_parse_qp_email (const gchar *string, gchar **name, gchar **email); -char *eab_parse_qp_email_to_html (const gchar *string); +gchar *eab_parse_qp_email_to_html (const gchar *string); G_END_DECLS diff --git a/addressbook/gui/widgets/eab-menu.c b/addressbook/gui/widgets/eab-menu.c index e07489b003..e26e621437 100644 --- a/addressbook/gui/widgets/eab-menu.c +++ b/addressbook/gui/widgets/eab-menu.c @@ -33,7 +33,7 @@ #include "eab-menu.h" -static void eabm_standard_menu_factory(EMenu *emp, void *data); +static void eabm_standard_menu_factory(EMenu *emp, gpointer data); static GObjectClass *eabm_parent; @@ -55,7 +55,7 @@ eabm_target_free(EMenu *ep, EMenuTarget *t) switch (t->type) { case EAB_MENU_TARGET_SELECT: { EABMenuTargetSelect *s = (EABMenuTargetSelect *)t; - int i; + gint i; for (i=0;icards->len;i++) g_object_unref(s->cards->pdata[i]); @@ -98,7 +98,7 @@ eab_menu_get_type(void) return type; } -EABMenu *eab_menu_new(const char *menuid) +EABMenu *eab_menu_new(const gchar *menuid) { EABMenu *emp = g_object_new(eab_menu_get_type(), NULL); @@ -119,11 +119,11 @@ EABMenu *eab_menu_new(const char *menuid) * Return value: **/ EABMenuTargetSelect * -eab_menu_target_new_select(EABMenu *eabp, struct _EBook *book, int readonly, GPtrArray *cards) +eab_menu_target_new_select(EABMenu *eabp, struct _EBook *book, gint readonly, GPtrArray *cards) { EABMenuTargetSelect *t = e_menu_target_new(&eabp->menu, EAB_MENU_TARGET_SELECT, sizeof(*t)); guint32 mask = ~0; - int has_email = FALSE, i; + gint has_email = FALSE, i; /* FIXME: duplicated in eab-popup.c */ @@ -166,7 +166,7 @@ eab_menu_target_new_select(EABMenu *eabp, struct _EBook *book, int readonly, GPt } static void -eabm_standard_menu_factory(EMenu *emp, void *data) +eabm_standard_menu_factory(EMenu *emp, gpointer data) { /* noop */ } @@ -199,7 +199,7 @@ eabm_standard_menu_factory(EMenu *emp, void *data) */ -static void *eabmph_parent_class; +static gpointer eabmph_parent_class; #define eabmph ((EABMenuHook *)eph) static const EMenuHookTargetMask eabmph_select_masks[] = { @@ -227,7 +227,7 @@ eabmph_finalise(GObject *o) static void eabmph_class_init(EPluginHookClass *klass) { - int i; + gint i; ((GObjectClass *)klass)->finalize = eabmph_finalise; ((EPluginHookClass *)klass)->id = "org.gnome.evolution.addressbook.bonobomenu:1.0"; diff --git a/addressbook/gui/widgets/eab-menu.h b/addressbook/gui/widgets/eab-menu.h index 7bea32efa4..53e2e88b25 100644 --- a/addressbook/gui/widgets/eab-menu.h +++ b/addressbook/gui/widgets/eab-menu.h @@ -84,9 +84,9 @@ struct _EABMenuClass { GType eab_menu_get_type(void); -EABMenu *eab_menu_new(const char *menuid); +EABMenu *eab_menu_new(const gchar *menuid); -EABMenuTargetSelect *eab_menu_target_new_select(EABMenu *eabp, struct _EBook *book, int readonly, GPtrArray *cards); +EABMenuTargetSelect *eab_menu_target_new_select(EABMenu *eabp, struct _EBook *book, gint readonly, GPtrArray *cards); /* ********************************************************************** */ diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c index d520108db4..e56b816af2 100644 --- a/addressbook/gui/widgets/eab-popup-control.c +++ b/addressbook/gui/widgets/eab-popup-control.c @@ -316,7 +316,7 @@ eab_popup_new (void) } static void -emit_event (EABPopupControl *pop, const char *event) +emit_event (EABPopupControl *pop, const gchar *event) { if (pop->es) { BonoboArg *arg; diff --git a/addressbook/gui/widgets/eab-popup.c b/addressbook/gui/widgets/eab-popup.c index 1b5cde4b5c..2957c483a6 100644 --- a/addressbook/gui/widgets/eab-popup.c +++ b/addressbook/gui/widgets/eab-popup.c @@ -53,7 +53,7 @@ eabp_target_free(EPopup *ep, EPopupTarget *t) switch (t->type) { case EAB_POPUP_TARGET_SELECT: { EABPopupTargetSelect *s = (EABPopupTargetSelect *)t; - int i; + gint i; for (i=0;icards->len;i++) g_object_unref(s->cards->pdata[i]); @@ -115,7 +115,7 @@ eab_popup_get_type(void) return type; } -EABPopup *eab_popup_new(const char *menuid) +EABPopup *eab_popup_new(const gchar *menuid) { EABPopup *eabp = g_object_new(eab_popup_get_type(), NULL); @@ -138,7 +138,7 @@ EABPopup *eab_popup_new(const char *menuid) EABPopupTargetURI * -eab_popup_target_new_uri(EABPopup *emp, const char *uri) +eab_popup_target_new_uri(EABPopup *emp, const gchar *uri) { EABPopupTargetURI *t = e_popup_target_new(&emp->popup, EAB_POPUP_TARGET_URI, sizeof(*t)); guint32 mask = ~0; @@ -162,11 +162,11 @@ eab_popup_target_new_uri(EABPopup *emp, const char *uri) EABPopupTargetSelect * -eab_popup_target_new_select(EABPopup *eabp, struct _EBook *book, int readonly, GPtrArray *cards) +eab_popup_target_new_select(EABPopup *eabp, struct _EBook *book, gint readonly, GPtrArray *cards) { EABPopupTargetSelect *t = e_popup_target_new(&eabp->popup, EAB_POPUP_TARGET_SELECT, sizeof(*t)); guint32 mask = ~0; - int has_email = FALSE, i; + gint has_email = FALSE, i; /* FIXME: duplicated in eab-menu.c */ @@ -219,7 +219,7 @@ eab_popup_target_new_source(EABPopup *eabp, ESourceSelector *selector) { EABPopupTargetSource *t = e_popup_target_new(&eabp->popup, EAB_POPUP_TARGET_SOURCE, sizeof(*t)); guint32 mask = ~0; - const char *source_uri; + const gchar *source_uri; ESource *source; /* TODO: this is duplicated for calendar and tasks too */ @@ -247,7 +247,7 @@ eab_popup_target_new_source(EABPopup *eabp, ESourceSelector *selector) #ifdef ADAPTED_TO_E_NAME_SELECTOR EABPopupTargetSelectNames * -eab_popup_target_new_select_names(EABPopup *eabp, struct _ESelectNamesModel *model, int row) +eab_popup_target_new_select_names(EABPopup *eabp, struct _ESelectNamesModel *model, gint row) { EABPopupTargetSelectNames *t = e_popup_target_new(&eabp->popup, EAB_POPUP_TARGET_SELECT_NAMES, sizeof(*t)); @@ -290,7 +290,7 @@ eab_popup_target_new_select_names(EABPopup *eabp, struct _ESelectNamesModel *mod */ -static void *eabph_parent_class; +static gpointer eabph_parent_class; #define eabph ((EABPopupHook *)eph) static const EPopupHookTargetMask eabph_select_masks[] = { @@ -338,7 +338,7 @@ eabph_finalise(GObject *o) static void eabph_class_init(EPluginHookClass *klass) { - int i; + gint i; ((GObjectClass *)klass)->finalize = eabph_finalise; ((EPluginHookClass *)klass)->id = "org.gnome.evolution.addressbook.popup:1.0"; diff --git a/addressbook/gui/widgets/eab-popup.h b/addressbook/gui/widgets/eab-popup.h index 86deff7f9c..2be355cf25 100644 --- a/addressbook/gui/widgets/eab-popup.h +++ b/addressbook/gui/widgets/eab-popup.h @@ -114,7 +114,7 @@ struct _EABPopupTargetSelect { struct _EABPopupTargetURI { EPopupTarget target; - char *uri; + gchar *uri; }; /** @@ -147,7 +147,7 @@ struct _EABPopupTargetSelectNames { EPopupTarget target; struct _ESelectNamesModel *model; - int row; + gint row; }; #endif @@ -167,15 +167,15 @@ struct _EABPopupClass { GType eab_popup_get_type(void); -EABPopup *eab_popup_new(const char *menuid); +EABPopup *eab_popup_new(const gchar *menuid); -EABPopupTargetSelect *eab_popup_target_new_select(EABPopup *eabp, struct _EBook *book, int readonly, GPtrArray *cards); -EABPopupTargetURI *eab_popup_target_new_uri(EABPopup *emp, const char *uri); +EABPopupTargetSelect *eab_popup_target_new_select(EABPopup *eabp, struct _EBook *book, gint readonly, GPtrArray *cards); +EABPopupTargetURI *eab_popup_target_new_uri(EABPopup *emp, const gchar *uri); EABPopupTargetSource *eab_popup_target_new_source(EABPopup *eabp, struct _ESourceSelector *selector); #ifdef ADAPTED_TO_E_NAME_SELECTOR -EABPopupTargetSelectNames *eab_popup_target_new_select_names(EABPopup *eabp, struct _ESelectNamesModel *model, int row); +EABPopupTargetSelectNames *eab_popup_target_new_select_names(EABPopup *eabp, struct _ESelectNamesModel *model, gint row); #endif diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c index 0240dddb60..2e9accaeac 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.c +++ b/addressbook/gui/widgets/gal-view-factory-minicard.c @@ -31,7 +31,7 @@ G_DEFINE_TYPE (GalViewFactoryMinicard, gal_view_factory_minicard, GAL_VIEW_FACTORY_TYPE) -static const char * +static const gchar * gal_view_factory_minicard_get_title (GalViewFactory *factory) { return _("Card View"); @@ -39,12 +39,12 @@ gal_view_factory_minicard_get_title (GalViewFactory *factory) static GalView * gal_view_factory_minicard_new_view (GalViewFactory *factory, - const char *name) + const gchar *name) { return gal_view_minicard_new(name); } -static const char * +static const gchar * gal_view_factory_minicard_get_type_code (GalViewFactory *factory) { return "minicard"; diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index 0a2fac9262..ae9b916e54 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -40,34 +40,34 @@ static GalViewClass *gal_view_minicard_parent_class; static void gal_view_minicard_load (GalView *view, - const char *filename) + const gchar *filename) { xmlDoc *doc; doc = e_xml_parse_file (filename); if (doc) { xmlNode *root = xmlDocGetRootElement(doc); - GAL_VIEW_MINICARD (view)->column_width = e_xml_get_double_prop_by_name_with_default (root, (const unsigned char *)"column_width", 150); + GAL_VIEW_MINICARD (view)->column_width = e_xml_get_double_prop_by_name_with_default (root, (const guchar *)"column_width", 150); xmlFreeDoc(doc); } } static void gal_view_minicard_save (GalView *view, - const char *filename) + const gchar *filename) { xmlDoc *doc; xmlNode *root; - doc = xmlNewDoc((const unsigned char *)"1.0"); - root = xmlNewNode (NULL, (const unsigned char *)"EMinicardViewState"); - e_xml_set_double_prop_by_name (root, (const unsigned char *)"column_width", GAL_VIEW_MINICARD (view)->column_width); + doc = xmlNewDoc((const guchar *)"1.0"); + root = xmlNewNode (NULL, (const guchar *)"EMinicardViewState"); + e_xml_set_double_prop_by_name (root, (const guchar *)"column_width", GAL_VIEW_MINICARD (view)->column_width); xmlDocSetRootElement(doc, root); e_xml_save_file (filename, doc); xmlFreeDoc(doc); } -static const char * +static const gchar * gal_view_minicard_get_title (GalView *view) { return GAL_VIEW_MINICARD(view)->title; @@ -75,13 +75,13 @@ gal_view_minicard_get_title (GalView *view) static void gal_view_minicard_set_title (GalView *view, - const char *title) + const gchar *title) { g_free(GAL_VIEW_MINICARD(view)->title); GAL_VIEW_MINICARD(view)->title = g_strdup(title); } -static const char * +static const gchar * gal_view_minicard_get_type_code (GalView *view) { return "minicard"; diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h index cf3faaec56..f5681fcca5 100644 --- a/addressbook/gui/widgets/gal-view-minicard.h +++ b/addressbook/gui/widgets/gal-view-minicard.h @@ -38,7 +38,7 @@ typedef struct { GalView base; - char *title; + gchar *title; double column_width; EMinicardViewWidget *emvw; diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index 164f9f5fe2..0456f81b19 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -53,7 +53,7 @@ typedef struct { guint idle_id; - int state; + gint state; FILE *file; gulong size; gint count; @@ -63,7 +63,7 @@ typedef struct { } CSVImporter; static gint importer; -static char delimiter; +static gchar delimiter; static void csv_import_done(CSVImporter *gci); @@ -85,7 +85,7 @@ typedef struct { #define FLAG_BIRTH_MONTH 0x50 #define FLAG_DATE_ANNIVERSARY 0x30 #define FLAG_INVALID 0xff - int flags; + gint flags; }import_fields; static import_fields csv_fields_outlook[] = { @@ -263,7 +263,7 @@ static import_fields csv_fields_evolution[] = { }; static void -add_to_notes(EContact *contact, gint i, char *val) { +add_to_notes(EContact *contact, gint i, gchar *val) { const gchar *old_text; const gchar *field_text = NULL; GString *new_text; @@ -296,12 +296,12 @@ add_to_notes(EContact *contact, gint i, char *val) { /* @str: a date string in the format MM-DD-YYYY or MMDDYYYY */ static EContactDate* -date_from_string (const char *str) +date_from_string (const gchar *str) { EContactDate* date; - int length; - char *t; - int i = 0; + gint length; + gchar *t; + gint i = 0; g_return_val_if_fail (str != NULL, NULL); @@ -335,13 +335,13 @@ date_from_string (const char *str) } static gboolean -parseLine (CSVImporter *gci, EContact *contact, char *buf) { +parseLine (CSVImporter *gci, EContact *contact, gchar *buf) { - char *ptr = buf, *do_free = NULL; + gchar *ptr = buf, *do_free = NULL; GString *value; gint i = 0; - int flags = 0; - int contact_field; + gint flags = 0; + gint contact_field; EContactAddress *home_address = NULL, *work_address = NULL, *other_address = NULL; EContactDate *bday = NULL; GString *home_street, *work_street, *other_street; @@ -554,8 +554,8 @@ getNextCSVEntry(CSVImporter *gci, FILE *f) { EContact *contact = NULL; GString *line; GString *str; - char *buf; - char c; + gchar *buf; + gchar c; /* if(!fgets(line, sizeof(line),f)) @@ -642,7 +642,7 @@ getNextCSVEntry(CSVImporter *gci, FILE *f) { } static gboolean -csv_import_contacts(void *d) { +csv_import_contacts(gpointer d) { CSVImporter *gci = d; EContact *contact = NULL; @@ -711,8 +711,8 @@ static const gchar *supported_extensions[4] = { static gboolean csv_supported(EImport *ei, EImportTarget *target, EImportImporter *im) { - char *ext; - int i; + gchar *ext; + gint i; EImportTargetURI *s; if (target->type != E_IMPORT_TARGET_URI) diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index 75f30a2359..544bb485fb 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -58,7 +58,7 @@ typedef struct { GHashTable *dn_contact_hash; - int state; /* 0 - initial scan, 1 - list cards, 2 - cancelled/complete */ + gint state; /* 0 - initial scan, 1 - list cards, 2 - cancelled/complete */ FILE *file; gulong size; @@ -79,7 +79,7 @@ static struct { #define FLAG_WORK_ADDRESS 0x02 #define FLAG_LIST 0x04 #define FLAG_BOOLEAN 0x08 - int flags; + gint flags; } ldif_fields[] = { { "cn", E_CONTACT_FULL_NAME }, @@ -128,13 +128,13 @@ ldif_fields[] = { { "nsAIMid", E_CONTACT_IM_AIM, FLAG_LIST }, { "mozilla_AimScreenName", E_CONTACT_IM_AIM, FLAG_LIST } }; -static int num_ldif_fields = sizeof(ldif_fields) / sizeof (ldif_fields[0]); +static gint num_ldif_fields = sizeof(ldif_fields) / sizeof (ldif_fields[0]); static GString * -getValue( char **src ) +getValue( gchar **src ) { GString *dest = g_string_new(""); - char *s = *src; + gchar *s = *src; gboolean need_base64 = (*s == ':'); copy_line: @@ -167,7 +167,7 @@ getValue( char **src ) } static void -populate_contact_address (EContactAddress *address, char *attr, char *value) +populate_contact_address (EContactAddress *address, gchar *attr, gchar *value) { if (!g_ascii_strcasecmp (attr, "locality") || !g_ascii_strcasecmp (attr, "l") || @@ -188,7 +188,7 @@ populate_contact_address (EContactAddress *address, char *attr, char *value) else if (!g_ascii_strcasecmp (attr, "mozillaPostalAddress2") || !g_ascii_strcasecmp (attr, "mozillaHomePostalAddress2")) { if (address->ext && *address->ext) { - char *temp = g_strdup (address->ext); + gchar *temp = g_strdup (address->ext); g_free (address->ext); address->ext = g_strconcat (temp, ",\n", value, NULL); g_free (temp); @@ -199,7 +199,7 @@ populate_contact_address (EContactAddress *address, char *attr, char *value) } else if (!g_ascii_strcasecmp (attr, "postalAddress") || !g_ascii_strcasecmp (attr, "homepostalAddress")) { - char *c, *i, *addr_field; + gchar *c, *i, *addr_field; addr_field = g_strdup (value); i = addr_field; @@ -210,7 +210,7 @@ populate_contact_address (EContactAddress *address, char *attr, char *value) } } if (address->ext && *address->ext) { - char *temp = g_strdup (address->ext); + gchar *temp = g_strdup (address->ext); g_free (address->ext); address->ext = g_strconcat (addr_field, ",\n", temp, NULL); g_free (temp); @@ -225,10 +225,10 @@ populate_contact_address (EContactAddress *address, char *attr, char *value) static gboolean parseLine (LDIFImporter *gci, EContact *contact, EContactAddress *work_address, EContactAddress *home_address, - char **buf) + gchar **buf) { - char *ptr; - char *colon, *value; + gchar *ptr; + gchar *colon, *value; gboolean field_handled; GString *ldif_value; @@ -256,9 +256,9 @@ parseLine (LDIFImporter *gci, EContact *contact, return FALSE; } - colon = (char *)strchr( ptr, ':' ); + colon = (gchar *)strchr( ptr, ':' ); if (colon) { - int i; + gint i; *colon = 0; value = colon + 1; @@ -345,8 +345,8 @@ getNextLDIFEntry(LDIFImporter *gci, FILE *f ) EContact *contact; EContactAddress *work_address, *home_address; GString *str; - char line[1024]; - char *buf; + gchar line[1024]; + gchar *buf; str = g_string_new (""); /* read from the file until we get to a blank line (or eof) */ @@ -402,7 +402,7 @@ resolve_list_card (LDIFImporter *gci, EContact *contact) { GList *email, *l; GList *email_attrs = NULL; - char *full_name; + gchar *full_name; /* set file_as to full_name so we don't later try and figure out a first/last name for the list. */ @@ -415,7 +415,7 @@ resolve_list_card (LDIFImporter *gci, EContact *contact) email = e_contact_get (contact, E_CONTACT_EMAIL); for (l = email; l; l = l->next) { /* mozilla stuffs dn's in the EMAIL list for contact lists */ - char *dn = l->data; + gchar *dn = l->data; EContact *dn_contact = g_hash_table_lookup (gci->dn_contact_hash, dn); /* break list chains here, since we don't support them just yet */ @@ -467,12 +467,12 @@ add_to_notes (EContact *contact, EContactField field) } static gboolean -ldif_import_contacts(void *d) +ldif_import_contacts(gpointer d) { LDIFImporter *gci = d; EContact *contact; GSList *iter; - int count = 0; + gint count = 0; /* We process all normal cards immediately and keep the list ones till the end */ @@ -563,8 +563,8 @@ static const gchar *supported_extensions[2] = { static gboolean ldif_supported(EImport *ei, EImportTarget *target, EImportImporter *im) { - char *ext; - int i; + gchar *ext; + gint i; EImportTargetURI *s; if (target->type != E_IMPORT_TARGET_URI) diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index 1ec623d098..169c6413d1 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -51,9 +51,9 @@ typedef struct { guint idle_id; - int state; /* 0 - importing, 1 - cancelled/complete */ - int total; - int count; + gint state; /* 0 - importing, 1 - cancelled/complete */ + gint total; + gint count; ESource *primary; @@ -115,8 +115,8 @@ vcard_import_contact(VCardImporter *gci, EContact *contact) GList *v = e_vcard_attribute_get_values (a); if (v && v->data) { - if (!strncmp ((char*)v->data, "data); + if (!strncmp ((gchar *)v->data, "data); e_destination_export_to_vcard_attribute (dest, a); @@ -155,9 +155,9 @@ vcard_import_contact(VCardImporter *gci, EContact *contact) vs = e_vcard_attribute_param_get_values (p); for (v = vs; v; v = v->next) { - if (!g_ascii_strcasecmp ((char*)v->data, "WORK") || - !g_ascii_strcasecmp ((char*)v->data, "HOME") || - !g_ascii_strcasecmp ((char*)v->data, "OTHER")) + if (!g_ascii_strcasecmp ((gchar *)v->data, "WORK") || + !g_ascii_strcasecmp ((gchar *)v->data, "HOME") || + !g_ascii_strcasecmp ((gchar *)v->data, "OTHER")) no_location = FALSE; else location_only = FALSE; @@ -204,8 +204,8 @@ vcard_import_contact(VCardImporter *gci, EContact *contact) vs = e_vcard_attribute_param_get_values (p); for (v = vs; v; v = v->next) { - if (!g_ascii_strcasecmp ((char*)v->data, "WORK") || - !g_ascii_strcasecmp ((char*)v->data, "HOME")) + if (!g_ascii_strcasecmp ((gchar *)v->data, "WORK") || + !g_ascii_strcasecmp ((gchar *)v->data, "HOME")) no_location = FALSE; } } @@ -228,10 +228,10 @@ vcard_import_contact(VCardImporter *gci, EContact *contact) } static gboolean -vcard_import_contacts(void *data) +vcard_import_contacts(gpointer data) { VCardImporter *gci = data; - int count = 0; + gint count = 0; GList *iterator = gci->iterator; if (gci->state == 0) { @@ -319,11 +319,11 @@ typedef enum _VCardEncoding VCardEncoding; /* Actually check the contents of this file */ static VCardEncoding -guess_vcard_encoding (const char *filename) +guess_vcard_encoding (const gchar *filename) { FILE *handle; - char line[4096]; - char *line_utf8; + gchar line[4096]; + gchar *line_utf8; VCardEncoding encoding = VCARD_ENCODING_NONE; handle = g_fopen (filename, "r"); @@ -455,7 +455,7 @@ static void vcard_import(EImport *ei, EImportTarget *target, EImportImporter *im) { VCardImporter *gci; - char *contents; + gchar *contents; VCardEncoding encoding; EBook *book; EImportTargetURI *s = (EImportTargetURI *)target; diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index cc3affeb2c..e57e5d175e 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -225,9 +225,9 @@ e_contact_start_new_page (EContactPrintContext *ctxt) static void e_contact_print_contact (EContact *contact, EContactPrintContext *ctxt) { - char *file_as; + gchar *file_as; cairo_t *cr; - int field; + gint field; cr = gtk_print_context_get_cairo_context (ctxt->context); cairo_save(cr); @@ -444,70 +444,70 @@ e_contact_build_style (EContactPrintStyle *style) xmlNodePtr stylenode = xmlDocGetRootElement(styledoc); xmlNodePtr node; for (node = stylenode->children; node; node = node->next) { - char *data = (char *)xmlNodeGetContent ( node ); - if ( !strcmp( (char *)node->name, "title" ) ) { + gchar *data = (gchar *)xmlNodeGetContent ( node ); + if ( !strcmp( (gchar *)node->name, "title" ) ) { get_string(data, &(style->title)); - } else if ( !strcmp( (char *)node->name, "type" ) ) { + } else if ( !strcmp( (gchar *)node->name, "type" ) ) { if (g_ascii_strcasecmp (data, "cards") == 0) style->type = E_CONTACT_PRINT_TYPE_CARDS; else if (g_ascii_strcasecmp (data, "memo_style") == 0) style->type = E_CONTACT_PRINT_TYPE_MEMO_STYLE; else if (g_ascii_strcasecmp (data, "phone_list") == 0) style->type = E_CONTACT_PRINT_TYPE_PHONE_LIST; - } else if ( !strcmp( (char *)node->name, "sections_start_new_page" ) ) { + } else if ( !strcmp( (gchar *)node->name, "sections_start_new_page" ) ) { style->sections_start_new_page = get_bool(data); - } else if ( !strcmp( (char *)node->name, "num_columns" ) ) { + } else if ( !strcmp( (gchar *)node->name, "num_columns" ) ) { style->num_columns = get_integer(data); - } else if ( !strcmp( (char *)node->name, "blank_forms" ) ) { + } else if ( !strcmp( (gchar *)node->name, "blank_forms" ) ) { style->blank_forms = get_integer(data); - } else if ( !strcmp( (char *)node->name, "letter_headings" ) ) { + } else if ( !strcmp( (gchar *)node->name, "letter_headings" ) ) { style->letter_headings = get_bool(data); - } else if ( !strcmp( (char *)node->name, "headings_font" ) ) { + } else if ( !strcmp( (gchar *)node->name, "headings_font" ) ) { get_font( data, &(style->headings_font) ); - } else if ( !strcmp( (char *)node->name, "body_font" ) ) { + } else if ( !strcmp( (gchar *)node->name, "body_font" ) ) { get_font( data, &(style->body_font) ); - } else if ( !strcmp( (char *)node->name, "print_using_grey" ) ) { + } else if ( !strcmp( (gchar *)node->name, "print_using_grey" ) ) { style->print_using_grey = get_bool(data); - } else if ( !strcmp( (char *)node->name, "paper_width" ) ) { + } else if ( !strcmp( (gchar *)node->name, "paper_width" ) ) { style->paper_width = get_float(data); - } else if ( !strcmp( (char *)node->name, "paper_height" ) ) { + } else if ( !strcmp( (gchar *)node->name, "paper_height" ) ) { style->paper_height = get_float(data); - } else if ( !strcmp( (char *)node->name, "top_margin" ) ) { + } else if ( !strcmp( (gchar *)node->name, "top_margin" ) ) { style->top_margin = get_float(data); - } else if ( !strcmp( (char *)node->name, "left_margin" ) ) { + } else if ( !strcmp( (gchar *)node->name, "left_margin" ) ) { style->left_margin = get_float(data); - } else if ( !strcmp( (char *)node->name, "bottom_margin" ) ) { + } else if ( !strcmp( (gchar *)node->name, "bottom_margin" ) ) { style->bottom_margin = get_float(data); - } else if ( !strcmp( (char *)node->name, "right_margin" ) ) { + } else if ( !strcmp( (gchar *)node->name, "right_margin" ) ) { style->right_margin = get_float(data); - } else if ( !strcmp( (char *)node->name, "page_width" ) ) { + } else if ( !strcmp( (gchar *)node->name, "page_width" ) ) { style->page_width = get_float(data); - } else if ( !strcmp( (char *)node->name, "page_height" ) ) { + } else if ( !strcmp( (gchar *)node->name, "page_height" ) ) { style->page_height = get_float(data); - } else if ( !strcmp( (char *)node->name, "orientation" ) ) { + } else if ( !strcmp( (gchar *)node->name, "orientation" ) ) { if ( data ) { style->orientation_portrait = (g_ascii_strcasecmp (data, "landscape") != 0); } else { style->orientation_portrait = TRUE; } - } else if ( !strcmp( (char *)node->name, "header_font" ) ) { + } else if ( !strcmp( (gchar *)node->name, "header_font" ) ) { get_font( data, &(style->header_font) ); - } else if ( !strcmp( (char *)node->name, "left_header" ) ) { + } else if ( !strcmp( (gchar *)node->name, "left_header" ) ) { get_string(data, &(style->left_header)); - } else if ( !strcmp( (char *)node->name, "center_header" ) ) { + } else if ( !strcmp( (gchar *)node->name, "center_header" ) ) { get_string(data, &(style->center_header)); - } else if ( !strcmp( (char *)node->name, "right_header" ) ) { + } else if ( !strcmp( (gchar *)node->name, "right_header" ) ) { get_string(data, &(style->right_header)); - } else if ( !strcmp( (char *)node->name, "footer_font" ) ) { + } else if ( !strcmp( (gchar *)node->name, "footer_font" ) ) { get_font( data, &(style->footer_font) ); - } else if ( !strcmp( (char *)node->name, "left_footer" ) ) { + } else if ( !strcmp( (gchar *)node->name, "left_footer" ) ) { get_string(data, &(style->left_footer)); - } else if ( !strcmp( (char *)node->name, "center_footer" ) ) { + } else if ( !strcmp( (gchar *)node->name, "center_footer" ) ) { get_string(data, &(style->center_footer)); - } else if ( !strcmp( (char *)node->name, "right_footer" ) ) { + } else if ( !strcmp( (gchar *)node->name, "right_footer" ) ) { get_string(data, &(style->right_footer)); - } else if ( !strcmp( (char *)node->name, "reverse_on_even_pages" ) ) { + } else if ( !strcmp( (gchar *)node->name, "reverse_on_even_pages" ) ) { style->reverse_on_even_pages = get_bool(data); } if ( data ) diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c index c38d2129a0..58ff940f03 100644 --- a/addressbook/printing/test-print.c +++ b/addressbook/printing/test-print.c @@ -27,8 +27,8 @@ #include #include "e-contact-print.h" -int -main (int argc, char *argv[]) +gint +main (gint argc, gchar *argv[]) { GList *shown_fields = NULL; diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c index 72fa8a07e3..2b418345ae 100644 --- a/addressbook/tools/evolution-addressbook-export-list-cards.c +++ b/addressbook/tools/evolution-addressbook-export-list-cards.c @@ -242,7 +242,7 @@ gchar *e_contact_get_csv (EContact * contact, GSList * csv_all_fields); gchar *delivery_address_get_sub_field (const EContactAddress * delivery_address, DeliveryAddressField sub_field); gchar *check_null_pointer (gchar * orig); gchar *escape_string (gchar * orig); -int output_n_cards_file (FILE * outputfile, GList *contacts, int size, int begin_no, CARD_FORMAT format); +gint output_n_cards_file (FILE * outputfile, GList *contacts, gint size, gint begin_no, CARD_FORMAT format); static void fork_to_background (void); void set_pre_defined_field (GSList ** pre_defined_fields); @@ -566,10 +566,10 @@ escape_string (gchar *orig) return dest; } -int -output_n_cards_file (FILE * outputfile, GList *contacts, int size, int begin_no, CARD_FORMAT format) +gint +output_n_cards_file (FILE * outputfile, GList *contacts, gint size, gint begin_no, CARD_FORMAT format) { - int i; + gint i; if (format == CARD_FORMAT_VCARD) { for (i = begin_no; i < size + begin_no; i++) { EContact *contact = g_list_nth_data (contacts, i); @@ -628,11 +628,11 @@ action_list_cards (GList *contacts, ActionContext * p_actctx) { FILE *outputfile; long length; - int IsFirstOne; - int series_no; + gint IsFirstOne; + gint series_no; gchar *file_series_name; CARD_FORMAT format; - int size; + gint size; length = g_list_length (contacts); diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c index e93748861d..1f18686242 100644 --- a/addressbook/tools/evolution-addressbook-export-list-folders.c +++ b/addressbook/tools/evolution-addressbook-export-list-folders.c @@ -61,8 +61,8 @@ action_list_folders_init (ActionContext * p_actctx) EBook *book; EBookQuery *query; GList *contacts; - char *uri; - const char *name; + gchar *uri; + const gchar *name; book = e_book_new (s, NULL); if (!book diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c index 1a7f86142b..c8ae956081 100644 --- a/addressbook/tools/evolution-addressbook-export.c +++ b/addressbook/tools/evolution-addressbook-export.c @@ -64,16 +64,16 @@ static GOptionEntry entries[] = { { NULL } }; -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { ActionContext actctx; GOptionContext *context; GError *error = NULL; - int current_action = ACTION_NOTHING; - int IsCSV = FALSE; - int IsVCard = FALSE; + gint current_action = ACTION_NOTHING; + gint IsCSV = FALSE; + gint IsVCard = FALSE; /*i18n-lize */ bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); @@ -162,7 +162,7 @@ main (int argc, char **argv) exit (-1); } - /*FIXME:should free actctx's some char* field, such as output_file! but since the program will end, so that will not cause mem leak. */ + /*FIXME:should free actctx's some gchar * field, such as output_file! but since the program will end, so that will not cause mem leak. */ exit (0); } diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c index 8d08a3e88f..ec8fccb5ba 100644 --- a/addressbook/util/eab-book-util.c +++ b/addressbook/util/eab-book-util.c @@ -46,11 +46,11 @@ eab_get_config_database (void) * */ -static char* -escape (const char *str) +static gchar * +escape (const gchar *str) { GString *s = g_string_new (NULL); - const char *p = str; + const gchar *p = str; while (*p) { if (*p == '\\') @@ -76,7 +76,7 @@ eab_name_and_email_query (EBook *book, gchar *email_query=NULL, *name_query=NULL; EBookQuery *query; guint tag; - char *escaped_name, *escaped_email; + gchar *escaped_name, *escaped_email; g_return_val_if_fail (book && E_IS_BOOK (book), 0); g_return_val_if_fail (cb != NULL, 0); @@ -118,7 +118,7 @@ eab_name_and_email_query (EBook *book, /* Assemble our e-mail & name queries */ if (email_query && name_query) { - char *full_query = g_strdup_printf ("(and %s %s)", email_query, name_query); + gchar *full_query = g_strdup_printf ("(and %s %s)", email_query, name_query); query = e_book_query_from_string (full_query); g_free (full_query); } @@ -147,12 +147,12 @@ eab_name_and_email_query (EBook *book, */ guint eab_nickname_query (EBook *book, - const char *nickname, + const gchar *nickname, EBookListCallback cb, gpointer closure) { EBookQuery *query; - char *query_string; + gchar *query_string; guint retval; g_return_val_if_fail (E_IS_BOOK (book), 0); @@ -175,11 +175,11 @@ eab_nickname_query (EBook *book, } /* Copied from camel_strstrcase */ -static char * -eab_strstrcase (const char *haystack, const char *needle) +static gchar * +eab_strstrcase (const gchar *haystack, const gchar *needle) { /* find the needle in the haystack neglecting case */ - const char *ptr; + const gchar *ptr; guint len; g_return_val_if_fail (haystack != NULL, NULL); @@ -190,24 +190,24 @@ eab_strstrcase (const char *haystack, const char *needle) return NULL; if (len == 0) - return (char *) haystack; + return (gchar *) haystack; for (ptr = haystack; *(ptr + len - 1) != '\0'; ptr++) if (!g_ascii_strncasecmp (ptr, needle, len)) - return (char *) ptr; + return (gchar *) ptr; return NULL; } GList* -eab_contact_list_from_string (const char *str) +eab_contact_list_from_string (const gchar *str) { GList *contacts = NULL; GString *gstr = g_string_new (NULL); - char *str_stripped; - char *p = (char*)str; - char *q; + gchar *str_stripped; + gchar *p = (gchar *)str; + gchar *q; if (!p) return NULL; @@ -270,7 +270,7 @@ eab_contact_list_from_string (const char *str) return contacts; } -char* +gchar * eab_contact_list_to_string (GList *contacts) { GString *str = g_string_new (""); @@ -278,7 +278,7 @@ eab_contact_list_to_string (GList *contacts) for (l = contacts; l; l = l->next) { EContact *contact = l->data; - char *vcard_str = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30); + gchar *vcard_str = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30); g_string_append (str, vcard_str); if (l->next) @@ -289,10 +289,10 @@ eab_contact_list_to_string (GList *contacts) } gboolean -eab_book_and_contact_list_from_string (const char *str, EBook **book, GList **contacts) +eab_book_and_contact_list_from_string (const gchar *str, EBook **book, GList **contacts) { - const char *s0, *s1; - char *uri; + const gchar *s0, *s1; + gchar *uri; g_return_val_if_fail (str != NULL, FALSE); g_return_val_if_fail (book != NULL, FALSE); @@ -323,10 +323,10 @@ eab_book_and_contact_list_from_string (const char *str, EBook **book, GList **co return *book ? TRUE : FALSE; } -char * +gchar * eab_book_and_contact_list_to_string (EBook *book, GList *contacts) { - char *s0, *s1; + gchar *s0, *s1; s0 = eab_contact_list_to_string (contacts); if (!s0) @@ -406,12 +406,12 @@ eab_query_address_default (const gchar *email, #endif /* bad place for this i know. */ -int -e_utf8_casefold_collate_len (const gchar *str1, const gchar *str2, int len) +gint +e_utf8_casefold_collate_len (const gchar *str1, const gchar *str2, gint len) { gchar *s1 = g_utf8_casefold(str1, len); gchar *s2 = g_utf8_casefold(str2, len); - int rv; + gint rv; rv = g_utf8_collate (s1, s2); @@ -421,7 +421,7 @@ e_utf8_casefold_collate_len (const gchar *str1, const gchar *str2, int len) return rv; } -int +gint e_utf8_casefold_collate (const gchar *str1, const gchar *str2) { return e_utf8_casefold_collate_len (str1, str2, -1); diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h index 0cded9c662..8a9df33e40 100644 --- a/addressbook/util/eab-book-util.h +++ b/addressbook/util/eab-book-util.h @@ -38,20 +38,20 @@ EConfigListener *eab_get_config_database (void); /* Specialized Name/Email Queries */ guint eab_name_and_email_query (EBook *book, - const char *name, - const char *email, + const gchar *name, + const gchar *email, EBookListCallback cb, gpointer closure); guint eab_nickname_query (EBook *book, - const char *nickname, + const gchar *nickname, EBookListCallback cb, gpointer closure); -GList *eab_contact_list_from_string (const char *str); -char *eab_contact_list_to_string (GList *contacts); +GList *eab_contact_list_from_string (const gchar *str); +gchar *eab_contact_list_to_string (GList *contacts); -gboolean eab_book_and_contact_list_from_string (const char *str, EBook **book, GList **contacts); -char *eab_book_and_contact_list_to_string (EBook *book, GList *contacts); +gboolean eab_book_and_contact_list_from_string (const gchar *str, EBook **book, GList **contacts); +gchar *eab_book_and_contact_list_to_string (EBook *book, GList *contacts); /* Returns the EContact associated to email in the callback, or NULL if no match is found in the default address book. */ @@ -59,8 +59,8 @@ void eab_query_address_default (const gchar * EABHaveAddressCallback cb, gpointer closure); -int e_utf8_casefold_collate_len (const gchar *str1, const gchar *str2, int len); -int e_utf8_casefold_collate (const gchar *str1, const gchar *str2); +gint e_utf8_casefold_collate_len (const gchar *str1, const gchar *str2, gint len); +gint e_utf8_casefold_collate (const gchar *str1, const gchar *str2); G_END_DECLS diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c index a33177874f..a9e2b95ea0 100644 --- a/calendar/common/authentication.c +++ b/calendar/common/authentication.c @@ -34,11 +34,11 @@ static GHashTable *source_lists_hash = NULL; -static char * -auth_func_cb (ECal *ecal, const char *prompt, const char *key, gpointer user_data) +static gchar * +auth_func_cb (ECal *ecal, const gchar *prompt, const gchar *key, gpointer user_data) { gboolean remember; - char *password, *auth_domain; + gchar *password, *auth_domain; ESource *source; const gchar *component_name; @@ -56,11 +56,11 @@ auth_func_cb (ECal *ecal, const char *prompt, const char *key, gpointer user_dat return password; } -static char * +static gchar * build_pass_key (ECal *ecal) { - char *euri_str; - const char *uri; + gchar *euri_str; + const gchar *uri; EUri *euri; uri = e_cal_get_uri (ecal); @@ -76,7 +76,7 @@ void auth_cal_forget_password (ECal *ecal) { ESource *source = NULL; - const char *auth_domain = NULL, *component_name = NULL, *auth_type = NULL; + const gchar *auth_domain = NULL, *component_name = NULL, *auth_type = NULL; source = e_cal_get_source (ecal); auth_domain = e_source_get_property (source, "auth-domain"); @@ -84,7 +84,7 @@ auth_cal_forget_password (ECal *ecal) auth_type = e_source_get_property (source, "auth-type"); if (auth_type) { - char *key = NULL; + gchar *key = NULL; key = build_pass_key (ecal); e_passwords_forget_password (component_name, key); @@ -119,7 +119,7 @@ auth_new_cal_from_source (ESource *source, ECalSourceType type) } ECal * -auth_new_cal_from_uri (const char *uri, ECalSourceType type) +auth_new_cal_from_uri (const gchar *uri, ECalSourceType type) { ESourceGroup *group = NULL; ESource *source = NULL; @@ -144,7 +144,7 @@ auth_new_cal_from_uri (const char *uri, ECalSourceType type) GSList *sl; for (sl = e_source_group_peek_sources (gl->data); sl != NULL; sl = sl->next) { - char *source_uri; + gchar *source_uri; source_uri = e_source_get_uri (sl->data); if (source_uri) { diff --git a/calendar/common/authentication.h b/calendar/common/authentication.h index 696a36d2ff..7d9d7f5fa7 100644 --- a/calendar/common/authentication.h +++ b/calendar/common/authentication.h @@ -29,7 +29,7 @@ ECal *auth_new_cal_from_default (ECalSourceType type); ECal *auth_new_cal_from_source (ESource *source, ECalSourceType type); -ECal *auth_new_cal_from_uri (const char *uri, ECalSourceType type); +ECal *auth_new_cal_from_uri (const gchar *uri, ECalSourceType type); void auth_cal_forget_password (ECal *ecal); #endif diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index 5aef1aeb53..3654f5bed1 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -151,9 +151,9 @@ calconduit_load_configuration (guint32 pilot_id) c->secret = e_pilot_setup_get_bool (prefix, "secret", FALSE); c->multi_day_split = e_pilot_setup_get_bool (prefix, "multi_day_split", TRUE); if ((c->last_uri = e_pilot_setup_get_string (prefix, "last_uri", NULL)) && !strncmp (c->last_uri, "file://", 7)) { - char *filename = g_filename_from_uri (c->last_uri, NULL, NULL); - const char *path = filename; - const char *home; + gchar *filename = g_filename_from_uri (c->last_uri, NULL, NULL); + const gchar *path = filename; + const gchar *home; home = g_get_home_dir (); @@ -379,10 +379,10 @@ e_calendar_context_destroy (ECalConduitContext *ctxt) } /* Debug routines */ -static char * +static gchar * print_local (ECalLocalRecord *local) { - static char buff[ 4096 ]; + static gchar buff[ 4096 ]; if (local == NULL) { sprintf (buff, "[NULL]"); @@ -403,9 +403,9 @@ print_local (ECalLocalRecord *local) return ""; } -static char *print_remote (GnomePilotRecord *remote) +static gchar *print_remote (GnomePilotRecord *remote) { - static char buff[ 4096 ]; + static gchar buff[ 4096 ]; struct Appointment appt; #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; @@ -446,10 +446,10 @@ static char *print_remote (GnomePilotRecord *remote) return buff; } -static char * -auth_func_cb (ECal *ecal, const char* prompt, const char *key, gpointer user_data) +static gchar * +auth_func_cb (ECal *ecal, const gchar * prompt, const gchar *key, gpointer user_data) { - char *password; + gchar *password; ESource *source; const gchar *auth_domain, *component_name; @@ -464,9 +464,9 @@ auth_func_cb (ECal *ecal, const char* prompt, const char *key, gpointer user_dat static int start_calendar_server (ECalConduitContext *ctxt) { - char *str_uri = NULL; - char *pass_key = NULL; - int retval = 0; + gchar *str_uri = NULL; + gchar *pass_key = NULL; + gint retval = 0; g_return_val_if_fail (ctxt != NULL, -2); @@ -505,7 +505,7 @@ start_calendar_server (ECalConduitContext *ctxt) /* Utility routines */ static icaltimezone * -get_timezone (ECal *client, const char *tzid) +get_timezone (ECal *client, const gchar *tzid) { icaltimezone *timezone = NULL; @@ -521,7 +521,7 @@ get_default_timezone (void) { EConfigListener *listener; icaltimezone *timezone = NULL; - char *location; + gchar *location; listener = e_config_listener_new (); @@ -541,10 +541,10 @@ get_default_timezone (void) } -static char * +static gchar * map_name (ECalConduitContext *ctxt) { - char *filename; + gchar *filename; filename = g_strdup_printf ("%s/.evolution/calendar/local/system/pilot-map-calendar-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id); @@ -553,7 +553,7 @@ map_name (ECalConduitContext *ctxt) } static icalrecurrencetype_weekday -get_ical_day (int day) +get_ical_day (gint day) { switch (day) { case 0: @@ -634,7 +634,7 @@ process_multi_day (ECalConduitContext *ctxt, ECalChange *ccc, GList **multi_comp icaltimezone *tz_start, *tz_end; time_t event_start, event_end, day_end; struct icaltimetype *old_start_value, *old_end_value; - const char *uid; + const gchar *uid; gboolean is_date = FALSE; gboolean last = FALSE; gboolean ret = TRUE; @@ -677,7 +677,7 @@ process_multi_day (ECalConduitContext *ctxt, ECalChange *ccc, GList **multi_comp while (!last) { ECalComponent *clone = e_cal_component_clone (ccc->comp); icalcomponent *ical_comp = NULL; - char *new_uid = e_cal_component_gen_uid (); + gchar *new_uid = e_cal_component_gen_uid (); struct icaltimetype start_value, end_value; ECalChange *c = NULL; @@ -743,7 +743,7 @@ process_multi_day (ECalConduitContext *ctxt, ECalChange *ccc, GList **multi_comp } static short -nth_weekday (int pos, icalrecurrencetype_weekday weekday) +nth_weekday (gint pos, icalrecurrencetype_weekday weekday) { g_assert ((pos > 0 && pos <= 5) || (pos == -1)); @@ -757,7 +757,7 @@ next_changed_item (ECalConduitContext *ctxt, GList *changes) GList *l; for (l = changes; l != NULL; l = l->next) { - const char *uid; + const gchar *uid; ccc = l->data; @@ -770,7 +770,7 @@ next_changed_item (ECalConduitContext *ctxt, GList *changes) } static void -compute_status (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *uid) +compute_status (ECalConduitContext *ctxt, ECalLocalRecord *local, const gchar *uid) { ECalChange *ccc; @@ -834,7 +834,7 @@ local_record_to_pilot_record (ECalLocalRecord *local, #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; #else - static char record[0xffff]; + static gchar record[0xffff]; #endif memset(&p, 0, sizeof (p)); @@ -865,7 +865,7 @@ local_record_to_pilot_record (ECalLocalRecord *local, pi_buffer_free(buffer); #else - p.record = (unsigned char *)record; + p.record = (guchar *)record; p.length = pack_Appointment (local->appt, p.record, 0xffff); #endif return p; @@ -877,14 +877,14 @@ local_record_to_pilot_record (ECalLocalRecord *local, static void local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduitContext *ctxt) { - const char *uid; + const gchar *uid; ECalComponentText summary; GSList *d_list = NULL, *edl = NULL, *l; ECalComponentText *description; ECalComponentDateTime dt_start, dt_end; ECalComponentClassification classif; icaltimezone *default_tz = ctxt->timezone; - int i; + gint i; g_return_if_fail (local != NULL); g_return_if_fail (comp != NULL); @@ -902,7 +902,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit * we don't overwrite them */ if (local->local.ID != 0) { - int cat = 0; + gint cat = 0; #ifdef PILOT_LINK_0_12 struct Appointment appt; pi_buffer_t * record; @@ -914,7 +914,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit } #else struct Appointment appt; - char record[0xffff]; + gchar record[0xffff]; #endif if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, ctxt->dbi->db_handle, @@ -930,7 +930,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit #ifdef PILOT_LINK_0_12 unpack_Appointment (&appt, record, datebook_v1); #else - unpack_Appointment (&appt, (unsigned char *)record, 0xffff); + unpack_Appointment (&appt, (guchar *)record, 0xffff); #endif local->appt->alarm = appt.alarm; local->appt->advance = appt.advance; @@ -1152,7 +1152,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit static void local_record_from_uid (ECalLocalRecord *local, - const char *uid, + const gchar *uid, ECalConduitContext *ctxt) { ECalComponent *comp; @@ -1199,8 +1199,8 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, ECalComponentText summary = {NULL, NULL}; ECalComponentDateTime dt = {NULL, NULL}; GSList *edl = NULL; - char *txt; - int pos, i; + gchar *txt; + gint pos, i; #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; #endif @@ -1456,8 +1456,8 @@ static void check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt) { GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c); - int map_count; - const char *uri; + gint map_count; + const gchar *uri; /* If there are objects but no log */ map_count = g_hash_table_size (ctxt->map->pid_map); @@ -1488,9 +1488,9 @@ pre_sync (GnomePilotConduit *conduit, { GnomePilotConduitSyncAbs *abs_conduit; GList *removed = NULL, *added = NULL, *l; - int len; - unsigned char *buf; - char *filename, *change_id; + gint len; + guchar *buf; + gchar *filename, *change_id; icalcomponent *icalcomp; gint num_records, add_records = 0, mod_records = 0, del_records = 0; #ifdef PILOT_LINK_0_12 @@ -1560,7 +1560,7 @@ pre_sync (GnomePilotConduit *conduit, ctxt->changed = g_list_concat (ctxt->changed, added); for (l = removed; l != NULL; l = l->next) { ECalChange *ccc = l->data; - const char *uid; + const gchar *uid; e_cal_component_get_uid (ccc->comp, &uid); if (e_pilot_map_lookup_pid (ctxt->map, uid, FALSE) == 0) { @@ -1573,7 +1573,7 @@ pre_sync (GnomePilotConduit *conduit, for (l = ctxt->changed; l != NULL; l = l->next) { ECalChange *ccc = l->data; - const char *uid; + const gchar *uid; e_cal_component_get_uid (ccc->comp, &uid); if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) { @@ -1614,9 +1614,9 @@ pre_sync (GnomePilotConduit *conduit, DLP_BUF_SIZE, buffer); #else - buf = (unsigned char*)g_malloc (0xffff); + buf = (guchar *)g_malloc (0xffff); len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, - (unsigned char *)buf, 0xffff); + (guchar *)buf, 0xffff); #endif if (len < 0) { WARN (_("Could not read pilot's Calendar application block")); @@ -1649,18 +1649,18 @@ post_sync (GnomePilotConduit *conduit, { GList *changed; gchar *filename, *change_id; - unsigned char *buf; - int dlpRetVal, len; + guchar *buf; + gint dlpRetVal, len; LOG (g_message ( "post_sync: Calendar Conduit v.%s", CONDUIT_VERSION )); /* Write AppBlock to PDA - updates categories */ - buf = (unsigned char*)g_malloc (0xffff); + buf = (guchar *)g_malloc (0xffff); len = pack_AppointmentAppInfo (&(ctxt->ai), buf, 0xffff); dlpRetVal = dlp_WriteAppBlock (dbi->pilot_socket, dbi->db_handle, - (unsigned char *)buf, len); + (guchar *)buf, len); g_free (buf); @@ -1699,7 +1699,7 @@ set_pilot_id (GnomePilotConduitSyncAbs *conduit, guint32 ID, ECalConduitContext *ctxt) { - const char *uid; + const gchar *uid; LOG (g_message ( "set_pilot_id: setting to %d\n", ID )); @@ -1714,7 +1714,7 @@ set_status_cleared (GnomePilotConduitSyncAbs *conduit, ECalLocalRecord *local, ECalConduitContext *ctxt) { - const char *uid; + const gchar *uid; LOG (g_message ( "set_status_cleared: clearing status\n" )); @@ -1730,7 +1730,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, ECalConduitContext *ctxt) { static GList *comps, *iterator; - static int count; + static gint count; GList *unused; g_return_val_if_fail (local != NULL, -1); @@ -1789,7 +1789,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, ECalConduitContext *ctxt) { static GList *iterator; - static int count; + static gint count; GList *unused; g_return_val_if_fail (local != NULL, -1); @@ -1851,7 +1851,7 @@ compare (GnomePilotConduitSyncAbs *conduit, { /* used by the quick compare */ GnomePilotRecord local_pilot; - int retval = 0; + gint retval = 0; LOG (g_message ("compare: local=%s remote=%s...\n", print_local (local), print_remote (remote))); @@ -1879,8 +1879,8 @@ add_record (GnomePilotConduitSyncAbs *conduit, ECalConduitContext *ctxt) { ECalComponent *comp; - char *uid; - int retval = 0; + gchar *uid; + gint retval = 0; g_return_val_if_fail (remote != NULL, -1); @@ -1911,7 +1911,7 @@ replace_record (GnomePilotConduitSyncAbs *conduit, ECalConduitContext *ctxt) { ECalComponent *new_comp; - int retval = 0; + gint retval = 0; g_return_val_if_fail (remote != NULL, -1); @@ -1934,7 +1934,7 @@ delete_record (GnomePilotConduitSyncAbs *conduit, ECalLocalRecord *local, ECalConduitContext *ctxt) { - const char *uid; + const gchar *uid; g_return_val_if_fail (local != NULL, -1); g_assert (local->comp != NULL); @@ -1959,8 +1959,8 @@ archive_record (GnomePilotConduitSyncAbs *conduit, gboolean archive, ECalConduitContext *ctxt) { - const char *uid; - int retval = 0; + const gchar *uid; + gint retval = 0; g_return_val_if_fail (local != NULL, -1); @@ -1978,7 +1978,7 @@ match (GnomePilotConduitSyncAbs *conduit, ECalLocalRecord **local, ECalConduitContext *ctxt) { - const char *uid; + const gchar *uid; LOG (g_message ("match: looking for local copy of %s\n", print_remote (remote))); diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c index cdb4a10d2d..1be106929d 100644 --- a/calendar/conduits/common/libecalendar-common-conduit.c +++ b/calendar/conduits/common/libecalendar-common-conduit.c @@ -58,11 +58,11 @@ * in UTF-8 format. A conversion must take place before calling * this function (see e_pilot_utf8_to_pchar() in e-pilot-util.c) */ -int -e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *category) +gint +e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *category) { - int i, j; - int retval = 0; /* 0 is the Unfiled category */ + gint i, j; + gint retval = 0; /* 0 is the Unfiled category */ LOG(g_message("e_pilot_add_category_if_possible\n")); for(i=0; iname[i]) == 0){ - int cat_to_add_len; - int desktopUniqueID; + gint cat_to_add_len; + gint desktopUniqueID; cat_to_add_len = strlen(cat_to_add); retval = i; @@ -95,7 +95,7 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ /* find a desktop id that is not in use between 128 and 255 */ for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) { - int found = 0; + gint found = 0; for(j=0; jID[i] == desktopUniqueID) { found = 1; @@ -126,15 +126,15 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ /* *conversion from an evolution category to a palm category */ -void e_pilot_local_category_to_remote(int * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category) +void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category) { GSList *c_list = NULL; - char * category_string; - int i; + gchar * category_string; + gint i; e_cal_component_get_categories_list (comp, &c_list); if (c_list) { /* list != 0, so at least 1 category is assigned */ - category_string = e_pilot_utf8_to_pchar((const char *)c_list->data); + category_string = e_pilot_utf8_to_pchar((const gchar *)c_list->data); if (c_list->next != 0) { LOG (g_message ("Note: item has more categories in evolution, first chosen")); } @@ -162,9 +162,9 @@ void e_pilot_local_category_to_remote(int * pilotCategory, ECalComponent *comp, /* *conversion from a palm category to an evolution category */ -void e_pilot_remote_category_to_local(int pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category) +void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category) { - char *category_string = NULL; + gchar *category_string = NULL; if (pilotCategory != 0) { /* pda has category assigned */ @@ -206,17 +206,17 @@ void e_pilot_remote_category_to_local(int pilotCategory, ECalComponent *comp, st } } -static char * -build_setup_path (const char *path, const char *key) +static gchar * +build_setup_path (const gchar *path, const gchar *key) { return g_strconcat ("/apps/evolution/conduit", "/", path, "/", key, NULL); } gboolean -e_pilot_setup_get_bool (const char *path, const char *key, gboolean def) +e_pilot_setup_get_bool (const gchar *path, const gchar *key, gboolean def) { gboolean res = def; - char *full_path; + gchar *full_path; GConfValue *value; GConfClient *gconf; @@ -241,10 +241,10 @@ e_pilot_setup_get_bool (const char *path, const char *key, gboolean def) } void -e_pilot_setup_set_bool (const char *path, const char *key, gboolean value) +e_pilot_setup_set_bool (const gchar *path, const gchar *key, gboolean value) { GError *error = NULL; - char *full_path; + gchar *full_path; GConfClient *gconf; g_return_if_fail (path != NULL); @@ -264,11 +264,11 @@ e_pilot_setup_set_bool (const char *path, const char *key, gboolean value) } } -int -e_pilot_setup_get_int (const char *path, const char *key, int def) +gint +e_pilot_setup_get_int (const gchar *path, const gchar *key, gint def) { - int res = def; - char *full_path; + gint res = def; + gchar *full_path; GConfValue *value; GConfClient *gconf; @@ -293,10 +293,10 @@ e_pilot_setup_get_int (const char *path, const char *key, int def) } void -e_pilot_setup_set_int (const char *path, const char *key, int value) +e_pilot_setup_set_int (const gchar *path, const gchar *key, gint value) { GError *error = NULL; - char *full_path; + gchar *full_path; GConfClient *gconf; g_return_if_fail (path != NULL); @@ -316,11 +316,11 @@ e_pilot_setup_set_int (const char *path, const char *key, int value) } } -char * -e_pilot_setup_get_string (const char *path, const char *key, const char *def) +gchar * +e_pilot_setup_get_string (const gchar *path, const gchar *key, const gchar *def) { - char *res = g_strdup (def); - char *full_path; + gchar *res = g_strdup (def); + gchar *full_path; GConfValue *value; GConfClient *gconf; @@ -347,10 +347,10 @@ e_pilot_setup_get_string (const char *path, const char *key, const char *def) } void -e_pilot_setup_set_string (const char *path, const char *key, const char *value) +e_pilot_setup_set_string (const gchar *path, const gchar *key, const gchar *value) { GError *error = NULL; - char *full_path; + gchar *full_path; GConfClient *gconf; g_return_if_fail (path != NULL); diff --git a/calendar/conduits/common/libecalendar-common-conduit.h b/calendar/conduits/common/libecalendar-common-conduit.h index aab5a58b56..8110fc5094 100644 --- a/calendar/conduits/common/libecalendar-common-conduit.h +++ b/calendar/conduits/common/libecalendar-common-conduit.h @@ -25,13 +25,13 @@ #define PILOT_MAX_CATEGORIES 16 -int e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *category); -void e_pilot_local_category_to_remote(int * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category); -void e_pilot_remote_category_to_local(int pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category); +gint e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *category); +void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category); +void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category); -gboolean e_pilot_setup_get_bool (const char *path, const char *key, gboolean def); -void e_pilot_setup_set_bool (const char *path, const char *key, gboolean value); -int e_pilot_setup_get_int (const char *path, const char *key, int def); -void e_pilot_setup_set_int (const char *path, const char *key, int value); -char *e_pilot_setup_get_string (const char *path, const char *key, const char *def); -void e_pilot_setup_set_string (const char *path, const char *key, const char *value); +gboolean e_pilot_setup_get_bool (const gchar *path, const gchar *key, gboolean def); +void e_pilot_setup_set_bool (const gchar *path, const gchar *key, gboolean value); +gint e_pilot_setup_get_int (const gchar *path, const gchar *key, gint def); +void e_pilot_setup_set_int (const gchar *path, const gchar *key, gint value); +gchar *e_pilot_setup_get_string (const gchar *path, const gchar *key, const gchar *def); +void e_pilot_setup_set_string (const gchar *path, const gchar *key, const gchar *value); diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c index 61e5c852e3..1d32917760 100644 --- a/calendar/conduits/memo/memo-conduit.c +++ b/calendar/conduits/memo/memo-conduit.c @@ -86,7 +86,7 @@ struct _EMemoLocalRecord { struct Memo *memo; }; -int lastDesktopUniqueID; +gint lastDesktopUniqueID; static void memoconduit_destroy_record (EMemoLocalRecord *local) @@ -297,10 +297,10 @@ e_memo_context_destroy (EMemoConduitContext *ctxt) } /* Debug routines */ -static char * +static gchar * print_local (EMemoLocalRecord *local) { - static char buff[ 64 ]; + static gchar buff[ 64 ]; if (local == NULL) { sprintf (buff, "[NULL]"); @@ -317,9 +317,9 @@ print_local (EMemoLocalRecord *local) return ""; } -static char *print_remote (GnomePilotRecord *remote) +static gchar *print_remote (GnomePilotRecord *remote) { - static char buff[ 64 ]; + static gchar buff[ 64 ]; struct Memo memo; #ifdef PILOT_LINK_0_12 pi_buffer_t *buffer; @@ -377,7 +377,7 @@ get_default_timezone (void) { EConfigListener *listener; icaltimezone *timezone = NULL; - char *location; + gchar *location; listener = e_config_listener_new (); @@ -396,10 +396,10 @@ get_default_timezone (void) return timezone; } -static char * +static gchar * map_name (EMemoConduitContext *ctxt) { - char *filename; + gchar *filename; filename = g_strdup_printf ("%s/.evolution/memos/local/system/pilot-map-memo-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id); @@ -413,7 +413,7 @@ next_changed_item (EMemoConduitContext *ctxt, GList *changes) GList *l; for (l = changes; l != NULL; l = l->next) { - const char *uid; + const gchar *uid; ccc = l->data; @@ -426,7 +426,7 @@ next_changed_item (EMemoConduitContext *ctxt, GList *changes) } static void -compute_status (EMemoConduitContext *ctxt, EMemoLocalRecord *local, const char *uid) +compute_status (EMemoConduitContext *ctxt, EMemoLocalRecord *local, const gchar *uid) { ECalChange *ccc; @@ -461,7 +461,7 @@ local_record_to_pilot_record (EMemoLocalRecord *local, #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; #else - static char record[0xffff]; + static gchar record[0xffff]; #endif memset(&p, 0, sizeof (p)); @@ -494,7 +494,7 @@ local_record_to_pilot_record (EMemoLocalRecord *local, pi_buffer_free(buffer); #else - p.record = (unsigned char *)record; + p.record = (guchar *)record; p.length = pack_Memo (local->memo, p.record, 0xffff); #endif return p; @@ -506,7 +506,7 @@ local_record_to_pilot_record (EMemoLocalRecord *local, static void local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoConduitContext *ctxt) { - const char *uid; + const gchar *uid; GSList *d_list = NULL; ECalComponentText *description; ECalComponentClassification classif; @@ -537,9 +537,9 @@ local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoCondu struct Memo memo; pi_buffer_t * record; #else - char record[0xffff]; + gchar record[0xffff]; #endif - int cat = 0; + gint cat = 0; #ifdef PILOT_LINK_0_12 record = pi_buffer_new(DLP_BUF_SIZE); @@ -602,7 +602,7 @@ local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoCondu static void local_record_from_uid (EMemoLocalRecord *local, - const char *uid, + const gchar *uid, EMemoConduitContext *ctxt) { ECalComponent *comp; @@ -648,8 +648,8 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, struct Memo memo; struct icaltimetype now; icaltimezone *utc_zone; - char *txt, *txt2, *txt3; - int i; + gchar *txt, *txt2, *txt3; + gint i; #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; #endif @@ -694,7 +694,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, e_cal_component_set_comment_list (comp, NULL); e_cal_component_set_summary(comp, NULL); } else { - int idxToUse = -1, ntext = strlen(memo.text); + gint idxToUse = -1, ntext = strlen(memo.text); gboolean foundNL = FALSE; GSList l; ECalComponentText text, sumText; @@ -755,8 +755,8 @@ static void check_for_slow_setting (GnomePilotConduit *c, EMemoConduitContext *ctxt) { GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c); - int map_count; - const char *uri; + gint map_count; + const gchar *uri; /* If there are no objects or objects but no log */ map_count = g_hash_table_size (ctxt->map->pid_map); @@ -787,9 +787,9 @@ pre_sync (GnomePilotConduit *conduit, { GnomePilotConduitSyncAbs *abs_conduit; GList *l; - int len; - unsigned char *buf; - char *filename, *change_id; + gint len; + guchar *buf; + gchar *filename, *change_id; icalcomponent *icalcomp; gint num_records, add_records = 0, mod_records = 0, del_records = 0; #ifdef PILOT_LINK_0_12 @@ -851,7 +851,7 @@ pre_sync (GnomePilotConduit *conduit, for (l = ctxt->changed; l != NULL; l = l->next) { ECalChange *ccc = l->data; - const char *uid; + const gchar *uid; e_cal_component_get_uid (ccc->comp, &uid); if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) { @@ -895,9 +895,9 @@ pre_sync (GnomePilotConduit *conduit, DLP_BUF_SIZE, buffer); #else - buf = (unsigned char*)g_malloc (0xffff); + buf = (guchar *)g_malloc (0xffff); len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, - (unsigned char *)buf, 0xffff); + (guchar *)buf, 0xffff); #endif if (len < 0) { WARN (_("Could not read pilot's Memo application block")); @@ -934,15 +934,15 @@ post_sync (GnomePilotConduit *conduit, { GList *changed; gchar *filename, *change_id; - unsigned char *buf; - int dlpRetVal, len; + guchar *buf; + gint dlpRetVal, len; - buf = (unsigned char*)g_malloc (0xffff); + buf = (guchar *)g_malloc (0xffff); len = pack_MemoAppInfo (&(ctxt->ai), buf, 0xffff); dlpRetVal = dlp_WriteAppBlock (dbi->pilot_socket, dbi->db_handle, - (unsigned char *)buf, len); + (guchar *)buf, len); g_free (buf); @@ -984,7 +984,7 @@ set_pilot_id (GnomePilotConduitSyncAbs *conduit, guint32 ID, EMemoConduitContext *ctxt) { - const char *uid; + const gchar *uid; LOG (g_message ( "set_pilot_id: setting to %d\n", ID )); @@ -999,7 +999,7 @@ set_status_cleared (GnomePilotConduitSyncAbs *conduit, EMemoLocalRecord *local, EMemoConduitContext *ctxt) { - const char *uid; + const gchar *uid; LOG (g_message ( "set_status_cleared: clearing status\n" )); @@ -1015,7 +1015,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, EMemoConduitContext *ctxt) { static GList *comps, *iterator; - static int count; + static gint count; GList *unused; g_return_val_if_fail (local != NULL, -1); @@ -1075,7 +1075,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, EMemoConduitContext *ctxt) { static GList *iterator; - static int count; + static gint count; GList *unused; g_return_val_if_fail (local != NULL, 0); @@ -1138,7 +1138,7 @@ compare (GnomePilotConduitSyncAbs *conduit, { /* used by the quick compare */ GnomePilotRecord local_pilot; - int retval = 0; + gint retval = 0; LOG (g_message ("compare: local=%s remote=%s...\n", print_local (local), print_remote (remote))); @@ -1166,8 +1166,8 @@ add_record (GnomePilotConduitSyncAbs *conduit, EMemoConduitContext *ctxt) { ECalComponent *comp; - char *uid; - int retval = 0; + gchar *uid; + gint retval = 0; g_return_val_if_fail (remote != NULL, -1); @@ -1196,7 +1196,7 @@ replace_record (GnomePilotConduitSyncAbs *conduit, EMemoConduitContext *ctxt) { ECalComponent *new_comp; - int retval = 0; + gint retval = 0; g_return_val_if_fail (remote != NULL, -1); @@ -1219,7 +1219,7 @@ delete_record (GnomePilotConduitSyncAbs *conduit, EMemoLocalRecord *local, EMemoConduitContext *ctxt) { - const char *uid; + const gchar *uid; g_return_val_if_fail (local != NULL, -1); g_return_val_if_fail (local->comp != NULL, -1); @@ -1241,8 +1241,8 @@ archive_record (GnomePilotConduitSyncAbs *conduit, gboolean archive, EMemoConduitContext *ctxt) { - const char *uid; - int retval = 0; + const gchar *uid; + gint retval = 0; g_return_val_if_fail (local != NULL, -1); @@ -1260,7 +1260,7 @@ match (GnomePilotConduitSyncAbs *conduit, EMemoLocalRecord **local, EMemoConduitContext *ctxt) { - const char *uid; + const gchar *uid; LOG (g_message ("match: looking for local copy of %s\n", print_remote (remote))); diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 3a684e0751..1ced6acfa3 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -88,7 +88,7 @@ struct _EToDoLocalRecord { struct ToDo *todo; }; -int lastDesktopUniqueID; +gint lastDesktopUniqueID; static void todoconduit_destroy_record (EToDoLocalRecord *local) @@ -361,10 +361,10 @@ e_todo_context_destroy (EToDoConduitContext *ctxt) } /* Debug routines */ -static char * +static gchar * print_local (EToDoLocalRecord *local) { - static char buff[ 4096 ]; + static gchar buff[ 4096 ]; if (local == NULL) { sprintf (buff, "[NULL]"); @@ -388,9 +388,9 @@ print_local (EToDoLocalRecord *local) return ""; } -static char *print_remote (GnomePilotRecord *remote) +static gchar *print_remote (GnomePilotRecord *remote) { - static char buff[ 4096 ]; + static gchar buff[ 4096 ]; struct ToDo todo; #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; @@ -432,10 +432,10 @@ static char *print_remote (GnomePilotRecord *remote) return buff; } -static char * -auth_func_cb (ECal *ecal, const char* prompt, const char *key, gpointer user_data) +static gchar * +auth_func_cb (ECal *ecal, const gchar * prompt, const gchar *key, gpointer user_data) { - char *password; + gchar *password; ESource *source; const gchar *auth_domain, *component_name; @@ -452,9 +452,9 @@ auth_func_cb (ECal *ecal, const char* prompt, const char *key, gpointer user_dat static int start_calendar_server (EToDoConduitContext *ctxt) { - char *str_uri = NULL; - char *pass_key = NULL; - int retval = 0; + gchar *str_uri = NULL; + gchar *pass_key = NULL; + gint retval = 0; g_return_val_if_fail (ctxt != NULL, -2); if (ctxt->cfg->source) { @@ -492,7 +492,7 @@ start_calendar_server (EToDoConduitContext *ctxt) /* Utility routines */ static icaltimezone * -get_timezone (ECal *client, const char *tzid) +get_timezone (ECal *client, const gchar *tzid) { icaltimezone *timezone = NULL; @@ -508,7 +508,7 @@ get_default_timezone (void) { EConfigListener *listener; icaltimezone *timezone = NULL; - char *location; + gchar *location; listener = e_config_listener_new (); @@ -527,10 +527,10 @@ get_default_timezone (void) return timezone; } -static char * +static gchar * map_name (EToDoConduitContext *ctxt) { - char *filename; + gchar *filename; filename = g_strdup_printf ("%s/.evolution/tasks/local/system/pilot-map-todo-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id); @@ -554,7 +554,7 @@ next_changed_item (EToDoConduitContext *ctxt, GList *changes) GList *l; for (l = changes; l != NULL; l = l->next) { - const char *uid; + const gchar *uid; ccc = l->data; @@ -567,7 +567,7 @@ next_changed_item (EToDoConduitContext *ctxt, GList *changes) } static void -compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid) +compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const gchar *uid) { ECalChange *ccc; @@ -602,7 +602,7 @@ local_record_to_pilot_record (EToDoLocalRecord *local, #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; #else - static char record[0xffff]; + static gchar record[0xffff]; #endif g_assert (local->comp != NULL); @@ -635,7 +635,7 @@ local_record_to_pilot_record (EToDoLocalRecord *local, pi_buffer_free(buffer); #else - p.record = (unsigned char *)record; + p.record = (guchar *)record; p.length = pack_ToDo (local->todo, p.record, 0xffff); #endif return p; @@ -647,8 +647,8 @@ local_record_to_pilot_record (EToDoLocalRecord *local, static void local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoConduitContext *ctxt) { - const char *uid; - int *priority; + const gchar *uid; + gint *priority; icalproperty_status status; ECalComponentText summary; GSList *d_list = NULL; @@ -674,7 +674,7 @@ local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoCondu /* Don't overwrite the category */ if (local->local.ID != 0) { - int cat = 0; + gint cat = 0; #ifdef PILOT_LINK_0_12 pi_buffer_t * record; record = pi_buffer_new(DLP_BUF_SIZE); @@ -683,7 +683,7 @@ local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoCondu return; } #else - char record[0xffff]; + gchar record[0xffff]; #endif if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, @@ -771,7 +771,7 @@ local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoCondu static void local_record_from_uid (EToDoLocalRecord *local, - const char *uid, + const gchar *uid, EToDoConduitContext *ctxt) { ECalComponent *comp; @@ -819,8 +819,8 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, ECalComponentDateTime dt = {NULL, icaltimezone_get_tzid (timezone)}; struct icaltimetype due, now; icaltimezone *utc_zone; - int priority; - char *txt; + gint priority; + gchar *txt; #ifdef PILOT_LINK_0_12 pi_buffer_t * buffer; #endif @@ -882,20 +882,20 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, } if (todo.complete) { - int percent = 100; + gint percent = 100; e_cal_component_set_completed (comp, &now); e_cal_component_set_percent (comp, &percent); e_cal_component_set_status (comp, ICAL_STATUS_COMPLETED); } else { - int *percent = NULL; + gint *percent = NULL; icalproperty_status status; e_cal_component_set_completed (comp, NULL); e_cal_component_get_percent (comp, &percent); if (percent == NULL || *percent == 100) { - int p = 0; + gint p = 0; e_cal_component_set_percent (comp, &p); } if (percent != NULL) @@ -948,8 +948,8 @@ static void check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt) { GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c); - int map_count; - const char *uri; + gint map_count; + const gchar *uri; /* If there are no objects or objects but no log */ map_count = g_hash_table_size (ctxt->map->pid_map); @@ -980,9 +980,9 @@ pre_sync (GnomePilotConduit *conduit, { GnomePilotConduitSyncAbs *abs_conduit; GList *l; - int len; - unsigned char *buf; - char *filename, *change_id; + gint len; + guchar *buf; + gchar *filename, *change_id; icalcomponent *icalcomp; gint num_records, add_records = 0, mod_records = 0, del_records = 0; #ifdef PILOT_LINK_0_12 @@ -1041,7 +1041,7 @@ pre_sync (GnomePilotConduit *conduit, for (l = ctxt->changed; l != NULL; l = l->next) { ECalChange *ccc = l->data; - const char *uid; + const gchar *uid; e_cal_component_get_uid (ccc->comp, &uid); if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) { @@ -1084,9 +1084,9 @@ pre_sync (GnomePilotConduit *conduit, DLP_BUF_SIZE, buffer); #else - buf = (unsigned char*)g_malloc (0xffff); + buf = (guchar *)g_malloc (0xffff); len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, - (unsigned char *)buf, 0xffff); + (guchar *)buf, 0xffff); #endif if (len < 0) { WARN (_("Could not read pilot's ToDo application block")); @@ -1121,15 +1121,15 @@ post_sync (GnomePilotConduit *conduit, { GList *changed; gchar *filename, *change_id; - unsigned char *buf; - int dlpRetVal, len; + guchar *buf; + gint dlpRetVal, len; - buf = (unsigned char*)g_malloc (0xffff); + buf = (guchar *)g_malloc (0xffff); len = pack_ToDoAppInfo (&(ctxt->ai), buf, 0xffff); dlpRetVal = dlp_WriteAppBlock (dbi->pilot_socket, dbi->db_handle, - (unsigned char *)buf, len); + (guchar *)buf, len); g_free (buf); @@ -1171,7 +1171,7 @@ set_pilot_id (GnomePilotConduitSyncAbs *conduit, guint32 ID, EToDoConduitContext *ctxt) { - const char *uid; + const gchar *uid; LOG (g_message ( "set_pilot_id: setting to %d\n", ID )); @@ -1186,7 +1186,7 @@ set_status_cleared (GnomePilotConduitSyncAbs *conduit, EToDoLocalRecord *local, EToDoConduitContext *ctxt) { - const char *uid; + const gchar *uid; LOG (g_message ( "set_status_cleared: clearing status\n" )); @@ -1202,7 +1202,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, EToDoConduitContext *ctxt) { static GList *comps, *iterator; - static int count; + static gint count; GList *unused; g_return_val_if_fail (local != NULL, -1); @@ -1261,7 +1261,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, EToDoConduitContext *ctxt) { static GList *iterator; - static int count; + static gint count; GList *unused; g_return_val_if_fail (local != NULL, 0); @@ -1323,7 +1323,7 @@ compare (GnomePilotConduitSyncAbs *conduit, { /* used by the quick compare */ GnomePilotRecord local_pilot; - int retval = 0; + gint retval = 0; LOG (g_message ("compare: local=%s remote=%s...\n", print_local (local), print_remote (remote))); @@ -1351,8 +1351,8 @@ add_record (GnomePilotConduitSyncAbs *conduit, EToDoConduitContext *ctxt) { ECalComponent *comp; - char *uid; - int retval = 0; + gchar *uid; + gint retval = 0; g_return_val_if_fail (remote != NULL, -1); @@ -1382,7 +1382,7 @@ replace_record (GnomePilotConduitSyncAbs *conduit, EToDoConduitContext *ctxt) { ECalComponent *new_comp; - int retval = 0; + gint retval = 0; g_return_val_if_fail (remote != NULL, -1); @@ -1405,7 +1405,7 @@ delete_record (GnomePilotConduitSyncAbs *conduit, EToDoLocalRecord *local, EToDoConduitContext *ctxt) { - const char *uid; + const gchar *uid; g_return_val_if_fail (local != NULL, -1); g_return_val_if_fail (local->comp != NULL, -1); @@ -1427,8 +1427,8 @@ archive_record (GnomePilotConduitSyncAbs *conduit, gboolean archive, EToDoConduitContext *ctxt) { - const char *uid; - int retval = 0; + const gchar *uid; + gint retval = 0; g_return_val_if_fail (local != NULL, -1); @@ -1446,7 +1446,7 @@ match (GnomePilotConduitSyncAbs *conduit, EToDoLocalRecord **local, EToDoConduitContext *ctxt) { - const char *uid; + const gchar *uid; LOG (g_message ("match: looking for local copy of %s\n", print_remote (remote))); diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 089bf37552..5307936b27 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -93,8 +93,8 @@ static void an_update_minutes_label (GtkSpinButton *sb, gpointer data) { AlarmNotify *an; - char *new_label; - int snooze_timeout_min; + gchar *new_label; + gint snooze_timeout_min; an = (AlarmNotify *) data; @@ -108,8 +108,8 @@ static void an_update_hrs_label (GtkSpinButton *sb, gpointer data) { AlarmNotify *an; - char *new_label; - int snooze_timeout_hrs; + gchar *new_label; + gint snooze_timeout_hrs; an = (AlarmNotify *) data; @@ -170,7 +170,7 @@ edit_pressed_cb (GtkButton *button, gpointer user_data) static void snooze_pressed_cb (GtkButton *button, gpointer user_data) { - int snooze_timeout; + gint snooze_timeout; AlarmNotify *an = user_data; GtkTreeIter iter; GtkTreeModel *model = NULL; @@ -253,7 +253,7 @@ notified_alarms_dialog_new (void) G_TYPE_POINTER /* FuncInfo*/)); - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "alarm-notify.glade", @@ -363,8 +363,8 @@ notified_alarms_dialog_new (void) GtkTreeIter add_alarm_to_notified_alarms_dialog (AlarmNotificationsDialog *na, time_t trigger, time_t occur_start, time_t occur_end, - ECalComponentVType vtype, const char *summary, - const char *description, const char *location, + ECalComponentVType vtype, const gchar *summary, + const gchar *description, const gchar *location, AlarmNotifyFunc func, gpointer func_data) { GtkTreeIter iter; diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h index 17f9b3a61c..ae523cb1ad 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.h +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.h @@ -43,7 +43,7 @@ struct _AlarmNotificationsDialog GtkWidget *treeview; }; -typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data); +typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, gint snooze_mins, gpointer data); AlarmNotificationsDialog * notified_alarms_dialog_new (void); @@ -51,8 +51,8 @@ notified_alarms_dialog_new (void); GtkTreeIter add_alarm_to_notified_alarms_dialog (AlarmNotificationsDialog *na, time_t trigger, time_t occur_start, time_t occur_end, - ECalComponentVType vtype, const char *summary, - const char *description, const char *location, + ECalComponentVType vtype, const gchar *summary, + const gchar *description, const gchar *location, AlarmNotifyFunc func, gpointer func_data); diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index 4085815bce..e05c6e6571 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -81,7 +81,7 @@ typedef struct { static void process_removal_in_hash (gpointer key, gpointer value, gpointer data) { - char *uri = key; + gchar *uri = key; ProcessRemovalsData *prd = data; GSList *groups, *sources, *p, *q; gboolean found = FALSE; @@ -94,8 +94,8 @@ process_removal_in_hash (gpointer key, gpointer value, gpointer data) sources = e_source_group_peek_sources (group); for (q = sources; q != NULL; q = q->next) { ESource *source = E_SOURCE (q->data); - char *source_uri; - const char *completion = e_source_get_property (source, "alarm"); + gchar *source_uri; + const gchar *completion = e_source_get_property (source, "alarm"); source_uri = e_source_get_uri (source); if (strcmp (source_uri, uri) == 0) @@ -122,7 +122,7 @@ list_changed_cb (ESourceList *source_list, gpointer data) ECalSourceType source_type = E_CAL_SOURCE_TYPE_LAST; ProcessRemovalsData prd; GList *l; - int i; + gint i; g_signal_handlers_block_by_func(source_list, list_changed_cb, data); @@ -146,8 +146,8 @@ list_changed_cb (ESourceList *source_list, gpointer data) sources = e_source_group_peek_sources (group); for (q = sources; q != NULL; q = q->next) { ESource *source = E_SOURCE (q->data); - char *uri; - const char *completion = e_source_get_property (source, "alarm"); + gchar *uri; + const gchar *completion = e_source_get_property (source, "alarm"); if (completion && (!g_ascii_strcasecmp (completion, "false") || !g_ascii_strcasecmp (completion, "never"))) @@ -169,7 +169,7 @@ list_changed_cb (ESourceList *source_list, gpointer data) g_hash_table_foreach (priv->uri_client_hash[source_type], (GHFunc) process_removal_in_hash, &prd); for (l = prd.removals; l; l = l->next) { - d (printf("%s:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, (char *)l->data)); + d (printf("%s:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, (gchar *)l->data)); alarm_notify_remove_calendar (an, source_type, l->data); } g_list_free (prd.removals); @@ -206,8 +206,8 @@ load_calendars (AlarmNotify *an, ECalSourceType source_type) sources = e_source_group_peek_sources (group); for (q = sources; q != NULL; q = q->next) { ESource *source = E_SOURCE (q->data); - char *uri; - const char *completion = e_source_get_property (source, "alarm"); + gchar *uri; + const gchar *completion = e_source_get_property (source, "alarm"); if (completion && (!g_ascii_strcasecmp (completion, "false") || !g_ascii_strcasecmp (completion, "never"))) @@ -230,7 +230,7 @@ static void alarm_notify_init (AlarmNotify *an, AlarmNotifyClass *klass) { AlarmNotifyPrivate *priv; - int i; + gint i; priv = g_new0 (AlarmNotifyPrivate, 1); an->priv = priv; @@ -263,7 +263,7 @@ alarm_notify_finalize (GObject *object) { AlarmNotify *an; AlarmNotifyPrivate *priv; - int i; + gint i; g_return_if_fail (object != NULL); g_return_if_fail (IS_ALARM_NOTIFY (object)); @@ -343,8 +343,8 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource AlarmNotifyPrivate *priv; ECal *client; EUri *e_uri; - char *str_uri; - char *pass_key; + gchar *str_uri; + gchar *pass_key; g_return_if_fail (an != NULL); g_return_if_fail (IS_ALARM_NOTIFY (an)); @@ -399,7 +399,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource } void -alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const char *str_uri) +alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const gchar *str_uri) { AlarmNotifyPrivate *priv; ECal *client; diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h index a548716295..a6ef3a173e 100644 --- a/calendar/gui/alarm-notify/alarm-notify.h +++ b/calendar/gui/alarm-notify/alarm-notify.h @@ -60,7 +60,7 @@ GType alarm_notify_get_type (void); AlarmNotify *alarm_notify_new (void); void alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource *source, gboolean load_afterwards); -void alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const char *str_uri); +void alarm_notify_remove_calendar (AlarmNotify *an, ECalSourceType source_type, const gchar *str_uri); ESourceList *alarm_notify_get_selected_calendars (AlarmNotify *); diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index c293bf74a8..14aed443e8 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -76,8 +76,8 @@ static GList *tray_icons_list = NULL; /* Top Tray Image */ static GtkStatusIcon *tray_icon = NULL; -static int tray_blink_id = -1; -static int tray_blink_countdown = 0; +static gint tray_blink_id = -1; +static gint tray_blink_countdown = 0; static AlarmNotify *an; /* Structure that stores a client we are monitoring */ @@ -520,7 +520,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms) static void load_alarms (ClientAlarms *ca, time_t start, time_t end) { - char *str_query, *iso_start, *iso_end; + gchar *str_query, *iso_start, *iso_end; d(printf("%s:%d (load_alarms) \n",__FILE__, __LINE__)); @@ -875,7 +875,7 @@ query_objects_removed_cb (ECal *client, GList *objects, gpointer data) * compued with respect to the current time. */ static void -create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, int snooze_mins) +create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, gint snooze_mins) { QueuedAlarm *orig_qa; time_t t; @@ -904,8 +904,8 @@ create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, int snooze_mins) static void edit_component (ECal *client, ECalComponent *comp) { - const char *uid; - const char *uri; + const gchar *uid; + const gchar *uri; ECalSourceType source_type; CORBA_Environment ev; GNOME_Evolution_Calendar_CompEditorFactory factory; @@ -938,7 +938,7 @@ edit_component (ECal *client, ECalComponent *comp) corba_type = GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT; } - GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (char *) uid, corba_type, &ev); + GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (gchar *) uid, corba_type, &ev); if (BONOBO_EX (&ev)) e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL); @@ -950,9 +950,9 @@ edit_component (ECal *client, ECalComponent *comp) } typedef struct { - char *summary; - char *description; - char *location; + gchar *summary; + gchar *description; + gchar *location; gboolean blink_state; gboolean snooze_set; gint blink_id; @@ -1009,7 +1009,7 @@ free_tray_icon_data (TrayIconData *tray_data) static void on_dialog_objs_removed_async (struct _query_msg *msg) { - const char *our_uid; + const gchar *our_uid; GList *l; TrayIconData *tray_data; ECal *client; @@ -1025,7 +1025,7 @@ on_dialog_objs_removed_async (struct _query_msg *msg) g_return_if_fail (our_uid && *our_uid); for (l = objects; l != NULL; l = l->next) { - const char *uid = l->data; + const gchar *uid = l->data; if (!uid) continue; @@ -1197,7 +1197,7 @@ tray_list_remove_data (TrayIconData *data) } static void -notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data) +notify_dialog_cb (AlarmNotifyResult result, gint snooze_mins, gpointer data) { TrayIconData *tray_data = data; @@ -1437,11 +1437,11 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, { QueuedAlarm *qa; ECalComponent *comp; - const char *summary, *description, *location; + const gchar *summary, *description, *location; TrayIconData *tray_data; ECalComponentText text; GSList *text_list; - char *str, *start_str, *end_str, *alarm_str, *time_str; + gchar *str, *start_str, *end_str, *alarm_str, *time_str; icaltimezone *current_zone; ECalComponentOrganizer organiser; @@ -1521,7 +1521,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, tray_list_add_new (tray_data); if (g_list_length (tray_icons_list) > 1) { - char *tip; + gchar *tip; tip = g_strdup_printf (_("You have %d alarms"), g_list_length (tray_icons_list)); gtk_status_icon_set_tooltip_text (tray_icon, tip); @@ -1559,13 +1559,13 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa, { QueuedAlarm *qa; ECalComponent *comp; - const char *summary, *location; + const gchar *summary, *location; ECalComponentText text; - char *str, *start_str, *end_str, *alarm_str, *time_str; + gchar *str, *start_str, *end_str, *alarm_str, *time_str; icaltimezone *current_zone; ECalComponentOrganizer organiser; NotifyNotification *n; - char *body; + gchar *body; d(printf("%s:%d (popup_notification)\n",__FILE__, __LINE__)); @@ -1652,7 +1652,7 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa, e_cal_component_alarm_free (alarm); if (attach && icalattach_get_is_url (attach)) { - const char *url; + const gchar *url; url = icalattach_get_url (attach); @@ -1702,11 +1702,11 @@ mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id) /* Performs notification of a procedure alarm */ static gboolean -procedure_notification_dialog (const char *cmd, const char *url) +procedure_notification_dialog (const gchar *cmd, const gchar *url) { GtkWidget *dialog, *label, *checkbox; - char *str; - int btn; + gchar *str; + gint btn; d(printf("%s:%d (procedure_notification_dialog)\n",__FILE__, __LINE__)); @@ -1755,8 +1755,8 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id ECalComponentAlarm *alarm; ECalComponentText description; icalattach *attach; - const char *url; - char *cmd; + const gchar *url; + gchar *cmd; gboolean result = TRUE; d(printf("%s:%d (procedure_notification)\n",__FILE__, __LINE__)); @@ -1789,12 +1789,12 @@ procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id if (description.value) cmd = g_strconcat (url, " ", description.value, NULL); else - cmd = (char *) url; + cmd = (gchar *) url; if (procedure_notification_dialog (cmd, url)) result = g_spawn_command_line_async (cmd, NULL); - if (cmd != (char *) url) + if (cmd != (gchar *) url) g_free (cmd); icalattach_unref (attach); @@ -2168,7 +2168,7 @@ update_cqa (CompQueuedAlarms *cqa, ECalComponent *newcomp) /* Update auids in Queued Alarms*/ for (qa_list = cqa->queued_alarms; qa_list; qa_list = qa_list->next) { QueuedAlarm *qa = qa_list->data; - char *check_auid = (char *) qa->instance->auid; + gchar *check_auid = (gchar *) qa->instance->auid; ECalComponentAlarm *alarm; alarm = e_cal_component_get_alarm (newcomp, check_auid); @@ -2207,7 +2207,7 @@ update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa) for (instance_list = alarms->alarms; instance_list; instance_list = instance_list->next) { al_inst = instance_list->data; if (al_inst->trigger == qa->orig_trigger) { /* FIXME if two or more alarm instances (audio, note) for same component have same trigger */ - g_free ((char *) qa->instance->auid); + g_free ((gchar *) qa->instance->auid); qa->instance->auid = g_strdup (al_inst->auid); break; } diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index dba9099520..8f3b0aebc1 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -48,7 +48,7 @@ static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL; static gboolean locale_supports_12_hour_format (void) { - char s[16]; + gchar s[16]; time_t t = 0; strftime (s, sizeof s, "%p", gmtime (&t)); @@ -100,7 +100,7 @@ ensure_inited (void) } ESourceList * -config_data_get_calendars (const char *key) +config_data_get_calendars (const gchar *key) { ESourceList *cal_sources; gboolean state; @@ -157,9 +157,9 @@ config_data_get_calendars (const char *key) } void -config_data_replace_string_list (const char *key, - const char *old, - const char *new) +config_data_replace_string_list (const gchar *key, + const gchar *old, + const gchar *new) { GSList *source, *tmp; @@ -204,7 +204,7 @@ config_data_get_conf_client (void) icaltimezone * config_data_get_timezone (void) { - char *location; + gchar *location; icaltimezone *local_timezone; ensure_inited (); @@ -309,7 +309,7 @@ config_data_get_last_notification_time (void) * Saves a program name as "blessed" **/ void -config_data_save_blessed_program (const char *program) +config_data_save_blessed_program (const gchar *program) { GConfClient *client; GSList *l; @@ -333,7 +333,7 @@ config_data_save_blessed_program (const char *program) * Return value: TRUE if program is blessed, FALSE otherwise **/ gboolean -config_data_is_blessed_program (const char *program) +config_data_is_blessed_program (const gchar *program) { GConfClient *client; GSList *l, *n; @@ -346,7 +346,7 @@ config_data_is_blessed_program (const char *program) while (l) { n = l->next; if (!found) - found = strcmp ((char *) l->data, program) == 0; + found = strcmp ((gchar *) l->data, program) == 0; g_free (l->data); g_slist_free_1 (l); l = n; diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h index 63e6c7205e..19086beb56 100644 --- a/calendar/gui/alarm-notify/config-data.h +++ b/calendar/gui/alarm-notify/config-data.h @@ -38,9 +38,9 @@ gboolean config_data_get_24_hour_format (void); gboolean config_data_get_notify_with_tray (void); void config_data_set_last_notification_time (time_t t); time_t config_data_get_last_notification_time (void); -void config_data_save_blessed_program (const char *program); -gboolean config_data_is_blessed_program (const char *program); -ESourceList *config_data_get_calendars (const char *); -void config_data_replace_string_list (const char *, const char *, const char *); +void config_data_save_blessed_program (const gchar *program); +gboolean config_data_is_blessed_program (const gchar *program); +ESourceList *config_data_get_calendars (const gchar *); +void config_data_replace_string_list (const gchar *, const gchar *, const gchar *); #endif diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c index a625bec0fa..887adaa1d5 100644 --- a/calendar/gui/alarm-notify/notify-main.c +++ b/calendar/gui/alarm-notify/notify-main.c @@ -67,7 +67,7 @@ static gint save_session_cb (GnomeClient *client, GnomeSaveStyle save_style, gint shutdown, GnomeInteractStyle interact_style, gint fast, gpointer user_data) { - char *args[2]; + gchar *args[2]; args[0] = g_build_filename (EVOLUTION_LIBEXECDIR, "evolution-alarm-notify" @@ -110,7 +110,7 @@ init_session (void) * singleton service object. */ static BonoboObject * -alarm_notify_factory_fn (BonoboGenericFactory *factory, const char *component_id, void *data) +alarm_notify_factory_fn (BonoboGenericFactory *factory, const gchar *component_id, gpointer data) { g_return_val_if_fail (alarm_notify_service != NULL, NULL); @@ -127,8 +127,8 @@ init_alarm_service (gpointer user_data) return FALSE; } -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c index 640a8f5f99..5377c8d4b2 100644 --- a/calendar/gui/alarm-notify/util.c +++ b/calendar/gui/alarm-notify/util.c @@ -33,12 +33,12 @@ #include "util.h" /* Converts a time_t to a string, relative to the specified timezone */ -char * +gchar * timet_to_str_with_zone (time_t t, icaltimezone *zone) { struct icaltimetype itt; struct tm tm; - char buf[256]; + gchar buf[256]; if (t == -1) return g_strdup (_("invalid time")); @@ -51,15 +51,15 @@ timet_to_str_with_zone (time_t t, icaltimezone *zone) return g_strdup (buf); } -char * +gchar * calculate_time (time_t start, time_t end) { time_t difference = end - start; - char *str; - int hours, minutes; - char *times[4]; - char *joined; - int i; + gchar *str; + gint hours, minutes; + gchar *times[4]; + gchar *joined; + gint i; i = 0; if (difference >= 3600) { diff --git a/calendar/gui/alarm-notify/util.h b/calendar/gui/alarm-notify/util.h index b7b715ca9b..bb6935729a 100644 --- a/calendar/gui/alarm-notify/util.h +++ b/calendar/gui/alarm-notify/util.h @@ -28,6 +28,6 @@ #include -char *timet_to_str_with_zone (time_t t, icaltimezone *zone); -char *calculate_time (time_t start, time_t end); +gchar *timet_to_str_with_zone (time_t t, icaltimezone *zone); +gchar *calculate_time (time_t start, time_t end); #endif diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index 6183d873ba..b93a98a934 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -46,7 +46,7 @@ typedef struct CALSearchBarItem { ESearchBarItem search; - const char *image; + const gchar *image; } CALSearchBarItem; static ESearchBarItem calendar_search_items[] = { @@ -192,7 +192,7 @@ cal_search_bar_init (CalSearchBar *cal_search) static void free_categories (GPtrArray *categories) { - int i; + gint i; for (i = 0; i < categories->len; i++) { if (categories->pdata[i] == NULL) @@ -245,14 +245,14 @@ cal_search_bar_destroy (GtkObject *object) /* Emits the "sexp_changed" signal for the calendar search bar */ static void -notify_sexp_changed (CalSearchBar *cal_search, const char *sexp) +notify_sexp_changed (CalSearchBar *cal_search, const gchar *sexp) { g_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[SEXP_CHANGED], 0, sexp); } /* Returns the string of the currently selected category, NULL for "Unmatched" and "All */ -static const char * +static const gchar * get_current_category (CalSearchBar *cal_search) { CalSearchBarPrivate *priv; @@ -282,16 +282,16 @@ get_current_category (CalSearchBar *cal_search) /* Returns a sexp for the selected category in the drop-down menu. The "All" - * option is returned as (const char *) 1, and the "Unfiled" option is returned + * option is returned as (const gchar *) 1, and the "Unfiled" option is returned * as NULL. */ -static char * +static gchar * get_show_option_sexp (CalSearchBar *cal_search) { CalSearchBarPrivate *priv ; gint viewid ; - char *start, *end, *due, *ret = NULL; - const char *category = NULL ; + gchar *start, *end, *due, *ret = NULL; + const gchar *category = NULL ; time_t start_range, end_range; priv = cal_search->priv; @@ -405,10 +405,10 @@ get_show_option_sexp (CalSearchBar *cal_search) /* Sets the query string to be (contains? "field" "text") */ static void -notify_e_cal_view_contains (CalSearchBar *cal_search, const char *field, const char *view) +notify_e_cal_view_contains (CalSearchBar *cal_search, const gchar *field, const gchar *view) { - char *text = NULL; - char *sexp; + gchar *text = NULL; + gchar *sexp; text = e_search_bar_get_text (E_SEARCH_BAR (cal_search)); @@ -437,7 +437,7 @@ notify_e_cal_view_contains (CalSearchBar *cal_search, const char *field, const c static void notify_category_is (CalSearchBar *cal_search) { - char *sexp; + gchar *sexp; sexp = get_show_option_sexp (cal_search); @@ -455,9 +455,9 @@ notify_category_is (CalSearchBar *cal_search) static void regen_query (CalSearchBar *cal_search) { - int id; - char *show_option_sexp = NULL; - char *sexp = NULL; + gint id; + gchar *show_option_sexp = NULL; + gchar *sexp = NULL; GString *out = NULL; EFilterBar *efb = (EFilterBar *) cal_search; @@ -518,7 +518,7 @@ regen_query (CalSearchBar *cal_search) static void regen_view_query (CalSearchBar *cal_search) { - const char *category; + const gchar *category; notify_category_is (cal_search); category = cal_search_bar_get_category (cal_search); @@ -546,7 +546,7 @@ generate_viewoption_menu (CALSearchBarItem *subitems) for (i = 0; subitems[i].search.id != -1; ++i) { if (subitems[i].search.text) { - char *str = NULL; + gchar *str = NULL; str = e_str_without_underscores (subitems[i].search.text); menu_item = gtk_image_menu_item_new_with_label (str); if (subitems[i].image) { @@ -588,12 +588,12 @@ setup_category_options (CalSearchBar *cal_search, CALSearchBarItem *subitems, gi subitems[index].image = NULL; for (i = 0; i < priv->categories->len; i++) { - const char *category; + const gchar *category; category = priv->categories->pdata[i] ? priv->categories->pdata [i] : ""; /* The search.text field should not be free'd */ - subitems[i + offset].search.text = (char *) category; + subitems[i + offset].search.text = (gchar *) category; subitems[i + offset].search.id = i + offset; subitems[i + offset].image = e_categories_get_icon_file_for (category); } @@ -719,7 +719,7 @@ make_suboptions (CalSearchBar *cal_search) } static void -search_menu_activated (ESearchBar *esb, int id) +search_menu_activated (ESearchBar *esb, gint id) { if (id == E_FILTERBAR_ADVANCED_ID) e_search_bar_set_item_id (esb, id); @@ -739,9 +739,9 @@ cal_search_bar_construct (CalSearchBar *cal_search, guint32 flags) { ESearchBarItem *items; guint32 bit = 0x1; - int i, j; - char *xmlfile = NULL; - char *userfile = NULL; + gint i, j; + gchar *xmlfile = NULL; + gchar *userfile = NULL; FilterPart *part; RuleContext *search_context; FilterRule *search_rule; @@ -831,12 +831,12 @@ cal_search_bar_new (guint32 flags) /* Used from qsort() */ static int -compare_categories_cb (const void *a, const void *b) +compare_categories_cb (gconstpointer a, gconstpointer b) { - const char **ca, **cb; + const gchar **ca, **cb; - ca = (const char **) a; - cb = (const char **) b; + ca = (const gchar **) a; + cb = (const gchar **) b; /* FIXME: should use some utf8 strcoll() thingy */ return strcmp (*ca, *cb); @@ -849,7 +849,7 @@ static GPtrArray * sort_categories (GPtrArray *categories) { GPtrArray *c; - int i; + gint i; c = g_ptr_array_new (); g_ptr_array_set_size (c, categories->len); @@ -899,10 +899,10 @@ cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories) * Return value: Name of the selected category, or NULL if there is no * selected category. **/ -const char * +const gchar * cal_search_bar_get_category (CalSearchBar *cal_search) { - const char *category; + const gchar *category; category = get_current_category (cal_search); diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h index 26f3998c89..3c7304f136 100644 --- a/calendar/gui/cal-search-bar.h +++ b/calendar/gui/cal-search-bar.h @@ -68,8 +68,8 @@ typedef struct { /* Notification signals */ - void (* sexp_changed) (CalSearchBar *cal_search, const char *sexp); - void (* category_changed) (CalSearchBar *cal_search, const char *category); + void (* sexp_changed) (CalSearchBar *cal_search, const gchar *sexp); + void (* category_changed) (CalSearchBar *cal_search, const gchar *category); } CalSearchBarClass; GType cal_search_bar_get_type (void); @@ -80,7 +80,7 @@ GtkWidget *cal_search_bar_new (guint32 flags); void cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories); -const char *cal_search_bar_get_category (CalSearchBar *cal_search); +const gchar *cal_search_bar_get_category (CalSearchBar *cal_search); void cal_search_bar_get_time_range (CalSearchBar *cal_search, time_t *start, time_t *end); diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index e69cd463ea..1bf0c442c4 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -67,7 +67,7 @@ typedef struct { } FocusData; static void -file_open_event_cb (BonoboUIComponent *uic, gpointer data, const char *path) +file_open_event_cb (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal; @@ -98,7 +98,7 @@ calendar_command_print (GnomeCalendar *gcal, GtkPrintOperationAction action) /* File/Print callback */ static void -file_print_cb (BonoboUIComponent *uic, gpointer data, const char *path) +file_print_cb (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal = GNOME_CALENDAR (data); @@ -106,7 +106,7 @@ file_print_cb (BonoboUIComponent *uic, gpointer data, const char *path) } static void -file_print_preview_cb (BonoboUIComponent *uic, gpointer data, const char *path) +file_print_preview_cb (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal = GNOME_CALENDAR (data); @@ -134,7 +134,7 @@ set_normal_cursor (GnomeCalendar *gcal) } static void -previous_clicked (BonoboUIComponent *uic, gpointer data, const char *path) +previous_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal; @@ -146,7 +146,7 @@ previous_clicked (BonoboUIComponent *uic, gpointer data, const char *path) } static void -next_clicked (BonoboUIComponent *uic, gpointer data, const char *path) +next_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal; @@ -166,7 +166,7 @@ calendar_goto_today (GnomeCalendar *gcal) } static void -today_clicked (BonoboUIComponent *uic, gpointer data, const char *path) +today_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal; @@ -176,7 +176,7 @@ today_clicked (BonoboUIComponent *uic, gpointer data, const char *path) } static void -goto_clicked (BonoboUIComponent *uic, gpointer data, const char *path) +goto_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal; @@ -186,7 +186,7 @@ goto_clicked (BonoboUIComponent *uic, gpointer data, const char *path) } static void -show_day_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path) +show_day_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal; @@ -196,7 +196,7 @@ show_day_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path) } static void -show_work_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path) +show_work_week_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal; @@ -206,7 +206,7 @@ show_work_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char * } static void -show_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path) +show_week_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal; @@ -216,7 +216,7 @@ show_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path) } static void -show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path) +show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal; @@ -227,7 +227,7 @@ show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path static void -show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path) +show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal; @@ -301,7 +301,7 @@ purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path) { GnomeCalendar *gcal; GtkWidget *dialog, *parent, *box, *label, *spin; - int response; + gint response; gcal = GNOME_CALENDAR (data); @@ -353,7 +353,7 @@ static void sensitize_items(BonoboUIComponent *uic, struct _sensitize_item *items, guint32 mask) { while (items->command) { - char command[32]; + gchar command[32]; if (strlen(items->command)>=21) { g_warning ("items->command >= 21: %s\n", items->command); @@ -552,7 +552,7 @@ gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data) } static void -help_debug (BonoboUIComponent *uid, void *data, const char *path) +help_debug (BonoboUIComponent *uid, gpointer data, const gchar *path) { calendar_component_show_logger ((GtkWidget *) data); } diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index bca0832bac..d7ae0c66e2 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -116,11 +116,11 @@ typedef struct } CalendarComponentView; struct _CalendarComponentPrivate { - char *base_directory; - char *config_directory; + gchar *base_directory; + gchar *config_directory; GConfClient *gconf_client; - int gconf_notify_id; + gint gconf_notify_id; ESourceList *source_list; ESourceList *task_source_list; @@ -164,7 +164,7 @@ ensure_sources (CalendarComponent *component) ESourceGroup *contacts; ESource *personal_source; ESource *birthdays_source; - char *base_uri, *base_uri_proto, base_uri_proto_seventh; + gchar *base_uri, *base_uri_proto, base_uri_proto_seventh; const gchar *base_dir; gchar *create_source; @@ -231,7 +231,7 @@ ensure_sources (CalendarComponent *component) /* ensure the source name is in current locale, not read from configuration */ e_source_set_name (personal_source, _("Personal")); } else { - char *primary_calendar = calendar_config_get_primary_calendar(); + gchar *primary_calendar = calendar_config_get_primary_calendar(); GSList *calendars_selected; /* Create the default Person addressbook */ @@ -331,7 +331,7 @@ is_in_uids (GSList *uids, ESource *source) GSList *l; for (l = uids; l; l = l->next) { - const char *uid = l->data; + const gchar *uid = l->data; if (!strcmp (uid, e_source_peek_uid (source))) return TRUE; @@ -358,7 +358,7 @@ update_uris_for_selection (CalendarComponentView *component_view) ESource *selected_source = l->data; if (gnome_calendar_add_source (component_view->calendar, E_CAL_SOURCE_TYPE_EVENT, selected_source)) - uids_selected = g_slist_append (uids_selected, (char *) e_source_peek_uid (selected_source)); + uids_selected = g_slist_append (uids_selected, (gchar *) e_source_peek_uid (selected_source)); } e_source_selector_free_selection (component_view->source_selection); @@ -410,7 +410,7 @@ update_selection (CalendarComponentView *component_view) /* Make sure the whole selection is there */ for (l = uids_selected; l; l = l->next) { - char *uid = l->data; + gchar *uid = l->data; ESource *source; source = e_source_list_peek_source_by_uid (component_view->source_list, uid); @@ -441,7 +441,7 @@ update_task_memo_selection (CalendarComponentView *component_view, ECalSourceTyp /* Remove any that aren't there any more */ for (l = source_selection; l; l = l->next) { - char *uid = l->data; + gchar *uid = l->data; ESource *source; source = e_source_list_peek_source_by_uid (component_view->source_list, uid); @@ -456,7 +456,7 @@ update_task_memo_selection (CalendarComponentView *component_view, ECalSourceTyp /* Make sure the whole selection is there */ for (l = uids_selected; l; l = l->next) { - char *uid = l->data; + gchar *uid = l->data; ESource *source; source = e_source_list_peek_source_by_uid (source_list, uid); @@ -475,7 +475,7 @@ static void update_primary_selection (CalendarComponentView *component_view) { ESource *source = NULL; - char *uid; + gchar *uid; uid = calendar_config_get_primary_calendar (); if (uid) { @@ -497,7 +497,7 @@ static void update_primary_task_memo_selection (CalendarComponentView *component_view, ECalSourceType type) { ESource *source = NULL; - char *uid; + gchar *uid; ESourceList *source_list = NULL; if (type == E_CAL_SOURCE_TYPE_TODO) { @@ -520,7 +520,7 @@ update_primary_task_memo_selection (CalendarComponentView *component_view, ECalS /* Callbacks. */ static void -copy_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) +copy_calendar_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { CalendarComponentView *component_view = data; ESource *selected_source; @@ -533,12 +533,12 @@ copy_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -delete_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) +delete_calendar_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { CalendarComponentView *component_view = data; ESource *selected_source; ECal *cal; - char *uri; + gchar *uri; selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector)); if (!selected_source) @@ -570,13 +570,13 @@ delete_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -new_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) +new_calendar_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { calendar_setup_edit_calendar (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), NULL, pitem->user_data); } static void -rename_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) +rename_calendar_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { CalendarComponentView *component_view = data; ESourceSelector *selector; @@ -586,7 +586,7 @@ rename_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) +edit_calendar_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { CalendarComponentView *component_view = data; ESource *selected_source; @@ -599,7 +599,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value) +set_offline_availability (EPopup *ep, EPopupItem *pitem, gpointer data, const gchar *value) { CalendarComponentView *component_view = data; ESource *selected_source; @@ -612,13 +612,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char } static void -mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) +mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { set_offline_availability (ep, pitem, data, "0"); } static void -mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data) +mark_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { set_offline_availability (ep, pitem, data, "1"); } @@ -638,7 +638,7 @@ static EPopupItem ecc_source_popups[] = { }; static void -ecc_source_popup_free(EPopup *ep, GSList *list, void *data) +ecc_source_popup_free(EPopup *ep, GSList *list, gpointer data) { g_slist_free(list); } @@ -649,7 +649,7 @@ popup_event_cb(ESourceSelector *selector, ESource *insource, GdkEventButton *eve ECalPopup *ep; ECalPopupTargetSource *t; GSList *menus = NULL; - int i; + gint i; GtkMenu *menu; /** @HookPoint-ECalPopup: Calendar Source Selector Context Menu @@ -730,7 +730,7 @@ set_info (CalendarComponentView *component_view) struct icaltimetype start_tt, end_tt; time_t start_time, end_time; struct tm start_tm, end_tm; - char buffer[512], end_buffer[256]; + gchar buffer[512], end_buffer[256]; GnomeCalendarViewType view; gnome_calendar_get_visible_time_range (component_view->calendar, &start_time, &end_time); @@ -866,15 +866,15 @@ config_primary_memos_selection_changed_cb (GConfClient *client, guint id, GConfE /* Evolution::Component CORBA methods. */ static void -impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environment *ev) +impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environment *ev) { CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant)); CalendarComponentPrivate *priv; GList *l; CalendarComponentView *view = NULL; - char *src_uid = NULL; - char *uid = NULL; - char *rid = NULL; + gchar *src_uid = NULL; + gchar *uid = NULL; + gchar *rid = NULL; priv = calendar_component->priv; @@ -886,8 +886,8 @@ impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environme if (!strncmp (uri, "calendar:", 9)) { EUri *euri = e_uri_new (uri); - const char *p; - char *header, *content; + const gchar *p; + gchar *header, *content; size_t len, clen; time_t start = -1, end = -1; @@ -900,7 +900,7 @@ impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environme if (p[len] != '=') break; - header = (char *) p; + header = (gchar *) p; header[len] = '\0'; p += len + 1; @@ -992,10 +992,10 @@ selector_tree_data_dropped (ESourceSelector *selector, if (data->data) { icalcomponent *icalcomp = NULL; - char *comp_str; /* do not free this! */ + gchar *comp_str; /* do not free this! */ /* data->data is "source_uid\ncomponent_string" */ - comp_str = strchr ((char *)data->data, '\n'); + comp_str = strchr ((gchar *)data->data, '\n'); if (comp_str) { comp_str [0] = 0; comp_str++; @@ -1003,7 +1003,7 @@ selector_tree_data_dropped (ESourceSelector *selector, icalcomp = icalparser_parse_string (comp_str); if (icalcomp) { - success = cal_comp_process_source_list_drop (client, icalcomp, action, (char *)data->data, component->priv->source_list); + success = cal_comp_process_source_list_drop (client, icalcomp, action, (gchar *)data->data, component->priv->source_list); icalcomponent_free (icalcomp); } } @@ -1045,7 +1045,7 @@ setup_create_ecal (CalendarComponent *calendar_component, CalendarComponentView { CalendarComponentPrivate *priv; ESource *source = NULL; - char *uid; + gchar *uid; guint not; priv = calendar_component->priv; @@ -1160,7 +1160,7 @@ create_new_event (CalendarComponent *calendar_component, CalendarComponentView * } static void -create_local_item_cb (EUserCreatableItemsHandler *handler, const char *item_type_name, void *data) +create_local_item_cb (EUserCreatableItemsHandler *handler, const gchar *item_type_name, gpointer data) { CalendarComponent *calendar_component = data; CalendarComponentPrivate *priv; @@ -1434,36 +1434,36 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_sequence_set_release (list, FALSE); - 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 = (char *) _("Create a new appointment"); + list->_buffer[0].id = (gchar *) CREATE_EVENT_ID; + list->_buffer[0].description = (gchar *) _("New appointment"); + list->_buffer[0].menuDescription = (gchar *) C_("New", "_Appointment"); + list->_buffer[0].tooltip = (gchar *) _("Create a new appointment"); list->_buffer[0].menuShortcut = 'a'; - list->_buffer[0].iconName = (char *) "appointment-new"; + list->_buffer[0].iconName = (gchar *) "appointment-new"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - 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 = (char *) _("Create a new meeting request"); + list->_buffer[1].id = (gchar *) CREATE_MEETING_ID; + list->_buffer[1].description = (gchar *) _("New meeting"); + list->_buffer[1].menuDescription = (gchar *) C_("New", "M_eeting"); + list->_buffer[1].tooltip = (gchar *) _("Create a new meeting request"); list->_buffer[1].menuShortcut = 'e'; - list->_buffer[1].iconName = (char *) "stock_new-meeting"; + list->_buffer[1].iconName = (gchar *) "stock_new-meeting"; list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT; - 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 = (char *) _("Create a new all-day appointment"); + list->_buffer[2].id = (gchar *) CREATE_ALLDAY_EVENT_ID; + list->_buffer[2].description = (gchar *) _("New all day appointment"); + list->_buffer[2].menuDescription = (gchar *) C_("New", "All Day A_ppointment"); + list->_buffer[2].tooltip = (gchar *) _("Create a new all-day appointment"); list->_buffer[2].menuShortcut = '\0'; - list->_buffer[2].iconName = (char *) "stock_new-24h-appointment"; + list->_buffer[2].iconName = (gchar *) "stock_new-24h-appointment"; list->_buffer[2].type = GNOME_Evolution_CREATABLE_OBJECT; - 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 = (char *) _("Create a new calendar"); + list->_buffer[3].id = (gchar *) CREATE_CALENDAR_ID; + list->_buffer[3].description = (gchar *) _("New calendar"); + list->_buffer[3].menuDescription = (gchar *) C_("New", "Cale_ndar"); + list->_buffer[3].tooltip = (gchar *) _("Create a new calendar"); list->_buffer[3].menuShortcut = '\0'; - list->_buffer[3].iconName = (char *) "x-office-calendar"; + list->_buffer[3].iconName = (gchar *) "x-office-calendar"; list->_buffer[3].type = GNOME_Evolution_CREATABLE_FOLDER; return list; @@ -1637,13 +1637,13 @@ calendar_component_peek (void) return component; } -const char * +const gchar * calendar_component_peek_base_directory (CalendarComponent *component) { return component->priv->base_directory; } -const char * +const gchar * calendar_component_peek_config_directory (CalendarComponent *component) { return component->priv->config_directory; diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h index 1fbcdbc487..851c4c3237 100644 --- a/calendar/gui/calendar-component.h +++ b/calendar/gui/calendar-component.h @@ -58,8 +58,8 @@ GType calendar_component_get_type (void); CalendarComponent *calendar_component_peek (void); -const char *calendar_component_peek_base_directory (CalendarComponent *component); -const char *calendar_component_peek_config_directory (CalendarComponent *component); +const gchar *calendar_component_peek_base_directory (CalendarComponent *component); +const gchar *calendar_component_peek_config_directory (CalendarComponent *component); ESourceList *calendar_component_peek_source_list (CalendarComponent *component); EActivityHandler *calendar_component_peek_activity_handler (CalendarComponent *component); void calendar_component_show_logger (gpointer); diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index ffd398bd69..58f77968d6 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -73,7 +73,7 @@ calendar_config_remove_notification (guint id) gboolean calendar_config_locale_supports_12_hour_format (void) { - char s[16]; + gchar s[16]; time_t t = 0; calendar_config_init (); @@ -83,7 +83,7 @@ calendar_config_locale_supports_12_hour_format (void) } /* Returns the string representation of a units value */ -static const char * +static const gchar * units_to_string (CalUnits units) { switch (units) { @@ -103,7 +103,7 @@ units_to_string (CalUnits units) /* opposite function to 'units_to_string' */ static CalUnits -string_to_units (const char *units) +string_to_units (const gchar *units) { CalUnits res; @@ -151,7 +151,7 @@ calendar_config_add_notification_calendars_selected (GConfClientNotifyFunc func, } /* The primary calendar */ -char * +gchar * calendar_config_get_primary_calendar (void) { calendar_config_init (); @@ -160,7 +160,7 @@ calendar_config_get_primary_calendar (void) } void -calendar_config_set_primary_calendar (const char *primary_uid) +calendar_config_set_primary_calendar (const gchar *primary_uid) { calendar_config_init (); @@ -233,7 +233,7 @@ calendar_config_get_timezone_stored (void) icaltimezone * calendar_config_get_icaltimezone (void) { - char *location; + gchar *location; icaltimezone *zone = NULL; calendar_config_init (); @@ -618,9 +618,9 @@ calendar_config_add_notification_month_scroll_by_week (GConfClientNotifyFunc fun /* Whether we show the Marcus Bains Line (current time), and in what colors. */ void -calendar_config_get_marcus_bains (gboolean *show_line, const char **dayview_color, const char **timebar_color) +calendar_config_get_marcus_bains (gboolean *show_line, const gchar **dayview_color, const gchar **timebar_color) { - static char *dcolor = NULL, *tcolor = NULL; + static gchar *dcolor = NULL, *tcolor = NULL; calendar_config_init (); @@ -855,7 +855,7 @@ calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpo } /* The primary task list */ -char * +gchar * calendar_config_get_primary_tasks (void) { calendar_config_init (); @@ -864,7 +864,7 @@ calendar_config_get_primary_tasks (void) } void -calendar_config_set_primary_tasks (const char *primary_uid) +calendar_config_set_primary_tasks (const gchar *primary_uid) { calendar_config_init (); @@ -933,7 +933,7 @@ calendar_config_add_notification_memos_selected (GConfClientNotifyFunc func, gpo } /* The primary memo list */ -char * +gchar * calendar_config_get_primary_memos (void) { calendar_config_init (); @@ -942,7 +942,7 @@ calendar_config_get_primary_memos (void) } void -calendar_config_set_primary_memos (const char *primary_uid) +calendar_config_set_primary_memos (const gchar *primary_uid) { calendar_config_init (); @@ -1086,7 +1086,7 @@ calendar_config_add_notification_hide_completed_tasks (GConfClientNotifyFunc fun CalUnits calendar_config_get_hide_completed_tasks_units (void) { - char *units; + gchar *units; CalUnits cu; calendar_config_init (); @@ -1109,7 +1109,7 @@ calendar_config_get_hide_completed_tasks_units (void) void calendar_config_set_hide_completed_tasks_units (CalUnits cu) { - char *units; + gchar *units; calendar_config_init (); @@ -1384,7 +1384,7 @@ calendar_config_set_use_default_reminder (gboolean value) * * Return value: Interval for default reminders. **/ -int +gint calendar_config_get_default_reminder_interval (void) { calendar_config_init (); @@ -1400,7 +1400,7 @@ calendar_config_get_default_reminder_interval (void) * appointments. **/ void -calendar_config_set_default_reminder_interval (int interval) +calendar_config_set_default_reminder_interval (gint interval) { calendar_config_init (); @@ -1418,7 +1418,7 @@ calendar_config_set_default_reminder_interval (int interval) CalUnits calendar_config_get_default_reminder_units (void) { - char *units; + gchar *units; CalUnits cu; calendar_config_init (); @@ -1455,7 +1455,7 @@ calendar_config_set_default_reminder_units (CalUnits units) * are retrieved even when returns FALSE. **/ gboolean -calendar_config_get_ba_reminder (int *interval, CalUnits *units) +calendar_config_get_ba_reminder (gint *interval, CalUnits *units) { calendar_config_init (); @@ -1464,7 +1464,7 @@ calendar_config_get_ba_reminder (int *interval, CalUnits *units) } if (units) { - char *str; + gchar *str; str = gconf_client_get_string (config, CALENDAR_CONFIG_BA_REMINDER_UNITS, NULL); *units = string_to_units (str); @@ -1483,7 +1483,7 @@ calendar_config_get_ba_reminder (int *interval, CalUnits *units) * @units: The units of the reminder; can be NULL. **/ void -calendar_config_set_ba_reminder (gboolean *enabled, int *interval, CalUnits *units) +calendar_config_set_ba_reminder (gboolean *enabled, gint *interval, CalUnits *units) { calendar_config_init (); @@ -1505,10 +1505,10 @@ calendar_config_set_ba_reminder (gboolean *enabled, int *interval, CalUnits *uni * Returns the subexpression to use to filter out completed tasks according * to the config settings. The returned sexp should be freed. **/ -char* +gchar * calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed) { - char *sexp = NULL; + gchar *sexp = NULL; if (calendar_config_get_hide_completed_tasks ()) { CalUnits units; @@ -1525,7 +1525,7 @@ calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed) else sexp = g_strdup ("(is-completed?)"); } else { - char *isodate; + gchar *isodate; icaltimezone *zone; struct icaltimetype tt; time_t t; @@ -1603,10 +1603,10 @@ calendar_config_set_dir_path (const gchar *path) gconf_client_set_string (config, CALENDAR_CONFIG_SAVE_DIR, path, NULL); } -char * +gchar * calendar_config_get_dir_path (void) { - char *path; + gchar *path; calendar_config_init (); @@ -1641,14 +1641,14 @@ calendar_config_free_day_second_zones (GSList *zones) /* keeps max 'day_second_zones_max' zones, if 'location' is already in a list, then it'll became first there */ void -calendar_config_set_day_second_zone (const char *location) +calendar_config_set_day_second_zone (const gchar *location) { calendar_config_init (); if (location && *location) { GSList *lst, *l; GError *error = NULL; - int max_zones; + gint max_zones; /* configurable max number of timezones to remember */ max_zones = gconf_client_get_int (config, CALENDAR_CONFIG_DAY_SECOND_ZONES_MAX, &error); @@ -1666,7 +1666,7 @@ calendar_config_set_day_second_zone (const char *location) if (l->data && g_str_equal (l->data, location)) { if (l != lst) { /* isn't first in the list */ - char *val = l->data; + gchar *val = l->data; lst = g_slist_remove (lst, val); lst = g_slist_prepend (lst, val); @@ -1695,7 +1695,7 @@ calendar_config_set_day_second_zone (const char *location) } /* location of the second time zone user has selected. Free with g_free. */ -char * +gchar * calendar_config_get_day_second_zone (void) { calendar_config_init (); @@ -1709,7 +1709,7 @@ calendar_config_select_day_second_zone (void) icaltimezone *zone = NULL; ETimezoneDialog *tzdlg; GtkWidget *dialog; - char *second_location; + gchar *second_location; second_location = calendar_config_get_day_second_zone (); if (second_location && *second_location) @@ -1725,7 +1725,7 @@ calendar_config_select_day_second_zone (void) dialog = e_timezone_dialog_get_toplevel (tzdlg); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - const char *location = NULL; + const gchar *location = NULL; zone = e_timezone_dialog_get_timezone (tzdlg); if (zone == icaltimezone_get_utc_timezone ()) { diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h index ff4e69d008..c4f264c230 100644 --- a/calendar/gui/calendar-config.h +++ b/calendar/gui/calendar-config.h @@ -69,8 +69,8 @@ void calendar_config_set_calendars_selected (GSList *selected); guint calendar_config_add_notification_calendars_selected (GConfClientNotifyFunc func, gpointer data); /* The primary calendar */ -char *calendar_config_get_primary_calendar (void); -void calendar_config_set_primary_calendar (const char *primary_uid); +gchar *calendar_config_get_primary_calendar (void); +void calendar_config_set_primary_calendar (const gchar *primary_uid); guint calendar_config_add_notification_primary_calendar (GConfClientNotifyFunc func, gpointer data); /* Use system timezone; if TRUE, then influences also the current timezone functions. */ @@ -79,8 +79,8 @@ void calendar_config_set_use_system_timezone (gboolean use); guint calendar_config_add_notification_use_system_timezone (GConfClientNotifyFunc func, gpointer data); /* The current timezone, e.g. "Europe/London". */ -gchar* calendar_config_get_timezone (void); -gchar* calendar_config_get_timezone_stored (void); +gchar * calendar_config_get_timezone (void); +gchar * calendar_config_get_timezone_stored (void); icaltimezone *calendar_config_get_icaltimezone (void); void calendar_config_set_timezone (const gchar *timezone); guint calendar_config_add_notification_timezone (GConfClientNotifyFunc func, gpointer data); @@ -142,7 +142,7 @@ void calendar_config_set_time_divisions (gint divisions); guint calendar_config_add_notification_time_divisions (GConfClientNotifyFunc func, gpointer data); /* Whether we show the Marcus Bains Line, and in what colors. */ -void calendar_config_get_marcus_bains (gboolean *show_line, const char **dayview_color, const char **timebar_color); +void calendar_config_get_marcus_bains (gboolean *show_line, const gchar **dayview_color, const gchar **timebar_color); void calendar_config_add_notification_marcus_bains (GConfClientNotifyFunc func, gpointer data, gint *not_show, gint *not_dcolor, gint *not_tcolor); /* Whether we show event end times. */ @@ -191,8 +191,8 @@ void calendar_config_set_tasks_selected (GSList *selected); guint calendar_config_add_notification_tasks_selected (GConfClientNotifyFunc func, gpointer data); /* The primary calendar */ -char *calendar_config_get_primary_tasks (void); -void calendar_config_set_primary_tasks (const char *primary_uid); +gchar *calendar_config_get_primary_tasks (void); +void calendar_config_set_primary_tasks (const gchar *primary_uid); guint calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc func, gpointer data); /* The pane position */ @@ -206,8 +206,8 @@ void calendar_config_set_memos_selected (GSList *selected); guint calendar_config_add_notification_memos_selected (GConfClientNotifyFunc func, gpointer data); /* The primary calendar */ -char *calendar_config_get_primary_memos (void); -void calendar_config_set_primary_memos (const char *primary_uid); +gchar *calendar_config_get_primary_memos (void); +void calendar_config_set_primary_memos (const gchar *primary_uid); guint calendar_config_add_notification_primary_memos (GConfClientNotifyFunc func, gpointer data); /* Colors for the task list */ @@ -230,7 +230,7 @@ gint calendar_config_get_hide_completed_tasks_value(void); void calendar_config_set_hide_completed_tasks_value(gint value); guint calendar_config_add_notification_hide_completed_tasks_value (GConfClientNotifyFunc func, gpointer data); -char * calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed); +gchar * calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed); /* Confirmation options */ gboolean calendar_config_get_confirm_delete (void); @@ -243,8 +243,8 @@ void calendar_config_set_confirm_purge (gboolean confirm); gboolean calendar_config_get_use_default_reminder (void); void calendar_config_set_use_default_reminder (gboolean value); -int calendar_config_get_default_reminder_interval (void); -void calendar_config_set_default_reminder_interval (int interval); +gint calendar_config_get_default_reminder_interval (void); +void calendar_config_set_default_reminder_interval (gint interval); CalUnits calendar_config_get_default_reminder_units (void); void calendar_config_set_default_reminder_units (CalUnits units); @@ -262,19 +262,19 @@ guint calendar_config_add_notification_free_busy_template (GConfClientNotifyFunc supports 12-hour time format. */ gboolean calendar_config_locale_supports_12_hour_format(void); -void calendar_config_set_dir_path (const char *); -char * calendar_config_get_dir_path (void); +void calendar_config_set_dir_path (const gchar *); +gchar * calendar_config_get_dir_path (void); GSList *calendar_config_get_day_second_zones (void); void calendar_config_free_day_second_zones (GSList *zones); -void calendar_config_set_day_second_zone (const char *location); -char * calendar_config_get_day_second_zone (void); +void calendar_config_set_day_second_zone (const gchar *location); +gchar * calendar_config_get_day_second_zone (void); void calendar_config_select_day_second_zone (void); guint calendar_config_add_notification_day_second_zone (GConfClientNotifyFunc func, gpointer data); /* Birthdays & Anniversaries reminder settings */ -gboolean calendar_config_get_ba_reminder (int *interval, CalUnits *units); -void calendar_config_set_ba_reminder (gboolean *enabled, int *interval, CalUnits *units); +gboolean calendar_config_get_ba_reminder (gint *interval, CalUnits *units); +void calendar_config_set_ba_reminder (gboolean *enabled, gint *interval, CalUnits *units); /* Scroll in a month view by a week, not by a month */ gboolean calendar_config_get_month_scroll_by_week (void); diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c index 8d167f44de..95497b1782 100644 --- a/calendar/gui/calendar-view-factory.c +++ b/calendar/gui/calendar-view-factory.c @@ -43,9 +43,9 @@ struct _CalendarViewFactoryPrivate { static void calendar_view_factory_finalize (GObject *object); -static const char *calendar_view_factory_get_title (GalViewFactory *factory); -static const char *calendar_view_factory_get_type_code (GalViewFactory *factory); -static GalView *calendar_view_factory_new_view (GalViewFactory *factory, const char *name); +static const gchar *calendar_view_factory_get_title (GalViewFactory *factory); +static const gchar *calendar_view_factory_get_type_code (GalViewFactory *factory); +static GalView *calendar_view_factory_new_view (GalViewFactory *factory, const gchar *name); G_DEFINE_TYPE (CalendarViewFactory, calendar_view_factory, GAL_VIEW_FACTORY_TYPE) @@ -99,7 +99,7 @@ calendar_view_factory_finalize (GObject *object) /* get_title method for the calendar view factory */ -static const char * +static const gchar * calendar_view_factory_get_title (GalViewFactory *factory) { CalendarViewFactory *cal_view_factory; @@ -127,7 +127,7 @@ calendar_view_factory_get_title (GalViewFactory *factory) } /* get_type_code method for the calendar view factory */ -static const char * +static const gchar * calendar_view_factory_get_type_code (GalViewFactory *factory) { CalendarViewFactory *cal_view_factory; @@ -156,7 +156,7 @@ calendar_view_factory_get_type_code (GalViewFactory *factory) /* new_view method for the calendar view factory */ static GalView * -calendar_view_factory_new_view (GalViewFactory *factory, const char *name) +calendar_view_factory_new_view (GalViewFactory *factory, const gchar *name) { CalendarViewFactory *cal_view_factory; CalendarViewFactoryPrivate *priv; diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c index 5415affdf2..b316771ca1 100644 --- a/calendar/gui/calendar-view.c +++ b/calendar/gui/calendar-view.c @@ -36,18 +36,18 @@ struct _CalendarViewPrivate { GnomeCalendarViewType view_type; /* Title of the view */ - char *title; + gchar *title; }; static void calendar_view_finalize (GObject *object); -static void calendar_view_load (GalView *view, const char *filename); -static void calendar_view_save (GalView *view, const char *filename); -static const char *calendar_view_get_title (GalView *view); -static void calendar_view_set_title (GalView *view, const char *title); -static const char *calendar_view_get_type_code (GalView *view); +static void calendar_view_load (GalView *view, const gchar *filename); +static void calendar_view_save (GalView *view, const gchar *filename); +static const gchar *calendar_view_get_title (GalView *view); +static void calendar_view_set_title (GalView *view, const gchar *title); +static const gchar *calendar_view_get_type_code (GalView *view); static GalView *calendar_view_clone (GalView *view); G_DEFINE_TYPE (CalendarView, calendar_view, GAL_VIEW_TYPE) @@ -114,20 +114,20 @@ calendar_view_finalize (GObject *object) /* load method of the calendar view */ static void -calendar_view_load (GalView *view, const char *filename) +calendar_view_load (GalView *view, const gchar *filename) { /* nothing */ } /* save method of the calendar view */ static void -calendar_view_save (GalView *view, const char *filename) +calendar_view_save (GalView *view, const gchar *filename) { /* nothing */ } /* get_title method of the calendar view */ -static const char * +static const gchar * calendar_view_get_title (GalView *view) { CalendarView *cal_view; @@ -136,12 +136,12 @@ calendar_view_get_title (GalView *view) cal_view = CALENDAR_VIEW (view); priv = cal_view->priv; - return (const char *) priv->title; + return (const gchar *) priv->title; } /* set_title method of the calendar view */ static void -calendar_view_set_title (GalView *view, const char *title) +calendar_view_set_title (GalView *view, const gchar *title) { CalendarView *cal_view; CalendarViewPrivate *priv; @@ -156,7 +156,7 @@ calendar_view_set_title (GalView *view, const char *title) } /* get_type_code method for the calendar view */ -static const char * +static const gchar * calendar_view_get_type_code (GalView *view) { CalendarView *cal_view; @@ -219,7 +219,7 @@ calendar_view_clone (GalView *view) CalendarView * calendar_view_construct (CalendarView *cal_view, GnomeCalendarViewType view_type, - const char *title) + const gchar *title) { CalendarViewPrivate *priv; @@ -245,7 +245,7 @@ calendar_view_construct (CalendarView *cal_view, * Return value: A newly-created calendar view. **/ CalendarView * -calendar_view_new (GnomeCalendarViewType view_type, const char *title) +calendar_view_new (GnomeCalendarViewType view_type, const gchar *title) { CalendarView *cal_view; diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h index 51e3235c34..a3c4a54012 100644 --- a/calendar/gui/calendar-view.h +++ b/calendar/gui/calendar-view.h @@ -57,10 +57,10 @@ GType calendar_view_get_type (void); CalendarView *calendar_view_construct (CalendarView *cal_view, GnomeCalendarViewType view_type, - const char *title); + const gchar *title); CalendarView *calendar_view_new (GnomeCalendarViewType view_type, - const char *title); + const gchar *title); GnomeCalendarViewType calendar_view_get_view_type (CalendarView *cal_view); diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c index b98f7170ed..a217254b18 100644 --- a/calendar/gui/comp-editor-factory.c +++ b/calendar/gui/comp-editor-factory.c @@ -56,7 +56,7 @@ typedef struct { union { struct { - char *uid; + gchar *uid; } existing; struct { @@ -71,13 +71,13 @@ typedef struct { CompEditorFactory *factory; /* Uri of the calendar, used as key in the clients hash table */ - char *uri; + gchar *uri; /* Client of the calendar */ ECal *client; /* Count editors using this client */ - int editor_count; + gint editor_count; /* Pending requests; they are pending if the client is still being opened */ GSList *pending; @@ -232,7 +232,7 @@ editor_destroy_cb (GtkObject *object, gpointer data) /* Starts editing an existing component on a client that is already open */ static void -edit_existing (OpenClient *oc, const char *uid) +edit_existing (OpenClient *oc, const gchar *uid) { ECalComponent *comp; icalcomponent *icalcomp; @@ -451,7 +451,7 @@ cal_opened_cb (ECal *client, ECalendarStatus status, gpointer data) * open request. */ static OpenClient * -open_client (CompEditorFactory *factory, ECalSourceType source_type, const char *uristr) +open_client (CompEditorFactory *factory, ECalSourceType source_type, const gchar *uristr) { CompEditorFactoryPrivate *priv; ECal *client; @@ -495,7 +495,7 @@ open_client (CompEditorFactory *factory, ECalSourceType source_type, const char * NULL on failure; in the latter case it sets the ev exception. */ static OpenClient * -lookup_open_client (CompEditorFactory *factory, ECalSourceType source_type, const char *str_uri, CORBA_Environment *ev) +lookup_open_client (CompEditorFactory *factory, ECalSourceType source_type, const gchar *str_uri, CORBA_Environment *ev) { CompEditorFactoryPrivate *priv; OpenClient *oc; @@ -526,7 +526,7 @@ lookup_open_client (CompEditorFactory *factory, ECalSourceType source_type, cons /* Queues a request for editing an existing object */ static void -queue_edit_existing (OpenClient *oc, const char *uid) +queue_edit_existing (OpenClient *oc, const gchar *uid) { Request *request; diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index 153dc089ec..49b43900d5 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -70,7 +70,7 @@ cal_comp_util_add_exdate (ECalComponent *comp, time_t t, icaltimezone *zone) /* Returns TRUE if the TZIDs are equivalent, i.e. both NULL or the same. */ static gboolean -e_cal_component_compare_tzid (const char *tzid1, const char *tzid2) +e_cal_component_compare_tzid (const gchar *tzid1, const gchar *tzid2) { gboolean retval = TRUE; @@ -103,10 +103,10 @@ cal_comp_util_compare_event_timezones (ECalComponent *comp, icaltimezone *zone) { ECalComponentDateTime start_datetime, end_datetime; - const char *tzid; + const gchar *tzid; gboolean retval = FALSE; icaltimezone *start_zone, *end_zone; - int offset1, offset2; + gint offset1, offset2; tzid = icaltimezone_get_tzid (zone); @@ -211,8 +211,8 @@ cal_comp_util_compare_event_timezones (ECalComponent *comp, gboolean cal_comp_is_on_server (ECalComponent *comp, ECal *client) { - const char *uid; - char *rid = NULL; + const gchar *uid; + gchar *rid = NULL; icalcomponent *icalcomp; GError *error = NULL; @@ -287,7 +287,7 @@ cal_comp_event_new_with_defaults (ECal *client) { icalcomponent *icalcomp; ECalComponent *comp; - int interval; + gint interval; CalUnits units; ECalComponentAlarm *alarm; icalproperty *icalprop; @@ -446,11 +446,11 @@ cal_comp_util_get_n_icons (ECalComponent *comp) e_cal_component_get_categories_list (comp, &categories_list); for (elem = categories_list; elem; elem = elem->next) { - char *category; + gchar *category; GdkPixmap *pixmap = NULL; GdkBitmap *mask = NULL; - category = (char *) elem->data; + category = (gchar *) elem->data; if (e_categories_config_get_icon_for (category, &pixmap, &mask)) { num_icons++; g_object_unref (pixmap); @@ -488,7 +488,7 @@ cal_comp_selection_set_string_list (GtkSelectionData *data, GSList *str_list) const guint8 *c = p->data; if (c) - g_byte_array_append (array, c, strlen ((const char *) c) + 1); + g_byte_array_append (array, c, strlen ((const gchar *) c) + 1); } gtk_selection_data_set (data, data->target, 8, array->data, array->len); @@ -509,17 +509,17 @@ GSList * cal_comp_selection_get_string_list (GtkSelectionData *data) { /* format is "str1\0str2\0...strN\0" */ - char *inptr, *inend; + gchar *inptr, *inend; GSList *list; g_return_val_if_fail (data != NULL, NULL); list = NULL; - inptr = (char *)data->data; - inend = (char *)(data->data + data->length); + inptr = (gchar *)data->data; + inend = (gchar *)(data->data + data->length); while (inptr < inend) { - char *start = inptr; + gchar *start = inptr; while (inptr < inend && *inptr) inptr++; @@ -533,7 +533,7 @@ cal_comp_selection_get_string_list (GtkSelectionData *data) } static void -datetime_to_zone (ECal *client, ECalComponentDateTime *date, const char *tzid) +datetime_to_zone (ECal *client, ECalComponentDateTime *date, const gchar *tzid) { icaltimezone *from, *to; @@ -612,8 +612,8 @@ cal_comp_set_dtend_with_oldzone (ECal *client, ECalComponent *comp, const ECalCo static gboolean update_single_object (ECal *client, icalcomponent *icalcomp, gboolean fail_on_modify) { - const char *uid; - char *tmp; + const gchar *uid; + gchar *tmp; icalcomponent *tmp_icalcomp; gboolean res; @@ -688,10 +688,10 @@ update_objects (ECal *client, icalcomponent *icalcomp) * @return Whether was the operation successful. **/ gboolean -cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDragAction action, const char *source_uid, ESourceList *source_list) +cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDragAction action, const gchar *source_uid, ESourceList *source_list) { - const char * uid; - char *old_uid = NULL; + const gchar * uid; + gchar *old_uid = NULL; icalcomponent *tmp_icalcomp = NULL; GError *error = NULL; gboolean success = FALSE; @@ -703,7 +703,7 @@ cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDr /* FIXME deal with GDK_ACTION_ASK */ if (action == GDK_ACTION_COPY) { - char *tmp; + gchar *tmp; old_uid = g_strdup (icalcomponent_get_uid (comp)); tmp = e_cal_component_gen_uid (); @@ -804,7 +804,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client) icalcomponent *icalcomp = NULL; ECalComponentRange rid; ECalComponentDateTime sdt; - const char *uid; + const gchar *uid; /* Get the master component */ e_cal_component_get_uid (comp, &uid); @@ -822,7 +822,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client) if (rid.datetime.value && sdt.value && icaltime_compare_date_only (*rid.datetime.value, *sdt.value) == 0) { ECalComponentDateTime msdt, medt, edt; - int *sequence; + gint *sequence; e_cal_component_get_dtstart (master, &msdt); e_cal_component_get_dtend (master, &medt); diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h index 3faf9f49a8..f6090543a5 100644 --- a/calendar/gui/comp-util.h +++ b/calendar/gui/comp-util.h @@ -57,7 +57,7 @@ GSList *cal_comp_selection_get_string_list (GtkSelectionData *data); void cal_comp_set_dtstart_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate); void cal_comp_set_dtend_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate); -gboolean cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDragAction action, const char *source_uid, ESourceList *source_list); +gboolean cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDragAction action, const gchar *source_uid, ESourceList *source_list); void comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client); #endif diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 73bfde30cc..ca8a58d528 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -86,7 +86,7 @@ typedef struct { GtkWidget *aalarm_file_chooser; /* Mail alarm widgets */ - const char *email; + const gchar *email; GtkWidget *malarm_group; GtkWidget *malarm_address_group; GtkWidget *malarm_addresses; @@ -103,7 +103,7 @@ typedef struct { ENameSelector *name_selector; } Dialog; -static const char *section_name = "Send To"; +static const gchar *section_name = "Send To"; /* "relative" types */ enum { @@ -119,7 +119,7 @@ enum { }; /* Combo box maps */ -static const int action_map[] = { +static const gint action_map[] = { E_CAL_COMPONENT_ALARM_DISPLAY, E_CAL_COMPONENT_ALARM_AUDIO, E_CAL_COMPONENT_ALARM_PROCEDURE, @@ -127,27 +127,27 @@ static const int action_map[] = { -1 }; -static const char *action_map_cap[] = { +static const gchar *action_map_cap[] = { CAL_STATIC_CAPABILITY_NO_DISPLAY_ALARMS, CAL_STATIC_CAPABILITY_NO_AUDIO_ALARMS, CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS, CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS }; -static const int value_map[] = { +static const gint value_map[] = { MINUTES, HOURS, DAYS, -1 }; -static const int relative_map[] = { +static const gint relative_map[] = { BEFORE, AFTER, -1 }; -static const int time_map[] = { +static const gint time_map[] = { E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END, -1 @@ -159,7 +159,7 @@ enum duration_units { DUR_DAYS }; -static const int duration_units_map[] = { +static const gint duration_units_map[] = { DUR_MINUTES, DUR_HOURS, DUR_DAYS, @@ -197,8 +197,8 @@ alarm_to_dialog (Dialog *dialog) gboolean valid; gboolean repeat; ECalComponentAlarmAction action; - char *email; - int i; + gchar *email; + gint i; /* Clean the page */ clear_widgets (dialog); @@ -314,7 +314,7 @@ repeat_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) static void aalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) { - char *url; + gchar *url; icalattach *attach; if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->aalarm_sound))) @@ -333,7 +333,7 @@ aalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) static void alarm_to_aalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm) { - const char *url; + const gchar *url; icalattach *attach; e_cal_component_alarm_get_attach (alarm, (&attach)); @@ -368,7 +368,7 @@ alarm_to_dalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm ) static void dalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) { - char *str; + gchar *str; ECalComponentText description; GtkTextBuffer *text_buffer; GtkTextIter text_iter_start, text_iter_end; @@ -394,7 +394,7 @@ dalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) icalcomp = e_cal_component_alarm_get_icalcomponent (alarm); icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY); while (icalprop) { - const char *x_name; + const gchar *x_name; x_name = icalproperty_get_x_name (icalprop); if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) { @@ -410,7 +410,7 @@ dalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) static void malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) { - char *str; + gchar *str; ECalComponentText description; GSList *attendee_list = NULL; GtkTextBuffer *text_buffer; @@ -468,7 +468,7 @@ malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) icalcomp = e_cal_component_alarm_get_icalcomponent (alarm); icalprop = icalcomponent_get_first_property(icalcomp, ICAL_X_PROPERTY); while (icalprop) { - const char *x_name; + const gchar *x_name; x_name = icalproperty_get_x_name (icalprop); if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) { @@ -489,7 +489,7 @@ alarm_to_malarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm ) ECalComponentText description; GtkTextBuffer *text_buffer; GSList *attendee_list, *l; - int len; + gint len; /* Attendees */ name_selector_model = e_name_selector_peek_model (dialog->name_selector); @@ -531,7 +531,7 @@ static void alarm_to_palarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm) { ECalComponentText description; - const char *url; + const gchar *url; icalattach *attach; e_cal_component_alarm_get_attach (alarm, (&attach)); @@ -551,9 +551,9 @@ alarm_to_palarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm) static void palarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) { - char *program; + gchar *program; icalattach *attach; - char *str; + gchar *str; ECalComponentText description; icalcomponent *icalcomp; icalproperty *icalprop; @@ -579,7 +579,7 @@ palarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) icalcomp = e_cal_component_alarm_get_icalcomponent (alarm); icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY); while (icalprop) { - const char *x_name; + const gchar *x_name; x_name = icalproperty_get_x_name (icalprop); if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) { @@ -792,7 +792,7 @@ get_widgets (Dialog *dialog) #undef GW if (dialog->action_combo) { - const char *actions[] = { + const gchar *actions[] = { N_("Pop up an alert"), N_("Play a sound"), N_("Run a program"), @@ -865,7 +865,7 @@ static void show_options (Dialog *dialog) { gboolean repeat; - char *email; + gchar *email; e_cal_component_alarm_set_action (dialog->alarm, e_dialog_combo_box_get (dialog->action_combo, action_map)); @@ -943,7 +943,7 @@ repeat_toggle_toggled_cb (GtkToggleButton *toggle, gpointer data) static void check_custom_sound (Dialog *dialog) { - char *str, *dir; + gchar *str, *dir; gboolean sens; str = gtk_file_chooser_get_filename ( @@ -985,7 +985,7 @@ aalarm_attach_changed_cb (GtkWidget *widget, gpointer data) static void check_custom_message (Dialog *dialog) { - char *str; + gchar *str; GtkTextBuffer *text_buffer; GtkTextIter text_iter_start, text_iter_end; gboolean sens; @@ -1024,7 +1024,7 @@ dalarm_description_changed_cb (GtkWidget *widget, gpointer data) static void check_custom_program (Dialog *dialog) { - char *str; + gchar *str; gboolean sens; str = e_dialog_editable_get (dialog->palarm_program); @@ -1044,7 +1044,7 @@ palarm_program_changed_cb (GtkWidget *widget, gpointer data) static void check_custom_email (Dialog *dialog) { - char *str; + gchar *str; GtkTextBuffer *text_buffer; GtkTextIter text_iter_start, text_iter_end; ENameSelectorModel *name_selector_model; @@ -1100,9 +1100,9 @@ static void action_changed_cb (GtkWidget *action_combo, gpointer data) { Dialog *dialog = data; - char *dir; + gchar *dir; ECalComponentAlarmAction action; - int page = 0, i; + gint page = 0, i; action = e_dialog_combo_box_get (dialog->action_combo, action_map); for (i = 0; action_map[i] != -1 ; i++) { @@ -1188,8 +1188,8 @@ gboolean alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm) { Dialog dialog; - int response_id; - char *gladefile; + gint response_id; + gchar *gladefile; g_return_val_if_fail (alarm != NULL, FALSE); diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index 8520b3727b..882f3fd0cc 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -263,8 +263,8 @@ gboolean alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store) { Dialog dialog; - int response_id; - char *gladefile; + gint response_id; + gchar *gladefile; dialog.ecal = ecal; dialog.list_store = list_store; @@ -312,7 +312,7 @@ GtkWidget * alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store) { Dialog *dialog; - char *gladefile; + gchar *gladefile; dialog = (Dialog *)g_new (Dialog, 1); dialog->ecal = ecal; diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c index 9c502153d3..b33753c42e 100644 --- a/calendar/gui/dialogs/cal-attachment-select-file.c +++ b/calendar/gui/dialogs/cal-attachment-select-file.c @@ -42,11 +42,11 @@ enum { }; static GtkWidget* -run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *showinline_p) +run_selector(CompEditor *editor, const gchar *title, guint32 flags, gboolean *showinline_p) { GtkWidget *selection; GtkWidget *showinline = NULL; - char *path; + gchar *path; path = g_object_get_data ((GObject *) editor, "attach_path"); @@ -117,12 +117,12 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho * Return value: the selected filename, or %NULL if the user * cancelled. **/ -char * -comp_editor_select_file (CompEditor *editor, const char *title, gboolean save_mode) +gchar * +comp_editor_select_file (CompEditor *editor, const gchar *title, gboolean save_mode) { guint32 flags = save_mode ? SELECTOR_MODE_SAVE : SELECTOR_MODE_MULTI; GtkWidget *selection; - char *name = NULL; + gchar *name = NULL; selection = run_selector (editor, title, flags, NULL); if (selection) { diff --git a/calendar/gui/dialogs/cal-attachment-select-file.h b/calendar/gui/dialogs/cal-attachment-select-file.h index 0f965e6c9b..b69a741007 100644 --- a/calendar/gui/dialogs/cal-attachment-select-file.h +++ b/calendar/gui/dialogs/cal-attachment-select-file.h @@ -26,8 +26,8 @@ #include "comp-editor.h" -char *comp_editor_select_file (CompEditor *editor, - const char *title, +gchar *comp_editor_select_file (CompEditor *editor, + const gchar *title, gboolean save_mode); GPtrArray *comp_editor_select_file_attachments (CompEditor *editor, diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index f00adc0f0d..ce6f607b5f 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -36,21 +36,21 @@ #include #include -static const int week_start_day_map[] = { +static const gint week_start_day_map[] = { 1, 2, 3, 4, 5, 6, 0, -1 }; -static const int time_division_map[] = { +static const gint time_division_map[] = { 60, 30, 15, 10, 5, -1 }; /* The following two are kept separate in case we need to re-order each menu individually */ -static const int hide_completed_units_map[] = { +static const gint hide_completed_units_map[] = { CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1 }; /* same is used for Birthdays & Anniversaries calendar */ -static const int default_reminder_units_map[] = { +static const gint default_reminder_units_map[] = { CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1 }; @@ -92,7 +92,7 @@ calendar_prefs_dialog_init (CalendarPrefsDialog *dialog) } static GtkWidget * -eccp_widget_glade (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, void *data) +eccp_widget_glade (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { CalendarPrefsDialog *prefs = data; @@ -104,7 +104,7 @@ working_days_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) { CalWeekdays working_days = 0; guint32 mask = 1; - int day; + gint day; for (day = 0; day < 7; day++) { if (e_dialog_toggle_get (prefs->working_days[day])) @@ -128,8 +128,8 @@ timezone_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) static void update_day_second_zone_caption (CalendarPrefsDialog *prefs) { - char *location; - const char *caption; + gchar *location; + const gchar *caption; icaltimezone *zone; g_return_if_fail (prefs != NULL); @@ -172,7 +172,7 @@ day_second_zone_clicked (GtkWidget *widget, CalendarPrefsDialog *prefs) { GtkWidget *menu, *item; GSList *group = NULL, *recent_zones, *s; - char *location; + gchar *location; icaltimezone *zone, *second_zone = NULL; menu = gtk_menu_new (); @@ -223,7 +223,7 @@ day_second_zone_clicked (GtkWidget *widget, CalendarPrefsDialog *prefs) static void start_of_day_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) { - int start_hour, start_minute, end_hour, end_minute; + gint start_hour, start_minute, end_hour, end_minute; EDateEdit *start, *end; start = E_DATE_EDIT (prefs->start_of_day); @@ -248,7 +248,7 @@ start_of_day_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) static void end_of_day_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) { - int start_hour, start_minute, end_hour, end_minute; + gint start_hour, start_minute, end_hour, end_minute; EDateEdit *start, *end; start = E_DATE_EDIT (prefs->start_of_day); @@ -272,7 +272,7 @@ end_of_day_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) static void week_start_day_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) { - int week_start_day; + gint week_start_day; week_start_day = e_dialog_combo_box_get (prefs->week_start_day, week_start_day_map); calendar_config_set_week_start_day (week_start_day); @@ -294,7 +294,7 @@ use_24_hour_toggled (GtkToggleButton *toggle, CalendarPrefsDialog *prefs) static void time_divisions_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) { - int time_divisions; + gint time_divisions; time_divisions = e_dialog_combo_box_get (prefs->time_divisions, time_division_map); calendar_config_set_time_divisions (time_divisions); @@ -417,7 +417,7 @@ static void ba_reminder_interval_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) { const gchar *str; - int value; + gint value; str = gtk_entry_get_text (GTK_ENTRY (widget)); value = (int) g_ascii_strtod (str, NULL); @@ -492,7 +492,7 @@ update_system_tz_widgets (CalendarPrefsDialog *prefs) zone = e_cal_util_get_system_timezone (); if (zone) { - char *tmp = g_strdup_printf ("(%s)", icaltimezone_get_display_name (zone)); + gchar *tmp = g_strdup_printf ("(%s)", icaltimezone_get_display_name (zone)); gtk_label_set_text (GTK_LABEL (prefs->system_tz_label), tmp); g_free (tmp); } else { @@ -512,7 +512,7 @@ use_system_tz_changed (GtkWidget *check, CalendarPrefsDialog *prefs) static void setup_changes (CalendarPrefsDialog *prefs) { - int i; + gint i; for (i = 0; i < 7; i ++) g_signal_connect (G_OBJECT (prefs->working_days[i]), "toggled", G_CALLBACK (working_days_changed), prefs); @@ -617,7 +617,7 @@ initialize_selection (ESourceSelector *selector, ESourceList *source_list) GSList *sources; for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) { ESource *source = E_SOURCE (sources->data); - const char *completion = e_source_get_property (source, "alarm"); + const gchar *completion = e_source_get_property (source, "alarm"); if (!completion || !g_ascii_strcasecmp (completion, "true")) { if (!completion) e_source_set_property (E_SOURCE (source), "alarm", "true"); @@ -648,9 +648,9 @@ show_config (CalendarPrefsDialog *prefs) gint mask, day, week_start_day, time_divisions; icaltimezone *zone; gboolean sensitive, set = FALSE; - char *location; + gchar *location; CalUnits units; - int interval; + gint interval; /* Use system timezone */ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->use_system_tz_check), calendar_config_get_use_system_timezone ()); @@ -753,7 +753,7 @@ static ECalConfigItem eccp_items[] = { }; static void -eccp_free (EConfig *ec, GSList *items, void *data) +eccp_free (EConfig *ec, GSList *items, gpointer data) { g_slist_free (items); } @@ -764,10 +764,10 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs) GladeXML *gui; ECalConfig *ec; ECalConfigTargetPrefs *target; - int i; + gint i; GtkWidget *toplevel; GSList *l; - const char *working_day_names[] = { + const gchar *working_day_names[] = { "sun_button", "mon_button", "tue_button", @@ -776,7 +776,7 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs) "fri_button", "sat_button", }; - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "cal-prefs-dialog.glade", diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index 95820b8247..32fbc9bd68 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -58,11 +58,11 @@ struct _CalendarSourceDialog { }; static gboolean -eccp_check_complete (EConfig *ec, const char *pageid, void *data) +eccp_check_complete (EConfig *ec, const gchar *pageid, gpointer data) { CalendarSourceDialog *sdialog = data; gboolean valid = TRUE; - const char *tmp; + const gchar *tmp; ESource *source; tmp = e_source_peek_name (sdialog->source); @@ -72,7 +72,7 @@ eccp_check_complete (EConfig *ec, const char *pageid, void *data) } static void -eccp_commit (EConfig *ec, GSList *items, void *data) +eccp_commit (EConfig *ec, GSList *items, gpointer data) { CalendarSourceDialog *sdialog = data; xmlNodePtr xml; @@ -80,7 +80,7 @@ eccp_commit (EConfig *ec, GSList *items, void *data) if (sdialog->original_source) { const gchar *color_spec; - xml = xmlNewNode (NULL, (const unsigned char *)"dummy"); + xml = xmlNewNode (NULL, (const guchar *)"dummy"); e_source_dump_to_xml_node (sdialog->source, xml); e_source_update_from_xml_node (sdialog->original_source, xml->children, NULL); xmlFreeNode (xml); @@ -95,7 +95,7 @@ eccp_commit (EConfig *ec, GSList *items, void *data) } static void -eccp_free (EConfig *ec, GSList *items, void *data) +eccp_free (EConfig *ec, GSList *items, gpointer data) { CalendarSourceDialog *sdialog = data; @@ -113,7 +113,7 @@ eccp_free (EConfig *ec, GSList *items, void *data) static void eccp_type_changed (GtkComboBox *dropdown, CalendarSourceDialog *sdialog) { - int id = gtk_combo_box_get_active (dropdown); + gint id = gtk_combo_box_get_active (dropdown); GtkTreeModel *model; GtkTreeIter iter; @@ -134,15 +134,15 @@ eccp_type_changed (GtkComboBox *dropdown, CalendarSourceDialog *sdialog) } static GtkWidget * -eccp_get_source_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, void *data) +eccp_get_source_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { static GtkWidget *label, *type; - int row; + gint row; CalendarSourceDialog *sdialog = data; ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target; ESource *source = t->source; ESourceGroup *group = e_source_peek_group (source); - char *markup; + gchar *markup; if (old) gtk_widget_destroy (label); @@ -164,7 +164,7 @@ eccp_get_source_type (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidg GtkListStore *store; GtkTreeIter iter; GSList *l; - int active = 0, i = 0; + gint active = 0, i = 0; label = gtk_label_new_with_mnemonic(_("_Type:")); @@ -211,10 +211,10 @@ name_changed (GtkEntry *entry, ECalConfigTargetSource *t) } static GtkWidget * -eccp_get_source_name (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +eccp_get_source_name (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { static GtkWidget *label, *entry; - int row; + gint row; ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target; ESource *source = t->source; @@ -252,13 +252,13 @@ offline_status_changed_cb (GtkWidget *widget, CalendarSourceDialog *sdialog) } static GtkWidget * -eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { CalendarSourceDialog *sdialog = data; GtkWidget *offline_setting = NULL; - const char *offline_sync; - int row; - const char *base_uri = e_source_group_peek_base_uri (sdialog->source_group); + const gchar *offline_sync; + gint row; + const gchar *base_uri = e_source_group_peek_base_uri (sdialog->source_group); gboolean is_local = base_uri && (g_str_has_prefix (base_uri, "file://") || g_str_has_prefix (base_uri, "contacts://")); offline_sync = e_source_get_property (sdialog->source, "offline_sync"); if (old) @@ -318,7 +318,7 @@ choose_initial_color (void) } static GtkWidget * -eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { CalendarSourceDialog *sdialog = data; static GtkWidget *label, *color_button; @@ -434,9 +434,9 @@ void calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourceGroup *group) { CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1); - char *xml; + gchar *xml; ECalConfig *ec; - int i; + gint i; GSList *items = NULL; ECalConfigTargetSource *target; @@ -491,9 +491,9 @@ void calendar_setup_edit_task_list (struct _GtkWindow *parent, ESource *source) { CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1); - char *xml; + gchar *xml; ECalConfig *ec; - int i; + gint i; GSList *items = NULL; ECalConfigTargetSource *target; @@ -547,9 +547,9 @@ void calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source) { CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1); - char *xml; + gchar *xml; ECalConfig *ec; - int i; + gint i; GSList *items = NULL; ECalConfigTargetSource *target; diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index cddd4f8d8d..cdb388e7b9 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -67,7 +67,7 @@ gboolean cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean deleting) { ECalComponentVType vtype; - const char *id; + const gchar *id; if (deleting && e_cal_get_save_schedules (client)) return TRUE; diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c index d1abc1724d..5fb0240037 100644 --- a/calendar/gui/dialogs/changed-comp.c +++ b/calendar/gui/dialogs/changed-comp.c @@ -48,7 +48,7 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet { GtkWidget *dialog; ECalComponentVType vtype; - char *str; + gchar *str; gint response; vtype = e_cal_component_get_vtype (comp); diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c index 93b9cd9304..2281e5d0fc 100644 --- a/calendar/gui/dialogs/comp-editor-page.c +++ b/calendar/gui/dialogs/comp-editor-page.c @@ -432,7 +432,7 @@ comp_editor_page_notify_dates_changed (CompEditorPage *page, */ void comp_editor_page_display_validation_error (CompEditorPage *page, - const char *msg, + const gchar *msg, GtkWidget *field) { GtkWidget *dialog; diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h index 819ea74ccc..a58da9b804 100644 --- a/calendar/gui/dialogs/comp-editor-page.h +++ b/calendar/gui/dialogs/comp-editor-page.h @@ -82,7 +82,7 @@ struct _CompEditorPageClass { /* Notification signals */ - void (* dates_changed) (CompEditorPage *page, const char *dates); + void (* dates_changed) (CompEditorPage *page, const gchar *dates); /* Virtual methods */ @@ -119,7 +119,7 @@ void comp_editor_page_notify_dates_changed CompEditorPageDates *dates); void comp_editor_page_display_validation_error (CompEditorPage *page, - const char *msg, + const gchar *msg, GtkWidget *field); G_END_DECLS diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 4666058b51..e9661db372 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -121,7 +121,7 @@ write_label_piece (struct icaltimetype *tt, { struct tm tmp_tm = { 0 }; struct icaltimetype tt_copy = *tt; - int len; + gint len; /* FIXME: May want to convert the time to an appropriate zone. */ @@ -166,7 +166,7 @@ write_label_piece (struct icaltimetype *tt, void comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label) { - char buffer[1024]; + gchar buffer[1024]; gboolean start_set = FALSE, end_set = FALSE; gboolean complete_set = FALSE, due_set = FALSE; @@ -290,13 +290,13 @@ comp_editor_get_current_time (GtkObject *object, gpointer data) * Return value: The category names stripped of surrounding whitespace * and separated with commas. **/ -char * -comp_editor_strip_categories (const char *categories) +gchar * +comp_editor_strip_categories (const gchar *categories) { - char *new_categories; - const char *start, *end; - const char *p; - char *new_p; + gchar *new_categories; + const gchar *start, *end; + const gchar *p; + gchar *new_p; if (!categories) return NULL; @@ -314,7 +314,7 @@ comp_editor_strip_categories (const char *categories) if (g_unichar_isspace (c)) continue; else if (c == ',') { - int len; + gint len; if (!start) continue; @@ -337,7 +337,7 @@ comp_editor_strip_categories (const char *categories) } if (start) { - int len; + gint len; g_return_val_if_fail (start <= end, NULL); diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h index 5516fe4cc4..3bf8921291 100644 --- a/calendar/gui/dialogs/comp-editor-util.h +++ b/calendar/gui/dialogs/comp-editor-util.h @@ -39,6 +39,6 @@ GtkWidget *comp_editor_new_date_edit (gboolean show_date, gboolean show_time, struct tm comp_editor_get_current_time (GtkObject *object, gpointer data); -char *comp_editor_strip_categories (const char *categories); +gchar *comp_editor_strip_categories (const gchar *categories); #endif diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index cd2dac7a9e..9fe0b3f1ca 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -198,10 +198,10 @@ get_attachment_list (CompEditor *editor) GtkTreeModel *model; GtkTreeIter iter; GSList *list = NULL; - const char *comp_uid = NULL; - const char *local_store = e_cal_get_local_attachment_store (editor->priv->client); + const gchar *comp_uid = NULL; + const gchar *local_store = e_cal_get_local_attachment_store (editor->priv->client); gboolean valid; - int ticker=0; + gint ticker=0; e_cal_component_get_uid (editor->priv->comp, &comp_uid); @@ -216,9 +216,9 @@ get_attachment_list (CompEditor *editor) CamelDataWrapper *wrapper; CamelMimePart *mime_part; CamelStream *stream; - char *attach_file_url; - char *safe_fname, *utf8_safe_fname; - char *filename; + gchar *attach_file_url; + gchar *safe_fname, *utf8_safe_fname; + gchar *filename; gint column_id; column_id = E_ATTACHMENT_STORE_COLUMN_ATTACHMENT; @@ -244,7 +244,7 @@ get_attachment_list (CompEditor *editor) if (!utf8_safe_fname) safe_fname = g_strdup_printf ("%s-%d", _("attachment"), ticker++); else { - safe_fname = g_filename_from_utf8 ((const char *) utf8_safe_fname, -1, NULL, NULL, NULL); + safe_fname = g_filename_from_utf8 ((const gchar *) utf8_safe_fname, -1, NULL, NULL, NULL); g_free (utf8_safe_fname); } filename = g_strdup_printf ("%s-%s", comp_uid, safe_fname); @@ -298,7 +298,7 @@ static void listen_for_changes (CompEditor *editor) { CompEditorPrivate *priv; - const char *uid = NULL; + const gchar *uid = NULL; priv = editor->priv; @@ -318,7 +318,7 @@ listen_for_changes (CompEditor *editor) e_cal_component_get_uid (priv->comp, &uid); if (uid) { - char *query; + gchar *query; query = g_strdup_printf ("(uid? \"%s\")", uid); e_cal_get_query (priv->source_client, query, &priv->view, NULL); @@ -356,7 +356,7 @@ save_comp (CompEditor *editor) gboolean result; GError *error = NULL; GHashTable *timezones; - const char *orig_uid; + const gchar *orig_uid; icalcomponent *icalcomp; priv = editor->priv; @@ -449,7 +449,7 @@ save_comp (CompEditor *editor) icalproperty *icalprop; icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY); while (icalprop) { - const char *x_name; + const gchar *x_name; x_name = icalproperty_get_x_name (icalprop); if (!strcmp (x_name, "X-EVOLUTION-OPTIONS-DELAY")) { @@ -817,7 +817,7 @@ action_save_cb (GtkAction *action, delegate = flags & COMP_EDITOR_DELEGATE; if (delegate && !remove_event_dialog (priv->client, priv->comp, GTK_WINDOW (editor))) { - const char *uid = NULL; + const gchar *uid = NULL; GError *error = NULL; e_cal_component_get_uid (priv->comp, &uid); @@ -2078,7 +2078,7 @@ page_unmapped_cb (GtkWidget *page_widget, void comp_editor_append_page (CompEditor *editor, CompEditorPage *page, - const char *label, + const gchar *label, gboolean add) { CompEditorPrivate *priv; @@ -2339,7 +2339,7 @@ real_edit_comp (CompEditor *editor, ECalComponent *comp) /* TODO These functions should be available in e-cal-component.c */ static void -set_attendees_for_delegation (ECalComponent *comp, const char *address, ECalComponentItipMethod method) +set_attendees_for_delegation (ECalComponent *comp, const gchar *address, ECalComponentItipMethod method) { icalproperty *prop; icalparameter *param; @@ -2350,8 +2350,8 @@ set_attendees_for_delegation (ECalComponent *comp, const char *address, ECalComp for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY); prop; prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY)) { - const char *attendee = icalproperty_get_attendee (prop); - const char *delfrom = NULL; + const gchar *attendee = icalproperty_get_attendee (prop); + const gchar *delfrom = NULL; param = icalproperty_get_first_parameter(prop, ICAL_DELEGATEDFROM_PARAMETER); if (param) @@ -2371,8 +2371,8 @@ get_users_from_memo_comp (ECalComponent *comp, GList **users) { icalcomponent *icalcomp; icalproperty *icalprop; - const char *attendees = NULL; - char **emails, **iter; + const gchar *attendees = NULL; + gchar **emails, **iter; icalcomp = e_cal_component_get_icalcomponent (comp); @@ -2402,7 +2402,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str CompEditorPrivate *priv; CompEditorFlags flags; ECalComponent *send_comp = NULL; - char *address = NULL; + gchar *address = NULL; GList *users = NULL; g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE); @@ -2413,7 +2413,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str if (priv->mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (priv->comp)) { /* Ensure we send the master object, not the instance only */ icalcomponent *icalcomp = NULL; - const char *uid = NULL; + const gchar *uid = NULL; e_cal_component_get_uid (priv->comp, &uid); if (e_cal_get_object (priv->client, uid, NULL, &icalcomp, NULL) && icalcomp) { @@ -2449,7 +2449,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str } } else { /* Clone the component with attachments set to CID:... */ - int num_attachments, i; + gint num_attachments, i; GSList *attach_list = NULL; GSList *mime_attach_list; @@ -2567,7 +2567,7 @@ void comp_editor_delete_comp (CompEditor *editor) { CompEditorPrivate *priv; - const char *uid; + const gchar *uid; g_return_if_fail (IS_COMP_EDITOR (editor)); @@ -2647,8 +2647,8 @@ comp_editor_get_mime_attach_list (CompEditor *editor) CamelDataWrapper *wrapper; CamelMimePart *mime_part; CamelStreamMem *mstream; - unsigned char *buffer = NULL; - const char *desc, *disp; + guchar *buffer = NULL; + const gchar *desc, *disp; gint column_id; column_id = E_ATTACHMENT_STORE_COLUMN_ATTACHMENT; @@ -2668,7 +2668,7 @@ comp_editor_get_mime_attach_list (CompEditor *editor) camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream); buffer = g_memdup (mstream->buffer->data, mstream->buffer->len); - cal_mime_attach->encoded_data = (char *)buffer; + cal_mime_attach->encoded_data = (gchar *)buffer; cal_mime_attach->length = mstream->buffer->len; cal_mime_attach->filename = g_strdup (camel_mime_part_get_filename (mime_part)); desc = camel_mime_part_get_description (mime_part); diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c index 92444678be..49cf8b3ce4 100644 --- a/calendar/gui/dialogs/copy-source-dialog.c +++ b/calendar/gui/dialogs/copy-source-dialog.c @@ -38,7 +38,7 @@ typedef struct { } CopySourceDialogData; static void -show_error (GtkWindow *parent, const char *msg) +show_error (GtkWindow *parent, const gchar *msg) { GtkWidget *dialog; @@ -82,7 +82,7 @@ copy_source (CopySourceDialogData *csdd) } else { if (e_cal_get_object_list (source_client, "#t", &obj_list, NULL)) { GList *l; - const char *uid; + const gchar *uid; icalcomponent *icalcomp; for (l = obj_list; l != NULL; l = l->next) { @@ -93,7 +93,7 @@ copy_source (CopySourceDialogData *csdd) e_cal_modify_object (dest_client, l->data, CALOBJ_MOD_ALL, NULL); icalcomponent_free (icalcomp); } else { - e_cal_create_object (dest_client, l->data, (char **) &uid, NULL); + e_cal_create_object (dest_client, l->data, (gchar **) &uid, NULL); g_free ((gpointer) uid); } } diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index ae371aabb2..1a004272d1 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -58,12 +58,12 @@ gboolean delete_component_dialog (ECalComponent *comp, gboolean consider_as_untitled, - int n_comps, ECalComponentVType vtype, + gint n_comps, ECalComponentVType vtype, GtkWidget *widget) { - const char *id; - char *arg0 = NULL; - int response; + const gchar *id; + gchar *arg0 = NULL; + gint response; if (comp) { g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE); @@ -167,9 +167,9 @@ cb_toggled_cb (GtkWidget *toggle, gpointer data) } gboolean -prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *parent, gboolean *retract) +prompt_retract_dialog (ECalComponent *comp, gchar **retract_text, GtkWidget *parent, gboolean *retract) { - char *message = NULL; + gchar *message = NULL; ECalComponentVType type = E_CAL_COMPONENT_NO_TYPE; GtkMessageDialog *dialog = NULL; GtkWidget *cb, *label, *entry, *vbox, *sw, *frame; diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h index c619e28b98..9123dcc479 100644 --- a/calendar/gui/dialogs/delete-comp.h +++ b/calendar/gui/dialogs/delete-comp.h @@ -31,8 +31,8 @@ gboolean delete_component_dialog (ECalComponent *comp, gboolean consider_as_untitled, - int n_comps, ECalComponentVType vtype, + gint n_comps, ECalComponentVType vtype, GtkWidget *widget); -gboolean prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *parent, gboolean *retract); +gboolean prompt_retract_dialog (ECalComponent *comp, gchar **retract_text, GtkWidget *parent, gboolean *retract); #endif diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c index f8df587aa4..c312e16ada 100644 --- a/calendar/gui/dialogs/delete-error.c +++ b/calendar/gui/dialogs/delete-error.c @@ -42,7 +42,7 @@ void delete_error_dialog (GError *error, ECalComponentVType vtype) { GtkWidget *dialog; - const char *str; + const gchar *str; const gchar *icon_name = NULL; if (!error) diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index 8e060832df..87fb164e6a 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -36,8 +36,8 @@ #include "e-delegate-dialog.h" struct _EDelegateDialogPrivate { - char *name; - char *address; + gchar *name; + gchar *address; /* Glade XML data */ GladeXML *xml; @@ -51,7 +51,7 @@ struct _EDelegateDialogPrivate { GtkWidget *entry; }; -static const char *section_name = "Delegate To"; +static const gchar *section_name = "Delegate To"; static void e_delegate_dialog_finalize (GObject *object); @@ -116,14 +116,14 @@ e_delegate_dialog_finalize (GObject *object) EDelegateDialog * -e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char *address) +e_delegate_dialog_construct (EDelegateDialog *edd, const gchar *name, const gchar *address) { EDelegateDialogPrivate *priv; EDestinationStore *destination_store; EDestination *dest; ENameSelectorModel *name_selector_model; ENameSelectorDialog *name_selector_dialog; - char *gladefile; + gchar *gladefile; g_return_val_if_fail (edd != NULL, NULL); g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL); @@ -234,7 +234,7 @@ addressbook_response_cb (GtkWidget *widget, gint response, gpointer data) * editor could not be created. **/ EDelegateDialog * -e_delegate_dialog_new (const char *name, const char *address) +e_delegate_dialog_new (const gchar *name, const gchar *address) { EDelegateDialog *edd; @@ -242,7 +242,7 @@ e_delegate_dialog_new (const char *name, const char *address) return e_delegate_dialog_construct (E_DELEGATE_DIALOG (edd), name, address); } -char * +gchar * e_delegate_dialog_get_delegate (EDelegateDialog *edd) { EDelegateDialogPrivate *priv; @@ -274,7 +274,7 @@ e_delegate_dialog_get_delegate (EDelegateDialog *edd) } -char * +gchar * e_delegate_dialog_get_delegate_name (EDelegateDialog *edd) { EDelegateDialogPrivate *priv; diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h index e4f474781a..6ff872e7e4 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.h +++ b/calendar/gui/dialogs/e-delegate-dialog.h @@ -54,18 +54,18 @@ struct _EDelegateDialogClass { GType e_delegate_dialog_get_type (void); EDelegateDialog* e_delegate_dialog_construct (EDelegateDialog *etd, - const char *name, - const char *address); + const gchar *name, + const gchar *address); -EDelegateDialog* e_delegate_dialog_new (const char *name, - const char *address); +EDelegateDialog* e_delegate_dialog_new (const gchar *name, + const gchar *address); -char* e_delegate_dialog_get_delegate (EDelegateDialog *etd); +gchar * e_delegate_dialog_get_delegate (EDelegateDialog *etd); -char* e_delegate_dialog_get_delegate_name (EDelegateDialog *etd); +gchar * e_delegate_dialog_get_delegate_name (EDelegateDialog *etd); void e_delegate_dialog_set_delegate (EDelegateDialog *etd, - const char *address); + const gchar *address); GtkWidget* e_delegate_dialog_get_toplevel (EDelegateDialog *etd); diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c index fd6bf245c2..5af9d4bc43 100644 --- a/calendar/gui/dialogs/e-send-options-utils.c +++ b/calendar/gui/dialogs/e-send-options-utils.c @@ -34,8 +34,8 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, ESendOptionsStatusTracking *sopts; GConfClient *gconf = gconf_client_get_default (); ESourceList *source_list; - const char *uid; - const char *value; + const gchar *uid; + const gchar *value; gopts = sod->data->gopts; sopts = sod->data->sopts; @@ -153,7 +153,7 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, void e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp) { - int i = 1; + gint i = 1; icalproperty *prop; icalcomponent *icalcomp; ESendOptionsGeneral *gopts; @@ -166,7 +166,7 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp icalcomp = e_cal_component_get_icalcomponent (comp); if (e_sendoptions_get_need_general_options (sod)) { - prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", gopts->priority)); + prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", gopts->priority)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-PRIORITY"); icalcomponent_add_property (icalcomp, prop); @@ -174,20 +174,20 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp if (gopts->reply_convenient) prop = icalproperty_new_x ("convenient"); else - prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", gopts->reply_within)); + prop = icalproperty_new_x ((const gchar *) g_strdup_printf ( "%d", gopts->reply_within)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-REPLY"); icalcomponent_add_property (icalcomp, prop); } if (gopts->expiration_enabled && gopts->expire_after) { - prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", gopts->expire_after)); + prop = icalproperty_new_x ((const gchar *) g_strdup_printf ( "%d", gopts->expire_after)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-EXPIRE"); icalcomponent_add_property (icalcomp, prop); } if (gopts->delay_enabled) { struct icaltimetype temp; - char *str; + gchar *str; icaltimezone *zone = calendar_config_get_icaltimezone (); temp = icaltime_from_timet_with_zone (gopts->delay_until, FALSE, zone); @@ -201,7 +201,7 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp } if (sopts->tracking_enabled) - prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", sopts->track_when)); + prop = icalproperty_new_x ((const gchar *) g_strdup_printf ( "%d", sopts->track_when)); else prop = icalproperty_new_x ("0"); @@ -209,19 +209,19 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp icalcomponent_add_property (icalcomp, prop); - prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->opened)); + prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", sopts->opened)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-OPENED"); icalcomponent_add_property (icalcomp, prop); - prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->accepted)); + prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", sopts->accepted)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-ACCEPTED"); icalcomponent_add_property (icalcomp, prop); - prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->declined)); + prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", sopts->declined)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-DECLINED"); icalcomponent_add_property (icalcomp, prop); - prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->completed)); + prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", sopts->completed)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-COMPLETED"); icalcomponent_add_property (icalcomp, prop); } diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index cff9d75950..93110b8797 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -551,8 +551,8 @@ event_editor_edit_comp (CompEditor *editor, ECalComponent *comp) /* Set up the attendees */ if (attendees != NULL) { GSList *l; - int row; - char *user_email; + gint row; + gchar *user_email; user_email = itip_get_comp_attendee (comp, client); if (!priv->meeting_shown) { diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index b2ac6b55db..f1994fa9a7 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -73,7 +73,7 @@ enum { ALARM_CUSTOM }; -static const int alarm_map_with_user_time[] = { +static const gint alarm_map_with_user_time[] = { ALARM_NONE, ALARM_15_MINUTES, ALARM_1_HOUR, @@ -83,7 +83,7 @@ static const int alarm_map_with_user_time[] = { -1 }; -static const int alarm_map_without_user_time[] = { +static const gint alarm_map_without_user_time[] = { ALARM_NONE, ALARM_15_MINUTES, ALARM_1_HOUR, @@ -113,7 +113,7 @@ struct _EventPagePrivate { EAccountList *accounts; GList *address_strings; EMeetingAttendee *ia; - char *user_add; + gchar *user_add; ECalComponent *comp; /* For meeting/event */ @@ -176,9 +176,9 @@ struct _EventPagePrivate { gboolean sendoptions_shown; ESendOptionsDialog *sod; - char *old_summary; + gchar *old_summary; CalUnits alarm_units; - int alarm_interval; + gint alarm_interval; /* This is TRUE if both the start & end timezone are the same. If the start timezone is then changed, we updated the end timezone to the @@ -189,7 +189,7 @@ struct _EventPagePrivate { GtkWidget *alarm_list_dlg_widget; /* either with-user-time or without it */ - const int *alarm_map; + const gint *alarm_map; }; static GtkWidget *event_page_get_widget (CompEditorPage *page); @@ -206,8 +206,8 @@ static void hour_sel_changed ( GtkSpinButton *widget, EventPage *epage); static void minute_sel_changed ( GtkSpinButton *widget, EventPage *epage); static void hour_minute_changed ( EventPage *epage); static void update_end_time_combo ( EventPage *epage); -static void event_page_select_organizer (EventPage *epage, const char *backend_address); -static void set_subscriber_info_string (EventPage *epage, const char *backend_address); +static void event_page_select_organizer (EventPage *epage, const gchar *backend_address); +static void set_subscriber_info_string (EventPage *epage, const gchar *backend_address); G_DEFINE_TYPE (EventPage, event_page, TYPE_COMP_EDITOR_PAGE) @@ -508,7 +508,7 @@ clear_widgets (EventPage *epage) } static gboolean -is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units, int user_interval, int *alarm_type) +is_custom_alarm (ECalComponentAlarm *ca, gchar *old_summary, CalUnits user_units, gint user_interval, gint *alarm_type) { ECalComponentAlarmTrigger trigger; ECalComponentAlarmRepeat repeat; @@ -530,7 +530,7 @@ is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units, icalcomp = e_cal_component_alarm_get_icalcomponent (ca); icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY); while (icalprop) { - const char *x_name; + const gchar *x_name; x_name = icalproperty_get_x_name (icalprop); if (!strcmp (x_name, "X-EVOLUTION-NEEDS-DESCRIPTION")) @@ -627,7 +627,7 @@ is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units, } static gboolean -is_custom_alarm_uid_list (ECalComponent *comp, GList *alarms, char *old_summary, CalUnits user_units, int user_interval, int *alarm_type) +is_custom_alarm_uid_list (ECalComponent *comp, GList *alarms, gchar *old_summary, CalUnits user_units, gint user_interval, gint *alarm_type) { ECalComponentAlarm *ca; gboolean result; @@ -643,7 +643,7 @@ is_custom_alarm_uid_list (ECalComponent *comp, GList *alarms, char *old_summary, } static gboolean -is_custom_alarm_store (EAlarmList *alarm_list_store, char *old_summary, CalUnits user_units, int user_interval, int *alarm_type) +is_custom_alarm_store (EAlarmList *alarm_list_store, gchar *old_summary, CalUnits user_units, gint user_interval, gint *alarm_type) { const ECalComponentAlarm *alarm; GtkTreeModel *model; @@ -700,7 +700,7 @@ event_page_set_view_rsvp (EventPage *epage, gboolean state) } static GtkWidget * -create_image_event_box (const char *image_text, const char *tip_text) +create_image_event_box (const gchar *image_text, const gchar *tip_text) { GtkWidget *image, *box; @@ -866,7 +866,7 @@ get_current_account (EventPage *epage) { EventPagePrivate *priv; EIterator *it; - const char *str; + const gchar *str; priv = epage->priv; @@ -876,7 +876,7 @@ get_current_account (EventPage *epage) for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) { EAccount *a = (EAccount *)e_iterator_get(it); - char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); + gchar *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); if (!g_ascii_strcasecmp (full, str)) { g_free (full); @@ -905,8 +905,8 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) ECalComponentClassification cl; ECalComponentTransparency transparency; ECalComponentDateTime start_date, end_date; - const char *location, *uid = NULL; - const char *categories; + const gchar *location, *uid = NULL; + const gchar *categories; gchar *backend_addr = NULL; GSList *l; gboolean validated = TRUE; @@ -1084,7 +1084,7 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) if (e_cal_component_has_alarms (comp)) { GList *alarms, *list; - int alarm_type; + gint alarm_type; alarms = e_cal_component_get_alarm_uids (comp); if (!is_custom_alarm_uid_list (comp, alarms, priv->old_summary, priv->alarm_units, priv->alarm_interval, &alarm_type)) @@ -1140,7 +1140,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) ECalComponentDateTime start_date, end_date; struct icaltimetype start_tt, end_tt; gboolean all_day_event, start_date_set, end_date_set, busy; - char *cat, *str; + gchar *cat, *str; GtkTextBuffer *text_buffer; GtkTextIter text_iter_start, text_iter_end; @@ -1322,7 +1322,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) icalcomp = e_cal_component_alarm_get_icalcomponent (alarm); icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY); while (icalprop) { - const char *x_name; + const gchar *x_name; ECalComponentText summary; x_name = icalproperty_get_x_name (icalprop); @@ -1349,7 +1349,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) ECalComponentAlarm *ca; ECalComponentText summary; ECalComponentAlarmTrigger trigger; - int alarm_type; + gint alarm_type; ca = e_cal_component_alarm_new (); @@ -1456,7 +1456,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) if (flags & COMP_EDITOR_DELEGATE) { GSList *attendee_list, *l; - int i; + gint i; const GPtrArray *attendees = e_meeting_store_get_attendees (priv->model); e_cal_component_get_attendee_list (priv->comp, &attendee_list); @@ -1530,7 +1530,7 @@ static void time_sel_changed (GtkComboBox *combo, EventPage *epage) { EventPagePrivate *priv; - int selection = gtk_combo_box_get_active (combo); + gint selection = gtk_combo_box_get_active (combo); priv = epage->priv; @@ -1683,8 +1683,8 @@ existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) for (l = attendees; l; l = l->next) { ECalComponentAttendee *attendee = l->data; - const char *address; - const char *sentby = NULL; + const gchar *address; + const gchar *sentby = NULL; address = itip_strip_mailto (attendee->value); if (attendee->sentby) @@ -1707,7 +1707,7 @@ remove_attendee (EventPage *epage, EMeetingAttendee *ia) EventPagePrivate *priv = epage->priv; CompEditor *editor; CompEditorFlags flags; - int pos = 0; + gint pos = 0; gboolean delegate; editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (epage)); @@ -1767,7 +1767,7 @@ remove_clicked_cb (GtkButton *btn, EventPage *epage) GtkTreePath *path = NULL; GtkTreeModel *model = NULL; gboolean valid_iter; - char *address; + gchar *address; priv = epage->priv; @@ -1847,7 +1847,7 @@ attendee_added_cb (EMeetingListView *emlv, e_meeting_store_remove_attendee (priv->model, ia); } else { if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY)) { - const char *delegator_id = e_meeting_attendee_get_delfrom (ia); + const gchar *delegator_id = e_meeting_attendee_get_delfrom (ia); EMeetingAttendee *delegator; delegator = e_meeting_store_find_attendee (priv->model, delegator_id, NULL); @@ -1866,7 +1866,7 @@ attendee_added_cb (EMeetingListView *emlv, /* Callbacks for list view*/ static void -popup_add_cb (EPopup *ep, EPopupItem *pitem, void *data) +popup_add_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { EventPage *epage = data; @@ -1874,7 +1874,7 @@ popup_add_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -popup_delete_cb (EPopup *ep, EPopupItem *pitem, void *data) +popup_delete_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { EventPage *epage = data; @@ -1894,7 +1894,7 @@ static EPopupItem context_menu_items[] = { }; static void -context_popup_free(EPopup *ep, GSList *items, void *data) +context_popup_free(EPopup *ep, GSList *items, gpointer data) { g_slist_free(items); } @@ -1909,11 +1909,11 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, EventPage *epage) EMeetingAttendee *ia; GtkTreePath *path; GtkTreeIter iter; - char *address; + gchar *address; guint32 disable_mask = ~0; GSList *menus = NULL; ECalPopup *ep; - int i; + gint i; /* only process right-clicks */ if (event->button != 3 || event->type != GDK_BUTTON_PRESS) @@ -2348,7 +2348,7 @@ check_start_before_end (struct icaltimetype *start_tt, gboolean adjust_end_time) { struct icaltimetype end_tt_copy; - int cmp; + gint cmp; /* Convert the end time to the same timezone as the start time. */ end_tt_copy = *end_tt; @@ -2420,7 +2420,7 @@ times_updated (EventPage *epage, gboolean adjust_end_time) if (all_day_event) { /* All Day Events are simple. We just compare the dates and if start > end we copy one of them to the other. */ - int cmp = icaltime_compare_date_only (start_tt, end_tt); + gint cmp = icaltime_compare_date_only (start_tt, end_tt); if (cmp > 0) { if (adjust_end_time) { end_tt = start_tt; @@ -2646,7 +2646,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage) } static void -set_subscriber_info_string (EventPage *epage, const char *backend_address) +set_subscriber_info_string (EventPage *epage, const gchar *backend_address) { CompEditor *editor; ECal *client; @@ -2679,7 +2679,7 @@ alarm_changed_cb (GtkWidget *widget, gpointer data) ECalComponentAlarmTrigger trigger; icalcomponent *icalcomp; icalproperty *icalprop; - int alarm_type; + gint alarm_type; ca = e_cal_component_alarm_new (); @@ -2813,7 +2813,7 @@ init_widgets (EventPage *epage) CompEditor *editor; GtkTextBuffer *text_buffer; icaltimezone *zone; - char *combo_label = NULL; + gchar *combo_label = NULL; GtkTreeSelection *selection; ECal *client; @@ -3013,7 +3013,7 @@ init_widgets (EventPage *epage) static void -event_page_select_organizer (EventPage *epage, const char *backend_address) +event_page_select_organizer (EventPage *epage, const gchar *backend_address) { EventPagePrivate *priv = epage->priv; CompEditor *editor; @@ -3021,10 +3021,10 @@ event_page_select_organizer (EventPage *epage, const char *backend_address) ECal *client; EAccount *def_account; gchar *def_address = NULL; - const char *default_address; + const gchar *default_address; gboolean subscribed_cal = FALSE; ESource *source = NULL; - const char *user_addr = NULL; + const gchar *user_addr = NULL; def_account = itip_addresses_get_default(); if (def_account && def_account->enabled) @@ -3047,7 +3047,7 @@ event_page_select_organizer (EventPage *epage, const char *backend_address) if (user_addr) for (l = priv->address_strings; l != NULL; l = l->next) if (g_strrstr ((gchar *) l->data, user_addr) != NULL) { - default_address = (const char *) l->data; + default_address = (const gchar *) l->data; break; } @@ -3080,7 +3080,7 @@ event_page_construct (EventPage *epage, EMeetingStore *model) EventPagePrivate *priv; EIterator *it; EAccount *a; - char *gladefile; + gchar *gladefile; priv = epage->priv; g_object_ref (model); @@ -3217,7 +3217,7 @@ static void set_attendees (ECalComponent *comp, const GPtrArray *attendees) { GSList *comp_attendees = NULL, *l; - int i; + gint i; for (i = 0; i < attendees->len; i++) { EMeetingAttendee *ia = g_ptr_array_index (attendees, i); diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 957b8f695c..c3642a91d4 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -101,10 +101,10 @@ struct _MemoPagePrivate { }; static void set_subscriber_info_string (MemoPage *mpage, const gchar *backend_address); -static const char * get_recipients (ECalComponent *comp); +static const gchar * get_recipients (ECalComponent *comp); static void sensitize_widgets (MemoPage *mpage); static gboolean memo_page_fill_component (CompEditorPage *page, ECalComponent *comp); -static void memo_page_select_organizer (MemoPage *mpage, const char *backend_address); +static void memo_page_select_organizer (MemoPage *mpage, const gchar *backend_address); G_DEFINE_TYPE (MemoPage, memo_page, TYPE_COMP_EDITOR_PAGE) @@ -196,7 +196,7 @@ memo_page_fill_widgets (CompEditorPage *page, ECalComponentText text; ECalComponentDateTime d; GSList *l; - const char *categories; + const gchar *categories; gchar *backend_addr = NULL; mpage = MEMO_PAGE (page); @@ -363,7 +363,7 @@ sensitize_widgets (MemoPage *mpage) } /* returns empty string rather than NULL because of simplicity of usage */ -static const char * +static const gchar * get_recipients (ECalComponent *comp) { icalcomponent *icalcomp; @@ -377,7 +377,7 @@ get_recipients (ECalComponent *comp) for (icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY); icalprop; icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY)) { - const char *xname = icalproperty_get_x_name (icalprop); + const gchar *xname = icalproperty_get_x_name (icalprop); if (xname && strcmp (xname, "X-EVOLUTION-RECIPIENTS") == 0) break; @@ -420,7 +420,7 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp) ENameSelectorDialog *dialog; EContactStore *c_store; GList *books, *l; - char *uri = e_contact_get (contact, E_CONTACT_BOOK_URI); + gchar *uri = e_contact_get (contact, E_CONTACT_BOOK_URI); dialog = e_name_selector_peek_dialog (name_selector); c_store = dialog->name_selector_model->contact_store; @@ -437,11 +437,11 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp) if (book) { GList *contacts = NULL; EContact *n_con = NULL; - char *qu; + gchar *qu; EBookQuery *query; qu = g_strdup_printf ("(is \"full_name\" \"%s\")", - (char *) e_contact_get (contact, E_CONTACT_FULL_NAME)); + (gchar *) e_contact_get (contact, E_CONTACT_FULL_NAME)); query = e_book_query_from_string (qu); if (!e_book_get_contacts (book, query, &contacts, NULL)) { @@ -471,7 +471,7 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp) for (l = list_dests; l; l = l->next) { EDestination *dest = l->data; - const char *name, *attendee = NULL; + const gchar *name, *attendee = NULL; name = e_destination_get_name (dest); @@ -512,7 +512,7 @@ get_current_account (MemoPage *page) { MemoPagePrivate *priv = page->priv; EIterator *it; - const char *str; + const gchar *str; str = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->org_combo)))); if (!str) @@ -520,7 +520,7 @@ get_current_account (MemoPage *page) for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) { EAccount *a = (EAccount *)e_iterator_get(it); - char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); + gchar *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); if (!g_ascii_strcasecmp (full, str)) { g_free (full); @@ -549,8 +549,8 @@ memo_page_fill_component (CompEditorPage *page, ECalComponentClassification classification; ECalComponentDateTime start_date; struct icaltimetype start_tt; - char *cat, *str; - int i; + gchar *cat, *str; + gint i; GtkTextBuffer *text_buffer; GtkTextIter text_iter_start, text_iter_end; @@ -591,10 +591,10 @@ memo_page_fill_component (CompEditorPage *page, e_cal_component_set_description_list (comp, NULL); } else { - int idxToUse = 1; + gint idxToUse = 1; GSList l; ECalComponentText text, sumText; - char *txt, *p; + gchar *txt, *p; gunichar uc; for(i = 0, p = str, uc = g_utf8_get_char_validated (p, -1); @@ -1016,7 +1016,7 @@ get_to_entry (ENameSelector *name_selector) } static void -memo_page_select_organizer (MemoPage *mpage, const char *backend_address) +memo_page_select_organizer (MemoPage *mpage, const gchar *backend_address) { MemoPagePrivate *priv; CompEditor *editor; @@ -1025,10 +1025,10 @@ memo_page_select_organizer (MemoPage *mpage, const char *backend_address) ECal *client; EAccount *def_account; gchar *def_address = NULL; - const char *default_address; + const gchar *default_address; gboolean subscribed_cal = FALSE; ESource *source = NULL; - const char *user_addr = NULL; + const gchar *user_addr = NULL; def_account = itip_addresses_get_default(); if (def_account && def_account->enabled) @@ -1053,7 +1053,7 @@ memo_page_select_organizer (MemoPage *mpage, const char *backend_address) if (user_addr) for (l = priv->address_strings; l != NULL; l = l->next) if (g_strrstr ((gchar *) l->data, user_addr) != NULL) { - default_address = (const char *) l->data; + default_address = (const gchar *) l->data; break; } @@ -1087,7 +1087,7 @@ memo_page_construct (MemoPage *mpage) CompEditor *editor; CompEditorFlags flags; EIterator *it; - char *gladefile; + gchar *gladefile; EAccount *a; editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (mpage)); diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c index 8d8dabbaf2..1323755cb1 100644 --- a/calendar/gui/dialogs/recur-comp.c +++ b/calendar/gui/dialogs/recur-comp.c @@ -37,7 +37,7 @@ recur_component_dialog (ECal *client, CalObjModType *mod, GtkWindow *parent, gboolean delegated) { - char *str; + gchar *str; GtkWidget *dialog, *rb_this, *rb_prior, *rb_future, *rb_all, *hbox; GtkWidget *placeholder, *vbox; ECalComponentVType vtype; diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index f89993154f..5e24495b5c 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -61,7 +61,7 @@ enum month_num_options { MONTH_NUM_OTHER }; -static const int month_num_options_map[] = { +static const gint month_num_options_map[] = { MONTH_NUM_FIRST, MONTH_NUM_SECOND, MONTH_NUM_THIRD, @@ -83,7 +83,7 @@ enum month_day_options { MONTH_DAY_SUN }; -static const int month_day_options_map[] = { +static const gint month_day_options_map[] = { MONTH_DAY_NTH, MONTH_DAY_MON, MONTH_DAY_TUE, @@ -101,14 +101,14 @@ enum recur_type { RECUR_CUSTOM }; -static const int type_map[] = { +static const gint type_map[] = { RECUR_NONE, RECUR_SIMPLE, RECUR_CUSTOM, -1 }; -static const int freq_map[] = { +static const gint freq_map[] = { ICAL_DAILY_RECURRENCE, ICAL_WEEKLY_RECURRENCE, ICAL_MONTHLY_RECURRENCE, @@ -122,7 +122,7 @@ enum ending_type { ENDING_FOREVER }; -static const int ending_types_map[] = { +static const gint ending_types_map[] = { ENDING_FOR, ENDING_UNTIL, ENDING_FOREVER, @@ -157,7 +157,7 @@ struct _RecurrencePagePrivate { guint8 weekday_blocked_day_mask; /* For monthly recurrences, created by hand */ - int month_index; + gint month_index; GtkWidget *month_day_combo; enum month_day_options month_day; @@ -171,7 +171,7 @@ struct _RecurrencePagePrivate { /* For ending count of occurrences, created by hand */ GtkWidget *ending_count_spin; - int ending_count; + gint ending_count; /* More widgets from the Glade file */ GtkWidget *exception_list; /* This is a GtkTreeView now */ @@ -583,7 +583,7 @@ sensitize_buttons (RecurrencePage *rpage) gint selected_rows; icalcomponent *icalcomp; ECal *client; - const char *uid; + const gchar *uid; if (priv->comp == NULL) return; @@ -639,7 +639,7 @@ sensitize_buttons (RecurrencePage *rpage) * icalrecurrencetype.by_day. Not needed at present. */ static short -nth_weekday (int pos, icalrecurrencetype_weekday weekday) +nth_weekday (gint pos, icalrecurrencetype_weekday weekday) { g_assert (pos > 0 && pos <= 5); @@ -679,7 +679,7 @@ simple_recur_to_comp (RecurrencePage *rpage, ECalComponent *comp) case ICAL_WEEKLY_RECURRENCE: { guint8 day_mask; - int i; + gint i; g_return_if_fail (GTK_BIN (priv->special)->child != NULL); g_return_if_fail (priv->weekday_picker != NULL); @@ -976,10 +976,10 @@ make_weekly_special (RecurrencePage *rpage) /* Creates the subtree for the monthly recurrence number */ static void -make_recur_month_num_subtree (GtkTreeStore *store, GtkTreeIter *par, const char *title, int start, int end) +make_recur_month_num_subtree (GtkTreeStore *store, GtkTreeIter *par, const gchar *title, gint start, gint end) { GtkTreeIter iter, parent; - int i; + gint i; gtk_tree_store_append (store, &parent, par); gtk_tree_store_set (store, &parent, 0, _(title), 1, -1, -1); @@ -1004,9 +1004,9 @@ only_leaf_sensitive (GtkCellLayout *cell_layout, } static GtkWidget * -make_recur_month_num_combo (int month_index) +make_recur_month_num_combo (gint month_index) { - static const char *options[] = { + static const gchar *options[] = { /* TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]' * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or * the name of a week day (like 'Monday' or 'Friday') always follow. @@ -1035,7 +1035,7 @@ make_recur_month_num_combo (int month_index) N_("last") }; - int i; + gint i; GtkTreeStore *store; GtkTreeIter iter; GtkWidget *combo; @@ -1095,7 +1095,7 @@ make_recur_month_num_combo (int month_index) static GtkWidget * make_recur_month_combobox (void) { - static const char *options[] = { + static const gchar *options[] = { /* For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]' (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or the name of a week day (like 'Monday' or 'Friday') always follow. */ @@ -1110,7 +1110,7 @@ make_recur_month_combobox (void) }; GtkWidget *combo; - int i; + gint i; combo = gtk_combo_box_new_text (); @@ -1313,9 +1313,9 @@ make_recurrence_special (RecurrencePage *rpage) /* Counts the elements in the by_xxx fields of an icalrecurrencetype */ static int -count_by_xxx (short *field, int max_elements) +count_by_xxx (short *field, gint max_elements) { - int i; + gint i; for (i = 0; i < max_elements; i++) if (field[i] == ICAL_RECURRENCE_ARRAY_MAX) @@ -1540,11 +1540,11 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) CompEditorFlags flags; CompEditorPageDates dates; GSList *rrule_list; - int len; + gint len; struct icalrecurrencetype *r; - int n_by_second, n_by_minute, n_by_hour; - int n_by_day, n_by_month_day, n_by_year_day; - int n_by_week_no, n_by_month, n_by_set_pos; + gint n_by_second, n_by_minute, n_by_hour; + gint n_by_day, n_by_month_day, n_by_year_day; + gint n_by_week_no, n_by_month, n_by_set_pos; GtkAdjustment *adj; rpage = RECURRENCE_PAGE (page); @@ -1661,7 +1661,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) break; case ICAL_WEEKLY_RECURRENCE: { - int i; + gint i; guint8 day_mask; if (n_by_month_day != 0 @@ -1675,7 +1675,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) for (i = 0; i < 8 && r->by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) { enum icalrecurrencetype_weekday weekday; - int pos; + gint pos; weekday = icalrecurrencetype_day_day_of_week (r->by_day[i]); pos = icalrecurrencetype_day_position (r->by_day[i]); @@ -1735,7 +1735,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) goto custom; if (n_by_month_day == 1) { - int nth; + gint nth; if (n_by_set_pos != 0) goto custom; @@ -1759,7 +1759,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) } else if (n_by_day == 1) { enum icalrecurrencetype_weekday weekday; - int pos; + gint pos; enum month_day_options month_day; /* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not @@ -2064,7 +2064,7 @@ type_toggled_cb (GtkToggleButton *toggle, } static GtkWidget * -create_exception_dialog (RecurrencePage *rpage, const char *title, GtkWidget **date_edit) +create_exception_dialog (RecurrencePage *rpage, const gchar *title, GtkWidget **date_edit) { RecurrencePagePrivate *priv; GtkWidget *dialog, *toplevel; @@ -2332,7 +2332,7 @@ recurrence_page_construct (RecurrencePage *rpage) { RecurrencePagePrivate *priv = rpage->priv; CompEditor *editor; - char *gladefile; + gchar *gladefile; editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage)); diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c index 4baa22ab8a..c85ccbb4fe 100644 --- a/calendar/gui/dialogs/schedule-page.c +++ b/calendar/gui/dialogs/schedule-page.c @@ -387,7 +387,7 @@ schedule_page_construct (SchedulePage *spage, EMeetingStore *ems) { SchedulePagePrivate *priv = spage->priv; CompEditor *editor; - char *gladefile; + gchar *gladefile; editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (spage)); diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c index f73af156b0..462ed7d82a 100644 --- a/calendar/gui/dialogs/select-source-dialog.c +++ b/calendar/gui/dialogs/select-source-dialog.c @@ -40,7 +40,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type) GtkWidget *dialog; ESourceList *source_list; ESource *selected_source = NULL; - const char *gconf_key; + const gchar *gconf_key; GConfClient *conf_client; const gchar *icon_name = NULL; @@ -72,12 +72,12 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type) if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { selected_source = e_source_selector_dialog_peek_primary_selection (E_SOURCE_SELECTOR_DIALOG (dialog)); if (selected_source) { - char *absolute_uri; + gchar *absolute_uri; /* set the absolute URI on the source we keep around, since the group will be unrefed */ absolute_uri = e_source_build_absolute_uri (selected_source); - e_source_set_absolute_uri (selected_source, (const char *) absolute_uri); + e_source_set_absolute_uri (selected_source, (const gchar *) absolute_uri); g_object_ref (selected_source); g_free (absolute_uri); diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index 4eca089435..c11dadf853 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -45,7 +45,7 @@ have_nonprocedural_alarm (ECalComponent *comp) ECalComponentAlarm *alarm; ECalComponentAlarmAction action = E_CAL_COMPONENT_ALARM_UNKNOWN; - alarm = e_cal_component_get_alarm (comp, (const char *)l->data); + alarm = e_cal_component_get_alarm (comp, (const gchar *)l->data); if (alarm) { e_cal_component_alarm_get_action (alarm, &action); e_cal_component_alarm_free (alarm); @@ -76,7 +76,7 @@ gboolean send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gboolean new, gboolean *strip_alarms) { ECalComponentVType vtype; - const char *id; + const gchar *id; if (strip_alarms) *strip_alarms = TRUE; @@ -140,7 +140,7 @@ gboolean send_component_prompt_subject (GtkWindow *parent, ECal *client, ECalComponent *comp) { ECalComponentVType vtype; - const char *id; + const gchar *id; vtype = e_cal_component_get_vtype (comp); diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 7fb4679047..4cff39864a 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -65,7 +65,7 @@ struct _TaskDetailsPagePrivate { }; /* Note that these two arrays must match. */ -static const int status_map[] = { +static const gint status_map[] = { ICAL_STATUS_NONE, ICAL_STATUS_INPROCESS, ICAL_STATUS_COMPLETED, @@ -80,7 +80,7 @@ typedef enum { PRIORITY_UNDEFINED } TaskEditorPriority; -static const int priority_map[] = { +static const gint priority_map[] = { PRIORITY_HIGH, PRIORITY_NORMAL, PRIORITY_LOW, @@ -170,7 +170,7 @@ task_details_page_focus_main_widget (CompEditorPage *page) static TaskEditorPriority -priority_value_to_index (int priority_value) +priority_value_to_index (gint priority_value) { TaskEditorPriority retval; @@ -189,7 +189,7 @@ priority_value_to_index (int priority_value) static int priority_index_to_value (TaskEditorPriority priority) { - int retval; + gint retval; switch (priority) { case PRIORITY_UNDEFINED: @@ -255,10 +255,10 @@ task_details_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) { TaskDetailsPage *tdpage; TaskDetailsPagePrivate *priv; - int *priority_value, *percent = NULL; + gint *priority_value, *percent = NULL; TaskEditorPriority priority; icalproperty_status status; - const char *url; + const gchar *url; struct icaltimetype *completed = NULL; tdpage = TASK_DETAILS_PAGE (page); @@ -345,8 +345,8 @@ task_details_page_fill_component (CompEditorPage *page, ECalComponent *comp) struct icaltimetype icalcomplete, icaltoday; icalproperty_status status; TaskEditorPriority priority; - int priority_value, percent; - char *url; + gint priority_value, percent; + gchar *url; gboolean date_set; icaltimezone *zone = calendar_config_get_icaltimezone (); @@ -713,7 +713,7 @@ task_details_page_construct (TaskDetailsPage *tdpage) { TaskDetailsPagePrivate *priv = tdpage->priv; CompEditor *editor; - char *gladefile; + gchar *gladefile; editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (tdpage)); diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index fbab8b0581..c08ccfdb4d 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -391,7 +391,7 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp) if (attendees != NULL) { GSList *l; - int row; + gint row; task_page_hide_options (priv->task_page); task_page_set_assignment (priv->task_page, TRUE); diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index b088fb4ff1..412dcd5fa6 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -70,7 +70,7 @@ struct _TaskPagePrivate { EAccountList *accounts; GList *address_strings; EMeetingAttendee *ia; - char *user_add; + gchar *user_add; ECalComponent *comp; /* For meeting/event */ @@ -127,7 +127,7 @@ struct _TaskPagePrivate { ESendOptionsDialog *sod; }; -static const int classification_map[] = { +static const gint classification_map[] = { E_CAL_COMPONENT_CLASS_PUBLIC, E_CAL_COMPONENT_CLASS_PRIVATE, E_CAL_COMPONENT_CLASS_CONFIDENTIAL, @@ -143,8 +143,8 @@ static void task_page_focus_main_widget (CompEditorPage *page); static gboolean task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp); static gboolean task_page_fill_component (CompEditorPage *page, ECalComponent *comp); static gboolean task_page_fill_timezones (CompEditorPage *page, GHashTable *timezones); -static void task_page_select_organizer (TaskPage *tpage, const char *backend_address); -static void set_subscriber_info_string (TaskPage *tpage, const char *backend_address); +static void task_page_select_organizer (TaskPage *tpage, const gchar *backend_address); +static void set_subscriber_info_string (TaskPage *tpage, const gchar *backend_address); G_DEFINE_TYPE (TaskPage, task_page, TYPE_COMP_EDITOR_PAGE) @@ -414,7 +414,7 @@ get_current_account (TaskPage *page) { TaskPagePrivate *priv; EIterator *it; - const char *str; + const gchar *str; priv = page->priv; @@ -424,7 +424,7 @@ get_current_account (TaskPage *page) for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) { EAccount *a = (EAccount *)e_iterator_get(it); - char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); + gchar *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); if (!g_ascii_strcasecmp (full, str)) { g_free (full); @@ -454,7 +454,7 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) ECal *client; GSList *l; icalcomponent *icalcomp; - const char *categories, *uid; + const gchar *categories, *uid; icaltimezone *zone, *default_zone; gchar *backend_addr = NULL; @@ -687,7 +687,7 @@ static void set_attendees (ECalComponent *comp, const GPtrArray *attendees) { GSList *comp_attendees = NULL, *l; - int i; + gint i; for (i = 0; i < attendees->len; i++) { EMeetingAttendee *ia = g_ptr_array_index (attendees, i); @@ -719,7 +719,7 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp) CompEditorFlags flags; ECal *client; struct icaltimetype start_tt, due_tt; - char *cat, *str; + gchar *cat, *str; gboolean start_date_set, due_date_set, time_set; GtkTextBuffer *text_buffer; GtkTextIter text_iter_start, text_iter_end; @@ -908,7 +908,7 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp) if (flags & COMP_EDITOR_DELEGATE ) { GSList *attendee_list, *l; - int i; + gint i; const GPtrArray *attendees = e_meeting_store_get_attendees (priv->model); e_cal_component_get_attendee_list (priv->comp, &attendee_list); @@ -996,8 +996,8 @@ existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) for (l = attendees; l; l = l->next) { ECalComponentAttendee *attendee = l->data; - const char *address; - const char *sentby = NULL; + const gchar *address; + const gchar *sentby = NULL; address = itip_strip_mailto (attendee->value); if (attendee->sentby) @@ -1020,7 +1020,7 @@ remove_attendee (TaskPage *page, EMeetingAttendee *ia) TaskPagePrivate *priv = page->priv; CompEditor *editor; CompEditorFlags flags; - int pos = 0; + gint pos = 0; editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (page)); flags = comp_editor_get_flags (editor); @@ -1077,7 +1077,7 @@ remove_clicked_cb (GtkButton *btn, TaskPage *page) GtkTreePath *path = NULL; GtkTreeModel *model = NULL; gboolean valid_iter; - char *address; + gchar *address; priv = page->priv; @@ -1157,7 +1157,7 @@ attendee_added_cb (EMeetingListView *emlv, e_meeting_store_remove_attendee (priv->model, ia); else { if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY)) { - const char *delegator_id = e_meeting_attendee_get_delfrom (ia); + const gchar *delegator_id = e_meeting_attendee_get_delfrom (ia); EMeetingAttendee *delegator; delegator = e_meeting_store_find_attendee (priv->model, delegator_id, NULL); @@ -1176,7 +1176,7 @@ attendee_added_cb (EMeetingListView *emlv, /* Callbacks for list view*/ static void -popup_add_cb (EPopup *ep, EPopupItem *pitem, void *data) +popup_add_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { TaskPage *page = data; @@ -1184,7 +1184,7 @@ popup_add_cb (EPopup *ep, EPopupItem *pitem, void *data) } static void -popup_delete_cb (EPopup *ep, EPopupItem *pitem, void *data) +popup_delete_cb (EPopup *ep, EPopupItem *pitem, gpointer data) { TaskPage *page = data; @@ -1204,7 +1204,7 @@ static EPopupItem context_menu_items[] = { }; static void -context_popup_free(EPopup *ep, GSList *items, void *data) +context_popup_free(EPopup *ep, GSList *items, gpointer data) { g_slist_free(items); } @@ -1219,11 +1219,11 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, TaskPage *page) EMeetingAttendee *ia; GtkTreePath *path; GtkTreeIter iter; - char *address; + gchar *address; guint32 disable_mask = ~0; GSList *menus = NULL; ECalPopup *ep; - int i; + gint i; /* only process right-clicks */ if (event->button != 3 || event->type != GDK_BUTTON_PRESS) @@ -1601,7 +1601,7 @@ check_start_before_end (struct icaltimetype *start_tt, gboolean adjust_by_hour) { struct icaltimetype end_tt_copy; - int cmp; + gint cmp; /* Convert the end time to the same timezone as the start time. */ end_tt_copy = *end_tt; @@ -1793,7 +1793,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage) } static void -set_subscriber_info_string (TaskPage *tpage, const char *backend_address) +set_subscriber_info_string (TaskPage *tpage, const gchar *backend_address) { CompEditor *editor; ECal *client; @@ -1961,18 +1961,18 @@ init_widgets (TaskPage *tpage) static void -task_page_select_organizer (TaskPage *tpage, const char *backend_address) +task_page_select_organizer (TaskPage *tpage, const gchar *backend_address) { TaskPagePrivate *priv = tpage->priv; CompEditor *editor; GList *l; EAccount *def_account; gchar *def_address = NULL; - const char *default_address; + const gchar *default_address; gboolean subscribed_cal = FALSE; ESource *source = NULL; ECal *client; - const char *user_addr = NULL; + const gchar *user_addr = NULL; editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (tpage)); client = comp_editor_get_client (editor); @@ -1995,7 +1995,7 @@ task_page_select_organizer (TaskPage *tpage, const char *backend_address) if (user_addr) for (l = priv->address_strings; l != NULL; l = l->next) if (g_strrstr ((gchar *) l->data, user_addr) != NULL) { - default_address = (const char *) l->data; + default_address = (const gchar *) l->data; break; } @@ -2028,7 +2028,7 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client) TaskPagePrivate *priv; EIterator *it; EAccount *a; - char *gladefile; + gchar *gladefile; priv = tpage->priv; g_object_ref (model); diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c index d60fab913e..32e5b4214a 100644 --- a/calendar/gui/e-alarm-list.c +++ b/calendar/gui/e-alarm-list.c @@ -380,11 +380,11 @@ e_alarm_list_get_path (GtkTreeModel *tree_model, } /* Builds a string for the duration of the alarm. If the duration is zero, returns NULL. */ -static char * +static gchar * get_alarm_duration_string (struct icaldurationtype *duration) { GString *string = g_string_new (NULL); - char *ret; + gchar *ret; gboolean have_something; have_something = FALSE; @@ -429,12 +429,12 @@ get_alarm_duration_string (struct icaldurationtype *duration) } } -static char * +static gchar * get_alarm_string (ECalComponentAlarm *alarm) { ECalComponentAlarmAction action; ECalComponentAlarmTrigger trigger; - char *base, *str = NULL, *dur; + gchar *base, *str = NULL, *dur; e_cal_component_alarm_get_action (alarm, &action); e_cal_component_alarm_get_trigger (alarm, &trigger); @@ -516,7 +516,7 @@ get_alarm_string (ECalComponentAlarm *alarm) struct icaltimetype itt; icaltimezone *utc_zone, *current_zone; struct tm tm; - char buf[256]; + gchar buf[256]; /* Absolute triggers come in UTC, so convert them to the local timezone */ diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c index 18c47ebfcc..20190a8f80 100644 --- a/calendar/gui/e-cal-component-memo-preview.c +++ b/calendar/gui/e-cal-component-memo-preview.c @@ -52,17 +52,17 @@ G_DEFINE_TYPE (ECalComponentMemoPreview, e_cal_component_memo_preview, GTK_TYPE_ static void -on_link_clicked (GtkHTML *html, const char *url, gpointer data) +on_link_clicked (GtkHTML *html, const gchar *url, gpointer data) { /* FIXME Pass a parent window. */ e_show_uri (NULL, url); } static void -on_url_cb (GtkHTML *html, const char *url, gpointer data) +on_url_cb (GtkHTML *html, const gchar *url, gpointer data) { #if 0 - char *msg; + gchar *msg; ECalComponentMemoPreview *preview = data; if (url && *url) { @@ -75,13 +75,13 @@ on_url_cb (GtkHTML *html, const char *url, gpointer data) } /* Converts a time_t to a string, relative to the specified timezone */ -static char * +static gchar * timet_to_str_with_zone (ECalComponentDateTime *dt, ECal *ecal, icaltimezone *default_zone) { struct icaltimetype itt; icaltimezone *zone; struct tm tm; - char buf[256]; + gchar buf[256]; if (dt->tzid) { /* If we can't find the zone, we'll guess its "local" */ @@ -138,23 +138,23 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone gtk_html_stream_printf(stream, "

%s: ", _("Categories")); for (node = l; node != NULL; node = node->next) { - const char *icon_file; + const gchar *icon_file; - icon_file = e_categories_get_icon_file_for ((const char *) node->data); + icon_file = e_categories_get_icon_file_for ((const gchar *) node->data); if (icon_file && g_file_test(icon_file, G_FILE_TEST_EXISTS)) { gchar *icon_file_uri = g_filename_to_uri (icon_file, NULL, NULL); gtk_html_stream_printf (stream, "\"%s\"", - (const char *) node->data, icon_file_uri); + (const gchar *) node->data, icon_file_uri); g_free (icon_file_uri); one_added = TRUE; } else{ if(one_added == FALSE){ - g_string_append_printf (string, "%s", (const char *) node->data); + g_string_append_printf (string, "%s", (const gchar *) node->data); one_added = TRUE; } else{ - g_string_append_printf (string, ", %s", (const char *) node->data); + g_string_append_printf (string, ", %s", (const gchar *) node->data); } } } @@ -196,7 +196,7 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone gtk_html_stream_printf (stream, "

"); for (node = l; node != NULL; node = node->next) { - char *html; + gchar *html; text = * (ECalComponentText *) node->data; html = camel_text_to_html (text.value ? text.value : "", CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES | CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES, 0); @@ -213,7 +213,7 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone } /* URL */ - e_cal_component_get_url (comp, (const char **) &str); + e_cal_component_get_url (comp, (const gchar **) &str); if (str) { gtk_html_stream_printf (stream, "
%s%s
"); for (node = l; node != NULL; node = node->next) { - char *html; + gchar *html; text = * (ECalComponentText *) node->data; html = camel_text_to_html (text.value ? text.value : "", CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES | CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES, 0); @@ -306,7 +306,7 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone } /* URL */ - e_cal_component_get_url (comp, (const char **) &str); + e_cal_component_get_url (comp, (const gchar **) &str); if (str) { gtk_html_stream_printf (stream, "
%s%s
", @@ -865,7 +865,7 @@ efhd_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Came static void efhd_image(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormatHandler *handle) { - char *classid; + gchar *classid; struct _attach_puri *info; classid = g_strdup_printf("image%s", ((EMFormat *)efh)->part_id->str); @@ -919,19 +919,19 @@ static EMFormatHandler type_builtin_table[] = { static void efhd_builtin_init(EMFormatHTMLDisplayClass *efhc) { - int i; + gint i; for (i=0;ifind_handler (emf, mime_type); } -static void efhd_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeMessage *msg, EMFormat *src) +static void efhd_format_clone(EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, EMFormat *src) { if (emf != src) ((EMFormatHTML *) emf)->header_wrap_flags = 0; @@ -952,11 +952,11 @@ efhd_write_image(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri) static void efhd_message_prefix(EMFormat *emf, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info) { - const char *flag, *comp, *due; + const gchar *flag, *comp, *due; time_t date; - char due_date[128]; + gchar due_date[128]; struct tm due_tm; - char *iconpath; + gchar *iconpath; if (emf->folder == NULL || emf->uid == NULL || (flag = camel_folder_get_message_user_tag(emf->folder, emf->uid, "follow-up")) == NULL @@ -974,7 +974,7 @@ static void efhd_message_prefix(EMFormat *emf, CamelStream *stream, CamelMimePar iconpart = em_format_html_file_part((EMFormatHTML *)emf, "image/png", iconpath); g_free (iconpath); if (iconpart) { - char *classid; + gchar *classid; classid = g_strdup_printf("icon:///em-format-html-display/%s/%s", emf->part_id->str, comp&&comp[0]?"comp":"uncomp"); camel_stream_printf(stream, "", classid); @@ -1010,7 +1010,7 @@ static void efhd_message_prefix(EMFormat *emf, CamelStream *stream, CamelMimePar } /* TODO: if these aren't going to do anything should remove */ -static void efhd_format_error(EMFormat *emf, CamelStream *stream, const char *txt) +static void efhd_format_error(EMFormat *emf, CamelStream *stream, const gchar *txt) { ((EMFormatClass *)efhd_parent)->format_error(emf, stream, txt); } @@ -1039,7 +1039,7 @@ efhd_can_process_attachment (GtkWidget *button) /* if it hasn't been processed yet, format the attachment */ static void -efhd_attachment_show(EPopup *ep, EPopupItem *item, void *data) +efhd_attachment_show(EPopup *ep, EPopupItem *item, gpointer data) { struct _attach_puri *info = data; @@ -1061,7 +1061,7 @@ efhd_attachment_button_expanded (GtkWidget *widget, } static void -efhd_image_fit(EPopup *ep, EPopupItem *item, void *data) +efhd_image_fit(EPopup *ep, EPopupItem *item, gpointer data) { struct _attach_puri *info = data; @@ -1070,7 +1070,7 @@ efhd_image_fit(EPopup *ep, EPopupItem *item, void *data) } static void -efhd_image_unfit(EPopup *ep, EPopupItem *item, void *data) +efhd_image_unfit(EPopup *ep, EPopupItem *item, gpointer data) { struct _attach_puri *info = data; @@ -1087,13 +1087,13 @@ static EPopupItem efhd_menu_items[] = { }; static void -efhd_menu_items_free(EPopup *ep, GSList *items, void *data) +efhd_menu_items_free(EPopup *ep, GSList *items, gpointer data) { g_slist_free(items); } static void -efhd_popup_place_widget(GtkMenu *menu, int *x, int *y, gboolean *push_in, gpointer user_data) +efhd_popup_place_widget(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer user_data) { GtkWidget *w = user_data; @@ -1178,7 +1178,7 @@ static void efhd_drag_data_get(GtkWidget *w, GdkDragContext *drag, GtkSelectionData *data, guint info, guint time, EMFormatHTMLPObject *pobject) { CamelMimePart *part = pobject->part; - char *uri, *uri_crlf, *path; + gchar *uri, *uri_crlf, *path; CamelStream *stream; switch (info) { @@ -1204,7 +1204,7 @@ efhd_drag_data_get(GtkWidget *w, GdkDragContext *drag, GtkSelectionData *data, g /* Kludge around Nautilus requesting the same data many times */ uri = g_object_get_data((GObject *)w, "e-drag-uri"); if (uri) { - gtk_selection_data_set(data, data->target, 8, (unsigned char *)uri, strlen(uri)); + gtk_selection_data_set(data, data->target, 8, (guchar *)uri, strlen(uri)); return; } @@ -1216,7 +1216,7 @@ efhd_drag_data_get(GtkWidget *w, GdkDragContext *drag, GtkSelectionData *data, g g_free(path); uri_crlf = g_strconcat(uri, "\r\n", NULL); g_free(uri); - gtk_selection_data_set(data, data->target, 8, (unsigned char *)uri_crlf, strlen(uri_crlf)); + gtk_selection_data_set(data, data->target, 8, (guchar *)uri_crlf, strlen(uri_crlf)); g_object_set_data_full((GObject *)w, "e-drag-uri", uri_crlf, g_free); break; default: @@ -1227,7 +1227,7 @@ efhd_drag_data_get(GtkWidget *w, GdkDragContext *drag, GtkSelectionData *data, g static void efhd_drag_data_delete(GtkWidget *w, GdkDragContext *drag, EMFormatHTMLPObject *pobject) { - char *uri; + gchar *uri; uri = g_object_get_data((GObject *)w, "e-drag-uri"); if (uri) { @@ -1236,7 +1236,7 @@ efhd_drag_data_delete(GtkWidget *w, GdkDragContext *drag, EMFormatHTMLPObject *p /* NB even more: doesn't the e-drag-uri have \r\n * appended? (see efhd_drag_data_get()) */ - char *filename = g_filename_from_uri (uri, NULL, NULL); + gchar *filename = g_filename_from_uri (uri, NULL, NULL); g_unlink(filename); g_free(filename); g_object_set_data((GObject *)w, "e-drag-uri", NULL); @@ -1244,7 +1244,7 @@ efhd_drag_data_delete(GtkWidget *w, GdkDragContext *drag, EMFormatHTMLPObject *p } static void -efhd_write_icon_job(struct _EMFormatHTMLJob *job, int cancelled) +efhd_write_icon_job(struct _EMFormatHTMLJob *job, gint cancelled) { EMFormatHTMLPObject *pobject; CamelDataWrapper *dw; @@ -1262,7 +1262,7 @@ static void efhd_image_resized(GtkWidget *w, GtkAllocation *event, struct _attach_puri *info) { GdkPixbuf *pb; - int width; + gint width; if (info->fit_width == 0) return; @@ -1294,7 +1294,7 @@ efhd_change_cursor(GtkWidget *w, GdkEventCrossing *event, struct _attach_puri *i static void efhd_image_fit_width(GtkWidget *widget, GdkEventButton *event, struct _attach_puri *info) { - int width; + gint width; width = ((GtkWidget *)((EMFormatHTML *)info->puri.format)->html)->allocation.width - 12; @@ -1345,7 +1345,7 @@ efhd_attachment_image(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObjec { NULL, 0, 0 }, { (gchar *) "text/uri-list", 0, 1 }, }; - char *simple_type; + gchar *simple_type; info = (struct _attach_puri *)em_format_find_puri((EMFormat *)efh, pobject->classid); @@ -1509,7 +1509,7 @@ efhd_message_add_bar (EMFormat *emf, CamelMimePart *part, const EMFormatHandler *info) { - const char *classid = "attachment-bar"; + const gchar *classid = "attachment-bar"; em_format_html_add_pobject ( (EMFormatHTML *) emf, @@ -1521,9 +1521,9 @@ efhd_message_add_bar (EMFormat *emf, } static void -efhd_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const char *mime_type, const EMFormatHandler *handle) +efhd_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const gchar *mime_type, const EMFormatHandler *handle) { - char *classid, *text, *html; + gchar *classid, *text, *html; struct _attach_puri *info; classid = g_strdup_printf ("attachment%s", emf->part_id->str); @@ -1666,7 +1666,7 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE); gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE); buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW (view)); - gtk_text_buffer_set_text (buffer, (char *)info->mstream->buffer->data, info->mstream->buffer->len); + gtk_text_buffer_set_text (buffer, (gchar *)info->mstream->buffer->data, info->mstream->buffer->len); camel_object_unref(info->mstream); info->mstream = NULL; gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), @@ -1693,7 +1693,7 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb static void efhd_format_optional(EMFormat *emf, CamelStream *fstream, CamelMimePart *part, CamelStream *mstream) { - char *classid, *html; + gchar *classid, *html; struct _attach_puri *info; CamelStream *stream; diff --git a/mail/em-format-html-display.h b/mail/em-format-html-display.h index bd0ea0edd3..16bafc30fb 100644 --- a/mail/em-format-html-display.h +++ b/mail/em-format-html-display.h @@ -59,9 +59,9 @@ struct _EMFormatHTMLDisplay { struct _ESearchingTokenizer *search_tok; - unsigned int animate:1; - unsigned int caret_mode:1; - unsigned int nobar:1; + guint animate:1; + guint caret_mode:1; + guint nobar:1; }; #define EM_FORMAT_HTML_DISPLAY_SEARCH_PRIMARY (0) @@ -72,11 +72,11 @@ struct _EMFormatHTMLDisplayClass { EMFormatHTMLClass formathtml_class; /* a link clicked normally */ - void (*link_clicked)(EMFormatHTMLDisplay *efhd, const char *uri); + void (*link_clicked)(EMFormatHTMLDisplay *efhd, const gchar *uri); /* a part or a link button pressed event */ - int (*popup_event)(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const char *uri, struct _CamelMimePart *part); + gint (*popup_event)(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const gchar *uri, struct _CamelMimePart *part); /* the mouse is over a link */ - void (*on_url)(EMFormatHTMLDisplay *efhd, const char *uri); + void (*on_url)(EMFormatHTMLDisplay *efhd, const gchar *uri); }; GType em_format_html_display_get_type (void); @@ -85,7 +85,7 @@ EMFormatHTMLDisplay * void em_format_html_display_goto_anchor (EMFormatHTMLDisplay *efhd, - const char *name); + const gchar *name); void em_format_html_display_set_animate (EMFormatHTMLDisplay *efhd, @@ -96,12 +96,12 @@ void em_format_html_display_set_caret_mode void em_format_html_display_set_search (EMFormatHTMLDisplay *efhd, - int type, + gint type, GSList *strings); void em_format_html_display_search (EMFormatHTMLDisplay *efhd); void em_format_html_display_search_with (EMFormatHTMLDisplay *efhd, - char *word); + gchar *word); void em_format_html_display_search_close (EMFormatHTMLDisplay *efhd); diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index ef1bbb13c4..c5c99bcab1 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -200,7 +200,7 @@ emfhp_complete (EMFormatHTMLPrint *efhp) } static void -emfhp_got_message (CamelFolder *folder, const char *uid, +emfhp_got_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data) { EMFormatHTMLPrint *efhp = data; @@ -224,7 +224,7 @@ emfhp_got_message (CamelFolder *folder, const char *uid, void em_format_html_print_message (EMFormatHTMLPrint *efhp, CamelFolder *folder, - const char *uid) + const gchar *uid) { g_object_ref (efhp); diff --git a/mail/em-format-html.c b/mail/em-format-html.c index aa82851bc9..c7d35a3423 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -90,12 +90,12 @@ struct _EMFormatHTMLCache { CamelMultipart *textmp; - char partid[1]; + gchar partid[1]; }; struct _EMFormatHTMLPrivate { struct _CamelMimeMessage *last_part; /* not reffed, DO NOT dereference */ - volatile int format_id; /* format thread id */ + volatile gint format_id; /* format thread id */ guint format_timeout_id; struct _format_msg *format_timeout_msg; @@ -106,16 +106,16 @@ struct _EMFormatHTMLPrivate { GMutex *lock; }; -static void efh_url_requested(GtkHTML *html, const char *url, GtkHTMLStream *handle, EMFormatHTML *efh); +static void efh_url_requested(GtkHTML *html, const gchar *url, GtkHTMLStream *handle, EMFormatHTML *efh); static gboolean efh_object_requested(GtkHTML *html, GtkHTMLEmbedded *eb, EMFormatHTML *efh); static void efh_gtkhtml_destroy(GtkHTML *html, EMFormatHTML *efh); static void efh_format_message(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info); -static void efh_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeMessage *msg, EMFormat *emfsource); -static void efh_format_error(EMFormat *emf, CamelStream *stream, const char *txt); +static void efh_format_clone(EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, EMFormat *emfsource); +static void efh_format_error(EMFormat *emf, CamelStream *stream, const gchar *txt); static void efh_format_source(EMFormat *, CamelStream *, CamelMimePart *); -static void efh_format_attachment(EMFormat *, CamelStream *, CamelMimePart *, const char *, const EMFormatHandler *); +static void efh_format_attachment(EMFormat *, CamelStream *, CamelMimePart *, const gchar *, const EMFormatHandler *); static void efh_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, CamelCipherValidity *valid); static gboolean efh_busy(EMFormat *); @@ -196,7 +196,7 @@ efh_gtkhtml_destroy(GtkHTML *html, EMFormatHTML *efh) } static struct _EMFormatHTMLCache * -efh_insert_cache(EMFormatHTML *efh, const char *partid) +efh_insert_cache(EMFormatHTML *efh, const gchar *partid) { struct _EMFormatHTMLCache *efhc; @@ -259,8 +259,8 @@ em_format_html_get_type(void) sizeof(EMFormatHTML), 0, (GInstanceInitFunc)efh_init }; - const char *base_directory = e_get_user_data_dir (); - char *path; + const gchar *base_directory = e_get_user_data_dir (); + gchar *path; /* Trigger creation of mail component. */ mail_component_peek (); @@ -303,7 +303,7 @@ void em_format_html_load_http(EMFormatHTML *emfh) } void -em_format_html_set_load_http(EMFormatHTML *emfh, int style) +em_format_html_set_load_http(EMFormatHTML *emfh, gint style) { if (emfh->load_http != style) { emfh->load_http = style; @@ -312,7 +312,7 @@ em_format_html_set_load_http(EMFormatHTML *emfh, int style) } void -em_format_html_set_mark_citations(EMFormatHTML *emfh, int state, guint32 citation_colour) +em_format_html_set_mark_citations(EMFormatHTML *emfh, gint state, guint32 citation_colour) { if (emfh->mark_citations ^ state || emfh->citation_colour != citation_colour) { emfh->mark_citations = state; @@ -328,12 +328,12 @@ em_format_html_set_mark_citations(EMFormatHTML *emfh, int state, guint32 citatio } CamelMimePart * -em_format_html_file_part(EMFormatHTML *efh, const char *mime_type, const char *filename) +em_format_html_file_part(EMFormatHTML *efh, const gchar *mime_type, const gchar *filename) { CamelMimePart *part; CamelStream *stream; CamelDataWrapper *dw; - char *basename; + gchar *basename; stream = camel_stream_fs_new_with_name(filename, O_RDONLY, 0); if (stream == NULL) @@ -358,7 +358,7 @@ em_format_html_file_part(EMFormatHTML *efh, const char *mime_type, const char *f /* all this api is a pain in the bum ... */ EMFormatHTMLPObject * -em_format_html_add_pobject(EMFormatHTML *efh, size_t size, const char *classid, CamelMimePart *part, EMFormatHTMLPObjectFunc func) +em_format_html_add_pobject(EMFormatHTML *efh, size_t size, const gchar *classid, CamelMimePart *part, EMFormatHTMLPObjectFunc func) { EMFormatHTMLPObject *pobj; @@ -383,7 +383,7 @@ em_format_html_add_pobject(EMFormatHTML *efh, size_t size, const char *classid, } EMFormatHTMLPObject * -em_format_html_find_pobject(EMFormatHTML *emf, const char *classid) +em_format_html_find_pobject(EMFormatHTML *emf, const gchar *classid) { EMFormatHTMLPObject *pw; @@ -431,7 +431,7 @@ em_format_html_clear_pobject(EMFormatHTML *emf) } struct _EMFormatHTMLJob * -em_format_html_job_new(EMFormatHTML *emfh, void (*callback)(struct _EMFormatHTMLJob *job, int cancelled), void *data) +em_format_html_job_new(EMFormatHTML *emfh, void (*callback)(struct _EMFormatHTMLJob *job, gint cancelled), gpointer data) { struct _EMFormatHTMLJob *job = g_malloc0(sizeof(*job)); @@ -455,22 +455,22 @@ em_format_html_job_queue(EMFormatHTML *emfh, struct _EMFormatHTMLJob *job) /* ********************************************************************** */ -static void emfh_getpuri(struct _EMFormatHTMLJob *job, int cancelled) +static void emfh_getpuri(struct _EMFormatHTMLJob *job, gint cancelled) { d(printf(" running getpuri task\n")); if (!cancelled) job->u.puri->func((EMFormat *)job->format, job->stream, job->u.puri); } -static void emfh_gethttp(struct _EMFormatHTMLJob *job, int cancelled) +static void emfh_gethttp(struct _EMFormatHTMLJob *job, gint cancelled) { CamelStream *cistream = NULL, *costream = NULL, *instream = NULL; CamelURL *url; CamelContentType *content_type; CamelHttpStream *tmp_stream; ssize_t n, total = 0, pc_complete = 0, nread = 0; - char buffer[1500]; - const char *length; + gchar buffer[1500]; + const gchar *length; if (cancelled || (url = camel_url_new(job->u.uri, NULL)) == NULL) @@ -482,7 +482,7 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, int cancelled) instream = cistream = camel_data_cache_get(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL); if (instream == NULL) { - char *proxy; + gchar *proxy; if (!(job->format->load_http_now @@ -567,7 +567,7 @@ badurl: /* ********************************************************************** */ static void -efh_url_requested(GtkHTML *html, const char *url, GtkHTMLStream *handle, EMFormatHTML *efh) +efh_url_requested(GtkHTML *html, const gchar *url, GtkHTMLStream *handle, EMFormatHTML *efh) { EMFormatPURI *puri; struct _EMFormatHTMLJob *job = NULL; @@ -601,7 +601,7 @@ efh_url_requested(GtkHTML *html, const char *url, GtkHTMLStream *handle, EMForma d(printf(" adding job, get %s\n", url)); job = em_format_html_job_new(efh, emfh_gethttp, g_strdup(url)); } else if (g_ascii_strncasecmp(url, "/", 1) == 0) { - char *data = NULL; + gchar *data = NULL; gsize length = 0; gboolean status; @@ -626,7 +626,7 @@ static gboolean efh_object_requested(GtkHTML *html, GtkHTMLEmbedded *eb, EMFormatHTML *efh) { EMFormatHTMLPObject *pobject; - int res = FALSE; + gint res = FALSE; if (eb->classid == NULL) return FALSE; @@ -650,7 +650,7 @@ efh_object_requested(GtkHTML *html, GtkHTMLEmbedded *eb, EMFormatHTML *efh) /* FIXME: This is duplicated in em-format-html-display, should be exported or in security module */ static const struct { - const char *icon, *shortdesc; + const gchar *icon, *shortdesc; } smime_sign_table[5] = { { "stock_signature-bad", N_("Unsigned") }, { "stock_signature-ok", N_("Valid signature") }, @@ -660,7 +660,7 @@ static const struct { }; static const struct { - const char *icon, *shortdesc; + const gchar *icon, *shortdesc; } smime_encrypt_table[4] = { { "stock_lock-broken", N_("Unencrypted") }, { "stock_lock", N_("Encrypted, weak"),}, @@ -668,7 +668,7 @@ static const struct { { "stock_lock-ok", N_("Encrypted, strong") }, }; -static const char *smime_sign_colour[4] = { +static const gchar *smime_sign_colour[4] = { "", " bgcolor=\"#88bb88\"", " bgcolor=\"#bb8888\"", " bgcolor=\"#e8d122\"" }; @@ -686,8 +686,8 @@ efh_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel if (emf->valid == valid && (valid->encrypt.status != CAMEL_CIPHER_VALIDITY_ENCRYPT_NONE || valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE)) { - char *classid, *iconpath; - const char *icon; + gchar *classid, *iconpath; + const gchar *icon; CamelMimePart *iconpart; camel_stream_printf (stream, "
", @@ -729,9 +729,9 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo CamelMultipart *mp; CamelDataWrapper *dw; CamelContentType *type; - const char *format; + const gchar *format; guint32 flags; - int i, count, len; + gint i, count, len; struct _EMFormatHTMLCache *efhc; flags = efh->text_html_flags; @@ -859,7 +859,7 @@ efh_write_text_html(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri) { #if d(!)0 CamelStream *out; - int fd; + gint fd; CamelDataWrapper *dw; fd = dup(STDOUT_FILENO); @@ -876,10 +876,10 @@ efh_write_text_html(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri) static void efh_text_html(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info) { - const char *location; + const gchar *location; /* This is set but never used for anything */ EMFormatPURI *puri; - char *cid = NULL; + gchar *cid = NULL; camel_stream_printf (stream, "
\n" @@ -923,8 +923,8 @@ static void efh_message_external(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info) { CamelContentType *type; - const char *access_type; - char *url = NULL, *desc = NULL; + const gchar *access_type; + gchar *url = NULL, *desc = NULL; if (!part) { camel_stream_printf(stream, _("Unknown external-body part.")); @@ -941,9 +941,9 @@ efh_message_external(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part if (!g_ascii_strcasecmp(access_type, "ftp") || !g_ascii_strcasecmp(access_type, "anon-ftp")) { - const char *name, *site, *dir, *mode; - char *path; - char ftype[16]; + const gchar *name, *site, *dir, *mode; + gchar *path; + gchar ftype[16]; name = camel_content_type_param (type, "name"); site = camel_content_type_param (type, "site"); @@ -967,7 +967,7 @@ efh_message_external(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part g_free (path); desc = g_strdup_printf (_("Pointer to FTP site (%s)"), url); } else if (!g_ascii_strcasecmp (access_type, "local-file")) { - const char *name, *site; + const gchar *name, *site; name = camel_content_type_param (type, "name"); site = camel_content_type_param (type, "site"); @@ -980,8 +980,8 @@ efh_message_external(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part else desc = g_strdup_printf(_("Pointer to local file (%s)"), name); } else if (!g_ascii_strcasecmp (access_type, "URL")) { - const char *urlparam; - char *s, *d; + const gchar *urlparam; + gchar *s, *d; /* RFC 2017 */ @@ -1046,11 +1046,11 @@ emfh_write_related(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri) } static void -emfh_multipart_related_check(struct _EMFormatHTMLJob *job, int cancelled) +emfh_multipart_related_check(struct _EMFormatHTMLJob *job, gint cancelled) { struct _EMFormatPURITree *ptree; EMFormatPURI *puri, *purin; - char *oldpartid; + gchar *oldpartid; if (cancelled) return; @@ -1085,8 +1085,8 @@ efh_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)part); CamelMimePart *body_part, *display_part = NULL; CamelContentType *content_type; - const char *start; - int i, nparts, partidlen, displayid = 0; + const gchar *start; + gint i, nparts, partidlen, displayid = 0; /* puri is set but never used */ EMFormatPURI *puri; struct _EMFormatHTMLJob *job; @@ -1100,8 +1100,8 @@ efh_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c content_type = camel_mime_part_get_content_type(part); start = camel_content_type_param (content_type, "start"); if (start && strlen(start)>2) { - int len; - const char *cid; + gint len; + const gchar *cid; /* strip <>'s */ len = strlen (start) - 2; @@ -1215,7 +1215,7 @@ static EMFormatHandler type_builtin_table[] = { static void efh_builtin_init(EMFormatHTMLClass *efhc) { - int i; + gint i; for (i=0;iformat->html == NULL) @@ -1440,7 +1440,7 @@ efh_format_timeout(struct _format_msg *m) return FALSE; } -static void efh_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeMessage *msg, EMFormat *emfsource) +static void efh_format_clone(EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, EMFormat *emfsource) { EMFormatHTML *efh = (EMFormatHTML *)emf; struct _format_msg *m; @@ -1485,9 +1485,9 @@ static void efh_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid } } -static void efh_format_error(EMFormat *emf, CamelStream *stream, const char *txt) +static void efh_format_error(EMFormat *emf, CamelStream *stream, const gchar *txt) { - char *html; + gchar *html; html = camel_text_to_html (txt, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL|CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0); camel_stream_printf(stream, "%s
", html); @@ -1495,10 +1495,10 @@ static void efh_format_error(EMFormat *emf, CamelStream *stream, const char *txt } static void -efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *label, const char *value, guint32 flags) +efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const gchar *label, const gchar *value, guint32 flags) { - const char *fmt, *html; - char *mhtml = NULL; + const gchar *fmt, *html; + gchar *mhtml = NULL; gboolean is_rtl; if (value == NULL) @@ -1557,11 +1557,11 @@ static gchar * efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_address *a, gchar *field) { guint32 flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES; - char *name, *mailto, *addr; - int i=0; + gchar *name, *mailto, *addr; + gint i=0; gboolean wrap = FALSE; - char *str = NULL; - int limit = mail_config_get_address_count (); + gchar *str = NULL; + gint limit = mail_config_get_address_count (); if (field ) { if ((!strcmp (field, _("To")) && !(efh->header_wrap_flags & EM_FORMAT_HTML_HEADER_TO)) @@ -1579,11 +1579,11 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres switch (a->type) { case CAMEL_HEADER_ADDRESS_NAME: if (name && *name) { - char *real, *mailaddr; + gchar *real, *mailaddr; g_string_append_printf (out, "%s <", name); /* rfc2368 for mailto syntax and url encoding extras */ - if ((real = camel_header_encode_phrase ((unsigned char *)a->name))) { + if ((real = camel_header_encode_phrase ((guchar *)a->name))) { mailaddr = g_strdup_printf("%s <%s>", real, a->v.addr); g_free (real); mailto = camel_url_encode (mailaddr, "?=&()"); @@ -1664,9 +1664,9 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres } static void -canon_header_name (char *name) +canon_header_name (gchar *name) { - char *inptr = name; + gchar *inptr = name; /* canonicalise the header name... first letter is * capitalised and any letter following a '-' also gets @@ -1688,14 +1688,14 @@ canon_header_name (char *name) } static void -efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct _camel_header_raw *header, guint32 flags, const char *charset) +efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct _camel_header_raw *header, guint32 flags, const gchar *charset) { EMFormatHTML *efh = (EMFormatHTML *)emf; - char *name, *buf, *value = NULL; - const char *label, *txt; + gchar *name, *buf, *value = NULL; + const gchar *label, *txt; gboolean addrspec = FALSE; - char *str_field = NULL; - int i; + gchar *str_field = NULL; + gint i; name = alloca(strlen(header->name)+1); strcpy(name, header->name); @@ -1713,7 +1713,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct if (addrspec) { struct _camel_header_address *addrs; GString *html; - char *img; + gchar *img; buf = camel_header_unfold (header->value); if (!(addrs = camel_header_address_decode (buf, emf->charset ? emf->charset : emf->default_charset))) { @@ -1724,7 +1724,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct g_free (buf); html = g_string_new(""); - img = efh_format_address(efh, html, addrs, (char *)label); + img = efh_format_address(efh, html, addrs, (gchar *)label); if (img) { str_field = g_strdup_printf ("%s%s:", img, label); @@ -1750,7 +1750,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct txt = value = camel_header_format_ctext (header->value, charset); flags |= EM_FORMAT_HEADER_BOLD; } else if (!strcmp (name, "Date") || !strcmp (name, "Resent-Date")) { - int msg_offset, local_tz; + gint msg_offset, local_tz; time_t msg_date; struct tm local; @@ -1768,17 +1768,17 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct msg_offset -= local_tz / 60; if (msg_offset) { - char buf[256], *html; + gchar buf[256], *html; msg_offset += (local.tm_hour * 60) + local.tm_min; if (msg_offset >= (24 * 60) || msg_offset < 0) { /* translators: strftime format for local time equivalent in Date header display, with day */ - char *msg = g_strdup_printf("%s", _(" (%a, %R %Z)")); + gchar *msg = g_strdup_printf("%s", _(" (%a, %R %Z)")); e_utf8_strftime(buf, sizeof(buf), msg, &local); g_free(msg); } else { /* translators: strftime format for local time equivalent in Date header display, without day */ - char *msg = g_strdup_printf("%s", _(" (%R %Z)")); + gchar *msg = g_strdup_printf("%s", _(" (%R %Z)")); e_utf8_strftime(buf, sizeof(buf), msg, &local); g_free(msg); } @@ -1838,18 +1838,18 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) { EMFormat *emf = (EMFormat *) efh; EMFormatHeader *h; - const char *charset; + const gchar *charset; CamelContentType *ct; struct _camel_header_raw *header; gboolean have_icon = FALSE; - const char *photo_name = NULL; + const gchar *photo_name = NULL; CamelInternetAddress *cia = NULL; gboolean face_decoded = FALSE, contact_has_photo = FALSE; guchar *face_header_value = NULL; gsize face_header_len = 0; - char *header_sender = NULL, *header_from = NULL, *name; + gchar *header_sender = NULL, *header_from = NULL, *name; gboolean mail_from_delegate = FALSE; - const char *hdr_charset; + const gchar *hdr_charset; if (!part) return; @@ -1935,9 +1935,9 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) header = header->next; } } else { - int mailer_shown = FALSE; + gint mailer_shown = FALSE; while (h->next) { - int mailer, face; + gint mailer, face; header = ((CamelMimePart *)part)->headers; mailer = !g_ascii_strcasecmp (h->name, "X-Evolution-Mailer"); @@ -1975,7 +1975,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) if (strstr(use_header->value, "Evolution")) have_icon = TRUE; } else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) { - char *cp = header->value; + gchar *cp = header->value; /* Skip over spaces */ while (*cp == ' ') @@ -2000,11 +2000,11 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) camel_stream_printf(stream, "
\n"); @@ -475,7 +475,7 @@ emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, E CamelMimeFilter *html_filter; CamelMimeFilter *sig_strip; CamelContentType *type; - const char *format; + const gchar *format; guint32 rgb = 0x737373, flags; if (!part) @@ -565,7 +565,7 @@ static EMFormatHandler type_builtin_table[] = { static void emfq_builtin_init(EMFormatQuoteClass *efhc) { - int i; + gint i; for (i=0;ipart_id->str)); @@ -479,7 +479,7 @@ em_format_pull_level(EMFormat *emf) * Return value: **/ EMFormatPURI * -em_format_find_visible_puri(EMFormat *emf, const char *uri) +em_format_find_visible_puri(EMFormat *emf, const gchar *uri) { EMFormatPURI *pw; struct _EMFormatPURITree *ptree; @@ -513,7 +513,7 @@ em_format_find_visible_puri(EMFormat *emf, const char *uri) **/ EMFormatPURI * -em_format_find_puri(EMFormat *emf, const char *uri) +em_format_find_puri(EMFormat *emf, const gchar *uri) { return g_hash_table_lookup(emf->pending_uri_table, uri); } @@ -582,12 +582,12 @@ em_format_clear_puri_tree(EMFormat *emf) /* use mime_type == NULL to force showing as application/octet-stream */ void -em_format_part_as(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const char *mime_type) +em_format_part_as(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const gchar *mime_type) { const EMFormatHandler *handle = NULL; - const char *snoop_save = emf->snoop_mime_type, *tmp; + const gchar *snoop_save = emf->snoop_mime_type, *tmp; CamelURL *base_save = emf->base, *base = NULL; - char *basestr = NULL; + gchar *basestr = NULL; d(printf("format_part_as()\n")); @@ -645,7 +645,7 @@ finish: void em_format_part(EMFormat *emf, CamelStream *stream, CamelMimePart *part) { - char *mime_type; + gchar *mime_type; CamelDataWrapper *dw; dw = camel_medium_get_content_object((CamelMedium *)part); @@ -659,7 +659,7 @@ em_format_part(EMFormat *emf, CamelStream *stream, CamelMimePart *part) } static void -emf_clone_inlines(void *key, void *val, void *data) +emf_clone_inlines(gpointer key, gpointer val, gpointer data) { struct _EMFormatCache *emfc = val, *new; @@ -672,7 +672,7 @@ emf_clone_inlines(void *key, void *val, void *data) } static void -emf_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeMessage *msg, EMFormat *emfsource) +emf_format_clone(EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, EMFormat *emfsource) { em_format_clear_puri_tree(emf); @@ -729,7 +729,7 @@ static void emf_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, CamelCipherValidity *valid) { CamelCipherValidity *save = emf->valid_parent; - int len; + gint len; /* Note that this also requires support from higher up in the class chain - validity needs to be cleared when you start output @@ -861,7 +861,7 @@ em_format_set_mode(EMFormat *emf, em_format_mode_t type) * required. **/ void -em_format_set_charset(EMFormat *emf, const char *charset) +em_format_set_charset(EMFormat *emf, const gchar *charset) { if ((emf->charset && charset && g_ascii_strcasecmp(emf->charset, charset) == 0) || (emf->charset == NULL && charset == NULL) @@ -885,7 +885,7 @@ em_format_set_charset(EMFormat *emf, const char *charset) * when it isn't). **/ void -em_format_set_default_charset(EMFormat *emf, const char *charset) +em_format_set_default_charset(EMFormat *emf, const gchar *charset) { if ((emf->default_charset && charset && g_ascii_strcasecmp(emf->default_charset, charset) == 0) || (emf->default_charset == NULL && charset == NULL) @@ -917,7 +917,7 @@ em_format_clear_headers(EMFormat *emf) /* note: also copied in em-mailer-prefs.c */ static const struct { - const char *name; + const gchar *name; guint32 flags; } default_headers[] = { { N_("From"), EM_FORMAT_HEADER_BOLD }, @@ -942,7 +942,7 @@ static const struct { void em_format_default_headers(EMFormat *emf) { - int i; + gint i; em_format_clear_headers(emf); for (i=0; ipart_id->len; + gint len = emf->part_id->len; g_string_append_printf(emf->part_id, ".alternative.%d", bestid); em_format_part(emf, stream, best); @@ -1358,7 +1358,7 @@ emf_multipart_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *part, { CamelCipherContext *context; CamelException *ex; - const char *protocol; + const gchar *protocol; CamelMimePart *opart; CamelCipherValidity *valid; CamelMultipartEncrypted *mpe; @@ -1425,9 +1425,9 @@ emf_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)part); CamelMimePart *body_part, *display_part = NULL; CamelContentType *content_type; - const char *start; - int i, nparts, partidlen, displayid = 0; - char *oldpartid; + const gchar *start; + gint i, nparts, partidlen, displayid = 0; + gchar *oldpartid; struct _EMFormatPURITree *ptree; EMFormatPURI *puri, *purin; @@ -1441,8 +1441,8 @@ emf_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c content_type = camel_mime_part_get_content_type(part); start = camel_content_type_param (content_type, "start"); if (start && strlen(start)>2) { - int len; - const char *cid; + gint len; + const gchar *cid; /* strip <>'s */ len = strlen (start) - 2; @@ -1581,7 +1581,7 @@ emf_message_rfc822(EMFormat *emf, CamelStream *stream, CamelMimePart *part, cons { CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)part); const EMFormatHandler *handle; - int len; + gint len; if (!CAMEL_IS_MIME_MESSAGE(dw)) { em_format_format_source(emf, stream, part); @@ -1616,7 +1616,7 @@ emf_inlinepgp_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart, E CamelMimePart *opart; CamelStream *ostream; CamelException *ex; - char *type; + gchar *type; if (!ipart) { em_format_format_error(emf, stream, _("Unknown error verifying signature")); @@ -1694,7 +1694,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart CamelException *ex; CamelMimePart *opart; CamelDataWrapper *dw; - char *mime_type; + gchar *mime_type; cipher = camel_gpg_context_new(emf->session); ex = camel_exception_new(); @@ -1718,7 +1718,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart /* this ensures to show the 'opart' as inlined, if possible */ if (mime_type && g_ascii_strcasecmp (mime_type, "application/octet-stream") == 0) { - const char *snoop = em_utils_snoop_type (opart); + const gchar *snoop = em_utils_snoop_type (opart); if (snoop) camel_data_wrapper_set_mime_type (dw, snoop); @@ -1764,7 +1764,7 @@ static EMFormatHandler type_builtin_table[] = { static void emf_builtin_init(EMFormatClass *klass) { - int i; + gint i; for (i=0;itype_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 e2363c2b8e..3602e5b75e 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -140,14 +140,14 @@ struct _EMFormatPURI { void (*free)(struct _EMFormatPURI *p); /* optional callback for freeing user-fields */ struct _EMFormat *format; - char *uri; /* will be the location of the part, may be empty */ - char *cid; /* will always be set, a fake one created if needed */ - char *part_id; /* will always be set, emf->part_id->str for this part */ + gchar *uri; /* will be the location of the part, may be empty */ + gchar *cid; /* will always be set, a fake one created if needed */ + gchar *part_id; /* will always be set, emf->part_id->str for this part */ EMFormatPURIFunc func; CamelMimePart *part; - unsigned int use_count; /* used by multipart/related to see if it was accessed */ + guint use_count; /* used by multipart/related to see if it was accessed */ }; /** @@ -176,7 +176,7 @@ struct _EMFormatHeader { struct _EMFormatHeader *next, *prev; guint32 flags; /* E_FORMAT_HEADER_* */ - char name[1]; + gchar name[1]; }; #define EM_FORMAT_HEADER_BOLD (1<<0) @@ -218,7 +218,7 @@ struct _EMFormat { CamelMimeMessage *message; /* the current message */ CamelFolder *folder; - char *uid; + gchar *uid; GString *part_id; /* current part id prefix, for identifying parts directly */ @@ -227,7 +227,7 @@ struct _EMFormat { CamelSession *session; /* session, used for authentication when required */ CamelURL *base; /* content-base header or absolute content-location, for any part */ - const char *snoop_mime_type; /* if we snooped an application/octet-stream type, what we snooped */ + const gchar *snoop_mime_type; /* if we snooped an application/octet-stream type, what we snooped */ /* for validity enveloping */ CamelCipherValidity *valid; @@ -245,8 +245,8 @@ struct _EMFormat { struct _EMFormatPURITree *pending_uri_level; em_format_mode_t mode; /* source/headers/etc */ - char *charset; /* charset override */ - char *default_charset; /* charset fallback */ + gchar *charset; /* charset override */ + gchar *default_charset; /* charset fallback */ gboolean composer; /* Formatting from composer ?*/ gboolean print; gboolean show_photo; /* Want to show the photo of the sender ?*/ @@ -259,16 +259,16 @@ struct _EMFormatClass { GHashTable *type_handlers; /* lookup handler, default falls back to hashtable above */ - const EMFormatHandler *(*find_handler)(EMFormat *, const char *mime_type); + const EMFormatHandler *(*find_handler)(EMFormat *, const gchar *mime_type); /* start formatting a message */ - void (*format_clone)(EMFormat *, CamelFolder *, const char *uid, CamelMimeMessage *, EMFormat *); + void (*format_clone)(EMFormat *, CamelFolder *, const gchar *uid, CamelMimeMessage *, EMFormat *); /* some internel error/inconsistency */ - void (*format_error)(EMFormat *, CamelStream *, const char *msg); + void (*format_error)(EMFormat *, CamelStream *, const gchar *msg); /* use for external structured parts */ - void (*format_attachment)(EMFormat *, CamelStream *, CamelMimePart *, const char *mime_type, const struct _EMFormatHandler *info); + void (*format_attachment)(EMFormat *, CamelStream *, CamelMimePart *, const gchar *mime_type, const struct _EMFormatHandler *info); /* use for unparsable content */ void (*format_source)(EMFormat *, CamelStream *, CamelMimePart *); @@ -290,22 +290,22 @@ struct _EMFormatClass { void em_format_set_session(EMFormat *emf, CamelSession *s); void em_format_set_mode(EMFormat *emf, em_format_mode_t type); -void em_format_set_charset(EMFormat *emf, const char *charset); -void em_format_set_default_charset(EMFormat *emf, const char *charset); +void em_format_set_charset(EMFormat *emf, const gchar *charset); +void em_format_set_default_charset(EMFormat *emf, const gchar *charset); void em_format_clear_headers(EMFormat *emf); /* also indicates to show all headers */ void em_format_default_headers(EMFormat *emf); -void em_format_add_header(EMFormat *emf, const char *name, guint32 flags); +void em_format_add_header(EMFormat *emf, const gchar *name, guint32 flags); /* FIXME: Need a 'clone' api to copy details about the current view (inlines etc) Or maybe it should live with sub-classes? */ -int em_format_is_attachment(EMFormat *emf, CamelMimePart *part); +gint em_format_is_attachment(EMFormat *emf, CamelMimePart *part); -int em_format_is_inline(EMFormat *emf, const char *partid, CamelMimePart *part, const EMFormatHandler *handle); -void em_format_set_inline(EMFormat *emf, const char *partid, int state); +gint em_format_is_inline(EMFormat *emf, const gchar *partid, CamelMimePart *part, const EMFormatHandler *handle); +void em_format_set_inline(EMFormat *emf, const gchar *partid, gint state); -char *em_format_describe_part(CamelMimePart *part, const char *mimetype); +gchar *em_format_describe_part(CamelMimePart *part, const gchar *mimetype); /* for implementers */ GType em_format_get_type(void); @@ -313,12 +313,12 @@ GType em_format_get_type(void); void em_format_class_add_handler(EMFormatClass *emfc, EMFormatHandler *info); void em_format_class_remove_handler(EMFormatClass *emfc, EMFormatHandler *info); #define em_format_find_handler(emf, type) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->find_handler((emf), (type)) -const EMFormatHandler *em_format_fallback_handler(EMFormat *emf, const char *mime_type); +const EMFormatHandler *em_format_fallback_handler(EMFormat *emf, const gchar *mime_type); /* puri is short for pending uri ... really */ -EMFormatPURI *em_format_add_puri(EMFormat *emf, size_t size, const char *uri, CamelMimePart *part, EMFormatPURIFunc func); -EMFormatPURI *em_format_find_visible_puri(EMFormat *emf, const char *uri); -EMFormatPURI *em_format_find_puri(EMFormat *emf, const char *uri); +EMFormatPURI *em_format_add_puri(EMFormat *emf, size_t size, const gchar *uri, CamelMimePart *part, EMFormatPURIFunc func); +EMFormatPURI *em_format_find_visible_puri(EMFormat *emf, const gchar *uri); +EMFormatPURI *em_format_find_puri(EMFormat *emf, const gchar *uri); void em_format_clear_puri_tree(EMFormat *emf); void em_format_push_level(EMFormat *emf); void em_format_pull_level(EMFormat *emf); @@ -328,7 +328,7 @@ void em_format_format_clone (EMFormat *emf, CamelFolder *folder, const gchar *ui /* formats a new message */ void em_format_format(EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMimeMessage *message); void em_format_redraw(EMFormat *emf); -void em_format_format_error(EMFormat *emf, CamelStream *stream, const char *fmt, ...); +void em_format_format_error(EMFormat *emf, CamelStream *stream, const gchar *fmt, ...); #define em_format_format_attachment(emf, stream, msg, type, info) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_attachment((emf), (stream), (msg), (type), (info)) #define em_format_format_source(emf, stream, msg) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_source((emf), (stream), (msg)) void em_format_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, CamelCipherValidity *valid); @@ -340,7 +340,7 @@ void em_format_format_content(EMFormat *emf, CamelStream *stream, CamelMimePart /* raw content text parts - should this just be checked/done by above? */ void em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *part); -void em_format_part_as(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const char *mime_type); +void em_format_part_as(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const gchar *mime_type); void em_format_part(EMFormat *emf, CamelStream *stream, CamelMimePart *part); void em_format_merge_handler(EMFormat *new, EMFormat *old); diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c index a1615d2d6a..a3284ab33e 100644 --- a/mail/em-html-stream.c +++ b/mail/em-html-stream.c @@ -38,9 +38,9 @@ static void em_html_stream_class_init (EMHTMLStreamClass *klass); static void em_html_stream_init (CamelObject *object); static void em_html_stream_finalize (CamelObject *object); -static ssize_t emhs_sync_write(CamelStream *stream, const char *buffer, size_t n); -static int emhs_sync_close(CamelStream *stream); -static int emhs_sync_flush(CamelStream *stream); +static ssize_t emhs_sync_write(CamelStream *stream, const gchar *buffer, size_t n); +static gint emhs_sync_close(CamelStream *stream); +static gint emhs_sync_flush(CamelStream *stream); static EMSyncStreamClass *parent_class = NULL; @@ -104,7 +104,7 @@ em_html_stream_finalize (CamelObject *object) } static ssize_t -emhs_sync_write(CamelStream *stream, const char *buffer, size_t n) +emhs_sync_write(CamelStream *stream, const gchar *buffer, size_t n) { EMHTMLStream *emhs = EM_HTML_STREAM (stream); diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c index b06145acc0..91dc5e10ca 100644 --- a/mail/em-icon-stream.c +++ b/mail/em-icon-stream.c @@ -50,15 +50,15 @@ static void em_icon_stream_class_init (EMIconStreamClass *klass); static void em_icon_stream_init (CamelObject *object); static void em_icon_stream_finalize (CamelObject *object); -static ssize_t emis_sync_write(CamelStream *stream, const char *buffer, size_t n); -static int emis_sync_close(CamelStream *stream); -static int emis_sync_flush(CamelStream *stream); +static ssize_t emis_sync_write(CamelStream *stream, const gchar *buffer, size_t n); +static gint emis_sync_close(CamelStream *stream); +static gint emis_sync_flush(CamelStream *stream); static EMSyncStreamClass *parent_class = NULL; static EMCache *emis_cache; static void -emis_cache_free(void *data) +emis_cache_free(gpointer data) { struct _emis_cache_node *node = data; @@ -133,14 +133,14 @@ em_icon_stream_finalize(CamelObject *object) } static ssize_t -emis_sync_write(CamelStream *stream, const char *buffer, size_t n) +emis_sync_write(CamelStream *stream, const gchar *buffer, size_t n) { EMIconStream *emis = EM_ICON_STREAM (stream); if (emis->loader == NULL) return -1; - if (!gdk_pixbuf_loader_write(emis->loader, (const unsigned char *)buffer, n, NULL)) { + if (!gdk_pixbuf_loader_write(emis->loader, (const guchar *)buffer, n, NULL)) { emis_cleanup(emis); return -1; } @@ -155,10 +155,10 @@ emis_sync_flush(CamelStream *stream) } static GdkPixbuf * -emis_fit(GdkPixbuf *pixbuf, int maxwidth, int maxheight, int *scale) +emis_fit(GdkPixbuf *pixbuf, gint maxwidth, gint maxheight, gint *scale) { GdkPixbuf *mini = NULL; - int width, height; + gint width, height; width = gdk_pixbuf_get_width(pixbuf); height = gdk_pixbuf_get_height(pixbuf); @@ -196,8 +196,8 @@ emis_sync_close(CamelStream *stream) EMIconStream *emis = (EMIconStream *)stream; GdkPixbuf *pixbuf, *mini; struct _emis_cache_node *node; - char *scalekey; - int scale; + gchar *scalekey; + gint scale; if (emis->loader == NULL) return -1; @@ -244,7 +244,7 @@ emis_image_destroy(struct _GtkImage *image, EMIconStream *emis) } CamelStream * -em_icon_stream_new(GtkImage *image, const char *key, unsigned int maxwidth, unsigned int maxheight, int keep) +em_icon_stream_new(GtkImage *image, const gchar *key, guint maxwidth, guint maxheight, gint keep) { EMIconStream *new; @@ -261,11 +261,11 @@ em_icon_stream_new(GtkImage *image, const char *key, unsigned int maxwidth, unsi } GdkPixbuf * -em_icon_stream_get_image(const char *tkey, unsigned int maxwidth, unsigned int maxheight) +em_icon_stream_get_image(const gchar *tkey, guint maxwidth, guint maxheight) { struct _emis_cache_node *node; GdkPixbuf *pb = NULL; - const char *key; + const gchar *key; key = tkey ? tkey : ""; @@ -274,7 +274,7 @@ em_icon_stream_get_image(const char *tkey, unsigned int maxwidth, unsigned int m node = (struct _emis_cache_node *)em_cache_lookup(emis_cache, key); if (node) { - int width, height; + gint width, height; pb = node->pixbuf; g_object_ref(pb); @@ -285,8 +285,8 @@ em_icon_stream_get_image(const char *tkey, unsigned int maxwidth, unsigned int m if ((maxwidth && width > maxwidth) || (maxheight && height > maxheight)) { - unsigned int scale; - char *realkey; + guint scale; + gchar *realkey; if (maxheight == 0 || width >= height) scale = width * EMIS_SCALE / maxwidth; @@ -317,12 +317,12 @@ em_icon_stream_get_image(const char *tkey, unsigned int maxwidth, unsigned int m return pb; } -int -em_icon_stream_is_resized(const char *tkey, unsigned int maxwidth, unsigned int maxheight) +gint +em_icon_stream_is_resized(const gchar *tkey, guint maxwidth, guint maxheight) { - int res = FALSE; + gint res = FALSE; struct _emis_cache_node *node; - const char *key; + const gchar *key; key = tkey ? tkey : ""; diff --git a/mail/em-icon-stream.h b/mail/em-icon-stream.h index 321e0cacae..24f4acedc1 100644 --- a/mail/em-icon-stream.h +++ b/mail/em-icon-stream.h @@ -41,11 +41,11 @@ struct _GtkIconStream; typedef struct _EMIconStream { EMSyncStream sync; - unsigned int width, height; + guint width, height; guint destroy_id; struct _GdkPixbufLoader *loader; struct _GtkImage *image; - char *key; + gchar *key; guint keep:1; } EMIconStream; @@ -55,10 +55,10 @@ typedef struct { } EMIconStreamClass; CamelType em_icon_stream_get_type (void); -CamelStream *em_icon_stream_new(GtkImage *image, const char *key, unsigned int maxwidth, unsigned int maxheight, int keep); +CamelStream *em_icon_stream_new(GtkImage *image, const gchar *key, guint maxwidth, guint maxheight, gint keep); -struct _GdkPixbuf *em_icon_stream_get_image(const char *key, unsigned int maxwidth, unsigned int maxheight); -int em_icon_stream_is_resized(const char *key, unsigned int maxwidth, unsigned int maxheight); +struct _GdkPixbuf *em_icon_stream_get_image(const gchar *key, guint maxwidth, guint maxheight); +gint em_icon_stream_is_resized(const gchar *key, guint maxwidth, guint maxheight); void em_icon_stream_clear_cache(void); diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index ffe9f676b3..7da549cd34 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -39,8 +39,8 @@ static void em_inline_filter_class_init (EMInlineFilterClass *klass); static void em_inline_filter_init (CamelObject *object); static void em_inline_filter_finalize (CamelObject *object); -static void emif_filter(CamelMimeFilter *f, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace); -static void emif_complete(CamelMimeFilter *f, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace); +static void emif_filter(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace); +static void emif_complete(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace); static void emif_reset(CamelMimeFilter *f); static CamelMimeFilterClass *parent_class = NULL; @@ -106,8 +106,8 @@ enum { }; static const struct { - const char *type; - const char *subtype; + const gchar *type; + const gchar *subtype; CamelTransferEncoding encoding; guint plain:1; } emif_types[] = { @@ -120,22 +120,22 @@ static const struct { }; static void -emif_add_part(EMInlineFilter *emif, const char *data, int len) +emif_add_part(EMInlineFilter *emif, const gchar *data, gint len) { CamelTransferEncoding encoding; CamelContentType *content_type; CamelDataWrapper *dw; - const char *mimetype; + const gchar *mimetype; CamelMimePart *part; CamelStream *mem; - char *type; + gchar *type; if (emif->state == EMIF_PLAIN || emif->state == EMIF_PGPSIGNED || emif->state == EMIF_PGPENCRYPTED) encoding = emif->base_encoding; else encoding = emif_types[emif->state].encoding; - g_byte_array_append(emif->data, (unsigned char *)data, len); + g_byte_array_append(emif->data, (guchar *)data, len); /* check the part will actually have content */ if (emif->data->len <= 0) { return; @@ -191,12 +191,12 @@ emif_add_part(EMInlineFilter *emif, const char *data, int len) } static int -emif_scan(CamelMimeFilter *f, char *in, size_t len, int final) +emif_scan(CamelMimeFilter *f, gchar *in, size_t len, gint final) { EMInlineFilter *emif = (EMInlineFilter *)f; - char *inptr = in, *inend = in+len; - char *data_start = in; - char *start = in; + gchar *inptr = in, *inend = in+len; + gchar *data_start = in; + gchar *start = in; while (inptr < inend) { start = inptr; @@ -219,8 +219,8 @@ emif_scan(CamelMimeFilter *f, char *in, size_t len, int final) /* This could use some funky plugin shit, but this'll do for now */ if (strncmp(start, "begin ", 6) == 0 && start[6] >= '0' && start[6] <= '7') { - int i = 7; - char *name; + gint i = 7; + gchar *name; while (start[i] >='0' && start[i] <='7') i++; @@ -267,7 +267,7 @@ emif_scan(CamelMimeFilter *f, char *in, size_t len, int final) data_start = inptr; emif->state = EMIF_PLAIN; } else { - int linelen; + gint linelen; /* check the length byte matches the data, if not, output what we have and re-scan this line */ len = ((start[0] - ' ') & 077); @@ -327,14 +327,14 @@ emif_scan(CamelMimeFilter *f, char *in, size_t len, int final) if (final) { emif_add_part(emif, data_start, inend-data_start); } else { - g_byte_array_append(emif->data, (unsigned char *)data_start, inend-data_start); + g_byte_array_append(emif->data, (guchar *)data_start, inend-data_start); } return 0; } static void -emif_filter(CamelMimeFilter *f, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace) +emif_filter(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace) { emif_scan(f, in, len, FALSE); @@ -344,7 +344,7 @@ emif_filter(CamelMimeFilter *f, char *in, size_t len, size_t prespace, char **ou } static void -emif_complete(CamelMimeFilter *f, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace) +emif_complete(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace) { emif_scan(f, in, len, TRUE); diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h index b6bc38502f..ed5b688dfb 100644 --- a/mail/em-inline-filter.h +++ b/mail/em-inline-filter.h @@ -40,13 +40,13 @@ extern "C" { typedef struct _EMInlineFilter { CamelMimeFilter filter; - int state; + gint state; CamelTransferEncoding base_encoding; CamelContentType *base_type; GByteArray *data; - char *filename; + gchar *filename; GSList *parts; } EMInlineFilter; diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c index f95685e351..42c15f754e 100644 --- a/mail/em-junk-hook.c +++ b/mail/em-junk-hook.c @@ -37,7 +37,7 @@ static GHashTable *emjh_types; static GObjectClass *parent_class = NULL; -static void *emjh_parent_class; +static gpointer emjh_parent_class; static GObjectClass *emj_parent; #define emjh ((EMJunkHook *)eph) @@ -63,7 +63,7 @@ static const EPluginHookTargetKey emjh_flag_map[] = { */ -static void manage_error (const char *msg, GError *error); +static void manage_error (const gchar *msg, GError *error); GQuark em_junk_error_quark (void) @@ -71,7 +71,7 @@ em_junk_error_quark (void) return g_quark_from_static_string ("em-junk-error-quark"); } -static const char * +static const gchar * em_junk_get_name (CamelJunkPlugin *csp); static void @@ -82,7 +82,7 @@ em_junk_init(CamelJunkPlugin *csp) ((EPluginClass *)G_OBJECT_GET_CLASS(item->hook->hook.plugin))->enable(item->hook->hook.plugin, 1); } -static const char * +static const gchar * em_junk_get_name (CamelJunkPlugin *csp) { struct _EMJunkHookItem *item = (EMJunkHookItem *)csp; @@ -248,7 +248,7 @@ emjh_construct_group(EPluginHook *eph, xmlNodePtr root) /* We'll processs only the first item from xml file*/ while (node) { - if (0 == strcmp((char *)node->name, "item")) { + if (0 == strcmp((gchar *)node->name, "item")) { struct _EMJunkHookItem *item; item = emjh_construct_item(eph, group, node); @@ -284,7 +284,7 @@ emjh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) node = root->children; while (node) { - if (strcmp((char *)node->name, "group") == 0) { + if (strcmp((gchar *)node->name, "group") == 0) { struct _EMJunkHookGroup *group; group = emjh_construct_group(eph, node); @@ -302,7 +302,7 @@ emjh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) struct manage_error_idle_data { - const char *msg; + const gchar *msg; GError *error; }; @@ -334,7 +334,7 @@ manage_error_idle (gpointer data) } static void -manage_error (const char *msg, GError *error) +manage_error (const gchar *msg, GError *error) { struct manage_error_idle_data *mei; @@ -350,7 +350,7 @@ manage_error (const char *msg, GError *error) /*XXX: don't think we need here*/ static void -emjh_enable(EPluginHook *eph, int state) +emjh_enable(EPluginHook *eph, gint state) { GSList *g; @@ -436,5 +436,5 @@ em_junk_hook_register_type(GType type) d(printf("registering junk plugin type '%s'\n", g_type_name(type))); klass = g_type_class_ref(type); - g_hash_table_insert(emjh_types, (void *)g_type_name(type), klass); + g_hash_table_insert(emjh_types, (gpointer)g_type_name(type), klass); } diff --git a/mail/em-junk-hook.h b/mail/em-junk-hook.h index 0e467a20bd..9e7c999b29 100644 --- a/mail/em-junk-hook.h +++ b/mail/em-junk-hook.h @@ -56,17 +56,17 @@ struct _EMJunkHookTarget { struct _EMJunkHookItem { CamelJunkPlugin csp; struct _EMJunkHook *hook; /* parent pointer */ - char *check_junk; - char *report_junk; - char *report_non_junk; - char *commit_reports; - char *validate_binary; - char *plugin_name; + gchar *check_junk; + gchar *report_junk; + gchar *report_non_junk; + gchar *commit_reports; + gchar *validate_binary; + gchar *plugin_name; }; struct _EMJunkHookGroup { struct _EMJunkHook *hook; /* parent pointer */ - char *id; /* target id */ + gchar *id; /* target id */ GSList *items; /* items to consider */ }; diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index 27f27ca721..a03bcd6cf3 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -71,7 +71,7 @@ static GType col_types[] = { }; /* temporarily copied from em-format.c */ -static const char *default_headers[] = { +static const gchar *default_headers[] = { N_("From"), N_("Reply-To"), N_("To"), @@ -88,8 +88,8 @@ static const char *default_headers[] = { /* for empty trash on exit frequency */ static const struct { - const char *label; - int days; + const gchar *label; + gint days; } empty_trash_frequency[] = { { N_("Every time"), 0 }, { N_("Once per day"), 1 }, @@ -309,7 +309,7 @@ jh_tree_refill (EMMailerPrefs *prefs) for (l = cjh; l; l = l->next) { GtkTreeIter iter; - char **tokens = g_strsplit (l->data, "=", 2); + gchar **tokens = g_strsplit (l->data, "=", 2); gtk_list_store_append (store, &iter); gtk_list_store_set ( @@ -329,7 +329,7 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) { EMMailerPrefs *prefs = (EMMailerPrefs *) user_data; GtkWidget *dialog, *l1, *l2, *entry1, *entry2, *vbox, *hbox; - int response; + gint response; dialog = gtk_dialog_new_with_buttons (_("Add Custom Junk Header"), (GtkWindow *)gtk_widget_get_toplevel (widget), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL); vbox = gtk_vbox_new (FALSE, 6); @@ -351,9 +351,9 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) gtk_container_add ((GtkContainer *)((GtkDialog *)dialog)->vbox, vbox); response = gtk_dialog_run ((GtkDialog *)dialog); if (response == GTK_RESPONSE_ACCEPT) { - const char *name = gtk_entry_get_text ((GtkEntry *)entry1); - const char *value = gtk_entry_get_text ((GtkEntry *)entry2); - char *tok; + const gchar *name = gtk_entry_get_text ((GtkEntry *)entry1); + const gchar *value = gtk_entry_get_text ((GtkEntry *)entry2); + gchar *tok; GSList *list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); /* FIXME: Validate the values */ @@ -381,13 +381,13 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (prefs->junk_header_tree)); if (gtk_tree_selection_get_selected (selection, &model, &iter)) { - char *name=NULL, *value=NULL; + gchar *name=NULL, *value=NULL; GSList *prev = NULL, *node, *list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); gtk_tree_model_get (model, &iter, JH_LIST_COLUMN_NAME, &name, JH_LIST_COLUMN_VALUE, &value, -1); node = list; while (node) { - char *test; - int len = strlen (name); + gchar *test; + gint len = strlen (name); test = strncmp (node->data, name, len) == 0 ? (gchar *) node->data+len:NULL; if (test) { @@ -488,7 +488,7 @@ init_label_tree (GtkWidget *label_tree, EMMailerPrefs *prefs, gboolean locked) static void label_add_cb (GtkWidget *widget, gpointer user_data) { - char *tag; + gchar *tag; tag = e_util_labels_add_with_dlg (GTK_WINDOW (gtk_widget_get_toplevel (widget)), NULL); @@ -535,7 +535,7 @@ label_edit_cb (GtkWidget *widget, gpointer user_data) gtk_tree_model_get (model, &iter, LABEL_LIST_COLUMN_TAG, &tag, -1); if (tag) { - char *str = e_util_labels_add_with_dlg (GTK_WINDOW (gtk_widget_get_toplevel (widget)), tag); + gchar *str = e_util_labels_add_with_dlg (GTK_WINDOW (gtk_widget_get_toplevel (widget)), tag); g_free (str); } @@ -569,7 +569,7 @@ emmp_header_remove_sensitivity (EMMailerPrefs *prefs) } static gboolean -emmp_header_is_valid (const char *header) +emmp_header_is_valid (const gchar *header) { gint len = g_utf8_strlen (header, -1); @@ -584,7 +584,7 @@ emmp_header_is_valid (const char *header) static void emmp_header_add_sensitivity (EMMailerPrefs *prefs) { - const char *entry_contents; + const gchar *entry_contents; GtkTreeIter iter; gboolean valid; @@ -601,7 +601,7 @@ emmp_header_add_sensitivity (EMMailerPrefs *prefs) /* check if this is a duplicate */ valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (prefs->header_list_store), &iter); while (valid) { - char *header_name; + gchar *header_name; gtk_tree_model_get (GTK_TREE_MODEL (prefs->header_list_store), &iter, HEADER_LIST_HEADER_COLUMN, &header_name, @@ -630,7 +630,7 @@ emmp_save_headers (EMMailerPrefs *prefs) while (valid) { struct _EMMailerPrefsHeader h; gboolean enabled; - char *xml; + gchar *xml; gtk_tree_model_get (GTK_TREE_MODEL (prefs->header_list_store), &iter, HEADER_LIST_HEADER_COLUMN, &h.name, @@ -650,12 +650,12 @@ emmp_save_headers (EMMailerPrefs *prefs) } static void -emmp_header_list_enabled_toggled (GtkCellRendererToggle *cell, const char *path_string, EMMailerPrefs *prefs) +emmp_header_list_enabled_toggled (GtkCellRendererToggle *cell, const gchar *path_string, EMMailerPrefs *prefs) { GtkTreeModel *model = GTK_TREE_MODEL (prefs->header_list_store); GtkTreePath *path = gtk_tree_path_new_from_string (path_string); GtkTreeIter iter; - int enabled; + gint enabled; gtk_tree_model_get_iter (model, &iter, path); gtk_tree_model_get (model, &iter, HEADER_LIST_ENABLED_COLUMN, &enabled, -1); @@ -728,7 +728,7 @@ emmp_header_entry_changed (GtkWidget *entry, gpointer user_data) static void mark_seen_timeout_changed (GtkSpinButton *spin, EMMailerPrefs *prefs) { - int timeout; + gint timeout; timeout = (int) (gtk_spin_button_get_value (prefs->timeout) * 1000.0); gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/mark_seen_timeout", timeout, NULL); @@ -737,7 +737,7 @@ mark_seen_timeout_changed (GtkSpinButton *spin, EMMailerPrefs *prefs) static void address_compress_count_changed (GtkSpinButton *spin, EMMailerPrefs *prefs) { - int count; + gint count; count = (int) gtk_spin_button_get_value (prefs->address_count); @@ -747,7 +747,7 @@ address_compress_count_changed (GtkSpinButton *spin, EMMailerPrefs *prefs) static void mlimit_count_changed (GtkSpinButton *spin, EMMailerPrefs *prefs) { - int count; + gint count; count = (int) gtk_spin_button_get_value (prefs->mlimit_count); @@ -755,12 +755,12 @@ mlimit_count_changed (GtkSpinButton *spin, EMMailerPrefs *prefs) } static void -spin_button_init (EMMailerPrefs *prefs, GtkSpinButton *spin, const char *key, float div, GCallback value_changed) +spin_button_init (EMMailerPrefs *prefs, GtkSpinButton *spin, const gchar *key, float div, GCallback value_changed) { GError *err = NULL; double min, max; - char *mkey, *p; - int val; + gchar *mkey, *p; + gint val; gtk_spin_button_get_range (spin, &min, &max); @@ -791,7 +791,7 @@ spin_button_init (EMMailerPrefs *prefs, GtkSpinButton *spin, const char *key, fl gtk_spin_button_set_value (spin, (1.0 * val) / div); if (value_changed) { - g_object_set_data ((GObject *) spin, "key", (void *) key); + g_object_set_data ((GObject *) spin, "key", (gpointer) key); g_signal_connect (spin, "value-changed", value_changed, prefs); } @@ -802,7 +802,7 @@ spin_button_init (EMMailerPrefs *prefs, GtkSpinButton *spin, const char *key, fl static void toggle_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) { - const char *key; + const gchar *key; key = g_object_get_data ((GObject *) toggle, "key"); gconf_client_set_bool (prefs->gconf, key, gtk_toggle_button_get_active (toggle), NULL); @@ -867,7 +867,7 @@ font_changed (GtkFontButton *font_button, EMMailerPrefs *prefs) } static void -toggle_button_init (EMMailerPrefs *prefs, GtkToggleButton *toggle, int not, const char *key, GCallback toggled) +toggle_button_init (EMMailerPrefs *prefs, GtkToggleButton *toggle, gint not, const gchar *key, GCallback toggled) { gboolean bool; @@ -875,7 +875,7 @@ toggle_button_init (EMMailerPrefs *prefs, GtkToggleButton *toggle, int not, cons gtk_toggle_button_set_active (toggle, not ? !bool : bool); if (toggled) { - g_object_set_data ((GObject *) toggle, "key", (void *) key); + g_object_set_data ((GObject *) toggle, "key", (gpointer) key); g_signal_connect (toggle, "toggled", toggled, prefs); } @@ -887,7 +887,7 @@ static void charset_activate (GtkWidget *item, EMMailerPrefs *prefs) { GtkWidget *menu; - char *string; + gchar *string; menu = gtk_option_menu_get_menu (prefs->charset); if (!(string = e_charset_picker_get_charset (menu))) @@ -902,7 +902,7 @@ charset_menu_init (EMMailerPrefs *prefs) { GtkWidget *menu, *item; GList *items; - char *buf; + gchar *buf; buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/charset", NULL); menu = e_charset_picker_new (buf && *buf ? buf : camel_iconv_locale_charset ()); @@ -923,7 +923,7 @@ charset_menu_init (EMMailerPrefs *prefs) static void trash_days_changed (GtkComboBox *combobox, EMMailerPrefs *prefs) { - int idx; + gint idx; idx = gtk_combo_box_get_active (combobox); g_return_if_fail (idx >= 0 && idx < G_N_ELEMENTS (empty_trash_frequency)); @@ -934,7 +934,7 @@ trash_days_changed (GtkComboBox *combobox, EMMailerPrefs *prefs) static void emmp_empty_trash_init (EMMailerPrefs *prefs) { - int locked, days, hist = 0, i; + gint locked, days, hist = 0, i; toggle_button_init (prefs, prefs->empty_trash, FALSE, "/apps/evolution/mail/trash/empty_on_exit", @@ -960,7 +960,7 @@ emmp_empty_trash_init (EMMailerPrefs *prefs) static void junk_days_changed (GtkComboBox *combobox, EMMailerPrefs *prefs) { - int idx; + gint idx; idx = gtk_combo_box_get_active (combobox); g_return_if_fail (idx >= 0 && idx < G_N_ELEMENTS (empty_trash_frequency)); @@ -971,7 +971,7 @@ junk_days_changed (GtkComboBox *combobox, EMMailerPrefs *prefs) static void emmp_empty_junk_init (EMMailerPrefs *prefs) { - int locked, days, hist = 0, i; + gint locked, days, hist = 0, i; toggle_button_init (prefs, prefs->empty_junk, FALSE, "/apps/evolution/mail/junk/empty_on_exit", @@ -997,7 +997,7 @@ emmp_empty_junk_init (EMMailerPrefs *prefs) static void http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs) { - int when; + gint when; if (gtk_toggle_button_get_active (prefs->images_always)) when = MAIL_CONFIG_HTTP_ALWAYS; @@ -1011,7 +1011,7 @@ http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs) static GtkWidget * -emmp_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emmp_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { EMMailerPrefs *prefs = data; @@ -1039,7 +1039,7 @@ static EMConfigItem emmp_items[] = { }; static void -emmp_free(EConfig *ec, GSList *items, void *data) +emmp_free(EConfig *ec, GSList *items, gpointer data) { /* the prefs data is freed automagically */ @@ -1049,7 +1049,7 @@ emmp_free(EConfig *ec, GSList *items, void *data) static void junk_plugin_changed (GtkWidget *combo, EMMailerPrefs *prefs) { - char *def_plugin = gtk_combo_box_get_active_text(GTK_COMBO_BOX (combo)); + gchar *def_plugin = gtk_combo_box_get_active_text(GTK_COMBO_BOX (combo)); const GList *plugins = mail_session_get_junk_plugins(); gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/junk/default_plugin", def_plugin, NULL); @@ -1062,7 +1062,7 @@ junk_plugin_changed (GtkWidget *combo, EMMailerPrefs *prefs) session->junk_plugin = CAMEL_JUNK_PLUGIN (&(item->csp)); status = e_plugin_invoke (item->hook->hook.plugin, item->validate_binary, NULL) != NULL; if ((gboolean)status == TRUE) { - char *text, *html; + gchar *text, *html; gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU); text = g_strdup_printf (_("%s plugin is available and the binary is installed."), item->plugin_name); html = g_strdup_printf ("%s", text); @@ -1070,7 +1070,7 @@ junk_plugin_changed (GtkWidget *combo, EMMailerPrefs *prefs) g_free (html); g_free (text); } else { - char *text, *html; + gchar *text, *html; gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-warning", GTK_ICON_SIZE_MENU); text = g_strdup_printf (_("%s plugin is not available. Please check whether the package is installed."), item->plugin_name); html = g_strdup_printf ("%s", text); @@ -1087,10 +1087,10 @@ junk_plugin_changed (GtkWidget *combo, EMMailerPrefs *prefs) static void junk_plugin_setup (GtkWidget *combo, EMMailerPrefs *prefs) { - int index = 0; + gint index = 0; gboolean def_set = FALSE; const GList *plugins = mail_session_get_junk_plugins(); - char *pdefault = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/junk/default_plugin", NULL); + gchar *pdefault = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/junk/default_plugin", NULL); if (!plugins || !g_list_length ((GList *)plugins)) { gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("No Junk plugin available")); @@ -1115,7 +1115,7 @@ junk_plugin_setup (GtkWidget *combo, EMMailerPrefs *prefs) gtk_combo_box_set_active (GTK_COMBO_BOX (combo), index); status = e_plugin_invoke (item->hook->hook.plugin, item->validate_binary, NULL) != NULL; if (status) { - char *text, *html; + gchar *text, *html; gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-info", GTK_ICON_SIZE_MENU); /* May be a better text */ text = g_strdup_printf (_("%s plugin is available and the binary is installed."), item->plugin_name); @@ -1124,7 +1124,7 @@ junk_plugin_setup (GtkWidget *combo, EMMailerPrefs *prefs) g_free (html); g_free (text); } else { - char *text, *html; + gchar *text, *html; gtk_image_set_from_stock (prefs->plugin_image, "gtk-dialog-warning", GTK_ICON_SIZE_MENU); /* May be a better text */ text = g_strdup_printf (_("%s plugin is not available. Please check whether the package is installed."), item->plugin_name); @@ -1156,14 +1156,14 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) GtkTreeSelection *selection; GtkCellRenderer *renderer; GtkTreeIter iter; - char *font, *buf; + gchar *font, *buf; GladeXML *gui; gboolean locked; - int val, i; + gint val, i; EMConfig *ec; EMConfigTargetPrefs *target; GSList *l; - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "mail-config.glade", @@ -1399,7 +1399,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) h = g_malloc (sizeof (struct _EMMailerPrefsHeader)); h->is_default = TRUE; h->name = g_strdup (default_headers[i]); - h->enabled = strcmp ((char *)default_headers[i], "x-evolution-mailer") != 0; + h->enabled = strcmp ((gchar *)default_headers[i], "x-evolution-mailer") != 0; g_hash_table_insert (default_header_hash, (gpointer) default_headers[i], h); header_add_list = g_slist_append (header_add_list, h); } @@ -1409,7 +1409,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) p = header_config_list; while (p) { struct _EMMailerPrefsHeader *h, *def; - char *xml = (char *) p->data; + gchar *xml = (gchar *) p->data; h = em_mailer_prefs_header_from_xml (xml); if (h) { @@ -1433,7 +1433,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) p = header_add_list; while (p) { struct _EMMailerPrefsHeader *h = (struct _EMMailerPrefsHeader *) p->data; - const char *name; + const gchar *name; if (g_ascii_strcasecmp (h->name, EM_FORMAT_HEADER_XMAILER) == 0) name = _("Mailer"); @@ -1525,10 +1525,10 @@ emmp_header_from_xmldoc (xmlDocPtr doc) return NULL; root = doc->children; - if (strcmp ((char *)root->name, "header") != 0) + if (strcmp ((gchar *)root->name, "header") != 0) return NULL; - name = xmlGetProp (root, (const unsigned char *)"name"); + name = xmlGetProp (root, (const guchar *)"name"); if (name == NULL) return NULL; @@ -1536,7 +1536,7 @@ emmp_header_from_xmldoc (xmlDocPtr doc) h->name = g_strdup ((gchar *)name); xmlFree (name); - if (xmlHasProp (root, (const unsigned char *)"enabled")) + if (xmlHasProp (root, (const guchar *)"enabled")) h->enabled = 1; else h->enabled = 0; @@ -1554,12 +1554,12 @@ emmp_header_from_xmldoc (xmlDocPtr doc) * is an error. **/ struct _EMMailerPrefsHeader * -em_mailer_prefs_header_from_xml (const char *xml) +em_mailer_prefs_header_from_xml (const gchar *xml) { struct _EMMailerPrefsHeader *header; xmlDocPtr doc; - if (!(doc = xmlParseDoc ((unsigned char *) xml))) + if (!(doc = xmlParseDoc ((guchar *) xml))) return NULL; header = emmp_header_from_xmldoc (doc); @@ -1592,24 +1592,24 @@ em_mailer_prefs_header_free (struct _EMMailerPrefsHeader *header) * Returns the passed header as a XML structure, * or NULL on error */ -char * +gchar * em_mailer_prefs_header_to_xml (struct _EMMailerPrefsHeader *header) { xmlDocPtr doc; xmlNodePtr root; xmlChar *xml; - char *out; - int size; + gchar *out; + gint size; g_return_val_if_fail (header != NULL, NULL); g_return_val_if_fail (header->name != NULL, NULL); - doc = xmlNewDoc ((const unsigned char *)"1.0"); + doc = xmlNewDoc ((const guchar *)"1.0"); - root = xmlNewDocNode (doc, NULL, (const unsigned char *)"header", NULL); - xmlSetProp (root, (const unsigned char *)"name", (unsigned char *)header->name); + root = xmlNewDocNode (doc, NULL, (const guchar *)"header", NULL); + xmlSetProp (root, (const guchar *)"name", (guchar *)header->name); if (header->enabled) - xmlSetProp (root, (const unsigned char *)"enabled", NULL); + xmlSetProp (root, (const guchar *)"enabled", NULL); xmlDocSetRootElement (doc, root); xmlDocDumpMemory (doc, &xml, &size); diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h index 10503a8461..917c00c932 100644 --- a/mail/em-mailer-prefs.h +++ b/mail/em-mailer-prefs.h @@ -56,7 +56,7 @@ typedef struct _EMMailerPrefsClass EMMailerPrefsClass; typedef struct _EMMailerPrefsHeader EMMailerPrefsHeader; struct _EMMailerPrefsHeader { - char *name; + gchar *name; guint enabled:1; guint is_default:1; }; @@ -150,8 +150,8 @@ GtkWidget * create_combo_text_widget (void); struct _GtkWidget *em_mailer_prefs_new (void); -EMMailerPrefsHeader *em_mailer_prefs_header_from_xml(const char *xml); -char *em_mailer_prefs_header_to_xml(EMMailerPrefsHeader *header); +EMMailerPrefsHeader *em_mailer_prefs_header_from_xml(const gchar *xml); +gchar *em_mailer_prefs_header_to_xml(EMMailerPrefsHeader *header); void em_mailer_prefs_header_free(EMMailerPrefsHeader *header); /* needed by global config */ diff --git a/mail/em-menu.c b/mail/em-menu.c index b504bd3304..f0da9c8820 100644 --- a/mail/em-menu.c +++ b/mail/em-menu.c @@ -50,7 +50,7 @@ #include -static void emp_standard_menu_factory(EMenu *emp, void *data); +static void emp_standard_menu_factory(EMenu *emp, gpointer data); static GObjectClass *emp_parent; @@ -114,7 +114,7 @@ em_menu_get_type(void) return type; } -EMMenu *em_menu_new(const char *menuid) +EMMenu *em_menu_new(const gchar *menuid) { EMMenu *emp = g_object_new(em_menu_get_type(), NULL); @@ -134,12 +134,12 @@ EMMenu *em_menu_new(const char *menuid) * Return value: **/ EMMenuTargetSelect * -em_menu_target_new_select(EMMenu *emp, struct _CamelFolder *folder, const char *folder_uri, GPtrArray *uids) +em_menu_target_new_select(EMMenu *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids) { EMMenuTargetSelect *t = e_menu_target_new(&emp->popup, EM_MENU_TARGET_SELECT, sizeof(*t)); guint32 mask = ~0; - int i; - const char *tmp; + gint i; + const gchar *tmp; /* NB: This is identical to em-popup-target-new-select function */ @@ -243,7 +243,7 @@ em_menu_target_new_widget(EMMenu *emp, struct _GtkWidget *w) } static void -emp_standard_menu_factory(EMenu *emp, void *data) +emp_standard_menu_factory(EMenu *emp, gpointer data) { /* noop */ } @@ -276,7 +276,7 @@ emp_standard_menu_factory(EMenu *emp, void *data) */ -static void *emph_parent_class; +static gpointer emph_parent_class; #define emph ((EMMenuHook *)eph) static const EMenuHookTargetMask emph_select_masks[] = { @@ -323,7 +323,7 @@ emph_finalise(GObject *o) static void emph_class_init(EPluginHookClass *klass) { - int i; + gint i; ((GObjectClass *)klass)->finalize = emph_finalise; ((EPluginHookClass *)klass)->id = "org.gnome.evolution.mail.bonobomenu:1.0"; diff --git a/mail/em-menu.h b/mail/em-menu.h index cdcc12bcae..96f571407c 100644 --- a/mail/em-menu.h +++ b/mail/em-menu.h @@ -73,7 +73,7 @@ typedef struct _EMMenuTargetSelect EMMenuTargetSelect; struct _EMMenuTargetSelect { EMenuTarget target; struct _CamelFolder *folder; - char *uri; + gchar *uri; GPtrArray *uids; }; @@ -98,9 +98,9 @@ struct _EMMenuClass { GType em_menu_get_type(void); -EMMenu *em_menu_new(const char *menuid); +EMMenu *em_menu_new(const gchar *menuid); -EMMenuTargetSelect *em_menu_target_new_select(EMMenu *emp, struct _CamelFolder *folder, const char *folder_uri, GPtrArray *uids); +EMMenuTargetSelect *em_menu_target_new_select(EMMenu *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids); EMMenuTargetWidget *em_menu_target_new_widget(EMMenu *emp, struct _GtkWidget *w); /* ********************************************************************** */ diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 3f5beb3f84..1745171ac0 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -84,11 +84,11 @@ /* upgrade helper functions */ static xmlDocPtr -emm_load_xml (const char *dirname, const char *filename) +emm_load_xml (const gchar *dirname, const gchar *filename) { xmlDocPtr doc; struct stat st; - char *path; + gchar *path; path = g_strdup_printf ("%s/%s", dirname, filename); if (stat (path, &st) == -1 || !(doc = xmlParseFile (path))) { @@ -102,10 +102,10 @@ emm_load_xml (const char *dirname, const char *filename) } static int -emm_save_xml (xmlDocPtr doc, const char *dirname, const char *filename) +emm_save_xml (xmlDocPtr doc, const gchar *dirname, const gchar *filename) { - char *path; - int retval; + gchar *path; + gint retval; path = g_strdup_printf ("%s/%s", dirname, filename); retval = e_xml_save_file (path, doc); @@ -115,13 +115,13 @@ emm_save_xml (xmlDocPtr doc, const char *dirname, const char *filename) } static xmlNodePtr -xml_find_node (xmlNodePtr parent, const char *name) +xml_find_node (xmlNodePtr parent, const gchar *name) { xmlNodePtr node; node = parent->children; while (node != NULL) { - if (node->name && !strcmp ((char *)node->name, name)) + if (node->name && !strcmp ((gchar *)node->name, name)) return node; node = node->next; @@ -131,15 +131,15 @@ xml_find_node (xmlNodePtr parent, const char *name) } static void -upgrade_xml_uris (xmlDocPtr doc, char * (* upgrade_uri) (const char *uri)) +upgrade_xml_uris (xmlDocPtr doc, gchar * (* upgrade_uri) (const gchar *uri)) { xmlNodePtr root, node; - char *uri, *new; + gchar *uri, *new; if (!doc || !(root = xmlDocGetRootElement (doc))) return; - if (!root->name || strcmp ((char *)root->name, "filteroptions") != 0) { + if (!root->name || strcmp ((gchar *)root->name, "filteroptions") != 0) { /* root node is not , nothing to upgrade */ return; } @@ -151,27 +151,27 @@ upgrade_xml_uris (xmlDocPtr doc, char * (* upgrade_uri) (const char *uri)) node = node->children; while (node != NULL) { - if (node->name && !strcmp ((char *)node->name, "rule")) { + if (node->name && !strcmp ((gchar *)node->name, "rule")) { xmlNodePtr actionset, part, val, n; if ((actionset = xml_find_node (node, "actionset"))) { /* filters.xml */ part = actionset->children; while (part != NULL) { - if (part->name && !strcmp ((char *)part->name, "part")) { + if (part->name && !strcmp ((gchar *)part->name, "part")) { val = part->children; while (val != NULL) { - if (val->name && !strcmp ((char *)val->name, "value")) { - char *type; + if (val->name && !strcmp ((gchar *)val->name, "value")) { + gchar *type; - type = (char *)xmlGetProp (val, (const unsigned char *)"type"); - if (type && !strcmp ((char *)type, "folder")) { + type = (gchar *)xmlGetProp (val, (const guchar *)"type"); + if (type && !strcmp ((gchar *)type, "folder")) { if ((n = xml_find_node (val, "folder"))) { - uri = (char *)xmlGetProp (n, (const unsigned char *)"uri"); + uri = (gchar *)xmlGetProp (n, (const guchar *)"uri"); new = upgrade_uri (uri); xmlFree (uri); - xmlSetProp (n, (const unsigned char *)"uri", (unsigned char *)new); + xmlSetProp (n, (const guchar *)"uri", (guchar *)new); g_free (new); } } @@ -189,12 +189,12 @@ upgrade_xml_uris (xmlDocPtr doc, char * (* upgrade_uri) (const char *uri)) /* vfolders.xml */ n = actionset->children; while (n != NULL) { - if (n->name && !strcmp ((char *)n->name, "folder")) { - uri = (char *)xmlGetProp (n, (const unsigned char *)"uri"); + if (n->name && !strcmp ((gchar *)n->name, "folder")) { + uri = (gchar *)xmlGetProp (n, (const guchar *)"uri"); new = upgrade_uri (uri); xmlFree (uri); - xmlSetProp (n, (const unsigned char *)"uri", (unsigned char *)new); + xmlSetProp (n, (const guchar *)"uri", (guchar *)new); g_free (new); } @@ -211,25 +211,25 @@ upgrade_xml_uris (xmlDocPtr doc, char * (* upgrade_uri) (const char *uri)) /* as much info as we have on a given account */ struct _account_info_1_0 { - char *name; - char *uri; - char *base_uri; + gchar *name; + gchar *uri; + gchar *base_uri; union { struct { /* for imap */ - char *namespace; - char *namespace_full; + gchar *namespace; + gchar *namespace_full; guint32 capabilities; GHashTable *folders; - char dir_sep; + gchar dir_sep; } imap; } u; }; struct _imap_folder_info_1_0 { - char *folder; + gchar *folder; /* encoded? decoded? canonicalised? */ - char dir_sep; + gchar dir_sep; }; static GHashTable *accounts_1_0 = NULL; @@ -254,10 +254,10 @@ account_info_1_0_free (struct _account_info_1_0 *ai) g_free(ai); } -static char * -get_base_uri(const char *val) +static gchar * +get_base_uri(const gchar *val) { - const char *tmp; + const gchar *tmp; tmp = strchr(val, ':'); if (tmp) { @@ -273,14 +273,14 @@ get_base_uri(const char *val) return g_strdup(val); } -static char * -upgrade_xml_uris_1_0 (const char *uri) +static gchar * +upgrade_xml_uris_1_0 (const gchar *uri) { - char *out = NULL; + gchar *out = NULL; /* upgrades camel uri's */ if (strncmp (uri, "imap:", 5) == 0) { - char *base_uri, dir_sep, *folder, *p; + gchar *base_uri, dir_sep, *folder, *p; struct _account_info_1_0 *ai; /* add namespace, canonicalise dir_sep to / */ @@ -318,7 +318,7 @@ upgrade_xml_uris_1_0 (const char *uri) folder = g_strdup (uri + strlen (base_uri) + 1); /* Add the namespace before the mailbox name, unless the mailbox is INBOX */ - if (ai->u.imap.namespace && strcmp ((char *)folder, "INBOX") != 0) + if (ai->u.imap.namespace && strcmp ((gchar *)folder, "INBOX") != 0) out = g_strdup_printf ("%s/%s/%s", base_uri, ai->u.imap.namespace, folder); else out = g_strdup_printf ("%s/%s", base_uri, folder); @@ -333,7 +333,7 @@ upgrade_xml_uris_1_0 (const char *uri) g_free (folder); g_free (base_uri); } else if (strncmp (uri, "exchange:", 9) == 0) { - char *base_uri, *folder, *p; + gchar *base_uri, *folder, *p; /* exchange://user@host/exchange/ * -> exchange://user@host/personal/ * */ /* Any url encoding (%xx) in the folder name is also removed */ @@ -353,10 +353,10 @@ upgrade_xml_uris_1_0 (const char *uri) return out; } -static char * -parse_lsub (const char *lsub, char *dir_sep) +static gchar * +parse_lsub (const gchar *lsub, gchar *dir_sep) { - static int comp; + static gint comp; static regex_t pat; regmatch_t match[3]; const gchar *m = "^\\* LSUB \\([^)]*\\) \"?([^\" ]+)\"? \"?(.*)\"?$"; @@ -385,7 +385,7 @@ read_imap_storeinfo (struct _account_info_1_0 *si) { FILE *storeinfo; guint32 tmp; - char *buf, *folder, dir_sep, *path, *name, *p; + gchar *buf, *folder, dir_sep, *path, *name, *p; struct _imap_folder_info_1_0 *fi; si->u.imap.folders = g_hash_table_new_full ( @@ -398,7 +398,7 @@ read_imap_storeinfo (struct _account_info_1_0 *si) if (name) { name = strstr (si->uri, ";namespace="); if (name) { - char *end; + gchar *end; name += strlen (";namespace="); if (*name == '\"') { @@ -480,9 +480,9 @@ static int load_accounts_1_0 (xmlDocPtr doc) { xmlNodePtr source; - char *val, *tmp; - int count = 0, i; - char key[32]; + gchar *val, *tmp; + gint count = 0, i; + gchar key[32]; if (!(source = e_bconf_get_path (doc, "/Mail/Accounts"))) return 0; @@ -495,7 +495,7 @@ load_accounts_1_0 (xmlDocPtr doc) /* load account upgrade info for each account */ for (i = 0; i < count; i++) { struct _account_info_1_0 *ai; - char *rawuri; + gchar *rawuri; sprintf (key, "source_url_%d", i); if (!(rawuri = e_bconf_get_value (source, key))) @@ -519,11 +519,11 @@ load_accounts_1_0 (xmlDocPtr doc) - this will be picked up later in the conversion */ sprintf (key, "transport_url_%d", i); node = e_bconf_get_entry (source, key); - if (node && (val = (char *)xmlGetProp (node, (const unsigned char *)"value"))) { + if (node && (val = (gchar *)xmlGetProp (node, (const guchar *)"value"))) { tmp = e_bconf_hex_decode (val); xmlFree (val); if (strncmp (tmp, "exchanget:", 10) == 0) - xmlSetProp (node, (const unsigned char *)"value", (unsigned char *)rawuri); + xmlSetProp (node, (const guchar *)"value", (guchar *)rawuri); g_free (tmp); } else { d(printf (" couldn't find transport uri?\n")); @@ -540,7 +540,7 @@ load_accounts_1_0 (xmlDocPtr doc) } static int -em_migrate_1_0 (const char *evolution_dir, xmlDocPtr config_xmldb, xmlDocPtr filters, xmlDocPtr vfolders, CamelException *ex) +em_migrate_1_0 (const gchar *evolution_dir, xmlDocPtr config_xmldb, xmlDocPtr filters, xmlDocPtr vfolders, CamelException *ex) { accounts_1_0 = g_hash_table_new_full ( g_str_hash, g_str_equal, @@ -560,13 +560,13 @@ em_migrate_1_0 (const char *evolution_dir, xmlDocPtr config_xmldb, xmlDocPtr fil /* 1.2 upgrade functions */ static int -is_xml1encoded (const char *txt) +is_xml1encoded (const gchar *txt) { - const unsigned char *p; - int isxml1 = FALSE; - int is8bit = FALSE; + const guchar *p; + gint isxml1 = FALSE; + gint is8bit = FALSE; - p = (const unsigned char *)txt; + p = (const guchar *)txt; while (*p) { if (p[0] == '\\' && p[1] == 'U' && p[2] == '+' && isxdigit (p[3]) && isxdigit (p[4]) && isxdigit (p[5]) && isxdigit (p[6]) @@ -585,24 +585,24 @@ is_xml1encoded (const char *txt) return isxml1; } -static char * -decode_xml1 (const char *txt) +static gchar * +decode_xml1 (const gchar *txt) { GString *out = g_string_new (""); - const unsigned char *p; - char *res; + const guchar *p; + gchar *res; /* convert: \U+XXXX\ -> utf8 8 bit characters -> utf8 (iso-8859-1) */ - p = (const unsigned char *) txt; + p = (const guchar *) txt; while (*p) { if (p[0] > 0x80 || (p[0] == '\\' && p[1] == 'U' && p[2] == '+' && isxdigit (p[3]) && isxdigit (p[4]) && isxdigit (p[5]) && isxdigit (p[6]) && p[7] == '\\')) { - char utf8[8]; + gchar utf8[8]; gunichar u; if (p[0] == '\\') { @@ -626,12 +626,12 @@ decode_xml1 (const char *txt) return res; } -static char * -utf8_reencode (const char *txt) +static gchar * +utf8_reencode (const gchar *txt) { GString *out = g_string_new (""); gchar *p; - char *res; + gchar *res; /* convert: libxml1 8 bit utf8 converted to xml entities byte-by-byte chars -> utf8 */ @@ -656,13 +656,13 @@ utf8_reencode (const char *txt) static int upgrade_xml_1_2_rec (xmlNodePtr node) { - const char *value_tags[] = { "string", "address", "regex", "file", "command", NULL }; - const char *rule_tags[] = { "title", NULL }; - const char *item_props[] = { "name", NULL }; + const gchar *value_tags[] = { "string", "address", "regex", "file", "command", NULL }; + const gchar *rule_tags[] = { "title", NULL }; + const gchar *item_props[] = { "name", NULL }; struct { - const char *name; - const char **tags; - const char **props; + const gchar *name; + const gchar **tags; + const gchar **props; } tags[] = { { "value", value_tags, NULL }, { "rule", rule_tags, NULL }, @@ -670,24 +670,24 @@ upgrade_xml_1_2_rec (xmlNodePtr node) { 0 }, }; xmlNodePtr work; - int i,j; - char *txt, *tmp; + gint i,j; + gchar *txt, *tmp; /* upgrades the content of a node, if the node has a specific parent/node name */ for (i = 0; tags[i].name; i++) { - if (!strcmp ((char *)node->name, tags[i].name)) { + if (!strcmp ((gchar *)node->name, tags[i].name)) { if (tags[i].tags != NULL) { work = node->children; while (work) { for (j = 0; tags[i].tags[j]; j++) { - if (!strcmp ((char *)work->name, tags[i].tags[j])) { - txt = (char *)xmlNodeGetContent (work); + if (!strcmp ((gchar *)work->name, tags[i].tags[j])) { + txt = (gchar *)xmlNodeGetContent (work); if (is_xml1encoded (txt)) { tmp = decode_xml1 (txt); d(printf ("upgrading xml node %s/%s '%s' -> '%s'\n", tags[i].name, tags[i].tags[j], txt, tmp)); - xmlNodeSetContent (work, (unsigned char *)tmp); + xmlNodeSetContent (work, (guchar *)tmp); g_free (tmp); } xmlFree (txt); @@ -700,11 +700,11 @@ upgrade_xml_1_2_rec (xmlNodePtr node) if (tags[i].props != NULL) { for (j = 0; tags[i].props[j]; j++) { - txt = (char *)xmlGetProp (node, (unsigned char *)tags[i].props[j]); + txt = (gchar *)xmlGetProp (node, (guchar *)tags[i].props[j]); tmp = utf8_reencode (txt); d(printf ("upgrading xml property %s on node %s '%s' -> '%s'\n", tags[i].props[j], tags[i].name, txt, tmp)); - xmlSetProp (node, (const unsigned char *)tags[i].props[j], (unsigned char *)tmp); + xmlSetProp (node, (const guchar *)tags[i].props[j], (guchar *)tmp); g_free (tmp); xmlFree (txt); } @@ -967,10 +967,10 @@ static int bconf_import(GConfClient *gconf, xmlDocPtr config_xmldb) { xmlNodePtr source; - char labx[16], colx[16]; - char *val, *lab, *col; + gchar labx[16], colx[16]; + gchar *val, *lab, *col; GSList *list, *l; - int i; + gint i; e_bconf_import(gconf, config_xmldb, gconf_remap_list); @@ -1018,7 +1018,7 @@ bconf_import(GConfClient *gconf, xmlDocPtr config_xmldb) } static int -em_migrate_1_2(const char *evolution_dir, xmlDocPtr config_xmldb, xmlDocPtr filters, xmlDocPtr vfolders, CamelException *ex) +em_migrate_1_2(const gchar *evolution_dir, xmlDocPtr config_xmldb, xmlDocPtr filters, xmlDocPtr vfolders, CamelException *ex) { GConfClient *gconf; @@ -1043,7 +1043,7 @@ typedef struct _EMMigrateSession { CamelSession parent_object; CamelStore *store; /* new folder tree store */ - char *srcdir; /* old folder tree path */ + gchar *srcdir; /* old folder tree path */ } EMMigrateSession; typedef struct _EMMigrateSessionClass { @@ -1052,7 +1052,7 @@ typedef struct _EMMigrateSessionClass { } EMMigrateSessionClass; static CamelType em_migrate_session_get_type (void); -static CamelSession *em_migrate_session_new (const char *path); +static CamelSession *em_migrate_session_new (const gchar *path); static void class_init (EMMigrateSessionClass *klass) @@ -1081,7 +1081,7 @@ em_migrate_session_get_type (void) } static CamelSession * -em_migrate_session_new (const char *path) +em_migrate_session_new (const gchar *path) { CamelSession *session; @@ -1100,7 +1100,7 @@ static GtkLabel *label; static GtkProgressBar *progress; static void -em_migrate_setup_progress_dialog (const char *title, const char *desc) +em_migrate_setup_progress_dialog (const gchar *title, const gchar *desc) { GtkWidget *vbox, *hbox, *w; gchar *markup; @@ -1162,7 +1162,7 @@ em_migrate_close_progress_dialog (void) } static void -em_migrate_set_folder_name (const char *folder_name) +em_migrate_set_folder_name (const gchar *folder_name) { gchar *text; @@ -1178,7 +1178,7 @@ em_migrate_set_folder_name (const char *folder_name) static void em_migrate_set_progress (double percent) { - char text[5]; + gchar text[5]; snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f)); @@ -1192,11 +1192,11 @@ em_migrate_set_progress (double percent) #ifndef G_OS_WIN32 static gboolean -is_mail_folder (const char *metadata) +is_mail_folder (const gchar *metadata) { xmlNodePtr node; xmlDocPtr doc; - char *type; + gchar *type; if (!(doc = xmlParseFile (metadata))) { g_warning ("Cannot parse `%s'", metadata); @@ -1209,7 +1209,7 @@ is_mail_folder (const char *metadata) return FALSE; } - if (!node->name || strcmp ((char *)node->name, "efolder") != 0) { + if (!node->name || strcmp ((gchar *)node->name, "efolder") != 0) { g_warning ("`%s' corrupt: root node is not 'efolder'", metadata); xmlFreeDoc (doc); return FALSE; @@ -1217,9 +1217,9 @@ is_mail_folder (const char *metadata) node = node->children; while (node != NULL) { - if (node->name && !strcmp ((char *)node->name, "type")) { - type = (char *)xmlNodeGetContent (node); - if (!strcmp ((char *)type, "mail")) { + if (node->name && !strcmp ((gchar *)node->name, "type")) { + type = (gchar *)xmlNodeGetContent (node); + if (!strcmp ((gchar *)type, "mail")) { xmlFreeDoc (doc); xmlFree (type); @@ -1240,13 +1240,13 @@ is_mail_folder (const char *metadata) } static int -get_local_et_expanded (const char *dirname) +get_local_et_expanded (const gchar *dirname) { xmlNodePtr node; xmlDocPtr doc; struct stat st; - char *buf, *p; - int thread_list; + gchar *buf, *p; + gint thread_list; buf = g_strdup_printf ("%s/evolution/config/file:%s", g_get_home_dir (), dirname); p = buf + strlen (g_get_home_dir ()) + strlen ("/evolution/config/file:"); @@ -1264,12 +1264,12 @@ get_local_et_expanded (const char *dirname) g_free (buf); - if (!(node = xmlDocGetRootElement (doc)) || strcmp ((char *)node->name, "expanded_state") != 0) { + if (!(node = xmlDocGetRootElement (doc)) || strcmp ((gchar *)node->name, "expanded_state") != 0) { xmlFreeDoc (doc); return -1; } - if (!(buf = (char *)xmlGetProp (node, (const unsigned char *)"default"))) { + if (!(buf = (gchar *)xmlGetProp (node, (const guchar *)"default"))) { xmlFreeDoc (doc); return -1; } @@ -1282,11 +1282,11 @@ get_local_et_expanded (const char *dirname) return thread_list; } -static char * -get_local_store_uri (const char *dirname, char **namep, int *indexp) +static gchar * +get_local_store_uri (const gchar *dirname, gchar **namep, gint *indexp) { gchar *name, *protocol, *metadata, *tmp; - int index; + gint index; struct stat st; xmlNodePtr node; xmlDocPtr doc; @@ -1308,24 +1308,24 @@ get_local_store_uri (const char *dirname, char **namep, int *indexp) goto nofile; node = doc->children; - if (strcmp((char *)node->name, "folderinfo")) + if (strcmp((gchar *)node->name, "folderinfo")) goto dodefault; for (node = node->children; node; node = node->next) { - if (node->name && !strcmp ((char *)node->name, "folder")) { - tmp = (char *)xmlGetProp (node, (const unsigned char *)"type"); + if (node->name && !strcmp ((gchar *)node->name, "folder")) { + tmp = (gchar *)xmlGetProp (node, (const guchar *)"type"); if (tmp) { protocol = alloca(strlen(tmp)+1); strcpy(protocol, tmp); xmlFree(tmp); } - tmp = (char *)xmlGetProp (node, (const unsigned char *)"name"); + tmp = (gchar *)xmlGetProp (node, (const guchar *)"name"); if (tmp) { name = alloca(strlen(tmp)+1); strcpy(name, tmp); xmlFree(tmp); } - tmp = (char *)xmlGetProp (node, (const unsigned char *)"index"); + tmp = (gchar *)xmlGetProp (node, (const guchar *)"index"); if (tmp) { index = atoi(tmp); xmlFree(tmp); @@ -1351,18 +1351,18 @@ enum { CP_APPEND }; -static int open_flags[3] = { +static gint open_flags[3] = { O_WRONLY | O_CREAT | O_TRUNC, O_WRONLY | O_CREAT | O_TRUNC, O_WRONLY | O_CREAT | O_APPEND, }; static int -cp (const char *src, const char *dest, gboolean show_progress, int mode) +cp (const gchar *src, const gchar *dest, gboolean show_progress, gint mode) { - unsigned char readbuf[65536]; + guchar readbuf[65536]; ssize_t nread, nwritten; - int errnosav, readfd, writefd; + gint errnosav, readfd, writefd; size_t total = 0; struct stat st; struct utimbuf ut; @@ -1440,7 +1440,7 @@ cp (const char *src, const char *dest, gboolean show_progress, int mode) #ifndef G_OS_WIN32 static int -cp_r (const char *src, const char *dest, const char *pattern, int mode) +cp_r (const gchar *src, const gchar *dest, const gchar *pattern, gint mode) { GString *srcpath, *destpath; struct dirent *dent; @@ -1491,10 +1491,10 @@ cp_r (const char *src, const char *dest, const char *pattern, int mode) } static void -mbox_build_filename (GString *path, const char *toplevel_dir, const char *full_name) +mbox_build_filename (GString *path, const gchar *toplevel_dir, const gchar *full_name) { - const char *start, *inptr = full_name; - int subdirs = 0; + const gchar *start, *inptr = full_name; + gint subdirs = 0; while (*inptr != '\0') { if (*inptr == '/') @@ -1525,17 +1525,17 @@ mbox_build_filename (GString *path, const char *toplevel_dir, const char *full_n } static int -em_migrate_folder(EMMigrateSession *session, const char *dirname, const char *full_name, CamelException *ex) +em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar *full_name, CamelException *ex) { CamelFolder *old_folder = NULL, *new_folder = NULL; CamelStore *local_store = NULL; - char *name, *uri; + gchar *name, *uri; GPtrArray *uids; struct stat st; - int thread_list; - int index, i; + gint thread_list; + gint index, i; GString *src, *dest; - int res = -1; + gint res = -1; src = g_string_new(""); @@ -1558,8 +1558,8 @@ em_migrate_folder(EMMigrateSession *session, const char *dirname, const char *fu static const gchar *meta_ext[] = { ".summary", ".ibex.index", ".ibex.index.data" }; size_t slen, dlen; FILE *fp; - char *p; - int mode; + gchar *p; + gint mode; g_string_printf (src, "%s/%s", uri + 5, name); mbox_build_filename (dest, ((CamelService *)session->store)->url->path, full_name); @@ -1581,7 +1581,7 @@ em_migrate_folder(EMMigrateSession *session, const char *dirname, const char *fu retry_copy: if (cp (src->str, dest->str, TRUE, mode) == -1) { if (errno == EEXIST) { - int save = errno; + gint save = errno; switch (e_error_run(NULL, "mail:ask-migrate-existing", src->str, dest->str, NULL)) { case GTK_RESPONSE_ACCEPT: @@ -1607,7 +1607,7 @@ em_migrate_folder(EMMigrateSession *session, const char *dirname, const char *fu g_string_truncate (dest, dlen); g_string_append (dest, ".cmeta"); if ((fp = fopen (dest->str, "w")) != NULL) { - int fd = fileno (fp); + gint fd = fileno (fp); /* write the magic string */ if (fwrite ("CLMD", 4, 1, fp) != 1) @@ -1723,13 +1723,13 @@ fatal: } static int -em_migrate_dir (EMMigrateSession *session, const char *dirname, const char *full_name, CamelException *ex) +em_migrate_dir (EMMigrateSession *session, const gchar *dirname, const gchar *full_name, CamelException *ex) { - char *path; + gchar *path; DIR *dir; struct stat st; struct dirent *dent; - int res = 0; + gint res = 0; if (em_migrate_folder(session, dirname, full_name, ex) == -1) return -1; @@ -1747,8 +1747,8 @@ em_migrate_dir (EMMigrateSession *session, const char *dirname, const char *full } while (res == 0 && (dent = readdir (dir))) { - char *full_path; - char *name; + gchar *full_path; + gchar *name; if (dent->d_name[0] == '.') continue; @@ -1778,7 +1778,7 @@ em_migrate_local_folders_1_4 (EMMigrateSession *session, CamelException *ex) struct dirent *dent; struct stat st; DIR *dir; - int res = 0; + gint res = 0; if (!(dir = opendir (session->srcdir))) { camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, @@ -1792,7 +1792,7 @@ em_migrate_local_folders_1_4 (EMMigrateSession *session, CamelException *ex) "patient while Evolution migrates your folders...")); while (res == 0 && (dent = readdir (dir))) { - char *full_path; + gchar *full_path; if (dent->d_name[0] == '.') continue; @@ -1814,10 +1814,10 @@ em_migrate_local_folders_1_4 (EMMigrateSession *session, CamelException *ex) return res; } -static char * -upgrade_xml_uris_1_4 (const char *uri) +static gchar * +upgrade_xml_uris_1_4 (const gchar *uri) { - char *path, *prefix, *p; + gchar *path, *prefix, *p; CamelURL *url; if (!strncmp (uri, "file:", 5)) { @@ -1866,7 +1866,7 @@ upgrade_vfolder_sources_1_4 (xmlDocPtr doc) if (!doc || !(root = xmlDocGetRootElement (doc))) return; - if (!root->name || strcmp ((char *)root->name, "filteroptions") != 0) { + if (!root->name || strcmp ((gchar *)root->name, "filteroptions") != 0) { /* root node is not , nothing to upgrade */ return; } @@ -1878,19 +1878,19 @@ upgrade_vfolder_sources_1_4 (xmlDocPtr doc) node = node->children; while (node != NULL) { - if (node->name && !strcmp ((char *)node->name, "rule")) { + if (node->name && !strcmp ((gchar *)node->name, "rule")) { xmlNodePtr sources; - char *src; + gchar *src; - if (!(src = (char *)xmlGetProp (node, (const unsigned char *)"source"))) - src = (char *)xmlStrdup ((const unsigned char *)"local"); /* default to all local folders? */ + if (!(src = (gchar *)xmlGetProp (node, (const guchar *)"source"))) + src = (gchar *)xmlStrdup ((const guchar *)"local"); /* default to all local folders? */ - xmlSetProp (node, (const unsigned char *)"source", (const unsigned char *)"incoming"); + xmlSetProp (node, (const guchar *)"source", (const guchar *)"incoming"); if (!(sources = xml_find_node (node, "sources"))) - sources = xmlNewChild (node, NULL, (const unsigned char *)"sources", NULL); + sources = xmlNewChild (node, NULL, (const guchar *)"sources", NULL); - xmlSetProp (sources, (const unsigned char *)"with", (unsigned char *)src); + xmlSetProp (sources, (const guchar *)"with", (guchar *)src); xmlFree (src); } @@ -1898,14 +1898,14 @@ upgrade_vfolder_sources_1_4 (xmlDocPtr doc) } } -static char * -get_nth_sig (int id) +static gchar * +get_nth_sig (gint id) { ESignatureList *list; ESignature *sig; EIterator *iter; - char *uid = NULL; - int i = 0; + gchar *uid = NULL; + gint i = 0; list = mail_config_get_signatures (); iter = e_list_get_iterator ((EList *) list); @@ -1937,7 +1937,7 @@ em_upgrade_accounts_1_4 (void) iter = e_list_get_iterator ((EList *) accounts); while (e_iterator_is_valid (iter)) { EAccount *account = (EAccount *) e_iterator_get (iter); - char *url; + gchar *url; if (account->drafts_folder_uri) { url = upgrade_xml_uris_1_4 (account->drafts_folder_uri); @@ -1952,7 +1952,7 @@ em_upgrade_accounts_1_4 (void) } if (account->id->sig_uid && !strncmp (account->id->sig_uid, "::", 2)) { - int sig_id; + gint sig_id; sig_id = strtol (account->id->sig_uid + 2, NULL, 10); g_free (account->id->sig_uid); @@ -1968,14 +1968,14 @@ em_upgrade_accounts_1_4 (void) } static int -em_migrate_pop_uid_caches_1_4 (const char *evolution_dir, CamelException *ex) +em_migrate_pop_uid_caches_1_4 (const gchar *evolution_dir, CamelException *ex) { GString *oldpath, *newpath; struct dirent *dent; size_t olen, nlen; - char *cache_dir; + gchar *cache_dir; DIR *dir; - int res = 0; + gint res = 0; /* Sigh, too many unique strings to translate, for cases which shouldn't ever happen */ @@ -2047,9 +2047,9 @@ em_migrate_pop_uid_caches_1_4 (const char *evolution_dir, CamelException *ex) } static int -em_migrate_imap_caches_1_4 (const char *evolution_dir, CamelException *ex) +em_migrate_imap_caches_1_4 (const gchar *evolution_dir, CamelException *ex) { - char *src, *dest; + gchar *src, *dest; struct stat st; src = g_build_filename (g_get_home_dir (), "evolution", "mail", "imap", NULL); @@ -2070,11 +2070,11 @@ em_migrate_imap_caches_1_4 (const char *evolution_dir, CamelException *ex) } static int -em_migrate_folder_expand_state_1_4 (const char *evolution_dir, CamelException *ex) +em_migrate_folder_expand_state_1_4 (const gchar *evolution_dir, CamelException *ex) { GString *srcpath, *destpath; size_t slen, dlen, rlen; - char *evo14_mbox_root; + gchar *evo14_mbox_root; struct dirent *dent; struct stat st; DIR *dir; @@ -2107,8 +2107,8 @@ em_migrate_folder_expand_state_1_4 (const char *evolution_dir, CamelException *e evo14_mbox_root[rlen] = '\0'; while ((dent = readdir (dir))) { - char *full_name, *inptr, *buf = NULL; - const char *filename; + gchar *full_name, *inptr, *buf = NULL; + const gchar *filename; GString *new; if (strncmp (dent->d_name, "et-expanded-", 12) != 0) @@ -2168,11 +2168,11 @@ em_migrate_folder_expand_state_1_4 (const char *evolution_dir, CamelException *e } static int -em_migrate_folder_view_settings_1_4 (const char *evolution_dir, CamelException *ex) +em_migrate_folder_view_settings_1_4 (const gchar *evolution_dir, CamelException *ex) { GString *srcpath, *destpath; size_t slen, dlen, rlen; - char *evo14_mbox_root; + gchar *evo14_mbox_root; struct dirent *dent; struct stat st; DIR *dir; @@ -2205,8 +2205,8 @@ em_migrate_folder_view_settings_1_4 (const char *evolution_dir, CamelException * evo14_mbox_root[rlen] = '\0'; while ((dent = readdir (dir))) { - char *full_name, *inptr, *buf = NULL; - const char *filename, *ext; + gchar *full_name, *inptr, *buf = NULL; + const gchar *filename, *ext; size_t prelen = 0; GString *new; @@ -2216,7 +2216,7 @@ em_migrate_folder_view_settings_1_4 (const char *evolution_dir, CamelException * if (!(ext = strrchr (dent->d_name, '.'))) continue; - if (!strcmp (ext, ".galview") || !strcmp ((char *)dent->d_name, "galview.xml")) { + if (!strcmp (ext, ".galview") || !strcmp ((gchar *)dent->d_name, "galview.xml")) { /* just copy the file */ filename = dent->d_name; goto copy; @@ -2224,9 +2224,9 @@ em_migrate_folder_view_settings_1_4 (const char *evolution_dir, CamelException * continue; } - if (!strncmp ((const char *)dent->d_name, "current_view-", 13)) { + if (!strncmp ((const gchar *)dent->d_name, "current_view-", 13)) { prelen = 13; - } else if (!strncmp ((const char *)dent->d_name, "custom_view-", 12)) { + } else if (!strncmp ((const gchar *)dent->d_name, "custom_view-", 12)) { prelen = 12; } else { /* huh? wtf is this file? */ @@ -2292,14 +2292,14 @@ em_migrate_folder_view_settings_1_4 (const char *evolution_dir, CamelException * #define SUBFOLDER_DIR_NAME "subfolders" #define SUBFOLDER_DIR_NAME_LEN 10 -static char * -e_path_to_physical (const char *prefix, const char *vpath) +static gchar * +e_path_to_physical (const gchar *prefix, const gchar *vpath) { - const char *p, *newp; - char *dp; - char *ppath; - int ppath_len; - int prefix_len; + const gchar *p, *newp; + gchar *dp; + gchar *ppath; + gint ppath_len; + gint prefix_len; while (*vpath == '/') vpath++; @@ -2368,7 +2368,7 @@ e_path_to_physical (const char *prefix, const char *vpath) } static int -em_migrate_imap_cmeta_1_4(const char *evolution_dir, CamelException *ex) +em_migrate_imap_cmeta_1_4(const gchar *evolution_dir, CamelException *ex) { GConfClient *gconf; GSList *paths, *p; @@ -2381,7 +2381,7 @@ em_migrate_imap_cmeta_1_4(const char *evolution_dir, CamelException *ex) gconf = gconf_client_get_default(); paths = gconf_client_get_list(gconf, "/apps/evolution/shell/offline/folder_paths", GCONF_VALUE_STRING, NULL); for (p = paths;p;p = g_slist_next(p)) { - char *name, *path; + gchar *name, *path; name = p->data; if (*name) @@ -2394,7 +2394,7 @@ em_migrate_imap_cmeta_1_4(const char *evolution_dir, CamelException *ex) CamelURL *url = camel_url_new(account->source->url, NULL); if (url) { - char *dir, *base; + gchar *dir, *base; base = g_strdup_printf("%s/mail/imap/%s@%s/folders", evolution_dir, @@ -2403,7 +2403,7 @@ em_migrate_imap_cmeta_1_4(const char *evolution_dir, CamelException *ex) dir = e_path_to_physical(base, path); if (g_mkdir_with_parents(dir, 0777) == 0) { - char *cmeta; + gchar *cmeta; FILE *fp; cmeta = g_build_filename(dir, "cmeta", NULL); @@ -2455,7 +2455,7 @@ remove_system_searches(xmlDocPtr searches) * searchtypes.xml file instead */ node = xmlDocGetRootElement(searches); - if (!node->name || strcmp((char *)node->name, "filteroptions")) + if (!node->name || strcmp((gchar *)node->name, "filteroptions")) return; if (!(node = xml_find_node(node, "ruleset"))) @@ -2465,11 +2465,11 @@ remove_system_searches(xmlDocPtr searches) while (node != NULL) { xmlNodePtr nnode = node->next; - if (node->name && !strcmp ((char *)node->name, "rule")) { - char *src; + if (node->name && !strcmp ((gchar *)node->name, "rule")) { + gchar *src; - src = (char *)xmlGetProp(node, (unsigned char *)"source"); - if (src && !strcmp((char *)src, "demand")) { + src = (gchar *)xmlGetProp(node, (guchar *)"source"); + if (src && !strcmp((gchar *)src, "demand")) { xmlUnlinkNode(node); xmlFreeNodeList(node); } @@ -2481,12 +2481,12 @@ remove_system_searches(xmlDocPtr searches) } static int -em_migrate_1_4 (const char *evolution_dir, xmlDocPtr filters, xmlDocPtr vfolders, CamelException *ex) +em_migrate_1_4 (const gchar *evolution_dir, xmlDocPtr filters, xmlDocPtr vfolders, CamelException *ex) { EMMigrateSession *session; CamelException lex; struct stat st; - char *path; + gchar *path; xmlDocPtr searches; path = g_build_filename (evolution_dir, "mail", NULL); @@ -2581,7 +2581,7 @@ em_update_accounts_2_11 (void) if (g_str_has_prefix (account->source->url, "spool://")) { if (g_file_test (account->source->url + 8, G_FILE_TEST_IS_DIR)) { - char *str = g_strdup_printf ("spooldir://%s", account->source->url + 8); + gchar *str = g_strdup_printf ("spooldir://%s", account->source->url + 8); g_free (account->source->url); account->source->url = str; @@ -2601,11 +2601,11 @@ em_update_accounts_2_11 (void) #endif /* !G_OS_WIN32 */ static int -emm_setup_initial(const char *evolution_dir) +emm_setup_initial(const gchar *evolution_dir) { GDir *dir; - const char *d; - char *local = NULL, *base; + const gchar *d; + gchar *local = NULL, *base; const gchar * const *language_names; /* special-case - this means brand new install of evolution */ @@ -2637,7 +2637,7 @@ emm_setup_initial(const char *evolution_dir) dir = g_dir_open(local, 0, NULL); if (dir) { while ((d = g_dir_read_name(dir))) { - char *src, *dest; + gchar *src, *dest; src = g_build_filename(local, d, NULL); dest = g_build_filename(base, d, NULL); @@ -2750,7 +2750,7 @@ em_update_sa_junk_setting_2_23 (void) key = gconf_client_get (client, "/apps/evolution/mail/junk/default_plugin", NULL); if (key) { - const char *str = gconf_value_get_string (key); + const gchar *str = gconf_value_get_string (key); if (str && strcmp (str, "Spamassasin") == 0) gconf_client_set_string (client, "/apps/evolution/mail/junk/default_plugin", "SpamAssassin", NULL); @@ -2772,13 +2772,13 @@ update_progress_in_main_thread (double *progress) } static void -migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const char *acc, CamelException *ex, gboolean *done, int *nth_folder, int total_folders) +migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const gchar *acc, CamelException *ex, gboolean *done, gint *nth_folder, gint total_folders) { CamelFolder *folder; while (fi) { double progress; - char *tmp; + gchar *tmp; *nth_folder = *nth_folder + 1; @@ -2808,7 +2808,7 @@ migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const /* This could be in CamelStore.ch */ static void -count_folders (CamelFolderInfo *fi, int *count) +count_folders (CamelFolderInfo *fi, gint *count) { while (fi) { *count = *count + 1; @@ -2821,7 +2821,7 @@ static CamelStore * setup_local_store (MailComponent *mc) { CamelURL *url; - char *tmp; + gchar *tmp; CamelStore *store; url = camel_url_new("mbox:", NULL); @@ -2837,7 +2837,7 @@ setup_local_store (MailComponent *mc) } struct migrate_folders_to_db_structure { - char *account_name; + gchar *account_name; CamelException ex; CamelStore *store; CamelFolderInfo *info; @@ -2847,7 +2847,7 @@ struct migrate_folders_to_db_structure { static void migrate_folders_to_db_thread (struct migrate_folders_to_db_structure *migrate_dbs) { - int num_of_folders = 0, nth_folder = 0; + gint num_of_folders = 0, nth_folder = 0; count_folders (migrate_dbs->info, &num_of_folders); migrate_folders (migrate_dbs->store, migrate_dbs->is_local_store, migrate_dbs->info, migrate_dbs->account_name, &(migrate_dbs->ex), &(migrate_dbs->done), @@ -2859,7 +2859,7 @@ migrate_to_db() { EAccountList *accounts; EIterator *iter; - int i=0, len; + gint i=0, len; MailComponent *component = mail_component_peek (); CamelStore *store = NULL; CamelFolderInfo *info; @@ -2901,7 +2901,7 @@ migrate_to_db() while (e_iterator_is_valid (iter)) { EAccount *account = (EAccount *) e_iterator_get (iter); EAccountService *service; - const char *name; + const gchar *name; service = account->source; name = account->name; @@ -2943,11 +2943,11 @@ migrate_to_db() } -int -em_migrate (const char *evolution_dir, int major, int minor, int revision, CamelException *ex) +gint +em_migrate (const gchar *evolution_dir, gint major, gint minor, gint revision, CamelException *ex) { struct stat st; - char *path; + gchar *path; /* make sure ~/.evolution/mail exists */ path = g_build_filename (evolution_dir, "mail", NULL); diff --git a/mail/em-migrate.h b/mail/em-migrate.h index 238f4fda1c..f6d43c159a 100644 --- a/mail/em-migrate.h +++ b/mail/em-migrate.h @@ -30,7 +30,7 @@ extern "C" { #pragma } #endif /* __cplusplus */ -int em_migrate (const char *evolution_dir, int major, int minor, int revision, CamelException *ex); +gint em_migrate (const gchar *evolution_dir, gint major, gint minor, gint revision, CamelException *ex); #ifdef __cplusplus } diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c index b0c51ed863..47df87a062 100644 --- a/mail/em-network-prefs.c +++ b/mail/em-network-prefs.c @@ -132,7 +132,7 @@ em_network_prefs_destroy (GtkObject *obj) static void toggle_button_toggled (GtkToggleButton *toggle, EMNetworkPrefs *prefs) { - const char *key; + const gchar *key; key = g_object_get_data ((GObject *) toggle, "key"); gconf_client_set_bool (prefs->gconf, key, gtk_toggle_button_get_active (toggle), NULL); @@ -146,14 +146,14 @@ toggle_button_toggled (GtkToggleButton *toggle, EMNetworkPrefs *prefs) } static void -toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const char *key) +toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const gchar *key) { gboolean bool; bool = gconf_client_get_bool (prefs->gconf, key, NULL); gtk_toggle_button_set_active (toggle, bool); - g_object_set_data ((GObject *) toggle, "key", (void *) key); + g_object_set_data ((GObject *) toggle, "key", (gpointer) key); g_signal_connect (toggle, "toggled", G_CALLBACK (toggle_button_toggled), prefs); if (!gconf_client_key_is_writable (prefs->gconf, key, NULL)) @@ -161,7 +161,7 @@ toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const char * } static GtkWidget * -emnp_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) +emnp_widget_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) { EMNetworkPrefs *prefs = data; @@ -210,7 +210,7 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs, NetworkConfigProxyType type, gboo static void notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs) { - int type; + gint type; if (gtk_toggle_button_get_active (prefs->sys_proxy)) type = NETWORK_PROXY_SYS_SETTINGS; @@ -249,8 +249,8 @@ notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs) static void widget_entry_changed_cb (GtkWidget *widget, gpointer data) { - const char *value; - int port = -1; + const gchar *value; + gint port = -1; GConfClient *gconf = mail_config_get_gconf_client (); /* @@ -259,12 +259,12 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data) */ if (GTK_IS_SPIN_BUTTON (widget)) { port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget)); - gconf_client_set_int (gconf, (const char *)data, port, NULL); - d(g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, (const char *)data, port)); + gconf_client_set_int (gconf, (const gchar *)data, port, NULL); + d(g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, (const gchar *)data, port)); } else if (GTK_IS_ENTRY (widget)) { value = gtk_entry_get_text (GTK_ENTRY (widget)); - gconf_client_set_string (gconf, (const char *)data, value, NULL); - d(g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, (const char *)data, value)); + gconf_client_set_string (gconf, (const gchar *)data, value, NULL); + d(g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, (const gchar *)data, value)); } } @@ -277,7 +277,7 @@ static EMConfigItem emnp_items[] = { }; static void -emnp_free(EConfig *ec, GSList *items, void *data) +emnp_free(EConfig *ec, GSList *items, gpointer data) { /* the prefs data is freed automagically */ @@ -301,12 +301,12 @@ em_network_prefs_construct (EMNetworkPrefs *prefs) GtkWidget *toplevel; GladeXML *gui; GSList* l; - char *buf; + gchar *buf; EMConfig *ec; EMConfigTargetPrefs *target; gboolean locked; - int i, val, port; - char *gladefile; + gint i, val, port; + gchar *gladefile; prefs->gconf = mail_config_get_gconf_client (); diff --git a/mail/em-popup.c b/mail/em-popup.c index ad738fca57..5caabca171 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -55,7 +55,7 @@ #include #include "e-attachment.h" -static void emp_standard_menu_factory(EPopup *emp, void *data); +static void emp_standard_menu_factory(EPopup *emp, gpointer data); static GObjectClass *emp_parent; @@ -135,7 +135,7 @@ em_popup_get_type(void) return type; } -EMPopup *em_popup_new(const char *menuid) +EMPopup *em_popup_new(const gchar *menuid) { EMPopup *emp = g_object_new(em_popup_get_type(), NULL); @@ -155,14 +155,14 @@ EMPopup *em_popup_new(const char *menuid) * Return value: **/ EMPopupTargetSelect * -em_popup_target_new_select(EMPopup *emp, struct _CamelFolder *folder, const char *folder_uri, GPtrArray *uids) +em_popup_target_new_select(EMPopup *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids) { EMPopupTargetSelect *t = e_popup_target_new(&emp->popup, EM_POPUP_TARGET_SELECT, sizeof(*t)); CamelStore *store = CAMEL_STORE (folder->parent_store); guint32 mask = ~0; gboolean draft_or_outbox; - int i; - const char *tmp; + gint i; + const gchar *tmp; t->uids = uids; t->folder = folder; @@ -251,7 +251,7 @@ em_popup_target_new_select(EMPopup *emp, struct _CamelFolder *folder, const char } EMPopupTargetURI * -em_popup_target_new_uri(EMPopup *emp, const char *uri) +em_popup_target_new_uri(EMPopup *emp, const gchar *uri) { EMPopupTargetURI *t = e_popup_target_new(&emp->popup, EM_POPUP_TARGET_URI, sizeof(*t)); guint32 mask = ~0; @@ -273,7 +273,7 @@ em_popup_target_new_uri(EMPopup *emp, const char *uri) } EMPopupTargetPart * -em_popup_target_new_part(EMPopup *emp, struct _CamelMimePart *part, const char *mime_type) +em_popup_target_new_part(EMPopup *emp, struct _CamelMimePart *part, const gchar *mime_type) { EMPopupTargetPart *t = e_popup_target_new(&emp->popup, EM_POPUP_TARGET_PART, sizeof(*t)); guint32 mask = ~0; @@ -300,7 +300,7 @@ em_popup_target_new_part(EMPopup *emp, struct _CamelMimePart *part, const char * /* TODO: This should be based on the CamelFolderInfo, but ... em-folder-tree doesn't keep it? */ EMPopupTargetFolder * -em_popup_target_new_folder (EMPopup *emp, const char *uri, guint32 info_flags, guint32 popup_flags) +em_popup_target_new_folder (EMPopup *emp, const gchar *uri, guint32 info_flags, guint32 popup_flags) { EMPopupTargetFolder *t = e_popup_target_new(&emp->popup, EM_POPUP_TARGET_FOLDER, sizeof(*t)); guint32 mask = ~0; @@ -318,7 +318,7 @@ em_popup_target_new_folder (EMPopup *emp, const char *uri, guint32 info_flags, g goto done; if (!(popup_flags & EM_POPUP_FOLDER_STORE)) { - const char *path; + const gchar *path; if (popup_flags & EM_POPUP_FOLDER_DELETE) mask &= ~EM_POPUP_FOLDER_DELETE; @@ -354,7 +354,7 @@ done: /* ********************************************************************** */ static void -emp_part_popup_saveas(EPopup *ep, EPopupItem *item, void *data) +emp_part_popup_saveas(EPopup *ep, EPopupItem *item, gpointer data) { EPopupTarget *t = ep->target; CamelMimePart *part = NULL; @@ -365,12 +365,12 @@ emp_part_popup_saveas(EPopup *ep, EPopupItem *item, void *data) } static void -emp_part_popup_set_background(EPopup *ep, EPopupItem *item, void *data) +emp_part_popup_set_background(EPopup *ep, EPopupItem *item, gpointer data) { EPopupTarget *t = ep->target; GConfClient *gconf; - char *str, *filename, *path, *extension; - unsigned int i=1; + gchar *str, *filename, *path, *extension; + guint i=1; CamelMimePart *part = NULL; part = ((EMPopupTargetPart *) t)->part; @@ -399,7 +399,7 @@ emp_part_popup_set_background(EPopup *ep, EPopupItem *item, void *data) /* if file exists, stick a (number) on the end */ while (g_file_test(path, G_FILE_TEST_EXISTS)) { - char *name; + gchar *name; name = g_strdup_printf(extension?"%s (%d).%s":"%s (%d)", filename, i++, extension); g_free(path); path = g_build_filename(g_get_home_dir(), ".gnome2", "wallpapers", name, NULL); @@ -438,7 +438,7 @@ emp_part_popup_set_background(EPopup *ep, EPopupItem *item, void *data) } static void -emp_part_popup_reply_sender(EPopup *ep, EPopupItem *item, void *data) +emp_part_popup_reply_sender(EPopup *ep, EPopupItem *item, gpointer data) { EPopupTarget *t = ep->target; CamelMimeMessage *message; @@ -451,7 +451,7 @@ emp_part_popup_reply_sender(EPopup *ep, EPopupItem *item, void *data) } static void -emp_part_popup_reply_list (EPopup *ep, EPopupItem *item, void *data) +emp_part_popup_reply_list (EPopup *ep, EPopupItem *item, gpointer data) { EPopupTarget *t = ep->target; CamelMimeMessage *message; @@ -464,7 +464,7 @@ emp_part_popup_reply_list (EPopup *ep, EPopupItem *item, void *data) } static void -emp_part_popup_reply_all (EPopup *ep, EPopupItem *item, void *data) +emp_part_popup_reply_all (EPopup *ep, EPopupItem *item, gpointer data) { EPopupTarget *t = ep->target; CamelMimeMessage *message; @@ -477,7 +477,7 @@ emp_part_popup_reply_all (EPopup *ep, EPopupItem *item, void *data) } static void -emp_part_popup_forward (EPopup *ep, EPopupItem *item, void *data) +emp_part_popup_forward (EPopup *ep, EPopupItem *item, gpointer data) { EPopupTarget *t = ep->target; CamelMimeMessage *message; @@ -506,7 +506,7 @@ static const EPopupItem emp_standard_part_apps_bar = { E_POPUP_BAR, (gchar *) "9 /* ********************************************************************** */ static void -emp_uri_popup_link_open(EPopup *ep, EPopupItem *item, void *data) +emp_uri_popup_link_open(EPopup *ep, EPopupItem *item, gpointer data) { EMPopupTargetURI *t = (EMPopupTargetURI *)ep->target; @@ -515,7 +515,7 @@ emp_uri_popup_link_open(EPopup *ep, EPopupItem *item, void *data) } static void -emp_uri_popup_address_send(EPopup *ep, EPopupItem *item, void *data) +emp_uri_popup_address_send(EPopup *ep, EPopupItem *item, gpointer data) { EMPopupTargetURI *t = (EMPopupTargetURI *)ep->target; @@ -524,7 +524,7 @@ emp_uri_popup_address_send(EPopup *ep, EPopupItem *item, void *data) } static void -emp_uri_popup_address_add(EPopup *ep, EPopupItem *item, void *data) +emp_uri_popup_address_add(EPopup *ep, EPopupItem *item, gpointer data) { EMPopupTargetURI *t = (EMPopupTargetURI *)ep->target; CamelURL *url; @@ -552,9 +552,9 @@ static EPopupItem emp_standard_uri_popups[] = { #define LEN(x) (sizeof(x)/sizeof(x[0])) static void -emp_apps_open_in(EPopup *ep, EPopupItem *item, void *data) +emp_apps_open_in(EPopup *ep, EPopupItem *item, gpointer data) { - char *path; + gchar *path; EPopupTarget *target = ep->target; CamelMimePart *part; @@ -573,7 +573,7 @@ emp_apps_open_in(EPopup *ep, EPopupItem *item, void *data) g_app_info_launch (app, uris, NULL, &error); g_object_unref (file); } else { - char *uri; + gchar *uri; uri = e_util_filename_to_uri (path); uris = g_list_append (uris, uri); @@ -593,7 +593,7 @@ emp_apps_open_in(EPopup *ep, EPopupItem *item, void *data) } static void -emp_apps_popup_free(EPopup *ep, GSList *free_list, void *data) +emp_apps_popup_free(EPopup *ep, GSList *free_list, gpointer data) { while (free_list) { GSList *n = free_list->next; @@ -612,13 +612,13 @@ emp_apps_popup_free(EPopup *ep, GSList *free_list, void *data) } static void -emp_standard_items_free(EPopup *ep, GSList *items, void *data) +emp_standard_items_free(EPopup *ep, GSList *items, gpointer data) { g_slist_free(items); } static void -emp_add_vcard (EPopup *ep, EPopupItem *item, void *data) +emp_add_vcard (EPopup *ep, EPopupItem *item, gpointer data) { EPopupTarget *target = ep->target; CamelMimePart *part; @@ -649,14 +649,14 @@ emp_add_vcard (EPopup *ep, EPopupItem *item, void *data) } static void -emp_standard_menu_factory(EPopup *emp, void *data) +emp_standard_menu_factory(EPopup *emp, gpointer data) { - int i, len; + gint i, len; EPopupItem *items; GSList *menus = NULL; GList *apps = NULL; - char *mime_type = NULL; - const char *filename = NULL; + gchar *mime_type = NULL; + const gchar *filename = NULL; switch (emp->target->type) { #if 0 @@ -714,7 +714,7 @@ emp_standard_menu_factory(EPopup *emp, void *data) GSList *open_menus = NULL; GList *l; - menus = g_slist_prepend(menus, (void *)&emp_standard_part_apps_bar); + menus = g_slist_prepend(menus, (gpointer)&emp_standard_part_apps_bar); for (l = apps, i = 0; l; l = l->next, i++) { GAppInfo *app = l->data; @@ -792,7 +792,7 @@ emp_standard_menu_factory(EPopup *emp, void *data) */ -static void *emph_parent_class; +static gpointer emph_parent_class; #define emph ((EMPopupHook *)eph) static const EPopupHookTargetMask emph_select_masks[] = { @@ -859,7 +859,7 @@ emph_finalise(GObject *o) static void emph_class_init(EPluginHookClass *klass) { - int i; + gint i; ((GObjectClass *)klass)->finalize = emph_finalise; ((EPluginHookClass *)klass)->id = "org.gnome.evolution.mail.popup:1.0"; diff --git a/mail/em-popup.h b/mail/em-popup.h index cde903a4ec..dea4aee5d2 100644 --- a/mail/em-popup.h +++ b/mail/em-popup.h @@ -169,7 +169,7 @@ typedef struct _EMPopupTargetFolder EMPopupTargetFolder; **/ struct _EMPopupTargetURI { EPopupTarget target; - char *uri; + gchar *uri; }; /** @@ -187,7 +187,7 @@ struct _EMPopupTargetURI { struct _EMPopupTargetSelect { EPopupTarget target; struct _CamelFolder *folder; - char *uri; + gchar *uri; GPtrArray *uids; }; @@ -204,7 +204,7 @@ struct _EMPopupTargetSelect { **/ struct _EMPopupTargetPart { EPopupTarget target; - char *mime_type; + gchar *mime_type; struct _CamelMimePart *part; }; @@ -218,7 +218,7 @@ struct _EMPopupTargetPart { **/ struct _EMPopupTargetFolder { EPopupTarget target; - char *uri; + gchar *uri; }; typedef struct _EPopupItem EMPopupItem; @@ -236,12 +236,12 @@ struct _EMPopupClass { GType em_popup_get_type(void); -EMPopup *em_popup_new(const char *menuid); +EMPopup *em_popup_new(const gchar *menuid); -EMPopupTargetURI *em_popup_target_new_uri(EMPopup *emp, const char *uri); -EMPopupTargetSelect *em_popup_target_new_select(EMPopup *emp, struct _CamelFolder *folder, const char *folder_uri, GPtrArray *uids); -EMPopupTargetPart *em_popup_target_new_part(EMPopup *emp, struct _CamelMimePart *part, const char *mime_type); -EMPopupTargetFolder *em_popup_target_new_folder(EMPopup *emp, const char *uri, guint32 info_flags, guint32 popup_flags); +EMPopupTargetURI *em_popup_target_new_uri(EMPopup *emp, const gchar *uri); +EMPopupTargetSelect *em_popup_target_new_select(EMPopup *emp, struct _CamelFolder *folder, const gchar *folder_uri, GPtrArray *uids); +EMPopupTargetPart *em_popup_target_new_part(EMPopup *emp, struct _CamelMimePart *part, const gchar *mime_type); +EMPopupTargetFolder *em_popup_target_new_folder(EMPopup *emp, const gchar *uri, guint32 info_flags, guint32 popup_flags); /* ********************************************************************** */ diff --git a/mail/em-search-context.c b/mail/em-search-context.c index ac03d40a80..22369b4f60 100644 --- a/mail/em-search-context.c +++ b/mail/em-search-context.c @@ -33,7 +33,7 @@ #include "filter/filter-option.h" #include "filter/filter-int.h" -static FilterElement *em_search_new_element(RuleContext *rc, const char *type); +static FilterElement *em_search_new_element(RuleContext *rc, const gchar *type); static RuleContextClass *parent_class = NULL; @@ -102,7 +102,7 @@ em_search_context_new (void) } static FilterElement * -em_search_new_element(RuleContext *rc, const char *type) +em_search_new_element(RuleContext *rc, const gchar *type) { if (!strcmp (type, "system-flag")) { return (FilterElement *) filter_option_new (); diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c index 1600eeaed0..1b977e975f 100644 --- a/mail/em-stripsig-filter.c +++ b/mail/em-stripsig-filter.c @@ -34,10 +34,10 @@ static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass); static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass); -static void filter_filter (CamelMimeFilter *filter, char *in, size_t len, size_t prespace, - char **out, size_t *outlen, size_t *outprespace); -static void filter_complete (CamelMimeFilter *filter, char *in, size_t len, size_t prespace, - char **out, size_t *outlen, size_t *outprespace); +static void filter_filter (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, + gchar **out, size_t *outlen, size_t *outprespace); +static void filter_complete (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, + gchar **out, size_t *outlen, size_t *outprespace); static void filter_reset (CamelMimeFilter *filter); @@ -83,13 +83,13 @@ em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass) } static void -strip_signature (CamelMimeFilter *filter, char *in, size_t len, size_t prespace, - char **out, size_t *outlen, size_t *outprespace, int flush) +strip_signature (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, + gchar **out, size_t *outlen, size_t *outprespace, gint flush) { EMStripSigFilter *stripsig = (EMStripSigFilter *) filter; - register const char *inptr = in; - const char *inend = in + len; - const char *start = NULL; + register const gchar *inptr = in; + const gchar *inend = in + len; + const gchar *start = NULL; if (stripsig->midline) { while (inptr < inend && *inptr != '\n') @@ -132,15 +132,15 @@ strip_signature (CamelMimeFilter *filter, char *in, size_t len, size_t prespace, } static void -filter_filter (CamelMimeFilter *filter, char *in, size_t len, size_t prespace, - char **out, size_t *outlen, size_t *outprespace) +filter_filter (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, + gchar **out, size_t *outlen, size_t *outprespace) { strip_signature (filter, in, len, prespace, out, outlen, outprespace, FALSE); } static void -filter_complete (CamelMimeFilter *filter, char *in, size_t len, size_t prespace, - char **out, size_t *outlen, size_t *outprespace) +filter_complete (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, + gchar **out, size_t *outlen, size_t *outprespace) { strip_signature (filter, in, len, prespace, out, outlen, outprespace, TRUE); } diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 25c447d62e..df58c808db 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -52,7 +52,7 @@ typedef struct _EMSubscribeEditor EMSubscribeEditor; struct _EMSubscribeEditor { EDList stores; - int busy; + gint busy; guint busy_id; struct _EMSubscribe *current; /* the current one, if any */ @@ -69,14 +69,14 @@ struct _EMSubscribe { struct _EMSubscribe *next; struct _EMSubscribe *prev; - int ref_count; - int cancel; - int seq; /* upped every time we refresh */ + gint ref_count; + gint cancel; + gint seq; /* upped every time we refresh */ struct _EMSubscribeEditor *editor; /* parent object*/ - char *store_uri; - int store_id; /* looking up a store */ + gchar *store_uri; + gint store_id; /* looking up a store */ CamelStore *store; GHashTable *folders; @@ -88,16 +88,16 @@ struct _EMSubscribe { GSList *info_list; /* pending LISTs, EMSubscribeNode's */ - int pending_id; + gint pending_id; EDList pending; /* queue of pending UN/SUBSCRIBEs, EMsg's */ - int subscribe_id; + gint subscribe_id; EDList subscribe; /* working variables at runtime */ - int selected_count; - int selected_subscribed_count; + gint selected_count; + gint selected_subscribed_count; guint subscribed_state:1; /* for setting the selection*/ }; @@ -116,8 +116,8 @@ struct _MailMsgListNode { MailMsg *msg; }; -static void sub_editor_busy(EMSubscribeEditor *se, int dir); -static int sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node); +static void sub_editor_busy(EMSubscribeEditor *se, gint dir); +static gint sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node); static void sub_selection_changed(GtkTreeSelection *selection, EMSubscribe *sub); static void @@ -169,8 +169,8 @@ struct _zsubscribe_msg { EMSubscribe *sub; EMSubscribeNode *node; - int subscribe; - char *path; + gint subscribe; + gchar *path; }; static void @@ -246,11 +246,11 @@ static MailMsgInfo sub_subscribe_folder_info = { /* spath is tree path in string form */ static int -sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, int state, const char *spath) +sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, gint state, const gchar *spath) { struct _zsubscribe_msg *m; MailMsgListNode *msgListNode; - int id; + gint id; m = mail_msg_new (&sub_subscribe_folder_info); m->sub = sub; @@ -276,7 +276,7 @@ sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, int state, const /* ********************************************************************** */ static void -sub_fill_level(EMSubscribe *sub, CamelFolderInfo *info, GtkTreeIter *parent, int pending) +sub_fill_level(EMSubscribe *sub, CamelFolderInfo *info, GtkTreeIter *parent, gint pending) { CamelFolderInfo *fi; GtkTreeStore *treestore; @@ -343,7 +343,7 @@ sub_fill_level(EMSubscribe *sub, CamelFolderInfo *info, GtkTreeIter *parent, in struct _emse_folderinfo_msg { MailMsg base; - int seq; + gint seq; EMSubscribe *sub; EMSubscribeNode *node; @@ -353,7 +353,7 @@ struct _emse_folderinfo_msg { static void sub_folderinfo_exec (struct _emse_folderinfo_msg *m) { - char *pub_full_name=NULL; + gchar *pub_full_name=NULL; if (m->seq == m->sub->seq) { camel_operation_register(m->base.cancel); @@ -424,7 +424,7 @@ static int sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node) { struct _emse_folderinfo_msg *m; - int id; + gint id; d(printf("%s:%s: Starting get folderinfo of '%s'\n", G_STRLOC, G_STRFUNC, node?node->info->full_name:"")); @@ -450,7 +450,7 @@ sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node) /* (un) subscribes the current selection */ static void -sub_subscribe_toggled(GtkCellRendererToggle *render, const char *spath, EMSubscribe *sub) +sub_subscribe_toggled(GtkCellRendererToggle *render, const gchar *spath, EMSubscribe *sub) { GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(sub->tree); @@ -468,7 +468,7 @@ sub_subscribe_toggled(GtkCellRendererToggle *render, const char *spath, EMSubscr } } -static void sub_do_changed(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, void *data) +static void sub_do_changed(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) { EMSubscribe *sub = data; EMSubscribeNode *node; @@ -484,7 +484,7 @@ static void sub_do_changed(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter * static void sub_selection_changed(GtkTreeSelection *selection, EMSubscribe *sub) { - int dosub = TRUE, dounsub = TRUE; + gint dosub = TRUE, dounsub = TRUE; sub->selected_count = 0; sub->selected_subscribed_count = 0; @@ -516,7 +516,7 @@ sub_row_expanded(GtkTreeView *tree, GtkTreeIter *iter, GtkTreePath *path, EMSubs EMSubscribeNode *node; GtkTreeIter child; GtkTreeModel *model = (GtkTreeModel *)gtk_tree_view_get_model(tree); - char *row_name; + gchar *row_name; gtk_tree_model_get(model, iter, 1, &row_name, -1); d(printf("%s:%s: row-expanded '%s'\n", G_STRLOC, G_STRFUNC, @@ -582,7 +582,7 @@ sub_destroy(GtkWidget *w, EMSubscribe *sub) } static EMSubscribe * -subscribe_new(EMSubscribeEditor *se, const char *uri) +subscribe_new(EMSubscribeEditor *se, const gchar *uri) { EMSubscribe *sub; @@ -720,7 +720,7 @@ sub_editor_refresh(GtkWidget *w, EMSubscribeEditor *se) } static void -sub_editor_got_store(char *uri, CamelStore *store, void *data) +sub_editor_got_store(gchar *uri, CamelStore *store, gpointer data) { struct _EMSubscribe *sub = data; @@ -732,7 +732,7 @@ sub_editor_got_store(char *uri, CamelStore *store, void *data) static void sub_editor_combobox_changed (GtkWidget *w, EMSubscribeEditor *se) { - int i, n; + gint i, n; struct _EMSubscribe *sub; d(printf("combobox changed\n")); @@ -784,9 +784,9 @@ static gboolean sub_editor_timeout(EMSubscribeEditor *se) return TRUE; } -static void sub_editor_busy(EMSubscribeEditor *se, int dir) +static void sub_editor_busy(EMSubscribeEditor *se, gint dir) { - int was; + gint was; was = se->busy != 0; se->busy += dir; @@ -831,7 +831,7 @@ GtkDialog *em_subscribe_editor_new(void) GtkCellRenderer *cell; GtkListStore *store; GtkTreeIter gtiter; - char *gladefile; + gchar *gladefile; se = g_malloc0(sizeof(*se)); e_dlist_init(&se->stores); diff --git a/mail/em-utils.c b/mail/em-utils.c index ba180e5011..2f0fb39789 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -82,7 +82,7 @@ #include "e-attachment.h" #include "e-activity-handler.h" -static void emu_save_part_done (CamelMimePart *part, char *name, int done, void *data); +static void emu_save_part_done (CamelMimePart *part, gchar *name, gint done, gpointer data); extern struct _CamelSession *session; @@ -103,11 +103,11 @@ extern struct _CamelSession *session; * Returns %TRUE if the user clicks Yes or %FALSE otherwise. **/ gboolean -em_utils_prompt_user(GtkWindow *parent, const char *promptkey, const char *tag, const char *arg0, ...) +em_utils_prompt_user(GtkWindow *parent, const gchar *promptkey, const gchar *tag, const gchar *arg0, ...) { GtkWidget *mbox, *check = NULL; va_list ap; - int button; + gint button; GConfClient *gconf = mail_config_get_gconf_client(); if (promptkey @@ -148,7 +148,7 @@ GPtrArray * em_utils_uids_copy (GPtrArray *uids) { GPtrArray *copy; - int i; + gint i; copy = g_ptr_array_new (); g_ptr_array_set_size (copy, uids->len); @@ -168,7 +168,7 @@ em_utils_uids_copy (GPtrArray *uids) void em_utils_uids_free (GPtrArray *uids) { - int i; + gint i; for (i = 0; i < uids->len; i++) g_free (uids->pdata[i]); @@ -248,12 +248,12 @@ em_utils_check_user_can_send_mail (GtkWidget *parent) static GtkWidget *filter_editor = NULL; static void -em_filter_editor_response (GtkWidget *dialog, int button, gpointer user_data) +em_filter_editor_response (GtkWidget *dialog, gint button, gpointer user_data) { EMFilterContext *fc; if (button == GTK_RESPONSE_OK) { - char *user; + gchar *user; fc = g_object_get_data ((GObject *) dialog, "context"); user = g_strdup_printf ("%s/filters.xml", @@ -284,8 +284,8 @@ static EMFilterSource em_filter_source_element_names[] = { void em_utils_edit_filters (GtkWidget *parent) { - const char *base_directory = mail_component_peek_base_directory (mail_component_peek ()); - char *user, *system; + const gchar *base_directory = mail_component_peek_base_directory (mail_component_peek ()); + gchar *user, *system; EMFilterContext *fc; if (filter_editor) { @@ -331,9 +331,9 @@ em_filename_make_safe (gchar *string) gchar *p, *ts; gunichar c; #ifdef G_OS_WIN32 - const char *unsafe_chars = "/\":*?<>|\\#"; + const gchar *unsafe_chars = "/\":*?<>|\\#"; #else - const char *unsafe_chars = "/#"; + const gchar *unsafe_chars = "/#"; #endif g_return_if_fail (string != NULL); @@ -385,7 +385,7 @@ emu_save_get_filename_for_part (CamelMimePart *part) * Saves a mime part to disk (prompting the user for filename). **/ void -em_utils_save_part (GtkWidget *parent, const char *prompt, CamelMimePart *part) +em_utils_save_part (GtkWidget *parent, const gchar *prompt, CamelMimePart *part) { GtkWidget *file_chooser; const gchar *utf8_filename; @@ -462,7 +462,7 @@ get_unique_file_names (GSList *parts) sorted_file_names = g_slist_sort (g_slist_copy (file_names), cmp_func); last = sorted_file_names->data; for (iter = sorted_file_names->next; iter; iter = iter->next) { - char *name = iter->data; + gchar *name = iter->data; if (name && last && cmp_func (name, last) == 0) { gchar *new_name; @@ -556,10 +556,10 @@ exit: * Returns %TRUE if saving succeeded, %FALSE otherwise **/ gboolean -em_utils_save_part_to_file(GtkWidget *parent, const char *filename, CamelMimePart *part) +em_utils_save_part_to_file(GtkWidget *parent, const gchar *filename, CamelMimePart *part) { - int done; - char *dirname; + gint done; + gchar *dirname; struct stat st; if (filename[0] == 0) @@ -599,9 +599,9 @@ struct _save_messages_data { }; static void -emu_save_messages_response(GtkWidget *filesel, int response, struct _save_messages_data *data) +emu_save_messages_response(GtkWidget *filesel, gint response, struct _save_messages_data *data) { - char *uri; + gchar *uri; if (response == GTK_RESPONSE_OK) { uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (filesel)); @@ -639,7 +639,7 @@ em_utils_save_messages (GtkWidget *parent, CamelFolder *folder, GPtrArray *uids) { struct _save_messages_data *data; GtkWidget *filesel; - char *filename = NULL; + gchar *filename = NULL; CamelMessageInfo *info = NULL; g_return_if_fail (CAMEL_IS_FOLDER (folder)); @@ -669,9 +669,9 @@ em_utils_save_messages (GtkWidget *parent, CamelFolder *folder, GPtrArray *uids) /* ********************************************************************** */ static void -emu_add_address_cb(BonoboListener *listener, const char *name, const CORBA_any *any, CORBA_Environment *ev, void *data) +emu_add_address_cb(BonoboListener *listener, const gchar *name, const CORBA_any *any, CORBA_Environment *ev, gpointer data) { - char *type = bonobo_event_subtype(name); + gchar *type = bonobo_event_subtype(name); if (!strcmp(type, "Destroy")) gtk_widget_destroy((GtkWidget *)data); @@ -681,12 +681,12 @@ emu_add_address_cb(BonoboListener *listener, const char *name, const CORBA_any * /* one of email or vcard should be always NULL, never both of them */ static void -emu_add_address_or_vcard (struct _GtkWidget *parent, const char *email, const char *vcard) +emu_add_address_or_vcard (struct _GtkWidget *parent, const gchar *email, const gchar *vcard) { GtkWidget *win; GtkWidget *control; /*GtkWidget *socket;*/ - char *email_buf = NULL; + gchar *email_buf = NULL; if (email) { CamelInternetAddress *cia; @@ -742,7 +742,7 @@ emu_add_address_or_vcard (struct _GtkWidget *parent, const char *email, const ch * Add address @email to the addressbook. **/ void -em_utils_add_address (struct _GtkWidget *parent, const char *email) +em_utils_add_address (struct _GtkWidget *parent, const gchar *email) { emu_add_address_or_vcard (parent, email, NULL); } @@ -752,7 +752,7 @@ em_utils_add_address (struct _GtkWidget *parent, const char *email) * Adds whole vCard to the addressbook. **/ void -em_utils_add_vcard (struct _GtkWidget *parent, const char *vcard) +em_utils_add_vcard (struct _GtkWidget *parent, const gchar *vcard) { emu_add_address_or_vcard (parent, NULL, vcard); } @@ -777,12 +777,12 @@ ted_free (struct ted_t *ted) } static void -tag_editor_response (GtkWidget *dialog, int button, struct ted_t *ted) +tag_editor_response (GtkWidget *dialog, gint button, struct ted_t *ted) { CamelFolder *folder; CamelTag *tags, *t; GPtrArray *uids; - int i; + gint i; if (button == GTK_RESPONSE_OK && (tags = message_tag_editor_get_tag_list (ted->editor))) { folder = ted->folder; @@ -824,7 +824,7 @@ em_utils_flag_for_followup (GtkWidget *parent, CamelFolder *folder, GPtrArray *u { GtkWidget *editor; struct ted_t *ted; - int i; + gint i; g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uids != NULL); @@ -886,7 +886,7 @@ em_utils_flag_for_followup (GtkWidget *parent, CamelFolder *folder, GPtrArray *u void em_utils_flag_for_followup_clear (GtkWidget *parent, CamelFolder *folder, GPtrArray *uids) { - int i; + gint i; g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uids != NULL); @@ -920,8 +920,8 @@ em_utils_flag_for_followup_clear (GtkWidget *parent, CamelFolder *folder, GPtrAr void em_utils_flag_for_followup_completed (GtkWidget *parent, CamelFolder *folder, GPtrArray *uids) { - char *now; - int i; + gchar *now; + gint i; g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uids != NULL); @@ -930,7 +930,7 @@ em_utils_flag_for_followup_completed (GtkWidget *parent, CamelFolder *folder, GP camel_folder_freeze (folder); for (i = 0; i < uids->len; i++) { - const char *tag; + const gchar *tag; CamelMessageInfo *mi = camel_folder_get_message_info(folder, uids->pdata[i]); if (mi) { @@ -958,7 +958,7 @@ em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStr { CamelStreamFilter *filtered_stream; CamelMimeFilterFrom *from_filter; - int i, res = 0; + gint i, res = 0; from_filter = camel_mime_filter_from_new(); filtered_stream = camel_stream_filter_new_with_stream(stream); @@ -967,7 +967,7 @@ em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStr for (i=0; ilen; i++) { CamelMimeMessage *message; - char *from; + gchar *from; message = camel_folder_get_message(folder, uids->pdata[i], NULL); if (message == NULL) { @@ -1003,7 +1003,7 @@ em_utils_read_messages_from_stream(CamelFolder *folder, CamelStream *stream) { CamelException *ex = camel_exception_new(); CamelMimeParser *mp = camel_mime_parser_new(); - int res = -1; + gint res = -1; camel_mime_parser_scan_from(mp, TRUE); camel_mime_parser_init_with_stream(mp, stream); @@ -1079,7 +1079,7 @@ em_utils_selection_get_mailbox(GtkSelectionData *data, CamelFolder *folder) /* TODO: a stream mem with read-only access to existing data? */ /* NB: Although copying would let us run this async ... which it should */ - stream = (CamelStream *)camel_stream_mem_new_with_buffer((char *)data->data, data->length); + stream = (CamelStream *)camel_stream_mem_new_with_buffer((gchar *)data->data, data->length); em_utils_read_messages_from_stream(folder, stream); camel_object_unref(stream); } @@ -1102,7 +1102,7 @@ em_utils_selection_get_message(GtkSelectionData *data, CamelFolder *folder) return; ex = camel_exception_new(); - stream = (CamelStream *)camel_stream_mem_new_with_buffer((char *)data->data, data->length); + stream = (CamelStream *)camel_stream_mem_new_with_buffer((gchar *)data->data, data->length); msg = camel_mime_message_new(); if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)msg, stream) == 0) camel_folder_append_message(folder, msg, NULL, NULL, ex); @@ -1122,14 +1122,14 @@ em_utils_selection_get_message(GtkSelectionData *data, CamelFolder *folder) * FIXME: be nice if this could take a folder argument rather than uri **/ void -em_utils_selection_set_uidlist(GtkSelectionData *data, const char *uri, GPtrArray *uids) +em_utils_selection_set_uidlist(GtkSelectionData *data, const gchar *uri, GPtrArray *uids) { GByteArray *array = g_byte_array_new(); - int i; + gint i; /* format: "uri\0uid1\0uid2\0uid3\0...\0uidn\0" */ - g_byte_array_append(array, (unsigned char *)uri, strlen(uri)+1); + g_byte_array_append(array, (guchar *)uri, strlen(uri)+1); for (i=0; ilen; i++) g_byte_array_append(array, uids->pdata[i], strlen(uids->pdata[i])+1); @@ -1148,10 +1148,10 @@ em_utils_selection_set_uidlist(GtkSelectionData *data, const char *uri, GPtrArra * Warning: Could take some time to run. **/ void -em_utils_selection_get_uidlist(GtkSelectionData *data, CamelFolder *dest, int move, CamelException *ex) +em_utils_selection_get_uidlist(GtkSelectionData *data, CamelFolder *dest, gint move, CamelException *ex) { /* format: "uri\0uid1\0uid2\0uid3\0...\0uidn" */ - char *inptr, *inend; + gchar *inptr, *inend; GPtrArray *uids; CamelFolder *folder; @@ -1160,15 +1160,15 @@ em_utils_selection_get_uidlist(GtkSelectionData *data, CamelFolder *dest, int mo uids = g_ptr_array_new(); - inptr = (char *)data->data; - inend = (char *)(data->data + data->length); + inptr = (gchar *)data->data; + inend = (gchar *)(data->data + data->length); while (inptr < inend) { - char *start = inptr; + gchar *start = inptr; while (inptr < inend && *inptr) inptr++; - if (start > (char *)data->data) + if (start > (gchar *)data->data) g_ptr_array_add(uids, g_strndup(start, inptr-start)); inptr++; @@ -1179,7 +1179,7 @@ em_utils_selection_get_uidlist(GtkSelectionData *data, CamelFolder *dest, int mo return; } - folder = mail_tool_uri_to_folder((char *)data->data, 0, ex); + folder = mail_tool_uri_to_folder((gchar *)data->data, 0, ex); if (folder) { camel_folder_transfer_messages_to(folder, uids, dest, NULL, move, ex); camel_object_unref(folder); @@ -1201,10 +1201,10 @@ em_utils_selection_get_uidlist(GtkSelectionData *data, CamelFolder *dest, int mo void em_utils_selection_set_urilist(GtkSelectionData *data, CamelFolder *folder, GPtrArray *uids) { - char *tmpdir; + gchar *tmpdir; CamelStream *fstream; - char *uri, *file = NULL, *tmpfile; - int fd; + gchar *uri, *file = NULL, *tmpfile; + gint fd; CamelMessageInfo *info; tmpdir = e_mkdtemp("drag-n-drop-XXXXXX"); @@ -1244,9 +1244,9 @@ em_utils_selection_set_urilist(GtkSelectionData *data, CamelFolder *folder, GPtr if (fstream) { if (em_utils_write_messages_to_stream(folder, uids, fstream) == 0) { /* terminate with \r\n to be compliant with the spec */ - char *uri_crlf = g_strconcat(uri, "\r\n", NULL); + gchar *uri_crlf = g_strconcat(uri, "\r\n", NULL); - gtk_selection_data_set(data, data->target, 8, (unsigned char *)uri_crlf, strlen(uri_crlf)); + gtk_selection_data_set(data, data->target, 8, (guchar *)uri_crlf, strlen(uri_crlf)); g_free(uri_crlf); } @@ -1272,12 +1272,12 @@ em_utils_selection_get_urilist(GtkSelectionData *data, CamelFolder *folder) { CamelStream *stream; CamelURL *url; - int fd, i, res = 0; - char *tmp, **uris; + gint fd, i, res = 0; + gchar *tmp, **uris; d(printf(" * drop uri list\n")); - tmp = g_strndup((char *)data->data, data->length); + tmp = g_strndup((gchar *)data->data, data->length); uris = g_strsplit(tmp, "\n", 0); g_free(tmp); for (i=0;res == 0 && uris[i];i++) { @@ -1305,9 +1305,9 @@ em_utils_selection_get_urilist(GtkSelectionData *data, CamelFolder *folder) } static void -emu_save_part_done(CamelMimePart *part, char *name, int done, void *data) +emu_save_part_done(CamelMimePart *part, gchar *name, gint done, gpointer data) { - ((int *)data)[0] = done; + ((gint *)data)[0] = done; } /** @@ -1321,12 +1321,12 @@ emu_save_part_done(CamelMimePart *part, char *name, int done, void *data) * * Return value: NULL if anything failed. **/ -char * +gchar * em_utils_temp_save_part(GtkWidget *parent, CamelMimePart *part, gboolean mode) { - const char *filename; - char *tmpdir, *path, *utf8_mfilename = NULL, *mfilename = NULL; - int done; + const gchar *filename; + gchar *tmpdir, *path, *utf8_mfilename = NULL, *mfilename = NULL; + gint done; GtkWidget *w; tmpdir = e_mkdtemp("evolution-tmp-XXXXXX"); @@ -1343,9 +1343,9 @@ em_utils_temp_save_part(GtkWidget *parent, CamelMimePart *part, gboolean mode) } else { utf8_mfilename = g_strdup (filename); e_filename_make_safe (utf8_mfilename); - mfilename = g_filename_from_utf8 ((const char *) utf8_mfilename, -1, NULL, NULL, NULL); + mfilename = g_filename_from_utf8 ((const gchar *) utf8_mfilename, -1, NULL, NULL, NULL); g_free (utf8_mfilename); - filename = (const char *) mfilename; + filename = (const gchar *) mfilename; } path = g_build_filename(tmpdir, filename, NULL); @@ -1376,13 +1376,13 @@ em_utils_temp_save_part(GtkWidget *parent, CamelMimePart *part, gboolean mode) **/ gboolean -em_utils_folder_is_templates (CamelFolder *folder, const char *uri) +em_utils_folder_is_templates (CamelFolder *folder, const gchar *uri) { EAccountList *accounts; EAccount *account; EIterator *iter; - int is = FALSE; - char *templates_uri; + gint is = FALSE; + gchar *templates_uri; if (folder == mail_component_get_folder (NULL, MAIL_COMPONENT_FOLDER_TEMPLATES)) return TRUE; @@ -1423,13 +1423,13 @@ em_utils_folder_is_templates (CamelFolder *folder, const char *uri) * Returns %TRUE if this is a Drafts folder or %FALSE otherwise. **/ gboolean -em_utils_folder_is_drafts(CamelFolder *folder, const char *uri) +em_utils_folder_is_drafts(CamelFolder *folder, const gchar *uri) { EAccountList *accounts; EAccount *account; EIterator *iter; - int is = FALSE; - char *drafts_uri; + gint is = FALSE; + gchar *drafts_uri; if (folder == mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_DRAFTS)) return TRUE; @@ -1470,13 +1470,13 @@ em_utils_folder_is_drafts(CamelFolder *folder, const char *uri) * Returns %TRUE if this is a Sent folder or %FALSE otherwise. **/ gboolean -em_utils_folder_is_sent(CamelFolder *folder, const char *uri) +em_utils_folder_is_sent(CamelFolder *folder, const gchar *uri) { EAccountList *accounts; EAccount *account; EIterator *iter; - int is = FALSE; - char *sent_uri; + gint is = FALSE; + gchar *sent_uri; if (folder == mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_SENT)) return TRUE; @@ -1517,7 +1517,7 @@ em_utils_folder_is_sent(CamelFolder *folder, const char *uri) * Returns %TRUE if this is an Outbox folder or %FALSE otherwise. **/ gboolean -em_utils_folder_is_outbox(CamelFolder *folder, const char *uri) +em_utils_folder_is_outbox(CamelFolder *folder, const gchar *uri) { /* There can be only one. */ return folder == mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_OUTBOX); @@ -1556,8 +1556,8 @@ em_utils_adjustment_page(GtkAdjustment *adj, gboolean down) static EProxy *emu_proxy = NULL; static GStaticMutex emu_proxy_lock = G_STATIC_MUTEX_INIT; -static void * -emu_proxy_setup (void *data) +static gpointer +emu_proxy_setup (gpointer data) { if (!emu_proxy) { emu_proxy = e_proxy_new (); @@ -1575,10 +1575,10 @@ emu_proxy_setup (void *data) * * Return value: Must be freed when finished with. **/ -char * -em_utils_get_proxy_uri (const char *pUri) +gchar * +em_utils_get_proxy_uri (const gchar *pUri) { - char *uri = NULL; + gchar *uri = NULL; g_static_mutex_lock (&emu_proxy_lock); @@ -1605,13 +1605,13 @@ em_utils_get_proxy_uri (const char *pUri) * * Return Value: The part in displayable html format. **/ -char * +gchar * em_utils_part_to_html(CamelMimePart *part, ssize_t *len, EMFormat *source) { EMFormatQuote *emfq; CamelStreamMem *mem; GByteArray *buf; - char *text; + gchar *text; buf = g_byte_array_new (); mem = (CamelStreamMem *) camel_stream_mem_new (); @@ -1633,7 +1633,7 @@ em_utils_part_to_html(CamelMimePart *part, ssize_t *len, EMFormat *source) camel_stream_write((CamelStream *) mem, "", 1); camel_object_unref(mem); - text = (char *)buf->data; + text = (gchar *)buf->data; if (len) *len = buf->len-1; g_byte_array_free (buf, FALSE); @@ -1655,13 +1655,13 @@ em_utils_part_to_html(CamelMimePart *part, ssize_t *len, EMFormat *source) * * Return value: The html version. **/ -char * -em_utils_message_to_html(CamelMimeMessage *message, const char *credits, guint32 flags, ssize_t *len, EMFormat *source, const char *append) +gchar * +em_utils_message_to_html(CamelMimeMessage *message, const gchar *credits, guint32 flags, ssize_t *len, EMFormat *source, const gchar *append) { EMFormatQuote *emfq; CamelStreamMem *mem; GByteArray *buf; - char *text; + gchar *text; buf = g_byte_array_new (); mem = (CamelStreamMem *) camel_stream_mem_new (); @@ -1673,7 +1673,7 @@ em_utils_message_to_html(CamelMimeMessage *message, const char *credits, guint32 if (!source) { GConfClient *gconf; - char *charset; + gchar *charset; /* FIXME: we should be getting this from the current view, not the global setting. */ gconf = gconf_client_get_default (); @@ -1692,7 +1692,7 @@ em_utils_message_to_html(CamelMimeMessage *message, const char *credits, guint32 camel_stream_write((CamelStream *)mem, "", 1); camel_object_unref(mem); - text = (char *)buf->data; + text = (gchar *)buf->data; if (len) *len = buf->len-1; g_byte_array_free(buf, FALSE); @@ -1712,7 +1712,7 @@ em_utils_message_to_html(CamelMimeMessage *message, const char *credits, guint32 void em_utils_expunge_folder (GtkWidget *parent, CamelFolder *folder) { - char *name; + gchar *name; camel_object_get(folder, NULL, CAMEL_OBJECT_DESCRIPTION, &name, 0); @@ -1772,11 +1772,11 @@ em_utils_empty_trash (GtkWidget *parent) mail_empty_trash (NULL, NULL, NULL); } -char * -em_utils_folder_name_from_uri (const char *uri) +gchar * +em_utils_folder_name_from_uri (const gchar *uri) { CamelURL *url; - char *folder_name = NULL; + gchar *folder_name = NULL; if (uri == NULL || (url = camel_url_new (uri, NULL)) == NULL) return NULL; @@ -1805,12 +1805,12 @@ em_utils_folder_name_from_uri (const char *uri) * local local:/storage/path#folder -> email://local@local/folder */ -char *em_uri_from_camel(const char *curi) +gchar *em_uri_from_camel(const gchar *curi) { CamelURL *curl; EAccount *account; - const char *uid, *path; - char *euri, *tmp; + const gchar *uid, *path; + gchar *euri, *tmp; CamelProvider *provider; CamelException ex; @@ -1856,14 +1856,14 @@ char *em_uri_from_camel(const char *curi) return euri; } -char *em_uri_to_camel(const char *euri) +gchar *em_uri_to_camel(const gchar *euri) { EAccountList *accounts; const EAccount *account; EAccountService *service; CamelProvider *provider; CamelURL *eurl, *curl; - char *uid, *curi; + gchar *uid, *curi; if (strncmp(euri, "email:", 6) != 0) { d(printf("em uri to camel not euri '%s'\n", euri)); @@ -1880,7 +1880,7 @@ char *em_uri_to_camel(const char *euri) /* Sigh, shoul'dve used mbox@local for mailboxes, not local@local */ if (strcmp(eurl->host, "local") == 0 && (strcmp(eurl->user, "local") == 0 || strcmp(eurl->user, "vfolder") == 0)) { - char *base; + gchar *base; if (strcmp(eurl->user, "vfolder") == 0) curl = camel_url_new("vfolder:", NULL); @@ -1891,7 +1891,7 @@ char *em_uri_to_camel(const char *euri) #ifdef G_OS_WIN32 /* Turn backslashes into slashes to avoid URI encoding */ { - char *p = base; + gchar *p = base; while ((p = strchr (p, '\\'))) *p++ = '/'; } @@ -1946,9 +1946,9 @@ char *em_uri_to_camel(const char *euri) #include struct _addr_node { - char *addr; + gchar *addr; time_t stamp; - int found; + gint found; }; #define EMU_ADDR_CACHE_TIME (60*30) /* in seconds */ @@ -1958,8 +1958,8 @@ static ESourceList *emu_addr_list; static GHashTable *emu_addr_cache; /* runs sync, in main thread */ -static void * -emu_addr_setup(void *dummy) +static gpointer +emu_addr_setup(gpointer dummy) { GError *err = NULL; @@ -1972,7 +1972,7 @@ emu_addr_setup(void *dummy) } static void -emu_addr_cancel_book(void *data) +emu_addr_cancel_book(gpointer data) { EBook *book = data; GError *err = NULL; @@ -2067,9 +2067,9 @@ em_utils_in_addressbook (CamelInternetAddress *iaddr, gboolean local_only) { GError *err = NULL; GSList *s, *g, *addr_sources = NULL; - int stop = FALSE, found = FALSE; + gint stop = FALSE, found = FALSE; EBookQuery *query; - const char *addr; + const gchar *addr; struct _addr_node *node; time_t now; @@ -2119,7 +2119,7 @@ em_utils_in_addressbook (CamelInternetAddress *iaddr, gboolean local_only) for (s = e_source_group_peek_sources((ESourceGroup *)g->data);s;s=g_slist_next(s)) { ESource *src = s->data; - const char *completion = e_source_get_property (src, "completion"); + const gchar *completion = e_source_get_property (src, "completion"); if (completion && !g_ascii_strcasecmp (completion, "true")) { addr_sources = g_slist_prepend(addr_sources, src); @@ -2194,8 +2194,8 @@ em_utils_in_addressbook (CamelInternetAddress *iaddr, gboolean local_only) struct _CamelMimePart * em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local) { - const char *addr; - int stop = FALSE, found = FALSE; + const gchar *addr; + gint stop = FALSE, found = FALSE; GSList *s, *g, *addr_sources = NULL; GError *err = NULL; EBookQuery *query = NULL; @@ -2224,7 +2224,7 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local) for (s = e_source_group_peek_sources((ESourceGroup *)g->data); s; s=g_slist_next(s)) { ESource *src = s->data; - const char *completion = e_source_get_property (src, "completion"); + const gchar *completion = e_source_get_property (src, "completion"); if (completion && !g_ascii_strcasecmp (completion, "true")) { addr_sources = g_slist_prepend(addr_sources, src); @@ -2289,7 +2289,7 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local) /* Form a mime part out of the photo */ part = camel_mime_part_new(); camel_mime_part_set_content(part, - (const char *) photo->data.inlined.data, + (const gchar *) photo->data.inlined.data, photo->data.inlined.length, "image/jpeg"); e_contact_photo_free (photo); @@ -2305,14 +2305,14 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local) * * Return value: NULL if unknown (more likely application/octet-stream). **/ -const char * +const gchar * em_utils_snoop_type(CamelMimePart *part) { - /* cache is here only to be able still return const char * */ + /* cache is here only to be able still return const gchar * */ static GHashTable *types_cache = NULL; - const char *filename; - char *name_type = NULL, *magic_type = NULL, *res, *tmp; + const gchar *filename; + gchar *name_type = NULL, *magic_type = NULL, *res, *tmp; CamelDataWrapper *dw; filename = camel_mime_part_get_filename (part); @@ -2324,7 +2324,7 @@ em_utils_snoop_type(CamelMimePart *part) CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new(); if (camel_data_wrapper_decode_to_stream(dw, (CamelStream *)mem) > 0) { - char *ct = g_content_type_guess (filename, mem->buffer->data, mem->buffer->len, NULL); + gchar *ct = g_content_type_guess (filename, mem->buffer->data, mem->buffer->len, NULL); if (ct) magic_type = g_content_type_get_mime_type (ct); @@ -2405,7 +2405,7 @@ em_utils_clear_get_password_canceled_accounts_flag (void) } -static void error_response(GtkObject *o, int button, void *data) +static void error_response(GtkObject *o, gint button, gpointer data) { gtk_widget_destroy((GtkWidget *)o); } diff --git a/mail/em-utils.h b/mail/em-utils.h index 1b60205168..76674bea11 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -44,7 +44,7 @@ struct _GtkAdjustment; struct _CamelException; struct _EMFormat; -gboolean em_utils_prompt_user(struct _GtkWindow *parent, const char *promptkey, const char *tag, const char *arg0, ...); +gboolean em_utils_prompt_user(struct _GtkWindow *parent, const gchar *promptkey, const gchar *tag, const gchar *arg0, ...); GPtrArray *em_utils_uids_copy (GPtrArray *uids); void em_utils_uids_free (GPtrArray *uids); @@ -56,12 +56,12 @@ void em_utils_edit_filters (struct _GtkWidget *parent); void em_filename_make_safe (gchar *string); void em_utils_edit_vfolders (struct _GtkWidget *parent); -void em_utils_save_part(struct _GtkWidget *parent, const char *prompt, struct _CamelMimePart *part); -gboolean em_utils_save_part_to_file(struct _GtkWidget *parent, const char *filename, struct _CamelMimePart *part); +void em_utils_save_part(struct _GtkWidget *parent, const gchar *prompt, struct _CamelMimePart *part); +gboolean em_utils_save_part_to_file(struct _GtkWidget *parent, const gchar *filename, struct _CamelMimePart *part); void em_utils_save_messages (struct _GtkWidget *parent, struct _CamelFolder *folder, GPtrArray *uids); -void em_utils_add_address(struct _GtkWidget *parent, const char *email); -void em_utils_add_vcard(struct _GtkWidget *parent, const char *vcard); +void em_utils_add_address(struct _GtkWidget *parent, const gchar *email); +void em_utils_add_vcard(struct _GtkWidget *parent, const gchar *vcard); void em_utils_flag_for_followup (struct _GtkWidget *parent, struct _CamelFolder *folder, GPtrArray *uids); void em_utils_flag_for_followup_clear (struct _GtkWidget *parent, struct _CamelFolder *folder, GPtrArray *uids); @@ -73,36 +73,36 @@ void em_utils_selection_set_mailbox(struct _GtkSelectionData *data, struct _Came void em_utils_selection_get_mailbox(struct _GtkSelectionData *data, struct _CamelFolder *folder); void em_utils_selection_get_message(struct _GtkSelectionData *data, struct _CamelFolder *folder); /* FIXME: be nice if these also worked on struct _CamelFolder's, no easy way to get uri from folder yet tho */ -void em_utils_selection_set_uidlist(struct _GtkSelectionData *data, const char *uri, GPtrArray *uids); -void em_utils_selection_get_uidlist(struct _GtkSelectionData *data, struct _CamelFolder *dest, int move, struct _CamelException *ex); +void em_utils_selection_set_uidlist(struct _GtkSelectionData *data, const gchar *uri, GPtrArray *uids); +void em_utils_selection_get_uidlist(struct _GtkSelectionData *data, struct _CamelFolder *dest, gint move, struct _CamelException *ex); void em_utils_selection_set_urilist(struct _GtkSelectionData *data, struct _CamelFolder *folder, GPtrArray *uids); void em_utils_selection_get_urilist(struct _GtkSelectionData *data, struct _CamelFolder *folder); -char *em_utils_temp_save_part(struct _GtkWidget *parent, struct _CamelMimePart *part, gboolean mode); -void em_utils_save_parts (struct _GtkWidget *parent, const char *prompt, GSList * parts); +gchar *em_utils_temp_save_part(struct _GtkWidget *parent, struct _CamelMimePart *part, gboolean mode); +void em_utils_save_parts (struct _GtkWidget *parent, const gchar *prompt, GSList * parts); -gboolean em_utils_folder_is_drafts(struct _CamelFolder *folder, const char *uri); -gboolean em_utils_folder_is_templates(struct _CamelFolder *folder, const char *uri); -gboolean em_utils_folder_is_sent(struct _CamelFolder *folder, const char *uri); -gboolean em_utils_folder_is_outbox(struct _CamelFolder *folder, const char *uri); +gboolean em_utils_folder_is_drafts(struct _CamelFolder *folder, const gchar *uri); +gboolean em_utils_folder_is_templates(struct _CamelFolder *folder, const gchar *uri); +gboolean em_utils_folder_is_sent(struct _CamelFolder *folder, const gchar *uri); +gboolean em_utils_folder_is_outbox(struct _CamelFolder *folder, const gchar *uri); void em_utils_adjustment_page(struct _GtkAdjustment *adj, gboolean down); -char *em_utils_get_proxy_uri (const char *uri); +gchar *em_utils_get_proxy_uri (const gchar *uri); /* FIXME: should this have an override charset? */ -char *em_utils_part_to_html(struct _CamelMimePart *part, ssize_t *len, struct _EMFormat *source); -char *em_utils_message_to_html(struct _CamelMimeMessage *msg, const char *credits, guint32 flags, ssize_t *len, struct _EMFormat *source, const char *append); +gchar *em_utils_part_to_html(struct _CamelMimePart *part, ssize_t *len, struct _EMFormat *source); +gchar *em_utils_message_to_html(struct _CamelMimeMessage *msg, const gchar *credits, guint32 flags, ssize_t *len, struct _EMFormat *source, const gchar *append); void em_utils_expunge_folder (struct _GtkWidget *parent, struct _CamelFolder *folder); void em_utils_empty_trash (struct _GtkWidget *parent); /* returns the folder name portion of an URI */ -char *em_utils_folder_name_from_uri (const char *uri); +gchar *em_utils_folder_name_from_uri (const gchar *uri); /* internal/camel uri translation */ -char *em_uri_from_camel (const char *curi); -char *em_uri_to_camel (const char *euri); +gchar *em_uri_from_camel (const gchar *curi); +gchar *em_uri_to_camel (const gchar *euri); /* Run errors silently on the status bar */ void em_utils_show_error_silent (struct _GtkWidget *widget); @@ -112,7 +112,7 @@ void em_utils_show_info_silent (struct _GtkWidget *widget); gboolean em_utils_in_addressbook (struct _CamelInternetAddress *addr, gboolean local_only); struct _CamelMimePart *em_utils_contact_photo (struct _CamelInternetAddress *addr, gboolean local); -const char *em_utils_snoop_type(struct _CamelMimePart *part); +const gchar *em_utils_snoop_type(struct _CamelMimePart *part); /* clears flag 'get_password_canceled' at every known accounts, so if needed, get_password will show dialog */ void em_utils_clear_get_password_canceled_accounts_flag (void); diff --git a/mail/em-vfolder-context.c b/mail/em-vfolder-context.c index e317b5cabf..b111376b20 100644 --- a/mail/em-vfolder-context.c +++ b/mail/em-vfolder-context.c @@ -35,7 +35,7 @@ #include "em-filter-folder-element.h" -static FilterElement *vfolder_new_element(RuleContext *rc, const char *type); +static FilterElement *vfolder_new_element(RuleContext *rc, const gchar *type); static RuleContextClass *parent_class = NULL; @@ -104,7 +104,7 @@ em_vfolder_context_new(void) } static FilterElement * -vfolder_new_element(RuleContext *rc, const char *type) +vfolder_new_element(RuleContext *rc, const gchar *type) { if (!strcmp(type, "system-flag")) { return (FilterElement *) filter_option_new(); diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c index dcc6f03e75..4182f7a3a3 100644 --- a/mail/em-vfolder-editor.c +++ b/mail/em-vfolder-editor.c @@ -104,7 +104,7 @@ em_vfolder_editor_new (EMVFolderContext *vc) { EMVFolderEditor *ve = (EMVFolderEditor *) g_object_new (em_vfolder_editor_get_type(), NULL); GladeXML *gui; - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "filter.glade", diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index 03f46afff8..d3090a672d 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -43,10 +43,10 @@ #define d(x) -static int validate(FilterRule *); -static int vfolder_eq(FilterRule *fr, FilterRule *cm); +static gint validate(FilterRule *); +static gint vfolder_eq(FilterRule *fr, FilterRule *cm); static xmlNodePtr xml_encode(FilterRule *); -static int xml_decode(FilterRule *, xmlNodePtr, RuleContext *f); +static gint xml_decode(FilterRule *, xmlNodePtr, RuleContext *f); static void rule_copy(FilterRule *dest, FilterRule *src); /*static void build_code(FilterRule *, GString *out);*/ static GtkWidget *get_widget(FilterRule *fr, RuleContext *f); @@ -56,7 +56,7 @@ static void em_vfolder_rule_init(EMVFolderRule *vr); static void em_vfolder_rule_finalise(GObject *obj); /* DO NOT internationalise these strings */ -static const char *with_names[] = { +static const gchar *with_names[] = { "specific", "local_remote_active", "remote_active", @@ -141,7 +141,7 @@ em_vfolder_rule_new(void) } void -em_vfolder_rule_add_source(EMVFolderRule *vr, const char *uri) +em_vfolder_rule_add_source(EMVFolderRule *vr, const gchar *uri) { g_return_if_fail (EM_IS_VFOLDER_RULE(vr)); g_return_if_fail (uri); @@ -151,8 +151,8 @@ em_vfolder_rule_add_source(EMVFolderRule *vr, const char *uri) filter_rule_emit_changed((FilterRule *)vr); } -const char * -em_vfolder_rule_find_source(EMVFolderRule *vr, const char *uri) +const gchar * +em_vfolder_rule_find_source(EMVFolderRule *vr, const gchar *uri) { GList *l; @@ -171,13 +171,13 @@ em_vfolder_rule_find_source(EMVFolderRule *vr, const char *uri) } void -em_vfolder_rule_remove_source(EMVFolderRule *vr, const char *uri) +em_vfolder_rule_remove_source(EMVFolderRule *vr, const gchar *uri) { - char *found; + gchar *found; g_return_if_fail (EM_IS_VFOLDER_RULE(vr)); - found =(char *)em_vfolder_rule_find_source(vr, uri); + found =(gchar *)em_vfolder_rule_find_source(vr, uri); if (found) { vr->sources = g_list_remove(vr->sources, found); g_free(found); @@ -185,15 +185,15 @@ em_vfolder_rule_remove_source(EMVFolderRule *vr, const char *uri) } } -const char * -em_vfolder_rule_next_source(EMVFolderRule *vr, const char *last) +const gchar * +em_vfolder_rule_next_source(EMVFolderRule *vr, const gchar *last) { GList *node; if (last == NULL) { node = vr->sources; } else { - node = g_list_find(vr->sources, (char *)last); + node = g_list_find(vr->sources, (gchar *)last); if (node == NULL) node = vr->sources; else @@ -201,7 +201,7 @@ em_vfolder_rule_next_source(EMVFolderRule *vr, const char *last) } if (node) - return (const char *)node->data; + return (const gchar *)node->data; return NULL; } @@ -231,10 +231,10 @@ validate(FilterRule *fr) static int list_eq(GList *al, GList *bl) { - int truth = TRUE; + gint truth = TRUE; while (truth && al && bl) { - char *a = al->data, *b = bl->data; + gchar *a = al->data, *b = bl->data; truth = strcmp(a, b)== 0; al = al->next; @@ -262,13 +262,13 @@ xml_encode(FilterRule *fr) g_return_val_if_fail (node != NULL, NULL); g_return_val_if_fail (vr->with < sizeof(with_names)/sizeof(with_names[0]), NULL); - set = xmlNewNode(NULL, (const unsigned char *)"sources"); + set = xmlNewNode(NULL, (const guchar *)"sources"); xmlAddChild(node, set); - xmlSetProp(set, (const unsigned char *)"with", (unsigned char *)with_names[vr->with]); + xmlSetProp(set, (const guchar *)"with", (guchar *)with_names[vr->with]); l = vr->sources; while (l) { - work = xmlNewNode(NULL, (const unsigned char *)"folder"); - xmlSetProp(work, (const unsigned char *)"uri", (unsigned char *)l->data); + work = xmlNewNode(NULL, (const guchar *)"folder"); + xmlSetProp(work, (const guchar *)"uri", (guchar *)l->data); xmlAddChild(set, work); l = l->next; } @@ -277,9 +277,9 @@ xml_encode(FilterRule *fr) } static void -set_with(EMVFolderRule *vr, const char *name) +set_with(EMVFolderRule *vr, const gchar *name) { - int i; + gint i; for(i=0;ixml_decode(fr, node, f); if (result != 0) @@ -312,16 +312,16 @@ xml_decode(FilterRule *fr, xmlNodePtr node, struct _RuleContext *f) set = node->children; while (set) { - if (!strcmp((char *)set->name, "sources")) { - tmp = (char *)xmlGetProp(set, (const unsigned char *)"with"); + if (!strcmp((gchar *)set->name, "sources")) { + tmp = (gchar *)xmlGetProp(set, (const guchar *)"with"); if (tmp) { set_with(vr, tmp); xmlFree(tmp); } work = set->children; while (work) { - if (!strcmp((char *)work->name, "folder")) { - tmp = (char *)xmlGetProp(work, (const unsigned char *)"uri"); + if (!strcmp((gchar *)work->name, "folder")) { + tmp = (gchar *)xmlGetProp(work, (const guchar *)"uri"); if (tmp) { vr->sources = g_list_append(vr->sources, g_strdup(tmp)); xmlFree(tmp); @@ -352,7 +352,7 @@ rule_copy(FilterRule *dest, FilterRule *src) node = vsrc->sources; while (node) { - char *uri = node->data; + gchar *uri = node->data; vdest->sources = g_list_append(vdest->sources, g_strdup(uri)); node = node->next; @@ -372,7 +372,7 @@ enum { struct _source_data { RuleContext *rc; EMVFolderRule *vr; - const char *current; + const gchar *current; GtkListStore *model; GtkTreeView *list; GtkWidget *source_selector; @@ -439,11 +439,11 @@ select_source_with_changed(GtkWidget *widget, struct _source_data *data) } /* attempt to make a 'nice' folder name out of the raw uri */ -static char *format_source(const char *euri) +static gchar *format_source(const gchar *euri) { CamelURL *url; GString *out; - char *res, *uri; + gchar *res, *uri; /* This should really probably base it on the account name? */ uri = em_uri_to_camel(euri); @@ -476,10 +476,10 @@ static char *format_source(const char *euri) static void vfr_folder_response(GtkWidget *dialog, gint button, struct _source_data *data) { - const char *uri = em_folder_selector_get_selected_uri((EMFolderSelector *)dialog); + const gchar *uri = em_folder_selector_get_selected_uri((EMFolderSelector *)dialog); if (button == GTK_RESPONSE_OK && uri != NULL) { - char *urinice, *euri; + gchar *urinice, *euri; GtkTreeSelection *selection; GtkTreeIter iter; @@ -521,11 +521,11 @@ static void source_remove(GtkWidget *widget, struct _source_data *data) { GtkTreeSelection *selection; - const char *source; + const gchar *source; GtkTreePath *path; GtkTreeIter iter; - int index = 0; - int n; + gint index = 0; + gint n; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(data->list)); @@ -568,11 +568,11 @@ source_remove(GtkWidget *widget, struct _source_data *data) } -GtkWidget *em_vfolder_editor_sourcelist_new(char *widget_name, char *string1, char *string2, - int int1, int int2); +GtkWidget *em_vfolder_editor_sourcelist_new(gchar *widget_name, gchar *string1, gchar *string2, + gint int1, gint int2); GtkWidget * -em_vfolder_editor_sourcelist_new(char *widget_name, char *string1, char *string2, int int1, int int2) +em_vfolder_editor_sourcelist_new(gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2) { GtkWidget *table, *scrolled; GtkTreeSelection *selection; @@ -616,11 +616,11 @@ get_widget(FilterRule *fr, RuleContext *rc) GtkWidget *widget, *frame, *list; struct _source_data *data; GtkRadioButton *rb; - const char *source; + const gchar *source; GtkTreeIter iter; GladeXML *gui; - int i; - char *gladefile; + gint i; + gchar *gladefile; widget = FILTER_RULE_CLASS(parent_class)->get_widget(fr, rc); @@ -649,7 +649,7 @@ get_widget(FilterRule *fr, RuleContext *rc) source = NULL; while ((source = em_vfolder_rule_next_source(vr, source))) { - char *nice = format_source(source); + gchar *nice = format_source(source); gtk_list_store_append(data->model, &iter); gtk_list_store_set(data->model, &iter, 0, nice, 1, source, -1); diff --git a/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h index 9274c94b5c..1c0b2a3113 100644 --- a/mail/em-vfolder-rule.h +++ b/mail/em-vfolder-rule.h @@ -60,9 +60,9 @@ GType em_vfolder_rule_get_type (void); EMVFolderRule *em_vfolder_rule_new (void); /* methods */ -void em_vfolder_rule_add_source (EMVFolderRule *vr, const char *uri); -void em_vfolder_rule_remove_source (EMVFolderRule *vr, const char *uri); -const char *em_vfolder_rule_find_source (EMVFolderRule *vr, const char *uri); -const char *em_vfolder_rule_next_source (EMVFolderRule *vr, const char *last); +void em_vfolder_rule_add_source (EMVFolderRule *vr, const gchar *uri); +void em_vfolder_rule_remove_source (EMVFolderRule *vr, const gchar *uri); +const gchar *em_vfolder_rule_find_source (EMVFolderRule *vr, const gchar *uri); +const gchar *em_vfolder_rule_next_source (EMVFolderRule *vr, const gchar *last); #endif /* ! _EM_VFOLDER_RULE_H */ diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 39bfd7bc3f..6e65418441 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -55,16 +55,16 @@ struct _elm_import_msg { EImportTargetHome *target; GMutex *status_lock; - char *status_what; - int status_pc; - int status_timeout_id; + gchar *status_what; + gint status_pc; + gint status_timeout_id; CamelOperation *status; }; static GHashTable * -parse_elm_rc(const char *elmrc) +parse_elm_rc(const gchar *elmrc) { - char line[4096]; + gchar line[4096]; FILE *handle; GHashTable *prefs; @@ -81,8 +81,8 @@ parse_elm_rc(const char *elmrc) return prefs; while (fgets (line, 4096, handle) != NULL) { - char *linestart, *end; - char *key, *value; + gchar *linestart, *end; + gchar *key, *value; if (*line == '#' && (line[1] != '#' && line[2] != '#')) { continue; @@ -122,11 +122,11 @@ parse_elm_rc(const char *elmrc) return prefs; } -static char * -elm_get_rc(EImport *ei, const char *name) +static gchar * +elm_get_rc(EImport *ei, const gchar *name) { GHashTable *prefs; - char *elmrc; + gchar *elmrc; prefs = g_object_get_data((GObject *)ei, "elm-rc"); if (prefs == NULL) { @@ -146,8 +146,8 @@ static gboolean elm_supported(EImport *ei, EImportTarget *target, EImportImporter *im) { EImportTargetHome *s; - const char *maildir; - char *elmdir; + const gchar *maildir; + gchar *elmdir; gboolean mailexists, exists; if (target->type != E_IMPORT_TARGET_HOME) @@ -190,8 +190,8 @@ static MailImporterSpecial elm_special_folders[] = { static void elm_import_exec (struct _elm_import_msg *m) { - const char *maildir; - char *elmdir; + const gchar *maildir; + gchar *elmdir; maildir = elm_get_rc(m->import, "maildir"); if (maildir == NULL) @@ -237,7 +237,7 @@ elm_import_free(struct _elm_import_msg *m) } static void -elm_status(CamelOperation *op, const char *what, int pc, void *data) +elm_status(CamelOperation *op, const gchar *what, gint pc, gpointer data) { struct _elm_import_msg *importer = data; @@ -254,11 +254,11 @@ elm_status(CamelOperation *op, const char *what, int pc, void *data) } static gboolean -elm_status_timeout(void *data) +elm_status_timeout(gpointer data) { struct _elm_import_msg *importer = data; - int pc; - char *what; + gint pc; + gchar *what; if (importer->status_what) { g_mutex_lock(importer->status_lock); @@ -285,7 +285,7 @@ static int mail_importer_elm_import(EImport *ei, EImportTarget *target) { struct _elm_import_msg *m; - int id; + gint id; m = mail_msg_new(&elm_import_info); g_datalist_set_data(&target->data, "elm-msg", m); diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index f42afec151..7cd2b34b22 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -54,12 +54,12 @@ typedef struct { EImportTarget *target; GMutex *status_lock; - char *status_what; - int status_pc; - int status_timeout_id; + gchar *status_what; + gint status_pc; + gint status_timeout_id; CamelOperation *cancel; /* cancel/status port */ - char *uri; + gchar *uri; } MboxImporter; static void @@ -95,11 +95,11 @@ mbox_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im) static gboolean mbox_supported(EImport *ei, EImportTarget *target, EImportImporter *im) { - char signature[6]; + gchar signature[6]; gboolean ret = FALSE; - int fd, n; + gint fd, n; EImportTargetURI *s; - char *filename; + gchar *filename; if (target->type != E_IMPORT_TARGET_URI) return FALSE; @@ -124,7 +124,7 @@ mbox_supported(EImport *ei, EImportTarget *target, EImportImporter *im) } static void -mbox_status(CamelOperation *op, const char *what, int pc, void *data) +mbox_status(CamelOperation *op, const gchar *what, gint pc, gpointer data) { MboxImporter *importer = data; @@ -141,11 +141,11 @@ mbox_status(CamelOperation *op, const char *what, int pc, void *data) } static gboolean -mbox_status_timeout(void *data) +mbox_status_timeout(gpointer data) { MboxImporter *importer = data; - int pc; - char *what; + gint pc; + gchar *what; if (importer->status_what) { g_mutex_lock(importer->status_lock); @@ -161,7 +161,7 @@ mbox_status_timeout(void *data) } static void -mbox_import_done(void *data, CamelException *ex) +mbox_import_done(gpointer data, CamelException *ex) { MboxImporter *importer = data; @@ -178,7 +178,7 @@ static void mbox_import(EImport *ei, EImportTarget *target, EImportImporter *im) { MboxImporter *importer; - char *filename; + gchar *filename; /* TODO: do we validate target? */ diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index 29a2dddd97..bfaf7896aa 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -62,8 +62,8 @@ * Return value: The physical uri of the folder, or NULL if the folder did * not exist and could not be created. **/ -char * -mail_importer_make_local_folder(const char *folderpath) +gchar * +mail_importer_make_local_folder(const gchar *folderpath) { return g_strdup_printf("mbox:/home/notzed/.evolution/mail/local/%s", folderpath); } @@ -79,7 +79,7 @@ mail_importer_make_local_folder(const char *folderpath) */ void mail_importer_add_line (MailImporter *importer, - const char *str, + const gchar *str, gboolean finished) { CamelMimeMessage *msg; @@ -113,7 +113,7 @@ mail_importer_add_line (MailImporter *importer, camel_message_info_free(info); } -struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *factory, const char *iid, void *data) +struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *factory, const gchar *iid, gpointer data) { #if 0 if (strcmp(iid, ELM_INTELLIGENT_IMPORTER_IID) == 0) @@ -133,12 +133,12 @@ struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *fac struct _import_mbox_msg { MailMsg base; - char *path; - char *uri; + gchar *path; + gchar *uri; CamelOperation *cancel; - void (*done)(void *data, CamelException *ex); - void *done_data; + void (*done)(gpointer data, CamelException *ex); + gpointer done_data; }; static gchar * @@ -148,7 +148,7 @@ import_mbox_desc (struct _import_mbox_msg *m) } static struct { - char tag; + gchar tag; guint32 mozflag; guint32 flag; } status_flags[] = { @@ -159,11 +159,11 @@ static struct { }; static guint32 -decode_status(const char *status) +decode_status(const gchar *status) { - const char *p; + const gchar *p; guint32 flags = 0; - int i; + gint i; p = status; while ((*p++)) { @@ -176,11 +176,11 @@ decode_status(const char *status) } static guint32 -decode_mozilla_status(const char *tmp) +decode_mozilla_status(const gchar *tmp) { unsigned long status = strtoul(tmp, NULL, 16); guint32 flags = 0; - int i; + gint i; for (i=0;ipath, &st) == -1) { @@ -232,8 +232,8 @@ import_mbox_exec (struct _import_mbox_msg *m) camel_folder_freeze(folder); while (camel_mime_parser_step(mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM) { CamelMimeMessage *msg; - const char *tmp; - int pc = 0; + const gchar *tmp; + gint pc = 0; guint32 flags = 0; if (st.st_size > 0) @@ -307,11 +307,11 @@ static MailMsgInfo import_mbox_info = { (MailMsgFreeFunc) import_mbox_free }; -int -mail_importer_import_mbox(const char *path, const char *folderuri, CamelOperation *cancel, void (*done)(void *data, CamelException *), void *data) +gint +mail_importer_import_mbox(const gchar *path, const gchar *folderuri, CamelOperation *cancel, void (*done)(gpointer data, CamelException *), gpointer data) { struct _import_mbox_msg *m; - int id; + gint id; m = mail_msg_new(&import_mbox_info); m->path = g_strdup(path); @@ -330,7 +330,7 @@ mail_importer_import_mbox(const char *path, const char *folderuri, CamelOperatio } void -mail_importer_import_mbox_sync(const char *path, const char *folderuri, CamelOperation *cancel) +mail_importer_import_mbox_sync(const gchar *path, const gchar *folderuri, CamelOperation *cancel) { struct _import_mbox_msg *m; @@ -355,13 +355,13 @@ struct _import_folders_data { }; static void -import_folders_rec(struct _import_folders_data *m, const char *filepath, const char *folderparent) +import_folders_rec(struct _import_folders_data *m, const gchar *filepath, const gchar *folderparent) { GDir *dir; - const char *d; + const gchar *d; struct stat st; - char *filefull, *foldersub, *uri, *utf8_filename; - const char *folder; + gchar *filefull, *foldersub, *uri, *utf8_filename; + const gchar *folder; dir = g_dir_open(filepath, 0, NULL); if (dir == NULL) @@ -387,7 +387,7 @@ import_folders_rec(struct _import_folders_data *m, const char *filepath, const c folder = d; if (folderparent == NULL) { - int i; + gint i; for (i=0;m->special_folders[i].orig;i++) if (strcmp(m->special_folders[i].orig, folder) == 0) { @@ -406,7 +406,7 @@ import_folders_rec(struct _import_folders_data *m, const char *filepath, const c /* This little gem re-uses the stat buffer and filefull to automagically scan mozilla-format folders */ if (!m->elmfmt) { - char *tmp = g_strdup_printf("%s.sbd", filefull); + gchar *tmp = g_strdup_printf("%s.sbd", filefull); g_free(filefull); filefull = tmp; @@ -445,7 +445,7 @@ import_folders_rec(struct _import_folders_data *m, const char *filepath, const c * standard unix directories. **/ void -mail_importer_import_folders_sync(const char *filepath, MailImporterSpecial special_folders[], int flags, CamelOperation *cancel) +mail_importer_import_folders_sync(const gchar *filepath, MailImporterSpecial special_folders[], gint flags, CamelOperation *cancel) { struct _import_folders_data m; CamelOperation *oldcancel = NULL; diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index f108967ebc..92f555cf75 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -38,14 +38,14 @@ void mail_importer_init (struct _MailComponent *mc); void mail_importer_uninit (void); void mail_importer_add_line (MailImporter *importer, - const char *str, + const gchar *str, gboolean finished); -void mail_importer_create_folder (const char *parent_path, - const char *name, - const char *description); +void mail_importer_create_folder (const gchar *parent_path, + const gchar *name, + const gchar *description); /* creates a folder at folderpath on the local storage */ -char *mail_importer_make_local_folder(const char *folderpath); +gchar *mail_importer_make_local_folder(const gchar *folderpath); struct _BonoboObject; struct _BonoboGenericFactory; @@ -71,7 +71,7 @@ struct _BonoboObject *netscape_intelligent_importer_new(void); struct _BonoboObject *mbox_importer_new(void); struct _BonoboObject *outlook_importer_new(void); -struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *factory, const char *iid, void *data); +struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *factory, const gchar *iid, gpointer data); /* Defines copied from nsMsgMessageFlags.h in Mozilla source. */ @@ -81,8 +81,8 @@ struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *fac #define MSG_FLAG_MARKED 0x0004 #define MSG_FLAG_EXPUNGED 0x0008 -int mail_importer_import_mbox(const char *path, const char *folderuri, struct _CamelOperation *cancel, void (*done)(void *data, struct _CamelException *), void *data); -void mail_importer_import_mbox_sync(const char *path, const char *folderuri, struct _CamelOperation *cancel); +gint mail_importer_import_mbox(const gchar *path, const gchar *folderuri, struct _CamelOperation *cancel, void (*done)(gpointer data, struct _CamelException *), gpointer data); +void mail_importer_import_mbox_sync(const gchar *path, const gchar *folderuri, struct _CamelOperation *cancel); struct _MailImporterSpecial { const gchar *orig, *new; @@ -93,6 +93,6 @@ typedef struct _MailImporterSpecial MailImporterSpecial; #define MAIL_IMPORTER_MOZFMT (1<<0) /* api in flux */ -void mail_importer_import_folders_sync(const char *filepath, MailImporterSpecial special_folders[], int flags, struct _CamelOperation *cancel); +void mail_importer_import_folders_sync(const gchar *filepath, MailImporterSpecial special_folders[], gint flags, struct _CamelOperation *cancel); #endif diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index 3a4e6d9cc1..e460d66d2e 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -58,9 +58,9 @@ struct _pine_import_msg { EImportTarget *target; GMutex *status_lock; - char *status_what; - int status_pc; - int status_timeout_id; + gchar *status_what; + gint status_pc; + gint status_timeout_id; CamelOperation *status; }; @@ -68,7 +68,7 @@ static gboolean pine_supported(EImport *ei, EImportTarget *target, EImportImporter *im) { EImportTargetHome *s; - char *maildir, *addrfile; + gchar *maildir, *addrfile; gboolean md_exists, addr_exists; if (target->type != E_IMPORT_TARGET_HOME) @@ -102,10 +102,10 @@ FIXME: we dont handle aliases in lists. */ static void -import_contact(EBook *book, char *line) +import_contact(EBook *book, gchar *line) { - char **strings, *addr, **addrs; - int i; + gchar **strings, *addr, **addrs; + gint i; GList *list; /*EContactName *name;*/ EContact *card; @@ -165,7 +165,7 @@ import_contacts(void) ESource *primary; ESourceList *source_list; EBook *book; - char *name; + gchar *name; GString *line; FILE *fp; size_t offset; @@ -238,7 +238,7 @@ pine_import_exec(struct _pine_import_msg *m) import_contacts(); if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-mail"))) { - char *path; + gchar *path; path = g_build_filename(g_get_home_dir(), "mail", NULL); mail_importer_import_folders_sync(path, pine_special_folders, 0, m->status); @@ -280,7 +280,7 @@ pine_import_free(struct _pine_import_msg *m) } static void -pine_status(CamelOperation *op, const char *what, int pc, void *data) +pine_status(CamelOperation *op, const gchar *what, gint pc, gpointer data) { struct _pine_import_msg *importer = data; @@ -297,11 +297,11 @@ pine_status(CamelOperation *op, const char *what, int pc, void *data) } static gboolean -pine_status_timeout(void *data) +pine_status_timeout(gpointer data) { struct _pine_import_msg *importer = data; - int pc; - char *what; + gint pc; + gchar *what; if (importer->status_what) { g_mutex_lock(importer->status_lock); @@ -328,7 +328,7 @@ static int mail_importer_pine_import(EImport *ei, EImportTarget *target) { struct _pine_import_msg *m; - int id; + gint id; m = mail_msg_new(&pine_import_info); g_datalist_set_data(&target->data, "pine-msg", m); diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index 53a0411f08..ef5e8787a6 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -56,9 +56,9 @@ rule_match_recipients (RuleContext *context, FilterRule *rule, CamelInternetAddr { FilterPart *part; FilterElement *element; - int i; - const char *real, *addr; - char *namestr; + gint i; + const gchar *real, *addr; + gchar *namestr; /* address types etc should handle multiple values */ for (i = 0; camel_internet_address_get (iaddr, i, &real, &addr); i++) { @@ -77,12 +77,12 @@ rule_match_recipients (RuleContext *context, FilterRule *rule, CamelInternetAddr /* remove 're' part of a subject */ -static const char * -strip_re (const char *subject) +static const gchar * +strip_re (const gchar *subject) { - const unsigned char *s, *p; + const guchar *s, *p; - s = (unsigned char *) subject; + s = (guchar *) subject; while (*s) { while (isspace (*s)) @@ -102,16 +102,16 @@ strip_re (const char *subject) break; } - return (char *) s; + return (gchar *) s; } #if 0 -int -reg_match (char *str, char *regstr) +gint +reg_match (gchar *str, gchar *regstr) { regex_t reg; - int error; - int ret; + gint error; + gint ret; error = regcomp(®, regstr, REG_EXTENDED|REG_ICASE|REG_NOSUB); if (error != 0) { @@ -124,7 +124,7 @@ reg_match (char *str, char *regstr) #endif static void -rule_add_subject (RuleContext *context, FilterRule *rule, const char *text) +rule_add_subject (RuleContext *context, FilterRule *rule, const gchar *text) { FilterPart *part; FilterElement *element; @@ -141,7 +141,7 @@ rule_add_subject (RuleContext *context, FilterRule *rule, const char *text) } static void -rule_add_sender (RuleContext *context, FilterRule *rule, const char *text) +rule_add_sender (RuleContext *context, FilterRule *rule, const gchar *text) { FilterPart *part; FilterElement *element; @@ -160,11 +160,11 @@ rule_add_sender (RuleContext *context, FilterRule *rule, const char *text) /* do a bunch of things on the subject to try and detect mailing lists, remove unneeded stuff, etc */ static void -rule_match_subject (RuleContext *context, FilterRule *rule, const char *subject) +rule_match_subject (RuleContext *context, FilterRule *rule, const gchar *subject) { - const char *s; - const char *s1, *s2; - char *tmp; + const gchar *s; + const gchar *s1, *s2; + gchar *tmp; s = strip_re (subject); /* dont match on empty subject */ @@ -202,7 +202,7 @@ rule_match_subject (RuleContext *context, FilterRule *rule, const char *subject) } static void -rule_match_mlist(RuleContext *context, FilterRule *rule, const char *mlist) +rule_match_mlist(RuleContext *context, FilterRule *rule, const gchar *mlist) { FilterPart *part; FilterElement *element; @@ -221,13 +221,13 @@ rule_match_mlist(RuleContext *context, FilterRule *rule, const char *mlist) } static void -rule_from_address (FilterRule *rule, RuleContext *context, CamelInternetAddress* addr, int flags) +rule_from_address (FilterRule *rule, RuleContext *context, CamelInternetAddress* addr, gint flags) { rule->grouping = FILTER_GROUP_ANY; if (flags & AUTO_FROM) { - const char *name, *address; - char *namestr; + const gchar *name, *address; + gchar *namestr; camel_internet_address_get (addr, 0, &name, &address); rule_add_sender (context, rule, address); @@ -244,15 +244,15 @@ rule_from_address (FilterRule *rule, RuleContext *context, CamelInternetAddress* } static void -rule_from_message (FilterRule *rule, RuleContext *context, CamelMimeMessage *msg, int flags) +rule_from_message (FilterRule *rule, RuleContext *context, CamelMimeMessage *msg, gint flags) { CamelInternetAddress *addr; rule->grouping = FILTER_GROUP_ANY; if (flags & AUTO_SUBJECT) { - const char *subject = msg->subject ? msg->subject : ""; - char *namestr; + const gchar *subject = msg->subject ? msg->subject : ""; + gchar *namestr; rule_match_subject (context, rule, subject); @@ -263,9 +263,9 @@ rule_from_message (FilterRule *rule, RuleContext *context, CamelMimeMessage *msg /* should parse the from address into an internet address? */ if (flags & AUTO_FROM) { const CamelInternetAddress *from; - int i; - const char *name, *address; - char *namestr; + gint i; + const gchar *name, *address; + gchar *namestr; from = camel_mime_message_get_from (msg); for (i = 0; from && camel_internet_address_get (from, i, &name, &address); i++) { @@ -286,7 +286,7 @@ rule_from_message (FilterRule *rule, RuleContext *context, CamelMimeMessage *msg rule_match_recipients (context, rule, addr); } if (flags & AUTO_MLIST) { - char *name, *mlist; + gchar *name, *mlist; mlist = camel_header_raw_check_mailing_list (&((CamelMimePart *)msg)->headers); if (mlist) { @@ -300,10 +300,10 @@ rule_from_message (FilterRule *rule, RuleContext *context, CamelMimeMessage *msg } FilterRule * -em_vfolder_rule_from_message (EMVFolderContext *context, CamelMimeMessage *msg, int flags, const char *source) +em_vfolder_rule_from_message (EMVFolderContext *context, CamelMimeMessage *msg, gint flags, const gchar *source) { EMVFolderRule *rule; - char *euri = em_uri_from_camel(source); + gchar *euri = em_uri_from_camel(source); rule = em_vfolder_rule_new (); em_vfolder_rule_add_source (rule, euri); @@ -314,10 +314,10 @@ em_vfolder_rule_from_message (EMVFolderContext *context, CamelMimeMessage *msg, } FilterRule * -em_vfolder_rule_from_address (EMVFolderContext *context, CamelInternetAddress *addr, int flags, const char *source) +em_vfolder_rule_from_address (EMVFolderContext *context, CamelInternetAddress *addr, gint flags, const gchar *source) { EMVFolderRule *rule; - char *euri = em_uri_from_camel(source); + gchar *euri = em_uri_from_camel(source); rule = em_vfolder_rule_new (); em_vfolder_rule_add_source (rule, euri); @@ -328,7 +328,7 @@ em_vfolder_rule_from_address (EMVFolderContext *context, CamelInternetAddress *a } FilterRule * -filter_rule_from_message (EMFilterContext *context, CamelMimeMessage *msg, int flags) +filter_rule_from_message (EMFilterContext *context, CamelMimeMessage *msg, gint flags) { EMFilterRule *rule; FilterPart *part; @@ -343,10 +343,10 @@ filter_rule_from_message (EMFilterContext *context, CamelMimeMessage *msg, int f } void -filter_gui_add_from_message (CamelMimeMessage *msg, const char *source, int flags) +filter_gui_add_from_message (CamelMimeMessage *msg, const gchar *source, gint flags) { EMFilterContext *fc; - char *user, *system; + gchar *user, *system; FilterRule *rule; g_return_if_fail (msg != NULL); @@ -368,12 +368,12 @@ filter_gui_add_from_message (CamelMimeMessage *msg, const char *source, int flag } void -mail_filter_rename_uri(CamelStore *store, const char *olduri, const char *newuri) +mail_filter_rename_uri(CamelStore *store, const gchar *olduri, const gchar *newuri) { EMFilterContext *fc; - char *user, *system; + gchar *user, *system; GList *changed; - char *eolduri, *enewuri; + gchar *eolduri, *enewuri; eolduri = em_uri_from_camel(olduri); enewuri = em_uri_from_camel(newuri); @@ -400,12 +400,12 @@ mail_filter_rename_uri(CamelStore *store, const char *olduri, const char *newuri } void -mail_filter_delete_uri(CamelStore *store, const char *uri) +mail_filter_delete_uri(CamelStore *store, const gchar *uri) { EMFilterContext *fc; - char *user, *system; + gchar *user, *system; GList *deleted; - char *euri; + gchar *euri; euri = em_uri_from_camel(uri); @@ -424,7 +424,7 @@ mail_filter_delete_uri(CamelStore *store, const char *uri) s = g_string_new(""); l = deleted; while (l) { - g_string_append_printf (s, " %s\n", (char *)l->data); + g_string_append_printf (s, " %s\n", (gchar *)l->data); l = l->next; } diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h index c12539a9d2..67ff5d6310 100644 --- a/mail/mail-autofilter.h +++ b/mail/mail-autofilter.h @@ -38,15 +38,15 @@ enum { AUTO_MLIST = 8 }; -struct _FilterRule *em_vfolder_rule_from_message(struct _EMVFolderContext *context, struct _CamelMimeMessage *msg, int flags, const char *source); -struct _FilterRule *filter_rule_from_message(struct _EMFilterContext *context, struct _CamelMimeMessage *msg, int flags); -struct _FilterRule *em_vfolder_rule_from_address(struct _EMVFolderContext *context, struct _CamelInternetAddress *addr, int flags, const char *source); +struct _FilterRule *em_vfolder_rule_from_message(struct _EMVFolderContext *context, struct _CamelMimeMessage *msg, gint flags, const gchar *source); +struct _FilterRule *filter_rule_from_message(struct _EMFilterContext *context, struct _CamelMimeMessage *msg, gint flags); +struct _FilterRule *em_vfolder_rule_from_address(struct _EMVFolderContext *context, struct _CamelInternetAddress *addr, gint flags, const gchar *source); /* easiest place to put this */ -void filter_gui_add_from_message(struct _CamelMimeMessage *msg, const char *source, int flags); +void filter_gui_add_from_message(struct _CamelMimeMessage *msg, const gchar *source, gint flags); /* Also easiest place for these, we should really share a global rule context for this stuff ... */ -void mail_filter_rename_uri(struct _CamelStore *store, const char *olduri, const char *newuri); -void mail_filter_delete_uri(struct _CamelStore *store, const char *uri); +void mail_filter_rename_uri(struct _CamelStore *store, const gchar *olduri, const gchar *newuri); +void mail_filter_delete_uri(struct _CamelStore *store, const gchar *uri); #endif diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c index 268f0b5e3c..9a95823bd4 100644 --- a/mail/mail-component-factory.c +++ b/mail/mail-component-factory.c @@ -57,7 +57,7 @@ #define FOLDER_INFO_ID "OAFIID:GNOME_Evolution_FolderInfo:" BASE_VERSION static BonoboObject * -factory(BonoboGenericFactory *factory, const char *component_id, void *closure) +factory(BonoboGenericFactory *factory, const gchar *component_id, gpointer closure) { BonoboObject *o; @@ -81,9 +81,9 @@ factory(BonoboGenericFactory *factory, const char *component_id, void *closure) } static Bonobo_Unknown -make_factory (PortableServer_POA poa, const char *iid, gpointer impl_ptr, CORBA_Environment *ev) +make_factory (PortableServer_POA poa, const gchar *iid, gpointer impl_ptr, CORBA_Environment *ev) { - static int init = 0; + static gint init = 0; if (!init) { EImportClass *klass; diff --git a/mail/mail-component.c b/mail/mail-component.c index 698cc940f8..339e2345e0 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -99,32 +99,32 @@ #define d(x) -static void create_local_item_cb(EUserCreatableItemsHandler *handler, const char *item_type_name, void *data); +static void create_local_item_cb(EUserCreatableItemsHandler *handler, const gchar *item_type_name, gpointer data); 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; +extern gint 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; +const gchar *x_mailer = "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT; #define OFFLINE 0 #define ONLINE 1 struct _store_info { CamelStore *store; - char *name; + gchar *name; /* we keep a reference to these so they remain around for the session */ CamelFolder *vtrash; CamelFolder *vjunk; /* for setup only */ - void (*done)(CamelStore *store, CamelFolderInfo *info, void *data); - void *done_data; + void (*done)(CamelStore *store, CamelFolderInfo *info, gpointer data); + gpointer done_data; - int ref_count:31; + gint ref_count:31; guint removed:1; }; @@ -133,10 +133,10 @@ struct _MailComponentPrivate { /* states/data used during shutdown */ enum { MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state; - int quit_count; - int quit_expunge; /* expunge on quit this time around? */ + gint quit_count; + gint quit_expunge; /* expunge on quit this time around? */ - char *base_directory; + gchar *base_directory; EMFolderTreeModel *model; @@ -147,7 +147,7 @@ struct _MailComponentPrivate { RuleContext *search_context; - char *context_path; /* current path for right-click menu */ + gchar *context_path; /* current path for right-click menu */ CamelStore *local_store; ELogger *logger; @@ -161,7 +161,7 @@ struct _MailComponentPrivate { /* indexed by _mail_component_folder_t */ static struct { const gchar *name; - char *uri; + gchar *uri; CamelFolder *folder; } mc_default_folders[] = { /* translators: standard local mailbox names */ @@ -174,7 +174,7 @@ static struct { }; static struct _store_info * -store_info_new(CamelStore *store, const char *name) +store_info_new(CamelStore *store, const gchar *name) { struct _store_info *si; @@ -220,7 +220,7 @@ store_info_unref(struct _store_info *si) } static gboolean -mc_add_store_done(CamelStore *store, CamelFolderInfo *info, void *data) +mc_add_store_done(CamelStore *store, CamelFolderInfo *info, gpointer data) { struct _store_info *si = data; @@ -242,7 +242,7 @@ mc_add_store_done(CamelStore *store, CamelFolderInfo *info, void *data) /* Utility functions. */ static void -mc_add_store(MailComponent *component, CamelStore *store, const char *name, void (*done)(CamelStore *store, CamelFolderInfo *info, void *data)) +mc_add_store(MailComponent *component, CamelStore *store, const gchar *name, void (*done)(CamelStore *store, CamelFolderInfo *info, gpointer data)) { struct _store_info *si; @@ -257,10 +257,10 @@ mc_add_store(MailComponent *component, CamelStore *store, const char *name, void } static void -mc_add_local_store_done(CamelStore *store, CamelFolderInfo *info, void *data) +mc_add_local_store_done(CamelStore *store, CamelFolderInfo *info, gpointer data) { /*MailComponent *mc = data;*/ - int i; + gint i; for (i=0;ipriv; CamelURL *url; - char *tmp; + gchar *tmp; CamelException ex; - int i; + gint i; g_mutex_lock(p->lock); if (p->local_store != NULL) { @@ -343,7 +343,7 @@ load_accounts (MailComponent *component, EAccountList *accounts) while (e_iterator_is_valid (iter)) { EAccountService *service; EAccount *account; - const char *name; + const gchar *name; account = (EAccount *) e_iterator_get (iter); service = account->source; @@ -369,8 +369,8 @@ setup_search_context (MailComponent *component) MailComponentPrivate *priv = component->priv; if (priv->search_context == NULL) { - char *user = g_build_filename(component->priv->base_directory, "searches.xml", NULL); - char *system = g_build_filename (EVOLUTION_PRIVDATADIR, "searchtypes.xml", NULL); + gchar *user = g_build_filename(component->priv->base_directory, "searches.xml", NULL); + gchar *system = g_build_filename (EVOLUTION_PRIVDATADIR, "searchtypes.xml", NULL); priv->search_context = (RuleContext *)em_search_context_new (); g_object_set_data_full (G_OBJECT (priv->search_context), "user", user, g_free); @@ -382,7 +382,7 @@ setup_search_context (MailComponent *component) static void mc_startup(MailComponent *mc) { - static int started = 0; + static gint started = 0; GConfClient *gconf; if (started) @@ -399,7 +399,7 @@ mc_startup(MailComponent *mc) } static void -folder_selected_cb (EMFolderTree *emft, const char *path, const char *uri, guint32 flags, EMFolderView *view) +folder_selected_cb (EMFolderTree *emft, const gchar *path, const gchar *uri, guint32 flags, EMFolderView *view) { EMFolderTreeModel *model; @@ -415,7 +415,7 @@ folder_selected_cb (EMFolderTree *emft, const char *path, const char *uri, guint } static int -check_autosave(void *data) +check_autosave(gpointer data) { e_msg_composer_check_autosave(NULL); @@ -426,7 +426,7 @@ static void view_control_activate_cb (BonoboControl *control, gboolean activate, EMFolderView *view) { BonoboUIComponent *uic; - static int recover = 0; + static gint recover = 0; uic = bonobo_control_get_ui_component (control); g_return_if_fail (uic != NULL); @@ -515,7 +515,7 @@ impl_finalize (GObject *object) } static void -view_on_url (GObject *emitter, const char *url, const char *nice_url, MailComponent *mail_component) +view_on_url (GObject *emitter, const gchar *url, const gchar *nice_url, MailComponent *mail_component) { MailComponentPrivate *priv = mail_component->priv; @@ -531,8 +531,8 @@ view_changed(EMFolderView *emfv, EComponentView *component_view) CORBA_exception_init(&ev); if (emfv->folder) { - char *name, *title; - const char *use_name; /* will contain localized name, if necessary */ + gchar *name, *title; + const gchar *use_name; /* will contain localized name, if necessary */ guint32 visible, unread, deleted, junked, junked_not_deleted; GPtrArray *selected; GString *tmp = g_string_new(""); @@ -623,7 +623,7 @@ view_changed_timeout_remove (EComponentView *component_view) } static int -view_changed_timeout(void *d) +view_changed_timeout(gpointer d) { EComponentView *component_view = d; EInfoLabel *el = g_object_get_data((GObject *)component_view, "info-label"); @@ -643,7 +643,7 @@ static void view_changed_cb(EMFolderView *emfv, EComponentView *component_view) { MailComponent *mc = mail_component_peek (); - void *v; + gpointer v; EInfoLabel *el = g_object_get_data((GObject *)component_view, "info-label"); v = g_object_get_data((GObject *)component_view, "view-changed-timeout"); @@ -726,7 +726,7 @@ impl_createView (PortableServer_Servant servant, GtkWidget *tree_widget, *vbox, *info; GtkWidget *view_widget; GtkWidget *statusbar_widget; - char *uri; + gchar *uri; mail_session_set_interactive(TRUE); mc_startup(mail_component); @@ -822,7 +822,7 @@ impl_requestQuit(PortableServer_Servant servant, CORBA_Environment *ev) } static void -mc_quit_sync_done(CamelStore *store, void *data) +mc_quit_sync_done(CamelStore *store, gpointer data) { MailComponent *mc = data; @@ -843,7 +843,7 @@ mc_quit_delete (CamelStore *store, struct _store_info *si, MailComponent *mc) if (folder) { GPtrArray *uids; - int i; + gint i; uids = camel_folder_get_uids (folder); camel_folder_freeze(folder); @@ -865,7 +865,7 @@ impl_quit(PortableServer_Servant servant, CORBA_Environment *ev) mail_config_prune_proxies (); switch (mc->priv->quit_state) { case MC_QUIT_START: { - int now = time(NULL)/60/60/24, days; + gint now = time(NULL)/60/60/24, days; gboolean empty_junk; GConfClient *gconf = mail_config_get_gconf_client(); @@ -926,27 +926,27 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment CORBA_sequence_set_release (list, FALSE); - list->_buffer[0].id = (char *) "message"; + list->_buffer[0].id = (gchar *) "message"; list->_buffer[0].description = _("New Mail Message"); - list->_buffer[0].menuDescription = (char *) C_("New", "_Mail Message"); + list->_buffer[0].menuDescription = (gchar *) C_("New", "_Mail Message"); list->_buffer[0].tooltip = _("Compose a new mail message"); list->_buffer[0].menuShortcut = 'm'; - list->_buffer[0].iconName = (char *) "mail-message-new"; + list->_buffer[0].iconName = (gchar *) "mail-message-new"; list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - list->_buffer[1].id = (char *) "folder"; + list->_buffer[1].id = (gchar *) "folder"; list->_buffer[1].description = _("New Mail Folder"); - list->_buffer[1].menuDescription = (char *) C_("New", "Mail _Folder"); + list->_buffer[1].menuDescription = (gchar *) C_("New", "Mail _Folder"); list->_buffer[1].tooltip = _("Create a new mail folder"); list->_buffer[1].menuShortcut = '\0'; - list->_buffer[1].iconName = (char *) "folder-new"; + list->_buffer[1].iconName = (gchar *) "folder-new"; list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER; return list; } static int -create_item(const char *type, EMFolderTreeModel *model, const char *uri, gpointer tree) +create_item(const gchar *type, EMFolderTreeModel *model, const gchar *uri, gpointer tree) { if (strcmp(type, "message") == 0) { if (!em_utils_check_user_can_send_mail(NULL)) @@ -962,10 +962,10 @@ create_item(const char *type, EMFolderTreeModel *model, const char *uri, gpointe } static void -create_local_item_cb(EUserCreatableItemsHandler *handler, const char *item_type_name, void *data) +create_local_item_cb(EUserCreatableItemsHandler *handler, const gchar *item_type_name, gpointer data) { EMFolderTree *tree = data; - char *uri = em_folder_tree_get_selected_uri(tree); + gchar *uri = em_folder_tree_get_selected_uri(tree); create_item(item_type_name, em_folder_tree_get_model(tree), uri, (gpointer) tree); g_free(uri); @@ -985,15 +985,15 @@ impl_requestCreateItem (PortableServer_Servant servant, } static void -handleuri_got_folder(char *uri, CamelFolder *folder, void *data) +handleuri_got_folder(gchar *uri, CamelFolder *folder, gpointer data) { CamelURL *url = data; EMMessageBrowser *emmb; if (folder != NULL) { - const char *reply = camel_url_get_param(url, "reply"); - const char *forward = camel_url_get_param(url, "forward"); - int mode; + const gchar *reply = camel_url_get_param(url, "reply"); + const gchar *forward = camel_url_get_param(url, "forward"); + gint mode; if (reply) { @@ -1007,7 +1007,7 @@ handleuri_got_folder(char *uri, CamelFolder *folder, void *data) em_utils_reply_to_message(folder, camel_url_get_param(url, "uid"), NULL, mode, NULL); } else if (forward) { GPtrArray *uids; - const char* uid; + const gchar * uid; uid = camel_url_get_param(url, "uid"); if (uid == NULL) @@ -1042,7 +1042,7 @@ handleuri_got_folder(char *uri, CamelFolder *folder, void *data) } static void -impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environment *ev) +impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environment *ev) { if (!strncmp (uri, "mailto:", 7)) { if (!em_utils_check_user_can_send_mail(NULL)) @@ -1053,7 +1053,7 @@ impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environme CamelURL *url = camel_url_new(uri, NULL); if (camel_url_get_param(url, "uid") != NULL) { - char *curi = em_uri_to_camel(uri); + gchar *curi = em_uri_to_camel(uri); mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push); g_free(curi); @@ -1093,7 +1093,7 @@ impl_upgradeFromVersion (PortableServer_Servant servant, const short major, cons } static void -mc_sync_store_done (CamelStore *store, void *data) +mc_sync_store_done (CamelStore *store, gpointer data) { MailComponent *mc = (MailComponent *) data; @@ -1130,11 +1130,11 @@ call_mail_sync (gpointer user_data) struct _setline_data { GNOME_Evolution_Listener listener; CORBA_boolean status; - int pending; + gint pending; }; static void -setline_done(CamelStore *store, void *data) +setline_done(CamelStore *store, gpointer data) { struct _setline_data *sd = data; @@ -1155,7 +1155,7 @@ setline_done(CamelStore *store, void *data) } static void -setline_check(void *key, void *value, void *data) +setline_check(gpointer key, gpointer value, gpointer data) { CamelService *service = key; struct _setline_data *sd = data; @@ -1167,10 +1167,10 @@ setline_check(void *key, void *value, void *data) } } -int +gint status_check (GNOME_Evolution_ShellState shell_state) { - int status = 0; + gint status = 0; switch (shell_state) { @@ -1197,7 +1197,7 @@ static void impl_setLineStatus(PortableServer_Servant servant, GNOME_Evolution_ShellState shell_state, GNOME_Evolution_Listener listener, CORBA_Environment *ev) { struct _setline_data *sd; - int status = status_check(shell_state); + gint status = status_check(shell_state); /* This will dis/enable further auto-mail-check action. */ /* FIXME: If send/receive active, wait for it to finish? */ @@ -1289,7 +1289,7 @@ mail_component_init (MailComponent *component) priv->base_directory = g_build_filename (e_get_user_data_dir (), "mail", NULL); #ifdef G_OS_WIN32 { - char *p = priv->base_directory; + gchar *p = priv->base_directory; while ((p = strchr(p, '\\'))) *p++ = '/'; } @@ -1333,7 +1333,7 @@ mail_component_peek (void) return component; } -const char * +const gchar * mail_component_peek_base_directory (MailComponent *component) { MAIL_COMPONENT_DEFAULT(component); @@ -1367,7 +1367,7 @@ struct _CamelSession *mail_component_peek_session(MailComponent *component) } void -mail_component_add_store (MailComponent *component, CamelStore *store, const char *name) +mail_component_add_store (MailComponent *component, CamelStore *store, const gchar *name) { mc_add_store(component, store, name, NULL); } @@ -1382,7 +1382,7 @@ mail_component_add_store (MailComponent *component, CamelStore *store, const cha * to ref the object if it wants to store it. **/ CamelStore * -mail_component_load_store_by_uri (MailComponent *component, const char *uri, const char *name) +mail_component_load_store_by_uri (MailComponent *component, const gchar *uri, const gchar *name) { CamelException ex; CamelStore *store; @@ -1425,7 +1425,7 @@ mail_component_load_store_by_uri (MailComponent *component, const char *uri, con } static void -store_disconnect (CamelStore *store, void *event_data, void *user_data) +store_disconnect (CamelStore *store, gpointer event_data, gpointer user_data) { camel_service_disconnect (CAMEL_SERVICE (store), TRUE, NULL); camel_object_unref (store); @@ -1462,7 +1462,7 @@ mail_component_remove_store (MailComponent *component, CamelStore *store) } void -mail_component_remove_store_by_uri (MailComponent *component, const char *uri) +mail_component_remove_store_by_uri (MailComponent *component, const gchar *uri) { CamelProvider *prov; CamelStore *store; @@ -1482,7 +1482,7 @@ mail_component_remove_store_by_uri (MailComponent *component, const char *uri) } } -int +gint mail_component_get_store_count (MailComponent *component) { MAIL_COMPONENT_DEFAULT(component); @@ -1493,17 +1493,17 @@ mail_component_get_store_count (MailComponent *component) /* need to map from internal struct to external api */ struct _store_foreach_data { GHFunc func; - void *data; + gpointer data; }; static void mc_stores_foreach(CamelStore *store, struct _store_info *si, struct _store_foreach_data *data) { - data->func((void *)store, (void *)si->name, data->data); + data->func((gpointer)store, (gpointer)si->name, data->data); } void -mail_component_stores_foreach (MailComponent *component, GHFunc func, void *user_data) +mail_component_stores_foreach (MailComponent *component, GHFunc func, gpointer user_data) { struct _store_foreach_data data = { func, user_data }; @@ -1513,7 +1513,7 @@ mail_component_stores_foreach (MailComponent *component, GHFunc func, void *user } void -mail_component_remove_folder (MailComponent *component, CamelStore *store, const char *path) +mail_component_remove_folder (MailComponent *component, CamelStore *store, const gchar *path) { MAIL_COMPONENT_DEFAULT(component); @@ -1566,7 +1566,7 @@ mail_component_get_folder(MailComponent *mc, enum _mail_component_folder_t id) * * Return value: **/ -const char * +const gchar * mail_component_get_folder_uri(MailComponent *mc, enum _mail_component_folder_t id) { g_return_val_if_fail (id <= MAIL_COMPONENT_FOLDER_LOCAL_INBOX, NULL); @@ -1585,7 +1585,7 @@ mail_component_get_folder_uri(MailComponent *mc, enum _mail_component_folder_t i void mail_indicate_new_mail (gboolean have_new_mail) { - const char *icon = NULL; + const gchar *icon = NULL; MailComponent *mc = mail_component_peek (); g_return_if_fail (mc != NULL); diff --git a/mail/mail-component.h b/mail/mail-component.h index 9af5caa40f..ef781d119a 100644 --- a/mail/mail-component.h +++ b/mail/mail-component.h @@ -67,7 +67,7 @@ GType mail_component_get_type (void); MailComponent *mail_component_peek (void); /* NOTE: Using NULL as the component implies using the default component */ -const char *mail_component_peek_base_directory (MailComponent *component); +const gchar *mail_component_peek_base_directory (MailComponent *component); struct _RuleContext *mail_component_peek_search_context (MailComponent *component); struct _EActivityHandler *mail_component_peek_activity_handler (MailComponent *component); @@ -75,30 +75,30 @@ struct _CamelSession *mail_component_peek_session(MailComponent *); void mail_component_add_store (MailComponent *component, struct _CamelStore *store, - const char *name); + const gchar *name); struct _CamelStore *mail_component_load_store_by_uri (MailComponent *component, - const char *uri, - const char *name); + const gchar *uri, + const gchar *name); void mail_component_remove_store (MailComponent *component, struct _CamelStore *store); void mail_component_remove_store_by_uri (MailComponent *component, - const char *uri); + const gchar *uri); -int mail_component_get_store_count (MailComponent *component); +gint mail_component_get_store_count (MailComponent *component); void mail_component_stores_foreach (MailComponent *component, GHFunc func, void *data); -void mail_component_remove_folder (MailComponent *component, struct _CamelStore *store, const char *path); +void mail_component_remove_folder (MailComponent *component, struct _CamelStore *store, const gchar *path); struct _EMFolderTreeModel *mail_component_peek_tree_model (MailComponent *component); struct _CamelStore *mail_component_peek_local_store (MailComponent *mc); struct _CamelFolder *mail_component_get_folder(MailComponent *mc, enum _mail_component_folder_t id); -const char *mail_component_get_folder_uri(MailComponent *mc, enum _mail_component_folder_t id); +const gchar *mail_component_get_folder_uri(MailComponent *mc, enum _mail_component_folder_t id); -int status_check (GNOME_Evolution_ShellState shell_state); +gint status_check (GNOME_Evolution_ShellState shell_state); void mail_indicate_new_mail (gboolean have_new_mail); void mail_component_show_logger (gpointer); diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c index f89383580c..75442b27fb 100644 --- a/mail/mail-config-factory.c +++ b/mail/mail-config-factory.c @@ -37,7 +37,7 @@ #define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ConfigControlFactory:" BASE_VERSION BonoboObject * -mail_config_control_factory_cb (BonoboGenericFactory *factory, const char *component_id, void *user_data) +mail_config_control_factory_cb (BonoboGenericFactory *factory, const gchar *component_id, gpointer user_data) { GNOME_Evolution_Shell shell = (GNOME_Evolution_Shell) user_data; EvolutionConfigControl *control; diff --git a/mail/mail-config-factory.h b/mail/mail-config-factory.h index 430058364e..428598a663 100644 --- a/mail/mail-config-factory.h +++ b/mail/mail-config-factory.h @@ -35,7 +35,7 @@ extern "C" { gboolean mail_config_register_factory (GNOME_Evolution_Shell shell); -BonoboObject *mail_config_control_factory_cb (BonoboGenericFactory *factory, const char *component_id, void *user_data); +BonoboObject *mail_config_control_factory_cb (BonoboGenericFactory *factory, const gchar *component_id, gpointer user_data); #ifdef __cplusplus } diff --git a/mail/mail-config.c b/mail/mail-config.c index bcf8dd7854..d414f75f0c 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -81,7 +81,7 @@ typedef struct { gboolean corrupt; - char *gtkrc; + gchar *gtkrc; EAccountList *accounts; ESignatureList *signatures; @@ -105,7 +105,7 @@ typedef struct { gboolean scripts_disabled; } MailConfig; -extern int camel_header_param_encode_filenames_in_rfc_2047; +extern gint camel_header_param_encode_filenames_in_rfc_2047; static MailConfig *config = NULL; static guint config_write_timeout = 0; @@ -125,7 +125,7 @@ mail_config_save_signatures (void) static void config_clear_mime_types (void) { - int i; + gint i; for (i = 0; i < config->mime_types->len; i++) g_free (config->mime_types->pdata[i]); @@ -278,13 +278,13 @@ gconf_jh_check_changed (GConfClient *client, guint cnxn_id, name = g_ptr_array_new (); value = g_ptr_array_new (); while (node && node->data) { - char **tok = g_strsplit (node->data, "=", 2); + gchar **tok = g_strsplit (node->data, "=", 2); g_ptr_array_add (name, g_strdup(tok[0])); g_ptr_array_add (value, g_strdup(tok[1])); node = node->next; g_strfreev (tok); } - mail_session_set_junk_headers ((const char **)name->pdata, (const char **)value->pdata, name->len); + mail_session_set_junk_headers ((const gchar **)name->pdata, (const gchar **)value->pdata, name->len); g_ptr_array_free (name, TRUE); g_ptr_array_free (value, TRUE); } @@ -302,13 +302,13 @@ gconf_jh_headers_changed (GConfClient *client, guint cnxn_id, name = g_ptr_array_new (); value = g_ptr_array_new (); while (node && node->data) { - char **tok = g_strsplit (node->data, "=", 2); + gchar **tok = g_strsplit (node->data, "=", 2); g_ptr_array_add (name, g_strdup(tok[0])); g_ptr_array_add (value, g_strdup(tok[1])); node = node->next; g_strfreev (tok); } - mail_session_set_junk_headers ((const char **)name->pdata, (const char **)value->pdata, name->len); + mail_session_set_junk_headers ((const gchar **)name->pdata, (const gchar **)value->pdata, name->len); } static void @@ -594,7 +594,7 @@ mail_config_write_on_exit (void) session cache */ iter = e_list_get_iterator ((EList *) config->accounts); while (e_iterator_is_valid (iter)) { - char *passwd; + gchar *passwd; account = (EAccount *) e_iterator_get (iter); @@ -667,7 +667,7 @@ mail_config_is_corrupt (void) return config->corrupt; } -int +gint mail_config_get_address_count (void) { if (!config->address_compress) @@ -694,7 +694,7 @@ mail_config_get_error_level (void) return config->error_level; } -int +gint mail_config_get_message_limit (void) { if (!config->mlimit) @@ -746,10 +746,10 @@ mail_config_get_labels (void) return config->labels; } -const char ** +const gchar ** mail_config_get_allowable_mime_types (void) { - return (const char **) config->mime_types->pdata; + return (const gchar **) config->mime_types->pdata; } gboolean @@ -788,19 +788,19 @@ mail_config_get_default_account (void) } EAccount * -mail_config_get_account_by_name (const char *account_name) +mail_config_get_account_by_name (const gchar *account_name) { return (EAccount *)e_account_list_find(config->accounts, E_ACCOUNT_FIND_NAME, account_name); } EAccount * -mail_config_get_account_by_uid (const char *uid) +mail_config_get_account_by_uid (const gchar *uid) { return (EAccount *) e_account_list_find (config->accounts, E_ACCOUNT_FIND_UID, uid); } static EAccount * -mc_get_account_by (const char *given_url, const char * (get_url_string)(EAccount *account)) +mc_get_account_by (const gchar *given_url, const gchar * (get_url_string)(EAccount *account)) { EAccount *account = NULL; EIterator *iter; @@ -819,7 +819,7 @@ mc_get_account_by (const char *given_url, const char * (get_url_string)(EAccount iter = e_list_get_iterator ((EList *) config->accounts); while (account == NULL && e_iterator_is_valid (iter)) { CamelURL *account_url; - const char *account_url_string; + const gchar *account_url_string; account = (EAccount *) e_iterator_get (iter); @@ -850,7 +850,7 @@ mc_get_account_by (const char *given_url, const char * (get_url_string)(EAccount return account; } -static const char * +static const gchar * get_source_url_string (EAccount *account) { if (account && account->source && account->source->url && *account->source->url) @@ -858,7 +858,7 @@ get_source_url_string (EAccount *account) return NULL; } -static const char * +static const gchar * get_transport_url_string (EAccount *account) { if (account && account->transport && account->transport->url && *account->transport->url) @@ -867,18 +867,18 @@ get_transport_url_string (EAccount *account) } EAccount * -mail_config_get_account_by_source_url (const char *source_url) +mail_config_get_account_by_source_url (const gchar *source_url) { return mc_get_account_by (source_url, get_source_url_string); } EAccount * -mail_config_get_account_by_transport_url (const char *transport_url) +mail_config_get_account_by_transport_url (const gchar *transport_url) { return mc_get_account_by (transport_url, get_transport_url_string); } -int +gint mail_config_has_proxies (EAccount *account) { return e_account_list_account_has_proxies (config->accounts, account); @@ -966,12 +966,12 @@ mail_config_get_default_transport (void) return NULL; } -static char * -uri_to_evname (const char *uri, const char *prefix) +static gchar * +uri_to_evname (const gchar *uri, const gchar *prefix) { - const char *base_directory = mail_component_peek_base_directory (mail_component_peek ()); - char *safe; - char *tmp; + const gchar *base_directory = mail_component_peek_base_directory (mail_component_peek ()); + gchar *safe; + gchar *tmp; safe = g_strdup (uri); e_filename_make_safe (safe); @@ -985,12 +985,12 @@ uri_to_evname (const char *uri, const char *prefix) } void -mail_config_uri_renamed (GCompareFunc uri_cmp, const char *old, const char *new) +mail_config_uri_renamed (GCompareFunc uri_cmp, const gchar *old, const gchar *new) { EAccount *account; EIterator *iter; - int i, work = 0; - char *oldname, *newname; + gint i, work = 0; + gchar *oldname, *newname; const gchar *cachenames[] = { "config/hidestate-", "config/et-expanded-", @@ -1038,14 +1038,14 @@ mail_config_uri_renamed (GCompareFunc uri_cmp, const char *old, const char *new) } void -mail_config_uri_deleted (GCompareFunc uri_cmp, const char *uri) +mail_config_uri_deleted (GCompareFunc uri_cmp, const gchar *uri) { EAccount *account; EIterator *iter; - int work = 0; + gint work = 0; /* assumes these can't be removed ... */ - const char *default_sent_folder_uri = mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_SENT); - const char *default_drafts_folder_uri = mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_DRAFTS); + const gchar *default_sent_folder_uri = mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_SENT); + const gchar *default_drafts_folder_uri = mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_DRAFTS); iter = e_list_get_iterator ((EList *) config->accounts); while (e_iterator_is_valid (iter)) { @@ -1077,10 +1077,10 @@ mail_config_service_set_save_passwd (EAccountService *service, gboolean save_pas service->save_passwd = save_passwd; } -char * +gchar * mail_config_folder_to_safe_url (CamelFolder *folder) { - char *url; + gchar *url; url = mail_tools_folder_to_url (folder); e_filename_make_safe (url); @@ -1088,11 +1088,11 @@ mail_config_folder_to_safe_url (CamelFolder *folder) return url; } -char * -mail_config_folder_to_cachename (CamelFolder *folder, const char *prefix) +gchar * +mail_config_folder_to_cachename (CamelFolder *folder, const gchar *prefix) { - char *url, *basename, *filename; - const char *evolution_dir; + gchar *url, *basename, *filename; + const gchar *evolution_dir; evolution_dir = mail_component_peek_base_directory (mail_component_peek ()); @@ -1111,13 +1111,13 @@ mail_config_get_signatures (void) return config->signatures; } -static char * +static gchar * get_new_signature_filename (void) { - const char *base_directory; - char *filename, *id; + const gchar *base_directory; + gchar *filename, *id; struct stat st; - int i; + gint i; base_directory = e_get_user_data_dir (); filename = g_build_filename (base_directory, "signatures", NULL); @@ -1137,7 +1137,7 @@ get_new_signature_filename (void) for (i = 0; i < (INT_MAX - 1); i++) { sprintf (id, "%d", i); if (g_lstat (filename, &st) == -1 && errno == ENOENT) { - int fd; + gint fd; fd = g_creat (filename, 0600); if (fd >= 0) { @@ -1154,7 +1154,7 @@ get_new_signature_filename (void) ESignature * -mail_config_signature_new (const char *filename, gboolean script, gboolean html) +mail_config_signature_new (const gchar *filename, gboolean script, gboolean html) { ESignature *sig; @@ -1172,13 +1172,13 @@ mail_config_signature_new (const char *filename, gboolean script, gboolean html) } ESignature * -mail_config_get_signature_by_uid (const char *uid) +mail_config_get_signature_by_uid (const gchar *uid) { return (ESignature *) e_signature_list_find (config->signatures, E_SIGNATURE_FIND_UID, uid); } ESignature * -mail_config_get_signature_by_name (const char *name) +mail_config_get_signature_by_name (const gchar *name) { return (ESignature *) e_signature_list_find (config->signatures, E_SIGNATURE_FIND_NAME, name); } @@ -1240,12 +1240,12 @@ mail_config_scripts_disabled (void) return config->scripts_disabled; } -char * -mail_config_signature_run_script (const char *script) +gchar * +mail_config_signature_run_script (const gchar *script) { #ifndef G_OS_WIN32 - int result, status; - int in_fds[2]; + gint result, status; + gint in_fds[2]; pid_t pid; if (mail_config_scripts_disabled ()) @@ -1258,7 +1258,7 @@ mail_config_signature_run_script (const char *script) if (!(pid = fork ())) { /* child process */ - int maxfd, i; + gint maxfd, i; close (in_fds [0]); if (dup2 (in_fds[1], STDOUT_FILENO) < 0) @@ -1287,8 +1287,8 @@ mail_config_signature_run_script (const char *script) CamelMimeFilter *charenc; CamelStream *stream; GByteArray *buffer; - char *charset; - char *content; + gchar *charset; + gchar *content; /* parent process */ close (in_fds[1]); @@ -1306,7 +1306,7 @@ mail_config_signature_run_script (const char *script) are known to not ever read the manual... we try to do our best if the content isn't valid UTF-8 by assuming that the content is in the user's preferred charset. */ - if (!g_utf8_validate ((char *)buffer->data, buffer->len, NULL)) { + if (!g_utf8_validate ((gchar *)buffer->data, buffer->len, NULL)) { stream = (CamelStream *) memstream; memstream = (CamelStreamMem *) camel_stream_mem_new (); camel_stream_mem_set_byte_array (memstream, g_byte_array_new ()); @@ -1332,8 +1332,8 @@ mail_config_signature_run_script (const char *script) camel_object_unref (memstream); - g_byte_array_append (buffer, (const unsigned char *)"", 1); - content = (char *)buffer->data; + g_byte_array_append (buffer, (const guchar *)"", 1); + content = (gchar *)buffer->data; g_byte_array_free (buffer, FALSE); /* wait for the script process to terminate */ diff --git a/mail/mail-config.h b/mail/mail-config.h index aea5c5da94..d2fef97d8e 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -46,10 +46,10 @@ extern "C" { #endif /* __cplusplus */ typedef struct _MailConfigSignature { - int id; - char *name; - char *filename; - char *script; + gint id; + gchar *name; + gchar *filename; + gchar *script; gboolean html; } MailConfigSignature; @@ -101,29 +101,29 @@ gboolean mail_config_is_corrupt (void); GSList *mail_config_get_labels (void); -const char **mail_config_get_allowable_mime_types (void); +const gchar **mail_config_get_allowable_mime_types (void); void mail_config_service_set_save_passwd (struct _EAccountService *service, gboolean save_passwd); /* accounts */ gboolean mail_config_find_account (struct _EAccount *account); struct _EAccount *mail_config_get_default_account (void); -struct _EAccount *mail_config_get_account_by_name (const char *account_name); -struct _EAccount *mail_config_get_account_by_uid (const char *uid); -struct _EAccount *mail_config_get_account_by_source_url (const char *url); -struct _EAccount *mail_config_get_account_by_transport_url (const char *url); +struct _EAccount *mail_config_get_account_by_name (const gchar *account_name); +struct _EAccount *mail_config_get_account_by_uid (const gchar *uid); +struct _EAccount *mail_config_get_account_by_source_url (const gchar *url); +struct _EAccount *mail_config_get_account_by_transport_url (const gchar *url); struct _EAccountList *mail_config_get_accounts (void); void mail_config_add_account (struct _EAccount *account); void mail_config_remove_account (struct _EAccount *account); void mail_config_set_default_account (struct _EAccount *account); -int mail_config_get_address_count (void); -int mail_config_get_message_limit (void); +gint mail_config_get_address_count (void); +gint mail_config_get_message_limit (void); gboolean mail_config_get_enable_magic_spacebar (void); void mail_config_remove_account_proxies (struct _EAccount *account); void mail_config_prune_proxies (void); -int mail_config_has_proxies (struct _EAccount *account); +gint mail_config_has_proxies (struct _EAccount *account); struct _EAccountIdentity *mail_config_get_default_identity (void); struct _EAccountService *mail_config_get_default_transport (void); @@ -131,9 +131,9 @@ struct _EAccountService *mail_config_get_default_transport (void); void mail_config_save_accounts (void); /* signatures */ -struct _ESignature *mail_config_signature_new (const char *filename, gboolean script, gboolean html); -struct _ESignature *mail_config_get_signature_by_uid (const char *uid); -struct _ESignature *mail_config_get_signature_by_name (const char *name); +struct _ESignature *mail_config_signature_new (const gchar *filename, gboolean script, gboolean html); +struct _ESignature *mail_config_get_signature_by_uid (const gchar *uid); +struct _ESignature *mail_config_get_signature_by_name (const gchar *name); struct _ESignatureList *mail_config_get_signatures (void); void mail_config_add_signature (struct _ESignature *signature); @@ -141,16 +141,16 @@ void mail_config_remove_signature (struct _ESignature *signature); void mail_config_save_signatures (void); -char *mail_config_signature_run_script (const char *script); +gchar *mail_config_signature_run_script (const gchar *script); /* uri's got changed by the store, etc */ -void mail_config_uri_renamed (GCompareFunc uri_cmp, const char *old, const char *new); -void mail_config_uri_deleted (GCompareFunc uri_cmp, const char *uri); +void mail_config_uri_renamed (GCompareFunc uri_cmp, const gchar *old, const gchar *new); +void mail_config_uri_deleted (GCompareFunc uri_cmp, const gchar *uri); /* static utility functions */ -char *mail_config_folder_to_cachename (struct _CamelFolder *folder, const char *prefix); -char *mail_config_folder_to_safe_url (struct _CamelFolder *folder); +gchar *mail_config_folder_to_cachename (struct _CamelFolder *folder, const gchar *prefix); +gchar *mail_config_folder_to_safe_url (struct _CamelFolder *folder); guint mail_config_get_error_timeout (void); guint mail_config_get_error_level (void); diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index a84dfcbf74..a6c4b800ad 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -81,8 +81,8 @@ static pthread_mutex_t info_lock = PTHREAD_MUTEX_INITIALIZER; struct _folder_info { struct _store_info *store_info; /* 'parent' link */ - char *full_name; /* full name of folder/folderinfo */ - char *uri; /* uri of folder */ + gchar *full_name; /* full name of folder/folderinfo */ + gchar *uri; /* uri of folder */ guint32 flags; @@ -94,18 +94,18 @@ struct _folder_update { struct _folder_update *next; struct _folder_update *prev; - unsigned int remove:1; /* removing from vfolders */ - unsigned int delete:1; /* deleting as well? */ - unsigned int add:1; /* add to vfolder */ - unsigned int unsub:1; /* unsubcribing? */ - unsigned int new; /* new mail arrived? */ + guint remove:1; /* removing from vfolders */ + guint delete:1; /* deleting as well? */ + guint add:1; /* add to vfolder */ + guint unsub:1; /* unsubcribing? */ + guint new; /* new mail arrived? */ - char *full_name; - char *uri; - char *oldfull; - char *olduri; + gchar *full_name; + gchar *uri; + gchar *oldfull; + gchar *olduri; - int unread; + gint unread; CamelStore *store; }; @@ -131,11 +131,11 @@ static GHashTable *stores = NULL; /* List of folder changes to be executed in gui thread */ static EDList updates = E_DLIST_INITIALISER(updates); -static int update_id = -1; +static gint update_id = -1; /* hack for people who LIKE to have unsent count */ -static int count_sent = FALSE; -static int count_trash = FALSE; +static gint count_sent = FALSE; +static gint count_trash = FALSE; static void free_update(struct _folder_update *up) @@ -150,7 +150,7 @@ free_update(struct _folder_update *up) } static void -real_flush_updates(void *o, void *event_data, void *data) +real_flush_updates(gpointer o, gpointer event_data, gpointer data) { struct _MailComponent *component; struct _EMFolderTreeModel *model; @@ -224,7 +224,7 @@ flush_updates(void) } static void -unset_folder_info(struct _folder_info *mfi, int delete, int unsub) +unset_folder_info(struct _folder_info *mfi, gint delete, gint unsub) { struct _folder_update *up; @@ -285,12 +285,12 @@ free_folder_info(struct _folder_info *mfi) * it's correct. */ static void -update_1folder(struct _folder_info *mfi, int new, CamelFolderInfo *info) +update_1folder(struct _folder_info *mfi, gint new, CamelFolderInfo *info) { struct _folder_update *up; CamelFolder *folder; - int unread = -1; - int deleted; + gint unread = -1; + gint deleted; folder = mfi->folder; if (folder) { @@ -399,8 +399,8 @@ folder_changed (CamelObject *o, gpointer event_data, gpointer user_data) CamelMessageInfo *info; struct _store_info *si; struct _folder_info *mfi; - int new = 0; - int i; + gint new = 0; + gint i; guint32 flags; d(printf("folder '%s' changed\n", folder->full_name)); @@ -462,7 +462,7 @@ static void folder_renamed(CamelObject *o, gpointer event_data, gpointer user_data) { CamelFolder *folder = (CamelFolder *)o; - char *old = event_data; + gchar *old = event_data; d(printf("Folder renamed from '%s' to '%s'\n", old, folder->full_name)); @@ -506,7 +506,7 @@ void mail_note_folder(CamelFolder *folder) } static void -store_folder_subscribed(CamelObject *o, void *event_data, void *data) +store_folder_subscribed(CamelObject *o, gpointer event_data, gpointer data) { struct _store_info *si; CamelFolderInfo *fi = event_data; @@ -521,7 +521,7 @@ store_folder_subscribed(CamelObject *o, void *event_data, void *data) } static void -store_folder_created(CamelObject *o, void *event_data, void *data) +store_folder_created(CamelObject *o, gpointer event_data, gpointer data) { /* we only want created events to do more work if we dont support subscriptions */ if (!camel_store_supports_subscriptions(CAMEL_STORE(o))) @@ -529,7 +529,7 @@ store_folder_created(CamelObject *o, void *event_data, void *data) } static void -store_folder_opened(CamelObject *o, void *event_data, void *data) +store_folder_opened(CamelObject *o, gpointer event_data, gpointer data) { CamelFolder *folder = event_data; @@ -537,7 +537,7 @@ store_folder_opened(CamelObject *o, void *event_data, void *data) } static void -store_folder_unsubscribed(CamelObject *o, void *event_data, void *data) +store_folder_unsubscribed(CamelObject *o, gpointer event_data, gpointer data) { struct _store_info *si; CamelFolderInfo *fi = event_data; @@ -561,24 +561,24 @@ store_folder_unsubscribed(CamelObject *o, void *event_data, void *data) } static void -store_folder_deleted(CamelObject *o, void *event_data, void *data) +store_folder_deleted(CamelObject *o, gpointer event_data, gpointer data) { /* we only want deleted events to do more work if we dont support subscriptions */ if (!camel_store_supports_subscriptions(CAMEL_STORE(o))) store_folder_unsubscribed(o, event_data, data); } -static char * -folder_to_url(CamelStore *store, const char *full_name) +static gchar * +folder_to_url(CamelStore *store, const gchar *full_name) { CamelURL *url; - char *out; + gchar *out; url = camel_url_copy(((CamelService *)store)->url); if (((CamelService *)store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) { camel_url_set_fragment(url, full_name); } else { - char *name = g_alloca(strlen(full_name)+2); + gchar *name = g_alloca(strlen(full_name)+2); sprintf(name, "/%s", full_name); camel_url_set_path(url, name); @@ -591,9 +591,9 @@ folder_to_url(CamelStore *store, const char *full_name) } static void -rename_folders(struct _store_info *si, const char *oldbase, const char *newbase, CamelFolderInfo *fi) +rename_folders(struct _store_info *si, const gchar *oldbase, const gchar *newbase, CamelFolderInfo *fi) { - char *old, *olduri, *oldfile, *newuri, *newfile; + gchar *old, *olduri, *oldfile, *newuri, *newfile; struct _folder_info *mfi; struct _folder_update *up; @@ -685,7 +685,7 @@ get_folders(CamelFolderInfo *fi, GPtrArray *folders) } static int -folder_cmp(const void *ap, const void *bp) +folder_cmp(gconstpointer ap, gconstpointer bp) { const CamelFolderInfo *a = ((CamelFolderInfo **)ap)[0]; const CamelFolderInfo *b = ((CamelFolderInfo **)bp)[0]; @@ -694,7 +694,7 @@ folder_cmp(const void *ap, const void *bp) } static void -store_folder_renamed(CamelObject *o, void *event_data, void *data) +store_folder_renamed(CamelObject *o, gpointer event_data, gpointer data) { CamelStore *store = (CamelStore *)o; CamelRenameInfo *info = event_data; @@ -707,7 +707,7 @@ store_folder_renamed(CamelObject *o, void *event_data, void *data) if (si) { GPtrArray *folders = g_ptr_array_new(); CamelFolderInfo *top; - int i; + gint i; /* Ok, so for some reason the folderinfo we have comes in all messed up from imap, should find out why ... this makes it workable */ @@ -729,21 +729,21 @@ struct _update_data { struct _update_data *next; struct _update_data *prev; - int id; /* id for cancellation */ + gint id; /* id for cancellation */ guint cancel:1; /* also tells us we're cancelled */ - gboolean (*done)(CamelStore *store, CamelFolderInfo *info, void *data); - void *data; + gboolean (*done)(CamelStore *store, CamelFolderInfo *info, gpointer data); + gpointer data; }; static void -unset_folder_info_hash(char *path, struct _folder_info *mfi, void *data) +unset_folder_info_hash(gchar *path, struct _folder_info *mfi, gpointer data) { unset_folder_info(mfi, FALSE, FALSE); } static void -free_folder_info_hash(char *path, struct _folder_info *mfi, void *data) +free_folder_info_hash(gchar *path, struct _folder_info *mfi, gpointer data) { free_folder_info(mfi); } @@ -792,7 +792,7 @@ mail_note_store_remove(CamelStore *store) } static gboolean -update_folders(CamelStore *store, CamelFolderInfo *fi, void *data) +update_folders(CamelStore *store, CamelFolderInfo *fi, gpointer data) { struct _update_data *ud = data; struct _store_info *si; @@ -829,8 +829,8 @@ struct _ping_store_msg { static gchar * ping_store_desc (struct _ping_store_msg *m) { - char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); - char *msg; + gchar *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); + gchar *msg; msg = g_strdup_printf (_("Pinging %s"), service_name); g_free (service_name); @@ -898,7 +898,7 @@ ping_cb (gpointer user_data) } static void -store_online_cb (CamelStore *store, void *data) +store_online_cb (CamelStore *store, gpointer data) { struct _update_data *ud = data; @@ -918,13 +918,13 @@ store_online_cb (CamelStore *store, void *data) void mail_note_store(CamelStore *store, CamelOperation *op, - gboolean (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data) + gboolean (*done)(CamelStore *store, CamelFolderInfo *info, gpointer data), gpointer data) { struct _store_info *si; struct _update_data *ud; - const char *buf; + const gchar *buf; guint timeout; - int hook = 0; + gint hook = 0; g_return_if_fail (CAMEL_IS_STORE(store)); g_return_if_fail (mail_in_main_thread()); @@ -998,7 +998,7 @@ mail_note_store(CamelStore *store, CamelOperation *op, } struct _find_info { - const char *uri; + const gchar *uri; struct _folder_info *fi; CamelURL *url; }; @@ -1008,7 +1008,7 @@ static void storeinfo_find_folder_info(CamelStore *store, struct _store_info *si { if (fi->fi == NULL) { if (((CamelService *)store)->provider->url_equal(fi->url, ((CamelService *)store)->url)) { - char *path = fi->url->fragment?fi->url->fragment:fi->url->path; + gchar *path = fi->url->fragment?fi->url->fragment:fi->url->path; if (path[0] == '/') path++; @@ -1019,7 +1019,7 @@ static void storeinfo_find_folder_info(CamelStore *store, struct _store_info *si /* returns TRUE if the uri is available, folderp is set to a reffed folder if the folder has also already been opened */ -int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp) +gint mail_note_get_folder_from_uri(const gchar *uri, CamelFolder **folderp) { struct _find_info fi = { uri, NULL, NULL }; @@ -1046,9 +1046,9 @@ int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp) } gboolean -mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags) +mail_folder_cache_get_folder_info_flags (CamelFolder *folder, gint *flags) { - char *uri = mail_tools_folder_to_url (folder); + gchar *uri = mail_tools_folder_to_url (folder); struct _find_info fi = { uri, NULL, NULL }; if (stores == NULL) diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h index 932f5c3f78..41f36ac0cf 100644 --- a/mail/mail-folder-cache.h +++ b/mail/mail-folder-cache.h @@ -34,8 +34,8 @@ The 'done' function returns if we can free folder info. */ void mail_note_store (CamelStore *store, CamelOperation *op, - gboolean (*done) (CamelStore *store, CamelFolderInfo *info, void *data), - void *data); + gboolean (*done) (CamelStore *store, CamelFolderInfo *info, gpointer data), + gpointer data); /* de-note a store */ void mail_note_store_remove (CamelStore *store); @@ -48,7 +48,7 @@ void mail_note_folder (CamelFolder *folder); /* Returns true if a folder is available (yet), and also sets *folderp (if supplied) to a (referenced) copy of the folder if it has already been opened */ -int mail_note_get_folder_from_uri (const char *uri, CamelFolder **folderp); -gboolean mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags); +gint mail_note_get_folder_from_uri (const gchar *uri, CamelFolder **folderp); +gboolean mail_folder_cache_get_folder_info_flags (CamelFolder *folder, gint *flags); #endif diff --git a/mail/mail-mt.c b/mail/mail-mt.c index ed7e257fba..f820f78a76 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -50,8 +50,8 @@ #define LOG_LOCKS #define d(x) -static void set_stop(int sensitive); -static void mail_operation_status(struct _CamelOperation *op, const char *what, int pc, void *data); +static void set_stop(gint sensitive); +static void mail_operation_status(struct _CamelOperation *op, const gchar *what, gint pc, gpointer data); #ifdef LOG_LOCKS #define MAIL_MT_LOCK(x) (log_locks?fprintf(log, "%" G_GINT64_MODIFIER "x: lock " # x "\n", e_util_pthread_id(pthread_self())):0, pthread_mutex_lock(&x)) @@ -63,9 +63,9 @@ static void mail_operation_status(struct _CamelOperation *op, const char *what, /* background operation status stuff */ struct _MailMsgPrivate { - int activity_state; /* sigh sigh sigh, we need to keep track of the state external to the + gint activity_state; /* sigh sigh sigh, we need to keep track of the state external to the pointer itself for locking/race conditions */ - int activity_id; + gint activity_id; GtkWidget *error; gboolean cancelable; }; @@ -73,10 +73,10 @@ struct _MailMsgPrivate { /* mail_msg stuff */ #ifdef LOG_OPS static FILE *log; -static int log_ops, log_locks, log_init; +static gint log_ops, log_locks, log_init; #endif -static unsigned int mail_msg_seq; /* sequence number of each message */ +static guint mail_msg_seq; /* sequence number of each message */ static GHashTable *mail_msg_active_table; /* table of active messages, must hold mail_msg_lock to access */ static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER; @@ -140,7 +140,7 @@ mail_msg_new (MailMsgInfo *info) } static void -end_event_callback (CamelObject *o, void *event_data, void *error) +end_event_callback (CamelObject *o, gpointer event_data, gpointer error) { MailComponent *component; EActivityHandler *activity_handler; @@ -161,10 +161,10 @@ end_event_callback (CamelObject *o, void *event_data, void *error) #include static void -checkmem(void *p) +checkmem(gpointer p) { if (p) { - int status = mprobe(p); + gint status = mprobe(p); switch (status) { case MCHECK_HEAD: @@ -277,12 +277,12 @@ mail_msg_unref (gpointer msg) /* hash table of ops->dialogue of active errors */ static GHashTable *active_errors = NULL; -static void error_destroy(GtkObject *o, void *data) +static void error_destroy(GtkObject *o, gpointer data) { g_hash_table_remove(active_errors, data); } -static void error_response(GtkObject *o, int button, void *data) +static void error_response(GtkObject *o, gint button, gpointer data) { gtk_widget_destroy((GtkWidget *)o); } @@ -291,7 +291,7 @@ void mail_msg_check_error (gpointer msg) { MailMsg *m = msg; - char *what; + gchar *what; GtkDialog *gd; #ifdef MALLOC_CHECK @@ -336,7 +336,7 @@ mail_msg_check_error (gpointer msg) gtk_widget_show((GtkWidget *)gd); } -void mail_msg_cancel(unsigned int msgid) +void mail_msg_cancel(guint msgid) { MailMsg *m; @@ -352,7 +352,7 @@ void mail_msg_cancel(unsigned int msgid) /* waits for a message to be finished processing (freed) the messageid is from MailMsg->seq */ -void mail_msg_wait(unsigned int msgid) +void mail_msg_wait(guint msgid) { MailMsg *m; @@ -377,9 +377,9 @@ void mail_msg_wait(unsigned int msgid) } } -int mail_msg_active(unsigned int msgid) +gint mail_msg_active(guint msgid) { - int active; + gint active; MAIL_MT_LOCK(mail_msg_lock); if (msgid == (unsigned int)-1) @@ -665,12 +665,12 @@ struct _proxy_msg { mail_async_event_t type; pthread_t thread; - int have_thread; + gint have_thread; MailAsyncFunc func; - void *o; - void *event_data; - void *data; + gpointer o; + gpointer event_data; + gpointer data; }; static void @@ -687,7 +687,7 @@ do_async_event(struct _proxy_msg *m) } static int -idle_async_event(void *mm) +idle_async_event(gpointer mm) { do_async_event(mm); mail_msg_unref(mm); @@ -713,10 +713,10 @@ MailAsyncEvent *mail_async_event_new(void) return ea; } -int mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyncFunc func, void *o, void *event_data, void *data) +gint mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyncFunc func, gpointer o, gpointer event_data, gpointer data) { struct _proxy_msg *m; - int id; + gint id; /* we dont have a reply port for this, we dont care when/if it gets executed, just queue it */ m = mail_msg_new(&async_event_info); @@ -746,9 +746,9 @@ int mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsync return id; } -int mail_async_event_destroy(MailAsyncEvent *ea) +gint mail_async_event_destroy(MailAsyncEvent *ea) { - int id; + gint id; pthread_t thread = pthread_self(); struct _proxy_msg *m; @@ -781,7 +781,7 @@ struct _call_msg { mail_call_t type; MailMainFunc func; - void *ret; + gpointer ret; va_list ap; EFlag *done; }; @@ -789,50 +789,50 @@ struct _call_msg { static void do_call(struct _call_msg *m) { - void *p1, *p2, *p3, *p4, *p5; - int i1; + gpointer p1, *p2, *p3, *p4, *p5; + gint i1; va_list ap; G_VA_COPY(ap, m->ap); switch(m->type) { case MAIL_CALL_p_p: - p1 = va_arg(ap, void *); + p1 = va_arg(ap, gpointer ); m->ret = m->func(p1); break; case MAIL_CALL_p_pp: - p1 = va_arg(ap, void *); - p2 = va_arg(ap, void *); + p1 = va_arg(ap, gpointer ); + p2 = va_arg(ap, gpointer ); m->ret = m->func(p1, p2); break; case MAIL_CALL_p_ppp: - p1 = va_arg(ap, void *); - p2 = va_arg(ap, void *); - p3 = va_arg(ap, void *); + p1 = va_arg(ap, gpointer ); + p2 = va_arg(ap, gpointer ); + p3 = va_arg(ap, gpointer ); m->ret = m->func(p1, p2, p3); break; case MAIL_CALL_p_pppp: - p1 = va_arg(ap, void *); - p2 = va_arg(ap, void *); - p3 = va_arg(ap, void *); - p4 = va_arg(ap, void *); + p1 = va_arg(ap, gpointer ); + p2 = va_arg(ap, gpointer ); + p3 = va_arg(ap, gpointer ); + p4 = va_arg(ap, gpointer ); m->ret = m->func(p1, p2, p3, p4); break; case MAIL_CALL_p_ppppp: - p1 = va_arg(ap, void *); - p2 = va_arg(ap, void *); - p3 = va_arg(ap, void *); - p4 = va_arg(ap, void *); - p5 = va_arg(ap, void *); + p1 = va_arg(ap, gpointer ); + p2 = va_arg(ap, gpointer ); + p3 = va_arg(ap, gpointer ); + p4 = va_arg(ap, gpointer ); + p5 = va_arg(ap, gpointer ); m->ret = m->func(p1, p2, p3, p4, p5); break; case MAIL_CALL_p_ppippp: - p1 = va_arg(ap, void *); - p2 = va_arg(ap, void *); + p1 = va_arg(ap, gpointer ); + p2 = va_arg(ap, gpointer ); i1 = va_arg(ap, int); - p3 = va_arg(ap, void *); - p4 = va_arg(ap, void *); - p5 = va_arg(ap, void *); + p3 = va_arg(ap, gpointer ); + p4 = va_arg(ap, gpointer ); + p5 = va_arg(ap, gpointer ); m->ret = m->func(p1, p2, i1, p3, p4, p5); break; } @@ -849,11 +849,11 @@ static MailMsgInfo mail_call_info = { (MailMsgFreeFunc) NULL }; -void * +gpointer mail_call_main (mail_call_t type, MailMainFunc func, ...) { struct _call_msg *m; - void *ret; + gpointer ret; va_list ap; va_start(ap, func); @@ -883,7 +883,7 @@ mail_call_main (mail_call_t type, MailMainFunc func, ...) /* ********************************************************************** */ /* locked via status_lock */ -static int busy_state; +static gint busy_state; static void do_set_busy(MailMsg *mm) @@ -931,9 +931,9 @@ struct _op_status_msg { MailMsg base; struct _CamelOperation *op; - char *what; - int pc; - void *data; + gchar *what; + gint pc; + gpointer data; }; static void @@ -942,8 +942,8 @@ op_status_exec (struct _op_status_msg *m) EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ()); MailMsg *msg; MailMsgPrivate *data; - char *out, *p, *o, c; - int pc; + gchar *out, *p, *o, c; + gint pc; g_return_if_fail (mail_in_main_thread ()); @@ -971,7 +971,7 @@ op_status_exec (struct _op_status_msg *m) pc = m->pc; if (data->activity_id == 0) { - char *what; + gchar *what; /* its being created/removed? well leave it be */ if (data->activity_state == 1 || data->activity_state == 3) { @@ -995,7 +995,7 @@ op_status_exec (struct _op_status_msg *m) g_free (what); MAIL_MT_LOCK (mail_msg_lock); if (data->activity_state == 3) { - int activity_id = data->activity_id; + gint activity_id = data->activity_id; MAIL_MT_UNLOCK (mail_msg_lock); mail_msg_free (msg); @@ -1032,7 +1032,7 @@ static MailMsgInfo op_status_info = { }; static void -mail_operation_status (struct _CamelOperation *op, const char *what, int pc, void *data) +mail_operation_status (struct _CamelOperation *op, const gchar *what, gint pc, gpointer data) { struct _op_status_msg *m; @@ -1057,9 +1057,9 @@ mail_operation_status (struct _CamelOperation *op, const char *what, int pc, voi /* ******************** */ static void -set_stop (int sensitive) +set_stop (gint sensitive) { - static int last = FALSE; + static gint last = FALSE; if (last == sensitive) return; diff --git a/mail/mail-mt.h b/mail/mail-mt.h index ed23c3beeb..396eb77ad2 100644 --- a/mail/mail-mt.h +++ b/mail/mail-mt.h @@ -40,7 +40,7 @@ typedef void (*MailMsgDispatchFunc) (gpointer msg); struct _MailMsg { MailMsgInfo *info; volatile gint ref_count; - unsigned int seq; /* seq number for synchronisation */ + guint seq; /* seq number for synchronisation */ gint priority; /* priority (default = 0) */ CamelOperation *cancel; /* a cancellation/status handle */ CamelException ex; /* an initialised camel exception, upto the caller to use this */ @@ -66,10 +66,10 @@ gpointer mail_msg_new (MailMsgInfo *info); gpointer mail_msg_ref (gpointer msg); void mail_msg_unref (gpointer msg); void mail_msg_check_error (gpointer msg); -void mail_msg_cancel(unsigned int msgid); -void mail_msg_wait(unsigned int msgid); +void mail_msg_cancel(guint msgid); +void mail_msg_wait(guint msgid); void mail_msg_wait_all(void); -int mail_msg_active(unsigned int msgid); +gint mail_msg_active(guint msgid); /* dispatch a message */ void mail_msg_main_loop_push (gpointer msg); @@ -84,13 +84,13 @@ void mail_cancel_all (void); void mail_msg_set_cancelable (gpointer msg, gboolean status); /* request a string/password */ -char *mail_get_password (CamelService *service, const char *prompt, +gchar *mail_get_password (CamelService *service, const gchar *prompt, gboolean secret, gboolean *cache); /* present information and get an ok (or possibly cancel) * "type" is as for gnome_message_box_new(); */ -gboolean mail_user_message (const char *type, const char *prompt, gboolean allow_cancel); +gboolean mail_user_message (const gchar *type, const gchar *prompt, gboolean allow_cancel); /* asynchronous event proxies */ typedef struct _MailAsyncEvent { @@ -103,14 +103,14 @@ typedef enum _mail_async_event_t { MAIL_ASYNC_THREAD } mail_async_event_t; -typedef void (*MailAsyncFunc)(void *, void *, void *); +typedef void (*MailAsyncFunc)(gpointer , gpointer , gpointer ); /* create a new async event handler */ MailAsyncEvent *mail_async_event_new(void); /* forward a camel event (or other call) to the gui thread */ -int mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyncFunc func, void *, void *, void *); +gint mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyncFunc func, gpointer , gpointer , gpointer ); /* wait for all outstanding async events to complete */ -int mail_async_event_destroy(MailAsyncEvent *ea); +gint mail_async_event_destroy(MailAsyncEvent *ea); /* Call a function in the gui thread, wait for it to return, type is the marshaller to use */ typedef enum { @@ -122,9 +122,9 @@ typedef enum { MAIL_CALL_p_ppippp } mail_call_t; -typedef void *(*MailMainFunc)(); +typedef gpointer (*MailMainFunc)(); -void *mail_call_main(mail_call_t type, MailMainFunc func, ...); +gpointer mail_call_main(mail_call_t type, MailMainFunc func, ...); /* use with caution. only works with active message's anyway */ void mail_enable_stop(void); diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 4f310db812..06ea94a594 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -72,7 +72,7 @@ #define w(x) #define d(x) -extern const char *x_mailer; +extern const gchar *x_mailer; /* used for both just filtering a folder + uid's, and for filtering a whole folder */ /* used both for fetching mail, and for filtering mail */ @@ -84,7 +84,7 @@ struct _filter_mail_msg { CamelUIDCache *cache; /* UID cache if we are to cache the uids, NULL otherwise */ CamelOperation *cancel; CamelFilterDriver *driver; - int delete; /* delete messages after filtering them? */ + gint delete; /* delete messages after filtering them? */ CamelFolder *destination; /* default destination for any messages, NULL for none */ }; @@ -93,12 +93,12 @@ struct _fetch_mail_msg { struct _filter_mail_msg fmsg; CamelOperation *cancel; /* we have our own cancellation struct, the other should be empty */ - int keep; /* keep on server? */ + gint keep; /* keep on server? */ - char *source_uri; + gchar *source_uri; - void (*done)(const char *source, void *data); - void *data; + void (*done)(const gchar *source, gpointer data); + gpointer data; }; static gchar * @@ -197,7 +197,7 @@ static MailMsgInfo em_filter_folder_element_info = { void mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids, - const char *type, gboolean notify, + const gchar *type, gboolean notify, CamelOperation *cancel) { struct _filter_mail_msg *m; @@ -240,12 +240,12 @@ mail_filter_junk (CamelFolder *folder, GPtrArray *uids) /* ********************************************************************** */ /* Temporary workaround for various issues. Gone before 0.11 */ -static char * +static gchar * uid_cachename_hack (CamelStore *store) { CamelURL *url = CAMEL_SERVICE (store)->url; - char *encoded_url, *filename; - const char *evolution_dir; + gchar *encoded_url, *filename; + const gchar *evolution_dir; encoded_url = g_strdup_printf ("%s%s%s@%s", url->user, url->authmech ? ";auth=" : "", @@ -270,7 +270,7 @@ static void fetch_mail_exec (struct _fetch_mail_msg *m) { struct _filter_mail_msg *fm = (struct _filter_mail_msg *)m; - int i; + gint i; if (m->cancel) camel_operation_register (m->cancel); @@ -282,7 +282,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m) /* FIXME: this should support keep_on_server too, which would then perform a spool access thingy, right? problem is matching raw messages to uid's etc. */ if (!strncmp (m->source_uri, "mbox:", 5)) { - char *path = mail_tool_do_movemail (m->source_uri, &fm->base.ex); + gchar *path = mail_tool_do_movemail (m->source_uri, &fm->base.ex); if (path && !camel_exception_is_set (&fm->base.ex)) { camel_folder_freeze (fm->destination); @@ -301,7 +301,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m) /* this handles 'keep on server' stuff, if we have any new uid's to copy across, we need to copy them to a new array 'cause of the way fetch_mail_free works */ CamelUIDCache *cache = NULL; - char *cachename; + gchar *cachename; cachename = uid_cachename_hack (folder->parent_store); cache = camel_uid_cache_new (cachename); @@ -334,7 +334,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m) if (fm->delete && !camel_exception_is_set (&fm->base.ex)) { /* not keep on server - just delete all the actual messages on the server */ for (i=0;ilen;i++) { - d(printf("force delete uid '%s'\n", (char *)folder_uids->pdata[i])); + d(printf("force delete uid '%s'\n", (gchar *)folder_uids->pdata[i])); camel_folder_delete_message(folder, folder_uids->pdata[i]); } } @@ -397,10 +397,10 @@ static MailMsgInfo fetch_mail_info = { /* ouch, a 'do everything' interface ... */ 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)(const char *source, void *data), void *data) +mail_fetch_mail (const gchar *source, gint keep, const gchar *type, CamelOperation *cancel, + CamelFilterGetFolderFunc get_folder, gpointer get_data, + CamelFilterStatusFunc *status, gpointer status_data, + void (*done)(const gchar *source, gpointer data), gpointer data) { struct _fetch_mail_msg *m; struct _filter_mail_msg *fm; @@ -443,21 +443,21 @@ static const gchar *resent_recipients[] = { /* send 1 message to a specific transport */ static void -mail_send_message(CamelFolder *queue, const char *uid, const char *destination, CamelFilterDriver *driver, CamelException *ex) +mail_send_message(CamelFolder *queue, const gchar *uid, const gchar *destination, CamelFilterDriver *driver, CamelException *ex) { EAccount *account = NULL; const CamelInternetAddress *iaddr; CamelAddress *from, *recipients; CamelMessageInfo *info = NULL; CamelTransport *xport = NULL; - char *transport_url = NULL; - char *sent_folder_uri = NULL; - const char *resent_from, *tmp; + gchar *transport_url = NULL; + gchar *sent_folder_uri = NULL; + const gchar *resent_from, *tmp; CamelFolder *folder = NULL; GString *err = NULL; struct _camel_header_raw *xev, *header; CamelMimeMessage *message; - int i; + gint i; message = camel_folder_get_message(queue, uid, ex); if (!message) @@ -470,7 +470,7 @@ mail_send_message(CamelFolder *queue, const char *uid, const char *destination, tmp = camel_header_raw_find(&xev, "X-Evolution-Account", NULL); if (tmp) { - char *name; + gchar *name; name = g_strstrip(g_strdup(tmp)); if ((account = mail_config_get_account_by_uid(name)) @@ -507,7 +507,7 @@ mail_send_message(CamelFolder *queue, const char *uid, const char *destination, recipients = (CamelAddress *) camel_internet_address_new (); for (i = 0; i < 3; i++) { - const char *type; + const gchar *type; type = resent_from ? resent_recipients[i] : normal_recipients[i]; iaddr = camel_mime_message_get_recipients (message, type); @@ -530,7 +530,7 @@ mail_send_message(CamelFolder *queue, const char *uid, const char *destination, camel_mime_message_set_date(message, CAMEL_MESSAGE_DATE_CURRENT, 0); for (header = xev;header;header=header->next) { - char *uri; + gchar *uri; if (strcmp(header->name, "X-Evolution-PostTo") != 0) continue; @@ -595,9 +595,9 @@ mail_send_message(CamelFolder *queue, const char *uid, const char *destination, sent_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_SENT); if (folder != sent_folder) { - const char *name; + const gchar *name; - camel_object_get (folder, NULL, CAMEL_OBJECT_DESCRIPTION, (char **) &name, 0); + camel_object_get (folder, NULL, CAMEL_OBJECT_DESCRIPTION, (gchar **) &name, 0); if (err->len) g_string_append(err, "\n\n"); g_string_append_printf (err, _("Failed to append to %s: %s\n" @@ -656,24 +656,24 @@ struct _send_queue_msg { MailMsg base; CamelFolder *queue; - char *destination; + gchar *destination; CamelFilterDriver *driver; CamelOperation *cancel; /* we use camelfilterstatusfunc, even though its not the filter doing it */ CamelFilterStatusFunc *status; - void *status_data; + gpointer status_data; - void (*done)(const char *destination, void *data); - void *data; + void (*done)(const gchar *destination, gpointer data); + gpointer data; }; static void -report_status (struct _send_queue_msg *m, enum camel_filter_status_t status, int pc, const char *desc, ...) +report_status (struct _send_queue_msg *m, enum camel_filter_status_t status, gint pc, const gchar *desc, ...) { va_list ap; - char *str; + gchar *str; if (m->status) { va_start (ap, desc); @@ -690,7 +690,7 @@ send_queue_exec (struct _send_queue_msg *m) CamelFolder *sent_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_SENT); GPtrArray *uids, *send_uids = NULL; CamelException ex; - int i, j; + gint i, j; d(printf("sending queue\n")); @@ -731,7 +731,7 @@ send_queue_exec (struct _send_queue_msg *m) used as a mechanism to accumualte warning messages and present them back to the user. */ for (i = 0, j = 0; i < send_uids->len; i++) { - int pc = (100 * i) / send_uids->len; + gint pc = (100 * i) / send_uids->len; report_status (m, CAMEL_FILTER_STATUS_START, pc, _("Sending message %d of %d"), i+1, send_uids->len); if (!m->cancel) @@ -828,11 +828,11 @@ static MailMsgInfo send_queue_info = { /* same interface as fetch_mail, just 'cause i'm lazy today (and we need to run it from the same spot?) */ 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)(const char *destination, void *data), void *data) +mail_send_queue(CamelFolder *queue, const gchar *destination, + const gchar *type, CamelOperation *cancel, + CamelFilterGetFolderFunc get_folder, gpointer get_data, + CamelFilterStatusFunc *status, gpointer status_data, + void (*done)(const gchar *destination, gpointer data), gpointer data) { struct _send_queue_msg *m; @@ -867,10 +867,10 @@ struct _append_msg { CamelFolder *folder; CamelMimeMessage *message; CamelMessageInfo *info; - char *appended_uid; + gchar *appended_uid; - void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, const char *appended_uid, void *data); - void *data; + void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, gint ok, const gchar *appended_uid, gpointer data); + gpointer data; }; static gchar * @@ -911,8 +911,8 @@ static MailMsgInfo append_mail_info = { void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, - void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, const char *appended_uid, void *data), - void *data) + void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, gint ok, const gchar *appended_uid, gpointer data), + gpointer data) { struct _append_msg *m; @@ -943,11 +943,11 @@ struct _transfer_msg { CamelFolder *source; GPtrArray *uids; gboolean delete; - char *dest_uri; + gchar *dest_uri; guint32 dest_flags; - void (*done)(gboolean ok, void *data); - void *data; + void (*done)(gboolean ok, gpointer data); + gpointer data; }; static gchar * @@ -981,7 +981,7 @@ transfer_messages_exec (struct _transfer_msg *m) /* make sure all deleted messages are marked as seen */ if (m->delete) { - int i; + gint i; for (i = 0; i < m->uids->len; i++) camel_folder_set_message_flags (m->source, m->uids->pdata[i], @@ -1020,10 +1020,10 @@ static MailMsgInfo transfer_messages_info = { void mail_transfer_messages (CamelFolder *source, GPtrArray *uids, gboolean delete_from_source, - const char *dest_uri, + const gchar *dest_uri, guint32 dest_flags, - void (*done) (gboolean ok, void *data), - void *data) + void (*done) (gboolean ok, gpointer data), + gpointer data) { struct _transfer_msg *m; @@ -1051,15 +1051,15 @@ struct _get_folderinfo_msg { CamelStore *store; CamelFolderInfo *info; - gboolean (*done)(CamelStore *store, CamelFolderInfo *info, void *data); - void *data; + gboolean (*done)(CamelStore *store, CamelFolderInfo *info, gpointer data); + gpointer data; gboolean can_clear; /* whether we can clear folder info */ }; static gchar * get_folderinfo_desc (struct _get_folderinfo_msg *m) { - char *ret, *name; + gchar *ret, *name; name = camel_service_get_name((CamelService *)m->store, TRUE); ret = g_strdup_printf(_("Scanning folders in \"%s\""), name); @@ -1079,7 +1079,7 @@ static void get_folderinfo_done (struct _get_folderinfo_msg *m) { if (!m->info && camel_exception_is_set (&m->base.ex)) { - char *url; + gchar *url; url = camel_service_get_url (CAMEL_SERVICE (m->store)); w(g_warning ("Error getting folder info from store at %s: %s", @@ -1109,11 +1109,11 @@ static MailMsgInfo get_folderinfo_info = { (MailMsgFreeFunc) get_folderinfo_free }; -int -mail_get_folderinfo (CamelStore *store, CamelOperation *op, gboolean (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data) +gint +mail_get_folderinfo (CamelStore *store, CamelOperation *op, gboolean (*done)(CamelStore *store, CamelFolderInfo *info, gpointer data), gpointer data) { struct _get_folderinfo_msg *m; - int id; + gint id; m = mail_msg_new(&get_folderinfo_info); if (op) { @@ -1135,18 +1135,18 @@ mail_get_folderinfo (CamelStore *store, CamelOperation *op, gboolean (*done)(Cam /* ** ATTACH MESSAGES ****************************************************** */ struct _build_data { - void (*done)(CamelFolder *folder, GPtrArray *uids, CamelMimePart *part, char *subject, void *data); - void *data; + void (*done)(CamelFolder *folder, GPtrArray *uids, CamelMimePart *part, gchar *subject, gpointer data); + gpointer data; }; static void -do_build_attachment (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *data) +do_build_attachment (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, gpointer data) { struct _build_data *d = data; CamelMultipart *multipart; CamelMimePart *part; - char *subject; - int i; + gchar *subject; + gint i; if (messages->len == 0) { d->done(folder, messages, NULL, NULL, d->data); @@ -1183,7 +1183,7 @@ do_build_attachment (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void mail_build_attachment(CamelFolder *folder, GPtrArray *uids, - void (*done)(CamelFolder *folder, GPtrArray *messages, CamelMimePart *part, char *subject, void *data), void *data) + void (*done)(CamelFolder *folder, GPtrArray *messages, CamelMimePart *part, gchar *subject, gpointer data), gpointer data) { struct _build_data *d; @@ -1201,11 +1201,11 @@ mail_build_attachment(CamelFolder *folder, GPtrArray *uids, struct _get_folder_msg { MailMsg base; - char *uri; + gchar *uri; guint32 flags; CamelFolder *folder; - void (*done) (char *uri, CamelFolder *folder, void *data); - void *data; + void (*done) (gchar *uri, CamelFolder *folder, gpointer data); + gpointer data; }; static gchar * @@ -1243,13 +1243,13 @@ static MailMsgInfo get_folder_info = { (MailMsgFreeFunc) get_folder_free }; -int -mail_get_folder (const char *uri, guint32 flags, - void (*done)(char *uri, CamelFolder *folder, void *data), - void *data, MailMsgDispatchFunc dispatch) +gint +mail_get_folder (const gchar *uri, guint32 flags, + void (*done)(gchar *uri, CamelFolder *folder, gpointer data), + gpointer data, MailMsgDispatchFunc dispatch) { struct _get_folder_msg *m; - int id; + gint id; m = mail_msg_new(&get_folder_info); m->uri = g_strdup (uri); @@ -1269,8 +1269,8 @@ struct _get_quota_msg { CamelFolder *folder; CamelFolderQuotaInfo *quota; - void (*done) (CamelFolder *folder, CamelFolderQuotaInfo *quota, void *data); - void *data; + void (*done) (CamelFolder *folder, CamelFolderQuotaInfo *quota, gpointer data); + gpointer data; }; static gchar * @@ -1309,13 +1309,13 @@ static MailMsgInfo get_quota_info = { (MailMsgFreeFunc) get_quota_free }; -int +gint mail_get_folder_quota (CamelFolder *folder, - void (*done)(CamelFolder *folder, CamelFolderQuotaInfo *quota, void *data), - void *data, MailMsgDispatchFunc dispatch) + void (*done)(CamelFolder *folder, CamelFolderQuotaInfo *quota, gpointer data), + gpointer data, MailMsgDispatchFunc dispatch) { struct _get_quota_msg *m; - int id; + gint id; g_return_val_if_fail (folder != NULL, -1); @@ -1336,10 +1336,10 @@ mail_get_folder_quota (CamelFolder *folder, struct _get_store_msg { MailMsg base; - char *uri; + gchar *uri; CamelStore *store; - void (*done) (char *uri, CamelStore *store, void *data); - void *data; + void (*done) (gchar *uri, CamelStore *store, gpointer data); + gpointer data; }; static gchar * @@ -1381,11 +1381,11 @@ static MailMsgInfo get_store_info = { (MailMsgFreeFunc) get_store_free }; -int -mail_get_store (const char *uri, CamelOperation *op, void (*done) (char *uri, CamelStore *store, void *data), void *data) +gint +mail_get_store (const gchar *uri, CamelOperation *op, void (*done) (gchar *uri, CamelStore *store, gpointer data), gpointer data) { struct _get_store_msg *m; - int id; + gint id; m = mail_msg_new (&get_store_info); if (op) { @@ -1409,8 +1409,8 @@ struct _remove_folder_msg { CamelFolder *folder; gboolean removed; - void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, void *data); - void *data; + void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, gpointer data); + gpointer data; }; static gchar * @@ -1438,7 +1438,7 @@ remove_folder_rec (CamelStore *store, CamelFolderInfo *fi, CamelException *ex) if (!CAMEL_IS_VEE_FOLDER (folder)) { GPtrArray *uids = camel_folder_get_uids (folder); - int i; + gint i; /* Delete every message in this folder, then expunge it */ camel_folder_freeze (folder); @@ -1506,7 +1506,7 @@ static MailMsgInfo remove_folder_info = { }; void -mail_remove_folder (CamelFolder *folder, void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, void *data), void *data) +mail_remove_folder (CamelFolder *folder, void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, gpointer data), gpointer data) { struct _remove_folder_msg *m; @@ -1527,8 +1527,8 @@ struct _sync_folder_msg { MailMsg base; CamelFolder *folder; - void (*done) (CamelFolder *folder, void *data); - void *data; + void (*done) (CamelFolder *folder, gpointer data); + gpointer data; }; static gchar * @@ -1566,7 +1566,7 @@ static MailMsgInfo sync_folder_info = { }; void -mail_sync_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, void *data), void *data) +mail_sync_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, gpointer data), gpointer data) { struct _sync_folder_msg *m; @@ -1585,15 +1585,15 @@ struct _sync_store_msg { MailMsg base; CamelStore *store; - int expunge; - void (*done) (CamelStore *store, void *data); - void *data; + gint expunge; + void (*done) (CamelStore *store, gpointer data); + gpointer data; }; static gchar * sync_store_desc (struct _sync_store_msg *m) { - char *uri, *res; + gchar *uri, *res; uri = camel_url_to_string(((CamelService *)m->store)->url, CAMEL_URL_HIDE_ALL); res = g_strdup_printf(m->expunge @@ -1633,7 +1633,7 @@ static MailMsgInfo sync_store_info = { }; void -mail_sync_store(CamelStore *store, int expunge, void (*done) (CamelStore *store, void *data), void *data) +mail_sync_store(CamelStore *store, gint expunge, void (*done) (CamelStore *store, gpointer data), gpointer data) { struct _sync_store_msg *m; @@ -1674,7 +1674,7 @@ static MailMsgInfo refresh_folder_info = { }; void -mail_refresh_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, void *data), void *data) +mail_refresh_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, gpointer data), gpointer data) { struct _sync_folder_msg *m; @@ -1711,7 +1711,7 @@ static MailMsgInfo expunge_folder_info = { }; void -mail_expunge_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, void *data), void *data) +mail_expunge_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, gpointer data), gpointer data) { struct _sync_folder_msg *m; @@ -1730,8 +1730,8 @@ struct _empty_trash_msg { MailMsg base; EAccount *account; - void (*done) (EAccount *account, void *data); - void *data; + void (*done) (EAccount *account, gpointer data); + gpointer data; }; static gchar * @@ -1749,9 +1749,9 @@ empty_trash_desc (struct _empty_trash_msg *m) static void empty_trash_exec (struct _empty_trash_msg *m) { - const char *evolution_dir; + const gchar *evolution_dir; CamelFolder *trash; - char *uri; + gchar *uri; if (m->account) { trash = mail_tool_get_trash (m->account->source->url, FALSE, &m->base.ex); @@ -1791,7 +1791,7 @@ static MailMsgInfo empty_trash_info = { }; void -mail_empty_trash(EAccount *account, void (*done) (EAccount *account, void *data), void *data) +mail_empty_trash(EAccount *account, void (*done) (EAccount *account, gpointer data), gpointer data) { struct _empty_trash_msg *m; @@ -1811,9 +1811,9 @@ struct _get_message_msg { MailMsg base; CamelFolder *folder; - char *uid; - void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data); - void *data; + gchar *uid; + void (*done) (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data); + gpointer data; CamelMimeMessage *message; CamelOperation *cancel; }; @@ -1857,9 +1857,9 @@ static MailMsgInfo get_message_info = { }; void -mail_get_message(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, - CamelMimeMessage *msg, void *data), - void *data, MailMsgDispatchFunc dispatch) +mail_get_message(CamelFolder *folder, const gchar *uid, void (*done) (CamelFolder *folder, const gchar *uid, + CamelMimeMessage *msg, gpointer data), + gpointer data, MailMsgDispatchFunc dispatch) { struct _get_message_msg *m; @@ -1868,13 +1868,13 @@ mail_get_message(CamelFolder *folder, const char *uid, void (*done) (CamelFolder camel_object_ref(folder); m->uid = g_strdup(uid); m->data = data; - m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; + m->done = (void (*) (CamelFolder *, const gchar *, CamelMimeMessage *, gpointer )) done; m->cancel = camel_operation_new(NULL, NULL); dispatch (m); } -typedef void (*get_done)(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *); +typedef void (*get_done)(CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data, CamelException *); static void get_messagex_done (struct _get_message_msg *m) @@ -1896,8 +1896,8 @@ static MailMsgInfo get_messagex_info = { /* This is temporary, to avoid having to rewrite everything that uses mail_get_message; it adds an exception argument to the callback */ CamelOperation * -mail_get_messagex(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), - void *data, MailMsgDispatchFunc dispatch) +mail_get_messagex(CamelFolder *folder, const gchar *uid, void (*done) (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data, CamelException *), + gpointer data, MailMsgDispatchFunc dispatch) { struct _get_message_msg *m; @@ -1906,7 +1906,7 @@ mail_get_messagex(CamelFolder *folder, const char *uid, void (*done) (CamelFolde camel_object_ref(folder); m->uid = g_strdup(uid); m->data = data; - m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; + m->done = (void (*) (CamelFolder *, const gchar *, CamelMimeMessage *, gpointer )) done; m->cancel = camel_operation_new(NULL, NULL); dispatch (m); @@ -1923,8 +1923,8 @@ struct _get_messages_msg { GPtrArray *uids; GPtrArray *messages; - void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data); - void *data; + void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, gpointer data); + gpointer data; }; static gchar * @@ -1938,11 +1938,11 @@ get_messages_desc (struct _get_messages_msg *m) static void get_messages_exec (struct _get_messages_msg *m) { - int i; + gint i; CamelMimeMessage *message; for (i=0; iuids->len; i++) { - int pc = ((i+1) * 100) / m->uids->len; + gint pc = ((i+1) * 100) / m->uids->len; message = camel_folder_get_message(m->folder, m->uids->pdata[i], &m->base.ex); camel_operation_progress(m->base.cancel, pc); @@ -1963,7 +1963,7 @@ get_messages_done (struct _get_messages_msg *m) static void get_messages_free (struct _get_messages_msg *m) { - int i; + gint i; em_utils_uids_free (m->uids); for (i=0;imessages->len;i++) { @@ -1984,8 +1984,8 @@ static MailMsgInfo get_messages_info = { void mail_get_messages(CamelFolder *folder, GPtrArray *uids, - void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data), - void *data) + void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, gpointer data), + gpointer data) { struct _get_messages_msg *m; @@ -2007,9 +2007,9 @@ struct _save_messages_msg { CamelFolder *folder; GPtrArray *uids; - char *path; - void (*done)(CamelFolder *folder, GPtrArray *uids, char *path, void *data); - void *data; + gchar *path; + void (*done)(CamelFolder *folder, GPtrArray *uids, gchar *path, gpointer data); + gpointer data; }; static gchar * @@ -2024,7 +2024,7 @@ static void save_prepare_part (CamelMimePart *mime_part) { CamelDataWrapper *wrapper; - int parts, i; + gint parts, i; wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part)); if (!wrapper) @@ -2058,8 +2058,8 @@ save_messages_exec (struct _save_messages_msg *m) CamelStreamFilter *filtered_stream; CamelMimeFilterFrom *from_filter; CamelStream *stream; - int i; - char *from, *path; + gint i; + gchar *from, *path; if (strstr (m->path, "://")) path = m->path; @@ -2077,7 +2077,7 @@ save_messages_exec (struct _save_messages_msg *m) for (i=0; iuids->len; i++) { CamelMimeMessage *message; - int pc = ((i+1) * 100) / m->uids->len; + gint pc = ((i+1) * 100) / m->uids->len; message = camel_folder_get_message(m->folder, m->uids->pdata[i], &m->base.ex); camel_operation_progress(m->base.cancel, pc); @@ -2129,12 +2129,12 @@ static MailMsgInfo save_messages_info = { (MailMsgFreeFunc) save_messages_free }; -int -mail_save_messages(CamelFolder *folder, GPtrArray *uids, const char *path, - void (*done) (CamelFolder *folder, GPtrArray *uids, char *path, void *data), void *data) +gint +mail_save_messages(CamelFolder *folder, GPtrArray *uids, const gchar *path, + void (*done) (CamelFolder *folder, GPtrArray *uids, gchar *path, gpointer data), gpointer data) { struct _save_messages_msg *m; - int id; + gint id; m = mail_msg_new(&save_messages_info); m->folder = folder; @@ -2156,9 +2156,9 @@ struct _save_part_msg { MailMsg base; CamelMimePart *part; - char *path; - void (*done)(CamelMimePart *part, char *path, int saved, void *data); - void *data; + gchar *path; + void (*done)(CamelMimePart *part, gchar *path, gint saved, gpointer data); + gpointer data; gboolean readonly; }; @@ -2173,7 +2173,7 @@ save_part_exec (struct _save_part_msg *m) { CamelDataWrapper *content; CamelStream *stream; - char *path; + gchar *path; if (strstr (m->path, "://")) path = m->path; @@ -2234,12 +2234,12 @@ static MailMsgInfo save_part_info = { (MailMsgFreeFunc) save_part_free }; -int -mail_save_part (CamelMimePart *part, const char *path, - void (*done)(CamelMimePart *part, char *path, int saved, void *data), void *data, gboolean readonly) +gint +mail_save_part (CamelMimePart *part, const gchar *path, + void (*done)(CamelMimePart *part, gchar *path, gint saved, gpointer data), gpointer data, gboolean readonly) { struct _save_part_msg *m; - int id; + gint id; m = mail_msg_new (&save_part_info); m->part = part; camel_object_ref (part); @@ -2261,9 +2261,9 @@ struct _prep_offline_msg { MailMsg base; CamelOperation *cancel; - char *uri; - void (*done)(const char *uri, void *data); - void *data; + gchar *uri; + void (*done)(const gchar *uri, gpointer data); + gpointer data; }; static void @@ -2317,10 +2317,10 @@ static MailMsgInfo prep_offline_info = { }; void -mail_prep_offline(const char *uri, +mail_prep_offline(const gchar *uri, CamelOperation *cancel, - void (*done)(const char *, void *data), - void *data) + void (*done)(const gchar *, gpointer data), + gpointer data) { struct _prep_offline_msg *m; @@ -2342,15 +2342,15 @@ struct _set_offline_msg { CamelStore *store; gboolean offline; - void (*done)(CamelStore *store, void *data); - void *data; + void (*done)(CamelStore *store, gpointer data); + gpointer data; }; static gchar * set_offline_desc (struct _set_offline_msg *m) { - char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); - char *msg; + gchar *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); + gchar *msg; msg = g_strdup_printf(m->offline?_("Disconnecting from %s"):_("Reconnecting to %s"), service_name); @@ -2413,13 +2413,13 @@ static MailMsgInfo set_offline_info = { (MailMsgFreeFunc) set_offline_free }; -int +gint mail_store_set_offline (CamelStore *store, gboolean offline, - void (*done)(CamelStore *, void *data), - void *data) + void (*done)(CamelStore *, gpointer data), + gpointer data) { struct _set_offline_msg *m; - int id; + gint id; /* Cancel any pending connect first so the set_offline_op * thread won't get queued behind a hung connect op. @@ -2442,11 +2442,11 @@ mail_store_set_offline (CamelStore *store, gboolean offline, /* ** Prepare OFFLINE ***************************************************** */ -static char * +static gchar * prepare_offline_desc (struct _set_offline_msg *m) { - char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); - char *msg; + gchar *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); + gchar *msg; msg = g_strdup_printf (_("Preparing account '%s' for offline"), service_name); g_free(service_name); @@ -2487,11 +2487,11 @@ static MailMsgInfo prepare_offline_info = { (MailMsgFreeFunc) prepare_offline_free }; -int +gint mail_store_prepare_offline (CamelStore *store) { struct _set_offline_msg *m; - int id; + gint id; /* Cancel any pending connect first so the set_offline_op * thread won't get queued behind a hung connect op. @@ -2511,7 +2511,7 @@ mail_store_prepare_offline (CamelStore *store) /* ** Execute Shell Command ***************************************************** */ void -mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, void *data) +mail_execute_shell_command (CamelFilterDriver *driver, gint argc, gchar **argv, gpointer data) { if (argc <= 0) return; @@ -2523,12 +2523,12 @@ mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, vo struct _check_msg { MailMsg base; - char *url; + gchar *url; CamelProviderType type; GList *authtypes; - void (*done)(const char *url, CamelProviderType type, GList *types, void *data); - void *data; + void (*done)(const gchar *url, CamelProviderType type, GList *types, gpointer data); + gpointer data; }; static gchar * @@ -2574,11 +2574,11 @@ static MailMsgInfo check_service_info = { (MailMsgFreeFunc) check_service_free }; -int -mail_check_service(const char *url, CamelProviderType type, void (*done)(const char *url, CamelProviderType type, GList *authtypes, void *data), void *data) +gint +mail_check_service(const gchar *url, CamelProviderType type, void (*done)(const gchar *url, CamelProviderType type, GList *authtypes, gpointer data), gpointer data) { struct _check_msg *m; - int id; + gint id; m = mail_msg_new (&check_service_info); m->url = g_strdup(url); diff --git a/mail/mail-ops.h b/mail/mail-ops.h index 39905fb06c..12e8632f88 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -40,113 +40,113 @@ extern "C" { #include "libedataserver/e-account.h" void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, - void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, - const char *appended_uid, void *data), - void *data); + void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, gint ok, + const gchar *appended_uid, gpointer data), + gpointer data); void mail_transfer_messages (CamelFolder *source, GPtrArray *uids, gboolean delete_from_source, - const char *dest_uri, + const gchar *dest_uri, guint32 dest_flags, - void (*done) (gboolean ok, void *data), - void *data); + void (*done) (gboolean ok, gpointer data), + gpointer data); /* get a single message, asynchronously */ -void mail_get_message (CamelFolder *folder, const char *uid, - void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), - void *data, +void mail_get_message (CamelFolder *folder, const gchar *uid, + void (*done) (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data), + gpointer data, MailMsgDispatchFunc dispatch); CamelOperation * -mail_get_messagex(CamelFolder *folder, const char *uid, - void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), - void *data, MailMsgDispatchFunc dispatch); +mail_get_messagex(CamelFolder *folder, const gchar *uid, + void (*done) (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data, CamelException *), + gpointer data, MailMsgDispatchFunc dispatch); /* get several messages */ void mail_get_messages (CamelFolder *folder, GPtrArray *uids, - void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data), - void *data); + void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, gpointer data), + gpointer data); /* same for a folder */ -int mail_get_folder (const char *uri, guint32 flags, - void (*done) (char *uri, CamelFolder *folder, void *data), void *data, +gint mail_get_folder (const gchar *uri, guint32 flags, + void (*done) (gchar *uri, CamelFolder *folder, gpointer data), gpointer data, MailMsgDispatchFunc dispatch); /* get quota information for a folder */ -int mail_get_folder_quota (CamelFolder *folder, - void (*done)(CamelFolder *folder, CamelFolderQuotaInfo *quota, void *data), - void *data, MailMsgDispatchFunc dispatch); +gint mail_get_folder_quota (CamelFolder *folder, + void (*done)(CamelFolder *folder, CamelFolderQuotaInfo *quota, gpointer data), + gpointer data, MailMsgDispatchFunc dispatch); /* and for a store */ -int mail_get_store (const char *uri, CamelOperation *op, - void (*done) (char *uri, CamelStore *store, void *data), void *data); +gint mail_get_store (const gchar *uri, CamelOperation *op, + void (*done) (gchar *uri, CamelStore *store, gpointer data), gpointer data); /* build an attachment */ void mail_build_attachment (CamelFolder *folder, GPtrArray *uids, void (*done)(CamelFolder *folder, GPtrArray *messages, - CamelMimePart *part, char *subject, void *data), - void *data); + CamelMimePart *part, gchar *subject, gpointer data), + gpointer data); void mail_sync_folder (CamelFolder *folder, - void (*done) (CamelFolder *folder, void *data), void *data); + void (*done) (CamelFolder *folder, gpointer data), gpointer data); -void mail_sync_store(CamelStore *store, int expunge, - void (*done) (CamelStore *store, void *data), void *data); +void mail_sync_store(CamelStore *store, gint expunge, + void (*done) (CamelStore *store, gpointer data), gpointer data); void mail_refresh_folder (CamelFolder *folder, - void (*done) (CamelFolder *folder, void *data), - void *data); + void (*done) (CamelFolder *folder, gpointer data), + gpointer data); void mail_expunge_folder (CamelFolder *folder, - void (*done) (CamelFolder *folder, void *data), - void *data); + void (*done) (CamelFolder *folder, gpointer data), + gpointer data); void mail_empty_trash (EAccount *account, - void (*done) (EAccount *account, void *data), - void *data); + void (*done) (EAccount *account, gpointer data), + gpointer data); /* get folder info asynchronously */ -int mail_get_folderinfo (CamelStore *store, CamelOperation *op, - gboolean (*done)(CamelStore *store, CamelFolderInfo *info, void *data), - void *data); +gint mail_get_folderinfo (CamelStore *store, CamelOperation *op, + gboolean (*done)(CamelStore *store, CamelFolderInfo *info, gpointer data), + gpointer data); /* remove an existing folder */ void mail_remove_folder (CamelFolder *folder, - void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, void *data), - void *data); + void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, gpointer data), + gpointer data); /* transfer (copy/move) a folder */ -void mail_xfer_folder (const char *src_uri, const char *dest_uri, gboolean remove_source, - void (*done) (char *src_uri, char *dest_uri, gboolean remove_source, - CamelFolder *folder, void *data), - void *data); +void mail_xfer_folder (const gchar *src_uri, const gchar *dest_uri, gboolean remove_source, + void (*done) (gchar *src_uri, gchar *dest_uri, gboolean remove_source, + CamelFolder *folder, gpointer data), + gpointer data); /* save messages */ -int mail_save_messages (CamelFolder *folder, GPtrArray *uids, const char *path, - void (*done) (CamelFolder *folder, GPtrArray *uids, char *path, void *data), - void *data); +gint mail_save_messages (CamelFolder *folder, GPtrArray *uids, const gchar *path, + void (*done) (CamelFolder *folder, GPtrArray *uids, gchar *path, gpointer data), + gpointer data); -int mail_save_part (CamelMimePart *part, const char *path, - void (*done)(CamelMimePart *part, char *path, int saved, void *data), - void *data, gboolean readonly); +gint mail_save_part (CamelMimePart *part, const gchar *path, + void (*done)(CamelMimePart *part, gchar *path, gint saved, gpointer data), + gpointer data, gboolean readonly); /* yeah so this is messy, but it does a lot, maybe i can consolidate all user_data's to be the one */ -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)(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)(const char *source, void *data), - void *data); +void mail_send_queue (CamelFolder *queue, const gchar *destination, + const gchar *type, CamelOperation *cancel, + CamelFilterGetFolderFunc get_folder, gpointer get_data, + CamelFilterStatusFunc *status, gpointer status_data, + void (*done)(const gchar *destination, gpointer data), + gpointer data); + +void mail_fetch_mail (const gchar *source, gint keep, + const gchar *type, CamelOperation *cancel, + CamelFilterGetFolderFunc get_folder, gpointer get_data, + CamelFilterStatusFunc *status, gpointer status_data, + void (*done)(const gchar *source, gpointer data), + gpointer data); void mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids, - const char *type, gboolean notify, + const gchar *type, gboolean notify, CamelOperation *cancel); /* convenience functions for above */ @@ -154,19 +154,19 @@ void mail_filter_on_demand (CamelFolder *folder, GPtrArray *uids); void mail_filter_junk (CamelFolder *folder, GPtrArray *uids); /* Work Offline */ -void mail_prep_offline(const char *uri, CamelOperation *cancel, - void (*done)(const char *, void *data), - void *data); -int mail_store_set_offline(CamelStore *store, gboolean offline, - void (*done)(CamelStore *, void *data), - void *data); -int mail_store_prepare_offline (CamelStore *store); +void mail_prep_offline(const gchar *uri, CamelOperation *cancel, + void (*done)(const gchar *, gpointer data), + gpointer data); +gint mail_store_set_offline(CamelStore *store, gboolean offline, + void (*done)(CamelStore *, gpointer data), + gpointer data); +gint mail_store_prepare_offline (CamelStore *store); /* filter driver execute shell command async callback */ -void mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, void *data); +void mail_execute_shell_command (CamelFilterDriver *driver, gint argc, gchar **argv, gpointer data); -int mail_check_service(const char *url, CamelProviderType type, - void (*done)(const char *url, CamelProviderType type, GList *authtypes, void *data), void *data); +gint mail_check_service(const gchar *url, CamelProviderType type, + void (*done)(const gchar *url, CamelProviderType type, GList *authtypes, gpointer data), gpointer data); #ifdef __cplusplus } diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index be834bb0d3..c6f7df9c2d 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -67,17 +67,17 @@ /* this stuff is used to keep track of which folders filters have accessed, and what not. the thaw/refreeze thing doesn't really seem to work though */ struct _folder_info { - char *uri; + gchar *uri; CamelFolder *folder; time_t update; - int count; /* how many times updated, to slow it down as we go, if we have lots */ + gint count; /* how many times updated, to slow it down as we go, if we have lots */ }; struct _send_data { GList *infos; GtkDialog *gd; - int cancelled; + gint cancelled; CamelFolder *inbox; /* since we're never asked to update this one, do it ourselves */ time_t inbox_update; @@ -104,24 +104,24 @@ typedef enum { struct _send_info { send_info_t type; /* 0 = fetch, 1 = send */ CamelOperation *cancel; - char *uri; + gchar *uri; gboolean keep_on_server; send_state_t state; GtkWidget *progress_bar; GtkWidget *cancel_button; GtkWidget *status_label; - int again; /* need to run send again */ + gint again; /* need to run send again */ - int timeout_id; - char *what; - int pc; + gint timeout_id; + gchar *what; + gint pc; /*time_t update;*/ struct _send_data *data; }; -static CamelFolder *receive_get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelException *ex); +static CamelFolder *receive_get_folder(CamelFilterDriver *d, const gchar *uri, gpointer data, CamelException *ex); static struct _send_data *send_data = NULL; static GtkWidget *send_recv_dialog = NULL; @@ -207,13 +207,13 @@ free_send_data(void) } static void -cancel_send_info(void *key, struct _send_info *info, void *data) +cancel_send_info(gpointer key, struct _send_info *info, gpointer data) { receive_cancel (GTK_BUTTON (info->cancel_button), info); } static void -hide_send_info(void *key, struct _send_info *info, void *data) +hide_send_info(gpointer key, struct _send_info *info, gpointer data) { info->cancel_button = NULL; info->progress_bar = NULL; @@ -234,7 +234,7 @@ dialog_destroy_cb (struct _send_data *data, GObject *deadbeef) } static void -dialog_response(GtkDialog *gd, int button, struct _send_data *data) +dialog_response(GtkDialog *gd, gint button, struct _send_data *data) { switch(button) { case GTK_RESPONSE_CANCEL: @@ -255,7 +255,7 @@ dialog_response(GtkDialog *gd, int button, struct _send_data *data) } static int -operation_status_timeout(void *data) +operation_status_timeout(gpointer data) { struct _send_info *info = data; @@ -274,7 +274,7 @@ operation_status_timeout(void *data) } static void -set_send_status(struct _send_info *info, const char *desc, int pc) +set_send_status(struct _send_info *info, const gchar *desc, gint pc) { /* FIXME: LOCK */ g_free(info->what); @@ -284,7 +284,7 @@ set_send_status(struct _send_info *info, const char *desc, int pc) /* for camel operation status */ static void -operation_status(CamelOperation *op, const char *what, int pc, void *data) +operation_status(CamelOperation *op, const gchar *what, gint pc, gpointer data) { struct _send_info *info = data; @@ -301,11 +301,11 @@ operation_status(CamelOperation *op, const char *what, int pc, void *data) set_send_status(info, what, pc); } -static char * -format_url(const char *internal_url, const char *account_name) +static gchar * +format_url(const gchar *internal_url, const gchar *account_name) { CamelURL *url; - char *pretty_url; + gchar *pretty_url; url = camel_url_new(internal_url, NULL); if (account_name) { @@ -330,7 +330,7 @@ format_url(const char *internal_url, const char *account_name) } static send_info_t -get_receive_type(const char *url) +get_receive_type(const gchar *url) { CamelProvider *provider; CamelException ex; @@ -360,11 +360,11 @@ get_receive_type(const char *url) } static struct _send_data * -build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destination) +build_dialog (EAccountList *accounts, CamelFolder *outbox, const gchar *destination) { GtkDialog *gd; GtkWidget *table; - int row, num_sources; + gint row, num_sources; GList *list = NULL; struct _send_data *data; GtkWidget *send_icon; @@ -375,7 +375,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati GtkWidget *progress_bar; GtkWidget *cancel_button; struct _send_info *info; - char *pretty_url; + gchar *pretty_url; EAccount *account; EIterator *iter; EMEventTargetSendReceive *target; @@ -623,7 +623,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati } static void -update_folders(char *uri, struct _folder_info *info, void *data) +update_folders(gchar *uri, struct _folder_info *info, gpointer data) { time_t now = *((time_t *)data); @@ -641,7 +641,7 @@ update_folders(char *uri, struct _folder_info *info, void *data) } static void -receive_status (CamelFilterDriver *driver, enum camel_filter_status_t status, int pc, const char *desc, void *data) +receive_status (CamelFilterDriver *driver, enum camel_filter_status_t status, gint pc, const gchar *desc, gpointer data) { struct _send_info *info = data; time_t now = time(NULL); @@ -673,7 +673,7 @@ receive_status (CamelFilterDriver *driver, enum camel_filter_status_t status, in /* when receive/send is complete */ static void -receive_done (const gchar *uri, void *data) +receive_done (const gchar *uri, gpointer data) { struct _send_info *info = data; @@ -731,7 +731,7 @@ receive_done (const gchar *uri, void *data) This can also be used to hook into which folders are being updated, and occasionally let them refresh */ static CamelFolder * -receive_get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelException *ex) +receive_get_folder(CamelFilterDriver *d, const gchar *uri, gpointer data, CamelException *ex) { struct _send_info *info = data; CamelFolder *folder; @@ -809,7 +809,7 @@ refresh_folders_desc (struct _refresh_folders_msg *m) static void refresh_folders_exec (struct _refresh_folders_msg *m) { - int i; + gint i; CamelFolder *folder; CamelException ex = CAMEL_EXCEPTION_INITIALISER; @@ -842,7 +842,7 @@ refresh_folders_done (struct _refresh_folders_msg *m) static void refresh_folders_free (struct _refresh_folders_msg *m) { - int i; + gint i; for (i=0;ifolders->len;i++) g_free(m->folders->pdata[i]); @@ -861,7 +861,7 @@ static MailMsgInfo refresh_folders_info = { }; static gboolean -receive_update_got_folderinfo(CamelStore *store, CamelFolderInfo *info, void *data) +receive_update_got_folderinfo(CamelStore *store, CamelFolderInfo *info, gpointer data) { if (info) { GPtrArray *folders = g_ptr_array_new(); @@ -887,7 +887,7 @@ receive_update_got_folderinfo(CamelStore *store, CamelFolderInfo *info, void *da } static void -receive_update_got_store (char *uri, CamelStore *store, void *data) +receive_update_got_store (gchar *uri, CamelStore *store, gpointer data) { struct _send_info *info = data; @@ -962,14 +962,14 @@ mail_send_receive (void) struct _auto_data { EAccount *account; - int period; /* in seconds */ - int timeout_id; + gint period; /* in seconds */ + gint timeout_id; }; static GHashTable *auto_active; static gboolean -auto_timeout(void *data) +auto_timeout(gpointer data) { struct _auto_data *info = data; @@ -988,7 +988,7 @@ auto_timeout(void *data) } static void -auto_account_removed(EAccountList *eal, EAccount *ea, void *dummy) +auto_account_removed(EAccountList *eal, EAccount *ea, gpointer dummy) { struct _auto_data *info = g_object_get_data((GObject *)ea, "mail-autoreceive"); @@ -1011,7 +1011,7 @@ auto_account_finalised(struct _auto_data *info) static void auto_account_commit(struct _auto_data *info) { - int period, check; + gint period, check; check = info->account->enabled && e_account_get_bool(info->account, E_ACCOUNT_SOURCE_AUTO_CHECK) @@ -1031,7 +1031,7 @@ auto_account_commit(struct _auto_data *info) } static void -auto_account_added(EAccountList *eal, EAccount *ea, void *dummy) +auto_account_added(EAccountList *eal, EAccount *ea, gpointer dummy) { struct _auto_data *info; @@ -1042,7 +1042,7 @@ auto_account_added(EAccountList *eal, EAccount *ea, void *dummy) } static void -auto_account_changed(EAccountList *eal, EAccount *ea, void *dummy) +auto_account_changed(EAccountList *eal, EAccount *ea, gpointer dummy) { struct _auto_data *info = g_object_get_data((GObject *)ea, "mail-autoreceive"); @@ -1052,7 +1052,7 @@ auto_account_changed(EAccountList *eal, EAccount *ea, void *dummy) } static void -auto_online(CamelObject *o, void *ed, void *d) +auto_online(CamelObject *o, gpointer ed, gpointer d) { EIterator *iter; EAccountList *accounts; diff --git a/mail/mail-session.c b/mail/mail-session.c index d9e34ccff4..96b4edf574 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -60,7 +60,7 @@ #define d(x) CamelSession *session; -static int session_check_junk_notify_id = -1; +static gint session_check_junk_notify_id = -1; #define MAIL_SESSION_TYPE (mail_session_get_type ()) #define MAIL_SESSION(obj) (CAMEL_CHECK_CAST((obj), MAIL_SESSION_TYPE, MailSession)) @@ -84,16 +84,16 @@ typedef struct _MailSessionClass { static CamelSessionClass *ms_parent_class; -static char *get_password(CamelSession *session, CamelService *service, const char *domain, const char *prompt, const char *item, guint32 flags, CamelException *ex); -static void forget_password(CamelSession *session, CamelService *service, const char *domain, const char *item, CamelException *ex); -static gboolean alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel); -static CamelFilterDriver *get_filter_driver(CamelSession *session, const char *type, CamelException *ex); -static gboolean lookup_addressbook(CamelSession *session, const char *name); +static gchar *get_password(CamelSession *session, CamelService *service, const gchar *domain, const gchar *prompt, const gchar *item, guint32 flags, CamelException *ex); +static void forget_password(CamelSession *session, CamelService *service, const gchar *domain, const gchar *item, CamelException *ex); +static gboolean alert_user(CamelSession *session, CamelSessionAlertType type, const gchar *prompt, gboolean cancel); +static CamelFilterDriver *get_filter_driver(CamelSession *session, const gchar *type, CamelException *ex); +static gboolean lookup_addressbook(CamelSession *session, const gchar *name); -static void ms_thread_status(CamelSession *session, CamelSessionThreadMsg *msg, const char *text, int pc); -static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size); +static void ms_thread_status(CamelSession *session, CamelSessionThreadMsg *msg, const gchar *text, gint pc); +static gpointer ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, guint size); static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m); -static void ms_forward_to (CamelSession *session, CamelFolder *folder, CamelMimeMessage *message, const char *address, CamelException *ex); +static void ms_forward_to (CamelSession *session, CamelFolder *folder, CamelMimeMessage *message, const gchar *address, CamelException *ex); static void init (MailSession *session) @@ -150,10 +150,10 @@ mail_session_get_type (void) } -static char * -make_key (CamelService *service, const char *item) +static gchar * +make_key (CamelService *service, const gchar *item) { - char *key; + gchar *key; if (service) key = camel_url_to_string (service->url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS); @@ -165,12 +165,12 @@ make_key (CamelService *service, const char *item) /* ********************************************************************** */ -static char * -get_password (CamelSession *session, CamelService *service, const char *domain, - const char *prompt, const char *item, guint32 flags, CamelException *ex) +static gchar * +get_password (CamelSession *session, CamelService *service, const gchar *domain, + const gchar *prompt, const gchar *item, guint32 flags, CamelException *ex) { - char *url; - char *ret = NULL; + gchar *url; + gchar *ret = NULL; EAccount *account = NULL; url = service?camel_url_to_string(service->url, CAMEL_URL_HIDE_ALL):NULL; @@ -183,7 +183,7 @@ get_password (CamelSession *session, CamelService *service, const char *domain, else ret = g_strdup(url); } else { - char *key = make_key(service, item); + gchar *key = make_key(service, item); EAccountService *config_service = NULL; if (domain == NULL) @@ -204,7 +204,7 @@ get_password (CamelSession *session, CamelService *service, const char *domain, if (!config_service || (config_service && !config_service->get_password_canceled)) { guint32 eflags; - char *title; + gchar *title; if (flags & CAMEL_SESSION_PASSPHRASE) { if (account) @@ -263,9 +263,9 @@ get_password (CamelSession *session, CamelService *service, const char *domain, } static void -forget_password (CamelSession *session, CamelService *service, const char *domain, const char *item, CamelException *ex) +forget_password (CamelSession *session, CamelService *service, const gchar *domain, const gchar *item, CamelException *ex) { - char *key = make_key (service, item); + gchar *key = make_key (service, item); e_passwords_forget_password (domain?domain:"Mail", key); g_free (key); @@ -280,18 +280,18 @@ struct _user_message_msg { MailMsg base; CamelSessionAlertType type; - char *prompt; + gchar *prompt; EFlag *done; - unsigned int allow_cancel:1; - unsigned int result:1; - unsigned int ismain:1; + guint allow_cancel:1; + guint result:1; + guint ismain:1; }; static void user_message_exec (struct _user_message_msg *m); static void -user_message_response_free (GtkDialog *dialog, int button, struct _user_message_msg *m) +user_message_response_free (GtkDialog *dialog, gint button, struct _user_message_msg *m) { gtk_widget_destroy ((GtkWidget *) dialog); @@ -307,7 +307,7 @@ user_message_response_free (GtkDialog *dialog, int button, struct _user_message_ /* clicked, send back the reply */ static void -user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m) +user_message_response (GtkDialog *dialog, gint button, struct _user_message_msg *m) { /* if !allow_cancel, then we've already replied */ if (m->allow_cancel) { @@ -398,7 +398,7 @@ static MailMsgInfo user_message_info = { }; static gboolean -lookup_addressbook(CamelSession *session, const char *name) +lookup_addressbook(CamelSession *session, const gchar *name) { CamelInternetAddress *addr; gboolean ret; @@ -415,7 +415,7 @@ lookup_addressbook(CamelSession *session, const char *name) } static gboolean -alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel) +alert_user(CamelSession *session, CamelSessionAlertType type, const gchar *prompt, gboolean cancel) { MailSession *mail_session = MAIL_SESSION (session); struct _user_message_msg *m; @@ -452,13 +452,13 @@ alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt } static CamelFolder * -get_folder (CamelFilterDriver *d, const char *uri, void *data, CamelException *ex) +get_folder (CamelFilterDriver *d, const gchar *uri, gpointer data, CamelException *ex) { return mail_tool_uri_to_folder(uri, 0, ex); } static void -main_play_sound (CamelFilterDriver *driver, char *filename, gpointer user_data) +main_play_sound (CamelFilterDriver *driver, gchar *filename, gpointer user_data) { if (filename && *filename) gnome_sound_play (filename); @@ -470,7 +470,7 @@ main_play_sound (CamelFilterDriver *driver, char *filename, gpointer user_data) } static void -session_play_sound (CamelFilterDriver *driver, const char *filename, gpointer user_data) +session_play_sound (CamelFilterDriver *driver, const gchar *filename, gpointer user_data) { MailSession *ms = (MailSession *) session; @@ -499,11 +499,11 @@ session_system_beep (CamelFilterDriver *driver, gpointer user_data) } static CamelFilterDriver * -main_get_filter_driver (CamelSession *session, const char *type, CamelException *ex) +main_get_filter_driver (CamelSession *session, const gchar *type, CamelException *ex) { CamelFilterDriver *driver; FilterRule *rule = NULL; - char *user, *system; + gchar *user, *system; GConfClient *gconf; RuleContext *fc; @@ -523,7 +523,7 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException MailSession *ms = (MailSession *) session; if (ms->filter_logfile == NULL) { - char *filename; + gchar *filename; filename = gconf_client_get_string (gconf, "/apps/evolution/mail/filters/logfile", NULL); if (filename) { @@ -579,7 +579,7 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException } static CamelFilterDriver * -get_filter_driver (CamelSession *session, const char *type, CamelException *ex) +get_filter_driver (CamelSession *session, const gchar *type, CamelException *ex) { return (CamelFilterDriver *) mail_call_main (MAIL_CALL_p_ppp, (MailMainFunc) main_get_filter_driver, session, type, ex); @@ -590,7 +590,7 @@ get_filter_driver (CamelSession *session, const char *type, CamelException *ex) static MailMsgInfo ms_thread_info_dummy = { sizeof (MailMsg) }; -static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) +static gpointer ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, guint size) { CamelSessionThreadMsg *msg = ms_parent_class->thread_msg_new(session, ops, size); @@ -614,14 +614,14 @@ static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) ms_parent_class->thread_msg_free(session, m); } -static void ms_thread_status(CamelSession *session, CamelSessionThreadMsg *msg, const char *text, int pc) +static void ms_thread_status(CamelSession *session, CamelSessionThreadMsg *msg, const gchar *text, gint pc) { /* This should never be called since we bypass it in alloc! */ printf("Thread status '%s' %d%%\n", text, pc); } static void -ms_forward_to (CamelSession *session, CamelFolder *folder, CamelMimeMessage *message, const char *address, CamelException *ex) +ms_forward_to (CamelSession *session, CamelFolder *folder, CamelMimeMessage *message, const gchar *address, CamelException *ex) { g_return_if_fail (session != NULL); g_return_if_fail (message != NULL); @@ -630,12 +630,12 @@ ms_forward_to (CamelSession *session, CamelFolder *folder, CamelMimeMessage *mes em_utils_forward_message_raw (folder, message, address, ex); } -char * -mail_session_get_password (const char *url_string) +gchar * +mail_session_get_password (const gchar *url_string) { CamelURL *url; - char *simple_url; - char *passwd; + gchar *simple_url; + gchar *passwd; url = camel_url_new (url_string, NULL); simple_url = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS); @@ -649,11 +649,11 @@ mail_session_get_password (const char *url_string) } void -mail_session_add_password (const char *url_string, - const char *passwd) +mail_session_add_password (const gchar *url_string, + const gchar *passwd) { CamelURL *url; - char *simple_url; + gchar *simple_url; url = camel_url_new (url_string, NULL); simple_url = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS); @@ -665,10 +665,10 @@ mail_session_add_password (const char *url_string, } void -mail_session_remember_password (const char *url_string) +mail_session_remember_password (const gchar *url_string) { CamelURL *url; - char *simple_url; + gchar *simple_url; url = camel_url_new (url_string, NULL); simple_url = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS); @@ -680,7 +680,7 @@ mail_session_remember_password (const char *url_string) } void -mail_session_forget_password (const char *key) +mail_session_forget_password (const gchar *key) { e_passwords_forget_password ("Mail", key); } @@ -702,9 +702,9 @@ mail_session_check_junk_notify (GConfClient *gconf, guint id, GConfEntry *entry, } void -mail_session_init (const char *base_directory) +mail_session_init (const gchar *base_directory) { - char *camel_dir; + gchar *camel_dir; GConfClient *gconf; if (camel_init (base_directory, TRUE) != 0) @@ -773,8 +773,8 @@ mail_session_set_interactive (gboolean interactive) } void -mail_session_forget_passwords (BonoboUIComponent *uih, void *user_data, - const char *path) +mail_session_forget_passwords (BonoboUIComponent *uih, gpointer user_data, + const gchar *path) { e_passwords_forget_passwords (); } @@ -789,11 +789,11 @@ mail_session_flush_filter_log (void) } void -mail_session_add_junk_plugin (const char *plugin_name, CamelJunkPlugin *junk_plugin) +mail_session_add_junk_plugin (const gchar *plugin_name, CamelJunkPlugin *junk_plugin) { MailSession *ms = (MailSession *) session; GConfClient *gconf; - char *def_plugin; + gchar *def_plugin; gconf = mail_config_get_gconf_client (); def_plugin = gconf_client_get_string (gconf, "/apps/evolution/mail/junk/default_plugin", NULL); @@ -818,7 +818,7 @@ mail_session_get_junk_plugins (void) } void -mail_session_set_junk_headers (const char **name, const char **value, int len) +mail_session_set_junk_headers (const gchar **name, const gchar **value, gint len) { if (!session) return; diff --git a/mail/mail-session.h b/mail/mail-session.h index 60d6b9ab2a..d0595ba548 100644 --- a/mail/mail-session.h +++ b/mail/mail-session.h @@ -32,28 +32,28 @@ extern "C" { #pragma } #endif /* __cplusplus */ -void mail_session_init (const char *base_directory); +void mail_session_init (const gchar *base_directory); void mail_session_shutdown (void); gboolean mail_session_get_interactive (void); void mail_session_set_interactive (gboolean interactive); -char *mail_session_request_dialog (const char *prompt, gboolean secret, - const char *key, gboolean async); -gboolean mail_session_accept_dialog (const char *prompt, const char *key, +gchar *mail_session_request_dialog (const gchar *prompt, gboolean secret, + const gchar *key, gboolean async); +gboolean mail_session_accept_dialog (const gchar *prompt, const gchar *key, gboolean async); -char *mail_session_get_password (const char *url); -void mail_session_add_password (const char *url, const char *passwd); -void mail_session_forget_passwords (BonoboUIComponent *uih, void *user_data, - const char *path); -void mail_session_remember_password (const char *url); +gchar *mail_session_get_password (const gchar *url); +void mail_session_add_password (const gchar *url, const gchar *passwd); +void mail_session_forget_passwords (BonoboUIComponent *uih, gpointer user_data, + const gchar *path); +void mail_session_remember_password (const gchar *url); -void mail_session_forget_password (const char *key); +void mail_session_forget_password (const gchar *key); void mail_session_flush_filter_log (void); -void mail_session_add_junk_plugin (const char *plugin_name, CamelJunkPlugin *junk_plugin); +void mail_session_add_junk_plugin (const gchar *plugin_name, CamelJunkPlugin *junk_plugin); const GList * mail_session_get_junk_plugins (void); -void mail_session_set_junk_headers (const char **name, const char **value, int len); +void mail_session_set_junk_headers (const gchar **name, const gchar **value, gint len); extern CamelSession *session; diff --git a/mail/mail-tools.c b/mail/mail-tools.c index a256e7e107..33c47462f9 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -78,7 +78,7 @@ mail_tool_get_inbox (const gchar *url, CamelException *ex) } CamelFolder * -mail_tool_get_trash (const gchar *url, int connect, CamelException *ex) +mail_tool_get_trash (const gchar *url, gint connect, CamelException *ex) { CamelStore *store; CamelFolder *trash; @@ -103,14 +103,14 @@ mail_tool_get_trash (const gchar *url, int connect, CamelException *ex) #ifndef G_OS_WIN32 -static char * -mail_tool_get_local_movemail_path (const unsigned char *uri, CamelException *ex) +static gchar * +mail_tool_get_local_movemail_path (const guchar *uri, CamelException *ex) { - unsigned char *safe_uri, *c; - char *path, *full; + guchar *safe_uri, *c; + gchar *path, *full; struct stat st; - safe_uri = (unsigned char *)g_strdup ((const gchar *)uri); + safe_uri = (guchar *)g_strdup ((const gchar *)uri); for (c = safe_uri; *c; c++) if (strchr("/:;=|%&#!*^()\\, ", *c) || !isprint((int) *c)) *c = '_'; @@ -132,11 +132,11 @@ mail_tool_get_local_movemail_path (const unsigned char *uri, CamelException *ex) #endif -char * -mail_tool_do_movemail (const char *source_url, CamelException *ex) +gchar * +mail_tool_do_movemail (const gchar *source_url, CamelException *ex) { #ifndef G_OS_WIN32 - char *dest_path; + gchar *dest_path; struct stat sb; CamelURL *uri; @@ -154,7 +154,7 @@ mail_tool_do_movemail (const char *source_url, CamelException *ex) } /* Set up our destination. */ - dest_path = mail_tool_get_local_movemail_path ((unsigned char *)source_url, ex); + dest_path = mail_tool_get_local_movemail_path ((guchar *)source_url, ex); if (dest_path == NULL) return NULL; @@ -183,12 +183,12 @@ mail_tool_do_movemail (const char *source_url, CamelException *ex) #endif } -char * +gchar * mail_tool_generate_forward_subject (CamelMimeMessage *msg) { - const char *subject; - char *fwd_subj; - const int max_subject_length = 1024; + const gchar *subject; + gchar *fwd_subj; + const gint max_subject_length = 1024; subject = camel_mime_message_get_subject(msg); @@ -207,7 +207,7 @@ mail_tool_generate_forward_subject (CamelMimeMessage *msg) } } else { const CamelInternetAddress *from; - char *fromstr; + gchar *fromstr; from = camel_mime_message_get_from (msg); if (from) { @@ -247,9 +247,9 @@ CamelMimePart * mail_tool_make_message_attachment (CamelMimeMessage *message) { CamelMimePart *part; - const char *subject; + const gchar *subject; struct _camel_header_raw *xev; - char *desc; + gchar *desc; subject = camel_mime_message_get_subject (message); if (subject) @@ -276,13 +276,13 @@ mail_tool_make_message_attachment (CamelMimeMessage *message) } CamelFolder * -mail_tool_uri_to_folder (const char *uri, guint32 flags, CamelException *ex) +mail_tool_uri_to_folder (const gchar *uri, guint32 flags, CamelException *ex) { CamelURL *url; CamelStore *store = NULL; CamelFolder *folder = NULL; - int offset = 0; - char *curi = NULL; + gint offset = 0; + gchar *curi = NULL; g_return_val_if_fail (uri != NULL, NULL); @@ -309,7 +309,7 @@ mail_tool_uri_to_folder (const char *uri, guint32 flags, CamelException *ex) store = (CamelStore *)camel_session_get_service(session, uri+offset, CAMEL_PROVIDER_STORE, ex); if (store) { - const char *name; + const gchar *name; /* if we have a fragment, then the path is actually used by the store, so the fragment is the path to the folder instead */ @@ -351,10 +351,10 @@ mail_tool_uri_to_folder (const char *uri, guint32 flags, CamelException *ex) * UIDs specified by the selection. **/ CamelFolder * -mail_tools_x_evolution_message_parse (char *in, unsigned int inlen, GPtrArray **uids) +mail_tools_x_evolution_message_parse (gchar *in, guint inlen, GPtrArray **uids) { /* format: "uri\0uid1\0uid2\0uid3\0...\0uidn" */ - char *inptr, *inend; + gchar *inptr, *inend; CamelFolder *folder; if (in == NULL) @@ -370,7 +370,7 @@ mail_tools_x_evolution_message_parse (char *in, unsigned int inlen, GPtrArray ** inptr = in + strlen (in) + 1; *uids = g_ptr_array_new (); while (inptr < inend) { - char *start = inptr; + gchar *start = inptr; while (inptr < inend && *inptr) inptr++; @@ -383,11 +383,11 @@ mail_tools_x_evolution_message_parse (char *in, unsigned int inlen, GPtrArray ** } /* FIXME: This should be a property on CamelFolder */ -char * +gchar * mail_tools_folder_to_url (CamelFolder *folder) { CamelURL *url; - char *out; + gchar *out; g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL); @@ -395,7 +395,7 @@ mail_tools_folder_to_url (CamelFolder *folder) if (((CamelService *)folder->parent_store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) { camel_url_set_fragment(url, folder->full_name); } else { - char *name = g_alloca(strlen(folder->full_name)+2); + gchar *name = g_alloca(strlen(folder->full_name)+2); sprintf(name, "/%s", folder->full_name); camel_url_set_path(url, name); diff --git a/mail/mail-tools.h b/mail/mail-tools.h index 1590636e5c..11e7c87dcd 100644 --- a/mail/mail-tools.h +++ b/mail/mail-tools.h @@ -32,14 +32,14 @@ struct _CamelMimePart; struct _camel_header_raw; /* Get the "inbox" for a url (uses global session) */ -struct _CamelFolder *mail_tool_get_inbox (const char *url, struct _CamelException *ex); +struct _CamelFolder *mail_tool_get_inbox (const gchar *url, struct _CamelException *ex); /* Get the "trash" for a url (uses global session) */ -struct _CamelFolder *mail_tool_get_trash (const char *url, int connect, struct _CamelException *ex); +struct _CamelFolder *mail_tool_get_trash (const gchar *url, gint connect, struct _CamelException *ex); /* Does a camel_movemail into the local movemail folder * and returns the path to the new movemail folder that was created. which shoudl be freed later */ -char *mail_tool_do_movemail (const char *source_url, struct _CamelException *ex); +gchar *mail_tool_do_movemail (const gchar *source_url, struct _CamelException *ex); struct _camel_header_raw *mail_tool_remove_xevolution_headers (struct _CamelMimeMessage *message); void mail_tool_restore_xevolution_headers (struct _CamelMimeMessage *message, struct _camel_header_raw *); @@ -51,12 +51,12 @@ gchar *mail_tool_generate_forward_subject (struct _CamelMimeMessage *msg); struct _CamelMimePart *mail_tool_make_message_attachment (struct _CamelMimeMessage *message); /* Parse the ui into a real struct _CamelFolder any way we know how. */ -struct _CamelFolder *mail_tool_uri_to_folder (const char *uri, guint32 flags, struct _CamelException *ex); +struct _CamelFolder *mail_tool_uri_to_folder (const gchar *uri, guint32 flags, struct _CamelException *ex); GHashTable *mail_lookup_url_table (struct _CamelMimeMessage *mime_message); -struct _CamelFolder *mail_tools_x_evolution_message_parse (char *in, unsigned int inlen, GPtrArray **uids); +struct _CamelFolder *mail_tools_x_evolution_message_parse (gchar *in, guint inlen, GPtrArray **uids); -char *mail_tools_folder_to_url (struct _CamelFolder *folder); +gchar *mail_tools_folder_to_url (struct _CamelFolder *folder); #endif diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index aab8625807..5014594a00 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -63,7 +63,7 @@ static GList *source_folders_local; /* list of source folder uri's - local ones static GHashTable *vfolder_hash; /* This is a slightly hacky solution to shutting down, we poll this variable in various loops, and just quit processing if it is set. */ -static volatile int shutdown; /* are we shutting down? */ +static volatile gint shutdown; /* are we shutting down? */ /* more globals ... */ extern CamelSession *session; @@ -78,7 +78,7 @@ struct _setup_msg { MailMsg base; CamelFolder *folder; - char *query; + gchar *query; GList *sources_uri; GList *sources_folder; }; @@ -101,13 +101,13 @@ vfolder_setup_exec (struct _setup_msg *m) l = m->sources_uri; while (l && !shutdown) { - d(printf(" Adding uri: %s\n", (char *)l->data)); + d(printf(" Adding uri: %s\n", (gchar *)l->data)); folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex); if (folder) { list = g_list_append(list, folder); } else { - g_warning("Could not open vfolder source: %s", (char *)l->data); + g_warning("Could not open vfolder source: %s", (gchar *)l->data); camel_exception_clear(&m->base.ex); } l = l->next; @@ -170,10 +170,10 @@ static MailMsgInfo vfolder_setup_info = { /* sources_uri should be camel uri's */ static int -vfolder_setup(CamelFolder *folder, const char *query, GList *sources_uri, GList *sources_folder) +vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList *sources_folder) { struct _setup_msg *m; - int id; + gint id; m = mail_msg_new(&vfolder_setup_info); m->folder = folder; @@ -193,15 +193,15 @@ vfolder_setup(CamelFolder *folder, const char *query, GList *sources_uri, GList struct _adduri_msg { MailMsg base; - char *uri; + gchar *uri; GList *folders; - int remove; + gint remove; }; static gchar * vfolder_adduri_desc (struct _adduri_msg *m) { - char *euri, *desc = NULL; + gchar *euri, *desc = NULL; /* Yuck yuck. Lookup the account name and use that to describe the path */ /* We really need to normalise this across all of camel and evolution :-/ */ @@ -210,13 +210,13 @@ vfolder_adduri_desc (struct _adduri_msg *m) CamelURL *url = camel_url_new(euri, NULL); if (url) { - const char *loc = NULL; + const gchar *loc = NULL; if (url->host && !strcmp(url->host, "local") && url->user && !strcmp(url->user, "local")) { loc = _("On This Computer"); } else { - char *uid; + gchar *uid; const EAccount *account; if (url->user == NULL) @@ -301,10 +301,10 @@ static MailMsgInfo vfolder_adduri_info = { /* uri should be a camel uri */ static int -vfolder_adduri(const char *uri, GList *folders, int remove) +vfolder_adduri(const gchar *uri, GList *folders, gint remove) { struct _adduri_msg *m; - int id; + gint id; m = mail_msg_new(&vfolder_adduri_info); m->folders = folders; @@ -320,7 +320,7 @@ vfolder_adduri(const char *uri, GList *folders, int remove) /* ********************************************************************** */ static GList * -mv_find_folder(GList *l, CamelStore *store, const char *uri) +mv_find_folder(GList *l, CamelStore *store, const gchar *uri) { while (l) { if (camel_store_folder_uri_equal(store, l->data, uri)) @@ -332,12 +332,12 @@ mv_find_folder(GList *l, CamelStore *store, const char *uri) /* uri is a camel uri */ static int -uri_is_ignore(CamelStore *store, const char *uri) +uri_is_ignore(CamelStore *store, const gchar *uri) { EAccountList *accounts; EAccount *account; EIterator *iter; - int found = FALSE; + gint found = FALSE; d(printf("checking '%s' against:\n %s\n %s\n %s\n", uri, mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_OUTBOX), @@ -354,7 +354,7 @@ uri_is_ignore(CamelStore *store, const char *uri) accounts = mail_config_get_accounts (); iter = e_list_get_iterator ((EList *) accounts); while (e_iterator_is_valid (iter)) { - char *curi; + gchar *curi; account = (EAccount *) e_iterator_get (iter); @@ -385,10 +385,10 @@ uri_is_ignore(CamelStore *store, const char *uri) /* so special we never use it */ static int -uri_is_spethal(CamelStore *store, const char *uri) +uri_is_spethal(CamelStore *store, const gchar *uri) { CamelURL *url; - int res; + gint res; /* This is a bit of a hack, but really the only way it can be done at the moment. */ @@ -420,15 +420,15 @@ uri_is_spethal(CamelStore *store, const char *uri) /* called when a new uri becomes (un)available */ void -mail_vfolder_add_uri(CamelStore *store, const char *curi, int remove) +mail_vfolder_add_uri(CamelStore *store, const gchar *curi, gint remove) { FilterRule *rule; - const char *source; + const gchar *source; CamelVeeFolder *vf; GList *folders = NULL, *link; - int remote = (((CamelService *)store)->provider->flags & CAMEL_PROVIDER_IS_REMOTE) != 0; - int is_ignore; - char *uri; + gint remote = (((CamelService *)store)->provider->flags & CAMEL_PROVIDER_IS_REMOTE) != 0; + gint is_ignore; + gchar *uri; uri = em_uri_from_camel(curi); if (uri_is_spethal (store, curi)) { @@ -475,7 +475,7 @@ mail_vfolder_add_uri(CamelStore *store, const char *curi, int remove) rule = NULL; while ((rule = rule_context_next_rule((RuleContext *)context, rule, NULL))) { - int found = FALSE; + gint found = FALSE; if (!rule->name) { d(printf("invalid rule (%p): rule->name is set to NULL\n", rule)); @@ -491,7 +491,7 @@ mail_vfolder_add_uri(CamelStore *store, const char *curi, int remove) source = NULL; while (!found && (source = em_vfolder_rule_next_source((EMVFolderRule *)rule, source))) { - char *csource; + gchar *csource; csource = em_uri_to_camel(source); found = camel_store_folder_uri_equal(store, curi, csource); d(printf(found?" '%s' == '%s'?\n":" '%s' != '%s'\n", curi, csource)); @@ -520,13 +520,13 @@ done: /* called when a uri is deleted from a store */ void -mail_vfolder_delete_uri(CamelStore *store, const char *curi) +mail_vfolder_delete_uri(CamelStore *store, const gchar *curi) { FilterRule *rule; - const char *source; + const gchar *source; CamelVeeFolder *vf; GString *changed; - char *uri; + gchar *uri; GList *link; if (uri_is_spethal (store, curi)) @@ -556,7 +556,7 @@ mail_vfolder_delete_uri(CamelStore *store, const char *curi) source = NULL; while ((source = em_vfolder_rule_next_source ((EMVFolderRule *) rule, source))) { - char *csource = em_uri_to_camel(source); + gchar *csource = em_uri_to_camel(source); /* Remove all sources that match, ignore changed events though because the adduri call above does the work async */ @@ -592,7 +592,7 @@ done: if (changed->str[0]) { GtkWidget *dialog; - char *user; + gchar *user; dialog = e_error_new(NULL, "mail:vfolder-updated", changed->str, uri, NULL); em_utils_show_info_silent (dialog); @@ -610,13 +610,13 @@ done: /* called when a uri is renamed in a store */ void -mail_vfolder_rename_uri(CamelStore *store, const char *cfrom, const char *cto) +mail_vfolder_rename_uri(CamelStore *store, const gchar *cfrom, const gchar *cto) { FilterRule *rule; - const char *source; + const gchar *source; CamelVeeFolder *vf; - int changed = 0; - char *from, *to; + gint changed = 0; + gchar *from, *to; d(printf("vfolder rename uri: %s to %s\n", cfrom, cto)); @@ -635,7 +635,7 @@ mail_vfolder_rename_uri(CamelStore *store, const char *cfrom, const char *cto) while ( (rule = rule_context_next_rule((RuleContext *)context, rule, NULL)) ) { source = NULL; while ( (source = em_vfolder_rule_next_source((EMVFolderRule *)rule, source)) ) { - char *csource = em_uri_to_camel(source); + gchar *csource = em_uri_to_camel(source); /* Remove all sources that match, ignore changed events though because the adduri call above does the work async */ @@ -661,7 +661,7 @@ mail_vfolder_rename_uri(CamelStore *store, const char *cfrom, const char *cto) UNLOCK(); if (changed) { - char *user; + gchar *user; d(printf("Vfolders updated from renamed folder\n")); user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ())); @@ -697,7 +697,7 @@ rule_add_sources(GList *l, GList **sources_folderp, GList **sources_urip) CamelFolder *newfolder; while (l) { - char *curi = em_uri_to_camel(l->data); + gchar *curi = em_uri_to_camel(l->data); if (mail_note_get_folder_from_uri(curi, &newfolder)) { if (newfolder) @@ -721,7 +721,7 @@ rule_changed(FilterRule *rule, CamelFolder *folder) /* if the folder has changed name, then add it, then remove the old manually */ if (strcmp(folder->full_name, rule->name) != 0) { - char *oldname; + gchar *oldname; gpointer key; gpointer oldfolder; @@ -785,7 +785,7 @@ static void context_rule_added(RuleContext *ctx, FilterRule *rule) static void context_rule_removed(RuleContext *ctx, FilterRule *rule) { - char *path; + gchar *path; gpointer key, folder = NULL; @@ -814,7 +814,7 @@ static void context_rule_removed(RuleContext *ctx, FilterRule *rule) } static void -store_folder_created(CamelObject *o, void *event_data, void *data) +store_folder_created(CamelObject *o, gpointer event_data, gpointer data) { CamelStore *store = (CamelStore *)o; CamelFolderInfo *info = event_data; @@ -824,12 +824,12 @@ store_folder_created(CamelObject *o, void *event_data, void *data) } static void -store_folder_deleted(CamelObject *o, void *event_data, void *data) +store_folder_deleted(CamelObject *o, gpointer event_data, gpointer data) { CamelStore *store = (CamelStore *)o; CamelFolderInfo *info = event_data; FilterRule *rule; - char *user; + gchar *user; d(printf("Folder deleted: %s\n", info->name)); store = store; @@ -859,11 +859,11 @@ store_folder_deleted(CamelObject *o, void *event_data, void *data) } static void -store_folder_renamed(CamelObject *o, void *event_data, void *data) +store_folder_renamed(CamelObject *o, gpointer event_data, gpointer data) { CamelRenameInfo *info = event_data; FilterRule *rule; - char *user; + gchar *user; gpointer key, folder; @@ -908,9 +908,9 @@ vfolder_load_storage(void) /* lock for loading storage, it is safe to call it more than once */ static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; - char *user, *storeuri; + gchar *user, *storeuri; FilterRule *rule; - char *xmlfile; + gchar *xmlfile; GConfClient *gconf; pthread_mutex_lock (&lock); @@ -982,7 +982,7 @@ vfolder_load_storage(void) void vfolder_revert(void) { - char *user; + gchar *user; d(printf("vfolder_revert\n")); user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ())); @@ -993,9 +993,9 @@ vfolder_revert(void) static GtkWidget *vfolder_editor = NULL; static void -em_vfolder_editor_response (GtkWidget *dialog, int button, void *data) +em_vfolder_editor_response (GtkWidget *dialog, gint button, gpointer data) { - char *user; + gchar *user; user = g_strdup_printf ("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ())); @@ -1033,10 +1033,10 @@ vfolder_edit (void) } static void -edit_rule_response(GtkWidget *w, int button, void *data) +edit_rule_response(GtkWidget *w, gint button, gpointer data) { if (button == GTK_RESPONSE_OK) { - char *user; + gchar *user; FilterRule *rule = g_object_get_data (G_OBJECT (w), "rule"); FilterRule *orig = g_object_get_data (G_OBJECT (w), "orig"); @@ -1050,7 +1050,7 @@ edit_rule_response(GtkWidget *w, int button, void *data) } void -vfolder_edit_rule(const char *uri) +vfolder_edit_rule(const gchar *uri) { GtkWidget *w; GtkDialog *gd; @@ -1095,10 +1095,10 @@ vfolder_edit_rule(const char *uri) } static void -new_rule_clicked(GtkWidget *w, int button, void *data) +new_rule_clicked(GtkWidget *w, gint button, gpointer data) { if (button == GTK_RESPONSE_OK) { - char *user; + gchar *user; FilterRule *rule = g_object_get_data((GObject *)w, "rule"); if (!filter_rule_validate(rule)) { @@ -1123,7 +1123,7 @@ new_rule_clicked(GtkWidget *w, int button, void *data) } FilterPart * -vfolder_create_part(const char *name) +vfolder_create_part(const gchar *name) { return rule_context_create_part((RuleContext *)context, name); } @@ -1175,7 +1175,7 @@ vfolder_gui_add_rule(EMVFolderRule *rule) } void -vfolder_gui_add_from_message(CamelMimeMessage *msg, int flags, const char *source) +vfolder_gui_add_from_message(CamelMimeMessage *msg, gint flags, const gchar *source) { EMVFolderRule *rule; @@ -1189,7 +1189,7 @@ vfolder_gui_add_from_message(CamelMimeMessage *msg, int flags, const char *sourc } void -vfolder_gui_add_from_address(CamelInternetAddress *addr, int flags, const char *source) +vfolder_gui_add_from_address(CamelInternetAddress *addr, gint flags, const gchar *source) { EMVFolderRule *rule; diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h index 002541371f..9eb1f85ac2 100644 --- a/mail/mail-vfolder.h +++ b/mail/mail-vfolder.h @@ -33,24 +33,24 @@ void vfolder_load_storage(void); void vfolder_revert(void); void vfolder_edit (void); -void vfolder_edit_rule(const char *name); -struct _FilterPart *vfolder_create_part (const char *name); +void vfolder_edit_rule(const gchar *name); +struct _FilterPart *vfolder_create_part (const gchar *name); struct _FilterRule *vfolder_clone_rule (struct _FilterRule *in); void vfolder_gui_add_rule (struct _EMVFolderRule *rule); -void vfolder_gui_add_from_message (struct _CamelMimeMessage *msg, int flags, const char *source); -void vfolder_gui_add_from_address (struct _CamelInternetAddress *addr, int flags, const char *source); +void vfolder_gui_add_from_message (struct _CamelMimeMessage *msg, gint flags, const gchar *source); +void vfolder_gui_add_from_address (struct _CamelInternetAddress *addr, gint flags, const gchar *source); GList * mail_vfolder_get_sources_local (void); GList * mail_vfolder_get_sources_remote (void); /* add a uri that is now (un)available to vfolders in a transient manner */ -void mail_vfolder_add_uri(struct _CamelStore *store, const char *uri, int remove); +void mail_vfolder_add_uri(struct _CamelStore *store, const gchar *uri, gint remove); /* note that a folder has changed name (uri) */ -void mail_vfolder_rename_uri(struct _CamelStore *store, const char *from, const char *to); +void mail_vfolder_rename_uri(struct _CamelStore *store, const gchar *from, const gchar *to); /* remove a uri that should be removed from vfolders permanently */ -void mail_vfolder_delete_uri(struct _CamelStore *store, const char *uri); +void mail_vfolder_delete_uri(struct _CamelStore *store, const gchar *uri); /* close up, clean up */ void mail_vfolder_shutdown (void); diff --git a/mail/message-list.c b/mail/message-list.c index 09f080cae0..a5a344f4e5 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -100,7 +100,7 @@ struct _MLSelection { GPtrArray *uids; CamelFolder *folder; - char *folder_uri; + gchar *folder_uri; }; struct _MessageListPrivate { @@ -178,7 +178,7 @@ enum { #ifdef SMART_ADDRESS_COMPARE struct _EMailAddress { ENameWestern *wname; - char *address; + gchar *address; }; typedef struct _EMailAddress EMailAddress; @@ -186,11 +186,11 @@ typedef struct _EMailAddress EMailAddress; G_DEFINE_TYPE (MessageList, message_list, E_TREE_SCROLLED_TYPE) -static void on_cursor_activated_cmd (ETree *tree, int row, ETreePath path, gpointer user_data); +static void on_cursor_activated_cmd (ETree *tree, gint row, ETreePath path, gpointer user_data); static void on_selection_changed_cmd(ETree *tree, MessageList *ml); static gint on_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, MessageList *list); -static char *filter_date (time_t date); -static char *filter_size (int size); +static gchar *filter_date (time_t date); +static gchar *filter_size (gint size); static void folder_changed (CamelObject *o, gpointer event_data, gpointer user_data); @@ -198,11 +198,11 @@ static void save_hide_state(MessageList *ml); static void load_hide_state(MessageList *ml); /* note: @changes is owned/freed by the caller */ -/*static void mail_do_regenerate_messagelist (MessageList *list, const char *search, const char *hideexpr, CamelFolderChangeInfo *changes);*/ -static void mail_regen_list(MessageList *ml, const char *search, const char *hideexpr, CamelFolderChangeInfo *changes); +/*static void mail_do_regenerate_messagelist (MessageList *list, const gchar *search, const gchar *hideexpr, CamelFolderChangeInfo *changes);*/ +static void mail_regen_list(MessageList *ml, const gchar *search, const gchar *hideexpr, CamelFolderChangeInfo *changes); static void mail_regen_cancel(MessageList *ml); -static void clear_info(char *key, ETreePath *node, MessageList *ml); +static void clear_info(gchar *key, ETreePath *node, MessageList *ml); enum { MESSAGE_SELECTED, @@ -243,11 +243,11 @@ static gboolean junk_folder = TRUE; #ifdef SMART_ADDRESS_COMPARE static EMailAddress * -e_mail_address_new (const char *address) +e_mail_address_new (const gchar *address) { CamelInternetAddress *cia; EMailAddress *new; - const char *name = NULL, *addr = NULL; + const gchar *name = NULL, *addr = NULL; cia = camel_internet_address_new (); if (camel_address_unformat (CAMEL_ADDRESS (cia), address) == -1) { @@ -288,7 +288,7 @@ e_mail_address_compare (gconstpointer address1, gconstpointer address2) { const EMailAddress *addr1 = address1; const EMailAddress *addr2 = address2; - int retval; + gint retval; g_return_val_if_fail (addr1 != NULL, 1); g_return_val_if_fail (addr2 != NULL, -1); @@ -351,7 +351,7 @@ address_compare (gconstpointer address1, gconstpointer address2) #ifdef SMART_ADDRESS_COMPARE EMailAddress *addr1, *addr2; #endif /* SMART_ADDRESS_COMPARE */ - int retval; + gint retval; g_return_val_if_fail (address1 != NULL, 1); g_return_val_if_fail (address2 != NULL, -1); @@ -363,13 +363,13 @@ address_compare (gconstpointer address1, gconstpointer address2) e_mail_address_free (addr1); e_mail_address_free (addr2); #else - retval = strcmp ((char *) address1, (char *) address2); + retval = strcmp ((gchar *) address1, (gchar *) address2); #endif /* SMART_ADDRESS_COMPARE */ return retval; } -static char * +static gchar * filter_size (gint size) { gfloat fsize; @@ -388,7 +388,7 @@ filter_size (gint size) } /* Gets the uid of the message displayed at a given view row */ -static const char * +static const gchar * get_message_uid (MessageList *message_list, ETreePath node) { CamelMessageInfo *info; @@ -416,13 +416,13 @@ get_message_info (MessageList *message_list, ETreePath node) return info; } -static const char * -get_normalised_string (MessageList *message_list, CamelMessageInfo *info, int col) +static const gchar * +get_normalised_string (MessageList *message_list, CamelMessageInfo *info, gint col) { - const char *string, *str; - char *normalised; + const gchar *string, *str; + gchar *normalised; EPoolv *poolv; - int index; + gint index; switch (col) { case COL_SUBJECT_NORM: @@ -450,7 +450,7 @@ get_normalised_string (MessageList *message_list, CamelMessageInfo *info, int co poolv = g_hash_table_lookup (message_list->normalised_hash, camel_message_info_uid (info)); if (poolv == NULL) { poolv = e_poolv_new (NORMALISED_LAST); - g_hash_table_insert (message_list->normalised_hash, (char *) camel_message_info_uid (info), poolv); + g_hash_table_insert (message_list->normalised_hash, (gchar *) camel_message_info_uid (info), poolv); } else { str = e_poolv_get (poolv, index); if (*str) @@ -458,10 +458,10 @@ get_normalised_string (MessageList *message_list, CamelMessageInfo *info, int co } if (col == COL_SUBJECT_NORM) { - const unsigned char *subject; + const guchar *subject; - subject = (const unsigned char *) string; - while (!g_ascii_strncasecmp ((char *)subject, "Re:", 3)) { + subject = (const guchar *) string; + while (!g_ascii_strncasecmp ((gchar *)subject, "Re:", 3)) { subject += 3; /* jump over any spaces */ @@ -473,7 +473,7 @@ get_normalised_string (MessageList *message_list, CamelMessageInfo *info, int co while (*subject && isspace ((int) *subject)) subject++; - string = (const char *) subject; + string = (const gchar *) subject; normalised = g_utf8_collate_key (string, -1); } else { /* because addresses require strings, not collate keys */ @@ -501,10 +501,10 @@ clear_selection(MessageList *ml, struct _MLSelection *selection) } static ETreePath -ml_search_forward(MessageList *ml, int start, int end, guint32 flags, guint32 mask) +ml_search_forward(MessageList *ml, gint start, gint end, guint32 flags, guint32 mask) { ETreePath path; - int row; + gint row; CamelMessageInfo *info; ETreeTableAdapter *etta = e_tree_get_table_adapter(ml->tree); @@ -520,10 +520,10 @@ ml_search_forward(MessageList *ml, int start, int end, guint32 flags, guint32 ma } static ETreePath -ml_search_backward(MessageList *ml, int start, int end, guint32 flags, guint32 mask) +ml_search_backward(MessageList *ml, gint start, gint end, guint32 flags, guint32 mask) { ETreePath path; - int row; + gint row; CamelMessageInfo *info; ETreeTableAdapter *etta = e_tree_get_table_adapter(ml->tree); @@ -542,7 +542,7 @@ static ETreePath ml_search_path(MessageList *ml, MessageListSelectDirection direction, guint32 flags, guint32 mask) { ETreePath node; - int row, count; + gint row, count; ETreeTableAdapter *etta = e_tree_get_table_adapter(ml->tree); if (ml->cursor_uid == NULL @@ -639,7 +639,7 @@ message_list_can_select(MessageList *ml, MessageListSelectDirection direction, g * Selects the message with the given UID. **/ void -message_list_select_uid (MessageList *message_list, const char *uid) +message_list_select_uid (MessageList *message_list, const gchar *uid) { ETreePath node; @@ -667,7 +667,7 @@ message_list_select_next_thread (MessageList *ml) { ETreePath node; ETreeTableAdapter *etta = e_tree_get_table_adapter(ml->tree); - int i, count, row; + gint i, count, row; if (!ml->cursor_uid || (node = g_hash_table_lookup(ml->uid_nodemap, ml->cursor_uid)) == NULL) @@ -818,7 +818,7 @@ message_list_copy(MessageList *ml, gboolean cut) if (uids->len > 0) { if (cut) { - int i; + gint i; camel_folder_freeze(ml->folder); for (i=0;ilen;i++) @@ -852,7 +852,7 @@ message_list_paste(MessageList *ml) * SimpleTableModel::col_count */ static int -ml_column_count (ETreeModel *etm, void *data) +ml_column_count (ETreeModel *etm, gpointer data) { return COL_LAST; } @@ -861,7 +861,7 @@ ml_column_count (ETreeModel *etm, void *data) * SimpleTableModel::has_save_id */ static gboolean -ml_has_save_id (ETreeModel *etm, void *data) +ml_has_save_id (ETreeModel *etm, gpointer data) { return TRUE; } @@ -869,8 +869,8 @@ ml_has_save_id (ETreeModel *etm, void *data) /* * SimpleTableModel::get_save_id */ -static char * -ml_get_save_id (ETreeModel *etm, ETreePath path, void *data) +static gchar * +ml_get_save_id (ETreeModel *etm, ETreePath path, gpointer data) { CamelMessageInfo *info; @@ -890,7 +890,7 @@ ml_get_save_id (ETreeModel *etm, ETreePath path, void *data) * SimpleTableModel::has_save_id */ static gboolean -ml_has_get_node_by_id (ETreeModel *etm, void *data) +ml_has_get_node_by_id (ETreeModel *etm, gpointer data) { return TRUE; } @@ -899,7 +899,7 @@ ml_has_get_node_by_id (ETreeModel *etm, void *data) * SimpleTableModel::get_save_id */ static ETreePath -ml_get_node_by_id (ETreeModel *etm, const char *save_id, void *data) +ml_get_node_by_id (ETreeModel *etm, const gchar *save_id, gpointer data) { MessageList *ml; @@ -911,8 +911,8 @@ ml_get_node_by_id (ETreeModel *etm, const char *save_id, void *data) return g_hash_table_lookup(ml->uid_nodemap, save_id); } -static void * -ml_duplicate_value (ETreeModel *etm, int col, const void *value, void *data) +static gpointer +ml_duplicate_value (ETreeModel *etm, gint col, gconstpointer value, gpointer data) { switch (col){ case COL_MESSAGE_STATUS: @@ -926,7 +926,7 @@ ml_duplicate_value (ETreeModel *etm, int col, const void *value, void *data) case COL_SIZE: case COL_FOLLOWUP_FLAG_STATUS: case COL_FOLLOWUP_DUE_BY: - return (void *) value; + return (gpointer) value; case COL_FROM: case COL_SUBJECT: @@ -946,7 +946,7 @@ ml_duplicate_value (ETreeModel *etm, int col, const void *value, void *data) } static void -ml_free_value (ETreeModel *etm, int col, void *value, void *data) +ml_free_value (ETreeModel *etm, gint col, gpointer value, gpointer data) { switch (col){ case COL_MESSAGE_STATUS: @@ -979,8 +979,8 @@ ml_free_value (ETreeModel *etm, int col, void *value, void *data) } } -static void * -ml_initialize_value (ETreeModel *etm, int col, void *data) +static gpointer +ml_initialize_value (ETreeModel *etm, gint col, gpointer data) { switch (col){ case COL_MESSAGE_STATUS: @@ -1015,7 +1015,7 @@ ml_initialize_value (ETreeModel *etm, int col, void *data) } static gboolean -ml_value_is_empty (ETreeModel *etm, int col, const void *value, void *data) +ml_value_is_empty (ETreeModel *etm, gint col, gconstpointer value, gpointer data) { switch (col){ case COL_MESSAGE_STATUS: @@ -1041,14 +1041,14 @@ ml_value_is_empty (ETreeModel *etm, int col, const void *value, void *data) case COL_MIXED_SENDER: case COL_MIXED_RECIPIENTS: case COL_LABELS: - return !(value && *(char *)value); + return !(value && *(gchar *)value); default: g_warning ("This shouldn't be reached\n"); return FALSE; } } -static const char *status_map[] = { +static const gchar *status_map[] = { N_("Unseen"), N_("Seen"), N_("Answered"), @@ -1057,7 +1057,7 @@ static const char *status_map[] = { N_("Multiple Messages"), }; -static const char *score_map[] = { +static const gchar *score_map[] = { N_("Lowest"), N_("Lower"), N_("Low"), @@ -1068,10 +1068,10 @@ static const char *score_map[] = { }; -static char * -ml_value_to_string (ETreeModel *etm, int col, const void *value, void *data) +static gchar * +ml_value_to_string (ETreeModel *etm, gint col, gconstpointer value, gpointer data) { - unsigned int i; + guint i; switch (col){ case COL_MESSAGE_STATUS: @@ -1119,7 +1119,7 @@ ml_value_to_string (ETreeModel *etm, int col, const void *value, void *data) } static GdkPixbuf * -ml_tree_icon_at (ETreeModel *etm, ETreePath path, void *model_data) +ml_tree_icon_at (ETreeModel *etm, ETreePath path, gpointer model_data) { /* we dont really need an icon ... */ return NULL; @@ -1148,7 +1148,7 @@ subtree_unread(MessageList *ml, ETreePath node) } static time_t -subtree_latest(MessageList *ml, ETreePath node, int sent) +subtree_latest(MessageList *ml, ETreePath node, gint sent) { CamelMessageInfo *info; time_t latest = 0, date; @@ -1185,8 +1185,8 @@ sanitize_recipients (const gchar *string) gboolean quoted = FALSE; const gchar *p; GString *recipients = g_string_new (""); - char *single_add; - char **name; + gchar *single_add; + gchar **name; if (!string || !*string) return (gchar *) ""; @@ -1222,11 +1222,11 @@ sanitize_recipients (const gchar *string) } static int -get_all_labels (CamelMessageInfo *msg_info, char **label_str, gboolean get_tags) +get_all_labels (CamelMessageInfo *msg_info, gchar **label_str, gboolean get_tags) { GString *str; - const char *old_label; - int count = 0; + const gchar *old_label; + gint count = 0; const CamelFlag *flag; GSList *labels; @@ -1234,7 +1234,7 @@ get_all_labels (CamelMessageInfo *msg_info, char **label_str, gboolean get_tags) str = g_string_new (""); for (flag = camel_message_info_user_flags (msg_info); flag; flag = flag->next) { - const char *name = e_util_labels_get_name (labels, flag->name); + const gchar *name = e_util_labels_get_name (labels, flag->name); if (name) { if (str->len) @@ -1251,7 +1251,7 @@ get_all_labels (CamelMessageInfo *msg_info, char **label_str, gboolean get_tags) old_label = e_util_labels_get_new_tag (camel_message_info_user_tag (msg_info, "label")); if (old_label != NULL) { - const char *name = NULL; + const gchar *name = NULL; if (str->len) g_string_append (str, ", "); @@ -1268,12 +1268,12 @@ get_all_labels (CamelMessageInfo *msg_info, char **label_str, gboolean get_tags) return count; } -static const char * +static const gchar * get_trimmed_subject (CamelMessageInfo *info) { - const char *subject; - const char *mlist; - int mlist_len = 0; + const gchar *subject; + const gchar *mlist; + gint mlist_len = 0; gboolean found_mlist; subject = camel_message_info_subject (info); @@ -1283,7 +1283,7 @@ get_trimmed_subject (CamelMessageInfo *info) mlist = camel_message_info_mlist (info); if (mlist && *mlist) { - const char *mlist_end; + const gchar *mlist_end; mlist_end = strchr (mlist, '@'); if (mlist_end) @@ -1295,7 +1295,7 @@ get_trimmed_subject (CamelMessageInfo *info) do { found_mlist = FALSE; - while (!g_ascii_strncasecmp ((char *) subject, "Re:", 3)) { + while (!g_ascii_strncasecmp ((gchar *) subject, "Re:", 3)) { subject += 3; /* jump over any spaces */ @@ -1305,7 +1305,7 @@ get_trimmed_subject (CamelMessageInfo *info) if (mlist_len && *subject == '[' && - !g_ascii_strncasecmp ((char *) subject + 1, mlist, mlist_len) && + !g_ascii_strncasecmp ((gchar *) subject + 1, mlist, mlist_len) && subject [1 + mlist_len] == ']') { subject += 1 + mlist_len + 1; /* jump over "[mailing-list]" */ found_mlist = TRUE; @@ -1323,14 +1323,14 @@ get_trimmed_subject (CamelMessageInfo *info) return subject; } -static void * -ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) +static gpointer +ml_tree_value_at (ETreeModel *etm, ETreePath path, gint col, gpointer model_data) { MessageList *message_list = model_data; CamelMessageInfo *msg_info; CamelException ex; - const char *str; + const gchar *str; guint32 flags; camel_exception_init (&ex); @@ -1356,8 +1356,8 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) case COL_FLAGGED: return GINT_TO_POINTER ((camel_message_info_flags(msg_info) & CAMEL_MESSAGE_FLAGGED) != 0); case COL_SCORE: { - const char *tag; - int score = 0; + const gchar *tag; + gint score = 0; tag = camel_message_info_user_tag(msg_info, "score"); if (tag) @@ -1366,7 +1366,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) return GINT_TO_POINTER (score); } case COL_FOLLOWUP_FLAG_STATUS: { - const char *tag, *cmp; + const gchar *tag, *cmp; /* FIXME: this all should be methods off of message-tag-followup class, FIXME: the tag names should be namespaced :( */ @@ -1381,7 +1381,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) return GINT_TO_POINTER(0); } case COL_FOLLOWUP_DUE_BY: { - const char *tag; + const gchar *tag; time_t due_by; tag = camel_message_info_user_tag(msg_info, "due-by"); @@ -1394,24 +1394,24 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) } case COL_FOLLOWUP_FLAG: str = camel_message_info_user_tag(msg_info, "follow-up"); - return (void *)(str ? str : ""); + return (gpointer)(str ? str : ""); case COL_ATTACHMENT: if (camel_message_info_user_flag (msg_info, "$has_cal")) return GINT_TO_POINTER (2); return GINT_TO_POINTER ((camel_message_info_flags(msg_info) & CAMEL_MESSAGE_ATTACHMENTS) != 0); case COL_FROM: str = camel_message_info_from (msg_info); - return (void *)(str ? str : ""); + return (gpointer)(str ? str : ""); case COL_FROM_NORM: - return (void *) get_normalised_string (message_list, msg_info, col); + return (gpointer) get_normalised_string (message_list, msg_info, col); case COL_SUBJECT: str = camel_message_info_subject (msg_info); - return (void *)(str ? str : ""); + return (gpointer)(str ? str : ""); case COL_SUBJECT_TRIMMED: str = get_trimmed_subject (msg_info); - return (void *)(str ? str : ""); + return (gpointer)(str ? str : ""); case COL_SUBJECT_NORM: - return (void *) get_normalised_string (message_list, msg_info, col); + return (gpointer) get_normalised_string (message_list, msg_info, col); case COL_SENT: { ETreePath child; @@ -1433,9 +1433,9 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) } case COL_TO: str = camel_message_info_to (msg_info); - return (void *)(str ? str : ""); + return (gpointer)(str ? str : ""); case COL_TO_NORM: - return (void *) get_normalised_string (message_list, msg_info, col); + return (gpointer) get_normalised_string (message_list, msg_info, col); case COL_SIZE: return GINT_TO_POINTER (camel_message_info_size(msg_info)); case COL_DELETED: @@ -1453,9 +1453,9 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) return GINT_TO_POINTER (!(flags & CAMEL_MESSAGE_SEEN)); } case COL_COLOUR: { - const char *colour, *due_by, *completed, *followup; - char *labels_string = NULL; - int n; + const gchar *colour, *due_by, *completed, *followup; + gchar *labels_string = NULL; + gint n; /* Priority: colour tag; label tag; important flag; due-by tag */ @@ -1485,15 +1485,15 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) g_free (labels_string); - return (void *) colour; + return (gpointer) colour; } case COL_LOCATION: { /* Fixme : freeing memory stuff (mem leaks) */ CamelFolder *folder; CamelURL *curl; EAccount *account; - char *location = NULL; - char *euri, *url; + gchar *location = NULL; + gchar *euri, *url; if (CAMEL_IS_VEE_FOLDER(message_list->folder)) { folder = camel_vee_folder_get_location((CamelVeeFolder *)message_list->folder, (CamelVeeMessageInfo *)msg_info, NULL); @@ -1532,34 +1532,34 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) } case COL_MIXED_SENDER: case COL_SENDER:{ - char **sender_name = NULL; + gchar **sender_name = NULL; str = camel_message_info_from (msg_info); if(str && str[0] != '\0'){ - char *res; + gchar *res; sender_name = g_strsplit (str,"<",2); res = g_strdup (*sender_name); g_strfreev (sender_name); - return (void *)(res); + return (gpointer)(res); } else - return (void *)(""); + return (gpointer)(""); } case COL_LABELS:{ - char *str = NULL; + gchar *str = NULL; GString *cleansed_str; cleansed_str = g_string_new (""); if (get_all_labels (msg_info, &str, FALSE)) { - int i; + gint i; for (i = 0; str[i] != '\0'; ++i) { if (str[i] != '_') { g_string_append_c (cleansed_str, str[i]); } } - return (void *) (g_string_free (cleansed_str, FALSE)); + return (gpointer) (g_string_free (cleansed_str, FALSE)); } else - return (void *) (""); + return (gpointer) (""); } default: g_warning ("This shouldn't be reached\n"); @@ -1567,8 +1567,8 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) } } -static void * -ml_tree_sort_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) +static gpointer +ml_tree_sort_value_at (ETreeModel *etm, ETreePath path, gint col, gpointer model_data) { MessageList *message_list = model_data; CamelMessageInfo *msg_info; @@ -1612,14 +1612,14 @@ ml_tree_sort_value_at (ETreeModel *etm, ETreePath path, int col, void *model_dat } static void -ml_tree_set_value_at (ETreeModel *etm, ETreePath path, int col, - const void *val, void *model_data) +ml_tree_set_value_at (ETreeModel *etm, ETreePath path, gint col, + gconstpointer val, gpointer model_data) { g_warning ("This shouldn't be reached\n"); } static gboolean -ml_tree_is_cell_editable (ETreeModel *etm, ETreePath path, int col, void *model_data) +ml_tree_is_cell_editable (ETreeModel *etm, ETreePath path, gint col, gpointer model_data) { return FALSE; } @@ -1627,7 +1627,7 @@ ml_tree_is_cell_editable (ETreeModel *etm, ETreePath path, int col, void *model_ static void message_list_init_images (void) { - int i; + gint i; /* * Only load once, and share @@ -1639,17 +1639,17 @@ message_list_init_images (void) if (states_pixmaps[i].icon_name) states_pixmaps[i].pixbuf = e_icon_factory_get_icon (states_pixmaps[i].icon_name, GTK_ICON_SIZE_MENU); else - states_pixmaps[i].pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) empty_xpm); + states_pixmaps[i].pixbuf = gdk_pixbuf_new_from_xpm_data ((const gchar **) empty_xpm); } } -static char * +static gchar * filter_date (time_t date) { time_t nowdate = time(NULL); time_t yesdate; struct tm then, now, yesterday; - char buf[26]; + gchar buf[26]; gboolean done = FALSE; if (date == 0) @@ -1674,7 +1674,7 @@ filter_date (time_t date) } } if (!done) { - int i; + gint i; for (i = 2; i < 7; i++) { yesdate = nowdate - 60 * 60 * 24 * i; localtime_r (&yesdate, &yesterday); @@ -1705,15 +1705,15 @@ filter_date (time_t date) return g_strdup (buf); } -static ECell * create_composite_cell (int col) +static ECell * create_composite_cell (gint col) { ECell *cell_vbox, *cell_hbox, *cell_sub, *cell_date, *cell_from, *cell_tree, *cell_attach; GdkPixbuf *images [7]; GConfClient *gconf; - char *fixed_name = NULL; + gchar *fixed_name = NULL; gboolean show_email; - int i; - int alt_col = (col == COL_FROM) ? COL_SENDER : COL_RECIPIENTS; + gint i; + gint alt_col = (col == COL_FROM) ? COL_SENDER : COL_RECIPIENTS; gboolean same_font = FALSE; gconf = mail_config_get_gconf_client (); @@ -1765,7 +1765,7 @@ static ECell * create_composite_cell (int col) } static void -composite_cell_set_strike_col (ECell *cell, int col) +composite_cell_set_strike_col (ECell *cell, gint col) { g_object_set (G_OBJECT (g_object_get_data(G_OBJECT (cell), "cell_date")), "strikeout_column", col, NULL); g_object_set (G_OBJECT (g_object_get_data(G_OBJECT (cell), "cell_from")), "strikeout_column", col, NULL); @@ -1774,7 +1774,7 @@ composite_cell_set_strike_col (ECell *cell, int col) static ETableExtras * message_list_create_extras (void) { - int i; + gint i; GdkPixbuf *images [7]; ETableExtras *extras; ECell *cell; @@ -1852,7 +1852,7 @@ message_list_create_extras (void) static void save_tree_state(MessageList *ml) { - char *filename; + gchar *filename; if (ml->folder == NULL || ml->tree == NULL) return; @@ -1873,7 +1873,7 @@ load_tree_state (MessageList *ml, xmlDoc *expand_state) if (expand_state) { e_tree_load_expanded_state_xml (ml->tree, expand_state); } else { - char *filename; + gchar *filename; filename = mail_config_folder_to_cachename (ml->folder, "et-expanded-"); e_tree_load_expanded_state (ml->tree, filename); @@ -1896,9 +1896,9 @@ message_list_setup_etree (MessageList *message_list, gboolean outgoing) /* build the spec based on the folder, and possibly from a saved file */ /* otherwise, leave default */ if (message_list->folder) { - char *path; - char *name; - int data = 1; + gchar *path; + gchar *name; + gint data = 1; struct stat st; ETableItem *item = e_tree_get_item (message_list->tree); @@ -1965,7 +1965,7 @@ ml_selection_received(GtkWidget *widget, GtkSelectionData *data, guint time, Mes } static void -ml_tree_drag_data_get (ETree *tree, int row, ETreePath path, int col, +ml_tree_drag_data_get (ETree *tree, gint row, ETreePath path, gint col, GdkDragContext *context, GtkSelectionData *data, guint info, guint time, MessageList *ml) { @@ -2002,9 +2002,9 @@ struct _drop_msg { guint32 action; guint info; - unsigned int move:1; - unsigned int moved:1; - unsigned int aborted:1; + guint move:1; + guint moved:1; + guint aborted:1; }; static gchar * @@ -2075,7 +2075,7 @@ ml_drop_action(struct _drop_msg *m) } static void -ml_drop_popup_copy(EPopup *ep, EPopupItem *item, void *data) +ml_drop_popup_copy(EPopup *ep, EPopupItem *item, gpointer data) { struct _drop_msg *m = data; @@ -2084,7 +2084,7 @@ ml_drop_popup_copy(EPopup *ep, EPopupItem *item, void *data) } static void -ml_drop_popup_move(EPopup *ep, EPopupItem *item, void *data) +ml_drop_popup_move(EPopup *ep, EPopupItem *item, gpointer data) { struct _drop_msg *m = data; @@ -2093,7 +2093,7 @@ ml_drop_popup_move(EPopup *ep, EPopupItem *item, void *data) } static void -ml_drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data) +ml_drop_popup_cancel(EPopup *ep, EPopupItem *item, gpointer data) { struct _drop_msg *m = data; @@ -2109,7 +2109,7 @@ static EPopupItem ml_drop_popup_menu[] = { }; static void -ml_drop_popup_free(EPopup *ep, GSList *items, void *data) +ml_drop_popup_free(EPopup *ep, GSList *items, gpointer data) { g_slist_free(items); @@ -2117,7 +2117,7 @@ ml_drop_popup_free(EPopup *ep, GSList *items, void *data) } static void -ml_tree_drag_data_received (ETree *tree, int row, ETreePath path, int col, +ml_tree_drag_data_received (ETree *tree, gint row, ETreePath path, gint col, GdkDragContext *context, gint x, gint y, GtkSelectionData *data, guint info, guint time, MessageList *ml) @@ -2146,7 +2146,7 @@ ml_tree_drag_data_received (ETree *tree, int row, ETreePath path, int col, EMPopup *emp; GSList *menus = NULL; GtkMenu *menu; - int i; + gint i; emp = em_popup_new("org.gnome.mail.messagelist.popup.drop"); for (i=0;itargets; targets; targets = targets->next) { - int i; + gint i; d(printf("atom drop '%s'\n", gdk_atom_name(targets->data))); for (i=0;idata == (void *)ml_drag_info[i].atom) + if (targets->data == (gpointer)ml_drag_info[i].atom) actions |= ml_drag_info[i].actions; } d(printf("\n")); @@ -2233,7 +2233,7 @@ ml_scrolled (GtkAdjustment *adj, MessageList *ml) } static void -on_model_row_changed (ETableModel *model, int row, MessageList *ml) +on_model_row_changed (ETableModel *model, gint row, MessageList *ml) { ml->priv->any_row_changed = TRUE; } @@ -2401,7 +2401,7 @@ message_list_class_init (MessageListClass *message_list_class) { GObjectClass *object_class = (GObjectClass *) message_list_class; GtkObjectClass *gtkobject_class = (GtkObjectClass *) message_list_class; - int i; + gint i; for (i=0;imodel = @@ -2574,7 +2574,7 @@ message_list_new (void) } static void -clear_info(char *key, ETreePath *node, MessageList *ml) +clear_info(gchar *key, ETreePath *node, MessageList *ml) { CamelMessageInfo *info; @@ -2671,13 +2671,13 @@ is_node_selectable (MessageList *ml, CamelMessageInfo *info) /* We try and find something that is selectable in our tree. There is * actually no assurance that we'll find something that will still be * there next time, but its probably going to work most of the time. */ -static char * +static gchar * find_next_selectable (MessageList *ml) { ETreePath node; - int last; - int vrow_orig; - int vrow; + gint last; + gint vrow_orig; + gint vrow; ETree *et = ml->tree; CamelMessageInfo *info; @@ -2725,19 +2725,19 @@ find_next_selectable (MessageList *ml) #define BROKEN_ETREE /* avoid some broken code in etree(?) by not using the incremental update */ -static void build_subtree (MessageList *ml, ETreePath parent, CamelFolderThreadNode *c, int *row); +static void build_subtree (MessageList *ml, ETreePath parent, CamelFolderThreadNode *c, gint *row); -static void build_subtree_diff (MessageList *ml, ETreePath parent, ETreePath path, CamelFolderThreadNode *c, int *row); +static void build_subtree_diff (MessageList *ml, ETreePath parent, ETreePath path, CamelFolderThreadNode *c, gint *row); static void build_tree (MessageList *ml, CamelFolderThread *thread, CamelFolderChangeInfo *changes) { - int row = 0; + gint row = 0; ETreeModel *etm = ml->model; #ifndef BROKEN_ETREE ETreePath *top; #endif - char *saveuid = NULL; + gchar *saveuid = NULL; #ifdef BROKEN_ETREE GPtrArray *selected; #endif @@ -2779,7 +2779,7 @@ build_tree (MessageList *ml, CamelFolderThread *thread, CamelFolderChangeInfo *c message_list_free_uids(ml, selected); #else } else { - static int tree_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp); + static gint tree_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp); build_subtree_diff(ml, ml->tree_root, top, thread->tree, &row); top = e_tree_model_node_get_first_child(etm, ml->tree_root); @@ -2815,7 +2815,7 @@ build_tree (MessageList *ml, CamelFolderThread *thread, CamelFolderChangeInfo *c is faster than inserting to the right row :( */ /* Otherwise, this code would probably go as it does the same thing essentially */ static void -build_subtree (MessageList *ml, ETreePath parent, CamelFolderThreadNode *c, int *row) +build_subtree (MessageList *ml, ETreePath parent, CamelFolderThreadNode *c, gint *row) { ETreeModel *tree = ml->model; ETreePath node; @@ -2828,8 +2828,8 @@ build_subtree (MessageList *ml, ETreePath parent, CamelFolderThreadNode *c, int continue; } - node = e_tree_memory_node_insert(E_TREE_MEMORY(tree), parent, -1, (void *)c->message); - g_hash_table_insert(ml->uid_nodemap, (void *)camel_message_info_uid(c->message), node); + node = e_tree_memory_node_insert(E_TREE_MEMORY(tree), parent, -1, (gpointer)c->message); + g_hash_table_insert(ml->uid_nodemap, (gpointer)camel_message_info_uid(c->message), node); camel_folder_ref_message_info(ml->folder, (CamelMessageInfo *)c->message); if (c->child) { @@ -2897,7 +2897,7 @@ tree_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp) /* adds a single node, retains save state, and handles adding children if required */ static void -add_node_diff(MessageList *ml, ETreePath parent, ETreePath path, CamelFolderThreadNode *c, int *row, int myrow) +add_node_diff(MessageList *ml, ETreePath parent, ETreePath path, CamelFolderThreadNode *c, gint *row, gint myrow) { ETreeModel *etm = ml->model; ETreePath node; @@ -2906,8 +2906,8 @@ add_node_diff(MessageList *ml, ETreePath parent, ETreePath path, CamelFolderThre /* we just update the hashtable key, umm, does this leak the info on the message node? */ g_hash_table_remove(ml->uid_nodemap, camel_message_info_uid(c->message)); - node = e_tree_memory_node_insert(E_TREE_MEMORY(etm), parent, myrow, (void *)c->message); - g_hash_table_insert(ml->uid_nodemap, (void *)camel_message_info_uid(c->message), node); + node = e_tree_memory_node_insert(E_TREE_MEMORY(etm), parent, myrow, (gpointer)c->message); + g_hash_table_insert(ml->uid_nodemap, (gpointer)camel_message_info_uid(c->message), node); camel_folder_ref_message_info(ml->folder, (CamelMessageInfo *)c->message); (*row)++; @@ -2918,13 +2918,13 @@ add_node_diff(MessageList *ml, ETreePath parent, ETreePath path, CamelFolderThre /* removes node, children recursively and all associated data */ static void -remove_node_diff(MessageList *ml, ETreePath node, int depth) +remove_node_diff(MessageList *ml, ETreePath node, gint depth) { ETreeModel *etm = ml->model; ETreePath cp, cn; CamelMessageInfo *info; - t(printf("Removing node: %s\n", (char *)e_tree_memory_node_get_data(etm, node))); + t(printf("Removing node: %s\n", (gchar *)e_tree_memory_node_get_data(etm, node))); /* we depth-first remove all node data's ... */ cp = e_tree_model_node_get_first_child(etm, node); @@ -2949,12 +2949,12 @@ remove_node_diff(MessageList *ml, ETreePath node, int depth) /* applies a new tree structure to an existing tree, but only by changing things that have changed */ static void -build_subtree_diff(MessageList *ml, ETreePath parent, ETreePath path, CamelFolderThreadNode *c, int *row) +build_subtree_diff(MessageList *ml, ETreePath parent, ETreePath path, CamelFolderThreadNode *c, gint *row) { ETreeModel *etm = ml->model; ETreePath ap, *ai, *at, *tmp; CamelFolderThreadNode *bp, *bi, *bt; - int i, j, myrow = 0; + gint i, j, myrow = 0; ap = path; bp = c; @@ -2982,7 +2982,7 @@ build_subtree_diff(MessageList *ml, ETreePath parent, ETreePath path, CamelFolde /* if this is a message row, check/update the row id map */ if (g_hash_table_lookup_extended(ml->uid_rowmap, camel_message_info_uid(bp->message), &olduid, &oldrow)) { if ((int)oldrow != (*row)) { - g_hash_table_insert(ml->uid_rowmap, olduid, (void *)(*row)); + g_hash_table_insert(ml->uid_rowmap, olduid, (gpointer)(*row)); } } else { g_warning("Cannot find uid %s in table?", camel_message_info_uid(bp->message)); @@ -3065,8 +3065,8 @@ static void build_flat (MessageList *ml, GPtrArray *summary, CamelFolderChangeInfo *changes) { ETreeModel *etm = ml->model; - char *saveuid = NULL; - int i; + gchar *saveuid = NULL; + gint i; #ifdef BROKEN_ETREE GPtrArray *selected; #endif @@ -3095,7 +3095,7 @@ build_flat (MessageList *ml, GPtrArray *summary, CamelFolderChangeInfo *changes) CamelMessageInfo *info = summary->pdata[i]; node = e_tree_memory_node_insert(E_TREE_MEMORY(etm), ml->tree_root, -1, info); - g_hash_table_insert(ml->uid_nodemap, (void *)camel_message_info_uid(info), node); + g_hash_table_insert(ml->uid_nodemap, (gpointer)camel_message_info_uid(info), node); camel_folder_ref_message_info(ml->folder, info); } e_tree_memory_thaw(E_TREE_MEMORY(etm)); @@ -3148,7 +3148,7 @@ message_list_change_first_visible_parent (MessageList *ml, ETreePath node) static void build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes) { - int i; + gint i; ETreePath node; CamelMessageInfo *info; @@ -3178,9 +3178,9 @@ build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes) for (i=0;iuid_added->len;i++) { info = camel_folder_get_message_info (ml->folder, changes->uid_added->pdata[i]); if (info) { - d(printf(" %s\n", (char *)changes->uid_added->pdata[i])); + d(printf(" %s\n", (gchar *)changes->uid_added->pdata[i])); node = e_tree_memory_node_insert (E_TREE_MEMORY (ml->model), ml->tree_root, -1, info); - g_hash_table_insert (ml->uid_nodemap, (void *)camel_message_info_uid (info), node); + g_hash_table_insert (ml->uid_nodemap, (gpointer)camel_message_info_uid (info), node); } } @@ -3208,11 +3208,11 @@ build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes) static void -mail_folder_hide_by_flag (CamelFolder *folder, MessageList *ml, CamelFolderChangeInfo **changes, int flag) +mail_folder_hide_by_flag (CamelFolder *folder, MessageList *ml, CamelFolderChangeInfo **changes, gint flag) { CamelFolderChangeInfo *newchanges, *oldchanges = *changes; CamelMessageInfo *info; - int i; + gint i; newchanges = camel_folder_change_info_new (); @@ -3252,7 +3252,7 @@ main_folder_changed (CamelObject *o, gpointer event_data, gpointer user_data) MessageList *ml = MESSAGE_LIST (user_data); CamelFolderChangeInfo *changes = (CamelFolderChangeInfo *)event_data; CamelFolder *folder = (CamelFolder *)o; - int i; + gint i; /* may be NULL if we're in the process of being destroyed */ if (ml->async_event == NULL) @@ -3324,7 +3324,7 @@ folder_changed (CamelObject *o, gpointer event_data, gpointer user_data) * the "Outgoing folder" column view. **/ void -message_list_set_folder (MessageList *message_list, CamelFolder *folder, const char *uri, gboolean outgoing) +message_list_set_folder (MessageList *message_list, CamelFolder *folder, const gchar *uri, gboolean outgoing) { ETreeModel *etm = message_list->model; gboolean hide_deleted; @@ -3382,7 +3382,7 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const c } if (folder) { - int strikeout_col = -1; + gint strikeout_col = -1; ECell *cell; camel_object_ref (folder); @@ -3429,7 +3429,7 @@ on_cursor_activated_idle (gpointer data) { MessageList *message_list = data; ESelectionModel *esm = e_tree_get_selection_model (message_list->tree); - int selected = e_selection_model_selected_count (esm); + gint selected = e_selection_model_selected_count (esm); if (selected == 1 && message_list->cursor_uid) { d(printf ("emitting cursor changed signal, for uid %s\n", message_list->cursor_uid)); @@ -3443,10 +3443,10 @@ on_cursor_activated_idle (gpointer data) } static void -on_cursor_activated_cmd (ETree *tree, int row, ETreePath path, gpointer user_data) +on_cursor_activated_cmd (ETree *tree, gint row, ETreePath path, gpointer user_data) { MessageList *message_list = MESSAGE_LIST (user_data); - const char *new_uid; + const gchar *new_uid; if (path == NULL) new_uid = NULL; @@ -3476,7 +3476,7 @@ static void on_selection_changed_cmd(ETree *tree, MessageList *ml) { GPtrArray *uids; - char *newuid; + gchar *newuid; ETreePath cursor; /* not sure if we could just ignore this for the cursor, i think sometimes you @@ -3485,7 +3485,7 @@ on_selection_changed_cmd(ETree *tree, MessageList *ml) if (uids->len == 1) newuid = uids->pdata[0]; else if ((cursor = e_tree_get_cursor(tree))) - newuid = (char *)camel_message_info_uid(e_tree_memory_node_get_data((ETreeMemory *)tree, cursor)); + newuid = (gchar *)camel_message_info_uid(e_tree_memory_node_get_data((ETreeMemory *)tree, cursor)); else newuid = NULL; @@ -3511,7 +3511,7 @@ static gint on_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, MessageList *list) { CamelMessageInfo *info; - int flag; + gint flag; guint32 flags; if (col == COL_MESSAGE_STATUS) @@ -3553,10 +3553,10 @@ struct _ml_selected_data { }; static void -ml_getselected_cb(ETreePath path, void *user_data) +ml_getselected_cb(ETreePath path, gpointer user_data) { struct _ml_selected_data *data = user_data; - const char *uid; + const gchar *uid; if (e_tree_model_node_is_root (data->ml->model, path)) return; @@ -3601,7 +3601,7 @@ message_list_get_selected(MessageList *ml) void message_list_set_selected(MessageList *ml, GPtrArray *uids) { - int i; + gint i; ETreeSelectionModel *etsm; ETreePath node; GPtrArray *paths = g_ptr_array_new(); @@ -3638,7 +3638,7 @@ message_list_thaw(MessageList *ml) void message_list_free_uids(MessageList *ml, GPtrArray *uids) { - int i; + gint i; for (i=0;ilen;i++) g_free(uids->pdata[i]); @@ -3691,7 +3691,7 @@ message_list_set_hidedeleted (MessageList *ml, gboolean hidedeleted) } void -message_list_set_search (MessageList *ml, const char *search) +message_list_set_search (MessageList *ml, const gchar *search) { if (search == NULL || search[0] == '\0') if (ml->search == NULL || ml->search[0] == '\0') @@ -3715,7 +3715,7 @@ message_list_set_search (MessageList *ml, const char *search) /* will ensure that the message with UID uid will be in the message list after the next rebuild */ void -message_list_ensure_message (MessageList *ml, const char *uid) +message_list_ensure_message (MessageList *ml, const gchar *uid) { g_return_if_fail (ml != NULL); @@ -3731,12 +3731,12 @@ message_list_length (MessageList *ml) } struct _glibsuxcrap { - unsigned int count; + guint count; CamelFolder *folder; }; static void -glib_crapback(void *key, void *data, void *x) +glib_crapback(gpointer key, gpointer data, gpointer x) { struct _glibsuxcrap *y = x; CamelMessageInfo *mi; @@ -3755,7 +3755,7 @@ glib_crapback(void *key, void *data, void *x) unsigned int message_list_hidden(MessageList *ml) { - unsigned int hidden = 0; + guint hidden = 0; MESSAGE_LIST_LOCK (ml, hide_lock); if (ml->hidden && ml->folder) { @@ -3783,7 +3783,7 @@ message_list_hidden(MessageList *ml) 100 messages. */ void -message_list_hide_add (MessageList *ml, const char *expr, unsigned int lower, unsigned int upper) +message_list_hide_add (MessageList *ml, const gchar *expr, guint lower, guint upper) { MESSAGE_LIST_LOCK (ml, hide_lock); @@ -3801,8 +3801,8 @@ message_list_hide_add (MessageList *ml, const char *expr, unsigned int lower, un void message_list_hide_uids (MessageList *ml, GPtrArray *uids) { - int i; - char *uid; + gint i; + gchar *uid; /* first see if we need to do any work, if so, then do it all at once */ for (i = 0; i < uids->len; i++) { @@ -3869,7 +3869,7 @@ message_list_hide_clear (MessageList *ml) static void load_hide_state (MessageList *ml) { - char *filename; + gchar *filename; FILE *in; gint32 version, lower, upper; @@ -3895,7 +3895,7 @@ load_hide_state (MessageList *ml) camel_file_util_decode_fixed_int32 (in, &upper); ml->hide_after = upper; while (!feof(in)) { - char *olduid, *uid; + gchar *olduid, *uid; if (camel_file_util_decode_string (in, &olduid) != -1) { uid = e_mempool_strdup(ml->hidden_pool, olduid); @@ -3912,7 +3912,7 @@ load_hide_state (MessageList *ml) } static void -hide_save_1 (char *uid, char *keydata, FILE *out) +hide_save_1 (gchar *uid, gchar *keydata, FILE *out) { camel_file_util_encode_string (out, uid); } @@ -3922,7 +3922,7 @@ hide_save_1 (char *uid, char *keydata, FILE *out) static void save_hide_state (MessageList *ml) { - char *filename; + gchar *filename; FILE *out; if (ml->folder == NULL) @@ -3950,11 +3950,11 @@ save_hide_state (MessageList *ml) struct _regen_list_msg { MailMsg base; - int complete; + gint complete; MessageList *ml; - char *search; - char *hideexpr; + gchar *search; + gchar *hideexpr; CamelFolderChangeInfo *changes; gboolean dotree; /* we are building a tree */ gboolean hidedel; /* we want to/dont want to show deleted messages */ @@ -3965,7 +3965,7 @@ struct _regen_list_msg { CamelFolder *folder; GPtrArray *summary; - int last_row; /* last selected (cursor) row */ + gint last_row; /* last selected (cursor) row */ xmlDoc *expand_state; /* stored expanded state of the previous view */ }; @@ -3992,7 +3992,7 @@ regen_list_exec (struct _regen_list_msg *m) GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL; CamelMessageInfo *info; ETreePath cursor; - int i; + gint i; gchar *expr = NULL; if (m->folder != m->ml->folder) @@ -4042,7 +4042,7 @@ regen_list_exec (struct _regen_list_msg *m) thus we will keep the selected message to be sure it doesn't disappear because it no longer belong to our search filter. */ if (uids && ((m->changes && m->ml->cursor_uid) || m->ml->ensure_uid)) { - const char *looking_for = m->ml->cursor_uid; + const gchar *looking_for = m->ml->cursor_uid; /* ensure_uid has precedence of cursor_uid */ if (m->ml->ensure_uid) looking_for = m->ml->ensure_uid; @@ -4094,7 +4094,7 @@ regen_list_exec (struct _regen_list_msg *m) for (i = 0; i < uidnew->len; i++) { if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == NULL) { - char *uid = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]); + gchar *uid = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]); g_hash_table_insert (m->ml->hidden, uid, uid); } } @@ -4114,12 +4114,12 @@ regen_list_exec (struct _regen_list_msg *m) /* perform uid hiding */ if (m->ml->hidden || m->ml->hide_before != ML_HIDE_NONE_START || m->ml->hide_after != ML_HIDE_NONE_END) { - int start, end; + gint start, end; uidnew = g_ptr_array_new (); /* first, hide matches */ if (m->ml->hidden) { - int subtr = 0; + gint subtr = 0; for (i = 0; i < uids->len; i++) { if (g_hash_table_lookup (m->ml->hidden, uids->pdata[i]) == NULL) @@ -4127,7 +4127,7 @@ regen_list_exec (struct _regen_list_msg *m) else if (m->last_row >= 0) { /* if we are going to hide message above last selected row, then we should decrease our last row number, to put cursor on a proper place. */ - ETreePath node = g_hash_table_lookup (m->ml->uid_nodemap, (const char *) uids->pdata[i]); + ETreePath node = g_hash_table_lookup (m->ml->uid_nodemap, (const gchar *) uids->pdata[i]); if (node && m->last_row > e_tree_table_adapter_row_of_node (e_tree_get_table_adapter (m->ml->tree), node)) subtr ++; @@ -4272,7 +4272,7 @@ regen_list_done (struct _regen_list_msg *m) g_mutex_unlock (m->ml->regen_lock); if (m->ml->regen == NULL && m->ml->pending_select_uid) { - char *uid = m->ml->pending_select_uid; + gchar *uid = m->ml->pending_select_uid; m->ml->pending_select_uid = NULL; message_list_select_uid(m->ml, uid); @@ -4310,7 +4310,7 @@ regen_list_done (struct _regen_list_msg *m) static void regen_list_free (struct _regen_list_msg *m) { - int i; + gint i; e_profile_event_emit("list.regenerated", m->folder->full_name, 0); @@ -4398,7 +4398,7 @@ mail_regen_cancel(MessageList *ml) } static void -mail_regen_list (MessageList *ml, const char *search, const char *hideexpr, CamelFolderChangeInfo *changes) +mail_regen_list (MessageList *ml, const gchar *search, const gchar *hideexpr, CamelFolderChangeInfo *changes) { struct _regen_list_msg *m; GConfClient *gconf; @@ -4457,7 +4457,7 @@ mail_regen_list (MessageList *ml, const char *search, const char *hideexpr, Came if (message_list_length (ml) <= 0) { if (GTK_WIDGET_VISIBLE (GTK_WIDGET (ml))) { /* there is some info why the message list is empty, let it be something useful */ - char *txt = g_strconcat (_("Generating message list"), "..." , NULL); + gchar *txt = g_strconcat (_("Generating message list"), "..." , NULL); e_tree_set_info_message (m->ml->tree, txt); diff --git a/mail/message-list.h b/mail/message-list.h index 4d0866fe20..eb908a7c9b 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -99,7 +99,7 @@ struct _MessageList { /* The folder & matching uri */ CamelFolder *folder; - char *folder_uri; + gchar *folder_uri; GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */ @@ -109,15 +109,15 @@ struct _MessageList { /* IMPORTANT: You MUST have obtained the hide lock, to operate on this data */ GHashTable *hidden; struct _EMemPool *hidden_pool; - int hide_unhidden; /* total length, before hiding */ - int hide_before, hide_after; /* hide ranges of messages */ + gint hide_unhidden; /* total length, before hiding */ + gint hide_before, hide_after; /* hide ranges of messages */ /* Current search string, or %NULL */ - char *search; + gchar *search; /* which message uid should be left in the list even not in a search after rebuild; rebuild will clear the value to NULL */ - char *ensure_uid; + gchar *ensure_uid; /* are we regenerating the message_list because set_folder was just called? */ guint just_set_folder : 1; @@ -138,7 +138,7 @@ struct _MessageList { guint frozen:16; /* Where the ETree cursor is. */ - char *cursor_uid; + gchar *cursor_uid; /* whether the last selection was on a single row or none/multi */ gboolean last_sel_single; @@ -152,11 +152,11 @@ struct _MessageList { /* list of outstanding regeneration requests */ GList *regen; GMutex *regen_lock; /* when writing to the regen, guard with this lock too */ - char *pending_select_uid; /* set if we were busy regnerating while we had a select come in */ + gchar *pending_select_uid; /* set if we were busy regnerating while we had a select come in */ guint regen_timeout_id; - void *regen_timeout_msg; + gpointer regen_timeout_msg; - char *frozen_search; /* to save search took place while we were frozen */ + gchar *frozen_search; /* to save search took place while we were frozen */ /* the current camel folder thread tree, if any */ struct _CamelFolderThread *thread_tree; @@ -169,7 +169,7 @@ typedef struct { ETreeScrolledClass parent_class; /* signals - select a message */ - void (*message_selected) (MessageList *ml, const char *uid); + void (*message_selected) (MessageList *ml, const gchar *uid); void (*message_list_built) (MessageList *ml); void (*message_list_scrolled) (MessageList *ml); } MessageListClass; @@ -183,7 +183,7 @@ typedef enum { GType message_list_get_type (void); GtkWidget *message_list_new (void); -void message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, const char *uri, gboolean outgoing); +void message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, const gchar *uri, gboolean outgoing); void message_list_freeze(MessageList *ml); void message_list_thaw(MessageList *ml); @@ -201,7 +201,7 @@ gboolean message_list_select (MessageList *message_list, gboolean message_list_can_select(MessageList *ml, MessageListSelectDirection direction, guint32 flags, guint32 mask); void message_list_select_uid (MessageList *message_list, - const char *uid); + const gchar *uid); void message_list_select_next_thread (MessageList *ml); @@ -216,11 +216,11 @@ void message_list_copy(MessageList *ml, gboolean cut); void message_list_paste (MessageList *ml); /* info */ -unsigned int message_list_length (MessageList *ml); -unsigned int message_list_hidden (MessageList *ml); +guint message_list_length (MessageList *ml); +guint message_list_hidden (MessageList *ml); /* hide specific messages */ -void message_list_hide_add (MessageList *ml, const char *expr, unsigned int lower, unsigned int upper); +void message_list_hide_add (MessageList *ml, const gchar *expr, guint lower, guint upper); void message_list_hide_uids (MessageList *ml, GPtrArray *uids); void message_list_hide_clear (MessageList *ml); @@ -229,8 +229,8 @@ void message_list_set_threaded_expand_all (MessageList *ml); void message_list_set_threaded_collapse_all (MessageList *ml); void message_list_set_hidedeleted (MessageList *ml, gboolean hidedeleted); -void message_list_set_search (MessageList *ml, const char *search); -void message_list_ensure_message (MessageList *ml, const char *uid); +void message_list_set_search (MessageList *ml, const gchar *search); +void message_list_ensure_message (MessageList *ml, const gchar *uid); void message_list_save_state (MessageList *ml); diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index 827fc6813a..b59154c47e 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -65,7 +65,7 @@ static const gchar *available_flags[] = { N_("Review"), }; -static int num_available_flags = sizeof (available_flags) / sizeof (available_flags[0]); +static gint num_available_flags = sizeof (available_flags) / sizeof (available_flags[0]); static MessageTagEditorClass *parent_class = NULL; @@ -137,7 +137,7 @@ get_tag_list (MessageTagEditor *editor) MessageTagFollowUp *followup = (MessageTagFollowUp *) editor; CamelTag *tags = NULL; time_t date; - char *text; + gchar *text; camel_tag_set (&tags, "follow-up", gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (followup->combo_entry))))); @@ -165,7 +165,7 @@ static void set_tag_list (MessageTagEditor *editor, CamelTag *tags) { MessageTagFollowUp *followup = (MessageTagFollowUp *) editor; - const char *text; + const gchar *text; time_t date; text = camel_tag_get (&tags, "follow-up"); @@ -224,22 +224,22 @@ get_week_start_day (void) static gboolean locale_supports_12_hour_format (void) { - char s[16]; + gchar s[16]; time_t t = 0; strftime(s, sizeof s, "%p", gmtime (&t)); return s[0] != '\0'; } -GtkWidget *target_date_new (const char *s1, const char *s2, int i1, int i2); +GtkWidget *target_date_new (const gchar *s1, const gchar *s2, gint i1, gint i2); GtkWidget * -target_date_new (const char *s1, const char *s2, int i1, int i2) +target_date_new (const gchar *s1, const gchar *s2, gint i1, gint i2) { gboolean time_24hour = TRUE; GConfClient *gconf; GtkWidget *widget; - int start; + gint start; widget = e_date_edit_new (); e_date_edit_set_show_date (E_DATE_EDIT (widget), TRUE); @@ -269,8 +269,8 @@ construct (MessageTagEditor *editor) GtkListStore *model; GtkWidget *widget; GladeXML *gui; - int i; - char *gladefile; + gint i; + gchar *gladefile; gtk_window_set_title (GTK_WINDOW (editor), _("Flag to Follow Up")); @@ -308,7 +308,7 @@ construct (MessageTagEditor *editor) followup->combo_entry = GTK_COMBO_BOX (glade_xml_get_widget (gui, "combo")); gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (followup->combo_entry))); for (i = 0; i < num_available_flags; i++) - gtk_combo_box_append_text (followup->combo_entry, (char *) _(available_flags[i])); + gtk_combo_box_append_text (followup->combo_entry, (gchar *) _(available_flags[i])); gtk_combo_box_set_active (followup->combo_entry, DEFAULT_FLAG); followup->target_date = E_DATE_EDIT (glade_xml_get_widget (gui, "target_date")); @@ -337,7 +337,7 @@ message_tag_followup_new (void) } void -message_tag_followup_append_message (MessageTagFollowUp *editor, const char *from, const char *subject) +message_tag_followup_append_message (MessageTagFollowUp *editor, const gchar *from, const gchar *subject) { GtkTreeIter iter; GtkListStore *model; diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h index 5c229fe36e..7e362df300 100644 --- a/mail/message-tag-followup.h +++ b/mail/message-tag-followup.h @@ -69,8 +69,8 @@ GType message_tag_followup_get_type (void); MessageTagEditor *message_tag_followup_new (void); void message_tag_followup_append_message (MessageTagFollowUp *editor, - const char *from, - const char *subject); + const gchar *from, + const gchar *subject); #ifdef __cplusplus } diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c index 3bccf0a229..d651ad4a56 100644 --- a/plugins/addressbook-file/addressbook-file.c +++ b/plugins/addressbook-file/addressbook-file.c @@ -32,8 +32,8 @@ e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data) { EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; ESource *source = t->source; - char *uri_text; - const char *relative_uri; + gchar *uri_text; + const gchar *relative_uri; uri_text = e_source_get_uri (source); if (strncmp (uri_text, "file", 4)) { diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index ccf14beb30..e0b85f5b89 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -68,7 +68,7 @@ enum { CLUE_N_COLUMNS }; -int e_plugin_lib_enable (EPluginLib *ep, int enable); +gint e_plugin_lib_enable (EPluginLib *ep, gint enable); GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl); void org_gnome_evolution_attachment_reminder (EPlugin *ep, EMEventTargetComposer *t); @@ -77,7 +77,7 @@ GtkWidget* org_gnome_attachment_reminder_config_option (struct _EPlugin *epl, st static gboolean ask_for_missing_attachment (EPlugin *ep, GtkWindow *widget); static gboolean check_for_attachment_clues (gchar *msg); static gboolean check_for_attachment (EMsgComposer *composer); -static gchar* strip_text_msg (gchar *msg); +static gchar * strip_text_msg (gchar *msg); static void commit_changes (UIData *ui); static void cell_edited_callback (GtkCellRendererText *cell, gchar *path_string, @@ -85,8 +85,8 @@ static void cell_edited_callback (GtkCellRendererText *cell, gchar *path_string static gboolean clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, UIData *ui); -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { return 0; } @@ -193,7 +193,7 @@ check_for_attachment (EMsgComposer *composer) return (e_attachment_store_get_num_attachments (store) > 0); } -static gchar* +static gchar * strip_text_msg (gchar *msg) { gchar **lines = g_strsplit ( msg, "\n", -1); @@ -233,7 +233,7 @@ commit_changes (UIData *ui) valid = gtk_tree_model_get_iter_first (model, &iter); while (valid) { - char *keyword; + gchar *keyword; gtk_tree_model_get (model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1); /* Check if the keyword is not empty */ @@ -252,7 +252,7 @@ static void clue_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, UIData *ui) { GtkTreeSelection *selection; - char *keyword = NULL; + gchar *keyword = NULL; gboolean valid; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview)); @@ -285,7 +285,7 @@ clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter valid = gtk_tree_model_get_iter_first (model, iter); while (valid && gtk_list_store_iter_is_valid (ui->store, iter)) { - char *keyword = NULL; + gchar *keyword = NULL; gtk_tree_model_get (model, iter, CLUE_KEYWORD_COLUMN, &keyword, -1); /* Check if the keyword is not empty and then emit the row-changed signal (if we delete the row, then the iter gets corrupted) */ @@ -458,7 +458,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) UIData *ui = g_new0 (UIData, 1); - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_PLUGINDIR, "attachment-reminder.glade", diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index c4c3c098ae..41744fc641 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -38,15 +38,15 @@ #define d(x) -void org_gnome_audio_inline_format (void *ep, EMFormatHookTarget *t); +void org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t); -static volatile int org_gnome_audio_class_id_counter = 0; +static volatile gint org_gnome_audio_class_id_counter = 0; struct _org_gnome_audio_inline_pobject { EMFormatHTMLPObject object; CamelMimePart *part; - char *filename; + gchar *filename; GstElement *playbin; gulong bus_id; GstState target_state; @@ -197,7 +197,7 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob CamelStream *stream; CamelDataWrapper *data; GError *error = NULL; - int argc = 1; + gint argc = 1; const gchar *argv [] = { "org_gnome_audio_inline", NULL }; /* FIXME this is ugly, we should stream this directly to gstreamer */ @@ -213,8 +213,8 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob d(printf ("audio inline formatter: init gst playbin\n")); - if (gst_init_check (&argc, (char ***) &argv, &error)) { - char *uri; + if (gst_init_check (&argc, (gchar ***) &argv, &error)) { + gchar *uri; GstBus *bus; /* create a disk reader */ @@ -254,7 +254,7 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob } static GtkWidget * -org_gnome_audio_inline_add_button (GtkWidget *box, const char *stock_icon, GCallback cb, gpointer data, gboolean sensitive) +org_gnome_audio_inline_add_button (GtkWidget *box, const gchar *stock_icon, GCallback cb, gpointer data, gboolean sensitive) { GtkWidget *button; @@ -288,10 +288,10 @@ org_gnome_audio_inline_button_panel (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMF } void -org_gnome_audio_inline_format (void *ep, EMFormatHookTarget *t) +org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t) { struct _org_gnome_audio_inline_pobject *pobj; - char *classid = g_strdup_printf ("org-gnome-audio-inline-button-panel-%d", org_gnome_audio_class_id_counter); + gchar *classid = g_strdup_printf ("org-gnome-audio-inline-button-panel-%d", org_gnome_audio_class_id_counter); org_gnome_audio_class_id_counter ++; diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index 59c04a605b..92d36e71d8 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -52,7 +52,7 @@ typedef enum _br_flags { }br_flags; static void -backup (const char *filename, gboolean restart) +backup (const gchar *filename, gboolean restart) { if (restart) execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", "--restart", filename, NULL); @@ -61,7 +61,7 @@ backup (const char *filename, gboolean restart) } static void -restore (const char *filename, gboolean restart) +restore (const gchar *filename, gboolean restart) { if (restart) execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", "--restart", filename, NULL); @@ -70,10 +70,10 @@ restore (const char *filename, gboolean restart) } static gboolean -sanity_check (const char *filename) +sanity_check (const gchar *filename) { - char *command; - int result; + gchar *command; + gint result; command = g_strdup_printf ("%s/evolution-backup --check %s", EVOLUTION_TOOLSDIR, filename); result = system (command); @@ -89,11 +89,11 @@ sanity_check (const char *filename) } static guint32 -dialog_prompt_user(GtkWindow *parent, const char *string, const char *tag, const char *arg0, ...) +dialog_prompt_user(GtkWindow *parent, const gchar *string, const gchar *tag, const gchar *arg0, ...) { GtkWidget *mbox, *check = NULL; va_list ap; - int button; + gint button; guint32 mask = 0; va_start(ap, arg0); @@ -120,7 +120,7 @@ dialog_prompt_user(GtkWindow *parent, const char *string, const char *tag, const } static gboolean -epbr_perform_pre_backup_checks (char* dir) +epbr_perform_pre_backup_checks (gchar * dir) { #ifdef G_OS_WIN32 return TRUE; @@ -134,7 +134,7 @@ org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target) { GtkWidget *dlg; GtkWidget *vbox; - int response; + gint response; dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution backup file"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE); @@ -150,10 +150,10 @@ org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target) response = gtk_dialog_run (GTK_DIALOG (dlg)); if (response == GTK_RESPONSE_OK) { - char *filename; + gchar *filename; guint32 mask; - char *uri = NULL; - char *dir; + gchar *uri = NULL; + gchar *dir; uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (dlg)); e_file_update_save_path(uri, TRUE); @@ -186,7 +186,7 @@ org_gnome_backup_restore_restore (EPlugin *ep, ESMenuTargetShell *target) { GtkWidget *dlg; GtkWidget *vbox; - int response; + gint response; dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution backup file to restore"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN); @@ -200,8 +200,8 @@ org_gnome_backup_restore_restore (EPlugin *ep, ESMenuTargetShell *target) response = gtk_dialog_run (GTK_DIALOG (dlg)); if (response == GTK_RESPONSE_OK) { - char *filename; - char *uri = NULL; + gchar *filename; + gchar *uri = NULL; uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (dlg)); e_file_update_save_path(uri, TRUE); @@ -232,7 +232,7 @@ check_toggled (GtkToggleButton *button, GnomeDruid *druid) { GtkWidget *box = g_object_get_data ((GObject *)button, "box"); gboolean state = gtk_toggle_button_get_active ((GtkToggleButton *)button); - char *prevfile = g_object_get_data ((GObject *)druid, "restore-file"); + gchar *prevfile = g_object_get_data ((GObject *)druid, "restore-file"); gtk_widget_set_sensitive (box, state); gnome_druid_set_show_finish (druid, state); @@ -249,7 +249,7 @@ static void restore_wizard (GnomeDruidPage *druidpage, GnomeDruid *druid, gpointer user_data) { gboolean state = GPOINTER_TO_INT(g_object_get_data((GObject *)druid, "restore")) ? TRUE:FALSE; - char *file = g_object_get_data ((GObject *)druid, "restore-file"); + gchar *file = g_object_get_data ((GObject *)druid, "restore-file"); if (state) { if (!file ||!sanity_check (file)) { @@ -263,8 +263,8 @@ restore_wizard (GnomeDruidPage *druidpage, GnomeDruid *druid, gpointer user_data static void file_changed (GtkFileChooser *chooser, GnomeDruid *druid) { - char *file = NULL, *prevfile=NULL; - char *uri = NULL; + gchar *file = NULL, *prevfile=NULL; + gchar *uri = NULL; uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (chooser)); e_file_update_save_path(uri, TRUE); diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 19e9e98bb1..67dea3e6a3 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -43,18 +43,18 @@ #define ARCHIVE_NAME "evolution-backup.tar.gz" static gboolean backup_op = FALSE; -static char *bk_file = NULL; +static gchar *bk_file = NULL; static gboolean restore_op = FALSE; -static char *res_file = NULL; +static gchar *res_file = NULL; static gboolean check_op = FALSE; -static char *chk_file = NULL; +static gchar *chk_file = NULL; static gboolean restart_arg = FALSE; static gboolean gui_arg = FALSE; static gchar **opt_remaining = NULL; -static int result=0; +static gint result=0; static GtkWidget *progress_dialog; static GtkWidget *pbar; -static char *txt = NULL; +static gchar *txt = NULL; gboolean complete = FALSE; static GOptionEntry options[] = { @@ -80,11 +80,11 @@ static GOptionEntry options[] = { #define CANCEL(x) if (x) return; static GString * -replace_string (const char *text, const char *find, const char *replace) +replace_string (const gchar *text, const gchar *find, const gchar *replace) { - const char *p, *next; + const gchar *p, *next; GString *str; - int find_len; + gint find_len; g_return_val_if_fail (text != NULL, NULL); g_return_val_if_fail (find != NULL, NULL); @@ -110,9 +110,9 @@ replace_string (const char *text, const char *find, const char *replace) } static void -replace_in_file (const char *filename, const char *find, const char *replace) +replace_in_file (const gchar *filename, const gchar *find, const gchar *replace) { - char *content = NULL; + gchar *content = NULL; GError *error = NULL; GString *filenamestr = NULL; @@ -157,7 +157,7 @@ replace_in_file (const char *filename, const char *find, const char *replace) } static void -run_cmd (const char *cmd) +run_cmd (const gchar *cmd) { if (!cmd) return; @@ -175,10 +175,10 @@ run_cmd (const char *cmd) } static void -backup (const char *filename) +backup (const gchar *filename) { - char *command; - char *quotedfname; + gchar *command; + gchar *quotedfname; g_return_if_fail (filename && *filename); quotedfname = g_shell_quote(filename); @@ -222,10 +222,10 @@ backup (const char *filename) } static void -restore (const char *filename) +restore (const gchar *filename) { - char *command; - char *quotedfname; + gchar *command; + gchar *quotedfname; g_return_if_fail (filename && *filename); quotedfname = g_shell_quote(filename); @@ -274,10 +274,10 @@ restore (const char *filename) } static void -check (const char *filename) +check (const gchar *filename) { - char *command; - char *quotedfname; + gchar *command; + gchar *quotedfname; g_return_if_fail (filename && *filename); quotedfname = g_shell_quote(filename); @@ -359,10 +359,10 @@ dlg_response (GtkWidget *dlg, gint response, gpointer data) gtk_main_quit (); } -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { - char *file = NULL, *oper = NULL; + gchar *file = NULL, *oper = NULL; gint i; GError *error = NULL; @@ -384,17 +384,17 @@ main (int argc, char **argv) for (i = 0; i < g_strv_length (opt_remaining); i++) { if (backup_op) { oper = _("Backing up to the folder %s"); - d(g_message ("Backing up to the folder %s", (char *) opt_remaining[i])); - bk_file = g_strdup ((char *) opt_remaining[i]); + d(g_message ("Backing up to the folder %s", (gchar *) opt_remaining[i])); + bk_file = g_strdup ((gchar *) opt_remaining[i]); file = bk_file; } else if (restore_op) { oper = _("Restoring from the folder %s"); - d(g_message ("Restoring from the folder %s", (char *) opt_remaining[i])); - res_file = g_strdup ((char *) opt_remaining[i]); + d(g_message ("Restoring from the folder %s", (gchar *) opt_remaining[i])); + res_file = g_strdup ((gchar *) opt_remaining[i]); file = res_file; } else if (check_op) { - d(g_message ("Checking %s", (char *) opt_remaining[i])); - chk_file = g_strdup ((char *) opt_remaining[i]); + d(g_message ("Checking %s", (gchar *) opt_remaining[i])); + chk_file = g_strdup ((gchar *) opt_remaining[i]); } } } diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 2f375ac43b..8cd8535a73 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -42,7 +42,7 @@ #define d(x) /* Plugin hooks */ -int e_plugin_lib_enable (EPluginLib *ep, int enable); +gint e_plugin_lib_enable (EPluginLib *ep, gint enable); void bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target); GtkWidget *bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); @@ -59,11 +59,11 @@ struct bbdb_stuff { /* Static forward declarations */ static gboolean bbdb_timeout (gpointer data); -static void bbdb_do_it (EBook *book, const char *name, const char *email); -static void add_email_to_contact (EContact *contact, const char *email); +static void bbdb_do_it (EBook *book, const gchar *name, const gchar *email); +static void add_email_to_contact (EContact *contact, const gchar *email); static void enable_toggled_cb (GtkWidget *widget, gpointer data); static void source_changed_cb (ESourceComboBox *source_combo_box, struct bbdb_stuff *stuff); -static GtkWidget *create_addressbook_option_menu (struct bbdb_stuff *stuff, int type); +static GtkWidget *create_addressbook_option_menu (struct bbdb_stuff *stuff, gint type); static void cleanup_cb (GObject *o, gpointer data); static ESource * @@ -105,8 +105,8 @@ find_esource_by_uri (ESourceList *source_list, const gchar *target_uri) return NULL; } -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { /* Start up the plugin. */ if (enable) { @@ -134,8 +134,8 @@ bbdb_timeout (gpointer data) typedef struct { - char *name; - char *email; + gchar *name; + gchar *email; } todo_struct; static void @@ -192,7 +192,7 @@ bbdb_do_in_thread (gpointer data) } static void -bbdb_do_thread (const char *name, const char *email) +bbdb_do_thread (const gchar *name, const gchar *email) { todo_struct *td; @@ -271,9 +271,9 @@ bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target) } static void -bbdb_do_it (EBook *book, const char *name, const char *email) +bbdb_do_it (EBook *book, const gchar *name, const gchar *email) { - char *query_string, *delim, *temp_name = NULL; + gchar *query_string, *delim, *temp_name = NULL; EBookQuery *query; GList *contacts, *l; EContact *contact; @@ -375,10 +375,10 @@ bbdb_do_it (EBook *book, const char *name, const char *email) } EBook * -bbdb_open_addressbook (int type) +bbdb_open_addressbook (gint type) { GConfClient *gconf; - char *uri; + gchar *uri; EBook *book = NULL; gboolean status; @@ -439,7 +439,7 @@ bbdb_check_gaim_enabled (void) } static void -add_email_to_contact (EContact *contact, const char *email) +add_email_to_contact (EContact *contact, const gchar *email) { GList *emails; @@ -497,7 +497,7 @@ enable_gaim_toggled_cb (GtkWidget *widget, gpointer data) struct bbdb_stuff *stuff = (struct bbdb_stuff *) data; gboolean active; ESource *selected_source; - char *addressbook_gaim; + gchar *addressbook_gaim; active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); @@ -562,12 +562,12 @@ gaim_source_changed_cb (ESourceComboBox *source_combo_box, } static GtkWidget * -create_addressbook_option_menu (struct bbdb_stuff *stuff, int type) +create_addressbook_option_menu (struct bbdb_stuff *stuff, gint type) { GtkWidget *combo_box; ESourceList *source_list; ESource *selected_source; - char *selected_source_uri; + gchar *selected_source_uri; GConfClient *gconf = stuff->target->gconf; diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index 62887a8ed0..994aab0385 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -36,7 +36,7 @@ #define BBDB_BLIST_CHECK_INTERVAL (2 * 60) /* bbdb.c */ -EBook *bbdb_open_addressbook (int type); +EBook *bbdb_open_addressbook (gint type); gboolean bbdb_check_gaim_enabled (void); /* gaimbuddies.c */ diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index d23749de66..f50498fc48 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -50,20 +50,20 @@ #include "bbdb.h" typedef struct { - char *account_name; - char *proto; - char *alias; - char *icon; + gchar *account_name; + gchar *proto; + gchar *alias; + gchar *icon; } GaimBuddy; /* Forward declarations for this file. */ 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); -static char *get_buddy_icon_from_setting (xmlNodePtr setting); +static gchar *get_node_text (xmlNodePtr node); +static gchar *get_buddy_icon_from_setting (xmlNodePtr setting); static void free_buddy_list (GList *blist); static void parse_buddy_group (xmlNodePtr group, GList **buddies, GSList *blocked); -static EContactField proto_to_contact_field (const char *proto); +static EContactField proto_to_contact_field (const gchar *proto); void bbdb_sync_buddy_list_check (void) @@ -71,8 +71,8 @@ bbdb_sync_buddy_list_check (void) GConfClient *gconf; struct stat statbuf; time_t last_sync; - char *blist_path; - char *last_sync_str; + gchar *blist_path; + gchar *last_sync_str; gconf = gconf_client_get_default (); @@ -87,7 +87,7 @@ bbdb_sync_buddy_list_check (void) /* Reprocess the buddy list if it's been updated. */ last_sync_str = gconf_client_get_string (gconf, GCONF_KEY_GAIM_LAST_SYNC, NULL); - if (last_sync_str == NULL || ! strcmp ((const char *)last_sync_str, "")) + if (last_sync_str == NULL || ! strcmp ((const gchar *)last_sync_str, "")) last_sync = (time_t) 0; else last_sync = (time_t) g_ascii_strtoull (last_sync_str, NULL, 10); @@ -179,7 +179,7 @@ bbdb_sync_buddy_list (void) { GConfClient *gconf; time_t last_sync; - char *last_sync_str; + gchar *last_sync_str; gconf = gconf_client_get_default (); @@ -199,7 +199,7 @@ im_list_contains_buddy (GList *ims, GaimBuddy *b) GList *l; for (l = ims; l != NULL; l = l->next) { - char *im = (char *) l->data; + gchar *im = (gchar *) l->data; if (! strcmp (im, b->account_name)) return TRUE; @@ -241,12 +241,12 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c) g_warning ("bbdb: Could not read buddy icon: %s\n", error->message); g_error_free (error); for (l = ims; l != NULL; l = l->next) - g_free ((char *) l->data); + g_free ((gchar *) l->data); g_list_free (ims); return dirty; } - photo->data.inlined.data = (unsigned char *)contents; + photo->data.inlined.data = (guchar *)contents; e_contact_set (c, E_CONTACT_PHOTO, (gpointer) photo); dirty = TRUE; } @@ -257,14 +257,14 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c) e_contact_photo_free (photo); for (l = ims; l != NULL; l = l->next) - g_free ((char *) l->data); + g_free ((gchar *) l->data); g_list_free (ims); return dirty; } static EContactField -proto_to_contact_field (const char *proto) +proto_to_contact_field (const gchar *proto) { if (! strcmp (proto, "prpl-oscar")) return E_CONTACT_IM_AIM; @@ -296,8 +296,8 @@ get_all_blocked (xmlNodePtr node, GSList **blocked) if (child->children) get_all_blocked (child, blocked); - if (!strcmp ((const char *)child->name, "block")) { - char *name = get_node_text (child); + if (!strcmp ((const gchar *)child->name, "block")) { + gchar *name = get_node_text (child); if (name) *blocked = g_slist_prepend (*blocked, name); @@ -308,7 +308,7 @@ get_all_blocked (xmlNodePtr node, GSList **blocked) static GList * bbdb_get_gaim_buddy_list (void) { - char *blist_path; + gchar *blist_path; xmlDocPtr buddy_xml; xmlNodePtr root, child, blist; GList *buddies = NULL; @@ -324,14 +324,14 @@ bbdb_get_gaim_buddy_list (void) } root = xmlDocGetRootElement (buddy_xml); - if (strcmp ((const char *)root->name, "purple")) { + if (strcmp ((const gchar *)root->name, "purple")) { fprintf (stderr, "bbdb: Could not parse Pidgin buddy list.\n"); xmlFreeDoc (buddy_xml); return NULL; } for (child = root->children; child != NULL; child = child->next) { - if (! strcmp ((const char *)child->name, "privacy")) { + if (! strcmp ((const gchar *)child->name, "privacy")) { get_all_blocked (child, &blocked); break; } @@ -339,7 +339,7 @@ bbdb_get_gaim_buddy_list (void) blist = NULL; for (child = root->children; child != NULL; child = child->next) { - if (! strcmp ((const char *)child->name, "blist")) { + if (! strcmp ((const gchar *)child->name, "blist")) { blist = child; break; } @@ -351,7 +351,7 @@ bbdb_get_gaim_buddy_list (void) } for (child = blist->children; child != NULL; child = child->next) { - if (! strcmp ((const char *)child->name, "group")) + if (! strcmp ((const gchar *)child->name, "group")) parse_buddy_group (child, &buddies, blocked); } @@ -383,24 +383,24 @@ free_buddy_list (GList *blist) g_list_free (blist); } -static char * +static gchar * get_node_text (xmlNodePtr node) { if (node->children == NULL || node->children->content == NULL || - strcmp ((char *)node->children->name, "text")) + strcmp ((gchar *)node->children->name, "text")) return NULL; - return g_strdup ((char *)node->children->content); + return g_strdup ((gchar *)node->children->content); } -static char * +static gchar * get_buddy_icon_from_setting (xmlNodePtr setting) { - char *icon = NULL; + gchar *icon = NULL; icon = get_node_text (setting); if (icon [0] != '/') { - char *path; + gchar *path; path = g_build_path ("/", getenv ("HOME"), ".purple/icons", icon, NULL); g_free (icon); @@ -420,7 +420,7 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked) gboolean is_blocked = FALSE; for (child = contact->children; child != NULL; child = child->next) { - if (! strcmp ((const char *)child->name, "buddy")) { + if (! strcmp ((const gchar *)child->name, "buddy")) { buddy = child; break; } @@ -433,21 +433,21 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked) gb = g_new0 (GaimBuddy, 1); - gb->proto = e_xml_get_string_prop_by_name (buddy, (const unsigned char *)"proto"); + gb->proto = e_xml_get_string_prop_by_name (buddy, (const guchar *)"proto"); for (child = buddy->children; child != NULL && !is_blocked; child = child->next) { - if (! strcmp ((const char *)child->name, "setting")) { - char *setting_type; - setting_type = e_xml_get_string_prop_by_name (child, (const unsigned char *)"name"); + if (! strcmp ((const gchar *)child->name, "setting")) { + gchar *setting_type; + setting_type = e_xml_get_string_prop_by_name (child, (const guchar *)"name"); - if (! strcmp ((const char *)setting_type, "buddy_icon")) + if (! strcmp ((const gchar *)setting_type, "buddy_icon")) gb->icon = get_buddy_icon_from_setting (child); g_free (setting_type); - } else if (! strcmp ((const char *)child->name, "name")) { + } else if (! strcmp ((const gchar *)child->name, "name")) { gb->account_name = get_node_text (child); is_blocked = g_slist_find_custom (blocked, gb->account_name, (GCompareFunc)strcmp) != NULL; - } else if (! strcmp ((const char *)child->name, "alias")) + } else if (! strcmp ((const gchar *)child->name, "alias")) gb->alias = get_node_text (child); } @@ -464,7 +464,7 @@ parse_buddy_group (xmlNodePtr group, GList **buddies, GSList *blocked) xmlNodePtr child; for (child = group->children; child != NULL; child = child->next) { - if (strcmp ((const char *)child->name, "contact")) + if (strcmp ((const gchar *)child->name, "contact")) continue; parse_contact (child, buddies, blocked); diff --git a/plugins/bbdb/test-evobuddy.c b/plugins/bbdb/test-evobuddy.c index 9d14aabebe..8d8486ac73 100644 --- a/plugins/bbdb/test-evobuddy.c +++ b/plugins/bbdb/test-evobuddy.c @@ -22,7 +22,7 @@ void bbdb_sync_buddy_list (void); -int +gint main (void) { printf ("Syncing...\n"); diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 77aa377751..105d97e245 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -73,14 +73,14 @@ GtkWidget * org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfi /* plugin fonction prototypes */ gboolean em_junk_bf_check_junk (EPlugin *ep, EMJunkHookTarget *target); -void *em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target); +gpointer 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, const gchar **argv, GError **error); /* eplugin stuff */ -int e_plugin_lib_enable (EPluginLib *ep, int enable); +gint e_plugin_lib_enable (EPluginLib *ep, gint enable); #define EM_JUNK_BF_GCONF_DIR_LENGTH (G_N_ELEMENTS (em_junk_bf_gconf_dir) - 1) @@ -132,7 +132,7 @@ pipe_to_bogofilter (CamelMimeMessage *msg, const gchar **argv, GError **error) retry: if (camel_debug_start ("junk")) { - int i; + gint i; printf ("pipe_to_bogofilter "); for (i = 0; argv[i]; i++) @@ -221,7 +221,7 @@ em_junk_bf_setting_notify (GConfClient *gconf, GConfEntry *entry, void *data) { - const char *key; + const gchar *key; GConfValue *value; value = gconf_entry_get_value (entry); @@ -247,7 +247,7 @@ gboolean em_junk_bf_check_junk (EPlugin *ep, EMJunkHookTarget *target) { CamelMimeMessage *msg = target->m; - int rv; + gint rv; const gchar *argv[] = { em_junk_bf_binary, @@ -315,14 +315,14 @@ em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target) { } -void * +gpointer em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target) { - return g_file_test (em_junk_bf_binary, G_FILE_TEST_EXISTS) ? (void *) "1" : NULL; + return g_file_test (em_junk_bf_binary, G_FILE_TEST_EXISTS) ? (gpointer) "1" : NULL; } -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { GConfClient *gconf; diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index 1dd5ae35b5..76d19a9929 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -42,8 +42,8 @@ /*****************************************************************************/ /* prototypes */ -int e_plugin_lib_enable (EPluginLib *ep, - int enable); +gint e_plugin_lib_enable (EPluginLib *ep, + gint enable); GtkWidget * oge_caldav (EPlugin *epl, EConfigHookItemFactoryData *data); @@ -65,8 +65,8 @@ ensure_caldav_source_group (ECalSourceType source_type) g_object_unref (slist); } -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { if (enable) { @@ -80,17 +80,17 @@ e_plugin_lib_enable (EPluginLib *ep, int enable) } /* replaces all '@' with '%40' in str; returns newly allocated string */ -static char * -replace_at_sign (const char *str) +static gchar * +replace_at_sign (const gchar *str) { - char *res, *at; + gchar *res, *at; if (!str) return NULL; res = g_strdup (str); while (at = strchr (res, '@'), at) { - char *tmp = g_malloc0 (sizeof (char) * (1 + strlen (res) + 2)); + gchar *tmp = g_malloc0 (sizeof (char) * (1 + strlen (res) + 2)); strncpy (tmp, res, at - res); strcat (tmp, "%40"); @@ -160,8 +160,8 @@ static void location_changed (GtkEntry *editable, ESource *source) { EUri *euri; - char *ruri; - const char *uri, *username; + gchar *ruri; + const gchar *uri, *username; uri = gtk_entry_get_text (GTK_ENTRY (editable)); @@ -194,9 +194,9 @@ static void user_changed (GtkEntry *editable, ESource *source) { EUri *euri; - char *uri; - char *ruri; - const char *user; + gchar *uri; + gchar *ruri; + const gchar *user; uri = e_source_get_uri (source); user = gtk_entry_get_text (GTK_ENTRY (editable)); @@ -227,9 +227,9 @@ user_changed (GtkEntry *editable, ESource *source) static void set_refresh_time (ESource *source, GtkWidget *spin, GtkWidget *combobox) { - int time; - int item_num = 0; - const char *refresh_str = e_source_get_property (source, "refresh"); + gint time; + gint item_num = 0; + const gchar *refresh_str = e_source_get_property (source, "refresh"); time = refresh_str ? atoi (refresh_str) : 30; if (time && !(time % 10080)) { @@ -249,10 +249,10 @@ set_refresh_time (ESource *source, GtkWidget *spin, GtkWidget *combobox) gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), time); } -static char * +static gchar * get_refresh_minutes (GtkWidget *spin, GtkWidget *combobox) { - int setting = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)); + gint setting = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)); switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combobox))) { case 0: /* minutes */ @@ -280,7 +280,7 @@ get_refresh_minutes (GtkWidget *spin, GtkWidget *combobox) static void spin_changed (GtkSpinButton *spin, ESource *source) { - char *refresh_str; + gchar *refresh_str; GtkWidget *combobox; combobox = g_object_get_data (G_OBJECT (spin), "combobox"); @@ -293,7 +293,7 @@ spin_changed (GtkSpinButton *spin, ESource *source) static void combobox_changed (GtkComboBox *combobox, ESource *source) { - char *refresh_str; + gchar *refresh_str; GtkWidget *spin; spin = g_object_get_data (G_OBJECT (combobox), "spin"); @@ -319,11 +319,11 @@ oge_caldav (EPlugin *epl, GtkWidget *luser; GtkWidget *user; GtkWidget *label, *hbox, *spin, *combobox; - char *uri; - char *username; - const char *ssl_prop; + gchar *uri; + gchar *username; + const gchar *ssl_prop; gboolean ssl_enabled; - int row; + gint row; source = t->source; group = e_source_peek_group (source); diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c index 6670d23293..9d21d62688 100644 --- a/plugins/calendar-file/calendar-file.c +++ b/plugins/calendar-file/calendar-file.c @@ -34,8 +34,8 @@ e_calendar_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data) { ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; ESource *source = t->source; - char *uri_text; - const char *relative_uri; + gchar *uri_text; + const gchar *relative_uri; uri_text = e_source_get_uri (source); if (strncmp (uri_text, "file", 4)) { diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c index 7814ef5ea0..e6d4aee6a2 100644 --- a/plugins/calendar-http/calendar-http.c +++ b/plugins/calendar-http/calendar-http.c @@ -72,7 +72,7 @@ static void url_changed (GtkEntry *entry, ESource *source) { EUri *uri; - char *relative_uri; + gchar *relative_uri; uri = e_uri_new (gtk_entry_get_text (GTK_ENTRY (entry))); @@ -96,10 +96,10 @@ e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data) { static GtkWidget *label; GtkWidget *entry, *parent; - int row; + gint row; ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; EUri *uri; - char *uri_text; + gchar *uri_text; static GtkWidget *hidden = NULL; if (!hidden) @@ -142,9 +142,9 @@ e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data) static void set_refresh_time (ESource *source, GtkWidget *spin, GtkWidget *combobox) { - int time; - int item_num = 0; - const char *refresh_str = e_source_get_property (source, "refresh"); + gint time; + gint item_num = 0; + const gchar *refresh_str = e_source_get_property (source, "refresh"); time = refresh_str ? atoi (refresh_str) : 30; if (time && !(time % 10080)) { @@ -164,10 +164,10 @@ set_refresh_time (ESource *source, GtkWidget *spin, GtkWidget *combobox) gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), time); } -static char * +static gchar * get_refresh_minutes (GtkWidget *spin, GtkWidget *combobox) { - int setting = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)); + gint setting = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)); switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combobox))) { case 0: /* minutes */ @@ -195,7 +195,7 @@ get_refresh_minutes (GtkWidget *spin, GtkWidget *combobox) static void spin_changed (GtkSpinButton *spin, ECalConfigTargetSource *t) { - char *refresh_str; + gchar *refresh_str; GtkWidget *combobox; combobox = g_object_get_data (G_OBJECT (spin), "combobox"); @@ -208,7 +208,7 @@ spin_changed (GtkSpinButton *spin, ECalConfigTargetSource *t) static void combobox_changed (GtkComboBox *combobox, ECalConfigTargetSource *t) { - char *refresh_str; + gchar *refresh_str; GtkWidget *spin; spin = g_object_get_data (G_OBJECT (combobox), "spin"); @@ -232,11 +232,11 @@ e_calendar_http_refresh (EPlugin *epl, EConfigHookItemFactoryData *data) { static GtkWidget *label; GtkWidget *combobox, *spin, *hbox, *parent; - int row; + gint row; ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; ESource *source = t->source; EUri *uri; - char* uri_text; + gchar * uri_text; static GtkWidget *hidden = NULL; if (!hidden) @@ -297,10 +297,10 @@ e_calendar_http_secure (EPlugin *epl, EConfigHookItemFactoryData *data) { ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; GtkWidget *secure_setting, *parent; - const char *secure_prop; - int row; + const gchar *secure_prop; + gint row; EUri *uri; - char* uri_text; + gchar * uri_text; static GtkWidget *hidden = NULL; if (!hidden) @@ -358,11 +358,11 @@ e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data) { static GtkWidget *label; GtkWidget *entry, *parent; - int row; + gint row; ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; EUri *uri; - char *uri_text; - const char *username; + gchar *uri_text; + const gchar *username; static GtkWidget *hidden = NULL; if (!hidden) @@ -412,7 +412,7 @@ e_calendar_http_check (EPlugin *epl, EConfigHookPageCheckData *data) EUri *uri; gboolean ok = FALSE; ESourceGroup *group = e_source_peek_group (t->source); - char *uri_text; + gchar *uri_text; if (strncmp (e_source_group_peek_base_uri (group), "webcal", 6)) return TRUE; diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c index 9354cbb0b1..694effccaa 100644 --- a/plugins/calendar-weather/calendar-weather.c +++ b/plugins/calendar-weather/calendar-weather.c @@ -43,20 +43,20 @@ GtkWidget *e_calendar_weather_refresh (EPlugin *epl, EConfigHookItemFactoryData GtkWidget *e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data); gboolean e_calendar_weather_check (EPlugin *epl, EConfigHookPageCheckData *data); void e_calendar_weather_migrate (EPlugin *epl, ECalEventTargetComponent *data); -int e_plugin_lib_enable (EPluginLib *epl, int enable); +gint e_plugin_lib_enable (EPluginLib *epl, gint enable); #define WEATHER_BASE_URI "weather://" -int -e_plugin_lib_enable (EPluginLib *epl, int enable) +gint +e_plugin_lib_enable (EPluginLib *epl, gint enable) { GList *l; gboolean found = FALSE; - const char *tmp; + const gchar *tmp; static struct { - const char *description; - const char *icon_name; + const gchar *description; + const gchar *icon_name; } categories[] = { { N_("Weather: Fog"), "weather-fog" }, { N_("Weather: Cloudy"), "weather-few-clouds" }, @@ -74,17 +74,17 @@ e_plugin_lib_enable (EPluginLib *epl, int enable) /* Add the categories icons if we don't have them. */ for (l = e_categories_get_list (); l; l = g_list_next (l)) { - if (!strcmp ((const char *)l->data, tmp)) { + if (!strcmp ((const gchar *)l->data, tmp)) { found = TRUE; break; } } if (!found) { - int i; + gint i; for (i = 0; categories[i].description; i++) { - char *filename; + gchar *filename; filename = e_icon_factory_get_icon_filename (categories[i].icon_name, GTK_ICON_SIZE_MENU); e_categories_add (_(categories[i].description), NULL, filename, FALSE); @@ -330,7 +330,7 @@ location_clicked (GtkButton *button, ESource *source) label = GTK_WIDGET (gtk_bin_get_child (GTK_BIN (button))); text = gtk_label_get_text (GTK_LABEL (label)); - if (strcmp ((const char *)text, _("None")) == 0) + if (strcmp ((const gchar *)text, _("None")) == 0) e_source_set_relative_uri (source, ""); } @@ -342,11 +342,11 @@ e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data) { static GtkWidget *label; GtkWidget *button, *parent, *text; - int row; + gint row; ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; ESource *source = t->source; EUri *uri; - char *uri_text; + gchar *uri_text; static GtkWidget *hidden; if (store == NULL) @@ -360,7 +360,7 @@ e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data) uri_text = e_source_get_uri (t->source); uri = e_uri_new (uri_text); - if (strcmp ((const char *)uri->protocol, "weather")) { + if (strcmp ((const gchar *)uri->protocol, "weather")) { e_uri_free (uri); return hidden; } @@ -399,9 +399,9 @@ e_calendar_weather_location (EPlugin *epl, EConfigHookItemFactoryData *data) static void set_refresh_time (ESource *source, GtkWidget *spin, GtkWidget *combobox) { - int time; - int item_num = 0; - const char *refresh_str = e_source_get_property (source, "refresh"); + gint time; + gint item_num = 0; + const gchar *refresh_str = e_source_get_property (source, "refresh"); time = refresh_str ? atoi (refresh_str) : 30; if (time && !(time % 10080)) { @@ -421,10 +421,10 @@ set_refresh_time (ESource *source, GtkWidget *spin, GtkWidget *combobox) gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), time); } -static char * +static gchar * get_refresh_minutes (GtkWidget *spin, GtkWidget *combobox) { - int setting = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)); + gint setting = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)); switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combobox))) { case 0: /* minutes */ @@ -451,7 +451,7 @@ get_refresh_minutes (GtkWidget *spin, GtkWidget *combobox) static void spin_changed (GtkSpinButton *spin, ECalConfigTargetSource *t) { - char *refresh_str; + gchar *refresh_str; GtkWidget *combobox; combobox = g_object_get_data (G_OBJECT (spin), "combobox"); @@ -464,7 +464,7 @@ spin_changed (GtkSpinButton *spin, ECalConfigTargetSource *t) static void combobox_changed (GtkComboBox *combobox, ECalConfigTargetSource *t) { - char *refresh_str; + gchar *refresh_str; GtkWidget *spin; spin = g_object_get_data (G_OBJECT (combobox), "spin"); @@ -479,11 +479,11 @@ e_calendar_weather_refresh (EPlugin *epl, EConfigHookItemFactoryData *data) { static GtkWidget *label; GtkWidget *spin, *combobox, *hbox, *parent; - int row; + gint row; ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; ESource *source = t->source; EUri *uri; - char *uri_text; + gchar *uri_text; static GtkWidget *hidden = NULL; if (!hidden) @@ -495,7 +495,7 @@ e_calendar_weather_refresh (EPlugin *epl, EConfigHookItemFactoryData *data) uri_text = e_source_get_uri (t->source); uri = e_uri_new (uri_text); g_free (uri_text); - if (strcmp ((const char *)uri->protocol, "weather")) { + if (strcmp ((const gchar *)uri->protocol, "weather")) { e_uri_free (uri); return hidden; } @@ -540,13 +540,13 @@ e_calendar_weather_refresh (EPlugin *epl, EConfigHookItemFactoryData *data) static void set_units (ESource *source, GtkWidget *combobox) { - const char *format = e_source_get_property (source, "units"); + const gchar *format = e_source_get_property (source, "units"); if (format == NULL) { format = e_source_get_property (source, "temperature"); if (format == NULL) { e_source_set_property (source, "units", "metric"); gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0); - } else if (strcmp ((const char *)format, "fahrenheit") == 0) { + } else if (strcmp ((const gchar *)format, "fahrenheit") == 0) { /* old format, convert */ e_source_set_property (source, "units", "imperial"); gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 1); @@ -555,7 +555,7 @@ set_units (ESource *source, GtkWidget *combobox) gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0); } } else { - if (strcmp ((const char *)format, "metric") == 0) + if (strcmp ((const gchar *)format, "metric") == 0) gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0); else gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 1); @@ -565,7 +565,7 @@ set_units (ESource *source, GtkWidget *combobox) static void units_changed (GtkComboBox *combobox, ECalConfigTargetSource *t) { - int choice = gtk_combo_box_get_active (GTK_COMBO_BOX (combobox)); + gint choice = gtk_combo_box_get_active (GTK_COMBO_BOX (combobox)); if (choice == 0) e_source_set_property (t->source, "units", "metric"); else @@ -577,11 +577,11 @@ e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data) { static GtkWidget *label; GtkWidget *combobox, *parent; - int row; + gint row; ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; ESource *source = t->source; EUri *uri; - char *uri_text; + gchar *uri_text; static GtkWidget *hidden = NULL; if (!hidden) @@ -593,7 +593,7 @@ e_calendar_weather_units (EPlugin *epl, EConfigHookItemFactoryData *data) uri_text = e_source_get_uri (t->source); uri = e_uri_new (uri_text); g_free (uri_text); - if (strcmp ((const char *)uri->protocol, "weather")) { + if (strcmp ((const gchar *)uri->protocol, "weather")) { e_uri_free (uri); return hidden; } diff --git a/plugins/copy-tool/copy-tool.c b/plugins/copy-tool/copy-tool.c index 1f33ba71db..769bd00431 100644 --- a/plugins/copy-tool/copy-tool.c +++ b/plugins/copy-tool/copy-tool.c @@ -39,17 +39,17 @@ #include "camel/camel-internet-address.h" #include "camel/camel-url.h" -void org_gnome_copy_tool_copy_address(void *ep, EMPopupTargetURI *t); +void org_gnome_copy_tool_copy_address(gpointer ep, EMPopupTargetURI *t); void -org_gnome_copy_tool_copy_address(void *ep, EMPopupTargetURI *t) +org_gnome_copy_tool_copy_address(gpointer ep, EMPopupTargetURI *t) { if (t->uri) { CamelInternetAddress *cia = camel_internet_address_new(); CamelURL *curl; GtkClipboard *clipboard; - char *addr; - const char *tmp; + gchar *addr; + const gchar *tmp; curl = camel_url_new(t->uri, NULL); camel_address_decode((CamelAddress *)cia, curl->path); diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c index a3611cc730..3f2c4635d5 100644 --- a/plugins/default-source/default-source.c +++ b/plugins/default-source/default-source.c @@ -94,10 +94,10 @@ org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data) return widget; } -static const char * +static const gchar * get_calendar_option_caption (ECalSourceType source_type) { - const char *res = "???"; + const gchar *res = "???"; switch (source_type) { case E_CAL_SOURCE_TYPE_EVENT: res = _("Mark as _default calendar"); break; @@ -117,7 +117,7 @@ org_gnome_default_cal (EPlugin *epl, EConfigHookItemFactoryData *data) GtkWidget *widget; ESource *source; ECalConfigTargetSource *cal_target; - int i; + gint i; if (data->old) return data->old; diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 7b065e0de5..10d812368d 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -70,7 +70,7 @@ struct _EmailCustomHeaderOptionsDialogPrivate { GArray *email_custom_header_details; GArray *header_index_type; gint flag; - char *help_section; + gchar *help_section; }; /* epech - e-plugin email custom header*/ @@ -81,13 +81,13 @@ static void epech_dialog_dispose (GObject *object); static void epech_setup_widgets (CustomHeaderOptionsDialog *mch); static gint epech_check_existing_composer_window(gconstpointer a, gconstpointer b); static void commit_changes (ConfigData *cd); -int e_plugin_lib_enable (EPluginLib *ep, int enable); +gint e_plugin_lib_enable (EPluginLib *ep, gint enable); GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl); gboolean e_plugin_ui_init(GtkUIManager *ui_manager, EMsgComposer *composer); GtkWidget *org_gnome_email_custom_header_config_option (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { return 0; } @@ -274,14 +274,14 @@ epech_get_header_list (CustomHeaderOptionsDialog *mch) } static void -epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsDialog *mch) +epech_load_from_gconf (GConfClient *client,const gchar *path,CustomHeaderOptionsDialog *mch) { EmailCustomHeaderOptionsDialogPrivate *priv; EmailCustomHeaderDetails temp_header_details= {-1, -1, NULL, NULL}; CustomSubHeader temp_header_value_details = {NULL}; GSList *header_list,*q; gchar *buffer; - char *str_colon; + gchar *str_colon; gint index,pos; priv = mch->priv; @@ -641,8 +641,8 @@ static void header_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, ConfigData *cd) { GtkTreeSelection *selection; - char *keyword = NULL; - char *value = NULL; + gchar *keyword = NULL; + gchar *value = NULL; gboolean valid; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cd->treeview)); @@ -677,8 +677,8 @@ header_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIte valid = gtk_tree_model_get_iter_first (model, iter); while (valid && gtk_list_store_iter_is_valid (cd->store, iter)) { - char *keyword = NULL; - char *value = NULL; + gchar *keyword = NULL; + gchar *value = NULL; gtk_tree_model_get (model, iter, HEADER_KEY_COLUMN, &keyword, -1); /* Check if the keyword is not empty and then emit the row-changed signal (if we delete the row, then the iter gets corrupted) */ @@ -879,15 +879,15 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) GtkTreeModel *model; gint index; gchar *buffer; - char *str_colon = NULL, *str1_colon = NULL; + gchar *str_colon = NULL, *str1_colon = NULL; GtkTreeViewColumn *col; - int col_pos; + gint col_pos; GConfClient *client = gconf_client_get_default(); ConfigData *cd = g_new0 (ConfigData, 1); - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "email-custom-header.glade", diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h index 30e0f7061a..9bba66d655 100644 --- a/plugins/email-custom-header/email-custom-header.h +++ b/plugins/email-custom-header/email-custom-header.h @@ -82,6 +82,6 @@ GType epech_dialog_get_type (void); CustomHeaderOptionsDialog *epech_dialog_new (void); static gboolean epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent); static void epech_get_header_list (CustomHeaderOptionsDialog *mch); -static void epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsDialog *mch); +static void epech_load_from_gconf (GConfClient *client,const gchar *path,CustomHeaderOptionsDialog *mch); #endif diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 2c08341ef3..53af222142 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -83,7 +83,7 @@ CamelServiceAuthType camel_exchange_password_authtype = { typedef struct { gboolean state; - char *message; + gchar *message; GtkWidget *text_view; }OOFData; @@ -119,7 +119,7 @@ static void btn_chpass_clicked (GtkButton *button, gpointer data) { ExchangeAccount *account; - char *old_password, *new_password; + gchar *old_password, *new_password; ExchangeAccountResult result; account = exchange_operations_get_exchange_account (); @@ -178,8 +178,8 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) EMConfigTargetAccount *target_account; ExchangeAccount *account = NULL; CamelURL *url; - const char *source_url; - char *message = NULL, *txt = NULL, *oof_message; + const gchar *source_url; + gchar *message = NULL, *txt = NULL, *oof_message; gboolean oof_state = FALSE; gint offline_status; @@ -386,7 +386,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) } static void -print_error (const char *owa_url, E2kAutoconfigResult result) +print_error (const gchar *owa_url, E2kAutoconfigResult result) { switch (result) { @@ -430,7 +430,7 @@ print_error (const char *owa_url, E2kAutoconfigResult result) } } -static const char * +static const gchar * gal_auth_to_string (E2kAutoconfigGalAuthPref ad_auth) { switch (ad_auth) { @@ -449,9 +449,9 @@ owa_authenticate_user(GtkWidget *button, EConfig *config) E2kAutoconfigResult result; CamelURL *url=NULL; gboolean remember_password; - char *url_string, *key; - const char *source_url, *id_name, *owa_url; - char *at, *user; + gchar *url_string, *key; + const gchar *source_url, *id_name, *owa_url; + gchar *at, *user; gboolean valid = FALSE; ExchangeParams *exchange_params; GtkWidget *mailbox_entry = g_object_get_data (G_OBJECT (button), "mailbox-entry"); @@ -520,7 +520,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config) camel_url_set_param (url, "ad_auth", valid ? gal_auth_to_string (exchange_params->ad_auth) : NULL); if (mailbox_entry) { - const char *par = camel_url_get_param (url, "mailbox"); + const gchar *par = camel_url_get_param (url, "mailbox"); gtk_entry_set_text (GTK_ENTRY (mailbox_entry), par ? par : ""); } @@ -544,16 +544,16 @@ owa_authenticate_user(GtkWidget *button, EConfig *config) static void owa_editor_entry_changed(GtkWidget *entry, EConfig *config) { - const char *uri, *ssl = NULL; + const gchar *uri, *ssl = NULL; CamelURL *url, *owaurl = NULL; - char *url_string; + gchar *url_string; EMConfigTargetAccount *target = (EMConfigTargetAccount *)config->target; GtkWidget *button = g_object_get_data((GObject *)entry, "authenticate-button"); - int active = FALSE; + gint active = FALSE; /* NB: we set the button active only if we have a parsable uri entered */ - const char * target_url = e_account_get_string(target->account, E_ACCOUNT_SOURCE_URL); + const gchar * target_url = e_account_get_string(target->account, E_ACCOUNT_SOURCE_URL); if (target_url && target_url[0] != '\0') url = camel_url_new(target_url, NULL); else url = NULL; @@ -583,11 +583,11 @@ owa_editor_entry_changed(GtkWidget *entry, EConfig *config) } static void -update_mailbox_param_in_url (EAccount *account, e_account_item_t item, const char *mailbox) +update_mailbox_param_in_url (EAccount *account, e_account_item_t item, const gchar *mailbox) { CamelURL *url; - char *url_string; - const char *target_url; + gchar *url_string; + const gchar *target_url; if (!account) return; @@ -613,7 +613,7 @@ static void mailbox_editor_entry_changed (GtkWidget *entry, EConfig *config) { EMConfigTargetAccount *target; - const char *mailbox; + const gchar *mailbox; target = (EMConfigTargetAccount *)config->target; mailbox = gtk_entry_get_text (GTK_ENTRY (entry)); @@ -634,7 +634,7 @@ want_mailbox_toggled (GtkWidget *toggle, EConfig *config) if (entry) { gboolean is_active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)); EMConfigTargetAccount *target; - const char *mailbox; + const gchar *mailbox; gtk_widget_set_sensitive (entry, is_active); @@ -646,12 +646,12 @@ want_mailbox_toggled (GtkWidget *toggle, EConfig *config) } } -static char * +static gchar * construct_owa_url (CamelURL *url) { - const char *owa_path, *use_ssl = NULL; - const char *protocol = "http", *mailbox_name; - char *owa_url; + const gchar *owa_path, *use_ssl = NULL; + const gchar *protocol = "http", *mailbox_name; + gchar *owa_url; use_ssl = camel_url_get_param (url, "use_ssl"); if (use_ssl) { @@ -677,11 +677,11 @@ GtkWidget * org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data) { EMConfigTargetAccount *target_account; - const char *source_url; - char *owa_url = NULL, *mailbox_name, *username; + const gchar *source_url; + gchar *owa_url = NULL, *mailbox_name, *username; GtkWidget *owa_entry, *mailbox_entry, *want_mailbox_check; CamelURL *url; - int row; + gint row; GtkWidget *hbox, *label, *button; target_account = (EMConfigTargetAccount *)data->config->target; @@ -716,7 +716,7 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data) /* if the host is null, then user+other info is dropped silently, force it to be kept */ if (url->host == NULL) { - char *uri; + gchar *uri; camel_url_set_host(url, ""); uri = camel_url_to_string(url, 0); @@ -734,7 +734,7 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data) if (!owa_url) { if (url->host[0] != 0) { - char *uri; + gchar *uri; /* url has hostname but not owa_url. * Account has been created using x-c-s or evo is upgraded to 2.2 @@ -818,7 +818,7 @@ gboolean org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data) { EMConfigTargetAccount *target = (EMConfigTargetAccount *)data->config->target; - int status = TRUE; + gint status = TRUE; /* We assume that if the host is set, then the setting is valid. The host gets set when the provider validate() call is made */ @@ -831,7 +831,7 @@ org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data) strcmp (data->pageid, "20.receive_options") == 0) { CamelURL *url; - const char * target_url = e_account_get_string(target->account, E_ACCOUNT_SOURCE_URL); + const gchar * target_url = e_account_get_string(target->account, E_ACCOUNT_SOURCE_URL); if (target_url && target_url[0] != '\0') url = camel_url_new(target_url, NULL); else @@ -875,7 +875,7 @@ void org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data) { EMConfigTargetAccount *target_account; - const char *source_url; + const gchar *source_url; CamelURL *url; gint offline_status; @@ -922,13 +922,13 @@ static void exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config) { EMConfigTargetAccount *target = (EMConfigTargetAccount *)config->target; - int id = gtk_combo_box_get_active(dropdown); + gint id = gtk_combo_box_get_active(dropdown); GtkTreeModel *model; GtkTreeIter iter; CamelServiceAuthType *authtype; CamelURL *url_source, *url_transport; - const char *source_url, *transport_url; - char *source_url_string, *transport_url_string; + const gchar *source_url, *transport_url; + gchar *source_url_string, *transport_url_string; source_url = e_account_get_string (target->account, E_ACCOUNT_SOURCE_URL); @@ -969,14 +969,14 @@ GtkWidget * org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data) { EMConfigTargetAccount *target_account; - const char *source_url; - char *label_text, *exchange_account_authtype = NULL; + const gchar *source_url; + gchar *label_text, *exchange_account_authtype = NULL; CamelURL *url; GtkWidget *hbox, *button, *auth_label, *vbox, *label_hide; GtkComboBox *dropdown; GtkTreeIter iter; GtkListStore *store; - int i, active=0, auth_changed_id = 0; + gint i, active=0, auth_changed_id = 0; GList *authtypes, *l, *ll; ExchangeAccount *account; @@ -1025,7 +1025,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data) for (i=0, l=authtypes; l; l=l->next, i++) { CamelServiceAuthType *authtype = l->data; - int avail = TRUE; + gint avail = TRUE; if (authtypes) { for (ll = authtypes; ll; ll = g_list_next(ll)) @@ -1104,8 +1104,8 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor GtkListStore *model; GtkVBox *vbx; GtkHBox *hbx_size; - char *folder_name, *folder_size; - int mode; + gchar *folder_name, *folder_size; + gint mode; service = CAMEL_SERVICE (camel_folder_get_parent_store (cml_folder)); if (!service) @@ -1126,7 +1126,7 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor if (mode == OFFLINE_MODE) return NULL; - folder_name = (char*) camel_folder_get_name (cml_folder); + folder_name = (gchar *) camel_folder_get_name (cml_folder); if (!folder_name) folder_name = g_strdup ("name"); diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c index 58af042c0c..e43d3b0531 100644 --- a/plugins/exchange-operations/exchange-calendar.c +++ b/plugins/exchange-operations/exchange-calendar.c @@ -62,7 +62,7 @@ e_exchange_calendar_get_calendars (ECalSourceType ftype) GPtrArray *folder_array; GPtrArray *calendar_list; EFolder *folder; - int i, prefix_len; + gint i, prefix_len; gchar *type; gchar *uri_prefix; gchar *tmp, *ruri; @@ -155,11 +155,11 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data) gchar *account_name; gchar *uri_text; gchar *cal_name; - char *folder_size; - const char *rel_uri; - int row, i; + gchar *folder_size; + const gchar *rel_uri; + gint row, i; gint offline_status; - char *offline_msg; + gchar *offline_msg; GtkWidget *lbl_offline_msg; gboolean is_personal; @@ -225,7 +225,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data) g_free (uri_text); if (calendar_src_exists && is_personal) { - cal_name = (gchar*) e_source_peek_name (source); + cal_name = (gchar *) e_source_peek_name (source); model = exchange_account_folder_size_get_model (account); if (model) folder_size = g_strdup_printf ("%s KB", exchange_folder_size_get_val (model, cal_name)); @@ -281,13 +281,13 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data) if (calendar_src_exists) { gchar *uri_prefix, *sruri, *tmpruri; - int prefix_len; + gint prefix_len; GtkTreeSelection *selection; uri_prefix = g_strconcat (account->account_filename, "/;", NULL); prefix_len = strlen (uri_prefix); - tmpruri = (gchar*) rel_uri; + tmpruri = (gchar *) rel_uri; if (g_str_has_prefix (tmpruri, uri_prefix)) { sruri = g_strdup (tmpruri+prefix_len); @@ -313,12 +313,12 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data) /* FIXME - check pageid */ ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; ESourceGroup *group; - const char *base_uri; - const char *rel_uri; + const gchar *base_uri; + const gchar *rel_uri; gint offline_status; ExchangeAccount *account; EUri *euri; - int uri_len; + gint uri_len; gchar *uri_text, *uri_string, *path, *folder_name; gboolean is_personal; @@ -381,7 +381,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target) ESource *source = t->source; gchar *uri_text, *gruri, *gname, *ruri, *ftype, *path, *path_prefix, *oldpath=NULL; gchar *username, *windows_domain, *authtype; - int prefix_len; + gint prefix_len; ExchangeAccount *account; ExchangeAccountFolderResult result; ExchangeConfigListenerStatus status; @@ -429,13 +429,13 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target) ftype = g_strdup ("mail"); } - gname = (gchar*) e_source_peek_name (source); - gruri = (gchar*) e_source_peek_relative_uri (source); + gname = (gchar *) e_source_peek_name (source); + gruri = (gchar *) e_source_peek_relative_uri (source); if (calendar_src_exists) { gchar *tmpruri, *uri_string, *temp_path, *prefix; EUri *euri; - int uri_len; + gint uri_len; /* sample uri_string: exchange://user;auth=NTLM@host/ */ /* sample uri_text: exchange://user;auth=NTLM@host/;personal/Calendar */ diff --git a/plugins/exchange-operations/exchange-change-password.c b/plugins/exchange-operations/exchange-change-password.c index 539bd24d3a..82382f6f9f 100644 --- a/plugins/exchange-operations/exchange-change-password.c +++ b/plugins/exchange-operations/exchange-change-password.c @@ -42,7 +42,7 @@ entry_changed (GtkEntry *entry, gpointer user_data) GladeXML *xml = user_data; GtkEntry *new_entry, *confirm_entry; GtkWidget *ok_button; - const char *text; + const gchar *text; new_entry = GTK_ENTRY (glade_xml_get_widget (xml, "new_pass_entry")); confirm_entry = GTK_ENTRY (glade_xml_get_widget (xml, "confirm_pass_entry")); @@ -71,15 +71,15 @@ entry_changed (GtkEntry *entry, gpointer user_data) * * Prompt the user for a new password. */ -char * -exchange_get_new_password (const char *existing_password, gboolean voluntary) +gchar * +exchange_get_new_password (const gchar *existing_password, gboolean voluntary) { GladeXML *xml; GtkWidget *top_widget; GtkEntry *cur_entry, *new_entry, *confirm_entry; GtkResponseType response; GtkLabel *top_label; - char *new_pass; + gchar *new_pass; xml = glade_xml_new (FILENAME, ROOTNODE, NULL); top_widget = glade_xml_get_widget (xml, ROOTNODE); @@ -100,7 +100,7 @@ exchange_get_new_password (const char *existing_password, gboolean voluntary) run_dialog_again: response = gtk_dialog_run (GTK_DIALOG (top_widget)); if (response == GTK_RESPONSE_OK) { - const char *cur_pass, *new_pass1, *new_pass2; + const gchar *cur_pass, *new_pass1, *new_pass2; cur_pass = gtk_entry_get_text (cur_entry); new_pass1 = gtk_entry_get_text (new_entry); diff --git a/plugins/exchange-operations/exchange-change-password.h b/plugins/exchange-operations/exchange-change-password.h index e320d89cf9..389922f1b3 100644 --- a/plugins/exchange-operations/exchange-change-password.h +++ b/plugins/exchange-operations/exchange-change-password.h @@ -28,7 +28,7 @@ extern "C" { #pragma } #endif /* __cplusplus */ -char *exchange_get_new_password (const char *existing_password, +gchar *exchange_get_new_password (const gchar *existing_password, gboolean voluntary); #ifdef __cplusplus diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index 5ff53fb171..35d06d527d 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -53,16 +53,16 @@ struct _ExchangeConfigListenerPrivate { GConfClient *gconf; guint idle_id; - char *configured_uri, *configured_name; + gchar *configured_uri, *configured_name; EAccount *configured_account; ExchangeAccount *exchange_account; }; typedef struct { - const char *name; - const char *uri; - int type; + const gchar *name; + const gchar *uri; + gint type; }FolderInfo; enum { @@ -96,7 +96,7 @@ static void exchange_add_autocompletion_folders (GConfClient *gc_client, static gboolean exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2); static void remove_selected_non_offline_esources (ExchangeAccount *account, - const char *gconf_key); + const gchar *gconf_key); static void class_init (GObjectClass *object_class) { @@ -182,9 +182,9 @@ E2K_MAKE_TYPE (exchange_config_listener, ExchangeConfigListener, class_init, ini #define EVOLUTION_URI_PREFIX_LEN (sizeof (EVOLUTION_URI_PREFIX) - 1) static EFolder * -standard_folder (ExchangeAccount *account, const char *folder_type) +standard_folder (ExchangeAccount *account, const gchar *folder_type) { - const char *uri; + const gchar *uri; uri = exchange_account_get_standard_uri (account, folder_type); if (!uri) @@ -193,14 +193,14 @@ standard_folder (ExchangeAccount *account, const char *folder_type) } static void -set_special_mail_folder (ExchangeAccount *account, const char *folder_type, - char **folder_uri) +set_special_mail_folder (ExchangeAccount *account, const gchar *folder_type, + gchar **folder_uri) { EFolder *folder; - const char *physical_uri; - char *url_string, *path; + const gchar *physical_uri; + gchar *url_string, *path; CamelURL *camel_url; - int uri_len; + gint uri_len; folder = standard_folder (account, folder_type); if (!folder) @@ -271,12 +271,12 @@ add_account_esources (ExchangeAccount *account, ESourceGroup *cal_source_group = NULL; ESourceGroup *tasks_source_group = NULL; ESourceGroup *contacts_source_group = NULL; - char *relative_uri = NULL, *username = NULL; + gchar *relative_uri = NULL, *username = NULL; #if 0 GSList *ids; #endif GConfClient *client; - int mode; + gint mode; ESourceList *cal_source_list, *tasks_source_list, *contacts_source_list; FolderInfo *folder=NULL; gboolean offline_mode = FALSE; @@ -409,11 +409,11 @@ add_new_sources (ExchangeAccount *account) exchange_folders = exchange_account_get_folders (account); if (exchange_folders && exchange_folders->len > 0) { - int i; - const char *folder_type; - const char *folder_name; - const char *folder_uri; - int type; + gint i; + const gchar *folder_type; + const gchar *folder_name; + const gchar *folder_uri; + gint type; EFolder *folder; ExchangeHierarchy *hier; gboolean create_esource = FALSE; @@ -462,8 +462,8 @@ add_sources (ExchangeAccount *account) exchange_folders = exchange_account_get_folders (account); if (exchange_folders && exchange_folders->len > 0) { - int i; - const char *folder_type; + gint i; + const gchar *folder_type; EFolder *folder; GSList *folders = NULL; @@ -516,7 +516,7 @@ remove_account_esource (ExchangeAccount *account, GSList *sources; GSList *ids, *node_to_be_deleted; gboolean found_group; - const char *source_uid; + const gchar *source_uid; GConfClient *client; ESourceList *source_list = NULL; @@ -614,10 +614,10 @@ remove_account_esources (ExchangeAccount *account) } #ifdef HAVE_KRB5 -static char * +static gchar * get_new_exchange_password (ExchangeAccount *account) { - char *old_password, *new_password; + gchar *old_password, *new_password; old_password = exchange_account_get_password (account); new_password = exchange_get_new_password (old_password, 0); @@ -638,7 +638,7 @@ get_new_exchange_password (ExchangeAccount *account) static void change_passwd_cb (GtkWidget *button, ExchangeAccount *account) { - char *current_passwd, *new_passwd; + gchar *current_passwd, *new_passwd; gtk_widget_hide (gtk_widget_get_toplevel(button)); current_passwd = exchange_account_get_password (account); @@ -650,13 +650,13 @@ change_passwd_cb (GtkWidget *button, ExchangeAccount *account) #endif static void -display_passwd_expiry_message (int max_passwd_age, ExchangeAccount *account) +display_passwd_expiry_message (gint max_passwd_age, ExchangeAccount *account) { GladeXML *xml; GtkWidget *top_widget, *change_passwd_button; GtkResponseType response; GtkLabel *warning_msg_label; - char *passwd_expiry_msg = + gchar *passwd_expiry_msg = g_strdup_printf (_("Your password will expire in the next %d days"), max_passwd_age); xml = glade_xml_new (FILENAME, ROOTNODE, NULL); @@ -688,13 +688,13 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, { ExchangeConfigListenerPrivate *priv; ExchangeAccountResult result; - char *key, *password, *title, *url_string; + gchar *key, *password, *title, *url_string; #ifdef HAVE_KRB5 - char *new_password; + gchar *new_password; #endif gboolean oldremember, remember = FALSE; CamelURL *camel_url; - const char *remember_password; + const gchar *remember_password; g_return_val_if_fail (EXCHANGE_IS_CONFIG_LISTENER (ex_conf_listener), EXCHANGE_ACCOUNT_CONFIG_ERROR); priv = ex_conf_listener->priv; @@ -752,7 +752,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, result == EXCHANGE_ACCOUNT_QUOTA_SEND_ERROR || result == EXCHANGE_ACCOUNT_QUOTA_WARN) { gchar *current_quota_usage = NULL; - const char *error_code = NULL; + const gchar *error_code = NULL; GtkWidget *widget; switch (result) { @@ -789,7 +789,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, result = EXCHANGE_ACCOUNT_CONNECT_SUCCESS; } if (result == EXCHANGE_ACCOUNT_CONNECT_SUCCESS) { - int max_pwd_age_days; + gint max_pwd_age_days; GladeXML *xml; GtkWidget *dialog; GtkResponseType response; @@ -905,13 +905,13 @@ configured_account_destroyed (gpointer user_data, GObject *where_account_was) } static gboolean -requires_relogin (char *current_url, char *new_url) +requires_relogin (gchar *current_url, gchar *new_url) { E2kUri *current_uri, *new_uri; - const char *current_param_val, *new_param_val; - const char *params [] = { "owa_url", "ad_server", "use_ssl" }; - const int n_params = G_N_ELEMENTS (params); - int i; + const gchar *current_param_val, *new_param_val; + const gchar *params [] = { "owa_url", "ad_server", "use_ssl" }; + const gint n_params = G_N_ELEMENTS (params); + gint i; gboolean relogin = FALSE; current_uri = e2k_uri_new (current_url); @@ -1176,8 +1176,8 @@ exchange_config_listener_get_accounts (ExchangeConfigListener *config_listener) **/ void exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl, - const char *old_name, - const char *new_name) + const gchar *old_name, + const gchar *new_name) { GConfClient *client; ESourceGroup *group; @@ -1299,22 +1299,22 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2) { CamelURL *curl1, *curl2; gchar *param1, *param2; - const char *params[] = { + const gchar *params[] = { "auth", "owa_url", "owa_path", "mailbox", "ad_server", }; - const int n_params = 5; - int i; + const gint n_params = 5; + gint i; curl1 = camel_url_new (url1, NULL); curl2 = camel_url_new (url2, NULL); for (i = 0; i < n_params; ++i) { - param1 = (gchar*) camel_url_get_param (curl1, params[i]); - param2 = (gchar*) camel_url_get_param (curl2, params[i]); + param1 = (gchar *) camel_url_get_param (curl1, params[i]); + param2 = (gchar *) camel_url_get_param (curl2, params[i]); if ((param1 && !param2) || (!param1 && param2) || /* Missing */ (param1 && param2 && strcmp (param1, param2))) { /* Differing */ g_free (param1); @@ -1342,7 +1342,7 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2) * selection list **/ static void -remove_selected_non_offline_esources (ExchangeAccount *account, const char *gconf_key) +remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gconf_key) { ESourceGroup *group; ESource *source = NULL; @@ -1350,11 +1350,11 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const char *gcon GSList *sources; GSList *ids, *node_to_be_deleted; gboolean found_group; - const char *source_uid; + const gchar *source_uid; GConfClient *client; ESourceList *source_list = NULL; - const char *offline_mode=NULL; - char *selected_gconf_key; + const gchar *offline_mode=NULL; + gchar *selected_gconf_key; if (gconf_key && !strcmp (gconf_key, CONF_KEY_CAL)) { diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h index b5ceca2a27..3ec2d5c62f 100644 --- a/plugins/exchange-operations/exchange-config-listener.h +++ b/plugins/exchange-operations/exchange-config-listener.h @@ -71,13 +71,13 @@ ExchangeConfigListener *exchange_config_listener_new (void); GSList *exchange_config_listener_get_accounts (ExchangeConfigListener *config_listener); -void add_folder_esource (ExchangeAccount *account, FolderType folder_type, const char *folder_name, const char *physical_uri); -void remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const char *physical_uri); +void add_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *folder_name, const gchar *physical_uri); +void remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *physical_uri); ExchangeConfigListenerStatus exchange_config_listener_get_offline_status (ExchangeConfigListener *excl, gint *mode); void exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl, - const char *old_name, - const char *new_name); + const gchar *old_name, + const gchar *new_name); ExchangeAccountResult exchange_config_listener_authenticate (ExchangeConfigListener *excl, ExchangeAccount *account); diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c index 1955f58eba..aec27f3f69 100644 --- a/plugins/exchange-operations/exchange-contacts.c +++ b/plugins/exchange-operations/exchange-contacts.c @@ -67,7 +67,7 @@ e_exchange_contacts_get_contacts (void) GPtrArray *contacts_list; EFolder *folder; - int i, prefix_len; + gint i, prefix_len; gchar *uri_prefix, *ruri; account = exchange_operations_get_exchange_account (); @@ -84,9 +84,9 @@ e_exchange_contacts_get_contacts (void) for (i=0; ilen; ++i) { gchar *type, *tmp; folder = g_ptr_array_index (folder_array, i); - type = (gchar*) e_folder_get_type_string (folder); + type = (gchar *) e_folder_get_type_string (folder); if (!strcmp (type, "contacts")) { - tmp = (gchar*) e_folder_get_physical_uri (folder); + tmp = (gchar *) e_folder_get_physical_uri (folder); if (g_str_has_prefix (tmp, uri_prefix)) { ruri = g_strdup (tmp+prefix_len); g_ptr_array_add (contacts_list, ruri); @@ -136,14 +136,14 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data) GPtrArray *conlist; gchar *ruri, *account_name, *uri_text; ExchangeAccount *account; - int i; - char *folder_size, *abook_name; - const char *rel_uri; - const char *uid; + gint i; + gchar *folder_size, *abook_name; + const gchar *rel_uri; + const gchar *uid; EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; ESource *source = t->source; GtkWidget *lbl_offline_msg, *vb_offline_msg; - char *offline_msg; + gchar *offline_msg; gint offline_status; gboolean gal_folder = FALSE, is_personal; @@ -212,7 +212,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data) g_free (uri_text); if (contacts_src_exists && is_personal ) { - abook_name = (char*)e_source_peek_name (source); + abook_name = (gchar *)e_source_peek_name (source); model = exchange_account_folder_size_get_model (account); if (model) folder_size = g_strdup_printf (_("%s KB"), exchange_folder_size_get_val (model, abook_name)); @@ -275,10 +275,10 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data) if (contacts_src_exists) { gchar *uri_prefix, *sruri, *tmpruri; - int prefix_len; + gint prefix_len; GtkTreeSelection *selection; - tmpruri = (gchar*) rel_uri; + tmpruri = (gchar *) rel_uri; uri_prefix = g_strconcat (account->account_filename, "/;", NULL); prefix_len = strlen (uri_prefix); @@ -311,8 +311,8 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data) /* FIXME - check pageid */ EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; ESourceGroup *group; - const char *base_uri; - const char *rel_uri; + const gchar *base_uri; + const gchar *rel_uri; gint offline_status; ExchangeAccount *account; @@ -375,7 +375,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data) } else { EUri *euri; - int uri_len; + gint uri_len; gchar *uri_text, *uri_string, *path, *folder_name; gboolean is_personal; @@ -414,7 +414,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target) ESource *source = t->source; gchar *uri_text, *gname, *gruri, *ruri = NULL, *path = NULL, *path_prefix, *oldpath=NULL; gchar *username, *windows_domain, *authtype; - int prefix_len; + gint prefix_len; ExchangeAccount *account; ExchangeAccountFolderResult result; gint offline_status; @@ -451,13 +451,13 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target) prefix_len = strlen (path_prefix); g_free (path_prefix); - gname = (gchar*) e_source_peek_name (source); - gruri = (gchar*) e_source_peek_relative_uri (source); + gname = (gchar *) e_source_peek_name (source); + gruri = (gchar *) e_source_peek_relative_uri (source); if (contacts_src_exists) { gchar *tmpruri, *uri_string, *temp_path, *prefix; EUri *euri; - int uri_len; + gint uri_len; euri = e_uri_new (uri_text); uri_string = e_uri_to_string (euri, FALSE); diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index 7de3948814..437aeec51f 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -54,7 +54,7 @@ * means "end of list" to e_dialog_combo_box_get/set */ -static const int exchange_perm_map[] = { +static const gint exchange_perm_map[] = { E2K_PERMISSIONS_ROLE_NONE, E2K_PERMISSIONS_ROLE_REVIEWER, E2K_PERMISSIONS_ROLE_AUTHOR, @@ -65,18 +65,18 @@ static const int exchange_perm_map[] = { -1 }; -const char *exchange_delegates_user_folder_names[] = { +const gchar *exchange_delegates_user_folder_names[] = { "calendar", "tasks", "inbox", "contacts" }; /* To translators: The folder names to be displayed in the message being sent to the delegatee. */ -static const char *folder_names_for_display[] = { +static const gchar *folder_names_for_display[] = { N_("Calendar"), N_("Tasks"), N_("Inbox"), N_("Contacts") }; -static const char *widget_names[] = { +static const gchar *widget_names[] = { "calendar_perms_combobox", "task_perms_combobox", "inbox_perms_combobox", "contact_perms_combobox", }; @@ -156,10 +156,10 @@ parent_window_destroyed (gpointer dialog, GObject *where_parent_window_was) /* Maps the role_nam parameter to their corresponding Full role name */ -static const char * +static const gchar * map_to_full_role_name (E2kPermissionsRole role_nam) { - const char *role_name; + const gchar *role_name; switch (role_nam) { @@ -187,7 +187,7 @@ map_to_full_role_name (E2kPermissionsRole role_nam) static void em_utils_delegates_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, - int queued, const char *appended_uid, void *data) + gint queued, const gchar *appended_uid, gpointer data) { camel_message_info_free (info); mail_send (); @@ -211,8 +211,8 @@ exchange_delegates_user_edit (ExchangeAccount *account, { GladeXML *xml; GtkWidget *dialog, *table, *label, *combobox, *check, *check_delegate; - char *title; - int button, i; + gchar *title; + gint button, i; E2kPermissionsRole role; gboolean modified; @@ -299,13 +299,13 @@ exchange_delegates_user_edit (ExchangeAccount *account, CamelStream *stream; CamelFolder *out_folder; CamelMessageInfo *info; - char *self_address, *delegate_mail_subject; - char *role_name; + gchar *self_address, *delegate_mail_subject; + gchar *role_name; GString *role_name_final; - const char *recipient_address; - const char *delegate_exchange_dn; - const char *msg_part1 = NULL, *msg_part2 = NULL; + const gchar *recipient_address; + const gchar *delegate_exchange_dn; + const gchar *msg_part1 = NULL, *msg_part2 = NULL; role_name_final = g_string_new (""); @@ -456,10 +456,10 @@ exchange_delegates_user_edit (ExchangeAccount *account, * with most of the internal data blank). **/ ExchangeDelegatesUser * -exchange_delegates_user_new (const char *display_name) +exchange_delegates_user_new (const gchar *display_name) { ExchangeDelegatesUser *user; - int i; + gint i; user = g_object_new (EXCHANGE_TYPE_DELEGATES_USER, NULL); user->display_name = g_strdup (display_name); @@ -487,7 +487,7 @@ exchange_delegates_user_new (const char *display_name) **/ ExchangeDelegatesUser * exchange_delegates_user_new_from_gc (E2kGlobalCatalog *gc, - const char *email, + const gchar *email, GByteArray *creator_entryid) { E2kGlobalCatalogStatus status; diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h index 251a09de9d..d1a38ca876 100644 --- a/plugins/exchange-operations/exchange-delegates-user.h +++ b/plugins/exchange-operations/exchange-delegates-user.h @@ -52,7 +52,7 @@ enum { struct _ExchangeDelegatesUser { GObject parent; - char *display_name, *dn; + gchar *display_name, *dn; GByteArray *entryid; E2kSid *sid; @@ -71,9 +71,9 @@ struct _ExchangeDelegatesUserClass { GType exchange_delegates_user_get_type (void); -ExchangeDelegatesUser *exchange_delegates_user_new (const char *display_name); +ExchangeDelegatesUser *exchange_delegates_user_new (const gchar *display_name); ExchangeDelegatesUser *exchange_delegates_user_new_from_gc (E2kGlobalCatalog *gc, - const char *email, + const gchar *email, GByteArray *creator_entryid); gboolean exchange_delegates_user_edit (ExchangeAccount *account, ExchangeDelegatesUser *user, diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c index 4038ef0baf..f5e8891b77 100644 --- a/plugins/exchange-operations/exchange-delegates.c +++ b/plugins/exchange-operations/exchange-delegates.c @@ -47,14 +47,14 @@ #include typedef struct { - const char *uri; + const gchar *uri; E2kSecurityDescriptor *sd; gboolean changed; } ExchangeDelegatesFolder; typedef struct { ExchangeAccount *account; - char *self_dn; + gchar *self_dn; GladeXML *xml; GtkWidget *dialog, *parent; @@ -69,18 +69,18 @@ typedef struct { ExchangeDelegatesFolder freebusy_folder; } ExchangeDelegates; -extern const char *exchange_delegates_user_folder_names[]; +extern const gchar *exchange_delegates_user_folder_names[]; -const char *exchange_localfreebusy_path = "NON_IPM_SUBTREE/Freebusy%20Data/LocalFreebusy.EML"; +const gchar *exchange_localfreebusy_path = "NON_IPM_SUBTREE/Freebusy%20Data/LocalFreebusy.EML"; static void set_perms_for_user (ExchangeDelegatesUser *user, gpointer user_data); static void set_sd_for_href (ExchangeDelegates *delegates, - const char *href, + const gchar *href, E2kSecurityDescriptor *sd) { - int i; + gint i; for (i = 0; i < EXCHANGE_DELEGATES_LAST; i++) { if (!delegates->folder[i].uri) @@ -112,7 +112,7 @@ set_sd_for_href (ExchangeDelegates *delegates, static gboolean fill_in_sids (ExchangeDelegates *delegates) { - int u, u2, sd, needed_sids; + gint u, u2, sd, needed_sids; ExchangeDelegatesUser *user, *user2; GList *sids, *s; E2kSid *sid; @@ -186,11 +186,11 @@ fill_in_sids (ExchangeDelegates *delegates) return ok; } -static const char *sd_props[] = { +static const gchar *sd_props[] = { E2K_PR_EXCHANGE_SD_BINARY, E2K_PR_EXCHANGE_SD_XML }; -static const int n_sd_props = sizeof (sd_props) / sizeof (sd_props[0]); +static const gint n_sd_props = sizeof (sd_props) / sizeof (sd_props[0]); /* Read the folder security descriptors and match them up with the * list of delegates. @@ -207,7 +207,7 @@ get_folder_security (ExchangeDelegates *delegates) GByteArray *binary_form; ExchangeDelegatesUser *user; guint32 perms; - int i, u; + gint i, u; /* If we've been here before, just return the success or * failure result from last time. @@ -228,16 +228,16 @@ get_folder_security (ExchangeDelegates *delegates) delegates->folder[i].uri = exchange_account_get_standard_uri ( delegates->account, exchange_delegates_user_folder_names[i]); if (delegates->folder[i].uri) { - g_ptr_array_add (hrefs, (char *)e2k_uri_relative ( + g_ptr_array_add (hrefs, (gchar *)e2k_uri_relative ( delegates->account->home_uri, delegates->folder[i].uri)); } } - g_ptr_array_add (hrefs, (char *)exchange_localfreebusy_path); + g_ptr_array_add (hrefs, (gchar *)exchange_localfreebusy_path); iter = e2k_context_bpropfind_start ( ctx, NULL, delegates->account->home_uri, - (const char **)hrefs->pdata, hrefs->len, + (const gchar **)hrefs->pdata, hrefs->len, sd_props, n_sd_props); g_ptr_array_free (hrefs, TRUE); @@ -281,13 +281,13 @@ get_folder_security (ExchangeDelegates *delegates) } -static const char *delegation_props[] = { +static const gchar *delegation_props[] = { PR_DELEGATES_DISPLAY_NAMES, PR_DELEGATES_ENTRYIDS, PR_DELEGATES_SEE_PRIVATE, PR_CREATOR_ENTRYID }; -static const int n_delegation_props = sizeof (delegation_props) / sizeof (delegation_props[0]); +static const gint n_delegation_props = sizeof (delegation_props) / sizeof (delegation_props[0]); /* Fetch the list of delegates from the freebusy message. */ static gboolean @@ -299,7 +299,7 @@ get_user_list (ExchangeDelegates *delegates) GPtrArray *display_names, *entryids, *privflags; GByteArray *entryid; ExchangeDelegatesUser *user; - int i; + gint i; ctx = exchange_account_get_context (delegates->account); iter = e2k_context_bpropfind_start (ctx, NULL, @@ -359,7 +359,7 @@ add_remove_user (ExchangeDelegatesUser *user, GPtrArray *to_array, GPtrArray *from_array) { ExchangeDelegatesUser *match; - int i; + gint i; for (i = 0; i < from_array->len; i++) { match = from_array->pdata[i]; @@ -379,7 +379,7 @@ static void set_perms_for_user (ExchangeDelegatesUser *user, gpointer user_data) { ExchangeDelegates *delegates = user_data; - int i, role; + gint i, role; guint32 perms; for (i = 0; i < EXCHANGE_DELEGATES_LAST; i++) { @@ -401,10 +401,10 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data) ExchangeDelegates *delegates = data; E2kGlobalCatalog *gc; GtkWidget *dialog, *parent_window; - const char *delegate_exchange_dn; - char *email; + const gchar *delegate_exchange_dn; + gchar *email; ExchangeDelegatesUser *user, *match; - int response, u; + gint response, u; GtkTreeIter iter; if (!get_folder_security (delegates)) @@ -478,7 +478,7 @@ get_selected_row (GtkWidget *tree_view, GtkTreeIter *iter) GtkTreeSelection *selection; GtkTreeModel *model; GtkTreePath *path; - int *indices, row; + gint *indices, row; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)); if (!gtk_tree_selection_get_selected (selection, &model, iter)) @@ -498,7 +498,7 @@ edit_button_clicked_cb (GtkWidget *widget, gpointer data) ExchangeDelegates *delegates = data; GtkWidget *parent_window; GtkTreeIter iter; - int row; + gint row; if (!get_folder_security (delegates)) return; @@ -512,14 +512,14 @@ edit_button_clicked_cb (GtkWidget *widget, gpointer data) parent_window); } -const char * -email_look_up (const char *delegate_legacy, ExchangeAccount *account) +const gchar * +email_look_up (const gchar *delegate_legacy, ExchangeAccount *account) { E2kGlobalCatalog *gc; E2kGlobalCatalogEntry *entry; E2kGlobalCatalogStatus status; - const char *email_id; + const gchar *email_id; gc = exchange_account_get_global_catalog (account); @@ -541,7 +541,7 @@ table_click_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) ExchangeDelegates *delegates = data; GtkWidget *parent_window; GtkTreeIter iter; - int row; + gint row; if (event->type != GDK_2BUTTON_PRESS) return FALSE; @@ -565,7 +565,7 @@ remove_button_clicked_cb (GtkWidget *widget, gpointer data) ExchangeDelegates *delegates = data; ExchangeDelegatesUser *user; GtkWidget *dialog; - int row, btn, i; + gint row, btn, i; GtkTreeIter iter; if (!get_folder_security (delegates)) @@ -609,7 +609,7 @@ proppatch_sd (E2kContext *ctx, ExchangeDelegatesFolder *folder) { GByteArray *binsd; E2kProperties *props; - const char *href = ""; + const gchar *href = ""; E2kResultIter *iter; E2kResult *result; E2kHTTPStatus status; @@ -640,7 +640,7 @@ get_user_dn (E2kGlobalCatalog *gc, ExchangeDelegatesUser *user) { E2kGlobalCatalogEntry *entry; E2kGlobalCatalogStatus status; - const char *exchange_dn; + const gchar *exchange_dn; exchange_dn = e2k_entryid_to_dn (user->entryid); status = e2k_global_catalog_lookup ( @@ -663,9 +663,9 @@ delegates_apply (ExchangeDelegates *delegates) E2kContext *ctx; GPtrArray *display_names, *entryids, *privflags; GByteArray *entryid_dup; - char *error = NULL; + gchar *error = NULL; E2kProperties *props; - int i; + gint i; E2kGlobalCatalogStatus status; if (!delegates->loaded_folders) @@ -837,7 +837,7 @@ static void parent_destroyed (gpointer user_data, GObject *ex_parent); static void delegates_destroy (ExchangeDelegates *delegates) { - int i; + gint i; g_object_unref (delegates->account); @@ -879,7 +879,7 @@ delegates_destroy (ExchangeDelegates *delegates) if (delegates->freebusy_folder.sd) g_object_unref (delegates->freebusy_folder.sd); if (delegates->freebusy_folder.uri) - g_free ((char *)delegates->freebusy_folder.uri); + g_free ((gchar *)delegates->freebusy_folder.uri); if (delegates->xml) g_object_unref (delegates->xml); @@ -889,7 +889,7 @@ delegates_destroy (ExchangeDelegates *delegates) static void -dialog_response (GtkDialog *dialog, int response, gpointer user_data) +dialog_response (GtkDialog *dialog, gint response, gpointer user_data) { ExchangeDelegates *delegates = user_data; @@ -915,7 +915,7 @@ exchange_delegates (ExchangeAccount *account, GtkWidget *parent) ExchangeDelegatesUser *user; GtkTreeViewColumn *column; GtkTreeIter iter; - int i; + gint i; g_return_if_fail (GTK_IS_WIDGET (parent)); g_return_if_fail (EXCHANGE_IS_ACCOUNT (account)); diff --git a/plugins/exchange-operations/exchange-delegates.h b/plugins/exchange-operations/exchange-delegates.h index 77fc354c60..5defd27f9a 100644 --- a/plugins/exchange-operations/exchange-delegates.h +++ b/plugins/exchange-operations/exchange-delegates.h @@ -30,7 +30,7 @@ extern "C" { #endif /* __cplusplus */ void exchange_delegates (ExchangeAccount *account, GtkWidget *parent); -const char *email_look_up (const char *delegate_legacy, ExchangeAccount *account); +const gchar *email_look_up (const gchar *delegate_legacy, ExchangeAccount *account); #ifdef __cplusplus } diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c index 63874c793a..03d7ac7aa9 100644 --- a/plugins/exchange-operations/exchange-folder-permission.c +++ b/plugins/exchange-operations/exchange-folder-permission.c @@ -47,7 +47,7 @@ #define d(x) -static void org_folder_permissions_cb (EPopup *ep, EPopupItem *p, void *data); +static void org_folder_permissions_cb (EPopup *ep, EPopupItem *p, gpointer data); void org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *t); void org_gnome_exchange_menu_folder_permissions (EPlugin *ep, EMMenuTargetSelect *target); void org_gnome_exchange_calendar_permissions (EPlugin *ep, ECalPopupTargetSource *target); @@ -63,7 +63,7 @@ static EPopupItem popup_items[] = { }; static void -popup_free (EPopup *ep, GSList *items, void *data) +popup_free (EPopup *ep, GSList *items, gpointer data) { g_slist_free (items); } @@ -72,8 +72,8 @@ void org_gnome_exchange_calendar_permissions (EPlugin *ep, ECalPopupTargetSource *target) { GSList *menus = NULL; - int i = 0, mode; - static int first =0; + gint i = 0, mode; + static gint first =0; ExchangeAccount *account = NULL; ESource *source = NULL; gchar *uri = NULL; @@ -113,8 +113,8 @@ void org_gnome_exchange_addressbook_permissions (EPlugin *ep, EABPopupTargetSource *target) { GSList *menus = NULL; - int i = 0, mode; - static int first =0; + gint i = 0, mode; + static gint first =0; ExchangeAccount *account = NULL; ESource *source = NULL; gchar *uri = NULL; @@ -152,10 +152,10 @@ void org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *target) { GSList *menus = NULL; - int i = 0, mode; - static int first =0; + gint i = 0, mode; + static gint first =0; gchar *path = NULL; - char *fixed_path = NULL; + gchar *fixed_path = NULL; ExchangeAccount *account = NULL; d(g_print ("exchange-folder-permission.c: entry\n")); @@ -201,7 +201,7 @@ org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *target) } static void -org_folder_permissions_cb (EPopup *ep, EPopupItem *p, void *data) +org_folder_permissions_cb (EPopup *ep, EPopupItem *p, gpointer data) { ExchangeAccount *account = NULL; EFolder *folder = NULL; @@ -223,7 +223,7 @@ org_gnome_exchange_menu_folder_permissions (EPlugin *ep, EMMenuTargetSelect *tar ExchangeAccount *account = NULL; EFolder *folder = NULL; gchar *path = NULL; - int mode; + gint mode; if (!g_str_has_prefix (target->uri, "exchange://")) return; @@ -249,7 +249,7 @@ org_gnome_exchange_menu_cal_permissions (EPlugin *ep, ECalMenuTargetSelect *targ ECalModel *model = NULL; ECal *ecal = NULL; gchar *uri = NULL; - int mode; + gint mode; if (!target) return; @@ -283,7 +283,7 @@ org_gnome_exchange_menu_tasks_permissions (EPlugin *ep, ECalMenuTargetSelect *ta ECalModel *model = NULL; ECal *ecal = NULL; gchar *uri = NULL; - int mode; + gint mode; if (!target) return; @@ -315,7 +315,7 @@ org_gnome_exchange_menu_ab_permissions (EPlugin *ep, EABMenuTargetSelect *target EFolder *folder = NULL; EBook *ebook = NULL; gchar *uri = NULL; - int mode; + gint mode; if (!target) return; diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c index ff3634341a..1a916a9f1b 100644 --- a/plugins/exchange-operations/exchange-folder-size-display.c +++ b/plugins/exchange-operations/exchange-folder-size-display.c @@ -46,7 +46,7 @@ get_folder_size_func (GtkTreeModel *model, { GHashTable *info = (GHashTable *) user_data; gdouble folder_size; - char *folder_name; + gchar *folder_name; gtk_tree_model_get(model, iter, COLUMN_SIZE, &folder_size, COLUMN_NAME, &folder_name, -1); @@ -54,11 +54,11 @@ get_folder_size_func (GtkTreeModel *model, return FALSE; } -char * -exchange_folder_size_get_val (GtkListStore *model, const char *folder_name) +gchar * +exchange_folder_size_get_val (GtkListStore *model, const gchar *folder_name) { GHashTable *finfo; - char *folder_size, *fsize; + gchar *folder_size, *fsize; finfo = g_hash_table_new_full ( g_str_hash, g_str_equal, @@ -86,7 +86,7 @@ format_size_func (GtkTreeViewColumn *col, { GtkCellRendererText *cell = (GtkCellRendererText *)renderer; gdouble folder_size; - char * new_text; + gchar * new_text; gtk_tree_model_get(model, iter, COLUMN_SIZE, &folder_size, -1); @@ -108,7 +108,7 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent) GladeXML *xml; GtkWidget *dialog, *table; GList *l; - char *col_name; + gchar *col_name; printf ("exchange_folder_size_display called\n"); g_return_if_fail (GTK_IS_WIDGET (parent)); diff --git a/plugins/exchange-operations/exchange-folder-size-display.h b/plugins/exchange-operations/exchange-folder-size-display.h index 95c795686d..08f22c7114 100644 --- a/plugins/exchange-operations/exchange-folder-size-display.h +++ b/plugins/exchange-operations/exchange-folder-size-display.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ void exchange_folder_size_display (GtkListStore *model, GtkWidget *parent); -char * exchange_folder_size_get_val (GtkListStore *model, const char *folder_name); +gchar * exchange_folder_size_get_val (GtkListStore *model, const gchar *folder_name); #ifdef __cplusplus } diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c index 2f72552983..6b5d2375bc 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.c +++ b/plugins/exchange-operations/exchange-folder-subscription.c @@ -105,7 +105,7 @@ setup_folder_name_combo (GladeXML *glade_xml, const gchar *fname) NULL /* FIXME: Should these be translated? */ }; - int i; + gint i; combo = GTK_COMBO_BOX (glade_xml_get_widget (glade_xml, "folder-name-combo")); g_assert (GTK_IS_COMBO_BOX_ENTRY (combo)); @@ -120,10 +120,10 @@ setup_folder_name_combo (GladeXML *glade_xml, const gchar *fname) static void folder_name_entry_changed_callback (GtkEditable *editable, - void *data) + gpointer data) { GtkDialog *dialog = GTK_DIALOG (data); - const char *folder_name_text = gtk_entry_get_text (GTK_ENTRY (editable)); + const gchar *folder_name_text = gtk_entry_get_text (GTK_ENTRY (editable)); if (*folder_name_text == '\0') gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE); @@ -132,10 +132,10 @@ folder_name_entry_changed_callback (GtkEditable *editable, } static void -user_name_entry_changed_callback (GtkEditable *editable, void *data) +user_name_entry_changed_callback (GtkEditable *editable, gpointer data) { GtkDialog *dialog = GTK_DIALOG (data); - const char *user_name_text = gtk_entry_get_text (GTK_ENTRY (editable)); + const gchar *user_name_text = gtk_entry_get_text (GTK_ENTRY (editable)); if (*user_name_text == '\0') gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE); @@ -181,7 +181,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data) { SubscriptionInfo *subscription_info = data; gchar *user_email_address = NULL, *folder_name = NULL, *path = NULL; - char *subscriber_email; + gchar *subscriber_email; EFolder *folder = NULL; EDestinationStore *destination_store; GList *destinations; @@ -292,7 +292,7 @@ create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname) GladeXML *glade_xml; GtkWidget *dialog, *ok_button; SubscriptionInfo *subscription_info; - int mode; + gint mode; exchange_account_is_offline (account, &mode); if (mode == OFFLINE_MODE) diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index 3362f0ae83..959bdec8e5 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -50,15 +50,15 @@ void org_gnome_exchange_addressbook_subscription (EPlugin *ep, EMMenuTargetSelec void org_gnome_exchange_calendar_subscription (EPlugin *ep, EMMenuTargetSelect *target); void org_gnome_exchange_tasks_subscription (EPlugin *ep, EMMenuTargetSelect *target); void org_gnome_exchange_check_subscribed (EPlugin *ep, ECalPopupTargetSource *target); -void org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data); +void org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data); void org_gnome_exchange_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target); -void org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, void *data); +void org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data); void org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *target); -void org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, void *data); -void popup_free (EPopup *ep, GSList *items, void *data); -void popup_inbox_free (EPopup *ep, GSList *items, void *data); -void popup_ab_free (EPopup *ep, GSList *items, void *data); -static void exchange_get_folder (char *uri, CamelFolder *folder, void *data); +void org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data); +void popup_free (EPopup *ep, GSList *items, gpointer data); +void popup_inbox_free (EPopup *ep, GSList *items, gpointer data); +void popup_ab_free (EPopup *ep, GSList *items, gpointer data); +static void exchange_get_folder (gchar *uri, CamelFolder *folder, gpointer data); #define CONF_KEY_SELECTED_CAL_SOURCES "/apps/evolution/calendar/display/selected_calendars" @@ -68,20 +68,20 @@ static EPopupItem popup_inbox_items[] = { }; void -popup_inbox_free (EPopup *ep, GSList *items, void *data) +popup_inbox_free (EPopup *ep, GSList *items, gpointer data) { g_slist_free (items); } void -org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, void *data) +org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data) { ExchangeAccount *account = NULL; EMPopupTargetFolder *target = data; gchar *path = NULL; gchar *stored_path = NULL; - const char *inbox_uri = NULL; - const char *inbox_physical_uri = NULL; + const gchar *inbox_uri = NULL; + const gchar *inbox_physical_uri = NULL; gchar *target_uri = NULL; EFolder *inbox; ExchangeAccountFolderResult result; @@ -147,11 +147,11 @@ org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, void *da } static CamelFolderInfo * -ex_create_folder_info (CamelStore *store, char *name, char *uri, - int unread_count, int flags) +ex_create_folder_info (CamelStore *store, gchar *name, gchar *uri, + gint unread_count, gint flags) { CamelFolderInfo *info; - const char *path; + const gchar *path; path = strstr (uri, "://"); if (!path) @@ -170,7 +170,7 @@ ex_create_folder_info (CamelStore *store, char *name, char *uri, } static void -exchange_get_folder (char *uri, CamelFolder *folder, void *data) +exchange_get_folder (gchar *uri, CamelFolder *folder, gpointer data) { CamelStore *store; CamelException ex; @@ -206,7 +206,7 @@ void org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *target) { GSList *menus = NULL; - int i = 0; + gint i = 0; ExchangeAccount *account = NULL; gchar *path = NULL; gchar *sub_folder = NULL; @@ -237,7 +237,7 @@ static EPopupItem popup_items[] = { }; void -popup_free (EPopup *ep, GSList *items, void *data) +popup_free (EPopup *ep, GSList *items, gpointer data) { g_slist_free (items); } @@ -247,7 +247,7 @@ static EPopupItem popup_ab_items[] = { }; void -popup_ab_free (EPopup *ep, GSList *items, void *data) +popup_ab_free (EPopup *ep, GSList *items, gpointer data) { g_slist_free (items); } @@ -256,12 +256,12 @@ void org_gnome_exchange_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target) { GSList *menus = NULL; - int i = 0; + gint i = 0; ESource *source = NULL; gchar *uri = NULL; gchar *path = NULL; - char *sub_folder = NULL; - const char *base_uri; + gchar *sub_folder = NULL; + const gchar *base_uri; ExchangeAccount *account = NULL; ESourceGroup *group; @@ -298,12 +298,12 @@ void org_gnome_exchange_check_subscribed (EPlugin *ep, ECalPopupTargetSource *target) { GSList *menus = NULL; - int i = 0; + gint i = 0; ESource *source = NULL; gchar *ruri = NULL; gchar *path = NULL; - char *sub_folder = NULL; - const char *base_uri; + gchar *sub_folder = NULL; + const gchar *base_uri; ExchangeAccount *account = NULL; ESourceGroup *group; @@ -335,14 +335,14 @@ org_gnome_exchange_check_subscribed (EPlugin *ep, ECalPopupTargetSource *target) } static void -unsubscribe_dialog_ab_response (GtkDialog *dialog, int response, gpointer data) +unsubscribe_dialog_ab_response (GtkDialog *dialog, gint response, gpointer data) { if (response == GTK_RESPONSE_OK) { ExchangeAccount *account = NULL; gchar *path = NULL; gchar *uri = NULL; - const char *source_uid = NULL; + const gchar *source_uid = NULL; ESourceGroup *source_group = NULL; ESource *source = NULL; EABPopupTargetSource *target = data; @@ -371,7 +371,7 @@ unsubscribe_dialog_ab_response (GtkDialog *dialog, int response, gpointer data) } static void -unsubscribe_dialog_response (GtkDialog *dialog, int response, gpointer data) +unsubscribe_dialog_response (GtkDialog *dialog, gint response, gpointer data) { if (response == GTK_RESPONSE_OK) { @@ -379,7 +379,7 @@ unsubscribe_dialog_response (GtkDialog *dialog, int response, gpointer data) ExchangeAccount *account = NULL; gchar *path = NULL; gchar *ruri = NULL; - const char *source_uid = NULL; + const gchar *source_uid = NULL; GConfClient *client; ESourceGroup *source_group = NULL; ESource *source = NULL; @@ -430,7 +430,7 @@ unsubscribe_dialog_response (GtkDialog *dialog, int response, gpointer data) } void -org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, void *data) +org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data) { GtkWidget *dialog = NULL; EABPopupTargetSource *target = data; @@ -485,7 +485,7 @@ org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, void *data) unsubscribe_dialog_ab_response (GTK_DIALOG (dialog), response, data); } void -org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data) +org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data) { GtkWidget *dialog = NULL; ECalPopupTargetSource *target = data; diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c index 74d3af258e..39929eaa5b 100644 --- a/plugins/exchange-operations/exchange-mail-send-options.c +++ b/plugins/exchange-operations/exchange-mail-send-options.c @@ -44,7 +44,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) { EMsgComposer *composer; CamelAddress *sender_address; - const char *sender_id, *recipient_id; + const gchar *sender_id, *recipient_id; struct _camel_header_address *addr; struct _camel_header_address *sender_addr; @@ -86,7 +86,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) e_msg_composer_remove_header (composer, "Sensitivity"); sender_address = (CamelAddress *) e_msg_composer_get_from (composer); - sender_id = (const char*) camel_address_encode (sender_address); + sender_id = (const gchar *) camel_address_encode (sender_address); addr = camel_header_address_decode (dialog->options->delegate_address, NULL); sender_addr = camel_header_address_decode (sender_id, NULL); @@ -122,7 +122,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) if (dialog->options->delivery_enabled) { EComposerHeaderTable *table; EAccount *account; - char *mdn_address; + gchar *mdn_address; table = e_msg_composer_get_header_table (composer); account = e_composer_header_table_get_account (table); @@ -137,7 +137,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) if (dialog->options->read_enabled) { EComposerHeaderTable *table; EAccount *account; - char *mdn_address; + gchar *mdn_address; table = e_msg_composer_get_header_table (composer); account = e_composer_header_table_get_account (table); @@ -171,7 +171,7 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target) EMsgComposer *composer = target->composer; EComposerHeaderTable *table; EAccount *account = NULL; - char *temp = NULL; + gchar *temp = NULL; table = e_msg_composer_get_header_table (composer); account = e_composer_header_table_get_account (table); diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c index 553a41695e..e9b8d3fd5d 100644 --- a/plugins/exchange-operations/exchange-operations.c +++ b/plugins/exchange-operations/exchange-operations.c @@ -57,8 +57,8 @@ free_exchange_listener (void) g_object_unref (exchange_global_config_listener); } -int -e_plugin_lib_enable (EPluginLib *eplib, int enable) +gint +e_plugin_lib_enable (EPluginLib *eplib, gint enable) { if (!exchange_global_config_listener) { exchange_global_config_listener = exchange_config_listener_new (); @@ -75,10 +75,10 @@ exchange_is_offline (gint *mode) /* FIXME: See if a GLib variant of this function available */ gboolean -exchange_operations_tokenize_string (char **string, char *token, char delimit, unsigned int maxsize) +exchange_operations_tokenize_string (gchar **string, gchar *token, gchar delimit, guint maxsize) { - unsigned int i=0; - char *str=*string; + guint i=0; + gchar *str=*string; while (*str!=delimit && *str!='\0' && inext) { gchar *ruri; - ruri = (gchar*) e_source_peek_relative_uri (tsource->data); + ruri = (gchar *) e_source_peek_relative_uri (tsource->data); if (ruri && g_strrstr (ruri, old_path)) { /* This ESource points to one of the child folders */ gchar **tmpv, *truri; @@ -288,7 +288,7 @@ void exchange_operations_update_child_esources (ESource *source, const gchar *ol } gboolean -is_exchange_personal_folder (ExchangeAccount *account, char *uri) +is_exchange_personal_folder (ExchangeAccount *account, gchar *uri) { ExchangeHierarchy *hier; EFolder *folder; diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h index c453b0b978..5de844ba7f 100644 --- a/plugins/exchange-operations/exchange-operations.h +++ b/plugins/exchange-operations/exchange-operations.h @@ -38,21 +38,21 @@ extern "C" { extern ExchangeConfigListener *exchange_global_config_listener; -int e_plugin_lib_enable (EPluginLib *eplib, int enable); +gint e_plugin_lib_enable (EPluginLib *eplib, gint enable); ExchangeAccount *exchange_operations_get_exchange_account (void); ExchangeConfigListenerStatus exchange_is_offline (gint *mode); -gboolean exchange_operations_tokenize_string (char **string, char *token, char delimit, unsigned int maxsize); +gboolean exchange_operations_tokenize_string (gchar **string, gchar *token, gchar delimit, guint maxsize); -gboolean exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *nuri); -void exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *nuri, const char *ruri, GtkTreeSelection *selection) ; +gboolean exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri); +void exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri, const gchar *ruri, GtkTreeSelection *selection) ; void exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResult result); void exchange_operations_update_child_esources (ESource *source, const gchar *old_path, const gchar *new_path); -gboolean is_exchange_personal_folder (ExchangeAccount *account, char *uri); +gboolean is_exchange_personal_folder (ExchangeAccount *account, gchar *uri); #ifdef __cplusplus } diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c index a83d54c517..9456754377 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.c +++ b/plugins/exchange-operations/exchange-permissions-dialog.c @@ -45,7 +45,7 @@ struct _ExchangePermissionsDialogPrivate { ExchangeAccount *account; - char *base_uri, *folder_path; + gchar *base_uri, *folder_path; E2kSecurityDescriptor *sd; gboolean changed; gboolean frozen; @@ -129,13 +129,13 @@ static void get_widgets (ExchangePermissionsDialog *dialog, static void setup_user_list (ExchangePermissionsDialog *dialog); static void display_permissions (ExchangePermissionsDialog *dialog); static void dialog_response (ExchangePermissionsDialog *dialog, - int response, gpointer user_data); + gint response, gpointer user_data); -static const char *sd_props[] = { +static const gchar *sd_props[] = { E2K_PR_EXCHANGE_SD_BINARY, E2K_PR_EXCHANGE_SD_XML }; -static const int n_sd_props = sizeof (sd_props) / sizeof (sd_props[0]); +static const gint n_sd_props = sizeof (sd_props) / sizeof (sd_props[0]); /** * exchange_permissions_dialog_new: @@ -151,15 +151,15 @@ exchange_permissions_dialog_new (ExchangeAccount *account, GtkWidget *parent) { ExchangePermissionsDialog *dialog; - const char *base_uri, *folder_uri, *folder_path; + const gchar *base_uri, *folder_uri, *folder_path; E2kContext *ctx; ExchangeHierarchy *hier; GladeXML *xml; GtkWidget *box; - char *title; + gchar *title; E2kHTTPStatus status; E2kResult *results; - int nresults = 0; + gint nresults = 0; xmlNode *xml_form; GByteArray *binary_form; @@ -242,7 +242,7 @@ exchange_permissions_dialog_new (ExchangeAccount *account, } static void -dialog_response (ExchangePermissionsDialog *dialog, int response, +dialog_response (ExchangePermissionsDialog *dialog, gint response, gpointer user_data) { E2kContext *ctx; @@ -276,7 +276,7 @@ dialog_response (ExchangePermissionsDialog *dialog, int response, * folder hierarchy. #29726 */ iter = e2k_context_bproppatch_start (ctx, NULL, dialog->priv->base_uri, - (const char **)&dialog->priv->folder_path, 1, + (const gchar **)&dialog->priv->folder_path, 1, props, FALSE); e2k_properties_free (props); @@ -388,7 +388,7 @@ add_clicked (GtkButton *button, gpointer user_data) const guint8 *bsid, *bsid2; GList *email_list = NULL; GList *l = NULL; - char *email = NULL; + gchar *email = NULL; gboolean valid; gint result; @@ -525,7 +525,7 @@ static void role_changed (GtkWidget *role_combo, gpointer user_data) { ExchangePermissionsDialog *dialog = user_data; - int role; + gint role; if (dialog->priv->frozen) return; @@ -548,7 +548,7 @@ role_changed (GtkWidget *role_combo, gpointer user_data) static void display_role (ExchangePermissionsDialog *dialog) { - int role = dialog->priv->selected_role; + gint role = dialog->priv->selected_role; GtkTreeModel *model; GtkTreeIter iter; @@ -772,17 +772,17 @@ get_widgets (ExchangePermissionsDialog *dialog, GladeXML *xml) "toggled", G_CALLBACK (rv_toggle), dialog); } -GtkWidget *exchange_permissions_role_optionmenu_new (char *widget_name, char *string1, char *string2, int int1, int int2); +GtkWidget *exchange_permissions_role_optionmenu_new (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2); GtkWidget * -exchange_permissions_role_optionmenu_new (char *widget_name, char *string1, char *string2, int int1, int int2) +exchange_permissions_role_optionmenu_new (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2) { GtkWidget *menu; - const char **roles; - int role; + const gchar **roles; + gint role; menu = gtk_combo_box_new_text (); - roles = g_new (const char *, E2K_PERMISSIONS_ROLE_NUM_ROLES + 1); + roles = g_new (const gchar *, E2K_PERMISSIONS_ROLE_NUM_ROLES + 1); for (role = 0; role < E2K_PERMISSIONS_ROLE_NUM_ROLES; role++) { roles[role] = e2k_permissions_role_get_name (role); gtk_combo_box_append_text (GTK_COMBO_BOX (menu), roles[role]); diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c index a9858d324a..783887cb24 100644 --- a/plugins/exchange-operations/exchange-send-options.c +++ b/plugins/exchange-operations/exchange-send-options.c @@ -68,7 +68,7 @@ struct _ExchangeSendOptionsDialogPrivate { /*Label Widgets*/ GtkWidget *importance_label; GtkWidget *sensitivity_label; - char *help_section; + gchar *help_section; }; static void exchange_sendoptions_dialog_class_init (GObjectClass *object_class); @@ -92,7 +92,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod) { ExchangeSendOptionsDialogPrivate *priv; ExchangeSendOptions *options; - const char *address, *email, *name; + const gchar *address, *email, *name; guint count=0; ENameSelectorEntry *name_selector_entry; @@ -120,8 +120,8 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod) produced ambiguous results. Hence count is used :) */ for (; tmp != NULL; tmp = g_list_next (tmp)) { - address = g_strdup ((char *) e_destination_get_address (tmp->data)); - email = g_strdup ((char *) e_destination_get_email (tmp->data)); + address = g_strdup ((gchar *) e_destination_get_address (tmp->data)); + email = g_strdup ((gchar *) e_destination_get_email (tmp->data)); name = g_strdup (e_destination_get_name (tmp->data)); if (g_str_equal (email, "")) continue; diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h index b7bb9dd58b..8a6d37d947 100644 --- a/plugins/exchange-operations/exchange-send-options.h +++ b/plugins/exchange-operations/exchange-send-options.h @@ -60,9 +60,9 @@ typedef struct { gboolean send_as_del_enabled; gboolean delivery_enabled; gboolean read_enabled; - const char *delegate_name; - const char *delegate_email; - const char *delegate_address; + const gchar *delegate_name; + const gchar *delegate_email; + const gchar *delegate_address; } ExchangeSendOptions ; struct _ExchangeSendOptionsDialog { diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c index 9285b9680e..3b7602f6e4 100644 --- a/plugins/exchange-operations/exchange-user-dialog.c +++ b/plugins/exchange-operations/exchange-user-dialog.c @@ -30,7 +30,7 @@ #include "e2k-xml-utils.h" struct _E2kUserDialogPrivate { - char *section_name; + gchar *section_name; ENameSelector *name_selector; GtkWidget *entry, *parent_window; }; @@ -125,8 +125,8 @@ addressbook_clicked_cb (GtkWidget *widget, gpointer data) static gboolean e2k_user_dialog_construct (E2kUserDialog *dialog, GtkWidget *parent_window, - const char *label_text, - const char *section_name) + const gchar *label_text, + const gchar *section_name) { E2kUserDialogPrivate *priv; GtkWidget *hbox, *vbox, *label, *button; @@ -197,7 +197,7 @@ e2k_user_dialog_construct (E2kUserDialog *dialog, **/ GtkWidget * e2k_user_dialog_new (GtkWidget *parent_window, - const char *label_text, const char *section_name) + const gchar *label_text, const gchar *section_name) { E2kUserDialog *dialog; @@ -243,7 +243,7 @@ e2k_user_dialog_get_user_list (E2kUserDialog *dialog) return NULL; for (l = destinations; l; l = g_list_next (l)) { - const char *mail; + const gchar *mail; destination = l->data; mail = e_destination_get_email (destination); @@ -263,7 +263,7 @@ e2k_user_dialog_get_user_list (E2kUserDialog *dialog) * * Return value: the email address, which must be freed with g_free(). **/ -char * +gchar * e2k_user_dialog_get_user (E2kUserDialog *dialog) { E2kUserDialogPrivate *priv; diff --git a/plugins/exchange-operations/exchange-user-dialog.h b/plugins/exchange-operations/exchange-user-dialog.h index 6bf191bc6e..8b6134befe 100644 --- a/plugins/exchange-operations/exchange-user-dialog.h +++ b/plugins/exchange-operations/exchange-user-dialog.h @@ -48,9 +48,9 @@ struct _E2kUserDialogClass { GType e2k_user_dialog_get_type (void); GtkWidget *e2k_user_dialog_new (GtkWidget *parent_window, - const char *label_text, - const char *section_name); -char *e2k_user_dialog_get_user (E2kUserDialog *dialog); + const gchar *label_text, + const gchar *section_name); +gchar *e2k_user_dialog_get_user (E2kUserDialog *dialog); GList *e2k_user_dialog_get_user_list (E2kUserDialog *dialog); #endif /* __E2K_USER_DIALOG_H__ */ diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index a07bb6e80e..10cfdb4fd6 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -69,7 +69,7 @@ static GThread *editor_thread; void ee_editor_command_changed (GtkWidget *textbox) { - const char *editor; + const gchar *editor; GConfClient *gconf; editor = gtk_entry_get_text (GTK_ENTRY(textbox)); @@ -101,7 +101,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) GtkWidget *vbox, *textbox, *label, *help; GtkWidget *checkbox; GConfClient *gconf; - char *editor; + gchar *editor; gboolean checked; vbox = gtk_vbox_new (FALSE, 10); @@ -209,8 +209,8 @@ run_error_dialog (gchar *text) void async_external_editor (EMsgComposer *composer) { - char *filename = NULL; - int status = 0; + gchar *filename = NULL; + gint status = 0; GConfClient *gconf; gchar *editor_cmd_line = NULL; gint fd; diff --git a/plugins/face/face.c b/plugins/face/face.c index 1b772863a4..6bbc7bbf1a 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -50,7 +50,7 @@ action_face_cb (GtkAction *action, if (error) { GtkWidget *filesel; - const char *image_filename; + const gchar *image_filename; gsize length; GtkFileFilter *filter; @@ -89,7 +89,7 @@ action_face_cb (GtkAction *action, pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); if (pixbuf) { - int width, height; + gint width, height; g_object_ref (pixbuf); diff --git a/plugins/folder-unsubscribe/folder-unsubscribe.c b/plugins/folder-unsubscribe/folder-unsubscribe.c index 308aea35f0..1d5e4fb8dc 100644 --- a/plugins/folder-unsubscribe/folder-unsubscribe.c +++ b/plugins/folder-unsubscribe/folder-unsubscribe.c @@ -46,7 +46,7 @@ void org_gnome_mail_folder_unsubscribe (EPlugin *plug, EMPopupTargetFolder *targ struct _folder_unsub_t { MailMsg base; - char *uri; + gchar *uri; }; static gchar * @@ -60,7 +60,7 @@ static void folder_unsubscribe_exec (struct _folder_unsub_t *msg) { extern CamelSession *session; - const char *path = NULL; + const gchar *path = NULL; CamelStore *store; CamelURL *url; diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c index 23314a44cc..2253d8a7a0 100644 --- a/plugins/google-account-setup/google-contacts-source.c +++ b/plugins/google-account-setup/google-contacts-source.c @@ -83,8 +83,8 @@ static void on_username_entry_changed (GtkEntry *entry, gpointer user_data) { ESource *source = user_data; - const char *text; - char *username; + const gchar *text; + gchar *username; text = gtk_entry_get_text (entry); @@ -120,9 +120,9 @@ typedef enum { } IntervalType; static void -seconds_to_interval (guint seconds, IntervalType *type, int *time) +seconds_to_interval (guint seconds, IntervalType *type, gint *time) { - int minutes = seconds / 60; + gint minutes = seconds / 60; *type = MINUTES; *time = minutes; @@ -139,7 +139,7 @@ seconds_to_interval (guint seconds, IntervalType *type, int *time) } static guint -interval_to_seconds (IntervalType type, int time) +interval_to_seconds (IntervalType type, gint time) { switch (type) { case MINUTES: @@ -163,7 +163,7 @@ on_interval_sb_value_changed (GtkSpinButton *sb, gpointer user_data) ESource *source = user_data; gdouble time; guint seconds; - char *value_string; + gchar *value_string; GtkWidget *interval_combo; IntervalType type; @@ -185,7 +185,7 @@ on_interval_combo_changed (GtkComboBox *combo, gpointer user_data) ESource *source = user_data; gdouble time; guint seconds; - char *value_string; + gchar *value_string; GtkWidget *sb; IntervalType type; @@ -223,11 +223,11 @@ plugin_google_contacts (EPlugin *epl, EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; ESource *source; ESourceGroup *group; - const char *base_uri; - const char *username; - const char *refresh_interval_str; + const gchar *base_uri; + const gchar *username; + const gchar *refresh_interval_str; guint refresh_interval; - const char *use_ssl_str; + const gchar *use_ssl_str; gboolean use_ssl; GtkWidget *parent; GtkWidget *vbox; @@ -243,7 +243,7 @@ plugin_google_contacts (EPlugin *epl, GtkWidget *interval_sb; GtkWidget *interval_combo; IntervalType type; - int time; + gint time; GtkWidget *ssl_cb; struct ui_data *ui; diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index 97d87c666d..cc18b0a3af 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -57,8 +57,8 @@ /*****************************************************************************/ /* prototypes */ -int e_plugin_lib_enable (EPluginLib *ep, - int enable); +gint e_plugin_lib_enable (EPluginLib *ep, + gint enable); GtkWidget * plugin_google (EPlugin *epl, EConfigHookItemFactoryData *data); @@ -82,8 +82,8 @@ ensure_google_source_group (void) g_object_unref (slist); } -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { if (enable) { @@ -114,22 +114,22 @@ ssl_changed (GtkToggleButton *button, ESource *source) static gboolean -is_email (const char *address) +is_email (const gchar *address) { /* This is supposed to check if the address's domain could be an FQDN but alas, it's not worth the pain and suffering. */ - const char *at; + const gchar *at; at = strchr (address, '@'); - /* make sure we have an '@' and that it's not the first or last char */ + /* make sure we have an '@' and that it's not the first or last gchar */ if (!at || at == address || *(at + 1) == '\0') return FALSE; return TRUE; } -static char * -sanitize_user_mail (const char *user) +static gchar * +sanitize_user_mail (const gchar *user) { if (!user) return NULL; @@ -137,8 +137,8 @@ sanitize_user_mail (const char *user) if (!is_email (user)) { return g_strconcat (user, "%40gmail.com", NULL); } else { - char *tmp = g_malloc0 (sizeof (char) * (1 + strlen (user) + 2)); - char *at = strchr (user, '@'); + gchar *tmp = g_malloc0 (sizeof (char) * (1 + strlen (user) + 2)); + gchar *at = strchr (user, '@'); strncpy (tmp, user, at - user); strcat (tmp, "%40"); @@ -148,10 +148,10 @@ sanitize_user_mail (const char *user) } } -static char * -construct_default_uri (const char *username) +static gchar * +construct_default_uri (const gchar *username) { - char *user, *uri; + gchar *user, *uri; user = sanitize_user_mail (username); uri = g_strconcat (CALENDAR_LOCATION, user, CALENDAR_DEFAULT_PATH, NULL); @@ -162,10 +162,10 @@ construct_default_uri (const char *username) /* checks whether the given_uri is pointing to the default user's calendar or not */ static gboolean -is_default_uri (const char *given_uri, const char *username) +is_default_uri (const gchar *given_uri, const gchar *username) { - char *uri, *at; - int ats; + gchar *uri, *at; + gint ats; gboolean res; if (!given_uri) @@ -182,8 +182,8 @@ is_default_uri (const char *given_uri, const char *username) if (!ats) res = g_ascii_strcasecmp (given_uri, uri) == 0; else { - const char *last; - char *tmp = g_malloc0 (sizeof (char) * (1 + strlen (given_uri) + (2 * ats))); + const gchar *last; + gchar *tmp = g_malloc0 (sizeof (char) * (1 + strlen (given_uri) + (2 * ats))); last = given_uri; for (at = strchr (last, '@'); at; at = strchr (at + 1, '@')) { @@ -203,13 +203,13 @@ is_default_uri (const char *given_uri, const char *username) return res; } -static void init_combo_values (GtkComboBox *combo, const char *deftitle, const char *defuri); +static void init_combo_values (GtkComboBox *combo, const gchar *deftitle, const gchar *defuri); static void user_changed (GtkEntry *editable, ESource *source) { - char *uri; - const char *user; + gchar *uri; + const gchar *user; /* two reasons why set readonly to FALSE: a) the e_source_set_relative_uri does nothing for readonly sources @@ -232,10 +232,10 @@ user_changed (GtkEntry *editable, ESource *source) init_combo_values (GTK_COMBO_BOX (g_object_get_data (G_OBJECT (editable), "CalendarCombo")), _("Default"), NULL); } -static char * +static gchar * get_refresh_minutes (GtkWidget *spin, GtkWidget *combobox) { - int setting = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)); + gint setting = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)); switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combobox))) { case 0: /* minutes */ @@ -289,9 +289,9 @@ combobox_changed (GtkComboBox *combobox, ECalConfigTargetSource *t) static void set_refresh_time (ESource *source, GtkWidget *spin, GtkWidget *combobox) { - int time; - int item_num = 0; - const char *refresh_str = e_source_get_property (source, "refresh"); + gint time; + gint item_num = 0; + const gchar *refresh_str = e_source_get_property (source, "refresh"); time = refresh_str ? atoi (refresh_str) : 30; if (time && !(time % 10080)) { @@ -320,7 +320,7 @@ enum { }; static void -init_combo_values (GtkComboBox *combo, const char *deftitle, const char *defuri) +init_combo_values (GtkComboBox *combo, const gchar *deftitle, const gchar *defuri) { GtkTreeIter iter; GtkListStore *store; @@ -355,7 +355,7 @@ cal_combo_changed (GtkComboBox *combo, ESource *source) store = GTK_LIST_STORE (gtk_combo_box_get_model (combo)); if (gtk_combo_box_get_active_iter (combo, &iter)) { - char *uri = NULL, *title = NULL; + gchar *uri = NULL, *title = NULL; gboolean readonly = FALSE; gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, COL_TITLE, &title, COL_URL_PATH, &uri, COL_READ_ONLY, &readonly, -1); @@ -383,7 +383,7 @@ cal_combo_changed (GtkComboBox *combo, ESource *source) } static void -claim_error (GtkWindow *parent, const char *error) +claim_error (GtkWindow *parent, const gchar *error) { GtkWidget *dialog; @@ -403,8 +403,8 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) ESource *source; GDataGoogleService *service; GDataFeed *feed; - char *password, *tmp; - const char *username; + gchar *password, *tmp; + const gchar *username; GError *error = NULL; GtkWindow *parent; @@ -438,8 +438,8 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) if (feed) { GSList *l; - char *old_selected = NULL; - int idx, active = -1, default_idx = -1; + gchar *old_selected = NULL; + gint idx, active = -1, default_idx = -1; GtkListStore *store = GTK_LIST_STORE (gtk_combo_box_get_model (combo)); GtkTreeIter iter; @@ -449,7 +449,7 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) gtk_list_store_clear (store); for (l = gdata_feed_get_entries (feed), idx = 1; l != NULL; l = l->next) { - const char *uri, *title, *color, *access; + const gchar *uri, *title, *color, *access; GSList *links; GDataEntry *entry = (GDataEntry *) l->data; @@ -559,11 +559,11 @@ plugin_google (EPlugin *epl, GtkWidget *user; GtkWidget *label; GtkWidget *combo; - char *uri; - const char *username; - const char *ssl_prop; + gchar *uri; + const gchar *username; + const gchar *ssl_prop; gboolean ssl_enabled; - int row; + gint row; GtkCellRenderer *renderer; GtkListStore *store; diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index 3d1fb15214..46beaac0b8 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -45,9 +45,9 @@ struct _CamelGwListenerPrivate { }; struct _GwAccountInfo { - char *uid; - char *name; - char *source_url; + gchar *uid; + gchar *name; + gchar *source_url; gboolean auto_check; guint auto_check_time; }; @@ -139,11 +139,11 @@ is_groupwise_account (EAccount *account) /* looks up for an existing groupwise account info in the groupwise_accounts list based on uid */ static GwAccountInfo* -lookup_account_info (const char *key) +lookup_account_info (const gchar *key) { GList *list; GwAccountInfo *info ; - int found = 0; + gint found = 0; if (!key) return NULL; @@ -169,7 +169,7 @@ lookup_account_info (const char *key) #define SELECTED_NOTES "/apps/evolution/calendar/memos/selected_memos" static void -add_esource (const char *conf_key, GwAccountInfo *info, const char *source_name, CamelURL *url, const char* parent_id_name, gboolean can_create) +add_esource (const gchar *conf_key, GwAccountInfo *info, const gchar *source_name, CamelURL *url, const gchar * parent_id_name, gboolean can_create) { ESourceList *source_list; ESourceGroup *group; @@ -177,12 +177,12 @@ add_esource (const char *conf_key, GwAccountInfo *info, const char *source_name GConfClient* client; GSList *ids, *temp ; const gchar *source_selection_key; - char *relative_uri; - const char *soap_port; - const char * use_ssl; - const char *poa_address; - const char *offline_sync; - const char *group_name; + gchar *relative_uri; + const gchar *soap_port; + const gchar * use_ssl; + const gchar *poa_address; + const gchar *offline_sync; + const gchar *group_name; poa_address = url->host; if (!poa_address || strlen (poa_address) ==0) @@ -220,7 +220,7 @@ add_esource (const char *conf_key, GwAccountInfo *info, const char *source_name e_source_set_property (source, "use_ssl", use_ssl); if (info->auto_check) { - char *str = g_strdup_printf ("%d", info->auto_check_time); + gchar *str = g_strdup_printf ("%d", info->auto_check_time); e_source_set_property (source, "refresh", str); g_free (str); @@ -266,7 +266,7 @@ add_esource (const char *conf_key, GwAccountInfo *info, const char *source_name } static void -remove_esource (const char *conf_key, const char *group_name, char* source_name, const char* relative_uri) +remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_name, const gchar * relative_uri) { ESourceList *list; GSList *groups; @@ -338,17 +338,17 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name, /* looks up for e-source with having same info as old_account_info and changes its values passed in new values */ static void -modify_esource (const char* conf_key, GwAccountInfo *old_account_info, EAccount *a, CamelURL *new_url) +modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccount *a, CamelURL *new_url) { ESourceList *list; GSList *groups; - char *old_relative_uri; + gchar *old_relative_uri; CamelURL *url; gboolean found_group; GConfClient* client; - const char *poa_address; - const char *new_poa_address; - const char* new_group_name = a->name; + const gchar *poa_address; + const gchar *new_poa_address; + const gchar * new_group_name = a->name; url = camel_url_new (old_account_info->source_url, NULL); poa_address = url->host; @@ -389,7 +389,7 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, EAccount e_source_set_property (source, "offline_sync", camel_url_get_param (url, "offline_sync") ? "1" : "0"); if (a->source->auto_check) { - char *str = g_strdup_printf ("%d", a->source->auto_check_time); + gchar *str = g_strdup_printf ("%d", a->source->auto_check_time); e_source_set_property (source, "refresh", str); g_free (str); @@ -437,9 +437,9 @@ static void remove_calendar_tasks_sources (GwAccountInfo *info) { CamelURL *url; - char *relative_uri; - const char *soap_port; - const char *poa_address; + gchar *relative_uri; + const gchar *soap_port; + const gchar *poa_address; url = camel_url_new (info->source_url, NULL); @@ -462,22 +462,22 @@ remove_calendar_tasks_sources (GwAccountInfo *info) } static GList* -get_addressbook_names_from_server (char *source_url) +get_addressbook_names_from_server (gchar *source_url) { - char *key; + gchar *key; EGwConnection *cnc; - char *password; + gchar *password; GList *book_list = NULL; - int status, count = 0; - const char *soap_port; + gint status, count = 0; + const gchar *soap_port; CamelURL *url; gboolean remember; - char *failed_auth = NULL; - char *prompt; - char *password_prompt; - char *uri; - const char *use_ssl; - const char *poa_address; + gchar *failed_auth = NULL; + gchar *prompt; + gchar *password_prompt; + gchar *uri; + const gchar *use_ssl; + const gchar *poa_address; guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET; url = camel_url_new (source_url, NULL); @@ -552,10 +552,10 @@ get_addressbook_names_from_server (char *source_url) } static void -add_proxy_sources (GwAccountInfo *info, const char *parent_name) +add_proxy_sources (GwAccountInfo *info, const gchar *parent_name) { CamelURL *url; - char *color; + gchar *color; url = camel_url_new (info->source_url, NULL); @@ -580,12 +580,12 @@ add_addressbook_sources (EAccount *account) ESourceList *list; ESourceGroup *group; ESource *source; - char *base_uri; - const char *soap_port; + gchar *base_uri; + const gchar *soap_port; GList *books_list, *temp_list; GConfClient* client; - const char* use_ssl; - const char *poa_address; + const gchar * use_ssl; + const gchar *poa_address; gboolean is_frequent_contacts = FALSE, is_writable = FALSE; url = camel_url_new (account->source->url, NULL); @@ -610,7 +610,7 @@ add_addressbook_sources (EAccount *account) if (!temp_list) return FALSE; for (; temp_list != NULL; temp_list = g_list_next (temp_list)) { - const char *book_name = e_gw_container_get_name (E_GW_CONTAINER(temp_list->data)); + const gchar *book_name = e_gw_container_get_name (E_GW_CONTAINER(temp_list->data)); /* is_writable is set to TRUE if the book has isPersonal property, * by e_gw_connection_get_address_book_list() */ @@ -673,14 +673,14 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_ GSList *groups; gboolean found_group; gboolean delete_group; - char *old_base_uri; - char *new_base_uri; - const char *soap_port; - const char *use_ssl; + gchar *old_base_uri; + gchar *new_base_uri; + const gchar *soap_port; + const gchar *use_ssl; GSList *sources; ESource *source; GConfClient *client; - const char *poa_address; + const gchar *poa_address; url = camel_url_new (existing_account_info->source_url, NULL); @@ -758,10 +758,10 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info) GSList *groups; gboolean found_group; CamelURL *url; - char *base_uri; - const char *soap_port; + gchar *base_uri; + const gchar *soap_port; GConfClient *client; - const char *poa_address; + const gchar *poa_address; url = camel_url_new (existing_account_info->source_url, NULL); if (url == NULL) { @@ -863,10 +863,10 @@ account_changed (EAccountList *account_listener, EAccount *account) { gboolean is_gw_account; CamelURL *old_url, *new_url; - const char *old_soap_port, *new_soap_port; + const gchar *old_soap_port, *new_soap_port; GwAccountInfo *existing_account_info; - const char *old_use_ssl, *new_use_ssl; - const char *old_poa_address, *new_poa_address; + const gchar *old_use_ssl, *new_use_ssl; + const gchar *old_poa_address, *new_poa_address; is_gw_account = is_groupwise_account (account); @@ -953,7 +953,7 @@ prune_proxies (void) { ESource *source; GError *err = NULL; const gchar *parent_id_name = NULL; - int i; + gint i; ECalSourceType types [] = { E_CAL_SOURCE_TYPE_EVENT, E_CAL_SOURCE_TYPE_TODO, E_CAL_SOURCE_TYPE_JOURNAL diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c index aee5e90623..71bb1ee31e 100644 --- a/plugins/groupwise-account-setup/groupwise-account-setup.c +++ b/plugins/groupwise-account-setup/groupwise-account-setup.c @@ -32,7 +32,7 @@ static CamelGwListener *config_listener = NULL; -int e_plugin_lib_enable (EPluginLib *ep, int enable); +gint e_plugin_lib_enable (EPluginLib *ep, gint enable); GtkWidget* org_gnome_gw_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); void ensure_mandatory_esource_properties (EPlugin *ep, ESEventTargetUpgrade *target); @@ -47,7 +47,7 @@ is_groupwise_account (EAccount *account) } static void -set_esource_props (const char *path, EAccount *a, GConfClient *client, const char *name) +set_esource_props (const gchar *path, EAccount *a, GConfClient *client, const gchar *name) { ESourceList *list; GSList *groups; @@ -66,7 +66,7 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha ESource *source = E_SOURCE (sources->data); if (a->source->auto_check) { - char *str = g_strdup_printf ("%d",a->source->auto_check_time); + gchar *str = g_strdup_printf ("%d",a->source->auto_check_time); e_source_set_property (source, "refresh", str); g_free (str); @@ -113,8 +113,8 @@ free_groupwise_listener ( void ) g_object_unref (config_listener); } -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { if (!config_listener) { config_listener = camel_gw_listener_new (); diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c index b6519c636e..ae0c5e1e8a 100644 --- a/plugins/groupwise-features/addressbook-groupwise.c +++ b/plugins/groupwise-features/addressbook-groupwise.c @@ -34,9 +34,9 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target) { EABConfigTargetSource *t = (EABConfigTargetSource *) target; ESource *source = t->source; - char *uri_text; + gchar *uri_text; ESourceGroup *source_group; - char *relative_uri; + gchar *relative_uri; GSList *l; uri_text = e_source_get_uri (source); diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index 29c5ed2855..c9d4ad54e4 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -57,17 +57,17 @@ struct AcceptData { void org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target); static void -install_folder_response (EMFolderSelector *emfs, int response, gpointer *data) +install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data) { struct AcceptData *accept_data = (struct AcceptData *)data; EMFolderTreeModel *model; - const char *uri, *path; - int parts = 0; + const gchar *uri, *path; + gint parts = 0; gchar **names; gchar *folder_name; gchar *parent_name; gchar *container_id; - const char *item_id; + const gchar *item_id; CamelException ex; CamelStore *store; CamelFolder *folder; @@ -106,12 +106,12 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data) if(E_IS_GW_CONNECTION (cnc)) { container_id = get_container_id (cnc, parent_name); - if(e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (char *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) { + if(e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) { folder = camel_store_get_folder (store, "Mailbox", 0, NULL); /*changes = camel_folder_change_info_new (); - camel_folder_change_info_remove_uid (changes, (char *) item_id); + camel_folder_change_info_remove_uid (changes, (gchar *) item_id); camel_folder_summary_remove_uid (folder->summary, item_id);*/ /* camel_folder_delete_message (folder, item_id); */ camel_folder_set_message_flags (folder, item_id, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED); @@ -146,7 +146,7 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data) } static void -accept_free(void *data) +accept_free(gpointer data) { struct AcceptData *accept_data = data; @@ -161,7 +161,7 @@ accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg) EMFolderTree *folder_tree; GtkWidget *dialog; struct AcceptData *accept_data; - char *uri; + gchar *uri; accept_data = g_new0(struct AcceptData, 1); model = mail_component_peek_tree_model (NULL); @@ -186,20 +186,20 @@ void org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target) { const CamelInternetAddress *from_addr = NULL; - const char *name; - const char *email; + const gchar *name; + const gchar *email; GtkWidget *window; GnomeDruid *wizard; GnomeDruidPageEdge *title_page; CamelMimeMessage *msg = (CamelMimeMessage *) target->message; CamelStreamMem *content; CamelDataWrapper *dw; - char *start_message; + gchar *start_message; if (!msg) return; - if (((char *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL + if (((gchar *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL || (from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message)) == NULL || !camel_internet_address_get(from_addr, 0, &name, &email) || (dw = camel_medium_get_content_object (CAMEL_MEDIUM (msg))) == NULL) { diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index 3e7d522c19..aa8c96368d 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -52,7 +52,7 @@ abort_changes (JunkSettings *js) } static void -junk_dialog_response (GtkWidget *dialog, int response, JunkSettings *js) +junk_dialog_response (GtkWidget *dialog, gint response, JunkSettings *js) { if (response == GTK_RESPONSE_ACCEPT) { commit_changes(js); @@ -66,11 +66,11 @@ junk_dialog_response (GtkWidget *dialog, int response, JunkSettings *js) } static void -junk_mail_settings (EPopup *ep, EPopupItem *item, void *data) +junk_mail_settings (EPopup *ep, EPopupItem *item, gpointer data) { GtkWidget *dialog ,*w, *notebook, *box; JunkSettings *junk_tab; - int page_count =0; + gint page_count =0; EGwConnection *cnc; gchar *msg; CamelFolder *folder = (CamelFolder *)data; @@ -118,7 +118,7 @@ static EPopupItem popup_items[] = { }; static void -popup_free (EPopup *ep, GSList *items, void *data) +popup_free (EPopup *ep, GSList *items, gpointer data) { g_slist_free (items); } @@ -128,8 +128,8 @@ org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t) { GSList *menus = NULL; - int i = 0; - static int first = 0; + gint i = 0; + static gint first = 0; if (! g_strrstr (t->uri, "groupwise://")) return ; diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index 3d66a1c518..cc735feee1 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -35,7 +35,7 @@ struct _JunkEntry { EGwJunkEntry *entry; - int flag; + gint flag; }; typedef struct _JunkEntry JunkEntry; @@ -175,9 +175,9 @@ static void get_junk_list (JunkSettings *js) { GList *list = NULL; - char *entry; - char *msg; - int use_junk, use_block, use_pab, persistence; + gchar *entry; + gchar *msg; + gint use_junk, use_block, use_pab, persistence; if (E_IS_GW_CONNECTION (js->cnc)) { if (e_gw_connection_get_junk_settings (js->cnc, &use_junk, &use_block, &use_pab, &persistence) == E_GW_CONNECTION_STATUS_OK) { @@ -227,7 +227,7 @@ commit_changes (JunkSettings *js) GList *node = NULL; JunkEntry *junk_entry = NULL; EGwJunkEntry *entry; - int use_junk, use_pab, use_block, persistence; + gint use_junk, use_pab, use_block, persistence; for (node = js->junk_list; node; node = node->next) { @@ -301,8 +301,8 @@ disable_clicked (GtkRadioButton *button, JunkSettings *js) static void add_clicked(GtkButton *button, JunkSettings *js) { - const char *email = NULL; - const char *self_email = NULL; + const gchar *email = NULL; + const gchar *self_email = NULL; JunkEntry *new_entry = NULL; EGwJunkEntry *junk_entry = NULL; gchar *msg = NULL; @@ -372,7 +372,7 @@ static void junk_settings_construct (JunkSettings *js) { GladeXML *xml; - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "junk-settings.glade", diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index cf039931a5..7007ba5760 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -36,19 +36,19 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t); -static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data) +static void retract_mail_settings (EPopup *ep, EPopupItem *item, gpointer data) { EGwConnection *cnc; CamelFolder *folder = (CamelFolder *)data; CamelStore *store = folder->parent_store; - char *id; + gchar *id; GtkWidget *confirm_dialog, *confirm_warning; - int n; + gint n; cnc = get_cnc (store); if (cnc && E_IS_GW_CONNECTION(cnc)) { - id = (char *)item->user_data; + id = (gchar *)item->user_data; confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, @@ -87,7 +87,7 @@ static EPopupItem popup_items[] = { { 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) +static void popup_free (EPopup *ep, GSList *items, gpointer data) { g_slist_free (items); } @@ -96,8 +96,8 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t) { GSList *menus = NULL; GPtrArray *uids; - int i = 0; - static int first = 0; + gint i = 0; + static gint first = 0; uids = t->uids; if (g_strrstr (t->uri, "groupwise://") && !g_ascii_strcasecmp((t->folder)->full_name, "Sent Items")) { @@ -105,7 +105,7 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t) /* for translation*/ if (!first) { popup_items[1].label = _(popup_items[1].label); - popup_items[1].user_data = g_strdup((char *) g_ptr_array_index(uids, 0)); + popup_items[1].user_data = g_strdup((gchar *) g_ptr_array_index(uids, 0)); } first++; diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c index 7954f9e1a4..05b3452091 100644 --- a/plugins/groupwise-features/mail-send-options.c +++ b/plugins/groupwise-features/mail-send-options.c @@ -46,7 +46,7 @@ static ESendOptionsDialog * dialog = NULL ; void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t); static time_t -add_day_to_time (time_t time, int days) +add_day_to_time (time_t time, gint days) { struct tm *tm; @@ -61,8 +61,8 @@ static void feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data) { EMsgComposer *comp; - char value [100]; - char *temp = NULL; + gchar value [100]; + gchar *temp = NULL; comp = (EMsgComposer *) data; /* we are bothered only for ok response: other cases are handled generally*/ @@ -145,7 +145,7 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t) EMsgComposer *comp = (struct _EMsgComposer *)t->composer ; EComposerHeaderTable *table; EAccount *account = NULL; - char *temp = NULL; + gchar *temp = NULL; table = e_msg_composer_get_header_table (comp); account = e_composer_header_table_get_account (table); diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index 67123decf4..57eba9392c 100644 --- a/plugins/groupwise-features/process-meeting.c +++ b/plugins/groupwise-features/process-meeting.c @@ -44,10 +44,10 @@ ECalendarView *c_view; void org_gnome_accept(EPlugin *ep, ECalPopupTargetSelect *target); void org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target); -static void on_accept_meeting (EPopup *ep, EPopupItem *pitem, void *data); -static void on_accept_meeting_tentative (EPopup *ep, EPopupItem *pitem, void *data); -static void on_decline_meeting (EPopup *ep, EPopupItem *pitem, void *data); -static void on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data); +static void on_accept_meeting (EPopup *ep, EPopupItem *pitem, gpointer data); +static void on_accept_meeting_tentative (EPopup *ep, EPopupItem *pitem, gpointer data); +static void on_decline_meeting (EPopup *ep, EPopupItem *pitem, gpointer data); +static void on_resend_meeting (EPopup *ep, EPopupItem *pitem, gpointer data); static EPopupItem popup_items[] = { { 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}, @@ -56,7 +56,7 @@ static EPopupItem popup_items[] = { }; static void -popup_free (EPopup *ep, GSList *items, void *data) +popup_free (EPopup *ep, GSList *items, gpointer data) { g_slist_free (items); items = NULL; @@ -67,9 +67,9 @@ org_gnome_accept (EPlugin *ep, ECalPopupTargetSelect *target) { GSList *menus = NULL; GList *selected; - int i = 0; - static int first = 0; - const char *uri = NULL; + gint i = 0; + static gint first = 0; + const gchar *uri = NULL; ECalendarView *cal_view = E_CALENDAR_VIEW (target->target.widget); c_view = cal_view; @@ -135,7 +135,7 @@ receive_objects (gpointer data) } static icalproperty * -find_attendee (icalcomponent *ical_comp, const char *address) +find_attendee (icalcomponent *ical_comp, const gchar *address) { icalproperty *prop; @@ -146,8 +146,8 @@ find_attendee (icalcomponent *ical_comp, const char *address) prop != NULL; prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) { icalvalue *value; - const char *attendee; - char *text; + const gchar *attendee; + gchar *text; value = icalproperty_get_value (prop); if (!value) @@ -167,7 +167,7 @@ find_attendee (icalcomponent *ical_comp, const char *address) return prop; } static void -change_status (icalcomponent *ical_comp, const char *address, icalparameter_partstat status) +change_status (icalcomponent *ical_comp, const gchar *address, icalparameter_partstat status) { icalproperty *prop; @@ -206,7 +206,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status) gboolean recurring = FALSE; GThread *thread = NULL; GError *error = NULL; - char *address = NULL; + gchar *address = NULL; e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); address = itip_get_comp_attendee (comp, event->comp_data->client); @@ -226,7 +226,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status) if (recurring) { gint response; - const char *msg; + const gchar *msg; if (status == ICAL_PARTSTAT_ACCEPTED || status == ICAL_PARTSTAT_TENTATIVE) msg = "org.gnome.evolution.process_meeting:recurrence-accept"; @@ -236,7 +236,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status) response = e_error_run (NULL, msg, NULL); if (response == GTK_RESPONSE_YES) { icalproperty *prop; - const char *uid = icalcomponent_get_uid (r_data->icalcomp); + const gchar *uid = icalcomponent_get_uid (r_data->icalcomp); prop = icalproperty_new_x ("All"); icalproperty_set_x_name (prop, "X-GW-RECUR-INSTANCES-MOD-TYPE"); @@ -263,14 +263,14 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status) /*FIXME the data does not give us the ECalendarView object. we should remove the global c_view variable once we get it from the data*/ static void -on_accept_meeting (EPopup *ep, EPopupItem *pitem, void *data) +on_accept_meeting (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = c_view; process_meeting (cal_view, ICAL_PARTSTAT_ACCEPTED); } static void -on_accept_meeting_tentative (EPopup *ep, EPopupItem *pitem, void *data) +on_accept_meeting_tentative (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = c_view; @@ -278,7 +278,7 @@ on_accept_meeting_tentative (EPopup *ep, EPopupItem *pitem, void *data) } static void -on_decline_meeting (EPopup *ep, EPopupItem *pitem, void *data) +on_decline_meeting (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = c_view; @@ -289,8 +289,8 @@ static gboolean is_meeting_owner (ECalComponent *comp, ECal *client) { ECalComponentOrganizer org; - char *email = NULL; - const char *strip = NULL; + gchar *email = NULL; + const gchar *strip = NULL; gboolean ret_val = FALSE; if (!(e_cal_component_has_attendees (comp) && @@ -327,9 +327,9 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target) { GSList *menus = NULL; GList *selected; - int i = 0; - static int first = 0; - const char *uri = NULL; + gint i = 0; + static gint first = 0; + const gchar *uri = NULL; ECalendarView *cal_view = E_CALENDAR_VIEW (target->target.widget); ECalComponent *comp = NULL; ECalendarViewEvent *event = NULL; @@ -373,7 +373,7 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target) } static void -add_retract_data (ECalComponent *comp, const char *retract_comment, CalObjModType mod) +add_retract_data (ECalComponent *comp, const gchar *retract_comment, CalObjModType mod) { icalcomponent *icalcomp = NULL; icalproperty *icalprop = NULL; @@ -415,8 +415,8 @@ retract_object (gpointer val) ThreadData *data = val; icalcomponent *icalcomp = NULL, *mod_comp = NULL; GList *users = NULL; - char *rid = NULL; - const char *uid; + gchar *rid = NULL; + const gchar *uid; GError *error = NULL; add_retract_data (data->comp, NULL, data->mod); @@ -459,7 +459,7 @@ static void object_created_cb (CompEditor *ce, gpointer data) { GThread *thread = NULL; - int response; + gint response; GError *error = NULL; gtk_widget_hide (GTK_WIDGET (ce)); @@ -478,7 +478,7 @@ object_created_cb (CompEditor *ce, gpointer data) } static void -on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data) +on_resend_meeting (EPopup *ep, EPopupItem *pitem, gpointer data) { ECalendarView *cal_view = c_view; GList *selected; @@ -492,7 +492,7 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data) CalObjModType mod = CALOBJ_MOD_THIS; ThreadData *data = NULL; gint response; - const char *msg; + const gchar *msg; /* inserting the boolean to share the code between resend and retract */ gboolean resend = TRUE; @@ -521,7 +521,7 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data) if (resend) { guint flags = 0; - char *new_uid = NULL; + gchar *new_uid = NULL; CompEditor *ce; icalcomponent *icalcomp; diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index ebcf068bf0..29c6545f01 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -69,7 +69,7 @@ struct _proxyLoginPrivate { /*Tree View*/ GtkTreeView *tree; - char *help_section; + gchar *help_section; }; static void @@ -175,12 +175,12 @@ proxy_login_new (void) } static int -proxy_get_password (EAccount *account, char **user_name, char **password) +proxy_get_password (EAccount *account, gchar **user_name, gchar **password) { const gchar *failed_auth; - char *uri, *key, *prompt; + gchar *uri, *key, *prompt; CamelURL *url; - const char *poa_address, *use_ssl = NULL, *soap_port; + const gchar *poa_address, *use_ssl = NULL, *soap_port; url = camel_url_new (account->source->url, NULL); if (url == NULL) @@ -223,8 +223,8 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent) EGwConnection *cnc; CamelURL *url; const gchar *failed_auth; - char *uri = NULL, *key = NULL, *prompt = NULL, *password = NULL; - const char *use_ssl = NULL, *soap_port; + gchar *uri = NULL, *key = NULL, *prompt = NULL, *password = NULL; + const gchar *use_ssl = NULL, *soap_port; gboolean remember; url = camel_url_new (account->source->url, NULL); @@ -259,7 +259,7 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent) g_free (prompt); cnc = e_gw_connection_new (uri, url->user, password); if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) { - char *http_uri = g_strconcat ("http://", uri + 8, NULL); + gchar *http_uri = g_strconcat ("http://", uri + 8, NULL); cnc = e_gw_connection_new (http_uri, url->user, password); g_free (http_uri); } @@ -278,11 +278,11 @@ proxy_login_cb (GtkDialog *dialog, gint state) { GtkWidget *account_name_tbox; proxyLoginPrivate *priv; - char *proxy_name; + gchar *proxy_name; priv = pld->priv; account_name_tbox = glade_xml_get_widget (priv->xml, "account_name"); - proxy_name = g_strdup ((char *) gtk_entry_get_text ((GtkEntry *) account_name_tbox)); + proxy_name = g_strdup ((gchar *) gtk_entry_get_text ((GtkEntry *) account_name_tbox)); switch (state) { case GTK_RESPONSE_OK: @@ -302,18 +302,18 @@ proxy_login_cb (GtkDialog *dialog, gint state) } static void -proxy_soap_login (char *email) +proxy_soap_login (gchar *email) { EAccountList *accounts = mail_config_get_accounts(); EAccount *srcAccount; EAccount *dstAccount; EGwConnection *proxy_cnc, *cnc; CamelURL *uri = NULL, *parent = NULL ; - char *password = NULL, *user_name = NULL; - char *proxy_source_url = NULL, *parent_source_url = NULL ; - char *name; - int i; - int permissions = 0; + gchar *password = NULL, *user_name = NULL; + gchar *proxy_source_url = NULL, *parent_source_url = NULL ; + gchar *name; + gint i; + gint permissions = 0; for (i=0; email[i]!='\0' && email[i]!='@' ; i++); if (email[i]=='@') @@ -374,11 +374,11 @@ proxy_soap_login (char *email) static void -proxy_login_add_new_store (char *uri, CamelStore *store, void *user_data) +proxy_login_add_new_store (gchar *uri, CamelStore *store, gpointer user_data) { MailComponent *component = mail_component_peek (); EAccount *account = user_data; - int permissions = GPOINTER_TO_INT(g_object_get_data ((GObject *)account, "permissions")); + gint permissions = GPOINTER_TO_INT(g_object_get_data ((GObject *)account, "permissions")); if (store == NULL) return; @@ -398,7 +398,7 @@ proxy_login_tree_view_changed_cb(GtkDialog *dialog) GtkTreeIter iter; GtkWidget *account_name_tbox; GtkTreeModel *model; - char *account_mailid; + gchar *account_mailid; account_select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree)); gtk_tree_selection_get_selected (account_select, &model, &iter); @@ -436,11 +436,11 @@ static void proxy_login_update_tree (void) { GtkTreeIter iter; - int i,n; + gint i,n; GdkPixbuf *broken_image = NULL; GList *proxy_list = NULL; - char *proxy_name; - char *proxy_email; + gchar *proxy_name; + gchar *proxy_email; EGwConnection *cnc; proxyLoginPrivate *priv = pld->priv; gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG); @@ -471,12 +471,12 @@ proxy_login_update_tree (void) } void -org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, void *data) +org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, gpointer data) { - char *uri = data; + gchar *uri = data; proxyLoginPrivate *priv; EGwConnection *cnc; - char *gladefile; + gchar *gladefile; /* This pops-up the password dialog in case the User has forgot-passwords explicitly */ cnc = proxy_login_get_cnc (mail_config_get_account_by_source_url (uri), NULL); @@ -513,7 +513,7 @@ static EPopupItem popup_items[] = { }; static void -popup_free (EPopup *ep, GSList *items, void *data) +popup_free (EPopup *ep, GSList *items, gpointer data) { g_slist_free (items); } @@ -523,7 +523,7 @@ org_gnome_create_proxy_login_option (EPlugin *ep, EMPopupTargetFolder *t) { EAccount *account; GSList *menus = NULL; - int i; + gint i; account = mail_config_get_account_by_source_url (t->uri); if (g_strrstr (t->uri,"groupwise://") && !account->parent_uid) { diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h index 24717f8cc7..47c2b3b901 100644 --- a/plugins/groupwise-features/proxy-login.h +++ b/plugins/groupwise-features/proxy-login.h @@ -53,13 +53,13 @@ struct _proxyLoginClass { GType proxy_login_get_type (void); proxyLogin * proxy_login_new (void); static void proxy_login_cb (GtkDialog *dialog, gint state); -static void proxy_login_add_new_store (char *uri, CamelStore *store, void *user_data); +static void proxy_login_add_new_store (gchar *uri, CamelStore *store, gpointer user_data); static void proxy_login_setup_tree_view (void); -void org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, void *data); +void org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, gpointer data); proxyLogin* proxy_dialog_new (void); -static void proxy_soap_login (char *email); -char *parse_email_for_name (char *email); +static void proxy_soap_login (gchar *email); +gchar *parse_email_for_name (gchar *email); static void proxy_login_update_tree (void); static void proxy_login_tree_view_changed_cb(GtkDialog *dialog); void org_gnome_create_proxy_login_option(EPlugin *ep, EMPopupTargetFolder *t); -static int proxy_get_password (EAccount *account, char **user_name, char **password); +static gint proxy_get_password (EAccount *account, gchar **user_name, gchar **password); diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 7ab0095dbf..6a18348002 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -62,7 +62,7 @@ static GObjectClass *parent_class = NULL; -static gboolean proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account); +static gboolean proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, gint num, EAccount *account); struct _proxyDialogPrivate { /* Glade XML data for the Add/Edit Proxy dialog*/ @@ -94,7 +94,7 @@ struct _proxyDialogPrivate { GtkWidget *notifications; GtkWidget *options; GtkWidget *private; - char *help_section; + gchar *help_section; GList *proxy_list; }; @@ -254,7 +254,7 @@ proxy_dialog_new (void) static int proxy_get_permissions_from_dialog (EAccount *account) { - int permissions; + gint permissions; proxyDialogPrivate *priv; proxyDialog *prd = NULL; @@ -309,7 +309,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog) GtkTreeModel *model; proxyHandler *new_proxy = NULL; proxyDialogPrivate *priv; - char *account_mailid; + gchar *account_mailid; proxyDialog *prd = NULL; prd = g_object_get_data ((GObject *)account, "prd"); @@ -322,7 +322,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog) ENameSelectorEntry *name_selector_entry; EDestinationStore *destination_store; GList *destinations, *tmp; - char *name, *email; + gchar *name, *email; GList *existing_list; name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, "Add User"); destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY ( @@ -337,7 +337,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog) for (; tmp != NULL; tmp = g_list_next (tmp)) { email = NULL; - email = (char *)e_destination_get_email (tmp->data); + email = (gchar *)e_destination_get_email (tmp->data); if (g_str_equal(email, "")) continue; @@ -376,12 +376,12 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog) for (; tmp != NULL; tmp = g_list_next (tmp)) { name = NULL; email = NULL; - email = (char *) e_destination_get_email (tmp->data); + email = (gchar *) e_destination_get_email (tmp->data); if (g_str_equal(email, "")) continue; - name = (char *) e_destination_get_name (tmp->data); + name = (gchar *) e_destination_get_name (tmp->data); new_proxy = (proxyHandler *) g_malloc0 (sizeof (proxyHandler)); if (name) @@ -460,9 +460,9 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window) { EGwConnection *cnc; const gchar *failed_auth; - char *uri, *key, *prompt, *password = NULL; + gchar *uri, *key, *prompt, *password = NULL; CamelURL *url; - const char *poa_address, *use_ssl, *soap_port; + const gchar *poa_address, *use_ssl, *soap_port; gboolean remember; url = camel_url_new (account->source->url, NULL); @@ -498,7 +498,7 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window) cnc = e_gw_connection_new (uri, url->user, password); if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) { - char *http_uri = g_strconcat ("http://", uri + 8, NULL); + gchar *http_uri = g_strconcat ("http://", uri + 8, NULL); cnc = e_gw_connection_new (http_uri, url->user, password); g_free (http_uri); } @@ -640,8 +640,8 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data) proxyDialogPrivate *priv; CamelOfflineStore *store; CamelException ex; - int pag_num; - char *gladefile; + gint pag_num; + gchar *gladefile; target_account = (EMConfigTargetAccount *)data->config->target; account = target_account->account; @@ -723,7 +723,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data) } static gboolean -proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account) +proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, gint num, EAccount *account) { proxyDialog *prd; proxyDialogPrivate *priv; @@ -823,7 +823,7 @@ proxy_edit_ok (GtkWidget *button, EAccount *account) } static proxyHandler * -proxy_get_item_from_list (EAccount *account, char *account_name) +proxy_get_item_from_list (EAccount *account, gchar *account_name) { proxyDialogPrivate *priv; proxyDialog *prd = NULL; @@ -852,7 +852,7 @@ proxy_remove_account (GtkWidget *button, EAccount *account) proxyDialogPrivate *priv; proxyHandler *deleted; GtkTreeSelection* account_select; - char *account_mailid; + gchar *account_mailid; proxyDialog *prd = NULL; prd = g_object_get_data ((GObject *)account, "prd"); @@ -906,7 +906,7 @@ proxy_add_account (GtkWidget *button, EAccount *account) ENameSelectorEntry *name_selector_entry; GtkWidget *proxy_name, *name_box; proxyDialog *prd = NULL; - char *gladefile; + gchar *gladefile; prd = g_object_get_data ((GObject *)account, "prd"); priv = prd->priv; @@ -1004,10 +1004,10 @@ proxy_edit_account (GtkWidget *button, EAccount *account) GtkTreeSelection* account_select; proxyHandler *edited; GtkButton *okButton, *proxyCancel; - char *account_mailid; + gchar *account_mailid; GtkWidget *contacts; proxyDialog *prd = NULL; - char *gladefile; + gchar *gladefile; prd = g_object_get_data ((GObject *)account, "prd"); priv = prd->priv; diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h index c2bd933db4..ca1b651f2c 100644 --- a/plugins/groupwise-features/proxy.h +++ b/plugins/groupwise-features/proxy.h @@ -61,6 +61,6 @@ static void proxy_edit_account (GtkWidget *button, EAccount *account); void proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data); void proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data); static void proxy_setup_meta_tree_view (EAccount *account); -static proxyHandler *proxy_get_item_from_list (EAccount *account, char *account_name); +static proxyHandler *proxy_get_item_from_list (EAccount *account, gchar *account_name); static void proxy_load_edit_dialog (EAccount *account, proxyHandler *edited); void free_proxy_list (GList *proxy_list); diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index 33f1dd2cb4..a739571b83 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -56,9 +56,9 @@ get_cnc (GtkWindow *parent_window) { EGwConnection *cnc; const gchar *failed_auth; - char *uri, *key, *prompt, *password = NULL; + gchar *uri, *key, *prompt, *password = NULL; CamelURL *url; - const char *poa_address, *use_ssl, *soap_port; + const gchar *poa_address, *use_ssl, *soap_port; gboolean remember; url = camel_url_new (account->source->url, NULL); @@ -94,7 +94,7 @@ get_cnc (GtkWindow *parent_window) cnc = e_gw_connection_new (uri, url->user, password); if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) { - char *http_uri = g_strconcat ("http://", uri + 8, NULL); + gchar *http_uri = g_strconcat ("http://", uri + 8, NULL); cnc = e_gw_connection_new (http_uri, url->user, password); g_free (http_uri); } @@ -122,7 +122,7 @@ e_send_options_load_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGene gopts->delay_enabled = ggopts->delay_enabled; - /* TODO convert int to timet comparing the current day */ + /* TODO convert gint to timet comparing the current day */ if (ggopts->delay_until) { gopts->delay_until = time_add_day_with_zone (temp, ggopts->delay_until, NULL); } else @@ -273,7 +273,7 @@ e_send_options_copy_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGene ggopts->delay_enabled = gopts->delay_enabled; if (gopts->delay_until) { - int diff; + gint diff; icaltimetype temp, current; temp = icaltime_from_timet (gopts->delay_until, 0); @@ -361,14 +361,14 @@ static ESource * get_source (ESourceList *list) { GSList *p, *l; - char **temp = g_strsplit (account->source->url, ";", -1); - char *uri = temp [0]; + gchar **temp = g_strsplit (account->source->url, ";", -1); + gchar *uri = temp [0]; l = e_source_list_peek_groups (list); for (p = l; p != NULL; p = p->next) { - char *so_uri; + gchar *so_uri; GSList *r, *s; ESourceGroup *group = E_SOURCE_GROUP (p->data); @@ -398,7 +398,7 @@ add_return_value (EGwSendOptionsReturnNotify track, ESource *source, const gchar *notify) { - char *value; + gchar *value; switch (track) { case E_GW_RETURN_NOTIFY_MAIL: @@ -415,8 +415,8 @@ add_return_value (EGwSendOptionsReturnNotify track, static void put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOptionsStatusTracking *sopts) { - char *value; - const char *val; + gchar *value; + const gchar *val; icaltimetype tt; CamelURL *url; diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 74ca71fbb4..c7c315c7f0 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -62,8 +62,8 @@ struct ShareInfo { GtkWidget * org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); void org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *target); -static void create_shared_folder(EPopup *ep, EPopupItem *p, void *data); -static void popup_free (EPopup *ep, GSList *items, void *data); +static void create_shared_folder(EPopup *ep, EPopupItem *p, gpointer data); +static void popup_free (EPopup *ep, GSList *items, gpointer data); void shared_folder_commit (EPlugin *ep, EConfigTarget *tget); void shared_folder_abort (EPlugin *ep, EConfigTarget *target); @@ -126,16 +126,16 @@ struct _EMCreateFolder { /* input data */ CamelStore *store; - char *full_name; - char *parent; - char *name; + gchar *full_name; + gchar *parent; + gchar *name; /* output data */ CamelFolderInfo *fi; /* callback data */ - void (* done) (struct _EMCreateFolder *m, void *user_data); - void *user_data; + void (* done) (struct _EMCreateFolder *m, gpointer user_data); + gpointer user_data; }; static gchar * @@ -194,7 +194,7 @@ static MailMsgInfo create_folder_info = { }; static void -new_folder_created_cb (struct _EMCreateFolder *m, void *user_data) +new_folder_created_cb (struct _EMCreateFolder *m, gpointer user_data) { struct ShareInfo *ssi = (struct ShareInfo *) user_data; EMFolderSelector *emfs = ssi->emfs; @@ -208,12 +208,12 @@ new_folder_created_cb (struct _EMCreateFolder *m, void *user_data) } static int -create_folder (CamelStore *store, const char *full_name, void (* done) (struct _EMCreateFolder *m, void *user_data), void *user_data) +create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct _EMCreateFolder *m, gpointer user_data), gpointer user_data) { - char *name, *namebuf = NULL; + gchar *name, *namebuf = NULL; struct _EMCreateFolder *m; - const char *parent; - int id; + const gchar *parent; + gint id; namebuf = g_strdup (full_name); if (!(name = strrchr (namebuf, '/'))) { @@ -240,11 +240,11 @@ create_folder (CamelStore *store, const char *full_name, void (* done) (struct _ } static void -users_dialog_response(GtkWidget *dialog, int response, struct ShareInfo *ssi) +users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi) { struct _EMFolderTreeModelStoreInfo *si; EMFolderSelector *emfs = ssi->emfs; - const char *uri, *path; + const gchar *uri, *path; CamelException ex; CamelStore *store; @@ -291,12 +291,12 @@ users_dialog_response(GtkWidget *dialog, int response, struct ShareInfo *ssi) } static void -new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *model) +new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *model) { GtkWidget *users_dialog; GtkWidget *w; struct ShareInfo *ssi; - const char *uri; + const gchar *uri; EGwConnection *cnc; CamelException ex; CamelStore *store; @@ -341,7 +341,7 @@ static EPopupItem popup_items[] = { }; static void -popup_free (EPopup *ep, GSList *items, void *data) +popup_free (EPopup *ep, GSList *items, gpointer data) { g_slist_free (items); } @@ -350,8 +350,8 @@ void org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *t) { GSList *menus = NULL; - int i = 0; - static int first = 0; + gint i = 0; + static gint first = 0; if (! g_strrstr (t->uri, "groupwise://")) @@ -373,13 +373,13 @@ org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *t) } static void -create_shared_folder(EPopup *ep, EPopupItem *p, void *data) +create_shared_folder(EPopup *ep, EPopupItem *p, gpointer data) { EMFolderTreeModel *model; EMFolderTree *folder_tree; GtkWidget *dialog ; - char *uri; + gchar *uri; model = mail_component_peek_tree_model (mail_component_peek ()); folder_tree = (EMFolderTree *) em_folder_tree_new_with_model (model); @@ -457,8 +457,8 @@ EGwConnection * get_cnc (CamelStore *store) { EGwConnection *cnc; - const char *uri, *property_value, *server_name, *user, *port; - char *use_ssl; + const gchar *uri, *property_value, *server_name, *user, *port; + gchar *use_ssl; CamelService *service; CamelURL *url; @@ -485,7 +485,7 @@ get_cnc (CamelStore *store) cnc = e_gw_connection_new (uri, user, service->url->passwd); if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) { - char *http_uri = g_strconcat ("http://", uri + 8, NULL); + gchar *http_uri = g_strconcat ("http://", uri + 8, NULL); cnc = e_gw_connection_new (http_uri, user, service->url->passwd); g_free (http_uri); } @@ -503,7 +503,7 @@ get_container_id(EGwConnection *cnc, const gchar *fname) gchar *id = NULL; gchar *name; gchar **names; - int i = 0, parts = 0; + gint i = 0, parts = 0; names = g_strsplit (fname, "/", -1); if(names){ diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 382cf75124..2b12d4be9b 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -37,7 +37,7 @@ struct _SharedUser { EShUsers *user_node; - int flag; + gint flag; }; typedef struct _SharedUser SharedUser; @@ -321,8 +321,8 @@ not_shared_clicked (GtkRadioButton *button, ShareFolder *sf) static void add_clicked(GtkButton *button, ShareFolder *sf) { - const char *email = NULL; - const char *self_email = NULL; + const gchar *email = NULL; + const gchar *self_email = NULL; SharedUser *new_user = NULL; EShUsers *usr = NULL; gint rights = 0; @@ -513,7 +513,7 @@ notification_clicked(GtkButton *button, ShareFolder *sf) GtkButton *not_ok; GtkButton *not_cancel; GtkWidget *vbox; - char *gladefile; + gchar *gladefile; sf->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_type_hint (GTK_WINDOW (sf->window), GDK_WINDOW_TYPE_HINT_DIALOG); @@ -580,7 +580,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) gboolean right = FALSE; SharedUser *usr = NULL; EShUsers *user = NULL; - char *email = NULL; + gchar *email = NULL; GtkTreePath *path = NULL; path = gtk_tree_path_new_from_string (arg1); @@ -613,7 +613,7 @@ edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) gboolean right = FALSE; SharedUser *usr = NULL; EShUsers *user = NULL; - char *email = NULL; + gchar *email = NULL; GtkTreePath *path = NULL; path = gtk_tree_path_new_from_string (arg1); @@ -647,7 +647,7 @@ delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) gboolean right = FALSE; SharedUser *usr = NULL; EShUsers *user = NULL; - char *email = NULL; + gchar *email = NULL; GtkTreePath *path = NULL; path = gtk_tree_path_new_from_string (arg1); @@ -682,7 +682,7 @@ share_folder_construct (ShareFolder *sf) ENameSelectorModel *name_selector_model; ENameSelectorEntry *name_selector_entry; GtkWidget *box; - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "properties.glade", diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index a465752c95..2569cbebd7 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -43,14 +43,14 @@ #include "share-folder.h" -void org_gnome_track_status (void *ep, EMPopupTargetSelect *t); +void org_gnome_track_status (gpointer ep, EMPopupTargetSelect *t); -static char * -format_date (const char * value) +static gchar * +format_date (const gchar * value) { time_t time; time_t actual_time; - char *str; + gchar *str; time = e_gw_connection_get_date_from_string (value); actual_time = camel_header_decode_date (ctime(&time), NULL); @@ -61,12 +61,12 @@ format_date (const char * value) } static void -track_status (EPopup *ep, EPopupItem *item, void *data) +track_status (EPopup *ep, EPopupItem *item, gpointer data) { EMPopupTargetSelect *t = (EMPopupTargetSelect *)data; CamelMimeMessage *msg = NULL ; const CamelInternetAddress *from ; - const char *namep, *addp ; + const gchar *namep, *addp ; GtkDialog *d ; GtkTable *table ; @@ -75,11 +75,11 @@ track_status (EPopup *ep, EPopupItem *item, void *data) GtkVBox *vbox; time_t time ; - char *time_str ; + gchar *time_str ; gchar *boldmsg; - int row = 0; + gint row = 0; EGwConnection *cnc; EGwItem *gwitem; @@ -242,17 +242,17 @@ static EPopupItem popup_items[] = { }; static void -popup_free (EPopup *ep, GSList *items, void *data) +popup_free (EPopup *ep, GSList *items, gpointer data) { g_slist_free (items); } -void org_gnome_track_status (void *ep, EMPopupTargetSelect *t) +void org_gnome_track_status (gpointer ep, EMPopupTargetSelect *t) { GSList *menus = NULL; - int i = 0; - static int first = 0; + gint i = 0; + static gint first = 0; if (! g_strrstr (t->uri, "groupwise://") || g_ascii_strncasecmp ((t->folder)->full_name, "Sent Items", 10)) return; diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index 1094bec34b..966abd114f 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -41,9 +41,9 @@ struct _CamelHulaListenerPrivate { }; struct _HulaAccountInfo { - char *uid; - char *name; - char *source_url; + gchar *uid; + gchar *name; + gchar *source_url; }; typedef struct _HulaAccountInfo HulaAccountInfo; @@ -144,11 +144,11 @@ is_hula_caldav_account (EAccount *account) /* looks up for an existing hula account info in the hula_accounts list based on uid */ static HulaAccountInfo* -lookup_account_info (const char *key) +lookup_account_info (const gchar *key) { GList *list; HulaAccountInfo *info ; - int found = 0; + gint found = 0; if (!key) return NULL; @@ -170,7 +170,7 @@ lookup_account_info (const char *key) #define SELECTED_CALENDARS "/apps/evolution/calendar/display/selected_calendars" static void -add_esource (const char *conf_key, const char *group_name, const char *source_name, CamelURL *url) +add_esource (const gchar *conf_key, const gchar *group_name, const gchar *source_name, CamelURL *url) { ESourceList *source_list; ESourceGroup *group; @@ -178,10 +178,10 @@ add_esource (const char *conf_key, const char *group_name, const char *source_n GConfClient *client; GSList *ids, *temp ; gboolean result; - char *source_selection_key; - char *relative_uri; - const char *cal_port = "8081"; - /* const char *use_ssl = ""; */ + gchar *source_selection_key; + gchar *relative_uri; + const gchar *cal_port = "8081"; + /* const gchar *use_ssl = ""; */ /* offline_sync to come soon */ /* TODO use_ssl = camel_url_get_param (url, "use_ssl"); */ @@ -237,7 +237,7 @@ add_esource (const char *conf_key, const char *group_name, const char *source_n static void -remove_esource (const char *conf_key, const char *group_name, char* source_name, const char* relative_uri) +remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_name, const gchar * relative_uri) { ESourceList *list; GSList *groups; @@ -245,7 +245,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; + gchar *source_selection_key; client = gconf_client_get_default(); list = e_source_list_new_for_gconf (client, conf_key); @@ -305,11 +305,11 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name, /* looks for e-source with the same info as old_account_info and changes its values to the values passed in */ static void -modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const char* new_group_name, CamelURL *new_url) +modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const gchar * new_group_name, CamelURL *new_url) { ESourceList *list; GSList *groups; - char *old_relative_uri; + gchar *old_relative_uri; CamelURL *url; gboolean found_group; GConfClient* client; @@ -388,9 +388,9 @@ static void remove_calendar_sources (HulaAccountInfo *info) { CamelURL *url; - char *relative_uri; - const char *address; - const char *caldav_port; + gchar *relative_uri; + const gchar *address; + const gchar *caldav_port; url = camel_url_new (info->source_url, NULL); @@ -463,10 +463,10 @@ account_changed (EAccountList *account_listener, EAccount *account) { gboolean is_hula; CamelURL *old_url, *new_url; - const char *old_caldav_port, *new_caldav_port; + const gchar *old_caldav_port, *new_caldav_port; HulaAccountInfo *existing_account_info; - const char *old_use_ssl, *new_use_ssl; - const char *old_address, *new_address; + const gchar *old_use_ssl, *new_use_ssl; + const gchar *old_address, *new_address; is_hula = is_hula_account (account); if (is_hula == FALSE) diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c index 84a7a4127c..29b334f115 100644 --- a/plugins/hula-account-setup/hula-account-setup.c +++ b/plugins/hula-account-setup/hula-account-setup.c @@ -27,7 +27,7 @@ static CamelHulaListener *config_listener = NULL; -int e_plugin_lib_enable (EPluginLib *ep, int enable); +gint e_plugin_lib_enable (EPluginLib *ep, gint enable); GtkWidget* org_gnome_evolution_hula_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); static void @@ -36,8 +36,8 @@ free_hula_listener ( void ) g_object_unref (config_listener); } -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { if (!config_listener) { config_listener = camel_hula_listener_new (); diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index c33a02bdef..64f64dc16a 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -135,7 +135,7 @@ imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data) /* return true is the header is considered valid */ static gboolean -epif_header_is_valid (const char *header) +epif_header_is_valid (const gchar *header) { gint len = g_utf8_strlen (header, -1); @@ -150,7 +150,7 @@ epif_header_is_valid (const char *header) static void epif_add_sensitivity (EPImapFeaturesData *ui) { - const char *entry_contents; + const gchar *entry_contents; GtkTreeIter iter; gboolean valid; @@ -166,7 +166,7 @@ epif_add_sensitivity (EPImapFeaturesData *ui) /* check if this is a duplicate */ valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ui->store), &iter); while (valid) { - char *header_name; + gchar *header_name; gtk_tree_model_get (GTK_TREE_MODEL (ui->store), &iter, 0, &header_name, @@ -254,7 +254,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data) GtkWidget *vbox; CamelURL *url = NULL; CamelException ex; - char *gladefile; + gchar *gladefile; GladeXML *gladexml; GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -289,11 +289,11 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data) gtk_tree_view_set_model (ui->custom_headers_tree, GTK_TREE_MODEL(ui->store)); if (url) { - char *custom_headers; + gchar *custom_headers; custom_headers = g_strdup(camel_url_get_param (url, "imap_custom_headers")); if (custom_headers) { - int i=0; + gint i=0; ui->custom_headers_array = g_strsplit (custom_headers, " ", -1); while (ui->custom_headers_array[i] ) { diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c index 487d9f14c5..11df39777a 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.c +++ b/plugins/ipod-sync/evolution-ipod-sync.c @@ -32,7 +32,7 @@ #include #include -char * mount_point = NULL; +gchar * mount_point = NULL; LibHalContext *ctx; gboolean @@ -100,7 +100,7 @@ ipod_check_status (gboolean silent) return TRUE; } -char * +gchar * ipod_get_mount (void) { return mount_point; diff --git a/plugins/ipod-sync/evolution-ipod-sync.h b/plugins/ipod-sync/evolution-ipod-sync.h index 662b16eff0..8760c43ceb 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.h +++ b/plugins/ipod-sync/evolution-ipod-sync.h @@ -30,9 +30,9 @@ gboolean check_hal (void); gboolean ipod_check_status (gboolean silent); -gboolean try_umount (char *device); +gboolean try_umount (gchar *device); -char *find_ipod_mount_point (LibHalContext *ctx); -char *ipod_get_mount (void); +gchar *find_ipod_mount_point (LibHalContext *ctx); +gchar *ipod_get_mount (void); diff --git a/plugins/ipod-sync/format-handler.h b/plugins/ipod-sync/format-handler.h index 145bcb7d6d..4a9207a474 100644 --- a/plugins/ipod-sync/format-handler.h +++ b/plugins/ipod-sync/format-handler.h @@ -44,9 +44,9 @@ struct _FormatHandler gpointer data; - void (*save) (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, char *dest_uri); + void (*save) (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, gchar *dest_uri); }; FormatHandler *ical_format_handler_new (void); -GOutputStream *open_for_writing (GtkWindow *parent, const char *uri, GError **error); +GOutputStream *open_for_writing (GtkWindow *parent, const gchar *uri, GError **error); diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c index 49c042f705..d8961e2520 100644 --- a/plugins/ipod-sync/ical-format.c +++ b/plugins/ipod-sync/ical-format.c @@ -37,7 +37,7 @@ #include "format-handler.h" static void -display_error_message (GtkWidget *parent, const char *message) +display_error_message (GtkWidget *parent, const gchar *message) { GtkWidget *dialog; @@ -47,7 +47,7 @@ display_error_message (GtkWidget *parent, const char *message) } static void -do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, char *dest_uri) +do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, gchar *dest_uri) { ESource *primary_source; ECal *source_client; @@ -89,7 +89,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc stream = open_for_writing (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (target->selector))), dest_uri, &error); if (stream && !error) { - char *ical_str = icalcomponent_as_ical_string_r (top_level); + gchar *ical_str = icalcomponent_as_ical_string_r (top_level); g_output_stream_write_all (stream, ical_str, strlen (ical_str), NULL, NULL, &error); g_output_stream_close (stream, NULL, NULL); diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c index 1f589bfdc0..7615d6e7cb 100644 --- a/plugins/ipod-sync/ipod-sync.c +++ b/plugins/ipod-sync/ipod-sync.c @@ -56,7 +56,7 @@ void org_gnome_sync_addressbook (EPlugin *ep, EABPopupTargetSource *target); static void -display_error_message (GtkWidget *parent, const char *message) +display_error_message (GtkWidget *parent, const gchar *message) { GtkWidget *dialog; @@ -70,7 +70,7 @@ display_error_message (GtkWidget *parent, const char *message) It will ask for overwrite if file already exists. */ GOutputStream * -open_for_writing (GtkWindow *parent, const char *uri, GError **error) +open_for_writing (GtkWindow *parent, const gchar *uri, GError **error) { GFile *file; GFileOutputStream *fostream; @@ -125,8 +125,8 @@ destination_save_addressbook (EPlugin *ep, EABPopupTargetSource *target) gchar *uri; GOutputStream *stream; GError *error = NULL; - char *dest_uri = NULL; - char *mount = ipod_get_mount(); + gchar *dest_uri = NULL; + gchar *mount = ipod_get_mount(); primary_source = e_source_selector_peek_primary_selection (target->selector); @@ -199,8 +199,8 @@ static void destination_save_cal (EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type) { FormatHandler *handler = NULL; - char *mount = ipod_get_mount(); - char *dest_uri = NULL, *path; + gchar *mount = ipod_get_mount(); + gchar *dest_uri = NULL, *path; ESource *primary_source = e_source_selector_peek_primary_selection (target->selector); /* The available formathandlers */ diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c index 5f399f23e6..baef16e0d5 100644 --- a/plugins/ipod-sync/ipod.c +++ b/plugins/ipod-sync/ipod.c @@ -35,8 +35,8 @@ gboolean check_hal (void) { LibHalContext *ctx; - char **devices; - int num; + gchar **devices; + gint num; DBusConnection *conn; conn = dbus_bus_get (DBUS_BUS_SYSTEM, NULL); @@ -64,9 +64,9 @@ check_hal (void) * Try to mount a given device. */ static gboolean -try_mount (char *device) +try_mount (gchar *device) { - char *argv[3]; + gchar *argv[3]; GError *err = NULL; gint exit_status; @@ -88,9 +88,9 @@ try_mount (char *device) * Try to unmount a given device. */ gboolean -try_umount (char *device) +try_umount (gchar *device) { - char *argv[3]; + gchar *argv[3]; GError *err = NULL; gint exit_status; @@ -117,11 +117,11 @@ try_umount (char *device) * database at /iPod_Control/iTunes/. */ static gboolean -is_ipod (char *mount_point) +is_ipod (gchar *mount_point) { gboolean ret = FALSE; - char *itunes_path; + gchar *itunes_path; itunes_path = g_build_path (G_DIR_SEPARATOR_S, mount_point, "iPod_Control", "iTunes", @@ -140,17 +140,17 @@ out: /** * Try to find a mount point for an iPod. */ -char * +gchar * find_ipod_mount_point (LibHalContext *ctx) { - char **apple_devices = NULL; - char **volumes = NULL; - char *udi, *udi2, *device, *fsusage, *mount_point = NULL; - char *retval = NULL; - int apple_count = 0; - int volume_count = 0; - int has_fs = 0; - int i, j; + gchar **apple_devices = NULL; + gchar **volumes = NULL; + gchar *udi, *udi2, *device, *fsusage, *mount_point = NULL; + gchar *retval = NULL; + gint apple_count = 0; + gint volume_count = 0; + gint has_fs = 0; + gint i, j; /* First, we look for things made by Apple. */ apple_devices = libhal_manager_find_device_string_match (ctx, diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c index 8fe83d1b5a..cc2febc5e3 100644 --- a/plugins/ipod-sync/sync.c +++ b/plugins/ipod-sync/sync.c @@ -50,7 +50,7 @@ static void pulse (void) /** * Something bad happened. */ -static void error_dialog (char *title, char *error) +static void error_dialog (gchar *title, gchar *error) { GtkWidget *error_dlg = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, @@ -71,7 +71,7 @@ static void error_dialog (char *title, char *error) /** * Something really bad happened. */ -static void critical_error (char *title, char *error) +static void critical_error (gchar *title, gchar *error) { error_dialog (title, error); gtk_main_quit (); @@ -79,7 +79,7 @@ static void critical_error (char *title, char *error) } static GSList * -get_source_uris_for_type (char *key) +get_source_uris_for_type (gchar *key) { ESourceList *sources; GSList *groups; @@ -124,9 +124,9 @@ free_uri_list (GSList *uris) * Note: data must be of even length. */ static void -force_little_endian (gunichar2 *data, int length) +force_little_endian (gunichar2 *data, gint length) { - int i; + gint i; /* We're big-endian? (A little tidier than before) */ @@ -151,10 +151,10 @@ force_little_endian (gunichar2 *data, int length) * display an error dialog and end the program. */ static void -write_to_ipod (GString *str, char *path, char *filename) +write_to_ipod (GString *str, gchar *path, gchar *filename) { - char *output_path; - char *output_file; + gchar *output_path; + gchar *output_file; FILE *f; guchar *utf8; gunichar2 *utf16; diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 293c4e3fca..18aa1ea82a 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -70,7 +70,7 @@ struct _itip_puri { CamelMimeMessage *msg; CamelMimePart *part; - char *uid; + gchar *uid; GtkWidget *view; ESourceList *source_lists[E_CAL_SOURCE_TYPE_LAST]; @@ -79,7 +79,7 @@ struct _itip_puri { ECal *current_ecal; ECalSourceType type; - char *vcalendar; + gchar *vcalendar; ECalComponent *comp; icalcomponent *main_comp; icalcomponent *ical_comp; @@ -89,8 +89,8 @@ struct _itip_puri { time_t start_time; time_t end_time; - int current; - int total; + gint current; + gint total; gchar *calendar_uid; @@ -144,12 +144,12 @@ static void itip_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPU typedef struct { struct _itip_puri *puri; - char *uid; - char *rid; + gchar *uid; + gchar *rid; - char *sexp; + gchar *sexp; - int count; + gint count; } FormatItipFindData; typedef void (* FormatItipOpenFunc) (ECal *ecal, ECalendarStatus status, gpointer data); @@ -157,7 +157,7 @@ typedef void (* FormatItipOpenFunc) (ECal *ecal, ECalendarStatus status, gpointe static gboolean check_is_instance (icalcomponent *icalcomp); static icalproperty * -find_attendee (icalcomponent *ical_comp, const char *address) +find_attendee (icalcomponent *ical_comp, const gchar *address) { icalproperty *prop; @@ -167,8 +167,8 @@ find_attendee (icalcomponent *ical_comp, const char *address) for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY); prop != NULL; prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) { - char *attendee; - char *text; + gchar *attendee; + gchar *text; attendee = icalproperty_get_value_as_string_r (prop); @@ -190,7 +190,7 @@ find_attendee (icalcomponent *ical_comp, const char *address) } static icalproperty * -find_attendee_if_sentby (icalcomponent *ical_comp, const char *address) +find_attendee_if_sentby (icalcomponent *ical_comp, const gchar *address) { icalproperty *prop; @@ -201,8 +201,8 @@ find_attendee_if_sentby (icalcomponent *ical_comp, const char *address) prop != NULL; prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) { icalparameter *param; - const char *attendee_sentby; - char *text; + const gchar *attendee_sentby; + gchar *text; param = icalproperty_get_first_parameter (prop, ICAL_SENTBY_PARAMETER); if (!param) @@ -247,7 +247,7 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet prop = find_attendee (ical_comp, account->id->address); if (prop) { - char *text; + gchar *text; icalparameter *param; param = icalproperty_get_first_parameter (prop, ICAL_CN_PARAMETER); @@ -303,7 +303,7 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet prop = find_attendee_if_sentby (ical_comp, account->id->address); if (prop) { - char *text; + gchar *text; icalparameter *param; param = icalproperty_get_first_parameter (prop, ICAL_CN_PARAMETER); @@ -342,11 +342,11 @@ find_from_address (struct _itip_puri *pitip, icalcomponent *ical_comp) { EIterator *it; icalproperty *prop; - char *organizer; + gchar *organizer; icalparameter *param; - const char *organizer_sentby; - char *organizer_clean = NULL; - char *organizer_sentby_clean = NULL; + const gchar *organizer_sentby; + gchar *organizer_clean = NULL; + gchar *organizer_sentby_clean = NULL; prop = icalcomponent_get_first_property (ical_comp, ICAL_ORGANIZER_PROPERTY); @@ -406,7 +406,7 @@ get_real_item (struct _itip_puri *pitip) ECalComponent *comp; icalcomponent *icalcomp; gboolean found = FALSE; - const char *uid; + const gchar *uid; e_cal_component_get_uid (pitip->comp, &uid); @@ -432,7 +432,7 @@ adjust_item (struct _itip_puri *pitip, ECalComponent *comp) real_comp = get_real_item (pitip); if (real_comp != NULL) { ECalComponentText text; - const char *string; + const gchar *string; GSList *l; e_cal_component_get_summary (real_comp, &text); @@ -551,9 +551,9 @@ start_calendar_server (struct _itip_puri *pitip, ESource *source, ECalSourceType } static ECal * -start_calendar_server_by_uid (struct _itip_puri *pitip, const char *uid, ECalSourceType type) +start_calendar_server_by_uid (struct _itip_puri *pitip, const gchar *uid, ECalSourceType type) { - int i; + gint i; itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), FALSE); @@ -716,7 +716,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) && !pitip->current_ecal) { /* Reuse already declared one or rename? */ ESource *source = NULL; - char *uid; + gchar *uid; switch (pitip->type) { case E_CAL_SOURCE_TYPE_EVENT: @@ -784,10 +784,10 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp) { FormatItipFindData *fd = NULL; GSList *groups, *l, *sources_conflict = NULL, *all_sources = NULL; - const char *uid; - char *rid = NULL; + const gchar *uid; + gchar *rid = NULL; CamelURL *url; - char *uri; + gchar *uri; ESource *source = NULL, *current_source = NULL; e_cal_component_get_uid (comp, &uid); @@ -807,7 +807,7 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp) sources = e_source_group_peek_sources (group); for (m = sources; m; m = m->next) { - char *source_uri = NULL; + gchar *source_uri = NULL; source = m->data; @@ -849,7 +849,7 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp) source = l->data; if (!fd) { - char *start = NULL, *end = NULL; + gchar *start = NULL, *end = NULL; fd = g_new0 (FormatItipFindData, 1); fd->puri = pitip; @@ -898,7 +898,7 @@ cleanup_ecal (gpointer data) } static gboolean -change_status (icalcomponent *ical_comp, const char *address, icalparameter_partstat status) +change_status (icalcomponent *ical_comp, const gchar *address, icalparameter_partstat status) { icalproperty *prop; @@ -947,8 +947,8 @@ static void message_foreach_part (CamelMimePart *part, GSList **part_list) { CamelDataWrapper *containee; - int parts, i; - int go = TRUE; + gint parts, i; + gint go = TRUE; if (!part) return; @@ -984,7 +984,7 @@ update_item (struct _itip_puri *pitip, ItipViewResponse response) ESource *source; GError *error = NULL; gboolean result = TRUE; - char *str; + gchar *str; /* Set X-MICROSOFT-CDO-REPLYTIME to record the time at which * the user accepted/declined the request. (Outlook ignores @@ -1037,7 +1037,7 @@ update_item (struct _itip_puri *pitip, ItipViewResponse response) alarms = e_cal_component_get_alarm_uids (real_comp); for (l = alarms; l; l = l->next) { - alarm = e_cal_component_get_alarm (real_comp, (const char *)l->data); + alarm = e_cal_component_get_alarm (real_comp, (const gchar *)l->data); if (alarm) { ECalComponentAlarm *aclone = e_cal_component_alarm_clone (alarm); @@ -1065,7 +1065,7 @@ update_item (struct _itip_puri *pitip, ItipViewResponse response) for (l = attachments; l; l = l->next) { GSList *parts = NULL, *m; - char *uri, *new_uri; + gchar *uri, *new_uri; CamelMimePart *part; uri = l->data; @@ -1152,7 +1152,7 @@ update_item (struct _itip_puri *pitip, ItipViewResponse response) /* TODO These operations should be available in e-cal-component.c */ static void -set_attendee (ECalComponent *comp, const char *address) +set_attendee (ECalComponent *comp, const gchar *address) { icalproperty *prop; icalcomponent *icalcomp; @@ -1163,7 +1163,7 @@ set_attendee (ECalComponent *comp, const char *address) for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY); prop; prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY)) { - const char *attendee = icalproperty_get_attendee (prop); + const gchar *attendee = icalproperty_get_attendee (prop); if (!(g_str_equal (itip_strip_mailto (attendee), address))) icalcomponent_remove_property (icalcomp, prop); @@ -1173,9 +1173,9 @@ set_attendee (ECalComponent *comp, const char *address) if (!found) { icalparameter *param; - char *temp = g_strdup_printf ("MAILTO:%s", address); + gchar *temp = g_strdup_printf ("MAILTO:%s", address); - prop = icalproperty_new_attendee ((const char *) temp); + prop = icalproperty_new_attendee ((const gchar *) temp); icalcomponent_add_property (icalcomp, prop); param = icalparameter_new_partstat (ICAL_PARTSTAT_NEEDSACTION); @@ -1196,7 +1196,7 @@ set_attendee (ECalComponent *comp, const char *address) } static gboolean -send_comp_to_attendee (ECalComponentItipMethod method, ECalComponent *comp, const char *user, ECal *client, const char *comment) +send_comp_to_attendee (ECalComponentItipMethod method, ECalComponent *comp, const gchar *user, ECal *client, const gchar *comment) { gboolean status; ECalComponent *send_comp = e_cal_component_clone (comp); @@ -1225,10 +1225,10 @@ send_comp_to_attendee (ECalComponentItipMethod method, ECalComponent *comp, cons } static void -remove_delegate (struct _itip_puri *pitip, const char *delegate, const char *delegator, ECalComponent *comp) +remove_delegate (struct _itip_puri *pitip, const gchar *delegate, const gchar *delegator, ECalComponent *comp) { gboolean status; - char *comment = g_strdup_printf (_("Organizer has removed the delegate %s "), itip_strip_mailto (delegate)); + gchar *comment = g_strdup_printf (_("Organizer has removed the delegate %s "), itip_strip_mailto (delegate)); /* send cancellation notice to delegate */ status = send_comp_to_attendee (E_CAL_COMPONENT_METHOD_CANCEL, pitip->comp, delegate, pitip->current_ecal, comment); @@ -1251,7 +1251,7 @@ update_x (ECalComponent *pitip_comp, ECalComponent *comp) icalproperty *prop = icalcomponent_get_first_property (itip_icalcomp, ICAL_X_PROPERTY); while (prop) { - const char *name = icalproperty_get_x_name (prop); + const gchar *name = icalproperty_get_x_name (prop); if (!g_ascii_strcasecmp (name, "X-EVOLUTION-IS-REPLY")) { icalproperty *new_prop = icalproperty_new_x (icalproperty_get_x (prop)); icalproperty_set_x_name (new_prop, "X-EVOLUTION-IS-REPLY"); @@ -1268,9 +1268,9 @@ update_attendee_status (struct _itip_puri *pitip) { ECalComponent *comp = NULL; icalcomponent *icalcomp = NULL, *org_icalcomp; - const char *uid; - char *rid = NULL; - const char *delegate; + const gchar *uid; + gchar *rid = NULL; + const gchar *delegate; GError *error = NULL; /* Obtain our version */ @@ -1455,10 +1455,10 @@ get_next (icalcompiter *iter) } static void -set_itip_error (struct _itip_puri *pitip, GtkContainer *container, const char *primary, const char *secondary) +set_itip_error (struct _itip_puri *pitip, GtkContainer *container, const gchar *primary, const gchar *secondary) { GtkWidget *vbox, *label; - char *message; + gchar *message; vbox = gtk_vbox_new (FALSE, 12); gtk_widget_show (vbox); @@ -1489,7 +1489,7 @@ extract_itip_data (struct _itip_puri *pitip, GtkContainer *container, gboolean * icalcomponent *alarm_comp; icalcompiter alarm_iter; ECalComponent *comp; - char *my_address; + gchar *my_address; if (!pitip->vcalendar) { @@ -1610,7 +1610,7 @@ extract_itip_data (struct _itip_puri *pitip, GtkContainer *container, gboolean * prop = find_attendee_if_sentby (pitip->ical_comp, my_address); if (prop) { icalparameter *param; - const char * delfrom; + const gchar * delfrom; if ((param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER))) { delfrom = icalparameter_get_delegatedfrom (param); @@ -1623,7 +1623,7 @@ extract_itip_data (struct _itip_puri *pitip, GtkContainer *container, gboolean * /* Determine any delegate sections */ prop = icalcomponent_get_first_property (pitip->ical_comp, ICAL_X_PROPERTY); while (prop) { - const char *x_name, *x_val; + const gchar *x_name, *x_val; x_name = icalproperty_get_x_name (prop); x_val = icalproperty_get_x (prop); @@ -1675,7 +1675,7 @@ extract_itip_data (struct _itip_puri *pitip, GtkContainer *container, gboolean * /* Add default reminder if the config says so */ if (calendar_config_get_use_default_reminder ()) { ECalComponentAlarm *acomp; - int interval; + gint interval; CalUnits units; ECalComponentAlarmTrigger trigger; @@ -1720,10 +1720,10 @@ extract_itip_data (struct _itip_puri *pitip, GtkContainer *container, gboolean * struct _opencal_msg { MailMsg base; - char *command; /* command line to run */ + gchar *command; /* command line to run */ }; -static char * +static gchar * open_calendar__desc (struct _opencal_msg *m, gint complete) { return g_strdup (_("Opening calendar")); @@ -1757,7 +1757,7 @@ idle_open_cb (gpointer data) { struct _itip_puri *pitip = data; struct _opencal_msg *m; - char *start, *end; + gchar *start, *end; start = isodate_from_time_t (pitip->start_time); end = isodate_from_time_t (pitip->end_time); @@ -1869,7 +1869,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) /* FIXME Remove this and handle this at the groupwise mail provider */ if (delete_invitation_from_cache) { CamelFolderChangeInfo *changes = NULL; - const char *tag = NULL; + const gchar *tag = NULL; CamelMessageInfo *mi; mi = camel_folder_summary_uid (pitip->folder->summary, pitip->uid); if (mi) { @@ -1881,7 +1881,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) tag = camel_message_info_user_tag (mi, "recurrence-key"); camel_message_info_free (mi); if (tag) { - int i = 0, count; + gint i = 0, count; GSList *list = NULL; count = camel_folder_summary_count (pitip->folder->summary); @@ -1891,8 +1891,8 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) continue; camel_message_info_ref (mi); if ( camel_message_info_user_tag (mi, "recurrence-key") && g_str_equal (camel_message_info_user_tag (mi, "recurrence-key"), tag)) { - camel_folder_summary_remove_uid_fast (pitip->folder->summary, (char *)(mi->uid)); - camel_folder_change_info_remove_uid (changes, (char *) mi->uid); + camel_folder_summary_remove_uid_fast (pitip->folder->summary, (gchar *)(mi->uid)); + camel_folder_change_info_remove_uid (changes, (gchar *) mi->uid); list = g_slist_prepend (list, (gpointer) mi->uid); /* step back once to have the right index */ @@ -1924,7 +1924,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) ECalComponent *comp = NULL; icalcomponent *ical_comp; icalvalue *value; - const char *attendee, *comment; + const gchar *attendee, *comment; GSList *l, *list = NULL; gboolean found; @@ -1944,7 +1944,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) prop != NULL; prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) { - char *text; + gchar *text; value = icalproperty_get_value (prop); if (!value) @@ -2003,7 +2003,7 @@ check_is_instance (icalcomponent *icalcomp) icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY); while (icalprop) { - const char *x_name; + const gchar *x_name; x_name = icalproperty_get_x_name (icalprop); if (!strcmp (x_name, "X-GW-RECURRENCE-KEY")) { @@ -2047,8 +2047,8 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject GString *gstring = NULL; GSList *list, *l; icalcomponent *icalcomp; - const char *string, *org; - int i; + const gchar *string, *org; + gint i; gboolean response_enabled; gboolean have_alarms = FALSE; @@ -2351,7 +2351,7 @@ static void puri_free (EMFormatPURI *puri) { struct _itip_puri *pitip = (struct _itip_puri*) puri; - int i; + gint i; for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) { if (pitip->source_lists[i]) @@ -2407,7 +2407,7 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) { EMFormatHTMLPObject *pobj; GConfClient *gconf; - char *classid; + gchar *classid; struct _itip_puri *puri; CamelDataWrapper *content; CamelStream *mem; @@ -2442,7 +2442,7 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) if (((CamelStreamMem *) mem)->buffer->len == 0) puri->vcalendar = NULL; else - puri->vcalendar = g_strndup ((char *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); + puri->vcalendar = g_strndup ((gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); camel_object_unref (mem); @@ -2471,7 +2471,7 @@ initialize_selection (ESourceSelector *selector, ESourceList *source_list) GSList *sources; for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) { ESource *source = E_SOURCE (sources->data); - const char *completion = e_source_get_property (source, "conflict"); + const gchar *completion = e_source_get_property (source, "conflict"); if (completion && !g_ascii_strcasecmp (completion, "true")) e_source_selector_select_source (selector, source); } diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 30dbe135cc..c2fe0e163a 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -50,7 +50,7 @@ G_DEFINE_TYPE (ItipView, itip_view, GTK_TYPE_HBOX) typedef struct { ItipViewInfoItemType type; - char *message; + gchar *message; guint id; } ItipViewInfoItem; @@ -60,27 +60,27 @@ struct _ItipViewPrivate { ECalSourceType type; GtkWidget *sender_label; - char *organizer; - char *organizer_sentby; - char *delegator; - char *attendee; - char *attendee_sentby; - char *proxy; + gchar *organizer; + gchar *organizer_sentby; + gchar *delegator; + gchar *attendee; + gchar *attendee_sentby; + gchar *proxy; GtkWidget *summary_label; - char *summary; + gchar *summary; GtkWidget *location_header; GtkWidget *location_label; - char *location; + gchar *location; GtkWidget *status_header; GtkWidget *status_label; - char *status; + gchar *status; GtkWidget *comment_header; GtkWidget *comment_label; - char *comment; + gchar *comment; GtkWidget *start_header; GtkWidget *start_label; @@ -99,7 +99,7 @@ struct _ItipViewPrivate { guint next_info_item_id; GtkWidget *description_label; - char *description; + gchar *description; GtkWidget *selector_box; GtkWidget *escb; @@ -148,7 +148,7 @@ format_date_and_time_x (struct tm *date_tm, char *buffer, int buffer_size) { - char *format; + gchar *format; struct tm tomorrow_tm, week_tm; /* Calculate a normalized "tomorrow" */ @@ -337,9 +337,9 @@ static void set_calendar_sender_text (ItipView *view) { ItipViewPrivate *priv; - const char *organizer, *attendee; - char *sender = NULL; - char *on_behalf_of = NULL; + const gchar *organizer, *attendee; + gchar *sender = NULL; + gchar *on_behalf_of = NULL; priv = view->priv; @@ -425,9 +425,9 @@ static void set_tasklist_sender_text (ItipView *view) { ItipViewPrivate *priv; - const char *organizer, *attendee; - char *sender = NULL; - char *on_behalf_of = NULL; + const gchar *organizer, *attendee; + gchar *sender = NULL; + gchar *on_behalf_of = NULL; priv = view->priv; @@ -513,9 +513,9 @@ static void set_journal_sender_text (ItipView *view) { ItipViewPrivate *priv; - const char *organizer, *attendee; - char *sender = NULL; - char *on_behalf_of = NULL; + const gchar *organizer, *attendee; + gchar *sender = NULL; + gchar *on_behalf_of = NULL; priv = view->priv; @@ -589,7 +589,7 @@ static void set_summary_text (ItipView *view) { ItipViewPrivate *priv; - char *summary = NULL; + gchar *summary = NULL; priv = view->priv; @@ -656,7 +656,7 @@ static void set_start_text (ItipView *view) { ItipViewPrivate *priv; - char buffer[256]; + gchar buffer[256]; time_t now; struct tm *now_tm; @@ -680,7 +680,7 @@ static void set_end_text (ItipView *view) { ItipViewPrivate *priv; - char buffer[256]; + gchar buffer[256]; time_t now; struct tm *now_tm; @@ -1242,7 +1242,7 @@ itip_view_get_item_type (ItipView *view) /* ensures the returned text will be valid UTF-8 text, thus gtk functions expecting only valid UTF-8 texts will not crash. Returned pointer should be freed with g_free. */ static gchar * -ensure_utf8 (const char *text) +ensure_utf8 (const gchar *text) { gchar *res = g_strdup (text), *p; @@ -1259,7 +1259,7 @@ ensure_utf8 (const char *text) } void -itip_view_set_organizer (ItipView *view, const char *organizer) +itip_view_set_organizer (ItipView *view, const gchar *organizer) { ItipViewPrivate *priv; @@ -1276,7 +1276,7 @@ itip_view_set_organizer (ItipView *view, const char *organizer) set_sender_text (view); } -const char * +const gchar * itip_view_get_organizer (ItipView *view) { ItipViewPrivate *priv; @@ -1290,7 +1290,7 @@ itip_view_get_organizer (ItipView *view) } void -itip_view_set_organizer_sentby (ItipView *view, const char *sentby) +itip_view_set_organizer_sentby (ItipView *view, const gchar *sentby) { ItipViewPrivate *priv; @@ -1307,7 +1307,7 @@ itip_view_set_organizer_sentby (ItipView *view, const char *sentby) set_sender_text (view); } -const char * +const gchar * itip_view_get_organizer_sentby (ItipView *view) { ItipViewPrivate *priv; @@ -1321,7 +1321,7 @@ itip_view_get_organizer_sentby (ItipView *view) } void -itip_view_set_attendee (ItipView *view, const char *attendee) +itip_view_set_attendee (ItipView *view, const gchar *attendee) { ItipViewPrivate *priv; @@ -1338,7 +1338,7 @@ itip_view_set_attendee (ItipView *view, const char *attendee) set_sender_text (view); } -const char * +const gchar * itip_view_get_attendee (ItipView *view) { ItipViewPrivate *priv; @@ -1352,7 +1352,7 @@ itip_view_get_attendee (ItipView *view) } void -itip_view_set_attendee_sentby (ItipView *view, const char *sentby) +itip_view_set_attendee_sentby (ItipView *view, const gchar *sentby) { ItipViewPrivate *priv; @@ -1369,7 +1369,7 @@ itip_view_set_attendee_sentby (ItipView *view, const char *sentby) set_sender_text (view); } -const char * +const gchar * itip_view_get_attendee_sentby (ItipView *view) { ItipViewPrivate *priv; @@ -1383,7 +1383,7 @@ itip_view_get_attendee_sentby (ItipView *view) } void -itip_view_set_proxy (ItipView *view, const char *proxy) +itip_view_set_proxy (ItipView *view, const gchar *proxy) { ItipViewPrivate *priv; @@ -1400,7 +1400,7 @@ itip_view_set_proxy (ItipView *view, const char *proxy) set_sender_text (view); } -const char * +const gchar * itip_view_get_proxy (ItipView *view) { ItipViewPrivate *priv; @@ -1414,7 +1414,7 @@ itip_view_get_proxy (ItipView *view) } void -itip_view_set_delegator (ItipView *view, const char *delegator) +itip_view_set_delegator (ItipView *view, const gchar *delegator) { ItipViewPrivate *priv; @@ -1431,7 +1431,7 @@ itip_view_set_delegator (ItipView *view, const char *delegator) set_sender_text (view); } -const char * +const gchar * itip_view_get_delegator (ItipView *view) { ItipViewPrivate *priv; @@ -1445,7 +1445,7 @@ itip_view_get_delegator (ItipView *view) } void -itip_view_set_summary (ItipView *view, const char *summary) +itip_view_set_summary (ItipView *view, const gchar *summary) { ItipViewPrivate *priv; @@ -1462,7 +1462,7 @@ itip_view_set_summary (ItipView *view, const char *summary) set_summary_text (view); } -const char * +const gchar * itip_view_get_summary (ItipView *view) { ItipViewPrivate *priv; @@ -1476,7 +1476,7 @@ itip_view_get_summary (ItipView *view) } void -itip_view_set_location (ItipView *view, const char *location) +itip_view_set_location (ItipView *view, const gchar *location) { ItipViewPrivate *priv; @@ -1493,7 +1493,7 @@ itip_view_set_location (ItipView *view, const char *location) set_location_text (view); } -const char * +const gchar * itip_view_get_location (ItipView *view) { ItipViewPrivate *priv; @@ -1507,7 +1507,7 @@ itip_view_get_location (ItipView *view) } void -itip_view_set_status (ItipView *view, const char *status) +itip_view_set_status (ItipView *view, const gchar *status) { ItipViewPrivate *priv; @@ -1524,7 +1524,7 @@ itip_view_set_status (ItipView *view, const char *status) set_status_text (view); } -const char * +const gchar * itip_view_get_status (ItipView *view) { ItipViewPrivate *priv; @@ -1538,7 +1538,7 @@ itip_view_get_status (ItipView *view) } void -itip_view_set_comment (ItipView *view, const char *comment) +itip_view_set_comment (ItipView *view, const gchar *comment) { ItipViewPrivate *priv; @@ -1555,7 +1555,7 @@ itip_view_set_comment (ItipView *view, const char *comment) set_comment_text (view); } -const char * +const gchar * itip_view_get_comment (ItipView *view) { ItipViewPrivate *priv; @@ -1570,7 +1570,7 @@ itip_view_get_comment (ItipView *view) void -itip_view_set_description (ItipView *view, const char *description) +itip_view_set_description (ItipView *view, const gchar *description) { ItipViewPrivate *priv; @@ -1587,7 +1587,7 @@ itip_view_set_description (ItipView *view, const char *description) set_description_text (view); } -const char * +const gchar * itip_view_get_description (ItipView *view) { ItipViewPrivate *priv; @@ -1674,7 +1674,7 @@ itip_view_get_end (ItipView *view) } guint -itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const char *message) +itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const gchar *message) { ItipViewPrivate *priv; ItipViewInfoItem *item; @@ -1698,10 +1698,10 @@ itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const } guint -itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType type, const char *format, ...) +itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType type, const gchar *format, ...) { va_list args; - char *message; + gchar *message; guint id; g_return_val_if_fail (view != NULL, 0); @@ -1769,7 +1769,7 @@ itip_view_clear_upper_info_items (ItipView *view) } guint -itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const char *message) +itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const gchar *message) { ItipViewPrivate *priv; ItipViewInfoItem *item; @@ -1793,10 +1793,10 @@ itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const } guint -itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type, const char *format, ...) +itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type, const gchar *format, ...) { va_list args; - char *message; + gchar *message; guint id; g_return_val_if_fail (view != NULL, 0); @@ -2084,7 +2084,7 @@ itip_view_get_show_update (ItipView *view) } void -itip_view_set_rsvp_comment (ItipView *view, const char *comment) +itip_view_set_rsvp_comment (ItipView *view, const gchar *comment) { ItipViewPrivate *priv; @@ -2096,7 +2096,7 @@ itip_view_set_rsvp_comment (ItipView *view, const char *comment) gtk_entry_set_text (GTK_ENTRY (priv->rsvp_comment_entry), comment); } -const char * +const gchar * itip_view_get_rsvp_comment (ItipView *view) { ItipViewPrivate *priv; diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h index 88d01204fb..2b834b01c8 100644 --- a/plugins/itip-formatter/itip-view.h +++ b/plugins/itip-formatter/itip-view.h @@ -87,7 +87,7 @@ struct _ItipViewClass { GtkHBoxClass parent_class; void (* source_selected) (ItipView *view, ESource *selected_source); - void (* response) (ItipView *view, int response); + void (* response) (ItipView *view, gint response); }; GType itip_view_get_type (void); @@ -99,38 +99,38 @@ ItipViewMode itip_view_get_mode (ItipView *view); void itip_view_set_item_type (ItipView *view, ECalSourceType type); ECalSourceType itip_view_get_item_type (ItipView *view); -void itip_view_set_organizer (ItipView *view, const char *organizer); -const char *itip_view_get_organizer (ItipView *view); +void itip_view_set_organizer (ItipView *view, const gchar *organizer); +const gchar *itip_view_get_organizer (ItipView *view); -void itip_view_set_organizer_sentby (ItipView *view, const char *sentby); -const char *itip_view_get_organizer_sentby (ItipView *view); +void itip_view_set_organizer_sentby (ItipView *view, const gchar *sentby); +const gchar *itip_view_get_organizer_sentby (ItipView *view); -void itip_view_set_attendee (ItipView *view, const char *attendee); -const char *itip_view_get_attendee (ItipView *view); +void itip_view_set_attendee (ItipView *view, const gchar *attendee); +const gchar *itip_view_get_attendee (ItipView *view); -void itip_view_set_attendee_sentby (ItipView *view, const char *sentby); -const char *itip_view_get_attendee_sentby (ItipView *view); +void itip_view_set_attendee_sentby (ItipView *view, const gchar *sentby); +const gchar *itip_view_get_attendee_sentby (ItipView *view); -void itip_view_set_delegator (ItipView *view, const char *delegator); -const char *itip_view_get_delegator (ItipView *view); +void itip_view_set_delegator (ItipView *view, const gchar *delegator); +const gchar *itip_view_get_delegator (ItipView *view); -void itip_view_set_proxy (ItipView *view, const char *proxy); -const char *itip_view_get_proxy (ItipView *view); +void itip_view_set_proxy (ItipView *view, const gchar *proxy); +const gchar *itip_view_get_proxy (ItipView *view); -void itip_view_set_summary (ItipView *view, const char *summary); -const char *itip_view_get_summary (ItipView *view); +void itip_view_set_summary (ItipView *view, const gchar *summary); +const gchar *itip_view_get_summary (ItipView *view); -void itip_view_set_location (ItipView *view, const char *location); -const char *itip_view_get_location (ItipView *view); +void itip_view_set_location (ItipView *view, const gchar *location); +const gchar *itip_view_get_location (ItipView *view); -void itip_view_set_status (ItipView *view, const char *status); -const char *itip_view_get_status (ItipView *view); +void itip_view_set_status (ItipView *view, const gchar *status); +const gchar *itip_view_get_status (ItipView *view); -void itip_view_set_comment (ItipView *view, const char *comment); -const char *itip_view_get_comment (ItipView *view); +void itip_view_set_comment (ItipView *view, const gchar *comment); +const gchar *itip_view_get_comment (ItipView *view); -void itip_view_set_description (ItipView *view, const char *description); -const char *itip_view_get_description (ItipView *view); +void itip_view_set_description (ItipView *view, const gchar *description); +const gchar *itip_view_get_description (ItipView *view); void itip_view_set_start (ItipView *view, struct tm *start); const struct tm *itip_view_get_start (ItipView *view); @@ -138,13 +138,13 @@ const struct tm *itip_view_get_start (ItipView *view); void itip_view_set_end (ItipView *view, struct tm *end); const struct tm *itip_view_get_end (ItipView *view); -guint itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const char *message); -guint itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType, const char *format, ...) G_GNUC_PRINTF (3, 4); +guint itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const gchar *message); +guint itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType, const gchar *format, ...) G_GNUC_PRINTF (3, 4); void itip_view_remove_upper_info_item (ItipView *view, guint id); void itip_view_clear_upper_info_items (ItipView *view); -guint itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const char *message); -guint itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type, const char *format, ...) G_GNUC_PRINTF (3, 4); +guint itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const gchar *message); +guint itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type, const gchar *format, ...) G_GNUC_PRINTF (3, 4); void itip_view_remove_lower_info_item (ItipView *view, guint id); void itip_view_clear_lower_info_items (ItipView *view); @@ -166,8 +166,8 @@ gboolean itip_view_get_update (ItipView *view); void itip_view_set_show_update (ItipView *view, gboolean update); gboolean itip_view_get_show_update (ItipView *view); -void itip_view_set_rsvp_comment (ItipView *view, const char *comment); -const char *itip_view_get_rsvp_comment (ItipView *view); +void itip_view_set_rsvp_comment (ItipView *view, const gchar *comment); +const gchar *itip_view_get_rsvp_comment (ItipView *view); void itip_view_set_buttons_sensitive (ItipView *view, gboolean sensitive); gboolean itip_view_get_buttons_sensitive (ItipView *view); diff --git a/plugins/mail-account-disable/mail-account-disable.c b/plugins/mail-account-disable/mail-account-disable.c index d03e97d0f8..aee3043682 100644 --- a/plugins/mail-account-disable/mail-account-disable.c +++ b/plugins/mail-account-disable/mail-account-disable.c @@ -38,7 +38,7 @@ #define ACCOUNT_DISABLE 0 #define PROXY_LOGOUT 1 -void mail_account_disable (EPopup *ep, EPopupItem *p, void *data); +void mail_account_disable (EPopup *ep, EPopupItem *p, gpointer data); void org_gnome_create_mail_account_disable (EPlugin *ep, EMPopupTargetFolder *t); static EPopupItem popup_items[] = { @@ -47,13 +47,13 @@ static EPopupItem popup_items[] = { }; static void -popup_free (EPopup *ep, GSList *items, void *data) +popup_free (EPopup *ep, GSList *items, gpointer data) { g_slist_free (items); } void -mail_account_disable (EPopup *ep, EPopupItem *p, void *data) +mail_account_disable (EPopup *ep, EPopupItem *p, gpointer data) { MailComponent *component; EAccount *account = data; diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 466648d80f..d7c0f8a3dd 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -66,7 +66,7 @@ static GStaticMutex mlock = G_STATIC_MUTEX_INIT; * b) void read_notify_... (EMEventTargetMessage *t) * it is called when read_notify message is sent by Evolution * - * c) void enable_... (int enable) + * c) void enable_... (gint enable) * when plugin itself or the part is enabled/disabled * * d) GtkWidget *get_config_widget_...(void) @@ -127,7 +127,7 @@ static DBusConnection *bus = NULL; static gboolean init_dbus (void); static void -send_dbus_message (const char *name, const char *data, guint new) +send_dbus_message (const gchar *name, const gchar *data, guint new) { DBusMessage *message; @@ -145,7 +145,7 @@ send_dbus_message (const char *name, const char *data, guint new) DBUS_TYPE_INVALID); if (new) { - char * display_name = em_utils_folder_name_from_uri (data); + gchar * display_name = em_utils_folder_name_from_uri (data); dbus_message_append_args (message, #if FOUND_DBUS_VERSION >= 310 DBUS_TYPE_STRING, &display_name, DBUS_TYPE_UINT32, &new, @@ -174,7 +174,7 @@ reinit_dbus (gpointer user_data) } static DBusHandlerResult -filter_function (DBusConnection *connection, DBusMessage *message, void *user_data) +filter_function (DBusConnection *connection, DBusMessage *message, gpointer user_data) { if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") && strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) { @@ -237,7 +237,7 @@ read_notify_dbus (EMEventTargetMessage *t) } static void -enable_dbus (int enable) +enable_dbus (gint enable) { if (enable) { /* we ignore errors here */ @@ -273,7 +273,7 @@ get_config_widget_dbus (void) static GtkStatusIcon *status_icon = NULL; static guint blink_timeout_id = 0; -static unsigned int status_count = 0; +static guint status_count = 0; #ifdef HAVE_LIBNOTIFY static gboolean notification_callback (gpointer notify); @@ -370,7 +370,7 @@ static void do_properties (GtkMenuItem *item, gpointer user_data) { GtkWidget *cfg, *dialog, *vbox, *label, *hbox; - char *text; + gchar *text; cfg = get_cfg_widget (); if (!cfg) @@ -465,7 +465,7 @@ notifyActionCallback (NotifyNotification *n, gchar *label, gpointer a) static void new_notify_status (EMEventTargetFolder *t) { - char *msg; + gchar *msg; gboolean new_icon = !status_icon; if (new_icon) { @@ -541,7 +541,7 @@ read_notify_status (EMEventTargetMessage *t) } static void -enable_status (int enable) +enable_status (gint enable) { /* this does nothing on enable, it's here just to be consistent with other parts of this plugin */ @@ -730,7 +730,7 @@ read_notify_sound (EMEventTargetMessage *t) } static void -enable_sound (int enable) +enable_sound (gint enable) { if (enable) gnome_sound_init ("localhost"); @@ -854,7 +854,7 @@ get_cfg_widget (void) void org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t); void org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t); -int e_plugin_lib_enable (EPluginLib *ep, int enable); +gint e_plugin_lib_enable (EPluginLib *ep, gint enable); GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl); @@ -904,8 +904,8 @@ org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t) g_static_mutex_unlock (&mlock); } -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { if (enable) { #ifdef HAVE_DBUS diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 5560a4cabd..78fd37b999 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -53,14 +53,14 @@ #include #include -static char * -clean_name(const unsigned char *s) +static gchar * +clean_name(const guchar *s) { GString *out = g_string_new(""); guint32 c; - char *r; + gchar *r; - while ((c = camel_utf8_getc ((const unsigned char **)&s))) + while ((c = camel_utf8_getc ((const guchar **)&s))) { if (!g_unichar_isprint (c) || ( c < 0x7f && strchr (" /'\"`&();|<>$%{}!", c ))) c = '_'; @@ -74,12 +74,12 @@ clean_name(const unsigned char *s) } static void -set_attendees (ECalComponent *comp, CamelMimeMessage *message, const char *organizer) +set_attendees (ECalComponent *comp, CamelMimeMessage *message, const gchar *organizer) { GSList *attendees = NULL, *to_free = NULL; ECalComponentAttendee *ca; const CamelInternetAddress *from = NULL, *to, *cc, *bcc, *arr[4]; - int len, i, j; + gint len, i, j; if (message->reply_to) from = message->reply_to; @@ -98,10 +98,10 @@ set_attendees (ECalComponent *comp, CamelMimeMessage *message, const char *organ len = CAMEL_ADDRESS (arr[j])->addresses->len; for (i = 0; i < len; i++) { - const char *name, *addr; + const gchar *name, *addr; if (camel_internet_address_get (arr[j], i, &name, &addr)) { - char *temp; + gchar *temp; temp = g_strconcat ("mailto:", addr, NULL); if (organizer && g_ascii_strcasecmp (temp, organizer) == 0) { @@ -152,7 +152,7 @@ set_description (ECalComponent *comp, CamelMimeMessage *message) CamelMimePart *mime_part = CAMEL_MIME_PART (message); ECalComponentText text; GSList sl; - char *str, *convert_str = NULL; + gchar *str, *convert_str = NULL; gsize bytes_read, bytes_written; gint count = 2; @@ -180,7 +180,7 @@ set_description (ECalComponent *comp, CamelMimeMessage *message) mem = camel_stream_mem_new (); camel_data_wrapper_decode_to_stream (content, mem); - str = g_strndup ((const gchar*)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); + str = g_strndup ((const gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); camel_object_unref (mem); /* convert to UTF-8 string */ @@ -206,13 +206,13 @@ set_description (ECalComponent *comp, CamelMimeMessage *message) g_free (convert_str); } -static char * +static gchar * set_organizer (ECalComponent *comp) { EAccount *account; - const char *str, *name; + const gchar *str, *name; ECalComponentOrganizer organizer = {NULL, NULL, NULL, NULL}; - char *res; + gchar *res; account = mail_config_get_default_account (); if (!account) @@ -235,11 +235,11 @@ set_organizer (ECalComponent *comp) static void set_attachments (ECal *client, ECalComponent *comp, CamelMimeMessage *message) { - int parts, i; + gint parts, i; GSList *list = NULL; - const char *uid; - const char *store_uri; - char *store_dir; + const gchar *uid; + const gchar *store_uri; + gchar *store_dir; CamelDataWrapper *content; content = camel_medium_get_content_object ((CamelMedium *) message); @@ -258,8 +258,8 @@ set_attachments (ECal *client, ECalComponent *comp, CamelMimeMessage *message) for (i = 1; i < parts; i++) { - char *filename, *path, *tmp; - const char *orig_filename; + gchar *filename, *path, *tmp; + const gchar *orig_filename; CamelMimePart *mime_part; mime_part = camel_multipart_get_part (CAMEL_MULTIPART (content), i); @@ -268,13 +268,13 @@ set_attachments (ECal *client, ECalComponent *comp, CamelMimeMessage *message) if (!orig_filename) continue; - tmp = clean_name ((const unsigned char *)orig_filename); + tmp = clean_name ((const guchar *)orig_filename); filename = g_strdup_printf ("%s-%s", uid, tmp); path = g_build_filename (store_dir, filename, NULL); if (em_utils_save_part_to_file (NULL, path, mime_part)) { - char *uri; + gchar *uri; uri = g_filename_to_uri (path, NULL, NULL); list = g_slist_append (list, g_strdup (uri)); g_free (uri); @@ -292,8 +292,8 @@ set_attachments (ECal *client, ECalComponent *comp, CamelMimeMessage *message) struct _report_error { - char *format; - char *param; + gchar *format; + gchar *param; }; static gboolean @@ -310,7 +310,7 @@ do_report_error (struct _report_error *err) } static void -report_error_idle (const char *format, const char *param) +report_error_idle (const gchar *format, const gchar *param) { struct _report_error *err = g_new (struct _report_error, 1); @@ -325,7 +325,7 @@ typedef struct { ECal *client; struct _CamelFolder *folder; GPtrArray *uids; - char *selected_text; + gchar *selected_text; gboolean with_attendees; }AsyncData; @@ -361,7 +361,7 @@ do_mail_to_event (AsyncData *data) } } } else { - int i; + gint i; ECalSourceType source_type = e_cal_get_source_type (client); ECalComponentDateTime dt, dt2; struct icaltimetype tt, tt2; @@ -433,7 +433,7 @@ do_mail_to_event (AsyncData *data) set_description (comp, message); if (data->with_attendees) { - char *organizer; + gchar *organizer; /* set actual user as organizer, to be able to change event's properties */ organizer = set_organizer (comp); @@ -477,15 +477,15 @@ do_mail_to_event (AsyncData *data) } static void -copy_uids (char *uid, GPtrArray *uid_array) +copy_uids (gchar *uid, GPtrArray *uid_array) { g_ptr_array_add (uid_array, g_strdup (uid)); } static gboolean -text_contains_nonwhitespace (const char *text, gint len) +text_contains_nonwhitespace (const gchar *text, gint len) { - const char *p; + const gchar *p; gunichar c = 0; if (!text || len<=0) @@ -508,10 +508,10 @@ text_contains_nonwhitespace (const char *text, gint len) } /* should be freed with g_free after done with it */ -static char * +static gchar * get_selected_text (EMFolderView *emfv) { - char *text = NULL; + gchar *text = NULL; gint len; if (!emfv || !emfv->preview || !gtk_html_command (((EMFormatHTML *)emfv->preview)->html, "is-selection-active")) @@ -602,7 +602,7 @@ mail_to_event (ECalSourceType source_type, gboolean with_attendees, GPtrArray *u client = auth_new_cal_from_source (source, source_type); if (!client) { - char *uri = e_source_get_uri (source); + gchar *uri = e_source_get_uri (source); e_notice (NULL, GTK_MESSAGE_ERROR, "Could not create the client: %s", uri); @@ -635,24 +635,24 @@ mail_to_event (ECalSourceType source_type, gboolean with_attendees, GPtrArray *u /* ************************************************************************* */ -int e_plugin_lib_enable (EPluginLib *ep, int enable); -void org_gnome_mail_to_event (void *ep, EMPopupTargetSelect *t); +gint e_plugin_lib_enable (EPluginLib *ep, gint enable); +void org_gnome_mail_to_event (gpointer ep, EMPopupTargetSelect *t); void org_gnome_mail_to_event_menu (EPlugin *ep, EMMenuTargetSelect *t); -void org_gnome_mail_to_meeting (void *ep, EMPopupTargetSelect *t); +void org_gnome_mail_to_meeting (gpointer ep, EMPopupTargetSelect *t); void org_gnome_mail_to_meeting_menu (EPlugin *ep, EMMenuTargetSelect *t); -void org_gnome_mail_to_task (void *ep, EMPopupTargetSelect *t); +void org_gnome_mail_to_task (gpointer ep, EMPopupTargetSelect *t); void org_gnome_mail_to_task_menu (EPlugin *ep, EMMenuTargetSelect *t); -void org_gnome_mail_to_memo (void *ep, EMPopupTargetSelect *t); +void org_gnome_mail_to_memo (gpointer ep, EMPopupTargetSelect *t); void org_gnome_mail_to_memo_menu (EPlugin *ep, EMMenuTargetSelect *t); -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { return 0; } void -org_gnome_mail_to_event (void *ep, EMPopupTargetSelect *t) +org_gnome_mail_to_event (gpointer ep, EMPopupTargetSelect *t) { mail_to_event (E_CAL_SOURCE_TYPE_EVENT, FALSE, t->uids, t->folder, (EMFolderView *) t->target.widget); } @@ -664,7 +664,7 @@ org_gnome_mail_to_event_menu (EPlugin *ep, EMMenuTargetSelect *t) } void -org_gnome_mail_to_meeting (void *ep, EMPopupTargetSelect *t) +org_gnome_mail_to_meeting (gpointer ep, EMPopupTargetSelect *t) { mail_to_event (E_CAL_SOURCE_TYPE_EVENT, TRUE, t->uids, t->folder, (EMFolderView *) t->target.widget); } @@ -676,7 +676,7 @@ org_gnome_mail_to_meeting_menu (EPlugin *ep, EMMenuTargetSelect *t) } void -org_gnome_mail_to_task (void *ep, EMPopupTargetSelect *t) +org_gnome_mail_to_task (gpointer ep, EMPopupTargetSelect *t) { mail_to_event (E_CAL_SOURCE_TYPE_TODO, TRUE, t->uids, t->folder, (EMFolderView *) t->target.widget); } @@ -688,7 +688,7 @@ org_gnome_mail_to_task_menu (EPlugin *ep, EMMenuTargetSelect *t) } void -org_gnome_mail_to_memo (void *ep, EMPopupTargetSelect *t) +org_gnome_mail_to_memo (gpointer ep, EMPopupTargetSelect *t) { /* do not set organizer and attendees for memos */ mail_to_event (E_CAL_SOURCE_TYPE_JOURNAL, FALSE, t->uids, t->folder, (EMFolderView *) t->target.widget); diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index 7dc1895389..f3ca8d1651 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -58,7 +58,7 @@ typedef enum { typedef struct { EmlaAction action; /* action enumeration */ gboolean interactive; /* whether the user needs to edit a mailto: message (e.g. for post action) */ - const char* header; /* header representing the action */ + const gchar * header; /* header representing the action */ } EmlaActionHeader; const EmlaActionHeader emla_action_headers[] = { @@ -70,7 +70,7 @@ const EmlaActionHeader emla_action_headers[] = { { EMLA_ACTION_ARCHIVE, FALSE, "List-Archive" }, }; -const int emla_n_action_headers = sizeof(emla_action_headers) / sizeof(EmlaActionHeader); +const gint emla_n_action_headers = sizeof(emla_action_headers) / sizeof(EmlaActionHeader); void emla_list_action (EPlugin *item, EMMenuTargetSelect* sel, EmlaAction action); void emla_list_help (EPlugin *item, EMMenuTargetSelect* sel); @@ -80,11 +80,11 @@ void emla_list_post (EPlugin *item, EMMenuTargetSelect* sel); void emla_list_owner (EPlugin *item, EMMenuTargetSelect* sel); void emla_list_archive (EPlugin *item, EMMenuTargetSelect* sel); -void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data); +void emla_list_action_do (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data); typedef struct { EmlaAction action; - char* uri; + gchar * uri; } emla_action_data; void emla_list_action (EPlugin *item, EMMenuTargetSelect* sel, EmlaAction action) @@ -97,19 +97,19 @@ void emla_list_action (EPlugin *item, EMMenuTargetSelect* sel, EmlaAction action data->action = action; data->uri = strdup (sel->uri); - mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0), + mail_get_message (sel->folder, (const gchar *) g_ptr_array_index (sel->uids, 0), emla_list_action_do, data, mail_msg_unordered_push); } -void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) +void emla_list_action_do (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data) { emla_action_data *action_data = (emla_action_data *) data; EmlaAction action = action_data->action; - const char* header = NULL, *headerpos; - char *end, *url = NULL; - int t; + const gchar * header = NULL, *headerpos; + gchar *end, *url = NULL; + gint t; EMsgComposer *composer; - int send_message_response; + gint send_message_response; EAccount *account; if (msg == NULL) diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index dfcf75937b..87f52183fd 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -42,7 +42,7 @@ "only, or in the current folder as well as all subfolders?") void org_gnome_mark_all_read (EPlugin *ep, EMPopupTargetFolder *target); -static void mar_got_folder (char *uri, CamelFolder *folder, void *data); +static void mar_got_folder (gchar *uri, CamelFolder *folder, gpointer data); static void mar_all_sub_folders (CamelStore *store, CamelFolderInfo *fi, CamelException *ex); static void @@ -204,7 +204,7 @@ static void mark_all_as_read (CamelFolder *folder) { GPtrArray *uids; - int i; + gint i; uids = camel_folder_get_uids (folder); camel_folder_freeze(folder); @@ -215,7 +215,7 @@ mark_all_as_read (CamelFolder *folder) } static void -mar_got_folder (char *uri, CamelFolder *folder, void *data) +mar_got_folder (gchar *uri, CamelFolder *folder, gpointer data) { CamelFolderInfo *info; CamelStore *store; diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c index 0bc95619ce..c7feb024b0 100644 --- a/plugins/mono/mono-plugin.c +++ b/plugins/mono/mono-plugin.c @@ -37,7 +37,7 @@ static MonoDomain *domain; /* ********************************************************************** */ -static void *epm_parent_class; +static gpointer epm_parent_class; typedef struct _EPluginMonoPrivate { MonoAssembly *assembly; @@ -48,13 +48,13 @@ typedef struct _EPluginMonoPrivate { #define epm ((EPluginMono *)ep) -void * load_plugin_type_register_function (void *a, void *b); +gpointer load_plugin_type_register_function (gpointer a, gpointer b); -static char * -get_xml_prop(xmlNodePtr node, const char *id) +static gchar * +get_xml_prop(xmlNodePtr node, const gchar *id) { - char *p = xmlGetProp(node, id); - char *out = NULL; + gchar *p = xmlGetProp(node, id); + gchar *out = NULL; if (p) { out = g_strdup(p); @@ -72,14 +72,14 @@ get_xml_prop(xmlNodePtr node, const char *id) All methods take a single (structured) argument. */ -static void * -epm_invoke(EPlugin *ep, const char *name, void *data) +static gpointer +epm_invoke(EPlugin *ep, const gchar *name, gpointer data) { EPluginMonoPrivate *p = epm->priv; MonoMethodDesc *d; MonoMethod *m; MonoObject *x = NULL, *res; - void **params; + gpointer *params; g_print ("\n\a epm_invoke in mono-plugin.c in mono plugin loader is called \n\a"); @@ -158,7 +158,7 @@ epm_invoke(EPlugin *ep, const char *name, void *data) mono_print_unhandled_exception(x); if (res) { - void **p = mono_object_unbox(res); + gpointer *p = mono_object_unbox(res); d(printf("mono method returned '%p' %ld\n", *p, (long int)*p)); return *p; } else @@ -217,8 +217,8 @@ epm_init(GObject *o) (GDestroyNotify) NULL); } -void * -load_plugin_type_register_function (void *a, void *b) +gpointer +load_plugin_type_register_function (gpointer a, gpointer b) { static GType type = 0; diff --git a/plugins/mono/mono-plugin.h b/plugins/mono/mono-plugin.h index 9dd8facdb3..8ea867e806 100644 --- a/plugins/mono/mono-plugin.h +++ b/plugins/mono/mono-plugin.h @@ -38,14 +38,14 @@ struct _EPluginMono { struct _EPluginMonoPrivate *priv; - char *location; /* location */ - char *handler; /* handler class */ + gchar *location; /* location */ + gchar *handler; /* handler class */ }; struct _EPluginMonoClass { EPluginClass plugin_class; }; -void *org_gnome_evolution_mono_get_type(void *a, void *b); +gpointer org_gnome_evolution_mono_get_type(gpointer a, gpointer b); #endif /* ! _ORG_GNOME_EVOLUTION_MONO_H */ diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c index 54d166065b..816505b662 100644 --- a/plugins/plugin-manager/plugin-manager.c +++ b/plugins/plugin-manager/plugin-manager.c @@ -52,7 +52,7 @@ enum }; static struct { - const char *label; + const gchar *label; } label_info[LABEL_LAST] = { { N_("Name"), }, { N_("Author(s)"), }, @@ -81,10 +81,10 @@ static GtkWidget *configure_page; static gint last_selected_page; static gulong switch_page_handler_id; -void org_gnome_plugin_manager_manage(void *ep, ESMenuTargetShell *t); +void org_gnome_plugin_manager_manage(gpointer ep, ESMenuTargetShell *t); static void -eppm_set_label (GtkLabel *l, const char *v) +eppm_set_label (GtkLabel *l, const gchar *v) { gtk_label_set_label(l, v?v:_("Unknown")); } @@ -101,7 +101,7 @@ static void eppm_show_plugin (Manager *m, EPlugin *ep, GtkWidget *cfg_widget) { if (ep) { - char *string; + gchar *string; string = g_strdup_printf ("%s", ep->name); gtk_label_set_markup (GTK_LABEL (m->items[LABEL_NAME]), string); @@ -133,7 +133,7 @@ eppm_show_plugin (Manager *m, EPlugin *ep, GtkWidget *cfg_widget) eppm_set_label (m->items[LABEL_DESCRIPTION], ep->description); } else { - int i; + gint i; gtk_label_set_markup (GTK_LABEL (m->config_plugin_label), ""); for (i = 0; i < LABEL_LAST; i++) @@ -184,7 +184,7 @@ eppm_selection_changed (GtkTreeSelection *selection, Manager *m) } static void -eppm_enable_toggled (GtkCellRendererToggle *renderer, const char *path_string, Manager *m) +eppm_enable_toggled (GtkCellRendererToggle *renderer, const gchar *path_string, Manager *m) { GtkTreePath *path; GtkTreeIter iter; @@ -207,7 +207,7 @@ eppm_enable_toggled (GtkCellRendererToggle *renderer, const char *path_string, M } static void -eppm_free (void *data) +eppm_free (gpointer data) { Manager *m = data; GSList *l; @@ -221,24 +221,24 @@ eppm_free (void *data) } static void -eppm_response (GtkDialog *w, int button, Manager *m) +eppm_response (GtkDialog *w, gint button, Manager *m) { gtk_widget_destroy (GTK_WIDGET (w)); dialog = NULL; } void -org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t) +org_gnome_plugin_manager_manage (gpointer ep, ESMenuTargetShell *t) { Manager *m; - int i; + gint i; GtkWidget *hbox, *w; GtkWidget *overview_page; GtkListStore *store; GtkTreeSelection *selection; GtkCellRenderer *renderer; GSList *l; - char *string; + gchar *string; GtkWidget *subvbox; if (dialog) { @@ -391,7 +391,7 @@ org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t) /* this is every other data */ for (i = 1; i < LABEL_LAST; i++) { - char *markup; + gchar *markup; subvbox = gtk_vbox_new (FALSE, 6); @@ -431,10 +431,10 @@ org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t) gtk_widget_show (GTK_WIDGET (m->dialog)); } -int e_plugin_lib_enable (EPluginLib *ep, int enable); +gint e_plugin_lib_enable (EPluginLib *ep, gint enable); -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { if (enable) { } else { diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index 13453b20f1..dd7e4539b8 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -37,8 +37,8 @@ #include #include "mail/em-config.h" -void org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t); -void org_gnome_prefer_plain_text_html(void *ep, EMFormatHookTarget *t); +void org_gnome_prefer_plain_multipart_alternative(gpointer ep, EMFormatHookTarget *t); +void org_gnome_prefer_plain_text_html(gpointer ep, EMFormatHookTarget *t); GtkWidget *org_gnome_prefer_plain_config_mode(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); enum { @@ -48,10 +48,10 @@ enum { }; static GConfClient *epp_gconf = NULL; -static int epp_mode = -1; +static gint epp_mode = -1; void -org_gnome_prefer_plain_text_html(void *ep, EMFormatHookTarget *t) +org_gnome_prefer_plain_text_html(gpointer ep, EMFormatHookTarget *t) { /* In text-only mode, all html output is suppressed */ if (epp_mode != EPP_TEXT) @@ -63,7 +63,7 @@ org_gnome_prefer_plain_text_html(void *ep, EMFormatHookTarget *t) static void export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream, CamelMimePart *except) { - int i, nparts, partidlen; + gint i, nparts, partidlen; CamelMimePart *part; if (!mp || !CAMEL_IS_MULTIPART (mp)) @@ -88,7 +88,7 @@ export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream camel_mime_part_set_disposition (part, "attachment"); if (!camel_mime_part_get_filename (part)) { - char *str = g_strdup_printf ("%s.html", _("attachment")); + gchar *str = g_strdup_printf ("%s.html", _("attachment")); camel_mime_part_set_filename (part, str); g_free (str); } @@ -104,11 +104,11 @@ export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream } void -org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t) +org_gnome_prefer_plain_multipart_alternative(gpointer ep, EMFormatHookTarget *t) { CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)t->part); CamelMimePart *part, *display_part = NULL; - int i, nparts, partidlen, displayid = 0; + gint i, nparts, partidlen, displayid = 0; /* FIXME: this part-id stuff is poking private data, needs api */ partidlen = t->format->part_id->len; @@ -183,8 +183,8 @@ org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t) } static struct { - const char *label; - const char *key; + const gchar *label; + const gchar *key; } epp_options[] = { { N_("Show HTML if present"), "normal" }, { N_("Prefer PLAIN"), "prefer_plain" }, @@ -192,7 +192,7 @@ static struct { }; static void -epp_mode_changed(GtkComboBox *dropdown, void *dummy) +epp_mode_changed(GtkComboBox *dropdown, gpointer dummy) { epp_mode = gtk_combo_box_get_active(dropdown); if (epp_mode > 2) @@ -209,7 +209,7 @@ org_gnome_prefer_plain_config_mode(struct _EPlugin *epl, struct _EConfigHookItem GtkCellRenderer *cell; GtkListStore *store; GtkWidget *w; - int i; + gint i; GtkTreeIter iter; if (data->old) @@ -243,13 +243,13 @@ org_gnome_prefer_plain_config_mode(struct _EPlugin *epl, struct _EConfigHookItem return (GtkWidget *)dropdown; } -int e_plugin_lib_enable(EPluginLib *ep, int enable); +gint e_plugin_lib_enable(EPluginLib *ep, gint enable); -int -e_plugin_lib_enable(EPluginLib *ep, int enable) +gint +e_plugin_lib_enable(EPluginLib *ep, gint enable) { - char *key; - int i; + gchar *key; + gint i; if (epp_gconf || epp_mode != -1) return 0; diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c index 08787fc1fc..94984a3560 100644 --- a/plugins/profiler/profiler.c +++ b/plugins/profiler/profiler.c @@ -38,7 +38,7 @@ org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t) static FILE *fp; if (!fp) { - char *name; + gchar *name; name = g_strdup_printf("eprofile.%ld", (long int)getpid()); fp = fopen(name, "w"); diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 4bfe66b41f..9c9f3ad244 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -72,9 +72,9 @@ typedef struct _PstImporter PstImporter; -int pst_init (pst_file *pst, char *filename); +gint pst_init (pst_file *pst, gchar *filename); gchar *get_pst_rootname (pst_file *pst, gchar *filename); -static void pst_error_msg (const char *fmt, ...); +static void pst_error_msg (const gchar *fmt, ...); static void pst_import_folders (PstImporter *m, pst_desc_ll *topitem); static void pst_process_item (PstImporter *m, pst_desc_ll *d_ptr); static void pst_process_folder (PstImporter *m, pst_item *item); @@ -89,13 +89,13 @@ gchar *foldername_to_utf8 (const gchar *pstname); gchar *string_to_utf8(const gchar *string); void contact_set_date (EContact *contact, EContactField id, FILETIME *date); struct icaltimetype get_ical_date (FILETIME *date, gboolean is_date); -char *rfc2445_datetime_format (FILETIME *ft); +gchar *rfc2445_datetime_format (FILETIME *ft); gboolean org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target); GtkWidget *org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im); void org_credativ_evolution_readpst_import (EImport *ei, EImportTarget *target, EImportImporter *im); void org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target, EImportImporter *im); -int e_plugin_lib_enable (EPluginLib *ep, int enable); +gint e_plugin_lib_enable (EPluginLib *ep, gint enable); /* em-folder-selection-button.h is private, even though other internal evo plugins use it! @@ -103,11 +103,11 @@ int e_plugin_lib_enable (EPluginLib *ep, int enable); TODO: sort out whether this should really be private */ typedef struct _EMFolderSelectionButton EMFolderSelectionButton; -GtkWidget *em_folder_selection_button_new (const char *title, const char *caption); -void em_folder_selection_button_set_selection (EMFolderSelectionButton *button, const char *uri); -const char *em_folder_selection_button_get_selection (EMFolderSelectionButton *button); +GtkWidget *em_folder_selection_button_new (const gchar *title, const gchar *caption); +void em_folder_selection_button_set_selection (EMFolderSelectionButton *button, const gchar *uri); +const gchar *em_folder_selection_button_get_selection (EMFolderSelectionButton *button); -static unsigned char pst_signature [] = { '!', 'B', 'D', 'N' }; +static guchar pst_signature [] = { '!', 'B', 'D', 'N' }; struct _PstImporter { MailMsg base; @@ -116,9 +116,9 @@ struct _PstImporter { EImportTarget *target; GMutex *status_lock; - char *status_what; - int status_pc; - int status_timeout_id; + gchar *status_what; + gint status_pc; + gint status_timeout_id; CamelOperation *status; CamelException ex; @@ -129,8 +129,8 @@ struct _PstImporter { gchar *parent_uri; gchar *folder_name; gchar *folder_uri; - int folder_count; - int current_item; + gint folder_count; + gint current_item; EBook *addressbook; ECal *calendar; @@ -141,11 +141,11 @@ struct _PstImporter { gboolean org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target) { - char signature[sizeof (pst_signature)]; + gchar signature[sizeof (pst_signature)]; gboolean ret = FALSE; - int fd, n; + gint fd, n; EImportTargetURI *s; - char *filename; + gchar *filename; if (target->type != E_IMPORT_TARGET_URI) { return FALSE; @@ -217,7 +217,7 @@ folder_selected (EMFolderSelectionButton *button, EImportTargetURI *target) * @param target * @return */ -static gchar* +static gchar * get_suggested_foldername (EImportTargetURI *target) { const gchar *inbox; @@ -259,7 +259,7 @@ get_suggested_foldername (EImportTargetURI *target) if (mail_tool_uri_to_folder (foldername->str, 0, NULL) != NULL) { /* Folder exists - add a number */ - int i, len; + gint i, len; len = foldername->len; CamelFolder *folder; @@ -346,14 +346,14 @@ org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EI return framebox; } -static char * -pst_import_describe (PstImporter *m, int complete) +static gchar * +pst_import_describe (PstImporter *m, gint complete) { return g_strdup (_("Importing Outlook data")); } static ECal* -open_ecal (ECalSourceType type, char *name) +open_ecal (ECalSourceType type, gchar *name) { /* Hack - grab the first calendar we can find TODO - add a selection mechanism in get_widget */ @@ -446,7 +446,7 @@ pst_import_import (PstImporter *m) static void pst_import_file (PstImporter *m) { - int ret; + gint ret; gchar *filename; pst_item *item = NULL; pst_desc_ll *d_ptr; @@ -689,7 +689,7 @@ pst_create_folder (PstImporter *m) { const gchar *parent; gchar *dest, *dest_end, *pos; - int dest_len; + gint dest_len; parent = ((EImportTargetURI *)m->target)->uri_dest; dest = g_strdup (m->folder_uri); @@ -733,7 +733,7 @@ static CamelMimePart * attachment_to_part (PstImporter *m, pst_item_attach *attach) { CamelMimePart *part; - char *mimetype; + gchar *mimetype; part = camel_mime_part_new (); @@ -754,11 +754,11 @@ attachment_to_part (PstImporter *m, pst_item_attach *attach) if (attach->data != NULL) { camel_mime_part_set_content (part, attach->data, strlen (attach->data), mimetype); } else { - char *buf = NULL; + gchar *buf = NULL; size_t size; size = pst_attach_to_mem (&m->pst, attach, &buf); - camel_mime_part_set_content (part, (char*) buf, size, mimetype); + camel_mime_part_set_content (part, (gchar *) buf, size, mimetype); free(buf); } @@ -942,7 +942,7 @@ pst_process_email (PstImporter *m, pst_item *item) } static void -contact_set_string (EContact *contact, EContactField id, char *string) +contact_set_string (EContact *contact, EContactField id, gchar *string) { if (string != NULL) { e_contact_set (contact, id, string); @@ -950,7 +950,7 @@ contact_set_string (EContact *contact, EContactField id, char *string) } static void -unknown_field (EContact *contact, GString *notes, char *name, char *string) +unknown_field (EContact *contact, GString *notes, gchar *name, gchar *string) { /* Field could not be mapped directly so add to notes field */ if (string != NULL) { @@ -959,7 +959,7 @@ unknown_field (EContact *contact, GString *notes, char *name, char *string) } static void -contact_set_address (EContact *contact, EContactField id, char *address, char *city, char *country, char *po_box, char *postal_code, char *state, char *street) +contact_set_address (EContact *contact, EContactField id, gchar *address, gchar *city, gchar *country, gchar *po_box, gchar *postal_code, gchar *state, gchar *street) { EContactAddress *eaddress; @@ -1181,8 +1181,8 @@ get_ical_date (FILETIME *date, gboolean is_date) } } -char *rfc2445_datetime_format (FILETIME *ft) { - static char* buffer = NULL; +gchar *rfc2445_datetime_format (FILETIME *ft) { + static gchar * buffer = NULL; struct tm *stm = NULL; if (buffer == NULL) { @@ -1198,8 +1198,8 @@ static void set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_attach *attach) { GSList *list = NULL; - const char *uid; - char *store_dir; + const gchar *uid; + gchar *store_dir; if (attach == NULL) { return; @@ -1209,8 +1209,8 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta store_dir = g_filename_from_uri (e_cal_get_local_attachment_store (cal), NULL, NULL); while (attach != NULL) { - const char* orig_filename; - char *filename, *tmp, *path, *dirname, *uri; + const gchar * orig_filename; + gchar *filename, *tmp, *path, *dirname, *uri; CamelMimePart *part; CamelDataWrapper *content; CamelStream *stream; @@ -1292,7 +1292,7 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta } static void -fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char *type) +fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const gchar *type) { pst_item_appointment *a; pst_item_email *e; @@ -1537,7 +1537,7 @@ pst_process_journal (PstImporter *m, pst_item *item) /* Print an error message - maybe later bring up an error dialog? */ static void -pst_error_msg (const char *fmt, ...) +pst_error_msg (const gchar *fmt, ...) { va_list ap; @@ -1580,11 +1580,11 @@ static MailMsgInfo pst_import_info = { }; static gboolean -pst_status_timeout (void *data) +pst_status_timeout (gpointer data) { PstImporter *importer = data; - int pc; - char *what; + gint pc; + gchar *what; if (importer->status_what) { g_mutex_lock (importer->status_lock); @@ -1600,7 +1600,7 @@ pst_status_timeout (void *data) } static void -pst_status (CamelOperation *op, const char *what, int pc, void *data) +pst_status (CamelOperation *op, const gchar *what, gint pc, gpointer data) { PstImporter *importer = data; @@ -1621,7 +1621,7 @@ static int pst_import (EImport *ei, EImportTarget *target) { PstImporter *m; - int id; + gint id; m = mail_msg_new (&pst_import_info); g_datalist_set_data (&target->data, "pst-msg", m); @@ -1675,8 +1675,8 @@ org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target, EImpo } } -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { if (enable) { bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); @@ -1695,12 +1695,12 @@ e_plugin_lib_enable (EPluginLib *ep, int enable) * @param filename : path to file * @return 0 for sucess, -1 for failure */ -int +gint pst_init (pst_file *pst, gchar *filename) { #if 0 - char *d_log = "readpst.log"; + gchar *d_log = "readpst.log"; /* initialize log file */ DEBUG_INIT (d_log); DEBUG_REGISTER_CLOSE (); diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 943f0ed933..ad6e38e9f9 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -47,9 +47,9 @@ static gint online = 0; static GSList *error_queue = NULL; static GStaticMutex error_queue_lock = G_STATIC_MUTEX_INIT; static guint error_queue_show_idle_id = 0; -static void error_queue_add (char *descriptions, GError *error); +static void error_queue_add (gchar *descriptions, GError *error); -int e_plugin_lib_enable (EPlugin *ep, int enable); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); void action_publish (EPlugin *ep, ECalMenuTargetSelect *t); void online_state_changed (EPlugin *ep, ESEventTargetState *target); void publish_calendar_context_activate (EPlugin *ep, ECalPopupTargetSource *target); @@ -233,14 +233,14 @@ ask_password (GMountOperation *op, const gchar *message, const gchar *default_us } static void -ask_question (GMountOperation *op, const char *message, const char *choices[]) +ask_question (GMountOperation *op, const gchar *message, const gchar *choices[]) { /* this has been stolen from file-chooser */ GtkWidget *dialog; - int cnt, len; - char *primary; - const char *secondary = NULL; - int res; + gint cnt, len; + gchar *primary; + const gchar *secondary = NULL; + gint res; primary = strstr (message, "\n"); if (primary) { @@ -452,7 +452,7 @@ url_list_changed (PublishUIData *ui) valid = gtk_tree_model_get_iter_first (model, &iter); while (valid) { EPublishUri *url; - char *xml; + gchar *xml; gtk_tree_model_get (model, &iter, URL_LIST_URL_COLUMN, &url, -1); @@ -469,7 +469,7 @@ url_list_changed (PublishUIData *ui) static void url_list_enable_toggled (GtkCellRendererToggle *renderer, - const char *path_string, + const gchar *path_string, PublishUIData *ui) { GtkTreeSelection *selection; @@ -618,7 +618,7 @@ url_remove_clicked (GtkButton *button, PublishUIData *ui) gtk_widget_destroy (confirm); if (response == GTK_RESPONSE_YES) { - int len; + gint len; guint id; gtk_list_store_remove (GTK_LIST_STORE (model), &iter); @@ -685,7 +685,7 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) GSList *l; GtkTreeIter iter; GConfClient *client; - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "publish-calendar.glade", @@ -806,8 +806,8 @@ publish_uris_set_timeout (GSList *uris) g_slist_free (uris); } -int -e_plugin_lib_enable (EPlugin *ep, int enable) +gint +e_plugin_lib_enable (EPlugin *ep, gint enable) { GSList *uris; GConfClient *client; @@ -831,7 +831,7 @@ e_plugin_lib_enable (EPlugin *ep, int enable) } struct eq_data { - char *description; + gchar *description; GError *error; }; @@ -899,7 +899,7 @@ error_queue_show_idle (gpointer user_data) } void -error_queue_add (char *description, GError *error) +error_queue_add (gchar *description, GError *error) { struct eq_data *data; diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index b28444458e..01b4e7a926 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -33,7 +33,7 @@ #include "publish-format-fb.h" static gboolean -write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream, int dur_type, int dur_value, GError **error) +write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream, gint dur_type, gint dur_value, GError **error) { ESource *source; ECal *client = NULL; @@ -41,7 +41,7 @@ write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream, int icaltimezone *utc; time_t start = time(NULL), end; icalcomponent *top_level; - char *email = NULL; + gchar *email = NULL; GList *users = NULL; gboolean res = FALSE; @@ -83,7 +83,7 @@ write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream, int top_level = e_cal_util_new_top_level (); if (e_cal_get_free_busy (client, users, start, end, &objects, error)) { - char *ical_string; + gchar *ical_string; while (objects) { ECalComponent *comp = objects->data; diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c index 04e70ca8a8..f6e780daab 100644 --- a/plugins/publish-calendar/publish-format-ical.c +++ b/plugins/publish-calendar/publish-format-ical.c @@ -36,9 +36,9 @@ typedef struct { } CompTzData; static void -insert_tz_comps (icalparameter *param, void *cb_data) +insert_tz_comps (icalparameter *param, gpointer cb_data) { - const char *tzid; + const gchar *tzid; CompTzData *tdata = cb_data; icaltimezone *zone = NULL; icalcomponent *tzcomp; @@ -91,7 +91,7 @@ write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream, GEr top_level = e_cal_util_new_top_level (); if (e_cal_get_object_list (client, "#t", &objects, error)) { - char *ical_string; + gchar *ical_string; CompTzData tdata; tdata.zones = g_hash_table_new (g_str_hash, g_str_equal); diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c index 71b82c8e07..98a8247725 100644 --- a/plugins/publish-calendar/publish-location.c +++ b/plugins/publish-calendar/publish-location.c @@ -54,12 +54,12 @@ migrateURI (const gchar *xml, xmlDocPtr doc) uri = g_new0 (EPublishUri, 1); root = doc->children; - location = xmlGetProp (root, (const unsigned char *)"location"); - enabled = xmlGetProp (root, (const unsigned char *)"enabled"); - frequency = xmlGetProp (root, (const unsigned char *)"frequency"); - username = xmlGetProp (root, (const unsigned char *)"username"); + location = xmlGetProp (root, (const guchar *)"location"); + enabled = xmlGetProp (root, (const guchar *)"enabled"); + frequency = xmlGetProp (root, (const guchar *)"frequency"); + username = xmlGetProp (root, (const guchar *)"username"); - euri = e_uri_new ((const char *)location); + euri = e_uri_new ((const gchar *)location); if (!euri) { g_warning ("Could not form the uri for %s \n", location); @@ -69,7 +69,7 @@ migrateURI (const gchar *xml, xmlDocPtr doc) if (euri->user) g_free (euri->user); - euri->user = g_strdup ((const char *)username); + euri->user = g_strdup ((const gchar *)username); temp = e_uri_to_string (euri, FALSE); uri->location = g_strdup_printf ("dav://%s", strstr (temp, "//") + 2); @@ -77,21 +77,21 @@ migrateURI (const gchar *xml, xmlDocPtr doc) e_uri_free (euri); if (enabled != NULL) - uri->enabled = atoi ((char *)enabled); + uri->enabled = atoi ((gchar *)enabled); if (frequency != NULL) - uri->publish_frequency = atoi ((char *)frequency); + uri->publish_frequency = atoi ((gchar *)frequency); uri->publish_format = URI_PUBLISH_AS_FB; - password = e_passwords_get_password ("Calendar", (char *)location); + password = e_passwords_get_password ("Calendar", (gchar *)location); if (password) { - e_passwords_forget_password ("Calendar", (char *)location); + e_passwords_forget_password ("Calendar", (gchar *)location); e_passwords_add_password (uri->location, password); e_passwords_remember_password ("Calendar", uri->location); } for (p = root->children; p != NULL; p = p->next) { - xmlChar *uid = xmlGetProp (p, (const unsigned char *)"uid"); - if (strcmp ((char *)p->name, "source") == 0) { + xmlChar *uid = xmlGetProp (p, (const guchar *)"uid"); + if (strcmp ((gchar *)p->name, "source") == 0) { events = g_slist_append (events, uid); } else { g_free (uid); @@ -125,15 +125,15 @@ e_publish_uri_from_xml (const gchar *xml) GSList *events = NULL; EPublishUri *uri; - doc = xmlParseDoc ((const unsigned char *)xml); + doc = xmlParseDoc ((const guchar *)xml); if (doc == NULL) return NULL; root = doc->children; - if (strcmp ((char *)root->name, "uri") != 0) + if (strcmp ((gchar *)root->name, "uri") != 0) return NULL; - if ((username = xmlGetProp (root, (const unsigned char *)"username"))) { + if ((username = xmlGetProp (root, (const guchar *)"username"))) { xmlFree (username); return migrateURI (xml, doc); @@ -141,27 +141,27 @@ e_publish_uri_from_xml (const gchar *xml) uri = g_new0 (EPublishUri, 1); - location = xmlGetProp (root, (const unsigned char *)"location"); - enabled = xmlGetProp (root, (const unsigned char *)"enabled"); - frequency = xmlGetProp (root, (const unsigned char *)"frequency"); - format = xmlGetProp (root, (const unsigned char *)"format"); - publish_time = xmlGetProp (root, (const unsigned char *)"publish_time"); + location = xmlGetProp (root, (const guchar *)"location"); + enabled = xmlGetProp (root, (const guchar *)"enabled"); + frequency = xmlGetProp (root, (const guchar *)"frequency"); + format = xmlGetProp (root, (const guchar *)"format"); + publish_time = xmlGetProp (root, (const guchar *)"publish_time"); fb_duration_value = xmlGetProp (root, (xmlChar *)"fb_duration_value"); fb_duration_type = xmlGetProp (root, (xmlChar *)"fb_duration_type"); if (location != NULL) - uri->location = (char *)location; + uri->location = (gchar *)location; if (enabled != NULL) - uri->enabled = atoi ((char *)enabled); + uri->enabled = atoi ((gchar *)enabled); if (frequency != NULL) - uri->publish_frequency = atoi ((char *)frequency); + uri->publish_frequency = atoi ((gchar *)frequency); if (format != NULL) - uri->publish_format = atoi ((char *)format); + uri->publish_format = atoi ((gchar *)format); if (publish_time != NULL) - uri->last_pub_time = (char *)publish_time; + uri->last_pub_time = (gchar *)publish_time; if (fb_duration_value) - uri->fb_duration_value = atoi ((char *)fb_duration_value); + uri->fb_duration_value = atoi ((gchar *)fb_duration_value); else uri->fb_duration_value = -1; @@ -170,9 +170,9 @@ e_publish_uri_from_xml (const gchar *xml) else if (uri->fb_duration_value > 100) uri->fb_duration_value = 100; - if (fb_duration_type && g_str_equal ((char *)fb_duration_type, "days")) + if (fb_duration_type && g_str_equal ((gchar *)fb_duration_type, "days")) uri->fb_duration_type = FB_DURATION_DAYS; - else if (fb_duration_type && g_str_equal ((char *)fb_duration_type, "months")) + else if (fb_duration_type && g_str_equal ((gchar *)fb_duration_type, "months")) uri->fb_duration_type = FB_DURATION_MONTHS; else uri->fb_duration_type = FB_DURATION_WEEKS; @@ -180,8 +180,8 @@ e_publish_uri_from_xml (const gchar *xml) uri->password = g_strdup (""); for (p = root->children; p != NULL; p = p->next) { - xmlChar *uid = xmlGetProp (p, (const unsigned char *)"uid"); - if (strcmp ((char *)p->name, "event") == 0) { + xmlChar *uid = xmlGetProp (p, (const guchar *)"uid"); + if (strcmp ((gchar *)p->name, "event") == 0) { events = g_slist_append (events, uid); } else { g_free (uid); @@ -207,23 +207,23 @@ e_publish_uri_to_xml (EPublishUri *uri) gchar *enabled, *frequency, *format; GSList *calendars = NULL; xmlChar *xml_buffer; - char *returned_buffer; - int xml_buffer_size; + gchar *returned_buffer; + gint xml_buffer_size; g_return_val_if_fail (uri != NULL, NULL); g_return_val_if_fail (uri->location != NULL, NULL); - doc = xmlNewDoc ((const unsigned char *)"1.0"); + doc = xmlNewDoc ((const guchar *)"1.0"); - root = xmlNewDocNode (doc, NULL, (const unsigned char *)"uri", NULL); + root = xmlNewDocNode (doc, NULL, (const guchar *)"uri", NULL); enabled = g_strdup_printf ("%d", uri->enabled); frequency = g_strdup_printf ("%d", uri->publish_frequency); format = g_strdup_printf ("%d", uri->publish_format); - xmlSetProp (root, (const unsigned char *)"location", (unsigned char *)uri->location); - xmlSetProp (root, (const unsigned char *)"enabled", (unsigned char *)enabled); - xmlSetProp (root, (const unsigned char *)"frequency", (unsigned char *)frequency); - xmlSetProp (root, (const unsigned char *)"format", (unsigned char *)format); - xmlSetProp (root, (const unsigned char *)"publish_time", (unsigned char *)uri->last_pub_time); + xmlSetProp (root, (const guchar *)"location", (guchar *)uri->location); + xmlSetProp (root, (const guchar *)"enabled", (guchar *)enabled); + xmlSetProp (root, (const guchar *)"frequency", (guchar *)frequency); + xmlSetProp (root, (const guchar *)"format", (guchar *)format); + xmlSetProp (root, (const guchar *)"publish_time", (guchar *)uri->last_pub_time); g_free (format); format = g_strdup_printf ("%d", uri->fb_duration_value); @@ -238,8 +238,8 @@ e_publish_uri_to_xml (EPublishUri *uri) for (calendars = uri->events; calendars != NULL; calendars = g_slist_next (calendars)) { xmlNodePtr node; - node = xmlNewChild (root, NULL, (const unsigned char *)"event", NULL); - xmlSetProp (node, (const unsigned char *)"uid", calendars->data); + node = xmlNewChild (root, NULL, (const guchar *)"event", NULL); + xmlSetProp (node, (const guchar *)"uid", calendars->data); } xmlDocSetRootElement (doc, root); diff --git a/plugins/publish-calendar/publish-location.h b/plugins/publish-calendar/publish-location.h index a6afc2c272..a55d432a8e 100644 --- a/plugins/publish-calendar/publish-location.h +++ b/plugins/publish-calendar/publish-location.h @@ -34,7 +34,7 @@ enum publish_frequency { URI_PUBLISH_MANUAL }; -static const int publish_frequency_type_map[] = { +static const gint publish_frequency_type_map[] = { URI_PUBLISH_DAILY, URI_PUBLISH_WEEKLY, URI_PUBLISH_MANUAL, @@ -46,7 +46,7 @@ enum publish_format { URI_PUBLISH_AS_FB }; -static const int publish_format_type_mask[] = { +static const gint publish_format_type_mask[] = { URI_PUBLISH_AS_ICAL, URI_PUBLISH_AS_FB, -1 @@ -67,8 +67,8 @@ struct _EPublishUri { gchar *password; GSList *events; gchar *last_pub_time; - int fb_duration_value; - int fb_duration_type; + gint fb_duration_value; + gint fb_duration_type; gint service_type; }; diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index 08e59513e8..7456d4b193 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -43,7 +43,7 @@ create_uri (UrlEditorDialog *dialog) uri->location = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->server_entry))); } else { const gchar *method; - char *server, *file, *port, *username, *password; + gchar *server, *file, *port, *username, *password; server = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->server_entry))); file = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->file_entry))); @@ -279,7 +279,7 @@ static void set_from_uri (UrlEditorDialog *dialog) { EPublishUri *uri; - char *method; + gchar *method; EUri *euri = NULL; uri = dialog->uri; @@ -287,17 +287,17 @@ set_from_uri (UrlEditorDialog *dialog) euri = e_uri_new (uri->location); /* determine our method */ method = euri->protocol; - if (strcmp ((const char *)method, "smb") == 0) + if (strcmp ((const gchar *)method, "smb") == 0) uri->service_type = TYPE_SMB; - else if (strcmp ((const char *)method, "sftp") == 0) + else if (strcmp ((const gchar *)method, "sftp") == 0) uri->service_type = TYPE_SFTP; - else if (strcmp ((const char *)method, "ftp") == 0) + else if (strcmp ((const gchar *)method, "ftp") == 0) /* we set TYPE_FTP here for now. if we don't find a * username later, we'll change it to TYPE_ANON_FTP */ uri->service_type = TYPE_FTP; - else if (strcmp ((const char *)method, "dav") == 0) + else if (strcmp ((const gchar *)method, "dav") == 0) uri->service_type = TYPE_DAV; - else if (strcmp ((const char *)method, "davs") == 0) + else if (strcmp ((const gchar *)method, "davs") == 0) uri->service_type = TYPE_DAVS; else uri->service_type = TYPE_URI; @@ -309,7 +309,7 @@ set_from_uri (UrlEditorDialog *dialog) gtk_entry_set_text (GTK_ENTRY (dialog->server_entry), euri->host); if (euri->port) { - char *port; + gchar *port; port = g_strdup_printf ("%d", euri->port); gtk_entry_set_text (GTK_ENTRY (dialog->port_entry), port); g_free (port); @@ -331,7 +331,7 @@ url_editor_dialog_construct (UrlEditorDialog *dialog) GConfClient *gconf; GtkSizeGroup *group; EPublishUri *uri; - char *gladefile; + gchar *gladefile; gconf = gconf_client_get_default (); diff --git a/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c index ea9ab4bfb0..4d7ead37da 100644 --- a/plugins/python/python-plugin-loader.c +++ b/plugins/python/python-plugin-loader.c @@ -28,7 +28,7 @@ #define d(x) -static void *epp_parent_class; +static gpointer epp_parent_class; typedef struct _EPluginPythonPrivate { PyObject *pModule; @@ -40,13 +40,13 @@ typedef struct _EPluginPythonPrivate { #define epp ((EPluginPython *)ep) -void * load_plugin_type_register_function (void *a, void *b); +gpointer load_plugin_type_register_function (gpointer a, gpointer b); -static char * -get_xml_prop(xmlNodePtr node, const char *id) +static gchar * +get_xml_prop(xmlNodePtr node, const gchar *id) { - char *p = xmlGetProp(node, id); - char *out = NULL; + gchar *p = xmlGetProp(node, id); + gchar *out = NULL; if (p) { out = g_strdup(p); @@ -56,8 +56,8 @@ get_xml_prop(xmlNodePtr node, const char *id) return out; } -static void * -epp_invoke(EPlugin *ep, const char *name, void *data) +static gpointer +epp_invoke(EPlugin *ep, const gchar *name, gpointer data) { EPluginPythonPrivate *p = epp->priv; PyObject *pModuleName, *pFunc; @@ -168,8 +168,8 @@ epp_init(GObject *o) (GDestroyNotify) NULL); } -void * -load_plugin_type_register_function (void *a, void *b) +gpointer +load_plugin_type_register_function (gpointer a, gpointer b) { static GType type = 0; diff --git a/plugins/python/python-plugin-loader.h b/plugins/python/python-plugin-loader.h index 4f9656e119..4f31ddd5a7 100644 --- a/plugins/python/python-plugin-loader.h +++ b/plugins/python/python-plugin-loader.h @@ -33,16 +33,16 @@ struct _EPluginPython { struct _EPluginPythonPrivate *priv; - char *location; /* location */ - char *pClass; /* handler class */ - char *module_name; + gchar *location; /* location */ + gchar *pClass; /* handler class */ + gchar *module_name; }; struct _EPluginPythonClass { EPluginClass plugin_class; }; -void *org_gnome_evolution_python_get_type(void *a, void *b); +gpointer org_gnome_evolution_python_get_type(gpointer a, gpointer b); #endif /* ! _ORG_GNOME_EVOLUTION_PYTHON_H */ diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 8846e8b4be..3c92b386ae 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -58,12 +58,12 @@ static pthread_mutex_t em_junk_sa_report_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t em_junk_sa_preferred_socket_path_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t em_junk_sa_spamd_restart_lock = PTHREAD_MUTEX_INITIALIZER; -int e_plugin_lib_enable (EPluginLib *ep, int enable); +gint e_plugin_lib_enable (EPluginLib *ep, gint enable); gboolean em_junk_sa_check_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_sa_commit_reports (EPlugin *ep); -void *em_junk_sa_validate_binary (EPlugin *ep); +gpointer em_junk_sa_validate_binary (EPlugin *ep); GtkWidget *org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); static void em_junk_sa_init (void); @@ -79,41 +79,41 @@ static gboolean em_junk_sa_system_spamd_available = FALSE; static gboolean em_junk_sa_new_daemon_started = FALSE; 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 gchar *em_junk_sa_socket_path = NULL; +static gchar *em_junk_sa_spamd_pidfile = NULL; static const gchar *em_junk_sa_spamc_binary = NULL; static GConfClient *em_junk_sa_gconf = NULL; /* volatile so not cached between threads */ 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 gchar * em_junk_sa_preferred_socket_path; 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}; -static int em_junk_sa_spamd_restarts_count = 0; +static gint em_junk_sa_spamd_restarts_count = 0; /* Variables to indicate whether spamd is running with --allow-tell */ -static int no_allow_tell; +static gint no_allow_tell; static gboolean em_junk_sa_allow_tell_tested = FALSE; -char *em_junk_sa_spamc_gconf_binary = NULL; -char *em_junk_sa_spamd_gconf_binary = NULL; +gchar *em_junk_sa_spamc_gconf_binary = NULL; +gchar *em_junk_sa_spamd_gconf_binary = NULL; static int -pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **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, gint rv_err, gint wait_for_termination, GByteArray *output_buffer, GError **error) { - int result, status, errnosav, fds[2], out_fds[2]; + gint result, status, errnosav, fds[2], out_fds[2]; CamelStream *stream; - char *program; + gchar *program; pid_t pid; if (camel_debug_start ("junk")) { - int i; + gint i; printf ("pipe_to_sa "); for (i = 0; argv[i]; i++) @@ -150,7 +150,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, int if (!(pid = fork ())) { /* child process */ - int maxfd, fd, nullfd; + gint maxfd, fd, nullfd; nullfd = open ("/dev/null", O_WRONLY); @@ -212,13 +212,13 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, int camel_stream_write_to_stream (stream, (CamelStream *) memstream); camel_object_unref (stream); - g_byte_array_append (output_buffer, (unsigned char *)"", 1); + g_byte_array_append (output_buffer, (guchar *)"", 1); d(printf ("child process output: %s len: %d\n", output_buffer->data, output_buffer->len)); } if (wait_for_termination) { - int res; + gint res; d(printf ("wait for child %d termination\n", pid)); result = waitpid (pid, &status, 0); @@ -259,7 +259,7 @@ pipe_to_sa (CamelMimeMessage *msg, const gchar *in, const gchar **argv, GError * return pipe_to_sa_full (msg, in, argv, -1, 1, NULL, error); } -static char * +static gchar * em_junk_sa_get_socket_path () { if (em_junk_sa_preferred_socket_path) @@ -272,7 +272,7 @@ static gboolean em_junk_sa_test_spamd_running (const gchar *binary, gboolean system) { const gchar *argv[5]; - int i = 0; + gint i = 0; gboolean rv; pthread_mutex_lock (&em_junk_sa_preferred_socket_path_lock); @@ -341,7 +341,7 @@ static gboolean em_junk_sa_run_spamd (const gchar *binary) { const gchar *argv[8]; - int i; + gint i; gboolean rv = FALSE; pthread_mutex_lock (&em_junk_sa_preferred_socket_path_lock); @@ -395,7 +395,7 @@ em_junk_sa_run_spamd (const gchar *binary) static void em_junk_sa_start_own_daemon () { - int b; + gint b; em_junk_sa_new_daemon_started = FALSE; @@ -415,7 +415,7 @@ static void em_junk_sa_find_spamc () { if (em_junk_sa_use_spamc && em_junk_sa_new_daemon_started) { - int b; + gint b; em_junk_sa_use_spamc = FALSE; for (b = 0; em_junk_sa_spamc_binaries [b]; b ++) { @@ -432,7 +432,7 @@ static void em_junk_sa_test_spamd (void) { const gchar *argv[4]; - int i, b; + gint i, b; gboolean try_system_spamd = TRUE; if (em_junk_sa_spamc_gconf_binary) { @@ -578,8 +578,8 @@ em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target) { GByteArray *out = NULL; const gchar *argv[7]; - char *to_free = NULL; - int i = 0, socket_i; + gchar *to_free = NULL; + gint i = 0, socket_i; gboolean rv; CamelMimeMessage *msg = target->m; @@ -613,7 +613,7 @@ em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target) rv = pipe_to_sa_full (msg, NULL, argv, 0, 1, out, &target->error) != 0; - if (!rv && out && out->data && !strcmp ((const char *)out->data, "0/0\n")) { + if (!rv && out && out->data && !strcmp ((const gchar *)out->data, "0/0\n")) { /* an error occurred */ if (em_junk_sa_respawn_spamd ()) { g_byte_array_set_size (out, 0); @@ -643,7 +643,7 @@ static guint get_spamassassin_version () { GByteArray *out = NULL; - int i; + gint i; const gchar *argv[3] = { "sa-learn", @@ -721,7 +721,7 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target) void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) { - const char *sync_op = + const gchar *sync_op = (get_spamassassin_version () >= 3) ? "--no-sync": "--no-rebuild"; const gchar *argv[6] = { @@ -783,17 +783,17 @@ em_junk_sa_commit_reports (EPlugin *ep) } } -void * +gpointer em_junk_sa_validate_binary (EPlugin *ep) { - return em_junk_sa_is_available (NULL) ? (void *) "1" : NULL; + return em_junk_sa_is_available (NULL) ? (gpointer) "1" : NULL; } static void -em_junk_sa_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, void *data) +em_junk_sa_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, gpointer data) { GConfValue *value; - char *tkey; + gchar *tkey; g_return_if_fail (gconf_entry_get_key (entry) != NULL); @@ -815,8 +815,8 @@ em_junk_sa_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, } } -int -e_plugin_lib_enable (EPluginLib *ep, int enable) +gint +e_plugin_lib_enable (EPluginLib *ep, gint enable) { em_junk_sa_init(); @@ -862,15 +862,15 @@ em_junk_sa_kill_spamd (void) pthread_mutex_unlock (&em_junk_sa_preferred_socket_path_lock); if (em_junk_sa_new_daemon_started) { - int fd = open (em_junk_sa_spamd_pidfile, O_RDONLY); + gint fd = open (em_junk_sa_spamd_pidfile, O_RDONLY); if (fd != -1) { - char pid_str [16]; - int bytes; + gchar pid_str [16]; + gint bytes; bytes = read (fd, pid_str, 15); if (bytes > 0) { - int pid; + gint pid; pid_str [bytes] = 0; pid = atoi (pid_str); @@ -907,7 +907,7 @@ GtkWidget * org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) { GtkWidget *check, *vbox, *label; - char *text = g_strdup_printf (" %s", _("This will make SpamAssassin more reliable, but slower")); + gchar *text = g_strdup_printf (" %s", _("This will make SpamAssassin more reliable, but slower")); guint i = ((GtkTable *)data->parent)->nrows; if (data->old) diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 2f9c92d6f7..4e59b80edd 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -47,7 +47,7 @@ struct _CsvConfig { gboolean header; }; -static gboolean string_needsquotes (const char *value, CsvConfig *config); +static gboolean string_needsquotes (const gchar *value, CsvConfig *config); typedef struct _CsvPluginData CsvPluginData; struct _CsvPluginData @@ -93,7 +93,7 @@ add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type) GString *tmp = NULL; gint cnt=0; while (list) { - const char *str = NULL; + const gchar *str = NULL; if (cnt == 0) tmp = g_string_new (""); if (cnt > 0) @@ -113,7 +113,7 @@ add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type) if (!needquotes) needquotes = string_needsquotes (str, config); if (str) - tmp = g_string_append (tmp, (const gchar*)str); + tmp = g_string_append (tmp, (const gchar *)str); list = g_slist_next (list); cnt++; if (list) tmp = g_string_append (tmp, config->delimiter); @@ -154,7 +154,7 @@ add_time_to_csv (GString *line, icaltimetype *time, CsvConfig *config) if (time) { gboolean needquotes = FALSE; struct tm mytm = icaltimetype_to_tm (time); - gchar *str = (gchar*) g_malloc (sizeof (gchar) * 200); + gchar *str = (gchar *) g_malloc (sizeof (gchar) * 200); /* * Translator: the %F %T is the thirth argument for a strftime function. @@ -182,7 +182,7 @@ add_time_to_csv (GString *line, icaltimetype *time, CsvConfig *config) } static gboolean -string_needsquotes (const char *value, CsvConfig *config) +string_needsquotes (const gchar *value, CsvConfig *config) { /* This is the actual need for quotes-checker */ @@ -243,7 +243,7 @@ string_needsquotes (const char *value, CsvConfig *config) } static GString * -add_string_to_csv (GString *line, const char *value, CsvConfig *config) +add_string_to_csv (GString *line, const gchar *value, CsvConfig *config) { /* Will add a string to the record and will check for the need for quotes */ @@ -252,7 +252,7 @@ add_string_to_csv (GString *line, const char *value, CsvConfig *config) if (needquotes) line = g_string_append (line, config->quote); - line = g_string_append (line, (const gchar*)value); + line = g_string_append (line, (const gchar *)value); if (needquotes) line = g_string_append (line, config->quote); } @@ -303,7 +303,7 @@ userstring_to_systemstring (const gchar *userstring) } static void -do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, char *dest_uri) +do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, gchar *dest_uri) { /* @@ -393,11 +393,11 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource while (objects != NULL) { ECalComponent *comp = objects->data; gchar *delimiter_temp = NULL; - const char *temp_constchar; + const gchar *temp_constchar; GSList *temp_list; ECalComponentDateTime temp_dt; struct icaltimetype *temp_time; - int *temp_int; + gint *temp_int; ECalComponentText temp_comptext; line = g_string_new (""); diff --git a/plugins/save-calendar/format-handler.h b/plugins/save-calendar/format-handler.h index a7bc2e8d85..f9e15dc771 100644 --- a/plugins/save-calendar/format-handler.h +++ b/plugins/save-calendar/format-handler.h @@ -43,11 +43,11 @@ struct _FormatHandler gpointer data; - void (*save) (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, char *dest_uri); + void (*save) (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, gchar *dest_uri); }; FormatHandler *csv_format_handler_new (void); FormatHandler *ical_format_handler_new (void); FormatHandler *rdf_format_handler_new (void); -GOutputStream *open_for_writing (GtkWindow *parent, const char *uri, GError **error); +GOutputStream *open_for_writing (GtkWindow *parent, const gchar *uri, GError **error); diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index f538a9e0a1..3b54176284 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -39,7 +39,7 @@ #include "e-util/e-error.h" static void -display_error_message (GtkWidget *parent, const char *message) +display_error_message (GtkWidget *parent, const gchar *message) { GtkWidget *dialog; @@ -54,9 +54,9 @@ typedef struct { } CompTzData; static void -insert_tz_comps (icalparameter *param, void *cb_data) +insert_tz_comps (icalparameter *param, gpointer cb_data) { - const char *tzid; + const gchar *tzid; CompTzData *tdata = cb_data; icaltimezone *zone = NULL; icalcomponent *tzcomp; @@ -84,7 +84,7 @@ append_tz_to_comp (gpointer key, gpointer value, icalcomponent *toplevel) } static void -do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, char *dest_uri) +do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, gchar *dest_uri) { ESource *primary_source; ECal *source_client; @@ -136,7 +136,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc stream = open_for_writing (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (target->selector))), dest_uri, &error); if (stream) { - char *ical_str = icalcomponent_as_ical_string_r (top_level); + gchar *ical_str = icalcomponent_as_ical_string_r (top_level); g_output_stream_write_all (stream, ical_str, strlen (ical_str), NULL, NULL, &error); g_output_stream_close (stream, NULL, NULL); diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index 9c9f864a2a..685fbdd6e5 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -45,7 +45,7 @@ #include "format-handler.h" static void -add_string_to_rdf (xmlNodePtr node, const gchar *tag, const char *value); +add_string_to_rdf (xmlNodePtr node, const gchar *tag, const gchar *value); /* Use { */ @@ -100,7 +100,7 @@ add_list_to_rdf (xmlNodePtr node, const gchar *tag, GSList *list_in, gint type) GSList *list = list_in; while (list) { - const char *str = NULL; + const gchar *str = NULL; switch (type) { case ECALCOMPONENTATTENDEE: @@ -127,8 +127,8 @@ add_nummeric_to_rdf (xmlNodePtr node, const gchar *tag, gint *nummeric) { if (nummeric) { gchar *value = g_strdup_printf ("%d", *nummeric); - xmlNodePtr cur_node = xmlNewChild (node, NULL, (unsigned char *)tag, (unsigned char *)value); - xmlSetProp (cur_node, (const unsigned char *)"rdf:datatype", (const unsigned char *)"http://www.w3.org/2001/XMLSchema#integer"); + xmlNodePtr cur_node = xmlNewChild (node, NULL, (guchar *)tag, (guchar *)value); + xmlSetProp (cur_node, (const guchar *)"rdf:datatype", (const guchar *)"http://www.w3.org/2001/XMLSchema#integer"); g_free (value); } } @@ -139,7 +139,7 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time) if (time) { xmlNodePtr cur_node = NULL; struct tm mytm = icaltimetype_to_tm (time); - gchar *str = (gchar*) g_malloc (sizeof (gchar) * 200); + gchar *str = (gchar *) g_malloc (sizeof (gchar) * 200); gchar *tmp = NULL; gchar *timezone; /* @@ -149,12 +149,12 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time) * */ e_utf8_strftime (str, 200, _("%FT%T"), &mytm); - cur_node = xmlNewChild (node, NULL, (unsigned char *)tag, (unsigned char *)str); + cur_node = xmlNewChild (node, NULL, (guchar *)tag, (guchar *)str); /* Not sure about this property */ timezone = calendar_config_get_timezone (); tmp = g_strdup_printf ("http://www.w3.org/2002/12/cal/tzd/%s#tz", timezone); - xmlSetProp (cur_node, (const unsigned char *)"rdf:datatype", (unsigned char *)tmp); + xmlSetProp (cur_node, (const guchar *)"rdf:datatype", (guchar *)tmp); g_free (tmp); g_free (timezone); g_free (str); @@ -163,12 +163,12 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time) static void -add_string_to_rdf (xmlNodePtr node, const gchar *tag, const char *value) +add_string_to_rdf (xmlNodePtr node, const gchar *tag, const gchar *value) { if (value) { xmlNodePtr cur_node = NULL; - cur_node = xmlNewChild (node, NULL, (unsigned char *)tag, (unsigned char *)value); - xmlSetProp (cur_node, (const unsigned char *)"rdf:datatype", (const unsigned char *)"http://www.w3.org/2001/XMLSchema#string"); + cur_node = xmlNewChild (node, NULL, (guchar *)tag, (guchar *)value); + xmlSetProp (cur_node, (const guchar *)"rdf:datatype", (const guchar *)"http://www.w3.org/2001/XMLSchema#string"); } } @@ -176,7 +176,7 @@ add_string_to_rdf (xmlNodePtr node, const gchar *tag, const char *value) static void -do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, char *dest_uri) +do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, gchar *dest_uri) { /* @@ -216,51 +216,51 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource xmlDocPtr doc = xmlNewDoc((xmlChar *) "1.0"); xmlNodePtr fnode = doc->children; - doc->children = xmlNewDocNode (doc, NULL, (const unsigned char *)"rdf:RDF", NULL); - xmlSetProp (doc->children, (const unsigned char *)"xmlns:rdf", (const unsigned char *)"http://www.w3.org/1999/02/22-rdf-syntax-ns#"); - xmlSetProp (doc->children, (const unsigned char *)"xmlns", (const unsigned char *)"http://www.w3.org/2002/12/cal/ical#"); + doc->children = xmlNewDocNode (doc, NULL, (const guchar *)"rdf:RDF", NULL); + xmlSetProp (doc->children, (const guchar *)"xmlns:rdf", (const guchar *)"http://www.w3.org/1999/02/22-rdf-syntax-ns#"); + xmlSetProp (doc->children, (const guchar *)"xmlns", (const guchar *)"http://www.w3.org/2002/12/cal/ical#"); - fnode = xmlNewChild (doc->children, NULL, (const unsigned char *)"Vcalendar", NULL); + fnode = xmlNewChild (doc->children, NULL, (const guchar *)"Vcalendar", NULL); /* Should Evolution publicise these? */ - xmlSetProp (fnode, (const unsigned char *)"xmlns:x-wr", (const unsigned char *)"http://www.w3.org/2002/12/cal/prod/Apple_Comp_628d9d8459c556fa#"); - xmlSetProp (fnode, (const unsigned char *)"xmlns:x-lic", (const unsigned char *)"http://www.w3.org/2002/12/cal/prod/Apple_Comp_628d9d8459c556fa#"); + xmlSetProp (fnode, (const guchar *)"xmlns:x-wr", (const guchar *)"http://www.w3.org/2002/12/cal/prod/Apple_Comp_628d9d8459c556fa#"); + xmlSetProp (fnode, (const guchar *)"xmlns:x-lic", (const guchar *)"http://www.w3.org/2002/12/cal/prod/Apple_Comp_628d9d8459c556fa#"); /* Not sure if it's correct like this */ - xmlNewChild (fnode, NULL, (const unsigned char *)"prodid", (const unsigned char *)"-//" PACKAGE_STRING "//iCal 1.0//EN"); + xmlNewChild (fnode, NULL, (const guchar *)"prodid", (const guchar *)"-//" PACKAGE_STRING "//iCal 1.0//EN"); /* Assuming GREGORIAN is the only supported calendar scale */ - xmlNewChild (fnode, NULL, (const unsigned char *)"calscale", (const unsigned char *)"GREGORIAN"); + xmlNewChild (fnode, NULL, (const guchar *)"calscale", (const guchar *)"GREGORIAN"); temp = calendar_config_get_timezone (); - xmlNewChild (fnode, NULL, (const unsigned char *)"x-wr:timezone", (unsigned char *)temp); + xmlNewChild (fnode, NULL, (const guchar *)"x-wr:timezone", (guchar *)temp); g_free (temp); - xmlNewChild (fnode, NULL, (const unsigned char *)"method", (const unsigned char *)"PUBLISH"); + xmlNewChild (fnode, NULL, (const guchar *)"method", (const guchar *)"PUBLISH"); - xmlNewChild (fnode, NULL, (const unsigned char *)"x-wr:relcalid", (unsigned char *)e_source_peek_uid (primary_source)); + xmlNewChild (fnode, NULL, (const guchar *)"x-wr:relcalid", (guchar *)e_source_peek_uid (primary_source)); - xmlNewChild (fnode, NULL, (const unsigned char *)"x-wr:calname", (unsigned char *)e_source_peek_name (primary_source)); + xmlNewChild (fnode, NULL, (const guchar *)"x-wr:calname", (guchar *)e_source_peek_name (primary_source)); /* Version of this RDF-format */ - xmlNewChild (fnode, NULL, (const unsigned char *)"version", (const unsigned char *)"2.0"); + xmlNewChild (fnode, NULL, (const guchar *)"version", (const guchar *)"2.0"); while (objects != NULL) { ECalComponent *comp = objects->data; - const char *temp_constchar; + const gchar *temp_constchar; gchar *tmp_str = NULL; GSList *temp_list; ECalComponentDateTime temp_dt; struct icaltimetype *temp_time; - int *temp_int; + gint *temp_int; ECalComponentText temp_comptext; - xmlNodePtr c_node = xmlNewChild (fnode, NULL, (const unsigned char *)"component", NULL); - xmlNodePtr node = xmlNewChild (c_node, NULL, (const unsigned char *)"Vevent", NULL); + xmlNodePtr c_node = xmlNewChild (fnode, NULL, (const guchar *)"component", NULL); + xmlNodePtr node = xmlNewChild (c_node, NULL, (const guchar *)"Vevent", NULL); /* Getting the stuff */ e_cal_component_get_uid (comp, &temp_constchar); tmp_str = g_strdup_printf ("#%s", temp_constchar); - xmlSetProp (node, (const unsigned char *)"about", (unsigned char *)tmp_str); + xmlSetProp (node, (const guchar *)"about", (guchar *)tmp_str); g_free (tmp_str); add_string_to_rdf (node, "uid",temp_constchar); diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index e461821242..c63c1dab2b 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -109,7 +109,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource GtkListStore *store = GTK_LIST_STORE (model); GtkTreeIter iter; GtkWidget *dialog = NULL; - char *dest_uri = NULL; + gchar *dest_uri = NULL; GList *format_handlers = NULL; @@ -173,7 +173,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { - char *tmp = NULL; + gchar *tmp = NULL; gtk_combo_box_get_active_iter (combo, &iter); gtk_tree_model_get (model, &iter, @@ -186,7 +186,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource if (!(tmp && *(tmp + strlen (handler->filename_ext)) == '\0')) { - char *temp; + gchar *temp; temp = g_strconcat (dest_uri, handler->filename_ext, NULL); g_free (dest_uri); dest_uri = temp; @@ -210,7 +210,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource It will ask for overwrite if file already exists. */ GOutputStream * -open_for_writing (GtkWindow *parent, const char *uri, GError **error) +open_for_writing (GtkWindow *parent, const gchar *uri, GError **error) { GFile *file; GFileOutputStream *fostream; diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 71fb4d4ff1..cc8168159b 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -101,7 +101,7 @@ startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data { GtkWidget *page, *label, *sep, *table; GSList *l; - int row=0; + gint row=0; if (import == NULL) { import = e_import_new("org.gnome.evolution.shell.importer"); @@ -123,7 +123,7 @@ startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data table = gtk_table_new(g_slist_length(import_importers), 2, FALSE); for (l = import_importers; l; l = l->next) { EImportImporter *eii = l->data; - char *str; + gchar *str; /* *label already declared */ GtkWidget *w, *label; @@ -150,21 +150,21 @@ startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data } static void -import_status(EImport *import, const char *what, int pc, void *d) +import_status(EImport *import, const gchar *what, gint pc, gpointer d) { gtk_progress_bar_set_fraction((GtkProgressBar *)import_progress, (gfloat)(pc/100.0)); gtk_progress_bar_set_text((GtkProgressBar *)import_progress, what); } static void -import_dialog_response(GtkDialog *d, guint button, void *data) +import_dialog_response(GtkDialog *d, guint button, gpointer data) { if (button == GTK_RESPONSE_CANCEL) e_import_cancel(import, (EImportTarget *)import_target, import_importer); } static void -import_done(EImport *ei, void *d) +import_done(EImport *ei, gpointer d) { if (import_iterator && (import_iterator = import_iterator->next)) { import_status(ei, "", 0, NULL); @@ -188,7 +188,7 @@ import_done(EImport *ei, void *d) void startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target) { - char *location; + gchar *location; /* Use System Timezone by default */ calendar_config_set_use_system_timezone (TRUE); diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index a871399754..b0de28ad49 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -68,11 +68,11 @@ typedef struct { EMPopupTargetSelect *t; } UserData; -static char* get_content (CamelMimeMessage *message); +static gchar * get_content (CamelMimeMessage *message); -static void reply_with_template (EPopup *ep, EPopupItem *item, void *data); +static void reply_with_template (EPopup *ep, EPopupItem *item, gpointer data); -static void popup_free (EPopup *ep, GSList *l, void *data); +static void popup_free (EPopup *ep, GSList *l, gpointer data); static GSList *fill_submenu (CamelStore *store, CamelFolderInfo *info, @@ -143,8 +143,8 @@ commit_changes (UIData *ui) valid = gtk_tree_model_get_iter_first (model, &iter); while (valid) { - char *keyword, *value; - char *key; + gchar *keyword, *value; + gchar *key; gtk_tree_model_get (model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1); gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1); @@ -168,7 +168,7 @@ static void clue_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, UIData *ui) { GtkTreeSelection *selection; - char *keyword = NULL; + gchar *keyword = NULL; gboolean valid; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview)); @@ -201,7 +201,7 @@ clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter valid = gtk_tree_model_get_iter_first (model, iter); while (valid && gtk_list_store_iter_is_valid (ui->store, iter)) { - char *keyword = NULL; + gchar *keyword = NULL; gtk_tree_model_get (model, iter, CLUE_KEYWORD_COLUMN, &keyword, -1); /* Check if the keyword is not empty and then emit the row-changed signal (if we delete the row, then the iter gets corrupted) */ @@ -223,7 +223,7 @@ key_cell_edited_callback (GtkCellRendererText *cell, { GtkTreeModel *model; GtkTreeIter iter; - char *value; + gchar *value; model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview)); @@ -244,7 +244,7 @@ value_cell_edited_callback (GtkCellRendererText *cell, { GtkTreeModel *model; GtkTreeIter iter; - char *keyword; + gchar *keyword; model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview)); @@ -370,7 +370,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) UIData *ui = g_new0 (UIData, 1); - char *gladefile; + gchar *gladefile; gladefile = g_build_filename (EVOLUTION_PLUGINDIR, "templates.glade", @@ -421,7 +421,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) clue_list = gconf_client_get_list ( gconf, GCONF_KEY_TEMPLATE_PLACEHOLDERS, GCONF_VALUE_STRING, NULL ); for (list = clue_list; list; list = g_slist_next (list)) { - char **temp = g_strsplit (list->data, "=", 2); + gchar **temp = g_strsplit (list->data, "=", 2); gtk_list_store_append (ui->store, &iter); gtk_list_store_set (ui->store, &iter, CLUE_KEYWORD_COLUMN, temp[0], CLUE_VALUE_COLUMN, temp[1], -1); g_strfreev(temp); @@ -445,14 +445,14 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) } /* borrowed from plugins/mail-to-task/ */ -static char * +static gchar * get_content (CamelMimeMessage *message) { CamelDataWrapper *content; CamelStream *mem; CamelContentType *type; CamelMimePart *mime_part = CAMEL_MIME_PART (message); - char *str, *convert_str = NULL; + gchar *str, *convert_str = NULL; gsize bytes_read, bytes_written; gint count = 2; @@ -477,7 +477,7 @@ get_content (CamelMimeMessage *message) mem = camel_stream_mem_new (); camel_data_wrapper_decode_to_stream (content, mem); - str = g_strndup ((const gchar*)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); + str = g_strndup ((const gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); camel_object_unref (mem); /* convert to UTF-8 string */ @@ -497,13 +497,13 @@ get_content (CamelMimeMessage *message) } static void -reply_with_template (EPopup *ep, EPopupItem *item, void *data) +reply_with_template (EPopup *ep, EPopupItem *item, gpointer data) { CamelMimeMessage *new, *template, *reply_to; CamelFolder *templates_folder; struct _camel_header_raw *header; UserData *userdata = item->user_data; - char *cont; + gchar *cont; /* We get the templates folder and all the uids of the messages in there */ templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES); @@ -559,7 +559,7 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data) } static void -popup_free (EPopup *ep, GSList *l, void *data) +popup_free (EPopup *ep, GSList *l, gpointer data) { g_slist_free (l); } @@ -567,15 +567,15 @@ popup_free (EPopup *ep, GSList *l, void *data) static GSList *append_to_menu (CamelFolder *folder, GPtrArray *uids, GSList *list, EMPopupTargetSelect *t) { - int i; + gint i; for (i = 0; i < uids->len; i++) { - const char *subject; - char *path; + const gchar *subject; + gchar *path; EPopupItem *item; CamelMimeMessage *message; UserData *user_data; - const char *uid; + const gchar *uid; uid = g_strdup (g_ptr_array_index (uids, i)); diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index ae0dc378da..cdbdb09872 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -52,42 +52,42 @@ #include #include -int verbose = 0; -int saveRTF = 0; -int saveintermediate = 0; -char *filepath = NULL; +gint verbose = 0; +gint saveRTF = 0; +gint saveintermediate = 0; +gchar *filepath = NULL; gboolean loaded = FALSE; void processTnef(TNEFStruct *tnef); void saveVCalendar(TNEFStruct *tnef); void saveVCard(TNEFStruct *tnef); void saveVTask(TNEFStruct *tnef); -void org_gnome_format_tnef(void *ep, EMFormatHookTarget *t); +void org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t); /* Other Prototypes */ -void fprintProperty(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, char text[]); -void fprintUserProp(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, char text[]); +void fprintProperty(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, gchar text[]); +void fprintUserProp(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, gchar text[]); void quotedfprint(FILE *fptr, variableLength *vl); void cstylefprint(FILE *fptr, variableLength *vl); void printRtf(FILE *fptr, variableLength *vl); -void printRrule(FILE *fptr, char *recur_data, int size, TNEFStruct *tnef); -unsigned char getRruleCount(unsigned char a, unsigned char b); -unsigned char getRruleMonthNum(unsigned char a, unsigned char b); -char * getRruleDayname(unsigned char a); +void printRrule(FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef); +guchar getRruleCount(guchar a, guchar b); +guchar getRruleMonthNum(guchar a, guchar b); +gchar * getRruleDayname(guchar a); void -org_gnome_format_tnef(void *ep, EMFormatHookTarget *t) +org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) { - char *tmpdir = NULL, *name = NULL; + gchar *tmpdir = NULL, *name = NULL; CamelStream *out; struct dirent *d; DIR *dir; CamelMultipart *mp; CamelMimePart *mainpart; CamelDataWrapper *content; - int len; + gint len; TNEFStruct *tnef; tnef = (TNEFStruct *) g_malloc(sizeof(TNEFStruct)); @@ -139,8 +139,8 @@ org_gnome_format_tnef(void *ep, EMFormatHookTarget *t) CamelMimePart *part; CamelDataWrapper *content; CamelStream *stream; - char *path; - const char *type; + gchar *path; + const gchar *type; if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..") @@ -195,10 +195,10 @@ org_gnome_format_tnef(void *ep, EMFormatHookTarget *t) } -int e_plugin_lib_enable(EPluginLib *ep, int enable); +gint e_plugin_lib_enable(EPluginLib *ep, gint enable); -int -e_plugin_lib_enable(EPluginLib *ep, int enable) +gint +e_plugin_lib_enable(EPluginLib *ep, gint enable) { if (loaded) return 0; @@ -216,14 +216,14 @@ void processTnef(TNEFStruct *tnef) { variableLength *filename; variableLength *filedata; Attachment *p; - int RealAttachment; - int object; - char * ifilename; - int i, count; - int foundCal=0; + gint RealAttachment; + gint object; + gchar * ifilename; + gint i, count; + gint foundCal=0; FILE *fptr; - ifilename = (char *) g_malloc(sizeof(char) * 256); + ifilename = (gchar *) g_malloc(sizeof(char) * 256); /* First see if this requires special processing. */ /* ie: it's a Contact Card, Task, or Meeting request (vCal/vCard) */ @@ -361,7 +361,7 @@ void processTnef(TNEFStruct *tnef) { if (filename->size == 1) { filename = (variableLength*)malloc(sizeof(variableLength)); filename->size = 20; - filename->data = (char*)malloc(20); + filename->data = (gchar *)malloc(20); sprintf(filename->data, "file_%03i.dat", count); } if (filepath == NULL) { @@ -398,12 +398,12 @@ void processTnef(TNEFStruct *tnef) { } void saveVCard(TNEFStruct *tnef) { - char ifilename[512]; + gchar ifilename[512]; FILE *fptr; variableLength *vl; variableLength *pobox, *street, *city, *state, *zip, *country; dtr thedate; - int boolean, i; + gint boolean, i; if ((vl = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_DISPLAY_NAME))) == MAPI_UNDEFINED) { if ((vl=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_COMPANY_NAME))) == MAPI_UNDEFINED) { @@ -699,11 +699,11 @@ void saveVCard(TNEFStruct *tnef) { } } -unsigned char getRruleCount(unsigned char a, unsigned char b) { +guchar getRruleCount(guchar a, guchar b) { return ((a << 8) | b); } -unsigned char getRruleMonthNum(unsigned char a, unsigned char b) { +guchar getRruleMonthNum(guchar a, guchar b) { switch (a) { case 0x00: switch (b) { @@ -773,8 +773,8 @@ unsigned char getRruleMonthNum(unsigned char a, unsigned char b) { return(0); } -char * getRruleDayname(unsigned char a) { - static char daystring[25]; +gchar * getRruleDayname(guchar a) { + static gchar daystring[25]; *daystring = 0; @@ -807,7 +807,7 @@ char * getRruleDayname(unsigned char a) { return(daystring); } -void printRrule(FILE *fptr, char *recur_data, int size, TNEFStruct *tnef) +void printRrule(FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) { variableLength *filename; @@ -882,11 +882,11 @@ void printRrule(FILE *fptr, char *recur_data, int size, TNEFStruct *tnef) } void saveVCalendar(TNEFStruct *tnef) { - char ifilename[256]; + gchar ifilename[256]; variableLength *filename; - char *charptr, *charptr2; + gchar *charptr, *charptr2; FILE *fptr; - int index; + gint index; DDWORD *ddword_ptr; DDWORD ddword_val; dtr thedate; @@ -1141,9 +1141,9 @@ void saveVCalendar(TNEFStruct *tnef) { void saveVTask(TNEFStruct *tnef) { variableLength *vl; variableLength *filename; - int index,i; - char ifilename[256]; - char *charptr, *charptr2; + gint index,i; + gchar ifilename[256]; + gchar *charptr, *charptr2; dtr thedate; FILE *fptr; DDWORD *ddword_ptr; @@ -1267,7 +1267,7 @@ void saveVTask(TNEFStruct *tnef) { } -void fprintProperty(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, char text[]) { +void fprintProperty(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, gchar text[]) { variableLength *vl; if ((vl=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(proptype, propid))) != MAPI_UNDEFINED) { if (vl->size > 0) { @@ -1279,7 +1279,7 @@ void fprintProperty(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, } } -void fprintUserProp(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, char text[]) { +void fprintUserProp(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, gchar text[]) { variableLength *vl; if ((vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(proptype, propid))) != MAPI_UNDEFINED) { if (vl->size > 0) { @@ -1292,7 +1292,7 @@ void fprintUserProp(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, } void quotedfprint(FILE *fptr, variableLength *vl) { - int index; + gint index; for (index=0;indexsize-1; index++) { if (vl->data[index] == '\n') { @@ -1305,7 +1305,7 @@ void quotedfprint(FILE *fptr, variableLength *vl) { } void cstylefprint(FILE *fptr, variableLength *vl) { - int index; + gint index; for (index=0;indexsize-1; index++) { if (vl->data[index] == '\n') { @@ -1325,10 +1325,10 @@ void cstylefprint(FILE *fptr, variableLength *vl) { } void printRtf(FILE *fptr, variableLength *vl) { - int index; - char *byte; - int brace_ct; - int key; + gint index; + gchar *byte; + gint brace_ct; + gint key; key = 0; brace_ct = 0; diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index fa0077f807..916774b4f0 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -52,7 +52,7 @@ struct _VCardInlinePObject { static gint org_gnome_vcard_inline_classid; /* Forward Declarations */ -void org_gnome_vcard_inline_format (void *ep, EMFormatHookTarget *target); +void org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target); static void org_gnome_vcard_inline_pobject_free (EMFormatHTMLPObject *object) @@ -258,7 +258,7 @@ org_gnome_vcard_inline_embed (EMFormatHTML *format, } void -org_gnome_vcard_inline_format (void *ep, EMFormatHookTarget *target) +org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target) { VCardInlinePObject *vcard_object; gchar *classid; diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c index 79d4744c56..d338094726 100644 --- a/plugins/webdav-account-setup/webdav-contacts-source.c +++ b/plugins/webdav-account-setup/webdav-contacts-source.c @@ -51,8 +51,8 @@ typedef struct { GtkWidget * plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data); -int -e_plugin_lib_enable(EPluginLib *ep, int enable); +gint +e_plugin_lib_enable(EPluginLib *ep, gint enable); static void ensure_webdav_contacts_source_group(void) @@ -136,10 +136,10 @@ static void set_ui_from_source(ui_data *data) { ESource *source = data->source; - const char *url = e_source_get_uri(source); + const gchar *url = e_source_get_uri(source); EUri *uri = e_uri_new(url); - char *url_ui; - const char *property; + gchar *url_ui; + const gchar *property; gboolean use_ssl; gboolean avoid_ifmatch; @@ -183,9 +183,9 @@ set_source_from_ui(ui_data *data) { ESource *source = data->source; gboolean avoid_ifmatch = gtk_toggle_button_get_active(data->avoid_ifmatch_toggle); - const char *url = gtk_entry_get_text(data->url_entry); + const gchar *url = gtk_entry_get_text(data->url_entry); EUri *uri = e_uri_new(url); - char *url_noprotocol; + gchar *url_noprotocol; gboolean use_ssl; e_source_set_property(source, "avoid_ifmatch", avoid_ifmatch ? "1" : "0"); @@ -247,7 +247,7 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; ESource *source; ESourceGroup *group; - const char *base_uri; + const gchar *base_uri; GtkWidget *parent; GtkWidget *vbox; @@ -342,8 +342,8 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) return NULL; } -int -e_plugin_lib_enable(EPluginLib *ep, int enable) +gint +e_plugin_lib_enable(EPluginLib *ep, gint enable) { if (enable) { ensure_webdav_contacts_source_group(); diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 18092979d2..877c410289 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -45,15 +45,15 @@ G_DEFINE_TYPE (EComponentRegistry, e_component_registry, G_TYPE_OBJECT) /* EComponentInfo handling. */ static EComponentInfo * -component_info_new (const char *id, +component_info_new (const gchar *id, GNOME_Evolution_Component iface, - const char *alias, - const char *button_label, - const char *button_tooltips, - const char *menu_label, - const char *menu_accelerator, - const char *icon_name, - int sort_order) + const gchar *alias, + const gchar *button_label, + const gchar *button_tooltips, + const gchar *menu_label, + const gchar *menu_accelerator, + const gchar *icon_name, + gint sort_order) { EComponentInfo *info = g_new0 (EComponentInfo, 1); @@ -108,7 +108,7 @@ set_schemas (EComponentInfo *component_info, { Bonobo_ActivationProperty *property = bonobo_server_info_prop_find (server_info, "evolution:uri_schemas"); Bonobo_StringList *list; - int i; + gint i; if (property == NULL) return; @@ -133,8 +133,8 @@ query_components (EComponentRegistry *registry) const gchar * const *language_names; CORBA_Environment ev; GSList *languages = NULL; - char *query; - int i; + gchar *query; + gint i; if (registry->priv->init) return; @@ -147,7 +147,7 @@ query_components (EComponentRegistry *registry) g_free (query); if (BONOBO_EX (&ev)) { - char *ex_text = bonobo_exception_get_text (&ev); + gchar *ex_text = bonobo_exception_get_text (&ev); g_warning ("Cannot query for components: %s\n", ex_text); g_free (ex_text); CORBA_exception_free (&ev); @@ -159,22 +159,22 @@ query_components (EComponentRegistry *registry) languages = g_slist_append (languages, (gpointer)(*language_names++)); for (i = 0; i < info_list->_length; i++) { - const char *id; - const char *label; - const char *menu_label; - const char *menu_accelerator; - const char *alias; - const char *icon_name; - const char *sort_order_string; - const char *tooltips; + const gchar *id; + const gchar *label; + const gchar *menu_label; + const gchar *menu_accelerator; + const gchar *alias; + const gchar *icon_name; + const gchar *sort_order_string; + const gchar *tooltips; EComponentInfo *info; - int sort_order; + gint sort_order; GNOME_Evolution_Component iface; id = info_list->_buffer[i].iid; - iface = bonobo_activation_activate_from_id ((char *)id, 0, NULL, &ev); + iface = bonobo_activation_activate_from_id ((gchar *)id, 0, NULL, &ev); if (BONOBO_EX (&ev) || iface == CORBA_OBJECT_NIL) { - char *ex_text = bonobo_exception_get_text (&ev); + gchar *ex_text = bonobo_exception_get_text (&ev); g_warning("Cannot activate '%s': %s\n", id, ex_text); g_free(ex_text); @@ -276,7 +276,7 @@ e_component_registry_peek_list (EComponentRegistry *registry) EComponentInfo * e_component_registry_peek_info (EComponentRegistry *registry, enum _EComponentRegistryField field, - const char *key) + const gchar *key) { GSList *p, *q; @@ -298,7 +298,7 @@ e_component_registry_peek_info (EComponentRegistry *registry, break; case ECR_FIELD_SCHEMA: for (q = info->uri_schemas; q != NULL; q = q->next) - if (strcmp((char *)q->data, key) == 0) + if (strcmp((gchar *)q->data, key) == 0) return info; break; } @@ -309,7 +309,7 @@ e_component_registry_peek_info (EComponentRegistry *registry, GNOME_Evolution_Component e_component_registry_activate (EComponentRegistry *registry, - const char *id, + const gchar *id, CORBA_Environment *ev) { EComponentInfo *info; diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h index 927fcf0120..c8c292a935 100644 --- a/shell/e-component-registry.h +++ b/shell/e-component-registry.h @@ -63,20 +63,20 @@ enum _EComponentRegistryField { }; struct _EComponentInfo { - char *id; + gchar *id; - char *alias; + gchar *alias; /* NULL if not activated. */ GNOME_Evolution_Component iface; - char *button_label; - char *button_tooltips; - char *menu_label; - char *menu_accelerator; - char *icon_name; + gchar *button_label; + gchar *button_tooltips; + gchar *menu_label; + gchar *menu_accelerator; + gchar *icon_name; - int sort_order; + gint sort_order; /* List of URI schemas that this component supports. */ GSList *uri_schemas; /* */ @@ -90,10 +90,10 @@ EComponentRegistry *e_component_registry_new (void); GSList *e_component_registry_peek_list (EComponentRegistry *registry); EComponentInfo *e_component_registry_peek_info (EComponentRegistry *registry, enum _EComponentRegistryField type, - const char *key); + const gchar *key); GNOME_Evolution_Component e_component_registry_activate (EComponentRegistry *registry, - const char *id, + const gchar *id, CORBA_Environment *ev); diff --git a/shell/e-component-view.c b/shell/e-component-view.c index b87078e974..8e75b5b4a8 100644 --- a/shell/e-component-view.c +++ b/shell/e-component-view.c @@ -93,7 +93,7 @@ e_component_view_init (EComponentView *shell) { } -EComponentView *e_component_view_new(GNOME_Evolution_ShellView parent, const char *id, struct _GtkWidget *side, struct _GtkWidget *view, struct _GtkWidget *statusbar) +EComponentView *e_component_view_new(GNOME_Evolution_ShellView parent, const gchar *id, struct _GtkWidget *side, struct _GtkWidget *view, struct _GtkWidget *statusbar) { EComponentView *new = g_object_new (e_component_view_get_type (), NULL); CORBA_Environment ev = { NULL }; @@ -110,7 +110,7 @@ EComponentView *e_component_view_new(GNOME_Evolution_ShellView parent, const cha return new; } -EComponentView *e_component_view_new_controls(GNOME_Evolution_ShellView parent, const char *id, BonoboControl *side, BonoboControl *view, BonoboControl *statusbar) +EComponentView *e_component_view_new_controls(GNOME_Evolution_ShellView parent, const gchar *id, BonoboControl *side, BonoboControl *view, BonoboControl *statusbar) { EComponentView *new = g_object_new (e_component_view_get_type (), NULL); CORBA_Environment ev = { NULL }; @@ -128,7 +128,7 @@ EComponentView *e_component_view_new_controls(GNOME_Evolution_ShellView parent, } void -e_component_view_set_title(EComponentView *ecv, const char *title) +e_component_view_set_title(EComponentView *ecv, const gchar *title) { CORBA_Environment ev = { NULL }; @@ -138,7 +138,7 @@ e_component_view_set_title(EComponentView *ecv, const char *title) } void -e_component_view_set_button_icon (EComponentView *ecv, const char *iconName) +e_component_view_set_button_icon (EComponentView *ecv, const gchar *iconName) { CORBA_Environment ev = { NULL }; diff --git a/shell/e-component-view.h b/shell/e-component-view.h index 51004e489e..9b741837b1 100644 --- a/shell/e-component-view.h +++ b/shell/e-component-view.h @@ -50,7 +50,7 @@ struct _EComponentView { EComponentViewPrivate *priv; - char *id; + gchar *id; GNOME_Evolution_ShellView shell_view; struct _BonoboControl *side_control; @@ -65,11 +65,11 @@ struct _EComponentViewClass { }; GType e_component_view_get_type(void); -EComponentView *e_component_view_new(GNOME_Evolution_ShellView shell_view, const char *id, struct _GtkWidget *side, struct _GtkWidget *view, struct _GtkWidget *status); -EComponentView *e_component_view_new_controls(GNOME_Evolution_ShellView parent, const char *id, struct _BonoboControl *side, struct _BonoboControl *view, struct _BonoboControl *statusbar); +EComponentView *e_component_view_new(GNOME_Evolution_ShellView shell_view, const gchar *id, struct _GtkWidget *side, struct _GtkWidget *view, struct _GtkWidget *status); +EComponentView *e_component_view_new_controls(GNOME_Evolution_ShellView parent, const gchar *id, struct _BonoboControl *side, struct _BonoboControl *view, struct _BonoboControl *statusbar); -void e_component_view_set_title(EComponentView *ecv, const char *title); -void e_component_view_set_button_icon (EComponentView *ecv, const char *iconName); +void e_component_view_set_title(EComponentView *ecv, const gchar *title); +void e_component_view_set_button_icon (EComponentView *ecv, const gchar *iconName); #ifdef __cplusplus } diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c index 9aa71d3278..a933972b9b 100644 --- a/shell/e-config-upgrade.c +++ b/shell/e-config-upgrade.c @@ -132,12 +132,12 @@ static e_gconf_map_list_t remap_list[] = { { NULL }, }; -int -e_config_upgrade(int major, int minor, int revision) +gint +e_config_upgrade(gint major, gint minor, gint revision) { xmlDocPtr config_doc; - char *conf_file; - int res = 0; + gchar *conf_file; + gint res = 0; conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL); config_doc = e_xml_parse_file (conf_file); diff --git a/shell/e-config-upgrade.h b/shell/e-config-upgrade.h index f4580425bd..36901109d7 100644 --- a/shell/e-config-upgrade.h +++ b/shell/e-config-upgrade.h @@ -24,6 +24,6 @@ #ifndef _E_CONFIG_UPGRADE_H #define _E_CONFIG_UPGRADE_H -int e_config_upgrade (int major, int minor, int revision); +gint e_config_upgrade (gint major, gint minor, gint revision); #endif /* _E_CONFIG_UPGRADE_H */ diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 74a89cc2ec..0e0a07ea21 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -147,10 +147,10 @@ static struct { #define num_info (sizeof (info) / sizeof (info[0])) static GtkWidget * -create_help (const char *name) +create_help (const gchar *name) { GtkWidget *label; - int i; + gint i; for (i = 0; i < num_info; i++) { if (!strcmp (name, info[i].name)) @@ -175,8 +175,8 @@ filename_changed (GtkWidget *widget, ImportData *data) { ImportDialogFilePage *page; - const char *filename; - int fileok; + const gchar *filename; + gint fileok; page = data->filepage; @@ -189,7 +189,7 @@ filename_changed (GtkWidget *widget, gboolean valid; GSList *l; EImportImporter *first = NULL; - int i=0, firstitem=0; + gint i=0, firstitem=0; g_free(page->target->uri_src); page->target->uri_src = g_filename_to_uri(filename, NULL, NULL); @@ -253,12 +253,12 @@ filetype_changed_cb (GtkWidget *combobox, ImportData *data) #if 0 static int -compare_info_name (const void *data1, const void *data2) +compare_info_name (gconstpointer data1, const void *data2) { const Bonobo_ServerInfo *info1 = (Bonobo_ServerInfo *)data1; const Bonobo_ServerInfo *info2 = (Bonobo_ServerInfo *)data2; - const char *name1 = get_name_from_component_info (info1); - const char *name2 = get_name_from_component_info (info2); + const gchar *name1 = get_name_from_component_info (info1); + const gchar *name2 = get_name_from_component_info (info2); /* If we can't find a name for a plug-in, its iid will be used * for display. Put such plug-ins at the end of the list since @@ -281,7 +281,7 @@ importer_file_page_new (ImportData *data) GtkWidget *table, *label; GtkCellRenderer *cell; GtkListStore *store; - int row = 0; + gint row = 0; page = g_new0 (ImportDialogFilePage, 1); @@ -390,7 +390,7 @@ prepare_intelligent_page (GnomeDruidPage *dpage, { GSList *l; GtkWidget *table; - int row; + gint row; ImportDialogImporterPage *page = data->importerpage; if (page->target != NULL) @@ -412,7 +412,7 @@ prepare_intelligent_page (GnomeDruidPage *dpage, row = 0; for (;l;l=l->next) { EImportImporter *eii = l->data; - char *str; + gchar *str; GtkWidget *w, *label; w = e_import_get_widget(data->import, (EImportTarget *)page->target, eii); @@ -456,7 +456,7 @@ import_druid_esc (GnomeDruid *druid, } static void -import_druid_weak_notify (void *blah, +import_druid_weak_notify (gpointer blah, GObject *where_the_object_was) { ImportData *data = (ImportData *) blah; @@ -475,7 +475,7 @@ import_druid_weak_notify (void *blah, } static void -import_status(EImport *import, const char *what, int pc, void *d) +import_status(EImport *import, const gchar *what, gint pc, gpointer d) { ImportData *data = d; @@ -491,7 +491,7 @@ import_dialog_response(GtkDialog *d, guint button, ImportData *data) } static void -import_done(EImport *ei, void *d) +import_done(EImport *ei, gpointer d) { ImportData *data = d; @@ -500,7 +500,7 @@ import_done(EImport *ei, void *d) } static void -import_intelligent_done(EImport *ei, void *d) +import_intelligent_done(EImport *ei, gpointer d) { ImportData *data = d; @@ -519,7 +519,7 @@ import_druid_finish (GnomeDruidPage *page, ImportData *data) { EImportCompleteFunc done = NULL; - char *msg = NULL; + gchar *msg = NULL; if (gtk_toggle_button_get_active((GtkToggleButton *)data->typepage->intelligent)) { data->importerpage->current = data->importerpage->importers; @@ -677,7 +677,7 @@ back_intelligent_page (GnomeDruidPage *page, } static void -dialog_weak_notify (void *data, +dialog_weak_notify (gpointer data, GObject *where_the_dialog_was) { gboolean *dialog_open = (gboolean *) data; @@ -692,7 +692,7 @@ e_shell_importer_start_import (EShellWindow *shell_window) GtkWidget *html; static gboolean dialog_open = FALSE; GdkPixbuf *icon; - char *gladefile; + gchar *gladefile; if (dialog_open) { return; diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index f51a565486..c8b449bed1 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -55,9 +55,9 @@ reinit_dbus (gpointer user_data) static DBusHandlerResult e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, - DBusMessage *message, void *user_data) + DBusMessage *message, gpointer user_data) { - const char *object; + const gchar *object; EShell *shell = user_data; GNOME_Evolution_ShellState shell_state; EShellLineStatus line_status; diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 291a46c187..1a9529688e 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -55,7 +55,7 @@ set_dialog_size (EShellSettingsDialog *dialog) PangoLayout *layout; PangoContext *context; PangoFontMetrics *metrics; - int width, height; + gint width, height; layout = gtk_widget_create_pango_layout (GTK_WIDGET (dialog), "M"); context = pango_layout_get_context (layout); @@ -78,21 +78,21 @@ set_dialog_size (EShellSettingsDialog *dialog) /* Page handling. */ struct _Page { - char *title; - char *description; + gchar *title; + gchar *description; GdkPixbuf *icon; Bonobo_ActivationProperty *type; - int priority; + gint priority; EConfigPage *page_widget; }; typedef struct _Page Page; static Page * -page_new (const char *title, - const char *description, +page_new (const gchar *title, + const gchar *description, GdkPixbuf *icon, Bonobo_ActivationProperty *type, - int priority, + gint priority, EConfigPage *page_widget) { Page *page; @@ -124,8 +124,8 @@ page_free (Page *page) } static int -compare_page_func (const void *a, - const void *b) +compare_page_func (gconstpointer a, + gconstpointer b) { const Page *page_a; const Page *page_b; @@ -155,7 +155,7 @@ load_pages (EShellSettingsDialog *dialog) GSList *languages = NULL; GList *page_list; GList *p; - int i, j; + gint i, j; priv = dialog->priv; @@ -178,12 +178,12 @@ load_pages (EShellSettingsDialog *dialog) for (i = 0; i < control_list->_length; i ++) { CORBA_Object corba_object; Bonobo_ServerInfo *info; - const char *title; - const char *description; - const char *icon_path; - const char *priority_string; + const gchar *title; + const gchar *description; + const gchar *icon_path; + const gchar *priority_string; Bonobo_ActivationProperty *type; - int priority; + gint priority; GdkPixbuf *icon; CORBA_exception_init (&ev); @@ -213,7 +213,7 @@ load_pages (EShellSettingsDialog *dialog) else priority = atoi (priority_string); - corba_object = bonobo_activation_activate_from_id ((char *) info->iid, 0, NULL, &ev); + corba_object = bonobo_activation_activate_from_id ((gchar *) info->iid, 0, NULL, &ev); if (! BONOBO_EX (&ev)) { Page *page; @@ -223,7 +223,7 @@ load_pages (EShellSettingsDialog *dialog) page_list = g_list_prepend (page_list, page); } else { - char *bonobo_ex_text = bonobo_exception_get_text (&ev); + gchar *bonobo_ex_text = bonobo_exception_get_text (&ev); g_warning ("Cannot activate %s -- %s", info->iid, bonobo_ex_text); g_free (bonobo_ex_text); } @@ -326,11 +326,11 @@ e_shell_settings_dialog_new (void) } void -e_shell_settings_dialog_show_type (EShellSettingsDialog *dialog, const char *type) +e_shell_settings_dialog_show_type (EShellSettingsDialog *dialog, const gchar *type) { EShellSettingsDialogPrivate *priv; gpointer key, value; - int page; + gint page; g_return_if_fail (dialog != NULL); g_return_if_fail (E_IS_SHELL_SETTINGS_DIALOG (dialog)); @@ -339,7 +339,7 @@ e_shell_settings_dialog_show_type (EShellSettingsDialog *dialog, const char *typ priv = dialog->priv; if (!g_hash_table_lookup_extended (priv->types, type, &key, &value)) { - char *slash, *supertype; + gchar *slash, *supertype; slash = strchr (type, '/'); if (slash) { diff --git a/shell/e-shell-settings-dialog.h b/shell/e-shell-settings-dialog.h index 55cce4a52f..ba636e6071 100644 --- a/shell/e-shell-settings-dialog.h +++ b/shell/e-shell-settings-dialog.h @@ -56,7 +56,7 @@ struct _EShellSettingsDialogClass { GType e_shell_settings_dialog_get_type (void); GtkWidget *e_shell_settings_dialog_new (void); void e_shell_settings_dialog_show_type (EShellSettingsDialog *dialog, - const char *type); + const gchar *type); #ifdef __cplusplus } diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index a6d071cc78..319a0d3c76 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -35,7 +35,7 @@ static BonoboObjectClass *parent_class = NULL; struct _EShellViewPrivate { - int dummy; + gint dummy; }; static void @@ -44,7 +44,7 @@ impl_ShellView_setTitle(PortableServer_Servant _servant, const CORBA_char *id, c EShellView *esw = (EShellView *)bonobo_object_from_servant(_servant); /* To translators: This is the window title and %s is the component name. Most translators will want to keep it as is. */ - char *tmp = g_strdup_printf(_("%s - Evolution"), title); + gchar *tmp = g_strdup_printf(_("%s - Evolution"), title); e_shell_window_set_title(esw->window, id, tmp); g_free(tmp); @@ -59,8 +59,8 @@ impl_ShellView_setComponent(PortableServer_Servant _servant, const CORBA_char *i } struct change_icon_struct { - const char *component_name; - const char *icon_name; + const gchar *component_name; + const gchar *icon_name; }; static gboolean diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 6f180012cb..a81bacf07a 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -63,7 +63,7 @@ launch_pilot_settings (void) { GError* error = NULL; - gchar* args = g_find_program_in_path ("gpilotd-control-applet"); + gchar * args = g_find_program_in_path ("gpilotd-control-applet"); if (args == NULL) { e_notice (NULL, GTK_MESSAGE_ERROR, _("The GNOME Pilot tools do not appear to be installed on this system.")); @@ -86,7 +86,7 @@ launch_pilot_settings (void) static void command_import (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { e_shell_importer_start_import (window); } @@ -94,7 +94,7 @@ command_import (BonoboUIComponent *uih, static void command_page_setup (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { e_print_run_page_setup_dialog (GTK_WINDOW (window)); } @@ -102,7 +102,7 @@ command_page_setup (BonoboUIComponent *uih, static void command_close (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { if (e_shell_request_close_window (e_shell_window_peek_shell (window), window)) gtk_widget_destroy (GTK_WIDGET (window)); @@ -111,7 +111,7 @@ command_close (BonoboUIComponent *uih, static void command_quit (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { EShell *shell = e_shell_window_peek_shell (window); @@ -121,7 +121,7 @@ command_quit (BonoboUIComponent *uih, static void command_submit_bug (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { const gchar *command_line; GError *error = NULL; @@ -150,7 +150,7 @@ command_submit_bug (BonoboUIComponent *uih, No all environments are utf8 and not all editors can handle it. */ -static const char *authors[] = { +static const gchar *authors[] = { "Aaron Weber", "Abel Cheung", "Abhishek Parwal", @@ -915,7 +915,7 @@ static const char *authors[] = { NULL }; -static const char *documentors[] = { +static const gchar *documentors[] = { "Aaron Weber", "Binika Preet", "Dan Winship", @@ -929,7 +929,7 @@ static const char *documentors[] = { static void command_about (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { gchar *translator_credits; @@ -958,7 +958,7 @@ command_about (BonoboUIComponent *uih, static void command_open_faq (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { const gchar *uri; @@ -969,9 +969,9 @@ command_open_faq (BonoboUIComponent *uih, static void command_quick_reference (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { - char *quickref; + gchar *quickref; const gchar * const *language_names; language_names = g_get_language_names (); @@ -990,7 +990,7 @@ command_quick_reference (BonoboUIComponent *uih, if (file) { GError *error = NULL; - char *uri = g_file_get_uri (file); + gchar *uri = g_file_get_uri (file); g_app_info_launch_default_for_uri (uri, NULL, &error); @@ -1015,7 +1015,7 @@ command_quick_reference (BonoboUIComponent *uih, static void command_work_offline (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { EShell *shell; @@ -1026,7 +1026,7 @@ command_work_offline (BonoboUIComponent *uih, static void command_work_online (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { EShell *shell; @@ -1037,7 +1037,7 @@ command_work_online (BonoboUIComponent *uih, static void command_open_new_window (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { e_shell_create_window (e_shell_window_peek_shell (window), e_shell_window_peek_current_component_id (window), @@ -1050,15 +1050,15 @@ command_open_new_window (BonoboUIComponent *uih, static void command_send_receive (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { e_shell_send_receive (e_shell_window_peek_shell (window)); } static void command_forget_passwords (BonoboUIComponent *ui_component, - void *data, - const char *path) + gpointer data, + const gchar *path) { if (e_error_run (NULL, "shell:forget-passwords", NULL) == GTK_RESPONSE_OK) e_passwords_forget_passwords(); @@ -1069,7 +1069,7 @@ command_forget_passwords (BonoboUIComponent *ui_component, static void command_settings (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { e_shell_window_show_settings (window); } @@ -1077,7 +1077,7 @@ command_settings (BonoboUIComponent *uih, static void command_pilot_settings (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const gchar *path) { launch_pilot_settings (); } @@ -1216,9 +1216,9 @@ shell_line_status_changed_cb (EShell *shell, static void view_buttons_icontext_item_toggled_handler (BonoboUIComponent *ui_component, - const char *path, + const gchar *path, Bonobo_UIComponent_EventType type, - const char *state, + const gchar *state, EShellWindow *shell_window) { ESidebar *sidebar; @@ -1229,9 +1229,9 @@ view_buttons_icontext_item_toggled_handler (BonoboUIComponent *ui_comp static void view_buttons_icon_item_toggled_handler (BonoboUIComponent *ui_component, - const char *path, + const gchar *path, Bonobo_UIComponent_EventType type, - const char *state, + const gchar *state, EShellWindow *shell_window) { ESidebar *sidebar; @@ -1242,9 +1242,9 @@ view_buttons_icon_item_toggled_handler (BonoboUIComponent *ui_componen static void view_buttons_text_item_toggled_handler (BonoboUIComponent *ui_component, - const char *path, + const gchar *path, Bonobo_UIComponent_EventType type, - const char *state, + const gchar *state, EShellWindow *shell_window) { ESidebar *sidebar; @@ -1255,9 +1255,9 @@ view_buttons_text_item_toggled_handler (BonoboUIComponent *ui_componen static void view_buttons_toolbar_item_toggled_handler (BonoboUIComponent *ui_component, - const char *path, + const gchar *path, Bonobo_UIComponent_EventType type, - const char *state, + const gchar *state, EShellWindow *shell_window) { ESidebar *sidebar; @@ -1268,9 +1268,9 @@ view_buttons_toolbar_item_toggled_handler (BonoboUIComponent *ui_compo static void view_buttons_hide_item_toggled_handler (BonoboUIComponent *ui_component, - const char *path, + const gchar *path, Bonobo_UIComponent_EventType type, - const char *state, + const gchar *state, EShellWindow *shell_window) { ESidebar *sidebar; @@ -1285,9 +1285,9 @@ view_buttons_hide_item_toggled_handler (BonoboUIComponent *ui_componen static void view_toolbar_item_toggled_handler (BonoboUIComponent *ui_component, - const char *path, + const gchar *path, Bonobo_UIComponent_EventType type, - const char *state, + const gchar *state, EShellWindow *shell_window) { gboolean is_visible; @@ -1300,9 +1300,9 @@ view_toolbar_item_toggled_handler (BonoboUIComponent *ui_component, static void view_statusbar_item_toggled_handler (BonoboUIComponent *ui_component, - const char *path, + const gchar *path, Bonobo_UIComponent_EventType type, - const char *state, + const gchar *state, EShellWindow *shell_window) { GtkWidget *status_bar = e_shell_window_peek_statusbar (shell_window); @@ -1321,9 +1321,9 @@ view_statusbar_item_toggled_handler (BonoboUIComponent *ui_component, static void view_sidebar_item_toggled_handler (BonoboUIComponent *ui_component, - const char *path, + const gchar *path, Bonobo_UIComponent_EventType type, - const char *state, + const gchar *state, EShellWindow *shell_window) { GtkWidget *side_bar = GTK_WIDGET(e_shell_window_peek_sidebar (shell_window)); diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 83e537c31b..8b24805fd4 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -60,18 +60,18 @@ gboolean e_shell_dbus_initialise (EShell *shell); to -1. When the views are created the first time, the widget pointers as well as the notebook page value get set. */ struct _ComponentView { - int button_id; - char *component_id; - char *component_alias; + gint button_id; + gchar *component_id; + gchar *component_alias; GNOME_Evolution_ComponentView component_view; - char *title; + gchar *title; GtkWidget *sidebar_widget; GtkWidget *view_widget; GtkWidget *statusbar_widget; - int notebook_page_num; + gint notebook_page_num; }; typedef struct _ComponentView ComponentView; @@ -132,7 +132,7 @@ static gboolean store_window_size (GtkWidget* widget); /* ComponentView handling. */ static ComponentView * -component_view_new (const char *id, const char *alias, int button_id) +component_view_new (const gchar *id, const gchar *alias, gint button_id) { ComponentView *view = g_new0 (ComponentView, 1); @@ -206,8 +206,8 @@ init_view (EShellWindow *window, Bonobo_Control statusbar_control; CORBA_boolean select_item; CORBA_Environment ev; - int sidebar_notebook_page_num; - int view_notebook_page_num; + gint sidebar_notebook_page_num; + gint view_notebook_page_num; g_return_if_fail (view->view_widget == NULL); g_return_if_fail (view->sidebar_widget == NULL); @@ -222,7 +222,7 @@ init_view (EShellWindow *window, component_iface = e_component_registry_activate (registry, view->component_id, &ev); if (BONOBO_EX (&ev) || component_iface == CORBA_OBJECT_NIL) { - char *ex_text = bonobo_exception_get_text (&ev); + gchar *ex_text = bonobo_exception_get_text (&ev); g_warning ("Cannot activate component %s: %s", view->component_id, ex_text); g_free (ex_text); CORBA_exception_free (&ev); @@ -305,7 +305,7 @@ switch_view (EShellWindow *window, ComponentView *component_view) EComponentInfo *info = e_component_registry_peek_info (registry, ECR_FIELD_ID, component_view->component_id); - char *title; + gchar *title; if (component_view->sidebar_widget == NULL) { init_view (window, component_view); @@ -423,7 +423,7 @@ update_send_receive_sensitivity (EShellWindow *window) /* Callbacks. */ static ComponentView * -get_component_view (EShellWindow *window, int id) +get_component_view (EShellWindow *window, gint id) { GSList *p; @@ -438,7 +438,7 @@ get_component_view (EShellWindow *window, int id) static void sidebar_button_selected_callback (ESidebar *sidebar, - int button_id, + gint button_id, EShellWindow *window) { ComponentView *component_view; @@ -450,7 +450,7 @@ sidebar_button_selected_callback (ESidebar *sidebar, static gboolean sidebar_button_pressed_callback (ESidebar *sidebar, GdkEventButton *event, - int button_id, + gint button_id, EShellWindow *window) { if (event->type == GDK_BUTTON_PRESS && @@ -502,7 +502,7 @@ shell_line_status_changed_callback (EShell *shell, static void ui_engine_add_hint_callback (BonoboUIEngine *engine, - const char *hint, + const gchar *hint, EShellWindow *window) { gtk_label_set_text (GTK_LABEL (window->priv->menu_hint_label), hint); @@ -614,9 +614,9 @@ setup_status_bar (EShellWindow *window) static void menu_component_selected (BonoboUIComponent *uic, EShellWindow *window, - const char *path) + const gchar *path) { - char *component_id; + gchar *component_id; component_id = strchr(path, '-'); if (component_id) @@ -640,10 +640,10 @@ setup_widgets (EShellWindow *window) GtkWidget *contents_vbox; GSList *p; GString *xml; - int button_id; + gint button_id; gboolean visible; - char *style; - int mode; + gchar *style; + gint mode; priv->paned = gtk_hpaned_new (); gtk_widget_show (priv->paned); @@ -754,7 +754,7 @@ setup_widgets (EShellWindow *window) button_id = 0; xml = g_string_new(""); for (p = e_component_registry_peek_list (registry); p != NULL; p = p->next) { - char *tmp, *tmp2; + gchar *tmp, *tmp2; EComponentInfo *info = p->data; ComponentView *view = component_view_new (info->id, info->alias, button_id); GtkIconInfo *icon_info; @@ -983,14 +983,14 @@ e_shell_window_init (EShellWindow *shell_window) GtkWidget * e_shell_window_new (EShell *shell, - const char *component_id) + const gchar *component_id) { EShellWindow *window = g_object_new (e_shell_window_get_type (), NULL); EShellWindowPrivate *priv = window->priv; GConfClient *gconf_client = gconf_client_get_default (); BonoboUIContainer *ui_container; - char *default_component_id = NULL; - char *xmlfile; + gchar *default_component_id = NULL; + gchar *xmlfile; gint width, height; if (bonobo_window_construct (BONOBO_WINDOW (window), @@ -1063,7 +1063,7 @@ e_shell_window_new (EShell *shell, void -e_shell_window_switch_to_component (EShellWindow *window, const char *component_id) +e_shell_window_switch_to_component (EShellWindow *window, const gchar *component_id) { EShellWindowPrivate *priv = window->priv; ComponentView *view = NULL; @@ -1093,7 +1093,7 @@ e_shell_window_switch_to_component (EShellWindow *window, const char *component_ } -const char * +const gchar * e_shell_window_peek_current_component_id (EShellWindow *window) { g_return_val_if_fail (E_IS_SHELL_WINDOW (window), NULL); @@ -1140,8 +1140,8 @@ void e_shell_window_save_defaults (EShellWindow *window) { GConfClient *client = gconf_client_get_default (); - char *prop; - const char *style; + gchar *prop; + const gchar *style; gboolean visible; gconf_client_set_int (client, "/apps/evolution/shell/view_defaults/folder_bar/width", @@ -1209,7 +1209,7 @@ e_shell_window_show_settings (EShellWindow *window) } void -e_shell_window_set_title(EShellWindow *window, const char *component_id, const char *title) +e_shell_window_set_title(EShellWindow *window, const gchar *component_id, const gchar *title) { EShellWindowPrivate *priv = window->priv; ComponentView *view = NULL; @@ -1246,7 +1246,7 @@ e_shell_window_set_title(EShellWindow *window, const char *component_id, const c * @param icon Icon buffer. **/ void -e_shell_window_change_component_button_icon (EShellWindow *window, const char *component_id, const char *icon_name) +e_shell_window_change_component_button_icon (EShellWindow *window, const gchar *component_id, const gchar *icon_name) { EShellWindowPrivate *priv; GSList *p; diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h index 869352b01c..d3abe1f201 100644 --- a/shell/e-shell-window.h +++ b/shell/e-shell-window.h @@ -58,22 +58,22 @@ struct _EShellWindowClass { GType e_shell_window_get_type (void); GtkWidget *e_shell_window_new (EShell *shell, - const char *component_id); + const gchar *component_id); void e_shell_window_switch_to_component (EShellWindow *shell, - const char *component_id); -const char *e_shell_window_peek_current_component_id (EShellWindow *shell); + const gchar *component_id); +const gchar *e_shell_window_peek_current_component_id (EShellWindow *shell); EShell *e_shell_window_peek_shell (EShellWindow *window); BonoboUIComponent *e_shell_window_peek_bonobo_ui_component (EShellWindow *window); ESidebar *e_shell_window_peek_sidebar (EShellWindow *window); GtkWidget *e_shell_window_peek_statusbar (EShellWindow *window); -void e_shell_window_set_title(EShellWindow *window, const char *component_id, const char *title); +void e_shell_window_set_title(EShellWindow *window, const gchar *component_id, const gchar *title); void e_shell_window_save_defaults (EShellWindow *window); void e_shell_window_show_settings (EShellWindow *window); -void e_shell_window_change_component_button_icon (EShellWindow *window, const char *component_id, const char *icon_name); +void e_shell_window_change_component_button_icon (EShellWindow *window, const gchar *component_id, const gchar *icon_name); #endif /* _E_SHELL_WINDOW_H_ */ diff --git a/shell/e-shell.c b/shell/e-shell.c index 9b4e6bc53a..ed7f8cc4b0 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -68,7 +68,7 @@ #include "evolution-listener.h" #include "evolution-shell-component-utils.h" -static void set_line_status_complete(EvolutionListener *el, void *data); +static void set_line_status_complete(EvolutionListener *el, gpointer data); #define PARENT_TYPE bonobo_object_get_type () static BonoboObjectClass *parent_class = NULL; @@ -76,7 +76,7 @@ static gboolean session_started = FALSE; struct _EShellPrivate { /* IID for registering the object on OAF. */ - char *iid; + gchar *iid; GList *windows; @@ -85,11 +85,11 @@ struct _EShellPrivate { /* Names for the types of the folders that have maybe crashed. */ /* FIXME TODO */ - GList *crash_type_names; /* char * */ + GList *crash_type_names; /* gchar * */ /* Line status and controllers */ EShellLineStatus line_status; - int line_status_pending; + gint line_status_pending; EShellLineStatus line_status_working; EvolutionListener *line_status_listener; @@ -105,19 +105,19 @@ struct _EShellPrivate { /* Whether the shell is succesfully initialized. This is needed during the start-up sequence, to avoid CORBA calls to do make wrong things to happen while the shell is initializing. */ - unsigned int is_initialized : 1; + guint is_initialized : 1; /* Wether the shell is working in "interactive" mode or not. (Currently, it's interactive IIF there is at least one active view.) */ - unsigned int is_interactive : 1; + guint is_interactive : 1; /* Whether quit has been requested, and the shell is now waiting for permissions from all the components to quit. */ - unsigned int preparing_to_quit : 1; + guint preparing_to_quit : 1; /* Whether we are recovering from a crash in the previous session. */ - unsigned int crash_recovery : 1; + guint crash_recovery : 1; }; @@ -160,7 +160,7 @@ set_interactive (EShell *shell, GSList *component_list; GSList *p; GList *first_element; - int num_windows; + gint num_windows; GtkWidget *view; g_return_if_fail (E_IS_SHELL (shell)); @@ -260,8 +260,8 @@ impl_Shell_handleURI (PortableServer_Servant servant, { EShell *shell = E_SHELL (bonobo_object_from_servant (servant)); EComponentInfo *component_info; - char *schema, *p; - int show = FALSE; + gchar *schema, *p; + gint show = FALSE; schema = g_alloca(strlen(uri)+1); strcpy(schema, uri); @@ -349,7 +349,7 @@ impl_Shell_findComponent(PortableServer_Servant servant, static int window_delete_event_cb (GtkWidget *widget, GdkEventAny *ev, - void *data) + gpointer data) { EShell *shell; @@ -360,7 +360,7 @@ window_delete_event_cb (GtkWidget *widget, } static gboolean -notify_no_windows_left_idle_cb (void *data) +notify_no_windows_left_idle_cb (gpointer data) { EShell *shell; EShellPrivate *priv; @@ -381,11 +381,11 @@ notify_no_windows_left_idle_cb (void *data) } static void -window_weak_notify (void *data, +window_weak_notify (gpointer data, GObject *where_the_object_was) { EShell *shell; - int num_windows; + gint num_windows; shell = E_SHELL (data); @@ -551,9 +551,9 @@ e_shell_init (EShell *shell) } static void -detect_version (GConfClient *gconf, int *major, int *minor, int *revision) +detect_version (GConfClient *gconf, gint *major, gint *minor, gint *revision) { - char *val, *evolution_dir; + gchar *val, *evolution_dir; struct stat st; evolution_dir = g_build_filename (g_get_home_dir (), "evolution", NULL); @@ -571,7 +571,7 @@ detect_version (GConfClient *gconf, int *major, int *minor, int *revision) } else { xmlDocPtr config_doc; xmlNodePtr source; - char *tmp; + gchar *tmp; tmp = g_build_filename (evolution_dir, "config.xmldb", NULL); config_doc = e_xml_parse_file (tmp); @@ -600,11 +600,11 @@ detect_version (GConfClient *gconf, int *major, int *minor, int *revision) /* calls components to perform upgrade */ static gboolean -attempt_upgrade (EShell *shell, int major, int minor, int revision) +attempt_upgrade (EShell *shell, gint major, gint minor, gint revision) { GSList *component_infos, *p; gboolean success; - int res; + gint res; success = TRUE; @@ -618,7 +618,7 @@ attempt_upgrade (EShell *shell, int major, int minor, int revision) GNOME_Evolution_Component_upgradeFromVersion (info->iface, major, minor, revision, &ev); if (BONOBO_EX (&ev)) { - char *exception_text; + gchar *exception_text; CORBA_char *id = CORBA_exception_id(&ev); if (strcmp (id, ex_CORBA_NO_IMPLEMENT) == 0) { @@ -660,7 +660,7 @@ attempt_upgrade (EShell *shell, int major, int minor, int revision) **/ EShellConstructResult e_shell_construct (EShell *shell, - const char *iid, + const gchar *iid, EShellStartupLineMode startup_line_mode) { EShellPrivate *priv; @@ -753,12 +753,12 @@ e_shell_new (EShellStartupLineMode startup_line_mode, } static int -remove_dir(const char *root, const char *path) +remove_dir(const gchar *root, const gchar *path) { GDir *dir; - const char *dname; - int res = -1; - char *new = NULL; + const gchar *dname; + gint res = -1; + gchar *new = NULL; struct stat st; dir = g_dir_open(path, 0, NULL); @@ -804,12 +804,12 @@ gboolean e_shell_attempt_upgrade (EShell *shell) { GConfClient *gconf_client; - int major = 0, minor = 0, revision = 0; - int lmajor, lminor, lrevision; - int cmajor, cminor, crevision; - char *version_string, *last_version = NULL; - int done_upgrade = FALSE; - char *oldpath; + gint major = 0, minor = 0, revision = 0; + gint lmajor, lminor, lrevision; + gint cmajor, cminor, crevision; + gchar *version_string, *last_version = NULL; + gint done_upgrade = FALSE; + gchar *oldpath; struct stat st; ESEvent *ese; @@ -834,8 +834,8 @@ e_shell_attempt_upgrade (EShell *shell) size = e_fsutils_usage(oldpath); space = e_fsutils_avail(g_get_home_dir()); if (size != -1 && space != -1 && space < size) { - char *required = g_strdup_printf(_("%ld KB"), size); - char *have = g_strdup_printf(_("%ld KB"), space); + gchar *required = g_strdup_printf(_("%ld KB"), size); + gchar *have = g_strdup_printf(_("%ld KB"), space); e_error_run(NULL, "shell:upgrade-nospace", required, have, NULL); g_free(required); @@ -866,7 +866,7 @@ check_old: if (lmajor == 1 && lminor < 5 && g_stat(oldpath, &st) == 0 && S_ISDIR(st.st_mode)) { - int res; + gint res; last_version = g_strdup_printf("%d.%d.%d", lmajor, lminor, lrevision); res = e_error_run(NULL, "shell:upgrade-remove-1-4", last_version, NULL); @@ -927,7 +927,7 @@ check_old: **/ EShellWindow * e_shell_create_window (EShell *shell, - const char *component_id, + const gchar *component_id, EShellWindow *template_window) { EShellWindow *window; @@ -1111,7 +1111,7 @@ set_line_status_finished(EShell *shell) } static void -set_line_status_complete(EvolutionListener *el, void *data) +set_line_status_complete(EvolutionListener *el, gpointer data) { EShell *shell = data; EShellPrivate *priv = shell->priv; @@ -1224,7 +1224,7 @@ e_shell_send_receive (EShell *shell) void e_shell_show_settings (EShell *shell, - const char *type, + const gchar *type, EShellWindow *shell_window) { EShellPrivate *priv; @@ -1252,7 +1252,7 @@ e_shell_show_settings (EShell *shell, } -const char * +const gchar * e_shell_construct_result_to_string (EShellConstructResult result) { switch (result) { diff --git a/shell/e-shell.h b/shell/e-shell.h index e8451e3b5b..4f26846071 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -95,7 +95,7 @@ typedef enum _EShellConstructResult EShellConstructResult; GType e_shell_get_type (void); EShellConstructResult e_shell_construct (EShell *shell, - const char *iid, + const gchar *iid, EShellStartupLineMode startup_line_mode); EShell *e_shell_new (EShellStartupLineMode startup_line_mode, EShellConstructResult *construct_result_return); @@ -103,7 +103,7 @@ EShell *e_shell_new (EShellStartupLineMode startup_line_m gboolean e_shell_attempt_upgrade (EShell *shell); EShellWindow *e_shell_create_window (EShell *shell, - const char *component_id, + const gchar *component_id, EShellWindow *template_window); gboolean e_shell_request_close_window (EShell *shell, EShellWindow *window); @@ -129,14 +129,14 @@ void e_shell_set_crash_recovery (EShell *shell, void e_shell_send_receive (EShell *shell); void e_shell_show_settings (EShell *shell, - const char *type, + const gchar *type, EShellWindow *shell_window); gboolean e_shell_can_quit (EShell *shell); gboolean e_shell_do_quit (EShell *shell); gboolean e_shell_quit (EShell *shell); -const char *e_shell_construct_result_to_string (EShellConstructResult result); +const gchar *e_shell_construct_result_to_string (EShellConstructResult result); typedef gboolean (*EMainShellFunc) (EShell *shell, EShellWindow *window, gpointer user_data); void e_shell_foreach_shell_window (EShell *shell, EMainShellFunc func, gpointer user_data); diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index d4c02e63ce..3326c5d1dc 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -36,7 +36,7 @@ typedef struct { GtkWidget *icon; GtkWidget *hbox; gchar *default_icon_name; - int id; + gint id; } Button; struct _ESidebarPrivate { @@ -60,7 +60,7 @@ enum { NUM_SIGNALS }; -static unsigned int signals[NUM_SIGNALS] = { 0 }; +static guint signals[NUM_SIGNALS] = { 0 }; G_DEFINE_TYPE (ESidebar, e_sidebar, GTK_TYPE_CONTAINER) @@ -75,7 +75,7 @@ button_new (GtkWidget *button_widget, GtkWidget *label, GtkWidget *icon, GtkWidget *hbox, - int id) + gint id) { Button *button = g_new (Button, 1); const gchar *icon_name; @@ -109,7 +109,7 @@ button_free (Button *button) } static void -update_buttons (ESidebar *sidebar, int new_selected_id) +update_buttons (ESidebar *sidebar, gint new_selected_id) { GSList *p; @@ -134,7 +134,7 @@ static void button_toggled_callback (GtkToggleButton *toggle_button, ESidebar *sidebar) { - int id = 0; + gint id = 0; gboolean is_active = FALSE; GSList *p; @@ -192,7 +192,7 @@ button_query_tooltip (GtkWidget *widget, { /* Show the tooltip only if the label is hidden */ if (INTERNAL_MODE (sidebar) == E_SIDEBAR_MODE_ICON) { - char *tip; + gchar *tip; tip = g_object_get_data (G_OBJECT (widget), "ESidebar:button-tooltip"); @@ -215,14 +215,14 @@ layout_buttons (ESidebar *sidebar) GtkAllocation *allocation = & GTK_WIDGET (sidebar)->allocation; ESidebarMode mode; gboolean icons_only; - int num_btns = g_slist_length (sidebar->priv->buttons), btns_per_row; + gint num_btns = g_slist_length (sidebar->priv->buttons), btns_per_row; GSList **rows, *p; Button *button; - int row_number; - int max_btn_width = 0, max_btn_height = 0; - int row_last; - int x, y; - int i; + gint row_number; + gint max_btn_width = 0, max_btn_height = 0; + gint row_last; + gint x, y; + gint i; y = allocation->y + allocation->height - V_PADDING - 1; @@ -281,7 +281,7 @@ layout_buttons (ESidebar *sidebar) /* Layout the buttons. */ for (i = row_last; i >= 0; i --) { - int len, extra_width; + gint len, extra_width; y -= max_btn_height; x = H_PADDING + allocation->x; @@ -318,7 +318,7 @@ do_layout (ESidebar *sidebar) { GtkAllocation *allocation = & GTK_WIDGET (sidebar)->allocation; GtkAllocation child_allocation; - int y; + gint y; if (sidebar->priv->show) y = layout_buttons (sidebar); @@ -341,7 +341,7 @@ static void impl_forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, - void *callback_data) + gpointer callback_data) { ESidebar *sidebar = E_SIDEBAR (container); GSList *p; @@ -544,10 +544,10 @@ e_sidebar_set_selection_widget (ESidebar *sidebar, GtkWidget *widget) void e_sidebar_add_button (ESidebar *sidebar, - const char *label, - const char *tooltips, - const char *icon_name, - int id) + const gchar *label, + const gchar *tooltips, + const gchar *icon_name, + gint id) { GtkWidget *button_widget; GtkWidget *hbox; @@ -613,7 +613,7 @@ e_sidebar_add_button (ESidebar *sidebar, * You cannot change icon as in a stack, only one default icon will be stored. **/ void -e_sidebar_change_button_icon (ESidebar *sidebar, const gchar *icon_name, int button_id) +e_sidebar_change_button_icon (ESidebar *sidebar, const gchar *icon_name, gint button_id) { GSList *p; @@ -639,7 +639,7 @@ e_sidebar_change_button_icon (ESidebar *sidebar, const gchar *icon_name, int but } void -e_sidebar_select_button (ESidebar *sidebar, int id) +e_sidebar_select_button (ESidebar *sidebar, gint id) { update_buttons (sidebar, id); @@ -712,11 +712,11 @@ set_mode_internal (ESidebar *sidebar, ESidebarMode mode ) } static void -style_changed_notify (GConfClient *gconf, guint id, GConfEntry *entry, void *data) +style_changed_notify (GConfClient *gconf, guint id, GConfEntry *entry, gpointer data) { ESidebar *sidebar = data; - char *val; - int mode; + gchar *val; + gint mode; val = gconf_client_get_string (gconf, "/desktop/gnome/interface/toolbar_style", NULL); if (val == NULL || !gconf_string_to_enum (toolbar_styles, val, &mode)) diff --git a/shell/e-sidebar.h b/shell/e-sidebar.h index 2585592363..9a06e5a377 100644 --- a/shell/e-sidebar.h +++ b/shell/e-sidebar.h @@ -54,8 +54,8 @@ struct _ESidebarClass { GtkContainerClass parent_class; /* signals */ - void (* button_selected) (ESidebar *sidebar, int id); - void (* button_pressed) (ESidebar *sidebar, GdkEventButton *event, int id); + void (* button_selected) (ESidebar *sidebar, gint id); + void (* button_pressed) (ESidebar *sidebar, GdkEventButton *event, gint id); }; @@ -66,17 +66,17 @@ void e_sidebar_set_selection_widget (ESidebar *sidebar, GtkWidget *widget); void e_sidebar_add_button (ESidebar *sidebar, - const char *label, - const char *tooltips, - const char *icon_name, - int id); + const gchar *label, + const gchar *tooltips, + const gchar *icon_name, + gint id); void e_sidebar_select_button (ESidebar *sidebar, - int id); + gint id); void e_sidebar_change_button_icon (ESidebar *sidebar, - const char *icon_name, - int button_id); + const gchar *icon_name, + gint button_id); ESidebarMode e_sidebar_get_mode (ESidebar *sidebar); void e_sidebar_set_mode (ESidebar *sidebar, ESidebarMode mode); diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index a49d7dbdc4..f5af1575dd 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -45,7 +45,7 @@ #include struct _Component { - char *id, *alias; + gchar *id, *alias; GNOME_Evolution_Component component; GNOME_Evolution_CreatableItemTypeList *type_list; }; @@ -53,11 +53,11 @@ typedef struct _Component Component; /* Representation of a single menu item. */ struct _MenuItem { - const char *label; - char shortcut; - char *verb; - char *tooltip; - char *component; + const gchar *label; + gchar shortcut; + gchar *verb; + gchar *tooltip; + gchar *component; GdkPixbuf *icon; GdkPixbuf *icon_toolbar; }; @@ -65,11 +65,11 @@ typedef struct _MenuItem MenuItem; struct _EUserCreatableItemsHandlerPrivate { /* This component's alias */ - char *this_component; + gchar *this_component; /* For creating items on the view */ EUserCreatableItemsHandlerCreate create_local; - void *create_data; + gpointer create_data; /* The components that register user creatable items. */ GSList *components; /* Component */ @@ -85,7 +85,7 @@ struct _EUserCreatableItemsHandlerPrivate { const MenuItem *fallback_menu_item; const MenuItem *default_menu_item; - char *menu_xml; + gchar *menu_xml; GtkWidget *new_button, *new_menu; BonoboControl *new_control; GtkAccelGroup *accel_group; @@ -101,8 +101,8 @@ G_DEFINE_TYPE (EUserCreatableItemsHandler, e_user_creatable_items_handler, G_TYP /* Component struct handling. */ static Component * -component_new (const char *id, - const char *component_alias, +component_new (const gchar *id, + const gchar *component_alias, GNOME_Evolution_Component component) { CORBA_Environment ev; @@ -149,7 +149,7 @@ component_free (Component *component) g_free (component); } -static const char *component_query = +static const gchar *component_query = "repo_ids.has ('IDL:GNOME/Evolution/Component:" BASE_VERSION "')"; static void @@ -159,15 +159,15 @@ get_components_from_bonobo (EUserCreatableItemsHandler *handler) Bonobo_ActivationProperty *property; CORBA_Environment ev; const gchar *alias; - char *iid; + gchar *iid; GNOME_Evolution_Component corba_component; Component *component; - int i; + gint i; CORBA_exception_init (&ev); info_list = bonobo_activation_query (component_query, NULL, &ev); if (BONOBO_EX (&ev)) { - char *ex_text = bonobo_exception_get_text (&ev); + gchar *ex_text = bonobo_exception_get_text (&ev); g_warning ("Cannot query for components: %s\n", ex_text); g_free (ex_text); CORBA_exception_free (&ev); @@ -198,7 +198,7 @@ get_components_from_bonobo (EUserCreatableItemsHandler *handler) static gboolean item_is_default (const MenuItem *item, - const char *component) + const gchar *component) { if (component == NULL) return FALSE; @@ -209,8 +209,8 @@ item_is_default (const MenuItem *item, return FALSE; } -static char * -create_verb (EUserCreatableItemsHandler *handler, int component_num, const char *comp, const char *type_id) +static gchar * +create_verb (EUserCreatableItemsHandler *handler, gint component_num, const gchar *comp, const gchar *type_id) { return g_strdup_printf ("EUserCreatableItemsHandler-%s:%d:%s", comp, component_num, type_id); } @@ -224,8 +224,8 @@ ensure_menu_items (EUserCreatableItemsHandler *handler) EUserCreatableItemsHandlerPrivate *priv; GSList *objects, *folders; GSList *p; - int component_num; - const char *default_verb; + gint component_num; + const gchar *default_verb; priv = handler->priv; if (priv->objects != NULL) @@ -236,7 +236,7 @@ ensure_menu_items (EUserCreatableItemsHandler *handler) default_verb = NULL; for (p = priv->components; p != NULL; p = p->next) { const Component *component; - int i; + gint i; component = (const Component *) p->data; if (component->type_list != NULL) { @@ -344,15 +344,15 @@ get_default_action_for_view (EUserCreatableItemsHandler *handler) static void execute_verb (EUserCreatableItemsHandler *handler, - const char *verb_name) + const gchar *verb_name) { EUserCreatableItemsHandlerPrivate *priv; const Component *component; - int component_number; - const char *p; - const char *id; + gint component_number; + const gchar *p; + const gchar *id; GSList *component_list_item; - int i; + gint i; priv = handler->priv; @@ -397,8 +397,8 @@ execute_verb (EUserCreatableItemsHandler *handler, static void verb_fn (BonoboUIComponent *ui_component, - void *data, - const char *verb_name) + gpointer data, + const gchar *verb_name) { EUserCreatableItemsHandler *handler= E_USER_CREATABLE_ITEMS_HANDLER (data); @@ -411,7 +411,7 @@ add_verbs (EUserCreatableItemsHandler *handler, BonoboUIComponent *ui_component) { EUserCreatableItemsHandlerPrivate *priv; - int component_num; + gint component_num; GSList *p; priv = handler->priv; @@ -419,13 +419,13 @@ add_verbs (EUserCreatableItemsHandler *handler, component_num = 0; for (p = priv->components; p != NULL; p = p->next) { const Component *component; - int i; + gint i; component = (const Component *) p->data; if (component->type_list != NULL) { for (i = 0; i < component->type_list->_length; i ++) { - char *verb_name; + gchar *verb_name; verb_name = create_verb (handler, component_num, @@ -446,12 +446,12 @@ add_verbs (EUserCreatableItemsHandler *handler, /* Generic menu construction code */ static int -item_types_sort_func (const void *a, - const void *b) +item_types_sort_func (gconstpointer a, + gconstpointer b) { const MenuItem *item_a; const MenuItem *item_b; - const char *p1, *p2; + const gchar *p1, *p2; item_a = (const MenuItem *) a; item_b = (const MenuItem *) b; @@ -559,8 +559,8 @@ xml_menu_item_func (EUserCreatableItemsHandler *handler, gpointer menu, MenuItem *item, gboolean first) { GString *xml = menu; - char *encoded_label; - char *encoded_tooltip; + gchar *encoded_label; + gchar *encoded_tooltip; encoded_label = bonobo_ui_util_encode_str (item->label); g_string_append_printf (xml, "shortcut); if (item->icon != NULL) { - char *icon_xml; + gchar *icon_xml; icon_xml = bonobo_ui_util_pixbuf_to_xml (item->icon); g_string_append_printf (xml, " pixtype=\"pixbuf\" pixname=\"%s\"", icon_xml); @@ -589,7 +589,7 @@ xml_menu_item_func (EUserCreatableItemsHandler *handler, gpointer menu, } static void -xml_separator_func (EUserCreatableItemsHandler *handler, gpointer menu, int nth) +xml_separator_func (EUserCreatableItemsHandler *handler, gpointer menu, gint nth) { GString *xml = menu; @@ -616,7 +616,7 @@ static void menuitem_activate (GtkMenuItem *item, gpointer data) { EUserCreatableItemsHandler *handler = data; - const char *verb; + const gchar *verb; verb = g_object_get_data (G_OBJECT (item), "EUserCreatableItemsHandler:verb"); execute_verb (handler, verb); @@ -665,7 +665,7 @@ gtk_menu_item_func (EUserCreatableItemsHandler *handler, gpointer menu, } static void -gtk_separator_func (EUserCreatableItemsHandler *handler, gpointer menu, int nth) +gtk_separator_func (EUserCreatableItemsHandler *handler, gpointer menu, gint nth) { gtk_menu_shell_append (menu, gtk_separator_menu_item_new ()); } @@ -696,12 +696,12 @@ set_combo_button_style (EComboButton *button, const gchar *style, GdkPixbuf *ico static void new_button_change (GConfClient *gconf, - unsigned int connection_id, + guint connection_id, GConfEntry *entry, EUserCreatableItemsHandler *handler) { EUserCreatableItemsHandlerPrivate *priv; - char *val; + gchar *val; priv = handler->priv; val = gconf_client_get_string (gconf, "/desktop/gnome/interface/toolbar_style", NULL); @@ -718,7 +718,7 @@ setup_toolbar_button (EUserCreatableItemsHandler *handler) { EUserCreatableItemsHandlerPrivate *priv; GConfClient *gconf = gconf_client_get_default (); - char *val; + gchar *val; priv = handler->priv; val = gconf_client_get_string (gconf, "/desktop/gnome/interface/toolbar_style", NULL); @@ -866,8 +866,8 @@ e_user_creatable_items_handler_init (EUserCreatableItemsHandler *handler) EUserCreatableItemsHandler * -e_user_creatable_items_handler_new (const char *component_alias, - EUserCreatableItemsHandlerCreate create_local, void *data) +e_user_creatable_items_handler_new (const gchar *component_alias, + EUserCreatableItemsHandlerCreate create_local, gpointer data) { EUserCreatableItemsHandler *handler; diff --git a/shell/e-user-creatable-items-handler.h b/shell/e-user-creatable-items-handler.h index b9be272af1..5350691eae 100644 --- a/shell/e-user-creatable-items-handler.h +++ b/shell/e-user-creatable-items-handler.h @@ -43,7 +43,7 @@ typedef struct _EUserCreatableItemsHandler EUserCreatableItemsHandler; typedef struct _EUserCreatableItemsHandlerPrivate EUserCreatableItemsHandlerPrivate; typedef struct _EUserCreatableItemsHandlerClass EUserCreatableItemsHandlerClass; -typedef void (*EUserCreatableItemsHandlerCreate)(EUserCreatableItemsHandler *handler, const char *item_type_name, void *data); +typedef void (*EUserCreatableItemsHandlerCreate)(EUserCreatableItemsHandler *handler, const gchar *item_type_name, gpointer data); struct _EUserCreatableItemsHandler { GObject parent; @@ -57,8 +57,8 @@ struct _EUserCreatableItemsHandlerClass { GType e_user_creatable_items_handler_get_type (void); -EUserCreatableItemsHandler *e_user_creatable_items_handler_new (const char *component_alias, - EUserCreatableItemsHandlerCreate create_local, void *data); +EUserCreatableItemsHandler *e_user_creatable_items_handler_new (const gchar *component_alias, + EUserCreatableItemsHandlerCreate create_local, gpointer data); void e_user_creatable_items_handler_activate (EUserCreatableItemsHandler *handler, BonoboUIComponent *ui_component); diff --git a/shell/es-event.c b/shell/es-event.c index 43a55c3fd5..5740d585c7 100644 --- a/shell/es-event.c +++ b/shell/es-event.c @@ -113,7 +113,7 @@ ESEvent *es_event_peek(void) } ESEventTargetState * -es_event_target_new_state(ESEvent *eme, int state) +es_event_target_new_state(ESEvent *eme, gint state) { ESEventTargetState *t = e_event_target_new(&eme->event, ES_EVENT_TARGET_STATE, sizeof(*t)); guint32 mask = ~0; @@ -141,7 +141,7 @@ es_event_target_new_shell(ESEvent *eme, EShell *shell) } ESEventTargetUpgrade * -es_event_target_new_upgrade(ESEvent *eme, int major, int minor, int revision) +es_event_target_new_upgrade(ESEvent *eme, gint major, gint minor, gint revision) { ESEventTargetUpgrade *t = e_event_target_new(&eme->event, ES_EVENT_TARGET_UPGRADE, sizeof(*t)); @@ -153,7 +153,7 @@ es_event_target_new_upgrade(ESEvent *eme, int major, int minor, int revision) } ESEventTargetComponent * -es_event_target_new_component (ESEvent *eme, const char *id) +es_event_target_new_component (ESEvent *eme, const gchar *id) { ESEventTargetComponent *t = e_event_target_new (&eme->event, ES_EVENT_TARGET_COMPONENT, sizeof (*t)); @@ -164,7 +164,7 @@ es_event_target_new_component (ESEvent *eme, const char *id) /* ********************************************************************** */ -static void *emeh_parent_class; +static gpointer emeh_parent_class; #define emeh ((ESEventHook *)eph) static const EEventHookTargetMask emeh_state_masks[] = { @@ -192,7 +192,7 @@ emeh_finalise(GObject *o) static void emeh_class_init(EPluginHookClass *klass) { - int i; + gint i; /** @HookClass: Shell Main Menu * @Id: org.gnome.evolution.shell.events:1.0 diff --git a/shell/es-event.h b/shell/es-event.h index 5ac363b8c8..0fa2ae0484 100644 --- a/shell/es-event.h +++ b/shell/es-event.h @@ -66,21 +66,21 @@ struct _ESEventTargetShell { struct _ESEventTargetState { EEventTarget target; - int state; + gint state; }; struct _ESEventTargetUpgrade { EEventTarget target; - int major; - int minor; - int revision; + gint major; + gint minor; + gint revision; }; struct _ESEventTargetComponent { EEventTarget target; - const char *id; + const gchar *id; }; typedef struct _EEventItem ESEventItem; @@ -100,10 +100,10 @@ GType es_event_get_type(void); ESEvent *es_event_peek(void); -ESEventTargetState *es_event_target_new_state(ESEvent *emp, int state); +ESEventTargetState *es_event_target_new_state(ESEvent *emp, gint state); ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, struct _EShell *shell); -ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, int major, int minor, int revision); -ESEventTargetComponent *es_event_target_new_component(ESEvent *eme, const char *id); +ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, gint major, gint minor, gint revision); +ESEventTargetComponent *es_event_target_new_component(ESEvent *eme, const gchar *id); /* ********************************************************************** */ diff --git a/shell/es-menu.c b/shell/es-menu.c index 3b459268a3..93fa3b339d 100644 --- a/shell/es-menu.c +++ b/shell/es-menu.c @@ -87,7 +87,7 @@ es_menu_get_type(void) return type; } -ESMenu *es_menu_new(const char *menuid) +ESMenu *es_menu_new(const gchar *menuid) { ESMenu *esm = g_object_new(es_menu_get_type(), NULL); @@ -120,7 +120,7 @@ es_menu_target_new_shell(ESMenu *esm, guint32 flags) /* ********************************************************************** */ -static void *esph_parent_class; +static gpointer esph_parent_class; #define esph ((ESMenuHook *)eph) static const EMenuHookTargetMask esph_shell_masks[] = { @@ -145,7 +145,7 @@ esph_finalise(GObject *o) static void esph_class_init(EPluginHookClass *klass) { - int i; + gint i; /** @HookClass: Shell Main Menu * @Id: org.gnome.evolution.shell.bonobomenu:1.0 diff --git a/shell/es-menu.h b/shell/es-menu.h index 9e9e0613b0..298de64e6e 100644 --- a/shell/es-menu.h +++ b/shell/es-menu.h @@ -71,7 +71,7 @@ struct _ESMenuClass { GType es_menu_get_type(void); -ESMenu *es_menu_new(const char *menuid); +ESMenu *es_menu_new(const gchar *menuid); ESMenuTargetShell *es_menu_target_new_shell(ESMenu *emp, guint32 flags); diff --git a/shell/evolution-listener.c b/shell/evolution-listener.c index 4bf9a76376..3209450134 100644 --- a/shell/evolution-listener.c +++ b/shell/evolution-listener.c @@ -59,7 +59,7 @@ evolution_listener_init(EvolutionListener *emf, EvolutionListenerClass *klass) BONOBO_TYPE_FUNC_FULL (EvolutionListener, GNOME_Evolution_Listener, PARENT_TYPE, evolution_listener) EvolutionListener * -evolution_listener_new(EvolutionListenerFunc complete, void *data) +evolution_listener_new(EvolutionListenerFunc complete, gpointer data) { EvolutionListener *el; diff --git a/shell/evolution-listener.h b/shell/evolution-listener.h index 7b79b3bab8..9637342099 100644 --- a/shell/evolution-listener.h +++ b/shell/evolution-listener.h @@ -32,14 +32,14 @@ typedef struct _EvolutionListener EvolutionListener; typedef struct _EvolutionListenerClass EvolutionListenerClass; -typedef void (*EvolutionListenerFunc)(EvolutionListener *, void *); +typedef void (*EvolutionListenerFunc)(EvolutionListener *, gpointer ); struct _EvolutionListener { BonoboObject parent; /* we dont need signals, so why bother wasting resources on it */ EvolutionListenerFunc complete; - void *data; + gpointer data; }; struct _EvolutionListenerClass { @@ -49,6 +49,6 @@ struct _EvolutionListenerClass { }; GType evolution_listener_get_type(void); -EvolutionListener *evolution_listener_new(EvolutionListenerFunc complete, void *data); +EvolutionListener *evolution_listener_new(EvolutionListenerFunc complete, gpointer data); #endif /* _EVOLUTION_LISTENER_H_ */ diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c index a8ce855268..bcbe610e4e 100644 --- a/shell/evolution-shell-component-utils.c +++ b/shell/evolution-shell-component-utils.c @@ -39,8 +39,8 @@ static GSList *inited_arrays = NULL; void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache) { - static int done_init = 0; - int i; + static gint done_init = 0; + gint i; if (!done_init) { g_atexit (free_pixmaps); @@ -72,7 +72,7 @@ void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache) static void free_pixmaps (void) { - int i; + gint i; GSList *li; for (li = inited_arrays; li != NULL; li = li->next) { @@ -93,7 +93,7 @@ free_pixmaps (void) * * Return value: A newly allocated string with the printable error message. **/ -char * +gchar * e_get_activation_failure_msg (CORBA_Environment *ev) { g_return_val_if_fail (ev != NULL, NULL); diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h index ce4fa11229..477643e93d 100644 --- a/shell/evolution-shell-component-utils.h +++ b/shell/evolution-shell-component-utils.h @@ -31,10 +31,10 @@ extern "C" { #endif /* __cplusplus */ typedef struct _EPixmap { - const char *path; - const char *name; + const gchar *path; + const gchar *name; GtkIconSize size; - char *pixbuf; + gchar *pixbuf; } EPixmap; #define E_PIXMAP(path,name,size) { (path), (name), (size), NULL } @@ -43,7 +43,7 @@ typedef struct _EPixmap { /* Takes an array of pixmaps, terminated by E_PIXMAP_END, and loads into uic */ void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache); -char *e_get_activation_failure_msg (CORBA_Environment *ev); +gchar *e_get_activation_failure_msg (CORBA_Environment *ev); #ifdef __cplusplus } diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c index 06d30d5733..66a82836e3 100644 --- a/shell/importer/evolution-importer-client.c +++ b/shell/importer/evolution-importer-client.c @@ -92,7 +92,7 @@ evolution_importer_client_new (const CORBA_Object objref) * Returns: A newly created EvolutionImporterClient. */ EvolutionImporterClient * -evolution_importer_client_new_from_id (const char *id) +evolution_importer_client_new_from_id (const gchar *id) { CORBA_Environment ev; CORBA_Object objref; @@ -100,7 +100,7 @@ evolution_importer_client_new_from_id (const char *id) g_return_val_if_fail (id != NULL, NULL); CORBA_exception_init (&ev); - objref = bonobo_activation_activate_from_id ((char *) id, 0, NULL, &ev); + objref = bonobo_activation_activate_from_id ((gchar *) id, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION) { CORBA_exception_free (&ev); g_warning ("Could not start %s.", id); @@ -154,7 +154,7 @@ evolution_importer_client_create_control (EvolutionImporterClient *client) */ gboolean evolution_importer_client_support_format (EvolutionImporterClient *client, - const char *filename) + const gchar *filename) { GNOME_Evolution_Importer corba_importer; gboolean result; @@ -185,7 +185,7 @@ evolution_importer_client_support_format (EvolutionImporterClient *client, * Returns: TRUE on sucess, FALSE on failure. */ gboolean -evolution_importer_client_load_file (EvolutionImporterClient *client, const char *filename) +evolution_importer_client_load_file (EvolutionImporterClient *client, const gchar *filename) { GNOME_Evolution_Importer corba_importer; gboolean result; @@ -248,7 +248,7 @@ evolution_importer_client_process_item (EvolutionImporterClient *client, * Returns: The error as a string. If there is no error NULL is returned. * Importers need not support this method and if so, NULL is also returned. */ -const char * +const gchar * evolution_importer_client_get_error (EvolutionImporterClient *client) { GNOME_Evolution_Importer corba_importer; diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h index 3ae4b2f7b0..2a71e58a45 100644 --- a/shell/importer/evolution-importer-client.h +++ b/shell/importer/evolution-importer-client.h @@ -56,16 +56,16 @@ struct _EvolutionImporterClientClass { GType evolution_importer_client_get_type (void); EvolutionImporterClient *evolution_importer_client_new (const CORBA_Object objref); -EvolutionImporterClient *evolution_importer_client_new_from_id (const char *id); +EvolutionImporterClient *evolution_importer_client_new_from_id (const gchar *id); GtkWidget *evolution_importer_client_create_control (EvolutionImporterClient *client); gboolean evolution_importer_client_support_format (EvolutionImporterClient *client, - const char *filename); + const gchar *filename); gboolean evolution_importer_client_load_file (EvolutionImporterClient *client, - const char *filename); + const gchar *filename); void evolution_importer_client_process_item (EvolutionImporterClient *client, EvolutionImporterListener *listener); -const char *evolution_importer_client_get_error (EvolutionImporterClient *client); +const gchar *evolution_importer_client_get_error (EvolutionImporterClient *client); #ifdef __cplusplus } diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c index 8915202d30..ffac2d3ab4 100644 --- a/shell/importer/evolution-importer-listener.c +++ b/shell/importer/evolution-importer-listener.c @@ -37,7 +37,7 @@ static BonoboObjectClass *parent_class = NULL; struct _EvolutionImporterListenerPrivate { EvolutionImporterListenerCallback callback; - void *closure; + gpointer closure; }; #if 0 @@ -185,7 +185,7 @@ evolution_importer_listener_init (EvolutionImporterListener *listener) static void evolution_importer_listener_construct (EvolutionImporterListener *listener, EvolutionImporterListenerCallback callback, - void *closure) + gpointer closure) { EvolutionImporterListenerPrivate *priv; @@ -209,7 +209,7 @@ evolution_importer_listener_construct (EvolutionImporterListener *listener, */ EvolutionImporterListener * evolution_importer_listener_new (EvolutionImporterListenerCallback callback, - void *closure) + gpointer closure) { EvolutionImporterListener *listener; diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h index 63f480e4dd..e4df945271 100644 --- a/shell/importer/evolution-importer-listener.h +++ b/shell/importer/evolution-importer-listener.h @@ -46,7 +46,7 @@ typedef struct _EvolutionImporterListenerClass EvolutionImporterListenerClass; typedef void (* EvolutionImporterListenerCallback) (EvolutionImporterListener *listener, EvolutionImporterResult result, gboolean more_items, - void *closure); + gpointer closure); struct _EvolutionImporterListener { BonoboObject parent; @@ -62,7 +62,7 @@ struct _EvolutionImporterListenerClass { GType evolution_importer_listener_get_type (void); EvolutionImporterListener *evolution_importer_listener_new (EvolutionImporterListenerCallback callback, - void *closure); + gpointer closure); #ifdef __cplusplus } diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c index f8e6847891..26b06e7c20 100644 --- a/shell/importer/evolution-importer.c +++ b/shell/importer/evolution-importer.c @@ -41,7 +41,7 @@ struct _EvolutionImporterPrivate { EvolutionImporterProcessItemFn process_item_fn; EvolutionImporterGetErrorFn get_error_fn; - void *closure; + gpointer closure; }; @@ -194,7 +194,7 @@ evolution_importer_construct (EvolutionImporter *importer, EvolutionImporterLoadFileFn load_file_fn, EvolutionImporterProcessItemFn process_item_fn, EvolutionImporterGetErrorFn get_error_fn, - void *closure) + gpointer closure) { EvolutionImporterPrivate *priv; @@ -233,7 +233,7 @@ evolution_importer_new (EvolutionImporterCreateControlFn create_control_fn, EvolutionImporterLoadFileFn load_file_fn, EvolutionImporterProcessItemFn process_item_fn, EvolutionImporterGetErrorFn get_error_fn, - void *closure) + gpointer closure) { EvolutionImporter *importer; diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h index 4925fad4fc..b4bf54928f 100644 --- a/shell/importer/evolution-importer.h +++ b/shell/importer/evolution-importer.h @@ -44,20 +44,20 @@ typedef struct _EvolutionImporterClass EvolutionImporterClass; typedef void (* EvolutionImporterCreateControlFn) (EvolutionImporter *importer, Bonobo_Control *control, - void *closure); + gpointer closure); typedef gboolean (* EvolutionImporterSupportFormatFn) (EvolutionImporter *importer, - const char *filename, - void *closure); + const gchar *filename, + gpointer closure); typedef gboolean (* EvolutionImporterLoadFileFn) (EvolutionImporter *importer, - const char *filename, - void *closure); + const gchar *filename, + gpointer closure); typedef void (* EvolutionImporterProcessItemFn) (EvolutionImporter *importer, CORBA_Object listener, - void *closure, + gpointer closure, CORBA_Environment *ev); -typedef char *(* EvolutionImporterGetErrorFn) (EvolutionImporter *importer, - void *closure); +typedef gchar *(* EvolutionImporterGetErrorFn) (EvolutionImporter *importer, + gpointer closure); typedef enum { EVOLUTION_IMPORTER_OK, diff --git a/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c index d867c120b8..48c767cfde 100644 --- a/shell/importer/evolution-intelligent-importer.c +++ b/shell/importer/evolution-intelligent-importer.c @@ -37,9 +37,9 @@ struct _EvolutionIntelligentImporterPrivate { EvolutionIntelligentImporterCanImportFn can_import_fn; EvolutionIntelligentImporterImportDataFn import_data_fn; - char *importername; - char *message; - void *closure; + gchar *importername; + gchar *message; + gpointer closure; }; @@ -148,9 +148,9 @@ static void evolution_intelligent_importer_construct (EvolutionIntelligentImporter *ii, EvolutionIntelligentImporterCanImportFn can_import_fn, EvolutionIntelligentImporterImportDataFn import_data_fn, - const char *importername, - const char *message, - void *closure) + const gchar *importername, + const gchar *message, + gpointer closure) { g_return_if_fail (ii != NULL); ii->priv->importername = g_strdup (importername); @@ -178,9 +178,9 @@ evolution_intelligent_importer_construct (EvolutionIntelligentImporter *ii, EvolutionIntelligentImporter * evolution_intelligent_importer_new (EvolutionIntelligentImporterCanImportFn can_import_fn, EvolutionIntelligentImporterImportDataFn import_data_fn, - const char *importername, - const char *message, - void *closure) + const gchar *importername, + const gchar *message, + gpointer closure) { EvolutionIntelligentImporter *ii; diff --git a/shell/importer/evolution-intelligent-importer.h b/shell/importer/evolution-intelligent-importer.h index 2d36d498e9..99d5d2b26d 100644 --- a/shell/importer/evolution-intelligent-importer.h +++ b/shell/importer/evolution-intelligent-importer.h @@ -43,9 +43,9 @@ typedef struct _EvolutionIntelligentImporterPrivate EvolutionIntelligentImporter typedef struct _EvolutionIntelligentImporterClass EvolutionIntelligentImporterClass; typedef gboolean (* EvolutionIntelligentImporterCanImportFn) (EvolutionIntelligentImporter *ii, - void *closure); + gpointer closure); typedef void (* EvolutionIntelligentImporterImportDataFn) (EvolutionIntelligentImporter *ii, - void *closure); + gpointer closure); struct _EvolutionIntelligentImporter { BonoboObject parent; @@ -63,9 +63,9 @@ GType evolution_intelligent_importer_get_type (void); EvolutionIntelligentImporter *evolution_intelligent_importer_new (EvolutionIntelligentImporterCanImportFn can_import_fn, EvolutionIntelligentImporterImportDataFn import_data_fn, - const char *importername, - const char *message, - void *closure); + const gchar *importername, + const gchar *message, + gpointer closure); #ifdef __cplusplus } diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c index 20927d2742..8b7ebaa743 100644 --- a/shell/importer/intelligent.c +++ b/shell/importer/intelligent.c @@ -48,9 +48,9 @@ typedef struct { Bonobo_Control control; GtkWidget *widget; - char *name; - char *blurb; - char *iid; + gchar *name; + gchar *blurb; + gchar *iid; } IntelligentImporterData; typedef struct { @@ -61,12 +61,12 @@ typedef struct { GList *importers; - int running; + gint running; } IntelligentImporterDialog; typedef struct { CORBA_Object importer; - char *iid; + gchar *iid; } SelectedImporterData; static void @@ -119,7 +119,7 @@ get_intelligent_importers (void) Bonobo_ServerInfoList *info_list; GList *iids_ret = NULL; CORBA_Environment ev; - int i; + gint i; CORBA_exception_init (&ev); info_list = bonobo_activation_query ("repo_ids.has ('IDL:GNOME/Evolution/IntelligentImporter:" BASE_VERSION "')", NULL, &ev); @@ -137,8 +137,8 @@ get_intelligent_importers (void) static void select_row_cb (GtkCList *clist, - int row, - int column, + gint row, + gint column, GdkEvent *ev, IntelligentImporterDialog *d) { @@ -147,8 +147,8 @@ select_row_cb (GtkCList *clist, static void unselect_row_cb (GtkCList *clist, - int row, - int column, + gint row, + gint column, GdkEvent *ev, IntelligentImporterDialog *d) { @@ -162,7 +162,7 @@ create_gui (GList *importers) GtkWidget *hbox, *vbox, *dummy; IntelligentImporterDialog *d; GList *l; - int running = 0; + gint running = 0; d = g_new (IntelligentImporterDialog, 1); d->dialog = dialog = gtk_dialog_new(); @@ -220,7 +220,7 @@ create_gui (GList *importers) IntelligentImporterData *data; CORBA_Environment ev; gboolean dontaskagain, can_run; - char *text[1], *prefix; + gchar *text[1], *prefix; /* Check if we want to show this one again */ prefix = g_strdup_printf ("=%s/evolution/config/Shell=/intelligent-importers/", g_get_home_dir ()); @@ -237,7 +237,7 @@ create_gui (GList *importers) data->iid = g_strdup (l->data); CORBA_exception_init (&ev); - data->object = bonobo_activation_activate_from_id ((char *) data->iid, 0, + data->object = bonobo_activation_activate_from_id ((gchar *) data->iid, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Could not start %s: %s", data->iid, @@ -359,9 +359,9 @@ intelligent_importer_init (void) { GList *importers, *l, *selected = NULL; IntelligentImporterDialog *d; - char *prefix; + gchar *prefix; gboolean dontaskagain; - int resp; + gint resp; prefix = g_strdup_printf ("=%s/evolution/config/Shell=/intelligent-importers/", g_get_home_dir()); gnome_config_push_prefix (prefix); @@ -395,7 +395,7 @@ intelligent_importer_init (void) IntelligentImporterData *data; SelectedImporterData *new_data; CORBA_Environment ev; - char *iid; + gchar *iid; data = g_list_nth_data (d->importers, GPOINTER_TO_INT (l->data)); iid = g_strdup (data->iid); diff --git a/shell/main.c b/shell/main.c index c6959d7663..4032c5544e 100644 --- a/shell/main.c +++ b/shell/main.c @@ -106,8 +106,8 @@ static gboolean disable_eplugin = FALSE; static gboolean disable_preview = FALSE; static gboolean idle_cb (gchar **uris); -static char *default_component_id = NULL; -static char *evolution_debug_log = NULL; +static gchar *default_component_id = NULL; +static gchar *evolution_debug_log = NULL; static gchar **remaining_args; static void @@ -118,7 +118,7 @@ no_windows_left_cb (EShell *shell, gpointer data) } static void -shell_weak_notify (void *data, +shell_weak_notify (gpointer data, GObject *where_the_object_was) { bonobo_main_quit (); @@ -199,7 +199,7 @@ show_development_warning(void) GtkWidget *checkbox; GtkWidget *alignment; gboolean skip; - char *text; + gchar *text; warning_dialog = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (warning_dialog), "Evolution " VERSION); @@ -422,7 +422,7 @@ static GStaticMutex segv_mutex = G_STATIC_MUTEX_INIT; static pthread_t main_thread; static void -segv_redirect (int sig) +segv_redirect (gint sig) { if (pthread_self () == main_thread) gnome_segv_handler (sig); @@ -562,8 +562,8 @@ set_paths (void) } #endif -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { #ifdef G_OS_WIN32 extern void link_shutdown (void); @@ -576,7 +576,7 @@ main (int argc, char **argv) GnomeProgram *program; GnomeClient *master_client; GOptionContext *context; - char *filename; + gchar *filename; /* Make ElectricFence work. */ free (malloc (10)); @@ -645,7 +645,7 @@ main (int argc, char **argv) setup_segv_redirect (); if (evolution_debug_log) { - int fd; + gint fd; fd = g_open (evolution_debug_log, O_WRONLY | O_CREAT | O_TRUNC, 0600); if (fd != -1) { diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c index 9fdeab7a3f..25df4d547a 100644 --- a/shell/test/evolution-test-component.c +++ b/shell/test/evolution-test-component.c @@ -103,7 +103,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, list->_buffer[0].id = CREATE_TEST_ID; list->_buffer[0].description = _("New Test"); - list->_buffer[0].menuDescription = (char *) C_("New", "_Test"); + list->_buffer[0].menuDescription = (gchar *) C_("New", "_Test"); list->_buffer[0].tooltip = _("Create a new test item"); list->_buffer[0].menuShortcut = 'i'; list->_buffer[0].iconName = ""; @@ -161,8 +161,8 @@ BONOBO_TYPE_FUNC_FULL (EvolutionTestComponent, GNOME_Evolution_Component, PARENT static BonoboObject * factory (BonoboGenericFactory *factory, - const char *component_id, - void *closure) + const gchar *component_id, + gpointer closure) { if (strcmp (component_id, TEST_COMPONENT_ID) == 0) { BonoboObject *object = BONOBO_OBJECT (g_object_new (EVOLUTION_TEST_TYPE_COMPONENT, NULL)); diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c index f3a47e1181..1f79754757 100644 --- a/smime/gui/ca-trust-dialog.c +++ b/smime/gui/ca-trust-dialog.c @@ -75,8 +75,8 @@ ca_trust_dialog_show (ECert *cert, gboolean importing) { CATrustDialogData *ctd_data; GtkWidget *w; - char *txt; - char *gladefile; + gchar *txt; + gchar *gladefile; ctd_data = g_new0 (CATrustDialogData, 1); diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c index 0e4af90edc..b32a7c58c7 100644 --- a/smime/gui/cert-trust-dialog.c +++ b/smime/gui/cert-trust-dialog.c @@ -51,7 +51,7 @@ typedef struct { } CertTrustDialogData; static void -free_data (void *data) +free_data (gpointer data) { CertTrustDialogData *ctd = data; @@ -116,7 +116,7 @@ cert_trust_dialog_show (ECert *cert) { CertTrustDialogData *ctd_data; CERTCertificate *icert; - char *gladefile; + gchar *gladefile; ctd_data = g_new0 (CertTrustDialogData, 1); diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index c5261e879b..e0663f0578 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -93,7 +93,7 @@ static void add_ca_cert (CertificateManagerData *cfm, ECert *cert); static void handle_selection_changed (GtkTreeSelection *selection, - int cert_column, + gint cert_column, GtkWidget *view_button, GtkWidget *edit_button, GtkWidget *delete_button) @@ -153,7 +153,7 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm) gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter); if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) { - char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); + gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); /* destroy dialog to get rid of it in the GUI */ gtk_widget_destroy (filesel); @@ -400,7 +400,7 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm) gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter); if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) { - char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); + gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); /* destroy dialog to get rid of it in the GUI */ gtk_widget_destroy (filesel); @@ -627,7 +627,7 @@ import_ca (GtkWidget *widget, CertificateManagerData *cfm) gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter); if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) { - char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); + gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); /* destroy dialog to get rid of it in the GUI */ gtk_widget_destroy (filesel); @@ -739,7 +739,7 @@ add_user_cert (CertificateManagerData *cfm, ECert *cert) { GtkTreeIter iter; GtkTreeIter *parent_iter = NULL; - const char *organization = e_cert_get_org (cert); + const gchar *organization = e_cert_get_org (cert); GtkTreeModel *model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (cfm->yourcerts_streemodel)); if (organization) { @@ -783,7 +783,7 @@ add_contact_cert (CertificateManagerData *cfm, ECert *cert) { GtkTreeIter iter; GtkTreeIter *parent_iter = NULL; - const char *organization = e_cert_get_org (cert); + const gchar *organization = e_cert_get_org (cert); GtkTreeModel *model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (cfm->contactcerts_streemodel)); if (organization) { @@ -825,7 +825,7 @@ add_ca_cert (CertificateManagerData *cfm, ECert *cert) { GtkTreeIter iter; GtkTreeIter *parent_iter = NULL; - const char *organization = e_cert_get_org (cert); + const gchar *organization = e_cert_get_org (cert); GtkTreeModel *model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (cfm->authoritycerts_streemodel)); if (organization) { @@ -994,7 +994,7 @@ certificate_manager_config_control_new (void) { CertificateManagerData *cfm_data; GtkWidget *control_widget; - char *gladefile; + gchar *gladefile; /* We need to peek the db here to make sure it (and NSS) are fully initialized. */ e_cert_db_peek (); diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c index 997bbace46..37289c3e8b 100644 --- a/smime/gui/certificate-viewer.c +++ b/smime/gui/certificate-viewer.c @@ -64,8 +64,8 @@ static void fill_in_general (CertificateViewerData *cvm_data, ECert *cert) { GtkWidget *label; - const char *text; - char *markup; + const gchar *text; + gchar *markup; /* issued to */ label = glade_xml_get_widget (cvm_data->gui, "issued-to-cn"); @@ -225,7 +225,7 @@ fields_selection_changed (GtkTreeSelection *selection, CertificateViewerData *cv &model, &iter)) { EASN1Object *asn1_object; - const char *value; + const gchar *value; gtk_tree_model_get (model, &iter, @@ -296,7 +296,7 @@ fill_in_details (CertificateViewerData *cvm_data, ECert *cert) cvm_data->cert_chain = g_list_reverse (cvm_data->cert_chain); for (l = cvm_data->cert_chain; l; l = l->next) { ECert *c = l->data; - const char *str; + const gchar *str; GtkTreeIter new_iter; str = e_cert_get_cn (c); @@ -319,8 +319,8 @@ GtkWidget* certificate_viewer_show (ECert *cert) { CertificateViewerData *cvm_data; - char *title; - char *gladefile; + gchar *title; + gchar *gladefile; cvm_data = g_new0 (CertificateViewerData, 1); diff --git a/smime/gui/component.c b/smime/gui/component.c index 1096aa2a5e..48546bf75f 100644 --- a/smime/gui/component.c +++ b/smime/gui/component.c @@ -36,10 +36,10 @@ #include "pk11func.h" static gboolean -smime_pk11_passwd (ECertDB *db, PK11SlotInfo* slot, gboolean retry, char **passwd, gpointer arg) +smime_pk11_passwd (ECertDB *db, PK11SlotInfo* slot, gboolean retry, gchar **passwd, gpointer arg) { - char *prompt; - char *slot_name = g_strdup (PK11_GetSlotName (slot)); + gchar *prompt; + gchar *slot_name = g_strdup (PK11_GetSlotName (slot)); g_strchomp (slot_name); @@ -58,9 +58,9 @@ smime_pk11_passwd (ECertDB *db, PK11SlotInfo* slot, gboolean retry, char **passw } static gboolean -smime_pk11_change_passwd (ECertDB *db, char **old_passwd, char **passwd, gpointer arg) +smime_pk11_change_passwd (ECertDB *db, gchar **old_passwd, gchar **passwd, gpointer arg) { - char *prompt; + gchar *prompt; /* XXX need better strings here, just copy mozilla's? */ @@ -86,7 +86,7 @@ static gboolean smime_confirm_ca_cert_import (ECertDB *db, ECert *cert, gboolean *trust_ssl, gboolean *trust_email, gboolean *trust_objsign, gpointer arg) { GtkWidget *dialog = ca_trust_dialog_show (cert, TRUE); - int response; + gint response; response = gtk_dialog_run (GTK_DIALOG (dialog)); diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c index 0ac946b5b8..e84b933a81 100644 --- a/smime/gui/e-cert-selector.c +++ b/smime/gui/e-cert-selector.c @@ -68,7 +68,7 @@ ecs_find_current(ECertSelector *ecs) { struct _ECertSelectorPrivate *p = ecs->priv; CERTCertListNode *node; - int n; + gint n; if (p->certlist == NULL || CERT_LIST_EMPTY(p->certlist)) return NULL; @@ -141,7 +141,7 @@ ecs_cert_changed(GtkWidget *w, ECertSelector *ecs) * Return value: A dialogue to be shown. **/ GtkWidget * -e_cert_selector_new(int type, const char *currentid) +e_cert_selector_new(gint type, const gchar *currentid) { ECertSelector *ecs; struct _ECertSelectorPrivate *p; @@ -150,8 +150,8 @@ e_cert_selector_new(int type, const char *currentid) CERTCertListNode *node; GladeXML *gui; GtkWidget *w; - int n=0, active=0; - char *gladefile; + gint n=0, active=0; + gchar *gladefile; ecs = g_object_new(e_cert_selector_get_type(), NULL); p = ecs->priv; diff --git a/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h index 85cfa0ba9f..5520b5621c 100644 --- a/smime/gui/e-cert-selector.h +++ b/smime/gui/e-cert-selector.h @@ -49,7 +49,7 @@ struct _ECertSelector { struct _ECertSelectorClass { GtkDialogClass parent_class; - void (*selected)(ECertSelector *, const char *certid); + void (*selected)(ECertSelector *, const gchar *certid); }; enum _e_cert_selector_type { @@ -58,7 +58,7 @@ enum _e_cert_selector_type { }; GType e_cert_selector_get_type (void); -GtkWidget *e_cert_selector_new (int type, const char *currentid); +GtkWidget *e_cert_selector_new (gint type, const gchar *currentid); #ifdef cplusplus } diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c index b3cfe9e726..6e490f6123 100644 --- a/smime/lib/e-asn1-object.c +++ b/smime/lib/e-asn1-object.c @@ -54,10 +54,10 @@ struct _EASN1ObjectPrivate { GList *children; - char *display_name; - char *value; + gchar *display_name; + gchar *value; - char *data; + gchar *data; guint data_len; }; @@ -137,9 +137,9 @@ e_asn1_object_get_type (void) ASN1. */ static int -get_integer_256 (unsigned char *data, unsigned int nb) +get_integer_256 (guchar *data, guint nb) { - int val; + gint val; switch (nb) { case 1: @@ -171,10 +171,10 @@ get_integer_256 (unsigned char *data, unsigned int nb) */ static guint32 -get_der_item_length (unsigned char *data, unsigned char *end, +get_der_item_length (guchar *data, guchar *end, unsigned long *bytesUsed, gboolean *indefinite) { - unsigned char lbyte = *data++; + guchar lbyte = *data++; PRInt32 length = -1; *indefinite = FALSE; @@ -205,13 +205,13 @@ get_der_item_length (unsigned char *data, unsigned char *end, } static gboolean -build_from_der (EASN1Object *parent, char *data, char *end) +build_from_der (EASN1Object *parent, gchar *data, gchar *end) { unsigned long bytesUsed; gboolean indefinite; PRInt32 len; PRUint32 type; - unsigned char code, tagnum; + guchar code, tagnum; EASN1Object *asn1object = NULL; if (data >= end) @@ -221,7 +221,7 @@ build_from_der (EASN1Object *parent, char *data, char *end) A DER item has the form of |tag|len|data tag is one byte and describes the type of elment we are dealing with. - len is a DER encoded int telling us how long the data is + len is a DER encoded gint telling us how long the data is data is a buffer that is len bytes long and has to be interpreted according to its type. */ @@ -237,7 +237,7 @@ build_from_der (EASN1Object *parent, char *data, char *end) return FALSE; } data++; - len = get_der_item_length ((unsigned char *)data, (unsigned char *)end, &bytesUsed, &indefinite); + len = get_der_item_length ((guchar *)data, (guchar *)end, &bytesUsed, &indefinite); data += bytesUsed; if ((len < 0) || ((data+len) > end)) return FALSE; @@ -277,7 +277,7 @@ build_from_der (EASN1Object *parent, char *data, char *end) asn1object->priv->type = tagnum; asn1object->priv->tag = tagnum; - /*printableItem->SetData((char*)data, len);*/ + /*printableItem->SetData((gchar *)data, len);*/ } data += len; @@ -288,7 +288,7 @@ build_from_der (EASN1Object *parent, char *data, char *end) } EASN1Object* -e_asn1_object_new_from_der (char *data, guint32 len) +e_asn1_object_new_from_der (gchar *data, guint32 len) { EASN1Object *obj = g_object_new (E_TYPE_ASN1_OBJECT, NULL); @@ -348,33 +348,33 @@ e_asn1_object_append_child (EASN1Object *parent, EASN1Object *child) } void -e_asn1_object_set_display_name (EASN1Object *obj, const char *name) +e_asn1_object_set_display_name (EASN1Object *obj, const gchar *name) { g_free (obj->priv->display_name); obj->priv->display_name = g_strdup (name); } -const char* +const gchar * e_asn1_object_get_display_name (EASN1Object *obj) { return obj->priv->display_name; } void -e_asn1_object_set_display_value (EASN1Object *obj, const char *value) +e_asn1_object_set_display_value (EASN1Object *obj, const gchar *value) { g_free (obj->priv->value); obj->priv->value = g_strdup (value); } -const char* +const gchar * e_asn1_object_get_display_value (EASN1Object *obj) { return obj->priv->value; } void -e_asn1_object_get_data (EASN1Object *obj, char **data, guint32 *len) +e_asn1_object_get_data (EASN1Object *obj, gchar **data, guint32 *len) { *data = obj->priv->data; *len = obj->priv->data_len; diff --git a/smime/lib/e-asn1-object.h b/smime/lib/e-asn1-object.h index 0c976dd827..35824967d4 100644 --- a/smime/lib/e-asn1-object.h +++ b/smime/lib/e-asn1-object.h @@ -85,7 +85,7 @@ struct _EASN1ObjectClass { void (*_ecert_reserved4) (void); }; -EASN1Object *e_asn1_object_new_from_der (char *data, guint32 len); +EASN1Object *e_asn1_object_new_from_der (gchar *data, guint32 len); EASN1Object *e_asn1_object_new (void); void e_asn1_object_set_valid_container (EASN1Object *obj, gboolean flag); @@ -94,12 +94,12 @@ PRUint32 e_asn1_object_get_asn1_type (EASN1Object *obj); PRUint32 e_asn1_object_get_asn1_tag (EASN1Object *obj); GList *e_asn1_object_get_children (EASN1Object *obj); void e_asn1_object_append_child (EASN1Object *parent, EASN1Object *child); -void e_asn1_object_set_display_name (EASN1Object *obj, const char *name); -const char *e_asn1_object_get_display_name (EASN1Object *obj); -void e_asn1_object_set_display_value (EASN1Object *obj, const char *value); -const char *e_asn1_object_get_display_value (EASN1Object *obj); +void e_asn1_object_set_display_name (EASN1Object *obj, const gchar *name); +const gchar *e_asn1_object_get_display_name (EASN1Object *obj); +void e_asn1_object_set_display_value (EASN1Object *obj, const gchar *value); +const gchar *e_asn1_object_get_display_value (EASN1Object *obj); -void e_asn1_object_get_data (EASN1Object *obj, char **data, guint32 *len); +void e_asn1_object_get_data (EASN1Object *obj, gchar **data, guint32 *len); GType e_asn1_object_get_type (void); diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index ae8a79ae23..d0528f7d2f 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -93,7 +93,7 @@ struct _ECertDBPrivate { #define PARENT_TYPE G_TYPE_OBJECT static GObjectClass *parent_class; -static CERTDERCerts* e_cert_db_get_certs_from_package (PRArenaPool *arena, char *data, guint32 length); +static CERTDERCerts* e_cert_db_get_certs_from_package (PRArenaPool *arena, gchar *data, guint32 length); @@ -117,22 +117,22 @@ e_cert_db_dispose (GObject *object) #ifdef notyet PRBool ucs2_ascii_conversion_fn (PRBool toUnicode, - unsigned char *inBuf, - unsigned int inBufLen, - unsigned char *outBuf, - unsigned int maxOutBufLen, - unsigned int *outBufLen, + guchar *inBuf, + guint inBufLen, + guchar *outBuf, + guint maxOutBufLen, + guint *outBufLen, PRBool swapBytes) { printf ("in ucs2_ascii_conversion_fn\n"); } #endif -static char* PR_CALLBACK -pk11_password (PK11SlotInfo* slot, PRBool retry, void* arg) +static gchar * PR_CALLBACK +pk11_password (PK11SlotInfo* slot, PRBool retry, gpointer arg) { - char *pwd; - char *nsspwd; + gchar *pwd; + gchar *nsspwd; gboolean rv = FALSE; @@ -155,7 +155,7 @@ pk11_password (PK11SlotInfo* slot, PRBool retry, void* arg) static void initialize_nss (void) { - char *evolution_dir_path; + gchar *evolution_dir_path; gboolean success; #ifdef G_OS_WIN32 @@ -207,7 +207,7 @@ install_loadable_roots (void) SECMODModuleList *list = SECMOD_GetDefaultModuleList (); SECMODListLock *lock = SECMOD_GetDefaultModuleListLock (); SECMODModule *RootsModule = NULL; - int i; + gint i; SECMOD_GetReadLock (lock); while (!RootsModule && list) { @@ -270,7 +270,7 @@ install_loadable_roots (void) }; for (i = 0; i < G_N_ELEMENTS (paths_to_check); i ++) { - char *dll_path = g_module_build_path (paths_to_check [i], "nssckbi"); + gchar *dll_path = g_module_build_path (paths_to_check [i], "nssckbi"); if (g_file_test (dll_path, G_FILE_TEST_EXISTS)) { PRInt32 modType; @@ -395,16 +395,16 @@ e_cert_db_shutdown (void) /* searching for certificates */ ECert* e_cert_db_find_cert_by_nickname (ECertDB *certdb, - const char *nickname, + const gchar *nickname, GError **error) { /* nsNSSShutDownPreventionLock locker;*/ CERTCertificate *cert = NULL; /*PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting \"%s\"\n", asciiname));*/ - cert = PK11_FindCertFromNickname((char*)nickname, NULL); + cert = PK11_FindCertFromNickname((gchar *)nickname, NULL); if (!cert) { - cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), (char*)nickname); + cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), (gchar *)nickname); } @@ -422,7 +422,7 @@ e_cert_db_find_cert_by_nickname (ECertDB *certdb, #ifdef notyet ECert* e_cert_db_find_cert_by_key (ECertDB *certdb, - const char *db_key, + const gchar *db_key, GError **error) { /* nsNSSShutDownPreventionLock locker;*/ @@ -471,14 +471,14 @@ e_cert_db_get_cert_nicknames (ECertDB *certdb, ECert* e_cert_db_find_email_encryption_cert (ECertDB *certdb, - const char *nickname, + const gchar *nickname, GError **error) { } ECert* e_cert_db_find_email_signing_cert (ECertDB *certdb, - const char *nickname, + const gchar *nickname, GError **error) { } @@ -486,13 +486,13 @@ e_cert_db_find_email_signing_cert (ECertDB *certdb, ECert* e_cert_db_find_cert_by_email_address (ECertDB *certdb, - const char *email, + const gchar *email, GError **error) { /* nsNSSShutDownPreventionLock locker; */ ECert *cert; CERTCertificate *any_cert = CERT_FindCertByNicknameOrEmailAddr(CERT_GetDefaultCertDB(), - (char*)email); + (gchar *)email); CERTCertList *certlist; if (!any_cert) { @@ -555,7 +555,7 @@ handle_ca_cert_download(ECertDB *cert_db, GList *certs, GError **error) { ECert *certToShow; SECItem der; - char *raw_der = NULL; + gchar *raw_der = NULL; CERTCertificate *tmpCert; /* First thing we have to do is figure out which certificate @@ -587,10 +587,10 @@ handle_ca_cert_download(ECertDB *cert_db, GList *certs, GError **error) /* there are multiple certs */ ECert *cert0; ECert *cert1; - const char* cert0SubjectName; - const char* cert0IssuerName; - const char* cert1SubjectName; - const char* cert1IssuerName; + const gchar * cert0SubjectName; + const gchar * cert0IssuerName; + const gchar * cert1SubjectName; + const gchar * cert1IssuerName; cert0 = E_CERT (certs->data); cert1 = E_CERT (certs->next->data); @@ -628,7 +628,7 @@ handle_ca_cert_download(ECertDB *cert_db, GList *certs, GError **error) return FALSE; } - der.data = (unsigned char *)raw_der; + der.data = (guchar *)raw_der; { /*PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Creating temp cert\n"));*/ @@ -656,7 +656,7 @@ handle_ca_cert_download(ECertDB *cert_db, GList *certs, GError **error) } else { gboolean trust_ssl, trust_email, trust_objsign; - char *nickname; + gchar *nickname; SECStatus srv; CERTCertTrust trust; @@ -709,7 +709,7 @@ handle_ca_cert_download(ECertDB *cert_db, GList *certs, GError **error) continue; /* Let's try to import the rest of 'em */ } nickname.Adopt(CERT_MakeCANickname(tmpCert2)); - CERT_AddTempCertToPerm(tmpCert2, NS_CONST_CAST(char*,nickname.get()), + CERT_AddTempCertToPerm(tmpCert2, NS_CONST_CAST(gchar *,nickname.get()), defaultTrust.GetTrust()); CERT_DestroyCertificate(tmpCert2); } @@ -755,7 +755,7 @@ e_cert_db_delete_cert (ECertDB *certdb, /* importing certificates */ gboolean e_cert_db_import_certs (ECertDB *certdb, - char *data, guint32 length, + gchar *data, guint32 length, ECertType cert_type, GError **error) { @@ -763,7 +763,7 @@ e_cert_db_import_certs (ECertDB *certdb, PRArenaPool *arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); GList *certs = NULL; CERTDERCerts *certCollection = e_cert_db_get_certs_from_package (arena, data, length); - int i; + gint i; gboolean rv; if (!certCollection) { @@ -777,7 +777,7 @@ e_cert_db_import_certs (ECertDB *certdb, SECItem *currItem = &certCollection->rawCerts[i]; ECert *cert; - cert = e_cert_new_from_der ((char*)currItem->data, currItem->len); + cert = e_cert_new_from_der ((gchar *)currItem->data, currItem->len); if (!cert) { /* XXX gerror */ g_list_foreach (certs, (GFunc)g_object_unref, NULL); @@ -806,7 +806,7 @@ e_cert_db_import_certs (ECertDB *certdb, gboolean e_cert_db_import_email_cert (ECertDB *certdb, - char *data, guint32 length, + gchar *data, guint32 length, GError **error) { /*nsNSSShutDownPreventionLock locker;*/ @@ -814,8 +814,8 @@ e_cert_db_import_email_cert (ECertDB *certdb, gboolean rv = TRUE; CERTCertificate * cert; SECItem **rawCerts; - int numcerts; - int i; + gint numcerts; + gint i; PRArenaPool *arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); CERTDERCerts *certCollection = e_cert_db_get_certs_from_package (arena, data, length); @@ -827,7 +827,7 @@ e_cert_db_import_email_cert (ECertDB *certdb, } cert = CERT_NewTempCertificate(CERT_GetDefaultCertDB(), certCollection->rawCerts, - (char *)NULL, PR_FALSE, PR_TRUE); + (gchar *)NULL, PR_FALSE, PR_TRUE); if (!cert) { /* XXX g_error */ rv = FALSE; @@ -863,16 +863,16 @@ e_cert_db_import_email_cert (ECertDB *certdb, return rv; } -static char * +static gchar * default_nickname (CERTCertificate *cert) { /* nsNSSShutDownPreventionLock locker; */ - char *username = NULL; - char *caname = NULL; - char *nickname = NULL; - char *tmp = NULL; - int count; - const char *nickFmt=NULL; + gchar *username = NULL; + gchar *caname = NULL; + gchar *nickname = NULL; + gchar *tmp = NULL; + gint count; + const gchar *nickFmt=NULL; CERTCertificate *dummycert; PK11SlotInfo *slot=NULL; CK_OBJECT_HANDLE keyHandle; @@ -990,14 +990,14 @@ default_nickname (CERTCertificate *cert) gboolean e_cert_db_import_user_cert (ECertDB *certdb, - char *data, guint32 length, + gchar *data, guint32 length, GError **error) { /* nsNSSShutDownPreventionLock locker;*/ PK11SlotInfo *slot; - char * nickname = NULL; + gchar * nickname = NULL; gboolean rv = FALSE; - int numCACerts; + gint numCACerts; SECItem *CACerts; CERTDERCerts * collectArgs; PRArenaPool *arena; @@ -1016,7 +1016,7 @@ e_cert_db_import_user_cert (ECertDB *certdb, } cert = CERT_NewTempCertificate(CERT_GetDefaultCertDB(), collectArgs->rawCerts, - (char *)NULL, PR_FALSE, PR_TRUE); + (gchar *)NULL, PR_FALSE, PR_TRUE); if (!cert) { /* XXX g_error */ goto loser; @@ -1068,7 +1068,7 @@ e_cert_db_import_user_cert (ECertDB *certdb, gboolean e_cert_db_import_server_cert (ECertDB *certdb, - char *data, guint32 length, + gchar *data, guint32 length, GError **error) { /* not c&p'ing this over at the moment, as we don't have a UI @@ -1078,15 +1078,15 @@ e_cert_db_import_server_cert (ECertDB *certdb, gboolean e_cert_db_import_certs_from_file (ECertDB *cert_db, - const char *file_path, + const gchar *file_path, ECertType cert_type, GError **error) { gboolean rv; - int fd; + gint fd; struct stat sb; - char *buf; - int bytes_read; + gchar *buf; + gint bytes_read; switch (cert_type) { case E_CERT_CA: @@ -1156,7 +1156,7 @@ e_cert_db_import_certs_from_file (ECertDB *cert_db, gboolean e_cert_db_import_pkcs12_file (ECertDB *cert_db, - const char *file_path, + const gchar *file_path, GError **error) { EPKCS12 *pkcs12 = e_pkcs12_new (); @@ -1173,7 +1173,7 @@ e_cert_db_import_pkcs12_file (ECertDB *cert_db, #ifdef notyet gboolean e_cert_db_export_pkcs12_file (ECertDB *cert_db, - const char *file_path, + const gchar *file_path, GList *certs, GError **error) { @@ -1188,7 +1188,7 @@ e_cert_db_login_to_slot (ECertDB *cert_db, PK11_Logout (slot); if (PK11_NeedUserInit (slot)) { - char *pwd; + gchar *pwd; gboolean rv = FALSE; printf ("initializing slot password\n"); @@ -1219,7 +1219,7 @@ e_cert_db_login_to_slot (ECertDB *cert_db, static SECStatus PR_CALLBACK -collect_certs(void *arg, SECItem **certs, int numcerts) +collect_certs(gpointer arg, SECItem **certs, gint numcerts) { CERTDERCerts *collectArgs; SECItem *cert; @@ -1247,7 +1247,7 @@ collect_certs(void *arg, SECItem **certs, int numcerts) static CERTDERCerts* e_cert_db_get_certs_from_package (PRArenaPool *arena, - char *data, + gchar *data, guint32 length) { /*nsNSSShutDownPreventionLock locker;*/ @@ -1261,7 +1261,7 @@ e_cert_db_get_certs_from_package (PRArenaPool *arena, collectArgs->arena = arena; sec_rv = CERT_DecodeCertPackage(data, length, collect_certs, - (void *)collectArgs); + (gpointer)collectArgs); if (sec_rv != SECSuccess) return NULL; diff --git a/smime/lib/e-cert-db.h b/smime/lib/e-cert-db.h index f628ba2073..30d20448cb 100644 --- a/smime/lib/e-cert-db.h +++ b/smime/lib/e-cert-db.h @@ -48,8 +48,8 @@ struct _ECertDBClass { GObjectClass parent_class; /* signals */ - gboolean (*pk11_passwd) (ECertDB *db, PK11SlotInfo *slot, gboolean retry, char **passwd); - gboolean (*pk11_change_passwd) (ECertDB *db, char **orig_passwd, char **passwd); + gboolean (*pk11_passwd) (ECertDB *db, PK11SlotInfo *slot, gboolean retry, gchar **passwd); + gboolean (*pk11_change_passwd) (ECertDB *db, gchar **orig_passwd, gchar **passwd); gboolean (*confirm_ca_cert_import) (ECertDB *db, ECert *cert, gboolean *trust_ssl, gboolean *trust_email, gboolean *trust_objsign); /* Padding for future expansion */ @@ -69,12 +69,12 @@ void e_cert_db_shutdown (void); /* searching for certificates */ ECert* e_cert_db_find_cert_by_nickname (ECertDB *certdb, - const char *nickname, + const gchar *nickname, GError **error); #ifdef notyet ECert* e_cert_db_find_cert_by_key (ECertDB *certdb, - const char *db_key, + const gchar *db_key, GError **error); GList* e_cert_db_get_cert_nicknames (ECertDB *certdb, @@ -83,16 +83,16 @@ GList* e_cert_db_get_cert_nicknames (ECertDB *certdb, ECert* e_cert_db_find_email_encryption_cert (ECertDB *certdb, - const char *nickname, + const gchar *nickname, GError **error); ECert* e_cert_db_find_email_signing_cert (ECertDB *certdb, - const char *nickname, + const gchar *nickname, GError **error); #endif ECert* e_cert_db_find_cert_by_email_address (ECertDB *certdb, - const char *nickname, + const gchar *nickname, GError **error); /* deleting certificates */ @@ -101,34 +101,34 @@ gboolean e_cert_db_delete_cert (ECertDB *certdb, /* importing certificates */ gboolean e_cert_db_import_certs (ECertDB *certdb, - char *data, guint32 length, + gchar *data, guint32 length, ECertType cert_type, GError **error); gboolean e_cert_db_import_email_cert (ECertDB *certdb, - char *data, guint32 length, + gchar *data, guint32 length, GError **error); gboolean e_cert_db_import_user_cert (ECertDB *certdb, - char *data, guint32 length, + gchar *data, guint32 length, GError **error); gboolean e_cert_db_import_server_cert (ECertDB *certdb, - char *data, guint32 length, + gchar *data, guint32 length, GError **error); gboolean e_cert_db_import_certs_from_file (ECertDB *cert_db, - const char *file_path, + const gchar *file_path, ECertType cert_type, GError **error); gboolean e_cert_db_import_pkcs12_file (ECertDB *cert_db, - const char *file_path, + const gchar *file_path, GError **error); #ifdef notyet gboolean e_cert_db_export_pkcs12_file (ECertDB *cert_db, - const char *file_path, + const gchar *file_path, GList *certs, GError **error); #endif diff --git a/smime/lib/e-cert-trust.c b/smime/lib/e-cert-trust.c index 8509f3ffee..8a8329c7f8 100644 --- a/smime/lib/e-cert-trust.c +++ b/smime/lib/e-cert-trust.c @@ -53,9 +53,9 @@ e_cert_trust_init (CERTCertTrust *trust) void e_cert_trust_init_with_values (CERTCertTrust *trust, - unsigned int ssl, - unsigned int email, - unsigned int objsign) + guint ssl, + guint email, + guint objsign) { memset(trust, 0, sizeof(CERTCertTrust)); e_cert_trust_add_trust(&trust->sslFlags, ssl); @@ -389,13 +389,13 @@ e_cert_trust_has_trusted_peer (CERTCertTrust *trust, } void -e_cert_trust_add_trust (unsigned int *t, unsigned int v) +e_cert_trust_add_trust (guint *t, guint v) { *t |= v; } PRBool -e_cert_trust_has_trust (unsigned int t, unsigned int v) +e_cert_trust_has_trust (guint t, guint v) { return (t & v); } diff --git a/smime/lib/e-cert-trust.h b/smime/lib/e-cert-trust.h index 6b515b1a24..71608f8415 100644 --- a/smime/lib/e-cert-trust.h +++ b/smime/lib/e-cert-trust.h @@ -32,9 +32,9 @@ G_BEGIN_DECLS void e_cert_trust_init (CERTCertTrust *trust); void e_cert_trust_init_with_values (CERTCertTrust *trust, - unsigned int ssl, - unsigned int email, - unsigned int objsign); + guint ssl, + guint email, + guint objsign); void e_cert_trust_copy (CERTCertTrust *dst_trust, CERTCertTrust *src_trust); void e_cert_trust_add_ca_trust (CERTCertTrust *trust, PRBool ssl, PRBool email, PRBool objSign); void e_cert_trust_add_peer_trust (CERTCertTrust *trust, PRBool ssl, PRBool email, PRBool objSign); @@ -79,8 +79,8 @@ PRBool e_cert_trust_has_trusted_peer (CERTCertTrust *trust, PRBool checkSSL, PRBool checkEmail, PRBool checkObjSign); -void e_cert_trust_add_trust (unsigned int *t, unsigned int v); -PRBool e_cert_trust_has_trust (unsigned int t, unsigned int v); +void e_cert_trust_add_trust (guint *t, guint v); +PRBool e_cert_trust_has_trust (guint t, guint v); G_END_DECLS diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c index 2146fc3d32..8367b7b8fd 100644 --- a/smime/lib/e-cert.c +++ b/smime/lib/e-cert.c @@ -60,26 +60,26 @@ struct _ECertPrivate { /* pointers we cache since the nss implementation allocs the string */ - char *org_name; - char *org_unit_name; - char *cn; + gchar *org_name; + gchar *org_unit_name; + gchar *cn; - char *issuer_org_name; - char *issuer_org_unit_name; - char *issuer_cn; + gchar *issuer_org_name; + gchar *issuer_org_unit_name; + gchar *issuer_cn; PRTime issued_on; PRTime expires_on; - char *issued_on_string; - char *expires_on_string; + gchar *issued_on_string; + gchar *expires_on_string; - char *serial_number; + gchar *serial_number; - char *usage_string; + gchar *usage_string; - char *sha1_fingerprint; - char *md5_fingerprint; + gchar *sha1_fingerprint; + gchar *md5_fingerprint; EASN1Object *asn1; @@ -195,7 +195,7 @@ static void e_cert_populate (ECert *cert) { CERTCertificate *c = cert->priv->cert; - unsigned char fingerprint[20]; + guchar fingerprint[20]; SECItem fpItem; cert->priv->org_name = CERT_GetOrgName (&c->subject); @@ -210,7 +210,7 @@ e_cert_populate (ECert *cert) if (SECSuccess == CERT_GetCertTimes (c, &cert->priv->issued_on, &cert->priv->expires_on)) { PRExplodedTime explodedTime; struct tm exploded_tm; - char buf[32]; + gchar buf[32]; PR_ExplodeTime (cert->priv->issued_on, PR_LocalTimeParameters, &explodedTime); exploded_tm.tm_sec = explodedTime.tm_sec; @@ -265,7 +265,7 @@ e_cert_new (CERTCertificate *cert) } ECert* -e_cert_new_from_der (char *data, guint32 len) +e_cert_new_from_der (gchar *data, guint32 len) { CERTCertificate *cert = CERT_DecodeCertFromPackage (data, len); @@ -289,13 +289,13 @@ e_cert_get_internal_cert (ECert *cert) } gboolean -e_cert_get_raw_der (ECert *cert, char **data, guint32 *len) +e_cert_get_raw_der (ECert *cert, gchar **data, guint32 *len) { /* XXX do we really need to check if cert->priv->cert is NULL here? it should always be non-null if we have the ECert.. */ if (cert->priv->cert) { - *data = (char*)cert->priv->cert->derCert.data; + *data = (gchar *)cert->priv->cert->derCert.data; *len = (guint32)cert->priv->cert->derCert.len; return TRUE; } @@ -305,7 +305,7 @@ e_cert_get_raw_der (ECert *cert, char **data, guint32 *len) } -const char* +const gchar * e_cert_get_window_title (ECert *cert) { if (cert->priv->cert->nickname) @@ -316,61 +316,61 @@ e_cert_get_window_title (ECert *cert) return cert->priv->cert->subjectName; } -const char* +const gchar * e_cert_get_nickname (ECert *cert) { return cert->priv->cert->nickname; } -const char* +const gchar * e_cert_get_email (ECert *cert) { return cert->priv->cert->emailAddr; } -const char* +const gchar * e_cert_get_org (ECert *cert) { return cert->priv->org_name; } -const char* +const gchar * e_cert_get_org_unit (ECert *cert) { return cert->priv->org_unit_name; } -const char* +const gchar * e_cert_get_cn (ECert *cert) { return cert->priv->cn; } -const char* +const gchar * e_cert_get_issuer_name (ECert *cert) { return cert->priv->cert->issuerName; } -const char* +const gchar * e_cert_get_issuer_cn (ECert *cert) { return cert->priv->issuer_cn; } -const char* +const gchar * e_cert_get_issuer_org (ECert *cert) { return cert->priv->issuer_org_name; } -const char* +const gchar * e_cert_get_issuer_org_unit (ECert *cert) { return cert->priv->issuer_org_unit_name; } -const char* +const gchar * e_cert_get_subject_name (ECert *cert) { return cert->priv->cert->subjectName; @@ -382,7 +382,7 @@ e_cert_get_issued_on_time (ECert *cert) return cert->priv->issued_on; } -const char* +const gchar * e_cert_get_issued_on (ECert *cert) { return cert->priv->issued_on_string; @@ -394,26 +394,26 @@ e_cert_get_expires_on_time (ECert *cert) return cert->priv->expires_on; } -const char* +const gchar * e_cert_get_expires_on (ECert *cert) { return cert->priv->expires_on_string; } static struct { - int bit; - const char *text; + gint bit; + const gchar *text; } usageinfo[] = { /* x509 certificate usage types */ { certificateUsageEmailSigner, N_("Sign") }, { certificateUsageEmailRecipient, N_("Encrypt") }, }; -const char* +const gchar * e_cert_get_usage(ECert *cert) { if (cert->priv->usage_string == NULL) { - int i; + gint i; GString *str = g_string_new(""); CERTCertificate *icert = e_cert_get_internal_cert (cert); @@ -432,19 +432,19 @@ e_cert_get_usage(ECert *cert) return cert->priv->usage_string; } -const char* +const gchar * e_cert_get_serial_number (ECert *cert) { return cert->priv->serial_number; } -const char* +const gchar * e_cert_get_sha1_fingerprint (ECert *cert) { return cert->priv->sha1_fingerprint; } -const char* +const gchar * e_cert_get_md5_fingerprint (ECert *cert) { return cert->priv->md5_fingerprint; @@ -547,7 +547,7 @@ static gboolean process_serial_number_der (SECItem *serialItem, EASN1Object **retItem) { - char *serialNumber; + gchar *serialNumber; EASN1Object *item = e_asn1_object_new (); e_asn1_object_set_display_name (item, _("Serial Number")); @@ -563,14 +563,14 @@ process_serial_number_der (SECItem *serialItem, static gboolean get_default_oid_format (SECItem *oid, - char **text) + gchar **text) { - char buf[300]; - unsigned int len; - int written; + gchar buf[300]; + guint len; + gint written; unsigned long val = oid->data[0]; - unsigned int i = val % 40; + guint i = val % 40; val /= 40; written = PR_snprintf(buf, 300, "%lu %u ", val, i); if (written < 0) @@ -607,10 +607,10 @@ get_default_oid_format (SECItem *oid, } static gboolean -get_oid_text (SECItem *oid, char **text) +get_oid_text (SECItem *oid, gchar **text) { SECOidTag oidTag = SECOID_FindOIDTag(oid); - char *temp; + gchar *temp; switch (oidTag) { case SEC_OID_PKCS1_MD2_WITH_RSA_ENCRYPTION: @@ -678,7 +678,7 @@ get_oid_text (SECItem *oid, char **text) static gboolean -process_raw_bytes (SECItem *data, char **text) +process_raw_bytes (SECItem *data, gchar **text) { /* This function is used to display some DER bytes that we have not added support for decoding. @@ -689,7 +689,7 @@ process_raw_bytes (SECItem *data, char **text) */ GString *str = g_string_new (""); PRUint32 i; - char buffer[5]; + gchar buffer[5]; for (i=0; ilen; i++) { PR_snprintf(buffer, 5, "%02x ", data->data[i]); g_string_append (str, buffer); @@ -706,7 +706,7 @@ process_sec_algorithm_id (SECAlgorithmID *algID, EASN1Object **retSequence) { EASN1Object *sequence = e_asn1_object_new (); - char *text; + gchar *text; *retSequence = NULL; @@ -747,7 +747,7 @@ process_subject_public_key_info (CERTSubjectPublicKeyInfo *spki, EASN1Object *sequenceItem; EASN1Object *printableItem; SECItem data; - char *text; + gchar *text; e_asn1_object_set_display_name (spkiSequence, _("Subject Public Key Info")); @@ -784,7 +784,7 @@ process_ns_cert_type_extensions (SECItem *extData, GString *text) { SECItem decoded; - unsigned char nsCertType; + guchar nsCertType; decoded.data = NULL; decoded.len = 0; @@ -833,7 +833,7 @@ static gboolean process_key_usage_extensions (SECItem *extData, GString *text) { SECItem decoded; - unsigned char keyUsage; + guchar keyUsage; decoded.data = NULL; decoded.len = 0; @@ -891,7 +891,7 @@ process_extension_data (SECOidTag oidTag, SECItem *extData, rv = process_key_usage_extensions (extData, str); break; default: { - char *text; + gchar *text; rv = process_raw_bytes (extData, &text); g_string_append (str, text); g_free (text); @@ -906,7 +906,7 @@ process_single_extension (CERTCertExtension *extension, EASN1Object **retExtension) { GString *str = g_string_new (""); - char *text; + gchar *text; EASN1Object *extensionItem; SECOidTag oidTag = SECOID_FindOIDTag(&extension->id); @@ -961,7 +961,7 @@ process_extensions (CERTCertExtension **extensions, } static gboolean -process_name (CERTName *name, char **value) +process_name (CERTName *name, gchar **value) { CERTRDN** rdns; CERTRDN** rdn; @@ -970,9 +970,9 @@ process_name (CERTName *name, char **value) SECItem *decodeItem = NULL; GString *final_string = g_string_new (""); - char *type; + gchar *type; GString *avavalue; - char *temp; + gchar *temp; CERTRDN **lastRdn; rdns = name->rdns; @@ -1012,7 +1012,7 @@ process_name (CERTName *name, char **value) return FALSE; } - avavalue = g_string_new_len ((char*)decodeItem->data, decodeItem->len); + avavalue = g_string_new_len ((gchar *)decodeItem->data, decodeItem->len); SECITEM_FreeItem(decodeItem, PR_TRUE); @@ -1053,7 +1053,7 @@ create_tbs_certificate_asn1_struct (ECert *cert, EASN1Object **seq) ** and then add more user friendly text for that field. */ EASN1Object *sequence = e_asn1_object_new (); - char *text; + gchar *text; EASN1Object *subitem; SECItem data; @@ -1176,7 +1176,7 @@ create_asn1_struct (ECert *cert) { EASN1Object *sequence; SECItem temp; - char *text; + gchar *text; cert->priv->asn1 = e_asn1_object_new (); @@ -1248,8 +1248,8 @@ e_cert_mark_for_deletion (ECert *cert) ECertType e_cert_get_cert_type (ECert *ecert) { - const char *nick = e_cert_get_nickname (ecert); - const char *email = e_cert_get_email (ecert); + const gchar *nick = e_cert_get_nickname (ecert); + const gchar *email = e_cert_get_email (ecert); CERTCertificate *cert = ecert->priv->cert; if (nick) { diff --git a/smime/lib/e-cert.h b/smime/lib/e-cert.h index 63125c1871..8c70bcded2 100644 --- a/smime/lib/e-cert.h +++ b/smime/lib/e-cert.h @@ -67,33 +67,33 @@ struct _ECertClass { GType e_cert_get_type (void); ECert* e_cert_new (CERTCertificate *cert); -ECert* e_cert_new_from_der (char *data, guint32 len); +ECert* e_cert_new_from_der (gchar *data, guint32 len); CERTCertificate* e_cert_get_internal_cert (ECert *cert); -gboolean e_cert_get_raw_der (ECert *cert, char **data, guint32 *len); -const char* e_cert_get_window_title (ECert *cert); -const char* e_cert_get_nickname (ECert *cert); -const char* e_cert_get_email (ECert *cert); -const char* e_cert_get_org (ECert *cert); -const char* e_cert_get_org_unit (ECert *cert); -const char* e_cert_get_cn (ECert *cert); -const char* e_cert_get_subject_name (ECert *cert); +gboolean e_cert_get_raw_der (ECert *cert, gchar **data, guint32 *len); +const gchar * e_cert_get_window_title (ECert *cert); +const gchar * e_cert_get_nickname (ECert *cert); +const gchar * e_cert_get_email (ECert *cert); +const gchar * e_cert_get_org (ECert *cert); +const gchar * e_cert_get_org_unit (ECert *cert); +const gchar * e_cert_get_cn (ECert *cert); +const gchar * e_cert_get_subject_name (ECert *cert); -const char* e_cert_get_issuer_name (ECert *cert); -const char* e_cert_get_issuer_cn (ECert *cert); -const char* e_cert_get_issuer_org (ECert *cert); -const char* e_cert_get_issuer_org_unit (ECert *cert); +const gchar * e_cert_get_issuer_name (ECert *cert); +const gchar * e_cert_get_issuer_cn (ECert *cert); +const gchar * e_cert_get_issuer_org (ECert *cert); +const gchar * e_cert_get_issuer_org_unit (ECert *cert); PRTime e_cert_get_issued_on_time (ECert *cert); -const char* e_cert_get_issued_on (ECert *cert); +const gchar * e_cert_get_issued_on (ECert *cert); PRTime e_cert_get_expires_on_time (ECert *cert); -const char* e_cert_get_expires_on (ECert *cert); -const char* e_cert_get_usage(ECert *cert); +const gchar * e_cert_get_expires_on (ECert *cert); +const gchar * e_cert_get_usage(ECert *cert); -const char* e_cert_get_serial_number (ECert *cert); -const char* e_cert_get_sha1_fingerprint (ECert *cert); -const char* e_cert_get_md5_fingerprint (ECert *cert); +const gchar * e_cert_get_serial_number (ECert *cert); +const gchar * e_cert_get_sha1_fingerprint (ECert *cert); +const gchar * e_cert_get_md5_fingerprint (ECert *cert); GList* e_cert_get_chain (ECert *cert); ECert * e_cert_get_ca_cert (ECert *ecert); diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index 759a7fd1d6..5caa13e4f4 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -65,16 +65,16 @@ #include "secerr.h" struct _EPKCS12Private { - int mumble; + gint mumble; }; #define PARENT_TYPE G_TYPE_OBJECT static GObjectClass *parent_class; /* static callback functions for the NSS PKCS#12 library */ -static SECItem * PR_CALLBACK nickname_collision(SECItem *, PRBool *, void *); +static SECItem * PR_CALLBACK nickname_collision(SECItem *, PRBool *, gpointer ); -static gboolean handle_error(int myerr); +static gboolean handle_error(gint myerr); #define PKCS12_BUFFER_SIZE 2048 #define PKCS12_RESTORE_OK 1 @@ -155,12 +155,12 @@ e_pkcs12_new (void) } static gboolean -input_to_decoder (SEC_PKCS12DecoderContext *dcx, const char *path, GError **error) +input_to_decoder (SEC_PKCS12DecoderContext *dcx, const gchar *path, GError **error) { /* nsNSSShutDownPreventionLock locker; */ SECStatus srv; - int amount; - char buf[PKCS12_BUFFER_SIZE]; + gint amount; + gchar buf[PKCS12_BUFFER_SIZE]; FILE *fp; /* open path */ @@ -180,7 +180,7 @@ input_to_decoder (SEC_PKCS12DecoderContext *dcx, const char *path, GError **erro /* feed the file data into the decoder */ srv = SEC_PKCS12DecoderUpdate(dcx, - (unsigned char*) buf, + (guchar *) buf, amount); if (srv) { /* XXX g_error */ @@ -198,9 +198,9 @@ input_to_decoder (SEC_PKCS12DecoderContext *dcx, const char *path, GError **erro e_cert_db_login_to_slot stuff, instead of a direct gui dep here.. for now, though, it stays. */ static gboolean -prompt_for_password (char *title, char *prompt, SECItem *pwd) +prompt_for_password (gchar *title, gchar *prompt, SECItem *pwd) { - char *passwd; + gchar *passwd; passwd = e_passwords_ask_password (title, "SMIME-PKCS12", "", prompt, E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL, @@ -208,8 +208,8 @@ prompt_for_password (char *title, char *prompt, SECItem *pwd) if (passwd) { size_t len = strlen (passwd); - const char *inptr = passwd; - unsigned char *outptr; + const gchar *inptr = passwd; + guchar *outptr; gunichar2 c; SECITEM_AllocItem(NULL, pwd, sizeof (gunichar2) * (len + 1)); @@ -218,8 +218,8 @@ prompt_for_password (char *title, char *prompt, SECItem *pwd) while (inptr && (c = (gunichar2) (g_utf8_get_char (inptr) & 0xffff))) { inptr = g_utf8_next_char (inptr); c = GUINT16_TO_BE (c); - *outptr++ = ((char *) &c)[0]; - *outptr++ = ((char *) &c)[1]; + *outptr++ = ((gchar *) &c)[0]; + *outptr++ = ((gchar *) &c)[1]; } *outptr++ = 0; @@ -234,7 +234,7 @@ prompt_for_password (char *title, char *prompt, SECItem *pwd) static gboolean import_from_file_helper (EPKCS12 *pkcs12, PK11SlotInfo *slot, - const char *path, gboolean *aWantRetry, GError **error) + const gchar *path, gboolean *aWantRetry, GError **error) { /*nsNSSShutDownPreventionLock locker; */ gboolean rv; @@ -310,7 +310,7 @@ import_from_file_helper (EPKCS12 *pkcs12, PK11SlotInfo *slot, } gboolean -e_pkcs12_import_from_file (EPKCS12 *pkcs12, const char *path, GError **error) +e_pkcs12_import_from_file (EPKCS12 *pkcs12, const gchar *path, GError **error) { /*nsNSSShutDownPreventionLock locker;*/ gboolean rv = TRUE; @@ -332,7 +332,7 @@ e_pkcs12_import_from_file (EPKCS12 *pkcs12, const char *path, GError **error) } gboolean -e_pkcs12_export_to_file (EPKCS12 *pkcs12, const char *path, GList *certs, GError **error) +e_pkcs12_export_to_file (EPKCS12 *pkcs12, const gchar *path, GList *certs, GError **error) { return FALSE; } @@ -340,12 +340,12 @@ e_pkcs12_export_to_file (EPKCS12 *pkcs12, const char *path, GList *certs, GError /* what to do when the nickname collides with one already in the db. TODO: not handled, throw a dialog allowing the nick to be changed? */ static SECItem * PR_CALLBACK -nickname_collision(SECItem *oldNick, PRBool *cancel, void *wincx) +nickname_collision(SECItem *oldNick, PRBool *cancel, gpointer wincx) { /* nsNSSShutDownPreventionLock locker; */ - int count = 1; - char *nickname = NULL; - char *default_nickname = _("Imported Certificate"); + gint count = 1; + gchar *nickname = NULL; + gchar *default_nickname = _("Imported Certificate"); SECItem *new_nick; *cancel = PR_FALSE; @@ -397,13 +397,13 @@ nickname_collision(SECItem *oldNick, PRBool *cancel, void *wincx) new_nick = PR_Malloc (sizeof (SECItem)); new_nick->type = siAsciiString; - new_nick->data = (unsigned char *)nickname; - new_nick->len = strlen((char*)new_nick->data); + new_nick->data = (guchar *)nickname; + new_nick->len = strlen((gchar *)new_nick->data); return new_nick; } static gboolean -handle_error(int myerr) +handle_error(gint myerr) { printf ("handle_error (%d)\n", myerr); diff --git a/smime/lib/e-pkcs12.h b/smime/lib/e-pkcs12.h index 5717edb14c..444afcaadd 100644 --- a/smime/lib/e-pkcs12.h +++ b/smime/lib/e-pkcs12.h @@ -63,7 +63,7 @@ EPKCS12* e_pkcs12_new (void); gboolean e_pkcs12_set_token (void); #endif -gboolean e_pkcs12_import_from_file (EPKCS12 *pkcs12, const char *path, GError **error); -gboolean e_pkcs12_export_to_file (EPKCS12 *pkcs12, const char *path, GList *certs, GError **error); +gboolean e_pkcs12_import_from_file (EPKCS12 *pkcs12, const gchar *path, GError **error); +gboolean e_pkcs12_export_to_file (EPKCS12 *pkcs12, const gchar *path, GList *certs, GError **error); #endif /* _E_CERT_H_ */ diff --git a/smime/tests/import-cert.c b/smime/tests/import-cert.c index b202053e6d..850590789a 100644 --- a/smime/tests/import-cert.c +++ b/smime/tests/import-cert.c @@ -23,8 +23,8 @@ #include "e-cert-db.h" #include "e-pkcs12.h" -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { ECertDB *db; EPKCS12 *pkcs12; diff --git a/tools/killev.c b/tools/killev.c index d26093986f..a978fea0d8 100644 --- a/tools/killev.c +++ b/tools/killev.c @@ -35,7 +35,7 @@ #include typedef struct { - char *location; + gchar *location; GPtrArray *names; } KillevComponent; @@ -43,10 +43,10 @@ static GSList *languages = NULL; static GHashTable *components; static gboolean -kill_process (const char *proc_name, KillevComponent *comp) +kill_process (const gchar *proc_name, KillevComponent *comp) { - int status, i; - char *command; + gint status, i; + gchar *command; GString *desc; command = g_strdup_printf (KILL_PROCESS_CMD " -0 %s 2> /dev/null", @@ -82,16 +82,16 @@ kill_process (const char *proc_name, KillevComponent *comp) return TRUE; } -static const char *patterns[] = { +static const gchar *patterns[] = { "%s", "%.16s", "lt-%s", "lt-%.13s", "%s.bin" }; -static const int n_patterns = G_N_ELEMENTS (patterns); +static const gint n_patterns = G_N_ELEMENTS (patterns); static void kill_component (KillevComponent *comp) { - char *base_name, *exe_name, *dash; - int i; + gchar *base_name, *exe_name, *dash; + gint i; base_name = g_strdup (comp->location); try_again: @@ -115,14 +115,14 @@ kill_component (KillevComponent *comp) } static void -add_matching_query (const char *query) +add_matching_query (const gchar *query) { Bonobo_ServerInfoList *info_list; Bonobo_ServerInfo *info; CORBA_Environment ev; - const char *location, *name; + const gchar *location, *name; KillevComponent *comp; - int i; + gint i; CORBA_exception_init (&ev); @@ -162,9 +162,9 @@ add_matching_query (const char *query) } static void -add_matching_repo_id (const char *repo_id) +add_matching_repo_id (const gchar *repo_id) { - char *query; + gchar *query; query = g_strdup_printf ("repo_ids.has ('%s')", repo_id); add_matching_query (query); @@ -172,17 +172,17 @@ add_matching_repo_id (const char *repo_id) } static void -add_matching_iid (const char *iid) +add_matching_iid (const gchar *iid) { - char *query; + gchar *query; query = g_strdup_printf ("iid == '%s'", iid); add_matching_query (query); g_free (query); } -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { const gchar * const *language_names; diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index 80a4485739..33b7eeb68d 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -102,9 +102,9 @@ static void on_combo_changed (GtkComboBox *combo, ETimezoneDialog *etd); static void timezone_combo_get_active_text (GtkComboBox *combo, - const char **zone_name); + const gchar **zone_name); static gboolean timezone_combo_set_active_text (GtkComboBox *combo, - const char *zone_name); + const gchar *zone_name); static void map_destroy_cb (gpointer data, GObject *where_object_was); @@ -198,7 +198,7 @@ e_timezone_dialog_add_timezones (ETimezoneDialog *etd) GtkTreeIter iter; GtkCellRenderer *cell; GHashTable *index; - int i; + gint i; priv = etd->priv; @@ -328,7 +328,7 @@ get_local_offset (void) { time_t now = time(NULL), t_gmt, t_local; struct tm gmt, local; - int diff; + gint diff; gmtime_r (&now, &gmt); localtime_r (&now, &local); @@ -400,7 +400,7 @@ format_utc_offset (int utc_offset, char *buffer) { const gchar *sign = "+"; - int hours, minutes, seconds; + gint hours, minutes, seconds; if (utc_offset < 0) { utc_offset = -utc_offset; @@ -429,14 +429,14 @@ format_utc_offset (int utc_offset, } -static char * +static gchar * zone_display_name_with_offset (icaltimezone *zone) { - const char *display_name; + const gchar *display_name; struct tm local; struct icaltimetype tt; - int offset; - char buffer [100]; + gint offset; + gchar buffer [100]; time_t now = time(NULL); gmtime_r ((const time_t *) &now, &local); @@ -452,10 +452,10 @@ zone_display_name_with_offset (icaltimezone *zone) return g_strdup_printf("%s (%s)\n", display_name, buffer);; } -static const char * +static const gchar * zone_display_name (icaltimezone *zone) { - const char *display_name; + const gchar *display_name; display_name = icaltimezone_get_display_name (zone); if (icaltimezone_get_builtin_timezone (display_name)) @@ -496,7 +496,7 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data) ETimezoneDialogPrivate *priv; double longitude, latitude; icaltimezone *new_zone; - char *display=NULL; + gchar *display=NULL; etd = E_TIMEZONE_DIALOG (data); priv = etd->priv; @@ -625,7 +625,7 @@ get_zone_from_point (ETimezoneDialog *etd, { icalarray *zones; double longitude, latitude; - int i; + gint i; if (point == NULL) return NULL; @@ -690,7 +690,7 @@ e_timezone_dialog_set_timezone (ETimezoneDialog *etd, icaltimezone *zone) { ETimezoneDialogPrivate *priv; - char *display = NULL; + gchar *display = NULL; g_return_if_fail (E_IS_TIMEZONE_DIALOG (etd)); @@ -762,11 +762,11 @@ static void on_combo_changed (GtkComboBox *combo_box, ETimezoneDialog *etd) { ETimezoneDialogPrivate *priv; - const char *new_zone_name; + const gchar *new_zone_name; icalarray *zones; icaltimezone *map_zone = NULL; - char *location; - int i; + gchar *location; + gint i; priv = etd->priv; @@ -794,7 +794,7 @@ on_combo_changed (GtkComboBox *combo_box, ETimezoneDialog *etd) } static void -timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name) +timezone_combo_get_active_text (GtkComboBox *combo, const gchar **zone_name) { GtkTreeModel *list_store; GtkTreeIter iter; @@ -809,7 +809,7 @@ timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name) } static gboolean -timezone_combo_set_active_text (GtkComboBox *combo, const char *zone_name) +timezone_combo_set_active_text (GtkComboBox *combo, const gchar *zone_name) { GtkTreeModel *list_store; GHashTable *index; diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index e820a51a6a..8ecbcba061 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -48,7 +48,7 @@ enum { }; typedef struct { - char *title; + gchar *title; GtkTreeView *treeview; GtkTreeModel *model; @@ -80,7 +80,7 @@ gal_define_views_dialog_class_init (GalDefineViewsDialogClass *klass) /* Button callbacks */ static void -gdvd_button_new_dialog_callback (GtkWidget *widget, int id, GalDefineViewsDialog *dialog) +gdvd_button_new_dialog_callback (GtkWidget *widget, gint id, GalDefineViewsDialog *dialog) { gchar *name; GtkTreeIter iter; @@ -146,7 +146,7 @@ gdvd_button_modify_callback(GtkWidget *widget, GalDefineViewsDialog *dialog) static void gdvd_button_delete_callback(GtkWidget *widget, GalDefineViewsDialog *dialog) { - int row; + gint row; GtkTreeIter iter; GtkTreePath *path; GtkTreeSelection *selection; @@ -182,7 +182,7 @@ gdvd_button_delete_callback(GtkWidget *widget, GalDefineViewsDialog *dialog) static void gdvd_button_copy_callback(GtkWidget *widget, GalDefineViewsDialog *dialog) { - int row; + gint row; GtkWidget *scrolled; ETable *etable; @@ -219,7 +219,7 @@ gdvd_cursor_changed_callback (GtkWidget *widget, GalDefineViewsDialog *dialog) } static void -gdvd_connect_signal(GalDefineViewsDialog *dialog, const char *widget_name, const char *signal, GCallback handler) +gdvd_connect_signal(GalDefineViewsDialog *dialog, const gchar *widget_name, const gchar *signal, GCallback handler) { GtkWidget *widget; @@ -230,7 +230,7 @@ gdvd_connect_signal(GalDefineViewsDialog *dialog, const char *widget_name, const } static void -dialog_response (GalDefineViewsDialog *dialog, int response_id, gpointer data) +dialog_response (GalDefineViewsDialog *dialog, gint response_id, gpointer data) { gal_view_collection_save (dialog->collection); } @@ -303,7 +303,7 @@ static void gal_define_views_dialog_set_collection(GalDefineViewsDialog *dialog, GalViewCollection *collection) { - int i; + gint i; GtkListStore *store; GtkCellRenderer *renderer; dialog->collection = collection; @@ -318,7 +318,7 @@ gal_define_views_dialog_set_collection(GalDefineViewsDialog *dialog, /*if (item->built_in == 1) continue;*/ - char *title = NULL; + gchar *title = NULL; title = e_str_without_underscores (item->title); gtk_list_store_append (store, &iter); @@ -353,7 +353,7 @@ gal_define_views_dialog_set_collection(GalDefineViewsDialog *dialog, GtkWidget *widget = glade_xml_get_widget(dialog->gui, "label-views"); if (widget && GTK_IS_LABEL (widget)) { if (collection->title) { - char *text = g_strdup_printf (_("Define Views for %s"), + gchar *text = g_strdup_printf (_("Define Views for %s"), collection->title); gtk_label_set_text (GTK_LABEL (widget), text); diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c index 9f67473c32..82ab22eedc 100644 --- a/widgets/menus/gal-define-views-model.c +++ b/widgets/menus/gal-define-views-model.c @@ -78,20 +78,20 @@ gdvm_row_count (ETableModel *etc) } /* This function returns the value at a particular point in our ETableModel. */ -static void * -gdvm_value_at (ETableModel *etc, int col, int row) +static gpointer +gdvm_value_at (ETableModel *etc, gint col, gint row) { GalDefineViewsModel *views = GAL_DEFINE_VIEWS_MODEL(etc); - const char *value; + const gchar *value; value = gal_view_get_title (gal_view_collection_get_view(views->collection, row)); - return (void *)(value ? value : ""); + return (gpointer)(value ? value : ""); } /* This function sets the value at a particular point in our ETableModel. */ static void -gdvm_set_value_at (ETableModel *etc, int col, int row, const void *val) +gdvm_set_value_at (ETableModel *etc, gint col, gint row, gconstpointer val) { GalDefineViewsModel *views = GAL_DEFINE_VIEWS_MODEL(etc); if (views->editable) { @@ -103,7 +103,7 @@ gdvm_set_value_at (ETableModel *etc, int col, int row, const void *val) /* This function returns whether a particular cell is editable. */ static gboolean -gdvm_is_cell_editable (ETableModel *etc, int col, int row) +gdvm_is_cell_editable (ETableModel *etc, gint col, gint row) { return GAL_DEFINE_VIEWS_MODEL(etc)->editable; } @@ -114,33 +114,33 @@ gdvm_append_row (ETableModel *etm, ETableModel *source, gint row) } /* This function duplicates the value passed to it. */ -static void * -gdvm_duplicate_value (ETableModel *etc, int col, const void *value) +static gpointer +gdvm_duplicate_value (ETableModel *etc, gint col, gconstpointer value) { return g_strdup(value); } /* This function frees the value passed to it. */ static void -gdvm_free_value (ETableModel *etc, int col, void *value) +gdvm_free_value (ETableModel *etc, gint col, gpointer value) { g_free(value); } -static void * -gdvm_initialize_value (ETableModel *etc, int col) +static gpointer +gdvm_initialize_value (ETableModel *etc, gint col) { return g_strdup(""); } static gboolean -gdvm_value_is_empty (ETableModel *etc, int col, const void *value) +gdvm_value_is_empty (ETableModel *etc, gint col, gconstpointer value) { - return !(value && *(char *)value); + return !(value && *(gchar *)value); } -static char * -gdvm_value_to_string (ETableModel *etc, int col, const void *value) +static gchar * +gdvm_value_to_string (ETableModel *etc, gint col, gconstpointer value) { return g_strdup(value); } @@ -279,7 +279,7 @@ gal_define_views_model_new (void) */ GalView * gal_define_views_model_get_view (GalDefineViewsModel *model, - int n) + gint n) { return gal_view_collection_get_view(model->collection, n); } @@ -293,7 +293,7 @@ gal_define_views_model_get_view (GalDefineViewsModel *model, */ void gal_define_views_model_delete_view (GalDefineViewsModel *model, - int n) + gint n) { e_table_model_pre_change(E_TABLE_MODEL(model)); gal_view_collection_delete_view(model->collection, n); @@ -309,7 +309,7 @@ gal_define_views_model_delete_view (GalDefineViewsModel *model, */ void gal_define_views_model_copy_view (GalDefineViewsModel *model, - int n) + gint n) { ETableModel *etm = E_TABLE_MODEL(model); e_table_model_pre_change(etm); diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h index d0ccfb16b9..2441cf7654 100644 --- a/widgets/menus/gal-define-views-model.h +++ b/widgets/menus/gal-define-views-model.h @@ -59,11 +59,11 @@ ETableModel *gal_define_views_model_new (void); void gal_define_views_model_append (GalDefineViewsModel *model, GalView *view); GalView *gal_define_views_model_get_view (GalDefineViewsModel *model, - int i); + gint i); void gal_define_views_model_delete_view (GalDefineViewsModel *model, - int i); + gint i); void gal_define_views_model_copy_view (GalDefineViewsModel *model, - int i); + gint i); #ifdef __cplusplus } diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index c32e791809..958759326a 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -92,13 +92,13 @@ gal_view_collection_item_free (GalViewCollectionItem *item) g_free(item); } -static char * +static gchar * gal_view_generate_string (GalViewCollection *collection, GalView *view, - int which) + gint which) { - char *ret_val; - char *pointer; + gchar *ret_val; + gchar *pointer; if (which == 1) ret_val = g_strdup(gal_view_get_title(view)); @@ -106,7 +106,7 @@ gal_view_generate_string (GalViewCollection *collection, ret_val = g_strdup_printf("%s_%d", gal_view_get_title(view), which); for (pointer = ret_val; *pointer; pointer = g_utf8_next_char(pointer)) { if (!g_unichar_isalnum(g_utf8_get_char(pointer))) { - char *ptr = pointer; + gchar *ptr = pointer; for (; ptr < g_utf8_next_char(pointer); *ptr = '_', ptr++) ; } @@ -116,9 +116,9 @@ gal_view_generate_string (GalViewCollection *collection, static gint gal_view_check_string (GalViewCollection *collection, - char *string) + gchar *string) { - int i; + gint i; if (!strcmp (string, "current_view")) return FALSE; @@ -134,13 +134,13 @@ gal_view_check_string (GalViewCollection *collection, return TRUE; } -static char * +static gchar * gal_view_generate_id (GalViewCollection *collection, GalView *view) { - int i; + gint i; for (i = 1; TRUE; i++) { - char *try; + gchar *try; try = gal_view_generate_string(collection, view, i); if (gal_view_check_string(collection, try)) @@ -153,7 +153,7 @@ static void gal_view_collection_dispose (GObject *object) { GalViewCollection *collection = GAL_VIEW_COLLECTION(object); - int i; + gint i; for (i = 0; i < collection->view_count; i++) { gal_view_collection_item_free (collection->view_data[i]); @@ -253,7 +253,7 @@ gal_view_collection_new (void) void gal_view_collection_set_title (GalViewCollection *collection, - const char *title) + const gchar *title) { g_free (collection->title); collection->title = g_strdup (title); @@ -269,8 +269,8 @@ gal_view_collection_set_title (GalViewCollection *collection, */ void gal_view_collection_set_storage_directories (GalViewCollection *collection, - const char *system_dir, - const char *local_dir) + const gchar *system_dir, + const gchar *local_dir) { g_return_if_fail (collection != NULL); g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection)); @@ -322,7 +322,7 @@ view_changed (GalView *view, /* Use factory list to load a GalView file. */ static GalView * -gal_view_collection_real_load_view_from_file (GalViewCollection *collection, const char *type, const char *title, const char *dir, const char *filename) +gal_view_collection_real_load_view_from_file (GalViewCollection *collection, const gchar *type, const gchar *title, const gchar *dir, const gchar *filename) { GalViewFactory *factory; GList *factories; @@ -346,7 +346,7 @@ gal_view_collection_real_load_view_from_file (GalViewCollection *collection, con } GalView * -gal_view_collection_load_view_from_file (GalViewCollection *collection, const char *type, const char *filename) +gal_view_collection_load_view_from_file (GalViewCollection *collection, const gchar *type, const gchar *filename) { return gal_view_collection_real_load_view_from_file (collection, type, "", collection->local_dir, filename); } @@ -362,15 +362,15 @@ load_single_file (GalViewCollection *collection, item->ever_changed = local; item->changed = FALSE; item->built_in = !local; - item->id = e_xml_get_string_prop_by_name(node, (const unsigned char *)"id"); - item->filename = e_xml_get_string_prop_by_name(node, (const unsigned char *)"filename"); - item->title = e_xml_get_translated_utf8_string_prop_by_name(node, (const unsigned char *)"title"); - item->type = e_xml_get_string_prop_by_name(node, (const unsigned char *)"type"); + item->id = e_xml_get_string_prop_by_name(node, (const guchar *)"id"); + item->filename = e_xml_get_string_prop_by_name(node, (const guchar *)"filename"); + item->title = e_xml_get_translated_utf8_string_prop_by_name(node, (const guchar *)"title"); + item->type = e_xml_get_string_prop_by_name(node, (const guchar *)"type"); item->collection = collection; item->view_changed_id = 0; if (item->filename) { - char *fullpath; + gchar *fullpath; fullpath = g_build_filename(dir, item->filename, NULL); item->view = gal_view_collection_real_load_view_from_file (collection, item->type, item->title, dir, fullpath); g_free(fullpath); @@ -385,14 +385,14 @@ load_single_file (GalViewCollection *collection, static void load_single_dir (GalViewCollection *collection, - char *dir, + gchar *dir, gboolean local) { xmlDoc *doc = NULL; xmlNode *root; xmlNode *child; - char *filename = g_build_filename(dir, "galview.xml", NULL); - char *default_view; + gchar *filename = g_build_filename(dir, "galview.xml", NULL); + gchar *default_view; if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) { #ifdef G_OS_WIN32 @@ -413,12 +413,12 @@ load_single_dir (GalViewCollection *collection, for (child = root->xmlChildrenNode; child; child = child->next) { gchar *id; gboolean found = FALSE; - int i; + gint i; - if (!strcmp ((char *)child->name, "text")) + if (!strcmp ((gchar *)child->name, "text")) continue; - id = e_xml_get_string_prop_by_name(child, (const unsigned char *)"id"); + id = e_xml_get_string_prop_by_name(child, (const guchar *)"id"); for (i = 0; i < collection->view_count; i++) { if (!strcmp(id, collection->view_data[i]->id)) { if (!local) @@ -453,7 +453,7 @@ load_single_dir (GalViewCollection *collection, g_free(id); } - default_view = e_xml_get_string_prop_by_name (root, (const unsigned char *)"default-view"); + default_view = e_xml_get_string_prop_by_name (root, (const guchar *)"default-view"); if (default_view) { if (local) collection->default_view_built_in = FALSE; @@ -505,21 +505,21 @@ gal_view_collection_load (GalViewCollection *collection) void gal_view_collection_save (GalViewCollection *collection) { - int i; + gint i; xmlDoc *doc; xmlNode *root; - char *filename; + gchar *filename; g_return_if_fail (collection != NULL); g_return_if_fail (GAL_IS_VIEW_COLLECTION (collection)); g_return_if_fail (collection->local_dir != NULL); - doc = xmlNewDoc((const unsigned char *)"1.0"); - root = xmlNewNode(NULL, (const unsigned char *)"GalViewCollection"); + doc = xmlNewDoc((const guchar *)"1.0"); + root = xmlNewNode(NULL, (const guchar *)"GalViewCollection"); xmlDocSetRootElement(doc, root); if (collection->default_view && !collection->default_view_built_in) { - e_xml_set_string_prop_by_name(root, (const unsigned char *)"default-view", collection->default_view); + e_xml_set_string_prop_by_name(root, (const guchar *)"default-view", collection->default_view); } for (i = 0; i < collection->view_count; i++) { @@ -528,11 +528,11 @@ gal_view_collection_save (GalViewCollection *collection) item = collection->view_data[i]; if (item->ever_changed) { - child = xmlNewChild(root, NULL, (const unsigned char *)"GalView", NULL); - e_xml_set_string_prop_by_name(child, (const unsigned char *)"id", item->id); - e_xml_set_string_prop_by_name(child, (const unsigned char *)"title", item->title); - e_xml_set_string_prop_by_name(child, (const unsigned char *)"filename", item->filename); - e_xml_set_string_prop_by_name(child, (const unsigned char *)"type", item->type); + child = xmlNewChild(root, NULL, (const guchar *)"GalView", NULL); + e_xml_set_string_prop_by_name(child, (const guchar *)"id", item->id); + e_xml_set_string_prop_by_name(child, (const guchar *)"title", item->title); + e_xml_set_string_prop_by_name(child, (const guchar *)"filename", item->filename); + e_xml_set_string_prop_by_name(child, (const guchar *)"type", item->type); if (item->changed) { filename = g_build_filename(collection->local_dir, item->filename, NULL); @@ -547,10 +547,10 @@ gal_view_collection_save (GalViewCollection *collection) item = collection->removed_view_data[i]; - child = xmlNewChild(root, NULL, (const unsigned char *)"GalView", NULL); - e_xml_set_string_prop_by_name(child, (const unsigned char *)"id", item->id); - e_xml_set_string_prop_by_name(child, (const unsigned char *)"title", item->title); - e_xml_set_string_prop_by_name(child, (const unsigned char *)"type", item->type); + child = xmlNewChild(root, NULL, (const guchar *)"GalView", NULL); + e_xml_set_string_prop_by_name(child, (const guchar *)"id", item->id); + e_xml_set_string_prop_by_name(child, (const guchar *)"title", item->title); + e_xml_set_string_prop_by_name(child, (const guchar *)"type", item->type); } filename = g_build_filename(collection->local_dir, "galview.xml", NULL); if (e_xml_save_file (filename, doc) == -1) @@ -585,7 +585,7 @@ gal_view_collection_get_count (GalViewCollection *collection) */ GalView * gal_view_collection_get_view (GalViewCollection *collection, - int n) + gint n) { g_return_val_if_fail (collection != NULL, NULL); g_return_val_if_fail (GAL_IS_VIEW_COLLECTION (collection), NULL); @@ -604,7 +604,7 @@ gal_view_collection_get_view (GalViewCollection *collection, */ GalViewCollectionItem * gal_view_collection_get_view_item (GalViewCollection *collection, - int n) + gint n) { g_return_val_if_fail (collection != NULL, NULL); g_return_val_if_fail (GAL_IS_VIEW_COLLECTION (collection), NULL); @@ -614,10 +614,10 @@ gal_view_collection_get_view_item (GalViewCollection *collection, return collection->view_data[n]; } -int -gal_view_collection_get_view_index_by_id (GalViewCollection *collection, const char *view_id) +gint +gal_view_collection_get_view_index_by_id (GalViewCollection *collection, const gchar *view_id) { - int i; + gint i; for (i = 0; i < collection->view_count; i++) { if (!strcmp (collection->view_data[i]->id, view_id)) return i; @@ -625,8 +625,8 @@ gal_view_collection_get_view_index_by_id (GalViewCollection *collection, con return -1; } -char * -gal_view_collection_get_view_id_by_index (GalViewCollection *collection, int n) +gchar * +gal_view_collection_get_view_id_by_index (GalViewCollection *collection, gint n) { g_return_val_if_fail (collection != NULL, NULL); g_return_val_if_fail (GAL_IS_VIEW_COLLECTION (collection), NULL); @@ -673,7 +673,7 @@ gal_view_collection_append (GalViewCollection *collection, void gal_view_collection_delete_view (GalViewCollection *collection, - int i) + gint i) { GalViewCollectionItem *item; @@ -700,7 +700,7 @@ gal_view_collection_delete_view (GalViewCollection *collection, void gal_view_collection_copy_view (GalViewCollection *collection, - int i) + gint i) { GalViewCollectionItem *item; GalView *view; @@ -739,8 +739,8 @@ gal_view_collection_loaded (GalViewCollection *collection) return collection->loaded; } -const char * -gal_view_collection_append_with_title (GalViewCollection *collection, const char *title, GalView *view) +const gchar * +gal_view_collection_append_with_title (GalViewCollection *collection, const gchar *title, GalView *view) { GalViewCollectionItem *item; @@ -777,8 +777,8 @@ gal_view_collection_append_with_title (GalViewCollection *collection, const char return item->id; } -const char * -gal_view_collection_set_nth_view (GalViewCollection *collection, int i, GalView *view) +const gchar * +gal_view_collection_set_nth_view (GalViewCollection *collection, gint i, GalView *view) { GalViewCollectionItem *item; @@ -814,14 +814,14 @@ gal_view_collection_set_nth_view (GalViewCollection *collection, int i, GalView return item->id; } -const char * +const gchar * gal_view_collection_get_default_view (GalViewCollection *collection) { return collection->default_view; } void -gal_view_collection_set_default_view (GalViewCollection *collection, const char *id) +gal_view_collection_set_default_view (GalViewCollection *collection, const gchar *id) { g_free (collection->default_view); collection->default_view = g_strdup (id); diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h index 83e5217131..d443aa9bc2 100644 --- a/widgets/menus/gal-view-collection.h +++ b/widgets/menus/gal-view-collection.h @@ -41,22 +41,22 @@ typedef struct { GObject base; GalViewCollectionItem **view_data; - int view_count; + gint view_count; GList *factory_list; GalViewCollectionItem **removed_view_data; - int removed_view_count; + gint removed_view_count; guint loaded : 1; guint default_view_built_in : 1; - char *system_dir; - char *local_dir; + gchar *system_dir; + gchar *local_dir; - char *default_view; + gchar *default_view; - char *title; + gchar *title; } GalViewCollection; typedef struct { @@ -72,13 +72,13 @@ typedef struct { struct GalViewCollectionItem { GalView *view; - char *id; + gchar *id; guint changed : 1; guint ever_changed : 1; guint built_in : 1; - char *filename; - char *title; - char *type; + gchar *filename; + gchar *title; + gchar *type; GalViewCollection *collection; guint view_changed_id; }; @@ -88,11 +88,11 @@ GType gal_view_collection_get_type (void); GalViewCollection *gal_view_collection_new (void); void gal_view_collection_set_title (GalViewCollection *collection, - const char *title); + const gchar *title); /* Set up the view collection. Call these two functions before ever doing load or save and never call them again. */ void gal_view_collection_set_storage_directories (GalViewCollection *collection, - const char *system_dir, - const char *local_dir); + const gchar *system_dir, + const gchar *local_dir); void gal_view_collection_add_factory (GalViewCollection *collection, GalViewFactory *factory); @@ -104,21 +104,21 @@ void gal_view_collection_display_view (GalViewColl /* Query the view collection. */ gint gal_view_collection_get_count (GalViewCollection *collection); GalView *gal_view_collection_get_view (GalViewCollection *collection, - int n); + gint n); GalViewCollectionItem *gal_view_collection_get_view_item (GalViewCollection *collection, - int n); -int gal_view_collection_get_view_index_by_id (GalViewCollection *collection, - const char *view_id); -char *gal_view_collection_get_view_id_by_index (GalViewCollection *collection, - int n); + gint n); +gint gal_view_collection_get_view_index_by_id (GalViewCollection *collection, + const gchar *view_id); +gchar *gal_view_collection_get_view_id_by_index (GalViewCollection *collection, + gint n); /* Manipulate the view collection */ void gal_view_collection_append (GalViewCollection *collection, GalView *view); void gal_view_collection_delete_view (GalViewCollection *collection, - int i); + gint i); void gal_view_collection_copy_view (GalViewCollection *collection, - int i); + gint i); /* Call set_storage_directories and add factories for anything that * might be found there before doing either of these. */ void gal_view_collection_load (GalViewCollection *collection); @@ -127,21 +127,21 @@ gboolean gal_view_collection_loaded (GalViewColl /* Use factory list to load a GalView file. */ GalView *gal_view_collection_load_view_from_file (GalViewCollection *collection, - const char *type, - const char *filename); + const gchar *type, + const gchar *filename); /* Returns id of the new view. These functions are used for GalViewInstanceSaveAsDialog. */ -const char *gal_view_collection_append_with_title (GalViewCollection *collection, - const char *title, +const gchar *gal_view_collection_append_with_title (GalViewCollection *collection, + const gchar *title, GalView *view); -const char *gal_view_collection_set_nth_view (GalViewCollection *collection, - int i, +const gchar *gal_view_collection_set_nth_view (GalViewCollection *collection, + gint i, GalView *view); -const char *gal_view_collection_get_default_view (GalViewCollection *collection); +const gchar *gal_view_collection_get_default_view (GalViewCollection *collection); void gal_view_collection_set_default_view (GalViewCollection *collection, - const char *id); + const gchar *id); G_END_DECLS diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c index 89ce837686..688e833aeb 100644 --- a/widgets/menus/gal-view-etable.c +++ b/widgets/menus/gal-view-etable.c @@ -88,19 +88,19 @@ gal_view_etable_edit (GalView *view, GtkWindow *parent) static void gal_view_etable_load (GalView *view, - const char *filename) + const gchar *filename) { e_table_state_load_from_file(GAL_VIEW_ETABLE(view)->state, filename); } static void gal_view_etable_save (GalView *view, - const char *filename) + const gchar *filename) { e_table_state_save_to_file(GAL_VIEW_ETABLE(view)->state, filename); } -static const char * +static const gchar * gal_view_etable_get_title (GalView *view) { return GAL_VIEW_ETABLE(view)->title; @@ -108,13 +108,13 @@ gal_view_etable_get_title (GalView *view) static void gal_view_etable_set_title (GalView *view, - const char *title) + const gchar *title) { g_free(GAL_VIEW_ETABLE(view)->title); GAL_VIEW_ETABLE(view)->title = g_strdup(title); } -static const char * +static const gchar * gal_view_etable_get_type_code (GalView *view) { return "etable"; diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h index fdc34b2710..201c1573ef 100644 --- a/widgets/menus/gal-view-etable.h +++ b/widgets/menus/gal-view-etable.h @@ -44,7 +44,7 @@ typedef struct { ETableSpecification *spec; ETableState *state; - char *title; + gchar *title; ETable *table; guint table_state_changed_id; diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c index 52f759ab37..def35a82b4 100644 --- a/widgets/menus/gal-view-factory-etable.c +++ b/widgets/menus/gal-view-factory-etable.c @@ -31,7 +31,7 @@ G_DEFINE_TYPE (GalViewFactoryEtable, gal_view_factory_etable, GAL_VIEW_FACTORY_TYPE) -static const char * +static const gchar * gal_view_factory_etable_get_title (GalViewFactory *factory) { return _("Table"); @@ -39,12 +39,12 @@ gal_view_factory_etable_get_title (GalViewFactory *factory) static GalView * gal_view_factory_etable_new_view (GalViewFactory *factory, - const char *name) + const gchar *name) { return gal_view_etable_new(GAL_VIEW_FACTORY_ETABLE(factory)->spec, name); } -static const char * +static const gchar * gal_view_factory_etable_get_type_code (GalViewFactory *factory) { return "etable"; diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c index 5b100654de..d58a1545d0 100644 --- a/widgets/menus/gal-view-factory.c +++ b/widgets/menus/gal-view-factory.c @@ -38,7 +38,7 @@ d(static gint depth = 0;) * * Returns: The title of the factory. */ -const char * +const gchar * gal_view_factory_get_title (GalViewFactory *factory) { g_return_val_if_fail (factory != NULL, NULL); @@ -59,7 +59,7 @@ gal_view_factory_get_title (GalViewFactory *factory) */ GalView * gal_view_factory_new_view (GalViewFactory *factory, - const char *name) + const gchar *name) { g_return_val_if_fail (factory != NULL, NULL); g_return_val_if_fail (GAL_IS_VIEW_FACTORY (factory), NULL); @@ -76,7 +76,7 @@ gal_view_factory_new_view (GalViewFactory *factory, * * Returns: The type code */ -const char * +const gchar * gal_view_factory_get_type_code (GalViewFactory *factory) { g_return_val_if_fail (factory != NULL, NULL); diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h index d2c4b4aa45..59f46a20e9 100644 --- a/widgets/menus/gal-view-factory.h +++ b/widgets/menus/gal-view-factory.h @@ -48,10 +48,10 @@ typedef struct { /* * Virtual methods */ - const char *(*get_title) (GalViewFactory *factory); - const char *(*get_type_code) (GalViewFactory *factory); + const gchar *(*get_title) (GalViewFactory *factory); + const gchar *(*get_type_code) (GalViewFactory *factory); GalView *(*new_view) (GalViewFactory *factory, - const char *name); + const gchar *name); } GalViewFactoryClass; /* Standard functions */ @@ -59,17 +59,17 @@ GType gal_view_factory_get_type (void); /* Query functions */ /* Returns already translated title. */ -const char *gal_view_factory_get_title (GalViewFactory *factory); +const gchar *gal_view_factory_get_title (GalViewFactory *factory); /* Returns the code for use in identifying this type of object in the * view list. This identifier should identify this as being the * unique factory for xml files which were written out with this * identifier. Thus each factory should have a unique type code. */ -const char *gal_view_factory_get_type_code (GalViewFactory *factory); +const gchar *gal_view_factory_get_type_code (GalViewFactory *factory); /* Create a new view */ GalView *gal_view_factory_new_view (GalViewFactory *factory, - const char *name); + const gchar *name); #ifdef __cplusplus } diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index 02283c630e..610c03a663 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -48,7 +48,7 @@ static void gal_view_instance_save_as_dialog_set_instance (GalViewInstanceSaveAsDialog *dialog, GalViewInstance *instance) { - int i; + gint i; GtkListStore *store; GtkCellRenderer *renderer; dialog->instance = instance; @@ -58,7 +58,7 @@ gal_view_instance_save_as_dialog_set_instance (GalViewInstanceSaveAsDialog *dial for (i=0; icollection->view_count; i++) { GalViewCollectionItem *item = instance->collection->view_data[i]; GtkTreeIter iter; - char *title = NULL; + gchar *title = NULL; /* hide built in views */ /*if (item->built_in == 1) @@ -304,9 +304,9 @@ void gal_view_instance_save_as_dialog_save (GalViewInstanceSaveAsDialog *dialog) { GalView *view = gal_view_instance_get_current_view (dialog->instance); - const char *title; - int n; - const char *id = NULL; + const gchar *title; + gint n; + const gchar *id = NULL; GalViewCollectionItem *item; view = gal_view_clone (view); diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index 9e0e2eb7c9..6ed7f9a604 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -87,14 +87,14 @@ save_current_view (GalViewInstance *instance) xmlDoc *doc; xmlNode *root; - doc = xmlNewDoc((const unsigned char *)"1.0"); - root = xmlNewNode (NULL, (const unsigned char *)"GalViewCurrentView"); + doc = xmlNewDoc((const guchar *)"1.0"); + root = xmlNewNode (NULL, (const guchar *)"GalViewCurrentView"); xmlDocSetRootElement(doc, root); if (instance->current_id) - e_xml_set_string_prop_by_name (root, (const unsigned char *)"current_view", instance->current_id); + e_xml_set_string_prop_by_name (root, (const guchar *)"current_view", instance->current_id); if (instance->current_type) - e_xml_set_string_prop_by_name (root, (const unsigned char *)"current_view_type", instance->current_type); + e_xml_set_string_prop_by_name (root, (const guchar *)"current_view_type", instance->current_type); if (e_xml_save_file (instance->current_view_filename, doc) == -1) g_warning ("Unable to save view to %s - %s", instance->current_view_filename, g_strerror(errno)); @@ -229,7 +229,7 @@ static void collection_changed (GalView *view, GalViewInstance *instance) { if (instance->current_id) { - char *view_id = instance->current_id; + gchar *view_id = instance->current_id; instance->current_id = NULL; gal_view_instance_set_current_view_id (instance, view_id); g_free (view_id); @@ -258,7 +258,7 @@ load_current_view (GalViewInstance *instance) instance->current_id = g_strdup (gal_view_instance_get_default_view (instance)); if (instance->current_id) { - int index = gal_view_collection_get_view_index_by_id (instance->collection, + gint index = gal_view_collection_get_view_index_by_id (instance->collection, instance->current_id); if (index != -1) { @@ -272,10 +272,10 @@ load_current_view (GalViewInstance *instance) } root = xmlDocGetRootElement(doc); - instance->current_id = e_xml_get_string_prop_by_name_with_default (root, (const unsigned char *)"current_view", NULL); + instance->current_id = e_xml_get_string_prop_by_name_with_default (root, (const guchar *)"current_view", NULL); if (instance->current_id != NULL) { - int index = gal_view_collection_get_view_index_by_id (instance->collection, + gint index = gal_view_collection_get_view_index_by_id (instance->collection, instance->current_id); if (index != -1) { @@ -285,8 +285,8 @@ load_current_view (GalViewInstance *instance) } } if (view == NULL) { - char *type; - type = e_xml_get_string_prop_by_name_with_default (root, (const unsigned char *)"current_view_type", NULL); + gchar *type; + type = e_xml_get_string_prop_by_name_with_default (root, (const guchar *)"current_view_type", NULL); view = gal_view_collection_load_view_from_file (instance->collection, type, instance->custom_filename); @@ -308,7 +308,7 @@ load_current_view (GalViewInstance *instance) * Return value: The new %GalViewInstance. **/ GalViewInstance * -gal_view_instance_new (GalViewCollection *collection, const char *instance_id) +gal_view_instance_new (GalViewCollection *collection, const gchar *instance_id) { GalViewInstance *instance = g_object_new (GAL_VIEW_INSTANCE_TYPE, NULL); if (gal_view_instance_construct (instance, collection, instance_id)) @@ -320,10 +320,10 @@ gal_view_instance_new (GalViewCollection *collection, const char *instance_id) } GalViewInstance * -gal_view_instance_construct (GalViewInstance *instance, GalViewCollection *collection, const char *instance_id) +gal_view_instance_construct (GalViewInstance *instance, GalViewCollection *collection, const gchar *instance_id) { - char *filename; - char *safe_id; + gchar *filename; + gchar *safe_id; g_return_val_if_fail (gal_view_collection_loaded (collection), NULL); @@ -356,7 +356,7 @@ gal_view_instance_construct (GalViewInstance *instance, GalViewCollection *colle } /* Manipulate the current view. */ -char * +gchar * gal_view_instance_get_current_view_id (GalViewInstance *instance) { if (instance->current_id && gal_view_collection_get_view_index_by_id (instance->collection, instance->current_id) != -1) @@ -366,10 +366,10 @@ gal_view_instance_get_current_view_id (GalViewInstance *instance) } void -gal_view_instance_set_current_view_id (GalViewInstance *instance, const char *view_id) +gal_view_instance_set_current_view_id (GalViewInstance *instance, const gchar *view_id) { GalView *view; - int index; + gint index; g_return_if_fail (instance != NULL); g_return_if_fail (GAL_IS_VIEW_INSTANCE (instance)); @@ -412,7 +412,7 @@ gal_view_instance_set_custom_view (GalViewInstance *instance, GalView *view) } static void -dialog_response(GtkWidget *dialog, int id, GalViewInstance *instance) +dialog_response(GtkWidget *dialog, gint id, GalViewInstance *instance) { if (id == GTK_RESPONSE_OK) { gal_view_instance_save_as_dialog_save (GAL_VIEW_INSTANCE_SAVE_AS_DIALOG (dialog)); @@ -440,7 +440,7 @@ gal_view_instance_load (GalViewInstance *instance) } /* These only mean anything before gal_view_instance_load is called the first time. */ -const char * +const gchar * gal_view_instance_get_default_view (GalViewInstance *instance) { if (instance->default_view) @@ -450,7 +450,7 @@ gal_view_instance_get_default_view (GalViewInstance *instance) } void -gal_view_instance_set_default_view (GalViewInstance *instance, const char *id) +gal_view_instance_set_default_view (GalViewInstance *instance, const gchar *id) { g_free (instance->default_view); instance->default_view = g_strdup (id); @@ -470,7 +470,7 @@ gal_view_instance_exists (GalViewInstance *instance) typedef struct { GalViewInstance *instance; - char *id; + gchar *id; } ListenerClosure; static void @@ -518,7 +518,7 @@ add_popup_menu_item (EPopupMenu *menu_item, } static void -define_views_dialog_response(GtkWidget *dialog, int id, GalViewInstance *instance) +define_views_dialog_response(GtkWidget *dialog, gint id, GalViewInstance *instance) { if (id == GTK_RESPONSE_OK) { gal_view_collection_save(instance->collection); @@ -547,10 +547,10 @@ EPopupMenu * gal_view_instance_get_popup_menu (GalViewInstance *instance) { EPopupMenu *ret_val; - int length; - int i; + gint length; + gint i; gboolean found = FALSE; - char *id; + gchar *id; length = gal_view_collection_get_count(instance->collection); id = gal_view_instance_get_current_view_id (instance); @@ -595,7 +595,7 @@ gal_view_instance_get_popup_menu (GalViewInstance *instance) void gal_view_instance_free_popup_menu (GalViewInstance *instance, EPopupMenu *menu) { - int i; + gint i; /* This depends on the first non-custom closure to be a separator or a terminator. */ for (i = 0; menu[i].name && *(menu[i].name); i++) { g_object_unref (((ListenerClosure *)(menu[i].closure))->instance); diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h index 787bc09713..a7ce2778c9 100644 --- a/widgets/menus/gal-view-instance.h +++ b/widgets/menus/gal-view-instance.h @@ -41,13 +41,13 @@ typedef struct { GalViewCollection *collection; - char *instance_id; - char *current_view_filename; - char *custom_filename; + gchar *instance_id; + gchar *current_view_filename; + gchar *custom_filename; - char *current_title; - char *current_type; - char *current_id; + gchar *current_title; + gchar *current_type; + gchar *current_id; GalView *current_view; @@ -55,7 +55,7 @@ typedef struct { guint collection_changed_id; guint loaded : 1; - char *default_view; + gchar *default_view; } GalViewInstance; typedef struct { @@ -76,15 +76,15 @@ GType gal_view_instance_get_type (void); /*collection should be loaded when you call this. instance_id: Which instance of this type of object is this (for most of evo, this is the folder id.) */ GalViewInstance *gal_view_instance_new (GalViewCollection *collection, - const char *instance_id); + const gchar *instance_id); GalViewInstance *gal_view_instance_construct (GalViewInstance *instance, GalViewCollection *collection, - const char *instance_id); + const gchar *instance_id); /* Manipulate the current view. */ -char *gal_view_instance_get_current_view_id (GalViewInstance *instance); +gchar *gal_view_instance_get_current_view_id (GalViewInstance *instance); void gal_view_instance_set_current_view_id (GalViewInstance *instance, - const char *view_id); + const gchar *view_id); GalView *gal_view_instance_get_current_view (GalViewInstance *instance); /* Sets the current view to the given custom view. */ @@ -103,9 +103,9 @@ void gal_view_instance_save_as (GalViewInstance *inst void gal_view_instance_load (GalViewInstance *instance); /* These only mean anything before gal_view_instance_load is called the first time. */ -const char *gal_view_instance_get_default_view (GalViewInstance *instance); +const gchar *gal_view_instance_get_default_view (GalViewInstance *instance); void gal_view_instance_set_default_view (GalViewInstance *instance, - const char *id); + const gchar *id); EPopupMenu *gal_view_instance_get_popup_menu (GalViewInstance *instance); void gal_view_instance_free_popup_menu (GalViewInstance *instance, diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index 4f76eb6cca..c1b75aee4b 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -43,8 +43,8 @@ struct _GalViewMenusPrivate { GalViewInstance *instance; - int collection_changed_id; - int instance_changed_id; + gint collection_changed_id; + gint instance_changed_id; BonoboUIComponent *component; EList *listenerClosures; GtkWidget *define_views_dialog; @@ -54,8 +54,8 @@ struct _GalViewMenusPrivate { typedef struct { GalViewInstance *instance; - char *id; - int ref_count; + gchar *id; + gint ref_count; } ListenerClosure; static void collection_changed (GalViewCollection *collection, @@ -69,7 +69,7 @@ static void instance_changed (GalViewInstance *instance, G_DEFINE_TYPE(GalViewMenus, gal_view_menus, G_TYPE_OBJECT) static void -closure_free (void *data, void *user_data) +closure_free (gpointer data, gpointer user_data) { ListenerClosure *closure = data; GalViewMenus *gvm = user_data; @@ -83,10 +83,10 @@ closure_free (void *data, void *user_data) } } -static void * -closure_copy (const void *data, void *user_data) +static gpointer +closure_copy (gconstpointer data, gpointer user_data) { - ListenerClosure *closure = (void *) data; + ListenerClosure *closure = (gpointer) data; closure->ref_count ++; return closure; @@ -226,7 +226,7 @@ gal_view_menus_construct (GalViewMenus *gvm, } static void -dialog_response(GtkWidget *dialog, int id, GalViewMenus *menus) +dialog_response(GtkWidget *dialog, gint id, GalViewMenus *menus) { if (id == GTK_RESPONSE_OK) { gal_view_collection_save(menus->priv->instance->collection); @@ -237,7 +237,7 @@ dialog_response(GtkWidget *dialog, int id, GalViewMenus *menus) static void define_views(BonoboUIComponent *component, GalViewMenus *menus, - char *cname) + gchar *cname) { if (menus->priv->define_views_dialog) { gdk_window_raise (menus->priv->define_views_dialog->window); @@ -254,16 +254,16 @@ define_views(BonoboUIComponent *component, static void save_current_view(BonoboUIComponent *component, GalViewMenus *menus, - char *cname) + gchar *cname) { gal_view_instance_save_as (menus->priv->instance); } static void toggled_cb (BonoboUIComponent *component, - const char *path, + const gchar *path, Bonobo_UIComponent_EventType type, - const char *state, + const gchar *state, gpointer user_data) { ListenerClosure *closure = user_data; @@ -277,16 +277,16 @@ toggled_cb (BonoboUIComponent *component, gal_view_instance_set_current_view_id (closure->instance, closure->id); } -static char * +static gchar * build_menus(GalViewMenus *menus) { BonoboUINode *root, *menu, *submenu, *place, *menuitem, *commands, *command; - char *xml; - int length; - int i; + gchar *xml; + gint length; + gint i; GalViewInstance *instance = menus->priv->instance; GalViewCollection *collection = instance->collection; - char *id; + gchar *id; gboolean found = FALSE; root = bonobo_ui_node_new("Root"); @@ -313,8 +313,8 @@ build_menus(GalViewMenus *menus) for (i = 0; i < length; i++) { GalViewCollectionItem *item = gal_view_collection_get_view_item(collection, i); ListenerClosure *closure; - char *label; - char *tip; + gchar *label; + gchar *tip; menuitem = bonobo_ui_node_new_child(submenu, "menuitem"); bonobo_ui_node_set_attr(menuitem, "name", item->id); @@ -416,7 +416,7 @@ static BonoboUIVerb verbs [] = { static void set_state (GalViewMenus *gvm, const gchar *path, CORBA_Environment *ev) { - char *full_path = g_strdup_printf ("/commands/%s", path); + gchar *full_path = g_strdup_printf ("/commands/%s", path); bonobo_ui_component_set_prop (gvm->priv->component, full_path, "state", "1", ev); g_free (full_path); @@ -426,7 +426,7 @@ static void set_radio (GalViewMenus *gvm, CORBA_Environment *ev) { - char *id; + gchar *id; id = gal_view_instance_get_current_view_id (gvm->priv->instance); @@ -442,7 +442,7 @@ static void build_stuff (GalViewMenus *gvm, CORBA_Environment *ev) { - char *xml; + gchar *xml; g_object_ref (gvm); diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index 8bfc84fa15..ea38e155a2 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -132,7 +132,7 @@ static void sensitize_ok_response (GalViewNewDialog *dialog) { gboolean ok = TRUE; - const char *text; + const gchar *text; text = gtk_entry_get_text (GTK_ENTRY (dialog->entry)); if (!text || !text[0]) diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c index fd3cdc2a5e..7b52d74864 100644 --- a/widgets/menus/gal-view.c +++ b/widgets/menus/gal-view.c @@ -65,7 +65,7 @@ gal_view_edit (GalView *view, */ void gal_view_load (GalView *view, - const char *filename) + const gchar *filename) { g_return_if_fail (view != NULL); g_return_if_fail (GAL_IS_VIEW (view)); @@ -81,7 +81,7 @@ gal_view_load (GalView *view, */ void gal_view_save (GalView *view, - const char *filename) + const gchar *filename) { g_return_if_fail (view != NULL); g_return_if_fail (GAL_IS_VIEW (view)); @@ -96,7 +96,7 @@ gal_view_save (GalView *view, * * Returns: The title of the view. */ -const char * +const gchar * gal_view_get_title (GalView *view) { g_return_val_if_fail (view != NULL, NULL); @@ -115,7 +115,7 @@ gal_view_get_title (GalView *view) */ void gal_view_set_title (GalView *view, - const char *title) + const gchar *title) { g_return_if_fail (view != NULL); g_return_if_fail (GAL_IS_VIEW (view)); @@ -130,7 +130,7 @@ gal_view_set_title (GalView *view, * * Returns: The type of the view. */ -const char * +const gchar * gal_view_get_type_code (GalView *view) { g_return_val_if_fail (view != NULL, NULL); diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h index b0ac4f3176..ce73400033 100644 --- a/widgets/menus/gal-view.h +++ b/widgets/menus/gal-view.h @@ -50,13 +50,13 @@ typedef struct { */ void (*edit) (GalView *view, GtkWindow *parent_window); void (*load) (GalView *view, - const char *filename); + const gchar *filename); void (*save) (GalView *view, - const char *filename); - const char *(*get_title) (GalView *view); + const gchar *filename); + const gchar *(*get_title) (GalView *view); void (*set_title) (GalView *view, - const char *title); - const char *(*get_type_code) (GalView *view); + const gchar *title); + const gchar *(*get_type_code) (GalView *view); GalView *(*clone) (GalView *view); /* Signals */ @@ -72,17 +72,17 @@ void gal_view_edit (GalView *view, /* xml load and save functions */ void gal_view_load (GalView *view, - const char *filename); + const gchar *filename); void gal_view_save (GalView *view, - const char *filename); + const gchar *filename); /* Title functions */ -const char *gal_view_get_title (GalView *view); +const gchar *gal_view_get_title (GalView *view); void gal_view_set_title (GalView *view, - const char *title); + const gchar *title); /* View type. */ -const char *gal_view_get_type_code (GalView *view); +const gchar *gal_view_get_type_code (GalView *view); /* Cloning the view */ GalView *gal_view_clone (GalView *view); diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index dd0bd60e9b..3cdd94984a 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -36,10 +36,10 @@ struct _ActivityInfo { - char *component_id; - int error_type; + gchar *component_id; + gint error_type; guint id; - char *information; + gchar *information; gboolean cancellable; double progress; GtkWidget *menu; @@ -61,7 +61,7 @@ struct _EActivityHandlerPrivate { }; /* In the status bar, we show only errors and info. Errors are pictured as warnings. */ -const char *icon_data [] = {"dialog-warning", "dialog-information"}; +const gchar *icon_data [] = {"dialog-warning", "dialog-information"}; G_DEFINE_TYPE (EActivityHandler, e_activity_handler, G_TYPE_OBJECT) @@ -82,10 +82,10 @@ get_new_activity_id (EActivityHandler *activity_handler) static GList * lookup_activity (GList *list, guint activity_id, - int *order_number_return) + gint *order_number_return) { GList *p; - int i; + gint i; for (p = list, i = 0; p != NULL; p = p->next, i ++) { ActivityInfo *activity_info; @@ -107,7 +107,7 @@ lookup_activity (GList *list, static int task_widget_button_press_event_callback (GtkWidget *widget, GdkEventButton *button_event, - void *data) + gpointer data) { ActivityInfo *activity_info; @@ -126,9 +126,9 @@ task_widget_button_press_event_callback (GtkWidget *widget, /* Creating and destroying ActivityInfos. */ static ActivityInfo * -activity_info_new (const char *component_id, +activity_info_new (const gchar *component_id, guint id, - const char *information, + const gchar *information, gboolean cancellable) { ActivityInfo *info; @@ -200,10 +200,10 @@ setup_task_bar (EActivityHandler *activity_handler, if (info->error) { /* Prepare to handle existing errors*/ GtkWidget *tool; - const char *stock; + const gchar *stock; stock = info->error_type ? icon_data [1] : icon_data[0]; - tool = e_task_widget_update_image (task_widget, (char *)stock, info->information); + tool = e_task_widget_update_image (task_widget, (gchar *)stock, info->information); g_object_set_data ((GObject *) task_widget, "tool", tool); g_object_set_data ((GObject *) task_widget, "error", info->error); g_object_set_data ((GObject *) task_widget, "activity-handler", activity_handler); @@ -215,7 +215,7 @@ setup_task_bar (EActivityHandler *activity_handler, } static void -task_bar_destroy_notify (void *data, +task_bar_destroy_notify (gpointer data, GObject *task_bar_instance) { EActivityHandler *activity_handler; @@ -304,7 +304,7 @@ e_activity_handler_new (void) } void -e_activity_handler_set_error_flush_time (EActivityHandler *handler, int time) +e_activity_handler_set_error_flush_time (EActivityHandler *handler, gint time) { handler->priv->error_flush_interval = time; } @@ -316,7 +316,7 @@ e_activity_handler_set_logger (EActivityHandler *handler, ELogger *logger) void e_activity_handler_set_message (EActivityHandler *activity_handler, - const char *message) + const gchar *message) { EActivityHandlerPrivate *priv; GSList *i; @@ -376,7 +376,7 @@ cancel_wrapper (gpointer pdata) /* Hide the error */ EActivityHandler *handler = data->handler; ActivityInfo *info; - int order, len; + gint order, len; GSList *sp; GList *p = lookup_activity (handler->priv->activity_infos, data->id, &order); e_logger_log (handler->priv->logger, E_LOG_ERROR, g_object_get_data (data->info->error, "primary"), @@ -404,15 +404,15 @@ cancel_wrapper (gpointer pdata) /* CORBA methods. */ guint e_activity_handler_cancelable_operation_started (EActivityHandler *activity_handler, - const char *component_id, - const char *information, + const gchar *component_id, + const gchar *information, gboolean cancellable, void (*cancel_func)(gpointer), gpointer user_data) { EActivityHandlerPrivate *priv; ActivityInfo *activity_info; - unsigned int activity_id; + guint activity_id; GSList *p; struct _cancel_wdata *data; gboolean bfree = FALSE; @@ -449,13 +449,13 @@ guint e_activity_handler_cancelable_operation_started (EActivityHandler *activ guint e_activity_handler_operation_started (EActivityHandler *activity_handler, - const char *component_id, - const char *information, + const gchar *component_id, + const gchar *information, gboolean cancellable) { EActivityHandlerPrivate *priv; ActivityInfo *activity_info; - unsigned int activity_id; + guint activity_id; GSList *p; priv = activity_handler->priv; @@ -481,7 +481,7 @@ handle_error (ETaskWidget *task) GtkWidget *tool, *error; EActivityHandler *activity_handler; guint id; - int error_type = GPOINTER_TO_INT((g_object_get_data ((GObject *) task, "error-type"))); + gint error_type = GPOINTER_TO_INT((g_object_get_data ((GObject *) task, "error-type"))); tool = g_object_get_data ((GObject *) task, "tool"); error = g_object_get_data ((GObject *) task, "error"); activity_handler = g_object_get_data ((GObject *) task, "activity-handler"); @@ -499,7 +499,7 @@ error_cleanup (EActivityHandler *activity_handler) EActivityHandlerPrivate *priv = activity_handler->priv; GList *p, *node; GSList *sp; - int i; + gint i; time_t now = time (NULL); gboolean berror = FALSE; @@ -541,16 +541,16 @@ error_cleanup (EActivityHandler *activity_handler) guint e_activity_handler_make_error (EActivityHandler *activity_handler, - const char *component_id, - int error_type, + const gchar *component_id, + gint error_type, GtkWidget *error) { EActivityHandlerPrivate *priv; ActivityInfo *activity_info; - unsigned int activity_id; + guint activity_id; GSList *p; - char *information = g_object_get_data((GObject *) error, "primary"); - const char *img; + gchar *information = g_object_get_data((GObject *) error, "primary"); + const gchar *img; priv = activity_handler->priv; activity_id = get_new_activity_id (activity_handler); @@ -571,7 +571,7 @@ e_activity_handler_make_error (EActivityHandler *activity_handler, task_widget->id = activity_id; e_task_bar_prepend_task (E_TASK_BAR (p->data), task_widget); - tool = e_task_widget_update_image (task_widget, (char *)img, information); + tool = e_task_widget_update_image (task_widget, (gchar *)img, information); g_object_set_data ((GObject *) task_widget, "tool", tool); g_object_set_data ((GObject *) task_widget, "error", error); g_object_set_data ((GObject *) task_widget, "activity-handler", activity_handler); @@ -597,7 +597,7 @@ e_activity_handler_operation_set_error(EActivityHandler *activity_handler, ActivityInfo *activity_info; GList *p; GSList *sp; - int order_number; + gint order_number; p = lookup_activity (priv->activity_infos, activity_id, &order_number); if (p == NULL) { @@ -621,7 +621,7 @@ e_activity_handler_operation_set_error(EActivityHandler *activity_handler, if (!task_widget) continue; - tool = e_task_widget_update_image (task_widget, (char *)icon_data[0], g_object_get_data ((GObject *) error, "primary")); + tool = e_task_widget_update_image (task_widget, (gchar *)icon_data[0], g_object_get_data ((GObject *) error, "primary")); g_object_set_data ((GObject *) task_widget, "tool", tool); g_object_set_data ((GObject *) task_widget, "error", error); g_object_set_data ((GObject *) task_widget, "activity-handler", activity_handler); @@ -637,14 +637,14 @@ e_activity_handler_operation_set_error(EActivityHandler *activity_handler, void e_activity_handler_operation_progressing (EActivityHandler *activity_handler, guint activity_id, - const char *information, + const gchar *information, double progress) { EActivityHandlerPrivate *priv = activity_handler->priv; ActivityInfo *activity_info; GList *p; GSList *sp; - int order_number; + gint order_number; p = lookup_activity (priv->activity_infos, activity_id, &order_number); if (p == NULL) { @@ -679,7 +679,7 @@ e_activity_handler_operation_finished (EActivityHandler *activity_handler, EActivityHandlerPrivate *priv = activity_handler->priv; GList *p; GSList *sp; - int order_number; + gint order_number; p = lookup_activity (priv->activity_infos, activity_id, &order_number); if (p == NULL) { diff --git a/widgets/misc/e-activity-handler.h b/widgets/misc/e-activity-handler.h index bf8d8e0095..a458bf0f31 100644 --- a/widgets/misc/e-activity-handler.h +++ b/widgets/misc/e-activity-handler.h @@ -65,24 +65,24 @@ void e_activity_handler_attach_task_bar (EActivityHandler *activity_hanlder, ETaskBar *task_bar); void e_activity_handler_set_message (EActivityHandler *activity_handler, - const char *message); + const gchar *message); void e_activity_handler_unset_message (EActivityHandler *activity_handler); guint e_activity_handler_operation_started (EActivityHandler *activity_handler, - const char *component_id, - const char *information, + const gchar *component_id, + const gchar *information, gboolean cancellable); guint e_activity_handler_cancelable_operation_started (EActivityHandler *activity_handler, - const char *component_id, - const char *information, + const gchar *component_id, + const gchar *information, gboolean cancellable, void (*cancel_func)(gpointer), gpointer user_data); void e_activity_handler_operation_progressing (EActivityHandler *activity_handler, guint activity_id, - const char *information, + const gchar *information, double progress); void e_activity_handler_operation_finished (EActivityHandler *activity_handler, @@ -90,8 +90,8 @@ void e_activity_handler_operation_finished (EActivityHandler *activity_handler void e_activity_handler_set_logger (EActivityHandler *handler, ELogger *logger); guint e_activity_handler_make_error (EActivityHandler *activity_handler, - const char *component_id, - int error_type, + const gchar *component_id, + gint error_type, GtkWidget *error); void e_activity_handler_operation_set_error (EActivityHandler *activity_handler, @@ -99,7 +99,7 @@ e_activity_handler_operation_set_error (EActivityHandler *activity_handler, GtkWidget *error); void -e_activity_handler_set_error_flush_time (EActivityHandler *handler, int time); +e_activity_handler_set_error_flush_time (EActivityHandler *handler, gint time); #ifdef __cplusplus } diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index be3751f852..cd3e2b5ec7 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -36,7 +36,7 @@ #include #include -static const int e_calendar_item_days_in_month[12] = { +static const gint e_calendar_item_days_in_month[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; @@ -1139,7 +1139,7 @@ e_calendar_item_draw (GnomeCanvasItem *canvas_item, static void -layout_set_day_text (ECalendarItem *calitem, PangoLayout *layout, int day_index) +layout_set_day_text (ECalendarItem *calitem, PangoLayout *layout, gint day_index) { const gchar *abbr_name; @@ -1364,18 +1364,18 @@ e_calendar_item_draw_month (ECalendarItem *calitem, cairo_destroy (cr); } -static const char * +static const gchar * get_digit_fomat () { #ifdef HAVE_GNU_GET_LIBC_VERSION #include - const char *libc_version = gnu_get_libc_version (); - char **split = g_strsplit (libc_version, ".", -1); - int major = 0; - int minor = 0; - int revision = 0; + const gchar *libc_version = gnu_get_libc_version (); + gchar **split = g_strsplit (libc_version, ".", -1); + gint major = 0; + gint minor = 0; + gint revision = 0; major = atoi (split [0]); minor = atoi (split [1]); @@ -1716,7 +1716,7 @@ e_calendar_item_get_week_number (ECalendarItem *calitem, { GDate date; guint weekday, yearday; - int offset, week_num; + gint offset, week_num; /* FIXME: check what happens at year boundaries. */ @@ -1757,7 +1757,7 @@ e_calendar_item_get_week_number (ECalendarItem *calitem, This is needed so that we get button/motion events. */ static double e_calendar_item_point (GnomeCanvasItem *item, double x, double y, - int cx, int cy, + gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; @@ -1983,7 +1983,7 @@ e_calendar_item_recalc_sizes (ECalendarItem *calitem) max_week_number_digit_width = 0; for (digit = 0; digit < 10; digit++) { gchar locale_digit[5]; - int locale_digit_len; + gint locale_digit_len; locale_digit_len = sprintf (locale_digit, get_digit_fomat (), digit); diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h index c0ee9a43bc..926ba1c077 100644 --- a/widgets/misc/e-calendar-item.h +++ b/widgets/misc/e-calendar-item.h @@ -126,7 +126,7 @@ struct _ECalendarItem gint year; gint month; /* 0 to 11 */ - /* Points to an array of styles, one char for each day. We use 32 + /* Points to an array of styles, one gchar for each day. We use 32 chars for each month, with n + 2 months, where n is the number of complete months shown (since we show some days before the first month and after the last month grayes out). diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index 181d7887d4..41b03d7f65 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -127,7 +127,7 @@ ecb_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y * GnomeCanvasItem::update method */ static void -ecb_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) +ecb_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags) { ArtPoint o1, o2; ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item); @@ -158,7 +158,7 @@ ecb_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) /* Sets the stipple pattern for the text */ static void -set_stipple (ECanvasBackground *ecb, GdkBitmap *stipple, int use_value) +set_stipple (ECanvasBackground *ecb, GdkBitmap *stipple, gint use_value) { if (use_value) { if (ecb->priv->stipple) @@ -365,10 +365,10 @@ ecb_unrealize (GnomeCanvasItem *item) } static void -ecb_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height) +ecb_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint width, gint height) { ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item); - int x1, x2, y1, y2; + gint x1, x2, y1, y2; double i2c [6]; ArtPoint upper_left, lower_right, ecb_base_point; @@ -402,7 +402,7 @@ ecb_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, } static double -ecb_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, +ecb_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy, GnomeCanvasItem **actual_item) { ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item); diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c index 62ea6c54ef..cae41d859f 100644 --- a/widgets/misc/e-canvas-utils.c +++ b/widgets/misc/e-canvas-utils.c @@ -37,10 +37,10 @@ e_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy) } static double -compute_offset(int top, int bottom, int page_top, int page_bottom) +compute_offset(gint top, gint bottom, gint page_top, gint page_bottom) { - int size = bottom - top; - int offset = 0; + gint size = bottom - top; + gint offset = 0; if (top <= page_top && bottom >= page_bottom) return 0; @@ -68,7 +68,7 @@ static void e_canvas_show_area (GnomeCanvas *canvas, double x1, double y1, double x2, double y2) { GtkAdjustment *h, *v; - int dx = 0, dy = 0; + gint dx = 0, dy = 0; g_return_if_fail (canvas != NULL); g_return_if_fail (GNOME_IS_CANVAS (canvas)); @@ -101,7 +101,7 @@ static gboolean e_canvas_area_shown (GnomeCanvas *canvas, double x1, double y1, double x2, double y2) { GtkAdjustment *h, *v; - int dx = 0, dy = 0; + gint dx = 0, dy = 0; g_return_val_if_fail (canvas != NULL, FALSE); g_return_val_if_fail (GNOME_IS_CANVAS (canvas), FALSE); diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c index 3d4e879c0c..1eb0ddec12 100644 --- a/widgets/misc/e-canvas-vbox.c +++ b/widgets/misc/e-canvas-vbox.c @@ -41,7 +41,7 @@ static void e_canvas_vbox_dispose (GObject *object); static gint e_canvas_vbox_event (GnomeCanvasItem *item, GdkEvent *event); static void e_canvas_vbox_realize (GnomeCanvasItem *item); -static void e_canvas_vbox_reflow (GnomeCanvasItem *item, int flags); +static void e_canvas_vbox_reflow (GnomeCanvasItem *item, gint flags); static void e_canvas_vbox_real_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item); static void e_canvas_vbox_real_add_item_start(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item); @@ -295,7 +295,7 @@ e_canvas_vbox_resize_children (GnomeCanvasItem *item) } static void -e_canvas_vbox_reflow( GnomeCanvasItem *item, int flags ) +e_canvas_vbox_reflow( GnomeCanvasItem *item, gint flags ) { ECanvasVbox *e_canvas_vbox = E_CANVAS_VBOX(item); if ( GTK_OBJECT_FLAGS( e_canvas_vbox ) & GNOME_CANVAS_ITEM_REALIZED ) { diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 055f0311f4..39b89d2675 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -48,7 +48,7 @@ static gint e_canvas_focus_out (GtkWidget *widget, static void e_canvas_style_set (GtkWidget *widget, GtkStyle *previous_style); -static int emit_event (GnomeCanvas *canvas, GdkEvent *event); +static gint emit_event (GnomeCanvas *canvas, GdkEvent *event); #define d(x) @@ -287,7 +287,7 @@ e_canvas_key (GtkWidget *widget, GdkEventKey *event) #define HACKISH_AFFINE static double -gnome_canvas_item_invoke_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, +gnome_canvas_item_invoke_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy, GnomeCanvasItem **actual_item) { #ifdef HACKISH_AFFINE @@ -319,10 +319,10 @@ gnome_canvas_item_invoke_point (GnomeCanvasItem *item, double x, double y, int c static int pick_current_item (GnomeCanvas *canvas, GdkEvent *event) { - int button_down; + gint button_down; double x, y; - int cx, cy; - int retval; + gint cx, cy; + gint retval; retval = FALSE; @@ -460,8 +460,8 @@ static gint e_canvas_button (GtkWidget *widget, GdkEventButton *event) { GnomeCanvas *canvas; - int mask; - int retval; + gint mask; + gint retval; g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (GNOME_IS_CANVAS (widget), FALSE); @@ -695,7 +695,7 @@ e_canvas_unrealize (GtkWidget *widget) } static void -e_canvas_item_invoke_reflow (GnomeCanvasItem *item, int flags) +e_canvas_item_invoke_reflow (GnomeCanvasItem *item, gint flags) { GnomeCanvasGroup *group; GList *list; @@ -814,7 +814,7 @@ void e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id) { GList *list; - int flags; + gint flags; ECanvas *canvas; ECanvasSelectionInfo *info; ECanvasItemSelectionFunc func; @@ -869,7 +869,7 @@ e_canvas_item_set_cursor_end (GnomeCanvasItem *item, gpointer id) void e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id) { - int flags; + gint flags; ECanvas *canvas; ECanvasSelectionInfo *info; ECanvasItemSelectionFunc func; @@ -932,7 +932,7 @@ e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id) void e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id) { - int flags; + gint flags; ECanvas *canvas; ECanvasSelectionInfo *info; GList *list; @@ -975,7 +975,7 @@ e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id) } } -void e_canvas_popup_tooltip (ECanvas *canvas, GtkWidget *widget, int x, int y) +void e_canvas_popup_tooltip (ECanvas *canvas, GtkWidget *widget, gint x, gint y) { if (canvas->tooltip_window && canvas->tooltip_window != widget) { e_canvas_hide_tooltip(canvas); @@ -1034,7 +1034,7 @@ grab_cancelled_check (gpointer data) return TRUE; } -int +gint e_canvas_item_grab (ECanvas *canvas, GnomeCanvasItem *item, guint event_mask, @@ -1046,7 +1046,7 @@ e_canvas_item_grab (ECanvas *canvas, if (gtk_grab_get_current ()) { return GDK_GRAB_ALREADY_GRABBED; } else { - int ret_val = gnome_canvas_item_grab (item, event_mask, cursor, etime); + gint ret_val = gnome_canvas_item_grab (item, event_mask, cursor, etime); if (ret_val == GDK_GRAB_SUCCESS) { canvas->grab_cancelled_cb = cancelled_cb; canvas->grab_cancelled_check_id = diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h index 00692c457a..e23d29f057 100644 --- a/widgets/misc/e-canvas.h +++ b/widgets/misc/e-canvas.h @@ -79,12 +79,12 @@ typedef void (*ECanvasItemGrabCancelled) (ECanvas *canvas, GnomeCanvasItem *item struct _ECanvas { GnomeCanvas parent; - int idle_id; + gint idle_id; GList *selection; ECanvasSelectionInfo *cursor; GtkWidget *tooltip_window; - int visibility_notify_id; + gint visibility_notify_id; GtkWidget *toplevel; guint visibility_first : 1; @@ -128,7 +128,7 @@ void e_canvas_item_add_selection (GnomeCanvasItem void e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id); -int e_canvas_item_grab (ECanvas *canvas, +gint e_canvas_item_grab (ECanvas *canvas, GnomeCanvasItem *item, guint event_mask, GdkCursor *cursor, @@ -144,8 +144,8 @@ void e_canvas_item_set_cursor_end (GnomeCanvasItem gpointer id); void e_canvas_popup_tooltip (ECanvas *canvas, GtkWidget *widget, - int x, - int y); + gint x, + gint y); void e_canvas_hide_tooltip (ECanvas *canvas); #ifdef __cplusplus diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index e994120b33..ddf8bf60ee 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -61,17 +61,17 @@ static void e_cell_date_edit_set_property (GObject *object, static gint e_cell_date_edit_do_popup (ECellPopup *ecp, GdkEvent *event, - int row, - int view_col); + gint row, + gint view_col); static void e_cell_date_edit_set_popup_values (ECellDateEdit *ecde); static void e_cell_date_edit_select_matching_time(ECellDateEdit *ecde, char *time); static void e_cell_date_edit_show_popup (ECellDateEdit *ecde, - int row, - int view_col); + gint row, + gint view_col); static void e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, - int row, - int view_col, + gint row, + gint view_col, gint *x, gint *y, gint *height, @@ -79,10 +79,10 @@ static void e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, static void e_cell_date_edit_rebuild_time_list (ECellDateEdit *ecde); -static int e_cell_date_edit_key_press (GtkWidget *popup_window, +static gint e_cell_date_edit_key_press (GtkWidget *popup_window, GdkEventKey *event, ECellDateEdit *ecde); -static int e_cell_date_edit_button_press (GtkWidget *popup_window, +static gint e_cell_date_edit_button_press (GtkWidget *popup_window, GdkEventButton *event, ECellDateEdit *ecde); static void e_cell_date_edit_on_ok_clicked (GtkWidget *button, @@ -485,8 +485,8 @@ e_cell_date_edit_set_property (GObject *object, static gint e_cell_date_edit_do_popup (ECellPopup *ecp, GdkEvent *event, - int row, - int view_col) + gint row, + gint view_col) { ECellDateEdit *ecde = E_CELL_DATE_EDIT (ecp); @@ -511,12 +511,12 @@ e_cell_date_edit_set_popup_values (ECellDateEdit *ecde) ECellView *ecv = (ECellView*) ecp->popup_cell_view; ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view); ETableCol *ecol; - char *cell_text; + gchar *cell_text; ETimeParseStatus status; struct tm date_tm; GDate date; ECalendarItem *calitem; - char buffer[64]; + gchar buffer[64]; gboolean is_date = TRUE; ecol = e_table_header_get_column (eti->header, ecp->popup_view_col); @@ -579,7 +579,7 @@ e_cell_date_edit_select_matching_time (ECellDateEdit *ecde, for (valid = gtk_tree_model_get_iter_first (model, &iter); valid && !found; valid = gtk_tree_model_iter_next (model, &iter)) { - char *str = NULL; + gchar *str = NULL; gtk_tree_model_get (model, &iter, 0, &str, -1); @@ -605,8 +605,8 @@ e_cell_date_edit_select_matching_time (ECellDateEdit *ecde, static void e_cell_date_edit_show_popup (ECellDateEdit *ecde, - int row, - int view_col) + gint row, + gint view_col) { gint x, y, width, height; @@ -630,8 +630,8 @@ e_cell_date_edit_show_popup (ECellDateEdit *ecde, /* Calculates the size and position of the popup window (like GtkCombo). */ static void e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, - int row, - int view_col, + gint row, + gint view_col, gint *x, gint *y, gint *height, @@ -753,7 +753,7 @@ static void e_cell_date_edit_rebuild_time_list (ECellDateEdit *ecde) { GtkListStore *store; - char buffer[40]; + gchar buffer[40]; struct tm tmp_tm; gint hour, min; @@ -801,8 +801,8 @@ e_cell_date_edit_on_ok_clicked (GtkWidget *button, GDate start_date, end_date; gboolean day_selected; struct tm date_tm; - char buffer[64]; - const char *text; + gchar buffer[64]; + const gchar *text; ETimeParseStatus status; gboolean is_date = FALSE; @@ -843,7 +843,7 @@ e_cell_date_edit_show_time_invalid_warning (ECellDateEdit *ecde) { GtkWidget *dialog; struct tm date_tm; - char buffer[64]; + gchar buffer[64]; /* Create a useful error message showing the correct format. */ date_tm.tm_year = 100; @@ -875,7 +875,7 @@ e_cell_date_edit_on_now_clicked (GtkWidget *button, { struct tm tmp_tm; time_t t; - char buffer[64]; + gchar buffer[64]; if (ecde->time_callback) { tmp_tm = (*ecde->time_callback) (ecde, ecde->time_callback_data); @@ -908,7 +908,7 @@ e_cell_date_edit_on_today_clicked (GtkWidget *button, { struct tm tmp_tm; time_t t; - char buffer[64]; + gchar buffer[64]; if (ecde->time_callback) { tmp_tm = (*ecde->time_callback) (ecde, ecde->time_callback_data); diff --git a/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c index 194a7bd6b6..378bb8ab55 100644 --- a/widgets/misc/e-cell-percent.c +++ b/widgets/misc/e-cell-percent.c @@ -41,11 +41,11 @@ G_DEFINE_TYPE (ECellPercent, e_cell_percent, E_CELL_TEXT_TYPE) -static char * -ecp_get_text (ECellText *cell, ETableModel *model, int col, int row) +static gchar * +ecp_get_text (ECellText *cell, ETableModel *model, gint col, gint row) { - int percent; - static char buffer[8]; + gint percent; + static gchar buffer[8]; percent = GPOINTER_TO_INT (e_table_model_value_at (model, col, row)); @@ -60,7 +60,7 @@ ecp_get_text (ECellText *cell, ETableModel *model, int col, int row) } static void -ecp_free_text(ECellText *cell, char *text) +ecp_free_text(ECellText *cell, gchar *text) { /* Do Nothing. */ } @@ -80,12 +80,12 @@ show_percent_warning (void) } static void -ecp_set_value (ECellText *cell, ETableModel *model, int col, int row, - const char *text) +ecp_set_value (ECellText *cell, ETableModel *model, gint col, gint row, + const gchar *text) { - int matched, percent; + gint matched, percent; gboolean empty = TRUE; - const char *p; + const gchar *p; if (text) { p = text; @@ -142,7 +142,7 @@ e_cell_percent_init (ECellPercent *ecp) * Returns: an ECell object that can be used to render numbers. */ ECell * -e_cell_percent_new (const char *fontname, GtkJustification justify) +e_cell_percent_new (const gchar *fontname, GtkJustification justify) { ECellPercent *ecn = g_object_new (E_CELL_PERCENT_TYPE, NULL); diff --git a/widgets/misc/e-cell-percent.h b/widgets/misc/e-cell-percent.h index 5e202dfa82..3ac15afab7 100644 --- a/widgets/misc/e-cell-percent.h +++ b/widgets/misc/e-cell-percent.h @@ -46,6 +46,6 @@ typedef struct { } ECellPercentClass; GType e_cell_percent_get_type (void); -ECell *e_cell_percent_new (const char *fontname, GtkJustification justify); +ECell *e_cell_percent_new (const gchar *fontname, GtkJustification justify); #endif /* _E_CELL_PERCENT_H_ */ diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index 5d1f8c036a..94133cc204 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -52,7 +52,7 @@ typedef enum { E_CHARSET_WESTERN_EUROPEAN_NEW } ECharsetClass; -static const char *classnames[] = { +static const gchar *classnames[] = { N_("Unknown"), N_("Arabic"), N_("Baltic"), @@ -110,7 +110,7 @@ static ECharset charsets[] = { { "ISO-8859-1", E_CHARSET_WESTERN_EUROPEAN, NULL }, { "ISO-8859-15", E_CHARSET_WESTERN_EUROPEAN_NEW, NULL }, }; -static const int num_charsets = sizeof (charsets) / sizeof (charsets[0]); +static const gint num_charsets = sizeof (charsets) / sizeof (charsets[0]); static void select_item (GtkMenuShell *menu_shell, GtkWidget *item) @@ -129,7 +129,7 @@ static GtkWidget * add_charset (GtkWidget *menu, ECharset *charset, gboolean free_name) { GtkWidget *item; - char *label; + gchar *label; if (charset->subclass) { label = g_strdup_printf ("%s, %s (%s)", @@ -157,7 +157,7 @@ add_charset (GtkWidget *menu, ECharset *charset, gboolean free_name) } static gboolean -add_other_charset (GtkWidget *menu, GtkWidget *other, const char *new_charset) +add_other_charset (GtkWidget *menu, GtkWidget *other, const gchar *new_charset) { ECharset charset = { NULL, E_CHARSET_UNKNOWN, NULL }; GtkWidget *item; @@ -203,7 +203,7 @@ static void activate_other (GtkWidget *item, gpointer menu) { GtkWidget *window, *entry, *label, *vbox, *hbox; - char *old_charset, *new_charset; + gchar *old_charset, *new_charset; GtkDialog *dialog; window = gtk_widget_get_toplevel (menu); @@ -257,7 +257,7 @@ activate_other (GtkWidget *item, gpointer menu) g_object_ref (dialog); if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) { - new_charset = (char *)gtk_entry_get_text (GTK_ENTRY (entry)); + new_charset = (gchar *)gtk_entry_get_text (GTK_ENTRY (entry)); if (*new_charset) { if (add_other_charset (menu, item, new_charset)) { @@ -292,11 +292,11 @@ activate_other (GtkWidget *item, gpointer menu) * attached. */ GtkWidget * -e_charset_picker_new (const char *default_charset) +e_charset_picker_new (const gchar *default_charset) { GtkWidget *menu, *item; - int def, i; - const char *locale_charset; + gint def, i; + const gchar *locale_charset; g_get_charset (&locale_charset); if (!g_ascii_strcasecmp (locale_charset, "US-ASCII")) @@ -350,11 +350,11 @@ e_charset_picker_new (const char *default_charset) * Return value: the currently-selected character set in @picker, * which must be freed with g_free(). **/ -char * +gchar * e_charset_picker_get_charset (GtkWidget *menu) { GtkWidget *item; - char *charset; + gchar *charset; g_return_val_if_fail (GTK_IS_MENU (menu), NULL); @@ -378,13 +378,13 @@ e_charset_picker_get_charset (GtkWidget *menu) * Return value: the selected character set (which must be freed with * g_free()), or %NULL. **/ -char * -e_charset_picker_dialog (const char *title, const char *prompt, - const char *default_charset, GtkWindow *parent) +gchar * +e_charset_picker_dialog (const gchar *title, const gchar *prompt, + const gchar *default_charset, GtkWindow *parent) { GtkDialog *dialog; GtkWidget *label, *omenu, *picker, *vbox, *hbox; - char *charset = NULL; + gchar *charset = NULL; dialog = GTK_DIALOG (gtk_dialog_new_with_buttons (title, parent, @@ -576,14 +576,14 @@ e_charset_add_radio_actions (GtkActionGroup *action_group, * sets. **/ void -e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, - const char *default_charset, +e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const gchar *path, + const gchar *default_charset, BonoboUIListenerFn cb, gpointer user_data) { - char *encoded_label, *label; - const char *locale_charset; + gchar *encoded_label, *label; + const gchar *locale_charset; GString *menuitems; - int def, i; + gint def, i; g_get_charset (&locale_charset); if (!g_ascii_strcasecmp (locale_charset, "US-ASCII")) @@ -610,7 +610,7 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, /* 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; + gint extra = 1; const gchar *s; gchar *d; @@ -663,19 +663,19 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, } if (def == num_charsets) { - char *command; - char *charset_name, *u; + gchar *command; + gchar *charset_name, *u; /* escape _'s in the charset name so that it doesn't become an underline in a GtkLabel */ if ((u = strchr (default_charset, '_'))) { - int extra = 1; - char *s, *d; + gint extra = 1; + gchar *s, *d; while ((u = strchr (u + 1, '_'))) extra++; d = charset_name = g_alloca (strlen (default_charset) + extra + 1); - s = (char *) default_charset; + s = (gchar *) default_charset; while (*s != '\0') { if (*s == '_') *d++ = '_'; @@ -683,7 +683,7 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, } *d = '\0'; } else { - charset_name = (char *) default_charset; + charset_name = (gchar *) default_charset; } label = g_strdup (charset_name); diff --git a/widgets/misc/e-charset-picker.h b/widgets/misc/e-charset-picker.h index 88c89fb308..04c013bd88 100644 --- a/widgets/misc/e-charset-picker.h +++ b/widgets/misc/e-charset-picker.h @@ -26,11 +26,11 @@ G_BEGIN_DECLS -GtkWidget * e_charset_picker_new (const char *default_charset); -char * e_charset_picker_get_charset (GtkWidget *picker); -char * e_charset_picker_dialog (const char *title, - const char *prompt, - const char *default_charset, +GtkWidget * e_charset_picker_new (const gchar *default_charset); +gchar * e_charset_picker_get_charset (GtkWidget *picker); +gchar * e_charset_picker_dialog (const gchar *title, + const gchar *prompt, + const gchar *default_charset, GtkWindow *parent); void e_charset_add_radio_actions (GtkActionGroup *action_group, @@ -40,8 +40,8 @@ void e_charset_add_radio_actions (GtkActionGroup *action_group, void e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, - const char *path, - const char *default_charset, + const gchar *path, + const gchar *default_charset, BonoboUIListenerFn cb, gpointer user_data); diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c index 74fbdbf58c..5e2fddabc8 100644 --- a/widgets/misc/e-colors.c +++ b/widgets/misc/e-colors.c @@ -48,7 +48,7 @@ e_color_alloc_gdk (GtkWidget *widget, GdkColor *c) } void -e_color_alloc_name (GtkWidget *widget, const char *name, GdkColor *c) +e_color_alloc_name (GtkWidget *widget, const gchar *name, GdkColor *c) { GdkColormap *map; diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h index 710ee59f59..c867d6425c 100644 --- a/widgets/misc/e-colors.h +++ b/widgets/misc/e-colors.h @@ -31,7 +31,7 @@ void e_color_init (void); /* Return the pixel value for the given red, green and blue */ gulong e_color_alloc (gushort red, gushort green, gushort blue); -void e_color_alloc_name (GtkWidget *widget, const char *name, GdkColor *color); +void e_color_alloc_name (GtkWidget *widget, const gchar *name, GdkColor *color); void e_color_alloc_gdk (GtkWidget *widget, GdkColor *color); extern GdkColor e_white, e_dark_gray, e_black; diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c index dc978af91a..b40cf70635 100644 --- a/widgets/misc/e-combo-button.c +++ b/widgets/misc/e-combo-button.c @@ -91,10 +91,10 @@ paint (EComboButton *combo_button, GtkButton *button = GTK_BUTTON (combo_button); GtkShadowType shadow_type; gboolean interior_focus; - int separator_x; - int focus_width, focus_pad; - int x, y, width, height; - int border_width; + gint separator_x; + gint focus_width, focus_pad; + gint x, y, width, height; + gint border_width; if (GTK_BUTTON (widget)->depressed || priv->menu_popped_up) { shadow_type = GTK_SHADOW_IN; @@ -194,7 +194,7 @@ menu_detacher (GtkWidget *widget, static void menu_deactivate_callback (GtkMenuShell *menu_shell, - void *data) + gpointer data) { EComboButton *combo_button; EComboButtonPrivate *priv; @@ -215,7 +215,7 @@ menu_position_func (GtkMenu *menu, gint *x_return, gint *y_return, gboolean *push_in, - void *data) + gpointer data) { EComboButton *combo_button; GtkAllocation *allocation; @@ -374,7 +374,7 @@ impl_released (GtkButton *button) the menu hasn't been popped up. */ if (button->button_down) { - int new_state; + gint new_state; button->button_down = FALSE; @@ -561,7 +561,7 @@ e_combo_button_set_icon (EComboButton *combo_button, void e_combo_button_set_label (EComboButton *combo_button, - const char *label) + const gchar *label) { EComboButtonPrivate *priv; diff --git a/widgets/misc/e-combo-button.h b/widgets/misc/e-combo-button.h index edeb1be9bd..c36948cbde 100644 --- a/widgets/misc/e-combo-button.h +++ b/widgets/misc/e-combo-button.h @@ -66,7 +66,7 @@ GtkWidget *e_combo_button_new (void); void e_combo_button_set_icon (EComboButton *combo_button, GdkPixbuf *pixbuf); void e_combo_button_set_label (EComboButton *combo_button, - const char *label); + const gchar *label); void e_combo_button_set_menu (EComboButton *combo_button, GtkMenu *menu); void e_combo_button_pack_vbox (EComboButton *combo_button); diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c index 8cee128619..3d3c777986 100644 --- a/widgets/misc/e-combo-cell-editable.c +++ b/widgets/misc/e-combo-cell-editable.c @@ -170,7 +170,7 @@ lookup_row (GList *list, const gchar *text) gint result = 0; for (l = list; l; l = l->next, result++) - if (!g_utf8_collate (text, (char *) l->data)) + if (!g_utf8_collate (text, (gchar *) l->data)) break; return result; diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c index ebc2f9bd78..ddf5f1ac26 100644 --- a/widgets/misc/e-cursors.c +++ b/widgets/misc/e-cursors.c @@ -65,11 +65,11 @@ static CursorDef cursors [] = { static void create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, const gchar **xpm) { - int height, width, colors; - char pixmap_buffer [(32 * 32)/8]; - char mask_buffer [(32 * 32)/8]; - int x, y, pix, yofs; - int transparent_color, black_color; + gint height, width, colors; + gchar pixmap_buffer [(32 * 32)/8]; + gchar mask_buffer [(32 * 32)/8]; + gint x, y, pix, yofs; + gint transparent_color, black_color; sscanf (xpm [0], "%d %d %d %d", &height, &width, &colors, &pix); @@ -83,7 +83,7 @@ create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, const gch yofs = colors + 1; for (y = 0; y < 32; y++){ for (x = 0; x < 32;){ - char value = 0, maskv = 0; + gchar value = 0, maskv = 0; for (pix = 0; pix < 8; pix++, x++){ if (xpm [y + yofs][x] != transparent_color){ @@ -111,7 +111,7 @@ create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, const gch void e_cursors_init (void) { - int i; + gint i; e_color_init (); @@ -144,7 +144,7 @@ e_cursors_init (void) void e_cursors_shutdown (void) { - int i; + gint i; for (i = 0; cursors [i].hot_x; i++) gdk_cursor_unref (cursors [i].cursor); diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 701cf69444..e8034eb487 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -1403,7 +1403,7 @@ rebuild_time_popup (EDateEdit *dedit) { EDateEditPrivate *priv; GtkComboBox *combo; - char buffer[40]; + gchar buffer[40]; struct tm tmp_tm; gint hour, min; @@ -1497,11 +1497,11 @@ e_date_edit_parse_time (EDateEdit *dedit, /* Returns TRUE if the string is empty or is "None" in the current locale. It ignores whitespace. */ static gboolean -field_set_to_none (const char *text) +field_set_to_none (const gchar *text) { - const char *pos; - const char *none_string; - int n; + const gchar *pos; + const gchar *none_string; + gint n; pos = text; while (n = (int)((unsigned char)*pos), isspace (n)) @@ -1717,7 +1717,7 @@ static void e_date_edit_update_date_entry (EDateEdit *dedit) { EDateEditPrivate *priv; - char buffer[100]; + gchar buffer[100]; struct tm tmp_tm = { 0 }; priv = dedit->priv; @@ -1728,7 +1728,7 @@ e_date_edit_update_date_entry (EDateEdit *dedit) /* This is a strftime() format for a short date. %x the preferred date representation for the current locale without the time, but has forced to use 4 digit year */ - char *format = e_time_get_d_fmt_with_4digit_year (); + gchar *format = e_time_get_d_fmt_with_4digit_year (); tmp_tm.tm_year = priv->year; tmp_tm.tm_mon = priv->month; @@ -1750,7 +1750,7 @@ static void e_date_edit_update_time_entry (EDateEdit *dedit) { EDateEditPrivate *priv; - char buffer[40]; + gchar buffer[40]; struct tm tmp_tm = { 0 }; priv = dedit->priv; @@ -1761,7 +1761,7 @@ e_date_edit_update_time_entry (EDateEdit *dedit) } else { GtkTreeModel *model; GtkTreeIter iter; - char *b; + gchar *b; /* Set these to reasonable values just in case. */ tmp_tm.tm_year = 2000; @@ -1797,11 +1797,11 @@ e_date_edit_update_time_entry (EDateEdit *dedit) model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->time_combo)); if (gtk_tree_model_get_iter_first (model, &iter)) { do { - char *text = NULL; + gchar *text = NULL; gtk_tree_model_get (model, &iter, 0, &text, -1); if (text) { - char *t = text; + gchar *t = text; /* truncate left spaces */ while (*t == ' ') diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c index 00b2695e5f..54cc5a0be8 100644 --- a/widgets/misc/e-dropdown-button.c +++ b/widgets/misc/e-dropdown-button.c @@ -40,15 +40,15 @@ G_DEFINE_TYPE (EDropdownButton, e_dropdown_button, GTK_TYPE_TOGGLE_BUTTON) static void menu_position_cb (GtkMenu *menu, - int *x, - int *y, + gint *x, + gint *y, gboolean *push_in, - void *data) + gpointer data) { EDropdownButton *dropdown_button; EDropdownButtonPrivate *priv; GtkRequisition menu_requisition; - int max_x, max_y; + gint max_x, max_y; dropdown_button = E_DROPDOWN_BUTTON (data); priv = dropdown_button->priv; @@ -72,7 +72,7 @@ menu_position_cb (GtkMenu *menu, static int menu_deactivate_cb (GtkMenuShell *menu_shell, - void *data) + gpointer data) { EDropdownButton *dropdown_button; @@ -166,7 +166,7 @@ e_dropdown_button_init (EDropdownButton *dropdown_button) **/ void e_dropdown_button_construct (EDropdownButton *dropdown_button, - const char *label_text, + const gchar *label_text, GtkMenu *menu) { EDropdownButtonPrivate *priv; @@ -220,7 +220,7 @@ e_dropdown_button_construct (EDropdownButton *dropdown_button, * Return value: A pointer to the newly created %EDropdownButton. **/ GtkWidget * -e_dropdown_button_new (const char *label_text, +e_dropdown_button_new (const gchar *label_text, GtkMenu *menu) { GtkWidget *widget; diff --git a/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h index bd4fe6feb4..19f678b4eb 100644 --- a/widgets/misc/e-dropdown-button.h +++ b/widgets/misc/e-dropdown-button.h @@ -58,9 +58,9 @@ struct _EDropdownButtonClass { GType e_dropdown_button_get_type (void); void e_dropdown_button_construct (EDropdownButton *dropdown_button, - const char *label_text, + const gchar *label_text, GtkMenu *menu); -GtkWidget *e_dropdown_button_new (const char *label_text, +GtkWidget *e_dropdown_button_new (const gchar *label_text, GtkMenu *menu); #ifdef __cplusplus diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 9a67636939..b699190568 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -68,7 +68,7 @@ rule_editor_destroyed (EFilterBar *efb, GObject *deadbeef) /* FIXME: need to update the popup menu to match any edited rules, sigh */ static void -full_rule_editor_response (GtkWidget *dialog, int response, void *data) +full_rule_editor_response (GtkWidget *dialog, gint response, gpointer data) { EFilterBar *efb = data; @@ -79,7 +79,7 @@ full_rule_editor_response (GtkWidget *dialog, int response, void *data) } static void -rule_editor_response (GtkWidget *dialog, int response, void *data) +rule_editor_response (GtkWidget *dialog, gint response, gpointer data) { EFilterBar *efb = data; FilterRule *rule; @@ -100,7 +100,7 @@ rule_editor_response (GtkWidget *dialog, int response, void *data) } static void -rule_advanced_response (GtkWidget *dialog, int response, void *data) +rule_advanced_response (GtkWidget *dialog, gint response, gpointer data) { EFilterBar *efb = data; /* the below generates a compiler warning about incompatible pointer types */ @@ -211,7 +211,7 @@ static void save_search_dialog (ESearchBar *esb) { FilterRule *rule; - char *name, *text; + gchar *name, *text; GtkWidget *dialog, *w; EFilterBar *efb = (EFilterBar *)esb; @@ -254,7 +254,7 @@ save_search_dialog (ESearchBar *esb) } static void -menubar_activated (ESearchBar *esb, int id, void *data) +menubar_activated (ESearchBar *esb, gint id, gpointer data) { EFilterBar *efb = (EFilterBar *)esb; GtkWidget *dialog; @@ -317,11 +317,11 @@ menubar_activated (ESearchBar *esb, int id, void *data) } static void -option_changed (ESearchBar *esb, void *data) +option_changed (ESearchBar *esb, gpointer data) { EFilterBar *efb = (EFilterBar *)esb; - int id = e_search_bar_get_item_id (esb); - char *query; + gint id = e_search_bar_get_item_id (esb); + gchar *query; d(printf("option changed, id = %d, setquery = %s %d\n", id, efb->setquery ? "true" : "false", esb->block_search)); @@ -366,16 +366,16 @@ dup_item_no_subitems (ESearchBarItem *dest, } static GArray * -build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrArray *rules) +build_items (ESearchBar *esb, ESearchBarItem *items, gint type, gint *start, GPtrArray *rules) { FilterRule *rule = NULL; EFilterBar *efb = (EFilterBar *)esb; - int id = 0, i; + gint id = 0, i; GArray *menu = g_array_new (FALSE, FALSE, sizeof (ESearchBarItem)); ESearchBarItem item = { NULL, -1, 2 }; const gchar *source; GSList *gtksux = NULL; - int num; + gint num; for (i=0;ilen;i++) gtksux = g_slist_prepend(gtksux, rules->pdata[i]); @@ -467,7 +467,7 @@ build_items (ESearchBar *esb, ESearchBarItem *items, int type, int *start, GPtrA static void free_built_items (GArray *menu) { - int i; + gint i; for (i = 0; i < menu->len; i ++) { ESearchBarItem *item; @@ -493,7 +493,7 @@ generate_menu (ESearchBar *esb, ESearchBarItem *items) static void free_items (ESearchBarItem *items) { - int i; + gint i; for (i = 0; items[i].id != -1; i++) g_free (items[i].text); @@ -508,7 +508,7 @@ set_menu (ESearchBar *esb, ESearchBarItem *items) { EFilterBar *efb = E_FILTER_BAR (esb); ESearchBarItem *default_items; - int i, num; + gint i, num; if (efb->default_items) free_items (efb->default_items); @@ -582,7 +582,7 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp switch (property_id) { case PROP_QUERY: { - char *text = e_search_bar_get_text (E_SEARCH_BAR (efb)); + gchar *text = e_search_bar_get_text (E_SEARCH_BAR (efb)); /* empty search text means searching turned off */ if (efb->current_query && text && *text) { @@ -600,15 +600,15 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp case PROP_STATE: { /* FIXME: we should have ESearchBar save its own state to the xmlDocPtr */ xmlChar *xmlbuf; - char *text, buf[12]; - int searchscope, item_id, n, view_id; + gchar *text, buf[12]; + gint searchscope, item_id, n, view_id; xmlNodePtr root, node; xmlDocPtr doc; item_id = e_search_bar_get_item_id ((ESearchBar *) efb); - doc = xmlNewDoc ((const unsigned char *)"1.0"); - root = xmlNewDocNode (doc, NULL, (const unsigned char *)"state", NULL); + doc = xmlNewDoc ((const guchar *)"1.0"); + root = xmlNewDocNode (doc, NULL, (const guchar *)"state", NULL); xmlDocSetRootElement (doc, root); searchscope = e_search_bar_get_search_scope ((ESearchBar *) efb); view_id = e_search_bar_get_viewitem_id ((ESearchBar *) efb); @@ -618,28 +618,28 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp if (item_id == E_FILTERBAR_ADVANCED_ID) { /* advanced query, save the filterbar state */ - node = xmlNewChild (root, NULL, (const unsigned char *)"filter-bar", NULL); + node = xmlNewChild (root, NULL, (const guchar *)"filter-bar", NULL); sprintf (buf, "%d", esb->last_search_option); - xmlSetProp (node, (const unsigned char *)"item_id", (unsigned char *)buf); + xmlSetProp (node, (const guchar *)"item_id", (guchar *)buf); sprintf (buf, "%d", searchscope); - xmlSetProp (node, (const unsigned char *)"searchscope", (unsigned char *)buf); + xmlSetProp (node, (const guchar *)"searchscope", (guchar *)buf); sprintf (buf, "%d", view_id); - xmlSetProp (node, (const unsigned char *)"view_id", (unsigned char *)buf); + xmlSetProp (node, (const guchar *)"view_id", (guchar *)buf); xmlAddChild (node, filter_rule_xml_encode (efb->current_query)); } else { /* simple query, save the searchbar state */ text = e_search_bar_get_text ((ESearchBar *) efb); - node = xmlNewChild (root, NULL, (const unsigned char *)"search-bar", NULL); - xmlSetProp (node, (const unsigned char *)"text", (unsigned char *)(text ? text : "")); + node = xmlNewChild (root, NULL, (const guchar *)"search-bar", NULL); + xmlSetProp (node, (const guchar *)"text", (guchar *)(text ? text : "")); sprintf (buf, "%d", item_id); - xmlSetProp (node, (const unsigned char *)"item_id", (unsigned char *)buf); + xmlSetProp (node, (const guchar *)"item_id", (guchar *)buf); sprintf (buf, "%d", searchscope); - xmlSetProp (node, (const unsigned char *)"searchscope", (unsigned char *)buf); + xmlSetProp (node, (const guchar *)"searchscope", (guchar *)buf); sprintf (buf, "%d", view_id); - xmlSetProp (node, (const unsigned char *)"view_id", (unsigned char *)buf); + xmlSetProp (node, (const guchar *)"view_id", (guchar *)buf); g_free (text); } @@ -648,7 +648,7 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp /* remap to glib memory */ text = g_malloc (n + 1); - memcpy (text, (char *)xmlbuf, n); + memcpy (text, (gchar *)xmlbuf, n); text[n] = '\0'; xmlFree (xmlbuf); @@ -662,12 +662,12 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp } static int -xml_get_prop_int (xmlNodePtr node, const char *prop) +xml_get_prop_int (xmlNodePtr node, const gchar *prop) { - char *buf; - int ret; + gchar *buf; + gint ret; - if ((buf = (char *)xmlGetProp (node, (unsigned char *)prop))) { + if ((buf = (gchar *)xmlGetProp (node, (guchar *)prop))) { ret = strtol (buf, NULL, 10); xmlFree (buf); } else { @@ -683,26 +683,26 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe EFilterBar *efb = (EFilterBar *) object; ESearchBar *esb = E_SEARCH_BAR (object); xmlNodePtr root, node; - const char *state; + const gchar *state; xmlDocPtr doc; gboolean rule_set = FALSE, is_cur_folder=FALSE; - int view_id, scope, item_id; + gint view_id, scope, item_id; switch (property_id) { case PROP_STATE: if ((state = g_value_get_string (value))) { - if (!(doc = xmlParseDoc ((unsigned char *) state))) + if (!(doc = xmlParseDoc ((guchar *) state))) return; root = doc->children; - if (strcmp ((char *)root->name, "state") != 0) { + if (strcmp ((gchar *)root->name, "state") != 0) { xmlFreeDoc (doc); return; } node = root->children; while (node != NULL) { - if (!strcmp ((char *)node->name, "filter-bar")) { + if (!strcmp ((gchar *)node->name, "filter-bar")) { FilterRule *rule = NULL; @@ -745,7 +745,7 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe esb->block_search = FALSE; efb->current_query = (FilterRule *)efb->option_rules->pdata[item_id - efb->option_base]; if (efb->config && efb->current_query) { - char *query = e_search_bar_get_text (esb); + gchar *query = e_search_bar_get_text (esb); efb->config (efb, efb->current_query, item_id, query, efb->config_data); g_free (query); @@ -758,9 +758,9 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe efb->setquery = FALSE; break; - } else if (!strcmp ((char *)node->name, "search-bar")) { - int subitem_id, item_id, scope, view_id; - char *text; + } else if (!strcmp ((gchar *)node->name, "search-bar")) { + gint subitem_id, item_id, scope, view_id; + gchar *text; GtkStyle *style = gtk_widget_get_default_style (); /* set the text first (it doesn't emit a signal) */ @@ -781,7 +781,7 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe scope = xml_get_prop_int (node, "searchscope"); e_search_bar_set_search_scope (E_SEARCH_BAR (efb), scope); - text = (char *)xmlGetProp (node, (const unsigned char *)"text"); + text = (gchar *)xmlGetProp (node, (const guchar *)"text"); e_search_bar_set_text (E_SEARCH_BAR (efb), text); if (text && *text) { efb->current_query = (FilterRule *)efb->option_rules->pdata[item_id - efb->option_base]; @@ -833,7 +833,7 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe static void clear_rules(EFilterBar *efb, GPtrArray *rules) { - int i; + gint i; FilterRule *rule; /* clear out any data on old rules */ @@ -952,10 +952,10 @@ init (EFilterBar *efb) EFilterBar * e_filter_bar_new (RuleContext *context, - const char *systemrules, - const char *userrules, + const gchar *systemrules, + const gchar *userrules, EFilterBarConfigRule config, - void *data) + gpointer data) { EFilterBar *bar; @@ -969,10 +969,10 @@ e_filter_bar_new (RuleContext *context, EFilterBar * e_filter_bar_lite_new (RuleContext *context, - const char *systemrules, - const char *userrules, + const gchar *systemrules, + const gchar *userrules, EFilterBarConfigRule config, - void *data) + gpointer data) { EFilterBar *bar; @@ -985,10 +985,10 @@ e_filter_bar_lite_new (RuleContext *context, void e_filter_bar_new_construct (RuleContext *context, - const char *systemrules, - const char *userrules, + const gchar *systemrules, + const gchar *userrules, EFilterBarConfigRule config, - void *data ,EFilterBar *bar ) + gpointer data ,EFilterBar *bar ) { ESearchBarItem item = { NULL, -1, 0 }; diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index 8f06c867ae..d5381319c9 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -56,11 +56,11 @@ extern "C" { typedef struct _EFilterBar EFilterBar; typedef struct _EFilterBarClass EFilterBarClass; -typedef void (*EFilterBarConfigRule)(EFilterBar *, FilterRule *rule, int id, const char *query, void *data); +typedef void (*EFilterBarConfigRule)(EFilterBar *, FilterRule *rule, gint id, const gchar *query, gpointer data); struct _EFilterBar { ESearchBar parent; - int menu_base, option_base; + gint menu_base, option_base; GPtrArray *menu_rules, *option_rules; ESearchBarItem *default_items; @@ -68,14 +68,14 @@ struct _EFilterBar { GtkWidget *save_dialog; /* current save dialogue (so we dont pop up multiple ones) */ FilterRule *current_query; /* as it says */ - int setquery; /* true when we're setting a query directly to advanced, so dont popup the dialog */ + gint setquery; /* true when we're setting a query directly to advanced, so dont popup the dialog */ RuleContext *context; - char *systemrules; - char *userrules; + gchar *systemrules; + gchar *userrules; EFilterBarConfigRule config; - void *config_data; + gpointer config_data; CamelVeeFolder *all_account_search_vf; CamelVeeFolder *account_search_vf; @@ -109,7 +109,7 @@ enum { #define E_FILTERBAR_SEPARATOR { NULL, 0, 0 } #ifdef JUST_FOR_TRANSLATORS -const char * strings[] = { +const gchar * strings[] = { N_("_Save Search..."), N_("_Edit Saved Searches..."), N_("_Advanced Search...") @@ -120,22 +120,22 @@ const char * strings[] = { GType e_filter_bar_get_type (void); EFilterBar *e_filter_bar_new (RuleContext *context, - const char *systemrules, - const char *userrules, + const gchar *systemrules, + const gchar *userrules, EFilterBarConfigRule config, - void *data); + gpointer data); EFilterBar *e_filter_bar_lite_new (RuleContext *context, - const char *systemrules, - const char *userrules, + const gchar *systemrules, + const gchar *userrules, EFilterBarConfigRule config, - void *data); + gpointer data); void e_filter_bar_new_construct (RuleContext *context, - const char *systemrules, - const char *userrules, + const gchar *systemrules, + const gchar *userrules, EFilterBarConfigRule config, - void *data ,EFilterBar *bar ); + gpointer data ,EFilterBar *bar ); #ifdef __cplusplus } diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c index 6acbe920ef..9110e14257 100644 --- a/widgets/misc/e-gui-utils.c +++ b/widgets/misc/e-gui-utils.c @@ -172,7 +172,7 @@ e_container_change_tab_order(GtkContainer *container, GList *widgets) struct widgetandint { GtkWidget *widget; - int count; + gint count; }; static void @@ -191,7 +191,7 @@ nth_entry_callback(GtkWidget *widget, struct widgetandint *data) } void -e_container_focus_nth_entry(GtkContainer *container, int n) +e_container_focus_nth_entry(GtkContainer *container, gint n) { struct widgetandint data; data.widget = NULL; @@ -202,7 +202,7 @@ e_container_focus_nth_entry(GtkContainer *container, int n) } gboolean -e_glade_xml_connect_widget (GladeXML *gui, char *name, char *signal, GCallback cb, gpointer closure) +e_glade_xml_connect_widget (GladeXML *gui, gchar *name, gchar *signal, GCallback cb, gpointer closure) { GtkWidget *widget; @@ -218,7 +218,7 @@ e_glade_xml_connect_widget (GladeXML *gui, char *name, char *signal, GCallback c } gboolean -e_glade_xml_set_sensitive (GladeXML *gui, char *name, gboolean sensitive) +e_glade_xml_set_sensitive (GladeXML *gui, gchar *name, gboolean sensitive) { GtkWidget *widget; diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h index 840a55289b..b66160c2d1 100644 --- a/widgets/misc/e-gui-utils.h +++ b/widgets/misc/e-gui-utils.h @@ -36,18 +36,18 @@ void e_container_foreach_leaf (GtkContainer *container, GtkCallback callback, gpointer closure); void e_container_focus_nth_entry (GtkContainer *container, - int n); + gint n); gint e_container_change_tab_order (GtkContainer *container, GList *widgets); /* Returns TRUE on success. */ gboolean e_glade_xml_connect_widget (GladeXML *gui, - char *name, - char *signal, + gchar *name, + gchar *signal, GCallback cb, gpointer closure); gboolean e_glade_xml_set_sensitive (GladeXML *gui, - char *name, + gchar *name, gboolean sensitive); G_END_DECLS diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c index 7f0dbaaaee..0fb4540161 100644 --- a/widgets/misc/e-icon-entry.c +++ b/widgets/misc/e-icon-entry.c @@ -60,10 +60,10 @@ entry_focus_change_cb (GtkWidget *widget, static void e_icon_entry_get_borders (GtkWidget *widget, GtkWidget *entry, - int *xborder, - int *yborder) + gint *xborder, + gint *yborder) { - int focus_width; + gint focus_width; gboolean interior_focus; g_return_if_fail (entry->style != NULL); @@ -89,7 +89,7 @@ e_icon_entry_paint (GtkWidget *widget, { EIconEntry *entry = E_ICON_ENTRY (widget); GtkWidget *entry_widget = entry->entry; - int x = 0, y = 0, width, height, focus_width; + gint x = 0, y = 0, width, height, focus_width; gboolean interior_focus; gtk_widget_style_get (entry_widget, @@ -201,7 +201,7 @@ e_icon_entry_size_request (GtkWidget *widget, EIconEntry *entry = E_ICON_ENTRY (widget); GtkContainer *container = GTK_CONTAINER (widget); GtkBin *bin = GTK_BIN (widget); - int xborder, yborder; + gint xborder, yborder; requisition->width = requisition->height = container->border_width * 2; @@ -229,7 +229,7 @@ e_icon_entry_size_allocate (GtkWidget *widget, GtkContainer *container = GTK_CONTAINER (widget); GtkBin *bin = GTK_BIN (widget); GtkAllocation child_allocation; - int xborder, yborder; + gint xborder, yborder; widget->allocation = *allocation; @@ -357,7 +357,7 @@ set_cursor (GtkWidget *widget, GdkEventCrossing *event, gpointer dummy) } GtkWidget * -e_icon_entry_create_button (const char *stock) +e_icon_entry_create_button (const gchar *stock) { GtkWidget *eventbox; GtkWidget *image; diff --git a/widgets/misc/e-icon-entry.h b/widgets/misc/e-icon-entry.h index 894cb16c4f..f8e4740d36 100644 --- a/widgets/misc/e-icon-entry.h +++ b/widgets/misc/e-icon-entry.h @@ -78,7 +78,7 @@ void e_icon_entry_pack_widget (EIconEntry *entry, GtkWidget *e_icon_entry_get_entry (EIconEntry *entry); -GtkWidget *e_icon_entry_create_button (const char *stock); +GtkWidget *e_icon_entry_create_button (const gchar *stock); G_END_DECLS diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index d3b5a1ac07..e11439eb26 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -37,10 +37,10 @@ struct _EImageChooserPrivate { GtkWidget *image; GtkWidget *browse_button; - char *image_buf; - int image_buf_size; - int image_width; - int image_height; + gchar *image_buf; + gint image_buf_size; + gint image_width; + gint image_height; gboolean editable; }; @@ -87,7 +87,7 @@ enum DndTargetType { static GtkTargetEntry image_drag_types[] = { { (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]); +static const gint num_image_drag_types = sizeof (image_drag_types) / sizeof (image_drag_types[0]); GtkWidget * e_image_chooser_new (void) @@ -222,13 +222,13 @@ e_image_chooser_dispose (GObject *object) static gboolean set_image_from_data (EImageChooser *chooser, - char *data, int length) + gchar *data, gint length) { gboolean rv = FALSE; GdkPixbufLoader *loader = gdk_pixbuf_loader_new (); GdkPixbuf *pixbuf; - gdk_pixbuf_loader_write (loader, (unsigned char *)data, length, NULL); + gdk_pixbuf_loader_write (loader, (guchar *)data, length, NULL); gdk_pixbuf_loader_close (loader, NULL); pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); @@ -242,7 +242,7 @@ set_image_from_data (EImageChooser *chooser, GdkPixbuf *composite; float scale; - int new_height, new_width; + gint new_height, new_width; new_height = gdk_pixbuf_get_height (pixbuf); new_width = gdk_pixbuf_get_width (pixbuf); @@ -331,7 +331,7 @@ image_drag_motion_cb (GtkWidget *widget, return FALSE; for (p = context->targets; p != NULL; p = p->next) { - char *possible_type; + gchar *possible_type; possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data)); if (!strcmp (possible_type, URI_LIST_TYPE)) { @@ -372,7 +372,7 @@ image_drag_drop_cb (GtkWidget *widget, } for (p = context->targets; p != NULL; p = p->next) { - char *possible_type; + gchar *possible_type; possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data)); if (!strcmp (possible_type, URI_LIST_TYPE)) { @@ -398,22 +398,22 @@ image_drag_data_received_cb (GtkWidget *widget, GtkSelectionData *selection_data, guint info, guint time, EImageChooser *chooser) { - char *target_type; + gchar *target_type; gboolean handled = FALSE; target_type = gdk_atom_name (selection_data->target); if (!strcmp (target_type, URI_LIST_TYPE)) { GError *error = NULL; - char *uri; - char *nl = strstr ((char *)selection_data->data, "\r\n"); - char *buf = NULL; + gchar *uri; + gchar *nl = strstr ((gchar *)selection_data->data, "\r\n"); + gchar *buf = NULL; gsize read = 0; if (nl) - uri = g_strndup ((char *)selection_data->data, nl - (char*)selection_data->data); + uri = g_strndup ((gchar *)selection_data->data, nl - (gchar *)selection_data->data); else - uri = g_strdup ((char *)selection_data->data); + uri = g_strdup ((gchar *)selection_data->data); if (e_util_read_file (uri, TRUE, &buf, &read, &error) && read > 0 && buf) { if (set_image_from_data (chooser, buf, read)) { @@ -436,7 +436,7 @@ image_drag_data_received_cb (GtkWidget *widget, gboolean -e_image_chooser_set_from_file (EImageChooser *chooser, const char *filename) +e_image_chooser_set_from_file (EImageChooser *chooser, const gchar *filename) { gchar *data; gsize data_length; @@ -465,7 +465,7 @@ e_image_chooser_set_editable (EImageChooser *chooser, gboolean editable) } gboolean -e_image_chooser_get_image_data (EImageChooser *chooser, char **data, gsize *data_length) +e_image_chooser_get_image_data (EImageChooser *chooser, gchar **data, gsize *data_length) { g_return_val_if_fail (E_IS_IMAGE_CHOOSER (chooser), FALSE); g_return_val_if_fail (data != NULL, FALSE); @@ -479,9 +479,9 @@ e_image_chooser_get_image_data (EImageChooser *chooser, char **data, gsize *data } gboolean -e_image_chooser_set_image_data (EImageChooser *chooser, char *data, gsize data_length) +e_image_chooser_set_image_data (EImageChooser *chooser, gchar *data, gsize data_length) { - char *buf; + gchar *buf; g_return_val_if_fail (E_IS_IMAGE_CHOOSER (chooser), FALSE); g_return_val_if_fail (data != NULL, FALSE); diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h index b7f599f0c1..a3972bd26d 100644 --- a/widgets/misc/e-image-chooser.h +++ b/widgets/misc/e-image-chooser.h @@ -58,10 +58,10 @@ struct _EImageChooserClass GtkWidget *e_image_chooser_new (void); GType e_image_chooser_get_type (void); -gboolean e_image_chooser_set_from_file (EImageChooser *chooser, const char *filename); -gboolean e_image_chooser_set_image_data (EImageChooser *chooser, char *data, gsize data_length); +gboolean e_image_chooser_set_from_file (EImageChooser *chooser, const gchar *filename); +gboolean e_image_chooser_set_image_data (EImageChooser *chooser, gchar *data, gsize data_length); void e_image_chooser_set_editable (EImageChooser *chooser, gboolean editable); -gboolean e_image_chooser_get_image_data (EImageChooser *chooser, char **data, gsize *data_length); +gboolean e_image_chooser_get_image_data (EImageChooser *chooser, gchar **data, gsize *data_length); #endif /* _E_IMAGE_CHOOSER_H_ */ diff --git a/widgets/misc/e-info-label.c b/widgets/misc/e-info-label.c index e6db111a74..4e158d4117 100644 --- a/widgets/misc/e-info-label.c +++ b/widgets/misc/e-info-label.c @@ -54,7 +54,7 @@ el_destroy (GtkObject *o) static int el_expose_event(GtkWidget *w, GdkEventExpose *event) { - int x = ((GtkContainer *)w)->border_width; + gint x = ((GtkContainer *)w)->border_width; /* This seems a hack to me, but playing with styles wouldn't affect the background */ gtk_paint_flat_box(w->style, w->window, @@ -71,7 +71,7 @@ get_text_full_width (GtkWidget *label) { PangoLayout *layout; PangoRectangle rect; - int width; + gint width; g_return_val_if_fail (GTK_IS_LABEL (label), 0); @@ -93,7 +93,7 @@ el_size_allocate (GtkWidget *widget, GtkAllocation *pallocation) { EInfoLabel *el; GtkAllocation allocation; - int full_loc, full_nfo; + gint full_loc, full_nfo; gint diff; /* let calculate parent class first, and then just make it not divide evenly */ @@ -179,7 +179,7 @@ e_info_label_get_type(void) * Return value: **/ GtkWidget * -e_info_label_new(const char *icon) +e_info_label_new(const gchar *icon) { EInfoLabel *el = g_object_new(e_info_label_get_type(), NULL); GtkWidget *image; @@ -207,7 +207,7 @@ e_info_label_new(const char *icon) * @info is some info about this location. **/ void -e_info_label_set_info(EInfoLabel *el, const char *location, const char *info) +e_info_label_set_info(EInfoLabel *el, const gchar *location, const gchar *info) { gchar *markup; diff --git a/widgets/misc/e-info-label.h b/widgets/misc/e-info-label.h index d4dd16e395..1541fb8f10 100644 --- a/widgets/misc/e-info-label.h +++ b/widgets/misc/e-info-label.h @@ -49,8 +49,8 @@ struct _EInfoLabelClass { GType e_info_label_get_type(void); -GtkWidget *e_info_label_new(const char *icon); -void e_info_label_set_info(EInfoLabel *, const char *loc, const char *info); +GtkWidget *e_info_label_new(const gchar *icon); +void e_info_label_set_info(EInfoLabel *, const gchar *loc, const gchar *info); #ifdef __cplusplus } diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index c2c0806178..c44e75886b 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -71,7 +71,7 @@ typedef struct GtkAdjustment *vadj; /* Current scrolling offsets */ - int xofs, yofs; + gint xofs, yofs; /* Realtime zoom data */ EMapZoomState zoom_state; @@ -104,9 +104,9 @@ static void e_map_set_scroll_adjustments (GtkWidget *widget, GtkAdjustment *hadj static void update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays); static void set_scroll_area (EMap *view); static void request_paint_area (EMap *view, GdkRectangle *area); -static void center_at (EMap *map, int x, int y, gboolean scroll); -static void smooth_center_at (EMap *map, int x, int y); -static void scroll_to (EMap *view, int x, int y); +static void center_at (EMap *map, gint x, gint y, gboolean scroll); +static void smooth_center_at (EMap *map, gint x, gint y); +static void scroll_to (EMap *view, gint x, gint y); static void zoom_do (EMap *map); static gint load_map_background (EMap *view, gchar *name); static void adjustment_changed_cb (GtkAdjustment *adj, gpointer data); @@ -207,7 +207,7 @@ static void e_map_init (EMap *view) { EMapPrivate *priv; - char *map_file_name = g_build_filename (EVOLUTION_IMAGES, "world_map-960.png", NULL); + gchar *map_file_name = g_build_filename (EVOLUTION_IMAGES, "world_map-960.png", NULL); priv = g_new0 (EMapPrivate, 1); view->priv = priv; @@ -305,7 +305,7 @@ static void e_map_realize (GtkWidget *widget) { GdkWindowAttr attr; - int attr_mask; + gint attr_mask; g_return_if_fail (widget != NULL); g_return_if_fail (IS_E_MAP (widget)); @@ -538,7 +538,7 @@ e_map_key_press (GtkWidget *widget, GdkEventKey *event) EMap *view; EMapPrivate *priv; gboolean do_scroll; - int xofs, yofs; + gint xofs, yofs; view = E_MAP (widget); priv = view->priv; @@ -578,7 +578,7 @@ e_map_key_press (GtkWidget *widget, GdkEventKey *event) if (do_scroll) { - int x, y; + gint x, y; x = CLAMP (priv->xofs + xofs, 0, priv->hadj->upper - priv->hadj->page_size); y = CLAMP (priv->yofs + yofs, 0, priv->vadj->upper - priv->vadj->page_size); @@ -644,7 +644,7 @@ void e_map_window_to_world (EMap *map, double win_x, double win_y, double *world_longitude, double *world_latitude) { EMapPrivate *priv; - int width, height; + gint width, height; g_return_if_fail (map); @@ -665,7 +665,7 @@ void e_map_world_to_window (EMap *map, double world_longitude, double world_latitude, double *win_x, double *win_y) { EMapPrivate *priv; - int width, height; + gint width, height; g_return_if_fail (map); @@ -895,7 +895,7 @@ e_map_get_closest_point (EMap *map, double longitude, double latitude, gboolean EMapPoint *point_chosen = NULL, *point; double min_dist = 0.0, dist; double dx, dy; - int i; + gint i; priv = map->priv; @@ -971,9 +971,9 @@ update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays) { EMapPrivate *priv; EMapPoint *point; - int width, height, orig_width, orig_height; + gint width, height, orig_width, orig_height; double zoom; - int i; + gint i; if (!GTK_WIDGET_REALIZED (GTK_WIDGET (map))) return; @@ -1039,7 +1039,7 @@ static void request_paint_area (EMap *view, GdkRectangle *area) { EMapPrivate *priv; - int width, height; + gint width, height; if (!GTK_WIDGET_DRAWABLE (GTK_WIDGET (view)) || !GTK_WIDGET_REALIZED (GTK_WIDGET (view))) return; @@ -1065,7 +1065,7 @@ request_paint_area (EMap *view, GdkRectangle *area) gdk_pixbuf_get_bits_per_sample (priv->map_render_pixbuf) == 8) { guchar *pixels; - int rowstride; + gint rowstride; rowstride = gdk_pixbuf_get_rowstride (priv->map_render_pixbuf); pixels = gdk_pixbuf_get_pixels (priv->map_render_pixbuf) + (area->y + priv->yofs) * rowstride + 3 * (area->x + priv->xofs); @@ -1162,10 +1162,10 @@ repaint_point (EMap *map, EMapPoint *point) static void -center_at (EMap *map, int x, int y, gboolean scroll) +center_at (EMap *map, gint x, gint y, gboolean scroll) { EMapPrivate *priv; - int pb_width, pb_height, + gint pb_width, pb_height, view_width, view_height; priv = map->priv; @@ -1189,12 +1189,12 @@ center_at (EMap *map, int x, int y, gboolean scroll) static void -smooth_center_at (EMap *map, int x, int y) +smooth_center_at (EMap *map, gint x, gint y) { EMapPrivate *priv; - int pb_width, pb_height, + gint pb_width, pb_height, view_width, view_height; - int dx, dy; + gint dx, dy; priv = map->priv; @@ -1222,15 +1222,15 @@ smooth_center_at (EMap *map, int x, int y) /* Scrolls the view to the specified offsets. Does not perform range checking! */ static void -scroll_to (EMap *view, int x, int y) +scroll_to (EMap *view, gint x, gint y) { EMapPrivate *priv; - int xofs, yofs; + gint xofs, yofs; GdkWindow *window; GdkGC *gc; - int width, height; - int src_x, src_y; - int dest_x, dest_y; + gint width, height; + gint src_x, src_y; + gint dest_x, dest_y; GdkEvent *event; priv = view->priv; @@ -1322,7 +1322,7 @@ scroll_to (EMap *view, int x, int y) } -static int divide_seq[] = +static gint divide_seq[] = { /* Dividends for divisor of 2 */ @@ -1417,7 +1417,7 @@ blowup_window_area (GdkWindow *window, gint area_x, gint area_y, gint target_x, gint divide_width_index, divide_height_index; gint area_width, area_height; gint i, j; - int line; + gint line; /* Set up the GC we'll be using */ @@ -1548,7 +1548,7 @@ zoom_in_smooth (EMap *map) GdkRectangle area; EMapPrivate *priv; GdkWindow *window; - int width, height; + gint width, height; double x, y; g_return_if_fail (map); diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index f78f764f03..9b193565d4 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -43,8 +43,8 @@ struct _EMultiConfigDialogPrivate { GtkWidget *notebook; - int set_page_timeout_id; - int set_page_timeout_page; + gint set_page_timeout_id; + gint set_page_timeout_page; }; G_DEFINE_TYPE (EMultiConfigDialog, e_multi_config_dialog, GTK_TYPE_DIALOG) @@ -76,7 +76,7 @@ static const gchar *list_e_table_spec = /* Page handling. */ static GtkWidget * -create_page_container (const char *description, +create_page_container (const gchar *description, GtkWidget *widget) { GtkWidget *vbox; @@ -95,7 +95,7 @@ create_page_container (const char *description, keyboard). */ static int -set_page_timeout_callback (void *data) +set_page_timeout_callback (gpointer data) { EMultiConfigDialog *multi_config_dialog; EMultiConfigDialogPrivate *priv; @@ -125,8 +125,8 @@ do_close (EMultiConfigDialog *dialog) static void table_cursor_change_callback (ETable *etable, - int row, - void *data) + gint row, + gpointer data) { EMultiConfigDialog *dialog; EMultiConfigDialogPrivate *priv; @@ -168,7 +168,7 @@ impl_finalize (GObject *object) /* GtkDialog methods. */ static void -impl_response (GtkDialog *dialog, int response_id) +impl_response (GtkDialog *dialog, gint response_id) { EMultiConfigDialog *multi_config_dialog; @@ -315,8 +315,8 @@ e_multi_config_dialog_new (void) void e_multi_config_dialog_add_page (EMultiConfigDialog *dialog, - const char *title, - const char *description, + const gchar *title, + const gchar *description, GdkPixbuf *icon, EConfigPage *page_widget) { @@ -359,7 +359,7 @@ e_multi_config_dialog_add_page (EMultiConfigDialog *dialog, } void -e_multi_config_dialog_show_page (EMultiConfigDialog *dialog, int page) +e_multi_config_dialog_show_page (EMultiConfigDialog *dialog, gint page) { EMultiConfigDialogPrivate *priv; diff --git a/widgets/misc/e-multi-config-dialog.h b/widgets/misc/e-multi-config-dialog.h index e8d9896d55..88a538bb1f 100644 --- a/widgets/misc/e-multi-config-dialog.h +++ b/widgets/misc/e-multi-config-dialog.h @@ -62,12 +62,12 @@ GType e_multi_config_dialog_get_type (void); GtkWidget *e_multi_config_dialog_new (void); void e_multi_config_dialog_add_page (EMultiConfigDialog *dialog, - const char *title, - const char *description, + const gchar *title, + const gchar *description, GdkPixbuf *icon, EConfigPage *page); void e_multi_config_dialog_show_page (EMultiConfigDialog *dialog, - int page); + gint page); #ifdef __cplusplus } diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c index 143eaff327..20b570df24 100644 --- a/widgets/misc/e-popup-menu.c +++ b/widgets/misc/e-popup-menu.c @@ -37,7 +37,7 @@ * Creates an item with an optional icon */ static void -make_item (GtkMenu *menu, GtkMenuItem *item, const char *name, GtkWidget *pixmap) +make_item (GtkMenu *menu, GtkMenuItem *item, const gchar *name, GtkWidget *pixmap) { GtkWidget *label; @@ -63,7 +63,7 @@ GtkMenu * e_popup_menu_create (EPopupMenu *menu_list, guint32 disable_mask, guint32 hide_mask, - void *default_closure) + gpointer default_closure) { return e_popup_menu_create_with_domain (menu_list, disable_mask, @@ -77,14 +77,14 @@ GtkMenu * e_popup_menu_create_with_domain (EPopupMenu *menu_list, guint32 disable_mask, guint32 hide_mask, - void *default_closure, - const char *domain) + gpointer default_closure, + const gchar *domain) { GtkMenu *menu = GTK_MENU (gtk_menu_new ()); GSList *group = NULL; gboolean last_item_separator = TRUE; - int last_non_separator = -1; - int i; + gint last_non_separator = -1; + gint i; for (i = 0; menu_list[i].name; i++) { if (strcmp ("", menu_list[i].name) && !(menu_list [i].disable_mask & hide_mask)) { @@ -147,7 +147,7 @@ e_popup_menu_create_with_domain (EPopupMenu *menu_list, } void -e_popup_menu_run (EPopupMenu *menu_list, GdkEvent *event, guint32 disable_mask, guint32 hide_mask, void *default_closure) +e_popup_menu_run (EPopupMenu *menu_list, GdkEvent *event, guint32 disable_mask, guint32 hide_mask, gpointer default_closure) { GtkMenu *menu; @@ -195,7 +195,7 @@ e_popup_menu_free_1 (EPopupMenu *menu_item) EPopupMenu * e_popup_menu_copy (const EPopupMenu *menu_list) { - int i; + gint i; EPopupMenu *ret_val; if (menu_list == NULL) @@ -220,7 +220,7 @@ e_popup_menu_copy (const EPopupMenu *menu_list) void e_popup_menu_free (EPopupMenu *menu_list) { - int i; + gint i; if (menu_list == NULL) return; diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h index ddf6ed04a9..75246ebda6 100644 --- a/widgets/misc/e-popup-menu.h +++ b/widgets/misc/e-popup-menu.h @@ -71,8 +71,8 @@ G_BEGIN_DECLS typedef struct _EPopupMenu EPopupMenu; struct _EPopupMenu { - char *name; - char *pixname; + gchar *name; + gchar *pixname; GCallback fn; EPopupMenu *submenu; @@ -80,7 +80,7 @@ struct _EPopupMenu { /* Added post 0.19 */ GtkWidget *pixmap_widget; - void *closure; + gpointer closure; guint is_toggle : 1; guint is_radio : 1; @@ -97,7 +97,7 @@ GtkMenu *e_popup_menu_create_with_domain (EPopupMenu *menu_list, guint32 disable_mask, guint32 hide_mask, void *default_closure, - const char *domain); + const gchar *domain); void e_popup_menu_run (EPopupMenu *menu_list, GdkEvent *event, guint32 disable_mask, diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c index d24b915e6e..2bf5e4990d 100644 --- a/widgets/misc/e-reflow-model.c +++ b/widgets/misc/e-reflow-model.c @@ -50,7 +50,7 @@ static guint e_reflow_model_signals [LAST_SIGNAL] = { 0, }; * @width: The new value for the width of each item. */ void -e_reflow_model_set_width (EReflowModel *e_reflow_model, int width) +e_reflow_model_set_width (EReflowModel *e_reflow_model, gint width) { g_return_if_fail (e_reflow_model != NULL); g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model)); @@ -64,7 +64,7 @@ e_reflow_model_set_width (EReflowModel *e_reflow_model, int width) * * Returns: the number of items in the reflow model. */ -int +gint e_reflow_model_count (EReflowModel *e_reflow_model) { g_return_val_if_fail (e_reflow_model != NULL, 0); @@ -81,8 +81,8 @@ e_reflow_model_count (EReflowModel *e_reflow_model) * * Returns: the height of the nth item. */ -int -e_reflow_model_height (EReflowModel *e_reflow_model, int n, GnomeCanvasGroup *parent) +gint +e_reflow_model_height (EReflowModel *e_reflow_model, gint n, GnomeCanvasGroup *parent) { g_return_val_if_fail (e_reflow_model != NULL, 0); g_return_val_if_fail (E_IS_REFLOW_MODEL (e_reflow_model), 0); @@ -101,7 +101,7 @@ e_reflow_model_height (EReflowModel *e_reflow_model, int n, GnomeCanvasGroup *pa * Returns: the new GnomeCanvasItem. */ GnomeCanvasItem * -e_reflow_model_incarnate (EReflowModel *e_reflow_model, int n, GnomeCanvasGroup *parent) +e_reflow_model_incarnate (EReflowModel *e_reflow_model, gint n, GnomeCanvasGroup *parent) { g_return_val_if_fail (e_reflow_model != NULL, NULL); g_return_val_if_fail (E_IS_REFLOW_MODEL (e_reflow_model), NULL); @@ -119,8 +119,8 @@ e_reflow_model_incarnate (EReflowModel *e_reflow_model, int n, GnomeCanvasGroup * * Returns: strcmp like semantics for the comparison value. */ -int -e_reflow_model_compare (EReflowModel *e_reflow_model, int n1, int n2) +gint +e_reflow_model_compare (EReflowModel *e_reflow_model, gint n1, gint n2) { #if 0 g_return_val_if_fail (e_reflow_model != NULL, 0); @@ -139,7 +139,7 @@ e_reflow_model_compare (EReflowModel *e_reflow_model, int n1, int n2) * Update item to represent the nth piece of data. */ void -e_reflow_model_reincarnate (EReflowModel *e_reflow_model, int n, GnomeCanvasItem *item) +e_reflow_model_reincarnate (EReflowModel *e_reflow_model, gint n, GnomeCanvasItem *item) { g_return_if_fail (e_reflow_model != NULL); g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model)); @@ -219,7 +219,7 @@ e_reflow_model_init (EReflowModel *e_reflow_model) static void print_tabs (void) { - int i; + gint i; for (i = 0; i < depth; i++) g_print("\t"); } @@ -284,7 +284,7 @@ e_reflow_model_comparison_changed (EReflowModel *e_reflow_model) * Use this function to notify any views of the reflow model that a number of items have been inserted. **/ void -e_reflow_model_items_inserted (EReflowModel *e_reflow_model, int position, int count) +e_reflow_model_items_inserted (EReflowModel *e_reflow_model, gint position, gint count) { g_return_if_fail (e_reflow_model != NULL); g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model)); @@ -308,7 +308,7 @@ e_reflow_model_items_inserted (EReflowModel *e_reflow_model, int position, int c **/ void e_reflow_model_item_removed (EReflowModel *e_reflow_model, - int n) + gint n) { g_return_if_fail (e_reflow_model != NULL); g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model)); @@ -335,7 +335,7 @@ e_reflow_model_item_removed (EReflowModel *e_reflow_model, * object */ void -e_reflow_model_item_changed (EReflowModel *e_reflow_model, int n) +e_reflow_model_item_changed (EReflowModel *e_reflow_model, gint n) { g_return_if_fail (e_reflow_model != NULL); g_return_if_fail (E_IS_REFLOW_MODEL (e_reflow_model)); diff --git a/widgets/misc/e-reflow-model.h b/widgets/misc/e-reflow-model.h index c772621d07..d606edf8cd 100644 --- a/widgets/misc/e-reflow-model.h +++ b/widgets/misc/e-reflow-model.h @@ -48,13 +48,13 @@ typedef struct { /* * Virtual methods */ - void (*set_width) (EReflowModel *etm, int width); + void (*set_width) (EReflowModel *etm, gint width); - int (*count) (EReflowModel *etm); - int (*height) (EReflowModel *etm, int n, GnomeCanvasGroup *parent); - GnomeCanvasItem *(*incarnate) (EReflowModel *etm, int n, GnomeCanvasGroup *parent); - int (*compare) (EReflowModel *etm, int n1, int n2); - void (*reincarnate) (EReflowModel *etm, int n, GnomeCanvasItem *item); + gint (*count) (EReflowModel *etm); + gint (*height) (EReflowModel *etm, gint n, GnomeCanvasGroup *parent); + GnomeCanvasItem *(*incarnate) (EReflowModel *etm, gint n, GnomeCanvasGroup *parent); + gint (*compare) (EReflowModel *etm, gint n1, gint n2); + void (*reincarnate) (EReflowModel *etm, gint n, GnomeCanvasItem *item); /* * Signals @@ -68,28 +68,28 @@ typedef struct { */ void (*model_changed) (EReflowModel *etm); void (*comparison_changed) (EReflowModel *etm); - void (*model_items_inserted) (EReflowModel *etm, int position, int count); - void (*model_item_removed) (EReflowModel *etm, int position); - void (*model_item_changed) (EReflowModel *etm, int n); + void (*model_items_inserted) (EReflowModel *etm, gint position, gint count); + void (*model_item_removed) (EReflowModel *etm, gint position); + void (*model_item_changed) (EReflowModel *etm, gint n); } EReflowModelClass; GType e_reflow_model_get_type (void); /**/ void e_reflow_model_set_width (EReflowModel *e_reflow_model, - int width); -int e_reflow_model_count (EReflowModel *e_reflow_model); -int e_reflow_model_height (EReflowModel *e_reflow_model, - int n, + gint width); +gint e_reflow_model_count (EReflowModel *e_reflow_model); +gint e_reflow_model_height (EReflowModel *e_reflow_model, + gint n, GnomeCanvasGroup *parent); GnomeCanvasItem *e_reflow_model_incarnate (EReflowModel *e_reflow_model, - int n, + gint n, GnomeCanvasGroup *parent); -int e_reflow_model_compare (EReflowModel *e_reflow_model, - int n1, - int n2); +gint e_reflow_model_compare (EReflowModel *e_reflow_model, + gint n1, + gint n2); void e_reflow_model_reincarnate (EReflowModel *e_reflow_model, - int n, + gint n, GnomeCanvasItem *item); /* @@ -98,12 +98,12 @@ void e_reflow_model_reincarnate (EReflowModel *e_reflow_mode void e_reflow_model_changed (EReflowModel *e_reflow_model); void e_reflow_model_comparison_changed (EReflowModel *e_reflow_model); void e_reflow_model_items_inserted (EReflowModel *e_reflow_model, - int position, - int count); + gint position, + gint count); void e_reflow_model_item_removed (EReflowModel *e_reflow_model, - int n); + gint n); void e_reflow_model_item_changed (EReflowModel *e_reflow_model, - int n); + gint n); #ifdef __cplusplus } diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index 129046a89e..0465c38792 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -41,10 +41,10 @@ static gboolean e_reflow_event (GnomeCanvasItem *item, GdkEvent *event); static void e_reflow_realize (GnomeCanvasItem *item); static void e_reflow_unrealize (GnomeCanvasItem *item); static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, - int x, int y, int width, int height); + gint x, gint y, gint width, gint height); static void e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gint flags); -static double e_reflow_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item); -static void e_reflow_reflow (GnomeCanvasItem *item, int flags); +static double e_reflow_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy, GnomeCanvasItem **actual_item); +static void e_reflow_reflow (GnomeCanvasItem *item, gint flags); static void set_empty(EReflow *reflow); static void e_reflow_resize_children (GnomeCanvasItem *item); @@ -75,7 +75,7 @@ enum { static guint signals [LAST_SIGNAL] = {0, }; static gint -er_compare (int i1, int i2, gpointer user_data) +er_compare (gint i1, gint i2, gpointer user_data) { EReflow *reflow = user_data; return e_reflow_model_compare (reflow->model, i1, i2); @@ -92,7 +92,7 @@ e_reflow_pick_line (EReflow *reflow, double x) static int er_find_item (EReflow *reflow, GnomeCanvasItem *item) { - int i; + gint i; for (i = 0; i < reflow->count; i++) { if (reflow->items[i] == item) return i; @@ -104,8 +104,8 @@ static void e_reflow_resize_children (GnomeCanvasItem *item) { EReflow *reflow; - int i; - int count; + gint i; + gint count; reflow = E_REFLOW (item); @@ -119,7 +119,7 @@ e_reflow_resize_children (GnomeCanvasItem *item) } static inline void -e_reflow_update_selection_row (EReflow *reflow, int row) +e_reflow_update_selection_row (EReflow *reflow, gint row) { if (reflow->items[row]) { g_object_set(reflow->items[row], @@ -137,8 +137,8 @@ e_reflow_update_selection_row (EReflow *reflow, int row) static void e_reflow_update_selection (EReflow *reflow) { - int i; - int count; + gint i; + gint count; count = reflow->count; for (i = 0; i < count; i++) { @@ -153,7 +153,7 @@ selection_changed (ESelectionModel *selection, EReflow *reflow) } static void -selection_row_changed (ESelectionModel *selection, int row, EReflow *reflow) +selection_row_changed (ESelectionModel *selection, gint row, EReflow *reflow) { e_reflow_update_selection_row (reflow, row); } @@ -161,7 +161,7 @@ selection_row_changed (ESelectionModel *selection, int row, EReflow *reflow) static gboolean do_adjustment (gpointer user_data) { - int row; + gint row; GtkAdjustment *adj ; gfloat value, min_value, max_value; EReflow *reflow = user_data; @@ -195,10 +195,10 @@ do_adjustment (gpointer user_data) } static void -cursor_changed (ESelectionModel *selection, int row, int col, EReflow *reflow) +cursor_changed (ESelectionModel *selection, gint row, gint col, EReflow *reflow) { - int count = reflow->count; - int old_cursor = reflow->cursor_row; + gint count = reflow->count; + gint old_cursor = reflow->cursor_row; if (old_cursor < count && old_cursor >= 0) { if (reflow->items[old_cursor]) { @@ -233,12 +233,12 @@ cursor_changed (ESelectionModel *selection, int row, int col, EReflow *reflow) static void incarnate (EReflow *reflow) { - int column_width; - int first_column; - int last_column; - int first_cell; - int last_cell; - int i; + gint column_width; + gint first_column; + gint last_column; + gint first_cell; + gint last_cell; + gint i; GtkAdjustment *adjustment = gtk_layout_get_hadjustment (GTK_LAYOUT (GNOME_CANVAS_ITEM (reflow)->canvas)); column_width = reflow->column_width; @@ -261,7 +261,7 @@ incarnate (EReflow *reflow) last_cell = reflow->count; for (i = first_cell; i < last_cell; i++) { - int unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i); + gint unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i); if (reflow->items[unsorted] == NULL) { if (reflow->model) { reflow->items[unsorted] = e_reflow_model_incarnate (reflow->model, unsorted, GNOME_CANVAS_GROUP (reflow)); @@ -295,10 +295,10 @@ static void reflow_columns (EReflow *reflow) { GSList *list; - int count; - int start; - int i; - int column_count, column_start; + gint count; + gint start; + gint i; + gint column_count, column_start; double running_height; if (reflow->reflow_from_column <= 1) { @@ -321,7 +321,7 @@ reflow_columns (EReflow *reflow) count = reflow->count - start; for (i = start; i < count; i++) { - int unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i); + gint unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i); if (i != 0 && running_height + reflow->heights[unsorted] + E_REFLOW_BORDER_WIDTH > reflow->height) { list = g_slist_prepend (list, GINT_TO_POINTER(i)); column_count ++; @@ -350,7 +350,7 @@ reflow_columns (EReflow *reflow) } static void -item_changed (EReflowModel *model, int i, EReflow *reflow) +item_changed (EReflowModel *model, gint i, EReflow *reflow) { if (i < 0 || i >= reflow->count) return; @@ -365,17 +365,17 @@ item_changed (EReflowModel *model, int i, EReflow *reflow) } static void -item_removed (EReflowModel *model, int i, EReflow *reflow) +item_removed (EReflowModel *model, gint i, EReflow *reflow) { - int c; - int sorted; + gint c; + gint sorted; if (i < 0 || i >= reflow->count) return; sorted = e_sorter_model_to_sorted (E_SORTER (reflow->sorter), i); for (c = reflow->column_count - 1; c >= 0; c--) { - int start_of_column = reflow->columns[c]; + gint start_of_column = reflow->columns[c]; if (start_of_column <= sorted) { if (reflow->reflow_from_column == -1 @@ -407,9 +407,9 @@ item_removed (EReflowModel *model, int i, EReflow *reflow) } static void -items_inserted (EReflowModel *model, int position, int count, EReflow *reflow) +items_inserted (EReflowModel *model, gint position, gint count, EReflow *reflow) { - int i, oldcount; + gint i, oldcount; if (position < 0 || position > reflow->count) return; @@ -438,11 +438,11 @@ items_inserted (EReflowModel *model, int position, int count, EReflow *reflow) e_sorter_array_set_count (reflow->sorter, reflow->count); for (i = position; i < position + count; i ++) { - int sorted = e_sorter_model_to_sorted (E_SORTER (reflow->sorter), i); - int c; + gint sorted = e_sorter_model_to_sorted (E_SORTER (reflow->sorter), i); + gint c; for (c = reflow->column_count - 1; c >= 0; c--) { - int start_of_column = reflow->columns[c]; + gint start_of_column = reflow->columns[c]; if (start_of_column <= sorted) { if (reflow->reflow_from_column == -1 @@ -462,9 +462,9 @@ items_inserted (EReflowModel *model, int position, int count, EReflow *reflow) static void model_changed (EReflowModel *model, EReflow *reflow) { - int i; - int count; - int oldcount; + gint i; + gint count; + gint oldcount; count = reflow->count; oldcount = count; @@ -829,8 +829,8 @@ e_reflow_realize (GnomeCanvasItem *item) { EReflow *reflow; GtkAdjustment *adjustment; - int count; - int i; + gint count; + gint i; reflow = E_REFLOW (item); @@ -897,7 +897,7 @@ static gboolean e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) { EReflow *reflow; - int return_val = FALSE; + gint return_val = FALSE; reflow = E_REFLOW (item); @@ -910,11 +910,11 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) if (event->key.keyval == GDK_Tab || event->key.keyval == GDK_KP_Tab || event->key.keyval == GDK_ISO_Left_Tab) { - int i; - int count; + gint i; + gint count; count = reflow->count; for (i = 0; i < count; i++) { - int unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i); + gint unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i); GnomeCanvasItem *item = reflow->items[unsorted]; EFocus has_focus; if (item) { @@ -1104,12 +1104,12 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) } static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, - int x, int y, int width, int height) + gint x, gint y, gint width, gint height) { - int x_rect, y_rect, width_rect, height_rect; + gint x_rect, y_rect, width_rect, height_rect; gdouble running_width; EReflow *reflow = E_REFLOW(item); - int i; + gint i; double column_width; if (GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->draw) @@ -1144,7 +1144,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH; } if (reflow->column_drag) { - int start_line = e_reflow_pick_line(reflow, + gint start_line = e_reflow_pick_line(reflow, gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); i = x - start_line * (column_width + E_REFLOW_FULL_GUTTER); running_width = start_line * (column_width + E_REFLOW_FULL_GUTTER); @@ -1216,11 +1216,11 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin gnome_canvas_request_redraw(item->canvas, x0, y0, x1, y1); reflow->need_height_update = FALSE; } else if (reflow->need_column_resize) { - int x_rect, y_rect, width_rect, height_rect; - int start_line = e_reflow_pick_line(reflow, + gint x_rect, y_rect, width_rect, height_rect; + gint start_line = e_reflow_pick_line(reflow, gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value); gdouble running_width; - int i; + gint i; double column_width; if ( reflow->previous_temp_column_width != -1 ) { @@ -1262,7 +1262,7 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin static double e_reflow_point (GnomeCanvasItem *item, - double x, double y, int cx, int cy, + double x, double y, gint cx, gint cy, GnomeCanvasItem **actual_item) { double distance = 1; @@ -1292,14 +1292,14 @@ e_reflow_point (GnomeCanvasItem *item, } static void -e_reflow_reflow( GnomeCanvasItem *item, int flags ) +e_reflow_reflow( GnomeCanvasItem *item, gint flags ) { EReflow *reflow = E_REFLOW(item); gdouble old_width; gdouble running_width; gdouble running_height; - int next_column; - int i; + gint next_column; + gint i; if (! (GTK_OBJECT_FLAGS (reflow) & GNOME_CANVAS_ITEM_REALIZED)) return; @@ -1316,7 +1316,7 @@ e_reflow_reflow( GnomeCanvasItem *item, int flags ) next_column = 1; for (i = 0; i < reflow->count; i++) { - int unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i); + gint unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), i); if (next_column < reflow->column_count && i == reflow->columns[next_column]) { running_height = E_REFLOW_BORDER_WIDTH; running_width += reflow->column_width + E_REFLOW_FULL_GUTTER; @@ -1340,8 +1340,8 @@ e_reflow_reflow( GnomeCanvasItem *item, int flags ) static int e_reflow_selection_event_real (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event) { - int row; - int return_val = TRUE; + gint row; + gint return_val = TRUE; switch (event->type) { case GDK_BUTTON_PRESS: switch (event->button.button) { diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h index 69f34d0fd9..69527bdf05 100644 --- a/widgets/misc/e-reflow.h +++ b/widgets/misc/e-reflow.h @@ -79,12 +79,12 @@ struct _EReflow guint adjustment_value_changed_id; guint set_scroll_adjustments_id; - int *heights; + gint *heights; GnomeCanvasItem **items; - int count; - int allocated_count; + gint count; + gint allocated_count; - int *columns; + gint *columns; gint column_count; /* Number of columnns */ GnomeCanvasItem *empty_text; @@ -96,8 +96,8 @@ struct _EReflow double column_width; - int incarnate_idle_id; - int do_adjustment_idle_id; + gint incarnate_idle_id; + gint do_adjustment_idle_id; /* These are all for when the column is being dragged. */ gdouble start_x; @@ -105,9 +105,9 @@ struct _EReflow double temp_column_width; double previous_temp_column_width; - int cursor_row; + gint cursor_row; - int reflow_from_column; + gint reflow_from_column; guint column_drag : 1; @@ -127,7 +127,7 @@ struct _EReflowClass { GnomeCanvasGroupClass parent_class; - int (*selection_event) (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event); + gint (*selection_event) (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event); void (*column_width_changed) (EReflow *reflow, double width); }; diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 2bbbc91a00..c6b26412f1 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -66,7 +66,7 @@ enum { /* Forward decls. */ -static int find_id (GtkWidget *menu, int idin, const char *type, GtkWidget **widget); +static gint find_id (GtkWidget *menu, gint idin, const gchar *type, GtkWidget **widget); static void emit_search_activated (ESearchBar *esb); static void emit_query_changed (ESearchBar *esb); @@ -105,8 +105,8 @@ clear_button_state_changed (GtkWidget *clear_button, GtkStateType state, ESearch update_clear_menuitem_sensitive (search_bar); } -static char * -verb_name_from_id (int id) +static gchar * +verb_name_from_id (gint id) { return g_strdup_printf ("ESearchBar:Activate:%d", id); } @@ -178,7 +178,7 @@ emit_search_activated(ESearchBar *esb) } static void -emit_menu_activated (ESearchBar *esb, int item) +emit_menu_activated (ESearchBar *esb, gint item) { g_signal_emit (esb, esb_signals [MENU_ACTIVATED], 0, @@ -190,12 +190,12 @@ emit_menu_activated (ESearchBar *esb, int item) static void search_now_verb_cb (BonoboUIComponent *ui_component, - void *data, - const char *verb_name) + gpointer data, + const gchar *verb_name) { ESearchBar *esb; GtkStyle *style = gtk_widget_get_default_style (); - char *text; + gchar *text; esb = E_SEARCH_BAR (data); text = e_search_bar_get_text (esb); @@ -218,8 +218,8 @@ search_now_verb_cb (BonoboUIComponent *ui_component, static void clear_verb_cb (BonoboUIComponent *ui_component, - void *data, - const char *verb_name) + gpointer data, + const gchar *verb_name) { ESearchBar *esb; esb = E_SEARCH_BAR (data); @@ -258,12 +258,12 @@ setup_standard_verbs (ESearchBar *search_bar) static void search_verb_cb (BonoboUIComponent *ui_component, - void *data, - const char *verb_name) + gpointer data, + const gchar *verb_name) { ESearchBar *esb; - const char *p; - int id; + const gchar *p; + gint id; esb = E_SEARCH_BAR (data); @@ -365,7 +365,7 @@ static void entry_activated_cb (GtkWidget *widget, ESearchBar *esb) { - const char *text = gtk_entry_get_text (GTK_ENTRY (esb->entry)); + const gchar *text = gtk_entry_get_text (GTK_ENTRY (esb->entry)); GtkStyle *style = gtk_widget_get_default_style (); if (text && *text) { @@ -389,7 +389,7 @@ static void entry_changed_cb (GtkWidget *widget, ESearchBar *esb) { - const char *text = gtk_entry_get_text (GTK_ENTRY (esb->entry)); + const gchar *text = gtk_entry_get_text (GTK_ENTRY (esb->entry)); GtkStyle *entry_style, *default_style; entry_style = gtk_widget_get_style (esb->entry); @@ -461,8 +461,8 @@ static void option_activated_cb (GtkWidget *widget, ESearchBar *esb) { - int id; - const char *text; + gint id; + const gchar *text; id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "EsbItemId")); @@ -529,7 +529,7 @@ entry_key_press_cb (GtkWidget *widget, static void scopeoption_changed_cb (GtkWidget *option_menu, ESearchBar *search_bar) { - char *text = NULL; + gchar *text = NULL; text = e_search_bar_get_text (search_bar); if (!(text && *text)) @@ -565,13 +565,13 @@ put_in_spacer_widget (GtkWidget *widget) static void append_xml_menu_item (GString *xml, - const char *name, - const char *label, - const char *stock, - const char *verb, - const char *accelerator) + const gchar *name, + const gchar *label, + const gchar *stock, + const gchar *verb, + const gchar *accelerator) { - char *encoded_label; + gchar *encoded_label; encoded_label = bonobo_ui_util_encode_str (label); g_string_append_printf (xml, "option_menu) gtk_widget_destroy (esb->option_menu); @@ -709,7 +709,7 @@ set_option (ESearchBar *esb, ESearchBarItem *items) group = NULL; if (items[i].text) { - char *str; + gchar *str; str = e_str_without_underscores (_(items[i].text)); switch (items[i].type) { case ESB_ITEMTYPE_NORMAL: @@ -749,10 +749,10 @@ set_option (ESearchBar *esb, ESearchBarItem *items) } static int -find_id (GtkWidget *menu, int idin, const char *type, GtkWidget **widget) +find_id (GtkWidget *menu, gint idin, const gchar *type, GtkWidget **widget) { GList *l = GTK_MENU_SHELL (menu)->children; - int row = -1, i = 0, id; + gint row = -1, i = 0, id; if (widget) *widget = NULL; @@ -1111,7 +1111,7 @@ e_search_bar_set_option (ESearchBar *search_bar, ESearchBarItem *option_items) } void -e_search_bar_set_viewoption_menufunc (ESearchBar *search_bar, ESearchBarMenuFunc *menu_gen_func, void *data) +e_search_bar_set_viewoption_menufunc (ESearchBar *search_bar, ESearchBarMenuFunc *menu_gen_func, gpointer data) { g_signal_connect (search_bar->viewoption, "button_press_event", G_CALLBACK (menu_gen_func), data); } @@ -1161,7 +1161,7 @@ e_search_bar_get_selected_viewitem (ESearchBar *search_bar) * Sets the items for the secondary option menu of a search bar. **/ void -e_search_bar_set_viewoption (ESearchBar *search_bar, int option_id, ESearchBarItem *subitems) +e_search_bar_set_viewoption (ESearchBar *search_bar, gint option_id, ESearchBarItem *subitems) { GtkWidget *menu; GtkWidget *menu_item; @@ -1180,7 +1180,7 @@ e_search_bar_set_viewoption (ESearchBar *search_bar, int option_id, ESearchBarIt for (i = 0; subitems[i].id != -1; ++i) { if (subitems[i].text) { - char *str = NULL; + gchar *str = NULL; str = e_str_without_underscores (subitems[i].text); menu_item = gtk_menu_item_new_with_label (str); g_free (str); @@ -1229,7 +1229,7 @@ e_search_bar_set_scopeoption (ESearchBar *search_bar, ESearchBarItem *scopeitems /* Generate items */ for (i = 0; scopeitems[i].id != -1; ++i) { if (scopeitems[i].text) { - char *str; + gchar *str; str = e_str_without_underscores (_(scopeitems[i].text)); menu_item = gtk_menu_item_new_with_label (str); g_object_set_data_full (G_OBJECT (menu_item), "string",str, g_free); @@ -1329,10 +1329,10 @@ e_search_bar_set_ui_component (ESearchBar *search_bar, } void -e_search_bar_set_menu_sensitive (ESearchBar *search_bar, int id, gboolean state) +e_search_bar_set_menu_sensitive (ESearchBar *search_bar, gint id, gboolean state) { - char *verb_name; - char *path; + gchar *verb_name; + gchar *path; if (search_bar->lite) return; @@ -1373,9 +1373,9 @@ e_search_bar_get_type (void) } void -e_search_bar_set_viewitem_id (ESearchBar *search_bar, int id) +e_search_bar_set_viewitem_id (ESearchBar *search_bar, gint id) { - int row; + gint row; g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); if (!search_bar->viewoption_menu) @@ -1398,9 +1398,9 @@ e_search_bar_set_viewitem_id (ESearchBar *search_bar, int id) * Sets the active item in the options menu of a search bar. **/ void -e_search_bar_set_item_id (ESearchBar *search_bar, int id) +e_search_bar_set_item_id (ESearchBar *search_bar, gint id) { - int row; + gint row; g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); @@ -1423,9 +1423,9 @@ e_search_bar_set_item_id (ESearchBar *search_bar, int id) } void -e_search_bar_set_item_menu (ESearchBar *search_bar, int id) +e_search_bar_set_item_menu (ESearchBar *search_bar, gint id) { - int row; + gint row; GtkWidget *item; g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); @@ -1446,9 +1446,9 @@ e_search_bar_set_item_menu (ESearchBar *search_bar, int id) * Sets the active item in the options menu of a search bar. **/ void -e_search_bar_set_search_scope (ESearchBar *search_bar, int id) +e_search_bar_set_search_scope (ESearchBar *search_bar, gint id) { - int row; + gint row; g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); @@ -1472,7 +1472,7 @@ e_search_bar_set_search_scope (ESearchBar *search_bar, int id) * * Return value: Identifier of the selected item in the options menu. **/ -int +gint e_search_bar_get_item_id (ESearchBar *search_bar) { GtkWidget *menu_item; @@ -1496,7 +1496,7 @@ e_search_bar_get_item_id (ESearchBar *search_bar) * * Return value: Identifier of the selected item in the options menu. **/ -int +gint e_search_bar_get_search_scope (ESearchBar *search_bar) { GtkWidget *menu_item; @@ -1523,7 +1523,7 @@ e_search_bar_get_search_scope (ESearchBar *search_bar) * If the search bar currently contains an entry rather than a a viewoption menu, * a value less than zero is returned. **/ -int +gint e_search_bar_get_viewitem_id (ESearchBar *search_bar) { GtkWidget *menu_item; @@ -1553,9 +1553,9 @@ e_search_bar_get_viewitem_id (ESearchBar *search_bar) * to an item that has subitems. **/ void -e_search_bar_set_ids (ESearchBar *search_bar, int item_id, int subitem_id) +e_search_bar_set_ids (ESearchBar *search_bar, gint item_id, gint subitem_id) { - int item_row; + gint item_row; GtkWidget *item_widget; g_return_if_fail (search_bar != NULL); @@ -1578,7 +1578,7 @@ e_search_bar_set_ids (ESearchBar *search_bar, int item_id, int subitem_id) * Sets the text string inside the entry line of a search bar. **/ void -e_search_bar_set_text (ESearchBar *search_bar, const char *text) +e_search_bar_set_text (ESearchBar *search_bar, const gchar *text) { g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); gtk_entry_set_text (GTK_ENTRY (search_bar->entry), text); @@ -1594,7 +1594,7 @@ e_search_bar_set_text (ESearchBar *search_bar, const char *text) * This must be freed using g_free(). If a suboption menu is active instead * of an entry, NULL is returned. **/ -char * +gchar * e_search_bar_get_text (ESearchBar *search_bar) { GtkStyle *entry_style, *default_style; @@ -1611,11 +1611,11 @@ e_search_bar_get_text (ESearchBar *search_bar) return g_strdup (gtk_entry_get_text (GTK_ENTRY (search_bar->entry))); } -void e_search_bar_scope_enable (ESearchBar *esb, int did, gboolean state) +void e_search_bar_scope_enable (ESearchBar *esb, gint did, gboolean state) { GtkWidget *widget=NULL; GList *l ; - int id; + gint id; gpointer *pointer; g_return_if_fail (esb != NULL); diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h index fd91068ebd..336c27608d 100644 --- a/widgets/misc/e-search-bar.h +++ b/widgets/misc/e-search-bar.h @@ -35,8 +35,8 @@ G_BEGIN_DECLS * * name type read/write description * --------------------------------------------------------------------------------- - * item_id int RW Which option item is currently selected. - * subitem_id int RW Which option subitem is currently selected. + * item_id gint RW Which option item is currently selected. + * subitem_id gint RW Which option subitem is currently selected. * text string RW Text in the entry box. */ @@ -99,10 +99,10 @@ struct _ESearchBar guint pending_activate; /* The currently-selected item & subitem */ - int item_id; - int viewitem_id; /* Current View Id */ - int scopeitem_id; /* Scope of search */ - int last_search_option; + gint item_id; + gint viewitem_id; /* Current View Id */ + gint scopeitem_id; /* Scope of search */ + gint last_search_option; gboolean block_search; gboolean lite; @@ -119,7 +119,7 @@ struct _ESearchBarClass void (*search_activated) (ESearchBar *search); void (*search_cleared) (ESearchBar *search); void (*query_changed) (ESearchBar *search); - void (*menu_activated) (ESearchBar *search, int item); + void (*menu_activated) (ESearchBar *search, gint item); }; enum { @@ -149,45 +149,45 @@ void e_search_bar_set_option (ESearchBar *search_bar, ESearchBarItem *option_items); void e_search_bar_paint (ESearchBar *search_bar); void e_search_bar_set_viewoption (ESearchBar *search_bar, - int option_id, + gint option_id, ESearchBarItem *subitems); void e_search_bar_set_menu_sensitive (ESearchBar *search_bar, - int id, + gint id, gboolean state); void e_search_bar_set_item_id (ESearchBar *search_bar, - int id); + gint id); void e_search_bar_set_item_menu (ESearchBar *search_bar, - int id); -int e_search_bar_get_item_id (ESearchBar *search_bar); + gint id); +gint e_search_bar_get_item_id (ESearchBar *search_bar); -int e_search_bar_get_viewitem_id (ESearchBar *search_bar); +gint e_search_bar_get_viewitem_id (ESearchBar *search_bar); -void e_search_bar_set_viewitem_id (ESearchBar *search_bar, int id); +void e_search_bar_set_viewitem_id (ESearchBar *search_bar, gint id); void e_search_bar_set_ids (ESearchBar *search_bar, - int item_id, - int subitem_id); + gint item_id, + gint subitem_id); void e_search_bar_set_scopeoption (ESearchBar *search_bar, ESearchBarItem *scopeitems); void e_search_bar_set_scopeoption_menu (ESearchBar *search_bar, GtkMenu *menu); -void e_search_bar_set_search_scope (ESearchBar *search_bar, int id); +void e_search_bar_set_search_scope (ESearchBar *search_bar, gint id); void e_search_bar_set_viewoption_menu (ESearchBar *search_bar, GtkWidget *menu); -void e_search_bar_set_viewoption_menufunc (ESearchBar *search_bar, ESearchBarMenuFunc *menu_gen_func, void *data); +void e_search_bar_set_viewoption_menufunc (ESearchBar *search_bar, ESearchBarMenuFunc *menu_gen_func, gpointer data); GtkWidget *e_search_bar_get_selected_viewitem (ESearchBar *search_bar); -int e_search_bar_get_search_scope (ESearchBar *search_bar); +gint e_search_bar_get_search_scope (ESearchBar *search_bar); void e_search_bar_set_text (ESearchBar *search_bar, - const char *text); -char *e_search_bar_get_text (ESearchBar *search_bar); -void e_search_bar_scope_enable (ESearchBar *search_bar, int did, gboolean state); + const gchar *text); +gchar *e_search_bar_get_text (ESearchBar *search_bar); +void e_search_bar_scope_enable (ESearchBar *search_bar, gint did, gboolean state); G_END_DECLS diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c index 7e82039d6e..dde69a7e06 100644 --- a/widgets/misc/e-selection-model-array.c +++ b/widgets/misc/e-selection-model-array.c @@ -42,7 +42,7 @@ void e_selection_model_array_confirm_row_count(ESelectionModelArray *esma) { if (esma->eba == NULL) { - int row_count = e_selection_model_array_get_row_count(esma); + gint row_count = e_selection_model_array_get_row_count(esma); esma->eba = e_bit_array_new(row_count); esma->selected_row = -1; esma->selected_range_end = -1; @@ -69,7 +69,7 @@ es_row_sorted_to_model (ESelectionModelArray *esma, gint sorted_row) /* FIXME: Should this deal with moving the selection if it's in single mode? */ void -e_selection_model_array_delete_rows(ESelectionModelArray *esma, int row, int count) +e_selection_model_array_delete_rows(ESelectionModelArray *esma, gint row, gint count) { if (esma->eba) { if (E_SELECTION_MODEL(esma)->mode == GTK_SELECTION_SINGLE) @@ -119,7 +119,7 @@ e_selection_model_array_delete_rows(ESelectionModelArray *esma, int row, int cou } void -e_selection_model_array_insert_rows(ESelectionModelArray *esma, int row, int count) +e_selection_model_array_insert_rows(ESelectionModelArray *esma, gint row, gint count) { if (esma->eba) { e_bit_array_insert(esma->eba, row, count); @@ -135,7 +135,7 @@ e_selection_model_array_insert_rows(ESelectionModelArray *esma, int row, int cou } void -e_selection_model_array_move_row(ESelectionModelArray *esma, int old_row, int new_row) +e_selection_model_array_move_row(ESelectionModelArray *esma, gint old_row, gint new_row) { ESelectionModel *esm = E_SELECTION_MODEL(esma); @@ -366,7 +366,7 @@ esma_row_count (ESelectionModel *selection) } static void -esma_change_one_row(ESelectionModel *selection, int row, gboolean grow) +esma_change_one_row(ESelectionModel *selection, gint row, gboolean grow) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); e_selection_model_array_confirm_row_count(esma); @@ -374,7 +374,7 @@ esma_change_one_row(ESelectionModel *selection, int row, gboolean grow) } static void -esma_change_cursor (ESelectionModel *selection, int row, int col) +esma_change_cursor (ESelectionModel *selection, gint row, gint col) { ESelectionModelArray *esma; @@ -389,9 +389,9 @@ esma_change_cursor (ESelectionModel *selection, int row, int col) } static void -esma_change_range(ESelectionModel *selection, int start, int end, gboolean grow) +esma_change_range(ESelectionModel *selection, gint start, gint end, gboolean grow) { - int i; + gint i; ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); if (start != end) { if (selection->sorter && e_sorter_needs_sorting(selection->sorter)) { @@ -420,7 +420,7 @@ esma_cursor_col (ESelectionModel *selection) } static void -esma_real_select_single_row (ESelectionModel *selection, int row) +esma_real_select_single_row (ESelectionModel *selection, gint row) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); @@ -434,10 +434,10 @@ esma_real_select_single_row (ESelectionModel *selection, int row) } static void -esma_select_single_row (ESelectionModel *selection, int row) +esma_select_single_row (ESelectionModel *selection, gint row) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); - int selected_row = esma->selected_row; + gint selected_row = esma->selected_row; esma_real_select_single_row (selection, row); if (selected_row != -1 && esma->eba && selected_row < e_bit_array_bit_count (esma->eba)) { @@ -451,7 +451,7 @@ esma_select_single_row (ESelectionModel *selection, int row) } static void -esma_toggle_single_row (ESelectionModel *selection, int row) +esma_toggle_single_row (ESelectionModel *selection, gint row) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); @@ -465,13 +465,13 @@ esma_toggle_single_row (ESelectionModel *selection, int row) } static void -esma_real_move_selection_end (ESelectionModel *selection, int row) +esma_real_move_selection_end (ESelectionModel *selection, gint row) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); - int old_start; - int old_end; - int new_start; - int new_end; + gint old_start; + gint old_end; + gint new_start; + gint new_end; if (selection->sorter && e_sorter_needs_sorting(selection->sorter)) { old_start = MIN (e_sorter_model_to_sorted(selection->sorter, esma->selection_start_row), e_sorter_model_to_sorted(selection->sorter, esma->cursor_row)); @@ -501,18 +501,18 @@ esma_real_move_selection_end (ESelectionModel *selection, int row) } static void -esma_move_selection_end (ESelectionModel *selection, int row) +esma_move_selection_end (ESelectionModel *selection, gint row) { esma_real_move_selection_end (selection, row); e_selection_model_selection_changed(selection); } static void -esma_set_selection_end (ESelectionModel *selection, int row) +esma_set_selection_end (ESelectionModel *selection, gint row) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); - int selected_range_end = esma->selected_range_end; - int view_row = e_sorter_model_to_sorted(selection->sorter, row); + gint selected_range_end = esma->selected_range_end; + gint view_row = e_sorter_model_to_sorted(selection->sorter, row); esma_real_select_single_row(selection, esma->selection_start_row); esma->cursor_row = esma->selection_start_row; @@ -530,7 +530,7 @@ esma_set_selection_end (ESelectionModel *selection, int row) e_selection_model_selection_changed(selection); } -int +gint e_selection_model_array_get_row_count (ESelectionModelArray *esma) { g_return_val_if_fail(esma != NULL, 0); diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h index 9f297c1fed..be21a5557e 100644 --- a/widgets/misc/e-selection-model-array.h +++ b/widgets/misc/e-selection-model-array.h @@ -76,14 +76,14 @@ GType e_selection_model_array_get_type (void); /* Protected Functions */ void e_selection_model_array_insert_rows (ESelectionModelArray *esm, - int row, - int count); + gint row, + gint count); void e_selection_model_array_delete_rows (ESelectionModelArray *esm, - int row, - int count); + gint row, + gint count); void e_selection_model_array_move_row (ESelectionModelArray *esm, - int old_row, - int new_row); + gint old_row, + gint new_row); void e_selection_model_array_confirm_row_count (ESelectionModelArray *esm); /* Protected Virtual Function */ diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c index b9f1d33bfe..b0b151dd6d 100644 --- a/widgets/misc/e-selection-model-simple.c +++ b/widgets/misc/e-selection-model-simple.c @@ -63,7 +63,7 @@ e_selection_model_simple_new (void) void e_selection_model_simple_set_row_count (ESelectionModelSimple *esms, - int row_count) + gint row_count) { if (esms->row_count != row_count) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(esms); @@ -85,8 +85,8 @@ esms_get_row_count (ESelectionModelArray *esma) } void e_selection_model_simple_insert_rows (ESelectionModelSimple *esms, - int row, - int count) + gint row, + gint count) { esms->row_count += count; e_selection_model_array_insert_rows (E_SELECTION_MODEL_ARRAY(esms), row, count); @@ -94,8 +94,8 @@ void e_selection_model_simple_insert_rows (ESelectionModelSimple *e void e_selection_model_simple_delete_rows (ESelectionModelSimple *esms, - int row, - int count) + gint row, + gint count) { esms->row_count -= count; e_selection_model_array_delete_rows (E_SELECTION_MODEL_ARRAY(esms), row, count); @@ -103,8 +103,8 @@ e_selection_model_simple_delete_rows (ESelectionModelSimple *esms, void e_selection_model_simple_move_row (ESelectionModelSimple *esms, - int old_row, - int new_row) + gint old_row, + gint new_row) { e_selection_model_array_move_row (E_SELECTION_MODEL_ARRAY(esms), old_row, new_row); } diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h index 7f11d3ac0e..8db463b32f 100644 --- a/widgets/misc/e-selection-model-simple.h +++ b/widgets/misc/e-selection-model-simple.h @@ -39,7 +39,7 @@ extern "C" { typedef struct { ESelectionModelArray parent; - int row_count; + gint row_count; } ESelectionModelSimple; typedef struct { @@ -50,17 +50,17 @@ GType e_selection_model_simple_get_type (void); ESelectionModelSimple *e_selection_model_simple_new (void); void e_selection_model_simple_insert_rows (ESelectionModelSimple *esms, - int row, - int count); + gint row, + gint count); void e_selection_model_simple_delete_rows (ESelectionModelSimple *esms, - int row, - int count); + gint row, + gint count); void e_selection_model_simple_move_row (ESelectionModelSimple *esms, - int old_row, - int new_row); + gint old_row, + gint new_row); void e_selection_model_simple_set_row_count (ESelectionModelSimple *selection, - int row_count); + gint row_count); #ifdef __cplusplus } diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c index 66187e6e7c..cc1d3b3780 100644 --- a/widgets/misc/e-selection-model.c +++ b/widgets/misc/e-selection-model.c @@ -113,8 +113,8 @@ esm_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpe case PROP_SELECTION_MODE: esm->mode = g_value_get_int (value); if (esm->mode == GTK_SELECTION_SINGLE) { - int cursor_row = e_selection_model_cursor_row(esm); - int cursor_col = e_selection_model_cursor_col(esm); + gint cursor_row = e_selection_model_cursor_row(esm); + gint cursor_col = e_selection_model_cursor_col(esm); e_selection_model_do_something(esm, cursor_row, cursor_col, 0); } break; @@ -322,7 +322,7 @@ e_selection_model_invert_selection (ESelectionModel *selection) E_SELECTION_MODEL_GET_CLASS(selection)->invert_selection (selection); } -int +gint e_selection_model_row_count (ESelectionModel *selection) { if (E_SELECTION_MODEL_GET_CLASS(selection)->row_count) @@ -332,20 +332,20 @@ e_selection_model_row_count (ESelectionModel *selection) } void -e_selection_model_change_one_row(ESelectionModel *selection, int row, gboolean grow) +e_selection_model_change_one_row(ESelectionModel *selection, gint row, gboolean grow) { if (E_SELECTION_MODEL_GET_CLASS(selection)->change_one_row) E_SELECTION_MODEL_GET_CLASS(selection)->change_one_row (selection, row, grow); } void -e_selection_model_change_cursor (ESelectionModel *selection, int row, int col) +e_selection_model_change_cursor (ESelectionModel *selection, gint row, gint col) { if (E_SELECTION_MODEL_GET_CLASS(selection)->change_cursor) E_SELECTION_MODEL_GET_CLASS(selection)->change_cursor (selection, row, col); } -int +gint e_selection_model_cursor_row (ESelectionModel *selection) { if (E_SELECTION_MODEL_GET_CLASS(selection)->cursor_row) @@ -354,7 +354,7 @@ e_selection_model_cursor_row (ESelectionModel *selection) return -1; } -int +gint e_selection_model_cursor_col (ESelectionModel *selection) { if (E_SELECTION_MODEL_GET_CLASS(selection)->cursor_col) @@ -364,28 +364,28 @@ e_selection_model_cursor_col (ESelectionModel *selection) } void -e_selection_model_select_single_row (ESelectionModel *selection, int row) +e_selection_model_select_single_row (ESelectionModel *selection, gint row) { if (E_SELECTION_MODEL_GET_CLASS(selection)->select_single_row) E_SELECTION_MODEL_GET_CLASS(selection)->select_single_row (selection, row); } void -e_selection_model_toggle_single_row (ESelectionModel *selection, int row) +e_selection_model_toggle_single_row (ESelectionModel *selection, gint row) { if (E_SELECTION_MODEL_GET_CLASS(selection)->toggle_single_row) E_SELECTION_MODEL_GET_CLASS(selection)->toggle_single_row (selection, row); } void -e_selection_model_move_selection_end (ESelectionModel *selection, int row) +e_selection_model_move_selection_end (ESelectionModel *selection, gint row) { if (E_SELECTION_MODEL_GET_CLASS(selection)->move_selection_end) E_SELECTION_MODEL_GET_CLASS(selection)->move_selection_end (selection, row); } void -e_selection_model_set_selection_end (ESelectionModel *selection, int row) +e_selection_model_set_selection_end (ESelectionModel *selection, gint row) { if (E_SELECTION_MODEL_GET_CLASS(selection)->set_selection_end) E_SELECTION_MODEL_GET_CLASS(selection)->set_selection_end (selection, row); @@ -409,7 +409,7 @@ e_selection_model_do_something (ESelectionModel *selection, { gint shift_p = state & GDK_SHIFT_MASK; gint ctrl_p = state & GDK_CONTROL_MASK; - int row_count; + gint row_count; selection->old_selection = -1; @@ -511,7 +511,7 @@ e_selection_model_select_as_key_press (ESelectionModel *selection, guint col, GdkModifierType state) { - int cursor_activated = TRUE; + gint cursor_activated = TRUE; gint shift_p = state & GDK_SHIFT_MASK; gint ctrl_p = state & GDK_CONTROL_MASK; @@ -552,9 +552,9 @@ move_selection (ESelectionModel *selection, gboolean up, GdkModifierType state) { - int row = e_selection_model_cursor_row(selection); - int col = e_selection_model_cursor_col(selection); - int row_count; + gint row = e_selection_model_cursor_row(selection); + gint col = e_selection_model_cursor_col(selection); + gint row_count; /* there is no selected row when row is -1 */ if (row != -1) @@ -601,8 +601,8 @@ e_selection_model_key_press (ESelectionModel *selection, case GDK_space: case GDK_KP_Space: if (selection->mode != GTK_SELECTION_SINGLE) { - int row = e_selection_model_cursor_row(selection); - int col = e_selection_model_cursor_col(selection); + gint row = e_selection_model_cursor_row(selection); + gint col = e_selection_model_cursor_col(selection); if (row == -1) break; @@ -616,8 +616,8 @@ e_selection_model_key_press (ESelectionModel *selection, case GDK_Return: case GDK_KP_Enter: if (selection->mode != GTK_SELECTION_SINGLE) { - int row = e_selection_model_cursor_row(selection); - int col = e_selection_model_cursor_col(selection); + gint row = e_selection_model_cursor_row(selection); + gint col = e_selection_model_cursor_col(selection); e_selection_model_select_single_row (selection, row); g_signal_emit(selection, e_selection_model_signals[CURSOR_ACTIVATED], 0, @@ -628,8 +628,8 @@ e_selection_model_key_press (ESelectionModel *selection, case GDK_Home: case GDK_KP_Home: if (selection->cursor_mode == E_CURSOR_LINE) { - int row = 0; - int cursor_col = e_selection_model_cursor_col(selection); + gint row = 0; + gint cursor_col = e_selection_model_cursor_col(selection); row = e_sorter_sorted_to_model(selection->sorter, row); e_selection_model_select_as_key_press (selection, row, cursor_col, key->state); @@ -639,8 +639,8 @@ e_selection_model_key_press (ESelectionModel *selection, case GDK_End: case GDK_KP_End: if (selection->cursor_mode == E_CURSOR_LINE) { - int row = e_selection_model_row_count(selection) - 1; - int cursor_col = e_selection_model_cursor_col(selection); + gint row = e_selection_model_row_count(selection) - 1; + gint cursor_col = e_selection_model_cursor_col(selection); row = e_sorter_sorted_to_model(selection->sorter, row); e_selection_model_select_as_key_press (selection, row, cursor_col, key->state); @@ -653,8 +653,8 @@ e_selection_model_key_press (ESelectionModel *selection, void e_selection_model_cursor_changed (ESelectionModel *selection, - int row, - int col) + gint row, + gint col) { g_signal_emit(selection, e_selection_model_signals[CURSOR_CHANGED], 0, @@ -663,8 +663,8 @@ e_selection_model_cursor_changed (ESelectionModel *selection, void e_selection_model_cursor_activated (ESelectionModel *selection, - int row, - int col) + gint row, + gint col) { g_signal_emit(selection, e_selection_model_signals[CURSOR_ACTIVATED], 0, @@ -680,7 +680,7 @@ e_selection_model_selection_changed (ESelectionModel *selection) void e_selection_model_selection_row_changed (ESelectionModel *selection, - int row) + gint row) { g_signal_emit(selection, e_selection_model_signals[SELECTION_ROW_CHANGED], 0, diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h index 24eccd304f..16194000a5 100644 --- a/widgets/misc/e-selection-model.h +++ b/widgets/misc/e-selection-model.h @@ -40,7 +40,7 @@ extern "C" { #ifndef _E_FOREACH_FUNC_H_ #define _E_FOREACH_FUNC_H_ -typedef void (*EForeachFunc) (int model_row, +typedef void (*EForeachFunc) (gint model_row, gpointer closure); #endif @@ -59,39 +59,39 @@ typedef struct { GtkSelectionMode mode; ECursorMode cursor_mode; - int old_selection; + gint old_selection; } ESelectionModel; typedef struct { GObjectClass parent_class; /* Virtual methods */ - gboolean (*is_row_selected) (ESelectionModel *esm, int row); + gboolean (*is_row_selected) (ESelectionModel *esm, gint row); void (*foreach) (ESelectionModel *esm, EForeachFunc callback, gpointer closure); void (*clear) (ESelectionModel *esm); gint (*selected_count) (ESelectionModel *esm); void (*select_all) (ESelectionModel *esm); void (*invert_selection) (ESelectionModel *esm); - int (*row_count) (ESelectionModel *esm); + gint (*row_count) (ESelectionModel *esm); /* Protected virtual methods. */ - void (*change_one_row) (ESelectionModel *esm, int row, gboolean on); - void (*change_cursor) (ESelectionModel *esm, int row, int col); - int (*cursor_row) (ESelectionModel *esm); - int (*cursor_col) (ESelectionModel *esm); + void (*change_one_row) (ESelectionModel *esm, gint row, gboolean on); + void (*change_cursor) (ESelectionModel *esm, gint row, gint col); + gint (*cursor_row) (ESelectionModel *esm); + gint (*cursor_col) (ESelectionModel *esm); - void (*select_single_row) (ESelectionModel *selection, int row); - void (*toggle_single_row) (ESelectionModel *selection, int row); - void (*move_selection_end) (ESelectionModel *selection, int row); - void (*set_selection_end) (ESelectionModel *selection, int row); + void (*select_single_row) (ESelectionModel *selection, gint row); + void (*toggle_single_row) (ESelectionModel *selection, gint row); + void (*move_selection_end) (ESelectionModel *selection, gint row); + void (*set_selection_end) (ESelectionModel *selection, gint row); /* * Signals */ - void (*cursor_changed) (ESelectionModel *esm, int row, int col); - void (*cursor_activated) (ESelectionModel *esm, int row, int col); - void (*selection_row_changed) (ESelectionModel *esm, int row); + void (*cursor_changed) (ESelectionModel *esm, gint row, gint col); + void (*cursor_activated) (ESelectionModel *esm, gint row, gint col); + void (*selection_row_changed) (ESelectionModel *esm, gint row); void (*selection_changed) (ESelectionModel *esm); } ESelectionModelClass; @@ -128,36 +128,36 @@ void e_selection_model_clear (ESelectionModel *esm); gint e_selection_model_selected_count (ESelectionModel *esm); void e_selection_model_select_all (ESelectionModel *esm); void e_selection_model_invert_selection (ESelectionModel *esm); -int e_selection_model_row_count (ESelectionModel *esm); +gint e_selection_model_row_count (ESelectionModel *esm); /* Private virtual Functions */ void e_selection_model_change_one_row (ESelectionModel *esm, - int row, + gint row, gboolean on); void e_selection_model_change_cursor (ESelectionModel *esm, - int row, - int col); -int e_selection_model_cursor_row (ESelectionModel *esm); -int e_selection_model_cursor_col (ESelectionModel *esm); + gint row, + gint col); +gint e_selection_model_cursor_row (ESelectionModel *esm); +gint e_selection_model_cursor_col (ESelectionModel *esm); void e_selection_model_select_single_row (ESelectionModel *selection, - int row); + gint row); void e_selection_model_toggle_single_row (ESelectionModel *selection, - int row); + gint row); void e_selection_model_move_selection_end (ESelectionModel *selection, - int row); + gint row); void e_selection_model_set_selection_end (ESelectionModel *selection, - int row); + gint row); /* Signals */ void e_selection_model_cursor_changed (ESelectionModel *selection, - int row, - int col); + gint row, + gint col); void e_selection_model_cursor_activated (ESelectionModel *selection, - int row, - int col); + gint row, + gint col); void e_selection_model_selection_row_changed (ESelectionModel *selection, - int row); + gint row); void e_selection_model_selection_changed (ESelectionModel *selection); #ifdef __cplusplus diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index 8740f2d02e..b42630ebae 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -97,7 +97,7 @@ struct _ESendOptionsDialogPrivate { GtkWidget *accepted_label; GtkWidget *completed_label; GtkWidget *until_label; - char *help_section; + gchar *help_section; }; static void e_sendoptions_dialog_class_init (GObjectClass *object_class); @@ -345,7 +345,7 @@ delay_until_date_changed_cb (GtkWidget *dedit, gpointer data) } static void -page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, gpointer data) +page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, gint num, gpointer data) { ESendOptionsDialog *sod = data; ESendOptionsDialogPrivate *priv = sod->priv; diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c index 6e18410018..87e53dce8f 100644 --- a/widgets/misc/e-spinner.c +++ b/widgets/misc/e-spinner.c @@ -100,8 +100,8 @@ typedef struct { guint ref_count; GtkIconSize size; - int width; - int height; + gint width; + gint height; GdkPixbuf **animation_pixbufs; guint n_animation_pixbufs; } ESpinnerImages; @@ -208,9 +208,9 @@ e_spinner_cache_data_unload (ESpinnerCacheData *data) static GdkPixbuf * extract_frame (GdkPixbuf *grid_pixbuf, - int x, - int y, - int size) + gint x, + gint y, + gint size) { GdkPixbuf *pixbuf; @@ -230,11 +230,11 @@ extract_frame (GdkPixbuf *grid_pixbuf, static GdkPixbuf * scale_to_size (GdkPixbuf *pixbuf, - int dw, - int dh) + gint dw, + gint dh) { GdkPixbuf *result; - int pw, ph; + gint pw, ph; g_return_val_if_fail (pixbuf != NULL, NULL); @@ -259,8 +259,8 @@ e_spinner_images_load (GdkScreen *screen, ESpinnerImages *images; GdkPixbuf *icon_pixbuf, *pixbuf; GtkIconInfo *icon_info = NULL; - int grid_width, grid_height, x, y, requested_size, size, isw, ish, n; - const char *icon; + gint grid_width, grid_height, x, y, requested_size, size, isw, ish, n; + const gchar *icon; GSList *list = NULL, *l; LOG ("ESpinnerCacheData loading for screen %p at size %d", screen, icon_size); @@ -642,7 +642,7 @@ e_spinner_expose (GtkWidget *widget, ESpinnerImages *images; GdkPixbuf *pixbuf; GdkGC *gc; - int x_offset, y_offset, width, height; + gint x_offset, y_offset, width, height; GdkRectangle pix_area, dest; if (!GTK_WIDGET_DRAWABLE (spinner)) diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c index c7a715decd..e0bdc762a3 100644 --- a/widgets/misc/e-task-bar.c +++ b/widgets/misc/e-task-bar.c @@ -51,8 +51,8 @@ reduce_displayed_activities_per_component (ETaskBar *task_bar) for (p = box->children; p != NULL; p = p->next) { GtkBoxChild *child; - const char *component_id; - void *hash_item; + const gchar *component_id; + gpointer hash_item; child = (GtkBoxChild *) p->data; component_id = e_task_widget_get_component_id (E_TASK_WIDGET (child->widget)); @@ -61,9 +61,9 @@ reduce_displayed_activities_per_component (ETaskBar *task_bar) if (hash_item == NULL) { gtk_widget_show (child->widget); - g_hash_table_insert (component_ids_hash, (void *) component_id, GINT_TO_POINTER (1)); + g_hash_table_insert (component_ids_hash, (gpointer) component_id, GINT_TO_POINTER (1)); } else { - int num_items; + gint num_items; num_items = GPOINTER_TO_INT (hash_item); g_return_if_fail (num_items <= MAX_ACTIVITIES_PER_COMPONENT); @@ -73,7 +73,7 @@ reduce_displayed_activities_per_component (ETaskBar *task_bar) } else { num_items ++; gtk_widget_show (child->widget); - g_hash_table_insert (component_ids_hash, (void *) component_id, GINT_TO_POINTER (num_items)); + g_hash_table_insert (component_ids_hash, (gpointer) component_id, GINT_TO_POINTER (num_items)); } } } @@ -157,7 +157,7 @@ e_task_bar_new (void) void e_task_bar_set_message (ETaskBar *task_bar, - const char *message) + const gchar *message) { if (message) { gtk_label_set_text ( @@ -242,7 +242,7 @@ e_task_bar_remove_task_from_id (ETaskBar *task_bar, void e_task_bar_remove_task (ETaskBar *task_bar, - int n) + gint n) { ETaskWidget *task_widget; @@ -288,7 +288,7 @@ e_task_bar_get_task_widget_from_id (ETaskBar *task_bar, ETaskWidget * e_task_bar_get_task_widget (ETaskBar *task_bar, - int n) + gint n) { GtkBoxChild *child_info; diff --git a/widgets/misc/e-task-bar.h b/widgets/misc/e-task-bar.h index d36898ebb8..33d0e2312f 100644 --- a/widgets/misc/e-task-bar.h +++ b/widgets/misc/e-task-bar.h @@ -59,20 +59,20 @@ void e_task_bar_construct (ETaskBar *task_bar); GtkWidget *e_task_bar_new (void); void e_task_bar_set_message (ETaskBar *task_bar, - const char *message); + const gchar *message); void e_task_bar_unset_message (ETaskBar *task_bar); void e_task_bar_prepend_task (ETaskBar *task_bar, ETaskWidget *task_widget); void e_task_bar_remove_task (ETaskBar *task_bar, - int n); + gint n); ETaskWidget * e_task_bar_get_task_widget_from_id (ETaskBar *task_bar, guint id); void e_task_bar_remove_task_from_id (ETaskBar *task_bar, guint id); ETaskWidget *e_task_bar_get_task_widget (ETaskBar *task_bar, - int n); + gint n); #ifdef __cplusplus } diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c index 2569a46557..de5b782f85 100644 --- a/widgets/misc/e-task-widget.c +++ b/widgets/misc/e-task-widget.c @@ -33,7 +33,7 @@ #define SPACING 2 struct _ETaskWidgetPrivate { - char *component_id; + gchar *component_id; GtkWidget *label; GtkWidget *box; @@ -115,8 +115,8 @@ prepare_popup (ETaskWidget *widget, GdkEventButton *event) void e_task_widget_construct (ETaskWidget *task_widget, - const char *component_id, - const char *information, + const gchar *component_id, + const gchar *information, void (*cancel_func) (gpointer data), gpointer data) { @@ -180,8 +180,8 @@ e_task_widget_construct (ETaskWidget *task_widget, } GtkWidget * -e_task_widget_new_with_cancel (const char *component_id, - const char *information, +e_task_widget_new_with_cancel (const gchar *component_id, + const gchar *information, void (*cancel_func) (gpointer data), gpointer data) { @@ -196,8 +196,8 @@ e_task_widget_new_with_cancel (const char *component_id, } GtkWidget * -e_task_widget_new (const char *component_id, - const char *information) +e_task_widget_new (const gchar *component_id, + const gchar *information) { ETaskWidget *task_widget; @@ -211,7 +211,7 @@ e_task_widget_new (const char *component_id, GtkWidget * e_task_widget_update_image (ETaskWidget *task_widget, - const char *stock, const char *text) + const gchar *stock, const gchar *text) { GtkWidget *image, *tool; GdkPixbuf *pixbuf; @@ -235,11 +235,11 @@ e_task_widget_update_image (ETaskWidget *task_widget, void e_task_widget_update (ETaskWidget *task_widget, - const char *information, + const gchar *information, double completion) { ETaskWidgetPrivate *priv; - char *text; + gchar *text; g_return_if_fail (task_widget != NULL); g_return_if_fail (E_IS_TASK_WIDGET (task_widget)); @@ -251,7 +251,7 @@ e_task_widget_update (ETaskWidget *task_widget, /* For Translator only: %s is status message that is displayed (eg "moving items", "updating objects") */ text = g_strdup_printf (_("%s (...)"), information); } else { - int percent_complete; + gint percent_complete; percent_complete = (int) (completion * 100.0 + .5); /* For Translator only: %s is status message that is displayed (eg "moving items", "updating objects"); %d is a number between 0 and 100, describing the percentage of operation complete */ @@ -280,7 +280,7 @@ e_task_wiget_unalert (ETaskWidget *task_widget) } -const char * +const gchar * e_task_widget_get_component_id (ETaskWidget *task_widget) { g_return_val_if_fail (task_widget != NULL, NULL); diff --git a/widgets/misc/e-task-widget.h b/widgets/misc/e-task-widget.h index 4770b9d108..c023d45030 100644 --- a/widgets/misc/e-task-widget.h +++ b/widgets/misc/e-task-widget.h @@ -55,25 +55,25 @@ struct _ETaskWidgetClass { GType e_task_widget_get_type (void); void e_task_widget_construct (ETaskWidget *task_widget, - const char *component_id, - const char *information, + const gchar *component_id, + const gchar *information, void (*cancel_func) (gpointer data), gpointer data); -GtkWidget * e_task_widget_new (const char *component_id, - const char *information); -GtkWidget * e_task_widget_new_with_cancel (const char *component_id, - const char *information, +GtkWidget * e_task_widget_new (const gchar *component_id, + const gchar *information); +GtkWidget * e_task_widget_new_with_cancel (const gchar *component_id, + const gchar *information, void (*cancel_func) (gpointer data), gpointer data); void e_task_widget_update (ETaskWidget *task_widget, - const char *information, + const gchar *information, double completion); GtkWidget * e_task_widget_update_image (ETaskWidget *task_widget, - const char *stock, - const char *text); + const gchar *stock, + const gchar *text); void e_task_wiget_alert (ETaskWidget *task_widget); void e_task_wiget_unalert (ETaskWidget *task_widget); -const char * e_task_widget_get_component_id (ETaskWidget *task_widget); +const gchar * e_task_widget_get_component_id (ETaskWidget *task_widget); #ifdef __cplusplus } diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index 2769001120..f1fed4dfab 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -97,7 +97,7 @@ e_utf8_strstrcasedecomp (const gchar *haystack, const gchar *needle) gint sc; sc = e_stripped_char (unival); if (sc) { - /* We have valid stripped char */ + /* We have valid stripped gchar */ if (sc == nuni[0]) { const gchar *q = p; gint npos = 1; @@ -145,7 +145,7 @@ e_utf8_strstrcase (const gchar *haystack, const gchar *needle) for (p = e_unicode_get_utf8 (o, &unival); p && unival; p = e_unicode_get_utf8 (p, &unival)) { gint sc; sc = g_unichar_tolower (unival); - /* We have valid stripped char */ + /* We have valid stripped gchar */ if (sc == nuni[0]) { const gchar *q = p; gint npos = 1; @@ -237,8 +237,8 @@ e_utf8_from_gtk_event_key (GtkWidget *widget, guint keyval, const gchar *string) gchar * e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) { - char *new, *ob; - const char *ib; + gchar *new, *ob; + const gchar *ib; size_t ibl, obl; if (!string) return NULL; @@ -246,8 +246,8 @@ e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) if (ic == (iconv_t) -1) { gint i; /* iso-8859-1 */ - ib = (char *) string; - new = ob = (char *)g_new (unsigned char, bytes * 2 + 1); + ib = (gchar *) string; + new = ob = (gchar *)g_new (unsigned char, bytes * 2 + 1); for (i = 0; i < (bytes); i ++) { ob += e_unichar_to_utf8 (ib[i], ob); } @@ -295,8 +295,8 @@ e_utf8_from_iconv_string (iconv_t ic, const gchar *string) gchar * e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) { - char *new, *ob; - const char *ib; + gchar *new, *ob; + const gchar *ib; size_t ibl, obl; if (!string) return NULL; @@ -306,7 +306,7 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) const gchar *u; gunichar uc; - new = (char *)g_new (unsigned char, bytes * 4 + 1); + new = (gchar *)g_new (unsigned char, bytes * 4 + 1); u = string; len = 0; @@ -362,7 +362,7 @@ gchar * e_utf8_from_charset_string_sized (const gchar *charset, const gchar *string, gint bytes) { iconv_t ic; - char *ret; + gchar *ret; if (!string) return NULL; @@ -384,7 +384,7 @@ gchar * e_utf8_to_charset_string_sized (const gchar *charset, const gchar *string, gint bytes) { iconv_t ic; - char *ret; + gchar *ret; if (!string) return NULL; @@ -406,7 +406,7 @@ gchar * e_utf8_from_locale_string_sized (const gchar *string, gint bytes) { iconv_t ic; - char *ret; + gchar *ret; if (!string) return NULL; @@ -428,7 +428,7 @@ gchar * e_utf8_to_locale_string_sized (const gchar *string, gint bytes) { iconv_t ic; - char *ret; + gchar *ret; if (!string) return NULL; @@ -449,7 +449,7 @@ e_utf8_to_locale_string (const gchar *string) gboolean e_utf8_is_ascii (const gchar *string) { - char c; + gchar c; g_return_val_if_fail (string != NULL, FALSE); @@ -488,7 +488,7 @@ e_utf8_gtk_editable_insert_text (GtkEditable *editable, const gchar *text, gint void e_utf8_gtk_editable_set_text (GtkEditable *editable, const gchar *text) { - int position; + gint position; gtk_editable_delete_text(editable, 0, -1); gtk_editable_insert_text (editable, text, strlen (text), &position); @@ -512,7 +512,7 @@ e_utf8_xml1_decode (const gchar *text) { const guchar *c; gchar *u, *d; - int len, s; + gint len, s; g_return_val_if_fail (text != NULL, NULL); @@ -533,8 +533,8 @@ e_utf8_xml1_decode (const gchar *text) isxdigit (c[s + 6]) && (c[s + 7] == '\\')) { /* Valid \U+XXXX\ sequence */ - int unival; - unival = strtol ((char *)(c + s + 3), NULL, 16); + gint unival; + unival = strtol ((gchar *)(c + s + 3), NULL, 16); d += e_unichar_to_utf8 (unival, d); s += 8; } else if (c[s] > 127) { @@ -555,8 +555,8 @@ gchar * e_utf8_xml1_encode (const gchar *text) { gchar *u, *d, *c; - unsigned int unival; - int len; + guint unival; + gint len; g_return_val_if_fail (text != NULL, NULL); @@ -568,7 +568,7 @@ e_utf8_xml1_encode (const gchar *text) len += 1; } } - d = c = (char *)g_new (guchar, len + 1); + d = c = (gchar *)g_new (guchar, len + 1); for (u = e_unicode_get_utf8 (text, &unival); u && unival; u = e_unicode_get_utf8 (u, &unival)) { if ((unival >= 0x80) || (unival == '\\')) { @@ -602,8 +602,8 @@ gint e_unichar_to_utf8 (gint c, gchar *outbuf) { size_t len = 0; - int first; - int i; + gint first; + gint i; if (c < 0x80) { @@ -1953,14 +1953,14 @@ e_canonical_decomposition (gunichar ch, gunichar * buf) if (ch <= 0xffff) { - int start = 0; - int end = sizeof (e_decomp_table) / sizeof (e_decomp_table[0]); + gint start = 0; + gint end = sizeof (e_decomp_table) / sizeof (e_decomp_table[0]); while (start != end) { - int half = (start + end) / 2; + gint half = (start + end) / 2; if (ch == e_decomp_table[half].ch) { /* Found it. */ - int i; + gint i; /* We store as a double-nul terminated string. */ for (len = 0; (e_decomp_table[half].expansion[len] || e_decomp_table[half].expansion[len + 1]); len += 2) ; @@ -2035,15 +2035,15 @@ e_xml_get_translated_utf8_string_prop_by_name (const xmlNode *parent, const xmlC prop = xmlGetProp ((xmlNode *) parent, prop_name); if (prop != NULL) { - ret_val = g_strdup ((char *)prop); + ret_val = g_strdup ((gchar *)prop); xmlFree (prop); return ret_val; } combined_name = g_strdup_printf("_%s", prop_name); - prop = xmlGetProp ((xmlNode *) parent, (unsigned char *)combined_name); + prop = xmlGetProp ((xmlNode *) parent, (guchar *)combined_name); if (prop != NULL) { - ret_val = g_strdup (gettext ((char *)prop)); + ret_val = g_strdup (gettext ((gchar *)prop)); xmlFree (prop); } g_free(combined_name); diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c index 6c8eab7c8b..2dd47ebb8f 100644 --- a/widgets/misc/e-url-entry.c +++ b/widgets/misc/e-url-entry.c @@ -186,7 +186,7 @@ entry_changed_cb (GtkEditable *editable, gpointer data) { EUrlEntry *url_entry; EUrlEntryPrivate *priv; - const char *url; + const gchar *url; url_entry = E_URL_ENTRY (data); priv = url_entry->priv; diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c index 6852010b24..68a9cc12f7 100644 --- a/widgets/misc/test-calendar.c +++ b/widgets/misc/test-calendar.c @@ -55,8 +55,8 @@ delete_event_cb (GtkWidget *widget, gtk_main_quit (); } -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { GtkWidget *window; GtkWidget *cal; diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c index 7468053f31..745c982b8d 100644 --- a/widgets/misc/test-dateedit.c +++ b/widgets/misc/test-dateedit.c @@ -47,8 +47,8 @@ static void on_time_changed (EDateEdit *dedit, gchar *name); #endif -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { GtkWidget *window; EDateEdit *dedit; diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c index b76174fb0e..7320fb9bac 100644 --- a/widgets/misc/test-dropdown-button.c +++ b/widgets/misc/test-dropdown-button.c @@ -39,9 +39,9 @@ static void item_activated (GtkWidget *widget, - void *data) + gpointer data) { - printf ("%s activated.\n", (char *) data); + printf ("%s activated.\n", (gchar *) data); } static GnomeUIInfo ui_info[] = { @@ -69,8 +69,8 @@ static GnomeUIInfo ui_info[] = { }; -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { GtkWidget *window; GtkWidget *menu; diff --git a/widgets/misc/test-error.c b/widgets/misc/test-error.c index e67e6985f5..a7d584bf6c 100644 --- a/widgets/misc/test-error.c +++ b/widgets/misc/test-error.c @@ -27,8 +27,8 @@ #include "e-error.h" -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { gtk_init (&argc, &argv); diff --git a/widgets/misc/test-info-label.c b/widgets/misc/test-info-label.c index 31298ed7c1..0f292a0487 100644 --- a/widgets/misc/test-info-label.c +++ b/widgets/misc/test-info-label.c @@ -36,8 +36,8 @@ delete_event_cb (GtkWidget *widget, gtk_main_quit (); } -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { GtkWidget *window; GtkWidget *info_label; diff --git a/widgets/misc/test-multi-config-dialog.c b/widgets/misc/test-multi-config-dialog.c index 34a7624a39..b8a43995bc 100644 --- a/widgets/misc/test-multi-config-dialog.c +++ b/widgets/misc/test-multi-config-dialog.c @@ -31,14 +31,14 @@ static void add_pages (EMultiConfigDialog *multi_config_dialog) { - int i; + gint i; for (i = 0; i < NUM_PAGES; i ++) { GtkWidget *widget; GtkWidget *page; - char *string; - char *title; - char *description; + gchar *string; + gchar *title; + gchar *description; string = g_strdup_printf ("This is page %d", i); description = g_strdup_printf ("Description of page %d", i); @@ -62,7 +62,7 @@ add_pages (EMultiConfigDialog *multi_config_dialog) static int delete_event_callback (GtkWidget *widget, GdkEventAny *event, - void *data) + gpointer data) { gtk_main_quit (); @@ -70,8 +70,8 @@ delete_event_callback (GtkWidget *widget, } -int -main (int argc, char **argv) +gint +main (gint argc, gchar **argv) { GtkWidget *dialog; diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c index 09e2187b82..583793e85f 100644 --- a/widgets/table/e-cell-checkbox.c +++ b/widgets/table/e-cell-checkbox.c @@ -41,11 +41,11 @@ static GdkPixbuf *checks [2]; static void ecc_print (ECellView *ecell_view, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width, double height) { cairo_t *cr = gtk_print_context_get_cairo_context (context); - const int value = GPOINTER_TO_INT ( + const gint value = GPOINTER_TO_INT ( e_table_model_value_at (ecell_view->e_table_model, model_col, row)); cairo_save (cr); diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 80d6294b2d..638058621d 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -78,15 +78,15 @@ static void e_cell_combo_dispose (GObject *object); static gint e_cell_combo_do_popup (ECellPopup *ecp, GdkEvent *event, - int row, - int view_col); + gint row, + gint view_col); static void e_cell_combo_select_matching_item (ECellCombo *ecc); static void e_cell_combo_show_popup (ECellCombo *ecc, - int row, - int view_col); + gint row, + gint view_col); static void e_cell_combo_get_popup_pos (ECellCombo *ecc, - int row, - int view_col, + gint row, + gint view_col, gint *x, gint *y, gint *height, @@ -100,7 +100,7 @@ static gint e_cell_combo_button_press (GtkWidget *popup_window, static gint e_cell_combo_button_release (GtkWidget *popup_window, GdkEventButton *event, ECellCombo *ecc); -static int e_cell_combo_key_press (GtkWidget *popup_window, +static gint e_cell_combo_key_press (GtkWidget *popup_window, GdkEventKey *event, ECellCombo *ecc); @@ -240,7 +240,7 @@ e_cell_combo_set_popdown_strings (ECellCombo *ecc, for (elem = strings; elem; elem = elem->next) { GtkTreeIter iter; - char *utf8_text = elem->data; + gchar *utf8_text = elem->data; gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, 0, utf8_text, -1); @@ -251,8 +251,8 @@ e_cell_combo_set_popdown_strings (ECellCombo *ecc, static gint e_cell_combo_do_popup (ECellPopup *ecp, GdkEvent *event, - int row, - int view_col) + gint row, + gint view_col) { ECellCombo *ecc = E_CELL_COMBO (ecp); guint32 time; @@ -297,7 +297,7 @@ e_cell_combo_select_matching_item (ECellCombo *ecc) ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view); ETableCol *ecol; gboolean found = FALSE; - char *cell_text; + gchar *cell_text; gboolean valid; GtkTreeSelection *selection; GtkTreeIter iter; @@ -313,7 +313,7 @@ e_cell_combo_select_matching_item (ECellCombo *ecc) for (valid = gtk_tree_model_get_iter_first (model, &iter); valid && !found; valid = gtk_tree_model_iter_next (model, &iter)) { - char *str = NULL; + gchar *str = NULL; gtk_tree_model_get (model, &iter, 0, &str, -1); @@ -336,7 +336,7 @@ e_cell_combo_select_matching_item (ECellCombo *ecc) } static void -e_cell_combo_show_popup (ECellCombo *ecc, int row, int view_col) +e_cell_combo_show_popup (ECellCombo *ecc, gint row, gint view_col) { gint x, y, width, height, old_width, old_height; @@ -366,8 +366,8 @@ e_cell_combo_show_popup (ECellCombo *ecc, int row, int view_col) /* Calculates the size and position of the popup window (like GtkCombo). */ static void e_cell_combo_get_popup_pos (ECellCombo *ecc, - int row, - int view_col, + gint row, + gint view_col, gint *x, gint *y, gint *height, diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c index 92c0dd98b6..6e95a1f5ea 100644 --- a/widgets/table/e-cell-date.c +++ b/widgets/table/e-cell-date.c @@ -40,15 +40,15 @@ G_DEFINE_TYPE (ECellDate, e_cell_date, E_CELL_TEXT_TYPE) #define localtime_r(timep, result) (localtime (timep) ? memcpy ((result), localtime (timep), sizeof (*(result))) : 0) #endif -static char * -ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) +static gchar * +ecd_get_text(ECellText *cell, ETableModel *model, gint col, gint row) { time_t date = GPOINTER_TO_INT (e_table_model_value_at(model, col, row)); time_t nowdate = time(NULL); time_t yesdate; struct tm then, now, yesterday; - char buf[100]; - char *temp; + gchar buf[100]; + gchar *temp; gboolean done = FALSE; if (date == 0) { @@ -83,7 +83,7 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) } } if (!done) { - int i; + gint i; for (i = 2; i < 7; i++) { yesdate = nowdate - 60 * 60 * 24 * i; localtime_r (&yesdate, &yesterday); @@ -111,7 +111,7 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) } static void -ecd_free_text(ECellText *cell, char *text) +ecd_free_text(ECellText *cell, gchar *text) { g_free(text); } @@ -156,7 +156,7 @@ e_cell_date_init (ECellDate *ecd) * Returns: an ECell object that can be used to render dates. */ ECell * -e_cell_date_new (const char *fontname, GtkJustification justify) +e_cell_date_new (const gchar *fontname, GtkJustification justify) { ECellDate *ecd = g_object_new (E_CELL_DATE_TYPE, NULL); diff --git a/widgets/table/e-cell-date.h b/widgets/table/e-cell-date.h index fece501726..968e387198 100644 --- a/widgets/table/e-cell-date.h +++ b/widgets/table/e-cell-date.h @@ -43,7 +43,7 @@ typedef struct { } ECellDateClass; GType e_cell_date_get_type (void); -ECell *e_cell_date_new (const char *fontname, GtkJustification justify); +ECell *e_cell_date_new (const gchar *fontname, GtkJustification justify); G_END_DECLS diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c index f84d8761c7..273343aaa1 100644 --- a/widgets/table/e-cell-hbox.c +++ b/widgets/table/e-cell-hbox.c @@ -48,11 +48,11 @@ G_DEFINE_TYPE (ECellHbox, e_cell_hbox, E_CELL_TYPE) * ECell::new_view method */ static ECellView * -ecv_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) +ecv_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view) { ECellHbox *ecv = E_CELL_HBOX (ecell); ECellHboxView *hbox_view = g_new0 (ECellHboxView, 1); - int i; + gint i; hbox_view->cell_view.ecell = ecell; hbox_view->cell_view.e_table_model = table_model; @@ -82,7 +82,7 @@ static void ecv_kill_view (ECellView *ecv) { ECellHboxView *hbox_view = (ECellHboxView *) ecv; - int i; + gint i; if (hbox_view->cell_view.kill_view_cb) (hbox_view->cell_view.kill_view_cb)(ecv, hbox_view->cell_view.kill_view_cb_data); @@ -107,7 +107,7 @@ static void ecv_realize (ECellView *ecell_view) { ECellHboxView *hbox_view = (ECellHboxView *) ecell_view; - int i; + gint i; /* realize our subcell view */ for (i = 0; i < hbox_view->subcell_view_count; i++) @@ -124,7 +124,7 @@ static void ecv_unrealize (ECellView *ecv) { ECellHboxView *hbox_view = (ECellHboxView *) ecv; - int i; + gint i; /* unrealize our subcell view. */ for (i = 0; i < hbox_view->subcell_view_count; i++) @@ -139,19 +139,19 @@ ecv_unrealize (ECellView *ecv) */ static void ecv_draw (ECellView *ecell_view, GdkDrawable *drawable, - int model_col, int view_col, int row, ECellFlags flags, - int x1, int y1, int x2, int y2) + gint model_col, gint view_col, gint row, ECellFlags flags, + gint x1, gint y1, gint x2, gint y2) { ECellHboxView *hbox_view = (ECellHboxView *)ecell_view; - int subcell_offset = 0; - int i; - int allotted_width = x2-x1; + gint subcell_offset = 0; + gint i; + gint allotted_width = x2-x1; for (i = 0; i < hbox_view->subcell_view_count; i++) { /* Now cause our subcells to draw their contents, shifted by subcell_offset pixels */ - int width = allotted_width * hbox_view->def_size_cols[i] / 100; + gint width = allotted_width * hbox_view->def_size_cols[i] / 100; /* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); if (width < hbox_view->def_size_cols[i]) width = hbox_view->def_size_cols[i]; @@ -168,12 +168,12 @@ ecv_draw (ECellView *ecell_view, GdkDrawable *drawable, * ECell::event method */ static gint -ecv_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions) +ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions) { ECellHboxView *hbox_view = (ECellHboxView *)ecell_view; - int y = 0; - int i; - int subcell_offset = 0; + gint y = 0; + gint i; + gint subcell_offset = 0; switch (event->type) { case GDK_BUTTON_PRESS: @@ -191,7 +191,7 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, } for (i = 0; i < hbox_view->subcell_view_count; i++) { - int width = e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); + gint width = e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); if (width < hbox_view->def_size_cols[i]) width = hbox_view->def_size_cols[i]; if (y < subcell_offset + width) @@ -205,11 +205,11 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, * ECell::height method */ static int -ecv_height (ECellView *ecell_view, int model_col, int view_col, int row) +ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { ECellHboxView *hbox_view = (ECellHboxView *)ecell_view; - int height = 0, max_height = 0; - int i; + gint height = 0, max_height = 0; + gint i; for (i = 0; i < hbox_view->subcell_view_count; i++) { height = e_cell_height (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); @@ -222,14 +222,14 @@ ecv_height (ECellView *ecell_view, int model_col, int view_col, int row) * ECell::max_width method */ static int -ecv_max_width (ECellView *ecell_view, int model_col, int view_col) +ecv_max_width (ECellView *ecell_view, gint model_col, gint view_col) { ECellHboxView *hbox_view = (ECellHboxView *)ecell_view; - int width = 0; - int i; + gint width = 0; + gint i; for (i = 0; i < hbox_view->subcell_view_count; i++) { - int cell_width = e_cell_max_width (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col); + gint cell_width = e_cell_max_width (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col); if (cell_width < hbox_view->def_size_cols[i]) cell_width = hbox_view->def_size_cols[i]; @@ -246,7 +246,7 @@ static void ecv_dispose (GObject *object) { ECellHbox *ecv = E_CELL_HBOX (object); - int i; + gint i; /* destroy our subcell */ for (i = 0; i < ecv->subcell_count; i++) @@ -305,7 +305,7 @@ e_cell_hbox_new (void) } void -e_cell_hbox_append (ECellHbox *hbox, ECell *subcell, int model_col, int size) +e_cell_hbox_append (ECellHbox *hbox, ECell *subcell, gint model_col, gint size) { hbox->subcell_count ++; diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h index dc726960fa..366d01fffe 100644 --- a/widgets/table/e-cell-hbox.h +++ b/widgets/table/e-cell-hbox.h @@ -38,18 +38,18 @@ G_BEGIN_DECLS typedef struct { ECell parent; - int subcell_count; + gint subcell_count; ECell **subcells; - int *model_cols; - int *def_size_cols; + gint *model_cols; + gint *def_size_cols; } ECellHbox; typedef struct { ECellView cell_view; - int subcell_view_count; + gint subcell_view_count; ECellView **subcell_views; - int *model_cols; - int *def_size_cols; + gint *model_cols; + gint *def_size_cols; } ECellHboxView; typedef struct { @@ -60,8 +60,8 @@ GType e_cell_hbox_get_type (void); ECell *e_cell_hbox_new (void); void e_cell_hbox_append (ECellHbox *vbox, ECell *subcell, - int model_col, - int size); + gint model_col, + gint size); G_END_DECLS diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c index 56754a05e5..63f55eb1c4 100644 --- a/widgets/table/e-cell-number.c +++ b/widgets/table/e-cell-number.c @@ -32,14 +32,14 @@ G_DEFINE_TYPE (ECellNumber, e_cell_number, E_CELL_TEXT_TYPE) -static char * -ecn_get_text(ECellText *cell, ETableModel *model, int col, int row) +static gchar * +ecn_get_text(ECellText *cell, ETableModel *model, gint col, gint row) { return e_format_number(GPOINTER_TO_INT (e_table_model_value_at(model, col, row))); } static void -ecn_free_text(ECellText *cell, char *text) +ecn_free_text(ECellText *cell, gchar *text) { g_free(text); } @@ -72,7 +72,7 @@ e_cell_number_init (ECellNumber *cell_number) * Returns: an ECell object that can be used to render numbers. */ ECell * -e_cell_number_new (const char *fontname, GtkJustification justify) +e_cell_number_new (const gchar *fontname, GtkJustification justify) { ECellNumber *ecn = g_object_new (E_CELL_NUMBER_TYPE, NULL); diff --git a/widgets/table/e-cell-number.h b/widgets/table/e-cell-number.h index 75471f7a2c..fcba9f517a 100644 --- a/widgets/table/e-cell-number.h +++ b/widgets/table/e-cell-number.h @@ -43,7 +43,7 @@ typedef struct { } ECellNumberClass; GType e_cell_number_get_type (void); -ECell *e_cell_number_new (const char *fontname, GtkJustification justify); +ECell *e_cell_number_new (const gchar *fontname, GtkJustification justify); G_END_DECLS diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index ea141305b9..cf90909d6f 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -76,7 +76,7 @@ e_cell_pixbuf_construct (ECellPixbuf *ecp) */ static ECellView * -pixbuf_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) +pixbuf_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view) { ECellPixbufView *pixbuf_view = g_new0 (ECellPixbufView, 1); ETableItem *eti = E_TABLE_ITEM (e_table_item_view); @@ -109,12 +109,12 @@ pixbuf_kill_view (ECellView *ecell_view) static void pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable, - int model_col, int view_col, int row, ECellFlags flags, - int x1, int y1, int x2, int y2) + gint model_col, gint view_col, gint row, ECellFlags flags, + gint x1, gint y1, gint x2, gint y2) { GdkPixbuf *cell_pixbuf; - int real_x, real_y, real_w, real_h; - int pix_w, pix_h; + gint real_x, real_y, real_w, real_h; + gint pix_w, pix_h; cairo_t *cr; cell_pixbuf = e_table_model_value_at (ecell_view->e_table_model, @@ -133,7 +133,7 @@ pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable, /* We center the pixbuf within our allocated space */ if (x2 - x1 > pix_w) { - int diff = (x2 - x1) - pix_w; + gint diff = (x2 - x1) - pix_w; real_x = x1 + diff/2; real_w = pix_w; } else { @@ -142,7 +142,7 @@ pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable, } if (y2 - y1 > pix_h) { - int diff = (y2 - y1) - pix_h; + gint diff = (y2 - y1) - pix_h; real_y = y1 + diff/2; real_h = pix_h; } else { @@ -160,7 +160,7 @@ pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable, static gint pixbuf_event (ECellView *ecell_view, GdkEvent *event, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions) { /* noop */ @@ -169,7 +169,7 @@ pixbuf_event (ECellView *ecell_view, GdkEvent *event, } static gint -pixbuf_height (ECellView *ecell_view, int model_col, int view_col, int row) +pixbuf_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { GdkPixbuf *pixbuf; if (row == -1) { @@ -193,11 +193,11 @@ pixbuf_height (ECellView *ecell_view, int model_col, int view_col, int row) */ static void pixbuf_print (ECellView *ecell_view, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width, double height) { GdkPixbuf *pixbuf; - int scale; + gint scale; cairo_t *cr = gtk_print_context_get_cairo_context (context); pixbuf = (GdkPixbuf *) e_table_model_value_at (ecell_view->e_table_model, 1, row); @@ -214,7 +214,7 @@ pixbuf_print (ECellView *ecell_view, GtkPrintContext *context, static gdouble pixbuf_print_height (ECellView *ecell_view, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width) { GdkPixbuf *pixbuf; @@ -236,9 +236,9 @@ pixbuf_print_height (ECellView *ecell_view, GtkPrintContext *context, } static gint -pixbuf_max_width (ECellView *ecell_view, int model_col, int view_col) +pixbuf_max_width (ECellView *ecell_view, gint model_col, gint view_col) { - int pw; + gint pw; gint num_rows, i; gint max_width = -1; diff --git a/widgets/table/e-cell-pixbuf.h b/widgets/table/e-cell-pixbuf.h index 850e9d535d..f6d3c5173d 100644 --- a/widgets/table/e-cell-pixbuf.h +++ b/widgets/table/e-cell-pixbuf.h @@ -39,9 +39,9 @@ typedef struct _ECellPixbufClass ECellPixbufClass; struct _ECellPixbuf { ECell parent; - int selected_column; - int focused_column; - int unselected_column; + gint selected_column; + gint focused_column; + gint unselected_column; }; struct _ECellPixbufClass { diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index 8a8918dc70..5fcd13fce4 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -76,7 +76,7 @@ static int ecp_height (ECellView *ecv, int model_col, int view_col, int row); -static void* ecp_enter_edit (ECellView *ecv, +static gpointer ecp_enter_edit (ECellView *ecv, int model_col, int view_col, int row); @@ -107,12 +107,12 @@ static void ecp_show_tooltip (ECellView *ecv, int row, int col_width, ETableTooltip *tooltip); -static char *ecp_get_bg_color (ECellView *ecell_view, int row); +static gchar *ecp_get_bg_color (ECellView *ecell_view, gint row); static gint e_cell_popup_do_popup (ECellPopupView *ecp_view, GdkEvent *event, - int row, - int model_col); + gint row, + gint model_col); G_DEFINE_TYPE (ECellPopup, e_cell_popup, E_CELL_TYPE) @@ -189,7 +189,7 @@ e_cell_popup_dispose (GObject *object) * ECell::new_view method */ static ECellView * -ecp_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) +ecp_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view) { ECellPopup *ecp = E_CELL_POPUP (ecell); ECellPopupView *ecp_view; @@ -267,8 +267,8 @@ ecp_unrealize (ECellView *ecv) */ static void ecp_draw (ECellView *ecv, GdkDrawable *drawable, - int model_col, int view_col, int row, ECellFlags flags, - int x1, int y1, int x2, int y2) + gint model_col, gint view_col, gint row, ECellFlags flags, + gint x1, gint y1, gint x2, gint y2) { ECellPopup *ecp = E_CELL_POPUP (ecv->ecell); ECellPopupView *ecp_view = (ECellPopupView *) ecv; @@ -326,13 +326,13 @@ ecp_draw (ECellView *ecv, GdkDrawable *drawable, * ECell::event method */ static gint -ecp_event (ECellView *ecv, GdkEvent *event, int model_col, int view_col, - int row, ECellFlags flags, ECellActions *actions) +ecp_event (ECellView *ecv, GdkEvent *event, gint model_col, gint view_col, + gint row, ECellFlags flags, ECellActions *actions) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; ECellPopup *ecp = E_CELL_POPUP (ecp_view->cell_view.ecell); ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view); - int width; + gint width; switch (event->type) { case GDK_BUTTON_PRESS: @@ -369,7 +369,7 @@ ecp_event (ECellView *ecv, GdkEvent *event, int model_col, int view_col, * ECell::height method */ static int -ecp_height (ECellView *ecv, int model_col, int view_col, int row) +ecp_height (ECellView *ecv, gint model_col, gint view_col, gint row) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; @@ -380,8 +380,8 @@ ecp_height (ECellView *ecv, int model_col, int view_col, int row) /* * ECellView::enter_edit method */ -static void * -ecp_enter_edit (ECellView *ecv, int model_col, int view_col, int row) +static gpointer +ecp_enter_edit (ECellView *ecv, gint model_col, gint view_col, gint row) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; @@ -393,8 +393,8 @@ ecp_enter_edit (ECellView *ecv, int model_col, int view_col, int row) * ECellView::leave_edit method */ static void -ecp_leave_edit (ECellView *ecv, int model_col, int view_col, int row, - void *edit_context) +ecp_leave_edit (ECellView *ecv, gint model_col, gint view_col, gint row, + gpointer edit_context) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; @@ -405,7 +405,7 @@ ecp_leave_edit (ECellView *ecv, int model_col, int view_col, int row, static void ecp_print (ECellView *ecv, GtkPrintContext *context, - int model_col, int view_col, int row, double width, double height) + gint model_col, gint view_col, gint row, double width, double height) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; @@ -416,7 +416,7 @@ ecp_print (ECellView *ecv, GtkPrintContext *context, static gdouble ecp_print_height (ECellView *ecv, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; @@ -428,8 +428,8 @@ ecp_print_height (ECellView *ecv, GtkPrintContext *context, static int ecp_max_width (ECellView *ecv, - int model_col, - int view_col) + gint model_col, + gint view_col) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; @@ -439,10 +439,10 @@ ecp_max_width (ECellView *ecv, static void ecp_show_tooltip (ECellView *ecv, - int model_col, - int view_col, - int row, - int col_width, + gint model_col, + gint view_col, + gint row, + gint col_width, ETableTooltip *tooltip) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; @@ -451,8 +451,8 @@ ecp_show_tooltip (ECellView *ecv, col_width, tooltip); } -static char * -ecp_get_bg_color (ECellView *ecell_view, int row) +static gchar * +ecp_get_bg_color (ECellView *ecell_view, gint row) { ECellPopupView *ecp_view = (ECellPopupView *) ecell_view; @@ -487,11 +487,11 @@ e_cell_popup_set_child (ECellPopup *ecp, static gint e_cell_popup_do_popup (ECellPopupView *ecp_view, GdkEvent *event, - int row, - int view_col) + gint row, + gint view_col) { ECellPopup *ecp = E_CELL_POPUP (ecp_view->cell_view.ecell); - gint (*popup_func) (ECellPopup *ecp, GdkEvent *event, int row, int view_col); + gint (*popup_func) (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col); ecp->popup_cell_view = ecp_view; diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h index c1262a1234..b1e40a9845 100644 --- a/widgets/table/e-cell-popup.h +++ b/widgets/table/e-cell-popup.h @@ -71,7 +71,7 @@ typedef struct { ECellClass parent_class; /* Virtual function for subclasses to override. */ - gint (*popup) (ECellPopup *ecp, GdkEvent *event, int row, int view_col); + gint (*popup) (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col); } ECellPopupClass; diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c index ca4078512f..1fa949ec6a 100644 --- a/widgets/table/e-cell-size.c +++ b/widgets/table/e-cell-size.c @@ -31,8 +31,8 @@ G_DEFINE_TYPE (ECellSize, e_cell_size, E_CELL_TEXT_TYPE) -static char * -ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) +static gchar * +ecd_get_text(ECellText *cell, ETableModel *model, gint col, gint row) { gint size = GPOINTER_TO_INT(e_table_model_value_at(model, col, row)); gfloat fsize; @@ -51,7 +51,7 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) } static void -ecd_free_text(ECellText *cell, char *text) +ecd_free_text(ECellText *cell, gchar *text) { g_free(text); } @@ -96,7 +96,7 @@ e_cell_size_init (ECellSize *e_cell_size) * * Returns: an ECell object that can be used to render file sizes. */ ECell * -e_cell_size_new (const char *fontname, GtkJustification justify) +e_cell_size_new (const gchar *fontname, GtkJustification justify) { ECellSize *ecd = g_object_new (E_CELL_SIZE_TYPE, NULL); diff --git a/widgets/table/e-cell-size.h b/widgets/table/e-cell-size.h index ed0d279f6b..2b335d7717 100644 --- a/widgets/table/e-cell-size.h +++ b/widgets/table/e-cell-size.h @@ -44,7 +44,7 @@ typedef struct { } ECellSizeClass; GType e_cell_size_get_type (void); -ECell *e_cell_size_new (const char *fontname, GtkJustification justify); +ECell *e_cell_size_new (const gchar *fontname, GtkJustification justify); G_END_DECLS diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 3a03fe51e7..409f933dae 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -73,10 +73,10 @@ /* This defines a line of text */ struct line { - char *text; /* Line's text UTF-8, it is a pointer into the text->text string */ - int length; /* Line's length in BYTES */ - int width; /* Line's width in pixels */ - int ellipsis_length; /* Length before adding ellipsis in BYTES */ + gchar *text; /* Line's text UTF-8, it is a pointer into the text->text string */ + gint length; /* Line's length in BYTES */ + gint width; /* Line's width in pixels */ + gint ellipsis_length; /* Length before adding ellipsis in BYTES */ }; /* Object argument IDs */ @@ -116,9 +116,9 @@ G_DEFINE_TYPE (ECellText, e_cell_text, E_CELL_TYPE) typedef struct { gpointer lines; /* Text split into lines (private field) */ - int num_lines; /* Number of lines of text */ - int max_width; - int ref_count; + gint num_lines; /* Number of lines of text */ + gint max_width; + gint ref_count; } ECellTextLineBreaks; @@ -138,7 +138,7 @@ typedef struct { CellEdit *edit; - int xofs, yofs; /* This gets added to the x + gint xofs, yofs; /* This gets added to the x and y for the cell text. */ double ellipsis_width[2]; /* The width of the ellipsis. */ } ECellTextView; @@ -147,26 +147,26 @@ struct _CellEdit { ECellTextView *text_view; - int model_col, view_col, row; - int cell_width; + gint model_col, view_col, row; + gint cell_width; PangoLayout *layout; - char *text; + gchar *text; - char *old_text; + gchar *old_text; /* * Where the editing is taking place */ - int xofs_edit, yofs_edit; /* Offset because of editing. + gint xofs_edit, yofs_edit; /* Offset because of editing. This is negative compared to the other offsets. */ /* This needs to be reworked a bit once we get line wrapping. */ - int selection_start; /* Start of selection - IN BYTES */ - int selection_end; /* End of selection - IN BYTES */ + gint selection_start; /* Start of selection - IN BYTES */ + gint selection_end; /* End of selection - IN BYTES */ gboolean select_by_word; /* Current selection is by word */ /* This section is for drag scrolling and blinking cursor. */ @@ -200,7 +200,7 @@ struct _CellEdit { static void e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand *command, gpointer data); static void e_cell_text_view_get_selection (CellEdit *edit, GdkAtom selection, guint32 time); -static void e_cell_text_view_supply_selection (CellEdit *edit, guint time, GdkAtom selection, char *data, gint length); +static void e_cell_text_view_supply_selection (CellEdit *edit, guint time, GdkAtom selection, gchar *data, gint length); static void _get_tep (CellEdit *edit); @@ -213,13 +213,13 @@ 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, const gchar *string, int value); +static void _insert (ECellTextView *text_view, const gchar *string, gint value); static void _delete_selection (ECellTextView *text_view); -static PangoAttrList* build_attr_list (ECellTextView *text_view, int row, int text_length); +static PangoAttrList* build_attr_list (ECellTextView *text_view, gint row, gint text_length); static void update_im_cursor_location (ECellTextView *tv); -char * -e_cell_text_get_text (ECellText *cell, ETableModel *model, int col, int row) +gchar * +e_cell_text_get_text (ECellText *cell, ETableModel *model, gint col, gint row) { if (ECT_CLASS(cell)->get_text) return ECT_CLASS(cell)->get_text (cell, model, col, row); @@ -228,44 +228,44 @@ e_cell_text_get_text (ECellText *cell, ETableModel *model, int col, int row) } void -e_cell_text_free_text (ECellText *cell, char *text) +e_cell_text_free_text (ECellText *cell, gchar *text) { if (ECT_CLASS(cell)->free_text) ECT_CLASS(cell)->free_text (cell, text); } void -e_cell_text_set_value (ECellText *cell, ETableModel *model, int col, int row, - const char *text) +e_cell_text_set_value (ECellText *cell, ETableModel *model, gint col, gint row, + const gchar *text) { if (ECT_CLASS(cell)->set_value) ECT_CLASS(cell)->set_value (cell, model, col, row, text); } -static char * -ect_real_get_text (ECellText *cell, ETableModel *model, int col, int row) +static gchar * +ect_real_get_text (ECellText *cell, ETableModel *model, gint col, gint row) { return e_table_model_value_at(model, col, row); } static void -ect_real_free_text (ECellText *cell, char *text) +ect_real_free_text (ECellText *cell, gchar *text) { } /* This is the default method for setting the ETableModel value based on the text in the ECellText. This simply uses the text as it is - it assumes - the value in the model is a char*. Subclasses may parse the text into + the value in the model is a gchar *. Subclasses may parse the text into data structures to pass to the model. */ static void -ect_real_set_value (ECellText *cell, ETableModel *model, int col, int row, - const char *text) +ect_real_set_value (ECellText *cell, ETableModel *model, gint col, gint row, + const gchar *text) { e_table_model_set_value_at (model, col, row, text); } static void -ect_queue_redraw (ECellTextView *text_view, int view_col, int view_row) +ect_queue_redraw (ECellTextView *text_view, gint view_col, gint view_row) { e_table_item_redraw_range ( text_view->cell_view.e_table_item_view, @@ -279,8 +279,8 @@ static void ect_stop_editing (ECellTextView *text_view, gboolean commit) { CellEdit *edit = text_view->edit; - int row, view_col, model_col; - char *old_text, *text; + gint row, view_col, model_col; + gchar *old_text, *text; if (!edit) return; @@ -350,7 +350,7 @@ ect_cancel_edit (ECellTextView *text_view) * ECell::new_view method */ static ECellView * -ect_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) +ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view) { ECellTextView *text_view = g_new0 (ECellTextView, 1); GnomeCanvas *canvas = GNOME_CANVAS_ITEM (e_table_item_view)->canvas; @@ -456,7 +456,7 @@ ect_free_color (gchar *color_spec, GdkColor *color, GdkColormap *colormap) static PangoAttrList* -build_attr_list (ECellTextView *text_view, int row, int text_length) +build_attr_list (ECellTextView *text_view, gint row, gint text_length) { ECellView *ecell_view = (ECellView *) text_view; @@ -501,7 +501,7 @@ build_attr_list (ECellTextView *text_view, int row, int text_length) } static PangoLayout * -layout_with_preedit (ECellTextView *text_view, int row, const char *text, gint width) +layout_with_preedit (ECellTextView *text_view, gint row, const gchar *text, gint width) { CellEdit *edit = text_view->edit; PangoAttrList *attrs ; @@ -563,7 +563,7 @@ layout_with_preedit (ECellTextView *text_view, int row, const char *text, gint w } static PangoLayout * -build_layout (ECellTextView *text_view, int row, const char *text, gint width) +build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width) { ECellView *ecell_view = (ECellView *) text_view; ECellText *ect = E_CELL_TEXT (ecell_view->ecell); @@ -592,13 +592,13 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width) if (ect->font_name) { PangoFontDescription *desc = NULL, *fixed_desc = NULL; - char *fixed_family = NULL; + gchar *fixed_family = NULL; gint fixed_size = 0; gboolean fixed_points = TRUE; fixed_desc = pango_font_description_from_string (ect->font_name); if (fixed_desc) { - fixed_family = (char *)pango_font_description_get_family (fixed_desc); + fixed_family = (gchar *)pango_font_description_get_family (fixed_desc); fixed_size = pango_font_description_get_size (fixed_desc); fixed_points = !pango_font_description_get_size_is_absolute (fixed_desc); } @@ -637,7 +637,7 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width) } static PangoLayout * -generate_layout (ECellTextView *text_view, int model_col, int view_col, int row, int width) +generate_layout (ECellTextView *text_view, gint model_col, gint view_col, gint row, gint width) { ECellView *ecell_view = (ECellView *) text_view; ECellText *ect = E_CELL_TEXT (ecell_view->ecell); @@ -650,7 +650,7 @@ generate_layout (ECellTextView *text_view, int model_col, int view_col, int row, } if (row >= 0) { - char *temp = e_cell_text_get_text(ect, ecell_view->e_table_model, model_col, row); + gchar *temp = e_cell_text_get_text(ect, ecell_view->e_table_model, model_col, row); layout = build_layout (text_view, row, temp ? temp : "?", width); e_cell_text_free_text(ect, temp); } else @@ -661,10 +661,10 @@ generate_layout (ECellTextView *text_view, int model_col, int view_col, int row, static void -draw_pango_rectangle (GdkDrawable *drawable, GdkGC *gc, int x1, int y1, PangoRectangle rect) +draw_pango_rectangle (GdkDrawable *drawable, GdkGC *gc, gint x1, gint y1, PangoRectangle rect) { - int width = rect.width / PANGO_SCALE; - int height = rect.height / PANGO_SCALE; + gint width = rect.width / PANGO_SCALE; + gint height = rect.height / PANGO_SCALE; if (width <= 0) width = 1; if (height <= 0) @@ -676,15 +676,15 @@ draw_pango_rectangle (GdkDrawable *drawable, GdkGC *gc, int x1, int y1, PangoRec static gboolean show_pango_rectangle (CellEdit *edit, PangoRectangle rect) { - int x1 = rect.x / PANGO_SCALE; - int x2 = (rect.x + rect.width) / PANGO_SCALE; + gint x1 = rect.x / PANGO_SCALE; + gint x2 = (rect.x + rect.width) / PANGO_SCALE; #if 0 - int y1 = rect.y / PANGO_SCALE; - int y2 = (rect.y + rect.height) / PANGO_SCALE; + gint y1 = rect.y / PANGO_SCALE; + gint y2 = (rect.y + rect.height) / PANGO_SCALE; #endif - int new_xofs_edit = edit->xofs_edit; - int new_yofs_edit = edit->yofs_edit; + gint new_xofs_edit = edit->xofs_edit; + gint new_yofs_edit = edit->yofs_edit; if (x1 < new_xofs_edit) new_xofs_edit = x1; @@ -717,8 +717,8 @@ show_pango_rectangle (CellEdit *edit, PangoRectangle rect) */ static void ect_draw (ECellView *ecell_view, GdkDrawable *drawable, - int model_col, int view_col, int row, ECellFlags flags, - int x1, int y1, int x2, int y2) + gint model_col, gint view_col, gint row, ECellFlags flags, + gint x1, gint y1, gint x2, gint y2) { PangoLayout *layout; ECellTextView *text_view = (ECellTextView *) ecell_view; @@ -728,7 +728,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, GdkColor *foreground; GtkWidget *canvas = GTK_WIDGET (text_view->canvas); GdkRectangle clip_rect; - int x_origin, y_origin; + gint x_origin, y_origin; selected = flags & E_CELL_SELECTED; @@ -741,7 +741,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, foreground = &canvas->style->text [GTK_STATE_NORMAL]; if (ect->color_column != -1) { - char *color_spec; + gchar *color_spec; GdkColor *cell_foreground; color_spec = e_table_model_value_at (ecell_view->e_table_model, @@ -783,7 +783,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, if (edit && edit->view_col == view_col && edit->row == row) { if (edit->selection_start != edit->selection_end) { - int start_index, end_index; + gint start_index, end_index; PangoLayoutLine *line; gint *ranges; gint n_ranges, i; @@ -861,7 +861,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, * Get the background color */ static gchar * -ect_get_bg_color(ECellView *ecell_view, int row) +ect_get_bg_color(ECellView *ecell_view, gint row) { ECellText *ect = E_CELL_TEXT (ecell_view->ecell); gchar *color_spec; @@ -902,7 +902,7 @@ key_begins_editing (GdkEventKey *event) * ECell::event method */ static gint -ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions) +ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions) { ECellTextView *text_view = (ECellTextView *) ecell_view; ETextEventProcessorEvent e_tep_event; @@ -1146,7 +1146,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, * ECell::height method */ static int -ect_height (ECellView *ecell_view, int model_col, int view_col, int row) +ect_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { ECellTextView *text_view = (ECellTextView *) ecell_view; gint height; @@ -1161,13 +1161,13 @@ ect_height (ECellView *ecell_view, int model_col, int view_col, int row) /* * ECellView::enter_edit method */ -static void * -ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row) +static gpointer +ect_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row) { ECellTextView *text_view = (ECellTextView *) ecell_view; CellEdit *edit; ECellText *ect = E_CELL_TEXT(ecell_view->ecell); - char *temp; + gchar *temp; edit = g_new0 (CellEdit, 1); text_view->edit = edit; @@ -1238,7 +1238,7 @@ ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row) * ECellView::leave_edit method */ static void -ect_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context) +ect_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context) { ECellTextView *text_view = (ECellTextView *) ecell_view; CellEdit *edit = text_view->edit; @@ -1255,13 +1255,13 @@ ect_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, voi /* * ECellView::save_state method */ -static void * -ect_save_state (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context) +static gpointer +ect_save_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context) { ECellTextView *text_view = (ECellTextView *) ecell_view; CellEdit *edit = text_view->edit; - int *save_state = g_new (int, 2); + gint *save_state = g_new (int, 2); save_state[0] = edit->selection_start; save_state[1] = edit->selection_end; @@ -1272,12 +1272,12 @@ ect_save_state (ECellView *ecell_view, int model_col, int view_col, int row, voi * ECellView::load_state method */ static void -ect_load_state (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context, void *save_state) +ect_load_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context, gpointer save_state) { ECellTextView *text_view = (ECellTextView *) ecell_view; CellEdit *edit = text_view->edit; - int length; - int *selection = save_state; + gint length; + gint *selection = save_state; length = strlen (edit->text); @@ -1291,7 +1291,7 @@ ect_load_state (ECellView *ecell_view, int model_col, int view_col, int row, voi * ECellView::free_state method */ static void -ect_free_state (ECellView *ecell_view, int model_col, int view_col, int row, void *save_state) +ect_free_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer save_state) { g_free (save_state); } @@ -1308,11 +1308,11 @@ get_font_description_for_size (double h) } static void -get_font_size (PangoLayout *layout, PangoFontDescription *font, const char *text, +get_font_size (PangoLayout *layout, PangoFontDescription *font, const gchar *text, double *width, double *height) { - int w; - int h; + gint w; + gint h; g_return_if_fail (layout != NULL); pango_layout_set_font_description (layout, font); @@ -1328,7 +1328,7 @@ get_font_size (PangoLayout *layout, PangoFontDescription *font, const char *text static void ect_print (ECellView *ecell_view, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width, double height) { PangoFontDescription *font_des = get_font_description_for_size (12); @@ -1341,7 +1341,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, PangoDirection dir; gboolean strikeout, underline; cairo_t *cr; - char *string; + gchar *string; double ty, ly, text_width = 0.0, text_height = 0.0; @@ -1417,7 +1417,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, static gdouble ect_print_height (ECellView *ecell_view, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width) { /* @@ -1432,20 +1432,20 @@ ect_print_height (ECellView *ecell_view, GtkPrintContext *context, static int ect_max_width (ECellView *ecell_view, - int model_col, - int view_col) + gint model_col, + gint view_col) { /* New ECellText */ ECellTextView *text_view = (ECellTextView *) ecell_view; - int row; - int number_of_rows; - int max_width = 0; + gint row; + gint number_of_rows; + gint max_width = 0; number_of_rows = e_table_model_row_count (ecell_view->e_table_model); for (row = 0; row < number_of_rows; row++) { PangoLayout *layout = generate_layout (text_view, model_col, view_col, row, 0); - int width; + gint width; pango_layout_get_pixel_size (layout, &width, NULL); @@ -1458,13 +1458,13 @@ ect_max_width (ECellView *ecell_view, static int ect_max_width_by_row (ECellView *ecell_view, - int model_col, - int view_col, - int row) + gint model_col, + gint view_col, + gint row) { /* New ECellText */ ECellTextView *text_view = (ECellTextView *) ecell_view; - int width; + gint width; PangoLayout *layout; if (row >= e_table_model_row_count (ecell_view->e_table_model)) @@ -1519,10 +1519,10 @@ tooltip_event (GtkWidget *window, static void ect_show_tooltip (ECellView *ecell_view, - int model_col, - int view_col, - int row, - int col_width, + gint model_col, + gint view_col, + gint row, + gint col_width, ETableTooltip *tooltip) { ECellTextView *text_view = (ECellTextView *) ecell_view; @@ -1530,7 +1530,7 @@ ect_show_tooltip (ECellView *ecell_view, double i2c[6]; ArtPoint origin = {0, 0}; ArtPoint pixel_origin; - int canvas_x, canvas_y; + gint canvas_x, canvas_y; GnomeCanvasItem *tooltip_text; double tooltip_width; double tooltip_height; @@ -1540,7 +1540,7 @@ ect_show_tooltip (ECellView *ecell_view, ECellText *ect = E_CELL_TEXT(ecell_view->ecell); GtkWidget *window; PangoLayout *layout; - int width, height; + gint width, height; tooltip->timer = 0; @@ -1733,7 +1733,7 @@ ect_get_property (GObject *object, } } -static char *ellipsis_default = NULL; +static gchar *ellipsis_default = NULL; static gboolean use_ellipsis_default = TRUE; static void @@ -1741,7 +1741,7 @@ e_cell_text_class_init (ECellTextClass *klass) { ECellClass *ecc = E_CELL_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass); - const char *ellipsis_env; + const gchar *ellipsis_env; object_class->finalize = ect_finalize; @@ -1972,7 +1972,7 @@ e_cell_text_delete_surrounding_cb (GtkIMContext *context, gint n_chars, ECellTextView *tv) { - int begin_pos, end_pos; + gint begin_pos, end_pos; glong text_len; CellEdit *edit = tv->edit; @@ -2020,7 +2020,7 @@ e_cell_text_init (ECellText *ect) * Returns: The ECellText. */ ECell * -e_cell_text_construct (ECellText *cell, const char *fontname, GtkJustification justify) +e_cell_text_construct (ECellText *cell, const gchar *fontname, GtkJustification justify) { if(!cell) return E_CELL(NULL); @@ -2037,7 +2037,7 @@ e_cell_text_construct (ECellText *cell, const char *fontname, GtkJustification j * * Creates a new ECell renderer that can be used to render strings that * that come from the model. The value returned from the model is - * interpreted as being a char *. + * interpreted as being a gchar *. * * The ECellText object support a large set of properties that can be * configured through the Gtk argument system and allows the user to have @@ -2056,7 +2056,7 @@ e_cell_text_construct (ECellText *cell, const char *fontname, GtkJustification j * Returns: an ECell object that can be used to render strings. */ ECell * -e_cell_text_new (const char *fontname, GtkJustification justify) +e_cell_text_new (const gchar *fontname, GtkJustification justify) { ECellText *ect = g_object_new (E_CELL_TEXT_TYPE, NULL); @@ -2072,9 +2072,9 @@ e_cell_text_new (const char *fontname, GtkJustification justify) static gint get_position_from_xy (CellEdit *edit, gint x, gint y) { - int index; - int trailing; - const char *text; + gint index; + gint trailing; + const gchar *text; PangoLayout *layout = generate_layout (edit->text_view, edit->model_col, edit->view_col, edit->row, edit->cell_width); ECellTextView *text_view = edit->text_view; @@ -2102,7 +2102,7 @@ _blink_scroll_timeout (gpointer data) gulong current_time; gboolean scroll = FALSE; gboolean redraw = FALSE; - int width, height; + gint width, height; g_timer_elapsed (edit->timer, ¤t_time); @@ -2164,10 +2164,10 @@ _blink_scroll_timeout (gpointer data) } static int -next_word (CellEdit *edit, int start) +next_word (CellEdit *edit, gint start) { - char *p; - int length; + gchar *p; + gint length; length = strlen (edit->text); if (start >= length) @@ -2188,12 +2188,12 @@ next_word (CellEdit *edit, int start) static int _get_position (ECellTextView *text_view, ETextEventProcessorCommand *command) { - int length; + gint length; CellEdit *edit = text_view->edit; gchar *p; - int unival; - int index; - int trailing; + gint unival; + gint index; + gint trailing; switch (command->position) { @@ -2360,10 +2360,10 @@ _delete_selection (ECellTextView *text_view) /* NB! We expect value to be length IN BYTES */ static void -_insert (ECellTextView *text_view, const gchar *string, int value) +_insert (ECellTextView *text_view, const gchar *string, gint value) { CellEdit *edit = text_view->edit; - char *temp; + gchar *temp; if (value <= 0) return; @@ -2386,16 +2386,16 @@ _insert (ECellTextView *text_view, const gchar *string, int value) } static void -capitalize (CellEdit *edit, int start, int end, ETextEventProcessorCaps type) +capitalize (CellEdit *edit, gint start, gint end, ETextEventProcessorCaps type) { ECellTextView *text_view = edit->text_view; gboolean first = TRUE; - int character_length = g_utf8_strlen (edit->text + start, start - end); - const char *p = edit->text + start; - const char *text_end = edit->text + end; - char *new_text = g_new0 (char, character_length * 6 + 1); - char *output = new_text; + gint character_length = g_utf8_strlen (edit->text + start, start - end); + const gchar *p = edit->text + start; + const gchar *text_end = edit->text + end; + gchar *new_text = g_new0 (char, character_length * 6 + 1); + gchar *output = new_text; while (p && *p && p < text_end && g_unichar_validate (g_utf8_get_char (p))) { gunichar unival = g_utf8_get_char (p); @@ -2446,7 +2446,7 @@ e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand * gboolean change = FALSE; gboolean redraw = FALSE; - int sel_start, sel_end; + gint sel_start, sel_end; /* If the EText isn't editable, then ignore any commands that would modify the text. */ @@ -2540,8 +2540,8 @@ e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand * if (edit->selection_start == edit->selection_end) { capitalize (edit, edit->selection_start, next_word (edit, edit->selection_start), command->value); } else { - int selection_start = MIN (edit->selection_start, edit->selection_end); - int selection_end = edit->selection_start + edit->selection_end - selection_start; /* Slightly faster than MAX */ + gint selection_start = MIN (edit->selection_start, edit->selection_end); + gint selection_end = edit->selection_start + edit->selection_end - selection_start; /* Slightly faster than MAX */ capitalize (edit, selection_start, selection_end, command->value); } if (edit->timer) { @@ -2581,7 +2581,7 @@ e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand * } static void -e_cell_text_view_supply_selection (CellEdit *edit, guint time, GdkAtom selection, char *data, gint length) +e_cell_text_view_supply_selection (CellEdit *edit, guint time, GdkAtom selection, gchar *data, gint length) { #if DO_SELECTION GtkClipboard *clipboard; @@ -2612,7 +2612,7 @@ paste_received (GtkClipboard *clipboard, ETextEventProcessorCommand command; command.action = E_TEP_INSERT; command.position = E_TEP_SELECTION; - command.string = (char *)text; + command.string = (gchar *)text; command.value = strlen (text); command.time = GDK_CURRENT_TIME; e_cell_text_view_command (edit->tep, &command, edit); @@ -2736,8 +2736,8 @@ e_cell_text_set_selection (ECellView *cell_view, * @cell_view: the given cell view * @col: column of the given cell in the view * @row: row of the given cell in the view - * @start: a pointer to an int value indicates the start offset of the selection - * @end: a pointer to an int value indicates the end offset of the selection + * @start: a pointer to an gint value indicates the start offset of the selection + * @end: a pointer to an gint value indicates the end offset of the selection * * Gets the selection of given text cell. * If the current editing cell is not the given cell, this function @@ -2875,7 +2875,7 @@ e_cell_text_delete_selection (ECellView *cell_view, gint col, gint row) * * This API is most likely to be used by a11y implementations. */ -char * +gchar * e_cell_text_get_text_by_view (ECellView *cell_view, gint col, gint row) { ECellTextView *ectv; diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h index d92b025aa5..df4a6f827c 100644 --- a/widgets/table/e-cell-text.h +++ b/widgets/table/e-cell-text.h @@ -54,27 +54,27 @@ typedef struct { ECell parent; GtkJustification justify; - char *font_name; + gchar *font_name; double x, y; /* Position at anchor */ gulong pixel; /* Fill color */ /* Clip handling */ - char *ellipsis; /* The ellipsis characters. NULL = "...". */ + gchar *ellipsis; /* The ellipsis characters. NULL = "...". */ guint use_ellipsis : 1; /* Whether to use the ellipsis. */ guint editable : 1; /* Whether the text can be edited. */ - int strikeout_column; - int underline_column; - int bold_column; + gint strikeout_column; + gint underline_column; + gint bold_column; /* This column in the ETable should return a string specifying a color, either a color name like "red" or a color spec like "rgb:F/0/0". See the XParseColor man page for the formats available. */ - int color_column; - int bg_color_column; + gint color_column; + gint bg_color_column; /* This stores the colors we have allocated. */ GHashTable *colors; @@ -83,28 +83,28 @@ typedef struct { typedef struct { ECellClass parent_class; - char *(*get_text) (ECellText *cell, ETableModel *model, int col, int row); - void (*free_text) (ECellText *cell, char *text); - void (*set_value) (ECellText *cell, ETableModel *model, int col, int row, const char *text); + gchar *(*get_text) (ECellText *cell, ETableModel *model, gint col, gint row); + void (*free_text) (ECellText *cell, gchar *text); + void (*set_value) (ECellText *cell, ETableModel *model, gint col, gint row, const gchar *text); /* signal handlers */ - void (*text_inserted) (ECellText *cell, ECellView *cell_view, int pos, int len, int row, int model_col); - void (*text_deleted) (ECellText *cell, ECellView *cell_view, int pos, int len, int row, int model_col); + void (*text_inserted) (ECellText *cell, ECellView *cell_view, gint pos, gint len, gint row, gint model_col); + void (*text_deleted) (ECellText *cell, ECellView *cell_view, gint pos, gint len, gint row, gint model_col); } ECellTextClass; GType e_cell_text_get_type (void); -ECell *e_cell_text_new (const char *fontname, GtkJustification justify); -ECell *e_cell_text_construct(ECellText *cell, const char *fontname, GtkJustification justify); +ECell *e_cell_text_new (const gchar *fontname, GtkJustification justify); +ECell *e_cell_text_construct(ECellText *cell, const gchar *fontname, GtkJustification justify); /* Gets the value from the model and converts it into a string. In ECellText - itself, the value is assumed to be a char* and so needs no conversion. + itself, the value is assumed to be a gchar * and so needs no conversion. In subclasses the ETableModel value may be a more complicated datatype. */ -char *e_cell_text_get_text (ECellText *cell, ETableModel *model, int col, int row); +char *e_cell_text_get_text (ECellText *cell, ETableModel *model, gint col, gint row); /* Frees the value returned by e_cell_text_get_text(). */ -void e_cell_text_free_text (ECellText *cell, char *text); +void e_cell_text_free_text (ECellText *cell, gchar *text); /* Sets the ETableModel value, based on the given string. */ -void e_cell_text_set_value (ECellText *cell, ETableModel *model, int col, int row, const char *text); +void e_cell_text_set_value (ECellText *cell, ETableModel *model, gint col, gint row, const gchar *text); /* Sets the selection of given text cell */ gboolean e_cell_text_set_selection (ECellView *cell_view, gint col, gint row, gint start, gint end); @@ -122,7 +122,7 @@ void e_cell_text_paste_clipboard (ECellView *cell_view, gint col, gint row); void e_cell_text_delete_selection (ECellView *cell_view, gint col, gint row); /* get text directly from view, both col and row are model format */ -char *e_cell_text_get_text_by_view (ECellView *cell_view, gint col, gint row); +gchar *e_cell_text_get_text_by_view (ECellView *cell_view, gint col, gint row); G_END_DECLS diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 69dc1b27bb..4248666ce6 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -50,7 +50,7 @@ typedef struct { * ECell::realize method */ static ECellView * -etog_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) +etog_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view) { ECellToggleView *toggle_view = g_new0 (ECellToggleView, 1); ETableItem *eti = E_TABLE_ITEM (e_table_item_view); @@ -109,17 +109,17 @@ etog_unrealize (ECellView *ecv) */ static void etog_draw (ECellView *ecell_view, GdkDrawable *drawable, - int model_col, int view_col, int row, ECellFlags flags, - int x1, int y1, int x2, int y2) + gint model_col, gint view_col, gint row, ECellFlags flags, + gint x1, gint y1, gint x2, gint y2) { ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell); ECellToggleView *toggle_view = (ECellToggleView *) ecell_view; GdkPixbuf *image; - int x, y, width, height; - int cache_seq; + gint x, y, width, height; + gint cache_seq; cairo_t *cr; - const int value = GPOINTER_TO_INT ( + const gint value = GPOINTER_TO_INT ( e_table_model_value_at (ecell_view->e_table_model, model_col, row)); if (value < 0 || value >= toggle->n_states){ @@ -168,7 +168,7 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable, } static void -etog_set_value (ECellToggleView *toggle_view, int model_col, int view_col, int row, int value) +etog_set_value (ECellToggleView *toggle_view, gint model_col, gint view_col, gint row, gint value) { ECell *ecell = toggle_view->cell_view.ecell; ECellToggle *toggle = E_CELL_TOGGLE (ecell); @@ -184,11 +184,11 @@ etog_set_value (ECellToggleView *toggle_view, int model_col, int view_col, int r * ECell::event method */ static gint -etog_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions) +etog_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions) { ECellToggleView *toggle_view = (ECellToggleView *) ecell_view; - void *_value = e_table_model_value_at (ecell_view->e_table_model, model_col, row); - const int value = GPOINTER_TO_INT (_value); + gpointer _value = e_table_model_value_at (ecell_view->e_table_model, model_col, row); + const gint value = GPOINTER_TO_INT (_value); #if 0 if (!(flags & E_CELL_EDITING)) @@ -216,7 +216,7 @@ etog_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, * ECell::height method */ static int -etog_height (ECellView *ecell_view, int model_col, int view_col, int row) +etog_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell); @@ -228,13 +228,13 @@ etog_height (ECellView *ecell_view, int model_col, int view_col, int row) */ static void etog_print (ECellView *ecell_view, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width, double height) { ECellToggle *toggle = E_CELL_TOGGLE(ecell_view->ecell); GdkPixbuf *image; double image_width, image_height; - const int value = GPOINTER_TO_INT ( + const gint value = GPOINTER_TO_INT ( e_table_model_value_at (ecell_view->e_table_model, model_col, row)); cairo_t *cr; @@ -264,7 +264,7 @@ etog_print (ECellView *ecell_view, GtkPrintContext *context, static gdouble etog_print_height (ECellView *ecell_view, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width) { ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell); @@ -276,16 +276,16 @@ etog_print_height (ECellView *ecell_view, GtkPrintContext *context, * ECell::max_width method */ static int -etog_max_width (ECellView *ecell_view, int model_col, int view_col) +etog_max_width (ECellView *ecell_view, gint model_col, gint view_col) { ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell); - int max_width = 0; - int number_of_rows; - int row; + gint max_width = 0; + gint number_of_rows; + gint row; number_of_rows = e_table_model_row_count (ecell_view->e_table_model); for (row = 0; row < number_of_rows; row++) { - void *value = e_table_model_value_at (ecell_view->e_table_model, + gpointer value = e_table_model_value_at (ecell_view->e_table_model, model_col, row); max_width = MAX (max_width, gdk_pixbuf_get_width (toggle->images[GPOINTER_TO_INT (value)])); } @@ -297,7 +297,7 @@ static void etog_finalize (GObject *object) { ECellToggle *etog = E_CELL_TOGGLE (object); - int i; + gint i; for (i = 0; i < etog->n_states; i++) g_object_unref (etog->images [i]); @@ -351,10 +351,10 @@ e_cell_toggle_init (ECellToggle *etog) * arguments. */ void -e_cell_toggle_construct (ECellToggle *etog, int border, int n_states, GdkPixbuf **images) +e_cell_toggle_construct (ECellToggle *etog, gint border, gint n_states, GdkPixbuf **images) { - int max_height = 0; - int i; + gint max_height = 0; + gint i; etog->border = border; etog->n_states = n_states; @@ -389,7 +389,7 @@ e_cell_toggle_construct (ECellToggle *etog, int border, int n_states, GdkPixbuf * toggle cells. */ ECell * -e_cell_toggle_new (int border, int n_states, GdkPixbuf **images) +e_cell_toggle_new (gint border, gint n_states, GdkPixbuf **images) { ECellToggle *etog = g_object_new (E_CELL_TOGGLE_TYPE, NULL); diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h index 97d16dc659..96e3d01a55 100644 --- a/widgets/table/e-cell-toggle.h +++ b/widgets/table/e-cell-toggle.h @@ -41,11 +41,11 @@ G_BEGIN_DECLS typedef struct { ECell parent; - int border; - int n_states; + gint border; + gint n_states; GdkPixbuf **images; - int height; + gint height; } ECellToggle; typedef struct { @@ -53,9 +53,9 @@ typedef struct { } ECellToggleClass; GType e_cell_toggle_get_type (void); -ECell *e_cell_toggle_new (int border, int n_states, GdkPixbuf **images); -void e_cell_toggle_construct (ECellToggle *etog, int border, - int n_states, GdkPixbuf **images); +ECell *e_cell_toggle_new (gint border, gint n_states, GdkPixbuf **images); +void e_cell_toggle_construct (ECellToggle *etog, gint border, + gint n_states, GdkPixbuf **images); G_END_DECLS diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index eb7e428fb9..0b61253c61 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -76,25 +76,25 @@ e_cell_tree_view_get_subcell_view (ECellView *ect) } static ETreePath -e_cell_tree_get_node (ETableModel *table_model, int row) +e_cell_tree_get_node (ETableModel *table_model, gint row) { return e_table_model_value_at (table_model, -1, row); } static ETreeModel* -e_cell_tree_get_tree_model (ETableModel *table_model, int row) +e_cell_tree_get_tree_model (ETableModel *table_model, gint row) { return e_table_model_value_at (table_model, -2, row); } static ETreeTableAdapter * -e_cell_tree_get_tree_table_adapter (ETableModel *table_model, int row) +e_cell_tree_get_tree_table_adapter (ETableModel *table_model, gint row) { return e_table_model_value_at (table_model, -3, row); } static int -visible_depth_of_node (ETableModel *model, int row) +visible_depth_of_node (ETableModel *model, gint row) { ETreeModel *tree_model = e_cell_tree_get_tree_model(model, row); ETreeTableAdapter *adapter = e_cell_tree_get_tree_table_adapter(model, row); @@ -107,7 +107,7 @@ visible_depth_of_node (ETableModel *model, int row) if the path is not expandable, then max_width needs to change as well. */ static gint -offset_of_node (ETableModel *table_model, int row) +offset_of_node (ETableModel *table_model, gint row) { ETreeModel *tree_model = e_cell_tree_get_tree_model(table_model, row); ETreePath path = e_cell_tree_get_node(table_model, row); @@ -124,7 +124,7 @@ offset_of_node (ETableModel *table_model, int row) * ECell::new_view method */ static ECellView * -ect_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) +ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view) { ECellTree *ect = E_CELL_TREE (ecell); ECellTreeView *tree_view = g_new0 (ECellTreeView, 1); @@ -209,7 +209,7 @@ static void draw_retro_expander (ECellTreeView *ectv, GdkDrawable *drawable, gboolean expanded, GdkRectangle *rect) { GdkPixbuf *image; - int image_width, image_height; + gint image_width, image_height; ECellTree *ect = E_CELL_TREE(ectv->cell_view.ecell); image = expanded ? ect->open_pixbuf : ect->closed_pixbuf; @@ -243,8 +243,8 @@ draw_expander (ECellTreeView *ectv, GdkDrawable *drawable, GtkExpanderStyle expa */ static void ect_draw (ECellView *ecell_view, GdkDrawable *drawable, - int model_col, int view_col, int row, ECellFlags flags, - int x1, int y1, int x2, int y2) + gint model_col, gint view_col, gint row, ECellFlags flags, + gint x1, gint y1, gint x2, gint y2) { ECellTreeView *tree_view = (ECellTreeView *)ecell_view; ETreeModel *tree_model = e_cell_tree_get_tree_model(ecell_view->e_table_model, row); @@ -256,14 +256,14 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, GdkColor *foreground; gboolean selected; - int offset, subcell_offset; + gint offset, subcell_offset; selected = flags & E_CELL_SELECTED; /* only draw the tree effects if we're the active sort */ if (/* XXX */ TRUE) { GdkPixbuf *node_image; - int node_image_width = 0, node_image_height = 0; + gint node_image_width = 0, node_image_height = 0; ETreePath parent_node; ETree *tree = E_TREE (canvas->parent); @@ -307,7 +307,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, /* draw our lines */ if (tree_view->retro_look && E_CELL_TREE(tree_view->cell_view.ecell)->draw_lines) { - int depth; + gint depth; if (visible_depth_of_node (ecell_view->e_table_model, row) > 0 || e_tree_model_node_get_children (tree_model, node, NULL) > 0) @@ -428,7 +428,7 @@ event_in_expander (GdkEvent *event, gint offset, gint height) * ECell::height method */ static int -ect_height (ECellView *ecell_view, int model_col, int view_col, int row) +ect_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { ECellTreeView *tree_view = (ECellTreeView *) ecell_view; @@ -468,13 +468,13 @@ animate_expander (gpointer data) * ECell::event method */ static gint -ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions) +ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions) { ECellTreeView *tree_view = (ECellTreeView *) ecell_view; ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row); ETreeTableAdapter *etta = e_cell_tree_get_tree_table_adapter(ecell_view->e_table_model, row); ETreePath node = e_cell_tree_get_node (ecell_view->e_table_model, row); - int offset = offset_of_node (ecell_view->e_table_model, row); + gint offset = offset_of_node (ecell_view->e_table_model, row); gint result; switch (event->type) { @@ -489,7 +489,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, gint tmp_row = row; GdkRectangle area; animate_closure_t *closure = g_new0 (animate_closure_t, 1); - int hgt; + gint hgt; e_table_item_get_cell_geometry (tree_view->cell_view.e_table_item_view, &tmp_row, &view_col, &area.x, &area.y, NULL, &area.height); @@ -568,14 +568,14 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, * ECell::max_width method */ static int -ect_max_width (ECellView *ecell_view, int model_col, int view_col) +ect_max_width (ECellView *ecell_view, gint model_col, gint view_col) { ECellTreeView *tree_view = (ECellTreeView *) ecell_view; - int row; - int number_of_rows; - int max_width = 0; - int width = 0; - int subcell_max_width = 0; + gint row; + gint number_of_rows; + gint max_width = 0; + gint width = 0; + gint subcell_max_width = 0; gboolean per_row = e_cell_max_width_by_row_implemented (tree_view->subcell_view); number_of_rows = e_table_model_row_count (ecell_view->e_table_model); @@ -587,9 +587,9 @@ ect_max_width (ECellView *ecell_view, int model_col, int view_col) ETreeModel *tree_model = e_cell_tree_get_tree_model(ecell_view->e_table_model, row); ETreePath node; GdkPixbuf *node_image; - int node_image_width = 0; + gint node_image_width = 0; - int offset, subcell_offset; + gint offset, subcell_offset; #if 0 gboolean expanded, expandable; ETreeTableAdapter *tree_table_adapter = e_cell_tree_get_tree_table_adapter(ecell_view->e_table_model, row); @@ -642,13 +642,13 @@ ect_max_width (ECellView *ecell_view, int model_col, int view_col) * ECellView::show_tooltip method */ static void -ect_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, - int col_width, ETableTooltip *tooltip) +ect_show_tooltip (ECellView *ecell_view, gint model_col, gint view_col, gint row, + gint col_width, ETableTooltip *tooltip) { ECellTreeView *tree_view = (ECellTreeView *) ecell_view; ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row); ETreePath node = e_cell_tree_get_node (ecell_view->e_table_model, row); - int offset = offset_of_node (ecell_view->e_table_model, row); + gint offset = offset_of_node (ecell_view->e_table_model, row); GdkPixbuf *node_image; node_image = e_tree_model_icon_at (tree_model, node); @@ -662,8 +662,8 @@ ect_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, /* * ECellView::get_bg_color method */ -static char * -ect_get_bg_color (ECellView *ecell_view, int row) +static gchar * +ect_get_bg_color (ECellView *ecell_view, gint row) { ECellTreeView *tree_view = (ECellTreeView *) ecell_view; @@ -673,8 +673,8 @@ ect_get_bg_color (ECellView *ecell_view, int row) /* * ECellView::enter_edit method */ -static void * -ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row) +static gpointer +ect_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row) { /* just defer to our subcell's view */ ECellTreeView *tree_view = (ECellTreeView *) ecell_view; @@ -686,7 +686,7 @@ ect_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row) * ECellView::leave_edit method */ static void -ect_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context) +ect_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context) { /* just defer to our subcell's view */ ECellTreeView *tree_view = (ECellTreeView *) ecell_view; @@ -696,7 +696,7 @@ ect_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, voi static void ect_print (ECellView *ecell_view, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width, double height) { ECellTreeView *tree_view = (ECellTreeView *) ecell_view; @@ -708,14 +708,14 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row); ETreeTableAdapter *tree_table_adapter = e_cell_tree_get_tree_table_adapter(ecell_view->e_table_model, row); ETreePath node = e_cell_tree_get_node (ecell_view->e_table_model, row); - int offset = offset_of_node (ecell_view->e_table_model, row); - int subcell_offset = offset; + gint offset = offset_of_node (ecell_view->e_table_model, row); + gint subcell_offset = offset; gboolean expandable = e_tree_model_node_is_expandable (tree_model, node); gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node); /* draw our lines */ if (E_CELL_TREE(tree_view->cell_view.ecell)->draw_lines) { - int depth; + gint depth; if (!e_tree_model_node_is_root (tree_model, node) || e_tree_model_node_get_children (tree_model, node, NULL) > 0) { @@ -791,7 +791,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, static gdouble ect_print_height (ECellView *ecell_view, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width) { return 12; /* XXX */ @@ -878,11 +878,11 @@ e_cell_tree_construct (ECellTree *ect, if (open_pixbuf) ect->open_pixbuf = open_pixbuf; else - ect->open_pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)tree_expanded_xpm); + ect->open_pixbuf = gdk_pixbuf_new_from_xpm_data ((const gchar **)tree_expanded_xpm); if (closed_pixbuf) ect->closed_pixbuf = closed_pixbuf; else - ect->closed_pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)tree_unexpanded_xpm); + ect->closed_pixbuf = gdk_pixbuf_new_from_xpm_data ((const gchar **)tree_unexpanded_xpm); ect->draw_lines = draw_lines; } diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index 1fd770ab6a..cfd9ddde72 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -44,11 +44,11 @@ G_DEFINE_TYPE (ECellVbox, e_cell_vbox, E_CELL_TYPE) * ECell::new_view method */ static ECellView * -ecv_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) +ecv_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view) { ECellVbox *ecv = E_CELL_VBOX (ecell); ECellVboxView *vbox_view = g_new0 (ECellVboxView, 1); - int i; + gint i; vbox_view->cell_view.ecell = ecell; vbox_view->cell_view.e_table_model = table_model; @@ -76,7 +76,7 @@ static void ecv_kill_view (ECellView *ecv) { ECellVboxView *vbox_view = (ECellVboxView *) ecv; - int i; + gint i; if (vbox_view->cell_view.kill_view_cb) (vbox_view->cell_view.kill_view_cb)(ecv, vbox_view->cell_view.kill_view_cb_data); @@ -100,7 +100,7 @@ static void ecv_realize (ECellView *ecell_view) { ECellVboxView *vbox_view = (ECellVboxView *) ecell_view; - int i; + gint i; /* realize our subcell view */ for (i = 0; i < vbox_view->subcell_view_count; i++) @@ -117,7 +117,7 @@ static void ecv_unrealize (ECellView *ecv) { ECellVboxView *vbox_view = (ECellVboxView *) ecv; - int i; + gint i; /* unrealize our subcell view. */ for (i = 0; i < vbox_view->subcell_view_count; i++) @@ -132,18 +132,18 @@ ecv_unrealize (ECellView *ecv) */ static void ecv_draw (ECellView *ecell_view, GdkDrawable *drawable, - int model_col, int view_col, int row, ECellFlags flags, - int x1, int y1, int x2, int y2) + gint model_col, gint view_col, gint row, ECellFlags flags, + gint x1, gint y1, gint x2, gint y2) { ECellVboxView *vbox_view = (ECellVboxView *)ecell_view; - int subcell_offset = 0; - int i; + gint subcell_offset = 0; + gint i; for (i = 0; i < vbox_view->subcell_view_count; i++) { /* Now cause our subcells to draw their contents, shifted by subcell_offset pixels */ - int height = e_cell_height (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col, row); + gint height = e_cell_height (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col, row); e_cell_draw (vbox_view->subcell_views[i], drawable, vbox_view->model_cols[i], view_col, row, flags, x1, y1 + subcell_offset, x2, y1 + subcell_offset + height); @@ -156,12 +156,12 @@ ecv_draw (ECellView *ecell_view, GdkDrawable *drawable, * ECell::event method */ static gint -ecv_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions) +ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions) { ECellVboxView *vbox_view = (ECellVboxView *)ecell_view; - int y = 0; - int i; - int subcell_offset = 0; + gint y = 0; + gint i; + gint subcell_offset = 0; switch (event->type) { case GDK_BUTTON_PRESS: @@ -180,7 +180,7 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, for (i = 0; i < vbox_view->subcell_view_count; i++) { - int height = e_cell_height (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col, row); + gint height = e_cell_height (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col, row); if (y < subcell_offset + height) return e_cell_event(vbox_view->subcell_views[i], event, vbox_view->model_cols[i], view_col, row, flags, actions); subcell_offset += height; @@ -192,11 +192,11 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, * ECell::height method */ static int -ecv_height (ECellView *ecell_view, int model_col, int view_col, int row) +ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { ECellVboxView *vbox_view = (ECellVboxView *)ecell_view; - int height = 0; - int i; + gint height = 0; + gint i; for (i = 0; i < vbox_view->subcell_view_count; i++) { height += e_cell_height (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col, row); @@ -208,14 +208,14 @@ ecv_height (ECellView *ecell_view, int model_col, int view_col, int row) * ECell::max_width method */ static int -ecv_max_width (ECellView *ecell_view, int model_col, int view_col) +ecv_max_width (ECellView *ecell_view, gint model_col, gint view_col) { ECellVboxView *vbox_view = (ECellVboxView *)ecell_view; - int max_width = 0; - int i; + gint max_width = 0; + gint i; for (i = 0; i < vbox_view->subcell_view_count; i++) { - int width = e_cell_max_width (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col); + gint width = e_cell_max_width (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col); max_width = MAX(width, max_width); } @@ -227,13 +227,13 @@ ecv_max_width (ECellView *ecell_view, int model_col, int view_col) * ECellView::show_tooltip method */ static void -ecv_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, - int col_width, ETableTooltip *tooltip) +ecv_show_tooltip (ECellView *ecell_view, gint model_col, gint view_col, gint row, + gint col_width, ETableTooltip *tooltip) { ECellVboxView *vbox_view = (ECellVboxView *) ecell_view; EVboxModel *vbox_model = e_cell_vbox_get_vbox_model (ecell_view->e_table_model, row); EVboxPath node = e_cell_vbox_get_node (ecell_view->e_table_model, row); - int offset = offset_of_node (ecell_view->e_table_model, row); + gint offset = offset_of_node (ecell_view->e_table_model, row); GdkPixbuf *node_image; node_image = e_vbox_model_icon_at (vbox_model, node); @@ -247,8 +247,8 @@ ecv_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, /* * ECellView::get_bg_color method */ -static char * -ecv_get_bg_color (ECellView *ecell_view, int row) +static gchar * +ecv_get_bg_color (ECellView *ecell_view, gint row) { ECellVboxView *vbox_view = (ECellVboxView *) ecell_view; @@ -258,8 +258,8 @@ ecv_get_bg_color (ECellView *ecell_view, int row) /* * ECellView::enter_edit method */ -static void * -ecv_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row) +static gpointer +ecv_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row) { /* just defer to our subcell's view */ ECellVboxView *vbox_view = (ECellVboxView *) ecell_view; @@ -271,7 +271,7 @@ ecv_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row) * ECellView::leave_edit method */ static void -ecv_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context) +ecv_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context) { /* just defer to our subcell's view */ ECellVboxView *vbox_view = (ECellVboxView *) ecell_view; @@ -281,7 +281,7 @@ ecv_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, voi static void ecv_print (ECellView *ecell_view, GnomePrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width, double height) { ECellVboxView *vbox_view = (ECellVboxView *) ecell_view; @@ -290,14 +290,14 @@ ecv_print (ECellView *ecell_view, GnomePrintContext *context, EVboxModel *vbox_model = e_cell_vbox_get_vbox_model (ecell_view->e_table_model, row); EVboxTableAdapter *vbox_table_adapter = e_cell_vbox_get_vbox_table_adapter(ecell_view->e_table_model, row); EVboxPath node = e_cell_vbox_get_node (ecell_view->e_table_model, row); - int offset = offset_of_node (ecell_view->e_table_model, row); - int subcell_offset = offset; + gint offset = offset_of_node (ecell_view->e_table_model, row); + gint subcell_offset = offset; gboolean expandable = e_vbox_model_node_is_expandable (vbox_model, node); gboolean expanded = e_vbox_table_adapter_node_is_expanded (vbox_table_adapter, node); /* draw our lines */ if (E_CELL_VBOX(vbox_view->cell_view.ecell)->draw_lines) { - int depth; + gint depth; if (!e_vbox_model_node_is_root (vbox_model, node) || e_vbox_model_node_get_children (vbox_model, node, NULL) > 0) { @@ -348,7 +348,7 @@ ecv_print (ECellView *ecell_view, GnomePrintContext *context, GdkPixbuf *image = (expanded ? E_CELL_VBOX(vbox_view->cell_view.ecell)->open_pixbuf : E_CELL_VBOX(vbox_view->cell_view.ecell)->closed_pixbuf); - int image_width, image_height, image_rowstride; + gint image_width, image_height, image_rowstride; guchar *image_pixels; image_width = gdk_pixbuf_get_width(image); @@ -379,7 +379,7 @@ ecv_print (ECellView *ecell_view, GnomePrintContext *context, static gdouble ecv_print_height (ECellView *ecell_view, GnomePrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width) { return 12; /* XXX */ @@ -393,7 +393,7 @@ static void ecv_dispose (GObject *object) { ECellVbox *ecv = E_CELL_VBOX (object); - int i; + gint i; /* destroy our subcell */ for (i = 0; i < ecv->subcell_count; i++) @@ -473,7 +473,7 @@ e_cell_vbox_new (void) } void -e_cell_vbox_append (ECellVbox *vbox, ECell *subcell, int model_col) +e_cell_vbox_append (ECellVbox *vbox, ECell *subcell, gint model_col) { vbox->subcell_count ++; diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h index ae774dbb7c..58aa523c58 100644 --- a/widgets/table/e-cell-vbox.h +++ b/widgets/table/e-cell-vbox.h @@ -43,16 +43,16 @@ G_BEGIN_DECLS typedef struct { ECell parent; - int subcell_count; + gint subcell_count; ECell **subcells; - int *model_cols; + gint *model_cols; } ECellVbox; typedef struct { ECellView cell_view; - int subcell_view_count; + gint subcell_view_count; ECellView **subcell_views; - int *model_cols; + gint *model_cols; } ECellVboxView; typedef struct { @@ -63,7 +63,7 @@ GType e_cell_vbox_get_type (void); ECell *e_cell_vbox_new (void); void e_cell_vbox_append (ECellVbox *vbox, ECell *subcell, - int model_col); + gint model_col); G_END_DECLS diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c index 41ffe86685..1152a42e1a 100644 --- a/widgets/table/e-cell.c +++ b/widgets/table/e-cell.c @@ -33,7 +33,7 @@ G_DEFINE_TYPE (ECell, e_cell, GTK_TYPE_OBJECT) #define ECVIEW_EC_CLASS(v) (E_CELL_GET_CLASS (v->ecell)) static ECellView * -ec_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) +ec_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view) { return NULL; } @@ -55,14 +55,14 @@ ec_unrealize (ECellView *e_cell) static void 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) + gint model_col, gint view_col, gint row, ECellFlags flags, + gint x1, gint y1, gint x2, gint y2) { 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) +ec_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions) { g_critical ("e-cell-event invoked"); @@ -70,7 +70,7 @@ ec_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, i } static gint -ec_height (ECellView *ecell_view, int model_col, int view_col, int row) +ec_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { g_critical ("e-cell-height invoked"); @@ -78,7 +78,7 @@ ec_height (ECellView *ecell_view, int model_col, int view_col, int row) } static void -ec_focus (ECellView *ecell_view, int model_col, int view_col, int row, int x1, int y1, int x2, int y2) +ec_focus (ECellView *ecell_view, gint model_col, gint view_col, gint row, gint x1, gint y1, gint x2, gint y2) { ecell_view->focus_col = view_col; ecell_view->focus_row = row; @@ -99,35 +99,35 @@ ec_unfocus (ECellView *ecell_view) ecell_view->focus_y2 = -1; } -static void * -ec_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row) +static gpointer +ec_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row) { return NULL; } static void -ec_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *context) +ec_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context) { } -static void * -ec_save_state (ECellView *ecell_view, int model_col, int view_col, int row, void *context) +static gpointer +ec_save_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context) { return NULL; } static void -ec_load_state (ECellView *ecell_view, int model_col, int view_col, int row, void *context, void *save_state) +ec_load_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context, gpointer save_state) { } static void -ec_free_state (ECellView *ecell_view, int model_col, int view_col, int row, void *save_state) +ec_free_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer save_state) { } static void -ec_show_tooltip (ECellView *ecell_view, int model_col, int view_col, int row, int col_width, ETableTooltip *tooltip) +ec_show_tooltip (ECellView *ecell_view, gint model_col, gint view_col, gint row, gint col_width, ETableTooltip *tooltip) { /* Do nothing */ } @@ -176,7 +176,7 @@ e_cell_init (ECell *cell) * Returns: processing state from the GdkEvent handling. */ gint -e_cell_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions) +e_cell_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions) { return ECVIEW_EC_CLASS(ecell_view)->event ( ecell_view, event, model_col, view_col, row, flags, actions); @@ -198,7 +198,7 @@ e_cell_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_co * Returns: a new ECellView for this @ecell on the @table_model displayed on the @e_table_item_view. */ ECellView * -e_cell_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view) +e_cell_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view) { return E_CELL_GET_CLASS (ecell)->new_view ( ecell, table_model, e_table_item_view); @@ -265,8 +265,8 @@ e_cell_unrealize (ECellView *ecell_view) */ void e_cell_draw (ECellView *ecell_view, GdkDrawable *drawable, - int model_col, int view_col, int row, ECellFlags flags, - int x1, int y1, int x2, int y2) + gint model_col, gint view_col, gint row, ECellFlags flags, + gint x1, gint y1, gint x2, gint y2) { g_return_if_fail (ecell_view != NULL); g_return_if_fail (row >= 0); @@ -289,7 +289,7 @@ e_cell_draw (ECellView *ecell_view, GdkDrawable *drawable, */ void e_cell_print (ECellView *ecell_view, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width, double height) { if (ECVIEW_EC_CLASS(ecell_view)->print) @@ -303,7 +303,7 @@ e_cell_print (ECellView *ecell_view, GtkPrintContext *context, */ gdouble e_cell_print_height (ECellView *ecell_view, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, double width) { if (ECVIEW_EC_CLASS(ecell_view)->print_height) @@ -323,8 +323,8 @@ e_cell_print_height (ECellView *ecell_view, GtkPrintContext *context, * Returns: the height of the cell at @model_col, @row rendered at * @view_col, @row. */ -int -e_cell_height (ECellView *ecell_view, int model_col, int view_col, int row) +gint +e_cell_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { return ECVIEW_EC_CLASS(ecell_view)->height (ecell_view, model_col, view_col, row); } @@ -339,8 +339,8 @@ e_cell_height (ECellView *ecell_view, int model_col, int view_col, int row) * Notifies the ECellView that it is about to enter editing mode for * @model_col, @row rendered at @view_col, @row. */ -void * -e_cell_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row) +gpointer +e_cell_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row) { return ECVIEW_EC_CLASS(ecell_view)->enter_edit (ecell_view, model_col, view_col, row); } @@ -357,7 +357,7 @@ e_cell_enter_edit (ECellView *ecell_view, int model_col, int view_col, int row) * rendered at @view_col, @row. */ void -e_cell_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context) +e_cell_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context) { ECVIEW_EC_CLASS(ecell_view)->leave_edit (ecell_view, model_col, view_col, row, edit_context); } @@ -372,12 +372,12 @@ e_cell_leave_edit (ECellView *ecell_view, int model_col, int view_col, int row, * * Returns: The save state. * - * Requests that the ECellView return a void * representing the state + * Requests that the ECellView return a gpointer representing the state * of the ECell. This is primarily intended for things like selection * or scrolling. */ -void * -e_cell_save_state (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context) +gpointer +e_cell_save_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context) { if (ECVIEW_EC_CLASS(ecell_view)->save_state) return ECVIEW_EC_CLASS(ecell_view)->save_state (ecell_view, model_col, view_col, row, edit_context); @@ -397,7 +397,7 @@ e_cell_save_state (ECellView *ecell_view, int model_col, int view_col, int row, * Requests that the ECellView load from the given save state. */ void -e_cell_load_state (ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context, void *save_state) +e_cell_load_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context, gpointer save_state) { if (ECVIEW_EC_CLASS(ecell_view)->load_state) ECVIEW_EC_CLASS(ecell_view)->load_state (ecell_view, model_col, view_col, row, edit_context, save_state); @@ -415,7 +415,7 @@ e_cell_load_state (ECellView *ecell_view, int model_col, int view_col, int row, * Requests that the ECellView free the given save state. */ void -e_cell_free_state (ECellView *ecell_view, int model_col, int view_col, int row, void *save_state) +e_cell_free_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer save_state) { if (ECVIEW_EC_CLASS(ecell_view)->free_state) ECVIEW_EC_CLASS(ecell_view)->free_state (ecell_view, model_col, view_col, row, save_state); @@ -430,8 +430,8 @@ e_cell_free_state (ECellView *ecell_view, int model_col, int view_col, int row, * Returns: the maximum width for the ECellview at @model_col which * is being rendered as @view_col */ -int -e_cell_max_width (ECellView *ecell_view, int model_col, int view_col) +gint +e_cell_max_width (ECellView *ecell_view, gint model_col, gint view_col) { return ECVIEW_EC_CLASS(ecell_view)->max_width (ecell_view, model_col, view_col); @@ -447,8 +447,8 @@ e_cell_max_width (ECellView *ecell_view, int model_col, int view_col) * Returns: the maximum width for the ECellview at @model_col which * is being rendered as @view_col for the data in @row. */ -int -e_cell_max_width_by_row (ECellView *ecell_view, int model_col, int view_col, int row) +gint +e_cell_max_width_by_row (ECellView *ecell_view, gint model_col, gint view_col, gint row) { if (ECVIEW_EC_CLASS(ecell_view)->max_width_by_row) return ECVIEW_EC_CLASS(ecell_view)->max_width_by_row @@ -474,15 +474,15 @@ e_cell_max_width_by_row_implemented (ECellView *ecell_view) } void -e_cell_show_tooltip (ECellView *ecell_view, int model_col, int view_col, - int row, int col_width, ETableTooltip *tooltip) +e_cell_show_tooltip (ECellView *ecell_view, gint model_col, gint view_col, + gint row, gint col_width, ETableTooltip *tooltip) { ECVIEW_EC_CLASS(ecell_view)->show_tooltip (ecell_view, model_col, view_col, row, col_width, tooltip); } gchar * -e_cell_get_bg_color(ECellView *ecell_view, int row) +e_cell_get_bg_color(ECellView *ecell_view, gint row) { if (ECVIEW_EC_CLASS(ecell_view)->get_bg_color) return ECVIEW_EC_CLASS(ecell_view)->get_bg_color (ecell_view, row); diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h index 5a0005095e..614e1ebe0e 100644 --- a/widgets/table/e-cell.h +++ b/widgets/table/e-cell.h @@ -38,7 +38,7 @@ G_BEGIN_DECLS #define E_IS_CELL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_TYPE)) typedef gboolean (*ETableSearchFunc) (gconstpointer haystack, - const char *needle); + const gchar *needle); typedef enum { E_CELL_SELECTED = 1 << 0, @@ -87,35 +87,35 @@ typedef struct _ECellView { typedef struct { GtkObjectClass parent_class; - ECellView *(*new_view) (ECell *ecell, ETableModel *table_model, void *e_table_item_view); + ECellView *(*new_view) (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view); void (*kill_view) (ECellView *ecell_view); void (*realize) (ECellView *ecell_view); void (*unrealize) (ECellView *ecell_view); void (*draw) (ECellView *ecell_view, GdkDrawable *drawable, - int model_col, int view_col, int row, - ECellFlags flags, int x1, int y1, int x2, int y2); - gint (*event) (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions); - void (*focus) (ECellView *ecell_view, int model_col, int view_col, - int row, int x1, int y1, int x2, int y2); + gint model_col, gint view_col, gint row, + ECellFlags flags, gint x1, gint y1, gint x2, gint y2); + gint (*event) (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions); + void (*focus) (ECellView *ecell_view, gint model_col, gint view_col, + gint row, gint x1, gint y1, gint x2, gint y2); void (*unfocus) (ECellView *ecell_view); - int (*height) (ECellView *ecell_view, int model_col, int view_col, int row); + gint (*height) (ECellView *ecell_view, gint model_col, gint view_col, gint row); - void *(*enter_edit) (ECellView *ecell_view, int model_col, int view_col, int row); - void (*leave_edit) (ECellView *ecell_view, int model_col, int view_col, int row, void *context); - void *(*save_state) (ECellView *ecell_view, int model_col, int view_col, int row, void *context); - void (*load_state) (ECellView *ecell_view, int model_col, int view_col, int row, void *context, void *save_state); - void (*free_state) (ECellView *ecell_view, int model_col, int view_col, int row, void *save_state); + void *(*enter_edit) (ECellView *ecell_view, gint model_col, gint view_col, gint row); + void (*leave_edit) (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context); + void *(*save_state) (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context); + void (*load_state) (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context, gpointer save_state); + void (*free_state) (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer save_state); void (*print) (ECellView *ecell_view, GtkPrintContext *context, - int model_col, int view_col, int row, + gint model_col, gint view_col, gint row, gdouble width, gdouble height); gdouble (*print_height) (ECellView *ecell_view,GtkPrintContext *context, - int model_col, int view_col, int row, gdouble width); - int (*max_width) (ECellView *ecell_view, int model_col, int view_col); - int (*max_width_by_row) (ECellView *ecell_view, int model_col, int view_col, int row); - void (*show_tooltip) (ECellView *ecell_view, int model_col, int view_col, int row, int col_width, ETableTooltip *tooltip); - gchar *(*get_bg_color) (ECellView *ecell_view, int row); + gint model_col, gint view_col, gint row, gdouble width); + gint (*max_width) (ECellView *ecell_view, gint model_col, gint view_col); + gint (*max_width_by_row) (ECellView *ecell_view, gint model_col, gint view_col, gint row); + void (*show_tooltip) (ECellView *ecell_view, gint model_col, gint view_col, gint row, gint col_width, ETableTooltip *tooltip); + gchar *(*get_bg_color) (ECellView *ecell_view, gint row); void (*style_set) (ECellView *ecell_view, GtkStyle *previous_style); } ECellClass; @@ -131,92 +131,92 @@ void e_cell_kill_view (ECellView *ecell_view); /* Cell View methods. */ gint e_cell_event (ECellView *ecell_view, GdkEvent *event, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, ECellFlags flags, ECellActions *actions); void e_cell_realize (ECellView *ecell_view); void e_cell_unrealize (ECellView *ecell_view); void e_cell_draw (ECellView *ecell_view, GdkDrawable *drawable, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, ECellFlags flags, - int x1, - int y1, - int x2, - int y2); + gint x1, + gint y1, + gint x2, + gint y2); void e_cell_print (ECellView *ecell_view, GtkPrintContext *context, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, double width, double height); gdouble e_cell_print_height (ECellView *ecell_view, GtkPrintContext *context, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, gdouble width); -int e_cell_max_width (ECellView *ecell_view, - int model_col, - int view_col); -int e_cell_max_width_by_row (ECellView *ecell_view, - int model_col, - int view_col, - int row); +gint e_cell_max_width (ECellView *ecell_view, + gint model_col, + gint view_col); +gint e_cell_max_width_by_row (ECellView *ecell_view, + gint model_col, + gint view_col, + gint row); gboolean e_cell_max_width_by_row_implemented (ECellView *ecell_view); void e_cell_show_tooltip (ECellView *ecell_view, - int model_col, - int view_col, - int row, - int col_width, + gint model_col, + gint view_col, + gint row, + gint col_width, ETableTooltip *tooltip); gchar *e_cell_get_bg_color (ECellView *ecell_view, - int row); + gint row); void e_cell_style_set (ECellView *ecell_view, GtkStyle *previous_style); void e_cell_focus (ECellView *ecell_view, - int model_col, - int view_col, - int row, - int x1, - int y1, - int x2, - int y2); + gint model_col, + gint view_col, + gint row, + gint x1, + gint y1, + gint x2, + gint y2); void e_cell_unfocus (ECellView *ecell_view); -int e_cell_height (ECellView *ecell_view, - int model_col, - int view_col, - int row); +gint e_cell_height (ECellView *ecell_view, + gint model_col, + gint view_col, + gint row); void *e_cell_enter_edit (ECellView *ecell_view, - int model_col, - int view_col, - int row); + gint model_col, + gint view_col, + gint row); void e_cell_leave_edit (ECellView *ecell_view, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, void *edit_context); void *e_cell_save_state (ECellView *ecell_view, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, void *edit_context); void e_cell_load_state (ECellView *ecell_view, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, void *edit_context, void *state); void e_cell_free_state (ECellView *ecell_view, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, void *state); G_END_DECLS diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index 879b8c34af..10a0ba8223 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -314,7 +314,7 @@ etcta_unrealize (GnomeCanvasItem *item) static void finish_editing (ETableClickToAdd *etcta); static int -item_key_press (ETableItem *item, int row, int col, GdkEvent *event, ETableClickToAdd *etcta) +item_key_press (ETableItem *item, gint row, gint col, GdkEvent *event, ETableClickToAdd *etcta) { switch (event->key.keyval) { case GDK_Return: @@ -451,7 +451,7 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e) } static void -etcta_reflow (GnomeCanvasItem *item, int flags) +etcta_reflow (GnomeCanvasItem *item, gint flags) { ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item); diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h index 31dded1989..17ac7f7fe3 100644 --- a/widgets/table/e-table-click-to-add.h +++ b/widgets/table/e-table-click-to-add.h @@ -46,7 +46,7 @@ typedef struct { ETableModel *model; /* The backend model. */ ETableHeader *eth; /* This is just to give to the ETableItem. */ - char *message; + gchar *message; GnomeCanvasItem *row; /* If row is NULL, we're sitting with no data and a "Click here" message. */ GnomeCanvasItem *text; /* If text is NULL, row shouldn't be. */ diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index d844f53c45..de1cc48b18 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -139,8 +139,8 @@ e_table_col_init (ETableCol *etc) * Returns: the newly created ETableCol object. */ ETableCol * -e_table_col_new (int col_idx, const char *text, double expansion, int min_width, - ECell *ecell, GCompareFunc compare, gboolean resizable, gboolean disabled, int priority) +e_table_col_new (gint col_idx, const gchar *text, double expansion, gint min_width, + ECell *ecell, GCompareFunc compare, gboolean resizable, gboolean disabled, gint priority) { ETableCol *etc; @@ -200,8 +200,8 @@ e_table_col_new (int col_idx, const char *text, double expansion, int min_width, * Returns: the newly created ETableCol object. */ ETableCol * -e_table_col_new_with_pixbuf (int col_idx, const char *text, GdkPixbuf *pixbuf, double expansion, int min_width, - ECell *ecell, GCompareFunc compare, gboolean resizable, gboolean disabled, int priority) +e_table_col_new_with_pixbuf (gint col_idx, const gchar *text, GdkPixbuf *pixbuf, double expansion, gint min_width, + ECell *ecell, GCompareFunc compare, gboolean resizable, gboolean disabled, gint priority) { ETableCol *etc; diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h index f7d892d317..8e514675d5 100644 --- a/widgets/table/e-table-col.h +++ b/widgets/table/e-table-col.h @@ -47,23 +47,23 @@ typedef enum { */ typedef struct { GObject base; - char *text; + gchar *text; GdkPixbuf *pixbuf; - int min_width; - int width; + gint min_width; + gint width; double expansion; short x; GCompareFunc compare; ETableSearchFunc search; - unsigned int is_pixbuf:1; - unsigned int selected:1; - unsigned int resizable:1; - unsigned int disabled:1; - unsigned int sortable:1; - unsigned int groupable:1; - int col_idx; - int compare_col; - int priority; + guint is_pixbuf:1; + guint selected:1; + guint resizable:1; + guint disabled:1; + guint sortable:1; + guint groupable:1; + gint col_idx; + gint compare_col; + gint priority; GtkJustification justification; @@ -75,25 +75,25 @@ typedef struct { } ETableColClass; GType e_table_col_get_type (void); -ETableCol *e_table_col_new (int col_idx, - const char *text, +ETableCol *e_table_col_new (gint col_idx, + const gchar *text, double expansion, - int min_width, + gint min_width, ECell *ecell, GCompareFunc compare, gboolean resizable, gboolean disabled, - int priority); -ETableCol *e_table_col_new_with_pixbuf (int col_idx, - const char *text, + gint priority); +ETableCol *e_table_col_new_with_pixbuf (gint col_idx, + const gchar *text, GdkPixbuf *pixbuf, double expansion, - int min_width, + gint min_width, ECell *ecell, GCompareFunc compare, gboolean resizable, gboolean disabled, - int priority); + gint priority); G_END_DECLS diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c index c48451587f..0f6acd7fc6 100644 --- a/widgets/table/e-table-column-specification.c +++ b/widgets/table/e-table-column-specification.c @@ -106,21 +106,21 @@ e_table_column_specification_load_from_node (ETableColumnSpecification *etcs, { free_strings(etcs); - etcs->model_col = e_xml_get_integer_prop_by_name (node, (const unsigned char *)"model_col"); - etcs->compare_col = e_xml_get_integer_prop_by_name_with_default (node, (const unsigned char *)"compare_col", etcs->model_col); - etcs->title = e_xml_get_string_prop_by_name (node, (const unsigned char *)"_title"); - etcs->pixbuf = e_xml_get_string_prop_by_name (node, (const unsigned char *)"pixbuf"); - - etcs->expansion = e_xml_get_double_prop_by_name (node, (const unsigned char *)"expansion"); - etcs->minimum_width = e_xml_get_integer_prop_by_name (node, (const unsigned char *)"minimum_width"); - etcs->resizable = e_xml_get_bool_prop_by_name (node, (const unsigned char *)"resizable"); - etcs->disabled = e_xml_get_bool_prop_by_name (node, (const unsigned char *)"disabled"); - - etcs->cell = e_xml_get_string_prop_by_name (node, (const unsigned char *)"cell"); - etcs->compare = e_xml_get_string_prop_by_name (node, (const unsigned char *)"compare"); - etcs->search = e_xml_get_string_prop_by_name (node, (const unsigned char *)"search"); - etcs->sortable = e_xml_get_string_prop_by_name (node, (const unsigned char *)"sortable"); - etcs->priority = e_xml_get_integer_prop_by_name_with_default (node, (const unsigned char *)"priority", 0); + etcs->model_col = e_xml_get_integer_prop_by_name (node, (const guchar *)"model_col"); + etcs->compare_col = e_xml_get_integer_prop_by_name_with_default (node, (const guchar *)"compare_col", etcs->model_col); + etcs->title = e_xml_get_string_prop_by_name (node, (const guchar *)"_title"); + etcs->pixbuf = e_xml_get_string_prop_by_name (node, (const guchar *)"pixbuf"); + + etcs->expansion = e_xml_get_double_prop_by_name (node, (const guchar *)"expansion"); + etcs->minimum_width = e_xml_get_integer_prop_by_name (node, (const guchar *)"minimum_width"); + etcs->resizable = e_xml_get_bool_prop_by_name (node, (const guchar *)"resizable"); + etcs->disabled = e_xml_get_bool_prop_by_name (node, (const guchar *)"disabled"); + + etcs->cell = e_xml_get_string_prop_by_name (node, (const guchar *)"cell"); + etcs->compare = e_xml_get_string_prop_by_name (node, (const guchar *)"compare"); + etcs->search = e_xml_get_string_prop_by_name (node, (const guchar *)"search"); + etcs->sortable = e_xml_get_string_prop_by_name (node, (const guchar *)"sortable"); + etcs->priority = e_xml_get_integer_prop_by_name_with_default (node, (const guchar *)"priority", 0); if (etcs->title == NULL) etcs->title = g_strdup(""); @@ -132,26 +132,26 @@ e_table_column_specification_save_to_node (ETableColumnSpecification *specificat { xmlNode *node; if (parent) - node = xmlNewChild(parent, NULL, (const unsigned char *)"ETableColumn", NULL); + node = xmlNewChild(parent, NULL, (const guchar *)"ETableColumn", NULL); else - node = xmlNewNode(NULL, (const unsigned char *)"ETableColumn"); + node = xmlNewNode(NULL, (const guchar *)"ETableColumn"); - e_xml_set_integer_prop_by_name(node, (const unsigned char *)"model_col", specification->model_col); + e_xml_set_integer_prop_by_name(node, (const guchar *)"model_col", specification->model_col); if (specification->compare_col != specification->model_col) - e_xml_set_integer_prop_by_name(node, (const unsigned char *)"compare_col", specification->compare_col); - e_xml_set_string_prop_by_name(node, (const unsigned char *)"_title", specification->title); - e_xml_set_string_prop_by_name(node, (const unsigned char *)"pixbuf", specification->pixbuf); - - e_xml_set_double_prop_by_name(node, (const unsigned char *)"expansion", specification->expansion); - e_xml_set_integer_prop_by_name(node, (const unsigned char *)"minimum_width", specification->minimum_width); - e_xml_set_bool_prop_by_name(node, (const unsigned char *)"resizable", specification->resizable); - e_xml_set_bool_prop_by_name(node, (const unsigned char *)"disabled", specification->disabled); - - e_xml_set_string_prop_by_name(node, (const unsigned char *)"cell", specification->cell); - e_xml_set_string_prop_by_name(node, (const unsigned char *)"compare", specification->compare); - e_xml_set_string_prop_by_name(node, (const unsigned char *)"search", specification->search); + e_xml_set_integer_prop_by_name(node, (const guchar *)"compare_col", specification->compare_col); + e_xml_set_string_prop_by_name(node, (const guchar *)"_title", specification->title); + e_xml_set_string_prop_by_name(node, (const guchar *)"pixbuf", specification->pixbuf); + + e_xml_set_double_prop_by_name(node, (const guchar *)"expansion", specification->expansion); + e_xml_set_integer_prop_by_name(node, (const guchar *)"minimum_width", specification->minimum_width); + e_xml_set_bool_prop_by_name(node, (const guchar *)"resizable", specification->resizable); + e_xml_set_bool_prop_by_name(node, (const guchar *)"disabled", specification->disabled); + + e_xml_set_string_prop_by_name(node, (const guchar *)"cell", specification->cell); + e_xml_set_string_prop_by_name(node, (const guchar *)"compare", specification->compare); + e_xml_set_string_prop_by_name(node, (const guchar *)"search", specification->search); if (specification->priority != 0) - e_xml_set_integer_prop_by_name (node, (const unsigned char *)"priority", specification->priority); + e_xml_set_integer_prop_by_name (node, (const guchar *)"priority", specification->priority); return node; } diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h index 688e194825..7ea6f23dc4 100644 --- a/widgets/table/e-table-column-specification.h +++ b/widgets/table/e-table-column-specification.h @@ -38,21 +38,21 @@ G_BEGIN_DECLS typedef struct { GObject base; - int model_col; - int compare_col; - char *title; - char *pixbuf; + gint model_col; + gint compare_col; + gchar *title; + gchar *pixbuf; double expansion; - int minimum_width; + gint minimum_width; guint resizable : 1; guint disabled : 1; - char *cell; - char *compare; - char *search; - char *sortable; - int priority; + gchar *cell; + gchar *compare; + gchar *search; + gchar *sortable; + gint priority; } ETableColumnSpecification; typedef struct { diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c index d2180d88e5..0969a79410 100644 --- a/widgets/table/e-table-column.c +++ b/widgets/table/e-table-column.c @@ -38,7 +38,7 @@ static void e_table_column_finalize (GObject *object) { ETableColumn *etc = E_TABLE_COLUMN (object); - const int cols = etc->col_count; + const gint cols = etc->col_count; /* * Destroy listeners @@ -82,7 +82,7 @@ e_table_column_class_init (GtkObjectClass *object_class) } static void -etc_do_insert (ETableColumn *etc, int pos, ETableCol *val) +etc_do_insert (ETableColumn *etc, gint pos, ETableCol *val) { memcpy (&etc->columns [pos+1], &etc->columns [pos], sizeof (ETableCol *) * (etc->col_count - pos)); @@ -90,7 +90,7 @@ etc_do_insert (ETableColumn *etc, int pos, ETableCol *val) } void -e_table_column_add_column (ETableColumn *etc, ETableCol *tc, int pos) +e_table_column_add_column (ETableColumn *etc, ETableCol *tc, gint pos) { ETableCol **new_ptr; @@ -109,7 +109,7 @@ e_table_column_add_column (ETableColumn *etc, ETableCol *tc, int pos) } ETableCol * -e_table_column_get_column (ETableColumn *etc, int column) +e_table_column_get_column (ETableColumn *etc, gint column) { g_return_val_if_fail (etc != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), NULL); @@ -123,7 +123,7 @@ e_table_column_get_column (ETableColumn *etc, int column) return etc->columns [column]; } -int +gint e_table_column_count (ETableColumn *etc) { g_return_val_if_fail (etc != NULL, 0); @@ -132,10 +132,10 @@ e_table_column_count (ETableColumn *etc) return etc->col_count; } -int -e_table_column_index (ETableColumn *etc, const char *identifier) +gint +e_table_column_index (ETableColumn *etc, const gchar *identifier) { - int i; + gint i; g_return_val_if_fail (etc != NULL, 0); g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0); @@ -151,10 +151,10 @@ e_table_column_index (ETableColumn *etc, const char *identifier) return -1; } -int -e_table_column_get_index_at (ETableColumn *etc, int x_offset) +gint +e_table_column_get_index_at (ETableColumn *etc, gint x_offset) { - int i, total; + gint i, total; g_return_val_if_fail (etc != NULL, 0); g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0); @@ -175,7 +175,7 @@ ETableCol ** e_table_column_get_columns (ETableColumn *etc) { ETableCol **ret; - int i; + gint i; g_return_val_if_fail (etc != NULL, 0); g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0); @@ -196,11 +196,11 @@ e_table_column_selection_ok (ETableColumn *etc) return etc->selectable; } -int +gint ve_table_column_get_selected (ETableColumn *etc) { - int i; - int selected = 0; + gint i; + gint selected = 0; g_return_val_if_fail (etc != NULL, 0); g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0); @@ -213,10 +213,10 @@ ve_table_column_get_selected (ETableColumn *etc) return selected; } -int +gint e_table_column_total_width (ETableColumn *etc) { - int total; + gint total; g_return_val_if_fail (etc != NULL, 0); g_return_val_if_fail (E_IS_TABLE_COLUMN (etc), 0); @@ -229,7 +229,7 @@ e_table_column_total_width (ETableColumn *etc) } static void -etc_do_remove (ETableColumn *etc, int idx) +etc_do_remove (ETableColumn *etc, gint idx) { memcpy (&etc->columns [idx], &etc->columns [idx+1], sizeof (ETableCol *) * etc->col_count - idx); @@ -237,7 +237,7 @@ etc_do_remove (ETableColumn *etc, int idx) } void -e_table_column_move (ETableColumn *etc, int source_index, int target_index) +e_table_column_move (ETableColumn *etc, gint source_index, gint target_index) { g_return_if_fail (etc != NULL); g_return_if_fail (E_IS_TABLE_COLUMN (etc)); @@ -253,7 +253,7 @@ e_table_column_move (ETableColumn *etc, int source_index, int target_index) } void -e_table_column_remove (ETableColumn *etc, int idx) +e_table_column_remove (ETableColumn *etc, gint idx) { g_return_if_fail (etc != NULL); g_return_if_fail (E_IS_TABLE_COLUMN (etc)); @@ -270,7 +270,7 @@ e_table_column_set_selection (ETableColumn *etc, gboolean allow_selection); } void -e_table_column_set_size (ETableColumn *etc, int idx, int size) +e_table_column_set_size (ETableColumn *etc, gint idx, gint size) { g_return_if_fail (etc != NULL); g_return_if_fail (E_IS_TABLE_COLUMN (etc)); diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c index 6d3e5611da..0fd82bf0ed 100644 --- a/widgets/table/e-table-config-field.c +++ b/widgets/table/e-table-config-field.c @@ -120,7 +120,7 @@ etcf_truncate (ETableConfigField *etcf) static void etcf_set_sensitivity(ETableConfigField *etcf) { - int count = etcf_get_count(etcf); + gint count = etcf_get_count(etcf); if (etcf->n >= count) { gtk_widget_set_sensitive(etcf->radio_ascending, FALSE); @@ -138,7 +138,7 @@ etcf_set_sensitivity(ETableConfigField *etcf) static void toggled(GtkWidget *widget, ETableConfigField *etcf) { - int count; + gint count; count = etcf_get_count(etcf); if (count > etcf->n) { @@ -176,11 +176,11 @@ changed(GtkWidget *widget, ETableConfigField *etcf) static void etcf_setup(ETableConfigField *etcf) { - int count; + gint count; GList *list = NULL; ETableColumnSpecification **column; ETableColumnSpecification *chosen_column = NULL; - int model_col = -1; + gint model_col = -1; etcf_set_sensitivity(etcf); @@ -228,7 +228,7 @@ e_table_config_field_construct_nth (ETableConfigField *etcf, ETableSpecification *spec, ETableSortInfo *sort_info, gboolean grouping, - int n) + gint n) { GtkWidget *frame; GtkWidget *internal_hbox; diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h index 9fbd21d694..eb13da90ab 100644 --- a/widgets/table/e-table-config-field.h +++ b/widgets/table/e-table-config-field.h @@ -41,7 +41,7 @@ typedef struct { ETableSpecification *spec; ETableSortInfo *sort_info; guint grouping : 1; - int n; + gint n; GtkWidget *combo; GtkWidget *radio_ascending; diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 06f98066bb..23ff88d2bd 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -233,7 +233,7 @@ configure_combo_box_set_active (GtkComboBox *combo_box, const gchar *value) } static ETableColumnSpecification * -find_column_in_spec (ETableSpecification *spec, int model_col) +find_column_in_spec (ETableSpecification *spec, gint model_col) { ETableColumnSpecification **column; @@ -250,7 +250,7 @@ find_column_in_spec (ETableSpecification *spec, int model_col) } static int -find_model_column_by_name (ETableSpecification *spec, const char *s) +find_model_column_by_name (ETableSpecification *spec, const gchar *s) { ETableColumnSpecification **column; @@ -268,7 +268,7 @@ static void update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) { ETableConfigSortWidgets *widgets; - int count, i; + gint count, i; if (is_sort){ count = e_table_sort_info_sorting_get_count ( @@ -362,7 +362,7 @@ config_sort_info_update (ETableConfig *config) { ETableSortInfo *info = config->state->sort_info; GString *res; - int count, i; + gint count, i; count = e_table_sort_info_sorting_get_count (info); res = g_string_new (""); @@ -401,7 +401,7 @@ config_group_info_update (ETableConfig *config) { ETableSortInfo *info = config->state->sort_info; GString *res; - int count, i; + gint count, i; if (!e_table_sort_info_get_can_group (info)) return; @@ -439,7 +439,7 @@ config_group_info_update (ETableConfig *config) static void setup_fields (ETableConfig *config) { - int i; + gint i; e_table_model_freeze ((ETableModel *)config->available_model); e_table_model_freeze ((ETableModel *)config->shown_model); @@ -466,7 +466,7 @@ config_fields_info_update (ETableConfig *config) { ETableColumnSpecification **column; GString *res = g_string_new (""); - int i, j; + gint i, j; for (i = 0; i < config->state->col_count; i++){ for (j = 0, column = config->source_spec->columns; *column; column++, j++){ @@ -493,7 +493,7 @@ static void do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) { GtkDialog *dialog; - int response, running = 1; + gint response, running = 1; config->temp_state = e_table_state_duplicate (config->state); @@ -554,7 +554,7 @@ do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) static void do_fields_config_dialog (ETableConfig *config) { - int response, running = 1; + gint response, running = 1; gtk_widget_ensure_style (config->dialog_show_fields); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (config->dialog_show_fields)->vbox), 0); @@ -604,12 +604,12 @@ static ETableModel *global_store; /* Glade better not be reentrant any time soo static void create_global_store (ETableConfig *config) { - int i; + gint i; global_store = e_table_memory_store_new (store_columns); for (i = 0; config->source_spec->columns[i]; i++) { - char *text; + gchar *text; if (config->source_spec->columns[i]->disabled) continue; @@ -693,7 +693,7 @@ dialog_destroyed (gpointer data, GObject *where_object_was) } static void -dialog_response (GtkWidget *dialog, int response_id, ETableConfig *config) +dialog_response (GtkWidget *dialog, gint response_id, ETableConfig *config) { if (response_id == GTK_RESPONSE_APPLY || response_id == GTK_RESPONSE_OK) { @@ -741,7 +741,7 @@ e_table_proxy_gtk_combo_text_new (void) #if 0 static GtkWidget * -configure_dialog (GladeXML *gui, const char *widget_name, ETableConfig *config) +configure_dialog (GladeXML *gui, const gchar *widget_name, ETableConfig *config) { GtkWidget *w; @@ -752,7 +752,7 @@ configure_dialog (GladeXML *gui, const char *widget_name, ETableConfig *config) #endif static void -connect_button (ETableConfig *config, GladeXML *gui, const char *widget_name, GCallback cback) +connect_button (ETableConfig *config, GladeXML *gui, const gchar *widget_name, GCallback cback) { GtkWidget *button = glade_xml_get_widget (gui, widget_name); @@ -779,14 +779,14 @@ sort_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *sort) ETableConfig *config = sort->e_table_config; ETableSortInfo *sort_info = config->temp_state->sort_info; ETableConfigSortWidgets *base = &config->sort[0]; - int idx = sort - base; + gint idx = sort - base; gchar *s; s = configure_combo_box_get_active (combo_box); if (s != NULL) { ETableSortColumn c; - int col; + gint col; col = find_model_column_by_name (config->source_spec, s); if (col == -1){ @@ -815,7 +815,7 @@ sort_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *sort) ETableConfig *config = sort->e_table_config; ETableSortInfo *si = config->temp_state->sort_info; ETableConfigSortWidgets *base = &config->sort[0]; - int idx = sort - base; + gint idx = sort - base; ETableSortColumn c; c = e_table_sort_info_sorting_get_nth (si, idx); @@ -827,10 +827,10 @@ static void configure_sort_dialog (ETableConfig *config, GladeXML *gui) { GSList *l; - int i; + gint i; for (i = 0; i < 4; i++){ - char buffer [80]; + gchar buffer [80]; snprintf (buffer, sizeof (buffer), "sort-combo-%d", i + 1); config->sort [i].combo = glade_xml_get_widget (gui, buffer); @@ -858,7 +858,7 @@ configure_sort_dialog (ETableConfig *config, GladeXML *gui) } for (l = config->column_names; l; l = l->next){ - char *label = l->data; + gchar *label = l->data; for (i = 0; i < 4; i++){ configure_combo_box_add ( @@ -889,14 +889,14 @@ group_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *group) ETableConfig *config = group->e_table_config; ETableSortInfo *sort_info = config->temp_state->sort_info; ETableConfigSortWidgets *base = &config->group[0]; - int idx = group - base; + gint idx = group - base; gchar *s; s = configure_combo_box_get_active (combo_box); if (s != NULL) { ETableSortColumn c; - int col; + gint col; col = find_model_column_by_name (config->source_spec, s); if (col == -1){ @@ -925,7 +925,7 @@ group_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *group) ETableConfig *config = group->e_table_config; ETableSortInfo *si = config->temp_state->sort_info; ETableConfigSortWidgets *base = &config->group[0]; - int idx = group - base; + gint idx = group - base; ETableSortColumn c; c = e_table_sort_info_grouping_get_nth (si, idx); @@ -937,10 +937,10 @@ static void configure_group_dialog (ETableConfig *config, GladeXML *gui) { GSList *l; - int i; + gint i; for (i = 0; i < 4; i++){ - char buffer [80]; + gchar buffer [80]; snprintf (buffer, sizeof (buffer), "group-combo-%d", i + 1); config->group [i].combo = glade_xml_get_widget (gui, buffer); @@ -976,7 +976,7 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui) for (l = config->column_names; l; l = l->next){ - char *label = l->data; + gchar *label = l->data; for (i = 0; i < 4; i++){ configure_combo_box_add ( @@ -1002,7 +1002,7 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui) } static void -add_column (int model_row, gpointer closure) +add_column (gint model_row, gpointer closure) { GList **columns = closure; *columns = g_list_prepend (*columns, GINT_TO_POINTER (model_row)); @@ -1013,8 +1013,8 @@ config_button_add (GtkWidget *widget, ETableConfig *config) { GList *columns = NULL; GList *column; - int count; - int i; + gint count; + gint i; e_table_selected_row_foreach (config->available, add_column, &columns); columns = g_list_reverse (columns); @@ -1045,7 +1045,7 @@ config_button_remove (GtkWidget *widget, ETableConfig *config) e_table_selected_row_foreach (config->shown, add_column, &columns); for (column = columns; column; column = column->next) { - int row = GPOINTER_TO_INT (column->data); + gint row = GPOINTER_TO_INT (column->data); memmove (config->temp_state->columns + row, config->temp_state->columns + row + 1, sizeof (int) * (config->temp_state->col_count - row - 1)); memmove (config->temp_state->expansions + row, config->temp_state->expansions + row + 1, sizeof (double) * (config->temp_state->col_count - row - 1)); @@ -1064,11 +1064,11 @@ config_button_up (GtkWidget *widget, ETableConfig *config) { GList *columns = NULL; GList *column; - int *new_shown; + gint *new_shown; double *new_expansions; - int next_col; + gint next_col; double next_expansion; - int i; + gint i; e_table_selected_row_foreach (config->shown, add_column, &columns); @@ -1119,11 +1119,11 @@ config_button_down (GtkWidget *widget, ETableConfig *config) { GList *columns = NULL; GList *column; - int *new_shown; + gint *new_shown; double *new_expansions; - int next_col; + gint next_col; double next_expansion; - int i; + gint i; e_table_selected_row_foreach (config->shown, add_column, &columns); @@ -1274,7 +1274,7 @@ e_table_config_init (ETableConfig *config) ETableConfig * e_table_config_construct (ETableConfig *config, - const char *header, + const gchar *header, ETableSpecification *spec, ETableState *state, GtkWindow *parent_window) @@ -1298,7 +1298,7 @@ e_table_config_construct (ETableConfig *config, config->domain = g_strdup (spec->domain); for (column = config->source_spec->columns; *column; column++){ - char *label = (*column)->title; + gchar *label = (*column)->title; if ((*column)->disabled) continue; @@ -1330,7 +1330,7 @@ e_table_config_construct (ETableConfig *config, * Returns: The config object. */ ETableConfig * -e_table_config_new (const char *header, +e_table_config_new (const gchar *header, ETableSpecification *spec, ETableState *state, GtkWindow *parent_window) diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h index d5366bf999..72357fb8f6 100644 --- a/widgets/table/e-table-config.h +++ b/widgets/table/e-table-config.h @@ -47,14 +47,14 @@ typedef struct { GtkWidget *radio_descending; GtkWidget *view_check; /* Only for group dialog */ guint changed_id, toggled_id; - void *e_table_config; + gpointer e_table_config; } ETableConfigSortWidgets; typedef struct { GObject parent; - char *header; + gchar *header; /* * Our various dialog boxes @@ -81,7 +81,7 @@ typedef struct { ETableWithout *available_model; ETable *shown; ETableSubsetVariable *shown_model; - char *domain; + gchar *domain; /* * List of valid column names @@ -97,12 +97,12 @@ typedef struct { } ETableConfigClass; GType e_table_config_get_type (void); -ETableConfig *e_table_config_new (const char *header, +ETableConfig *e_table_config_new (const gchar *header, ETableSpecification *spec, ETableState *state, GtkWindow *parent_window); ETableConfig *e_table_config_construct (ETableConfig *etco, - const char *header, + const gchar *header, ETableSpecification *spec, ETableState *state, GtkWindow *parent_window); diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c index b1eae4cc40..b870967099 100644 --- a/widgets/table/e-table-example-1.c +++ b/widgets/table/e-table-example-1.c @@ -41,10 +41,10 @@ * class, you simply create a new object of the ETableSimple class. You * give it a bunch of functions that act as callbacks. * - * You also get to pass a void * to ETableSimple and it gets passed to + * You also get to pass a gpointer to ETableSimple and it gets passed to * your callbacks. This would be for having multiple models of the same * type. This is just an example though, so we statically define all the - * data and ignore the void *data parameter. + * data and ignore the gpointer data parameter. * * In our example we will be creating a table model with 6 columns and 10 * rows. This corresponds to having 6 different types of information and @@ -99,7 +99,7 @@ \ " -char *headers [COLS] = { +gchar *headers [COLS] = { "Email", "Full Name", "Address", @@ -114,7 +114,7 @@ char *headers [COLS] = { * 3 Phone */ -char *table_data [ROWS] [COLS]; +gchar *table_data [ROWS] [COLS]; /* * ETableSimple callbacks @@ -128,28 +128,28 @@ char *table_data [ROWS] [COLS]; /* This function returns the number of columns in our ETableModel. */ static int -my_col_count (ETableModel *etc, void *data) +my_col_count (ETableModel *etc, gpointer data) { return COLS; } /* This function returns the number of rows in our ETableModel. */ static int -my_row_count (ETableModel *etc, void *data) +my_row_count (ETableModel *etc, gpointer data) { return ROWS; } /* This function returns the value at a particular point in our ETableModel. */ -static void * -my_value_at (ETableModel *etc, int col, int row, void *data) +static gpointer +my_value_at (ETableModel *etc, gint col, gint row, gpointer data) { - return (void *) table_data [row] [col]; + return (gpointer) table_data [row] [col]; } /* This function sets the value at a particular point in our ETableModel. */ static void -my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data) +my_set_value_at (ETableModel *etc, gint col, gint row, gconstpointer val, gpointer data) { g_free (table_data [row] [col]); table_data [row] [col] = g_strdup (val); @@ -157,42 +157,42 @@ my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data /* This function returns whether a particular cell is editable. */ static gboolean -my_is_cell_editable (ETableModel *etc, int col, int row, void *data) +my_is_cell_editable (ETableModel *etc, gint col, gint row, gpointer data) { return TRUE; } /* This function duplicates the value passed to it. */ -static void * -my_duplicate_value (ETableModel *etc, int col, const void *value, void *data) +static gpointer +my_duplicate_value (ETableModel *etc, gint col, gconstpointer value, gpointer data) { return g_strdup (value); } /* This function frees the value passed to it. */ static void -my_free_value (ETableModel *etc, int col, void *value, void *data) +my_free_value (ETableModel *etc, gint col, gpointer value, gpointer data) { g_free (value); } /* This function creates an empty value. */ -static void * -my_initialize_value (ETableModel *etc, int col, void *data) +static gpointer +my_initialize_value (ETableModel *etc, gint col, gpointer data) { return g_strdup (""); } /* This function reports if a value is empty. */ static gboolean -my_value_is_empty (ETableModel *etc, int col, const void *value, void *data) +my_value_is_empty (ETableModel *etc, gint col, gconstpointer value, gpointer data) { - return !(value && *(char *)value); + return !(value && *(gchar *)value); } /* This function reports if a value is empty. */ -static char * -my_value_to_string (ETableModel *etc, int col, const void *value, void *data) +static gchar * +my_value_to_string (ETableModel *etc, gint col, gconstpointer value, gpointer data) { return g_strdup(value); } @@ -204,7 +204,7 @@ create_table (void) GtkWidget *e_table, *window, *frame; ECell *cell_left_just; ETableHeader *e_table_header; - int i, j; + gint i, j; ETableModel *e_table_model = NULL; /* First we fill in the simple data. */ @@ -287,8 +287,8 @@ create_table (void) /* This is the main function which just initializes gnome and call our create_table function */ -int -main (int argc, char *argv []) +gint +main (gint argc, gchar *argv []) { gnome_init ("TableExample", "TableExample", argc, argv); e_cursors_init (); diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c index ac12886813..ca4128590c 100644 --- a/widgets/table/e-table-example-2.c +++ b/widgets/table/e-table-example-2.c @@ -43,10 +43,10 @@ the ETableSimple class. Instead of creating your own ETableModel class, you simply create a new object of the ETableSimple class. You give it a bunch of functions that act as callbacks. -You also get to pass a void * to ETableSimple and it gets passed to +You also get to pass a gpointer to ETableSimple and it gets passed to your callbacks. This would be for having multiple models of the same type. This is just an example though, so we statically define all the -data and ignore the void *data parameter. +data and ignore the gpointer data parameter. In our example we will be creating a table model with 6 columns and 10 rows. This corresponds to having 6 different types of information and @@ -100,7 +100,7 @@ The headers will be hard coded, as will be the example data. \ " -char *headers[VIEW_COLS] = { +gchar *headers[VIEW_COLS] = { "Email", "Full Name", "Address", @@ -119,7 +119,7 @@ char *headers[VIEW_COLS] = { Importance field. */ -char *table_data[ROWS][VIEW_COLS]; +gchar *table_data[ROWS][VIEW_COLS]; gboolean importance_data[ROWS]; /* @@ -134,19 +134,19 @@ static GdkColor *color1; static GdkColor *color2; static int -my_col_count (ETableModel *etc, void *data) +my_col_count (ETableModel *etc, gpointer data) { return VIRTUAL_COLS; } static int -my_row_count (ETableModel *etc, void *data) +my_row_count (ETableModel *etc, gpointer data) { return ROWS; } -static void * -my_value_at (ETableModel *etc, int col, int row, void *data) +static gpointer +my_value_at (ETableModel *etc, gint col, gint row, gpointer data) { if (col == COLOR_COLUMN){ if (importance_data[row]){ @@ -157,12 +157,12 @@ my_value_at (ETableModel *etc, int col, int row, void *data) } else if (col == IMPORTANCE_COLUMN){ return (gpointer) importance_data[row]; } else { - return (void *) table_data [row][col]; + return (gpointer) table_data [row][col]; } } static void -my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data) +my_set_value_at (ETableModel *etc, gint col, gint row, gconstpointer val, gpointer data) { if (col == COLOR_COLUMN){ } else if (col == IMPORTANCE_COLUMN){ @@ -174,7 +174,7 @@ my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data } static gboolean -my_is_cell_editable (ETableModel *etc, int col, int row, void *data) +my_is_cell_editable (ETableModel *etc, gint col, gint row, gpointer data) { if (col == IMPORTANCE_COLUMN) return FALSE; @@ -182,20 +182,20 @@ my_is_cell_editable (ETableModel *etc, int col, int row, void *data) return TRUE; } -static void * -my_duplicate_value (ETableModel *etc, int col, const void *value, void *data) +static gpointer +my_duplicate_value (ETableModel *etc, gint col, gconstpointer value, gpointer data) { if (col == COLOR_COLUMN){ - return (void *) value; + return (gpointer) value; } else if (col == IMPORTANCE_COLUMN){ - return (void *) value; + return (gpointer) value; } else { return g_strdup (value); } } static void -my_free_value (ETableModel *etc, int col, void *value, void *data) +my_free_value (ETableModel *etc, gint col, gpointer value, gpointer data) { if (col == COLOR_COLUMN){ } else if (col == IMPORTANCE_COLUMN){ @@ -204,8 +204,8 @@ my_free_value (ETableModel *etc, int col, void *value, void *data) } } -static void * -my_initialize_value (ETableModel *etc, int col, void *data) +static gpointer +my_initialize_value (ETableModel *etc, gint col, gpointer data) { if (col == COLOR_COLUMN){ return NULL; @@ -217,19 +217,19 @@ my_initialize_value (ETableModel *etc, int col, void *data) } static gboolean -my_value_is_empty (ETableModel *etc, int col, const void *value, void *data) +my_value_is_empty (ETableModel *etc, gint col, gconstpointer value, gpointer data) { if (col == COLOR_COLUMN){ return value == NULL; } else if (col == IMPORTANCE_COLUMN){ return value == NULL; } else { - return !(value && *(char *)value); + return !(value && *(gchar *)value); } } -static char * -my_value_to_string (ETableModel *etc, int col, const void *value, void *data) +static gchar * +my_value_to_string (ETableModel *etc, gint col, gconstpointer value, gpointer data) { if (col == COLOR_COLUMN){ return g_strdup_printf("%d", (int) value); @@ -248,7 +248,7 @@ create_table () ECell *cell_left_just; ECell *cell_checkbox; ETableHeader *e_table_header; - int i, j; + gint i, j; ETableModel *e_table_model = NULL; ETableCol *ecol; GdkPixbuf *pixbuf; @@ -333,8 +333,8 @@ create_table () -int -main (int argc, char *argv []) +gint +main (gint argc, gchar *argv []) { gnome_init ("TableExample", "TableExample", argc, argv); e_cursors_init (); diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index 0099b23656..78513792f8 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -83,8 +83,8 @@ ete_class_init (ETableExtrasClass *klass) static gint e_strint_compare(gconstpointer data1, gconstpointer data2) { - int int1 = atoi(data1); - int int2 = atoi(data2); + gint int1 = atoi(data1); + gint int2 = atoi(data2); return e_int_compare(GINT_TO_POINTER(int1), GINT_TO_POINTER(int2)); } @@ -124,9 +124,9 @@ g_utf8_strncasecmp (const gchar *s1, } static gboolean -e_string_search(gconstpointer haystack, const char *needle) +e_string_search(gconstpointer haystack, const gchar *needle) { - int length; + gint length; if (haystack == NULL) return FALSE; diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c index 61dedd4e12..e3c059d748 100644 --- a/widgets/table/e-table-field-chooser-dialog.c +++ b/widgets/table/e-table-field-chooser-dialog.c @@ -208,7 +208,7 @@ e_table_field_chooser_dialog_get_property (GObject *object, guint prop_id, GValu } static void -e_table_field_chooser_dialog_response (GtkDialog *dialog, int id) +e_table_field_chooser_dialog_response (GtkDialog *dialog, gint id) { if (id == GTK_RESPONSE_OK) gtk_widget_destroy (GTK_WIDGET (dialog)); diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 99b61f9ffa..9c62064b27 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -94,8 +94,8 @@ etfci_dispose (GObject *object) static gint etfci_find_button (ETableFieldChooserItem *etfci, double loc) { - int i; - int count; + gint i; + gint count; double height = 0; count = e_table_header_count(etfci->combined_header); @@ -115,9 +115,9 @@ etfci_find_button (ETableFieldChooserItem *etfci, double loc) static void etfci_rebuild_combined (ETableFieldChooserItem *etfci) { - int count; + gint count; GHashTable *hash; - int i; + gint i; if (etfci->combined_header != NULL) g_object_unref (etfci->combined_header); @@ -151,8 +151,8 @@ etfci_reflow (GnomeCanvasItem *item, gint flags) { ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item); double old_height; - int i; - int count; + gint i; + gint count; double height = 0; etfci_rebuild_combined (etfci); @@ -178,7 +178,7 @@ etfci_reflow (GnomeCanvasItem *item, gint flags) } static void -etfci_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) +etfci_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags) { ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item); double i2c [6]; @@ -255,7 +255,7 @@ full_header_structure_changed (ETableHeader *header, ETableFieldChooserItem *etf } static void -full_header_dimension_changed (ETableHeader *header, int col, ETableFieldChooserItem *etfci) +full_header_dimension_changed (ETableHeader *header, gint col, ETableFieldChooserItem *etfci) { e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci)); } @@ -305,7 +305,7 @@ table_header_structure_changed (ETableHeader *header, ETableFieldChooserItem *et } static void -table_header_dimension_changed (ETableHeader *header, int col, ETableFieldChooserItem *etfci) +table_header_dimension_changed (ETableHeader *header, gint col, ETableFieldChooserItem *etfci) { e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(etfci)); } @@ -396,7 +396,7 @@ etfci_drag_data_get (GtkWidget *widget, gtk_selection_data_set(selection_data, GDK_SELECTION_TYPE_STRING, sizeof(string[0]), - (unsigned char *)string, + (guchar *)string, strlen(string)); g_free(string); } @@ -449,13 +449,13 @@ etfci_unrealize (GnomeCanvasItem *item) } static void -etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height) +etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint width, gint height) { ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item); GnomeCanvas *canvas = item->canvas; - int rows; - int y1, y2; - int row; + gint rows; + gint y1, y2; + gint row; GtkStyle *style; GtkStateType state; @@ -495,7 +495,7 @@ etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int widt } static double -etfci_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, +etfci_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; @@ -503,7 +503,7 @@ etfci_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, } static gboolean -etfci_maybe_start_drag (ETableFieldChooserItem *etfci, int x, int y) +etfci_maybe_start_drag (ETableFieldChooserItem *etfci, gint x, gint y) { if (!etfci->maybe_drag) return FALSE; @@ -523,8 +523,8 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, double x, doub GdkDragContext *context; ETableCol *ecol; GdkPixmap *pixmap; - int drag_col; - int button_height; + gint drag_col; + gint button_height; GtkTargetEntry etfci_drag_types [] = { { (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER }, @@ -580,7 +580,7 @@ etfci_event (GnomeCanvasItem *item, GdkEvent *e) { ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item); GnomeCanvas *canvas = item->canvas; - int x, y; + gint x, y; switch (e->type){ case GDK_MOTION_NOTIFY: diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h index 3b9937bf3c..d0cbbd9f75 100644 --- a/widgets/table/e-table-field-chooser-item.h +++ b/widgets/table/e-table-field-chooser-item.h @@ -49,8 +49,8 @@ typedef struct { /* * Ids */ - int full_header_structure_change_id, full_header_dimension_change_id; - int table_header_structure_change_id, table_header_dimension_change_id; + gint full_header_structure_change_id, full_header_dimension_change_id; + gint table_header_structure_change_id, table_header_dimension_change_id; gchar *dnd_code; @@ -58,8 +58,8 @@ typedef struct { * For dragging columns */ guint maybe_drag:1; - int click_x, click_y; - int drag_col; + gint click_x, click_y; + gint drag_col; guint drag_data_get_id; guint drag_end_id; } ETableFieldChooserItem; diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 5af40532f8..28b7f4e45f 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -142,7 +142,7 @@ void e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContainer *etgc, ETableHeader *full_header, ETableHeader *header, - ETableModel *model, ETableSortInfo *sort_info, int n) + ETableModel *model, ETableSortInfo *sort_info, gint n) { ETableCol *col; ETableSortColumn column = e_table_sort_info_grouping_get_nth(sort_info, n); @@ -184,7 +184,7 @@ e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContaine ETableGroup * e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header, ETableHeader *header, - ETableModel *model, ETableSortInfo *sort_info, int n) + ETableModel *model, ETableSortInfo *sort_info, gint n) { ETableGroupContainer *etgc; @@ -359,56 +359,56 @@ compute_text (ETableGroupContainer *etgc, ETableGroupContainerChildNode *child_n } static void -child_cursor_change (ETableGroup *etg, int row, +child_cursor_change (ETableGroup *etg, gint row, ETableGroupContainer *etgc) { e_table_group_cursor_change (E_TABLE_GROUP (etgc), row); } static void -child_cursor_activated (ETableGroup *etg, int row, +child_cursor_activated (ETableGroup *etg, gint row, ETableGroupContainer *etgc) { e_table_group_cursor_activated (E_TABLE_GROUP (etgc), row); } static void -child_double_click (ETableGroup *etg, int row, int col, GdkEvent *event, +child_double_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETableGroupContainer *etgc) { e_table_group_double_click (E_TABLE_GROUP (etgc), row, col, event); } static gint -child_right_click (ETableGroup *etg, int row, int col, GdkEvent *event, +child_right_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETableGroupContainer *etgc) { return e_table_group_right_click (E_TABLE_GROUP (etgc), row, col, event); } static gint -child_click (ETableGroup *etg, int row, int col, GdkEvent *event, +child_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETableGroupContainer *etgc) { return e_table_group_click (E_TABLE_GROUP (etgc), row, col, event); } static gint -child_key_press (ETableGroup *etg, int row, int col, GdkEvent *event, +child_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETableGroupContainer *etgc) { return e_table_group_key_press (E_TABLE_GROUP (etgc), row, col, event); } static gint -child_start_drag (ETableGroup *etg, int row, int col, GdkEvent *event, +child_start_drag (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETableGroupContainer *etgc) { return e_table_group_start_drag (E_TABLE_GROUP (etgc), row, col, event); } static ETableGroupContainerChildNode * -create_child_node (ETableGroupContainer *etgc, void *val) +create_child_node (ETableGroupContainer *etgc, gpointer val) { ETableGroup *child; ETableGroupContainerChildNode *child_node; @@ -466,15 +466,15 @@ static void etgc_add (ETableGroup *etg, gint row) { ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg); - void *val = e_table_model_value_at (etg->model, etgc->ecol->col_idx, row); + gpointer val = e_table_model_value_at (etg->model, etgc->ecol->col_idx, row); GCompareFunc comp = etgc->ecol->compare; GList *list = etgc->children; ETableGroup *child; ETableGroupContainerChildNode *child_node; - int i = 0; + gint i = 0; for (; list; list = g_list_next (list), i++){ - int comp_val; + gint comp_val; child_node = list->data; comp_val = (*comp)(child_node->key, val); @@ -504,12 +504,12 @@ etgc_add (ETableGroup *etg, gint row) } static void -etgc_add_array (ETableGroup *etg, const int *array, int count) +etgc_add_array (ETableGroup *etg, const gint *array, gint count) { - int i; + gint i; ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg); - void *lastval = NULL; - int laststart = 0; + gpointer lastval = NULL; + gint laststart = 0; GCompareFunc comp = etgc->ecol->compare; ETableGroupContainerChildNode *child_node; ETableGroup *child; @@ -523,8 +523,8 @@ etgc_add_array (ETableGroup *etg, const int *array, int count) lastval = e_table_model_value_at (etg->model, etgc->ecol->col_idx, array[0]); for (i = 1; i < count; i++) { - void *val = e_table_model_value_at (etg->model, etgc->ecol->col_idx, array[i]); - int comp_val; + gpointer val = e_table_model_value_at (etg->model, etgc->ecol->col_idx, array[i]); + gint comp_val; comp_val = (*comp)(lastval, val); if (comp_val != 0) { @@ -558,8 +558,8 @@ etgc_add_all (ETableGroup *etg) { ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg); ESorter *sorter = etgc->selection_model->sorter; - int *array; - int count; + gint *array; + gint count; e_sorter_get_sorted_to_model_array(sorter, &array, &count); @@ -661,7 +661,7 @@ etgc_get_focus_column (ETableGroup *etg) } static void -etgc_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col) +etgc_compute_location (ETableGroup *etg, gint *x, gint *y, gint *row, gint *col) { ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg); @@ -687,7 +687,7 @@ etgc_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col) } static void -etgc_get_mouse_over (ETableGroup *etg, int *row, int *col) +etgc_get_mouse_over (ETableGroup *etg, gint *row, gint *col) { ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg); @@ -697,7 +697,7 @@ etgc_get_mouse_over (ETableGroup *etg, int *row, int *col) *col = -1; if (etgc->children) { - int row_plus = 0; + gint row_plus = 0; GList *list; for (list = etgc->children; list; list = list->next) { @@ -718,11 +718,11 @@ etgc_get_mouse_over (ETableGroup *etg, int *row, int *col) } static void -etgc_get_cell_geometry (ETableGroup *etg, int *row, int *col, int *x, int *y, int *width, int *height) +etgc_get_cell_geometry (ETableGroup *etg, gint *row, gint *col, gint *x, gint *y, gint *width, gint *height) { ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg); - int ypos; + gint ypos; ypos = 0; @@ -731,7 +731,7 @@ etgc_get_cell_geometry (ETableGroup *etg, int *row, int *col, int *x, int *y, in for (list = etgc->children; list; list = list->next) { ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data; ETableGroup *child = child_node->child; - int thisy; + gint thisy; e_table_group_get_cell_geometry (child, row, col, x, &thisy, width, height); ypos += thisy; @@ -1115,7 +1115,7 @@ etgc_init (ETableGroupContainer *container) } void -e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, void *closure) +e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, gpointer closure) { if (E_IS_TABLE_GROUP_CONTAINER (etg)){ ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg); diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h index 69791e376b..168b2f8a5a 100644 --- a/widgets/table/e-table-group-container.h +++ b/widgets/table/e-table-group-container.h @@ -62,8 +62,8 @@ typedef struct { gdouble width, height, minimum_width; ETableSortInfo *sort_info; - int n; - int length_threshold; + gint n; + gint length_threshold; ESelectionModel *selection_model; @@ -86,8 +86,8 @@ typedef struct { typedef struct { ETableGroup *child; - void *key; - char *string; + gpointer key; + gchar *string; GnomeCanvasItem *text; GnomeCanvasItem *rect; gint count; @@ -95,11 +95,11 @@ typedef struct { ETableGroup *e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header, ETableHeader *header, - ETableModel *model, ETableSortInfo *sort_info, int n); + ETableModel *model, ETableSortInfo *sort_info, gint n); void e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContainer *etgc, ETableHeader *full_header, ETableHeader *header, - ETableModel *model, ETableSortInfo *sort_info, int n); + ETableModel *model, ETableSortInfo *sort_info, gint n); GType e_table_group_container_get_type (void); diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c index 6076030737..5e269e284e 100644 --- a/widgets/table/e-table-group-leaf.c +++ b/widgets/table/e-table-group-leaf.c @@ -400,7 +400,7 @@ etgl_get_printable (ETableGroup *etg) } static void -etgl_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col) +etgl_compute_location (ETableGroup *etg, gint *x, gint *y, gint *row, gint *col) { ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg); @@ -408,7 +408,7 @@ etgl_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col) } static void -etgl_get_mouse_over (ETableGroup *etg, int *row, int *col) +etgl_get_mouse_over (ETableGroup *etg, gint *row, gint *col) { ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg); @@ -421,7 +421,7 @@ etgl_get_mouse_over (ETableGroup *etg, int *row, int *col) } static void -etgl_get_cell_geometry (ETableGroup *etg, int *row, int *col, int *x, int *y, int *width, int *height) +etgl_get_cell_geometry (ETableGroup *etg, gint *row, gint *col, gint *x, gint *y, gint *width, gint *height) { ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg); diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h index e19bf8cdb8..8d05874c01 100644 --- a/widgets/table/e-table-group-leaf.h +++ b/widgets/table/e-table-group-leaf.h @@ -49,7 +49,7 @@ typedef struct { gdouble width; gdouble minimum_width; - int length_threshold; + gint length_threshold; ETableSubset *ets; guint is_grouped : 1; @@ -61,13 +61,13 @@ typedef struct { guint uniform_row_height : 1; ECursorMode cursor_mode; - int etgl_cursor_change_id; - int etgl_cursor_activated_id; - int etgl_double_click_id; - int etgl_right_click_id; - int etgl_click_id; - int etgl_key_press_id; - int etgl_start_drag_id; + gint etgl_cursor_change_id; + gint etgl_cursor_activated_id; + gint etgl_double_click_id; + gint etgl_right_click_id; + gint etgl_click_id; + gint etgl_key_press_id; + gint etgl_start_drag_id; ESelectionModel *selection_model; } ETableGroupLeaf; diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index 5cc03e90fc..a1d965b57a 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -101,7 +101,7 @@ e_table_group_new (GnomeCanvasGroup *parent, ETableHeader *header, ETableModel *model, ETableSortInfo *sort_info, - int n) + gint n) { g_return_val_if_fail (model != NULL, NULL); @@ -170,8 +170,8 @@ e_table_group_add (ETableGroup *etg, */ void e_table_group_add_array (ETableGroup *etg, - const int *array, - int count) + const gint *array, + gint count) { g_return_if_fail (etg != NULL); g_return_if_fail (E_IS_TABLE_GROUP (etg)); @@ -372,7 +372,7 @@ e_table_group_get_printable (ETableGroup *etg) * %ETableGroup is removed from the value y points to. */ void -e_table_group_compute_location (ETableGroup *etg, int *x, int *y, int *row, int *col) +e_table_group_compute_location (ETableGroup *etg, gint *x, gint *y, gint *row, gint *col) { g_return_if_fail (etg != NULL); g_return_if_fail (E_IS_TABLE_GROUP (etg)); @@ -382,7 +382,7 @@ e_table_group_compute_location (ETableGroup *etg, int *x, int *y, int *row, int } void -e_table_group_get_mouse_over (ETableGroup *etg, int *row, int *col) +e_table_group_get_mouse_over (ETableGroup *etg, gint *row, gint *col) { g_return_if_fail (etg != NULL); g_return_if_fail (E_IS_TABLE_GROUP (etg)); @@ -407,12 +407,12 @@ e_table_group_get_mouse_over (ETableGroup *etg, int *row, int *col) */ void e_table_group_get_cell_geometry (ETableGroup *etg, - int *row, - int *col, - int *x, - int *y, - int *width, - int *height) + gint *row, + gint *col, + gint *x, + gint *y, + gint *width, + gint *height) { g_return_if_fail (etg != NULL); g_return_if_fail (E_IS_TABLE_GROUP (etg)); diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h index 36868f7d35..7bf139e666 100644 --- a/widgets/table/e-table-group.h +++ b/widgets/table/e-table-group.h @@ -69,17 +69,17 @@ typedef struct { GnomeCanvasGroupClass parent_class; /* Signals */ - void (*cursor_change) (ETableGroup *etg, int row); - void (*cursor_activated) (ETableGroup *etg, int row); - void (*double_click) (ETableGroup *etg, int row, int col, GdkEvent *event); - gint (*right_click) (ETableGroup *etg, int row, int col, GdkEvent *event); - gint (*click) (ETableGroup *etg, int row, int col, GdkEvent *event); - gint (*key_press) (ETableGroup *etg, int row, int col, GdkEvent *event); - gint (*start_drag) (ETableGroup *etg, int row, int col, GdkEvent *event); + void (*cursor_change) (ETableGroup *etg, gint row); + void (*cursor_activated) (ETableGroup *etg, gint row); + void (*double_click) (ETableGroup *etg, gint row, gint col, GdkEvent *event); + gint (*right_click) (ETableGroup *etg, gint row, gint col, GdkEvent *event); + gint (*click) (ETableGroup *etg, gint row, gint col, GdkEvent *event); + gint (*key_press) (ETableGroup *etg, gint row, gint col, GdkEvent *event); + gint (*start_drag) (ETableGroup *etg, gint row, gint col, GdkEvent *event); /* Virtual functions. */ void (*add) (ETableGroup *etg, gint row); - void (*add_array) (ETableGroup *etg, const int *array, int count); + void (*add_array) (ETableGroup *etg, const gint *array, gint count); void (*add_all) (ETableGroup *etg); gboolean (*remove) (ETableGroup *etg, gint row); gint (*row_count) (ETableGroup *etg); @@ -89,9 +89,9 @@ typedef struct { gboolean (*get_focus) (ETableGroup *etg); gint (*get_focus_column) (ETableGroup *etg); EPrintable *(*get_printable) (ETableGroup *etg); - void (*compute_location) (ETableGroup *etg, int *x, int *y, int *row, int *col); - void (*get_mouse_over) (ETableGroup *etg, int *row, int *col); - void (*get_cell_geometry) (ETableGroup *etg, int *row, int *col, int *x, int *y, int *width, int *height); + void (*compute_location) (ETableGroup *etg, gint *x, gint *y, gint *row, gint *col); + void (*get_mouse_over) (ETableGroup *etg, gint *row, gint *col); + void (*get_cell_geometry) (ETableGroup *etg, gint *row, gint *col, gint *x, gint *y, gint *width, gint *height); } ETableGroupClass; @@ -99,8 +99,8 @@ typedef struct { void e_table_group_add (ETableGroup *etg, gint row); void e_table_group_add_array (ETableGroup *etg, - const int *array, - int count); + const gint *array, + gint count); void e_table_group_add_all (ETableGroup *etg); gboolean e_table_group_remove (ETableGroup *etg, gint row); @@ -119,26 +119,26 @@ gint e_table_group_get_focus_column (ETableGroup *etg); ETableHeader *e_table_group_get_header (ETableGroup *etg); EPrintable *e_table_group_get_printable (ETableGroup *etg); void e_table_group_compute_location (ETableGroup *etg, - int *x, - int *y, - int *row, - int *col); + gint *x, + gint *y, + gint *row, + gint *col); void e_table_group_get_mouse_over(ETableGroup *etg, - int *row, - int *col); + gint *row, + gint *col); void e_table_group_get_cell_geometry (ETableGroup *etg, - int *row, - int *col, - int *x, - int *y, - int *width, - int *height); + gint *row, + gint *col, + gint *x, + gint *y, + gint *width, + gint *height); ETableGroup *e_table_group_new (GnomeCanvasGroup *parent, ETableHeader *full_header, ETableHeader *header, ETableModel *model, ETableSortInfo *sort_info, - int n); + gint n); void e_table_group_construct (GnomeCanvasGroup *parent, ETableGroup *etg, ETableHeader *full_header, @@ -172,7 +172,7 @@ gint e_table_group_start_drag (ETableGroup *etg, GdkEvent *event); GType e_table_group_get_type (void); -typedef void (*ETableGroupLeafFn) (void *e_table_item, void *closure); +typedef void (*ETableGroupLeafFn) (gpointer e_table_item, gpointer closure); void e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, void *closure); diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 62c00f94a4..d569e8dd9e 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -155,8 +155,8 @@ static int e_table_header_item_get_height (ETableHeaderItem *ethi) { ETableHeader *eth; - int numcols, col; - int maxheight; + gint numcols, col; + gint maxheight; g_return_val_if_fail (ethi != NULL, 0); g_return_val_if_fail (E_IS_TABLE_HEADER_ITEM (ethi), 0); @@ -168,7 +168,7 @@ e_table_header_item_get_height (ETableHeaderItem *ethi) for (col = 0; col < numcols; col++) { ETableCol *ecol = e_table_header_get_column (eth, col); - int height; + gint height; height = e_table_header_compute_height (ecol, GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas)); @@ -181,7 +181,7 @@ e_table_header_item_get_height (ETableHeaderItem *ethi) } static void -ethi_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) +ethi_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags) { ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item); @@ -260,7 +260,7 @@ structure_changed (ETableHeader *header, ETableHeaderItem *ethi) } static void -dimension_changed (ETableHeader *header, int col, ETableHeaderItem *ethi) +dimension_changed (ETableHeader *header, gint col, ETableHeaderItem *ethi) { gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(ethi)); } @@ -388,11 +388,11 @@ ethi_get_property (GObject *object, } static int -ethi_find_col_by_x (ETableHeaderItem *ethi, int x) +ethi_find_col_by_x (ETableHeaderItem *ethi, gint x) { - const int cols = e_table_header_count (ethi->eth); - int x1 = 0; - int col; + const gint cols = e_table_header_count (ethi->eth); + gint x1 = 0; + gint col; d(g_print ("%s:%d: x = %d, x1 = %d\n", __FUNCTION__, __LINE__, x, x1)); @@ -418,11 +418,11 @@ ethi_find_col_by_x (ETableHeaderItem *ethi, int x) } static int -ethi_find_col_by_x_nearest (ETableHeaderItem *ethi, int x) +ethi_find_col_by_x_nearest (ETableHeaderItem *ethi, gint x) { - const int cols = e_table_header_count (ethi->eth); - int x1 = 0; - int col; + const gint cols = e_table_header_count (ethi->eth); + gint x1 = 0; + gint col; x1 += ethi->group_indent_width; @@ -455,7 +455,7 @@ ethi_remove_drop_marker (ETableHeaderItem *ethi) } static GtkWidget * -make_shaped_window_from_xpm (const char **xpm) +make_shaped_window_from_xpm (const gchar **xpm) { GdkPixbuf *pixbuf; GdkPixmap *pixmap; @@ -483,10 +483,10 @@ make_shaped_window_from_xpm (const char **xpm) } static void -ethi_add_drop_marker (ETableHeaderItem *ethi, int col, gboolean recreate) +ethi_add_drop_marker (ETableHeaderItem *ethi, gint col, gboolean recreate) { - int rx, ry; - int x; + gint rx, ry; + gint x; if (!recreate && ethi->drag_mark == col) return; @@ -518,7 +518,7 @@ ethi_add_drop_marker (ETableHeaderItem *ethi, int col, gboolean recreate) #define gray50_width 2 #define gray50_height 2 -static char gray50_bits [] = { +static gchar gray50_bits [] = { 0x02, 0x01, }; static void @@ -592,7 +592,7 @@ do_drag_motion(ETableHeaderItem *ethi, if ((x >= 0) && (x <= (ethi->width)) && (y >= 0) && (y <= (ethi->height))){ - int col; + gint col; d(g_print("In header\n")); col = ethi_find_col_by_x_nearest (ethi, x); @@ -626,7 +626,7 @@ static gboolean scroll_timeout (gpointer data) { ETableHeaderItem *ethi = data; - int dx = 0; + gint dx = 0; GtkAdjustment *h, *v; double value; @@ -701,7 +701,7 @@ ethi_drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint time, ETableHeaderItem *ethi) { - char *droptype, *headertype; + gchar *droptype, *headertype; guint direction = 0; gdk_drag_status (context, 0, time); @@ -768,15 +768,15 @@ ethi_drag_data_received (GtkWidget *canvas, guint time, ETableHeaderItem *ethi) { - int found = FALSE; - int count; - int column; - int drop_col; - int i; + gint found = FALSE; + gint count; + gint column; + gint drop_col; + gint i; if (data->data) { count = e_table_header_count(ethi->eth); - column = atoi((char *)data->data); + column = atoi((gchar *)data->data); drop_col = ethi->drop_col; ethi->drop_col = -1; @@ -820,7 +820,7 @@ ethi_drag_data_get (GtkWidget *canvas, gtk_selection_data_set(selection_data, GDK_SELECTION_TYPE_STRING, sizeof(string[0]), - (unsigned char *)string, + (guchar *)string, strlen(string)); g_free(string); } @@ -838,7 +838,7 @@ ethi_drag_drop (GtkWidget *canvas, if ((x >= 0) && (x <= (ethi->width)) && (y >= 0) && (y <= (ethi->height))){ - int col; + gint col; col = ethi_find_col_by_x_nearest (ethi, x); @@ -847,7 +847,7 @@ ethi_drag_drop (GtkWidget *canvas, ethi->drop_col = col; if (col != -1) { - char *target = g_strdup_printf ("%s-%s", TARGET_ETABLE_COL_TYPE, ethi->dnd_code); + gchar *target = g_strdup_printf ("%s-%s", TARGET_ETABLE_COL_TYPE, ethi->dnd_code); d(g_print ("ethi - %s\n", target)); gtk_drag_get_data (canvas, context, gdk_atom_intern(target, FALSE), time); g_free (target); @@ -935,19 +935,19 @@ ethi_unrealize (GnomeCanvasItem *item) } static void -ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height) +ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint width, gint height) { ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item); GnomeCanvas *canvas = item->canvas; - const int cols = e_table_header_count (ethi->eth); - int x1, x2; - int col; + const gint cols = e_table_header_count (ethi->eth); + gint x1, x2; + gint col; GHashTable *arrows = g_hash_table_new (NULL, NULL); if (ethi->sort_info) { - int length = e_table_sort_info_grouping_get_count(ethi->sort_info); - int i; + gint length = e_table_sort_info_grouping_get_count(ethi->sort_info); + gint i; for (i = 0; i < length; i++) { ETableSortColumn column = e_table_sort_info_grouping_get_nth(ethi->sort_info, i); g_hash_table_insert (arrows, @@ -972,7 +972,7 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width x2 += ethi->group_indent_width; for (col = 0; col < cols; col++, x1 = x2){ ETableCol *ecol = e_table_header_get_column (ethi->eth, col); - int col_width; + gint col_width; col_width = ecol->width; @@ -1002,7 +1002,7 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width } static double -ethi_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, +ethi_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; @@ -1017,10 +1017,10 @@ ethi_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, * then the ETableCol that actually contains this point is returned here */ static gboolean -is_pointer_on_division (ETableHeaderItem *ethi, int pos, int *the_total, int *return_col) +is_pointer_on_division (ETableHeaderItem *ethi, gint pos, gint *the_total, gint *return_col) { - const int cols = e_table_header_count (ethi->eth); - int col, total; + const gint cols = e_table_header_count (ethi->eth); + gint col, total; total = 0; for (col = 0; col < cols; col++){ @@ -1052,9 +1052,9 @@ is_pointer_on_division (ETableHeaderItem *ethi, int pos, int *the_total, int *re #define convert(c,sx,sy,x,y) gnome_canvas_w2c (c,sx,sy,x,y) static void -set_cursor (ETableHeaderItem *ethi, int pos) +set_cursor (ETableHeaderItem *ethi, gint pos) { - int col; + gint col; GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas); gboolean resizable = FALSE; @@ -1063,12 +1063,12 @@ set_cursor (ETableHeaderItem *ethi, int pos) return; if (is_pointer_on_division (ethi, pos, NULL, &col)) { - int last_col = ethi->eth->col_count - 1; + gint last_col = ethi->eth->col_count - 1; ETableCol *ecol = e_table_header_get_column (ethi->eth, col); /* Last column is not resizable */ if (ecol->resizable && col != last_col) { - int c = col + 1; + gint c = col + 1; /* Column is not resizable if all columns after it are also not resizable */ @@ -1125,9 +1125,9 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) GtkTargetList *list; GdkDragContext *context; ETableCol *ecol; - int col_width; + gint col_width; GdkPixmap *pixmap; - int group_indent = 0; + gint group_indent = 0; GHashTable *arrows = g_hash_table_new (NULL, NULL); GtkTargetEntry ethi_drag_types [] = { @@ -1140,8 +1140,8 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) return; if (ethi->sort_info) { - int length = e_table_sort_info_grouping_get_count(ethi->sort_info); - int i; + gint length = e_table_sort_info_grouping_get_count(ethi->sort_info); + gint i; for (i = 0; i < length; i++) { ETableSortColumn column = e_table_sort_info_grouping_get_nth( @@ -1205,17 +1205,17 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) typedef struct { ETableHeaderItem *ethi; - int col; + gint col; } EthiHeaderInfo; static void ethi_popup_sort_ascending(GtkWidget *widget, EthiHeaderInfo *info) { ETableCol *col; - int model_col = -1; - int length; - int i; - int found = FALSE; + gint model_col = -1; + gint length; + gint i; + gint found = FALSE; ETableHeaderItem *ethi = info->ethi; col = e_table_header_get_column (ethi->eth, info->col); @@ -1267,10 +1267,10 @@ static void ethi_popup_sort_descending(GtkWidget *widget, EthiHeaderInfo *info) { ETableCol *col; - int model_col=-1; - int length; - int i; - int found = FALSE; + gint model_col=-1; + gint length; + gint i; + gint found = FALSE; ETableHeaderItem *ethi = info->ethi; col = e_table_header_get_column (ethi->eth, info->col); @@ -1331,7 +1331,7 @@ static void ethi_popup_group_field(GtkWidget *widget, EthiHeaderInfo *info) { ETableCol *col; - int model_col; + gint model_col; ETableHeaderItem *ethi = info->ethi; ETableSortColumn column; @@ -1389,7 +1389,7 @@ static void ethi_popup_best_fit(GtkWidget *widget, EthiHeaderInfo *info) { ETableHeaderItem *ethi = info->ethi; - int width; + gint width; g_signal_emit_by_name (ethi->eth, "request_width", @@ -1416,7 +1416,7 @@ config_destroyed (gpointer data, GObject *where_object_was) static void apply_changes (ETableConfig *config, ETableHeaderItem *ethi) { - char *state = e_table_state_save_to_string (config->state); + gchar *state = e_table_state_save_to_string (config->state); if (ethi->table) e_table_set_state (ethi->table, state); @@ -1489,7 +1489,7 @@ static EPopupMenu ethi_context_menu [] = { static void sort_by_id (GtkWidget *menu_item, ETableHeaderItem *ethi) { - int col = GPOINTER_TO_INT (g_object_get_data(G_OBJECT (menu_item), "col-number")); + gint col = GPOINTER_TO_INT (g_object_get_data(G_OBJECT (menu_item), "col-number")); ETableCol *ecol; gboolean clearfirst; @@ -1520,7 +1520,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event) EthiHeaderInfo *info = g_new (EthiHeaderInfo, 1); ETableCol *col; GtkMenu *popup; - int ncol, sort_count, sort_col; + gint ncol, sort_count, sort_col; GtkWidget *menu_item, *sub_menu; ETableSortColumn column; gboolean ascending = TRUE; @@ -1571,7 +1571,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event) /* Headers */ for (ncol = 0; ncolfull_header->col_count; ncol++) { - char *text=NULL; + gchar *text=NULL; if (!ethi->full_header->columns[ncol]->sortable || ethi->full_header->columns[ncol]->disabled) @@ -1610,9 +1610,9 @@ ethi_button_pressed (ETableHeaderItem *ethi, GdkEventButton *event) void ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col) { - int model_col = -1; - int length; - int i; + gint model_col = -1; + gint length; + gint i; gboolean found = FALSE; if (col == NULL) @@ -1625,7 +1625,7 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col) for (i = 0; i < length; i++) { ETableSortColumn column = e_table_sort_info_grouping_get_nth(ethi->sort_info, i); if (model_col == column.column || model_col == -1){ - int ascending = column.ascending; + gint ascending = column.ascending; ascending = ! ascending; column.ascending = ascending; e_table_sort_info_grouping_set_nth(ethi->sort_info, i, column); @@ -1641,14 +1641,14 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col) ETableSortColumn column = e_table_sort_info_sorting_get_nth(ethi->sort_info, i); if (model_col == column.column || model_col == -1){ - int ascending = column.ascending; + gint ascending = column.ascending; if (ascending == 0 && model_col != -1){ /* * This means the user has clicked twice * already, lets kill sorting of this column now. */ - int j; + gint j; for (j = i + 1; j < length; j++) e_table_sort_info_sorting_set_nth (ethi->sort_info, @@ -1688,8 +1688,8 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item); GnomeCanvas *canvas = item->canvas; const gboolean resizing = ETHI_RESIZING (ethi); - int x, y, start, col; - int was_maybe_drag = 0; + gint x, y, start, col; + gint was_maybe_drag = 0; switch (e->type){ case GDK_ENTER_NOTIFY: @@ -1706,7 +1706,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) convert (canvas, e->motion.x, e->motion.y, &x, &y); if (resizing){ - int new_width; + gint new_width; if (ethi->resize_guide == NULL){ /* Quick hack until I actually bind the views */ @@ -1776,7 +1776,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) if (e->button.button != 1) break; else { - int width = 0; + gint width = 0; g_signal_emit_by_name (ethi->eth, "request_width", (int)ethi->resize_col, &width); diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h index 24a86939d8..db2aeb3508 100644 --- a/widgets/table/e-table-header-item.h +++ b/widgets/table/e-table-header-item.h @@ -51,26 +51,26 @@ typedef struct { /* * Used during resizing; Could be shorts */ - int resize_col; - int resize_start_pos; - int resize_min_width; + gint resize_col; + gint resize_start_pos; + gint resize_min_width; GtkObject *resize_guide; - int group_indent_width; + gint group_indent_width; /* * Ids */ - int structure_change_id, dimension_change_id; + gint structure_change_id, dimension_change_id; /* * For dragging columns */ guint maybe_drag:1; guint dnd_ready:1; - int click_x, click_y; - int drag_col, drop_col, drag_mark; + gint click_x, click_y; + gint drag_col, drop_col, drag_mark; guint drag_motion_id, drag_end_id, drag_leave_id, drag_drop_id, drag_data_received_id, drag_data_get_id; guint sort_info_changed_id, group_info_changed_id; GnomeCanvasItem *remove_item; @@ -84,11 +84,11 @@ typedef struct { ETableSortInfo *sort_info; guint scroll_direction : 4; - int last_drop_x; - int last_drop_y; - int last_drop_time; + gint last_drop_x; + gint last_drop_y; + gint last_drop_time; GdkDragContext *last_drop_context; - int scroll_idle_id; + gint scroll_idle_id; /* For adding fields. */ ETableHeader *full_header; @@ -102,7 +102,7 @@ typedef struct { } etfcd; /* For keyboard navigation*/ - int selected_col; + gint selected_col; } ETableHeaderItem; diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index ae5ebf871f..8044b73bfc 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -35,7 +35,7 @@ #include "e-table-header-utils.h" static PangoLayout* -build_header_layout (GtkWidget *widget, const char *str) +build_header_layout (GtkWidget *widget, const gchar *str) { PangoLayout *layout; @@ -70,8 +70,8 @@ build_header_layout (GtkWidget *widget, const char *str) double e_table_header_compute_height (ETableCol *ecol, GtkWidget *widget) { - int ythick; - int height; + gint ythick; + gint height; PangoLayout *layout; g_return_val_if_fail (ecol != NULL, -1); @@ -111,13 +111,13 @@ e_table_header_width_extras (GtkStyle *style) */ static GdkPixmap * make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc, - GdkPixbuf *pixbuf, GdkColor *bg, int width, int height, - int dither_xofs, int dither_yofs) + GdkPixbuf *pixbuf, GdkColor *bg, gint width, gint height, + gint dither_xofs, gint dither_yofs) { - int pwidth, pheight; + gint pwidth, pheight; GdkPixmap *pixmap; GdkPixbuf *tmp; - int color; + gint color; pwidth = gdk_pixbuf_get_width (pixbuf); pheight = gdk_pixbuf_get_height (pixbuf); @@ -141,7 +141,7 @@ make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc, 16, color, color); } else { - int x, y, rowstride; + gint x, y, rowstride; GdkPixbuf *fade; guchar *pixels; @@ -162,7 +162,7 @@ make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc, for (y = 0; y < height; y++) { guchar *p; - int yfactor; + gint yfactor; p = pixels + y * rowstride; @@ -172,7 +172,7 @@ make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc, yfactor = height; for (x = 0; x < width; x++) { - int xfactor; + gint xfactor; if (width < pwidth) xfactor = width - x; @@ -238,12 +238,12 @@ make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc, **/ static void e_table_draw_elided_string (GdkDrawable *drawable, GdkGC *gc, GtkWidget *widget, - int x, int y, PangoLayout *layout, char *str, - int max_width, gboolean center) + gint x, gint y, PangoLayout *layout, gchar *str, + gint max_width, gboolean center) { - int width; - int height; - int index; + gint width; + gint height; + gint index; GSList *lines; PangoLayoutLine *line; @@ -257,7 +257,7 @@ e_table_draw_elided_string (GdkDrawable *drawable, GdkGC *gc, GtkWidget *widget, gdk_gc_set_clip_rectangle (gc, NULL); if (width <= max_width) { - int xpos; + gint xpos; if (center) xpos = x + (max_width - width) / 2; @@ -268,8 +268,8 @@ e_table_draw_elided_string (GdkDrawable *drawable, GdkGC *gc, GtkWidget *widget, xpos, y, layout); } else { - int arrow_width; - int i; + gint arrow_width; + gint i; if (max_width < ARROW_WIDTH + 1) arrow_width = max_width - 1; @@ -323,13 +323,13 @@ void e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol, GtkStyle *style, GtkStateType state, GtkWidget *widget, - int x, int y, int width, int height, - int button_width, int button_height, + gint x, gint y, gint width, gint height, + gint button_width, gint button_height, ETableColArrow arrow) { - int xthick, ythick; - int inner_x, inner_y; - int inner_width, inner_height; + gint xthick, ythick; + gint inner_x, inner_y; + gint inner_width, inner_height; GdkGC *gc; PangoLayout *layout; static gpointer g_label = NULL; @@ -385,7 +385,7 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol, case E_TABLE_COL_ARROW_UP: case E_TABLE_COL_ARROW_DOWN: { - int arrow_width, arrow_height; + gint arrow_width, arrow_height; arrow_width = MIN (MIN_ARROW_SIZE, inner_width); arrow_height = MIN (MIN_ARROW_SIZE, inner_height); @@ -413,9 +413,9 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol, /* Pixbuf or label */ if (ecol->is_pixbuf) { - int pwidth, pheight; - int clip_width, clip_height; - int xpos; + gint pwidth, pheight; + gint clip_width, clip_height; + gint xpos; GdkPixmap *pixmap; g_return_if_fail (ecol->pixbuf != NULL); @@ -429,7 +429,7 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol, xpos = inner_x; if (inner_width - pwidth > 11) { - int ypos; + gint ypos; pango_layout_get_pixel_size (layout, &width, NULL); diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h index 2ae1f79b1b..7804bd12c5 100644 --- a/widgets/table/e-table-header-utils.h +++ b/widgets/table/e-table-header-utils.h @@ -40,12 +40,12 @@ void e_table_header_draw_button (GdkDrawable *drawable, GtkStyle *style, GtkStateType state, GtkWidget *widget, - int x, - int y, - int width, - int height, - int button_width, - int button_height, + gint x, + gint y, + gint width, + gint height, + gint button_width, + gint button_height, ETableColArrow arrow); #ifdef __cplusplus diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c index 6fd40ae0fa..b931f48e20 100644 --- a/widgets/table/e-table-header.c +++ b/widgets/table/e-table-header.c @@ -49,7 +49,7 @@ enum { LAST_SIGNAL }; -static void eth_set_size (ETableHeader *eth, int idx, int size); +static void eth_set_size (ETableHeader *eth, gint idx, gint size); static void eth_calc_widths (ETableHeader *eth); static guint eth_signals [LAST_SIGNAL] = { 0, }; @@ -57,18 +57,18 @@ static guint eth_signals [LAST_SIGNAL] = { 0, }; G_DEFINE_TYPE (ETableHeader, e_table_header, G_TYPE_OBJECT) struct two_ints { - int column; - int width; + gint column; + gint width; }; static void -eth_set_width (ETableHeader *eth, int width) +eth_set_width (ETableHeader *eth, gint width) { eth->width = width; } static void -dequeue (ETableHeader *eth, int *column, int *width) +dequeue (ETableHeader *eth, gint *column, gint *width) { GSList *head; struct two_ints *store; @@ -88,7 +88,7 @@ dequeue (ETableHeader *eth, int *column, int *width) static gboolean dequeue_idle (ETableHeader *eth) { - int column, width; + gint column, width; dequeue (eth, &column, &width); while (eth->change_queue && ((struct two_ints *) eth->change_queue->data)->column == column) @@ -108,7 +108,7 @@ dequeue_idle (ETableHeader *eth) } static void -enqueue (ETableHeader *eth, int column, int width) +enqueue (ETableHeader *eth, gint column, gint width) { struct two_ints *store; store = g_new(struct two_ints, 1); @@ -125,7 +125,7 @@ enqueue (ETableHeader *eth, int column, int width) } void -e_table_header_set_size (ETableHeader *eth, int idx, int size) +e_table_header_set_size (ETableHeader *eth, gint idx, gint size) { g_return_if_fail (eth != NULL); g_return_if_fail (E_IS_TABLE_HEADER (eth)); @@ -134,7 +134,7 @@ e_table_header_set_size (ETableHeader *eth, int idx, int size) } static void -eth_do_remove (ETableHeader *eth, int idx, gboolean do_unref) +eth_do_remove (ETableHeader *eth, gint idx, gboolean do_unref) { if (do_unref) g_object_unref (eth->columns [idx]); @@ -148,8 +148,8 @@ static void eth_finalize (GObject *object) { ETableHeader *eth = E_TABLE_HEADER (object); - const int cols = eth->col_count; - int i; + const gint cols = eth->col_count; + gint i; if (eth->sort_info) { if (eth->sort_info_group_change_id) @@ -345,8 +345,8 @@ e_table_header_new (void) static void eth_update_offsets (ETableHeader *eth) { - int i; - int x = 0; + gint i; + gint x = 0; for (i = 0; i < eth->col_count; i++){ ETableCol *etc = eth->columns [i]; @@ -357,7 +357,7 @@ eth_update_offsets (ETableHeader *eth) } static void -eth_do_insert (ETableHeader *eth, int pos, ETableCol *val) +eth_do_insert (ETableHeader *eth, gint pos, ETableCol *val) { memmove (ð->columns [pos+1], ð->columns [pos], sizeof (ETableCol *) * (eth->col_count - pos)); @@ -380,7 +380,7 @@ eth_do_insert (ETableHeader *eth, int pos, ETableCol *val) * The ETableCol is assumed */ void -e_table_header_add_column (ETableHeader *eth, ETableCol *tc, int pos) +e_table_header_add_column (ETableHeader *eth, ETableCol *tc, gint pos) { g_return_if_fail (eth != NULL); g_return_if_fail (E_IS_TABLE_HEADER (eth)); @@ -411,7 +411,7 @@ e_table_header_add_column (ETableHeader *eth, ETableCol *tc, int pos) * Returns: The ETableCol at @column in the @eth object */ ETableCol * -e_table_header_get_column (ETableHeader *eth, int column) +e_table_header_get_column (ETableHeader *eth, gint column) { g_return_val_if_fail (eth != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), NULL); @@ -433,9 +433,9 @@ e_table_header_get_column (ETableHeader *eth, int column) * Returns: The ETableCol with col_idx = @col_idx in the @eth object */ ETableCol * -e_table_header_get_column_by_col_idx (ETableHeader *eth, int col_idx) +e_table_header_get_column_by_col_idx (ETableHeader *eth, gint col_idx) { - int i; + gint i; g_return_val_if_fail (eth != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), NULL); @@ -454,7 +454,7 @@ e_table_header_get_column_by_col_idx (ETableHeader *eth, int col_idx) * * Returns: the number of columns in this ETableHeader. */ -int +gint e_table_header_count (ETableHeader *eth) { g_return_val_if_fail (eth != NULL, 0); @@ -475,8 +475,8 @@ e_table_header_count (ETableHeader *eth) * * Returns: the column in the model that the @col column * in the ETableHeader points to. */ -int -e_table_header_index (ETableHeader *eth, int col) +gint +e_table_header_index (ETableHeader *eth, gint col) { g_return_val_if_fail (eth != NULL, -1); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), -1); @@ -496,10 +496,10 @@ e_table_header_index (ETableHeader *eth, int col) * Returns: the column that contains pixel @x_offset, or -1 * if no column inside this ETableHeader contains that pixel. */ -int -e_table_header_get_index_at (ETableHeader *eth, int x_offset) +gint +e_table_header_get_index_at (ETableHeader *eth, gint x_offset) { - int i, total; + gint i, total; g_return_val_if_fail (eth != NULL, 0); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0); @@ -529,7 +529,7 @@ ETableCol ** e_table_header_get_columns (ETableHeader *eth) { ETableCol **ret; - int i; + gint i; g_return_val_if_fail (eth != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), NULL); @@ -551,11 +551,11 @@ e_table_header_get_columns (ETableHeader *eth) * * Returns: The number of selected columns in the @eth object. */ -int +gint e_table_header_get_selected (ETableHeader *eth) { - int i; - int selected = 0; + gint i; + gint selected = 0; g_return_val_if_fail (eth != NULL, 0); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0); @@ -575,10 +575,10 @@ e_table_header_get_selected (ETableHeader *eth) * Returns: the number of pixels used by the @eth object * when rendered on screen */ -int +gint e_table_header_total_width (ETableHeader *eth) { - int total, i; + gint total, i; g_return_val_if_fail (eth != NULL, 0); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0); @@ -596,10 +596,10 @@ e_table_header_total_width (ETableHeader *eth) * * Returns: the minimum number of pixels required by the @eth object. **/ -int +gint e_table_header_min_width (ETableHeader *eth) { - int total, i; + gint total, i; g_return_val_if_fail (eth != NULL, 0); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0); @@ -622,7 +622,7 @@ e_table_header_min_width (ETableHeader *eth) * and "structure_change" will be emmited */ void -e_table_header_move (ETableHeader *eth, int source_index, int target_index) +e_table_header_move (ETableHeader *eth, gint source_index, gint target_index) { ETableCol *old; @@ -654,7 +654,7 @@ e_table_header_move (ETableHeader *eth, int source_index, int target_index) * This emmits the "structure_change" signal on the @eth object. */ void -e_table_header_remove (ETableHeader *eth, int idx) +e_table_header_remove (ETableHeader *eth, gint idx) { g_return_if_fail (eth != NULL); g_return_if_fail (E_IS_TABLE_HEADER (eth)); @@ -677,16 +677,16 @@ e_table_header_set_selection (ETableHeader *eth, gboolean allow_selection) } static void -eth_set_size (ETableHeader *eth, int idx, int size) +eth_set_size (ETableHeader *eth, gint idx, gint size) { double expansion; double old_expansion; - int min_width; - int left_width; - int total_extra; - int expandable_count; - int usable_width; - int i; + gint min_width; + gint left_width; + gint total_extra; + gint expandable_count; + gint usable_width; + gint i; g_return_if_fail (eth != NULL); g_return_if_fail (E_IS_TABLE_HEADER (eth)); g_return_if_fail (idx >= 0); @@ -813,10 +813,10 @@ eth_set_size (ETableHeader *eth, int idx, int size) * Returns: the number of pixels between @start_col and @end_col on the * @eth ETableHeader object */ -int -e_table_header_col_diff (ETableHeader *eth, int start_col, int end_col) +gint +e_table_header_col_diff (ETableHeader *eth, gint start_col, gint end_col) { - int total, col; + gint total, col; g_return_val_if_fail (eth != NULL, 0); g_return_val_if_fail (E_IS_TABLE_HEADER (eth), 0); @@ -838,13 +838,13 @@ e_table_header_col_diff (ETableHeader *eth, int start_col, int end_col) static void eth_calc_widths (ETableHeader *eth) { - int i; - int extra; + gint i; + gint extra; double expansion; - int last_position = 0; + gint last_position = 0; double next_position = 0; - int last_resizable = -1; - int *widths; + gint last_resizable = -1; + gint *widths; gboolean changed; widths = g_new (int, eth->col_count); @@ -887,13 +887,13 @@ eth_calc_widths (ETableHeader *eth) void e_table_header_update_horizontal (ETableHeader *eth) { - int i; - int cols; + gint i; + gint cols; cols = eth->col_count; for (i = 0; i < cols; i++) { - int width = 0; + gint width = 0; g_signal_emit_by_name (G_OBJECT (eth), "request_width", @@ -905,13 +905,13 @@ e_table_header_update_horizontal (ETableHeader *eth) g_signal_emit (G_OBJECT (eth), eth_signals [EXPANSION_CHANGE], 0); } -int +gint e_table_header_prioritized_column (ETableHeader *eth) { - int best_model_col = 0; - int best_priority; - int i; - int count; + gint best_model_col = 0; + gint best_priority; + gint i; + gint count; count = e_table_header_count (eth); if (count == 0) @@ -919,7 +919,7 @@ e_table_header_prioritized_column (ETableHeader *eth) best_priority = e_table_header_get_column (eth, 0)->priority; best_model_col = e_table_header_get_column (eth, 0)->col_idx; for (i = 1; i < count; i++) { - int priority = e_table_header_get_column (eth, i)->priority; + gint priority = e_table_header_get_column (eth, i)->priority; if (priority > best_priority) { best_priority = priority; best_model_col = e_table_header_get_column (eth, i)->col_idx; @@ -932,9 +932,9 @@ ETableCol * e_table_header_prioritized_column_selected (ETableHeader *eth, ETableColCheckFunc check_func, gpointer user_data) { ETableCol *best_col = NULL; - int best_priority = G_MININT; - int i; - int count; + gint best_priority = G_MININT; + gint i; + gint count; count = e_table_header_count (eth); if (count == 0) diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h index 00b145ef87..d724c2710f 100644 --- a/widgets/table/e-table-header.h +++ b/widgets/table/e-table-header.h @@ -49,13 +49,13 @@ typedef gboolean (*ETableColCheckFunc) (ETableCol *col, gpointer user_data); struct _ETableHeader { GObject base; - int col_count; - int width; - int nominal_width; - int width_extras; + gint col_count; + gint width; + gint nominal_width; + gint width_extras; ETableSortInfo *sort_info; - int sort_info_group_change_id; + gint sort_info_group_change_id; ETableCol **columns; @@ -67,9 +67,9 @@ typedef struct { GObjectClass parent_class; void (*structure_change) (ETableHeader *eth); - void (*dimension_change) (ETableHeader *eth, int width); + void (*dimension_change) (ETableHeader *eth, gint width); void (*expansion_change) (ETableHeader *eth); - int (*request_width) (ETableHeader *eth, int col); + gint (*request_width) (ETableHeader *eth, gint col); } ETableHeaderClass; GType e_table_header_get_type (void); @@ -77,39 +77,39 @@ ETableHeader *e_table_header_new (void); void e_table_header_add_column (ETableHeader *eth, ETableCol *tc, - int pos); + gint pos); ETableCol *e_table_header_get_column (ETableHeader *eth, - int column); + gint column); ETableCol *e_table_header_get_column_by_col_idx (ETableHeader *eth, - int col_idx); -int e_table_header_count (ETableHeader *eth); -int e_table_header_index (ETableHeader *eth, - int col); -int e_table_header_get_index_at (ETableHeader *eth, - int x_offset); + gint col_idx); +gint e_table_header_count (ETableHeader *eth); +gint e_table_header_index (ETableHeader *eth, + gint col); +gint e_table_header_get_index_at (ETableHeader *eth, + gint x_offset); ETableCol **e_table_header_get_columns (ETableHeader *eth); -int e_table_header_get_selected (ETableHeader *eth); +gint e_table_header_get_selected (ETableHeader *eth); -int e_table_header_total_width (ETableHeader *eth); -int e_table_header_min_width (ETableHeader *eth); +gint e_table_header_total_width (ETableHeader *eth); +gint e_table_header_min_width (ETableHeader *eth); void e_table_header_move (ETableHeader *eth, - int source_index, - int target_index); + gint source_index, + gint target_index); void e_table_header_remove (ETableHeader *eth, - int idx); + gint idx); void e_table_header_set_size (ETableHeader *eth, - int idx, - int size); + gint idx, + gint size); void e_table_header_set_selection (ETableHeader *eth, gboolean allow_selection); -int e_table_header_col_diff (ETableHeader *eth, - int start_col, - int end_col); +gint e_table_header_col_diff (ETableHeader *eth, + gint start_col, + gint end_col); void e_table_header_calc_widths (ETableHeader *eth); GList *e_table_header_get_selected_indexes (ETableHeader *eth); void e_table_header_update_horizontal (ETableHeader *eth); -int e_table_header_prioritized_column (ETableHeader *eth); +gint e_table_header_prioritized_column (ETableHeader *eth); ETableCol *e_table_header_prioritized_column_selected (ETableHeader *eth, ETableColCheckFunc check_func, gpointer user_data); diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index ce2484cafb..987b9610b3 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -108,23 +108,23 @@ enum { #define TRIPLE_CLICK_TIME 500 -static int eti_get_height (ETableItem *eti); -static int eti_row_height (ETableItem *eti, int row); -static void e_table_item_focus (ETableItem *eti, int col, int row, GdkModifierType state); -static void eti_cursor_change (ESelectionModel *selection, int row, int col, ETableItem *eti); -static void eti_cursor_activated (ESelectionModel *selection, int row, int col, ETableItem *eti); +static gint eti_get_height (ETableItem *eti); +static gint eti_row_height (ETableItem *eti, gint row); +static void e_table_item_focus (ETableItem *eti, gint col, gint row, GdkModifierType state); +static void eti_cursor_change (ESelectionModel *selection, gint row, gint col, ETableItem *eti); +static void eti_cursor_activated (ESelectionModel *selection, gint row, gint col, ETableItem *eti); static void eti_selection_change (ESelectionModel *selection, ETableItem *eti); -static void eti_selection_row_change (ESelectionModel *selection, int row, ETableItem *eti); -static void e_table_item_redraw_row (ETableItem *eti, int row); +static void eti_selection_row_change (ESelectionModel *selection, gint row, ETableItem *eti); +static void e_table_item_redraw_row (ETableItem *eti, gint row); #define ETI_SINGLE_ROW_HEIGHT(eti) ((eti)->uniform_row_height_cache != -1 ? (eti)->uniform_row_height_cache : eti_row_height((eti), -1)) #define ETI_MULTIPLE_ROW_HEIGHT(eti,row) ((eti)->height_cache && (eti)->height_cache[(row)] != -1 ? (eti)->height_cache[(row)] : eti_row_height((eti),(row))) #define ETI_ROW_HEIGHT(eti,row) ((eti)->uniform_row_height ? ETI_SINGLE_ROW_HEIGHT ((eti)) : ETI_MULTIPLE_ROW_HEIGHT((eti),(row))) inline static gint -model_to_view_row(ETableItem *eti, int row) +model_to_view_row(ETableItem *eti, gint row) { - int i; + gint i; if (row == -1) return -1; if (eti->uses_source_model) { @@ -144,7 +144,7 @@ model_to_view_row(ETableItem *eti, int row) } inline static gint -view_to_model_row(ETableItem *eti, int row) +view_to_model_row(ETableItem *eti, gint row) { if (eti->uses_source_model) { ETableSubset *etss = E_TABLE_SUBSET(eti->table_model); @@ -158,9 +158,9 @@ view_to_model_row(ETableItem *eti, int row) } inline static gint -model_to_view_col(ETableItem *eti, int col) +model_to_view_col(ETableItem *eti, gint col) { - int i; + gint i; if (col == -1) return -1; for (i = 0; i < eti->cols; i++) { @@ -172,7 +172,7 @@ model_to_view_col(ETableItem *eti, int col) } inline static gint -view_to_model_col(ETableItem *eti, int col) +view_to_model_col(ETableItem *eti, gint col) { ETableCol *ecol = e_table_header_get_column (eti->header, col); return ecol ? ecol->col_idx : -1; @@ -243,7 +243,7 @@ eti_editing (ETableItem *eti) } inline static GdkColor * -eti_get_cell_background_color (ETableItem *eti, int row, int col, gboolean selected, gboolean *allocatedp) +eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean selected, gboolean *allocatedp) { ECellView *ecell_view = eti->cell_views [col]; GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(eti)->canvas); @@ -291,7 +291,7 @@ eti_get_cell_background_color (ETableItem *eti, int row, int col, gboolean selec } inline static GdkColor * -eti_get_cell_foreground_color (ETableItem *eti, int row, int col, gboolean selected, gboolean *allocated) +eti_get_cell_foreground_color (ETableItem *eti, gint row, gint col, gboolean selected, gboolean *allocated) { GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(eti)->canvas); GdkColor *foreground; @@ -336,7 +336,7 @@ eti_free_save_state (ETableItem *eti) static void eti_realize_cell_views ( ETableItem *eti) { - int i; + gint i; if (eti->cell_views_realized) return; @@ -352,7 +352,7 @@ eti_realize_cell_views ( ETableItem *eti) static void eti_attach_cell_views (ETableItem *eti) { - int i; + gint i; g_return_if_fail (eti->header); g_return_if_fail (eti->table_model); @@ -390,7 +390,7 @@ eti_attach_cell_views (ETableItem *eti) static void eti_unrealize_cell_views (ETableItem *eti) { - int i; + gint i; if (eti->cell_views_realized == 0) return; @@ -405,7 +405,7 @@ eti_unrealize_cell_views (ETableItem *eti) static void eti_detach_cell_views (ETableItem *eti) { - int i; + gint i; eti_free_save_state (eti); @@ -449,7 +449,7 @@ eti_reflow (GnomeCanvasItem *item, gint flags) ETableItem *eti = E_TABLE_ITEM (item); if (eti->needs_compute_height) { - int new_height = eti_get_height (eti); + gint new_height = eti_get_height (eti); if (new_height != eti->height) { eti->height = new_height; @@ -460,7 +460,7 @@ eti_reflow (GnomeCanvasItem *item, gint flags) eti->needs_compute_height = 0; } if (eti->needs_compute_width) { - int new_width = e_table_header_total_width(eti->header); + gint new_width = e_table_header_total_width(eti->header); if (new_width != eti->width) { eti->width = new_width; e_canvas_item_request_parent_reflow (GNOME_CANVAS_ITEM (eti)); @@ -475,7 +475,7 @@ eti_reflow (GnomeCanvasItem *item, gint flags) * GnomeCanvasItem::update method */ static void -eti_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) +eti_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags) { ArtPoint o1, o2; ETableItem *eti = E_TABLE_ITEM (item); @@ -610,11 +610,11 @@ eti_remove_header_model (ETableItem *eti) * used as a separator between rows */ static int -eti_row_height_real (ETableItem *eti, int row) +eti_row_height_real (ETableItem *eti, gint row) { - const int cols = e_table_header_count (eti->header); - int col; - int h, max_h; + const gint cols = e_table_header_count (eti->header); + gint col; + gint h, max_h; g_return_val_if_fail (cols == 0 || eti->cell_views, 0); @@ -632,7 +632,7 @@ eti_row_height_real (ETableItem *eti, int row) static void confirm_height_cache (ETableItem *eti) { - int i; + gint i; if (eti->uniform_row_height || eti->height_cache) return; @@ -645,8 +645,8 @@ confirm_height_cache (ETableItem *eti) static gboolean height_cache_idle(ETableItem *eti) { - int changed = 0; - int i; + gint changed = 0; + gint i; confirm_height_cache(eti); for (i = eti->height_cache_idle_count; i < eti->rows; i++) { if (eti->height_cache[i] == -1) { @@ -699,7 +699,7 @@ calculate_height_cache (ETableItem *eti) * used as a separator between rows */ static int -eti_row_height (ETableItem *eti, int row) +eti_row_height (ETableItem *eti, gint row) { if (eti->uniform_row_height) { eti->uniform_row_height_cache = eti_row_height_real (eti, -1); @@ -737,21 +737,21 @@ eti_row_height (ETableItem *eti, int row) static int eti_get_height (ETableItem *eti) { - const int rows = eti->rows; - int height_extra = eti->horizontal_draw_grid ? 1 : 0; + const gint rows = eti->rows; + gint height_extra = eti->horizontal_draw_grid ? 1 : 0; if (rows == 0) return 0; if (eti->uniform_row_height) { - int row_height = eti_row_height(eti, -1); + gint row_height = eti_row_height(eti, -1); return ((row_height + height_extra) * rows + height_extra); } else { - int height; - int row; + gint height; + gint row; if (eti->length_threshold != -1){ if (rows > eti->length_threshold){ - int row_height = eti_row_height(eti, 0); + gint row_height = eti_row_height(eti, 0); if (eti->height_cache) { height = 0; for (row = 0; row < rows; row++) { @@ -781,7 +781,7 @@ eti_get_height (ETableItem *eti) } static void -eti_item_region_redraw (ETableItem *eti, int x0, int y0, int x1, int y1) +eti_item_region_redraw (ETableItem *eti, gint x0, gint y0, gint x1, gint y1) { GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti); ArtDRect rect; @@ -801,10 +801,10 @@ eti_item_region_redraw (ETableItem *eti, int x0, int y0, int x1, int y1) /* * Computes the distance between @start_row and @end_row in pixels */ -int -e_table_item_row_diff (ETableItem *eti, int start_row, int end_row) +gint +e_table_item_row_diff (ETableItem *eti, gint start_row, gint end_row) { - int height_extra = eti->horizontal_draw_grid ? 1 : 0; + gint height_extra = eti->horizontal_draw_grid ? 1 : 0; if (start_row < 0) start_row = 0; @@ -814,7 +814,7 @@ e_table_item_row_diff (ETableItem *eti, int start_row, int end_row) if (eti->uniform_row_height) { return ((end_row - start_row) * (eti_row_height(eti, -1) + height_extra)); } else { - int row, total; + gint row, total; total = 0; for (row = start_row; row < end_row; row++) total += eti_row_height (eti, row) + height_extra; @@ -825,12 +825,12 @@ e_table_item_row_diff (ETableItem *eti, int start_row, int end_row) static void eti_get_region (ETableItem *eti, - int start_col, int start_row, - int end_col, int end_row, - int *x1p, int *y1p, - int *x2p, int *y2p) + gint start_col, gint start_row, + gint end_col, gint end_row, + gint *x1p, gint *y1p, + gint *x2p, gint *y2p) { - int x1, y1, x2, y2; + gint x1, y1, x2, y2; x1 = e_table_header_col_diff (eti->header, 0, start_col); y1 = e_table_item_row_diff (eti, 0, start_row); @@ -858,10 +858,10 @@ eti_get_region (ETableItem *eti, */ static void eti_request_region_redraw (ETableItem *eti, - int start_col, int start_row, - int end_col, int end_row, int border) + gint start_col, gint start_row, + gint end_col, gint end_row, gint border) { - int x1, y1, x2, y2; + gint x1, y1, x2, y2; if (eti->rows > 0) { @@ -885,10 +885,10 @@ eti_request_region_redraw (ETableItem *eti, */ static void eti_request_region_show (ETableItem *eti, - int start_col, int start_row, - int end_col, int end_row, int delay) + gint start_col, gint start_row, + gint end_col, gint end_row, gint delay) { - int x1, y1, x2, y2; + gint x1, y1, x2, y2; eti_get_region (eti, start_col, start_row, @@ -902,9 +902,9 @@ eti_request_region_show (ETableItem *eti, } static void -eti_show_cursor (ETableItem *eti, int delay) +eti_show_cursor (ETableItem *eti, gint delay) { - int cursor_row; + gint cursor_row; if (!((GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED) && eti->cell_views_realized)) return; @@ -953,8 +953,8 @@ eti_check_cursor_on_screen (ETableItem *eti) static void eti_check_cursor_bounds (ETableItem *eti) { - int x1, y1, x2, y2; - int cursor_row; + gint x1, y1, x2, y2; + gint cursor_row; if (!((GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED) && eti->cell_views_realized)) return; @@ -1002,7 +1002,7 @@ eti_check_cursor_bounds (ETableItem *eti) } static void -eti_maybe_show_cursor(ETableItem *eti, int delay) +eti_maybe_show_cursor(ETableItem *eti, gint delay) { d(g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE")); if (eti->cursor_on_screen) @@ -1122,7 +1122,7 @@ eti_table_model_changed (ETableModel *table_model, ETableItem *eti) } static void -eti_table_model_row_changed (ETableModel *table_model, int row, ETableItem *eti) +eti_table_model_row_changed (ETableModel *table_model, gint row, ETableItem *eti) { if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { eti_unfreeze (eti); @@ -1140,7 +1140,7 @@ eti_table_model_row_changed (ETableModel *table_model, int row, ETableItem *eti) } static void -eti_table_model_cell_changed (ETableModel *table_model, int col, int row, ETableItem *eti) +eti_table_model_cell_changed (ETableModel *table_model, gint col, gint row, ETableItem *eti) { if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { eti_unfreeze (eti); @@ -1158,7 +1158,7 @@ eti_table_model_cell_changed (ETableModel *table_model, int col, int row, ETable } static void -eti_table_model_rows_inserted (ETableModel *table_model, int row, int count, ETableItem *eti) +eti_table_model_rows_inserted (ETableModel *table_model, gint row, gint count, ETableItem *eti) { if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { eti_unfreeze (eti); @@ -1167,7 +1167,7 @@ eti_table_model_rows_inserted (ETableModel *table_model, int row, int count, ETa eti->rows = e_table_model_row_count (eti->table_model); if (eti->height_cache) { - int i; + gint i; eti->height_cache = g_renew(int, eti->height_cache, eti->rows); memmove(eti->height_cache + row + count, eti->height_cache + row, (eti->rows - count - row) * sizeof(int)); for (i = row; i < row + count; i++) @@ -1185,7 +1185,7 @@ eti_table_model_rows_inserted (ETableModel *table_model, int row, int count, ETa } static void -eti_table_model_rows_deleted (ETableModel *table_model, int row, int count, ETableItem *eti) +eti_table_model_rows_deleted (ETableModel *table_model, gint row, gint count, ETableItem *eti) { if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { eti_unfreeze (eti); @@ -1221,11 +1221,11 @@ eti_table_model_rows_deleted (ETableModel *table_model, int row, int count, ETab */ void e_table_item_redraw_range (ETableItem *eti, - int start_col, int start_row, - int end_col, int end_row) + gint start_col, gint start_row, + gint end_col, gint end_row) { - int border; - int cursor_col, cursor_row; + gint border; + gint cursor_col, cursor_row; g_return_if_fail (eti != NULL); g_return_if_fail (E_IS_TABLE_ITEM (eti)); @@ -1248,7 +1248,7 @@ e_table_item_redraw_range (ETableItem *eti, static void e_table_item_redraw_row (ETableItem *eti, - int row) + gint row) { if (row != -1) e_table_item_redraw_range (eti, 0, row, eti->cols - 1, row); @@ -1337,7 +1337,7 @@ eti_add_selection_model (ETableItem *eti, ESelectionModel *selection) } static void -eti_header_dim_changed (ETableHeader *eth, int col, ETableItem *eti) +eti_header_dim_changed (ETableHeader *eth, gint col, ETableItem *eti) { eti->needs_compute_width = 1; e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti)); @@ -1373,9 +1373,9 @@ eti_header_structure_changed (ETableHeader *eth, ETableItem *eti) } static int -eti_request_column_width (ETableHeader *eth, int col, ETableItem *eti) +eti_request_column_width (ETableHeader *eth, gint col, ETableItem *eti) { - int width = 0; + gint width = 0; if (eti->cell_views && eti->cell_views_realized) { width = e_cell_max_width (eti->cell_views[col], view_to_model_col(eti, col), col); @@ -1462,7 +1462,7 @@ static void eti_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { ETableItem *eti; - int cursor_col; + gint cursor_col; eti = E_TABLE_ITEM (object); @@ -1546,7 +1546,7 @@ static void eti_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { ETableItem *eti; - int row; + gint row; eti = E_TABLE_ITEM (object); @@ -1653,7 +1653,7 @@ eti_init (ETableItem *eti) #define gray50_width 2 #define gray50_height 2 -static const char gray50_bits[] = { +static const gchar gray50_bits[] = { 0x02, 0x01, }; static void @@ -1729,7 +1729,7 @@ eti_realize (GnomeCanvasItem *item) free_height_cache(eti); if (item->canvas->focused_item == NULL && eti->selection) { - int row; + gint row; row = e_selection_model_cursor_row (E_SELECTION_MODEL (eti->selection)); row = model_to_view_row(eti, row); @@ -1815,21 +1815,21 @@ eti_unrealize (GnomeCanvasItem *item) static void -eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height) +eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint width, gint height) { ETableItem *eti = E_TABLE_ITEM (item); - const int rows = eti->rows; - const int cols = eti->cols; - int row, col; - int first_col, last_col, x_offset; - int first_row, last_row, y_offset, yd; - int x1, x2; - int f_x1, f_x2, f_y1, f_y2; + const gint rows = eti->rows; + const gint cols = eti->cols; + gint row, col; + gint first_col, last_col, x_offset; + gint first_row, last_row, y_offset, yd; + gint x1, x2; + gint f_x1, f_x2, f_y1, f_y2; gboolean f_found; double i2c [6]; ArtPoint eti_base, eti_base_item, lower_right; GtkWidget *canvas = GTK_WIDGET(item->canvas); - int height_extra = eti->horizontal_draw_grid ? 1 : 0; + gint height_extra = eti->horizontal_draw_grid ? 1 : 0; cairo_t *cr; cr = gdk_cairo_create (drawable); @@ -1888,7 +1888,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, if (last_row > eti->rows) last_row = eti->rows; } else { - int y1, y2; + gint y1, y2; y_offset = 0; first_row = -1; @@ -1934,7 +1934,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, yd += height_extra; for (row = first_row; row < last_row; row++){ - int xd; + gint xd; gboolean selected; gint cursor_col, cursor_row; @@ -1957,7 +1957,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, ECellFlags flags; gboolean free_background; GdkColor *background; - int x1, x2, y1, y2; + gint x1, x2, y1, y2; cairo_pattern_t *pat; switch (eti->cursor_mode) { @@ -2082,7 +2082,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, } if (eti->vertical_draw_grid){ - int xd = x_offset; + gint xd = x_offset; for (col = first_col; col <= last_col; col++){ ETableCol *ecol = e_table_header_get_column (eti->header, col); @@ -2113,7 +2113,7 @@ exit: } static double -eti_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, +eti_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; @@ -2122,14 +2122,14 @@ eti_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, } static gboolean -find_cell (ETableItem *eti, double x, double y, int *view_col_res, int *view_row_res, double *x1_res, double *y1_res) +find_cell (ETableItem *eti, double x, double y, gint *view_col_res, gint *view_row_res, double *x1_res, double *y1_res) { - const int cols = eti->cols; - const int rows = eti->rows; + const gint cols = eti->cols; + const gint rows = eti->rows; gdouble x1, y1, x2, y2; - int col, row; + gint col, row; - int height_extra = eti->horizontal_draw_grid ? 1 : 0; + gint height_extra = eti->horizontal_draw_grid ? 1 : 0; /* FIXME: this routine is inneficient, fix later */ @@ -2200,7 +2200,7 @@ eti_cursor_move (ETableItem *eti, gint row, gint column) static void eti_cursor_move_left (ETableItem *eti) { - int cursor_col, cursor_row; + gint cursor_col, cursor_row; g_object_get(eti->selection, "cursor_col", &cursor_col, "cursor_row", &cursor_row, @@ -2212,7 +2212,7 @@ eti_cursor_move_left (ETableItem *eti) static void eti_cursor_move_right (ETableItem *eti) { - int cursor_col, cursor_row; + gint cursor_col, cursor_row; g_object_get(eti->selection, "cursor_col", &cursor_col, "cursor_row", &cursor_row, @@ -2229,7 +2229,7 @@ _do_tooltip (ETableItem *eti) gboolean free_color; ETableCol *ecol; gboolean selected; - int cursor_row, cursor_col; + gint cursor_row, cursor_col; e_canvas_hide_tooltip (E_CANVAS(GNOME_CANVAS_ITEM(eti)->canvas)); @@ -2287,7 +2287,7 @@ _do_tooltip (ETableItem *eti) #endif static gint -eti_e_cell_event (ETableItem *item, ECellView *ecell_view, GdkEvent *event, int time, int model_col, int view_col, int row, ECellFlags flags) +eti_e_cell_event (ETableItem *item, ECellView *ecell_view, GdkEvent *event, gint time, gint model_col, gint view_col, gint row, ECellFlags flags) { ECellActions actions = 0; gint ret_val; @@ -2330,7 +2330,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) double x1, y1; double realx, realy; GdkEventButton button; - int col, row; + gint col, row; gint cursor_row, cursor_col; gint new_cursor_row, new_cursor_col; ECellFlags flags = 0; @@ -2457,7 +2457,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) case GDK_BUTTON_RELEASE: { double x1, y1; - int col, row; + gint col, row; gint cursor_row, cursor_col; d(g_print("%s: GDK_BUTTON_RELEASE received, button %d\n", __FUNCTION__, e->button.button)); @@ -2540,7 +2540,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) } case GDK_2BUTTON_PRESS: { - int model_col, model_row; + gint model_col, model_row; #if 0 double x1, y1; #endif @@ -2596,7 +2596,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) break; } case GDK_MOTION_NOTIFY: { - int col, row, flags; + gint col, row, flags; double x1, y1; gint cursor_col, cursor_row; @@ -2956,8 +2956,8 @@ eti_style_set (ETableItem *eti, GtkStyle *previous_style) return; if (eti->cell_views_realized) { - int i; - int n_cells = eti->n_cells; + gint i; + gint n_cells = eti->n_cells; for (i = 0; i < n_cells; i++) { e_cell_style_set (eti->cell_views[i], previous_style); @@ -3209,13 +3209,13 @@ eti_class_init (ETableItemClass *klass) * This routine sets the cursor of the %ETableItem canvas item. */ void -e_table_item_set_cursor (ETableItem *eti, int col, int row) +e_table_item_set_cursor (ETableItem *eti, gint col, gint row) { e_table_item_focus(eti, col, view_to_model_row(eti, row), 0); } static void -e_table_item_focus (ETableItem *eti, int col, int row, GdkModifierType state) +e_table_item_focus (ETableItem *eti, gint col, gint row, GdkModifierType state) { g_return_if_fail (eti != NULL); g_return_if_fail (E_IS_TABLE_ITEM (eti)); @@ -3246,7 +3246,7 @@ e_table_item_focus (ETableItem *eti, int col, int row, GdkModifierType state) gint e_table_item_get_focused_column (ETableItem *eti) { - int cursor_col; + gint cursor_col; g_return_val_if_fail (eti != NULL, -1); g_return_val_if_fail (E_IS_TABLE_ITEM (eti), -1); @@ -3259,9 +3259,9 @@ e_table_item_get_focused_column (ETableItem *eti) } static void -eti_cursor_change (ESelectionModel *selection, int row, int col, ETableItem *eti) +eti_cursor_change (ESelectionModel *selection, gint row, gint col, ETableItem *eti) { - int view_row; + gint view_row; if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) return; @@ -3297,10 +3297,10 @@ eti_cursor_change (ESelectionModel *selection, int row, int col, ETableItem *eti } static void -eti_cursor_activated (ESelectionModel *selection, int row, int col, ETableItem *eti) +eti_cursor_activated (ESelectionModel *selection, gint row, gint col, ETableItem *eti) { - int view_row; - int view_col; + gint view_row; + gint view_col; if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) return; @@ -3338,7 +3338,7 @@ eti_selection_change (ESelectionModel *selection, ETableItem *eti) } static void -eti_selection_row_change (ESelectionModel *selection, int row, ETableItem *eti) +eti_selection_row_change (ESelectionModel *selection, gint row, ETableItem *eti) { if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) return; @@ -3359,7 +3359,7 @@ eti_selection_row_change (ESelectionModel *selection, int row, ETableItem *eti) * column and row. */ void -e_table_item_enter_edit (ETableItem *eti, int col, int row) +e_table_item_enter_edit (ETableItem *eti, gint col, gint row) { g_return_if_fail (eti != NULL); g_return_if_fail (E_IS_TABLE_ITEM (eti)); @@ -3384,8 +3384,8 @@ e_table_item_enter_edit (ETableItem *eti, int col, int row) void e_table_item_leave_edit (ETableItem *eti) { - int col, row; - void *edit_ctx; + gint col, row; + gpointer edit_ctx; g_return_if_fail (eti != NULL); g_return_if_fail (E_IS_TABLE_ITEM (eti)); @@ -3424,14 +3424,14 @@ e_table_item_leave_edit (ETableItem *eti) */ void e_table_item_compute_location (ETableItem *eti, - int *x, - int *y, - int *row, - int *col) + gint *x, + gint *y, + gint *row, + gint *col) { /* Save the grabbed row but make sure that we don't get flawed results because the cursor is grabbed. */ - int grabbed_row = eti->grabbed_row; + gint grabbed_row = eti->grabbed_row; eti->grabbed_row = -1; if (!find_cell (eti, *x, *y, col, row, NULL, NULL)) { @@ -3448,15 +3448,15 @@ e_table_item_compute_location (ETableItem *eti, **/ void e_table_item_compute_mouse_over (ETableItem *eti, - int x, - int y, - int *row, - int *col) + gint x, + gint y, + gint *row, + gint *col) { double realx, realy; /* Save the grabbed row but make sure that we don't get flawed results because the cursor is grabbed. */ - int grabbed_row = eti->grabbed_row; + gint grabbed_row = eti->grabbed_row; eti->grabbed_row = -1; realx = x; @@ -3474,12 +3474,12 @@ e_table_item_compute_mouse_over (ETableItem *eti, void e_table_item_get_cell_geometry (ETableItem *eti, - int *row, - int *col, - int *x, - int *y, - int *width, - int *height) + gint *row, + gint *col, + gint *x, + gint *y, + gint *width, + gint *height) { if (eti->rows > *row) { if (x) @@ -3499,16 +3499,16 @@ e_table_item_get_cell_geometry (ETableItem *eti, typedef struct { ETableItem *item; - int rows_printed; + gint rows_printed; } ETableItemPrintContext; static gdouble * e_table_item_calculate_print_widths (ETableHeader *eth, gdouble width) { - int i; + gint i; double extra; double expansion; - int last_resizable = -1; + gint last_resizable = -1; gdouble scale = 1.0L; gdouble *widths = g_new(gdouble, e_table_header_count(eth)); /* - 1 to account for the last pixel border. */ @@ -3531,8 +3531,8 @@ e_table_item_calculate_print_widths (ETableHeader *eth, gdouble width) static gdouble eti_printed_row_height (ETableItem *eti, gdouble *widths, GtkPrintContext *context, gint row) { - int col; - int cols = eti->cols; + gint col; + gint cols = eti->cols; gdouble height = 0; for (col = 0; col < cols; col++) { ECellView *ecell_view = eti->cell_views [col]; @@ -3568,11 +3568,11 @@ e_table_item_print_page (EPrintable *ep, ETableItemPrintContext *itemcontext) { ETableItem *eti = itemcontext->item; - const int rows = eti->rows; - const int cols = eti->cols; + const gint rows = eti->rows; + const gint cols = eti->cols; gdouble max_height; - int rows_printed = itemcontext->rows_printed; - int row, col, next_page = 0; + gint rows_printed = itemcontext->rows_printed; + gint row, col, next_page = 0; double yd = height; cairo_t *cr; gdouble *widths; @@ -3655,7 +3655,7 @@ e_table_item_data_left (EPrintable *ep, ETableItemPrintContext *itemcontext) { ETableItem *item = itemcontext->item; - int rows_printed = itemcontext->rows_printed; + gint rows_printed = itemcontext->rows_printed; g_signal_stop_emission_by_name(ep, "data_left"); return rows_printed < item->rows; @@ -3677,10 +3677,10 @@ e_table_item_height (EPrintable *ep, ETableItemPrintContext *itemcontext) { ETableItem *item = itemcontext->item; - const int rows = item->rows; - int rows_printed = itemcontext->rows_printed; + const gint rows = item->rows; + gint rows_printed = itemcontext->rows_printed; gdouble *widths; - int row; + gint row; gdouble yd = 0; widths = e_table_item_calculate_print_widths (itemcontext->item->header, width); @@ -3727,10 +3727,10 @@ e_table_item_will_fit (EPrintable *ep, ETableItemPrintContext *itemcontext) { ETableItem *item = itemcontext->item; - const int rows = item->rows; - int rows_printed = itemcontext->rows_printed; + const gint rows = item->rows; + gint rows_printed = itemcontext->rows_printed; gdouble *widths; - int row; + gint row; gdouble yd = 0; gboolean ret_val = TRUE; diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index befadb77ca..0536367c99 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -49,41 +49,41 @@ typedef struct { ETableModel *source_model; ESelectionModel *selection; - int x1, y1; - int minimum_width, width, height; + gint x1, y1; + gint minimum_width, width, height; - int cols, rows; + gint cols, rows; - int click_count; + gint click_count; /* * Ids for the signals we connect to */ - int header_dim_change_id; - int header_structure_change_id; - int header_request_width_id; - int table_model_pre_change_id; - int table_model_no_change_id; - int table_model_change_id; - int table_model_row_change_id; - int table_model_cell_change_id; - int table_model_rows_inserted_id; - int table_model_rows_deleted_id; - - int selection_change_id; - int selection_row_change_id; - int cursor_change_id; - int cursor_activated_id; + gint header_dim_change_id; + gint header_structure_change_id; + gint header_request_width_id; + gint table_model_pre_change_id; + gint table_model_no_change_id; + gint table_model_change_id; + gint table_model_row_change_id; + gint table_model_cell_change_id; + gint table_model_rows_inserted_id; + gint table_model_rows_deleted_id; + + gint selection_change_id; + gint selection_row_change_id; + gint cursor_change_id; + gint cursor_activated_id; guint cursor_idle_id; /* View row, -1 means unknown */ - int old_cursor_row; + gint old_cursor_row; - int hadjustment_change_id; - int hadjustment_value_change_id; - int vadjustment_change_id; - int vadjustment_value_change_id; + gint hadjustment_change_id; + gint hadjustment_value_change_id; + gint vadjustment_change_id; + gint vadjustment_value_change_id; GdkGC *fill_gc; GdkGC *grid_gc; @@ -117,52 +117,52 @@ typedef struct { guint queue_show_cursor : 1; guint grab_cancelled : 1; - int frozen_count; + gint frozen_count; - int cursor_x1; - int cursor_y1; - int cursor_x2; - int cursor_y2; + gint cursor_x1; + gint cursor_y1; + gint cursor_x2; + gint cursor_y2; - int drag_col; - int drag_row; - int drag_x; - int drag_y; + gint drag_col; + gint drag_row; + gint drag_x; + gint drag_y; guint drag_state; /* * Realized views, per column */ ECellView **cell_views; - int n_cells; + gint n_cells; - int *height_cache; - int uniform_row_height_cache; - int height_cache_idle_id; - int height_cache_idle_count; + gint *height_cache; + gint uniform_row_height_cache; + gint height_cache_idle_id; + gint height_cache_idle_count; /* * Lengh Threshold: above this, we stop computing correctly * the size */ - int length_threshold; + gint length_threshold; gint row_guess; ECursorMode cursor_mode; - int motion_col, motion_row; + gint motion_col, motion_row; /* * During editing */ - int editing_col, editing_row; + gint editing_col, editing_row; void *edit_ctx; - int save_col, save_row; + gint save_col, save_row; void *save_state; - int grabbed_col, grabbed_row; - int grabbed_count; + gint grabbed_col, grabbed_row; + gint grabbed_count; /* * Tooltip @@ -174,13 +174,13 @@ typedef struct { typedef struct { GnomeCanvasItemClass parent_class; - void (*cursor_change) (ETableItem *eti, int row); - void (*cursor_activated) (ETableItem *eti, int row); - void (*double_click) (ETableItem *eti, int row, int col, GdkEvent *event); - gint (*right_click) (ETableItem *eti, int row, int col, GdkEvent *event); - gint (*click) (ETableItem *eti, int row, int col, GdkEvent *event); - gint (*key_press) (ETableItem *eti, int row, int col, GdkEvent *event); - gint (*start_drag) (ETableItem *eti, int row, int col, GdkEvent *event); + void (*cursor_change) (ETableItem *eti, gint row); + void (*cursor_activated) (ETableItem *eti, gint row); + void (*double_click) (ETableItem *eti, gint row, gint col, GdkEvent *event); + gint (*right_click) (ETableItem *eti, gint row, gint col, GdkEvent *event); + gint (*click) (ETableItem *eti, gint row, gint col, GdkEvent *event); + gint (*key_press) (ETableItem *eti, gint row, gint col, GdkEvent *event); + gint (*start_drag) (ETableItem *eti, gint row, gint col, GdkEvent *event); void (*style_set) (ETableItem *eti, GtkStyle *previous_style); void (*selection_model_removed) (ETableItem *eti, ESelectionModel *selection); void (*selection_model_added) (ETableItem *eti, ESelectionModel *selection); @@ -192,40 +192,40 @@ GType e_table_item_get_type (void); * Focus */ void e_table_item_set_cursor (ETableItem *eti, - int col, - int row); + gint col, + gint row); gint e_table_item_get_focused_column (ETableItem *eti); void e_table_item_leave_edit (ETableItem *eti); void e_table_item_enter_edit (ETableItem *eti, - int col, - int row); + gint col, + gint row); void e_table_item_redraw_range (ETableItem *eti, - int start_col, - int start_row, - int end_col, - int end_row); + gint start_col, + gint start_row, + gint end_col, + gint end_row); EPrintable *e_table_item_get_printable (ETableItem *eti); void e_table_item_compute_location (ETableItem *eti, - int *x, - int *y, - int *row, - int *col); + gint *x, + gint *y, + gint *row, + gint *col); void e_table_item_compute_mouse_over (ETableItem *eti, - int x, - int y, - int *row, - int *col); + gint x, + gint y, + gint *row, + gint *col); void e_table_item_get_cell_geometry (ETableItem *eti, - int *row, - int *col, - int *x, - int *y, - int *width, - int *height); + gint *row, + gint *col, + gint *x, + gint *y, + gint *width, + gint *height); int e_table_item_row_diff (ETableItem *eti, int start_row, diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c index b1833aa2e1..c06303ca4b 100644 --- a/widgets/table/e-table-memory-callbacks.c +++ b/widgets/table/e-table-memory-callbacks.c @@ -40,8 +40,8 @@ etmc_column_count (ETableModel *etm) return 0; } -static void * -etmc_value_at (ETableModel *etm, int col, int row) +static gpointer +etmc_value_at (ETableModel *etm, gint col, gint row) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); @@ -52,7 +52,7 @@ etmc_value_at (ETableModel *etm, int col, int row) } static void -etmc_set_value_at (ETableModel *etm, int col, int row, const void *val) +etmc_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); @@ -61,7 +61,7 @@ etmc_set_value_at (ETableModel *etm, int col, int row, const void *val) } static gboolean -etmc_is_cell_editable (ETableModel *etm, int col, int row) +etmc_is_cell_editable (ETableModel *etm, gint col, gint row) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); @@ -72,19 +72,19 @@ etmc_is_cell_editable (ETableModel *etm, int col, int row) } /* The default for etmc_duplicate_value is to return the raw value. */ -static void * -etmc_duplicate_value (ETableModel *etm, int col, const void *value) +static gpointer +etmc_duplicate_value (ETableModel *etm, gint col, gconstpointer value) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); if (etmc->duplicate_value) return etmc->duplicate_value (etm, col, value, etmc->data); else - return (void *)value; + return (gpointer)value; } static void -etmc_free_value (ETableModel *etm, int col, void *value) +etmc_free_value (ETableModel *etm, gint col, gpointer value) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); @@ -92,8 +92,8 @@ etmc_free_value (ETableModel *etm, int col, void *value) etmc->free_value (etm, col, value, etmc->data); } -static void * -etmc_initialize_value (ETableModel *etm, int col) +static gpointer +etmc_initialize_value (ETableModel *etm, gint col) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); @@ -104,7 +104,7 @@ etmc_initialize_value (ETableModel *etm, int col) } static gboolean -etmc_value_is_empty (ETableModel *etm, int col, const void *value) +etmc_value_is_empty (ETableModel *etm, gint col, gconstpointer value) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); @@ -114,8 +114,8 @@ etmc_value_is_empty (ETableModel *etm, int col, const void *value) return FALSE; } -static char * -etmc_value_to_string (ETableModel *etm, int col, const void *value) +static gchar * +etmc_value_to_string (ETableModel *etm, gint col, gconstpointer value) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); @@ -126,7 +126,7 @@ etmc_value_to_string (ETableModel *etm, int col, const void *value) } static void -etmc_append_row (ETableModel *etm, ETableModel *source, int row) +etmc_append_row (ETableModel *etm, ETableModel *source, gint row) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); @@ -194,7 +194,7 @@ e_table_memory_callbacks_new (ETableMemoryCalbacksColumnCountFn col_count, ETableMemoryCalbacksInitializeValueFn initialize_value, ETableMemoryCalbacksValueIsEmptyFn value_is_empty, ETableMemoryCalbacksValueToStringFn value_to_string, - void *data) + gpointer data) { ETableMemoryCalbacks *et; diff --git a/widgets/table/e-table-memory-callbacks.h b/widgets/table/e-table-memory-callbacks.h index bfeacb284c..97e2e53421 100644 --- a/widgets/table/e-table-memory-callbacks.h +++ b/widgets/table/e-table-memory-callbacks.h @@ -34,18 +34,18 @@ G_BEGIN_DECLS #define E_IS_TABLE_MEMORY_CALLBACKS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_MEMORY_CALLBACKS_TYPE)) #define E_TABLE_MEMORY_CALLBACKS_GET_CLASS(k) (G_TYPE_INSTANCE_GET_CLASS((k), E_TABLE_MEMORY_CALLBACKS_TYPE, ETableMemoryCalbacksClass)) -typedef int (*ETableMemoryCalbacksColumnCountFn) (ETableModel *etm, void *data); -typedef void (*ETableMemoryCalbacksAppendRowFn) (ETableModel *etm, ETableModel *model, int row, void *data); +typedef gint (*ETableMemoryCalbacksColumnCountFn) (ETableModel *etm, gpointer data); +typedef void (*ETableMemoryCalbacksAppendRowFn) (ETableModel *etm, ETableModel *model, gint row, gpointer data); -typedef void *(*ETableMemoryCalbacksValueAtFn) (ETableModel *etm, int col, int row, void *data); -typedef void (*ETableMemoryCalbacksSetValueAtFn) (ETableModel *etm, int col, int row, const void *val, void *data); -typedef gboolean (*ETableMemoryCalbacksIsCellEditableFn) (ETableModel *etm, int col, int row, void *data); +typedef void *(*ETableMemoryCalbacksValueAtFn) (ETableModel *etm, gint col, gint row, gpointer data); +typedef void (*ETableMemoryCalbacksSetValueAtFn) (ETableModel *etm, gint col, gint row, gconstpointer val, gpointer data); +typedef gboolean (*ETableMemoryCalbacksIsCellEditableFn) (ETableModel *etm, gint col, gint row, gpointer data); -typedef void *(*ETableMemoryCalbacksDuplicateValueFn) (ETableModel *etm, int col, const void *val, void *data); -typedef void (*ETableMemoryCalbacksFreeValueFn) (ETableModel *etm, int col, void *val, void *data); -typedef void *(*ETableMemoryCalbacksInitializeValueFn) (ETableModel *etm, int col, void *data); -typedef gboolean (*ETableMemoryCalbacksValueIsEmptyFn) (ETableModel *etm, int col, const void *val, void *data); -typedef char *(*ETableMemoryCalbacksValueToStringFn) (ETableModel *etm, int col, const void *val, void *data); +typedef void *(*ETableMemoryCalbacksDuplicateValueFn) (ETableModel *etm, gint col, gconstpointer val, gpointer data); +typedef void (*ETableMemoryCalbacksFreeValueFn) (ETableModel *etm, gint col, gpointer val, gpointer data); +typedef void *(*ETableMemoryCalbacksInitializeValueFn) (ETableModel *etm, gint col, gpointer data); +typedef gboolean (*ETableMemoryCalbacksValueIsEmptyFn) (ETableModel *etm, gint col, gconstpointer val, gpointer data); +typedef gchar *(*ETableMemoryCalbacksValueToStringFn) (ETableModel *etm, gint col, gconstpointer val, gpointer data); typedef struct { ETableMemory parent; @@ -62,7 +62,7 @@ typedef struct { ETableMemoryCalbacksInitializeValueFn initialize_value; ETableMemoryCalbacksValueIsEmptyFn value_is_empty; ETableMemoryCalbacksValueToStringFn value_to_string; - void *data; + gpointer data; } ETableMemoryCalbacks; typedef struct { @@ -82,7 +82,7 @@ ETableModel *e_table_memory_callbacks_new (ETableMemoryCalbacksColumnCountFn col ETableMemoryCalbacksInitializeValueFn initialize_value, ETableMemoryCalbacksValueIsEmptyFn value_is_empty, ETableMemoryCalbacksValueToStringFn value_to_string, - void *data); + gpointer data); G_END_DECLS diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c index 284823bc3d..622de851c0 100644 --- a/widgets/table/e-table-memory-store.c +++ b/widgets/table/e-table-memory-store.c @@ -31,27 +31,27 @@ #define STORE_LOCATOR(etms, col, row) (*((etms)->priv->store + (row) * (etms)->priv->col_count + (col))) struct _ETableMemoryStorePrivate { - int col_count; + gint col_count; ETableMemoryStoreColumnInfo *columns; - void **store; + gpointer *store; }; G_DEFINE_TYPE (ETableMemoryStore, e_table_memory_store, E_TABLE_MEMORY_TYPE) -static void * -duplicate_value (ETableMemoryStore *etms, int col, const void *val) +static gpointer +duplicate_value (ETableMemoryStore *etms, gint col, gconstpointer val) { switch (etms->priv->columns[col].type) { case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING: return g_strdup (val); case E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF: if (val) - g_object_ref ((void *) val); - return (void *) val; + g_object_ref ((gpointer) val); + return (gpointer) val; case E_TABLE_MEMORY_STORE_COLUMN_TYPE_OBJECT: if (val) - g_object_ref ((void *) val); - return (void *) val; + g_object_ref ((gpointer) val); + return (gpointer) val; case E_TABLE_MEMORY_STORE_COLUMN_TYPE_CUSTOM: if (etms->priv->columns[col].custom.duplicate_value) return etms->priv->columns[col].custom.duplicate_value (E_TABLE_MODEL (etms), col, val, NULL); @@ -59,11 +59,11 @@ duplicate_value (ETableMemoryStore *etms, int col, const void *val) default: break; } - return (void *) val; + return (gpointer) val; } static void -free_value (ETableMemoryStore *etms, int col, void *value) +free_value (ETableMemoryStore *etms, gint col, gpointer value) { switch (etms->priv->columns[col].type) { case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING: @@ -95,8 +95,8 @@ etms_column_count (ETableModel *etm) return etms->priv->col_count; } -static void * -etms_value_at (ETableModel *etm, int col, int row) +static gpointer +etms_value_at (ETableModel *etm, gint col, gint row) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); @@ -104,7 +104,7 @@ etms_value_at (ETableModel *etm, int col, int row) } static void -etms_set_value_at (ETableModel *etm, int col, int row, const void *val) +etms_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); @@ -116,7 +116,7 @@ etms_set_value_at (ETableModel *etm, int col, int row, const void *val) } static gboolean -etms_is_cell_editable (ETableModel *etm, int col, int row) +etms_is_cell_editable (ETableModel *etm, gint col, gint row) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); @@ -124,8 +124,8 @@ etms_is_cell_editable (ETableModel *etm, int col, int row) } /* The default for etms_duplicate_value is to return the raw value. */ -static void * -etms_duplicate_value (ETableModel *etm, int col, const void *value) +static gpointer +etms_duplicate_value (ETableModel *etm, gint col, gconstpointer value) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); @@ -133,15 +133,15 @@ etms_duplicate_value (ETableModel *etm, int col, const void *value) } static void -etms_free_value (ETableModel *etm, int col, void *value) +etms_free_value (ETableModel *etm, gint col, gpointer value) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); free_value (etms, col, value); } -static void * -etms_initialize_value (ETableModel *etm, int col) +static gpointer +etms_initialize_value (ETableModel *etm, gint col) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); @@ -162,13 +162,13 @@ etms_initialize_value (ETableModel *etm, int col) } static gboolean -etms_value_is_empty (ETableModel *etm, int col, const void *value) +etms_value_is_empty (ETableModel *etm, gint col, gconstpointer value) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); switch (etms->priv->columns[col].type) { case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING: - return !(value && *(char *) value); + return !(value && *(gchar *) value); case E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF: return value == NULL; case E_TABLE_MEMORY_STORE_COLUMN_TYPE_CUSTOM: @@ -182,8 +182,8 @@ etms_value_is_empty (ETableModel *etm, int col, const void *value) return value == NULL; } -static char * -etms_value_to_string (ETableModel *etm, int col, const void *value) +static gchar * +etms_value_to_string (ETableModel *etm, gint col, gconstpointer value) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); @@ -204,14 +204,14 @@ etms_value_to_string (ETableModel *etm, int col, const void *value) } static void -etms_append_row (ETableModel *etm, ETableModel *source, int row) +etms_append_row (ETableModel *etm, ETableModel *source, gint row) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); - void **new_data; - int i; - int row_count; + gpointer *new_data; + gint i; + gint row_count; - new_data = g_new (void *, etms->priv->col_count); + new_data = g_new (gpointer , etms->priv->col_count); for (i = 0; i < etms->priv->col_count; i++) { new_data[i] = e_table_model_value_at (source, i, row); @@ -311,7 +311,7 @@ e_table_memory_store_new (ETableMemoryStoreColumnInfo *columns) ETableModel * e_table_memory_store_construct (ETableMemoryStore *etms, ETableMemoryStoreColumnInfo *columns) { - int i; + gint i; for (i = 0; columns[i].type != E_TABLE_MEMORY_STORE_COLUMN_TYPE_TERMINATOR; i++) /* Intentionally blank */; etms->priv->col_count = i; @@ -325,7 +325,7 @@ e_table_memory_store_construct (ETableMemoryStore *etms, ETableMemoryStoreColumn void -e_table_memory_store_adopt_value_at (ETableMemoryStore *etms, int col, int row, void *value) +e_table_memory_store_adopt_value_at (ETableMemoryStore *etms, gint col, gint row, gpointer value) { e_table_model_pre_change (E_TABLE_MODEL (etms)); @@ -336,18 +336,18 @@ e_table_memory_store_adopt_value_at (ETableMemoryStore *etms, int col, int row, /* The size of these arrays is the number of columns. */ void -e_table_memory_store_insert_array (ETableMemoryStore *etms, int row, void **store, gpointer data) +e_table_memory_store_insert_array (ETableMemoryStore *etms, gint row, gpointer *store, gpointer data) { - int row_count; - int i; + gint row_count; + gint i; row_count = e_table_model_row_count (E_TABLE_MODEL (etms)) + 1; if (row == -1) row = row_count - 1; - etms->priv->store = g_realloc (etms->priv->store, etms->priv->col_count * row_count * sizeof (void *)); + etms->priv->store = g_realloc (etms->priv->store, etms->priv->col_count * row_count * sizeof (gpointer)); memmove (etms->priv->store + etms->priv->col_count * (row + 1), etms->priv->store + etms->priv->col_count * row, - etms->priv->col_count * (row_count - row - 1) * sizeof (void *)); + etms->priv->col_count * (row_count - row - 1) * sizeof (gpointer)); for (i = 0; i < etms->priv->col_count; i++) { STORE_LOCATOR(etms, i, row) = duplicate_value(etms, i, store[i]); @@ -357,17 +357,17 @@ e_table_memory_store_insert_array (ETableMemoryStore *etms, int row, void **stor } void -e_table_memory_store_insert (ETableMemoryStore *etms, int row, gpointer data, ...) +e_table_memory_store_insert (ETableMemoryStore *etms, gint row, gpointer data, ...) { - void **store; + gpointer *store; va_list args; - int i; + gint i; - store = g_new (void *, etms->priv->col_count + 1); + store = g_new (gpointer , etms->priv->col_count + 1); va_start (args, data); for (i = 0; i < etms->priv->col_count; i++) { - store[i] = va_arg (args, void *); + store[i] = va_arg (args, gpointer ); } va_end (args); @@ -377,18 +377,18 @@ e_table_memory_store_insert (ETableMemoryStore *etms, int row, gpointer data, .. } void -e_table_memory_store_insert_adopt_array (ETableMemoryStore *etms, int row, void **store, gpointer data) +e_table_memory_store_insert_adopt_array (ETableMemoryStore *etms, gint row, gpointer *store, gpointer data) { - int row_count; - int i; + gint row_count; + gint i; row_count = e_table_model_row_count (E_TABLE_MODEL (etms)) + 1; if (row == -1) row = row_count - 1; - etms->priv->store = g_realloc (etms->priv->store, etms->priv->col_count * row_count * sizeof (void *)); + etms->priv->store = g_realloc (etms->priv->store, etms->priv->col_count * row_count * sizeof (gpointer)); memmove (etms->priv->store + etms->priv->col_count * (row + 1), etms->priv->store + etms->priv->col_count * row, - etms->priv->col_count * (row_count - row - 1) * sizeof (void *)); + etms->priv->col_count * (row_count - row - 1) * sizeof (gpointer)); for (i = 0; i < etms->priv->col_count; i++) { STORE_LOCATOR(etms, i, row) = store[i]; @@ -398,17 +398,17 @@ e_table_memory_store_insert_adopt_array (ETableMemoryStore *etms, int row, void } void -e_table_memory_store_insert_adopt (ETableMemoryStore *etms, int row, gpointer data, ...) +e_table_memory_store_insert_adopt (ETableMemoryStore *etms, gint row, gpointer data, ...) { - void **store; + gpointer *store; va_list args; - int i; + gint i; - store = g_new (void *, etms->priv->col_count + 1); + store = g_new (gpointer , etms->priv->col_count + 1); va_start (args, data); for (i = 0; i < etms->priv->col_count; i++) { - store[i] = va_arg (args, void *); + store[i] = va_arg (args, gpointer ); } va_end (args); @@ -429,9 +429,9 @@ e_table_memory_store_insert_adopt (ETableMemoryStore *etms, int row, gpointer da * */ void -e_table_memory_store_change_array (ETableMemoryStore *etms, int row, void **store, gpointer data) +e_table_memory_store_change_array (ETableMemoryStore *etms, gint row, gpointer *store, gpointer data) { - int i; + gint i; g_return_if_fail (row >= 0 && row < e_table_model_row_count (E_TABLE_MODEL (etms))); @@ -456,19 +456,19 @@ e_table_memory_store_change_array (ETableMemoryStore *etms, int row, void **stor * pass in etms->col_count args. */ void -e_table_memory_store_change (ETableMemoryStore *etms, int row, gpointer data, ...) +e_table_memory_store_change (ETableMemoryStore *etms, gint row, gpointer data, ...) { - void **store; + gpointer *store; va_list args; - int i; + gint i; g_return_if_fail (row >= 0 && row < e_table_model_row_count (E_TABLE_MODEL (etms))); - store = g_new0 (void *, etms->priv->col_count + 1); + store = g_new0 (gpointer , etms->priv->col_count + 1); va_start (args, data); for (i = 0; i < etms->priv->col_count; i++) { - store[i] = va_arg (args, void *); + store[i] = va_arg (args, gpointer ); } va_end (args); @@ -490,9 +490,9 @@ e_table_memory_store_change (ETableMemoryStore *etms, int row, gpointer data, .. * duplicate the data. */ void -e_table_memory_store_change_adopt_array (ETableMemoryStore *etms, int row, void **store, gpointer data) +e_table_memory_store_change_adopt_array (ETableMemoryStore *etms, gint row, gpointer *store, gpointer data) { - int i; + gint i; g_return_if_fail (row >= 0 && row < e_table_model_row_count (E_TABLE_MODEL (etms))); @@ -515,19 +515,19 @@ e_table_memory_store_change_adopt_array (ETableMemoryStore *etms, int row, void * must pass in etms->col_count args. */ void -e_table_memory_store_change_adopt (ETableMemoryStore *etms, int row, gpointer data, ...) +e_table_memory_store_change_adopt (ETableMemoryStore *etms, gint row, gpointer data, ...) { - void **store; + gpointer *store; va_list args; - int i; + gint i; g_return_if_fail (row >= 0 && row < e_table_model_row_count (E_TABLE_MODEL (etms))); - store = g_new0 (void *, etms->priv->col_count + 1); + store = g_new0 (gpointer , etms->priv->col_count + 1); va_start (args, data); for (i = 0; i < etms->priv->col_count; i++) { - store[i] = va_arg (args, void *); + store[i] = va_arg (args, gpointer ); } va_end (args); @@ -537,11 +537,11 @@ e_table_memory_store_change_adopt (ETableMemoryStore *etms, int row, gpointer da } void -e_table_memory_store_remove (ETableMemoryStore *etms, int row) +e_table_memory_store_remove (ETableMemoryStore *etms, gint row) { ETableModel *model; - int column_count, row_count; - int i; + gint column_count, row_count; + gint i; model = E_TABLE_MODEL (etms); column_count = e_table_model_column_count (model); @@ -552,8 +552,8 @@ e_table_memory_store_remove (ETableMemoryStore *etms, int row) row_count = e_table_model_row_count (E_TABLE_MODEL (etms)) - 1; memmove (etms->priv->store + etms->priv->col_count * row, etms->priv->store + etms->priv->col_count * (row + 1), - etms->priv->col_count * (row_count - row) * sizeof (void *)); - etms->priv->store = g_realloc (etms->priv->store, etms->priv->col_count * row_count * sizeof (void *)); + etms->priv->col_count * (row_count - row) * sizeof (gpointer)); + etms->priv->store = g_realloc (etms->priv->store, etms->priv->col_count * row_count * sizeof (gpointer)); e_table_memory_remove (E_TABLE_MEMORY (etms), row); } @@ -562,8 +562,8 @@ void e_table_memory_store_clear (ETableMemoryStore *etms) { ETableModel *model; - int row_count, column_count; - int i, j; + gint row_count, column_count; + gint i, j; model = E_TABLE_MODEL (etms); row_count = e_table_model_row_count (model); diff --git a/widgets/table/e-table-memory-store.h b/widgets/table/e-table-memory-store.h index f197e11fe6..96da50f71c 100644 --- a/widgets/table/e-table-memory-store.h +++ b/widgets/table/e-table-memory-store.h @@ -92,45 +92,45 @@ ETableModel *e_table_memory_store_construct (ETableMemoryStore /* Adopt a value instead of copying it. */ void e_table_memory_store_adopt_value_at (ETableMemoryStore *etms, - int col, - int row, + gint col, + gint row, void *value); /* The size of these arrays is the number of columns. */ void e_table_memory_store_insert_array (ETableMemoryStore *etms, - int row, + gint row, void **store, gpointer data); void e_table_memory_store_insert (ETableMemoryStore *etms, - int row, + gint row, gpointer data, ...); void e_table_memory_store_insert_adopt (ETableMemoryStore *etms, - int row, + gint row, gpointer data, ...); void e_table_memory_store_insert_adopt_array (ETableMemoryStore *etms, - int row, + gint row, void **store, gpointer data); void e_table_memory_store_change_array (ETableMemoryStore *etms, - int row, + gint row, void **store, gpointer data); void e_table_memory_store_change (ETableMemoryStore *etms, - int row, + gint row, gpointer data, ...); void e_table_memory_store_change_adopt (ETableMemoryStore *etms, - int row, + gint row, gpointer data, ...); void e_table_memory_store_change_adopt_array (ETableMemoryStore *etms, - int row, + gint row, void **store, gpointer data); void e_table_memory_store_remove (ETableMemoryStore *etms, - int row); + gint row); void e_table_memory_store_clear (ETableMemoryStore *etms); G_END_DECLS diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c index 3fb85a9553..98fd65c460 100644 --- a/widgets/table/e-table-memory.c +++ b/widgets/table/e-table-memory.c @@ -41,7 +41,7 @@ G_DEFINE_TYPE (ETableMemory, e_table_memory, E_TABLE_MODEL_TYPE) struct ETableMemoryPriv { gpointer *data; - int num_rows; + gint num_rows; gint frozen; }; @@ -120,7 +120,7 @@ e_table_memory_new (void) * Return value: **/ gpointer -e_table_memory_get_data (ETableMemory *etmm, int row) +e_table_memory_get_data (ETableMemory *etmm, gint row) { g_return_val_if_fail(row >= 0, NULL); g_return_val_if_fail(row < etmm->priv->num_rows, NULL); @@ -137,7 +137,7 @@ e_table_memory_get_data (ETableMemory *etmm, int row) * **/ void -e_table_memory_set_data (ETableMemory *etmm, int row, gpointer data) +e_table_memory_set_data (ETableMemory *etmm, gint row, gpointer data) { g_return_if_fail(row >= 0); g_return_if_fail(row < etmm->priv->num_rows); @@ -158,7 +158,7 @@ e_table_memory_set_data (ETableMemory *etmm, int row, gpointer data) **/ void e_table_memory_insert (ETableMemory *etmm, - int row, + gint row, gpointer data) { g_return_if_fail(row >= -1); @@ -189,7 +189,7 @@ e_table_memory_insert (ETableMemory *etmm, * Return value: **/ gpointer -e_table_memory_remove (ETableMemory *etmm, int row) +e_table_memory_remove (ETableMemory *etmm, gint row) { gpointer ret; diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h index 889eec5d33..07a79b6856 100644 --- a/widgets/table/e-table-memory.h +++ b/widgets/table/e-table-memory.h @@ -55,19 +55,19 @@ ETableMemory *e_table_memory_new (void); /* row operations */ void e_table_memory_insert (ETableMemory *etable, - int row, + gint row, gpointer data); gpointer e_table_memory_remove (ETableMemory *etable, - int row); + gint row); void e_table_memory_clear (ETableMemory *etable); /* Freeze and thaw */ void e_table_memory_freeze (ETableMemory *etable); void e_table_memory_thaw (ETableMemory *etable); gpointer e_table_memory_get_data (ETableMemory *etm, - int row); + gint row); void e_table_memory_set_data (ETableMemory *etm, - int row, + gint row, gpointer data); G_END_DECLS diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index efe097c4e1..2badb768c9 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -59,7 +59,7 @@ static guint e_table_model_signals [LAST_SIGNAL] = { 0, }; * * Returns: the number of columns in the table model. */ -int +gint e_table_model_column_count (ETableModel *e_table_model) { g_return_val_if_fail (e_table_model != NULL, 0); @@ -75,7 +75,7 @@ e_table_model_column_count (ETableModel *e_table_model) * * Returns: the number of rows in the Table model. */ -int +gint e_table_model_row_count (ETableModel *e_table_model) { g_return_val_if_fail (e_table_model != NULL, 0); @@ -92,7 +92,7 @@ e_table_model_row_count (ETableModel *e_table_model) * */ void -e_table_model_append_row (ETableModel *e_table_model, ETableModel *source, int row) +e_table_model_append_row (ETableModel *e_table_model, ETableModel *source, gint row) { g_return_if_fail (e_table_model != NULL); g_return_if_fail (E_IS_TABLE_MODEL (e_table_model)); @@ -120,8 +120,8 @@ e_table_model_append_row (ETableModel *e_table_model, ETableModel *source, int r * data in that cell. rows_deleted affects all data in those rows. * rows_inserted and no_change don't affect any data in this way. **/ -void * -e_table_model_value_at (ETableModel *e_table_model, int col, int row) +gpointer +e_table_model_value_at (ETableModel *e_table_model, gint col, gint row) { g_return_val_if_fail (e_table_model != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL); @@ -142,10 +142,10 @@ e_table_model_value_at (ETableModel *e_table_model, int col, int row) * * There should be an agreement between the Table Model and the user * of this function about the data being stored. Typically it will - * be a pointer to a set of data, or a datum that fits inside a void *. + * be a pointer to a set of data, or a datum that fits inside a gpointer . */ void -e_table_model_set_value_at (ETableModel *e_table_model, int col, int row, const void *value) +e_table_model_set_value_at (ETableModel *e_table_model, gint col, gint row, gconstpointer value) { g_return_if_fail (e_table_model != NULL); g_return_if_fail (E_IS_TABLE_MODEL (e_table_model)); @@ -163,7 +163,7 @@ e_table_model_set_value_at (ETableModel *e_table_model, int col, int row, const * edited, %FALSE otherwise */ gboolean -e_table_model_is_cell_editable (ETableModel *e_table_model, int col, int row) +e_table_model_is_cell_editable (ETableModel *e_table_model, gint col, gint row) { g_return_val_if_fail (e_table_model != NULL, FALSE); g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), FALSE); @@ -172,8 +172,8 @@ e_table_model_is_cell_editable (ETableModel *e_table_model, int col, int row) } -void * -e_table_model_duplicate_value (ETableModel *e_table_model, int col, const void *value) +gpointer +e_table_model_duplicate_value (ETableModel *e_table_model, gint col, gconstpointer value) { g_return_val_if_fail (e_table_model != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL); @@ -185,7 +185,7 @@ e_table_model_duplicate_value (ETableModel *e_table_model, int col, const void * } void -e_table_model_free_value (ETableModel *e_table_model, int col, void *value) +e_table_model_free_value (ETableModel *e_table_model, gint col, gpointer value) { g_return_if_fail (e_table_model != NULL); g_return_if_fail (E_IS_TABLE_MODEL (e_table_model)); @@ -206,8 +206,8 @@ e_table_model_has_save_id (ETableModel *e_table_model) return FALSE; } -char * -e_table_model_get_save_id (ETableModel *e_table_model, int row) +gchar * +e_table_model_get_save_id (ETableModel *e_table_model, gint row) { g_return_val_if_fail (e_table_model != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL); @@ -230,8 +230,8 @@ e_table_model_has_change_pending(ETableModel *e_table_model) return FALSE; } -void * -e_table_model_initialize_value (ETableModel *e_table_model, int col) +gpointer +e_table_model_initialize_value (ETableModel *e_table_model, gint col) { g_return_val_if_fail (e_table_model != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL); @@ -243,7 +243,7 @@ e_table_model_initialize_value (ETableModel *e_table_model, int col) } gboolean -e_table_model_value_is_empty (ETableModel *e_table_model, int col, const void *value) +e_table_model_value_is_empty (ETableModel *e_table_model, gint col, gconstpointer value) { g_return_val_if_fail (e_table_model != NULL, FALSE); g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), FALSE); @@ -254,8 +254,8 @@ e_table_model_value_is_empty (ETableModel *e_table_model, int col, const void *v return FALSE; } -char * -e_table_model_value_to_string (ETableModel *e_table_model, int col, const void *value) +gchar * +e_table_model_value_to_string (ETableModel *e_table_model, gint col, gconstpointer value) { g_return_val_if_fail (e_table_model != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL); @@ -381,7 +381,7 @@ e_table_model_init (ETableModel *e_table_model) static void print_tabs (void) { - int i; + gint i; for (i = 0; i < depth; i++) g_print("\t"); } @@ -475,7 +475,7 @@ e_table_model_changed (ETableModel *e_table_model) * object */ void -e_table_model_row_changed (ETableModel *e_table_model, int row) +e_table_model_row_changed (ETableModel *e_table_model, gint row) { g_return_if_fail (e_table_model != NULL); g_return_if_fail (E_IS_TABLE_MODEL (e_table_model)); @@ -503,7 +503,7 @@ e_table_model_row_changed (ETableModel *e_table_model, int row) * object */ void -e_table_model_cell_changed (ETableModel *e_table_model, int col, int row) +e_table_model_cell_changed (ETableModel *e_table_model, gint col, gint row) { g_return_if_fail (e_table_model != NULL); g_return_if_fail (E_IS_TABLE_MODEL (e_table_model)); @@ -531,7 +531,7 @@ e_table_model_cell_changed (ETableModel *e_table_model, int col, int row) * @e_table_model object */ void -e_table_model_rows_inserted (ETableModel *e_table_model, int row, int count) +e_table_model_rows_inserted (ETableModel *e_table_model, gint row, gint count) { g_return_if_fail (e_table_model != NULL); g_return_if_fail (E_IS_TABLE_MODEL (e_table_model)); @@ -557,7 +557,7 @@ e_table_model_rows_inserted (ETableModel *e_table_model, int row, int count) * the "model_rows_inserted" signal on the @e_table_model object */ void -e_table_model_row_inserted (ETableModel *e_table_model, int row) +e_table_model_row_inserted (ETableModel *e_table_model, gint row) { e_table_model_rows_inserted(e_table_model, row, 1); } @@ -574,7 +574,7 @@ e_table_model_row_inserted (ETableModel *e_table_model, int row) * @e_table_model object */ void -e_table_model_rows_deleted (ETableModel *e_table_model, int row, int count) +e_table_model_rows_deleted (ETableModel *e_table_model, gint row, gint count) { g_return_if_fail (e_table_model != NULL); g_return_if_fail (E_IS_TABLE_MODEL (e_table_model)); @@ -600,7 +600,7 @@ e_table_model_rows_deleted (ETableModel *e_table_model, int row, int count) * the "model_rows_deleted" signal on the @e_table_model object */ void -e_table_model_row_deleted (ETableModel *e_table_model, int row) +e_table_model_row_deleted (ETableModel *e_table_model, gint row) { e_table_model_rows_deleted(e_table_model, row, 1); } diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h index d647eee4e1..571c2f8a12 100644 --- a/widgets/table/e-table-model.h +++ b/widgets/table/e-table-model.h @@ -45,29 +45,29 @@ typedef struct { /* * Virtual methods */ - int (*column_count) (ETableModel *etm); - int (*row_count) (ETableModel *etm); - void (*append_row) (ETableModel *etm, ETableModel *source, int row); + gint (*column_count) (ETableModel *etm); + gint (*row_count) (ETableModel *etm); + void (*append_row) (ETableModel *etm, ETableModel *source, gint row); - void *(*value_at) (ETableModel *etm, int col, int row); - void (*set_value_at) (ETableModel *etm, int col, int row, const void *value); - gboolean (*is_cell_editable) (ETableModel *etm, int col, int row); + void *(*value_at) (ETableModel *etm, gint col, gint row); + void (*set_value_at) (ETableModel *etm, gint col, gint row, gconstpointer value); + gboolean (*is_cell_editable) (ETableModel *etm, gint col, gint row); gboolean (*has_save_id) (ETableModel *etm); - gchar *(*get_save_id) (ETableModel *etm, int row); + gchar *(*get_save_id) (ETableModel *etm, gint row); gboolean (*has_change_pending) (ETableModel *etm); /* Allocate a copy of the given value. */ - void *(*duplicate_value) (ETableModel *etm, int col, const void *value); + void *(*duplicate_value) (ETableModel *etm, gint col, gconstpointer value); /* Free an allocated value. */ - void (*free_value) (ETableModel *etm, int col, void *value); + void (*free_value) (ETableModel *etm, gint col, gpointer value); /* Return an allocated empty value. */ - void *(*initialize_value) (ETableModel *etm, int col); + void *(*initialize_value) (ETableModel *etm, gint col); /* Return TRUE if value is equivalent to an empty cell. */ - gboolean (*value_is_empty) (ETableModel *etm, int col, const void *value); + gboolean (*value_is_empty) (ETableModel *etm, gint col, gconstpointer value); /* Return an allocated string. */ - char *(*value_to_string) (ETableModel *etm, int col, const void *value); + gchar *(*value_to_string) (ETableModel *etm, gint col, gconstpointer value); /* @@ -87,39 +87,39 @@ typedef struct { void (*model_no_change) (ETableModel *etm); void (*model_changed) (ETableModel *etm); - void (*model_row_changed) (ETableModel *etm, int row); - void (*model_cell_changed) (ETableModel *etm, int col, int row); - void (*model_rows_inserted) (ETableModel *etm, int row, int count); - void (*model_rows_deleted) (ETableModel *etm, int row, int count); + void (*model_row_changed) (ETableModel *etm, gint row); + void (*model_cell_changed) (ETableModel *etm, gint col, gint row); + void (*model_rows_inserted) (ETableModel *etm, gint row, gint count); + void (*model_rows_deleted) (ETableModel *etm, gint row, gint count); } ETableModelClass; GType e_table_model_get_type (void); /**/ -int e_table_model_column_count (ETableModel *e_table_model); -const char *e_table_model_column_name (ETableModel *e_table_model, - int col); -int e_table_model_row_count (ETableModel *e_table_model); +gint e_table_model_column_count (ETableModel *e_table_model); +const gchar *e_table_model_column_name (ETableModel *e_table_model, + gint col); +gint e_table_model_row_count (ETableModel *e_table_model); void e_table_model_append_row (ETableModel *e_table_model, ETableModel *source, - int row); + gint row); /**/ void *e_table_model_value_at (ETableModel *e_table_model, - int col, - int row); + gint col, + gint row); void e_table_model_set_value_at (ETableModel *e_table_model, - int col, - int row, + gint col, + gint row, const void *value); gboolean e_table_model_is_cell_editable (ETableModel *e_table_model, - int col, - int row); + gint col, + gint row); /**/ gboolean e_table_model_has_save_id (ETableModel *etm); -char *e_table_model_get_save_id (ETableModel *etm, - int row); +gchar *e_table_model_get_save_id (ETableModel *etm, + gint row); /**/ gboolean e_table_model_has_change_pending (ETableModel *etm); @@ -127,18 +127,18 @@ gboolean e_table_model_has_change_pending (ETableModel *etm); /**/ void *e_table_model_duplicate_value (ETableModel *e_table_model, - int col, + gint col, const void *value); void e_table_model_free_value (ETableModel *e_table_model, - int col, + gint col, void *value); void *e_table_model_initialize_value (ETableModel *e_table_model, - int col); + gint col); gboolean e_table_model_value_is_empty (ETableModel *e_table_model, - int col, + gint col, const void *value); -char *e_table_model_value_to_string (ETableModel *e_table_model, - int col, +gchar *e_table_model_value_to_string (ETableModel *e_table_model, + gint col, const void *value); /* @@ -148,22 +148,22 @@ void e_table_model_pre_change (ETableModel *e_table_model); void e_table_model_no_change (ETableModel *e_table_model); void e_table_model_changed (ETableModel *e_table_model); void e_table_model_row_changed (ETableModel *e_table_model, - int row); + gint row); void e_table_model_cell_changed (ETableModel *e_table_model, - int col, - int row); + gint col, + gint row); void e_table_model_rows_inserted (ETableModel *e_table_model, -int row, -int count); +gint row, +gint count); void e_table_model_rows_deleted (ETableModel *e_table_model, -int row, -int count); +gint row, +gint count); /**/ void e_table_model_row_inserted (ETableModel *e_table_model, -int row); +gint row); void e_table_model_row_deleted (ETableModel *e_table_model, -int row); +gint row); void e_table_model_freeze (ETableModel *e_table_model); void e_table_model_thaw (ETableModel *e_table_model); diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c index 56cd8b6549..c8cea32963 100644 --- a/widgets/table/e-table-one.c +++ b/widgets/table/e-table-one.c @@ -46,8 +46,8 @@ one_row_count (ETableModel *etm) return 1; } -static void * -one_value_at (ETableModel *etm, int col, int row) +static gpointer +one_value_at (ETableModel *etm, gint col, gint row) { ETableOne *one = E_TABLE_ONE(etm); @@ -58,7 +58,7 @@ one_value_at (ETableModel *etm, int col, int row) } static void -one_set_value_at (ETableModel *etm, int col, int row, const void *val) +one_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val) { ETableOne *one = E_TABLE_ONE(etm); @@ -69,7 +69,7 @@ one_set_value_at (ETableModel *etm, int col, int row, const void *val) } static gboolean -one_is_cell_editable (ETableModel *etm, int col, int row) +one_is_cell_editable (ETableModel *etm, gint col, gint row) { ETableOne *one = E_TABLE_ONE(etm); @@ -80,19 +80,19 @@ one_is_cell_editable (ETableModel *etm, int col, int row) } /* The default for one_duplicate_value is to return the raw value. */ -static void * -one_duplicate_value (ETableModel *etm, int col, const void *value) +static gpointer +one_duplicate_value (ETableModel *etm, gint col, gconstpointer value) { ETableOne *one = E_TABLE_ONE(etm); if (one->source) return e_table_model_duplicate_value(one->source, col, value); else - return (void *)value; + return (gpointer)value; } static void -one_free_value (ETableModel *etm, int col, void *value) +one_free_value (ETableModel *etm, gint col, gpointer value) { ETableOne *one = E_TABLE_ONE(etm); @@ -100,8 +100,8 @@ one_free_value (ETableModel *etm, int col, void *value) e_table_model_free_value(one->source, col, value); } -static void * -one_initialize_value (ETableModel *etm, int col) +static gpointer +one_initialize_value (ETableModel *etm, gint col) { ETableOne *one = E_TABLE_ONE(etm); @@ -112,7 +112,7 @@ one_initialize_value (ETableModel *etm, int col) } static gboolean -one_value_is_empty (ETableModel *etm, int col, const void *value) +one_value_is_empty (ETableModel *etm, gint col, gconstpointer value) { ETableOne *one = E_TABLE_ONE(etm); @@ -122,8 +122,8 @@ one_value_is_empty (ETableModel *etm, int col, const void *value) return FALSE; } -static char * -one_value_to_string (ETableModel *etm, int col, const void *value) +static gchar * +one_value_to_string (ETableModel *etm, gint col, gconstpointer value) { ETableOne *one = E_TABLE_ONE(etm); @@ -146,8 +146,8 @@ one_dispose (GObject *object) if (one->data) { - int i; - int col_count; + gint i; + gint col_count; if (one->source) { col_count = e_table_model_column_count(one->source); @@ -199,14 +199,14 @@ ETableModel * e_table_one_new (ETableModel *source) { ETableOne *eto; - int col_count; - int i; + gint col_count; + gint i; eto = g_object_new (E_TABLE_ONE_TYPE, NULL); eto->source = source; col_count = e_table_model_column_count(source); - eto->data = g_new(void *, col_count); + eto->data = g_new(gpointer , col_count); for (i = 0; i < col_count; i++) { eto->data[i] = e_table_model_initialize_value(source, i); } @@ -221,9 +221,9 @@ void e_table_one_commit (ETableOne *one) { if (one->source) { - int empty = TRUE; - int col; - int cols = e_table_model_column_count(one->source); + gint empty = TRUE; + gint col; + gint cols = e_table_model_column_count(one->source); for (col = 0; col < cols; col++) { if (!e_table_model_value_is_empty(one->source, col, one->data[col])) { empty = FALSE; diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c index 42425efd9a..778041d73c 100644 --- a/widgets/table/e-table-scrolled.c +++ b/widgets/table/e-table-scrolled.c @@ -71,8 +71,8 @@ e_table_scrolled_real_construct (ETableScrolled *ets) ETableScrolled *e_table_scrolled_construct (ETableScrolled *ets, ETableModel *etm, ETableExtras *ete, - const char *spec, - const char *state) + const gchar *spec, + const gchar *state) { g_return_val_if_fail(ets != NULL, NULL); g_return_val_if_fail(E_IS_TABLE_SCROLLED(ets), NULL); @@ -90,8 +90,8 @@ ETableScrolled *e_table_scrolled_construct (ETableScrolled *e GtkWidget *e_table_scrolled_new (ETableModel *etm, ETableExtras *ete, - const char *spec, - const char *state) + const gchar *spec, + const gchar *state) { ETableScrolled *ets; @@ -113,8 +113,8 @@ GtkWidget *e_table_scrolled_new (ETableModel *e ETableScrolled *e_table_scrolled_construct_from_spec_file (ETableScrolled *ets, ETableModel *etm, ETableExtras *ete, - const char *spec_fn, - const char *state_fn) + const gchar *spec_fn, + const gchar *state_fn) { g_return_val_if_fail(ets != NULL, NULL); g_return_val_if_fail(E_IS_TABLE_SCROLLED(ets), NULL); @@ -132,8 +132,8 @@ ETableScrolled *e_table_scrolled_construct_from_spec_file (ETableScrolled *e GtkWidget *e_table_scrolled_new_from_spec_file (ETableModel *etm, ETableExtras *ete, - const char *spec_fn, - const char *state_fn) + const gchar *spec_fn, + const gchar *state_fn) { ETableScrolled *ets; diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h index d2f5024495..71e50b8cdd 100644 --- a/widgets/table/e-table-scrolled.h +++ b/widgets/table/e-table-scrolled.h @@ -51,22 +51,22 @@ GType e_table_scrolled_get_type (void); ETableScrolled *e_table_scrolled_construct (ETableScrolled *ets, ETableModel *etm, ETableExtras *ete, - const char *spec, - const char *state); + const gchar *spec, + const gchar *state); GtkWidget *e_table_scrolled_new (ETableModel *etm, ETableExtras *ete, - const char *spec, - const char *state); + const gchar *spec, + const gchar *state); ETableScrolled *e_table_scrolled_construct_from_spec_file (ETableScrolled *ets, ETableModel *etm, ETableExtras *ete, - const char *spec_fn, - const char *state_fn); + const gchar *spec_fn, + const gchar *state_fn); GtkWidget *e_table_scrolled_new_from_spec_file (ETableModel *etm, ETableExtras *ete, - const char *spec_fn, - const char *state_fn); + const gchar *spec_fn, + const gchar *state_fn); ETable *e_table_scrolled_get_table (ETableScrolled *ets); diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c index 401e0fd33f..e11510371a 100644 --- a/widgets/table/e-table-search.c +++ b/widgets/table/e-table-search.c @@ -35,7 +35,7 @@ d(static gint depth = 0) struct _ETableSearchPrivate { guint timeout_id; - char *search_string; + gchar *search_string; gunichar last_character; }; @@ -50,7 +50,7 @@ enum { static guint e_table_search_signals [LAST_SIGNAL] = { 0, }; static gboolean -e_table_search_search (ETableSearch *e_table_search, char *string, ETableSearchFlags flags) +e_table_search_search (ETableSearch *e_table_search, gchar *string, ETableSearchFlags flags) { gboolean ret_val; g_return_val_if_fail (e_table_search != NULL, FALSE); @@ -172,8 +172,8 @@ e_table_search_new (void) void e_table_search_input_character (ETableSearch *ets, gunichar character) { - char character_utf8[7]; - char *temp_string; + gchar character_utf8[7]; + gchar *temp_string; g_return_if_fail (ets != NULL); g_return_if_fail (E_IS_TABLE_SEARCH (ets)); @@ -202,7 +202,7 @@ e_table_search_input_character (ETableSearch *ets, gunichar character) gboolean e_table_search_backspace (ETableSearch *ets) { - char *end; + gchar *end; g_return_val_if_fail (ets != NULL, FALSE); g_return_val_if_fail (E_IS_TABLE_SEARCH (ets), FALSE); diff --git a/widgets/table/e-table-search.h b/widgets/table/e-table-search.h index 9866d07f94..798d81bd2d 100644 --- a/widgets/table/e-table-search.h +++ b/widgets/table/e-table-search.h @@ -53,7 +53,7 @@ typedef struct { /* * Signals */ - gboolean (*search) (ETableSearch *ets, char *string /* utf8 */, ETableSearchFlags flags); + gboolean (*search) (ETableSearch *ets, gchar *string /* utf8 */, ETableSearchFlags flags); void (*accept) (ETableSearch *ets); } ETableSearchClass; diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c index 7f6ab4d782..22ec5af7d5 100644 --- a/widgets/table/e-table-selection-model.c +++ b/widgets/table/e-table-selection-model.c @@ -42,7 +42,7 @@ enum { }; static void -save_to_hash(int model_row, gpointer closure) +save_to_hash(gint model_row, gpointer closure) { ETableSelectionModel *etsm = closure; const gchar *key = e_table_model_get_save_id(etsm->model, model_row); @@ -95,10 +95,10 @@ model_changed_idle(ETableSelectionModel *etsm) e_selection_model_clear(E_SELECTION_MODEL(etsm)); if (etsm->cursor_id && etm && e_table_model_has_save_id(etm)) { - int row_count = e_table_model_row_count(etm); - int cursor_row = -1; - int cursor_col = -1; - int i; + gint row_count = e_table_model_row_count(etm); + gint cursor_row = -1; + gint cursor_col = -1; + gint i; e_selection_model_array_confirm_row_count(E_SELECTION_MODEL_ARRAY(etsm)); for (i = 0; i < row_count; i++) { gchar *save_id = e_table_model_get_save_id(etm, i); @@ -138,27 +138,27 @@ model_changed(ETableModel *etm, ETableSelectionModel *etsm) } static void -model_row_changed(ETableModel *etm, int row, ETableSelectionModel *etsm) +model_row_changed(ETableModel *etm, gint row, ETableSelectionModel *etsm) { free_hash(etsm); } static void -model_cell_changed(ETableModel *etm, int col, int row, ETableSelectionModel *etsm) +model_cell_changed(ETableModel *etm, gint col, gint row, ETableSelectionModel *etsm) { free_hash(etsm); } #if 1 static void -model_rows_inserted(ETableModel *etm, int row, int count, ETableSelectionModel *etsm) +model_rows_inserted(ETableModel *etm, gint row, gint count, ETableSelectionModel *etsm) { e_selection_model_array_insert_rows(E_SELECTION_MODEL_ARRAY(etsm), row, count); free_hash(etsm); } static void -model_rows_deleted(ETableModel *etm, int row, int count, ETableSelectionModel *etsm) +model_rows_deleted(ETableModel *etm, gint row, gint count, ETableSelectionModel *etsm) { e_selection_model_array_delete_rows(E_SELECTION_MODEL_ARRAY(etsm), row, count); free_hash(etsm); @@ -167,13 +167,13 @@ model_rows_deleted(ETableModel *etm, int row, int count, ETableSelectionModel *e #else static void -model_rows_inserted(ETableModel *etm, int row, int count, ETableSelectionModel *etsm) +model_rows_inserted(ETableModel *etm, gint row, gint count, ETableSelectionModel *etsm) { model_changed(etm, etsm); } static void -model_rows_deleted(ETableModel *etm, int row, int count, ETableSelectionModel *etsm) +model_rows_deleted(ETableModel *etm, gint row, gint count, ETableSelectionModel *etsm) { model_changed(etm, etsm); } diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c index a220769ded..f2eceb9314 100644 --- a/widgets/table/e-table-simple.c +++ b/widgets/table/e-table-simple.c @@ -53,7 +53,7 @@ simple_row_count (ETableModel *etm) } static void -simple_append_row (ETableModel *etm, ETableModel *source, int row) +simple_append_row (ETableModel *etm, ETableModel *source, gint row) { ETableSimple *simple = E_TABLE_SIMPLE(etm); @@ -61,8 +61,8 @@ simple_append_row (ETableModel *etm, ETableModel *source, int row) simple->append_row (etm, source, row, simple->data); } -static void * -simple_value_at (ETableModel *etm, int col, int row) +static gpointer +simple_value_at (ETableModel *etm, gint col, gint row) { ETableSimple *simple = E_TABLE_SIMPLE(etm); @@ -73,7 +73,7 @@ simple_value_at (ETableModel *etm, int col, int row) } static void -simple_set_value_at (ETableModel *etm, int col, int row, const void *val) +simple_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val) { ETableSimple *simple = E_TABLE_SIMPLE(etm); @@ -82,7 +82,7 @@ simple_set_value_at (ETableModel *etm, int col, int row, const void *val) } static gboolean -simple_is_cell_editable (ETableModel *etm, int col, int row) +simple_is_cell_editable (ETableModel *etm, gint col, gint row) { ETableSimple *simple = E_TABLE_SIMPLE(etm); @@ -103,8 +103,8 @@ simple_has_save_id (ETableModel *etm) return FALSE; } -static char * -simple_get_save_id (ETableModel *etm, int row) +static gchar * +simple_get_save_id (ETableModel *etm, gint row) { ETableSimple *simple = E_TABLE_SIMPLE(etm); @@ -115,19 +115,19 @@ simple_get_save_id (ETableModel *etm, int row) } /* The default for simple_duplicate_value is to return the raw value. */ -static void * -simple_duplicate_value (ETableModel *etm, int col, const void *value) +static gpointer +simple_duplicate_value (ETableModel *etm, gint col, gconstpointer value) { ETableSimple *simple = E_TABLE_SIMPLE(etm); if (simple->duplicate_value) return simple->duplicate_value (etm, col, value, simple->data); else - return (void *)value; + return (gpointer)value; } static void -simple_free_value (ETableModel *etm, int col, void *value) +simple_free_value (ETableModel *etm, gint col, gpointer value) { ETableSimple *simple = E_TABLE_SIMPLE(etm); @@ -135,8 +135,8 @@ simple_free_value (ETableModel *etm, int col, void *value) simple->free_value (etm, col, value, simple->data); } -static void * -simple_initialize_value (ETableModel *etm, int col) +static gpointer +simple_initialize_value (ETableModel *etm, gint col) { ETableSimple *simple = E_TABLE_SIMPLE(etm); @@ -147,7 +147,7 @@ simple_initialize_value (ETableModel *etm, int col) } static gboolean -simple_value_is_empty (ETableModel *etm, int col, const void *value) +simple_value_is_empty (ETableModel *etm, gint col, gconstpointer value) { ETableSimple *simple = E_TABLE_SIMPLE(etm); @@ -157,8 +157,8 @@ simple_value_is_empty (ETableModel *etm, int col, const void *value) return FALSE; } -static char * -simple_value_to_string (ETableModel *etm, int col, const void *value) +static gchar * +simple_value_to_string (ETableModel *etm, gint col, gconstpointer value) { ETableSimple *simple = E_TABLE_SIMPLE(etm); @@ -266,32 +266,32 @@ e_table_simple_new (ETableSimpleColumnCountFn col_count, return (ETableModel *) et; } -void * -e_table_simple_string_duplicate_value (ETableModel *etm, int col, const void *val, void *data) +gpointer +e_table_simple_string_duplicate_value (ETableModel *etm, gint col, gconstpointer val, gpointer data) { return g_strdup (val); } void -e_table_simple_string_free_value (ETableModel *etm, int col, void *val, void *data) +e_table_simple_string_free_value (ETableModel *etm, gint col, gpointer val, gpointer data) { g_free (val); } -void * -e_table_simple_string_initialize_value (ETableModel *etm, int col, void *data) +gpointer +e_table_simple_string_initialize_value (ETableModel *etm, gint col, gpointer data) { return g_strdup (""); } gboolean -e_table_simple_string_value_is_empty (ETableModel *etm, int col, const void *val, void *data) +e_table_simple_string_value_is_empty (ETableModel *etm, gint col, gconstpointer val, gpointer data) { - return !(val && * (char *) val); + return !(val && * (gchar *) val); } -char * -e_table_simple_string_value_to_string (ETableModel *etm, int col, const void *val, void *data) +gchar * +e_table_simple_string_value_to_string (ETableModel *etm, gint col, gconstpointer val, gpointer data) { return g_strdup (val); } diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h index 453a90a54d..c93b313a82 100644 --- a/widgets/table/e-table-simple.h +++ b/widgets/table/e-table-simple.h @@ -36,22 +36,22 @@ G_BEGIN_DECLS #define E_IS_TABLE_SIMPLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SIMPLE_TYPE)) #define E_TABLE_SIMPLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_SIMPLE_TYPE, ETableSimpleClass)) -typedef int (*ETableSimpleColumnCountFn) (ETableModel *etm, void *data); -typedef int (*ETableSimpleRowCountFn) (ETableModel *etm, void *data); -typedef void (*ETableSimpleAppendRowFn) (ETableModel *etm, ETableModel *model, int row, void *data); +typedef gint (*ETableSimpleColumnCountFn) (ETableModel *etm, gpointer data); +typedef gint (*ETableSimpleRowCountFn) (ETableModel *etm, gpointer data); +typedef void (*ETableSimpleAppendRowFn) (ETableModel *etm, ETableModel *model, gint row, gpointer data); -typedef void *(*ETableSimpleValueAtFn) (ETableModel *etm, int col, int row, void *data); -typedef void (*ETableSimpleSetValueAtFn) (ETableModel *etm, int col, int row, const void *val, void *data); -typedef gboolean (*ETableSimpleIsCellEditableFn) (ETableModel *etm, int col, int row, void *data); +typedef void *(*ETableSimpleValueAtFn) (ETableModel *etm, gint col, gint row, gpointer data); +typedef void (*ETableSimpleSetValueAtFn) (ETableModel *etm, gint col, gint row, gconstpointer val, gpointer data); +typedef gboolean (*ETableSimpleIsCellEditableFn) (ETableModel *etm, gint col, gint row, gpointer data); -typedef gboolean (*ETableSimpleHasSaveIdFn) (ETableModel *etm, void *data); -typedef char *(*ETableSimpleGetSaveIdFn) (ETableModel *etm, int row, void *data); +typedef gboolean (*ETableSimpleHasSaveIdFn) (ETableModel *etm, gpointer data); +typedef gchar *(*ETableSimpleGetSaveIdFn) (ETableModel *etm, gint row, gpointer data); -typedef void *(*ETableSimpleDuplicateValueFn) (ETableModel *etm, int col, const void *val, void *data); -typedef void (*ETableSimpleFreeValueFn) (ETableModel *etm, int col, void *val, void *data); -typedef void *(*ETableSimpleInitializeValueFn) (ETableModel *etm, int col, void *data); -typedef gboolean (*ETableSimpleValueIsEmptyFn) (ETableModel *etm, int col, const void *val, void *data); -typedef char *(*ETableSimpleValueToStringFn) (ETableModel *etm, int col, const void *val, void *data); +typedef void *(*ETableSimpleDuplicateValueFn) (ETableModel *etm, gint col, gconstpointer val, gpointer data); +typedef void (*ETableSimpleFreeValueFn) (ETableModel *etm, gint col, gpointer val, gpointer data); +typedef void *(*ETableSimpleInitializeValueFn) (ETableModel *etm, gint col, gpointer data); +typedef gboolean (*ETableSimpleValueIsEmptyFn) (ETableModel *etm, gint col, gconstpointer val, gpointer data); +typedef gchar *(*ETableSimpleValueToStringFn) (ETableModel *etm, gint col, gconstpointer val, gpointer data); typedef struct { ETableModel parent; @@ -72,7 +72,7 @@ typedef struct { ETableSimpleInitializeValueFn initialize_value; ETableSimpleValueIsEmptyFn value_is_empty; ETableSimpleValueToStringFn value_to_string; - void *data; + gpointer data; } ETableSimple; typedef struct { @@ -98,22 +98,22 @@ ETableModel *e_table_simple_new (ETableSimpleColumnCountFn /* Helper functions for if your values are all just strings. */ void *e_table_simple_string_duplicate_value (ETableModel *etm, - int col, + gint col, const void *val, void *data); void e_table_simple_string_free_value (ETableModel *etm, - int col, + gint col, void *val, void *data); void *e_table_simple_string_initialize_value (ETableModel *etm, - int col, + gint col, void *data); gboolean e_table_simple_string_value_is_empty (ETableModel *etm, - int col, + gint col, const void *val, void *data); -char *e_table_simple_string_value_to_string (ETableModel *etm, - int col, +gchar *e_table_simple_string_value_to_string (ETableModel *etm, + gint col, const void *val, void *data); diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c index 8d722038e3..bed0c5d679 100644 --- a/widgets/table/e-table-sort-info.c +++ b/widgets/table/e-table-sort-info.c @@ -188,7 +188,7 @@ e_table_sort_info_grouping_get_count (ETableSortInfo *info) } static void -e_table_sort_info_grouping_real_truncate (ETableSortInfo *info, int length) +e_table_sort_info_grouping_real_truncate (ETableSortInfo *info, gint length) { if (length < info->group_count) { info->group_count = length; @@ -208,7 +208,7 @@ e_table_sort_info_grouping_real_truncate (ETableSortInfo *info, int length) * criteria in the object. */ void -e_table_sort_info_grouping_truncate (ETableSortInfo *info, int length) +e_table_sort_info_grouping_truncate (ETableSortInfo *info, gint length) { e_table_sort_info_grouping_real_truncate(info, length); e_table_sort_info_group_info_changed(info); @@ -222,7 +222,7 @@ e_table_sort_info_grouping_truncate (ETableSortInfo *info, int length) * Returns: the description of the @n-th grouping criteria in the @info object. */ ETableSortColumn -e_table_sort_info_grouping_get_nth (ETableSortInfo *info, int n) +e_table_sort_info_grouping_get_nth (ETableSortInfo *info, gint n) { if (info->can_group && n < info->group_count) { return info->groupings[n]; @@ -242,7 +242,7 @@ e_table_sort_info_grouping_get_nth (ETableSortInfo *info, int n) * whether it is ascending or descending). */ void -e_table_sort_info_grouping_set_nth (ETableSortInfo *info, int n, ETableSortColumn column) +e_table_sort_info_grouping_set_nth (ETableSortInfo *info, gint n, ETableSortColumn column) { if (n >= info->group_count) { e_table_sort_info_grouping_real_truncate(info, n + 1); @@ -265,7 +265,7 @@ e_table_sort_info_sorting_get_count (ETableSortInfo *info) } static void -e_table_sort_info_sorting_real_truncate (ETableSortInfo *info, int length) +e_table_sort_info_sorting_real_truncate (ETableSortInfo *info, gint length) { if (length < info->sort_count) { info->sort_count = length; @@ -285,7 +285,7 @@ e_table_sort_info_sorting_real_truncate (ETableSortInfo *info, int length) * criteria in the object. */ void -e_table_sort_info_sorting_truncate (ETableSortInfo *info, int length) +e_table_sort_info_sorting_truncate (ETableSortInfo *info, gint length) { e_table_sort_info_sorting_real_truncate (info, length); e_table_sort_info_sort_info_changed(info); @@ -299,7 +299,7 @@ e_table_sort_info_sorting_truncate (ETableSortInfo *info, int length) * Returns: the description of the @n-th grouping criteria in the @info object. */ ETableSortColumn -e_table_sort_info_sorting_get_nth (ETableSortInfo *info, int n) +e_table_sort_info_sorting_get_nth (ETableSortInfo *info, gint n) { if (n < info->sort_count) { return info->sortings[n]; @@ -319,7 +319,7 @@ e_table_sort_info_sorting_get_nth (ETableSortInfo *info, int n) * column number and whether it is ascending or descending). */ void -e_table_sort_info_sorting_set_nth (ETableSortInfo *info, int n, ETableSortColumn column) +e_table_sort_info_sorting_set_nth (ETableSortInfo *info, gint n, ETableSortColumn column) { if (n >= info->sort_count) { e_table_sort_info_sorting_real_truncate(info, n + 1); @@ -358,22 +358,22 @@ e_table_sort_info_load_from_node (ETableSortInfo *info, xmlNode *node, gdouble state_version) { - int i; + gint i; xmlNode *grouping; if (state_version <= 0.05) { i = 0; - for (grouping = node->xmlChildrenNode; grouping && !strcmp ((char *)grouping->name, "group"); grouping = grouping->xmlChildrenNode) { + for (grouping = node->xmlChildrenNode; grouping && !strcmp ((gchar *)grouping->name, "group"); grouping = grouping->xmlChildrenNode) { ETableSortColumn column; - column.column = e_xml_get_integer_prop_by_name (grouping, (const unsigned char *)"column"); - column.ascending = e_xml_get_bool_prop_by_name (grouping, (const unsigned char *)"ascending"); + column.column = e_xml_get_integer_prop_by_name (grouping, (const guchar *)"column"); + column.ascending = e_xml_get_bool_prop_by_name (grouping, (const guchar *)"ascending"); e_table_sort_info_grouping_set_nth(info, i++, column); } i = 0; - for (; grouping && !strcmp ((char *)grouping->name, "leaf"); grouping = grouping->xmlChildrenNode) { + for (; grouping && !strcmp ((gchar *)grouping->name, "leaf"); grouping = grouping->xmlChildrenNode) { ETableSortColumn column; - column.column = e_xml_get_integer_prop_by_name (grouping, (const unsigned char *)"column"); - column.ascending = e_xml_get_bool_prop_by_name (grouping, (const unsigned char *)"ascending"); + column.column = e_xml_get_integer_prop_by_name (grouping, (const guchar *)"column"); + column.ascending = e_xml_get_bool_prop_by_name (grouping, (const guchar *)"ascending"); e_table_sort_info_sorting_set_nth(info, i++, column); } } else { @@ -385,13 +385,13 @@ e_table_sort_info_load_from_node (ETableSortInfo *info, if (grouping->type != XML_ELEMENT_NODE) continue; - if (!strcmp ((char *)grouping->name, "group")) { - column.column = e_xml_get_integer_prop_by_name (grouping, (const unsigned char *)"column"); - column.ascending = e_xml_get_bool_prop_by_name (grouping, (const unsigned char *)"ascending"); + if (!strcmp ((gchar *)grouping->name, "group")) { + column.column = e_xml_get_integer_prop_by_name (grouping, (const guchar *)"column"); + column.ascending = e_xml_get_bool_prop_by_name (grouping, (const guchar *)"ascending"); e_table_sort_info_grouping_set_nth(info, gcnt++, column); - } else if (!strcmp ((char *)grouping->name, "leaf")) { - column.column = e_xml_get_integer_prop_by_name (grouping, (const unsigned char *)"column"); - column.ascending = e_xml_get_bool_prop_by_name (grouping, (const unsigned char *)"ascending"); + } else if (!strcmp ((gchar *)grouping->name, "leaf")) { + column.column = e_xml_get_integer_prop_by_name (grouping, (const guchar *)"column"); + column.ascending = e_xml_get_bool_prop_by_name (grouping, (const guchar *)"ascending"); e_table_sort_info_sorting_set_nth(info, scnt++, column); } } @@ -414,26 +414,26 @@ e_table_sort_info_save_to_node (ETableSortInfo *info, xmlNode *parent) { xmlNode *grouping; - int i; - const int sort_count = e_table_sort_info_sorting_get_count (info); - const int group_count = e_table_sort_info_grouping_get_count (info); + gint i; + const gint sort_count = e_table_sort_info_sorting_get_count (info); + const gint group_count = e_table_sort_info_grouping_get_count (info); - grouping = xmlNewChild (parent, NULL, (const unsigned char *)"grouping", NULL); + grouping = xmlNewChild (parent, NULL, (const guchar *)"grouping", NULL); for (i = 0; i < group_count; i++) { ETableSortColumn column = e_table_sort_info_grouping_get_nth(info, i); - xmlNode *new_node = xmlNewChild(grouping, NULL, (const unsigned char *)"group", NULL); + xmlNode *new_node = xmlNewChild(grouping, NULL, (const guchar *)"group", NULL); - e_xml_set_integer_prop_by_name (new_node, (const unsigned char *)"column", column.column); - e_xml_set_bool_prop_by_name (new_node, (const unsigned char *)"ascending", column.ascending); + e_xml_set_integer_prop_by_name (new_node, (const guchar *)"column", column.column); + e_xml_set_bool_prop_by_name (new_node, (const guchar *)"ascending", column.ascending); } for (i = 0; i < sort_count; i++) { ETableSortColumn column = e_table_sort_info_sorting_get_nth(info, i); - xmlNode *new_node = xmlNewChild(grouping, NULL, (const unsigned char *)"leaf", NULL); + xmlNode *new_node = xmlNewChild(grouping, NULL, (const guchar *)"leaf", NULL); - e_xml_set_integer_prop_by_name (new_node, (const unsigned char *)"column", column.column); - e_xml_set_bool_prop_by_name (new_node, (const unsigned char *)"ascending", column.ascending); + e_xml_set_integer_prop_by_name (new_node, (const guchar *)"column", column.column); + e_xml_set_bool_prop_by_name (new_node, (const guchar *)"ascending", column.ascending); } return grouping; diff --git a/widgets/table/e-table-sort-info.h b/widgets/table/e-table-sort-info.h index 4a0dde4d88..d9ffec9be2 100644 --- a/widgets/table/e-table-sort-info.h +++ b/widgets/table/e-table-sort-info.h @@ -74,20 +74,20 @@ void e_table_sort_info_thaw (ETableSortInfo *info) guint e_table_sort_info_grouping_get_count (ETableSortInfo *info); void e_table_sort_info_grouping_truncate (ETableSortInfo *info, - int length); + gint length); ETableSortColumn e_table_sort_info_grouping_get_nth (ETableSortInfo *info, - int n); + gint n); void e_table_sort_info_grouping_set_nth (ETableSortInfo *info, - int n, + gint n, ETableSortColumn column); guint e_table_sort_info_sorting_get_count (ETableSortInfo *info); void e_table_sort_info_sorting_truncate (ETableSortInfo *info, - int length); + gint length); ETableSortColumn e_table_sort_info_sorting_get_nth (ETableSortInfo *info, - int n); + gint n); void e_table_sort_info_sorting_set_nth (ETableSortInfo *info, - int n, + gint n, ETableSortColumn column); ETableSortInfo *e_table_sort_info_new (void); diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c index 02a2e8bf26..82b2d5b37d 100644 --- a/widgets/table/e-table-sorted-variable.c +++ b/widgets/table/e-table-sorted-variable.c @@ -127,7 +127,7 @@ etsv_add (ETableSubsetVariable *etssv, ETableModel *etm = E_TABLE_MODEL(etssv); ETableSubset *etss = E_TABLE_SUBSET(etssv); ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (etssv); - int i; + gint i; e_table_model_pre_change (etm); @@ -164,8 +164,8 @@ etsv_add_all (ETableSubsetVariable *etssv) ETableModel *etm = E_TABLE_MODEL(etssv); ETableSubset *etss = E_TABLE_SUBSET(etssv); ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (etssv); - int rows; - int i; + gint rows; + gint i; e_table_model_pre_change(etm); @@ -217,7 +217,7 @@ static void etsv_sort(ETableSortedVariable *etsv) { ETableSubset *etss = E_TABLE_SUBSET(etsv); - static int reentering = 0; + static gint reentering = 0; if (reentering) return; reentering = 1; diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h index 53744dce72..48bb0e3aa0 100644 --- a/widgets/table/e-table-sorted-variable.h +++ b/widgets/table/e-table-sorted-variable.h @@ -46,8 +46,8 @@ typedef struct { ETableHeader *full_header; - int sort_info_changed_id; - int sort_idle_id; + gint sort_info_changed_id; + gint sort_idle_id; int insert_idle_id; int insert_count; diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c index 076863adfb..7eceeb875f 100644 --- a/widgets/table/e-table-sorted.c +++ b/widgets/table/e-table-sorted.c @@ -44,10 +44,10 @@ G_DEFINE_TYPE (ETableSorted, ets, E_TABLE_SUBSET_TYPE) static void ets_sort_info_changed (ETableSortInfo *info, ETableSorted *ets); static void ets_sort (ETableSorted *ets); static void ets_proxy_model_changed (ETableSubset *etss, ETableModel *source); -static void ets_proxy_model_row_changed (ETableSubset *etss, ETableModel *source, int row); -static void ets_proxy_model_cell_changed (ETableSubset *etss, ETableModel *source, int col, int row); -static void ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, int row, int count); -static void ets_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *source, int row, int count); +static void ets_proxy_model_row_changed (ETableSubset *etss, ETableModel *source, gint row); +static void ets_proxy_model_cell_changed (ETableSubset *etss, ETableModel *source, gint col, gint row); +static void ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row, gint count); +static void ets_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *source, gint row, gint count); static void ets_dispose (GObject *object) @@ -158,7 +158,7 @@ ets_sort_info_changed (ETableSortInfo *info, ETableSorted *ets) static void ets_proxy_model_changed (ETableSubset *subset, ETableModel *source) { - int rows, i; + gint rows, i; rows = e_table_model_row_count(source); @@ -177,7 +177,7 @@ ets_proxy_model_changed (ETableSubset *subset, ETableModel *source) } static void -ets_proxy_model_row_changed (ETableSubset *subset, ETableModel *source, int row) +ets_proxy_model_row_changed (ETableSubset *subset, ETableModel *source, gint row) { if (!E_TABLE_SORTED(subset)->sort_idle_id) E_TABLE_SORTED(subset)->sort_idle_id = g_idle_add_full(50, (GSourceFunc) ets_sort_idle, subset, NULL); @@ -187,7 +187,7 @@ ets_proxy_model_row_changed (ETableSubset *subset, ETableModel *source, int row) } static void -ets_proxy_model_cell_changed (ETableSubset *subset, ETableModel *source, int col, int row) +ets_proxy_model_cell_changed (ETableSubset *subset, ETableModel *source, gint col, gint row) { ETableSorted *ets = E_TABLE_SORTED(subset); if (e_table_sorting_utils_affects_sort(ets->sort_info, ets->full_header, col)) @@ -197,11 +197,11 @@ ets_proxy_model_cell_changed (ETableSubset *subset, ETableModel *source, int col } static void -ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, int row, int count) +ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row, gint count) { ETableModel *etm = E_TABLE_MODEL(etss); ETableSorted *ets = E_TABLE_SORTED(etss); - int i; + gint i; gboolean full_change = FALSE; if (count == 0) { @@ -257,12 +257,12 @@ ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, int row, } static void -ets_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *source, int row, int count) +ets_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *source, gint row, gint count) { ETableModel *etm = E_TABLE_MODEL(etss); - int i; + gint i; gboolean shift; - int j; + gint j; shift = row == etss->n_map - count; @@ -297,7 +297,7 @@ static void ets_sort(ETableSorted *ets) { ETableSubset *etss = E_TABLE_SUBSET(ets); - static int reentering = 0; + static gint reentering = 0; if (reentering) return; reentering = 1; diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h index 031d9c9647..cb802768d8 100644 --- a/widgets/table/e-table-sorted.h +++ b/widgets/table/e-table-sorted.h @@ -46,8 +46,8 @@ typedef struct { ETableHeader *full_header; - int sort_info_changed_id; - int sort_idle_id; + gint sort_info_changed_id; + gint sort_idle_id; int insert_idle_id; int insert_count; diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c index 154d5a2581..8851f31209 100644 --- a/widgets/table/e-table-sorter.c +++ b/widgets/table/e-table-sorter.c @@ -45,19 +45,19 @@ G_DEFINE_TYPE (ETableSorter, ets, E_SORTER_TYPE) #define INCREMENT_AMOUNT 100 static void ets_model_changed (ETableModel *etm, ETableSorter *ets); -static void ets_model_row_changed (ETableModel *etm, int row, ETableSorter *ets); -static void ets_model_cell_changed (ETableModel *etm, int col, int row, ETableSorter *ets); -static void ets_model_rows_inserted (ETableModel *etm, int row, int count, ETableSorter *ets); -static void ets_model_rows_deleted (ETableModel *etm, int row, int count, ETableSorter *ets); +static void ets_model_row_changed (ETableModel *etm, gint row, ETableSorter *ets); +static void ets_model_cell_changed (ETableModel *etm, gint col, gint row, ETableSorter *ets); +static void ets_model_rows_inserted (ETableModel *etm, gint row, gint count, ETableSorter *ets); +static void ets_model_rows_deleted (ETableModel *etm, gint row, gint count, ETableSorter *ets); static void ets_sort_info_changed (ETableSortInfo *info, ETableSorter *ets); static void ets_clean (ETableSorter *ets); static void ets_sort (ETableSorter *ets); static void ets_backsort (ETableSorter *ets); -static gint ets_model_to_sorted (ESorter *sorter, int row); -static gint ets_sorted_to_model (ESorter *sorter, int row); -static void ets_get_model_to_sorted_array (ESorter *sorter, int **array, int *count); -static void ets_get_sorted_to_model_array (ESorter *sorter, int **array, int *count); +static gint ets_model_to_sorted (ESorter *sorter, gint row); +static gint ets_sorted_to_model (ESorter *sorter, gint row); +static void ets_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count); +static void ets_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count); static gboolean ets_needs_sorting (ESorter *ets); static void @@ -230,25 +230,25 @@ ets_model_changed (ETableModel *etm, ETableSorter *ets) } static void -ets_model_row_changed (ETableModel *etm, int row, ETableSorter *ets) +ets_model_row_changed (ETableModel *etm, gint row, ETableSorter *ets) { ets_clean(ets); } static void -ets_model_cell_changed (ETableModel *etm, int col, int row, ETableSorter *ets) +ets_model_cell_changed (ETableModel *etm, gint col, gint row, ETableSorter *ets) { ets_clean(ets); } static void -ets_model_rows_inserted (ETableModel *etm, int row, int count, ETableSorter *ets) +ets_model_rows_inserted (ETableModel *etm, gint row, gint count, ETableSorter *ets) { ets_clean(ets); } static void -ets_model_rows_deleted (ETableModel *etm, int row, int count, ETableSorter *ets) +ets_model_rows_deleted (ETableModel *etm, gint row, gint count, ETableSorter *ets) { ets_clean(ets); } @@ -261,22 +261,22 @@ ets_sort_info_changed (ETableSortInfo *info, ETableSorter *ets) } static ETableSorter *ets_closure; -static void **vals_closure; -static int cols_closure; -static int *ascending_closure; +static gpointer *vals_closure; +static gint cols_closure; +static gint *ascending_closure; static GCompareFunc *compare_closure; /* FIXME: Make it not cache the second and later columns (as if anyone cares.) */ static int -qsort_callback(const void *data1, const void *data2) +qsort_callback(gconstpointer data1, gconstpointer data2) { - gint row1 = *(int *)data1; - gint row2 = *(int *)data2; - int j; - int sort_count = e_table_sort_info_sorting_get_count(ets_closure->sort_info) + e_table_sort_info_grouping_get_count(ets_closure->sort_info); - int comp_val = 0; - int ascending = 1; + gint row1 = *(gint *)data1; + gint row2 = *(gint *)data2; + gint j; + gint sort_count = e_table_sort_info_sorting_get_count(ets_closure->sort_info) + e_table_sort_info_grouping_get_count(ets_closure->sort_info); + gint comp_val = 0; + gint ascending = 1; for (j = 0; j < sort_count; j++) { comp_val = (*(compare_closure[j]))(vals_closure[cols_closure * row1 + j], vals_closure[cols_closure * row2 + j]); ascending = ascending_closure[j]; @@ -310,11 +310,11 @@ ets_clean(ETableSorter *ets) static void ets_sort(ETableSorter *ets) { - int rows; - int i; - int j; - int cols; - int group_cols; + gint rows; + gint i; + gint j; + gint cols; + gint group_cols; if (ets->sorted) return; @@ -330,7 +330,7 @@ ets_sort(ETableSorter *ets) cols_closure = cols; ets_closure = ets; - vals_closure = g_new(void *, rows * cols); + vals_closure = g_new(gpointer , rows * cols); ascending_closure = g_new(int, cols); compare_closure = g_new(GCompareFunc, cols); @@ -365,7 +365,7 @@ ets_sort(ETableSorter *ets) static void ets_backsort(ETableSorter *ets) { - int i, rows; + gint i, rows; if (ets->backsorted) return; @@ -382,10 +382,10 @@ ets_backsort(ETableSorter *ets) static gint -ets_model_to_sorted (ESorter *es, int row) +ets_model_to_sorted (ESorter *es, gint row) { ETableSorter *ets = E_TABLE_SORTER(es); - int rows = e_table_model_row_count(ets->source); + gint rows = e_table_model_row_count(ets->source); g_return_val_if_fail(row >= 0, -1); g_return_val_if_fail(row < rows, -1); @@ -400,10 +400,10 @@ ets_model_to_sorted (ESorter *es, int row) } static gint -ets_sorted_to_model (ESorter *es, int row) +ets_sorted_to_model (ESorter *es, gint row) { ETableSorter *ets = E_TABLE_SORTER(es); - int rows = e_table_model_row_count(ets->source); + gint rows = e_table_model_row_count(ets->source); g_return_val_if_fail(row >= 0, -1); g_return_val_if_fail(row < rows, -1); @@ -418,7 +418,7 @@ ets_sorted_to_model (ESorter *es, int row) } static void -ets_get_model_to_sorted_array (ESorter *es, int **array, int *count) +ets_get_model_to_sorted_array (ESorter *es, gint **array, gint *count) { ETableSorter *ets = E_TABLE_SORTER(es); if (array || count) { @@ -432,7 +432,7 @@ ets_get_model_to_sorted_array (ESorter *es, int **array, int *count) } static void -ets_get_sorted_to_model_array (ESorter *es, int **array, int *count) +ets_get_sorted_to_model_array (ESorter *es, gint **array, gint *count) { ETableSorter *ets = E_TABLE_SORTER(es); if (array || count) { diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h index 245539e36f..067da103f9 100644 --- a/widgets/table/e-table-sorter.h +++ b/widgets/table/e-table-sorter.h @@ -46,18 +46,18 @@ typedef struct { ETableSortInfo *sort_info; /* If needs_sorting is 0, then model_to_sorted and sorted_to_model are no-ops. */ - int needs_sorting; + gint needs_sorting; - int *sorted; - int *backsorted; + gint *sorted; + gint *backsorted; - int table_model_changed_id; - int table_model_row_changed_id; - int table_model_cell_changed_id; - int table_model_rows_inserted_id; - int table_model_rows_deleted_id; - int sort_info_changed_id; - int group_info_changed_id; + gint table_model_changed_id; + gint table_model_row_changed_id; + gint table_model_cell_changed_id; + gint table_model_rows_inserted_id; + gint table_model_rows_deleted_id; + gint sort_info_changed_id; + gint group_info_changed_id; } ETableSorter; typedef struct { diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c index d04144d5ad..a8ab92bf94 100644 --- a/widgets/table/e-table-sorting-utils.c +++ b/widgets/table/e-table-sorting-utils.c @@ -32,12 +32,12 @@ /* This takes source rows. */ static int -etsu_compare(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, int row1, int row2) +etsu_compare(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint row1, gint row2) { - int j; - int sort_count = e_table_sort_info_sorting_get_count(sort_info); - int comp_val = 0; - int ascending = 1; + gint j; + gint sort_count = e_table_sort_info_sorting_get_count(sort_info); + gint comp_val = 0; + gint ascending = 1; for (j = 0; j < sort_count; j++) { ETableSortColumn column = e_table_sort_info_sorting_get_nth(sort_info, j); @@ -63,9 +63,9 @@ etsu_compare(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_ } typedef struct { - int cols; - void **vals; - int *ascending; + gint cols; + gpointer *vals; + gint *ascending; GCompareFunc *compare; } ETableSortClosure; @@ -78,15 +78,15 @@ typedef struct { /* FIXME: Make it not cache the second and later columns (as if anyone cares.) */ static int -e_sort_callback(const void *data1, const void *data2, gpointer user_data) +e_sort_callback(gconstpointer data1, gconstpointer data2, gpointer user_data) { - gint row1 = *(int *)data1; - gint row2 = *(int *)data2; + gint row1 = *(gint *)data1; + gint row2 = *(gint *)data2; ETableSortClosure *closure = user_data; - int j; - int sort_count = closure->cols; - int comp_val = 0; - int ascending = 1; + gint j; + gint sort_count = closure->cols; + gint comp_val = 0; + gint ascending = 1; for (j = 0; j < sort_count; j++) { comp_val = (*(closure->compare[j]))(closure->vals[closure->cols * row1 + j], closure->vals[closure->cols * row2 + j]); ascending = closure->ascending[j]; @@ -105,12 +105,12 @@ e_sort_callback(const void *data1, const void *data2, gpointer user_data) } void -e_table_sorting_utils_sort(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, int *map_table, int rows) +e_table_sorting_utils_sort(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint *map_table, gint rows) { - int total_rows; - int i; - int j; - int cols; + gint total_rows; + gint i; + gint j; + gint cols; ETableSortClosure closure; g_return_if_fail(source != NULL); @@ -124,7 +124,7 @@ e_table_sorting_utils_sort(ETableModel *source, ETableSortInfo *sort_info, ETabl cols = e_table_sort_info_sorting_get_count(sort_info); closure.cols = cols; - closure.vals = g_new(void *, total_rows * cols); + closure.vals = g_new(gpointer , total_rows * cols); closure.ascending = g_new(int, cols); closure.compare = g_new(GCompareFunc, cols); @@ -152,10 +152,10 @@ e_table_sorting_utils_sort(ETableModel *source, ETableSortInfo *sort_info, ETabl gboolean e_table_sorting_utils_affects_sort (ETableSortInfo *sort_info, ETableHeader *full_header, - int col) + gint col) { - int j; - int cols; + gint j; + gint cols; g_return_val_if_fail(sort_info != NULL, TRUE); g_return_val_if_fail(E_IS_TABLE_SORT_INFO(sort_info), TRUE); @@ -178,10 +178,10 @@ e_table_sorting_utils_affects_sort (ETableSortInfo *sort_info, /* FIXME: This could be done in time log n instead of time n with a binary search. */ -int -e_table_sorting_utils_insert(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, int *map_table, int rows, int row) +gint +e_table_sorting_utils_insert(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint *map_table, gint rows, gint row) { - int i; + gint i; i = 0; /* handle insertions when we have a 'sort group' */ @@ -192,11 +192,11 @@ e_table_sorting_utils_insert(ETableModel *source, ETableSortInfo *sort_info, ETa } /* FIXME: This could be done in time log n instead of time n with a binary search. */ -int -e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, int *map_table, int rows, int view_row) +gint +e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint *map_table, gint rows, gint view_row) { - int i; - int row; + gint i; + gint row; i = view_row; row = map_table[i]; @@ -221,10 +221,10 @@ e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_ static int etsu_tree_compare(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath path1, ETreePath path2) { - int j; - int sort_count = e_table_sort_info_sorting_get_count(sort_info); - int comp_val = 0; - int ascending = 1; + gint j; + gint sort_count = e_table_sort_info_sorting_get_count(sort_info); + gint comp_val = 0; + gint ascending = 1; for (j = 0; j < sort_count; j++) { ETableSortColumn column = e_table_sort_info_sorting_get_nth(sort_info, j); @@ -244,7 +244,7 @@ etsu_tree_compare(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *f } static int -e_sort_tree_callback(const void *data1, const void *data2, gpointer user_data) +e_sort_tree_callback(gconstpointer data1, gconstpointer data2, gpointer user_data) { ETreePath *path1 = *(ETreePath *)data1; ETreePath *path2 = *(ETreePath *)data2; @@ -254,12 +254,12 @@ e_sort_tree_callback(const void *data1, const void *data2, gpointer user_data) } void -e_table_sorting_utils_tree_sort(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, int count) +e_table_sorting_utils_tree_sort(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, gint count) { ETableSortClosure closure; - int cols; - int i, j; - int *map; + gint cols; + gint i, j; + gint *map; ETreePath *map_copy; g_return_if_fail(source != NULL); g_return_if_fail(E_IS_TREE_MODEL(source)); @@ -271,7 +271,7 @@ e_table_sorting_utils_tree_sort(ETreeModel *source, ETableSortInfo *sort_info, E cols = e_table_sort_info_sorting_get_count(sort_info); closure.cols = cols; - closure.vals = g_new(void *, count * cols); + closure.vals = g_new(gpointer , count * cols); closure.ascending = g_new(int, cols); closure.compare = g_new(GCompareFunc, cols); @@ -315,10 +315,10 @@ e_table_sorting_utils_tree_sort(ETreeModel *source, ETableSortInfo *sort_info, E } /* FIXME: This could be done in time log n instead of time n with a binary search. */ -int -e_table_sorting_utils_tree_check_position (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, int count, int old_index) +gint +e_table_sorting_utils_tree_check_position (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, gint count, gint old_index) { - int i; + gint i; ETreePath path; i = old_index; @@ -337,8 +337,8 @@ e_table_sorting_utils_tree_check_position (ETreeModel *source, ETableSortInfo *s } /* FIXME: This does not pay attention to making sure that it's a stable insert. This needs to be fixed. */ -int -e_table_sorting_utils_tree_insert(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, int count, ETreePath path) +gint +e_table_sorting_utils_tree_insert(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, gint count, ETreePath path) { size_t start; size_t end; diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h index a0f43fb232..d348d4b6b1 100644 --- a/widgets/table/e-table-sorting-utils.h +++ b/widgets/table/e-table-sorting-utils.h @@ -31,27 +31,27 @@ G_BEGIN_DECLS #include gboolean e_table_sorting_utils_affects_sort (ETableSortInfo *sort_info, ETableHeader *full_header, - int col); + gint col); void e_table_sorting_utils_sort (ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, - int *map_table, - int rows); -int e_table_sorting_utils_insert (ETableModel *source, + gint *map_table, + gint rows); +gint e_table_sorting_utils_insert (ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, - int *map_table, - int rows, - int row); -int e_table_sorting_utils_check_position (ETableModel *source, + gint *map_table, + gint rows, + gint row); +gint e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, - int *map_table, - int rows, - int view_row); + gint *map_table, + gint rows, + gint view_row); @@ -59,18 +59,18 @@ void e_table_sorting_utils_tree_sort (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, - int count); -int e_table_sorting_utils_tree_check_position (ETreeModel *source, + gint count); +gint e_table_sorting_utils_tree_check_position (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, - int count, - int old_index); -int e_table_sorting_utils_tree_insert (ETreeModel *source, + gint count, + gint old_index); +gint e_table_sorting_utils_tree_insert (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, - int count, + gint count, ETreePath path); G_END_DECLS diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c index f966b3ca6f..fd57f5b130 100644 --- a/widgets/table/e-table-specification.c +++ b/widgets/table/e-table-specification.c @@ -45,7 +45,7 @@ static void etsp_finalize (GObject *object) { ETableSpecification *etsp = E_TABLE_SPECIFICATION (object); - int i; + gint i; if (etsp->columns) { for (i = 0; etsp->columns[i]; i++) { @@ -128,7 +128,7 @@ e_table_specification_new (void) */ gboolean e_table_specification_load_from_file (ETableSpecification *specification, - const char *filename) + const gchar *filename) { xmlDoc *doc; @@ -155,10 +155,10 @@ e_table_specification_load_from_file (ETableSpecification *specification, */ gboolean e_table_specification_load_from_string (ETableSpecification *specification, - const char *xml) + const gchar *xml) { xmlDoc *doc; - doc = xmlParseMemory ( (char *) xml, strlen (xml)); + doc = xmlParseMemory ( (gchar *) xml, strlen (xml)); if (doc) { xmlNode *node = xmlDocGetRootElement (doc); e_table_specification_load_from_node (specification, node); @@ -181,29 +181,29 @@ void e_table_specification_load_from_node (ETableSpecification *specification, const xmlNode *node) { - char *temp; + gchar *temp; xmlNode *children; GList *list = NULL, *list2; - int i; - - specification->no_headers = e_xml_get_bool_prop_by_name (node, (const unsigned char *)"no-headers"); - specification->click_to_add = e_xml_get_bool_prop_by_name (node, (const unsigned char *)"click-to-add"); - specification->click_to_add_end = e_xml_get_bool_prop_by_name (node, (const unsigned char *)"click-to-add-end") && specification->click_to_add; - specification->alternating_row_colors = e_xml_get_bool_prop_by_name_with_default (node, (const unsigned char *)"alternating-row-colors", TRUE); - specification->horizontal_draw_grid = e_xml_get_bool_prop_by_name (node, (const unsigned char *)"horizontal-draw-grid"); - specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, (const unsigned char *)"vertical-draw-grid"); - if (e_xml_get_bool_prop_by_name_with_default(node, (const unsigned char *)"draw-grid", TRUE) == - e_xml_get_bool_prop_by_name_with_default(node, (const unsigned char *)"draw-grid", FALSE)) { + gint i; + + specification->no_headers = e_xml_get_bool_prop_by_name (node, (const guchar *)"no-headers"); + specification->click_to_add = e_xml_get_bool_prop_by_name (node, (const guchar *)"click-to-add"); + specification->click_to_add_end = e_xml_get_bool_prop_by_name (node, (const guchar *)"click-to-add-end") && specification->click_to_add; + specification->alternating_row_colors = e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"alternating-row-colors", TRUE); + specification->horizontal_draw_grid = e_xml_get_bool_prop_by_name (node, (const guchar *)"horizontal-draw-grid"); + specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, (const guchar *)"vertical-draw-grid"); + if (e_xml_get_bool_prop_by_name_with_default(node, (const guchar *)"draw-grid", TRUE) == + e_xml_get_bool_prop_by_name_with_default(node, (const guchar *)"draw-grid", FALSE)) { specification->horizontal_draw_grid = - specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, (const unsigned char *)"draw-grid"); + specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, (const guchar *)"draw-grid"); } - specification->draw_focus = e_xml_get_bool_prop_by_name_with_default (node, (const unsigned char *)"draw-focus", TRUE); - specification->horizontal_scrolling = e_xml_get_bool_prop_by_name_with_default (node, (const unsigned char *)"horizontal-scrolling", FALSE); - specification->horizontal_resize = e_xml_get_bool_prop_by_name_with_default (node, (const unsigned char *)"horizontal-resize", FALSE); - specification->allow_grouping = e_xml_get_bool_prop_by_name_with_default (node, (const unsigned char *)"allow-grouping", TRUE); + specification->draw_focus = e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"draw-focus", TRUE); + specification->horizontal_scrolling = e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"horizontal-scrolling", FALSE); + specification->horizontal_resize = e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"horizontal-resize", FALSE); + specification->allow_grouping = e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"allow-grouping", TRUE); specification->selection_mode = GTK_SELECTION_MULTIPLE; - temp = e_xml_get_string_prop_by_name (node, (const unsigned char *)"selection-mode"); + temp = e_xml_get_string_prop_by_name (node, (const guchar *)"selection-mode"); if (temp && !g_ascii_strcasecmp (temp, "single")) { specification->selection_mode = GTK_SELECTION_SINGLE; } else if (temp && !g_ascii_strcasecmp (temp, "browse")) { @@ -214,7 +214,7 @@ e_table_specification_load_from_node (ETableSpecification *specification, g_free (temp); specification->cursor_mode = E_CURSOR_SIMPLE; - temp = e_xml_get_string_prop_by_name (node, (const unsigned char *)"cursor-mode"); + temp = e_xml_get_string_prop_by_name (node, (const guchar *)"cursor-mode"); if (temp && !g_ascii_strcasecmp (temp, "line")) { specification->cursor_mode = E_CURSOR_LINE; } else if (temp && !g_ascii_strcasecmp (temp, "spreadsheet")) { @@ -225,12 +225,12 @@ e_table_specification_load_from_node (ETableSpecification *specification, g_free (specification->click_to_add_message); specification->click_to_add_message = e_xml_get_string_prop_by_name ( - node, (const unsigned char *)"_click-to-add-message"); + node, (const guchar *)"_click-to-add-message"); g_free (specification->domain); specification->domain = e_xml_get_string_prop_by_name ( - node, (const unsigned char *)"gettext-domain"); + node, (const guchar *)"gettext-domain"); if (specification->domain && !*specification->domain) { g_free (specification->domain); specification->domain = NULL; @@ -248,12 +248,12 @@ e_table_specification_load_from_node (ETableSpecification *specification, specification->columns = NULL; for (children = node->xmlChildrenNode; children; children = children->next) { - if (!strcmp ((char *)children->name, "ETableColumn")) { + if (!strcmp ((gchar *)children->name, "ETableColumn")) { ETableColumnSpecification *col_spec = e_table_column_specification_new (); e_table_column_specification_load_from_node (col_spec, children); list = g_list_append (list, col_spec); - } else if (specification->state == NULL && !strcmp ((char *)children->name, "ETableState")) { + } else if (specification->state == NULL && !strcmp ((gchar *)children->name, "ETableState")) { specification->state = e_table_state_new (); e_table_state_load_from_node (specification->state, children); e_table_sort_info_set_can_group (specification->state->sort_info, specification->allow_grouping); @@ -282,18 +282,18 @@ e_table_specification_load_from_node (ETableSpecification *specification, * * Returns: 0 on success or -1 on error. */ -int +gint e_table_specification_save_to_file (ETableSpecification *specification, - const char *filename) + const gchar *filename) { xmlDoc *doc; - int ret; + gint ret; g_return_val_if_fail (specification != NULL, -1); g_return_val_if_fail (filename != NULL, -1); g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (specification), -1); - if ((doc = xmlNewDoc ((const unsigned char *)"1.0")) == NULL) + if ((doc = xmlNewDoc ((const guchar *)"1.0")) == NULL) return -1; xmlDocSetRootElement (doc, e_table_specification_save_to_node (specification, doc)); @@ -315,18 +315,18 @@ e_table_specification_save_to_file (ETableSpecification *specification, * representation of @specification. This stringified representation * uses XML as a convenience. */ -char * +gchar * e_table_specification_save_to_string (ETableSpecification *specification) { - char *ret_val; + gchar *ret_val; xmlChar *string; - int length; + gint length; xmlDoc *doc; g_return_val_if_fail (specification != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (specification), NULL); - doc = xmlNewDoc ((const unsigned char *)"1.0"); + doc = xmlNewDoc ((const guchar *)"1.0"); xmlDocSetRootElement (doc, e_table_specification_save_to_node (specification, doc)); xmlDocDumpMemory (doc, &string, &length); @@ -357,17 +357,17 @@ e_table_specification_save_to_node (ETableSpecification *specification, g_return_val_if_fail (specification != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (specification), NULL); - node = xmlNewNode (NULL, (const unsigned char *)"ETableSpecification"); - e_xml_set_bool_prop_by_name (node, (const unsigned char *)"no-headers", specification->no_headers); - e_xml_set_bool_prop_by_name (node, (const unsigned char *)"click-to-add", specification->click_to_add); - e_xml_set_bool_prop_by_name (node, (const unsigned char *)"click-to-add-end", specification->click_to_add_end && specification->click_to_add); - e_xml_set_bool_prop_by_name (node, (const unsigned char *)"alternating-row-colors", specification->alternating_row_colors); - e_xml_set_bool_prop_by_name (node, (const unsigned char *)"horizontal-draw-grid", specification->horizontal_draw_grid); - e_xml_set_bool_prop_by_name (node, (const unsigned char *)"vertical-draw-grid", specification->vertical_draw_grid); - e_xml_set_bool_prop_by_name (node, (const unsigned char *)"draw-focus", specification->draw_focus); - e_xml_set_bool_prop_by_name (node, (const unsigned char *)"horizontal-scrolling", specification->horizontal_scrolling); - e_xml_set_bool_prop_by_name (node, (const unsigned char *)"horizontal-resize", specification->horizontal_resize); - e_xml_set_bool_prop_by_name (node, (const unsigned char *)"allow-grouping", specification->allow_grouping); + node = xmlNewNode (NULL, (const guchar *)"ETableSpecification"); + e_xml_set_bool_prop_by_name (node, (const guchar *)"no-headers", specification->no_headers); + e_xml_set_bool_prop_by_name (node, (const guchar *)"click-to-add", specification->click_to_add); + e_xml_set_bool_prop_by_name (node, (const guchar *)"click-to-add-end", specification->click_to_add_end && specification->click_to_add); + e_xml_set_bool_prop_by_name (node, (const guchar *)"alternating-row-colors", specification->alternating_row_colors); + e_xml_set_bool_prop_by_name (node, (const guchar *)"horizontal-draw-grid", specification->horizontal_draw_grid); + e_xml_set_bool_prop_by_name (node, (const guchar *)"vertical-draw-grid", specification->vertical_draw_grid); + e_xml_set_bool_prop_by_name (node, (const guchar *)"draw-focus", specification->draw_focus); + e_xml_set_bool_prop_by_name (node, (const guchar *)"horizontal-scrolling", specification->horizontal_scrolling); + e_xml_set_bool_prop_by_name (node, (const guchar *)"horizontal-resize", specification->horizontal_resize); + e_xml_set_bool_prop_by_name (node, (const guchar *)"allow-grouping", specification->allow_grouping); switch (specification->selection_mode){ case GTK_SELECTION_SINGLE: @@ -380,18 +380,18 @@ e_table_specification_save_to_node (ETableSpecification *specification, case GTK_SELECTION_EXTENDED: s = "extended"; } - xmlSetProp (node, (const unsigned char *)"selection-mode", (unsigned char *)s); + xmlSetProp (node, (const guchar *)"selection-mode", (guchar *)s); if (specification->cursor_mode == E_CURSOR_LINE) s = "line"; else s = "cell"; - xmlSetProp (node, (const unsigned char *)"cursor-mode", (unsigned char *)s); + xmlSetProp (node, (const guchar *)"cursor-mode", (guchar *)s); - xmlSetProp (node, (const unsigned char *)"_click-to-add-message", (unsigned char *)specification->click_to_add_message); - xmlSetProp (node, (const unsigned char *)"gettext-domain", (unsigned char *)specification->domain); + xmlSetProp (node, (const guchar *)"_click-to-add-message", (guchar *)specification->click_to_add_message); + xmlSetProp (node, (const guchar *)"gettext-domain", (guchar *)specification->domain); if (specification->columns){ - int i; + gint i; for (i = 0; specification->columns [i]; i++) e_table_column_specification_save_to_node ( @@ -417,7 +417,7 @@ ETableSpecification * e_table_specification_duplicate (ETableSpecification *spec) { ETableSpecification *new_spec; - char *spec_str; + gchar *spec_str; g_return_val_if_fail (spec != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_SPECIFICATION (spec), NULL); diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h index 580cbc6ba3..c2ca7a018d 100644 --- a/widgets/table/e-table-specification.h +++ b/widgets/table/e-table-specification.h @@ -59,8 +59,8 @@ typedef struct { GtkSelectionMode selection_mode; ECursorMode cursor_mode; - char *click_to_add_message; - char *domain; + gchar *click_to_add_message; + gchar *domain; } ETableSpecification; typedef struct { @@ -71,15 +71,15 @@ GType e_table_specification_get_type (void); ETableSpecification *e_table_specification_new (void); gboolean e_table_specification_load_from_file (ETableSpecification *specification, - const char *filename); + const gchar *filename); gboolean e_table_specification_load_from_string (ETableSpecification *specification, - const char *xml); + const gchar *xml); void e_table_specification_load_from_node (ETableSpecification *specification, const xmlNode *node); -int e_table_specification_save_to_file (ETableSpecification *specification, - const char *filename); -char *e_table_specification_save_to_string (ETableSpecification *specification); +gint e_table_specification_save_to_file (ETableSpecification *specification, + const gchar *filename); +gchar *e_table_specification_save_to_string (ETableSpecification *specification); xmlNode *e_table_specification_save_to_node (ETableSpecification *specification, xmlDoc *doc); ETableSpecification *e_table_specification_duplicate (ETableSpecification *spec); diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index e9440ecd55..6cbdcbacb9 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -94,10 +94,10 @@ e_table_state_new (void) } ETableState * -e_table_state_vanilla (int col_count) +e_table_state_vanilla (gint col_count) { GString *str; - int i; + gint i; ETableState *res; str = g_string_new ("\n"); @@ -115,7 +115,7 @@ e_table_state_vanilla (int col_count) gboolean e_table_state_load_from_file (ETableState *state, - const char *filename) + const gchar *filename) { xmlDoc *doc; @@ -131,11 +131,11 @@ e_table_state_load_from_file (ETableState *state, void e_table_state_load_from_string (ETableState *state, - const char *xml) + const gchar *xml) { xmlDoc *doc; - doc = xmlParseMemory ((char *) xml, strlen(xml)); + doc = xmlParseMemory ((gchar *) xml, strlen(xml)); if (doc) { xmlNode *node = xmlDocGetRootElement(doc); e_table_state_load_from_node(state, node); @@ -144,7 +144,7 @@ e_table_state_load_from_string (ETableState *state, } typedef struct { - int column; + gint column; double expansion; } int_and_double; @@ -155,10 +155,10 @@ e_table_state_load_from_node (ETableState *state, xmlNode *children; GList *list = NULL, *iterator; gdouble state_version; - int i; + gint i; state_version = e_xml_get_double_prop_by_name_with_default ( - node, (const unsigned char *)"state-version", STATE_VERSION); + node, (const guchar *)"state-version", STATE_VERSION); if (state->sort_info) g_object_unref (state->sort_info); @@ -166,18 +166,18 @@ e_table_state_load_from_node (ETableState *state, state->sort_info = NULL; children = node->xmlChildrenNode; for (; children; children = children->next) { - if (!strcmp ((char *)children->name, "column")) { + if (!strcmp ((gchar *)children->name, "column")) { int_and_double *column_info = g_new(int_and_double, 1); column_info->column = e_xml_get_integer_prop_by_name( - children, (const unsigned char *)"source"); + children, (const guchar *)"source"); column_info->expansion = e_xml_get_double_prop_by_name_with_default( - children, (const unsigned char *)"expansion", 1); + children, (const guchar *)"expansion", 1); list = g_list_append (list, column_info); } else if (state->sort_info == NULL && - !strcmp ((char *)children->name, "grouping")) { + !strcmp ((gchar *)children->name, "grouping")) { state->sort_info = e_table_sort_info_new(); e_table_sort_info_load_from_node( state->sort_info, children, state_version); @@ -205,11 +205,11 @@ e_table_state_load_from_node (ETableState *state, void e_table_state_save_to_file (ETableState *state, - const char *filename) + const gchar *filename) { xmlDoc *doc; - if ((doc = xmlNewDoc ((const unsigned char *)"1.0")) == NULL) + if ((doc = xmlNewDoc ((const guchar *)"1.0")) == NULL) return; xmlDocSetRootElement (doc, e_table_state_save_to_node (state, NULL)); @@ -219,15 +219,15 @@ e_table_state_save_to_file (ETableState *state, xmlFreeDoc (doc); } -char * +gchar * e_table_state_save_to_string (ETableState *state) { - char *ret_val; + gchar *ret_val; xmlChar *string; - int length; + gint length; xmlDoc *doc; - doc = xmlNewDoc((const unsigned char *)"1.0"); + doc = xmlNewDoc((const guchar *)"1.0"); xmlDocSetRootElement(doc, e_table_state_save_to_node(state, NULL)); xmlDocDumpMemory(doc, &string, &length); xmlFreeDoc(doc); @@ -241,25 +241,25 @@ xmlNode * e_table_state_save_to_node (ETableState *state, xmlNode *parent) { - int i; + gint i; xmlNode *node; if (parent) - node = xmlNewChild (parent, NULL, (const unsigned char *)"ETableState", NULL); + node = xmlNewChild (parent, NULL, (const guchar *)"ETableState", NULL); else - node = xmlNewNode (NULL, (const unsigned char *)"ETableState"); + node = xmlNewNode (NULL, (const guchar *)"ETableState"); - e_xml_set_double_prop_by_name(node, (const unsigned char *)"state-version", STATE_VERSION); + e_xml_set_double_prop_by_name(node, (const guchar *)"state-version", STATE_VERSION); for (i = 0; i < state->col_count; i++) { - int column = state->columns[i]; + gint column = state->columns[i]; double expansion = state->expansions[i]; xmlNode *new_node; - new_node = xmlNewChild(node, NULL, (const unsigned char *)"column", NULL); - e_xml_set_integer_prop_by_name (new_node, (const unsigned char *)"source", column); + new_node = xmlNewChild(node, NULL, (const guchar *)"column", NULL); + e_xml_set_integer_prop_by_name (new_node, (const guchar *)"source", column); if (expansion >= -1) - e_xml_set_double_prop_by_name(new_node, (const unsigned char *)"expansion", expansion); + e_xml_set_double_prop_by_name(new_node, (const guchar *)"expansion", expansion); } @@ -280,7 +280,7 @@ ETableState * e_table_state_duplicate (ETableState *state) { ETableState *new_state; - char *copy; + gchar *copy; g_return_val_if_fail (state != NULL, NULL); g_return_val_if_fail (E_IS_TABLE_STATE (state), NULL); diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h index 7a320c56ba..da3f11b93c 100644 --- a/widgets/table/e-table-state.h +++ b/widgets/table/e-table-state.h @@ -40,8 +40,8 @@ typedef struct { GObject base; ETableSortInfo *sort_info; - int col_count; - int *columns; + gint col_count; + gint *columns; double *expansions; } ETableState; @@ -52,18 +52,18 @@ typedef struct { GType e_table_state_get_type (void); ETableState *e_table_state_new (void); -ETableState *e_table_state_vanilla (int col_count); +ETableState *e_table_state_vanilla (gint col_count); gboolean e_table_state_load_from_file (ETableState *state, - const char *filename); + const gchar *filename); void e_table_state_load_from_string (ETableState *state, - const char *xml); + const gchar *xml); void e_table_state_load_from_node (ETableState *state, const xmlNode *node); void e_table_state_save_to_file (ETableState *state, - const char *filename); -char *e_table_state_save_to_string (ETableState *state); + const gchar *filename); +gchar *e_table_state_save_to_string (ETableState *state); xmlNode *e_table_state_save_to_node (ETableState *state, xmlNode *parent); ETableState *e_table_state_duplicate (ETableState *state); diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c index b088d8302a..93faeac0f8 100644 --- a/widgets/table/e-table-subset-variable.c +++ b/widgets/table/e-table-subset-variable.c @@ -63,7 +63,7 @@ etssv_add_array (ETableSubsetVariable *etssv, { ETableModel *etm = E_TABLE_MODEL(etssv); ETableSubset *etss = E_TABLE_SUBSET(etssv); - int i; + gint i; e_table_model_pre_change(etm); @@ -82,8 +82,8 @@ etssv_add_all (ETableSubsetVariable *etssv) { ETableModel *etm = E_TABLE_MODEL(etssv); ETableSubset *etss = E_TABLE_SUBSET(etssv); - int rows; - int i; + gint rows; + gint i; e_table_model_pre_change(etm); @@ -104,7 +104,7 @@ etssv_remove (ETableSubsetVariable *etssv, { ETableModel *etm = E_TABLE_MODEL(etssv); ETableSubset *etss = E_TABLE_SUBSET(etssv); - int i; + gint i; for (i = 0; i < etss->n_map; i++){ if (etss->map_table[i] == row) { @@ -213,7 +213,7 @@ e_table_subset_variable_clear (ETableSubsetVariable *etssv) e_table_model_pre_change (etm); etss->n_map = 0; g_free (etss->map_table); - etss->map_table = (int *)g_new (unsigned int, 1); + etss->map_table = (gint *)g_new (unsigned int, 1); etssv->n_vals_allocated = 1; e_table_model_changed (etm); @@ -224,7 +224,7 @@ e_table_subset_variable_increment (ETableSubsetVariable *etssv, gint position, gint amount) { - int i; + gint i; ETableSubset *etss = E_TABLE_SUBSET(etssv); for (i = 0; i < etss->n_map; i++) { if (etss->map_table[i] >= position) @@ -237,7 +237,7 @@ e_table_subset_variable_decrement (ETableSubsetVariable *etssv, gint position, gint amount) { - int i; + gint i; ETableSubset *etss = E_TABLE_SUBSET(etssv); for (i = 0; i < etss->n_map; i++) { if (etss->map_table[i] >= position) diff --git a/widgets/table/e-table-subset-variable.h b/widgets/table/e-table-subset-variable.h index 1aed0d3cb3..4654fb5d67 100644 --- a/widgets/table/e-table-subset-variable.h +++ b/widgets/table/e-table-subset-variable.h @@ -38,7 +38,7 @@ G_BEGIN_DECLS typedef struct { ETableSubset base; - int n_vals_allocated; + gint n_vals_allocated; } ETableSubsetVariable; typedef struct { diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c index 1cec532d03..bf137e0ef8 100644 --- a/widgets/table/e-table-subset.c +++ b/widgets/table/e-table-subset.c @@ -33,10 +33,10 @@ static void etss_proxy_model_pre_change_real (ETableSubset *etss, ETableModel *etm); static void etss_proxy_model_no_change_real (ETableSubset *etss, ETableModel *etm); static void etss_proxy_model_changed_real (ETableSubset *etss, ETableModel *etm); -static void etss_proxy_model_row_changed_real (ETableSubset *etss, ETableModel *etm, int row); -static void etss_proxy_model_cell_changed_real (ETableSubset *etss, ETableModel *etm, int col, int row); -static void etss_proxy_model_rows_inserted_real (ETableSubset *etss, ETableModel *etm, int row, int count); -static void etss_proxy_model_rows_deleted_real (ETableSubset *etss, ETableModel *etm, int row, int count); +static void etss_proxy_model_row_changed_real (ETableSubset *etss, ETableModel *etm, gint row); +static void etss_proxy_model_cell_changed_real (ETableSubset *etss, ETableModel *etm, gint col, gint row); +static void etss_proxy_model_rows_inserted_real (ETableSubset *etss, ETableModel *etm, gint row, gint count); +static void etss_proxy_model_rows_deleted_real (ETableSubset *etss, ETableModel *etm, gint row, gint count); #define d(x) @@ -50,15 +50,15 @@ G_DEFINE_TYPE (ETableSubset, etss, E_TABLE_MODEL_TYPE) #define MAP_ROW(etss, row) (row == -1 ? -1 : etss->map_table[row]) static gint -etss_get_view_row (ETableSubset *etss, int row) +etss_get_view_row (ETableSubset *etss, gint row) { - const int n = etss->n_map; - const int * const map_table = etss->map_table; - int i; + const gint n = etss->n_map; + const gint * const map_table = etss->map_table; + gint i; - int end = MIN(etss->n_map, etss->last_access + 10); - int start = MAX(0, etss->last_access - 10); - int initial = MAX (MIN (etss->last_access, end), start); + gint end = MIN(etss->n_map, etss->last_access + 10); + gint start = MAX(0, etss->last_access - 10); + gint initial = MAX (MIN (etss->last_access, end), start); for (i = initial; i < end; i++) { if (map_table [i] == row){ @@ -147,8 +147,8 @@ etss_row_count (ETableModel *etm) return etss->n_map; } -static void * -etss_value_at (ETableModel *etm, int col, int row) +static gpointer +etss_value_at (ETableModel *etm, gint col, gint row) { ETableSubset *etss = (ETableSubset *)etm; @@ -160,7 +160,7 @@ etss_value_at (ETableModel *etm, int col, int row) } static void -etss_set_value_at (ETableModel *etm, int col, int row, const void *val) +etss_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val) { ETableSubset *etss = (ETableSubset *)etm; @@ -172,7 +172,7 @@ etss_set_value_at (ETableModel *etm, int col, int row, const void *val) } static gboolean -etss_is_cell_editable (ETableModel *etm, int col, int row) +etss_is_cell_editable (ETableModel *etm, gint col, gint row) { ETableSubset *etss = (ETableSubset *)etm; @@ -187,8 +187,8 @@ etss_has_save_id (ETableModel *etm) return TRUE; } -static char * -etss_get_save_id (ETableModel *etm, int row) +static gchar * +etss_get_save_id (ETableModel *etm, gint row) { ETableSubset *etss = (ETableSubset *)etm; @@ -201,14 +201,14 @@ etss_get_save_id (ETableModel *etm, int row) } static void -etss_append_row (ETableModel *etm, ETableModel *source, int row) +etss_append_row (ETableModel *etm, ETableModel *source, gint row) { ETableSubset *etss = (ETableSubset *)etm; e_table_model_append_row (etss->source, source, row); } -static void * -etss_duplicate_value (ETableModel *etm, int col, const void *value) +static gpointer +etss_duplicate_value (ETableModel *etm, gint col, gconstpointer value) { ETableSubset *etss = (ETableSubset *)etm; @@ -216,15 +216,15 @@ etss_duplicate_value (ETableModel *etm, int col, const void *value) } static void -etss_free_value (ETableModel *etm, int col, void *value) +etss_free_value (ETableModel *etm, gint col, gpointer value) { ETableSubset *etss = (ETableSubset *)etm; e_table_model_free_value (etss->source, col, value); } -static void * -etss_initialize_value (ETableModel *etm, int col) +static gpointer +etss_initialize_value (ETableModel *etm, gint col) { ETableSubset *etss = (ETableSubset *)etm; @@ -232,15 +232,15 @@ etss_initialize_value (ETableModel *etm, int col) } static gboolean -etss_value_is_empty (ETableModel *etm, int col, const void *value) +etss_value_is_empty (ETableModel *etm, gint col, gconstpointer value) { ETableSubset *etss = (ETableSubset *)etm; return e_table_model_value_is_empty (etss->source, col, value); } -static char * -etss_value_to_string (ETableModel *etm, int col, const void *value) +static gchar * +etss_value_to_string (ETableModel *etm, gint col, gconstpointer value) { ETableSubset *etss = (ETableSubset *)etm; @@ -307,9 +307,9 @@ etss_proxy_model_changed_real (ETableSubset *etss, ETableModel *etm) } static void -etss_proxy_model_row_changed_real (ETableSubset *etss, ETableModel *etm, int row) +etss_proxy_model_row_changed_real (ETableSubset *etss, ETableModel *etm, gint row) { - int view_row = etss_get_view_row (etss, row); + gint view_row = etss_get_view_row (etss, row); if (view_row != -1) e_table_model_row_changed (E_TABLE_MODEL (etss), view_row); else @@ -317,9 +317,9 @@ etss_proxy_model_row_changed_real (ETableSubset *etss, ETableModel *etm, int row } static void -etss_proxy_model_cell_changed_real (ETableSubset *etss, ETableModel *etm, int col, int row) +etss_proxy_model_cell_changed_real (ETableSubset *etss, ETableModel *etm, gint col, gint row) { - int view_row = etss_get_view_row (etss, row); + gint view_row = etss_get_view_row (etss, row); if (view_row != -1) e_table_model_cell_changed (E_TABLE_MODEL (etss), col, view_row); else @@ -327,13 +327,13 @@ etss_proxy_model_cell_changed_real (ETableSubset *etss, ETableModel *etm, int co } static void -etss_proxy_model_rows_inserted_real (ETableSubset *etss, ETableModel *etm, int row, int count) +etss_proxy_model_rows_inserted_real (ETableSubset *etss, ETableModel *etm, gint row, gint count) { e_table_model_no_change (E_TABLE_MODEL (etss)); } static void -etss_proxy_model_rows_deleted_real (ETableSubset *etss, ETableModel *etm, int row, int count) +etss_proxy_model_rows_deleted_real (ETableSubset *etss, ETableModel *etm, gint row, gint count) { e_table_model_no_change (E_TABLE_MODEL (etss)); } @@ -360,46 +360,46 @@ etss_proxy_model_changed (ETableModel *etm, ETableSubset *etss) } static void -etss_proxy_model_row_changed (ETableModel *etm, int row, ETableSubset *etss) +etss_proxy_model_row_changed (ETableModel *etm, gint row, ETableSubset *etss) { if (ETSS_CLASS(etss)->proxy_model_row_changed) (ETSS_CLASS(etss)->proxy_model_row_changed) (etss, etm, row); } static void -etss_proxy_model_cell_changed (ETableModel *etm, int row, int col, ETableSubset *etss) +etss_proxy_model_cell_changed (ETableModel *etm, gint row, gint col, ETableSubset *etss) { if (ETSS_CLASS(etss)->proxy_model_cell_changed) (ETSS_CLASS(etss)->proxy_model_cell_changed) (etss, etm, col, row); } static void -etss_proxy_model_rows_inserted (ETableModel *etm, int row, int col, ETableSubset *etss) +etss_proxy_model_rows_inserted (ETableModel *etm, gint row, gint col, ETableSubset *etss) { if (ETSS_CLASS(etss)->proxy_model_rows_inserted) (ETSS_CLASS(etss)->proxy_model_rows_inserted) (etss, etm, row, col); } static void -etss_proxy_model_rows_deleted (ETableModel *etm, int row, int col, ETableSubset *etss) +etss_proxy_model_rows_deleted (ETableModel *etm, gint row, gint col, ETableSubset *etss) { if (ETSS_CLASS(etss)->proxy_model_rows_deleted) (ETSS_CLASS(etss)->proxy_model_rows_deleted) (etss, etm, row, col); } ETableModel * -e_table_subset_construct (ETableSubset *etss, ETableModel *source, int nvals) +e_table_subset_construct (ETableSubset *etss, ETableModel *source, gint nvals) { - unsigned int *buffer; - int i; + guint *buffer; + gint i; if (nvals) { - buffer = (unsigned int *) g_malloc (sizeof (unsigned int) * nvals); + buffer = (guint *) g_malloc (sizeof (unsigned int) * nvals); if (buffer == NULL) return NULL; } else buffer = NULL; - etss->map_table = (int *)buffer; + etss->map_table = (gint *)buffer; etss->n_map = nvals; etss->source = source; g_object_ref (source); @@ -427,7 +427,7 @@ e_table_subset_construct (ETableSubset *etss, ETableModel *source, int nvals) } ETableModel * -e_table_subset_new (ETableModel *source, const int nvals) +e_table_subset_new (ETableModel *source, const gint nvals) { ETableSubset *etss = g_object_new (E_TABLE_SUBSET_TYPE, NULL); @@ -439,11 +439,11 @@ e_table_subset_new (ETableModel *source, const int nvals) return (ETableModel *) etss; } -int +gint e_table_subset_model_to_view_row (ETableSubset *ets, - int model_row) + gint model_row) { - int i; + gint i; for (i = 0; i < ets->n_map; i++) { if (ets->map_table[i] == model_row) return i; @@ -451,9 +451,9 @@ e_table_subset_model_to_view_row (ETableSubset *ets, return -1; } -int +gint e_table_subset_view_to_model_row (ETableSubset *ets, - int view_row) + gint view_row) { if (view_row >= 0 && view_row < ets->n_map) return ets->map_table[view_row]; @@ -476,7 +476,7 @@ e_table_subset_get_toplevel (ETableSubset *table) void e_table_subset_print_debugging (ETableSubset *table_model) { - int i; + gint i; for (i = 0; i < table_model->n_map; i++) { g_print("%8d\n", table_model->map_table[i]); } diff --git a/widgets/table/e-table-subset.h b/widgets/table/e-table-subset.h index 83c9af4d99..dd345732e2 100644 --- a/widgets/table/e-table-subset.h +++ b/widgets/table/e-table-subset.h @@ -41,18 +41,18 @@ typedef struct { ETableModel base; ETableModel *source; - int n_map; - int *map_table; - - int last_access; - - int table_model_pre_change_id; - int table_model_no_change_id; - int table_model_changed_id; - int table_model_row_changed_id; - int table_model_cell_changed_id; - int table_model_rows_inserted_id; - int table_model_rows_deleted_id; + gint n_map; + gint *map_table; + + gint last_access; + + gint table_model_pre_change_id; + gint table_model_no_change_id; + gint table_model_changed_id; + gint table_model_row_changed_id; + gint table_model_cell_changed_id; + gint table_model_rows_inserted_id; + gint table_model_rows_deleted_id; } ETableSubset; typedef struct { @@ -61,23 +61,23 @@ typedef struct { void (*proxy_model_pre_change) (ETableSubset *etss, ETableModel *etm); void (*proxy_model_no_change) (ETableSubset *etss, ETableModel *etm); void (*proxy_model_changed) (ETableSubset *etss, ETableModel *etm); - void (*proxy_model_row_changed) (ETableSubset *etss, ETableModel *etm, int row); - void (*proxy_model_cell_changed) (ETableSubset *etss, ETableModel *etm, int col, int row); - void (*proxy_model_rows_inserted) (ETableSubset *etss, ETableModel *etm, int row, int count); - void (*proxy_model_rows_deleted) (ETableSubset *etss, ETableModel *etm, int row, int count); + void (*proxy_model_row_changed) (ETableSubset *etss, ETableModel *etm, gint row); + void (*proxy_model_cell_changed) (ETableSubset *etss, ETableModel *etm, gint col, gint row); + void (*proxy_model_rows_inserted) (ETableSubset *etss, ETableModel *etm, gint row, gint count); + void (*proxy_model_rows_deleted) (ETableSubset *etss, ETableModel *etm, gint row, gint count); } ETableSubsetClass; GType e_table_subset_get_type (void); ETableModel *e_table_subset_new (ETableModel *etm, - int n_vals); + gint n_vals); ETableModel *e_table_subset_construct (ETableSubset *ets, ETableModel *source, - int nvals); + gint nvals); -int e_table_subset_model_to_view_row (ETableSubset *ets, - int model_row); -int e_table_subset_view_to_model_row (ETableSubset *ets, - int view_row); +gint e_table_subset_model_to_view_row (ETableSubset *ets, + gint model_row); +gint e_table_subset_view_to_model_row (ETableSubset *ets, + gint view_row); ETableModel *e_table_subset_get_toplevel (ETableSubset *table_model); diff --git a/widgets/table/e-table-tooltip.h b/widgets/table/e-table-tooltip.h index 5b2acbf584..27dcf26db2 100644 --- a/widgets/table/e-table-tooltip.h +++ b/widgets/table/e-table-tooltip.h @@ -29,10 +29,10 @@ G_BEGIN_DECLS typedef struct { gint timer; - int col, row; - int row_height; - int x, y; - int cx, cy; + gint col, row; + gint row_height; + gint x, y; + gint cx, cy; GdkColor *foreground; GdkColor *background; GnomeCanvasItem *eti; diff --git a/widgets/table/e-table-tree.h b/widgets/table/e-table-tree.h index 864359bf33..178c2a3ba2 100644 --- a/widgets/table/e-table-tree.h +++ b/widgets/table/e-table-tree.h @@ -29,7 +29,7 @@ G_BEGIN_DECLS typedef struct { - char *title; + gchar *title; union { ETableModel *table; @@ -40,8 +40,8 @@ typedef struct { guint is_leaf :1; } ETableGroup; -ETableGroup *e_table_group_new (const char *title, ETableModel *table); -ETableGroup *e_table_group_new_leaf (const char *title); +ETableGroup *e_table_group_new (const gchar *title, ETableModel *table); +ETableGroup *e_table_group_new_leaf (const gchar *title); G_END_DECLS diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c index 6e87a2a6ce..784f1f5b66 100644 --- a/widgets/table/e-table-utils.c +++ b/widgets/table/e-table-utils.c @@ -36,8 +36,8 @@ ETableHeader * e_table_state_to_header (GtkWidget *widget, ETableHeader *full_header, ETableState *state) { ETableHeader *nh; - const int max_cols = e_table_header_count (full_header); - int column; + const gint max_cols = e_table_header_count (full_header); + gint column; GValue *val = g_new0 (GValue, 1); g_return_val_if_fail (widget, NULL); @@ -51,7 +51,7 @@ e_table_state_to_header (GtkWidget *widget, ETableHeader *full_header, ETableSta g_free (val); for (column = 0; column < state->col_count; column++) { - int col; + gint col; double expansion; ETableCol *table_col; @@ -75,7 +75,7 @@ e_table_state_to_header (GtkWidget *widget, ETableHeader *full_header, ETableSta static ETableCol * et_col_spec_to_col (ETableColumnSpecification *col_spec, ETableExtras *ete, - const char *domain) + const gchar *domain) { ETableCol *col = NULL; ECell *cell = NULL; @@ -90,7 +90,7 @@ et_col_spec_to_col (ETableColumnSpecification *col_spec, search = e_table_extras_get_search(ete, col_spec->search); if (cell && compare) { - char *title = dgettext (domain, col_spec->title); + gchar *title = dgettext (domain, col_spec->title); title = g_strdup (title); @@ -132,7 +132,7 @@ e_table_spec_to_full_header (ETableSpecification *spec, ETableExtras *ete) { ETableHeader *nh; - int column; + gint column; g_return_val_if_fail (spec, NULL); g_return_val_if_fail (ete, NULL); @@ -161,8 +161,8 @@ check_col (ETableCol *col, gpointer user_data) ETableCol * e_table_util_calculate_current_search_col (ETableHeader *header, ETableHeader *full_header, ETableSortInfo *sort_info, gboolean always_search) { - int i; - int count; + gint i; + gint count; ETableCol *col = NULL; count = e_table_sort_info_grouping_get_count (sort_info); for (i = 0; i < count; i++) { diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index 7d9c5bfce7..6b856274a4 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -47,14 +47,14 @@ struct _ETableWithoutPrivate { ETableWithoutFreeKeyFunc free_gotten_key_func; ETableWithoutFreeKeyFunc free_duplicated_key_func; - void *closure; + gpointer closure; }; static gboolean -check (ETableWithout *etw, int model_row) +check (ETableWithout *etw, gint model_row) { gboolean ret_val; - void *key; + gpointer key; ETableSubset *etss = E_TABLE_SUBSET (etw); if (etw->priv->get_key_func) @@ -68,10 +68,10 @@ check (ETableWithout *etw, int model_row) } static gboolean -check_with_key (ETableWithout *etw, void *key, int model_row) +check_with_key (ETableWithout *etw, gpointer key, gint model_row) { gboolean ret_val; - void *key2; + gpointer key2; ETableSubset *etss = E_TABLE_SUBSET (etw); if (etw->priv->get_key_func) @@ -88,14 +88,14 @@ check_with_key (ETableWithout *etw, void *key, int model_row) } static gint -etw_view_to_model_row (ETableWithout *etw, int view_row) +etw_view_to_model_row (ETableWithout *etw, gint view_row) { ETableSubset *etss = E_TABLE_SUBSET (etw); return etss->map_table[view_row]; } static void -add_row (ETableWithout *etw, int model_row) +add_row (ETableWithout *etw, gint model_row) { ETableSubset *etss = E_TABLE_SUBSET (etw); @@ -109,7 +109,7 @@ add_row (ETableWithout *etw, int model_row) } static void -remove_row (ETableWithout *etw, int view_row) +remove_row (ETableWithout *etw, gint view_row) { ETableSubset *etss = E_TABLE_SUBSET (etw); @@ -149,9 +149,9 @@ etw_dispose (GObject *object) } static void -etw_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *etm, int model_row, int count) +etw_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *etm, gint model_row, gint count) { - int i; + gint i; ETableWithout *etw = E_TABLE_WITHOUT (etss); gboolean shift = FALSE; @@ -177,9 +177,9 @@ etw_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *etm, int model_r } static void -etw_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *etm, int model_row, int count) +etw_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *etm, gint model_row, gint count) { - int i; /* View row */ + gint i; /* View row */ ETableWithout *etw = E_TABLE_WITHOUT (etss); gboolean shift = FALSE; @@ -201,9 +201,9 @@ etw_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *etm, int model_ro static void etw_proxy_model_changed (ETableSubset *etss, ETableModel *etm) { - int i; /* Model row */ - int j; /* View row */ - int row_count; + gint i; /* Model row */ + gint j; /* View row */ + gint row_count; ETableWithout *etw = E_TABLE_WITHOUT (etss); g_free (etss->map_table); @@ -306,7 +306,7 @@ e_table_without_new (ETableModel *source, void e_table_without_hide (ETableWithout *etw, void *key) { - int i; /* View row */ + gint i; /* View row */ ETableSubset *etss = E_TABLE_SUBSET (etw); if (etw->priv->duplicate_key_func) @@ -325,7 +325,7 @@ void e_table_without_hide (ETableWithout *etw, void e_table_without_hide_adopt (ETableWithout *etw, void *key) { - int i; /* View row */ + gint i; /* View row */ ETableSubset *etss = E_TABLE_SUBSET (etw); g_hash_table_insert (etw->priv->hash, key, key); @@ -341,10 +341,10 @@ void e_table_without_show (ETableWithout *etw, void *key) { - int i; /* Model row */ + gint i; /* Model row */ ETableSubset *etss = E_TABLE_SUBSET (etw); - int count; - void *old_key; + gint count; + gpointer old_key; count = e_table_model_row_count (etss->source); @@ -365,8 +365,8 @@ e_table_without_show (ETableWithout *etw, void e_table_without_show_all (ETableWithout *etw) { - int i; /* Model row */ - int row_count; + gint i; /* Model row */ + gint row_count; ETableSubset *etss = E_TABLE_SUBSET (etw); e_table_model_pre_change (E_TABLE_MODEL (etw)); diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h index c43bdab332..e4aabbd64d 100644 --- a/widgets/table/e-table-without.h +++ b/widgets/table/e-table-without.h @@ -38,10 +38,10 @@ extern "C" { #define E_IS_TABLE_WITHOUT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_WITHOUT_TYPE)) typedef struct _ETableWithoutPrivate ETableWithoutPrivate; -typedef void *(*ETableWithoutGetKeyFunc) (ETableModel *source, - int row, +typedef gpointer (*ETableWithoutGetKeyFunc) (ETableModel *source, + gint row, void *closure); -typedef void *(*ETableWithoutDuplicateKeyFunc) (const void *key, +typedef gpointer (*ETableWithoutDuplicateKeyFunc) (const void *key, void *closure); typedef void (*ETableWithoutFreeKeyFunc) (void *key, void *closure); diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index b48fd454f1..1c86a4415c 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -253,7 +253,7 @@ expansion_changed (ETableHeader *header, ETable *et) } static void -dimension_changed (ETableHeader *header, int total_width, ETable *et) +dimension_changed (ETableHeader *header, gint total_width, ETable *et) { set_header_width (et); } @@ -405,9 +405,9 @@ et_unrealize (GtkWidget *widget) } static gboolean -check_row (ETable *et, int model_row, int col, ETableSearchFunc search, char *string) +check_row (ETable *et, gint model_row, gint col, ETableSearchFunc search, gchar *string) { - const void *value; + gconstpointer value; value = e_table_model_value_at (et->model, col, model_row); @@ -415,11 +415,11 @@ check_row (ETable *et, int model_row, int col, ETableSearchFunc search, char *st } static gboolean -et_search_search (ETableSearch *search, char *string, ETableSearchFlags flags, ETable *et) +et_search_search (ETableSearch *search, gchar *string, ETableSearchFlags flags, ETable *et) { - int cursor; - int rows; - int i; + gint cursor; + gint rows; + gint i; ETableCol *col = current_search_col (et); if (col == NULL) @@ -437,7 +437,7 @@ et_search_search (ETableSearch *search, char *string, ETableSearchFlags flags, E cursor = e_sorter_model_to_sorted (E_SORTER (et->sorter), cursor); for (i = cursor + 1; i < rows; i++) { - int model_row = e_sorter_sorted_to_model (E_SORTER (et->sorter), i); + gint model_row = e_sorter_sorted_to_model (E_SORTER (et->sorter), i); if (check_row (et, model_row, col->col_idx, col->search, string)) { e_selection_model_select_as_key_press(E_SELECTION_MODEL (et->selection), model_row, col->col_idx, GDK_CONTROL_MASK); return TRUE; @@ -445,7 +445,7 @@ et_search_search (ETableSearch *search, char *string, ETableSearchFlags flags, E } for (i = 0; i < cursor; i++) { - int model_row = e_sorter_sorted_to_model (E_SORTER (et->sorter), i); + gint model_row = e_sorter_sorted_to_model (E_SORTER (et->sorter), i); if (check_row (et, model_row, col->col_idx, col->search, string)) { e_selection_model_select_as_key_press(E_SELECTION_MODEL (et->selection), model_row, col->col_idx, GDK_CONTROL_MASK); return TRUE; @@ -461,7 +461,7 @@ et_search_search (ETableSearch *search, char *string, ETableSearchFlags flags, E static void et_search_accept (ETableSearch *search, ETable *et) { - int cursor; + gint cursor; ETableCol *col = current_search_col (et); if (col == NULL) @@ -651,7 +651,7 @@ sort_info_changed (ETableSortInfo *info, ETable *et) static void e_table_setup_header (ETable *e_table) { - char *pointer; + gchar *pointer; e_table->header_canvas = GNOME_CANVAS (e_canvas_new ()); gtk_widget_show (GTK_WIDGET (e_table->header_canvas)); @@ -740,7 +740,7 @@ table_canvas_reflow (GnomeCanvas *canvas, ETable *e_table) } static void -click_to_add_cursor_change (ETableClickToAdd *etcta, int row, int col, ETable *et) +click_to_add_cursor_change (ETableClickToAdd *etcta, gint row, gint col, ETable *et) { if (et->cursor_loc == E_TABLE_CURSOR_LOC_TABLE) { e_selection_model_clear(E_SELECTION_MODEL (et->selection)); @@ -749,7 +749,7 @@ click_to_add_cursor_change (ETableClickToAdd *etcta, int row, int col, ETable *e } static void -group_cursor_change (ETableGroup *etg, int row, ETable *et) +group_cursor_change (ETableGroup *etg, gint row, ETable *et) { ETableCursorLoc old_cursor_loc; @@ -763,39 +763,39 @@ group_cursor_change (ETableGroup *etg, int row, ETable *et) } static void -group_cursor_activated (ETableGroup *etg, int row, ETable *et) +group_cursor_activated (ETableGroup *etg, gint row, ETable *et) { g_signal_emit (G_OBJECT (et), et_signals [CURSOR_ACTIVATED], 0, row); } static void -group_double_click (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et) +group_double_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et) { g_signal_emit (G_OBJECT (et), et_signals [DOUBLE_CLICK], 0, row, col, event); } static gint -group_right_click (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et) +group_right_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et) { - int return_val = 0; + gint return_val = 0; g_signal_emit (G_OBJECT (et), et_signals [RIGHT_CLICK], 0, row, col, event, &return_val); return return_val; } static gint -group_click (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et) +group_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et) { - int return_val = 0; + gint return_val = 0; g_signal_emit (G_OBJECT (et), et_signals [CLICK], 0, row, col, event, &return_val); return return_val; } static gint -group_key_press (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et) +group_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et) { - int return_val = 0; + gint return_val = 0; GdkEventKey *key = (GdkEventKey *) event; - int y, row_local, col_local; + gint y, row_local, col_local; GtkAdjustment *vadj; switch (key->keyval) { @@ -849,9 +849,9 @@ group_key_press (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et } static gint -group_start_drag (ETableGroup *etg, int row, int col, GdkEvent *event, ETable *et) +group_start_drag (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et) { - int return_val = 0; + gint return_val = 0; g_signal_emit (G_OBJECT (et), et_signals [START_DRAG], 0, row, col, event, &return_val); return return_val; @@ -869,7 +869,7 @@ et_table_model_changed (ETableModel *model, ETable *et) } static void -et_table_row_changed (ETableModel *table_model, int row, ETable *et) +et_table_row_changed (ETableModel *table_model, gint row, ETable *et) { if (!et->need_rebuild) { if (e_table_group_remove (et->group, row)) @@ -879,18 +879,18 @@ et_table_row_changed (ETableModel *table_model, int row, ETable *et) } static void -et_table_cell_changed (ETableModel *table_model, int view_col, int row, ETable *et) +et_table_cell_changed (ETableModel *table_model, gint view_col, gint row, ETable *et) { et_table_row_changed (table_model, row, et); } static void -et_table_rows_inserted (ETableModel *table_model, int row, int count, ETable *et) +et_table_rows_inserted (ETableModel *table_model, gint row, gint count, ETable *et) { /* This number has already been decremented. */ - int row_count = e_table_model_row_count(table_model); + gint row_count = e_table_model_row_count(table_model); if (!et->need_rebuild) { - int i; + gint i; if (row != row_count - count) e_table_group_increment(et->group, row, count); for (i = 0; i < count; i++) @@ -900,11 +900,11 @@ et_table_rows_inserted (ETableModel *table_model, int row, int count, ETable *et } static void -et_table_rows_deleted (ETableModel *table_model, int row, int count, ETable *et) +et_table_rows_deleted (ETableModel *table_model, gint row, gint count, ETable *et) { - int row_count = e_table_model_row_count(table_model); + gint row_count = e_table_model_row_count(table_model); if (!et->need_rebuild) { - int i; + gint i; for (i = 0; i < count; i++) e_table_group_remove (et->group, row + i); if (row != row_count) @@ -1024,7 +1024,7 @@ et_canvas_realize (GtkWidget *canvas, ETable *e_table) static gint white_item_event (GnomeCanvasItem *white_item, GdkEvent *event, ETable *e_table) { - int return_val = 0; + gint return_val = 0; g_signal_emit (GTK_OBJECT (e_table), et_signals [WHITE_SPACE_EVENT], 0, event, &return_val); return return_val; @@ -1421,8 +1421,8 @@ ETableState * e_table_get_state_object (ETable *e_table) { ETableState *state; - int full_col_count; - int i, j; + gint full_col_count; + gint i, j; state = e_table_state_new(); if (state->sort_info) @@ -1498,7 +1498,7 @@ et_selection_model_selection_changed (ETableGroup *etg, ETable *et) } static void -et_selection_model_selection_row_changed (ETableGroup *etg, int row, ETable *et) +et_selection_model_selection_row_changed (ETableGroup *etg, gint row, ETable *et) { g_signal_emit (G_OBJECT (et), et_signals [SELECTION_CHANGE], 0); } @@ -1507,8 +1507,8 @@ static ETable * et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete, ETableSpecification *specification, ETableState *state) { - int row = 0; - int col_count, i; + gint row = 0; + gint col_count, i; GValue *val = g_new0 (GValue, 1); g_value_init (val, G_TYPE_OBJECT); @@ -1633,7 +1633,7 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete, **/ ETable * e_table_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete, - const char *spec_str, const char *state_str) + const gchar *spec_str, const gchar *state_str) { ETableSpecification *specification; ETableState *state; @@ -1693,7 +1693,7 @@ e_table_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete, **/ ETable * e_table_construct_from_spec_file (ETable *e_table, ETableModel *etm, ETableExtras *ete, - const char *spec_fn, const char *state_fn) + const gchar *spec_fn, const gchar *state_fn) { ETableSpecification *specification; ETableState *state; @@ -1758,7 +1758,7 @@ e_table_construct_from_spec_file (ETable *e_table, ETableModel *etm, ETableExtra * The newly created #ETable or %NULL if there's an error. **/ GtkWidget * -e_table_new (ETableModel *etm, ETableExtras *ete, const char *spec, const char *state) +e_table_new (ETableModel *etm, ETableExtras *ete, const gchar *spec, const gchar *state) { ETable *e_table; @@ -1795,7 +1795,7 @@ e_table_new (ETableModel *etm, ETableExtras *ete, const char *spec, const char * * The newly created #ETable or %NULL if there's an error. **/ GtkWidget * -e_table_new_from_spec_file (ETableModel *etm, ETableExtras *ete, const char *spec_fn, const char *state_fn) +e_table_new_from_spec_file (ETableModel *etm, ETableExtras *ete, const gchar *spec_fn, const gchar *state_fn) { ETable *e_table; @@ -1836,9 +1836,9 @@ et_build_grouping_spec (ETable *e_table) { xmlNode *node; xmlNode *grouping; - int i; - const int sort_count = e_table_sort_info_sorting_get_count (e_table->sort_info); - const int group_count = e_table_sort_info_grouping_get_count (e_table->sort_info); + gint i; + const gint sort_count = e_table_sort_info_sorting_get_count (e_table->sort_info); + const gint group_count = e_table_sort_info_grouping_get_count (e_table->sort_info); grouping = xmlNewNode (NULL, "grouping"); node = grouping; @@ -1899,18 +1899,18 @@ e_table_get_specification (ETable *e_table) return buffer; } -int -e_table_set_specification (ETable *e_table, const char *spec) +gint +e_table_set_specification (ETable *e_table, const gchar *spec) { xmlDoc *xmlSpec; - int ret; + gint ret; g_return_val_if_fail(e_table != NULL, -1); g_return_val_if_fail(E_IS_TABLE(e_table), -1); g_return_val_if_fail(spec != NULL, -1); /* doesn't work yet, sigh */ - xmlSpec = xmlParseMemory ((char *)spec, strlen(spec)); + xmlSpec = xmlParseMemory ((gchar *)spec, strlen(spec)); ret = et_real_set_specification(e_table, xmlSpec); xmlFreeDoc (xmlSpec); @@ -1918,7 +1918,7 @@ e_table_set_specification (ETable *e_table, const char *spec) } void -e_table_save_specification (ETable *e_table, const char *filename) +e_table_save_specification (ETable *e_table, const gchar *filename) { xmlDoc *doc = et_build_tree (e_table); @@ -1931,11 +1931,11 @@ e_table_save_specification (ETable *e_table, const char *filename) xmlFreeDoc (doc); } -int +gint e_table_load_specification (ETable *e_table, gchar *filename) { xmlDoc *xmlSpec; - int ret; + gint ret; g_return_val_if_fail(e_table != NULL, -1); g_return_val_if_fail(E_IS_TABLE(e_table), -1); @@ -1966,7 +1966,7 @@ e_table_load_specification (ETable *e_table, gchar *filename) * Sets the cursor row and the selection to the given row number. **/ void -e_table_set_cursor_row (ETable *e_table, int row) +e_table_set_cursor_row (ETable *e_table, gint row) { g_return_if_fail(e_table != NULL); g_return_if_fail(E_IS_TABLE(e_table)); @@ -1986,10 +1986,10 @@ e_table_set_cursor_row (ETable *e_table, int row) * Return value: * Cursor row **/ -int +gint e_table_get_cursor_row (ETable *e_table) { - int row; + gint row; g_return_val_if_fail(e_table != NULL, -1); g_return_val_if_fail(E_IS_TABLE(e_table), -1); @@ -2146,7 +2146,7 @@ et_get_property (GObject *object, } typedef struct { - char *arg; + gchar *arg; gboolean setting; } bool_closure; @@ -2260,7 +2260,7 @@ e_table_get_next_row (ETable *e_table, g_return_val_if_fail(E_IS_TABLE(e_table), -1); if (e_table->sorter) { - int i; + gint i; i = e_sorter_model_to_sorted(E_SORTER (e_table->sorter), model_row); i++; if (i < e_table_model_row_count(e_table->model)) { @@ -2294,7 +2294,7 @@ e_table_get_prev_row (ETable *e_table, g_return_val_if_fail(E_IS_TABLE(e_table), -1); if (e_table->sorter) { - int i; + gint i; i = e_sorter_model_to_sorted(E_SORTER (e_table->sorter), model_row); i--; if (i >= 0) @@ -2364,8 +2364,8 @@ e_table_view_to_model_row (ETable *e_table, **/ void e_table_get_cell_at (ETable *table, - int x, int y, - int *row_return, int *col_return) + gint x, gint y, + gint *row_return, gint *col_return) { g_return_if_fail (table != NULL); g_return_if_fail (E_IS_TABLE (table)); @@ -2395,9 +2395,9 @@ e_table_get_cell_at (ETable *table, **/ void e_table_get_cell_geometry (ETable *table, - int row, int col, - int *x_return, int *y_return, - int *width_return, int *height_return) + gint row, gint col, + gint *x_return, gint *y_return, + gint *width_return, gint *height_return) { g_return_if_fail (table != NULL); g_return_if_fail (E_IS_TABLE (table)); @@ -2419,7 +2419,7 @@ e_table_get_cell_geometry (ETable *table, * Similar to e_table_get_cell_at, only here we check based on the mouse motion information in the group. **/ void -e_table_get_mouse_over_cell (ETable *table, int *row, int *col) +e_table_get_mouse_over_cell (ETable *table, gint *row, gint *col) { g_return_if_fail (table != NULL); g_return_if_fail (E_IS_TABLE (table)); @@ -2532,8 +2532,8 @@ struct _GtkDragSourceInfo **/ void e_table_drag_get_data (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, GdkAtom target, guint32 time) @@ -2558,14 +2558,14 @@ e_table_drag_get_data (ETable *table, **/ void e_table_drag_highlight (ETable *table, - int row, - int col) + gint row, + gint col) { g_return_if_fail(table != NULL); g_return_if_fail(E_IS_TABLE(table)); if (row != -1) { - int x, y, width, height; + gint x, y, width, height; if (col == -1) { e_table_get_cell_geometry (table, row, 0, &x, &y, &width, &height); x = 0; @@ -2665,7 +2665,7 @@ e_table_drag_dest_unset (GtkWidget *widget) /* Source side */ static gint -et_real_start_drag (ETable *table, int row, int col, GdkEvent *event) +et_real_start_drag (ETable *table, gint row, gint col, GdkEvent *event) { GtkDragSourceInfo *info; GdkDragContext *context; @@ -2795,8 +2795,8 @@ e_table_drag_source_unset (ETable *table) **/ GdkDragContext * e_table_drag_begin (ETable *table, - int row, - int col, + gint row, + gint col, GtkTargetList *targets, GdkDragAction actions, gint button, @@ -2863,7 +2863,7 @@ do_drag_motion(ETable *et, guint time) { gboolean ret_val; - int row = -1, col = -1; + gint row = -1, col = -1; e_table_get_cell_at (et, x, y, &row, &col); @@ -2883,7 +2883,7 @@ static gboolean scroll_timeout (gpointer data) { ETable *et = data; - int dx = 0, dy = 0; + gint dx = 0, dy = 0; GtkAdjustment *h, *v; double hvalue, vvalue; @@ -3027,7 +3027,7 @@ et_drag_drop(GtkWidget *widget, ETable *et) { gboolean ret_val; - int row, col; + gint row, col; e_table_get_cell_at (et, x, y, &row, &col); @@ -3059,7 +3059,7 @@ et_drag_data_received(GtkWidget *widget, guint time, ETable *et) { - int row, col; + gint row, col; e_table_get_cell_at (et, x, y, &row, &col); diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index 4894085330..7d3d0ff8cb 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -80,21 +80,21 @@ typedef struct { guint search_search_id; guint search_accept_id; - int table_model_change_id; - int table_row_change_id; - int table_cell_change_id; - int table_rows_inserted_id; - int table_rows_deleted_id; + gint table_model_change_id; + gint table_row_change_id; + gint table_cell_change_id; + gint table_rows_inserted_id; + gint table_rows_deleted_id; - int group_info_change_id; - int sort_info_change_id; + gint group_info_change_id; + gint sort_info_change_id; - int structure_change_id; - int expansion_change_id; - int dimension_change_id; + gint structure_change_id; + gint expansion_change_id; + gint dimension_change_id; - int reflow_idle_id; - int scroll_idle_id; + gint reflow_idle_id; + gint scroll_idle_id; GnomeCanvas *header_canvas, *table_canvas; @@ -131,41 +131,41 @@ typedef struct { guint always_search : 1; guint search_col_set : 1; - char *click_to_add_message; + gchar *click_to_add_message; GnomeCanvasItem *click_to_add; gboolean use_click_to_add; gboolean use_click_to_add_end; ECursorMode cursor_mode; - int drop_row; - int drop_col; + gint drop_row; + gint drop_col; GnomeCanvasItem *drop_highlight; - int last_drop_x; - int last_drop_y; - int last_drop_time; + gint last_drop_x; + gint last_drop_y; + gint last_drop_time; GdkDragContext *last_drop_context; - int drag_row; - int drag_col; + gint drag_row; + gint drag_col; ETableDragSourceSite *site; - int header_width; + gint header_width; - char *domain; + gchar *domain; } ETable; typedef struct { GtkTableClass parent_class; - void (*cursor_change) (ETable *et, int row); - void (*cursor_activated) (ETable *et, int row); + void (*cursor_change) (ETable *et, gint row); + void (*cursor_activated) (ETable *et, gint row); void (*selection_change) (ETable *et); - void (*double_click) (ETable *et, int row, int col, GdkEvent *event); - gint (*right_click) (ETable *et, int row, int col, GdkEvent *event); - gint (*click) (ETable *et, int row, int col, GdkEvent *event); - gint (*key_press) (ETable *et, int row, int col, GdkEvent *event); - gint (*start_drag) (ETable *et, int row, int col, GdkEvent *event); + void (*double_click) (ETable *et, gint row, gint col, GdkEvent *event); + gint (*right_click) (ETable *et, gint row, gint col, GdkEvent *event); + gint (*click) (ETable *et, gint row, gint col, GdkEvent *event); + gint (*key_press) (ETable *et, gint row, gint col, GdkEvent *event); + gint (*start_drag) (ETable *et, gint row, gint col, GdkEvent *event); void (*state_change) (ETable *et); gint (*white_space_event) (ETable *et, GdkEvent *event); @@ -175,48 +175,48 @@ typedef struct { /* Source side drag signals */ void (* table_drag_begin) (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context); void (* table_drag_end) (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context); void (* table_drag_data_get) (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint time); void (* table_drag_data_delete) (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context); /* Target side drag signals */ void (* table_drag_leave) (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, guint time); gboolean (* table_drag_motion) (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, gint x, gint y, guint time); gboolean (* table_drag_drop) (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, gint x, gint y, guint time); void (* table_drag_data_received) (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, gint x, gint y, @@ -228,23 +228,23 @@ GType e_table_get_type (void); ETable *e_table_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete, - const char *spec, - const char *state); + const gchar *spec, + const gchar *state); GtkWidget *e_table_new (ETableModel *etm, ETableExtras *ete, - const char *spec, - const char *state); + const gchar *spec, + const gchar *state); /* Create an ETable using files. */ ETable *e_table_construct_from_spec_file (ETable *e_table, ETableModel *etm, ETableExtras *ete, - const char *spec_fn, - const char *state_fn); + const gchar *spec_fn, + const gchar *state_fn); GtkWidget *e_table_new_from_spec_file (ETableModel *etm, ETableExtras *ete, - const char *spec_fn, - const char *state_fn); + const gchar *spec_fn, + const gchar *state_fn); /* To save the state */ gchar *e_table_get_state (ETable *e_table); @@ -260,10 +260,10 @@ void e_table_set_state_object (ETable *e_tabl void e_table_load_state (ETable *e_table, const gchar *filename); void e_table_set_cursor_row (ETable *e_table, - int row); + gint row); /* -1 means we don't have the cursor. This is in model rows. */ -int e_table_get_cursor_row (ETable *e_table); +gint e_table_get_cursor_row (ETable *e_table); void e_table_selected_row_foreach (ETable *e_table, EForeachFunc callback, gpointer closure); @@ -278,18 +278,18 @@ gint e_table_model_to_view_row (ETable *e_tabl gint e_table_view_to_model_row (ETable *e_table, gint view_row); void e_table_get_cell_at (ETable *table, - int x, - int y, - int *row_return, - int *col_return); -void e_table_get_mouse_over_cell (ETable *table, int *row, int *col); + gint x, + gint y, + gint *row_return, + gint *col_return); +void e_table_get_mouse_over_cell (ETable *table, gint *row, gint *col); void e_table_get_cell_geometry (ETable *table, - int row, - int col, - int *x_return, - int *y_return, - int *width_return, - int *height_return); + gint row, + gint col, + gint *x_return, + gint *y_return, + gint *width_return, + gint *height_return); /* Useful accessor functions. */ ESelectionModel *e_table_get_selection_model (ETable *table); @@ -297,14 +297,14 @@ ESelectionModel *e_table_get_selection_model (ETable *table) /* Drag & drop stuff. */ /* Target */ void e_table_drag_get_data (ETable *table, - int row, - int col, + gint row, + gint col, GdkDragContext *context, GdkAtom target, guint32 time); void e_table_drag_highlight (ETable *table, - int row, - int col); /* col == -1 to highlight entire row. */ + gint row, + gint col); /* col == -1 to highlight entire row. */ void e_table_drag_unhighlight (ETable *table); void e_table_drag_dest_set (ETable *table, GtkDestDefaults flags, @@ -333,8 +333,8 @@ void e_table_drag_source_unset (ETable *table) * as a GtkTargetList */ GdkDragContext *e_table_drag_begin (ETable *table, - int row, - int col, + gint row, + gint col, GtkTargetList *targets, GdkDragAction actions, gint button, diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c index 08d703b7ff..25175c9797 100644 --- a/widgets/table/e-tree-memory-callbacks.c +++ b/widgets/table/e-tree-memory-callbacks.c @@ -62,7 +62,7 @@ etmc_has_save_id (ETreeModel *etm) return FALSE; } -static char * +static gchar * etmc_get_save_id (ETreeModel *etm, ETreePath node) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); @@ -85,7 +85,7 @@ etmc_has_get_node_by_id (ETreeModel *etm) } static ETreePath -etmc_get_node_by_id (ETreeModel *etm, const char *save_id) +etmc_get_node_by_id (ETreeModel *etm, const gchar *save_id) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); @@ -95,8 +95,8 @@ etmc_get_node_by_id (ETreeModel *etm, const char *save_id) return NULL; } -static void * -etmc_sort_value_at (ETreeModel *etm, ETreePath node, int col) +static gpointer +etmc_sort_value_at (ETreeModel *etm, ETreePath node, gint col) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); @@ -106,8 +106,8 @@ etmc_sort_value_at (ETreeModel *etm, ETreePath node, int col) return etmc->value_at (etm, node, col, etmc->model_data); } -static void * -etmc_value_at (ETreeModel *etm, ETreePath node, int col) +static gpointer +etmc_value_at (ETreeModel *etm, ETreePath node, gint col) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); @@ -115,7 +115,7 @@ etmc_value_at (ETreeModel *etm, ETreePath node, int col) } static void -etmc_set_value_at (ETreeModel *etm, ETreePath node, int col, const void *val) +etmc_set_value_at (ETreeModel *etm, ETreePath node, gint col, gconstpointer val) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); @@ -123,7 +123,7 @@ etmc_set_value_at (ETreeModel *etm, ETreePath node, int col, const void *val) } static gboolean -etmc_is_editable (ETreeModel *etm, ETreePath node, int col) +etmc_is_editable (ETreeModel *etm, ETreePath node, gint col) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); @@ -132,19 +132,19 @@ etmc_is_editable (ETreeModel *etm, ETreePath node, int col) /* The default for etmc_duplicate_value is to return the raw value. */ -static void * -etmc_duplicate_value (ETreeModel *etm, int col, const void *value) +static gpointer +etmc_duplicate_value (ETreeModel *etm, gint col, gconstpointer value) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); if (etmc->duplicate_value) return etmc->duplicate_value (etm, col, value, etmc->model_data); else - return (void *)value; + return (gpointer)value; } static void -etmc_free_value (ETreeModel *etm, int col, void *value) +etmc_free_value (ETreeModel *etm, gint col, gpointer value) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); @@ -152,8 +152,8 @@ etmc_free_value (ETreeModel *etm, int col, void *value) etmc->free_value (etm, col, value, etmc->model_data); } -static void * -etmc_initialize_value (ETreeModel *etm, int col) +static gpointer +etmc_initialize_value (ETreeModel *etm, gint col) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); @@ -164,7 +164,7 @@ etmc_initialize_value (ETreeModel *etm, int col) } static gboolean -etmc_value_is_empty (ETreeModel *etm, int col, const void *value) +etmc_value_is_empty (ETreeModel *etm, gint col, gconstpointer value) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); @@ -174,8 +174,8 @@ etmc_value_is_empty (ETreeModel *etm, int col, const void *value) return FALSE; } -static char * -etmc_value_to_string (ETreeModel *etm, int col, const void *value) +static gchar * +etmc_value_to_string (ETreeModel *etm, gint col, gconstpointer value) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h index f74a472642..a7705795af 100644 --- a/widgets/table/e-tree-memory-callbacks.h +++ b/widgets/table/e-tree-memory-callbacks.h @@ -36,25 +36,25 @@ extern "C" { #define E_IS_TREE_MEMORY_CALLBACKS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_MEMORY_CALLBACKS_TYPE)) -typedef GdkPixbuf* (*ETreeMemoryCallbacksIconAtFn) (ETreeModel *etree, ETreePath path, void *model_data); +typedef GdkPixbuf* (*ETreeMemoryCallbacksIconAtFn) (ETreeModel *etree, ETreePath path, gpointer model_data); -typedef gint (*ETreeMemoryCallbacksColumnCountFn) (ETreeModel *etree, void *model_data); +typedef gint (*ETreeMemoryCallbacksColumnCountFn) (ETreeModel *etree, gpointer model_data); -typedef gboolean (*ETreeMemoryCallbacksHasSaveIdFn) (ETreeModel *etree, void *model_data); -typedef gchar *(*ETreeMemoryCallbacksGetSaveIdFn) (ETreeModel *etree, ETreePath path, void *model_data); +typedef gboolean (*ETreeMemoryCallbacksHasSaveIdFn) (ETreeModel *etree, gpointer model_data); +typedef gchar *(*ETreeMemoryCallbacksGetSaveIdFn) (ETreeModel *etree, ETreePath path, gpointer model_data); -typedef gboolean (*ETreeMemoryCallbacksHasGetNodeByIdFn) (ETreeModel *etree, void *model_data); -typedef ETreePath (*ETreeMemoryCallbacksGetNodeByIdFn) (ETreeModel *etree, const char *save_id, void *model_data); +typedef gboolean (*ETreeMemoryCallbacksHasGetNodeByIdFn) (ETreeModel *etree, gpointer model_data); +typedef ETreePath (*ETreeMemoryCallbacksGetNodeByIdFn) (ETreeModel *etree, const gchar *save_id, gpointer model_data); -typedef void* (*ETreeMemoryCallbacksValueAtFn) (ETreeModel *etree, ETreePath path, int col, void *model_data); -typedef void (*ETreeMemoryCallbacksSetValueAtFn) (ETreeModel *etree, ETreePath path, int col, const void *val, void *model_data); -typedef gboolean (*ETreeMemoryCallbacksIsEditableFn) (ETreeModel *etree, ETreePath path, int col, void *model_data); +typedef gpointer (*ETreeMemoryCallbacksValueAtFn) (ETreeModel *etree, ETreePath path, gint col, gpointer model_data); +typedef void (*ETreeMemoryCallbacksSetValueAtFn) (ETreeModel *etree, ETreePath path, gint col, gconstpointer val, gpointer model_data); +typedef gboolean (*ETreeMemoryCallbacksIsEditableFn) (ETreeModel *etree, ETreePath path, gint col, gpointer model_data); -typedef void *(*ETreeMemoryCallbacksDuplicateValueFn) (ETreeModel *etm, int col, const void *val, void *data); -typedef void (*ETreeMemoryCallbacksFreeValueFn) (ETreeModel *etm, int col, void *val, void *data); -typedef void *(*ETreeMemoryCallbacksInitializeValueFn) (ETreeModel *etm, int col, void *data); -typedef gboolean (*ETreeMemoryCallbacksValueIsEmptyFn) (ETreeModel *etm, int col, const void *val, void *data); -typedef char *(*ETreeMemoryCallbacksValueToStringFn) (ETreeModel *etm, int col, const void *val, void *data); +typedef void *(*ETreeMemoryCallbacksDuplicateValueFn) (ETreeModel *etm, gint col, gconstpointer val, gpointer data); +typedef void (*ETreeMemoryCallbacksFreeValueFn) (ETreeModel *etm, gint col, gpointer val, gpointer data); +typedef void *(*ETreeMemoryCallbacksInitializeValueFn) (ETreeModel *etm, gint col, gpointer data); +typedef gboolean (*ETreeMemoryCallbacksValueIsEmptyFn) (ETreeModel *etm, gint col, gconstpointer val, gpointer data); +typedef gchar *(*ETreeMemoryCallbacksValueToStringFn) (ETreeModel *etm, gint col, gconstpointer val, gpointer data); typedef struct { ETreeMemory parent; diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index 99c9ef9895..728392f7b0 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -87,7 +87,7 @@ check_children (ETreeMemory *memory, ETreePath node) static int e_tree_memory_path_depth (ETreeMemoryPath *path) { - int depth = 0; + gint depth = 0; g_return_val_if_fail(path != NULL, -1); @@ -97,7 +97,7 @@ e_tree_memory_path_depth (ETreeMemoryPath *path) } static void -e_tree_memory_path_insert (ETreeMemoryPath *parent, int position, ETreeMemoryPath *child) +e_tree_memory_path_insert (ETreeMemoryPath *parent, gint position, ETreeMemoryPath *child) { g_return_if_fail (position <= parent->num_children && position >= -1); @@ -299,7 +299,7 @@ etmm_get_children (ETreeModel *etm, ETreePath node, ETreePath **nodes) if (nodes) { ETreeMemoryPath *p; - int i = 0; + gint i = 0; (*nodes) = g_new (ETreePath, n_children); for (p = path->first_child; p; p = p->next_sibling) { @@ -486,7 +486,7 @@ e_tree_memory_node_set_data (ETreeMemory *etmm, ETreePath node, gpointer node_da ETreePath e_tree_memory_node_insert (ETreeMemory *tree_model, ETreePath parent_node, - int position, + gint position, gpointer node_data) { ETreeMemoryPriv *priv; @@ -522,7 +522,7 @@ e_tree_memory_node_insert (ETreeMemory *tree_model, return new_path; } -ETreePath e_tree_memory_node_insert_id (ETreeMemory *etree, ETreePath parent, int position, gpointer node_data, char *id) +ETreePath e_tree_memory_node_insert_id (ETreeMemory *etree, ETreePath parent, gint position, gpointer node_data, gchar *id) { return e_tree_memory_node_insert(etree, parent, position, node_data); } @@ -547,7 +547,7 @@ e_tree_memory_node_insert_before (ETreeMemory *etree, ETreeMemoryPath *child; ETreeMemoryPath *parent_path = parent; ETreeMemoryPath *sibling_path = sibling; - int position = 0; + gint position = 0; g_return_val_if_fail(etree != NULL, NULL); @@ -598,7 +598,7 @@ e_tree_memory_node_remove (ETreeMemory *etree, ETreePath node) ETreeMemoryPath *parent = path->parent; ETreeMemoryPath *sibling; gpointer ret = path->node_data; - int old_position = 0; + gint old_position = 0; g_return_val_if_fail(etree != NULL, NULL); @@ -637,7 +637,7 @@ typedef struct { } MemoryAndClosure; static int -sort_callback(const void *data1, const void *data2, gpointer user_data) +sort_callback(gconstpointer data1, gconstpointer data2, gpointer user_data) { ETreePath path1 = *(ETreePath *)data1; ETreePath path2 = *(ETreePath *)data2; @@ -653,8 +653,8 @@ e_tree_memory_sort_node (ETreeMemory *etmm, { ETreeMemoryPath **children; ETreeMemoryPath *child; - int count; - int i; + gint count; + gint i; ETreeMemoryPath *path = node; MemoryAndClosure mac; ETreeMemoryPath *last; diff --git a/widgets/table/e-tree-memory.h b/widgets/table/e-tree-memory.h index 2c82d1c8d1..0a56c8d37e 100644 --- a/widgets/table/e-tree-memory.h +++ b/widgets/table/e-tree-memory.h @@ -41,7 +41,7 @@ typedef struct ETreeMemory ETreeMemory; typedef struct ETreeMemoryPriv ETreeMemoryPriv; typedef struct ETreeMemoryClass ETreeMemoryClass; -typedef int (*ETreeMemorySortCallback) (ETreeMemory *etmm, ETreePath path1, ETreePath path2, gpointer closure); +typedef gint (*ETreeMemorySortCallback) (ETreeMemory *etmm, ETreePath path1, ETreePath path2, gpointer closure); struct ETreeMemory { ETreeModel base; @@ -63,13 +63,13 @@ ETreeMemory *e_tree_memory_new (void); /* node operations */ ETreePath e_tree_memory_node_insert (ETreeMemory *etree, ETreePath parent, - int position, + gint position, gpointer node_data); ETreePath e_tree_memory_node_insert_id (ETreeMemory *etree, ETreePath parent, - int position, + gint position, gpointer node_data, - char *id); + gchar *id); ETreePath e_tree_memory_node_insert_before (ETreeMemory *etree, ETreePath parent, ETreePath sibling, diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index bd35358874..9482fe9789 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -320,7 +320,7 @@ e_tree_model_node_data_changed (ETreeModel *tree_model, ETreePath node) * Return value: **/ void -e_tree_model_node_col_changed (ETreeModel *tree_model, ETreePath node, int col) +e_tree_model_node_col_changed (ETreeModel *tree_model, ETreePath node, gint col) { g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); @@ -361,7 +361,7 @@ e_tree_model_node_inserted (ETreeModel *tree_model, * **/ void -e_tree_model_node_removed (ETreeModel *tree_model, ETreePath parent_node, ETreePath removed_node, int old_position) +e_tree_model_node_removed (ETreeModel *tree_model, ETreePath parent_node, ETreePath removed_node, gint old_position) { g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); @@ -754,7 +754,7 @@ e_tree_model_has_get_node_by_id (ETreeModel *etree) * return values: The path for this save id. */ ETreePath -e_tree_model_get_node_by_id (ETreeModel *etree, const char *save_id) +e_tree_model_get_node_by_id (ETreeModel *etree, const gchar *save_id) { g_return_val_if_fail (etree != NULL, NULL); g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL); @@ -805,8 +805,8 @@ e_tree_model_has_change_pending (ETreeModel *etree) * affects the data in that node for that column. node_inserted, * node_removed, and no_change don't affect any data in this way. **/ -void * -e_tree_model_sort_value_at (ETreeModel *etree, ETreePath node, int col) +gpointer +e_tree_model_sort_value_at (ETreeModel *etree, ETreePath node, gint col) { g_return_val_if_fail (etree != NULL, NULL); g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL); @@ -836,8 +836,8 @@ e_tree_model_sort_value_at (ETreeModel *etree, ETreePath node, int col) * affects the data in that node for that column. node_inserted, * node_removed, and no_change don't affect any data in this way. **/ -void * -e_tree_model_value_at (ETreeModel *etree, ETreePath node, int col) +gpointer +e_tree_model_value_at (ETreeModel *etree, ETreePath node, gint col) { g_return_val_if_fail (etree != NULL, NULL); g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL); @@ -849,7 +849,7 @@ e_tree_model_value_at (ETreeModel *etree, ETreePath node, int col) } void -e_tree_model_set_value_at (ETreeModel *etree, ETreePath node, int col, const void *val) +e_tree_model_set_value_at (ETreeModel *etree, ETreePath node, gint col, gconstpointer val) { g_return_if_fail (etree != NULL); g_return_if_fail (E_IS_TREE_MODEL (etree)); @@ -868,7 +868,7 @@ e_tree_model_set_value_at (ETreeModel *etree, ETreePath node, int col, const voi * Return value: **/ gboolean -e_tree_model_node_is_editable (ETreeModel *etree, ETreePath node, int col) +e_tree_model_node_is_editable (ETreeModel *etree, ETreePath node, gint col) { g_return_val_if_fail(etree != NULL, FALSE); @@ -887,8 +887,8 @@ e_tree_model_node_is_editable (ETreeModel *etree, ETreePath node, int col) * * Return value: **/ -void * -e_tree_model_duplicate_value (ETreeModel *etree, int col, const void *value) +gpointer +e_tree_model_duplicate_value (ETreeModel *etree, gint col, gconstpointer value) { g_return_val_if_fail(etree != NULL, NULL); @@ -908,7 +908,7 @@ e_tree_model_duplicate_value (ETreeModel *etree, int col, const void *value) * Return value: **/ void -e_tree_model_free_value (ETreeModel *etree, int col, void *value) +e_tree_model_free_value (ETreeModel *etree, gint col, gpointer value) { g_return_if_fail(etree != NULL); @@ -925,8 +925,8 @@ e_tree_model_free_value (ETreeModel *etree, int col, void *value) * * Return value: **/ -void * -e_tree_model_initialize_value (ETreeModel *etree, int col) +gpointer +e_tree_model_initialize_value (ETreeModel *etree, gint col) { g_return_val_if_fail(etree != NULL, NULL); @@ -946,7 +946,7 @@ e_tree_model_initialize_value (ETreeModel *etree, int col) * Return value: **/ gboolean -e_tree_model_value_is_empty (ETreeModel *etree, int col, const void *value) +e_tree_model_value_is_empty (ETreeModel *etree, gint col, gconstpointer value) { g_return_val_if_fail(etree != NULL, TRUE); @@ -965,8 +965,8 @@ e_tree_model_value_is_empty (ETreeModel *etree, int col, const void *value) * * Return value: **/ -char * -e_tree_model_value_to_string (ETreeModel *etree, int col, const void *value) +gchar * +e_tree_model_value_to_string (ETreeModel *etree, gint col, gconstpointer value) { g_return_val_if_fail(etree != NULL, g_strdup("")); diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h index ed34933cb1..fdd7f26a66 100644 --- a/widgets/table/e-tree-model.h +++ b/widgets/table/e-tree-model.h @@ -39,7 +39,7 @@ G_BEGIN_DECLS #define E_IS_TREE_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_MODEL_TYPE)) #define E_TREE_MODEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TREE_MODEL_TYPE, ETreeModelClass)) -typedef void * ETreePath; +typedef gpointer ETreePath; typedef struct ETreeModel ETreeModel; typedef struct ETreeModelClass ETreeModelClass; typedef gint (*ETreePathCompareFunc)(ETreeModel *model, ETreePath path1, ETreePath path2); @@ -77,23 +77,23 @@ struct ETreeModelClass { gchar *(*get_save_id) (ETreeModel *etm, ETreePath node); gboolean (*has_get_node_by_id) (ETreeModel *etm); - ETreePath (*get_node_by_id) (ETreeModel *etm, const char *save_id); + ETreePath (*get_node_by_id) (ETreeModel *etm, const gchar *save_id); gboolean (*has_change_pending) (ETreeModel *etm); /* * ETable analogs */ - void *(*sort_value_at) (ETreeModel *etm, ETreePath node, int col); - void *(*value_at) (ETreeModel *etm, ETreePath node, int col); - void (*set_value_at) (ETreeModel *etm, ETreePath node, int col, const void *val); - gboolean (*is_editable) (ETreeModel *etm, ETreePath node, int col); + void *(*sort_value_at) (ETreeModel *etm, ETreePath node, gint col); + void *(*value_at) (ETreeModel *etm, ETreePath node, gint col); + void (*set_value_at) (ETreeModel *etm, ETreePath node, gint col, gconstpointer val); + gboolean (*is_editable) (ETreeModel *etm, ETreePath node, gint col); - void *(*duplicate_value) (ETreeModel *etm, int col, const void *value); - void (*free_value) (ETreeModel *etm, int col, void *value); - void *(*initialize_value) (ETreeModel *etm, int col); - gboolean (*value_is_empty) (ETreeModel *etm, int col, const void *value); - char *(*value_to_string) (ETreeModel *etm, int col, const void *value); + void *(*duplicate_value) (ETreeModel *etm, gint col, gconstpointer value); + void (*free_value) (ETreeModel *etm, gint col, gpointer value); + void *(*initialize_value) (ETreeModel *etm, gint col); + gboolean (*value_is_empty) (ETreeModel *etm, gint col, gconstpointer value); + gchar *(*value_to_string) (ETreeModel *etm, gint col, gconstpointer value); /* * Signals @@ -108,9 +108,9 @@ struct ETreeModelClass { void (*no_change) (ETreeModel *etm); void (*node_changed) (ETreeModel *etm, ETreePath node); void (*node_data_changed) (ETreeModel *etm, ETreePath node); - void (*node_col_changed) (ETreeModel *etm, ETreePath node, int col); + void (*node_col_changed) (ETreeModel *etm, ETreePath node, gint col); void (*node_inserted) (ETreeModel *etm, ETreePath parent, ETreePath inserted_node); - void (*node_removed) (ETreeModel *etm, ETreePath parent, ETreePath removed_node, int old_position); + void (*node_removed) (ETreeModel *etm, ETreePath parent, ETreePath removed_node, gint old_position); void (*node_deleted) (ETreeModel *etm, ETreePath deleted_node); void (*rebuilt) (ETreeModel *etm); @@ -156,34 +156,34 @@ gchar *e_tree_model_get_save_id (ETreeModel *model, ETreePath node); gboolean e_tree_model_has_get_node_by_id (ETreeModel *model); ETreePath e_tree_model_get_node_by_id (ETreeModel *model, - const char *save_id); + const gchar *save_id); gboolean e_tree_model_has_change_pending (ETreeModel *model); void *e_tree_model_sort_value_at (ETreeModel *etree, ETreePath node, - int col); + gint col); void *e_tree_model_value_at (ETreeModel *etree, ETreePath node, - int col); + gint col); void e_tree_model_set_value_at (ETreeModel *etree, ETreePath node, - int col, + gint col, const void *val); gboolean e_tree_model_node_is_editable (ETreeModel *etree, ETreePath node, - int col); + gint col); void *e_tree_model_duplicate_value (ETreeModel *etree, - int col, + gint col, const void *value); void e_tree_model_free_value (ETreeModel *etree, - int col, + gint col, void *value); void *e_tree_model_initialize_value (ETreeModel *etree, - int col); + gint col); gboolean e_tree_model_value_is_empty (ETreeModel *etree, - int col, + gint col, const void *value); -char *e_tree_model_value_to_string (ETreeModel *etree, - int col, +gchar *e_tree_model_value_to_string (ETreeModel *etree, + gint col, const void *value); /* depth first traversal of path's descendents, calling func on each one */ @@ -214,14 +214,14 @@ void e_tree_model_node_data_changed (ETreeModel *tree_model, ETreePath node); void e_tree_model_node_col_changed (ETreeModel *tree_model, ETreePath node, - int col); + gint col); void e_tree_model_node_inserted (ETreeModel *tree_model, ETreePath parent_node, ETreePath inserted_node); void e_tree_model_node_removed (ETreeModel *tree_model, ETreePath parent_node, ETreePath removed_node, - int old_position); + gint old_position); void e_tree_model_node_deleted (ETreeModel *tree_model, ETreePath deleted_node); void e_tree_model_node_request_collapse (ETreeModel *tree_model, diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c index 18267a42c3..fc729ab411 100644 --- a/widgets/table/e-tree-scrolled.c +++ b/widgets/table/e-tree-scrolled.c @@ -73,8 +73,8 @@ gboolean e_tree_scrolled_construct (ETreeScrolled *ets, ETreeModel *etm, ETableExtras *ete, - const char *spec, - const char *state) + const gchar *spec, + const gchar *state) { g_return_val_if_fail(ets != NULL, FALSE); g_return_val_if_fail(E_IS_TREE_SCROLLED(ets), FALSE); @@ -93,8 +93,8 @@ e_tree_scrolled_construct (ETreeScrolled *ets, GtkWidget *e_tree_scrolled_new (ETreeModel *etm, ETableExtras *ete, - const char *spec, - const char *state) + const gchar *spec, + const gchar *state) { ETreeScrolled *ets; @@ -120,8 +120,8 @@ gboolean e_tree_scrolled_construct_from_spec_file (ETreeScrolled *ets, ETreeModel *etm, ETableExtras *ete, - const char *spec_fn, - const char *state_fn) + const gchar *spec_fn, + const gchar *state_fn) { g_return_val_if_fail(ets != NULL, FALSE); g_return_val_if_fail(E_IS_TREE_SCROLLED(ets), FALSE); @@ -140,8 +140,8 @@ e_tree_scrolled_construct_from_spec_file (ETreeScrolled *ets, GtkWidget *e_tree_scrolled_new_from_spec_file (ETreeModel *etm, ETableExtras *ete, - const char *spec_fn, - const char *state_fn) + const gchar *spec_fn, + const gchar *state_fn) { ETreeScrolled *ets; diff --git a/widgets/table/e-tree-scrolled.h b/widgets/table/e-tree-scrolled.h index 5d4b8de36f..197dd9a083 100644 --- a/widgets/table/e-tree-scrolled.h +++ b/widgets/table/e-tree-scrolled.h @@ -51,22 +51,22 @@ GType e_tree_scrolled_get_type (void); gboolean e_tree_scrolled_construct (ETreeScrolled *ets, ETreeModel *etm, ETableExtras *ete, - const char *spec, - const char *state); + const gchar *spec, + const gchar *state); GtkWidget *e_tree_scrolled_new (ETreeModel *etm, ETableExtras *ete, - const char *spec, - const char *state); + const gchar *spec, + const gchar *state); gboolean e_tree_scrolled_construct_from_spec_file (ETreeScrolled *ets, ETreeModel *etm, ETableExtras *ete, - const char *spec_fn, - const char *state_fn); + const gchar *spec_fn, + const gchar *state_fn); GtkWidget *e_tree_scrolled_new_from_spec_file (ETreeModel *etm, ETableExtras *ete, - const char *spec_fn, - const char *state_fn); + const gchar *spec_fn, + const gchar *state_fn); ETree *e_tree_scrolled_get_tree (ETreeScrolled *ets); diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 1d694f9b60..68316f72bb 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -179,7 +179,7 @@ etsm_node_data_changed (ETreeModel *etm, ETreePath node, ETreeSelectionModel *et } static void -etsm_node_col_changed (ETreeModel *etm, ETreePath node, int col, ETreeSelectionModel *etsm) +etsm_node_col_changed (ETreeModel *etm, ETreePath node, gint col, ETreeSelectionModel *etsm) { free_id (etsm); } @@ -191,7 +191,7 @@ etsm_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETreeSel } static void -etsm_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, int old_position, ETreeSelectionModel *etsm) +etsm_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, gint old_position, ETreeSelectionModel *etsm) { restore_cursor (etsm, etm); } @@ -392,7 +392,7 @@ etsm_row_foreach_cb (gpointer key, gpointer value, gpointer user_data) { ETreePath path = key; ModelAndCallback *mac = user_data; - int row = e_tree_table_adapter_row_of_node(mac->etsm->priv->etta, path); + gint row = e_tree_table_adapter_row_of_node(mac->etsm->priv->etta, path); if (row >= 0) mac->callback(row, mac->closure); } @@ -521,7 +521,7 @@ etsm_invert_selection (ESelectionModel *selection) } static void -etsm_change_one_row(ESelectionModel *selection, int row, gboolean grow) +etsm_change_one_row(ESelectionModel *selection, gint row, gboolean grow) { ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection); ETreePath path; @@ -539,7 +539,7 @@ etsm_change_one_row(ESelectionModel *selection, int row, gboolean grow) } static void -etsm_change_cursor (ESelectionModel *selection, int row, int col) +etsm_change_cursor (ESelectionModel *selection, gint row, gint col) { ETreeSelectionModel *etsm; @@ -570,9 +570,9 @@ etsm_cursor_col (ESelectionModel *selection) } static void -etsm_get_rows(int row, void *d) +etsm_get_rows(gint row, gpointer d) { - int **rowp = d; + gint **rowp = d; **rowp = row; (*rowp)++; @@ -583,7 +583,7 @@ etsm_select_single_row (ESelectionModel *selection, gint row) { ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection); ETreePath path = e_tree_table_adapter_node_at_row (etsm->priv->etta, row); - int rows[5], *rowp = NULL, size; + gint rows[5], *rowp = NULL, size; g_return_if_fail (path != NULL); @@ -601,7 +601,7 @@ etsm_select_single_row (ESelectionModel *selection, gint row) e_selection_model_selection_changed(E_SELECTION_MODEL(etsm)); } else { if (rowp) { - int *p = rows; + gint *p = rows; while (plen;i++) { path = paths->pdata[i]; @@ -723,7 +723,7 @@ e_tree_selection_model_add_to_selection (ETreeSelectionModel *etsm, ETreePath pa void e_tree_selection_model_change_cursor (ETreeSelectionModel *etsm, ETreePath path) { - int row; + gint row; etsm->priv->cursor_path = path; diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c index 3252a3db18..2704b7ea24 100644 --- a/widgets/table/e-tree-simple.c +++ b/widgets/table/e-tree-simple.c @@ -39,19 +39,19 @@ simple_column_count (ETableModel *etm) } /* The default for simple_duplicate_value is to return the raw value. */ -static void * -simple_duplicate_value (ETableModel *etm, int col, const void *value) +static gpointer +simple_duplicate_value (ETableModel *etm, gint col, gconstpointer value) { ETreeSimple *simple = E_TREE_SIMPLE(etm); if (simple->duplicate_value) return simple->duplicate_value (etm, col, value, simple->model_data); else - return (void *)value; + return (gpointer)value; } static void -simple_free_value (ETableModel *etm, int col, void *value) +simple_free_value (ETableModel *etm, gint col, gpointer value) { ETreeSimple *simple = E_TREE_SIMPLE(etm); @@ -59,8 +59,8 @@ simple_free_value (ETableModel *etm, int col, void *value) simple->free_value (etm, col, value, simple->model_data); } -static void * -simple_initialize_value (ETableModel *etm, int col) +static gpointer +simple_initialize_value (ETableModel *etm, gint col) { ETreeSimple *simple = E_TREE_SIMPLE(etm); @@ -71,7 +71,7 @@ simple_initialize_value (ETableModel *etm, int col) } static gboolean -simple_value_is_empty (ETableModel *etm, int col, const void *value) +simple_value_is_empty (ETableModel *etm, gint col, gconstpointer value) { ETreeSimple *simple = E_TREE_SIMPLE(etm); @@ -81,8 +81,8 @@ simple_value_is_empty (ETableModel *etm, int col, const void *value) return FALSE; } -static char * -simple_value_to_string (ETableModel *etm, int col, const void *value) +static gchar * +simple_value_to_string (ETableModel *etm, gint col, gconstpointer value) { ETreeSimple *simple = E_TREE_SIMPLE(etm); @@ -92,8 +92,8 @@ simple_value_to_string (ETableModel *etm, int col, const void *value) return g_strdup (""); } -static void * -simple_value_at (ETreeModel *etm, ETreePath *node, int col) +static gpointer +simple_value_at (ETreeModel *etm, ETreePath *node, gint col) { ETreeSimple *simple = E_TREE_SIMPLE(etm); @@ -109,7 +109,7 @@ simple_icon_at (ETreeModel *etm, ETreePath *node) } static void -simple_set_value_at (ETreeModel *etm, ETreePath *node, int col, const void *val) +simple_set_value_at (ETreeModel *etm, ETreePath *node, gint col, gconstpointer val) { ETreeSimple *simple = E_TREE_SIMPLE(etm); @@ -117,7 +117,7 @@ simple_set_value_at (ETreeModel *etm, ETreePath *node, int col, const void *val) } static gboolean -simple_is_editable (ETreeModel *etm, ETreePath *node, int col) +simple_is_editable (ETreeModel *etm, ETreePath *node, gint col) { ETreeSimple *simple = E_TREE_SIMPLE(etm); diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h index bb64aa18a2..47a5e6bdf1 100644 --- a/widgets/table/e-tree-simple.h +++ b/widgets/table/e-tree-simple.h @@ -37,10 +37,10 @@ G_BEGIN_DECLS #define E_TREE_SIMPLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TREE_SIMPLE_TYPE, ETreeSimpleClass)) -typedef GdkPixbuf* (*ETreeSimpleIconAtFn) (ETreeModel *etree, ETreePath *path, void *model_data); -typedef void* (*ETreeSimpleValueAtFn) (ETreeModel *etree, ETreePath *path, int col, void *model_data); -typedef void (*ETreeSimpleSetValueAtFn) (ETreeModel *etree, ETreePath *path, int col, const void *val, void *model_data); -typedef gboolean (*ETreeSimpleIsEditableFn) (ETreeModel *etree, ETreePath *path, int col, void *model_data); +typedef GdkPixbuf* (*ETreeSimpleIconAtFn) (ETreeModel *etree, ETreePath *path, gpointer model_data); +typedef gpointer (*ETreeSimpleValueAtFn) (ETreeModel *etree, ETreePath *path, gint col, gpointer model_data); +typedef void (*ETreeSimpleSetValueAtFn) (ETreeModel *etree, ETreePath *path, gint col, gconstpointer val, gpointer model_data); +typedef gboolean (*ETreeSimpleIsEditableFn) (ETreeModel *etree, ETreePath *path, gint col, gpointer model_data); typedef struct { ETreeModel parent; diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c index 432a7897e4..0bc82506e8 100644 --- a/widgets/table/e-tree-sorted-variable.c +++ b/widgets/table/e-tree-sorted-variable.c @@ -48,8 +48,8 @@ struct ETreeSortedVariablePrivate { static void etsv_proxy_model_changed (ETableModel *etm, ETreeSortedVariable *etsv); #if 0 -static void etsv_proxy_model_row_changed (ETableModel *etm, int row, ETreeSortedVariable *etsv); -static void etsv_proxy_model_cell_changed (ETableModel *etm, int col, int row, ETreeSortedVariable *etsv); +static void etsv_proxy_model_row_changed (ETableModel *etm, gint row, ETreeSortedVariable *etsv); +static void etsv_proxy_model_cell_changed (ETableModel *etm, gint col, gint row, ETreeSortedVariable *etsv); #endif static void etsv_sort_info_changed (ETableSortInfo *info, ETreeSortedVariable *etsv); static void etsv_sort (ETreeSortedVariable *etsv); @@ -186,7 +186,7 @@ etsv_proxy_model_changed (ETableModel *etm, ETreeSortedVariable *etsv) } #if 0 static void -etsv_proxy_model_row_changed (ETableModel *etm, int row, ETreeSortedVariable *etsv) +etsv_proxy_model_row_changed (ETableModel *etm, gint row, ETreeSortedVariable *etsv) { ETreeSortedVariable *etsv = E_TABLE_SUBSET_VARIABLE(etsv); @@ -195,7 +195,7 @@ etsv_proxy_model_row_changed (ETableModel *etm, int row, ETreeSortedVariable *et } static void -etsv_proxy_model_cell_changed (ETableModel *etm, int col, int row, ETreeSortedVariable *etsv) +etsv_proxy_model_cell_changed (ETableModel *etm, gint col, gint row, ETreeSortedVariable *etsv) { ETreeSortedVariable *etsv = E_TABLE_SUBSET_VARIABLE(etsv); @@ -214,10 +214,10 @@ etsv_sort_info_changed (ETableSortInfo *info, ETreeSortedVariable *etsv) static int etsv_compare(ETreeSortedVariable *etsv, const ETreePath *path1, const ETreePath *path2) { - int j; - int sort_count = e_table_sort_info_sorting_get_count(etsv->sort_info); - int comp_val = 0; - int ascending = 1; + gint j; + gint sort_count = e_table_sort_info_sorting_get_count(etsv->sort_info); + gint comp_val = 0; + gint ascending = 1; for (j = 0; j < sort_count; j++) { ETableSortColumn column = e_table_sort_info_sorting_get_nth(etsv->sort_info, j); @@ -244,18 +244,18 @@ etsv_compare(ETreeSortedVariable *etsv, const ETreePath *path1, const ETreePath static ETreeSortedVariable *etsv_closure; -int cols_closure; -int *ascending_closure; -int *col_idx_closure; +gint cols_closure; +gint *ascending_closure; +gint *col_idx_closure; GCompareFunc *compare_closure; static int etsv_compare_closure(const ETreePath *path1, const ETreePath *path2) { - int j; - int sort_count = e_table_sort_info_sorting_get_count(etsv_closure->sort_info); - int comp_val = 0; - int ascending = 1; + gint j; + gint sort_count = e_table_sort_info_sorting_get_count(etsv_closure->sort_info); + gint comp_val = 0; + gint ascending = 1; for (j = 0; j < sort_count; j++) { comp_val = (*(compare_closure[j]))(e_tree_model_value_at (etsv_closure->source, path1, col_idx_closure[j]), @@ -276,7 +276,7 @@ etsv_compare_closure(const ETreePath *path1, const ETreePath *path2) } static int -qsort_callback(const void *data1, const void *data2) +qsort_callback(gconstpointer data1, gconstpointer data2) { GNode *node1 = *(GNode **)data1; GNode *node2 = *(GNode **)data2; @@ -284,7 +284,7 @@ qsort_callback(const void *data1, const void *data2) } static int -qsort_callback_source(const void *data1, const void *data2) +qsort_callback_source(gconstpointer data1, gconstpointer data2) { return etsv_compare_closure(data1, data2); } @@ -292,8 +292,8 @@ qsort_callback_source(const void *data1, const void *data2) static void etsv_setup_closures(ETreeSortedVariable *etsv) { - int j; - int cols; + gint j; + gint cols; cols = e_table_sort_info_sorting_get_count(etsv->sort_info); cols_closure = cols; @@ -367,7 +367,7 @@ etsv_sort_tree(ETreeSortedVariable *etsv, GNode *root) static void etsv_sort(ETreeSortedVariable *etsv) { - static int reentering = 0; + static gint reentering = 0; if (reentering) return; reentering = 1; @@ -440,8 +440,8 @@ etsv_add_all_node (ETreeSortedVariable *etsv, ETreePath *path, GNode *node) { ETreeModel *source = etsv->source; ETreePath **children; - int n; - int i; + gint n; + gint i; n = e_tree_model_node_get_children(source, path, &children); qsort(children, n, sizeof(ETreePath *), qsort_callback_source); diff --git a/widgets/table/e-tree-sorted-variable.h b/widgets/table/e-tree-sorted-variable.h index 15f9d8e8af..2d5af111d9 100644 --- a/widgets/table/e-tree-sorted-variable.h +++ b/widgets/table/e-tree-sorted-variable.h @@ -46,11 +46,11 @@ typedef struct { ETableHeader *full_header; - int table_model_changed_id; - int table_model_row_changed_id; - int table_model_cell_changed_id; - int sort_info_changed_id; - int sort_idle_id; + gint table_model_changed_id; + gint table_model_row_changed_id; + gint table_model_cell_changed_id; + gint sort_info_changed_id; + gint sort_idle_id; int insert_idle_id; int insert_count; diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index 092fa87b9b..3ec12c8360 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -66,8 +66,8 @@ struct ETreeSortedPath { ETreeSortedPath *parent; gint num_children; ETreeSortedPath **children; - int position; - int orig_position; + gint position; + gint orig_position; guint needs_resort : 1; guint child_needs_resort : 1; @@ -84,20 +84,20 @@ struct ETreeSortedPriv { ETreeSortedPath *last_access; - int tree_model_pre_change_id; - int tree_model_no_change_id; - int tree_model_node_changed_id; - int tree_model_node_data_changed_id; - int tree_model_node_col_changed_id; - int tree_model_node_inserted_id; - int tree_model_node_removed_id; - int tree_model_node_deleted_id; - int tree_model_node_request_collapse_id; - - int sort_info_changed_id; - int sort_idle_id; - int insert_idle_id; - int insert_count; + gint tree_model_pre_change_id; + gint tree_model_no_change_id; + gint tree_model_node_changed_id; + gint tree_model_node_data_changed_id; + gint tree_model_node_col_changed_id; + gint tree_model_node_inserted_id; + gint tree_model_node_removed_id; + gint tree_model_node_deleted_id; + gint tree_model_node_request_collapse_id; + + gint sort_info_changed_id; + gint sort_idle_id; + gint insert_idle_id; + gint insert_count; guint in_resort_idle : 1; guint nested_resort_idle : 1; @@ -184,11 +184,11 @@ check_last_access (ETreeSorted *ets, ETreePath corresponding) #ifdef CHECK_AROUND_LAST_ACCESS parent = ets->priv->last_access->parent; if (parent && parent->children) { - int position = ets->priv->last_access->position; - int end = MIN(parent->num_children, position + 10); - int start = MAX(0, position - 10); - int initial = MAX (MIN (position, end), start); - int i; + gint position = ets->priv->last_access->position; + gint end = MIN(parent->num_children, position + 10); + gint start = MAX(0, position - 10); + gint initial = MAX (MIN (position, end), start); + gint i; for (i = initial; i < end; i++) { if (parent->children[i] && parent->children[i]->corresponding == corresponding) { @@ -211,9 +211,9 @@ check_last_access (ETreeSorted *ets, ETreePath corresponding) static ETreeSortedPath * find_path(ETreeSorted *ets, ETreePath corresponding) { - int depth; + gint depth; ETreePath *sequence; - int i; + gint i; ETreeSortedPath *path; ETreeSortedPath *check_last; @@ -238,7 +238,7 @@ find_path(ETreeSorted *ets, ETreePath corresponding) path = ets->priv->root; for (i = depth - 1; i >= 0 && path != NULL; i --) { - int j; + gint j; if (path->num_children == -1) { path = NULL; @@ -268,7 +268,7 @@ find_path(ETreeSorted *ets, ETreePath corresponding) static ETreeSortedPath * find_child_path(ETreeSorted *ets, ETreeSortedPath *parent, ETreePath corresponding) { - int i; + gint i; if (corresponding == NULL) return NULL; @@ -287,9 +287,9 @@ find_child_path(ETreeSorted *ets, ETreeSortedPath *parent, ETreePath correspondi static ETreeSortedPath * find_or_create_path(ETreeSorted *ets, ETreePath corresponding) { - int depth; + gint depth; ETreePath *sequence; - int i; + gint i; ETreeSortedPath *path; ETreeSortedPath *check_last; @@ -314,7 +314,7 @@ find_or_create_path(ETreeSorted *ets, ETreePath corresponding) path = ets->priv->root; for (i = depth - 1; i >= 0 && path != NULL; i --) { - int j; + gint j; if (path->num_children == -1) { generate_children(ets, path); @@ -343,7 +343,7 @@ find_or_create_path(ETreeSorted *ets, ETreePath corresponding) static void free_children (ETreeSortedPath *path) { - int i; + gint i; if (path == NULL) return; @@ -388,8 +388,8 @@ new_path (ETreeSortedPath *parent, ETreePath corresponding) static gboolean reposition_path (ETreeSorted *ets, ETreeSortedPath *path) { - int new_index; - int old_index = path->position; + gint new_index; + gint old_index = path->position; ETreeSortedPath *parent = path->parent; gboolean changed = FALSE; if (parent) { @@ -412,7 +412,7 @@ reposition_path (ETreeSorted *ets, ETreeSortedPath *path) old_index); if (new_index > old_index) { - int i; + gint i; ets->priv->insert_count++; memmove(parent->children + old_index, parent->children + old_index + 1, sizeof (ETreePath) * (new_index - old_index)); parent->children[new_index] = path; @@ -422,7 +422,7 @@ reposition_path (ETreeSorted *ets, ETreeSortedPath *path) e_tree_model_node_changed(E_TREE_MODEL(ets), parent); e_tree_sorted_node_resorted(ets, parent); } else if (new_index < old_index) { - int i; + gint i; ets->priv->insert_count++; memmove(parent->children + new_index + 1, parent->children + new_index, sizeof (ETreePath) * (old_index - new_index)); parent->children[new_index] = path; @@ -443,7 +443,7 @@ static void regenerate_children(ETreeSorted *ets, ETreeSortedPath *path) { ETreeSortedPath **children; - int i; + gint i; children = g_new(ETreeSortedPath *, path->num_children); for (i = 0; i < path->num_children; i++) @@ -456,8 +456,8 @@ static void generate_children(ETreeSorted *ets, ETreeSortedPath *path) { ETreePath child; - int i; - int count; + gint i; + gint count; free_children(path); @@ -492,7 +492,7 @@ resort_node (ETreeSorted *ets, ETreeSortedPath *path, gboolean resort_all_childr if (needs_resort && send_signals) e_tree_model_pre_change(E_TREE_MODEL(ets)); if (needs_resort) { - int i; + gint i; d(g_print("Start sort of node %p\n", path)); if (needs_regen) regenerate_children(ets, path); @@ -511,7 +511,7 @@ resort_node (ETreeSorted *ets, ETreeSortedPath *path, gboolean resort_all_childr if (path->resort_all_children) resort_all_children = TRUE; if ((resort_all_children || path->child_needs_resort) && path->num_children >= 0) { - int i; + gint i; for (i = 0; i < path->num_children; i++) { resort_node(ets, path->children[i], resort_all_children, needs_regen, send_signals && !needs_resort); } @@ -779,7 +779,7 @@ ets_get_children (ETreeModel *etm, ETreePath node, ETreePath **nodes) n_children = path->num_children; if (nodes) { - int i; + gint i; (*nodes) = g_malloc (sizeof (ETreePath) * n_children); for (i = 0; i < n_children; i ++) { @@ -851,7 +851,7 @@ ets_has_get_node_by_id (ETreeModel *etm) } static ETreePath -ets_get_node_by_id (ETreeModel *etm, const char *save_id) +ets_get_node_by_id (ETreeModel *etm, const gchar *save_id) { ETreeSorted *ets = E_TREE_SORTED(etm); ETreePath node; @@ -870,8 +870,8 @@ ets_has_change_pending (ETreeModel *etm) } -static void * -ets_value_at (ETreeModel *etm, ETreePath node, int col) +static gpointer +ets_value_at (ETreeModel *etm, ETreePath node, gint col) { ETreeSorted *ets = E_TREE_SORTED(etm); ETreeSortedPath *path = node; @@ -880,7 +880,7 @@ ets_value_at (ETreeModel *etm, ETreePath node, int col) } static void -ets_set_value_at (ETreeModel *etm, ETreePath node, int col, const void *val) +ets_set_value_at (ETreeModel *etm, ETreePath node, gint col, gconstpointer val) { ETreeSorted *ets = E_TREE_SORTED(etm); ETreeSortedPath *path = node; @@ -889,7 +889,7 @@ ets_set_value_at (ETreeModel *etm, ETreePath node, int col, const void *val) } static gboolean -ets_is_editable (ETreeModel *etm, ETreePath node, int col) +ets_is_editable (ETreeModel *etm, ETreePath node, gint col) { ETreeSorted *ets = E_TREE_SORTED(etm); ETreeSortedPath *path = node; @@ -899,8 +899,8 @@ ets_is_editable (ETreeModel *etm, ETreePath node, int col) /* The default for ets_duplicate_value is to return the raw value. */ -static void * -ets_duplicate_value (ETreeModel *etm, int col, const void *value) +static gpointer +ets_duplicate_value (ETreeModel *etm, gint col, gconstpointer value) { ETreeSorted *ets = E_TREE_SORTED(etm); @@ -908,15 +908,15 @@ ets_duplicate_value (ETreeModel *etm, int col, const void *value) } static void -ets_free_value (ETreeModel *etm, int col, void *value) +ets_free_value (ETreeModel *etm, gint col, gpointer value) { ETreeSorted *ets = E_TREE_SORTED(etm); e_tree_model_free_value (ets->priv->source, col, value); } -static void * -ets_initialize_value (ETreeModel *etm, int col) +static gpointer +ets_initialize_value (ETreeModel *etm, gint col) { ETreeSorted *ets = E_TREE_SORTED(etm); @@ -924,15 +924,15 @@ ets_initialize_value (ETreeModel *etm, int col) } static gboolean -ets_value_is_empty (ETreeModel *etm, int col, const void *value) +ets_value_is_empty (ETreeModel *etm, gint col, gconstpointer value) { ETreeSorted *ets = E_TREE_SORTED(etm); return e_tree_model_value_is_empty (ets->priv->source, col, value); } -static char * -ets_value_to_string (ETreeModel *etm, int col, const void *value) +static gchar * +ets_value_to_string (ETreeModel *etm, gint col, gconstpointer value) { ETreeSorted *ets = E_TREE_SORTED(etm); @@ -999,7 +999,7 @@ ets_proxy_node_data_changed (ETreeModel *etm, ETreePath node, ETreeSorted *ets) } static void -ets_proxy_node_col_changed (ETreeModel *etm, ETreePath node, int col, ETreeSorted *ets) +ets_proxy_node_col_changed (ETreeModel *etm, ETreePath node, gint col, ETreeSorted *ets) { ETreeSortedPath *path = find_path(ets, node); @@ -1021,10 +1021,10 @@ ets_proxy_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETr ETreeSortedPath *parent_path = find_path(ets, parent); if (parent_path && parent_path->num_children != -1) { - int i; - int j; + gint i; + gint j; ETreeSortedPath *path; - int position = parent_path->num_children; + gint position = parent_path->num_children; ETreePath counter; for (counter = e_tree_model_node_get_next(etm, child); @@ -1084,7 +1084,7 @@ ets_proxy_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETr } static void -ets_proxy_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, int old_position, ETreeSorted *ets) +ets_proxy_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, gint old_position, ETreeSorted *ets) { ETreeSortedPath *parent_path = find_path(ets, parent); ETreeSortedPath *path; @@ -1098,7 +1098,7 @@ ets_proxy_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, int ets->priv->last_access = NULL; if (path && parent_path && parent_path->num_children != -1) { - int i; + gint i; for (i = 0; i < parent_path->num_children; i++) { if (parent_path->children[i]->orig_position > old_position) parent_path->children[i]->orig_position --; @@ -1313,7 +1313,7 @@ e_tree_sorted_model_to_view_path (ETreeSorted *ets, return find_or_create_path(ets, model_path); } -int +gint e_tree_sorted_orig_position (ETreeSorted *ets, ETreePath path) { @@ -1321,7 +1321,7 @@ e_tree_sorted_orig_position (ETreeSorted *ets, return sorted_path->orig_position; } -int +gint e_tree_sorted_node_num_children (ETreeSorted *ets, ETreePath path) { diff --git a/widgets/table/e-tree-sorted.h b/widgets/table/e-tree-sorted.h index 1e286b7e75..45adbef1fb 100644 --- a/widgets/table/e-tree-sorted.h +++ b/widgets/table/e-tree-sorted.h @@ -69,9 +69,9 @@ ETreePath e_tree_sorted_view_to_model_path (ETreeSorted *ets, ETreePath view_path); ETreePath e_tree_sorted_model_to_view_path (ETreeSorted *ets, ETreePath model_path); -int e_tree_sorted_orig_position (ETreeSorted *ets, +gint e_tree_sorted_orig_position (ETreeSorted *ets, ETreePath path); -int e_tree_sorted_node_num_children (ETreeSorted *ets, +gint e_tree_sorted_node_num_children (ETreeSorted *ets, ETreePath path); void e_tree_sorted_node_resorted (ETreeSorted *tree_model, diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 7cfeab33ed..2018ea59bb 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -60,8 +60,8 @@ struct ETreeTableAdapterPriv { ETableSortInfo *sort_info; ETableHeader *header; - int n_map; - int n_vals_allocated; + gint n_map; + gint n_vals_allocated; node_t **map_table; GHashTable *nodes; GNode *root; @@ -69,22 +69,22 @@ struct ETreeTableAdapterPriv { guint root_visible : 1; guint remap_needed : 1; - int last_access; + gint last_access; - int pre_change_id; - int no_change_id; + gint pre_change_id; + gint no_change_id; int rebuilt_id; - int node_changed_id; - int node_data_changed_id; - int node_col_changed_id; - int node_inserted_id; - int node_removed_id; - int node_request_collapse_id; - int sort_info_changed_id; + gint node_changed_id; + gint node_data_changed_id; + gint node_col_changed_id; + gint node_inserted_id; + gint node_removed_id; + gint node_request_collapse_id; + gint sort_info_changed_id; guint resort_idle_id; - int force_expanded_state; /* use this instead of model's default if not 0; <0 ... collapse, >0 ... expand */ + gint force_expanded_state; /* use this instead of model's default if not 0; <0 ... collapse, >0 ... expand */ }; static void etta_sort_info_changed (ETableSortInfo *sort_info, ETreeTableAdapter *etta); @@ -103,7 +103,7 @@ lookup_gnode(ETreeTableAdapter *etta, ETreePath path) } static void -resize_map(ETreeTableAdapter *etta, int size) +resize_map(ETreeTableAdapter *etta, gint size) { if (size > etta->priv->n_vals_allocated) { etta->priv->n_vals_allocated = MAX(etta->priv->n_vals_allocated + INCREMENT_AMOUNT, size); @@ -114,7 +114,7 @@ resize_map(ETreeTableAdapter *etta, int size) } static void -move_map_elements(ETreeTableAdapter *etta, int to, int from, int count) +move_map_elements(ETreeTableAdapter *etta, gint to, gint from, gint count) { if (count <= 0 || from >= etta->priv->n_map) return; @@ -140,7 +140,7 @@ fill_map(ETreeTableAdapter *etta, gint index, GNode *gnode) static void remap_indices(ETreeTableAdapter *etta) { - int i; + gint i; for (i = 0; i < etta->priv->n_map; i++) etta->priv->map_table[i]->index = i; etta->priv->remap_needed = FALSE; @@ -163,7 +163,7 @@ resort_node(ETreeTableAdapter *etta, GNode *gnode, gboolean recurse) node_t *node = (node_t *)gnode->data; ETreePath *paths, path; GNode *prev, *curr; - int i, count; + gint i, count; gboolean sort_needed; if (node->num_visible_children == 0) @@ -222,7 +222,7 @@ get_row(ETreeTableAdapter *etta, ETreePath path) } static ETreePath -get_path (ETreeTableAdapter *etta, int row) +get_path (ETreeTableAdapter *etta, gint row) { if (row == -1 && etta->priv->n_map > 0) row = etta->priv->n_map - 1; @@ -263,7 +263,7 @@ static int delete_children(ETreeTableAdapter *etta, GNode *gnode) { node_t *node = (node_t *)gnode->data; - int to_remove = node ? node->num_visible_children : 0; + gint to_remove = node ? node->num_visible_children : 0; if (to_remove == 0) return 0; @@ -280,9 +280,9 @@ delete_children(ETreeTableAdapter *etta, GNode *gnode) static void delete_node(ETreeTableAdapter *etta, ETreePath parent, ETreePath path) { - int to_remove = 1; - int parent_row = get_row(etta, parent); - int row = get_row(etta, path); + gint to_remove = 1; + gint parent_row = get_row(etta, parent); + gint row = get_row(etta, path); GNode *gnode = lookup_gnode(etta, path); GNode *parent_gnode = lookup_gnode(etta, parent); @@ -338,8 +338,8 @@ static gint insert_children(ETreeTableAdapter *etta, GNode *gnode) { ETreePath path, tmp; - int count = 0; - int pos = 0; + gint count = 0; + gint pos = 0; path = ((node_t *)gnode->data)->path; for (tmp = e_tree_model_node_get_first_child(etta->priv->source, path); @@ -361,7 +361,7 @@ generate_tree(ETreeTableAdapter *etta, ETreePath path) { GNode *gnode; node_t *node; - int size; + gint size; e_table_model_pre_change(E_TABLE_MODEL(etta)); @@ -391,7 +391,7 @@ insert_node(ETreeTableAdapter *etta, ETreePath parent, ETreePath path) GNode *gnode, *parent_gnode; node_t *node, *parent_node; gboolean expandable; - int size, row; + gint size, row; e_table_model_pre_change(E_TABLE_MODEL(etta)); @@ -583,7 +583,7 @@ etta_has_save_id (ETableModel *etm) } static gchar * -etta_get_save_id (ETableModel *etm, int row) +etta_get_save_id (ETableModel *etm, gint row) { ETreeTableAdapter *etta = (ETreeTableAdapter *)etm; @@ -607,8 +607,8 @@ etta_row_count (ETableModel *etm) return etta->priv->n_map; } -static void * -etta_value_at (ETableModel *etm, int col, int row) +static gpointer +etta_value_at (ETableModel *etm, gint col, gint row) { ETreeTableAdapter *etta = (ETreeTableAdapter *)etm; @@ -627,7 +627,7 @@ etta_value_at (ETableModel *etm, int col, int row) } static void -etta_set_value_at (ETableModel *etm, int col, int row, const void *val) +etta_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val) { ETreeTableAdapter *etta = (ETreeTableAdapter *)etm; @@ -635,7 +635,7 @@ etta_set_value_at (ETableModel *etm, int col, int row, const void *val) } static gboolean -etta_is_cell_editable (ETableModel *etm, int col, int row) +etta_is_cell_editable (ETableModel *etm, gint col, gint row) { ETreeTableAdapter *etta = (ETreeTableAdapter *)etm; @@ -643,12 +643,12 @@ etta_is_cell_editable (ETableModel *etm, int col, int row) } static void -etta_append_row (ETableModel *etm, ETableModel *source, int row) +etta_append_row (ETableModel *etm, ETableModel *source, gint row) { } -static void * -etta_duplicate_value (ETableModel *etm, int col, const void *value) +static gpointer +etta_duplicate_value (ETableModel *etm, gint col, gconstpointer value) { ETreeTableAdapter *etta = (ETreeTableAdapter *)etm; @@ -656,15 +656,15 @@ etta_duplicate_value (ETableModel *etm, int col, const void *value) } static void -etta_free_value (ETableModel *etm, int col, void *value) +etta_free_value (ETableModel *etm, gint col, gpointer value) { ETreeTableAdapter *etta = (ETreeTableAdapter *)etm; e_tree_model_free_value (etta->priv->source, col, value); } -static void * -etta_initialize_value (ETableModel *etm, int col) +static gpointer +etta_initialize_value (ETableModel *etm, gint col) { ETreeTableAdapter *etta = (ETreeTableAdapter *)etm; @@ -672,15 +672,15 @@ etta_initialize_value (ETableModel *etm, int col) } static gboolean -etta_value_is_empty (ETableModel *etm, int col, const void *value) +etta_value_is_empty (ETableModel *etm, gint col, gconstpointer value) { ETreeTableAdapter *etta = (ETreeTableAdapter *)etm; return e_tree_model_value_is_empty (etta->priv->source, col, value); } -static char * -etta_value_to_string (ETableModel *etm, int col, const void *value) +static gchar * +etta_value_to_string (ETableModel *etm, gint col, gconstpointer value) { ETreeTableAdapter *etta = (ETreeTableAdapter *)etm; @@ -793,7 +793,7 @@ etta_proxy_node_changed (ETreeModel *etm, ETreePath path, ETreeTableAdapter *ett static void etta_proxy_node_data_changed (ETreeModel *etm, ETreePath path, ETreeTableAdapter *etta) { - int row = get_row(etta, path); + gint row = get_row(etta, path); if (row == -1) { e_table_model_no_change(E_TABLE_MODEL(etta)); @@ -804,9 +804,9 @@ etta_proxy_node_data_changed (ETreeModel *etm, ETreePath path, ETreeTableAdapter } static void -etta_proxy_node_col_changed (ETreeModel *etm, ETreePath path, int col, ETreeTableAdapter *etta) +etta_proxy_node_col_changed (ETreeModel *etm, ETreePath path, gint col, ETreeTableAdapter *etta) { - int row = get_row(etta, path); + gint row = get_row(etta, path); if (row == -1) { e_table_model_no_change(E_TABLE_MODEL(etta)); @@ -828,7 +828,7 @@ etta_proxy_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ET } static void -etta_proxy_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, int old_position, ETreeTableAdapter *etta) +etta_proxy_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, gint old_position, ETreeTableAdapter *etta) { delete_node(etta, parent, child); e_table_model_changed(E_TABLE_MODEL(etta)); @@ -926,8 +926,8 @@ save_expanded_state_func (gpointer keyp, gpointer value, gpointer data) if (node->expanded != tar->expanded_default) { gchar *save_id = e_tree_model_get_save_id(tar->model, path); - xmlnode = xmlNewChild (tar->root, NULL, (const unsigned char *)"node", NULL); - e_xml_set_string_prop_by_name(xmlnode, (const unsigned char *)"id", save_id); + xmlnode = xmlNewChild (tar->root, NULL, (const guchar *)"node", NULL); + e_xml_set_string_prop_by_name(xmlnode, (const guchar *)"id", save_id); g_free(save_id); } } @@ -941,16 +941,16 @@ e_tree_table_adapter_save_expanded_state_xml (ETreeTableAdapter *etta) g_return_val_if_fail (etta != NULL, NULL); - doc = xmlNewDoc ((const unsigned char *)"1.0"); - root = xmlNewDocNode (doc, NULL, (const unsigned char *)"expanded_state", NULL); + doc = xmlNewDoc ((const guchar *)"1.0"); + root = xmlNewDocNode (doc, NULL, (const guchar *)"expanded_state", NULL); xmlDocSetRootElement (doc, root); tar.model = etta->priv->source; tar.root = root; tar.expanded_default = e_tree_model_get_expanded_default(etta->priv->source); - e_xml_set_integer_prop_by_name (root, (const unsigned char *)"vers", 2); - e_xml_set_bool_prop_by_name (root, (const unsigned char *)"default", tar.expanded_default); + e_xml_set_integer_prop_by_name (root, (const guchar *)"vers", 2); + e_xml_set_bool_prop_by_name (root, (const guchar *)"default", tar.expanded_default); g_hash_table_foreach (etta->priv->nodes, save_expanded_state_func, &tar); @@ -958,7 +958,7 @@ e_tree_table_adapter_save_expanded_state_xml (ETreeTableAdapter *etta) } void -e_tree_table_adapter_save_expanded_state (ETreeTableAdapter *etta, const char *filename) +e_tree_table_adapter_save_expanded_state (ETreeTableAdapter *etta, const gchar *filename) { xmlDoc *doc; @@ -972,11 +972,11 @@ e_tree_table_adapter_save_expanded_state (ETreeTableAdapter *etta, const char *f } static xmlDoc * -open_file (ETreeTableAdapter *etta, const char *filename) +open_file (ETreeTableAdapter *etta, const gchar *filename) { xmlDoc *doc; xmlNode *root; - int vers; + gint vers; gboolean model_default, saved_default; if (!g_file_test (filename, G_FILE_TEST_EXISTS)) @@ -996,18 +996,18 @@ open_file (ETreeTableAdapter *etta, const char *filename) return NULL; root = xmlDocGetRootElement (doc); - if (root == NULL || strcmp ((char *)root->name, "expanded_state")) { + if (root == NULL || strcmp ((gchar *)root->name, "expanded_state")) { xmlFreeDoc (doc); return NULL; } - vers = e_xml_get_integer_prop_by_name_with_default (root, (const unsigned char *)"vers", 0); + vers = e_xml_get_integer_prop_by_name_with_default (root, (const guchar *)"vers", 0); if (vers > 2) { xmlFreeDoc (doc); return NULL; } model_default = e_tree_model_get_expanded_default (etta->priv->source); - saved_default = e_xml_get_bool_prop_by_name_with_default (root, (const unsigned char *)"default", !model_default); + saved_default = e_xml_get_bool_prop_by_name_with_default (root, (const guchar *)"default", !model_default); if (saved_default != model_default) { xmlFreeDoc (doc); return NULL; @@ -1018,7 +1018,7 @@ open_file (ETreeTableAdapter *etta, const char *filename) /* state: <0 ... collapse; 0 ... use default; >0 ... expand */ void -e_tree_table_adapter_force_expanded_state (ETreeTableAdapter *etta, int state) +e_tree_table_adapter_force_expanded_state (ETreeTableAdapter *etta, gint state) { g_return_if_fail (etta != NULL); @@ -1041,10 +1041,10 @@ e_tree_table_adapter_load_expanded_state_xml (ETreeTableAdapter *etta, xmlDoc *d model_default = e_tree_model_get_expanded_default(etta->priv->source); - if (!strcmp ((char *)root->name, "expanded_state")) { - char *state; + if (!strcmp ((gchar *)root->name, "expanded_state")) { + gchar *state; - state = e_xml_get_string_prop_by_name_with_default (root, (const unsigned char *)"default", ""); + state = e_xml_get_string_prop_by_name_with_default (root, (const guchar *)"default", ""); if (state[0] == 't') file_default = TRUE; @@ -1062,15 +1062,15 @@ e_tree_table_adapter_load_expanded_state_xml (ETreeTableAdapter *etta, xmlDoc *d } for (child = root->xmlChildrenNode; child; child = child->next) { - char *id; + gchar *id; ETreePath path; - if (strcmp ((char *)child->name, "node")) { + if (strcmp ((gchar *)child->name, "node")) { d(g_warning ("unknown node '%s' in %s", child->name, filename)); continue; } - id = e_xml_get_string_prop_by_name_with_default (child, (const unsigned char *)"id", ""); + id = e_xml_get_string_prop_by_name_with_default (child, (const guchar *)"id", ""); if (!strcmp(id, "")) { g_free(id); @@ -1088,7 +1088,7 @@ e_tree_table_adapter_load_expanded_state_xml (ETreeTableAdapter *etta, xmlDoc *d } void -e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta, const char *filename) +e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta, const gchar *filename) { xmlDoc *doc; @@ -1106,7 +1106,7 @@ e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta, const char *f void e_tree_table_adapter_root_node_set_visible (ETreeTableAdapter *etta, gboolean visible) { - int size; + gint size; g_return_if_fail (etta != NULL); @@ -1133,7 +1133,7 @@ e_tree_table_adapter_node_set_expanded (ETreeTableAdapter *etta, ETreePath path, { GNode *gnode = lookup_gnode(etta, path); node_t *node; - int row; + gint row; if (!expanded && (!gnode || (e_tree_model_node_is_root (etta->priv->source, path) && !etta->priv->root_visible))) return; @@ -1163,7 +1163,7 @@ e_tree_table_adapter_node_set_expanded (ETreeTableAdapter *etta, ETreePath path, if (expanded) { - int num_children = insert_children(etta, gnode); + gint num_children = insert_children(etta, gnode); update_child_counts(gnode, num_children); if (etta->priv->sort_info && e_table_sort_info_sorting_get_count(etta->priv->sort_info) > 0) resort_node(etta, gnode, TRUE); @@ -1175,7 +1175,7 @@ e_tree_table_adapter_node_set_expanded (ETreeTableAdapter *etta, ETreePath path, } else e_table_model_no_change(E_TABLE_MODEL(etta)); } else { - int num_children = delete_children(etta, gnode); + gint num_children = delete_children(etta, gnode); if (num_children == 0) { e_table_model_no_change(E_TABLE_MODEL(etta)); return; @@ -1202,12 +1202,12 @@ e_tree_table_adapter_node_set_expanded_recurse (ETreeTableAdapter *etta, ETreePa } ETreePath -e_tree_table_adapter_node_at_row (ETreeTableAdapter *etta, int row) +e_tree_table_adapter_node_at_row (ETreeTableAdapter *etta, gint row) { return get_path(etta, row); } -int +gint e_tree_table_adapter_row_of_node (ETreeTableAdapter *etta, ETreePath path) { return get_row(etta, path); diff --git a/widgets/table/e-tree-table-adapter.h b/widgets/table/e-tree-table-adapter.h index 13ab5787c0..6a0f67bca8 100644 --- a/widgets/table/e-tree-table-adapter.h +++ b/widgets/table/e-tree-table-adapter.h @@ -72,12 +72,12 @@ void e_tree_table_adapter_node_set_expanded_recurse (ETreeTableAdapter ETreePath path, gboolean expanded); void e_tree_table_adapter_force_expanded_state (ETreeTableAdapter *etta, - int state); + gint state); void e_tree_table_adapter_root_node_set_visible (ETreeTableAdapter *etta, gboolean visible); ETreePath e_tree_table_adapter_node_at_row (ETreeTableAdapter *etta, - int row); -int e_tree_table_adapter_row_of_node (ETreeTableAdapter *etta, + gint row); +gint e_tree_table_adapter_row_of_node (ETreeTableAdapter *etta, ETreePath path); gboolean e_tree_table_adapter_root_node_is_visible (ETreeTableAdapter *etta); @@ -85,9 +85,9 @@ void e_tree_table_adapter_show_node (ETreeTableAdapter ETreePath path); void e_tree_table_adapter_save_expanded_state (ETreeTableAdapter *etta, - const char *filename); + const gchar *filename); void e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta, - const char *filename); + const gchar *filename); xmlDoc *e_tree_table_adapter_save_expanded_state_xml (ETreeTableAdapter *etta); void e_tree_table_adapter_load_expanded_state_xml (ETreeTableAdapter *etta, xmlDoc *doc); diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index e58ac1bdd9..725654b90e 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -130,14 +130,14 @@ struct ETreePriv { guint search_search_id; guint search_accept_id; - int reflow_idle_id; - int scroll_idle_id; - int hover_idle_id; + gint reflow_idle_id; + gint scroll_idle_id; + gint hover_idle_id; - int table_model_change_id; - int table_row_change_id; - int table_cell_change_id; - int table_rows_delete_id; + gint table_model_change_id; + gint table_row_change_id; + gint table_cell_change_id; + gint table_rows_delete_id; GnomeCanvasItem *info_text; guint info_text_resize_id; @@ -173,22 +173,22 @@ struct ETreePriv { ECursorMode cursor_mode; - int drop_row; + gint drop_row; ETreePath drop_path; - int drop_col; + gint drop_col; GnomeCanvasItem *drop_highlight; - int last_drop_x; - int last_drop_y; - int last_drop_time; + gint last_drop_x; + gint last_drop_y; + gint last_drop_time; GdkDragContext *last_drop_context; - int hover_x; - int hover_y; + gint hover_x; + gint hover_y; - int drag_row; + gint drag_row; ETreePath drag_path; - int drag_col; + gint drag_col; ETreeDragSourceSite *site; GList *expanded_list; @@ -243,7 +243,7 @@ static void et_drag_data_received(GtkWidget *widget, static void scroll_off (ETree *et); static void scroll_on (ETree *et, guint scroll_direction); static void hover_off (ETree *et); -static void hover_on (ETree *et, int x, int y); +static void hover_on (ETree *et, gint x, gint y); static void context_destroyed (gpointer data, GObject *ctx); static void @@ -451,14 +451,14 @@ et_unrealize (GtkWidget *widget) typedef struct { ETree *et; - char *string; + gchar *string; } SearchSearchStruct; static gboolean search_search_callback (ETreeModel *model, ETreePath path, gpointer data) { SearchSearchStruct *cb_data = data; - const void *value; + gconstpointer value; ETableCol *col = current_search_col (cb_data->et); value = e_tree_model_value_at (model, path, cb_data->et->priv->current_search_col->col_idx); @@ -467,7 +467,7 @@ search_search_callback (ETreeModel *model, ETreePath path, gpointer data) } static gboolean -et_search_search (ETableSearch *search, char *string, ETableSearchFlags flags, ETree *et) +et_search_search (ETableSearch *search, gchar *string, ETableSearchFlags flags, ETree *et) { ETreePath cursor; ETreePath found; @@ -483,7 +483,7 @@ et_search_search (ETableSearch *search, char *string, ETableSearchFlags flags, E cursor = e_tree_get_cursor (et); if (cursor && (flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST)) { - const void *value; + gconstpointer value; value = e_tree_model_value_at (et->priv->model, cursor, col->col_idx); @@ -497,7 +497,7 @@ et_search_search (ETableSearch *search, char *string, ETableSearchFlags flags, E found = e_tree_model_node_find (et->priv->model, NULL, cursor, E_TREE_FIND_NEXT_FORWARD, search_search_callback, &cb_data); if (found && found != cursor) { - int model_row; + gint model_row; e_tree_table_adapter_show_node (et->priv->etta, found); model_row = e_tree_table_adapter_row_of_node (et->priv->etta, found); @@ -507,7 +507,7 @@ et_search_search (ETableSearch *search, char *string, ETableSearchFlags flags, E e_selection_model_select_as_key_press(E_SELECTION_MODEL (et->priv->selection), model_row, col->col_idx, GDK_CONTROL_MASK); return TRUE; } else if (cursor && !(flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST)) { - const void *value; + gconstpointer value; value = e_tree_model_value_at (et->priv->model, cursor, col->col_idx); @@ -520,7 +520,7 @@ static void et_search_accept (ETableSearch *search, ETree *et) { ETableCol *col = current_search_col (et); - int cursor; + gint cursor; if (col == NULL) return; @@ -698,7 +698,7 @@ header_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *e_t static void e_tree_setup_header (ETree *e_tree) { - char *pointer; + gchar *pointer; e_tree->priv->header_canvas = GNOME_CANVAS (e_canvas_new ()); GTK_WIDGET_UNSET_FLAGS (e_tree->priv->header_canvas, GTK_CAN_FOCUS); @@ -785,8 +785,8 @@ tree_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, x = y = w = h = 0; if (path) { - int row = e_tree_row_of_node(e_tree, path); - int col = 0; + gint row = e_tree_row_of_node(e_tree, path); + gint col = 0; if (row >= 0) e_table_item_get_cell_geometry (E_TABLE_ITEM (e_tree->priv->item), @@ -805,7 +805,7 @@ tree_canvas_reflow (GnomeCanvas *canvas, ETree *e_tree) } static void -item_cursor_change (ETableItem *eti, int row, ETree *et) +item_cursor_change (ETableItem *eti, gint row, ETree *et) { ETreePath path = e_tree_table_adapter_node_at_row(et->priv->etta, row); g_signal_emit (et, @@ -814,7 +814,7 @@ item_cursor_change (ETableItem *eti, int row, ETree *et) } static void -item_cursor_activated (ETableItem *eti, int row, ETree *et) +item_cursor_activated (ETableItem *eti, gint row, ETree *et) { ETreePath path = e_tree_table_adapter_node_at_row(et->priv->etta, row); g_signal_emit (et, @@ -824,7 +824,7 @@ item_cursor_activated (ETableItem *eti, int row, ETree *et) } static void -item_double_click (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et) +item_double_click (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et) { ETreePath path = e_tree_table_adapter_node_at_row(et->priv->etta, row); g_signal_emit (et, @@ -833,9 +833,9 @@ item_double_click (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et } static gint -item_right_click (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et) +item_right_click (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et) { - int return_val = 0; + gint return_val = 0; ETreePath path = e_tree_table_adapter_node_at_row(et->priv->etta, row); g_signal_emit (et, et_signals [RIGHT_CLICK], 0, @@ -844,9 +844,9 @@ item_right_click (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et) } static gint -item_click (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et) +item_click (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et) { - int return_val = 0; + gint return_val = 0; ETreePath path = e_tree_table_adapter_node_at_row(et->priv->etta, row); g_signal_emit (et, et_signals [CLICK], 0, @@ -855,12 +855,12 @@ item_click (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et) } static gint -item_key_press (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et) +item_key_press (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et) { - int return_val = 0; + gint return_val = 0; GdkEventKey *key = (GdkEventKey *) event; ETreePath path; - int y, row_local, col_local; + gint y, row_local, col_local; GtkAdjustment *vadj; switch (key->keyval) { @@ -945,7 +945,7 @@ item_key_press (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et) } static gint -item_start_drag (ETableItem *eti, int row, int col, GdkEvent *event, ETree *et) +item_start_drag (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et) { ETreePath path; gint return_val = 0; @@ -967,7 +967,7 @@ et_selection_model_selection_changed (ETableSelectionModel *etsm, ETree *et) } static void -et_selection_model_selection_row_changed (ETableSelectionModel *etsm, int row, ETree *et) +et_selection_model_selection_row_changed (ETableSelectionModel *etsm, gint row, ETree *et) { g_signal_emit (et, et_signals [SELECTION_CHANGE], 0); @@ -1018,7 +1018,7 @@ et_canvas_style_set (GtkWidget *widget, GtkStyle *prev_style) static gint white_item_event (GnomeCanvasItem *white_item, GdkEvent *event, ETree *e_tree) { - int return_val = 0; + gint return_val = 0; g_signal_emit (e_tree, et_signals [WHITE_SPACE_EVENT], 0, event, &return_val); @@ -1252,8 +1252,8 @@ ETableState * e_tree_get_state_object (ETree *e_tree) { ETableState *state; - int full_col_count; - int i, j; + gint full_col_count; + gint i, j; state = e_table_state_new(); state->sort_info = e_tree->priv->sort_info; @@ -1342,19 +1342,19 @@ et_table_model_changed (ETableModel *model, ETree *et) } static void -et_table_row_changed (ETableModel *table_model, int row, ETree *et) +et_table_row_changed (ETableModel *table_model, gint row, ETree *et) { et_table_model_changed (table_model, et); } static void -et_table_cell_changed (ETableModel *table_model, int view_col, int row, ETree *et) +et_table_cell_changed (ETableModel *table_model, gint view_col, gint row, ETree *et) { et_table_model_changed (table_model, et); } static void -et_table_rows_deleted (ETableModel *table_model, int row, int count, ETree *et) +et_table_rows_deleted (ETableModel *table_model, gint row, gint count, ETree *et) { ETreePath * node, * prev_node; @@ -1400,7 +1400,7 @@ static gboolean et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete, ETableSpecification *specification, ETableState *state) { - int row = 0; + gint row = 0; if (ete) g_object_ref(ete); @@ -1494,7 +1494,7 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete, **/ gboolean e_tree_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete, - const char *spec_str, const char *state_str) + const gchar *spec_str, const gchar *state_str) { ETableSpecification *specification; ETableState *state; @@ -1553,7 +1553,7 @@ e_tree_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete, **/ gboolean e_tree_construct_from_spec_file (ETree *e_tree, ETreeModel *etm, ETableExtras *ete, - const char *spec_fn, const char *state_fn) + const gchar *spec_fn, const gchar *state_fn) { ETableSpecification *specification; ETableState *state; @@ -1622,7 +1622,7 @@ e_tree_construct_from_spec_file (ETree *e_tree, ETreeModel *etm, ETableExtras *e * The newly created #ETree or %NULL if there's an error. **/ GtkWidget * -e_tree_new (ETreeModel *etm, ETableExtras *ete, const char *spec, const char *state) +e_tree_new (ETreeModel *etm, ETableExtras *ete, const gchar *spec, const gchar *state) { ETree *e_tree; @@ -1662,7 +1662,7 @@ e_tree_new (ETreeModel *etm, ETableExtras *ete, const char *spec, const char *st * The newly created #ETree or %NULL if there's an error. **/ GtkWidget * -e_tree_new_from_spec_file (ETreeModel *etm, ETableExtras *ete, const char *spec_fn, const char *state_fn) +e_tree_new_from_spec_file (ETreeModel *etm, ETableExtras *ete, const gchar *spec_fn, const gchar *state_fn) { ETree *e_tree; @@ -1685,7 +1685,7 @@ void e_tree_set_cursor (ETree *e_tree, ETreePath path) { #ifndef E_TREE_USE_TREE_SELECTION - int row; + gint row; #endif g_return_if_fail(e_tree != NULL); g_return_if_fail(E_IS_TREE(e_tree)); @@ -1712,7 +1712,7 @@ e_tree_get_cursor (ETree *e_tree) #ifdef E_TREE_USE_TREE_SELECTION return e_tree_selection_model_get_cursor (E_TREE_SELECTION_MODEL(e_tree->priv->selection)); #else - int row; + gint row; ETreePath path; g_return_val_if_fail(e_tree != NULL, NULL); g_return_val_if_fail(E_IS_TREE(e_tree), NULL); @@ -1825,7 +1825,7 @@ et_get_property (GObject *object, } typedef struct { - char *arg; + gchar *arg; gboolean setting; } bool_closure; @@ -1926,7 +1926,7 @@ e_tree_get_next_row (ETree *e_tree, g_return_val_if_fail(E_IS_TREE(e_tree), -1); if (e_tree->priv->sorter) { - int i; + gint i; i = e_sorter_model_to_sorted(E_SORTER (e_tree->priv->sorter), model_row); i++; if (i < e_table_model_row_count(E_TABLE_MODEL(e_tree->priv->etta))) { @@ -1948,7 +1948,7 @@ e_tree_get_prev_row (ETree *e_tree, g_return_val_if_fail(E_IS_TREE(e_tree), -1); if (e_tree->priv->sorter) { - int i; + gint i; i = e_sorter_model_to_sorted(E_SORTER (e_tree->priv->sorter), model_row); i--; if (i >= 0) @@ -2022,7 +2022,7 @@ e_tree_root_node_set_visible (ETree *et, gboolean visible) } ETreePath -e_tree_node_at_row (ETree *et, int row) +e_tree_node_at_row (ETree *et, gint row) { ETreePath path; @@ -2031,7 +2031,7 @@ e_tree_node_at_row (ETree *et, int row) return path; } -int +gint e_tree_row_of_node (ETree *et, ETreePath path) { return e_tree_table_adapter_row_of_node (et->priv->etta, path); @@ -2053,7 +2053,7 @@ e_tree_show_node (ETree *et, ETreePath path) } void -e_tree_save_expanded_state (ETree *et, char *filename) +e_tree_save_expanded_state (ETree *et, gchar *filename) { g_return_if_fail (et != NULL); g_return_if_fail (E_IS_TREE(et)); @@ -2062,7 +2062,7 @@ e_tree_save_expanded_state (ETree *et, char *filename) } void -e_tree_load_expanded_state (ETree *et, char *filename) +e_tree_load_expanded_state (ETree *et, gchar *filename) { e_tree_table_adapter_load_expanded_state (et->priv->etta, filename); } @@ -2090,7 +2090,7 @@ e_tree_load_expanded_state_xml (ETree *et, xmlDoc *doc) when using this, be sure to reset to 0 once no forcing is required anymore, aka the build of the tree is done */ void -e_tree_force_expanded_state (ETree *et, int state) +e_tree_force_expanded_state (ETree *et, gint state) { e_tree_table_adapter_force_expanded_state (et->priv->etta, state); } @@ -2321,8 +2321,8 @@ struct _GtkDragSourceInfo void e_tree_drag_get_data (ETree *tree, - int row, - int col, + gint row, + gint col, GdkDragContext *context, GdkAtom target, guint32 time) @@ -2348,14 +2348,14 @@ e_tree_drag_get_data (ETree *tree, */ void e_tree_drag_highlight (ETree *tree, - int row, - int col) + gint row, + gint col) { g_return_if_fail(tree != NULL); g_return_if_fail(E_IS_TREE(tree)); if (row != -1) { - int x, y, width, height; + gint x, y, width, height; if (col == -1) { e_tree_get_cell_geometry (tree, row, 0, &x, &y, &width, &height); x = 0; @@ -2447,7 +2447,7 @@ e_tree_drag_dest_unset (GtkWidget *widget) /* Source side */ static gint -et_real_start_drag (ETree *tree, int row, ETreePath path, int col, GdkEvent *event) +et_real_start_drag (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event) { GtkDragSourceInfo *info; GdkDragContext *context; @@ -2545,8 +2545,8 @@ e_tree_drag_source_unset (ETree *tree) GdkDragContext * e_tree_drag_begin (ETree *tree, - int row, - int col, + gint row, + gint col, GtkTargetList *targets, GdkDragAction actions, gint button, @@ -2582,8 +2582,8 @@ e_tree_drag_begin (ETree *tree, **/ void e_tree_get_cell_at (ETree *tree, - int x, int y, - int *row_return, int *col_return) + gint x, gint y, + gint *row_return, gint *col_return) { g_return_if_fail (tree != NULL); g_return_if_fail (E_IS_TREE (tree)); @@ -2617,9 +2617,9 @@ e_tree_get_cell_at (ETree *tree, **/ void e_tree_get_cell_geometry (ETree *tree, - int row, int col, - int *x_return, int *y_return, - int *width_return, int *height_return) + gint row, gint col, + gint *x_return, gint *y_return, + gint *width_return, gint *height_return) { g_return_if_fail (tree != NULL); g_return_if_fail (E_IS_TREE (tree)); @@ -2703,7 +2703,7 @@ do_drag_motion(ETree *et, guint time) { gboolean ret_val = FALSE; - int row, col; + gint row, col; ETreePath path; e_tree_get_cell_at (et, @@ -2744,7 +2744,7 @@ static gboolean scroll_timeout (gpointer data) { ETree *et = data; - int dx = 0, dy = 0; + gint dx = 0, dy = 0; GtkAdjustment *v, *h; double vvalue, hvalue; @@ -2803,9 +2803,9 @@ static gboolean hover_timeout (gpointer data) { ETree *et = data; - int x = et->priv->hover_x; - int y = et->priv->hover_y; - int row, col; + gint x = et->priv->hover_x; + gint y = et->priv->hover_y; + gint row, col; ETreePath path; e_tree_get_cell_at (et, @@ -2827,7 +2827,7 @@ hover_timeout (gpointer data) } static void -hover_on (ETree *et, int x, int y) +hover_on (ETree *et, gint x, gint y) { et->priv->hover_x = x; et->priv->hover_y = y; @@ -2856,7 +2856,7 @@ collapse_drag (ETree *et, ETreePath drop) } for (list = et->priv->expanded_list; list; list = list->next) { - char *save_id = list->data; + gchar *save_id = list->data; ETreePath path; path = e_tree_model_get_node_by_id (et->priv->model, save_id); @@ -2938,7 +2938,7 @@ et_drag_motion(GtkWidget *widget, guint time, ETree *et) { - int ret_val; + gint ret_val; guint direction = 0; et->priv->last_drop_x = x; @@ -2988,7 +2988,7 @@ et_drag_drop(GtkWidget *widget, ETree *et) { gboolean ret_val = FALSE; - int row, col; + gint row, col; ETreePath path; e_tree_get_cell_at(et, x, @@ -3051,7 +3051,7 @@ et_drag_data_received(GtkWidget *widget, guint time, ETree *et) { - int row, col; + gint row, col; ETreePath path; e_tree_get_cell_at(et, x, @@ -3420,7 +3420,7 @@ tree_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *tree) * Creates an info message in table area, or removes old. **/ void -e_tree_set_info_message (ETree *tree, const char *info_message) +e_tree_set_info_message (ETree *tree, const gchar *info_message) { g_return_if_fail (tree != NULL); g_return_if_fail (tree->priv != NULL); diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h index 426cf9c44d..6bcc21706e 100644 --- a/widgets/table/e-tree.h +++ b/widgets/table/e-tree.h @@ -60,14 +60,14 @@ typedef struct { typedef struct { GtkTableClass parent_class; - void (*cursor_change) (ETree *et, int row, ETreePath path); - void (*cursor_activated) (ETree *et, int row, ETreePath path); + void (*cursor_change) (ETree *et, gint row, ETreePath path); + void (*cursor_activated) (ETree *et, gint row, ETreePath path); void (*selection_change) (ETree *et); - void (*double_click) (ETree *et, int row, ETreePath path, int col, GdkEvent *event); - gint (*right_click) (ETree *et, int row, ETreePath path, int col, GdkEvent *event); - gint (*click) (ETree *et, int row, ETreePath path, int col, GdkEvent *event); - gint (*key_press) (ETree *et, int row, ETreePath path, int col, GdkEvent *event); - gint (*start_drag) (ETree *et, int row, ETreePath path, int col, GdkEvent *event); + void (*double_click) (ETree *et, gint row, ETreePath path, gint col, GdkEvent *event); + gint (*right_click) (ETree *et, gint row, ETreePath path, gint col, GdkEvent *event); + gint (*click) (ETree *et, gint row, ETreePath path, gint col, GdkEvent *event); + gint (*key_press) (ETree *et, gint row, ETreePath path, gint col, GdkEvent *event); + gint (*start_drag) (ETree *et, gint row, ETreePath path, gint col, GdkEvent *event); gint (*state_change) (ETree *et); gint (*white_space_event) (ETree *et, GdkEvent *event); @@ -77,56 +77,56 @@ typedef struct { /* Source side drag signals */ void (* tree_drag_begin) (ETree *tree, - int row, + gint row, ETreePath path, - int col, + gint col, GdkDragContext *context); void (* tree_drag_end) (ETree *tree, - int row, + gint row, ETreePath path, - int col, + gint col, GdkDragContext *context); void (* tree_drag_data_get) (ETree *tree, - int row, + gint row, ETreePath path, - int col, + gint col, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint time); void (* tree_drag_data_delete) (ETree *tree, - int row, + gint row, ETreePath path, - int col, + gint col, GdkDragContext *context); /* Target side drag signals */ void (* tree_drag_leave) (ETree *tree, - int row, + gint row, ETreePath path, - int col, + gint col, GdkDragContext *context, guint time); gboolean (* tree_drag_motion) (ETree *tree, - int row, + gint row, ETreePath path, - int col, + gint col, GdkDragContext *context, gint x, gint y, guint time); gboolean (* tree_drag_drop) (ETree *tree, - int row, + gint row, ETreePath path, - int col, + gint col, GdkDragContext *context, gint x, gint y, guint time); void (* tree_drag_data_received) (ETree *tree, - int row, + gint row, ETreePath path, - int col, + gint col, GdkDragContext *context, gint x, gint y, @@ -139,23 +139,23 @@ GType e_tree_get_type (void); gboolean e_tree_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete, - const char *spec, - const char *state); + const gchar *spec, + const gchar *state); GtkWidget *e_tree_new (ETreeModel *etm, ETableExtras *ete, - const char *spec, - const char *state); + const gchar *spec, + const gchar *state); /* Create an ETree using files. */ gboolean e_tree_construct_from_spec_file (ETree *e_tree, ETreeModel *etm, ETableExtras *ete, - const char *spec_fn, - const char *state_fn); + const gchar *spec_fn, + const gchar *state_fn); GtkWidget *e_tree_new_from_spec_file (ETreeModel *etm, ETableExtras *ete, - const char *spec_fn, - const char *state_fn); + const gchar *spec_fn, + const gchar *state_fn); /* To save the state */ gchar *e_tree_get_state (ETree *e_tree); @@ -200,17 +200,17 @@ gint e_tree_model_to_view_row (ETree *e_tree, gint e_tree_view_to_model_row (ETree *e_tree, gint view_row); void e_tree_get_cell_at (ETree *tree, - int x, - int y, - int *row_return, - int *col_return); + gint x, + gint y, + gint *row_return, + gint *col_return); void e_tree_get_cell_geometry (ETree *tree, - int row, - int col, - int *x_return, - int *y_return, - int *width_return, - int *height_return); + gint row, + gint col, + gint *x_return, + gint *y_return, + gint *width_return, + gint *height_return); /* Useful accessors */ ETreeModel * e_tree_get_model (ETree *et); @@ -220,14 +220,14 @@ ETreeTableAdapter *e_tree_get_table_adapter (ETree *et); /* Drag & drop stuff. */ /* Target */ void e_tree_drag_get_data (ETree *tree, - int row, - int col, + gint row, + gint col, GdkDragContext *context, GdkAtom target, guint32 time); void e_tree_drag_highlight (ETree *tree, - int row, - int col); /* col == -1 to highlight entire row. */ + gint row, + gint col); /* col == -1 to highlight entire row. */ void e_tree_drag_unhighlight (ETree *tree); void e_tree_drag_dest_set (ETree *tree, GtkDestDefaults flags, @@ -256,8 +256,8 @@ void e_tree_drag_source_unset (ETree *tree); * as a GtkTargetList */ GdkDragContext *e_tree_drag_begin (ETree *tree, - int row, - int col, + gint row, + gint col, GtkTargetList *targets, GdkDragAction actions, gint button, @@ -275,23 +275,23 @@ void e_tree_node_set_expanded_recurse (ETree *et, void e_tree_root_node_set_visible (ETree *et, gboolean visible); ETreePath e_tree_node_at_row (ETree *et, - int row); -int e_tree_row_of_node (ETree *et, + gint row); +gint e_tree_row_of_node (ETree *et, ETreePath path); gboolean e_tree_root_node_is_visible (ETree *et); void e_tree_show_node (ETree *et, ETreePath path); void e_tree_save_expanded_state (ETree *et, - char *filename); + gchar *filename); void e_tree_load_expanded_state (ETree *et, - char *filename); + gchar *filename); xmlDoc *e_tree_save_expanded_state_xml (ETree *et); void e_tree_load_expanded_state_xml (ETree *et, xmlDoc *doc); -int e_tree_row_count (ETree *et); +gint e_tree_row_count (ETree *et); GtkWidget *e_tree_get_tooltip (ETree *et); -void e_tree_force_expanded_state (ETree *et, int state); +void e_tree_force_expanded_state (ETree *et, gint state); typedef enum { E_TREE_FIND_NEXT_BACKWARD = 0, @@ -311,7 +311,7 @@ ETableItem * e_tree_get_item(ETree * et); GnomeCanvasItem * e_tree_get_header_item(ETree * et); -void e_tree_set_info_message (ETree *tree, const char *info_message); +void e_tree_set_info_message (ETree *tree, const gchar *info_message); G_END_DECLS diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index c7462e21a6..1bc2090caa 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -222,10 +222,10 @@ static void e_text_model_real_insert_length (ETextModel *model, gint position, const gchar *text, gint length) { EReposInsertShift repos; - int model_len = e_text_model_real_get_text_length (model); - char *offs; - const char *p; - int byte_length, l; + gint model_len = e_text_model_real_get_text_length (model); + gchar *offs; + const gchar *p; + gint byte_length, l; if (position > model_len) return; @@ -255,9 +255,9 @@ static void e_text_model_real_delete (ETextModel *model, gint position, gint length) { EReposDeleteShift repos; - int byte_position, byte_length; - char *offs, *p; - int l; + gint byte_position, byte_length; + gchar *offs, *p; + gint l; offs = g_utf8_offset_to_pointer (model->priv->text->str, position); byte_position = offs - model->priv->text->str; diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h index 69c6f0c68e..f16c061610 100644 --- a/widgets/text/e-text-model.h +++ b/widgets/text/e-text-model.h @@ -60,7 +60,7 @@ struct _ETextModelClass { gint (* validate_pos) (ETextModel *model, gint pos); - const char *(* get_text) (ETextModel *model); + const gchar *(* get_text) (ETextModel *model); gint (* get_text_len) (ETextModel *model); void (* set_text) (ETextModel *model, const gchar *text); void (* insert) (ETextModel *model, gint position, const gchar *text); diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index c225636885..c4d3dbef34 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -122,11 +122,11 @@ static void calc_height (EText *text); static gboolean show_pango_rectangle (EText *text, PangoRectangle rect); -static void e_text_do_popup (EText *text, GdkEventButton *button, int position); +static void e_text_do_popup (EText *text, GdkEventButton *button, gint position); static void e_text_update_primary_selection (EText *text); static void e_text_paste (EText *text, GdkAtom selection); -static void e_text_insert(EText *text, const char *string); +static void e_text_insert(EText *text, const gchar *string); static void reset_layout_attrs (EText *text); @@ -139,7 +139,7 @@ static void e_text_editable_do_insert_text (GtkEditable *editable, static void e_text_editable_do_delete_text (GtkEditable *editable, gint start_pos, gint end_pos); -static gchar* e_text_editable_get_chars (GtkEditable *editable, +static gchar * e_text_editable_get_chars (GtkEditable *editable, gint start_pos, gint end_pos); static void e_text_editable_set_selection_bounds (GtkEditable *editable, @@ -341,7 +341,7 @@ static void reset_layout_attrs (EText *text) { PangoAttrList *attrs = NULL; - int object_count; + gint object_count; if (text->layout == NULL) return; @@ -349,13 +349,13 @@ reset_layout_attrs (EText *text) object_count = e_text_model_object_count (text->model); if (text->bold || text->strikeout || object_count > 0) { - int length = 0; - int i; + gint length = 0; + gint i; attrs = pango_attr_list_new (); for (i = 0; i < object_count; i++) { - int start_pos, end_pos; + gint start_pos, end_pos; PangoAttribute *attr = pango_attr_underline_new (PANGO_UNDERLINE_SINGLE); e_text_model_get_nth_object_bounds (text->model, i, &start_pos, &end_pos); @@ -442,7 +442,7 @@ reset_layout (EText *text) if (!text->button_down) { PangoRectangle strong_pos, weak_pos; - char *offs = g_utf8_offset_to_pointer (text->text, text->selection_start); + gchar *offs = g_utf8_offset_to_pointer (text->text, text->selection_start); pango_layout_get_cursor_pos (text->layout, offs - text->text, &strong_pos, &weak_pos); @@ -597,10 +597,10 @@ static void calc_height (EText *text) { GnomeCanvasItem *item; - int old_height; - int old_width; - int width = 0; - int height = 0; + gint old_height; + gint old_width; + gint width = 0; + gint height = 0; item = GNOME_CANVAS_ITEM (text); @@ -623,7 +623,7 @@ static void calc_ellipsis (EText *text) { /* FIXME: a pango layout per calc_ellipsis sucks */ - int width; + gint width; PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas), text->ellipsis ? text->ellipsis : "..."); pango_layout_get_size (layout, &width, NULL); @@ -651,7 +651,7 @@ set_text_gc_foreground (EText *text) /* Sets the stipple pattern for the text */ static void -set_stipple (EText *text, GdkBitmap *stipple, int reconfigure) +set_stipple (EText *text, GdkBitmap *stipple, gint reconfigure) { if (text->stipple && !reconfigure) g_object_unref (text->stipple); @@ -1167,7 +1167,7 @@ e_text_get_property (GObject *object, /* Update handler for the text item */ static void -e_text_reflow (GnomeCanvasItem *item, int flags) +e_text_reflow (GnomeCanvasItem *item, gint flags) { EText *text; @@ -1196,7 +1196,7 @@ e_text_reflow (GnomeCanvasItem *item, int flags) /* Update handler for the text item */ static void -e_text_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) +e_text_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags) { EText *text; double x1, y1, x2, y2; @@ -1293,10 +1293,10 @@ _get_tep(EText *text) } static void -draw_pango_rectangle (GdkDrawable *drawable, GdkGC *gc, int x1, int y1, PangoRectangle rect) +draw_pango_rectangle (GdkDrawable *drawable, GdkGC *gc, gint x1, gint y1, PangoRectangle rect) { - int width = rect.width / PANGO_SCALE; - int height = rect.height / PANGO_SCALE; + gint width = rect.width / PANGO_SCALE; + gint height = rect.height / PANGO_SCALE; if (width <= 0) width = 1; if (height <= 0) @@ -1308,16 +1308,16 @@ draw_pango_rectangle (GdkDrawable *drawable, GdkGC *gc, int x1, int y1, PangoRec static gboolean show_pango_rectangle (EText *text, PangoRectangle rect) { - int x1 = rect.x / PANGO_SCALE; - int x2 = (rect.x + rect.width) / PANGO_SCALE; + gint x1 = rect.x / PANGO_SCALE; + gint x2 = (rect.x + rect.width) / PANGO_SCALE; - int y1 = rect.y / PANGO_SCALE; - int y2 = (rect.y + rect.height) / PANGO_SCALE; + gint y1 = rect.y / PANGO_SCALE; + gint y2 = (rect.y + rect.height) / PANGO_SCALE; - int new_xofs_edit = text->xofs_edit; - int new_yofs_edit = text->yofs_edit; + gint new_xofs_edit = text->xofs_edit; + gint new_yofs_edit = text->yofs_edit; - int clip_width, clip_height; + gint clip_width, clip_height; clip_width = text->clip_width; if (clip_width >= 0 && text->draw_borders) { @@ -1372,11 +1372,11 @@ show_pango_rectangle (EText *text, PangoRectangle rect) /* Draw handler for the text item */ static void e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, - int x, int y, int width, int height) + gint x, gint y, gint width, gint height) { EText *text; GdkRectangle rect, *clip_rect; - int xpos, ypos; + gint xpos, ypos; GdkGC *main_gc; GnomeCanvas *canvas; GtkWidget *widget; @@ -1422,8 +1422,8 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, } } if (text->draw_button) { - int xoff = item->x1 - x; - int yoff = item->y1 - y; + gint xoff = item->x1 - x; + gint yoff = item->y1 - y; widget = GTK_WIDGET (item->canvas); @@ -1442,8 +1442,8 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, if (widget) { GtkButton *button = GTK_BUTTON (widget); GtkShadowType shadow_type; - int thisx, thisy, thisheight, thiswidth; - int default_spacing; + gint thisx, thisy, thisheight, thiswidth; + gint default_spacing; GdkRectangle area; area.x = 0; area.y = 0; @@ -1562,7 +1562,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, GdkRegion *clip_region = gdk_region_new (); GdkGC *selection_gc; GdkGC *text_gc; - int start_index, end_index; + gint start_index, end_index; start_index = MIN (text->selection_start, text->selection_end); end_index = MAX (text->selection_start, text->selection_end); @@ -1587,8 +1587,8 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, PangoLayoutLine *line = pango_layout_iter_get_line (iter); gint n_ranges, i; gint *ranges; - int y0, y1; - int s, e; + gint y0, y1; + gint s, e; if (start_index < line->start_index + line->length && end_index > line->start_index) { @@ -1644,7 +1644,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, } else { if (text->show_cursor) { PangoRectangle strong_pos, weak_pos; - char *offs = g_utf8_offset_to_pointer (text->text, text->selection_start); + gchar *offs = g_utf8_offset_to_pointer (text->text, text->selection_start); pango_layout_get_cursor_pos (text->layout, offs - text->text + text->preedit_len, &strong_pos, &weak_pos); draw_pango_rectangle (drawable, main_gc, xpos, ypos, strong_pos); @@ -1666,7 +1666,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, /* Point handler for the text item */ static double e_text_point (GnomeCanvasItem *item, double x, double y, - int cx, int cy, GnomeCanvasItem **actual_item) + gint cx, gint cy, GnomeCanvasItem **actual_item) { EText *text; double clip_width; @@ -1783,8 +1783,8 @@ e_text_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double static gint get_position_from_xy (EText *text, gint x, gint y) { - int index; - int trailing; + gint index; + gint trailing; if (text->draw_borders) { x -= BORDER_INDENT; @@ -1829,8 +1829,8 @@ _blink_scroll_timeout (gpointer data) scroll = TRUE; } if (scroll && text->button_down && text->clip) { - int old_xofs_edit = text->xofs_edit; - int old_yofs_edit = text->yofs_edit; + gint old_xofs_edit = text->xofs_edit; + gint old_yofs_edit = text->yofs_edit; if (text->clip_cwidth >= 0 && text->lastx - text->clip_cx > text->clip_cwidth && @@ -1946,13 +1946,13 @@ _do_tooltip (gpointer data) /* FIXME: need to sort out tooltip stuff. */ EText *text = E_TEXT (data); GtkWidget *canvas; - int i; - int max_width; + gint i; + gint max_width; gboolean cut_off; double i2c[6]; ArtPoint origin = {0, 0}; ArtPoint pixel_origin; - int canvas_x, canvas_y; + gint canvas_x, canvas_y; GnomeCanvasItem *tooltip_text; double tooltip_width; double tooltip_height; @@ -2525,7 +2525,7 @@ e_text_copy_clipboard (EText *text) void e_text_delete_selection(EText *text) { - int sel_start, sel_end; + gint sel_start, sel_end; sel_start = MIN(text->selection_start, text->selection_end); sel_end = MAX(text->selection_start, text->selection_end); @@ -2573,7 +2573,7 @@ primary_get_cb (GtkClipboard *clipboard, gpointer data) { EText *text = E_TEXT (data); - int sel_start, sel_end; + gint sel_start, sel_end; sel_start = MIN(text->selection_start, text->selection_end); sel_end = MAX(text->selection_start, text->selection_end); @@ -2655,7 +2655,7 @@ e_text_paste (EText *text, GdkAtom selection) typedef struct { EText *text; GdkEventButton *button; - int position; + gint position; } PopupClosure; static void @@ -2688,7 +2688,7 @@ popup_targets_received (GtkClipboard *clipboard, PopupClosure *closure = user_data; EText *text = closure->text; GdkEventButton *button = closure->button; - int position = closure->position; + gint position = closure->position; GtkWidget *popup_menu = gtk_menu_new (); GtkWidget *menuitem, *submenu; @@ -2767,7 +2767,7 @@ popup_targets_received (GtkClipboard *clipboard, } static void -e_text_do_popup (EText *text, GdkEventButton *button, int position) +e_text_do_popup (EText *text, GdkEventButton *button, gint position) { PopupClosure *closure = g_new (PopupClosure, 1); @@ -2799,10 +2799,10 @@ e_text_reset_im_context (EText *text) /* fixme: */ static int -next_word (EText *text, int start) +next_word (EText *text, gint start) { - char *p = g_utf8_offset_to_pointer (text->text, start); - int length; + gchar *p = g_utf8_offset_to_pointer (text->text, start); + gint length; length = g_utf8_strlen (text->text, -1); @@ -2828,15 +2828,15 @@ next_word (EText *text, int start) } static int -find_offset_into_line (EText *text, int offset_into_text, char **start_of_line) +find_offset_into_line (EText *text, gint offset_into_text, gchar **start_of_line) { - char *p; + gchar *p; p = g_utf8_offset_to_pointer (text->text, offset_into_text); if (p == text->text) { if (start_of_line) - *start_of_line = (char*)text->text; + *start_of_line = (gchar *)text->text; return 0; } else { @@ -2852,7 +2852,7 @@ find_offset_into_line (EText *text, int offset_into_text, char **start_of_line) } if (start_of_line) - *start_of_line = (char*)text->text; + *start_of_line = (gchar *)text->text; return offset_into_text; } } @@ -2866,7 +2866,7 @@ _get_updated_position (EText *text, gboolean direction) { PangoLogAttr *log_attrs = NULL; gint n_attrs; - char *p = NULL; + gchar *p = NULL; gint new_pos = 0; gint length = 0; @@ -2889,7 +2889,7 @@ _get_updated_position (EText *text, gboolean direction) /* get layout's PangoLogAttr to facilitate moving when moving across grapheme cluster as in indic langs */ pango_layout_get_log_attrs (text->layout, &log_attrs, &n_attrs); - /* Fetch the current char index in the line & keep moving + /* Fetch the current gchar index in the line & keep moving forward until we can display cursor */ p = g_utf8_offset_to_pointer (text->text, text->selection_end); @@ -2930,9 +2930,9 @@ _get_updated_position (EText *text, gboolean direction) static int _get_position(EText *text, ETextEventProcessorCommand *command) { - int length, obj_num; + gint length, obj_num; gunichar unival; - char *p = NULL; + gchar *p = NULL; gint new_pos = 0; switch (command->position) { @@ -3020,7 +3020,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command) case E_TEP_BACKWARD_WORD: new_pos = 0; if (text->selection_end >= 1) { - int pos = text->selection_end; + gint pos = text->selection_end; p = g_utf8_find_prev_char (text->text, g_utf8_offset_to_pointer (text->text, text->selection_end)); pos --; @@ -3046,7 +3046,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command) break; case E_TEP_FORWARD_LINE: { - int offset_into_line; + gint offset_into_line; offset_into_line = find_offset_into_line (text, text->selection_end, NULL); if (offset_into_line == -1) @@ -3077,7 +3077,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command) break; } case E_TEP_BACKWARD_LINE: { - int offset_into_line = find_offset_into_line (text, text->selection_end, &p); + gint offset_into_line = find_offset_into_line (text, text->selection_end, &p); if (offset_into_line == -1) return text->selection_end; @@ -3196,22 +3196,22 @@ _get_position(EText *text, ETextEventProcessorCommand *command) } static void -e_text_insert(EText *text, const char *string) +e_text_insert(EText *text, const gchar *string) { - int len = strlen (string); + gint len = strlen (string); if (len > 0) { - int utf8len = 0; + gint utf8len = 0; if (!text->allow_newlines) { - const char *i; - char *new_string = g_malloc (len + 1); - char *j = new_string; + const gchar *i; + gchar *new_string = g_malloc (len + 1); + gchar *j = new_string; for (i = string; *i; i = g_utf8_next_char(i)) { if (*i != '\n') { gunichar c; - int charlen; + gint charlen; c = g_utf8_get_char (i); charlen = g_unichar_to_utf8 (c, j); @@ -3231,16 +3231,16 @@ e_text_insert(EText *text, const char *string) } static void -capitalize (EText *text, int start, int end, ETextEventProcessorCaps type) +capitalize (EText *text, gint start, gint end, ETextEventProcessorCaps type) { gboolean first = TRUE; - const char *p = g_utf8_offset_to_pointer (text->text, start); - const char *text_end = g_utf8_offset_to_pointer (text->text, end); - int utf8len = text_end - p; + const gchar *p = g_utf8_offset_to_pointer (text->text, start); + const gchar *text_end = g_utf8_offset_to_pointer (text->text, end); + gint utf8len = text_end - p; if (utf8len > 0) { - char *new_text = g_new0 (char, utf8len * 6); - char *output = new_text; + gchar *new_text = g_new0 (char, utf8len * 6); + gchar *output = new_text; while (p && *p && p < text_end) { gunichar unival = g_utf8_get_char (p); @@ -3374,8 +3374,8 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp if (text->selection_start == text->selection_end) { capitalize (text, text->selection_start, next_word (text, text->selection_start), command->value); } else { - int selection_start = MIN (text->selection_start, text->selection_end); - int selection_end = MAX (text->selection_start, text->selection_end); + gint selection_start = MIN (text->selection_start, text->selection_end); + gint selection_end = MAX (text->selection_start, text->selection_end); capitalize (text, selection_start, selection_end, command->value); } break; @@ -3397,7 +3397,7 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp we don't we can scrap the loop and just use pango_layout_index_to_pos */ PangoLayoutLine *cur_line = NULL; - int selection_index; + gint selection_index; PangoLayoutIter *iter = pango_layout_get_iter (text->layout); /* check if we are using selection_start or selection_end for moving? */ @@ -3418,7 +3418,7 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp } while (pango_layout_iter_next_line (iter)); if (cur_line) { - int xpos, ypos; + gint xpos, ypos; double clip_width, clip_height; /* gboolean trailing = FALSE; */ PangoRectangle pango_pos; diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index ebe5817285..f9b838aae3 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -85,7 +85,7 @@ G_BEGIN_DECLS * ellipsis string RW The characters to use as ellipsis. NULL = "...". * line_wrap boolean RW Line wrap when not editing. * break_characters string RW List of characters to optionally break on. - * max_lines int RW Number of lines possible when doing line wrap. + * max_lines gint RW Number of lines possible when doing line wrap. * draw_borders boolean RW Whether to draw borders. * draw_background boolean RW Whether to draw the background. * draw_button boolean RW This makes EText handle being the child of a button properly and highlighting as it should. @@ -112,7 +112,7 @@ struct _EText { gint preedit_len; /* preedit length to display */ gint preedit_pos; /* preedit cursor position */ PangoLayout *layout; - int num_lines; /* Number of lines of text */ + gint num_lines; /* Number of lines of text */ gchar *revert; /* Text to revert to */ @@ -128,26 +128,26 @@ struct _EText { GdkBitmap *stipple; /* Stipple for text */ GdkGC *gc; /* GC for drawing text */ - int cx, cy; /* Top-left canvas coordinates for text */ - int text_cx, text_cy; /* Top-left canvas coordinates for text */ - int clip_cx, clip_cy; /* Top-left canvas coordinates for clip rectangle */ - int clip_cwidth, clip_cheight; /* Size of clip rectangle in pixels */ - int max_width; /* Maximum width of text lines */ - int width; /* Rendered text width in pixels */ - int height; /* Rendered text height in pixels */ + gint cx, cy; /* Top-left canvas coordinates for text */ + gint text_cx, text_cy; /* Top-left canvas coordinates for text */ + gint clip_cx, clip_cy; /* Top-left canvas coordinates for clip rectangle */ + gint clip_cwidth, clip_cheight; /* Size of clip rectangle in pixels */ + gint max_width; /* Maximum width of text lines */ + gint width; /* Rendered text width in pixels */ + gint height; /* Rendered text height in pixels */ guint32 rgba; /* RGBA color for text */ double affine[6]; /* The item -> canvas affine */ - char *ellipsis; /* The ellipsis characters. NULL = "...". */ + gchar *ellipsis; /* The ellipsis characters. NULL = "...". */ double ellipsis_width; /* The width of the ellipsis. */ - int xofs_edit; /* Offset because of editing */ - int yofs_edit; /* Offset because of editing */ + gint xofs_edit; /* Offset because of editing */ + gint yofs_edit; /* Offset because of editing */ /* This needs to be reworked a bit once we get line wrapping. */ - int selection_start; /* Start of selection IN BYTES */ - int selection_end; /* End of selection IN BYTES */ + gint selection_start; /* Start of selection IN BYTES */ + gint selection_end; /* End of selection IN BYTES */ gboolean select_by_word; /* Current selection is by word */ /* This section is for drag scrolling and blinking cursor. */ -- cgit v1.2.3 From 6413227cef16fcee96670ccb56ece9e1cc3293c5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 28 May 2009 13:06:29 -0400 Subject: Whitespace cleanup. --- a11y/addressbook/ea-minicard-view.c | 6 +- a11y/calendar/ea-day-view-main-item.c | 4 +- a11y/calendar/ea-week-view-cell.c | 12 ++-- a11y/calendar/ea-week-view-main-item.c | 4 +- a11y/calendar/ea-week-view.c | 4 +- a11y/e-table/gal-a11y-e-cell-popup.c | 8 +-- a11y/e-table/gal-a11y-e-cell-toggle.c | 4 +- a11y/e-table/gal-a11y-e-cell-vbox.h | 2 +- a11y/e-table/gal-a11y-e-cell.c | 4 +- a11y/e-table/gal-a11y-e-cell.h | 4 +- a11y/e-table/gal-a11y-e-table-click-to-add.c | 2 +- a11y/e-table/gal-a11y-e-table-item.c | 8 +-- a11y/e-text/gal-a11y-e-text.c | 28 ++++---- a11y/ea-factory.h | 18 ++--- a11y/widgets/ea-calendar-item.c | 4 +- addressbook/conduit/address-conduit.c | 54 +++++++-------- addressbook/gui/component/addressbook-config.h | 2 +- addressbook/gui/component/addressbook-migrate.c | 2 +- addressbook/gui/component/addressbook-view.c | 10 +-- addressbook/gui/component/openldap-extract.h | 10 +-- addressbook/gui/contact-editor/e-contact-editor.c | 18 ++--- addressbook/gui/contact-editor/eab-editor.h | 12 ++-- addressbook/gui/merging/eab-contact-merging.c | 4 +- addressbook/gui/widgets/e-addressbook-view.c | 10 +-- addressbook/gui/widgets/e-minicard-view-widget.h | 4 +- addressbook/gui/widgets/e-minicard-view.c | 4 +- addressbook/gui/widgets/e-minicard-view.h | 4 +- addressbook/gui/widgets/e-minicard.c | 2 +- addressbook/gui/widgets/eab-contact-display.c | 14 ++-- addressbook/gui/widgets/eab-gui-util.c | 26 +++---- addressbook/importers/evolution-ldif-importer.c | 6 +- addressbook/importers/evolution-vcard-importer.c | 2 +- addressbook/printing/e-contact-print.c | 4 +- .../evolution-addressbook-export-list-cards.c | 4 +- calendar/conduits/calendar/calendar-conduit.c | 36 +++++----- calendar/conduits/memo/memo-conduit.c | 30 ++++---- calendar/conduits/todo/todo-conduit.c | 26 +++---- calendar/gui/alarm-notify/alarm-notify-dialog.c | 4 +- calendar/gui/alarm-notify/alarm-queue.c | 14 ++-- calendar/gui/calendar-commands.c | 2 +- calendar/gui/calendar-component.c | 4 +- calendar/gui/calendar-view.h | 2 +- calendar/gui/comp-util.c | 2 +- calendar/gui/dialogs/alarm-dialog.c | 8 +-- calendar/gui/dialogs/comp-editor.c | 18 ++--- calendar/gui/dialogs/comp-editor.h | 2 +- calendar/gui/dialogs/e-send-options-utils.c | 2 +- calendar/gui/dialogs/event-editor.c | 6 +- calendar/gui/dialogs/event-page.c | 20 +++--- calendar/gui/dialogs/event-page.h | 2 +- calendar/gui/dialogs/memo-page.c | 6 +- calendar/gui/dialogs/task-editor.c | 2 +- calendar/gui/dialogs/task-page.c | 6 +- calendar/gui/e-alarm-list.h | 2 +- calendar/gui/e-cal-component-memo-preview.h | 2 +- calendar/gui/e-cal-component-preview.h | 2 +- calendar/gui/e-cal-model-tasks.c | 2 +- calendar/gui/e-cal-model.c | 8 +-- calendar/gui/e-cal-model.h | 2 +- calendar/gui/e-cal-popup.c | 4 +- calendar/gui/e-calendar-table.h | 2 +- calendar/gui/e-calendar-view.c | 70 +++++++++---------- calendar/gui/e-date-time-list.h | 2 +- calendar/gui/e-day-view-config.c | 2 +- calendar/gui/e-day-view-layout.c | 10 +-- calendar/gui/e-day-view-main-item.c | 8 +-- calendar/gui/e-day-view-time-item.c | 4 +- calendar/gui/e-day-view-top-item.c | 4 +- calendar/gui/e-day-view.c | 62 ++++++++--------- calendar/gui/e-day-view.h | 8 +-- calendar/gui/e-itip-control.c | 8 +-- calendar/gui/e-meeting-list-view.c | 8 +-- calendar/gui/e-meeting-store.c | 36 +++++----- calendar/gui/e-meeting-time-sel-item.c | 2 +- calendar/gui/e-meeting-time-sel.c | 2 +- calendar/gui/e-memo-table.c | 4 +- calendar/gui/e-week-view-config.c | 4 +- calendar/gui/e-week-view-event-item.c | 2 +- calendar/gui/e-week-view-main-item.c | 2 +- calendar/gui/e-week-view.c | 28 ++++---- calendar/gui/e-week-view.h | 6 +- calendar/gui/gnome-cal.c | 80 +++++++++++----------- calendar/gui/gnome-cal.h | 14 ++-- calendar/gui/itip-bonobo-control.c | 14 ++-- calendar/gui/itip-utils.c | 34 ++++----- calendar/gui/memos-control.c | 2 +- calendar/gui/migration.c | 4 +- calendar/gui/print.c | 22 +++--- calendar/gui/tasks-control.c | 6 +- composer/e-composer-header.h | 2 +- composer/e-msg-composer.c | 4 +- composer/e-msg-composer.h | 6 +- e-util/e-config.c | 4 +- e-util/e-dialog-utils.c | 2 +- e-util/e-plugin-ui.c | 2 +- e-util/e-sorter-array.c | 12 ++-- e-util/e-text-event-processor-emacs-like.h | 4 +- e-util/e-util-labels.c | 2 +- e-util/e-util.h | 6 +- filter/filter-part.c | 2 +- filter/filter-rule.h | 2 +- mail/em-account-prefs.c | 4 +- mail/em-composer-prefs.c | 2 +- mail/em-composer-utils.c | 8 +-- mail/em-event.h | 2 +- mail/em-filter-context.c | 2 +- mail/em-folder-browser.c | 16 ++--- mail/em-folder-tree.c | 4 +- mail/em-folder-utils.c | 2 +- mail/em-folder-view.c | 2 +- mail/em-format-html-display.c | 4 +- mail/em-format-html.c | 2 +- mail/em-format.c | 4 +- mail/em-junk-hook.c | 4 +- mail/em-mailer-prefs.c | 6 +- mail/em-migrate.c | 2 +- mail/em-subscribe-editor.c | 4 +- mail/em-utils.c | 6 +- mail/importers/mail-importer.c | 2 +- mail/importers/pine-importer.c | 2 +- mail/mail-component.c | 4 +- mail/mail-ops.c | 24 +++---- mail/mail-send-recv.c | 6 +- mail/mail-vfolder.c | 8 +-- mail/message-list.c | 50 +++++++------- mail/message-list.h | 2 +- mail/message-tag-editor.h | 2 +- plugins/audio-inline/audio-inline.c | 4 +- plugins/backup-restore/backup-restore.c | 16 ++--- plugins/backup-restore/backup.c | 12 ++-- plugins/bbdb/bbdb.c | 6 +- plugins/bbdb/gaimbuddies.c | 2 +- plugins/bogo-junk-plugin/bf-junk-filter.c | 38 +++++----- plugins/calendar-http/calendar-http.c | 2 +- plugins/calendar-weather/calendar-weather.c | 12 ++-- plugins/email-custom-header/email-custom-header.c | 8 +-- .../exchange-operations/exchange-account-setup.c | 8 +-- .../exchange-operations/exchange-config-listener.c | 26 +++---- .../exchange-operations/exchange-config-listener.h | 4 +- .../exchange-operations/exchange-delegates-user.c | 4 +- plugins/exchange-operations/exchange-delegates.c | 2 +- .../exchange-folder-subscription.c | 4 +- .../exchange-mail-send-options.c | 6 +- plugins/exchange-operations/exchange-operations.c | 6 +- .../exchange-operations/exchange-send-options.c | 18 ++--- plugins/google-account-setup/google-source.c | 2 +- .../groupwise-account-setup/camel-gw-listener.c | 22 +++--- .../groupwise-account-setup.c | 2 +- plugins/groupwise-features/install-shared.c | 2 +- plugins/groupwise-features/junk-mail-settings.c | 2 +- plugins/groupwise-features/junk-settings.h | 2 +- plugins/groupwise-features/proxy-login.c | 6 +- plugins/groupwise-features/proxy.c | 14 ++-- plugins/groupwise-features/send-options.c | 2 +- plugins/groupwise-features/share-folder.h | 2 +- plugins/hula-account-setup/camel-hula-listener.c | 10 +-- plugins/hula-account-setup/hula-account-setup.c | 2 +- plugins/imap-features/imap-headers.c | 6 +- plugins/ipod-sync/ipod.c | 6 +- plugins/ipod-sync/sync.c | 12 ++-- plugins/itip-formatter/itip-formatter.c | 8 +-- plugins/mail-notification/mail-notification.c | 14 ++-- plugins/pst-import/pst-importer.c | 4 +- plugins/publish-calendar/publish-calendar.c | 6 +- plugins/python/python-plugin-loader.c | 2 +- plugins/sa-junk-plugin/em-junk-filter.c | 8 +-- plugins/save-calendar/save-calendar.c | 2 +- plugins/templates/templates.c | 16 ++--- plugins/tnef-attachments/tnef-plugin.c | 2 +- .../webdav-account-setup/webdav-contacts-source.c | 2 +- shell/e-component-registry.c | 2 +- shell/e-shell-importer.c | 2 +- shell/e-shell-settings-dialog.c | 6 +- shell/e-shell-window-commands.c | 2 +- shell/e-shell-window.c | 8 +-- shell/e-shell.c | 4 +- shell/e-sidebar.c | 14 ++-- shell/e-user-creatable-items-handler.c | 2 +- shell/importer/evolution-importer.c | 2 +- widgets/e-timezone-dialog/e-timezone-dialog.c | 22 +++--- widgets/menus/gal-define-views-dialog.c | 2 +- widgets/misc/e-activity-handler.c | 6 +- widgets/misc/e-activity-handler.h | 6 +- widgets/misc/e-attachment-dialog.c | 2 +- widgets/misc/e-calendar.c | 12 ++-- widgets/misc/e-canvas.h | 2 +- widgets/misc/e-cell-date-edit.c | 2 +- widgets/misc/e-charset-picker.c | 2 +- widgets/misc/e-combo-button.c | 2 +- widgets/misc/e-cursors.h | 2 +- widgets/misc/e-dateedit.c | 4 +- widgets/misc/e-filter-bar.c | 6 +- widgets/misc/e-filter-bar.h | 2 +- widgets/misc/e-image-chooser.h | 6 +- widgets/misc/e-map.c | 8 +-- widgets/misc/e-multi-config-dialog.c | 6 +- widgets/misc/e-reflow.c | 2 +- widgets/misc/e-search-bar.c | 26 +++---- widgets/misc/e-send-options.c | 14 ++-- widgets/misc/e-spinner.c | 14 ++-- widgets/misc/e-task-bar.h | 2 +- widgets/misc/e-task-widget.c | 2 +- widgets/table/e-cell-hbox.c | 2 +- widgets/table/e-cell-hbox.h | 2 +- widgets/table/e-cell-popup.c | 2 +- widgets/table/e-cell-popup.h | 2 +- widgets/table/e-cell-text.c | 20 +++--- widgets/table/e-cell-toggle.c | 2 +- widgets/table/e-cell-vbox.c | 2 +- widgets/table/e-cell.c | 2 +- widgets/table/e-cell.h | 20 +++--- widgets/table/e-table-click-to-add.c | 2 +- widgets/table/e-table-example-1.c | 16 ++--- widgets/table/e-table-example-2.c | 16 ++--- widgets/table/e-table-header-item.c | 2 +- widgets/table/e-table-header-utils.c | 2 +- widgets/table/e-table-header.c | 2 +- widgets/table/e-table-item.c | 30 ++++---- widgets/table/e-table-item.h | 24 +++---- widgets/table/e-table-sorted-variable.c | 2 +- widgets/table/e-table-sorted.c | 4 +- widgets/table/e-table-sorter.c | 30 ++++---- widgets/table/e-table-specification.c | 2 +- widgets/table/e-table-without.c | 6 +- widgets/table/e-table.c | 26 +++---- widgets/table/e-table.h | 10 +-- widgets/table/e-tree-memory-callbacks.c | 2 +- widgets/table/e-tree-memory.c | 2 +- widgets/table/e-tree-model.c | 4 +- widgets/table/e-tree-selection-model.c | 16 ++--- widgets/table/e-tree-simple.c | 10 +-- widgets/table/e-tree-sorted-variable.c | 4 +- widgets/table/e-tree-sorted.c | 24 +++---- widgets/table/e-tree-table-adapter.c | 10 +-- widgets/table/e-tree-table-adapter.h | 2 +- widgets/table/e-tree.c | 30 ++++---- widgets/table/e-tree.h | 6 +- widgets/text/e-text.c | 18 ++--- widgets/text/e-text.h | 6 +- 239 files changed, 1040 insertions(+), 1040 deletions(-) diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c index d13975b34a..7e6fea543d 100644 --- a/a11y/addressbook/ea-minicard-view.c +++ b/a11y/addressbook/ea-minicard-view.c @@ -160,8 +160,8 @@ ea_minicard_view_get_name (AtkObject *accessible) source_name=""; string = g_strdup_printf (ngettext ("current address book folder %s has %d card", - "current address book folder %s has %d cards", - reflow->count), source_name, reflow->count); + "current address book folder %s has %d cards", + reflow->count), source_name, reflow->count); ATK_OBJECT_CLASS (parent_class)->set_name (accessible, string); g_free (string); @@ -390,7 +390,7 @@ static gboolean atk_action_interface_do_action (AtkAction *action, gint i) eab_show_contact_list_editor (book, contact, TRUE, TRUE); break; default: - return_value = FALSE; + return_value = FALSE; break; } g_object_unref (book); diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c index c1176b4417..87cd266c5c 100644 --- a/a11y/calendar/ea-day-view-main-item.c +++ b/a11y/calendar/ea-day-view-main-item.c @@ -445,10 +445,10 @@ ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data) atk_state_set_add_state (state_set, ATK_STATE_FOCUSED); g_object_unref (state_set); - g_signal_emit_by_name (ea_main_item, + g_signal_emit_by_name (ea_main_item, "active-descendant-changed", item_cell); - g_signal_emit_by_name (data, "selection_changed"); + g_signal_emit_by_name (data, "selection_changed"); atk_focus_tracker_notify (item_cell); g_object_unref (item_cell); diff --git a/a11y/calendar/ea-week-view-cell.c b/a11y/calendar/ea-week-view-cell.c index f3f7183c55..a7248c00ae 100644 --- a/a11y/calendar/ea-week-view-cell.c +++ b/a11y/calendar/ea-week-view-cell.c @@ -369,9 +369,9 @@ component_interface_get_extents (AtkComponent *component, if (week_view->multi_week_view) { if (week_view->compress_weekend && (cell->column == (5 - start_day))) { *height = week_view->row_heights[cell->row*2]; - *width = week_view->col_widths[cell->column]; - *x += week_view->col_offsets[cell->column] - scroll_x; - *y += week_view->row_offsets[cell->row*2]- scroll_y; + *width = week_view->col_widths[cell->column]; + *x += week_view->col_offsets[cell->column] - scroll_x; + *y += week_view->row_offsets[cell->row*2]- scroll_y; } else if (week_view->compress_weekend && (cell->column == (6 - start_day))) { *height = week_view->row_heights[cell->row*2]; *width = week_view->col_widths[cell->column - 1]; @@ -383,10 +383,10 @@ component_interface_get_extents (AtkComponent *component, *x += week_view->col_offsets[cell->column - 1] - scroll_x; *y += week_view->row_offsets[cell->row*2]- scroll_y; } else { - *height = week_view->row_heights[cell->row*2]*2; + *height = week_view->row_heights[cell->row*2]*2; *width = week_view->col_widths[cell->column]; - *x += week_view->col_offsets[cell->column] - scroll_x; - *y += week_view->row_offsets[cell->row*2]- scroll_y; + *x += week_view->col_offsets[cell->column] - scroll_x; + *y += week_view->row_offsets[cell->row*2]- scroll_y; } } else { if (start_day < 3) { diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c index 3ba4508ba3..065f2be528 100644 --- a/a11y/calendar/ea-week-view-main-item.c +++ b/a11y/calendar/ea-week-view-main-item.c @@ -445,10 +445,10 @@ ea_week_view_main_item_time_change_cb (EWeekView *week_view, gpointer data) atk_state_set_add_state (state_set, ATK_STATE_FOCUSED); g_object_unref (state_set); - g_signal_emit_by_name (ea_main_item, + g_signal_emit_by_name (ea_main_item, "active-descendant-changed", item_cell); - g_signal_emit_by_name (data, "selection_changed"); + g_signal_emit_by_name (data, "selection_changed"); atk_focus_tracker_notify (item_cell); g_object_unref (item_cell); } diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c index 734f09239a..97a8dae25d 100644 --- a/a11y/calendar/ea-week-view.c +++ b/a11y/calendar/ea-week-view.c @@ -258,7 +258,7 @@ ea_week_view_ref_child (AtkObject *accessible, gint index) g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL); child_num = atk_object_get_n_accessible_children (accessible); - if (child_num <= 0 || index < 0 || index >= child_num) + if (child_num <= 0 || index < 0 || index >= child_num) return NULL; if (!GTK_ACCESSIBLE (accessible)->widget) @@ -270,7 +270,7 @@ ea_week_view_ref_child (AtkObject *accessible, gint index) /* index == 0 is the main item */ atk_object = atk_gobject_accessible_for_object (G_OBJECT (week_view->main_canvas_item)); g_object_ref (atk_object); - } else + } else for (event_index = 0; event_index < max_count; ++event_index) { EWeekViewEvent *event; EWeekViewEventSpan *span; diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c index f76b2431b0..141ce172a4 100644 --- a/a11y/e-table/gal-a11y-e-cell-popup.c +++ b/a11y/e-table/gal-a11y-e-cell-popup.c @@ -89,15 +89,15 @@ gal_a11y_e_cell_popup_new (ETableItem *item, { AtkObject *a11y; GalA11yECell *cell; - ECellPopup *popupcell; + ECellPopup *popupcell; ECellView* child_view = NULL; popupcell= E_CELL_POPUP(cell_view->ecell); if (popupcell && popupcell->popup_cell_view) - child_view = popupcell->popup_cell_view->child_view; + child_view = popupcell->popup_cell_view->child_view; - if (child_view && child_view->ecell) { + if (child_view && child_view->ecell) { a11y = gal_a11y_e_cell_registry_get_object (NULL, item, child_view, @@ -114,7 +114,7 @@ gal_a11y_e_cell_popup_new (ETableItem *item, model_col, view_col, row); - } + } g_return_val_if_fail (a11y != NULL, NULL); cell = GAL_A11Y_E_CELL(a11y); gal_a11y_e_cell_add_action (cell, diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c index 1101bac7ee..4fec22577b 100644 --- a/a11y/e-table/gal-a11y-e-cell-toggle.c +++ b/a11y/e-table/gal-a11y-e-cell-toggle.c @@ -125,9 +125,9 @@ model_change_cb (ETableModel *etm, if (col == cell->model_col && row == cell->row) { - value = GPOINTER_TO_INT ( + value = GPOINTER_TO_INT ( e_table_model_value_at (cell->cell_view->e_table_model, - cell->model_col, cell->row)); + cell->model_col, cell->row)); /* Cheat gnopernicus, or it will ignore the state change signal */ atk_focus_tracker_notify (ATK_OBJECT (cell)); diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.h b/a11y/e-table/gal-a11y-e-cell-vbox.h index cf6375a2be..b8f8bdd77d 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.h +++ b/a11y/e-table/gal-a11y-e-cell-vbox.h @@ -44,7 +44,7 @@ typedef struct _GalA11yECellVboxClass GalA11yECellVboxClass; struct _GalA11yECellVbox { GalA11yECell object; - gint a11y_subcell_count; + gint a11y_subcell_count; gpointer *a11y_subcells; }; diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c index a316500af7..e09b5456d9 100644 --- a/a11y/e-table/gal-a11y-e-cell.c +++ b/a11y/e-table/gal-a11y-e-cell.c @@ -113,7 +113,7 @@ gal_a11y_e_cell_get_name (AtkObject * a11y) return a11y->name; if (cell->item != NULL) { - ecol = e_table_header_get_column (cell->item->header, cell->view_col); + ecol = e_table_header_get_column (cell->item->header, cell->view_col); if (ecol != NULL) return ecol->text; } @@ -350,7 +350,7 @@ gal_a11y_e_cell_remove_action_by_name (GalA11yECell *cell, g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE); for (list_node = cell->action_list; list_node && !action_found; - list_node = list_node->next) { + list_node = list_node->next) { if (!g_ascii_strcasecmp (((ActionInfo *)(list_node->data))->name, action_name)) { action_found = TRUE; break; diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h index 3ec3070a9b..c61e5e2d22 100644 --- a/a11y/e-table/gal-a11y-e-cell.h +++ b/a11y/e-table/gal-a11y-e-cell.h @@ -90,7 +90,7 @@ void gal_a11y_e_cell_construct (AtkObject *object, void gal_a11y_e_cell_type_add_action_interface (GType type); gboolean gal_a11y_e_cell_add_action (GalA11yECell *cell, - const gchar *action_name, + const gchar *action_name, const gchar *action_description, const gchar *action_keybinding, ACTION_FUNC action_func); @@ -99,7 +99,7 @@ gboolean gal_a11y_e_cell_remove_action (GalA11yECell *cell, gint action_id); gboolean gal_a11y_e_cell_remove_action_by_name (GalA11yECell *cell, - const gchar *action_name); + const gchar *action_name); gboolean gal_a11y_e_cell_add_state (GalA11yECell *cell, AtkStateType state_type, diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c index e36fe51a00..8a8fe56796 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add.c +++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c @@ -324,7 +324,7 @@ gal_a11y_e_table_click_to_add_new (GObject *widget) g_signal_connect_after (G_OBJECT(widget), "event", - G_CALLBACK (etcta_event), a11y); + G_CALLBACK (etcta_event), a11y); g_signal_connect (etcta->selection, "cursor_changed", G_CALLBACK (etcta_selection_cursor_changed), a11y); diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c index 912d055964..a3044a702b 100644 --- a/a11y/e-table/gal-a11y-e-table-item.c +++ b/a11y/e-table/gal-a11y-e-table-item.c @@ -185,7 +185,7 @@ eti_a11y_reset_focus_object (GalA11yETableItem *a11y, ETableItem *item, gboolean cell = eti_ref_at (ATK_TABLE (a11y), view_row, view_col); if (cell != NULL) { - g_object_set_data (G_OBJECT (a11y), "gail-focus-object", cell); + g_object_set_data (G_OBJECT (a11y), "gail-focus-object", cell); gal_a11y_e_cell_add_state (GAL_A11Y_E_CELL (cell), ATK_STATE_FOCUSED, FALSE); } else g_object_set_data (G_OBJECT (a11y), "gail-focus-object", NULL); @@ -362,7 +362,7 @@ eti_ref_at (AtkTable *table, gint row, gint column) ATK_OBJECT (table), ecol->col_idx, column, - row); + row); if (ATK_IS_OBJECT (ret)) { g_object_weak_ref (G_OBJECT (ret), (GWeakNotify) cell_destroyed, @@ -684,7 +684,7 @@ eti_rows_inserted (ETableModel * model, gint row, gint count, gint old_nrows; g_return_if_fail (table_item); - item_a11y = GAL_A11Y_E_TABLE_ITEM (table_item); + item_a11y = GAL_A11Y_E_TABLE_ITEM (table_item); n_cols = atk_table_get_n_columns (ATK_TABLE(table_item)); n_rows = atk_table_get_n_rows (ATK_TABLE(table_item)); @@ -840,7 +840,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) /* Emit signals */ if (reorder_found) - g_signal_emit_by_name (G_OBJECT(a11y_item), "column_reordered"); + g_signal_emit_by_name (G_OBJECT(a11y_item), "column_reordered"); if (removed_found) { diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c index 6717f687b0..f5939670f2 100644 --- a/a11y/e-text/gal-a11y-e-text.c +++ b/a11y/e-text/gal-a11y-e-text.c @@ -383,19 +383,19 @@ et_get_text_at_offset (AtkText *text, case ATK_TEXT_BOUNDARY_SENTENCE_START: start = find_sentence_start (full_text, offset - 1, -1); end = find_sentence_start (full_text, offset, 1); - break; + break; case ATK_TEXT_BOUNDARY_SENTENCE_END: - start = find_sentence_end (full_text, offset, -1); + start = find_sentence_end (full_text, offset, -1); end = find_sentence_end (full_text, offset + 1, 1); break; case ATK_TEXT_BOUNDARY_LINE_START: - start = find_line_start (full_text, offset - 1, -1); + start = find_line_start (full_text, offset - 1, -1); end = find_line_start (full_text, offset, 1); - break; + break; case ATK_TEXT_BOUNDARY_LINE_END: start = find_line_end (full_text, offset, -1); end = find_line_end (full_text, offset + 1, 1); - break; + break; default: return NULL; } @@ -448,19 +448,19 @@ et_get_text_before_offset (AtkText *text, case ATK_TEXT_BOUNDARY_SENTENCE_START: end = find_sentence_start (full_text, offset, -1); start = find_sentence_start (full_text, end - 1, -1); - break; + break; case ATK_TEXT_BOUNDARY_SENTENCE_END: - end = find_sentence_end (full_text, offset, -1); + end = find_sentence_end (full_text, offset, -1); start = find_sentence_end (full_text, end - 1, -1); - break; + break; case ATK_TEXT_BOUNDARY_LINE_START: - end = find_line_start (full_text, offset, -1); + end = find_line_start (full_text, offset, -1); start = find_line_start (full_text, end - 1, -1); - break; + break; case ATK_TEXT_BOUNDARY_LINE_END: - end = find_line_end (full_text, offset, -1); + end = find_line_end (full_text, offset, -1); start = find_line_end (full_text, end - 1, -1); - break; + break; default: return NULL; } @@ -572,8 +572,8 @@ et_get_character_extents (AtkText *text, window = gdk_window_get_toplevel (window); gdk_window_get_origin (window, &x_window, &y_window); *x -= x_window; - *y -= y_window; - } + *y -= y_window; + } else if (coords == ATK_XY_SCREEN) { } else { diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h index 2331f54a0b..e234368a98 100644 --- a/a11y/ea-factory.h +++ b/a11y/ea-factory.h @@ -36,11 +36,11 @@ type_as_function ## _factory_create_accessible (GObject *obj) \ { \ AtkObject *accessible; \ g_return_val_if_fail (G_IS_OBJECT (obj), NULL); \ - accessible = opt_create_accessible (G_OBJECT (obj)); \ - return accessible; \ + accessible = opt_create_accessible (G_OBJECT (obj)); \ + return accessible; \ } -#define EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible) \ +#define EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible) \ static AtkObject* \ type_as_function ## _factory_create_accessible (GObject *obj) \ { \ @@ -52,10 +52,10 @@ type_as_function ## _factory_create_accessible (GObject *obj) \ widget = GTK_WIDGET (obj); \ \ accessible = opt_create_accessible (widget); \ - return accessible; \ + return accessible; \ } -#define EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible) \ +#define EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible) \ \ static GType \ type_as_function ## _factory_get_accessible_type (void) \ @@ -81,7 +81,7 @@ type_as_function ## _factory_get_type (void) \ gchar *name; \ static const GTypeInfo tinfo = \ { \ - sizeof (AtkObjectFactoryClass), \ + sizeof (AtkObjectFactoryClass), \ NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init, \ NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL \ }; \ @@ -95,15 +95,15 @@ type_as_function ## _factory_get_type (void) \ return t; \ } -#define EA_FACTORY(type, type_as_function, opt_create_accessible) \ - EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible) \ +#define EA_FACTORY(type, type_as_function, opt_create_accessible) \ + EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible) \ EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible) #define EA_FACTORY_GOBJECT(type, type_as_function, opt_create_accessible) \ EA_FACTORY_PARTA_GOBJECT(type, type_as_function, opt_create_accessible) \ EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible) -#define EA_SET_FACTORY(obj_type, type_as_function) \ +#define EA_SET_FACTORY(obj_type, type_as_function) \ { \ if (atk_get_root ()) { \ atk_registry_set_factory_type (atk_get_default_registry (), \ diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c index 17795c51a5..9dcb83449c 100644 --- a/a11y/widgets/ea-calendar-item.c +++ b/a11y/widgets/ea-calendar-item.c @@ -280,7 +280,7 @@ ea_calendar_item_get_name (AtkObject *accessible) g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible)); if (!g_obj) - return NULL; + return NULL; g_return_val_if_fail (E_IS_CALENDAR_ITEM (g_obj), NULL); calitem = E_CALENDAR_ITEM (g_obj); @@ -1192,7 +1192,7 @@ e_calendar_item_get_day_extents (ECalendarItem *calitem, month_y = item->y1 + ythickness + month_row * calitem->month_height; month_cell_x = month_x + E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS - + calitem->month_lpad + E_CALENDAR_ITEM_XPAD_BEFORE_CELLS; + + calitem->month_lpad + E_CALENDAR_ITEM_XPAD_BEFORE_CELLS; text_y = month_y + ythickness * 2 + E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME + char_height + E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index c82726276c..2b7aad0812 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -1288,7 +1288,7 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui phone_str = e_contact_get_const (contact, next_mail); next_mail = get_next_mail (&next_mail); } else if (phonelabel == LABEL_HOME && !is_next_done (next_home)) { - phone_str = e_contact_get_const (contact, next_home); + phone_str = e_contact_get_const (contact, next_home); next_home = get_next_home (&next_home); } else if (phonelabel == LABEL_WORK && !is_next_done (next_work)) { phone_str = e_contact_get_const (contact, next_work); @@ -1579,7 +1579,7 @@ pre_sync (GnomePilotConduit *conduit, { GnomePilotConduitSyncAbs *abs_conduit; EBookQuery *query; - GList *l; + GList *l; gint len; gchar *filename; gchar *change_id; @@ -1669,11 +1669,11 @@ pre_sync (GnomePilotConduit *conduit, } /* Set the count information */ - num_records = g_list_length (ctxt->cards); - gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records); - gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records); - gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records); - gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records); + num_records = g_list_length (ctxt->cards); + gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records); + gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records); + gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records); + gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records); #ifdef PILOT_LINK_0_12 buffer = pi_buffer_new(DLP_BUF_SIZE); @@ -1702,7 +1702,7 @@ pre_sync (GnomePilotConduit *conduit, unpack_AddressAppInfo (&(ctxt->ai), buf, len); g_free (buf); #endif - check_for_slow_setting (conduit, ctxt); + check_for_slow_setting (conduit, ctxt); if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot) ctxt->map->write_touched_only = TRUE; @@ -1794,10 +1794,10 @@ for_each (GnomePilotConduitSyncAbs *conduit, EAddrLocalRecord **local, EAddrConduitContext *ctxt) { - static GList *cards, *iterator; - static gint count; + static GList *cards, *iterator; + static gint count; - g_return_val_if_fail (local != NULL, -1); + g_return_val_if_fail (local != NULL, -1); if (*local == NULL) { LOG (g_message ( "beginning for_each" )); @@ -1809,7 +1809,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, LOG (g_message ( "iterating over %d records", g_list_length (cards) )); *local = g_new0 (EAddrLocalRecord, 1); - local_record_from_ecard (*local, cards->data, ctxt); + local_record_from_ecard (*local, cards->data, ctxt); ctxt->locals = g_list_prepend (ctxt->locals, *local); iterator = cards; @@ -1829,7 +1829,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, } else { LOG (g_message ( "for_each ending" )); - /* Tell the pilot the iteration is over */ + /* Tell the pilot the iteration is over */ *local = NULL; return 0; @@ -1882,7 +1882,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, } else { LOG (g_message ( "for_each_modified ending" )); - /* Signal the iteration is over */ + /* Signal the iteration is over */ *local = NULL; return 0; @@ -2057,7 +2057,7 @@ match (GnomePilotConduitSyncAbs *conduit, EAddrLocalRecord **local, EAddrConduitContext *ctxt) { - const gchar *uid; + const gchar *uid; LOG (g_message ("match: looking for local copy of %s\n", print_remote (remote))); @@ -2192,22 +2192,22 @@ conduit_get_gpilot_conduit (guint32 pilot_id) g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt); g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt); - g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt); - g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt); + g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt); + g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt); - g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt); - g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt); - g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt); + g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt); + g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt); + g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt); - g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt); - g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt); - g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt); - g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt); + g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt); + g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt); + g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt); + g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt); - g_signal_connect (retval, "match", G_CALLBACK (match), ctxt); - g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt); + g_signal_connect (retval, "match", G_CALLBACK (match), ctxt); + g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt); - g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt); + g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt); /* Gui Settings */ g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt); diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h index e06e98f887..0cfcb95b56 100644 --- a/addressbook/gui/component/addressbook-config.h +++ b/addressbook/gui/component/addressbook-config.h @@ -15,7 +15,7 @@ * * Authors: * Chris Toshok - * Chris Lahey + * Chris Lahey * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index 8017e8979f..8ba997cd3e 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -660,7 +660,7 @@ migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers) port = get_string_child (child, "port"); host = get_string_child (child, "host"); rootdn = get_string_child (child, "rootdn"); - scope = get_string_child (child, "scope"); + scope = get_string_child (child, "scope"); authmethod = get_string_child (child, "authmethod"); ssl = get_string_child (child, "ssl"); emailaddr = get_string_child (child, "emailaddr"); diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 379660c993..3ce0a855b9 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -262,7 +262,7 @@ copy_all_contacts_to_cb (BonoboUIComponent *uih, gpointer user_data, const gchar AddressbookView *view = (AddressbookView *) user_data; EABView *v = get_current_view (view); - if (v) + if (v) eab_view_copy_to_folder (v, TRUE); } @@ -419,7 +419,7 @@ rename_addressbook_folder (AddressbookView *view) source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->selector)); old_name = e_source_peek_name(source); - prompt = g_strdup_printf (_("Rename the \"%s\" folder to:"), old_name); + prompt = g_strdup_printf (_("Rename the \"%s\" folder to:"), old_name); while (!done) { new_name = e_request_string (NULL, _("Rename Folder"), prompt, old_name); @@ -923,7 +923,7 @@ save_addressbook_cb(EPopup *ep, EPopupItem *pitem, gpointer data) { AddressbookView *view = data; EABView *v = get_current_view (view); - if (v) + if (v) eab_view_save_as (v, TRUE); } @@ -947,7 +947,7 @@ primary_source_selection_changed_callback (ESourceSelector *selector, static EPopupItem abv_source_popups[] = { { 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 *) "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, (gchar *) "30.bar" }, @@ -1241,7 +1241,7 @@ addressbook_view_init (AddressbookView *view) G_CALLBACK (primary_source_selection_changed_callback), G_OBJECT (view), 0); g_signal_connect_after (priv->selector, "key_press_event", - G_CALLBACK (source_selector_key_press_event_callback), + G_CALLBACK (source_selector_key_press_event_callback), G_OBJECT (view)); g_signal_connect_object (priv->selector, "popup_event", G_CALLBACK (popup_event_callback), diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h index 083fc0d162..630e12e4f6 100644 --- a/addressbook/gui/component/openldap-extract.h +++ b/addressbook/gui/component/openldap-extract.h @@ -214,8 +214,8 @@ get_token( const gchar ** sp, gchar ** token_val ) *token_val = res; } break; -/* kind = TK_UNEXPCHAR; */ -/* break; */ +/* kind = TK_UNEXPCHAR; */ +/* break; */ } return kind; @@ -863,9 +863,9 @@ skip_url_prefix( const gchar **scheme ) { /* - * return non-zero if this looks like a LDAP URL; zero if not - * if non-zero returned, *urlp will be moved past "ldap://" part of URL - */ + * return non-zero if this looks like a LDAP URL; zero if not + * if non-zero returned, *urlp will be moved past "ldap://" part of URL + */ const gchar *p; if ( url == NULL ) { diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 305511d5d5..0ba954320f 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -82,10 +82,10 @@ static void e_contact_editor_set_property (GObject *object, guint prop_id, const static void e_contact_editor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void e_contact_editor_dispose (GObject *object); -static void e_contact_editor_raise (EABEditor *editor); -static void e_contact_editor_show (EABEditor *editor); +static void e_contact_editor_raise (EABEditor *editor); +static void e_contact_editor_show (EABEditor *editor); static void e_contact_editor_save_contact (EABEditor *editor, gboolean should_close); -static void e_contact_editor_close (EABEditor *editor); +static void e_contact_editor_close (EABEditor *editor); static gboolean e_contact_editor_is_valid (EABEditor *editor); static gboolean e_contact_editor_is_changed (EABEditor *editor); static GtkWindow* e_contact_editor_get_window (EABEditor *editor); @@ -402,20 +402,20 @@ name_to_style (const EContactName *name, const gchar *company, gint style) midstrptr=midstring; if(name){ if (name->family && *name->family) - *(midstrptr++) = name->family; + *(midstrptr++) = name->family; if (name->given && *name->given) - *(midstrptr++) = name->given; + *(midstrptr++) = name->given; } *midstrptr = NULL; stringptr = strings; *(stringptr++) = g_strjoinv(", ", midstring); - if (name) { + if (name) { if (name->additional && *name->additional) *(stringptr++) = name->additional; } *stringptr = NULL; - string = g_strjoinv(" ", strings); - break; + string = g_strjoinv(" ", strings); + break; case 3: string = g_strdup(company); break; @@ -3836,7 +3836,7 @@ e_contact_editor_create_source_combo_box (gchar *name, GtkWidget * e_contact_editor_create_source_combo_box (gchar *name, - gchar *string1, gchar *string2, + gchar *string1, gchar *string2, gint int1, gint int2) { GtkWidget *combo_box; diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h index 6959d25801..c658b1070b 100644 --- a/addressbook/gui/contact-editor/eab-editor.h +++ b/addressbook/gui/contact-editor/eab-editor.h @@ -65,8 +65,8 @@ struct _EABEditorClass /* virtual functions */ void (* show) (EABEditor *editor); - void (* close) (EABEditor *editor); - void (* raise) (EABEditor *editor); + void (* close) (EABEditor *editor); + void (* raise) (EABEditor *editor); void (* save_contact) (EABEditor *editor, gboolean should_close); gboolean (* is_valid) (EABEditor *editor); gboolean (* is_changed) (EABEditor *editor); @@ -94,10 +94,10 @@ gboolean eab_editor_prompt_to_save_changes (EABEditor *editor, GtkWindow gboolean eab_editor_confirm_delete (GtkWindow *parent, gboolean plural, gboolean is_list, gchar *name); /* these four generate EABEditor signals */ -void eab_editor_contact_added (EABEditor *editor, EBookStatus status, EContact *contact); -void eab_editor_contact_modified (EABEditor *editor, EBookStatus status, EContact *contact); -void eab_editor_contact_deleted (EABEditor *editor, EBookStatus status, EContact *contact); -void eab_editor_closed (EABEditor *editor); +void eab_editor_contact_added (EABEditor *editor, EBookStatus status, EContact *contact); +void eab_editor_contact_modified (EABEditor *editor, EBookStatus status, EContact *contact); +void eab_editor_contact_deleted (EABEditor *editor, EBookStatus status, EContact *contact); +void eab_editor_closed (EABEditor *editor); /* these maintain the global list of editors so we can prompt the user if there are unsaved changes when they exit. */ diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 0805ca3110..983de5dab6 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -346,14 +346,14 @@ mergeit (EContactMergingLookup *lookup) switch (result) { case GTK_RESPONSE_OK: - lookup->contact = lookup->match; + lookup->contact = lookup->match; e_book_async_remove_contact (lookup->book, lookup->match, NULL, lookup); e_book_async_add_contact (lookup->book, lookup->contact, final_id_cb, lookup); value = 1; break; case GTK_RESPONSE_CANCEL: default: - value = 0; + value = 0; break; } gtk_widget_destroy (GTK_WIDGET (dialog)); diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index cda5c5f27c..ed726db613 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1737,10 +1737,10 @@ static void delete_contacts_cb (EBook *book, EBookStatus status, gpointer clos case E_BOOK_ERROR_OK : case E_BOOK_ERROR_CANCELLED : break; - case E_BOOK_ERROR_PERMISSION_DENIED : - e_error_run (NULL, "addressbook:contact-delete-error-perm", NULL); + case E_BOOK_ERROR_PERMISSION_DENIED : + e_error_run (NULL, "addressbook:contact-delete-error-perm", NULL); break; - default : + default : /* Unknown error */ eab_error_dialog (_("Failed to delete contact"), status); break; @@ -1955,7 +1955,7 @@ eab_view_save_as (EABView *view, gboolean all) if (all) { EBookQuery *query = e_book_query_any_field_contains(""); e_book_get_contacts(book, query, &list, NULL); - e_book_query_unref(query); + e_book_query_unref(query); } else { list = get_selected_contacts(view); @@ -2082,7 +2082,7 @@ view_transfer_contacts (EABView *view, gboolean delete_from_source, gboolean all if (all) { EBookQuery *query = e_book_query_any_field_contains(""); e_book_get_contacts(book, query, &contacts, NULL); - e_book_query_unref(query); + e_book_query_unref(query); } else { contacts = get_selected_contacts (view); diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index 29b8904797..37bef22900 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -32,8 +32,8 @@ G_BEGIN_DECLS #define E_TYPE_MINICARD_VIEW_WIDGET (e_minicard_view_widget_get_type ()) #define E_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_VIEW_WIDGET, EMinicardViewWidget)) #define E_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_VIEW_WIDGET, EMinicardViewWidgetClass)) -#define E_IS_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET)) -#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET)) +#define E_IS_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET)) +#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET)) typedef struct _EMinicardViewWidget EMinicardViewWidget; diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 2e9ef12507..8cb68bb504 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -625,8 +625,8 @@ e_minicard_view_jump_to_letter (EMinicardView *view, utf_str [g_unichar_to_utf8 (letter, utf_str)] = '\0'; e_reflow_sorted_jump (E_REFLOW_SORTED (view), - (GCompareFunc) compare_to_utf_str, - utf_str); + (GCompareFunc) compare_to_utf_str, + utf_str); #endif } diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index 4bda766254..a548c9bf11 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -55,8 +55,8 @@ G_BEGIN_DECLS #define E_TYPE_MINICARD_VIEW (e_minicard_view_get_type ()) #define E_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_VIEW, EMinicardView)) #define E_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_VIEW, EMinicardViewClass)) -#define E_IS_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW)) -#define E_IS_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW)) +#define E_IS_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW)) +#define E_IS_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW)) typedef struct _EMinicardView EMinicardView; diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index da85e5fd83..30f326402a 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -770,7 +770,7 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width) EMinicardField *minicard_field; gchar *name; gchar *string; - gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); + gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL); group = GNOME_CANVAS_GROUP( e_minicard ); diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 197a91e89c..1e39b10cf0 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -105,7 +105,7 @@ eab_uri_popup_email_address_copy(EPopup *ep, EPopupItem *item, gpointer data) i++; } - g_free(p->selection_uri); + g_free(p->selection_uri); p->selection_uri = g_strdup(html); g_free (html); @@ -132,7 +132,7 @@ eab_uri_popup_address_send(EPopup *ep, EPopupItem *item, gpointer data) EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target; const gchar *url = t->uri; EABContactDisplay *display = data; - struct _EABContactDisplayPrivate *p = display->priv; + struct _EABContactDisplayPrivate *p = display->priv; gint mail_num = atoi (url + strlen ("internal-mailto:")); @@ -185,7 +185,7 @@ eab_uri_popup_free(EPopup *ep, GSList *list, gpointer data) g_slist_free_1(list); list = n; - } + } } static int @@ -695,7 +695,7 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact e_contact_photo_free (photo); } - gtk_html_stream_printf (html_stream, "
\n", is_rtl ? " align=\"right\" " : ""); + gtk_html_stream_printf (html_stream, "\n", is_rtl ? " align=\"right\" " : ""); str = e_contact_get_const (contact, E_CONTACT_FILE_AS); if (!str) @@ -862,7 +862,7 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac html = eab_parse_qp_email_to_html (str); \ \ if (!html) \ - html = e_text_to_html (str, 0); \ + html = e_text_to_html (str, 0); \ \ gtk_html_stream_printf (html_stream, "%s%s", comma ? ", " : "", html); \ g_free (html); \ @@ -933,10 +933,10 @@ eab_html_press_event (GtkWidget *widget, GdkEvent *event,EABContactDisplay *disp if (event->button.button!= 3 ) return FALSE; - uri = gtk_html_get_url_at (GTK_HTML (widget), event->button.x, event->button.y); + uri = gtk_html_get_url_at (GTK_HTML (widget), event->button.x, event->button.y); if (uri){ eab_uri_popup_event(display,event,uri); - } + } g_free(uri); diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 9b3b0c7730..77481ad2c8 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -55,19 +55,19 @@ /* the NULL's in this table correspond to the status codes that should *never* be generated by a backend */ static const gchar *status_to_string[] = { - /* E_BOOK_ERROR_OK */ N_("Success"), - /* E_BOOK_ERROR_INVALID_ARG */ NULL, - /* E_BOOK_ERROR_BUSY */ N_("Backend busy"), - /* E_BOOK_ERROR_REPOSITORY_OFFLINE */ N_("Repository offline"), - /* E_BOOK_ERROR_NO_SUCH_BOOK */ N_("Address Book does not exist"), - /* E_BOOK_ERROR_NO_SELF_CONTACT */ N_("No Self Contact defined"), - /* E_BOOK_ERROR_URI_NOT_LOADED */ NULL, - /* E_BOOK_ERROR_URI_ALREADY_LOADED */ NULL, - /* E_BOOK_ERROR_PERMISSION_DENIED */ N_("Permission denied"), - /* E_BOOK_ERROR_CONTACT_NOT_FOUND */ N_("Contact not found"), - /* E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS */ N_("Contact ID already exists"), - /* E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED */ N_("Protocol not supported"), - /* E_BOOK_ERROR_CANCELLED */ N_("Canceled"), + /* E_BOOK_ERROR_OK */ N_("Success"), + /* E_BOOK_ERROR_INVALID_ARG */ NULL, + /* E_BOOK_ERROR_BUSY */ N_("Backend busy"), + /* E_BOOK_ERROR_REPOSITORY_OFFLINE */ N_("Repository offline"), + /* E_BOOK_ERROR_NO_SUCH_BOOK */ N_("Address Book does not exist"), + /* E_BOOK_ERROR_NO_SELF_CONTACT */ N_("No Self Contact defined"), + /* E_BOOK_ERROR_URI_NOT_LOADED */ NULL, + /* E_BOOK_ERROR_URI_ALREADY_LOADED */ NULL, + /* E_BOOK_ERROR_PERMISSION_DENIED */ N_("Permission denied"), + /* E_BOOK_ERROR_CONTACT_NOT_FOUND */ N_("Contact not found"), + /* E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS */ N_("Contact ID already exists"), + /* E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED */ N_("Protocol not supported"), + /* E_BOOK_ERROR_CANCELLED */ N_("Canceled"), /* E_BOOK_ERROR_COULD_NOT_CANCEL */ N_("Could not cancel"), /* E_BOOK_ERROR_AUTHENTICATION_FAILED */ N_("Authentication Failed"), /* E_BOOK_ERROR_AUTHENTICATION_REQUIRED */ N_("Authentication Required"), diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index 544bb485fb..8aaad1ba33 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -76,9 +76,9 @@ static struct { const gchar *ldif_attribute; EContactField contact_field; #define FLAG_HOME_ADDRESS 0x01 -#define FLAG_WORK_ADDRESS 0x02 -#define FLAG_LIST 0x04 -#define FLAG_BOOLEAN 0x08 +#define FLAG_WORK_ADDRESS 0x02 +#define FLAG_LIST 0x04 +#define FLAG_BOOLEAN 0x08 gint flags; } ldif_fields[] = { diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index 169c6413d1..ff6b205afa 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -18,7 +18,7 @@ * Authors: * Chris Toshok * JP Rosevear - * Michael Zucchi + * Michael Zucchi * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index e57e5d175e..6c6710a479 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -217,7 +217,7 @@ e_contact_start_new_page (EContactPrintContext *ctxt) /*cairo_show_page (cr);*/ - ctxt->x = ctxt->y = .0; + ctxt->x = ctxt->y = .0; ctxt->column = 0; ctxt->pages++; } @@ -294,7 +294,7 @@ e_contact_start_new_column (EContactPrintContext *ctxt) else { ctxt->x = ctxt->column * (ctxt->column_width + ctxt->column_spacing); - ctxt->y = .0; + ctxt->y = .0; } } diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c index 2b418345ae..556931462a 100644 --- a/addressbook/tools/evolution-addressbook-export-list-cards.c +++ b/addressbook/tools/evolution-addressbook-export-list-cards.c @@ -166,7 +166,7 @@ static EContactCSVFieldData csv_field_data[] = { {E_CONTACT_CSV_PHONE_HOME, E_CONTACT_PHONE_HOME, "", DT_STRING}, {E_CONTACT_CSV_ORG, E_CONTACT_ORG, "", DT_STRING}, /*E_CONTACT_CSV_ADDRESS_BUSINESS, */ - {E_CONTACT_CSV_ADDRESS_BUSINESS_STREET, NOMAP, "Business Address", DT_STRING}, + {E_CONTACT_CSV_ADDRESS_BUSINESS_STREET, NOMAP, "Business Address", DT_STRING}, {E_CONTACT_CSV_ADDRESS_BUSINESS_EXT, NOMAP, "Business Address2", DT_STRING}, {E_CONTACT_CSV_ADDRESS_BUSINESS_CITY, NOMAP, "Business Address City", DT_STRING}, {E_CONTACT_CSV_ADDRESS_BUSINESS_REGION, NOMAP, "Business Address State", DT_STRING}, @@ -179,7 +179,7 @@ static EContactCSVFieldData csv_field_data[] = { {E_CONTACT_CSV_ADDRESS_HOME_REGION, NOMAP, "Home Address State", DT_STRING}, {E_CONTACT_CSV_ADDRESS_HOME_POSTCODE, NOMAP, "Home Address PostCode", DT_STRING}, {E_CONTACT_CSV_ADDRESS_HOME_COUNTRY, NOMAP, "Home Address Country", DT_STRING}, - {E_CONTACT_CSV_PHONE_MOBILE, E_CONTACT_PHONE_MOBILE, "", DT_STRING}, + {E_CONTACT_CSV_PHONE_MOBILE, E_CONTACT_PHONE_MOBILE, "", DT_STRING}, {E_CONTACT_CSV_PHONE_CAR, E_CONTACT_PHONE_CAR, "", DT_STRING}, {E_CONTACT_CSV_PHONE_BUSINESS_FAX, E_CONTACT_PHONE_BUSINESS_FAX, "", DT_STRING}, {E_CONTACT_CSV_PHONE_HOME_FAX, E_CONTACT_PHONE_HOME_FAX, "", DT_STRING}, diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index 3654f5bed1..fe6f7dfe5d 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -114,7 +114,7 @@ calconduit_load_configuration (guint32 pilot_id) ECalConduitCfg *c; GnomePilotConduitManagement *management; GnomePilotConduitConfig *config; - gchar prefix[256]; + gchar prefix[256]; c = g_new0 (ECalConduitCfg, 1); g_assert (c != NULL); @@ -352,8 +352,8 @@ e_calendar_context_destroy (ECalConduitContext *ctxt) if (ctxt->client != NULL) g_object_unref (ctxt->client); - if (ctxt->default_comp != NULL) - g_object_unref (ctxt->default_comp); + if (ctxt->default_comp != NULL) + g_object_unref (ctxt->default_comp); if (ctxt->comps != NULL) { for (l = ctxt->comps; l; l = l->next) g_object_unref (l->data); @@ -673,7 +673,7 @@ process_multi_day (ECalConduitContext *ctxt, ECalChange *ccc, GList **multi_comp is_date = TRUE; old_start_value = dt_start.value; - old_end_value = dt_end.value; + old_end_value = dt_end.value; while (!last) { ECalComponent *clone = e_cal_component_clone (ccc->comp); icalcomponent *ical_comp = NULL; @@ -1279,7 +1279,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, } /* Recurrence information */ - icalrecurrencetype_clear (&recur); + icalrecurrencetype_clear (&recur); switch (appt.repeatType) { case repeatNone: @@ -1610,7 +1610,7 @@ pre_sync (GnomePilotConduit *conduit, return -1; } - len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, + len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, DLP_BUF_SIZE, buffer); #else @@ -2114,22 +2114,22 @@ conduit_get_gpilot_conduit (guint32 pilot_id) g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt); g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt); - g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt); - g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt); + g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt); + g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt); - g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt); - g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt); - g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt); + g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt); + g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt); + g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt); - g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt); - g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt); - g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt); - g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt); + g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt); + g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt); + g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt); + g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt); - g_signal_connect (retval, "match", G_CALLBACK (match), ctxt); - g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt); + g_signal_connect (retval, "match", G_CALLBACK (match), ctxt); + g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt); - g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt); + g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt); /* Gui Settings */ g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt); diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c index 1d32917760..9a226f59b8 100644 --- a/calendar/conduits/memo/memo-conduit.c +++ b/calendar/conduits/memo/memo-conduit.c @@ -891,7 +891,7 @@ pre_sync (GnomePilotConduit *conduit, return -1; } - len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, + len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, DLP_BUF_SIZE, buffer); #else @@ -909,7 +909,7 @@ pre_sync (GnomePilotConduit *conduit, #ifdef PILOT_LINK_0_12 buf = g_new0 (unsigned char,buffer->used); memcpy(buf, buffer->data, buffer->used); - unpack_MemoAppInfo (&(ctxt->ai), buf, len); + unpack_MemoAppInfo (&(ctxt->ai), buf, len); pi_buffer_free(buffer); #else unpack_MemoAppInfo (&(ctxt->ai), buf, len); @@ -1035,7 +1035,7 @@ for_each (GnomePilotConduitSyncAbs *conduit, /* NOTE: ignore the return value, otherwise ctxt->locals * gets messed up. The calling function keeps track of * the *local variable */ - unused = g_list_prepend (ctxt->locals, *local); + unused = g_list_prepend (ctxt->locals, *local); iterator = comps; } else { LOG (g_message ( "no events" )); @@ -1391,22 +1391,22 @@ conduit_get_gpilot_conduit (guint32 pilot_id) g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt); g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt); - g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt); - g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt); + g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt); + g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt); - g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt); - g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt); - g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt); + g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt); + g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt); + g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt); - g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt); - g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt); - g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt); - g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt); + g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt); + g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt); + g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt); + g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt); - g_signal_connect (retval, "match", G_CALLBACK (match), ctxt); - g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt); + g_signal_connect (retval, "match", G_CALLBACK (match), ctxt); + g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt); - g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt); + g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt); /* Gui Settings */ g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt); diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 1ced6acfa3..b0b5526fba 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -1080,7 +1080,7 @@ pre_sync (GnomePilotConduit *conduit, pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY); return -1; } - len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, + len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, DLP_BUF_SIZE, buffer); #else @@ -1581,22 +1581,22 @@ conduit_get_gpilot_conduit (guint32 pilot_id) g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt); g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt); - g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt); - g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt); + g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt); + g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt); - g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt); - g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt); - g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt); + g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt); + g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt); + g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt); - g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt); - g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt); - g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt); - g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt); + g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt); + g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt); + g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt); + g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt); - g_signal_connect (retval, "match", G_CALLBACK (match), ctxt); - g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt); + g_signal_connect (retval, "match", G_CALLBACK (match), ctxt); + g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt); - g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt); + g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt); /* Gui Settings */ g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt); diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 5307936b27..9e9aa003a4 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -325,11 +325,11 @@ notified_alarms_dialog_new (void) /* Set callback for updating the snooze "minutes" label */ g_signal_connect (G_OBJECT (an->snooze_time_min), "value_changed", - G_CALLBACK (an_update_minutes_label), an); + G_CALLBACK (an_update_minutes_label), an); /* Set callback for updating the snooze "hours" label */ g_signal_connect (G_OBJECT (an->snooze_time_hrs), "value_changed", - G_CALLBACK (an_update_hrs_label), an); + G_CALLBACK (an_update_hrs_label), an); na = g_new0 (AlarmNotificationsDialog, 1); diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 14aed443e8..d5984d1e96 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -1459,7 +1459,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, if (text.value) summary = text.value; else - summary = _("No summary available."); + summary = _("No summary available."); e_cal_component_get_description_list (comp, &text_list); @@ -1478,7 +1478,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, e_cal_component_get_location (comp, &location); if (!location) - location = _("No location information available."); + location = _("No location information available."); /* create the tray icon */ if (tray_icon == NULL) { @@ -1555,7 +1555,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, #ifdef HAVE_LIBNOTIFY static void popup_notification (time_t trigger, CompQueuedAlarms *cqa, - gpointer alarm_id, gboolean use_description) + gpointer alarm_id, gboolean use_description) { QueuedAlarm *qa; ECalComponent *comp; @@ -1584,7 +1584,7 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa, if (text.value) summary = text.value; else - summary = _("No summary available."); + summary = _("No summary available."); e_cal_component_get_location (comp, &location); @@ -2049,8 +2049,8 @@ remove_comp_by_id (gpointer key, gpointer value, gpointer userdata) { d(printf("%s:%d (remove_comp_by_id)\n",__FILE__, __LINE__)); -/* if (!g_hash_table_size (ca->uid_alarms_hash)) */ -/* return; */ +/* if (!g_hash_table_size (ca->uid_alarms_hash)) */ +/* return; */ remove_cqa (ca, (ECalComponentId *)key, (CompQueuedAlarms *) value); @@ -2206,7 +2206,7 @@ update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa) d(printf("%s:%d (update_qa)\n",__FILE__, __LINE__)); for (instance_list = alarms->alarms; instance_list; instance_list = instance_list->next) { al_inst = instance_list->data; - if (al_inst->trigger == qa->orig_trigger) { /* FIXME if two or more alarm instances (audio, note) for same component have same trigger */ + if (al_inst->trigger == qa->orig_trigger) { /* FIXME if two or more alarm instances (audio, note) for same component have same trigger */ g_free ((gchar *) qa->instance->auid); qa->instance->auid = g_strdup (al_inst->auid); break; diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 1bf0c442c4..9b665ce44e 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -694,5 +694,5 @@ calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal) g_signal_handlers_disconnect_matched (gcal, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, control); bonobo_ui_component_rm (uic, "/", NULL); - bonobo_ui_component_unset_container (uic, NULL); + bonobo_ui_component_unset_container (uic, NULL); } diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index d7ae0c66e2..072df02049 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -1180,7 +1180,7 @@ create_local_item_cb (EUserCreatableItemsHandler *handler, const gchar *item_typ if (strcmp (item_type_name, CREATE_EVENT_ID) == 0) create_new_event (calendar_component, component_view, FALSE, FALSE); - else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0) + else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0) create_new_event (calendar_component, component_view, TRUE, FALSE); else if (strcmp (item_type_name, CREATE_MEETING_ID) == 0) create_new_event (calendar_component, component_view, FALSE, TRUE); @@ -1479,7 +1479,7 @@ impl_requestCreateItem (PortableServer_Servant servant, if (strcmp (item_type_name, CREATE_EVENT_ID) == 0) result = create_new_event (calendar_component, NULL, FALSE, FALSE); - else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0) + else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0) result = create_new_event (calendar_component, NULL, TRUE, FALSE); else if (strcmp (item_type_name, CREATE_MEETING_ID) == 0) result = create_new_event (calendar_component, NULL, FALSE, TRUE); diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h index a3c4a54012..78b6127dbd 100644 --- a/calendar/gui/calendar-view.h +++ b/calendar/gui/calendar-view.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define TYPE_CALENDAR_VIEW (calendar_view_get_type ()) #define CALENDAR_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CALENDAR_VIEW, CalendarView)) -#define CALENDAR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW, \ +#define CALENDAR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW, \ CalendarViewClass)) #define IS_CALENDAR_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CALENDAR_VIEW)) #define IS_CALENDAR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_VIEW)) diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index 49b43900d5..62a55d2c30 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -803,7 +803,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client) ECalComponent *master = NULL; icalcomponent *icalcomp = NULL; ECalComponentRange rid; - ECalComponentDateTime sdt; + ECalComponentDateTime sdt; const gchar *uid; /* Get the master component */ diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index ca8a58d528..5284656d1d 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -612,7 +612,7 @@ populate_widgets_from_alarm (Dialog *dialog) /* Alarm Types */ switch ( trigger->type ) { - case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START: + case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START: e_dialog_combo_box_set (dialog->time_combo, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START, time_map); break; @@ -1212,9 +1212,9 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm) } if (!setup_select_names (&dialog)) { - g_object_unref (dialog.xml); - return FALSE; - } + g_object_unref (dialog.xml); + return FALSE; + } init_widgets (&dialog); diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 9fe0b3f1ca..4063a317f4 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -113,11 +113,11 @@ struct _CompEditorPrivate { CalObjModType mod; - gboolean existing_org; - gboolean user_org; + gboolean existing_org; + gboolean user_org; gboolean is_group_item; - gboolean warned; + gboolean warned; }; enum { @@ -534,8 +534,8 @@ save_comp_with_send (CompEditor *editor) return FALSE; if ((delegate && !e_cal_get_save_schedules (priv->client)) || (send && send_component_dialog ((GtkWindow *) editor, priv->client, priv->comp, !priv->existing_org, &strip_alarms))) { - if ((itip_organizer_is_user (priv->comp, priv->client) || itip_sentby_is_user (priv->comp, priv->client))) { - if (e_cal_component_get_vtype (priv->comp) == E_CAL_COMPONENT_JOURNAL) + if ((itip_organizer_is_user (priv->comp, priv->client) || itip_sentby_is_user (priv->comp, priv->client))) { + if (e_cal_component_get_vtype (priv->comp) == E_CAL_COMPONENT_JOURNAL) return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_PUBLISH, strip_alarms); else return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REQUEST, strip_alarms); @@ -546,7 +546,7 @@ save_comp_with_send (CompEditor *editor) if (delegate) return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REPLY, strip_alarms); } - } + } return TRUE; } @@ -2324,9 +2324,9 @@ real_edit_comp (CompEditor *editor, ECalComponent *comp) if (comp) priv->comp = e_cal_component_clone (comp); - priv->existing_org = e_cal_component_has_organizer (comp); - priv->user_org = (itip_organizer_is_user (comp, priv->client) || itip_sentby_is_user (comp, priv->client)); - priv->warned = FALSE; + priv->existing_org = e_cal_component_has_organizer (comp); + priv->user_org = (itip_organizer_is_user (comp, priv->client) || itip_sentby_is_user (comp, priv->client)); + priv->warned = FALSE; update_window_border (editor, NULL); diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index 22167cb78f..ec1b991592 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -147,7 +147,7 @@ GtkAction * comp_editor_get_action (CompEditor *editor, const gchar *action_name); GtkActionGroup * comp_editor_get_action_group (CompEditor *editor, - const gchar *group_name); + const gchar *group_name); GtkWidget * comp_editor_get_managed_widget (CompEditor *editor, const gchar *widget_path); diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c index 5af9d4bc43..87f4584133 100644 --- a/calendar/gui/dialogs/e-send-options-utils.c +++ b/calendar/gui/dialogs/e-send-options-utils.c @@ -131,7 +131,7 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, sopts->accepted = E_RETURN_NOTIFY_MAIL; } - value = e_source_get_property (source, "return-decline"); + value = e_source_get_property (source, "return-decline"); if (value) { if (!strcmp (value, "none")) sopts->declined = E_RETURN_NOTIFY_NONE; diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 93110b8797..4643f8f697 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -324,7 +324,7 @@ event_editor_constructor (GType type, event_page_show_options (priv->event_page); comp_editor_set_group_item (editor, TRUE); - if (!((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM))) { + if (!((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM))) { GtkAction *action; action = comp_editor_get_action (editor, "free-busy"); @@ -346,7 +346,7 @@ event_editor_dispose (GObject *object) priv = EVENT_EDITOR_GET_PRIVATE (object); if (priv->event_page) { - g_object_unref (priv->event_page); + g_object_unref (priv->event_page); priv->event_page = NULL; } @@ -691,7 +691,7 @@ event_editor_show_meeting (EventEditor *ee) ee->priv->meeting_shown = TRUE; - comp_editor_set_changed (editor, FALSE); + comp_editor_set_changed (editor, FALSE); comp_editor_set_needs_send (editor, TRUE); } diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index f1994fa9a7..f43dcc1d41 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -732,7 +732,7 @@ sensitize_widgets (EventPage *epage) priv = epage->priv; if (flags & COMP_EDITOR_MEETING) - sens = flags & COMP_EDITOR_USER_ORG; + sens = flags & COMP_EDITOR_USER_ORG; if (!e_cal_is_read_only (client, &read_only, NULL)) read_only = TRUE; @@ -1563,15 +1563,15 @@ void update_end_time_combo (EventPage *epage) &start_tt.month, &start_tt.day); e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time), - &start_tt.hour, - &start_tt.minute); + &start_tt.hour, + &start_tt.minute); e_date_edit_get_date (E_DATE_EDIT (priv->end_time), &end_tt.year, &end_tt.month, &end_tt.day); e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time), - &end_tt.hour, - &end_tt.minute); + &end_tt.hour, + &end_tt.minute); end_timet = icaltime_as_timet (end_tt); start_timet = icaltime_as_timet (start_tt); @@ -1619,10 +1619,10 @@ hour_minute_changed (EventPage *epage) icaltime_adjust (&end_tt, 0, for_hours, for_minutes, 0); e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (priv->end_time), - end_tt.year, + end_tt.year, end_tt.month, end_tt.day, - end_tt.hour, + end_tt.hour, end_tt.minute); } @@ -1937,8 +1937,8 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, EventPage *epage) gtk_tree_selection_unselect_all (selection); gtk_tree_selection_select_path (selection, path); - if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL) - disable_mask &= ~ATTENDEE_CAN_DELETE; + if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL) + disable_mask &= ~ATTENDEE_CAN_DELETE; } } } @@ -3041,7 +3041,7 @@ event_page_select_organizer (EventPage *epage, const gchar *backend_address) if (user_addr) subscribed_cal = TRUE; else - user_addr = (backend_address && *backend_address) ? backend_address : NULL; + user_addr = (backend_address && *backend_address) ? backend_address : NULL; default_address = NULL; if (user_addr) diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h index 5bd377c075..ab43c0f7ba 100644 --- a/calendar/gui/dialogs/event-page.h +++ b/calendar/gui/dialogs/event-page.h @@ -108,7 +108,7 @@ void event_page_set_view_rvsp (EventPage *epage, ENameSelector * event_page_get_name_selector (EventPage *epage); void event_page_add_attendee (EventPage *epage, EMeetingAttendee *attendee); -void event_page_remove_all_attendees (EventPage *epage); +void event_page_remove_all_attendees (EventPage *epage); G_END_DECLS diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index c3642a91d4..0b76d783c9 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -334,15 +334,15 @@ sensitize_widgets (MemoPage *mpage) read_only = TRUE; if (flags & COMP_EDITOR_IS_SHARED) - sens = flags & COMP_EDITOR_USER_ORG; + sens = flags & COMP_EDITOR_USER_ORG; else sens = TRUE; sensitize = (!read_only && sens); /* The list of organizers is set to be non-editable. Otherwise any - * change in the displayed list causes an 'Account not found' error. - */ + * change in the displayed list causes an 'Account not found' error. + */ gtk_editable_set_editable (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (priv->org_combo))), FALSE); gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->memo_content), sensitize); diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index c08ccfdb4d..9377e0970b 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -403,7 +403,7 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp) ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_e_cal_component_attendee (ca)); /* If we aren't the organizer or the attendee is just delegating, don't allow editing */ if (!comp_editor_get_user_org (editor) || e_meeting_attendee_is_set_delto (ia)) - e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE); + e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE); task_page_add_attendee (priv->task_page, ia); g_object_unref (ia); diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 412dcd5fa6..faaba68317 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -325,7 +325,7 @@ sensitize_widgets (TaskPage *tpage) read_only = TRUE; if (flags & COMP_EDITOR_IS_ASSIGNED) - sens = flags & COMP_EDITOR_USER_ORG; + sens = flags & COMP_EDITOR_USER_ORG; sensitize = (!read_only && sens); @@ -1247,8 +1247,8 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, TaskPage *page) gtk_tree_selection_unselect_all (selection); gtk_tree_selection_select_path (selection, path); - if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL) - disable_mask &= ~ATTENDEE_CAN_DELETE; + if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL) + disable_mask &= ~ATTENDEE_CAN_DELETE; } } } diff --git a/calendar/gui/e-alarm-list.h b/calendar/gui/e-alarm-list.h index 6dfb1c6515..e65e7514c1 100644 --- a/calendar/gui/e-alarm-list.h +++ b/calendar/gui/e-alarm-list.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS #define E_TYPE_ALARM_LIST (e_alarm_list_get_type ()) -#define E_ALARM_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ALARM_LIST, EAlarmList)) +#define E_ALARM_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ALARM_LIST, EAlarmList)) #define E_ALARM_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_ALARM_LIST, EAlarmListClass)) #define E_IS_ALARM_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ALARM_LIST)) #define E_IS_ALARM_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_ALARM_LIST)) diff --git a/calendar/gui/e-cal-component-memo-preview.h b/calendar/gui/e-cal-component-memo-preview.h index 3f310cce03..2c697231aa 100644 --- a/calendar/gui/e-cal-component-memo-preview.h +++ b/calendar/gui/e-cal-component-memo-preview.h @@ -31,7 +31,7 @@ #define E_TYPE_CAL_COMPONENT_MEMO_PREVIEW (e_cal_component_memo_preview_get_type ()) #define E_CAL_COMPONENT_MEMO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW, ECalComponentMemoPreview)) #define E_CAL_COMPONENT_MEMO_PREVIEW_CLASS(klass) (G_TYPE_CHECK_INSTANCE_CAST_CLASS ((klass), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW, \ - ECalComponentMemoPreviewClass)) + ECalComponentMemoPreviewClass)) #define E_IS_CAL_COMPONENT_MEMO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW)) #define E_IS_CAL_COMPONENT_MEMO_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW)) diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h index 86aa99ffc0..dd355c01ce 100644 --- a/calendar/gui/e-cal-component-preview.h +++ b/calendar/gui/e-cal-component-preview.h @@ -33,7 +33,7 @@ #define E_TYPE_CAL_COMPONENT_PREVIEW (e_cal_component_preview_get_type ()) #define E_CAL_COMPONENT_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_COMPONENT_PREVIEW, ECalComponentPreview)) #define E_CAL_COMPONENT_PREVIEW_CLASS(klass) (G_TYPE_CHECK_INSTANCE_CAST_CLASS ((klass), E_TYPE_CAL_COMPONENT_PREVIEW, \ - ECalComponentPreviewClass)) + ECalComponentPreviewClass)) #define E_IS_CAL_COMPONENT_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_COMPONENT_PREVIEW)) #define E_IS_CAL_COMPONENT_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_COMPONENT_PREVIEW)) diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 3ec7626d77..4e384f2774 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -136,7 +136,7 @@ ensure_task_complete (ECalModelComponent *comp_data, time_t completed_date) if (completed_date == -1) { if (prop) set_completed = FALSE; - else + else completed_date = time (NULL); } diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index df41fa5fae..68214fa051 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -180,7 +180,7 @@ e_cal_model_class_init (ECalModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECalModelClass, cal_view_progress), NULL, NULL, - e_marshal_VOID__STRING_INT_INT, + e_marshal_VOID__STRING_INT_INT, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT); signals[CAL_VIEW_DONE] = g_signal_new ("cal_view_done", @@ -1534,7 +1534,7 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data e_table_model_pre_change (E_TABLE_MODEL (model)); e_table_model_row_deleted (E_TABLE_MODEL (model), pos); - } + } e_cal_component_free_id (id); g_object_unref (comp); @@ -1701,7 +1701,7 @@ e_cal_view_progress_cb (ECalView *query, const gchar *message, gint percent, gpo static void e_cal_view_done_cb (ECalView *query, ECalendarStatus status, gpointer user_data) { - ECalModel *model = (ECalModel *) user_data; + ECalModel *model = (ECalModel *) user_data; ECal *client = e_cal_view_get_client (query); g_return_if_fail (E_IS_CAL_MODEL (model)); @@ -2164,7 +2164,7 @@ e_cal_model_create_component_with_defaults (ECalModel *model) comp = cal_comp_task_new_with_defaults (client); break; case ICAL_VJOURNAL_COMPONENT : - comp = cal_comp_memo_new_with_defaults (client); + comp = cal_comp_memo_new_with_defaults (client); break; default: return NULL; diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index 2c470840c8..6f3d3637b1 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -128,7 +128,7 @@ typedef struct { typedef time_t (*ECalModelDefaultTimeFunc)(ECalModel *model, gpointer user_data); GType e_cal_model_get_type (void); -GType e_cal_model_component_get_type (void); +GType e_cal_model_component_get_type (void); icalcomponent_kind e_cal_model_get_component_kind (ECalModel *model); void e_cal_model_set_component_kind (ECalModel *model, icalcomponent_kind kind); diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c index ef94eb8ab2..d6bf0ed4c5 100644 --- a/calendar/gui/e-cal-popup.c +++ b/calendar/gui/e-cal-popup.c @@ -362,7 +362,7 @@ e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector) /* check for e_target_selector's offline_status property here */ offline = e_source_get_property (source, "offline_sync"); if (offline && strcmp (offline, "1") == 0) - mask &= ~E_CAL_POPUP_SOURCE_NO_OFFLINE; /* set the menu item to Mark Offline */ + mask &= ~E_CAL_POPUP_SOURCE_NO_OFFLINE; /* set the menu item to Mark Offline */ else mask &= ~E_CAL_POPUP_SOURCE_OFFLINE; } else { @@ -374,7 +374,7 @@ e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector) /* check for delete_status property here */ delete = e_source_get_property (source, "delete"); if (delete && strcmp (delete, "no") == 0) - mask &= ~E_CAL_POPUP_SOURCE_NO_DELETE; /* set the menu item to non deletable */ + mask &= ~E_CAL_POPUP_SOURCE_NO_DELETE; /* set the menu item to non deletable */ else mask &= ~E_CAL_POPUP_SOURCE_DELETE; diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h index 50f2bb5995..e91886b5d4 100644 --- a/calendar/gui/e-calendar-table.h +++ b/calendar/gui/e-calendar-table.h @@ -107,7 +107,7 @@ void e_calendar_table_set_activity_handler (ECalendarTable *cal_table, void e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *message, gint percent); -void e_calendar_table_open_task (ECalendarTable *cal_table, +void e_calendar_table_open_task (ECalendarTable *cal_table, ECal *client, icalcomponent *icalcomp, gboolean assign); diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 9644259198..a2b1b735de 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -163,7 +163,7 @@ e_calendar_view_class_init (ECalendarViewClass *klass) object_class->destroy = e_calendar_view_destroy; klass->selection_changed = NULL; - klass->selected_time_changed = NULL; + klass->selected_time_changed = NULL; klass->event_changed = NULL; klass->event_added = NULL; klass->user_created = NULL; @@ -255,7 +255,7 @@ e_calendar_view_class_init (ECalendarViewClass *klass) "open_event", 0); /* init the accessibility support for e_day_view */ - e_cal_view_a11y_init (); + e_cal_view_a11y_init (); } @@ -1228,7 +1228,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view) TRUE, zone ? zone : icaltimezone_get_utc_timezone ()); e_cal_util_remove_instances (event->comp_data->icalcomp, instance_rid, CALOBJ_MOD_THIS); e_cal_modify_object (event->comp_data->client, event->comp_data->icalcomp, CALOBJ_MOD_THIS, - &error); + &error); } delete_error_dialog (error, E_CAL_COMPONENT_EVENT); @@ -2355,10 +2355,10 @@ e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client) /* * It is expected to show the tooltips in this below format * - * SUBJECT OF THE MEETING - * Organiser: NameOfTheUser - * Location: PlaceOfTheMeeting - * Time : DateAndTime (xx Minutes) + * SUBJECT OF THE MEETING + * Organiser: NameOfTheUser + * Location: PlaceOfTheMeeting + * Time : DateAndTime (xx Minutes) * Status: Accepted: X Declined: Y ... */ @@ -2621,38 +2621,38 @@ draw_curved_rectangle (cairo_t *cr, double x0, double y0, return; if (rect_width / 2 < radius) { if (rect_height / 2 < radius) { - cairo_move_to (cr, x0, (y0 + y1)/2); - cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0); - cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2); - cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1); - cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2); + cairo_move_to (cr, x0, (y0 + y1)/2); + cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0); + cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2); + cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1); + cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2); } else { - cairo_move_to (cr, x0, y0 + radius); - cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0); - cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius); - cairo_line_to (cr, x1 , y1 - radius); - cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1); - cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius); - } + cairo_move_to (cr, x0, y0 + radius); + cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0); + cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius); + cairo_line_to (cr, x1 , y1 - radius); + cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1); + cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius); + } } else { if (rect_height / 2 < radius) { - cairo_move_to (cr, x0, (y0 + y1)/2); - cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0); - cairo_line_to (cr, x1 - radius, y0); - cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2); - cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1); - cairo_line_to (cr, x0 + radius, y1); - cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2); + cairo_move_to (cr, x0, (y0 + y1)/2); + cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0); + cairo_line_to (cr, x1 - radius, y0); + cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2); + cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1); + cairo_line_to (cr, x0 + radius, y1); + cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2); } else { - cairo_move_to (cr, x0, y0 + radius); - cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0); - cairo_line_to (cr, x1 - radius, y0); - cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius); - cairo_line_to (cr, x1 , y1 - radius); - cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1); - cairo_line_to (cr, x0 + radius, y1); - cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius); - } + cairo_move_to (cr, x0, y0 + radius); + cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0); + cairo_line_to (cr, x1 - radius, y0); + cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius); + cairo_line_to (cr, x1 , y1 - radius); + cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1); + cairo_line_to (cr, x0 + radius, y1); + cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius); + } } cairo_close_path (cr); } diff --git a/calendar/gui/e-date-time-list.h b/calendar/gui/e-date-time-list.h index fe5e1fdc11..cdf279a537 100644 --- a/calendar/gui/e-date-time-list.h +++ b/calendar/gui/e-date-time-list.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS #define E_TYPE_DATE_TIME_LIST (e_date_time_list_get_type ()) -#define E_DATE_TIME_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DATE_TIME_LIST, EDateTimeList)) +#define E_DATE_TIME_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DATE_TIME_LIST, EDateTimeList)) #define E_DATE_TIME_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_DATE_TIME_LIST, EDateTimeListClass)) #define E_IS_DATE_TIME_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DATE_TIME_LIST)) #define E_IS_DATE_TIME_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DATE_TIME_LIST)) diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c index 682c99e6b7..942f73933e 100644 --- a/calendar/gui/e-day-view-config.c +++ b/calendar/gui/e-day-view-config.c @@ -353,7 +353,7 @@ set_show_event_end (EDayView *day_view) { gboolean show_event_end; - show_event_end = calendar_config_get_show_event_end (); + show_event_end = calendar_config_get_show_event_end (); e_day_view_set_show_event_end_times (day_view, show_event_end); } diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c index 5b5536d391..ab1f6c0fd0 100644 --- a/calendar/gui/e-day-view-layout.c +++ b/calendar/gui/e-day-view-layout.c @@ -40,14 +40,14 @@ static void e_day_view_layout_long_event (EDayViewEvent *event, static void e_day_view_layout_day_event (EDayViewEvent *event, EBitArray **grid, guint16 *group_starts, - guint8 *cols_per_row, - gint rows, - gint mins_per_row, + guint8 *cols_per_row, + gint rows, + gint mins_per_row, gint max_cols); static void e_day_view_expand_day_event (EDayViewEvent *event, EBitArray **grid, - guint8 *cols_per_row, - gint mins_per_row); + guint8 *cols_per_row, + gint mins_per_row); static void e_day_view_recalc_cols_per_row (gint rows, guint8 *cols_per_row, guint16 *group_starts); diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index f3ad280cae..6f9d6333d6 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -111,7 +111,7 @@ e_day_view_main_item_class_init (EDayViewMainItemClass *class) G_PARAM_WRITABLE)); /* init the accessibility support for e_day_view */ - e_day_view_main_item_a11y_init (); + e_day_view_main_item_a11y_init (); } @@ -641,7 +641,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, gconf = gconf_client_get_default (); alpha = gconf_client_get_float (gconf, - "/apps/evolution/calendar/display/events_transparency", + "/apps/evolution/calendar/display/events_transparency", NULL); gradient = gconf_client_get_bool (gconf, @@ -788,7 +788,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, /* Black border */ cairo_save (cr); x0 = item_x + E_DAY_VIEW_BAR_WIDTH + 9; - y0 = item_y + 10; + y0 = item_y + 10; rect_width = MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 7, 0); rect_height = item_h - 7; @@ -1217,7 +1217,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, { if (event->start_minute % day_view->mins_per_row != 0 || (day_view->show_event_end_times - && event->end_minute % day_view->mins_per_row != 0)) { + && event->end_minute % day_view->mins_per_row != 0)) { offset = day_view->first_hour_shown * 60 + day_view->first_minute_shown; show_span = TRUE; diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index 4cbfadd9da..78bf55863f 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -365,7 +365,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item, /* diff is number of minutes */ diff = (icaltimezone_get_utc_offset (use_zone, &tt, NULL) - - icaltimezone_get_utc_offset (cal_zone, &tt, NULL) + icaltimezone_get_utc_offset (cal_zone, &tt, NULL) ) / 60; tt = icaltime_today (); @@ -834,7 +834,7 @@ e_day_view_time_item_on_set_divisions (GtkWidget *item, day_view = dvtmitem->day_view; g_return_if_fail (day_view != NULL); - if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item))) + if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item))) return; divisions = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "divisions")); diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index de9a542ef6..7579f00986 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -395,8 +395,8 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem, gconf_client = gconf_client_get_default (); alpha = gconf_client_get_float (gconf_client, - "/apps/evolution/calendar/display/events_transparency", - NULL); + "/apps/evolution/calendar/display/events_transparency", + NULL); gradient = gconf_client_get_bool (gconf_client, "/apps/evolution/calendar/display/events_gradient", diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 5d6dd15563..ba05c400c0 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -130,7 +130,7 @@ static gint e_day_view_focus_out (GtkWidget *widget, static gboolean e_day_view_key_press (GtkWidget *widget, GdkEventKey *event); static gboolean e_day_view_focus (GtkWidget *widget, - GtkDirectionType direction); + GtkDirectionType direction); static gboolean e_day_view_get_next_tab_event (EDayView *day_view, GtkDirectionType direction, gint *day, gint *event_num); @@ -453,11 +453,11 @@ e_day_view_class_init (EDayViewClass *class) widget_class->realize = e_day_view_realize; widget_class->unrealize = e_day_view_unrealize; widget_class->style_set = e_day_view_style_set; - widget_class->size_allocate = e_day_view_size_allocate; + widget_class->size_allocate = e_day_view_size_allocate; widget_class->focus_in_event = e_day_view_focus_in; widget_class->focus_out_event = e_day_view_focus_out; widget_class->key_press_event = e_day_view_key_press; - widget_class->focus = e_day_view_focus; + widget_class->focus = e_day_view_focus; widget_class->popup_menu = e_day_view_popup_menu; view_class->get_selected_events = e_day_view_get_selected_events; @@ -467,7 +467,7 @@ e_day_view_class_init (EDayViewClass *class) view_class->paste_text = e_day_view_paste_text; /* init the accessibility support for e_day_view */ - e_day_view_a11y_init (); + e_day_view_a11y_init (); } static void @@ -1241,19 +1241,19 @@ e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget * gdouble cc = 65535.0; red = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].red; - green = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green; - blue = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].blue; + green = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green; + blue = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].blue; if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)), event->comp_data), - &bg_color)) { + &bg_color)) { GdkColormap *colormap; - colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view)); - if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) { - red = bg_color.red; + colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view)); + if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) { + red = bg_color.red; green = bg_color.green; - blue = bg_color.blue; + blue = bg_color.blue; } - } + } if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 )) return widget->style->black; @@ -2579,7 +2579,7 @@ e_day_view_update_marcus_bains (EDayView *day_view) void e_day_view_set_marcus_bains (EDayView *day_view, gboolean show_line, - const gchar *dayview_color, + const gchar *dayview_color, const gchar *timebar_color) { g_return_if_fail (E_IS_DAY_VIEW (day_view)); @@ -4021,11 +4021,11 @@ e_day_view_finish_long_event_resize (EDayView *day_view) } e_cal_component_commit_sequence (comp); - if (e_cal_component_has_recurrences (comp)) { - if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) { - gtk_widget_queue_draw (day_view->top_canvas); + if (e_cal_component_has_recurrences (comp)) { + if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) { + gtk_widget_queue_draw (day_view->top_canvas); goto out; - } + } if (mod == CALOBJ_MOD_ALL) comp_util_sanitize_recurrence_master (comp, client); @@ -4058,7 +4058,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view) e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE); out: - day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE; + day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE; g_object_unref (comp); } @@ -4132,11 +4132,11 @@ e_day_view_finish_resize (EDayView *day_view) day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE; - if (e_cal_component_has_recurrences (comp)) { - if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) { - gtk_widget_queue_draw (day_view->top_canvas); + if (e_cal_component_has_recurrences (comp)) { + if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) { + gtk_widget_queue_draw (day_view->top_canvas); goto out; - } + } if (mod == CALOBJ_MOD_ALL) comp_util_sanitize_recurrence_master (comp, client); @@ -4940,9 +4940,9 @@ e_day_view_do_key_press (GtkWidget *widget, GdkEventKey *event) /*Go to the start/end of a work day*/ if ((keyval == GDK_Home) - &&((event->state & GDK_SHIFT_MASK) != GDK_SHIFT_MASK) - &&((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK) - &&((event->state & GDK_MOD1_MASK) != GDK_MOD1_MASK)) { + &&((event->state & GDK_SHIFT_MASK) != GDK_SHIFT_MASK) + &&((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK) + &&((event->state & GDK_MOD1_MASK) != GDK_MOD1_MASK)) { e_day_view_goto_start_of_work_day (day_view); return TRUE; } @@ -6145,11 +6145,11 @@ e_day_view_change_event_time (EDayView *day_view, time_t start_dt, time_t end_dt day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE; - if (e_cal_component_has_recurrences (comp)) { - if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) { - gtk_widget_queue_draw (day_view->top_canvas); + if (e_cal_component_has_recurrences (comp)) { + if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) { + gtk_widget_queue_draw (day_view->top_canvas); goto out; - } + } if (mod == CALOBJ_MOD_ALL) comp_util_sanitize_recurrence_master (comp, client); @@ -7417,7 +7417,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget, GtkSelectionData *data, guint info, guint time, - EDayView *day_view) + EDayView *day_view) { EDayViewEvent *event=NULL; ECalendarViewPosition pos; @@ -7948,7 +7948,7 @@ e_day_view_paste_text (ECalendarView *cal_view) if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT) { event = &g_array_index (day_view->long_events, - EDayViewEvent, + EDayViewEvent, day_view->editing_event_num); } else { event = &g_array_index (day_view->events[day_view->editing_event_day], diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index 8fde1e9ad7..2b3f11e280 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -530,7 +530,7 @@ void e_day_view_set_working_day (EDayView *day_view, gboolean e_day_view_get_show_marcus_bains (EDayView *day_view); void e_day_view_set_marcus_bains (EDayView *day_view, gboolean show_line, - const gchar *dayview_color, + const gchar *dayview_color, const gchar *timebar_color); /* Whether we display event end times in the main canvas. */ @@ -604,9 +604,9 @@ gint e_day_view_event_sort_func (const void *arg1, const void *arg2); gboolean e_day_view_find_event_from_item (EDayView *day_view, - GnomeCanvasItem *item, - gint *day_return, - gint *event_num_return); + GnomeCanvasItem *item, + gint *day_return, + gint *event_num_return); void e_day_view_update_calendar_selection_time (EDayView *day_view); void e_day_view_ensure_rows_visible (EDayView *day_view, gint start_row, diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 1876d36832..d3928d6c6a 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -1096,12 +1096,12 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title, itip_strip_mailto (organizer.value), priv->delegator_name ? priv->delegator_name : - priv->delegator_address); + priv->delegator_address); else html = g_strdup_printf (itip_desc, _("An unknown person"), priv->delegator_name ? priv->delegator_name : - priv->delegator_address); + priv->delegator_address); } else { if (organizer.value != NULL) html = g_strdup_printf (itip_desc, @@ -1275,7 +1275,7 @@ get_cancel_options (gboolean found, icalcomponent_kind kind) case ICAL_VEVENT_COMPONENT: return g_strdup_printf ("%s", _("The meeting has been canceled, however it could not be found in your calendars")); case ICAL_VTODO_COMPONENT: - return g_strdup_printf ("%s", _("The task has been canceled, however it could not be found in your task lists")); + return g_strdup_printf ("%s", _("The task has been canceled, however it could not be found in your task lists")); default: g_return_val_if_reached (NULL); } @@ -2182,7 +2182,7 @@ url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpoint return; } - while ((len = read (fd, buffer, 4096)) > 0) { + while ((len = read (fd, buffer, 4096)) > 0) { gtk_html_write (html, handle, (gchar *)buffer, len); } diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 8567aa07fa..924ab6720d 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -15,7 +15,7 @@ * * Authors: * Mike Kestner - * JP Rosevear + * JP Rosevear * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * @@ -97,7 +97,7 @@ e_meeting_list_view_finalize (GObject *obj) g_free (priv); if (G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize) - (* G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize) (obj); + (* G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize) (obj); } static void @@ -150,7 +150,7 @@ e_meeting_list_view_init (EMeetingListView *view) name_selector_dialog = e_name_selector_peek_dialog (view->priv->name_selector); gtk_window_set_title (GTK_WINDOW (name_selector_dialog), _("Attendees")); - g_signal_connect (name_selector_dialog, "response", + g_signal_connect (name_selector_dialog, "response", G_CALLBACK (name_selector_dialog_close_cb), view); } @@ -908,7 +908,7 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin EMeetingStore *store; const GPtrArray *attendees; gint i; - GSList *la = NULL, *l; + GSList *la = NULL, *l; name_selector_model = e_name_selector_peek_model (view->priv->name_selector); store = E_MEETING_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view))); diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index e843bee2f5..b555c41f6c 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -15,7 +15,7 @@ * * Authors: * JP Rosevear - * Mike Kestner + * Mike Kestner * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * @@ -539,13 +539,13 @@ ems_finalize (GObject *obj) if (priv->client != NULL) g_object_unref (priv->client); - while (priv->refresh_queue->len > 0) - refresh_queue_remove (store, g_ptr_array_index (priv->refresh_queue, 0)); - g_ptr_array_free (priv->refresh_queue, TRUE); - g_hash_table_destroy (priv->refresh_data); + while (priv->refresh_queue->len > 0) + refresh_queue_remove (store, g_ptr_array_index (priv->refresh_queue, 0)); + g_ptr_array_free (priv->refresh_queue, TRUE); + g_hash_table_destroy (priv->refresh_data); - if (priv->refresh_idle_id) - g_source_remove (priv->refresh_idle_id); + if (priv->refresh_idle_id) + g_source_remove (priv->refresh_idle_id); g_free (priv->fb_uri); @@ -554,7 +554,7 @@ ems_finalize (GObject *obj) g_free (priv); if (G_OBJECT_CLASS (parent_class)->finalize) - (* G_OBJECT_CLASS (parent_class)->finalize) (obj); + (* G_OBJECT_CLASS (parent_class)->finalize) (obj); } static void @@ -1048,19 +1048,19 @@ process_free_busy_comp (EMeetingAttendee *attendee, static void process_free_busy (EMeetingStoreQueueData *qdata, gchar *text) { - EMeetingStore *store = qdata->store; - EMeetingStorePrivate *priv; - EMeetingAttendee *attendee = qdata->attendee; + EMeetingStore *store = qdata->store; + EMeetingStorePrivate *priv; + EMeetingAttendee *attendee = qdata->attendee; icalcomponent *main_comp; icalcomponent_kind kind = ICAL_NO_COMPONENT; priv = store->priv; main_comp = icalparser_parse_string (text); - if (main_comp == NULL) { - process_callbacks (qdata); - return; - } + if (main_comp == NULL) { + process_callbacks (qdata); + return; + } kind = icalcomponent_isa (main_comp); if (kind == ICAL_VCALENDAR_COMPONENT) { @@ -1136,7 +1136,7 @@ freebusy_async (gpointer data) FreeBusyAsyncData *fbd = data; EMeetingAttendee *attendee = fbd->attendee; gchar *default_fb_uri = NULL; - gchar *fburi = NULL; + gchar *fburi = NULL; static GStaticMutex mutex = G_STATIC_MUTEX_INIT; EMeetingStorePrivate *priv = fbd->store->priv; @@ -1341,8 +1341,8 @@ refresh_queue_add (EMeetingStore *store, gint row, e_meeting_attendee_clear_busy_periods (attendee); e_meeting_attendee_set_has_calendar_info (attendee, FALSE); - qdata->start = *start; - qdata->end = *end; + qdata->start = *start; + qdata->end = *end; qdata->string = g_string_new (NULL); qdata->call_backs = g_ptr_array_new (); qdata->data = g_ptr_array_new (); diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c index 95a1738057..00efabe029 100644 --- a/calendar/gui/e-meeting-time-sel-item.c +++ b/calendar/gui/e-meeting-time-sel-item.c @@ -726,7 +726,7 @@ e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorIt { EMeetingTimeSelector *mts; EMeetingAttendee *ia; - const GArray *busy_periods; + const GArray *busy_periods; EMeetingFreeBusyPeriod *period; GdkGC *gc; gint period_num, x1, x2, x2_within_day, x2_within_col; diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 09e1994908..e8cc938429 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -64,7 +64,7 @@ const gchar *EMeetingTimeSelectorHours12[24] = { }; /* The number of days shown in the entire canvas. */ -#define E_MEETING_TIME_SELECTOR_DAYS_SHOWN 35 +#define E_MEETING_TIME_SELECTOR_DAYS_SHOWN 35 #define E_MEETING_TIME_SELECTOR_DAYS_START_BEFORE 7 #define E_MEETING_TIME_SELECTOR_FB_DAYS_BEFORE 7 #define E_MEETING_TIME_SELECTOR_FB_DAYS_AFTER 28 diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index cbc66c44d0..ea03097ca8 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -80,7 +80,7 @@ static void e_memo_table_on_double_click (ETable *table, gint col, GdkEvent *event, EMemoTable *memo_table); -static gint e_memo_table_show_popup_menu (ETable *table, +static gint e_memo_table_show_popup_menu (ETable *table, GdkEvent *gdk_event, EMemoTable *memo_table); @@ -89,7 +89,7 @@ static gint e_memo_table_on_right_click (ETable *table, gint col, GdkEvent *event, EMemoTable *memo_table); -static gboolean e_memo_table_on_popup_menu (GtkWidget *widget, +static gboolean e_memo_table_on_popup_menu (GtkWidget *widget, gpointer data); static gint e_memo_table_on_key_press (ETable *table, diff --git a/calendar/gui/e-week-view-config.c b/calendar/gui/e-week-view-config.c index c981be8f53..423a12a2d9 100644 --- a/calendar/gui/e-week-view-config.c +++ b/calendar/gui/e-week-view-config.c @@ -193,7 +193,7 @@ set_show_event_end (EWeekView *week_view) { gboolean show_event_end; - show_event_end = calendar_config_get_show_event_end (); + show_event_end = calendar_config_get_show_event_end (); e_week_view_set_show_event_end_times (week_view, show_event_end); } @@ -214,7 +214,7 @@ set_compress_weekend (EWeekView *week_view) { gboolean compress_weekend; - compress_weekend = calendar_config_get_compress_weekend (); + compress_weekend = calendar_config_get_compress_weekend (); e_week_view_set_compress_weekend (week_view, compress_weekend); } diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index a8123bdf53..f72c9dfcb1 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -179,7 +179,7 @@ static void e_week_view_event_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags) + int flags) { EWeekViewEventItem *wveitem; EWeekView *week_view; diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c index 67e9574a16..a43e816406 100644 --- a/calendar/gui/e-week-view-main-item.c +++ b/calendar/gui/e-week-view-main-item.c @@ -92,7 +92,7 @@ e_week_view_main_item_class_init (EWeekViewMainItemClass *class) G_PARAM_WRITABLE)); /* init the accessibility support for e_week_view_main_item */ - e_week_view_main_item_a11y_init (); + e_week_view_main_item_a11y_init (); } diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index dac03a274e..97f85a5f4f 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -212,7 +212,7 @@ e_week_view_class_init (EWeekViewClass *class) widget_class->realize = e_week_view_realize; widget_class->unrealize = e_week_view_unrealize; widget_class->style_set = e_week_view_style_set; - widget_class->size_allocate = e_week_view_size_allocate; + widget_class->size_allocate = e_week_view_size_allocate; widget_class->focus_in_event = e_week_view_focus_in; widget_class->focus_out_event = e_week_view_focus_out; widget_class->key_press_event = e_week_view_key_press; @@ -827,19 +827,19 @@ e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidg gdouble cc = 65535.0; red = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].red; - green = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green; - blue = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue; + green = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green; + blue = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue; if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)), event->comp_data), - &bg_color)) { + &bg_color)) { GdkColormap *colormap; - colormap = gtk_widget_get_colormap (GTK_WIDGET (week_view)); - if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) { - red = bg_color.red; + colormap = gtk_widget_get_colormap (GTK_WIDGET (week_view)); + if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) { + red = bg_color.red; green = bg_color.green; - blue = bg_color.blue; + blue = bg_color.blue; } - } + } if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 )) return widget->style->black; @@ -2685,7 +2685,7 @@ tooltip_destroy (EWeekView *week_view, GnomeCanvasItem *item) static gboolean tooltip_event_cb (GnomeCanvasItem *item, - GdkEvent *event, + GdkEvent *event, EWeekView *view) { gint event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num")); @@ -3484,11 +3484,11 @@ e_week_view_change_event_time (EWeekView *week_view, time_t start_dt, time_t end week_view->last_edited_comp_string = e_cal_component_get_as_string (comp); - if (e_cal_component_has_recurrences (comp)) { - if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) { - gtk_widget_queue_draw (week_view->main_canvas); + if (e_cal_component_has_recurrences (comp)) { + if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) { + gtk_widget_queue_draw (week_view->main_canvas); goto out; - } + } if (mod == CALOBJ_MOD_ALL) comp_util_sanitize_recurrence_master (comp, client); diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h index 0936a1e6dc..605c96b24b 100644 --- a/calendar/gui/e-week-view.h +++ b/calendar/gui/e-week-view.h @@ -441,9 +441,9 @@ gint e_week_view_event_sort_func (const void *arg1, const void *arg2); gboolean e_week_view_find_event_from_item (EWeekView *week_view, - GnomeCanvasItem *item, - gint *event_num_return, - gint *span_num_return); + GnomeCanvasItem *item, + gint *event_num_return, + gint *span_num_return); gboolean e_week_view_is_jump_button_visible (EWeekView *week_view, gint day); diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 951f01bfa9..ff99530429 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -162,7 +162,7 @@ struct _GnomeCalendarPrivate { gint hpane_pos; gint hpane_pos_month_view; gint vpane_pos; - gint vpane_pos_month_view; + gint vpane_pos_month_view; /* The signal handler id for our GtkCalendar "day_selected" handler. */ guint day_selected_id; @@ -209,7 +209,7 @@ enum { GOTO_DATE, SOURCE_ADDED, SOURCE_REMOVED, - CHANGE_VIEW, + CHANGE_VIEW, LAST_SIGNAL }; @@ -422,7 +422,7 @@ gnome_calendar_class_init (GnomeCalendarClass *class) class->source_added = NULL; class->source_removed = NULL; class->goto_date = gnome_calendar_goto_date; - class->change_view = gnome_calendar_change_view; + class->change_view = gnome_calendar_change_view; /* * Key bindings @@ -496,33 +496,33 @@ gnome_calendar_class_init (GnomeCalendarClass *class) G_TYPE_ENUM, GNOME_CAL_GOTO_SAME_DAY_OF_NEXT_WEEK); - /* Ctrl+Y/J/K/M/L to switch between + /* Ctrl+Y/J/K/M/L to switch between * DayView/WorkWeekView/WeekView/MonthView/ListView */ - gtk_binding_entry_add_signal (binding_set, GDK_y, - GDK_CONTROL_MASK, - "change_view", 1, - G_TYPE_ENUM, - GNOME_CAL_DAY_VIEW); - gtk_binding_entry_add_signal (binding_set, GDK_j, - GDK_CONTROL_MASK, - "change_view", 1, - G_TYPE_ENUM, - GNOME_CAL_WORK_WEEK_VIEW); - gtk_binding_entry_add_signal (binding_set, GDK_k, - GDK_CONTROL_MASK, - "change_view", 1, - G_TYPE_ENUM, - GNOME_CAL_WEEK_VIEW); - gtk_binding_entry_add_signal (binding_set, GDK_m, - GDK_CONTROL_MASK, - "change_view", 1, - G_TYPE_ENUM, - GNOME_CAL_MONTH_VIEW); + gtk_binding_entry_add_signal (binding_set, GDK_y, + GDK_CONTROL_MASK, + "change_view", 1, + G_TYPE_ENUM, + GNOME_CAL_DAY_VIEW); + gtk_binding_entry_add_signal (binding_set, GDK_j, + GDK_CONTROL_MASK, + "change_view", 1, + G_TYPE_ENUM, + GNOME_CAL_WORK_WEEK_VIEW); + gtk_binding_entry_add_signal (binding_set, GDK_k, + GDK_CONTROL_MASK, + "change_view", 1, + G_TYPE_ENUM, + GNOME_CAL_WEEK_VIEW); + gtk_binding_entry_add_signal (binding_set, GDK_m, + GDK_CONTROL_MASK, + "change_view", 1, + G_TYPE_ENUM, + GNOME_CAL_MONTH_VIEW); gtk_binding_entry_add_signal (binding_set, GDK_l, - GDK_CONTROL_MASK, - "change_view", 1, - G_TYPE_ENUM, - GNOME_CAL_LIST_VIEW); + GDK_CONTROL_MASK, + "change_view", 1, + G_TYPE_ENUM, + GNOME_CAL_LIST_VIEW); /* init the accessibility support for gnome_calendar */ gnome_calendar_a11y_init (); @@ -4069,46 +4069,46 @@ gnome_calendar_get_task_pad (GnomeCalendar *gcal) GtkWidget * gnome_calendar_get_e_calendar_widget (GnomeCalendar *gcal) { - g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); + g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); - return GTK_WIDGET(gcal->priv->date_navigator); + return GTK_WIDGET(gcal->priv->date_navigator); } GtkWidget * gnome_calendar_get_search_bar_widget (GnomeCalendar *gcal) { - g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); + g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); - return GTK_WIDGET(gcal->priv->search_bar); + return GTK_WIDGET(gcal->priv->search_bar); } GtkWidget * gnome_calendar_get_view_notebook_widget (GnomeCalendar *gcal) { - g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); + g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); - return GTK_WIDGET(gcal->priv->notebook); + return GTK_WIDGET(gcal->priv->notebook); } ECalMenu *gnome_calendar_get_taskpad_menu (GnomeCalendar *gcal) { - g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); + g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); - return gcal->priv->taskpad_menu; + return gcal->priv->taskpad_menu; } ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal) { - g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); + g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); - return gcal->priv->calendar_menu; + return gcal->priv->calendar_menu; } ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal) { - g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); + g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); - return gcal->priv->memopad_menu; + return gcal->priv->memopad_menu; } diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index 5d7ca5f031..b0bbc8535b 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -93,8 +93,8 @@ struct _GnomeCalendarClass { void (* calendar_focus_change) (GnomeCalendar *gcal, gboolean in); void (* taskpad_focus_change) (GnomeCalendar *gcal, gboolean in); void (* memopad_focus_change) (GnomeCalendar *gcal, gboolean in); - void (* change_view) (GnomeCalendar *gcal, - GnomeCalendarViewType view_type); + void (* change_view) (GnomeCalendar *gcal, + GnomeCalendarViewType view_type); void (* source_added) (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source); void (* source_removed) (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source); @@ -104,7 +104,7 @@ struct _GnomeCalendarClass { }; -GType gnome_calendar_get_type (void); +GType gnome_calendar_get_type (void); GtkWidget *gnome_calendar_construct (GnomeCalendar *gcal); GtkWidget *gnome_calendar_new (void); @@ -120,11 +120,11 @@ gboolean gnome_calendar_remove_source (GnomeCalendar *gcal, ECalSourceType s gboolean gnome_calendar_remove_source_by_uid (GnomeCalendar *gcal, ECalSourceType source_type, const gchar *uid); gboolean gnome_calendar_set_default_source (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source); -void gnome_calendar_next (GnomeCalendar *gcal); -void gnome_calendar_previous (GnomeCalendar *gcal); -void gnome_calendar_goto (GnomeCalendar *gcal, +void gnome_calendar_next (GnomeCalendar *gcal); +void gnome_calendar_previous (GnomeCalendar *gcal); +void gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time); -void gnome_calendar_dayjump (GnomeCalendar *gcal, +void gnome_calendar_dayjump (GnomeCalendar *gcal, time_t time); /* Jumps to the current day */ void gnome_calendar_goto_today (GnomeCalendar *gcal); diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c index c58e5ab27b..ab107ad29c 100644 --- a/calendar/gui/itip-bonobo-control.c +++ b/calendar/gui/itip-bonobo-control.c @@ -165,17 +165,17 @@ pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream, /* static CORBA_long */ /* pstream_get_max_size (BonoboPersistStream *ps, gpointer data, */ -/* CORBA_Environment *ev) */ +/* CORBA_Environment *ev) */ /* { */ -/* EItipControl *itip = data; */ -/* gint len; */ +/* EItipControl *itip = data; */ +/* gint len; */ -/* len = e_itip_control_get_data_size (itip); */ +/* len = e_itip_control_get_data_size (itip); */ -/* if (len > 0) */ -/* return len; */ +/* if (len > 0) */ +/* return len; */ -/* return 0L; */ +/* return 0L; */ /* } */ static Bonobo_Persist_ContentTypeList * diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 5cfa2cf378..19d0aa37c2 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -95,20 +95,20 @@ itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_ e_cal_component_get_organizer (comp, &organizer); if (organizer.value != NULL) { - strip = itip_strip_mailto (organizer.value); + strip = itip_strip_mailto (organizer.value); - if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) { - gchar *email = NULL; + if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) { + gchar *email = NULL; - if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) { + if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) { g_free (email); - return TRUE; + return TRUE; } g_free (email); - return FALSE; - } + return FALSE; + } user_org = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL; } @@ -437,7 +437,7 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users, GPtrArray *array = NULL; EDestination *destination; gint len; - gchar *sender = NULL; + gchar *sender = NULL; union { gpointer *pdata; @@ -1389,13 +1389,13 @@ reply_to_calendar_comp (ECalComponentItipMethod method, if (text_list){ ECalComponentText text = *((ECalComponentText *)text_list->data); - if (text.value) - description = text.value; - else - description = ""; - } else { - description = ""; - } + if (text.value) + description = text.value; + else + description = ""; + } else { + description = ""; + } e_cal_component_free_text_list (text_list); @@ -1505,8 +1505,8 @@ itip_publish_begin (ECalComponent *pub_comp, ECal *client, icomp_clone = e_cal_component_get_icalcomponent (*clone); for (prop = icalcomponent_get_first_property (icomp, ICAL_FREEBUSY_PROPERTY); - prop != NULL; - prop = icalcomponent_get_next_property (icomp, + prop != NULL; + prop = icalcomponent_get_next_property (icomp, ICAL_FREEBUSY_PROPERTY)) { icalproperty *p; diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c index 45e31a37da..a12d9e2935 100644 --- a/calendar/gui/memos-control.c +++ b/calendar/gui/memos-control.c @@ -291,7 +291,7 @@ memos_control_deactivate (BonoboControl *control, EMemos *memos) g_signal_handlers_disconnect_matched (memos, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, control); bonobo_ui_component_rm (uic, "/", NULL); - bonobo_ui_component_unset_container (uic, NULL); + bonobo_ui_component_unset_container (uic, NULL); } static void memos_control_open_memo_cmd (BonoboUIComponent *uic, diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index b2552a5a27..6c5504afa3 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -1028,7 +1028,7 @@ fail: /******************************************************************************************************** * - * MEMOS + * MEMOS * ********************************************************************************************************/ @@ -1154,7 +1154,7 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name, const gchar return; soap_port = camel_url_get_param (url, "soap_port"); - if (!soap_port || strlen (soap_port) == 0) + if (!soap_port || strlen (soap_port) == 0) soap_port = "7191"; use_ssl = camel_url_get_param (url, "use_ssl"); diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 7abe2f5da7..659897bda6 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -1351,7 +1351,7 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence, max_font_size = ((top - bottom) / pdi.rows) - 4; else max_font_size = ((bottom - top ) / pdi.rows) - 4; - font_size = MIN(DAY_NORMAL_FONT_SIZE, max_font_size); + font_size = MIN(DAY_NORMAL_FONT_SIZE, max_font_size); font = get_font_for_size (font_size, PANGO_WEIGHT_NORMAL); for (i = 0; i < pdi.events[0]->len; i++) { @@ -1697,13 +1697,13 @@ print_week_summary_cb (ECalComponent *comp, gpointer data) { - icaltimezone *zone = calendar_config_get_icaltimezone (); - EWeekViewEvent event; - struct icaltimetype start_tt, end_tt; + icaltimezone *zone = calendar_config_get_icaltimezone (); + EWeekViewEvent event; + struct icaltimetype start_tt, end_tt; ECalModelGenerateInstancesData *mdata = (ECalModelGenerateInstancesData *) data; - struct psinfo *psi = (struct psinfo *) mdata->cb_data; + struct psinfo *psi = (struct psinfo *) mdata->cb_data; - /* Check that the event times are valid. */ + /* Check that the event times are valid. */ #if 0 g_print ("View start:%li end:%li Event start:%li end:%li\n", @@ -1711,12 +1711,12 @@ print_week_summary_cb (ECalComponent *comp, start, end); #endif - g_return_val_if_fail (start <= end, TRUE); - g_return_val_if_fail (start < psi->day_starts[psi->days_shown], TRUE); - g_return_val_if_fail (end > psi->day_starts[0], TRUE); + g_return_val_if_fail (start <= end, TRUE); + g_return_val_if_fail (start < psi->day_starts[psi->days_shown], TRUE); + g_return_val_if_fail (end > psi->day_starts[0], TRUE); - start_tt = icaltime_from_timet_with_zone (start, FALSE, zone); - end_tt = icaltime_from_timet_with_zone (end, FALSE, zone); + start_tt = icaltime_from_timet_with_zone (start, FALSE, zone); + end_tt = icaltime_from_timet_with_zone (end, FALSE, zone); event.comp_data = e_cal_model_copy_component_data (mdata->comp_data); diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 5e57456bd3..15a4e38db7 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -372,7 +372,7 @@ tasks_control_deactivate (BonoboControl *control, ETasks *tasks) g_signal_handlers_disconnect_matched (tasks, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, control); bonobo_ui_component_rm (uic, "/", NULL); - bonobo_ui_component_unset_container (uic, NULL); + bonobo_ui_component_unset_container (uic, NULL); } static void tasks_control_open_task_cmd (BonoboUIComponent *uic, @@ -557,7 +557,7 @@ tasks_control_assign_cmd (BonoboUIComponent *uic, tasks = E_TASKS (data); cal_table = e_tasks_get_calendar_table (tasks); comp_data = e_calendar_table_get_selected_comp (cal_table); - if (comp_data) + if (comp_data) e_calendar_table_open_task (cal_table, comp_data->client, comp_data->icalcomp, TRUE); } @@ -566,7 +566,7 @@ tasks_control_forward_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path) { - ETasks *tasks; + ETasks *tasks; ECalendarTable *cal_table; ECalModelComponent *comp_data; diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h index eb339d647c..e1d7d923ab 100644 --- a/composer/e-composer-header.h +++ b/composer/e-composer-header.h @@ -65,7 +65,7 @@ void e_composer_header_set_sensitive (EComposerHeader *header, gboolean e_composer_header_get_visible (EComposerHeader *header); void e_composer_header_set_visible (EComposerHeader *header, gboolean visible); -void e_composer_header_set_property (GObject *object, guint property_id, +void e_composer_header_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); void e_composer_header_set_title_tooltip (EComposerHeader *header, diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 7f1cb69504..a7a2dfaf62 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1214,7 +1214,7 @@ get_signature_html (EMsgComposer *composer) "

" "%s%s%s%s" "%s
", - encoded_uid ? encoded_uid : "", + encoded_uid ? encoded_uid : "", format_html ? "" : "
\n",
 					format_html || !add_delim || (!strncmp ("-- \n", text, 4) || strstr (text, "\n-- \n")) ? "" : "-- \n",
 					text,
@@ -1650,7 +1650,7 @@ msg_composer_map (GtkWidget *widget)
 
 static gint
 msg_composer_delete_event (GtkWidget *widget,
-	                   GdkEventAny *event)
+			   GdkEventAny *event)
 {
 	/* This is needed for the ACTION macro. */
 	EMsgComposer *composer = E_MSG_COMPOSER (widget);
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index b9985f7f44..7664a8355b 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -71,14 +71,14 @@ struct _EAttachmentBar;
 
 GType		e_msg_composer_get_type		(void);
 EMsgComposer *	e_msg_composer_new		(void);
-EMsgComposer *  e_msg_composer_lite_new 	(void);
+EMsgComposer *  e_msg_composer_lite_new	(void);
 
 EMsgComposer *	e_msg_composer_new_with_message	(CamelMimeMessage *msg);
 EMsgComposer *	e_msg_composer_new_from_url	(const gchar *url);
 EMsgComposer *	e_msg_composer_new_redirect	(CamelMimeMessage *message,
 						 const gchar *resent_from);
-void		e_msg_composer_set_lite 	(void);
-gboolean 	e_msg_composer_get_lite 	(void);
+void		e_msg_composer_set_lite	(void);
+gboolean	e_msg_composer_get_lite	(void);
 
 void		e_msg_composer_send		(EMsgComposer *composer);
 void		e_msg_composer_save_draft	(EMsgComposer *composer);
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 36f42451ae..b51ca463a5 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -554,9 +554,9 @@ ec_rebuild(EConfig *emp)
 
 			/* CONFIG_PAGEs depend on the config type.
 			   E_CONFIG_BOOK:
-			   	The page is a VBox, stored in the notebook.
+				The page is a VBox, stored in the notebook.
 			   E_CONFIG_DRUID
-			   	The page is a GnomeDruidPageStandard,
+				The page is a GnomeDruidPageStandard,
 				any sections automatically added are added to
 				the vbox inside it. */
 			sectionno = 0;
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index b209c84633..3558af4e42 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -15,7 +15,7 @@
  *
  * Authors:
  *		Michael Meeks 
- *   	Ettore Perazzoli 
+ *	Ettore Perazzoli 
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index 840dd67a0e..0353fecea0 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -34,7 +34,7 @@ struct _EPluginUIHookPrivate {
 	 * For example:
 	 *
 	 *     
- 	 *             ... UI definition ...
+	 *             ... UI definition ...
 	 *     
 	 *
 	 * Results in:
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index a708550a12..02f9bc2bfc 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -34,13 +34,13 @@
 
 G_DEFINE_TYPE (ESorterArray, e_sorter_array, E_SORTER_TYPE)
 
-static void    	esa_sort               (ESorterArray *esa);
-static void    	esa_backsort           (ESorterArray *esa);
+static void	esa_sort               (ESorterArray *esa);
+static void	esa_backsort           (ESorterArray *esa);
 
-static gint    	esa_model_to_sorted           (ESorter *sorter, gint row);
-static gint    	esa_sorted_to_model           (ESorter *sorter, gint row);
-static void    	esa_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count);
-static void    	esa_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count);
+static gint	esa_model_to_sorted           (ESorter *sorter, gint row);
+static gint	esa_sorted_to_model           (ESorter *sorter, gint row);
+static void	esa_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count);
+static void	esa_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count);
 static gboolean esa_needs_sorting             (ESorter *esa);
 
 #define ESA_NEEDS_SORTING(esa) (((ESorterArray *) (esa))->compare != NULL)
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index 99635e2341..efb8c7e665 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -38,8 +38,8 @@ extern "C" {
 #define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE			(e_text_event_processor_emacs_like_get_type ())
 #define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLike))
 #define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLikeClass))
-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj)		        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass)	        (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
+#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
+#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
 
 
 typedef struct _ETextEventProcessorEmacsLike       ETextEventProcessorEmacsLike;
diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c
index 1241e7092f..b78b46f28b 100644
--- a/e-util/e-util-labels.c
+++ b/e-util/e-util-labels.c
@@ -407,7 +407,7 @@ e_util_labels_remove (const gchar *tag)
 
 	free_label_struct (label);
 
-	return 	flush_labels_cache (labels, TRUE);
+	return	flush_labels_cache (labels, TRUE);
 }
 
 /**
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 9cea65a6eb..ecb389b8b3 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -75,8 +75,8 @@ gboolean	e_write_file_uri		(const gchar *filename,
 gchar *		e_format_number			(gint number);
 
 typedef gint	(*ESortCompareFunc)		(gconstpointer first,
-				  		 gconstpointer second,
-				  		 gpointer closure);
+						 gconstpointer second,
+						 gpointer closure);
 
 void		e_bsearch			(gconstpointer key,
 						 gconstpointer base,
@@ -127,7 +127,7 @@ gchar *		e_file_get_save_path		(void);
 
 gboolean	e_file_lock_create		(void);
 void		e_file_lock_destroy		(void);
-gboolean 	e_file_lock_exists		(void);
+gboolean	e_file_lock_exists		(void);
 
 gchar *		e_util_guess_mime_type		(const gchar *filename, gboolean localfile);
 gchar *		e_util_filename_to_uri		(const gchar *filename);
diff --git a/filter/filter-part.c b/filter/filter-part.c
index 2247810e6c..f8dc448f77 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -128,7 +128,7 @@ filter_part_validate (FilterPart *fp)
 	while (l && correct) {
 		FilterElement *fe = l->data;
 
-	        correct = filter_element_validate (fe);
+		correct = filter_element_validate (fe);
 
 		l = l->next;
 	}
diff --git a/filter/filter-rule.h b/filter/filter-rule.h
index ecada873d1..9009fd1db0 100644
--- a/filter/filter-rule.h
+++ b/filter/filter-rule.h
@@ -57,7 +57,7 @@ enum _filter_threading_t {
 
 #define FILTER_SOURCE_INCOMING "incoming" /* performed on incoming email */
 #define FILTER_SOURCE_DEMAND   "demand"   /* performed on the selected folder
-	 				   * when the user asks for it */
+					   * when the user asks for it */
 #define	FILTER_SOURCE_OUTGOING  "outgoing"/* performed on outgoing mail */
 #define	FILTER_SOURCE_JUNKTEST  "junktest"/* perform only junktest on incoming mail */
 
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index f5a86fe9b0..be431db9cc 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -363,7 +363,7 @@ account_cursor_change (GtkTreeSelection *selection, EMAccountPrefs *prefs)
 	EAccount *account = NULL;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
- 	const gchar *url = NULL;
+	const gchar *url = NULL;
 	gint state;
 	EAccount *default_account;
 	default_account = mail_config_get_default_account ();
@@ -561,7 +561,7 @@ em_account_prefs_construct (EMAccountPrefs *prefs)
 			  "changed", G_CALLBACK (account_cursor_change), prefs);
 	g_signal_connect (prefs->table, "row-activated", G_CALLBACK (account_double_click), prefs);
 
- 	account_cursor_change(gtk_tree_view_get_selection(prefs->table), prefs);
+	account_cursor_change(gtk_tree_view_get_selection(prefs->table), prefs);
 }
 
 GtkWidget *
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index 6c01dffa08..ab2bb2d8a4 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -945,7 +945,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs)
 
 	gtk_tree_view_insert_column_with_attributes (
 		view, -1, _("Language(s)"),
-     		gtk_cell_renderer_text_new (),
+		gtk_cell_renderer_text_new (),
 		"text", 1, NULL);
 	selection = gtk_tree_view_get_selection (view);
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_NONE);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index e8abdd30b3..19a20b2c1b 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -659,10 +659,10 @@ create_new_composer (const gchar *subject, const gchar *fromuri, gboolean use_de
 	EComposerHeaderTable *table;
 	EAccount *account = NULL;
 
- 	if (lite)
- 		composer = e_msg_composer_lite_new ();
- 	else
- 		composer = e_msg_composer_new ();
+	if (lite)
+		composer = e_msg_composer_lite_new ();
+	else
+		composer = e_msg_composer_new ();
 	table = e_msg_composer_get_header_table (composer);
 
 	if (fromuri != NULL) {
diff --git a/mail/em-event.h b/mail/em-event.h
index 81173fe690..0af32086cf 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -134,7 +134,7 @@ struct _EMEventTargetCustomIcon {
 	EEventTarget target;
 
 	GtkCellRenderer *renderer;
-	const gchar 	*folder_name;
+	const gchar	*folder_name;
 };
 
 typedef struct _EEventItem EMEventItem;
diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c
index 5a82c6ea9d..4817d896b5 100644
--- a/mail/em-filter-context.c
+++ b/mail/em-filter-context.c
@@ -291,7 +291,7 @@ filter_new_element(RuleContext *rc, const gchar *type)
 	} else if (!strcmp(type, "score")) {
 		return (FilterElement *) filter_int_new_type("score", -3, 3);
 	} else if (!strcmp(type, "source")) {
-    	        return (FilterElement *) em_filter_source_element_new();
+		return (FilterElement *) em_filter_source_element_new();
 	} else {
 		return parent_class->new_element(rc, type);
 	}
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 0fc37b46bd..b0481d46d5 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -298,7 +298,7 @@ generate_viewoption_menu (GtkWidget *emfv)
 
 			str = e_str_without_underscores (_(emfb_view_items[i].search.text));
 			menu_item = gtk_image_menu_item_new_with_label (str);
- 			if (emfb_view_items[i].image) {
+			if (emfb_view_items[i].image) {
 				GtkWidget *image;
 
 				image = gtk_image_new_from_icon_name (
@@ -524,7 +524,7 @@ emfb_init(GObject *o)
 		efb = (EFilterBar *)emfb->search;
 		efb->account_search_vf = NULL;
 		efb->all_account_search_vf = NULL;
- 		efb->account_search_cancel = NULL;
+		efb->account_search_cancel = NULL;
 		e_search_bar_set_menu ((ESearchBar *)emfb->search, emfb_search_items);
 		e_search_bar_set_scopeoption ((ESearchBar *)emfb->search, emfb_search_scope_items);
 		emfb->priv->scope_restricted = TRUE;
@@ -982,7 +982,7 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const gchar *folder_uri)
 		g_string_append (s, ")");
 
 		duplicate = FALSE;
-	        view_sexp = g_string_free (s, FALSE);
+		view_sexp = g_string_free (s, FALSE);
 		} break;
         case VIEW_LABEL:
 		tag = (gchar *)g_object_get_data (G_OBJECT (menu_item), "LabelTag");
@@ -1118,9 +1118,9 @@ vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList
 	m->sources_uri = sources_uri;
 	m->sources_folder = sources_folder;
 
- 	if (cancel) {
- 		m->cancel = cancel;
- 	}
+	if (cancel) {
+		m->cancel = cancel;
+	}
 
 	id = m->base.seq;
 	mail_msg_slow_ordered_push (m);
@@ -2196,8 +2196,8 @@ emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint act)
 
 		/* FIXME: finish */
 		/* (Pre)view pane size (do this first because it affects the
-	           preview settings - see folder_browser_set_message_preview()
-	           internals for details) */
+		   preview settings - see folder_browser_set_message_preview()
+		   internals for details) */
 		g_signal_handler_block(emfb->vpane, emfb->priv->vpane_resize_id);
 		gtk_paned_set_position((GtkPaned *)emfb->vpane, gconf_client_get_int (gconf, emfb->priv->show_wide ? "/apps/evolution/mail/display/hpaned_size": "/apps/evolution/mail/display/paned_size", NULL));
 		g_signal_handler_unblock(emfb->vpane, emfb->priv->vpane_resize_id);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 3d1a8564f2..b62702bbd7 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -615,7 +615,7 @@ emft_maybe_expand_row (EMFolderTreeModel *model, GtkTreePath *tree_path, GtkTree
 
 	si = g_hash_table_lookup (model->store_hash, store);
 	if ((account = mail_config_get_account_by_name (si->display_name))) {
-	        key = g_strdup_printf ("%s/%s", account->uid, full_name ? full_name : "");
+		key = g_strdup_printf ("%s/%s", account->uid, full_name ? full_name : "");
 	} else if (CAMEL_IS_VEE_STORE (store)) {
 		/* vfolder store */
 		key = g_strdup_printf ("vfolder/%s", full_name ? full_name : "");
@@ -1779,7 +1779,7 @@ emft_update_model_expanded_state (struct _EMFolderTreePrivate *priv, GtkTreeIter
 
 	si = g_hash_table_lookup (priv->model->store_hash, store);
 	if ((account = mail_config_get_account_by_name (si->display_name))) {
-	        key = g_strdup_printf ("%s/%s", account->uid, full_name ? full_name : "");
+		key = g_strdup_printf ("%s/%s", account->uid, full_name ? full_name : "");
 	} else if (CAMEL_IS_VEE_STORE (store)) {
 		/* vfolder store */
 		key = g_strdup_printf ("vfolder/%s", full_name ? full_name : "");
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 682ffc77c5..b9fda4f9b0 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -621,7 +621,7 @@ new_folder_created_cb (CamelFolderInfo *fi, gpointer user_data)
 	}
 	g_object_unref (emcftd->emfs);
 	g_free (emcftd->uri);
-   	g_free (emcftd);
+	g_free (emcftd);
 }
 
 static void
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 5de430e34b..4a23dceb03 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -3058,7 +3058,7 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold
 		EMFormat *emf = (EMFormat *)emfv->preview;
 
 		header_config_list = gconf_client_get_list(gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, NULL);
-      		em_format_clear_headers((EMFormat *)emfv->preview);
+		em_format_clear_headers((EMFormat *)emfv->preview);
 		p = header_config_list;
 		while (p) {
 			EMMailerPrefsHeader *h;
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 044ffe598a..28e67f0f18 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -1285,7 +1285,7 @@ efhd_change_cursor(GtkWidget *w, GdkEventCrossing *event, struct _attach_puri *i
 	if (info->shown && info->image) {
 		if (info->fit_width != 0) {
 			if (em_icon_stream_is_resized(info->puri.cid, info->fit_width, info->fit_height))
-			    	e_cursor_set(w->window, E_CURSOR_ZOOM_IN);
+				e_cursor_set(w->window, E_CURSOR_ZOOM_IN);
 
 		}
 	}
@@ -1732,7 +1732,7 @@ efhd_format_optional(EMFormat *emf, CamelStream *fstream, CamelMimePart *part, C
 	g_free(html);
 
 	camel_stream_write_string(stream,
-/* 				  "
\n" */ +/* "
\n" */ EM_FORMAT_HTML_VPAD); g_free(classid); diff --git a/mail/em-format-html.c b/mail/em-format-html.c index c7d35a3423..9a2c6a184b 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -805,7 +805,7 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo type = camel_mime_part_get_content_type(newpart); if (camel_content_type_is (type, "text", "*") && !camel_content_type_is(type, "text", "calendar")) { camel_stream_printf (stream, - "
\n", + "
\n", efh->frame_colour & 0xffffff, efh->content_colour & 0xffffff, efh->text_colour & 0xffffff); camel_stream_write_string(stream, "\n" EFH_MESSAGE_START); em_format_format_text((EMFormat *)efh, (CamelStream *)filtered_stream, (CamelDataWrapper *)newpart); diff --git a/mail/em-format.c b/mail/em-format.c index 85459682ad..ed7d48ea06 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -220,7 +220,7 @@ em_format_get_type(void) void 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)); + 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, (gpointer) info->mime_type, info); } @@ -1636,7 +1636,7 @@ emf_inlinepgp_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart, E camel_exception_free(ex); camel_object_unref(cipher); return; - } + } /* Setup output stream */ ostream = camel_stream_mem_new(); diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c index 42c15f754e..a0a2a205ce 100644 --- a/mail/em-junk-hook.c +++ b/mail/em-junk-hook.c @@ -55,7 +55,7 @@ static const EPluginHookTargetKey emjh_flag_map[] = { @@ -90,7 +90,7 @@ em_junk_get_name (CamelJunkPlugin *csp) if (item->hook && item->hook->hook.plugin->enabled) { return (item->hook->hook.plugin->name); } else - return _("None"); + return _("None"); } diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index a03bcd6cf3..ac6f3db5d9 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -434,7 +434,7 @@ init_junk_tree (GtkTreeView *jh_tree, EMMailerPrefs *prefs) store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); gtk_tree_view_set_model (GTK_TREE_VIEW (jh_tree), GTK_TREE_MODEL (store)); - g_object_unref (store); + g_object_unref (store); renderer = gtk_cell_renderer_text_new (); col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (jh_tree), -1, _("Header"), renderer, "text", JH_LIST_COLUMN_NAME, NULL); @@ -446,7 +446,7 @@ init_junk_tree (GtkTreeView *jh_tree, EMMailerPrefs *prefs) jh_tree_refill (prefs); - return TRUE; + return TRUE; } static gboolean @@ -461,7 +461,7 @@ init_label_tree (GtkWidget *label_tree, EMMailerPrefs *prefs, gboolean locked) store = gtk_list_store_new (3, GDK_TYPE_COLOR, G_TYPE_STRING, G_TYPE_STRING); gtk_tree_view_set_model (GTK_TREE_VIEW (label_tree), GTK_TREE_MODEL (store)); - g_object_unref (store); + g_object_unref (store); renderer = e_cell_renderer_color_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (label_tree), -1, _("Color"), renderer, "color", LABEL_LIST_COLUMN_COLOR, NULL); diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 1745171ac0..3d32783298 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -2342,7 +2342,7 @@ e_path_to_physical (const gchar *prefix, const gchar *vpath) /* Copy the mangled path. */ p = vpath; - while (1) { + while (1) { newp = strchr (p, '/'); if (newp == NULL) { strcpy (dp, p); diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index df58c808db..95714a948b 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -219,8 +219,8 @@ sub_folder_done (struct _zsubscribe_msg *m) msgListNode = (MailMsgListNode *) e_dlist_remhead(&m->sub->subscribe); if (msgListNode) { next = (struct _zsubscribe_msg *) msgListNode->msg; - /* Free the memory of the MailMsgListNode which won't be used anymore. */ - g_free(msgListNode); + /* Free the memory of the MailMsgListNode which won't be used anymore. */ + g_free(msgListNode); next->sub->subscribe_id = next->base.seq; mail_msg_unordered_push (next); } else { diff --git a/mail/em-utils.c b/mail/em-utils.c index 2f0fb39789..7204d761c3 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -2217,7 +2217,7 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local) } } - query = e_book_query_field_test(E_CONTACT_EMAIL, E_BOOK_QUERY_IS, addr); + query = e_book_query_field_test(E_CONTACT_EMAIL, E_BOOK_QUERY_IS, addr); for (g = e_source_list_peek_groups(emu_addr_list); g; g = g_slist_next(g)) { if (local && !is_local (g->data)) continue; @@ -2289,8 +2289,8 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local) /* Form a mime part out of the photo */ part = camel_mime_part_new(); camel_mime_part_set_content(part, - (const gchar *) photo->data.inlined.data, - photo->data.inlined.length, "image/jpeg"); + (const gchar *) photo->data.inlined.data, + photo->data.inlined.length, "image/jpeg"); e_contact_photo_free (photo); diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index bfaf7896aa..ab5cf18e9b 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -364,7 +364,7 @@ import_folders_rec(struct _import_folders_data *m, const gchar *filepath, const const gchar *folder; dir = g_dir_open(filepath, 0, NULL); - if (dir == NULL) + if (dir == NULL) return; utf8_filename = g_filename_to_utf8 (filepath, -1, NULL, NULL, NULL); diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index e460d66d2e..0c5b5fd92e 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -15,7 +15,7 @@ * * Authors: * Iain Holmes - * Michael Zucchi + * Michael Zucchi * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/mail/mail-component.c b/mail/mail-component.c index 339e2345e0..bda9e7ea18 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -586,7 +586,7 @@ view_changed(EMFolderView *emfv, EComponentView *component_view) || !strcmp (name, "Outbox") || !strcmp (name, "Sent") || !strcmp (name, "Templates"))) use_name = _(name); else if (!strcmp (name, "INBOX")) - use_name = _("Inbox"); + use_name = _("Inbox"); else use_name = name; @@ -1177,7 +1177,7 @@ status_check (GNOME_Evolution_ShellState shell_state) case GNOME_Evolution_USER_OFFLINE: status = OFFLINE; if (em_utils_prompt_user (NULL, "/apps/evolution/mail/prompts/quick_offline", "mail:ask-quick-offline", NULL)) - break; + break; case GNOME_Evolution_FORCED_OFFLINE: /*Network is down so change network state on the camel session*/ status = OFFLINE; diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 06ea94a594..a75d330e93 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -17,7 +17,7 @@ * * Authors: * Dan Winship - * Jeffrey Stedfast + * Jeffrey Stedfast * Peter Williams * Michael Zucchi * @@ -719,11 +719,11 @@ send_queue_exec (struct _send_queue_msg *m) if (m->cancel) camel_operation_register (m->cancel); - else - camel_operation_register (m->base.cancel); + else + camel_operation_register (m->base.cancel); - if (!m->cancel) - camel_operation_start (NULL, _("Sending message")); + if (!m->cancel) + camel_operation_start (NULL, _("Sending message")); camel_exception_init (&ex); @@ -734,8 +734,8 @@ send_queue_exec (struct _send_queue_msg *m) gint pc = (100 * i) / send_uids->len; report_status (m, CAMEL_FILTER_STATUS_START, pc, _("Sending message %d of %d"), i+1, send_uids->len); - if (!m->cancel) - camel_operation_progress (NULL, (i+1) * 100 / send_uids->len); + if (!m->cancel) + camel_operation_progress (NULL, (i+1) * 100 / send_uids->len); mail_send_message (m->queue, send_uids->pdata[i], m->destination, m->driver, &ex); if (camel_exception_is_set (&ex)) { @@ -784,13 +784,13 @@ send_queue_exec (struct _send_queue_msg *m) camel_exception_clear (&ex); } - if (!m->cancel) - camel_operation_end (NULL); + if (!m->cancel) + camel_operation_end (NULL); if (m->cancel) camel_operation_unregister (m->cancel); - else - camel_operation_unregister (m->base.cancel); + else + camel_operation_unregister (m->base.cancel); } @@ -2459,7 +2459,7 @@ prepare_offline_exec (struct _set_offline_msg *m) { if (CAMEL_IS_DISCO_STORE (m->store)) { camel_disco_store_prepare_for_offline (CAMEL_DISCO_STORE (m->store), - &m->base.ex); + &m->base.ex); } else if (CAMEL_IS_OFFLINE_STORE (m->store)) { camel_offline_store_prepare_for_offline (CAMEL_OFFLINE_STORE (m->store), &m->base.ex); diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index c6f7df9c2d..b26203c6da 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -305,7 +305,7 @@ static gchar * format_url(const gchar *internal_url, const gchar *account_name) { CamelURL *url; - gchar *pretty_url; + gchar *pretty_url; url = camel_url_new(internal_url, NULL); if (account_name) { @@ -487,7 +487,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const gchar *destinat recv_icon = gtk_image_new_from_icon_name ( "mail-inbox", GTK_ICON_SIZE_LARGE_TOOLBAR); - pretty_url = format_url (source->url, account->name); + pretty_url = format_url (source->url, account->name); label = gtk_label_new (NULL); gtk_label_set_ellipsize ( GTK_LABEL (label), PANGO_ELLIPSIZE_END); @@ -508,7 +508,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const gchar *destinat gtk_misc_set_alignment (GTK_MISC (label), 0, .5); gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5); - gtk_table_attach ( + gtk_table_attach ( GTK_TABLE (table), recv_icon, 0, 1, row, row+2, 0, 0, 0, 0); gtk_table_attach ( diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 5014594a00..de79eaa694 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -442,7 +442,7 @@ mail_vfolder_add_uri(CamelStore *store, const gchar *curi, gint remove) LOCK(); -/* d(printf("%s uri to check: %s\n", remove?"Removing":"Adding", uri)); */ +/* d(printf("%s uri to check: %s\n", remove?"Removing":"Adding", uri)); */ /* maintain the source folders lists for changed rules later on */ if (CAMEL_IS_VEE_STORE(store)) { @@ -473,7 +473,7 @@ mail_vfolder_add_uri(CamelStore *store, const gchar *curi, gint remove) if (context == NULL) goto done; - rule = NULL; + rule = NULL; while ((rule = rule_context_next_rule((RuleContext *)context, rule, NULL))) { gint found = FALSE; @@ -546,7 +546,7 @@ mail_vfolder_delete_uri(CamelStore *store, const gchar *curi) goto done; /* see if any rules directly reference this removed uri */ - rule = NULL; + rule = NULL; while ((rule = rule_context_next_rule ((RuleContext *) context, rule, NULL))) { if (!rule->name) { @@ -631,7 +631,7 @@ mail_vfolder_rename_uri(CamelStore *store, const gchar *cfrom, const gchar *cto) LOCK(); /* see if any rules directly reference this removed uri */ - rule = NULL; + rule = NULL; while ( (rule = rule_context_next_rule((RuleContext *)context, rule, NULL)) ) { source = NULL; while ( (source = em_vfolder_rule_next_source((EMVFolderRule *)rule, source)) ) { diff --git a/mail/message-list.c b/mail/message-list.c index a5a344f4e5..bfa51250df 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -1501,32 +1501,32 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, gint col, gpointer model_data folder = message_list->folder; } - url = mail_tools_folder_to_url (folder); - euri = em_uri_from_camel(url); - - account = mail_config_get_account_by_source_url (url); - - if (account) { - curl = camel_url_new (url, &ex); - location = g_strconcat (account->name, ":", curl->path, NULL); - } else { - /* Local account */ - euri = em_uri_from_camel(url); - curl = camel_url_new (euri, &ex); - if (curl->host && !strcmp(curl->host, "local") && curl->user && !strcmp(curl->user, "local")) - location = g_strconcat (_("On This Computer"), ":",curl->path, NULL); - } - - camel_exception_clear (&ex); + url = mail_tools_folder_to_url (folder); + euri = em_uri_from_camel(url); + + account = mail_config_get_account_by_source_url (url); + + if (account) { + curl = camel_url_new (url, &ex); + location = g_strconcat (account->name, ":", curl->path, NULL); + } else { + /* Local account */ + euri = em_uri_from_camel(url); + curl = camel_url_new (euri, &ex); + if (curl->host && !strcmp(curl->host, "local") && curl->user && !strcmp(curl->user, "local")) + location = g_strconcat (_("On This Computer"), ":",curl->path, NULL); + } + + camel_exception_clear (&ex); camel_url_free (curl); - g_free (url); - g_free (euri); + g_free (url); + g_free (euri); - return location; + return location; } case COL_MIXED_RECIPIENTS: case COL_RECIPIENTS:{ - str = camel_message_info_to (msg_info); + str = camel_message_info_to (msg_info); return sanitize_recipients(str); } @@ -1561,7 +1561,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, gint col, gpointer model_data } else return (gpointer) (""); } - default: + default: g_warning ("This shouldn't be reached\n"); return NULL; } @@ -1748,7 +1748,7 @@ static ECell * create_composite_cell (gint col) cell_sub = e_cell_text_new(fixed_name? fixed_name:NULL, GTK_JUSTIFY_LEFT); g_object_set (G_OBJECT (cell_sub), -/* "bold_column", COL_UNREAD, */ +/* "bold_column", COL_UNREAD, */ "color_column", COL_COLOUR, NULL); cell_tree = e_cell_tree_new (NULL, NULL, TRUE, cell_sub); @@ -2495,7 +2495,7 @@ message_list_construct (MessageList *message_list) e_tree_memory_set_expanded_default(E_TREE_MEMORY(message_list->model), read_boolean_with_default (gconf, - "/apps/evolution/mail/display/thread_expand", + "/apps/evolution/mail/display/thread_expand", TRUE)); message_list->priv->thread_latest = read_boolean_with_default (gconf, "/apps/evolution/mail/display/thread_latest", TRUE); @@ -3862,7 +3862,7 @@ message_list_hide_clear (MessageList *ml) /* version 1 file is: uintf 1 uintf hide_before - uintf hide_after + uintf hide_after string* uids */ diff --git a/mail/message-list.h b/mail/message-list.h index eb908a7c9b..02bd486920 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -53,7 +53,7 @@ enum { COL_FOLLOWUP_FLAG_STATUS, COL_FOLLOWUP_FLAG, COL_FOLLOWUP_DUE_BY, - COL_LOCATION, /* vfolder location? */ + COL_LOCATION, /* vfolder location? */ COL_SENDER, COL_RECIPIENTS, COL_MIXED_SENDER, diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h index 30d3ec1e9b..5193ac2103 100644 --- a/mail/message-tag-editor.h +++ b/mail/message-tag-editor.h @@ -34,7 +34,7 @@ extern "C" { #endif /* __cplusplus */ #define MESSAGE_TAG_EDITOR_TYPE (message_tag_editor_get_type ()) -#define MESSAGE_TAG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, MESSAGE_TAG_EDITOR_TYPE, MessageTagEditor)) +#define MESSAGE_TAG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, MESSAGE_TAG_EDITOR_TYPE, MessageTagEditor)) #define MESSAGE_TAG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, MESSAGE_TAG_EDITOR_TYPE, MessageTagEditorClass)) #define IS_MESSAGE_TAG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, MESSAGE_TAG_EDITOR_TYPE)) #define IS_MESSAGE_TAG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MESSAGE_TAG_EDITOR_TYPE)) diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 41744fc641..c6a7b94db1 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -135,7 +135,7 @@ org_gnome_audio_inline_set_audiosink (GstElement *playbin) } if (audiosink) { - g_object_set (playbin, "audio-sink", audiosink, NULL); + g_object_set (playbin, "audio-sink", audiosink, NULL); } } @@ -174,7 +174,7 @@ org_gnome_audio_inline_gst_callback (GstBus * bus, GstMessage * message, gpointe if (po->pause_button) gtk_widget_set_sensitive (po->pause_button, new_state > GST_STATE_PAUSED); if (po->stop_button) - gtk_widget_set_sensitive (po->stop_button, new_state >= GST_STATE_PAUSED); + gtk_widget_set_sensitive (po->stop_button, new_state >= GST_STATE_PAUSED); } break; diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index 92d36e71d8..e550851762 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -138,10 +138,10 @@ org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target) dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution backup file"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE); -/* dlg = gtk_file_chooser_dialog_new (_("Select name of the Evolution backup file"), GTK_WINDOW (target->target.widget), */ -/* GTK_FILE_CHOOSER_ACTION_SAVE, */ -/* GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, */ -/* GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); */ +/* dlg = gtk_file_chooser_dialog_new (_("Select name of the Evolution backup file"), GTK_WINDOW (target->target.widget), */ +/* GTK_FILE_CHOOSER_ACTION_SAVE, */ +/* GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, */ +/* GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); */ gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dlg), "evolution-backup.tar.gz"); @@ -190,10 +190,10 @@ org_gnome_backup_restore_restore (EPlugin *ep, ESMenuTargetShell *target) dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution backup file to restore"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN); -/* dlg = gtk_file_chooser_dialog_new (_("Select Evolution backup file to restore"), GTK_WINDOW (target->target.widget), */ -/* GTK_FILE_CHOOSER_ACTION_OPEN, */ -/* GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, */ -/* GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); */ +/* dlg = gtk_file_chooser_dialog_new (_("Select Evolution backup file to restore"), GTK_WINDOW (target->target.widget), */ +/* GTK_FILE_CHOOSER_ACTION_OPEN, */ +/* GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, */ +/* GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); */ vbox = gtk_vbox_new (FALSE, 6); gtk_widget_show (vbox); diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 67dea3e6a3..92adb2d7a4 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -408,12 +408,12 @@ main (gint argc, gchar **argv) gtk_window_set_default_icon_name ("evolution"); /* Backup / Restore only can have GUI. We should restrict the rest */ - progress_dialog = gtk_dialog_new_with_buttons (backup_op ? _("Evolution Backup"): _("Evolution Restore"), - NULL, - GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - NULL); + progress_dialog = gtk_dialog_new_with_buttons (backup_op ? _("Evolution Backup"): _("Evolution Restore"), + NULL, + GTK_DIALOG_MODAL, + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + NULL); gtk_dialog_set_has_separator (GTK_DIALOG (progress_dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (progress_dialog), 12); diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 8cd8535a73..bb11ab9c6d 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -108,7 +108,7 @@ find_esource_by_uri (ESourceList *source_list, const gchar *target_uri) gint e_plugin_lib_enable (EPluginLib *ep, gint enable) { - /* Start up the plugin. */ + /* Start up the plugin. */ if (enable) { d(fprintf (stderr, "BBDB spinning up...\n")); @@ -236,7 +236,7 @@ walk_destinations_and_free (EDestination **dests) return; for (i = 0; dests[i] != NULL; i++) { - const char *name, *addr; + const gchar *name, *addr; name = e_destination_get_name (dests[i]); addr = e_destination_get_email (dests[i]); @@ -465,7 +465,7 @@ enable_toggled_cb (GtkWidget *widget, gpointer data) /* Save the new setting to gconf */ gconf_client_set_bool (stuff->target->gconf, GCONF_KEY_ENABLE, active, NULL); - gtk_widget_set_sensitive (stuff->option_menu, active); + gtk_widget_set_sensitive (stuff->option_menu, active); addressbook = gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL); diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index f50498fc48..98eb3d05e4 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -142,7 +142,7 @@ bbdb_sync_buddy_list (void) name, just give up; we're not smart enough for this. */ if (contacts->next != NULL) - continue; + continue; c = E_CONTACT (contacts->data); diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 105d97e245..7da5584db4 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -142,21 +142,21 @@ retry: } if (!g_spawn_async_with_pipes (NULL, - (gchar **) argv, - NULL, - G_SPAWN_DO_NOT_REAP_CHILD | - G_SPAWN_STDOUT_TO_DEV_NULL, - NULL, - NULL, - &child_pid, - &bf_in, - NULL, - NULL, - &err)) + (gchar **) argv, + NULL, + G_SPAWN_DO_NOT_REAP_CHILD | + G_SPAWN_STDOUT_TO_DEV_NULL, + NULL, + NULL, + &child_pid, + &bf_in, + NULL, + NULL, + &err)) { g_warning ("error occurred while spawning %s: %s", - argv[0], - err->message); + argv[0], + err->message); /* For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself. */ g_set_error (error, EM_JUNK_ERROR, err->code, _("Error occurred while spawning %s: %s."), argv[0], err->message); @@ -333,12 +333,12 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable) gconf = gconf_client_get_default(); gconf_client_add_dir (gconf, - em_junk_bf_gconf_dir, - GCONF_CLIENT_PRELOAD_ONELEVEL, - NULL); + em_junk_bf_gconf_dir, + GCONF_CLIENT_PRELOAD_ONELEVEL, + NULL); gconf_client_notify_add (gconf, - em_junk_bf_gconf_dir, + em_junk_bf_gconf_dir, em_junk_bf_setting_notify, NULL, NULL, NULL); @@ -357,7 +357,7 @@ convert_unicode_cb (GtkWidget *widget, gpointer data) gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); GConfClient *gconf = gconf_client_get_default(); - gconf_client_set_bool (gconf, data, active, NULL); + gconf_client_set_bool (gconf, data, active, NULL); g_object_unref (gconf); } @@ -365,7 +365,7 @@ convert_unicode_cb (GtkWidget *widget, gpointer data) GtkWidget * org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) { - GtkWidget *check; + GtkWidget *check; guint i = ((GtkTable *)data->parent)->nrows; if (data->old) diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c index e6d4aee6a2..86f96404e2 100644 --- a/plugins/calendar-http/calendar-http.c +++ b/plugins/calendar-http/calendar-http.c @@ -80,7 +80,7 @@ url_changed (GtkEntry *entry, ESource *source) gpointer secure_checkbox; secure_checkbox = g_object_get_data (G_OBJECT (gtk_widget_get_parent (GTK_WIDGET (entry))), - "secure_checkbox"); + "secure_checkbox"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (secure_checkbox), TRUE); } diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c index 694effccaa..cacc7e00fa 100644 --- a/plugins/calendar-weather/calendar-weather.c +++ b/plugins/calendar-weather/calendar-weather.c @@ -58,14 +58,14 @@ e_plugin_lib_enable (EPluginLib *epl, gint enable) const gchar *description; const gchar *icon_name; } categories[] = { - { N_("Weather: Fog"), "weather-fog" }, - { N_("Weather: Cloudy"), "weather-few-clouds" }, + { N_("Weather: Fog"), "weather-fog" }, + { N_("Weather: Cloudy"), "weather-few-clouds" }, { N_("Weather: Cloudy Night"), "weather-few-clouds-night" }, { N_("Weather: Overcast"), "weather-overcast" }, - { N_("Weather: Showers"), "weather-showers" }, - { N_("Weather: Snow"), "weather-snow" }, - { N_("Weather: Sunny"), "weather-clear" }, - { N_("Weather: Clear Night"), "weather-clear-night" }, + { N_("Weather: Showers"), "weather-showers" }, + { N_("Weather: Snow"), "weather-snow" }, + { N_("Weather: Sunny"), "weather-clear" }, + { N_("Weather: Clear Night"), "weather-clear-night" }, { N_("Weather: Thunderstorms"), "weather-storm" }, { NULL, NULL } }; diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 10d812368d..026a4dc5e1 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -153,7 +153,7 @@ epech_fill_widgets_with_data (CustomHeaderOptionsDialog *mch) gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,0); } else { gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box, - g_array_index(priv->header_index_type, gint, set_index_column)); + g_array_index(priv->header_index_type, gint, set_index_column)); } } } @@ -355,7 +355,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) temp_header_ptr = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,header_section_id); str = (temp_header_ptr->header_type_value)->str; if (strcmp (str, security_field) == 0) { - str = _(security_field); + str = _(security_field); } gtk_label_set_markup (GTK_LABEL (priv->header_type_name_label), str); @@ -384,8 +384,8 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) str = (temp_header_value_ptr->sub_header_string_value)->str; for (i = 0; security_values[i].value != NULL; i++) { if (strcmp (str, security_values[i].value) == 0) { - str = _(security_values[i].str); - break; + str = _(security_values[i].str); + break; } } gtk_combo_box_append_text (GTK_COMBO_BOX (sub_combo_box_ptr->header_value_combo_box), diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 53af222142..46f4101bb9 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -120,7 +120,7 @@ btn_chpass_clicked (GtkButton *button, gpointer data) { ExchangeAccount *account; gchar *old_password, *new_password; - ExchangeAccountResult result; + ExchangeAccountResult result; account = exchange_operations_get_exchange_account (); if (!account) @@ -137,7 +137,7 @@ btn_chpass_clicked (GtkButton *button, gpointer data) return; } /* g_print ("Current password is \"%s\"\n", old_password); */ - result = exchange_account_set_password (account, old_password, new_password); + result = exchange_account_set_password (account, old_password, new_password); if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS) exchange_operations_report_error (account, result); @@ -738,8 +738,8 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data) /* url has hostname but not owa_url. * Account has been created using x-c-s or evo is upgraded to 2.2 - * When invoked from druid, hostname will get set after validation, - * so this condition will never be true during account creation. + * When invoked from druid, hostname will get set after validation, + * so this condition will never be true during account creation. */ owa_url = construct_owa_url (url); camel_url_set_param (url, "owa_url", owa_url); diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index 35d06d527d..c898f1b4c5 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -237,12 +237,12 @@ add_defaults_for_account (ExchangeConfigListener *config_listener, eaccount = config_listener->priv->configured_account; if (!e_account_get_string (eaccount, E_ACCOUNT_DRAFTS_FOLDER_URI)) { set_special_mail_folder (account, "drafts", - &eaccount->drafts_folder_uri); + &eaccount->drafts_folder_uri); save = TRUE; } if (!e_account_get_string (eaccount, E_ACCOUNT_SENT_FOLDER_URI)) { set_special_mail_folder (account, "sentitems", - &eaccount->sent_folder_uri); + &eaccount->sent_folder_uri); save = TRUE; } if (save) { @@ -302,9 +302,9 @@ add_account_esources (ExchangeAccount *account, cal_source_group = e_source_group_new (account->account_name, EXCHANGE_URI_PREFIX); tasks_source_group = e_source_group_new (account->account_name, - EXCHANGE_URI_PREFIX); + EXCHANGE_URI_PREFIX); contacts_source_group = e_source_group_new (account->account_name, - EXCHANGE_URI_PREFIX); + EXCHANGE_URI_PREFIX); if (!e_source_list_add_group (contacts_source_list, contacts_source_group, -1) || !e_source_list_add_group (cal_source_list, cal_source_group, -1) || @@ -481,15 +481,15 @@ add_sources (ExchangeAccount *account) folders = g_slist_append (folders, folder_info); } else if (!(strcmp (folder_type, "tasks")) || - !(strcmp (folder_type, "tasks/public"))) { + !(strcmp (folder_type, "tasks/public"))) { folder_info->name = e_folder_get_name (folder); folder_info->uri = e_folder_get_physical_uri (folder); folder_info->type = EXCHANGE_TASKS_FOLDER; folders = g_slist_append (folders, folder_info); } else if (!(strcmp (folder_type, "contacts")) || - !(strcmp (folder_type, "contacts/public")) || - !(strcmp (folder_type, "contacts/ldap"))) { + !(strcmp (folder_type, "contacts/public")) || + !(strcmp (folder_type, "contacts/ldap"))) { folder_info->name = e_folder_get_name (folder); folder_info->uri = e_folder_get_physical_uri (folder); folder_info->type = EXCHANGE_CONTACTS_FOLDER; @@ -508,7 +508,7 @@ add_sources (ExchangeAccount *account) static void remove_account_esource (ExchangeAccount *account, - FolderType folder_type) + FolderType folder_type) { ESourceGroup *group; ESource *source = NULL; @@ -732,7 +732,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, exchange_account_set_save_password (account, FALSE); } - exchange_account_connect (account, password, &result); + exchange_account_connect (account, password, &result); g_free (password); g_free (key); @@ -743,7 +743,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, new_password = get_new_exchange_password (account); if (new_password) { /* try connecting with new password */ - exchange_account_connect (account, new_password, &result); + exchange_account_connect (account, new_password, &result); g_free (new_password); } #endif @@ -872,7 +872,7 @@ account_added (EAccountList *account_list, EAccount *account) g_signal_emit (config_listener, signals[EXCHANGE_ACCOUNT_CREATED], 0, exchange_account); -/* add_sources (exchange_account); */ +/* add_sources (exchange_account); */ exchange_config_listener_get_offline_status (config_listener, &is_offline); @@ -925,7 +925,7 @@ requires_relogin (gchar *current_url, gchar *new_url) if (current_uri->authmech || new_uri->authmech) { if (current_uri->authmech && new_uri->authmech) { - if (strcmp (current_uri->authmech, new_uri->authmech)) { + if (strcmp (current_uri->authmech, new_uri->authmech)) { /* Auth mechanism has changed */ relogin = TRUE; goto end; @@ -1031,7 +1031,7 @@ account_changed (EAccountList *account_list, EAccount *account) remove_account_esources (priv->exchange_account); exchange_account_forget_password (priv->exchange_account); } else if (strcmp (config_listener->priv->configured_name, account->name)) { -/* remove_account_esources (priv->exchange_account); */ +/* remove_account_esources (priv->exchange_account); */ exchange_config_listener_modify_esource_group_name (config_listener, config_listener->priv->configured_name, account->name); diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h index 3ec2d5c62f..c079b7eac7 100644 --- a/plugins/exchange-operations/exchange-config-listener.h +++ b/plugins/exchange-operations/exchange-config-listener.h @@ -71,8 +71,8 @@ ExchangeConfigListener *exchange_config_listener_new (void); GSList *exchange_config_listener_get_accounts (ExchangeConfigListener *config_listener); -void add_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *folder_name, const gchar *physical_uri); -void remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *physical_uri); +void add_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *folder_name, const gchar *physical_uri); +void remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *physical_uri); ExchangeConfigListenerStatus exchange_config_listener_get_offline_status (ExchangeConfigListener *excl, gint *mode); void exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl, diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index 437aeec51f..085bce398b 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -328,7 +328,7 @@ exchange_delegates_user_edit (ExchangeAccount *account, summarizing the permissions assigned to him. */ msg_part1 = _("This message was sent automatically by Evolution to inform you that you have been " - "designated as a delegate. You can now send messages on my behalf."); + "designated as a delegate. You can now send messages on my behalf."); /* To translators: Another chunk of the same message. */ @@ -488,7 +488,7 @@ exchange_delegates_user_new (const gchar *display_name) ExchangeDelegatesUser * exchange_delegates_user_new_from_gc (E2kGlobalCatalog *gc, const gchar *email, - GByteArray *creator_entryid) + GByteArray *creator_entryid) { E2kGlobalCatalogStatus status; E2kGlobalCatalogEntry *entry; diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c index f5e8891b77..b4ef8c43ad 100644 --- a/plugins/exchange-operations/exchange-delegates.c +++ b/plugins/exchange-operations/exchange-delegates.c @@ -949,7 +949,7 @@ exchange_delegates (ExchangeAccount *account, GtkWidget *parent) /* Set up the table */ delegates->model = gtk_list_store_new (1, G_TYPE_STRING); - delegates->table = glade_xml_get_widget (delegates->xml, "delegates_table"); + delegates->table = glade_xml_get_widget (delegates->xml, "delegates_table"); column = gtk_tree_view_column_new_with_attributes ( _("Name"), gtk_cell_renderer_text_new (), "text", 0, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (delegates->table), diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c index 6b5d2375bc..f8772373cb 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.c +++ b/plugins/exchange-operations/exchange-folder-subscription.c @@ -219,8 +219,8 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data) } /* It would be nice to insensitivize the OK button appropriately - instead of doing this, but unfortunately we can't do this for the - Bonobo control. */ + instead of doing this, but unfortunately we can't do this for the + Bonobo control. */ e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":select-user", NULL); } diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c index 39929eaa5b..9537f592a3 100644 --- a/plugins/exchange-operations/exchange-mail-send-options.c +++ b/plugins/exchange-operations/exchange-mail-send-options.c @@ -91,7 +91,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) addr = camel_header_address_decode (dialog->options->delegate_address, NULL); sender_addr = camel_header_address_decode (sender_id, NULL); - if(dialog->options->send_as_del_enabled && + if(dialog->options->send_as_del_enabled && dialog->options->delegate_address && g_ascii_strcasecmp(addr->v.addr, sender_addr->v.addr)) { @@ -109,7 +109,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) } else - e_msg_composer_add_header (composer, "From", + e_msg_composer_add_header (composer, "From", dialog->options->delegate_address); } @@ -183,7 +183,7 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target) return; } e_msg_composer_set_send_options (composer, TRUE); - /*disply the send options dialog*/ + /*disply the send options dialog*/ if (!dialog) { g_print ("New dialog\n\n") ; dialog = exchange_sendoptions_dialog_new () ; diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c index e9b8d3fd5d..d79948ccc4 100644 --- a/plugins/exchange-operations/exchange-operations.c +++ b/plugins/exchange-operations/exchange-operations.c @@ -102,7 +102,7 @@ exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *pare exchange_operations_tokenize_string (&luri, nodename, '/', sizeof(nodename)); - if (!nodename[0]) { + if (!nodename[0]) { return TRUE; } @@ -157,7 +157,7 @@ exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter return; exchange_operations_tokenize_string (&luri, nodename, '/', sizeof(nodename)); - if (!nodename[0]) { + if (!nodename[0]) { return; } @@ -278,7 +278,7 @@ void exchange_operations_update_child_esources (ESource *source, const gchar *ol /* This ESource points to one of the child folders */ gchar **tmpv, *truri; /* A nasty search and replace */ - tmpv = g_strsplit (ruri, old_path, -1); + tmpv = g_strsplit (ruri, old_path, -1); truri = g_strjoinv (new_path, tmpv); e_source_set_relative_uri (tsource->data, truri); g_strfreev (tmpv); diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c index 783887cb24..e44056abb8 100644 --- a/plugins/exchange-operations/exchange-send-options.c +++ b/plugins/exchange-operations/exchange-send-options.c @@ -108,7 +108,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod) if(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled))) { name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, "Add User"); - destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (name_selector_entry)); + destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY (name_selector_entry)); destinations = e_destination_store_list_destinations (destination_store); tmp = destinations; @@ -268,7 +268,7 @@ GType exchange_sendoptions_dialog_get_type (void) sizeof (ExchangeSendOptionsDialog), 0, /* n_preallocs */ (GInstanceInitFunc) exchange_sendoptions_dialog_init, - NULL /* instance_init */ + NULL /* instance_init */ }; type = g_type_register_static (G_TYPE_OBJECT, "ExchangeSendOptionsDialogType", @@ -279,8 +279,8 @@ GType exchange_sendoptions_dialog_get_type (void) static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data) { - ExchangeSendOptionsDialogPrivate *priv; - ExchangeSendOptionsDialog *sod; + ExchangeSendOptionsDialogPrivate *priv; + ExchangeSendOptionsDialog *sod; sod = func_data; priv = sod->priv; @@ -290,15 +290,15 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu if(exchange_send_options_get_widgets_data (sod) < 0) return; case GTK_RESPONSE_CANCEL: - gtk_widget_hide (priv->main); - gtk_widget_destroy (priv->main); - g_object_unref (priv->xml); - break; + gtk_widget_hide (priv->main); + gtk_widget_destroy (priv->main); + g_object_unref (priv->xml); + break; case GTK_RESPONSE_HELP: e_display_help ( GTK_WINDOW (priv->main), priv->help_section); - break; + break; } g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index cc18b0a3af..93b4ee9876 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -641,7 +641,7 @@ plugin_google (EPlugin *epl, gtk_widget_show (hbox); spin = gtk_spin_button_new_with_range (1, 100, 1); - gtk_label_set_mnemonic_widget (GTK_LABEL(label), spin); + gtk_label_set_mnemonic_widget (GTK_LABEL(label), spin); gtk_widget_show (spin); gtk_box_pack_start (GTK_BOX(hbox), spin, FALSE, TRUE, 0); diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index 46beaac0b8..99679ebd18 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -36,7 +36,7 @@ /*stores some info about all currently existing groupwise accounts list of GwAccountInfo structures */ -static GList *groupwise_accounts = NULL; +static GList *groupwise_accounts = NULL; struct _CamelGwListenerPrivate { GConfClient *gconf_client; @@ -192,7 +192,7 @@ add_esource (const gchar *conf_key, GwAccountInfo *info, const gchar *source_na soap_port = camel_url_get_param (url, "soap_port"); - if (!soap_port || strlen (soap_port) == 0) + if (!soap_port || strlen (soap_port) == 0) soap_port = "7191"; use_ssl = camel_url_get_param (url, "use_ssl"); @@ -345,7 +345,7 @@ modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccoun gchar *old_relative_uri; CamelURL *url; gboolean found_group; - GConfClient* client; + GConfClient* client; const gchar *poa_address; const gchar *new_poa_address; const gchar * new_group_name = a->name; @@ -464,7 +464,7 @@ remove_calendar_tasks_sources (GwAccountInfo *info) static GList* get_addressbook_names_from_server (gchar *source_url) { - gchar *key; + gchar *key; EGwConnection *cnc; gchar *password; GList *book_list = NULL; @@ -580,7 +580,7 @@ add_addressbook_sources (EAccount *account) ESourceList *list; ESourceGroup *group; ESource *source; - gchar *base_uri; + gchar *base_uri; const gchar *soap_port; GList *books_list, *temp_list; GConfClient* client; @@ -671,7 +671,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_ ESourceList *list; ESourceGroup *group; GSList *groups; - gboolean found_group; + gboolean found_group; gboolean delete_group; gchar *old_base_uri; gchar *new_base_uri; @@ -756,7 +756,7 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info) ESourceList *list; ESourceGroup *group; GSList *groups; - gboolean found_group; + gboolean found_group; CamelURL *url; gchar *base_uri; const gchar *soap_port; @@ -839,7 +839,7 @@ account_added (EAccountList *account_listener, EAccount *account) static void account_removed (EAccountList *account_listener, EAccount *account) { - GwAccountInfo *info; + GwAccountInfo *info; if (!is_groupwise_account (account)) return; @@ -919,7 +919,7 @@ account_changed (EAccountList *account_listener, EAccount *account) if ((old_poa_address && strcmp (old_poa_address, new_poa_address)) || (old_soap_port && strcmp (old_soap_port, new_soap_port)) || strcmp (old_url->user, new_url->user) - || (!old_use_ssl) + || (!old_use_ssl) || strcmp (old_use_ssl, new_use_ssl)) { account_removed (account_listener, account); @@ -998,7 +998,7 @@ camel_gw_listener_construct (CamelGwListener *config_listener) prune_proxies (); - config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client); + config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client); for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) { @@ -1006,7 +1006,7 @@ camel_gw_listener_construct (CamelGwListener *config_listener) if ( is_groupwise_account (account) && account->enabled) { - info = g_new0 (GwAccountInfo, 1); + info = g_new0 (GwAccountInfo, 1); info->uid = g_strdup (account->uid); info->name = g_strdup (account->name); info->source_url = g_strdup (account->source->url); diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c index 71bb1ee31e..549c75da61 100644 --- a/plugins/groupwise-account-setup/groupwise-account-setup.c +++ b/plugins/groupwise-account-setup/groupwise-account-setup.c @@ -118,7 +118,7 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable) { if (!config_listener) { config_listener = camel_gw_listener_new (); - g_atexit ( free_groupwise_listener ); + g_atexit ( free_groupwise_listener ); } return 0; diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index c9d4ad54e4..67b1b5bdee 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -174,7 +174,7 @@ accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg) camel_object_ref(msg); accept_data->model = model; g_object_set_data_full((GObject *)dialog, "accept-data", accept_data, accept_free); - g_signal_connect (dialog, "response", G_CALLBACK (install_folder_response), accept_data); + g_signal_connect (dialog, "response", G_CALLBACK (install_folder_response), accept_data); g_object_set_data_full((GObject *)dialog, "druid", druid, (GDestroyNotify)gtk_widget_destroy); gtk_window_set_title (GTK_WINDOW (dialog), "Install Shared Folder"); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index aa8c96368d..dc13fad256 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -48,7 +48,7 @@ org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t); static void abort_changes (JunkSettings *js) { - g_object_run_dispose ((GObject *)js); + g_object_run_dispose ((GObject *)js); } static void diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h index 43322de018..13e8a25c9b 100644 --- a/plugins/groupwise-features/junk-settings.h +++ b/plugins/groupwise-features/junk-settings.h @@ -33,7 +33,7 @@ extern "C" { #include #include -#define _JUNK_SETTINGS_TYPE (junk_settings_get_type ()) +#define _JUNK_SETTINGS_TYPE (junk_settings_get_type ()) #define JUNK_SETTINGS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), JUNK_SETTINGS, JunkSettings)) #define JUNK_SETTINGS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), JUNK_SETTINGS_TYPE, JunkSettings)) #define IS_JUNK_SETTINGS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), JUNK_SETTINGS_TYPE)) diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 29c6545f01..8c8013f6fe 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -154,7 +154,7 @@ proxy_login_get_type (void) sizeof (proxyLogin), 0, /* n_preallocs */ (GInstanceInitFunc) proxy_login_init, - NULL /* instance_init */ + NULL /* instance_init */ }; type = g_type_register_static (G_TYPE_OBJECT, "proxyLoginType", @@ -291,7 +291,7 @@ proxy_login_cb (GtkDialog *dialog, gint state) g_object_unref (pld); break; case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (priv->main); + gtk_widget_destroy (priv->main); g_object_unref (pld); break; case GTK_RESPONSE_HELP: @@ -435,7 +435,7 @@ proxy_login_setup_tree_view (void) static void proxy_login_update_tree (void) { - GtkTreeIter iter; + GtkTreeIter iter; gint i,n; GdkPixbuf *broken_image = NULL; GList *proxy_list = NULL; diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 6a18348002..44c82610d6 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -15,7 +15,7 @@ * * Authors: * Shreyas Srinivasan - * Sankar P + * Sankar P * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * @@ -230,7 +230,7 @@ proxy_dialog_get_type (void) sizeof (proxyDialog), 0, /* n_preallocs */ (GInstanceInitFunc) proxy_dialog_init, - NULL /* instance_init */ + NULL /* instance_init */ }; type = g_type_register_static (G_TYPE_OBJECT, @@ -551,7 +551,7 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data) /* Handle case where the structure is new and deleted*/ if ( !((aclInstance->flags & E_GW_PROXY_NEW) && (aclInstance->flags & E_GW_PROXY_DELETED))) { - if ( !E_IS_GW_CONNECTION(prd->cnc)) /* Add check in case the connection request fails*/ + if ( !E_IS_GW_CONNECTION(prd->cnc)) /* Add check in case the connection request fails*/ prd->cnc = proxy_get_cnc (account, GTK_WINDOW (gtk_widget_get_toplevel (button))); if (aclInstance->flags & E_GW_PROXY_NEW ) @@ -599,7 +599,7 @@ static void proxy_update_tree_view (EAccount *account) { proxyDialog *prd = NULL; - GtkTreeIter iter; + GtkTreeIter iter; GdkPixbuf *broken_image = NULL; GList *list_iter; proxyHandler *aclInstance; @@ -614,7 +614,7 @@ proxy_update_tree_view (EAccount *account) list_iter = priv->proxy_list; for (;list_iter; list_iter = g_list_next(list_iter)) { - aclInstance = (proxyHandler *) list_iter->data; + aclInstance = (proxyHandler *) list_iter->data; if(! (aclInstance->flags & E_GW_PROXY_DELETED )) { gtk_tree_store_append (priv->store, &iter, NULL); @@ -622,7 +622,7 @@ proxy_update_tree_view (EAccount *account) } } - g_free (file_name); + g_free (file_name); if (broken_image) g_object_unref (broken_image); @@ -835,7 +835,7 @@ proxy_get_item_from_list (EAccount *account, gchar *account_name) list_iter = priv->proxy_list; for (;list_iter; list_iter = g_list_next(list_iter)) { - iter = (proxyHandler *) list_iter->data; + iter = (proxyHandler *) list_iter->data; if ( g_str_equal (iter->proxy_email,account_name)) return iter; diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index a739571b83..c3036d1da3 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -191,7 +191,7 @@ e_sendoptions_clicked_cb (GtkWidget *button, gpointer data) if (n_cnc) e_sendoptions_dialog_run (sod, parent ? parent : NULL, E_ITEM_NONE); else - return; + return; } GtkWidget * diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index fadf37bcfb..8ff4ec3521 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -34,7 +34,7 @@ extern "C" { #include #include -#define _SHARE_FOLDER_TYPE (share_folder_get_type ()) +#define _SHARE_FOLDER_TYPE (share_folder_get_type ()) #define SHARE_FOLDER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SHARE_FOLDER, ShareFolder)) #define SHARE_FOLDER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SHARE_FOLDER_TYPE, ShareFolder)) #define IS_SHARE_FOLDER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SHARE_FOLDER_TYPE)) diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index 966abd114f..d5a17b7893 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -32,7 +32,7 @@ #include "camel-hula-listener.h" -static GList *hula_accounts = NULL; +static GList *hula_accounts = NULL; struct _CamelHulaListenerPrivate { GConfClient *gconf_client; @@ -312,7 +312,7 @@ modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const gchar *old_relative_uri; CamelURL *url; gboolean found_group; - GConfClient* client; + GConfClient* client; url = camel_url_new (old_account_info->source_url, NULL); if (!url->host || strlen (url->host) ==0) @@ -440,7 +440,7 @@ account_added (EAccountList *account_listener, EAccount *account) static void account_removed (EAccountList *account_listener, EAccount *account) { - HulaAccountInfo *info; + HulaAccountInfo *info; if (!is_hula_account (account) || !is_hula_caldav_account (account)) return; @@ -546,7 +546,7 @@ camel_hula_listener_construct (CamelHulaListener *config_listener) EAccount *account; HulaAccountInfo *info ; - config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client); + config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client); for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) { @@ -554,7 +554,7 @@ camel_hula_listener_construct (CamelHulaListener *config_listener) if ( is_hula_account (account) && account->enabled) { - info = g_new0 (HulaAccountInfo, 1); + info = g_new0 (HulaAccountInfo, 1); info->uid = g_strdup (account->uid); info->name = g_strdup (account->name); info->source_url = g_strdup (account->source->url); diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c index 29b334f115..c334019d71 100644 --- a/plugins/hula-account-setup/hula-account-setup.c +++ b/plugins/hula-account-setup/hula-account-setup.c @@ -41,7 +41,7 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable) { if (!config_listener) { config_listener = camel_hula_listener_new (); - g_atexit ( free_hula_listener ); + g_atexit ( free_hula_listener ); } return 0; diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index 64f64dc16a..ea969b2b3a 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -45,13 +45,13 @@ typedef struct _epif_data EPImapFeaturesData; struct _epif_data { GtkWidget *all_headers; GtkWidget *basic_headers; - GtkWidget *mailing_list_headers; + GtkWidget *mailing_list_headers; GtkWidget *custom_headers_box; GtkEntry *entry_header; GtkButton *add_header; - GtkButton *remove_header; + GtkButton *remove_header; GtkTreeView *custom_headers_tree; GtkTreeStore *store; @@ -174,7 +174,7 @@ epif_add_sensitivity (EPImapFeaturesData *ui) if (g_ascii_strcasecmp (header_name, entry_contents) == 0) { gtk_widget_set_sensitive (GTK_WIDGET (ui->add_header), FALSE); return; - } + } valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (ui->store), &iter); } diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c index baef16e0d5..41267ae3e6 100644 --- a/plugins/ipod-sync/ipod.c +++ b/plugins/ipod-sync/ipod.c @@ -180,13 +180,13 @@ find_ipod_mount_point (LibHalContext *ctx) if (!libhal_device_property_exists (ctx, udi2, "volume.is_filesystem", NULL) || !libhal_device_get_property_bool (ctx, udi2, - "volume.is_filesystem", NULL)) + "volume.is_filesystem", NULL)) { has_fs = 1; } fsusage = libhal_device_get_property_string (ctx, udi2, - "volume.fsusage", NULL); + "volume.fsusage", NULL); if (fsusage == NULL) continue; @@ -208,7 +208,7 @@ find_ipod_mount_point (LibHalContext *ctx) if (!libhal_device_property_exists (ctx, udi2, "volume.is_mounted", NULL) || !libhal_device_get_property_bool (ctx, udi2, - "volume.is_mounted", NULL)) + "volume.is_mounted", NULL)) { /* It isn't, so let's attempt to mount it */ if (device != NULL) diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c index cc2febc5e3..5f518dece6 100644 --- a/plugins/ipod-sync/sync.c +++ b/plugins/ipod-sync/sync.c @@ -170,7 +170,7 @@ write_to_ipod (GString *str, gchar *path, gchar *filename) if (mkdir (output_path, 0777) != 0) critical_error (_("No output directory!"), _("The output directory was not found on " - "iPod! Please ensure that iPod has been correctly " + "iPod! Please ensure that iPod has been correctly " "set up and try again.")); } @@ -223,9 +223,9 @@ write_to_ipod (GString *str, gchar *path, gchar *filename) static GString * uri_list_to_vcard_string (GSList *uris) { - GString *str = NULL; - EBook *book = NULL; - EBookQuery *qry = NULL; + GString *str = NULL; + EBook *book = NULL; + EBookQuery *qry = NULL; GList *contacts = NULL, *c = NULL; GSList *uri; @@ -285,8 +285,8 @@ uri_list_to_vcard_string (GSList *uris) static GString * uri_list_to_vcal_string (GSList *uris, ECalSourceType type) { - GString *str = NULL; - ECal *cal = NULL; + GString *str = NULL; + ECal *cal = NULL; icalcomponent *obj = NULL; GList *objects = NULL, *o = NULL; GSList *uri; diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 18aa1ea82a..ed406d9bd2 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -970,7 +970,7 @@ message_foreach_part (CamelMimePart *part, GSList **part_list) message_foreach_part (part, part_list); } } else if (CAMEL_IS_MIME_MESSAGE (containee)) { - message_foreach_part ((CamelMimePart *)containee, part_list); + message_foreach_part ((CamelMimePart *)containee, part_list); } } @@ -1305,7 +1305,7 @@ update_attendee_status (struct _itip_puri *pitip) icalcomponent_add_property (icalcomp, icalproperty_new_clone (del_prop)); e_cal_component_rescan (comp); } else if (response == GTK_RESPONSE_NO) { - remove_delegate (pitip, delegate, itip_strip_mailto (a->value), comp); + remove_delegate (pitip, delegate, itip_strip_mailto (a->value), comp); goto cleanup; } else { goto cleanup; @@ -1957,8 +1957,8 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) /* We do this to ensure there is at most one * attendee in the response */ - if (found || g_ascii_strcasecmp (pitip->to_address, text)) - list = g_slist_prepend (list, prop); + if (found || g_ascii_strcasecmp (pitip->to_address, text)) + list = g_slist_prepend (list, prop); else if (!g_ascii_strcasecmp (pitip->to_address, text)) found = TRUE; g_free (text); diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index d7c0f8a3dd..a893895949 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -48,11 +48,11 @@ #include #endif -#define GCONF_KEY_ROOT "/apps/evolution/eplugin/mail-notification/" +#define GCONF_KEY_ROOT "/apps/evolution/eplugin/mail-notification/" #define GCONF_KEY_NOTIFY_ONLY_INBOX GCONF_KEY_ROOT "notify-only-inbox" -#define GCONF_KEY_ENABLED_DBUS GCONF_KEY_ROOT "dbus-enabled" -#define GCONF_KEY_ENABLED_STATUS GCONF_KEY_ROOT "status-enabled" -#define GCONF_KEY_ENABLED_SOUND GCONF_KEY_ROOT "sound-enabled" +#define GCONF_KEY_ENABLED_DBUS GCONF_KEY_ROOT "dbus-enabled" +#define GCONF_KEY_ENABLED_STATUS GCONF_KEY_ROOT "status-enabled" +#define GCONF_KEY_ENABLED_SOUND GCONF_KEY_ROOT "sound-enabled" static gboolean enabled = FALSE; static GtkWidget *get_cfg_widget (void); @@ -556,9 +556,9 @@ get_config_widget_status (void) vbox = gtk_vbox_new (FALSE, 0); scw = g_malloc0 (sizeof (struct _StatusConfigureWidgets)); - #define create_check(c, key, desc) \ - c = gtk_check_button_new_with_mnemonic (desc); \ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (c), is_part_enabled (key)); \ + #define create_check(c, key, desc) \ + c = gtk_check_button_new_with_mnemonic (desc); \ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (c), is_part_enabled (key)); \ gtk_box_pack_start (GTK_BOX (parent), c, FALSE, FALSE, 0); \ g_signal_connect (G_OBJECT (c), "toggled", G_CALLBACK (toggled_status_cb), scw); diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 9c9f3ad244..ac3d8ea6f0 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -811,11 +811,11 @@ pst_process_email (PstImporter *m, pst_item *item) camel_mime_message_set_from (msg, addr); camel_object_unref (addr); - if (item->email->sent_date != NULL) { + if (item->email->sent_date != NULL) { camel_mime_message_set_date (msg, fileTimeToUnixTime (item->email->sent_date, 0), 0); } - if (item->email->messageid != NULL) { + if (item->email->messageid != NULL) { camel_mime_message_set_message_id (msg, item->email->messageid); } diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index ad6e38e9f9..4650d97375 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -608,7 +608,7 @@ url_remove_clicked (GtkButton *button, PublishUIData *ui) gtk_tree_model_get (model, &iter, URL_LIST_URL_COLUMN, &url, -1); confirm = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, + GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, _("Are you sure you want to remove this location?")); gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_CANCEL, GTK_RESPONSE_NO); gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_REMOVE, GTK_RESPONSE_YES); @@ -704,11 +704,11 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) renderer = gtk_cell_renderer_toggle_new (); g_object_set (G_OBJECT (renderer), "activatable", TRUE, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Enabled"), - renderer, "active", URL_LIST_ENABLED_COLUMN, NULL); + renderer, "active", URL_LIST_ENABLED_COLUMN, NULL); g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (url_list_enable_toggled), ui); renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Location"), - renderer, "text", URL_LIST_LOCATION_COLUMN, NULL); + renderer, "text", URL_LIST_LOCATION_COLUMN, NULL); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), ui); diff --git a/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c index 4d7ead37da..aa273ae264 100644 --- a/plugins/python/python-plugin-loader.c +++ b/plugins/python/python-plugin-loader.c @@ -67,7 +67,7 @@ epp_invoke(EPlugin *ep, const gchar *name, gpointer data) Py_Initialize(); if (p->pModule == NULL) { - pModuleName = PyString_FromString(epp->module_name); + pModuleName = PyString_FromString(epp->module_name); PyRun_SimpleString(g_strdup_printf ("import sys ; sys.path.insert(0, '%s')", epp->location)); diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 3c92b386ae..d7123dc4e7 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -444,7 +444,7 @@ em_junk_sa_test_spamd (void) em_junk_sa_spamd_binaries [0] = em_junk_sa_spamd_gconf_binary; em_junk_sa_spamd_binaries [1] = NULL; try_system_spamd = FALSE; - } + } em_junk_sa_use_spamc = FALSE; @@ -513,7 +513,7 @@ em_junk_sa_is_available (GError **error) /* While we're at it, see if spamd is running with --allow-tell */ if (!em_junk_sa_allow_tell_tested) - em_junk_sa_test_allow_tell () ; + em_junk_sa_test_allow_tell () ; pthread_mutex_unlock (&em_junk_sa_init_lock); @@ -900,13 +900,13 @@ static void use_remote_tests_cb (GtkWidget *widget, gpointer data) { gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); - gconf_client_set_bool (em_junk_sa_gconf, data, !active, NULL); + gconf_client_set_bool (em_junk_sa_gconf, data, !active, NULL); } GtkWidget * org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) { - GtkWidget *check, *vbox, *label; + GtkWidget *check, *vbox, *label; gchar *text = g_strdup_printf (" %s", _("This will make SpamAssassin more reliable, but slower")); guint i = ((GtkTable *)data->parent)->nrows; diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index c63c1dab2b..6042de7d6f 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -163,7 +163,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE_AS, GTK_RESPONSE_OK, - NULL); + NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), extra_widget); diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index b0de28ad49..95a3c1e361 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -75,14 +75,14 @@ static void reply_with_template (EPopup *ep, EPopupItem *item, gpointer data); static void popup_free (EPopup *ep, GSList *l, gpointer data); static GSList *fill_submenu (CamelStore *store, - CamelFolderInfo *info, - GSList *list, - EMPopupTargetSelect *t); + CamelFolderInfo *info, + GSList *list, + EMPopupTargetSelect *t); -static GSList *append_to_menu (CamelFolder *folder, - GPtrArray *uids, - GSList *list, - EMPopupTargetSelect *t); +static GSList *append_to_menu (CamelFolder *folder, + GPtrArray *uids, + GSList *list, + EMPopupTargetSelect *t); void org_gnome_templates_popup (EPlugin *ep, EMPopupTargetSelect *t); @@ -709,7 +709,7 @@ static GtkActionEntry entries[] = { { "Template", GTK_STOCK_SAVE, N_("Save as _Template"), - "t", + "t", N_("Save as Template"), G_CALLBACK (action_template_cb) } }; diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index cdbdb09872..1777f526fb 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -108,7 +108,7 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) if (camel_data_wrapper_decode_to_stream(content, out) == -1 || camel_stream_close(out) == -1) { camel_object_unref(out); - goto fail; + goto fail; } camel_object_unref(out); diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c index d338094726..c4f7ef9f58 100644 --- a/plugins/webdav-account-setup/webdav-contacts-source.c +++ b/plugins/webdav-account-setup/webdav-contacts-source.c @@ -322,7 +322,7 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) gtk_check_button_new_with_mnemonic( _("_Avoid IfMatch (needed on Apache < 2.2.8)"))); gtk_box_pack_start(hbox, GTK_WIDGET(uidata->avoid_ifmatch_toggle), - FALSE, FALSE, 0); + FALSE, FALSE, 0); set_ui_from_source(uidata); diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 877c410289..97490b45ac 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -49,7 +49,7 @@ component_info_new (const gchar *id, GNOME_Evolution_Component iface, const gchar *alias, const gchar *button_label, - const gchar *button_tooltips, + const gchar *button_tooltips, const gchar *menu_label, const gchar *menu_accelerator, const gchar *icon_name, diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 0e0a07ea21..30318ccb0b 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -440,7 +440,7 @@ static void import_druid_cancel (GnomeDruid *druid, ImportData *data) { - gtk_widget_destroy (GTK_WIDGET (data->dialog)); + gtk_widget_destroy (GTK_WIDGET (data->dialog)); } static gboolean diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 1a9529688e..8b13233a9d 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -190,9 +190,9 @@ load_pages (EShellSettingsDialog *dialog) info = & control_list->_buffer[i]; - title = bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", languages); - description = bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", languages); - icon_path = bonobo_server_info_prop_lookup (info, "evolution2:config_item:icon_name", NULL); + title = bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", languages); + description = bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", languages); + icon_path = bonobo_server_info_prop_lookup (info, "evolution2:config_item:icon_name", NULL); type = bonobo_server_info_prop_find (info, "evolution2:config_item:type"); priority_string = bonobo_server_info_prop_lookup (info, "evolution2:config_item:priority", NULL); diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index a81bacf07a..3f9c4b0f26 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -958,7 +958,7 @@ command_about (BonoboUIComponent *uih, static void command_open_faq (BonoboUIComponent *uih, EShellWindow *window, - const gchar *path) + const gchar *path) { const gchar *uri; diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 8b24805fd4..eb1f96e6d8 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -628,7 +628,7 @@ static GConfEnumStringPair button_styles[] = { { E_SIDEBAR_MODE_ICON, "icons" }, { E_SIDEBAR_MODE_BOTH, "both" }, { E_SIDEBAR_MODE_TOOLBAR, "toolbar" }, - { -1, NULL } + { -1, NULL } }; static void @@ -687,7 +687,7 @@ setup_widgets (EShellWindow *window) "/apps/evolution/shell/view_defaults/buttons_style", NULL); - if (gconf_string_to_enum (button_styles, style, &mode)) { + if (gconf_string_to_enum (button_styles, style, &mode)) { switch (mode) { case E_SIDEBAR_MODE_TEXT: bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window), @@ -718,7 +718,7 @@ setup_widgets (EShellWindow *window) /* Status Bar*/ visible = gconf_client_get_bool (gconf_client, - "/apps/evolution/shell/view_defaults/statusbar_visible", + "/apps/evolution/shell/view_defaults/statusbar_visible", NULL); bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window), "/commands/ViewStatusBar", @@ -728,7 +728,7 @@ setup_widgets (EShellWindow *window) /* Side Bar*/ visible = gconf_client_get_bool (gconf_client, - "/apps/evolution/shell/view_defaults/sidebar_visible", + "/apps/evolution/shell/view_defaults/sidebar_visible", NULL); bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window), "/commands/ViewSideBar", diff --git a/shell/e-shell.c b/shell/e-shell.c index ed7f8cc4b0..de4e0a88ca 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -269,7 +269,7 @@ impl_Shell_handleURI (PortableServer_Servant servant, if (p) *p = 0; - component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_SCHEMA, schema); + component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_SCHEMA, schema); if (component_info == NULL) { show = TRUE; component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_ALIAS, schema); @@ -855,7 +855,7 @@ e_shell_attempt_upgrade (EShell *shell) check_old: /* if the last upgraded version was old, check for stuff to remove */ if (done_upgrade - || (last_version = gconf_client_get_string (gconf_client, "/apps/evolution/last_version", NULL)) == NULL + || (last_version = gconf_client_get_string (gconf_client, "/apps/evolution/last_version", NULL)) == NULL || sscanf(last_version, "%d.%d.%d", &lmajor, &lminor, &lrevision) != 3) { lmajor = major; lminor = minor; diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index 3326c5d1dc..6a061ab422 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -437,7 +437,7 @@ impl_dispose (GObject *object) priv->style_changed_id = 0; } - g_object_unref (gconf_client); + g_object_unref (gconf_client); (* G_OBJECT_CLASS (e_sidebar_parent_class)->dispose) (object); } @@ -558,8 +558,8 @@ e_sidebar_add_button (ESidebar *sidebar, if (sidebar->priv->show) gtk_widget_show (button_widget); g_signal_connect (button_widget, "toggled", G_CALLBACK (button_toggled_callback), sidebar); - g_signal_connect (button_widget, "button_press_event", - G_CALLBACK (button_pressed_callback), sidebar); + g_signal_connect (button_widget, "button_press_event", + G_CALLBACK (button_pressed_callback), sidebar); hbox = gtk_hbox_new (FALSE, 3); gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); @@ -659,7 +659,7 @@ static GConfEnumStringPair toolbar_styles[] = { { E_SIDEBAR_MODE_BOTH, "both" }, { E_SIDEBAR_MODE_BOTH, "both-horiz" }, { E_SIDEBAR_MODE_BOTH, "both_horiz" }, - { -1, NULL } + { -1, NULL } }; static void @@ -715,15 +715,15 @@ static void style_changed_notify (GConfClient *gconf, guint id, GConfEntry *entry, gpointer data) { ESidebar *sidebar = data; - gchar *val; - gint mode; + gchar *val; + gint mode; val = gconf_client_get_string (gconf, "/desktop/gnome/interface/toolbar_style", NULL); if (val == NULL || !gconf_string_to_enum (toolbar_styles, val, &mode)) mode = E_SIDEBAR_MODE_BOTH; g_free(val); - set_mode_internal (E_SIDEBAR (sidebar), mode); + set_mode_internal (E_SIDEBAR (sidebar), mode); sidebar->priv->toolbar_mode = mode; gtk_widget_queue_resize (GTK_WIDGET (sidebar)); diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index f5af1575dd..2fe35ddb78 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -717,7 +717,7 @@ static void setup_toolbar_button (EUserCreatableItemsHandler *handler) { EUserCreatableItemsHandlerPrivate *priv; - GConfClient *gconf = gconf_client_get_default (); + GConfClient *gconf = gconf_client_get_default (); gchar *val; priv = handler->priv; diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c index 26b06e7c20..17e118094b 100644 --- a/shell/importer/evolution-importer.c +++ b/shell/importer/evolution-importer.c @@ -229,7 +229,7 @@ evolution_importer_construct (EvolutionImporter *importer, */ EvolutionImporter * evolution_importer_new (EvolutionImporterCreateControlFn create_control_fn, - EvolutionImporterSupportFormatFn support_format_fn, + EvolutionImporterSupportFormatFn support_format_fn, EvolutionImporterLoadFileFn load_file_fn, EvolutionImporterProcessItemFn process_item_fn, EvolutionImporterGetErrorFn get_error_fn, diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index 33b7eeb68d..e55938978c 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -101,9 +101,9 @@ static void set_map_timezone (ETimezoneDialog *etd, static void on_combo_changed (GtkComboBox *combo, ETimezoneDialog *etd); -static void timezone_combo_get_active_text (GtkComboBox *combo, +static void timezone_combo_get_active_text (GtkComboBox *combo, const gchar **zone_name); -static gboolean timezone_combo_set_active_text (GtkComboBox *combo, +static gboolean timezone_combo_set_active_text (GtkComboBox *combo, const gchar *zone_name); static void map_destroy_cb (gpointer data, @@ -479,10 +479,10 @@ on_map_timeout (gpointer data) if (e_map_point_get_color_rgba (priv->point_selected) == E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_1_RGBA) - e_map_point_set_color_rgba (priv->map, priv->point_selected, + e_map_point_set_color_rgba (priv->map, priv->point_selected, E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_2_RGBA); else - e_map_point_set_color_rgba (priv->map, priv->point_selected, + e_map_point_set_color_rgba (priv->map, priv->point_selected, E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_1_RGBA); return TRUE; @@ -505,14 +505,14 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data) &longitude, &latitude); if (priv->point_hover && priv->point_hover != priv->point_selected) - e_map_point_set_color_rgba (priv->map, priv->point_hover, + e_map_point_set_color_rgba (priv->map, priv->point_hover, E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA); priv->point_hover = e_map_get_closest_point (priv->map, longitude, latitude, TRUE); if (priv->point_hover != priv->point_selected) - e_map_point_set_color_rgba (priv->map, priv->point_hover, + e_map_point_set_color_rgba (priv->map, priv->point_hover, E_TIMEZONE_DIALOG_MAP_POINT_HOVER_RGBA); new_zone = get_zone_from_point (etd, priv->point_hover); @@ -542,7 +542,7 @@ on_map_leave (GtkWidget *widget, GdkEventCrossing *event, gpointer data) return FALSE; if (priv->point_hover && priv->point_hover != priv->point_selected) - e_map_point_set_color_rgba (priv->map, priv->point_hover, + e_map_point_set_color_rgba (priv->map, priv->point_hover, E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA); timezone_combo_set_active_text (GTK_COMBO_BOX (priv->timezone_combo), @@ -596,14 +596,14 @@ on_map_button_pressed (GtkWidget *w, GdkEventButton *event, gpointer data) &longitude, &latitude); if (event->button != 1) { - e_map_zoom_out (priv->map); + e_map_zoom_out (priv->map); } else { if (e_map_get_magnification (priv->map) <= 1.0) - e_map_zoom_to_location (priv->map, longitude, + e_map_zoom_to_location (priv->map, longitude, latitude); if (priv->point_selected) - e_map_point_set_color_rgba (priv->map, + e_map_point_set_color_rgba (priv->map, priv->point_selected, E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA); priv->point_selected = priv->point_hover; @@ -694,7 +694,7 @@ e_timezone_dialog_set_timezone (ETimezoneDialog *etd, g_return_if_fail (E_IS_TIMEZONE_DIALOG (etd)); - if (!zone) { + if (!zone) { zone = (icaltimezone *)get_local_timezone(); if (!zone) zone = icaltimezone_get_utc_timezone(); diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index 8ecbcba061..3670218456 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -167,7 +167,7 @@ gdvd_button_delete_callback(GtkWidget *widget, GalDefineViewsDialog *dialog) if (gtk_tree_path_prev (path)) { gtk_tree_model_get_iter (dialog->model, &iter, path); - } else { + } else { gtk_tree_model_get_iter_first (dialog->model, &iter); } diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index 3cdd94984a..003e326b69 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -290,7 +290,7 @@ e_activity_handler_init (EActivityHandler *activity_handler) priv->next_activity_id = 1; priv->activity_infos = NULL; priv->task_bars = NULL; - priv->logger = NULL; + priv->logger = NULL; priv->error_timer = 0; priv->error_flush_interval = 0; activity_handler->priv = priv; @@ -405,8 +405,8 @@ cancel_wrapper (gpointer pdata) /* CORBA methods. */ guint e_activity_handler_cancelable_operation_started (EActivityHandler *activity_handler, const gchar *component_id, - const gchar *information, - gboolean cancellable, + const gchar *information, + gboolean cancellable, void (*cancel_func)(gpointer), gpointer user_data) { diff --git a/widgets/misc/e-activity-handler.h b/widgets/misc/e-activity-handler.h index a458bf0f31..65bd1ded97 100644 --- a/widgets/misc/e-activity-handler.h +++ b/widgets/misc/e-activity-handler.h @@ -65,7 +65,7 @@ void e_activity_handler_attach_task_bar (EActivityHandler *activity_hanlder, ETaskBar *task_bar); void e_activity_handler_set_message (EActivityHandler *activity_handler, - const gchar *message); + const gchar *message); void e_activity_handler_unset_message (EActivityHandler *activity_handler); @@ -75,8 +75,8 @@ guint e_activity_handler_operation_started (EActivityHandler *activity_handler gboolean cancellable); guint e_activity_handler_cancelable_operation_started (EActivityHandler *activity_handler, const gchar *component_id, - const gchar *information, - gboolean cancellable, + const gchar *information, + gboolean cancellable, void (*cancel_func)(gpointer), gpointer user_data); diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c index e1037ae175..45c2103e3d 100644 --- a/widgets/misc/e-attachment-dialog.c +++ b/widgets/misc/e-attachment-dialog.c @@ -407,7 +407,7 @@ e_attachment_dialog_new (GtkWindow *parent, EAttachment *attachment) { if (parent != NULL) - g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL); + g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL); if (attachment != NULL) g_return_val_if_fail (E_IS_ATTACHMENT (attachment), NULL); diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c index 88e59b87db..a0adf46cf5 100644 --- a/widgets/misc/e-calendar.c +++ b/widgets/misc/e-calendar.c @@ -83,7 +83,7 @@ static void e_calendar_drag_leave (GtkWidget *widget, guint time); static gboolean e_calendar_button_has_focus (ECalendar *cal); static gboolean e_calendar_focus (GtkWidget *widget, - GtkDirectionType direction); + GtkDirectionType direction); static void e_calendar_on_prev_pressed (ECalendar *cal); static void e_calendar_on_prev_released (ECalendar *cal); @@ -113,11 +113,11 @@ e_calendar_class_init (ECalendarClass *class) widget_class->realize = e_calendar_realize; widget_class->style_set = e_calendar_style_set; - widget_class->size_request = e_calendar_size_request; - widget_class->size_allocate = e_calendar_size_allocate; + widget_class->size_request = e_calendar_size_request; + widget_class->size_allocate = e_calendar_size_allocate; widget_class->drag_motion = e_calendar_drag_motion; widget_class->drag_leave = e_calendar_drag_leave; - widget_class->focus = e_calendar_focus; + widget_class->focus = e_calendar_focus; } @@ -351,7 +351,7 @@ e_calendar_size_allocate (GtkWidget *widget, gnome_canvas_item_set (cal->prev_item, "x", (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? new_x2 + 1 - xthickness * 2 - E_CALENDAR_ARROW_BUTTON_X_PAD - - arrow_button_size + - arrow_button_size : xthickness * 2 + E_CALENDAR_ARROW_BUTTON_X_PAD, "y", ythickness * 2 + E_CALENDAR_ARROW_BUTTON_Y_PAD, @@ -363,7 +363,7 @@ e_calendar_size_allocate (GtkWidget *widget, "x", (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? xthickness * 2 + E_CALENDAR_ARROW_BUTTON_X_PAD : new_x2 + 1 - xthickness * 2 - E_CALENDAR_ARROW_BUTTON_X_PAD - - arrow_button_size, + - arrow_button_size, "y", ythickness * 2 + E_CALENDAR_ARROW_BUTTON_Y_PAD, "width", arrow_button_size, diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h index e23d29f057..5f60fc4046 100644 --- a/widgets/misc/e-canvas.h +++ b/widgets/misc/e-canvas.h @@ -42,7 +42,7 @@ extern "C" { #define E_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_CANVAS_TYPE)) typedef void (*ECanvasItemReflowFunc) (GnomeCanvasItem *item, - gint flags); + gint flags); typedef void (*ECanvasItemSelectionFunc) (GnomeCanvasItem *item, gint flags, diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index ddf8bf60ee..18723b5f61 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -284,7 +284,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde) gtk_container_set_focus_vadjustment (GTK_CONTAINER (tree_view), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window))); gtk_container_set_focus_hadjustment (GTK_CONTAINER (tree_view), - gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled_window))); + gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled_window))); gtk_widget_show (tree_view); ecde->time_tree_view = tree_view; g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)), "changed", diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index 94133cc204..53beaa9c11 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -259,7 +259,7 @@ activate_other (GtkWidget *item, gpointer menu) if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) { new_charset = (gchar *)gtk_entry_get_text (GTK_ENTRY (entry)); - if (*new_charset) { + if (*new_charset) { if (add_other_charset (menu, item, new_charset)) { gtk_widget_destroy (GTK_WIDGET (dialog)); g_object_unref (dialog); diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c index b40cf70635..a6fb3b517f 100644 --- a/widgets/misc/e-combo-button.c +++ b/widgets/misc/e-combo-button.c @@ -495,7 +495,7 @@ e_combo_button_pack_vbox (EComboButton *combo_button) gtk_container_add (GTK_CONTAINER (combo_button), priv->hbox); gtk_widget_show (priv->hbox); - priv->vbox = gtk_vbox_new (FALSE, 0); + priv->vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (priv->vbox); priv->icon_image = gtk_image_new_from_stock ( diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h index 7df3404092..23ac7c0899 100644 --- a/widgets/misc/e-cursors.h +++ b/widgets/misc/e-cursors.h @@ -51,7 +51,7 @@ void e_cursors_shutdown (void); #define e_cursor_set(win, c) \ G_STMT_START { \ - if (win) \ + if (win) \ gdk_window_set_cursor (win, e_cursor_get (c)); \ } G_STMT_END diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index e8034eb487..b9ae1ad901 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -1247,7 +1247,7 @@ position_date_popup (EDateEdit *dedit) x += win_x; y += win_y; - screen_width = gdk_screen_width (); + screen_width = gdk_screen_width (); screen_height = gdk_screen_height (); x = CLAMP (x, 0, MAX (0, screen_width - cal_req.width)); @@ -1326,7 +1326,7 @@ on_date_popup_key_press (GtkWidget *widget, EDateEdit *dedit) { if (event->keyval != GDK_Escape) { - gdk_keyboard_grab (dedit->priv->cal_popup->window, TRUE, GDK_CURRENT_TIME); + gdk_keyboard_grab (dedit->priv->cal_popup->window, TRUE, GDK_CURRENT_TIME); return FALSE; } diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index b699190568..9fdb45b0b6 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -962,7 +962,7 @@ e_filter_bar_new (RuleContext *context, bar = g_object_new (e_filter_bar_get_type (), NULL); ((ESearchBar *)bar)->lite = FALSE; - e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar); + e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar); return bar; } @@ -978,7 +978,7 @@ e_filter_bar_lite_new (RuleContext *context, bar = g_object_new (e_filter_bar_get_type (), NULL); ((ESearchBar *)bar)->lite = TRUE; - e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar); + e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar); return bar; } @@ -1003,7 +1003,7 @@ e_filter_bar_new_construct (RuleContext *context, bar->all_account_search_vf = NULL; bar->account_search_vf = NULL; - bar->account_search_cancel = NULL; + bar->account_search_cancel = NULL; e_search_bar_construct ((ESearchBar *)bar, &item, &item); diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index d5381319c9..3e22182021 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -131,7 +131,7 @@ EFilterBar *e_filter_bar_lite_new (RuleContext *context, gpointer data); void -e_filter_bar_new_construct (RuleContext *context, +e_filter_bar_new_construct (RuleContext *context, const gchar *systemrules, const gchar *userrules, EFilterBarConfigRule config, diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h index a3972bd26d..be2d427291 100644 --- a/widgets/misc/e-image-chooser.h +++ b/widgets/misc/e-image-chooser.h @@ -28,10 +28,10 @@ G_BEGIN_DECLS -#define E_TYPE_IMAGE_CHOOSER (e_image_chooser_get_type ()) -#define E_IMAGE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_IMAGE_CHOOSER, EImageChooser)) +#define E_TYPE_IMAGE_CHOOSER (e_image_chooser_get_type ()) +#define E_IMAGE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_IMAGE_CHOOSER, EImageChooser)) #define E_IMAGE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_IMAGE_CHOOSER, EImageChooserClass)) -#define E_IS_IMAGE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_IMAGE_CHOOSER)) +#define E_IS_IMAGE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_IMAGE_CHOOSER)) #define E_IS_IMAGE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_IMAGE_CHOOSER)) typedef struct _EImageChooser EImageChooser; diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index c44e75886b..f35335f37d 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -345,7 +345,7 @@ e_map_unrealize (GtkWidget *widget) g_return_if_fail (IS_E_MAP (widget)); if (GTK_WIDGET_CLASS (parent_class)->unrealize) - (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); + (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); } @@ -882,7 +882,7 @@ e_map_point_is_in_view (EMap *map, EMapPoint *point) if (x >= 0 && x < GTK_WIDGET (map)->allocation.width && y >= 0 && y < GTK_WIDGET (map)->allocation.height) - return TRUE; + return TRUE; return FALSE; } @@ -1011,8 +1011,8 @@ update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays) if (width > 1 && height > 1) { gdk_pixbuf_scale (priv->map_pixbuf, priv->map_render_pixbuf, 0, 0, /* Dest (x, y) */ - width, height, 0, 0, /* Offset (x, y) */ - zoom, zoom, /* Scale (x, y) */ + width, height, 0, 0, /* Offset (x, y) */ + zoom, zoom, /* Scale (x, y) */ interp); } diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index 9b193565d4..ba1a5b011e 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -60,11 +60,11 @@ static const gchar *list_e_table_spec = " horizontal-resize=\"true\"" ">" " " " " " " diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index 0465c38792..2adad1991b 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -1278,7 +1278,7 @@ e_reflow_point (GnomeCanvasItem *item, return 0; #if 0 if (y >= E_REFLOW_BORDER_WIDTH && y <= reflow->height - E_REFLOW_BORDER_WIDTH) { - float n_x; + float n_x; n_x = x; n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH; n_x = fmod(n_x, (reflow->column_width + E_REFLOW_FULL_GUTTER)); diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index c6b26412f1..652123f2ce 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -664,8 +664,8 @@ set_menu (ESearchBar *esb, ESearchBarItem *new_item; new_item = g_new (ESearchBarItem, 1); - new_item->text = items[i].text ? g_strdup (_(items[i].text)) : NULL; - new_item->id = items[i].id; + new_item->text = items[i].text ? g_strdup (_(items[i].text)) : NULL; + new_item->id = items[i].id; new_item->type = items[i].type; esb->menu_items = g_slist_append (esb->menu_items, new_item); @@ -681,13 +681,13 @@ set_menu (ESearchBar *esb, /* static gpointer / /* option_item_destroy_cb (GtkObject *object, gpointer data) */ /* { */ -/* /\* ESearchBarSubitem *subitems; *\/ */ +/* /\* ESearchBarSubitem *subitems; *\/ */ -/* /\* subitems = data; *\/ */ +/* /\* subitems = data; *\/ */ -/* /\* g_assert (subitems != NULL); *\/ */ -/* /\* free_subitems (subitems); *\/ */ -/* /\* g_object_set_data (G_OBJECT (object), "EsbChoiceSubitems", NULL); *\/ */ +/* /\* g_assert (subitems != NULL); *\/ */ +/* /\* free_subitems (subitems); *\/ */ +/* /\* g_object_set_data (G_OBJECT (object), "EsbChoiceSubitems", NULL); *\/ */ /* } */ static void @@ -745,7 +745,7 @@ set_option (ESearchBar *esb, ESearchBarItem *items) gtk_widget_show_all (menu); g_object_set_data (G_OBJECT(esb->option_menu), "group", group); - entry_focus_out_cb (esb->entry, NULL, esb); + entry_focus_out_cb (esb->entry, NULL, esb); } static int @@ -828,10 +828,10 @@ impl_dispose (GObject *object) bonobo_object_unref (BONOBO_OBJECT (esb->ui_component)); esb->ui_component = NULL; } -/* if (esb->entry) { */ -/* g_object_unref (esb->entry); */ -/* esb->entry = NULL; */ -/* } */ +/* if (esb->entry) { */ +/* g_object_unref (esb->entry); */ +/* esb->entry = NULL; */ +/* } */ if (esb->suboption) { g_object_unref (esb->suboption); esb->suboption = NULL; @@ -1050,7 +1050,7 @@ e_search_bar_construct (ESearchBar *search_bar, gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), label, FALSE, FALSE, 0); search_bar->scopeoption = gtk_option_menu_new (); - /* g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */ + /* g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */ gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), search_bar->scopeoption, FALSE, FALSE, 0); gtk_widget_show_all (search_bar->scopeoption_box); gtk_widget_hide (hbox); diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index b42630ebae..fa84e86cc8 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -397,7 +397,7 @@ init_widgets (ESendOptionsDialog *sod) g_signal_connect (priv->delay_until, "changed", G_CALLBACK (delay_until_date_changed_cb), sod); if (priv->global) - g_signal_connect (priv->notebook, "switch-page", G_CALLBACK (page_changed_cb), sod); + g_signal_connect (priv->notebook, "switch-page", G_CALLBACK (page_changed_cb), sod); } @@ -502,7 +502,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) gtk_label_set_mnemonic_widget (GTK_LABEL (priv->until_label), priv->delay_until); if (priv->global) { - GtkWidget *widget = gtk_label_new ("Calendar"); + GtkWidget *widget = gtk_label_new ("Calendar"); gtk_label_set_text (GTK_LABEL (priv->sopts_label), "Mail"); gtk_notebook_append_page (priv->notebook, priv->status, widget); gtk_widget_show (widget); @@ -514,7 +514,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) switch (type) { case E_ITEM_MAIL: - priv->help_section = g_strdup ("usage-mail"); + priv->help_section = g_strdup ("usage-mail"); gtk_widget_hide (priv->accepted_label); gtk_widget_hide (priv->when_accepted); gtk_widget_hide (priv->completed_label); @@ -522,11 +522,11 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->declined_label), (_("When de_leted:"))); break; case E_ITEM_CALENDAR: - priv->help_section = g_strdup ("usage-calendar"); + priv->help_section = g_strdup ("usage-calendar"); gtk_widget_hide (priv->completed_label); gtk_widget_hide (priv->when_completed); case E_ITEM_TASK: - priv->help_section = g_strdup ("usage-calendar-todo"); + priv->help_section = g_strdup ("usage-calendar-todo"); gtk_widget_hide (priv->security_label); gtk_widget_hide (priv->security); gtk_widget_set_sensitive (priv->autodelete, FALSE); @@ -606,7 +606,7 @@ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data e_display_help ( GTK_WINDOW (priv->main), priv->help_section); - break; + break; } g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); @@ -821,7 +821,7 @@ GType e_sendoptions_dialog_get_type (void) sizeof (ESendOptionsDialog), 0, /* n_preallocs */ (GInstanceInitFunc) e_sendoptions_dialog_init, - NULL /* instance_init */ + NULL /* instance_init */ }; type = g_type_register_static (G_TYPE_OBJECT, "ESendOptionsDialogType", diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c index 87e53dce8f..78303cc9ec 100644 --- a/widgets/misc/e-spinner.c +++ b/widgets/misc/e-spinner.c @@ -66,7 +66,7 @@ struct _ESpinnerClass #define E_TYPE_SPINNER_CACHE (e_spinner_cache_get_type()) #define E_SPINNER_CACHE(object) (G_TYPE_CHECK_INSTANCE_CAST((object), E_TYPE_SPINNER_CACHE, ESpinnerCache)) -#define E_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass)) +#define E_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass)) #define E_IS_SPINNER_CACHE(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), E_TYPE_SPINNER_CACHE)) #define E_IS_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), E_TYPE_SPINNER_CACHE)) #define E_SPINNER_CACHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass)) @@ -275,7 +275,7 @@ e_spinner_images_load (GdkScreen *screen, /* Load the animation. The 'rest icon' is the 0th frame */ icon_info = gtk_icon_theme_lookup_icon (icon_theme, SPINNER_ICON_NAME, - requested_size, 0); + requested_size, 0); if (icon_info == NULL) { g_warning ("Throbber animation not found"); @@ -741,10 +741,10 @@ e_spinner_start (ESpinner *spinner) details->timer_task = g_timeout_add_full (G_PRIORITY_LOW, - details->timeout, - (GSourceFunc) bump_spinner_frame_cb, - spinner, - NULL); + details->timeout, + (GSourceFunc) bump_spinner_frame_cb, + spinner, + NULL); } } @@ -843,7 +843,7 @@ e_spinner_size_request (GtkWidget *widget, gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget), details->size, &requisition->width, - &requisition->height); + &requisition->height); return; } diff --git a/widgets/misc/e-task-bar.h b/widgets/misc/e-task-bar.h index 33d0e2312f..f208603b63 100644 --- a/widgets/misc/e-task-bar.h +++ b/widgets/misc/e-task-bar.h @@ -69,7 +69,7 @@ void e_task_bar_remove_task (ETaskBar *task_bar, ETaskWidget * e_task_bar_get_task_widget_from_id (ETaskBar *task_bar, guint id); -void e_task_bar_remove_task_from_id (ETaskBar *task_bar, +void e_task_bar_remove_task_from_id (ETaskBar *task_bar, guint id); ETaskWidget *e_task_bar_get_task_widget (ETaskBar *task_bar, gint n); diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c index de5b782f85..59909f6542 100644 --- a/widgets/misc/e-task-widget.c +++ b/widgets/misc/e-task-widget.c @@ -172,7 +172,7 @@ e_task_widget_construct (ETaskWidget *task_widget, priv->cancel_func = cancel_func; priv->data = data; g_signal_connect (tool, "clicked", G_CALLBACK (button_press_event_cb), task_widget); - g_signal_connect (task_widget, "button-press-event", G_CALLBACK (prepare_popup), task_widget); + g_signal_connect (task_widget, "button-press-event", G_CALLBACK (prepare_popup), task_widget); } diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c index 273343aaa1..59a8cd3e0d 100644 --- a/widgets/table/e-cell-hbox.c +++ b/widgets/table/e-cell-hbox.c @@ -277,7 +277,7 @@ e_cell_hbox_class_init (ECellHboxClass *klass) ecc->max_width = ecv_max_width; -/* gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_HBOX_TYPE, gal_a11y_e_cell_hbox_new); */ +/* gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_HBOX_TYPE, gal_a11y_e_cell_hbox_new); */ } static void diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h index 366d01fffe..def14d81ed 100644 --- a/widgets/table/e-cell-hbox.h +++ b/widgets/table/e-cell-hbox.h @@ -61,7 +61,7 @@ ECell *e_cell_hbox_new (void); void e_cell_hbox_append (ECellHbox *vbox, ECell *subcell, gint model_col, - gint size); + gint size); G_END_DECLS diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index 5fcd13fce4..64d7d69182 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -76,7 +76,7 @@ static int ecp_height (ECellView *ecv, int model_col, int view_col, int row); -static gpointer ecp_enter_edit (ECellView *ecv, +static gpointer ecp_enter_edit (ECellView *ecv, int model_col, int view_col, int row); diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h index b1e40a9845..a8ce08f44f 100644 --- a/widgets/table/e-cell-popup.h +++ b/widgets/table/e-cell-popup.h @@ -71,7 +71,7 @@ typedef struct { ECellClass parent_class; /* Virtual function for subclasses to override. */ - gint (*popup) (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col); + gint (*popup) (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col); } ECellPopupClass; diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 409f933dae..ff3dd357e8 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -609,7 +609,7 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width) pango_font_description_set_size (desc, fixed_size); else pango_font_description_set_absolute_size (desc, fixed_size); -/* pango_font_description_set_style (desc, PANGO_STYLE_OBLIQUE); */ +/* pango_font_description_set_style (desc, PANGO_STYLE_OBLIQUE); */ pango_layout_set_font_description (layout, desc); pango_font_description_free (desc); pango_font_description_free (fixed_desc); @@ -870,7 +870,7 @@ ect_get_bg_color(ECellView *ecell_view, gint row) return NULL; color_spec = e_table_model_value_at (ecell_view->e_table_model, - ect->bg_color_column, row); + ect->bg_color_column, row); return color_spec; } @@ -985,7 +985,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col if (preedit_len && flags & E_CELL_PREEDIT) return 0; else - return 1; + return 1; } if (event->key.keyval == GDK_Escape){ @@ -1362,7 +1362,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, pango_context = gtk_widget_get_pango_context (canvas); font_metrics = pango_context_get_metrics (pango_context, - canvas->style->font_desc, pango_context_get_language(pango_context)); + canvas->style->font_desc, pango_context_get_language(pango_context)); ty = (double)(text_height - pango_font_metrics_get_ascent (font_metrics) - pango_font_metrics_get_descent (font_metrics)) / 2.0 /(double)PANGO_SCALE; @@ -1402,7 +1402,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, } cairo_set_line_width (cr,(double)pango_font_metrics_get_strikethrough_thickness (font_metrics)/(double)PANGO_SCALE); - cairo_stroke (cr); + cairo_stroke (cr); } cairo_move_to(cr, 2, text_height- 5); @@ -1592,7 +1592,7 @@ ect_show_tooltip (ECellView *ecell_view, "clip_height", (double) height, "clip", TRUE, "line_wrap", FALSE, - "justification", E_CELL_TEXT (text_view->cell_view.ecell)->justify, + "justification", E_CELL_TEXT (text_view->cell_view.ecell)->justify, "draw_background", FALSE, NULL); @@ -1755,7 +1755,7 @@ e_cell_text_class_init (ECellTextClass *klass) ecc->enter_edit = ect_enter_edit; ecc->leave_edit = ect_leave_edit; ecc->save_state = ect_save_state; - ecc->load_state = ect_load_state; + ecc->load_state = ect_load_state; ecc->free_state = ect_free_state; ecc->print = ect_print; ecc->print_height = ect_print_height; @@ -1978,7 +1978,7 @@ e_cell_text_delete_surrounding_cb (GtkIMContext *context, text_len = g_utf8_strlen (edit->text, -1); begin_pos = g_utf8_pointer_to_offset (edit->text, - edit->text + MIN (edit->selection_start, edit->selection_end)); + edit->text + MIN (edit->selection_start, edit->selection_end)); begin_pos += offset; end_pos = begin_pos + n_chars; if(begin_pos < 0 || text_len < begin_pos) @@ -1986,9 +1986,9 @@ e_cell_text_delete_surrounding_cb (GtkIMContext *context, if(end_pos > text_len) end_pos = text_len; edit->selection_start = g_utf8_offset_to_pointer (edit->text, begin_pos) - - edit->text; + - edit->text; edit->selection_end = g_utf8_offset_to_pointer (edit->text, end_pos) - - edit->text; + - edit->text; _delete_selection (tv); diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 4248666ce6..1acbf7af61 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -329,7 +329,7 @@ e_cell_toggle_class_init (ECellToggleClass *klass) ecc->max_width = etog_max_width; gal_a11y_e_cell_registry_add_cell_type (NULL, - E_CELL_TOGGLE_TYPE, + E_CELL_TOGGLE_TYPE, gal_a11y_e_cell_toggle_new); } diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index cfd9ddde72..9bac6ad9c6 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -79,7 +79,7 @@ ecv_kill_view (ECellView *ecv) gint i; if (vbox_view->cell_view.kill_view_cb) - (vbox_view->cell_view.kill_view_cb)(ecv, vbox_view->cell_view.kill_view_cb_data); + (vbox_view->cell_view.kill_view_cb)(ecv, vbox_view->cell_view.kill_view_cb_data); if (vbox_view->cell_view.kill_view_cb_data) g_list_free(vbox_view->cell_view.kill_view_cb_data); diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c index 1152a42e1a..be674e6374 100644 --- a/widgets/table/e-cell.c +++ b/widgets/table/e-cell.c @@ -16,7 +16,7 @@ * * Authors: * Miguel de Icaza - * Chris Lahey + * Chris Lahey * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h index 614e1ebe0e..79adb5c5b4 100644 --- a/widgets/table/e-cell.h +++ b/widgets/table/e-cell.h @@ -93,13 +93,13 @@ typedef struct { void (*realize) (ECellView *ecell_view); void (*unrealize) (ECellView *ecell_view); - void (*draw) (ECellView *ecell_view, GdkDrawable *drawable, - gint model_col, gint view_col, gint row, - ECellFlags flags, gint x1, gint y1, gint x2, gint y2); - gint (*event) (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions); - void (*focus) (ECellView *ecell_view, gint model_col, gint view_col, - gint row, gint x1, gint y1, gint x2, gint y2); - void (*unfocus) (ECellView *ecell_view); + void (*draw) (ECellView *ecell_view, GdkDrawable *drawable, + gint model_col, gint view_col, gint row, + ECellFlags flags, gint x1, gint y1, gint x2, gint y2); + gint (*event) (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions); + void (*focus) (ECellView *ecell_view, gint model_col, gint view_col, + gint row, gint x1, gint y1, gint x2, gint y2); + void (*unfocus) (ECellView *ecell_view); gint (*height) (ECellView *ecell_view, gint model_col, gint view_col, gint row); void *(*enter_edit) (ECellView *ecell_view, gint model_col, gint view_col, gint row); @@ -108,10 +108,10 @@ typedef struct { void (*load_state) (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context, gpointer save_state); void (*free_state) (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer save_state); void (*print) (ECellView *ecell_view, GtkPrintContext *context, - gint model_col, gint view_col, gint row, - gdouble width, gdouble height); + gint model_col, gint view_col, gint row, + gdouble width, gdouble height); gdouble (*print_height) (ECellView *ecell_view,GtkPrintContext *context, - gint model_col, gint view_col, gint row, gdouble width); + gint model_col, gint view_col, gint row, gdouble width); gint (*max_width) (ECellView *ecell_view, gint model_col, gint view_col); gint (*max_width_by_row) (ECellView *ecell_view, gint model_col, gint view_col, gint row); void (*show_tooltip) (ECellView *ecell_view, gint model_col, gint view_col, gint row, gint col_width, ETableTooltip *tooltip); diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index 10a0ba8223..9b2efc49ee 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -575,7 +575,7 @@ etcta_init (ETableClickToAdd *etcta) /* create its a11y object at this time if accessibility is enabled*/ if (atk_get_root () != NULL) { - a11y = atk_gobject_accessible_for_object (G_OBJECT (etcta)); + a11y = atk_gobject_accessible_for_object (G_OBJECT (etcta)); atk_object_set_name (a11y, _("click to add")); } } diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c index b870967099..7772a2851b 100644 --- a/widgets/table/e-table-example-1.c +++ b/widgets/table/e-table-example-1.c @@ -88,14 +88,14 @@ * (sorting is specified by the "column" argument to the leaf elemnt. */ -#define INITIAL_SPEC " \ - \ - 0 \ - 4 \ - 1 \ - 2 \ - 3 \ - \ +#define INITIAL_SPEC " \ + \ + 0 \ + 4 \ + 1 \ + 2 \ + 3 \ + \ \ " diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c index ca4128590c..295820da23 100644 --- a/widgets/table/e-table-example-2.c +++ b/widgets/table/e-table-example-2.c @@ -89,14 +89,14 @@ The headers will be hard coded, as will be the example data. front. It also sorts by the "Full Name" column (ascending.) Sorting and grouping take the model column as their arguments (sorting is specified by the "column" argument to the leaf elemnt. */ -#define INITIAL_SPEC " \ - \ - 0 \ - 4 \ - 1 \ - 2 \ - 3 \ - \ +#define INITIAL_SPEC " \ + \ + 0 \ + 4 \ + 1 \ + 2 \ + 3 \ + \ \ " diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index d569e8dd9e..909c00ddf7 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -888,7 +888,7 @@ ethi_realize (GnomeCanvasItem *item) gtk_drag_dest_set (GTK_WIDGET (item->canvas), 0, ethi_drop_types, ELEMENTS (ethi_drop_types), GDK_ACTION_MOVE); - g_free(ethi_drop_types[0].target); + g_free(ethi_drop_types[0].target); /* Drop signals */ ethi->drag_motion_id = g_signal_connect (item->canvas, "drag_motion", diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index 8044b73bfc..81adbf15e9 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -241,7 +241,7 @@ e_table_draw_elided_string (GdkDrawable *drawable, GdkGC *gc, GtkWidget *widget, gint x, gint y, PangoLayout *layout, gchar *str, gint max_width, gboolean center) { - gint width; + gint width; gint height; gint index; GSList *lines; diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c index b931f48e20..37a1e3c332 100644 --- a/widgets/table/e-table-header.c +++ b/widgets/table/e-table-header.c @@ -154,7 +154,7 @@ eth_finalize (GObject *object) if (eth->sort_info) { if (eth->sort_info_group_change_id) g_signal_handler_disconnect(G_OBJECT(eth->sort_info), - eth->sort_info_group_change_id); + eth->sort_info_group_change_id); g_object_unref(eth->sort_info); eth->sort_info = NULL; } diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 987b9610b3..ec54f3dcfc 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -245,7 +245,7 @@ eti_editing (ETableItem *eti) inline static GdkColor * eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean selected, gboolean *allocatedp) { - ECellView *ecell_view = eti->cell_views [col]; + ECellView *ecell_view = eti->cell_views [col]; GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(eti)->canvas); GdkColor *background, bg; gchar *color_spec = NULL; @@ -584,11 +584,11 @@ eti_remove_header_model (ETableItem *eti) return; g_signal_handler_disconnect (G_OBJECT (eti->header), - eti->header_structure_change_id); + eti->header_structure_change_id); g_signal_handler_disconnect (G_OBJECT (eti->header), - eti->header_dim_change_id); + eti->header_dim_change_id); g_signal_handler_disconnect (G_OBJECT (eti->header), - eti->header_request_width_id); + eti->header_request_width_id); if (eti->cell_views){ eti_unrealize_cell_views (eti); @@ -1102,7 +1102,7 @@ eti_table_model_no_change (ETableModel *table_model, ETableItem *eti) static void eti_table_model_changed (ETableModel *table_model, ETableItem *eti) { - if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { + if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { eti_unfreeze (eti); return; } @@ -1124,7 +1124,7 @@ eti_table_model_changed (ETableModel *table_model, ETableItem *eti) static void eti_table_model_row_changed (ETableModel *table_model, gint row, ETableItem *eti) { - if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { + if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { eti_unfreeze (eti); return; } @@ -1142,7 +1142,7 @@ eti_table_model_row_changed (ETableModel *table_model, gint row, ETableItem *eti static void eti_table_model_cell_changed (ETableModel *table_model, gint col, gint row, ETableItem *eti) { - if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { + if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { eti_unfreeze (eti); return; } @@ -1160,7 +1160,7 @@ eti_table_model_cell_changed (ETableModel *table_model, gint col, gint row, ETab static void eti_table_model_rows_inserted (ETableModel *table_model, gint row, gint count, ETableItem *eti) { - if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { + if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { eti_unfreeze (eti); return; } @@ -1187,7 +1187,7 @@ eti_table_model_rows_inserted (ETableModel *table_model, gint row, gint count, E static void eti_table_model_rows_deleted (ETableModel *table_model, gint row, gint count, ETableItem *eti) { - if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { + if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) { eti_unfreeze (eti); return; } @@ -1578,8 +1578,8 @@ eti_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *psp static void eti_init (ETableItem *eti) { - eti->motion_row = -1; - eti->motion_col = -1; + eti->motion_row = -1; + eti->motion_col = -1; eti->editing_col = -1; eti->editing_row = -1; eti->height = 0; @@ -1637,7 +1637,7 @@ eti_init (ETableItem *eti) eti->grabbed_row = -1; eti->cursor_on_screen = FALSE; - eti->cursor_x1 = -1; + eti->cursor_x1 = -1; eti->cursor_y1 = -1; eti->cursor_x2 = -1; eti->cursor_y2 = -1; @@ -2626,7 +2626,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) cross->crossing.time = e->motion.time; return_val = eti_e_cell_event (eti, eti->cell_views [eti->motion_col], cross, cross->crossing.time, - view_to_model_col(eti, eti->motion_col), + view_to_model_col(eti, eti->motion_col), eti->motion_col, eti->motion_row, 0); } @@ -2910,7 +2910,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) if (eti->motion_row != -1 && eti->motion_col != -1) return_val = eti_e_cell_event (eti, eti->cell_views [eti->motion_col], e, e->crossing.time, - view_to_model_col(eti, eti->motion_col), + view_to_model_col(eti, eti->motion_col), eti->motion_col, eti->motion_row, 0); eti->motion_row = -1; eti->motion_col = -1; @@ -2952,7 +2952,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) static void eti_style_set (ETableItem *eti, GtkStyle *previous_style) { - if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) + if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) return; if (eti->cell_views_realized) { diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index 0536367c99..f149656fac 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -91,15 +91,15 @@ typedef struct { GdkBitmap *stipple; guint alternating_row_colors:1; - guint horizontal_draw_grid:1; - guint vertical_draw_grid:1; - guint draw_focus:1; - guint uniform_row_height:1; - guint cell_views_realized:1; + guint horizontal_draw_grid:1; + guint vertical_draw_grid:1; + guint draw_focus:1; + guint uniform_row_height:1; + guint cell_views_realized:1; - guint needs_redraw : 1; - guint needs_compute_height : 1; - guint needs_compute_width : 1; + guint needs_redraw : 1; + guint needs_compute_height : 1; + guint needs_compute_width : 1; guint uses_source_model : 1; @@ -124,10 +124,10 @@ typedef struct { gint cursor_x2; gint cursor_y2; - gint drag_col; - gint drag_row; - gint drag_x; - gint drag_y; + gint drag_col; + gint drag_row; + gint drag_x; + gint drag_y; guint drag_state; /* diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c index 82b2d5b37d..c4d5574dbc 100644 --- a/widgets/table/e-table-sorted-variable.c +++ b/widgets/table/e-table-sorted-variable.c @@ -53,7 +53,7 @@ etsv_dispose (GObject *object) if (etsv->sort_info_changed_id) g_signal_handler_disconnect (G_OBJECT (etsv->sort_info), - etsv->sort_info_changed_id); + etsv->sort_info_changed_id); etsv->sort_info_changed_id = 0; if (etsv->sort_idle_id) { diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c index 7eceeb875f..ae9bbbd3eb 100644 --- a/widgets/table/e-table-sorted.c +++ b/widgets/table/e-table-sorted.c @@ -64,7 +64,7 @@ ets_dispose (GObject *object) if (ets->sort_info) { g_signal_handler_disconnect (G_OBJECT (ets->sort_info), - ets->sort_info_changed_id); + ets->sort_info_changed_id); g_object_unref(ets->sort_info); ets->sort_info = NULL; } @@ -199,7 +199,7 @@ ets_proxy_model_cell_changed (ETableSubset *subset, ETableModel *source, gint co static void ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row, gint count) { - ETableModel *etm = E_TABLE_MODEL(etss); + ETableModel *etm = E_TABLE_MODEL(etss); ETableSorted *ets = E_TABLE_SORTED(etss); gint i; gboolean full_change = FALSE; diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c index 8851f31209..4d3148a902 100644 --- a/widgets/table/e-table-sorter.c +++ b/widgets/table/e-table-sorter.c @@ -44,20 +44,20 @@ G_DEFINE_TYPE (ETableSorter, ets, E_SORTER_TYPE) #define INCREMENT_AMOUNT 100 -static void ets_model_changed (ETableModel *etm, ETableSorter *ets); -static void ets_model_row_changed (ETableModel *etm, gint row, ETableSorter *ets); -static void ets_model_cell_changed (ETableModel *etm, gint col, gint row, ETableSorter *ets); -static void ets_model_rows_inserted (ETableModel *etm, gint row, gint count, ETableSorter *ets); -static void ets_model_rows_deleted (ETableModel *etm, gint row, gint count, ETableSorter *ets); -static void ets_sort_info_changed (ETableSortInfo *info, ETableSorter *ets); -static void ets_clean (ETableSorter *ets); -static void ets_sort (ETableSorter *ets); -static void ets_backsort (ETableSorter *ets); - -static gint ets_model_to_sorted (ESorter *sorter, gint row); -static gint ets_sorted_to_model (ESorter *sorter, gint row); -static void ets_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count); -static void ets_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count); +static void ets_model_changed (ETableModel *etm, ETableSorter *ets); +static void ets_model_row_changed (ETableModel *etm, gint row, ETableSorter *ets); +static void ets_model_cell_changed (ETableModel *etm, gint col, gint row, ETableSorter *ets); +static void ets_model_rows_inserted (ETableModel *etm, gint row, gint count, ETableSorter *ets); +static void ets_model_rows_deleted (ETableModel *etm, gint row, gint count, ETableSorter *ets); +static void ets_sort_info_changed (ETableSortInfo *info, ETableSorter *ets); +static void ets_clean (ETableSorter *ets); +static void ets_sort (ETableSorter *ets); +static void ets_backsort (ETableSorter *ets); + +static gint ets_model_to_sorted (ESorter *sorter, gint row); +static gint ets_sorted_to_model (ESorter *sorter, gint row); +static void ets_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count); +static void ets_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count); static gboolean ets_needs_sorting (ESorter *ets); static void @@ -210,7 +210,7 @@ e_table_sorter_new (ETableModel *source, ETableHeader *full_header, ETableSortIn ets->table_model_row_changed_id = g_signal_connect (source, "model_row_changed", G_CALLBACK (ets_model_row_changed), ets); ets->table_model_cell_changed_id = g_signal_connect (source, "model_cell_changed", - G_CALLBACK (ets_model_cell_changed), ets); + G_CALLBACK (ets_model_cell_changed), ets); ets->table_model_rows_inserted_id = g_signal_connect (source, "model_rows_inserted", G_CALLBACK (ets_model_rows_inserted), ets); ets->table_model_rows_deleted_id = g_signal_connect (source, "model_rows_deleted", diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c index fd57f5b130..e7acd90f34 100644 --- a/widgets/table/e-table-specification.c +++ b/widgets/table/e-table-specification.c @@ -217,7 +217,7 @@ e_table_specification_load_from_node (ETableSpecification *specification, temp = e_xml_get_string_prop_by_name (node, (const guchar *)"cursor-mode"); if (temp && !g_ascii_strcasecmp (temp, "line")) { specification->cursor_mode = E_CURSOR_LINE; - } else if (temp && !g_ascii_strcasecmp (temp, "spreadsheet")) { + } else if (temp && !g_ascii_strcasecmp (temp, "spreadsheet")) { specification->cursor_mode = E_CURSOR_SPREADSHEET; } g_free (temp); diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index 6b856274a4..fc7cb101ec 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -262,9 +262,9 @@ e_table_without_construct (ETableWithout *etw, E_TABLE_SUBSET(etw)->n_map = 0; etw->priv->hash_func = hash_func; - etw->priv->compare_func = compare_func; - etw->priv->get_key_func = get_key_func; - etw->priv->duplicate_key_func = duplicate_key_func; + etw->priv->compare_func = compare_func; + etw->priv->get_key_func = get_key_func; + etw->priv->duplicate_key_func = duplicate_key_func; etw->priv->free_gotten_key_func = free_gotten_key_func; etw->priv->free_duplicated_key_func = free_duplicated_key_func; etw->priv->closure = closure; diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 1c86a4415c..29eb9ac481 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -168,19 +168,19 @@ et_disconnect_model (ETable *et) if (et->table_model_change_id != 0) g_signal_handler_disconnect (G_OBJECT (et->model), - et->table_model_change_id); + et->table_model_change_id); if (et->table_row_change_id != 0) g_signal_handler_disconnect (G_OBJECT (et->model), - et->table_row_change_id); + et->table_row_change_id); if (et->table_cell_change_id != 0) g_signal_handler_disconnect (G_OBJECT (et->model), - et->table_cell_change_id); + et->table_cell_change_id); if (et->table_rows_inserted_id != 0) g_signal_handler_disconnect (G_OBJECT (et->model), - et->table_rows_inserted_id); + et->table_rows_inserted_id); if (et->table_rows_deleted_id != 0) g_signal_handler_disconnect (G_OBJECT (et->model), - et->table_rows_deleted_id); + et->table_rows_deleted_id); et->table_model_change_id = 0; et->table_row_change_id = 0; @@ -307,23 +307,23 @@ et_dispose (GObject *object) if (et->search) { if (et->search_search_id) g_signal_handler_disconnect (G_OBJECT (et->search), - et->search_search_id); + et->search_search_id); if (et->search_accept_id) g_signal_handler_disconnect (G_OBJECT (et->search), - et->search_accept_id); + et->search_accept_id); g_object_unref (et->search); et->search = NULL; } if (et->group_info_change_id) { g_signal_handler_disconnect (G_OBJECT (et->sort_info), - et->group_info_change_id); + et->group_info_change_id); et->group_info_change_id = 0; } if (et->sort_info_change_id) { g_signal_handler_disconnect (G_OBJECT (et->sort_info), - et->sort_info_change_id); + et->sort_info_change_id); et->sort_info_change_id = 0; } @@ -1115,7 +1115,7 @@ table_canvas_focus_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer d gnome_canvas_item_grab_focus (etable->canvas_vbox); gnome_canvas_item_grab_focus (etable->click_to_add); } else if (!canvas->focused_item && etable->group) { - focus_first_etable_item (etable->group); + focus_first_etable_item (etable->group); } else if (canvas->focused_item) { ESelectionModel *selection = (ESelectionModel *)etable->selection; @@ -2454,7 +2454,7 @@ struct _ETableDragSourceSite GdkModifierType start_button_mask; GtkTargetList *target_list; /* Targets for drag data */ GdkDragAction actions; /* Possible actions */ - GdkColormap *colormap; /* Colormap for drag icon */ + GdkColormap *colormap; /* Colormap for drag icon */ GdkPixmap *pixmap; /* Icon for drag data */ GdkBitmap *mask; @@ -2795,8 +2795,8 @@ e_table_drag_source_unset (ETable *table) **/ GdkDragContext * e_table_drag_begin (ETable *table, - gint row, - gint col, + gint row, + gint col, GtkTargetList *targets, GdkDragAction actions, gint button, diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index 7d3d0ff8cb..bb82ef1613 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -77,8 +77,8 @@ typedef struct { ETableCol *current_search_col; - guint search_search_id; - guint search_accept_id; + guint search_search_id; + guint search_accept_id; gint table_model_change_id; gint table_row_change_id; @@ -174,11 +174,11 @@ typedef struct { GtkAdjustment *vadjustment); /* Source side drag signals */ - void (* table_drag_begin) (ETable *table, + void (* table_drag_begin) (ETable *table, gint row, gint col, GdkDragContext *context); - void (* table_drag_end) (ETable *table, + void (* table_drag_end) (ETable *table, gint row, gint col, GdkDragContext *context); @@ -195,7 +195,7 @@ typedef struct { GdkDragContext *context); /* Target side drag signals */ - void (* table_drag_leave) (ETable *table, + void (* table_drag_leave) (ETable *table, gint row, gint col, GdkDragContext *context, diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c index 25175c9797..562a47386c 100644 --- a/widgets/table/e-tree-memory-callbacks.c +++ b/widgets/table/e-tree-memory-callbacks.c @@ -277,7 +277,7 @@ e_tree_memory_callbacks_new (ETreeMemoryCallbacksIconAtFn icon_at, etmc->has_get_node_by_id = has_get_node_by_id; etmc->get_node_by_id = get_node_by_id; - etmc->sort_value_at = sort_value_at; + etmc->sort_value_at = sort_value_at; etmc->value_at = value_at; etmc->set_value_at = set_value_at; etmc->is_editable = is_editable; diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index 728392f7b0..54bd7b77f5 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -274,7 +274,7 @@ etmm_get_prev (ETreeModel *etm, ETreePath node) static gboolean etmm_is_root (ETreeModel *etm, ETreePath node) { - ETreeMemoryPath *path = node; + ETreeMemoryPath *path = node; return e_tree_memory_path_depth (path) == 0; } diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index 9482fe9789..143ad61629 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -180,7 +180,7 @@ e_tree_model_class_init (ETreeModelClass *klass) klass->has_change_pending = NULL; - klass->sort_value_at = NULL; + klass->sort_value_at = NULL; klass->value_at = NULL; klass->set_value_at = NULL; klass->is_editable = NULL; @@ -193,7 +193,7 @@ e_tree_model_class_init (ETreeModelClass *klass) klass->pre_change = NULL; klass->no_change = NULL; - klass->rebuilt = NULL; + klass->rebuilt = NULL; klass->node_changed = NULL; klass->node_data_changed = NULL; klass->node_col_changed = NULL; diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 68316f72bb..3bb4375b4d 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -241,21 +241,21 @@ drop_model(ETreeSelectionModel *etsm) return; g_signal_handler_disconnect (G_OBJECT (priv->model), - priv->tree_model_pre_change_id); + priv->tree_model_pre_change_id); g_signal_handler_disconnect (G_OBJECT (priv->model), - priv->tree_model_no_change_id); + priv->tree_model_no_change_id); g_signal_handler_disconnect (G_OBJECT (priv->model), - priv->tree_model_node_changed_id); + priv->tree_model_node_changed_id); g_signal_handler_disconnect (G_OBJECT (priv->model), - priv->tree_model_node_data_changed_id); + priv->tree_model_node_data_changed_id); g_signal_handler_disconnect (G_OBJECT (priv->model), - priv->tree_model_node_col_changed_id); + priv->tree_model_node_col_changed_id); g_signal_handler_disconnect (G_OBJECT (priv->model), - priv->tree_model_node_inserted_id); + priv->tree_model_node_inserted_id); g_signal_handler_disconnect (G_OBJECT (priv->model), - priv->tree_model_node_removed_id); + priv->tree_model_node_removed_id); g_signal_handler_disconnect (G_OBJECT (priv->model), - priv->tree_model_node_deleted_id); + priv->tree_model_node_deleted_id); g_object_unref (priv->model); priv->model = NULL; diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c index 2704b7ea24..b71f108a7d 100644 --- a/widgets/table/e-tree-simple.c +++ b/widgets/table/e-tree-simple.c @@ -182,12 +182,12 @@ e_tree_simple_new (ETableSimpleColumnCountFn col_count, ETableSimpleValueIsEmptyFn value_is_empty, ETableSimpleValueToStringFn value_to_string, - ETreeSimpleIconAtFn icon_at, - ETreeSimpleValueAtFn value_at, - ETreeSimpleSetValueAtFn set_value_at, - ETreeSimpleIsEditableFn is_editable, + ETreeSimpleIconAtFn icon_at, + ETreeSimpleValueAtFn value_at, + ETreeSimpleSetValueAtFn set_value_at, + ETreeSimpleIsEditableFn is_editable, - gpointer model_data) + gpointer model_data) { ETreeSimple *etg = g_object_new (E_TREE_SIMPLE_TYPE, NULL); diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c index 0bc82506e8..d9901e611b 100644 --- a/widgets/table/e-tree-sorted-variable.c +++ b/widgets/table/e-tree-sorted-variable.c @@ -63,7 +63,7 @@ etsv_dispose (GObject *object) if (etsv->table_model_changed_id) g_signal_handler_disconnect (G_OBJECT (etss->source), - etsv->table_model_changed_id); + etsv->table_model_changed_id); etsv->table_model_changed_id = 0; #if 0 @@ -77,7 +77,7 @@ etsv_dispose (GObject *object) #endif if (etsv->sort_info_changed_id) g_signal_handler_disconnect (etsv->sort_info, - etsv->sort_info_changed_id); + etsv->sort_info_changed_id); etsv->sort_info_changed_id = 0; if (etsv->sort_idle_id) diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index 3ec12c8360..c72c269471 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -593,23 +593,23 @@ ets_dispose (GObject *object) if (priv->source) { g_signal_handler_disconnect (G_OBJECT (priv->source), - priv->tree_model_pre_change_id); + priv->tree_model_pre_change_id); g_signal_handler_disconnect (G_OBJECT (priv->source), - priv->tree_model_no_change_id); + priv->tree_model_no_change_id); g_signal_handler_disconnect (G_OBJECT (priv->source), - priv->tree_model_node_changed_id); + priv->tree_model_node_changed_id); g_signal_handler_disconnect (G_OBJECT (priv->source), - priv->tree_model_node_data_changed_id); + priv->tree_model_node_data_changed_id); g_signal_handler_disconnect (G_OBJECT (priv->source), - priv->tree_model_node_col_changed_id); + priv->tree_model_node_col_changed_id); g_signal_handler_disconnect (G_OBJECT (priv->source), - priv->tree_model_node_inserted_id); + priv->tree_model_node_inserted_id); g_signal_handler_disconnect (G_OBJECT (priv->source), - priv->tree_model_node_removed_id); + priv->tree_model_node_removed_id); g_signal_handler_disconnect (G_OBJECT (priv->source), - priv->tree_model_node_deleted_id); + priv->tree_model_node_deleted_id); g_signal_handler_disconnect (G_OBJECT (priv->source), - priv->tree_model_node_request_collapse_id); + priv->tree_model_node_request_collapse_id); g_object_unref (priv->source); priv->source = NULL; @@ -627,7 +627,7 @@ ets_dispose (GObject *object) if (priv->sort_info) { g_signal_handler_disconnect (G_OBJECT (priv->sort_info), - priv->sort_info_changed_id); + priv->sort_info_changed_id); priv->sort_info_changed_id = 0; g_object_unref (priv->sort_info); @@ -746,7 +746,7 @@ ets_get_prev (ETreeModel *etm, ETreePath node) static gboolean ets_is_root (ETreeModel *etm, ETreePath node) { - ETreeSortedPath *path = node; + ETreeSortedPath *path = node; ETreeSorted *ets = E_TREE_SORTED(etm); return e_tree_model_node_is_root (ets->priv->source, path->corresponding); @@ -755,7 +755,7 @@ ets_is_root (ETreeModel *etm, ETreePath node) static gboolean ets_is_expandable (ETreeModel *etm, ETreePath node) { - ETreeSortedPath *path = node; + ETreeSortedPath *path = node; ETreeSorted *ets = E_TREE_SORTED(etm); gboolean expandable = e_tree_model_node_is_expandable (ets->priv->source, path->corresponding); diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 2018ea59bb..cac1260681 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -60,8 +60,8 @@ struct ETreeTableAdapterPriv { ETableSortInfo *sort_info; ETableHeader *header; - gint n_map; - gint n_vals_allocated; + gint n_map; + gint n_vals_allocated; node_t **map_table; GHashTable *nodes; GNode *root; @@ -864,7 +864,7 @@ e_tree_table_adapter_construct (ETreeTableAdapter *etta, ETreeModel *source, ETa if (sort_info) { g_object_ref(sort_info); etta->priv->sort_info_changed_id = g_signal_connect (G_OBJECT (sort_info), "sort_info_changed", - G_CALLBACK (etta_sort_info_changed), etta); + G_CALLBACK (etta_sort_info_changed), etta); } etta->priv->header = header; @@ -1247,7 +1247,7 @@ e_tree_table_adapter_set_sort_info (ETreeTableAdapter *etta, ETableSortInfo *sor { if (etta->priv->sort_info) { g_signal_handler_disconnect(G_OBJECT(etta->priv->sort_info), - etta->priv->sort_info_changed_id); + etta->priv->sort_info_changed_id); g_object_unref(etta->priv->sort_info); } @@ -1255,7 +1255,7 @@ e_tree_table_adapter_set_sort_info (ETreeTableAdapter *etta, ETableSortInfo *sor if (sort_info) { g_object_ref(sort_info); etta->priv->sort_info_changed_id = g_signal_connect(G_OBJECT(sort_info), "sort_info_changed", - G_CALLBACK(etta_sort_info_changed), etta); + G_CALLBACK(etta_sort_info_changed), etta); } if (!etta->priv->root) diff --git a/widgets/table/e-tree-table-adapter.h b/widgets/table/e-tree-table-adapter.h index 6a0f67bca8..596a3def1f 100644 --- a/widgets/table/e-tree-table-adapter.h +++ b/widgets/table/e-tree-table-adapter.h @@ -58,7 +58,7 @@ ETableModel *e_tree_table_adapter_new (ETreeModel ETableHeader *header); ETableModel *e_tree_table_adapter_construct (ETreeTableAdapter *ets, ETreeModel *source, - ETableSortInfo *sort_info, + ETableSortInfo *sort_info, ETableHeader *header); ETreePath e_tree_table_adapter_node_get_next (ETreeTableAdapter *etta, diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 725654b90e..6e9b2f8d90 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -127,8 +127,8 @@ struct ETreePriv { ETableCol *current_search_col; - guint search_search_id; - guint search_accept_id; + guint search_search_id; + guint search_accept_id; gint reflow_idle_id; gint scroll_idle_id; @@ -251,16 +251,16 @@ et_disconnect_from_etta (ETree *et) { if (et->priv->table_model_change_id != 0) g_signal_handler_disconnect (G_OBJECT (et->priv->etta), - et->priv->table_model_change_id); + et->priv->table_model_change_id); if (et->priv->table_row_change_id != 0) g_signal_handler_disconnect (G_OBJECT (et->priv->etta), - et->priv->table_row_change_id); + et->priv->table_row_change_id); if (et->priv->table_cell_change_id != 0) g_signal_handler_disconnect (G_OBJECT (et->priv->etta), - et->priv->table_cell_change_id); + et->priv->table_cell_change_id); if (et->priv->table_rows_delete_id != 0) g_signal_handler_disconnect (G_OBJECT (et->priv->etta), - et->priv->table_rows_delete_id); + et->priv->table_rows_delete_id); et->priv->table_model_change_id = 0; et->priv->table_row_change_id = 0; @@ -316,17 +316,17 @@ disconnect_header (ETree *e_tree) if (e_tree->priv->structure_change_id) g_signal_handler_disconnect (G_OBJECT (e_tree->priv->header), - e_tree->priv->structure_change_id); + e_tree->priv->structure_change_id); if (e_tree->priv->expansion_change_id) g_signal_handler_disconnect (G_OBJECT (e_tree->priv->header), - e_tree->priv->expansion_change_id); + e_tree->priv->expansion_change_id); if (e_tree->priv->sort_info) { if (e_tree->priv->sort_info_change_id) g_signal_handler_disconnect (G_OBJECT (e_tree->priv->sort_info), - e_tree->priv->sort_info_change_id); + e_tree->priv->sort_info_change_id); if (e_tree->priv->group_info_change_id) g_signal_handler_disconnect (G_OBJECT (e_tree->priv->sort_info), - e_tree->priv->group_info_change_id); + e_tree->priv->group_info_change_id); g_object_unref(e_tree->priv->sort_info); } @@ -793,7 +793,7 @@ tree_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, &row, &col, &x, &y, &w, &h); } - if (y < adj->value || y + h > adj->value + adj->page_size) + if (y < adj->value || y + h > adj->value + adj->page_size) gtk_adjustment_set_value(adj, CLAMP(y - adj->page_size / 2, adj->lower, adj->upper - adj->page_size)); } @@ -2254,7 +2254,7 @@ struct _ETreeDragSourceSite GdkModifierType start_button_mask; GtkTargetList *target_list; /* Targets for drag data */ GdkDragAction actions; /* Possible actions */ - GdkColormap *colormap; /* Colormap for drag icon */ + GdkColormap *colormap; /* Colormap for drag icon */ GdkPixmap *pixmap; /* Icon for drag data */ GdkBitmap *mask; @@ -2545,8 +2545,8 @@ e_tree_drag_source_unset (ETree *tree) GdkDragContext * e_tree_drag_begin (ETree *tree, - gint row, - gint col, + gint row, + gint col, GtkTargetList *targets, GdkDragAction actions, gint button, @@ -2900,7 +2900,7 @@ static void context_connect (ETree *et, GdkDragContext *context) { if (context == et->priv->last_drop_context) - return; + return; if (et->priv->last_drop_context) g_object_weak_unref (G_OBJECT(et->priv->last_drop_context), context_destroyed, et); diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h index 6bcc21706e..b74615662f 100644 --- a/widgets/table/e-tree.h +++ b/widgets/table/e-tree.h @@ -76,12 +76,12 @@ typedef struct { GtkAdjustment *vadjustment); /* Source side drag signals */ - void (* tree_drag_begin) (ETree *tree, + void (* tree_drag_begin) (ETree *tree, gint row, ETreePath path, gint col, GdkDragContext *context); - void (* tree_drag_end) (ETree *tree, + void (* tree_drag_end) (ETree *tree, gint row, ETreePath path, gint col, @@ -101,7 +101,7 @@ typedef struct { GdkDragContext *context); /* Target side drag signals */ - void (* tree_drag_leave) (ETree *tree, + void (* tree_drag_leave) (ETree *tree, gint row, ETreePath path, gint col, diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index c4d3dbef34..b63771500a 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -436,8 +436,8 @@ reset_layout (EText *text) pango_font_description_get_family ((GTK_WIDGET (item->canvas))->style->font_desc)); pango_layout_set_font_description (text->layout, text->font_desc); - pango_layout_set_text (text->layout, text->text, -1); - reset_layout_attrs (text); + pango_layout_set_text (text->layout, text->text, -1); + reset_layout_attrs (text); } if (!text->button_down) { @@ -2226,7 +2226,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) * Here when a new text widget comes into focus we can disconnect the * old one.Shouldn't hurt much, as in worst case, save_text which should * be disconnected will be overwritten and we will have signal - * handlers connect to multiple e-texts but with subsequent commit these + * handlers connect to multiple e-texts but with subsequent commit these * should go away. */ @@ -2753,7 +2753,7 @@ popup_targets_received (GtkClipboard *clipboard, /* If invoked by S-F10 key binding, button will be 0. */ if (button->button == 0){ - gtk_menu_popup (GTK_MENU (popup_menu), NULL, NULL, + gtk_menu_popup (GTK_MENU (popup_menu), NULL, NULL, popup_menu_placement_cb, (gpointer)text, button->button, GDK_CURRENT_TIME); } else { @@ -3911,15 +3911,15 @@ e_text_preedit_changed_cb (GtkIMContext *context, EText *etext) { gchar *preedit_string = NULL; - gint cursor_pos; + gint cursor_pos; gtk_im_context_get_preedit_string (context, &preedit_string, NULL, &cursor_pos); - cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); + cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); etext->preedit_len = strlen (preedit_string); - etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string; - g_free (preedit_string); + etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string; + g_free (preedit_string); g_signal_emit (etext, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0); } @@ -3943,7 +3943,7 @@ e_text_delete_surrounding_cb (GtkIMContext *context, EText *text) { e_text_model_delete (text->model, - MIN (text->selection_start, text->selection_end) + offset, + MIN (text->selection_start, text->selection_end) + offset, n_chars); return TRUE; diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index f9b838aae3..5f6904b14a 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -109,8 +109,8 @@ struct _EText { gint model_repos_signal_id; const gchar *text; /* Text to display --- from the ETextModel */ - gint preedit_len; /* preedit length to display */ - gint preedit_pos; /* preedit cursor position */ + gint preedit_len; /* preedit length to display */ + gint preedit_pos; /* preedit cursor position */ PangoLayout *layout; gint num_lines; /* Number of lines of text */ @@ -124,7 +124,7 @@ struct _EText { double xofs, yofs; /* Text offset distance from anchor position */ - GdkColor color; /* Fill color */ + GdkColor color; /* Fill color */ GdkBitmap *stipple; /* Stipple for text */ GdkGC *gc; /* GC for drawing text */ -- cgit v1.2.3 From 8a7316508eb8e35980009ded5338a50b7f35b723 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 28 May 2009 14:21:47 -0400 Subject: =?UTF-8?q?Bug=20583991=20=E2=80=93=20"Suggest=20automatic=20displ?= =?UTF-8?q?ay=20of=20attachment"=20does=20not=20work?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- widgets/misc/e-attachment-store.c | 1 + 1 file changed, 1 insertion(+) diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c index 2977be9593..baa1ef6c7f 100644 --- a/widgets/misc/e-attachment-store.c +++ b/widgets/misc/e-attachment-store.c @@ -569,6 +569,7 @@ e_attachment_store_run_load_dialog (EAttachmentStore *store, attachment = e_attachment_new (); e_attachment_set_file (attachment, file); + e_attachment_set_disposition (attachment, disposition); e_attachment_store_add_attachment (store, attachment); e_attachment_load_async ( attachment, (GAsyncReadyCallback) -- cgit v1.2.3 From 2a62fc778c898effc4d76f1380691ac574092bdb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 28 May 2009 14:43:41 -0400 Subject: Fix whitespace errors in mail/Makefile.am --- mail/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mail/Makefile.am b/mail/Makefile.am index e1b0da9475..edae1da8cb 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -66,7 +66,7 @@ mailinclude_HEADERS = \ em-filter-editor.h \ em-filter-folder-element.h \ em-filter-rule.h \ - em-filter-source-element.h \ + em-filter-source-element.h \ em-folder-browser.h \ em-folder-tree-model.h \ em-folder-tree.h \ @@ -149,7 +149,7 @@ endif libevolution_mail_la_LIBADD = \ - $(top_builddir)/mail/libevolution-mail-shared.la \ + $(top_builddir)/mail/libevolution-mail-shared.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/widgets/table/libetable.la \ @@ -181,7 +181,7 @@ libevolution_mail_shared_la_SOURCES = \ em-event.c \ em-config.c \ em-composer-utils.c \ - em-composer-utils.h \ + em-composer-utils.h \ em-filter-context.c \ em-filter-context.h \ em-filter-editor.c \ -- cgit v1.2.3 From b7d79d3a852746058de93dd0af9b2c13969d55c0 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Thu, 28 May 2009 23:39:37 +0300 Subject: =?UTF-8?q?Bug=20584154=20=E2=80=93=20custom=20icon=20folder=20hoo?= =?UTF-8?q?k=20does=20not=20work?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mail/em-event.c | 5 +++-- mail/em-event.h | 5 +++-- mail/em-folder-tree-model.c | 5 +++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mail/em-event.c b/mail/em-event.c index 852e319e1b..b1bf7a7d05 100644 --- a/mail/em-event.c +++ b/mail/em-event.c @@ -199,11 +199,12 @@ em_event_target_new_send_receive(EMEvent *eme, GtkWidget *table, gpointer data, } EMEventTargetCustomIcon * -em_event_target_new_custom_icon(EMEvent *eme, GtkCellRenderer *renderer, const gchar *folder_name, guint32 flags) +em_event_target_new_custom_icon(EMEvent *eme, GtkTreeStore *store, GtkTreeIter *iter, const gchar *folder_name, guint32 flags) { EMEventTargetCustomIcon *t = e_event_target_new(&eme->popup, EM_EVENT_TARGET_CUSTOM_ICON, sizeof(*t)); - t->renderer = renderer; + t->store = store; + t->iter = iter; t->folder_name = folder_name; t->target.mask = ~flags; diff --git a/mail/em-event.h b/mail/em-event.h index 0af32086cf..5dc11bd910 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -133,7 +133,8 @@ typedef struct _EMEventTargetCustomIcon EMEventTargetCustomIcon; struct _EMEventTargetCustomIcon { EEventTarget target; - GtkCellRenderer *renderer; + GtkTreeStore *store; + GtkTreeIter *iter; const gchar *folder_name; }; @@ -159,7 +160,7 @@ EMEventTargetFolderBrowser *em_event_target_new_folder_browser (EMEvent *eme, EM EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const struct _EMsgComposer *composer, guint32 flags); EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, struct _CamelFolder *folder, struct _CamelMimeMessage *message, const gchar *uid, guint32 flags); EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, struct _GtkWidget *table, gpointer data, gint row, guint32 flags); -EMEventTargetCustomIcon * em_event_target_new_custom_icon(EMEvent *eme, GtkCellRenderer *renderer, const gchar *uri, guint32 flags); +EMEventTargetCustomIcon * em_event_target_new_custom_icon(EMEvent *eme, GtkTreeStore *store, GtkTreeIter *iter, const gchar *uri, guint32 flags); /* ********************************************************************** */ diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 2fedce05b3..a12b453e53 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -55,6 +55,7 @@ #include "em-utils.h" #include "em-folder-utils.h" +#include "em-event.h" #include #include @@ -453,6 +454,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite const gchar *name; const gchar *icon_name; guint32 flags; + EMEventTargetCustomIcon *target; /* make sure we don't already know about it? */ if (g_hash_table_lookup (si->full_hash, fi->full_name)) @@ -540,6 +542,9 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite COL_BOOL_LOAD_SUBDIRS, load, -1); + target = em_event_target_new_custom_icon (em_event_peek(), tree_store, iter, fi->full_name, EM_EVENT_CUSTOM_ICON); + e_event_emit ((EEvent *)em_event_peek (), "folder.customicon", (EEventTarget *) target); + if (unread != ~0) gtk_tree_store_set (tree_store, iter, COL_UINT_UNREAD, unread, -1); -- cgit v1.2.3 From 77fe50d5c183dee35845c23586d74d27402c17da Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Thu, 28 May 2009 23:47:03 +0300 Subject: =?UTF-8?q?Bug=20583446=20=E2=80=93=20refresh=20folder=20hook?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mail/em-folder-browser.c | 6 +++++- mail/em-folder-tree.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index b0481d46d5..3c2d223307 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -1596,8 +1596,12 @@ emfb_folder_refresh(BonoboUIComponent *uid, gpointer data, const gchar *path) EMFolderTree *tree = g_object_get_data (G_OBJECT (emfb), "foldertree"); CamelFolder *folder; - if ((folder = em_folder_tree_get_selected_folder (tree)) != NULL) + if ((folder = em_folder_tree_get_selected_folder (tree)) != NULL) { + EMEvent *e = em_event_peek(); + EMEventTargetFolder *t = em_event_target_new_folder(e, folder->full_name, 0); + e_event_emit((EEvent *)e, "folder.refresh", (EEventTarget *)t); mail_refresh_folder(folder, NULL, NULL); + } } diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index b62702bbd7..a7b56e7fcb 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1982,8 +1982,12 @@ emft_popup_refresh_folder (EPopup *ep, EPopupItem *pitem, gpointer data) EMFolderTree *emft = data; CamelFolder *folder; - if ((folder = em_folder_tree_get_selected_folder (emft)) != NULL) + if ((folder = em_folder_tree_get_selected_folder (emft)) != NULL) { + EMEvent *e = em_event_peek(); + EMEventTargetFolder *t = em_event_target_new_folder(e, folder->full_name, 0); + e_event_emit((EEvent *)e, "folder.refresh", (EEventTarget *)t); mail_refresh_folder(folder, NULL, NULL); + } } static void -- cgit v1.2.3 From 4ba25a3b6d1fe600caa930661cbcaaf7cd342e72 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 29 May 2009 15:06:43 -0400 Subject: Fix libevolution-mail-shared.la The shared library was being built as a libtool module instead of a normal libtool library, and was installed to the wrong directory. Fixing this created further automake-related problems which I had to hack around (see BIG NASTY AUTOMAKE HACK in the patch). This is NOT a permanent solution. A better approach is to split the source code into separate directories, like we do in all the other components. --- mail/Makefile.am | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/mail/Makefile.am b/mail/Makefile.am index edae1da8cb..8fbac19ce0 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -30,9 +30,8 @@ INCLUDES = \ -DPREFIX=\""$(prefix)"\" \ -DG_LOG_DOMAIN=\"evolution-mail\" -component_LTLIBRARIES = libevolution-mail-shared.la \ - libevolution-mail.la - +privsolib_LTLIBRARIES = libevolution-mail-shared.la +component_LTLIBRARIES = libevolution-mail.la # Mail.idl MAIL_IDL = Evolution-Mail.idl @@ -147,7 +146,6 @@ SMIME_LIBS = \ $(top_builddir)/smime/gui/libevolution-smime.la endif - libevolution_mail_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail-shared.la \ $(top_builddir)/e-util/libeutil.la \ @@ -171,11 +169,11 @@ libevolution_mail_la_LIBADD = \ libevolution_mail_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) -libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h - -# .server files +libevolution_mail_la_DEPENDENCIES = \ + em-filter-i18n.h \ + libevolution-mail-shared.la -libevolution_mail_shared_la_SOURCES = \ +libevolution_mail_shared_la_SOURCES = \ em-account-editor.c \ em-account-editor.h \ em-event.c \ @@ -237,12 +235,7 @@ libevolution_mail_shared_la_SOURCES = \ message-tag-followup.c \ message-tag-followup.h - - - - - -libevolution_mail_shared_la_LIBADD = \ +libevolution_mail_shared_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/composer/libcomposer.la \ @@ -251,10 +244,29 @@ libevolution_mail_shared_la_LIBADD = \ $(SMIME_LIBS) \ $(THREADS_LIBS) -libevolution_mail_shared_la_LDFLAGS = \ - -avoid-version -module $(NO_UNDEFINED) - +libevolution_mail_shared_la_LDFLAGS = $(NO_UNDEFINED) + +# --- BIG NASTY AUTOMAKE HACK --- +# +# Automake apparently sorts Makefile.am rules alphabetically. And +# since component_LTLIBRARIES < privsolib_LTLIBRARIES, it tries to +# install libevolution-mail.la before libevolution-mail-shared.la, +# which fails when libtool tries to relink libevolution-mail.la +# against the not-yet-installed libevolution-mail-shared.la. +install-data-am: \ + install-privsolibLTLIBRARIES \ + install-componentLTLIBRARIES \ + install-data-local \ + install-errorDATA \ + install-etspecDATA \ + install-filterDATA \ + install-gladeDATA \ + install-idlDATA \ + install-mailincludeHEADERS \ + install-schemaDATA \ + install-serverDATA +# .server files server_in_files = GNOME_Evolution_Mail.server.in.in server_DATA = $(server_in_files:.server.in.in=.server) -- cgit v1.2.3 From e561ea06160c52cca3cf54edabb333dd360ee11e Mon Sep 17 00:00:00 2001 From: "Ask H. Larsen" Date: Sat, 30 May 2009 18:12:06 +0200 Subject: Updated Danish translation --- po/da.po | 36453 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 18361 insertions(+), 18092 deletions(-) diff --git a/po/da.po b/po/da.po index c5e5e682ed..56f90d9541 100644 --- a/po/da.po +++ b/po/da.po @@ -46,13 +46,13 @@ # # Husk at tilføje dig i credit-listen (besked id "translator-credits") # -#: ../shell/main.c:603 +#: ../shell/main.c:605 msgid "" msgstr "" "Project-Id-Version: evolution.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-15 00:17+0100\n" -"PO-Revision-Date: 2009-02-15 00:12+0100\n" +"POT-Creation-Date: 2009-05-30 18:12+0200\n" +"PO-Revision-Date: 2009-05-15 00:25+0200\n" "Last-Translator: Kenneth Nielsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -68,12 +68,12 @@ msgid "evolution address book" msgstr "evolution-adressebog" #: ../a11y/addressbook/ea-minicard-view.c:33 -#: ../addressbook/gui/component/addressbook-component.c:237 +#: ../addressbook/gui/component/addressbook-component.c:208 msgid "New Contact" msgstr "Ny kontaktperson" #: ../a11y/addressbook/ea-minicard-view.c:34 -#: ../addressbook/gui/component/addressbook-component.c:245 +#: ../addressbook/gui/component/addressbook-component.c:216 msgid "New Contact List" msgstr "Ny kontaktliste" @@ -100,32 +100,32 @@ msgstr "Kontaktperson: " msgid "evolution minicard" msgstr "evolution minivisitkort" -#: ../a11y/calendar/ea-cal-view-event.c:265 +#: ../a11y/calendar/ea-cal-view-event.c:268 msgid "It has alarms." msgstr "Den har påmindelser." -#: ../a11y/calendar/ea-cal-view-event.c:268 +#: ../a11y/calendar/ea-cal-view-event.c:271 msgid "It has recurrences." msgstr "Den er tilbagevendende." -#: ../a11y/calendar/ea-cal-view-event.c:271 +#: ../a11y/calendar/ea-cal-view-event.c:274 msgid "It is a meeting." msgstr "Det er et møde." -#: ../a11y/calendar/ea-cal-view-event.c:277 +#: ../a11y/calendar/ea-cal-view-event.c:280 #, c-format msgid "Calendar Event: Summary is %s." msgstr "Kalenderbegivenhed: Sammendrag er %s." -#: ../a11y/calendar/ea-cal-view-event.c:279 +#: ../a11y/calendar/ea-cal-view-event.c:282 msgid "Calendar Event: It has no summary." msgstr "Kalenderbegivenhed: Den har intet sammendrag." -#: ../a11y/calendar/ea-cal-view-event.c:299 +#: ../a11y/calendar/ea-cal-view-event.c:302 msgid "calendar view event" msgstr "begivenhed i kalenderoversigt" -#: ../a11y/calendar/ea-cal-view-event.c:527 +#: ../a11y/calendar/ea-cal-view-event.c:530 msgid "Grab Focus" msgstr "Tag fokus" @@ -194,7 +194,7 @@ msgid "calendar view for one or more days" msgstr "kalenderoversigt for en eller flere dage" #: ../a11y/calendar/ea-gnome-calendar.c:186 -#: ../calendar/gui/calendar-component.c:821 +#: ../calendar/gui/calendar-component.c:772 msgid "%A %d %b %Y" msgstr "%A, %d. %b %Y" @@ -205,8 +205,8 @@ msgstr "%A, %d. %b %Y" #. You can change the order but don't change the #. specifiers or add anything. #: ../a11y/calendar/ea-gnome-calendar.c:189 -#: ../calendar/gui/calendar-component.c:824 -#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599 +#: ../calendar/gui/calendar-component.c:775 +#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1598 #: ../calendar/gui/e-week-view-main-item.c:335 msgid "%a %d %b" msgstr "%a %d. %b" @@ -214,9 +214,9 @@ msgstr "%a %d. %b" #: ../a11y/calendar/ea-gnome-calendar.c:191 #: ../a11y/calendar/ea-gnome-calendar.c:196 #: ../a11y/calendar/ea-gnome-calendar.c:198 -#: ../calendar/gui/calendar-component.c:826 -#: ../calendar/gui/calendar-component.c:831 -#: ../calendar/gui/calendar-component.c:833 +#: ../calendar/gui/calendar-component.c:777 +#: ../calendar/gui/calendar-component.c:782 +#: ../calendar/gui/calendar-component.c:784 msgid "%a %d %b %Y" msgstr "%a, %d. %b %Y" @@ -224,10 +224,10 @@ msgstr "%a, %d. %b %Y" #: ../a11y/calendar/ea-gnome-calendar.c:221 #: ../a11y/calendar/ea-gnome-calendar.c:227 #: ../a11y/calendar/ea-gnome-calendar.c:229 -#: ../calendar/gui/calendar-component.c:845 -#: ../calendar/gui/calendar-component.c:852 -#: ../calendar/gui/calendar-component.c:858 -#: ../calendar/gui/calendar-component.c:860 +#: ../calendar/gui/calendar-component.c:796 +#: ../calendar/gui/calendar-component.c:803 +#: ../calendar/gui/calendar-component.c:809 +#: ../calendar/gui/calendar-component.c:811 msgid "%d %b %Y" msgstr "%d %b %Y" @@ -237,15 +237,15 @@ msgstr "%d %b %Y" #. month name. You can change the order but don't #. change the specifiers or add anything. #: ../a11y/calendar/ea-gnome-calendar.c:219 -#: ../calendar/gui/calendar-component.c:850 -#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615 +#: ../calendar/gui/calendar-component.c:801 +#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1614 #: ../calendar/gui/e-week-view-main-item.c:349 msgid "%d %b" msgstr "%d %b" #: ../a11y/calendar/ea-gnome-calendar.c:245 #: ../a11y/calendar/ea-gnome-calendar.c:253 -#: ../calendar/importers/icalendar-importer.c:780 +#: ../calendar/importers/icalendar-importer.c:782 msgid "Gnome Calendar" msgstr "Gnome-kalenderen" @@ -309,19 +309,19 @@ msgstr "slå til og fra" msgid "toggle the cell" msgstr "slå cellen til og fra" -#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208 +#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210 msgid "expand" msgstr "udvid" -#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209 +#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211 msgid "expands the row in the ETree containing this cell" msgstr "udvid rækken i ETree'et der indeholder denne celle" -#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214 +#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216 msgid "collapse" msgstr "sammenfolde" -#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215 +#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217 msgid "collapses the row in the ETree containing this cell" msgstr "sammenfolder rækken i ETree'et der indeholder denne celle" @@ -331,7 +331,7 @@ msgstr "Tabelcelle" #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134 -#: ../widgets/table/e-table-click-to-add.c:580 +#: ../widgets/table/e-table-click-to-add.c:579 msgid "click to add" msgstr "tilføj ved at klikke" @@ -369,14 +369,6 @@ msgstr "Benyt forvalg" msgid "Popup Menu" msgstr "Pop op-menu" -#: ../a11y/widgets/ea-expander.c:40 -msgid "Toggle Attachment Bar" -msgstr "Vis/skjul bilags-panel" - -#: ../a11y/widgets/ea-expander.c:50 -msgid "activate" -msgstr "aktivér" - #. For Translators: {0} is the name of the address book source #: ../addressbook/addressbook.error.xml.h:2 msgid "" @@ -429,10 +421,11 @@ msgid "Could not remove address book." msgstr "Kunne ikke fjerne adressebogen." #: ../addressbook/addressbook.error.xml.h:11 +#, fuzzy msgid "" -"Currently you can access only GroupWise System Address Book from Evolution. " -"Please use some other GroupWise mail client once, to get your GroupWise " -"Frequent Contacts and GroupWise Personal Contacts folders." +"Currently you can only access the GroupWise System Address Book from " +"Evolution. Please use some other GroupWise mail client once to get your " +"GroupWise Frequent Contacts and Groupwise Personal Contacts folders." msgstr "" "I øjeblikket kan du kun få adgang til GroupWise-system-adressebog fra " "Evolution. Brug venligst en anden GroupWise-postklient en enkelt gang for at " @@ -457,7 +450,7 @@ msgstr "Godkendelse på LDAP-server mislykkedes." #. Unknown error #: ../addressbook/addressbook.error.xml.h:16 -#: ../addressbook/gui/widgets/e-addressbook-view.c:1746 +#: ../addressbook/gui/widgets/e-addressbook-view.c:1745 msgid "Failed to delete contact" msgstr "Kunne ikke slette kontaktperson" @@ -611,17 +604,17 @@ msgstr "{0}" msgid "{1}" msgstr "{1}" -#: ../addressbook/conduit/address-conduit.c:491 +#: ../addressbook/conduit/address-conduit.c:592 msgid "Default Sync Address:" msgstr "Standardsynkroniseringsadresse:" -#: ../addressbook/conduit/address-conduit.c:1521 -#: ../addressbook/conduit/address-conduit.c:1522 +#: ../addressbook/conduit/address-conduit.c:1614 +#: ../addressbook/conduit/address-conduit.c:1615 msgid "Could not load address book" msgstr "Kunne ikke indlæse adressebogen" -#: ../addressbook/conduit/address-conduit.c:1599 -#: ../addressbook/conduit/address-conduit.c:1602 +#: ../addressbook/conduit/address-conduit.c:1692 +#: ../addressbook/conduit/address-conduit.c:1695 msgid "Could not read pilot's Address application block" msgstr "Kunne ikke læse pilotens adresseapplikationsblok" @@ -642,14 +635,12 @@ msgstr "Certifikater" msgid "Configure autocomplete here" msgstr "Konfigurér automatisk fuldførelse her" -#. ensure the group name is in current locale, not read from configuration #. Create the contacts group #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5 #: ../addressbook/gui/component/addressbook-view.c:1213 -#: ../calendar/gui/calendar-component.c:316 -#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396 -#: ../plugins/exchange-operations/exchange-delegates-user.c:78 -#: ../plugins/exchange-operations/exchange-folder.c:582 +#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:396 +#: ../plugins/exchange-operations/exchange-delegates-user.c:76 +#: ../plugins/exchange-operations/exchange-folder.c:583 msgid "Contacts" msgstr "Adressebog" @@ -685,30 +676,26 @@ msgstr "Styreelement til opsætning af Evolutions mappeindstillinger" msgid "Manage your S/MIME certificates here" msgstr "Håndtér dine S/MIME-certifikater her" -#. ensure the group name is in current locale, not read from configuration -#. create the local source group -#. ensure the group name is in current locale, not read from configuration -#. create the local source group -#. ensure the group name is in current locale, not read from configuration -#. create the local source group -#. ensure the group name is in current locale, not read from configuration #. create the local source group #. On This Computer is always first and Search Folders is always last -#: ../addressbook/gui/component/addressbook-component.c:142 -#: ../addressbook/gui/component/addressbook-component.c:146 +#: ../addressbook/gui/component/addressbook-component.c:97 #: ../addressbook/gui/component/addressbook-migrate.c:500 -#: ../calendar/gui/calendar-component.c:243 -#: ../calendar/gui/calendar-component.c:247 -#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201 -#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577 -#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194 -#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200 -#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990 -#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223 +#: ../calendar/gui/calendar-component.c:192 +#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:475 +#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091 +#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:205 +#: ../mail/em-folder-tree-model.c:207 ../mail/em-migrate.c:2891 +#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217 #: ../mail/message-list.c:1517 msgid "On This Computer" msgstr "På denne maskine" +#. Create the LDAP source group +#: ../addressbook/gui/component/addressbook-component.c:98 +#: ../addressbook/gui/component/addressbook-migrate.c:518 +msgid "On LDAP Servers" +msgstr "På LDAP-servere" + #. ensure the source name is in current locale, not read from configuration #. Create the default Person addressbook #. ensure the source name is in current locale, not read from configuration @@ -720,117 +707,181 @@ msgstr "På denne maskine" #. ensure the source name is in current locale, not read from configuration #. Create the default Person addressbook #. orange -#: ../addressbook/gui/component/addressbook-component.c:154 -#: ../addressbook/gui/component/addressbook-component.c:157 +#: ../addressbook/gui/component/addressbook-component.c:135 +#: ../addressbook/gui/component/addressbook-component.c:138 #: ../addressbook/gui/component/addressbook-migrate.c:508 -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21 -#: ../addressbook/gui/widgets/eab-contact-display.c:652 -#: ../calendar/gui/calendar-component.c:255 -#: ../calendar/gui/calendar-component.c:261 -#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213 +#: ../addressbook/gui/widgets/eab-contact-display.c:653 +#: ../calendar/gui/calendar-component.c:232 +#: ../calendar/gui/calendar-component.c:238 +#: ../calendar/gui/memos-component.c:190 ../calendar/gui/memos-component.c:194 #: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585 -#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206 -#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058 +#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:187 +#: ../calendar/gui/tasks-component.c:191 ../mail/em-migrate.c:960 #: ../plugins/email-custom-header/email-custom-header.c:338 msgid "Personal" msgstr "Personlig" -#. ensure the group name is in current locale, not read from configuration -#. Create the LDAP source group -#: ../addressbook/gui/component/addressbook-component.c:168 -#: ../addressbook/gui/component/addressbook-component.c:171 -#: ../addressbook/gui/component/addressbook-migrate.c:518 -msgid "On LDAP Servers" -msgstr "På LDAP-servere" +#: ../addressbook/gui/component/addressbook-component.c:209 +msgctxt "New" +msgid "_Contact" +msgstr "_Kontaktperson" -#: ../addressbook/gui/component/addressbook-component.c:239 +#: ../addressbook/gui/component/addressbook-component.c:210 msgid "Create a new contact" msgstr "Opret en ny kontaktperson" -#: ../addressbook/gui/component/addressbook-component.c:247 +#: ../addressbook/gui/component/addressbook-component.c:217 +msgctxt "New" +msgid "Contact _List" +msgstr "Kontakt_liste" + +#: ../addressbook/gui/component/addressbook-component.c:218 msgid "Create a new contact list" msgstr "Opret en ny kontaktliste" -#: ../addressbook/gui/component/addressbook-component.c:253 -#: ../addressbook/gui/component/addressbook-config.c:1223 +#: ../addressbook/gui/component/addressbook-component.c:224 +#: ../addressbook/gui/component/addressbook-config.c:1247 msgid "New Address Book" msgstr "Ny adressebog" -#: ../addressbook/gui/component/addressbook-component.c:255 +#: ../addressbook/gui/component/addressbook-component.c:225 +msgctxt "New" +msgid "Address _Book" +msgstr "Adresse_bog" + +#: ../addressbook/gui/component/addressbook-component.c:226 msgid "Create a new address book" msgstr "Opret en ny adressebog" -#: ../addressbook/gui/component/addressbook-component.c:418 +#: ../addressbook/gui/component/addressbook-component.c:389 msgid "Failed upgrading Address Book settings or folders." msgstr "" "Opgradering af indstillinger eller mapper for adressebogen mislykkedes." -#: ../addressbook/gui/component/addressbook-config.c:332 +#: ../addressbook/gui/component/addressbook-config.c:217 +msgid "" +"Selecting this option means that Evolution will only connect to your LDAP " +"server if your LDAP server supports SSL." +msgstr "" +"Ved at vælge denne indstilling, vil Evolution kun oprette forbindelse til " +"din LDAP-server hvis den understøtter SSL." + +#: ../addressbook/gui/component/addressbook-config.c:219 +msgid "" +"Selecting this option means that Evolution will only connect to your LDAP " +"server if your LDAP server supports TLS." +msgstr "" +"Ved at vælge denne indstilling, vil Evolution kun oprette forbindelse til " +"din LDAP-server hvis den understøtter TLS." + +#: ../addressbook/gui/component/addressbook-config.c:221 +msgid "" +"Selecting this option means that your server does not support either SSL or " +"TLS. This means that your connection will be insecure, and that you will be " +"vulnerable to security exploits." +msgstr "" +"At vælge dette indstilling betyder at din server hverken understøtter SSL " +"eller TLS. Dette betyder at din forbindelse vil være usikker, og at du " +"bliver sårbar overfor angreb." + +#: ../addressbook/gui/component/addressbook-config.c:346 msgid "Base" msgstr "Basis" -#: ../addressbook/gui/component/addressbook-config.c:533 -#: ../calendar/gui/dialogs/calendar-setup.c:170 +#: ../addressbook/gui/component/addressbook-config.c:547 +#: ../calendar/gui/dialogs/calendar-setup.c:169 msgid "_Type:" msgstr "T_ype:" -#: ../addressbook/gui/component/addressbook-config.c:635 +#: ../addressbook/gui/component/addressbook-config.c:649 msgid "Copy _book content locally for offline operation" msgstr "Kopiér _bogindholdet lokalt til brug i afkoblet tilstand" -#: ../addressbook/gui/component/addressbook-config.c:998 -#: ../addressbook/gui/component/ldap-config.glade.h:22 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21 -#: ../calendar/gui/dialogs/calendar-setup.c:368 -#: ../calendar/gui/dialogs/calendar-setup.c:379 -#: ../calendar/gui/dialogs/calendar-setup.c:390 -#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90 -#: ../plugins/itip-formatter/itip-formatter.c:2532 +#: ../addressbook/gui/component/addressbook-config.c:761 +msgid "" +"This is the port on the LDAP server that Evolution will try to connect to. A " +"list of standard ports has been provided. Ask your system administrator what " +"port you should specify." +msgstr "" +"Dette er den port på LDAP-serveren som Evolution vil forsøge at tilslutte. " +"En liste over standardporte er givet. Spørg din systemadministrator hvilken " +"port du skal bruge." + +#: ../addressbook/gui/component/addressbook-config.c:839 +msgid "" +"This is the method Evolution will use to authenticate you. Note that " +"setting this to \"Email Address\" requires anonymous access to your LDAP " +"server." +msgstr "" +"Dette er metoden som, Evolution vil anvende til at godkende dig. Bemærk at " +"det kræver anonym adgang til din LDAP-server at sætte denne til \"e-post-" +"adresse\"." + +#: ../addressbook/gui/component/addressbook-config.c:918 +msgid "" +"The search scope defines how deep you would like the search to extend down " +"the directory tree. A search scope of \"sub\" will include all entries below " +"your search base. A search scope of \"one\" will only include the entries " +"one level beneath your base." +msgstr "" +"Søgeomfanget angiver hvor dybt du ønsker at søgningen skal gå ned i " +"mappestrukturen. Søgeomfanget \"sub\" vil inkludere alle poster under din " +"søgebase. Søgeomfanget \"one\" inkluderer alene de poster som er et niveau " +"under din søgebase." + +#: ../addressbook/gui/component/addressbook-config.c:1022 +#: ../addressbook/gui/component/ldap-config.glade.h:17 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20 +#: ../calendar/gui/dialogs/calendar-setup.c:367 +#: ../calendar/gui/dialogs/calendar-setup.c:378 +#: ../calendar/gui/dialogs/calendar-setup.c:389 +#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95 +#: ../plugins/itip-formatter/itip-formatter.c:2545 #: ../smime/gui/smime-ui.glade.h:28 msgid "General" msgstr "Alment" -#: ../addressbook/gui/component/addressbook-config.c:999 -#: ../addressbook/gui/widgets/e-addressbook-view.c:554 +#: ../addressbook/gui/component/addressbook-config.c:1023 +#: ../addressbook/gui/widgets/e-addressbook-view.c:553 #: ../mail/importers/pine-importer.c:383 msgid "Address Book" msgstr "Adressebog" -#: ../addressbook/gui/component/addressbook-config.c:1003 +#: ../addressbook/gui/component/addressbook-config.c:1027 msgid "Server Information" msgstr "Serverinformation" -#: ../addressbook/gui/component/addressbook-config.c:1005 +#: ../addressbook/gui/component/addressbook-config.c:1029 msgid "Authentication" msgstr "Godkendelse" -#: ../addressbook/gui/component/addressbook-config.c:1008 -#: ../addressbook/gui/component/ldap-config.glade.h:17 +#: ../addressbook/gui/component/addressbook-config.c:1032 +#: ../addressbook/gui/component/ldap-config.glade.h:15 #: ../smime/gui/smime-ui.glade.h:20 msgid "Details" msgstr "Detaljer" -#: ../addressbook/gui/component/addressbook-config.c:1009 -#: ../mail/em-folder-browser.c:1000 +#: ../addressbook/gui/component/addressbook-config.c:1033 +#: ../mail/em-folder-browser.c:1024 msgid "Searching" msgstr "Søgning" -#: ../addressbook/gui/component/addressbook-config.c:1011 +#: ../addressbook/gui/component/addressbook-config.c:1035 msgid "Downloading" msgstr "Henter" -#: ../addressbook/gui/component/addressbook-config.c:1221 -#: ../addressbook/gui/component/ldap-config.glade.h:11 +#: ../addressbook/gui/component/addressbook-config.c:1245 +#: ../addressbook/gui/component/ldap-config.glade.h:9 msgid "Address Book Properties" msgstr "Egenskaber for adressebog" #: ../addressbook/gui/component/addressbook-migrate.c:74 -#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209 +#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1110 msgid "Migrating..." msgstr "Overflytter..." #: ../addressbook/gui/component/addressbook-migrate.c:126 -#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268 +#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1169 #, c-format msgid "Migrating '%s':" msgstr "Overflytter \"%s\":" @@ -887,18 +938,18 @@ msgstr "" "Vent venligst mens Evolution overflytter dine mapper..." #: ../addressbook/gui/component/addressbook-view.c:422 -#: ../mail/em-folder-utils.c:448 +#: ../mail/em-folder-utils.c:453 #, c-format msgid "Rename the \"%s\" folder to:" msgstr "Omdøb mappe \"%s\" til:" #: ../addressbook/gui/component/addressbook-view.c:425 -#: ../mail/em-folder-utils.c:450 +#: ../mail/em-folder-utils.c:455 msgid "Rename Folder" msgstr "Omdøb mappe" #: ../addressbook/gui/component/addressbook-view.c:430 -#: ../mail/em-folder-utils.c:456 +#: ../mail/em-folder-utils.c:461 msgid "Folder names cannot contain '/'" msgstr "Mappenavne kan ikke indeholde \"/\"" @@ -911,19 +962,19 @@ msgid "Save As vCard..." msgstr "Gem som vCard..." #: ../addressbook/gui/component/addressbook-view.c:951 -#: ../calendar/gui/calendar-component.c:678 -#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501 -#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39 +#: ../calendar/gui/calendar-component.c:629 +#: ../calendar/gui/memos-component.c:481 ../calendar/gui/tasks-component.c:473 +#: ../mail/em-folder-tree.c:2059 ../ui/evolution-mail-list.xml.h:39 msgid "_Rename..." msgstr "_Omdøb..." #: ../addressbook/gui/component/addressbook-view.c:954 -#: ../addressbook/gui/widgets/e-addressbook-view.c:955 -#: ../calendar/gui/calendar-component.c:681 -#: ../calendar/gui/e-calendar-table.c:1609 -#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:939 -#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504 -#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342 +#: ../addressbook/gui/widgets/e-addressbook-view.c:954 +#: ../calendar/gui/calendar-component.c:632 +#: ../calendar/gui/e-calendar-table.c:1614 +#: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:952 +#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:476 +#: ../mail/em-folder-tree.c:2056 ../mail/em-folder-view.c:1341 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16 #: ../ui/evolution-tasks.xml.h:24 @@ -931,11 +982,10 @@ msgid "_Delete" msgstr "_Slet" #: ../addressbook/gui/component/addressbook-view.c:957 -#: ../calendar/gui/calendar-component.c:686 -#: ../calendar/gui/dialogs/comp-editor.c:2092 -#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509 -#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138 -#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38 +#: ../calendar/gui/calendar-component.c:637 +#: ../calendar/gui/memos-component.c:489 ../calendar/gui/tasks-component.c:481 +#: ../mail/em-folder-tree.c:2065 ../ui/evolution-addressbook.xml.h:59 +#: ../ui/evolution-mail-list.xml.h:38 msgid "_Properties" msgstr "_Egenskaber" @@ -960,8 +1010,8 @@ msgstr "Angiv adgangskode for %s (bruger %s)" #: ../addressbook/gui/component/addressbook.c:222 #: ../calendar/common/authentication.c:51 -#: ../plugins/google-account-setup/google-source.c:422 -#: ../plugins/publish-calendar/publish-calendar.c:191 +#: ../plugins/google-account-setup/google-source.c:423 +#: ../plugins/publish-calendar/publish-calendar.c:208 #: ../smime/gui/component.c:49 msgid "Enter password" msgstr "Indtast adgangskode" @@ -1010,7 +1060,7 @@ msgid "URI for the folder last used in the select names dialog." msgstr "URI for mappen der sidst blev brugt i \"vælg navne\"-vinduet." #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10 -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80 +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83 msgid "Vertical pane position" msgstr "Rudens lodrette placering" @@ -1039,21 +1089,16 @@ msgid "1" msgstr "1" #: ../addressbook/gui/component/ldap-config.glade.h:2 -msgid "3268" -msgstr "3268" - -#: ../addressbook/gui/component/ldap-config.glade.h:3 -msgid "389" -msgstr "389" +msgid "" +"389\n" +"636\n" +"3268" +msgstr "" -#: ../addressbook/gui/component/ldap-config.glade.h:4 +#: ../addressbook/gui/component/ldap-config.glade.h:5 msgid "5" msgstr "5" -#: ../addressbook/gui/component/ldap-config.glade.h:5 -msgid "636" -msgstr "636" - #: ../addressbook/gui/component/ldap-config.glade.h:6 msgid "Authentication" msgstr "Godkendelse" @@ -1066,147 +1111,70 @@ msgstr "Hentning" msgid "Searching" msgstr "Søgning" -#: ../addressbook/gui/component/ldap-config.glade.h:9 -msgid "Type:" -msgstr "Type:" - #: ../addressbook/gui/component/ldap-config.glade.h:10 -msgid "Add Address Book" -msgstr "Tilføj adressebog" - -#: ../addressbook/gui/component/ldap-config.glade.h:12 -#: ../mail/em-account-editor.c:760 -msgid "Always" -msgstr "Altid" - -#: ../addressbook/gui/component/ldap-config.glade.h:13 -msgid "Anonymously" -msgstr "Anonymt" +#, fuzzy +msgid "" +"Anonymously\n" +"Using email address\n" +"Using distinguished name (DN)" +msgstr "Bruger specielt navn" #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached -#: ../addressbook/gui/component/ldap-config.glade.h:15 +#: ../addressbook/gui/component/ldap-config.glade.h:14 msgid "B_rowse this book until limit reached" msgstr "G_ennemse denne bog indtil tidsgrænsen nås" #: ../addressbook/gui/component/ldap-config.glade.h:16 -msgid "Basic" -msgstr "Basal" - -#: ../addressbook/gui/component/ldap-config.glade.h:18 -msgid "Distinguished name" -msgstr "Specielt navn" - -#: ../addressbook/gui/component/ldap-config.glade.h:19 -msgid "Email address" -msgstr "E-mail-adresse" - -#: ../addressbook/gui/component/ldap-config.glade.h:20 msgid "" "Evolution will use this email address to authenticate you with the server." msgstr "" "Evolution vil bruge denne e-post-adresse til at godkende dig på serveren." -#: ../addressbook/gui/component/ldap-config.glade.h:21 -msgid "Find Possible Search Bases" -msgstr "Find mulige søgebaser" - -#: ../addressbook/gui/component/ldap-config.glade.h:23 +#: ../addressbook/gui/component/ldap-config.glade.h:18 msgid "Lo_gin:" msgstr "Lo_gind:" -#: ../addressbook/gui/component/ldap-config.glade.h:24 -#: ../mail/em-account-editor.c:759 -msgid "Never" -msgstr "Aldrig" - -#. Translators: This string is a "Use secure connection" option for -#. the Mailer. It will not use an encrypted connection. -#: ../addressbook/gui/component/ldap-config.glade.h:25 -#: ../mail/em-account-editor.c:287 -msgid "No encryption" -msgstr "Ingen kryptering" - -#: ../addressbook/gui/component/ldap-config.glade.h:26 -msgid "One" +#: ../addressbook/gui/component/ldap-config.glade.h:19 +#, fuzzy +msgid "" +"One\n" +"Sub" msgstr "En" -#. Translators: This string is a "Use secure connection" option for -#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this -#. abbreviation. -#: ../addressbook/gui/component/ldap-config.glade.h:27 -#: ../mail/em-account-editor.c:295 -msgid "SSL encryption" -msgstr "SSL-kryptering" +#: ../addressbook/gui/component/ldap-config.glade.h:21 +msgid "" +"SSL encryption\n" +"TLS encryption\n" +"No encryption" +msgstr "" -#: ../addressbook/gui/component/ldap-config.glade.h:28 +#: ../addressbook/gui/component/ldap-config.glade.h:24 msgid "Search Filter" msgstr "Søgefilter" -#: ../addressbook/gui/component/ldap-config.glade.h:29 +#: ../addressbook/gui/component/ldap-config.glade.h:25 msgid "Search _base:" msgstr "Søge_base:" -#: ../addressbook/gui/component/ldap-config.glade.h:30 +#: ../addressbook/gui/component/ldap-config.glade.h:26 msgid "Search _filter:" msgstr "Søge_filter:" -#: ../addressbook/gui/component/ldap-config.glade.h:31 -msgid "Search filter" -msgstr "Søgefilter" - -#: ../addressbook/gui/component/ldap-config.glade.h:32 +#: ../addressbook/gui/component/ldap-config.glade.h:27 +#, fuzzy msgid "" -"Search filter is the type of the objects searched for, while performing the " -"search. If this is not modified, by default search will be performed on " -"objectclass of the type \"person\"." +"Search filter is the type of object to be searched for. If this is not " +"modified, the default search will be performed on the type \"person\"." msgstr "" "Søgefilter er typen af objekter der søges efter mens søgningen udføres. Hvis " "dette ikke ændres vil søgningen som standard udføres på objekt-klassen der " "har typen \"person\"." -#: ../addressbook/gui/component/ldap-config.glade.h:33 -msgid "" -"Selecting this option means that Evolution will only connect to your LDAP " -"server if your LDAP server supports SSL." -msgstr "" -"Ved at vælge denne indstilling, vil Evolution kun oprette forbindelse til " -"din LDAP-server hvis den understøtter SSL." - -#: ../addressbook/gui/component/ldap-config.glade.h:34 -msgid "" -"Selecting this option means that Evolution will only connect to your LDAP " -"server if your LDAP server supports TLS." -msgstr "" -"Ved at vælge denne indstilling, vil Evolution kun oprette forbindelse til " -"din LDAP-server hvis den understøtter TLS." - -#: ../addressbook/gui/component/ldap-config.glade.h:35 -msgid "" -"Selecting this option means that your server does not support either SSL or " -"TLS. This means that your connection will be insecure, and that you will be " -"vulnerable to security exploits." -msgstr "" -"At vælge dette indstilling betyder at din server hverken understøtter SSL " -"eller TLS. Dette betyder at din forbindelse vil være usikker, og at du " -"bliver sårbar overfor angreb." - -#: ../addressbook/gui/component/ldap-config.glade.h:36 -msgid "Sub" -msgstr "Under" - -#: ../addressbook/gui/component/ldap-config.glade.h:37 +#: ../addressbook/gui/component/ldap-config.glade.h:28 msgid "Supported Search Bases" msgstr "Understøttede søgebaser" -#. Translators: This string is a "Use secure connection" option for -#. the Mailer. TLS (Transport Layer Security) is commonly known by -#. this abbreviation. -#: ../addressbook/gui/component/ldap-config.glade.h:38 -#: ../mail/em-account-editor.c:291 -msgid "TLS encryption" -msgstr "TLS-kryptering" - -#: ../addressbook/gui/component/ldap-config.glade.h:39 +#: ../addressbook/gui/component/ldap-config.glade.h:29 msgid "" "The search base is the distinguished name (DN) of the entry where your " "searches will begin. If you leave this blank, the search will begin at the " @@ -1216,26 +1184,14 @@ msgstr "" "søgninger starter. Hvis du efterlader dette tomt kommer søgningen at begynde " "ved roden af katalogtræet." -#: ../addressbook/gui/component/ldap-config.glade.h:40 -msgid "" -"The search scope defines how deep you would like the search to extend down " -"the directory tree. A search scope of \"sub\" will include all entries below " -"your search base. A search scope of \"one\" will only include the entries " -"one level beneath your base." -msgstr "" -"Søgeomfanget angiver hvor dybt du ønsker at søgningen skal gå ned i " -"mappestrukturen. Søgeomfanget \"sub\" vil inkludere alle poster under din " -"søgebase. Søgeomfanget \"one\" inkluderer alene de poster som er et niveau " -"under din søgebase." - -#: ../addressbook/gui/component/ldap-config.glade.h:41 +#: ../addressbook/gui/component/ldap-config.glade.h:30 msgid "" "This is the full name of your LDAP server. For example, \"ldap.mycompany.com" "\"." msgstr "" "Dette er din LDAP-servers fulde navn. For eksempel \"ldap.mitfirma.dk\"." -#: ../addressbook/gui/component/ldap-config.glade.h:42 +#: ../addressbook/gui/component/ldap-config.glade.h:31 msgid "" "This is the maximum number of entries to download. Setting this number to be " "too large will slow down your address book." @@ -1243,17 +1199,7 @@ msgstr "" "Dette er det største antal poster der skal hentes. Sættes dette tal for højt " "sænkes hastigheden på adressebogen." -#: ../addressbook/gui/component/ldap-config.glade.h:43 -msgid "" -"This is the method Evolution will use to authenticate you. Note that " -"setting this to \"Email Address\" requires anonymous access to your LDAP " -"server." -msgstr "" -"Dette er metoden som, Evolution vil anvende til at godkende dig. Bemærk at " -"det kræver anonym adgang til din LDAP-server at sætte denne til \"e-post-" -"adresse\"." - -#: ../addressbook/gui/component/ldap-config.glade.h:44 +#: ../addressbook/gui/component/ldap-config.glade.h:32 msgid "" "This is the name for this server that will appear in your Evolution folder " "list. It is for display purposes only. " @@ -1261,87 +1207,60 @@ msgstr "" "Dette er navnet på denne server, som vises i din Evolution-mappeliste. Det " "anvendes kun i forbindelse med visning. " -#: ../addressbook/gui/component/ldap-config.glade.h:45 -msgid "" -"This is the port on the LDAP server that Evolution will try to connect to. A " -"list of standard ports has been provided. Ask your system administrator what " -"port you should specify." -msgstr "" -"Dette er den port på LDAP-serveren som Evolution vil forsøge at tilslutte. " -"En liste over standardporte er givet. Spørg din systemadministrator hvilken " -"port du skal bruge." - -#: ../addressbook/gui/component/ldap-config.glade.h:46 -msgid "Using distinguished name (DN)" -msgstr "Bruger specielt navn" - -#: ../addressbook/gui/component/ldap-config.glade.h:47 -msgid "Using email address" -msgstr "Bruger e-postadresse" - -#: ../addressbook/gui/component/ldap-config.glade.h:48 -msgid "Whenever Possible" -msgstr "Når det er muligt" - -#: ../addressbook/gui/component/ldap-config.glade.h:49 -msgid "_Add Address Book" -msgstr "_Tilføj adressebog" - -#: ../addressbook/gui/component/ldap-config.glade.h:50 +#: ../addressbook/gui/component/ldap-config.glade.h:33 msgid "_Download limit:" msgstr "_Grænse for hentning:" -#: ../addressbook/gui/component/ldap-config.glade.h:51 +#: ../addressbook/gui/component/ldap-config.glade.h:34 msgid "_Find Possible Search Bases" msgstr "_Find mulige søgebaser" -#: ../addressbook/gui/component/ldap-config.glade.h:52 +#: ../addressbook/gui/component/ldap-config.glade.h:35 msgid "_Login method:" msgstr "_Logind-metode:" -#: ../addressbook/gui/component/ldap-config.glade.h:53 -#: ../calendar/gui/dialogs/calendar-setup.c:227 -#: ../mail/mail-config.glade.h:178 +#: ../addressbook/gui/component/ldap-config.glade.h:36 +#: ../calendar/gui/dialogs/calendar-setup.c:226 +#: ../mail/mail-config.glade.h:176 #: ../plugins/groupwise-features/properties.glade.h:11 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2 msgid "_Name:" msgstr "_Navn:" -#: ../addressbook/gui/component/ldap-config.glade.h:54 +#: ../addressbook/gui/component/ldap-config.glade.h:37 msgid "_Port:" msgstr "_Port:" -#: ../addressbook/gui/component/ldap-config.glade.h:55 +#: ../addressbook/gui/component/ldap-config.glade.h:38 msgid "_Search scope:" msgstr "Udstrækning af _søgning:" -#: ../addressbook/gui/component/ldap-config.glade.h:56 -#: ../mail/mail-config.glade.h:187 -#: ../plugins/publish-calendar/publish-calendar.glade.h:26 +#: ../addressbook/gui/component/ldap-config.glade.h:39 +#: ../mail/mail-config.glade.h:185 +#: ../plugins/publish-calendar/publish-calendar.glade.h:27 msgid "_Server:" msgstr "_Server:" -#: ../addressbook/gui/component/ldap-config.glade.h:57 +#: ../addressbook/gui/component/ldap-config.glade.h:40 msgid "_Timeout:" msgstr "_Tid:" -#: ../addressbook/gui/component/ldap-config.glade.h:58 +#: ../addressbook/gui/component/ldap-config.glade.h:41 msgid "_Use secure connection:" msgstr "_Brug sikker forbindelse:" -#: ../addressbook/gui/component/ldap-config.glade.h:59 +#: ../addressbook/gui/component/ldap-config.glade.h:42 msgid "cards" msgstr "kort" -#: ../addressbook/gui/component/ldap-config.glade.h:60 +#: ../addressbook/gui/component/ldap-config.glade.h:43 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10 -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27 -#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17 -#: ../plugins/caldav/caldav-source.c:430 -#: ../plugins/calendar-http/calendar-http.c:279 -#: ../plugins/calendar-weather/calendar-weather.c:524 -#: ../plugins/google-account-setup/google-source.c:652 -#: ../plugins/google-account-setup/google-contacts-source.c:366 +#: ../calendar/gui/dialogs/event-page.glade.h:23 +#: ../plugins/caldav/caldav-source.c:448 +#: ../plugins/calendar-http/calendar-http.c:278 +#: ../plugins/calendar-weather/calendar-weather.c:523 +#: ../plugins/google-account-setup/google-source.c:653 +#: ../plugins/google-account-setup/google-contacts-source.c:330 msgid "minutes" msgstr "minutter" @@ -1382,22749 +1301,23117 @@ msgid "Work" msgstr "Arbejde" #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:176 -#: ../addressbook/gui/widgets/eab-contact-display.c:605 -msgid "AIM" -msgstr "AIM" - -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11 #: ../calendar/gui/dialogs/event-page.glade.h:6 #: ../calendar/gui/dialogs/memo-page.glade.h:1 msgid "Ca_tegories..." msgstr "Ka_tegorier..." -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:266 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11 +#: ../addressbook/gui/contact-editor/e-contact-editor.c:262 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158 -#: ../addressbook/gui/widgets/e-minicard.c:199 +#: ../addressbook/gui/widgets/e-minicard.c:198 msgid "Contact" msgstr "Kontaktperson" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:543 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:558 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12 +#: ../addressbook/gui/contact-editor/e-contact-editor.c:542 +#: ../addressbook/gui/contact-editor/e-contact-editor.c:557 +#: ../addressbook/gui/contact-editor/e-contact-editor.c:2443 msgid "Contact Editor" msgstr "Redigering af kontaktperson" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13 msgid "Full _Name..." msgstr "_Fulde navn..." -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15 -#: ../composer/e-msg-composer.c:2478 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14 msgid "Image" msgstr "Billede" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16 -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58 -msgid "MSN Messenger" -msgstr "MSN Messenger" - -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15 msgid "Mailing Address" msgstr "Post-adresse" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16 msgid "Nic_kname:" msgstr "Kæle_navn:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19 -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54 -msgid "Novell GroupWise" -msgstr "Novell GroupWise" - -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20 -msgid "Novell Groupwise" -msgstr "Novell Groupwise" - -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17 msgid "Personal Information" msgstr "Personlige oplysninger" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18 msgid "Telephone" msgstr "Telefon" -#. red -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24 -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:195 -#: ../addressbook/gui/widgets/eab-contact-display.c:57 -#: ../addressbook/gui/widgets/eab-contact-display.c:635 -#: ../mail/em-migrate.c:1057 -msgid "Work" -msgstr "Arbejde" - -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25 -#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19 msgid "_Address:" msgstr "_Adresse:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20 msgid "_Anniversary:" msgstr "_Jubilæum:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21 msgid "_Assistant:" msgstr "_Assistent:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22 msgid "_Birthday:" msgstr "_Fødselsdag:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29 -#: ../calendar/gui/dialogs/event-page.c:792 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23 +#: ../calendar/gui/dialogs/event-page.c:805 #: ../calendar/gui/dialogs/event-page.glade.h:14 -#: ../plugins/itip-formatter/itip-view.c:1909 +#: ../plugins/itip-formatter/itip-view.c:1913 msgid "_Calendar:" msgstr "_Kalender:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24 msgid "_City:" msgstr "B_y:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25 msgid "_Company:" msgstr "_Firma:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26 msgid "_Country:" msgstr "_Land:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27 msgid "_Department:" msgstr "_Afdeling:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28 msgid "_File under:" msgstr "_Arkivér under:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29 msgid "_Free/Busy:" msgstr "_Ledig/optaget:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30 msgid "_Home Page:" msgstr "_Hjemmeside:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31 msgid "_Manager:" msgstr "_Leder:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32 msgid "_Notes:" msgstr "_Notater:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33 msgid "_Office:" msgstr "Kont_or:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40 -#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34 msgid "_PO Box:" msgstr "_Postboks:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35 msgid "_Profession:" msgstr "_Erhverv:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36 msgid "_Spouse:" msgstr "_Ægtefælle:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43 -#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37 msgid "_State/Province:" msgstr "_Stat/Provins:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44 -#: ../addressbook/gui/contact-editor/fullname.glade.h:17 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38 +#: ../addressbook/gui/contact-editor/fullname.glade.h:19 msgid "_Title:" msgstr "_Titel:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39 msgid "_Video Chat:" msgstr "_Video-samtale:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40 msgid "_Wants to receive HTML mail" msgstr "_Ønsker at modtage breve i HTML-format" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41 msgid "_Web Log:" msgstr "_Weblog:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7 msgid "_Where:" msgstr "_Hvor:" -#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49 +#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43 msgid "_Zip/Postal Code:" msgstr "_Postnummer:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91 -#: ../addressbook/gui/widgets/eab-contact-display.c:632 -#: ../addressbook/gui/widgets/eab-contact-display.c:647 -msgid "Address" -msgstr "Adresse" +#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85 +#: ../mail/em-mailer-prefs.c:475 +#: ../plugins/exchange-operations/exchange-delegates.c:954 +#: ../plugins/exchange-operations/exchange-permissions-dialog.c:706 +#: ../plugins/plugin-manager/plugin-manager.c:57 +#: ../widgets/menus/gal-define-views-dialog.c:344 +#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90 +#: ../widgets/menus/gal-view-new-dialog.c:61 +msgid "Name" +msgstr "Navn" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91 -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:294 +#: ../addressbook/gui/contact-editor/e-contact-editor.c:290 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178 #: ../addressbook/gui/widgets/e-addressbook-model.c:325 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419 -#: ../addressbook/gui/widgets/e-minicard-label.c:165 +#: ../addressbook/gui/widgets/e-minicard-label.c:164 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131 #: ../addressbook/gui/widgets/e-minicard-view.c:545 -#: ../addressbook/gui/widgets/e-minicard.c:192 +#: ../addressbook/gui/widgets/e-minicard.c:191 #: ../widgets/menus/gal-define-views-model.c:178 -#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688 -#: ../widgets/text/e-text.c:3689 +#: ../widgets/table/e-cell-text.c:1828 ../widgets/text/e-text.c:3689 +#: ../widgets/text/e-text.c:3690 msgid "Editable" msgstr "Redigerbar" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131 -msgid "United States" -msgstr "U.S.A." +#: ../addressbook/gui/contact-editor/e-contact-editor.c:172 +#: ../addressbook/gui/widgets/eab-contact-display.c:606 +msgid "AIM" +msgstr "AIM" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132 -msgid "Afghanistan" -msgstr "Afghanistan" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:173 +#: ../addressbook/gui/widgets/eab-contact-display.c:609 +msgid "Jabber" +msgstr "Jabber" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133 -msgid "Albania" -msgstr "Albanien" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:174 +#: ../addressbook/gui/widgets/eab-contact-display.c:611 +msgid "Yahoo" +msgstr "Yahoo" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134 -msgid "Algeria" -msgstr "Algeriet" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:175 +#: ../addressbook/gui/widgets/eab-contact-display.c:612 +msgid "Gadu-Gadu" +msgstr "Gadu-Gadu" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135 -msgid "American Samoa" -msgstr "Amerikansk Samoa" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:176 +#: ../addressbook/gui/widgets/eab-contact-display.c:610 +msgid "MSN" +msgstr "MSN" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136 -msgid "Andorra" -msgstr "Andorra" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:177 +#: ../addressbook/gui/widgets/eab-contact-display.c:608 +msgid "ICQ" +msgstr "ICQ" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137 -msgid "Angola" -msgstr "Angola" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:178 +#: ../addressbook/gui/widgets/eab-contact-display.c:607 +msgid "GroupWise" +msgstr "GroupWise" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138 -msgid "Anguilla" -msgstr "Anguilla" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:179 +#: ../addressbook/gui/widgets/eab-contact-display.c:613 +msgid "Skype" +msgstr "Skype" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139 -msgid "Antarctica" -msgstr "Antarktis" +#. red +#: ../addressbook/gui/contact-editor/e-contact-editor.c:191 +#: ../addressbook/gui/widgets/eab-contact-display.c:57 +#: ../addressbook/gui/widgets/eab-contact-display.c:636 +#: ../mail/em-migrate.c:959 +msgid "Work" +msgstr "Arbejde" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140 -msgid "Antigua And Barbuda" -msgstr "Antigua og Barbuda" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:192 +#: ../addressbook/gui/widgets/eab-contact-display.c:58 +msgid "Home" +msgstr "Hjem" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141 -msgid "Argentina" -msgstr "Argentina" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:193 +#: ../addressbook/gui/widgets/eab-contact-display.c:59 +#: ../addressbook/gui/widgets/eab-contact-display.c:519 +#: ../calendar/gui/e-calendar-view.c:2296 +msgid "Other" +msgstr "Anden" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142 -msgid "Armenia" -msgstr "Armenien" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:248 +msgid "Source Book" +msgstr "Kildebog" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143 -msgid "Aruba" -msgstr "Aruba" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:255 +msgid "Target Book" +msgstr "Målbog" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144 -msgid "Australia" -msgstr "Australien" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:269 +msgid "Is New Contact" +msgstr "Er ny kontaktperson" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145 -msgid "Austria" -msgstr "Østrig" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:276 +msgid "Writable Fields" +msgstr "Skrivbare felter" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146 -msgid "Azerbaijan" -msgstr "Aserbajdsjan" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:283 +msgid "Required Fields" +msgstr "Obligatoriske felter" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147 -msgid "Bahamas" -msgstr "Bahamas" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:297 +msgid "Changed" +msgstr "Ændret" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148 -msgid "Bahrain" -msgstr "Bahrain" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:552 +#: ../addressbook/gui/contact-editor/e-contact-editor.c:2438 +#, c-format +msgid "Contact Editor - %s" +msgstr "Redigering af kontaktperson - %s" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149 -msgid "Bangladesh" -msgstr "Bangladesh" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:2834 +msgid "Please select an image for this contact" +msgstr "Vælg venligst et billede til denne kontaktperson" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150 -msgid "Barbados" -msgstr "Barbados" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:2835 +msgid "_No image" +msgstr "_Intet billede" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151 -msgid "Belarus" -msgstr "Hviderusland" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:3109 +msgid "" +"The contact data is invalid:\n" +"\n" +msgstr "" +"Data om kontaktperson er ugyldige:\n" +"\n" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152 -msgid "Belgium" -msgstr "Belgien" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113 +#, c-format +msgid "'%s' has an invalid format" +msgstr "\"%s\" er i et ugyldigt format" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153 -msgid "Belize" -msgstr "Belize" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120 +#, c-format +msgid "%s'%s' has an invalid format" +msgstr "%s\"%s\" er i et ugyldigt format" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154 -msgid "Benin" -msgstr "Benin" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:3135 +#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146 +#, c-format +msgid "%s'%s' is empty" +msgstr "%s\"%s\" har intet indhold" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155 -msgid "Bermuda" -msgstr "Bermuda" +#: ../addressbook/gui/contact-editor/e-contact-editor.c:3161 +msgid "Invalid contact." +msgstr "Ugyldig kontaktperson." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156 -msgid "Bhutan" -msgstr "Bhutan" +#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324 +msgid "Contact Quick-Add" +msgstr "Hurtig tilføjelse af kontaktperson" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157 -msgid "Bolivia" -msgstr "Bolivia" +#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327 +msgid "_Edit Full" +msgstr "_Redigér alt" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158 -msgid "Bosnia And Herzegowina" -msgstr "Bosnien og Herzegovina" +#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401 +msgid "_Full name" +msgstr "_Fulde navn" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159 -msgid "Botswana" -msgstr "Botswana" +#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412 +msgid "E_mail" +msgstr "E-_post" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160 -msgid "Bouvet Island" -msgstr "Bouvetøen" +#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423 +msgid "_Select Address Book" +msgstr "_Vælg adressebog" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161 -msgid "Brazil" -msgstr "Brasilien" +#: ../addressbook/gui/contact-editor/eab-editor.c:323 +#, c-format +msgid "" +"Are you sure you want\n" +"to delete contact list (%s)?" +msgstr "" +"Er du sikker på du vil\n" +"slette listen over kontaktpersoner (%s)?" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162 -msgid "British Indian Ocean Territory" -msgstr "Britisk-Indisk havområde" +#: ../addressbook/gui/contact-editor/eab-editor.c:326 +msgid "" +"Are you sure you want\n" +"to delete these contact lists?" +msgstr "" +"Er du sikker på du vil\n" +"slette disse lister over kontaktpersoner?" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163 -msgid "Brunei Darussalam" -msgstr "Brunei Dar-es-salam" +#: ../addressbook/gui/contact-editor/eab-editor.c:331 +#, c-format +msgid "" +"Are you sure you want\n" +"to delete contact (%s)?" +msgstr "" +"Er du sikker på du vil\n" +"slette kontaktpersonen (%s)?" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164 -msgid "Bulgaria" -msgstr "Bulgarien" +#: ../addressbook/gui/contact-editor/eab-editor.c:334 +msgid "" +"Are you sure you want\n" +"to delete these contacts?" +msgstr "" +"Er du sikker på at du vil\n" +"fjerne disse kontaktpersoner?" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165 -msgid "Burkina Faso" -msgstr "Burkina Faso" +#: ../addressbook/gui/contact-editor/fullname.glade.h:1 +msgid "" +"\n" +"Mr.\n" +"Mrs.\n" +"Ms.\n" +"Miss\n" +"Dr." +msgstr "" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166 -msgid "Burundi" -msgstr "Burundi" +#: ../addressbook/gui/contact-editor/fullname.glade.h:7 +msgid "" +"\n" +"Sr.\n" +"Jr.\n" +"I\n" +"II\n" +"III\n" +"Esq." +msgstr "" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167 -msgid "Cambodia" -msgstr "Cambodja" +#: ../addressbook/gui/contact-editor/fullname.glade.h:14 +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16 +msgid "Full Name" +msgstr "Fulde navn" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168 -msgid "Cameroon" -msgstr "Kamerun" +#: ../addressbook/gui/contact-editor/fullname.glade.h:15 +msgid "_First:" +msgstr "_Fornavn:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169 -msgid "Canada" -msgstr "Canada" +#: ../addressbook/gui/contact-editor/fullname.glade.h:16 +msgid "_Last:" +msgstr "_Efternavn:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170 -msgid "Cape Verde" -msgstr "Kap Verde" +#: ../addressbook/gui/contact-editor/fullname.glade.h:17 +msgid "_Middle:" +msgstr "_Mellemnavn:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171 -msgid "Cayman Islands" -msgstr "Cayman-øerne" +#: ../addressbook/gui/contact-editor/fullname.glade.h:18 +msgid "_Suffix:" +msgstr "_Suffiks:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172 -msgid "Central African Republic" -msgstr "Centralafrikanske republik" +#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1 +msgid "Members" +msgstr "Medlemmer:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173 -msgid "Chad" -msgstr "Tchad" +#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2 +#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668 +msgid "Contact List Editor" +msgstr "Redigering af liste over kontaktpersoner" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174 -msgid "Chile" -msgstr "Chile" +#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3 +#: ../calendar/gui/dialogs/cal-prefs-dialog.c:213 +#: ../calendar/gui/e-day-view-time-item.c:816 +#: ../calendar/gui/e-timezone-entry.c:121 +msgid "Select..." +msgstr "Vælg..." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175 -msgid "China" -msgstr "Kina" +#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4 +msgid "_Hide addresses when sending mail to this list" +msgstr "_Skjul adresser når du sender e-post til listen" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176 -msgid "Christmas Island" -msgstr "Juleøen" +#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5 +msgid "_List name:" +msgstr "_Listenavn:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177 -msgid "Cocos (Keeling) Islands" -msgstr "Cocos (Keeling)-øerne" +#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6 +msgid "_Type an email address or drag a contact into the list below:" +msgstr "" +"_Skriv en e-postadresse eller træk en kontaktperson ind i listen nedenfor:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178 -msgid "Colombia" -msgstr "Columbia" +#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761 +msgid "Contact List Members" +msgstr "Medlemmer af liste over kontaktpersoner" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179 -msgid "Comoros" -msgstr "Komorene" +#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900 +#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239 +msgid "_Members" +msgstr "_Medlemmer" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180 -msgid "Congo" -msgstr "Congo" +#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148 +#: ../addressbook/gui/widgets/e-addressbook-model.c:311 +#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405 +#: ../addressbook/gui/widgets/e-addressbook-view.c:210 +#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117 +#: ../addressbook/gui/widgets/e-minicard-view.c:531 +msgid "Book" +msgstr "Bog" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181 -msgid "Congo, The Democratic Republic Of The" -msgstr "Congo" +#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168 +msgid "Is New List" +msgstr "Er ny liste" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182 -msgid "Cook Islands" -msgstr "Cook-øerne" +#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1 +msgid "Changed Contact:" +msgstr "Ændret kontaktperson:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183 -msgid "Costa Rica" -msgstr "Costa Rica" +#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2 +msgid "Conflicting Contact:" +msgstr "Kontaktperson i konflikt:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184 -msgid "Cote d'Ivoire" -msgstr "Elfenbenskysten" +#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3 +#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1 +msgid "Duplicate Contact Detected" +msgstr "Dublet af kontaktperson fundet" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185 -msgid "Croatia" -msgstr "Kroatien" +#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4 +msgid "" +"The name or email of this contact already exists in this folder. Would you " +"like to add it anyway?" +msgstr "" +"Navnet eller e-postadressen for denne kontaktperson eksisterer allerede i " +"denne mappe. Vil du tilføje den alligevel?" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186 -msgid "Cuba" -msgstr "Cuba" +#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2 +msgid "New Contact:" +msgstr "Ny kontaktperson:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187 -msgid "Cyprus" -msgstr "Cypern" +#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3 +msgid "Original Contact:" +msgstr "Oprindelig kontaktperson:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188 -msgid "Czech Republic" -msgstr "Tjekkiet" +#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4 +msgid "" +"The name or email address of this contact already exists\n" +"in this folder. Would you like to add it anyway?" +msgstr "" +"Navnet eller e-postadressen for denne kontaktperson eksisterer allerede\n" +"i denne mappe. Vil du tilføje den alligevel?" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189 -msgid "Denmark" -msgstr "Danmark" +#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6 +#: ../addressbook/gui/merging/eab-contact-merging.c:214 +msgid "_Merge" +msgstr "_Flet" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190 -msgid "Djibouti" -msgstr "Djibouti" +#: ../addressbook/gui/merging/eab-contact-merging.c:199 +msgid "Merge Contact" +msgstr "Flet kontakt" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191 -msgid "Dominica" -msgstr "Dominika" +#: ../addressbook/gui/merging/eab-contact-merging.c:267 +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11 +#: ../addressbook/gui/widgets/eab-contact-display.c:584 +#: ../addressbook/gui/widgets/eab-contact-display.c:589 +#: ../addressbook/gui/widgets/eab-contact-display.c:592 +#: ../addressbook/gui/widgets/eab-contact-display.c:872 +#: ../plugins/groupwise-features/junk-settings.c:421 ../smime/lib/e-cert.c:810 +msgid "Email" +msgstr "E-post" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192 -msgid "Dominican Republic" -msgstr "Dominikanske Republik" +#: ../addressbook/gui/widgets/addresstypes.xml.h:1 +#: ../addressbook/gui/widgets/e-addressbook-view.c:159 +#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2 +#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4 +msgid "Any field contains" +msgstr "Et felt indeholder" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193 -msgid "Ecuador" -msgstr "Ækvador" +#: ../addressbook/gui/widgets/addresstypes.xml.h:2 +#: ../addressbook/gui/widgets/e-addressbook-view.c:158 +msgid "Email begins with" +msgstr "E-postadresse begynder med" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194 -msgid "Egypt" -msgstr "Egypten" +#: ../addressbook/gui/widgets/addresstypes.xml.h:3 +msgid "Name contains" +msgstr "Navn indeholder" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195 -msgid "El Salvador" -msgstr "El Salvador" +#: ../addressbook/gui/widgets/e-addressbook-model.c:163 +msgid "No contacts" +msgstr "Ingen kontaktpersoner" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196 -msgid "Equatorial Guinea" -msgstr "Ækvatorial Guinea" +#: ../addressbook/gui/widgets/e-addressbook-model.c:166 +#, c-format +msgid "%d contact" +msgid_plural "%d contacts" +msgstr[0] "%d kontaktperson" +msgstr[1] "%d kontaktpersoner" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197 -msgid "Eritrea" -msgstr "Eritrea" +#: ../addressbook/gui/widgets/e-addressbook-model.c:318 +#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412 +#: ../addressbook/gui/widgets/e-addressbook-view.c:224 +#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124 +#: ../addressbook/gui/widgets/e-minicard-view.c:538 +msgid "Query" +msgstr "Forespørgsel" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198 -msgid "Estonia" -msgstr "Estland" +#: ../addressbook/gui/widgets/e-addressbook-model.c:461 +msgid "Error getting book view" +msgstr "Fejl ved bogvisning" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199 -msgid "Ethiopia" -msgstr "Etiopien" +#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426 +#: ../widgets/table/e-table-click-to-add.c:508 +#: ../widgets/table/e-table-selection-model.c:302 +#: ../widgets/table/e-table.c:3352 +#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3553 +#: ../widgets/text/e-text.c:3554 +msgid "Model" +msgstr "Model" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200 -msgid "Falkland Islands" -msgstr "Falklandsøerne" +#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150 +msgid "Error modifying card" +msgstr "Fejl ved ændring af kort" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201 -msgid "Faroe Islands" -msgstr "Færøerne" +#: ../addressbook/gui/widgets/e-addressbook-view.c:157 +msgid "Name begins with" +msgstr "Navn begynder med" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202 -msgid "Fiji" -msgstr "Fiji" +#: ../addressbook/gui/widgets/e-addressbook-view.c:217 +msgid "Source" +msgstr "Kilde" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203 -msgid "Finland" -msgstr "Finland" +#: ../addressbook/gui/widgets/e-addressbook-view.c:231 +#: ../calendar/gui/e-calendar-table.etspec.h:14 +#: ../calendar/gui/e-meeting-list-view.c:567 +#: ../calendar/gui/e-meeting-time-sel.etspec.h:11 +#: ../calendar/gui/e-memo-table.etspec.h:7 +#: ../widgets/misc/e-attachment-tree-view.c:554 +msgid "Type" +msgstr "Type" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204 -msgid "France" -msgstr "Frankrig" +#: ../addressbook/gui/widgets/e-addressbook-view.c:811 +#: ../addressbook/gui/widgets/e-addressbook-view.c:1964 +msgid "Save as vCard..." +msgstr "Gem som vCard..." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205 -msgid "French Guiana" -msgstr "Fransk Guinea" +#: ../addressbook/gui/widgets/e-addressbook-view.c:932 +#: ../calendar/gui/e-calendar-table.c:1592 +#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:935 +#: ../ui/evolution-addressbook.xml.h:56 +msgid "_Open" +msgstr "_Åbn" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206 -msgid "French Polynesia" -msgstr "Fransk polynesien" +#: ../addressbook/gui/widgets/e-addressbook-view.c:934 +msgid "_New Contact..." +msgstr "N_y kontaktperson..." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207 -msgid "French Southern Territories" -msgstr "Sydlige franske territorier" +#: ../addressbook/gui/widgets/e-addressbook-view.c:935 +msgid "New Contact _List..." +msgstr "Ny _liste over kontaktpersoner..." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208 -msgid "Gabon" -msgstr "Gabon" +#: ../addressbook/gui/widgets/e-addressbook-view.c:938 +msgid "_Save as vCard..." +msgstr "_Gem som vCard..." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209 -msgid "Gambia" -msgstr "Gambia" +#: ../addressbook/gui/widgets/e-addressbook-view.c:939 +msgid "_Forward Contact" +msgstr "_Videresend kontaktperson" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210 -msgid "Georgia" -msgstr "Georgien" +#: ../addressbook/gui/widgets/e-addressbook-view.c:940 +msgid "_Forward Contacts" +msgstr "Vider_esend kontaktpersoner" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211 -msgid "Germany" -msgstr "Tyskland" +#: ../addressbook/gui/widgets/e-addressbook-view.c:941 +msgid "Send _Message to Contact" +msgstr "Send _brev til kontaktperson" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212 -msgid "Ghana" -msgstr "Ghana" +#: ../addressbook/gui/widgets/e-addressbook-view.c:942 +msgid "Send _Message to List" +msgstr "Send _brev til liste" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213 -msgid "Gibraltar" -msgstr "Gibraltar" +#: ../addressbook/gui/widgets/e-addressbook-view.c:943 +msgid "Send _Message to Contacts" +msgstr "Send _brev til kontaktpersoner" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214 -msgid "Greece" -msgstr "Grækenland" +#: ../addressbook/gui/widgets/e-addressbook-view.c:944 +msgid "_Print" +msgstr "_Udskriv" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215 -msgid "Greenland" -msgstr "Grønland" +#: ../addressbook/gui/widgets/e-addressbook-view.c:947 +msgid "Cop_y to Address Book..." +msgstr "Kopiér til _adressebog..." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216 -msgid "Grenada" -msgstr "Grenada" +#: ../addressbook/gui/widgets/e-addressbook-view.c:948 +msgid "Mo_ve to Address Book..." +msgstr "_Flyt til adressebog..." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217 -msgid "Guadeloupe" -msgstr "Guadeloupe" +#: ../addressbook/gui/widgets/e-addressbook-view.c:951 +msgid "Cu_t" +msgstr "Klip u_d" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218 -msgid "Guam" -msgstr "Guam" +#: ../addressbook/gui/widgets/e-addressbook-view.c:952 +#: ../calendar/gui/e-calendar-table.c:1600 +#: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:943 +#: ../mail/em-folder-tree.c:928 ../mail/em-folder-view.c:1326 +#: ../mail/message-list.c:2105 ../ui/evolution-addressbook.xml.h:46 +#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99 +#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23 +msgid "_Copy" +msgstr "_Kopiér" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219 -msgid "Guatemala" -msgstr "Guatemala" +#: ../addressbook/gui/widgets/e-addressbook-view.c:953 +msgid "P_aste" +msgstr "Ind_sæt" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220 -msgid "Guernsey" -msgstr "Guernsey" +#. All, unmatched, separator +#: ../addressbook/gui/widgets/e-addressbook-view.c:1527 +#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671 +#: ../calendar/gui/cal-search-bar.c:690 +msgid "Any Category" +msgstr "Alle kategorier" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221 -msgid "Guinea" -msgstr "Guinea" +#: ../addressbook/gui/widgets/e-addressbook-view.c:1530 +#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675 +#: ../calendar/gui/cal-search-bar.c:694 +msgid "Unmatched" +msgstr "Ingen træffere" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222 -msgid "Guinea-Bissau" -msgstr "Guinea-Bissau" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1 +#: ../addressbook/gui/widgets/eab-contact-display.c:627 +msgid "Assistant" +msgstr "Assistent" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223 -msgid "Guyana" -msgstr "Guyana" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2 +msgid "Assistant Phone" +msgstr "Assistents telefon" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224 -msgid "Haiti" -msgstr "Haiti" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3 +msgid "Business Fax" +msgstr "Fax på arbejde" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225 -msgid "Heard And McDonald Islands" -msgstr "Heard og McDonald-øerne" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4 +msgid "Business Phone" +msgstr "Arbejdstelefon" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226 -msgid "Holy See" -msgstr "Dødehavet" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5 +msgid "Business Phone 2" +msgstr "Arbejdstelefon 2" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227 -msgid "Honduras" -msgstr "Honduras" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6 +msgid "Callback Phone" +msgstr "Telefon til tilbageringning" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228 -msgid "Hong Kong" -msgstr "Hong Kong" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7 +msgid "Car Phone" +msgstr "Biltelefon" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229 -msgid "Hungary" -msgstr "Ungarn" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8 +#: ../calendar/gui/dialogs/event-page.glade.h:7 +#: ../calendar/gui/e-cal-component-memo-preview.c:138 +#: ../calendar/gui/e-cal-list-view.etspec.h:1 +#: ../calendar/gui/e-calendar-table.etspec.h:3 +#: ../calendar/gui/e-memo-table.etspec.h:1 +msgid "Categories" +msgstr "Kategorier" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230 -msgid "Iceland" -msgstr "Island" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9 +#: ../addressbook/gui/widgets/eab-contact-display.c:622 +msgid "Company" +msgstr "Firma" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231 -msgid "India" -msgstr "Indien" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10 +msgid "Company Phone" +msgstr "Firmatelefon" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232 -msgid "Indonesia" -msgstr "Indonesien" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12 +msgid "Email 2" +msgstr "E-post 2" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233 -msgid "Iran" -msgstr "Iran" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13 +msgid "Email 3" +msgstr "E-post 3" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234 -msgid "Iraq" -msgstr "Irak" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14 +msgid "Family Name" +msgstr "Efternavn" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235 -msgid "Ireland" -msgstr "Irland" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15 +msgid "File As" +msgstr "Gem som" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236 -msgid "Isle of Man" -msgstr "Isle of Man" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17 +msgid "Given Name" +msgstr "Fornavn" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237 -msgid "Israel" -msgstr "Israel" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18 +msgid "Home Fax" +msgstr "Fax hjemme" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238 -msgid "Italy" -msgstr "Italien" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19 +msgid "Home Phone" +msgstr "Hjemmetelefon" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239 -msgid "Jamaica" -msgstr "Jamaica" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20 +msgid "Home Phone 2" +msgstr "Hjemmetelefon 2" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240 -msgid "Japan" -msgstr "Japan" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21 +msgid "ISDN Phone" +msgstr "ISDN-telefon" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241 -msgid "Jersey" -msgstr "Jersey" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22 +msgid "Journal" +msgstr "Journal" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242 -msgid "Jordan" -msgstr "Jordan" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23 +#: ../addressbook/gui/widgets/eab-contact-display.c:626 +msgid "Manager" +msgstr "Leder" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243 -msgid "Kazakhstan" -msgstr "Kasakhstan" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24 +#: ../addressbook/gui/widgets/eab-contact-display.c:647 +msgid "Mobile Phone" +msgstr "Mobiltelefon" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244 -msgid "Kenya" -msgstr "Kenya" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25 +#: ../addressbook/gui/widgets/eab-contact-display.c:600 +msgid "Nickname" +msgstr "Kælenavn" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245 -msgid "Kiribati" -msgstr "Kiribati" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26 +#: ../addressbook/gui/widgets/eab-contact-display.c:660 +msgid "Note" +msgstr "Note" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246 -msgid "Korea, Democratic People's Republic Of" -msgstr "Nordkorea" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27 +msgid "Office" +msgstr "Kontor" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247 -msgid "Korea, Republic Of" -msgstr "Sydkorea" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28 +msgid "Other Fax" +msgstr "Anden fax" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248 -msgid "Kuwait" -msgstr "Kuwait" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29 +msgid "Other Phone" +msgstr "Anden telefon" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249 -msgid "Kyrgyzstan" -msgstr "Kirgisistan" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30 +msgid "Pager" +msgstr "Personsøger" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250 -msgid "Laos" -msgstr "Laos" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31 +msgid "Primary Phone" +msgstr "Primær telefon" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251 -msgid "Latvia" -msgstr "Letland" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32 +msgid "Radio" +msgstr "Radio" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252 -msgid "Lebanon" -msgstr "Libanon" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33 +#: ../calendar/gui/e-meeting-list-view.c:579 +#: ../calendar/gui/e-meeting-time-sel.etspec.h:9 +#: ../plugins/exchange-operations/exchange-permissions-dialog.c:710 +msgid "Role" +msgstr "Rolle" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253 -msgid "Lesotho" -msgstr "Lesotho" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34 +#: ../addressbook/gui/widgets/eab-contact-display.c:651 +msgid "Spouse" +msgstr "Ægtefælle" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254 -msgid "Liberia" -msgstr "Liberia" +#. Translators: This is a vcard standard and stands for the type of +#. phone used by the hearing impaired. TTY stands for "teletype" +#. (familiar from Unix device names), and TDD is "Telecommunications +#. Device for Deaf". However, you probably want to leave this +#. abbreviation unchanged unless you know that there is actually a +#. different and established translation for this in your language. +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41 +msgid "TTYTDD" +msgstr "TTYTTD" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255 -msgid "Libya" -msgstr "Libya" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42 +msgid "Telex" +msgstr "Telex" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256 -msgid "Liechtenstein" -msgstr "Liechtenstein" - -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257 -msgid "Lithuania" -msgstr "Litauen" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43 +msgid "Title" +msgstr "Titel" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258 -msgid "Luxembourg" -msgstr "Luxembourg" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44 +msgid "Unit" +msgstr "Enhed" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259 -msgid "Macao" -msgstr "Macao" +#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45 +msgid "Web Site" +msgstr "Websted" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260 -msgid "Macedonia" -msgstr "Makedonien" +#: ../addressbook/gui/widgets/e-minicard-label.c:115 +#: ../addressbook/gui/widgets/e-minicard.c:154 +#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84 +#: ../widgets/misc/e-reflow.c:1423 ../widgets/misc/e-reflow.c:1424 +#: ../widgets/table/e-table-click-to-add.c:522 +#: ../widgets/table/e-table-col.c:98 +#: ../widgets/table/e-table-group-container.c:996 +#: ../widgets/table/e-table-group-container.c:997 +#: ../widgets/table/e-table-group-leaf.c:642 +#: ../widgets/table/e-table-group-leaf.c:643 +#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078 +#: ../widgets/text/e-text.c:3731 ../widgets/text/e-text.c:3732 +msgid "Width" +msgstr "Bredde" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261 -msgid "Madagascar" -msgstr "Madagaskar" +#: ../addressbook/gui/widgets/e-minicard-label.c:122 +#: ../addressbook/gui/widgets/e-minicard.c:161 +#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96 +#: ../widgets/misc/e-reflow.c:1431 ../widgets/misc/e-reflow.c:1432 +#: ../widgets/table/e-table-click-to-add.c:529 +#: ../widgets/table/e-table-group-container.c:989 +#: ../widgets/table/e-table-group-container.c:990 +#: ../widgets/table/e-table-group-leaf.c:635 +#: ../widgets/table/e-table-group-leaf.c:636 +#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084 +#: ../widgets/text/e-text.c:3739 ../widgets/text/e-text.c:3740 +msgid "Height" +msgstr "Højde" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262 -msgid "Malawi" -msgstr "Malawi" +#: ../addressbook/gui/widgets/e-minicard-label.c:129 +#: ../addressbook/gui/widgets/e-minicard.c:169 +msgid "Has Focus" +msgstr "Har fokus" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263 -msgid "Malaysia" -msgstr "Malaysia" +#: ../addressbook/gui/widgets/e-minicard-label.c:136 +msgid "Field" +msgstr "Felt" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264 -msgid "Maldives" -msgstr "Maldiverne" +#: ../addressbook/gui/widgets/e-minicard-label.c:143 +msgid "Field Name" +msgstr "Feltnavn" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265 -msgid "Mali" -msgstr "Mali" +#: ../addressbook/gui/widgets/e-minicard-label.c:150 +msgid "Text Model" +msgstr "Tekstmodel" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266 -msgid "Malta" -msgstr "Malta" +#: ../addressbook/gui/widgets/e-minicard-label.c:157 +msgid "Max field name length" +msgstr "Maksimal længde på feltets navn" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267 -msgid "Marshall Islands" -msgstr "Marshalløerne" +#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138 +msgid "Column Width" +msgstr "Kolonnebredde" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268 -msgid "Martinique" -msgstr "Martinique" +#: ../addressbook/gui/widgets/e-minicard-view.c:178 +msgid "" +"\n" +"\n" +"Searching for the Contacts..." +msgstr "" +"\n" +"\n" +"Søger efter kontaktpersonerne..." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269 -msgid "Mauritania" -msgstr "Mauretanien" +#: ../addressbook/gui/widgets/e-minicard-view.c:181 +msgid "" +"\n" +"\n" +"Search for the Contact\n" +"\n" +"or double-click here to create a new Contact." +msgstr "" +"\n" +"\n" +"Søg efter kontaktpersonen\n" +"\n" +"eller dobbeltklik her for at oprette en ny kontaktperson." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270 -msgid "Mauritius" -msgstr "Mauritius" +#: ../addressbook/gui/widgets/e-minicard-view.c:184 +msgid "" +"\n" +"\n" +"There are no items to show in this view.\n" +"\n" +"Double-click here to create a new Contact." +msgstr "" +"\n" +"\n" +"Der findes ingen objekter at vise i denne oversigt\n" +"\n" +"Dobbeltklik her for at oprette en ny kontaktperson." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271 -msgid "Mayotte" -msgstr "Mayotte" +#: ../addressbook/gui/widgets/e-minicard-view.c:188 +msgid "" +"\n" +"\n" +"Search for the Contact." +msgstr "" +"\n" +"\n" +"Søg efter kontaktpersonen." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272 -msgid "Mexico" -msgstr "Mexico" +#: ../addressbook/gui/widgets/e-minicard-view.c:190 +msgid "" +"\n" +"\n" +"There are no items to show in this view." +msgstr "" +"\n" +"\n" +"Der findes ingen objekter at vise i denne oversigt." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273 -msgid "Micronesia" -msgstr "Mikronesien" +#: ../addressbook/gui/widgets/e-minicard-view.c:524 +msgid "Adapter" +msgstr "Adapter" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274 -msgid "Moldova, Republic Of" -msgstr "Moldova" +#: ../addressbook/gui/widgets/e-minicard.c:99 +msgid "Work Email" +msgstr "E-post / arbejde" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275 -msgid "Monaco" -msgstr "Monaco" +#: ../addressbook/gui/widgets/e-minicard.c:100 +msgid "Home Email" +msgstr "E-post / hjemme" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276 -msgid "Mongolia" -msgstr "Mongoliet" +#: ../addressbook/gui/widgets/e-minicard.c:101 +#: ../addressbook/gui/widgets/e-minicard.c:830 +msgid "Other Email" +msgstr "Anden E-post" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277 -msgid "Montserrat" -msgstr "Montserrat" +#: ../addressbook/gui/widgets/e-minicard.c:177 +msgid "Selected" +msgstr "Valgt" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278 -msgid "Morocco" -msgstr "Marokko" +#: ../addressbook/gui/widgets/e-minicard.c:184 +msgid "Has Cursor" +msgstr "Har markør" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279 -msgid "Mozambique" -msgstr "Mozambique" +#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545 +msgid "_Open Link in Browser" +msgstr "_Åbn link i browser" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280 -msgid "Myanmar" -msgstr "Myanmar" +#: ../addressbook/gui/widgets/eab-contact-display.c:170 +#: ../mail/em-folder-view.c:2734 +msgid "_Copy Link Location" +msgstr "_Kopiér adresse" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281 -msgid "Namibia" -msgstr "Namibia" +#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546 +msgid "_Send New Message To..." +msgstr "_Send nyt brev til..." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282 -msgid "Nauru" -msgstr "Nauru" +#: ../addressbook/gui/widgets/eab-contact-display.c:172 +#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2 +msgid "Copy _Email Address" +msgstr "Kopiér e-post_adresse" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283 -msgid "Nepal" -msgstr "Nepal" +#: ../addressbook/gui/widgets/eab-contact-display.c:287 +#: ../addressbook/gui/widgets/eab-contact-display.c:361 +#: ../addressbook/gui/widgets/eab-contact-display.c:363 +msgid "(map)" +msgstr "(kort)" -# Holland udgør kun 2 af Nederland(ene)s 12 provinser. -# og der skelnes mellem Holland og Nederland på sproget. -# Off. danske navn iflg. udenrigsministeriet er Nederlandene. -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284 -msgid "Netherlands" -msgstr "Nederlandene" +#: ../addressbook/gui/widgets/eab-contact-display.c:297 +#: ../addressbook/gui/widgets/eab-contact-display.c:381 +#: ../addressbook/gui/widgets/eab-contact-display.c:393 +msgid "map" +msgstr "kort" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285 -msgid "Netherlands Antilles" -msgstr "Nederlandske Antiller" +#: ../addressbook/gui/widgets/eab-contact-display.c:478 +#: ../addressbook/gui/widgets/eab-contact-display.c:839 +msgid "List Members" +msgstr "Listemedlemer" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286 -msgid "New Caledonia" -msgstr "Ny-kaledonia" +#: ../addressbook/gui/widgets/eab-contact-display.c:623 +msgid "Department" +msgstr "Afdeling" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287 -msgid "New Zealand" -msgstr "New Zealand" +#: ../addressbook/gui/widgets/eab-contact-display.c:624 +msgid "Profession" +msgstr "Profession" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288 -msgid "Nicaragua" -msgstr "Nicaragua" +#: ../addressbook/gui/widgets/eab-contact-display.c:625 +msgid "Position" +msgstr "Position" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289 -msgid "Niger" -msgstr "Niger" +#: ../addressbook/gui/widgets/eab-contact-display.c:628 +msgid "Video Chat" +msgstr "Video-samtale" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290 -msgid "Nigeria" -msgstr "Nigeria" +#: ../addressbook/gui/widgets/eab-contact-display.c:629 +#: ../calendar/gui/calendar-commands.c:90 +#: ../calendar/gui/dialogs/calendar-setup.c:368 +#: ../calendar/gui/gnome-cal.c:2523 +#: ../plugins/exchange-operations/exchange-delegates-user.c:76 +#: ../plugins/exchange-operations/exchange-folder.c:576 +#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424 +#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455 +#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568 +#: ../plugins/hula-account-setup/camel-hula-listener.c:377 +#: ../plugins/hula-account-setup/camel-hula-listener.c:406 +#: ../plugins/publish-calendar/publish-calendar.glade.h:5 +msgid "Calendar" +msgstr "Kalender" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291 -msgid "Niue" -msgstr "Niue" +#: ../addressbook/gui/widgets/eab-contact-display.c:630 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18 +#: ../calendar/gui/dialogs/event-editor.c:116 +msgid "Free/Busy" +msgstr "Ledig/optaget" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292 -msgid "Norfolk Island" -msgstr "Norfolk-øen" +#: ../addressbook/gui/widgets/eab-contact-display.c:631 +#: ../addressbook/gui/widgets/eab-contact-display.c:646 +msgid "Phone" +msgstr "Telefon" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293 -msgid "Northern Mariana Islands" -msgstr "Nordre Mariana-øerne" +#: ../addressbook/gui/widgets/eab-contact-display.c:632 +msgid "Fax" +msgstr "Fax" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294 -msgid "Norway" -msgstr "Norge" +#: ../addressbook/gui/widgets/eab-contact-display.c:633 +#: ../addressbook/gui/widgets/eab-contact-display.c:648 +msgid "Address" +msgstr "Adresse" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295 -msgid "Oman" -msgstr "Oman" +#: ../addressbook/gui/widgets/eab-contact-display.c:643 +msgid "Home Page" +msgstr "Hjemmeside" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296 -msgid "Pakistan" -msgstr "Pakistan" +#: ../addressbook/gui/widgets/eab-contact-display.c:644 +msgid "Web Log" +msgstr "Weblog" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297 -msgid "Palau" -msgstr "Palau" +#: ../addressbook/gui/widgets/eab-contact-display.c:649 +#: ../calendar/gui/e-calendar-view.c:2587 +msgid "Birthday" +msgstr "Fødselsdag" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298 -msgid "Palestinian Territory" -msgstr "Palestinensisk område" +#: ../addressbook/gui/widgets/eab-contact-display.c:650 +#: ../calendar/gui/e-calendar-view.c:2588 +msgid "Anniversary" +msgstr "Bryllupsdag" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299 -msgid "Panama" -msgstr "Panama" +#: ../addressbook/gui/widgets/eab-contact-display.c:857 +msgid "Job Title" +msgstr "Jobtitel" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300 -msgid "Papua New Guinea" -msgstr "Papua Ny Guinea" +#: ../addressbook/gui/widgets/eab-contact-display.c:893 +msgid "Home page" +msgstr "Startside" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301 -msgid "Paraguay" -msgstr "Paraguay" +#: ../addressbook/gui/widgets/eab-contact-display.c:901 +msgid "Blog" +msgstr "Blog" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302 -msgid "Peru" -msgstr "Peru" +#. E_BOOK_ERROR_OK +#: ../addressbook/gui/widgets/eab-gui-util.c:58 +msgid "Success" +msgstr "Lykkedes" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303 -msgid "Philippines" -msgstr "Filippinerne" +#. E_BOOK_ERROR_INVALID_ARG +#. E_BOOK_ERROR_BUSY +#: ../addressbook/gui/widgets/eab-gui-util.c:60 +msgid "Backend busy" +msgstr "Database optaget" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304 -msgid "Pitcairn" -msgstr "Pitcairn" +#. E_BOOK_ERROR_REPOSITORY_OFFLINE +#: ../addressbook/gui/widgets/eab-gui-util.c:61 +msgid "Repository offline" +msgstr "Arkiv er afkoblet" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305 -msgid "Poland" -msgstr "Polen" +#. E_BOOK_ERROR_NO_SUCH_BOOK +#: ../addressbook/gui/widgets/eab-gui-util.c:62 +msgid "Address Book does not exist" +msgstr "Adressebogen findes ikke" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306 -msgid "Portugal" -msgstr "Portugal" +#. E_BOOK_ERROR_NO_SELF_CONTACT +#: ../addressbook/gui/widgets/eab-gui-util.c:63 +msgid "No Self Contact defined" +msgstr "Du er ikke defineret som kontaktperson" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307 -msgid "Puerto Rico" -msgstr "Puerto Rico" +#. E_BOOK_ERROR_URI_NOT_LOADED +#. E_BOOK_ERROR_URI_ALREADY_LOADED +#. E_BOOK_ERROR_PERMISSION_DENIED +#: ../addressbook/gui/widgets/eab-gui-util.c:66 +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51 +msgid "Permission denied" +msgstr "Tilladelse nægtet" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308 -msgid "Qatar" -msgstr "Qatar" +#. E_BOOK_ERROR_CONTACT_NOT_FOUND +#: ../addressbook/gui/widgets/eab-gui-util.c:67 +msgid "Contact not found" +msgstr "Kontaktperson ikke fundet" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309 -msgid "Reunion" -msgstr "Réunion" +#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS +#: ../addressbook/gui/widgets/eab-gui-util.c:68 +msgid "Contact ID already exists" +msgstr "Kontaktpersonens id findes allerede" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310 -msgid "Romania" -msgstr "Rumænien" +#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED +#: ../addressbook/gui/widgets/eab-gui-util.c:69 +msgid "Protocol not supported" +msgstr "Protokollen er ikke tilgængelig" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311 -msgid "Russian Federation" -msgstr "Rusland" +#. E_BOOK_ERROR_CANCELLED +#: ../addressbook/gui/widgets/eab-gui-util.c:70 +#: ../calendar/gui/e-cal-component-preview.c:250 +#: ../calendar/gui/e-cal-model-tasks.c:364 +#: ../calendar/gui/e-cal-model-tasks.c:681 +#: ../calendar/gui/e-calendar-table.c:237 +#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2571 +msgid "Canceled" +msgstr "Afbrudt" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312 -msgid "Rwanda" -msgstr "Rwanda" +#. E_BOOK_ERROR_COULD_NOT_CANCEL +#: ../addressbook/gui/widgets/eab-gui-util.c:71 +msgid "Could not cancel" +msgstr "Kunne ikke annullere" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313 -msgid "Saint Kitts And Nevis" -msgstr "Saint Kitts og Nevis" +#. E_BOOK_ERROR_AUTHENTICATION_FAILED +#: ../addressbook/gui/widgets/eab-gui-util.c:72 +#: ../calendar/gui/comp-editor-factory.c:433 +msgid "Authentication Failed" +msgstr "Godkendelse mislykkedes" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314 -msgid "Saint Lucia" -msgstr "Saint Lucia" +#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED +#: ../addressbook/gui/widgets/eab-gui-util.c:73 +#: ../calendar/gui/comp-editor-factory.c:427 +msgid "Authentication Required" +msgstr "Godkendelse kræves" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315 -msgid "Saint Vincent And The Grenadines" -msgstr "Saint Vincent og Grenadinerne" +#. E_BOOK_ERROR_TLS_NOT_AVAILABLE +#: ../addressbook/gui/widgets/eab-gui-util.c:74 +msgid "TLS not Available" +msgstr "TLS er ikke tilgængelig" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316 -msgid "Samoa" -msgstr "Samoa" +#. E_BOOK_ERROR_CORBA_EXCEPTION +#. E_BOOK_ERROR_NO_SUCH_SOURCE +#: ../addressbook/gui/widgets/eab-gui-util.c:76 +msgid "No such source" +msgstr "Ingen sådan kilde" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317 -msgid "San Marino" -msgstr "San Marino" +#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE +#: ../addressbook/gui/widgets/eab-gui-util.c:77 +msgid "Not available in offline mode" +msgstr "Ikke tilgængelig i afkoblet tilstand" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318 -msgid "Sao Tome And Principe" -msgstr "Sao Tome og Principe" - -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319 -msgid "Saudi Arabia" -msgstr "Saudi Arabien" - -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320 -msgid "Senegal" -msgstr "Senegal" - -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321 -msgid "Serbia And Montenegro" -msgstr "Serbien og Montenegro" +#. E_BOOK_ERROR_OTHER_ERROR +#: ../addressbook/gui/widgets/eab-gui-util.c:78 +msgid "Other error" +msgstr "Anden fejl" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322 -msgid "Seychelles" -msgstr "Seyschellene" +#. E_BOOK_ERROR_INVALID_SERVER_VERSION +#: ../addressbook/gui/widgets/eab-gui-util.c:79 +msgid "Invalid server version" +msgstr "Ugyldig serverversion" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323 -msgid "Sierra Leone" -msgstr "Sierra Leone" +#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD +#: ../addressbook/gui/widgets/eab-gui-util.c:80 +msgid "Unsupported authentication method" +msgstr "Ikke-understøttet godkendelsesmetode" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324 -msgid "Singapore" -msgstr "Singapore" +#: ../addressbook/gui/widgets/eab-gui-util.c:110 +msgid "" +"This address book cannot be opened. This either means this book is not " +"marked for offline usage or not yet downloaded for offline usage. Please " +"load the address book once in online mode to download its contents." +msgstr "" +"Denne adressebog kan ikke åbnes. Dette betyder enten, at bogen ikke er " +"markeret til afkoblet brug eller ikke er blevet hentet ned til afkoblet " +"brug. Indlæs venligst bogen i opkoblet tilstand for at overføre dens indhold." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325 -msgid "Slovakia" -msgstr "Slovakiet" +#: ../addressbook/gui/widgets/eab-gui-util.c:119 +#, c-format +msgid "" +"This address book cannot be opened. Please check that the path %s exists " +"and that permissions are set to access it." +msgstr "" +"Denne adressebog kan ikke åbnes. Kontrollér venligst at stien %s findes og " +"at rettigheder er indstillet, så der er adgang til den." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326 -msgid "Slovenia" -msgstr "Slovenien" +#: ../addressbook/gui/widgets/eab-gui-util.c:131 +msgid "" +"This version of Evolution does not have LDAP support compiled in to it. To " +"use LDAP in Evolution an LDAP-enabled Evolution package must be installed." +msgstr "" +"Denne udgave af Evolution har ikke LDAP-understøttelse indbygget. For at " +"bruge LDAP i Evolution, skal der være installeret en Evolutionpakke med LDAP " +"indbygget." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327 -msgid "Solomon Islands" -msgstr "Solomonøerne" +#: ../addressbook/gui/widgets/eab-gui-util.c:140 +msgid "" +"This address book cannot be opened. This either means that an incorrect URI " +"was entered, or the server is unreachable." +msgstr "" +"Denne adressebog kan ikke åbnes. Dette betyder enten, at du har angivet en " +"ukorrekt adresse, eller at serveren ikke kan nås." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328 -msgid "Somalia" -msgstr "Somalia" +#: ../addressbook/gui/widgets/eab-gui-util.c:148 +msgid "Detailed error message:" +msgstr "Detaljeret fejlbesked:" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329 -msgid "South Africa" -msgstr "Sydafrika" +#: ../addressbook/gui/widgets/eab-gui-util.c:171 +msgid "" +"More cards matched this query than either the server is \n" +"configured to return or Evolution is configured to display.\n" +"Please make your search more specific or raise the result limit in\n" +"the directory server preferences for this address book." +msgstr "" +"Flere kort matchede denne forespørgsel end enten serveren er\n" +"konfigureret til at returnere eller Evolution er konfigureret at vise.\n" +"Gør din søgning mere specifik eller forøg resultatgrænsen i\n" +"katalogserverens indstillinger for denne adressebog." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330 -msgid "South Georgia And The South Sandwich Islands" -msgstr "Syd Georgia og De Sydlige Sandwich-øer" +#: ../addressbook/gui/widgets/eab-gui-util.c:177 +msgid "" +"The time to execute this query exceeded the server limit or the limit\n" +"configured for this address book. Please make your search\n" +"more specific or raise the time limit in the directory server\n" +"preferences for this address book." +msgstr "" +"Udførelsen af denne forespørgsel overskred serverens tidsgrænse eller den " +"tidsgrænse, som er konfigureret for denne adressebog. Gør din søgning mere " +"specifik eller forøg tidsgrænsen i katalogserverens indstillinger for denne " +"adressebog." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331 -msgid "Spain" -msgstr "Spanien" +#: ../addressbook/gui/widgets/eab-gui-util.c:183 +msgid "The backend for this address book was unable to parse this query." +msgstr "" +"Modulet til håndtering af denne adressebog kunne ikke fortolke forespørgslen." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332 -msgid "Sri Lanka" -msgstr "Sri Lanka" +#: ../addressbook/gui/widgets/eab-gui-util.c:186 +msgid "The backend for this address book refused to perform this query." +msgstr "" +"Modulet til håndtering af denne adressebog nægtede at gennemføre denne " +"forespørgsel." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333 -msgid "St. Helena" -msgstr "St. Helena" +#: ../addressbook/gui/widgets/eab-gui-util.c:189 +msgid "This query did not complete successfully." +msgstr "Denne forespørgsel lykkedes ikke." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334 -msgid "St. Pierre And Miquelon" -msgstr "St. Pierre og Miquelon" +#: ../addressbook/gui/widgets/eab-gui-util.c:211 +msgid "Error adding list" +msgstr "Fejl ved tilføjelse af liste" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335 -msgid "Sudan" -msgstr "Sudan" +#: ../addressbook/gui/widgets/eab-gui-util.c:211 +#: ../addressbook/gui/widgets/eab-gui-util.c:687 +msgid "Error adding contact" +msgstr "Fejl ved tilføjelse af kontaktperson" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336 -msgid "Suriname" -msgstr "Surinam" +#: ../addressbook/gui/widgets/eab-gui-util.c:222 +msgid "Error modifying list" +msgstr "Fejl ved ændring af liste" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337 -msgid "Svalbard And Jan Mayen Islands" -msgstr "Øerne Svalbard og Jan Mayen" +#: ../addressbook/gui/widgets/eab-gui-util.c:222 +msgid "Error modifying contact" +msgstr "Fejl ved ændring af kontaktperson" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338 -msgid "Swaziland" -msgstr "Swaziland" +#: ../addressbook/gui/widgets/eab-gui-util.c:234 +msgid "Error removing list" +msgstr "Fejl ved fjernelse af liste" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339 -msgid "Sweden" -msgstr "Sverige" +#: ../addressbook/gui/widgets/eab-gui-util.c:234 +#: ../addressbook/gui/widgets/eab-gui-util.c:637 +msgid "Error removing contact" +msgstr "Fejl ved fjernelse af kontaktperson" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340 -msgid "Switzerland" -msgstr "Schweiz" +#: ../addressbook/gui/widgets/eab-gui-util.c:316 +#, c-format +msgid "" +"Opening %d contact will open %d new window as well.\n" +"Do you really want to display this contact?" +msgid_plural "" +"Opening %d contacts will open %d new windows as well.\n" +"Do you really want to display all of these contacts?" +msgstr[0] "" +"Ved at åbne %d kontaktperson vil yderligere %d nyt vindue åbnes.\n" +"Ønsker du virkelig at vise denne kontaktperson?" +msgstr[1] "" +"Ved at åbne %d kontaktpersoner, vil yderligere %d nye vinduer åbnes.\n" +"Ønsker du virkelig at vise alle disse kontaktpersoner?" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341 -msgid "Syria" -msgstr "Syrien" +#: ../addressbook/gui/widgets/eab-gui-util.c:324 +msgid "_Don't Display" +msgstr "Vis _ikke" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342 -msgid "Taiwan" -msgstr "Taiwan" +#: ../addressbook/gui/widgets/eab-gui-util.c:325 +msgid "Display _All Contacts" +msgstr "Vis _alle kontakter" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343 -msgid "Tajikistan" -msgstr "Tadsjikistan" +#. For Translators only: "it" refers to the filename %s. +#: ../addressbook/gui/widgets/eab-gui-util.c:351 +#, c-format +msgid "" +"%s already exists\n" +"Do you want to overwrite it?" +msgstr "" +"%s eksisterer allerede\n" +"Vil du overskrive den?" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344 -msgid "Tanzania, United Republic Of" -msgstr "Tanzania" +#: ../addressbook/gui/widgets/eab-gui-util.c:355 +msgid "Overwrite" +msgstr "Overskriv" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345 -msgid "Thailand" -msgstr "Thailand" +#. more than one, finding the total number of contacts might +#. * hit performance while saving large number of contacts +#. +#: ../addressbook/gui/widgets/eab-gui-util.c:396 +#: ../addressbook/gui/widgets/eab-gui-util.c:399 +msgid "contact" +msgid_plural "contacts" +msgstr[0] "kontaktperson" +msgstr[1] "kontaktpersoner" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346 -msgid "Timor-Leste" -msgstr "Timor-Leste" +#. This is a filename. Translators take note. +#: ../addressbook/gui/widgets/eab-gui-util.c:445 +msgid "card.vcf" +msgstr "card.vcf" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347 -msgid "Togo" -msgstr "Togo" +#: ../addressbook/gui/widgets/eab-gui-util.c:482 +msgid "Select Address Book" +msgstr "Vælg adressebog" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348 -msgid "Tokelau" -msgstr "Tokelau" +#: ../addressbook/gui/widgets/eab-gui-util.c:596 +msgid "list" +msgstr "liste" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349 -msgid "Tonga" -msgstr "Tonga" +#: ../addressbook/gui/widgets/eab-gui-util.c:748 +msgid "Move contact to" +msgstr "Flyt kontaktperson til" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350 -msgid "Trinidad And Tobago" -msgstr "Trinidad og Tobago" +#: ../addressbook/gui/widgets/eab-gui-util.c:750 +msgid "Copy contact to" +msgstr "Kopiér kontaktperson til" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351 -msgid "Tunisia" -msgstr "Tunesien" +#: ../addressbook/gui/widgets/eab-gui-util.c:753 +msgid "Move contacts to" +msgstr "Flyt kontaktpersoner til" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352 -msgid "Turkey" -msgstr "Tyrkiet" +#: ../addressbook/gui/widgets/eab-gui-util.c:755 +msgid "Copy contacts to" +msgstr "Kopiér kontaktpersoner til" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353 -msgid "Turkmenistan" -msgstr "Turkmenistan" +#: ../addressbook/gui/widgets/eab-gui-util.c:903 +msgid "Multiple vCards" +msgstr "Flere vCards" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354 -msgid "Turks And Caicos Islands" -msgstr "Turks og Caicos-øerne" +#: ../addressbook/gui/widgets/eab-gui-util.c:910 +#, c-format +msgid "vCard for %s" +msgstr "vCard for %s" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355 -msgid "Tuvalu" -msgstr "Tuvalu" +#: ../addressbook/gui/widgets/eab-gui-util.c:922 +#: ../addressbook/gui/widgets/eab-gui-util.c:948 +#, c-format +msgid "Contact information" +msgstr "Information om kontaktperson" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356 -msgid "Uganda" -msgstr "Uganda" +#: ../addressbook/gui/widgets/eab-gui-util.c:950 +#, c-format +msgid "Contact information for %s" +msgstr "Information om kontaktpersonen %s" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357 -msgid "Ukraine" -msgstr "Ukraine" +#: ../addressbook/gui/widgets/eab-popup-control.c:292 +msgid "Querying Address Book..." +msgstr "Forespørger adressebogen..." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358 -msgid "United Arab Emirates" -msgstr "De forenede arabiske emirater" +#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37 +msgid "Card View" +msgstr "Visitkortvisning" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359 -msgid "United Kingdom" -msgstr "Storbritannien" +#: ../addressbook/importers/evolution-csv-importer.c:661 +#: ../addressbook/importers/evolution-ldif-importer.c:513 +#: ../addressbook/importers/evolution-vcard-importer.c:252 +#: ../calendar/importers/icalendar-importer.c:310 +#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7 +msgid "Importing..." +msgstr "Importerer..." -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360 -msgid "United States Minor Outlying Islands" -msgstr "USA, mindre omliggende øer" +#: ../addressbook/importers/evolution-csv-importer.c:863 +msgid "Outlook CSV or Tab (.csv, .tab)" +msgstr "Outlook CSV eller Tab (.csv, .tab)" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361 -msgid "Uruguay" -msgstr "Uruguay" +#: ../addressbook/importers/evolution-csv-importer.c:864 +msgid "Outlook CSV and Tab Importer" +msgstr "Evolution CSV- og Tab-importør" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362 -msgid "Uzbekistan" -msgstr "Usbekistan" +#: ../addressbook/importers/evolution-csv-importer.c:872 +msgid "Mozilla CSV or Tab (.csv, .tab)" +msgstr "Mozilla CSV eller Tab (.csv, .tab)" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363 -msgid "Vanuatu" -msgstr "Vanuatu" +#: ../addressbook/importers/evolution-csv-importer.c:873 +msgid "Mozilla CSV and Tab Importer" +msgstr "Mozilla CSV- og Tab-importør" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364 -msgid "Venezuela" -msgstr "Venezuela" +#: ../addressbook/importers/evolution-csv-importer.c:881 +msgid "Evolution CSV or Tab (.csv, .tab)" +msgstr "Evolution CSV eller Tab (.csv, .tab)" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365 -msgid "Viet Nam" -msgstr "Vietnam" +#: ../addressbook/importers/evolution-csv-importer.c:882 +msgid "Evolution CSV and Tab Importer" +msgstr "Evolution CSV- og Tab-importør" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366 -msgid "Virgin Islands, British" -msgstr "Britiske Jomfruøer" +#: ../addressbook/importers/evolution-ldif-importer.c:680 +msgid "LDAP Data Interchange Format (.ldif)" +msgstr "LDAP-dataudvekslingsformat (.ldif)" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367 -msgid "Virgin Islands, U.S." -msgstr "Amerikanske Jomfruøer" +#: ../addressbook/importers/evolution-ldif-importer.c:681 +msgid "Evolution LDIF importer" +msgstr "Evolution LDIF-importør" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368 -msgid "Wallis And Futuna Islands" -msgstr "Wallis- og Futuna-øerne" +#: ../addressbook/importers/evolution-vcard-importer.c:549 +msgid "vCard (.vcf, .gcrd)" +msgstr "vCard (.vcf, .gcrd)" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369 -msgid "Western Sahara" -msgstr "Vestlige Sahara" +#: ../addressbook/importers/evolution-vcard-importer.c:550 +msgid "Evolution vCard Importer" +msgstr "Evolution vCard-importør" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370 -msgid "Yemen" -msgstr "Yemen" +#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653 +#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689 +#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48 +msgid "Can not open file" +msgstr "Kan ikke åbne filen" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371 -msgid "Zambia" -msgstr "Zambia" +#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42 +msgid "Couldn't get list of address books" +msgstr "Kunne ikke etablere liste over adressebøger" -#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372 -msgid "Zimbabwe" -msgstr "Zimbabwe" +#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70 +msgid "failed to open book" +msgstr "kunne ikke åbne bog" -#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85 -#: ../mail/em-mailer-prefs.c:467 -#: ../plugins/exchange-operations/exchange-delegates.c:954 -#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711 -#: ../plugins/plugin-manager/plugin-manager.c:57 -#: ../plugins/save-attachments/save-attachments.c:351 -#: ../widgets/menus/gal-define-views-dialog.c:346 -#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90 -#: ../widgets/menus/gal-view-new-dialog.c:63 -msgid "Name" -msgstr "Navn" +#: ../addressbook/tools/evolution-addressbook-export.c:45 +msgid "Specify the output file instead of standard output" +msgstr "Angiv uddatafil i stedet for standard uddata" -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53 -msgid "AOL Instant Messenger" -msgstr "AOL-kvikbesked" +#: ../addressbook/tools/evolution-addressbook-export.c:46 +msgid "OUTPUTFILE" +msgstr "UDDATAFIL" -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:177 -#: ../addressbook/gui/widgets/eab-contact-display.c:608 -msgid "Jabber" -msgstr "Jabber" +#: ../addressbook/tools/evolution-addressbook-export.c:49 +msgid "List local address book folders" +msgstr "Vis lokale adressebogmapper" -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56 -msgid "Yahoo Messenger" -msgstr "Yahoo Messenger" +#: ../addressbook/tools/evolution-addressbook-export.c:52 +msgid "Show cards as vcard or csv file" +msgstr "Vis kontakter som vcard eller csv-fil" -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57 -msgid "Gadu-Gadu Messenger" -msgstr "Gadu-Gadu Messenger" +#: ../addressbook/tools/evolution-addressbook-export.c:53 +msgid "[vcard|csv]" +msgstr "[vcard|csv]" -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:181 -#: ../addressbook/gui/widgets/eab-contact-display.c:607 -msgid "ICQ" -msgstr "ICQ" +#: ../addressbook/tools/evolution-addressbook-export.c:56 +msgid "Export in asynchronous mode" +msgstr "Eksportér i asynkron tilstand" -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:183 -#: ../addressbook/gui/widgets/eab-contact-display.c:612 -msgid "Skype" -msgstr "Skype" - -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150 -msgid "Service" -msgstr "Tjeneste" - -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159 -#: ../calendar/gui/caltypes.xml.h:12 -#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9 -#: ../plugins/publish-calendar/publish-calendar.c:694 -#: ../plugins/save-calendar/csv-format.c:376 -msgid "Location" -msgstr "Sted" - -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166 -msgid "Username" -msgstr "Brugernavn" - -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:196 -#: ../addressbook/gui/widgets/eab-contact-display.c:58 -msgid "Home" -msgstr "Hjem" - -#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:197 -#: ../addressbook/gui/widgets/eab-contact-display.c:59 -#: ../addressbook/gui/widgets/eab-contact-display.c:519 -#: ../calendar/gui/e-calendar-view.c:2259 -msgid "Other" -msgstr "Anden" - -#: ../addressbook/gui/contact-editor/e-contact-editor.c:178 -#: ../addressbook/gui/widgets/eab-contact-display.c:610 -msgid "Yahoo" -msgstr "Yahoo" - -#: ../addressbook/gui/contact-editor/e-contact-editor.c:179 -#: ../addressbook/gui/widgets/eab-contact-display.c:611 -msgid "Gadu-Gadu" -msgstr "Gadu-Gadu" - -#: ../addressbook/gui/contact-editor/e-contact-editor.c:180 -#: ../addressbook/gui/widgets/eab-contact-display.c:609 -msgid "MSN" -msgstr "MSN" - -#: ../addressbook/gui/contact-editor/e-contact-editor.c:182 -#: ../addressbook/gui/widgets/eab-contact-display.c:606 -msgid "GroupWise" -msgstr "GroupWise" - -#: ../addressbook/gui/contact-editor/e-contact-editor.c:252 -msgid "Source Book" -msgstr "Kildebog" - -#: ../addressbook/gui/contact-editor/e-contact-editor.c:259 -msgid "Target Book" -msgstr "Målbog" - -#: ../addressbook/gui/contact-editor/e-contact-editor.c:273 -msgid "Is New Contact" -msgstr "Er ny kontaktperson" +# Lack of space after the comma +# http://bugzilla.ximian.com/show_bug.cgi?id=61069 +#: ../addressbook/tools/evolution-addressbook-export.c:59 +msgid "" +"The number of cards in one output file in asynchronous mode, default size " +"100." +msgstr "" +"Antallet af visitkort i én uddatafil i asynkron tilstand, standardstørrelsen " +"100." -#: ../addressbook/gui/contact-editor/e-contact-editor.c:280 -msgid "Writable Fields" -msgstr "Skrivbare felter" +#: ../addressbook/tools/evolution-addressbook-export.c:61 +msgid "NUMBER" +msgstr "ANTAL" -#: ../addressbook/gui/contact-editor/e-contact-editor.c:287 -msgid "Required Fields" -msgstr "Obligatoriske felter" +#: ../addressbook/tools/evolution-addressbook-export.c:99 +msgid "" +"Command line arguments error, please use --help option to see the usage." +msgstr "" +"Fejl i argumenter på kommandolinjen - benyt argumentet --help for at få " +"hjælp." -#: ../addressbook/gui/contact-editor/e-contact-editor.c:301 -msgid "Changed" -msgstr "Ændret" +#: ../addressbook/tools/evolution-addressbook-export.c:113 +msgid "Only support csv or vcard format." +msgstr "Understøt kun csv- eller vcard-format." -#: ../addressbook/gui/contact-editor/e-contact-editor.c:553 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418 -#, c-format -msgid "Contact Editor - %s" -msgstr "Redigering af kontaktperson - %s" +#: ../addressbook/tools/evolution-addressbook-export.c:122 +msgid "In async mode, output must be file." +msgstr "I asynkron tilstand skal uddata være en fil." -#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814 -msgid "Please select an image for this contact" -msgstr "Vælg venligst et billede til denne kontaktperson" +# Strange use of English +# http://bugzilla.ximian.com/show_bug.cgi?id=61070 +#: ../addressbook/tools/evolution-addressbook-export.c:130 +msgid "In normal mode, there is no need for the size option." +msgstr "I normal-tilstand behøves intet tilvalg af størrelse." -#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815 -msgid "_No image" -msgstr "_Intet billede" +#: ../addressbook/tools/evolution-addressbook-export.c:161 +msgid "Unhandled error" +msgstr "Fejl der ikke blev håndteret" -#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089 +#. For Translators: {0} is the name of the calendar source +#: ../calendar/calendar.error.xml.h:2 msgid "" -"The contact data is invalid:\n" -"\n" +"'{0}' is a read-only calendar and cannot be modified. Please select a " +"different calendar from the side bar in the Calendar view." msgstr "" -"Data om kontaktperson er ugyldige:\n" -"\n" - -#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093 -#, c-format -msgid "'%s' has an invalid format" -msgstr "\"%s\" er i et ugyldigt format" - -#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100 -#, c-format -msgid "%s'%s' has an invalid format" -msgstr "%s\"%s\" er i et ugyldigt format" - -#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115 -#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126 -#, c-format -msgid "%s'%s' is empty" -msgstr "%s\"%s\" har intet indhold" - -#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141 -msgid "Invalid contact." -msgstr "Ugyldig kontaktperson." +"\"{0}\" er en skrivebeskyttet kalender og kan ikke modificeres. Vælg " +"venligst en anden kalender fra sidepanelet i kalendervisningen." -#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324 -msgid "Contact Quick-Add" -msgstr "Hurtig tilføjelse af kontaktperson" +#. For Translators: {0} is the name of the calendar source +#: ../calendar/calendar.error.xml.h:4 +msgid "" +"'{0}' is a read-only calendar and cannot be modified. Please select a " +"different calendar that can accept appointments." +msgstr "" +"\"{0}\" er en skrivebeskyttet kalender og kan ikke modificeres. Vælg " +"venligst en anden kalender som vil acceptere aftaler." -#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327 -msgid "_Edit Full" -msgstr "_Redigér alt" +#: ../calendar/calendar.error.xml.h:5 +msgid "" +"Adding a meaningful summary to your appointment will give your recipients an " +"idea of what your appointment is about." +msgstr "" +"Hvis du giver din aftale et meningsfyldt sammendrag, vil dine modtagere få " +"en idé om, hvad din aftale handler om." -#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401 -msgid "_Full name" -msgstr "_Fulde navn" +#: ../calendar/calendar.error.xml.h:6 +msgid "" +"Adding a meaningful summary to your task will give your recipients an idea " +"of what your task is about." +msgstr "" +"Hvis du giver opgaven et meningsfyldt sammendrag, vil dine modtagere få en " +"idé om, hvad opgaven handler om." -#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412 -msgid "E_mail" -msgstr "E-_post" +#: ../calendar/calendar.error.xml.h:7 +msgid "All information in these memos will be deleted and can not be restored." +msgstr "" +"Al information i disse huskesedler vil blive slettet og vil ikke kunne " +"genoprettes." -#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423 -msgid "_Select Address Book" -msgstr "_Vælg adressebog" +#: ../calendar/calendar.error.xml.h:8 +msgid "All information in this memo will be deleted and can not be restored." +msgstr "" +"Al information i denne huskeseddel vil blive slettet og vil ikke kunne " +"genoprettes." -#: ../addressbook/gui/contact-editor/eab-editor.c:323 -#, c-format +#: ../calendar/calendar.error.xml.h:9 msgid "" -"Are you sure you want\n" -"to delete contact list (%s)?" +"All information on these appointments will be deleted and can not be " +"restored." msgstr "" -"Er du sikker på du vil\n" -"slette listen over kontaktpersoner (%s)?" +"Al information om disse aftaler vil blive slettet og vil ikke kunne " +"genoprettes." -#: ../addressbook/gui/contact-editor/eab-editor.c:326 -msgid "" -"Are you sure you want\n" -"to delete these contact lists?" +#: ../calendar/calendar.error.xml.h:10 +msgid "All information on these tasks will be deleted and can not be restored." msgstr "" -"Er du sikker på du vil\n" -"slette disse lister over kontaktpersoner?" +"Al information om disse opgaver vil blive slettet og vil ikke kunne " +"genoprettes." -#: ../addressbook/gui/contact-editor/eab-editor.c:331 -#, c-format +#: ../calendar/calendar.error.xml.h:11 msgid "" -"Are you sure you want\n" -"to delete contact (%s)?" +"All information on this appointment will be deleted and can not be restored." msgstr "" -"Er du sikker på du vil\n" -"slette kontaktpersonen (%s)?" +"Al information i denne aftale vil blive slettet og vil ikke kunne " +"genoprettes." -#: ../addressbook/gui/contact-editor/eab-editor.c:334 +#: ../calendar/calendar.error.xml.h:12 msgid "" -"Are you sure you want\n" -"to delete these contacts?" +"All information on this meeting will be deleted and can not be restored." msgstr "" -"Er du sikker på at du vil\n" -"fjerne disse kontaktpersoner?" - -#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1 -msgid "Address _2:" -msgstr "Adresse _2:" - -#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2 -msgid "Ci_ty:" -msgstr "_By:" +"Al information om dette møde vil blive slettet og vil ikke kunne genoprettes." -#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3 -msgid "Countr_y:" -msgstr "Lan_d:" +#: ../calendar/calendar.error.xml.h:13 +msgid "All information on this memo will be deleted and can not be restored." +msgstr "" +"Al information om denne huskeseddel vil blive slettet og vil ikke kunne " +"genoprettes." -#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4 -msgid "Full Address" -msgstr "Fulde adresse" +#: ../calendar/calendar.error.xml.h:14 +msgid "All information on this task will be deleted and can not be restored." +msgstr "" +"Al information om denne opgave vil blive slettet og vil ikke kunne " +"genoprettes." -#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8 -msgid "_ZIP Code:" -msgstr "_ZIP/Postnummer:" +#: ../calendar/calendar.error.xml.h:15 +msgid "Are you sure you want to delete the '{0}' task?" +msgstr "Er du sikker på du vil slette opgaven \"{0}\"?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:1 -msgid "Dr." -msgstr "Dr." +#: ../calendar/calendar.error.xml.h:16 +msgid "Are you sure you want to delete the appointment titled '{0}'?" +msgstr "Er du sikker på du vil slette aftalen med titlen \"{0}\"?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:2 -msgid "Esq." -msgstr "Herr" +#: ../calendar/calendar.error.xml.h:17 +msgid "Are you sure you want to delete the memo '{0}'?" +msgstr "Er du sikker på du vil slette huskesedlen \"{0}\"?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:3 -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16 -msgid "Full Name" -msgstr "Fulde navn" +#: ../calendar/calendar.error.xml.h:18 +msgid "Are you sure you want to delete these {0} appointments?" +msgstr "Er du sikker på du vil slette disse {0} aftaler?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:4 -msgid "I" -msgstr "I" +#: ../calendar/calendar.error.xml.h:19 +msgid "Are you sure you want to delete these {0} memos?" +msgstr "Er du sikker på du vil slette disse {0} huskesedler?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:5 -msgid "II" -msgstr "II" +#: ../calendar/calendar.error.xml.h:20 +msgid "Are you sure you want to delete these {0} tasks?" +msgstr "Er du sikker på du vil slette disse {0} opgaver?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:6 -msgid "III" -msgstr "III" +#: ../calendar/calendar.error.xml.h:21 +msgid "Are you sure you want to delete this appointment?" +msgstr "Er du sikker på du vil slette denne aftale?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:7 -msgid "Jr." -msgstr "Jr." +#: ../calendar/calendar.error.xml.h:22 +#: ../calendar/gui/dialogs/delete-comp.c:182 +#, c-format +msgid "Are you sure you want to delete this meeting?" +msgstr "Er du sikker på du vil slette dette møde?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:8 -msgid "Miss" -msgstr "Frk." +#: ../calendar/calendar.error.xml.h:23 +#: ../calendar/gui/dialogs/delete-comp.c:188 +#, c-format +msgid "Are you sure you want to delete this memo?" +msgstr "Er du sikker på du vil slette denne huskeseddel?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:9 -msgid "Mr." -msgstr "Hr." +#: ../calendar/calendar.error.xml.h:24 +#: ../calendar/gui/dialogs/delete-comp.c:185 +#, c-format +msgid "Are you sure you want to delete this task?" +msgstr "Er du sikker på du vil slette denne opgave?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:10 -msgid "Mrs." -msgstr "Fru" +#: ../calendar/calendar.error.xml.h:25 +msgid "Are you sure you want to save the memo without a summary?" +msgstr "Er du sikker på du vil gemme denne huskeseddel uden et sammendrag?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:11 -msgid "Ms." -msgstr "Frk." +#: ../calendar/calendar.error.xml.h:26 +msgid "Are you sure you want to send the appointment without a summary?" +msgstr "Er du sikker på du vil sende aftalen uden et sammendrag?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:12 -msgid "Sr." -msgstr "Sr." +#: ../calendar/calendar.error.xml.h:27 +msgid "Are you sure you want to send the task without a summary?" +msgstr "Er du sikker på du vil sende opgaven uden et sammendrag?" -#: ../addressbook/gui/contact-editor/fullname.glade.h:13 -msgid "_First:" -msgstr "_Fornavn:" +#: ../calendar/calendar.error.xml.h:28 +msgid "Calendar repository is offline." +msgstr "Kalenderarkiv er afkoblet." -#: ../addressbook/gui/contact-editor/fullname.glade.h:14 -msgid "_Last:" -msgstr "_Efternavn:" +#: ../calendar/calendar.error.xml.h:29 +msgid "Cannot create a new event" +msgstr "Kan ikke oprette en ny begivenhed" -#: ../addressbook/gui/contact-editor/fullname.glade.h:15 -msgid "_Middle:" -msgstr "_Mellemnavn:" +#: ../calendar/calendar.error.xml.h:30 +msgid "Cannot save event" +msgstr "Kan ikke gemme begivenhed" -#: ../addressbook/gui/contact-editor/fullname.glade.h:16 -msgid "_Suffix:" -msgstr "_Suffiks:" +#: ../calendar/calendar.error.xml.h:31 +msgid "Delete calendar '{0}'?" +msgstr "Slet kalenderen \"{0}\"?" -#: ../addressbook/gui/contact-editor/im.glade.h:1 -msgid "Add IM Account" -msgstr "Tilføj kvikbesked-konto" +#: ../calendar/calendar.error.xml.h:32 +msgid "Delete memo list '{0}'?" +msgstr "Slet listen over huskesedler \"{0}\"?" -#: ../addressbook/gui/contact-editor/im.glade.h:2 -msgid "_Account name:" -msgstr "_Kontonavn:" +#: ../calendar/calendar.error.xml.h:33 +msgid "Delete task list '{0}'?" +msgstr "Slet opgave-listen \"{0}\"?" -#: ../addressbook/gui/contact-editor/im.glade.h:3 -msgid "_IM Service:" -msgstr "_Kvikbesked-tjeneste:" +#: ../calendar/calendar.error.xml.h:34 +msgid "Do _not Send" +msgstr "Send _ikke" -#: ../addressbook/gui/contact-editor/im.glade.h:4 -#: ../calendar/gui/dialogs/event-page.glade.h:16 -#: ../plugins/calendar-weather/calendar-weather.c:372 -#: ../plugins/exchange-operations/exchange-calendar.c:247 -#: ../plugins/exchange-operations/exchange-contacts.c:239 -msgid "_Location:" -msgstr "_Sted:" +#: ../calendar/calendar.error.xml.h:35 +msgid "Download in progress. Do you want to save the appointment?" +msgstr "Overføring i gang. Vil du gemme aftalen?" -#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1 -msgid "Members" -msgstr "Medlemmer:" +#: ../calendar/calendar.error.xml.h:36 +msgid "Download in progress. Do you want to save the task?" +msgstr "Overføring i gang. Vil du gemme opgaven?" -#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2 -#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668 -msgid "Contact List Editor" -msgstr "Redigering af liste over kontaktpersoner" +#: ../calendar/calendar.error.xml.h:37 +msgid "Editor could not be loaded." +msgstr "Redigeringsprogram kunne ikke indlæses." -#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3 -#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220 -#: ../calendar/gui/e-day-view-time-item.c:815 -#: ../calendar/gui/e-timezone-entry.c:121 -msgid "Select..." -msgstr "Vælg..." +#: ../calendar/calendar.error.xml.h:38 +msgid "" +"Email invitations will be sent to all participants and allow them to accept " +"this task." +msgstr "" +"E-post-invitationer sendes til alle deltagerne således at de kan godkende " +"denne opgave." -#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4 -msgid "_Hide addresses when sending mail to this list" -msgstr "_Skjul adresser når du sender e-post til listen" +#: ../calendar/calendar.error.xml.h:39 +msgid "" +"Email invitations will be sent to all participants and allow them to reply." +msgstr "" +"E-post-invitationer bliver sendt til alle deltagerne, således at de kan " +"svare." -#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5 -msgid "_List name:" -msgstr "_Listenavn:" +#: ../calendar/calendar.error.xml.h:40 +msgid "Error loading calendar" +msgstr "Fejl ved indlæsning af kalender" -#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6 -msgid "_Type an email address or drag a contact into the list below:" -msgstr "" -"_Skriv en e-postadresse eller træk en kontaktperson ind i listen nedenfor:" +#: ../calendar/calendar.error.xml.h:41 +msgid "Error loading memo list" +msgstr "Fejl ved indlæsning af liste over huskesedler" -#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761 -msgid "Contact List Members" -msgstr "Medlemmer af liste over kontaktpersoner" +#: ../calendar/calendar.error.xml.h:42 +msgid "Error loading task list" +msgstr "Fejl ved indlæsning af opgaveliste" -#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900 -#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239 -msgid "_Members" -msgstr "_Medlemmer" +#. For Translators: {0} is specify the backend server +#: ../calendar/calendar.error.xml.h:44 +msgid "Error on '{0}'" +msgstr "Fejl ved \"{0}\"" -#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148 -#: ../addressbook/gui/widgets/e-addressbook-model.c:311 -#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405 -#: ../addressbook/gui/widgets/e-addressbook-view.c:211 -#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117 -#: ../addressbook/gui/widgets/e-minicard-view.c:531 -msgid "Book" -msgstr "Bog" +#: ../calendar/calendar.error.xml.h:45 +msgid "" +"If you do not send a cancelation notice, the other participants may not know " +"the meeting is canceled." +msgstr "" +"Hvis du ikke sender afbud, vil de andre deltagere måske ikke vide at mødet " +"er aflyst." -#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168 -msgid "Is New List" -msgstr "Er ny liste" +#: ../calendar/calendar.error.xml.h:46 +msgid "" +"If you do not send a cancelation notice, the other participants may not know " +"the memo has been deleted." +msgstr "" +"Hvis du ikke sender en aflysningsnotits, får de øvrige deltagere måske ikke " +"at vide, at denne huskeseddel er blevet slettet." -#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1 -msgid "Changed Contact:" -msgstr "Ændret kontaktperson:" +#: ../calendar/calendar.error.xml.h:47 +msgid "" +"If you do not send a cancelation notice, the other participants may not know " +"the task has been deleted." +msgstr "" +"Hvis du ikke underretter de øvrige deltagere om at du har slettet opgaven, " +"vil de måske ikke vide det." -#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2 -msgid "Conflicting Contact:" -msgstr "Kontaktperson i konflikt:" +#: ../calendar/calendar.error.xml.h:48 +msgid "No response from the server." +msgstr "Intet svar fra serveren." -#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3 -#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1 -msgid "Duplicate Contact Detected" -msgstr "Dublet af kontaktperson fundet" +#: ../calendar/calendar.error.xml.h:49 +msgid "Save Appointment" +msgstr "Gem aftale" -#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4 +#: ../calendar/calendar.error.xml.h:50 +msgid "Save Memo" +msgstr "Gem huskeseddel" + +#: ../calendar/calendar.error.xml.h:51 +msgid "Save Task" +msgstr "Gem opgave" + +#: ../calendar/calendar.error.xml.h:52 msgid "" -"The name or email of this contact already exists in this folder. Would you " -"like to add it anyway?" +"Sending updated information allows other participants to keep their " +"calendars up to date." msgstr "" -"Navnet eller e-postadressen for denne kontaktperson eksisterer allerede i " -"denne mappe. Vil du tilføje den alligevel?" +"Ved at sende opdateret information vil andre deltagere kunne holde deres " +"kalendere opdateret." -#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2 -msgid "New Contact:" -msgstr "Ny kontaktperson:" +#: ../calendar/calendar.error.xml.h:53 +msgid "" +"Sending updated information allows other participants to keep their task " +"lists up to date." +msgstr "" +"Ved at sende opdateret information, vil de andre deltagere kunne opdatere " +"deres opgavelister." -#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3 -msgid "Original Contact:" -msgstr "Oprindelig kontaktperson:" +#: ../calendar/calendar.error.xml.h:55 +msgid "" +"Some attachments are being downloaded. Saving the appointment would result " +"in the loss of these attachments." +msgstr "" +"Nogle bilag er ved at blive hentet. Gemmer du denne aftale nu, vil bilagene " +"ikke blive gemt sammen med aftalen." -#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4 +#: ../calendar/calendar.error.xml.h:56 msgid "" -"The name or email address of this contact already exists\n" -"in this folder. Would you like to add it anyway?" +"Some attachments are being downloaded. Saving the task would result in the " +"loss of these attachments." msgstr "" -"Navnet eller e-postadressen for denne kontaktperson eksisterer allerede\n" -"i denne mappe. Vil du tilføje den alligevel?" +"Nogle bilag er ved at blive hentet. Gem er du denne opgave nu, vil bilagene " +"ikke blive gemt sammen med opgaven." -#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6 -#: ../addressbook/gui/merging/eab-contact-merging.c:214 -msgid "_Merge" -msgstr "_Flet" +#: ../calendar/calendar.error.xml.h:57 +msgid "Some features may not work properly with your current server." +msgstr "" +"Visse faciliteter vil måske ikke virke ordentligt med din nuværende server." -#: ../addressbook/gui/merging/eab-contact-merging.c:199 -msgid "Merge Contact" -msgstr "Flet kontakt" +#: ../calendar/calendar.error.xml.h:58 +msgid "The Evolution calendar has quit unexpectedly." +msgstr "Evolutions kalender afsluttedes uventet." -#: ../addressbook/gui/merging/eab-contact-merging.c:267 -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11 -#: ../addressbook/gui/widgets/eab-contact-display.c:583 -#: ../addressbook/gui/widgets/eab-contact-display.c:588 -#: ../addressbook/gui/widgets/eab-contact-display.c:591 -#: ../addressbook/gui/widgets/eab-contact-display.c:871 -#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810 -msgid "Email" -msgstr "E-post" +#: ../calendar/calendar.error.xml.h:59 +msgid "The Evolution calendars have quit unexpectedly." +msgstr "Evolutionskalenderne afsluttedes uventet." -#: ../addressbook/gui/widgets/addresstypes.xml.h:1 -#: ../addressbook/gui/widgets/e-addressbook-view.c:160 -#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2 -#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4 -msgid "Any field contains" -msgstr "Et felt indeholder" +#: ../calendar/calendar.error.xml.h:60 +msgid "The Evolution memo has quit unexpectedly." +msgstr "Evolutions huskeseddel afsluttedes uventet." -#: ../addressbook/gui/widgets/addresstypes.xml.h:2 -#: ../addressbook/gui/widgets/e-addressbook-view.c:159 -msgid "Email begins with" -msgstr "E-postadresse begynder med" +#: ../calendar/calendar.error.xml.h:61 +msgid "The Evolution tasks have quit unexpectedly." +msgstr "Evolutions opgaver afsluttedes uventet." -#: ../addressbook/gui/widgets/addresstypes.xml.h:3 -msgid "Name contains" -msgstr "Navn indeholder" +#: ../calendar/calendar.error.xml.h:62 +msgid "The calendar is not marked for offline usage." +msgstr "Kalenderen er ikke markeret til brug i afkoblet tilstand." -#: ../addressbook/gui/widgets/e-addressbook-model.c:163 -msgid "No contacts" -msgstr "Ingen kontaktpersoner" +#: ../calendar/calendar.error.xml.h:63 +msgid "The memo list is not marked for offline usage." +msgstr "Huskeseddel-listen er ikke markeret til brug i afkoblet tilstand." -#: ../addressbook/gui/widgets/e-addressbook-model.c:166 -#, c-format -msgid "%d contact" -msgid_plural "%d contacts" -msgstr[0] "%d kontaktperson" -msgstr[1] "%d kontaktpersoner" +#: ../calendar/calendar.error.xml.h:64 +msgid "The task list is not marked for offline usage." +msgstr "Opgavelisten er ikke markeret til brug i afkoblet tilstand." -#: ../addressbook/gui/widgets/e-addressbook-model.c:318 -#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412 -#: ../addressbook/gui/widgets/e-addressbook-view.c:225 -#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124 -#: ../addressbook/gui/widgets/e-minicard-view.c:538 -msgid "Query" -msgstr "Forespørgsel" +#: ../calendar/calendar.error.xml.h:65 +msgid "This calendar will be removed permanently." +msgstr "Denne kalender vil blive fjernet permanent." -#: ../addressbook/gui/widgets/e-addressbook-model.c:461 -msgid "Error getting book view" -msgstr "Fejl ved bogvisning" +#: ../calendar/calendar.error.xml.h:66 +msgid "This memo list will be removed permanently." +msgstr "Denne liste over huskesedler vil blive fjernet permanent." -#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426 -#: ../widgets/table/e-table-click-to-add.c:509 -#: ../widgets/table/e-table-selection-model.c:302 -#: ../widgets/table/e-table.c:3354 -#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552 -#: ../widgets/text/e-text.c:3553 -msgid "Model" -msgstr "Model" +#: ../calendar/calendar.error.xml.h:67 +msgid "This task list will be removed permanently." +msgstr "Denne opgaveliste vil blive fjernet permanent." -#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150 -msgid "Error modifying card" -msgstr "Fejl ved ændring af kort" +#: ../calendar/calendar.error.xml.h:68 +msgid "Unable to load the calendar" +msgstr "Kunne ikke indlæse kalenderen" -#: ../addressbook/gui/widgets/e-addressbook-view.c:158 -msgid "Name begins with" -msgstr "Navn begynder med" +#: ../calendar/calendar.error.xml.h:69 +msgid "Would you like to save your changes to this appointment?" +msgstr "Vil du gemme dine ændringer for denne aftale?" -#: ../addressbook/gui/widgets/e-addressbook-view.c:218 -msgid "Source" -msgstr "Kilde" +#: ../calendar/calendar.error.xml.h:70 +msgid "Would you like to save your changes to this memo?" +msgstr "Vil du gemme dine ændringer af denne huskeseddel?" -#: ../addressbook/gui/widgets/e-addressbook-view.c:232 -#: ../calendar/gui/e-calendar-table.etspec.h:12 -#: ../calendar/gui/e-meeting-list-view.c:565 -#: ../calendar/gui/e-meeting-time-sel.etspec.h:11 -#: ../calendar/gui/e-memo-table.etspec.h:5 -msgid "Type" -msgstr "Type" +#: ../calendar/calendar.error.xml.h:71 +msgid "Would you like to save your changes to this task?" +msgstr "Vil du gemme dine ændringer af opgaven?" -#: ../addressbook/gui/widgets/e-addressbook-view.c:812 -#: ../addressbook/gui/widgets/e-addressbook-view.c:1965 -msgid "Save as vCard..." -msgstr "Gem som vCard..." +#: ../calendar/calendar.error.xml.h:72 +msgid "Would you like to send a cancelation notice for this memo?" +msgstr "Vil du sende en aflysningsnotits for denne huskeseddel?" -#: ../addressbook/gui/widgets/e-addressbook-view.c:933 -#: ../calendar/gui/dialogs/comp-editor.c:2090 -#: ../calendar/gui/e-calendar-table.c:1587 -#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:922 -#: ../ui/evolution-addressbook.xml.h:56 -msgid "_Open" -msgstr "_Åbn" +#: ../calendar/calendar.error.xml.h:73 +msgid "Would you like to send all the participants a cancelation notice?" +msgstr "Vil du sende en aflysningsnotits til alle deltagerne?" -#: ../addressbook/gui/widgets/e-addressbook-view.c:935 -msgid "_New Contact..." -msgstr "N_y kontaktperson..." +#: ../calendar/calendar.error.xml.h:74 +msgid "Would you like to send meeting invitations to participants?" +msgstr "Vil du sende mødeinvitationer til deltagerne?" -#: ../addressbook/gui/widgets/e-addressbook-view.c:936 -msgid "New Contact _List..." -msgstr "Ny _liste over kontaktpersoner..." +#: ../calendar/calendar.error.xml.h:75 +msgid "Would you like to send this task to participants?" +msgstr "Vil du sende denne opgave til deltagerne?" -#: ../addressbook/gui/widgets/e-addressbook-view.c:939 -msgid "_Save as vCard..." -msgstr "_Gem som vCard..." +#: ../calendar/calendar.error.xml.h:76 +msgid "Would you like to send updated meeting information to participants?" +msgstr "Vil du sende opdateret mødeinformation til alle deltagerne?" -#: ../addressbook/gui/widgets/e-addressbook-view.c:940 -msgid "_Forward Contact" -msgstr "_Videresend kontaktperson" +#: ../calendar/calendar.error.xml.h:77 +msgid "Would you like to send updated task information to participants?" +msgstr "Vil du sende opdateret opgaveinformation til deltagerne?" -#: ../addressbook/gui/widgets/e-addressbook-view.c:941 -msgid "_Forward Contacts" -msgstr "Vider_esend kontaktpersoner" +#: ../calendar/calendar.error.xml.h:78 +msgid "" +"You are connecting to an unsupported GroupWise server and may encounter " +"problems using Evolution. For best results, the server should be upgraded to " +"a supported version." +msgstr "" +"Du tilslutter dig en GroupWise-server der ikke er understøttet, du vil " +"muligvis opleve problemer med Evolution. For at få det bedste resultat skal " +"serveren opgraderes til en understøttet version." -#: ../addressbook/gui/widgets/e-addressbook-view.c:942 -msgid "Send _Message to Contact" -msgstr "Send _brev til kontaktperson" +#: ../calendar/calendar.error.xml.h:79 +msgid "You have changed this appointment, but not yet saved it." +msgstr "Du har ændret denne aftale, men ikke gemt ændringerne endnu." -#: ../addressbook/gui/widgets/e-addressbook-view.c:943 -msgid "Send _Message to List" -msgstr "Send _brev til liste" +#: ../calendar/calendar.error.xml.h:80 +msgid "You have changed this task, but not yet saved it." +msgstr "Du har lavet ændringer af opgaven, men ikke gemt dem endnu." -#: ../addressbook/gui/widgets/e-addressbook-view.c:944 -msgid "Send _Message to Contacts" -msgstr "Send _brev til kontaktpersoner" +#: ../calendar/calendar.error.xml.h:81 +msgid "You have made changes to this memo, but not yet saved them." +msgstr "Du har lavet ændringer af huskesedlen, men ikke gemt dem endnu." -#: ../addressbook/gui/widgets/e-addressbook-view.c:945 -msgid "_Print" -msgstr "_Udskriv" +#: ../calendar/calendar.error.xml.h:82 +msgid "Your calendars will not be available until Evolution is restarted." +msgstr "Dine kalendere vil ikke være tilgængelige før Evolution genstartes." -#: ../addressbook/gui/widgets/e-addressbook-view.c:948 -msgid "Cop_y to Address Book..." -msgstr "Kopiér til _adressebog..." +#: ../calendar/calendar.error.xml.h:83 +msgid "Your memos will not be available until Evolution is restarted." +msgstr "Dine huskesedler vil ikke være tilgængelige før Evolution genstartes." -#: ../addressbook/gui/widgets/e-addressbook-view.c:949 -msgid "Mo_ve to Address Book..." -msgstr "_Flyt til adressebog..." +#: ../calendar/calendar.error.xml.h:84 +msgid "Your tasks will not be available until Evolution is restarted." +msgstr "Dine opgaver vil ikke være tilgængelige før Evolution genstartes." -#: ../addressbook/gui/widgets/e-addressbook-view.c:952 -msgid "Cu_t" -msgstr "Klip u_d" +#: ../calendar/calendar.error.xml.h:85 +#: ../composer/mail-composer.error.xml.h:30 +msgid "_Discard Changes" +msgstr "_Forkast ændringer" -#: ../addressbook/gui/widgets/e-addressbook-view.c:953 -#: ../calendar/gui/dialogs/comp-editor.c:487 -#: ../calendar/gui/e-calendar-table.c:1595 -#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:930 -#: ../composer/e-msg-composer.c:2056 ../mail/em-folder-tree.c:1005 -#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105 -#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40 -#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15 -#: ../ui/evolution-tasks.xml.h:23 -msgid "_Copy" -msgstr "_Kopiér" +#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343 +msgid "_Save" +msgstr "_Gem" -#: ../addressbook/gui/widgets/e-addressbook-view.c:954 -msgid "P_aste" -msgstr "Ind_sæt" +#: ../calendar/calendar.error.xml.h:87 +msgid "_Save Changes" +msgstr "_Gem ændringer" -#. All, unmatched, separator -#: ../addressbook/gui/widgets/e-addressbook-view.c:1528 -#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671 -#: ../calendar/gui/cal-search-bar.c:690 -msgid "Any Category" -msgstr "Alle kategorier" +#: ../calendar/calendar.error.xml.h:88 +#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142 +#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6 +msgid "_Send" +msgstr "_Send" -#: ../addressbook/gui/widgets/e-addressbook-view.c:1531 -#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675 -#: ../calendar/gui/cal-search-bar.c:694 -msgid "Unmatched" -msgstr "Ingen træffere" +#: ../calendar/calendar.error.xml.h:89 +msgid "_Send Notice" +msgstr "_Send notits" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1 -#: ../addressbook/gui/widgets/eab-contact-display.c:626 -msgid "Assistant" -msgstr "Assistent" +#: ../calendar/calendar.error.xml.h:90 +msgid "{0}." +msgstr "{0}." -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2 -msgid "Assistant Phone" -msgstr "Assistents telefon" +#: ../calendar/conduits/calendar/calendar-conduit.c:249 +msgid "Split Multi-Day Events:" +msgstr "Dél flerdagsbegivenheder:" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3 -msgid "Business Fax" -msgstr "Fax på arbejde" +#: ../calendar/conduits/calendar/calendar-conduit.c:1514 +#: ../calendar/conduits/calendar/calendar-conduit.c:1515 +#: ../calendar/conduits/memo/memo-conduit.c:809 +#: ../calendar/conduits/memo/memo-conduit.c:810 +#: ../calendar/conduits/todo/todo-conduit.c:1008 +#: ../calendar/conduits/todo/todo-conduit.c:1009 +msgid "Could not start evolution-data-server" +msgstr "Kunne ikke starte evolution-data-server" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4 -msgid "Business Phone" -msgstr "Arbejdstelefon" +#: ../calendar/conduits/calendar/calendar-conduit.c:1622 +#: ../calendar/conduits/calendar/calendar-conduit.c:1625 +msgid "Could not read pilot's Calendar application block" +msgstr "Kunne ikke læse pilotens kalender-programblok" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5 -msgid "Business Phone 2" -msgstr "Arbejdstelefon 2" +#: ../calendar/conduits/memo/memo-conduit.c:903 +#: ../calendar/conduits/memo/memo-conduit.c:906 +msgid "Could not read pilot's Memo application block" +msgstr "Kunne ikke læse pilotens programblok for huskeseddel" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6 -msgid "Callback Phone" -msgstr "Telefon til tilbageringning" +#: ../calendar/conduits/memo/memo-conduit.c:950 +#: ../calendar/conduits/memo/memo-conduit.c:953 +msgid "Could not write pilot's Memo application block" +msgstr "Kunne ikke skrive til pilotens programblok for huskeseddel" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7 -msgid "Car Phone" -msgstr "Biltelefon" +#: ../calendar/conduits/todo/todo-conduit.c:229 +msgid "Default Priority:" +msgstr "Standardprioritet:" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8 -#: ../calendar/gui/dialogs/event-page.glade.h:7 -#: ../calendar/gui/e-cal-component-memo-preview.c:138 -#: ../calendar/gui/e-cal-list-view.etspec.h:1 -#: ../calendar/gui/e-calendar-table.etspec.h:3 -#: ../calendar/gui/e-memo-table.etspec.h:1 -msgid "Categories" -msgstr "Kategorier" +#: ../calendar/conduits/todo/todo-conduit.c:1092 +#: ../calendar/conduits/todo/todo-conduit.c:1095 +msgid "Could not read pilot's ToDo application block" +msgstr "Kunne ikke læse pilotens programblok for opgaveliste" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9 -#: ../addressbook/gui/widgets/eab-contact-display.c:621 -msgid "Company" -msgstr "Firma" +#: ../calendar/conduits/todo/todo-conduit.c:1137 +#: ../calendar/conduits/todo/todo-conduit.c:1140 +msgid "Could not write pilot's ToDo application block" +msgstr "Kunne ikke skrive til pilotens programblok for opgaveliste" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10 -msgid "Company Phone" -msgstr "Firmatelefon" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1 +#: ../plugins/itip-formatter/itip-formatter.c:2536 +msgid "Calendar and Tasks" +msgstr "Kalender og opgaver" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12 -msgid "Email 2" -msgstr "E-post 2" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2 +#: ../calendar/gui/calendar-component.c:820 +#: ../calendar/gui/calendar-component.c:1242 +msgid "Calendars" +msgstr "Kalendere" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13 -msgid "Email 3" -msgstr "E-post 3" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3 +msgid "Configure your timezone, Calendar and Task List here " +msgstr "Konfigurér din tidszone, kalender og opgaveliste her " -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14 -msgid "Family Name" -msgstr "Efternavn" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4 +msgid "Evolution Calendar and Tasks" +msgstr "Evolutions kalender- og opgaveoversigt" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15 -msgid "File As" -msgstr "Gem som" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5 +msgid "Evolution Calendar configuration control" +msgstr "Styreelement til opsætning af Evolutions kalender" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17 -msgid "Given Name" -msgstr "Fornavn" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6 +msgid "Evolution Calendar scheduling message viewer" +msgstr "Visning af Evolution-kalenderens planlægningsbesked" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18 -msgid "Home Fax" -msgstr "Fax hjemme" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7 +msgid "Evolution Calendar/Task editor" +msgstr "Evolution kalender/opgave-redigering" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19 -msgid "Home Phone" -msgstr "Hjemmetelefon" - -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20 -msgid "Home Phone 2" -msgstr "Hjemmetelefon 2" - -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21 -msgid "ISDN Phone" -msgstr "ISDN-telefon" - -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22 -msgid "Journal" -msgstr "Journal" - -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23 -#: ../addressbook/gui/widgets/eab-contact-display.c:625 -msgid "Manager" -msgstr "Leder" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8 +msgid "Evolution's Calendar component" +msgstr "Evolutions kalenderkomponent" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24 -#: ../addressbook/gui/widgets/eab-contact-display.c:646 -msgid "Mobile Phone" -msgstr "Mobiltelefon" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9 +msgid "Evolution's Memos component" +msgstr "Evolutions huskeseddel-komponent" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25 -#: ../addressbook/gui/widgets/eab-contact-display.c:599 -msgid "Nickname" -msgstr "Kælenavn" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10 +msgid "Evolution's Tasks component" +msgstr "Evolutions opgavekomponent" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26 -#: ../addressbook/gui/widgets/eab-contact-display.c:659 -msgid "Note" -msgstr "Note" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11 +msgid "Memo_s" +msgstr "H_uskesedler" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27 -msgid "Office" -msgstr "Kontor" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12 +#: ../calendar/gui/e-memo-table.c:291 ../calendar/gui/e-memos.c:1132 +#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:566 +#: ../calendar/gui/memos-component.c:884 ../calendar/gui/memos-control.c:389 +#: ../calendar/gui/memos-control.c:405 +msgid "Memos" +msgstr "Huskesedler" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28 -msgid "Other Fax" -msgstr "Anden fax" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13 +#: ../calendar/gui/e-calendar-table.c:723 ../calendar/gui/e-tasks.c:1436 +#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1991 +#: ../calendar/gui/tasks-component.c:558 ../calendar/gui/tasks-component.c:880 +#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544 +#: ../calendar/importers/icalendar-importer.c:76 +#: ../calendar/importers/icalendar-importer.c:751 +#: ../plugins/exchange-operations/exchange-delegates-user.c:76 +#: ../plugins/exchange-operations/exchange-folder.c:590 +#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425 +#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569 +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12 +msgid "Tasks" +msgstr "Opgaver" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29 -msgid "Other Phone" -msgstr "Anden telefon" +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14 +msgid "_Calendars" +msgstr "K_alendere" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30 -msgid "Pager" -msgstr "Personsøger" +#. Tasks +#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15 +#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3 +msgid "_Tasks" +msgstr "_Opgaver" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31 -msgid "Primary Phone" -msgstr "Primær telefon" +#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1 +msgid "Evolution Calendar alarm notification service" +msgstr "Evolution kalenderpåmindelse" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32 -msgid "Radio" -msgstr "Radio" +#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "minut" +msgstr[1] "minutter" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33 -#: ../calendar/gui/e-meeting-list-view.c:577 -#: ../calendar/gui/e-meeting-time-sel.etspec.h:9 -#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715 -msgid "Role" -msgstr "Rolle" +#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117 +#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8 +#: ../calendar/gui/dialogs/event-page.glade.h:22 +#: ../plugins/caldav/caldav-source.c:449 +#: ../plugins/calendar-http/calendar-http.c:279 +#: ../plugins/calendar-weather/calendar-weather.c:524 +#: ../plugins/google-account-setup/google-source.c:654 +#: ../plugins/google-account-setup/google-contacts-source.c:331 +msgid "hours" +msgid_plural "hours" +msgstr[0] "timer" +msgstr[1] "timer" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34 -#: ../addressbook/gui/widgets/eab-contact-display.c:650 -msgid "Spouse" -msgstr "Ægtefælle" +#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:295 +msgid "Start time" +msgstr "Starttidspunkt" -#. Translators: This is a vcard standard and stands for the type of -#. phone used by the hearing impaired. TTY stands for "teletype" -#. (familiar from Unix device names), and TDD is "Telecommunications -#. Device for Deaf". However, you probably want to leave this -#. abbreviation unchanged unless you know that there is actually a -#. different and established translation for this in your language. -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41 -msgid "TTYTDD" -msgstr "TTYTTD" +#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1 +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4 +msgid "Appointments" +msgstr "Aftaler" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42 -msgid "Telex" -msgstr "Telex" +#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2 +msgid "Dismiss _All" +msgstr "Forkast _alle" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43 -msgid "Title" -msgstr "Titel" +#. Location +#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1604 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1610 +#: ../calendar/gui/e-itip-control.c:1165 +#: ../plugins/itip-formatter/itip-view.c:1024 +msgid "Location:" +msgstr "Sted:" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44 -msgid "Unit" -msgstr "Enhed" +#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4 +msgid "Snooze _time:" +msgstr "Udsæt_tid:" -#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45 -msgid "Web Site" -msgstr "Websted" +#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5 +msgid "_Dismiss" +msgstr "_Forkast" -#: ../addressbook/gui/widgets/e-minicard-label.c:116 -#: ../addressbook/gui/widgets/e-minicard.c:155 -#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86 -#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425 -#: ../widgets/table/e-table-click-to-add.c:523 -#: ../widgets/table/e-table-col.c:98 -#: ../widgets/table/e-table-field-chooser-item.c:654 -#: ../widgets/table/e-table-group-container.c:992 -#: ../widgets/table/e-table-group-container.c:993 -#: ../widgets/table/e-table-group-leaf.c:637 -#: ../widgets/table/e-table-group-leaf.c:638 -#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078 -#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731 -msgid "Width" -msgstr "Bredde" +#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6 +#: ../calendar/gui/dialogs/comp-editor.c:1019 +#: ../calendar/gui/dialogs/recurrence-page.glade.h:8 +#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168 +#: ../plugins/exchange-operations/exchange-delegates.glade.h:15 +#: ../plugins/publish-calendar/publish-calendar.glade.h:22 +#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43 +#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17 +#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42 +#: ../widgets/menus/gal-define-views.glade.h:5 +msgid "_Edit" +msgstr "R_edigér" -#: ../addressbook/gui/widgets/e-minicard-label.c:123 -#: ../addressbook/gui/widgets/e-minicard.c:162 -#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98 -#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433 -#: ../widgets/table/e-table-click-to-add.c:530 -#: ../widgets/table/e-table-field-chooser-item.c:661 -#: ../widgets/table/e-table-group-container.c:985 -#: ../widgets/table/e-table-group-container.c:986 -#: ../widgets/table/e-table-group-leaf.c:630 -#: ../widgets/table/e-table-group-leaf.c:631 -#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084 -#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739 -msgid "Height" -msgstr "Højde" +#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7 +msgid "_Snooze" +msgstr "_Udsæt" -#: ../addressbook/gui/widgets/e-minicard-label.c:130 -#: ../addressbook/gui/widgets/e-minicard.c:170 -msgid "Has Focus" -msgstr "Har fokus" +#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9 +msgid "location of appointment" +msgstr "placering af aftale" -#: ../addressbook/gui/widgets/e-minicard-label.c:137 -msgid "Field" -msgstr "Felt" +#: ../calendar/gui/alarm-notify/alarm-queue.c:1462 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1587 +msgid "No summary available." +msgstr "Intet tilgængeligt sammendrag." -#: ../addressbook/gui/widgets/e-minicard-label.c:144 -msgid "Field Name" -msgstr "Feltnavn" +#: ../calendar/gui/alarm-notify/alarm-queue.c:1471 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1473 +msgid "No description available." +msgstr "Ingen tilgængelig beskrivelse." -#: ../addressbook/gui/widgets/e-minicard-label.c:151 -msgid "Text Model" -msgstr "Tekstmodel" +#: ../calendar/gui/alarm-notify/alarm-queue.c:1481 +msgid "No location information available." +msgstr "Ingen tilgængelig stedinformation." -#: ../addressbook/gui/widgets/e-minicard-label.c:158 -msgid "Max field name length" -msgstr "Maksimal længde på feltets navn" +#: ../calendar/gui/alarm-notify/alarm-queue.c:1526 +#, c-format +msgid "You have %d alarms" +msgstr "Du har %d påmindelser" -#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138 -msgid "Column Width" -msgstr "Kolonnebredde" +#: ../calendar/gui/alarm-notify/alarm-queue.c:1688 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1716 +#: ../e-util/e-non-intrusive-error-dialog.h:41 +msgid "Warning" +msgstr "Advarsel" -#: ../addressbook/gui/widgets/e-minicard-view.c:178 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1692 msgid "" -"\n" -"\n" -"Searching for the Contacts..." +"Evolution does not support calendar reminders with\n" +"email notifications yet, but this reminder was\n" +"configured to send an email. Evolution will display\n" +"a normal reminder dialog box instead." msgstr "" -"\n" -"\n" -"Søger efter kontaktpersonerne..." +"Evolution understøtter ikke påmindelser pr. brev endnu,\n" +"men denne påmindelse blev konfigureret til at sende et brev.\n" +"Evolution vil vise en normal dialog med påmindelse i stedet." -#: ../addressbook/gui/widgets/e-minicard-view.c:181 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1722 +#, c-format msgid "" +"An Evolution Calendar reminder is about to trigger. This reminder is " +"configured to run the following program:\n" "\n" +" %s\n" "\n" -"Search for the Contact\n" -"\n" -"or double-click here to create a new Contact." +"Are you sure you want to run this program?" msgstr "" +"En Evolution kalenderpåmindelse udløses snart.\n" +"Denne påmindelse er konfigureret til at køre følgende program:\n" "\n" +" %s\n" "\n" -"Søg efter kontaktpersonen\n" -"\n" -"eller dobbeltklik her for at oprette en ny kontaktperson." +"Er du sikker på at du vil køre dette program?" -#: ../addressbook/gui/widgets/e-minicard-view.c:184 -msgid "" -"\n" -"\n" -"There are no items to show in this view.\n" -"\n" -"Double-click here to create a new Contact." -msgstr "" -"\n" -"\n" -"Der findes ingen objekter at vise i denne oversigt\n" -"\n" -"Dobbeltklik her for at oprette en ny kontaktperson." +#: ../calendar/gui/alarm-notify/alarm-queue.c:1736 +msgid "Do not ask me about this program again." +msgstr "Spørg mig ikke om dette program igen." -#: ../addressbook/gui/widgets/e-minicard-view.c:188 -msgid "" -"\n" -"\n" -"Search for the Contact." -msgstr "" -"\n" -"\n" -"Søg efter kontaktpersonen." +#: ../calendar/gui/alarm-notify/notify-main.c:141 +msgid "Could not initialize Bonobo" +msgstr "Kunne ikke initialisere Bonobo" -#: ../addressbook/gui/widgets/e-minicard-view.c:190 +# "Factory" er en factory-funktion, vi nøjes med "funktion -MBJ +#: ../calendar/gui/alarm-notify/notify-main.c:154 msgid "" -"\n" -"\n" -"There are no items to show in this view." +"Could not create the alarm notify service factory, maybe it's already " +"running..." msgstr "" -"\n" -"\n" -"Der findes ingen objekter at vise i denne oversigt." +"Kunne ikke oprette funktionen til påmindelser, måske kører den allerede..." -#: ../addressbook/gui/widgets/e-minicard-view.c:524 -msgid "Adapter" -msgstr "Adapter" +#: ../calendar/gui/alarm-notify/util.c:44 +msgid "invalid time" +msgstr "ugyldig tidsangivelse" -#: ../addressbook/gui/widgets/e-minicard.c:100 -msgid "Work Email" -msgstr "E-post / arbejde" +#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment" +#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406 +#: ../calendar/gui/misc.c:116 +#, c-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d time" +msgstr[1] "%d timer" -#: ../addressbook/gui/widgets/e-minicard.c:101 -msgid "Home Email" -msgstr "E-post / hjemme" +#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment" +#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412 +#: ../calendar/gui/misc.c:122 +#, c-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minut" +msgstr[1] "%d minutter" -#: ../addressbook/gui/widgets/e-minicard.c:102 -#: ../addressbook/gui/widgets/e-minicard.c:831 -msgid "Other Email" -msgstr "Anden E-post" +#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") +#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment" +#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") +#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418 +#: ../calendar/gui/misc.c:126 +#, c-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "%d sekund" +msgstr[1] "%d sekunder" -#: ../addressbook/gui/widgets/e-minicard.c:178 -msgid "Selected" -msgstr "Valgt" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1 +msgid "Alarm programs" +msgstr "Programmer der udløses ved påmindelser" -#: ../addressbook/gui/widgets/e-minicard.c:185 -msgid "Has Cursor" -msgstr "Har markør" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2 +#: ../mail/evolution-mail.schemas.in.h:6 +msgid "Amount of time in seconds the error should be shown on the status bar." +msgstr "Antallet af sekunder fejlen skal vises i statusbjælken." -#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623 -msgid "_Open Link in Browser" -msgstr "_Åbn link i browser" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3 +msgid "Ask for confirmation when deleting items" +msgstr "Spørg efter bekræftelse ved sletning af punkter" -#: ../addressbook/gui/widgets/eab-contact-display.c:170 -#: ../mail/em-folder-view.c:2757 -msgid "_Copy Link Location" -msgstr "_Kopiér adresse" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4 +msgid "Background color of tasks that are due today, in \"#rrggbb\" format." +msgstr "Baggrundsfarve for dagens opgaver, i \"#rrggbb\"-format." -#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624 -msgid "_Send New Message To..." -msgstr "_Send nyt brev til..." +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5 +msgid "Background color of tasks that are overdue, in \"#rrggbb\" format." +msgstr "" +"Baggrundsfarve for opgaver der tidsmæssigt er overskredet, i \"#rrggbb\"-" +"format." -#: ../addressbook/gui/widgets/eab-contact-display.c:172 -#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2 -msgid "Copy _Email Address" -msgstr "Kopiér e-post_adresse" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6 +msgid "Calendars to run alarms for" +msgstr "Kalendere hvor påmindelser skal gives" -#: ../addressbook/gui/widgets/eab-contact-display.c:287 -#: ../addressbook/gui/widgets/eab-contact-display.c:361 -#: ../addressbook/gui/widgets/eab-contact-display.c:363 -msgid "(map)" -msgstr "(kort)" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7 +msgid "Check this to use system timezone in Evolution." +msgstr "" -#: ../addressbook/gui/widgets/eab-contact-display.c:297 -#: ../addressbook/gui/widgets/eab-contact-display.c:381 -#: ../addressbook/gui/widgets/eab-contact-display.c:393 -msgid "map" -msgstr "kort" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8 +msgid "" +"Color to draw the Marcus Bains Line in the Time bar (empty for default)." +msgstr "" +"Farven der bruges til at tegne Marcus Bains-linjen i tidslinjen (tom for " +"standardfarven)." -#: ../addressbook/gui/widgets/eab-contact-display.c:478 -#: ../addressbook/gui/widgets/eab-contact-display.c:838 -msgid "List Members" -msgstr "Listemedlemer" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9 +msgid "Color to draw the Marcus Bains line in the Day View." +msgstr "Farven der bruges til at tegne Marcus Bains-linjen i dagsoversigten." -#: ../addressbook/gui/widgets/eab-contact-display.c:622 -msgid "Department" -msgstr "Afdeling" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10 +msgid "Compress weekends in month view" +msgstr "Komprimér weekender i månedsoversigt" -#: ../addressbook/gui/widgets/eab-contact-display.c:623 -msgid "Profession" -msgstr "Profession" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11 +msgid "Confirm expunge" +msgstr "Bekræft tømning" -#: ../addressbook/gui/widgets/eab-contact-display.c:624 -msgid "Position" -msgstr "Position" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12 +msgid "Days on which the start and end of work hours should be indicated." +msgstr "Dage hvor start og slut på arbejdstimerne skal indikeres." -#: ../addressbook/gui/widgets/eab-contact-display.c:627 -msgid "Video Chat" -msgstr "Video-samtale" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13 +msgid "Default appointment reminder" +msgstr "Standard-aftalepåmindelse" -#: ../addressbook/gui/widgets/eab-contact-display.c:628 -#: ../calendar/gui/calendar-commands.c:90 -#: ../calendar/gui/dialogs/calendar-setup.c:369 -#: ../calendar/gui/gnome-cal.c:2512 -#: ../plugins/exchange-operations/exchange-delegates-user.c:78 -#: ../plugins/exchange-operations/exchange-folder.c:576 -#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424 -#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455 -#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568 -#: ../plugins/hula-account-setup/camel-hula-listener.c:377 -#: ../plugins/hula-account-setup/camel-hula-listener.c:406 -#: ../plugins/publish-calendar/publish-calendar.glade.h:5 -msgid "Calendar" -msgstr "Kalender" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14 +msgid "Default reminder units" +msgstr "Tidsenheder der anvendes som standard ved påmindelser" -#: ../addressbook/gui/widgets/eab-contact-display.c:629 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 -#: ../calendar/gui/dialogs/event-editor.c:116 -msgid "Free/Busy" -msgstr "Ledig/optaget" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15 +msgid "Default reminder value" +msgstr "Værdier der anvendes som standard ved påmindelser" -#: ../addressbook/gui/widgets/eab-contact-display.c:630 -#: ../addressbook/gui/widgets/eab-contact-display.c:645 -msgid "Phone" -msgstr "Telefon" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16 +msgid "Directory for saving alarm audio files" +msgstr "Mappe hvor alarm lydfiler skal gemmes i" -#: ../addressbook/gui/widgets/eab-contact-display.c:631 -msgid "Fax" -msgstr "Fax" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17 +msgid "Event Gradient" +msgstr "Gradient ved begivenhed" -#: ../addressbook/gui/widgets/eab-contact-display.c:642 -msgid "Home Page" -msgstr "Hjemmeside" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18 +msgid "Event Transparency" +msgstr "Gennemsigtighed ved begivenhed" -#: ../addressbook/gui/widgets/eab-contact-display.c:643 -msgid "Web Log" -msgstr "Weblog" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19 +msgid "Free/busy server URLs" +msgstr "Server-adresser ved ledig/optaget" -#: ../addressbook/gui/widgets/eab-contact-display.c:648 -#: ../calendar/gui/e-calendar-view.c:2538 -msgid "Birthday" -msgstr "Fødselsdag" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20 +msgid "Free/busy template URL" +msgstr "Skabelon-adresse for ledig/optaget" -#: ../addressbook/gui/widgets/eab-contact-display.c:649 -#: ../calendar/gui/e-calendar-view.c:2539 -msgid "Anniversary" -msgstr "Bryllupsdag" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21 +msgid "Gradient of the events in calendar views." +msgstr "Gradient ved begivenheder i kalenderoversigter." -#: ../addressbook/gui/widgets/eab-contact-display.c:856 -msgid "Job Title" -msgstr "Jobtitel" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22 +msgid "Hide completed tasks" +msgstr "Skjul udførte opgaver" -#: ../addressbook/gui/widgets/eab-contact-display.c:892 -msgid "Home page" -msgstr "Startside" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23 +msgid "Hide task units" +msgstr "Skjul opgave-enheder" -#: ../addressbook/gui/widgets/eab-contact-display.c:900 -msgid "Blog" -msgstr "Blog" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24 +msgid "Hide task value" +msgstr "Skjul opgaveværdi" -#. E_BOOK_ERROR_OK -#: ../addressbook/gui/widgets/eab-gui-util.c:58 -msgid "Success" -msgstr "Lykkedes" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25 +msgid "Horizontal pane position" +msgstr "Rudens vandrette placering" -#. E_BOOK_ERROR_INVALID_ARG -#. E_BOOK_ERROR_BUSY -#: ../addressbook/gui/widgets/eab-gui-util.c:60 -msgid "Backend busy" -msgstr "Database optaget" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26 +msgid "Hour the workday ends on, in twenty four hour format, 0 to 23." +msgstr "Timen hvorpå arbejdsdagen slutter, i 24-timers-format, 0 - 23." -#. E_BOOK_ERROR_REPOSITORY_OFFLINE -#: ../addressbook/gui/widgets/eab-gui-util.c:61 -msgid "Repository offline" -msgstr "Arkiv er afkoblet" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27 +msgid "Hour the workday starts on, in twenty four hour format, 0 to 23." +msgstr "Timen hvorpå arbejdsdagen starter, i 24-timers-format, 0 - 23." -#. E_BOOK_ERROR_NO_SUCH_BOOK -#: ../addressbook/gui/widgets/eab-gui-util.c:62 -msgid "Address Book does not exist" -msgstr "Adressebogen findes ikke" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28 +msgid "Intervals shown in Day and Work Week views, in minutes." +msgstr "Tidsintervaller der vises i dag- og arbejdsugeoversigter, i minutter." -#. E_BOOK_ERROR_NO_SELF_CONTACT -#: ../addressbook/gui/widgets/eab-gui-util.c:63 -msgid "No Self Contact defined" -msgstr "Du er ikke defineret som kontaktperson" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29 +msgid "Last alarm time" +msgstr "Seneste tidspunkt for påmindelse" -#. E_BOOK_ERROR_URI_NOT_LOADED -#. E_BOOK_ERROR_URI_ALREADY_LOADED -#. E_BOOK_ERROR_PERMISSION_DENIED -#: ../addressbook/gui/widgets/eab-gui-util.c:66 -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51 -msgid "Permission denied" -msgstr "Tilladelse nægtet" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30 +#: ../mail/evolution-mail.schemas.in.h:72 +msgid "Level beyond which the message should be logged." +msgstr "Over dette niveau logges brevet." -#. E_BOOK_ERROR_CONTACT_NOT_FOUND -#: ../addressbook/gui/widgets/eab-gui-util.c:67 -msgid "Contact not found" -msgstr "Kontaktperson ikke fundet" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31 +msgid "List of recently used second time zones in a Day View." +msgstr "Liste af nyligt brugte sekundære tidszoner i dagsvisning." -#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS -#: ../addressbook/gui/widgets/eab-gui-util.c:68 -msgid "Contact ID already exists" -msgstr "Kontaktpersonens id findes allerede" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32 +msgid "List of server URLs for free/busy publishing." +msgstr "Liste med server-adresser for ledig- / optaget-udgivelse." -#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED -#: ../addressbook/gui/widgets/eab-gui-util.c:69 -msgid "Protocol not supported" -msgstr "Protokollen er ikke tilgængelig" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33 +msgid "Marcus Bains Line" +msgstr "Marcus Bains-linje" -#. E_BOOK_ERROR_CANCELLED -#: ../addressbook/gui/widgets/eab-gui-util.c:70 -#: ../calendar/gui/dialogs/task-details-page.glade.h:3 -#: ../calendar/gui/e-cal-component-preview.c:250 -#: ../calendar/gui/e-cal-model-tasks.c:364 -#: ../calendar/gui/e-cal-model-tasks.c:681 -#: ../calendar/gui/e-calendar-table.c:239 -#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2564 -msgid "Canceled" -msgstr "Afbrudt" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34 +msgid "Marcus Bains Line Color - Day View" +msgstr "Farve for Marcus Bains-linje - dagsoversigt" -#. E_BOOK_ERROR_COULD_NOT_CANCEL -#: ../addressbook/gui/widgets/eab-gui-util.c:71 -msgid "Could not cancel" -msgstr "Kunne ikke annullere" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35 +msgid "Marcus Bains Line Color - Time bar" +msgstr "Farve for Marcus Bains-linje - tidslinje" -#. E_BOOK_ERROR_AUTHENTICATION_FAILED -#: ../addressbook/gui/widgets/eab-gui-util.c:72 -#: ../calendar/gui/comp-editor-factory.c:433 -msgid "Authentication Failed" -msgstr "Godkendelse mislykkedes" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36 +msgid "" +"Maximum number of recently used timezones to remember in a " +"'day_second_zones' list." +msgstr "" +"Maksimalt antal af nyligt brugte tidszoner, der skal huskes i en " +"\"day_second_zones\"-liste." -#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED -#: ../addressbook/gui/widgets/eab-gui-util.c:73 -#: ../calendar/gui/comp-editor-factory.c:427 -msgid "Authentication Required" -msgstr "Godkendelse kræves" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37 +msgid "Maximum number of recently used timezones to remember." +msgstr "Maksimalt antal af nyligt brugte tidszoner, der skal huskes." -#. E_BOOK_ERROR_TLS_NOT_AVAILABLE -#: ../addressbook/gui/widgets/eab-gui-util.c:74 -msgid "TLS not Available" -msgstr "TLS er ikke tilgængelig" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38 +msgid "Minute the workday ends on, 0 to 59." +msgstr "Det minut som arbejdsdagen slutter på, 0 - 59." -#. E_BOOK_ERROR_CORBA_EXCEPTION -#. E_BOOK_ERROR_NO_SUCH_SOURCE -#: ../addressbook/gui/widgets/eab-gui-util.c:76 -msgid "No such source" -msgstr "Ingen sådan kilde" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39 +msgid "Minute the workday starts on, 0 to 59." +msgstr "Minut arbejdsdagen starter på, 0 - 59." -#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE -#: ../addressbook/gui/widgets/eab-gui-util.c:77 -msgid "Not available in offline mode" -msgstr "Ikke tilgængelig i afkoblet tilstand" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40 +msgid "Month view horizontal pane position" +msgstr "Vandret placering for rude med månedsoversigt" -#. E_BOOK_ERROR_OTHER_ERROR -#: ../addressbook/gui/widgets/eab-gui-util.c:78 -msgid "Other error" -msgstr "Anden fejl" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41 +msgid "Month view vertical pane position" +msgstr "Lodret placering for rude med månedsoversigt" -#. E_BOOK_ERROR_INVALID_SERVER_VERSION -#: ../addressbook/gui/widgets/eab-gui-util.c:79 -msgid "Invalid server version" -msgstr "Ugyldig serverversion" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42 +msgid "Number of units for determining a default reminder." +msgstr "Antal enheder til bestemmelse for en standardpåmindelse." -#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD -#: ../addressbook/gui/widgets/eab-gui-util.c:80 -msgid "Unsupported authentication method" -msgstr "Ikke-understøttet godkendelsesmetode" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43 +msgid "Number of units for determining when to hide tasks." +msgstr "Antal enheder for at bestemme hvornår opgaver skal skjules." -#: ../addressbook/gui/widgets/eab-gui-util.c:110 +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44 +msgid "Overdue tasks color" +msgstr "Farve for opgaver der tidsmæssigt er overskredet" + +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45 msgid "" -"This address book cannot be opened. This either means this book is not " -"marked for offline usage or not yet downloaded for offline usage. Please " -"load the address book once in online mode to download its contents." +"Position of the horizontal pane, between the date navigator calendar and the " +"task list when not in the month view, in pixels." msgstr "" -"Denne adressebog kan ikke åbnes. Dette betyder enten, at bogen ikke er " -"markeret til afkoblet brug eller ikke er blevet hentet ned til afkoblet " -"brug. Indlæs venligst bogen i opkoblet tilstand for at overføre dens indhold." +"Placering i billedpunkter af den vandrette rude mellem dato-" +"navigeringskalenderen og opgavelisten når man ikke befinder sig i " +"månedsoversigten." -#: ../addressbook/gui/widgets/eab-gui-util.c:119 -#, c-format +# "between the view and .." Hvilket "view" er der tale om? -MBJ +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46 msgid "" -"This address book cannot be opened. Please check that the path %s exists " -"and that permissions are set to access it." +"Position of the horizontal pane, between the view and the date navigator " +"calendar and task list in the month view, in pixels." msgstr "" -"Denne adressebog kan ikke åbnes. Kontrollér venligst at stien %s findes og " -"at rettigheder er indstillet, så der er adgang til den." +"Placeringen i billedpunkter af den vandrette rude mellem dato-" +"navigeringskalenderen og opgavelisten, i månedsoversigten." -#: ../addressbook/gui/widgets/eab-gui-util.c:131 +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47 msgid "" -"This version of Evolution does not have LDAP support compiled in to it. To " -"use LDAP in Evolution an LDAP-enabled Evolution package must be installed." +"Position of the vertical pane, between the calendar lists and the date " +"navigator calendar." msgstr "" -"Denne udgave af Evolution har ikke LDAP-understøttelse indbygget. For at " -"bruge LDAP i Evolution, skal der være installeret en Evolutionpakke med LDAP " -"indbygget." +"Placeringen af den lodrette rude mellem kalenderlisterne og dato-" +"navigeringskalenderen." -#: ../addressbook/gui/widgets/eab-gui-util.c:140 +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48 msgid "" -"This address book cannot be opened. This either means that an incorrect URI " -"was entered, or the server is unreachable." +"Position of the vertical pane, between the task list and the task preview " +"pane, in pixels." msgstr "" -"Denne adressebog kan ikke åbnes. Dette betyder enten, at du har angivet en " -"ukorrekt adresse, eller at serveren ikke kan nås." - -#: ../addressbook/gui/widgets/eab-gui-util.c:148 -msgid "Detailed error message:" -msgstr "Detaljeret fejlbesked:" +"Placeringen i billedpunkter af den lodrette rude mellem opgavelisten og " +"forhåndsvisningsruden for opgaver." -#: ../addressbook/gui/widgets/eab-gui-util.c:171 +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49 msgid "" -"More cards matched this query than either the server is \n" -"configured to return or Evolution is configured to display.\n" -"Please make your search more specific or raise the result limit in\n" -"the directory server preferences for this address book." +"Position of the vertical pane, between the view and the date navigator " +"calendar and task list in the month view, in pixels." msgstr "" -"Flere kort matchede denne forespørgsel end enten serveren er\n" -"konfigureret til at returnere eller Evolution er konfigureret at vise.\n" -"Gør din søgning mere specifik eller forøg resultatgrænsen i\n" -"katalogserverens indstillinger for denne adressebog." +"Placeringen i billedpunkter i månedsoversigten af den lodrette rude, mellem " +"oversigten, datonavigeringskalenderen og opgavelisten." -#: ../addressbook/gui/widgets/eab-gui-util.c:177 +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50 msgid "" -"The time to execute this query exceeded the server limit or the limit\n" -"configured for this address book. Please make your search\n" -"more specific or raise the time limit in the directory server\n" -"preferences for this address book." +"Position of the vertical pane, between the view and the date navigator " +"calendar and task list when not in the month view, in pixels." msgstr "" -"Udførelsen af denne forespørgsel overskred serverens tidsgrænse eller den " -"tidsgrænse, som er konfigureret for denne adressebog. Gør din søgning mere " -"specifik eller forøg tidsgrænsen i katalogserverens indstillinger for denne " -"adressebog." +"Placeringen i billedpunkter af den lodrette rude, mellem oversigten," +"datonavigeringskalenderen og opgavelisten når denne ikke er i " +"månedsoversigten." -#: ../addressbook/gui/widgets/eab-gui-util.c:183 -msgid "The backend for this address book was unable to parse this query." -msgstr "" -"Modulet til håndtering af denne adressebog kunne ikke fortolke forespørgslen." +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51 +msgid "Programs that are allowed to be run by alarms." +msgstr "Programmer der kan udføres som en del af påmindelser." -#: ../addressbook/gui/widgets/eab-gui-util.c:186 -msgid "The backend for this address book refused to perform this query." -msgstr "" -"Modulet til håndtering af denne adressebog nægtede at gennemføre denne " -"forespørgsel." +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52 +msgid "Recently used second time zones in a Day View" +msgstr "Nyligt brugte sekundære tidszoner brugt i dagsvisning" -#: ../addressbook/gui/widgets/eab-gui-util.c:189 -msgid "This query did not complete successfully." -msgstr "Denne forespørgsel lykkedes ikke." +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53 +msgid "Save directory for alarm audio" +msgstr "Mappe hvor alarmlyd gemmes" -#: ../addressbook/gui/widgets/eab-gui-util.c:211 -msgid "Error adding list" -msgstr "Fejl ved tilføjelse af liste" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54 +msgid "Scroll Month View by a week" +msgstr "" -#: ../addressbook/gui/widgets/eab-gui-util.c:211 -#: ../addressbook/gui/widgets/eab-gui-util.c:687 -msgid "Error adding contact" -msgstr "Fejl ved tilføjelse af kontaktperson" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55 +msgid "Show RSVP field in the event/task/meeting editor" +msgstr "Vis RSVP-feltet ved redigering af begivenhed/opgave/møde" -#: ../addressbook/gui/widgets/eab-gui-util.c:222 -msgid "Error modifying list" -msgstr "Fejl ved ændring af liste" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56 +msgid "Show Role field in the event/task/meeting editor" +msgstr "Vis rolle-feltet ved redigering af begivenhed/opgave/møde" -#: ../addressbook/gui/widgets/eab-gui-util.c:222 -msgid "Error modifying contact" -msgstr "Fejl ved ændring af kontaktperson" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57 +msgid "Show appointment end times in week and month views" +msgstr "Vis sluttiderne for aftaler i uge- og måneds-oversigterne" -#: ../addressbook/gui/widgets/eab-gui-util.c:234 -msgid "Error removing list" -msgstr "Fejl ved fjernelse af liste" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58 +msgid "Show categories field in the event/meeting/task editor" +msgstr "Vis feltet kategorier ved redigering af begivenhed/møde/opgave" -#: ../addressbook/gui/widgets/eab-gui-util.c:234 -#: ../addressbook/gui/widgets/eab-gui-util.c:637 -msgid "Error removing contact" -msgstr "Fejl ved fjernelse af kontaktperson" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59 +msgid "Show display alarms in notification tray" +msgstr "Vis skærmpåmindelser i statusfeltet" -#: ../addressbook/gui/widgets/eab-gui-util.c:316 -#, c-format -msgid "" -"Opening %d contact will open %d new window as well.\n" -"Do you really want to display this contact?" -msgid_plural "" -"Opening %d contacts will open %d new windows as well.\n" -"Do you really want to display all of these contacts?" -msgstr[0] "" -"Ved at åbne %d kontaktperson vil yderligere %d nyt vindue åbnes.\n" -"Ønsker du virkelig at vise denne kontaktperson?" -msgstr[1] "" -"Ved at åbne %d kontaktpersoner, vil yderligere %d nye vinduer åbnes.\n" -"Ønsker du virkelig at vise alle disse kontaktpersoner?" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60 +msgid "Show status field in the event/task/meeting editor" +msgstr "Vis status-feltet ved redigering af begivenhed/opgave/møde" -#: ../addressbook/gui/widgets/eab-gui-util.c:324 -msgid "_Don't Display" -msgstr "Vis _ikke" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61 +#: ../mail/evolution-mail.schemas.in.h:136 +msgid "Show the \"Preview\" pane" +msgstr "Vis forhåndsvisningsruden" -#: ../addressbook/gui/widgets/eab-gui-util.c:325 -msgid "Display _All Contacts" -msgstr "Vis _alle kontakter" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62 +#: ../mail/evolution-mail.schemas.in.h:137 +msgid "Show the \"Preview\" pane." +msgstr "Vis forhåndsvisningsruden." -#. For Translators only: "it" refers to the filename %s. -#: ../addressbook/gui/widgets/eab-gui-util.c:351 -#, c-format -msgid "" -"%s already exists\n" -"Do you want to overwrite it?" -msgstr "" -"%s eksisterer allerede\n" -"Vil du overskrive den?" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63 +msgid "Show timezone field in the event/meeting editor" +msgstr "Vis tidszone-feltet ved redigering af begivenhed/møde" -#: ../addressbook/gui/widgets/eab-gui-util.c:355 -msgid "Overwrite" -msgstr "Overskriv" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64 +msgid "Show type field in the event/task/meeting editor" +msgstr "Vis type-feltet ved redigering af begivenhed/opgave/møde" -#. more than one, finding the total number of contacts might -#. * hit performance while saving large number of contacts -#. -#: ../addressbook/gui/widgets/eab-gui-util.c:396 -#: ../addressbook/gui/widgets/eab-gui-util.c:399 -msgid "contact" -msgid_plural "contacts" -msgstr[0] "kontaktperson" -msgstr[1] "kontaktpersoner" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65 +msgid "Show week number in Day and Work Week View" +msgstr "Vis ugenumre i dags- og arbejdsugevisning" -#. This is a filename. Translators take note. -#: ../addressbook/gui/widgets/eab-gui-util.c:445 -msgid "card.vcf" -msgstr "card.vcf" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66 +msgid "Show week numbers in date navigator" +msgstr "Vis ugenumre i datonavigeringen" -#: ../addressbook/gui/widgets/eab-gui-util.c:482 -msgid "Select Address Book" -msgstr "Vælg adressebog" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67 +msgid "" +"Shows the second time zone in a Day View, if set. Value is similar to one " +"used in a 'timezone' key." +msgstr "" +"Vis den sekundære tidszone i dagsvisningen, hvis den er indstillet. Værdier " +"er ligesom de, der bliver brugt i \"timezone\"-nøglen." -#: ../addressbook/gui/widgets/eab-gui-util.c:596 -msgid "list" -msgstr "liste" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68 +msgid "Tasks due today color" +msgstr "Farve for dagens opgaver" -#: ../addressbook/gui/widgets/eab-gui-util.c:748 -msgid "Move contact to" -msgstr "Flyt kontaktperson til" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69 +msgid "Tasks vertical pane position" +msgstr "Lodret placering for rude med opgaver" -#: ../addressbook/gui/widgets/eab-gui-util.c:750 -msgid "Copy contact to" -msgstr "Kopiér kontaktperson til" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71 +#, no-c-format +msgid "" +"The URL template to use as a free/busy data fallback, %u is replaced by the " +"user part of the mail address and %d is replaced by the domain." +msgstr "" +"Adresseskabelonen der skal bruges som ledig/optaget-data, ved tilbagefald, %" +"u udskiftes med brugerdelen af e-postadressen, mens %d udskiftes med domænet." -#: ../addressbook/gui/widgets/eab-gui-util.c:753 -msgid "Move contacts to" -msgstr "Flyt kontaktpersoner til" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72 +msgid "" +"The default timezone to use for dates and times in the calendar, as an " +"untranslated Olsen timezone database location like \"America/New York\"." +msgstr "" +"Den forvalgte tidszone til brug for datoer og tid i kalenderen, som et " +"uoversat Olsen-tidszone-database-sted ligesom \"America/New York\"." -#: ../addressbook/gui/widgets/eab-gui-util.c:755 -msgid "Copy contacts to" -msgstr "Kopiér kontaktpersoner til" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73 +msgid "The second timezone for a Day View" +msgstr "Den anden tidszone for dagsvisningen" -#: ../addressbook/gui/widgets/eab-gui-util.c:901 -msgid "Multiple vCards" -msgstr "Flere vCards" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74 +msgid "" +"This can have three possible values. 0 for errors. 1 for warnings. 2 for " +"debug messages." +msgstr "" +"Denne kan have tre forskellige værdier. 0 for fejl. 1 for advarsler. 2 for " +"fejlsøgningsbeskeder." -#: ../addressbook/gui/widgets/eab-gui-util.c:908 -#, c-format -msgid "vCard for %s" -msgstr "vCard for %s" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75 +msgid "Time divisions" +msgstr "Tidsinddelinger" -#: ../addressbook/gui/widgets/eab-gui-util.c:920 -#: ../addressbook/gui/widgets/eab-gui-util.c:946 -#, c-format -msgid "Contact information" -msgstr "Information om kontaktperson" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76 +msgid "Time the last alarm ran, in time_t." +msgstr "Udførselstidspunkt for forrige påmindelse, i time_t." -#: ../addressbook/gui/widgets/eab-gui-util.c:948 -#, c-format -msgid "Contact information for %s" -msgstr "Information om kontaktpersonen %s" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77 +msgid "Timezone" +msgstr "Tidszone" -#: ../addressbook/gui/widgets/eab-popup-control.c:293 -msgid "Querying Address Book..." -msgstr "Forespørger adressebogen..." +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78 +msgid "" +"Transparency of the events in calendar views, a value between 0 " +"(transparent) and 1 (opaque)." +msgstr "" +"Gennemsigtighed ved begivenheder i kalenderoversigter. Værdien skal være " +"mellem 0 (gennemsigtig) og 1 (uigennemsigtig)." -#: ../addressbook/gui/widgets/eab-vcard-control.c:141 -#, c-format -msgid "There is one other contact." -msgid_plural "There are %d other contacts." -msgstr[0] "Der er én anden kontaktperson." -msgstr[1] "Der er %d andre kontaktpersoner." +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79 +msgid "Twenty four hour time format" +msgstr "24-timers-format" -#: ../addressbook/gui/widgets/eab-vcard-control.c:226 -#: ../addressbook/gui/widgets/eab-vcard-control.c:277 -msgid "Show Full vCard" -msgstr "Vis hele vCard-kortet" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80 +msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"." +msgstr "" +"Enheder for en forvalgt påmindelse, \"minutes\", \"hours\" eller \"days\"." -#: ../addressbook/gui/widgets/eab-vcard-control.c:230 -msgid "Show Compact vCard" -msgstr "Vis vCard-kortet kompakt" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81 +msgid "" +"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"." +msgstr "" +"Enheder for at bestemme når opgaver skal skjules, \"minutes\", \"hours\" " +"eller \"days\"." -#: ../addressbook/gui/widgets/eab-vcard-control.c:282 -msgid "Save in address book" -msgstr "Gem i adressebog" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82 +#, fuzzy +msgid "Use system timezone" +msgstr "_Benyt systemforvalg" -#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37 -msgid "Card View" -msgstr "Visitkortvisning" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84 +msgid "Week start" +msgstr "Ugestart" -#: ../addressbook/importers/evolution-csv-importer.c:661 -#: ../addressbook/importers/evolution-ldif-importer.c:513 -#: ../addressbook/importers/evolution-vcard-importer.c:252 -#: ../calendar/importers/icalendar-importer.c:308 -#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7 -msgid "Importing..." -msgstr "Importerer..." +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85 +msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)." +msgstr "Ugedag hvorpå ugen starter, fra søndag (0) til lørdag (6)." -#: ../addressbook/importers/evolution-csv-importer.c:863 -msgid "Outlook CSV or Tab (.csv, .tab)" -msgstr "Outlook CSV eller Tab (.csv, .tab)" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86 +msgid "Whether or not to use the notification tray for display alarms." +msgstr "Om statusfeltet skal anvendes til visning af påmindelser." -#: ../addressbook/importers/evolution-csv-importer.c:864 -msgid "Outlook CSV and Tab Importer" -msgstr "Evolution CSV- og Tab-importør" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87 +msgid "Whether to ask for confirmation when deleting an appointment or task." +msgstr "" +"Om der spørges efter bekræftelse ved sletning af aftaler eller opgaver." -#: ../addressbook/importers/evolution-csv-importer.c:872 -msgid "Mozilla CSV or Tab (.csv, .tab)" -msgstr "Mozilla CSV eller Tab (.csv, .tab)" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88 +msgid "Whether to ask for confirmation when expunging appointments and tasks." +msgstr "" +"Om der spørges efter bekræftelse ved sletning af aftaler eller opgaver." -#: ../addressbook/importers/evolution-csv-importer.c:873 -msgid "Mozilla CSV and Tab Importer" -msgstr "Mozilla CSV- og Tab-importør" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89 +msgid "" +"Whether to compress weekends in the month view, which puts Saturday and " +"Sunday in the space of one weekday." +msgstr "" +"Om weekender skal komprimeres i månedsoversigten, hvilket vil give lørdag og " +"søndag samme plads som en enkelt ugedag." -#: ../addressbook/importers/evolution-csv-importer.c:881 -msgid "Evolution CSV or Tab (.csv, .tab)" -msgstr "Evolution CSV eller Tab (.csv, .tab)" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90 +msgid "Whether to display the end time of events in the week and month views." +msgstr "" +"Om sluttiderne for begivenheder i uge- og måneds-oversigterne skal vises." -#: ../addressbook/importers/evolution-csv-importer.c:882 -msgid "Evolution CSV and Tab Importer" -msgstr "Evolution CSV- og Tab-importør" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91 +msgid "" +"Whether to draw the Marcus Bains Line (line at current time) in the calendar." +msgstr "" +"Om Marcus Bains-linjen (linje ved aktuel tid) skal tegnes i kalenderen." -#: ../addressbook/importers/evolution-ldif-importer.c:680 -msgid "LDAP Data Interchange Format (.ldif)" -msgstr "LDAP-dataudvekslingsformat (.ldif)" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92 +msgid "Whether to hide completed tasks in the tasks view." +msgstr "Om løste opgaver skjules i opgave-oversigten." -#: ../addressbook/importers/evolution-ldif-importer.c:681 -msgid "Evolution LDIF importer" -msgstr "Evolution LDIF-importør" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93 +msgid "Whether to scroll a Month View by a week, not by a month." +msgstr "" -#: ../addressbook/importers/evolution-vcard-importer.c:549 -msgid "vCard (.vcf, .gcrd)" -msgstr "vCard (.vcf, .gcrd)" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94 +msgid "Whether to set a default reminder for appointments." +msgstr "Om begivenheder skal have en standardpåmindelse." -#: ../addressbook/importers/evolution-vcard-importer.c:550 -msgid "Evolution vCard Importer" -msgstr "Evolution vCard-importør" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95 +msgid "Whether to show RSVP field in the event/task/meeting editor" +msgstr "" +"Vælg om RSVP-feltet skal vises ved redigering af begivenhed/opgave/møde" -#: ../addressbook/printing/e-contact-print.glade.h:1 -msgid "10 pt. Tahoma" -msgstr "10 pt. Tahoma" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96 +msgid "Whether to show categories field in the event/meeting editor" +msgstr "Vælg om kategori-feltet skal vises ved redigering af begivenhed/møde" -#: ../addressbook/printing/e-contact-print.glade.h:2 -msgid "8 pt. Tahoma" -msgstr "8 pt. Tahoma" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97 +msgid "Whether to show role field in the event/task/meeting editor" +msgstr "" +"Vælg om rolle-feltet skal vises ved redigering af begivenhed/opgave/møde" -#: ../addressbook/printing/e-contact-print.glade.h:3 -msgid "Blank forms at end:" -msgstr "Blanke skemaer ved slutningen:" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98 +msgid "Whether to show status field in the event/task/meeting editor" +msgstr "" +"Vælg om status-feltet skal vises ved redigering af begivenhed/opgave/møde" -#: ../addressbook/printing/e-contact-print.glade.h:4 -msgid "Body" -msgstr "Indhold" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99 +msgid "" +"Whether to show times in twenty four hour format instead of using am/pm." +msgstr "Om tider skal vises i 24-timers-format i stedet for at bruge am/pm." -#: ../addressbook/printing/e-contact-print.glade.h:5 -msgid "Bottom:" -msgstr "Nederst:" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100 +msgid "Whether to show timezone field in the event/meeting editor" +msgstr "Vælg om tidszone-feltet skal vises ved redigering af begivenhed/møde" -#: ../addressbook/printing/e-contact-print.glade.h:6 -msgid "Dimensions:" -msgstr "Dimensioner:" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101 +msgid "Whether to show type field in the event/task/meeting editor" +msgstr "" +"Vælg om type-feltet skal vises ved redigering af begivenhed/opgave/møde" -#: ../addressbook/printing/e-contact-print.glade.h:7 -msgid "F_ont..." -msgstr "Skr_ifttype..." - -#: ../addressbook/printing/e-contact-print.glade.h:8 -msgid "Fonts" -msgstr "Skrifttyper" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102 +msgid "Whether to show week number in the Day and Work Week View." +msgstr "Om ugenumre skal vises i dags- og arbejdsugevisningen." -#: ../addressbook/printing/e-contact-print.glade.h:9 -msgid "Footer:" -msgstr "Bundtekst:" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103 +msgid "Whether to show week numbers in the date navigator." +msgstr "Om ugenumre skal vises i datonavigeringen." -#: ../addressbook/printing/e-contact-print.glade.h:10 -msgid "Format" -msgstr "Format" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104 +msgid "Work days" +msgstr "Arbejdsdage" -#: ../addressbook/printing/e-contact-print.glade.h:11 -#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502 -#: ../widgets/table/e-table-field-chooser-dialog.c:81 -#: ../widgets/table/e-table-field-chooser-item.c:647 -#: ../widgets/table/e-table-field-chooser.c:80 -#: ../widgets/table/e-table-header-item.c:1907 -#: ../widgets/table/e-table-selection-model.c:309 -msgid "Header" -msgstr "Teksthoved" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105 +msgid "Workday end hour" +msgstr "Time for arbejdsdagens afslutning" -#: ../addressbook/printing/e-contact-print.glade.h:12 -msgid "Header/Footer" -msgstr "Top-/bundtekst" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106 +msgid "Workday end minute" +msgstr "Minut for arbejdsdagens afslutning" -#: ../addressbook/printing/e-contact-print.glade.h:13 -msgid "Headings" -msgstr "Toptekster" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107 +msgid "Workday start hour" +msgstr "Time for arbejdsdagens start" -#: ../addressbook/printing/e-contact-print.glade.h:14 -msgid "Headings for each letter" -msgstr "Toptekst for hvert bogstav" +#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108 +msgid "Workday start minute" +msgstr "Minut for arbejdsdagens start" -#: ../addressbook/printing/e-contact-print.glade.h:15 -msgid "Height:" -msgstr "Højde:" +#: ../calendar/gui/cal-search-bar.c:75 +msgid "Summary contains" +msgstr "Sammendrag indeholder" -#: ../addressbook/printing/e-contact-print.glade.h:16 -msgid "Immediately follow each other" -msgstr "Lige efter hinanden" +#: ../calendar/gui/cal-search-bar.c:76 +msgid "Description contains" +msgstr "Beskrivelse indeholder" -#: ../addressbook/printing/e-contact-print.glade.h:17 -msgid "Include:" -msgstr "Inkludér:" +#: ../calendar/gui/cal-search-bar.c:77 +msgid "Category is" +msgstr "Kategorien er" -#: ../addressbook/printing/e-contact-print.glade.h:18 -msgid "Landscape" -msgstr "Liggende" +#: ../calendar/gui/cal-search-bar.c:78 +msgid "Comment contains" +msgstr "Kommentar indeholder" -#: ../addressbook/printing/e-contact-print.glade.h:19 -msgid "Left:" -msgstr "Venstre:" +#: ../calendar/gui/cal-search-bar.c:79 +msgid "Location contains" +msgstr "Sted indeholder" -#: ../addressbook/printing/e-contact-print.glade.h:20 -msgid "Letter tabs on side" -msgstr "Bogstavfaneblade på siden" +#: ../calendar/gui/cal-search-bar.c:640 +msgid "Next 7 Days' Tasks" +msgstr "Næste 7 dages opgaver" -#: ../addressbook/printing/e-contact-print.glade.h:21 -msgid "Margins" -msgstr "Margener" +#: ../calendar/gui/cal-search-bar.c:644 +msgid "Active Tasks" +msgstr "Aktive opgaver" -#: ../addressbook/printing/e-contact-print.glade.h:22 -msgid "Number of columns:" -msgstr "Antal kolonner:" +#: ../calendar/gui/cal-search-bar.c:648 +msgid "Overdue Tasks" +msgstr "For sene opgaver" -#: ../addressbook/printing/e-contact-print.glade.h:23 -msgid "Options" -msgstr "Indstillinger" +#: ../calendar/gui/cal-search-bar.c:652 +msgid "Completed Tasks" +msgstr "Fuldførte opgaver" -#: ../addressbook/printing/e-contact-print.glade.h:24 -msgid "Orientation" -msgstr "Orientering" +#: ../calendar/gui/cal-search-bar.c:656 +msgid "Tasks with Attachments" +msgstr "Opgaver med bilag" -#: ../addressbook/printing/e-contact-print.glade.h:25 -msgid "Page" -msgstr "Side" +#: ../calendar/gui/cal-search-bar.c:702 +msgid "Active Appointments" +msgstr "Aktive aftaler" -#: ../addressbook/printing/e-contact-print.glade.h:26 -msgid "Page Setup:" -msgstr "Sideopsætning:" +#: ../calendar/gui/cal-search-bar.c:706 +msgid "Next 7 Days' Appointments" +msgstr "Næste 7 dages aftaler" -#: ../addressbook/printing/e-contact-print.glade.h:27 -msgid "Paper" -msgstr "Papir" +#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26 +#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71 +#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14 +msgid "Print" +msgstr "Udskriv" -#: ../addressbook/printing/e-contact-print.glade.h:28 -msgid "Paper source:" -msgstr "Papirkilde:" +#: ../calendar/gui/calendar-commands.c:315 +msgid "" +"This operation will permanently erase all events older than the selected " +"amount of time. If you continue, you will not be able to recover these " +"events." +msgstr "" +"Denne handling vil permanent fjerne alle begivenheder der er ældre end den " +"valgte tid. Hvis du fortsætter vil du ikke længere kunne tilvejebringe disse " +"begivenheder." -#: ../addressbook/printing/e-contact-print.glade.h:29 -msgid "Portrait" -msgstr "Stående" +#: ../calendar/gui/calendar-commands.c:321 +msgid "Purge events older than" +msgstr "Fjern begivenheder der er ældre end" -#: ../addressbook/printing/e-contact-print.glade.h:30 -msgid "Preview:" -msgstr "Forhåndsvisning:" +#: ../calendar/gui/calendar-commands.c:326 +#: ../plugins/caldav/caldav-source.c:450 +#: ../plugins/calendar-http/calendar-http.c:280 +#: ../plugins/calendar-weather/calendar-weather.c:525 +#: ../plugins/google-account-setup/google-source.c:655 +#: ../plugins/google-account-setup/google-contacts-source.c:332 +#: ../widgets/misc/e-send-options.glade.h:39 +msgid "days" +msgstr "dage" -#: ../addressbook/printing/e-contact-print.glade.h:31 -msgid "Print using gray shading" -msgstr "Udskriv med gråtoner" +#. Create the Webcal source group +#: ../calendar/gui/calendar-component.c:194 +#: ../calendar/gui/memos-component.c:153 ../calendar/gui/migration.c:505 +#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118 +#: ../calendar/gui/tasks-component.c:150 +msgid "On The Web" +msgstr "På webbet" -#: ../addressbook/printing/e-contact-print.glade.h:32 -msgid "Reverse on even pages" -msgstr "Modsat på lige sider" +#: ../calendar/gui/calendar-component.c:195 +#: ../plugins/calendar-weather/calendar-weather.c:126 +msgid "Weather" +msgstr "Vejr" -#: ../addressbook/printing/e-contact-print.glade.h:33 -msgid "Right:" -msgstr "Højre:" +#. ensure the source name is in current locale, not read from configuration +#: ../calendar/gui/calendar-component.c:289 +#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:399 +msgid "Birthdays & Anniversaries" +msgstr "Fødselsdage og jubilæer" -#: ../addressbook/printing/e-contact-print.glade.h:34 -msgid "Sections:" -msgstr "Sektioner:" +#: ../calendar/gui/calendar-component.c:627 +msgid "_New Calendar" +msgstr "_Ny kalender" -#: ../addressbook/printing/e-contact-print.glade.h:35 -msgid "Shading" -msgstr "Skyggelægning" +#: ../calendar/gui/calendar-component.c:628 +#: ../calendar/gui/memos-component.c:480 ../calendar/gui/tasks-component.c:472 +#: ../mail/em-folder-tree.c:2051 +msgid "_Copy..." +msgstr "_Kopiér..." -#. FIXME: Take care of i18n -#: ../addressbook/printing/e-contact-print.glade.h:36 -#: ../plugins/exchange-operations/exchange-account-setup.c:1141 -#: ../plugins/exchange-operations/exchange-calendar.c:236 -#: ../plugins/exchange-operations/exchange-contacts.c:222 -msgid "Size:" -msgstr "Størrelse:" +#: ../calendar/gui/calendar-component.c:633 +#: ../calendar/gui/memos-component.c:485 ../calendar/gui/tasks-component.c:477 +msgid "_Make available for offline use" +msgstr "_Gør tilgængelig i afkoblet tilstand" -#: ../addressbook/printing/e-contact-print.glade.h:37 -msgid "Start on a new page" -msgstr "Start på en ny side" +#: ../calendar/gui/calendar-component.c:634 +#: ../calendar/gui/memos-component.c:486 ../calendar/gui/tasks-component.c:478 +msgid "_Do not make available for offline use" +msgstr "Gør _ikke tilgængelig i afkoblet tilstand" -#: ../addressbook/printing/e-contact-print.glade.h:38 -msgid "Style name:" -msgstr "Stilnavn:" +#: ../calendar/gui/calendar-component.c:964 +msgid "Failed upgrading calendars." +msgstr "Opgradering af kalenderne mislykkedes." -#: ../addressbook/printing/e-contact-print.glade.h:39 -msgid "Top:" -msgstr "Top:" +#: ../calendar/gui/calendar-component.c:1093 +#, c-format +msgid "Unable to open the calendar '%s' for creating events and meetings" +msgstr "" +"Kan ikke åbne kalenderen \"%s\" for oprettelse af begivenheder og møder" -#: ../addressbook/printing/e-contact-print.glade.h:40 -#: ../calendar/gui/dialogs/calendar-setup.c:154 -msgid "Type:" -msgstr "Type:" +#: ../calendar/gui/calendar-component.c:1109 +msgid "There is no calendar available for creating events and meetings" +msgstr "" +"Der er ingen kalender tilgængelig for oprettelse af begivenheder og møder" -#: ../addressbook/printing/e-contact-print.glade.h:41 -msgid "Width:" -msgstr "Bredde:" +#: ../calendar/gui/calendar-component.c:1222 +msgid "Calendar Source Selector" +msgstr "Kalenderkilde-vælger" -#: ../addressbook/printing/e-contact-print.glade.h:42 -msgid "_Font..." -msgstr "Skri_fttype..." +#: ../calendar/gui/calendar-component.c:1438 +msgid "New appointment" +msgstr "Ny aftale" -#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656 -#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692 -#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50 -msgid "Can not open file" -msgstr "Kan ikke åbne filen" +#: ../calendar/gui/calendar-component.c:1439 +msgctxt "New" +msgid "_Appointment" +msgstr "_Aftale" -#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44 -msgid "Couldn't get list of address books" -msgstr "Kunne ikke etablere liste over adressebøger" +#: ../calendar/gui/calendar-component.c:1440 +msgid "Create a new appointment" +msgstr "Opret en ny aftale" -#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72 -msgid "failed to open book" -msgstr "kunne ikke åbne bog" +#: ../calendar/gui/calendar-component.c:1446 +msgid "New meeting" +msgstr "Nyt møde" -#: ../addressbook/tools/evolution-addressbook-export.c:48 -msgid "Specify the output file instead of standard output" -msgstr "Angiv uddatafil i stedet for standard uddata" +#: ../calendar/gui/calendar-component.c:1447 +msgctxt "New" +msgid "M_eeting" +msgstr "Mød_e" -#: ../addressbook/tools/evolution-addressbook-export.c:49 -msgid "OUTPUTFILE" -msgstr "UDDATAFIL" +#: ../calendar/gui/calendar-component.c:1448 +msgid "Create a new meeting request" +msgstr "Opret en ny mødeindkaldelse" -#: ../addressbook/tools/evolution-addressbook-export.c:52 -msgid "List local address book folders" -msgstr "Vis lokale adressebogmapper" +#: ../calendar/gui/calendar-component.c:1454 +msgid "New all day appointment" +msgstr "Ny heldagsaftale" -#: ../addressbook/tools/evolution-addressbook-export.c:55 -msgid "Show cards as vcard or csv file" -msgstr "Vis kontakter som vcard eller csv-fil" +#: ../calendar/gui/calendar-component.c:1455 +msgctxt "New" +msgid "All Day A_ppointment" +msgstr "_Heldagsaftale" -#: ../addressbook/tools/evolution-addressbook-export.c:56 -msgid "[vcard|csv]" -msgstr "[vcard|csv]" +#: ../calendar/gui/calendar-component.c:1456 +msgid "Create a new all-day appointment" +msgstr "Opret en ny helddagsaftale" -#: ../addressbook/tools/evolution-addressbook-export.c:59 -msgid "Export in asynchronous mode" -msgstr "Eksportér i asynkron tilstand" +#: ../calendar/gui/calendar-component.c:1462 +msgid "New calendar" +msgstr "Ny kalender" -# Lack of space after the comma -# http://bugzilla.ximian.com/show_bug.cgi?id=61069 -#: ../addressbook/tools/evolution-addressbook-export.c:62 -msgid "" -"The number of cards in one output file in asynchronous mode, default size " -"100." -msgstr "" -"Antallet af visitkort i én uddatafil i asynkron tilstand, standardstørrelsen " -"100." +#: ../calendar/gui/calendar-component.c:1463 +msgctxt "New" +msgid "Cale_ndar" +msgstr "Kale_nder" -#: ../addressbook/tools/evolution-addressbook-export.c:64 -msgid "NUMBER" -msgstr "ANTAL" +#: ../calendar/gui/calendar-component.c:1464 +msgid "Create a new calendar" +msgstr "Opret en ny kalender" -#: ../addressbook/tools/evolution-addressbook-export.c:101 -msgid "" -"Command line arguments error, please use --help option to see the usage." -msgstr "" -"Fejl i argumenter på kommandolinjen - benyt argumentet --help for at få " -"hjælp." +#: ../calendar/gui/calendar-view-factory.c:113 +msgid "Day View" +msgstr "Dagsoversigt" -#: ../addressbook/tools/evolution-addressbook-export.c:115 -msgid "Only support csv or vcard format." -msgstr "Understøt kun csv- eller vcard-format." +#: ../calendar/gui/calendar-view-factory.c:116 +msgid "Work Week View" +msgstr "Arbejdsugeoversigt" -#: ../addressbook/tools/evolution-addressbook-export.c:124 -msgid "In async mode, output must be file." -msgstr "I asynkron tilstand skal uddata være en fil." +#: ../calendar/gui/calendar-view-factory.c:119 +msgid "Week View" +msgstr "Ugeoversigt" -# Strange use of English -# http://bugzilla.ximian.com/show_bug.cgi?id=61070 -#: ../addressbook/tools/evolution-addressbook-export.c:132 -msgid "In normal mode, there is no need for the size option." -msgstr "I normal-tilstand behøves intet tilvalg af størrelse." +#: ../calendar/gui/calendar-view-factory.c:122 +msgid "Month View" +msgstr "Månedsoversigt" -#: ../addressbook/tools/evolution-addressbook-export.c:163 -msgid "Unhandled error" -msgstr "Fejl der ikke blev håndteret" +#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1 +#: ../calendar/gui/tasktypes.xml.h:3 +msgid "Any Field" +msgstr "Ethvert felt" -#. For Translators: {0} is the name of the calendar source -#: ../calendar/calendar.error.xml.h:2 -msgid "" -"'{0}' is a read-only calendar and cannot be modified. Please select a " -"different calendar from the side bar in the Calendar view." -msgstr "" -"\"{0}\" er en skrivebeskyttet kalender og kan ikke modificeres. Vælg " -"venligst en anden kalender fra sidepanelet i kalendervisningen." +#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3 +#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5 +msgid "Attachments" +msgstr "Brevdele" -#. For Translators: {0} is the name of the calendar source -#: ../calendar/calendar.error.xml.h:4 -msgid "" -"'{0}' is a read-only calendar and cannot be modified. Please select a " -"different calendar that can accept appointments." -msgstr "" -"\"{0}\" er en skrivebeskyttet kalender og kan ikke modificeres. Vælg " -"venligst en anden kalender som vil acceptere aftaler." +#: ../calendar/gui/caltypes.xml.h:4 +#: ../calendar/gui/e-meeting-time-sel.etspec.h:1 +#: ../calendar/gui/tasktypes.xml.h:6 +msgid "Attendee" +msgstr "Deltager" -#: ../calendar/calendar.error.xml.h:5 -msgid "" -"Adding a meaningful summary to your appointment will give your recipients an " -"idea of what your appointment is about." -msgstr "" -"Hvis du giver din aftale et meningsfyldt sammendrag, vil dine modtagere få " -"en idé om, hvad din aftale handler om." +#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4 +#: ../calendar/gui/tasktypes.xml.h:8 +msgid "Category" +msgstr "Kategori" -#: ../calendar/calendar.error.xml.h:6 -msgid "" -"Adding a meaningful summary to your task will give your recipients an idea " -"of what your task is about." -msgstr "" -"Hvis du giver opgaven et meningsfyldt sammendrag, vil dine modtagere få en " -"idé om, hvad opgaven handler om." +#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5 +msgid "Classification" +msgstr "Klassificering" -#: ../calendar/calendar.error.xml.h:7 -msgid "All information in these memos will be deleted and can not be restored." -msgstr "" -"Al information i disse huskesedler vil blive slettet og vil ikke kunne " -"genoprettes." +#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:248 +#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:566 +#: ../calendar/gui/memotypes.xml.h:6 +#: ../plugins/email-custom-header/email-custom-header.c:341 +msgid "Confidential" +msgstr "Fortroligt" -#: ../calendar/calendar.error.xml.h:8 -msgid "All information in this memo will be deleted and can not be restored." -msgstr "" -"Al information i denne huskeseddel vil blive slettet og vil ikke kunne " -"genoprettes." +#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7 +#: ../calendar/gui/tasktypes.xml.h:10 +#: ../plugins/plugin-manager/plugin-manager.c:59 +#: ../widgets/misc/e-attachment-tree-view.c:496 +#: ../widgets/table/e-table-config.glade.h:6 +msgid "Description" +msgstr "Beskrivelse" -#: ../calendar/calendar.error.xml.h:9 -msgid "" -"All information on these appointments will be deleted and can not be " -"restored." -msgstr "" -"Al information om disse aftaler vil blive slettet og vil ikke kunne " -"genoprettes." +#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8 +#: ../calendar/gui/tasktypes.xml.h:11 +msgid "Description Contains" +msgstr "Beskrivelse indeholder" -#: ../calendar/calendar.error.xml.h:10 -msgid "All information on these tasks will be deleted and can not be restored." -msgstr "" -"Al information om disse opgaver vil blive slettet og vil ikke kunne " -"genoprettes." +#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9 +#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22 +msgid "Do Not Exist" +msgstr "Eksisterer ikke" -#: ../calendar/calendar.error.xml.h:11 -msgid "" -"All information on this appointment will be deleted and can not be restored." -msgstr "" -"Al information i denne aftale vil blive slettet og vil ikke kunne " -"genoprettes." +#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10 +#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25 +msgid "Exist" +msgstr "Eksisterer" -#: ../calendar/calendar.error.xml.h:12 -msgid "" -"All information on this meeting will be deleted and can not be restored." -msgstr "" -"Al information om dette møde vil blive slettet og vil ikke kunne genoprettes." +#: ../calendar/gui/caltypes.xml.h:12 +#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9 +#: ../plugins/publish-calendar/publish-calendar.c:710 +#: ../plugins/save-calendar/csv-format.c:376 +msgid "Location" +msgstr "Sted" -#: ../calendar/calendar.error.xml.h:13 -msgid "All information on this memo will be deleted and can not be restored." -msgstr "" -"Al information om denne huskeseddel vil blive slettet og vil ikke kunne " -"genoprettes." +#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11 +#: ../calendar/gui/tasktypes.xml.h:19 +msgid "Organizer" +msgstr "Organisator" -#: ../calendar/calendar.error.xml.h:14 -msgid "All information on this task will be deleted and can not be restored." -msgstr "" -"Al information om denne opgave vil blive slettet og vil ikke kunne " -"genoprettes." +#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:247 +#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:565 +#: ../calendar/gui/memotypes.xml.h:12 +msgid "Private" +msgstr "Privat" -#: ../calendar/calendar.error.xml.h:15 -msgid "Are you sure you want to delete the '{0}' task?" -msgstr "Er du sikker på du vil slette opgaven \"{0}\"?" +#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:246 +#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348 +#: ../calendar/gui/e-calendar-table.c:564 ../calendar/gui/memotypes.xml.h:13 +msgid "Public" +msgstr "Offentlig" -#: ../calendar/calendar.error.xml.h:16 -msgid "Are you sure you want to delete the appointment titled '{0}'?" -msgstr "Er du sikker på du vil slette aftalen med titlen \"{0}\"?" +#: ../calendar/gui/caltypes.xml.h:16 +#: ../calendar/gui/dialogs/event-editor.c:304 +msgid "Recurrence" +msgstr "Tilbagevenden" -#: ../calendar/calendar.error.xml.h:17 -msgid "Are you sure you want to delete the memo '{0}'?" -msgstr "Er du sikker på du vil slette huskesedlen \"{0}\"?" +#: ../calendar/gui/caltypes.xml.h:17 +#: ../calendar/gui/e-cal-list-view.etspec.h:7 +#: ../calendar/gui/e-calendar-table.etspec.h:13 +#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14 +#: ../calendar/gui/tasktypes.xml.h:22 +#: ../plugins/save-calendar/csv-format.c:362 +msgid "Summary" +msgstr "Sammendrag" -#: ../calendar/calendar.error.xml.h:18 -msgid "Are you sure you want to delete these {0} appointments?" -msgstr "Er du sikker på du vil slette disse {0} aftaler?" +#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15 +#: ../calendar/gui/tasktypes.xml.h:23 +msgid "Summary Contains" +msgstr "Sammendrag indeholder" -#: ../calendar/calendar.error.xml.h:19 -msgid "Are you sure you want to delete these {0} memos?" -msgstr "Er du sikker på du vil slette disse {0} huskesedler?" +#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16 +#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10 +msgid "contains" +msgstr "indeholder" -#: ../calendar/calendar.error.xml.h:20 -msgid "Are you sure you want to delete these {0} tasks?" -msgstr "Er du sikker på du vil slette disse {0} opgaver?" +#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17 +#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16 +msgid "does not contain" +msgstr "indeholder ikke" -#: ../calendar/calendar.error.xml.h:21 -msgid "Are you sure you want to delete this appointment?" -msgstr "Er du sikker på du vil slette denne aftale?" +#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18 +#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31 +msgid "is" +msgstr "er" -#: ../calendar/calendar.error.xml.h:22 -#: ../calendar/gui/dialogs/delete-comp.c:182 -#, c-format -msgid "Are you sure you want to delete this meeting?" -msgstr "Er du sikker på du vil slette dette møde?" +#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19 +#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37 +msgid "is not" +msgstr "er ikke" -#: ../calendar/calendar.error.xml.h:23 -#: ../calendar/gui/dialogs/delete-comp.c:188 -#, c-format -msgid "Are you sure you want to delete this memo?" -msgstr "Er du sikker på du vil slette denne huskeseddel?" +#: ../calendar/gui/comp-editor-factory.c:409 +msgid "Error while opening the calendar" +msgstr "Fejl under åbning af kalender" -#: ../calendar/calendar.error.xml.h:24 -#: ../calendar/gui/dialogs/delete-comp.c:185 -#, c-format -msgid "Are you sure you want to delete this task?" -msgstr "Er du sikker på du vil slette denne opgave?" +#: ../calendar/gui/comp-editor-factory.c:415 +msgid "Method not supported when opening the calendar" +msgstr "Metode ikke understøttet under åbning af kalenderen" -#: ../calendar/calendar.error.xml.h:25 -msgid "Are you sure you want to save the memo without a summary?" -msgstr "Er du sikker på du vil gemme denne huskeseddel uden et sammendrag?" +#: ../calendar/gui/comp-editor-factory.c:421 +msgid "Permission denied to open the calendar" +msgstr "Du har ikke rettigheder til at åbne kalenderen" -#: ../calendar/calendar.error.xml.h:26 -msgid "Are you sure you want to send the appointment without a summary?" -msgstr "Er du sikker på du vil sende aftalen uden et sammendrag?" +#: ../calendar/gui/comp-editor-factory.c:439 +#: ../plugins/mail-to-task/mail-to-task.c:455 ../shell/e-shell.c:1270 +msgid "Unknown error" +msgstr "Ukendt fejl" -#: ../calendar/calendar.error.xml.h:27 -msgid "Are you sure you want to send the task without a summary?" -msgstr "Er du sikker på du vil sende opgaven uden et sammendrag?" +#: ../calendar/gui/dialogs/alarm-dialog.c:611 +msgid "Edit Alarm" +msgstr "Redigér påmindelse" -#: ../calendar/calendar.error.xml.h:28 -msgid "Calendar repository is offline." -msgstr "Kalenderarkiv er afkoblet." +#: ../calendar/gui/dialogs/alarm-dialog.c:796 +#: ../calendar/gui/e-alarm-list.c:448 +msgid "Pop up an alert" +msgstr "Vis en advarsel" -#: ../calendar/calendar.error.xml.h:29 -msgid "Cannot create a new event" -msgstr "Kan ikke oprette en ny begivenhed" +#: ../calendar/gui/dialogs/alarm-dialog.c:797 +#: ../calendar/gui/e-alarm-list.c:444 +msgid "Play a sound" +msgstr "Afspil en lyd" -#: ../calendar/calendar.error.xml.h:30 -msgid "Cannot save event" -msgstr "Kan ikke gemme begivenhed" +#: ../calendar/gui/dialogs/alarm-dialog.c:798 +#: ../calendar/gui/e-alarm-list.c:456 +msgid "Run a program" +msgstr "Kør et program" -#: ../calendar/calendar.error.xml.h:31 -msgid "Delete calendar '{0}'?" -msgstr "Slet kalenderen \"{0}\"?" +#: ../calendar/gui/dialogs/alarm-dialog.c:799 +#: ../calendar/gui/e-alarm-list.c:452 +msgid "Send an email" +msgstr "Send et brev" -#: ../calendar/calendar.error.xml.h:32 -msgid "Delete memo list '{0}'?" -msgstr "Slet listen over huskesedler \"{0}\"?" +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1 +msgid "Alarm" +msgstr "Påmindelse" -#: ../calendar/calendar.error.xml.h:33 -msgid "Delete task list '{0}'?" -msgstr "Slet opgave-listen \"{0}\"?" +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2 +msgid "Options" +msgstr "Valgmuligheder" -#: ../calendar/calendar.error.xml.h:34 -msgid "Do _not Send" -msgstr "Send _ikke" +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3 +msgid "Repeat" +msgstr "Gentag" -#: ../calendar/calendar.error.xml.h:35 -msgid "Download in progress. Do you want to save the appointment?" -msgstr "Overføring i gang. Vil du gemme aftalen?" +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4 +msgid "Add Alarm" +msgstr "Tilføj påmindelse" -#: ../calendar/calendar.error.xml.h:36 -msgid "Download in progress. Do you want to save the task?" -msgstr "Overføring i gang. Vil du gemme opgaven?" +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5 +msgid "Custom _message" +msgstr "Tilpasset _brev" -#: ../calendar/calendar.error.xml.h:37 -msgid "Editor could not be loaded." -msgstr "Redigeringsprogram kunne ikke indlæses." +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6 +msgid "Custom alarm sound" +msgstr "Brugertilpasset lyd ved påmindelser" -#: ../calendar/calendar.error.xml.h:38 -msgid "" -"Email invitations will be sent to all participants and allow them to accept " -"this task." -msgstr "" -"E-post-invitationer sendes til alle deltagerne således at de kan godkende " -"denne opgave." +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7 +msgid "Mes_sage:" +msgstr "Be_sked:" -#: ../calendar/calendar.error.xml.h:39 -msgid "" -"Email invitations will be sent to all participants and allow them to reply." -msgstr "" -"E-post-invitationer bliver sendt til alle deltagerne, således at de kan " -"svare." +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8 +msgid "Select A File" +msgstr "Vælg en fil" -#: ../calendar/calendar.error.xml.h:40 -msgid "Error loading calendar" -msgstr "Fejl ved indlæsning af kalender" +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9 +msgid "Send To:" +msgstr "Send til:" -#: ../calendar/calendar.error.xml.h:41 -msgid "Error loading memo list" -msgstr "Fejl ved indlæsning af liste over huskesedler" +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10 +msgid "_Arguments:" +msgstr "_Argumenter:" -#: ../calendar/calendar.error.xml.h:42 -msgid "Error loading task list" -msgstr "Fejl ved indlæsning af opgaveliste" +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11 +msgid "_Program:" +msgstr "_Program:" -#. For Translators: {0} is specify the backend server -#: ../calendar/calendar.error.xml.h:44 -msgid "Error on '{0}'" -msgstr "Fejl ved \"{0}\"" +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12 +msgid "_Repeat the alarm" +msgstr "_Gentag påmindelsen" -#: ../calendar/calendar.error.xml.h:45 -msgid "" -"If you do not send a cancelation notice, the other participants may not know " -"the meeting is canceled." -msgstr "" -"Hvis du ikke sender afbud, vil de andre deltagere måske ikke vide at mødet " -"er aflyst." +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13 +msgid "_Sound:" +msgstr "_Lyd:" -#: ../calendar/calendar.error.xml.h:46 +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14 +#, fuzzy msgid "" -"If you do not send a cancelation notice, the other participants may not know " -"the memo has been deleted." +"before\n" +"after" +msgstr "før" + +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16 +msgid "extra times every" +msgstr "ekstra gange hver" + +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17 +#, fuzzy +msgid "" +"minute(s)\n" +"hour(s)\n" +"day(s)" msgstr "" -"Hvis du ikke sender en aflysningsnotits, får de øvrige deltagere måske ikke " -"at vide, at denne huskeseddel er blevet slettet." +"Minutter\n" +"Timer\n" +"Dage" -#: ../calendar/calendar.error.xml.h:47 +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20 +#, fuzzy msgid "" -"If you do not send a cancelation notice, the other participants may not know " -"the task has been deleted." +"minutes\n" +"hours\n" +"days" msgstr "" -"Hvis du ikke underretter de øvrige deltagere om at du har slettet opgaven, " -"vil de måske ikke vide det." +"Minutter\n" +"Timer\n" +"Dage" -#: ../calendar/calendar.error.xml.h:48 -msgid "No response from the server." -msgstr "Intet svar fra serveren." +#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23 +#, fuzzy +msgid "" +"start of appointment\n" +"end of appointment" +msgstr "start på aftale" -#: ../calendar/calendar.error.xml.h:49 -msgid "Save Appointment" -msgstr "Gem aftale" +#: ../calendar/gui/dialogs/alarm-list-dialog.c:244 +msgid "Action/Trigger" +msgstr "Handling/udløser" -#: ../calendar/calendar.error.xml.h:50 -msgid "Save Memo" -msgstr "Gem huskeseddel" +#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1 +msgid "A_dd" +msgstr "_Tilføj" -#: ../calendar/calendar.error.xml.h:51 -msgid "Save Task" -msgstr "Gem opgave" +#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15 +#: ../calendar/gui/dialogs/event-page.glade.h:4 +msgid "Alarms" +msgstr "Påmindelser" -#: ../calendar/calendar.error.xml.h:52 -msgid "" -"Sending updated information allows other participants to keep their " -"calendars up to date." -msgstr "" -"Ved at sende opdateret information vil andre deltagere kunne holde deres " -"kalendere opdateret." +#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81 +#: ../widgets/misc/e-attachment-dialog.c:371 +#: ../widgets/misc/e-attachment-store.c:553 +msgid "_Suggest automatic display of attachment" +msgstr "F_oreslå automatisk visning af bilag" -#: ../calendar/calendar.error.xml.h:53 -msgid "" -"Sending updated information allows other participants to keep their task " -"lists up to date." -msgstr "" -"Ved at sende opdateret information, vil de andre deltagere kunne opdatere " -"deres opgavelister." +#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142 +msgid "Attach file(s)" +msgstr "Vedhæft fil(er)" -#: ../calendar/calendar.error.xml.h:55 +#. an empty string is the same as 'None' +#: ../calendar/gui/dialogs/cal-prefs-dialog.c:137 +#: ../calendar/gui/dialogs/cal-prefs-dialog.c:186 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32 +#: ../calendar/gui/dialogs/event-page.c:2968 +#: ../calendar/gui/e-cal-model-tasks.c:673 +#: ../calendar/gui/e-day-view-time-item.c:789 +#: ../calendar/gui/e-itip-control.c:1151 ../filter/filter-rule.c:942 +#: ../mail/em-account-editor.c:704 ../mail/em-account-editor.c:1433 +#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93 +#: ../plugins/calendar-weather/calendar-weather.c:333 +#: ../plugins/calendar-weather/calendar-weather.c:387 +#: ../plugins/email-custom-header/email-custom-header.c:395 +#: ../plugins/exchange-operations/exchange-delegates-user.c:181 +#: ../plugins/itip-formatter/itip-formatter.c:2192 +#: ../widgets/misc/e-cell-date-edit.c:316 ../widgets/misc/e-dateedit.c:1510 +#: ../widgets/misc/e-dateedit.c:1726 +#: ../widgets/misc/e-signature-combo-box.c:74 +msgid "None" +msgstr "Ingen" + +#: ../calendar/gui/dialogs/cal-prefs-dialog.c:637 +msgid "Selected Calendars for Alarms" +msgstr "Kalendere hvor påmindelser er aktiveret" + +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1 +msgid "(Shown in a Day View)" +msgstr "(Vises i dagsvisning)" + +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2 msgid "" -"Some attachments are being downloaded. Saving the appointment would result " -"in the loss of these attachments." +"60 minutes\n" +"30 minutes\n" +"15 minutes\n" +"10 minutes\n" +"05 minutes" msgstr "" -"Nogle bilag er ved at blive hentet. Gemmer du denne aftale nu, vil bilagene " -"ikke blive gemt sammen med aftalen." +"60 minutter\n" +"30 minutter\n" +"15 minutter\n" +"10 minutter\n" +"05 minutter" -#: ../calendar/calendar.error.xml.h:56 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8 +#, no-c-format msgid "" -"Some attachments are being downloaded. Saving the task would result in the " -"loss of these attachments." +"%u and %d will be replaced by user and domain from the email address." msgstr "" -"Nogle bilag er ved at blive hentet. Gem er du denne opgave nu, vil bilagene " -"ikke blive gemt sammen med opgaven." +"%u og %d vil blive udskiftet med bruger og domæne fra e-postadressen." -#: ../calendar/calendar.error.xml.h:57 -msgid "Some features may not work properly with your current server." -msgstr "" -"Visse faciliteter vil måske ikke virke ordentligt med din nuværende server." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9 +#: ../mail/mail-config.glade.h:10 +msgid "Alerts" +msgstr "Advarsler" -#: ../calendar/calendar.error.xml.h:58 -msgid "The Evolution calendar has quit unexpectedly." -msgstr "Evolutions kalender afsluttedes uventet." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10 +msgid "Default Free/Busy Server" +msgstr "Standardserver ved ledig/optaget" -#: ../calendar/calendar.error.xml.h:59 -msgid "The Evolution calendars have quit unexpectedly." -msgstr "Evolutionskalenderne afsluttedes uventet." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11 +#: ../mail/mail-config.glade.h:17 +#: ../plugins/publish-calendar/publish-calendar.glade.h:1 +msgid "General" +msgstr "Generelt" -#: ../calendar/calendar.error.xml.h:60 -msgid "The Evolution memo has quit unexpectedly." -msgstr "Evolutions huskeseddel afsluttedes uventet." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12 +msgid "Task List" +msgstr "Opgaveliste" -#: ../calendar/calendar.error.xml.h:61 -msgid "The Evolution tasks have quit unexpectedly." -msgstr "Evolutions opgaver afsluttedes uventet." +# klokkeslet? +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13 +msgid "Time" +msgstr "Tidspunkt" -#: ../calendar/calendar.error.xml.h:62 -msgid "The calendar is not marked for offline usage." -msgstr "Kalenderen er ikke markeret til brug i afkoblet tilstand." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14 +msgid "Work Week" +msgstr "Arbejdsuge" -#: ../calendar/calendar.error.xml.h:63 -msgid "The memo list is not marked for offline usage." -msgstr "Huskeseddel-listen er ikke markeret til brug i afkoblet tilstand." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16 +msgid "Day _ends:" +msgstr "Dagen _slutter:" -#: ../calendar/calendar.error.xml.h:64 -msgid "The task list is not marked for offline usage." -msgstr "Opgavelisten er ikke markeret til brug i afkoblet tilstand." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 +msgid "Display" +msgstr "Vis" -#: ../calendar/calendar.error.xml.h:65 -msgid "This calendar will be removed permanently." -msgstr "Denne kalender vil blive fjernet permanent." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 +#: ../calendar/gui/dialogs/recurrence-page.c:1107 +#: ../calendar/gui/e-itip-control.c:731 +msgid "Friday" +msgstr "Fredag" -#: ../calendar/calendar.error.xml.h:66 -msgid "This memo list will be removed permanently." -msgstr "Denne liste over huskesedler vil blive fjernet permanent." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21 +msgid "" +"Minutes\n" +"Hours\n" +"Days" +msgstr "" +"Minutter\n" +"Timer\n" +"Dage" -#: ../calendar/calendar.error.xml.h:67 -msgid "This task list will be removed permanently." -msgstr "Denne opgaveliste vil blive fjernet permanent." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24 +#: ../calendar/gui/dialogs/recurrence-page.c:1103 +#: ../calendar/gui/e-itip-control.c:727 +msgid "Monday" +msgstr "Mandag" -#: ../calendar/calendar.error.xml.h:68 -msgid "Unable to load the calendar" -msgstr "Kunne ikke indlæse kalenderen" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25 +msgid "" +"Monday\n" +"Tuesday\n" +"Wednesday\n" +"Thursday\n" +"Friday\n" +"Saturday\n" +"Sunday" +msgstr "" +"Mandag\n" +"Tirsdag\n" +"Onsdag\n" +"Torsdag\n" +"Fredag\n" +"Lørdag\n" +"Søndag" -#: ../calendar/calendar.error.xml.h:69 -msgid "Would you like to save your changes to this appointment?" -msgstr "Vil du gemme dine ændringer for denne aftale?" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 +#: ../mail/mail-config.glade.h:117 +msgid "Pick a color" +msgstr "Vælg en farve" -#: ../calendar/calendar.error.xml.h:70 -msgid "Would you like to save your changes to this memo?" -msgstr "Vil du gemme dine ændringer af denne huskeseddel?" +#. Sunday +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35 +msgid "S_un" +msgstr "_Søn" -#: ../calendar/calendar.error.xml.h:71 -msgid "Would you like to save your changes to this task?" -msgstr "Vil du gemme dine ændringer af opgaven?" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36 +#: ../calendar/gui/dialogs/recurrence-page.c:1108 +#: ../calendar/gui/e-itip-control.c:732 +msgid "Saturday" +msgstr "Lørdag" -#: ../calendar/calendar.error.xml.h:72 -msgid "Would you like to send a cancelation notice for this memo?" -msgstr "Vil du sende en aflysningsnotits for denne huskeseddel?" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37 +msgid "Sc_roll Month View by a week" +msgstr "" -#: ../calendar/calendar.error.xml.h:73 -msgid "Would you like to send all the participants a cancelation notice?" -msgstr "Vil du sende en aflysningsnotits til alle deltagerne?" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38 +msgid "Se_cond zone:" +msgstr "An_den zone:" -#: ../calendar/calendar.error.xml.h:74 -msgid "Would you like to send meeting invitations to participants?" -msgstr "Vil du sende mødeinvitationer til deltagerne?" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 +msgid "Select the calendars for alarm notification" +msgstr "Vælg kalendere hvor påmindelser ved alarm skal aktiveres" -#: ../calendar/calendar.error.xml.h:75 -msgid "Would you like to send this task to participants?" -msgstr "Vil du sende denne opgave til deltagerne?" +#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 +msgid "Sh_ow a reminder" +msgstr "_Vis en påmindelse" -#: ../calendar/calendar.error.xml.h:76 -msgid "Would you like to send updated meeting information to participants?" -msgstr "Vil du sende opdateret mødeinformation til alle deltagerne?" +#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 +msgid "Show a _reminder" +msgstr "Vis en på_mindelse" -#: ../calendar/calendar.error.xml.h:77 -msgid "Would you like to send updated task information to participants?" -msgstr "Vil du sende opdateret opgaveinformation til deltagerne?" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 +msgid "Show week _numbers in date navigator" +msgstr "Vis uge_numre i datonavigeringen" -#: ../calendar/calendar.error.xml.h:78 -msgid "" -"You are connecting to an unsupported GroupWise server and may encounter " -"problems using Evolution. For best results, the server should be upgraded to " -"a supported version." -msgstr "" -"Du tilslutter dig en GroupWise-server der ikke er understøttet, du vil " -"muligvis opleve problemer med Evolution. For at få det bedste resultat skal " -"serveren opgraderes til en understøttet version." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45 +msgid "Show week n_umber in Day and Work Week View" +msgstr "Vis ugen_umre i dags- og arbejdsugevisningen" -#: ../calendar/calendar.error.xml.h:79 -msgid "You have changed this appointment, but not yet saved it." -msgstr "Du har ændret denne aftale, men ikke gemt ændringerne endnu." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46 +#: ../calendar/gui/dialogs/recurrence-page.c:1109 +#: ../calendar/gui/e-itip-control.c:726 +msgid "Sunday" +msgstr "Søndag" -#: ../calendar/calendar.error.xml.h:80 -msgid "You have changed this task, but not yet saved it." -msgstr "Du har lavet ændringer af opgaven, men ikke gemt dem endnu." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47 +msgid "T_asks due today:" +msgstr "_Dagens opgaver:" -#: ../calendar/calendar.error.xml.h:81 -msgid "You have made changes to this memo, but not yet saved them." -msgstr "Du har lavet ændringer af huskesedlen, men ikke gemt dem endnu." +#. Thursday +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 +msgid "T_hu" +msgstr "T_or" -#: ../calendar/calendar.error.xml.h:82 -msgid "Your calendars will not be available until Evolution is restarted." -msgstr "Dine kalendere vil ikke være tilgængelige før Evolution genstartes." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50 +msgid "Template:" +msgstr "Skabelon:" -#: ../calendar/calendar.error.xml.h:83 -msgid "Your memos will not be available until Evolution is restarted." -msgstr "Dine huskesedler vil ikke være tilgængelige før Evolution genstartes." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51 +#: ../calendar/gui/dialogs/recurrence-page.c:1106 +#: ../calendar/gui/e-itip-control.c:730 +msgid "Thursday" +msgstr "Torsdag" -#: ../calendar/calendar.error.xml.h:84 -msgid "Your tasks will not be available until Evolution is restarted." -msgstr "Dine opgaver vil ikke være tilgængelige før Evolution genstartes." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52 +#: ../calendar/gui/dialogs/event-page.glade.h:12 +msgid "Time _zone:" +msgstr "Tids_zone:" -#: ../calendar/calendar.error.xml.h:85 -#: ../composer/mail-composer.error.xml.h:30 -msgid "_Discard Changes" -msgstr "_Forkast ændringer" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53 +msgid "Time format:" +msgstr "Tidsformat:" -#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497 -msgid "_Save" -msgstr "_Gem" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54 +#: ../calendar/gui/dialogs/recurrence-page.c:1104 +#: ../calendar/gui/e-itip-control.c:728 +msgid "Tuesday" +msgstr "Tirsdag" -#: ../calendar/calendar.error.xml.h:87 -msgid "_Save Changes" -msgstr "_Gem ændringer" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55 +#, fuzzy +msgid "Use s_ystem time zone" +msgstr "Vis den sekundære tidszone" -#: ../calendar/calendar.error.xml.h:88 -#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142 -#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6 -msgid "_Send" -msgstr "_Send" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56 +#: ../calendar/gui/dialogs/recurrence-page.c:1105 +#: ../calendar/gui/e-itip-control.c:729 +msgid "Wednesday" +msgstr "Onsdag" -#: ../calendar/calendar.error.xml.h:89 -msgid "_Send Notice" -msgstr "_Send notits" +#. A weekday like "Monday" follows +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58 +msgid "Wee_k starts on:" +msgstr "_Ugen starter:" -#: ../calendar/calendar.error.xml.h:90 -msgid "{0}." -msgstr "{0}." +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59 +msgid "Work days:" +msgstr "Arbejdsdage:" -#: ../calendar/conduits/calendar/calendar-conduit.c:258 -msgid "Split Multi-Day Events:" -msgstr "Dél flerdagsbegivenheder:" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60 +msgid "_12 hour (AM/PM)" +msgstr "_12 timer (AM/PM)" -#: ../calendar/conduits/calendar/calendar-conduit.c:1523 -#: ../calendar/conduits/calendar/calendar-conduit.c:1524 -#: ../calendar/conduits/memo/memo-conduit.c:821 -#: ../calendar/conduits/memo/memo-conduit.c:822 -#: ../calendar/conduits/todo/todo-conduit.c:1019 -#: ../calendar/conduits/todo/todo-conduit.c:1020 -msgid "Could not start evolution-data-server" -msgstr "Kunne ikke starte evolution-data-server" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61 +msgid "_24 hour" +msgstr "_24 timer" -#: ../calendar/conduits/calendar/calendar-conduit.c:1631 -#: ../calendar/conduits/calendar/calendar-conduit.c:1634 -msgid "Could not read pilot's Calendar application block" -msgstr "Kunne ikke læse pilotens kalender-programblok" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62 +msgid "_Ask for confirmation when deleting items" +msgstr "Spørg efter bekræftelse ved sletning _af tilførsler" -#: ../calendar/conduits/memo/memo-conduit.c:915 -#: ../calendar/conduits/memo/memo-conduit.c:918 -msgid "Could not read pilot's Memo application block" -msgstr "Kunne ikke læse pilotens programblok for huskeseddel" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63 +msgid "_Compress weekends in month view" +msgstr "_Komprimér weekender i månedsvisning" -#: ../calendar/conduits/memo/memo-conduit.c:962 -#: ../calendar/conduits/memo/memo-conduit.c:965 -msgid "Could not write pilot's Memo application block" -msgstr "Kunne ikke skrive til pilotens programblok for huskeseddel" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64 +msgid "_Day begins:" +msgstr "_Dagen begynder:" -#: ../calendar/conduits/todo/todo-conduit.c:241 -msgid "Default Priority:" -msgstr "Standardprioritet:" +#. Friday +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66 +msgid "_Fri" +msgstr "_Fre" -#: ../calendar/conduits/todo/todo-conduit.c:1103 -#: ../calendar/conduits/todo/todo-conduit.c:1106 -msgid "Could not read pilot's ToDo application block" -msgstr "Kunne ikke læse pilotens programblok for opgaveliste" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67 +msgid "_Hide completed tasks after" +msgstr "Sk_jul udførte opgaver efter" -#: ../calendar/conduits/todo/todo-conduit.c:1148 -#: ../calendar/conduits/todo/todo-conduit.c:1151 -msgid "Could not write pilot's ToDo application block" -msgstr "Kunne ikke skrive til pilotens programblok for opgaveliste" +#. Monday +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69 +msgid "_Mon" +msgstr "_Man" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1 -#: ../plugins/itip-formatter/itip-formatter.c:2523 -msgid "Calendar and Tasks" -msgstr "Kalender og opgaver" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70 +msgid "_Overdue tasks:" +msgstr "_Opgaver der skulle have været udført:" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2 -#: ../calendar/gui/calendar-component.c:869 -#: ../calendar/gui/calendar-component.c:1291 -msgid "Calendars" -msgstr "Kalendere" +#. Saturday +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72 +msgid "_Sat" +msgstr "L_ør" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3 -msgid "Configure your timezone, Calendar and Task List here " -msgstr "Konfigurér din tidszone, kalender og opgaveliste her " +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73 +msgid "_Show appointment end times in week and month view" +msgstr "_Vis sluttiderne for aftaler i uge- og måneds-oversigterne" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4 -msgid "Evolution Calendar and Tasks" -msgstr "Evolutions kalender- og opgaveoversigt" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74 +msgid "_Time divisions:" +msgstr "_Tidsinddelinger:" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5 -msgid "Evolution Calendar configuration control" -msgstr "Styreelement til opsætning af Evolutions kalender" +#. Tuesday +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76 +msgid "_Tue" +msgstr "T_irs" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6 -msgid "Evolution Calendar scheduling message viewer" -msgstr "Visning af Evolution-kalenderens planlægningsbesked" +#. Wednesday +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78 +msgid "_Wed" +msgstr "_Ons" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7 -msgid "Evolution Calendar/Task editor" -msgstr "Evolution kalender/opgave-redigering" +#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80 +msgid "before every anniversary/birthday" +msgstr "før hver jubilæum/fødselsdag" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8 -msgid "Evolution's Calendar component" -msgstr "Evolutions kalenderkomponent" +#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82 +msgid "before every appointment" +msgstr "før hver aftale" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9 -msgid "Evolution's Memos component" -msgstr "Evolutions huskeseddel-komponent" +#: ../calendar/gui/dialogs/calendar-setup.c:153 +msgid "Type:" +msgstr "Type:" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10 -msgid "Evolution's Tasks component" -msgstr "Evolutions opgavekomponent" +#: ../calendar/gui/dialogs/calendar-setup.c:270 +msgid "Cop_y calendar contents locally for offline operation" +msgstr "Kopiér _kalenderindhold lokalt til brug i afkoblet tilstand" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11 -msgid "Memo_s" -msgstr "H_uskesedler" +#: ../calendar/gui/dialogs/calendar-setup.c:272 +msgid "Cop_y task list contents locally for offline operation" +msgstr "Kopiér _opgavelistens indhold lokalt til brug i afkoblet tilstand" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12 -#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133 -#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594 -#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:350 -#: ../calendar/gui/memos-control.c:366 -msgid "Memos" -msgstr "Huskesedler" +#: ../calendar/gui/dialogs/calendar-setup.c:274 +msgid "Cop_y memo list contents locally for offline operation" +msgstr "" +"Kopiér _huskeseddel-listens indhold lokalt til brug i afkoblet tilstand" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13 -#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437 -#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988 -#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908 -#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498 -#: ../calendar/importers/icalendar-importer.c:76 -#: ../calendar/importers/icalendar-importer.c:749 -#: ../plugins/exchange-operations/exchange-delegates-user.c:78 -#: ../plugins/exchange-operations/exchange-folder.c:588 -#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425 -#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569 -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12 -msgid "Tasks" -msgstr "Opgaver" +#: ../calendar/gui/dialogs/calendar-setup.c:344 +msgid "Colo_r:" +msgstr "_Farve:" -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14 -msgid "_Calendars" -msgstr "K_alendere" +#: ../calendar/gui/dialogs/calendar-setup.c:379 +msgid "Task List" +msgstr "Opgaveliste" -#. Tasks -#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15 -#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3 -msgid "_Tasks" -msgstr "_Opgaver" +#: ../calendar/gui/dialogs/calendar-setup.c:390 +msgid "Memo List" +msgstr "Liste over huskesedler" -#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1 -msgid "Evolution Calendar alarm notification service" -msgstr "Evolution kalenderpåmindelse" +#: ../calendar/gui/dialogs/calendar-setup.c:475 +msgid "Calendar Properties" +msgstr "Kalenderegenskaber" -#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105 -msgid "minute" -msgid_plural "minutes" -msgstr[0] "minut" -msgstr[1] "minutter" +#: ../calendar/gui/dialogs/calendar-setup.c:475 +msgid "New Calendar" +msgstr "Ny kalender" -#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120 -#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8 -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25 -#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15 -#: ../plugins/caldav/caldav-source.c:431 -#: ../plugins/calendar-http/calendar-http.c:280 -#: ../plugins/calendar-weather/calendar-weather.c:525 -#: ../plugins/google-account-setup/google-source.c:653 -#: ../plugins/google-account-setup/google-contacts-source.c:367 -msgid "hours" -msgid_plural "hours" -msgstr[0] "timer" -msgstr[1] "timer" +#: ../calendar/gui/dialogs/calendar-setup.c:531 +msgid "Task List Properties" +msgstr "Opgavelisteegenskaber" -#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298 -msgid "Start time" -msgstr "Starttidspunkt" +#: ../calendar/gui/dialogs/calendar-setup.c:531 +msgid "New Task List" +msgstr "Ny opgaveliste" -#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1 -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4 -msgid "Appointments" -msgstr "Aftaler" +#: ../calendar/gui/dialogs/calendar-setup.c:587 +msgid "Memo List Properties" +msgstr "Opgavelisteegenskaber" -#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2 -msgid "Dismiss _All" -msgstr "Forkast _alle" +#: ../calendar/gui/dialogs/calendar-setup.c:587 +msgid "New Memo List" +msgstr "Ny liste over huskesedler" -#. Location -#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1608 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1614 -#: ../calendar/gui/e-itip-control.c:1167 -#: ../plugins/itip-formatter/itip-view.c:1021 -msgid "Location:" -msgstr "Sted:" +#: ../calendar/gui/dialogs/changed-comp.c:59 +msgid "This event has been deleted." +msgstr "Denne begivenhed er slettet." -#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4 -msgid "Snooze _time:" -msgstr "Udsæt_tid:" +#: ../calendar/gui/dialogs/changed-comp.c:63 +msgid "This task has been deleted." +msgstr "Denne opgave er slettet." -#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5 -msgid "_Dismiss" -msgstr "_Forkast" +#: ../calendar/gui/dialogs/changed-comp.c:67 +msgid "This memo has been deleted." +msgstr "Denne huskeseddel er blevet slettet." -#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6 -#: ../calendar/gui/dialogs/comp-editor.c:1382 -#: ../calendar/gui/dialogs/recurrence-page.glade.h:10 -#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170 -#: ../plugins/exchange-operations/exchange-delegates.glade.h:15 -#: ../plugins/publish-calendar/publish-calendar.glade.h:21 -#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43 -#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17 -#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42 -#: ../widgets/menus/gal-define-views.glade.h:5 -msgid "_Edit" -msgstr "R_edigér" +#: ../calendar/gui/dialogs/changed-comp.c:76 +#, c-format +msgid "%s You have made changes. Forget those changes and close the editor?" +msgstr "" +"%s Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen " +"lukkes?" -#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7 -msgid "_Snooze" -msgstr "_Udsæt" +#: ../calendar/gui/dialogs/changed-comp.c:78 +#, c-format +msgid "%s You have made no changes, close the editor?" +msgstr "%s Du har ikke lavet nogen ændringer. Afslut redigering?" -#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9 -msgid "location of appointment" -msgstr "placering af aftale" +#: ../calendar/gui/dialogs/changed-comp.c:83 +msgid "This event has been changed." +msgstr "Denne begivenhed er ændret." -#: ../calendar/gui/alarm-notify/alarm-queue.c:1466 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1591 -msgid "No summary available." -msgstr "Intet tilgængeligt sammendrag." +#: ../calendar/gui/dialogs/changed-comp.c:87 +msgid "This task has been changed." +msgstr "Denne opgave er ændret." -#: ../calendar/gui/alarm-notify/alarm-queue.c:1475 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1477 -msgid "No description available." -msgstr "Ingen tilgængelig beskrivelse." +#: ../calendar/gui/dialogs/changed-comp.c:91 +msgid "This memo has been changed." +msgstr "Denne huskeseddel er blevet ændret." -#: ../calendar/gui/alarm-notify/alarm-queue.c:1485 -msgid "No location information available." -msgstr "Ingen tilgængelig stedinformation." +#: ../calendar/gui/dialogs/changed-comp.c:100 +#, c-format +msgid "%s You have made changes. Forget those changes and update the editor?" +msgstr "" +"%s Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen " +"opdateres?" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1530 +#: ../calendar/gui/dialogs/changed-comp.c:102 #, c-format -msgid "You have %d alarms" -msgstr "Du har %d påmindelser" +msgid "%s You have made no changes, update the editor?" +msgstr "%s Du har ikke gjort ændringer. Opdater redigering?" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1692 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1720 -#: ../e-util/e-non-intrusive-error-dialog.h:41 -msgid "Warning" -msgstr "Advarsel" +#: ../calendar/gui/dialogs/comp-editor-page.c:448 +#, c-format +msgid "Validation error: %s" +msgstr "Valideringsfejl: %s" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1696 -msgid "" -"Evolution does not support calendar reminders with\n" -"email notifications yet, but this reminder was\n" -"configured to send an email. Evolution will display\n" -"a normal reminder dialog box instead." -msgstr "" -"Evolution understøtter ikke påmindelser pr. brev endnu,\n" -"men denne påmindelse blev konfigureret til at sende et brev.\n" -"Evolution vil vise en normal dialog med påmindelse i stedet." +#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2372 +msgid " to " +msgstr " til " -#: ../calendar/gui/alarm-notify/alarm-queue.c:1726 -#, c-format -msgid "" -"An Evolution Calendar reminder is about to trigger. This reminder is " -"configured to run the following program:\n" -"\n" -" %s\n" -"\n" -"Are you sure you want to run this program?" -msgstr "" -"En Evolution kalenderpåmindelse udløses snart.\n" -"Denne påmindelse er konfigureret til at køre følgende program:\n" -"\n" -" %s\n" -"\n" -"Er du sikker på at du vil køre dette program?" +#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2376 +msgid " (Completed " +msgstr " (Fuldført " -#: ../calendar/gui/alarm-notify/alarm-queue.c:1740 -msgid "Do not ask me about this program again." -msgstr "Spørg mig ikke om dette program igen." +#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2378 +msgid "Completed " +msgstr "Fuldført " -#: ../calendar/gui/alarm-notify/notify-main.c:141 -msgid "Could not initialize Bonobo" -msgstr "Kunne ikke initialisere Bonobo" +#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2383 +msgid " (Due " +msgstr " (Forfalder " -# "Factory" er en factory-funktion, vi nøjes med "funktion -MBJ -#: ../calendar/gui/alarm-notify/notify-main.c:154 -msgid "" -"Could not create the alarm notify service factory, maybe it's already " -"running..." -msgstr "" -"Kunne ikke oprette funktionen til påmindelser, måske kører den allerede..." +#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2385 +msgid "Due " +msgstr "Forfalder " -#: ../calendar/gui/alarm-notify/util.c:44 -msgid "invalid time" -msgstr "ugyldig tidsangivelse" +#: ../calendar/gui/dialogs/comp-editor.c:245 +#: ../calendar/gui/dialogs/comp-editor.c:2676 ../mail/em-utils.c:373 +#: ../plugins/prefer-plain/prefer-plain.c:91 +msgid "attachment" +msgstr "bilag" -#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment" -#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406 -#: ../calendar/gui/misc.c:116 +#: ../calendar/gui/dialogs/comp-editor.c:474 +msgid "Could not update object" +msgstr "Kunne ikke opdatere objekt" + +#: ../calendar/gui/dialogs/comp-editor.c:563 +msgid "Edit Appointment" +msgstr "Redigér aftale" + +#: ../calendar/gui/dialogs/comp-editor.c:570 #, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d time" -msgstr[1] "%d timer" +msgid "Meeting - %s" +msgstr "Møde - %s" -#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment" -#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412 -#: ../calendar/gui/misc.c:122 +#: ../calendar/gui/dialogs/comp-editor.c:572 #, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d minut" -msgstr[1] "%d minutter" +msgid "Appointment - %s" +msgstr "Aftale - %s" -#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") -#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment" -#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") -#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418 -#: ../calendar/gui/misc.c:126 +#: ../calendar/gui/dialogs/comp-editor.c:578 #, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d sekund" -msgstr[1] "%d sekunder" +msgid "Assigned Task - %s" +msgstr "Tildelt opgave - %s" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1 -msgid "Alarm programs" -msgstr "Programmer der udløses ved påmindelser" +#: ../calendar/gui/dialogs/comp-editor.c:580 +#, c-format +msgid "Task - %s" +msgstr "Opgave - %s" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2 -#: ../mail/evolution-mail.schemas.in.h:6 -msgid "Amount of time in seconds the error should be shown on the status bar." -msgstr "Antallet af sekunder fejlen skal vises i statusbjælken." +#: ../calendar/gui/dialogs/comp-editor.c:585 +#, c-format +msgid "Memo - %s" +msgstr "Huskeseddel - %s" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3 -msgid "Ask for confirmation when deleting items" -msgstr "Spørg efter bekræftelse ved sletning af punkter" +#: ../calendar/gui/dialogs/comp-editor.c:601 +msgid "No Summary" +msgstr "Intet sammendrag" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4 -msgid "Background color of tasks that are due today, in \"#rrggbb\" format." -msgstr "Baggrundsfarve for dagens opgaver, i \"#rrggbb\"-format." +#: ../calendar/gui/dialogs/comp-editor.c:743 +msgid "Keep original item?" +msgstr "Behold oprindelige element?" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5 -msgid "Background color of tasks that are overdue, in \"#rrggbb\" format." -msgstr "" -"Baggrundsfarve for opgaver der tidsmæssigt er overskredet, i \"#rrggbb\"-" -"format." +#: ../calendar/gui/dialogs/comp-editor.c:949 +msgid "Click here to close the current window" +msgstr "Klik her for at lukke det aktive vindue" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6 -msgid "Calendars to run alarms for" -msgstr "Kalendere hvor påmindelser skal gives" +#: ../calendar/gui/dialogs/comp-editor.c:956 +msgid "Copy selected text to the clipboard" +msgstr "Kopiér markeret tekst til udklipsholderen" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7 -msgid "" -"Color to draw the Marcus Bains Line in the Time bar (empty for default)." -msgstr "" -"Farven der bruges til at tegne Marcus Bains-linjen i tidslinjen (tom for " -"standardfarven)." +#: ../calendar/gui/dialogs/comp-editor.c:963 +msgid "Cut selected text to the clipboard" +msgstr "Klip markeret tekst til udklipsholderen" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8 -msgid "Color to draw the Marcus Bains line in the Day View." -msgstr "Farven der bruges til at tegne Marcus Bains-linjen i dagsoversigten." +#: ../calendar/gui/dialogs/comp-editor.c:970 +msgid "Click here to view help available" +msgstr "Klik her for at læse den tilgængelige hjælpedokumentation" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9 -msgid "Compress weekends in month view" -msgstr "Komprimér weekender i månedsoversigt" +#: ../calendar/gui/dialogs/comp-editor.c:977 +msgid "Paste text from the clipboard" +msgstr "Indsæt tekst fra udklipsholderen" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10 -msgid "Confirm expunge" -msgstr "Bekræft tømning" +#: ../calendar/gui/dialogs/comp-editor.c:998 +msgid "Click here to save the current window" +msgstr "Klik her for at gemme det aktive vindue" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11 -msgid "Days on which the start and end of work hours should be indicated." -msgstr "Dage hvor start og slut på arbejdstimerne skal indikeres." +#: ../calendar/gui/dialogs/comp-editor.c:1005 +msgid "Select all text" +msgstr "Vælg hele teksten" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12 -msgid "Default appointment reminder" -msgstr "Standard-aftalepåmindelse" +#: ../calendar/gui/dialogs/comp-editor.c:1012 +msgid "_Classification" +msgstr "K_lassificering" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13 -msgid "Default reminder units" -msgstr "Tidsenheder der anvendes som standard ved påmindelser" +#: ../calendar/gui/dialogs/comp-editor.c:1026 +#: ../mail/mail-signature-editor.c:208 +#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43 +msgid "_File" +msgstr "_Fil" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14 -msgid "Default reminder value" -msgstr "Værdier der anvendes som standard ved påmindelser" - -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15 -msgid "Directory for saving alarm audio files" -msgstr "Mappe hvor alarm lydfiler skal gemmes i" +#: ../calendar/gui/dialogs/comp-editor.c:1033 +#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24 +#: ../ui/evolution.xml.h:46 +msgid "_Help" +msgstr "_Hjælp" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16 -msgid "Event Gradient" -msgstr "Gradient ved begivenhed" +#: ../calendar/gui/dialogs/comp-editor.c:1040 +msgid "_Insert" +msgstr "_Indsæt" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17 -msgid "Event Transparency" -msgstr "Gennemsigtighed ved begivenhed" +#: ../calendar/gui/dialogs/comp-editor.c:1047 +msgid "_Options" +msgstr "_Indstillinger" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18 -msgid "Free/busy server URLs" -msgstr "Server-adresser ved ledig/optaget" +#: ../calendar/gui/dialogs/comp-editor.c:1054 ../mail/em-folder-tree.c:2043 +#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34 +#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30 +#: ../ui/evolution.xml.h:55 +msgid "_View" +msgstr "_Vis" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19 -msgid "Free/busy template URL" -msgstr "Skabelon-adresse for ledig/optaget" +#: ../calendar/gui/dialogs/comp-editor.c:1064 +#: ../composer/e-composer-actions.c:315 +msgid "_Attachment..." +msgstr "_Bilag..." -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20 -msgid "Gradient of the events in calendar views." -msgstr "Gradient ved begivenheder i kalenderoversigter." +#: ../calendar/gui/dialogs/comp-editor.c:1066 +msgid "Click here to attach a file" +msgstr "Klik her for at vedlægge en fil" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21 -msgid "Hide completed tasks" -msgstr "Skjul udførte opgaver" +#: ../calendar/gui/dialogs/comp-editor.c:1074 +msgid "_Categories" +msgstr "_Kategorier" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22 -msgid "Hide task units" -msgstr "Skjul opgave-enheder" +#: ../calendar/gui/dialogs/comp-editor.c:1076 +msgid "Toggles whether to display categories" +msgstr "Slå visning af kategorier fra/til" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23 -msgid "Hide task value" -msgstr "Skjul opgaveværdi" +#: ../calendar/gui/dialogs/comp-editor.c:1082 +msgid "Time _Zone" +msgstr "Tids_zone" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24 -msgid "Horizontal pane position" -msgstr "Rudens vandrette placering" +#: ../calendar/gui/dialogs/comp-editor.c:1084 +msgid "Toggles whether the time zone is displayed" +msgstr "Slå visning af Tidszone-feltet fra/til" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25 -msgid "Hour the workday ends on, in twenty four hour format, 0 to 23." -msgstr "Timen hvorpå arbejdsdagen slutter, i 24-timers-format, 0 - 23." +#: ../calendar/gui/dialogs/comp-editor.c:1093 +msgid "Pu_blic" +msgstr "Of_fentlig" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26 -msgid "Hour the workday starts on, in twenty four hour format, 0 to 23." -msgstr "Timen hvorpå arbejdsdagen starter, i 24-timers-format, 0 - 23." +#: ../calendar/gui/dialogs/comp-editor.c:1095 +msgid "Classify as public" +msgstr "Klassificér som offentlig" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27 -msgid "Intervals shown in Day and Work Week views, in minutes." -msgstr "Tidsintervaller der vises i dag- og arbejdsugeoversigter, i minutter." +#: ../calendar/gui/dialogs/comp-editor.c:1100 +msgid "_Private" +msgstr "_Privat" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28 -msgid "Last alarm time" -msgstr "Seneste tidspunkt for påmindelse" +#: ../calendar/gui/dialogs/comp-editor.c:1102 +msgid "Classify as private" +msgstr "Klassificér som privat" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29 -#: ../mail/evolution-mail.schemas.in.h:72 -msgid "Level beyond which the message should be logged." -msgstr "Over dette niveau logges brevet." +#: ../calendar/gui/dialogs/comp-editor.c:1107 +msgid "_Confidential" +msgstr "_Fortroligt" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30 -msgid "List of recently used second time zones in a Day View." -msgstr "Liste af nyligt brugte sekundære tidszoner i dagsvisning." +#: ../calendar/gui/dialogs/comp-editor.c:1109 +msgid "Classify as confidential" +msgstr "Klassificér som fortroligt" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31 -msgid "List of server URLs for free/busy publishing." -msgstr "Liste med server-adresser for ledig- / optaget-udgivelse." +#: ../calendar/gui/dialogs/comp-editor.c:1117 +msgid "R_ole Field" +msgstr "_Rolle-felt" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32 -msgid "Marcus Bains Line" -msgstr "Marcus Bains-linje" +#: ../calendar/gui/dialogs/comp-editor.c:1119 +msgid "Toggles whether the Role field is displayed" +msgstr "Slå visning af Rolle-feltet fra/til" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33 -msgid "Marcus Bains Line Color - Day View" -msgstr "Farve for Marcus Bains-linje - dagsoversigt" +#: ../calendar/gui/dialogs/comp-editor.c:1125 +msgid "_RSVP" +msgstr "_RSVP" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34 -msgid "Marcus Bains Line Color - Time bar" -msgstr "Farve for Marcus Bains-linje - tidslinje" +#: ../calendar/gui/dialogs/comp-editor.c:1127 +msgid "Toggles whether the RSVP field is displayed" +msgstr "Slå visning af RSVP-feltet fra/til" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35 -msgid "" -"Maximum number of recently used timezones to remember in a " -"'day_second_zones' list." -msgstr "" -"Maksimalt antal af nyligt brugte tidszoner, der skal huskes i en " -"\"day_second_zones\"-liste." +#: ../calendar/gui/dialogs/comp-editor.c:1133 +msgid "_Status Field" +msgstr "_Status-felt" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36 -msgid "Maximum number of recently used timezones to remember." -msgstr "Maksimalt antal af nyligt brugte tidszoner, der skal huskes." +#: ../calendar/gui/dialogs/comp-editor.c:1135 +msgid "Toggles whether the Status field is displayed" +msgstr "Slå visning af Status-feltet fra/til" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37 -msgid "Minute the workday ends on, 0 to 59." -msgstr "Det minut som arbejdsdagen slutter på, 0 - 59." +#: ../calendar/gui/dialogs/comp-editor.c:1141 +msgid "_Type Field" +msgstr "_Type-felt" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38 -msgid "Minute the workday starts on, 0 to 59." -msgstr "Minut arbejdsdagen starter på, 0 - 59." +#: ../calendar/gui/dialogs/comp-editor.c:1143 +msgid "Toggles whether the Attendee Type is displayed" +msgstr "Slå visning af deltagertype fra/til" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39 -msgid "Month view horizontal pane position" -msgstr "Vandret placering for rude med månedsoversigt" +#: ../calendar/gui/dialogs/comp-editor.c:1167 +#: ../composer/e-composer-private.c:66 +msgid "Recent _Documents" +msgstr "Seneste _dokumenter" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40 -msgid "Month view vertical pane position" -msgstr "Lodret placering for rude med månedsoversigt" +#: ../calendar/gui/dialogs/comp-editor.c:1593 +#: ../composer/e-composer-actions.c:518 +msgid "Attach" +msgstr "Vedlæg" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41 -msgid "Number of units for determining a default reminder." -msgstr "Antal enheder til bestemmelse for en standardpåmindelse." +#: ../calendar/gui/dialogs/comp-editor.c:1856 +#: ../calendar/gui/dialogs/comp-editor.c:1905 +#: ../calendar/gui/dialogs/comp-editor.c:2707 +msgid "Changes made to this item may be discarded if an update arrives" +msgstr "" +"Ændringer af dette element bliver muligvis ignoreret hvis en opdatering " +"ankommer" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42 -msgid "Number of units for determining when to hide tasks." -msgstr "Antal enheder for at bestemme hvornår opgaver skal skjules." +#: ../calendar/gui/dialogs/comp-editor.c:2736 +msgid "Unable to use current version!" +msgstr "Kan ikke bruge nuværende version!" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43 -msgid "Overdue tasks color" -msgstr "Farve for opgaver der tidsmæssigt er overskredet" +#: ../calendar/gui/dialogs/copy-source-dialog.c:64 +msgid "Could not open source" +msgstr "Kunne ikke åbne kilde" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44 -msgid "" -"Position of the horizontal pane, between the date navigator calendar and the " -"task list when not in the month view, in pixels." -msgstr "" -"Placering i billedpunkter af den vandrette rude mellem dato-" -"navigeringskalenderen og opgavelisten når man ikke befinder sig i " -"månedsoversigten." +#: ../calendar/gui/dialogs/copy-source-dialog.c:72 +msgid "Could not open destination" +msgstr "Kunne ikke åbne mål" -# "between the view and .." Hvilket "view" er der tale om? -MBJ -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45 -msgid "" -"Position of the horizontal pane, between the view and the date navigator " -"calendar and task list in the month view, in pixels." -msgstr "" -"Placeringen i billedpunkter af den vandrette rude mellem dato-" -"navigeringskalenderen og opgavelisten, i månedsoversigten." +#: ../calendar/gui/dialogs/copy-source-dialog.c:81 +msgid "Destination is read only" +msgstr "Mål er skrivebeskyttet" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46 -msgid "" -"Position of the vertical pane, between the calendar lists and the date " -"navigator calendar." -msgstr "" -"Placeringen af den lodrette rude mellem kalenderlisterne og dato-" -"navigeringskalenderen." +#: ../calendar/gui/dialogs/delete-comp.c:205 +msgid "_Delete this item from all other recipient's mailboxes?" +msgstr "_Slet dette element fra alle øvrige modtageres brevbakker?" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47 -msgid "" -"Position of the vertical pane, between the task list and the task preview " -"pane, in pixels." -msgstr "" -"Placeringen i billedpunkter af den lodrette rude mellem opgavelisten og " -"forhåndsvisningsruden for opgaver." +#: ../calendar/gui/dialogs/delete-error.c:55 +msgid "The event could not be deleted due to a corba error" +msgstr "Begivenheder kunne ikke fjernes pga. en CORBA-fejl" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48 -msgid "" -"Position of the vertical pane, between the view and the date navigator " -"calendar and task list in the month view, in pixels." -msgstr "" -"Placeringen i billedpunkter i månedsoversigten af den lodrette rude, mellem " -"oversigten, datonavigeringskalenderen og opgavelisten." +#: ../calendar/gui/dialogs/delete-error.c:58 +msgid "The task could not be deleted due to a corba error" +msgstr "Opgaven kunne ikke fjernes pga. en CORBA-fejl" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49 -msgid "" -"Position of the vertical pane, between the view and the date navigator " -"calendar and task list when not in the month view, in pixels." -msgstr "" -"Placeringen i billedpunkter af den lodrette rude, mellem oversigten," -"datonavigeringskalenderen og opgavelisten når denne ikke er i " -"månedsoversigten." +#: ../calendar/gui/dialogs/delete-error.c:61 +msgid "The memo could not be deleted due to a corba error" +msgstr "Huskeseddelen kunne ikke fjernes pga. en CORBA-fejl" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50 -msgid "Programs that are allowed to be run by alarms." -msgstr "Programmer der kan udføres som en del af påmindelser." +#: ../calendar/gui/dialogs/delete-error.c:64 +msgid "The item could not be deleted due to a corba error" +msgstr "Punktet kunne ikke fjernes pga. en CORBA-fejl" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51 -msgid "Recently used second time zones in a Day View" -msgstr "Nyligt brugte sekundære tidszoner brugt i dagsvisning" +#: ../calendar/gui/dialogs/delete-error.c:71 +msgid "The event could not be deleted because permission was denied" +msgstr "Begivenheden kunne ikke fjernes da du ikke har rettigheder hertil" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52 -msgid "Save directory for alarm audio" -msgstr "Mappe hvor alarmlyd gemmes" +#: ../calendar/gui/dialogs/delete-error.c:74 +msgid "The task could not be deleted because permission was denied" +msgstr "Opgaven kunne ikke fjernes, fordi tilladelse blev nægtet" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53 -msgid "Show RSVP field in the event/task/meeting editor" -msgstr "Vis RSVP-feltet ved redigering af begivenhed/opgave/møde" +#: ../calendar/gui/dialogs/delete-error.c:77 +msgid "The memo could not be deleted because permission was denied" +msgstr "Huskeseddelen kunne ikke fjernes da du ikke har rettigheder hertil" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54 -msgid "Show Role field in the event/task/meeting editor" -msgstr "Vis rolle-feltet ved redigering af begivenhed/opgave/møde" +#: ../calendar/gui/dialogs/delete-error.c:80 +msgid "The item could not be deleted because permission was denied" +msgstr "Punktet kunne ikke fjernes da du ikke har rettigheder hertil" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55 -msgid "Show appointment end times in week and month views" -msgstr "Vis sluttiderne for aftaler i uge- og måneds-oversigterne" +#: ../calendar/gui/dialogs/delete-error.c:87 +msgid "The event could not be deleted due to an error" +msgstr "Begivenheden kunne ikke fjernes pga. en fejl" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56 -msgid "Show categories field in the event/meeting/task editor" -msgstr "Vis feltet kategorier ved redigering af begivenhed/møde/opgave" +#: ../calendar/gui/dialogs/delete-error.c:90 +msgid "The task could not be deleted due to an error" +msgstr "Opgaven kunne ikke fjernes pga. en fejl" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57 -msgid "Show display alarms in notification tray" -msgstr "Vis skærmpåmindelser i statusfeltet" +#: ../calendar/gui/dialogs/delete-error.c:93 +msgid "The memo could not be deleted due to an error" +msgstr "Huskeseddelen kunne ikke fjernes pga. en fejl" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58 -msgid "Show status field in the event/task/meeting editor" -msgstr "Vis status-feltet ved redigering af begivenhed/opgave/møde" +#: ../calendar/gui/dialogs/delete-error.c:96 +msgid "The item could not be deleted due to an error" +msgstr "Punktet kunne ikke fjernes pga. en fejl" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59 -#: ../mail/evolution-mail.schemas.in.h:126 -msgid "Show the \"Preview\" pane" -msgstr "Vis forhåndsvisningsruden" +#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1 +msgid "Contacts..." +msgstr "Kontaktpersoner..." -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60 -#: ../mail/evolution-mail.schemas.in.h:127 -msgid "Show the \"Preview\" pane." -msgstr "Vis forhåndsvisningsruden." +#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2 +#: ../plugins/exchange-operations/exchange-delegates.c:417 +msgid "Delegate To:" +msgstr "Uddelegér til:" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61 -msgid "Show timezone field in the event/meeting editor" -msgstr "Vis tidszone-feltet ved redigering af begivenhed/møde" +#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3 +msgid "Enter Delegate" +msgstr "Indtast delegat" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62 -msgid "Show type field in the event/task/meeting editor" -msgstr "Vis type-feltet ved redigering af begivenhed/opgave/møde" +#: ../calendar/gui/dialogs/event-editor.c:202 +msgid "_Alarms" +msgstr "_Påmindelser" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63 -msgid "Show week number in Day and Work Week View" -msgstr "Vis ugenumre i dags- og arbejdsugevisning" +#: ../calendar/gui/dialogs/event-editor.c:204 +msgid "Click here to set or unset alarms for this event" +msgstr "Klik her for at aktivere/deaktivere påmindelser for denne begivenhed" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64 -msgid "Show week numbers in date navigator" -msgstr "Vis ugenumre i datonavigeringen" +#: ../calendar/gui/dialogs/event-editor.c:209 +msgid "_Recurrence" +msgstr "_Tilbagevenden" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65 -msgid "" -"Shows the second time zone in a Day View, if set. Value is similar to one " -"used in a 'timezone' key." -msgstr "" -"Vis den sekundære tidszone i dagsvisningen, hvis den er indstillet. Værdier " -"er ligesom de, der bliver brugt i \"timezone\"-nøglen." +#: ../calendar/gui/dialogs/event-editor.c:211 +msgid "Make this a recurring event" +msgstr "Gør denne begivenhed tilbagevendende" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66 -msgid "Tasks due today color" -msgstr "Farve for dagens opgaver" +#: ../calendar/gui/dialogs/event-editor.c:216 +#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2 +#: ../plugins/groupwise-features/send-options.c:213 +#: ../widgets/misc/e-send-options.glade.h:18 +msgid "Send Options" +msgstr "Afsendelsesindstillinger" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67 -msgid "Tasks vertical pane position" -msgstr "Lodret placering for rude med opgaver" +#: ../calendar/gui/dialogs/event-editor.c:218 +#: ../calendar/gui/dialogs/task-editor.c:125 +msgid "Insert advanced send options" +msgstr "Indsæt avancerede afsendelsesindstillinger" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69 -#, no-c-format -msgid "" -"The URL template to use as a free/busy data fallback, %u is replaced by the " -"user part of the mail address and %d is replaced by the domain." -msgstr "" -"Adresseskabelonen der skal bruges som ledig/optaget-data, ved tilbagefald, %" -"u udskiftes med brugerdelen af e-postadressen, mens %d udskiftes med domænet." +#: ../calendar/gui/dialogs/event-editor.c:226 +msgid "All _Day Event" +msgstr "_Heldagsbegivenhed" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70 -msgid "" -"The default timezone to use for dates and times in the calendar, as an " -"untranslated Olsen timezone database location like \"America/New York\"." -msgstr "" -"Den forvalgte tidszone til brug for datoer og tid i kalenderen, som et " -"uoversat Olsen-tidszone-database-sted ligesom \"America/New York\"." +#: ../calendar/gui/dialogs/event-editor.c:228 +msgid "Toggles whether to have All Day Event" +msgstr "Slå visning af heldagsbegivenhed fra/til" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71 -msgid "The second timezone for a Day View" -msgstr "Den anden tidszone for dagsvisningen" +#: ../calendar/gui/dialogs/event-editor.c:234 +msgid "Show Time as _Busy" +msgstr "Vis tid som _optaget" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72 -msgid "" -"This can have three possible values. 0 for errors. 1 for warnings. 2 for " -"debug messages." -msgstr "" -"Denne kan have tre forskellige værdier. 0 for fejl. 1 for advarsler. 2 for " -"fejlsøgningsbeskeder." +#: ../calendar/gui/dialogs/event-editor.c:236 +msgid "Toggles whether to show time as busy" +msgstr "Slå visning af tid som optaget fra/til" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73 -msgid "Time divisions" -msgstr "Tidsinddelinger" +#: ../calendar/gui/dialogs/event-editor.c:245 +msgid "_Free/Busy" +msgstr "_Ledig/optaget" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74 -msgid "Time the last alarm ran, in time_t." -msgstr "Udførselstidspunkt for forrige påmindelse, i time_t." +#: ../calendar/gui/dialogs/event-editor.c:247 +msgid "Query free / busy information for the attendees" +msgstr "Forespørg om deltagere er ledige eller optagede" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75 -#: ../plugins/startup-wizard/startup-wizard.c:109 -msgid "Timezone" -msgstr "Tidszone" +#: ../calendar/gui/dialogs/event-editor.c:301 +msgid "Appoint_ment" +msgstr "_Aftale" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76 -msgid "" -"Transparency of the events in calendar views, a value between 0 " -"(transparent) and 1 (opaque)." -msgstr "" -"Gennemsigtighed ved begivenheder i kalenderoversigter. Værdien skal være " -"mellem 0 (gennemsigtig) og 1 (uigennemsigtig)." +#: ../calendar/gui/dialogs/event-page.c:749 +#: ../calendar/gui/dialogs/event-page.c:2743 +msgid "This event has alarms" +msgstr "Denne begivenhed har påmindelser" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77 -msgid "Twenty four hour time format" -msgstr "24-timers-format" +#: ../calendar/gui/dialogs/event-page.c:812 +#: ../calendar/gui/dialogs/event-page.glade.h:10 +#: ../calendar/gui/dialogs/memo-page.glade.h:2 +msgid "Or_ganizer:" +msgstr "Or_ganisator:" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78 -msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"." -msgstr "" -"Enheder for en forvalgt påmindelse, \"minutes\", \"hours\" eller \"days\"." +#: ../calendar/gui/dialogs/event-page.c:859 +msgid "_Delegatees" +msgstr "_Delegerede" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79 -msgid "" -"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"." -msgstr "" -"Enheder for at bestemme når opgaver skal skjules, \"minutes\", \"hours\" " -"eller \"days\"." +#: ../calendar/gui/dialogs/event-page.c:861 +msgid "Atte_ndees" +msgstr "D_eltagere" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81 -msgid "Week start" -msgstr "Ugestart" +#: ../calendar/gui/dialogs/event-page.c:1046 +msgid "Event with no start date" +msgstr "Begivenhed uden startdato" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82 -msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)." -msgstr "Ugedag hvorpå ugen starter, fra søndag (0) til lørdag (6)." +#: ../calendar/gui/dialogs/event-page.c:1049 +msgid "Event with no end date" +msgstr "Begivenhed uden slutdato" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83 -msgid "Whether or not to use the notification tray for display alarms." -msgstr "Om statusfeltet skal anvendes til visning af påmindelser." +#: ../calendar/gui/dialogs/event-page.c:1218 +#: ../calendar/gui/dialogs/memo-page.c:640 +#: ../calendar/gui/dialogs/task-page.c:814 +msgid "Start date is wrong" +msgstr "Startdatoen er forkert" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84 -msgid "Whether to ask for confirmation when deleting an appointment or task." -msgstr "" -"Om der spørges efter bekræftelse ved sletning af aftaler eller opgaver." +#: ../calendar/gui/dialogs/event-page.c:1228 +msgid "End date is wrong" +msgstr "Slutdatoen er forkert" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85 -msgid "Whether to ask for confirmation when expunging appointments and tasks." -msgstr "" -"Om der spørges efter bekræftelse ved sletning af aftaler eller opgaver." +#: ../calendar/gui/dialogs/event-page.c:1251 +msgid "Start time is wrong" +msgstr "Starttiden er forkert" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86 -msgid "" -"Whether to compress weekends in the month view, which puts Saturday and " -"Sunday in the space of one weekday." -msgstr "" -"Om weekender skal komprimeres i månedsoversigten, hvilket vil give lørdag og " -"søndag samme plads som en enkelt ugedag." +#: ../calendar/gui/dialogs/event-page.c:1258 +msgid "End time is wrong" +msgstr "Sluttiden er forkert" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87 -msgid "Whether to display the end time of events in the week and month views." -msgstr "" -"Om sluttiderne for begivenheder i uge- og måneds-oversigterne skal vises." +#: ../calendar/gui/dialogs/event-page.c:1421 +#: ../calendar/gui/dialogs/memo-page.c:681 +#: ../calendar/gui/dialogs/task-page.c:874 +msgid "The organizer selected no longer has an account." +msgstr "Den valgte organisator har ikke længere en konto." -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88 -msgid "" -"Whether to draw the Marcus Bains Line (line at current time) in the calendar." -msgstr "" -"Om Marcus Bains-linjen (linje ved aktuel tid) skal tegnes i kalenderen." +#: ../calendar/gui/dialogs/event-page.c:1427 +#: ../calendar/gui/dialogs/memo-page.c:687 +#: ../calendar/gui/dialogs/task-page.c:880 +msgid "An organizer is required." +msgstr "En organisator er påkrævet." -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89 -msgid "Whether to hide completed tasks in the tasks view." -msgstr "Om løste opgaver skjules i opgave-oversigten." +#: ../calendar/gui/dialogs/event-page.c:1452 +#: ../calendar/gui/dialogs/task-page.c:904 +msgid "At least one attendee is required." +msgstr "Mindst en deltager er nødvendig." -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90 -msgid "Whether to set a default reminder for appointments." -msgstr "Om begivenheder skal have en standardpåmindelse." +#: ../calendar/gui/dialogs/event-page.c:1892 +#: ../calendar/gui/dialogs/task-page.c:1202 +#: ../plugins/groupwise-features/junk-settings.glade.h:8 +#: ../plugins/groupwise-features/properties.glade.h:13 +#: ../widgets/table/e-table-config.glade.h:21 +msgid "_Remove" +msgstr "_Fjern" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91 -msgid "Whether to show RSVP field in the event/task/meeting editor" -msgstr "" -"Vælg om RSVP-feltet skal vises ved redigering af begivenhed/opgave/møde" +#: ../calendar/gui/dialogs/event-page.c:1893 +#: ../calendar/gui/dialogs/task-page.c:1203 +msgid "_Add " +msgstr "_Tilføj " -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92 -msgid "Whether to show categories field in the event/meeting editor" -msgstr "Vælg om kategori-feltet skal vises ved redigering af begivenhed/møde" +#: ../calendar/gui/dialogs/event-page.c:2619 +#, c-format +msgid "Unable to open the calendar '%s'." +msgstr "Kan ikke åbne kalenderen \"%s\"." -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93 -msgid "Whether to show role field in the event/task/meeting editor" -msgstr "" -"Vælg om rolle-feltet skal vises ved redigering af begivenhed/opgave/møde" +#: ../calendar/gui/dialogs/event-page.c:2663 +#: ../calendar/gui/dialogs/memo-page.c:896 +#: ../calendar/gui/dialogs/task-page.c:1810 +#, c-format +msgid "You are acting on behalf of %s" +msgstr "Du udfører en handlig på vegne af %s" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94 -msgid "Whether to show status field in the event/task/meeting editor" -msgstr "" -"Vælg om status-feltet skal vises ved redigering af begivenhed/opgave/møde" - -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95 -msgid "" -"Whether to show times in twenty four hour format instead of using am/pm." -msgstr "Om tider skal vises i 24-timers-format i stedet for at bruge am/pm." - -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96 -msgid "Whether to show timezone field in the event/meeting editor" -msgstr "Vælg om tidszone-feltet skal vises ved redigering af begivenhed/møde" - -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97 -msgid "Whether to show type field in the event/task/meeting editor" -msgstr "" -"Vælg om type-feltet skal vises ved redigering af begivenhed/opgave/møde" - -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98 -msgid "Whether to show week number in the Day and Work Week View." -msgstr "Om ugenumre skal vises i dags- og arbejdsugevisningen." +#: ../calendar/gui/dialogs/event-page.c:2942 +#, c-format +msgid "%d day before appointment" +msgid_plural "%d days before appointment" +msgstr[0] "%d dag før aftalen" +msgstr[1] "%d dage før aftalen" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99 -msgid "Whether to show week numbers in the date navigator." -msgstr "Om ugenumre skal vises i datonavigeringen." +#: ../calendar/gui/dialogs/event-page.c:2948 +#, c-format +msgid "%d hour before appointment" +msgid_plural "%d hours before appointment" +msgstr[0] "%d time før aftalen" +msgstr[1] "%d timer før aftalen" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100 -msgid "Whether to use daylight savings time while displaying events." -msgstr "Vælg om sommertid bruges når begivenhed vises." +#: ../calendar/gui/dialogs/event-page.c:2954 +#, c-format +msgid "%d minute before appointment" +msgid_plural "%d minutes before appointment" +msgstr[0] "%d minut før aftale" +msgstr[1] "%d minutter før aftale" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101 -msgid "Work days" -msgstr "Arbejdsdage" +#: ../calendar/gui/dialogs/event-page.c:2967 +msgid "Customize" +msgstr "Tilpas" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102 -msgid "Workday end hour" -msgstr "Time for arbejdsdagens afslutning" +#: ../calendar/gui/dialogs/event-page.glade.h:1 +msgid "" +"15 minutes before appointment\n" +"1 hour before appointment\n" +"1 day before appointment" +msgstr "" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103 -msgid "Workday end minute" -msgstr "Minut for arbejdsdagens afslutning" +#: ../calendar/gui/dialogs/event-page.glade.h:5 +msgid "Attendee_s..." +msgstr "D_eltagere..." -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104 -msgid "Workday start hour" -msgstr "Time for arbejdsdagens start" +#: ../calendar/gui/dialogs/event-page.glade.h:8 +msgid "Custom Alarm:" +msgstr "Brugertilpasset lyd ved påmindelser:" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105 -msgid "Workday start minute" -msgstr "Minut for arbejdsdagens start" +#: ../calendar/gui/dialogs/event-page.glade.h:9 +msgid "Event Description" +msgstr "Beskrivelse af begivenhed" -#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106 -msgid "daylight savings time" -msgstr "sommertid" +#: ../calendar/gui/dialogs/event-page.glade.h:11 +#: ../calendar/gui/dialogs/memo-page.glade.h:4 +#: ../calendar/gui/dialogs/task-page.glade.h:6 +msgid "Su_mmary:" +msgstr "Sa_mmendrag:" -#: ../calendar/gui/cal-search-bar.c:75 -msgid "Summary contains" -msgstr "Sammendrag indeholder" +#: ../calendar/gui/dialogs/event-page.glade.h:13 +msgid "_Alarm" +msgstr "_Påmindelser" -#: ../calendar/gui/cal-search-bar.c:76 -msgid "Description contains" -msgstr "Beskrivelse indeholder" +#: ../calendar/gui/dialogs/event-page.glade.h:15 +#: ../calendar/gui/dialogs/memo-page.glade.h:6 +#: ../calendar/gui/dialogs/task-page.glade.h:8 +#: ../widgets/misc/e-attachment-dialog.c:345 +msgid "_Description:" +msgstr "_Beskrivelse:" -#: ../calendar/gui/cal-search-bar.c:77 -msgid "Category is" -msgstr "Kategorien er" +#: ../calendar/gui/dialogs/event-page.glade.h:16 +#: ../plugins/calendar-weather/calendar-weather.c:372 +#: ../plugins/exchange-operations/exchange-calendar.c:247 +#: ../plugins/exchange-operations/exchange-contacts.c:240 +msgid "_Location:" +msgstr "_Sted:" -#: ../calendar/gui/cal-search-bar.c:78 -msgid "Comment contains" -msgstr "Kommentar indeholder" +#: ../calendar/gui/dialogs/event-page.glade.h:17 +msgid "_Time:" +msgstr "_Tid:" -#: ../calendar/gui/cal-search-bar.c:79 -msgid "Location contains" -msgstr "Sted indeholder" +#: ../calendar/gui/dialogs/event-page.glade.h:18 +#: ../calendar/gui/dialogs/memo-page.glade.h:8 +#: ../calendar/gui/dialogs/task-page.glade.h:10 +#: ../mail/mail-config.glade.h:193 ../mail/mail-dialogs.glade.h:21 +#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5 +#: ../smime/gui/smime-ui.glade.h:49 +msgid "" +"a\n" +"b" +msgstr "" -#: ../calendar/gui/cal-search-bar.c:640 -msgid "Next 7 Days' Tasks" -msgstr "Næste 7 dages opgaver" +#: ../calendar/gui/dialogs/event-page.glade.h:20 +#, fuzzy +msgid "" +"for\n" +"until" +msgstr "til" -#: ../calendar/gui/cal-search-bar.c:644 -msgid "Active Tasks" -msgstr "Aktive opgaver" +#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2492 +msgid "Memo" +msgstr "Huskeseddel" -#: ../calendar/gui/cal-search-bar.c:648 -msgid "Overdue Tasks" -msgstr "For sene opgaver" +#: ../calendar/gui/dialogs/memo-page.c:857 +#, c-format +msgid "Unable to open memos in '%s'." +msgstr "Kan ikke åbne huskesedler i \"%s\"." -#: ../calendar/gui/cal-search-bar.c:652 -msgid "Completed Tasks" -msgstr "Fuldførte opgaver" +#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567 +#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651 +#: ../mail/em-format-quote.c:210 ../mail/em-format.c:925 +#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20 +msgid "To" +msgstr "Til" -#: ../calendar/gui/cal-search-bar.c:656 -msgid "Tasks with Attachments" -msgstr "Opgaver med bilag" +#: ../calendar/gui/dialogs/memo-page.glade.h:3 +#: ../calendar/gui/dialogs/task-page.glade.h:5 +msgid "Sta_rt date:" +msgstr "Sta_rtdato:" -#: ../calendar/gui/cal-search-bar.c:702 -msgid "Active Appointments" -msgstr "Aktive aftaler" +#: ../calendar/gui/dialogs/memo-page.glade.h:5 +msgid "T_o:" +msgstr "T_il:" -#: ../calendar/gui/cal-search-bar.c:706 -msgid "Next 7 Days' Appointments" -msgstr "Næste 7 dages aftaler" +#: ../calendar/gui/dialogs/memo-page.glade.h:7 +#: ../calendar/gui/dialogs/task-page.c:365 +#: ../calendar/gui/dialogs/task-page.glade.h:9 +msgid "_Group:" +msgstr "_Gruppe:" -#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26 -#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75 -#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14 -msgid "Print" -msgstr "Udskriv" +#: ../calendar/gui/dialogs/recur-comp.c:53 +#, c-format +msgid "You are modifying a recurring event. What would you like to modify?" +msgstr "Du ændrer en tilbagevendende begivenhed. Hvad ønsker du at ændre?" -#: ../calendar/gui/calendar-commands.c:315 -msgid "" -"This operation will permanently erase all events older than the selected " -"amount of time. If you continue, you will not be able to recover these " -"events." +#: ../calendar/gui/dialogs/recur-comp.c:55 +#, c-format +msgid "You are delegating a recurring event. What would you like to delegate?" msgstr "" -"Denne handling vil permanent fjerne alle begivenheder der er ældre end den " -"valgte tid. Hvis du fortsætter vil du ikke længere kunne tilvejebringe disse " -"begivenheder." - -#: ../calendar/gui/calendar-commands.c:321 -msgid "Purge events older than" -msgstr "Fjern begivenheder der er ældre end" - -#: ../calendar/gui/calendar-commands.c:326 -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14 -#: ../plugins/caldav/caldav-source.c:432 -#: ../plugins/calendar-http/calendar-http.c:281 -#: ../plugins/calendar-weather/calendar-weather.c:526 -#: ../plugins/google-account-setup/google-source.c:654 -#: ../plugins/google-account-setup/google-contacts-source.c:368 -#: ../widgets/misc/e-send-options.glade.h:39 -msgid "days" -msgstr "dage" - -#. ensure the group name is in current locale, not read from configuration -#. Create the On the web source group -#. ensure the group name is in current locale, not read from configuration -#. Create the source group -#. Create the Webcal source group -#. Create the LDAP source group -#. ensure the group name is in current locale, not read from configuration -#: ../calendar/gui/calendar-component.c:287 -#: ../calendar/gui/calendar-component.c:290 -#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243 -#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604 -#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237 -#: ../calendar/gui/tasks-component.c:243 -msgid "On The Web" -msgstr "På webbet" - -#. ensure the source name is in current locale, not read from configuration -#: ../calendar/gui/calendar-component.c:331 -#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399 -msgid "Birthdays & Anniversaries" -msgstr "Fødselsdage og jubilæer" +"Du uddelegerer en tilbagevendende begivenhed. Hvad ønsker du at uddelegere?" -#. ensure the group name is in current locale, not read from configuration -#. Create the weather group -#: ../calendar/gui/calendar-component.c:346 -#: ../calendar/gui/calendar-component.c:349 -#: ../plugins/calendar-weather/calendar-weather.c:126 -msgid "Weather" -msgstr "Vejr" +#: ../calendar/gui/dialogs/recur-comp.c:59 +#, c-format +msgid "You are modifying a recurring task. What would you like to modify?" +msgstr "Du ændrer en tilbagevendende opgave. Hvad vil du ændre?" -#: ../calendar/gui/calendar-component.c:676 -msgid "_New Calendar" -msgstr "_Ny kalender" +#: ../calendar/gui/dialogs/recur-comp.c:63 +#, c-format +msgid "You are modifying a recurring memo. What would you like to modify?" +msgstr "Du ændrer en tilbagevendende huskeseddel. Hvad ønsker du at ændre?" -#: ../calendar/gui/calendar-component.c:677 -#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500 -#: ../mail/em-folder-tree.c:2124 -msgid "_Copy..." -msgstr "_Kopiér..." +#: ../calendar/gui/dialogs/recur-comp.c:88 +msgid "This Instance Only" +msgstr "Kun dette tilfælde" -#: ../calendar/gui/calendar-component.c:682 -#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505 -msgid "_Make available for offline use" -msgstr "_Gør tilgængelig i afkoblet tilstand" +#: ../calendar/gui/dialogs/recur-comp.c:92 +msgid "This and Prior Instances" +msgstr "Dette og tidligere tilfælde" -#: ../calendar/gui/calendar-component.c:683 -#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506 -msgid "_Do not make available for offline use" -msgstr "Gør _ikke tilgængelig i afkoblet tilstand" +#: ../calendar/gui/dialogs/recur-comp.c:98 +msgid "This and Future Instances" +msgstr "Dette og fremtidige tilfælde" -#: ../calendar/gui/calendar-component.c:1013 -msgid "Failed upgrading calendars." -msgstr "Opgradering af kalenderne mislykkedes." +#: ../calendar/gui/dialogs/recur-comp.c:103 +msgid "All Instances" +msgstr "Alle tilfælde" -#: ../calendar/gui/calendar-component.c:1142 -#, c-format -msgid "Unable to open the calendar '%s' for creating events and meetings" +#: ../calendar/gui/dialogs/recurrence-page.c:559 +msgid "This appointment contains recurrences that Evolution cannot edit." msgstr "" -"Kan ikke åbne kalenderen \"%s\" for oprettelse af begivenheder og møder" +"Denne aftale har tilbagevendende elementer som ikke kan redigeres af " +"Evolution." -#: ../calendar/gui/calendar-component.c:1158 -msgid "There is no calendar available for creating events and meetings" +#: ../calendar/gui/dialogs/recurrence-page.c:888 +msgid "Recurrence date is invalid" +msgstr "Dato for tilbagevendende aftale er ugyldig" + +#: ../calendar/gui/dialogs/recurrence-page.c:928 +msgid "End time of the recurrence was before event's start" msgstr "" -"Der er ingen kalender tilgængelig for oprettelse af begivenheder og møder" +"Sluttidspunkt for den tilbagevendende begivenhed var før begivenhedens start" -#: ../calendar/gui/calendar-component.c:1271 -msgid "Calendar Source Selector" -msgstr "Kalenderkilde-vælger" +#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]' +#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows. +#: ../calendar/gui/dialogs/recurrence-page.c:957 +msgid "on" +msgstr "på" -#: ../calendar/gui/calendar-component.c:1487 -msgid "New appointment" -msgstr "Ny aftale" +#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]' +#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or +#. * the name of a week day (like 'Monday' or 'Friday') always follow. +#. +#: ../calendar/gui/dialogs/recurrence-page.c:1014 +msgid "first" +msgstr "første" -#: ../calendar/gui/calendar-component.c:1489 -msgid "Create a new appointment" -msgstr "Opret en ny aftale" - -#: ../calendar/gui/calendar-component.c:1495 -msgid "New meeting" -msgstr "Nyt møde" +#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute") +#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]' +#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or +#. * the name of a week day (like 'Monday' or 'Friday') always follow. +#. +#: ../calendar/gui/dialogs/recurrence-page.c:1020 +msgid "second" +msgstr "anden" -#: ../calendar/gui/calendar-component.c:1497 -msgid "Create a new meeting request" -msgstr "Opret en ny mødeindkaldelse" +#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]' +#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or +#. * the name of a week day (like 'Monday' or 'Friday') always follow. +#. +#: ../calendar/gui/dialogs/recurrence-page.c:1025 +msgid "third" +msgstr "tredje" -#: ../calendar/gui/calendar-component.c:1503 -msgid "New all day appointment" -msgstr "Ny heldagsaftale" +#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]' +#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or +#. * the name of a week day (like 'Monday' or 'Friday') always follow. +#. +#: ../calendar/gui/dialogs/recurrence-page.c:1030 +msgid "fourth" +msgstr "fjerde" -#: ../calendar/gui/calendar-component.c:1505 -msgid "Create a new all-day appointment" -msgstr "Opret en ny helddagsaftale" +#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]' +#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or +#. * the name of a week day (like 'Monday' or 'Friday') always follow. +#. +#: ../calendar/gui/dialogs/recurrence-page.c:1035 +msgid "last" +msgstr "sidste" -#: ../calendar/gui/calendar-component.c:1511 -msgid "New calendar" -msgstr "Ny kalender" +#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]' +#. * (dropdown menu options are in [square brackets]). +#: ../calendar/gui/dialogs/recurrence-page.c:1059 +msgid "Other Date" +msgstr "Anden dato" -#: ../calendar/gui/calendar-component.c:1513 -msgid "Create a new calendar" -msgstr "Opret en ny kalender" +#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of +#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s) +#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]). +#. +#: ../calendar/gui/dialogs/recurrence-page.c:1065 +msgid "1st to 10th" +msgstr "1. til 10." -#: ../calendar/gui/calendar-view-factory.c:113 -msgid "Day View" -msgstr "Dagsoversigt" +#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of +#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s) +#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]). +#. +#: ../calendar/gui/dialogs/recurrence-page.c:1071 +msgid "11th to 20th" +msgstr "11. til 20." -#: ../calendar/gui/calendar-view-factory.c:116 -msgid "Work Week View" -msgstr "Arbejdsugeoversigt" +#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of +#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s) +#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]). +#. +#: ../calendar/gui/dialogs/recurrence-page.c:1077 +msgid "21st to 31st" +msgstr "21. til 31." -#: ../calendar/gui/calendar-view-factory.c:119 -msgid "Week View" -msgstr "Ugeoversigt" +#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]' +#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or +#. the name of a week day (like 'Monday' or 'Friday') always follow. +#: ../calendar/gui/dialogs/recurrence-page.c:1102 +msgid "day" +msgstr "dag" -#: ../calendar/gui/calendar-view-factory.c:122 -msgid "Month View" -msgstr "Månedsoversigt" +#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]' +#. * (dropdown menu options are in [square brackets])." +#. +#: ../calendar/gui/dialogs/recurrence-page.c:1231 +msgid "on the" +msgstr "den" -#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1 -#: ../calendar/gui/tasktypes.xml.h:3 -msgid "Any Field" -msgstr "Ethvert felt" +#: ../calendar/gui/dialogs/recurrence-page.c:1401 +msgid "occurrences" +msgstr "forekomster" -#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3 -#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5 -msgid "Attachments" -msgstr "Brevdele" +#: ../calendar/gui/dialogs/recurrence-page.c:2096 +msgid "Add exception" +msgstr "Tilføj undtagelse" -#: ../calendar/gui/caltypes.xml.h:4 -#: ../calendar/gui/e-meeting-time-sel.etspec.h:1 -#: ../calendar/gui/tasktypes.xml.h:6 -msgid "Attendee" -msgstr "Deltager" +#: ../calendar/gui/dialogs/recurrence-page.c:2137 +msgid "Could not get a selection to modify." +msgstr "Der er ikke markeret noget til redigering." -#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4 -#: ../calendar/gui/tasktypes.xml.h:8 -msgid "Category" -msgstr "Kategori" +#: ../calendar/gui/dialogs/recurrence-page.c:2143 +msgid "Modify exception" +msgstr "Undtagelse fra redigering" -#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5 -#: ../widgets/misc/e-send-options.glade.h:6 -msgid "Classification" -msgstr "Klassificering" +#: ../calendar/gui/dialogs/recurrence-page.c:2187 +msgid "Could not get a selection to delete." +msgstr "Der er ikke markeret noget til sletning." -#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249 -#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557 -#: ../calendar/gui/memotypes.xml.h:6 -#: ../plugins/email-custom-header/email-custom-header.c:341 -msgid "Confidential" -msgstr "Fortroligt" +#: ../calendar/gui/dialogs/recurrence-page.c:2311 +msgid "Date/Time" +msgstr "Dato/Tid" -#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7 -#: ../calendar/gui/tasktypes.xml.h:10 -#: ../plugins/plugin-manager/plugin-manager.c:59 -#: ../widgets/table/e-table-config.glade.h:6 -msgid "Description" -msgstr "Beskrivelse" +#: ../calendar/gui/dialogs/recurrence-page.glade.h:1 +msgid "Exceptions" +msgstr "Undtagelser" -#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8 -#: ../calendar/gui/tasktypes.xml.h:11 -msgid "Description Contains" -msgstr "Beskrivelse indeholder" +#: ../calendar/gui/dialogs/recurrence-page.glade.h:2 +#: ../mail/mail-config.glade.h:3 +msgid "Preview" +msgstr "Forhåndsvisning" -#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9 -#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22 -msgid "Do Not Exist" -msgstr "Eksisterer ikke" +#: ../calendar/gui/dialogs/recurrence-page.glade.h:3 +msgid "Recurrence" +msgstr "Tilbagevenden" -#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10 -#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25 -msgid "Exist" -msgstr "Eksisterer" +#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets]) +#: ../calendar/gui/dialogs/recurrence-page.glade.h:5 +msgid "Every" +msgstr "Hver" -#: ../calendar/gui/caltypes.xml.h:13 -#: ../calendar/gui/dialogs/meeting-page.glade.h:6 -#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19 -msgid "Organizer" -msgstr "Organisator" +#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets]) +#: ../calendar/gui/dialogs/recurrence-page.glade.h:7 +msgid "This appointment rec_urs" +msgstr "Denne aftale er til_bagevendende" -#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248 -#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556 -#: ../calendar/gui/memotypes.xml.h:12 -msgid "Private" -msgstr "Privat" +#. TRANSLATORS: Entire string is for example: +#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) +#: ../calendar/gui/dialogs/recurrence-page.glade.h:11 +msgid "" +"day(s)\n" +"week(s)\n" +"month(s)\n" +"year(s)" +msgstr "" -#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247 -#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348 -#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13 -msgid "Public" -msgstr "Offentlig" +#. TRANSLATORS: Entire string is for example: +#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets]) +#: ../calendar/gui/dialogs/recurrence-page.glade.h:17 +msgid "" +"for\n" +"until\n" +"forever" +msgstr "" -#: ../calendar/gui/caltypes.xml.h:16 -#: ../calendar/gui/dialogs/event-editor.c:304 -msgid "Recurrence" -msgstr "Tilbagevenden" +#: ../calendar/gui/dialogs/send-comp.c:116 +msgid "Send my alarms with this event" +msgstr "Send mine alarmer med denne begivenhed" -#: ../calendar/gui/caltypes.xml.h:17 -#: ../calendar/gui/e-cal-list-view.etspec.h:5 -#: ../calendar/gui/e-calendar-table.etspec.h:11 -#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14 -#: ../calendar/gui/tasktypes.xml.h:22 -#: ../plugins/save-calendar/csv-format.c:362 -msgid "Summary" -msgstr "Sammendrag" +#: ../calendar/gui/dialogs/task-details-page.c:377 +#: ../calendar/gui/dialogs/task-details-page.c:397 +msgid "Completed date is wrong" +msgstr "Fuldførelsesdato er forkert" -#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15 -#: ../calendar/gui/tasktypes.xml.h:23 -msgid "Summary Contains" -msgstr "Sammendrag indeholder" +#: ../calendar/gui/dialogs/task-details-page.c:482 +msgid "Web Page" +msgstr "Webside" -#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16 -#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10 -msgid "contains" -msgstr "indeholder" +#: ../calendar/gui/dialogs/task-details-page.glade.h:1 +msgid "Miscellaneous" +msgstr "Diverse" -#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17 -#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16 -msgid "does not contain" -msgstr "indeholder ikke" +#: ../calendar/gui/dialogs/task-details-page.glade.h:2 +msgid "Status" +msgstr "Status" -#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18 -#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30 -msgid "is" -msgstr "er" +#: ../calendar/gui/dialogs/task-details-page.glade.h:3 +msgid "" +"High\n" +"Normal\n" +"Low\n" +"Undefined" +msgstr "" -#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19 -#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36 -msgid "is not" -msgstr "er ikke" +#: ../calendar/gui/dialogs/task-details-page.glade.h:7 +msgid "" +"Not Started\n" +"In Progress\n" +"Completed\n" +"Canceled" +msgstr "" -#: ../calendar/gui/comp-editor-factory.c:409 -msgid "Error while opening the calendar" -msgstr "Fejl under åbning af kalender" +#: ../calendar/gui/dialogs/task-details-page.glade.h:11 +msgid "P_ercent complete:" +msgstr "F_uldført i procent:" -#: ../calendar/gui/comp-editor-factory.c:415 -msgid "Method not supported when opening the calendar" -msgstr "Metode ikke understøttet under åbning af kalenderen" +#: ../calendar/gui/dialogs/task-details-page.glade.h:12 +msgid "Stat_us:" +msgstr "_Status:" -#: ../calendar/gui/comp-editor-factory.c:421 -msgid "Permission denied to open the calendar" -msgstr "Du har ikke rettigheder til at åbne kalenderen" +#: ../calendar/gui/dialogs/task-details-page.glade.h:13 +msgid "_Date completed:" +msgstr "_Dato for fuldførelse:" -#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271 -msgid "Unknown error" -msgstr "Ukendt fejl" +#: ../calendar/gui/dialogs/task-details-page.glade.h:14 +#: ../widgets/misc/e-send-options.glade.h:34 +msgid "_Priority:" +msgstr "_Prioritet:" -#: ../calendar/gui/dialogs/alarm-dialog.c:601 -msgid "Edit Alarm" -msgstr "Redigér påmindelse" +#: ../calendar/gui/dialogs/task-details-page.glade.h:15 +msgid "_Web Page:" +msgstr "_Hjemmeside:" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1 -msgid "Alarm" -msgstr "Påmindelse" +#: ../calendar/gui/dialogs/task-editor.c:113 +msgid "_Status Details" +msgstr "Statusdet_aljer" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2 -msgid "Options" -msgstr "Valgmuligheder" +#: ../calendar/gui/dialogs/task-editor.c:115 +msgid "Click to change or view the status details of the task" +msgstr "Klik for at ændre eller vise statusdetaljer om opgaven" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3 -msgid "Repeat" -msgstr "Gentag" +#: ../calendar/gui/dialogs/task-editor.c:123 +#: ../composer/e-composer-actions.c:371 +msgid "_Send Options" +msgstr "_Afsendelsesindstillinger" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4 -msgid "Add Alarm" -msgstr "Tilføj påmindelse" +#: ../calendar/gui/dialogs/task-editor.c:317 +msgid "_Task" +msgstr "_Opgave" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5 -msgid "Custom _message" -msgstr "Tilpasset _brev" +#: ../calendar/gui/dialogs/task-editor.c:320 +msgid "Task Details" +msgstr "Opgavedetaljer" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6 -msgid "Custom alarm sound" -msgstr "Brugertilpasset lyd ved påmindelser" +#: ../calendar/gui/dialogs/task-page.c:373 +#: ../calendar/gui/dialogs/task-page.glade.h:4 +msgid "Organi_zer:" +msgstr "Organi_sator:" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7 -msgid "Mes_sage:" -msgstr "Be_sked:" +#: ../calendar/gui/dialogs/task-page.c:787 +msgid "Due date is wrong" +msgstr "Forfaldsdatoen er forkert" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8 -#: ../calendar/gui/e-alarm-list.c:444 -msgid "Play a sound" -msgstr "Afspil en lyd" +#: ../calendar/gui/dialogs/task-page.c:1767 +#, c-format +msgid "Unable to open tasks in '%s'." +msgstr "Kan ikke åbne opgaver i \"%s\"." -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9 -#: ../calendar/gui/e-alarm-list.c:448 -msgid "Pop up an alert" -msgstr "Vis en advarsel" +#: ../calendar/gui/dialogs/task-page.glade.h:1 +msgid "Atte_ndees..." +msgstr "D_eltagere..." -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10 -#: ../calendar/gui/e-alarm-list.c:456 -msgid "Run a program" -msgstr "Kør et program" +#: ../calendar/gui/dialogs/task-page.glade.h:2 +msgid "Categor_ies..." +msgstr "Ka_tegorier..." -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11 -msgid "Select A File" -msgstr "Vælg en fil" +#: ../calendar/gui/dialogs/task-page.glade.h:3 +msgid "D_ue date:" +msgstr "_Forfaldsdato:" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12 -msgid "Send To:" -msgstr "Send til:" +#: ../calendar/gui/dialogs/task-page.glade.h:7 +msgid "Time zone:" +msgstr "Tidszone:" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13 -#: ../calendar/gui/e-alarm-list.c:452 -msgid "Send an email" -msgstr "Send et brev" +#. Translator: Entire string is like "Pop up an alert %d days before start of appointment" +#: ../calendar/gui/e-alarm-list.c:394 +#, c-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dag" +msgstr[1] "%d dage" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14 -msgid "_Arguments:" -msgstr "_Argumenter:" +#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment" +#: ../calendar/gui/e-alarm-list.c:400 +#, c-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%d uge" +msgstr[1] "%d uger" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15 -msgid "_Program:" -msgstr "_Program:" +#: ../calendar/gui/e-alarm-list.c:462 +msgid "Unknown action to be performed" +msgstr "Ukendt handling som skal udføres" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16 -msgid "_Repeat the alarm" -msgstr "_Gentag påmindelsen" +#. Translator: The first %s refers to the base, which would be actions like +#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes" +#: ../calendar/gui/e-alarm-list.c:476 +#, c-format +msgid "%s %s before the start of the appointment" +msgstr "%s %s før aftalen starter" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17 -msgid "_Sound:" -msgstr "_Lyd:" +#. Translator: The first %s refers to the base, which would be actions like +#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes" +#: ../calendar/gui/e-alarm-list.c:481 +#, c-format +msgid "%s %s after the start of the appointment" +msgstr "%s %s efter aftalen er startet" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18 -msgid "after" -msgstr "efter" +#. Translator: The %s refers to the base, which would be actions like +#. * "Play a sound" +#: ../calendar/gui/e-alarm-list.c:488 +#, c-format +msgid "%s at the start of the appointment" +msgstr "%s ved aftalens start" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19 -msgid "before" -msgstr "før" +#. Translator: The first %s refers to the base, which would be actions like +#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes" +#: ../calendar/gui/e-alarm-list.c:499 +#, c-format +msgid "%s %s before the end of the appointment" +msgstr "%s %s før aftalen slutter" -#. TRANSLATORS: Entire string is for example: -#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets]) -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20 -#: ../calendar/gui/dialogs/recurrence-page.glade.h:13 -msgid "day(s)" -msgstr "dag(er)" +#. Translator: The first %s refers to the base, which would be actions like +#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes" +#: ../calendar/gui/e-alarm-list.c:504 +#, c-format +msgid "%s %s after the end of the appointment" +msgstr "%s %s efter aftalens slutning" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22 -msgid "end of appointment" -msgstr "slutning på aftale" +#. Translator: The %s refers to the base, which would be actions like +#. * "Play a sound" +#: ../calendar/gui/e-alarm-list.c:511 +#, c-format +msgid "%s at the end of the appointment" +msgstr "%s ved aftalens slutning" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23 -msgid "extra times every" -msgstr "ekstra gange hver" +#. Translator: The first %s refers to the base, which would be actions like +#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM" +#: ../calendar/gui/e-alarm-list.c:535 +#, c-format +msgid "%s at %s" +msgstr "%s ved %s" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24 -msgid "hour(s)" -msgstr "time(r)" +#. Translator: The %s refers to the base, which would be actions like +#. * "Play a sound". "Trigger types" are absolute or relative dates +#: ../calendar/gui/e-alarm-list.c:543 +#, c-format +msgid "%s for an unknown trigger type" +msgstr "%s for en ukendt udløsertype" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26 -msgid "minute(s)" -msgstr "minutt(er)" +#: ../calendar/gui/e-attachment-handler-calendar.c:258 +#, fuzzy +msgid "I_mport" +msgstr "Importér" -#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28 -msgid "start of appointment" -msgstr "start på aftale" +#: ../calendar/gui/e-attachment-handler-calendar.c:340 +#, fuzzy +msgid "Select a Calendar" +msgstr "Vælg kalender" -#: ../calendar/gui/dialogs/alarm-list-dialog.c:244 -msgid "Action/Trigger" -msgstr "Handling/udløser" +#: ../calendar/gui/e-attachment-handler-calendar.c:367 +#, fuzzy +msgid "Select a Task List" +msgstr "Vælg opgaveliste" -#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1 -msgid "A_dd" -msgstr "_Tilføj" +#: ../calendar/gui/e-attachment-handler-calendar.c:377 +#, fuzzy +msgid "I_mport to Calendar" +msgstr "Importér til kalender" -#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16 -#: ../calendar/gui/dialogs/event-page.glade.h:4 -msgid "Alarms" -msgstr "Påmindelser" +#: ../calendar/gui/e-attachment-handler-calendar.c:384 +#, fuzzy +msgid "I_mport to Tasks" +msgstr "_Importér til opgaver" -#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81 -#: ../composer/e-composer-actions.c:62 -msgid "_Suggest automatic display of attachment" -msgstr "F_oreslå automatisk visning af bilag" +#: ../calendar/gui/e-cal-component-memo-preview.c:69 +#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3250 +#, c-format +msgid "Click to open %s" +msgstr "Klik for at åbne %s" -#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142 -msgid "Attach file(s)" -msgstr "Vedhæft fil(er)" +#: ../calendar/gui/e-cal-component-memo-preview.c:129 +#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:859 +msgid "Untitled" +msgstr "Unavngiven" -#. an empty string is the same as 'None' -#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144 -#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 -#: ../calendar/gui/dialogs/event-page.c:2955 -#: ../calendar/gui/dialogs/meeting-page.glade.h:4 -#: ../calendar/gui/e-cal-model-tasks.c:673 -#: ../calendar/gui/e-day-view-time-item.c:788 -#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945 -#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408 -#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93 -#: ../plugins/calendar-weather/calendar-weather.c:333 -#: ../plugins/calendar-weather/calendar-weather.c:387 -#: ../plugins/email-custom-header/email-custom-header.c:395 -#: ../plugins/exchange-operations/exchange-delegates-user.c:195 -#: ../plugins/exchange-operations/exchange-delegates.glade.h:9 -#: ../plugins/itip-formatter/itip-formatter.c:2179 -#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511 -#: ../widgets/misc/e-dateedit.c:1725 -#: ../widgets/misc/e-signature-combo-box.c:74 -msgid "None" -msgstr "Ingen" +#: ../calendar/gui/e-cal-component-memo-preview.c:181 +#: ../calendar/gui/e-cal-component-preview.c:211 +#: ../calendar/gui/e-cal-component-preview.c:222 +msgid "Start Date:" +msgstr "Startdato:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621 -msgid "Selected Calendars for Alarms" -msgstr "Kalendere hvor påmindelser er aktiveret" +#: ../calendar/gui/e-cal-component-memo-preview.c:194 +#: ../calendar/gui/e-cal-component-preview.c:287 +#: ../calendar/gui/e-itip-control.c:1211 +#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75 +msgid "Description:" +msgstr "Beskrivelse:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1 -msgid "(Shown in a Day View)" -msgstr "(Vises i dagsvisning)" +#: ../calendar/gui/e-cal-component-memo-preview.c:218 +#: ../calendar/gui/e-cal-component-preview.c:311 +msgid "Web Page:" +msgstr "Hjemmeside:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2 -msgid "" -"60 minutes\n" -"30 minutes\n" -"15 minutes\n" -"10 minutes\n" -"05 minutes" -msgstr "" -"60 minutter\n" -"30 minutter\n" -"15 minutter\n" -"10 minutter\n" -"05 minutter" +#: ../calendar/gui/e-cal-component-preview.c:204 +#: ../calendar/gui/e-itip-control.c:1155 +#: ../calendar/gui/e-itip-control.glade.h:9 +msgid "Summary:" +msgstr "Sammendrag:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8 -#, no-c-format -msgid "" -"%u and %d will be replaced by user and domain from the email address." -msgstr "" -"%u og %d vil blive udskiftet med bruger og domæne fra e-postadressen." +#: ../calendar/gui/e-cal-component-preview.c:233 +msgid "Due Date:" +msgstr "Forfaldsdato:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9 -#: ../mail/mail-config.glade.h:10 -msgid "Alerts" -msgstr "Advarsler" +#. write status +#. Status +#: ../calendar/gui/e-cal-component-preview.c:240 +#: ../calendar/gui/e-itip-control.c:1179 +#: ../plugins/exchange-operations/exchange-account-setup.c:284 +#: ../plugins/itip-formatter/itip-view.c:1055 +msgid "Status:" +msgstr "Status:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10 -msgid "Default Free/Busy Server" -msgstr "Standardserver ved ledig/optaget" +#: ../calendar/gui/e-cal-component-preview.c:244 +#: ../calendar/gui/e-cal-model-tasks.c:360 +#: ../calendar/gui/e-cal-model-tasks.c:677 +#: ../calendar/gui/e-cal-model-tasks.c:754 +#: ../calendar/gui/e-calendar-table.c:233 +#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/print.c:2565 +msgid "In Progress" +msgstr "I gang" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11 -#: ../mail/mail-config.glade.h:17 -#: ../plugins/publish-calendar/publish-calendar.glade.h:1 -msgid "General" -msgstr "Generelt" +#. Pass TRUE as is_utc, so it gets converted to the current +#. timezone. +#: ../calendar/gui/e-cal-component-preview.c:247 +#: ../calendar/gui/e-cal-model-tasks.c:362 +#: ../calendar/gui/e-cal-model-tasks.c:679 +#: ../calendar/gui/e-calendar-table.c:235 +#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/e-itip-control.c:939 +#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203 +#: ../calendar/gui/print.c:2568 ../calendar/gui/tasktypes.xml.h:9 +#: ../plugins/save-calendar/csv-format.c:366 +msgid "Completed" +msgstr "Fuldført" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12 -msgid "Task List" -msgstr "Opgaveliste" +#: ../calendar/gui/e-cal-component-preview.c:254 +#: ../calendar/gui/e-cal-model-tasks.c:358 +#: ../calendar/gui/e-cal-model-tasks.c:675 +#: ../calendar/gui/e-calendar-table.c:231 +#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2562 +#: ../calendar/gui/tasktypes.xml.h:18 +msgid "Not Started" +msgstr "Ikke startet" -# klokkeslet? -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13 -msgid "Time" -msgstr "Tidspunkt" +#: ../calendar/gui/e-cal-component-preview.c:264 +msgid "Priority:" +msgstr "Prioritet:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14 -msgid "Work Week" -msgstr "Arbejdsuge" +#: ../calendar/gui/e-cal-component-preview.c:266 +#: ../calendar/gui/e-calendar-table.c:586 ../calendar/gui/tasktypes.xml.h:14 +#: ../mail/message-list.c:1065 +msgid "High" +msgstr "Høj" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15 -msgid "Adjust for daylight sa_ving time" -msgstr "Tilpas til _sommertid" +#: ../calendar/gui/e-cal-component-preview.c:268 +#: ../calendar/gui/e-cal-model.c:1058 ../calendar/gui/e-calendar-table.c:587 +#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064 +msgid "Normal" +msgstr "Normal" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 -msgid "Day _ends:" -msgstr "Dagen _slutter:" +#: ../calendar/gui/e-cal-component-preview.c:270 +#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:16 +#: ../mail/message-list.c:1063 +msgid "Low" +msgstr "Lav" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18 -msgid "Display" -msgstr "Vis" +#: ../calendar/gui/e-cal-list-view.etspec.h:2 +#: ../calendar/gui/e-calendar-table.etspec.h:7 +#: ../calendar/gui/e-memo-table.etspec.h:3 +#: ../plugins/save-calendar/csv-format.c:367 +msgid "Created" +msgstr "Oprettet" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20 -#: ../calendar/gui/dialogs/recurrence-page.c:1120 -#: ../calendar/gui/e-itip-control.c:733 -msgid "Friday" -msgstr "Fredag" +#: ../calendar/gui/e-cal-list-view.etspec.h:3 +msgid "End Date" +msgstr "Slutdato" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22 -msgid "" -"Minutes\n" -"Hours\n" -"Days" -msgstr "" -"Minutter\n" -"Timer\n" -"Dage" +#: ../calendar/gui/e-cal-list-view.etspec.h:4 +#: ../calendar/gui/e-calendar-table.etspec.h:9 +#: ../calendar/gui/e-memo-table.etspec.h:4 +#, fuzzy +msgid "Last modified" +msgstr "Ændret" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25 -#: ../calendar/gui/dialogs/recurrence-page.c:1116 -#: ../calendar/gui/e-itip-control.c:729 -msgid "Monday" -msgstr "Mandag" +#: ../calendar/gui/e-cal-list-view.etspec.h:6 +#: ../calendar/gui/e-memo-table.etspec.h:5 +msgid "Start Date" +msgstr "Startdato" + +#: ../calendar/gui/e-cal-model-calendar.c:187 +#: ../calendar/gui/e-calendar-table.c:638 +msgid "Free" +msgstr "Ledig" + +#: ../calendar/gui/e-cal-model-calendar.c:190 +#: ../calendar/gui/e-calendar-table.c:639 +#: ../calendar/gui/e-meeting-time-sel.c:397 +msgid "Busy" +msgstr "Optaget" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26 +#: ../calendar/gui/e-cal-model-tasks.c:627 msgid "" -"Monday\n" -"Tuesday\n" -"Wednesday\n" -"Thursday\n" -"Friday\n" -"Saturday\n" -"Sunday" +"The geographical position must be entered in the format: \n" +"\n" +"45.436845,125.862501" msgstr "" -"Mandag\n" -"Tirsdag\n" -"Onsdag\n" -"Torsdag\n" -"Fredag\n" -"Lørdag\n" -"Søndag" +"Den geografiske position skal angives i formatet: \n" +"\n" +"45.436845,125.862501" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34 -#: ../mail/mail-config.glade.h:114 -msgid "Pick a color" -msgstr "Vælg en farve" +#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064 +#: ../calendar/gui/e-meeting-list-view.c:191 +#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162 +#: ../calendar/gui/e-meeting-store.c:745 +#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5 +msgid "Yes" +msgstr "Ja" -#. Sunday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36 -msgid "S_un" -msgstr "_Søn" +#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064 +#: ../calendar/gui/e-meeting-list-view.c:192 +#: ../calendar/gui/e-meeting-store.c:164 +#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2 +msgid "No" +msgstr "Nej" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37 -#: ../calendar/gui/dialogs/recurrence-page.c:1121 -#: ../calendar/gui/e-itip-control.c:734 -msgid "Saturday" -msgstr "Lørdag" +#. This is the default filename used for temporary file creation +#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-itip-control.c:1196 +#: ../calendar/gui/e-itip-control.c:1336 +#: ../calendar/gui/e-meeting-list-view.c:167 +#: ../calendar/gui/e-meeting-list-view.c:181 +#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145 +#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:985 +#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1342 +#: ../plugins/itip-formatter/itip-formatter.c:448 +#: ../plugins/itip-formatter/itip-formatter.c:2217 +#: ../plugins/plugin-manager/plugin-manager.c:89 +#: ../widgets/misc/e-charset-picker.c:56 +msgid "Unknown" +msgstr "Ukendt" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38 -msgid "Se_cond zone:" -msgstr "An_den zone:" +#: ../calendar/gui/e-cal-model.c:1060 +msgid "Recurring" +msgstr "Tilbagevendende" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 -msgid "Select the calendars for alarm notification" -msgstr "Vælg kalendere hvor påmindelser ved alarm skal aktiveres" +#: ../calendar/gui/e-cal-model.c:1062 +msgid "Assigned" +msgstr "Tildelt" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40 -msgid "Sh_ow a reminder" -msgstr "_Vis en påmindelse" +#: ../calendar/gui/e-calendar-table.c:334 +msgid "* No Summary *" +msgstr "* Intet sammendrag *" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 -msgid "Show a _reminder" -msgstr "Vis en på_mindelse" +#. To Translators: It will display "Organiser: NameOfTheUser " +#: ../calendar/gui/e-calendar-table.c:370 +#: ../calendar/gui/e-calendar-view.c:2436 +#, c-format +msgid "Organizer: %s <%s>" +msgstr "Organisator: %s <%s>" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 -msgid "Show week _numbers in date navigator" -msgstr "Vis uge_numre i datonavigeringen" +#. With SunOne accounts, there may be no ':' in organiser.value +#. With SunOne accouts, there may be no ':' in organiser.value +#: ../calendar/gui/e-calendar-table.c:373 +#: ../calendar/gui/e-calendar-view.c:2440 +#, c-format +msgid "Organizer: %s" +msgstr "Organisator: %s" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 -msgid "Show week n_umber in Day and Work Week View" -msgstr "Vis ugen_umre i dags- og arbejdsugevisningen" +#: ../calendar/gui/e-calendar-table.c:404 +msgid "Start: " +msgstr "Start: " -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 -#: ../calendar/gui/dialogs/recurrence-page.c:1122 -#: ../calendar/gui/e-itip-control.c:728 -msgid "Sunday" -msgstr "Søndag" +#: ../calendar/gui/e-calendar-table.c:416 +msgid "Due: " +msgstr "Forfalder: " -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45 -msgid "T_asks due today:" -msgstr "_Dagens opgaver:" +#: ../calendar/gui/e-calendar-table.c:589 ../calendar/gui/tasktypes.xml.h:24 +msgid "Undefined" +msgstr "Udefineret" -#. Thursday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47 -msgid "T_hu" -msgstr "T_or" +#: ../calendar/gui/e-calendar-table.c:608 +msgid "0%" +msgstr "0%" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48 -msgid "Template:" -msgstr "Skabelon:" +#: ../calendar/gui/e-calendar-table.c:609 +msgid "10%" +msgstr "10%" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 -#: ../calendar/gui/dialogs/recurrence-page.c:1119 -#: ../calendar/gui/e-itip-control.c:732 -msgid "Thursday" -msgstr "Torsdag" +#: ../calendar/gui/e-calendar-table.c:610 +msgid "20%" +msgstr "20%" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50 -#: ../calendar/gui/dialogs/event-page.glade.h:12 -msgid "Time _zone:" -msgstr "Tids_zone:" +#: ../calendar/gui/e-calendar-table.c:611 +msgid "30%" +msgstr "30%" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51 -msgid "Time format:" -msgstr "Tidsformat:" +#: ../calendar/gui/e-calendar-table.c:612 +msgid "40%" +msgstr "40%" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52 -#: ../calendar/gui/dialogs/recurrence-page.c:1117 -#: ../calendar/gui/e-itip-control.c:730 -msgid "Tuesday" -msgstr "Tirsdag" +#: ../calendar/gui/e-calendar-table.c:613 +msgid "50%" +msgstr "50%" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53 -#: ../calendar/gui/dialogs/recurrence-page.c:1118 -#: ../calendar/gui/e-itip-control.c:731 -msgid "Wednesday" -msgstr "Onsdag" +#: ../calendar/gui/e-calendar-table.c:614 +msgid "60%" +msgstr "60%" -#. A weekday like "Monday" follows -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55 -msgid "Wee_k starts on:" -msgstr "_Ugen starter:" +#: ../calendar/gui/e-calendar-table.c:615 +msgid "70%" +msgstr "70%" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56 -msgid "Work days:" -msgstr "Arbejdsdage:" +#: ../calendar/gui/e-calendar-table.c:616 +msgid "80%" +msgstr "80%" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 -msgid "_12 hour (AM/PM)" -msgstr "_12 timer (AM/PM)" +#: ../calendar/gui/e-calendar-table.c:617 +msgid "90%" +msgstr "90%" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58 -msgid "_24 hour" -msgstr "_24 timer" +#: ../calendar/gui/e-calendar-table.c:618 +msgid "100%" +msgstr "100%" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59 -msgid "_Ask for confirmation when deleting items" -msgstr "Spørg efter bekræftelse ved sletning _af tilførsler" +#: ../calendar/gui/e-calendar-table.c:898 +#: ../calendar/gui/e-calendar-view.c:658 ../calendar/gui/e-memo-table.c:450 +msgid "Deleting selected objects" +msgstr "Sletter de valgte objekter" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60 -msgid "_Compress weekends in month view" -msgstr "_Komprimér weekender i månedsvisning" +#: ../calendar/gui/e-calendar-table.c:1177 +#: ../calendar/gui/e-calendar-view.c:872 ../calendar/gui/e-memo-table.c:655 +msgid "Updating objects" +msgstr "Opdaterer objekter" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61 -msgid "_Day begins:" -msgstr "_Dagen begynder:" - -#. Friday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63 -msgid "_Fri" -msgstr "_Fre" +#: ../calendar/gui/e-calendar-table.c:1365 +#: ../calendar/gui/e-calendar-view.c:1334 ../calendar/gui/e-memo-table.c:831 +#: ../composer/e-composer-actions.c:219 +msgid "Save as..." +msgstr "Gem som..." -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64 -msgid "_Hide completed tasks after" -msgstr "Sk_jul udførte opgaver efter" +#: ../calendar/gui/e-calendar-table.c:1589 +#: ../calendar/gui/e-calendar-view.c:1794 +msgid "New _Task" +msgstr "_Ny opgave" -#. Monday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66 -msgid "_Mon" -msgstr "_Man" +#: ../calendar/gui/e-calendar-table.c:1593 ../calendar/gui/e-memo-table.c:936 +msgid "Open _Web Page" +msgstr "Åbn _hjemmeside" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67 -msgid "_Overdue tasks:" -msgstr "_Opgaver der skulle have været udført:" +#: ../calendar/gui/e-calendar-table.c:1594 +#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:937 +#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:494 +msgid "_Save As..." +msgstr "Gem _som..." -#. Saturday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69 -msgid "_Sat" -msgstr "L_ør" +#: ../calendar/gui/e-calendar-table.c:1595 +#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:938 +msgid "P_rint..." +msgstr "Ud_skriv..." -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70 -msgid "_Show appointment end times in week and month view" -msgstr "_Vis sluttiderne for aftaler i uge- og måneds-oversigterne" +#: ../calendar/gui/e-calendar-table.c:1599 +#: ../calendar/gui/e-calendar-view.c:1817 ../calendar/gui/e-memo-table.c:942 +#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1 +#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1 +msgid "C_ut" +msgstr "Klip _ud" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71 -msgid "_Time divisions:" -msgstr "_Tidsinddelinger:" +#: ../calendar/gui/e-calendar-table.c:1601 +#: ../calendar/gui/e-calendar-view.c:1800 +#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944 +#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46 +#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28 +msgid "_Paste" +msgstr "_Indsæt" -#. Tuesday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73 -msgid "_Tue" -msgstr "T_irs" +#: ../calendar/gui/e-calendar-table.c:1605 ../ui/evolution-tasks.xml.h:22 +msgid "_Assign Task" +msgstr "_Tildel opgave" -#. Wednesday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75 -msgid "_Wed" -msgstr "_Ons" +#: ../calendar/gui/e-calendar-table.c:1606 ../calendar/gui/e-memo-table.c:948 +#: ../ui/evolution-tasks.xml.h:26 +msgid "_Forward as iCalendar" +msgstr "_Videresend som iCalendar" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76 -msgid "before every anniversary/birthday" -msgstr "før hver jubilæum/fødselsdag" +#: ../calendar/gui/e-calendar-table.c:1607 +msgid "_Mark as Complete" +msgstr "_Markér som fuldført" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77 -msgid "before every appointment" -msgstr "før hver aftale" +#: ../calendar/gui/e-calendar-table.c:1608 +msgid "_Mark Selected Tasks as Complete" +msgstr "_Markér valgte opgaver som fuldførte" -#: ../calendar/gui/dialogs/calendar-setup.c:271 -msgid "Cop_y calendar contents locally for offline operation" -msgstr "Kopiér _kalenderindhold lokalt til brug i afkoblet tilstand" +#: ../calendar/gui/e-calendar-table.c:1609 +msgid "_Mark as Incomplete" +msgstr "_Markér som ikke-fuldført" -#: ../calendar/gui/dialogs/calendar-setup.c:273 -msgid "Cop_y task list contents locally for offline operation" -msgstr "Kopiér _opgavelistens indhold lokalt til brug i afkoblet tilstand" +#: ../calendar/gui/e-calendar-table.c:1610 +msgid "_Mark Selected Tasks as Incomplete" +msgstr "_Markér valgte opgaver som ikke-fuldførte" -#: ../calendar/gui/dialogs/calendar-setup.c:275 -msgid "Cop_y memo list contents locally for offline operation" -msgstr "" -"Kopiér _huskeseddel-listens indhold lokalt til brug i afkoblet tilstand" +#: ../calendar/gui/e-calendar-table.c:1615 +msgid "_Delete Selected Tasks" +msgstr "Sle_t valgte opgaver" -#: ../calendar/gui/dialogs/calendar-setup.c:345 -msgid "Colo_r:" -msgstr "_Farve:" +#: ../calendar/gui/e-calendar-table.c:1852 +#: ../calendar/gui/e-calendar-table.etspec.h:4 +msgid "Click to add a task" +msgstr "Klik for at tilføje en opgave" -#: ../calendar/gui/dialogs/calendar-setup.c:380 -msgid "Task List" -msgstr "Opgaveliste" +#: ../calendar/gui/e-calendar-table.etspec.h:2 +#, no-c-format +msgid "% Complete" +msgstr "% fuldført" -#: ../calendar/gui/dialogs/calendar-setup.c:391 -msgid "Memo List" -msgstr "Liste over huskesedler" +#: ../calendar/gui/e-calendar-table.etspec.h:5 +msgid "Complete" +msgstr "Fuldført" -#: ../calendar/gui/dialogs/calendar-setup.c:476 -msgid "Calendar Properties" -msgstr "Kalenderegenskaber" +#: ../calendar/gui/e-calendar-table.etspec.h:6 +msgid "Completion date" +msgstr "Fuldførelsesdato" -#: ../calendar/gui/dialogs/calendar-setup.c:476 -msgid "New Calendar" -msgstr "Ny kalender" +#: ../calendar/gui/e-calendar-table.etspec.h:8 +msgid "Due date" +msgstr "Forfaldsdato" -#: ../calendar/gui/dialogs/calendar-setup.c:532 -msgid "Task List Properties" -msgstr "Opgavelisteegenskaber" +#: ../calendar/gui/e-calendar-table.etspec.h:10 +#: ../calendar/gui/tasktypes.xml.h:20 +#: ../plugins/save-calendar/csv-format.c:373 +msgid "Priority" +msgstr "Prioritet" -#: ../calendar/gui/dialogs/calendar-setup.c:532 -msgid "New Task List" -msgstr "Ny opgaveliste" +#: ../calendar/gui/e-calendar-table.etspec.h:11 +msgid "Start date" +msgstr "Startdato" -#: ../calendar/gui/dialogs/calendar-setup.c:588 -msgid "Memo List Properties" -msgstr "Opgavelisteegenskaber" +#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form: +#. Status: Accepted: X Declined: Y ... +#: ../calendar/gui/e-calendar-table.etspec.h:12 +#: ../calendar/gui/e-calendar-view.c:2344 +#: ../calendar/gui/e-meeting-list-view.c:604 +#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 +#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72 +#: ../mail/message-list.etspec.h:17 +msgid "Status" +msgstr "Status" -#: ../calendar/gui/dialogs/calendar-setup.c:588 -msgid "New Memo List" -msgstr "Ny liste over huskesedler" +#: ../calendar/gui/e-calendar-view.c:1480 +msgid "Moving items" +msgstr "Flytter elementer" -#: ../calendar/gui/dialogs/changed-comp.c:59 -msgid "This event has been deleted." -msgstr "Denne begivenhed er slettet." +#: ../calendar/gui/e-calendar-view.c:1482 +msgid "Copying items" +msgstr "Kopierer elementer" -#: ../calendar/gui/dialogs/changed-comp.c:63 -msgid "This task has been deleted." -msgstr "Denne opgave er slettet." +#: ../calendar/gui/e-calendar-view.c:1791 +msgid "New _Appointment..." +msgstr "Ny _aftale..." -#: ../calendar/gui/dialogs/changed-comp.c:67 -msgid "This memo has been deleted." -msgstr "Denne huskeseddel er blevet slettet." +#: ../calendar/gui/e-calendar-view.c:1792 +msgid "New All Day _Event" +msgstr "Ny aftale som varer h_ele dagen" -#: ../calendar/gui/dialogs/changed-comp.c:76 -#, c-format -msgid "%s You have made changes. Forget those changes and close the editor?" -msgstr "" -"%s Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen " -"lukkes?" +#: ../calendar/gui/e-calendar-view.c:1793 +msgid "New _Meeting" +msgstr "_Nyt møde" -#: ../calendar/gui/dialogs/changed-comp.c:78 -#, c-format -msgid "%s You have made no changes, close the editor?" -msgstr "%s Du har ikke lavet nogen ændringer. Afslut redigering?" +#. FIXME: hook in this somehow +#: ../calendar/gui/e-calendar-view.c:1804 +msgid "_Current View" +msgstr "_Aktuel oversigt" -#: ../calendar/gui/dialogs/changed-comp.c:83 -msgid "This event has been changed." -msgstr "Denne begivenhed er ændret." +#: ../calendar/gui/e-calendar-view.c:1806 +msgid "Select T_oday" +msgstr "Vælg _dagen i dag" -#: ../calendar/gui/dialogs/changed-comp.c:87 -msgid "This task has been changed." -msgstr "Denne opgave er ændret." +#: ../calendar/gui/e-calendar-view.c:1807 +msgid "_Select Date..." +msgstr "_Vælg dato..." -#: ../calendar/gui/dialogs/changed-comp.c:91 -msgid "This memo has been changed." -msgstr "Denne huskeseddel er blevet ændret." +#: ../calendar/gui/e-calendar-view.c:1813 +msgid "Pri_nt..." +msgstr "Ud_skriv..." -#: ../calendar/gui/dialogs/changed-comp.c:100 -#, c-format -msgid "%s You have made changes. Forget those changes and update the editor?" -msgstr "" -"%s Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen " -"opdateres?" +#: ../calendar/gui/e-calendar-view.c:1823 +msgid "Cop_y to Calendar..." +msgstr "_Kopiér til kalender..." -#: ../calendar/gui/dialogs/changed-comp.c:102 -#, c-format -msgid "%s You have made no changes, update the editor?" -msgstr "%s Du har ikke gjort ændringer. Opdater redigering?" +#: ../calendar/gui/e-calendar-view.c:1824 +msgid "Mo_ve to Calendar..." +msgstr "Fl_yt til kalender..." -#: ../calendar/gui/dialogs/comp-editor-page.c:448 -#, c-format -msgid "Validation error: %s" -msgstr "Valideringsfejl: %s" +#: ../calendar/gui/e-calendar-view.c:1825 +msgid "_Delegate Meeting..." +msgstr "Udde_legér møde..." -#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365 -msgid " to " -msgstr " til " +#: ../calendar/gui/e-calendar-view.c:1826 +msgid "_Schedule Meeting..." +msgstr "_Planlæg møde..." -#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369 -msgid " (Completed " -msgstr " (Fuldført " +#: ../calendar/gui/e-calendar-view.c:1827 +msgid "_Forward as iCalendar..." +msgstr "_Videresend som iCalendar..." -#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371 -msgid "Completed " -msgstr "Fuldført " +#: ../calendar/gui/e-calendar-view.c:1828 +msgid "_Reply" +msgstr "_Svar" -#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376 -msgid " (Due " -msgstr " (Forfalder " +#: ../calendar/gui/e-calendar-view.c:1829 +#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1331 +#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78 +msgid "Reply to _All" +msgstr "Svar til _alle" -#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378 -msgid "Due " -msgstr "Forfalder " +#: ../calendar/gui/e-calendar-view.c:1834 +msgid "Make this Occurrence _Movable" +msgstr "Gør denne hændelse _flytbar" -#: ../calendar/gui/dialogs/comp-editor.c:239 -#, c-format -msgid "Attached message - %s" -msgstr "Vedlagt brev - %s" +#: ../calendar/gui/e-calendar-view.c:1835 ../ui/evolution-calendar.xml.h:9 +msgid "Delete this _Occurrence" +msgstr "Slet denne _hændelse" -#. translators, this count will always be >1 -#: ../calendar/gui/dialogs/comp-editor.c:244 -#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1770 -#: ../composer/e-msg-composer.c:1989 -#, c-format -msgid "Attached message" -msgid_plural "%d attached messages" -msgstr[0] "Vedlagt brev" -msgstr[1] "%d vedlagte breve" +#: ../calendar/gui/e-calendar-view.c:1836 +msgid "Delete _All Occurrences" +msgstr "Slet _alle forekomster" -#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2057 -#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364 -#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106 -msgid "_Move" -msgstr "_Flyt" +#: ../calendar/gui/e-calendar-view.c:2291 +#: ../calendar/gui/e-itip-control.c:1184 +#: ../calendar/gui/e-meeting-list-view.c:203 +#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195 +#: ../plugins/itip-formatter/itip-formatter.c:2205 +msgid "Accepted" +msgstr "Accepteret" -#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2059 -#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108 -msgid "Cancel _Drag" -msgstr "Annullér _træk" +#: ../calendar/gui/e-calendar-view.c:2292 +#: ../calendar/gui/e-itip-control.c:1192 +#: ../calendar/gui/e-meeting-list-view.c:204 +#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197 +#: ../plugins/itip-formatter/itip-formatter.c:2211 +msgid "Declined" +msgstr "Afslået" -#: ../calendar/gui/dialogs/comp-editor.c:623 -#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:373 -#: ../plugins/prefer-plain/prefer-plain.c:91 -#: ../widgets/misc/e-attachment-bar.c:453 -msgid "attachment" -msgstr "bilag" +#: ../calendar/gui/e-calendar-view.c:2293 +#: ../calendar/gui/e-meeting-list-view.c:205 +#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199 +#: ../calendar/gui/e-meeting-time-sel.c:396 +msgid "Tentative" +msgstr "Forsøgsvis" -#: ../calendar/gui/dialogs/comp-editor.c:849 -msgid "Could not update object" -msgstr "Kunne ikke opdatere objekt" +#: ../calendar/gui/e-calendar-view.c:2294 +#: ../calendar/gui/e-meeting-list-view.c:206 +#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201 +#: ../plugins/itip-formatter/itip-formatter.c:2214 +msgid "Delegated" +msgstr "Uddelegeret" -#: ../calendar/gui/dialogs/comp-editor.c:938 -msgid "Edit Appointment" -msgstr "Redigér aftale" +#: ../calendar/gui/e-calendar-view.c:2295 +msgid "Needs action" +msgstr "Kræver handling" -#: ../calendar/gui/dialogs/comp-editor.c:945 +#. To Translators: It will display "Location: PlaceOfTheMeeting" +#: ../calendar/gui/e-calendar-view.c:2456 ../calendar/gui/print.c:2524 #, c-format -msgid "Meeting - %s" -msgstr "Møde - %s" +msgid "Location: %s" +msgstr "Sted: %s" -#: ../calendar/gui/dialogs/comp-editor.c:947 +#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)" +#: ../calendar/gui/e-calendar-view.c:2487 #, c-format -msgid "Appointment - %s" -msgstr "Aftale - %s" +msgid "Time: %s %s" +msgstr "Tid: %s %s" -#: ../calendar/gui/dialogs/comp-editor.c:953 -#, c-format -msgid "Assigned Task - %s" -msgstr "Tildelt opgave - %s" +#. strftime format of a weekday, a date and a time, 24-hour. +#: ../calendar/gui/e-cell-date-edit-text.c:109 +msgid "%a %m/%d/%Y %H:%M:%S" +msgstr "%a %Y-%m-%d %H:%M:%S" + +#. strftime format of a weekday, a date and a time, 12-hour. +#: ../calendar/gui/e-cell-date-edit-text.c:112 +msgid "%a %m/%d/%Y %I:%M:%S %p" +msgstr "%a %d/%m-%Y %H:%M:%S" -#: ../calendar/gui/dialogs/comp-editor.c:955 +#: ../calendar/gui/e-cell-date-edit-text.c:120 #, c-format -msgid "Task - %s" -msgstr "Opgave - %s" +msgid "" +"The date must be entered in the format: \n" +"%s" +msgstr "" +"Datoen skal angives i formatet: \n" +"%s" -#: ../calendar/gui/dialogs/comp-editor.c:960 +#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry +#. * to change the length of the time division in the calendar day view, e.g. +#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions" +#. +#: ../calendar/gui/e-day-view-time-item.c:751 #, c-format -msgid "Memo - %s" -msgstr "Huskeseddel - %s" +msgid "%02i minute divisions" +msgstr "%02i minutters inddeling" -#: ../calendar/gui/dialogs/comp-editor.c:976 -msgid "No Summary" -msgstr "Intet sammendrag" +#: ../calendar/gui/e-day-view-time-item.c:772 +msgid "Show the second time zone" +msgstr "Vis den sekundære tidszone" -#: ../calendar/gui/dialogs/comp-editor.c:1117 -msgid "Keep original item?" -msgstr "Behold oprindelige element?" +#. strftime format %A = full weekday name, %d = day of month, +#. %B = full month name. Don't use any other specifiers. +#. strftime format %A = full weekday name, %d = day of +#. month, %B = full month name. You can change the +#. order but don't change the specifiers or add +#. anything. +#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1581 +#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1681 +msgid "%A %d %B" +msgstr "%A %d %B" -#: ../calendar/gui/dialogs/comp-editor.c:1312 -msgid "Click here to close the current window" -msgstr "Klik her for at lukke det aktive vindue" +#. String to use in 12-hour time format for times in the morning. +#: ../calendar/gui/e-day-view.c:804 ../calendar/gui/e-week-view.c:542 +#: ../calendar/gui/print.c:829 +msgid "am" +msgstr "am" -#: ../calendar/gui/dialogs/comp-editor.c:1319 -msgid "Copy selected text to the clipboard" -msgstr "Kopiér markerede meddelelser til klippebord" +#. String to use in 12-hour time format for times in the afternoon. +#: ../calendar/gui/e-day-view.c:807 ../calendar/gui/e-week-view.c:545 +#: ../calendar/gui/print.c:831 +msgid "pm" +msgstr "pm" -#: ../calendar/gui/dialogs/comp-editor.c:1326 -msgid "Cut selected text to the clipboard" -msgstr "Klip markerede meddelelser ud til klippebord" +#. To Translators: the %d stands for a week number, it's value between 1 and 52/53 +#: ../calendar/gui/e-day-view.c:2320 +#, c-format +msgid "Week %d" +msgstr "Uge %d" -#: ../calendar/gui/dialogs/comp-editor.c:1333 -msgid "Click here to view help available" -msgstr "Klik her for at læse den tilgængelige hjælpedokumentation" +#: ../calendar/gui/e-itip-control.c:758 +msgid "Yes. (Complex Recurrence)" +msgstr "Ja. (Kompleks tilbagevenden)" -#: ../calendar/gui/dialogs/comp-editor.c:1340 -msgid "Paste text from the clipboard" -msgstr "Kopiér tekst fra klippebord" +#: ../calendar/gui/e-itip-control.c:775 +#, c-format +msgid "Every day" +msgid_plural "Every %d days" +msgstr[0] "Hver dag" +msgstr[1] "Hver %d dage" -#: ../calendar/gui/dialogs/comp-editor.c:1361 -msgid "Click here to save the current window" -msgstr "Klik her for at gemme det aktive vindue" +#: ../calendar/gui/e-itip-control.c:788 +#, c-format +msgid "Every week" +msgid_plural "Every %d weeks" +msgstr[0] "Hver uge" +msgstr[1] "Hver %d uger" -#: ../calendar/gui/dialogs/comp-editor.c:1368 -msgid "Select all text" -msgstr "Vælg hele teksten" +#: ../calendar/gui/e-itip-control.c:795 +#, c-format +msgid "Every week on " +msgid_plural "Every %d weeks on " +msgstr[0] "Hver uge på " +msgstr[1] "Hver %d uger på " -#: ../calendar/gui/dialogs/comp-editor.c:1375 -msgid "_Classification" -msgstr "K_lassificering" +#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)' +#: ../calendar/gui/e-itip-control.c:806 +msgid " and " +msgstr " og " -#: ../calendar/gui/dialogs/comp-editor.c:1389 -#: ../mail/mail-signature-editor.c:208 -#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43 -msgid "_File" -msgstr "_Fil" +#: ../calendar/gui/e-itip-control.c:815 +#, c-format +msgid "The %s day of " +msgstr "Den %s. dag af " -#: ../calendar/gui/dialogs/comp-editor.c:1396 -#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24 -#: ../ui/evolution.xml.h:46 -msgid "_Help" -msgstr "_Hjælp" +#: ../calendar/gui/e-itip-control.c:831 +#, c-format +msgid "The %s %s of " +msgstr "Den %s %s af " -#: ../calendar/gui/dialogs/comp-editor.c:1403 -msgid "_Insert" -msgstr "_Indsæt" +#: ../calendar/gui/e-itip-control.c:842 +#, c-format +msgid "every month" +msgid_plural "every %d months" +msgstr[0] "hver måned" +msgstr[1] "hver %d måneder" -#: ../calendar/gui/dialogs/comp-editor.c:1410 -msgid "_Options" -msgstr "_Indstillinger" +#: ../calendar/gui/e-itip-control.c:854 +#, c-format +msgid "Every year" +msgid_plural "Every %d years" +msgstr[0] "Hvert år" +msgstr[1] "Hver %d år" -#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116 -#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34 -#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30 -#: ../ui/evolution.xml.h:55 -msgid "_View" -msgstr "_Vis" +#: ../calendar/gui/e-itip-control.c:867 +#, c-format +msgid "a total of %d time" +msgid_plural "a total of %d times" +msgstr[0] "i alt %d gang" +msgstr[1] " i alt %d gange" -#: ../calendar/gui/dialogs/comp-editor.c:1427 -#: ../composer/e-composer-actions.c:469 -msgid "_Attachment..." -msgstr "_Bilag..." +#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).' +#: ../calendar/gui/e-itip-control.c:878 +msgid ", ending on " +msgstr ", sluttende på " -#: ../calendar/gui/dialogs/comp-editor.c:1429 -msgid "Click here to attach a file" -msgstr "Klik her for at vedlægge en fil" +#. For Translators : 'starts' is starts:date implying a task starts on what date +#: ../calendar/gui/e-itip-control.c:900 +msgid "Starts" +msgstr "Starter" -#: ../calendar/gui/dialogs/comp-editor.c:1437 -msgid "_Categories" -msgstr "_Kategorier" +#. For Translators : 'ends' is ends:date implying a task ends on what date +#: ../calendar/gui/e-itip-control.c:914 +msgid "Ends" +msgstr "Ender" -#: ../calendar/gui/dialogs/comp-editor.c:1439 -msgid "Toggles whether to display categories" -msgstr "Slå visning af kategorier fra/til" +#: ../calendar/gui/e-itip-control.c:954 +#: ../plugins/save-calendar/csv-format.c:371 +msgid "Due" +msgstr "Forfalder" -#: ../calendar/gui/dialogs/comp-editor.c:1445 -msgid "Time _Zone" -msgstr "Tids_zone" +#: ../calendar/gui/e-itip-control.c:996 ../calendar/gui/e-itip-control.c:1053 +msgid "iCalendar Information" +msgstr "iCalendar-information" -#: ../calendar/gui/dialogs/comp-editor.c:1447 -msgid "Toggles whether the time zone is displayed" -msgstr "Slå visning af Tidszone-feltet fra/til" +#. Title +#: ../calendar/gui/e-itip-control.c:1013 +msgid "iCalendar Error" +msgstr "iCalendar-fejl" -#: ../calendar/gui/dialogs/comp-editor.c:1456 -msgid "Pu_blic" -msgstr "Of_fentlig" +#: ../calendar/gui/e-itip-control.c:1085 ../calendar/gui/e-itip-control.c:1101 +#: ../calendar/gui/e-itip-control.c:1112 ../calendar/gui/e-itip-control.c:1129 +#: ../plugins/itip-formatter/itip-view.c:346 +#: ../plugins/itip-formatter/itip-view.c:347 +#: ../plugins/itip-formatter/itip-view.c:434 +#: ../plugins/itip-formatter/itip-view.c:435 +#: ../plugins/itip-formatter/itip-view.c:522 +#: ../plugins/itip-formatter/itip-view.c:523 +msgid "An unknown person" +msgstr "En ukendt person" -#: ../calendar/gui/dialogs/comp-editor.c:1458 -msgid "Classify as public" -msgstr "Klassificér som offentlig" +#. Describe what the user can do +#: ../calendar/gui/e-itip-control.c:1136 +msgid "" +"
Please review the following information, and then select an action from " +"the menu below." +msgstr "" +"
Kontrollér venligst følgende information og vælg så en handling fra " +"menuen nedenfor." -#: ../calendar/gui/dialogs/comp-editor.c:1463 -msgid "_Private" -msgstr "_Privat" +#: ../calendar/gui/e-itip-control.c:1188 +#: ../plugins/itip-formatter/itip-formatter.c:2208 +msgid "Tentatively Accepted" +msgstr "Forsøgsvist godtaget" -#: ../calendar/gui/dialogs/comp-editor.c:1465 -msgid "Classify as private" -msgstr "Klassificér som privat" +#: ../calendar/gui/e-itip-control.c:1276 +msgid "" +"The meeting has been canceled, however it could not be found in your " +"calendars" +msgstr "Mødet er blevet aflyst, men det blev ikke fundet i dine kalendere" -#: ../calendar/gui/dialogs/comp-editor.c:1470 -msgid "_Confidential" -msgstr "_Fortroligt" +#: ../calendar/gui/e-itip-control.c:1278 +msgid "" +"The task has been canceled, however it could not be found in your task lists" +msgstr "Opgaven er blevet aflyst, men den blev ikke fundet i dine opgavelister" -#: ../calendar/gui/dialogs/comp-editor.c:1472 -msgid "Classify as confidential" -msgstr "Klassificér som fortroligt" +#: ../calendar/gui/e-itip-control.c:1356 +#, c-format +msgid "%s has published meeting information." +msgstr "%s har offentliggjort mødeoplysning." -#: ../calendar/gui/dialogs/comp-editor.c:1480 -msgid "R_ole Field" -msgstr "_Rolle-felt" +#: ../calendar/gui/e-itip-control.c:1357 +msgid "Meeting Information" +msgstr "Mødeinformation" -#: ../calendar/gui/dialogs/comp-editor.c:1482 -msgid "Toggles whether the Role field is displayed" -msgstr "Slå visning af Rolle-feltet fra/til" +#: ../calendar/gui/e-itip-control.c:1363 +#, c-format +msgid "%s requests the presence of %s at a meeting." +msgstr "%s ønsker at %s er til stede ved et møde." -#: ../calendar/gui/dialogs/comp-editor.c:1488 -msgid "_RSVP" -msgstr "_RSVP" +#: ../calendar/gui/e-itip-control.c:1365 +#, c-format +msgid "%s requests your presence at a meeting." +msgstr "%s beder om din tilstedeværelse i et møde." -#: ../calendar/gui/dialogs/comp-editor.c:1490 -msgid "Toggles whether the RSVP field is displayed" -msgstr "Slå visning af RSVP-feltet fra/til" +#: ../calendar/gui/e-itip-control.c:1366 +msgid "Meeting Proposal" +msgstr "Mødeforslag" -#: ../calendar/gui/dialogs/comp-editor.c:1496 -msgid "_Status Field" -msgstr "_Status-felt" +#. FIXME Whats going on here? +#: ../calendar/gui/e-itip-control.c:1372 +#, c-format +msgid "%s wishes to be added to an existing meeting." +msgstr "%s ønsker at blive tilføjet til et eksisterende møde." -#: ../calendar/gui/dialogs/comp-editor.c:1498 -msgid "Toggles whether the Status field is displayed" -msgstr "Slå visning af Status-feltet fra/til" +#: ../calendar/gui/e-itip-control.c:1373 +msgid "Meeting Update" +msgstr "Mødeopdatering" -#: ../calendar/gui/dialogs/comp-editor.c:1504 -msgid "_Type Field" -msgstr "_Type-felt" +#: ../calendar/gui/e-itip-control.c:1377 +#, c-format +msgid "%s wishes to receive the latest meeting information." +msgstr "%s ønsker at modtage seneste mødeinformation." -#: ../calendar/gui/dialogs/comp-editor.c:1506 -msgid "Toggles whether the Attendee Type is displayed" -msgstr "Slå visning af deltagertype fra/til" +#: ../calendar/gui/e-itip-control.c:1378 +msgid "Meeting Update Request" +msgstr "Anmodning om mødeopdatering" -#: ../calendar/gui/dialogs/comp-editor.c:1828 -#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376 -msgid "Recent _Documents" -msgstr "Seneste _dokumenter" +#: ../calendar/gui/e-itip-control.c:1385 +#, c-format +msgid "%s has replied to a meeting request." +msgstr "%s har svaret på en mødeforespørgsel." -#: ../calendar/gui/dialogs/comp-editor.c:1847 -#: ../composer/e-composer-actions.c:696 -msgid "Attach" -msgstr "Vedlæg" +#: ../calendar/gui/e-itip-control.c:1386 +msgid "Meeting Reply" +msgstr "Mødesvar" -#: ../calendar/gui/dialogs/comp-editor.c:1942 +#: ../calendar/gui/e-itip-control.c:1393 #, c-format -msgid "%d Attachment" -msgid_plural "%d Attachments" -msgstr[0] "%d Bilag" -msgstr[1] "%d Bilag" - -#: ../calendar/gui/dialogs/comp-editor.c:1974 -msgid "Hide Attachment _Bar" -msgstr "_Skjul bilagslinje" +msgid "%s has canceled a meeting." +msgstr "%s har aflyst et møde." -#: ../calendar/gui/dialogs/comp-editor.c:1977 -#: ../calendar/gui/dialogs/comp-editor.c:2280 -msgid "Show Attachment _Bar" -msgstr "_Vis bilagslinje" +#: ../calendar/gui/e-itip-control.c:1394 +msgid "Meeting Cancelation" +msgstr "Mødeaflysing" -#: ../calendar/gui/dialogs/comp-editor.c:2091 -#: ../calendar/gui/dialogs/event-page.c:1877 -#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039 -#: ../plugins/groupwise-features/junk-settings.glade.h:8 -#: ../plugins/groupwise-features/properties.glade.h:13 -#: ../widgets/table/e-table-config.glade.h:21 -msgid "_Remove" -msgstr "_Fjern" +#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481 +#: ../calendar/gui/e-itip-control.c:1521 +#, c-format +msgid "%s has sent an unintelligible message." +msgstr "%s har sendt en uforståelig besked." -#: ../calendar/gui/dialogs/comp-editor.c:2094 -#: ../composer/e-msg-composer.c:1042 -#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4 -msgid "_Add attachment..." -msgstr "_Tilføj bilag..." +#: ../calendar/gui/e-itip-control.c:1405 +msgid "Bad Meeting Message" +msgstr "Ugyldig mødebesked" -#: ../calendar/gui/dialogs/comp-editor.c:2302 -#: ../mail/em-format-html-display.c:2384 -msgid "Show Attachments" -msgstr "Vis bilag" +#: ../calendar/gui/e-itip-control.c:1432 +#, c-format +msgid "%s has published task information." +msgstr "%s har offentliggjort information om en opgave." -#: ../calendar/gui/dialogs/comp-editor.c:2303 -msgid "Press space key to toggle attachment bar" -msgstr "Tast mellemrum for at vise/skjule bilagslinjen" +#: ../calendar/gui/e-itip-control.c:1433 +msgid "Task Information" +msgstr "Opgaveinformation" -#: ../calendar/gui/dialogs/comp-editor.c:2448 -#: ../calendar/gui/dialogs/comp-editor.c:2496 -#: ../calendar/gui/dialogs/comp-editor.c:3348 -msgid "Changes made to this item may be discarded if an update arrives" -msgstr "" -"Ændringer af dette element bliver muligvis ignoreret hvis en opdatering " -"ankommer" +#: ../calendar/gui/e-itip-control.c:1440 +#, c-format +msgid "%s requests %s to perform a task." +msgstr "%s ønsker at %s udfører en opgave." -#: ../calendar/gui/dialogs/comp-editor.c:3377 -msgid "Unable to use current version!" -msgstr "Kan ikke bruge nuværende version!" +#: ../calendar/gui/e-itip-control.c:1442 +#, c-format +msgid "%s requests you perform a task." +msgstr "%s anmoder om at du udfører en opgave." -#: ../calendar/gui/dialogs/copy-source-dialog.c:64 -msgid "Could not open source" -msgstr "Kunne ikke åbne kilde" +#: ../calendar/gui/e-itip-control.c:1443 +msgid "Task Proposal" +msgstr "Forslag om opgave" -#: ../calendar/gui/dialogs/copy-source-dialog.c:72 -msgid "Could not open destination" -msgstr "Kunne ikke åbne mål" +#. FIXME Whats going on here? +#: ../calendar/gui/e-itip-control.c:1449 +#, c-format +msgid "%s wishes to be added to an existing task." +msgstr "%s ønsker at blive tilføjet til en eksisterende opgave." -#: ../calendar/gui/dialogs/copy-source-dialog.c:81 -msgid "Destination is read only" -msgstr "Mål er skrivebeskyttet" +#: ../calendar/gui/e-itip-control.c:1450 +msgid "Task Update" +msgstr "Opgaveopdatering" -#: ../calendar/gui/dialogs/delete-comp.c:205 -msgid "_Delete this item from all other recipient's mailboxes?" -msgstr "_Slet dette element fra alle øvrige modtageres brevbakker?" +#: ../calendar/gui/e-itip-control.c:1454 +#, c-format +msgid "%s wishes to receive the latest task information." +msgstr "%s ønsker at modtage den seneste information om opgaven." -#: ../calendar/gui/dialogs/delete-error.c:55 -msgid "The event could not be deleted due to a corba error" -msgstr "Begivenheder kunne ikke fjernes pga. en CORBA-fejl" +#: ../calendar/gui/e-itip-control.c:1455 +msgid "Task Update Request" +msgstr "Anmodning om opgaveopdatering" -#: ../calendar/gui/dialogs/delete-error.c:58 -msgid "The task could not be deleted due to a corba error" -msgstr "Opgaven kunne ikke fjernes pga. en CORBA-fejl" +#: ../calendar/gui/e-itip-control.c:1462 +#, c-format +msgid "%s has replied to a task assignment." +msgstr "%s har svaret på en opgavetildeling." -#: ../calendar/gui/dialogs/delete-error.c:61 -msgid "The memo could not be deleted due to a corba error" -msgstr "Huskeseddelen kunne ikke fjernes pga. en CORBA-fejl" +#: ../calendar/gui/e-itip-control.c:1463 +msgid "Task Reply" +msgstr "Svar på opgave" -#: ../calendar/gui/dialogs/delete-error.c:64 -msgid "The item could not be deleted due to a corba error" -msgstr "Punktet kunne ikke fjernes pga. en CORBA-fejl" +#: ../calendar/gui/e-itip-control.c:1470 +#, c-format +msgid "%s has canceled a task." +msgstr "%s har aflyst en opgave." -#: ../calendar/gui/dialogs/delete-error.c:71 -msgid "The event could not be deleted because permission was denied" -msgstr "Begivenheden kunne ikke fjernes da du ikke har rettigheder hertil" +#: ../calendar/gui/e-itip-control.c:1471 +msgid "Task Cancelation" +msgstr "Aflysning af opgave" -#: ../calendar/gui/dialogs/delete-error.c:74 -msgid "The task could not be deleted because permission was denied" -msgstr "Opgaven kunne ikke fjernes, fordi tilladelse blev nægtet" +#: ../calendar/gui/e-itip-control.c:1482 +msgid "Bad Task Message" +msgstr "Ugyldig opgavebesked" -#: ../calendar/gui/dialogs/delete-error.c:77 -msgid "The memo could not be deleted because permission was denied" -msgstr "Huskeseddelen kunne ikke fjernes da du ikke har rettigheder hertil" +#: ../calendar/gui/e-itip-control.c:1506 +#, c-format +msgid "%s has published free/busy information." +msgstr "%s har publiceret ledig/optaget-information." -#: ../calendar/gui/dialogs/delete-error.c:80 -msgid "The item could not be deleted because permission was denied" -msgstr "Punktet kunne ikke fjernes da du ikke har rettigheder hertil" +#: ../calendar/gui/e-itip-control.c:1507 +msgid "Free/Busy Information" +msgstr "Ugyldig besked om ledig/optaget" -#: ../calendar/gui/dialogs/delete-error.c:87 -msgid "The event could not be deleted due to an error" -msgstr "Begivenheden kunne ikke fjernes pga. en fejl" +#: ../calendar/gui/e-itip-control.c:1511 +#, c-format +msgid "%s requests your free/busy information." +msgstr "%s anmoder om din oplysning om ledig/optaget." -#: ../calendar/gui/dialogs/delete-error.c:90 -msgid "The task could not be deleted due to an error" -msgstr "Opgaven kunne ikke fjernes pga. en fejl" +#: ../calendar/gui/e-itip-control.c:1512 +msgid "Free/Busy Request" +msgstr "Forespørgsel om ledig/optaget" -#: ../calendar/gui/dialogs/delete-error.c:93 -msgid "The memo could not be deleted due to an error" -msgstr "Huskeseddelen kunne ikke fjernes pga. en fejl" +#: ../calendar/gui/e-itip-control.c:1516 +#, c-format +msgid "%s has replied to a free/busy request." +msgstr "" +"%s har svaret på en forespørgsel efter oplysning om ledig/optaget." -#: ../calendar/gui/dialogs/delete-error.c:96 -msgid "The item could not be deleted due to an error" -msgstr "Punktet kunne ikke fjernes pga. en fejl" +#: ../calendar/gui/e-itip-control.c:1517 +msgid "Free/Busy Reply" +msgstr "Svar på ledig/optaget" -#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1 -msgid "Contacts..." -msgstr "Kontaktpersoner..." +#: ../calendar/gui/e-itip-control.c:1522 +msgid "Bad Free/Busy Message" +msgstr "Ugyldig besked om ledig/optaget" -#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2 -#: ../plugins/exchange-operations/exchange-delegates.c:417 -msgid "Delegate To:" -msgstr "Uddelegér til:" +#: ../calendar/gui/e-itip-control.c:1598 +msgid "The message does not appear to be properly formed" +msgstr "Brevet ser ikke ud til at være korrekt udformet" -#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3 -msgid "Enter Delegate" -msgstr "Indtast delegat" +#: ../calendar/gui/e-itip-control.c:1657 +msgid "The message contains only unsupported requests." +msgstr "Dette brev indeholder forespørgsler som ikke er understøttet." -#: ../calendar/gui/dialogs/event-editor.c:202 -msgid "_Alarms" -msgstr "_Påmindelser" +#: ../calendar/gui/e-itip-control.c:1690 +msgid "The attachment does not contain a valid calendar message" +msgstr "Bilaget indeholder ikke en gyldig kalenderbesked" -#: ../calendar/gui/dialogs/event-editor.c:204 -msgid "Click here to set or unset alarms for this event" -msgstr "Klik her for at aktivere/deaktivere påmindelser for denne begivenhed" +#: ../calendar/gui/e-itip-control.c:1728 +msgid "The attachment has no viewable calendar items" +msgstr "Bilaget har ingen synlige kalender-elementer" -#: ../calendar/gui/dialogs/event-editor.c:209 -msgid "_Recurrence" -msgstr "_Tilbagevenden" +#: ../calendar/gui/e-itip-control.c:1973 +msgid "Update complete\n" +msgstr "Opdatering fuldført\n" -#: ../calendar/gui/dialogs/event-editor.c:211 -msgid "Make this a recurring event" -msgstr "Gør denne begivenhed tilbagevendende" +#: ../calendar/gui/e-itip-control.c:2007 +msgid "Object is invalid and cannot be updated\n" +msgstr "Objektet er ugyldigt og kan ikke opdateres\n" -#: ../calendar/gui/dialogs/event-editor.c:216 -#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2 -#: ../plugins/groupwise-features/send-options.c:212 -#: ../widgets/misc/e-send-options.glade.h:19 -msgid "Send Options" -msgstr "Afsendelsesindstillinger" +#: ../calendar/gui/e-itip-control.c:2024 +msgid "This response is not from a current attendee. Add as an attendee?" +msgstr "" +"Dette svar er ikke fra en nuværende mødesdeltager. Tilføj som mødesdeltager?" -#: ../calendar/gui/dialogs/event-editor.c:218 -#: ../calendar/gui/dialogs/task-editor.c:125 -msgid "Insert advanced send options" -msgstr "Indsæt avancerede afsendelsesindstillinger" +#: ../calendar/gui/e-itip-control.c:2042 +msgid "Attendee status could not be updated because of an invalid status!\n" +msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status!\n" -#: ../calendar/gui/dialogs/event-editor.c:226 -msgid "All _Day Event" -msgstr "_Heldagsbegivenhed" +#: ../calendar/gui/e-itip-control.c:2066 +msgid "Attendee status updated\n" +msgstr "Deltagerstatus opdateret\n" -#: ../calendar/gui/dialogs/event-editor.c:228 -msgid "Toggles whether to have All Day Event" -msgstr "Slå visning af heldagsbegivenhed fra/til" +#: ../calendar/gui/e-itip-control.c:2073 +#: ../plugins/itip-formatter/itip-formatter.c:1385 +msgid "Attendee status can not be updated because the item no longer exists" +msgstr "" +"Deltagerstatus kan ikke opdateres, fordi elementet ikke længere eksisterer" -#: ../calendar/gui/dialogs/event-editor.c:234 -msgid "Show Time as _Busy" -msgstr "Vis tid som _optaget" +#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2161 +msgid "Item sent!\n" +msgstr "Elementet sendt!\n" -#: ../calendar/gui/dialogs/event-editor.c:236 -msgid "Toggles whether to show time as busy" -msgstr "Slå visning af tid som optaget fra/til" +#: ../calendar/gui/e-itip-control.c:2110 ../calendar/gui/e-itip-control.c:2169 +msgid "The item could not be sent!\n" +msgstr "Elementet kunne ikke sendes!\n" -#: ../calendar/gui/dialogs/event-editor.c:245 -msgid "_Free/Busy" -msgstr "_Ledig/optaget" +#: ../calendar/gui/e-itip-control.c:2287 +msgid "Choose an action:" +msgstr "Vælg en handling:" -#: ../calendar/gui/dialogs/event-editor.c:247 -msgid "Query free / busy information for the attendees" -msgstr "Forespørg om deltagere er ledige eller optagede" +#. To translators: RSVP means "please reply" +#: ../calendar/gui/e-itip-control.c:2316 +#: ../calendar/gui/e-meeting-list-view.c:592 +#: ../calendar/gui/e-meeting-time-sel.etspec.h:8 +msgid "RSVP" +msgstr "SU" -#: ../calendar/gui/dialogs/event-editor.c:301 -msgid "Appoint_ment" -msgstr "_Aftale" +#: ../calendar/gui/e-itip-control.c:2356 +msgid "Update" +msgstr "Opdatér" -#: ../calendar/gui/dialogs/event-page.c:736 -#: ../calendar/gui/dialogs/event-page.c:2725 -msgid "This event has alarms" -msgstr "Denne begivenhed har påmindelser" +#: ../calendar/gui/e-itip-control.c:2380 +#: ../plugins/groupwise-features/process-meeting.c:53 +msgid "Accept" +msgstr "Godkend" -#: ../calendar/gui/dialogs/event-page.c:799 -#: ../calendar/gui/dialogs/event-page.glade.h:10 -#: ../calendar/gui/dialogs/meeting-page.glade.h:5 -#: ../calendar/gui/dialogs/memo-page.glade.h:2 -msgid "Or_ganizer:" -msgstr "Or_ganisator:" +#: ../calendar/gui/e-itip-control.c:2381 +msgid "Tentatively accept" +msgstr "Foreslået" -#: ../calendar/gui/dialogs/event-page.c:845 -msgid "_Delegatees" -msgstr "_Delegerede" +#: ../calendar/gui/e-itip-control.c:2382 +#: ../plugins/groupwise-features/process-meeting.c:55 +msgid "Decline" +msgstr "Afslået" -#: ../calendar/gui/dialogs/event-page.c:847 -msgid "Atte_ndees" -msgstr "D_eltagere" +#: ../calendar/gui/e-itip-control.c:2407 +msgid "Send Free/Busy Information" +msgstr "Send oplysning om ledig/optaget" -#: ../calendar/gui/dialogs/event-page.c:1031 -msgid "Event with no start date" -msgstr "Begivenhed uden startdato" +#: ../calendar/gui/e-itip-control.c:2431 +msgid "Update respondent status" +msgstr "Opdaterer modpartens status" -#: ../calendar/gui/dialogs/event-page.c:1034 -msgid "Event with no end date" -msgstr "Begivenhed uden slutdato" +#: ../calendar/gui/e-itip-control.c:2455 +msgid "Send Latest Information" +msgstr "Send nyeste oplysninger" -#: ../calendar/gui/dialogs/event-page.c:1203 -#: ../calendar/gui/dialogs/memo-page.c:641 -#: ../calendar/gui/dialogs/task-page.c:813 -msgid "Start date is wrong" -msgstr "Startdatoen er forkert" +#: ../calendar/gui/e-itip-control.c:2479 ../ui/evolution-mail-global.xml.h:1 +msgid "Cancel" +msgstr "Afbryd" -#: ../calendar/gui/dialogs/event-page.c:1213 -msgid "End date is wrong" -msgstr "Slutdatoen er forkert" +#: ../calendar/gui/e-itip-control.glade.h:1 +msgid "--to--" +msgstr "--til--" -#: ../calendar/gui/dialogs/event-page.c:1236 -msgid "Start time is wrong" -msgstr "Starttiden er forkert" +#: ../calendar/gui/e-itip-control.glade.h:2 +msgid "Calendar Message" +msgstr "Kalenderbesked" -#: ../calendar/gui/dialogs/event-page.c:1243 -msgid "End time is wrong" -msgstr "Sluttiden er forkert" +#: ../calendar/gui/e-itip-control.glade.h:3 +msgid "Date:" +msgstr "Dato:" -#: ../calendar/gui/dialogs/event-page.c:1406 -#: ../calendar/gui/dialogs/memo-page.c:682 -#: ../calendar/gui/dialogs/task-page.c:873 -msgid "The organizer selected no longer has an account." -msgstr "Den valgte organisator har ikke længere en konto." +#: ../calendar/gui/e-itip-control.glade.h:5 +msgid "Loading Calendar" +msgstr "Indlæser kalender" -#: ../calendar/gui/dialogs/event-page.c:1412 -#: ../calendar/gui/dialogs/memo-page.c:688 -#: ../calendar/gui/dialogs/task-page.c:879 -msgid "An organizer is required." -msgstr "En organisator er påkrævet." +#: ../calendar/gui/e-itip-control.glade.h:6 +msgid "Loading calendar..." +msgstr "Indlæser kalender..." -#: ../calendar/gui/dialogs/event-page.c:1437 -#: ../calendar/gui/dialogs/task-page.c:903 -msgid "At least one attendee is required." -msgstr "Mindst en deltager er nødvendig." +#: ../calendar/gui/e-itip-control.glade.h:7 +msgid "Organizer:" +msgstr "Organisator:" -#: ../calendar/gui/dialogs/event-page.c:1878 -#: ../calendar/gui/dialogs/task-page.c:1202 -msgid "_Add " -msgstr "_Tilføj " +#: ../calendar/gui/e-itip-control.glade.h:8 +msgid "Server Message:" +msgstr "Serverbesked:" -#: ../calendar/gui/dialogs/event-page.c:2601 -#, c-format -msgid "Unable to open the calendar '%s'." -msgstr "Kan ikke åbne kalenderen \"%s\"." +#: ../calendar/gui/e-meeting-list-view.c:67 +msgid "Chair Persons" +msgstr "Formænd" -#: ../calendar/gui/dialogs/event-page.c:2645 -#: ../calendar/gui/dialogs/memo-page.c:896 -#: ../calendar/gui/dialogs/task-page.c:1806 -#, c-format -msgid "You are acting on behalf of %s" -msgstr "Du udfører en handlig på vegne af %s" +#: ../calendar/gui/e-meeting-list-view.c:68 +msgid "Required Participants" +msgstr "Obligatoriske deltagere" -#: ../calendar/gui/dialogs/event-page.c:2925 -#, c-format -msgid "%d day before appointment" -msgid_plural "%d days before appointment" -msgstr[0] "%d dag før aftalen" -msgstr[1] "%d dage før aftalen" +#: ../calendar/gui/e-meeting-list-view.c:69 +msgid "Optional Participants" +msgstr "Valgfrie deltagere" -#: ../calendar/gui/dialogs/event-page.c:2931 -#, c-format -msgid "%d hour before appointment" -msgid_plural "%d hours before appointment" -msgstr[0] "%d time før aftalen" -msgstr[1] "%d timer før aftalen" +#: ../calendar/gui/e-meeting-list-view.c:70 +msgid "Resources" +msgstr "Ressourcer" -#: ../calendar/gui/dialogs/event-page.c:2937 -#, c-format -msgid "%d minute before appointment" -msgid_plural "%d minutes before appointment" -msgstr[0] "%d minut før aftale" -msgstr[1] "%d minutter før aftale" +#: ../calendar/gui/e-meeting-list-view.c:152 +msgid "Attendees" +msgstr "Deltagere" -#: ../calendar/gui/dialogs/event-page.c:2950 -msgid "Customize" -msgstr "Tilpas" +#: ../calendar/gui/e-meeting-list-view.c:163 +#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102 +#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:981 +msgid "Individual" +msgstr "Individuel" -#: ../calendar/gui/dialogs/event-page.glade.h:1 -msgid "1 day before appointment" -msgstr "1 dag før aftalen" +#: ../calendar/gui/e-meeting-list-view.c:164 +#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104 +#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7 +msgid "Group" +msgstr "Gruppe" -#: ../calendar/gui/dialogs/event-page.glade.h:2 -msgid "1 hour before appointment" -msgstr "1 time før aftalen" +#: ../calendar/gui/e-meeting-list-view.c:165 +#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106 +#: ../calendar/gui/print.c:983 +msgid "Resource" +msgstr "Ressource" -#: ../calendar/gui/dialogs/event-page.glade.h:3 -msgid "15 minutes before appointment" -msgstr "15 minutter før aftalen" +#: ../calendar/gui/e-meeting-list-view.c:166 +#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108 +#: ../calendar/gui/print.c:984 +msgid "Room" +msgstr "Rum" -#: ../calendar/gui/dialogs/event-page.glade.h:5 -msgid "Attendee_s..." -msgstr "D_eltagere..." +#: ../calendar/gui/e-meeting-list-view.c:177 +#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137 +#: ../calendar/gui/print.c:998 +msgid "Chair" +msgstr "Formand" -#: ../calendar/gui/dialogs/event-page.glade.h:8 -msgid "Custom Alarm:" -msgstr "Brugertilpasset lyd ved påmindelser:" +#: ../calendar/gui/e-meeting-list-view.c:178 +#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139 +#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:999 +msgid "Required Participant" +msgstr "Obligatorisk deltager" -#: ../calendar/gui/dialogs/event-page.glade.h:9 -msgid "Event Description" -msgstr "Beskrivelse af begivenhed" +#: ../calendar/gui/e-meeting-list-view.c:179 +#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141 +#: ../calendar/gui/print.c:1000 +msgid "Optional Participant" +msgstr "Valgfri deltager" -#: ../calendar/gui/dialogs/event-page.glade.h:11 -#: ../calendar/gui/dialogs/memo-page.glade.h:4 -#: ../calendar/gui/dialogs/task-page.glade.h:6 -msgid "Su_mmary:" -msgstr "Sa_mmendrag:" +#: ../calendar/gui/e-meeting-list-view.c:180 +#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143 +#: ../calendar/gui/print.c:1001 +msgid "Non-Participant" +msgstr "Ikke-deltager" -#: ../calendar/gui/dialogs/event-page.glade.h:13 -msgid "_Alarm" -msgstr "_Påmindelser" +#: ../calendar/gui/e-meeting-list-view.c:202 +#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193 +#: ../calendar/gui/e-meeting-store.c:752 +msgid "Needs Action" +msgstr "Behøver handling" -#: ../calendar/gui/dialogs/event-page.glade.h:15 -#: ../calendar/gui/dialogs/memo-page.glade.h:6 -#: ../calendar/gui/dialogs/task-page.glade.h:8 -msgid "_Description:" -msgstr "_Beskrivelse:" +#. The extra space is just a hack to occupy more space for Attendee +#: ../calendar/gui/e-meeting-list-view.c:547 +msgid "Attendee " +msgstr "Deltager " -#: ../calendar/gui/dialogs/event-page.glade.h:17 -msgid "_Time:" -msgstr "_Tid:" +#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205 +msgid "In Process" +msgstr "I gang" -#. TRANSLATORS: Entire string is for example: -#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets]) -#: ../calendar/gui/dialogs/event-page.glade.h:18 -#: ../calendar/gui/dialogs/recurrence-page.glade.h:16 -msgid "for" -msgstr "for" +#. This is a strftime() format string %A = full weekday name, +#. %B = full month name, %d = month day, %Y = full year. +#: ../calendar/gui/e-meeting-time-sel-item.c:467 +#: ../calendar/gui/e-meeting-time-sel.c:2125 +msgid "%A, %B %d, %Y" +msgstr "%A den %d %B, %Y" -#. TRANSLATORS: Entire string is for example: -#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets]) -#: ../calendar/gui/dialogs/event-page.glade.h:21 -#: ../calendar/gui/dialogs/recurrence-page.glade.h:25 -msgid "until" -msgstr "til" +#. This is a strftime() format string %a = abbreviated weekday +#. name, %m = month number, %d = month day, %Y = full year. +#. This is a strftime() format string %a = abbreviated weekday name, +#. %m = month number, %d = month day, %Y = full year. +#: ../calendar/gui/e-meeting-time-sel-item.c:471 +#: ../calendar/gui/e-meeting-time-sel.c:2156 +msgid "%a %m/%d/%Y" +msgstr "%a %d/%m-%Y" -#: ../calendar/gui/dialogs/meeting-page.glade.h:1 -msgid "Att_endees" -msgstr "Del_tagere" +#. This is a strftime() format string %m = month number, +#. %d = month day, %Y = full year. +#: ../calendar/gui/e-meeting-time-sel-item.c:475 +msgid "%m/%d/%Y" +msgstr "%d/%m-%Y" -#: ../calendar/gui/dialogs/meeting-page.glade.h:2 -msgid "C_hange Organizer" -msgstr "_Skift organisator" +#: ../calendar/gui/e-meeting-time-sel.c:398 +msgid "Out of Office" +msgstr "Ude" -#: ../calendar/gui/dialogs/meeting-page.glade.h:3 -msgid "Co_ntacts..." -msgstr "_Kontaktpersoner..." +#: ../calendar/gui/e-meeting-time-sel.c:399 +msgid "No Information" +msgstr "Ingen information" -#: ../calendar/gui/dialogs/meeting-page.glade.h:7 -#: ../calendar/gui/e-itip-control.glade.h:7 -msgid "Organizer:" -msgstr "Organisator:" +#: ../calendar/gui/e-meeting-time-sel.c:414 +msgid "A_ttendees..." +msgstr "D_eltagere..." -#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485 -msgid "Memo" -msgstr "Huskeseddel" +#: ../calendar/gui/e-meeting-time-sel.c:435 +msgid "O_ptions" +msgstr "_Valgmuligheder" -#: ../calendar/gui/dialogs/memo-page.c:857 -#, c-format -msgid "Unable to open memos in '%s'." -msgstr "Kan ikke åbne huskesedler i \"%s\"." +#: ../calendar/gui/e-meeting-time-sel.c:452 +msgid "Show _only working hours" +msgstr "Vis _kun arbejdstid" -#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567 -#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651 -#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887 -#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20 -msgid "To" -msgstr "Til" +#: ../calendar/gui/e-meeting-time-sel.c:462 +msgid "Show _zoomed out" +msgstr "Vis _zoomet ud" -#: ../calendar/gui/dialogs/memo-page.glade.h:3 -#: ../calendar/gui/dialogs/task-page.glade.h:5 -msgid "Sta_rt date:" -msgstr "Sta_rtdato:" +#: ../calendar/gui/e-meeting-time-sel.c:477 +msgid "_Update free/busy" +msgstr "_Opdatér ledig/optaget" -#: ../calendar/gui/dialogs/memo-page.glade.h:5 -msgid "T_o:" -msgstr "T_il:" +#: ../calendar/gui/e-meeting-time-sel.c:492 +msgid "_<<" +msgstr "_<<" -#: ../calendar/gui/dialogs/memo-page.glade.h:7 -#: ../calendar/gui/dialogs/task-page.c:365 -#: ../calendar/gui/dialogs/task-page.glade.h:9 -msgid "_Group:" -msgstr "_Gruppe:" +#: ../calendar/gui/e-meeting-time-sel.c:510 +msgid "_Autopick" +msgstr "_Autovælg" -#: ../calendar/gui/dialogs/recur-comp.c:53 -#, c-format -msgid "You are modifying a recurring event. What would you like to modify?" -msgstr "Du ændrer en tilbagevendende begivenhed. Hvad ønsker du at ændre?" +#: ../calendar/gui/e-meeting-time-sel.c:525 +msgid ">_>" +msgstr "_>>" -#: ../calendar/gui/dialogs/recur-comp.c:55 -#, c-format -msgid "You are delegating a recurring event. What would you like to delegate?" -msgstr "" -"Du uddelegerer en tilbagevendende begivenhed. Hvad ønsker du at uddelegere?" +#: ../calendar/gui/e-meeting-time-sel.c:542 +msgid "_All people and resources" +msgstr "_Alle mennesker og ressourcer" -#: ../calendar/gui/dialogs/recur-comp.c:59 -#, c-format -msgid "You are modifying a recurring task. What would you like to modify?" -msgstr "Du ændrer en tilbagevendende opgave. Hvad vil du ændre?" +#: ../calendar/gui/e-meeting-time-sel.c:551 +msgid "All _people and one resource" +msgstr "Alle _personer og en enkelt ressource" -#: ../calendar/gui/dialogs/recur-comp.c:63 -#, c-format -msgid "You are modifying a recurring memo. What would you like to modify?" -msgstr "Du ændrer en tilbagevendende huskeseddel. Hvad ønsker du at ændre?" +#: ../calendar/gui/e-meeting-time-sel.c:560 +msgid "_Required people" +msgstr "_Obligatoriske personer" -#: ../calendar/gui/dialogs/recur-comp.c:88 -msgid "This Instance Only" -msgstr "Kun dette tilfælde" +#: ../calendar/gui/e-meeting-time-sel.c:569 +msgid "Required people and _one resource" +msgstr "Obligatoriske personer og _en enkelt ressource" -#: ../calendar/gui/dialogs/recur-comp.c:92 -msgid "This and Prior Instances" -msgstr "Dette og tidligere tilfælde" +#: ../calendar/gui/e-meeting-time-sel.c:605 +msgid "_Start time:" +msgstr "_Starttidspunkt:" -#: ../calendar/gui/dialogs/recur-comp.c:98 -msgid "This and Future Instances" -msgstr "Dette og fremtidige tilfælde" +#: ../calendar/gui/e-meeting-time-sel.c:632 +msgid "_End time:" +msgstr "S_luttidspunkt:" -#: ../calendar/gui/dialogs/recur-comp.c:103 -msgid "All Instances" -msgstr "Alle tilfælde" +#: ../calendar/gui/e-meeting-time-sel.etspec.h:2 +msgid "Click here to add an attendee" +msgstr "Klik her for at tilføje en deltager" -#: ../calendar/gui/dialogs/recurrence-page.c:562 -msgid "This appointment contains recurrences that Evolution cannot edit." -msgstr "" -"Denne aftale har tilbagevendende elementer som ikke kan redigeres af " -"Evolution." +#: ../calendar/gui/e-meeting-time-sel.etspec.h:3 +msgid "Common Name" +msgstr "Normalt navn" -#: ../calendar/gui/dialogs/recurrence-page.c:892 -msgid "Recurrence date is invalid" -msgstr "Dato for tilbagevendende aftale er ugyldig" +#: ../calendar/gui/e-meeting-time-sel.etspec.h:4 +msgid "Delegated From" +msgstr "Uddelegeret fra" -#: ../calendar/gui/dialogs/recurrence-page.c:932 -msgid "End time of the recurrence was before event's start" -msgstr "" -"Sluttidspunkt for den tilbagevendende begivenhed var før begivenhedens start" +#: ../calendar/gui/e-meeting-time-sel.etspec.h:5 +msgid "Delegated To" +msgstr "Uddelegeret til" -#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]' -#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows. -#: ../calendar/gui/dialogs/recurrence-page.c:961 -msgid "on" -msgstr "på" +#: ../calendar/gui/e-meeting-time-sel.etspec.h:6 +msgid "Language" +msgstr "Sprog" -#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]' -#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or -#. * the name of a week day (like 'Monday' or 'Friday') always follow. -#. -#: ../calendar/gui/dialogs/recurrence-page.c:1025 -msgid "first" -msgstr "første" +#: ../calendar/gui/e-meeting-time-sel.etspec.h:7 +msgid "Member" +msgstr "Medlem" -#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute") -#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]' -#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or -#. * the name of a week day (like 'Monday' or 'Friday') always follow. -#. -#: ../calendar/gui/dialogs/recurrence-page.c:1031 -msgid "second" -msgstr "anden" +#: ../calendar/gui/e-memo-table.c:953 +msgid "_Delete Selected Memos" +msgstr "Sle_t valgte huskesedler" -#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]' -#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or -#. * the name of a week day (like 'Monday' or 'Friday') always follow. -#. -#: ../calendar/gui/dialogs/recurrence-page.c:1036 -msgid "third" -msgstr "tredje" +#: ../calendar/gui/e-memo-table.c:1104 ../calendar/gui/e-memo-table.etspec.h:2 +msgid "Click to add a memo" +msgstr "Klik for at tilføje en huskeseddel" -#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]' -#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or -#. * the name of a week day (like 'Monday' or 'Friday') always follow. -#. -#: ../calendar/gui/dialogs/recurrence-page.c:1041 -msgid "fourth" -msgstr "fjerde" +#: ../calendar/gui/e-memos.c:759 ../calendar/gui/e-tasks.c:909 +#, c-format +msgid "" +"Error on %s:\n" +" %s" +msgstr "" +"Fejl ved %s:\n" +" %s" -#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]' -#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or -#. * the name of a week day (like 'Monday' or 'Friday') always follow. -#. -#: ../calendar/gui/dialogs/recurrence-page.c:1046 -msgid "last" -msgstr "sidste" +#: ../calendar/gui/e-memos.c:811 +msgid "Loading memos" +msgstr "Indlæser huskesedler" -#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]' -#. * (dropdown menu options are in [square brackets]). -#: ../calendar/gui/dialogs/recurrence-page.c:1072 -msgid "Other Date" -msgstr "Anden dato" +#: ../calendar/gui/e-memos.c:902 +#, c-format +msgid "Opening memos at %s" +msgstr "Åbner huskesedler på %s" -#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of -#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s) -#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]). -#. -#: ../calendar/gui/dialogs/recurrence-page.c:1080 -msgid "1st to 10th" -msgstr "1. til 10." +#: ../calendar/gui/e-memos.c:1074 ../calendar/gui/e-tasks.c:1328 +msgid "Deleting selected objects..." +msgstr "Fjerner markerede objekter..." -#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of -#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s) -#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]). -#. -#: ../calendar/gui/dialogs/recurrence-page.c:1086 -msgid "11th to 20th" -msgstr "11. til 20." +#: ../calendar/gui/e-tasks.c:962 +msgid "Loading tasks" +msgstr "Indlæser opgaver" -#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of -#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s) -#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]). -#. -#: ../calendar/gui/dialogs/recurrence-page.c:1092 -msgid "21st to 31st" -msgstr "21. til 31." +#: ../calendar/gui/e-tasks.c:1060 +#, c-format +msgid "Opening tasks at %s" +msgstr "Åbner lager %s" -#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]' -#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or -#. the name of a week day (like 'Monday' or 'Friday') always follow. -#: ../calendar/gui/dialogs/recurrence-page.c:1115 -msgid "day" -msgstr "dag" +#: ../calendar/gui/e-tasks.c:1305 +msgid "Completing tasks..." +msgstr "Færdiggør opgaver..." -#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]' -#. * (dropdown menu options are in [square brackets])." -#. -#: ../calendar/gui/dialogs/recurrence-page.c:1241 -msgid "on the" -msgstr "den" +#: ../calendar/gui/e-tasks.c:1355 +msgid "Expunging" +msgstr "Udrenser" -#: ../calendar/gui/dialogs/recurrence-page.c:1417 -msgid "occurrences" -msgstr "forekomster" +#: ../calendar/gui/e-timezone-entry.c:127 +msgid "Select Timezone" +msgstr "Vælg en tidszone" -#: ../calendar/gui/dialogs/recurrence-page.c:2120 -msgid "Add exception" -msgstr "Tilføj undtagelse" +#. strftime format %d = day of month, %B = full +#. month name. You can change the order but don't +#. change the specifiers or add anything. +#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1662 +msgid "%d %B" +msgstr "%d %B" -#: ../calendar/gui/dialogs/recurrence-page.c:2161 -msgid "Could not get a selection to modify." -msgstr "Der er ikke markeret noget til redigering." +#: ../calendar/gui/gnome-cal.c:2648 +msgid "_Custom View" +msgstr "_Brugertilpasset oversigt" -#: ../calendar/gui/dialogs/recurrence-page.c:2167 -msgid "Modify exception" -msgstr "Undtagelse fra redigering" +#: ../calendar/gui/gnome-cal.c:2649 +msgid "_Save Custom View" +msgstr "_Gem brugertilpasset oversigt" -#: ../calendar/gui/dialogs/recurrence-page.c:2211 -msgid "Could not get a selection to delete." -msgstr "Der er ikke markeret noget til sletning." +#: ../calendar/gui/gnome-cal.c:2654 +msgid "_Define Views..." +msgstr "_Definér oversigter..." -#: ../calendar/gui/dialogs/recurrence-page.c:2335 -msgid "Date/Time" -msgstr "Dato/Tid" +#: ../calendar/gui/gnome-cal.c:2891 +#, c-format +msgid "Loading appointments at %s" +msgstr "Indlæser aftaler på %s" -#: ../calendar/gui/dialogs/recurrence-page.glade.h:1 -msgid "Exceptions" -msgstr "Undtagelser" +#: ../calendar/gui/gnome-cal.c:2906 +#, c-format +msgid "Loading tasks at %s" +msgstr "Indlæser opgaver på %s" -#: ../calendar/gui/dialogs/recurrence-page.glade.h:2 -#: ../mail/mail-config.glade.h:3 -msgid "Preview" -msgstr "Forhåndsvisning" +#: ../calendar/gui/gnome-cal.c:2915 +#, c-format +msgid "Loading memos at %s" +msgstr "Indlæser huskesedler på %s" -#: ../calendar/gui/dialogs/recurrence-page.glade.h:3 -msgid "Recurrence" -msgstr "Tilbagevenden" +#: ../calendar/gui/gnome-cal.c:3027 +#, c-format +msgid "Opening %s" +msgstr "Åbner %s" -#. TRANSLATORS: Entire string is for example: -#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets]) -#: ../calendar/gui/dialogs/recurrence-page.glade.h:6 -msgid "Every" -msgstr "Hver" +#: ../calendar/gui/gnome-cal.c:3995 +msgid "Purging" +msgstr "Opryder" -#. TRANSLATORS: Entire string is for example: -#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets]) -#: ../calendar/gui/dialogs/recurrence-page.glade.h:9 -msgid "This appointment rec_urs" -msgstr "Denne aftale er til_bagevendende" +#: ../calendar/gui/goto-dialog.glade.h:1 +msgid "" +"January\n" +"February\n" +"March\n" +"April\n" +"May\n" +"June\n" +"July\n" +"August\n" +"September\n" +"October\n" +"November\n" +"December" +msgstr "" -#. TRANSLATORS: Entire string is for example: -#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets]) -#: ../calendar/gui/dialogs/recurrence-page.glade.h:19 -msgid "forever" -msgstr "for altid" +#: ../calendar/gui/goto-dialog.glade.h:13 +msgid "Select Date" +msgstr "Vælg dato" -#. TRANSLATORS: Entire string is for example: -#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets]) -#: ../calendar/gui/dialogs/recurrence-page.glade.h:22 -msgid "month(s)" -msgstr "måned(er)" +#: ../calendar/gui/goto-dialog.glade.h:14 +msgid "_Select Today" +msgstr "_Vælg dagen i dag" -#. TRANSLATORS: Entire string is for example: -#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets]) -#: ../calendar/gui/dialogs/recurrence-page.glade.h:28 -msgid "week(s)" -msgstr "uge(r)" +#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462 +#: ../calendar/gui/itip-utils.c:550 +msgid "An organizer must be set." +msgstr "En organisator skal angives." -#: ../calendar/gui/dialogs/recurrence-page.glade.h:29 -msgid "year(s)" -msgstr "år" +#: ../calendar/gui/itip-utils.c:454 +msgid "At least one attendee is necessary" +msgstr "Mindst en deltager er nødvendig" -#: ../calendar/gui/dialogs/send-comp.c:116 -msgid "Send my alarms with this event" -msgstr "Send mine alarmer med denne begivenhed" +#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778 +msgid "Event information" +msgstr "Kalenderinformation" -#: ../calendar/gui/dialogs/task-details-page.c:377 -#: ../calendar/gui/dialogs/task-details-page.c:397 -msgid "Completed date is wrong" -msgstr "Fuldførelsesdato er forkert" +#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781 +msgid "Task information" +msgstr "Opgaveinformation" -#: ../calendar/gui/dialogs/task-details-page.c:482 -msgid "Web Page" -msgstr "Webside" +#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784 +msgid "Memo information" +msgstr "Huskeseddel-information" -#: ../calendar/gui/dialogs/task-details-page.glade.h:1 -msgid "Miscellaneous" -msgstr "Diverse" +#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802 +msgid "Free/Busy information" +msgstr "Ledig/optaget-information" -#: ../calendar/gui/dialogs/task-details-page.glade.h:2 -msgid "Status" -msgstr "Status" +#: ../calendar/gui/itip-utils.c:640 +msgid "Calendar information" +msgstr "Kalenderinformation" -#. Pass TRUE as is_utc, so it gets converted to the current -#. timezone. -#: ../calendar/gui/dialogs/task-details-page.glade.h:4 -#: ../calendar/gui/e-cal-component-preview.c:247 -#: ../calendar/gui/e-cal-model-tasks.c:362 -#: ../calendar/gui/e-cal-model-tasks.c:679 -#: ../calendar/gui/e-calendar-table.c:237 -#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941 -#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203 -#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9 -#: ../plugins/save-calendar/csv-format.c:366 -msgid "Completed" -msgstr "Fuldført" +#. Translators: This is part of the subject +#. * line of a meeting request or update email. +#. * The full subject line would be: +#. * "Accepted: Meeting Name". +#: ../calendar/gui/itip-utils.c:674 +msgctxt "Meeting" +msgid "Accepted" +msgstr "Accepteret" -#: ../calendar/gui/dialogs/task-details-page.glade.h:5 -#: ../calendar/gui/e-cal-component-preview.c:266 -#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14 -#: ../mail/message-list.c:1065 -msgid "High" -msgstr "Høj" +#. Translators: This is part of the subject +#. * line of a meeting request or update email. +#. * The full subject line would be: +#. * "Tentatively Accepted: Meeting Name". +#: ../calendar/gui/itip-utils.c:681 +msgctxt "Meeting" +msgid "Tentatively Accepted" +msgstr "Forsøgsvist accepteret" + +#. Translators: This is part of the subject +#. * line of a meeting request or update email. +#. * The full subject line would be: +#. * "Declined: Meeting Name". +#. Translators: This is part of the subject line of a +#. * meeting request or update email. The full subject +#. * line would be: "Declined: Meeting Name". +#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736 +msgctxt "Meeting" +msgid "Declined" +msgstr "Afslået" -#: ../calendar/gui/dialogs/task-details-page.glade.h:6 -#: ../calendar/gui/e-cal-component-preview.c:244 -#: ../calendar/gui/e-cal-model-tasks.c:360 -#: ../calendar/gui/e-cal-model-tasks.c:677 -#: ../calendar/gui/e-cal-model-tasks.c:754 -#: ../calendar/gui/e-calendar-table.c:235 -#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2558 -msgid "In Progress" -msgstr "I gang" +#. Translators: This is part of the subject +#. * line of a meeting request or update email. +#. * The full subject line would be: +#. * "Delegated: Meeting Name". +#: ../calendar/gui/itip-utils.c:695 +msgctxt "Meeting" +msgid "Delegated" +msgstr "Uddelegeret" -#: ../calendar/gui/dialogs/task-details-page.glade.h:7 -#: ../calendar/gui/e-cal-component-preview.c:270 -#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16 -#: ../mail/message-list.c:1063 -msgid "Low" -msgstr "Lav" +#. Translators: This is part of the subject line of a +#. * meeting request or update email. The full subject +#. * line would be: "Updated: Meeting Name". +#: ../calendar/gui/itip-utils.c:708 +msgctxt "Meeting" +msgid "Updated" +msgstr "Opdateret" + +#. Translators: This is part of the subject line of a +#. * meeting request or update email. The full subject +#. * line would be: "Cancel: Meeting Name". +#: ../calendar/gui/itip-utils.c:715 +msgctxt "Meeting" +msgid "Cancel" +msgstr "Aflys" + +#. Translators: This is part of the subject line of a +#. * meeting request or update email. The full subject +#. * line would be: "Refresh: Meeting Name". +#: ../calendar/gui/itip-utils.c:722 +msgctxt "Meeting" +msgid "Refresh" +msgstr "Genopfrisk" + +#. Translators: This is part of the subject line of a +#. * meeting request or update email. The full subject +#. * line would be: "Counter-proposal: Meeting Name". +#: ../calendar/gui/itip-utils.c:729 +msgctxt "Meeting" +msgid "Counter-proposal" +msgstr "Modforslag" -#: ../calendar/gui/dialogs/task-details-page.glade.h:8 -#: ../calendar/gui/e-cal-component-preview.c:268 -#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578 -#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064 -msgid "Normal" -msgstr "Normal" +#: ../calendar/gui/itip-utils.c:799 +#, c-format +msgid "Free/Busy information (%s to %s)" +msgstr "Ledig/optaget-information (%s til %s)" -#: ../calendar/gui/dialogs/task-details-page.glade.h:9 -#: ../calendar/gui/e-cal-component-preview.c:254 -#: ../calendar/gui/e-cal-model-tasks.c:358 -#: ../calendar/gui/e-cal-model-tasks.c:675 -#: ../calendar/gui/e-calendar-table.c:233 -#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2555 -#: ../calendar/gui/tasktypes.xml.h:18 -msgid "Not Started" -msgstr "Ikke startet" - -#: ../calendar/gui/dialogs/task-details-page.glade.h:10 -msgid "P_ercent complete:" -msgstr "F_uldført i procent:" +#: ../calendar/gui/itip-utils.c:807 +msgid "iCalendar information" +msgstr "iCalendar-information" -#: ../calendar/gui/dialogs/task-details-page.glade.h:11 -msgid "Stat_us:" -msgstr "_Status:" +#: ../calendar/gui/itip-utils.c:978 +msgid "You must be an attendee of the event." +msgstr "Du må være en deltager i arrangementet." -#: ../calendar/gui/dialogs/task-details-page.glade.h:12 -#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24 -msgid "Undefined" -msgstr "Udefineret" +#: ../calendar/gui/memos-component.c:479 +msgid "_New Memo List" +msgstr "N_y liste over huskesedler" -#: ../calendar/gui/dialogs/task-details-page.glade.h:13 -msgid "_Date completed:" -msgstr "_Dato for fuldførelse:" +#: ../calendar/gui/memos-component.c:562 +#, c-format +msgid "%d memo" +msgid_plural "%d memos" +msgstr[0] "%d huskeseddel" +msgstr[1] "%d huskesedler" -#: ../calendar/gui/dialogs/task-details-page.glade.h:14 -#: ../widgets/misc/e-send-options.glade.h:34 -msgid "_Priority:" -msgstr "_Prioritet:" +#: ../calendar/gui/memos-component.c:564 ../calendar/gui/tasks-component.c:556 +#, c-format +msgid ", %d selected" +msgid_plural ", %d selected" +msgstr[0] ", %d valgt" +msgstr[1] ", %d valgte" -#: ../calendar/gui/dialogs/task-details-page.glade.h:15 -msgid "_Web Page:" -msgstr "_Hjemmeside:" +#: ../calendar/gui/memos-component.c:611 +msgid "Failed upgrading memos." +msgstr "Opgradering af huskesedler mislykkedes." -#: ../calendar/gui/dialogs/task-editor.c:113 -msgid "_Status Details" -msgstr "Statusdet_aljer" +#: ../calendar/gui/memos-component.c:741 +#, c-format +msgid "Unable to open the memo list '%s' for creating events and meetings" +msgstr "" +"Kan ikke åbne listen over huskesedler \"%s\" til oprettelse af begivenheder " +"og møder" -#: ../calendar/gui/dialogs/task-editor.c:115 -msgid "Click to change or view the status details of the task" -msgstr "Klik for at ændre eller vise statusdetaljer om opgaven" +#: ../calendar/gui/memos-component.c:754 +msgid "There is no calendar available for creating memos" +msgstr "Ingen kalender tilgængelig for oprettelse af huskesedler" -#: ../calendar/gui/dialogs/task-editor.c:123 -#: ../composer/e-composer-actions.c:525 -msgid "_Send Options" -msgstr "_Afsendelsesindstillinger" +#: ../calendar/gui/memos-component.c:864 +msgid "Memo Source Selector" +msgstr "Huskeseddel-kildevælger" -#: ../calendar/gui/dialogs/task-editor.c:317 -msgid "_Task" -msgstr "_Opgave" +#: ../calendar/gui/memos-component.c:1043 +msgid "New memo" +msgstr "Ny huskeseddel" -#: ../calendar/gui/dialogs/task-editor.c:320 -msgid "Task Details" -msgstr "Opgavedetaljer" +#: ../calendar/gui/memos-component.c:1044 +msgctxt "New" +msgid "Mem_o" +msgstr "H_uskeseddel" -#: ../calendar/gui/dialogs/task-page.c:373 -#: ../calendar/gui/dialogs/task-page.glade.h:4 -msgid "Organi_zer:" -msgstr "Organi_sator:" +#: ../calendar/gui/memos-component.c:1045 +msgid "Create a new memo" +msgstr "Opret en ny huskeseddel" -#: ../calendar/gui/dialogs/task-page.c:786 -msgid "Due date is wrong" -msgstr "Forfaldsdatoen er forkert" +#: ../calendar/gui/memos-component.c:1051 +msgid "New shared memo" +msgstr "Ny fælles huskeseddel" -#: ../calendar/gui/dialogs/task-page.c:1763 -#, c-format -msgid "Unable to open tasks in '%s'." -msgstr "Kan ikke åbne opgaver i \"%s\"." +#: ../calendar/gui/memos-component.c:1052 +msgctxt "New" +msgid "_Shared memo" +msgstr "_Fælles huskeseddel" -#: ../calendar/gui/dialogs/task-page.glade.h:1 -msgid "Atte_ndees..." -msgstr "D_eltagere..." +#: ../calendar/gui/memos-component.c:1053 +msgid "Create a shared new memo" +msgstr "Opret en ny, fælles huskeseddel" -#: ../calendar/gui/dialogs/task-page.glade.h:2 -msgid "Categor_ies..." -msgstr "Ka_tegorier..." +#: ../calendar/gui/memos-component.c:1059 +msgid "New memo list" +msgstr "Ny liste over huskesedler" -#: ../calendar/gui/dialogs/task-page.glade.h:3 -msgid "D_ue date:" -msgstr "_Forfaldsdato:" +#: ../calendar/gui/memos-component.c:1060 +msgctxt "New" +msgid "Memo li_st" +msgstr "Liste over _huskesedler" -#: ../calendar/gui/dialogs/task-page.glade.h:7 -msgid "Time zone:" -msgstr "Tidszone:" +#: ../calendar/gui/memos-component.c:1061 +msgid "Create a new memo list" +msgstr "Opret en ny liste over huskesedler" -#. Translator: Entire string is like "Pop up an alert %d days before start of appointment" -#: ../calendar/gui/e-alarm-list.c:394 -#, c-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d dag" -msgstr[1] "%d dage" +#: ../calendar/gui/memos-control.c:389 ../calendar/gui/memos-control.c:405 +msgid "Print Memos" +msgstr "Udskriv huskesedler" -#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment" -#: ../calendar/gui/e-alarm-list.c:400 -#, c-format -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "%d uge" -msgstr[1] "%d uger" +#: ../calendar/gui/migration.c:157 +msgid "" +"The location and hierarchy of the Evolution task folders has changed since " +"Evolution 1.x.\n" +"\n" +"Please be patient while Evolution migrates your folders..." +msgstr "" +"Placering og struktur for Evolutions opgavemapper er ændret siden Evolution " +"1. x.\n" +"\n" +"Vent venligst mens Evolution overflytter dine mapper..." -#: ../calendar/gui/e-alarm-list.c:462 -msgid "Unknown action to be performed" -msgstr "Ukendt handling som skal udføres" +#: ../calendar/gui/migration.c:161 +msgid "" +"The location and hierarchy of the Evolution calendar folders has changed " +"since Evolution 1.x.\n" +"\n" +"Please be patient while Evolution migrates your folders..." +msgstr "" +"Placering og struktur for Evolutions kalendermapper er ændret siden " +"Evolution 1.x.\n" +"\n" +"Vent venligst mens Evolution overflytter dine mapper..." -#. Translator: The first %s refers to the base, which would be actions like -#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes" -#: ../calendar/gui/e-alarm-list.c:476 +#. FIXME: set proper domain/code +#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943 #, c-format -msgid "%s %s before the start of the appointment" -msgstr "%s %s før aftalen starter" +msgid "Unable to migrate old settings from evolution/config.xmldb" +msgstr "Kan ikke overflytte gamle indstillinger fra evolution/config.xmldb" -#. Translator: The first %s refers to the base, which would be actions like -#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes" -#: ../calendar/gui/e-alarm-list.c:481 +#. FIXME: domain/code +#: ../calendar/gui/migration.c:804 #, c-format -msgid "%s %s after the start of the appointment" -msgstr "%s %s efter aftalen er startet" +msgid "Unable to migrate calendar `%s'" +msgstr "Kan ikke overflytte kalenderen \"%s\"" -#. Translator: The %s refers to the base, which would be actions like -#. * "Play a sound" -#: ../calendar/gui/e-alarm-list.c:488 +#. FIXME: domain/code +#: ../calendar/gui/migration.c:972 #, c-format -msgid "%s at the start of the appointment" -msgstr "%s ved aftalens start" +msgid "Unable to migrate tasks `%s'" +msgstr "Kan ikke overflytte opgaverne \"%s\"" -#. Translator: The first %s refers to the base, which would be actions like -#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes" -#: ../calendar/gui/e-alarm-list.c:499 -#, c-format -msgid "%s %s before the end of the appointment" -msgstr "%s %s før aftalen slutter" +#: ../calendar/gui/migration.c:1227 +#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426 +#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457 +#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570 +msgid "Notes" +msgstr "Noter" -#. Translator: The first %s refers to the base, which would be actions like -#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes" -#: ../calendar/gui/e-alarm-list.c:504 -#, c-format -msgid "%s %s after the end of the appointment" -msgstr "%s %s efter aftalens slutning" +#: ../calendar/gui/print.c:514 +msgid "1st" +msgstr "1." -#. Translator: The %s refers to the base, which would be actions like -#. * "Play a sound" -#: ../calendar/gui/e-alarm-list.c:511 -#, c-format -msgid "%s at the end of the appointment" -msgstr "%s ved aftalens slutning" +#: ../calendar/gui/print.c:514 +msgid "2nd" +msgstr "2." -#. Translator: The first %s refers to the base, which would be actions like -#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM" -#: ../calendar/gui/e-alarm-list.c:535 -#, c-format -msgid "%s at %s" -msgstr "%s ved %s" +#: ../calendar/gui/print.c:514 +msgid "3rd" +msgstr "3." -#. Translator: The %s refers to the base, which would be actions like -#. * "Play a sound". "Trigger types" are absolute or relative dates -#: ../calendar/gui/e-alarm-list.c:543 -#, c-format -msgid "%s for an unknown trigger type" -msgstr "%s for en ukendt udløsertype" +#: ../calendar/gui/print.c:514 +msgid "4th" +msgstr "4." -#: ../calendar/gui/e-cal-component-memo-preview.c:69 -#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273 -#, c-format -msgid "Click to open %s" -msgstr "Klik for at åbne %s" +#: ../calendar/gui/print.c:514 +msgid "5th" +msgstr "5." -#: ../calendar/gui/e-cal-component-memo-preview.c:129 -#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858 -msgid "Untitled" -msgstr "Unavngiven" +#: ../calendar/gui/print.c:515 +msgid "6th" +msgstr "6." -#: ../calendar/gui/e-cal-component-memo-preview.c:181 -#: ../calendar/gui/e-cal-component-preview.c:211 -#: ../calendar/gui/e-cal-component-preview.c:222 -msgid "Start Date:" -msgstr "Startdato:" +#: ../calendar/gui/print.c:515 +msgid "7th" +msgstr "7." -#: ../calendar/gui/e-cal-component-memo-preview.c:194 -#: ../calendar/gui/e-cal-component-preview.c:285 -#: ../calendar/gui/e-itip-control.c:1213 -#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69 -#: ../widgets/misc/e-attachment.glade.h:2 -msgid "Description:" -msgstr "Beskrivelse:" +#: ../calendar/gui/print.c:515 +msgid "8th" +msgstr "8." -#: ../calendar/gui/e-cal-component-memo-preview.c:218 -#: ../calendar/gui/e-cal-component-preview.c:309 -msgid "Web Page:" -msgstr "Hjemmeside:" +#: ../calendar/gui/print.c:515 +msgid "9th" +msgstr "9." -#: ../calendar/gui/e-cal-component-preview.c:204 -#: ../calendar/gui/e-itip-control.c:1157 -#: ../calendar/gui/e-itip-control.glade.h:9 -msgid "Summary:" -msgstr "Sammendrag:" +#: ../calendar/gui/print.c:515 +msgid "10th" +msgstr "10." -#: ../calendar/gui/e-cal-component-preview.c:233 -msgid "Due Date:" -msgstr "Forfaldsdato:" +#: ../calendar/gui/print.c:516 +msgid "11th" +msgstr "11." -#. write status -#. Status -#: ../calendar/gui/e-cal-component-preview.c:240 -#: ../calendar/gui/e-itip-control.c:1181 -#: ../plugins/exchange-operations/exchange-account-setup.c:284 -#: ../plugins/itip-formatter/itip-view.c:1052 -msgid "Status:" -msgstr "Status:" +#: ../calendar/gui/print.c:516 +msgid "12th" +msgstr "12." -#: ../calendar/gui/e-cal-component-preview.c:264 -msgid "Priority:" -msgstr "Prioritet:" +#: ../calendar/gui/print.c:516 +msgid "13th" +msgstr "13." -#: ../calendar/gui/e-cal-list-view.etspec.h:2 -msgid "End Date" -msgstr "Slutdato" +#: ../calendar/gui/print.c:516 +msgid "14th" +msgstr "14." -#: ../calendar/gui/e-cal-list-view.etspec.h:4 -#: ../calendar/gui/e-memo-table.etspec.h:3 -msgid "Start Date" -msgstr "Startdato" +#: ../calendar/gui/print.c:516 +msgid "15th" +msgstr "15." -#: ../calendar/gui/e-cal-model-calendar.c:187 -#: ../calendar/gui/e-calendar-table.c:629 -msgid "Free" -msgstr "Ledig" +#: ../calendar/gui/print.c:517 +msgid "16th" +msgstr "16." -#: ../calendar/gui/e-cal-model-calendar.c:190 -#: ../calendar/gui/e-calendar-table.c:630 -#: ../calendar/gui/e-meeting-time-sel.c:399 -msgid "Busy" -msgstr "Optaget" +#: ../calendar/gui/print.c:517 +msgid "17th" +msgstr "17." -#: ../calendar/gui/e-cal-model-tasks.c:627 -msgid "" -"The geographical position must be entered in the format: \n" -"\n" -"45.436845,125.862501" -msgstr "" -"Den geografiske position skal angives i formatet: \n" -"\n" -"45.436845,125.862501" +#: ../calendar/gui/print.c:517 +msgid "18th" +msgstr "18." -#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012 -#: ../calendar/gui/e-meeting-list-view.c:190 -#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162 -#: ../calendar/gui/e-meeting-store.c:745 -#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5 -msgid "Yes" -msgstr "Ja" +#: ../calendar/gui/print.c:517 +msgid "19th" +msgstr "19." -#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012 -#: ../calendar/gui/e-meeting-list-view.c:191 -#: ../calendar/gui/e-meeting-store.c:164 -#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2 -msgid "No" -msgstr "Nej" +#: ../calendar/gui/print.c:517 +msgid "20th" +msgstr "20." -#. This is the default filename used for temporary file creation -#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106 -#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178 -#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338 -#: ../calendar/gui/e-meeting-list-view.c:166 -#: ../calendar/gui/e-meeting-list-view.c:180 -#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145 -#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984 -#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342 -#: ../plugins/itip-formatter/itip-formatter.c:447 -#: ../plugins/itip-formatter/itip-formatter.c:2204 -#: ../plugins/plugin-manager/plugin-manager.c:89 -#: ../widgets/misc/e-attachment-bar.c:821 -#: ../widgets/misc/e-charset-picker.c:56 -msgid "Unknown" -msgstr "Ukendt" +#: ../calendar/gui/print.c:518 +msgid "21st" +msgstr "21." -#: ../calendar/gui/e-cal-model.c:1008 -msgid "Recurring" -msgstr "Tilbagevendende" +#: ../calendar/gui/print.c:518 +msgid "22nd" +msgstr "22." -#: ../calendar/gui/e-cal-model.c:1010 -msgid "Assigned" -msgstr "Tildelt" +#: ../calendar/gui/print.c:518 +msgid "23rd" +msgstr "23." -#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414 -msgid "Save As..." -msgstr "Gem som..." +#: ../calendar/gui/print.c:518 +msgid "24th" +msgstr "24." -#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217 -msgid "Select folder to save selected attachments..." -msgstr "Vælg mappen hvor de valgte bilag skal gemmes..." +#: ../calendar/gui/print.c:518 +msgid "25th" +msgstr "25." -#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442 -#, c-format -msgid "untitled_image.%s" -msgstr "billede_uden_titel.%s" +#: ../calendar/gui/print.c:519 +msgid "26th" +msgstr "26." -#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1589 -#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:924 -#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570 -msgid "_Save As..." -msgstr "Gem _som..." +#: ../calendar/gui/print.c:519 +msgid "27th" +msgstr "27." -#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560 -#: ../mail/em-popup.c:571 -msgid "Set as _Background" -msgstr "Vælg som _baggrund" +#: ../calendar/gui/print.c:519 +msgid "28th" +msgstr "28." -#: ../calendar/gui/e-cal-popup.c:288 -msgid "_Save Selected" -msgstr "Gem _valgte" +#: ../calendar/gui/print.c:519 +msgid "29th" +msgstr "29." -#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828 -#, c-format -msgid "Open in %s..." -msgstr "Åbn i %s..." +#: ../calendar/gui/print.c:519 +msgid "30th" +msgstr "30." -#: ../calendar/gui/e-calendar-table.c:337 -msgid "* No Summary *" -msgstr "* Intet sammendrag *" +#: ../calendar/gui/print.c:520 +msgid "31st" +msgstr "31." -#. To Translators: It will display "Organiser: NameOfTheUser " -#: ../calendar/gui/e-calendar-table.c:373 -#: ../calendar/gui/e-calendar-view.c:2399 -#, c-format -msgid "Organizer: %s <%s>" -msgstr "Organisator: %s <%s>" +#: ../calendar/gui/print.c:596 +msgid "Su" +msgstr "Søn" -#. With SunOne accounts, there may be no ':' in organiser.value -#. With SunOne accouts, there may be no ':' in organiser.value -#: ../calendar/gui/e-calendar-table.c:376 -#: ../calendar/gui/e-calendar-view.c:2403 -#, c-format -msgid "Organizer: %s" -msgstr "Organisator: %s" +#: ../calendar/gui/print.c:596 +msgid "Mo" +msgstr "Man" -#: ../calendar/gui/e-calendar-table.c:407 -msgid "Start: " -msgstr "Start: " +#: ../calendar/gui/print.c:596 +msgid "Tu" +msgstr "Tir" -#: ../calendar/gui/e-calendar-table.c:419 -msgid "Due: " -msgstr "Forfalder: " +#: ../calendar/gui/print.c:596 +msgid "We" +msgstr "Ons" -#: ../calendar/gui/e-calendar-table.c:599 -msgid "0%" -msgstr "0%" +#: ../calendar/gui/print.c:597 +msgid "Th" +msgstr "Tor" -#: ../calendar/gui/e-calendar-table.c:600 -msgid "10%" -msgstr "10%" +#: ../calendar/gui/print.c:597 +msgid "Fr" +msgstr "Fre" -#: ../calendar/gui/e-calendar-table.c:601 -msgid "20%" -msgstr "20%" +#: ../calendar/gui/print.c:597 +msgid "Sa" +msgstr "Lør" -#: ../calendar/gui/e-calendar-table.c:602 -msgid "30%" -msgstr "30%" +#: ../calendar/gui/print.c:2488 +msgid "Appointment" +msgstr "Aftale" -#: ../calendar/gui/e-calendar-table.c:603 -msgid "40%" -msgstr "40%" +#: ../calendar/gui/print.c:2490 +msgid "Task" +msgstr "Opgave" -#: ../calendar/gui/e-calendar-table.c:604 -msgid "50%" -msgstr "50%" +#: ../calendar/gui/print.c:2515 +#, c-format +msgid "Summary: %s" +msgstr "Sammendrag: %s" -#: ../calendar/gui/e-calendar-table.c:605 -msgid "60%" -msgstr "60%" +#: ../calendar/gui/print.c:2538 +msgid "Attendees: " +msgstr "Deltagere: " -#: ../calendar/gui/e-calendar-table.c:606 -msgid "70%" -msgstr "70%" +#: ../calendar/gui/print.c:2578 +#, c-format +msgid "Status: %s" +msgstr "Status: %s" -#: ../calendar/gui/e-calendar-table.c:607 -msgid "80%" -msgstr "80%" +#: ../calendar/gui/print.c:2594 +#, c-format +msgid "Priority: %s" +msgstr "Prioritet: %s" -#: ../calendar/gui/e-calendar-table.c:608 -msgid "90%" -msgstr "90%" +#: ../calendar/gui/print.c:2609 +#, c-format +msgid "Percent Complete: %i" +msgstr "Fuldført i procent: %i" -#: ../calendar/gui/e-calendar-table.c:609 -msgid "100%" -msgstr "100%" +#: ../calendar/gui/print.c:2621 +#, c-format +msgid "URL: %s" +msgstr "Adresse: %s" -#: ../calendar/gui/e-calendar-table.c:889 -#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437 -msgid "Deleting selected objects" -msgstr "Sletter de valgte objekter" +#: ../calendar/gui/print.c:2634 +#, c-format +msgid "Categories: %s" +msgstr "Kategorier: %s" -#: ../calendar/gui/e-calendar-table.c:1172 -#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:642 -msgid "Updating objects" -msgstr "Opdaterer objekter" +#: ../calendar/gui/print.c:2645 +msgid "Contacts: " +msgstr "Kontaktpersoner: " -#: ../calendar/gui/e-calendar-table.c:1360 -#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:818 -#: ../composer/e-composer-actions.c:275 -msgid "Save as..." -msgstr "Gem som..." +#: ../calendar/gui/tasks-component.c:471 +msgid "_New Task List" +msgstr "_Ny opgaveliste" -#: ../calendar/gui/e-calendar-table.c:1584 -#: ../calendar/gui/e-calendar-view.c:1758 -msgid "New _Task" -msgstr "_Ny opgave" +#: ../calendar/gui/tasks-component.c:554 +#, c-format +msgid "%d task" +msgid_plural "%d tasks" +msgstr[0] "%d opgave" +msgstr[1] "%d opgaver" -#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:923 -msgid "Open _Web Page" -msgstr "Åbn _hjemmeside" +#: ../calendar/gui/tasks-component.c:603 +msgid "Failed upgrading tasks." +msgstr "Opgradering af opgaver mislykkedes." -#: ../calendar/gui/e-calendar-table.c:1590 -#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:925 -msgid "P_rint..." -msgstr "Ud_skriv..." +#: ../calendar/gui/tasks-component.c:736 +#, c-format +msgid "Unable to open the task list '%s' for creating events and meetings" +msgstr "" +"Kan ikke åbne opgavelisten \"%s\" for oprettelse af begivenheder og møder" -#: ../calendar/gui/e-calendar-table.c:1594 -#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:929 -#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1 -#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1 -msgid "C_ut" -msgstr "Klip _ud" +#: ../calendar/gui/tasks-component.c:749 +msgid "There is no calendar available for creating tasks" +msgstr "Ingen kalender tilgængelig for oprettelse af opgaver" -#: ../calendar/gui/e-calendar-table.c:1596 -#: ../calendar/gui/e-calendar-view.c:1764 -#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:931 -#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46 -#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28 -msgid "_Paste" -msgstr "_Indsæt" +#: ../calendar/gui/tasks-component.c:860 +msgid "Task Source Selector" +msgstr "Opgavekilde-vælger" -#: ../calendar/gui/e-calendar-table.c:1600 ../ui/evolution-tasks.xml.h:22 -msgid "_Assign Task" -msgstr "_Tildel opgave" +#: ../calendar/gui/tasks-component.c:1114 +msgid "New task" +msgstr "Ny opgave" -#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:935 -#: ../ui/evolution-tasks.xml.h:26 -msgid "_Forward as iCalendar" -msgstr "_Videresend som iCalendar" +#: ../calendar/gui/tasks-component.c:1115 +msgctxt "New" +msgid "_Task" +msgstr "_Opgave" -#: ../calendar/gui/e-calendar-table.c:1602 -msgid "_Mark as Complete" -msgstr "_Markér som fuldført" +#: ../calendar/gui/tasks-component.c:1116 +msgid "Create a new task" +msgstr "Opret en ny opgave" -#: ../calendar/gui/e-calendar-table.c:1603 -msgid "_Mark Selected Tasks as Complete" -msgstr "_Markér valgte opgaver som fuldførte" +#: ../calendar/gui/tasks-component.c:1122 +msgid "New assigned task" +msgstr "Ny tildelt opgave" -#: ../calendar/gui/e-calendar-table.c:1604 -msgid "_Mark as Incomplete" -msgstr "_Markér som ikke-fuldført" +#: ../calendar/gui/tasks-component.c:1123 +msgctxt "New" +msgid "Assigne_d Task" +msgstr "_Tildelt opgave" -#: ../calendar/gui/e-calendar-table.c:1605 -msgid "_Mark Selected Tasks as Incomplete" -msgstr "_Markér valgte opgaver som ikke-fuldførte" +#: ../calendar/gui/tasks-component.c:1124 +msgid "Create a new assigned task" +msgstr "Opret en ny tildelt opgave" -#: ../calendar/gui/e-calendar-table.c:1610 -msgid "_Delete Selected Tasks" -msgstr "Sle_t valgte opgaver" +#: ../calendar/gui/tasks-component.c:1130 +msgid "New task list" +msgstr "Ny opgaveliste" -#: ../calendar/gui/e-calendar-table.c:1847 -#: ../calendar/gui/e-calendar-table.etspec.h:4 -msgid "Click to add a task" -msgstr "Klik for at tilføje en opgave" +#: ../calendar/gui/tasks-component.c:1131 +msgctxt "New" +msgid "Tas_k list" +msgstr "_Opgaveliste" -#: ../calendar/gui/e-calendar-table.etspec.h:2 -#, no-c-format -msgid "% Complete" -msgstr "% fuldført" +#: ../calendar/gui/tasks-component.c:1132 +msgid "Create a new task list" +msgstr "Opret en ny opgaveliste" -#: ../calendar/gui/e-calendar-table.etspec.h:5 -msgid "Complete" -msgstr "Fuldført" +#: ../calendar/gui/tasks-control.c:488 +msgid "" +"This operation will permanently erase all tasks marked as completed. If you " +"continue, you will not be able to recover these tasks.\n" +"\n" +"Really erase these tasks?" +msgstr "" +"Denne handling vil permanent fjerne alle opgaver der er markeret som " +"fuldførte. Hvis du fortsætter, vil du ikke længere kunne tilvejebringe disse " +"opgaver.\n" +"\n" +"Vil du virkelig fjerne disse opgaver?" -#: ../calendar/gui/e-calendar-table.etspec.h:6 -msgid "Completion date" -msgstr "Fuldførelsesdato" +#: ../calendar/gui/tasks-control.c:491 ../mail/em-folder-view.c:1127 +msgid "Do not ask me again." +msgstr "Spørg mig ikke igen." -#: ../calendar/gui/e-calendar-table.etspec.h:7 -msgid "Due date" -msgstr "Forfaldsdato" +#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544 +msgid "Print Tasks" +msgstr "Udskriv opgaver" -#: ../calendar/gui/e-calendar-table.etspec.h:8 -#: ../calendar/gui/tasktypes.xml.h:20 -#: ../plugins/save-calendar/csv-format.c:373 -msgid "Priority" -msgstr "Prioritet" +#: ../calendar/gui/tasktypes.xml.h:2 +#, no-c-format +msgid "% Completed" +msgstr "% fuldført" -#: ../calendar/gui/e-calendar-table.etspec.h:9 -msgid "Start date" -msgstr "Startdato" +#: ../calendar/gui/tasktypes.xml.h:7 +msgid "Cancelled" +msgstr "Afbrudt" -#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form: -#. Status: Accepted: X Declined: Y ... -#: ../calendar/gui/e-calendar-table.etspec.h:10 -#: ../calendar/gui/e-calendar-view.c:2307 -#: ../calendar/gui/e-meeting-list-view.c:602 -#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 -#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70 -#: ../mail/message-list.etspec.h:17 -msgid "Status" -msgstr "Status" +#: ../calendar/gui/tasktypes.xml.h:15 +msgid "In progress" +msgstr "I gang" -#: ../calendar/gui/e-calendar-view.c:1444 -msgid "Moving items" -msgstr "Flytter elementer" +#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35 +msgid "is greater than" +msgstr "er større end" -#: ../calendar/gui/e-calendar-view.c:1446 -msgid "Copying items" -msgstr "Kopierer elementer" +#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36 +msgid "is less than" +msgstr "er mindre end" -#: ../calendar/gui/e-calendar-view.c:1755 -msgid "New _Appointment..." -msgstr "Ny _aftale..." +#: ../calendar/importers/icalendar-importer.c:75 +msgid "Appointments and Meetings" +msgstr "Aftaler og møder" -#: ../calendar/gui/e-calendar-view.c:1756 -msgid "New All Day _Event" -msgstr "Ny aftale som varer h_ele dagen" +#: ../calendar/importers/icalendar-importer.c:335 +#: ../calendar/importers/icalendar-importer.c:630 +#: ../plugins/itip-formatter/itip-formatter.c:1729 +msgid "Opening calendar" +msgstr "Åbner kalender" -#: ../calendar/gui/e-calendar-view.c:1757 -msgid "New _Meeting" -msgstr "_Nyt møde" +#: ../calendar/importers/icalendar-importer.c:442 +msgid "iCalendar files (.ics)" +msgstr "iCalendar-filer (.ics)" -#. FIXME: hook in this somehow -#: ../calendar/gui/e-calendar-view.c:1768 -msgid "_Current View" -msgstr "_Aktuel oversigt" +#: ../calendar/importers/icalendar-importer.c:443 +msgid "Evolution iCalendar importer" +msgstr "Evolution iCalendar-importør" -#: ../calendar/gui/e-calendar-view.c:1770 -msgid "Select T_oday" -msgstr "Vælg _dagen i dag" +#: ../calendar/importers/icalendar-importer.c:531 +msgid "Reminder!" +msgstr "Påmindelse!" -#: ../calendar/gui/e-calendar-view.c:1771 -msgid "_Select Date..." -msgstr "_Vælg dato..." +#: ../calendar/importers/icalendar-importer.c:583 +msgid "vCalendar files (.vcf)" +msgstr "vCalendar-filer (.vcf)" -#: ../calendar/gui/e-calendar-view.c:1777 -msgid "Pri_nt..." -msgstr "Ud_skriv..." +#: ../calendar/importers/icalendar-importer.c:584 +msgid "Evolution vCalendar importer" +msgstr "Evolution vCalendar-importør" -#: ../calendar/gui/e-calendar-view.c:1787 -msgid "Cop_y to Calendar..." -msgstr "_Kopiér til kalender..." +#: ../calendar/importers/icalendar-importer.c:746 +msgid "Calendar Events" +msgstr "Kalenderbegivenheder" -#: ../calendar/gui/e-calendar-view.c:1788 -msgid "Mo_ve to Calendar..." -msgstr "Fl_yt til kalender..." +#: ../calendar/importers/icalendar-importer.c:783 +msgid "Evolution Calendar intelligent importer" +msgstr "Evolution intelligent kalender-importør" -#: ../calendar/gui/e-calendar-view.c:1789 -msgid "_Delegate Meeting..." -msgstr "Udde_legér møde..." +#. +#. * +#. * This program is free software; you can redistribute it and/or +#. * modify it under the terms of the GNU Lesser General Public +#. * License as published by the Free Software Foundation; either +#. * version 2 of the License, or (at your option) version 3. +#. * +#. * This program is distributed in the hope that it will be useful, +#. * but WITHOUT ANY WARRANTY; without even the implied warranty of +#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +#. * Lesser General Public License for more details. +#. * +#. * You should have received a copy of the GNU Lesser General Public +#. * License along with the program; if not, see +#. * +#. * +#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +#. * +#. +#. +#. * These are the timezone names from the Olson timezone data. +#. * We only place them here so gettext picks them up for translation. +#. * Don't include in any C files. +#. +#: ../calendar/zones.h:26 +msgid "Africa/Abidjan" +msgstr "Afrika/Abidjan" -#: ../calendar/gui/e-calendar-view.c:1790 -msgid "_Schedule Meeting..." -msgstr "_Planlæg møde..." +#: ../calendar/zones.h:27 +msgid "Africa/Accra" +msgstr "Afrika/Akkra" -#: ../calendar/gui/e-calendar-view.c:1791 -msgid "_Forward as iCalendar..." -msgstr "_Videresend som iCalendar..." +#: ../calendar/zones.h:28 +msgid "Africa/Addis_Ababa" +msgstr "Afrika/Addis_Abeba" -#: ../calendar/gui/e-calendar-view.c:1792 -msgid "_Reply" -msgstr "_Svar" +#: ../calendar/zones.h:29 +msgid "Africa/Algiers" +msgstr "Afrika/Algier" -#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1332 -#: ../mail/em-popup.c:564 ../mail/em-popup.c:575 -#: ../ui/evolution-mail-message.xml.h:82 -msgid "Reply to _All" -msgstr "Svar til _alle" +#: ../calendar/zones.h:30 +msgid "Africa/Asmera" +msgstr "Afrika/Asmera" -#: ../calendar/gui/e-calendar-view.c:1798 -msgid "Make this Occurrence _Movable" -msgstr "Gør denne hændelse _flytbar" +#: ../calendar/zones.h:31 +msgid "Africa/Bamako" +msgstr "Afrika/Bamako" -#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9 -msgid "Delete this _Occurrence" -msgstr "Slet denne _hændelse" +#: ../calendar/zones.h:32 +msgid "Africa/Bangui" +msgstr "Afrika/Bangui" -#: ../calendar/gui/e-calendar-view.c:1800 -msgid "Delete _All Occurrences" -msgstr "Slet _alle forekomster" +#: ../calendar/zones.h:33 +msgid "Africa/Banjul" +msgstr "Afrika/Banjul" -#: ../calendar/gui/e-calendar-view.c:2254 -#: ../calendar/gui/e-itip-control.c:1186 -#: ../calendar/gui/e-meeting-list-view.c:202 -#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195 -#: ../plugins/itip-formatter/itip-formatter.c:2192 -msgid "Accepted" -msgstr "Accepteret" +#: ../calendar/zones.h:34 +msgid "Africa/Bissau" +msgstr "Afrika/Bissau" -#: ../calendar/gui/e-calendar-view.c:2255 -#: ../calendar/gui/e-itip-control.c:1194 -#: ../calendar/gui/e-meeting-list-view.c:203 -#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197 -#: ../plugins/itip-formatter/itip-formatter.c:2198 -msgid "Declined" -msgstr "Afslået" +#: ../calendar/zones.h:35 +msgid "Africa/Blantyre" +msgstr "Afrika/Blantyre" -#: ../calendar/gui/e-calendar-view.c:2256 -#: ../calendar/gui/e-meeting-list-view.c:204 -#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199 -#: ../calendar/gui/e-meeting-time-sel.c:398 -msgid "Tentative" -msgstr "Forsøgsvis" +#: ../calendar/zones.h:36 +msgid "Africa/Brazzaville" +msgstr "Afrika/Brazzaville" -#: ../calendar/gui/e-calendar-view.c:2257 -#: ../calendar/gui/e-meeting-list-view.c:205 -#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201 -#: ../plugins/itip-formatter/itip-formatter.c:2201 -msgid "Delegated" -msgstr "Uddelegeret" +#: ../calendar/zones.h:37 +msgid "Africa/Bujumbura" +msgstr "Afrika/Bujumbura" -#: ../calendar/gui/e-calendar-view.c:2258 -msgid "Needs action" -msgstr "Kræver handling" +#: ../calendar/zones.h:38 +msgid "Africa/Cairo" +msgstr "Afrika/Kairo" -#. To Translators: It will display "Location: PlaceOfTheMeeting" -#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517 -#, c-format -msgid "Location: %s" -msgstr "Sted: %s" +#: ../calendar/zones.h:39 +msgid "Africa/Casablanca" +msgstr "Afrika/Casablanca" -#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)" -#: ../calendar/gui/e-calendar-view.c:2453 -#, c-format -msgid "Time: %s %s" -msgstr "Tid: %s %s" +#: ../calendar/zones.h:40 +msgid "Africa/Ceuta" +msgstr "Afrika/Ceuta" -#. strftime format of a weekday, a date and a time, 24-hour. -#: ../calendar/gui/e-cell-date-edit-text.c:109 -msgid "%a %m/%d/%Y %H:%M:%S" -msgstr "%a %Y-%m-%d %H:%M:%S" +#: ../calendar/zones.h:41 +msgid "Africa/Conakry" +msgstr "Afrika/Conakry" -#. strftime format of a weekday, a date and a time, 12-hour. -#: ../calendar/gui/e-cell-date-edit-text.c:112 -msgid "%a %m/%d/%Y %I:%M:%S %p" -msgstr "%a %d/%m-%Y %H:%M:%S" +#: ../calendar/zones.h:42 +msgid "Africa/Dakar" +msgstr "Afrika/Dakar" -#: ../calendar/gui/e-cell-date-edit-text.c:120 -#, c-format -msgid "" -"The date must be entered in the format: \n" -"%s" -msgstr "" -"Datoen skal angives i formatet: \n" -"%s" +#: ../calendar/zones.h:43 +msgid "Africa/Dar_es_Salaam" +msgstr "Afrika/Dar_es_salaam" -#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry -#. * to change the length of the time division in the calendar day view, e.g. -#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions" -#. -#: ../calendar/gui/e-day-view-time-item.c:750 -#, c-format -msgid "%02i minute divisions" -msgstr "%02i minutters inddeling" +#: ../calendar/zones.h:44 +msgid "Africa/Djibouti" +msgstr "Afrika/Djibouti" -#: ../calendar/gui/e-day-view-time-item.c:771 -msgid "Show the second time zone" -msgstr "Vis den sekundære tidszone" +#: ../calendar/zones.h:45 +msgid "Africa/Douala" +msgstr "Afrika/Douala" -#. strftime format %A = full weekday name, %d = day of month, -#. %B = full month name. Don't use any other specifiers. -#. strftime format %A = full weekday name, %d = day of -#. month, %B = full month name. You can change the -#. order but don't change the specifiers or add -#. anything. -#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1582 -#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678 -msgid "%A %d %B" -msgstr "%A %d %B" +#: ../calendar/zones.h:46 +msgid "Africa/El_Aaiun" +msgstr "Afrika/El_Aaiun" -#. String to use in 12-hour time format for times in the morning. -#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541 -#: ../calendar/gui/print.c:828 -msgid "am" -msgstr "am" +#: ../calendar/zones.h:47 +msgid "Africa/Freetown" +msgstr "Afrika/Freetown" -#. String to use in 12-hour time format for times in the afternoon. -#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544 -#: ../calendar/gui/print.c:830 -msgid "pm" -msgstr "pm" +#: ../calendar/zones.h:48 +msgid "Africa/Gaborone" +msgstr "Afrika/Gaborone" -#. To Translators: the %d stands for a week number, it's value between 1 and 52/53 -#: ../calendar/gui/e-day-view.c:2320 -#, c-format -msgid "Week %d" -msgstr "Uge %d" +#: ../calendar/zones.h:49 +msgid "Africa/Harare" +msgstr "Afrika/Harare" -#: ../calendar/gui/e-itip-control.c:760 -msgid "Yes. (Complex Recurrence)" -msgstr "Ja. (Kompleks tilbagevenden)" +#: ../calendar/zones.h:50 +msgid "Africa/Johannesburg" +msgstr "Afrika/Johannesburg" -#: ../calendar/gui/e-itip-control.c:777 -#, c-format -msgid "Every day" -msgid_plural "Every %d days" -msgstr[0] "Hver dag" -msgstr[1] "Hver %d dage" +#: ../calendar/zones.h:51 +msgid "Africa/Kampala" +msgstr "Afrika/Kampala" -#: ../calendar/gui/e-itip-control.c:790 -#, c-format -msgid "Every week" -msgid_plural "Every %d weeks" -msgstr[0] "Hver uge" -msgstr[1] "Hver %d uger" +#: ../calendar/zones.h:52 +msgid "Africa/Khartoum" +msgstr "Afrika/Khartoum" -#: ../calendar/gui/e-itip-control.c:797 -#, c-format -msgid "Every week on " -msgid_plural "Every %d weeks on " -msgstr[0] "Hver uge på " -msgstr[1] "Hver %d uger på " +#: ../calendar/zones.h:53 +msgid "Africa/Kigali" +msgstr "Afrika/Kigali" -#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)' -#: ../calendar/gui/e-itip-control.c:808 -msgid " and " -msgstr " og " +#: ../calendar/zones.h:54 +msgid "Africa/Kinshasa" +msgstr "Afrika/Kinshasa" -#: ../calendar/gui/e-itip-control.c:817 -#, c-format -msgid "The %s day of " -msgstr "Den %s. dag af " +#: ../calendar/zones.h:55 +msgid "Africa/Lagos" +msgstr "Afrika/Lagos" -#: ../calendar/gui/e-itip-control.c:833 -#, c-format -msgid "The %s %s of " -msgstr "Den %s %s af " +#: ../calendar/zones.h:56 +msgid "Africa/Libreville" +msgstr "Afrika/Libreville" -#: ../calendar/gui/e-itip-control.c:844 -#, c-format -msgid "every month" -msgid_plural "every %d months" -msgstr[0] "hver måned" -msgstr[1] "hver %d måneder" +#: ../calendar/zones.h:57 +msgid "Africa/Lome" +msgstr "Afrika/Lome" -#: ../calendar/gui/e-itip-control.c:856 -#, c-format -msgid "Every year" -msgid_plural "Every %d years" -msgstr[0] "Hvert år" -msgstr[1] "Hver %d år" +#: ../calendar/zones.h:58 +msgid "Africa/Luanda" +msgstr "Afrika/Luanda" -#: ../calendar/gui/e-itip-control.c:869 -#, c-format -msgid "a total of %d time" -msgid_plural "a total of %d times" -msgstr[0] "i alt %d gang" -msgstr[1] " i alt %d gange" +#: ../calendar/zones.h:59 +msgid "Africa/Lubumbashi" +msgstr "Afrika/Lubumbashi" -#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).' -#: ../calendar/gui/e-itip-control.c:880 -msgid ", ending on " -msgstr ", sluttende på " +#: ../calendar/zones.h:60 +msgid "Africa/Lusaka" +msgstr "Afrika/Lusaka" -#. For Translators : 'starts' is starts:date implying a task starts on what date -#: ../calendar/gui/e-itip-control.c:902 -msgid "Starts" -msgstr "Starter" +#: ../calendar/zones.h:61 +msgid "Africa/Malabo" +msgstr "Afrika/Malabo" -#. For Translators : 'ends' is ends:date implying a task ends on what date -#: ../calendar/gui/e-itip-control.c:916 -msgid "Ends" -msgstr "Ender" +#: ../calendar/zones.h:62 +msgid "Africa/Maputo" +msgstr "Afrika/Maputo" -#: ../calendar/gui/e-itip-control.c:956 -#: ../plugins/save-calendar/csv-format.c:371 -msgid "Due" -msgstr "Forfalder" +#: ../calendar/zones.h:63 +msgid "Africa/Maseru" +msgstr "Afrika/Maseru" -#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055 -msgid "iCalendar Information" -msgstr "iCalendar-information" +#: ../calendar/zones.h:64 +msgid "Africa/Mbabane" +msgstr "Afrika/Mbabane" -#. Title -#: ../calendar/gui/e-itip-control.c:1015 -msgid "iCalendar Error" -msgstr "iCalendar-fejl" +#: ../calendar/zones.h:65 +msgid "Africa/Mogadishu" +msgstr "Afrika/Mogadishu" -#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103 -#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131 -#: ../plugins/itip-formatter/itip-view.c:346 -#: ../plugins/itip-formatter/itip-view.c:347 -#: ../plugins/itip-formatter/itip-view.c:434 -#: ../plugins/itip-formatter/itip-view.c:435 -#: ../plugins/itip-formatter/itip-view.c:522 -#: ../plugins/itip-formatter/itip-view.c:523 -msgid "An unknown person" -msgstr "En ukendt person" +#: ../calendar/zones.h:66 +msgid "Africa/Monrovia" +msgstr "Afrika/Monrovia" -#. Describe what the user can do -#: ../calendar/gui/e-itip-control.c:1138 -msgid "" -"
Please review the following information, and then select an action from " -"the menu below." -msgstr "" -"
Kontrollér venligst følgende information og vælg så en handling fra " -"menuen nedenfor." +#: ../calendar/zones.h:67 +msgid "Africa/Nairobi" +msgstr "Afrika/Nairobi" -#: ../calendar/gui/e-itip-control.c:1190 -#: ../plugins/itip-formatter/itip-formatter.c:2195 -msgid "Tentatively Accepted" -msgstr "Forsøgsvist godtaget" +#: ../calendar/zones.h:68 +msgid "Africa/Ndjamena" +msgstr "Afrika/Ndjamena" -#: ../calendar/gui/e-itip-control.c:1278 -msgid "" -"The meeting has been canceled, however it could not be found in your " -"calendars" -msgstr "Mødet er blevet aflyst, men det blev ikke fundet i dine kalendere" +#: ../calendar/zones.h:69 +msgid "Africa/Niamey" +msgstr "Afrika/Niamey" -#: ../calendar/gui/e-itip-control.c:1280 -msgid "" -"The task has been canceled, however it could not be found in your task lists" -msgstr "Opgaven er blevet aflyst, men den blev ikke fundet i dine opgavelister" +#: ../calendar/zones.h:70 +msgid "Africa/Nouakchott" +msgstr "Afrika/Nouakchott" -#: ../calendar/gui/e-itip-control.c:1358 -#, c-format -msgid "%s has published meeting information." -msgstr "%s har offentliggjort mødeoplysning." +#: ../calendar/zones.h:71 +msgid "Africa/Ouagadougou" +msgstr "Afrika/Ouagadougou" -#: ../calendar/gui/e-itip-control.c:1359 -msgid "Meeting Information" -msgstr "Mødeinformation" +#: ../calendar/zones.h:72 +msgid "Africa/Porto-Novo" +msgstr "Afrika/Porto-Novo" -#: ../calendar/gui/e-itip-control.c:1365 -#, c-format -msgid "%s requests the presence of %s at a meeting." -msgstr "%s ønsker at %s er til stede ved et møde." +#: ../calendar/zones.h:73 +msgid "Africa/Sao_Tome" +msgstr "Afrika/Sao_Tome" -#: ../calendar/gui/e-itip-control.c:1367 -#, c-format -msgid "%s requests your presence at a meeting." -msgstr "%s beder om din tilstedeværelse i et møde." +#: ../calendar/zones.h:74 +msgid "Africa/Timbuktu" +msgstr "Afrika/Timbuktu" -#: ../calendar/gui/e-itip-control.c:1368 -msgid "Meeting Proposal" -msgstr "Mødeforslag" +#: ../calendar/zones.h:75 +msgid "Africa/Tripoli" +msgstr "Afrika/Tripoli" -#. FIXME Whats going on here? -#: ../calendar/gui/e-itip-control.c:1374 -#, c-format -msgid "%s wishes to be added to an existing meeting." -msgstr "%s ønsker at blive tilføjet til et eksisterende møde." +#: ../calendar/zones.h:76 +msgid "Africa/Tunis" +msgstr "Afrika/Tunis" -#: ../calendar/gui/e-itip-control.c:1375 -msgid "Meeting Update" -msgstr "Mødeopdatering" +#: ../calendar/zones.h:77 +msgid "Africa/Windhoek" +msgstr "Afrika/Windhoek" -#: ../calendar/gui/e-itip-control.c:1379 -#, c-format -msgid "%s wishes to receive the latest meeting information." -msgstr "%s ønsker at modtage seneste mødeinformation." +#: ../calendar/zones.h:78 +msgid "America/Adak" +msgstr "Amerika/Adak" -#: ../calendar/gui/e-itip-control.c:1380 -msgid "Meeting Update Request" -msgstr "Anmodning om mødeopdatering" +#: ../calendar/zones.h:79 +msgid "America/Anchorage" +msgstr "Amerika/Anchorage" -#: ../calendar/gui/e-itip-control.c:1387 -#, c-format -msgid "%s has replied to a meeting request." -msgstr "%s har svaret på en mødeforespørgsel." +#: ../calendar/zones.h:80 +msgid "America/Anguilla" +msgstr "Amerika/Anguilla" -#: ../calendar/gui/e-itip-control.c:1388 -msgid "Meeting Reply" -msgstr "Mødesvar" +#: ../calendar/zones.h:81 +msgid "America/Antigua" +msgstr "Amerika/Antigua" -#: ../calendar/gui/e-itip-control.c:1395 -#, c-format -msgid "%s has canceled a meeting." -msgstr "%s har aflyst et møde." +#: ../calendar/zones.h:82 +msgid "America/Araguaina" +msgstr "Amerika/Araguaina" -#: ../calendar/gui/e-itip-control.c:1396 -msgid "Meeting Cancelation" -msgstr "Mødeaflysing" +#: ../calendar/zones.h:83 +msgid "America/Aruba" +msgstr "Amerika/Aruba" -#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483 -#: ../calendar/gui/e-itip-control.c:1523 -#, c-format -msgid "%s has sent an unintelligible message." -msgstr "%s har sendt en uforståelig besked." +#: ../calendar/zones.h:84 +msgid "America/Asuncion" +msgstr "Amerika/Asuncion" -#: ../calendar/gui/e-itip-control.c:1407 -msgid "Bad Meeting Message" -msgstr "Ugyldig mødebesked" +#: ../calendar/zones.h:85 +msgid "America/Barbados" +msgstr "Amerika/Barbados" -#: ../calendar/gui/e-itip-control.c:1434 -#, c-format -msgid "%s has published task information." -msgstr "%s har offentliggjort information om en opgave." +#: ../calendar/zones.h:86 +msgid "America/Belem" +msgstr "Amerika/Belem" -#: ../calendar/gui/e-itip-control.c:1435 -msgid "Task Information" -msgstr "Opgaveinformation" +#: ../calendar/zones.h:87 +msgid "America/Belize" +msgstr "Amerika/Belize" -#: ../calendar/gui/e-itip-control.c:1442 -#, c-format -msgid "%s requests %s to perform a task." -msgstr "%s ønsker at %s udfører en opgave." +#: ../calendar/zones.h:88 +msgid "America/Boa_Vista" +msgstr "Amerika/Boa_Vista" -#: ../calendar/gui/e-itip-control.c:1444 -#, c-format -msgid "%s requests you perform a task." -msgstr "%s anmoder om at du udfører en opgave." +#: ../calendar/zones.h:89 +msgid "America/Bogota" +msgstr "Amerika/Bogota" -#: ../calendar/gui/e-itip-control.c:1445 -msgid "Task Proposal" -msgstr "Forslag om opgave" +#: ../calendar/zones.h:90 +msgid "America/Boise" +msgstr "Amerika/Boise" -#. FIXME Whats going on here? -#: ../calendar/gui/e-itip-control.c:1451 -#, c-format -msgid "%s wishes to be added to an existing task." -msgstr "%s ønsker at blive tilføjet til en eksisterende opgave." +#: ../calendar/zones.h:91 +msgid "America/Buenos_Aires" +msgstr "Amerika/Buenos_Aires" -#: ../calendar/gui/e-itip-control.c:1452 -msgid "Task Update" -msgstr "Opgaveopdatering" +#: ../calendar/zones.h:92 +msgid "America/Cambridge_Bay" +msgstr "Amerika/Cambridge_Bay" -#: ../calendar/gui/e-itip-control.c:1456 -#, c-format -msgid "%s wishes to receive the latest task information." -msgstr "%s ønsker at modtage den seneste information om opgaven." +#: ../calendar/zones.h:93 +msgid "America/Cancun" +msgstr "Amerika/Cancun" -#: ../calendar/gui/e-itip-control.c:1457 -msgid "Task Update Request" -msgstr "Anmodning om opgaveopdatering" +#: ../calendar/zones.h:94 +msgid "America/Caracas" +msgstr "Amerika/Caracas" -#: ../calendar/gui/e-itip-control.c:1464 -#, c-format -msgid "%s has replied to a task assignment." -msgstr "%s har svaret på en opgavetildeling." +#: ../calendar/zones.h:95 +msgid "America/Catamarca" +msgstr "Amerika/Catamarca" -#: ../calendar/gui/e-itip-control.c:1465 -msgid "Task Reply" -msgstr "Svar på opgave" +#: ../calendar/zones.h:96 +msgid "America/Cayenne" +msgstr "Amerika/Cayenne" -#: ../calendar/gui/e-itip-control.c:1472 -#, c-format -msgid "%s has canceled a task." -msgstr "%s har aflyst en opgave." +#: ../calendar/zones.h:97 +msgid "America/Cayman" +msgstr "Amerika/Cayman" -#: ../calendar/gui/e-itip-control.c:1473 -msgid "Task Cancelation" -msgstr "Aflysning af opgave" +#: ../calendar/zones.h:98 +msgid "America/Chicago" +msgstr "Amerika/Chicago" -#: ../calendar/gui/e-itip-control.c:1484 -msgid "Bad Task Message" -msgstr "Ugyldig opgavebesked" +#: ../calendar/zones.h:99 +msgid "America/Chihuahua" +msgstr "Amerika/Chihuahua" -#: ../calendar/gui/e-itip-control.c:1508 -#, c-format -msgid "%s has published free/busy information." -msgstr "%s har publiceret ledig/optaget-information." +#: ../calendar/zones.h:100 +msgid "America/Cordoba" +msgstr "Amerika/Cordoba" -#: ../calendar/gui/e-itip-control.c:1509 -msgid "Free/Busy Information" -msgstr "Ugyldig besked om ledig/optaget" +#: ../calendar/zones.h:101 +msgid "America/Costa_Rica" +msgstr "Amerika/Costa_Rica" -#: ../calendar/gui/e-itip-control.c:1513 -#, c-format -msgid "%s requests your free/busy information." -msgstr "%s anmoder om din oplysning om ledig/optaget." +#: ../calendar/zones.h:102 +msgid "America/Cuiaba" +msgstr "Amerika/Cuiaba" -#: ../calendar/gui/e-itip-control.c:1514 -msgid "Free/Busy Request" -msgstr "Forespørgsel om ledig/optaget" +#: ../calendar/zones.h:103 +msgid "America/Curacao" +msgstr "Amerika/Curacao" -#: ../calendar/gui/e-itip-control.c:1518 -#, c-format -msgid "%s has replied to a free/busy request." -msgstr "" -"%s har svaret på en forespørgsel efter oplysning om ledig/optaget." +#: ../calendar/zones.h:104 +msgid "America/Danmarkshavn" +msgstr "Amerika/Danmarkshavn" -#: ../calendar/gui/e-itip-control.c:1519 -msgid "Free/Busy Reply" -msgstr "Svar på ledig/optaget" +#: ../calendar/zones.h:105 +msgid "America/Dawson" +msgstr "Amerika/Dawson" -#: ../calendar/gui/e-itip-control.c:1524 -msgid "Bad Free/Busy Message" -msgstr "Ugyldig besked om ledig/optaget" +#: ../calendar/zones.h:106 +msgid "America/Dawson_Creek" +msgstr "Amerika/Dawson_Creek" -#: ../calendar/gui/e-itip-control.c:1600 -msgid "The message does not appear to be properly formed" -msgstr "Brevet ser ikke ud til at være korrekt udformet" +#: ../calendar/zones.h:107 +msgid "America/Denver" +msgstr "Amerika/Denver" -#: ../calendar/gui/e-itip-control.c:1659 -msgid "The message contains only unsupported requests." -msgstr "Dette brev indeholder forespørgsler som ikke er understøttet." +#: ../calendar/zones.h:108 +msgid "America/Detroit" +msgstr "Amerika/Detroit" -#: ../calendar/gui/e-itip-control.c:1692 -msgid "The attachment does not contain a valid calendar message" -msgstr "Bilaget indeholder ikke en gyldig kalenderbesked" +#: ../calendar/zones.h:109 +msgid "America/Dominica" +msgstr "Amerika/Dominika" -#: ../calendar/gui/e-itip-control.c:1730 -msgid "The attachment has no viewable calendar items" -msgstr "Bilaget har ingen synlige kalender-elementer" +#: ../calendar/zones.h:110 +msgid "America/Edmonton" +msgstr "Amerika/Edmonton" -#: ../calendar/gui/e-itip-control.c:1975 -msgid "Update complete\n" -msgstr "Opdatering fuldført\n" +#: ../calendar/zones.h:111 +msgid "America/Eirunepe" +msgstr "Amerika/Eirunepe" -#: ../calendar/gui/e-itip-control.c:2009 -msgid "Object is invalid and cannot be updated\n" -msgstr "Objektet er ugyldigt og kan ikke opdateres\n" +#: ../calendar/zones.h:112 +msgid "America/El_Salvador" +msgstr "Amerika/El_Salvador" -#: ../calendar/gui/e-itip-control.c:2026 -msgid "This response is not from a current attendee. Add as an attendee?" -msgstr "" -"Dette svar er ikke fra en nuværende mødesdeltager. Tilføj som mødesdeltager?" +#: ../calendar/zones.h:113 +msgid "America/Fortaleza" +msgstr "Amerika/Fortaleza" -#: ../calendar/gui/e-itip-control.c:2044 -msgid "Attendee status could not be updated because of an invalid status!\n" -msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status!\n" +#: ../calendar/zones.h:114 +msgid "America/Glace_Bay" +msgstr "Amerika/Glace_Bay" -#: ../calendar/gui/e-itip-control.c:2068 -msgid "Attendee status updated\n" -msgstr "Deltagerstatus opdateret\n" +#: ../calendar/zones.h:115 +msgid "America/Godthab" +msgstr "America/Godthåb" -#: ../calendar/gui/e-itip-control.c:2075 -#: ../plugins/itip-formatter/itip-formatter.c:1379 -msgid "Attendee status can not be updated because the item no longer exists" -msgstr "" -"Deltagerstatus kan ikke opdateres, fordi elementet ikke længere eksisterer" +#: ../calendar/zones.h:116 +msgid "America/Goose_Bay" +msgstr "Amerika/Goose_Bay" -#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163 -msgid "Item sent!\n" -msgstr "Elementet sendt!\n" +#: ../calendar/zones.h:117 +msgid "America/Grand_Turk" +msgstr "Amerika/Grand_Turk" -#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171 -msgid "The item could not be sent!\n" -msgstr "Elementet kunne ikke sendes!\n" +#: ../calendar/zones.h:118 +msgid "America/Grenada" +msgstr "Amerika/Grenada" -#: ../calendar/gui/e-itip-control.c:2251 -msgid "Choose an action:" -msgstr "Vælg en handling:" +#: ../calendar/zones.h:119 +msgid "America/Guadeloupe" +msgstr "Amerika/Guadeloupe" -#. To translators: RSVP means "please reply" -#: ../calendar/gui/e-itip-control.c:2280 -#: ../calendar/gui/e-meeting-list-view.c:590 -#: ../calendar/gui/e-meeting-time-sel.etspec.h:8 -msgid "RSVP" -msgstr "SU" +#: ../calendar/zones.h:120 +msgid "America/Guatemala" +msgstr "Amerika/Guatemala" -#: ../calendar/gui/e-itip-control.c:2322 -msgid "Update" -msgstr "Opdatér" +#: ../calendar/zones.h:121 +msgid "America/Guayaquil" +msgstr "Amerika/Guayaquil" -#: ../calendar/gui/e-itip-control.c:2350 -#: ../plugins/groupwise-features/process-meeting.c:51 -msgid "Accept" -msgstr "Godkend" +#: ../calendar/zones.h:122 +msgid "America/Guyana" +msgstr "Amerika/Guyana" -#: ../calendar/gui/e-itip-control.c:2351 -msgid "Tentatively accept" -msgstr "Foreslået" +#: ../calendar/zones.h:123 +msgid "America/Halifax" +msgstr "Amerika/Halifax" -#: ../calendar/gui/e-itip-control.c:2352 -#: ../plugins/groupwise-features/process-meeting.c:53 -msgid "Decline" -msgstr "Afslået" +#: ../calendar/zones.h:124 +msgid "America/Havana" +msgstr "Amerika/Havana" -#: ../calendar/gui/e-itip-control.c:2381 -msgid "Send Free/Busy Information" -msgstr "Send oplysning om ledig/optaget" +#: ../calendar/zones.h:125 +msgid "America/Hermosillo" +msgstr "Amerika/Hermosillo" -#: ../calendar/gui/e-itip-control.c:2409 -msgid "Update respondent status" -msgstr "Opdaterer modpartens status" - -#: ../calendar/gui/e-itip-control.c:2437 -msgid "Send Latest Information" -msgstr "Send nyeste oplysninger" +#: ../calendar/zones.h:126 +msgid "America/Indiana/Indianapolis" +msgstr "Amerika/Indiana/Indianapolis" -#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1 -msgid "Cancel" -msgstr "Afbryd" +#: ../calendar/zones.h:127 +msgid "America/Indiana/Knox" +msgstr "Amerika/Indiana/Knox" -#: ../calendar/gui/e-itip-control.glade.h:1 -msgid "--to--" -msgstr "--til--" +#: ../calendar/zones.h:128 +msgid "America/Indiana/Marengo" +msgstr "Amerika/Indiana/Marengo" -#: ../calendar/gui/e-itip-control.glade.h:2 -msgid "Calendar Message" -msgstr "Kalenderbesked" +#: ../calendar/zones.h:129 +msgid "America/Indiana/Vevay" +msgstr "Amerika/Indiana/Vevay" -#: ../calendar/gui/e-itip-control.glade.h:3 -msgid "Date:" -msgstr "Dato:" +#: ../calendar/zones.h:130 +msgid "America/Indianapolis" +msgstr "Amerika/Indianapolis" -#: ../calendar/gui/e-itip-control.glade.h:5 -msgid "Loading Calendar" -msgstr "Indlæser kalender" +#: ../calendar/zones.h:131 +msgid "America/Inuvik" +msgstr "Amerika/Inuvik" -#: ../calendar/gui/e-itip-control.glade.h:6 -msgid "Loading calendar..." -msgstr "Indlæser kalender..." +#: ../calendar/zones.h:132 +msgid "America/Iqaluit" +msgstr "Amerika/Iqaluit" -#: ../calendar/gui/e-itip-control.glade.h:8 -msgid "Server Message:" -msgstr "Serverbesked:" +#: ../calendar/zones.h:133 +msgid "America/Jamaica" +msgstr "Amerika/Jamaica" -#: ../calendar/gui/e-meeting-list-view.c:67 -msgid "Chair Persons" -msgstr "Formænd" +#: ../calendar/zones.h:134 +msgid "America/Jujuy" +msgstr "Amerika/Jujuy" -#: ../calendar/gui/e-meeting-list-view.c:68 -msgid "Required Participants" -msgstr "Obligatoriske deltagere" +#: ../calendar/zones.h:135 +msgid "America/Juneau" +msgstr "Amerika/Juneau" -#: ../calendar/gui/e-meeting-list-view.c:69 -msgid "Optional Participants" -msgstr "Valgfrie deltagere" +#: ../calendar/zones.h:136 +msgid "America/Kentucky/Louisville" +msgstr "Amerika/Kentucky/Louisville" -#: ../calendar/gui/e-meeting-list-view.c:70 -msgid "Resources" -msgstr "Ressourcer" +#: ../calendar/zones.h:137 +msgid "America/Kentucky/Monticello" +msgstr "Amerika/Kentucky/Monticello" -#: ../calendar/gui/e-meeting-list-view.c:151 -msgid "Attendees" -msgstr "Deltagere" +#: ../calendar/zones.h:138 +msgid "America/La_Paz" +msgstr "Amerika/La_Paz" -#: ../calendar/gui/e-meeting-list-view.c:162 -#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102 -#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980 -msgid "Individual" -msgstr "Individuel" +#: ../calendar/zones.h:139 +msgid "America/Lima" +msgstr "Amerika/Lima" -#: ../calendar/gui/e-meeting-list-view.c:163 -#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104 -#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7 -msgid "Group" -msgstr "Gruppe" +#: ../calendar/zones.h:140 +msgid "America/Los_Angeles" +msgstr "Amerika/Los_Angeles" -#: ../calendar/gui/e-meeting-list-view.c:164 -#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106 -#: ../calendar/gui/print.c:982 -msgid "Resource" -msgstr "Ressource" +#: ../calendar/zones.h:141 +msgid "America/Louisville" +msgstr "Amerika/Louisville" -#: ../calendar/gui/e-meeting-list-view.c:165 -#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108 -#: ../calendar/gui/print.c:983 -msgid "Room" -msgstr "Rum" +#: ../calendar/zones.h:142 +msgid "America/Maceio" +msgstr "Amerika/Maceio" -#: ../calendar/gui/e-meeting-list-view.c:176 -#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137 -#: ../calendar/gui/print.c:997 -msgid "Chair" -msgstr "Formand" +#: ../calendar/zones.h:143 +msgid "America/Managua" +msgstr "Amerika/Managua" -#: ../calendar/gui/e-meeting-list-view.c:177 -#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139 -#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998 -msgid "Required Participant" -msgstr "Obligatorisk deltager" +#: ../calendar/zones.h:144 +msgid "America/Manaus" +msgstr "Amerika/Manaus" -#: ../calendar/gui/e-meeting-list-view.c:178 -#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141 -#: ../calendar/gui/print.c:999 -msgid "Optional Participant" -msgstr "Valgfri deltager" +#: ../calendar/zones.h:145 +msgid "America/Martinique" +msgstr "Amerika/Martinique" -#: ../calendar/gui/e-meeting-list-view.c:179 -#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143 -#: ../calendar/gui/print.c:1000 -msgid "Non-Participant" -msgstr "Ikke-deltager" +#: ../calendar/zones.h:146 +msgid "America/Mazatlan" +msgstr "Amerika/Mazatlan" -#: ../calendar/gui/e-meeting-list-view.c:201 -#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193 -#: ../calendar/gui/e-meeting-store.c:752 -msgid "Needs Action" -msgstr "Behøver handling" +#: ../calendar/zones.h:147 +msgid "America/Mendoza" +msgstr "Amerika/Mendoza" -#. The extra space is just a hack to occupy more space for Attendee -#: ../calendar/gui/e-meeting-list-view.c:546 -msgid "Attendee " -msgstr "Deltager " +#: ../calendar/zones.h:148 +msgid "America/Menominee" +msgstr "Amerika/Menominee" -#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205 -msgid "In Process" -msgstr "I gang" +#: ../calendar/zones.h:149 +msgid "America/Merida" +msgstr "Amerika/Merida" -#. This is a strftime() format string %A = full weekday name, -#. %B = full month name, %d = month day, %Y = full year. -#: ../calendar/gui/e-meeting-time-sel-item.c:467 -#: ../calendar/gui/e-meeting-time-sel.c:2124 -msgid "%A, %B %d, %Y" -msgstr "%A den %d %B, %Y" +#: ../calendar/zones.h:150 +msgid "America/Mexico_City" +msgstr "Amerika/Mexico_City" -#. This is a strftime() format string %a = abbreviated weekday -#. name, %m = month number, %d = month day, %Y = full year. -#. This is a strftime() format string %a = abbreviated weekday name, -#. %m = month number, %d = month day, %Y = full year. -#: ../calendar/gui/e-meeting-time-sel-item.c:471 -#: ../calendar/gui/e-meeting-time-sel.c:2155 -msgid "%a %m/%d/%Y" -msgstr "%a %d/%m-%Y" +#: ../calendar/zones.h:151 +msgid "America/Miquelon" +msgstr "America/Miquelon" -#. This is a strftime() format string %m = month number, -#. %d = month day, %Y = full year. -#: ../calendar/gui/e-meeting-time-sel-item.c:475 -msgid "%m/%d/%Y" -msgstr "%d/%m-%Y" +#: ../calendar/zones.h:152 +msgid "America/Monterrey" +msgstr "Amerika/Monterrey" -#: ../calendar/gui/e-meeting-time-sel.c:400 -msgid "Out of Office" -msgstr "Ude" +#: ../calendar/zones.h:153 +msgid "America/Montevideo" +msgstr "Amerika/Montevideo" -#: ../calendar/gui/e-meeting-time-sel.c:401 -msgid "No Information" -msgstr "Ingen information" +#: ../calendar/zones.h:154 +msgid "America/Montreal" +msgstr "Amerika/Montréal" -#: ../calendar/gui/e-meeting-time-sel.c:416 -msgid "A_ttendees..." -msgstr "D_eltagere..." +#: ../calendar/zones.h:155 +msgid "America/Montserrat" +msgstr "Amerika/Montserrat" -#: ../calendar/gui/e-meeting-time-sel.c:437 -msgid "O_ptions" -msgstr "_Valgmuligheder" +#: ../calendar/zones.h:156 +msgid "America/Nassau" +msgstr "Amerika/Nassau" -#: ../calendar/gui/e-meeting-time-sel.c:454 -msgid "Show _only working hours" -msgstr "Vis _kun arbejdstid" +#: ../calendar/zones.h:157 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3 +msgid "America/New_York" +msgstr "Amerika/New_York" -#: ../calendar/gui/e-meeting-time-sel.c:464 -msgid "Show _zoomed out" -msgstr "Vis _zoomet ud" +#: ../calendar/zones.h:158 +msgid "America/Nipigon" +msgstr "Amerika/Nipigon" -#: ../calendar/gui/e-meeting-time-sel.c:479 -msgid "_Update free/busy" -msgstr "_Opdatér ledig/optaget" +#: ../calendar/zones.h:159 +msgid "America/Nome" +msgstr "Amerika/Nome" -#: ../calendar/gui/e-meeting-time-sel.c:494 -msgid "_<<" -msgstr "_<<" +#: ../calendar/zones.h:160 +msgid "America/Noronha" +msgstr "Amerika/Noronha" -#: ../calendar/gui/e-meeting-time-sel.c:512 -msgid "_Autopick" -msgstr "_Autovælg" +#: ../calendar/zones.h:161 +msgid "America/North_Dakota/Center" +msgstr "Amerika/North_Dakota/Center" -#: ../calendar/gui/e-meeting-time-sel.c:527 -msgid ">_>" -msgstr "_>>" +#: ../calendar/zones.h:162 +msgid "America/Panama" +msgstr "Amerika/Panama" -#: ../calendar/gui/e-meeting-time-sel.c:544 -msgid "_All people and resources" -msgstr "_Alle mennesker og ressourcer" +#: ../calendar/zones.h:163 +msgid "America/Pangnirtung" +msgstr "Amerika/Pangnirtung" -#: ../calendar/gui/e-meeting-time-sel.c:553 -msgid "All _people and one resource" -msgstr "Alle _personer og en enkelt ressource" +#: ../calendar/zones.h:164 +msgid "America/Paramaribo" +msgstr "Amerika/Paramaribo" -#: ../calendar/gui/e-meeting-time-sel.c:562 -msgid "_Required people" -msgstr "_Obligatoriske personer" +#: ../calendar/zones.h:165 +msgid "America/Phoenix" +msgstr "Amerika/Phoenix" -#: ../calendar/gui/e-meeting-time-sel.c:571 -msgid "Required people and _one resource" -msgstr "Obligatoriske personer og _en enkelt ressource" +#: ../calendar/zones.h:166 +msgid "America/Port-au-Prince" +msgstr "Amerika/Port-au-Prince" -#: ../calendar/gui/e-meeting-time-sel.c:607 -msgid "_Start time:" -msgstr "_Starttidspunkt:" +#: ../calendar/zones.h:167 +msgid "America/Port_of_Spain" +msgstr "Amerika/Port_of_Spain" -#: ../calendar/gui/e-meeting-time-sel.c:634 -msgid "_End time:" -msgstr "S_luttidspunkt:" +#: ../calendar/zones.h:168 +msgid "America/Porto_Velho" +msgstr "Amerika/Porto_Velho" -#: ../calendar/gui/e-meeting-time-sel.etspec.h:2 -msgid "Click here to add an attendee" -msgstr "Klik her for at tilføje en deltager" +#: ../calendar/zones.h:169 +msgid "America/Puerto_Rico" +msgstr "Amerika/Puerto_Rico" -#: ../calendar/gui/e-meeting-time-sel.etspec.h:3 -msgid "Common Name" -msgstr "Normalt navn" +#: ../calendar/zones.h:170 +msgid "America/Rainy_River" +msgstr "Amerika/Rainy_River" -#: ../calendar/gui/e-meeting-time-sel.etspec.h:4 -msgid "Delegated From" -msgstr "Uddelegeret fra" +#: ../calendar/zones.h:171 +msgid "America/Rankin_Inlet" +msgstr "Amerika/Rankin_Inlet" -#: ../calendar/gui/e-meeting-time-sel.etspec.h:5 -msgid "Delegated To" -msgstr "Uddelegeret til" +#: ../calendar/zones.h:172 +msgid "America/Recife" +msgstr "Amerika/Recife" -#: ../calendar/gui/e-meeting-time-sel.etspec.h:6 -msgid "Language" -msgstr "Sprog" +#: ../calendar/zones.h:173 +msgid "America/Regina" +msgstr "Amerika/Regina" -#: ../calendar/gui/e-meeting-time-sel.etspec.h:7 -msgid "Member" -msgstr "Medlem" +#: ../calendar/zones.h:174 +msgid "America/Rio_Branco" +msgstr "Amerika/Rio_Branco" -#: ../calendar/gui/e-memo-table.c:940 -msgid "_Delete Selected Memos" -msgstr "Sle_t valgte huskesedler" +#: ../calendar/zones.h:175 +msgid "America/Rosario" +msgstr "Amerika/Rosario" -#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2 -msgid "Click to add a memo" -msgstr "Klik for at tilføje en huskeseddel" +#: ../calendar/zones.h:176 +msgid "America/Santiago" +msgstr "Amerika/Santiago" -#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910 -#, c-format -msgid "" -"Error on %s:\n" -" %s" -msgstr "" -"Fejl ved %s:\n" -" %s" +#: ../calendar/zones.h:177 +msgid "America/Santo_Domingo" +msgstr "Amerika/Santo_Domingo" -#: ../calendar/gui/e-memos.c:812 -msgid "Loading memos" -msgstr "Indlæser huskesedler" +#: ../calendar/zones.h:178 +msgid "America/Sao_Paulo" +msgstr "Amerika/Sao_Paulo" -#: ../calendar/gui/e-memos.c:903 -#, c-format -msgid "Opening memos at %s" -msgstr "Åbner huskesedler på %s" +#: ../calendar/zones.h:179 +msgid "America/Scoresbysund" +msgstr "Amerika/Scoresbysund" -#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329 -msgid "Deleting selected objects..." -msgstr "Fjerner markerede objekter..." +#: ../calendar/zones.h:180 +msgid "America/Shiprock" +msgstr "Amerika/Shiprock" -#: ../calendar/gui/e-tasks.c:963 -msgid "Loading tasks" -msgstr "Indlæser opgaver" +#: ../calendar/zones.h:181 +msgid "America/St_Johns" +msgstr "Amerika/St_Johns" -#: ../calendar/gui/e-tasks.c:1061 -#, c-format -msgid "Opening tasks at %s" -msgstr "Åbner lager %s" +#: ../calendar/zones.h:182 +msgid "America/St_Kitts" +msgstr "Amerika/St_Kitts" -#: ../calendar/gui/e-tasks.c:1306 -msgid "Completing tasks..." -msgstr "Færdiggør opgaver..." +#: ../calendar/zones.h:183 +msgid "America/St_Lucia" +msgstr "Amerika/St_Lucia" -#: ../calendar/gui/e-tasks.c:1356 -msgid "Expunging" -msgstr "Udrenser" +#: ../calendar/zones.h:184 +msgid "America/St_Thomas" +msgstr "Amerika/St_Thomas" -#: ../calendar/gui/e-timezone-entry.c:127 -msgid "Select Timezone" -msgstr "Vælg en tidszone" +#: ../calendar/zones.h:185 +msgid "America/St_Vincent" +msgstr "Amerika/St_Vincent" -#. strftime format %d = day of month, %B = full -#. month name. You can change the order but don't -#. change the specifiers or add anything. -#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659 -msgid "%d %B" -msgstr "%d %B" +#: ../calendar/zones.h:186 +msgid "America/Swift_Current" +msgstr "Amerika/Swift_Current" -#: ../calendar/gui/gnome-cal.c:2637 -msgid "_Custom View" -msgstr "_Brugertilpasset oversigt" +#: ../calendar/zones.h:187 +msgid "America/Tegucigalpa" +msgstr "Amerika/Tegucigalpa" -#: ../calendar/gui/gnome-cal.c:2638 -msgid "_Save Custom View" -msgstr "_Gem brugertilpasset oversigt" +#: ../calendar/zones.h:188 +msgid "America/Thule" +msgstr "Amerika/Thule" -#: ../calendar/gui/gnome-cal.c:2643 -msgid "_Define Views..." -msgstr "_Definér oversigter..." +#: ../calendar/zones.h:189 +msgid "America/Thunder_Bay" +msgstr "Amerika/Thunder_Bay" -#: ../calendar/gui/gnome-cal.c:2880 -#, c-format -msgid "Loading appointments at %s" -msgstr "Indlæser aftaler på %s" +#: ../calendar/zones.h:190 +msgid "America/Tijuana" +msgstr "Amerika/Tijuana" -#: ../calendar/gui/gnome-cal.c:2895 -#, c-format -msgid "Loading tasks at %s" -msgstr "Indlæser opgaver på %s" +#: ../calendar/zones.h:191 +msgid "America/Tortola" +msgstr "Amerika/Tortola" -#: ../calendar/gui/gnome-cal.c:2904 -#, c-format -msgid "Loading memos at %s" -msgstr "Indlæser huskesedler på %s" +#: ../calendar/zones.h:192 +msgid "America/Vancouver" +msgstr "Amerika/Vancouver" -#: ../calendar/gui/gnome-cal.c:3016 -#, c-format -msgid "Opening %s" -msgstr "Åbner %s" +#: ../calendar/zones.h:193 +msgid "America/Whitehorse" +msgstr "Amerika/Whitehorse" -#: ../calendar/gui/gnome-cal.c:3984 -msgid "Purging" -msgstr "Opryder" +#: ../calendar/zones.h:194 +msgid "America/Winnipeg" +msgstr "Amerika/Winnipeg" -#: ../calendar/gui/goto-dialog.glade.h:1 -msgid "April" -msgstr "April" +#: ../calendar/zones.h:195 +msgid "America/Yakutat" +msgstr "Amerika/Yakutat" -#: ../calendar/gui/goto-dialog.glade.h:2 -msgid "August" -msgstr "August" +#: ../calendar/zones.h:196 +msgid "America/Yellowknife" +msgstr "Amerika/Yellowknife" -#: ../calendar/gui/goto-dialog.glade.h:3 -msgid "December" -msgstr "December" +#: ../calendar/zones.h:197 +msgid "Antarctica/Casey" +msgstr "Antarktis/Casey" -#: ../calendar/gui/goto-dialog.glade.h:4 -msgid "February" -msgstr "Februar" +#: ../calendar/zones.h:198 +msgid "Antarctica/Davis" +msgstr "Antarktis/Davis" -#: ../calendar/gui/goto-dialog.glade.h:5 -msgid "January" -msgstr "Januar" +#: ../calendar/zones.h:199 +msgid "Antarctica/DumontDUrville" +msgstr "Antarktis/DumontDUrville" -#: ../calendar/gui/goto-dialog.glade.h:6 -msgid "July" -msgstr "Juli" +#: ../calendar/zones.h:200 +msgid "Antarctica/Mawson" +msgstr "Antarktis/Mawson" -#: ../calendar/gui/goto-dialog.glade.h:7 -msgid "June" -msgstr "Juni" +#: ../calendar/zones.h:201 +msgid "Antarctica/McMurdo" +msgstr "Antarktis/McMurdo" -#: ../calendar/gui/goto-dialog.glade.h:8 -msgid "March" -msgstr "Marts" +#: ../calendar/zones.h:202 +msgid "Antarctica/Palmer" +msgstr "Antarktis/Palmer" -#: ../calendar/gui/goto-dialog.glade.h:9 -msgid "May" -msgstr "Maj" +#: ../calendar/zones.h:203 +msgid "Antarctica/South_Pole" +msgstr "Antarktis/Syd_polen" -#: ../calendar/gui/goto-dialog.glade.h:10 -msgid "November" -msgstr "November" +#: ../calendar/zones.h:204 +msgid "Antarctica/Syowa" +msgstr "Antarktis/Syowa" -#: ../calendar/gui/goto-dialog.glade.h:11 -msgid "October" -msgstr "Oktober" +#: ../calendar/zones.h:205 +msgid "Antarctica/Vostok" +msgstr "Antarktis/Vostok" -#: ../calendar/gui/goto-dialog.glade.h:12 -msgid "Select Date" -msgstr "Vælg dato" +#: ../calendar/zones.h:206 +msgid "Arctic/Longyearbyen" +msgstr "Arktis/Longyearbyen" -#: ../calendar/gui/goto-dialog.glade.h:13 -msgid "September" -msgstr "September" +#: ../calendar/zones.h:207 +msgid "Asia/Aden" +msgstr "Asien/Aden" -#: ../calendar/gui/goto-dialog.glade.h:14 -msgid "_Select Today" -msgstr "_Vælg dagen i dag" +#: ../calendar/zones.h:208 +msgid "Asia/Almaty" +msgstr "Asien/Almaty" -#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462 -#: ../calendar/gui/itip-utils.c:550 -msgid "An organizer must be set." -msgstr "En organisator skal angives." +#: ../calendar/zones.h:209 +msgid "Asia/Amman" +msgstr "Asien/Amman" -#: ../calendar/gui/itip-utils.c:454 -msgid "At least one attendee is necessary" -msgstr "Mindst en deltager er nødvendig" +#: ../calendar/zones.h:210 +msgid "Asia/Anadyr" +msgstr "Asien/Anadyr" -#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778 -msgid "Event information" -msgstr "Kalenderinformation" +#: ../calendar/zones.h:211 +msgid "Asia/Aqtau" +msgstr "Asien/Aqtau" -#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781 -msgid "Task information" -msgstr "Opgaveinformation" +#: ../calendar/zones.h:212 +msgid "Asia/Aqtobe" +msgstr "Asien/Aqtobe" -#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784 -msgid "Memo information" -msgstr "Huskeseddel-information" +#: ../calendar/zones.h:213 +msgid "Asia/Ashgabat" +msgstr "Asien/Ashgabat" -#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802 -msgid "Free/Busy information" -msgstr "Ledig/optaget-information" +#: ../calendar/zones.h:214 +msgid "Asia/Baghdad" +msgstr "Asien/Bagdad" -#: ../calendar/gui/itip-utils.c:640 -msgid "Calendar information" -msgstr "Kalenderinformation" +#: ../calendar/zones.h:215 +msgid "Asia/Bahrain" +msgstr "Asien/Bahrain" -#: ../calendar/gui/itip-utils.c:799 -#, c-format -msgid "Free/Busy information (%s to %s)" -msgstr "Ledig/optaget-information (%s til %s)" +#: ../calendar/zones.h:216 +msgid "Asia/Baku" +msgstr "Asien/Bakuc" -#: ../calendar/gui/itip-utils.c:807 -msgid "iCalendar information" -msgstr "iCalendar-information" - -#: ../calendar/gui/itip-utils.c:978 -msgid "You must be an attendee of the event." -msgstr "Du må være en deltager i arrangementet." +#: ../calendar/zones.h:217 +msgid "Asia/Bangkok" +msgstr "Asien/Bangkok" -#: ../calendar/gui/memos-component.c:507 -msgid "_New Memo List" -msgstr "N_y liste over huskesedler" +#: ../calendar/zones.h:218 +msgid "Asia/Beirut" +msgstr "Asien/Beirut" -#: ../calendar/gui/memos-component.c:590 -#, c-format -msgid "%d memo" -msgid_plural "%d memos" -msgstr[0] "%d huskeseddel" -msgstr[1] "%d huskesedler" +#: ../calendar/zones.h:219 +msgid "Asia/Bishkek" +msgstr "Asien/Bishkek" -#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584 -#, c-format -msgid ", %d selected" -msgid_plural ", %d selected" -msgstr[0] ", %d valgt" -msgstr[1] ", %d valgte" +#: ../calendar/zones.h:220 +msgid "Asia/Brunei" +msgstr "Asien/Brunei" -#: ../calendar/gui/memos-component.c:639 -msgid "Failed upgrading memos." -msgstr "Opgradering af huskesedler mislykkedes." +#: ../calendar/zones.h:221 +msgid "Asia/Calcutta" +msgstr "Asien/Calcutta" -#: ../calendar/gui/memos-component.c:769 -#, c-format -msgid "Unable to open the memo list '%s' for creating events and meetings" -msgstr "" -"Kan ikke åbne listen over huskesedler \"%s\" til oprettelse af begivenheder " -"og møder" +#: ../calendar/zones.h:222 +msgid "Asia/Choibalsan" +msgstr "Asien/Choibalsan" -#: ../calendar/gui/memos-component.c:782 -msgid "There is no calendar available for creating memos" -msgstr "Ingen kalender tilgængelig for oprettelse af huskesedler" +#: ../calendar/zones.h:223 +msgid "Asia/Chongqing" +msgstr "Asien Chongqing" -#: ../calendar/gui/memos-component.c:892 -msgid "Memo Source Selector" -msgstr "Huskeseddel-kildevælger" +#: ../calendar/zones.h:224 +msgid "Asia/Colombo" +msgstr "Asien/Colombo" -#: ../calendar/gui/memos-component.c:1071 -msgid "New memo" -msgstr "Ny huskeseddel" +#: ../calendar/zones.h:225 +msgid "Asia/Damascus" +msgstr "Asien/Damaskus" -#: ../calendar/gui/memos-component.c:1073 -msgid "Create a new memo" -msgstr "Opret en ny huskeseddel" +#: ../calendar/zones.h:226 +msgid "Asia/Dhaka" +msgstr "Asien/Dhaka" -#: ../calendar/gui/memos-component.c:1079 -msgid "New shared memo" -msgstr "Ny fælles huskeseddel" +#: ../calendar/zones.h:227 +msgid "Asia/Dili" +msgstr "Asien/Dili" -#: ../calendar/gui/memos-component.c:1081 -msgid "Create a shared new memo" -msgstr "Opret en ny, fælles huskeseddel" +#: ../calendar/zones.h:228 +msgid "Asia/Dubai" +msgstr "Asien/Dubai" -#: ../calendar/gui/memos-component.c:1087 -msgid "New memo list" -msgstr "Ny liste over huskesedler" +#: ../calendar/zones.h:229 +msgid "Asia/Dushanbe" +msgstr "Asien/Dushanbe" -#: ../calendar/gui/memos-component.c:1089 -msgid "Create a new memo list" -msgstr "Opret en ny liste over huskesedler" +#: ../calendar/zones.h:230 +msgid "Asia/Gaza" +msgstr "Asien/Gaza" -#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366 -msgid "Print Memos" -msgstr "Udskriv huskesedler" +#: ../calendar/zones.h:231 +msgid "Asia/Harbin" +msgstr "Asien/Harbin" -#: ../calendar/gui/migration.c:157 -msgid "" -"The location and hierarchy of the Evolution task folders has changed since " -"Evolution 1.x.\n" -"\n" -"Please be patient while Evolution migrates your folders..." -msgstr "" -"Placering og struktur for Evolutions opgavemapper er ændret siden Evolution " -"1. x.\n" -"\n" -"Vent venligst mens Evolution overflytter dine mapper..." +#: ../calendar/zones.h:232 +msgid "Asia/Hong_Kong" +msgstr "Asien/Hong_Kong" -#: ../calendar/gui/migration.c:161 -msgid "" -"The location and hierarchy of the Evolution calendar folders has changed " -"since Evolution 1.x.\n" -"\n" -"Please be patient while Evolution migrates your folders..." -msgstr "" -"Placering og struktur for Evolutions kalendermapper er ændret siden " -"Evolution 1.x.\n" -"\n" -"Vent venligst mens Evolution overflytter dine mapper..." +#: ../calendar/zones.h:233 +msgid "Asia/Hovd" +msgstr "Asien/Hovd" -#. FIXME: set proper domain/code -#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943 -#, c-format -msgid "Unable to migrate old settings from evolution/config.xmldb" -msgstr "Kan ikke overflytte gamle indstillinger fra evolution/config.xmldb" +#: ../calendar/zones.h:234 +msgid "Asia/Irkutsk" +msgstr "Asien/Irkutsk" -#. FIXME: domain/code -#: ../calendar/gui/migration.c:804 -#, c-format -msgid "Unable to migrate calendar `%s'" -msgstr "Kan ikke overflytte kalenderen \"%s\"" +#: ../calendar/zones.h:235 +msgid "Asia/Istanbul" +msgstr "Asien/Istanbul" -#. FIXME: domain/code -#: ../calendar/gui/migration.c:972 -#, c-format -msgid "Unable to migrate tasks `%s'" -msgstr "Kan ikke overflytte opgaverne \"%s\"" +#: ../calendar/zones.h:236 +msgid "Asia/Jakarta" +msgstr "Asien/Jakarta" -#: ../calendar/gui/migration.c:1227 -#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426 -#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457 -#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570 -msgid "Notes" -msgstr "Noter" +#: ../calendar/zones.h:237 +msgid "Asia/Jayapura" +msgstr "Asien/Jayapura" -#: ../calendar/gui/print.c:514 -msgid "1st" -msgstr "1." +#: ../calendar/zones.h:238 +msgid "Asia/Jerusalem" +msgstr "Asien/Jerusalem" -#: ../calendar/gui/print.c:514 -msgid "2nd" -msgstr "2." +#: ../calendar/zones.h:239 +msgid "Asia/Kabul" +msgstr "Asien/Kabul" -#: ../calendar/gui/print.c:514 -msgid "3rd" -msgstr "3." +#: ../calendar/zones.h:240 +msgid "Asia/Kamchatka" +msgstr "Asien/Kamchatka" -#: ../calendar/gui/print.c:514 -msgid "4th" -msgstr "4." +#: ../calendar/zones.h:241 +msgid "Asia/Karachi" +msgstr "Asien/Karachi" -#: ../calendar/gui/print.c:514 -msgid "5th" -msgstr "5." +#: ../calendar/zones.h:242 +msgid "Asia/Kashgar" +msgstr "Asien/Kashgar" -#: ../calendar/gui/print.c:515 -msgid "6th" -msgstr "6." +#: ../calendar/zones.h:243 +msgid "Asia/Katmandu" +msgstr "Asien/Katmandu" -#: ../calendar/gui/print.c:515 -msgid "7th" -msgstr "7." +#: ../calendar/zones.h:244 +msgid "Asia/Krasnoyarsk" +msgstr "Asien/Krasnoyarsk" -#: ../calendar/gui/print.c:515 -msgid "8th" -msgstr "8." +#: ../calendar/zones.h:245 +msgid "Asia/Kuala_Lumpur" +msgstr "Asien/Kuala_Lumpur" -#: ../calendar/gui/print.c:515 -msgid "9th" -msgstr "9." +#: ../calendar/zones.h:246 +msgid "Asia/Kuching" +msgstr "Asien/Kuching" -#: ../calendar/gui/print.c:515 -msgid "10th" -msgstr "10." +#: ../calendar/zones.h:247 +msgid "Asia/Kuwait" +msgstr "Asien/Kuwait" -#: ../calendar/gui/print.c:516 -msgid "11th" -msgstr "11." +#: ../calendar/zones.h:248 +msgid "Asia/Macao" +msgstr "Asien/Macao" -#: ../calendar/gui/print.c:516 -msgid "12th" -msgstr "12." +#: ../calendar/zones.h:249 +msgid "Asia/Macau" +msgstr "Asien/Macao" -#: ../calendar/gui/print.c:516 -msgid "13th" -msgstr "13." +#: ../calendar/zones.h:250 +msgid "Asia/Magadan" +msgstr "Asien/Magadan" -#: ../calendar/gui/print.c:516 -msgid "14th" -msgstr "14." +#: ../calendar/zones.h:251 +msgid "Asia/Makassar" +msgstr "Asien/Makassar" -#: ../calendar/gui/print.c:516 -msgid "15th" -msgstr "15." +#: ../calendar/zones.h:252 +msgid "Asia/Manila" +msgstr "Asien/Manila" -#: ../calendar/gui/print.c:517 -msgid "16th" -msgstr "16." +#: ../calendar/zones.h:253 +msgid "Asia/Muscat" +msgstr "Asien/Muscat" -#: ../calendar/gui/print.c:517 -msgid "17th" -msgstr "17." +#: ../calendar/zones.h:254 +msgid "Asia/Nicosia" +msgstr "Asien/Nicosia" -#: ../calendar/gui/print.c:517 -msgid "18th" -msgstr "18." +#: ../calendar/zones.h:255 +msgid "Asia/Novosibirsk" +msgstr "Asien/Novosibirsk" -#: ../calendar/gui/print.c:517 -msgid "19th" -msgstr "19." +#: ../calendar/zones.h:256 +msgid "Asia/Omsk" +msgstr "Asien/Omsk" -#: ../calendar/gui/print.c:517 -msgid "20th" -msgstr "20." +#: ../calendar/zones.h:257 +msgid "Asia/Oral" +msgstr "Asien/Ural" -#: ../calendar/gui/print.c:518 -msgid "21st" -msgstr "21." +#: ../calendar/zones.h:258 +msgid "Asia/Phnom_Penh" +msgstr "Asien/Phnom_Penh" -#: ../calendar/gui/print.c:518 -msgid "22nd" -msgstr "22." +#: ../calendar/zones.h:259 +msgid "Asia/Pontianak" +msgstr "Asien/Pontianak" -#: ../calendar/gui/print.c:518 -msgid "23rd" -msgstr "23." +#: ../calendar/zones.h:260 +msgid "Asia/Pyongyang" +msgstr "Asien/Pyongyang" -#: ../calendar/gui/print.c:518 -msgid "24th" -msgstr "24." +#: ../calendar/zones.h:261 +msgid "Asia/Qatar" +msgstr "Asien/Qatar" -#: ../calendar/gui/print.c:518 -msgid "25th" -msgstr "25." +#: ../calendar/zones.h:262 +msgid "Asia/Qyzylorda" +msgstr "Asien/Kzyl-Orda" -#: ../calendar/gui/print.c:519 -msgid "26th" -msgstr "26." +#: ../calendar/zones.h:263 +msgid "Asia/Rangoon" +msgstr "Asien/Rangoon" -#: ../calendar/gui/print.c:519 -msgid "27th" -msgstr "27." +#: ../calendar/zones.h:264 +msgid "Asia/Riyadh" +msgstr "Asien/Riyadh" -#: ../calendar/gui/print.c:519 -msgid "28th" -msgstr "28." +#: ../calendar/zones.h:265 +msgid "Asia/Saigon" +msgstr "Asien/Saigon" -#: ../calendar/gui/print.c:519 -msgid "29th" -msgstr "29." +#: ../calendar/zones.h:266 +msgid "Asia/Sakhalin" +msgstr "Asien/Sakhalin" -#: ../calendar/gui/print.c:519 -msgid "30th" -msgstr "30." +#: ../calendar/zones.h:267 +msgid "Asia/Samarkand" +msgstr "Asien/Samarkand" -#: ../calendar/gui/print.c:520 -msgid "31st" -msgstr "31." +#: ../calendar/zones.h:268 +msgid "Asia/Seoul" +msgstr "Asien/Seoul" -#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday -#: ../calendar/gui/print.c:595 -msgid "Su" -msgstr "Søn" +#: ../calendar/zones.h:269 +msgid "Asia/Shanghai" +msgstr "Asien/Shanghai" -#: ../calendar/gui/print.c:595 -msgid "Mo" -msgstr "Man" +#: ../calendar/zones.h:270 +msgid "Asia/Singapore" +msgstr "Asien/Singapore" -#: ../calendar/gui/print.c:595 -msgid "Tu" -msgstr "Tir" +#: ../calendar/zones.h:271 +msgid "Asia/Taipei" +msgstr "Asien/Taipei" -#: ../calendar/gui/print.c:595 -msgid "We" -msgstr "Ons" +#: ../calendar/zones.h:272 +msgid "Asia/Tashkent" +msgstr "Asien/Tashkent" -#: ../calendar/gui/print.c:596 -msgid "Th" -msgstr "Tor" +#: ../calendar/zones.h:273 +msgid "Asia/Tbilisi" +msgstr "Asien/Tbilisi" -#: ../calendar/gui/print.c:596 -msgid "Fr" -msgstr "Fre" +#: ../calendar/zones.h:274 +msgid "Asia/Tehran" +msgstr "Asien/Teheran" -#: ../calendar/gui/print.c:596 -msgid "Sa" -msgstr "Lør" +#: ../calendar/zones.h:275 +msgid "Asia/Thimphu" +msgstr "Asien/Thimphu" -#: ../calendar/gui/print.c:2481 -msgid "Appointment" -msgstr "Aftale" +#: ../calendar/zones.h:276 +msgid "Asia/Tokyo" +msgstr "Asien/Tokyo" -#: ../calendar/gui/print.c:2483 -msgid "Task" -msgstr "Opgave" +#: ../calendar/zones.h:277 +msgid "Asia/Ujung_Pandang" +msgstr "Asien/Ujung_Pandang" -#: ../calendar/gui/print.c:2508 -#, c-format -msgid "Summary: %s" -msgstr "Sammendrag: %s" +#: ../calendar/zones.h:278 +msgid "Asia/Ulaanbaatar" +msgstr "Asien/Ulaanbaatar" -#: ../calendar/gui/print.c:2531 -msgid "Attendees: " -msgstr "Deltagere: " +#: ../calendar/zones.h:279 +msgid "Asia/Urumqi" +msgstr "Asien/Urumqi" -#: ../calendar/gui/print.c:2571 -#, c-format -msgid "Status: %s" -msgstr "Status: %s" +#: ../calendar/zones.h:280 +msgid "Asia/Vientiane" +msgstr "Asien/Vientiane" -#: ../calendar/gui/print.c:2588 -#, c-format -msgid "Priority: %s" -msgstr "Prioritet: %s" +#: ../calendar/zones.h:281 +msgid "Asia/Vladivostok" +msgstr "Asien/Vladivostok" -#: ../calendar/gui/print.c:2600 -#, c-format -msgid "Percent Complete: %i" -msgstr "Fuldført i procent: %i" +#: ../calendar/zones.h:282 +msgid "Asia/Yakutsk" +msgstr "Asien/Jakutsk" -#: ../calendar/gui/print.c:2612 -#, c-format -msgid "URL: %s" -msgstr "Adresse: %s" +#: ../calendar/zones.h:283 +msgid "Asia/Yekaterinburg" +msgstr "Asien/Jekaterinburg" -#: ../calendar/gui/print.c:2625 -#, c-format -msgid "Categories: %s" -msgstr "Kategorier: %s" +#: ../calendar/zones.h:284 +msgid "Asia/Yerevan" +msgstr "Asien/Jerevan" -#: ../calendar/gui/print.c:2636 -msgid "Contacts: " -msgstr "Kontaktpersoner: " +#: ../calendar/zones.h:285 +msgid "Atlantic/Azores" +msgstr "Atlanten/Azorene" -#: ../calendar/gui/tasks-component.c:499 -msgid "_New Task List" -msgstr "_Ny opgaveliste" +#: ../calendar/zones.h:286 +msgid "Atlantic/Bermuda" +msgstr "Atlanten/Bermuda" -#: ../calendar/gui/tasks-component.c:582 -#, c-format -msgid "%d task" -msgid_plural "%d tasks" -msgstr[0] "%d opgave" -msgstr[1] "%d opgaver" +#: ../calendar/zones.h:287 +msgid "Atlantic/Canary" +msgstr "Atlanteren/De canariske øer" -#: ../calendar/gui/tasks-component.c:631 -msgid "Failed upgrading tasks." -msgstr "Opgradering af opgaver mislykkedes." +#: ../calendar/zones.h:288 +msgid "Atlantic/Cape_Verde" +msgstr "Atlanten/Kap_Verde" -#: ../calendar/gui/tasks-component.c:764 -#, c-format -msgid "Unable to open the task list '%s' for creating events and meetings" -msgstr "" -"Kan ikke åbne opgavelisten \"%s\" for oprettelse af begivenheder og møder" +#: ../calendar/zones.h:289 +msgid "Atlantic/Faeroe" +msgstr "Atlanten/Færøerne" -#: ../calendar/gui/tasks-component.c:777 -msgid "There is no calendar available for creating tasks" -msgstr "Ingen kalender tilgængelig for oprettelse af opgaver" +#: ../calendar/zones.h:290 +msgid "Atlantic/Jan_Mayen" +msgstr "Atlanten/Jan_Mayen" -#: ../calendar/gui/tasks-component.c:888 -msgid "Task Source Selector" -msgstr "Opgavekilde-vælger" +#: ../calendar/zones.h:291 +msgid "Atlantic/Madeira" +msgstr "Atlanten/Madeira" -#: ../calendar/gui/tasks-component.c:1142 -msgid "New task" -msgstr "Ny opgave" +#: ../calendar/zones.h:292 +msgid "Atlantic/Reykjavik" +msgstr "Atlanten/Reykjavík" -#: ../calendar/gui/tasks-component.c:1144 -msgid "Create a new task" -msgstr "Opret en ny opgave" +#: ../calendar/zones.h:293 +msgid "Atlantic/South_Georgia" +msgstr "Atlanten/Syd-_Georgia" -#: ../calendar/gui/tasks-component.c:1150 -msgid "New assigned task" -msgstr "Ny tildelt opgave" +#: ../calendar/zones.h:294 +msgid "Atlantic/St_Helena" +msgstr "Atlanten/St_Helena" -#: ../calendar/gui/tasks-component.c:1152 -msgid "Create a new assigned task" -msgstr "Opret en ny tildelt opgave" +#: ../calendar/zones.h:295 +msgid "Atlantic/Stanley" +msgstr "Atlanten/Stanley" -#: ../calendar/gui/tasks-component.c:1158 -msgid "New task list" -msgstr "Ny opgaveliste" +#: ../calendar/zones.h:296 +msgid "Australia/Adelaide" +msgstr "Australien/Adelaide" -#: ../calendar/gui/tasks-component.c:1160 -msgid "Create a new task list" -msgstr "Opret en ny opgaveliste" +#: ../calendar/zones.h:297 +msgid "Australia/Brisbane" +msgstr "Australien/Brisbane" -#: ../calendar/gui/tasks-control.c:442 -msgid "" -"This operation will permanently erase all tasks marked as completed. If you " -"continue, you will not be able to recover these tasks.\n" -"\n" -"Really erase these tasks?" -msgstr "" -"Denne handling vil permanent fjerne alle opgaver der er markeret som " -"fuldførte. Hvis du fortsætter, vil du ikke længere kunne tilvejebringe disse " -"opgaver.\n" -"\n" -"Vil du virkelig fjerne disse opgaver?" +#: ../calendar/zones.h:298 +msgid "Australia/Broken_Hill" +msgstr "Australien/Broken_Hill" -#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128 -msgid "Do not ask me again." -msgstr "Spørg mig ikke igen." +#: ../calendar/zones.h:299 +msgid "Australia/Darwin" +msgstr "Australien/Darwin" -#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498 -msgid "Print Tasks" -msgstr "Udskriv opgaver" +#: ../calendar/zones.h:300 +msgid "Australia/Hobart" +msgstr "Australien/Hobart" -#: ../calendar/gui/tasktypes.xml.h:2 -#, no-c-format -msgid "% Completed" -msgstr "% fuldført" +#: ../calendar/zones.h:301 +msgid "Australia/Lindeman" +msgstr "Australien/Lindeman" -#: ../calendar/gui/tasktypes.xml.h:7 -msgid "Cancelled" -msgstr "Afbrudt" +#: ../calendar/zones.h:302 +msgid "Australia/Lord_Howe" +msgstr "Australien/Lord_Howe" -#: ../calendar/gui/tasktypes.xml.h:15 -msgid "In progress" -msgstr "I gang" +#: ../calendar/zones.h:303 +msgid "Australia/Melbourne" +msgstr "Australien/Melbourne" -#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34 -msgid "is greater than" -msgstr "er større end" +#: ../calendar/zones.h:304 +msgid "Australia/Perth" +msgstr "Australien/Perth" -#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35 -msgid "is less than" -msgstr "er mindre end" +#: ../calendar/zones.h:305 +msgid "Australia/Sydney" +msgstr "Australien/Sydney" -#: ../calendar/importers/icalendar-importer.c:75 -msgid "Appointments and Meetings" -msgstr "Aftaler og møder" +#: ../calendar/zones.h:306 +msgid "Europe/Amsterdam" +msgstr "Europa/Amsterdam" -#: ../calendar/importers/icalendar-importer.c:333 -#: ../calendar/importers/icalendar-importer.c:628 -#: ../plugins/itip-formatter/itip-formatter.c:1723 -msgid "Opening calendar" -msgstr "Åbner kalender" +#: ../calendar/zones.h:307 +msgid "Europe/Andorra" +msgstr "Europa/Andorra" -#: ../calendar/importers/icalendar-importer.c:440 -msgid "iCalendar files (.ics)" -msgstr "iCalendar-filer (.ics)" +#: ../calendar/zones.h:308 +msgid "Europe/Athens" +msgstr "Europa/Athen" -#: ../calendar/importers/icalendar-importer.c:441 -msgid "Evolution iCalendar importer" -msgstr "Evolution iCalendar-importør" +#: ../calendar/zones.h:309 +msgid "Europe/Belfast" +msgstr "Europa/Belfast" -#: ../calendar/importers/icalendar-importer.c:529 -msgid "Reminder!" -msgstr "Påmindelse!" +#: ../calendar/zones.h:310 +msgid "Europe/Belgrade" +msgstr "Europa/Beograd" -#: ../calendar/importers/icalendar-importer.c:581 -msgid "vCalendar files (.vcf)" -msgstr "vCalendar-filer (.vcf)" +#: ../calendar/zones.h:311 +msgid "Europe/Berlin" +msgstr "Europa/Berlin" -#: ../calendar/importers/icalendar-importer.c:582 -msgid "Evolution vCalendar importer" -msgstr "Evolution vCalendar-importør" +#: ../calendar/zones.h:312 +msgid "Europe/Bratislava" +msgstr "Europa/Bratislava" -#: ../calendar/importers/icalendar-importer.c:744 -msgid "Calendar Events" -msgstr "Kalenderbegivenheder" +#: ../calendar/zones.h:313 +msgid "Europe/Brussels" +msgstr "Europa/Bryssel" -#: ../calendar/importers/icalendar-importer.c:781 -msgid "Evolution Calendar intelligent importer" -msgstr "Evolution intelligent kalender-importør" +#: ../calendar/zones.h:314 +msgid "Europe/Bucharest" +msgstr "Europa/Bukarest" -#. -#. * -#. * This program is free software; you can redistribute it and/or -#. * modify it under the terms of the GNU Lesser General Public -#. * License as published by the Free Software Foundation; either -#. * version 2 of the License, or (at your option) version 3. -#. * -#. * This program is distributed in the hope that it will be useful, -#. * but WITHOUT ANY WARRANTY; without even the implied warranty of -#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -#. * Lesser General Public License for more details. -#. * -#. * You should have received a copy of the GNU Lesser General Public -#. * License along with the program; if not, see -#. * -#. * -#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) -#. * -#. -#. -#. * These are the timezone names from the Olson timezone data. -#. * We only place them here so gettext picks them up for translation. -#. * Don't include in any C files. -#. -#: ../calendar/zones.h:26 -msgid "Africa/Abidjan" -msgstr "Afrika/Abidjan" +#: ../calendar/zones.h:315 +msgid "Europe/Budapest" +msgstr "Europa/Budapest" -#: ../calendar/zones.h:27 -msgid "Africa/Accra" -msgstr "Afrika/Akkra" +#: ../calendar/zones.h:316 +msgid "Europe/Chisinau" +msgstr "Europa/Chisinau" -#: ../calendar/zones.h:28 -msgid "Africa/Addis_Ababa" -msgstr "Afrika/Addis_Abeba" +#: ../calendar/zones.h:317 +msgid "Europe/Copenhagen" +msgstr "Europa/København" -#: ../calendar/zones.h:29 -msgid "Africa/Algiers" -msgstr "Afrika/Algier" +#: ../calendar/zones.h:318 +msgid "Europe/Dublin" +msgstr "Europa/Dublin" -#: ../calendar/zones.h:30 -msgid "Africa/Asmera" -msgstr "Afrika/Asmera" +#: ../calendar/zones.h:319 +msgid "Europe/Gibraltar" +msgstr "Europa/Gibraltar" -#: ../calendar/zones.h:31 -msgid "Africa/Bamako" -msgstr "Afrika/Bamako" +#: ../calendar/zones.h:320 +msgid "Europe/Helsinki" +msgstr "Europa/Helsinki" -#: ../calendar/zones.h:32 -msgid "Africa/Bangui" -msgstr "Afrika/Bangui" +#: ../calendar/zones.h:321 +msgid "Europe/Istanbul" +msgstr "Europa/Istanbul" -#: ../calendar/zones.h:33 -msgid "Africa/Banjul" -msgstr "Afrika/Banjul" +#: ../calendar/zones.h:322 +msgid "Europe/Kaliningrad" +msgstr "Europa/Kaliningrad" -#: ../calendar/zones.h:34 -msgid "Africa/Bissau" -msgstr "Afrika/Bissau" +#: ../calendar/zones.h:323 +msgid "Europe/Kiev" +msgstr "Europa/Kiev" -#: ../calendar/zones.h:35 -msgid "Africa/Blantyre" -msgstr "Afrika/Blantyre" +#: ../calendar/zones.h:324 +msgid "Europe/Lisbon" +msgstr "Europa/Lisboa" -#: ../calendar/zones.h:36 -msgid "Africa/Brazzaville" -msgstr "Afrika/Brazzaville" +#: ../calendar/zones.h:325 +msgid "Europe/Ljubljana" +msgstr "Europa/Ljubljana" -#: ../calendar/zones.h:37 -msgid "Africa/Bujumbura" -msgstr "Afrika/Bujumbura" +#: ../calendar/zones.h:326 +msgid "Europe/London" +msgstr "Europa/London" -#: ../calendar/zones.h:38 -msgid "Africa/Cairo" -msgstr "Afrika/Kairo" +#: ../calendar/zones.h:327 +msgid "Europe/Luxembourg" +msgstr "Europa/Luxembourg" -#: ../calendar/zones.h:39 -msgid "Africa/Casablanca" -msgstr "Afrika/Casablanca" +#: ../calendar/zones.h:328 +msgid "Europe/Madrid" +msgstr "Europa/Madrid" -#: ../calendar/zones.h:40 -msgid "Africa/Ceuta" -msgstr "Afrika/Ceuta" +#: ../calendar/zones.h:329 +msgid "Europe/Malta" +msgstr "Europa/Malta" -#: ../calendar/zones.h:41 -msgid "Africa/Conakry" -msgstr "Afrika/Conakry" +#: ../calendar/zones.h:330 +msgid "Europe/Minsk" +msgstr "Europa/Minsk" -#: ../calendar/zones.h:42 -msgid "Africa/Dakar" -msgstr "Afrika/Dakar" +#: ../calendar/zones.h:331 +msgid "Europe/Monaco" +msgstr "Europa/Monaco" -#: ../calendar/zones.h:43 -msgid "Africa/Dar_es_Salaam" -msgstr "Afrika/Dar_es_salaam" +#: ../calendar/zones.h:332 +msgid "Europe/Moscow" +msgstr "Europa/Moskva" -#: ../calendar/zones.h:44 -msgid "Africa/Djibouti" -msgstr "Afrika/Djibouti" +#: ../calendar/zones.h:333 +msgid "Europe/Nicosia" +msgstr "Europa/Nicosia" -#: ../calendar/zones.h:45 -msgid "Africa/Douala" -msgstr "Afrika/Douala" +#: ../calendar/zones.h:334 +msgid "Europe/Oslo" +msgstr "Europa/Oslo" -#: ../calendar/zones.h:46 -msgid "Africa/El_Aaiun" -msgstr "Afrika/El_Aaiun" +#: ../calendar/zones.h:335 +msgid "Europe/Paris" +msgstr "Europa/Paris" -#: ../calendar/zones.h:47 -msgid "Africa/Freetown" -msgstr "Afrika/Freetown" +#: ../calendar/zones.h:336 +msgid "Europe/Prague" +msgstr "Europa/Prag" -#: ../calendar/zones.h:48 -msgid "Africa/Gaborone" -msgstr "Afrika/Gaborone" +#: ../calendar/zones.h:337 +msgid "Europe/Riga" +msgstr "Europa/Riga" -#: ../calendar/zones.h:49 -msgid "Africa/Harare" -msgstr "Afrika/Harare" +#: ../calendar/zones.h:338 +msgid "Europe/Rome" +msgstr "Europa/Rom" -#: ../calendar/zones.h:50 -msgid "Africa/Johannesburg" -msgstr "Afrika/Johannesburg" +#: ../calendar/zones.h:339 +msgid "Europe/Samara" +msgstr "Europa/Samara" -#: ../calendar/zones.h:51 -msgid "Africa/Kampala" -msgstr "Afrika/Kampala" +#: ../calendar/zones.h:340 +msgid "Europe/San_Marino" +msgstr "Europa/San_Marino" -#: ../calendar/zones.h:52 -msgid "Africa/Khartoum" -msgstr "Afrika/Khartoum" +#: ../calendar/zones.h:341 +msgid "Europe/Sarajevo" +msgstr "Europa/Sarajevo" -#: ../calendar/zones.h:53 -msgid "Africa/Kigali" -msgstr "Afrika/Kigali" +#: ../calendar/zones.h:342 +msgid "Europe/Simferopol" +msgstr "Europa/Simferopol" -#: ../calendar/zones.h:54 -msgid "Africa/Kinshasa" -msgstr "Afrika/Kinshasa" +#: ../calendar/zones.h:343 +msgid "Europe/Skopje" +msgstr "Europa/Skopje" -#: ../calendar/zones.h:55 -msgid "Africa/Lagos" -msgstr "Afrika/Lagos" +#: ../calendar/zones.h:344 +msgid "Europe/Sofia" +msgstr "Europa/Sofia" -#: ../calendar/zones.h:56 -msgid "Africa/Libreville" -msgstr "Afrika/Libreville" +#: ../calendar/zones.h:345 +msgid "Europe/Stockholm" +msgstr "Europa/Stockholm" -#: ../calendar/zones.h:57 -msgid "Africa/Lome" -msgstr "Afrika/Lome" +#: ../calendar/zones.h:346 +msgid "Europe/Tallinn" +msgstr "Europa/Tallinn" -#: ../calendar/zones.h:58 -msgid "Africa/Luanda" -msgstr "Afrika/Luanda" +#: ../calendar/zones.h:347 +msgid "Europe/Tirane" +msgstr "Europa/Tirane" -#: ../calendar/zones.h:59 -msgid "Africa/Lubumbashi" -msgstr "Afrika/Lubumbashi" +#: ../calendar/zones.h:348 +msgid "Europe/Uzhgorod" +msgstr "Europa/Uzhgorod" -#: ../calendar/zones.h:60 -msgid "Africa/Lusaka" -msgstr "Afrika/Lusaka" +#: ../calendar/zones.h:349 +msgid "Europe/Vaduz" +msgstr "Europa/Vaduz" -#: ../calendar/zones.h:61 -msgid "Africa/Malabo" -msgstr "Afrika/Malabo" +#: ../calendar/zones.h:350 +msgid "Europe/Vatican" +msgstr "Europa/Vatikanet" -#: ../calendar/zones.h:62 -msgid "Africa/Maputo" -msgstr "Afrika/Maputo" +#: ../calendar/zones.h:351 +msgid "Europe/Vienna" +msgstr "Europa/Wien" -#: ../calendar/zones.h:63 -msgid "Africa/Maseru" -msgstr "Afrika/Maseru" +#: ../calendar/zones.h:352 +msgid "Europe/Vilnius" +msgstr "Europa/Vilnius" -#: ../calendar/zones.h:64 -msgid "Africa/Mbabane" -msgstr "Afrika/Mbabane" +#: ../calendar/zones.h:353 +msgid "Europe/Warsaw" +msgstr "Europa/Warszawa" -#: ../calendar/zones.h:65 -msgid "Africa/Mogadishu" -msgstr "Afrika/Mogadishu" +#: ../calendar/zones.h:354 +msgid "Europe/Zagreb" +msgstr "Europa/Zagreb" -#: ../calendar/zones.h:66 -msgid "Africa/Monrovia" -msgstr "Afrika/Monrovia" +#: ../calendar/zones.h:355 +msgid "Europe/Zaporozhye" +msgstr "Europa/Zaporozhye" -#: ../calendar/zones.h:67 -msgid "Africa/Nairobi" -msgstr "Afrika/Nairobi" +#: ../calendar/zones.h:356 +msgid "Europe/Zurich" +msgstr "Europa/Zürich" -#: ../calendar/zones.h:68 -msgid "Africa/Ndjamena" -msgstr "Afrika/Ndjamena" +#: ../calendar/zones.h:357 +msgid "Indian/Antananarivo" +msgstr "Indiske hav/Antananarivo" -#: ../calendar/zones.h:69 -msgid "Africa/Niamey" -msgstr "Afrika/Niamey" +#: ../calendar/zones.h:358 +msgid "Indian/Chagos" +msgstr "Indiske hav/Chagos" -#: ../calendar/zones.h:70 -msgid "Africa/Nouakchott" -msgstr "Afrika/Nouakchott" +#: ../calendar/zones.h:359 +msgid "Indian/Christmas" +msgstr "Indiske hav/Juleøen" -#: ../calendar/zones.h:71 -msgid "Africa/Ouagadougou" -msgstr "Afrika/Ouagadougou" +#: ../calendar/zones.h:360 +msgid "Indian/Cocos" +msgstr "Indiske hav/Cocos" -#: ../calendar/zones.h:72 -msgid "Africa/Porto-Novo" -msgstr "Afrika/Porto-Novo" +#: ../calendar/zones.h:361 +msgid "Indian/Comoro" +msgstr "Indiske hav/Comorerne" -#: ../calendar/zones.h:73 -msgid "Africa/Sao_Tome" -msgstr "Afrika/Sao_Tome" +#: ../calendar/zones.h:362 +msgid "Indian/Kerguelen" +msgstr "Indiske hav/Kerguelen" -#: ../calendar/zones.h:74 -msgid "Africa/Timbuktu" -msgstr "Afrika/Timbuktu" +#: ../calendar/zones.h:363 +msgid "Indian/Mahe" +msgstr "Indiske hav/Mahe" -#: ../calendar/zones.h:75 -msgid "Africa/Tripoli" -msgstr "Afrika/Tripoli" +#: ../calendar/zones.h:364 +msgid "Indian/Maldives" +msgstr "Indiske hav/Maldiverne" -#: ../calendar/zones.h:76 -msgid "Africa/Tunis" -msgstr "Afrika/Tunis" +#: ../calendar/zones.h:365 +msgid "Indian/Mauritius" +msgstr "Indiske hav/Mauritius" -#: ../calendar/zones.h:77 -msgid "Africa/Windhoek" -msgstr "Afrika/Windhoek" +#: ../calendar/zones.h:366 +msgid "Indian/Mayotte" +msgstr "Indiske hav/Mayotte" -#: ../calendar/zones.h:78 -msgid "America/Adak" -msgstr "Amerika/Adak" +#: ../calendar/zones.h:367 +msgid "Indian/Reunion" +msgstr "Indiske hav/Reunion" -#: ../calendar/zones.h:79 -msgid "America/Anchorage" -msgstr "Amerika/Anchorage" +#: ../calendar/zones.h:368 +msgid "Pacific/Apia" +msgstr "Stillehavet/Apia" -#: ../calendar/zones.h:80 -msgid "America/Anguilla" -msgstr "Amerika/Anguilla" +#: ../calendar/zones.h:369 +msgid "Pacific/Auckland" +msgstr "Stillehavet/Auckland" -#: ../calendar/zones.h:81 -msgid "America/Antigua" -msgstr "Amerika/Antigua" +#: ../calendar/zones.h:370 +msgid "Pacific/Chatham" +msgstr "Stillehavet/Chatham" -#: ../calendar/zones.h:82 -msgid "America/Araguaina" -msgstr "Amerika/Araguaina" +#: ../calendar/zones.h:371 +msgid "Pacific/Easter" +msgstr "Stillehavet/Påskeøen" -#: ../calendar/zones.h:83 -msgid "America/Aruba" -msgstr "Amerika/Aruba" +#: ../calendar/zones.h:372 +msgid "Pacific/Efate" +msgstr "Stillehavet/Efate" -#: ../calendar/zones.h:84 -msgid "America/Asuncion" -msgstr "Amerika/Asuncion" +#: ../calendar/zones.h:373 +msgid "Pacific/Enderbury" +msgstr "Stillehavet/Enderbury" -#: ../calendar/zones.h:85 -msgid "America/Barbados" -msgstr "Amerika/Barbados" +#: ../calendar/zones.h:374 +msgid "Pacific/Fakaofo" +msgstr "Stillehavet/Fakaofo" -#: ../calendar/zones.h:86 -msgid "America/Belem" -msgstr "Amerika/Belem" +#: ../calendar/zones.h:375 +msgid "Pacific/Fiji" +msgstr "Stillehavet/Fijiøerne" -#: ../calendar/zones.h:87 -msgid "America/Belize" -msgstr "Amerika/Belize" +#: ../calendar/zones.h:376 +msgid "Pacific/Funafuti" +msgstr "Stillehavet/Funafuti" -#: ../calendar/zones.h:88 -msgid "America/Boa_Vista" -msgstr "Amerika/Boa_Vista" +#: ../calendar/zones.h:377 +msgid "Pacific/Galapagos" +msgstr "Stillehavet/Galapagos" -#: ../calendar/zones.h:89 -msgid "America/Bogota" -msgstr "Amerika/Bogota" +#: ../calendar/zones.h:378 +msgid "Pacific/Gambier" +msgstr "Stillehavet/Gambier" -#: ../calendar/zones.h:90 -msgid "America/Boise" -msgstr "Amerika/Boise" +#: ../calendar/zones.h:379 +msgid "Pacific/Guadalcanal" +msgstr "Stillehavet/Guadalcanal" -#: ../calendar/zones.h:91 -msgid "America/Buenos_Aires" -msgstr "Amerika/Buenos_Aires" +#: ../calendar/zones.h:380 +msgid "Pacific/Guam" +msgstr "Stillehavet/Guam" -#: ../calendar/zones.h:92 -msgid "America/Cambridge_Bay" -msgstr "Amerika/Cambridge_Bay" +#: ../calendar/zones.h:381 +msgid "Pacific/Honolulu" +msgstr "Stillehavet/Honolulu" -#: ../calendar/zones.h:93 -msgid "America/Cancun" -msgstr "Amerika/Cancun" +#: ../calendar/zones.h:382 +msgid "Pacific/Johnston" +msgstr "Stillehavet/Johnston" -#: ../calendar/zones.h:94 -msgid "America/Caracas" -msgstr "Amerika/Caracas" +#: ../calendar/zones.h:383 +msgid "Pacific/Kiritimati" +msgstr "Stillehavet/Kiritimati" -#: ../calendar/zones.h:95 -msgid "America/Catamarca" -msgstr "Amerika/Catamarca" +#: ../calendar/zones.h:384 +msgid "Pacific/Kosrae" +msgstr "Stillehavet/Kosrae" -#: ../calendar/zones.h:96 -msgid "America/Cayenne" -msgstr "Amerika/Cayenne" +#: ../calendar/zones.h:385 +msgid "Pacific/Kwajalein" +msgstr "Stillehavet/Kwajalein" -#: ../calendar/zones.h:97 -msgid "America/Cayman" -msgstr "Amerika/Cayman" +#: ../calendar/zones.h:386 +msgid "Pacific/Majuro" +msgstr "Stillehavet/Majuro" -#: ../calendar/zones.h:98 -msgid "America/Chicago" -msgstr "Amerika/Chicago" +#: ../calendar/zones.h:387 +msgid "Pacific/Marquesas" +msgstr "Stillehavet/Marquesas" -#: ../calendar/zones.h:99 -msgid "America/Chihuahua" -msgstr "Amerika/Chihuahua" +#: ../calendar/zones.h:388 +msgid "Pacific/Midway" +msgstr "Stillehavet/Midway" -#: ../calendar/zones.h:100 -msgid "America/Cordoba" -msgstr "Amerika/Cordoba" +#: ../calendar/zones.h:389 +msgid "Pacific/Nauru" +msgstr "Stillehavet/Nauru" -#: ../calendar/zones.h:101 -msgid "America/Costa_Rica" -msgstr "Amerika/Costa_Rica" +#: ../calendar/zones.h:390 +msgid "Pacific/Niue" +msgstr "Stillehavet/Niue" -#: ../calendar/zones.h:102 -msgid "America/Cuiaba" -msgstr "Amerika/Cuiaba" +#: ../calendar/zones.h:391 +msgid "Pacific/Norfolk" +msgstr "Stillehavet/Norfolk" -#: ../calendar/zones.h:103 -msgid "America/Curacao" -msgstr "Amerika/Curacao" +#: ../calendar/zones.h:392 +msgid "Pacific/Noumea" +msgstr "Stillehavet/Noumea" -#: ../calendar/zones.h:104 -msgid "America/Danmarkshavn" -msgstr "Amerika/Danmarkshavn" +#: ../calendar/zones.h:393 +msgid "Pacific/Pago_Pago" +msgstr "Stillehavet/Pago_Pago" -#: ../calendar/zones.h:105 -msgid "America/Dawson" -msgstr "Amerika/Dawson" +#: ../calendar/zones.h:394 +msgid "Pacific/Palau" +msgstr "Stillehavet/Palau" -#: ../calendar/zones.h:106 -msgid "America/Dawson_Creek" -msgstr "Amerika/Dawson_Creek" +#: ../calendar/zones.h:395 +msgid "Pacific/Pitcairn" +msgstr "Stillehavet/Pitcairn" -#: ../calendar/zones.h:107 -msgid "America/Denver" -msgstr "Amerika/Denver" +#: ../calendar/zones.h:396 +msgid "Pacific/Ponape" +msgstr "Stillehavet/Ponape" -#: ../calendar/zones.h:108 -msgid "America/Detroit" -msgstr "Amerika/Detroit" +#: ../calendar/zones.h:397 +msgid "Pacific/Port_Moresby" +msgstr "Stillehavet/Port_Moresby" -#: ../calendar/zones.h:109 -msgid "America/Dominica" -msgstr "Amerika/Dominika" +#: ../calendar/zones.h:398 +msgid "Pacific/Rarotonga" +msgstr "Stillehavet/Rarotonga" -#: ../calendar/zones.h:110 -msgid "America/Edmonton" -msgstr "Amerika/Edmonton" +#: ../calendar/zones.h:399 +msgid "Pacific/Saipan" +msgstr "Stillehavet/Saipan" -#: ../calendar/zones.h:111 -msgid "America/Eirunepe" -msgstr "Amerika/Eirunepe" +#: ../calendar/zones.h:400 +msgid "Pacific/Tahiti" +msgstr "Stillehavet/Tahiti" -#: ../calendar/zones.h:112 -msgid "America/El_Salvador" -msgstr "Amerika/El_Salvador" +#: ../calendar/zones.h:401 +msgid "Pacific/Tarawa" +msgstr "Stillehavet/Tarawa" -#: ../calendar/zones.h:113 -msgid "America/Fortaleza" -msgstr "Amerika/Fortaleza" +#: ../calendar/zones.h:402 +msgid "Pacific/Tongatapu" +msgstr "Stillehavet/Tongatapu" -#: ../calendar/zones.h:114 -msgid "America/Glace_Bay" -msgstr "Amerika/Glace_Bay" +#: ../calendar/zones.h:403 +msgid "Pacific/Truk" +msgstr "Stillehavet/Truk" -#: ../calendar/zones.h:115 -msgid "America/Godthab" -msgstr "America/Godthåb" +#: ../calendar/zones.h:404 +msgid "Pacific/Wake" +msgstr "Stillehavet/Wake" -#: ../calendar/zones.h:116 -msgid "America/Goose_Bay" -msgstr "Amerika/Goose_Bay" +#: ../calendar/zones.h:405 +msgid "Pacific/Wallis" +msgstr "Stillehavet/Wallis" -#: ../calendar/zones.h:117 -msgid "America/Grand_Turk" -msgstr "Amerika/Grand_Turk" +#: ../calendar/zones.h:406 +msgid "Pacific/Yap" +msgstr "Stillehavet/Yap" -#: ../calendar/zones.h:118 -msgid "America/Grenada" -msgstr "Amerika/Grenada" +#: ../composer/e-composer-autosave.c:273 +msgid "Could not open autosave file" +msgstr "Kunne ikke åbne auto-gemningsfil" -#: ../calendar/zones.h:119 -msgid "America/Guadeloupe" -msgstr "Amerika/Guadeloupe" +#: ../composer/e-composer-autosave.c:280 +msgid "Unable to retrieve message from editor" +msgstr "Kunne ikke hente brev fra editor" -#: ../calendar/zones.h:120 -msgid "America/Guatemala" -msgstr "Amerika/Guatemala" +#: ../composer/e-composer-actions.c:84 +msgid "Untitled Message" +msgstr "Brev uden titel" -#: ../calendar/zones.h:121 -msgid "America/Guayaquil" -msgstr "Amerika/Guayaquil" +#: ../composer/e-composer-actions.c:317 +#: ../widgets/misc/e-attachment-view.c:328 +msgid "Attach a file" +msgstr "Vedlæg en fil" -#: ../calendar/zones.h:122 -msgid "America/Guyana" -msgstr "Amerika/Guyana" +#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:194 +#: ../ui/evolution-mail-messagedisplay.xml.h:4 +msgid "_Close" +msgstr "_Luk" -#: ../calendar/zones.h:123 -msgid "America/Halifax" -msgstr "Amerika/Halifax" +#: ../composer/e-composer-actions.c:324 +msgid "Close the current file" +msgstr "Luk aktiv fil" -#: ../calendar/zones.h:124 -msgid "America/Havana" -msgstr "Amerika/Havana" +#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1338 +#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47 +#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20 +#: ../ui/evolution-tasks.xml.h:29 +msgid "_Print..." +msgstr "_Udskriv..." -#: ../calendar/zones.h:125 -msgid "America/Hermosillo" -msgstr "Amerika/Hermosillo" +#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27 +#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72 +#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15 +msgid "Print Pre_view" +msgstr "V_is udskrift" -#: ../calendar/zones.h:126 -msgid "America/Indiana/Indianapolis" -msgstr "Amerika/Indiana/Indianapolis" +#: ../composer/e-composer-actions.c:345 +msgid "Save the current file" +msgstr "Gem aktiv fil" -#: ../calendar/zones.h:127 -msgid "America/Indiana/Knox" -msgstr "Amerika/Indiana/Knox" +#: ../composer/e-composer-actions.c:350 +msgid "Save _As..." +msgstr "_Gem som..." -#: ../calendar/zones.h:128 -msgid "America/Indiana/Marengo" -msgstr "Amerika/Indiana/Marengo" +#: ../composer/e-composer-actions.c:352 +msgid "Save the current file with a different name" +msgstr "Gem aktiv fil med et nyt navn" -#: ../calendar/zones.h:129 -msgid "America/Indiana/Vevay" -msgstr "Amerika/Indiana/Vevay" +#: ../composer/e-composer-actions.c:357 +msgid "Save as _Draft" +msgstr "Gem som _kladde" -#: ../calendar/zones.h:130 -msgid "America/Indianapolis" -msgstr "Amerika/Indianapolis" +#: ../composer/e-composer-actions.c:359 +msgid "Save as draft" +msgstr "Gem som kladde" -#: ../calendar/zones.h:131 -msgid "America/Inuvik" -msgstr "Amerika/Inuvik" +#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:152 +msgid "S_end" +msgstr "S_end" -#: ../calendar/zones.h:132 -msgid "America/Iqaluit" -msgstr "Amerika/Iqaluit" +#: ../composer/e-composer-actions.c:366 +msgid "Send this message" +msgstr "Send dette brev" -#: ../calendar/zones.h:133 -msgid "America/Jamaica" -msgstr "Amerika/Jamaica" +#: ../composer/e-composer-actions.c:373 +msgid "Insert Send options" +msgstr "Indsæt afsendelsesindstillinger" -#: ../calendar/zones.h:134 -msgid "America/Jujuy" -msgstr "Amerika/Jujuy" +#: ../composer/e-composer-actions.c:378 +msgid "New _Message" +msgstr "Nyt _brev" -#: ../calendar/zones.h:135 -msgid "America/Juneau" -msgstr "Amerika/Juneau" +#: ../composer/e-composer-actions.c:380 +msgid "Open New Message window" +msgstr "Åbn vinduet \"Nyt brev\"" -#: ../calendar/zones.h:136 -msgid "America/Kentucky/Louisville" -msgstr "Amerika/Kentucky/Louisville" +#: ../composer/e-composer-actions.c:387 +msgid "Character _Encoding" +msgstr "Tegn_kodning" -#: ../calendar/zones.h:137 -msgid "America/Kentucky/Monticello" -msgstr "Amerika/Kentucky/Monticello" +#: ../composer/e-composer-actions.c:394 +msgid "_Security" +msgstr "_Sikkerhed" -#: ../calendar/zones.h:138 -msgid "America/La_Paz" -msgstr "Amerika/La_Paz" +#: ../composer/e-composer-actions.c:404 +msgid "PGP _Encrypt" +msgstr "_Kryptér med PGP" -#: ../calendar/zones.h:139 -msgid "America/Lima" -msgstr "Amerika/Lima" +#: ../composer/e-composer-actions.c:406 +msgid "Encrypt this message with PGP" +msgstr "Kryptér dette brev med PGP" -#: ../calendar/zones.h:140 -msgid "America/Los_Angeles" -msgstr "Amerika/Los_Angeles" +#: ../composer/e-composer-actions.c:412 +msgid "PGP _Sign" +msgstr "_Signér med PGP" -#: ../calendar/zones.h:141 -msgid "America/Louisville" -msgstr "Amerika/Louisville" +#: ../composer/e-composer-actions.c:414 +msgid "Sign this message with your PGP key" +msgstr "Underskriv dette brev med din PGP-nøgle" -#: ../calendar/zones.h:142 -msgid "America/Maceio" -msgstr "Amerika/Maceio" +#: ../composer/e-composer-actions.c:420 +msgid "_Prioritize Message" +msgstr "_Prioritér brev" -#: ../calendar/zones.h:143 -msgid "America/Managua" -msgstr "Amerika/Managua" +#: ../composer/e-composer-actions.c:422 +msgid "Set the message priority to high" +msgstr "Angiv brevets prioritet som høj" -#: ../calendar/zones.h:144 -msgid "America/Manaus" -msgstr "Amerika/Manaus" +#: ../composer/e-composer-actions.c:428 +msgid "Re_quest Read Receipt" +msgstr "_Anmod om læsningskvittering" -#: ../calendar/zones.h:145 -msgid "America/Martinique" -msgstr "Amerika/Martinique" +#: ../composer/e-composer-actions.c:430 +msgid "Get delivery notification when your message is read" +msgstr "Anmod om kvittering for at dit brev er blevet åbnet" -#: ../calendar/zones.h:146 -msgid "America/Mazatlan" -msgstr "Amerika/Mazatlan" +#: ../composer/e-composer-actions.c:436 +msgid "S/MIME En_crypt" +msgstr "Kry_ptér med S/MIME" -#: ../calendar/zones.h:147 -msgid "America/Mendoza" -msgstr "Amerika/Mendoza" +#: ../composer/e-composer-actions.c:438 +msgid "Encrypt this message with your S/MIME Encryption Certificate" +msgstr "Kryptér dette brev med dit S/MIME krypteringscertifikat" -#: ../calendar/zones.h:148 -msgid "America/Menominee" -msgstr "Amerika/Menominee" +#: ../composer/e-composer-actions.c:444 +msgid "S/MIME Sig_n" +msgstr "Sig_nér med S/MIME" -#: ../calendar/zones.h:149 -msgid "America/Merida" -msgstr "Amerika/Merida" +#: ../composer/e-composer-actions.c:446 +msgid "Sign this message with your S/MIME Signature Certificate" +msgstr "Signér dette brev med dit S/MIME signaturcertifikat" -#: ../calendar/zones.h:150 -msgid "America/Mexico_City" -msgstr "Amerika/Mexico_City" +#: ../composer/e-composer-actions.c:452 +msgid "_Bcc Field" +msgstr "_Bcc-felt" -#: ../calendar/zones.h:151 -msgid "America/Miquelon" -msgstr "America/Miquelon" +#: ../composer/e-composer-actions.c:454 +msgid "Toggles whether the BCC field is displayed" +msgstr "Slå visning af BCC-feltet fra/til" -#: ../calendar/zones.h:152 -msgid "America/Monterrey" -msgstr "Amerika/Monterrey" +#: ../composer/e-composer-actions.c:460 +msgid "_Cc Field" +msgstr "_Cc-felt" -#: ../calendar/zones.h:153 -msgid "America/Montevideo" -msgstr "Amerika/Montevideo" +#: ../composer/e-composer-actions.c:462 +msgid "Toggles whether the CC field is displayed" +msgstr "Slå visning af CC-feltet fra/til" -#: ../calendar/zones.h:154 -msgid "America/Montreal" -msgstr "Amerika/Montréal" +#: ../composer/e-composer-actions.c:468 +msgid "_From Field" +msgstr "_Fra-felt" -#: ../calendar/zones.h:155 -msgid "America/Montserrat" -msgstr "Amerika/Montserrat" +#: ../composer/e-composer-actions.c:470 +msgid "Toggles whether the From chooser is displayed" +msgstr "Slå visning af Fra-feltet fra/til" -#: ../calendar/zones.h:156 -msgid "America/Nassau" -msgstr "Amerika/Nassau" +#: ../composer/e-composer-actions.c:476 +msgid "_Reply-To Field" +msgstr "Sva_r-til felt" -#: ../calendar/zones.h:157 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3 -msgid "America/New_York" -msgstr "Amerika/New_York" +#: ../composer/e-composer-actions.c:478 +msgid "Toggles whether the Reply-To field is displayed" +msgstr "Slå visning af Svar-til feltet fra/til" -#: ../calendar/zones.h:158 -msgid "America/Nipigon" -msgstr "Amerika/Nipigon" +#: ../composer/e-composer-actions.c:521 +msgid "Save Draft" +msgstr "Gem kladde" -#: ../calendar/zones.h:159 -msgid "America/Nome" -msgstr "Amerika/Nome" +#: ../composer/e-composer-header-table.c:41 +msgid "Enter the recipients of the message" +msgstr "Indtast brevets modtagere" -#: ../calendar/zones.h:160 -msgid "America/Noronha" -msgstr "Amerika/Noronha" +#: ../composer/e-composer-header-table.c:43 +msgid "Enter the addresses that will receive a carbon copy of the message" +msgstr "Indtast adresserne som skal modtage en kopi af brevet" -#: ../calendar/zones.h:161 -msgid "America/North_Dakota/Center" -msgstr "Amerika/North_Dakota/Center" +#: ../composer/e-composer-header-table.c:46 +msgid "" +"Enter the addresses that will receive a carbon copy of the message without " +"appearing in the recipient list of the message" +msgstr "" +"Indtast adresserne som skal modtage en kopi af brevet, uden at blive vist i " +"listen over modtagere" -#: ../calendar/zones.h:162 -msgid "America/Panama" -msgstr "Amerika/Panama" +#: ../composer/e-composer-header-table.c:927 +msgid "Fr_om:" +msgstr "_Fra:" -#: ../calendar/zones.h:163 -msgid "America/Pangnirtung" -msgstr "Amerika/Pangnirtung" +#: ../composer/e-composer-header-table.c:936 +msgid "_Reply-To:" +msgstr "_Svar-til:" -#: ../calendar/zones.h:164 -msgid "America/Paramaribo" -msgstr "Amerika/Paramaribo" +#: ../composer/e-composer-header-table.c:941 +msgid "_To:" +msgstr "_Til:" -#: ../calendar/zones.h:165 -msgid "America/Phoenix" -msgstr "Amerika/Phoenix" +#: ../composer/e-composer-header-table.c:947 +msgid "_Cc:" +msgstr "_Cc:" -#: ../calendar/zones.h:166 -msgid "America/Port-au-Prince" -msgstr "Amerika/Port-au-Prince" +#: ../composer/e-composer-header-table.c:947 +#, fuzzy +msgid "Show CC" +msgstr "V_is: " -#: ../calendar/zones.h:167 -msgid "America/Port_of_Spain" -msgstr "Amerika/Port_of_Spain" +#: ../composer/e-composer-header-table.c:953 +msgid "_Bcc:" +msgstr "_Bcc:" -#: ../calendar/zones.h:168 -msgid "America/Porto_Velho" -msgstr "Amerika/Porto_Velho" +#: ../composer/e-composer-header-table.c:953 +#, fuzzy +msgid "Show BCC" +msgstr "V_is: " -#: ../calendar/zones.h:169 -msgid "America/Puerto_Rico" -msgstr "Amerika/Puerto_Rico" +#: ../composer/e-composer-header-table.c:958 +msgid "_Post To:" +msgstr "_Post-til:" -#: ../calendar/zones.h:170 -msgid "America/Rainy_River" -msgstr "Amerika/Rainy_River" +#: ../composer/e-composer-header-table.c:962 +msgid "S_ubject:" +msgstr "_Emne:" -#: ../calendar/zones.h:171 -msgid "America/Rankin_Inlet" -msgstr "Amerika/Rankin_Inlet" +#: ../composer/e-composer-header-table.c:971 +msgid "Si_gnature:" +msgstr "Si_gnatur:" -#: ../calendar/zones.h:172 -msgid "America/Recife" -msgstr "Amerika/Recife" +#: ../composer/e-composer-name-header.c:115 +msgid "Click here for the address book" +msgstr "Klik her for at se adressebogen" -#: ../calendar/zones.h:173 -msgid "America/Regina" -msgstr "Amerika/Regina" +#: ../composer/e-composer-post-header.c:137 +msgid "Posting destination" +msgstr "Leveringssted for breve" -#: ../calendar/zones.h:174 -msgid "America/Rio_Branco" -msgstr "Amerika/Rio_Branco" +#: ../composer/e-composer-post-header.c:138 +msgid "Choose folders to post the message to." +msgstr "Vælg mapperne som brevet skal sendes til." -#: ../calendar/zones.h:175 -msgid "America/Rosario" -msgstr "Amerika/Rosario" +#: ../composer/e-composer-post-header.c:172 +msgid "Click here to select folders to post to" +msgstr "Klik her for at vælge mapper at sende til" -#: ../calendar/zones.h:176 -msgid "America/Santiago" -msgstr "Amerika/Santiago" +#: ../composer/e-composer-private.c:169 +#, fuzzy +msgid "Save draft" +msgstr "Gem kladde" -#: ../calendar/zones.h:177 -msgid "America/Santo_Domingo" -msgstr "Amerika/Santo_Domingo" +#: ../composer/e-composer-private.c:186 +#, fuzzy +msgid "Add attachment" +msgstr "Bilag" -#: ../calendar/zones.h:178 -msgid "America/Sao_Paulo" -msgstr "Amerika/Sao_Paulo" +#: ../composer/e-msg-composer.c:807 +msgid "" +"Cannot sign outgoing message: No signing certificate set for this account" +msgstr "" +"Kan ikke underskrive udgående brev: Intet signaturcertifikat for denne konto" -#: ../calendar/zones.h:179 -msgid "America/Scoresbysund" -msgstr "Amerika/Scoresbysund" +#: ../composer/e-msg-composer.c:814 +msgid "" +"Cannot encrypt outgoing message: No encryption certificate set for this " +"account" +msgstr "" +"Kan ikke kryptere udgående brev: Intet krypteringscertifikat for denne konto" -#: ../calendar/zones.h:180 -msgid "America/Shiprock" -msgstr "Amerika/Shiprock" +#: ../composer/e-msg-composer.c:1331 ../composer/e-msg-composer.c:2170 +msgid "Compose Message" +msgstr "Skriv brev" -#: ../calendar/zones.h:181 -msgid "America/St_Johns" -msgstr "Amerika/St_Johns" +#: ../composer/e-msg-composer.c:3329 +msgid "" +"(The composer contains a non-text message body, which cannot be edited.)" +msgstr "" +"(Redigeringsvinduet indeholder et brev som ikke er tekst og som ikke kan " +"redigeres.)" -#: ../calendar/zones.h:182 -msgid "America/St_Kitts" -msgstr "Amerika/St_Kitts" +#: ../composer/mail-composer.error.xml.h:1 +msgid "" +" There are few attachments getting downloaded. Sending the mail will cause " +"the mail to be sent without those pending attachments " +msgstr "" +" Der er et par bilag der er ved at blive overført. Ved at sende brevet nu, " +"vil disse bilag ikke blive medsendt " -#: ../calendar/zones.h:183 -msgid "America/St_Lucia" -msgstr "Amerika/St_Lucia" +#: ../composer/mail-composer.error.xml.h:2 +msgid "All accounts have been removed." +msgstr "Alle konti er blevet fjernet." -#: ../calendar/zones.h:184 -msgid "America/St_Thomas" -msgstr "Amerika/St_Thomas" +#: ../composer/mail-composer.error.xml.h:3 +msgid "" +"Are you sure you want to discard the message, titled '{0}', you are " +"composing?" +msgstr "" +"Er du sikker på du vil kassere brevet med titlen \"{0}\", som du er ved at " +"skrive?" -#: ../calendar/zones.h:185 -msgid "America/St_Vincent" -msgstr "Amerika/St_Vincent" +#: ../composer/mail-composer.error.xml.h:4 +msgid "Because "{0}", you may need to select different mail options." +msgstr "" +"Fordi "{0}", vil du måske være nødt til at vælge andre e-post-" +"indstillinger." -#: ../calendar/zones.h:186 -msgid "America/Swift_Current" -msgstr "Amerika/Swift_Current" +#: ../composer/mail-composer.error.xml.h:5 +msgid "Because "{1}"." +msgstr "Fordi "{1}"." -#: ../calendar/zones.h:187 -msgid "America/Tegucigalpa" -msgstr "Amerika/Tegucigalpa" +#: ../composer/mail-composer.error.xml.h:6 +msgid "" +"Closing this composer window will discard the message permanently, unless " +"you choose to save the message in your Drafts folder. This will allow you to " +"continue the message at a later date." +msgstr "" +"Hvis du lukker skrivevinduet vil beskeden forkastes permanent, med mindre du " +"vælger at gemme brevet i mappen Kladder. Dette vil lade dig fortsætte med at " +"skrive brevet på et senere tidspunkt." -#: ../calendar/zones.h:188 -msgid "America/Thule" -msgstr "Amerika/Thule" +#: ../composer/mail-composer.error.xml.h:7 +msgid "Could not create composer window." +msgstr "Kunne ikke oprette skrivevindue." -#: ../calendar/zones.h:189 -msgid "America/Thunder_Bay" -msgstr "Amerika/Thunder_Bay" +#: ../composer/mail-composer.error.xml.h:8 +msgid "Could not create message." +msgstr "Kunne ikke oprette brev." -#: ../calendar/zones.h:190 -msgid "America/Tijuana" -msgstr "Amerika/Tijuana" +#: ../composer/mail-composer.error.xml.h:9 +msgid "Could not read signature file "{0}"." +msgstr "Kunne ikke læse signaturfilen "{0}"." -#: ../calendar/zones.h:191 -msgid "America/Tortola" -msgstr "Amerika/Tortola" +#: ../composer/mail-composer.error.xml.h:10 +msgid "Could not retrieve messages to attach from {0}." +msgstr "Kunne ikke hente brevene der skulle vedlægges fra {0}." -#: ../calendar/zones.h:192 -msgid "America/Vancouver" -msgstr "Amerika/Vancouver" +#: ../composer/mail-composer.error.xml.h:11 +msgid "Could not save to autosave file "{0}"." +msgstr "Kunne ikke gemme til autogemfilen "{0}"." -#: ../calendar/zones.h:193 -msgid "America/Whitehorse" -msgstr "Amerika/Whitehorse" +#: ../composer/mail-composer.error.xml.h:12 +msgid "Directories can not be attached to Messages." +msgstr "Mapper kan ikke vedlægges breve." -#: ../calendar/zones.h:194 -msgid "America/Winnipeg" -msgstr "Amerika/Winnipeg" +#: ../composer/mail-composer.error.xml.h:13 +msgid "Do you want to recover unfinished messages?" +msgstr "Vil du genoprette uafsluttede breve?" -#: ../calendar/zones.h:195 -msgid "America/Yakutat" -msgstr "Amerika/Yakutat" +#: ../composer/mail-composer.error.xml.h:14 +msgid "Download in progress. Do you want to send the mail?" +msgstr "Overførsel i gang. Vil du sende brevet?" -#: ../calendar/zones.h:196 -msgid "America/Yellowknife" -msgstr "Amerika/Yellowknife" +#: ../composer/mail-composer.error.xml.h:15 +msgid "Error saving to autosave because "{1}"." +msgstr "Fejl ved gemning til autogem fordi "{1}"." -#: ../calendar/zones.h:197 -msgid "Antarctica/Casey" -msgstr "Antarktis/Casey" +#: ../composer/mail-composer.error.xml.h:16 +msgid "" +"Evolution quit unexpectedly while you were composing a new message. " +"Recovering the message will allow you to continue where you left off." +msgstr "" +"Evolution afsluttede uventet mens du var ved at skrive et nyt brev. " +"Genoprettelse af brevet vil lade dig fortsætte hvor du slap." -#: ../calendar/zones.h:198 -msgid "Antarctica/Davis" -msgstr "Antarktis/Davis" +#: ../composer/mail-composer.error.xml.h:17 +msgid "" +"Send options available only for Novell GroupWise and Microsoft Exchange " +"accounts." +msgstr "" +"Sendetilvalg som kun er tilgængelige for Novell Groupwise- og Microsoft " +"Exchange-konti." -#: ../calendar/zones.h:199 -msgid "Antarctica/DumontDUrville" -msgstr "Antarktis/DumontDUrville" +#: ../composer/mail-composer.error.xml.h:18 +msgid "Send options not available." +msgstr "Afsendelsesindstillinger ikke tilgængelige." -#: ../calendar/zones.h:200 -msgid "Antarctica/Mawson" -msgstr "Antarktis/Mawson" +#: ../composer/mail-composer.error.xml.h:19 +msgid "The file `{0}' is not a regular file and cannot be sent in a message." +msgstr "Filen \"{0}\" er ikke en normal fil og kan ikke sendes i et brev." -#: ../calendar/zones.h:201 -msgid "Antarctica/McMurdo" -msgstr "Antarktis/McMurdo" +#: ../composer/mail-composer.error.xml.h:20 +msgid "" +"To attach the contents of this directory, either attach the files in this " +"directory individually, or create an archive of the directory and attach it." +msgstr "" +"For at tilføje indholdet af denne mappe, må du enten vedlægge filerne hver " +"for sig, eller oprette et arkiv af mappen og vedlægge dette." -#: ../calendar/zones.h:202 -msgid "Antarctica/Palmer" -msgstr "Antarktis/Palmer" +#: ../composer/mail-composer.error.xml.h:21 +msgid "" +"Unable to activate the HTML editor control.\n" +"\n" +"Please make sure that you have the correct version of gtkhtml and libgtkhtml " +"installed." +msgstr "" +"Kan ikke aktivere HTML-redigeringskomponenten.\n" +"\n" +"Kontrollér venligst at du har den rette version af gtkhtml og libgtkhtml " +"installeret." -#: ../calendar/zones.h:203 -msgid "Antarctica/South_Pole" -msgstr "Antarktis/Syd_polen" +#: ../composer/mail-composer.error.xml.h:24 +msgid "Unable to activate the address selector control." +msgstr "Kan ikke aktivere styreelement til adresseudvælgelse." -#: ../calendar/zones.h:204 -msgid "Antarctica/Syowa" -msgstr "Antarktis/Syowa" +#: ../composer/mail-composer.error.xml.h:25 +msgid "Unfinished messages found" +msgstr "Ikke-fuldførte breve fundet" -#: ../calendar/zones.h:205 -msgid "Antarctica/Vostok" -msgstr "Antarktis/Vostok" +#: ../composer/mail-composer.error.xml.h:26 +msgid "Warning: Modified Message" +msgstr "Advarsel: Brevet ændret" -#: ../calendar/zones.h:206 -msgid "Arctic/Longyearbyen" -msgstr "Arktis/Longyearbyen" +#: ../composer/mail-composer.error.xml.h:27 +msgid "You cannot attach the file `{0}' to this message." +msgstr "Du kan ikke vedlægge filen \"{0}\" til dette brev." -#: ../calendar/zones.h:207 -msgid "Asia/Aden" -msgstr "Asien/Aden" +#: ../composer/mail-composer.error.xml.h:28 +msgid "You need to configure an account before you can compose mail." +msgstr "Du skal konfigurere en konto inden du kan skrive e-post." -#: ../calendar/zones.h:208 -msgid "Asia/Almaty" -msgstr "Asien/Almaty" +#: ../composer/mail-composer.error.xml.h:29 +msgid "_Continue Editing" +msgstr "_Fortsæt med at redigere" -#: ../calendar/zones.h:209 -msgid "Asia/Amman" -msgstr "Asien/Amman" +#: ../composer/mail-composer.error.xml.h:31 +msgid "_Do not Recover" +msgstr "Gendan _ikke" -#: ../calendar/zones.h:210 -msgid "Asia/Anadyr" -msgstr "Asien/Anadyr" +#: ../composer/mail-composer.error.xml.h:32 +msgid "_Recover" +msgstr "_Genopret" -#: ../calendar/zones.h:211 -msgid "Asia/Aqtau" -msgstr "Asien/Aqtau" +#: ../composer/mail-composer.error.xml.h:33 +msgid "_Save Draft" +msgstr "_Gem kladde" -#: ../calendar/zones.h:212 -msgid "Asia/Aqtobe" -msgstr "Asien/Aqtobe" +#: ../data/evolution.desktop.in.in.h:1 +msgid "Evolution Mail and Calendar" +msgstr "Evolutions E-post og Kalender" -#: ../calendar/zones.h:213 -msgid "Asia/Ashgabat" -msgstr "Asien/Ashgabat" +#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:948 +msgid "Groupware Suite" +msgstr "Samarbejdsprogrammelsuite" -#: ../calendar/zones.h:214 -msgid "Asia/Baghdad" -msgstr "Asien/Bagdad" +#: ../data/evolution.desktop.in.in.h:3 +msgid "Manage your email, contacts and schedule" +msgstr "Håndter dine e-breve, kontakter og skema" -#: ../calendar/zones.h:215 -msgid "Asia/Bahrain" -msgstr "Asien/Bahrain" +#: ../data/evolution.keys.in.in.h:1 +msgid "address card" +msgstr "adressekort" -#: ../calendar/zones.h:216 -msgid "Asia/Baku" -msgstr "Asien/Bakuc" +#: ../data/evolution.keys.in.in.h:2 +msgid "calendar information" +msgstr "kalenderinformation" -#: ../calendar/zones.h:217 -msgid "Asia/Bangkok" -msgstr "Asien/Bangkok" +#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121 +msgid "Evolution Error" +msgstr "Evolution fejl" -#: ../calendar/zones.h:218 -msgid "Asia/Beirut" -msgstr "Asien/Beirut" +#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119 +msgid "Evolution Warning" +msgstr "Evolution advarsel" -#: ../calendar/zones.h:219 -msgid "Asia/Bishkek" -msgstr "Asien/Bishkek" +#: ../e-util/e-error.c:118 +msgid "Evolution Information" +msgstr "Evolution information" -#: ../calendar/zones.h:220 -msgid "Asia/Brunei" -msgstr "Asien/Brunei" +#: ../e-util/e-error.c:120 +msgid "Evolution Query" +msgstr "Evolution forespørgsel" -#: ../calendar/zones.h:221 -msgid "Asia/Calcutta" -msgstr "Asien/Calcutta" +#. setup a dummy error +#: ../e-util/e-error.c:448 +#, c-format +msgid "Internal error, unknown error '%s' requested" +msgstr "Intern fejl, ukendt fejl \"%s\" forespurgt" -#: ../calendar/zones.h:222 -msgid "Asia/Choibalsan" -msgstr "Asien/Choibalsan" +#: ../e-util/e-logger.c:161 +msgid "Component" +msgstr "Komponent" -#: ../calendar/zones.h:223 -msgid "Asia/Chongqing" -msgstr "Asien Chongqing" - -#: ../calendar/zones.h:224 -msgid "Asia/Colombo" -msgstr "Asien/Colombo" +#: ../e-util/e-logger.c:162 +msgid "Name of the component being logged" +msgstr "Navn på den komponent som logges" -#: ../calendar/zones.h:225 -msgid "Asia/Damascus" -msgstr "Asien/Damaskus" +#: ../e-util/e-non-intrusive-error-dialog.c:190 +msgid "Debug Logs" +msgstr "Fejlfindingslogge" -#: ../calendar/zones.h:226 -msgid "Asia/Dhaka" -msgstr "Asien/Dhaka" +#: ../e-util/e-non-intrusive-error-dialog.c:204 +msgid "Show _errors in the status bar for" +msgstr "Viser _fejl i statusbjælken i" -#: ../calendar/zones.h:227 -msgid "Asia/Dili" -msgstr "Asien/Dili" +#. Translators: This is the second part of the sentence +#. * "Show _errors in the status bar for" - XXX - "second(s)." +#: ../e-util/e-non-intrusive-error-dialog.c:222 +msgid "second(s)." +msgstr "sekund(er)." -#: ../calendar/zones.h:228 -msgid "Asia/Dubai" -msgstr "Asien/Dubai" +#: ../e-util/e-non-intrusive-error-dialog.c:228 +msgid "Log Messages:" +msgstr "Log breve:" -#: ../calendar/zones.h:229 -msgid "Asia/Dushanbe" -msgstr "Asien/Dushanbe" +#: ../e-util/e-non-intrusive-error-dialog.c:273 +msgid "Log Level" +msgstr "Logniveau" -#: ../calendar/zones.h:230 -msgid "Asia/Gaza" -msgstr "Asien/Gaza" +#: ../e-util/e-non-intrusive-error-dialog.c:281 +#: ../widgets/misc/e-dateedit.c:388 +msgid "Time" +msgstr "Tid" -#: ../calendar/zones.h:231 -msgid "Asia/Harbin" -msgstr "Asien/Harbin" +#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523 +#: ../mail/message-list.etspec.h:10 +msgid "Messages" +msgstr "Breve" -#: ../calendar/zones.h:232 -msgid "Asia/Hong_Kong" -msgstr "Asien/Hong_Kong" +#: ../e-util/e-non-intrusive-error-dialog.c:300 +#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4 +msgid "Close this window" +msgstr "Luk dette vindue" -#: ../calendar/zones.h:233 -msgid "Asia/Hovd" -msgstr "Asien/Hovd" +#: ../e-util/e-non-intrusive-error-dialog.h:40 +msgid "Error" +msgstr "Fejl" -#: ../calendar/zones.h:234 -msgid "Asia/Irkutsk" -msgstr "Asien/Irkutsk" +#: ../e-util/e-non-intrusive-error-dialog.h:40 +msgid "Errors" +msgstr "Fejl" -#: ../calendar/zones.h:235 -msgid "Asia/Istanbul" -msgstr "Asien/Istanbul" +#: ../e-util/e-non-intrusive-error-dialog.h:41 +msgid "Warnings and Errors" +msgstr "Advarsler og fejl" -#: ../calendar/zones.h:236 -msgid "Asia/Jakarta" -msgstr "Asien/Jakarta" +#: ../e-util/e-non-intrusive-error-dialog.h:42 +msgid "Debug" +msgstr "Fejlfind" -#: ../calendar/zones.h:237 -msgid "Asia/Jayapura" -msgstr "Asien/Jayapura" +#: ../e-util/e-non-intrusive-error-dialog.h:42 +msgid "Error, Warnings and Debug messages" +msgstr "Fejl, advarsler og fejlfindingsbeskeder" -#: ../calendar/zones.h:238 -msgid "Asia/Jerusalem" -msgstr "Asien/Jerusalem" +#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799 +#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:943 +#: ../plugins/plugin-manager/plugin-manager.c:355 +#: ../plugins/publish-calendar/publish-calendar.c:706 +msgid "Enabled" +msgstr "Aktiveret" -#: ../calendar/zones.h:239 -msgid "Asia/Kabul" -msgstr "Asien/Kabul" +#: ../e-util/e-plugin.c:309 +msgid "Whether the plugin is enabled" +msgstr "Om udvidelsesmodulet er slået til eller fra" -#: ../calendar/zones.h:240 -msgid "Asia/Kamchatka" -msgstr "Asien/Kamchatka" +#: ../e-util/e-print.c:160 +msgid "An error occurred while printing" +msgstr "Der opstod en fejl under udskrivning" -#: ../calendar/zones.h:241 -msgid "Asia/Karachi" -msgstr "Asien/Karachi" +#: ../e-util/e-print.c:167 +msgid "The printing system reported the following details about the error:" +msgstr "Udskriftssystemet gav følgende information om fejlen:" -#: ../calendar/zones.h:242 -msgid "Asia/Kashgar" -msgstr "Asien/Kashgar" +#: ../e-util/e-print.c:173 +msgid "" +"The printing system did not report any additional details about the error." +msgstr "Udskriftssystemet gav ikke yderligere information om fejlen." -#: ../calendar/zones.h:243 -msgid "Asia/Katmandu" -msgstr "Asien/Katmandu" +#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19 +msgid "Because \"{1}\"." +msgstr "Fordi \"{1}\"." -#: ../calendar/zones.h:244 -msgid "Asia/Krasnoyarsk" -msgstr "Asien/Krasnoyarsk" +#: ../e-util/e-system.error.xml.h:2 +msgid "Cannot open file \"{0}\"." +msgstr "Kan ikke åbne filen \"{0}\"." -#: ../calendar/zones.h:245 -msgid "Asia/Kuala_Lumpur" -msgstr "Asien/Kuala_Lumpur" +#: ../e-util/e-system.error.xml.h:3 +msgid "Cannot save file \"{0}\"." +msgstr "Kan ikke gemme filen \"{0}\"." -#: ../calendar/zones.h:246 -msgid "Asia/Kuching" -msgstr "Asien/Kuching" +#: ../e-util/e-system.error.xml.h:4 +msgid "Do you wish to overwrite it?" +msgstr "Ønsker du at overskrive den?" -#: ../calendar/zones.h:247 -msgid "Asia/Kuwait" -msgstr "Asien/Kuwait" +#: ../e-util/e-system.error.xml.h:5 +msgid "File exists \"{0}\"." +msgstr "Filen findes \"{0}\"." -#: ../calendar/zones.h:248 -msgid "Asia/Macao" -msgstr "Asien/Macao" +#: ../e-util/e-system.error.xml.h:6 +msgid "Overwrite file?" +msgstr "Overskriv fil?" -#: ../calendar/zones.h:249 -msgid "Asia/Macau" -msgstr "Asien/Macao" +#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141 +msgid "_Overwrite" +msgstr "_Overskriv" -#: ../calendar/zones.h:250 -msgid "Asia/Magadan" -msgstr "Asien/Magadan" +#: ../e-util/e-util.c:133 +msgid "Could not open the link." +msgstr "Kunne ikke åbne link." -#: ../calendar/zones.h:251 -msgid "Asia/Makassar" -msgstr "Asien/Makassar" +#: ../e-util/e-util.c:183 +msgid "Could not display help for Evolution." +msgstr "Kunne ikke vise hjælp for Evolution." -#: ../calendar/zones.h:252 -msgid "Asia/Manila" -msgstr "Asien/Manila" +#: ../e-util/e-util-labels.c:45 +msgid "I_mportant" +msgstr "_Vigtig" -#: ../calendar/zones.h:253 -msgid "Asia/Muscat" -msgstr "Asien/Muscat" +#. red +#: ../e-util/e-util-labels.c:46 +msgid "_Work" +msgstr "A_rbejde" -#: ../calendar/zones.h:254 -msgid "Asia/Nicosia" -msgstr "Asien/Nicosia" +#. orange +#: ../e-util/e-util-labels.c:47 +msgid "_Personal" +msgstr "_Personligt" -#: ../calendar/zones.h:255 -msgid "Asia/Novosibirsk" -msgstr "Asien/Novosibirsk" +#. green +#: ../e-util/e-util-labels.c:48 +msgid "_To Do" +msgstr "_Gøremål" -#: ../calendar/zones.h:256 -msgid "Asia/Omsk" -msgstr "Asien/Omsk" +#. blue +#: ../e-util/e-util-labels.c:49 +msgid "_Later" +msgstr "_Senere" -#: ../calendar/zones.h:257 -msgid "Asia/Oral" -msgstr "Asien/Ural" +#: ../e-util/e-util-labels.c:321 +msgid "Label _Name:" +msgstr "Mærkat_navn:" -#: ../calendar/zones.h:258 -msgid "Asia/Phnom_Penh" -msgstr "Asien/Phnom_Penh" +#: ../e-util/e-util-labels.c:344 +msgid "Edit Label" +msgstr "Rediger mærkat" -#: ../calendar/zones.h:259 -msgid "Asia/Pontianak" -msgstr "Asien/Pontianak" +#: ../e-util/e-util-labels.c:344 +msgid "Add Label" +msgstr "Tilføj mærkat" -#: ../calendar/zones.h:260 -msgid "Asia/Pyongyang" -msgstr "Asien/Pyongyang" +#: ../e-util/e-util-labels.c:363 +msgid "Label name cannot be empty." +msgstr "Mærkatnavnet kan ikke være tomt." -#: ../calendar/zones.h:261 -msgid "Asia/Qatar" -msgstr "Asien/Qatar" +#: ../e-util/e-util-labels.c:368 +msgid "" +"A label having the same tag already exists on the server. Please rename your " +"label." +msgstr "" +"Mærkat med samme mærke eksisterer allerede på serveren. Omdøb venligst din " +"mærkat." -#: ../calendar/zones.h:262 -msgid "Asia/Qyzylorda" -msgstr "Asien/Kzyl-Orda" +#: ../e-util/gconf-bridge.c:1222 +#, c-format +msgid "GConf error: %s" +msgstr "GConf-fejl: %s" -#: ../calendar/zones.h:263 -msgid "Asia/Rangoon" -msgstr "Asien/Rangoon" +#: ../e-util/gconf-bridge.c:1233 +msgid "All further errors shown only on terminal." +msgstr "Alle følgende fejl vises kun i terminalen." -#: ../calendar/zones.h:264 -msgid "Asia/Riyadh" -msgstr "Asien/Riyadh" +#: ../filter/filter-datespec.c:81 +#, c-format +msgid "1 second ago" +msgid_plural "%d seconds ago" +msgstr[0] "1 sekund siden" +msgstr[1] "%d sekunder siden" -#: ../calendar/zones.h:265 -msgid "Asia/Saigon" -msgstr "Asien/Saigon" +#: ../filter/filter-datespec.c:81 +#, c-format +msgid "1 second in the future" +msgid_plural "%d seconds in the future" +msgstr[0] "1 sekund ude i fremtiden" +msgstr[1] "%d sekunder ude i fremtiden" -#: ../calendar/zones.h:266 -msgid "Asia/Sakhalin" -msgstr "Asien/Sakhalin" +#: ../filter/filter-datespec.c:82 +#, c-format +msgid "1 minute ago" +msgid_plural "%d minutes ago" +msgstr[0] "1 minut siden" +msgstr[1] "%d minutter siden" -#: ../calendar/zones.h:267 -msgid "Asia/Samarkand" -msgstr "Asien/Samarkand" +#: ../filter/filter-datespec.c:82 +#, c-format +msgid "1 minute in the future" +msgid_plural "%d minutes in the future" +msgstr[0] "1 minut ude i fremtiden" +msgstr[1] "%d minutter ude i fremtiden" -#: ../calendar/zones.h:268 -msgid "Asia/Seoul" -msgstr "Asien/Seoul" +#: ../filter/filter-datespec.c:83 +#, c-format +msgid "1 hour ago" +msgid_plural "%d hours ago" +msgstr[0] "1 time siden" +msgstr[1] "%d timer siden" -#: ../calendar/zones.h:269 -msgid "Asia/Shanghai" -msgstr "Asien/Shanghai" +#: ../filter/filter-datespec.c:83 +#, c-format +msgid "1 hour in the future" +msgid_plural "%d hours in the future" +msgstr[0] "1 time ude i fremtiden" +msgstr[1] "%d timer ude i fremtiden" -#: ../calendar/zones.h:270 -msgid "Asia/Singapore" -msgstr "Asien/Singapore" +#: ../filter/filter-datespec.c:84 +#, c-format +msgid "1 day ago" +msgid_plural "%d days ago" +msgstr[0] "1 dag siden" +msgstr[1] "%d dage siden" -#: ../calendar/zones.h:271 -msgid "Asia/Taipei" -msgstr "Asien/Taipei" +#: ../filter/filter-datespec.c:84 +#, c-format +msgid "1 day in the future" +msgid_plural "%d days in the future" +msgstr[0] "1 dag ude i fremtiden" +msgstr[1] "%d dage ude i fremtiden" -#: ../calendar/zones.h:272 -msgid "Asia/Tashkent" -msgstr "Asien/Tashkent" +#: ../filter/filter-datespec.c:85 +#, c-format +msgid "1 week ago" +msgid_plural "%d weeks ago" +msgstr[0] "1 uge siden" +msgstr[1] "%d uger siden" -#: ../calendar/zones.h:273 -msgid "Asia/Tbilisi" -msgstr "Asien/Tbilisi" +#: ../filter/filter-datespec.c:85 +#, c-format +msgid "1 week in the future" +msgid_plural "%d weeks in the future" +msgstr[0] "1 uge ude i fremtiden" +msgstr[1] "%d uger ude i fremtiden" -#: ../calendar/zones.h:274 -msgid "Asia/Tehran" -msgstr "Asien/Teheran" +#: ../filter/filter-datespec.c:86 +#, c-format +msgid "1 month ago" +msgid_plural "%d months ago" +msgstr[0] "1 måned siden" +msgstr[1] "%d måneder siden" -#: ../calendar/zones.h:275 -msgid "Asia/Thimphu" -msgstr "Asien/Thimphu" +#: ../filter/filter-datespec.c:86 +#, c-format +msgid "1 month in the future" +msgid_plural "%d months in the future" +msgstr[0] "1 måned ude i fremtiden" +msgstr[1] "%d måneder ude i fremtiden" -#: ../calendar/zones.h:276 -msgid "Asia/Tokyo" -msgstr "Asien/Tokyo" +#: ../filter/filter-datespec.c:87 +#, c-format +msgid "1 year ago" +msgid_plural "%d years ago" +msgstr[0] "1 år siden" +msgstr[1] "%d år siden" -#: ../calendar/zones.h:277 -msgid "Asia/Ujung_Pandang" -msgstr "Asien/Ujung_Pandang" +#: ../filter/filter-datespec.c:87 +#, c-format +msgid "1 year in the future" +msgid_plural "%d years in the future" +msgstr[0] "1 år ude i fremtiden" +msgstr[1] "%d år ude i fremtiden" -#: ../calendar/zones.h:278 -msgid "Asia/Ulaanbaatar" -msgstr "Asien/Ulaanbaatar" +#: ../filter/filter-datespec.c:288 +msgid "" +msgstr "" -#: ../calendar/zones.h:279 -msgid "Asia/Urumqi" -msgstr "Asien/Urumqi" +#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302 +#: ../filter/filter-datespec.c:313 +msgid "now" +msgstr "nu" -#: ../calendar/zones.h:280 -msgid "Asia/Vientiane" -msgstr "Asien/Vientiane" +#. strftime for date filter display, only needs to show a day date (i.e. no time) +#: ../filter/filter-datespec.c:298 +msgid "%d-%b-%Y" +msgstr "%d %b %Y" -#: ../calendar/zones.h:281 -msgid "Asia/Vladivostok" -msgstr "Asien/Vladivostok" +#: ../filter/filter-datespec.c:442 +msgid "Select a time to compare against" +msgstr "Vælg en tid at sammenligne med" -#: ../calendar/zones.h:282 -msgid "Asia/Yakutsk" -msgstr "Asien/Jakutsk" +#: ../filter/filter-file.c:284 +msgid "Choose a file" +msgstr "Vælg en fil" -#: ../calendar/zones.h:283 -msgid "Asia/Yekaterinburg" -msgstr "Asien/Jekaterinburg" +#: ../filter/filter-part.c:532 +#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3 +msgid "Test" +msgstr "Test" -#: ../calendar/zones.h:284 -msgid "Asia/Yerevan" -msgstr "Asien/Jerevan" +#: ../filter/filter-rule.c:854 +msgid "R_ule name:" +msgstr "R_egelnavn:" -#: ../calendar/zones.h:285 -msgid "Atlantic/Azores" -msgstr "Atlanten/Azorene" +#: ../filter/filter-rule.c:882 +msgid "Find items that meet the following conditions" +msgstr "Find punkter der opfylder følgende betingelser" -#: ../calendar/zones.h:286 -msgid "Atlantic/Bermuda" -msgstr "Atlanten/Bermuda" +#: ../filter/filter-rule.c:916 +msgid "A_dd Condition" +msgstr "T_ilføj betingelse" -#: ../calendar/zones.h:287 -msgid "Atlantic/Canary" -msgstr "Atlanteren/De canariske øer" +#: ../filter/filter-rule.c:922 +msgid "If all conditions are met" +msgstr "Hvis alle betingelser er opfyldt" -#: ../calendar/zones.h:288 -msgid "Atlantic/Cape_Verde" -msgstr "Atlanten/Kap_Verde" +#: ../filter/filter-rule.c:922 +msgid "If any conditions are met" +msgstr "Hvis én eller flere betingelser er opfyldt" -#: ../calendar/zones.h:289 -msgid "Atlantic/Faeroe" -msgstr "Atlanten/Færøerne" +#: ../filter/filter-rule.c:924 +msgid "_Find items:" +msgstr "_Find punkter:" -#: ../calendar/zones.h:290 -msgid "Atlantic/Jan_Mayen" -msgstr "Atlanten/Jan_Mayen" +#: ../filter/filter-rule.c:942 +msgid "All related" +msgstr "Alle relaterede" -#: ../calendar/zones.h:291 -msgid "Atlantic/Madeira" -msgstr "Atlanten/Madeira" +#: ../filter/filter-rule.c:942 +msgid "Replies" +msgstr "Svar" -#: ../calendar/zones.h:292 -msgid "Atlantic/Reykjavik" -msgstr "Atlanten/Reykjavík" +#: ../filter/filter-rule.c:942 +msgid "Replies and parents" +msgstr "Svar og forældre" -#: ../calendar/zones.h:293 -msgid "Atlantic/South_Georgia" -msgstr "Atlanten/Syd-_Georgia" +#: ../filter/filter-rule.c:942 +msgid "No reply or parent" +msgstr "Intet svar eller forældre" -#: ../calendar/zones.h:294 -msgid "Atlantic/St_Helena" -msgstr "Atlanten/St_Helena" +#: ../filter/filter-rule.c:944 +msgid "I_nclude threads" +msgstr "I_nkludér tråde" -#: ../calendar/zones.h:295 -msgid "Atlantic/Stanley" -msgstr "Atlanten/Stanley" +#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3 +#: ../mail/em-utils.c:310 +msgid "Incoming" +msgstr "Indkommende" -#: ../calendar/zones.h:296 -msgid "Australia/Adelaide" -msgstr "Australien/Adelaide" +#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:311 +msgid "Outgoing" +msgstr "Udgående" -#: ../calendar/zones.h:297 -msgid "Australia/Brisbane" -msgstr "Australien/Brisbane" +#: ../filter/filter.error.xml.h:1 +msgid "Bad regular expression "{0}"." +msgstr "Fejl i regulært udtryk "{0}"." -#: ../calendar/zones.h:298 -msgid "Australia/Broken_Hill" -msgstr "Australien/Broken_Hill" +#: ../filter/filter.error.xml.h:2 +msgid "Could not compile regular expression "{1}"." +msgstr "Kunne ikke oversætte det regulære udtryk "{1}"." -#: ../calendar/zones.h:299 -msgid "Australia/Darwin" -msgstr "Australien/Darwin" +#: ../filter/filter.error.xml.h:3 +msgid "File "{0}" does not exist or is not a regular file." +msgstr "Filen "{0}" findes ikke eller er ingen almindelig fil." -#: ../calendar/zones.h:300 -msgid "Australia/Hobart" -msgstr "Australien/Hobart" +#: ../filter/filter.error.xml.h:4 +msgid "Missing date." +msgstr "Dato mangler." -#: ../calendar/zones.h:301 -msgid "Australia/Lindeman" -msgstr "Australien/Lindeman" +#: ../filter/filter.error.xml.h:5 +msgid "Missing file name." +msgstr "Filnavn mangler." -#: ../calendar/zones.h:302 -msgid "Australia/Lord_Howe" -msgstr "Australien/Lord_Howe" +#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75 +msgid "Missing name." +msgstr "Navn mangler." -#: ../calendar/zones.h:303 -msgid "Australia/Melbourne" -msgstr "Australien/Melbourne" +#: ../filter/filter.error.xml.h:7 +msgid "Name "{0}" already used." +msgstr "Navnet "{0}" er allerede brugt." -#: ../calendar/zones.h:304 -msgid "Australia/Perth" -msgstr "Australien/Perth" +#: ../filter/filter.error.xml.h:8 +msgid "Please choose another name." +msgstr "Vælg venligst et andet navn." -#: ../calendar/zones.h:305 -msgid "Australia/Sydney" -msgstr "Australien/Sydney" +#: ../filter/filter.error.xml.h:9 +msgid "You must choose a date." +msgstr "Du skal vælge en dato." -#: ../calendar/zones.h:306 -msgid "Europe/Amsterdam" -msgstr "Europa/Amsterdam" +#: ../filter/filter.error.xml.h:10 +msgid "You must name this filter." +msgstr "Du skal give navn til dette filter." -#: ../calendar/zones.h:307 -msgid "Europe/Andorra" -msgstr "Europa/Andorra" +#: ../filter/filter.error.xml.h:11 +msgid "You must specify a file name." +msgstr "Du skal angive et filnavn." -#: ../calendar/zones.h:308 -msgid "Europe/Athens" -msgstr "Europa/Athen" +#: ../filter/filter.glade.h:1 +msgid "_Filter Rules" +msgstr "_Filterregler" -#: ../calendar/zones.h:309 -msgid "Europe/Belfast" -msgstr "Europa/Belfast" +#: ../filter/filter.glade.h:2 +msgid "Compare against" +msgstr "Sammenlign med" -#: ../calendar/zones.h:310 -msgid "Europe/Belgrade" -msgstr "Europa/Beograd" +#: ../filter/filter.glade.h:4 +msgid "Show filters for mail:" +msgstr "Vis filtre for e-post:" -#: ../calendar/zones.h:311 -msgid "Europe/Berlin" -msgstr "Europa/Berlin" +#: ../filter/filter.glade.h:5 +msgid "" +"The message's date will be compared against\n" +"12:00am of the date specified." +msgstr "" +"Brevets datering vil blive sammenlignet med\n" +"klokken 12.00 på den angivne dato." -#: ../calendar/zones.h:312 -msgid "Europe/Bratislava" -msgstr "Europa/Bratislava" +#: ../filter/filter.glade.h:7 +msgid "" +"The message's date will be compared against\n" +"a time relative to when filtering occurs." +msgstr "" +"Brevets datering vil blive sammenlignet med\n" +"en tid som er relativ til når filtrering sker." -#: ../calendar/zones.h:313 -msgid "Europe/Brussels" -msgstr "Europa/Bryssel" +#: ../filter/filter.glade.h:9 +msgid "" +"The message's date will be compared against\n" +"the current time when filtering occurs." +msgstr "" +"Brevets datering vil blive sammenlignet med\n" +"det aktuelle tidspunkt når filtreringen sker." -#: ../calendar/zones.h:314 -msgid "Europe/Bucharest" -msgstr "Europa/Bukarest" +# Det her er lidt en fortolkning. Jeg går ud fra at strengen ender med at skulle være. 2 måneder og 4 dage ude i fremtiden. Gættet er også lidt understøttet af at strengen "a time relative to the current time" findes lige i nærheden +#: ../filter/filter.glade.h:12 +#, fuzzy +msgid "" +"ago\n" +"in the future" +msgstr "ude i fremtiden" -#: ../calendar/zones.h:315 -msgid "Europe/Budapest" -msgstr "Europa/Budapest" +#: ../filter/filter.glade.h:14 +msgid "" +"seconds\n" +"minutes\n" +"hours\n" +"days\n" +"weeks\n" +"months\n" +"years" +msgstr "" -#: ../calendar/zones.h:316 -msgid "Europe/Chisinau" -msgstr "Europa/Chisinau" +#: ../filter/filter.glade.h:21 +#, fuzzy +msgid "" +"the current time\n" +"the time you specify\n" +"a time relative to the current time" +msgstr "en tid relativ til tiden nu" -#: ../calendar/zones.h:317 -msgid "Europe/Copenhagen" -msgstr "Europa/København" +#: ../filter/rule-editor.c:382 +msgid "Add Rule" +msgstr "Tilføj regel" -#: ../calendar/zones.h:318 -msgid "Europe/Dublin" -msgstr "Europa/Dublin" +#: ../filter/rule-editor.c:463 +msgid "Edit Rule" +msgstr "Redigér regel" -#: ../calendar/zones.h:319 -msgid "Europe/Gibraltar" -msgstr "Europa/Gibraltar" +#: ../filter/rule-editor.c:809 +msgid "Rule name" +msgstr "Regelnavn" -#: ../calendar/zones.h:320 -msgid "Europe/Helsinki" -msgstr "Europa/Helsinki" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1 +msgid "Composer Preferences" +msgstr "Redigeringsindstillinger" -#: ../calendar/zones.h:321 -msgid "Europe/Istanbul" -msgstr "Europa/Istanbul" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2 +msgid "" +"Configure mail preferences, including security and message display, here" +msgstr "" +"Konfigurér e-post-indstillinger, inklusive sikkerhed og brevvisning, her" -#: ../calendar/zones.h:322 -msgid "Europe/Kaliningrad" -msgstr "Europa/Kaliningrad" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3 +msgid "Configure spell-checking, signatures, and the message composer here" +msgstr "Konfigurér stavekontrol, signaturer, og brevredigering her" -#: ../calendar/zones.h:323 -msgid "Europe/Kiev" -msgstr "Europa/Kiev" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4 +msgid "Configure your email accounts here" +msgstr "Konfigurér dine e-post-konti her" -#: ../calendar/zones.h:324 -msgid "Europe/Lisbon" -msgstr "Europa/Lisboa" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5 +msgid "Configure your network connection settings here" +msgstr "Konfigurér dine netværkforbindelses-indstillinger her" -#: ../calendar/zones.h:325 -msgid "Europe/Ljubljana" -msgstr "Europa/Ljubljana" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6 +msgid "Evolution Mail" +msgstr "Evolution e-post" -#: ../calendar/zones.h:326 -msgid "Europe/London" -msgstr "Europa/London" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7 +msgid "Evolution Mail accounts configuration control" +msgstr "Styreelement til opsætning af Evolutions postkonti" -#: ../calendar/zones.h:327 -msgid "Europe/Luxembourg" -msgstr "Europa/Luxembourg" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8 +msgid "Evolution Mail component" +msgstr "Evolutions e-post-komponent" -#: ../calendar/zones.h:328 -msgid "Europe/Madrid" -msgstr "Europa/Madrid" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9 +msgid "Evolution Mail composer" +msgstr "Evolutions e-post-redigering" -#: ../calendar/zones.h:329 -msgid "Europe/Malta" -msgstr "Europa/Malta" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10 +msgid "Evolution Mail composer configuration control" +msgstr "Styreelement til brevredigering i Evolution" -#: ../calendar/zones.h:330 -msgid "Europe/Minsk" -msgstr "Europa/Minsk" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 +msgid "Evolution Mail preferences control" +msgstr "Styreelement til Evolutions e-post-indstillinger" -#: ../calendar/zones.h:331 -msgid "Europe/Monaco" -msgstr "Europa/Monaco" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12 +msgid "Evolution Network configuration control" +msgstr "Styreelement til opsætning af Evolutions netværk" -#: ../calendar/zones.h:332 -msgid "Europe/Moscow" -msgstr "Europa/Moskva" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:603 +#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378 +#: ../mail/mail-component.c:601 ../mail/mail-component.c:602 +#: ../mail/mail-component.c:771 +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6 +msgid "Mail" +msgstr "E-post" -#: ../calendar/zones.h:333 -msgid "Europe/Nicosia" -msgstr "Europa/Nicosia" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14 +#: ../mail/em-account-prefs.c:495 +msgid "Mail Accounts" +msgstr "E-post-konti" -#: ../calendar/zones.h:334 -msgid "Europe/Oslo" -msgstr "Europa/Oslo" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15 +#: ../mail/mail-config.glade.h:107 +msgid "Mail Preferences" +msgstr "E-post-indstillinger" -#: ../calendar/zones.h:335 -msgid "Europe/Paris" -msgstr "Europa/Paris" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16 +msgid "Network Preferences" +msgstr "Netværksindstillinger" -#: ../calendar/zones.h:336 -msgid "Europe/Prague" -msgstr "Europa/Prag" +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17 +#: ../plugins/pst-import/pst-importer.c:300 +msgid "_Mail" +msgstr "_E-post" -#: ../calendar/zones.h:337 -msgid "Europe/Riga" -msgstr "Europa/Riga" +#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1332 +#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105 +msgid "_Forward" +msgstr "_Videresend" -#: ../calendar/zones.h:338 -msgid "Europe/Rome" -msgstr "Europa/Rom" +#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1330 +#: ../ui/evolution-mail-message.xml.h:123 +msgid "_Reply to Sender" +msgstr "Send sva_r til afsender" -#: ../calendar/zones.h:339 -msgid "Europe/Samara" -msgstr "Europa/Samara" +#. Translators: This is only for multiple messages. +#: ../mail/e-attachment-handler-mail.c:334 +#, fuzzy, c-format +msgid "%d attached messages" +msgstr "Vedlagt brev" -#: ../calendar/zones.h:340 -msgid "Europe/San_Marino" -msgstr "Europa/San_Marino" +#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1654 +#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:140 +msgid "Attachment" +msgid_plural "Attachments" +msgstr[0] "Bilag" +msgstr[1] "Bilag" -#: ../calendar/zones.h:341 -msgid "Europe/Sarajevo" -msgstr "Europa/Sarajevo" +#: ../mail/e-mail-attachment-bar.c:615 +#: ../widgets/misc/e-attachment-paned.c:599 +#, fuzzy +msgid "Icon View" +msgstr "Månedsoversigt" -#: ../calendar/zones.h:342 -msgid "Europe/Simferopol" -msgstr "Europa/Simferopol" +#: ../mail/e-mail-attachment-bar.c:616 +#: ../widgets/misc/e-attachment-paned.c:600 +#, fuzzy +msgid "List View" +msgstr "_Listeoversigt" -#: ../calendar/zones.h:343 -msgid "Europe/Skopje" -msgstr "Europa/Skopje" +#: ../mail/e-mail-search-bar.c:76 +#, c-format +msgid "Matches: %d" +msgstr "Matcher: %d" -#: ../calendar/zones.h:344 -msgid "Europe/Sofia" -msgstr "Europa/Sofia" +#: ../mail/e-mail-search-bar.c:520 +#, fuzzy +msgid "Close the find bar" +msgstr "Luk dette vindue" -#: ../calendar/zones.h:345 -msgid "Europe/Stockholm" -msgstr "Europa/Stockholm" +#: ../mail/e-mail-search-bar.c:528 +msgid "Fin_d:" +msgstr "F_ind:" -#: ../calendar/zones.h:346 -msgid "Europe/Tallinn" -msgstr "Europa/Tallinn" +#: ../mail/e-mail-search-bar.c:540 +#, fuzzy +msgid "Clear the search" +msgstr "Søg altid" -#: ../calendar/zones.h:347 -msgid "Europe/Tirane" -msgstr "Europa/Tirane" +#: ../mail/e-mail-search-bar.c:559 +msgid "_Previous" +msgstr "_Forrige" -#: ../calendar/zones.h:348 -msgid "Europe/Uzhgorod" -msgstr "Europa/Uzhgorod" +#: ../mail/e-mail-search-bar.c:565 +msgid "Find the previous occurrence of the phrase" +msgstr "" -#: ../calendar/zones.h:349 -msgid "Europe/Vaduz" -msgstr "Europa/Vaduz" +#: ../mail/e-mail-search-bar.c:573 +msgid "_Next" +msgstr "_Næste" -#: ../calendar/zones.h:350 -msgid "Europe/Vatican" -msgstr "Europa/Vatikanet" +#: ../mail/e-mail-search-bar.c:579 +msgid "Find the next occurrence of the phrase" +msgstr "" -#: ../calendar/zones.h:351 -msgid "Europe/Vienna" -msgstr "Europa/Wien" +#: ../mail/e-mail-search-bar.c:587 +#, fuzzy +msgid "Mat_ch case" +msgstr "M_atch store/små bogstaver" -#: ../calendar/zones.h:352 -msgid "Europe/Vilnius" -msgstr "Europa/Vilnius" +#: ../mail/e-mail-search-bar.c:615 +msgid "Reached bottom of page, continued from top" +msgstr "" -#: ../calendar/zones.h:353 -msgid "Europe/Warsaw" -msgstr "Europa/Warszawa" +#: ../mail/e-mail-search-bar.c:637 +msgid "Reached top of page, continued from bottom" +msgstr "" -#: ../calendar/zones.h:354 -msgid "Europe/Zagreb" -msgstr "Europa/Zagreb" +#. Translators: This string is a "Use secure connection" option for +#. the Mailer. It will not use an encrypted connection. +#: ../mail/em-account-editor.c:307 +msgid "No encryption" +msgstr "Ingen kryptering" -#: ../calendar/zones.h:355 -msgid "Europe/Zaporozhye" -msgstr "Europa/Zaporozhye" +#. Translators: This string is a "Use secure connection" option for +#. the Mailer. TLS (Transport Layer Security) is commonly known by +#. this abbreviation. +#: ../mail/em-account-editor.c:311 +msgid "TLS encryption" +msgstr "TLS-kryptering" -#: ../calendar/zones.h:356 -msgid "Europe/Zurich" -msgstr "Europa/Zürich" +#. Translators: This string is a "Use secure connection" option for +#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this +#. abbreviation. +#: ../mail/em-account-editor.c:315 +msgid "SSL encryption" +msgstr "SSL-kryptering" -#: ../calendar/zones.h:357 -msgid "Indian/Antananarivo" -msgstr "Indiske hav/Antananarivo" +#: ../mail/em-account-editor.c:406 +#, c-format +msgid "%s License Agreement" +msgstr "Licensaftalen for %s" -#: ../calendar/zones.h:358 -msgid "Indian/Chagos" -msgstr "Indiske hav/Chagos" +#: ../mail/em-account-editor.c:413 +#, c-format +msgid "" +"\n" +"Please read carefully the license agreement\n" +"for %s displayed below\n" +"and tick the check box for accepting it\n" +msgstr "" +"\n" +"Læs venligst Licensaftalen for %s som vises\n" +"nedenfor\n" +"og kryds afkrydsningsfeltet af for at\n" +"acceptere den\n" -#: ../calendar/zones.h:359 -msgid "Indian/Christmas" -msgstr "Indiske hav/Juleøen" +#: ../mail/em-account-editor.c:485 ../mail/em-filter-folder-element.c:258 +#: ../mail/em-vfolder-rule.c:513 +msgid "Select Folder" +msgstr "Vælg mappe" -#: ../calendar/zones.h:360 -msgid "Indian/Cocos" -msgstr "Indiske hav/Cocos" +#: ../mail/em-account-editor.c:609 ../mail/em-account-editor.c:654 +#: ../mail/em-account-editor.c:721 ../widgets/misc/e-signature-combo-box.c:102 +msgid "Autogenerated" +msgstr "Automatisk genereret" -#: ../calendar/zones.h:361 -msgid "Indian/Comoro" -msgstr "Indiske hav/Comorerne" +#: ../mail/em-account-editor.c:779 +msgid "Never" +msgstr "Aldrig" -#: ../calendar/zones.h:362 -msgid "Indian/Kerguelen" -msgstr "Indiske hav/Kerguelen" +#: ../mail/em-account-editor.c:780 +msgid "Always" +msgstr "Altid" -#: ../calendar/zones.h:363 -msgid "Indian/Mahe" -msgstr "Indiske hav/Mahe" +#: ../mail/em-account-editor.c:781 +msgid "Ask for each message" +msgstr "Spørg for hver enkelt brev" -#: ../calendar/zones.h:364 -msgid "Indian/Maldives" -msgstr "Indiske hav/Maldiverne" +#: ../mail/em-account-editor.c:1854 ../mail/mail-config.glade.h:100 +msgid "Identity" +msgstr "Identitet" -#: ../calendar/zones.h:365 -msgid "Indian/Mauritius" -msgstr "Indiske hav/Mauritius" +#: ../mail/em-account-editor.c:1905 ../mail/mail-config.glade.h:127 +msgid "Receiving Email" +msgstr "Modtagelse af e-post" -#: ../calendar/zones.h:366 -msgid "Indian/Mayotte" -msgstr "Indiske hav/Mayotte" +#: ../mail/em-account-editor.c:2177 +msgid "Check for _new messages every" +msgstr "Hent _nye breve automatisk hver(t)" -#: ../calendar/zones.h:367 -msgid "Indian/Reunion" -msgstr "Indiske hav/Reunion" +#: ../mail/em-account-editor.c:2185 +msgid "minu_tes" +msgstr "minut_ter" -#: ../calendar/zones.h:368 -msgid "Pacific/Apia" -msgstr "Stillehavet/Apia" +#: ../mail/em-account-editor.c:2375 ../mail/mail-config.glade.h:138 +msgid "Sending Email" +msgstr "Afsendelse af e-post" -#: ../calendar/zones.h:369 -msgid "Pacific/Auckland" -msgstr "Stillehavet/Auckland" +#: ../mail/em-account-editor.c:2434 ../mail/mail-config.glade.h:73 +msgid "Defaults" +msgstr "Standarder" -#: ../calendar/zones.h:370 -msgid "Pacific/Chatham" -msgstr "Stillehavet/Chatham" +#. Security settings +#: ../mail/em-account-editor.c:2500 ../mail/mail-config.glade.h:133 +#: ../plugins/exchange-operations/exchange-account-setup.c:332 +msgid "Security" +msgstr "Sikkerhed" -#: ../calendar/zones.h:371 -msgid "Pacific/Easter" -msgstr "Stillehavet/Påskeøen" +#. Most sections for this is auto-generated from the camel config +#. Most sections for this is auto-generated fromt the camel config +#: ../mail/em-account-editor.c:2537 ../mail/em-account-editor.c:2632 +msgid "Receiving Options" +msgstr "Modtagelsesindstillinger" -#: ../calendar/zones.h:372 -msgid "Pacific/Efate" -msgstr "Stillehavet/Efate" +#: ../mail/em-account-editor.c:2538 ../mail/em-account-editor.c:2633 +msgid "Checking for New Messages" +msgstr "Ser efter nye breve" -#: ../calendar/zones.h:373 -msgid "Pacific/Enderbury" -msgstr "Stillehavet/Enderbury" +#: ../mail/em-account-editor.c:3094 ../mail/mail-config.glade.h:34 +msgid "Account Editor" +msgstr "Kontoredigeringsværktøj" -#: ../calendar/zones.h:374 -msgid "Pacific/Fakaofo" -msgstr "Stillehavet/Fakaofo" +#: ../mail/em-account-editor.c:3094 ../mail/mail-config.glade.h:89 +msgid "Evolution Account Assistant" +msgstr "Evolutions konto-vejleder" -#: ../calendar/zones.h:375 -msgid "Pacific/Fiji" -msgstr "Stillehavet/Fijiøerne" +#. translators: default account indicator +#: ../mail/em-account-prefs.c:429 +msgid "[Default]" +msgstr "[Standard]" -#: ../calendar/zones.h:376 -msgid "Pacific/Funafuti" -msgstr "Stillehavet/Funafuti" +#: ../mail/em-account-prefs.c:488 +msgid "Account name" +msgstr "Kontonavn" -#: ../calendar/zones.h:377 -msgid "Pacific/Galapagos" -msgstr "Stillehavet/Galapagos" +#: ../mail/em-account-prefs.c:490 +msgid "Protocol" +msgstr "Protokol" -#: ../calendar/zones.h:378 -msgid "Pacific/Gambier" -msgstr "Stillehavet/Gambier" +#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438 +#: ../mail/mail-config.c:1162 ../mail/mail-signature-editor.c:478 +msgid "Unnamed" +msgstr "Unavngivet" -#: ../calendar/zones.h:379 -msgid "Pacific/Guadalcanal" -msgstr "Stillehavet/Guadalcanal" +#: ../mail/em-composer-prefs.c:947 +msgid "Language(s)" +msgstr "Sprog" -#: ../calendar/zones.h:380 -msgid "Pacific/Guam" -msgstr "Stillehavet/Guam" +#: ../mail/em-composer-prefs.c:980 +msgid "Add signature script" +msgstr "Tilføj signaturskript" -#: ../calendar/zones.h:381 -msgid "Pacific/Honolulu" -msgstr "Stillehavet/Honolulu" +#: ../mail/em-composer-prefs.c:1022 +msgid "Signature(s)" +msgstr "Signatur(er)" -#: ../calendar/zones.h:382 -msgid "Pacific/Johnston" -msgstr "Stillehavet/Johnston" +#: ../mail/em-composer-utils.c:1104 ../mail/em-format-quote.c:416 +msgid "-------- Forwarded Message --------" +msgstr "-------- Videresendt brev --------" -#: ../calendar/zones.h:383 -msgid "Pacific/Kiritimati" -msgstr "Stillehavet/Kiritimati" +#: ../mail/em-composer-utils.c:1556 +msgid "" +"No destination address provided, forward of the message has been cancelled." +msgstr "" +"Ingen modtageradresse er angivet. Videresendelse af brevet er blevet " +"annulleret." -#: ../calendar/zones.h:384 -msgid "Pacific/Kosrae" -msgstr "Stillehavet/Kosrae" +#: ../mail/em-composer-utils.c:1562 +msgid "No account found to use, forward of the message has been cancelled." +msgstr "" +"Der blev ikke fundet nogen konto, som kunne bruges. Videresendelse af brevet " +"er blevet annulleret." -#: ../calendar/zones.h:385 -msgid "Pacific/Kwajalein" -msgstr "Stillehavet/Kwajalein" +#: ../mail/em-composer-utils.c:2030 +msgid "an unknown sender" +msgstr "en ukendt afsender" -#: ../calendar/zones.h:386 -msgid "Pacific/Majuro" -msgstr "Stillehavet/Majuro" +#. Note to translators: this is the attribution string used when quoting messages. +#. * each ${Variable} gets replaced with a value. To see a full list of available +#. * variables, see em-composer-utils.c:1514 +#: ../mail/em-composer-utils.c:2077 +msgid "" +"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " +"${TimeZone}, ${Sender} wrote:" +msgstr "" +"${AbbrevWeekdayName}, ${Day} ${Month} ${Year} kl. ${24Hour}:${Minute} " +"${TimeZone}, skrev ${Sender}:" -#: ../calendar/zones.h:387 -msgid "Pacific/Marquesas" -msgstr "Stillehavet/Marquesas" +#: ../mail/em-composer-utils.c:2220 +msgid "-----Original Message-----" +msgstr "-----Oprindelige besked-----" -#: ../calendar/zones.h:388 -msgid "Pacific/Midway" -msgstr "Stillehavet/Midway" +#: ../mail/em-filter-editor.c:174 +msgid "_Filter Rules" +msgstr "_Filterregler" -#: ../calendar/zones.h:389 -msgid "Pacific/Nauru" -msgstr "Stillehavet/Nauru" +#. Automatically generated. Do not edit. +#: ../mail/em-filter-i18n.h:2 +msgid "Adjust Score" +msgstr "Justér point" -#: ../calendar/zones.h:390 -msgid "Pacific/Niue" -msgstr "Stillehavet/Niue" +#: ../mail/em-filter-i18n.h:3 +msgid "Assign Color" +msgstr "Tilknyt farve" -#: ../calendar/zones.h:391 -msgid "Pacific/Norfolk" -msgstr "Stillehavet/Norfolk" +#: ../mail/em-filter-i18n.h:4 +msgid "Assign Score" +msgstr "Giv point" -#: ../calendar/zones.h:392 -msgid "Pacific/Noumea" -msgstr "Stillehavet/Noumea" +#: ../mail/em-filter-i18n.h:6 +msgid "BCC" +msgstr "BCC" -#: ../calendar/zones.h:393 -msgid "Pacific/Pago_Pago" -msgstr "Stillehavet/Pago_Pago" +#: ../mail/em-filter-i18n.h:7 +msgid "Beep" +msgstr "Bippelyd" -#: ../calendar/zones.h:394 -msgid "Pacific/Palau" -msgstr "Stillehavet/Palau" +#: ../mail/em-filter-i18n.h:8 +msgid "CC" +msgstr "CC" -#: ../calendar/zones.h:395 -msgid "Pacific/Pitcairn" -msgstr "Stillehavet/Pitcairn" +#: ../mail/em-filter-i18n.h:9 +msgid "Completed On" +msgstr "Fuldført den" -#: ../calendar/zones.h:396 -msgid "Pacific/Ponape" -msgstr "Stillehavet/Ponape" +#: ../mail/em-filter-i18n.h:11 +msgid "Copy to Folder" +msgstr "Kopier til mappe" -#: ../calendar/zones.h:397 -msgid "Pacific/Port_Moresby" -msgstr "Stillehavet/Port_Moresby" +#: ../mail/em-filter-i18n.h:12 +msgid "Date received" +msgstr "Dato modtaget" -#: ../calendar/zones.h:398 -msgid "Pacific/Rarotonga" -msgstr "Stillehavet/Rarotonga" +#: ../mail/em-filter-i18n.h:13 +msgid "Date sent" +msgstr "Dato sendt" -#: ../calendar/zones.h:399 -msgid "Pacific/Saipan" -msgstr "Stillehavet/Saipan" +#: ../mail/em-filter-i18n.h:14 +#: ../plugins/groupwise-features/share-folder.c:770 +#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5 +#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6 +#: ../ui/evolution-tasks.xml.h:6 +msgid "Delete" +msgstr "Slet" -#: ../calendar/zones.h:400 -msgid "Pacific/Tahiti" -msgstr "Stillehavet/Tahiti" +#: ../mail/em-filter-i18n.h:15 +msgid "Deleted" +msgstr "Slettet" -#: ../calendar/zones.h:401 -msgid "Pacific/Tarawa" -msgstr "Stillehavet/Tarawa" +#: ../mail/em-filter-i18n.h:17 +msgid "does not end with" +msgstr "slutter ikke med" -#: ../calendar/zones.h:402 -msgid "Pacific/Tongatapu" -msgstr "Stillehavet/Tongatapu" +#: ../mail/em-filter-i18n.h:18 +msgid "does not exist" +msgstr "eksisterer ikke" -#: ../calendar/zones.h:403 -msgid "Pacific/Truk" -msgstr "Stillehavet/Truk" +#: ../mail/em-filter-i18n.h:19 +msgid "does not return" +msgstr "returnerer ikke" -#: ../calendar/zones.h:404 -msgid "Pacific/Wake" -msgstr "Stillehavet/Wake" +#: ../mail/em-filter-i18n.h:20 +msgid "does not sound like" +msgstr "ligner ikke" -#: ../calendar/zones.h:405 -msgid "Pacific/Wallis" -msgstr "Stillehavet/Wallis" +#: ../mail/em-filter-i18n.h:21 +msgid "does not start with" +msgstr "starter ikke med" -#: ../calendar/zones.h:406 -msgid "Pacific/Yap" -msgstr "Stillehavet/Yap" +#: ../mail/em-filter-i18n.h:23 +msgid "Draft" +msgstr "Skitse" -#: ../composer/e-composer-autosave.c:273 -msgid "Could not open autosave file" -msgstr "Kunne ikke åbne auto-gemningsfil" +#: ../mail/em-filter-i18n.h:24 +msgid "ends with" +msgstr "slutter med" -#: ../composer/e-composer-autosave.c:280 -msgid "Unable to retrieve message from editor" -msgstr "Kunne ikke hente brev fra editor" +#: ../mail/em-filter-i18n.h:26 +msgid "exists" +msgstr "eksisterer" -#: ../composer/e-composer-actions.c:45 -msgid "Insert Attachment" -msgstr "Indsæt bilag" +#: ../mail/em-filter-i18n.h:27 +msgid "Expression" +msgstr "Udtryk" -#: ../composer/e-composer-actions.c:49 -msgid "A_ttach" -msgstr "_Vedlæg" +#: ../mail/em-filter-i18n.h:28 +msgid "Follow Up" +msgstr "Følg op" -#: ../composer/e-composer-actions.c:140 -msgid "Untitled Message" -msgstr "Brev uden titel" +#: ../mail/em-filter-i18n.h:29 +#, fuzzy +msgid "Forward to" +msgstr "Videresend" -#: ../composer/e-composer-actions.c:471 -msgid "Attach a file" -msgstr "Vedlæg en fil" +#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958 +msgid "Important" +msgstr "Vigtig" -#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194 -#: ../ui/evolution-mail-messagedisplay.xml.h:4 -msgid "_Close" -msgstr "_Luk" +#: ../mail/em-filter-i18n.h:32 +msgid "is after" +msgstr "er efter" -#: ../composer/e-composer-actions.c:478 -msgid "Close the current file" -msgstr "Luk aktiv fil" +#: ../mail/em-filter-i18n.h:33 +msgid "is before" +msgstr "er inden" -#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339 -#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47 -#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20 -#: ../ui/evolution-tasks.xml.h:29 -msgid "_Print..." -msgstr "_Udskriv..." +#: ../mail/em-filter-i18n.h:34 +msgid "is Flagged" +msgstr "har markering" -#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27 -#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76 -#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15 -msgid "Print Pre_view" -msgstr "V_is udskrift" +#: ../mail/em-filter-i18n.h:38 +msgid "is not Flagged" +msgstr "har ingen markering" -#: ../composer/e-composer-actions.c:499 -msgid "Save the current file" -msgstr "Gem aktiv fil" +#: ../mail/em-filter-i18n.h:39 +msgid "is not set" +msgstr "er ikke indstillet" -#: ../composer/e-composer-actions.c:504 -msgid "Save _As..." -msgstr "_Gem som..." +#: ../mail/em-filter-i18n.h:40 +msgid "is set" +msgstr "er indstillet" -#: ../composer/e-composer-actions.c:506 -msgid "Save the current file with a different name" -msgstr "Gem aktiv fil med et nyt navn" +#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:101 +#: ../ui/evolution-mail-message.xml.h:48 +msgid "Junk" +msgstr "Spam" -#: ../composer/e-composer-actions.c:511 -msgid "Save as _Draft" -msgstr "Gem som _kladde" +#: ../mail/em-filter-i18n.h:42 +msgid "Junk Test" +msgstr "Spamtest" -#: ../composer/e-composer-actions.c:513 -msgid "Save as draft" -msgstr "Gem som kladde" +#: ../mail/em-filter-i18n.h:43 +msgid "Label" +msgstr "Mærkning" -#: ../composer/e-composer-actions.c:518 -msgid "S_end" -msgstr "S_end" +#: ../mail/em-filter-i18n.h:44 +msgid "Mailing list" +msgstr "Postliste" -#: ../composer/e-composer-actions.c:520 -msgid "Send this message" -msgstr "Send dette brev" +#: ../mail/em-filter-i18n.h:45 +msgid "Match All" +msgstr "Match alt" -#: ../composer/e-composer-actions.c:527 -msgid "Insert Send options" -msgstr "Indsæt afsendelsesindstillinger" +#: ../mail/em-filter-i18n.h:46 +msgid "Message Body" +msgstr "Brevindhold" -#: ../composer/e-composer-actions.c:532 -msgid "New _Message" -msgstr "Nyt _brev" +#: ../mail/em-filter-i18n.h:47 +msgid "Message Header" +msgstr "Brevhoved" -#: ../composer/e-composer-actions.c:534 -msgid "Open New Message window" -msgstr "Åbn vinduet \"Nyt brev\"" +#: ../mail/em-filter-i18n.h:48 +msgid "Message is Junk" +msgstr "Brevet er spam" -#: ../composer/e-composer-actions.c:541 -msgid "Character _Encoding" -msgstr "Tegn_kodning" +#: ../mail/em-filter-i18n.h:49 +msgid "Message is not Junk" +msgstr "Brevet er ikke-spam" -#: ../composer/e-composer-actions.c:548 -msgid "_Security" -msgstr "_Sikkerhed" +#: ../mail/em-filter-i18n.h:50 +#, fuzzy +msgid "Message Location" +msgstr "Brev indeholder" -#: ../composer/e-composer-actions.c:558 -msgid "PGP _Encrypt" -msgstr "_Kryptér med PGP" +#: ../mail/em-filter-i18n.h:51 +msgid "Move to Folder" +msgstr "Flyt til mappe" -#: ../composer/e-composer-actions.c:560 -msgid "Encrypt this message with PGP" -msgstr "Kryptér dette brev med PGP" +#: ../mail/em-filter-i18n.h:52 +msgid "Pipe to Program" +msgstr "Videreled til programmet" -#: ../composer/e-composer-actions.c:566 -msgid "PGP _Sign" -msgstr "_Signér med PGP" +#: ../mail/em-filter-i18n.h:53 +msgid "Play Sound" +msgstr "Afspil lyd" -#: ../composer/e-composer-actions.c:568 -msgid "Sign this message with your PGP key" -msgstr "Underskriv dette brev med din PGP-nøgle" +#. Translators: "Read" as in "has been read" (message-tag-followup.c) +#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:62 +msgid "Read" +msgstr "Læst" -#: ../composer/e-composer-actions.c:574 -msgid "_Prioritize Message" -msgstr "_Prioritér brev" +#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12 +msgid "Recipients" +msgstr "Modtagere" -#: ../composer/e-composer-actions.c:576 -msgid "Set the message priority to high" -msgstr "Angiv brevets prioritet som høj" +#: ../mail/em-filter-i18n.h:56 +msgid "Regex Match" +msgstr "Træffer på regulært udtryk" -#: ../composer/e-composer-actions.c:582 -msgid "Re_quest Read Receipt" -msgstr "_Anmod om læsningskvittering" +#: ../mail/em-filter-i18n.h:57 +msgid "Replied to" +msgstr "Svaret til" -#: ../composer/e-composer-actions.c:584 -msgid "Get delivery notification when your message is read" -msgstr "Anmod om kvittering for at dit brev er blevet åbnet" +#: ../mail/em-filter-i18n.h:58 +msgid "returns" +msgstr "returnerer" -#: ../composer/e-composer-actions.c:590 -msgid "S/MIME En_crypt" -msgstr "Kry_ptér med S/MIME" +#: ../mail/em-filter-i18n.h:59 +msgid "returns greater than" +msgstr "returnerer større end" -#: ../composer/e-composer-actions.c:592 -msgid "Encrypt this message with your S/MIME Encryption Certificate" -msgstr "Kryptér dette brev med dit S/MIME krypteringscertifikat" +#: ../mail/em-filter-i18n.h:60 +msgid "returns less than" +msgstr "returnerer mindre end" -#: ../composer/e-composer-actions.c:598 -msgid "S/MIME Sig_n" -msgstr "Sig_nér med S/MIME" +#: ../mail/em-filter-i18n.h:61 +msgid "Run Program" +msgstr "Kør program" -#: ../composer/e-composer-actions.c:600 -msgid "Sign this message with your S/MIME Signature Certificate" -msgstr "Signér dette brev med dit S/MIME signaturcertifikat" +#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13 +msgid "Score" +msgstr "Point" -#: ../composer/e-composer-actions.c:606 -msgid "_Bcc Field" -msgstr "_Bcc-felt" +#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14 +msgid "Sender" +msgstr "Afsender" -#: ../composer/e-composer-actions.c:608 -msgid "Toggles whether the BCC field is displayed" -msgstr "Slå visning af BCC-feltet fra/til" +#: ../mail/em-filter-i18n.h:64 +msgid "Sender or Recipients" +msgstr "Afsender eller modtagere" -#: ../composer/e-composer-actions.c:614 -msgid "_Cc Field" -msgstr "_Cc-felt" +#: ../mail/em-filter-i18n.h:65 +msgid "Set Label" +msgstr "Brug mærkat" -#: ../composer/e-composer-actions.c:616 -msgid "Toggles whether the CC field is displayed" -msgstr "Slå visning af CC-feltet fra/til" +#: ../mail/em-filter-i18n.h:66 +msgid "Set Status" +msgstr "Sæt status" -#: ../composer/e-composer-actions.c:622 -msgid "_From Field" -msgstr "_Fra-felt" +#: ../mail/em-filter-i18n.h:67 +msgid "Size (kB)" +msgstr "Størrelse (kB)" -#: ../composer/e-composer-actions.c:624 -msgid "Toggles whether the From chooser is displayed" -msgstr "Slå visning af Fra-feltet fra/til" +#: ../mail/em-filter-i18n.h:68 +msgid "sounds like" +msgstr "lyder som" -#: ../composer/e-composer-actions.c:630 -msgid "_Post-To Field" -msgstr "_Post-til-felt" +#: ../mail/em-filter-i18n.h:69 +msgid "Source Account" +msgstr "Kildekonto" -#: ../composer/e-composer-actions.c:632 -msgid "Toggles whether the Post-To field is displayed" -msgstr "Slå visning af Send-til-feltet fra/til" +#: ../mail/em-filter-i18n.h:70 +msgid "Specific header" +msgstr "Nærmere angivet linje i brevhoved" -#: ../composer/e-composer-actions.c:638 -msgid "_Reply-To Field" -msgstr "Sva_r-til felt" +#: ../mail/em-filter-i18n.h:71 +msgid "starts with" +msgstr "starter med" -#: ../composer/e-composer-actions.c:640 -msgid "Toggles whether the Reply-To field is displayed" -msgstr "Slå visning af Svar-til feltet fra/til" +#: ../mail/em-filter-i18n.h:73 +msgid "Stop Processing" +msgstr "Stop behandling" -#: ../composer/e-composer-actions.c:646 -msgid "_Subject Field" -msgstr "_Emnefelt" +#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:342 +#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:80 +#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:305 +#: ../plugins/groupwise-features/properties.glade.h:7 +#: ../smime/lib/e-cert.c:1115 +msgid "Subject" +msgstr "Emne" -#: ../composer/e-composer-actions.c:648 -msgid "Toggles whether the Subject field is displayed" -msgstr "Slå visning af emnefeltet fra/til" +#: ../mail/em-filter-i18n.h:75 +msgid "Unset Status" +msgstr "Nulstil status" -#: ../composer/e-composer-actions.c:654 -msgid "_To Field" -msgstr "_Til-felt" +#. and now for the action area +#: ../mail/em-filter-rule.c:521 +msgid "Then" +msgstr "Så" -#: ../composer/e-composer-actions.c:656 -msgid "Toggles whether the To field is displayed" -msgstr "Slå visning af Til-feltet fra/til" +#: ../mail/em-filter-rule.c:549 +msgid "Add Ac_tion" +msgstr "Tilføj hand_ling" -#: ../composer/e-composer-actions.c:699 -msgid "Save Draft" -msgstr "Gem kladde" +#: ../mail/em-folder-browser.c:194 +msgid "C_reate Search Folder From Search..." +msgstr "Opret _søgemappe fra søgning..." -#: ../composer/e-composer-header-table.c:64 -msgid "Enter the recipients of the message" -msgstr "Indtast brevets modtagere" +#: ../mail/em-folder-browser.c:219 +msgid "All Messages" +msgstr "Alle breve" -#: ../composer/e-composer-header-table.c:66 -msgid "Enter the addresses that will receive a carbon copy of the message" -msgstr "Indtast adresserne som skal modtage en kopi af brevet" +#: ../mail/em-folder-browser.c:220 +msgid "Unread Messages" +msgstr "Ulæste breve" -#: ../composer/e-composer-header-table.c:69 -msgid "" -"Enter the addresses that will receive a carbon copy of the message without " -"appearing in the recipient list of the message" -msgstr "" -"Indtast adresserne som skal modtage en kopi af brevet, uden at blive vist i " -"listen over modtagere" +#: ../mail/em-folder-browser.c:222 +msgid "No Label" +msgstr "Ingen mærkning" -#: ../composer/e-composer-header-table.c:643 -msgid "Fr_om:" -msgstr "_Fra:" +#: ../mail/em-folder-browser.c:229 +msgid "Read Messages" +msgstr "Læste breve" -#: ../composer/e-composer-header-table.c:652 -msgid "_Reply-To:" -msgstr "_Svar-til:" +#: ../mail/em-folder-browser.c:230 +msgid "Recent Messages" +msgstr "Nyere breve" -#: ../composer/e-composer-header-table.c:656 -msgid "_To:" -msgstr "_Til:" +#: ../mail/em-folder-browser.c:231 +msgid "Last 5 Days' Messages" +msgstr "Breve fra de sidste 5 dage" -#: ../composer/e-composer-header-table.c:661 -msgid "_Cc:" -msgstr "_Cc:" +#: ../mail/em-folder-browser.c:232 +msgid "Messages with Attachments" +msgstr "Breve med bilag" -#: ../composer/e-composer-header-table.c:666 -msgid "_Bcc:" -msgstr "_Bcc:" +#: ../mail/em-folder-browser.c:233 +msgid "Important Messages" +msgstr "Vigtige breve" -#: ../composer/e-composer-header-table.c:671 -msgid "_Post To:" -msgstr "_Post-til:" +#: ../mail/em-folder-browser.c:234 +msgid "Messages Not Junk" +msgstr "Breve som ikke er spam" -#: ../composer/e-composer-header-table.c:675 -msgid "S_ubject:" -msgstr "_Emne:" +#: ../mail/em-folder-browser.c:1201 +msgid "Account Search" +msgstr "Kontosøgning" -#: ../composer/e-composer-header-table.c:684 -msgid "Si_gnature:" -msgstr "Si_gnatur:" +#: ../mail/em-folder-browser.c:1254 +msgid "All Account Search" +msgstr "Søgning i alle konti" -#: ../composer/e-composer-name-header.c:115 -msgid "Click here for the address book" -msgstr "Klik her for at se adressebogen" +#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 +#: ../mail/em-folder-properties.c:174 +msgid "Unread messages:" +msgid_plural "Unread messages:" +msgstr[0] "Ulæste breve:" +msgstr[1] "Ulæste breve:" -#: ../composer/e-composer-post-header.c:137 -msgid "Posting destination" -msgstr "Leveringssted for breve" +#. TODO: can this be done in a loop? +#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 +#: ../mail/em-folder-properties.c:178 +msgid "Total messages:" +msgid_plural "Total messages:" +msgstr[0] "Totalt breve:" +msgstr[1] "Totalt breve:" -#: ../composer/e-composer-post-header.c:138 -msgid "Choose folders to post the message to." -msgstr "Vælg mapperne som brevet skal sendes til." +#: ../mail/em-folder-properties.c:196 +#, c-format +msgid "Quota usage (%s):" +msgstr "Kvote-brug (%s):" -#: ../composer/e-composer-post-header.c:172 -msgid "Click here to select folders to post to" -msgstr "Klik her for at vælge mapper at sende til" +#: ../mail/em-folder-properties.c:198 +#, c-format +msgid "Quota usage" +msgstr "Kvote-brug" -#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1557 -msgid "Show _Attachment Bar" -msgstr "_Vis bilagspanel" +#. translators: standard local mailbox names +#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:519 +#: ../mail/em-folder-tree.c:2528 ../mail/mail-component.c:168 +#: ../mail/mail-component.c:589 +#: ../plugins/exchange-operations/exchange-delegates-user.c:76 +#: ../plugins/exchange-operations/exchange-folder.c:597 +msgid "Inbox" +msgstr "Indbakke" -#: ../composer/e-msg-composer.c:866 -msgid "" -"Cannot sign outgoing message: No signing certificate set for this account" -msgstr "" -"Kan ikke underskrive udgående brev: Intet signaturcertifikat for denne konto" +#: ../mail/em-folder-properties.c:390 +#: ../plugins/groupwise-features/properties.glade.h:4 +msgid "Folder Properties" +msgstr "Mappeegenskaber" -#: ../composer/e-msg-composer.c:873 -msgid "" -"Cannot encrypt outgoing message: No encryption certificate set for this " -"account" -msgstr "" -"Kan ikke kryptere udgående brev: Intet krypteringscertifikat for denne konto" +#: ../mail/em-folder-selection-button.c:120 +msgid "" +msgstr "" -#: ../composer/e-msg-composer.c:1499 ../mail/em-format-html-display.c:1952 -#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45 -#: ../mail/message-list.etspec.h:1 -msgid "Attachment" -msgid_plural "Attachments" -msgstr[0] "Bilag" -msgstr[1] "Bilag" +#: ../mail/em-folder-selector.c:254 +msgid "C_reate" +msgstr "Op_ret" -#: ../composer/e-msg-composer.c:1555 -msgid "Hide _Attachment Bar" -msgstr "Skj_ul bilagspanel" +#: ../mail/em-folder-selector.c:258 +msgid "Folder _name:" +msgstr "Mappe_navn:" -#: ../composer/e-msg-composer.c:1572 ../composer/e-msg-composer.c:2797 -msgid "Compose Message" -msgstr "Skriv brev" +#. load store to mail component +#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211 +#: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1029 +msgid "Search Folders" +msgstr "Søgemapper" -#: ../composer/e-msg-composer.c:4098 -msgid "" -"(The composer contains a non-text message body, which cannot be edited.)" -msgstr "" -"(Redigeringsvinduet indeholder et brev som ikke er tekst og som ikke kan " -"redigeres.)" +#. UNMATCHED is always last +#: ../mail/em-folder-tree-model.c:215 ../mail/em-folder-tree-model.c:217 +msgid "UNMATCHED" +msgstr "MATCHEDE_IKKE" -#: ../composer/mail-composer.error.xml.h:1 -msgid "" -" There are few attachments getting downloaded. Sending the mail will cause " -"the mail to be sent without those pending attachments " -msgstr "" -" Der er et par bilag der er ved at blive overført. Ved at sende brevet nu, " -"vil disse bilag ikke blive medsendt " +#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:169 +msgid "Drafts" +msgstr "Kladder" -#: ../composer/mail-composer.error.xml.h:2 -msgid "All accounts have been removed." -msgstr "Alle konti er blevet fjernet." +#: ../mail/em-folder-tree-model.c:516 ../mail/mail-component.c:172 +#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2 +msgid "Templates" +msgstr "Skabeloner" -#: ../composer/mail-composer.error.xml.h:3 -msgid "" -"Are you sure you want to discard the message, titled '{0}', you are " -"composing?" -msgstr "" -"Er du sikker på du vil kassere brevet med titlen \"{0}\", som du er ved at " -"skrive?" +#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:170 +msgid "Outbox" +msgstr "Udbakke" -#: ../composer/mail-composer.error.xml.h:4 -msgid "Because "{0}", you may need to select different mail options." -msgstr "" -"Fordi "{0}", vil du måske være nødt til at vælge andre e-post-" -"indstillinger." +#: ../mail/em-folder-tree-model.c:524 ../mail/mail-component.c:171 +msgid "Sent" +msgstr "Afsendte" -#: ../composer/mail-composer.error.xml.h:5 -msgid "Because "{1}"." -msgstr "Fordi "{1}"." +#: ../mail/em-folder-tree-model.c:556 ../mail/em-folder-tree-model.c:865 +msgid "Loading..." +msgstr "Indlæser..." -#: ../composer/mail-composer.error.xml.h:6 -msgid "" -"Closing this composer window will discard the message permanently, unless " -"you choose to save the message in your Drafts folder. This will allow you to " -"continue the message at a later date." -msgstr "" -"Hvis du lukker skrivevinduet vil beskeden forkastes permanent, med mindre du " -"vælger at gemme brevet i mappen Kladder. Dette vil lade dig fortsætte med at " -"skrive brevet på et senere tidspunkt." +#. Translators: This is the string used for displaying the +#. * folder names in folder trees. "%s" will be replaced by +#. * the folder's name and "%u" will be replaced with the +#. * number of unread messages in the folder. +#. * +#. * Most languages should translate this as "%s (%u)". The +#. * languages that use localized digits (like Persian) may +#. * need to replace "%u" with "%Iu". Right-to-left languages +#. * (like Arabic and Hebrew) may need to add bidirectional +#. * formatting codes to take care of the cases the folder +#. * name appears in either direction. +#. * +#. * Do not translate the "folder-display|" part. Remove it +#. * from your translation. +#. +#: ../mail/em-folder-tree.c:300 +#, c-format +msgctxt "folder-display" +msgid "%s (%u)" +msgstr "%s (%u)" -#: ../composer/mail-composer.error.xml.h:7 -msgid "Could not create composer window." -msgstr "Kunne ikke oprette skrivevindue." +#: ../mail/em-folder-tree.c:664 +msgid "Mail Folder Tree" +msgstr "Træ over brevmapper" -#: ../composer/mail-composer.error.xml.h:8 -msgid "Could not create message." -msgstr "Kunne ikke oprette brev." +#: ../mail/em-folder-tree.c:823 +#, c-format +msgid "Moving folder %s" +msgstr "Flytter mappen %s" -#: ../composer/mail-composer.error.xml.h:9 -msgid "Could not read signature file "{0}"." -msgstr "Kunne ikke læse signaturfilen "{0}"." +#: ../mail/em-folder-tree.c:825 +#, c-format +msgid "Copying folder %s" +msgstr "Kopierer mappen %s" -#: ../composer/mail-composer.error.xml.h:10 -msgid "Could not retrieve messages to attach from {0}." -msgstr "Kunne ikke hente brevene der skulle vedlægges fra {0}." +#: ../mail/em-folder-tree.c:832 ../mail/message-list.c:2014 +#, c-format +msgid "Moving messages into folder %s" +msgstr "Flytter breve til mappen %s" -#: ../composer/mail-composer.error.xml.h:11 -msgid "Could not save to autosave file "{0}"." -msgstr "Kunne ikke gemme til autogemfilen "{0}"." +#: ../mail/em-folder-tree.c:834 ../mail/message-list.c:2016 +#, c-format +msgid "Copying messages into folder %s" +msgstr "Kopierer breve til mappen %s" -#: ../composer/mail-composer.error.xml.h:12 -msgid "Directories can not be attached to Messages." -msgstr "Mapper kan ikke vedlægges breve." +# Kommentaren i kildekoden lyder: +# /* for types other than folder, we can't drop to the root path */ +#: ../mail/em-folder-tree.c:849 +msgid "Cannot drop message(s) into toplevel store" +msgstr "Kan ikke droppe brev(e) til rodniveau" -#: ../composer/mail-composer.error.xml.h:13 -msgid "Do you want to recover unfinished messages?" -msgstr "Vil du genoprette uafsluttede breve?" +#: ../mail/em-folder-tree.c:926 ../ui/evolution-mail-message.xml.h:100 +msgid "_Copy to Folder" +msgstr "Kop_iér til mappe" -#: ../composer/mail-composer.error.xml.h:14 -msgid "Download in progress. Do you want to send the mail?" -msgstr "Overførsel i gang. Vil du sende brevet?" +#: ../mail/em-folder-tree.c:927 ../ui/evolution-mail-message.xml.h:113 +msgid "_Move to Folder" +msgstr "Fl_yt til mappe" -#: ../composer/mail-composer.error.xml.h:15 -msgid "Error saving to autosave because "{1}"." -msgstr "Fejl ved gemning til autogem fordi "{1}"." +#: ../mail/em-folder-tree.c:929 ../mail/em-folder-utils.c:362 +#: ../mail/em-folder-view.c:1187 ../mail/message-list.c:2106 +msgid "_Move" +msgstr "_Flyt" -#: ../composer/mail-composer.error.xml.h:16 -msgid "" -"Evolution quit unexpectedly while you were composing a new message. " -"Recovering the message will allow you to continue where you left off." -msgstr "" -"Evolution afsluttede uventet mens du var ved at skrive et nyt brev. " -"Genoprettelse af brevet vil lade dig fortsætte hvor du slap." +#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:2108 +msgid "Cancel _Drag" +msgstr "Annullér _træk" -#: ../composer/mail-composer.error.xml.h:17 -msgid "" -"Send options available only for Novell GroupWise and Microsoft Exchange " -"accounts." -msgstr "" -"Sendetilvalg som kun er tilgængelige for Novell Groupwise- og Microsoft " -"Exchange-konti." +#: ../mail/em-folder-tree.c:1641 ../mail/mail-ops.c:1065 +#, c-format +msgid "Scanning folders in \"%s\"" +msgstr "Skanner mapper i \"%s\"" -#: ../composer/mail-composer.error.xml.h:18 -msgid "Send options not available." -msgstr "Afsendelsesindstillinger ikke tilgængelige." +#: ../mail/em-folder-tree.c:2044 +msgid "Open in _New Window" +msgstr "Åbn i _nyt vindue" -#: ../composer/mail-composer.error.xml.h:19 -msgid "The file `{0}' is not a regular file and cannot be sent in a message." -msgstr "Filen \"{0}\" er ikke en normal fil og kan ikke sendes i et brev." +#. FIXME: need to disable for nochildren folders +#: ../mail/em-folder-tree.c:2049 +msgid "_New Folder..." +msgstr "_Ny mappe..." -#: ../composer/mail-composer.error.xml.h:20 -msgid "" -"To attach the contents of this directory, either attach the files in this " -"directory individually, or create an archive of the directory and attach it." -msgstr "" -"For at tilføje indholdet af denne mappe, må du enten vedlægge filerne hver " -"for sig, eller oprette et arkiv af mappen og vedlægge dette." +#: ../mail/em-folder-tree.c:2052 +msgid "_Move..." +msgstr "_Flyt..." -#: ../composer/mail-composer.error.xml.h:21 -msgid "" -"Unable to activate the HTML editor control.\n" -"\n" -"Please make sure that you have the correct version of gtkhtml and libgtkhtml " -"installed." -msgstr "" -"Kan ikke aktivere HTML-redigeringskomponenten.\n" -"\n" -"Kontrollér venligst at du har den rette version af gtkhtml og libgtkhtml " -"installeret." +#: ../mail/em-folder-tree.c:2060 ../ui/evolution-mail-list.xml.h:21 +msgid "Re_fresh" +msgstr "Op_datér" -#: ../composer/mail-composer.error.xml.h:24 -msgid "Unable to activate the address selector control." -msgstr "Kan ikke aktivere styreelement til adresseudvælgelse." +#: ../mail/em-folder-tree.c:2061 +msgid "Fl_ush Outbox" +msgstr "T_øm udbakke" -#: ../composer/mail-composer.error.xml.h:25 -msgid "Unfinished messages found" -msgstr "Ikke-fuldførte breve fundet" +#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:138 +msgid "_Empty Trash" +msgstr "_Tøm papirkurv" -#: ../composer/mail-composer.error.xml.h:26 -msgid "Warning: Modified Message" -msgstr "Advarsel: Brevet ændret" +#: ../mail/em-folder-tree.c:2170 +msgid "_Unread Search Folder" +msgstr "_Ulæst søgemappe" -#: ../composer/mail-composer.error.xml.h:27 -msgid "You cannot attach the file `{0}' to this message." -msgstr "Du kan ikke vedlægge filen \"{0}\" til dette brev." +#: ../mail/em-folder-utils.c:99 +#, c-format +msgid "Copying `%s' to `%s'" +msgstr "Kopierer \"%s\" til \"%s\"" -#: ../composer/mail-composer.error.xml.h:28 -msgid "You need to configure an account before you can compose mail." -msgstr "Du skal konfigurere en konto inden du kan skrive e-post." +#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1187 +#: ../mail/em-folder-view.c:1202 +#: ../mail/importers/evolution-mbox-importer.c:82 +#: ../plugins/pst-import/pst-importer.c:305 +msgid "Select folder" +msgstr "Vælg mappe" -#: ../composer/mail-composer.error.xml.h:29 -msgid "_Continue Editing" -msgstr "_Fortsæt med at redigere" +#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1202 +msgid "C_opy" +msgstr "_Kopiér" -#: ../composer/mail-composer.error.xml.h:31 -msgid "_Do not Recover" -msgstr "Gendan _ikke" +#: ../mail/em-folder-utils.c:537 +#: ../plugins/groupwise-features/share-folder-common.c:144 +#, c-format +msgid "Creating folder `%s'" +msgstr "Opretter mappen \"%s\"" -#: ../composer/mail-composer.error.xml.h:32 -msgid "_Recover" -msgstr "_Genopret" +#: ../mail/em-folder-utils.c:696 +#: ../plugins/groupwise-features/install-shared.c:169 +#: ../plugins/groupwise-features/share-folder-common.c:386 +msgid "Create folder" +msgstr "Opret mappe" -#: ../composer/mail-composer.error.xml.h:33 -msgid "_Save Draft" -msgstr "_Gem kladde" +#: ../mail/em-folder-utils.c:696 +#: ../plugins/groupwise-features/install-shared.c:169 +#: ../plugins/groupwise-features/share-folder-common.c:386 +msgid "Specify where to create the folder:" +msgstr "Angiver hvor mappen skal oprettes:" -#: ../data/evolution.desktop.in.in.h:1 -msgid "Evolution Mail and Calendar" -msgstr "Evolutions E-post og Kalender" +#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70 +msgid "Mail Deletion Failed" +msgstr "Sletning af post fejlede" -#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951 -msgid "Groupware Suite" -msgstr "Samarbejdsprogrammelsuite" +#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126 +msgid "You do not have sufficient permissions to delete this mail." +msgstr "Du har ikke tilstrækkelige rettigheder til at slette denne post." -#: ../data/evolution.desktop.in.in.h:3 -msgid "Manage your email, contacts and schedule" -msgstr "Håndter dine e-breve, kontakter og skema" +#. 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 +#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:102 +msgid "_Edit as New Message..." +msgstr "R_edigér som nyt brev..." -#: ../data/evolution.keys.in.in.h:1 -msgid "address card" -msgstr "adressekort" +#: ../mail/em-folder-view.c:1342 +msgid "U_ndelete" +msgstr "_Fortryd sletning" -#: ../data/evolution.keys.in.in.h:2 -msgid "calendar information" -msgstr "kalenderinformation" +#: ../mail/em-folder-view.c:1343 +msgid "_Move to Folder..." +msgstr "Fl_yt til mappe..." -#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121 -msgid "Evolution Error" -msgstr "Evolution fejl" +#: ../mail/em-folder-view.c:1344 +msgid "_Copy to Folder..." +msgstr "K_opiér til mappe..." -#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119 -msgid "Evolution Warning" -msgstr "Evolution advarsel" +#: ../mail/em-folder-view.c:1347 +msgid "Mar_k as Read" +msgstr "Mar_kér som læst" -#: ../e-util/e-error.c:118 -msgid "Evolution Information" -msgstr "Evolution information" +#: ../mail/em-folder-view.c:1348 +msgid "Mark as _Unread" +msgstr "Markér som ulæs_t" -#: ../e-util/e-error.c:120 -msgid "Evolution Query" -msgstr "Evolution forespørgsel" +#: ../mail/em-folder-view.c:1349 +msgid "Mark as _Important" +msgstr "Markér som v_igtig" -#. setup a dummy error -#: ../e-util/e-error.c:444 -#, c-format -msgid "Internal error, unknown error '%s' requested" -msgstr "Intern fejl, ukendt fejl \"%s\" forespurgt" +#: ../mail/em-folder-view.c:1350 +msgid "Mark as Un_important" +msgstr "Markér som uvi_gtig" -#: ../e-util/e-logger.c:161 -msgid "Component" -msgstr "Komponent" +#: ../mail/em-folder-view.c:1351 +msgid "Mark as _Junk" +msgstr "Markér som spa_m" -#: ../e-util/e-logger.c:162 -msgid "Name of the component being logged" -msgstr "Navn på den komponent som logges" +#: ../mail/em-folder-view.c:1352 +msgid "Mark as _Not Junk" +msgstr "Markér som værende _ikke-spam" -#: ../e-util/e-non-intrusive-error-dialog.c:190 -msgid "Debug Logs" -msgstr "Fejlfindingslogge" +#: ../mail/em-folder-view.c:1353 +msgid "Mark for Follo_w Up..." +msgstr "Markér til opføl_gning..." -#: ../e-util/e-non-intrusive-error-dialog.c:204 -msgid "Show _errors in the status bar for" -msgstr "Viser _fejl i statusbjælken i" +#: ../mail/em-folder-view.c:1355 +msgid "_Label" +msgstr "Mær_kning" -#. Translators: This is the second part of the sentence -#. * "Show _errors in the status bar for" - XXX - "second(s)." -#: ../e-util/e-non-intrusive-error-dialog.c:222 -msgid "second(s)." -msgstr "sekund(er)." +#. Note that we don't show this here, since by default a 'None' date +#. is not permitted. +#: ../mail/em-folder-view.c:1356 ../widgets/misc/e-dateedit.c:477 +msgid "_None" +msgstr "_Ingen" -#: ../e-util/e-non-intrusive-error-dialog.c:228 -msgid "Log Messages:" -msgstr "Log breve:" +#: ../mail/em-folder-view.c:1359 +msgid "_New Label" +msgstr "_Ny mærkat" -#: ../e-util/e-non-intrusive-error-dialog.c:273 -msgid "Log Level" -msgstr "Logniveau" - -#: ../e-util/e-non-intrusive-error-dialog.c:281 -#: ../widgets/misc/e-dateedit.c:389 -msgid "Time" -msgstr "Tid" +#: ../mail/em-folder-view.c:1363 +msgid "Fla_g Completed" +msgstr "Markér som fuldf_ørt" -#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523 -#: ../mail/message-list.etspec.h:10 -msgid "Messages" -msgstr "Breve" +#: ../mail/em-folder-view.c:1364 +msgid "Cl_ear Flag" +msgstr "Fjer_n markering" -#: ../e-util/e-non-intrusive-error-dialog.c:300 -#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4 -msgid "Close this window" -msgstr "Luk dette vindue" +#: ../mail/em-folder-view.c:1367 +msgid "Crea_te Rule From Message" +msgstr "_Opret regel fra brev" -#: ../e-util/e-non-intrusive-error-dialog.h:40 -msgid "Error" -msgstr "Fejl" +#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on. +#: ../mail/em-folder-view.c:1369 +msgid "Search Folder based on _Subject" +msgstr "Søgemappe ud fra _emne" -#: ../e-util/e-non-intrusive-error-dialog.h:40 -msgid "Errors" -msgstr "Fejl" +#: ../mail/em-folder-view.c:1370 +msgid "Search Folder based on Se_nder" +msgstr "Søgemappe ud fra afse_nder" -#: ../e-util/e-non-intrusive-error-dialog.h:41 -msgid "Warnings and Errors" -msgstr "Advarsler og fejl" +#: ../mail/em-folder-view.c:1371 +msgid "Search Folder based on _Recipients" +msgstr "Søgemappe ud fra modtage_re" -#: ../e-util/e-non-intrusive-error-dialog.h:42 -msgid "Debug" -msgstr "Fejlfind" +#: ../mail/em-folder-view.c:1372 +msgid "Search Folder based on Mailing _List" +msgstr "Søgemappe ud fra e-post_liste" -#: ../e-util/e-non-intrusive-error-dialog.h:42 -msgid "Error, Warnings and Debug messages" -msgstr "Fejl, advarsler og fejlfindingsbeskeder" +#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on. +#: ../mail/em-folder-view.c:1377 +msgid "Filter based on Sub_ject" +msgstr "Filtrér på em_ne" -#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799 -#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966 -#: ../plugins/plugin-manager/plugin-manager.c:355 -#: ../plugins/publish-calendar/publish-calendar.c:690 -msgid "Enabled" -msgstr "Aktiveret" +#: ../mail/em-folder-view.c:1378 +msgid "Filter based on Sen_der" +msgstr "Filtrér på afsen_der" -#: ../e-util/e-plugin.c:309 -msgid "Whether the plugin is enabled" -msgstr "Om udvidelsesmodulet er slået til eller fra" +#: ../mail/em-folder-view.c:1379 +msgid "Filter based on Re_cipients" +msgstr "Filtrér på modta_gere" -#: ../e-util/e-print.c:160 -msgid "An error occurred while printing" -msgstr "Der opstod en fejl under udskrivning" +#: ../mail/em-folder-view.c:1380 +msgid "Filter based on _Mailing List" +msgstr "Filtrér på e-_postliste" -#: ../e-util/e-print.c:167 -msgid "The printing system reported the following details about the error:" -msgstr "Udskriftssystemet gav følgende information om fejlen:" +#. default charset used in mail view +#. we changed user, thus reset the chosen calendar combo too, because +#. other user means other calendars subscribed +#: ../mail/em-folder-view.c:2235 ../mail/em-folder-view.c:2278 +#: ../plugins/google-account-setup/google-source.c:232 +#: ../plugins/google-account-setup/google-source.c:511 +#: ../plugins/google-account-setup/google-source.c:699 +msgid "Default" +msgstr "Standard" -#: ../e-util/e-print.c:173 -msgid "" -"The printing system did not report any additional details about the error." -msgstr "Udskriftssystemet gav ikke yderligere information om fejlen." +#: ../mail/em-folder-view.c:2496 +msgid "Unable to retrieve message" +msgstr "Kan ikke hente brevet" -#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19 -msgid "Because \"{1}\"." -msgstr "Fordi \"{1}\"." +#: ../mail/em-folder-view.c:2515 +msgid "Retrieving Message..." +msgstr "Henter brev..." -#: ../e-util/e-system.error.xml.h:2 -msgid "Cannot open file \"{0}\"." -msgstr "Kan ikke åbne filen \"{0}\"." +#: ../mail/em-folder-view.c:2736 +msgid "Create _Search Folder" +msgstr "Opret søge_mappe" -#: ../e-util/e-system.error.xml.h:3 -msgid "Cannot save file \"{0}\"." -msgstr "Kan ikke gemme filen \"{0}\"." +#: ../mail/em-folder-view.c:2737 +msgid "_From this Address" +msgstr "_Fra denne adresse" -#: ../e-util/e-system.error.xml.h:4 -msgid "Do you wish to overwrite it?" -msgstr "Ønsker du at overskrive den?" +#: ../mail/em-folder-view.c:2738 +msgid "_To this Address" +msgstr "_Til denne adresse" -#: ../e-util/e-system.error.xml.h:5 -msgid "File exists \"{0}\"." -msgstr "Filen findes \"{0}\"." +#: ../mail/em-folder-view.c:3231 +#, c-format +msgid "Click to mail %s" +msgstr "Klik for at skrive til %s" -#: ../e-util/e-system.error.xml.h:6 -msgid "Overwrite file?" -msgstr "Overskriv fil?" +#: ../mail/em-folder-view.c:3243 +#, c-format +msgid "Click to call %s" +msgstr "Klik for at ringe til %s" -#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141 -msgid "_Overwrite" -msgstr "_Overskriv" +#: ../mail/em-folder-view.c:3248 +msgid "Click to hide/unhide addresses" +msgstr "Klik for at vise/skjule adresser" -#: ../e-util/e-util.c:127 -msgid "Could not open the link." -msgstr "Kunne ikke åbne link." +#: ../mail/em-format-html-display.c:570 ../mail/em-format-html.c:655 +msgid "Unsigned" +msgstr "Ikke signeret" -#: ../e-util/e-util.c:174 -msgid "Could not display help for Evolution." -msgstr "Kunne ikke vise hjælp for Evolution." +#: ../mail/em-format-html-display.c:570 +msgid "" +"This message is not signed. There is no guarantee that this message is " +"authentic." +msgstr "" +"Dette brev er ikke signeret. Der er ingen garanti for at dette brev er " +"autentisk." -#: ../e-util/e-util-labels.c:39 -msgid "I_mportant" -msgstr "_Vigtig" +#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:656 +msgid "Valid signature" +msgstr "Gyldig signatur" -#. red -#: ../e-util/e-util-labels.c:40 -msgid "_Work" -msgstr "A_rbejde" +#: ../mail/em-format-html-display.c:571 +msgid "" +"This message is signed and is valid meaning that it is very likely that this " +"message is authentic." +msgstr "" +"Dette brev er signeret og er gyldigt, hvilket sandsynligvis betyder at dette " +"brev er autentisk." -#. orange -#: ../e-util/e-util-labels.c:41 -msgid "_Personal" -msgstr "_Personligt" +#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:657 +msgid "Invalid signature" +msgstr "Ugyldig signatur" -#. green -#: ../e-util/e-util-labels.c:42 -msgid "_To Do" -msgstr "_Gøremål" +#: ../mail/em-format-html-display.c:572 +msgid "" +"The signature of this message cannot be verified, it may have been altered " +"in transit." +msgstr "" +"Signaturen for dette brev kan ikke verificeres. Den kan være ændret under " +"overføringen." -#. blue -#: ../e-util/e-util-labels.c:43 -msgid "_Later" -msgstr "_Senere" +#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:658 +msgid "Valid signature, but cannot verify sender" +msgstr "Gyldig signatur, men kunne ikke verificere afsenderen" -#: ../e-util/e-util-labels.c:315 -msgid "Label _Name:" -msgstr "Mærkat_navn:" +#: ../mail/em-format-html-display.c:573 +msgid "" +"This message is signed with a valid signature, but the sender of the message " +"cannot be verified." +msgstr "" +"Dette brev er signeret med en gyldig signatur, men afsenderen af brevet kan " +"ikke verificeres." -#: ../e-util/e-util-labels.c:338 -msgid "Edit Label" -msgstr "Rediger mærkat" +#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:659 +msgid "Signature exists, but need public key" +msgstr "Signaturen eksisterer, men der skal bruges en offentlig nøgle" -#: ../e-util/e-util-labels.c:338 -msgid "Add Label" -msgstr "Tilføj mærkat" +#: ../mail/em-format-html-display.c:574 +msgid "" +"This message is signed with a signature, but there is no corresponding " +"public key." +msgstr "" +"Dette brev er signeret med en signatur, men der er ikke nogen tilsvarende " +"offentlig nøgle." -#: ../e-util/e-util-labels.c:357 -msgid "Label name cannot be empty." -msgstr "Mærkatnavnet kan ikke være tomt." +#: ../mail/em-format-html-display.c:581 ../mail/em-format-html.c:665 +msgid "Unencrypted" +msgstr "Ikke krypteret" -#: ../e-util/e-util-labels.c:362 +#: ../mail/em-format-html-display.c:581 msgid "" -"A label having the same tag already exists on the server. Please rename your " -"label." +"This message is not encrypted. Its content may be viewed in transit across " +"the Internet." msgstr "" -"Mærkat med samme mærke eksisterer allerede på serveren. Omdøb venligst din " -"mærkat." +"Dette brev er ikke krypteret. Indholdet af brevet kan ses ved overførslen " +"over internettet." -#: ../e-util/gconf-bridge.c:1221 -#, c-format -msgid "GConf error: %s" -msgstr "GConf-fejl: %s" +#: ../mail/em-format-html-display.c:582 ../mail/em-format-html.c:666 +msgid "Encrypted, weak" +msgstr "Krypteret, svag" -#: ../e-util/gconf-bridge.c:1231 -msgid "All further errors shown only on terminal." -msgstr "Alle følgende fejl vises kun i terminalen." +#: ../mail/em-format-html-display.c:582 +msgid "" +"This message is encrypted, but with a weak encryption algorithm. It would be " +"difficult, but not impossible for an outsider to view the content of this " +"message in a practical amount of time." +msgstr "" +"Dette brev er krypteret, men med en svag krypteringsalgoritme. Det er " +"vanskeligt, men i praksis ikke umuligt for en udenforstående at se indholdet " +"af brevet." -#: ../filter/filter-datespec.c:81 -#, c-format -msgid "1 second ago" -msgid_plural "%d seconds ago" -msgstr[0] "1 sekund siden" -msgstr[1] "%d sekunder siden" +#: ../mail/em-format-html-display.c:583 ../mail/em-format-html.c:667 +msgid "Encrypted" +msgstr "Krypteret" -#: ../filter/filter-datespec.c:81 -#, c-format -msgid "1 second in the future" -msgid_plural "%d seconds in the future" -msgstr[0] "1 sekund ude i fremtiden" -msgstr[1] "%d sekunder ude i fremtiden" +#: ../mail/em-format-html-display.c:583 +msgid "" +"This message is encrypted. It would be difficult for an outsider to view " +"the content of this message." +msgstr "" +"Dette brev er krypteret. Det vil være vanskeligt for en udenforstående at se " +"indholdet i brevet." -#: ../filter/filter-datespec.c:82 -#, c-format -msgid "1 minute ago" -msgid_plural "%d minutes ago" -msgstr[0] "1 minut siden" -msgstr[1] "%d minutter siden" +#: ../mail/em-format-html-display.c:584 ../mail/em-format-html.c:668 +msgid "Encrypted, strong" +msgstr "Krypteret, stærk" -#: ../filter/filter-datespec.c:82 -#, c-format -msgid "1 minute in the future" -msgid_plural "%d minutes in the future" -msgstr[0] "1 minut ude i fremtiden" -msgstr[1] "%d minutter ude i fremtiden" +#: ../mail/em-format-html-display.c:584 +msgid "" +"This message is encrypted, with a strong encryption algorithm. It would be " +"very difficult for an outsider to view the content of this message in a " +"practical amount of time." +msgstr "" +"Dette brev er krypteret med en stærk algoritme. Det vil være meget " +"vanskeligt for en udenforstående at kunne komme til at se indholdet af " +"brevet i løbet af en kortere tidshorisont." -#: ../filter/filter-datespec.c:83 -#, c-format -msgid "1 hour ago" -msgid_plural "%d hours ago" -msgstr[0] "1 time siden" -msgstr[1] "%d timer siden" +#: ../mail/em-format-html-display.c:685 ../smime/gui/smime-ui.glade.h:48 +msgid "_View Certificate" +msgstr "_Vis certifikat" -#: ../filter/filter-datespec.c:83 -#, c-format -msgid "1 hour in the future" -msgid_plural "%d hours in the future" -msgstr[0] "1 time ude i fremtiden" -msgstr[1] "%d timer ude i fremtiden" +#: ../mail/em-format-html-display.c:700 +msgid "This certificate is not viewable" +msgstr "Dette certifikat kan ikke vises" -#: ../filter/filter-datespec.c:84 -#, c-format -msgid "1 day ago" -msgid_plural "%d days ago" -msgstr[0] "1 dag siden" -msgstr[1] "%d dage siden" +#: ../mail/em-format-html-display.c:992 +msgid "Completed on %B %d, %Y, %l:%M %p" +msgstr "Fuldført den %d. %B %Y %H:%M" -#: ../filter/filter-datespec.c:84 +#: ../mail/em-format-html-display.c:1000 +msgid "Overdue:" +msgstr "Overskredet:" + +#: ../mail/em-format-html-display.c:1003 +msgid "by %B %d, %Y, %l:%M %p" +msgstr "den %d. %B %Y %H:%M" + +#: ../mail/em-format-html-display.c:1083 +#: ../widgets/misc/e-attachment-view.c:357 +msgid "_View Inline" +msgstr "_Vis integreret" + +#: ../mail/em-format-html-display.c:1084 +#: ../widgets/misc/e-attachment-view.c:350 +msgid "_Hide" +msgstr "_Skjul" + +#: ../mail/em-format-html-display.c:1085 +msgid "_Fit to Width" +msgstr "Tilpas til _bredde" + +#: ../mail/em-format-html-display.c:1086 +msgid "Show _Original Size" +msgstr "Vis _oprindelig størrelse" + +#: ../mail/em-format-html-display.c:1587 ../mail/em-format-html-display.c:1626 +msgid "View _Unformatted" +msgstr "Vis _uformateret" + +#: ../mail/em-format-html-display.c:1589 +msgid "Hide _Unformatted" +msgstr "Skjul _uformateret" + +#: ../mail/em-format-html-display.c:1646 +msgid "O_pen With" +msgstr "_Åbn med" + +#: ../mail/em-format-html-display.c:1723 +msgid "" +"Evolution cannot render this email as it is too large to process. You can " +"view it unformatted or with an external text editor." +msgstr "" +"Evolution kan ikke vise dette e-brev da det er for stort til at håndtere. Du " +"kan se den uformateret eller med et eksternt tekstredigeringsprogram." + +#: ../mail/em-format-html-print.c:157 #, c-format -msgid "1 day in the future" -msgid_plural "%d days in the future" -msgstr[0] "1 dag ude i fremtiden" -msgstr[1] "%d dage ude i fremtiden" +msgid "Page %d of %d" +msgstr "Side %d af %d" -#: ../filter/filter-datespec.c:85 +#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515 #, c-format -msgid "1 week ago" -msgid_plural "%d weeks ago" -msgstr[0] "1 uge siden" -msgstr[1] "%d uger siden" +msgid "Retrieving `%s'" +msgstr "Henter \"%s\"" -#: ../filter/filter-datespec.c:85 +#: ../mail/em-format-html.c:930 +msgid "Unknown external-body part." +msgstr "Ukendt ydre del af brevindhold." + +#: ../mail/em-format-html.c:938 +msgid "Malformed external-body part." +msgstr "Misdannet ydre del af brevindhold." + +#: ../mail/em-format-html.c:968 #, c-format -msgid "1 week in the future" -msgid_plural "%d weeks in the future" -msgstr[0] "1 uge ude i fremtiden" -msgstr[1] "%d uger ude i fremtiden" +msgid "Pointer to FTP site (%s)" +msgstr "Peger til FTP-server (%s)" -#: ../filter/filter-datespec.c:86 +#: ../mail/em-format-html.c:979 #, c-format -msgid "1 month ago" -msgid_plural "%d months ago" -msgstr[0] "1 måned siden" -msgstr[1] "%d måneder siden" +msgid "Pointer to local file (%s) valid at site \"%s\"" +msgstr "Peger til lokal fil (%s) gyldig på netsted \"%s\"" -#: ../filter/filter-datespec.c:86 +#: ../mail/em-format-html.c:981 #, c-format -msgid "1 month in the future" -msgid_plural "%d months in the future" -msgstr[0] "1 måned ude i fremtiden" -msgstr[1] "%d måneder ude i fremtiden" +msgid "Pointer to local file (%s)" +msgstr "Peger til lokal fil (%s)" -#: ../filter/filter-datespec.c:87 +#: ../mail/em-format-html.c:1002 #, c-format -msgid "1 year ago" -msgid_plural "%d years ago" -msgstr[0] "1 år siden" -msgstr[1] "%d år siden" +msgid "Pointer to remote data (%s)" +msgstr "Peger til eksterne data (%s)" -#: ../filter/filter-datespec.c:87 +#: ../mail/em-format-html.c:1013 #, c-format -msgid "1 year in the future" -msgid_plural "%d years in the future" -msgstr[0] "1 år ude i fremtiden" -msgstr[1] "%d år ude i fremtiden" +msgid "Pointer to unknown external data (\"%s\" type)" +msgstr "Peger til ukendt ekstern data (\"%s\"-type)" -#: ../filter/filter-datespec.c:288 -msgid "" -msgstr "" +#: ../mail/em-format-html.c:1241 +msgid "Formatting message" +msgstr "Formaterer brev" -#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302 -#: ../filter/filter-datespec.c:313 -msgid "now" -msgstr "nu" +#: ../mail/em-format-html.c:1415 +msgid "Formatting Message..." +msgstr "Formaterer brev..." -#. strftime for date filter display, only needs to show a day date (i.e. no time) -#: ../filter/filter-datespec.c:298 -msgid "%d-%b-%Y" -msgstr "%d %b %Y" +#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632 +#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210 +#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:78 +msgid "Cc" +msgstr "Cc" -#: ../filter/filter-datespec.c:452 -msgid "Select a time to compare against" -msgstr "Vælg en tid at sammenligne med" +#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638 +#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210 +#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:79 +msgid "Bcc" +msgstr "Bcc" -#: ../filter/filter-file.c:284 -msgid "Choose a file" -msgstr "Vælg en fil" +#. pseudo-header +#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353 +#: ../mail/em-mailer-prefs.c:1439 +msgid "Mailer" +msgstr "E-postprogram" -#: ../filter/filter-part.c:532 -#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3 -msgid "Test" -msgstr "Test" +#. translators: strftime format for local time equivalent in Date header display, with day +#: ../mail/em-format-html.c:1776 +msgid " (%a, %R %Z)" +msgstr " (%a, %R %Z)" -#: ../filter/filter-rule.c:853 -msgid "R_ule name:" -msgstr "R_egelnavn:" +#. translators: strftime format for local time equivalent in Date header display, without day +#: ../mail/em-format-html.c:1781 +msgid " (%R %Z)" +msgstr " (%R %Z)" -#: ../filter/filter-rule.c:881 -msgid "Find items that meet the following conditions" -msgstr "Find punkter der opfylder følgende betingelser" +#. To translators: This message suggests to the receipients that the sender of the mail is +#. different from the one listed in From field. +#. +#: ../mail/em-format-html.c:1917 +#, c-format +msgid "This message was sent by %s on behalf of %s" +msgstr "Dette brev blev sendt af %s på vegne af %s" -#: ../filter/filter-rule.c:915 -msgid "A_dd Condition" -msgstr "T_ilføj betingelse" +#: ../mail/em-format-quote.c:210 ../mail/em-format.c:923 +#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7 +#: ../mail/message-tag-followup.c:301 +msgid "From" +msgstr "Fra" -#: ../filter/filter-rule.c:921 -msgid "If all conditions are met" -msgstr "Hvis alle betingelser er opfyldt" +#: ../mail/em-format-quote.c:210 ../mail/em-format.c:924 +#: ../mail/em-mailer-prefs.c:76 +msgid "Reply-To" +msgstr "Svar-til" -#: ../filter/filter-rule.c:921 -msgid "If any conditions are met" -msgstr "Hvis én eller flere betingelser er opfyldt" +#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:81 +#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:324 +#: ../widgets/misc/e-dateedit.c:346 +msgid "Date" +msgstr "Dato" -#: ../filter/filter-rule.c:923 -msgid "_Find items:" -msgstr "_Find punkter:" +#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:82 +msgid "Newsgroups" +msgstr "Nyhedsgrupper" -#: ../filter/filter-rule.c:945 -msgid "All related" -msgstr "Alle relaterede" +#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:83 +#: ../plugins/face/org-gnome-face.eplug.xml.h:4 +msgid "Face" +msgstr "Ansigt" -#: ../filter/filter-rule.c:945 -msgid "Replies" -msgstr "Svar" +#: ../mail/em-format.c:1201 +#, c-format +msgid "%s attachment" +msgstr "%s-bilag" -#: ../filter/filter-rule.c:945 -msgid "Replies and parents" -msgstr "Svar og forældre" +#: ../mail/em-format.c:1239 +msgid "Could not parse S/MIME message: Unknown error" +msgstr "Kunne ikke fortolke S/MIME-brev: Ukendt fejl" -#: ../filter/filter-rule.c:945 -msgid "No reply or parent" -msgstr "Intet svar eller forældre" +#: ../mail/em-format.c:1376 ../mail/em-format.c:1533 +msgid "Could not parse MIME message. Displaying as source." +msgstr "Kunne ikke læse MIME-brev. Viser rå brevtekst." -#: ../filter/filter-rule.c:947 -msgid "I_nclude threads" -msgstr "I_nkludér tråde" +#: ../mail/em-format.c:1384 +msgid "Unsupported encryption type for multipart/encrypted" +msgstr "Krypteringstype for multipart/encrypted som ikke er understøttet" -#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3 -#: ../mail/em-utils.c:310 -msgid "Incoming" -msgstr "Indkommende" +#: ../mail/em-format.c:1394 +msgid "Could not parse PGP/MIME message" +msgstr "Kunne ikke fortolke PGP/MIME-meddelelse" -#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311 -msgid "Outgoing" -msgstr "Udgående" +#: ../mail/em-format.c:1394 +msgid "Could not parse PGP/MIME message: Unknown error" +msgstr "Kunne ikke fortolke PGP/MIME-meddelelse: Ukendt fejl" -#: ../filter/filter.error.xml.h:1 -msgid "Bad regular expression "{0}"." -msgstr "Fejl i regulært udtryk "{0}"." +#: ../mail/em-format.c:1552 +msgid "Unsupported signature format" +msgstr "Signatur-formatet er ikke understøttet" -#: ../filter/filter.error.xml.h:2 -msgid "Could not compile regular expression "{1}"." -msgstr "Kunne ikke oversætte det regulære udtryk "{1}"." +#: ../mail/em-format.c:1560 ../mail/em-format.c:1631 +msgid "Error verifying signature" +msgstr "Fejl ved efterprøvning af signaturen" -#: ../filter/filter.error.xml.h:3 -msgid "File "{0}" does not exist or is not a regular file." -msgstr "Filen "{0}" findes ikke eller er ingen almindelig fil." +#: ../mail/em-format.c:1560 ../mail/em-format.c:1622 ../mail/em-format.c:1631 +msgid "Unknown error verifying signature" +msgstr "Ukendt fejl ved efterprøvning af signaturen" -#: ../filter/filter.error.xml.h:4 -msgid "Missing date." -msgstr "Dato mangler." +#: ../mail/em-format.c:1705 +msgid "Could not parse PGP message" +msgstr "Kunne ikke fortolke PGP-meddelelse" -#: ../filter/filter.error.xml.h:5 -msgid "Missing file name." -msgstr "Filnavn mangler." +#: ../mail/em-format.c:1705 +msgid "Could not parse PGP message: Unknown error" +msgstr "Kunne ikke fortolke PGP-meddelelse: Ukendt fejl" -#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75 -msgid "Missing name." -msgstr "Navn mangler." +#: ../mail/em-mailer-prefs.c:94 +msgid "Every time" +msgstr "Hver gang" -#: ../filter/filter.error.xml.h:7 -msgid "Name "{0}" already used." -msgstr "Navnet "{0}" er allerede brugt." +#: ../mail/em-mailer-prefs.c:95 +msgid "Once per day" +msgstr "En gang per dag" -#: ../filter/filter.error.xml.h:8 -msgid "Please choose another name." -msgstr "Vælg venligst et andet navn." +#: ../mail/em-mailer-prefs.c:96 +msgid "Once per week" +msgstr "En gang per uge" -#: ../filter/filter.error.xml.h:9 -msgid "You must choose a date." -msgstr "Du skal vælge en dato." +#: ../mail/em-mailer-prefs.c:97 +msgid "Once per month" +msgstr "En gang per måned" -#: ../filter/filter.error.xml.h:10 -msgid "You must name this filter." -msgstr "Du skal give navn til dette filter." +#: ../mail/em-mailer-prefs.c:333 +msgid "Add Custom Junk Header" +msgstr "Tilføj tilpasset spam-brevhoved" -#: ../filter/filter.error.xml.h:11 -msgid "You must specify a file name." -msgstr "Du skal angive et filnavn." +#: ../mail/em-mailer-prefs.c:337 +msgid "Header Name:" +msgstr "Brevhovednavn:" -#: ../filter/filter.glade.h:1 -msgid "_Filter Rules" -msgstr "_Filterregler" +#: ../mail/em-mailer-prefs.c:338 +msgid "Header Value Contains:" +msgstr "Brevhoved-værdi indeholder:" -#: ../filter/filter.glade.h:2 -msgid "Compare against" -msgstr "Sammenlign med" +#: ../mail/em-mailer-prefs.c:440 ../widgets/table/e-table-click-to-add.c:501 +#: ../widgets/table/e-table-selection-model.c:309 +msgid "Header" +msgstr "Teksthoved" -#: ../filter/filter.glade.h:4 -msgid "Show filters for mail:" -msgstr "Vis filtre for e-post:" +#: ../mail/em-mailer-prefs.c:444 +msgid "Contains Value" +msgstr "Indeholder værdi" -#: ../filter/filter.glade.h:5 -msgid "" -"The message's date will be compared against\n" -"12:00am of the date specified." -msgstr "" -"Brevets datering vil blive sammenlignet med\n" -"klokken 12.00 på den angivne dato." +#: ../mail/em-mailer-prefs.c:467 +msgid "Color" +msgstr "Farve" -#: ../filter/filter.glade.h:7 -msgid "" -"The message's date will be compared against\n" -"a time relative to when filtering occurs." +#: ../mail/em-mailer-prefs.c:470 +msgid "Tag" +msgstr "Mærke" + +#. May be a better text +#: ../mail/em-mailer-prefs.c:1067 ../mail/em-mailer-prefs.c:1121 +#, c-format +msgid "%s plugin is available and the binary is installed." msgstr "" -"Brevets datering vil blive sammenlignet med\n" -"en tid som er relativ til når filtrering sker." +"%s-udvidelsesmodulet er tilgængeligt og dets binære pakke er installeret." -#: ../filter/filter.glade.h:9 +#. May be a better text +#: ../mail/em-mailer-prefs.c:1075 ../mail/em-mailer-prefs.c:1130 +#, c-format msgid "" -"The message's date will be compared against\n" -"the current time when filtering occurs." +"%s plugin is not available. Please check whether the package is installed." msgstr "" -"Brevets datering vil blive sammenlignet med\n" -"det aktuelle tidspunkt når filtreringen sker." +"%s-udvidelsesmodulet er ikke tilgængeligt. Kontrollér om pakken er " +"installeret." -#: ../filter/filter.glade.h:12 -msgid "a time relative to the current time" -msgstr "en tid relativ til tiden nu" +#: ../mail/em-mailer-prefs.c:1096 +msgid "No Junk plugin available" +msgstr "Intet spam-udvidelsesmodul tilgængeligt" -#: ../filter/filter.glade.h:13 -msgid "ago" -msgstr "siden" +#. green +#: ../mail/em-migrate.c:961 +msgid "To Do" +msgstr "Gøremål" -# Det her er lidt en fortolkning. Jeg går ud fra at strengen ender med at skulle være. 2 måneder og 4 dage ude i fremtiden. Gættet er også lidt understøttet af at strengen "a time relative to the current time" findes lige i nærheden -#: ../filter/filter.glade.h:16 -msgid "in the future" -msgstr "ude i fremtiden" +#. blue +#: ../mail/em-migrate.c:962 +msgid "Later" +msgstr "Senere" -#: ../filter/filter.glade.h:18 -msgid "months" -msgstr "måneder" +#: ../mail/em-migrate.c:1129 +msgid "Migration" +msgstr "Overflytning" -#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198 -msgid "seconds" -msgstr "sekunder" +#: ../mail/em-migrate.c:1574 +#, c-format +msgid "Unable to create new folder `%s': %s" +msgstr "Kan ikke oprette ny mappe \"%s\": %s" -#: ../filter/filter.glade.h:20 -msgid "the current time" -msgstr "tiden nu" +#: ../mail/em-migrate.c:1600 +#, c-format +msgid "Unable to copy folder `%s' to `%s': %s" +msgstr "Kan ikke kopiere mappen \"%s\" til \"%s\": %s" -#: ../filter/filter.glade.h:21 -msgid "the time you specify" -msgstr "den tid du angiver" +#: ../mail/em-migrate.c:1785 +#, c-format +msgid "Unable to scan for existing mailboxes at `%s': %s" +msgstr "Kan ikke skanne efter eksisterende brevbakker på \"%s\": %s" -#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433 -#: ../plugins/calendar-http/calendar-http.c:282 -#: ../plugins/calendar-weather/calendar-weather.c:527 -#: ../plugins/google-account-setup/google-source.c:655 -#: ../plugins/google-account-setup/google-contacts-source.c:369 -msgid "weeks" -msgstr "uger" +#: ../mail/em-migrate.c:1790 +msgid "" +"The location and hierarchy of the Evolution mailbox folders has changed " +"since Evolution 1.x.\n" +"\n" +"Please be patient while Evolution migrates your folders..." +msgstr "" +"Placering og struktur for Evolutions e-post-mapper er ændret siden Evolution " +"1.x.\n" +"\n" +"Vent venligst mens Evolution overflytter dine mapper..." -#: ../filter/filter.glade.h:23 -msgid "years" -msgstr "år" +#: ../mail/em-migrate.c:1991 +#, c-format +msgid "Unable to open old POP keep-on-server data `%s': %s" +msgstr "Kan ikke åbne gammel POP-behold på serveren-data \"%s\": %s" -#: ../filter/rule-editor.c:382 -msgid "Add Rule" -msgstr "Tilføj regel" +#: ../mail/em-migrate.c:2005 +#, c-format +msgid "Unable to create POP3 keep-on-server data directory `%s': %s" +msgstr "Kan ikke oprette POP3-behold på serveren-data-katalog \"%s\": %s" -#: ../filter/rule-editor.c:463 -msgid "Edit Rule" -msgstr "Redigér regel" +#: ../mail/em-migrate.c:2034 +#, c-format +msgid "Unable to copy POP3 keep-on-server data `%s': %s" +msgstr "" +"Kan ikke kopiere data om breve der skal beholdes på POP3-server \"%s\": %s" -#: ../filter/rule-editor.c:809 -msgid "Rule name" -msgstr "Regelnavn" +#: ../mail/em-migrate.c:2505 ../mail/em-migrate.c:2517 +#, c-format +msgid "Failed to create local mail storage `%s': %s" +msgstr "Kunne ikke oprette opbevaringssted \"%s\": %s til lokal e-post" -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1 -msgid "Composer Preferences" -msgstr "Redigeringsindstillinger" +#: ../mail/em-migrate.c:2875 +msgid "Migrating Folders" +msgstr "Overflytter mapper" -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2 +#: ../mail/em-migrate.c:2875 msgid "" -"Configure mail preferences, including security and message display, here" +"The summary format of the Evolution mailbox folders has been moved to SQLite " +"since Evolution 2.24.\n" +"\n" +"Please be patient while Evolution migrates your folders..." msgstr "" -"Konfigurér e-post-indstillinger, inklusive sikkerhed og brevvisning, her" +"Sammendragsformatet for Evolution e-post-brevbakkerne er blevet flyttet til " +"SQLite siden Evolution 2.24.\n" +"\n" +"Vent venligst mens Evolution flytter dine mapper..." -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3 -msgid "Configure spell-checking, signatures, and the message composer here" -msgstr "Konfigurér stavekontrol, signaturer, og brevredigering her" +#: ../mail/em-migrate.c:2957 +#, c-format +msgid "Unable to create local mail folders at `%s': %s" +msgstr "Kan ikke oprette lokal e-post-mappe på \"%s\": %s" -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4 -msgid "Configure your email accounts here" -msgstr "Konfigurér dine e-post-konti her" +#: ../mail/em-migrate.c:2976 +msgid "" +"Unable to read settings from previous Evolution install, `evolution/config." +"xmldb' does not exist or is corrupt." +msgstr "" +"Kan ikke læse indstillingerne fra tidligere installation af Evolution, " +"\"evolution/config.xmldb\" findes ikke eller er ødelagt." -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5 -msgid "Configure your network connection settings here" -msgstr "Konfigurér dine netværkforbindelses-indstillinger her" +#: ../mail/em-popup.c:364 +msgid "Save As..." +msgstr "Gem som..." -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6 -msgid "Evolution Mail" -msgstr "Evolution e-post" +#: ../mail/em-popup.c:389 +#, c-format +msgid "untitled_image.%s" +msgstr "billede_uden_titel.%s" -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7 -msgid "Evolution Mail accounts configuration control" -msgstr "Styreelement til opsætning af Evolutions postkonti" +#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147 +msgid "Set as _Background" +msgstr "Vælg som _baggrund" -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8 -msgid "Evolution Mail component" -msgstr "Evolutions e-post-komponent" +#: ../mail/em-popup.c:497 +msgid "_Reply to sender" +msgstr "_Svar afsenderen" -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9 -msgid "Evolution Mail composer" -msgstr "Evolutions e-post-redigering" +#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79 +msgid "Reply to _List" +msgstr "Svar til _listen" -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10 -msgid "Evolution Mail composer configuration control" -msgstr "Styreelement til brevredigering i Evolution" +#. make it first item +#: ../mail/em-popup.c:547 ../mail/em-popup.c:747 +msgid "_Add to Address Book" +msgstr "_Føj til adressebogen" -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 -msgid "Evolution Mail preferences control" -msgstr "Styreelement til Evolutions e-post-indstillinger" +#: ../mail/em-popup.c:726 +#, c-format +msgid "Open in %s..." +msgstr "Åbn i %s..." -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12 -msgid "Evolution Network configuration control" -msgstr "Styreelement til opsætning af Evolutions netværk" +#: ../mail/em-subscribe-editor.c:606 +msgid "This store does not support subscriptions, or they are not enabled." +msgstr "" +"Dette opbevaringssted understøtter ikke abonnementer eller også er de ikke " +"aktiveret." -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604 -#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378 -#: ../mail/mail-component.c:597 ../mail/mail-component.c:598 -#: ../mail/mail-component.c:767 -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6 -msgid "Mail" -msgstr "E-post" +#: ../mail/em-subscribe-editor.c:639 +msgid "Subscribed" +msgstr "Tilmeldt" -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14 -#: ../mail/em-account-prefs.c:495 -msgid "Mail Accounts" -msgstr "E-post-konti" +#: ../mail/em-subscribe-editor.c:643 +msgid "Folder" +msgstr "Katalog" -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15 -#: ../mail/mail-config.glade.h:104 -msgid "Mail Preferences" -msgstr "E-post-indstillinger" +#. FIXME: This is just to get the shadow, is there a better way? +#: ../mail/em-subscribe-editor.c:859 +msgid "Please select a server." +msgstr "Vælg en server." -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16 -msgid "Network Preferences" -msgstr "Netværksindstillinger" +#: ../mail/em-subscribe-editor.c:895 +msgid "No server has been selected" +msgstr "Ingen server er valgt" -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17 -#: ../plugins/pst-import/pst-importer.c:300 -msgid "_Mail" -msgstr "_E-post" +#. Check buttons +#: ../mail/em-utils.c:122 +#: ../plugins/attachment-reminder/attachment-reminder.c:130 +msgid "_Do not show this message again." +msgstr "_Vis ikke denne meddelelse igen." -#: ../mail/em-account-editor.c:386 -#, c-format -msgid "%s License Agreement" -msgstr "Licensaftalen for %s" +#: ../mail/em-utils.c:318 +msgid "Message Filters" +msgstr "Brevfiltre" -#: ../mail/em-account-editor.c:393 -#, c-format -msgid "" -"\n" -"Please read carefully the license agreement\n" -"for %s displayed below\n" -"and tick the check box for accepting it\n" -msgstr "" -"\n" -"Læs venligst Licensaftalen for %s som vises\n" -"nedenfor\n" -"og kryds afkrydsningsfeltet af for at\n" -"acceptere den\n" - -#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258 -#: ../mail/em-vfolder-rule.c:513 -msgid "Select Folder" -msgstr "Vælg mappe" - -#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634 -#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102 -msgid "Autogenerated" -msgstr "Automatisk genereret" - -#: ../mail/em-account-editor.c:761 -msgid "Ask for each message" -msgstr "Spørg for hver enkelt brev" +#: ../mail/em-utils.c:371 +msgid "message" +msgstr "brev" -#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95 -msgid "Identity" -msgstr "Identitet" +#: ../mail/em-utils.c:655 +msgid "Save Message..." +msgstr "Gem brev..." -#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125 -msgid "Receiving Email" -msgstr "Modtagelse af e-post" +#: ../mail/em-utils.c:705 +msgid "Add address" +msgstr "Tilføj adresse" -#: ../mail/em-account-editor.c:2130 -msgid "Check for _new messages every" -msgstr "Hent _nye breve automatisk hver(t)" +#. Drop filename for messages from a mailbox +#: ../mail/em-utils.c:1226 +#, c-format +msgid "Messages from %s" +msgstr "Breve fra %s" -#: ../mail/em-account-editor.c:2138 -msgid "minu_tes" -msgstr "minut_ter" +#: ../mail/em-vfolder-editor.c:115 +msgid "Search _Folders" +msgstr "Søg i _mapper" -#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139 -msgid "Sending Email" -msgstr "Afsendelse af e-post" +#: ../mail/em-vfolder-rule.c:593 +msgid "Search Folder source" +msgstr "Søgemappe-kilde" -#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67 -msgid "Defaults" -msgstr "Standarder" +#: ../mail/evolution-mail.schemas.in.h:1 +msgid "\"Send and Receive Mail\" window height" +msgstr "Højde af \"Send og modtag e-post\"-vindue" -#. Security settings -#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132 -#: ../plugins/exchange-operations/exchange-account-setup.c:332 -msgid "Security" -msgstr "Sikkerhed" +#: ../mail/evolution-mail.schemas.in.h:2 +msgid "\"Send and Receive Mail\" window maximize state" +msgstr "Maksimeringstilstand for \"Send og modtag e-post\"-vindue" -#. Most sections for this is auto-generated fromt the camel config -#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579 -msgid "Receiving Options" -msgstr "Modtagelsesindstillinger" +#: ../mail/evolution-mail.schemas.in.h:3 +msgid "\"Send and Receive Mail\" window width" +msgstr "Bredde af \"Send og modtag e-post\"-vindue" -#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580 -msgid "Checking for New Messages" -msgstr "Ser efter nye breve" +#: ../mail/evolution-mail.schemas.in.h:4 +msgid "Allows Evolution to display text part of limited size" +msgstr "Tillader Evolution at vise tekstdel af begrænset størrelse" -#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34 -msgid "Account Editor" -msgstr "Kontoredigeringsværktøj" +#: ../mail/evolution-mail.schemas.in.h:5 +msgid "Always request read receipt" +msgstr "Anmod altid om en kvittering for at brevet er læst" -#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84 -msgid "Evolution Account Assistant" -msgstr "Evolutions konto-vejleder" +#: ../mail/evolution-mail.schemas.in.h:7 +msgid "Automatic emoticon recognition" +msgstr "Automatisk genkendelse af smileyer" -#. translators: default account indicator -#: ../mail/em-account-prefs.c:429 -msgid "[Default]" -msgstr "[Standard]" +#: ../mail/evolution-mail.schemas.in.h:8 +msgid "Automatic link recognition" +msgstr "Automatisk genkendelse af links" -#: ../mail/em-account-prefs.c:488 -msgid "Account name" -msgstr "Kontonavn" +#: ../mail/evolution-mail.schemas.in.h:9 +msgid "Check incoming mail being junk" +msgstr "Kontrollér om indgående breve er spam" -#: ../mail/em-account-prefs.c:490 -msgid "Protocol" -msgstr "Protokol" +#: ../mail/evolution-mail.schemas.in.h:10 +msgid "Citation highlight color" +msgstr "Farve til fremhævning af citater" -#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438 -#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478 -msgid "Unnamed" -msgstr "Unavngivet" +#: ../mail/evolution-mail.schemas.in.h:11 +msgid "Citation highlight color." +msgstr "Farve til fremhævning af citater." -#: ../mail/em-composer-prefs.c:970 -msgid "Language(s)" -msgstr "Sprog" +#: ../mail/evolution-mail.schemas.in.h:12 +msgid "Composer Window default height" +msgstr "Standardhøjde for skrivevindue" -#: ../mail/em-composer-prefs.c:1019 -msgid "Add signature script" -msgstr "Tilføj signaturskript" +#: ../mail/evolution-mail.schemas.in.h:13 +msgid "Composer Window default width" +msgstr "Standardbredde for skrivevindue" -#: ../mail/em-composer-prefs.c:1061 -msgid "Signature(s)" -msgstr "Signatur(er)" +#: ../mail/evolution-mail.schemas.in.h:14 +msgid "Composer load/attach directory" +msgstr "Indlæs/vedhæft-mappe for skrivevindue" -#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416 -msgid "-------- Forwarded Message --------" -msgstr "-------- Videresendt brev --------" +#: ../mail/evolution-mail.schemas.in.h:15 +msgid "Compress display of addresses in TO/CC/BCC" +msgstr "Begræns antallet af synlige adresser i TO/CC/BCC" -#: ../mail/em-composer-utils.c:1602 +#: ../mail/evolution-mail.schemas.in.h:16 msgid "" -"No destination address provided, forward of the message has been cancelled." +"Compress display of addresses in TO/CC/BCC to the number specified in " +"address_count." msgstr "" -"Ingen modtageradresse er angivet. Videresendelse af brevet er blevet " -"annulleret." +"Begræns synlige adresser i TO/CC/BCC til det antal der er angivet i " +"address_count." -#: ../mail/em-composer-utils.c:1608 -msgid "No account found to use, forward of the message has been cancelled." +#: ../mail/evolution-mail.schemas.in.h:17 +msgid "" +"Controls how frequently local changes are synchronized with the remote mail " +"server. The interval must be at least 30 seconds." msgstr "" -"Der blev ikke fundet nogen konto, som kunne bruges. Videresendelse af brevet " -"er blevet annulleret." +"Kontrollerer hvor ofte lokale ændringer synkroniseres med den fjerne e-" +"postserver. Intervallet skal være mindst 30 sekunder." -#: ../mail/em-composer-utils.c:2058 -msgid "an unknown sender" -msgstr "en ukendt afsender" +#: ../mail/evolution-mail.schemas.in.h:18 +msgid "Custom headers to use while checking for junk." +msgstr "Tilpassede brevhoveder der skal bruges mens der kontrolleres for spam." -#. Note to translators: this is the attribution string used when quoting messages. -#. * each ${Variable} gets replaced with a value. To see a full list of available -#. * variables, see em-composer-utils.c:1514 -#: ../mail/em-composer-utils.c:2105 +#: ../mail/evolution-mail.schemas.in.h:19 msgid "" -"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " -"${TimeZone}, ${Sender} wrote:" +"Custom headers to use while checking for junk. The list elements are string " +"in the format \"headername=value\"." msgstr "" -"${AbbrevWeekdayName}, ${Day} ${Month} ${Year} kl. ${24Hour}:${Minute} " -"${TimeZone}, skrev ${Sender}:" +"Tilpassede brevhoveder der skal bruges, mens der kontrolleres for spam. " +"Listelementerne er strenge på formen \"brevhovednavn=værdi\"." -#: ../mail/em-composer-utils.c:2248 -msgid "-----Original Message-----" -msgstr "-----Oprindelige besked-----" +#: ../mail/evolution-mail.schemas.in.h:20 +msgid "Default charset in which to compose messages" +msgstr "Standardtegnkodning ved skrivning af breve" -#: ../mail/em-filter-editor.c:156 -msgid "_Filter Rules" -msgstr "_Filterregler" +#: ../mail/evolution-mail.schemas.in.h:21 +msgid "Default charset in which to compose messages." +msgstr "Standardtegnkodning ved skrivning af breve." -#. Automatically generated. Do not edit. -#: ../mail/em-filter-i18n.h:2 -msgid "Adjust Score" -msgstr "Justér point" +#: ../mail/evolution-mail.schemas.in.h:22 +msgid "Default charset in which to display messages" +msgstr "Standardtegnkodning ved visning af breve" -#: ../mail/em-filter-i18n.h:3 -msgid "Assign Color" -msgstr "Tilknyt farve" +#: ../mail/evolution-mail.schemas.in.h:23 +msgid "Default charset in which to display messages." +msgstr "Standardtegnkodning ved visning af breve." -#: ../mail/em-filter-i18n.h:4 -msgid "Assign Score" -msgstr "Giv point" +#: ../mail/evolution-mail.schemas.in.h:24 +msgid "Default forward style" +msgstr "Standardstil for videresending" -#: ../mail/em-filter-i18n.h:6 -msgid "BCC" -msgstr "BCC" +#: ../mail/evolution-mail.schemas.in.h:25 +msgid "Default height of the Composer Window." +msgstr "Standardhøjde af skrivevinduet." -#: ../mail/em-filter-i18n.h:7 -msgid "Beep" -msgstr "Bippelyd" +#: ../mail/evolution-mail.schemas.in.h:26 +msgid "Default height of the message window." +msgstr "Standardhøjde af brevvinduet." -#: ../mail/em-filter-i18n.h:8 -msgid "CC" -msgstr "CC" +#: ../mail/evolution-mail.schemas.in.h:27 +msgid "Default height of the subscribe dialog." +msgstr "Standardhøjde af abonnementsvinduet." -#: ../mail/em-filter-i18n.h:9 -msgid "Completed On" -msgstr "Fuldført den" +#: ../mail/evolution-mail.schemas.in.h:28 +msgid "Default reply style" +msgstr "Standardstil for svar" -#: ../mail/em-filter-i18n.h:11 -msgid "Copy to Folder" -msgstr "Kopier til mappe" +#: ../mail/evolution-mail.schemas.in.h:29 +msgid "Default value for thread expand state" +msgstr "Standardværdi for udfoldningen af en tråd" -#: ../mail/em-filter-i18n.h:12 -msgid "Date received" -msgstr "Dato modtaget" +#: ../mail/evolution-mail.schemas.in.h:30 +msgid "Default width of the Composer Window." +msgstr "Standardbredde af skrivevinduet." -#: ../mail/em-filter-i18n.h:13 -msgid "Date sent" -msgstr "Dato sendt" +#: ../mail/evolution-mail.schemas.in.h:31 +msgid "Default width of the message window." +msgstr "Standardbredde af brevvinduet." -#: ../mail/em-filter-i18n.h:14 -#: ../plugins/groupwise-features/share-folder.c:768 -#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5 -#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6 -#: ../ui/evolution-tasks.xml.h:6 -msgid "Delete" -msgstr "Slet" +#: ../mail/evolution-mail.schemas.in.h:32 +msgid "Default width of the subscribe dialog." +msgstr "Standardbredde af abonnementsvinduet." -#: ../mail/em-filter-i18n.h:15 -msgid "Deleted" -msgstr "Slettet" +#: ../mail/evolution-mail.schemas.in.h:33 +msgid "" +"Determines whether to look up addresses for junk filtering in local address " +"book only" +msgstr "" +"Afgør hvorvidt der kun skal søges efter adresser i den lokale adressebog i " +"forbindelse med spamfiltrering" -#: ../mail/em-filter-i18n.h:17 -msgid "does not end with" -msgstr "slutter ikke med" +#: ../mail/evolution-mail.schemas.in.h:34 +msgid "Determines whether to lookup in address book for sender email" +msgstr "Afgør hvorvidt der skal søges efter afsenderadresse i adressebog" -#: ../mail/em-filter-i18n.h:18 -msgid "does not exist" -msgstr "eksisterer ikke" - -#: ../mail/em-filter-i18n.h:19 -msgid "does not return" -msgstr "returnerer ikke" +#: ../mail/evolution-mail.schemas.in.h:35 +msgid "" +"Determines whether to lookup the sender email in address book. If found, it " +"shouldn't be a spam. It looks up in the books marked for autocompletion. It " +"can be slow, if remote address books (like LDAP) are marked for " +"autocompletion." +msgstr "" +"Afgør hvorvidt der skal søges efter afsenderadresse i adressebogen. Hvis den " +"bliver fundet skulle det ikke være spam. Der søges i bøger markeret til " +"autofuldførelse. Dette kan være langsomt, hvis fjerne adressebøger (som f." +"eks. ldap) er markeret til autofuldførelse." -#: ../mail/em-filter-i18n.h:20 -msgid "does not sound like" -msgstr "ligner ikke" +#: ../mail/evolution-mail.schemas.in.h:36 +msgid "Determines whether to use custom headers to check for junk" +msgstr "" +"Afgør om der skal anvendes brugertilpassede brevhoveder til at kontrollere " +"for spam" -#: ../mail/em-filter-i18n.h:21 -msgid "does not start with" -msgstr "starter ikke med" +#: ../mail/evolution-mail.schemas.in.h:37 +msgid "" +"Determines whether to use custom headers to check for junk. If this option " +"is enabled and the headers are mentioned, it will be improve the junk " +"checking speed." +msgstr "" +"Afgør om der skal anvendes brugertilpassede brevhoveder til at kontrollere " +"for spam. Hvis denne valgmulighed er slået til og brevhovederne er nævnt vil " +"det forbedre spam-søgningshastigheden." -#: ../mail/em-filter-i18n.h:23 -msgid "Draft" -msgstr "Skitse" +#: ../mail/evolution-mail.schemas.in.h:38 +msgid "" +"Determines whether to use the same fonts for both \"From\" and \"Subject\" " +"lines in the \"Messages\" column in vertical view." +msgstr "" +"Afgør hvorvidt der skal bruges den samme skrifttype til både \"Fra\" og " +"\"Emne\"-linjerne i \"Brev\"-kolonnen i lodret visning." -#: ../mail/em-filter-i18n.h:24 -msgid "ends with" -msgstr "slutter med" +#: ../mail/evolution-mail.schemas.in.h:39 +msgid "Directory for loading/attaching files to composer." +msgstr "Mappe til at indlæse/vedhæfte filer i skrivevindue." -#: ../mail/em-filter-i18n.h:26 -msgid "exists" -msgstr "eksisterer" +#: ../mail/evolution-mail.schemas.in.h:40 +msgid "Directory for saving mail component files." +msgstr "Mappe hvor post-komponentfilerne skal gemmes." -#: ../mail/em-filter-i18n.h:27 -msgid "Expression" -msgstr "Udtryk" +#: ../mail/evolution-mail.schemas.in.h:41 +msgid "Disable or enable ellipsizing of folder names in side bar" +msgstr "Slå forkortelse af mappenavne i sidepanelet til eller fra" -#: ../mail/em-filter-i18n.h:28 -msgid "Follow Up" -msgstr "Følg op" +#: ../mail/evolution-mail.schemas.in.h:42 +msgid "Draw spelling error indicators on words as you type." +msgstr "Vis indikatorer for stavefejl mens du skriver." -#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056 -msgid "Important" -msgstr "Vigtig" +#: ../mail/evolution-mail.schemas.in.h:43 +msgid "Empty Junk folders on exit" +msgstr "Tøm spammapper ved afslutning" -#: ../mail/em-filter-i18n.h:31 -msgid "is after" -msgstr "er efter" +#: ../mail/evolution-mail.schemas.in.h:44 +msgid "Empty Trash folders on exit" +msgstr "Tøm affaldsmapper ved afslutning" -#: ../mail/em-filter-i18n.h:32 -msgid "is before" -msgstr "er inden" +#: ../mail/evolution-mail.schemas.in.h:45 +msgid "Empty all Junk folders when exiting Evolution." +msgstr "Tøm alle spammapper når Evolution afslutter." -#: ../mail/em-filter-i18n.h:33 -msgid "is Flagged" -msgstr "har markering" +#: ../mail/evolution-mail.schemas.in.h:46 +msgid "Empty all Trash folders when exiting Evolution." +msgstr "Tøm alle affaldsmapper når Evolution afslutter." -#: ../mail/em-filter-i18n.h:37 -msgid "is not Flagged" -msgstr "har ingen markering" +#: ../mail/evolution-mail.schemas.in.h:47 +msgid "Enable caret mode, so that you can see a cursor when reading mail." +msgstr "" +"Aktivér markøtilstand således at du kan se en markør når du læser post." -#: ../mail/em-filter-i18n.h:38 -msgid "is not set" -msgstr "er ikke indstillet" +#: ../mail/evolution-mail.schemas.in.h:48 +msgid "Enable or disable magic space bar" +msgstr "Slå magisk mellemrumstast til eller fra" -#: ../mail/em-filter-i18n.h:39 -msgid "is set" -msgstr "er indstillet" +#: ../mail/evolution-mail.schemas.in.h:49 +#, fuzzy +msgid "Enable or disable the prompt whilst marking multiple messages." +msgstr "Deaktiverer/aktiverer spørgsmål mens der markeres flere breve." -#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98 -#: ../ui/evolution-mail-message.xml.h:48 -msgid "Junk" -msgstr "Spam" +#: ../mail/evolution-mail.schemas.in.h:50 +msgid "Enable or disable type ahead search feature" +msgstr "Aktivér eller deaktivér tast-og-find søgefunktionen" -#: ../mail/em-filter-i18n.h:41 -msgid "Junk Test" -msgstr "Spamtest" +#: ../mail/evolution-mail.schemas.in.h:51 +msgid "Enable search folders" +msgstr "Slå søgemapper til" -#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190 -msgid "Label" -msgstr "Mærkning" +#: ../mail/evolution-mail.schemas.in.h:52 +msgid "Enable search folders on startup." +msgstr "Slå søgemapper til ved opstart." -#: ../mail/em-filter-i18n.h:43 -msgid "Mailing list" -msgstr "Postliste" +#: ../mail/evolution-mail.schemas.in.h:53 +msgid "" +"Enable the side bar search feature to allow interactive searching of folder " +"names." +msgstr "" -#: ../mail/em-filter-i18n.h:44 -msgid "Match All" -msgstr "Match alt" +#: ../mail/evolution-mail.schemas.in.h:54 +msgid "" +"Enable this to use Space bar key to scroll in message preview, message list " +"and folders." +msgstr "" +"Slå denne til for at bruge mellemrumstasten til at rulle ned gennem brev-" +"forhåndsvisning, brevindeks og mapper." -#: ../mail/em-filter-i18n.h:45 -msgid "Message Body" -msgstr "Brevindhold" +#: ../mail/evolution-mail.schemas.in.h:55 +msgid "Enable to render message text part of limited size." +msgstr "Aktivér for at tegne beskedtekstdel af begrænset størrelse." -#: ../mail/em-filter-i18n.h:46 -msgid "Message Header" -msgstr "Brevhoved" +#: ../mail/evolution-mail.schemas.in.h:56 +msgid "Enable/disable caret mode" +msgstr "Aktivér / deaktivér markørtilstand" -#: ../mail/em-filter-i18n.h:47 -msgid "Message is Junk" -msgstr "Brevet er spam" +#: ../mail/evolution-mail.schemas.in.h:57 ../mail/mail-config.glade.h:86 +msgid "Encode file names in an Outlook/GMail way" +msgstr "Indkod filnavne på en Outlook/GMail-måde" -#: ../mail/em-filter-i18n.h:48 -msgid "Message is not Junk" -msgstr "Brevet er ikke-spam" +# Oh my +#: ../mail/evolution-mail.schemas.in.h:58 +#, fuzzy +msgid "" +"Encode file names in the mail headers same as Outlook or GMail do, to let " +"them display correctly file names with UTF-8 letters sent by Evolution, " +"because they do not follow the RFC 2231, but use the incorrect RFC 2047 " +"standard." +msgstr "" +"Indkod filnavne i brevhoveder på samme måde som Outlook eller GMail gør for " +"at gøre det muligt for dem at forstå lokaliserede filnavne, som bliver sendt " +"af Evolution, fordi de ikke følger RFC 2231, men bruger den ukorrekte RFC " +"2047-standard." -#: ../mail/em-filter-i18n.h:49 -msgid "Move to Folder" -msgstr "Flyt til mappe" +#: ../mail/evolution-mail.schemas.in.h:59 +msgid "Height of the message-list pane" +msgstr "Højden på vinduet med brevindekset" -#: ../mail/em-filter-i18n.h:50 -msgid "Pipe to Program" -msgstr "Videreled til programmet" +#: ../mail/evolution-mail.schemas.in.h:60 +msgid "Height of the message-list pane." +msgstr "Højden på vinduet med brevindekset." -#: ../mail/em-filter-i18n.h:51 -msgid "Play Sound" -msgstr "Afspil lyd" +# Hmm, ophæver markeringen eller fjerner det der er markeret. Nå denne her oversættelse er lige så tvetydig som originalen +#: ../mail/evolution-mail.schemas.in.h:61 +msgid "Hides the per-folder preview and removes the selection" +msgstr "Skjuler per-mappe-forhåndsvisning og fjerner markeringen" -#. Translators: "Read" as in "has been read" (message-tag-followup.c) -#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62 -msgid "Read" -msgstr "Læst" +#: ../mail/evolution-mail.schemas.in.h:62 +msgid "" +"If a user tries to open 10 or more messages at one time, ask the user if " +"they really want to do it." +msgstr "" +"Hvis en bruger forsøger at åbne 10 eller flere breve på en gang, så spørg om " +"brugeren virkelig ønsker det." -#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12 -msgid "Recipients" -msgstr "Modtagere" +#: ../mail/evolution-mail.schemas.in.h:63 +msgid "" +"If the \"Preview\" pane is on, then show it side-by-side rather than " +"vertically." +msgstr "" +"Hvis forhåndsvisningsruden er synlig, så vis den ved siden af, i stedet for " +"ovenfor." -#: ../mail/em-filter-i18n.h:54 -msgid "Regex Match" -msgstr "Træffer på regulært udtryk" +#: ../mail/evolution-mail.schemas.in.h:64 +msgid "" +"If there isn't a builtin viewer for a particular MIME type inside Evolution, " +"any MIME types appearing in this list which map to a Bonobo component viewer " +"in GNOME's MIME type database may be used for displaying content." +msgstr "" +"Hvis der ikke er indbygget visning for en bestemt MIME-type inden i " +"Evolution, vil en hvilken som helst MIME-type i denne liste, som er " +"afbilledet i en bonobo komponentvisning i GNOME's MIME-typedatabase, blive " +"brugt til at vise indholdet." -#: ../mail/em-filter-i18n.h:55 -msgid "Replied to" -msgstr "Svaret til" +#: ../mail/evolution-mail.schemas.in.h:65 +msgid "" +"Initial height of the \"Send and Receive Mail\" window. The value updates as " +"the user resizes the window vertically." +msgstr "" +"Højden af \"Send og modtag e-post\"-vinduet ved start. Værdien opdateres når " +"brugeren ændrer vinduet vertikalt." -#: ../mail/em-filter-i18n.h:56 -msgid "returns" -msgstr "returnerer" +#: ../mail/evolution-mail.schemas.in.h:66 +msgid "" +"Initial maximize state of the \"Send and Receive Mail\" window. The value " +"updates when the user maximizes or unmaximizes the window. Note, this " +"particular value is not used by Evolution since the \"Send and Receive Mail" +"\" window cannot be maximized. This key exists only as an implementation " +"detail." +msgstr "" +"Maksimeringstilstanden af \"Send og modtag e-post\"-vinduet ved start. " +"Værdien opdateres når brugeren maksimerer eller af-maksimerer vinduet. " +"Bemærk at denne værdi ikke bruges af Evolution, eftersom \"Send og modtag e-" +"post\"-vinduet ikke kan maksimeres. Nøglen eksisterer udelukkende som en " +"implementeringsdetalje." -#: ../mail/em-filter-i18n.h:57 -msgid "returns greater than" -msgstr "returnerer større end" +#: ../mail/evolution-mail.schemas.in.h:67 +msgid "" +"Initial width of the \"Send and Receive Mail\" window. The value updates as " +"the user resizes the window horizontally." +msgstr "" +"Bredde af \"Send og modtag e-post\"-vinduet ved start. Værdien opdateres når " +"brugeren ændrer vinduet horisontalt." -#: ../mail/em-filter-i18n.h:58 -msgid "returns less than" -msgstr "returnerer mindre end" +#: ../mail/evolution-mail.schemas.in.h:68 +msgid "" +"It disables/enables the repeated prompts to ask if offline sync is required " +"before going into offline mode." +msgstr "" +"Deaktiverer/aktiverer de gentagne forespørgsler om hvorvidt der skal " +"synkroniseres ved overgang til afkoblet tilstand." -#: ../mail/em-filter-i18n.h:59 -msgid "Run Program" -msgstr "Kør program" +#: ../mail/evolution-mail.schemas.in.h:69 +msgid "" +"It disables/enables the repeated prompts to warn that deleting messages from " +"a search folder permanently deletes the message, not simply removing it from " +"the search results." +msgstr "" +"Deaktiverer/aktiverer de gentagne advarsler om at hvis et brev slettes i en " +"søgefolder, slettes brevet rigtig og ikke kun i søgeresultatet." -#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13 -msgid "Score" -msgstr "Point" +#: ../mail/evolution-mail.schemas.in.h:70 +msgid "Last time empty junk was run" +msgstr "Sidst gang tøm spam blev udført" -#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14 -msgid "Sender" -msgstr "Afsender" +#: ../mail/evolution-mail.schemas.in.h:71 +msgid "Last time empty trash was run" +msgstr "Sidst gang tøm affald blev udført" -#: ../mail/em-filter-i18n.h:62 -msgid "Sender or Recipients" -msgstr "Afsender eller modtagere" +#: ../mail/evolution-mail.schemas.in.h:73 +msgid "List of Labels and their associated colors" +msgstr "Liste over mærkninger og deres associerede farver" -#: ../mail/em-filter-i18n.h:63 -msgid "Set Label" -msgstr "Brug mærkat" +#: ../mail/evolution-mail.schemas.in.h:74 +msgid "List of MIME types to check for Bonobo component viewers" +msgstr "" +"Liste over MIME-typer, som skal kontrolleres for bonobo komponentfremvisere" -#: ../mail/em-filter-i18n.h:64 -msgid "Set Status" -msgstr "Sæt status" +#: ../mail/evolution-mail.schemas.in.h:75 +msgid "List of accepted licenses" +msgstr "Liste over accepterede licenser" -#: ../mail/em-filter-i18n.h:65 -msgid "Size (kB)" -msgstr "Størrelse (kB)" +#: ../mail/evolution-mail.schemas.in.h:76 +msgid "List of accounts" +msgstr "Liste over konti" -#: ../mail/em-filter-i18n.h:66 -msgid "sounds like" -msgstr "lyder som" +#: ../mail/evolution-mail.schemas.in.h:77 +msgid "" +"List of accounts known to the mail component of Evolution. The list contains " +"strings naming subdirectories relative to /apps/evolution/mail/accounts." +msgstr "" +"Liste over konti som Evolutions e-post-komponent kender. Listen indeholder " +"navnene på undermapperne i /apps/evolution/mail/accounts." -#: ../mail/em-filter-i18n.h:67 -msgid "Source Account" -msgstr "Kildekonto" +#: ../mail/evolution-mail.schemas.in.h:78 +msgid "List of custom headers and whether they are enabled." +msgstr "Liste over tilpassede hoveder og om de er aktiveret." -#: ../mail/em-filter-i18n.h:68 -msgid "Specific header" -msgstr "Nærmere angivet linje i brevhoved" +#: ../mail/evolution-mail.schemas.in.h:79 +msgid "List of dictionary language codes used for spell checking." +msgstr "Liste af ordbogs-sprogkoder som bruges ved stavekontrol." -#: ../mail/em-filter-i18n.h:69 -msgid "starts with" -msgstr "starter med" +#: ../mail/evolution-mail.schemas.in.h:80 +msgid "" +"List of labels known to the mail component of Evolution. The list contains " +"strings containing name:color where color uses the HTML hex encoding." +msgstr "" +"Liste over mærkninger som Evolutions e-post-komponent kender. Listen " +"indeholder strenge indeholdende navn:farve, hvor farve benytter sig af HTML-" +"hex-kodning." -#: ../mail/em-filter-i18n.h:71 -msgid "Stop Processing" -msgstr "Stop behandling" +#: ../mail/evolution-mail.schemas.in.h:81 +msgid "List of protocol names whose license has been accepted." +msgstr "Liste over protokolnavne hvis licens er blevet accepteret." -#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342 -#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80 -#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311 -#: ../plugins/groupwise-features/properties.glade.h:7 -#: ../smime/lib/e-cert.c:1115 -msgid "Subject" -msgstr "Emne" +#: ../mail/evolution-mail.schemas.in.h:82 +msgid "Load images for HTML messages over HTTP" +msgstr "Indlæs billeder for HTML-breve via HTTP" -#: ../mail/em-filter-i18n.h:73 -msgid "Unset Status" -msgstr "Nulstil status" +#: ../mail/evolution-mail.schemas.in.h:83 +msgid "" +"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - " +"Never load images off the net. \"1\" - Load images in messages from " +"contacts. \"2\" - Always load images off the net." +msgstr "" +"Indlæs billeder i HTML-breve via HTTP(S). Mulige værdier er: \"0\" - Indlæs " +"aldrig billeder fra nettet. \"1\" - Indlæs billeder hvis afsenderen findes i " +"adressebogen. \"2\" - Indlæs altid billeder fra nettet." -#. and now for the action area -#: ../mail/em-filter-rule.c:522 -msgid "Then" -msgstr "Så" +#: ../mail/evolution-mail.schemas.in.h:84 +msgid "Log filter actions" +msgstr "Log filterhandlinger" -#: ../mail/em-filter-rule.c:550 -msgid "Add Ac_tion" -msgstr "Tilføj hand_ling" +#: ../mail/evolution-mail.schemas.in.h:85 +msgid "Log filter actions to the specified log file." +msgstr "Log filterhandlinger til den angivne logfil." -#: ../mail/em-folder-browser.c:193 -msgid "C_reate Search Folder From Search..." -msgstr "Opret _søgemappe fra søgning..." +#: ../mail/evolution-mail.schemas.in.h:86 +msgid "Logfile to log filter actions" +msgstr "Logfilen for filterhandlinger" -#: ../mail/em-folder-browser.c:218 -msgid "All Messages" -msgstr "Alle breve" +#: ../mail/evolution-mail.schemas.in.h:87 +msgid "Logfile to log filter actions." +msgstr "Logfilen for filterhandlinger." -#: ../mail/em-folder-browser.c:219 -msgid "Unread Messages" -msgstr "Ulæste breve" +#: ../mail/evolution-mail.schemas.in.h:88 +msgid "Mark as Seen after specified timeout" +msgstr "Markér som set efter angivet tidsgrænse" -#: ../mail/em-folder-browser.c:221 -msgid "No Label" -msgstr "Ingen mærkning" +#: ../mail/evolution-mail.schemas.in.h:89 +msgid "Mark as Seen after specified timeout." +msgstr "Markér som set efter angivet tidsgrænse." -#: ../mail/em-folder-browser.c:228 -msgid "Read Messages" -msgstr "Læste breve" +#: ../mail/evolution-mail.schemas.in.h:90 +msgid "Mark citations in the message \"Preview\"" +msgstr "Markér citater i forhåndsvisningen af breve" -#: ../mail/em-folder-browser.c:229 -msgid "Recent Messages" -msgstr "Nyere breve" +#: ../mail/evolution-mail.schemas.in.h:91 +msgid "Mark citations in the message \"Preview\"." +msgstr "Markér citater i forhåndsvisningen af breve." -#: ../mail/em-folder-browser.c:230 -msgid "Last 5 Days' Messages" -msgstr "Breve fra de sidste 5 dage" +#: ../mail/evolution-mail.schemas.in.h:92 +msgid "Message Window default height" +msgstr "Standardhøjden på brevvinduet" -#: ../mail/em-folder-browser.c:231 -msgid "Messages with Attachments" -msgstr "Breve med bilag" +#: ../mail/evolution-mail.schemas.in.h:93 +msgid "Message Window default width" +msgstr "Standardbredden på brevvinduet" -#: ../mail/em-folder-browser.c:232 -msgid "Important Messages" -msgstr "Vigtige breve" +#: ../mail/evolution-mail.schemas.in.h:94 +msgid "Message-display style (\"normal\", \"full headers\", \"source\")" +msgstr "Stil for brevvisning (\"normal\", \"full headers\", \"source\")" -#: ../mail/em-folder-browser.c:233 -msgid "Messages Not Junk" -msgstr "Breve som ikke er spam" +#: ../mail/evolution-mail.schemas.in.h:95 +msgid "Minimum days between emptying the junk on exit" +msgstr "Minimum antal dage mellem tømning af spammapper ved afslutning" -#: ../mail/em-folder-browser.c:1188 -msgid "Account Search" -msgstr "Kontosøgning" +#: ../mail/evolution-mail.schemas.in.h:96 +msgid "Minimum days between emptying the trash on exit" +msgstr "Minimum antal dage mellem tømning af affald ved afslutning" -#: ../mail/em-folder-browser.c:1241 -msgid "All Account Search" -msgstr "Søgning i alle konti" +#: ../mail/evolution-mail.schemas.in.h:97 +msgid "Minimum time between emptying the junk on exit, in days." +msgstr "Minimum tid mellem tømning af spammapper ved afslutning i dage." -#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 -#: ../mail/em-folder-properties.c:174 -msgid "Unread messages:" -msgid_plural "Unread messages:" -msgstr[0] "Ulæste breve:" -msgstr[1] "Ulæste breve:" +#: ../mail/evolution-mail.schemas.in.h:98 +msgid "Minimum time between emptying the trash on exit, in days." +msgstr "Minimum tid mellem tømning af affald ved afslutning i dage." -#. TODO: can this be done in a loop? -#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 -#: ../mail/em-folder-properties.c:178 -msgid "Total messages:" -msgid_plural "Total messages:" -msgstr[0] "Totalt breve:" -msgstr[1] "Totalt breve:" +#: ../mail/evolution-mail.schemas.in.h:99 +msgid "Number of addresses to display in TO/CC/BCC" +msgstr "Antal adresser der skal vises i TO/CC/BCC" -#: ../mail/em-folder-properties.c:196 -#, c-format -msgid "Quota usage (%s):" -msgstr "Kvote-brug (%s):" +#: ../mail/evolution-mail.schemas.in.h:100 +msgid "Prompt on empty subject" +msgstr "Spørg ved tomt emne" -#: ../mail/em-folder-properties.c:198 -#, c-format -msgid "Quota usage" -msgstr "Kvote-brug" +#: ../mail/evolution-mail.schemas.in.h:101 +msgid "Prompt the user when he or she tries to expunge a folder." +msgstr "Spørg brugeren når han eller hun prøver at tømme en folder." -#. translators: standard local mailbox names -#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509 -#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164 -#: ../mail/mail-component.c:585 -#: ../plugins/exchange-operations/exchange-delegates-user.c:78 -#: ../plugins/exchange-operations/exchange-folder.c:594 -msgid "Inbox" -msgstr "Indbakke" +#: ../mail/evolution-mail.schemas.in.h:102 +msgid "" +"Prompt the user when he or she tries to send a message without a Subject." +msgstr "Spørg brugeren når han eller hun forsøger at sende breve uden emne." -#: ../mail/em-folder-properties.c:390 -#: ../plugins/groupwise-features/properties.glade.h:4 -msgid "Folder Properties" -msgstr "Mappeegenskaber" +#: ../mail/evolution-mail.schemas.in.h:103 +msgid "Prompt to check if the user wants to go offline immediately" +msgstr "Spørg for at kontrollere om brugeren vil koble af med det samme" -#: ../mail/em-folder-selection-button.c:120 -msgid "" -msgstr "" +#: ../mail/evolution-mail.schemas.in.h:104 +msgid "Prompt when deleting messages in search folder" +msgstr "Spørg når breve slettes i søgemappe" -#: ../mail/em-folder-selector.c:254 -msgid "C_reate" -msgstr "Op_ret" +#: ../mail/evolution-mail.schemas.in.h:105 +msgid "Prompt when user expunges" +msgstr "Spørg når brugeren tømmer" -#: ../mail/em-folder-selector.c:258 -msgid "Folder _name:" -msgstr "Mappe_navn:" +#: ../mail/evolution-mail.schemas.in.h:106 +msgid "Prompt when user only fills Bcc" +msgstr "Spørg når brugeren kun udfylder Bcc-feltet" -#. load store to mail component -#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206 -#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047 -msgid "Search Folders" -msgstr "Søgemapper" - -#. UNMATCHED is always last -#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212 -msgid "UNMATCHED" -msgstr "MATCHEDE_IKKE" +#: ../mail/evolution-mail.schemas.in.h:107 +msgid "Prompt when user tries to open 10 or more messages at once" +msgstr "Spørg når brugeren forsøger at åbne 10 eller flere breve på en gang" -#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165 -msgid "Drafts" -msgstr "Kladder" +#: ../mail/evolution-mail.schemas.in.h:108 +msgid "" +"Prompt when user tries to send HTML mail to recipients that may not want to " +"receive HTML mail." +msgstr "" +"Spørg når breve i HTML-format sendes til modtagere der måske ikke vil have " +"dem." -#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168 -#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2 -msgid "Templates" -msgstr "Skabeloner" +#: ../mail/evolution-mail.schemas.in.h:109 +msgid "Prompt when user tries to send a message with no To or Cc recipients." +msgstr "Spørg når der sendes breve uden modtagere i Til- eller Cc-felterne." -#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166 -msgid "Outbox" -msgstr "Udbakke" +#: ../mail/evolution-mail.schemas.in.h:110 +msgid "Prompt when user tries to send unwanted HTML" +msgstr "Spørg når brugeren prøver at sende uønsket HTML" -#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167 -msgid "Sent" -msgstr "Afsendte" +#: ../mail/evolution-mail.schemas.in.h:111 +msgid "Prompt while marking multiple messages" +msgstr "Spørg når flere breve markeres" -#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843 -msgid "Loading..." -msgstr "Indlæser..." +#: ../mail/evolution-mail.schemas.in.h:112 +msgid "Recognize emoticons in text and replace them with images." +msgstr "Genkend smileyer i tekst og erstat dem med billeder." -#: ../mail/em-folder-tree.c:741 -msgid "Mail Folder Tree" -msgstr "Træ over brevmapper" +#: ../mail/evolution-mail.schemas.in.h:113 +msgid "Recognize links in text and replace them." +msgstr "Genkend links i tekst og erstat dem." -#: ../mail/em-folder-tree.c:900 -#, c-format -msgid "Moving folder %s" -msgstr "Flytter mappen %s" +#: ../mail/evolution-mail.schemas.in.h:114 +msgid "Run junk test on incoming mail." +msgstr "Udfør spamtest på indgående e-post." -#: ../mail/em-folder-tree.c:902 -#, c-format -msgid "Copying folder %s" -msgstr "Kopierer mappen %s" +#: ../mail/evolution-mail.schemas.in.h:115 +msgid "Save directory" +msgstr "Gem mappe" -#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014 -#, c-format -msgid "Moving messages into folder %s" -msgstr "Flytter breve til mappen %s" +#: ../mail/evolution-mail.schemas.in.h:116 +msgid "Search for the sender photo in local address books" +msgstr "Søg efter afsenderfotoet i den lokale adressebog" -#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016 -#, c-format -msgid "Copying messages into folder %s" -msgstr "Kopierer breve til mappen %s" +#: ../mail/evolution-mail.schemas.in.h:117 +msgid "Send HTML mail by default" +msgstr "Send breve i HTML-format som standard" -# Kommentaren i kildekoden lyder: -# /* for types other than folder, we can't drop to the root path */ -#: ../mail/em-folder-tree.c:926 -msgid "Cannot drop message(s) into toplevel store" -msgstr "Kan ikke droppe brev(e) til rodniveau" +#: ../mail/evolution-mail.schemas.in.h:118 +msgid "Send HTML mail by default." +msgstr "Send breve i HTML-format som standard." -#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104 -msgid "_Copy to Folder" -msgstr "Kop_iér til mappe" +#: ../mail/evolution-mail.schemas.in.h:119 +msgid "Sender email-address column in the message list" +msgstr "Kolonnen for afsender-e-postadresser i brevindeks" -#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117 -msgid "_Move to Folder" -msgstr "Fl_yt til mappe" +#: ../mail/evolution-mail.schemas.in.h:120 +msgid "Server synchronization interval" +msgstr "Synkroniseringsinterval for server" -#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059 -#, c-format -msgid "Scanning folders in \"%s\"" -msgstr "Skanner mapper i \"%s\"" +#: ../mail/evolution-mail.schemas.in.h:121 +msgid "Show \"Bcc\" field when sending a mail message" +msgstr "" -#: ../mail/em-folder-tree.c:2117 -msgid "Open in _New Window" -msgstr "Åbn i _nyt vindue" +#: ../mail/evolution-mail.schemas.in.h:122 +msgid "Show \"Cc\" field when sending a mail message" +msgstr "" -#. FIXME: need to disable for nochildren folders -#: ../mail/em-folder-tree.c:2122 -msgid "_New Folder..." -msgstr "_Ny mappe..." +#: ../mail/evolution-mail.schemas.in.h:123 +msgid "Show \"From\" field when posting to a newsgroup" +msgstr "" -#: ../mail/em-folder-tree.c:2125 -msgid "_Move..." -msgstr "_Flyt..." +#: ../mail/evolution-mail.schemas.in.h:124 +msgid "Show \"From\" field when sending a mail message" +msgstr "" -#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21 -msgid "Re_fresh" -msgstr "Op_datér" +#: ../mail/evolution-mail.schemas.in.h:125 +msgid "Show \"Reply To\" field when posting to a newsgroup" +msgstr "" -#: ../mail/em-folder-tree.c:2134 -msgid "Fl_ush Outbox" -msgstr "T_øm udbakke" +#: ../mail/evolution-mail.schemas.in.h:126 +#, fuzzy +msgid "Show \"Reply To\" field when sending a mail message" +msgstr "Kryptér også til mig _selv når krypteret e-post sendes" -#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138 -msgid "_Empty Trash" -msgstr "_Tøm papirkurv" +#: ../mail/evolution-mail.schemas.in.h:127 +msgid "Show Animations" +msgstr "Vis animationer" -#: ../mail/em-folder-tree.c:2243 -msgid "_Unread Search Folder" -msgstr "_Ulæst søgemappe" +#: ../mail/evolution-mail.schemas.in.h:128 +msgid "Show animated images as animations." +msgstr "Vis animerede billeder som animationer." -#: ../mail/em-folder-utils.c:101 -#, c-format -msgid "Copying `%s' to `%s'" -msgstr "Kopierer \"%s\" til \"%s\"" +#: ../mail/evolution-mail.schemas.in.h:129 +msgid "Show deleted messages (with a strike-through) in the message-list." +msgstr "Vis slettede breve med gennemstregning i brevlisten." -#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188 -#: ../mail/em-folder-view.c:1203 -#: ../mail/importers/evolution-mbox-importer.c:82 -#: ../plugins/pst-import/pst-importer.c:305 -msgid "Select folder" -msgstr "Vælg mappe" +#: ../mail/evolution-mail.schemas.in.h:130 +msgid "Show deleted messages in the message-list" +msgstr "Vis slettede breve i brevlisten" -#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203 -msgid "C_opy" -msgstr "_Kopiér" +#: ../mail/evolution-mail.schemas.in.h:131 +msgid "Show photo of the sender" +msgstr "Vis foto af afsenderen" -#: ../mail/em-folder-utils.c:532 -#: ../plugins/groupwise-features/share-folder-common.c:145 -#, c-format -msgid "Creating folder `%s'" -msgstr "Opretter mappen \"%s\"" +#: ../mail/evolution-mail.schemas.in.h:132 +msgid "" +"Show the \"Bcc\" field when sending a mail message. This is controlled from " +"the View menu when a mail account is chosen." +msgstr "" -#: ../mail/em-folder-utils.c:690 -#: ../plugins/groupwise-features/install-shared.c:169 -#: ../plugins/groupwise-features/share-folder-common.c:387 -msgid "Create folder" -msgstr "Opret mappe" +#: ../mail/evolution-mail.schemas.in.h:133 +msgid "" +"Show the \"Cc\" field when sending a mail message. This is controlled from " +"the View menu when a mail account is chosen." +msgstr "" -#: ../mail/em-folder-utils.c:690 -#: ../plugins/groupwise-features/install-shared.c:169 -#: ../plugins/groupwise-features/share-folder-common.c:387 -msgid "Specify where to create the folder:" -msgstr "Angiver hvor mappen skal oprettes:" +#: ../mail/evolution-mail.schemas.in.h:134 +msgid "" +"Show the \"From\" field when posting to a newsgroup. This is controlled from " +"the View menu when a news account is chosen." +msgstr "" -#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70 -msgid "Mail Deletion Failed" -msgstr "Sletning af post fejlede" +#: ../mail/evolution-mail.schemas.in.h:135 +msgid "" +"Show the \"From\" field when sending a mail message. This is controlled from " +"the View menu when a mail account is chosen." +msgstr "" -#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126 -msgid "You do not have sufficient permissions to delete this mail." -msgstr "Du har ikke tilstrækkelige rettigheder til at slette denne post." +#: ../mail/evolution-mail.schemas.in.h:138 +msgid "" +"Show the \"Reply To\" field when posting to a newsgroup. This is controlled " +"from the View menu when a news account is chosen." +msgstr "" -#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127 -msgid "_Reply to Sender" -msgstr "Send sva_r til afsender" +#: ../mail/evolution-mail.schemas.in.h:139 +msgid "" +"Show the \"Reply To\" field when sending a mail message. This is controlled " +"from the View menu when a mail account is chosen." +msgstr "" -#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577 -#: ../ui/evolution-mail-message.xml.h:109 -msgid "_Forward" -msgstr "_Videresend" +#: ../mail/evolution-mail.schemas.in.h:140 +msgid "" +"Show the email-address of the sender in a separate column in the message " +"list." +msgstr "Vis afsenderens e-postadresse i en separat kolonne i brevindeks." -#. 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 -#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106 -msgid "_Edit as New Message..." -msgstr "R_edigér som nyt brev..." +#: ../mail/evolution-mail.schemas.in.h:141 +msgid "Show the photo of the sender in the message reading pane." +msgstr "Vis afsenderens foto i brevlæsnings-panelet." -#: ../mail/em-folder-view.c:1343 -msgid "U_ndelete" -msgstr "_Fortryd sletning" +#: ../mail/evolution-mail.schemas.in.h:142 +msgid "Spell check inline" +msgstr "Integreret stavekontrol" -#: ../mail/em-folder-view.c:1344 -msgid "_Move to Folder..." -msgstr "Fl_yt til mappe..." +#: ../mail/evolution-mail.schemas.in.h:143 +msgid "Spell checking color" +msgstr "Stavekontrolfarve" -#: ../mail/em-folder-view.c:1345 -msgid "_Copy to Folder..." -msgstr "K_opiér til mappe..." +#: ../mail/evolution-mail.schemas.in.h:144 +msgid "Spell checking languages" +msgstr "Stavekontrolsprog" -#: ../mail/em-folder-view.c:1348 -msgid "Mar_k as Read" -msgstr "Mar_kér som læst" +#: ../mail/evolution-mail.schemas.in.h:145 +msgid "Subscribe dialog default height" +msgstr "Standardhøjden for abonnementsvinduet" -#: ../mail/em-folder-view.c:1349 -msgid "Mark as _Unread" -msgstr "Markér som ulæs_t" +#: ../mail/evolution-mail.schemas.in.h:146 +msgid "Subscribe dialog default width" +msgstr "Standardbredde på abonneringsvinduet" -#: ../mail/em-folder-view.c:1350 -msgid "Mark as _Important" -msgstr "Markér som v_igtig" +#: ../mail/evolution-mail.schemas.in.h:147 +msgid "Terminal font" +msgstr "Terminalskrifttype" -#: ../mail/em-folder-view.c:1351 -msgid "Mark as Un_important" -msgstr "Markér som uvi_gtig" +#: ../mail/evolution-mail.schemas.in.h:148 +msgid "Text message part limit" +msgstr "Grænse for tekstbeskeddel" -#: ../mail/em-folder-view.c:1352 -msgid "Mark as _Junk" -msgstr "Markér som spa_m" +#: ../mail/evolution-mail.schemas.in.h:149 +msgid "The default plugin for Junk hook" +msgstr "Standard-udvidelsesmodulet for spam-funktion" -#: ../mail/em-folder-view.c:1353 -msgid "Mark as _Not Junk" -msgstr "Markér som værende _ikke-spam" +#: ../mail/evolution-mail.schemas.in.h:150 +msgid "The last time empty junk was run, in days since the epoch." +msgstr "Sidste gang spammapperne blev tømt, målt i dage siden epoken." -#: ../mail/em-folder-view.c:1354 -msgid "Mark for Follo_w Up..." -msgstr "Markér til opføl_gning..." +#: ../mail/evolution-mail.schemas.in.h:151 +msgid "The last time empty trash was run, in days since the epoch." +msgstr "Sidste gang affaldet blev tømt, målt i dage siden epoken." -#: ../mail/em-folder-view.c:1356 -msgid "_Label" -msgstr "Mær_kning" +#: ../mail/evolution-mail.schemas.in.h:152 +msgid "The terminal font for mail display." +msgstr "Terminalskrifttypen ved visning af brev." -#. Note that we don't show this here, since by default a 'None' date -#. is not permitted. -#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478 -msgid "_None" -msgstr "_Ingen" +#: ../mail/evolution-mail.schemas.in.h:153 +msgid "The variable width font for mail display." +msgstr "Skrifttypen med variabel bredde til visning af e-post." -#: ../mail/em-folder-view.c:1360 -msgid "_New Label" -msgstr "_Ny mærkat" - -#: ../mail/em-folder-view.c:1364 -msgid "Fla_g Completed" -msgstr "Markér som fuldf_ørt" - -#: ../mail/em-folder-view.c:1365 -msgid "Cl_ear Flag" -msgstr "Fjer_n markering" - -#: ../mail/em-folder-view.c:1368 -msgid "Crea_te Rule From Message" -msgstr "_Opret regel fra brev" +#: ../mail/evolution-mail.schemas.in.h:154 +msgid "" +"This can have three possible values. \"0\" for errors. \"1\" for warnings. " +"\"2\" for debug messages." +msgstr "" +"Kan have tre forskellige værdier. \"0\" for fejl. \"1\" for advarsler. \"2\" " +"for fejlsøgningsbeskeder." -#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on. -#: ../mail/em-folder-view.c:1370 -msgid "Search Folder based on _Subject" -msgstr "Søgemappe ud fra _emne" +#: ../mail/evolution-mail.schemas.in.h:155 +msgid "" +"This decides the max size of the text part that can be formatted under " +"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB." +msgstr "" +"Dette bestemmer den maksimale mængde af tekstdelen, som kan blive formateret " +"i evolution. Standarden er 4MB / 4096KB og er angivet i KB." -#: ../mail/em-folder-view.c:1371 -msgid "Search Folder based on Se_nder" -msgstr "Søgemappe ud fra afse_nder" +#: ../mail/evolution-mail.schemas.in.h:156 +msgid "" +"This is the default junk plugin, even though there are multiple plugins " +"enabled. If the default listed plugin is disabled, then it won't fall back " +"to the other available plugins." +msgstr "" +"Dette er det forvalgte spam-udvidelsesmodul, selv om der er flere af slagsen " +"aktiveret. Hvis det forvalgte udvidelsesmodul er deaktiveret vil der ikke " +"automatisk benyttes et af de andre." -#: ../mail/em-folder-view.c:1372 -msgid "Search Folder based on _Recipients" -msgstr "Søgemappe ud fra modtage_re" +#: ../mail/evolution-mail.schemas.in.h:157 +msgid "" +"This key is read only once and reset to \"false\" after read. This unselects " +"the mail in the list and removes the preview for that folder." +msgstr "" +"Denne nøgle læses kun en gang og sættes til \"false\" efter at den er læst. " +"Dette fravælger brevene i listen og fjerner forhåndsvisning for den mappe." -#: ../mail/em-folder-view.c:1373 -msgid "Search Folder based on Mailing _List" -msgstr "Søgemappe ud fra e-post_liste" +#: ../mail/evolution-mail.schemas.in.h:158 +msgid "" +"This key should contain a list of XML structures specifying custom headers, " +"and whether they are to be displayed. The format of the XML structure is <" +"header enabled> - set enabled if the header is to be displayed in the " +"mail view." +msgstr "" +"Denne nøgle bør indeholde en liste over XML-strukturer der angiver " +"tilpassede hoveder og om de skal vises. Formatet for XML-strukturen er <" +"header enabled> - sæt til enabled hvis hovedet skal vises i e-post-" +"visningen." -#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on. -#: ../mail/em-folder-view.c:1378 -msgid "Filter based on Sub_ject" -msgstr "Filtrér på em_ne" +#: ../mail/evolution-mail.schemas.in.h:159 +msgid "" +"This option is related to the key lookup_addressbook and is used to " +"determine whether to look up addresses in local address book only to exclude " +"mail sent by known contacts from junk filtering." +msgstr "" +"Denne valgmulighed er relateret til nøglen lookup_adressbook og bruges til " +"at afgøre, hvorvidt der kun skal kigges i den lokale adressebog, når post " +"som er modtaget fra kendte kontaktpersoner, skal ekskluderes fra " +"spamfiltreringen." -#: ../mail/em-folder-view.c:1379 -msgid "Filter based on Sen_der" -msgstr "Filtrér på afsen_der" +#: ../mail/evolution-mail.schemas.in.h:160 +msgid "This option would help in improving the speed of fetching." +msgstr "Denne valgmulighed vil hjælpe med at øge farten hvormed der overføres." -#: ../mail/em-folder-view.c:1380 -msgid "Filter based on Re_cipients" -msgstr "Filtrér på modta_gere" +#: ../mail/evolution-mail.schemas.in.h:161 +msgid "" +"This sets the number of addresses to show in default message list view, " +"beyond which a '...' is shown." +msgstr "" +"Dette bestemmer antallet af adresser der som standard vises i brevindekset. " +"Efter dette antal vises \"...\"." -#: ../mail/em-folder-view.c:1381 -msgid "Filter based on _Mailing List" -msgstr "Filtrér på e-_postliste" +#: ../mail/evolution-mail.schemas.in.h:162 +msgid "" +"This setting specifies whether the threads should be in expanded or " +"collapsed state by default. Evolution requires a restart." +msgstr "" +"Denne valgmulighed specificerer hvorvidt tråde skal være foldet ud eller " +"klappet sammen til at starte med. Dette kræver en genstart af Evolution." -#. default charset used in mail view -#. we changed user, thus reset the chosen calendar combo too, because -#. other user means other calendars subscribed -#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300 -#: ../plugins/google-account-setup/google-source.c:232 -#: ../plugins/google-account-setup/google-source.c:510 -#: ../plugins/google-account-setup/google-source.c:708 -msgid "Default" -msgstr "Standard" +#: ../mail/evolution-mail.schemas.in.h:163 +msgid "" +"This setting specifies whether the threads should be sorted based on latest " +"message in each thread, rather than by message's date. Evolution requires a " +"restart." +msgstr "" +"Denne valgmulighed specificerer hvorvidt tråde skal sorteres efter sidste e-" +"brev i tråden i stedet for brevets dato. Dette kræver en genstart af " +"Evolution." -#: ../mail/em-folder-view.c:2518 -msgid "Unable to retrieve message" -msgstr "Kan ikke hente brevet" +#: ../mail/evolution-mail.schemas.in.h:164 +msgid "Thread the message list." +msgstr "Benyt trådning i brevindeks." -#: ../mail/em-folder-view.c:2537 -msgid "Retrieving Message..." -msgstr "Henter brev..." +#: ../mail/evolution-mail.schemas.in.h:165 +msgid "Thread the message-list" +msgstr "Benyt trådning i brevlisten" -#: ../mail/em-folder-view.c:2756 -msgid "C_all To..." -msgstr "Opk_ald til..." +#: ../mail/evolution-mail.schemas.in.h:166 +msgid "Thread the message-list based on Subject" +msgstr "Benyt trådning i brevindekset, baseret på emne" -#: ../mail/em-folder-view.c:2759 -msgid "Create _Search Folder" -msgstr "Opret søge_mappe" +#: ../mail/evolution-mail.schemas.in.h:167 +msgid "Timeout for marking message as seen" +msgstr "Tidsgrænse for at markere brev som set" -#: ../mail/em-folder-view.c:2760 -msgid "_From this Address" -msgstr "_Fra denne adresse" +#: ../mail/evolution-mail.schemas.in.h:168 +msgid "Timeout for marking message as seen." +msgstr "Tidsgrænse for at markere brev som set." -#: ../mail/em-folder-view.c:2761 -msgid "_To this Address" -msgstr "_Til denne adresse" +#: ../mail/evolution-mail.schemas.in.h:169 +msgid "UID string of the default account." +msgstr "Standardkontoens UID-streng." -#: ../mail/em-folder-view.c:3254 -#, c-format -msgid "Click to mail %s" -msgstr "Klik for at skrive til %s" +#: ../mail/evolution-mail.schemas.in.h:170 +msgid "Underline color for misspelled words when using inline spelling." +msgstr "" +"Farve af streg under forkert stavede ord ved brug af løbende stavekontrol." -#: ../mail/em-folder-view.c:3266 -#, c-format -msgid "Click to call %s" -msgstr "Klik for at ringe til %s" +#: ../mail/evolution-mail.schemas.in.h:171 +msgid "Use SpamAssassin daemon and client" +msgstr "Benyt Spamassassin-dæmon og klient" -#: ../mail/em-folder-view.c:3271 -msgid "Click to hide/unhide addresses" -msgstr "Klik for at vise/skjule adresser" +#: ../mail/evolution-mail.schemas.in.h:172 +msgid "Use SpamAssassin daemon and client (spamc/spamd)." +msgstr "Benyt Spamassassin-dæmon og klient (spamc/spamd)." -#. message-search popup match count string -#: ../mail/em-format-html-display.c:474 -#, c-format -msgid "Matches: %d" -msgstr "Matcher: %d" +#: ../mail/evolution-mail.schemas.in.h:173 +msgid "Use custom fonts" +msgstr "Brug tilpassede skrifttyper" -#: ../mail/em-format-html-display.c:618 -msgid "Fin_d:" -msgstr "F_ind:" +#: ../mail/evolution-mail.schemas.in.h:174 +msgid "Use custom fonts for displaying mail." +msgstr "Benyt tilpassede skrifttyper til e-post-visning." -#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5); -#: ../mail/em-format-html-display.c:642 -msgid "_Previous" -msgstr "_Forrige" +#: ../mail/evolution-mail.schemas.in.h:175 +msgid "Use only local spam tests." +msgstr "Benyt kun lokale spam-test." -#: ../mail/em-format-html-display.c:647 -msgid "_Next" -msgstr "_Næste" +#: ../mail/evolution-mail.schemas.in.h:176 +msgid "Use only the local spam tests (no DNS)." +msgstr "Benyt kun de lokale spam-test (ingen DNS)." -#: ../mail/em-format-html-display.c:652 -msgid "M_atch case" -msgstr "M_atch store/små bogstaver" +#: ../mail/evolution-mail.schemas.in.h:177 +msgid "Use side-by-side or wide layout" +msgstr "Anvend side-om-side-layout eller bredformat" -#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655 -msgid "Unsigned" -msgstr "Ikke signeret" +#: ../mail/evolution-mail.schemas.in.h:178 +msgid "Variable width font" +msgstr "Skrifttype med variabel bredde" -#: ../mail/em-format-html-display.c:951 -msgid "" -"This message is not signed. There is no guarantee that this message is " -"authentic." +#: ../mail/evolution-mail.schemas.in.h:179 +msgid "Whether a read receipt request gets added to every message by default." msgstr "" -"Dette brev er ikke signeret. Der er ingen garanti for at dette brev er " -"autentisk." - -#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656 -msgid "Valid signature" -msgstr "Gyldig signatur" +"Hvorvidt der vedhæftes en anmodning om en kvittering for at brevet er læst " +"til alle breve som standard." -#: ../mail/em-format-html-display.c:952 -msgid "" -"This message is signed and is valid meaning that it is very likely that this " -"message is authentic." +#: ../mail/evolution-mail.schemas.in.h:180 +msgid "Whether disable ellipsizing feature of folder names in side bar." msgstr "" -"Dette brev er signeret og er gyldigt, hvilket sandsynligvis betyder at dette " -"brev er autentisk." - -#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:657 -msgid "Invalid signature" -msgstr "Ugyldig signatur" +"Om funktionen for forkortelse af mappenavne i mappetræet skal slås fra." -#: ../mail/em-format-html-display.c:953 +#: ../mail/evolution-mail.schemas.in.h:181 msgid "" -"The signature of this message cannot be verified, it may have been altered " -"in transit." +"Whether or not to fall back on threading by subjects when the messages do " +"not contain In-Reply-To or References headers." msgstr "" -"Signaturen for dette brev kan ikke verificeres. Den kan være ændret under " -"overføringen." +"Vælg om der skal benyttes emnebaseret trådning når breve ikke indeholder " +"linjerne \"In-Reply-To\" eller \"References\" i brevhoved." -#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658 -msgid "Valid signature, but cannot verify sender" -msgstr "Gyldig signatur, men kunne ikke verificere afsenderen" +#: ../mail/evolution-mail.schemas.in.h:182 +msgid "Whether sort threads based on latest message in that thread" +msgstr "Hvorvidt sortering baseres på det sidste brev i tråden" -#: ../mail/em-format-html-display.c:954 -msgid "" -"This message is signed with a valid signature, but the sender of the message " -"cannot be verified." -msgstr "" -"Dette brev er signeret med en gyldig signatur, men afsenderen af brevet kan " -"ikke verificeres." +#: ../mail/evolution-mail.schemas.in.h:183 +msgid "Width of the message-list pane" +msgstr "Bredde på ruden med brevindeks" -#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:659 -msgid "Signature exists, but need public key" -msgstr "Signaturen eksisterer, men der skal bruges en offentlig nøgle" +#: ../mail/evolution-mail.schemas.in.h:184 +msgid "Width of the message-list pane." +msgstr "Bredde på ruden med brevindeks." -#: ../mail/em-format-html-display.c:955 -msgid "" -"This message is signed with a signature, but there is no corresponding " -"public key." -msgstr "" -"Dette brev er signeret med en signatur, men der er ikke nogen tilsvarende " -"offentlig nøgle." +#: ../mail/importers/elm-importer.c:182 +msgid "Importing Elm data" +msgstr "Importerer Elm-data" -#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665 -msgid "Unencrypted" -msgstr "Ikke krypteret" +#: ../mail/importers/elm-importer.c:367 +msgid "Evolution Elm importer" +msgstr "Evolution elm-importør" -#: ../mail/em-format-html-display.c:962 -msgid "" -"This message is not encrypted. Its content may be viewed in transit across " -"the Internet." -msgstr "" -"Dette brev er ikke krypteret. Indholdet af brevet kan ses ved overførslen " -"over internettet." - -#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666 -msgid "Encrypted, weak" -msgstr "Krypteret, svag" - -#: ../mail/em-format-html-display.c:963 -msgid "" -"This message is encrypted, but with a weak encryption algorithm. It would be " -"difficult, but not impossible for an outsider to view the content of this " -"message in a practical amount of time." -msgstr "" -"Dette brev er krypteret, men med en svag krypteringsalgoritme. Det er " -"vanskeligt, men i praksis ikke umuligt for en udenforstående at se indholdet " -"af brevet." - -#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667 -msgid "Encrypted" -msgstr "Krypteret" - -#: ../mail/em-format-html-display.c:964 -msgid "" -"This message is encrypted. It would be difficult for an outsider to view " -"the content of this message." -msgstr "" -"Dette brev er krypteret. Det vil være vanskeligt for en udenforstående at se " -"indholdet i brevet." - -#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:668 -msgid "Encrypted, strong" -msgstr "Krypteret, stærk" - -#: ../mail/em-format-html-display.c:965 -msgid "" -"This message is encrypted, with a strong encryption algorithm. It would be " -"very difficult for an outsider to view the content of this message in a " -"practical amount of time." -msgstr "" -"Dette brev er krypteret med en stærk algoritme. Det vil være meget " -"vanskeligt for en udenforstående at kunne komme til at se indholdet af " -"brevet i løbet af en kortere tidshorisont." - -#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48 -msgid "_View Certificate" -msgstr "_Vis certifikat" - -#: ../mail/em-format-html-display.c:1081 -msgid "This certificate is not viewable" -msgstr "Dette certifikat kan ikke vises" +#: ../mail/importers/elm-importer.c:368 +msgid "Import mail from Elm." +msgstr "Importer e-post fra Elm." -#: ../mail/em-format-html-display.c:1410 -msgid "Completed on %B %d, %Y, %l:%M %p" -msgstr "Fuldført den %d. %B %Y %H:%M" +#: ../mail/importers/evolution-mbox-importer.c:79 +#: ../plugins/pst-import/pst-importer.c:312 +msgid "Destination folder:" +msgstr "Destinationsmappe:" -#: ../mail/em-format-html-display.c:1418 -msgid "Overdue:" -msgstr "Overskredet:" +#: ../mail/importers/evolution-mbox-importer.c:82 +#: ../plugins/pst-import/pst-importer.c:305 +msgid "Select folder to import into" +msgstr "Vælg mappen der skal importeres til" -#: ../mail/em-format-html-display.c:1421 -msgid "by %B %d, %Y, %l:%M %p" -msgstr "den %d. %B %Y %H:%M" +#: ../mail/importers/evolution-mbox-importer.c:219 +msgid "Berkeley Mailbox (mbox)" +msgstr "Berkeley Mailbox (mbox)" -#: ../mail/em-format-html-display.c:1499 -msgid "_View Inline" -msgstr "_Vis integreret" +#: ../mail/importers/evolution-mbox-importer.c:220 +msgid "Importer Berkeley Mailbox format folders" +msgstr "Importør til mapper i Berkeley Mailbox-formatet (mbox)" -#: ../mail/em-format-html-display.c:1500 -msgid "_Hide" -msgstr "_Skjul" +#: ../mail/importers/mail-importer.c:147 +msgid "Importing mailbox" +msgstr "Importerer brevbakke" -#: ../mail/em-format-html-display.c:1501 -msgid "_Fit to Width" -msgstr "Tilpas til _bredde" +#. Destination folder, was set in our widget +#: ../mail/importers/mail-importer.c:231 +#: ../plugins/pst-import/pst-importer.c:457 +#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:537 +#, c-format +msgid "Importing `%s'" +msgstr "Importerer \"%s\"" -#: ../mail/em-format-html-display.c:1502 -msgid "Show _Original Size" -msgstr "Vis _oprindelig størrelse" +#: ../mail/importers/mail-importer.c:371 +#, c-format +msgid "Scanning %s" +msgstr "Søger i %s" -#: ../mail/em-format-html-display.c:2171 -msgid "Save attachment as" -msgstr "Gem bilag som" +#: ../mail/importers/pine-importer.c:225 +msgid "Importing Pine data" +msgstr "Importerer Pine-data" -#: ../mail/em-format-html-display.c:2175 -msgid "Select folder to save all attachments" -msgstr "Vælg mappe til at gemme alle bilag i" +#: ../mail/importers/pine-importer.c:424 +msgid "Evolution Pine importer" +msgstr "Evolution Pine-importør" -#: ../mail/em-format-html-display.c:2226 -msgid "_Save Selected..." -msgstr "_Gem markerede..." +#: ../mail/importers/pine-importer.c:425 +msgid "Import mail from Pine." +msgstr "Importer e-post fra Pine." -#. Cant i put in the number of attachments here ? -#: ../mail/em-format-html-display.c:2293 +#: ../mail/mail-autofilter.c:72 #, c-format -msgid "%d at_tachment" -msgid_plural "%d at_tachments" -msgstr[0] "%d _bilag" -msgstr[1] "%d _bilag" - -#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390 -msgid "S_ave" -msgstr "_Gem" - -#: ../mail/em-format-html-display.c:2311 -msgid "S_ave All" -msgstr "_Gem alt" - -#: ../mail/em-format-html-display.c:2386 -msgid "No Attachment" -msgstr "Intet bilag" +msgid "Mail to %s" +msgstr "E-post til %s" -#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572 -msgid "View _Unformatted" -msgstr "Vis _uformateret" +#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275 +#, c-format +msgid "Mail from %s" +msgstr "E-post fra %s" -#: ../mail/em-format-html-display.c:2535 -msgid "Hide _Unformatted" -msgstr "Skjul _uformateret" +#: ../mail/mail-autofilter.c:259 +#, c-format +msgid "Subject is %s" +msgstr "Emne er %s" -#: ../mail/em-format-html-display.c:2592 -msgid "O_pen With" -msgstr "_Åbn med" +#: ../mail/mail-autofilter.c:294 +#, c-format +msgid "%s mailing list" +msgstr "%s e-post-liste" -#: ../mail/em-format-html-display.c:2668 -msgid "" -"Evolution cannot render this email as it is too large to process. You can " -"view it unformatted or with an external text editor." -msgstr "" -"Evolution kan ikke vise dette e-brev da det er for stort til at håndtere. Du " -"kan se den uformateret eller med et eksternt tekstredigeringsprogram." +#: ../mail/mail-autofilter.c:365 +msgid "Add Filter Rule" +msgstr "Tilføj filterregel" -#: ../mail/em-format-html-print.c:157 +#: ../mail/mail-component.c:554 #, c-format -msgid "Page %d of %d" -msgstr "Side %d af %d" +msgid "%d selected, " +msgid_plural "%d selected, " +msgstr[0] "%d markeret, " +msgstr[1] "%d markeret, " -#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515 +#: ../mail/mail-component.c:558 #, c-format -msgid "Retrieving `%s'" -msgstr "Henter \"%s\"" - -#: ../mail/em-format-html.c:930 -msgid "Unknown external-body part." -msgstr "Ukendt ydre del af brevindhold." +msgid "%d deleted" +msgid_plural "%d deleted" +msgstr[0] "%d slettet" +msgstr[1] "%d slettet" -#: ../mail/em-format-html.c:938 -msgid "Malformed external-body part." -msgstr "Misdannet ydre del af brevindhold." +#: ../mail/mail-component.c:565 +#, c-format +msgid "%d junk" +msgid_plural "%d junk" +msgstr[0] "%d spam" +msgstr[1] "%d spam" -#: ../mail/em-format-html.c:968 +#: ../mail/mail-component.c:568 #, c-format -msgid "Pointer to FTP site (%s)" -msgstr "Peger til FTP-server (%s)" +msgid "%d draft" +msgid_plural "%d drafts" +msgstr[0] "%d kladde" +msgstr[1] "%d kladder" -#: ../mail/em-format-html.c:979 +#: ../mail/mail-component.c:570 #, c-format -msgid "Pointer to local file (%s) valid at site \"%s\"" -msgstr "Peger til lokal fil (%s) gyldig på netsted \"%s\"" +msgid "%d sent" +msgid_plural "%d sent" +msgstr[0] "%d sendt" +msgstr[1] "%d sendte" -#: ../mail/em-format-html.c:981 +#: ../mail/mail-component.c:572 #, c-format -msgid "Pointer to local file (%s)" -msgstr "Peger til lokal fil (%s)" +msgid "%d unsent" +msgid_plural "%d unsent" +msgstr[0] "%d usendt" +msgstr[1] "%d usendte" -#: ../mail/em-format-html.c:1002 +#: ../mail/mail-component.c:578 #, c-format -msgid "Pointer to remote data (%s)" -msgstr "Peger til eksterne data (%s)" +msgid "%d unread, " +msgid_plural "%d unread, " +msgstr[0] "%d ulæst, " +msgstr[1] "%d ulæste, " -#: ../mail/em-format-html.c:1013 +#: ../mail/mail-component.c:579 #, c-format -msgid "Pointer to unknown external data (\"%s\" type)" -msgstr "Peger til ukendt ekstern data (\"%s\"-type)" +msgid "%d total" +msgid_plural "%d total" +msgstr[0] "%d totalt" +msgstr[1] "%d totalt" -#: ../mail/em-format-html.c:1241 -msgid "Formatting message" -msgstr "Formaterer brev" +#: ../mail/mail-component.c:930 +msgid "New Mail Message" +msgstr "Nyt brev" -#: ../mail/em-format-html.c:1415 -msgid "Formatting Message..." -msgstr "Formaterer brev..." +#: ../mail/mail-component.c:931 +msgctxt "New" +msgid "_Mail Message" +msgstr "_Brevbesked" -#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632 -#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210 -#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78 -msgid "Cc" -msgstr "Cc" +#: ../mail/mail-component.c:932 +msgid "Compose a new mail message" +msgstr "Skriv et nyt brev" -#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638 -#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210 -#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79 -msgid "Bcc" -msgstr "Bcc" +#: ../mail/mail-component.c:938 +msgid "New Mail Folder" +msgstr "Ny brevmappe" -#. pseudo-header -#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353 -#: ../mail/em-mailer-prefs.c:1451 -msgid "Mailer" -msgstr "E-postprogram" +#: ../mail/mail-component.c:939 +msgctxt "New" +msgid "Mail _Folder" +msgstr "_Brevmappe" -#. translators: strftime format for local time equivalent in Date header display, with day -#: ../mail/em-format-html.c:1776 -msgid " (%a, %R %Z)" -msgstr " (%a, %R %Z)" +#: ../mail/mail-component.c:940 +msgid "Create a new mail folder" +msgstr "Opret en ny brevmappe" -#. translators: strftime format for local time equivalent in Date header display, without day -#: ../mail/em-format-html.c:1781 -msgid " (%R %Z)" -msgstr " (%R %Z)" +#: ../mail/mail-component.c:1087 +msgid "Failed upgrading Mail settings or folders." +msgstr "Det mislykkedes at opgradere e-post-indstillingerne eller mapperne." -#. To translators: This message suggests to the receipients that the sender of the mail is -#. different from the one listed in From field. -#. -#: ../mail/em-format-html.c:1917 -#, c-format -msgid "This message was sent by %s on behalf of %s" -msgstr "Dette brev blev sendt af %s på vegne af %s" +#: ../mail/mail-config.glade.h:1 +msgid " Ch_eck for Supported Types " +msgstr " _Søg efter understøttede typer " -#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885 -#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7 -#: ../mail/message-tag-followup.c:307 -msgid "From" -msgstr "Fra" +#: ../mail/mail-config.glade.h:2 +msgid "(Note: Requires restart of the application)" +msgstr "(Bemærk: Kræver genstart af programmet)" -#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886 -#: ../mail/em-mailer-prefs.c:76 -msgid "Reply-To" -msgstr "Svar-til" +#: ../mail/mail-config.glade.h:4 +msgid "SSL is not supported in this build of Evolution" +msgstr "SSL er ikke understøttet i denne version af Evolution" -#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81 -#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325 -#: ../widgets/misc/e-dateedit.c:347 -msgid "Date" -msgstr "Dato" - -#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82 -msgid "Newsgroups" -msgstr "Nyhedsgrupper" - -#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83 -#: ../plugins/face/org-gnome-face.eplug.xml.h:2 -msgid "Face" -msgstr "Ansigt" +#: ../mail/mail-config.glade.h:5 +msgid "Sender Photograph" +msgstr "Afsenderfoto" -#: ../mail/em-format.c:1160 -#, c-format -msgid "%s attachment" -msgstr "%s-bilag" +#: ../mail/mail-config.glade.h:6 +msgid "Sig_natures" +msgstr "Si_gnaturer" -#: ../mail/em-format.c:1199 -msgid "Could not parse S/MIME message: Unknown error" -msgstr "Kunne ikke fortolke S/MIME-brev: Ukendt fejl" +#: ../mail/mail-config.glade.h:7 +msgid "Top Posting Option (Not Recommended)" +msgstr "Postér fra toppen (Ikke anbefalet)" -#: ../mail/em-format.c:1336 ../mail/em-format.c:1492 -msgid "Could not parse MIME message. Displaying as source." -msgstr "Kunne ikke læse MIME-brev. Viser rå brevtekst." +#: ../mail/mail-config.glade.h:8 +msgid "_Languages" +msgstr "_Sprog" -#: ../mail/em-format.c:1344 -msgid "Unsupported encryption type for multipart/encrypted" -msgstr "Krypteringstype for multipart/encrypted som ikke er understøttet" +#: ../mail/mail-config.glade.h:9 +msgid "Account Information" +msgstr "Kontoinformation" -#: ../mail/em-format.c:1354 -msgid "Could not parse PGP/MIME message" -msgstr "Kunne ikke fortolke PGP/MIME-meddelelse" +#: ../mail/mail-config.glade.h:11 +msgid "Authentication" +msgstr "Godkendelse" -#: ../mail/em-format.c:1354 -msgid "Could not parse PGP/MIME message: Unknown error" -msgstr "Kunne ikke fortolke PGP/MIME-meddelelse: Ukendt fejl" +#: ../mail/mail-config.glade.h:12 +msgid "Composing Messages" +msgstr "Skrivning af breve" -#: ../mail/em-format.c:1511 -msgid "Unsupported signature format" -msgstr "Signatur-formatet er ikke understøttet" +#: ../mail/mail-config.glade.h:13 +msgid "Configuration" +msgstr "Konfiguration" -#: ../mail/em-format.c:1519 ../mail/em-format.c:1590 -msgid "Error verifying signature" -msgstr "Fejl ved efterprøvning af signaturen" +#: ../mail/mail-config.glade.h:14 +msgid "Default Behavior" +msgstr "Standardopførsel" -#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590 -msgid "Unknown error verifying signature" -msgstr "Ukendt fejl ved efterprøvning af signaturen" +#: ../mail/mail-config.glade.h:15 +msgid "Delete Mail" +msgstr "Slet e-post" -#: ../mail/em-format.c:1664 -msgid "Could not parse PGP message" -msgstr "Kunne ikke fortolke PGP-meddelelse" +#: ../mail/mail-config.glade.h:16 +msgid "Displayed Message _Headers" +msgstr "Brev_hoved som vises" -#: ../mail/em-format.c:1664 -msgid "Could not parse PGP message: Unknown error" -msgstr "Kunne ikke fortolke PGP-meddelelse: Ukendt fejl" +#: ../mail/mail-config.glade.h:18 +msgid "Labels" +msgstr "Mærkater" -#: ../mail/em-mailer-prefs.c:94 -msgid "Every time" -msgstr "Hver gang" +#: ../mail/mail-config.glade.h:19 +msgid "Loading Images" +msgstr "Indlæsning af billeder" -#: ../mail/em-mailer-prefs.c:95 -msgid "Once per day" -msgstr "En gang per dag" +#: ../mail/mail-config.glade.h:20 +msgid "Message Display" +msgstr "Brevvisning" -#: ../mail/em-mailer-prefs.c:96 -msgid "Once per week" -msgstr "En gang per uge" +#: ../mail/mail-config.glade.h:21 +msgid "Message Fonts" +msgstr "Skrifttyper for breve" -#: ../mail/em-mailer-prefs.c:97 -msgid "Once per month" -msgstr "En gang per måned" +#: ../mail/mail-config.glade.h:22 +msgid "Message Receipts" +msgstr "Kvitteringer for breve" -#: ../mail/em-mailer-prefs.c:327 -msgid "Add Custom Junk Header" -msgstr "Tilføj tilpasset spam-brevhoved" +#: ../mail/mail-config.glade.h:23 +#: ../plugins/publish-calendar/publish-calendar.glade.h:3 +msgid "Optional Information" +msgstr "Valgfri information" -#: ../mail/em-mailer-prefs.c:331 -msgid "Header Name:" -msgstr "Brevhovednavn:" +#: ../mail/mail-config.glade.h:24 +msgid "Options" +msgstr "Indstillinger" -#: ../mail/em-mailer-prefs.c:332 -msgid "Header Value Contains:" -msgstr "Brevhoved-værdi indeholder:" +#: ../mail/mail-config.glade.h:25 +msgid "Pretty Good Privacy (PGP/GPG)" +msgstr "Pretty Good Privacy (PGP/GPG)" -#: ../mail/em-mailer-prefs.c:437 -msgid "Contains Value" -msgstr "Indeholder værdi" +#: ../mail/mail-config.glade.h:26 +msgid "Printed Fonts" +msgstr "Skrifttyper for udskrift" -#: ../mail/em-mailer-prefs.c:459 -msgid "Color" -msgstr "Farve" +#: ../mail/mail-config.glade.h:27 +msgid "Proxy Settings" +msgstr "Proxyindstillinger" -#: ../mail/em-mailer-prefs.c:462 -msgid "Tag" -msgstr "Mærke" +#: ../mail/mail-config.glade.h:28 +msgid "Required Information" +msgstr "Nødvendig information" -#. May be a better text -#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133 -#, c-format -msgid "%s plugin is available and the binary is installed." -msgstr "" -"%s-udvidelsesmodulet er tilgængeligt og dets binære pakke er installeret." +#: ../mail/mail-config.glade.h:29 +msgid "Secure MIME (S/MIME)" +msgstr "Sikker MIME (S/MIME)" -#. May be a better text -#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142 -#, c-format -msgid "" -"%s plugin is not available. Please check whether the package is installed." -msgstr "" -"%s-udvidelsesmodulet er ikke tilgængeligt. Kontrollér om pakken er " -"installeret." +#: ../mail/mail-config.glade.h:30 +msgid "Security" +msgstr "Sikkerhed" -#: ../mail/em-mailer-prefs.c:1108 -msgid "No Junk plugin available" -msgstr "Intet spam-udvidelsesmodul tilgængeligt" +#: ../mail/mail-config.glade.h:31 +msgid "Sent and Draft Messages" +msgstr "Sendte breve og kladder" -#. green -#: ../mail/em-migrate.c:1059 -msgid "To Do" -msgstr "Gøremål" +#: ../mail/mail-config.glade.h:32 +msgid "Server Configuration" +msgstr "Konfiguration af server" -#. blue -#: ../mail/em-migrate.c:1060 -msgid "Later" -msgstr "Senere" +#: ../mail/mail-config.glade.h:33 +msgid "_Authentication Type" +msgstr "_Godkendelsestype" -#: ../mail/em-migrate.c:1228 -msgid "Migration" -msgstr "Overflytning" +#: ../mail/mail-config.glade.h:35 +msgid "Account Management" +msgstr "Håndtering af konti" -#: ../mail/em-migrate.c:1673 -#, c-format -msgid "Unable to create new folder `%s': %s" -msgstr "Kan ikke oprette ny mappe \"%s\": %s" +#: ../mail/mail-config.glade.h:36 +msgid "Add Ne_w Signature..." +msgstr "Tilføj _ny signatur..." -#: ../mail/em-migrate.c:1699 -#, c-format -msgid "Unable to copy folder `%s' to `%s': %s" -msgstr "Kan ikke kopiere mappen \"%s\" til \"%s\": %s" +#: ../mail/mail-config.glade.h:37 +msgid "Add _Script" +msgstr "Tilføj _skript" -#: ../mail/em-migrate.c:1884 -#, c-format -msgid "Unable to scan for existing mailboxes at `%s': %s" -msgstr "Kan ikke skanne efter eksisterende brevbakker på \"%s\": %s" +#: ../mail/mail-config.glade.h:38 +msgid "Al_ways sign outgoing messages when using this account" +msgstr "Signér _altid udgående breve når denne konto benyttes" -#: ../mail/em-migrate.c:1889 -msgid "" -"The location and hierarchy of the Evolution mailbox folders has changed " -"since Evolution 1.x.\n" -"\n" -"Please be patient while Evolution migrates your folders..." -msgstr "" -"Placering og struktur for Evolutions e-post-mapper er ændret siden Evolution " -"1.x.\n" -"\n" -"Vent venligst mens Evolution overflytter dine mapper..." +#: ../mail/mail-config.glade.h:39 +msgid "Also encrypt to sel_f when sending encrypted messages" +msgstr "Kryptér også til mig _selv når krypteret e-post sendes" -#: ../mail/em-migrate.c:2090 -#, c-format -msgid "Unable to open old POP keep-on-server data `%s': %s" -msgstr "Kan ikke åbne gammel POP-behold på serveren-data \"%s\": %s" +#: ../mail/mail-config.glade.h:40 +msgid "Alway_s carbon-copy (cc) to:" +msgstr "Send _altid en kopi (cc) til:" -#: ../mail/em-migrate.c:2104 -#, c-format -msgid "Unable to create POP3 keep-on-server data directory `%s': %s" -msgstr "Kan ikke oprette POP3-behold på serveren-data-katalog \"%s\": %s" +#: ../mail/mail-config.glade.h:41 +msgid "Always _blind carbon-copy (bcc) to:" +msgstr "Send altid en _blindkopi (bcc) til:" -#: ../mail/em-migrate.c:2133 -#, c-format -msgid "Unable to copy POP3 keep-on-server data `%s': %s" -msgstr "" -"Kan ikke kopiere data om breve der skal beholdes på POP3-server \"%s\": %s" +#: ../mail/mail-config.glade.h:42 +msgid "Always _trust keys in my keyring when encrypting" +msgstr "_Stol altid på nøgler i min nøglering ved kryptering" -#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616 -#, c-format -msgid "Failed to create local mail storage `%s': %s" -msgstr "Kunne ikke oprette opbevaringssted \"%s\": %s til lokal e-post" +#: ../mail/mail-config.glade.h:43 +msgid "Always encrypt to _myself when sending encrypted messages" +msgstr "Kryptér altid til _mig selv når krypteret e-post sendes" -#: ../mail/em-migrate.c:2974 -msgid "Migrating Folders" -msgstr "Overflytter mapper" +#: ../mail/mail-config.glade.h:44 +msgid "Always request rea_d receipt" +msgstr "Anmod altid om en kvittering for l_æsning" -#: ../mail/em-migrate.c:2974 +#: ../mail/mail-config.glade.h:45 +#, fuzzy msgid "" -"The summary format of the Evolution mailbox folders has been moved to SQLite " -"since Evolution 2.24.\n" -"\n" -"Please be patient while Evolution migrates your folders..." -msgstr "" -"Sammendragsformatet for Evolution e-post-brevbakkerne er blevet flyttet til " -"SQLite siden Evolution 2.24.\n" -"\n" -"Vent venligst mens Evolution flytter dine mapper..." - -#: ../mail/em-migrate.c:3056 -#, c-format -msgid "Unable to create local mail folders at `%s': %s" -msgstr "Kan ikke oprette lokal e-post-mappe på \"%s\": %s" +"Attachment\n" +"Inline\n" +"Quoted" +msgstr "Bilagspåmindelse" -#: ../mail/em-migrate.c:3075 +#: ../mail/mail-config.glade.h:48 msgid "" -"Unable to read settings from previous Evolution install, `evolution/config." -"xmldb' does not exist or is corrupt." +"Attachment\n" +"Inline (Outlook style)\n" +"Quoted\n" +"Do not quote" msgstr "" -"Kan ikke læse indstillingerne fra tidligere installation af Evolution, " -"\"evolution/config.xmldb\" findes ikke eller er ødelagt." -#: ../mail/em-popup.c:562 ../mail/em-popup.c:573 -msgid "_Reply to sender" -msgstr "_Svar afsenderen" +#: ../mail/mail-config.glade.h:52 +msgid "Automatically insert _emoticon images" +msgstr "Indsæt s_miley-billeder automatisk" -#: ../mail/em-popup.c:563 ../mail/em-popup.c:574 -#: ../ui/evolution-mail-message.xml.h:83 -msgid "Reply to _List" -msgstr "Svar til _listen" +#: ../mail/mail-config.glade.h:53 +msgid "Baltic (ISO-8859-13)" +msgstr "Baltisk (ISO-8859-13)" -#. make it first item -#: ../mail/em-popup.c:625 ../mail/em-popup.c:849 -msgid "_Add to Address Book" -msgstr "_Føj til adressebogen" - -#: ../mail/em-subscribe-editor.c:600 -msgid "This store does not support subscriptions, or they are not enabled." -msgstr "" -"Dette opbevaringssted understøtter ikke abonnementer eller også er de ikke " -"aktiveret." +#: ../mail/mail-config.glade.h:54 +msgid "Baltic (ISO-8859-4)" +msgstr "Baltisk (ISO-8859-4)" -#: ../mail/em-subscribe-editor.c:633 -msgid "Subscribed" -msgstr "Tilmeldt" +#: ../mail/mail-config.glade.h:55 +msgid "C_haracter set:" +msgstr "Te_gnkodning:" -#: ../mail/em-subscribe-editor.c:637 -msgid "Folder" -msgstr "Katalog" +#: ../mail/mail-config.glade.h:56 +msgid "Ch_eck for Supported Types " +msgstr "_Søg efter understøttede typer " -#. FIXME: This is just to get the shadow, is there a better way? -#: ../mail/em-subscribe-editor.c:839 -msgid "Please select a server." -msgstr "Vælg en server." +#: ../mail/mail-config.glade.h:57 +msgid "Check cu_stom headers for junk" +msgstr "K_ontrollér tilpassede brevhoveder for spam" -#: ../mail/em-subscribe-editor.c:860 -msgid "No server has been selected" -msgstr "Ingen server er valgt" +#: ../mail/mail-config.glade.h:58 +msgid "Check incoming _messages for junk" +msgstr "Kontrollér _indgående post for spam" -#. Check buttons -#: ../mail/em-utils.c:122 -#: ../plugins/attachment-reminder/attachment-reminder.c:128 -msgid "_Do not show this message again." -msgstr "_Vis ikke denne meddelelse igen." +#: ../mail/mail-config.glade.h:59 +msgid "Check spelling while I _type" +msgstr "Kontrollér stavning mens jeg skri_ver" -#: ../mail/em-utils.c:318 -msgid "Message Filters" -msgstr "Brevfiltre" +#: ../mail/mail-config.glade.h:60 +msgid "Checks incoming mail messages to be Junk" +msgstr "Kontrollerer om indgående breve er spam" -#: ../mail/em-utils.c:371 -msgid "message" -msgstr "brev" +#: ../mail/mail-config.glade.h:61 +msgid "Cle_ar" +msgstr "_Ryd" -#: ../mail/em-utils.c:655 -msgid "Save Message..." -msgstr "Gem brev..." +#: ../mail/mail-config.glade.h:62 +msgid "Clea_r" +msgstr "R_yd" -#: ../mail/em-utils.c:705 -msgid "Add address" -msgstr "Tilføj adresse" +#: ../mail/mail-config.glade.h:63 +msgid "Color for _misspelled words:" +msgstr "Farve på _fejlstavede ord:" -#. Drop filename for messages from a mailbox -#: ../mail/em-utils.c:1226 -#, c-format -msgid "Messages from %s" -msgstr "Breve fra %s" +#: ../mail/mail-config.glade.h:64 +msgid "Confirm _when expunging a folder" +msgstr "Bekræft _når en mappe tømmes" -#: ../mail/em-vfolder-editor.c:115 -msgid "Search _Folders" -msgstr "Søg i _mapper" +#: ../mail/mail-config.glade.h:65 +msgid "" +"Congratulations, your mail configuration is complete.\n" +"\n" +"You are now ready to send and receive email \n" +"using Evolution. \n" +"\n" +"Click \"Apply\" to save your settings." +msgstr "" +"Tillykke, din e-post-konfiguration er nu fuldført.\n" +"\n" +"Du kan nu sende og modtage e-post \n" +"med Evolution. \n" +"\n" +"Klik på \"Anvend\" for at gemme dine indstillinger." -#: ../mail/em-vfolder-rule.c:593 -msgid "Search Folder source" -msgstr "Søgemappe-kilde" +#: ../mail/mail-config.glade.h:71 +msgid "De_fault" +msgstr "_Forvalg" -#: ../mail/evolution-mail.schemas.in.h:1 -msgid "\"Send and Receive Mail\" window height" -msgstr "Højde af \"Send og modtag e-post\"-vindue" +#: ../mail/mail-config.glade.h:72 +msgid "Default character e_ncoding:" +msgstr "Standardtegn_kodning:" -#: ../mail/evolution-mail.schemas.in.h:2 -msgid "\"Send and Receive Mail\" window maximize state" -msgstr "Maksimeringstilstand for \"Send og modtag e-post\"-vindue" +#: ../mail/mail-config.glade.h:74 +msgid "Delete junk messages on e_xit" +msgstr "Slet spam når der a_fsluttes" -#: ../mail/evolution-mail.schemas.in.h:3 -msgid "\"Send and Receive Mail\" window width" -msgstr "Bredde af \"Send og modtag e-post\"-vindue" +#: ../mail/mail-config.glade.h:76 +msgid "Digitally sign o_utgoing messages (by default)" +msgstr "Signér ud_gående breve digitalt (som forvalg)" -#: ../mail/evolution-mail.schemas.in.h:4 -msgid "Allows Evolution to display text part of limited size" -msgstr "Tillader Evolution at vise tekstdel af begrænset størrelse" +#: ../mail/mail-config.glade.h:77 +msgid "Do not format messages when text si_ze exceeds" +msgstr "Formatér ikke beskeder hvis tekst_størrelsen overskrider" -#: ../mail/evolution-mail.schemas.in.h:5 -msgid "Always request read receipt" -msgstr "Anmod altid om en kvittering for at brevet er læst" +#: ../mail/mail-config.glade.h:78 +msgid "Do not mar_k messages as junk if sender is in my address book" +msgstr "Mar_ker ikke breve som spam hvis afsenderen er i min adressebog" -#: ../mail/evolution-mail.schemas.in.h:7 -msgid "Automatic emoticon recognition" -msgstr "Automatisk genkendelse af smileyer" +#: ../mail/mail-config.glade.h:79 +msgid "Done" +msgstr "Færdig" -#: ../mail/evolution-mail.schemas.in.h:8 -msgid "Automatic link recognition" -msgstr "Automatisk genkendelse af links" +#: ../mail/mail-config.glade.h:80 +msgid "Drafts _Folder:" +msgstr "Kladde_mappe:" -#: ../mail/evolution-mail.schemas.in.h:9 -msgid "Check incoming mail being junk" -msgstr "Kontrollér om indgående breve er spam" +#: ../mail/mail-config.glade.h:81 +msgid "Email Accounts" +msgstr "E-post-konti" -#: ../mail/evolution-mail.schemas.in.h:10 -msgid "Citation highlight color" -msgstr "Farve til fremhævning af citater" +#: ../mail/mail-config.glade.h:82 +msgid "Email _Address:" +msgstr "E-post_adresse:" -#: ../mail/evolution-mail.schemas.in.h:11 -msgid "Citation highlight color." -msgstr "Farve til fremhævning af citater." +#: ../mail/mail-config.glade.h:83 +msgid "Empty trash folders on e_xit" +msgstr "T_øm affaldsmapper ved afslutning" -#: ../mail/evolution-mail.schemas.in.h:12 -msgid "Composer Window default height" -msgstr "Standardhøjde for skrivevindue" +#: ../mail/mail-config.glade.h:84 +msgid "Enable Magic S_pacebar" +msgstr "Slå magisk m_ellemrumstast til" -#: ../mail/evolution-mail.schemas.in.h:13 -msgid "Composer Window default width" -msgstr "Standardbredde for skrivevindue" +#: ../mail/mail-config.glade.h:85 +msgid "Enable Sea_rch Folders" +msgstr "Slå sø_gemapper til" -#: ../mail/evolution-mail.schemas.in.h:14 -msgid "Composer load/attach directory" -msgstr "Indlæs/vedhæft-mappe for skrivevindue" +#: ../mail/mail-config.glade.h:87 +msgid "Encry_ption certificate:" +msgstr "_Krypteringscertifikat:" -#: ../mail/evolution-mail.schemas.in.h:15 -msgid "Compress display of addresses in TO/CC/BCC" -msgstr "Begræns antallet af synlige adresser i TO/CC/BCC" +#: ../mail/mail-config.glade.h:88 +msgid "Encrypt out_going messages (by default)" +msgstr "Kryptér ud_gående breve (som forvalg)" -#: ../mail/evolution-mail.schemas.in.h:16 -msgid "" -"Compress display of addresses in TO/CC/BCC to the number specified in " -"address_count." -msgstr "" -"Begræns synlige adresser i TO/CC/BCC til det antal der er angivet i " -"address_count." +#: ../mail/mail-config.glade.h:90 +msgid "Fi_xed-width:" +msgstr "_Fastbredde:" -#: ../mail/evolution-mail.schemas.in.h:17 -msgid "" -"Controls how frequently local changes are synchronized with the remote mail " -"server. The interval must be at least 30 seconds." -msgstr "" -"Kontrollerer hvor ofte lokale ændringer synkroniseres med den fjerne e-" -"postserver. Intervallet skal være mindst 30 sekunder." +#: ../mail/mail-config.glade.h:91 +msgid "Fix_ed width Font:" +msgstr "_Fastbredde-skrifttype:" -#: ../mail/evolution-mail.schemas.in.h:18 -msgid "Custom headers to use while checking for junk." -msgstr "Tilpassede brevhoveder der skal bruges mens der kontrolleres for spam." +#: ../mail/mail-config.glade.h:92 +msgid "Font Properties" +msgstr "Skrifttypeegenskaber" -#: ../mail/evolution-mail.schemas.in.h:19 -msgid "" -"Custom headers to use while checking for junk. The list elements are string " -"in the format \"headername=value\"." -msgstr "" -"Tilpassede brevhoveder der skal bruges, mens der kontrolleres for spam. " -"Listelementerne er strenge på formen \"brevhovednavn=værdi\"." +#: ../mail/mail-config.glade.h:93 +msgid "Format messages in _HTML" +msgstr "Formatér breve som _HTML" -#: ../mail/evolution-mail.schemas.in.h:20 -msgid "Default charset in which to compose messages" -msgstr "Standardtegnkodning ved skrivning af breve" +#: ../mail/mail-config.glade.h:94 +msgid "Full Nam_e:" +msgstr "Fuld_e navn:" -#: ../mail/evolution-mail.schemas.in.h:21 -msgid "Default charset in which to compose messages." -msgstr "Standardtegnkodning ved skrivning af breve." +#: ../mail/mail-config.glade.h:96 +msgid "HTML Messages" +msgstr "HTML-Breve" -#: ../mail/evolution-mail.schemas.in.h:22 -msgid "Default charset in which to display messages" -msgstr "Standardtegnkodning ved visning af breve" +#: ../mail/mail-config.glade.h:97 +msgid "H_TTP Proxy:" +msgstr "H_TTP-Proxy:" -#: ../mail/evolution-mail.schemas.in.h:23 -msgid "Default charset in which to display messages." -msgstr "Standardtegnkodning ved visning af breve." +#: ../mail/mail-config.glade.h:98 +msgid "Headers" +msgstr "Brevhoved" -#: ../mail/evolution-mail.schemas.in.h:24 -msgid "Default forward style" -msgstr "Standardstil for videresending" +#: ../mail/mail-config.glade.h:99 +msgid "Highlight _quotations with" +msgstr "Markér _citat med" -#: ../mail/evolution-mail.schemas.in.h:25 -msgid "Default height of the Composer Window." -msgstr "Standardhøjde af skrivevinduet." +#: ../mail/mail-config.glade.h:102 +msgid "KB" +msgstr "Kb" -#: ../mail/evolution-mail.schemas.in.h:26 -msgid "Default height of the message window." -msgstr "Standardhøjde af brevvinduet." +#: ../mail/mail-config.glade.h:103 ../mail/message-list.etspec.h:8 +msgid "Labels" +msgstr "Mærkater" -#: ../mail/evolution-mail.schemas.in.h:27 -msgid "Default height of the subscribe dialog." -msgstr "Standardhøjde af abonnementsvinduet." +#: ../mail/mail-config.glade.h:104 +msgid "Languages Table" +msgstr "Sprogtabel" -#: ../mail/evolution-mail.schemas.in.h:28 -msgid "Default reply style" -msgstr "Standardstil for svar" +#: ../mail/mail-config.glade.h:105 +msgid "Mail Configuration" +msgstr "Opsætning af postsystem" -#: ../mail/evolution-mail.schemas.in.h:29 -msgid "Default value for thread expand state" -msgstr "Standardværdi for udfoldningen af en tråd" +#: ../mail/mail-config.glade.h:106 +msgid "Mail Headers Table" +msgstr "Brevhovedtabel" -#: ../mail/evolution-mail.schemas.in.h:30 -msgid "Default width of the Composer Window." -msgstr "Standardbredde af skrivevinduet." +#: ../mail/mail-config.glade.h:108 +msgid "Mailbox location" +msgstr "Placering af brevbakke" -#: ../mail/evolution-mail.schemas.in.h:31 -msgid "Default width of the message window." -msgstr "Standardbredde af brevvinduet." +#: ../mail/mail-config.glade.h:109 +msgid "Message Composer" +msgstr "Brevredigering" -#: ../mail/evolution-mail.schemas.in.h:32 -msgid "Default width of the subscribe dialog." -msgstr "Standardbredde af abonnementsvinduet." +#: ../mail/mail-config.glade.h:110 +msgid "No _Proxy for:" +msgstr "Ingen _proxy for:" -#: ../mail/evolution-mail.schemas.in.h:33 +#: ../mail/mail-config.glade.h:111 msgid "" -"Determines whether to look up addresses for junk filtering in local address " -"book only" +"Note: Underscore in the label name is used as mnemonic identifier in menu." msgstr "" -"Afgør hvorvidt der kun skal søges efter adresser i den lokale adressebog i " -"forbindelse med spamfiltrering" - -#: ../mail/evolution-mail.schemas.in.h:34 -msgid "Determines whether to lookup in address book for sender email" -msgstr "Afgør hvorvidt der skal søges efter afsenderadresse i adressebog" +"Bemærk: Bundstreger i mærkatnavnet bliver brugt som mnemoteknisk id i menuen." -#: ../mail/evolution-mail.schemas.in.h:35 +#: ../mail/mail-config.glade.h:112 msgid "" -"Determines whether to lookup the sender email in address book. If found, it " -"shouldn't be a spam. It looks up in the books marked for autocompletion. It " -"can be slow, if remote address books (like LDAP) are marked for " -"autocompletion." +"Note: you will not be prompted for a password until you connect for the " +"first time" msgstr "" -"Afgør hvorvidt der skal søges efter afsenderadresse i adressebogen. Hvis den " -"bliver fundet skulle det ikke være spam. Der søges i bøger markeret til " -"autofuldførelse. Dette kan være langsomt, hvis fjerne adressebøger (som f." -"eks. ldap) er markeret til autofuldførelse." +"Bemærk: du bliver ikke spurgt om adgangskoden før du tilslutter første gang" -#: ../mail/evolution-mail.schemas.in.h:36 -msgid "Determines whether to use custom headers to check for junk" +#: ../mail/mail-config.glade.h:113 +msgid "Option is ignored if a match for custom junk headers is found." msgstr "" -"Afgør om der skal anvendes brugertilpassede brevhoveder til at kontrollere " -"for spam" +"Denne valgmulighed vil blive ignoreret, hvis der er et træf med tilpassede " +"spam-brevhoveder." -#: ../mail/evolution-mail.schemas.in.h:37 +#: ../mail/mail-config.glade.h:114 +msgid "Or_ganization:" +msgstr "Or_ganisation:" + +#: ../mail/mail-config.glade.h:115 +msgid "PGP/GPG _Key ID:" +msgstr "PGP/GPG-_nøgleid:" + +#: ../mail/mail-config.glade.h:116 +msgid "Pass_word:" +msgstr "Adgangs_kode:" + +#: ../mail/mail-config.glade.h:118 msgid "" -"Determines whether to use custom headers to check for junk. If this option " -"is enabled and the headers are mentioned, it will be improve the junk " -"checking speed." +"Please enter a descriptive name for this account in the space below.\n" +"This name will be used for display purposes only." msgstr "" -"Afgør om der skal anvendes brugertilpassede brevhoveder til at kontrollere " -"for spam. Hvis denne valgmulighed er slået til og brevhovederne er nævnt vil " -"det forbedre spam-søgningshastigheden." +"Angiv venligst et beskrivende navn for denne konto på pladsen nedenfor.\n" +"Dette navn vil kun blive brugt til fremvisningsformål." -#: ../mail/evolution-mail.schemas.in.h:38 +#: ../mail/mail-config.glade.h:120 msgid "" -"Determines whether to use the same fonts for both \"From\" and \"Subject\" " -"lines in the \"Messages\" column in vertical view." +"Please enter information about the way you will send mail. If you are not " +"sure, ask your system administrator or Internet Service Provider." msgstr "" -"Afgør hvorvidt der skal bruges den samme skrifttype til både \"Fra\" og " -"\"Emne\"-linjerne i \"Brev\"-kolonnen i lodret visning." +"Angiv information om hvordan du vil sende e-post. Hvis du ikke er sikker bør " +"du spørge din systemadministrator eller Internetleverandør." -#: ../mail/evolution-mail.schemas.in.h:39 -msgid "Directory for loading/attaching files to composer." -msgstr "Mappe til at indlæse/vedhæfte filer i skrivevindue." +#: ../mail/mail-config.glade.h:121 +msgid "" +"Please enter your name and email address below. The \"optional\" fields " +"below do not need to be filled in, unless you wish to include this " +"information in email you send." +msgstr "" +"Angiv dit navn og din e-post-adresse nedenfor. De \"valgfrie\" felter " +"nedenfor behøver ikke at blive udfyldt, medmindre du ønsker at inkludere " +"disse oplysninger i den e-post du sender." -#: ../mail/evolution-mail.schemas.in.h:40 -msgid "Directory for saving mail component files." -msgstr "Mappe hvor post-komponentfilerne skal gemmes." +#: ../mail/mail-config.glade.h:122 +msgid "Please select among the following options" +msgstr "Vælg venligst mellem følgende valgmuligheder" -#: ../mail/evolution-mail.schemas.in.h:41 -msgid "Disable or enable ellipsizing of folder names in side bar" -msgstr "Slå forkortelse af mappenavne i sidepanelet til eller fra" +#: ../mail/mail-config.glade.h:123 +msgid "Port:" +msgstr "Port:" -#: ../mail/evolution-mail.schemas.in.h:42 -msgid "Draw spelling error indicators on words as you type." -msgstr "Vis indikatorer for stavefejl mens du skriver." +#: ../mail/mail-config.glade.h:124 +msgid "Pr_ompt when sending messages with only Bcc recipients defined" +msgstr "Sp_ørg når der sendes breve kun med blindkopimodtagere" -#: ../mail/evolution-mail.schemas.in.h:43 -msgid "Empty Junk folders on exit" -msgstr "Tøm spammapper ved afslutning" +#: ../mail/mail-config.glade.h:125 +msgid "Re_member password" +msgstr "_Husk adgangskode" -#: ../mail/evolution-mail.schemas.in.h:44 -msgid "Empty Trash folders on exit" -msgstr "Tøm affaldsmapper ved afslutning" +#: ../mail/mail-config.glade.h:126 +msgid "Re_ply-To:" +msgstr "Sva_r-til:" -#: ../mail/evolution-mail.schemas.in.h:45 -msgid "Empty all Junk folders when exiting Evolution." -msgstr "Tøm alle spammapper når Evolution afslutter." +#: ../mail/mail-config.glade.h:128 +msgid "Remember _password" +msgstr "Husk _adgangskode" -#: ../mail/evolution-mail.schemas.in.h:46 -msgid "Empty all Trash folders when exiting Evolution." -msgstr "Tøm alle affaldsmapper når Evolution afslutter." +#: ../mail/mail-config.glade.h:129 +msgid "S_earch for sender photograph only in local address books" +msgstr "S_øg kun efter afsenderens foto i de lokale adressebøger" -#: ../mail/evolution-mail.schemas.in.h:47 -msgid "Enable caret mode, so that you can see a cursor when reading mail." -msgstr "" -"Aktivér markøtilstand således at du kan se en markør når du læser post." +#: ../mail/mail-config.glade.h:130 +msgid "S_elect..." +msgstr "_Vælg..." -#: ../mail/evolution-mail.schemas.in.h:48 -msgid "Enable or disable magic space bar" -msgstr "Slå magisk mellemrumstast til eller fra" +#: ../mail/mail-config.glade.h:131 +msgid "S_end message receipts:" +msgstr "S_end kvitteringer for breve:" -#: ../mail/evolution-mail.schemas.in.h:49 -msgid "Enable or disable type ahead search feature" -msgstr "Aktivér eller deaktivér tast-og-find søgefunktionen" +#: ../mail/mail-config.glade.h:132 +msgid "S_tandard Font:" +msgstr "Stan_dard-skrifttype:" -#: ../mail/evolution-mail.schemas.in.h:50 -msgid "Enable search folders" -msgstr "Slå søgemapper til" +#: ../mail/mail-config.glade.h:134 +msgid "Select HTML fixed width font" +msgstr "Vælg HTML-skrifttype med fast bredde" -#: ../mail/evolution-mail.schemas.in.h:51 -msgid "Enable search folders on startup." -msgstr "Slå søgemapper til ved opstart." +#: ../mail/mail-config.glade.h:135 +msgid "Select HTML fixed width font for printing" +msgstr "Vælg HTML-skrifttype med fast bredde til udskrivning" -#: ../mail/evolution-mail.schemas.in.h:52 -msgid "" -"Enable side bar search feature so that you can start interactive searching " -"by typing in the text. Use is that you can easily find a folder in that side " -"bar by just typing the folder name and the selection jumps automatically to " -"that folder." -msgstr "" -"Aktivér sidepanelet, så du kan starte en interaktiv søgning ved at indtaste " -"søgeteksten. Man kan f.eks. let finde en mappe ved simpelthen at indtaste " -"dens navn og derefter hoppe til denne mappe." +#: ../mail/mail-config.glade.h:136 +msgid "Select HTML variable width font" +msgstr "Vælg HTML-skrifttype med variabel bredde" -#: ../mail/evolution-mail.schemas.in.h:53 -msgid "" -"Enable this to use Space bar key to scroll in message preview, message list " -"and folders." -msgstr "" -"Slå denne til for at bruge mellemrumstasten til at rulle ned gennem brev-" -"forhåndsvisning, brevindeks og mapper." +#: ../mail/mail-config.glade.h:137 +msgid "Select HTML variable width font for printing" +msgstr "Vælg HTML-skrifttype med variabel bredde til udskrift" -#: ../mail/evolution-mail.schemas.in.h:54 -msgid "Enable to render message text part of limited size." -msgstr "Aktivér for at tegne beskedtekstdel af begrænset størrelse." +#: ../mail/mail-config.glade.h:139 +msgid "Sending Mail" +msgstr "Sender brev(e)" -#: ../mail/evolution-mail.schemas.in.h:55 -msgid "Enable/disable caret mode" -msgstr "Aktivér / deaktivér markørtilstand" +#: ../mail/mail-config.glade.h:140 +msgid "Sent _Messages Folder:" +msgstr "Mappe til sendte _breve:" -#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81 -msgid "Encode file names in an Outlook/GMail way" -msgstr "Indkod filnavne på en Outlook/GMail-måde" +#: ../mail/mail-config.glade.h:141 +msgid "Ser_ver requires authentication" +msgstr "Server kræver _godkendelse" -# Oh my -#: ../mail/evolution-mail.schemas.in.h:57 -msgid "" -"Encode file names in the mail headers same as Outlook or GMail does, to let " -"them understand localized file names sent by Evolution, because they do not " -"follow the RFC 2231, but uses incorrect RFC 2047 standard." -msgstr "" -"Indkod filnavne i brevhoveder på samme måde som Outlook eller GMail gør for " -"at gøre det muligt for dem at forstå lokaliserede filnavne, som bliver sendt " -"af Evolution, fordi de ikke følger RFC 2231, men bruger den ukorrekte RFC " -"2047-standard." +#: ../mail/mail-config.glade.h:142 +msgid "Server _Type: " +msgstr "Server_type: " -#: ../mail/evolution-mail.schemas.in.h:58 -msgid "Height of the message-list pane" -msgstr "Højden på vinduet med brevindekset" +#: ../mail/mail-config.glade.h:143 +msgid "Sig_ning certificate:" +msgstr "_Certifikat til signatur:" -#: ../mail/evolution-mail.schemas.in.h:59 -msgid "Height of the message-list pane." -msgstr "Højden på vinduet med brevindekset." +#: ../mail/mail-config.glade.h:144 +msgid "Signat_ure:" +msgstr "Signat_ur:" -# Hmm, ophæver markeringen eller fjerner det der er markeret. Nå denne her oversættelse er lige så tvetydig som originalen -#: ../mail/evolution-mail.schemas.in.h:60 -msgid "Hides the per-folder preview and removes the selection" -msgstr "Skjuler per-mappe-forhåndsvisning og fjerner markeringen" +#: ../mail/mail-config.glade.h:145 +msgid "Signatures" +msgstr "Signaturer" -#: ../mail/evolution-mail.schemas.in.h:61 -msgid "" -"If a user tries to open 10 or more messages at one time, ask the user if " -"they really want to do it." -msgstr "" -"Hvis en bruger forsøger at åbne 10 eller flere breve på en gang, så spørg om " -"brugeren virkelig ønsker det." +#: ../mail/mail-config.glade.h:146 +msgid "Signatures Table" +msgstr "Signaturtabel" -#: ../mail/evolution-mail.schemas.in.h:62 -msgid "" -"If the \"Preview\" pane is on, then show it side-by-side rather than " -"vertically." -msgstr "" -"Hvis forhåndsvisningsruden er synlig, så vis den ved siden af, i stedet for " -"ovenfor." +#: ../mail/mail-config.glade.h:147 +msgid "Spell Checking" +msgstr "Stavekontrol" -#: ../mail/evolution-mail.schemas.in.h:63 -msgid "" -"If there isn't a builtin viewer for a particular MIME type inside Evolution, " -"any MIME types appearing in this list which map to a Bonobo component viewer " -"in GNOME's MIME type database may be used for displaying content." -msgstr "" -"Hvis der ikke er indbygget visning for en bestemt MIME-type inden i " -"Evolution, vil en hvilken som helst MIME-type i denne liste, som er " -"afbilledet i en bonobo komponentvisning i GNOME's MIME-typedatabase, blive " -"brugt til at vise indholdet." +#: ../mail/mail-config.glade.h:148 +msgid "Start _typing at the bottom on replying" +msgstr "Påbegynd _skrivning i bunden når der svares" -#: ../mail/evolution-mail.schemas.in.h:64 -msgid "" -"Initial height of the \"Send and Receive Mail\" window. The value updates as " -"the user resizes the window vertically." -msgstr "" -"Højden af \"Send og modtag e-post\"-vinduet ved start. Værdien opdateres når " -"brugeren ændrer vinduet vertikalt." +#: ../mail/mail-config.glade.h:149 +msgid "T_ype: " +msgstr "_Type: " -#: ../mail/evolution-mail.schemas.in.h:65 +#: ../mail/mail-config.glade.h:150 msgid "" -"Initial maximize state of the \"Send and Receive Mail\" window. The value " -"updates when the user maximizes or unmaximizes the window. Note, this " -"particular value is not used by Evolution since the \"Send and Receive Mail" -"\" window cannot be maximized. This key exists only as an implementation " -"detail." +"The list of languages here reflects only the languages for which you have a " +"dictionary installed." msgstr "" -"Maksimeringstilstanden af \"Send og modtag e-post\"-vinduet ved start. " -"Værdien opdateres når brugeren maksimerer eller af-maksimerer vinduet. " -"Bemærk at denne værdi ikke bruges af Evolution, eftersom \"Send og modtag e-" -"post\"-vinduet ikke kan maksimeres. Nøglen eksisterer udelukkende som en " -"implementeringsdetalje." +"Listen med sprog viser kun de sprog for hvilke en ordbog er installeret." -#: ../mail/evolution-mail.schemas.in.h:66 +#: ../mail/mail-config.glade.h:151 msgid "" -"Initial width of the \"Send and Receive Mail\" window. The value updates as " -"the user resizes the window horizontally." +"The output of this script will be used as your\n" +"signature. The name you specify will be used\n" +"for display purposes only. " msgstr "" -"Bredde af \"Send og modtag e-post\"-vinduet ved start. Værdien opdateres når " -"brugeren ændrer vinduet horisontalt." - -#: ../mail/evolution-mail.schemas.in.h:67 -msgid "It disables/enables the prompt while marking multiple messages." -msgstr "Deaktiverer/aktiverer spørgsmål mens der markeres flere breve." +"Uddata fra dette skript vil blive brugt som\n" +"din signatur. Navnet du angiver vil kun blive\n" +"brugt ved visning. " -#: ../mail/evolution-mail.schemas.in.h:68 +#: ../mail/mail-config.glade.h:154 msgid "" -"It disables/enables the repeated prompts to ask if offline sync is required " -"before going into offline mode." +"Type the name by which you would like to refer to this account.\n" +"For example: \"Work\" or \"Personal\"" msgstr "" -"Deaktiverer/aktiverer de gentagne forespørgsler om hvorvidt der skal " -"synkroniseres ved overgang til afkoblet tilstand." +"Indtast navnet som skal henvise til denne konto.\n" +"For eksempel: \"Job\" eller \"Personlig\"" -#: ../mail/evolution-mail.schemas.in.h:69 -msgid "" -"It disables/enables the repeated prompts to warn that deleting messages from " -"a search folder permanently deletes the message, not simply removing it from " -"the search results." -msgstr "" -"Deaktiverer/aktiverer de gentagne advarsler om at hvis et brev slettes i en " -"søgefolder, slettes brevet rigtig og ikke kun i søgeresultatet." +#: ../mail/mail-config.glade.h:156 +msgid "Us_ername:" +msgstr "Bruger_navn:" -#: ../mail/evolution-mail.schemas.in.h:70 -msgid "Last time empty junk was run" -msgstr "Sidst gang tøm spam blev udført" +#: ../mail/mail-config.glade.h:157 +msgid "Use Authe_ntication" +msgstr "Brug godkendelse" -#: ../mail/evolution-mail.schemas.in.h:71 -msgid "Last time empty trash was run" -msgstr "Sidst gang tøm affald blev udført" +#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:405 +#: ../plugins/google-account-setup/google-source.c:613 +#: ../plugins/google-account-setup/google-contacts-source.c:280 +#: ../plugins/webdav-account-setup/webdav-contacts-source.c:308 +msgid "User_name:" +msgstr "Bruger_navn:" -#: ../mail/evolution-mail.schemas.in.h:73 -msgid "List of Labels and their associated colors" -msgstr "Liste over mærkninger og deres associerede farver" +#: ../mail/mail-config.glade.h:159 +msgid "V_ariable-width:" +msgstr "V_ariabel bredde:" -#: ../mail/evolution-mail.schemas.in.h:74 -msgid "List of MIME types to check for Bonobo component viewers" +#: ../mail/mail-config.glade.h:160 +msgid "" +"Welcome to the Evolution Mail Configuration Assistant.\n" +"\n" +"Click \"Forward\" to begin. " msgstr "" -"Liste over MIME-typer, som skal kontrolleres for bonobo komponentfremvisere" +"Velkommen til assistenten for konfiguration af Evolution e-post.\n" +"\n" +"Klik \"Fremad\" for at begynde. " -#: ../mail/evolution-mail.schemas.in.h:75 -msgid "List of accepted licenses" -msgstr "Liste over accepterede licenser" +#: ../mail/mail-config.glade.h:163 +msgid "_Add Signature" +msgstr "_Tilføj signatur" -#: ../mail/evolution-mail.schemas.in.h:76 -msgid "List of accounts" -msgstr "Liste over konti" +#: ../mail/mail-config.glade.h:164 +msgid "_Always load images from the Internet" +msgstr "_Indlæs altid billeder fra internettet" -#: ../mail/evolution-mail.schemas.in.h:77 -msgid "" -"List of accounts known to the mail component of Evolution. The list contains " -"strings naming subdirectories relative to /apps/evolution/mail/accounts." -msgstr "" -"Liste over konti som Evolutions e-post-komponent kender. Listen indeholder " -"navnene på undermapperne i /apps/evolution/mail/accounts." +#: ../mail/mail-config.glade.h:165 +msgid "_Default junk plugin:" +msgstr "_Forvalgt spam-udvidelsesmodul:" -#: ../mail/evolution-mail.schemas.in.h:78 -msgid "List of custom headers and whether they are enabled." -msgstr "Liste over tilpassede hoveder og om de er aktiveret." +#: ../mail/mail-config.glade.h:166 +msgid "_Direct connection to the Internet" +msgstr "_Direkte forbindelse til internettet" -#: ../mail/evolution-mail.schemas.in.h:79 -msgid "List of dictionary language codes used for spell checking." -msgstr "Liste af ordbogs-sprogkoder som bruges ved stavekontrol." +#: ../mail/mail-config.glade.h:167 +msgid "_Do not sign meeting requests (for Outlook compatibility)" +msgstr "Signér _ikke mødeindkaldelser (for kompatibilitet med Outlook)" -#: ../mail/evolution-mail.schemas.in.h:80 -msgid "" -"List of labels known to the mail component of Evolution. The list contains " -"strings containing name:color where color uses the HTML hex encoding." -msgstr "" -"Liste over mærkninger som Evolutions e-post-komponent kender. Listen " -"indeholder strenge indeholdende navn:farve, hvor farve benytter sig af HTML-" -"hex-kodning." +#: ../mail/mail-config.glade.h:169 +msgid "_Forward style:" +msgstr "_Videresendelsesformat:" -#: ../mail/evolution-mail.schemas.in.h:81 -msgid "List of protocol names whose license has been accepted." -msgstr "Liste over protokolnavne hvis licens er blevet accepteret." +#: ../mail/mail-config.glade.h:170 +msgid "_Keep Signature above the original message on replying" +msgstr "_Hold signaturen over den oprindelige besked ved svar" -#: ../mail/evolution-mail.schemas.in.h:82 -msgid "Load images for HTML messages over HTTP" -msgstr "Indlæs billeder for HTML-breve via HTTP" +#: ../mail/mail-config.glade.h:171 +msgid "_Load images in messages from contacts" +msgstr "_Indlæs billeder i breve fra kontaktpersoner" -#: ../mail/evolution-mail.schemas.in.h:83 -msgid "" -"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - " -"Never load images off the net. \"1\" - Load images in messages from " -"contacts. \"2\" - Always load images off the net." -msgstr "" -"Indlæs billeder i HTML-breve via HTTP(S). Mulige værdier er: \"0\" - Indlæs " -"aldrig billeder fra nettet. \"1\" - Indlæs billeder hvis afsenderen findes i " -"adressebogen. \"2\" - Indlæs altid billeder fra nettet." +#: ../mail/mail-config.glade.h:172 +msgid "_Lookup in local address book only" +msgstr "_Søg kun i lokale adressebøger" -#: ../mail/evolution-mail.schemas.in.h:84 -msgid "Log filter actions" -msgstr "Log filterhandlinger" +#: ../mail/mail-config.glade.h:173 +msgid "_Make this my default account" +msgstr "_Gør dette til min standardkonto" -#: ../mail/evolution-mail.schemas.in.h:85 -msgid "Log filter actions to the specified log file." -msgstr "Log filterhandlinger til den angivne logfil." +#: ../mail/mail-config.glade.h:174 +msgid "_Manual proxy configuration:" +msgstr "_Manuel proxykonfiguration:" -#: ../mail/evolution-mail.schemas.in.h:86 -msgid "Logfile to log filter actions" -msgstr "Logfilen for filterhandlinger" +#: ../mail/mail-config.glade.h:175 +msgid "_Mark messages as read after" +msgstr "Markér breve som l_æste efter" -#: ../mail/evolution-mail.schemas.in.h:87 -msgid "Logfile to log filter actions." -msgstr "Logfilen for filterhandlinger." +#: ../mail/mail-config.glade.h:177 +msgid "_Never load images from the Internet" +msgstr "Indlæs _aldrig billeder fra internettet" -#: ../mail/evolution-mail.schemas.in.h:88 -msgid "Mark as Seen after specified timeout" -msgstr "Markér som set efter angivet tidsgrænse" +#: ../mail/mail-config.glade.h:178 +msgid "_Path:" +msgstr "S_ti:" -#: ../mail/evolution-mail.schemas.in.h:89 -msgid "Mark as Seen after specified timeout." -msgstr "Markér som set efter angivet tidsgrænse." +#: ../mail/mail-config.glade.h:179 +msgid "_Prompt on sending HTML mail to contacts that do not want them" +msgstr "_Spørg når HTML-breve sendes til kontaktpersoner som ikke vil have dem" -#: ../mail/evolution-mail.schemas.in.h:90 -msgid "Mark citations in the message \"Preview\"" -msgstr "Markér citater i forhåndsvisningen af breve" +#: ../mail/mail-config.glade.h:180 +msgid "_Prompt when sending messages with an empty subject line" +msgstr "Spørg når breve sendes med en _tom emnelinie" -#: ../mail/evolution-mail.schemas.in.h:91 -msgid "Mark citations in the message \"Preview\"." -msgstr "Markér citater i forhåndsvisningen af breve." +#: ../mail/mail-config.glade.h:181 +msgid "_Reply style:" +msgstr "_Svarsstil:" -#: ../mail/evolution-mail.schemas.in.h:92 -msgid "Message Window default height" -msgstr "Standardhøjden på brevvinduet" +#: ../mail/mail-config.glade.h:182 +msgid "_Script:" +msgstr "_Skript:" -#: ../mail/evolution-mail.schemas.in.h:93 -msgid "Message Window default width" -msgstr "Standardbredden på brevvinduet" +#: ../mail/mail-config.glade.h:183 +msgid "_Secure HTTP Proxy:" +msgstr "_Sikker HTTP-proxy:" -#: ../mail/evolution-mail.schemas.in.h:94 -msgid "Message-display style (\"normal\", \"full headers\", \"source\")" -msgstr "Stil for brevvisning (\"normal\", \"full headers\", \"source\")" +#: ../mail/mail-config.glade.h:184 +msgid "_Select..." +msgstr "_Vælg..." -#: ../mail/evolution-mail.schemas.in.h:95 -msgid "Minimum days between emptying the junk on exit" -msgstr "Minimum antal dage mellem tømning af spammapper ved afslutning" +#. If enabled, show animation; if disabled, only display a static image without any animation +#: ../mail/mail-config.glade.h:187 +msgid "_Show image animations" +msgstr "_Vis billed-animationer" -#: ../mail/evolution-mail.schemas.in.h:96 -msgid "Minimum days between emptying the trash on exit" -msgstr "Minimum antal dage mellem tømning af affald ved afslutning" +#: ../mail/mail-config.glade.h:188 +msgid "_Show the photograph of sender in the message preview" +msgstr "_Vis afsenderens foto i forhåndsvisning af e-breve" -#: ../mail/evolution-mail.schemas.in.h:97 -msgid "Minimum time between emptying the junk on exit, in days." -msgstr "Minimum tid mellem tømning af spammapper ved afslutning i dage." +#: ../mail/mail-config.glade.h:189 +msgid "_Shrink To / Cc / Bcc headers to " +msgstr "Begræns synlige _To-/CC-/Bcc-linjer til " -#: ../mail/evolution-mail.schemas.in.h:98 -msgid "Minimum time between emptying the trash on exit, in days." -msgstr "Minimum tid mellem tømning af affald ved afslutning i dage." +#: ../mail/mail-config.glade.h:190 +msgid "_Use Secure Connection:" +msgstr "_Brug sikker forbindelse:" -#: ../mail/evolution-mail.schemas.in.h:99 -msgid "Number of addresses to display in TO/CC/BCC" -msgstr "Antal adresser der skal vises i TO/CC/BCC" +#: ../mail/mail-config.glade.h:191 +msgid "_Use system defaults" +msgstr "_Benyt systemforvalg" -#: ../mail/evolution-mail.schemas.in.h:100 -msgid "Prompt on empty subject" -msgstr "Spørg ved tomt emne" +#: ../mail/mail-config.glade.h:192 +msgid "_Use the same fonts as other applications" +msgstr "Br_ug de samme skrifttyper som andre programmer" -#: ../mail/evolution-mail.schemas.in.h:101 -msgid "Prompt the user when he or she tries to expunge a folder." -msgstr "Spørg brugeren når han eller hun prøver at tømme en folder." +#: ../mail/mail-config.glade.h:195 +msgid "addresses" +msgstr "adresser" -#: ../mail/evolution-mail.schemas.in.h:102 -msgid "" -"Prompt the user when he or she tries to send a message without a Subject." -msgstr "Spørg brugeren når han eller hun forsøger at sende breve uden emne." +#: ../mail/mail-config.glade.h:196 +msgid "color" +msgstr "farve" -#: ../mail/evolution-mail.schemas.in.h:103 -msgid "Prompt to check if the user wants to go offline immediately" -msgstr "Spørg for at kontrollere om brugeren vil koble af med det samme" +#: ../mail/mail-config.glade.h:197 +msgid "description" +msgstr "beskrivelse" -#: ../mail/evolution-mail.schemas.in.h:104 -msgid "Prompt when deleting messages in search folder" -msgstr "Spørg når breve slettes i søgemappe" +#: ../mail/mail-config.glade.h:198 +msgid "seconds" +msgstr "sekunder" -#: ../mail/evolution-mail.schemas.in.h:105 -msgid "Prompt when user expunges" -msgstr "Spørg når brugeren tømmer" +#: ../mail/mail-dialogs.glade.h:1 +msgid " " +msgstr " " -#: ../mail/evolution-mail.schemas.in.h:106 -msgid "Prompt when user only fills Bcc" -msgstr "Spørg når brugeren kun udfylder Bcc-feltet" +#: ../mail/mail-dialogs.glade.h:2 +msgid "Search Folder Sources" +msgstr "Søgemappe-kilder" -#: ../mail/evolution-mail.schemas.in.h:107 -msgid "Prompt when user tries to open 10 or more messages at once" -msgstr "Spørg når brugeren forsøger at åbne 10 eller flere breve på en gang" +#: ../mail/mail-dialogs.glade.h:3 +msgid "Digital Signature" +msgstr "Digital signatur" -#: ../mail/evolution-mail.schemas.in.h:108 -msgid "" -"Prompt when user tries to send HTML mail to recipients that may not want to " -"receive HTML mail." -msgstr "" -"Spørg når breve i HTML-format sendes til modtagere der måske ikke vil have " -"dem." +#: ../mail/mail-dialogs.glade.h:4 +msgid "Encryption" +msgstr "Kryptering" -#: ../mail/evolution-mail.schemas.in.h:109 -msgid "Prompt when user tries to send a message with no To or Cc recipients." -msgstr "Spørg når der sendes breve uden modtagere i Til- eller Cc-felterne." +#: ../mail/mail-dialogs.glade.h:5 +msgid "All active remote folders" +msgstr "Alle aktive, eksterne mapper" -#: ../mail/evolution-mail.schemas.in.h:110 -msgid "Prompt when user tries to send unwanted HTML" -msgstr "Spørg når brugeren prøver at sende uønsket HTML" +#: ../mail/mail-dialogs.glade.h:6 +msgid "All local and active remote folders" +msgstr "Alle lokale og aktive, eksterne mapper" -#: ../mail/evolution-mail.schemas.in.h:111 -msgid "Prompt while marking multiple messages" -msgstr "Spørg når flere breve markeres" +#: ../mail/mail-dialogs.glade.h:7 +msgid "All local folders" +msgstr "Alle lokale mapper" -#: ../mail/evolution-mail.schemas.in.h:112 -msgid "Recognize emoticons in text and replace them with images." -msgstr "Genkend smileyer i tekst og erstat dem med billeder." +#: ../mail/mail-dialogs.glade.h:8 +msgid "Co_mpleted" +msgstr "_Fuldført" -#: ../mail/evolution-mail.schemas.in.h:113 -msgid "Recognize links in text and replace them." -msgstr "Genkend links i tekst og erstat dem." +#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:275 +msgid "Flag to Follow Up" +msgstr "Markér til opfølgning" -#: ../mail/evolution-mail.schemas.in.h:114 -msgid "Run junk test on incoming mail." -msgstr "Udfør spamtest på indgående e-post." +#: ../mail/mail-dialogs.glade.h:10 +msgid "Folder Subscriptions" +msgstr "Mappeabonnementer" -#: ../mail/evolution-mail.schemas.in.h:115 -msgid "Save directory" -msgstr "Gem mappe" +#: ../mail/mail-dialogs.glade.h:11 +msgid "License Agreement" +msgstr "Licensaftale" -#: ../mail/evolution-mail.schemas.in.h:116 -msgid "Search for the sender photo in local address books" -msgstr "Søg efter afsenderfotoet i den lokale adressebog" +#: ../mail/mail-dialogs.glade.h:12 +msgid "S_erver:" +msgstr "S_erver:" -#: ../mail/evolution-mail.schemas.in.h:117 -msgid "Send HTML mail by default" -msgstr "Send breve i HTML-format som standard" +#: ../mail/mail-dialogs.glade.h:13 +msgid "Security Information" +msgstr "Sikkerhedsinformation" -#: ../mail/evolution-mail.schemas.in.h:118 -msgid "Send HTML mail by default." -msgstr "Send breve i HTML-format som standard." +#: ../mail/mail-dialogs.glade.h:14 +msgid "Specific folders" +msgstr "Specifikke mapper" -#: ../mail/evolution-mail.schemas.in.h:119 -msgid "Sender email-address column in the message list" -msgstr "Kolonnen for afsender-e-postadresser i brevindeks" +#: ../mail/mail-dialogs.glade.h:15 +msgid "" +"The messages you have selected for follow up are listed below.\n" +"Please select a follow up action from the \"Flag\" menu." +msgstr "" +"De meddelelser som du vil følge op vises nedenfor.\n" +"Vælg en opfølgningshandling fra menupunktet \"Markering\"." -#: ../mail/evolution-mail.schemas.in.h:120 -msgid "Server synchronization interval" -msgstr "Synkroniseringsinterval for server" +#: ../mail/mail-dialogs.glade.h:17 +msgid "_Accept License" +msgstr "_Acceptér licens" -#: ../mail/evolution-mail.schemas.in.h:121 -msgid "Show Animations" -msgstr "Vis animationer" +#: ../mail/mail-dialogs.glade.h:18 +msgid "_Due By:" +msgstr "_Forfalder den:" -#: ../mail/evolution-mail.schemas.in.h:122 -msgid "Show animated images as animations." -msgstr "Vis animerede billeder som animationer." +#: ../mail/mail-dialogs.glade.h:19 +msgid "_Flag:" +msgstr "_Markering:" -#: ../mail/evolution-mail.schemas.in.h:123 -msgid "Show deleted messages (with a strike-through) in the message-list." -msgstr "Vis slettede breve med gennemstregning i brevlisten." +#: ../mail/mail-dialogs.glade.h:20 +msgid "_Tick this to accept the license agreement" +msgstr "_Afkryds dette for at acceptere licensaftalen" -#: ../mail/evolution-mail.schemas.in.h:124 -msgid "Show deleted messages in the message-list" -msgstr "Vis slettede breve i brevlisten" +#: ../mail/mail-folder-cache.c:835 +#, c-format +msgid "Pinging %s" +msgstr "Pinger %s" -#: ../mail/evolution-mail.schemas.in.h:125 -msgid "Show photo of the sender" -msgstr "Vis foto af afsenderen" +#: ../mail/mail-ops.c:107 +msgid "Filtering Selected Messages" +msgstr "Filtrerer valgte beskeder" -#: ../mail/evolution-mail.schemas.in.h:128 +#: ../mail/mail-ops.c:266 +msgid "Fetching Mail" +msgstr "Henter e-post" + +#. sending mail, filtering failed +#: ../mail/mail-ops.c:562 +#, c-format +msgid "Failed to apply outgoing filters: %s" +msgstr "Det mislykkedes at anvende de udgående filtre: %s" + +#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:603 +#, c-format msgid "" -"Show the email-address of the sender in a separate column in the message " -"list." -msgstr "Vis afsenderens e-postadresse i en separat kolonne i brevindeks." +"Failed to append to %s: %s\n" +"Appending to local `Sent' folder instead." +msgstr "" +"Det mislykkedes at føje til %s: %s\n" +"Føjer til lokal \"Sendt\"-mappe i stedet." -#: ../mail/evolution-mail.schemas.in.h:129 -msgid "Show the photo of the sender in the message reading pane." -msgstr "Vis afsenderens foto i brevlæsnings-panelet." +#: ../mail/mail-ops.c:620 +#, c-format +msgid "Failed to append to local `Sent' folder: %s" +msgstr "Det mislykkedes at føje til den lokale \"sendt\"-mappe: %s" -#: ../mail/evolution-mail.schemas.in.h:130 -msgid "Spell check inline" -msgstr "Integreret stavekontrol" +#: ../mail/mail-ops.c:726 ../mail/mail-ops.c:807 +msgid "Sending message" +msgstr "Sender brev" -#: ../mail/evolution-mail.schemas.in.h:131 -msgid "Spell checking color" -msgstr "Stavekontrolfarve" +#: ../mail/mail-ops.c:736 +#, c-format +msgid "Sending message %d of %d" +msgstr "Sender brev %d af %d" -#: ../mail/evolution-mail.schemas.in.h:132 -msgid "Spell checking languages" -msgstr "Stavekontrolsprog" +#: ../mail/mail-ops.c:763 +#, c-format +msgid "Failed to send %d of %d messages" +msgstr "Det mislykkedes at sende %d af %d breve" -#: ../mail/evolution-mail.schemas.in.h:133 -msgid "Subscribe dialog default height" -msgstr "Standardhøjden for abonnementsvinduet" +#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:700 +msgid "Canceled." +msgstr "Annulleret." -#: ../mail/evolution-mail.schemas.in.h:134 -msgid "Subscribe dialog default width" -msgstr "Standardbredde på abonneringsvinduet" +#: ../mail/mail-ops.c:767 ../mail/mail-send-recv.c:702 +msgid "Complete." +msgstr "Fuldført." -#: ../mail/evolution-mail.schemas.in.h:135 -msgid "Terminal font" -msgstr "Terminalskrifttype" +#: ../mail/mail-ops.c:879 +msgid "Saving message to folder" +msgstr "Gemmer brev i mappe" -#: ../mail/evolution-mail.schemas.in.h:136 -msgid "Text message part limit" -msgstr "Grænse for tekstbeskeddel" +#: ../mail/mail-ops.c:956 +#, c-format +msgid "Moving messages to %s" +msgstr "Flytter breve til %s" -#: ../mail/evolution-mail.schemas.in.h:137 -msgid "The default plugin for Junk hook" -msgstr "Standard-udvidelsesmodulet for spam-funktion" +#: ../mail/mail-ops.c:956 +#, c-format +msgid "Copying messages to %s" +msgstr "Kopierer breve til %s" -#: ../mail/evolution-mail.schemas.in.h:138 -msgid "The last time empty junk was run, in days since the epoch." -msgstr "Sidste gang spammapperne blev tømt, målt i dage siden epoken." +#: ../mail/mail-ops.c:1173 +msgid "Forwarded messages" +msgstr "Videresendte breve" -#: ../mail/evolution-mail.schemas.in.h:139 -msgid "The last time empty trash was run, in days since the epoch." -msgstr "Sidste gang affaldet blev tømt, målt i dage siden epoken." +#: ../mail/mail-ops.c:1214 +#, c-format +msgid "Opening folder %s" +msgstr "Åbner mappe %s" -#: ../mail/evolution-mail.schemas.in.h:140 -msgid "The terminal font for mail display." -msgstr "Terminalskrifttypen ved visning af brev." +#: ../mail/mail-ops.c:1279 +#, c-format +msgid "Retrieving quota information for folder %s" +msgstr "Henter kvoteinformation for mappen %s" -#: ../mail/evolution-mail.schemas.in.h:141 -msgid "The variable width font for mail display." -msgstr "Skrifttypen med variabel bredde til visning af e-post." +#: ../mail/mail-ops.c:1348 +#, c-format +msgid "Opening store %s" +msgstr "Åbner opbevaringssted %s" -#: ../mail/evolution-mail.schemas.in.h:142 -msgid "" -"This can have three possible values. \"0\" for errors. \"1\" for warnings. " -"\"2\" for debug messages." -msgstr "" -"Kan have tre forskellige værdier. \"0\" for fejl. \"1\" for advarsler. \"2\" " -"for fejlsøgningsbeskeder." +#: ../mail/mail-ops.c:1419 +#, c-format +msgid "Removing folder %s" +msgstr "Fjerner mappe %s" -#: ../mail/evolution-mail.schemas.in.h:143 -msgid "" -"This decides the max size of the text part that can be formatted under " -"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB." -msgstr "" -"Dette bestemmer den maksimale mængde af tekstdelen, som kan blive formateret " -"i evolution. Standarden er 4MB / 4096KB og er angivet i KB." +#: ../mail/mail-ops.c:1537 +#, c-format +msgid "Storing folder '%s'" +msgstr "Gemmer mappe \"%s\"" -#: ../mail/evolution-mail.schemas.in.h:144 -msgid "" -"This is the default junk plugin, even though there are multiple plugins " -"enabled. If the default listed plugin is disabled, then it won't fall back " -"to the other available plugins." -msgstr "" -"Dette er det forvalgte spam-udvidelsesmodul, selv om der er flere af slagsen " -"aktiveret. Hvis det forvalgte udvidelsesmodul er deaktiveret vil der ikke " -"automatisk benyttes et af de andre." +#: ../mail/mail-ops.c:1600 +#, c-format +msgid "Expunging and storing account '%s'" +msgstr "Tømmer og arkiverer kontoen \"%s\"" -#: ../mail/evolution-mail.schemas.in.h:145 -msgid "" -"This key is read only once and reset to \"false\" after read. This unselects " -"the mail in the list and removes the preview for that folder." -msgstr "" -"Denne nøgle læses kun en gang og sættes til \"false\" efter at den er læst. " -"Dette fravælger brevene i listen og fjerner forhåndsvisning for den mappe." +#: ../mail/mail-ops.c:1601 +#, c-format +msgid "Storing account '%s'" +msgstr "Arkiverer konto \"%s\"" -#: ../mail/evolution-mail.schemas.in.h:146 -msgid "" -"This key should contain a list of XML structures specifying custom headers, " -"and whether they are to be displayed. The format of the XML structure is <" -"header enabled> - set enabled if the header is to be displayed in the " -"mail view." -msgstr "" -"Denne nøgle bør indeholde en liste over XML-strukturer der angiver " -"tilpassede hoveder og om de skal vises. Formatet for XML-strukturen er <" -"header enabled> - sæt til enabled hvis hovedet skal vises i e-post-" -"visningen." +#: ../mail/mail-ops.c:1655 +msgid "Refreshing folder" +msgstr "Opfrisker mappe" -#: ../mail/evolution-mail.schemas.in.h:147 -msgid "" -"This option is related to the key lookup_addressbook and is used to " -"determine whether to look up addresses in local address book only to exclude " -"mail sent by known contacts from junk filtering." -msgstr "" -"Denne valgmulighed er relateret til nøglen lookup_adressbook og bruges til " -"at afgøre, hvorvidt der kun skal kigges i den lokale adressebog, når post " -"som er modtaget fra kendte kontaktpersoner, skal ekskluderes fra " -"spamfiltreringen." +#: ../mail/mail-ops.c:1695 ../mail/mail-ops.c:1745 +msgid "Expunging folder" +msgstr "Fjerner slettede breve fra mappe" -#: ../mail/evolution-mail.schemas.in.h:148 -msgid "This option would help in improving the speed of fetching." -msgstr "Denne valgmulighed vil hjælpe med at øge farten hvormed der overføres." +#: ../mail/mail-ops.c:1742 +#, c-format +msgid "Emptying trash in '%s'" +msgstr "Tømmer affald i \"%s\"" -#: ../mail/evolution-mail.schemas.in.h:149 -msgid "" -"This sets the number of addresses to show in default message list view, " -"beyond which a '...' is shown." -msgstr "" -"Dette bestemmer antallet af adresser der som standard vises i brevindekset. " -"Efter dette antal vises \"...\"." +#: ../mail/mail-ops.c:1743 +msgid "Local Folders" +msgstr "Lokale mapper" -#: ../mail/evolution-mail.schemas.in.h:150 +#: ../mail/mail-ops.c:1824 +#, c-format +msgid "Retrieving message %s" +msgstr "Henter brev %s" + +#: ../mail/mail-ops.c:1933 +#, c-format +msgid "Retrieving %d message" +msgid_plural "Retrieving %d messages" +msgstr[0] "Henter %d brev" +msgstr[1] "Henter %d breve" + +#: ../mail/mail-ops.c:2018 +#, c-format +msgid "Saving %d message" +msgid_plural "Saving %d messages" +msgstr[0] "Gemmer %d besked" +msgstr[1] "Gemmer %d beskeder" + +#: ../mail/mail-ops.c:2096 +#, c-format msgid "" -"This setting specifies whether the threads should be in expanded or " -"collapsed state by default. Evolution requires a restart." +"Error saving messages to: %s:\n" +" %s" msgstr "" -"Denne valgmulighed specificerer hvorvidt tråde skal være foldet ud eller " -"klappet sammen til at starte med. Dette kræver en genstart af Evolution." +"Fejl under gemning af breve til: %s:\n" +" %s" -#: ../mail/evolution-mail.schemas.in.h:151 +#: ../mail/mail-ops.c:2168 +msgid "Saving attachment" +msgstr "Gemmer bilag" + +#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194 +#, c-format msgid "" -"This setting specifies whether the threads should be sorted based on latest " -"message in each thread, rather than by message's date. Evolution requires a " -"restart." +"Cannot create output file: %s:\n" +" %s" msgstr "" -"Denne valgmulighed specificerer hvorvidt tråde skal sorteres efter sidste e-" -"brev i tråden i stedet for brevets dato. Dette kræver en genstart af " -"Evolution." +"Kunne ikke oprette uddatafil: %s\n" +" %s" -#: ../mail/evolution-mail.schemas.in.h:152 -msgid "Thread the message list." -msgstr "Benyt trådning i brevindeks." +#: ../mail/mail-ops.c:2209 +#, c-format +msgid "Could not write data: %s" +msgstr "Kunne ikke skrive data: %s" -#: ../mail/evolution-mail.schemas.in.h:153 -msgid "Thread the message-list" -msgstr "Benyt trådning i brevlisten" +#: ../mail/mail-ops.c:2355 +#, c-format +msgid "Disconnecting from %s" +msgstr "Afkobler fra %s" -#: ../mail/evolution-mail.schemas.in.h:154 -msgid "Thread the message-list based on Subject" -msgstr "Benyt trådning i brevindekset, baseret på emne" +#: ../mail/mail-ops.c:2355 +#, c-format +msgid "Reconnecting to %s" +msgstr "Kobler til %s igen" -#: ../mail/evolution-mail.schemas.in.h:155 -msgid "Timeout for marking message as seen" -msgstr "Tidsgrænse for at markere brev som set" +#: ../mail/mail-ops.c:2451 +#, c-format +msgid "Preparing account '%s' for offline" +msgstr "Forbereder konto \"%s\" til afkoblet tilstand" -#: ../mail/evolution-mail.schemas.in.h:156 -msgid "Timeout for marking message as seen." -msgstr "Tidsgrænse for at markere brev som set." +#: ../mail/mail-ops.c:2537 +msgid "Checking Service" +msgstr "Undersøger tjeneste" -#: ../mail/evolution-mail.schemas.in.h:157 -msgid "UID string of the default account." -msgstr "Standardkontoens UID-streng." +#: ../mail/mail-send-recv.c:181 +msgid "Canceling..." +msgstr "Afbryder..." -#: ../mail/evolution-mail.schemas.in.h:158 -msgid "Underline color for misspelled words when using inline spelling." -msgstr "" -"Farve af streg under forkert stavede ord ved brug af løbende stavekontrol." +#: ../mail/mail-send-recv.c:383 +msgid "Send & Receive Mail" +msgstr "Send & modtag e-post" -#: ../mail/evolution-mail.schemas.in.h:159 -msgid "Use SpamAssassin daemon and client" -msgstr "Benyt Spamassassin-dæmon og klient" +#: ../mail/mail-send-recv.c:394 +msgid "Cancel _All" +msgstr "Afbryd _alle" -#: ../mail/evolution-mail.schemas.in.h:160 -msgid "Use SpamAssassin daemon and client (spamc/spamd)." -msgstr "Benyt Spamassassin-dæmon og klient (spamc/spamd)." +#: ../mail/mail-send-recv.c:503 +msgid "Updating..." +msgstr "Opdaterer..." -#: ../mail/evolution-mail.schemas.in.h:161 -msgid "Use custom fonts" -msgstr "Brug tilpassede skrifttyper" +#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580 +msgid "Waiting..." +msgstr "Venter..." -#: ../mail/evolution-mail.schemas.in.h:162 -msgid "Use custom fonts for displaying mail." -msgstr "Benyt tilpassede skrifttyper til e-post-visning." +#: ../mail/mail-send-recv.c:806 +#, c-format +msgid "Checking for new mail" +msgstr "Kontrollerer om der er ny e-post" -#: ../mail/evolution-mail.schemas.in.h:163 -msgid "Use only local spam tests." -msgstr "Benyt kun lokale spam-test." +#: ../mail/mail-session.c:211 +#, c-format +msgid "Enter Passphrase for %s" +msgstr "Indtast løsen for %s" -#: ../mail/evolution-mail.schemas.in.h:164 -msgid "Use only the local spam tests (no DNS)." -msgstr "Benyt kun de lokale spam-test (ingen DNS)." +#: ../mail/mail-session.c:213 +msgid "Enter Passphrase" +msgstr "Indtast løsen" -#: ../mail/evolution-mail.schemas.in.h:165 -msgid "Use side-by-side or wide layout" -msgstr "Anvend side-om-side-layout eller bredformat" +#: ../mail/mail-session.c:216 +#: ../plugins/exchange-operations/exchange-config-listener.c:708 +#, c-format +msgid "Enter Password for %s" +msgstr "Indtast adgangskode for %s" -#: ../mail/evolution-mail.schemas.in.h:166 -msgid "Variable width font" -msgstr "Skrifttype med variabel bredde" +#: ../mail/mail-session.c:218 +msgid "Enter Password" +msgstr "Indtast adgangskode" -#: ../mail/evolution-mail.schemas.in.h:167 -msgid "View/Bcc menu item is checked" -msgstr "Vis/Bcc-menupunktet er afkrydset" +#: ../mail/mail-session.c:260 +msgid "User canceled operation." +msgstr "Operation afbrudt af bruger." -#: ../mail/evolution-mail.schemas.in.h:168 -msgid "View/Bcc menu item is checked." -msgstr "Vis/Bcc-menupunktet er afkrydset." +#: ../mail/mail-signature-editor.c:201 +msgid "_Save and Close" +msgstr "_Gem og luk" -#: ../mail/evolution-mail.schemas.in.h:169 -msgid "View/Cc menu item is checked" -msgstr "Vis/Cc-menupunktet er afkrydset" +#: ../mail/mail-signature-editor.c:355 +msgid "Edit Signature" +msgstr "Redigér signatur" -#: ../mail/evolution-mail.schemas.in.h:170 -msgid "View/Cc menu item is checked." -msgstr "Vis/Cc-menupunktet er afkrydset." +#: ../mail/mail-signature-editor.c:370 +msgid "_Signature Name:" +msgstr "_Signaturnavn:" -#: ../mail/evolution-mail.schemas.in.h:171 -msgid "View/From menu item is checked" -msgstr "Vis/Fra-menupunktet er afkrydset" +#: ../mail/mail-tools.c:120 +#, c-format +msgid "Could not create spool directory `%s': %s" +msgstr "Kunne ikke oprette kø-mappe \"%s\": %s" -#: ../mail/evolution-mail.schemas.in.h:172 -msgid "View/From menu item is checked." -msgstr "Vis/Fra-menupunktet er afkrydset." +#: ../mail/mail-tools.c:150 +#, c-format +msgid "Trying to movemail a non-mbox source `%s'" +msgstr "Prøver at bruge movemail på en kilde som ikke er i mbox-format \"%s\"" -#: ../mail/evolution-mail.schemas.in.h:173 -msgid "View/PostTo menu item is checked" -msgstr "Vis/Send til-menupunktet er afkrydset" +#: ../mail/mail-tools.c:256 +#, c-format +msgid "Forwarded message - %s" +msgstr "Videresendt brev - %s" -#: ../mail/evolution-mail.schemas.in.h:174 -msgid "View/PostTo menu item is checked." -msgstr "Vis/Send til-menupunktet er afkrydset." +#: ../mail/mail-tools.c:258 +msgid "Forwarded message" +msgstr "Videresendt brev" -#: ../mail/evolution-mail.schemas.in.h:175 -msgid "View/ReplyTo menu item is checked" -msgstr "Vis/Svar til-menupunktet er afkrydset" +#: ../mail/mail-tools.c:298 +#, c-format +msgid "Invalid folder: `%s'" +msgstr "Ugyldig mappe: \"%s\"" -#: ../mail/evolution-mail.schemas.in.h:176 -msgid "View/ReplyTo menu item is checked." -msgstr "Vis/Svar til-menupunktet er afkrydset." +#: ../mail/mail-vfolder.c:89 +#, c-format +msgid "Setting up Search Folder: %s" +msgstr "Opsætter søgemappe: %s" -#: ../mail/evolution-mail.schemas.in.h:177 -msgid "Whether a read receipt request gets added to every message by default." +#: ../mail/mail-vfolder.c:234 +#, c-format +msgid "Updating Search Folders for '%s:%s'" +msgstr "Opdaterer søgemapper for \"%s:%s\"" + +#: ../mail/mail-vfolder.c:241 +#, c-format +msgid "Updating Search Folders for '%s'" +msgstr "Opdaterer søgemapper for \"%s\"" + +#: ../mail/mail-vfolder.c:1068 +msgid "Edit Search Folder" +msgstr "Rediger søgemappe" + +#: ../mail/mail-vfolder.c:1157 +msgid "New Search Folder" +msgstr "Ny søgemappe" + +#: ../mail/mail.error.xml.h:1 +msgid "A folder named \"{0}\" already exists. Please use a different name." msgstr "" -"Hvorvidt der vedhæftes en anmodning om en kvittering for at brevet er læst " -"til alle breve som standard." +"En mappe med navnet \"{0}\" findes allerede. Brug venligst et andet navn." -#: ../mail/evolution-mail.schemas.in.h:178 -msgid "Whether disable ellipsizing feature of folder names in side bar." +#: ../mail/mail.error.xml.h:2 +msgid "A folder named \"{1}\" already exists. Please use a different name." msgstr "" -"Om funktionen for forkortelse af mappenavne i mappetræet skal slås fra." +"En mappe med navnet \"{1}\" findes allerede. Brug venligst et andet navn." -#: ../mail/evolution-mail.schemas.in.h:179 +#: ../mail/mail.error.xml.h:3 msgid "" -"Whether or not to fall back on threading by subjects when the messages do " -"not contain In-Reply-To or References headers." +"A non-empty folder at \"{1}\" already exists.\n" +"\n" +"You can choose to ignore this folder, overwrite or append its contents, or " +"quit." msgstr "" -"Vælg om der skal benyttes emnebaseret trådning når breve ikke indeholder " -"linjerne \"In-Reply-To\" eller \"References\" i brevhoved." - -#: ../mail/evolution-mail.schemas.in.h:180 -msgid "Whether sort threads based on latest message in that thread" -msgstr "Hvorvidt sortering baseres på det sidste brev i tråden" +"Der findes allerede en ikke-tom mappe på \"{1}\".\n" +"\n" +"Du kan vælge at ignorere denne mappe, overskrive dens indhold, tilføje dens " +"indhold eller afslutte." -#: ../mail/evolution-mail.schemas.in.h:181 -msgid "Width of the message-list pane" -msgstr "Bredde på ruden med brevindeks" +#: ../mail/mail.error.xml.h:6 +msgid "" +"A read receipt notification has been requested for \"{1}\". Send the receipt " +"notification to {0}?" +msgstr "" +"En kvittering for at brevet er blevet åbnet, er blevet forespurgt for \"{1}" +"\". Send kvitteringen til {0}?" -#: ../mail/evolution-mail.schemas.in.h:182 -msgid "Width of the message-list pane." -msgstr "Bredde på ruden med brevindeks." +#: ../mail/mail.error.xml.h:7 +msgid "" +"A signature already exists with the name \"{0}\". Please specify a different " +"name." +msgstr "" +"En signatur med navnet \"{0}\" findes allerede. Angiv venligst et andet navn." -#: ../mail/importers/elm-importer.c:182 -msgid "Importing Elm data" -msgstr "Importerer Elm-data" +#: ../mail/mail.error.xml.h:8 +msgid "" +"Adding a meaningful Subject line to your messages will give your recipients " +"an idea of what your mail is about." +msgstr "" +"Hvis du giver dine breve en forståelig emnelinje, vil dine modtagere få en " +"idé om, hvad dit brev handler om." -#: ../mail/importers/elm-importer.c:367 -msgid "Evolution Elm importer" -msgstr "Evolution elm-importør" +#: ../mail/mail.error.xml.h:9 +msgid "Are you sure you want to delete this account and all its proxies?" +msgstr "" +"Er du sikker på at du vil slette denne konto og alle dens mellemværter?" -#: ../mail/importers/elm-importer.c:368 -msgid "Import mail from Elm." -msgstr "Importer e-post fra Elm." +#: ../mail/mail.error.xml.h:10 +msgid "Are you sure you want to delete this account?" +msgstr "Er du sikker på at du vil slette denne konto?" -#: ../mail/importers/evolution-mbox-importer.c:79 -#: ../plugins/pst-import/pst-importer.c:312 -msgid "Destination folder:" -msgstr "Destinationsmappe:" +#: ../mail/mail.error.xml.h:11 +msgid "" +"Are you sure you want to disable this account and delete all its proxies?" +msgstr "" +"Er du sikker på at du vil deaktivere denne konto og slette alle dens " +"mellemværter?" -#: ../mail/importers/evolution-mbox-importer.c:82 -#: ../plugins/pst-import/pst-importer.c:305 -msgid "Select folder to import into" -msgstr "Vælg mappen der skal importeres til" +#: ../mail/mail.error.xml.h:12 +msgid "Are you sure you want to open {0} messages at once?" +msgstr "Er du sikker på du vil åbne {0} breve på en gang?" -#: ../mail/importers/evolution-mbox-importer.c:219 -msgid "Berkeley Mailbox (mbox)" -msgstr "Berkeley Mailbox (mbox)" +#: ../mail/mail.error.xml.h:13 +msgid "" +"Are you sure you want to permanently remove all the deleted messages in all " +"folders?" +msgstr "" +"Er du sikker på du vil fjerne alle de slettede breve i alle mapperne, " +"permanent?" -#: ../mail/importers/evolution-mbox-importer.c:220 -msgid "Importer Berkeley Mailbox format folders" -msgstr "Importør til mapper i Berkeley Mailbox-formatet (mbox)" +#: ../mail/mail.error.xml.h:14 +msgid "" +"Are you sure you want to permanently remove all the deleted messages in " +"folder \"{0}\"?" +msgstr "" +"Er du sikker på at du permanent vil fjerne alle de slettede breve i mappen " +"\"{0}\"?" -#: ../mail/importers/mail-importer.c:147 -msgid "Importing mailbox" -msgstr "Importerer brevbakke" +#: ../mail/mail.error.xml.h:15 +msgid "Are you sure you want to send a message in HTML format?" +msgstr "Er du sikker på du vil sende et brev i HTML-formatet?" -#. Destination folder, was set in our widget -#: ../mail/importers/mail-importer.c:231 -#: ../plugins/pst-import/pst-importer.c:457 -#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512 -#, c-format -msgid "Importing `%s'" -msgstr "Importerer \"%s\"" +#: ../mail/mail.error.xml.h:16 +msgid "Are you sure you want to send a message with only BCC recipients?" +msgstr "Er du sikker på du vil sende et brev der kun har BCC-modtagere?" -#: ../mail/importers/mail-importer.c:371 -#, c-format -msgid "Scanning %s" -msgstr "Søger i %s" +#: ../mail/mail.error.xml.h:17 +msgid "Are you sure you want to send a message without a subject?" +msgstr "Er du sikker på du vil sende et brev uden emne?" -#: ../mail/importers/pine-importer.c:225 -msgid "Importing Pine data" -msgstr "Importerer Pine-data" +#: ../mail/mail.error.xml.h:18 +msgid "Because \"{0}\"." +msgstr "Fordi \"{0}\"." -#: ../mail/importers/pine-importer.c:424 -msgid "Evolution Pine importer" -msgstr "Evolution Pine-importør" +#: ../mail/mail.error.xml.h:20 +msgid "Because \"{2}\"." +msgstr "Fordi \"{2}\"." -#: ../mail/importers/pine-importer.c:425 -msgid "Import mail from Pine." -msgstr "Importer e-post fra Pine." +#: ../mail/mail.error.xml.h:21 +msgid "Blank Signature" +msgstr "Tom signatur" -#: ../mail/mail-autofilter.c:72 -#, c-format -msgid "Mail to %s" -msgstr "E-post til %s" +#: ../mail/mail.error.xml.h:22 +msgid "Cannot add Search Folder \"{0}\"." +msgstr "Kan ikke tilføje søgemappen \"{0}\"." -#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275 -#, c-format -msgid "Mail from %s" -msgstr "E-post fra %s" +#: ../mail/mail.error.xml.h:23 +msgid "Cannot copy folder \"{0}\" to \"{1}\"." +msgstr "Kan ikke kopiere mappen \"{0}\" til \"{1}\"." -#: ../mail/mail-autofilter.c:259 -#, c-format -msgid "Subject is %s" -msgstr "Emne er %s" +#: ../mail/mail.error.xml.h:24 +msgid "Cannot create folder \"{0}\"." +msgstr "Kan ikke oprette mappen \"{0}\"." -#: ../mail/mail-autofilter.c:294 -#, c-format -msgid "%s mailing list" -msgstr "%s e-post-liste" +#: ../mail/mail.error.xml.h:25 +msgid "Cannot create temporary save directory." +msgstr "Kan ikke oprette midlertidigt gemmekatalog." -#: ../mail/mail-autofilter.c:365 -msgid "Add Filter Rule" -msgstr "Tilføj filterregel" +#: ../mail/mail.error.xml.h:26 +msgid "Cannot create the save directory, because \"{1}\"" +msgstr "Kan ikke oprette gemmekataloget, fordi \"{1}\"" -#: ../mail/mail-component.c:550 -#, c-format -msgid "%d selected, " -msgid_plural "%d selected, " -msgstr[0] "%d markeret, " -msgstr[1] "%d markeret, " +#: ../mail/mail.error.xml.h:27 +msgid "Cannot delete folder \"{0}\"." +msgstr "Kan ikke slette mappen \"{0}\"." -#: ../mail/mail-component.c:554 -#, c-format -msgid "%d deleted" -msgid_plural "%d deleted" -msgstr[0] "%d slettet" -msgstr[1] "%d slettet" +#: ../mail/mail.error.xml.h:28 +msgid "Cannot delete system folder \"{0}\"." +msgstr "Kan ikke slette systemmappen \"{0}\"." -#: ../mail/mail-component.c:561 -#, c-format -msgid "%d junk" -msgid_plural "%d junk" -msgstr[0] "%d spam" -msgstr[1] "%d spam" +#: ../mail/mail.error.xml.h:29 +msgid "Cannot edit Search Folder \"{0}\" as it does not exist." +msgstr "Kan ikke redigere søgemappen \"{0}\", for den findes ikke." -#: ../mail/mail-component.c:564 -#, c-format -msgid "%d draft" -msgid_plural "%d drafts" -msgstr[0] "%d kladde" -msgstr[1] "%d kladder" +#: ../mail/mail.error.xml.h:30 +msgid "Cannot move folder \"{0}\" to \"{1}\"." +msgstr "Kan ikke flytte mappen \"{0}\" til \"{1}\"." -#: ../mail/mail-component.c:566 -#, c-format -msgid "%d sent" -msgid_plural "%d sent" -msgstr[0] "%d sendt" -msgstr[1] "%d sendte" +#: ../mail/mail.error.xml.h:31 +msgid "Cannot open source \"{1}\"" +msgstr "Kan ikke åbne kilden \"{1}\"" -#: ../mail/mail-component.c:568 -#, c-format -msgid "%d unsent" -msgid_plural "%d unsent" -msgstr[0] "%d usendt" -msgstr[1] "%d usendte" +#: ../mail/mail.error.xml.h:32 +msgid "Cannot open source \"{2}\"." +msgstr "Kan ikke åbne kilden \"{2}\"." -#: ../mail/mail-component.c:574 -#, c-format -msgid "%d unread, " -msgid_plural "%d unread, " -msgstr[0] "%d ulæst, " -msgstr[1] "%d ulæste, " +#: ../mail/mail.error.xml.h:33 +msgid "Cannot open target \"{2}\"." +msgstr "Kan ikke åbne målet \"{2}\"." -#: ../mail/mail-component.c:575 -#, c-format -msgid "%d total" -msgid_plural "%d total" -msgstr[0] "%d totalt" -msgstr[1] "%d totalt" +#: ../mail/mail.error.xml.h:34 +msgid "" +"Cannot read the license file \"{0}\", due to an installation problem. You " +"will not be able to use this provider until you can accept its license." +msgstr "" +"Kan ikke læse licens-filen \"{0}\" pga. et installationsproblem. Du vil ikke " +"kunne bruge denne udbyder, før du kan acceptere hans licens." -#: ../mail/mail-component.c:927 -msgid "New Mail Message" -msgstr "Nyt brev" +#: ../mail/mail.error.xml.h:35 +msgid "Cannot rename \"{0}\" to \"{1}\"." +msgstr "Kan ikke omdøbe \"{0}\" til \"{1}\"." -#: ../mail/mail-component.c:929 -msgid "Compose a new mail message" -msgstr "Skriv et nyt brev" +#: ../mail/mail.error.xml.h:36 +msgid "Cannot rename or move system folder \"{0}\"." +msgstr "Kan ikke omdøbe eller flytte systemmappen \"{0}\"." -#: ../mail/mail-component.c:935 -msgid "New Mail Folder" -msgstr "Ny brevmappe" +#: ../mail/mail.error.xml.h:37 +msgid "Cannot save changes to account." +msgstr "Kan ikke gemme ændringerne til kontoen." -#: ../mail/mail-component.c:937 -msgid "Create a new mail folder" -msgstr "Opret en ny brevmappe" +#: ../mail/mail.error.xml.h:38 +msgid "Cannot save to directory \"{0}\"." +msgstr "Kan ikke gemme i kataloget \"{0}\"." -#: ../mail/mail-component.c:1084 -msgid "Failed upgrading Mail settings or folders." -msgstr "Det mislykkedes at opgradere e-post-indstillingerne eller mapperne." +#: ../mail/mail.error.xml.h:39 +msgid "Cannot save to file \"{0}\"." +msgstr "Kan ikke gemme filen \"{0}\"." -#: ../mail/mail-config.glade.h:1 -msgid " Ch_eck for Supported Types " -msgstr " _Søg efter understøttede typer " +#: ../mail/mail.error.xml.h:40 +msgid "Cannot set signature script \"{0}\"." +msgstr "Kan ikke sætte signaturskriptet \"{0}\"." -#: ../mail/mail-config.glade.h:2 -msgid "(Note: Requires restart of the application)" -msgstr "(Bemærk: Kræver genstart af programmet)" +#: ../mail/mail.error.xml.h:41 +msgid "Check Junk Failed" +msgstr "Spamcheck fejlede" -#: ../mail/mail-config.glade.h:4 -msgid "SSL is not supported in this build of Evolution" -msgstr "SSL er ikke understøttet i denne version af Evolution" +#: ../mail/mail.error.xml.h:42 +msgid "" +"Check to make sure your password is spelled correctly. Remember that many " +"passwords are case sensitive; your caps lock might be on." +msgstr "" +"Kontrollér at din adgangskode er skrevet korrekt. Husk at mange adgangskoder " +"er versalfølsomme \"Caps Lock\"-knappen kan være aktiveret." -#: ../mail/mail-config.glade.h:5 -msgid "Sender Photograph" -msgstr "Afsenderfoto" +#: ../mail/mail.error.xml.h:43 +msgid "Could not save signature file." +msgstr "Kunne ikke gemme signaturfilen." -#: ../mail/mail-config.glade.h:6 -msgid "Sig_natures" -msgstr "Si_gnaturer" +#: ../mail/mail.error.xml.h:44 +msgid "Delete \"{0}\"?" +msgstr "Slet \"{0}\"?" -#: ../mail/mail-config.glade.h:7 -msgid "Top Posting Option (Not Recommended)" -msgstr "Postér fra toppen (Ikke anbefalet)" +#: ../mail/mail.error.xml.h:45 +msgid "Delete account?" +msgstr "Slet konto?" -#: ../mail/mail-config.glade.h:8 -msgid "_Languages" -msgstr "_Sprog" +#: ../mail/mail.error.xml.h:46 +msgid "Delete messages in Search Folder \"{0}\"?" +msgstr "Slet breve i søgemappen \"{0}\"?" -#: ../mail/mail-config.glade.h:9 -msgid "Account Information" -msgstr "Kontoinformation" +#: ../mail/mail.error.xml.h:47 +msgid "Delete messages in Search Folder?" +msgstr "Slet breve i søgemappe?" -#: ../mail/mail-config.glade.h:11 -msgid "Authentication" -msgstr "Godkendelse" +#: ../mail/mail.error.xml.h:48 +msgid "Discard changes?" +msgstr "Forkast ændringer?" -#: ../mail/mail-config.glade.h:12 -msgid "Composing Messages" -msgstr "Skrivning af breve" +#: ../mail/mail.error.xml.h:49 +msgid "Do not d_elete" +msgstr "Undlad at sl_ette" -#: ../mail/mail-config.glade.h:13 -msgid "Configuration" -msgstr "Konfiguration" +#: ../mail/mail.error.xml.h:50 +msgid "Do not delete" +msgstr "Undlad at slette" -#: ../mail/mail-config.glade.h:14 -msgid "Default Behavior" -msgstr "Standardopførsel" +#: ../mail/mail.error.xml.h:51 +msgid "Do not disable" +msgstr "Undlad at deaktivere" -#: ../mail/mail-config.glade.h:15 -msgid "Delete Mail" -msgstr "Slet e-post" +#: ../mail/mail.error.xml.h:52 +msgid "" +"Do you want to locally synchronize the folders that are marked for offline " +"usage?" +msgstr "" +"Ønsker du lokalt at synkronisere mapperne som er markeret til brug i " +"afkoblet tilstand?" -#: ../mail/mail-config.glade.h:16 -msgid "Displayed Message _Headers" -msgstr "Brev_hoved som vises" +#: ../mail/mail.error.xml.h:53 +msgid "Do you want to mark all messages as read?" +msgstr "Vil du markere alle breve som læst?" -#: ../mail/mail-config.glade.h:18 -msgid "Labels" -msgstr "Mærkater" +#: ../mail/mail.error.xml.h:54 +msgid "Do you wish to save your changes?" +msgstr "Ønsker du at gemme dine ændringer?" -#: ../mail/mail-config.glade.h:19 -msgid "Loading Images" -msgstr "Indlæsning af billeder" +#: ../mail/mail.error.xml.h:55 +msgid "Enter password." +msgstr "Indtast adgangskode." -#: ../mail/mail-config.glade.h:20 -msgid "Message Display" -msgstr "Brevvisning" +#: ../mail/mail.error.xml.h:56 +msgid "Error loading filter definitions." +msgstr "Fejl ved indlæsning af filter-definitionerne." -#: ../mail/mail-config.glade.h:21 -msgid "Message Fonts" -msgstr "Skrifttyper for breve" +#: ../mail/mail.error.xml.h:57 +msgid "Error while performing operation." +msgstr "Fejl ved udførsel af handling." -#: ../mail/mail-config.glade.h:22 -msgid "Message Receipts" -msgstr "Kvitteringer for breve" +#: ../mail/mail.error.xml.h:58 +msgid "Error while {0}." +msgstr "Fejl ved {0}." -#: ../mail/mail-config.glade.h:23 -#: ../plugins/publish-calendar/publish-calendar.glade.h:3 -msgid "Optional Information" -msgstr "Valgfri information" +#: ../mail/mail.error.xml.h:59 +msgid "File exists but cannot overwrite it." +msgstr "Filen findes, men kunne ikke overskrive den." -#: ../mail/mail-config.glade.h:24 -msgid "Options" -msgstr "Indstillinger" +#: ../mail/mail.error.xml.h:60 +msgid "File exists but is not a regular file." +msgstr "Filen findes, men er ikke en almindelig fil." -#: ../mail/mail-config.glade.h:25 -msgid "Pretty Good Privacy (PGP/GPG)" -msgstr "Pretty Good Privacy (PGP/GPG)" +#: ../mail/mail.error.xml.h:61 +msgid "If you continue, you will not be able to recover these messages." +msgstr "Hvis du fortsætter vil du ikke kunne genoprette disse breve." -#: ../mail/mail-config.glade.h:26 -msgid "Printed Fonts" -msgstr "Skrifttyper for udskrift" +#: ../mail/mail.error.xml.h:62 +msgid "" +"If you delete the folder, all of its contents and its subfolders contents " +"will be deleted permanently." +msgstr "Hvis du sletter mappen vil alt indholdet i denne slettes permanent." -#: ../mail/mail-config.glade.h:27 -msgid "Proxy Settings" -msgstr "Proxyindstillinger" +#: ../mail/mail.error.xml.h:63 +msgid "If you proceed, all proxy accounts will be deleted permanently." +msgstr "Hvis du fortsætter, vil alle proxy-konti blive slettet permanent." -#: ../mail/mail-config.glade.h:28 -msgid "Required Information" -msgstr "Nødvendig information" +#: ../mail/mail.error.xml.h:64 +msgid "" +"If you proceed, the account information and\n" +"all proxy information will be deleted permanently." +msgstr "" +"Hvis du fortsætter, vil kontoinformationen og\n" +"al proxy-information blive slettet permanent." -#: ../mail/mail-config.glade.h:29 -msgid "Secure MIME (S/MIME)" -msgstr "Sikker MIME (S/MIME)" +#: ../mail/mail.error.xml.h:66 +msgid "If you proceed, the account information will be deleted permanently." +msgstr "Hvis du fortsætter vil kontoinformationen blive slettet permanent." -#: ../mail/mail-config.glade.h:30 -msgid "Security" -msgstr "Sikkerhed" +#: ../mail/mail.error.xml.h:67 +msgid "" +"If you quit, these messages will not be sent until Evolution is started " +"again." +msgstr "" +"Hvis du afslutter vil disse breve ikke blive sendt før Evolution genstartes." -#: ../mail/mail-config.glade.h:31 -msgid "Sent and Draft Messages" -msgstr "Sendte breve og kladder" +#: ../mail/mail.error.xml.h:68 +msgid "Ignore" +msgstr "Ignorér" -#: ../mail/mail-config.glade.h:32 -msgid "Server Configuration" -msgstr "Konfiguration af server" +#: ../mail/mail.error.xml.h:69 +msgid "Invalid authentication" +msgstr "Ugyldig godkendelse" -#: ../mail/mail-config.glade.h:33 -msgid "_Authentication Type" -msgstr "_Godkendelsestype" +#: ../mail/mail.error.xml.h:71 +msgid "Mail filters automatically updated." +msgstr "E-post-filtre opdateret automatisk." -#: ../mail/mail-config.glade.h:35 -msgid "Account Management" -msgstr "Håndtering af konti" +#: ../mail/mail.error.xml.h:72 +msgid "" +"Many email systems add an Apparently-To header to messages that only have " +"BCC recipients. This header, if added, will list all of your recipients to " +"your message anyway. To avoid this, you should add at least one To: or CC: " +"recipient." +msgstr "" +"Mange e-post-systemer føjer et Apparently-To-hoved til breve der kun har Bcc-" +"modtagere. Dette hoved, hvis tilføjet, vil liste alle dine modtagere i dit " +"brev alligevel For at undgå dette bør du tilføje mindst en Til:- eller Cc:-" +"modtager." -#: ../mail/mail-config.glade.h:36 -msgid "Add Ne_w Signature..." -msgstr "Tilføj _ny signatur..." +#: ../mail/mail.error.xml.h:73 +msgid "Mark all messages as read" +msgstr "Markér alle breve som læst" -#: ../mail/mail-config.glade.h:37 -msgid "Add _Script" -msgstr "Tilføj _skript" +#: ../mail/mail.error.xml.h:74 +msgid "Missing folder." +msgstr "Manglende mappe." -#: ../mail/mail-config.glade.h:38 -msgid "Al_ways sign outgoing messages when using this account" -msgstr "Signér _altid udgående breve når denne konto benyttes" +#: ../mail/mail.error.xml.h:76 +msgid "No sources selected." +msgstr "Ingen kilder valgt." -#: ../mail/mail-config.glade.h:39 -msgid "Also encrypt to sel_f when sending encrypted messages" -msgstr "Kryptér også til mig _selv når krypteret e-post sendes" +#: ../mail/mail.error.xml.h:77 +msgid "Opening too many messages at once may take a long time." +msgstr "At åbne for mange breve på en gang, kan tage lang tid." -#: ../mail/mail-config.glade.h:40 -msgid "Alway_s carbon-copy (cc) to:" -msgstr "Send _altid en kopi (cc) til:" +#: ../mail/mail.error.xml.h:78 +msgid "Please check your account settings and try again." +msgstr "Kontrollér venligst din konto-opsætning og prøv igen." -#: ../mail/mail-config.glade.h:41 -msgid "Always _blind carbon-copy (bcc) to:" -msgstr "Send altid en _blindkopi (bcc) til:" +#: ../mail/mail.error.xml.h:79 +msgid "Please enable the account or send using another account." +msgstr "Aktivér venligst kontoen, eller send via en anden konto." -#: ../mail/mail-config.glade.h:42 -msgid "Always _trust keys in my keyring when encrypting" -msgstr "_Stol altid på nøgler i min nøglering ved kryptering" +#: ../mail/mail.error.xml.h:80 +msgid "" +"Please enter a valid email address in the To: field. You can search for " +"email addresses by clicking on the To: button next to the entry box." +msgstr "" +"Vær så venlig at indtaste en gyldig e-postadresse i Til:-feltet. Du kan søge " +"efter e-post-adresser ved at klikke på Til:-knappen ved siden af " +"indtastningsfeltet." -#: ../mail/mail-config.glade.h:43 -msgid "Always encrypt to _myself when sending encrypted messages" -msgstr "Kryptér altid til _mig selv når krypteret e-post sendes" +#: ../mail/mail.error.xml.h:81 +msgid "" +"Please make sure the following recipients are willing and able to receive " +"HTML email:\n" +"{0}" +msgstr "" +"Kontrollér venligst at følgende modtagere ønsker og kan modtage HTML-breve:\n" +"{0}" -#: ../mail/mail-config.glade.h:44 -msgid "Always request rea_d receipt" -msgstr "Anmod altid om en kvittering for l_æsning" +#: ../mail/mail.error.xml.h:83 +msgid "Please provide an unique name to identify this signature." +msgstr "" +"Indtast venligst et entydigt navn til identifikation af denne signatur." -#: ../mail/mail-config.glade.h:46 -msgid "Automatically insert _emoticon images" -msgstr "Indsæt s_miley-billeder automatisk" +#: ../mail/mail.error.xml.h:84 +msgid "Please wait." +msgstr "Vent venligst." -#: ../mail/mail-config.glade.h:47 -msgid "Baltic (ISO-8859-13)" -msgstr "Baltisk (ISO-8859-13)" +#: ../mail/mail.error.xml.h:85 +msgid "Problem migrating old mail folder \"{0}\"." +msgstr "Problem ved overflytning af den gamle brevmappe \"{0}\"." -#: ../mail/mail-config.glade.h:48 -msgid "Baltic (ISO-8859-4)" -msgstr "Baltisk (ISO-8859-4)" +#: ../mail/mail.error.xml.h:86 +msgid "Querying server" +msgstr "Forespørger server" -#: ../mail/mail-config.glade.h:49 -msgid "C_haracter set:" -msgstr "Te_gnkodning:" +#: ../mail/mail.error.xml.h:87 +msgid "Querying server for a list of supported authentication mechanisms." +msgstr "" +"Forespørger serveren om en liste af understøttede godkendelsesmekanismer." -#: ../mail/mail-config.glade.h:50 -msgid "Ch_eck for Supported Types " -msgstr "_Søg efter understøttede typer " +#: ../mail/mail.error.xml.h:88 +msgid "Read receipt requested." +msgstr "Der anmodes om kvittering for at brevet er blevet åbnet." -#: ../mail/mail-config.glade.h:51 -msgid "Check cu_stom headers for junk" -msgstr "K_ontrollér tilpassede brevhoveder for spam" +#: ../mail/mail.error.xml.h:89 +msgid "Really delete folder \"{0}\" and all of its subfolders?" +msgstr "Er du sikker på du vil slette mappen \"{0}\" og alle dens undermapper?" -#: ../mail/mail-config.glade.h:52 -msgid "Check incoming _messages for junk" -msgstr "Kontrollér _indgående post for spam" +#: ../mail/mail.error.xml.h:90 +msgid "Report Junk Failed" +msgstr "Indrapportering som spam fejlede" -#: ../mail/mail-config.glade.h:53 -msgid "Check spelling while I _type" -msgstr "Kontrollér stavning mens jeg skri_ver" +#: ../mail/mail.error.xml.h:91 +msgid "Report Not Junk Failed" +msgstr "Indrapportering som ikke-spam fejlede" -#: ../mail/mail-config.glade.h:54 -msgid "Checks incoming mail messages to be Junk" -msgstr "Kontrollerer om indgående breve er spam" +#: ../mail/mail.error.xml.h:92 +msgid "Search Folders automatically updated." +msgstr "Søgemapper opdateret automatisk." -#: ../mail/mail-config.glade.h:55 -msgid "Cle_ar" -msgstr "_Ryd" +#: ../mail/mail.error.xml.h:93 +msgid "Send Receipt" +msgstr "Send kvittering" -#: ../mail/mail-config.glade.h:56 -msgid "Clea_r" -msgstr "R_yd" +#: ../mail/mail.error.xml.h:94 +msgid "Signature Already Exists" +msgstr "Signaturen findes allerede" -#: ../mail/mail-config.glade.h:57 -msgid "Color for _misspelled words:" -msgstr "Farve på _fejlstavede ord:" +#: ../mail/mail.error.xml.h:95 +msgid "Synchronize" +msgstr "Synkronisér" -#: ../mail/mail-config.glade.h:58 -msgid "Confirm _when expunging a folder" -msgstr "Bekræft _når en mappe tømmes" +#: ../mail/mail.error.xml.h:96 +msgid "Synchronize folders locally for offline usage?" +msgstr "Synkronisér mapperne lokalt til brug i afkoblet tilstand?" -#: ../mail/mail-config.glade.h:59 +#: ../mail/mail.error.xml.h:97 msgid "" -"Congratulations, your mail configuration is complete.\n" -"\n" -"You are now ready to send and receive email \n" -"using Evolution. \n" -"\n" -"Click \"Apply\" to save your settings." +"System folders are required for Evolution to function correctly and cannot " +"be renamed, moved, or deleted." msgstr "" -"Tillykke, din e-post-konfiguration er nu fuldført.\n" +"Systemmapper kræves for at Evolution kan fungere korrekt, og du kan ikke " +"omdøbe, flytte eller slette disse." + +#: ../mail/mail.error.xml.h:98 +msgid "" +"The contact list you are sending to is configured to hide list recipients.\n" "\n" -"Du kan nu sende og modtage e-post \n" -"med Evolution. \n" +"Many email systems add an Apparently-To header to messages that only have " +"BCC recipients. This header, if added, will list all of your recipients in " +"your message. To avoid this, you should add at least one To: or CC: " +"recipient. " +msgstr "" +"Kontaktlisten du sender til er konfigureret til at skjule liste-modtagere.\n" "\n" -"Klik på \"Anvend\" for at gemme dine indstillinger." - -#: ../mail/mail-config.glade.h:65 -msgid "De_fault" -msgstr "_Forvalg" +"Mange e-post-systemer føjer et Apparently-To-hoved til breve der kun har " +"Bcc- modtagere. Dette hoved, hvis tilføjet, vil liste alle dine modtagere i " +"dit brev. For at undgå dette bør du tilføje mindst en Til:- eller Cc:- " +"modtager. " -#: ../mail/mail-config.glade.h:66 -msgid "Default character e_ncoding:" -msgstr "Standardtegn_kodning:" +#: ../mail/mail.error.xml.h:101 +msgid "" +"The following Search Folder(s):\n" +"{0}\n" +"Used the now removed folder:\n" +" \"{1}\"\n" +"And have been updated." +msgstr "" +"Følgende søgemappe(r):\n" +"{0}\n" +"benyttede den nu fjernede mappe:\n" +" \"{1}\"\n" +"og er blevet opdateret." -#: ../mail/mail-config.glade.h:68 -msgid "Delete junk messages on e_xit" -msgstr "Slet spam når der a_fsluttes" +#: ../mail/mail.error.xml.h:106 +msgid "" +"The following filter rule(s):\n" +"{0}\n" +"Used the now removed folder:\n" +" \"{1}\"\n" +"And have been updated." +msgstr "" +"Følgende filterregler:\n" +"{0}\n" +"benyttede den nu fjernede mappe:\n" +" \"{1}\"\n" +"og er blevet opdateret." -#: ../mail/mail-config.glade.h:70 -msgid "Digitally sign o_utgoing messages (by default)" -msgstr "Signér ud_gående breve digitalt (som forvalg)" +#: ../mail/mail.error.xml.h:111 +msgid "The script file must exist and be executable." +msgstr "Skriptfilen skal eksistere og være kørbar." -#: ../mail/mail-config.glade.h:71 -msgid "Do not format messages when text si_ze exceeds" -msgstr "Formatér ikke beskeder hvis tekst_størrelsen overskrider" +#: ../mail/mail.error.xml.h:112 +msgid "" +"This folder may have been added implicitly,\n" +"go to the Search Folder editor to add it explicitly, if required." +msgstr "" +"Denne mappe er muligvis blevet tilføjet implicit, brug søgemappe-" +"redigeringen for at tilføje den eksplicit, om nødvendigt." -#: ../mail/mail-config.glade.h:72 -msgid "Do not mar_k messages as junk if sender is in my address book" -msgstr "Mar_ker ikke breve som spam hvis afsenderen er i min adressebog" +#: ../mail/mail.error.xml.h:114 +msgid "" +"This message cannot be sent because the account you chose to send with is " +"not enabled" +msgstr "" +"Dette brev kan ikke sendes fordi den konto du har valgt at sende med, ikke " +"er aktiveret" -#: ../mail/mail-config.glade.h:73 -msgid "Do not quote" -msgstr "Citér ikke" +#: ../mail/mail.error.xml.h:115 +msgid "" +"This message cannot be sent because you have not specified any recipients" +msgstr "Dette brev kan ikke sendes fordi du ikke har angivet nogen modtagere" -#: ../mail/mail-config.glade.h:74 -msgid "Done" -msgstr "Færdig" +#: ../mail/mail.error.xml.h:116 +msgid "" +"This server does not support this type of authentication and may not support " +"authentication at all." +msgstr "" +"Denne server understøtter ikke denne type godkendelse og understøtter måske " +"ikke godkendelse overhovedet." -#: ../mail/mail-config.glade.h:75 -msgid "Drafts _Folder:" -msgstr "Kladde_mappe:" +#: ../mail/mail.error.xml.h:117 +msgid "This signature has been changed, but has not been saved." +msgstr "Denne signatur er ændret, men er ikke blevet gemt." -#: ../mail/mail-config.glade.h:76 -msgid "Email Accounts" -msgstr "E-post-konti" +#: ../mail/mail.error.xml.h:118 +msgid "" +"This will mark all messages as read in the selected folder and its " +"subfolders." +msgstr "" +"Dette vil markere alle breve som læste i den valgte mappe og dens " +"undermapper." -#: ../mail/mail-config.glade.h:77 -msgid "Email _Address:" -msgstr "E-post_adresse:" +#: ../mail/mail.error.xml.h:119 +msgid "Unable to connect to the GroupWise server." +msgstr "Kan ikke skabe forbindelse til GroupWise-serveren." -#: ../mail/mail-config.glade.h:78 -msgid "Empty trash folders on e_xit" -msgstr "T_øm affaldsmapper ved afslutning" +#: ../mail/mail.error.xml.h:120 +msgid "" +"Unable to open the drafts folder for this account. Use the system drafts " +"folder instead?" +msgstr "" +"Kan ikke åbne kladdemappen for denne konto. Vil du bruge systemkladdemappen " +"i stedet?" -#: ../mail/mail-config.glade.h:79 -msgid "Enable Magic S_pacebar" -msgstr "Slå magisk m_ellemrumstast til" +#: ../mail/mail.error.xml.h:121 +msgid "Unable to read license file." +msgstr "Kan ikke læse licens-fil." -#: ../mail/mail-config.glade.h:80 -msgid "Enable Sea_rch Folders" -msgstr "Slå sø_gemapper til" +#: ../mail/mail.error.xml.h:122 +msgid "Use _Default" +msgstr "Benyt _forvalg" -#: ../mail/mail-config.glade.h:82 -msgid "Encry_ption certificate:" -msgstr "_Krypteringscertifikat:" +#: ../mail/mail.error.xml.h:123 +msgid "Use default drafts folder?" +msgstr "Benyt standardkladdemappen?" -#: ../mail/mail-config.glade.h:83 -msgid "Encrypt out_going messages (by default)" -msgstr "Kryptér ud_gående breve (som forvalg)" +#: ../mail/mail.error.xml.h:124 +msgid "" +"Warning: Deleting messages from a Search Folder will delete the actual " +"message from one of your local or remote folders.\n" +"Do you really want to do this?" +msgstr "" +"Advarsel: Sletning af et brev fra en søgemappe vil slette det rigtige brev " +"fra en af dine lokale eller fjerne mapper. Ønsker du virkelig at gøre dette?" -#: ../mail/mail-config.glade.h:85 -msgid "Fi_xed-width:" -msgstr "_Fastbredde:" +#: ../mail/mail.error.xml.h:127 +msgid "You have not filled in all of the required information." +msgstr "Du har ikke udfyldt al nødvendig information." -#: ../mail/mail-config.glade.h:86 -msgid "Fix_ed width Font:" -msgstr "_Fastbredde-skrifttype:" +#: ../mail/mail.error.xml.h:128 +msgid "You have unsent messages, do you wish to quit anyway?" +msgstr "Du har usendte breve, vil du afslutte alligevel?" -#: ../mail/mail-config.glade.h:87 -msgid "Font Properties" -msgstr "Skrifttypeegenskaber" +#: ../mail/mail.error.xml.h:129 +msgid "You may not create two accounts with the same name." +msgstr "Du kan ikke oprette to konti med samme navn." -#: ../mail/mail-config.glade.h:88 -msgid "Format messages in _HTML" -msgstr "Formatér breve som _HTML" +#: ../mail/mail.error.xml.h:130 +msgid "You must name this Search Folder." +msgstr "Du skal navngive denne søgemappe." -#: ../mail/mail-config.glade.h:89 -msgid "Full Nam_e:" -msgstr "Fuld_e navn:" +#: ../mail/mail.error.xml.h:131 +msgid "You must specify a folder." +msgstr "Du skal angive en mappe." -#: ../mail/mail-config.glade.h:91 -msgid "HTML Messages" -msgstr "HTML-Breve" +#: ../mail/mail.error.xml.h:132 +msgid "" +"You must specify at least one folder as a source.\n" +"Either by selecting the folders individually, and/or by selecting all local " +"folders, all remote folders, or both." +msgstr "" +"Du skal angive mindst en mappe som værende kilde.\n" +"Enten ved at vælge mapperne individuelt, og/eller ved at vælge\n" +"alle lokale mapper, alle eksterne mapper eller begge." -#: ../mail/mail-config.glade.h:92 -msgid "H_TTP Proxy:" -msgstr "H_TTP-Proxy:" +#: ../mail/mail.error.xml.h:134 +msgid "Your login to your server \"{0}\" as \"{0}\" failed." +msgstr "Dit logind på serveren \"{0}\" som \"{0}\" mislykkedes." -#: ../mail/mail-config.glade.h:93 -msgid "Headers" -msgstr "Brevhoved" +#: ../mail/mail.error.xml.h:135 +msgid "_Append" +msgstr "_Tilføj" -#: ../mail/mail-config.glade.h:94 -msgid "Highlight _quotations with" -msgstr "Markér _citat med" +#: ../mail/mail.error.xml.h:136 +msgid "_Discard changes" +msgstr "_Forkast ændringer" -#: ../mail/mail-config.glade.h:96 -msgid "Inline" -msgstr "Integreret" +#: ../mail/mail.error.xml.h:137 +msgid "_Do not Synchronize" +msgstr "Synkronisér _ikke" -#: ../mail/mail-config.glade.h:97 -msgid "Inline (Outlook style)" -msgstr "Integreret (som i Outlook)" +#: ../mail/mail.error.xml.h:139 +msgid "_Expunge" +msgstr "_Tøm" -#: ../mail/mail-config.glade.h:99 -msgid "KB" -msgstr "Kb" +#: ../mail/mail.error.xml.h:140 +msgid "_Open Messages" +msgstr "_Åbn breve" -#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8 -msgid "Labels" -msgstr "Mærkater" +#: ../mail/message-list.c:1052 +msgid "Unseen" +msgstr "Ulæst" -#: ../mail/mail-config.glade.h:101 -msgid "Languages Table" -msgstr "Sprogtabel" +#: ../mail/message-list.c:1053 +msgid "Seen" +msgstr "Læst" -#: ../mail/mail-config.glade.h:102 -msgid "Mail Configuration" -msgstr "Opsætning af postsystem" +#: ../mail/message-list.c:1054 +msgid "Answered" +msgstr "Besvaret" -#: ../mail/mail-config.glade.h:103 -msgid "Mail Headers Table" -msgstr "Brevhovedtabel" +#: ../mail/message-list.c:1055 +msgid "Forwarded" +msgstr "Videresendt" -#: ../mail/mail-config.glade.h:105 -msgid "Mailbox location" -msgstr "Placering af brevbakke" +#: ../mail/message-list.c:1056 +msgid "Multiple Unseen Messages" +msgstr "Flere ulæste breve" -#: ../mail/mail-config.glade.h:106 -msgid "Message Composer" -msgstr "Brevredigering" +#: ../mail/message-list.c:1057 +msgid "Multiple Messages" +msgstr "Flere breve" -#: ../mail/mail-config.glade.h:107 -msgid "No _Proxy for:" -msgstr "Ingen _proxy for:" +#: ../mail/message-list.c:1061 +msgid "Lowest" +msgstr "Lavest" -#: ../mail/mail-config.glade.h:108 -msgid "" -"Note: Underscore in the label name is used as mnemonic identifier in menu." -msgstr "" -"Bemærk: Bundstreger i mærkatnavnet bliver brugt som mnemoteknisk id i menuen." +#: ../mail/message-list.c:1062 +msgid "Lower" +msgstr "Lavere" -#: ../mail/mail-config.glade.h:109 -msgid "" -"Note: you will not be prompted for a password until you connect for the " -"first time" -msgstr "" -"Bemærk: du bliver ikke spurgt om adgangskoden før du tilslutter første gang" +#: ../mail/message-list.c:1066 +msgid "Higher" +msgstr "Højere" -#: ../mail/mail-config.glade.h:110 -msgid "Option is ignored if a match for custom junk headers is found." -msgstr "" -"Denne valgmulighed vil blive ignoreret, hvis der er et træf med tilpassede " -"spam-brevhoveder." +#: ../mail/message-list.c:1067 +msgid "Highest" +msgstr "Højest" -#: ../mail/mail-config.glade.h:111 -msgid "Or_ganization:" -msgstr "Or_ganisation:" +#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55 +msgid "?" +msgstr "?" -#: ../mail/mail-config.glade.h:112 -msgid "PGP/GPG _Key ID:" -msgstr "PGP/GPG-_nøgleid:" +#. strftime format of a time, +#. in 12-hour format, without seconds. +#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205 +#: ../widgets/table/e-cell-date.c:71 +msgid "Today %l:%M %p" +msgstr "I dag %H:%M" -#: ../mail/mail-config.glade.h:113 -msgid "Pass_word:" -msgstr "Adgangs_kode:" +#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:81 +msgid "Yesterday %l:%M %p" +msgstr "I går %H:%M" -#: ../mail/mail-config.glade.h:115 -msgid "" -"Please enter a descriptive name for this account in the space below.\n" -"This name will be used for display purposes only." -msgstr "" -"Angiv venligst et beskrivende navn for denne konto på pladsen nedenfor.\n" -"Dette navn vil kun blive brugt til fremvisningsformål." +#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:93 +msgid "%a %l:%M %p" +msgstr "%a %H:%M" -#: ../mail/mail-config.glade.h:117 -msgid "" -"Please enter information about the way you will send mail. If you are not " -"sure, ask your system administrator or Internet Service Provider." -msgstr "" -"Angiv information om hvordan du vil sende e-post. Hvis du ikke er sikker bør " -"du spørge din systemadministrator eller Internetleverandør." +#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:101 +msgid "%b %d %l:%M %p" +msgstr "%d %b %H:%M" -#: ../mail/mail-config.glade.h:118 +#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:103 +msgid "%b %d %Y" +msgstr "%d %b %Y" + +#. there is some info why the message list is empty, let it be something useful +#: ../mail/message-list.c:3986 ../mail/message-list.c:4460 +msgid "Generating message list" +msgstr "Danner brevindeks" + +#: ../mail/message-list.c:4299 msgid "" -"Please enter your name and email address below. The \"optional\" fields " -"below do not need to be filled in, unless you wish to include this " -"information in email you send." +"No message satisfies your search criteria. Either clear search with Search-" +">Clear menu item or change it." msgstr "" -"Angiv dit navn og din e-post-adresse nedenfor. De \"valgfrie\" felter " -"nedenfor behøver ikke at blive udfyldt, medmindre du ønsker at inkludere " -"disse oplysninger i den e-post du sender." +"Ingen beskeder passer til dine søgekriterier. Ryd enten søgningen med " +"menuvalget Søg->Ryd eller ændr den." -#: ../mail/mail-config.glade.h:119 -msgid "Please select among the following options" -msgstr "Vælg venligst mellem følgende valgmuligheder" +#: ../mail/message-list.c:4301 +msgid "There are no messages in this folder." +msgstr "Der er ingen beskeder i denne mappe." -#: ../mail/mail-config.glade.h:120 -msgid "Port:" -msgstr "Port:" +#: ../mail/message-list.etspec.h:3 +msgid "Due By" +msgstr "Skal afleveres den" -#: ../mail/mail-config.glade.h:121 -msgid "Pr_ompt when sending messages with only Bcc recipients defined" -msgstr "Sp_ørg når der sendes breve kun med blindkopimodtagere" +#: ../mail/message-list.etspec.h:4 +msgid "Flag Status" +msgstr "Markeringsstatus" -#: ../mail/mail-config.glade.h:122 -msgid "Quoted" -msgstr "Citeret" +#: ../mail/message-list.etspec.h:5 +msgid "Flagged" +msgstr "Markerede" -#: ../mail/mail-config.glade.h:123 -msgid "Re_member password" -msgstr "_Husk adgangskode" +#: ../mail/message-list.etspec.h:6 +msgid "Follow Up Flag" +msgstr "Følg-op-markering" -#: ../mail/mail-config.glade.h:124 -msgid "Re_ply-To:" -msgstr "Sva_r-til:" - -#: ../mail/mail-config.glade.h:126 -msgid "Remember _password" -msgstr "Husk _adgangskode" - -#: ../mail/mail-config.glade.h:127 -msgid "S_OCKS Host:" -msgstr "S_OCKS-vært:" +#: ../mail/message-list.etspec.h:11 +msgid "Received" +msgstr "Modtaget" -#: ../mail/mail-config.glade.h:128 -msgid "S_earch for sender photograph only in local address books" -msgstr "S_øg kun efter afsenderens foto i de lokale adressebøger" +#: ../mail/message-list.etspec.h:15 +msgid "Sent Messages" +msgstr "Sendte breve" -#: ../mail/mail-config.glade.h:129 -msgid "S_elect..." -msgstr "_Vælg..." +#: ../mail/message-list.etspec.h:16 +#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4 +#: ../widgets/misc/e-attachment-tree-view.c:542 +msgid "Size" +msgstr "Størrelse" -#: ../mail/mail-config.glade.h:130 -msgid "S_end message receipts:" -msgstr "S_end kvitteringer for breve:" +#: ../mail/message-list.etspec.h:19 +msgid "Subject - Trimmed" +msgstr "Emne - Trimmet" -#: ../mail/mail-config.glade.h:131 -msgid "S_tandard Font:" -msgstr "Stan_dard-skrifttype:" +#: ../mail/message-tag-followup.c:55 +msgid "Call" +msgstr "Ring" -#: ../mail/mail-config.glade.h:133 -msgid "Select Drafts Folder" -msgstr "Vælg udkastmappe" +#: ../mail/message-tag-followup.c:56 +msgid "Do Not Forward" +msgstr "Videresend ikke" -#: ../mail/mail-config.glade.h:134 -msgid "Select HTML fixed width font" -msgstr "Vælg HTML-skrifttype med fast bredde" +#: ../mail/message-tag-followup.c:57 +msgid "Follow-Up" +msgstr "Følg op" -#: ../mail/mail-config.glade.h:135 -msgid "Select HTML fixed width font for printing" -msgstr "Vælg HTML-skrifttype med fast bredde til udskrivning" +#: ../mail/message-tag-followup.c:58 +msgid "For Your Information" +msgstr "Til din oplysning" -#: ../mail/mail-config.glade.h:136 -msgid "Select HTML variable width font" -msgstr "Vælg HTML-skrifttype med variabel bredde" +#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42 +msgid "Forward" +msgstr "Videresend" -#: ../mail/mail-config.glade.h:137 -msgid "Select HTML variable width font for printing" -msgstr "Vælg HTML-skrifttype med variabel bredde til udskrift" +#: ../mail/message-tag-followup.c:60 +msgid "No Response Necessary" +msgstr "Intet svar er påkrævet" -#: ../mail/mail-config.glade.h:138 -msgid "Select Sent Folder" -msgstr "Vælg \"Afsendte\"-mappen" +#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:76 +msgid "Reply" +msgstr "Svar" -#: ../mail/mail-config.glade.h:140 -msgid "Sending Mail" -msgstr "Sender brev(e)" +#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:77 +msgid "Reply to All" +msgstr "Svar til alle" -#: ../mail/mail-config.glade.h:141 -msgid "Sent _Messages Folder:" -msgstr "Mappe til sendte _breve:" +#: ../mail/message-tag-followup.c:65 +msgid "Review" +msgstr "Gennemse" -#: ../mail/mail-config.glade.h:142 -msgid "Ser_ver requires authentication" -msgstr "Server kræver _godkendelse" +#: ../mail/searchtypes.xml.h:1 +msgid "Body contains" +msgstr "Brevindhold indeholder" -#: ../mail/mail-config.glade.h:143 -msgid "Server _Type: " -msgstr "Server_type: " +#: ../mail/searchtypes.xml.h:2 +msgid "Message contains" +msgstr "Brev indeholder" -#: ../mail/mail-config.glade.h:144 -msgid "Sig_ning certificate:" -msgstr "_Certifikat til signatur:" +#: ../mail/searchtypes.xml.h:3 +msgid "Recipients contain" +msgstr "Modtagere indeholder" -#: ../mail/mail-config.glade.h:145 -msgid "Signat_ure:" -msgstr "Signat_ur:" +#: ../mail/searchtypes.xml.h:4 +msgid "Sender contains" +msgstr "Afsender indeholder" -#: ../mail/mail-config.glade.h:146 -msgid "Signatures" -msgstr "Signaturer" +#: ../mail/searchtypes.xml.h:5 +msgid "Subject contains" +msgstr "Emne indeholder" -#: ../mail/mail-config.glade.h:147 -msgid "Signatures Table" -msgstr "Signaturtabel" +#: ../mail/searchtypes.xml.h:6 +msgid "Subject or Recipients contains" +msgstr "Emne eller modtagere indeholder" -#: ../mail/mail-config.glade.h:148 -msgid "Spell Checking" -msgstr "Stavekontrol" +#: ../mail/searchtypes.xml.h:7 +msgid "Subject or Sender contains" +msgstr "Emne eller afsender indeholder" -#: ../mail/mail-config.glade.h:149 -msgid "Start _typing at the bottom on replying" -msgstr "Påbegynd _skrivning i bunden når der svares" +#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1 +#, fuzzy +msgid "Add local address books to Evolution." +msgstr "Vis lokale adressebogmapper" -#: ../mail/mail-config.glade.h:150 -msgid "T_ype: " -msgstr "_Type: " +#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2 +msgid "Local Address Books" +msgstr "Lokale adressebøger" -#: ../mail/mail-config.glade.h:151 +#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1 msgid "" -"The list of languages here reflects only the languages for which you have a " -"dictionary installed." +"List of clues for the attachment reminder plugin to look for in a message " +"body" msgstr "" -"Listen med sprog viser kun de sprog for hvilke en ordbog er installeret." +"Liste af spor som udvidelsesmodulet til påmindelse om bilag skal kigge efter " +"i brevkroppen" -#: ../mail/mail-config.glade.h:152 +#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2 msgid "" -"The output of this script will be used as your\n" -"signature. The name you specify will be used\n" -"for display purposes only. " +"List of clues for the attachment reminder plugin to look for in a message " +"body." +msgstr "" +"Liste af spor som udvidelsesmodulet til påmindelse om bilag skal kigge efter " +"i brevkroppen." + +#: ../plugins/attachment-reminder/attachment-reminder.c:478 +#: ../plugins/templates/templates.c:390 +msgid "Keywords" +msgstr "Nøgleord" + +#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1 +#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1 +msgid "Attachment Reminder" +msgstr "Bilagspåmindelse" + +#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2 +msgid "Reminds you when you forgot to add an attachment to a mail message." msgstr "" -"Uddata fra dette skript vil blive brugt som\n" -"din signatur. Navnet du angiver vil kun blive\n" -"brugt ved visning. " -#: ../mail/mail-config.glade.h:155 +#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2 msgid "" -"Type the name by which you would like to refer to this account.\n" -"For example: \"Work\" or \"Personal\"" +"Evolution has found some keywords that suggest that this message should " +"contain an attachment, but cannot find one." msgstr "" -"Indtast navnet som skal henvise til denne konto.\n" -"For eksempel: \"Job\" eller \"Personlig\"" +"Evolution has fundet nogle nøgleord som antyder at dette brev skulle have et " +"bilag vedhæftet, men kan ikke finde noget." -#: ../mail/mail-config.glade.h:157 -msgid "Us_ername:" -msgstr "Bruger_navn:" +#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3 +msgid "Message has no attachments" +msgstr "Brev har ikke noget bilag" -#: ../mail/mail-config.glade.h:158 -msgid "Use Authe_ntication" -msgstr "Brug godkendelse" +#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4 +msgid "_Add attachment..." +msgstr "_Tilføj bilag..." -#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387 -#: ../plugins/google-account-setup/google-source.c:615 -#: ../plugins/google-account-setup/google-contacts-source.c:316 -#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348 -msgid "User_name:" -msgstr "Bruger_navn:" +#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5 +msgid "_Edit Message" +msgstr "Re_digér brev" -#: ../mail/mail-config.glade.h:160 -msgid "V_ariable-width:" -msgstr "V_ariabel bredde:" +#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1 +#, fuzzy +msgid "Audio Inline" +msgstr "Integreret lyd-udvidelsesmodul" -#: ../mail/mail-config.glade.h:161 -msgid "" -"Welcome to the Evolution Mail Configuration Assistant.\n" -"\n" -"Click \"Forward\" to begin. " +#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2 +msgid "Play audio attachments directly from Evolution." msgstr "" -"Velkommen til assistenten for konfiguration af Evolution e-post.\n" -"\n" -"Klik \"Fremad\" for at begynde. " -#: ../mail/mail-config.glade.h:164 -msgid "_Add Signature" -msgstr "_Tilføj signatur" +#: ../plugins/backup-restore/backup-restore.c:139 +msgid "Select name of the Evolution backup file" +msgstr "Vælg navn til Evolutions sikkerhedskopifil" -#: ../mail/mail-config.glade.h:165 -msgid "_Always load images from the Internet" -msgstr "_Indlæs altid billeder fra internettet" +#: ../plugins/backup-restore/backup-restore.c:168 +msgid "_Restart Evolution after backup" +msgstr "_Genstart Evolution efter sikkerhedskopiering" -#: ../mail/mail-config.glade.h:166 -msgid "_Automatic proxy configuration URL:" -msgstr "URL for _automatisk proxykonfiguration:" +#: ../plugins/backup-restore/backup-restore.c:191 +msgid "Select name of the Evolution backup file to restore" +msgstr "" +"Vælg navn for den Evolution-sikkerhedskopifil som der skal genoprettes fra" -#: ../mail/mail-config.glade.h:167 -msgid "_Default junk plugin:" -msgstr "_Forvalgt spam-udvidelsesmodul:" +#: ../plugins/backup-restore/backup-restore.c:215 +msgid "_Restart Evolution after restore" +msgstr "_Genstart Evolution efter genoprettelse" -#: ../mail/mail-config.glade.h:168 -msgid "_Direct connection to the Internet" -msgstr "_Direkte forbindelse til internettet" +#: ../plugins/backup-restore/backup-restore.c:288 +msgid "Restore from backup" +msgstr "Genopret fra sikkerhedskopifil" -#: ../mail/mail-config.glade.h:169 -msgid "_Do not sign meeting requests (for Outlook compatibility)" -msgstr "Signér _ikke mødeindkaldelser (for kompatibilitet med Outlook)" +#: ../plugins/backup-restore/backup-restore.c:290 +msgid "" +"You can restore Evolution from your backup. It can restore all the Mails, " +"Calendars, Tasks, Memos, Contacts. \n" +"It also restores all your personal settings, mail filters etc." +msgstr "" +"Du kan genoprette Evolution fra din sikkerhedskopi. Dette kan genoprette " +"alle breve, kalendere, opgaver, huskesedler og kontaktpersoner. \n" +"Det kan også genoprette alle dine personlige indstillinger for f.eks. " +"postfiltre." -#: ../mail/mail-config.glade.h:171 -msgid "_Forward style:" -msgstr "_Videresendelsesformat:" +#: ../plugins/backup-restore/backup-restore.c:296 +msgid "_Restore Evolution from the backup file" +msgstr "_Genopret Evolution fra sikkerhedskopifil" -#: ../mail/mail-config.glade.h:172 -msgid "_Keep Signature above the original message on replying" -msgstr "_Hold signaturen over den oprindelige besked ved svar" +#: ../plugins/backup-restore/backup-restore.c:303 +msgid "Please select an Evolution Archive to restore:" +msgstr "Vælg Evolution-arkiv som skal genoprettes:" -#: ../mail/mail-config.glade.h:173 -msgid "_Load images in messages from contacts" -msgstr "_Indlæs billeder i breve fra kontaktpersoner" +#: ../plugins/backup-restore/backup-restore.c:306 +msgid "Choose a file to restore" +msgstr "Vælg en fil der skal genoprettes" -#: ../mail/mail-config.glade.h:174 -msgid "_Lookup in local address book only" -msgstr "_Søg kun i lokale adressebøger" +#: ../plugins/backup-restore/backup.c:62 +msgid "Backup Evolution directory" +msgstr "Tag en sikkerhedskopi af Evolution-mappen" -#: ../mail/mail-config.glade.h:175 -msgid "_Make this my default account" -msgstr "_Gør dette til min standardkonto" - -#: ../mail/mail-config.glade.h:176 -msgid "_Manual proxy configuration:" -msgstr "_Manuel proxykonfiguration:" - -#: ../mail/mail-config.glade.h:177 -msgid "_Mark messages as read after" -msgstr "Markér breve som l_æste efter" +#: ../plugins/backup-restore/backup.c:64 +msgid "Restore Evolution directory" +msgstr "Genopret Evolution-mappen" -#: ../mail/mail-config.glade.h:179 -msgid "_Never load images from the Internet" -msgstr "Indlæs _aldrig billeder fra internettet" +#: ../plugins/backup-restore/backup.c:66 +msgid "Check Evolution Backup" +msgstr "Tjek Evolution sikkerhedskopi" -#: ../mail/mail-config.glade.h:180 -msgid "_Path:" -msgstr "S_ti:" +#: ../plugins/backup-restore/backup.c:68 +msgid "Restart Evolution" +msgstr "Genstart Evolution" -#: ../mail/mail-config.glade.h:181 -msgid "_Prompt on sending HTML mail to contacts that do not want them" -msgstr "_Spørg når HTML-breve sendes til kontaktpersoner som ikke vil have dem" +#: ../plugins/backup-restore/backup.c:70 +msgid "With Graphical User Interface" +msgstr "Med grafisk brugergrænseflade" -#: ../mail/mail-config.glade.h:182 -msgid "_Prompt when sending messages with an empty subject line" -msgstr "Spørg når breve sendes med en _tom emnelinie" +#: ../plugins/backup-restore/backup.c:187 +#: ../plugins/backup-restore/backup.c:235 +msgid "Shutting down Evolution" +msgstr "Lukker Evolution ned" -#: ../mail/mail-config.glade.h:183 -msgid "_Reply style:" -msgstr "_Svarsstil:" +#: ../plugins/backup-restore/backup.c:194 +msgid "Backing Evolution accounts and settings" +msgstr "Tager sikkerhedskopi af Evolution-konti og indstillinger" -#: ../mail/mail-config.glade.h:184 -msgid "_Script:" -msgstr "_Skript:" +#: ../plugins/backup-restore/backup.c:200 +msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)" +msgstr "" +"Tager sikkerhedskopi af Evolution-data (Breve, kontakterpersoner, kalender, " +"opgaver og huskesedler)" -#: ../mail/mail-config.glade.h:185 -msgid "_Secure HTTP Proxy:" -msgstr "_Sikker HTTP-proxy:" +#: ../plugins/backup-restore/backup.c:211 +msgid "Backup complete" +msgstr "Sikkerhedkopi fuldført" -#: ../mail/mail-config.glade.h:186 -msgid "_Select..." -msgstr "_Vælg..." +#: ../plugins/backup-restore/backup.c:216 +#: ../plugins/backup-restore/backup.c:269 +msgid "Restarting Evolution" +msgstr "Genstarter Evolution" -#. If enabled, show animation; if disabled, only display a static image without any animation -#: ../mail/mail-config.glade.h:189 -msgid "_Show image animations" -msgstr "_Vis billed-animationer" +#: ../plugins/backup-restore/backup.c:239 +msgid "Backup current Evolution data" +msgstr "Tag en sikkerhedskopi af nuværende Evolution-data" -#: ../mail/mail-config.glade.h:190 -msgid "_Show the photograph of sender in the message preview" -msgstr "_Vis afsenderens foto i forhåndsvisning af e-breve" +#: ../plugins/backup-restore/backup.c:244 +msgid "Extracting files from backup" +msgstr "Pakker filer ud fra sikkerhedskopi" -#: ../mail/mail-config.glade.h:191 -msgid "_Shrink To / Cc / Bcc headers to " -msgstr "Begræns synlige _To-/CC-/Bcc-linjer til " +#: ../plugins/backup-restore/backup.c:251 +msgid "Loading Evolution settings" +msgstr "Indlæser Evolution-indstillinger" -#: ../mail/mail-config.glade.h:192 -msgid "_Use Secure Connection:" -msgstr "_Brug sikker forbindelse:" +#: ../plugins/backup-restore/backup.c:258 +msgid "Removing temporary backup files" +msgstr "Fjerner midlertidige sikkerhedskopifiler" -#: ../mail/mail-config.glade.h:193 -msgid "_Use system defaults" -msgstr "_Benyt systemforvalg" +#: ../plugins/backup-restore/backup.c:265 +msgid "Ensuring local sources" +msgstr "Sikrer lokale kilder" -#: ../mail/mail-config.glade.h:194 -msgid "_Use the same fonts as other applications" -msgstr "Br_ug de samme skrifttyper som andre programmer" +#: ../plugins/backup-restore/backup.c:386 +#, c-format +msgid "Backing up to the folder %s" +msgstr "Tager sikkerhedkopi til mappen %s" -#: ../mail/mail-config.glade.h:195 -msgid "addresses" -msgstr "adresser" +#: ../plugins/backup-restore/backup.c:391 +#, c-format +msgid "Restoring from the folder %s" +msgstr "Genopretter fra mappen %s" -#: ../mail/mail-config.glade.h:196 -msgid "color" -msgstr "farve" +#. Backup / Restore only can have GUI. We should restrict the rest +#: ../plugins/backup-restore/backup.c:411 +msgid "Evolution Backup" +msgstr "Evolution sikkerhedskopiering" -#: ../mail/mail-config.glade.h:197 -msgid "description" -msgstr "beskrivelse" +#: ../plugins/backup-restore/backup.c:411 +msgid "Evolution Restore" +msgstr "Evolution genoprettelse" -#: ../mail/mail-dialogs.glade.h:1 -msgid " " -msgstr " " +#: ../plugins/backup-restore/backup.c:446 +msgid "Backing up Evolution Data" +msgstr "Tager sikkerhedskopi af Evolution-data" -#: ../mail/mail-dialogs.glade.h:2 -msgid "Search Folder Sources" -msgstr "Søgemappe-kilder" +#: ../plugins/backup-restore/backup.c:447 +msgid "Please wait while Evolution is backing up your data." +msgstr "Vent venligst mens Evolution laver en sikkerhedskopi af dine data." -#: ../mail/mail-dialogs.glade.h:3 -msgid "Digital Signature" -msgstr "Digital signatur" +#: ../plugins/backup-restore/backup.c:449 +msgid "Restoring Evolution Data" +msgstr "Gendanner Evolution-data" -#: ../mail/mail-dialogs.glade.h:4 -msgid "Encryption" -msgstr "Kryptering" +#: ../plugins/backup-restore/backup.c:450 +msgid "Please wait while Evolution is restoring your data." +msgstr "Vent venligst mens Evolution gendanner dine data." -#: ../mail/mail-dialogs.glade.h:5 -msgid "All active remote folders" -msgstr "Alle aktive, eksterne mapper" +#: ../plugins/backup-restore/backup.c:468 +msgid "This may take a while depending on the amount of data in your account." +msgstr "Dette kan tage nogen tid alt efter mængden af data i din konto." -#: ../mail/mail-dialogs.glade.h:6 -msgid "All local and active remote folders" -msgstr "Alle lokale og aktive, eksterne mapper" +#. the path to the shared library +#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2 +#, fuzzy +msgid "Backup and Restore" +msgstr "Udvidelsesmodul: sikkerhedskopier og genoprettelse" -#: ../mail/mail-dialogs.glade.h:7 -msgid "All local folders" -msgstr "Alle lokale mapper" +#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3 +#, fuzzy +msgid "Backup and restore your Evolution data and settings." +msgstr "Tag en sikkerhedskopi og genopret Evolution-data og indstillinger" -#: ../mail/mail-dialogs.glade.h:8 -msgid "Case _sensitive" -msgstr "Skeln mellem _store/små bogstaver" +#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1 +msgid "Are you sure you want to close Evolution?" +msgstr "Er du sikker på at du ønsker at afslutte Evolution?" -#: ../mail/mail-dialogs.glade.h:9 -msgid "Co_mpleted" -msgstr "_Fuldført" +#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2 +msgid "" +"Are you sure you want to restore Evolution from the selected backup file?" +msgstr "" +"Er du sikker på du ønsker genoprette Evolution fra den valgte " +"sikkerhedskopifil?" -#: ../mail/mail-dialogs.glade.h:10 -msgid "F_ind:" -msgstr "F_ind:" +#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3 +msgid "" +"Evolution backup can start only when Evolution is not running. Please make " +"sure that you save and close all your unsaved windows before proceeding. If " +"you want Evolution to restart automatically after backup, please enable the " +"toggle button." +msgstr "" +"Evolution-sikkerhedskopiering kan kun starte når Evolution ikke kører. Sikr " +"dig at du gemmer og lukker alle ugemte vinduer før du går videre. Hvis du " +"ønsker at Evolution skal genstarte automatisk efter sikkerhedskopiering så " +"slå til/fra knappen til." -#: ../mail/mail-dialogs.glade.h:11 -msgid "Find in Message" -msgstr "Søg efter i brev" +#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4 +msgid "Insufficient Permissions" +msgstr "Utilstrækkelige rettigheder" -#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276 -msgid "Flag to Follow Up" -msgstr "Markér til opfølgning" +#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5 +msgid "Invalid Evolution backup file" +msgstr "Ugyldig Evolution-sikkerhedskopifil" -#: ../mail/mail-dialogs.glade.h:13 -msgid "Folder Subscriptions" -msgstr "Mappeabonnementer" +#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6 +msgid "Please select a valid backup file to restore." +msgstr "Vælg en gyldig sikkerhedskopifile, der skal genoprettes." -#: ../mail/mail-dialogs.glade.h:14 -msgid "License Agreement" -msgstr "Licensaftale" +#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7 +msgid "The selected folder is not writable." +msgstr "Der kan ikke skrives til den valgte mappe." -#: ../mail/mail-dialogs.glade.h:15 -msgid "None Selected" -msgstr "Ingen valgt" +#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8 +msgid "" +"This will delete all your current Evolution data and settings and restore " +"them from your backup. Evolution restore can start only when Evolution is " +"not running. Please make sure that you close all your unsaved windows before " +"you proceed. If you want Evolution to restart automatically restart after " +"restore, please enable the toggle button." +msgstr "" +"Dette vil slette alle dine nuværende Evolution-data og indstillinger og " +"genoprette nogle andre fra din sikkerhedskopifil. Evolution genoprettelse " +"kan kun starte når Evolution ikke kører. Sikr dig at du lukker alle ugemte " +"vinduer før du fortsætter. Hvis du ønsker at Evolution skal genstarte " +"automatisk efter genoprettelsen så slå til/fra knappen til." -#: ../mail/mail-dialogs.glade.h:16 -msgid "S_erver:" -msgstr "S_erver:" +#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1 +msgid "Backup and restore Evolution data and settings" +msgstr "Tag en sikkerhedskopi og genopret Evolution-data og indstillinger" -#: ../mail/mail-dialogs.glade.h:17 -msgid "Security Information" -msgstr "Sikkerhedsinformation" +#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2 +msgid "R_estore Settings..." +msgstr "G_enopret indstillinger..." -#: ../mail/mail-dialogs.glade.h:18 -msgid "Specific folders" -msgstr "Specifikke mapper" +#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3 +msgid "_Backup Settings..." +msgstr "_Sikkerhedskopi-indstillinger..." -#: ../mail/mail-dialogs.glade.h:19 -msgid "" -"The messages you have selected for follow up are listed below.\n" -"Please select a follow up action from the \"Flag\" menu." -msgstr "" -"De meddelelser som du vil følge op vises nedenfor.\n" -"Vælg en opfølgningshandling fra menupunktet \"Markering\"." +#: ../plugins/bbdb/bbdb.c:624 ../plugins/bbdb/bbdb.c:633 +#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1 +msgid "Automatic Contacts" +msgstr "Automatisk tilføjede kontaktpersoner" -#: ../mail/mail-dialogs.glade.h:21 -msgid "_Accept License" -msgstr "_Acceptér licens" +#. Enable BBDB checkbox +#: ../plugins/bbdb/bbdb.c:648 +#, fuzzy +msgid "Create _address book entries when sending mails" +msgstr "Føj kontaktpersoner _automatisk til adressebog ved besvarelse af breve" -#: ../mail/mail-dialogs.glade.h:22 -msgid "_Due By:" -msgstr "_Forfalder den:" +#: ../plugins/bbdb/bbdb.c:654 +msgid "Select Address book for Automatic Contacts" +msgstr "Vælg adressebog til automatisk tilføjede kontaktpersoner" -#: ../mail/mail-dialogs.glade.h:23 -msgid "_Flag:" -msgstr "_Markering:" +#: ../plugins/bbdb/bbdb.c:669 +msgid "Instant Messaging Contacts" +msgstr "Kvikbesked-kontaktpersoner" -#: ../mail/mail-dialogs.glade.h:24 -msgid "_Tick this to accept the license agreement" -msgstr "_Afkryds dette for at acceptere licensaftalen" +#. Enable Gaim Checkbox +#: ../plugins/bbdb/bbdb.c:684 +msgid "Synchronize contact info and images from Pidgin buddy list" +msgstr "" +"Synkronisér information om kontaktpersoner og billeder fra en Pidgin-" +"venneliste" -#: ../mail/mail-folder-cache.c:834 -#, c-format -msgid "Pinging %s" -msgstr "Pinger %s" +#: ../plugins/bbdb/bbdb.c:690 +msgid "Select Address book for Pidgin buddy list" +msgstr "Vælg adressebog til Pidgin-venneliste" -#: ../mail/mail-ops.c:106 -msgid "Filtering Selected Messages" -msgstr "Filtrerer valgte beskeder" +#. Synchronize now button. +#: ../plugins/bbdb/bbdb.c:701 +msgid "Synchronize with _buddy list now" +msgstr "Synkronisér med _venneliste nu" -#: ../mail/mail-ops.c:265 -msgid "Fetching Mail" -msgstr "Henter e-post" +#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2 +msgid "BBDB" +msgstr "BBDB" -#. sending mail, filtering failed -#: ../mail/mail-ops.c:561 -#, c-format -msgid "Failed to apply outgoing filters: %s" -msgstr "Det mislykkedes at anvende de udgående filtre: %s" - -#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602 -#, c-format +#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3 +#, fuzzy msgid "" -"Failed to append to %s: %s\n" -"Appending to local `Sent' folder instead." +"Takes the gruntwork out of managing your address book.\n" +"\n" +"Automatically fills your address book with names and email addresses as you " +"reply to messages. Also fills in IM contact information from your buddy " +"lists." msgstr "" -"Det mislykkedes at føje til %s: %s\n" -"Føjer til lokal \"Sendt\"-mappe i stedet." - -#: ../mail/mail-ops.c:619 -#, c-format -msgid "Failed to append to local `Sent' folder: %s" -msgstr "Det mislykkedes at føje til den lokale \"sendt\"-mappe: %s" - -#: ../mail/mail-ops.c:725 -msgid "Sending message" -msgstr "Sender brev" +"Tilføjer navne og adresser automatisk til din adressebog efterhånden som du " +"svarer på breve. Tilføjer også kontaktinformation fra din kvikbesked-" +"venneliste." -#: ../mail/mail-ops.c:735 +#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself. +#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161 #, c-format -msgid "Sending message %d of %d" -msgstr "Sender brev %d af %d" +msgid "Error occurred while spawning %s: %s." +msgstr "Fejl opstod under opstart af %s: %s." -#: ../mail/mail-ops.c:762 +#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186 #, c-format -msgid "Failed to send %d of %d messages" -msgstr "Det mislykkedes at sende %d af %d breve" - -#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700 -msgid "Canceled." -msgstr "Annulleret." - -#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702 -msgid "Complete." -msgstr "Fuldført." - -#: ../mail/mail-ops.c:872 -msgid "Saving message to folder" -msgstr "Gemmer brev i mappe" +msgid "Bogofilter child process does not respond, killing..." +msgstr "Bogofilter-underproces svarer ikke, afslutter den..." -#: ../mail/mail-ops.c:950 +#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188 #, c-format -msgid "Moving messages to %s" -msgstr "Flytter breve til %s" +msgid "Wait for Bogofilter child process interrupted, terminating..." +msgstr "Venten på Bogofilter-underproces afbrudt, afslutter den..." -#: ../mail/mail-ops.c:950 +#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211 #, c-format -msgid "Copying messages to %s" -msgstr "Kopierer breve til %s" +msgid "Pipe to Bogofilter failed, error code: %d." +msgstr "Rør til Bogofilter fejlede, fejlkode: %d." -#: ../mail/mail-ops.c:1167 -msgid "Forwarded messages" -msgstr "Videresendte breve" +#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374 +msgid "Convert message text to _Unicode" +msgstr "Konvertér brevtekst til _Unicode" -#: ../mail/mail-ops.c:1208 -#, c-format -msgid "Opening folder %s" -msgstr "Åbner mappe %s" +#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1 +msgid "Convert mail messages to Unicode" +msgstr "Konvertér brevtekst til Unicode" -#: ../mail/mail-ops.c:1273 -#, c-format -msgid "Retrieving quota information for folder %s" -msgstr "Henter kvoteinformation for mappen %s" +#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2 +msgid "" +"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from " +"different character sets." +msgstr "" +"Konvertér brevtekst til Unicode UTF-8 for at forene spam-tekstbidder som " +"kommer fra forskellige tegnsæt." -#: ../mail/mail-ops.c:1342 -#, c-format -msgid "Opening store %s" -msgstr "Åbner opbevaringssted %s" +#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1 +#, fuzzy +msgid "Bogofilter Junk Filter" +msgstr "Bogofilter-spamindstillinger" -#: ../mail/mail-ops.c:1413 -#, c-format -msgid "Removing folder %s" -msgstr "Fjerner mappe %s" +#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2 +msgid "Bogofilter Options" +msgstr "Bogofilter-indstillinger" -#: ../mail/mail-ops.c:1531 -#, c-format -msgid "Storing folder '%s'" -msgstr "Gemmer mappe \"%s\"" +#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3 +#, fuzzy +msgid "Filter junk messages using Bogofilter." +msgstr "Sorterer spam fra ved hjælp af Bogofilter." -#: ../mail/mail-ops.c:1594 -#, c-format -msgid "Expunging and storing account '%s'" -msgstr "Tømmer og arkiverer kontoen \"%s\"" +#: ../plugins/caldav/caldav-source.c:64 +msgid "CalDAV" +msgstr "CalDAV" -#: ../mail/mail-ops.c:1595 -#, c-format -msgid "Storing account '%s'" -msgstr "Arkiverer konto \"%s\"" +#: ../plugins/caldav/caldav-source.c:366 +#: ../plugins/calendar-http/calendar-http.c:126 +msgid "_URL:" +msgstr "_Adresse:" -#: ../mail/mail-ops.c:1649 -msgid "Refreshing folder" -msgstr "Opfrisker mappe" +#: ../plugins/caldav/caldav-source.c:390 +#: ../plugins/google-account-setup/google-source.c:606 +#: ../plugins/google-account-setup/google-contacts-source.c:303 +msgid "Use _SSL" +msgstr "Brug _SSL" -#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739 -msgid "Expunging folder" -msgstr "Fjerner slettede breve fra mappe" +#. add refresh option +#: ../plugins/caldav/caldav-source.c:433 +#: ../plugins/calendar-http/calendar-http.c:263 +#: ../plugins/calendar-weather/calendar-weather.c:508 +#: ../plugins/google-account-setup/google-source.c:630 +#: ../plugins/google-account-setup/google-contacts-source.c:322 +msgid "Re_fresh:" +msgstr "Op_datér:" -#: ../mail/mail-ops.c:1736 -#, c-format -msgid "Emptying trash in '%s'" -msgstr "Tømmer affald i \"%s\"" +#: ../plugins/caldav/caldav-source.c:451 +#: ../plugins/calendar-http/calendar-http.c:281 +#: ../plugins/calendar-weather/calendar-weather.c:526 +#: ../plugins/google-account-setup/google-source.c:656 +#: ../plugins/google-account-setup/google-contacts-source.c:333 +msgid "weeks" +msgstr "uger" -#: ../mail/mail-ops.c:1737 -msgid "Local Folders" -msgstr "Lokale mapper" +#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1 +msgid "Add CalDAV support to Evolution." +msgstr "" -#: ../mail/mail-ops.c:1818 -#, c-format -msgid "Retrieving message %s" -msgstr "Henter brev %s" +#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2 +#, fuzzy +msgid "CalDAV Support" +msgstr "CalDAV-kilder" -#: ../mail/mail-ops.c:1925 -#, c-format -msgid "Retrieving %d message" -msgid_plural "Retrieving %d messages" -msgstr[0] "Henter %d brev" -msgstr[1] "Henter %d breve" +#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1 +msgid "Add local calendars to Evolution." +msgstr "" -#: ../mail/mail-ops.c:2010 -#, c-format -msgid "Saving %d message" -msgid_plural "Saving %d messages" -msgstr[0] "Gemmer %d besked" -msgstr[1] "Gemmer %d beskeder" +#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2 +msgid "Local Calendars" +msgstr "Lokale kalendere" -#: ../mail/mail-ops.c:2088 -#, c-format -msgid "" -"Error saving messages to: %s:\n" -" %s" -msgstr "" -"Fejl under gemning af breve til: %s:\n" -" %s" +#: ../plugins/calendar-http/calendar-http.c:324 +msgid "_Secure connection" +msgstr "_Sikker forbindelse" -#: ../mail/mail-ops.c:2160 -msgid "Saving attachment" -msgstr "Gemmer bilag" +#: ../plugins/calendar-http/calendar-http.c:389 +msgid "Userna_me:" +msgstr "Bruger_navn:" -#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186 -#, c-format -msgid "" -"Cannot create output file: %s:\n" -" %s" +#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1 +msgid "Add web calendars to Evolution." msgstr "" -"Kunne ikke oprette uddatafil: %s\n" -" %s" -#: ../mail/mail-ops.c:2201 -#, c-format -msgid "Could not write data: %s" -msgstr "Kunne ikke skrive data: %s" +#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2 +#, fuzzy +msgid "Web Calendars" +msgstr "Kalendere" -#: ../mail/mail-ops.c:2347 -#, c-format -msgid "Disconnecting from %s" -msgstr "Afkobler fra %s" +#: ../plugins/calendar-weather/calendar-weather.c:61 +msgid "Weather: Fog" +msgstr "Vejr: Tåge" -#: ../mail/mail-ops.c:2347 -#, c-format -msgid "Reconnecting to %s" -msgstr "Kobler til %s igen" +#: ../plugins/calendar-weather/calendar-weather.c:62 +msgid "Weather: Cloudy" +msgstr "Vejr: Skyet" -#: ../mail/mail-ops.c:2443 -#, c-format -msgid "Preparing account '%s' for offline" -msgstr "Forbereder konto \"%s\" til afkoblet tilstand" +#: ../plugins/calendar-weather/calendar-weather.c:63 +msgid "Weather: Cloudy Night" +msgstr "Vejr: Skyet nat" -#: ../mail/mail-ops.c:2529 -msgid "Checking Service" -msgstr "Undersøger tjeneste" +#: ../plugins/calendar-weather/calendar-weather.c:64 +msgid "Weather: Overcast" +msgstr "Vejr: Gråvejr" -#: ../mail/mail-send-recv.c:181 -msgid "Canceling..." -msgstr "Afbryder..." +#: ../plugins/calendar-weather/calendar-weather.c:65 +msgid "Weather: Showers" +msgstr "Vejr: Byger" -#: ../mail/mail-send-recv.c:383 -msgid "Send & Receive Mail" -msgstr "Send & modtag e-post" +#: ../plugins/calendar-weather/calendar-weather.c:66 +msgid "Weather: Snow" +msgstr "Vejr: Sne" -#: ../mail/mail-send-recv.c:394 -msgid "Cancel _All" -msgstr "Afbryd _alle" +#: ../plugins/calendar-weather/calendar-weather.c:67 +msgid "Weather: Sunny" +msgstr "Vejr: Solbeskinnet" -#: ../mail/mail-send-recv.c:503 -msgid "Updating..." -msgstr "Opdaterer..." +#: ../plugins/calendar-weather/calendar-weather.c:68 +msgid "Weather: Clear Night" +msgstr "Vejr: Klar nat" -#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580 -msgid "Waiting..." -msgstr "Venter..." +#: ../plugins/calendar-weather/calendar-weather.c:69 +msgid "Weather: Thunderstorms" +msgstr "Vejr: Tordenstorme" -#: ../mail/mail-send-recv.c:806 -#, c-format -msgid "Checking for new mail" -msgstr "Kontrollerer om der er ny e-post" +#: ../plugins/calendar-weather/calendar-weather.c:230 +msgid "Select a location" +msgstr "Vælg et sted" -#: ../mail/mail-session.c:212 -#, c-format -msgid "Enter Passphrase for %s" -msgstr "Indtast løsen for %s" +#: ../plugins/calendar-weather/calendar-weather.c:606 +msgid "_Units:" +msgstr "_Enheder:" -#: ../mail/mail-session.c:214 -msgid "Enter Passphrase" -msgstr "Indtast løsen" +#: ../plugins/calendar-weather/calendar-weather.c:613 +msgid "Metric (Celsius, cm, etc)" +msgstr "Metrisk (celsius, cm, o.a.)" -#: ../mail/mail-session.c:217 -#: ../plugins/exchange-operations/exchange-config-listener.c:708 -#, c-format -msgid "Enter Password for %s" -msgstr "Indtast adgangskode for %s" +#: ../plugins/calendar-weather/calendar-weather.c:614 +msgid "Imperial (Fahrenheit, inches, etc)" +msgstr "Imperial (fahrenheit, tommer, o.a.)" -#: ../mail/mail-session.c:219 -msgid "Enter Password" -msgstr "Indtast adgangskode" +#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1 +msgid "Add weather calendars to Evolution." +msgstr "" -#: ../mail/mail-session.c:261 -msgid "User canceled operation." -msgstr "Operation afbrudt af bruger." +#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2 +msgid "Weather Calendars" +msgstr "Vejrkalendere" -#: ../mail/mail-signature-editor.c:201 -msgid "_Save and Close" -msgstr "_Gem og luk" +#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1 +#, fuzzy +msgid "Copy Tool" +msgstr "Kopieringsværktøj" -#: ../mail/mail-signature-editor.c:355 -msgid "Edit Signature" -msgstr "Redigér signatur" +#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3 +#, fuzzy +msgid "Copy things to the clipboard." +msgstr "Kopiér markerede breve til udklipsholderen" -#: ../mail/mail-signature-editor.c:370 -msgid "_Signature Name:" -msgstr "_Signaturnavn:" +#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1 +msgid "Check whether Evolution is the default mailer" +msgstr "Kontrollér om Evolution er valgt som standard-postprogram" -#: ../mail/mail-tools.c:120 -#, c-format -msgid "Could not create spool directory `%s': %s" -msgstr "Kunne ikke oprette kø-mappe \"%s\": %s" +#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2 +msgid "" +"Every time Evolution starts, check whether or not it is the default mailer." +msgstr "Kontrollér om Evolution er forvalgt postprogram hver gang den startes." -#: ../mail/mail-tools.c:150 -#, c-format -msgid "Trying to movemail a non-mbox source `%s'" -msgstr "Prøver at bruge movemail på en kilde som ikke er i mbox-format \"%s\"" +#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1 +#, fuzzy +msgid "Check whether Evolution is the default mail client on startup." +msgstr "" +"Kontrollerer om Evolution er forvalgt postprogram hver gang den startes." -#: ../mail/mail-tools.c:256 -#, c-format -msgid "Forwarded message - %s" -msgstr "Videresendt brev - %s" +#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2 +#, fuzzy +msgid "Default Mail Client" +msgstr "Forvalgt postprogram " -#: ../mail/mail-tools.c:258 -msgid "Forwarded message" -msgstr "Videresendt brev" +#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1 +msgid "Do you want to make Evolution your default e-mail client?" +msgstr "Vil du gøre Evolution til forvalgt postprogram?" -#: ../mail/mail-tools.c:298 -#, c-format -msgid "Invalid folder: `%s'" -msgstr "Ugyldig mappe: \"%s\"" +#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2 +#: ../shell/main.c:601 +msgid "Evolution" +msgstr "Evolution" -#: ../mail/mail-vfolder.c:89 -#, c-format -msgid "Setting up Search Folder: %s" -msgstr "Opsætter søgemappe: %s" +#: ../plugins/default-source/default-source.c:82 +msgid "Mark as _default address book" +msgstr "Markér som _forvalgt adressebog" -#: ../mail/mail-vfolder.c:240 -#, c-format -msgid "Updating Search Folders for '%s:%s'" -msgstr "Opdaterer søgemapper for \"%s:%s\"" +#: ../plugins/default-source/default-source.c:103 +msgid "Mark as _default calendar" +msgstr "Markér som _forvalgt kalender" -#: ../mail/mail-vfolder.c:247 -#, c-format -msgid "Updating Search Folders for '%s'" -msgstr "Opdaterer søgemapper for \"%s\"" +#: ../plugins/default-source/default-source.c:104 +msgid "Mark as _default task list" +msgstr "Markér som _forvalgt opgaveliste" -#: ../mail/mail-vfolder.c:1086 -msgid "Edit Search Folder" -msgstr "Rediger søgemappe" +#: ../plugins/default-source/default-source.c:105 +msgid "Mark as _default memo list" +msgstr "Markér som _forvalgt huskeseddelliste" -#: ../mail/mail-vfolder.c:1175 -msgid "New Search Folder" -msgstr "Ny søgemappe" +#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1 +msgid "Default Sources" +msgstr "Standardkilder" -#: ../mail/mail.error.xml.h:1 -msgid "A folder named \"{0}\" already exists. Please use a different name." +#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2 +msgid "Mark your preferred address book and calendar as default." msgstr "" -"En mappe med navnet \"{0}\" findes allerede. Brug venligst et andet navn." -#: ../mail/mail.error.xml.h:2 -msgid "A folder named \"{1}\" already exists. Please use a different name." -msgstr "" -"En mappe med navnet \"{1}\" findes allerede. Brug venligst et andet navn." +#: ../plugins/email-custom-header/email-custom-header.c:334 +msgid "Security:" +msgstr "Sikkerhed:" -#: ../mail/mail.error.xml.h:3 -msgid "" -"A non-empty folder at \"{1}\" already exists.\n" -"\n" -"You can choose to ignore this folder, overwrite or append its contents, or " -"quit." -msgstr "" -"Der findes allerede en ikke-tom mappe på \"{1}\".\n" -"\n" -"Du kan vælge at ignorere denne mappe, overskrive dens indhold, tilføje dens " -"indhold eller afslutte." +#: ../plugins/email-custom-header/email-custom-header.c:339 +msgid "Unclassified" +msgstr "Ikke klassificeret" -#: ../mail/mail.error.xml.h:6 -msgid "" -"A read receipt notification has been requested for \"{1}\". Send the receipt " -"notification to {0}?" -msgstr "" -"En kvittering for at brevet er blevet åbnet, er blevet forespurgt for \"{1}" -"\". Send kvitteringen til {0}?" +#: ../plugins/email-custom-header/email-custom-header.c:340 +msgid "Protected" +msgstr "Beskyttet" -#: ../mail/mail.error.xml.h:7 -msgid "" -"A signature already exists with the name \"{0}\". Please specify a different " -"name." -msgstr "" -"En signatur med navnet \"{0}\" findes allerede. Angiv venligst et andet navn." +#: ../plugins/email-custom-header/email-custom-header.c:342 +msgid "Secret" +msgstr "Hemmeligt" -#: ../mail/mail.error.xml.h:8 -msgid "" -"Adding a meaningful Subject line to your messages will give your recipients " -"an idea of what your mail is about." -msgstr "" -"Hvis du giver dine breve en forståelig emnelinje, vil dine modtagere få en " -"idé om, hvad dit brev handler om." +#: ../plugins/email-custom-header/email-custom-header.c:343 +msgid "Top secret" +msgstr "Strengt fortroligt" -#: ../mail/mail.error.xml.h:9 -msgid "Are you sure you want to delete this account and all its proxies?" -msgstr "" -"Er du sikker på at du vil slette denne konto og alle dens mellemværter?" +#: ../plugins/email-custom-header/email-custom-header.c:585 +msgid "_Custom Header" +msgstr "_Tilpassede brevhoveder" -#: ../mail/mail.error.xml.h:10 -msgid "Are you sure you want to delete this account?" -msgstr "Er du sikker på at du vil slette denne konto?" +#: ../plugins/email-custom-header/email-custom-header.c:907 +msgid "Key" +msgstr "Nøgle" -#: ../mail/mail.error.xml.h:11 +#: ../plugins/email-custom-header/email-custom-header.c:918 +#: ../plugins/templates/templates.c:396 +msgid "Values" +msgstr "Værdier" + +#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values +#: ../plugins/email-custom-header/email-custom-header.glade.h:2 msgid "" -"Are you sure you want to disable this account and delete all its proxies?" +"The format for specifying a Custom Header key value is:\n" +"Name of the Custom Header key values separated by \";\"." msgstr "" -"Er du sikker på at du vil deaktivere denne konto og slette alle dens " -"mellemværter?" +"Formatet som specificeringen af nøgleværdier i et tilpasset brevhoved " +"angives i:\n" +"Navne på nøgleværdier for de tilpassede brevhoveder separeres med \";\"." -#: ../mail/mail.error.xml.h:12 -msgid "Are you sure you want to open {0} messages at once?" -msgstr "Er du sikker på du vil åbne {0} breve på en gang?" +#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1 +msgid "Email Custom Header" +msgstr "Tilpasset brevhoved for e-post" -#: ../mail/mail.error.xml.h:13 -msgid "" -"Are you sure you want to permanently remove all the deleted messages in all " -"folders?" -msgstr "" -"Er du sikker på du vil fjerne alle de slettede breve i alle mapperne, " -"permanent?" +#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added +#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2 +#, fuzzy +msgid "Add custom headers to outgoing mail messages." +msgstr "Tilføj tilpasset brevhoved til udgående besked." -#: ../mail/mail.error.xml.h:14 +#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3 +msgid "Custom Header" +msgstr "Tilpasset brevhoved" + +#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1 +msgid "List of Custom Headers" +msgstr "Liste over tilpassede brevhoveder" + +#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2 msgid "" -"Are you sure you want to permanently remove all the deleted messages in " -"folder \"{0}\"?" +"The key specifies the list of custom headers that you can add to an outgoing " +"message. The format for specifying a Header and Header value is: Name of the " +"custom header followed by \"=\" and the values separated by \";\"" msgstr "" -"Er du sikker på at du permanent vil fjerne alle de slettede breve i mappen " -"\"{0}\"?" +"Denne nøgle specificerer listen over tilpassede brevhoveder som du kan " +"tilføje til en udgående besked. Formatet som et brevhoved og dets værdier " +"angives i er: Navnet på det tilpassede brevhoved, efterfulgt af et \"=\" og " +"værdierne separeret med et \";\"" -#: ../mail/mail.error.xml.h:15 -msgid "Are you sure you want to send a message in HTML format?" -msgstr "Er du sikker på du vil sende et brev i HTML-formatet?" +#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1 +msgid "Open Other User's Folder" +msgstr "Åbn en anden brugers mappe" -#: ../mail/mail.error.xml.h:16 -msgid "Are you sure you want to send a message with only BCC recipients?" -msgstr "Er du sikker på du vil sende et brev der kun har BCC-modtagere?" +#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2 +msgid "_Account:" +msgstr "_Konto:" -#: ../mail/mail.error.xml.h:17 -msgid "Are you sure you want to send a message without a subject?" -msgstr "Er du sikker på du vil sende et brev uden emne?" +#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3 +msgid "_Folder Name:" +msgstr "_Mappenavn:" -#: ../mail/mail.error.xml.h:18 -msgid "Because \"{0}\"." -msgstr "Fordi \"{0}\"." +#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4 +msgid "_User:" +msgstr "_Bruger:" -#: ../mail/mail.error.xml.h:20 -msgid "Because \"{2}\"." -msgstr "Fordi \"{2}\"." +#. i18n: "Secure Password Authentication" is an Outlookism +#: ../plugins/exchange-operations/exchange-account-setup.c:63 +msgid "Secure Password" +msgstr "Sikker adgangskode" -#: ../mail/mail.error.xml.h:21 -msgid "Blank Signature" -msgstr "Tom signatur" +#. i18n: "NTLM" probably doesn't translate +#: ../plugins/exchange-operations/exchange-account-setup.c:66 +msgid "" +"This option will connect to the Exchange server using secure password (NTLM) " +"authentication." +msgstr "" +"Dette alternativ vil tilslutte Exchange-serveren ved hjælp af sikker " +"adgangskode (NTLM)-godkendelse." -#: ../mail/mail.error.xml.h:22 -msgid "Cannot add Search Folder \"{0}\"." -msgstr "Kan ikke tilføje søgemappen \"{0}\"." +#: ../plugins/exchange-operations/exchange-account-setup.c:74 +msgid "Plaintext Password" +msgstr "Adgangskode i klartekst" -#: ../mail/mail.error.xml.h:23 -msgid "Cannot copy folder \"{0}\" to \"{1}\"." -msgstr "Kan ikke kopiere mappen \"{0}\" til \"{1}\"." +#: ../plugins/exchange-operations/exchange-account-setup.c:76 +msgid "" +"This option will connect to the Exchange server using standard plaintext " +"password authentication." +msgstr "" +"Dette alternativ vil tilslutte Exchange-serveren ved hjælp af " +"standardgodkendelse med adgangskode i klartekst." -#: ../mail/mail.error.xml.h:24 -msgid "Cannot create folder \"{0}\"." -msgstr "Kan ikke oprette mappen \"{0}\"." +#: ../plugins/exchange-operations/exchange-account-setup.c:272 +msgid "Out Of Office" +msgstr "Fraværende" -#: ../mail/mail.error.xml.h:25 -msgid "Cannot create temporary save directory." -msgstr "Kan ikke oprette midlertidigt gemmekatalog." +#: ../plugins/exchange-operations/exchange-account-setup.c:279 +msgid "" +"The message specified below will be automatically sent to \n" +"each person who sends mail to you while you are out of the office." +msgstr "" +"Nedenstående brev sendes automatisk til alle som sender dig\n" +"e-post mens du er borte fra kontoret." -#: ../mail/mail.error.xml.h:26 -msgid "Cannot create the save directory, because \"{1}\"" -msgstr "Kan ikke oprette gemmekataloget, fordi \"{1}\"" +#: ../plugins/exchange-operations/exchange-account-setup.c:291 +#: ../plugins/exchange-operations/exchange-account-setup.c:296 +msgid "I am out of the office" +msgstr "Jeg er ikke på kontoret" -#: ../mail/mail.error.xml.h:27 -msgid "Cannot delete folder \"{0}\"." -msgstr "Kan ikke slette mappen \"{0}\"." +#: ../plugins/exchange-operations/exchange-account-setup.c:292 +#: ../plugins/exchange-operations/exchange-account-setup.c:295 +msgid "I am in the office" +msgstr "Jeg er på kontoret" -#: ../mail/mail.error.xml.h:28 -msgid "Cannot delete system folder \"{0}\"." -msgstr "Kan ikke slette systemmappen \"{0}\"." +#. Change Password +#: ../plugins/exchange-operations/exchange-account-setup.c:343 +msgid "Change the password for Exchange account" +msgstr "Skift adgangskoden for Exchange-konto" -#: ../mail/mail.error.xml.h:29 -msgid "Cannot edit Search Folder \"{0}\" as it does not exist." -msgstr "Kan ikke redigere søgemappen \"{0}\", for den findes ikke." +#: ../plugins/exchange-operations/exchange-account-setup.c:345 +#: ../plugins/exchange-operations/exchange-change-password.glade.h:1 +msgid "Change Password" +msgstr "Skift adgangskode" -#: ../mail/mail.error.xml.h:30 -msgid "Cannot move folder \"{0}\" to \"{1}\"." -msgstr "Kan ikke flytte mappen \"{0}\" til \"{1}\"." +#. Delegation Assistant +#: ../plugins/exchange-operations/exchange-account-setup.c:350 +msgid "Manage the delegate settings for Exchange account" +msgstr "Håndtér uddelegerings-indstillinger for Exchange-konto" -#: ../mail/mail.error.xml.h:31 -msgid "Cannot open source \"{1}\"" -msgstr "Kan ikke åbne kilden \"{1}\"" +#: ../plugins/exchange-operations/exchange-account-setup.c:352 +msgid "Delegation Assistant" +msgstr "Delegeringsassistent" -#: ../mail/mail.error.xml.h:32 -msgid "Cannot open source \"{2}\"." -msgstr "Kan ikke åbne kilden \"{2}\"." +#. Miscelleneous settings +#: ../plugins/exchange-operations/exchange-account-setup.c:364 +msgid "Miscelleneous" +msgstr "Diverse" -#: ../mail/mail.error.xml.h:33 -msgid "Cannot open target \"{2}\"." -msgstr "Kan ikke åbne målet \"{2}\"." +#. Folder Size +#: ../plugins/exchange-operations/exchange-account-setup.c:374 +msgid "View the size of all Exchange folders" +msgstr "Vis alle Exchange-mappers størrelse" -#: ../mail/mail.error.xml.h:34 -msgid "" -"Cannot read the license file \"{0}\", due to an installation problem. You " -"will not be able to use this provider until you can accept its license." +#: ../plugins/exchange-operations/exchange-account-setup.c:376 +msgid "Folders Size" +msgstr "Mappestørrelse" + +#: ../plugins/exchange-operations/exchange-account-setup.c:383 +#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3 +msgid "Exchange Settings" +msgstr "Exchange-indstillinger" + +#: ../plugins/exchange-operations/exchange-account-setup.c:730 +msgid "_OWA URL:" +msgstr "_OWA-adresse:" + +#: ../plugins/exchange-operations/exchange-account-setup.c:756 +msgid "A_uthenticate" +msgstr "_Godkend" + +#: ../plugins/exchange-operations/exchange-account-setup.c:778 +msgid "Mailbox name is _different than user name" msgstr "" -"Kan ikke læse licens-filen \"{0}\" pga. et installationsproblem. Du vil ikke " -"kunne bruge denne udbyder, før du kan acceptere hans licens." -#: ../mail/mail.error.xml.h:35 -msgid "Cannot rename \"{0}\" to \"{1}\"." -msgstr "Kan ikke omdøbe \"{0}\" til \"{1}\"." +#: ../plugins/exchange-operations/exchange-account-setup.c:791 +msgid "_Mailbox:" +msgstr "_Brevbakke" -#: ../mail/mail.error.xml.h:36 -msgid "Cannot rename or move system folder \"{0}\"." -msgstr "Kan ikke omdøbe eller flytte systemmappen \"{0}\"." +#: ../plugins/exchange-operations/exchange-account-setup.c:1006 +msgid "_Authentication Type" +msgstr "_Godkendelsestype" -#: ../mail/mail.error.xml.h:37 -msgid "Cannot save changes to account." -msgstr "Kan ikke gemme ændringerne til kontoen." +#: ../plugins/exchange-operations/exchange-account-setup.c:1020 +msgid "Ch_eck for Supported Types" +msgstr "_Søg efter understøttede typer" -#: ../mail/mail.error.xml.h:38 -msgid "Cannot save to directory \"{0}\"." -msgstr "Kan ikke gemme i kataloget \"{0}\"." +#: ../plugins/exchange-operations/exchange-account-setup.c:1135 +#: ../plugins/exchange-operations/exchange-contacts.c:218 +#, c-format +msgid "%s KB" +msgstr "%s Kb" -#: ../mail/mail.error.xml.h:39 -msgid "Cannot save to file \"{0}\"." -msgstr "Kan ikke gemme filen \"{0}\"." +#: ../plugins/exchange-operations/exchange-account-setup.c:1137 +#: ../plugins/exchange-operations/exchange-contacts.c:220 +#, c-format +msgid "0 KB" +msgstr "0 kB" -#: ../mail/mail.error.xml.h:40 -msgid "Cannot set signature script \"{0}\"." -msgstr "Kan ikke sætte signaturskriptet \"{0}\"." +#. FIXME: Take care of i18n +#: ../plugins/exchange-operations/exchange-account-setup.c:1142 +#: ../plugins/exchange-operations/exchange-calendar.c:236 +#: ../plugins/exchange-operations/exchange-contacts.c:223 +msgid "Size:" +msgstr "Størrelse:" -#: ../mail/mail.error.xml.h:41 -msgid "Check Junk Failed" -msgstr "Spamcheck fejlede" +#: ../plugins/exchange-operations/exchange-calendar.c:196 +#: ../plugins/exchange-operations/exchange-contacts.c:171 +msgid "" +"Evolution is in offline mode. You cannot create or modify folders now.\n" +"Please switch to online mode for such operations." +msgstr "" +"Evolution er afkoblet. Du kan ikke oprette eller ændre mapper nu.\n" +"Skift venligst til opkoblet tilstand for at udføre disse handlinger." -#: ../mail/mail.error.xml.h:42 +#. User entered a wrong existing +#. * password. Prompt him again. +#. +#: ../plugins/exchange-operations/exchange-change-password.c:114 msgid "" -"Check to make sure your password is spelled correctly. Remember that many " -"passwords are case sensitive; your caps lock might be on." +"The current password does not match the existing password for your account. " +"Please enter the correct password" msgstr "" -"Kontrollér at din adgangskode er skrevet korrekt. Husk at mange adgangskoder " -"er versalfølsomme \"Caps Lock\"-knappen kan være aktiveret." +"Den nuværende adgangskode matcher ikke den eksisterende adgangskode for din " +"konto. Angiv den korrekte adgangskode" -#: ../mail/mail.error.xml.h:43 -msgid "Could not save signature file." -msgstr "Kunne ikke gemme signaturfilen." +#: ../plugins/exchange-operations/exchange-change-password.c:121 +msgid "The two passwords do not match. Please re-enter the passwords." +msgstr "De to adgangskoder matcher ikke. Angiv adgangskoden igen." -#: ../mail/mail.error.xml.h:44 -msgid "Delete \"{0}\"?" -msgstr "Slet \"{0}\"?" +#: ../plugins/exchange-operations/exchange-change-password.glade.h:2 +msgid "Confirm Password:" +msgstr "Bekræft adgangskode:" -#: ../mail/mail.error.xml.h:45 -msgid "Delete account?" -msgstr "Slet konto?" +#: ../plugins/exchange-operations/exchange-change-password.glade.h:3 +msgid "Current Password:" +msgstr "Nuværende adgangskode:" -#: ../mail/mail.error.xml.h:46 -msgid "Delete messages in Search Folder \"{0}\"?" -msgstr "Slet breve i søgemappen \"{0}\"?" +#: ../plugins/exchange-operations/exchange-change-password.glade.h:4 +msgid "New Password:" +msgstr "Ny adgangskode:" -#: ../mail/mail.error.xml.h:47 -msgid "Delete messages in Search Folder?" -msgstr "Slet breve i søgemappe?" +#: ../plugins/exchange-operations/exchange-change-password.glade.h:5 +msgid "Your current password has expired. Please change your password now." +msgstr "Din nuværende adgangskode er udløbet. Skift din adgangskode nu." -#: ../mail/mail.error.xml.h:48 -msgid "Discard changes?" -msgstr "Forkast ændringer?" +#: ../plugins/exchange-operations/exchange-config-listener.c:660 +#, c-format +msgid "Your password will expire in the next %d days" +msgstr "Din adgangskode vil udløbe indenfor de næste %d dage" -#: ../mail/mail.error.xml.h:49 -msgid "Do not d_elete" -msgstr "Undlad at sl_ette" +#: ../plugins/exchange-operations/exchange-delegates-user.c:144 +#: ../plugins/exchange-operations/exchange-permissions-dialog.c:565 +msgid "Custom" +msgstr "Tilpasset" -#: ../mail/mail.error.xml.h:50 -msgid "Do not delete" -msgstr "Undlad at slette" +#: ../plugins/exchange-operations/exchange-delegates-user.c:170 +msgid "Editor (read, create, edit)" +msgstr "Redaktør (læs, opret, redigér)" -#: ../mail/mail.error.xml.h:51 -msgid "Do not disable" -msgstr "Undlad at deaktivere" +#: ../plugins/exchange-operations/exchange-delegates-user.c:174 +msgid "Author (read, create)" +msgstr "Forfatter (læs, opret)" -#: ../mail/mail.error.xml.h:52 +#: ../plugins/exchange-operations/exchange-delegates-user.c:178 +msgid "Reviewer (read-only)" +msgstr "Gennemlæser (skrivebeskyttet)" + +#: ../plugins/exchange-operations/exchange-delegates-user.c:228 +#: ../plugins/exchange-operations/exchange-delegates.glade.h:5 +msgid "Delegate Permissions" +msgstr "Rettigheder for delegater" + +#: ../plugins/exchange-operations/exchange-delegates-user.c:239 +#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178 +#, c-format +msgid "Permissions for %s" +msgstr "Rettigheder for %s" + +#. To translators: This is a part of the message to be sent to the delegatee +#. summarizing the permissions assigned to him. +#. +#: ../plugins/exchange-operations/exchange-delegates-user.c:330 msgid "" -"Do you want to locally synchronize the folders that are marked for offline " -"usage?" +"This message was sent automatically by Evolution to inform you that you have " +"been designated as a delegate. You can now send messages on my behalf." msgstr "" -"Ønsker du lokalt at synkronisere mapperne som er markeret til brug i " -"afkoblet tilstand?" +"Denne besked blev automatisk udsendt af Evolution for at gøre dig opmærksom " +"at du er blevet delegat. Du kan nu sende breve på mine vegne." -#: ../mail/mail.error.xml.h:53 -msgid "Do you want to mark all messages as read?" -msgstr "Vil du markere alle breve som læst?" +#. To translators: Another chunk of the same message. +#. +#: ../plugins/exchange-operations/exchange-delegates-user.c:335 +msgid "You have been given the following permissions on my folders:" +msgstr "Du har fået tildelt følgende rettigheder over mine mapper:" -#: ../mail/mail.error.xml.h:54 -msgid "Do you wish to save your changes?" -msgstr "Ønsker du at gemme dine ændringer?" +#. To translators: This message is included if the delegatee has been given access +#. to the private items. +#. +#: ../plugins/exchange-operations/exchange-delegates-user.c:355 +msgid "You are also permitted to see my private items." +msgstr "Du har også lov til at se mine private objekter." -#: ../mail/mail.error.xml.h:55 -msgid "Enter password." -msgstr "Indtast adgangskode." +#. To translators: This message is included if the delegatee has not been given access +#. to the private items. +#. +#: ../plugins/exchange-operations/exchange-delegates-user.c:362 +msgid "However you are not permitted to see my private items." +msgstr "Men du har ikke lov til at se mine private objekter." -#: ../mail/mail.error.xml.h:56 -msgid "Error loading filter definitions." -msgstr "Fejl ved indlæsning af filter-definitionerne." +#: ../plugins/exchange-operations/exchange-delegates-user.c:394 +#, c-format +msgid "You have been designated as a delegate for %s" +msgstr "Du er blevet udnævnt som delegat for %s" -#: ../mail/mail.error.xml.h:57 -msgid "Error while performing operation." -msgstr "Fejl ved udførsel af handling." +#: ../plugins/exchange-operations/exchange-delegates.c:417 +msgid "Delegate To" +msgstr "Uddelegér til" -#: ../mail/mail.error.xml.h:58 -msgid "Error while {0}." -msgstr "Fejl ved {0}." +#: ../plugins/exchange-operations/exchange-delegates.c:582 +#, c-format +msgid "Remove the delegate %s?" +msgstr "Fjern delegaten %s?" -#: ../mail/mail.error.xml.h:59 -msgid "File exists but cannot overwrite it." -msgstr "Filen findes, men kunne ikke overskrive den." +#: ../plugins/exchange-operations/exchange-delegates.c:700 +msgid "Could not access Active Directory" +msgstr "Kunne ikke tilgå Active Directory" -#: ../mail/mail.error.xml.h:60 -msgid "File exists but is not a regular file." -msgstr "Filen findes, men er ikke en almindelig fil." +#: ../plugins/exchange-operations/exchange-delegates.c:712 +msgid "Could not find self in Active Directory" +msgstr "Kunne ikke finde sig selv i Active Directory" -#: ../mail/mail.error.xml.h:61 -msgid "If you continue, you will not be able to recover these messages." -msgstr "Hvis du fortsætter vil du ikke kunne genoprette disse breve." +#: ../plugins/exchange-operations/exchange-delegates.c:725 +#, c-format +msgid "Could not find delegate %s in Active Directory" +msgstr "Kunne ikke finde delegaten %s i Active Directory" -#: ../mail/mail.error.xml.h:62 -msgid "" -"If you delete the folder, all of its contents and its subfolders contents " -"will be deleted permanently." -msgstr "Hvis du sletter mappen vil alt indholdet i denne slettes permanent." +#: ../plugins/exchange-operations/exchange-delegates.c:737 +#, c-format +msgid "Could not remove delegate %s" +msgstr "Kunne ikke fjerne delegaten %s" -#: ../mail/mail.error.xml.h:63 -msgid "If you proceed, all proxy accounts will be deleted permanently." -msgstr "Hvis du fortsætter, vil alle proxy-konti blive slettet permanent." +#: ../plugins/exchange-operations/exchange-delegates.c:797 +msgid "Could not update list of delegates." +msgstr "Kunne ikke opdatere listen af delegater." -#: ../mail/mail.error.xml.h:64 +#: ../plugins/exchange-operations/exchange-delegates.c:815 +#, c-format +msgid "Could not add delegate %s" +msgstr "Kunne ikke tilføje delegat %s" + +#: ../plugins/exchange-operations/exchange-delegates.c:983 +msgid "Error reading delegates list." +msgstr "Fejl ved læsning af liste af delegater." + +#. Translators: This is used for permissions for for the folder Calendar. +#: ../plugins/exchange-operations/exchange-delegates.glade.h:2 +msgid "C_alendar:" +msgstr "K_alender:" + +#. Translators: This is used for permissions for for the folder Contacts. +#: ../plugins/exchange-operations/exchange-delegates.glade.h:4 +msgid "Co_ntacts:" +msgstr "Ko_ntaktpersoner:" + +#: ../plugins/exchange-operations/exchange-delegates.glade.h:6 +msgid "Delegates" +msgstr "Delegater" + +#: ../plugins/exchange-operations/exchange-delegates.glade.h:7 msgid "" -"If you proceed, the account information and\n" -"all proxy information will be deleted permanently." +"None\n" +"Reviewer (read-only)\n" +"Author (read, create)\n" +"Editor (read, create, edit)" msgstr "" -"Hvis du fortsætter, vil kontoinformationen og\n" -"al proxy-information blive slettet permanent." -#: ../mail/mail.error.xml.h:66 -msgid "If you proceed, the account information will be deleted permanently." -msgstr "Hvis du fortsætter vil kontoinformationen blive slettet permanent." +#: ../plugins/exchange-operations/exchange-delegates.glade.h:11 +msgid "Permissions for" +msgstr "Rettigheder for" -#: ../mail/mail.error.xml.h:67 +#: ../plugins/exchange-operations/exchange-delegates.glade.h:12 msgid "" -"If you quit, these messages will not be sent until Evolution is started " -"again." +"These users will be able to send mail on your behalf\n" +"and access your folders with the permissions you give them." msgstr "" -"Hvis du afslutter vil disse breve ikke blive sendt før Evolution genstartes." +"Disse brugere vil kunne sende e-post på dine vegne\n" +"og tilgå dine mapper med de rettigheder du giver dem." -#: ../mail/mail.error.xml.h:68 -msgid "Ignore" -msgstr "Ignorér" +#: ../plugins/exchange-operations/exchange-delegates.glade.h:14 +msgid "_Delegate can see private items" +msgstr "_Delegater kan se private ting" -#: ../mail/mail.error.xml.h:69 -msgid "Invalid authentication" -msgstr "Ugyldig godkendelse" +#. Translators: This is used for permissions for for the folder Inbox. +#: ../plugins/exchange-operations/exchange-delegates.glade.h:17 +msgid "_Inbox:" +msgstr "_Indbakke:" -#: ../mail/mail.error.xml.h:71 -msgid "Mail filters automatically updated." -msgstr "E-post-filtre opdateret automatisk." +#: ../plugins/exchange-operations/exchange-delegates.glade.h:18 +msgid "_Summarize permissions" +msgstr "_Opsummér rettigheder" -#: ../mail/mail.error.xml.h:72 -msgid "" -"Many email systems add an Apparently-To header to messages that only have " -"BCC recipients. This header, if added, will list all of your recipients to " -"your message anyway. To avoid this, you should add at least one To: or CC: " -"recipient." -msgstr "" -"Mange e-post-systemer føjer et Apparently-To-hoved til breve der kun har Bcc-" -"modtagere. Dette hoved, hvis tilføjet, vil liste alle dine modtagere i dit " -"brev alligevel For at undgå dette bør du tilføje mindst en Til:- eller Cc:-" -"modtager." +#. Translators: This is used for permissions for for the folder Tasks. +#: ../plugins/exchange-operations/exchange-delegates.glade.h:20 +#: ../plugins/itip-formatter/itip-view.c:1915 +msgid "_Tasks:" +msgstr "_Opgaver:" -#: ../mail/mail.error.xml.h:73 -msgid "Mark all messages as read" -msgstr "Markér alle breve som læst" +#: ../plugins/exchange-operations/exchange-folder-permission.c:62 +#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2 +msgid "Permissions..." +msgstr "Rettigheder..." -#: ../mail/mail.error.xml.h:74 -msgid "Missing folder." -msgstr "Manglende mappe." +#: ../plugins/exchange-operations/exchange-folder-size-display.c:130 +msgid "Folder Name" +msgstr "Mappenavn" -#: ../mail/mail.error.xml.h:76 -msgid "No sources selected." -msgstr "Ingen kilder valgt." +#: ../plugins/exchange-operations/exchange-folder-size-display.c:134 +msgid "Folder Size" +msgstr "Mappestørrelse" -#: ../mail/mail.error.xml.h:77 -msgid "Opening too many messages at once may take a long time." -msgstr "At åbne for mange breve på en gang, kan tage lang tid." +#. FIXME Limit to one user +#: ../plugins/exchange-operations/exchange-folder-subscription.c:78 +msgid "User" +msgstr "Bruger" -#: ../mail/mail.error.xml.h:78 -msgid "Please check your account settings and try again." -msgstr "Kontrollér venligst din konto-opsætning og prøv igen." +#: ../plugins/exchange-operations/exchange-folder-subscription.c:311 +#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1 +msgid "Subscribe to Other User's Folder" +msgstr "Tilmeld til en anden brugers mappe" -#: ../mail/mail.error.xml.h:79 -msgid "Please enable the account or send using another account." -msgstr "Aktivér venligst kontoen, eller send via en anden konto." +#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1 +msgid "Exchange Folder Tree" +msgstr "Exchange-mappetræ" -#: ../mail/mail.error.xml.h:80 +#: ../plugins/exchange-operations/exchange-folder.c:67 +#: ../plugins/exchange-operations/exchange-folder.c:236 +#: ../plugins/exchange-operations/exchange-folder.c:246 +msgid "Unsubscribe Folder..." +msgstr "Afmeld mappe..." + +#: ../plugins/exchange-operations/exchange-folder.c:466 +#: ../plugins/exchange-operations/exchange-folder.c:521 +#, c-format +msgid "Really unsubscribe from folder \"%s\"?" +msgstr "Er du sikker på at du vil afmelde abonnementet på mappen \"%s\"?" + +#: ../plugins/exchange-operations/exchange-folder.c:478 +#: ../plugins/exchange-operations/exchange-folder.c:533 +#, c-format +msgid "Unsubscribe from \"%s\"" +msgstr "Opsig abonnement på \"%s\"" + +#: ../plugins/exchange-operations/exchange-oof.glade.h:1 msgid "" -"Please enter a valid email address in the To: field. You can search for " -"email addresses by clicking on the To: button next to the entry box." +"Currently, your status is \"Out of the Office\". \n" +"\n" +"Would you like to change your status to \"In the Office\"? " msgstr "" -"Vær så venlig at indtaste en gyldig e-postadresse i Til:-feltet. Du kan søge " -"efter e-post-adresser ved at klikke på Til:-knappen ved siden af " -"indtastningsfeltet." +"Din nuværende status er \"borte fra kontoret\".\n" +"\n" +"Vil du ændre din status til \"på kontoret\"? " -#: ../mail/mail.error.xml.h:81 +#: ../plugins/exchange-operations/exchange-oof.glade.h:4 +msgid "Out of Office Message:" +msgstr "Fraværende-besked:" + +#: ../plugins/exchange-operations/exchange-oof.glade.h:5 +msgid "Status:" +msgstr "Status:" + +#: ../plugins/exchange-operations/exchange-oof.glade.h:6 msgid "" -"Please make sure the following recipients are willing and able to receive " -"HTML email:\n" -"{0}" +"The message specified below will be automatically sent to each person " +"who sends\n" +"mail to you while you are out of the office." msgstr "" -"Kontrollér venligst at følgende modtagere ønsker og kan modtage HTML-breve:\n" -"{0}" +"Beskeden nedenfor sendes automatisk til hver person som\n" +"sender e-post til dig når du er borte fra kontoret." -#: ../mail/mail.error.xml.h:83 -msgid "Please provide an unique name to identify this signature." -msgstr "" -"Indtast venligst et entydigt navn til identifikation af denne signatur." +#: ../plugins/exchange-operations/exchange-oof.glade.h:8 +msgid "I am currently in the office" +msgstr "Jeg er på kontoret i øjeblikket" -#: ../mail/mail.error.xml.h:84 -msgid "Please wait." -msgstr "Vent venligst." +#: ../plugins/exchange-operations/exchange-oof.glade.h:9 +msgid "I am currently out of the office" +msgstr "Jeg er ikke på kontoret i øjeblikket" -#: ../mail/mail.error.xml.h:85 -msgid "Problem migrating old mail folder \"{0}\"." -msgstr "Problem ved overflytning af den gamle brevmappe \"{0}\"." +#: ../plugins/exchange-operations/exchange-oof.glade.h:10 +msgid "No, Don't Change Status" +msgstr "Nej, undlad at skifte status" -#: ../mail/mail.error.xml.h:86 -msgid "Querying server" -msgstr "Forespørger server" +#: ../plugins/exchange-operations/exchange-oof.glade.h:11 +msgid "Out of Office Assistant" +msgstr "Stedfortræder ved fravær" -#: ../mail/mail.error.xml.h:87 -msgid "Querying server for a list of supported authentication mechanisms." -msgstr "" -"Forespørger serveren om en liste af understøttede godkendelsesmekanismer." +#: ../plugins/exchange-operations/exchange-oof.glade.h:12 +msgid "Yes, Change Status" +msgstr "Ja, skift status" -#: ../mail/mail.error.xml.h:88 -msgid "Read receipt requested." -msgstr "Der anmodes om kvittering for at brevet er blevet åbnet." +#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1 +msgid "Password Expiry Warning..." +msgstr "Advarsel om udløb af adgangskode..." -#: ../mail/mail.error.xml.h:89 -msgid "Really delete folder \"{0}\" and all of its subfolders?" -msgstr "Er du sikker på du vil slette mappen \"{0}\" og alle dens undermapper?" +#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2 +msgid "Your password will expire in 7 days..." +msgstr "Din adgangskode vil udløbe om 7 dage..." -#: ../mail/mail.error.xml.h:90 -msgid "Report Junk Failed" -msgstr "Indrapportering som spam fejlede" +#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3 +msgid "_Change Password" +msgstr "_Skift adgangskode" -#: ../mail/mail.error.xml.h:91 -msgid "Report Not Junk Failed" -msgstr "Indrapportering som ikke-spam fejlede" - -#: ../mail/mail.error.xml.h:92 -msgid "Search Folders automatically updated." -msgstr "Søgemapper opdateret automatisk." +#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295 +msgid "(Permission denied.)" +msgstr "(Adgang nægtet.)" -#: ../mail/mail.error.xml.h:93 -msgid "Send Receipt" -msgstr "Send kvittering" +#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403 +msgid "Add User:" +msgstr "Tilføj bruger:" -#: ../mail/mail.error.xml.h:94 -msgid "Signature Already Exists" -msgstr "Signaturen findes allerede" +#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403 +#: ../plugins/exchange-operations/exchange-send-options.c:410 +#: ../plugins/groupwise-features/proxy.c:936 +#: ../plugins/groupwise-features/share-folder.c:718 +msgid "Add User" +msgstr "Tilføj bruger" -#: ../mail/mail.error.xml.h:95 -msgid "Synchronize" -msgstr "Synkronisér" +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1 +msgid "Permissions" +msgstr "Rettigheder" -#: ../mail/mail.error.xml.h:96 -msgid "Synchronize folders locally for offline usage?" -msgstr "Synkronisér mapperne lokalt til brug i afkoblet tilstand?" +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2 +msgid "Cannot Delete" +msgstr "Kan ikke slette" -#: ../mail/mail.error.xml.h:97 -msgid "" -"System folders are required for Evolution to function correctly and cannot " -"be renamed, moved, or deleted." -msgstr "" -"Systemmapper kræves for at Evolution kan fungere korrekt, og du kan ikke " -"omdøbe, flytte eller slette disse." +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3 +msgid "Cannot Edit" +msgstr "Kan ikke redigere" -#: ../mail/mail.error.xml.h:98 -msgid "" -"The contact list you are sending to is configured to hide list recipients.\n" -"\n" -"Many email systems add an Apparently-To header to messages that only have " -"BCC recipients. This header, if added, will list all of your recipients in " -"your message. To avoid this, you should add at least one To: or CC: " -"recipient. " -msgstr "" -"Kontaktlisten du sender til er konfigureret til at skjule liste-modtagere.\n" -"\n" -"Mange e-post-systemer føjer et Apparently-To-hoved til breve der kun har " -"Bcc- modtagere. Dette hoved, hvis tilføjet, vil liste alle dine modtagere i " -"dit brev. For at undgå dette bør du tilføje mindst en Til:- eller Cc:- " -"modtager. " +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4 +msgid "Create items" +msgstr "Opret elementer" -#: ../mail/mail.error.xml.h:101 -msgid "" -"The following Search Folder(s):\n" -"{0}\n" -"Used the now removed folder:\n" -" \"{1}\"\n" -"And have been updated." -msgstr "" -"Følgende søgemappe(r):\n" -"{0}\n" -"benyttede den nu fjernede mappe:\n" -" \"{1}\"\n" -"og er blevet opdateret." +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5 +msgid "Create subfolders" +msgstr "Opret undermapper" -#: ../mail/mail.error.xml.h:106 -msgid "" -"The following filter rule(s):\n" -"{0}\n" -"Used the now removed folder:\n" -" \"{1}\"\n" -"And have been updated." -msgstr "" -"Følgende filterregler:\n" -"{0}\n" -"benyttede den nu fjernede mappe:\n" -" \"{1}\"\n" -"og er blevet opdateret." +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6 +msgid "Delete Any Items" +msgstr "Slet alle elementer" -#: ../mail/mail.error.xml.h:111 -msgid "The script file must exist and be executable." -msgstr "Skriptfilen skal eksistere og være kørbar." +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7 +msgid "Delete Own Items" +msgstr "Slet egne elementer" -#: ../mail/mail.error.xml.h:112 -msgid "" -"This folder may have been added implicitly,\n" -"go to the Search Folder editor to add it explicitly, if required." -msgstr "" -"Denne mappe er muligvis blevet tilføjet implicit, brug søgemappe-" -"redigeringen for at tilføje den eksplicit, om nødvendigt." +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8 +msgid "Edit Any Items" +msgstr "Redigér alle elementer" -#: ../mail/mail.error.xml.h:114 -msgid "" -"This message cannot be sent because the account you chose to send with is " -"not enabled" -msgstr "" -"Dette brev kan ikke sendes fordi den konto du har valgt at sende med, ikke " -"er aktiveret" +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9 +msgid "Edit Own Items" +msgstr "Redigér egne elementer" -#: ../mail/mail.error.xml.h:115 -msgid "" -"This message cannot be sent because you have not specified any recipients" -msgstr "Dette brev kan ikke sendes fordi du ikke har angivet nogen modtagere" +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10 +msgid "Folder contact" +msgstr "Mappe med kontaktperson" -#: ../mail/mail.error.xml.h:116 -msgid "" -"This server does not support this type of authentication and may not support " -"authentication at all." -msgstr "" -"Denne server understøtter ikke denne type godkendelse og understøtter måske " -"ikke godkendelse overhovedet." +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11 +msgid "Folder owner" +msgstr "Mappeejer" -#: ../mail/mail.error.xml.h:117 -msgid "This signature has been changed, but has not been saved." -msgstr "Denne signatur er ændret, men er ikke blevet gemt." +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12 +msgid "Folder visible" +msgstr "Mappe synlig" -#: ../mail/mail.error.xml.h:118 -msgid "" -"This will mark all messages as read in the selected folder and its " -"subfolders." -msgstr "" -"Dette vil markere alle breve som læste i den valgte mappe og dens " -"undermapper." +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13 +msgid "Read items" +msgstr "Læste elementer" -#: ../mail/mail.error.xml.h:119 -msgid "Unable to connect to the GroupWise server." -msgstr "Kan ikke skabe forbindelse til GroupWise-serveren." +#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14 +msgid "Role: " +msgstr "Rolle: " -#: ../mail/mail.error.xml.h:120 -msgid "" -"Unable to open the drafts folder for this account. Use the system drafts " -"folder instead?" -msgstr "" -"Kan ikke åbne kladdemappen for denne konto. Vil du bruge systemkladdemappen " -"i stedet?" +#: ../plugins/exchange-operations/exchange-send-options.glade.h:1 +msgid "Message Settings" +msgstr "Indstillinger for besked" -#: ../mail/mail.error.xml.h:121 -msgid "Unable to read license file." -msgstr "Kan ikke læse licens-fil." +#: ../plugins/exchange-operations/exchange-send-options.glade.h:2 +msgid "Tracking Options" +msgstr "Valgmuligheder for opfølgning" -#: ../mail/mail.error.xml.h:122 -msgid "Use _Default" -msgstr "Benyt _forvalg" +#: ../plugins/exchange-operations/exchange-send-options.glade.h:3 +msgid "Exchange - Send Options" +msgstr "Exchange - Sendemuligheder" -#: ../mail/mail.error.xml.h:123 -msgid "Use default drafts folder?" -msgstr "Benyt standardkladdemappen?" +#: ../plugins/exchange-operations/exchange-send-options.glade.h:4 +msgid "I_mportance: " +msgstr "_Vigtighed: " -#: ../mail/mail.error.xml.h:124 +#: ../plugins/exchange-operations/exchange-send-options.glade.h:5 msgid "" -"Warning: Deleting messages from a Search Folder will delete the actual " -"message from one of your local or remote folders.\n" -"Do you really want to do this?" +"Normal\n" +"High\n" +"Low" msgstr "" -"Advarsel: Sletning af et brev fra en søgemappe vil slette det rigtige brev " -"fra en af dine lokale eller fjerne mapper. Ønsker du virkelig at gøre dette?" +"Normal\n" +"Høj\n" +"Lav" -#: ../mail/mail.error.xml.h:127 -msgid "You have not filled in all of the required information." -msgstr "Du har ikke udfyldt al nødvendig information." +#: ../plugins/exchange-operations/exchange-send-options.glade.h:8 +msgid "" +"Normal\n" +"Personal\n" +"Private\n" +"Confidential" +msgstr "" +"Normal\n" +"Personlig\n" +"Privat\n" +"Klassificeret" -#: ../mail/mail.error.xml.h:128 -msgid "You have unsent messages, do you wish to quit anyway?" -msgstr "Du har usendte breve, vil du afslutte alligevel?" +#: ../plugins/exchange-operations/exchange-send-options.glade.h:12 +msgid "Request a _delivery receipt for this message" +msgstr "Bed om en _modtagelseskvittering for dette brev" -#: ../mail/mail.error.xml.h:129 -msgid "You may not create two accounts with the same name." -msgstr "Du kan ikke oprette to konti med samme navn." +#: ../plugins/exchange-operations/exchange-send-options.glade.h:13 +msgid "Request a _read receipt for this message" +msgstr "Bed om en _kvittering for at brevet er læst" -#: ../mail/mail.error.xml.h:130 -msgid "You must name this Search Folder." -msgstr "Du skal navngive denne søgemappe." +#: ../plugins/exchange-operations/exchange-send-options.glade.h:14 +msgid "Send as Delegate" +msgstr "Send som delegat" -#: ../mail/mail.error.xml.h:131 -msgid "You must specify a folder." -msgstr "Du skal angive en mappe." +#: ../plugins/exchange-operations/exchange-send-options.glade.h:15 +msgid "_Sensitivity: " +msgstr "_Følsomhed: " -#: ../mail/mail.error.xml.h:132 -msgid "" -"You must specify at least one folder as a source.\n" -"Either by selecting the folders individually, and/or by selecting all local " -"folders, all remote folders, or both." -msgstr "" -"Du skal angive mindst en mappe som værende kilde.\n" -"Enten ved at vælge mapperne individuelt, og/eller ved at vælge\n" -"alle lokale mapper, alle eksterne mapper eller begge." +#: ../plugins/exchange-operations/exchange-send-options.glade.h:16 +msgid "_User" +msgstr "_Bruger" -#: ../mail/mail.error.xml.h:134 -msgid "Your login to your server \"{0}\" as \"{0}\" failed." -msgstr "Dit logind på serveren \"{0}\" som \"{0}\" mislykkedes." +#: ../plugins/exchange-operations/exchange-user-dialog.c:136 +msgid "Select User" +msgstr "Vælg bruger" -#: ../mail/mail.error.xml.h:135 -msgid "_Append" -msgstr "_Tilføj" +#: ../plugins/exchange-operations/exchange-user-dialog.c:174 +msgid "Address Book..." +msgstr "Adressebog..." -#: ../mail/mail.error.xml.h:136 -msgid "_Discard changes" -msgstr "_Forkast ændringer" +#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1 +msgid "Subscribe to Other User's Contacts" +msgstr "Abonnér på en anden brugers kontaktpersoner" -#: ../mail/mail.error.xml.h:137 -msgid "_Do not Synchronize" -msgstr "Synkronisér _ikke" +#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1 +msgid "Subscribe to Other User's Calendar" +msgstr "Abonnér på en anden brugers kalender" -#: ../mail/mail.error.xml.h:139 -msgid "_Expunge" -msgstr "_Tøm" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1 +msgid "Activates the Evolution-Exchange extension package." +msgstr "" -#: ../mail/mail.error.xml.h:140 -msgid "_Open Messages" -msgstr "_Åbn breve" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2 +msgid "Exchange Operations" +msgstr "Exchange-handlinger" -#: ../mail/message-list.c:1052 -msgid "Unseen" -msgstr "Ulæst" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1 +msgid "Cannot access the \"Exchange settings\" tab in offline mode." +msgstr "Kan ikke tilgå fanen \"Exchange-indstillinger\" i afkoblet tilstand." -#: ../mail/message-list.c:1053 -msgid "Seen" -msgstr "Læst" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2 +msgid "Cannot change password due to configuration problems." +msgstr "Kan ikke ændre adgangskode på grund af konfigurationsproblemer." -#: ../mail/message-list.c:1054 -msgid "Answered" -msgstr "Besvaret" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3 +msgid "Cannot display folders." +msgstr "Kan ikke vise mapper." -#: ../mail/message-list.c:1055 -msgid "Forwarded" -msgstr "Videresendt" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4 +msgid "Cannot perform the operation." +msgstr "Kan ikke udføre handling." -#: ../mail/message-list.c:1056 -msgid "Multiple Unseen Messages" -msgstr "Flere ulæste breve" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5 +msgid "" +"Changes to options for Exchange account \"{0}\" will only take effect after " +"restarting Evolution." +msgstr "" +"Ændringer i indstillinger for Exchange-konto \"{0}\" vil først træde i kraft " +"efter genstart af Evolution." -#: ../mail/message-list.c:1057 -msgid "Multiple Messages" -msgstr "Flere breve" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6 +msgid "Could not authenticate to server." +msgstr "Kunne ikke opnå brugergodkendelse hos server." -#: ../mail/message-list.c:1061 -msgid "Lowest" -msgstr "Lavest" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7 +msgid "Could not change password." +msgstr "Kunne ikke ændre adgangskode." -#: ../mail/message-list.c:1062 -msgid "Lower" -msgstr "Lavere" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8 +msgid "" +"Could not configure Exchange account because \n" +"an unknown error occurred. Check the URL, \n" +"username, and password, and try again." +msgstr "" +"Kunne ikke konfigurere Exchange-kontoen pga. en ukendt fejl \n" +"Kontrollér adressen, brugernavnet og adgangskoden og prøv igen." -#: ../mail/message-list.c:1066 -msgid "Higher" -msgstr "Højere" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11 +msgid "Could not connect to Exchange server." +msgstr "Kunne ikke oprette forbindelse til Exchange-server." -#: ../mail/message-list.c:1067 -msgid "Highest" -msgstr "Højest" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12 +msgid "Could not connect to server {0}." +msgstr "Kunne ikke oprette forbindelse server {0}." -#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55 -msgid "?" -msgstr "?" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13 +msgid "Could not determine folder permissions for delegates." +msgstr "Kunne ikke bestemme mapperettigheder for delegater." -#. strftime format of a time, -#. in 12-hour format, without seconds. -#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205 -#: ../widgets/table/e-cell-date.c:70 -msgid "Today %l:%M %p" -msgstr "I dag %H:%M" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14 +msgid "Could not find Exchange Web Storage System." +msgstr "Kunne ikke finde et Exchange Web Storage System." -#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:80 -msgid "Yesterday %l:%M %p" -msgstr "I går %H:%M" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15 +msgid "Could not locate server {0}." +msgstr "Kunne ikke finde serveren {0}." -#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:92 -msgid "%a %l:%M %p" -msgstr "%a %H:%M" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16 +msgid "Could not make {0} a delegate" +msgstr "Kunne ikke gøre {0} til delegat" -#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:100 -msgid "%b %d %l:%M %p" -msgstr "%d %b %H:%M" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17 +msgid "Could not read folder permissions" +msgstr "Kunne ikke læse mapperettighederne" -#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:102 -msgid "%b %d %Y" -msgstr "%d %b %Y" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18 +msgid "Could not read folder permissions." +msgstr "Kunne ikke læse mapperettigheder." -#. there is some info why the message list is empty, let it be something useful -#: ../mail/message-list.c:3985 ../mail/message-list.c:4450 -msgid "Generating message list" -msgstr "Danner brevindeks" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19 +msgid "Could not read out-of-office state" +msgstr "Kunne ikke læse borte-fra-kontoret-tilstanden" -#: ../mail/message-list.c:4289 -msgid "" -"No message satisfies your search criteria. Either clear search with Search-" -">Clear menu item or change it." -msgstr "" -"Ingen beskeder passer til dine søgekriterier. Ryd enten søgningen med " -"menuvalget Søg->Ryd eller ændr den." +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20 +msgid "Could not update folder permissions." +msgstr "Kunne ikke opdatere mapperettighederne." -#: ../mail/message-list.c:4291 -msgid "There are no messages in this folder." -msgstr "Der er ingen beskeder i denne mappe." +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21 +msgid "Could not update out-of-office state" +msgstr "Kunne ikke opdatere borte-fra-kontoret-tilstanden" -#: ../mail/message-list.etspec.h:3 -msgid "Due By" -msgstr "Skal afleveres den" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22 +msgid "Evolution requires a restart to load the subscribed user's mailbox" +msgstr "" +"Evolution skal bruge en genstart for at kunne indlæse den tilmeldte brugers " +"brevbakke" -#: ../mail/message-list.etspec.h:4 -msgid "Flag Status" -msgstr "Markeringsstatus" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23 +msgid "Exchange Account is offline." +msgstr "Exchange-konto er afkoblet." -#: ../mail/message-list.etspec.h:5 -msgid "Flagged" -msgstr "Markerede" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24 +msgid "" +"Exchange Connector requires access to certain\n" +"functionality on the Exchange Server that appears\n" +"to be disabled or blocked. (This is usually \n" +"unintentional.) Your Exchange Administrator will \n" +"need to enable this functionality in order for \n" +"you to be able to use Evolution Exchange Connector.\n" +"\n" +"For information to provide to your Exchange \n" +"administrator, please follow the link below:\n" +"\n" +"{0}\n" +" " +msgstr "" +"Exchange Connector kræver adgang til visse\n" +"funktioner på Exchange-serveren som ser ud til\n" +"at være deaktiveret eller spærret. Dette er normalt\n" +"ikke tilsigtet. Din Exchange-administrator er nødt\n" +"til at aktivere disse funktioner for at du kan\n" +"bruge Evolution Exchange Connector.\n" +"\n" +"Følg linket nedenfor for at få de oplysninger,\n" +"du skal give din Exchange-administrator:\n" +"\n" +"{0}\n" +" " -#: ../mail/message-list.etspec.h:6 -msgid "Follow Up Flag" -msgstr "Følg-op-markering" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36 +msgid "Failed to update delegates:" +msgstr "Kunne ikke opdatere delegater:" -#: ../mail/message-list.etspec.h:11 -msgid "Received" -msgstr "Modtaget" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37 +msgid "Folder already exists" +msgstr "Mappen findes allerede" -#: ../mail/message-list.etspec.h:15 -msgid "Sent Messages" -msgstr "Sendte breve" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38 +msgid "Folder does not exist" +msgstr "Mappen findes ikke" -#: ../mail/message-list.etspec.h:16 -#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4 -msgid "Size" -msgstr "Størrelse" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39 +msgid "Folder offline" +msgstr "Arbejder afkoblet" -#: ../mail/message-list.etspec.h:19 -msgid "Subject - Trimmed" -msgstr "Emne - Trimmet" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40 +#: ../shell/e-shell.c:1268 +msgid "Generic error" +msgstr "Generel fejl" -#: ../mail/message-tag-followup.c:55 -msgid "Call" -msgstr "Ring" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41 +msgid "Global Catalog Server is not reachable" +msgstr "Global Catalog Server er ikke tilgængelig" -#: ../mail/message-tag-followup.c:56 -msgid "Do Not Forward" -msgstr "Videresend ikke" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42 +msgid "" +"If OWA is running on a different path, you must specify that in the account " +"configuration dialog." +msgstr "Hvis OWA kører på en anden sti, må du anføre denne i kontoopsætningen." -#: ../mail/message-tag-followup.c:57 -msgid "Follow-Up" -msgstr "Følg op" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43 +msgid "Mailbox for {0} is not on this server." +msgstr "Brevbakke for {0} findes ikke på denne server." -#: ../mail/message-tag-followup.c:58 -msgid "For Your Information" -msgstr "Til din oplysning" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44 +msgid "Make sure the URL is correct and try again." +msgstr "Sørg for at adressen er korrekt og prøv igen." -#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42 -msgid "Forward" -msgstr "Videresend" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45 +msgid "Make sure the server name is spelled correctly and try again." +msgstr "Sørg for at navnet på serveren er stavet korrekt og prøv igen." -#: ../mail/message-tag-followup.c:60 -msgid "No Response Necessary" -msgstr "Intet svar er påkrævet" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46 +msgid "Make sure the username and password are correct and try again." +msgstr "Sørg for at brugernavn og adgangskode er korrekte og prøv igen." -#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80 -msgid "Reply" -msgstr "Svar" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47 +msgid "No Global Catalog server configured for this account." +msgstr "Ingen Global Catalog-server er konfigureret for denne konto." -#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81 -msgid "Reply to All" -msgstr "Svar til alle" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48 +msgid "No mailbox for user {0} on {1}." +msgstr "Ingen brevbakke for bruger {0} på {1}." -#: ../mail/message-tag-followup.c:65 -msgid "Review" -msgstr "Gennemse" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49 +msgid "No such user {0}" +msgstr "Bruger findes ikke {0}" -#: ../mail/searchtypes.xml.h:1 -msgid "Body contains" -msgstr "Brevindhold indeholder" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50 +msgid "Password successfully changed." +msgstr "Adgangskode blev ændret." -#: ../mail/searchtypes.xml.h:2 -msgid "Message contains" -msgstr "Brev indeholder" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52 +msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option." +msgstr "" +"Indtast en delegats id eller fravælg \"Send som delegat\"-valgmuligheden." -#: ../mail/searchtypes.xml.h:3 -msgid "Recipients contain" -msgstr "Modtagere indeholder" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53 +msgid "Please make sure the Global Catalog Server name is correct." +msgstr "Sørg for at navnet på Global Catalog-serveren er korrekt og prøv igen." -#: ../mail/searchtypes.xml.h:4 -msgid "Sender contains" -msgstr "Afsender indeholder" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54 +msgid "Please restart Evolution for changes to take effect" +msgstr "Genstart venligst Evolution for at lade ændringerne træde i kraft" -#: ../mail/searchtypes.xml.h:5 -msgid "Subject contains" -msgstr "Emne indeholder" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55 +msgid "Please select a user." +msgstr "Vælg venligst en bruger." -#: ../mail/searchtypes.xml.h:6 -msgid "Subject or Recipients contains" -msgstr "Emne eller modtagere indeholder" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56 +msgid "Server rejected password because it is too weak." +msgstr "Serveren afviste adgangskoden fordi det er for nemt at gætte." -#: ../mail/searchtypes.xml.h:7 -msgid "Subject or Sender contains" -msgstr "Emne eller afsender indeholder" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57 +msgid "The Exchange account will be disabled when you quit Evolution" +msgstr "Exchange-kontoen deaktiveres når du afslutter Evolution" -#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1 -msgid "Local Address Books" -msgstr "Lokale adressebøger" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58 +msgid "The Exchange account will be removed when you quit Evolution" +msgstr "Exchange-kontoen fjernes når du afslutter Evolution" -#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2 -msgid "Provides core functionality for local address books." -msgstr "Sørger for kernefunktionalitet til lokale adressebøger." +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59 +msgid "The Exchange server is not compatible with Exchange Connector." +msgstr "Exchange-serveren er ikke kompatibel med Exchange Connector." -#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1 +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60 msgid "" -"List of clues for the attachment reminder plugin to look for in a message " -"body" +"The server is running Exchange 5.5. Exchange Connector \n" +"supports Microsoft Exchange 2000 and 2003 only." msgstr "" -"Liste af spor som udvidelsesmodulet til påmindelse om bilag skal kigge efter " -"i brevkroppen" +"Serveren kører Exchange 5.5. Exchange Connector \n" +"understøtter kun Microsoft Exchange 2000 og 2003." -#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2 +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62 msgid "" -"List of clues for the attachment reminder plugin to look for in a message " -"body." +"This probably means that your server requires \n" +"you to specify the Windows domain name \n" +"as part of your username (eg, "DOMAIN\\user").\n" +"\n" +"Or you might have just typed your password wrong." msgstr "" -"Liste af spor som udvidelsesmodulet til påmindelse om bilag skal kigge efter " -"i brevkroppen." +"Dette betyder sikkert at din server kræver \n" +"at du anfører Windows-domænenavnet \n" +"som en del af dit brugernavn (f.eks., "DOMÆNE\\bruger").\n" +"\n" +"Eller det kan være at du blot har fejlindtastet din adgangskode." -#: ../plugins/attachment-reminder/attachment-reminder.c:475 -#: ../plugins/templates/templates.c:390 -msgid "Keywords" -msgstr "Nøgleord" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67 +msgid "Try again with a different password." +msgstr "Prøv igen med en anden adgangskode." -#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1 -#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1 -msgid "Attachment Reminder" -msgstr "Bilagspåmindelse" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68 +msgid "Unable to add user to access control list:" +msgstr "Kan ikke føje bruger til adgangskontrol-listen:" -#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2 -msgid "" -"Looks for clues in a message for mention of attachments and warns if the " -"attachment is missing" -msgstr "" -"Kigger efter spor som omhandler bilag i dette brev og advarer hvis der ikke " -"er noget bilag" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69 +msgid "Unable to edit delegates." +msgstr "Kan ikke redigere delegater." -#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2 -msgid "" -"Evolution has found some keywords that suggest that this message should " -"contain an attachment, but cannot find one." -msgstr "" -"Evolution has fundet nogle nøgleord som antyder at dette brev skulle have et " -"bilag vedhæftet, men kan ikke finde noget." +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70 +msgid "Unknown error looking up {0}" +msgstr "Ukendt fejl ved opslag af {0}" -#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3 -msgid "Message has no attachments" -msgstr "Brev har ikke noget bilag" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71 +#: ../plugins/google-account-setup/google-source.c:522 +#: ../plugins/mail-to-task/mail-to-task.c:343 +#: ../plugins/mail-to-task/mail-to-task.c:555 +msgid "Unknown error." +msgstr "Ukendt fejl." -#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5 -msgid "_Edit Message" -msgstr "Re_digér brev" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72 +msgid "Unknown type" +msgstr "Ukendt type" -#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1 +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73 +msgid "Unsupported operation" +msgstr "En ikke-understøttet handling" + +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74 +msgid "You are nearing your quota available for storing mail on this server." +msgstr "Du er ved at have opbrugt din kvote for at gemme post på denne server." + +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75 msgid "" -"A formatter plugin which displays audio attachments inline and allows you to " -"play them directly from Evolution." +"You are permitted to send a message on behalf of only one delegator at a " +"time." msgstr "" -"Et formateringsudvidelsesmodul, der viser lydbilag indlejret, og tillader " -"dig at afspille dem direkte i Evolution." +"Du har kun lov til at sende breve på vegne af én af dem, der har dig som " +"delegat, ad gangen." -#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2 -msgid "Audio inline plugin" -msgstr "Integreret lyd-udvidelsesmodul" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76 +msgid "You cannot make yourself your own delegate" +msgstr "Du kan ikke gøre dig selv til din egen delegat" -#: ../plugins/backup-restore/backup-restore.c:138 -msgid "Select name of the Evolution backup file" -msgstr "Vælg navn til Evolutions sikkerhedskopifil" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77 +msgid "You have exceeded your quota for storing mail on this server." +msgstr "Du har overskredet din kvote for at gemme post på denne server." -#: ../plugins/backup-restore/backup-restore.c:167 -msgid "_Restart Evolution after backup" -msgstr "_Genstart Evolution efter sikkerhedskopiering" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78 +msgid "You may only configure a single Exchange account." +msgstr "Du kan kun konfigurere en enkelt Exchange-konto." -#: ../plugins/backup-restore/backup-restore.c:190 -msgid "Select name of the Evolution backup file to restore" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79 +msgid "" +"Your current usage is: {0} KB. Try to clear up some space by deleting some " +"mail." msgstr "" -"Vælg navn for den Evolution-sikkerhedskopifil som der skal genoprettes fra" - -#: ../plugins/backup-restore/backup-restore.c:214 -msgid "_Restart Evolution after restore" -msgstr "_Genstart Evolution efter genoprettelse" +"Dit aktuelle pladsforbrug er: {0} kB. Prøv at frigøre noget plads ved at " +"slette noget post." -#: ../plugins/backup-restore/backup-restore.c:287 -msgid "Restore from backup" -msgstr "Genopret fra sikkerhedskopifil" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80 +msgid "" +"Your current usage is: {0} KB. You will not be able to either send or " +"receive mail now." +msgstr "" +"Dit aktuelle pladsforbrug er: {0} kB. Du vil nu hverken kunne sende eller " +"modtage post." -#: ../plugins/backup-restore/backup-restore.c:289 +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81 msgid "" -"You can restore Evolution from your backup. It can restore all the Mails, " -"Calendars, Tasks, Memos, Contacts. \n" -"It also restores all your personal settings, mail filters etc." +"Your current usage is: {0} KB. You will not be able to send mail until you " +"clear up some space by deleting some mail." msgstr "" -"Du kan genoprette Evolution fra din sikkerhedskopi. Dette kan genoprette " -"alle breve, kalendere, opgaver, huskesedler og kontaktpersoner. \n" -"Det kan også genoprette alle dine personlige indstillinger for f.eks. " -"postfiltre." +"Dit aktuelle pladsforbrug er: {0} kB. Du vil ikke kunne sende post før du " +"frigør noget plads ved at slette noget post." -#: ../plugins/backup-restore/backup-restore.c:295 -msgid "_Restore Evolution from the backup file" -msgstr "_Genopret Evolution fra sikkerhedskopifil" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82 +msgid "Your password has expired." +msgstr "Din adgangskode er udløbet." -#: ../plugins/backup-restore/backup-restore.c:302 -msgid "Please select an Evolution Archive to restore:" -msgstr "Vælg Evolution-arkiv som skal genoprettes:" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84 +msgid "{0} cannot be added to an access control list" +msgstr "{0} kan ikke føjes til adgangskontrol-listen" -#: ../plugins/backup-restore/backup-restore.c:305 -msgid "Choose a file to restore" -msgstr "Vælg en fil der skal genoprettes" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85 +msgid "{0} is already a delegate" +msgstr "{0} er allerede en delegat" -#: ../plugins/backup-restore/backup.c:65 -msgid "Backup Evolution directory" -msgstr "Tag en sikkerhedskopi af Evolution-mappen" +#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86 +msgid "{0} is already in the list" +msgstr "{0} er allerede på listen" -#: ../plugins/backup-restore/backup.c:67 -msgid "Restore Evolution directory" -msgstr "Genopret Evolution-mappen" +#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1 +msgid "Subscribe to Other User's Tasks" +msgstr "Abonnér på en anden brugers opgaver" -#: ../plugins/backup-restore/backup.c:69 -msgid "Check Evolution Backup" -msgstr "Tjek Evolution sikkerhedskopi" +#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1 +msgid "Check folder permissions" +msgstr "Kontrollér rettigheder til mapper" -#: ../plugins/backup-restore/backup.c:71 -msgid "Restart Evolution" -msgstr "Genstart Evolution" +#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1 +msgid "Automatically launch editor when key is pressed in the mail composer" +msgstr "" -#: ../plugins/backup-restore/backup.c:73 -msgid "With Graphical User Interface" -msgstr "Med grafisk brugergrænseflade" +#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2 +#: ../plugins/external-editor/external-editor.c:120 +msgid "Automatically launch when a new mail is edited" +msgstr "" -#: ../plugins/backup-restore/backup.c:124 -#: ../plugins/backup-restore/backup.c:257 -msgid "Shutting down Evolution" -msgstr "Lukker Evolution ned" +#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3 +msgid "Default External Editor" +msgstr "Forvalgt eksternt tekstredigeringsprogram" -#: ../plugins/backup-restore/backup.c:131 -msgid "Backing Evolution accounts and settings" -msgstr "Tager sikkerhedskopi af Evolution-konti og indstillinger" +#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4 +msgid "The default command that must be used as the editor." +msgstr "Den forvalgte kommando som skal bruges som tekstredigeringsprogram." -#: ../plugins/backup-restore/backup.c:135 -msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)" -msgstr "" -"Tager sikkerhedskopi af Evolution-data (Breve, kontakterpersoner, kalender, " -"opgaver og huskesedler)" - -#: ../plugins/backup-restore/backup.c:146 -msgid "Backup complete" -msgstr "Sikkerhedkopi fuldført" - -#: ../plugins/backup-restore/backup.c:151 -#: ../plugins/backup-restore/backup.c:338 -msgid "Restarting Evolution" -msgstr "Genstarter Evolution" - -#: ../plugins/backup-restore/backup.c:261 -msgid "Backup current Evolution data" -msgstr "Tag en sikkerhedskopi af nuværende Evolution-data" - -#: ../plugins/backup-restore/backup.c:266 -msgid "Extracting files from backup" -msgstr "Pakker filer ud fra sikkerhedskopi" - -#: ../plugins/backup-restore/backup.c:273 -msgid "Loading Evolution settings" -msgstr "Indlæser Evolution-indstillinger" - -#: ../plugins/backup-restore/backup.c:277 -msgid "Removing temporary backup files" -msgstr "Fjerner midlertidige sikkerhedskopifiler" - -#: ../plugins/backup-restore/backup.c:284 -msgid "Ensuring local sources" -msgstr "Sikrer lokale kilder" - -#: ../plugins/backup-restore/backup.c:454 -#, c-format -msgid "Backing up to the folder %s" -msgstr "Tager sikkerhedkopi til mappen %s" - -#: ../plugins/backup-restore/backup.c:459 -#, c-format -msgid "Restoring from the folder %s" -msgstr "Genopretter fra mappen %s" - -#. Backup / Restore only can have GUI. We should restrict the rest -#: ../plugins/backup-restore/backup.c:478 -msgid "Evolution Backup" -msgstr "Evolution sikkerhedskopiering" - -#: ../plugins/backup-restore/backup.c:478 -msgid "Evolution Restore" -msgstr "Evolution genoprettelse" - -#: ../plugins/backup-restore/backup.c:513 -msgid "Backing up Evolution Data" -msgstr "Tager sikkerhedskopi af Evolution-data" - -#: ../plugins/backup-restore/backup.c:514 -msgid "Please wait while Evolution is backing up your data." -msgstr "Vent venligst mens Evolution laver en sikkerhedskopi af dine data." +#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1 +msgid "External Editor" +msgstr "Eksternt tekstredigeringsprogram" -#: ../plugins/backup-restore/backup.c:516 -msgid "Restoring Evolution Data" -msgstr "Gendanner Evolution-data" +#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2 +#, fuzzy +msgid "Use an external editor to compose plain-text mail messages." +msgstr "" +"Et udvidelsesmodul som gør det muligt at bruge et eksternt tekstredigerings-" +"program til brevredigering. Du kan kun sende ren tekst." -#: ../plugins/backup-restore/backup.c:517 -msgid "Please wait while Evolution is restoring your data." -msgstr "Vent venligst mens Evolution gendanner dine data." +#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1 +msgid "Cannot create Temporary File" +msgstr "Kan ikke oprette midlertidig fil" -#: ../plugins/backup-restore/backup.c:535 -msgid "This may take a while depending on the amount of data in your account." -msgstr "Dette kan tage nogen tid alt efter mængden af data i din konto." +#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2 +msgid "Editor not launchable" +msgstr "Redigeringsprogram kan ikke startes" -#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1 -msgid "A plugin for backing up and restore Evolution data and settings." +#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3 +msgid "" +"Evolution is unable to create a temporary file to save your mail. Retry " +"later." msgstr "" -"Et udvidelsesmodul til at tage sikkerhedskopier og genoprette Evolutions " -"data og indstillinger." - -#. the path to the shared library -#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3 -msgid "Backup and restore plugin" -msgstr "Udvidelsesmodul: sikkerhedskopier og genoprettelse" +"Evolution er ikke i stand til at oprette en midlertidig fil som din post kan " +"gemmes i. Prøv igen senere." -#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1 -msgid "Are you sure you want to close Evolution?" -msgstr "Er du sikker på at du ønsker at afslutte Evolution?" +#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4 +#, fuzzy +msgid "External editor still running" +msgstr "Eksternt tekstredigeringsprogram" -#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2 +#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5 msgid "" -"Are you sure you want to restore Evolution from the selected backup file?" +"The external editor is still running. The mail composer window cannot be " +"closed as long as the editor is active." msgstr "" -"Er du sikker på du ønsker genoprette Evolution fra den valgte " -"sikkerhedskopifil?" -#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3 +#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6 msgid "" -"Evolution backup can start only when Evolution is not running. Please make " -"sure that you save and close all your unsaved windows before proceeding. If " -"you want Evolution to restart automatically after backup, please enable the " -"toggle button." +"The external editor set in your plugin preferences cannot be launched. Try " +"setting a different editor." msgstr "" -"Evolution-sikkerhedskopiering kan kun starte når Evolution ikke kører. Sikr " -"dig at du gemmer og lukker alle ugemte vinduer før du går videre. Hvis du " -"ønsker at Evolution skal genstarte automatisk efter sikkerhedskopiering så " -"slå til/fra knappen til." - -#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4 -msgid "Insufficient Permissions" -msgstr "Utilstrækkelige rettigheder" - -#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5 -msgid "Invalid Evolution backup file" -msgstr "Ugyldig Evolution-sikkerhedskopifil" - -#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6 -msgid "Please select a valid backup file to restore." -msgstr "Vælg en gyldig sikkerhedskopifile, der skal genoprettes." +"Det eksterne tekstredigeringsprogram som er valgt i indstillingerne for dit " +"udvidelsesmodul kan ikke startes. Prøv at vælge et andet " +"tekstredigeringsprogram." -#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7 -msgid "The selected folder is not writable." -msgstr "Der kan ikke skrives til den valgte mappe." +#: ../plugins/external-editor/external-editor.c:109 +msgid "Command to be executed to launch the editor: " +msgstr "Kommando som skal køres for at starte tekstredigeringsprogrammet: " -#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8 +#: ../plugins/external-editor/external-editor.c:110 +#, fuzzy msgid "" -"This will delete all your current Evolution data and settings and restore " -"them from your backup. Evolution restore can start only when Evolution is " -"not running. Please make sure that you close all your unsaved windows before " -"you proceed. If you want Evolution to restart automatically restart after " -"restore, please enable the toggle button." +"For Emacs use \"xemacs\"\n" +"For VI use \"gvim -f\"" msgstr "" -"Dette vil slette alle dine nuværende Evolution-data og indstillinger og " -"genoprette nogle andre fra din sikkerhedskopifil. Evolution genoprettelse " -"kan kun starte når Evolution ikke kører. Sikr dig at du lukker alle ugemte " -"vinduer før du fortsætter. Hvis du ønsker at Evolution skal genstarte " -"automatisk efter genoprettelsen så slå til/fra knappen til." - -#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1 -msgid "Backup and restore Evolution data and settings" -msgstr "Tag en sikkerhedskopi og genopret Evolution-data og indstillinger" - -#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2 -msgid "R_estore Settings..." -msgstr "G_enopret indstillinger..." - -#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3 -msgid "_Backup Settings..." -msgstr "_Sikkerhedskopi-indstillinger..." +"Brug \"xemacs\" for Emacs\n" +"Brug \"gvim\" for VI" -#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624 -#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1 -msgid "Automatic Contacts" -msgstr "Automatisk tilføjede kontaktpersoner" +#: ../plugins/external-editor/external-editor.c:308 +#: ../plugins/external-editor/external-editor.c:310 +#, fuzzy +msgid "Compose in External Editor" +msgstr "Skriv brev i _eksternt tekstredigeringsprogram" -#. Enable BBDB checkbox -#: ../plugins/bbdb/bbdb.c:639 -msgid "_Auto-create address book entries when replying to messages" -msgstr "Føj kontaktpersoner _automatisk til adressebog ved besvarelse af breve" +#: ../plugins/face/face.c:59 +msgid "Select a (48*48) png of size < 700bytes" +msgstr "Vælg en (48*48) png med størrelse < 700bytes" -#: ../plugins/bbdb/bbdb.c:645 -msgid "Select Address book for Automatic Contacts" -msgstr "Vælg adressebog til automatisk tilføjede kontaktpersoner" +#: ../plugins/face/face.c:69 +msgid "PNG files" +msgstr "PNG-filer" -#: ../plugins/bbdb/bbdb.c:660 -msgid "Instant Messaging Contacts" -msgstr "Kvikbesked-kontaktpersoner" +#: ../plugins/face/face.c:126 +msgid "_Face" +msgstr "_Ansigt" -#. Enable Gaim Checkbox -#: ../plugins/bbdb/bbdb.c:675 -msgid "Synchronize contact info and images from Pidgin buddy list" +#: ../plugins/face/org-gnome-face.eplug.xml.h:1 +#, fuzzy +msgid "" +"Attach a small picture of your face to outgoing messages.\n" +"\n" +"First time the user needs to configure a 48x48 PNG image. It is Base-64 " +"encoded and stored in ~/.evolution/faces. This will be used in subsequent " +"sent messages." msgstr "" -"Synkronisér information om kontaktpersoner og billeder fra en Pidgin-" -"venneliste" +"Vedhæft ansigtssidehoved til udgående breve. Første gang skal brugeren " +"konfigurere et 48*48 png-billede. Det bliver base64-kodet og lagret i \"~/." +"evolution/faces\". Dette vil blive brugt i breve der sendes fremover." -#: ../plugins/bbdb/bbdb.c:681 -msgid "Select Address book for Pidgin buddy list" -msgstr "Vælg adressebog til Pidgin-venneliste" +#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56 +#, c-format +msgid "Unsubscribing from folder \"%s\"" +msgstr "Opsiger abonnement på mappe \"%s\"" -#. Synchronize now button. -#: ../plugins/bbdb/bbdb.c:692 -msgid "Synchronize with _buddy list now" -msgstr "Synkronisér med _venneliste nu" +#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1 +msgid "Unsubscribe Folders" +msgstr "Afmeld mapper" -#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2 +#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2 msgid "" -"Automatically fills your address book with names and email addresses as you " -"reply to messages. Also fills in IM contact information from your buddy " -"lists." +"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree." msgstr "" -"Tilføjer navne og adresser automatisk til din adressebog efterhånden som du " -"svarer på breve. Tilføjer også kontaktinformation fra din kvikbesked-" -"venneliste." -#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3 -msgid "BBDB" -msgstr "BBDB" +#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3 +msgid "_Unsubscribe" +msgstr "_Afmeld abonnement" -#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself. -#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161 -#, c-format -msgid "Error occurred while spawning %s: %s." -msgstr "Fejl opstod under opstart af %s: %s." +#: ../plugins/google-account-setup/google-source.c:81 +#: ../plugins/google-account-setup/google-contacts-source.c:51 +msgid "Google" +msgstr "Google" -#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186 +#: ../plugins/google-account-setup/google-source.c:422 #, c-format -msgid "Bogofilter child process does not respond, killing..." -msgstr "Bogofilter-underproces svarer ikke, afslutter den..." +msgid "Enter password for user %s to access list of subscribed calendars." +msgstr "" +"Indtast kodeordet for brugeren %s for at få adgang til listen af kalendere " +"som der abonneres på." -#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188 +#: ../plugins/google-account-setup/google-source.c:522 #, c-format -msgid "Wait for Bogofilter child process interrupted, terminating..." -msgstr "Venten på Bogofilter-underproces afbrudt, afslutter den..." +msgid "" +"Cannot read data from Google server.\n" +"%s" +msgstr "" +"Kan ikke læse data fra Google-server.\n" +"%s" -#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211 -#, c-format -msgid "Pipe to Bogofilter failed, error code: %d." -msgstr "Rør til Bogofilter fejlede, fejlkode: %d." +#: ../plugins/google-account-setup/google-source.c:674 +msgid "Cal_endar:" +msgstr "_Kalender:" -#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374 -msgid "Convert message text to _Unicode" -msgstr "Konvertér brevtekst til _Unicode" +#: ../plugins/google-account-setup/google-source.c:709 +msgid "Retrieve _list" +msgstr "Hent _liste" -#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1 -msgid "Convert mail messages to Unicode" -msgstr "Konvertér brevtekst til Unicode" +#: ../plugins/google-account-setup/google-contacts-source.c:270 +#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285 +msgid "Server" +msgstr "Server" -#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2 -msgid "" -"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from " -"different character sets." +#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1 +msgid "Add Google Calendars to Evolution." msgstr "" -"Konvertér brevtekst til Unicode UTF-8 for at forene spam-tekstbidder som " -"kommer fra forskellige tegnsæt." - -#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1 -msgid "Bogofilter Options" -msgstr "Bogofilter-indstillinger" -#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2 -msgid "Bogofilter junk plugin" -msgstr "Bogofilter-spamindstillinger" +#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2 +#, fuzzy +msgid "Google Calendars" +msgstr "Gnome-kalenderen" -#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3 -msgid "Filters junk messages using Bogofilter." -msgstr "Sorterer spam fra ved hjælp af Bogofilter." +#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456 +msgid "Checklist" +msgstr "Afkrydsningsliste" -#. we found the group, change the name based on the actual language -#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92 -msgid "CalDAV" -msgstr "CalDAV" +#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1 +msgid "Add Novell GroupWise support to Evolution." +msgstr "" -#: ../plugins/caldav/caldav-source.c:348 -#: ../plugins/calendar-http/calendar-http.c:126 -msgid "_URL:" -msgstr "_Adresse:" +#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2 +msgid "GroupWise Account Setup" +msgstr "GroupWise-kontoopsætning" -#: ../plugins/caldav/caldav-source.c:372 -#: ../plugins/google-account-setup/google-source.c:608 -#: ../plugins/google-account-setup/google-contacts-source.c:339 -msgid "Use _SSL" -msgstr "Brug _SSL" +#: ../plugins/groupwise-features/install-shared.c:220 +#, c-format +msgid "" +"The user '%s' has shared a folder with you\n" +"\n" +"Message from '%s'\n" +"\n" +"\n" +"%s\n" +"\n" +"\n" +"Click 'Forward' to install the shared folder\n" +"\n" +msgstr "" +"Brugeren \"%s\" har delt en mappe med dig\n" +"\n" +"Besked fra \"%s\"\n" +"\n" +"\n" +"%s\n" +"\n" +"\n" +"Klik \"Næste\" for at installere den delte mappe\n" +"\n" -#. add refresh option -#: ../plugins/caldav/caldav-source.c:415 -#: ../plugins/calendar-http/calendar-http.c:264 -#: ../plugins/calendar-weather/calendar-weather.c:509 -#: ../plugins/google-account-setup/google-source.c:632 -#: ../plugins/google-account-setup/google-contacts-source.c:358 -msgid "Re_fresh:" -msgstr "Op_datér:" +#: ../plugins/groupwise-features/install-shared.c:225 +msgid "Install the shared folder" +msgstr "Installér den delte mappe" -#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1 -msgid "CalDAV Calendar sources" -msgstr "Kilder til CalDAV-kalendere" +#: ../plugins/groupwise-features/install-shared.c:227 +msgid "Shared Folder Installation" +msgstr "Installation af delte mapper" -#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2 -msgid "CalDAV sources" -msgstr "CalDAV-kilder" +#: ../plugins/groupwise-features/junk-mail-settings.c:80 +msgid "Junk Settings" +msgstr "Spam-indstillinger" -#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1 -msgid "Local Calendars" -msgstr "Lokale kalendere" +#: ../plugins/groupwise-features/junk-mail-settings.c:93 +#: ../plugins/groupwise-features/junk-settings.glade.h:3 +msgid "Junk Mail Settings" +msgstr "Indstillinger for spam" -#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2 -msgid "Provides core functionality for local calendars." -msgstr "Sørger for kernefunktionalitet til lokale kalendere." +#: ../plugins/groupwise-features/junk-mail-settings.c:117 +msgid "Junk Mail Settings..." +msgstr "Indstillinger for spam..." -#: ../plugins/calendar-http/calendar-http.c:332 -msgid "_Secure connection" -msgstr "_Sikker forbindelse" +#: ../plugins/groupwise-features/junk-settings.glade.h:1 +msgid "Junk List:" +msgstr "Spam-liste" -#: ../plugins/calendar-http/calendar-http.c:397 -msgid "Userna_me:" -msgstr "Bruger_navn:" +#: ../plugins/groupwise-features/junk-settings.glade.h:2 +msgid "Email:" +msgstr "E-post:" -#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1 -msgid "HTTP Calendars" -msgstr "HTTP-kalendere" +#: ../plugins/groupwise-features/junk-settings.glade.h:5 +#: ../plugins/mail-account-disable/mail-account-disable.c:45 +msgid "_Disable" +msgstr "_Deaktivér" -#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2 -msgid "Provides core functionality for webcal and http calendars." -msgstr "Sørger for kernefunktionalitet til webcal- og http-kalendere." +#: ../plugins/groupwise-features/junk-settings.glade.h:6 +msgid "_Enable" +msgstr "_Aktivér" -#: ../plugins/calendar-weather/calendar-weather.c:61 -msgid "Weather: Fog" -msgstr "Vejr: Tåge" +#: ../plugins/groupwise-features/junk-settings.glade.h:7 +msgid "_Junk List" +msgstr "_Spam-liste" -#: ../plugins/calendar-weather/calendar-weather.c:62 -msgid "Weather: Cloudy" -msgstr "Vejr: Skyet" +#: ../plugins/groupwise-features/mail-retract.c:53 +msgid "Message Retract" +msgstr "Beskedtilbagetrækning" -#: ../plugins/calendar-weather/calendar-weather.c:63 -msgid "Weather: Cloudy Night" -msgstr "Vejr: Skyet nat" +#: ../plugins/groupwise-features/mail-retract.c:58 +msgid "" +"Retracting a message may remove it from the recipient's mailbox. Are you " +"sure you want to do this ?" +msgstr "" +"At tilbagetrække en besked kan fjerne den fra modtagerens brevbakke. Er du " +"sikker op du ønsker at gøre dette ?" -#: ../plugins/calendar-weather/calendar-weather.c:64 -msgid "Weather: Overcast" -msgstr "Vejr: Gråvejr" +#: ../plugins/groupwise-features/mail-retract.c:77 +msgid "Message retracted successfully" +msgstr "Brevet blev tilbagetrukket" -#: ../plugins/calendar-weather/calendar-weather.c:65 -msgid "Weather: Showers" -msgstr "Vejr: Byger" +#: ../plugins/groupwise-features/mail-retract.c:87 +msgid "Retract Mail" +msgstr "Tilbagetræk brev" -#: ../plugins/calendar-weather/calendar-weather.c:66 -msgid "Weather: Snow" -msgstr "Vejr: Sne" +#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1 +msgid "Add Send Options to GroupWise messages" +msgstr "Føj afsendelsesindstillinger til GroupWise-breve" -#: ../plugins/calendar-weather/calendar-weather.c:67 -msgid "Weather: Sunny" -msgstr "Vejr: Solbeskinnet" +#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1 +#, fuzzy +msgid "Fine-tune your GroupWise accounts." +msgstr "Et udvidelsesmodul til funktionerne i GroupWise-konti." -#: ../plugins/calendar-weather/calendar-weather.c:68 -msgid "Weather: Clear Night" -msgstr "Vejr: Klar nat" +#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2 +msgid "GroupWise Features" +msgstr "GroupWise-funktioner" -#: ../plugins/calendar-weather/calendar-weather.c:69 -msgid "Weather: Thunderstorms" -msgstr "Vejr: Tordenstorme" +#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1 +msgid "Message retract failed" +msgstr "Tilbagetrækning af brevet fejlede" -#: ../plugins/calendar-weather/calendar-weather.c:230 -msgid "Select a location" -msgstr "Vælg et sted" +#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2 +msgid "The server did not allow the selected message to be retracted." +msgstr "Serveren tillod ikke at det valgte brev kunne tilbagetrækkes." -#: ../plugins/calendar-weather/calendar-weather.c:615 -msgid "_Units:" -msgstr "_Enheder:" +#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1 +#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3 +#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1 +msgid "Invalid user" +msgstr "Ugyldig bruger" -#: ../plugins/calendar-weather/calendar-weather.c:622 -msgid "Metric (Celsius, cm, etc)" -msgstr "Metrisk (celsius, cm, o.a.)" +#. 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 +#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3 +msgid "Proxy access cannot be given to user "{0}"" +msgstr "Proxyadgang kan ikke gives til bruger "{0}"." -#: ../plugins/calendar-weather/calendar-weather.c:623 -msgid "Imperial (Fahrenheit, inches, etc)" -msgstr "Imperial (fahrenheit, tommer, o.a.)" +#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4 +#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2 +msgid "Specify User" +msgstr "Specificér bruger" -#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1 -msgid "Provides core functionality for weather calendars." -msgstr "Sørger for kernefunktionalitet til vejrkalendere." +#. 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 +#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6 +msgid "You have already given proxy permissions to this user." +msgstr "Du har allerede tildelt denne bruger proxytilladelser." -#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2 -msgid "Weather Calendars" -msgstr "Vejrkalendere" +#. 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 +#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8 +msgid "You have to specify a valid user name to give proxy rights." +msgstr "Du skal angive et gyldigt brugernavn for at tildele proxyrettigheder." -#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1 -msgid "" -"A test plugin which demonstrates a popup menu plugin which lets you copy " -"things to the clipboard." +#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1 +msgid "Account "{0}" already exists. Please check your folder tree." msgstr "" -"Et test-udvidelsesmodul som demonstrerer et pop op-menu-udvidelsesmodul der " -"lader dig kopiere ting til klippebordet." - -#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3 -msgid "Copy tool" -msgstr "Kopieringsværktøj" +"Kontoen "{0}" findes allerede. Kontroller venligst dit mappetræ." -#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1 -msgid "Check whether Evolution is the default mailer" -msgstr "Kontrollér om Evolution er valgt som standard-postprogram" +#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2 +msgid "Account Already Exists" +msgstr "Kontoen findes allerede" -#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2 +#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4 msgid "" -"Every time Evolution starts, check whether or not it is the default mailer." -msgstr "Kontrollér om Evolution er forvalgt postprogram hver gang den startes." - -#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1 -msgid "Checks whether Evolution is the default mail client on startup." +"Proxy login as "{0}" was unsuccessful. Please check your email " +"address and try again." msgstr "" -"Kontrollerer om Evolution er forvalgt postprogram hver gang den startes." +"Proxylogind som "{0}" lykkedes ikke. Kontroller venligst din e-post-" +"adresse og prøv igen." -#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2 -msgid "Default Mail Client " -msgstr "Forvalgt postprogram " +#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3 +msgid "You cannot share this folder with the specified user "{0}"" +msgstr "Du kan ikke dele denne mappe med den anførte bruger "{0}"" -#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1 -msgid "Do you want to make Evolution your default e-mail client?" -msgstr "Vil du gøre Evolution til forvalgt postprogram?" +#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4 +msgid "You have to specify a user name which you want to add to the list" +msgstr "Du skal angive et brugernavn, som du vil tilføje til listen" -#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2 -#: ../shell/main.c:599 -msgid "Evolution" -msgstr "Evolution" +#: ../plugins/groupwise-features/process-meeting.c:54 +msgid "Accept Tentatively" +msgstr "Godkend forsøgsvist" -#: ../plugins/default-source/default-source.c:82 -msgid "Mark as _default address book" -msgstr "Markér som _forvalgt adressebog" +#: ../plugins/groupwise-features/process-meeting.c:322 +#, fuzzy +msgid "Rese_nd Meeting..." +msgstr "Udde_legér møde..." -#: ../plugins/default-source/default-source.c:103 -msgid "Mark as _default calendar" -msgstr "Markér som _forvalgt kalender" +#: ../plugins/groupwise-features/properties.glade.h:1 +msgid "Users:" +msgstr "Brugere:" -#: ../plugins/default-source/default-source.c:104 -msgid "Mark as _default task list" -msgstr "Markér som _forvalgt opgaveliste" +#: ../plugins/groupwise-features/properties.glade.h:2 +msgid "C_ustomize notification message" +msgstr "_Tilpas påmindelsesbrev" -#: ../plugins/default-source/default-source.c:105 -msgid "Mark as _default memo list" -msgstr "Markér som _forvalgt huskeseddelliste" +#: ../plugins/groupwise-features/properties.glade.h:3 +msgid "Con_tacts..." +msgstr "Kon_taktpersoner..." -#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1 -msgid "Default Sources" -msgstr "Standardkilder" +#: ../plugins/groupwise-features/properties.glade.h:5 +#: ../widgets/table/e-table-click-to-add.c:515 +msgid "Message" +msgstr "Brev" -#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2 -msgid "" -"Provides functionality for marking a calendar or an address book as the " -"default one." -msgstr "" -"Sørger for funktionalitet til at markere en kalender eller en adressebog som " -"den forvalgte." +#: ../plugins/groupwise-features/properties.glade.h:6 +msgid "Shared Folder Notification" +msgstr "Underretning for delt mappe" -#: ../plugins/email-custom-header/email-custom-header.c:334 -msgid "Security:" -msgstr "Sikkerhed:" +#: ../plugins/groupwise-features/properties.glade.h:8 +msgid "The participants will receive the following notification.\n" +msgstr "Deltagerne vil modtage følgende påmindelse.\n" -#: ../plugins/email-custom-header/email-custom-header.c:339 -msgid "Unclassified" -msgstr "Ikke klassificeret" +#: ../plugins/groupwise-features/properties.glade.h:12 +msgid "_Not Shared" +msgstr "_Ikke fælles" -#: ../plugins/email-custom-header/email-custom-header.c:340 -msgid "Protected" -msgstr "Beskyttet" +#: ../plugins/groupwise-features/properties.glade.h:14 +msgid "_Shared With..." +msgstr "_Delt med..." -#: ../plugins/email-custom-header/email-custom-header.c:342 -msgid "Secret" -msgstr "Hemmeligt" +#: ../plugins/groupwise-features/properties.glade.h:15 +msgid "_Sharing" +msgstr "_Deling" -#: ../plugins/email-custom-header/email-custom-header.c:343 -msgid "Top secret" -msgstr "Strengt fortroligt" +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1 +msgid "Name" +msgstr "Navn" -#: ../plugins/email-custom-header/email-custom-header.c:585 -msgid "_Custom Header" -msgstr "_Tilpassede brevhoveder" - -#: ../plugins/email-custom-header/email-custom-header.c:906 -msgid "Key" -msgstr "Nøgle" +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2 +msgid "Access Rights" +msgstr "Adgangrettigheder" -#: ../plugins/email-custom-header/email-custom-header.c:917 -#: ../plugins/templates/templates.c:396 -msgid "Values" -msgstr "Værdier" +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3 +msgid "Add/Edit" +msgstr "Tilføje/redigére" -#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values -#: ../plugins/email-custom-header/email-custom-header.glade.h:2 -msgid "" -"The format for specifying a Custom Header key value is:\n" -"Name of the Custom Header key values separated by \";\"." -msgstr "" -"Formatet som specificeringen af nøgleværdier i et tilpasset brevhoved " -"angives i:\n" -"Navne på nøgleværdier for de tilpassede brevhoveder separeres med \";\"." +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5 +msgid "Con_tacts" +msgstr "Kon_takter" -#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1 -msgid "Email Custom Header" -msgstr "Tilpasset brevhoved for e-post" +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7 +msgid "Modify _folders/options/rules/" +msgstr "Ændr _mapper/indstillinger/regler/" -#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added -#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2 -msgid "Adds custom header to outgoing messages." -msgstr "Tilføj tilpasset brevhoved til udgående besked." +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8 +msgid "Read items marked _private" +msgstr "Læse punkter der er _private" -#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3 -msgid "Custom Header" -msgstr "Tilpasset brevhoved" +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9 +msgid "Reminder Notes" +msgstr "Påmindelsesnoter" -#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1 -msgid "List of Custom Headers" -msgstr "Liste over tilpassede brevhoveder" +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10 +msgid "Subscribe to my _alarms" +msgstr "Abonnér på mine _påmindelser" -#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2 -msgid "" -"The key specifies the list of custom headers that you can add to an outgoing " -"message. The format for specifying a Header and Header value is: Name of the " -"custom header followed by \"=\" and the values separated by \";\"" -msgstr "" -"Denne nøgle specificerer listen over tilpassede brevhoveder som du kan " -"tilføje til en udgående besked. Formatet som et brevhoved og dets værdier " -"angives i er: Navnet på det tilpassede brevhoved, efterfulgt af et \"=\" og " -"værdierne separeret med et \";\"" +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11 +msgid "Subscribe to my _notifications" +msgstr "Tilmeld til mine _påmindelser" -#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1 -msgid "Open Other User's Folder" -msgstr "Åbn en anden brugers mappe" +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13 +msgid "_Write" +msgstr "_Skriv" -#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2 -msgid "_Account:" -msgstr "_Konto:" +#. To Translators: strip the part in front of the | and the | itself +#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15 +msgid "permission to read|_Read" +msgstr "_Læse" -#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3 -msgid "_Folder Name:" -msgstr "_Mappenavn:" +#. 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 +#: ../plugins/groupwise-features/proxy-listing.glade.h:2 +msgid "Proxy" +msgstr "Proxy" -#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4 -msgid "_User:" -msgstr "_Bruger:" +#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1 +msgid "Account Name" +msgstr "Kontonavn" -#. i18n: "Secure Password Authentication" is an Outlookism -#: ../plugins/exchange-operations/exchange-account-setup.c:63 -msgid "Secure Password" -msgstr "Sikker adgangskode" +#. 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 +#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3 +msgid "Proxy Login" +msgstr "Logind på proxy" -#. i18n: "NTLM" probably doesn't translate -#: ../plugins/exchange-operations/exchange-account-setup.c:66 -msgid "" -"This option will connect to the Exchange server using secure password (NTLM) " -"authentication." -msgstr "" -"Dette alternativ vil tilslutte Exchange-serveren ved hjælp af sikker " -"adgangskode (NTLM)-godkendelse." +#: ../plugins/groupwise-features/proxy-login.c:207 +#: ../plugins/groupwise-features/proxy-login.c:250 +#: ../plugins/groupwise-features/proxy.c:490 +#: ../plugins/groupwise-features/send-options.c:86 +#, c-format +msgid "%sEnter password for %s (user %s)" +msgstr "%sIndtast adgangskode for %s (bruger %s)" -#: ../plugins/exchange-operations/exchange-account-setup.c:74 -msgid "Plaintext Password" -msgstr "Adgangskode i klartekst" +#. 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 +#: ../plugins/groupwise-features/proxy-login.c:512 +msgid "_Proxy Login..." +msgstr "_Proxylogind..." -#: ../plugins/exchange-operations/exchange-account-setup.c:76 -msgid "" -"This option will connect to the Exchange server using standard plaintext " -"password authentication." -msgstr "" -"Dette alternativ vil tilslutte Exchange-serveren ved hjælp af " -"standardgodkendelse med adgangskode i klartekst." +#. 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 +#: ../plugins/groupwise-features/proxy.c:691 +msgid "The Proxy tab will be available only when the account is online." +msgstr "Proxy-fanebladet vil kun være tilgængeligt når kontoen er opkoblet." -#: ../plugins/exchange-operations/exchange-account-setup.c:272 -msgid "Out Of Office" -msgstr "Fraværende" +#. 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 +#: ../plugins/groupwise-features/proxy.c:697 +msgid "The Proxy tab will be available only when the account is enabled." +msgstr "Proxy-fanebladet vil kun være tilgængeligt når kontoen er aktiveret." -#: ../plugins/exchange-operations/exchange-account-setup.c:279 -msgid "" -"The message specified below will be automatically sent to \n" -"each person who sends mail to you while you are out of the office." -msgstr "" -"Nedenstående brev sendes automatisk til alle som sender dig\n" -"e-post mens du er borte fra kontoret." +#: ../plugins/groupwise-features/send-options.c:215 +msgid "Advanced send options" +msgstr "Avancerede afsendelsesindstillinger" -#: ../plugins/exchange-operations/exchange-account-setup.c:291 -#: ../plugins/exchange-operations/exchange-account-setup.c:296 -msgid "I am out of the office" -msgstr "Jeg er ikke på kontoret" +#: ../plugins/groupwise-features/share-folder-common.c:320 +#: ../plugins/groupwise-features/share-folder.c:753 +msgid "Users" +msgstr "Brugere" -#: ../plugins/exchange-operations/exchange-account-setup.c:292 -#: ../plugins/exchange-operations/exchange-account-setup.c:295 -msgid "I am in the office" -msgstr "Jeg er på kontoret" +#: ../plugins/groupwise-features/share-folder-common.c:321 +msgid "Enter the users and set permissions" +msgstr "Angiv brugerne og sæt rettigheder" -#. Change Password -#: ../plugins/exchange-operations/exchange-account-setup.c:343 -msgid "Change the password for Exchange account" -msgstr "Skift adgangskoden for Exchange-konto" +#: ../plugins/groupwise-features/share-folder-common.c:340 +msgid "New _Shared Folder..." +msgstr "Ny _fælles mappe..." -#: ../plugins/exchange-operations/exchange-account-setup.c:345 -#: ../plugins/exchange-operations/exchange-change-password.glade.h:1 -msgid "Change Password" -msgstr "Skift adgangskode" +#: ../plugins/groupwise-features/share-folder-common.c:448 +msgid "Sharing" +msgstr "Deling" -#. Delegation Assistant -#: ../plugins/exchange-operations/exchange-account-setup.c:350 -msgid "Manage the delegate settings for Exchange account" -msgstr "Håndtér uddelegerings-indstillinger for Exchange-konto" +#: ../plugins/groupwise-features/share-folder.c:536 +msgid "Custom Notification" +msgstr "Tilpasset påmindelse" -#: ../plugins/exchange-operations/exchange-account-setup.c:352 -msgid "Delegation Assistant" -msgstr "Delegeringsassistent" +#: ../plugins/groupwise-features/share-folder.c:758 +msgid "Add " +msgstr "Tilføj " -#. Miscelleneous settings -#: ../plugins/exchange-operations/exchange-account-setup.c:364 -msgid "Miscelleneous" -msgstr "Diverse" +#: ../plugins/groupwise-features/share-folder.c:764 +msgid "Modify" +msgstr "Ændre" -#. Folder Size -#: ../plugins/exchange-operations/exchange-account-setup.c:374 -msgid "View the size of all Exchange folders" -msgstr "Vis alle Exchange-mappers størrelse" +#: ../plugins/groupwise-features/status-track.c:97 +msgid "Message Status" +msgstr "Beskedstatus" -#: ../plugins/exchange-operations/exchange-account-setup.c:376 -msgid "Folders Size" -msgstr "Mappestørrelse" +#. Subject +#: ../plugins/groupwise-features/status-track.c:111 +msgid "Subject:" +msgstr "Emne:" -#: ../plugins/exchange-operations/exchange-account-setup.c:383 -#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3 -msgid "Exchange Settings" -msgstr "Exchange-indstillinger" +#: ../plugins/groupwise-features/status-track.c:125 +msgid "From:" +msgstr "Fra:" -#: ../plugins/exchange-operations/exchange-account-setup.c:730 -msgid "_OWA URL:" -msgstr "_OWA-adresse:" +#: ../plugins/groupwise-features/status-track.c:140 +msgid "Creation date:" +msgstr "Oprettelsesdato:" -#: ../plugins/exchange-operations/exchange-account-setup.c:756 -msgid "A_uthenticate" -msgstr "_Godkend" +#: ../plugins/groupwise-features/status-track.c:179 +msgid "Recipient: " +msgstr "Modtager: " -#: ../plugins/exchange-operations/exchange-account-setup.c:777 -msgid "S_pecify the mailbox name" -msgstr "A_ngiv navnet for brevbakke" +#: ../plugins/groupwise-features/status-track.c:186 +msgid "Delivered: " +msgstr "Leveret: " -#: ../plugins/exchange-operations/exchange-account-setup.c:790 -msgid "_Mailbox:" -msgstr "_Brevbakke" +#: ../plugins/groupwise-features/status-track.c:192 +msgid "Opened: " +msgstr "Åbnet: " -#: ../plugins/exchange-operations/exchange-account-setup.c:1005 -msgid "_Authentication Type" -msgstr "_Godkendelsestype" +#: ../plugins/groupwise-features/status-track.c:197 +msgid "Accepted: " +msgstr "Accepteret: " -#: ../plugins/exchange-operations/exchange-account-setup.c:1019 -msgid "Ch_eck for Supported Types" -msgstr "_Søg efter understøttede typer" +#: ../plugins/groupwise-features/status-track.c:202 +msgid "Deleted: " +msgstr "Slettet: " -#: ../plugins/exchange-operations/exchange-account-setup.c:1134 -#: ../plugins/exchange-operations/exchange-contacts.c:217 -#, c-format -msgid "%s KB" -msgstr "%s Kb" +#: ../plugins/groupwise-features/status-track.c:207 +msgid "Declined: " +msgstr "Afslået: " -#: ../plugins/exchange-operations/exchange-account-setup.c:1136 -#: ../plugins/exchange-operations/exchange-contacts.c:219 -#, c-format -msgid "0 KB" -msgstr "0 kB" +#: ../plugins/groupwise-features/status-track.c:212 +msgid "Completed: " +msgstr "Fuldført: " -#: ../plugins/exchange-operations/exchange-calendar.c:196 -#: ../plugins/exchange-operations/exchange-contacts.c:170 -msgid "" -"Evolution is in offline mode. You cannot create or modify folders now.\n" -"Please switch to online mode for such operations." -msgstr "" -"Evolution er afkoblet. Du kan ikke oprette eller ændre mapper nu.\n" -"Skift venligst til opkoblet tilstand for at udføre disse handlinger." +#: ../plugins/groupwise-features/status-track.c:217 +msgid "Undelivered: " +msgstr "Ikke leveret: " -#. User entered a wrong existing -#. * password. Prompt him again. -#. -#: ../plugins/exchange-operations/exchange-change-password.c:114 -msgid "" -"The current password does not match the existing password for your account. " -"Please enter the correct password" +#: ../plugins/groupwise-features/status-track.c:241 +msgid "Track Message Status..." +msgstr "Efterspor brevstatus..." + +#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1 +msgid "Add Hula support to Evolution." msgstr "" -"Den nuværende adgangskode matcher ikke den eksisterende adgangskode for din " -"konto. Angiv den korrekte adgangskode" -#: ../plugins/exchange-operations/exchange-change-password.c:121 -msgid "The two passwords do not match. Please re-enter the passwords." -msgstr "De to adgangskoder matcher ikke. Angiv adgangskoden igen." +#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2 +msgid "Hula Support" +msgstr "" -#: ../plugins/exchange-operations/exchange-change-password.glade.h:2 -msgid "Confirm Password:" -msgstr "Bekræft adgangskode:" +#: ../plugins/imap-features/imap-headers.c:320 +msgid "Custom Headers" +msgstr "Tilpassede brevhoveder" -#: ../plugins/exchange-operations/exchange-change-password.glade.h:3 -msgid "Current Password:" -msgstr "Nuværende adgangskode:" +#: ../plugins/imap-features/imap-headers.c:333 +msgid "IMAP Headers" +msgstr "IMAP-brevhoveder" -#: ../plugins/exchange-operations/exchange-change-password.glade.h:4 -msgid "New Password:" -msgstr "Ny adgangskode:" +#: ../plugins/imap-features/imap-headers.glade.h:1 +msgid "Custom Headers" +msgstr "Tilpassede brevhoveder" -#: ../plugins/exchange-operations/exchange-change-password.glade.h:5 -msgid "Your current password has expired. Please change your password now." -msgstr "Din nuværende adgangskode er udløbet. Skift din adgangskode nu." +#: ../plugins/imap-features/imap-headers.glade.h:2 +msgid "IMAP Headers" +msgstr "IMAP-brevhoveder" -#: ../plugins/exchange-operations/exchange-config-listener.c:660 -#, c-format -msgid "Your password will expire in the next %d days" -msgstr "Din adgangskode vil udløbe indenfor de næste %d dage" +#: ../plugins/imap-features/imap-headers.glade.h:3 +msgid "Basic and _Mailing List Headers (Default)" +msgstr "Basale og _postliste brevhoveder (standard)" -#: ../plugins/exchange-operations/exchange-delegates-user.c:154 -#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570 -msgid "Custom" -msgstr "Tilpasset" +#: ../plugins/imap-features/imap-headers.glade.h:4 +msgid "Fetch A_ll Headers" +msgstr "Hent a_lle brevhoveder" -#: ../plugins/exchange-operations/exchange-delegates-user.c:184 -#: ../plugins/exchange-operations/exchange-delegates.glade.h:8 -msgid "Editor (read, create, edit)" -msgstr "Redaktør (læs, opret, redigér)" +#: ../plugins/imap-features/imap-headers.glade.h:5 +msgid "" +"Give the extra headers that you need to fetch in addition to the above " +"standard headers. \n" +"You can ignore this if you choose \"All Headers\"." +msgstr "" +"Giv de ekstra brevhoveder som du bliver nødt til at hente i tillæg til de " +"overstående standard brevhoveder. \n" +"Du kan ignorere dette hvis du vælger \"Alle brevhoveder\"." -#: ../plugins/exchange-operations/exchange-delegates-user.c:188 -#: ../plugins/exchange-operations/exchange-delegates.glade.h:1 -msgid "Author (read, create)" -msgstr "Forfatter (læs, opret)" +#: ../plugins/imap-features/imap-headers.glade.h:7 +msgid "" +"Select your IMAP Header Preferences. \n" +"The more headers you have the more time it will take to download." +msgstr "" +"Vælg dine IMAP-brevhovedindstillinger. \n" +"Jo flere brevhoveder du har, jo mere tid vil det tage at hente." -#: ../plugins/exchange-operations/exchange-delegates-user.c:192 -#: ../plugins/exchange-operations/exchange-delegates.glade.h:11 -msgid "Reviewer (read-only)" -msgstr "Gennemlæser (skrivebeskyttet)" +#: ../plugins/imap-features/imap-headers.glade.h:9 +msgid "" +"_Basic Headers - (Fastest) \n" +"Use this if you do not have filters based on mailing lists" +msgstr "" +"_Basale brevhoveder - (hurtigst) \n" +"Brug dette hvis du ikke vil have filtre baseret på postlister" -#: ../plugins/exchange-operations/exchange-delegates-user.c:242 -#: ../plugins/exchange-operations/exchange-delegates.glade.h:6 -msgid "Delegate Permissions" -msgstr "Rettigheder for delegater" +#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1 +msgid "Fine-tune your IMAP accounts." +msgstr "" -#: ../plugins/exchange-operations/exchange-delegates-user.c:253 -#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178 -#, c-format -msgid "Permissions for %s" -msgstr "Rettigheder for %s" +#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2 +msgid "IMAP Features" +msgstr "IMAP-egenskaber" -#. To translators: This is a part of the message to be sent to the delegatee -#. summarizing the permissions assigned to him. -#. -#: ../plugins/exchange-operations/exchange-delegates-user.c:343 +#: ../plugins/ipod-sync/evolution-ipod-sync.c:49 +msgid "Hardware Abstraction Layer not loaded" +msgstr "Hardware-abstraktionslag ikke indlæst" + +#: ../plugins/ipod-sync/evolution-ipod-sync.c:50 msgid "" -"This message was sent automatically by Evolution to inform you that you have " -"been designated as a delegate. You can now send messages on my behalf." +"The \"hald\" service is required but not currently running. Please enable " +"the service and rerun this program, or contact your system administrator." msgstr "" -"Denne besked blev automatisk udsendt af Evolution for at gøre dig opmærksom " -"at du er blevet delegat. Du kan nu sende breve på mine vegne." +"Servicen \"hald\" er påkrævet, men kører ikke på nuværende tidspunkt. " +"Aktivér denne service og genstart programmet, eller kontakt din " +"systemadministrator." -#. To translators: Another chunk of the same message. -#. -#: ../plugins/exchange-operations/exchange-delegates-user.c:348 -msgid "You have been given the following permissions on my folders:" -msgstr "Du har fået tildelt følgende rettigheder over mine mapper:" +#: ../plugins/ipod-sync/evolution-ipod-sync.c:83 +msgid "Search for an iPod failed" +msgstr "Søgning efter en iPod fejlede" -#. To translators: This message is included if the delegatee has been given access -#. to the private items. -#. -#: ../plugins/exchange-operations/exchange-delegates-user.c:366 -msgid "You are also permitted to see my private items." -msgstr "Du har også lov til at se mine private objekter." +#: ../plugins/ipod-sync/evolution-ipod-sync.c:84 +msgid "" +"Evolution could not find an iPod to synchronize with. Either the iPod is not " +"connected to the system or it is not powered on." +msgstr "" +"Evolution kunne ikke finde en iPod at synkronisere med. Den er enten ikke " +"forbundet til systemet eller ikke tændt." -#. To translators: This message is included if the delegatee has not been given access -#. to the private items. -#. -#: ../plugins/exchange-operations/exchange-delegates-user.c:373 -msgid "However you are not permitted to see my private items." -msgstr "Men du har ikke lov til at se mine private objekter." +#: ../plugins/ipod-sync/ical-format.c:119 +#: ../plugins/save-calendar/ical-format.c:164 +msgid "iCalendar format (.ics)" +msgstr "iCalendar-format (.ics)" + +#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1 +msgid "Synchronize to iPod" +msgstr "Synkronisér med iPod" + +#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2 +#, fuzzy +msgid "Synchronize your data with your Apple iPod." +msgstr "Synkronisér med iPod" + +#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3 +msgid "iPod Synchronization" +msgstr "iPod-synkronisering" -#: ../plugins/exchange-operations/exchange-delegates-user.c:405 +#: ../plugins/itip-formatter/itip-formatter.c:482 +#: ../plugins/itip-formatter/itip-formatter.c:607 #, c-format -msgid "You have been designated as a delegate for %s" -msgstr "Du er blevet udnævnt som delegat for %s" +msgid "Failed to load the calendar '%s'" +msgstr "Kunne ikke indlæse kalenderen \"%s\"" -#: ../plugins/exchange-operations/exchange-delegates.c:417 -msgid "Delegate To" -msgstr "Uddelegér til" +#: ../plugins/itip-formatter/itip-formatter.c:627 +#, c-format +msgid "An appointment in the calendar '%s' conflicts with this meeting" +msgstr "En aftale i kalenderen \"%s\" er i konflikt med dette møde" -#: ../plugins/exchange-operations/exchange-delegates.c:582 +#: ../plugins/itip-formatter/itip-formatter.c:663 #, c-format -msgid "Remove the delegate %s?" -msgstr "Fjern delegaten %s?" +msgid "Found the appointment in the calendar '%s'" +msgstr "Fandt aftalen i kalenderen \"%s\"" -#: ../plugins/exchange-operations/exchange-delegates.c:700 -msgid "Could not access Active Directory" -msgstr "Kunne ikke tilgå Active Directory" +#: ../plugins/itip-formatter/itip-formatter.c:753 +msgid "Unable to find any calendars" +msgstr "Kunne ikke finde nogen kalendere" -#: ../plugins/exchange-operations/exchange-delegates.c:712 -msgid "Could not find self in Active Directory" -msgstr "Kunne ikke finde sig selv i Active Directory" +#: ../plugins/itip-formatter/itip-formatter.c:760 +msgid "Unable to find this meeting in any calendar" +msgstr "Kunne ikke finde dette møde i nogen kalender" -#: ../plugins/exchange-operations/exchange-delegates.c:725 +#: ../plugins/itip-formatter/itip-formatter.c:764 +msgid "Unable to find this task in any task list" +msgstr "Kunne ikke finde denne opgave i nogen opgaveliste" + +#: ../plugins/itip-formatter/itip-formatter.c:768 +msgid "Unable to find this memo in any memo list" +msgstr "Kunne ikke finde denne huskeseddel i nogen huskeseddelliste" + +#: ../plugins/itip-formatter/itip-formatter.c:839 +#, fuzzy +msgid "Opening the calendar. Please wait.." +msgstr "Åbner kalender" + +#: ../plugins/itip-formatter/itip-formatter.c:842 +msgid "Searching for an existing version of this appointment" +msgstr "Søger efter en eksisterende udgave af denne aftale" + +#: ../plugins/itip-formatter/itip-formatter.c:1024 +msgid "Unable to parse item" +msgstr "Kan ikke fortolke elementet" + +#: ../plugins/itip-formatter/itip-formatter.c:1111 #, c-format -msgid "Could not find delegate %s in Active Directory" -msgstr "Kunne ikke finde delegaten %s i Active Directory" +msgid "Unable to send item to calendar '%s'. %s" +msgstr "Kan ikke sende elementet til kalenderen \"%s\". %s" -#: ../plugins/exchange-operations/exchange-delegates.c:737 +#: ../plugins/itip-formatter/itip-formatter.c:1123 #, c-format -msgid "Could not remove delegate %s" -msgstr "Kunne ikke fjerne delegaten %s" +msgid "Sent to calendar '%s' as accepted" +msgstr "Sendt til kalenderen \"%s\" som accepteret" -#: ../plugins/exchange-operations/exchange-delegates.c:797 -msgid "Could not update list of delegates." -msgstr "Kunne ikke opdatere listen af delegater." +#: ../plugins/itip-formatter/itip-formatter.c:1127 +#, c-format +msgid "Sent to calendar '%s' as tentative" +msgstr "Sendt forsøgsvist til kalenderen \"%s\"" -#: ../plugins/exchange-operations/exchange-delegates.c:815 +#: ../plugins/itip-formatter/itip-formatter.c:1132 #, c-format -msgid "Could not add delegate %s" -msgstr "Kunne ikke tilføje delegat %s" +msgid "Sent to calendar '%s' as declined" +msgstr "Sendt til kalenderen \"%s\" som afslået" -#: ../plugins/exchange-operations/exchange-delegates.c:983 -msgid "Error reading delegates list." -msgstr "Fejl ved læsning af liste af delegater." +#: ../plugins/itip-formatter/itip-formatter.c:1137 +#, c-format +msgid "Sent to calendar '%s' as canceled" +msgstr "Sendt til kalenderen \"%s\" som annulleret" -#. Translators: This is used for permissions for for the folder Calendar. -#: ../plugins/exchange-operations/exchange-delegates.glade.h:3 -msgid "C_alendar:" -msgstr "K_alender:" +#: ../plugins/itip-formatter/itip-formatter.c:1231 +#, c-format +msgid "Organizer has removed the delegate %s " +msgstr "Organisator har fjernet delegat %s " -#. Translators: This is used for permissions for for the folder Contacts. -#: ../plugins/exchange-operations/exchange-delegates.glade.h:5 -msgid "Co_ntacts:" -msgstr "Ko_ntaktpersoner:" +#: ../plugins/itip-formatter/itip-formatter.c:1238 +msgid "Sent a cancelation notice to the delegate" +msgstr "Sendte en aflysningsnotits til delegaten" -#: ../plugins/exchange-operations/exchange-delegates.glade.h:7 -msgid "Delegates" -msgstr "Delegater" +#: ../plugins/itip-formatter/itip-formatter.c:1240 +msgid "Could not send the cancelation notice to the delegate" +msgstr "Kunne ikke sende en aflysningsnotits til delegaten" -#: ../plugins/exchange-operations/exchange-delegates.glade.h:10 -msgid "Permissions for" -msgstr "Rettigheder for" +#: ../plugins/itip-formatter/itip-formatter.c:1348 +msgid "Attendee status could not be updated because the status is invalid" +msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status" -#: ../plugins/exchange-operations/exchange-delegates.glade.h:12 -msgid "" -"These users will be able to send mail on your behalf\n" -"and access your folders with the permissions you give them." -msgstr "" -"Disse brugere vil kunne sende e-post på dine vegne\n" -"og tilgå dine mapper med de rettigheder du giver dem." +#: ../plugins/itip-formatter/itip-formatter.c:1377 +#, c-format +msgid "Unable to update attendee. %s" +msgstr "Kunne ikke opdatere deltager. %s" -#: ../plugins/exchange-operations/exchange-delegates.glade.h:14 -msgid "_Delegate can see private items" -msgstr "_Delegater kan se private ting" +#: ../plugins/itip-formatter/itip-formatter.c:1381 +msgid "Attendee status updated" +msgstr "Deltagerstatus opdateret" -#. Translators: This is used for permissions for for the folder Inbox. -#: ../plugins/exchange-operations/exchange-delegates.glade.h:17 -msgid "_Inbox:" -msgstr "_Indbakke:" - -#: ../plugins/exchange-operations/exchange-delegates.glade.h:18 -msgid "_Summarize permissions" -msgstr "_Opsummér rettigheder" - -#. Translators: This is used for permissions for for the folder Tasks. -#: ../plugins/exchange-operations/exchange-delegates.glade.h:20 -msgid "_Tasks:" -msgstr "_Opgaver:" - -#: ../plugins/exchange-operations/exchange-folder-permission.c:62 -#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2 -msgid "Permissions..." -msgstr "Rettigheder..." +#: ../plugins/itip-formatter/itip-formatter.c:1407 +msgid "Meeting information sent" +msgstr "Mødeinformation afsendt" -#: ../plugins/exchange-operations/exchange-folder-size-display.c:130 -msgid "Folder Name" -msgstr "Mappenavn" +#: ../plugins/itip-formatter/itip-formatter.c:1410 +msgid "Task information sent" +msgstr "Opgaveinformation afsendt" -#: ../plugins/exchange-operations/exchange-folder-size-display.c:134 -msgid "Folder Size" -msgstr "Mappestørrelse" +#: ../plugins/itip-formatter/itip-formatter.c:1413 +msgid "Memo information sent" +msgstr "Huskeseddel-information afsendt" -#. FIXME Limit to one user -#: ../plugins/exchange-operations/exchange-folder-subscription.c:78 -msgid "User" -msgstr "Bruger" +#: ../plugins/itip-formatter/itip-formatter.c:1422 +msgid "Unable to send meeting information, the meeting does not exist" +msgstr "Ude af stand til at sende mødeinformation, mødet eksisterer ikke" -#: ../plugins/exchange-operations/exchange-folder-subscription.c:321 -#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1 -msgid "Subscribe to Other User's Folder" -msgstr "Tilmeld til en anden brugers mappe" +#: ../plugins/itip-formatter/itip-formatter.c:1425 +msgid "Unable to send task information, the task does not exist" +msgstr "Ude af stand til at sende opgaveinformation, opgaven eksisterer ikke" -#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1 -msgid "Exchange Folder Tree" -msgstr "Exchange-mappetræ" +#: ../plugins/itip-formatter/itip-formatter.c:1428 +msgid "Unable to send memo information, the memo does not exist" +msgstr "" +"Ude af stand til at sende huskeseddel-information, huskesedlen eksisterer " +"ikke" -#: ../plugins/exchange-operations/exchange-folder.c:67 -#: ../plugins/exchange-operations/exchange-folder.c:236 -#: ../plugins/exchange-operations/exchange-folder.c:246 -msgid "Unsubscribe Folder..." -msgstr "Afmeld mappe..." +#: ../plugins/itip-formatter/itip-formatter.c:1497 +#: ../plugins/itip-formatter/itip-formatter.c:1508 +msgid "The calendar attached is not valid" +msgstr "Den vedlagte kalender er ikke gyldig" -#: ../plugins/exchange-operations/exchange-folder.c:466 -#: ../plugins/exchange-operations/exchange-folder.c:521 -#, c-format -msgid "Really unsubscribe from folder \"%s\"?" -msgstr "Er du sikker på at du vil afmelde abonnementet på mappen \"%s\"?" +#: ../plugins/itip-formatter/itip-formatter.c:1498 +#: ../plugins/itip-formatter/itip-formatter.c:1509 +msgid "" +"The message claims to contain a calendar, but the calendar is not a valid " +"iCalendar." +msgstr "" +"Brevet påstår at indeholde en kalender, men kalenderen er ikke i et gyldigt " +"iCalender-format." -#: ../plugins/exchange-operations/exchange-folder.c:478 -#: ../plugins/exchange-operations/exchange-folder.c:533 -#, c-format -msgid "Unsubscribe from \"%s\"" -msgstr "Opsig abonnement på \"%s\"" +#: ../plugins/itip-formatter/itip-formatter.c:1549 +#: ../plugins/itip-formatter/itip-formatter.c:1577 +#: ../plugins/itip-formatter/itip-formatter.c:1669 +msgid "The item in the calendar is not valid" +msgstr "Posten i kalenderen er ikke gyldig" -#: ../plugins/exchange-operations/exchange-oof.glade.h:1 +#: ../plugins/itip-formatter/itip-formatter.c:1550 +#: ../plugins/itip-formatter/itip-formatter.c:1578 +#: ../plugins/itip-formatter/itip-formatter.c:1670 msgid "" -"Currently, your status is \"Out of the Office\". \n" -"\n" -"Would you like to change your status to \"In the Office\"? " +"The message does contain a calendar, but the calendar contains no events, " +"tasks or free/busy information" msgstr "" -"Din nuværende status er \"borte fra kontoret\".\n" -"\n" -"Vil du ændre din status til \"på kontoret\"? " - -#: ../plugins/exchange-operations/exchange-oof.glade.h:4 -msgid "Out of Office Message:" -msgstr "Fraværende-besked:" +"Brevet indeholder en kalender, men kalenderen indeholder ikke nogen " +"begivenheder eller ledig/optaget-information" -#: ../plugins/exchange-operations/exchange-oof.glade.h:5 -msgid "Status:" -msgstr "Status:" +#: ../plugins/itip-formatter/itip-formatter.c:1589 +msgid "The calendar attached contains multiple items" +msgstr "Den vedlagte kalender indeholder flere punkter" -#: ../plugins/exchange-operations/exchange-oof.glade.h:6 +#: ../plugins/itip-formatter/itip-formatter.c:1590 msgid "" -"The message specified below will be automatically sent to each person " -"who sends\n" -"mail to you while you are out of the office." +"To process all of these items, the file should be saved and the calendar " +"imported" msgstr "" -"Beskeden nedenfor sendes automatisk til hver person som\n" -"sender e-post til dig når du er borte fra kontoret." - -#: ../plugins/exchange-operations/exchange-oof.glade.h:8 -msgid "I am currently in the office" -msgstr "Jeg er på kontoret i øjeblikket" +"For at gennemarbejde alle disse punkter skal filen gemmes og kalenderen " +"importeres" -#: ../plugins/exchange-operations/exchange-oof.glade.h:9 -msgid "I am currently out of the office" -msgstr "Jeg er ikke på kontoret i øjeblikket" +#: ../plugins/itip-formatter/itip-formatter.c:2319 +msgid "This meeting recurs" +msgstr "Dette møde er tilbagevendende" -#: ../plugins/exchange-operations/exchange-oof.glade.h:10 -msgid "No, Don't Change Status" -msgstr "Nej, undlad at skifte status" +#: ../plugins/itip-formatter/itip-formatter.c:2322 +msgid "This task recurs" +msgstr "Denne opgave er tilbagevendende" -#: ../plugins/exchange-operations/exchange-oof.glade.h:11 -msgid "Out of Office Assistant" -msgstr "Stedfortræder ved fravær" +#: ../plugins/itip-formatter/itip-formatter.c:2325 +msgid "This memo recurs" +msgstr "Denne huskeseddel er tilbagevendende" -#: ../plugins/exchange-operations/exchange-oof.glade.h:12 -msgid "Yes, Change Status" -msgstr "Ja, skift status" +#. Delete message after acting +#. FIXME Need a schema for this +#: ../plugins/itip-formatter/itip-formatter.c:2561 +msgid "_Delete message after acting" +msgstr "_Slet brev efter handling" -#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1 -msgid "Password Expiry Warning..." -msgstr "Advarsel om udløb af adgangskode..." +#: ../plugins/itip-formatter/itip-formatter.c:2571 +#: ../plugins/itip-formatter/itip-formatter.c:2604 +msgid "Conflict Search" +msgstr "Konfliktsøgning" -#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2 -msgid "Your password will expire in 7 days..." -msgstr "Din adgangskode vil udløbe om 7 dage..." +#. Source selector +#: ../plugins/itip-formatter/itip-formatter.c:2586 +msgid "Select the calendars to search for meeting conflicts" +msgstr "Vælg kalendere for at søge efter mødekonflikter" -#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3 -msgid "_Change Password" -msgstr "_Skift adgangskode" +#. strftime format of a weekday and a date. +#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34 +#: ../widgets/misc/e-cell-date-edit.c:308 +msgid "Today" +msgstr "I dag" -#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295 -msgid "(Permission denied.)" -msgstr "(Adgang nægtet.)" +#. strftime format of a time, +#. in 24-hour format, without seconds. +#: ../plugins/itip-formatter/itip-view.c:196 +msgid "Today %H:%M" +msgstr "I dag %H:%M" -#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403 -msgid "Add User:" -msgstr "Tilføj bruger:" +#. strftime format of a time, +#. in 24-hour format. +#: ../plugins/itip-formatter/itip-view.c:200 +msgid "Today %H:%M:%S" +msgstr "I dag %H:%M:%S" -#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403 -#: ../plugins/exchange-operations/exchange-send-options.c:410 -#: ../plugins/groupwise-features/proxy.c:937 -#: ../plugins/groupwise-features/share-folder.c:716 -msgid "Add User" -msgstr "Tilføj bruger" +#. strftime format of a time, +#. in 12-hour format. +#: ../plugins/itip-formatter/itip-view.c:209 +msgid "Today %l:%M:%S %p" +msgstr "I dag %l:%M:%S %p" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1 -msgid "Permissions" -msgstr "Rettigheder" +#. strftime format of a weekday and a date. +#: ../plugins/itip-formatter/itip-view.c:219 +msgid "Tomorrow" +msgstr "I morgen" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2 -msgid "Cannot Delete" -msgstr "Kan ikke slette" +#. strftime format of a time, +#. in 24-hour format, without seconds. +#: ../plugins/itip-formatter/itip-view.c:224 +msgid "Tomorrow %H:%M" +msgstr "I morgen %H:%M" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3 -msgid "Cannot Edit" -msgstr "Kan ikke redigere" +#. strftime format of a time, +#. in 24-hour format. +#: ../plugins/itip-formatter/itip-view.c:228 +msgid "Tomorrow %H:%M:%S" +msgstr "I morgen %H:%M:%S" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4 -msgid "Create items" -msgstr "Opret elementer" +#. strftime format of a time, +#. in 12-hour format, without seconds. +#: ../plugins/itip-formatter/itip-view.c:233 +msgid "Tomorrow %l:%M %p" +msgstr "I morgen %l:%M %p" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5 -msgid "Create subfolders" -msgstr "Opret undermapper" +#. strftime format of a time, +#. in 12-hour format. +#: ../plugins/itip-formatter/itip-view.c:237 +msgid "Tomorrow %l:%M:%S %p" +msgstr "I morgen %l:%M:%S %p" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6 -msgid "Delete Any Items" -msgstr "Slet alle elementer" +#. strftime format of a weekday. +#: ../plugins/itip-formatter/itip-view.c:256 +#, c-format +msgid "%A" +msgstr "%A" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7 -msgid "Delete Own Items" -msgstr "Slet egne elementer" +#. strftime format of a weekday and a +#. time, in 24-hour format, without seconds. +#: ../plugins/itip-formatter/itip-view.c:261 +msgid "%A %H:%M" +msgstr "%A %H:%M" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8 -msgid "Edit Any Items" -msgstr "Redigér alle elementer" +#. strftime format of a weekday and a +#. time, in 24-hour format. +#: ../plugins/itip-formatter/itip-view.c:265 +msgid "%A %H:%M:%S" +msgstr "%A %H:%M:%S" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9 -msgid "Edit Own Items" -msgstr "Redigér egne elementer" +#. strftime format of a weekday and a +#. time, in 12-hour format, without seconds. +#: ../plugins/itip-formatter/itip-view.c:270 +msgid "%A %l:%M %p" +msgstr "%A %l:%M %p" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10 -msgid "Folder contact" -msgstr "Mappe med kontaktperson" +#. strftime format of a weekday and a +#. time, in 12-hour format. +#: ../plugins/itip-formatter/itip-view.c:274 +msgid "%A %l:%M:%S %p" +msgstr "%A %l:%M:%S %p" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11 -msgid "Folder owner" -msgstr "Mappeejer" +#. strftime format of a weekday and a date +#. without a year. +#: ../plugins/itip-formatter/itip-view.c:283 +msgid "%A, %B %e" +msgstr "%A %e. %B" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12 -msgid "Folder visible" -msgstr "Mappe synlig" +#. strftime format of a weekday, a date +#. without a year and a time, +#. in 24-hour format, without seconds. +#: ../plugins/itip-formatter/itip-view.c:289 +msgid "%A, %B %e %H:%M" +msgstr "%A %e. %B, %H:%M" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13 -msgid "Read items" -msgstr "Læste elementer" +#. strftime format of a weekday, a date without a year +#. and a time, in 24-hour format. +#: ../plugins/itip-formatter/itip-view.c:293 +msgid "%A, %B %e %H:%M:%S" +msgstr "%A %e. %B, %H:%M:%S" -#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14 -msgid "Role: " -msgstr "Rolle: " +#. strftime format of a weekday, a date without a year +#. and a time, in 12-hour format, without seconds. +#: ../plugins/itip-formatter/itip-view.c:298 +msgid "%A, %B %e %l:%M %p" +msgstr "%A, %B %e %l:%M %p" -#: ../plugins/exchange-operations/exchange-send-options.glade.h:1 -msgid "Message Settings" -msgstr "Indstillinger for besked" +#. strftime format of a weekday, a date without a year +#. and a time, in 12-hour format. +#: ../plugins/itip-formatter/itip-view.c:302 +msgid "%A, %B %e %l:%M:%S %p" +msgstr "%A, %B %e %l:%M:%S %p" -#: ../plugins/exchange-operations/exchange-send-options.glade.h:2 -msgid "Tracking Options" -msgstr "Valgmuligheder for opfølgning" +#. strftime format of a weekday and a date. +#: ../plugins/itip-formatter/itip-view.c:308 +msgid "%A, %B %e, %Y" +msgstr "%A %e. %B %Y" -#: ../plugins/exchange-operations/exchange-send-options.glade.h:3 -msgid "Exchange - Send Options" -msgstr "Exchange - Sendemuligheder" +#. strftime format of a weekday, a date and a +#. time, in 24-hour format, without seconds. +#: ../plugins/itip-formatter/itip-view.c:313 +msgid "%A, %B %e, %Y %H:%M" +msgstr "%A %e. %B %Y, %H:%M" -#: ../plugins/exchange-operations/exchange-send-options.glade.h:4 -msgid "I_mportance: " -msgstr "_Vigtighed: " +#. strftime format of a weekday, a date and a +#. time, in 24-hour format. +#: ../plugins/itip-formatter/itip-view.c:317 +msgid "%A, %B %e, %Y %H:%M:%S" +msgstr "%A %e. %B %Y, %H:%M:%S" -#: ../plugins/exchange-operations/exchange-send-options.glade.h:5 -msgid "" -"Normal\n" -"High\n" -"Low" -msgstr "" -"Normal\n" -"Høj\n" -"Lav" +#. strftime format of a weekday, a date and a +#. time, in 12-hour format, without seconds. +#: ../plugins/itip-formatter/itip-view.c:322 +msgid "%A, %B %e, %Y %l:%M %p" +msgstr "%A, %B %e, %Y %l:%M %p" -#: ../plugins/exchange-operations/exchange-send-options.glade.h:8 -msgid "" -"Normal\n" -"Personal\n" -"Private\n" -"Confidential" -msgstr "" -"Normal\n" -"Personlig\n" -"Privat\n" -"Klassificeret" +#. strftime format of a weekday, a date and a +#. time, in 12-hour format. +#: ../plugins/itip-formatter/itip-view.c:326 +msgid "%A, %B %e, %Y %l:%M:%S %p" +msgstr "%A, %B %e, %Y %l:%M:%S %p" -#: ../plugins/exchange-operations/exchange-send-options.glade.h:12 -msgid "Request a _delivery receipt for this message" -msgstr "Bed om en _modtagelseskvittering for dette brev" +#: ../plugins/itip-formatter/itip-view.c:351 +#: ../plugins/itip-formatter/itip-view.c:439 +#: ../plugins/itip-formatter/itip-view.c:527 +#, c-format +msgid "Please respond on behalf of %s" +msgstr "Svar veligst på vegne af %s" -#: ../plugins/exchange-operations/exchange-send-options.glade.h:13 -msgid "Request a _read receipt for this message" -msgstr "Bed om en _kvittering for at brevet er læst" +#: ../plugins/itip-formatter/itip-view.c:353 +#: ../plugins/itip-formatter/itip-view.c:441 +#: ../plugins/itip-formatter/itip-view.c:529 +#, c-format +msgid "Received on behalf of %s" +msgstr "Modtaget på vegne af %s" -#: ../plugins/exchange-operations/exchange-send-options.glade.h:14 -msgid "Send as Delegate" -msgstr "Send som delegat" +#: ../plugins/itip-formatter/itip-view.c:358 +#, c-format +msgid "%s through %s has published the following meeting information:" +msgstr "%s gennem %s har offentliggjort følgende mødeinformation:" -#: ../plugins/exchange-operations/exchange-send-options.glade.h:15 -msgid "_Sensitivity: " -msgstr "_Følsomhed: " +#: ../plugins/itip-formatter/itip-view.c:360 +#, c-format +msgid "%s has published the following meeting information:" +msgstr "%s har offentliggjort følgende mødeinformation:" -#: ../plugins/exchange-operations/exchange-send-options.glade.h:16 -msgid "_User" -msgstr "_Bruger" +#: ../plugins/itip-formatter/itip-view.c:365 +#, c-format +msgid "%s has delegated the following meeting to you:" +msgstr "%s har uddelegeret det følgende møde til dig:" -#: ../plugins/exchange-operations/exchange-user-dialog.c:136 -msgid "Select User" -msgstr "Vælg bruger" +#: ../plugins/itip-formatter/itip-view.c:368 +#, c-format +msgid "%s through %s requests your presence at the following meeting:" +msgstr "" +"%s gennem %s beder om din tilstedeværelse ved det følgende møde:" -#: ../plugins/exchange-operations/exchange-user-dialog.c:174 -msgid "Address Book..." -msgstr "Adressebog..." +#: ../plugins/itip-formatter/itip-view.c:370 +#, c-format +msgid "%s requests your presence at the following meeting:" +msgstr "%s beder om din tilstedeværelse ved det følgende møde:" -#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1 -msgid "Subscribe to Other User's Contacts" -msgstr "Abonnér på en anden brugers kontaktpersoner" +#: ../plugins/itip-formatter/itip-view.c:376 +#, c-format +msgid "%s through %s wishes to add to an existing meeting:" +msgstr "%s gennem %s ønsker at tilføje noget til et eksisterende møde:" -#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1 -msgid "Subscribe to Other User's Calendar" -msgstr "Abonnér på en anden brugers kalender" +#: ../plugins/itip-formatter/itip-view.c:378 +#, c-format +msgid "%s wishes to add to an existing meeting:" +msgstr "%s ønsker at tilføje noget til et eksisterende møde:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1 +#: ../plugins/itip-formatter/itip-view.c:382 +#, c-format msgid "" -"A plugin that manages a collection of Exchange account specific operations " -"and features." +"%s through %s wishes to receive the latest information for the " +"following meeting:" msgstr "" -"Et udvidelsesmodul der håndterer et udvalg af specifikke handlinger og " -"funktioner for en Exchange-konto." - -#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2 -msgid "Exchange Operations" -msgstr "Exchange-handlinger" - -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1 -msgid "Cannot access the \"Exchange settings\" tab in offline mode." -msgstr "Kan ikke tilgå fanen \"Exchange-indstillinger\" i afkoblet tilstand." - -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2 -msgid "Cannot change password due to configuration problems." -msgstr "Kan ikke ændre adgangskode på grund af konfigurationsproblemer." - -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3 -msgid "Cannot display folders." -msgstr "Kan ikke vise mapper." - -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4 -msgid "Cannot perform the operation." -msgstr "Kan ikke udføre handling." +"%s ønsker at modtage den seneste information om det følgende møde " +"gennem %s:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5 +#: ../plugins/itip-formatter/itip-view.c:384 +#, c-format msgid "" -"Changes to options for Exchange account \"{0}\" will only take effect after " -"restarting Evolution." +"%s wishes to receive the latest information for the following meeting:" msgstr "" -"Ændringer i indstillinger for Exchange-konto \"{0}\" vil først træde i kraft " -"efter genstart af Evolution." +"%s ønsker at modtage den seneste information om det følgende møde:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6 -msgid "Could not authenticate to server." -msgstr "Kunne ikke opnå brugergodkendelse hos server." +#: ../plugins/itip-formatter/itip-view.c:388 +#, c-format +msgid "%s through %s has sent back the following meeting response:" +msgstr "%s har sendt følgende mødetilbagemelding gennem %s:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7 -msgid "Could not change password." -msgstr "Kunne ikke ændre adgangskode." +#: ../plugins/itip-formatter/itip-view.c:390 +#, c-format +msgid "%s has sent back the following meeting response:" +msgstr "%s har sendt følgende mødetilbagemelding:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8 -msgid "" -"Could not configure Exchange account because \n" -"an unknown error occurred. Check the URL, \n" -"username, and password, and try again." -msgstr "" -"Kunne ikke konfigurere Exchange-kontoen pga. en ukendt fejl \n" -"Kontrollér adressen, brugernavnet og adgangskoden og prøv igen." +#: ../plugins/itip-formatter/itip-view.c:394 +#, c-format +msgid "%s through %s has canceled the following meeting:" +msgstr "%s har gennem %s aflyst det følgende møde:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11 -msgid "Could not connect to Exchange server." -msgstr "Kunne ikke oprette forbindelse til Exchange-server." +#: ../plugins/itip-formatter/itip-view.c:396 +#, c-format +msgid "%s has canceled the following meeting." +msgstr "%s har aflyst det følgende møde." -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12 -msgid "Could not connect to server {0}." -msgstr "Kunne ikke oprette forbindelse server {0}." +#: ../plugins/itip-formatter/itip-view.c:400 +#, c-format +msgid "%s through %s has proposed the following meeting changes." +msgstr "%s har foreslået følgende mødeændringer gennem %s." -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13 -msgid "Could not determine folder permissions for delegates." -msgstr "Kunne ikke bestemme mapperettigheder for delegater." +#: ../plugins/itip-formatter/itip-view.c:402 +#, c-format +msgid "%s has proposed the following meeting changes." +msgstr "%s har foreslået følgende mødeændringer." -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14 -msgid "Could not find Exchange Web Storage System." -msgstr "Kunne ikke finde et Exchange Web Storage System." +#: ../plugins/itip-formatter/itip-view.c:406 +#, c-format +msgid "%s through %s has declined the following meeting changes:" +msgstr "%s gennem %s har afvist følgende mødeændringer:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15 -msgid "Could not locate server {0}." -msgstr "Kunne ikke finde serveren {0}." +#: ../plugins/itip-formatter/itip-view.c:408 +#, c-format +msgid "%s has declined the following meeting changes." +msgstr "%s har afvist følgende mødeændringer." -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16 -msgid "Could not make {0} a delegate" -msgstr "Kunne ikke gøre {0} til delegat" +#: ../plugins/itip-formatter/itip-view.c:446 +#, c-format +msgid "%s through %s has published the following task:" +msgstr "%s gennem %s har offentliggjort følgende opgaver:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17 -msgid "Could not read folder permissions" -msgstr "Kunne ikke læse mapperettighederne" +#: ../plugins/itip-formatter/itip-view.c:448 +#, c-format +msgid "%s has published the following task:" +msgstr "%s har offentliggjort følgende opgave:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18 -msgid "Could not read folder permissions." -msgstr "Kunne ikke læse mapperettigheder." +#: ../plugins/itip-formatter/itip-view.c:453 +#, c-format +msgid "%s requests the assignment of %s to the following task:" +msgstr "%s ønsker at %s tildeles følgende opgave:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19 -msgid "Could not read out-of-office state" -msgstr "Kunne ikke læse borte-fra-kontoret-tilstanden" +#: ../plugins/itip-formatter/itip-view.c:456 +#, c-format +msgid "%s through %s has assigned you a task:" +msgstr "%s har gennem %s tildelt dig en opgave:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20 -msgid "Could not update folder permissions." -msgstr "Kunne ikke opdatere mapperettighederne." +#: ../plugins/itip-formatter/itip-view.c:458 +#, c-format +msgid "%s has assigned you a task:" +msgstr "%s har tildelt dig en opgave:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21 -msgid "Could not update out-of-office state" -msgstr "Kunne ikke opdatere borte-fra-kontoret-tilstanden" +#: ../plugins/itip-formatter/itip-view.c:464 +#, c-format +msgid "%s through %s wishes to add to an existing task:" +msgstr "%s ønsker gennem %s at føje noget til en eksisterende opgave:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22 -msgid "Evolution requires a restart to load the subscribed user's mailbox" +#: ../plugins/itip-formatter/itip-view.c:466 +#, c-format +msgid "%s wishes to add to an existing task:" +msgstr "%s ønsker at føje noget til en eksisterende opgave:" + +#: ../plugins/itip-formatter/itip-view.c:470 +#, c-format +msgid "" +"%s through %s wishes to receive the latest information for the " +"following assigned task:" msgstr "" -"Evolution skal bruge en genstart for at kunne indlæse den tilmeldte brugers " -"brevbakke" +"%s ønsker at modtage den seneste information om følgende " +"opgavetildeling gennem %s:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23 -msgid "Exchange Account is offline." -msgstr "Exchange-konto er afkoblet." +#: ../plugins/itip-formatter/itip-view.c:472 +#, c-format +msgid "" +"%s wishes to receive the latest information for the following " +"assigned task:" +msgstr "" +"%s ønsker at modtage den seneste information om følgende " +"opgavetildeling:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24 +#: ../plugins/itip-formatter/itip-view.c:476 +#, c-format msgid "" -"Exchange Connector requires access to certain\n" -"functionality on the Exchange Server that appears\n" -"to be disabled or blocked. (This is usually \n" -"unintentional.) Your Exchange Administrator will \n" -"need to enable this functionality in order for \n" -"you to be able to use Evolution Exchange Connector.\n" -"\n" -"For information to provide to your Exchange \n" -"administrator, please follow the link below:\n" -"\n" -"{0}\n" -" " +"%s through %s has sent back the following assigned task response:" msgstr "" -"Exchange Connector kræver adgang til visse\n" -"funktioner på Exchange-serveren som ser ud til\n" -"at være deaktiveret eller spærret. Dette er normalt\n" -"ikke tilsigtet. Din Exchange-administrator er nødt\n" -"til at aktivere disse funktioner for at du kan\n" -"bruge Evolution Exchange Connector.\n" -"\n" -"Følg linket nedenfor for at få de oplysninger,\n" -"du skal give din Exchange-administrator:\n" -"\n" -"{0}\n" -" " +"%s har sendt en tilbagemelding om følgende opgavetildeling gennem %s:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36 -msgid "Failed to update delegates:" -msgstr "Kunne ikke opdatere delegater:" +#: ../plugins/itip-formatter/itip-view.c:478 +#, c-format +msgid "%s has sent back the following assigned task response:" +msgstr "%s har sendt en tilbagemelding om følgende opgavetildeling:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37 -msgid "Folder already exists" -msgstr "Mappen findes allerede" +#: ../plugins/itip-formatter/itip-view.c:482 +#, c-format +msgid "%s through %s has canceled the following assigned task:" +msgstr "%s har gennem %s aflyst følgende opgavetildeling:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38 -msgid "Folder does not exist" -msgstr "Mappen findes ikke" +#: ../plugins/itip-formatter/itip-view.c:484 +#, c-format +msgid "%s has canceled the following assigned task:" +msgstr "%s har aflyst følgende opgavetildeling:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39 -msgid "Folder offline" -msgstr "Arbejder afkoblet" +#: ../plugins/itip-formatter/itip-view.c:488 +#, c-format +msgid "" +"%s through %s has proposed the following task assignment changes:" +msgstr "" +"%s har foreslået følgende ændringer i opgavetildelinger gennem %s:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40 -#: ../shell/e-shell.c:1269 -msgid "Generic error" -msgstr "Generel fejl" +#: ../plugins/itip-formatter/itip-view.c:490 +#, c-format +msgid "%s has proposed the following task assignment changes:" +msgstr "%s har foreslået følgende ændringer i opgavetildelinger:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41 -msgid "Global Catalog Server is not reachable" -msgstr "Global Catalog Server er ikke tilgængelig" +#: ../plugins/itip-formatter/itip-view.c:494 +#, c-format +msgid "%s through %s has declined the following assigned task:" +msgstr "%s har gennem %s afslået følgende opgavetildeling:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42 -msgid "" -"If OWA is running on a different path, you must specify that in the account " -"configuration dialog." -msgstr "Hvis OWA kører på en anden sti, må du anføre denne i kontoopsætningen." +#: ../plugins/itip-formatter/itip-view.c:496 +#, c-format +msgid "%s has declined the following assigned task:" +msgstr "%s har afslået følgende opgavetildeling:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43 -msgid "Mailbox for {0} is not on this server." -msgstr "Brevbakke for {0} findes ikke på denne server." +#: ../plugins/itip-formatter/itip-view.c:534 +#, c-format +msgid "%s through %s has published the following memo:" +msgstr "%s har gennem %s offentliggjort følgende huskeseddel:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44 -msgid "Make sure the URL is correct and try again." -msgstr "Sørg for at adressen er korrekt og prøv igen." +#: ../plugins/itip-formatter/itip-view.c:536 +#, c-format +msgid "%s has published the following memo:" +msgstr "%s har offentliggjort følgende huskeseddel:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45 -msgid "Make sure the server name is spelled correctly and try again." -msgstr "Sørg for at navnet på serveren er stavet korrekt og prøv igen." +#: ../plugins/itip-formatter/itip-view.c:541 +#, c-format +msgid "%s through %s wishes to add to an existing memo:" +msgstr "" +"%s ønsker gennem %s at føje noget til en eksisterende huskeseddel:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46 -msgid "Make sure the username and password are correct and try again." -msgstr "Sørg for at brugernavn og adgangskode er korrekte og prøv igen." +#: ../plugins/itip-formatter/itip-view.c:543 +#, c-format +msgid "%s wishes to add to an existing memo:" +msgstr "%s ønsker at føje noget til en eksisterende huskeseddel:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47 -msgid "No Global Catalog server configured for this account." -msgstr "Ingen Global Catalog-server er konfigureret for denne konto." +#: ../plugins/itip-formatter/itip-view.c:547 +#, c-format +msgid "%s through %s has canceled the following shared memo:" +msgstr "%s har gennem %s aflyst følgende fælles huskeseddel:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48 -msgid "No mailbox for user {0} on {1}." -msgstr "Ingen brevbakke for bruger {0} på {1}." +#: ../plugins/itip-formatter/itip-view.c:549 +#, c-format +msgid "%s has canceled the following shared memo:" +msgstr "%s har aflyst følgende fælles huskeseddel:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49 -msgid "No such user {0}" -msgstr "Bruger findes ikke {0}" +#. Everything gets the open button +#: ../plugins/itip-formatter/itip-view.c:824 +msgid "_Open Calendar" +msgstr "_Åbn kalender" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50 -msgid "Password successfully changed." -msgstr "Adgangskode blev ændret." +#: ../plugins/itip-formatter/itip-view.c:830 +#: ../plugins/itip-formatter/itip-view.c:834 +#: ../plugins/itip-formatter/itip-view.c:840 +#: ../plugins/itip-formatter/itip-view.c:857 +#: ../plugins/itip-formatter/itip-view.c:862 +msgid "_Decline" +msgstr "_Nægt" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52 -msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option." -msgstr "" -"Indtast en delegats id eller fravælg \"Send som delegat\"-valgmuligheden." +#: ../plugins/itip-formatter/itip-view.c:831 +#: ../plugins/itip-formatter/itip-view.c:836 +#: ../plugins/itip-formatter/itip-view.c:843 +#: ../plugins/itip-formatter/itip-view.c:859 +#: ../plugins/itip-formatter/itip-view.c:864 +msgid "_Accept" +msgstr "_Acceptér" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53 -msgid "Please make sure the Global Catalog Server name is correct." -msgstr "Sørg for at navnet på Global Catalog-serveren er korrekt og prøv igen." +#: ../plugins/itip-formatter/itip-view.c:834 +msgid "_Decline all" +msgstr "_Afslå alle" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54 -msgid "Please restart Evolution for changes to take effect" -msgstr "Genstart venligst Evolution for at lade ændringerne træde i kraft" +#: ../plugins/itip-formatter/itip-view.c:835 +msgid "_Tentative all" +msgstr "_Alle forsøgsvis" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55 -msgid "Please select a user." -msgstr "Vælg venligst en bruger." +#: ../plugins/itip-formatter/itip-view.c:835 +#: ../plugins/itip-formatter/itip-view.c:841 +#: ../plugins/itip-formatter/itip-view.c:858 +#: ../plugins/itip-formatter/itip-view.c:863 +msgid "_Tentative" +msgstr "_Forsøgsvis" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56 -msgid "Server rejected password because it is too weak." -msgstr "Serveren afviste adgangskoden fordi det er for nemt at gætte." +#: ../plugins/itip-formatter/itip-view.c:836 +msgid "_Accept all" +msgstr "_Godkend alle" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57 -msgid "The Exchange account will be disabled when you quit Evolution" -msgstr "Exchange-kontoen deaktiveres når du afslutter Evolution" +#. FIXME Is this really the right button? +#: ../plugins/itip-formatter/itip-view.c:847 +msgid "_Send Information" +msgstr "_Send oplysninger" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58 -msgid "The Exchange account will be removed when you quit Evolution" -msgstr "Exchange-kontoen fjernes når du afslutter Evolution" +#. FIXME Is this really the right button? +#: ../plugins/itip-formatter/itip-view.c:851 +msgid "_Update Attendee Status" +msgstr "_Opdatér status for deltager" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59 -msgid "The Exchange server is not compatible with Exchange Connector." -msgstr "Exchange-serveren er ikke kompatibel med Exchange Connector." +#: ../plugins/itip-formatter/itip-view.c:854 +msgid "_Update" +msgstr "_Opdatér" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60 -msgid "" -"The server is running Exchange 5.5. Exchange Connector \n" -"supports Microsoft Exchange 2000 and 2003 only." -msgstr "" -"Serveren kører Exchange 5.5. Exchange Connector \n" -"understøtter kun Microsoft Exchange 2000 og 2003." - -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62 -msgid "" -"This probably means that your server requires \n" -"you to specify the Windows domain name \n" -"as part of your username (eg, "DOMAIN\\user").\n" -"\n" -"Or you might have just typed your password wrong." -msgstr "" -"Dette betyder sikkert at din server kræver \n" -"at du anfører Windows-domænenavnet \n" -"som en del af dit brugernavn (f.eks., "DOMÆNE\\bruger").\n" -"\n" -"Eller det kan være at du blot har fejlindtastet din adgangskode." - -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67 -msgid "Try again with a different password." -msgstr "Prøv igen med en anden adgangskode." +#. Start time +#: ../plugins/itip-formatter/itip-view.c:1034 +msgid "Start time:" +msgstr "Starttid:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68 -msgid "Unable to add user to access control list:" -msgstr "Kan ikke føje bruger til adgangskontrol-listen:" +#. End time +#: ../plugins/itip-formatter/itip-view.c:1045 +msgid "End time:" +msgstr "Sluttid:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69 -msgid "Unable to edit delegates." -msgstr "Kan ikke redigere delegater." +#. Comment +#: ../plugins/itip-formatter/itip-view.c:1065 +#: ../plugins/itip-formatter/itip-view.c:1119 +msgid "Comment:" +msgstr "Kommentar:" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70 -msgid "Unknown error looking up {0}" -msgstr "Ukendt fejl ved opslag af {0}" +#: ../plugins/itip-formatter/itip-view.c:1104 +msgid "Send _reply to sender" +msgstr "Send _svar til afsenderen" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71 -#: ../plugins/google-account-setup/google-source.c:521 -msgid "Unknown error." -msgstr "Ukendt fejl." +#: ../plugins/itip-formatter/itip-view.c:1134 +msgid "Send _updates to attendees" +msgstr "Send o_pdateringer til deltagere" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72 -msgid "Unknown type" -msgstr "Ukendt type" +#: ../plugins/itip-formatter/itip-view.c:1143 +msgid "_Apply to all instances" +msgstr "An_vend på alle forekomster" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73 -msgid "Unsupported operation" -msgstr "En ikke-understøttet handling" +#: ../plugins/itip-formatter/itip-view.c:1152 +msgid "Show time as _free" +msgstr "Vis tid som _fri" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74 -msgid "You are nearing your quota available for storing mail on this server." -msgstr "Du er ved at have opbrugt din kvote for at gemme post på denne server." +#: ../plugins/itip-formatter/itip-view.c:1155 +msgid "_Preserve my reminder" +msgstr "_Bevar min påmindelse" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75 -msgid "" -"You are permitted to send a message on behalf of only one delegator at a " -"time." -msgstr "" -"Du har kun lov til at sende breve på vegne af én af dem, der har dig som " -"delegat, ad gangen." +#. To Translators: This is a check box to inherit a reminder. +#: ../plugins/itip-formatter/itip-view.c:1161 +msgid "_Inherit reminder" +msgstr "_Nedarv påmindelse" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76 -msgid "You cannot make yourself your own delegate" -msgstr "Du kan ikke gøre dig selv til din egen delegat" +#: ../plugins/itip-formatter/itip-view.c:1917 +#, fuzzy +msgid "_Memos:" +msgstr "_Huskesedler" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77 -msgid "You have exceeded your quota for storing mail on this server." -msgstr "Du har overskredet din kvote for at gemme post på denne server." +#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1 +#, fuzzy +msgid "Display \"text/calendar\" MIME parts in mail messages." +msgstr "Viser tekst-/kalenderdele i breve." -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78 -msgid "You may only configure a single Exchange account." -msgstr "Du kan kun konfigurere en enkelt Exchange-konto." +#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2 +msgid "Itip Formatter" +msgstr "Itip-formateringsenhed" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79 +#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1 msgid "" -"Your current usage is: {0} KB. Try to clear up some space by deleting some " -"mail." +""{0}" has delegated the meeting. Do you want to add the delegate " +""{1}"?" msgstr "" -"Dit aktuelle pladsforbrug er: {0} kB. Prøv at frigøre noget plads ved at " -"slette noget post." +""{0}" har uddelegeret mødet. Vil du tilføje delegaten "{1}" +""?" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80 -msgid "" -"Your current usage is: {0} KB. You will not be able to either send or " -"receive mail now." -msgstr "" -"Dit aktuelle pladsforbrug er: {0} kB. Du vil nu hverken kunne sende eller " -"modtage post." +#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3 +msgid "This meeting has been delegated" +msgstr "Dette møde er blevet uddelegeret" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81 +#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4 msgid "" -"Your current usage is: {0} KB. You will not be able to send mail until you " -"clear up some space by deleting some mail." +"This response is not from a current attendee. Add the sender as an attendee?" msgstr "" -"Dit aktuelle pladsforbrug er: {0} kB. Du vil ikke kunne sende post før du " -"frigør noget plads ved at slette noget post." +"Dette svar er ikke fra en nuværende mødedeltager. Tilføj afsender som " +"mødedeltager?" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82 -msgid "Your password has expired." -msgstr "Din adgangskode er udløbet." +#: ../plugins/mail-account-disable/mail-account-disable.c:46 +msgid "Proxy _Logout" +msgstr "Logud af _proxy" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84 -msgid "{0} cannot be added to an access control list" -msgstr "{0} kan ikke føjes til adgangskontrol-listen" +#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1 +msgid "Disable Account" +msgstr "Deaktivér konto" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85 -msgid "{0} is already a delegate" -msgstr "{0} er allerede en delegat" +#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2 +msgid "Disable an account by right-clicking on it in the folder tree." +msgstr "" -#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86 -msgid "{0} is already in the list" -msgstr "{0} er allerede på listen" +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1 +msgid "Beep or play sound file." +msgstr "Bip eller spil lydfil." -#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1 -msgid "Subscribe to Other User's Tasks" -msgstr "Abonnér på en anden brugers opgaver" +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2 +msgid "Blink icon in notification area." +msgstr "Blink ikon i påmindelsesområde." -#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1 -msgid "Check folder permissions" -msgstr "Kontrollér rettigheder til mapper" +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3 +msgid "Enable D-Bus messages." +msgstr "Slå D-Bus-beskeder til." -#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1 -msgid "Default External Editor" -msgstr "Forvalgt eksternt tekstredigeringsprogram" +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4 +msgid "Enable icon in notification area." +msgstr "Aktivér ikon i påmindelsesområde." -#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2 -msgid "The default command that must be used as the editor." -msgstr "Den forvalgte kommando som skal bruges som tekstredigeringsprogram." +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5 +msgid "Generates a D-Bus message when new mail messages arrive." +msgstr "Genererer en D-BUS-besked når nye breve ankommer." -#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1 +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6 msgid "" -"A plugin for using an external editor as the composer. You can send only " -"plain-text messages." +"If \"true\", then beep, otherwise will play sound file when new messages " +"arrive." msgstr "" -"Et udvidelsesmodul som gør det muligt at bruge et eksternt tekstredigerings-" -"program til brevredigering. Du kan kun sende ren tekst." +"Hvis \"true\" så bip, ellers vil der spilles en lydfil når der ankommer ny " +"post." -#. the path to the shared library -#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3 -msgid "External Editor" -msgstr "Eksternt tekstredigeringsprogram" +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7 +msgid "Notify new messages for Inbox only." +msgstr "Påmind kun om nye breve i indbakkken." -#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1 -msgid "Cannot create Temporary File" -msgstr "Kan ikke oprette midlertidig fil" +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8 +msgid "Play sound when new messages arrive." +msgstr "Afspil lydfil når nye breve ankommer." -#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2 -msgid "Editor not launchable" -msgstr "Redigeringsprogram kan ikke startes" +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9 +msgid "Popup message together with the icon." +msgstr "Vis pop-op-besked sammen med ikonet." -#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3 -msgid "" -"Evolution is unable to create a temporary file to save your mail. Retry " -"later." +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10 +msgid "Show new mail icon in notification area when new messages arrive." msgstr "" -"Evolution er ikke i stand til at oprette en midlertidig fil som din post kan " -"gemmes i. Prøv igen senere." +"Påmind brugeren om at der er ankommet ny post ved hjælp af et ikon i " +"påmindelsesområdet." -#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4 -msgid "" -"The external editor set in your plugin preferences cannot be launched. Try " -"setting a different editor." +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11 +msgid "Sound file name to be played." +msgstr "Navn på lydfil som skal spilles." + +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12 +msgid "Sound file to be played when new messages arrive, if not in beep mode." msgstr "" -"Det eksterne tekstredigeringsprogram som er valgt i indstillingerne for dit " -"udvidelsesmodul kan ikke startes. Prøv at vælge et andet " -"tekstredigeringsprogram." +"Lydfilen der skal afspilles når nye breve ankommer, hvis ikke i bip-tilstand." -#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1 -msgid "Compose in _External Editor" -msgstr "Skriv brev i _eksternt tekstredigeringsprogram" +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13 +msgid "Whether play sound or beep when new messages arrive." +msgstr "Om der afspilles lyd eller bip når nyt brev ankommer." -#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2 -msgid "Compose messages using an external editor" -msgstr "Skrive breve ved hjælp af et eksternt tekstredigeringsprogram" +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14 +msgid "Whether show message over the icon when new messages arrive." +msgstr "Om der skal vises besked over ikonet når der kommer nye breve." -#: ../plugins/external-editor/external-editor.c:114 -msgid "Command to be executed to launch the editor: " -msgstr "Kommando som skal køres for at starte tekstredigeringsprogrammet: " +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15 +msgid "Whether the icon should blink or not." +msgstr "Om ikonet skal blinke eller ej." -#: ../plugins/external-editor/external-editor.c:115 -msgid "" -"For Emacs use \"xemacs\"\n" -"For VI use \"gvim\"" -msgstr "" -"Brug \"xemacs\" for Emacs\n" -"Brug \"gvim\" for VI" +#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16 +msgid "Whether to notify new messages in Inbox folder only." +msgstr "Om der kun skal påmindes for nye breve i indbakken." -#: ../plugins/face/face.c:59 -msgid "Select a (48*48) png of size < 700bytes" -msgstr "Vælg en (48*48) png med størrelse < 700bytes" +#: ../plugins/mail-notification/mail-notification.c:256 +msgid "Generate a _D-Bus message" +msgstr "Generér en _D-Bus-besked" -#: ../plugins/face/face.c:69 -msgid "PNG files" -msgstr "PNG-filer" +#: ../plugins/mail-notification/mail-notification.c:379 +msgid "Evolution's Mail Notification" +msgstr "Evolutions postpåmindelse" -#: ../plugins/face/face.c:126 -msgid "_Face" -msgstr "_Ansigt" +#: ../plugins/mail-notification/mail-notification.c:400 +msgid "Mail Notification Properties" +msgstr "Egenskaber for postpåmindelsen" -#: ../plugins/face/org-gnome-face.eplug.xml.h:1 +#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder +#: ../plugins/mail-notification/mail-notification.c:479 +#, c-format msgid "" -"Attach Face header to outgoing messages. First time the user needs to " -"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/" -"faces This will be used in messages that are sent further." -msgstr "" -"Vedhæft ansigtssidehoved til udgående breve. Første gang skal brugeren " -"konfigurere et 48*48 png-billede. Det bliver base64-kodet og lagret i \"~/." -"evolution/faces\". Dette vil blive brugt i breve der sendes fremover." - -#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56 -#, c-format -msgid "Unsubscribing from folder \"%s\"" -msgstr "Opsiger abonnement på mappe \"%s\"" +"You have received %d new message\n" +"in %s." +msgid_plural "" +"You have received %d new messages\n" +"in %s." +msgstr[0] "" +"Du har modtaget %d nyt brev\n" +"i %s." +msgstr[1] "" +"Du har modtaget %d nye breve\n" +"i %s." -#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1 -msgid "Allows unsubscribing of mail folders in the side bar context menu." -msgstr "Tillader afmeldelse af brevmapper i sidepanelets kontekstmenu." +#: ../plugins/mail-notification/mail-notification.c:484 +#, c-format +msgid "You have received %d new message." +msgid_plural "You have received %d new messages." +msgstr[0] "Du har modtaget %d nyt brev." +msgstr[1] "Du har modtaget %d nye breve." -#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2 -msgid "Unsubscribe Folders" -msgstr "Afmeld mapper" +#: ../plugins/mail-notification/mail-notification.c:501 +#: ../plugins/mail-notification/mail-notification.c:506 +msgid "New email" +msgstr "Nyt post" -#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3 -msgid "_Unsubscribe" -msgstr "_Afmeld abonnement" +#: ../plugins/mail-notification/mail-notification.c:566 +msgid "Show icon in _notification area" +msgstr "Vis ikon i _påmindelsesområde" -#: ../plugins/google-account-setup/google-source.c:421 -#, c-format -msgid "Enter password for user %s to access list of subscribed calendars." -msgstr "" -"Indtast kodeordet for brugeren %s for at få adgang til listen af kalendere " -"som der abonneres på." +#: ../plugins/mail-notification/mail-notification.c:569 +msgid "B_link icon in notification area" +msgstr "B_link med ikon i påmindelsesområde" -#: ../plugins/google-account-setup/google-source.c:521 -#, c-format -msgid "" -"Cannot read data from Google server.\n" -"%s" -msgstr "" -"Kan ikke læse data fra Google-server.\n" -"%s" +#: ../plugins/mail-notification/mail-notification.c:571 +msgid "Popup _message together with the icon" +msgstr "Pop-op-_besked sammen med ikon" -#: ../plugins/google-account-setup/google-source.c:683 -msgid "Cal_endar:" -msgstr "_Kalender:" +#: ../plugins/mail-notification/mail-notification.c:752 +msgid "_Play sound when new messages arrive" +msgstr "_Afspil lydfil når nye breve ankommer" -#: ../plugins/google-account-setup/google-source.c:718 -msgid "Retrieve _list" -msgstr "Hent _liste" +#: ../plugins/mail-notification/mail-notification.c:758 +msgid "_Beep" +msgstr "_Bip" -#: ../plugins/google-account-setup/google-contacts-source.c:69 -#: ../plugins/google-account-setup/google-contacts-source.c:71 -msgid "Google" -msgstr "Google" +#: ../plugins/mail-notification/mail-notification.c:759 +msgid "Play _sound file" +msgstr "Afspil _lydfil" -#: ../plugins/google-account-setup/google-contacts-source.c:306 -#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325 -msgid "Server" -msgstr "Server" +#: ../plugins/mail-notification/mail-notification.c:770 +msgid "Specify _filename:" +msgstr "Angiv _filnavn:" -#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1 -msgid "A plugin to setup Google Calendar and Contacts." -msgstr "" -"Et udvidelsesmodul til opsætning af Google-kalender og -kontaktpersoner." +#: ../plugins/mail-notification/mail-notification.c:771 +msgid "Select sound file" +msgstr "Vælg lydfil" -#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2 -msgid "Google sources" -msgstr "Google-kilder" +#: ../plugins/mail-notification/mail-notification.c:772 +msgid "Pl_ay" +msgstr "Af_spil" -#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456 -msgid "Checklist" -msgstr "Afkrydsningsliste" +#: ../plugins/mail-notification/mail-notification.c:829 +msgid "Notify new messages for _Inbox only" +msgstr "Påmind kun om nye breve i _indbakke" -#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1 -msgid "A plugin to setup GroupWise calendar and contacts sources." -msgstr "" -"Et udvidelsesmodul til opsætning af GroupWise-kalender og -kontaktkilder." +#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1 +msgid "Mail Notification" +msgstr "Underretning om ny post" -#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2 -msgid "GroupWise Account Setup" -msgstr "GroupWise-kontoopsætning" +#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2 +#, fuzzy +msgid "Notifies you when new mail messages arrive." +msgstr "Afspil lydfil når nye breve ankommer." -#: ../plugins/groupwise-features/install-shared.c:220 +#: ../plugins/mail-to-task/mail-to-task.c:343 #, c-format +msgid "Cannot open calendar. %s" +msgstr "Kan ikke åbne kalenderen. %s" + +#: ../plugins/mail-to-task/mail-to-task.c:350 +#, fuzzy msgid "" -"The user '%s' has shared a folder with you\n" -"\n" -"Message from '%s'\n" -"\n" -"\n" -"%s\n" -"\n" -"\n" -"Click 'Forward' to install the shared folder\n" -"\n" +"Selected source is read only, thus cannot create event there. Select other " +"source, please." msgstr "" -"Brugeren \"%s\" har delt en mappe med dig\n" -"\n" -"Besked fra \"%s\"\n" -"\n" -"\n" -"%s\n" -"\n" -"\n" -"Klik \"Næste\" for at installere den delte mappe\n" -"\n" +"Den valgte kilde er skrivebeskyttet og der kan derfor ikke oprettes nogen " +"opgave der. Vælg en anden kilde." -#: ../plugins/groupwise-features/install-shared.c:225 -msgid "Install the shared folder" -msgstr "Installér den delte mappe" +#: ../plugins/mail-to-task/mail-to-task.c:353 +msgid "" +"Selected source is read only, thus cannot create task there. Select other " +"source, please." +msgstr "" +"Den valgte kilde er skrivebeskyttet og der kan derfor ikke oprettes nogen " +"opgave der. Vælg en anden kilde." -#: ../plugins/groupwise-features/install-shared.c:227 -msgid "Shared Folder Installation" -msgstr "Installation af delte mapper" +#: ../plugins/mail-to-task/mail-to-task.c:356 +#, fuzzy +msgid "" +"Selected source is read only, thus cannot create memo there. Select other " +"source, please." +msgstr "" +"Den valgte kilde er skrivebeskyttet og der kan derfor ikke oprettes nogen " +"opgave der. Vælg en anden kilde." -#: ../plugins/groupwise-features/junk-mail-settings.c:80 -msgid "Junk Settings" -msgstr "Spam-indstillinger" +#: ../plugins/mail-to-task/mail-to-task.c:455 +#, fuzzy, c-format +msgid "Could not create object. %s" +msgstr "Kunne ikke opdatere objekt" -#: ../plugins/groupwise-features/junk-mail-settings.c:93 -#: ../plugins/groupwise-features/junk-settings.glade.h:3 -msgid "Junk Mail Settings" -msgstr "Indstillinger for spam" +#: ../plugins/mail-to-task/mail-to-task.c:555 +#, fuzzy, c-format +msgid "Cannot get source list. %s" +msgstr "Kan ikke åbne kilden \"{2}\"." -#: ../plugins/groupwise-features/junk-mail-settings.c:117 -msgid "Junk Mail Settings..." -msgstr "Indstillinger for spam..." +#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1 +#, fuzzy +msgid "Convert a mail message to a task." +msgstr "Konverterer det valgte brev til en ny opgave" -#: ../plugins/groupwise-features/junk-settings.glade.h:1 -msgid "Junk List:" -msgstr "Spam-liste" +#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2 +#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5 +#, fuzzy +msgid "Convert to a Mem_o" +msgstr "Kon_vertér til opgave" -#: ../plugins/groupwise-features/junk-settings.glade.h:2 -msgid "Email:" -msgstr "E-post:" +#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3 +#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6 +#, fuzzy +msgid "Convert to a _Meeting" +msgstr "K_onvertér til møde" -#: ../plugins/groupwise-features/junk-settings.glade.h:5 -#: ../plugins/mail-account-disable/mail-account-disable.c:45 -msgid "_Disable" -msgstr "_Deaktivér" +#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4 +#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7 +#, fuzzy +msgid "Convert to a _Task" +msgstr "Kon_vertér til opgave" -#: ../plugins/groupwise-features/junk-settings.glade.h:6 -msgid "_Enable" -msgstr "_Aktivér" +#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5 +#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8 +#, fuzzy +msgid "Convert to an _Event" +msgstr "K_onvertér til møde" -#: ../plugins/groupwise-features/junk-settings.glade.h:7 -msgid "_Junk List" -msgstr "_Spam-liste" +#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6 +#, fuzzy +msgid "Mail-to-Task" +msgstr "Brev til opgave" -#: ../plugins/groupwise-features/mail-retract.c:53 -msgid "Message Retract" -msgstr "Beskedtilbagetrækning" +#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1 +#, fuzzy +msgid "Convert the selected message to a new event" +msgstr "Konverterer det valgte brev til en ny opgave" -#: ../plugins/groupwise-features/mail-retract.c:58 -msgid "" -"Retracting a message may remove it from the recipient's mailbox. Are you " -"sure you want to do this ?" -msgstr "" -"At tilbagetrække en besked kan fjerne den fra modtagerens brevbakke. Er du " -"sikker op du ønsker at gøre dette ?" +#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2 +#, fuzzy +msgid "Convert the selected message to a new meeting" +msgstr "Konverterer det valgte brev til en ny opgave" -#: ../plugins/groupwise-features/mail-retract.c:77 -msgid "Message retracted successfully" -msgstr "Brevet blev tilbagetrukket" +#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3 +#, fuzzy +msgid "Convert the selected message to a new memo" +msgstr "Konverterer det valgte brev til en ny opgave" -#: ../plugins/groupwise-features/mail-retract.c:87 -msgid "Retract Mail" -msgstr "Tilbagetræk brev" +#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4 +msgid "Convert the selected message to a new task" +msgstr "Konverterer det valgte brev til en ny opgave" -#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1 -msgid "Add Send Options to GroupWise messages" -msgstr "Føj afsendelsesindstillinger til GroupWise-breve" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1 +msgid "Contact list _owner" +msgstr "Adresselistens _ejer" -#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1 -msgid "A plugin for the features in GroupWise accounts." -msgstr "Et udvidelsesmodul til funktionerne i GroupWise-konti." +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2 +msgid "Get list _archive" +msgstr "Hent _arkiv over lister" -#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2 -msgid "GroupWise Features" -msgstr "GroupWise-funktioner" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3 +msgid "Get list _usage information" +msgstr "Hent information om _brug af lister" -#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1 -msgid "Message retract failed" -msgstr "Tilbagetrækning af brevet fejlede" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4 +msgid "Mailing List Actions" +msgstr "Postlistehandlinger" -#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2 -msgid "The server did not allow the selected message to be retracted." -msgstr "Serveren tillod ikke at det valgte brev kunne tilbagetrækkes." +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5 +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7 +msgid "Mailing _List" +msgstr "_Postliste" -#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1 -#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3 -#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1 -msgid "Invalid user" -msgstr "Ugyldig bruger" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6 +#, fuzzy +msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)." +msgstr "" +"Sørger for almindelige handlinger til postliste-kommandoer (abonnér, " +"afmeld...)." -#. 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 -#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3 -msgid "Proxy access cannot be given to user "{0}"" -msgstr "Proxyadgang kan ikke gives til bruger "{0}"." +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7 +msgid "_Post message to list" +msgstr "_Send brev til liste" -#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4 -#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2 -msgid "Specify User" -msgstr "Specificér bruger" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8 +msgid "_Subscribe to list" +msgstr "_Tilmeld til listen" -#. 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 -#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6 -msgid "You have already given proxy permissions to this user." -msgstr "Du har allerede tildelt denne bruger proxytilladelser." +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9 +msgid "_Un-subscribe to list" +msgstr "_Frameld fra listen" -#. 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 -#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8 -msgid "You have to specify a valid user name to give proxy rights." -msgstr "Du skal angive et gyldigt brugernavn for at tildele proxyrettigheder." +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1 +msgid "Action not available" +msgstr "Handling ikke tilgængelig" -#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1 -msgid "Account "{0}" already exists. Please check your folder tree." +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2 +msgid "" +"An e-mail message will be sent to the URL \"{0}\". You can either send the " +"message automatically, or see and change it first.\n" +"\n" +"You should receive an answer from the mailing list shortly after the message " +"has been sent." msgstr "" -"Kontoen "{0}" findes allerede. Kontroller venligst dit mappetræ." +"Et brev vil blive sendt til adressen \"{0}\". Du kan enten sende brevet " +"automatisk eller se og ændre det først.\n" +"\n" +"Du burde modtage et svar fra e-postlisten kort efter at brevet er blevet " +"sendt." -#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2 -msgid "Account Already Exists" -msgstr "Kontoen findes allerede" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5 +msgid "Malformed header" +msgstr "Misdannet brevhoved" + +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6 +msgid "No e-mail action" +msgstr "Ingen e-post-handling" + +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7 +msgid "Posting not allowed" +msgstr "Afsendelse ikke tilladt" -#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4 +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8 msgid "" -"Proxy login as "{0}" was unsuccessful. Please check your email " -"address and try again." +"Posting to this mailing list is not allowed. Possibly, this is a read-only " +"mailing list. Contact the list owner for details." msgstr "" -"Proxylogind som "{0}" lykkedes ikke. Kontroller venligst din e-post-" -"adresse og prøv igen." +"Afsendelse til denne e-post-liste er ikke tilladt. Dette er sandsynligvis en " +"skrivebeskyttet e-post-liste. Kontakt ejeren af listen for detaljer." -#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3 -msgid "This is a recurring meeting" -msgstr "Dette er et tilbagevendende møde" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9 +msgid "Send e-mail message to mailing list?" +msgstr "Send brev til postliste?" -#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") -#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5 -msgid "Would you like to accept it?" -msgstr "Accepterer du?" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10 +msgid "" +"The action could not be performed. The header for this action did not " +"contain any action that could be processed.\n" +"\n" +"Header: {0}" +msgstr "" +"Handlingen kunne ikke udføres. Hovedet for denne handling indeholdt ikke " +"nogen handlinger, der kunne behandles.\n" +"\n" +"Hoved: {0}" -#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") -#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7 -msgid "Would you like to decline it?" -msgstr "Afviser du?" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13 +msgid "" +"The {0} header of this message is malformed and could not be processed.\n" +"\n" +"Header: {1}" +msgstr "" +"{0}-hovedet på dette brev er misdannet og kunne ikke behandles.\n" +"\n" +"Hoved: {1}" -#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8 -msgid "You cannot share this folder with the specified user "{0}"" -msgstr "Du kan ikke dele denne mappe med den anførte bruger "{0}"" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16 +msgid "" +"This message does not contain the header information required for this " +"action." +msgstr "" +"Brevet indeholder ikke påkrævet oplysning i brevhoved til denne handling." -#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9 -msgid "You have to specify a user name which you want to add to the list" -msgstr "Du skal angive et brugernavn, som du vil tilføje til listen" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17 +msgid "_Edit message" +msgstr "Re_digér brev" -#: ../plugins/groupwise-features/process-meeting.c:52 -msgid "Accept Tentatively" -msgstr "Godkend forsøgsvist" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18 +msgid "_Send message" +msgstr "_Send brev" -#: ../plugins/groupwise-features/properties.glade.h:1 -msgid "Users:" -msgstr "Brugere:" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1 +msgid "Contact List _Owner" +msgstr "Kontaktlistens _ejer" -#: ../plugins/groupwise-features/properties.glade.h:2 -msgid "C_ustomize notification message" -msgstr "_Tilpas påmindelsesbrev" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2 +msgid "Contact the owner of the mailing list this message belongs to" +msgstr "Kontakt ejeren af den postliste som dette brev tilhører" -#: ../plugins/groupwise-features/properties.glade.h:3 -msgid "Con_tacts..." -msgstr "Kon_taktpersoner..." +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3 +msgid "Get List _Archive" +msgstr "Hent _arkiv over lister" -#: ../plugins/groupwise-features/properties.glade.h:5 -#: ../widgets/table/e-table-click-to-add.c:516 -msgid "Message" -msgstr "Brev" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4 +msgid "Get List _Usage Information" +msgstr "Hent information om _brug af lister" -#: ../plugins/groupwise-features/properties.glade.h:6 -msgid "Shared Folder Notification" -msgstr "Underretning for delt mappe" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5 +msgid "Get an archive of the list this message belongs to" +msgstr "Hent et arkiv over listen dette brev tilhører" -#: ../plugins/groupwise-features/properties.glade.h:8 -msgid "The participants will receive the following notification.\n" -msgstr "Deltagerne vil modtage følgende påmindelse.\n" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6 +msgid "Get information about the usage of the list this message belongs to" +msgstr "Hent information om brugen af listen som dette brev tilhøre" -#: ../plugins/groupwise-features/properties.glade.h:12 -msgid "_Not Shared" -msgstr "_Ikke fælles" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8 +msgid "Post a message to the mailing list this message belongs to" +msgstr "Send et brev til den postliste som dette brev tilhører" -#: ../plugins/groupwise-features/properties.glade.h:14 -msgid "_Shared With..." -msgstr "_Delt med..." +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9 +msgid "Subscribe to the mailing list this message belongs to" +msgstr "Tilmeld dig den postliste som dette brev tilhører" -#: ../plugins/groupwise-features/properties.glade.h:15 -msgid "_Sharing" -msgstr "_Deling" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10 +msgid "Unsubscribe to the mailing list this message belongs to" +msgstr "Afmeld dig den postliste som dette brev tilhører" -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1 -msgid "Name" -msgstr "Navn" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11 +msgid "_Post Message to List" +msgstr "_Send brev til liste" -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2 -msgid "Access Rights" -msgstr "Adgangrettigheder" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12 +msgid "_Subscribe to List" +msgstr "_Abonnér på postlisten" -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3 -msgid "Add/Edit" -msgstr "Tilføje/redigére" +#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13 +msgid "_Unsubscribe from List" +msgstr "_Frameld liste" -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5 -msgid "Con_tacts" -msgstr "Kon_takter" +#: ../plugins/mark-all-read/mark-all-read.c:39 +msgid "Also mark messages in subfolders?" +msgstr "Marker også beskeder i undermapper?" -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7 -msgid "Modify _folders/options/rules/" -msgstr "Ændr _mapper/indstillinger/regler/" +#: ../plugins/mark-all-read/mark-all-read.c:41 +msgid "" +"Do you want to mark messages as read in the current folder only, or in the " +"current folder as well as all subfolders?" +msgstr "" +"Ønsker du at markere beskeder som læst udelukkende i den aktuelle mappe, " +"eller både i den aktuelle mappe og dens undermapper?" -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8 -msgid "Read items marked _private" -msgstr "Læse punkter der er _private" +#: ../plugins/mark-all-read/mark-all-read.c:164 +msgid "Current Folder and _Subfolders" +msgstr "Nuværende mappe og _undermapper" -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9 -msgid "Reminder Notes" -msgstr "Påmindelsesnoter" +#: ../plugins/mark-all-read/mark-all-read.c:176 +msgid "Current _Folder Only" +msgstr "Kun aktuel _mappe" -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10 -msgid "Subscribe to my _alarms" -msgstr "Abonnér på mine _påmindelser" +#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1 +msgid "Mark All Read" +msgstr "Markér alle som læst" -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11 -msgid "Subscribe to my _notifications" -msgstr "Tilmeld til mine _påmindelser" +#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2 +msgid "Mark Me_ssages as Read" +msgstr "Markér _breve som læst" -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13 -msgid "_Write" -msgstr "_Skriv" +#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3 +#, fuzzy +msgid "Mark all messages in a folder as read." +msgstr "Markér alle breve i denne mappe som læst" -#. To Translators: strip the part in front of the | and the | itself -#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15 -msgid "permission to read|_Read" -msgstr "_Læse" +#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1 +msgid "Mono Loader" +msgstr "Mono-indlæser" -#. 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 -#: ../plugins/groupwise-features/proxy-listing.glade.h:2 -msgid "Proxy" -msgstr "Proxy" +#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2 +msgid "Support plugins written in Mono." +msgstr "" -#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1 -msgid "Account Name" -msgstr "Kontonavn" +#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1 +#, fuzzy +msgid "Manage your Evolution plugins." +msgstr "Skift indstillinger for Evolution" -#. 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 -#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3 -msgid "Proxy Login" -msgstr "Logind på proxy" +#. Setup the ui +#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2 +#: ../plugins/plugin-manager/plugin-manager.c:252 +msgid "Plugin Manager" +msgstr "Håndtering af udvidelsesmoduler" -#: ../plugins/groupwise-features/proxy-login.c:206 -#: ../plugins/groupwise-features/proxy-login.c:248 -#: ../plugins/groupwise-features/proxy.c:491 -#: ../plugins/groupwise-features/send-options.c:85 -#, c-format -msgid "%sEnter password for %s (user %s)" -msgstr "%sIndtast adgangskode for %s (bruger %s)" +#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1 +msgid "Enable and disable plugins" +msgstr "Aktivér og deaktivér udvidelsesmoduler" -#. 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 -#: ../plugins/groupwise-features/proxy-login.c:510 -msgid "_Proxy Login..." -msgstr "_Proxylogind..." +#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2 +msgid "_Plugins" +msgstr "_Udvidelsesmoduler" -#. 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 -#: ../plugins/groupwise-features/proxy.c:692 -msgid "The Proxy tab will be available only when the account is online." -msgstr "Proxy-fanebladet vil kun være tilgængeligt når kontoen er opkoblet." +#: ../plugins/plugin-manager/plugin-manager.c:58 +msgid "Author(s)" +msgstr "Forfatter(e)" -#. 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 -#: ../plugins/groupwise-features/proxy.c:698 -msgid "The Proxy tab will be available only when the account is enabled." -msgstr "Proxy-fanebladet vil kun være tilgængeligt når kontoen er aktiveret." +#: ../plugins/plugin-manager/plugin-manager.c:146 +msgid "Configuration" +msgstr "Konfiguration" -#: ../plugins/groupwise-features/send-options.c:214 -msgid "Advanced send options" -msgstr "Avancerede afsendelsesindstillinger" +#: ../plugins/plugin-manager/plugin-manager.c:265 +msgid "Note: Some changes will not take effect until restart" +msgstr "NB: Visse ændringer vil ikke træde i kraft før der genstartes" -#: ../plugins/groupwise-features/share-folder-common.c:321 -#: ../plugins/groupwise-features/share-folder.c:751 -msgid "Users" -msgstr "Brugere" +#: ../plugins/plugin-manager/plugin-manager.c:291 +msgid "Overview" +msgstr "Oversigt" -#: ../plugins/groupwise-features/share-folder-common.c:322 -msgid "Enter the users and set permissions" -msgstr "Angiv brugerne og sæt rettigheder" +#: ../plugins/plugin-manager/plugin-manager.c:362 +#: ../plugins/plugin-manager/plugin-manager.c:424 +msgid "Plugin" +msgstr "Udvidelsesmodul" -#: ../plugins/groupwise-features/share-folder-common.c:341 -msgid "New _Shared Folder..." -msgstr "Ny _fælles mappe..." +#. but then we also need to create our own section frame +#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2 +msgid "Plain Text Mode" +msgstr "Klartekst-tilstand" -#: ../plugins/groupwise-features/share-folder-common.c:449 -msgid "Sharing" -msgstr "Deling" +#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3 +#, fuzzy +msgid "Prefer Plain Text" +msgstr "Fortræk klartekst" -#: ../plugins/groupwise-features/share-folder.c:534 -msgid "Custom Notification" -msgstr "Tilpasset påmindelse" +#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4 +msgid "View mail messages as plain text, even if they contain HTML content." +msgstr "" -#: ../plugins/groupwise-features/share-folder.c:756 -msgid "Add " -msgstr "Tilføj " +#: ../plugins/prefer-plain/prefer-plain.c:189 +msgid "Show HTML if present" +msgstr "Vis HTML hvis det er tilstede" -#: ../plugins/groupwise-features/share-folder.c:762 -msgid "Modify" -msgstr "Ændre" +#: ../plugins/prefer-plain/prefer-plain.c:190 +msgid "Prefer PLAIN" +msgstr "Foretræk klartekst" -#: ../plugins/groupwise-features/status-track.c:97 -msgid "Message Status" -msgstr "Beskedstatus" +#: ../plugins/prefer-plain/prefer-plain.c:191 +msgid "Only ever show PLAIN" +msgstr "Vis kun klartekst" -#. Subject -#: ../plugins/groupwise-features/status-track.c:111 -msgid "Subject:" -msgstr "Emne:" +#: ../plugins/prefer-plain/prefer-plain.c:234 +msgid "HTML _Mode" +msgstr "HTML-_tilstand" -#: ../plugins/groupwise-features/status-track.c:125 -msgid "From:" -msgstr "Fra:" +#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1 +msgid "Evolution Profiler" +msgstr "Evolution-profiler" -#: ../plugins/groupwise-features/status-track.c:140 -msgid "Creation date:" -msgstr "Oprettelsesdato:" +#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2 +msgid "Profile data events in Evolution (for developers only)." +msgstr "" -#: ../plugins/groupwise-features/status-track.c:179 -msgid "Recipient: " -msgstr "Modtager: " +#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1 +msgid "Import Outlook messages from PST file" +msgstr "Importer Outlook-breve fra PST-fil" -#: ../plugins/groupwise-features/status-track.c:186 -msgid "Delivered: " -msgstr "Leveret: " +#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2 +msgid "Outlook PST import" +msgstr "Outlook PST-import" -#: ../plugins/groupwise-features/status-track.c:192 -msgid "Opened: " -msgstr "Åbnet: " +#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3 +msgid "Outlook personal folders (.pst)" +msgstr "Outlook personlige mapper (.pst)" -#: ../plugins/groupwise-features/status-track.c:197 -msgid "Accepted: " -msgstr "Accepteret: " +#. Address book +#: ../plugins/pst-import/pst-importer.c:318 +msgid "_Address Book" +msgstr "_Adressebog" -#: ../plugins/groupwise-features/status-track.c:202 -msgid "Deleted: " -msgstr "Slettet: " +#. Appointments +#: ../plugins/pst-import/pst-importer.c:325 +msgid "A_ppointments" +msgstr "A_ftaler" -#: ../plugins/groupwise-features/status-track.c:207 -msgid "Declined: " -msgstr "Afslået: " +#. Journal +#: ../plugins/pst-import/pst-importer.c:337 +msgid "_Journal entries" +msgstr "_Journalindgange" -#: ../plugins/groupwise-features/status-track.c:212 -msgid "Completed: " -msgstr "Fuldført: " +#: ../plugins/pst-import/pst-importer.c:352 +msgid "Importing Outlook data" +msgstr "Importerer Outlook-data" -#: ../plugins/groupwise-features/status-track.c:217 -msgid "Undelivered: " -msgstr "Ikke leveret: " +#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1 +msgid "Calendar Publishing" +msgstr "Kalender-offentliggørelse" -#: ../plugins/groupwise-features/status-track.c:241 -msgid "Track Message Status..." -msgstr "Efterspor brevstatus..." +#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2 +msgid "Locations" +msgstr "Steder" -#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1 -msgid "A plugin to setup hula calendar sources." -msgstr "Et udvidelsesmodul til opsætning af kilder til hula-kalendere." +#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3 +#, fuzzy +msgid "Publish calendars to the web." +msgstr "Gør det muligt at offentliggøre kalendere på nettet" -#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2 -msgid "Hula Account Setup" -msgstr "Opsætning af Hula-konto" +#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1 +msgid "_Publish Calendar Information" +msgstr "Information om kalender-_offentliggørelse" -#: ../plugins/imap-features/imap-headers.c:320 -msgid "Custom Headers" -msgstr "Tilpassede brevhoveder" +#: ../plugins/publish-calendar/publish-calendar.c:95 +#: ../plugins/publish-calendar/publish-calendar.c:329 +#, fuzzy, c-format +msgid "Could not open %s:" +msgstr "Kunne ikke åbne kilde" -#: ../plugins/imap-features/imap-headers.c:333 -msgid "IMAP Headers" -msgstr "IMAP-brevhoveder" +#: ../plugins/publish-calendar/publish-calendar.c:97 +#, fuzzy, c-format +msgid "Could not open %s: Unknown error" +msgstr "Kunne ikke fortolke PGP-meddelelse: Ukendt fejl" -#: ../plugins/imap-features/imap-headers.glade.h:1 -msgid "Custom Headers" -msgstr "Tilpassede brevhoveder" +#: ../plugins/publish-calendar/publish-calendar.c:117 +#, c-format +msgid "There was an error while publishing to %s:" +msgstr "" -#: ../plugins/imap-features/imap-headers.glade.h:2 -msgid "IMAP Headers" -msgstr "IMAP-brevhoveder" +#: ../plugins/publish-calendar/publish-calendar.c:119 +#, c-format +msgid "Publishing to %s finished successfully" +msgstr "" -#: ../plugins/imap-features/imap-headers.glade.h:3 -msgid "Basic and _Mailing List Headers (Default)" -msgstr "Basale og _postliste brevhoveder (standard)" +#: ../plugins/publish-calendar/publish-calendar.c:160 +#, c-format +msgid "Mount of %s failed:" +msgstr "" -#: ../plugins/imap-features/imap-headers.glade.h:4 -msgid "Fetch A_ll Headers" -msgstr "Hent a_lle brevhoveder" +#: ../plugins/publish-calendar/publish-calendar.c:612 +msgid "Are you sure you want to remove this location?" +msgstr "Er du sikker på, du vil slette dette sted?" -#: ../plugins/imap-features/imap-headers.glade.h:5 -msgid "" -"Give the extra headers that you need to fetch in addition to the above " -"standard headers. \n" -"You can ignore this if you choose \"All Headers\"." -msgstr "" -"Giv de ekstra brevhoveder som du bliver nødt til at hente i tillæg til de " -"overstående standard brevhoveder. \n" -"Du kan ignorere dette hvis du vælger \"Alle brevhoveder\"." +#: ../plugins/publish-calendar/publish-calendar.c:776 +#, fuzzy +msgid "Could not create publish thread." +msgstr "Kunne ikke oprette brev." -#: ../plugins/imap-features/imap-headers.glade.h:7 -msgid "" -"Select your IMAP Header Preferences. \n" -"The more headers you have the more time it will take to download." -msgstr "" -"Vælg dine IMAP-brevhovedindstillinger. \n" -"Jo flere brevhoveder du har, jo mere tid vil det tage at hente." +#: ../plugins/publish-calendar/publish-calendar.glade.h:2 +msgid "Location" +msgstr "Sted" -#: ../plugins/imap-features/imap-headers.glade.h:9 +#: ../plugins/publish-calendar/publish-calendar.glade.h:4 +msgid "Sources" +msgstr "Kilder" + +#: ../plugins/publish-calendar/publish-calendar.glade.h:6 msgid "" -"_Basic Headers - (Fastest) \n" -"Use this if you do not have filters based on mailing lists" +"Daily\n" +"Weekly\n" +"Manual (via Actions menu)" msgstr "" -"_Basale brevhoveder - (hurtigst) \n" -"Brug dette hvis du ikke vil have filtre baseret på postlister" +"Daglig\n" +"Ugentlig\n" +"Manuel (via menuen Handlinger)" -#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1 -msgid "A plugin for the features in the IMAP accounts." -msgstr "Et udvidelsesmodul til faciliteterne i IMAP-kontiene." +#: ../plugins/publish-calendar/publish-calendar.glade.h:9 +msgid "E_nable" +msgstr "A_ktivér" -#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2 -msgid "IMAP Features" -msgstr "IMAP-egenskaber" +#: ../plugins/publish-calendar/publish-calendar.glade.h:10 +msgid "P_ort:" +msgstr "_Port:" -#: ../plugins/import-ics-attachments/icsimporter.c:78 -msgid "_Import to Calendar" -msgstr "_Importér til kalender" +#: ../plugins/publish-calendar/publish-calendar.glade.h:11 +msgid "Publishing Location" +msgstr "Offentliggørelsessted" -#: ../plugins/import-ics-attachments/icsimporter.c:83 -msgid "_Import to Tasks" -msgstr "_Importér til opgaver" +#: ../plugins/publish-calendar/publish-calendar.glade.h:12 +msgid "Publishing _Frequency:" +msgstr "Offentliggørelses_hyppighed:" -#: ../plugins/import-ics-attachments/icsimporter.c:201 -msgid "Import ICS" -msgstr "Importér ICS" +#: ../plugins/publish-calendar/publish-calendar.glade.h:13 +msgid "" +"Secure FTP (SSH)\n" +"Public FTP\n" +"FTP (with login)\n" +"Windows share\n" +"WebDAV (HTTP)\n" +"Secure WebDAV (HTTPS)\n" +"Custom Location" +msgstr "" +"Sikker FTP (SSH)\n" +"Offentlig FTP\n" +"FTP (med logind)\n" +"Windowsdeling\n" +"WebDAV (HTTP)\n" +"Sikker WebDAV (HTTPS)\n" +"Brugerdefineret sted" -#: ../plugins/import-ics-attachments/icsimporter.c:224 -msgid "Select Task List" -msgstr "Vælg opgaveliste" +#: ../plugins/publish-calendar/publish-calendar.glade.h:20 +msgid "Service _type:" +msgstr "Tjeneste_type:" -#: ../plugins/import-ics-attachments/icsimporter.c:228 -msgid "Select Calendar" -msgstr "Vælg kalender" +#: ../plugins/publish-calendar/publish-calendar.glade.h:21 +#, fuzzy +msgid "Time _duration:" +msgstr "Tids_zone:" -#: ../plugins/import-ics-attachments/icsimporter.c:260 -#: ../shell/e-shell-importer.c:696 -msgid "_Import" -msgstr "_Importér" +#: ../plugins/publish-calendar/publish-calendar.glade.h:23 +msgid "_File:" +msgstr "_Fil:" -#. the path to the shared library -#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2 -msgid "Import to Calendar" -msgstr "Importér til kalender" +#: ../plugins/publish-calendar/publish-calendar.glade.h:24 +msgid "_Password:" +msgstr "_Adgangskode:" -#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3 -msgid "Imports ICS attachments to calendar." -msgstr "Importerer ICS-bilag til kalender." +#: ../plugins/publish-calendar/publish-calendar.glade.h:25 +msgid "_Publish as:" +msgstr "_Offentliggør som:" -#: ../plugins/ipod-sync/evolution-ipod-sync.c:49 -msgid "Hardware Abstraction Layer not loaded" -msgstr "Hardware-abstraktionslag ikke indlæst" +#: ../plugins/publish-calendar/publish-calendar.glade.h:26 +msgid "_Remember password" +msgstr "_Husk adgangskode" -#: ../plugins/ipod-sync/evolution-ipod-sync.c:50 +#: ../plugins/publish-calendar/publish-calendar.glade.h:28 +msgid "_Username:" +msgstr "_Brugernavn:" + +#: ../plugins/publish-calendar/publish-calendar.glade.h:29 msgid "" -"The \"hald\" service is required but not currently running. Please enable " -"the service and rerun this program, or contact your system administrator." +"days\n" +"weeks\n" +"months" msgstr "" -"Servicen \"hald\" er påkrævet, men kører ikke på nuværende tidspunkt. " -"Aktivér denne service og genstart programmet, eller kontakt din " -"systemadministrator." -#: ../plugins/ipod-sync/evolution-ipod-sync.c:83 -msgid "Search for an iPod failed" -msgstr "Søgning efter en iPod fejlede" - -#: ../plugins/ipod-sync/evolution-ipod-sync.c:84 +#: ../plugins/publish-calendar/publish-calendar.glade.h:32 msgid "" -"Evolution could not find an iPod to synchronize with. Either the iPod is not " -"connected to the system or it is not powered on." +"iCal\n" +"Free/Busy" msgstr "" -"Evolution kunne ikke finde en iPod at synkronisere med. Den er enten ikke " -"forbundet til systemet eller ikke tændt." - -#: ../plugins/ipod-sync/ical-format.c:119 -#: ../plugins/save-calendar/ical-format.c:164 -msgid "iCalendar format (.ics)" -msgstr "iCalendar-format (.ics)" +"iCal\n" +"Ledig/optaget" -#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1 -msgid "" -"Synchronize the selected task/memo/calendar/address book with Apple iPod" +#: ../plugins/publish-calendar/publish-format-fb.c:69 +#: ../plugins/publish-calendar/publish-format-ical.c:82 +#, c-format +msgid "Could not publish calendar: Calendar backend no longer exists" msgstr "" -"Synkronisér den valgte opgave/memo/kalender/adressebog med en Apple iPod" - -#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2 -msgid "Synchronize to iPod" -msgstr "Synkronisér med iPod" - -#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3 -msgid "iPod Synchronization" -msgstr "iPod-synkronisering" -#: ../plugins/itip-formatter/itip-formatter.c:481 -#: ../plugins/itip-formatter/itip-formatter.c:606 -#, c-format -msgid "Failed to load the calendar '%s'" -msgstr "Kunne ikke indlæse kalenderen \"%s\"" +#: ../plugins/publish-calendar/url-editor-dialog.c:481 +msgid "New Location" +msgstr "Nyt sted" -#: ../plugins/itip-formatter/itip-formatter.c:626 -#, c-format -msgid "An appointment in the calendar '%s' conflicts with this meeting" -msgstr "En aftale i kalenderen \"%s\" er i konflikt med dette møde" +#: ../plugins/publish-calendar/url-editor-dialog.c:483 +msgid "Edit Location" +msgstr "Redigér sted" -#: ../plugins/itip-formatter/itip-formatter.c:662 -#, c-format -msgid "Found the appointment in the calendar '%s'" -msgstr "Fandt aftalen i kalenderen \"%s\"" +#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1 +msgid "Hello Python" +msgstr "Hej Python" -#: ../plugins/itip-formatter/itip-formatter.c:752 -msgid "Unable to find any calendars" -msgstr "Kunne ikke finde nogen kalendere" +#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2 +msgid "Python Plugin Loader tests" +msgstr "Test af indlæsningsinstans af Python-udvidelsesmoduler" -#: ../plugins/itip-formatter/itip-formatter.c:759 -msgid "Unable to find this meeting in any calendar" -msgstr "Kunne ikke finde dette møde i nogen kalender" +#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1 +msgid "Python Test Plugin" +msgstr "Python-testudvidelsesmodul" -#: ../plugins/itip-formatter/itip-formatter.c:763 -msgid "Unable to find this task in any task list" -msgstr "Kunne ikke finde denne opgave i nogen opgaveliste" +#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2 +msgid "Test Plugin for Python EPlugin loader." +msgstr "" +"Testudvidelsesmodul for indlæsningsinstans af PythonEUdvidelsesmoduler " +"(EPlugin)." -#: ../plugins/itip-formatter/itip-formatter.c:767 -msgid "Unable to find this memo in any memo list" -msgstr "Kunne ikke finde denne huskeseddel i nogen huskeseddelliste" +#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1 +msgid "A plugin which loads other plugins written using Python." +msgstr "" +"Et udvidelsesmodul som indlæser andre udvidelsesmoduler, som er skrevet i " +"Python." -#: ../plugins/itip-formatter/itip-formatter.c:838 -msgid "Searching for an existing version of this appointment" -msgstr "Søger efter en eksisterende udgave af denne aftale" +#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2 +msgid "Python Loader" +msgstr "Python-indlæsningsinstans" -#: ../plugins/itip-formatter/itip-formatter.c:1020 -msgid "Unable to parse item" -msgstr "Kan ikke fortolke elementet" +#: ../plugins/sa-junk-plugin/em-junk-filter.c:128 +#, c-format +msgid "SpamAssassin not found, code: %d" +msgstr "SpamAssassin ikke fundet, kode: %d" -#: ../plugins/itip-formatter/itip-formatter.c:1107 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:136 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:144 #, c-format -msgid "Unable to send item to calendar '%s'. %s" -msgstr "Kan ikke sende elementet til kalenderen \"%s\". %s" +msgid "Failed to create pipe: %s" +msgstr "Kunne ikke danne rør: %s" -#: ../plugins/itip-formatter/itip-formatter.c:1119 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:183 #, c-format -msgid "Sent to calendar '%s' as accepted" -msgstr "Sendt til kalenderen \"%s\" som accepteret" +msgid "Error after fork: %s" +msgstr "Fejl efter forgrening: %s" -#: ../plugins/itip-formatter/itip-formatter.c:1123 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:238 #, c-format -msgid "Sent to calendar '%s' as tentative" -msgstr "Sendt forsøgsvist til kalenderen \"%s\"" +msgid "SpamAssassin child process does not respond, killing..." +msgstr "SpamAssassin-underproces svarer ikke, afslutter den..." -#: ../plugins/itip-formatter/itip-formatter.c:1128 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:240 #, c-format -msgid "Sent to calendar '%s' as declined" -msgstr "Sendt til kalenderen \"%s\" som afslået" +msgid "Wait for SpamAssassin child process interrupted, terminating..." +msgstr "Venten på SpamAssassin-underproces afbrudt, afslutter den..." -#: ../plugins/itip-formatter/itip-formatter.c:1133 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:249 #, c-format -msgid "Sent to calendar '%s' as canceled" -msgstr "Sendt til kalenderen \"%s\" som annulleret" +msgid "Pipe to SpamAssassin failed, error code: %d" +msgstr "Rør til SpamAssassin fejlede, fejlkode: %d" -#: ../plugins/itip-formatter/itip-formatter.c:1227 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:512 #, c-format -msgid "Organizer has removed the delegate %s " -msgstr "Organisator har fjernet delegat %s " +msgid "SpamAssassin is not available." +msgstr "SpamAssassin er ikke tilgængelig." -#: ../plugins/itip-formatter/itip-formatter.c:1234 -msgid "Sent a cancelation notice to the delegate" -msgstr "Sendte en aflysningsnotits til delegaten" +#: ../plugins/sa-junk-plugin/em-junk-filter.c:910 +msgid "This will make SpamAssassin more reliable, but slower" +msgstr "Dette vil gøre SpamAssassin mere pålidelig, men langsommere" -#: ../plugins/itip-formatter/itip-formatter.c:1236 -msgid "Could not send the cancelation notice to the delegate" -msgstr "Kunne ikke sende en aflysningsnotits til delegaten" +#: ../plugins/sa-junk-plugin/em-junk-filter.c:916 +msgid "I_nclude remote tests" +msgstr "_Inkludér fjerntest" -#: ../plugins/itip-formatter/itip-formatter.c:1342 -msgid "Attendee status could not be updated because the status is invalid" -msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status" +#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1 +#, fuzzy +msgid "Filter junk messages using SpamAssassin." +msgstr "Sorterer spam fra ved hjælp af Bogofilter." -#: ../plugins/itip-formatter/itip-formatter.c:1371 -#, c-format -msgid "Unable to update attendee. %s" -msgstr "Kunne ikke opdatere deltager. %s" +#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2 +#, fuzzy +msgid "SpamAssassin Junk Filter" +msgstr "SpamAssassin-udvidelsesmodul til spam" -#: ../plugins/itip-formatter/itip-formatter.c:1375 -msgid "Attendee status updated" -msgstr "Deltagerstatus opdateret" +#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3 +msgid "SpamAssassin Options" +msgstr "SpamAssassin-indstillinger" -#: ../plugins/itip-formatter/itip-formatter.c:1401 -msgid "Meeting information sent" -msgstr "Mødeinformation afsendt" +#. +#. * Translator: the %F %T is the thirth argument for a strftime function. +#. * It lets you define the formatting of the date in the csv-file. +#. * +#: ../plugins/save-calendar/csv-format.c:163 +msgid "%F %T" +msgstr "%d-%m-%Y %T" -#: ../plugins/itip-formatter/itip-formatter.c:1404 -msgid "Task information sent" -msgstr "Opgaveinformation afsendt" +#: ../plugins/save-calendar/csv-format.c:361 +msgid "UID" +msgstr "Bruger-id" -#: ../plugins/itip-formatter/itip-formatter.c:1407 -msgid "Memo information sent" -msgstr "Huskeseddel-information afsendt" +#: ../plugins/save-calendar/csv-format.c:363 +msgid "Description List" +msgstr "Beskrivelsesliste" -#: ../plugins/itip-formatter/itip-formatter.c:1416 -msgid "Unable to send meeting information, the meeting does not exist" -msgstr "Ude af stand til at sende mødeinformation, mødet eksisterer ikke" +#: ../plugins/save-calendar/csv-format.c:364 +msgid "Categories List" +msgstr "Kategoriliste" -#: ../plugins/itip-formatter/itip-formatter.c:1419 -msgid "Unable to send task information, the task does not exist" -msgstr "Ude af stand til at sende opgaveinformation, opgaven eksisterer ikke" +#: ../plugins/save-calendar/csv-format.c:365 +msgid "Comment List" +msgstr "Kommentarliste" -#: ../plugins/itip-formatter/itip-formatter.c:1422 -msgid "Unable to send memo information, the memo does not exist" -msgstr "" -"Ude af stand til at sende huskeseddel-information, huskesedlen eksisterer " -"ikke" +#: ../plugins/save-calendar/csv-format.c:368 +msgid "Contact List" +msgstr "Liste over kontaktpersoner" -#: ../plugins/itip-formatter/itip-formatter.c:1491 -#: ../plugins/itip-formatter/itip-formatter.c:1502 -msgid "The calendar attached is not valid" -msgstr "Den vedlagte kalender er ikke gyldig" +#: ../plugins/save-calendar/csv-format.c:369 +msgid "Start" +msgstr "Start" -#: ../plugins/itip-formatter/itip-formatter.c:1492 -#: ../plugins/itip-formatter/itip-formatter.c:1503 -msgid "" -"The message claims to contain a calendar, but the calendar is not a valid " -"iCalendar." -msgstr "" -"Brevet påstår at indeholde en kalender, men kalenderen er ikke i et gyldigt " -"iCalender-format." +#: ../plugins/save-calendar/csv-format.c:370 +msgid "End" +msgstr "End" -#: ../plugins/itip-formatter/itip-formatter.c:1543 -#: ../plugins/itip-formatter/itip-formatter.c:1571 -#: ../plugins/itip-formatter/itip-formatter.c:1663 -msgid "The item in the calendar is not valid" -msgstr "Posten i kalenderen er ikke gyldig" +#: ../plugins/save-calendar/csv-format.c:372 +msgid "percent Done" +msgstr "procent færdig" -#: ../plugins/itip-formatter/itip-formatter.c:1544 -#: ../plugins/itip-formatter/itip-formatter.c:1572 -#: ../plugins/itip-formatter/itip-formatter.c:1664 -msgid "" -"The message does contain a calendar, but the calendar contains no events, " -"tasks or free/busy information" -msgstr "" -"Brevet indeholder en kalender, men kalenderen indeholder ikke nogen " -"begivenheder eller ledig/optaget-information" +#: ../plugins/save-calendar/csv-format.c:374 +msgid "URL" +msgstr "Adresse" -#: ../plugins/itip-formatter/itip-formatter.c:1583 -msgid "The calendar attached contains multiple items" -msgstr "Den vedlagte kalender indeholder flere punkter" +#: ../plugins/save-calendar/csv-format.c:375 +msgid "Attendees List" +msgstr "Deltagerliste" -#: ../plugins/itip-formatter/itip-formatter.c:1584 -msgid "" -"To process all of these items, the file should be saved and the calendar " -"imported" -msgstr "" -"For at gennemarbejde alle disse punkter skal filen gemmes og kalenderen " -"importeres" +#: ../plugins/save-calendar/csv-format.c:377 +msgid "Modified" +msgstr "Ændret" -#: ../plugins/itip-formatter/itip-formatter.c:2306 -msgid "This meeting recurs" -msgstr "Dette møde er tilbagevendende" +#: ../plugins/save-calendar/csv-format.c:532 +msgid "Advanced options for the CSV format" +msgstr "Avancerede indstillinger for CSV-formatet" -#: ../plugins/itip-formatter/itip-formatter.c:2309 -msgid "This task recurs" -msgstr "Denne opgave er tilbagevendende" +#: ../plugins/save-calendar/csv-format.c:539 +msgid "Prepend a header" +msgstr "Tilføj et hoved" -#: ../plugins/itip-formatter/itip-formatter.c:2312 -msgid "This memo recurs" -msgstr "Denne huskeseddel er tilbagevendende" +#: ../plugins/save-calendar/csv-format.c:548 +msgid "Value delimiter:" +msgstr "Værdiadskiller:" -#. Delete message after acting -#. FIXME Need a schema for this -#: ../plugins/itip-formatter/itip-formatter.c:2548 -msgid "_Delete message after acting" -msgstr "_Slet brev efter handling" +#: ../plugins/save-calendar/csv-format.c:554 +msgid "Record delimiter:" +msgstr "Posteringsadskiller:" -#: ../plugins/itip-formatter/itip-formatter.c:2558 -#: ../plugins/itip-formatter/itip-formatter.c:2590 -msgid "Conflict Search" -msgstr "Konfliktsøgning" +#: ../plugins/save-calendar/csv-format.c:560 +msgid "Encapsulate values with:" +msgstr "Indkapsl værdier med:" -#. Source selector -#: ../plugins/itip-formatter/itip-formatter.c:2573 -msgid "Select the calendars to search for meeting conflicts" -msgstr "Vælg kalendere for at søge efter mødekonflikter" +#: ../plugins/save-calendar/csv-format.c:582 +msgid "Comma separated value format (.csv)" +msgstr "Kommasepareret format for værdier (.csv)" -#. strftime format of a weekday and a date. -#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34 -#: ../widgets/misc/e-cell-date-edit.c:297 -msgid "Today" -msgstr "I dag" +#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1 +msgid "Save Selected" +msgstr "Gem de markerede" -#. strftime format of a time, -#. in 24-hour format, without seconds. -#: ../plugins/itip-formatter/itip-view.c:196 -msgid "Today %H:%M" -msgstr "I dag %H:%M" +#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2 +#, fuzzy +msgid "Save a calendar or task list to disk." +msgstr "Gemmer den valgte kalender eller opgaveliste til disken." -#. strftime format of a time, -#. in 24-hour format. -#: ../plugins/itip-formatter/itip-view.c:200 -msgid "Today %H:%M:%S" -msgstr "I dag %H:%M:%S" +#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3 +msgid "_Save to Disk" +msgstr "Gem til _disken" -#. strftime format of a time, -#. in 12-hour format. -#: ../plugins/itip-formatter/itip-view.c:209 -msgid "Today %l:%M:%S %p" -msgstr "I dag %l:%M:%S %p" +#. +#. * Translator: the %FT%T is the thirth argument for a strftime function. +#. * It lets you define the formatting of the date in the rdf-file. +#. * Also check out http://www.w3.org/2002/12/cal/tzd +#. * +#: ../plugins/save-calendar/rdf-format.c:150 +msgid "%FT%T" +msgstr "%FT%T" -#. strftime format of a weekday and a date. -#: ../plugins/itip-formatter/itip-view.c:219 -msgid "Tomorrow" -msgstr "I morgen" +#: ../plugins/save-calendar/rdf-format.c:377 +msgid "RDF format (.rdf)" +msgstr "RDF-format (.rdf)" -#. strftime format of a time, -#. in 24-hour format, without seconds. -#: ../plugins/itip-formatter/itip-view.c:224 -msgid "Tomorrow %H:%M" -msgstr "I morgen %H:%M" +#: ../plugins/save-calendar/save-calendar.c:161 +msgid "Select destination file" +msgstr "Vælg en målfil" -#. strftime format of a time, -#. in 24-hour format. -#: ../plugins/itip-formatter/itip-view.c:228 -msgid "Tomorrow %H:%M:%S" -msgstr "I morgen %H:%M:%S" +#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1 +#, fuzzy +msgid "Quickly select a single calendar or task list for viewing." +msgstr "Vælger en enkelt kalender eller opgavekilde til visning." -#. strftime format of a time, -#. in 12-hour format, without seconds. -#: ../plugins/itip-formatter/itip-view.c:233 -msgid "Tomorrow %l:%M %p" -msgstr "I morgen %l:%M %p" +#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2 +#, fuzzy +msgid "Select One Source" +msgstr "Vælg en kilde" -#. strftime format of a time, -#. in 12-hour format. -#: ../plugins/itip-formatter/itip-view.c:237 -msgid "Tomorrow %l:%M:%S %p" -msgstr "I morgen %l:%M:%S %p" +#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3 +msgid "Show _only this Calendar" +msgstr "Vis _kun denne kalender" -#. strftime format of a weekday. -#: ../plugins/itip-formatter/itip-view.c:256 -#, c-format -msgid "%A" -msgstr "%A" +#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4 +msgid "Show _only this Memo List" +msgstr "Vis _kun denne huskeseddel" -#. strftime format of a weekday and a -#. time, in 24-hour format, without seconds. -#: ../plugins/itip-formatter/itip-view.c:261 -msgid "%A %H:%M" -msgstr "%A %H:%M" +#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5 +msgid "Show _only this Task List" +msgstr "Vis _kun denne opgaveliste" -#. strftime format of a weekday and a -#. time, in 24-hour format. -#: ../plugins/itip-formatter/itip-view.c:265 -msgid "%A %H:%M:%S" -msgstr "%A %H:%M:%S" +#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1 +msgid "Guides you through your initial account setup." +msgstr "Hjælper dig igennem den indledende kontoopsætning." -#. strftime format of a weekday and a -#. time, in 12-hour format, without seconds. -#: ../plugins/itip-formatter/itip-view.c:270 -msgid "%A %l:%M %p" -msgstr "%A %l:%M %p" +#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2 +msgid "Setup Assistant" +msgstr "Opsætningsassistent" -#. strftime format of a weekday and a -#. time, in 12-hour format. -#: ../plugins/itip-formatter/itip-view.c:274 -msgid "%A %l:%M:%S %p" -msgstr "%A %l:%M:%S %p" +#: ../plugins/startup-wizard/startup-wizard.c:84 +msgid "Evolution Setup Assistant" +msgstr "Opsætningsvejleder til Evolution" -#. strftime format of a weekday and a date -#. without a year. -#: ../plugins/itip-formatter/itip-view.c:283 -msgid "%A, %B %e" -msgstr "%A %e. %B" +#: ../plugins/startup-wizard/startup-wizard.c:87 +msgid "Welcome" +msgstr "Velkommen" -#. strftime format of a weekday, a date -#. without a year and a time, -#. in 24-hour format, without seconds. -#: ../plugins/itip-formatter/itip-view.c:289 -msgid "%A, %B %e %H:%M" -msgstr "%A %e. %B, %H:%M" +#: ../plugins/startup-wizard/startup-wizard.c:88 +msgid "" +"Welcome to Evolution. The next few screens will allow Evolution to connect " +"to your email accounts, and to import files from other applications. \n" +"\n" +"Please click the \"Forward\" button to continue. " +msgstr "" +"Velkommen til Evolution. De næste skærme lader dig\n" +"konfigurere Evolution til at forbinde til dine e-post-konti, og\n" +"importere filer fra andre applikationer. \n" +"\n" +"Klík venligst på knappen \"Næste\" for at fortsætte. " -#. strftime format of a weekday, a date without a year -#. and a time, in 24-hour format. -#: ../plugins/itip-formatter/itip-view.c:293 -msgid "%A, %B %e %H:%M:%S" -msgstr "%A %e. %B, %H:%M:%S" +#: ../plugins/startup-wizard/startup-wizard.c:115 +msgid "Importing files" +msgstr "Importér filer" -#. strftime format of a weekday, a date without a year -#. and a time, in 12-hour format, without seconds. -#: ../plugins/itip-formatter/itip-view.c:298 -msgid "%A, %B %e %l:%M %p" -msgstr "%A, %B %e %l:%M %p" +#: ../plugins/startup-wizard/startup-wizard.c:117 +#: ../shell/e-shell-importer.c:138 +msgid "Please select the information that you would like to import:" +msgstr "Venligst vælg information du ønsker at importere:" -#. strftime format of a weekday, a date without a year -#. and a time, in 12-hour format. -#: ../plugins/itip-formatter/itip-view.c:302 -msgid "%A, %B %e %l:%M:%S %p" -msgstr "%A, %B %e %l:%M:%S %p" +#: ../plugins/startup-wizard/startup-wizard.c:132 +#: ../shell/e-shell-importer.c:420 +#, c-format +msgid "From %s:" +msgstr "Fra %s:" -#. strftime format of a weekday and a date. -#: ../plugins/itip-formatter/itip-view.c:308 -msgid "%A, %B %e, %Y" -msgstr "%A %e. %B %Y" +#: ../plugins/startup-wizard/startup-wizard.c:203 +#: ../shell/e-shell-importer.c:530 +#, c-format +msgid "Importing data." +msgstr "Importerer data." -#. strftime format of a weekday, a date and a -#. time, in 24-hour format, without seconds. -#: ../plugins/itip-formatter/itip-view.c:313 -msgid "%A, %B %e, %Y %H:%M" -msgstr "%A %e. %B %Y, %H:%M" +#: ../plugins/startup-wizard/startup-wizard.c:205 +#: ../shell/e-shell-importer.c:544 +msgid "Please wait" +msgstr "Vent venligst" -#. strftime format of a weekday, a date and a -#. time, in 24-hour format. -#: ../plugins/itip-formatter/itip-view.c:317 -msgid "%A, %B %e, %Y %H:%M:%S" -msgstr "%A %e. %B %Y, %H:%M:%S" +#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1 +#, fuzzy +msgid "Sort mail message threads by subject." +msgstr "Trådning af breve baseret på emne" -#. strftime format of a weekday, a date and a -#. time, in 12-hour format, without seconds. -#: ../plugins/itip-formatter/itip-view.c:322 -msgid "%A, %B %e, %Y %l:%M %p" -msgstr "%A, %B %e, %Y %l:%M %p" +#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2 +msgid "Subject Threading" +msgstr "Trådning baseret på emne" -#. strftime format of a weekday, a date and a -#. time, in 12-hour format. -#: ../plugins/itip-formatter/itip-view.c:326 -msgid "%A, %B %e, %Y %l:%M:%S %p" -msgstr "%A, %B %e, %Y %l:%M:%S %p" +#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3 +msgid "Thread messages by subject" +msgstr "Trådning af breve baseret på emne" -#: ../plugins/itip-formatter/itip-view.c:351 -#: ../plugins/itip-formatter/itip-view.c:439 -#: ../plugins/itip-formatter/itip-view.c:527 -#, c-format -msgid "Please respond on behalf of %s" -msgstr "Svar veligst på vegne af %s" +#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog +#: ../plugins/subject-thread/subject-thread.c:56 +msgid "F_all back to threading messages by subject" +msgstr "G_å tilbage til at vise breve trådet efter emne" -#: ../plugins/itip-formatter/itip-view.c:353 -#: ../plugins/itip-formatter/itip-view.c:441 -#: ../plugins/itip-formatter/itip-view.c:529 -#, c-format -msgid "Received on behalf of %s" -msgstr "Modtaget på vegne af %s" +#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1 +msgid "" +"List of keyword/value pairs for the Templates plugin to substitute in a " +"message body." +msgstr "" +"Liste af nøgleord/værdi-par som skabelonudvidelsesmodulet kan substituere " +"ind i en brevkrop." -#: ../plugins/itip-formatter/itip-view.c:358 -#, c-format -msgid "%s through %s has published the following meeting information:" -msgstr "%s gennem %s har offentliggjort følgende mødeinformation:" +#: ../plugins/templates/templates.c:603 +msgid "No title" +msgstr "Ingen titel" -#: ../plugins/itip-formatter/itip-view.c:360 -#, c-format -msgid "%s has published the following meeting information:" -msgstr "%s har offentliggjort følgende mødeinformation:" +#: ../plugins/templates/templates.c:711 +msgid "Save as _Template" +msgstr "Gem som _skabelon" -#: ../plugins/itip-formatter/itip-view.c:365 -#, c-format -msgid "%s has delegated the following meeting to you:" -msgstr "%s har uddelegeret det følgende møde til dig:" +#: ../plugins/templates/templates.c:713 +msgid "Save as Template" +msgstr "Gem som skabelon" -#: ../plugins/itip-formatter/itip-view.c:368 -#, c-format -msgid "%s through %s requests your presence at the following meeting:" -msgstr "" -"%s gennem %s beder om din tilstedeværelse ved det følgende møde:" +#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1 +msgid "Drafts based template plugin" +msgstr "Kladdebaseret skabelonudvidelsesmodul" -#: ../plugins/itip-formatter/itip-view.c:370 -#, c-format -msgid "%s requests your presence at the following meeting:" -msgstr "%s beder om din tilstedeværelse ved det følgende møde:" +#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1 +msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook." +msgstr "" -#: ../plugins/itip-formatter/itip-view.c:376 -#, c-format -msgid "%s through %s wishes to add to an existing meeting:" -msgstr "%s gennem %s ønsker at tilføje noget til et eksisterende møde:" +#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2 +#, fuzzy +msgid "TNEF Decoder" +msgstr "TNEF bilagsafkoder" -#: ../plugins/itip-formatter/itip-view.c:378 -#, c-format -msgid "%s wishes to add to an existing meeting:" -msgstr "%s ønsker at tilføje noget til et eksisterende møde:" +#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1 +#, fuzzy +msgid "Inline vCards" +msgstr "Flere vCards" -#: ../plugins/itip-formatter/itip-view.c:382 -#, c-format -msgid "" -"%s through %s wishes to receive the latest information for the " -"following meeting:" +#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2 +msgid "Show vCards directly in mail messages." msgstr "" -"%s ønsker at modtage den seneste information om det følgende møde " -"gennem %s:" -#: ../plugins/itip-formatter/itip-view.c:384 -#, c-format -msgid "" -"%s wishes to receive the latest information for the following meeting:" -msgstr "" -"%s ønsker at modtage den seneste information om det følgende møde:" - -#: ../plugins/itip-formatter/itip-view.c:388 -#, c-format -msgid "%s through %s has sent back the following meeting response:" -msgstr "%s har sendt følgende mødetilbagemelding gennem %s:" +#: ../plugins/vcard-inline/vcard-inline.c:155 +#: ../plugins/vcard-inline/vcard-inline.c:239 +msgid "Show Full vCard" +msgstr "Vis hele vCard-kortet" -#: ../plugins/itip-formatter/itip-view.c:390 -#, c-format -msgid "%s has sent back the following meeting response:" -msgstr "%s har sendt følgende mødetilbagemelding:" +#: ../plugins/vcard-inline/vcard-inline.c:158 +msgid "Show Compact vCard" +msgstr "Vis vCard-kortet kompakt" -#: ../plugins/itip-formatter/itip-view.c:394 -#, c-format -msgid "%s through %s has canceled the following meeting:" -msgstr "%s har gennem %s aflyst det følgende møde:" +#: ../plugins/vcard-inline/vcard-inline.c:218 +#, fuzzy +msgid "There is one other contact." +msgstr "Der er én anden kontaktperson." -#: ../plugins/itip-formatter/itip-view.c:396 -#, c-format -msgid "%s has canceled the following meeting." -msgstr "%s har aflyst det følgende møde." +#: ../plugins/vcard-inline/vcard-inline.c:227 +#, fuzzy, c-format +msgid "There is %d other contact." +msgid_plural "There are %d other contacts." +msgstr[0] "Der er én anden kontaktperson." +msgstr[1] "Der er %d andre kontaktpersoner." -#: ../plugins/itip-formatter/itip-view.c:400 -#, c-format -msgid "%s through %s has proposed the following meeting changes." -msgstr "%s har foreslået følgende mødeændringer gennem %s." +#: ../plugins/vcard-inline/vcard-inline.c:248 +#, fuzzy +msgid "Save in Address Book" +msgstr "Gem i adressebog" -#: ../plugins/itip-formatter/itip-view.c:402 -#, c-format -msgid "%s has proposed the following meeting changes." -msgstr "%s har foreslået følgende mødeændringer." +#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1 +#, fuzzy +msgid "Add WebDAV contacts to Evolution." +msgstr "WebDAV-kontaktpersoner" -#: ../plugins/itip-formatter/itip-view.c:406 -#, c-format -msgid "%s through %s has declined the following meeting changes:" -msgstr "%s gennem %s har afvist følgende mødeændringer:" +#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2 +msgid "WebDAV contacts" +msgstr "WebDAV-kontaktpersoner" -#: ../plugins/itip-formatter/itip-view.c:408 -#, c-format -msgid "%s has declined the following meeting changes." -msgstr "%s har afvist følgende mødeændringer." +#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68 +msgid "WebDAV" +msgstr "WebDAV" -#: ../plugins/itip-formatter/itip-view.c:446 -#, c-format -msgid "%s through %s has published the following task:" -msgstr "%s gennem %s har offentliggjort følgende opgaver:" +#: ../plugins/webdav-account-setup/webdav-contacts-source.c:296 +msgid "URL:" +msgstr "URL:" -#: ../plugins/itip-formatter/itip-view.c:448 -#, c-format -msgid "%s has published the following task:" -msgstr "%s har offentliggjort følgende opgave:" +#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323 +msgid "_Avoid IfMatch (needed on Apache < 2.2.8)" +msgstr "_Undgå IfMatch (påkrævet i Apache < 2.2.8)" -#: ../plugins/itip-formatter/itip-view.c:453 -#, c-format -msgid "%s requests the assignment of %s to the following task:" -msgstr "%s ønsker at %s tildeles følgende opgave:" +#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1 +msgid "Evolution Shell" +msgstr "Evolutions kommandoskal" -#: ../plugins/itip-formatter/itip-view.c:456 -#, c-format -msgid "%s through %s has assigned you a task:" -msgstr "%s har gennem %s tildelt dig en opgave:" +#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2 +msgid "Evolution Shell Config factory" +msgstr "Funktion til opsætning af Evolutions kommandoskal" -#: ../plugins/itip-formatter/itip-view.c:458 -#, c-format -msgid "%s has assigned you a task:" -msgstr "%s har tildelt dig en opgave:" +#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1 +msgid "Evolution Test" +msgstr "Evolution-test" -#: ../plugins/itip-formatter/itip-view.c:464 -#, c-format -msgid "%s through %s wishes to add to an existing task:" -msgstr "%s ønsker gennem %s at føje noget til en eksisterende opgave:" +#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2 +msgid "Evolution Test component" +msgstr "Evolutions testkomponent" -#: ../plugins/itip-formatter/itip-view.c:466 -#, c-format -msgid "%s wishes to add to an existing task:" -msgstr "%s ønsker at føje noget til en eksisterende opgave:" +#: ../shell/apps_evolution_shell.schemas.in.h:1 +msgid "Authenticate proxy server connections" +msgstr "Godkend proxyserverforbindelse" -#: ../plugins/itip-formatter/itip-view.c:470 -#, c-format -msgid "" -"%s through %s wishes to receive the latest information for the " -"following assigned task:" -msgstr "" -"%s ønsker at modtage den seneste information om følgende " -"opgavetildeling gennem %s:" +#: ../shell/apps_evolution_shell.schemas.in.h:2 +msgid "Automatic proxy configuration URL" +msgstr "URL til automatisk proxykonfiguration" -#: ../plugins/itip-formatter/itip-view.c:472 -#, c-format -msgid "" -"%s wishes to receive the latest information for the following " -"assigned task:" -msgstr "" -"%s ønsker at modtage den seneste information om følgende " -"opgavetildeling:" +#: ../shell/apps_evolution_shell.schemas.in.h:3 +msgid "Configuration version" +msgstr "Konfigurationsversion" -#: ../plugins/itip-formatter/itip-view.c:476 -#, c-format -msgid "" -"%s through %s has sent back the following assigned task response:" -msgstr "" -"%s har sendt en tilbagemelding om følgende opgavetildeling gennem %s:" +#: ../shell/apps_evolution_shell.schemas.in.h:4 +msgid "Default sidebar width" +msgstr "Standardbredde på sidepanel" -#: ../plugins/itip-formatter/itip-view.c:478 -#, c-format -msgid "%s has sent back the following assigned task response:" -msgstr "%s har sendt en tilbagemelding om følgende opgavetildeling:" +#: ../shell/apps_evolution_shell.schemas.in.h:5 +msgid "Default window height" +msgstr "Standardvindueshøjde" -#: ../plugins/itip-formatter/itip-view.c:482 -#, c-format -msgid "%s through %s has canceled the following assigned task:" -msgstr "%s har gennem %s aflyst følgende opgavetildeling:" +#: ../shell/apps_evolution_shell.schemas.in.h:6 +msgid "Default window state" +msgstr "Normal tilstand for vindue" -#: ../plugins/itip-formatter/itip-view.c:484 -#, c-format -msgid "%s has canceled the following assigned task:" -msgstr "%s har aflyst følgende opgavetildeling:" +#: ../shell/apps_evolution_shell.schemas.in.h:7 +msgid "Default window width" +msgstr "Standardvinduesbredde" -#: ../plugins/itip-formatter/itip-view.c:488 -#, c-format +#: ../shell/apps_evolution_shell.schemas.in.h:8 msgid "" -"%s through %s has proposed the following task assignment changes:" +"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet." msgstr "" -"%s har foreslået følgende ændringer i opgavetildelinger gennem %s:" +"Slår proxyindstillingerne til ved tilgang til HTTP/sikker HTTP over " +"internettet." -#: ../plugins/itip-formatter/itip-view.c:490 -#, c-format -msgid "%s has proposed the following task assignment changes:" -msgstr "%s har foreslået følgende ændringer i opgavetildelinger:" +#: ../shell/apps_evolution_shell.schemas.in.h:9 +msgid "HTTP proxy host name" +msgstr "HTTP-proxyværtsnavn" -#: ../plugins/itip-formatter/itip-view.c:494 -#, c-format -msgid "%s through %s has declined the following assigned task:" -msgstr "%s har gennem %s afslået følgende opgavetildeling:" +#: ../shell/apps_evolution_shell.schemas.in.h:10 +msgid "HTTP proxy password" +msgstr "HTTP-proxyadgangkode" -#: ../plugins/itip-formatter/itip-view.c:496 -#, c-format -msgid "%s has declined the following assigned task:" -msgstr "%s har afslået følgende opgavetildeling:" +#: ../shell/apps_evolution_shell.schemas.in.h:11 +msgid "HTTP proxy port" +msgstr "HTTP-proxyport" -#: ../plugins/itip-formatter/itip-view.c:534 -#, c-format -msgid "%s through %s has published the following memo:" -msgstr "%s har gennem %s offentliggjort følgende huskeseddel:" +#: ../shell/apps_evolution_shell.schemas.in.h:12 +msgid "HTTP proxy username" +msgstr "HTTP-proxybrugernavn" -#: ../plugins/itip-formatter/itip-view.c:536 -#, c-format -msgid "%s has published the following memo:" -msgstr "%s har offentliggjort følgende huskeseddel:" +#: ../shell/apps_evolution_shell.schemas.in.h:13 +msgid "ID or alias of the component to be shown by default at start-up." +msgstr "Identifikation eller alias for komponenten der skal vises ved opstart." -#: ../plugins/itip-formatter/itip-view.c:541 -#, c-format -msgid "%s through %s wishes to add to an existing memo:" +#: ../shell/apps_evolution_shell.schemas.in.h:14 +msgid "" +"If true, then connections to the proxy server require authentication. The " +"username is retrieved from the \"/apps/evolution/shell/network_config/" +"authentication_user\" GConf key, and the password is retrieved from either " +"gnome-keyring or the ~/.gnome2_private/Evolution password file." msgstr "" -"%s ønsker gennem %s at føje noget til en eksisterende huskeseddel:" +"Hvis sand så vil der kræves godkendelse for forbindelsen til proxyserveren. " +"Brugernavnet hentes fra \"/apps/evolution/shell/network_config/" +"authentication_user\"-GConfnøglen og kodeordet hentes enten fra gnome-" +"keyring eller \"~/.gnome2_private/Evolution\"-kodeordsfilen." -#: ../plugins/itip-formatter/itip-view.c:543 -#, c-format -msgid "%s wishes to add to an existing memo:" -msgstr "%s ønsker at føje noget til en eksisterende huskeseddel:" +#: ../shell/apps_evolution_shell.schemas.in.h:15 +#, fuzzy +msgid "Initial attachment view" +msgstr "Indsæt bilag" -#: ../plugins/itip-formatter/itip-view.c:547 -#, c-format -msgid "%s through %s has canceled the following shared memo:" -msgstr "%s har gennem %s aflyst følgende fælles huskeseddel:" +#: ../shell/apps_evolution_shell.schemas.in.h:16 +#, fuzzy +msgid "Initial file chooser folder" +msgstr "Installér den delte mappe" -#: ../plugins/itip-formatter/itip-view.c:549 -#, c-format -msgid "%s has canceled the following shared memo:" -msgstr "%s har aflyst følgende fælles huskeseddel:" +#: ../shell/apps_evolution_shell.schemas.in.h:17 +msgid "Initial folder for GtkFileChooser dialogs." +msgstr "" -#. Everything gets the open button -#: ../plugins/itip-formatter/itip-view.c:821 -msgid "_Open Calendar" -msgstr "_Åbn kalender" +#: ../shell/apps_evolution_shell.schemas.in.h:18 +msgid "" +"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List " +"View." +msgstr "" -#: ../plugins/itip-formatter/itip-view.c:827 -#: ../plugins/itip-formatter/itip-view.c:831 -#: ../plugins/itip-formatter/itip-view.c:837 -#: ../plugins/itip-formatter/itip-view.c:854 -#: ../plugins/itip-formatter/itip-view.c:859 -msgid "_Decline" -msgstr "_Nægt" +#: ../shell/apps_evolution_shell.schemas.in.h:19 +msgid "Last upgraded configuration version" +msgstr "Sidste opgraderet konfigurationsversion" -#: ../plugins/itip-formatter/itip-view.c:828 -#: ../plugins/itip-formatter/itip-view.c:833 -#: ../plugins/itip-formatter/itip-view.c:840 -#: ../plugins/itip-formatter/itip-view.c:856 -#: ../plugins/itip-formatter/itip-view.c:861 -msgid "_Accept" -msgstr "_Acceptér" +#: ../shell/apps_evolution_shell.schemas.in.h:20 +msgid "" +"List of paths for the folders to be synchronized to disk for offline usage" +msgstr "" +"Liste over stier til mapper der skal synkroniseres til disken for " +"afkobletbrug" -#: ../plugins/itip-formatter/itip-view.c:831 -msgid "_Decline all" -msgstr "_Afslå alle" +#: ../shell/apps_evolution_shell.schemas.in.h:21 +msgid "Non-proxy hosts" +msgstr "Ikke-proxyværter" -#: ../plugins/itip-formatter/itip-view.c:832 -msgid "_Tentative all" -msgstr "_Alle forsøgsvis" +#: ../shell/apps_evolution_shell.schemas.in.h:22 +msgid "Password to pass as authentication when doing HTTP proxying." +msgstr "Kodeord som skal gives som godkendelse ved brug af HTTP-proxy." -#: ../plugins/itip-formatter/itip-view.c:832 -#: ../plugins/itip-formatter/itip-view.c:838 -#: ../plugins/itip-formatter/itip-view.c:855 -#: ../plugins/itip-formatter/itip-view.c:860 -msgid "_Tentative" -msgstr "_Forsøgsvis" +#: ../shell/apps_evolution_shell.schemas.in.h:23 +msgid "Proxy configuration mode" +msgstr "Proxykonfigurationstilstand" -#: ../plugins/itip-formatter/itip-view.c:833 -msgid "_Accept all" -msgstr "_Godkend alle" +#: ../shell/apps_evolution_shell.schemas.in.h:24 +msgid "SOCKS proxy host name" +msgstr "SOCKS-proxyværtsnavn" -#. FIXME Is this really the right button? -#: ../plugins/itip-formatter/itip-view.c:844 -msgid "_Send Information" -msgstr "_Send oplysninger" +#: ../shell/apps_evolution_shell.schemas.in.h:25 +msgid "SOCKS proxy port" +msgstr "SOCKS-proxyværtport" -#. FIXME Is this really the right button? -#: ../plugins/itip-formatter/itip-view.c:848 -msgid "_Update Attendee Status" -msgstr "_Opdatér status for deltager" +#: ../shell/apps_evolution_shell.schemas.in.h:26 +msgid "Secure HTTP proxy host name" +msgstr "Sikker HTTP-proxyværtnavn" -#: ../plugins/itip-formatter/itip-view.c:851 -msgid "_Update" -msgstr "_Opdatér" +#: ../shell/apps_evolution_shell.schemas.in.h:27 +msgid "Secure HTTP proxy port" +msgstr "Sikker HTTP-proxyport" -#. Start time -#: ../plugins/itip-formatter/itip-view.c:1031 -msgid "Start time:" -msgstr "Starttid:" +#: ../shell/apps_evolution_shell.schemas.in.h:28 +msgid "" +"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 " +"representing \"use system settings\", \"no proxy\", \"use manual proxy " +"configuration\" and \"use proxy configuration provided in the autoconfig url" +"\" respectively." +msgstr "" +"Vælg proxykonfigurationstilstanden. Understøttede værdier er 0, 1, 2 og 3 " +"som respektivt repræsenterer \"brug systemindstillinger\", \"ingen proxy\", " +"\"brug manuel proxykonfiguration\" og \"brug proxykonfiguration som er givet " +"i autoconfig-URL'en\"." -#. End time -#: ../plugins/itip-formatter/itip-view.c:1042 -msgid "End time:" -msgstr "Sluttid:" +#: ../shell/apps_evolution_shell.schemas.in.h:29 +msgid "Sidebar is visible" +msgstr "Sidepanel er synlig" -#. Comment -#: ../plugins/itip-formatter/itip-view.c:1062 -#: ../plugins/itip-formatter/itip-view.c:1116 -msgid "Comment:" -msgstr "Kommentar:" +#: ../shell/apps_evolution_shell.schemas.in.h:30 +msgid "Skip development warning dialog" +msgstr "Spring advarselsvinduet for udviklingsversionen over" -#: ../plugins/itip-formatter/itip-view.c:1101 -msgid "Send _reply to sender" -msgstr "Send _svar til afsenderen" +#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:485 +msgid "Start in offline mode" +msgstr "Start i afkoblet tilstand" -#: ../plugins/itip-formatter/itip-view.c:1131 -msgid "Send _updates to attendees" -msgstr "Send o_pdateringer til deltagere" +#: ../shell/apps_evolution_shell.schemas.in.h:32 +msgid "Statusbar is visible" +msgstr "Statuslinjen er synlig" -#: ../plugins/itip-formatter/itip-view.c:1140 -msgid "_Apply to all instances" -msgstr "An_vend på alle forekomster" +#: ../shell/apps_evolution_shell.schemas.in.h:33 +msgid "" +"The configuration version of Evolution, with major/minor/configuration level " +"(for example \"2.6.0\")." +msgstr "" +"Konfigurationsversionen for Evolution, med hovednummer/undernummer/" +"konfigurationsniveau (f.eks. \"2.6.0\")." -#: ../plugins/itip-formatter/itip-view.c:1149 -msgid "Show time as _free" -msgstr "Vis tid som _fri" +#: ../shell/apps_evolution_shell.schemas.in.h:34 +msgid "The default height for the main window, in pixels." +msgstr "Standardhøjden på hovedvinduet, i billedpunkter." -#: ../plugins/itip-formatter/itip-view.c:1152 -msgid "_Preserve my reminder" -msgstr "_Bevar min påmindelse" +#: ../shell/apps_evolution_shell.schemas.in.h:35 +msgid "The default width for the main window, in pixels." +msgstr "Standardbredden på hovedvinduet, i billedpunkter." -#: ../plugins/itip-formatter/itip-view.c:1157 -msgid "_Inherit reminder" -msgstr "_Nedarv påmindelse" +#: ../shell/apps_evolution_shell.schemas.in.h:36 +msgid "The default width for the sidebar, in pixels." +msgstr "Standardbredden på sidepanelet, i billedpunkter." -#: ../plugins/itip-formatter/itip-view.c:1911 -msgid "_Tasks :" -msgstr "_Opgaver :" +#: ../shell/apps_evolution_shell.schemas.in.h:37 +msgid "" +"The last upgraded configuration version of Evolution, with major/minor/" +"configuration level (for example \"2.6.0\")." +msgstr "" +"Den sidst opgraderede konfigurationsversion for Evolution, med hovednummer/" +"undernummer/konfigurationsniveau (f.eks. \"2.6.0\")." -#: ../plugins/itip-formatter/itip-view.c:1913 -msgid "Memos :" -msgstr "Huskesedler :" +#: ../shell/apps_evolution_shell.schemas.in.h:38 +msgid "The machine name to proxy HTTP through." +msgstr "Navnet på maskinen, der fungerer som HTTP-proxy." -#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1 -msgid "Displays text/calendar parts in messages." -msgstr "Viser tekst-/kalenderdele i breve." +#: ../shell/apps_evolution_shell.schemas.in.h:39 +msgid "The machine name to proxy secure HTTP through." +msgstr "Navnet på maskinen, der fungerer som sikker HTTP-proxy." -#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2 -msgid "Itip Formatter" -msgstr "Itip-formateringsenhed" +#: ../shell/apps_evolution_shell.schemas.in.h:40 +msgid "The machine name to proxy socks through." +msgstr "Navnet på maskinen, der fungerer som socks-proxy." -#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1 +#: ../shell/apps_evolution_shell.schemas.in.h:41 msgid "" -""{0}" has delegated the meeting. Do you want to add the delegate " -""{1}"?" +"The port on the machine defined by \"/apps/evolution/shell/network_config/" +"http_host\" that you proxy through." msgstr "" -""{0}" har uddelegeret mødet. Vil du tilføje delegaten "{1}" -""?" - -#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3 -msgid "This meeting has been delegated" -msgstr "Dette møde er blevet uddelegeret" +"Porten på maskinen, defineret ved \"/apps/evolution/shell/network_config/" +"http_host\", der fungerer som proxy." -#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4 +#: ../shell/apps_evolution_shell.schemas.in.h:42 msgid "" -"This response is not from a current attendee. Add the sender as an attendee?" +"The port on the machine defined by \"/apps/evolution/shell/network_config/" +"secure_host\" that you proxy through." msgstr "" -"Dette svar er ikke fra en nuværende mødedeltager. Tilføj afsender som " -"mødedeltager?" - -#: ../plugins/mail-account-disable/mail-account-disable.c:46 -msgid "Proxy _Logout" -msgstr "Logud af _proxy" +"Porten på maskinen, defineret ved \"/apps/evolution/shell/network_config/" +"secure_host\", der fungerer som proxy." -#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1 -msgid "Allows disabling of accounts." -msgstr "Tillader deaktivering af konti." +#: ../shell/apps_evolution_shell.schemas.in.h:43 +msgid "" +"The port on the machine defined by \"/apps/evolution/shell/network_config/" +"socks_host\" that you proxy through." +msgstr "" +"Porten på maskinen, defineret ved \"/apps/evolution/shell/network_config/" +"socks_host\", der fungerer som proxy." -#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2 -msgid "Disable Account" -msgstr "Deaktivér konto" +#: ../shell/apps_evolution_shell.schemas.in.h:44 +msgid "" +"The style of the window buttons. Can be \"text\", \"icons\", \"both\", " +"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined " +"by the GNOME toolbar setting." +msgstr "" +"Stilen for vindueknapperne. Kan være \"text\", \"icons\", \"both\", \"toolbar" +"\". Hvis \"toolbar\" er sat, vil knappernes stil blive afgjort af " +"indstillingerne for Gnomes værktøjslinje." -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1 -msgid "Beep or play sound file." -msgstr "Bip eller spil lydfil." +#: ../shell/apps_evolution_shell.schemas.in.h:45 +msgid "" +"This key contains a list of hosts which are connected to directly, rather " +"than via the proxy (if it is active). The values can be hostnames, domains " +"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and " +"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)." +msgstr "" +"Denne nøgle indeholder en liste af værter som der forbindes til direkte, i " +"stedet for via proxy (hvis den er aktiv). Værdierne kan være værtsnavne, " +"domæner (ved brug af en asterisk som i *.foo.com), IP-værtsadresser (både " +"IPv4 og IPv6) og netværksadresser med en netmaske (sådan noget som " +"192.168.0.0/24)." -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2 -msgid "Blink icon in notification area." -msgstr "Blink ikon i påmindelsesområde." +#: ../shell/apps_evolution_shell.schemas.in.h:46 +msgid "Toolbar is visible" +msgstr "Værktøjslinjen er synlig" -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3 -msgid "Enable D-Bus messages." -msgstr "Slå D-Bus-beskeder til." +#: ../shell/apps_evolution_shell.schemas.in.h:47 +msgid "URL that provides proxy configuration values." +msgstr "URL som giver proxykonfigurationsværdier." -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4 -msgid "Enable icon in notification area." -msgstr "Aktivér ikon i påmindelsesområde." +#: ../shell/apps_evolution_shell.schemas.in.h:48 +msgid "Use HTTP proxy" +msgstr "Brug HTTP-proxy" -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5 -msgid "Generates a D-Bus message when new mail messages arrive." -msgstr "Genererer en D-BUS-besked når nye breve ankommer." +#: ../shell/apps_evolution_shell.schemas.in.h:49 +msgid "User name to pass as authentication when doing HTTP proxying." +msgstr "Brugernavn som skal gives som godkendelse ved brug af HTTP-proxy." -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6 -msgid "" -"If \"true\", then beep, otherwise will play sound file when new messages " -"arrive." +#: ../shell/apps_evolution_shell.schemas.in.h:50 +msgid "Whether Evolution will start up in offline mode instead of online mode." msgstr "" -"Hvis \"true\" så bip, ellers vil der spilles en lydfil når der ankommer ny " -"post." - -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7 -msgid "Notify new messages for Inbox only." -msgstr "Påmind kun om nye breve i indbakkken." +"Om Evolution starter i afkoblet tilstand istedet for opkoblet tilstand." -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8 -msgid "Play sound when new messages arrive." -msgstr "Afspil lydfil når nye breve ankommer." +#: ../shell/apps_evolution_shell.schemas.in.h:51 +msgid "Whether or not the window should be maximized." +msgstr "Vælg om vinduet skal være maksimeret." -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9 -msgid "Popup message together with the icon." -msgstr "Vis pop-op-besked sammen med ikonet." +#: ../shell/apps_evolution_shell.schemas.in.h:52 +msgid "Whether the sidebar should be visible." +msgstr "Vælg om sidepanelet skal være synligt." -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10 -msgid "Show new mail icon in notification area when new messages arrive." -msgstr "" -"Påmind brugeren om at der er ankommet ny post ved hjælp af et ikon i " -"påmindelsesområdet." +#: ../shell/apps_evolution_shell.schemas.in.h:53 +msgid "Whether the status bar should be visible." +msgstr "Vælg om statuslinjen skal være synlig." -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11 -msgid "Sound file name to be played." -msgstr "Navn på lydfil som skal spilles." +#: ../shell/apps_evolution_shell.schemas.in.h:54 +msgid "Whether the toolbar should be visible." +msgstr "Vælg om værktøjslinjen skal være synlig." -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12 -msgid "Sound file to be played when new messages arrive, if not in beep mode." +#: ../shell/apps_evolution_shell.schemas.in.h:55 +msgid "" +"Whether the warning dialog in development versions of Evolution is skipped." msgstr "" -"Lydfilen der skal afspilles når nye breve ankommer, hvis ikke i bip-tilstand." +"Vælg om advarselsvinduet i udviklingsversionen af Evolution springes over." -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13 -msgid "Whether play sound or beep when new messages arrive." -msgstr "Om der afspilles lyd eller bip når nyt brev ankommer." +#: ../shell/apps_evolution_shell.schemas.in.h:56 +msgid "Whether the window buttons should be visible." +msgstr "Vælg om vinduesknapperne skal være synlige." -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14 -msgid "Whether show message over the icon when new messages arrive." -msgstr "Om der skal vises besked over ikonet når der kommer nye breve." +#: ../shell/apps_evolution_shell.schemas.in.h:57 +msgid "Window button style" +msgstr "Vinduesknap-stil" -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15 -msgid "Whether the icon should blink or not." -msgstr "Om ikonet skal blinke eller ej." +#: ../shell/apps_evolution_shell.schemas.in.h:58 +msgid "Window buttons are visible" +msgstr "Vinduesknapper er synlige" -#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16 -msgid "Whether to notify new messages in Inbox folder only." -msgstr "Om der kun skal påmindes for nye breve i indbakken." +#: ../shell/e-active-connection-dialog.glade.h:1 +msgid "Active Connections" +msgstr "Aktive forbindelser" -#: ../plugins/mail-notification/mail-notification.c:256 -msgid "Generate a _D-Bus message" -msgstr "Generér en _D-Bus-besked" +#: ../shell/e-active-connection-dialog.glade.h:2 +msgid "Active Connections" +msgstr "Aktive opkoblinger" -#: ../plugins/mail-notification/mail-notification.c:379 -msgid "Evolution's Mail Notification" -msgstr "Evolutions postpåmindelse" +#: ../shell/e-active-connection-dialog.glade.h:3 +msgid "Click OK to close these connections and go offline" +msgstr "Klik o.k. for at lukke disse forbindelser og gå afkoblet" -#: ../plugins/mail-notification/mail-notification.c:400 -msgid "Mail Notification Properties" -msgstr "Egenskaber for postpåmindelsen" +#: ../shell/e-shell-importer.c:128 +msgid "Choose the type of importer to run:" +msgstr "Vælg type importerer som skal køres:" -#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder -#: ../plugins/mail-notification/mail-notification.c:479 -#, c-format +#: ../shell/e-shell-importer.c:131 msgid "" -"You have received %d new message\n" -"in %s." -msgid_plural "" -"You have received %d new messages\n" -"in %s." -msgstr[0] "" -"Du har modtaget %d nyt brev\n" -"i %s." -msgstr[1] "" -"Du har modtaget %d nye breve\n" -"i %s." +"Choose the file that you want to import into Evolution, and select what type " +"of file it is from the list." +msgstr "" +"Vælg filen du ønsker at importere i Evolution, og vælg hvilken type fil det " +"er fra listen." -#: ../plugins/mail-notification/mail-notification.c:484 -#, c-format -msgid "You have received %d new message." -msgid_plural "You have received %d new messages." -msgstr[0] "Du har modtaget %d nyt brev." -msgstr[1] "Du har modtaget %d nye breve." +#: ../shell/e-shell-importer.c:135 +msgid "Choose the destination for this import" +msgstr "Vælg målet for denne importering" -#: ../plugins/mail-notification/mail-notification.c:501 -#: ../plugins/mail-notification/mail-notification.c:506 -msgid "New email" -msgstr "Nyt post" +#: ../shell/e-shell-importer.c:141 +msgid "" +"Evolution checked for settings to import from the following\n" +"applications: Pine, Netscape, Elm, iCalendar. No importable\n" +"settings found. If you would like to\n" +"try again, please click the \"Back\" button.\n" +msgstr "" +"Evolution undersøgte om indstillinger kunne importeres fra\n" +"følgende programmer: Pine, Netscape, Elm og iCalendar.\n" +"Ingen indstillinger som kunne importeres blev fundet.\n" +"Hvis du vil prøve igen kan du klikke på \"Tilbage\"-knappen.\n" -#: ../plugins/mail-notification/mail-notification.c:566 -msgid "Show icon in _notification area" -msgstr "Vis ikon i _påmindelsesområde" +#: ../shell/e-shell-importer.c:296 +msgid "F_ilename:" +msgstr "_Filnavn:" -#: ../plugins/mail-notification/mail-notification.c:569 -msgid "B_link icon in notification area" -msgstr "B_link med ikon i påmindelsesområde" +#: ../shell/e-shell-importer.c:301 +msgid "Select a file" +msgstr "Vælg en fil" -#: ../plugins/mail-notification/mail-notification.c:571 -msgid "Popup _message together with the icon" -msgstr "Pop-op-_besked sammen med ikon" +#: ../shell/e-shell-importer.c:310 +msgid "File _type:" +msgstr "Fil_type:" -#: ../plugins/mail-notification/mail-notification.c:752 -msgid "_Play sound when new messages arrive" -msgstr "_Afspil lydfil når nye breve ankommer" +#: ../shell/e-shell-importer.c:358 +msgid "Import data and settings from _older programs" +msgstr "Importer data og indstillinger fra _ældre programmer" -#: ../plugins/mail-notification/mail-notification.c:758 -msgid "_Beep" -msgstr "_Bip" +#: ../shell/e-shell-importer.c:361 +msgid "Import a _single file" +msgstr "Importer en _enkelt fil" -#: ../plugins/mail-notification/mail-notification.c:759 -msgid "Play _sound file" -msgstr "Afspil _lydfil" +#: ../shell/e-shell-importer.c:725 +msgid "_Import" +msgstr "_Importér" -#: ../plugins/mail-notification/mail-notification.c:770 -msgid "Specify _filename:" -msgstr "Angiv _filnavn:" +#: ../shell/e-shell-settings-dialog.c:313 +msgid "Evolution Preferences" +msgstr "Evolution-indstillinger" -#: ../plugins/mail-notification/mail-notification.c:771 -msgid "Select sound file" -msgstr "Vælg lydfil" +#. To translators: This is the window title and %s is the +#. component name. Most translators will want to keep it as is. +#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:326 +#, c-format +msgid "%s - Evolution" +msgstr "%s - Evolution" -#: ../plugins/mail-notification/mail-notification.c:772 -msgid "Pl_ay" -msgstr "Af_spil" +#: ../shell/e-shell-window-commands.c:69 +msgid "The GNOME Pilot tools do not appear to be installed on this system." +msgstr "" +"GNOMEs pilotværktøjer ser ikke ud til at være installeret på dette system." -#: ../plugins/mail-notification/mail-notification.c:829 -msgid "Notify new messages for _Inbox only" -msgstr "Påmind kun om nye breve i _indbakke" +#: ../shell/e-shell-window-commands.c:78 +#, fuzzy, c-format +msgid "Error executing %s. (%s)" +msgstr "Fejl under kørsel af %s." -#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1 -msgid "" -"Generates a D-Bus message or notifies the user with an icon in notification " -"area and a notification message whenever a new message has arrived." -msgstr "" -"Genererer en D-Bus-besked eller underretter brugeren om at der er ankommet " -"ny post ved hjælp af et ikon i påmindelsesområdet og en påmindelsesbesked." +#: ../shell/e-shell-window-commands.c:136 +msgid "Bug buddy is not installed." +msgstr "Bug buddy er ikke installeret." -#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2 -msgid "Mail Notification" -msgstr "Underretning om ny post" +#: ../shell/e-shell-window-commands.c:139 +msgid "Bug buddy could not be run." +msgstr "Bug buddy kunne ikke køres." -#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1 -msgid "" -"A plugin which allows the creation of meetings from the contents of a mail " -"message." +#. The translator-credits string is for translators to list +#. * per-language credits for translation, displayed in the +#. * about dialog. +#: ../shell/e-shell-window-commands.c:939 +msgid "translator-credits" msgstr "" -"Et udvidelsesmodul der tillader oprettelse af møder ud fra indholdet af et " -"brev." +"Anna Jonna Armannsdottir\n" +"Keld Simonsen\n" +"Kenneth Christiansen\n" +"Kjartan Maraas\n" +"Martin Willemoes Hansen\n" +"Rasmus Ory Nielsen\n" +"Søren Boll Overgaard\n" +"Marie Lund\n" +"Ole Laursen\n" +"Morten Bo Johansen\n" +"Peter Bach\n" +"Kenneth Nielsen\n" +"\n" +"Dansk-gruppen \n" +"Mere info: http://www.dansk-gruppen.dk" -#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2 -msgid "Con_vert to Meeting" -msgstr "K_onvertér til møde" +#: ../shell/e-shell-window-commands.c:950 +msgid "Evolution Website" +msgstr "Evolutions webside" + +#: ../shell/e-shell-window-commands.c:1168 +msgid "_Work Online" +msgstr "_Arbejd opkoblet" -#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3 -msgid "Mail to meeting" -msgstr "Brev til møde" +#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57 +msgid "_Work Offline" +msgstr "Ar_bejd afkoblet" -#: ../plugins/mail-to-task/mail-to-task.c:287 -#, c-format -msgid "Cannot open calendar. %s" -msgstr "Kan ikke åbne kalenderen. %s" +#: ../shell/e-shell-window-commands.c:1194 +msgid "Work Offline" +msgstr "Arbejd afkoblet" -#: ../plugins/mail-to-task/mail-to-task.c:292 +#: ../shell/e-shell-window.c:375 msgid "" -"Selected source is read only, thus cannot create task there. Select other " -"source, please." +"Evolution is currently online.\n" +"Click on this button to work offline." msgstr "" -"Den valgte kilde er skrivebeskyttet og der kan derfor ikke oprettes nogen " -"opgave der. Vælg en anden kilde." +"Evolution er nu opkoblet.\n" +"Klik på denne knap for at arbejde afkoblet." -#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1 +#: ../shell/e-shell-window.c:382 +msgid "Evolution is in the process of going offline." +msgstr "Evolution er i færd med at afkoble." + +#: ../shell/e-shell-window.c:389 msgid "" -"A plugin which allows the creation of tasks from the contents of a mail " -"message." +"Evolution is currently offline.\n" +"Click on this button to work online." msgstr "" -"Et udvidelsesmodul der tillader oprettelse af opgaver ud fra indholdet af et " -"brev." - -#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2 -#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1 -msgid "Con_vert to Task" -msgstr "Kon_vertér til opgave" +"Evolution er nu afkoblet.\n" +"Klik på denne knap for at arbejde opkoblet." -#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3 -msgid "Mail to task" -msgstr "Brev til opgave" +#: ../shell/e-shell-window.c:783 +#, c-format +msgid "Switch to %s" +msgstr "Skift til %s" -#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2 -msgid "Convert the selected message to a new task" -msgstr "Konverterer det valgte brev til en ny opgave" +#: ../shell/e-shell.c:639 +msgid "Unknown system error." +msgstr "Ukendt systemfejl." -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1 -msgid "Contact list _owner" -msgstr "Adresselistens _ejer" +#: ../shell/e-shell.c:837 ../shell/e-shell.c:838 +#, c-format +msgid "%ld KB" +msgstr "%ld kB" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2 -msgid "Get list _archive" -msgstr "Hent _arkiv over lister" +#: ../shell/e-shell.c:1260 ../widgets/misc/e-cell-date-edit.c:324 +msgid "OK" +msgstr "O.k." -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3 -msgid "Get list _usage information" -msgstr "Hent information om _brug af lister" +#: ../shell/e-shell.c:1262 +msgid "Invalid arguments" +msgstr "Ugyldige argumenter" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4 -msgid "Mailing List Actions" -msgstr "Postlistehandlinger" +#: ../shell/e-shell.c:1264 +msgid "Cannot register on OAF" +msgstr "Kan ikke registrere i OAF" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5 -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7 -msgid "Mailing _List" -msgstr "_Postliste" +#: ../shell/e-shell.c:1266 +msgid "Configuration Database not found" +msgstr "Konfigurationsdatabase ikke fundet" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6 -msgid "" -"Provide actions for common mailing list commands (subscribe, unsubscribe...)." -msgstr "" -"Sørger for almindelige handlinger til postliste-kommandoer (abonnér, " -"afmeld...)." +#: ../shell/e-user-creatable-items-handler.c:678 +#: ../shell/e-user-creatable-items-handler.c:688 +#: ../shell/e-user-creatable-items-handler.c:693 +msgid "New" +msgstr "Nye" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7 -msgid "_Post message to list" -msgstr "_Send brev til liste" +#: ../shell/test/evolution-test-component.c:105 +msgid "New Test" +msgstr "Ny test" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8 -msgid "_Subscribe to list" -msgstr "_Tilmeld til listen" +#: ../shell/test/evolution-test-component.c:106 +msgctxt "New" +msgid "_Test" +msgstr "_Test" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9 -msgid "_Un-subscribe to list" -msgstr "_Frameld fra listen" +#: ../shell/test/evolution-test-component.c:107 +msgid "Create a new test item" +msgstr "Opret et nyt testelement" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1 -msgid "Action not available" -msgstr "Handling ikke tilgængelig" +#: ../shell/import.glade.h:1 +msgid "Click \"Import\" to begin importing the file into Evolution. " +msgstr "Klik \"Importér\" for at starte import af filen til Evolution. " -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2 -msgid "" -"An e-mail message will be sent to the URL \"{0}\". You can either send the " -"message automatically, or see and change it first.\n" -"\n" -"You should receive an answer from the mailing list shortly after the message " -"has been sent." -msgstr "" -"Et brev vil blive sendt til adressen \"{0}\". Du kan enten sende brevet " -"automatisk eller se og ændre det først.\n" -"\n" -"Du burde modtage et svar fra e-postlisten kort efter at brevet er blevet " -"sendt." +#: ../shell/import.glade.h:2 +msgid "Evolution Import Assistant" +msgstr "Import-vejleder til Evolution" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5 -msgid "Malformed header" -msgstr "Misdannet brevhoved" +#: ../shell/import.glade.h:3 +msgid "Import File" +msgstr "Importér fil" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6 -msgid "No e-mail action" -msgstr "Ingen e-post-handling" +#: ../shell/import.glade.h:4 +msgid "Import Location" +msgstr "Importér sted" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7 -msgid "Posting not allowed" -msgstr "Afsendelse ikke tilladt" +#: ../shell/import.glade.h:5 +msgid "Importer Type" +msgstr "Importér type" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8 -msgid "" -"Posting to this mailing list is not allowed. Possibly, this is a read-only " -"mailing list. Contact the list owner for details." -msgstr "" -"Afsendelse til denne e-post-liste er ikke tilladt. Dette er sandsynligvis en " -"skrivebeskyttet e-post-liste. Kontakt ejeren af listen for detaljer." +#: ../shell/import.glade.h:6 +msgid "Select Information to Import" +msgstr "Vælg information som skal importeres" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9 -msgid "Send e-mail message to mailing list?" -msgstr "Send brev til postliste?" +#: ../shell/import.glade.h:7 +msgid "Select a File" +msgstr "Vælg en fil" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10 +#: ../shell/import.glade.h:8 msgid "" -"The action could not be performed. The header for this action did not " -"contain any action that could be processed.\n" -"\n" -"Header: {0}" +"Welcome to the Evolution Import Assistant.\n" +"With this assistant you will be guided through the process of\n" +"importing external files into Evolution." msgstr "" -"Handlingen kunne ikke udføres. Hovedet for denne handling indeholdt ikke " -"nogen handlinger, der kunne behandles.\n" -"\n" -"Hoved: {0}" +"Velkommen til Evolutions import-vejleder\n" +"Gennem denne vejleder vil du blive guidet gennem proceduren\n" +"for import af eksterne filer til Evolution." -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13 +#. Preview/Alpha/Beta version warning message +#: ../shell/main.c:222 +#, no-c-format msgid "" -"The {0} header of this message is malformed and could not be processed.\n" +"Hi. Thanks for taking the time to download this preview release\n" +"of the Evolution groupware suite.\n" "\n" -"Header: {1}" +"This version of Evolution is not yet complete. It is getting close,\n" +"but some features are either unfinished or do not work properly.\n" +"\n" +"If you want a stable version of Evolution, we urge you to uninstall\n" +"this version, and install version %s instead.\n" +"\n" +"If you find bugs, please report them to us at bugzilla.gnome.org.\n" +"This product comes with no warranty and is not intended for\n" +"individuals prone to violent fits of anger.\n" +"\n" +"We hope that you enjoy the results of our hard work, and we\n" +"eagerly await your contributions!\n" msgstr "" -"{0}-hovedet på dette brev er misdannet og kunne ikke behandles.\n" +"Hej. Tak for at du tog dig tid til at hente denne forudgave\n" +"af samarbejdsprogrammelsuiten Evolution.\n" "\n" -"Hoved: {1}" +"Denne version af Evolution er ikke færdig endnu. Det begynder at nærme sig,\n" +"men der findes steder hvor funktioner enten mangler eller kun fungerer " +"delvis.\n" +"\n" +"Hvis du vil have en stabil version af Evolution anbefaler vi dig at\n" +"afinstallere denne version og installere version %s i stedet.\n" +"\n" +"Hvis du finder fejl i programmet, beder vi om at du rapporterer dem til os\n" +"på bugzilla.gnome.org.\n" +"\n" +"Dette produkt leveres uden garanti og er ikke beregnet for\n" +"personer der let får vredesudbrud.\n" +"\n" +"Vi håber at du vil være fornøjet med resultatet af vort hårde arbejde, og " +"vi\n" +"venter med spænding på dine bidrag!\n" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16 +#: ../shell/main.c:246 msgid "" -"This message does not contain the header information required for this " -"action." +"Thanks\n" +"The Evolution Team\n" msgstr "" -"Brevet indeholder ikke påkrævet oplysning i brevhoved til denne handling." - -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17 -msgid "_Edit message" -msgstr "Re_digér brev" - -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18 -msgid "_Send message" -msgstr "_Send brev" - -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1 -msgid "Contact List _Owner" -msgstr "Kontaktlistens _ejer" - -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2 -msgid "Contact the owner of the mailing list this message belongs to" -msgstr "Kontakt ejeren af den postliste som dette brev tilhører" - -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3 -msgid "Get List _Archive" -msgstr "Hent _arkiv over lister" - -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4 -msgid "Get List _Usage Information" -msgstr "Hent information om _brug af lister" +"Tak\n" +"Evolution-holdet\n" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5 -msgid "Get an archive of the list this message belongs to" -msgstr "Hent et arkiv over listen dette brev tilhører" +#: ../shell/main.c:253 +msgid "Do not tell me again" +msgstr "Fortæl mig det ikke igen" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6 -msgid "Get information about the usage of the list this message belongs to" -msgstr "Hent information om brugen af listen som dette brev tilhøre" +#: ../shell/main.c:483 +msgid "Start Evolution activating the specified component" +msgstr "Start Evolution med den angivne komponent aktiveret" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8 -msgid "Post a message to the mailing list this message belongs to" -msgstr "Send et brev til den postliste som dette brev tilhører" +#: ../shell/main.c:487 +msgid "Start in online mode" +msgstr "Start i opkoblet tilstand" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9 -msgid "Subscribe to the mailing list this message belongs to" -msgstr "Tilmeld dig den postliste som dette brev tilhører" +#: ../shell/main.c:490 +msgid "Forcibly shut down all Evolution components" +msgstr "Gennemtving nedlukning af alle komponenter i Evolution" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10 -msgid "Unsubscribe to the mailing list this message belongs to" -msgstr "Afmeld dig den postliste som dette brev tilhører" +#: ../shell/main.c:494 +msgid "Forcibly re-migrate from Evolution 1.4" +msgstr "Gennemtving genoverflytning fra Evolution 1.4" -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11 -msgid "_Post Message to List" -msgstr "_Send brev til liste" +#: ../shell/main.c:497 +msgid "Send the debugging output of all components to a file." +msgstr "Send fejlsøgingsudskrift for alle komponenterne til en fil." -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12 -msgid "_Subscribe to List" -msgstr "_Abonnér på postlisten" +#: ../shell/main.c:499 +msgid "Disable loading of any plugins." +msgstr "Deaktivér indlæsning af alle udvidelsesmoduler." -#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13 -msgid "_Unsubscribe from List" -msgstr "_Frameld liste" +#: ../shell/main.c:501 +msgid "Disable preview pane of Mail, Contacts and Tasks." +msgstr "Deaktivér forhåndsvisnings-panel for post, kontaktpersoner og opgaver." -#: ../plugins/mark-all-read/mark-all-read.c:39 -msgid "Also mark messages in subfolders?" -msgstr "Marker også beskeder i undermapper?" +#: ../shell/main.c:588 +msgid "- The Evolution PIM and Email Client" +msgstr "- Evolution, en PIM og e-post-klient" -#: ../plugins/mark-all-read/mark-all-read.c:41 +#: ../shell/main.c:616 +#, c-format msgid "" -"Do you want to mark messages as read in the current folder only, or in the " -"current folder as well as all subfolders?" +"%s: --online and --offline cannot be used together.\n" +" Use %s --help for more information.\n" msgstr "" -"Ønsker du at markere beskeder som læst udelukkende i den aktuelle mappe, " -"eller både i den aktuelle mappe og dens undermapper?" - -#: ../plugins/mark-all-read/mark-all-read.c:164 -msgid "Current Folder and _Subfolders" -msgstr "Nuværende mappe og _undermapper" - -#: ../plugins/mark-all-read/mark-all-read.c:176 -msgid "Current _Folder Only" -msgstr "Kun aktuel _mappe" +"%s: --online og --offline kan ikke bruges sammen.\n" +" Brug %s --help for mere information.\n" -#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1 -msgid "Mark All Read" -msgstr "Markér alle som læst" +#: ../shell/shell.error.xml.h:1 +msgid "Are you sure you want to forget all remembered passwords?" +msgstr "Er du sikker på du vil glemme alle huskede adgangskoder?" -#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2 -msgid "Mark Me_ssages as Read" -msgstr "Markér _breve som læst" +#: ../shell/shell.error.xml.h:2 +msgid "Cannot start Evolution" +msgstr "Kan ikke starte Evolution" -#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3 -msgid "Used for marking all the messages under a folder as read" -msgstr "Bruges til at markere alle breve i en mappe som læste" +#: ../shell/shell.error.xml.h:3 +msgid "Continue" +msgstr "Fortsæt" -#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1 -msgid "A plugin which implements mono plugins." -msgstr "Et udvidelsesmodul som muliggør Mono-udvidelsesmoduler." +#: ../shell/shell.error.xml.h:4 +msgid "Delete old data from version {0}?" +msgstr "Slet gamle data fra version {0}?" -#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2 -msgid "Mono Loader" -msgstr "Mono-indlæser" +#: ../shell/shell.error.xml.h:5 +msgid "Evolution can not start." +msgstr "Evolution kan ikke starte." -#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1 -msgid "A plugin for managing which plugins are enabled or disabled." +#: ../shell/shell.error.xml.h:6 +msgid "" +"Forgetting your passwords will clear all remembered passwords. You will be " +"reprompted next time they are needed." msgstr "" -"Et udvidelsesmodul der håndterer hvilke udvidelsesmoduler der er aktiveret " -"eller deaktiveret." - -#. Setup the ui -#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2 -#: ../plugins/plugin-manager/plugin-manager.c:252 -msgid "Plugin Manager" -msgstr "Håndtering af udvidelsesmoduler" +"Hvis du \"glemmer\" dine adgangskoder, vil alle huskede adgangskoder blive " +"fjernet. Du vil blive spurgt igen, næste gang der er brug for dem." -#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1 -msgid "Enable and disable plugins" -msgstr "Aktivér og deaktivér udvidelsesmoduler" +#: ../shell/shell.error.xml.h:8 +msgid "Insufficient disk space for upgrade." +msgstr "Der er ikke nok diskplads til opgraderingen." -#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2 -msgid "_Plugins" -msgstr "_Udvidelsesmoduler" +#: ../shell/shell.error.xml.h:9 +msgid "Really delete old data?" +msgstr "Skal gamle data virkelig slettes?" -#: ../plugins/plugin-manager/plugin-manager.c:58 -msgid "Author(s)" -msgstr "Forfatter(e)" - -#: ../plugins/plugin-manager/plugin-manager.c:146 -msgid "Configuration" -msgstr "Konfiguration" +#: ../shell/shell.error.xml.h:10 +msgid "" +"The entire contents of the "evolution" directory are about to be " +"permanently removed.\n" +"\n" +"It is suggested you manually verify that all of your mail, contact, and " +"calendar data is present, and that this version of Evolution operates " +"correctly before deleting this old data.\n" +"\n" +"Once deleted, you cannot downgrade to the previous version of Evolution " +"without manual intervention.\n" +msgstr "" +"Hele indholdet af "evolution"-mappen er ved at blive fjernet " +"permanent.\n" +"\n" +"Du bør manuelt kontrollere at al din e-post-, dine kontaktperson- og " +"kalender-data er tilstede, og at denne version af Evolution opfører sig " +"korrekt, før du sletter disse gamle data.\n" +"\n" +"Når dataene er slettet, kan du ikke nedgradere til en tidligere version af " +"Evolution, uden manuel indgriben.\n" -#: ../plugins/plugin-manager/plugin-manager.c:265 -msgid "Note: Some changes will not take effect until restart" -msgstr "NB: Visse ændringer vil ikke træde i kraft før der genstartes" +#: ../shell/shell.error.xml.h:16 +msgid "" +"The previous version of Evolution stored its data in a different location.\n" +"\n" +"If you choose to remove this data, the entire contents of the "" +"evolution" directory will be removed permanently. If you choose to keep " +"this data, then you may manually remove the contents of "" +"evolution" at your convenience.\n" +msgstr "" +"Den tidligere version af Evolution lagrede sine data et andet sted.\n" +"\n" +"Hvis du vælger at fjerne disse data, vil alt indholdet af " " +"evolution"-mappen blive fjernet permanent. Hvis du vælger at beholde " +"disse data, kan du manuelt fjerne indholdet af "evolution" når du " +"har lyst.\n" -#: ../plugins/plugin-manager/plugin-manager.c:291 -msgid "Overview" -msgstr "Oversigt" +#: ../shell/shell.error.xml.h:20 +msgid "Upgrade from previous version failed: {0}" +msgstr "Opgradering fra forrige version mislykkedes: {0}" -#: ../plugins/plugin-manager/plugin-manager.c:362 -#: ../plugins/plugin-manager/plugin-manager.c:424 -msgid "Plugin" -msgstr "Udvidelsesmodul" +#: ../shell/shell.error.xml.h:21 +msgid "" +"Upgrading your data and settings will require up to {0} of disk space, but " +"you only have {1} available.\n" +"\n" +"You will need to make more space available in your home directory before you " +"can continue." +msgstr "" +"Opgradering af dine data og indstillinger vil kræve optil {0} diskplads, men " +"du har kun {1} tilgængelig.\n" +"\n" +"Du må gøre mere plads tilgængelig i dit hjemmekatalog før du kan fortsætte." -#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1 +#: ../shell/shell.error.xml.h:24 msgid "" -"A test plugin which demonstrates a formatter plugin which lets you choose to " -"disable HTML messages.\n" +"Your system configuration does not match your Evolution configuration.\n" "\n" -"This plugin is unsupported demonstration code only.\n" +"Click help for details" msgstr "" -"Et formaterings-testudvidelsesmodul som gør det muligt at deaktivere HTML-" -"breve.\n" +"Din systemopsætning matcher ikke din Evolutionopsætning.\n" "\n" -"Dette udvidelsesmodul er ikke understøttet og kun til demonstrationsbrug.\n" +"Klik på hjælp for detaljer" -#. but then we also need to create our own section frame -#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6 -msgid "Plain Text Mode" -msgstr "Klartekst-tilstand" +#: ../shell/shell.error.xml.h:27 +msgid "" +"Your system configuration does not match your Evolution configuration:\n" +"\n" +"{0}\n" +"\n" +"Click help for details." +msgstr "" +"Din systemopsætning matcher ikke din Evolutionopsætning:\n" +"\n" +"{0}\n" +"\n" +"Klik på hjælp for detaljer." -#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7 -msgid "Prefer plain-text" -msgstr "Fortræk klartekst" +#: ../shell/shell.error.xml.h:32 +msgid "_Forget" +msgstr "_Glem" -#: ../plugins/prefer-plain/prefer-plain.c:189 -msgid "Show HTML if present" -msgstr "Vis HTML hvis det er tilstede" +#: ../shell/shell.error.xml.h:33 +msgid "_Keep Data" +msgstr "_Behold data" -#: ../plugins/prefer-plain/prefer-plain.c:190 -msgid "Prefer PLAIN" -msgstr "Foretræk klartekst" +#: ../shell/shell.error.xml.h:34 +msgid "_Remind Me Later" +msgstr "_Påmind mig senere" -#: ../plugins/prefer-plain/prefer-plain.c:191 -msgid "Only ever show PLAIN" -msgstr "Vis kun klartekst" +#: ../shell/shell.error.xml.h:35 +msgid "" +"{1}\n" +"\n" +"If you choose to continue, you may not have access to some of your old " +"data.\n" +msgstr "" +"{1}\n" +"\n" +"Hvis du vælger at fortsætte vil du måske ikke få adgang til alle dine gamle " +"data.\n" -#: ../plugins/prefer-plain/prefer-plain.c:234 -msgid "HTML _Mode" -msgstr "HTML-_tilstand" +#: ../smime/gui/ca-trust-dialog.c:102 +#, c-format +msgid "" +"Certificate '%s' is a CA certificate.\n" +"\n" +"Edit trust settings:" +msgstr "" +"Certifikatet \"%s\" er et CA-certifikat.\n" +"\n" +"Redigér troværdighedsopsætning:" -#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1 -msgid "Evolution Profiler" -msgstr "Evolution-profiler" +#: ../smime/gui/cert-trust-dialog.c:151 +msgid "" +"Because you trust the certificate authority that issued this certificate, " +"then you trust the authenticity of this certificate unless otherwise " +"indicated here" +msgstr "" +"Fordi du stoler på certificeringsmyndigheden som har udstedt dette " +"certifikat, så stoler du også på at dette certifikat er autentisk, med " +"mindre du angiver det her" -#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2 -msgid "Writes a log of profiling data events." -msgstr "Skriver en log over begivenheder ifm. dannelse af profil." +#: ../smime/gui/cert-trust-dialog.c:155 +msgid "" +"Because you do not trust the certificate authority that issued this " +"certificate, then you do not trust the authenticity of this certificate " +"unless otherwise indicated here" +msgstr "" +"Fordi du ikke stoler på certificeringsmyndigheden som har udstedet dette " +"certifikat, så stoler du heller ikke på at dette certifikat er autentisk, " +"med mindre du angiver det her" -#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1 -msgid "Import Outlook messages from PST file" -msgstr "Importer Outlook-breve fra PST-fil" +#: ../smime/gui/certificate-manager.c:136 +#: ../smime/gui/certificate-manager.c:383 +#: ../smime/gui/certificate-manager.c:611 +msgid "Select a certificate to import..." +msgstr "Vælg et certifikat, at importere..." -#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2 -msgid "Outlook PST import" -msgstr "Outlook PST-import" +#: ../smime/gui/certificate-manager.c:145 +msgid "All PKCS12 files" +msgstr "Alle PKCS12-filer" -#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3 -msgid "Outlook personal folders (.pst)" -msgstr "Outlook personlige mapper (.pst)" +#: ../smime/gui/certificate-manager.c:151 +#: ../smime/gui/certificate-manager.c:398 +#: ../smime/gui/certificate-manager.c:625 +msgid "All files" +msgstr "Alle filer" -#. Address book -#: ../plugins/pst-import/pst-importer.c:318 -msgid "_Address Book" -msgstr "_Adressebog" +#: ../smime/gui/certificate-manager.c:275 +#: ../smime/gui/certificate-manager.c:488 +#: ../smime/gui/certificate-manager.c:713 +msgid "Certificate Name" +msgstr "Certifikat-navn" -#. Appointments -#: ../plugins/pst-import/pst-importer.c:325 -msgid "A_ppointments" -msgstr "A_ftaler" +#: ../smime/gui/certificate-manager.c:284 +#: ../smime/gui/certificate-manager.c:506 +msgid "Purposes" +msgstr "Formål" -#. Journal -#: ../plugins/pst-import/pst-importer.c:337 -msgid "_Journal entries" -msgstr "_Journalindgange" +#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37 +#: ../smime/lib/e-cert.c:553 +msgid "Serial Number" +msgstr "Serienummer" -#: ../plugins/pst-import/pst-importer.c:352 -msgid "Importing Outlook data" -msgstr "Importerer Outlook-data" +#: ../smime/gui/certificate-manager.c:301 +msgid "Expires" +msgstr "Udløber" -#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1 -msgid "Allows calendars to be published to the web" -msgstr "Gør det muligt at offentliggøre kalendere på nettet" +#: ../smime/gui/certificate-manager.c:392 +msgid "All email certificate files" +msgstr "Alle e-post-certifikatsfiler" -#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2 -msgid "Calendar Publishing" -msgstr "Kalender-offentliggørelse" +#: ../smime/gui/certificate-manager.c:497 +msgid "E-Mail Address" +msgstr "E-postadresse" -#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3 -msgid "Locations" -msgstr "Steder" +#: ../smime/gui/certificate-manager.c:620 +msgid "All CA certificate files" +msgstr "Alle CA-Certifikatsfiler" -#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1 -msgid "_Publish Calendar Information" -msgstr "Information om kalender-_offentliggørelse" +#: ../smime/gui/certificate-viewer.c:338 +#, c-format +msgid "Certificate Viewer: %s" +msgstr "Certifikat-viser: %s" -#: ../plugins/publish-calendar/publish-calendar.c:596 -msgid "Are you sure you want to remove this location?" -msgstr "Er du sikker på, du vil slette dette sted?" +#: ../smime/gui/component.c:46 +#, c-format +msgid "Enter the password for `%s'" +msgstr "Indtast adgangskoden for \"%s\"" -#: ../plugins/publish-calendar/publish-calendar.glade.h:2 -msgid "Location" -msgstr "Sted" +#. we're setting the password initially +#: ../smime/gui/component.c:69 +msgid "Enter new password for certificate database" +msgstr "Indtast ny adgangskode for certifikat-databasen" -#: ../plugins/publish-calendar/publish-calendar.glade.h:4 -msgid "Sources" -msgstr "Kilder" +#: ../smime/gui/component.c:71 +msgid "Enter new password" +msgstr "Indtast ny adgangskode" -#: ../plugins/publish-calendar/publish-calendar.glade.h:6 +#. FIXME: add serial no, validity date, uses +#: ../smime/gui/e-cert-selector.c:117 +#, c-format msgid "" -"Daily\n" -"Weekly\n" -"Manual (via Actions menu)" +"Issued to:\n" +" Subject: %s\n" msgstr "" -"Daglig\n" -"Ugentlig\n" -"Manuel (via menuen Handlinger)" +"Udstedt til:\n" +" Emne: %s\n" -#: ../plugins/publish-calendar/publish-calendar.glade.h:9 -msgid "E_nable" -msgstr "A_ktivér" +#: ../smime/gui/e-cert-selector.c:118 +#, c-format +msgid "" +"Issued by:\n" +" Subject: %s\n" +msgstr "" +"Udstedt af:\n" +" Emne: %s\n" -#: ../plugins/publish-calendar/publish-calendar.glade.h:10 -msgid "P_ort:" -msgstr "_Port:" +#: ../smime/gui/e-cert-selector.c:170 +msgid "Select certificate" +msgstr "Vælg certifikat" -#: ../plugins/publish-calendar/publish-calendar.glade.h:11 -msgid "Publishing Location" -msgstr "Offentliggørelsessted" +#: ../smime/gui/smime-ui.glade.h:1 +msgid "" +msgstr "" -#: ../plugins/publish-calendar/publish-calendar.glade.h:12 -msgid "Publishing _Frequency:" -msgstr "Offentliggørelses_hyppighed:" +#: ../smime/gui/smime-ui.glade.h:2 +msgid "Certificate Fields" +msgstr "Certifikat-felter" -#: ../plugins/publish-calendar/publish-calendar.glade.h:13 -msgid "" -"Secure FTP (SSH)\n" -"Public FTP\n" -"FTP (with login)\n" -"Windows share\n" -"WebDAV (HTTP)\n" -"Secure WebDAV (HTTPS)\n" -"Custom Location" -msgstr "" -"Sikker FTP (SSH)\n" -"Offentlig FTP\n" -"FTP (med logind)\n" -"Windowsdeling\n" -"WebDAV (HTTP)\n" -"Sikker WebDAV (HTTPS)\n" -"Brugerdefineret sted" +#: ../smime/gui/smime-ui.glade.h:3 +msgid "Certificate Hierarchy" +msgstr "Certifikat-hierarki" -#: ../plugins/publish-calendar/publish-calendar.glade.h:20 -msgid "Service _type:" -msgstr "Tjeneste_type:" +#: ../smime/gui/smime-ui.glade.h:4 +msgid "Field Value" +msgstr "Feltværdi" -#: ../plugins/publish-calendar/publish-calendar.glade.h:22 -msgid "_File:" -msgstr "_Fil:" +#: ../smime/gui/smime-ui.glade.h:5 +msgid "Fingerprints" +msgstr "Fingeraftryk" -#: ../plugins/publish-calendar/publish-calendar.glade.h:23 -msgid "_Password:" -msgstr "_Adgangskode:" +#: ../smime/gui/smime-ui.glade.h:6 +msgid "Issued By" +msgstr "Udstedt af" -#: ../plugins/publish-calendar/publish-calendar.glade.h:24 -msgid "_Publish as:" -msgstr "_Offentliggør som:" +#: ../smime/gui/smime-ui.glade.h:7 +msgid "Issued To" +msgstr "Udstedt til" -#: ../plugins/publish-calendar/publish-calendar.glade.h:25 -msgid "_Remember password" -msgstr "_Husk adgangskode" +#: ../smime/gui/smime-ui.glade.h:8 +msgid "This certificate has been verified for the following uses:" +msgstr "Dette certifikat er verificeret til følgende brug:" -#: ../plugins/publish-calendar/publish-calendar.glade.h:27 -msgid "_Username:" -msgstr "_Brugernavn:" +#: ../smime/gui/smime-ui.glade.h:9 +msgid "Validity" +msgstr "Gyldighed" -#: ../plugins/publish-calendar/publish-calendar.glade.h:28 +#: ../smime/gui/smime-ui.glade.h:10 +msgid "Authorities" +msgstr "Myndigheder" + +#: ../smime/gui/smime-ui.glade.h:11 +msgid "Backup" +msgstr "Tag sikkerhedskopi" + +#: ../smime/gui/smime-ui.glade.h:12 +msgid "Backup All" +msgstr "Sikkerhedskopiér alle" + +#: ../smime/gui/smime-ui.glade.h:13 msgid "" -"iCal\n" -"Free/Busy" +"Before trusting this CA for any purpose, you should examine its certificate " +"and its policy and procedures (if available)." msgstr "" -"iCal\n" -"Ledig/optaget" +"Før du stoler på denne CA til noget formål, bør du undersøge dens " +"certifikat, regelsæt og procedurer (hvis de er tilgængelige)." -#: ../plugins/publish-calendar/url-editor-dialog.c:461 -msgid "New Location" -msgstr "Nyt sted" +#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060 +msgid "Certificate" +msgstr "Certifikat" -#: ../plugins/publish-calendar/url-editor-dialog.c:463 -msgid "Edit Location" -msgstr "Redigér sted" +#: ../smime/gui/smime-ui.glade.h:15 +msgid "Certificate Authority Trust" +msgstr "Troværdighed for certificeringsmyndighed" -#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1 -msgid "Hello Python" -msgstr "Hej Python" +#: ../smime/gui/smime-ui.glade.h:16 +msgid "Certificate details" +msgstr "Certifikat-detaljer" -#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2 -msgid "Python Plugin Loader tests" -msgstr "Test af indlæsningsinstans af Python-udvidelsesmoduler" +#: ../smime/gui/smime-ui.glade.h:17 +msgid "Certificates Table" +msgstr "Certifikat-tabel" -#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1 -msgid "Python Test Plugin" -msgstr "Python-testudvidelsesmodul" +#: ../smime/gui/smime-ui.glade.h:18 +msgid "Common Name (CN)" +msgstr "Normalt navn (CN)" -#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2 -msgid "Test Plugin for Python EPlugin loader." -msgstr "" -"Testudvidelsesmodul for indlæsningsinstans af PythonEUdvidelsesmoduler " -"(EPlugin)." +#: ../smime/gui/smime-ui.glade.h:19 +msgid "Contact Certificates" +msgstr "Kontaktpersoners certifikater" -#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1 -msgid "A plugin which loads other plugins written using Python." -msgstr "" -"Et udvidelsesmodul som indlæser andre udvidelsesmoduler, som er skrevet i " -"Python." +#: ../smime/gui/smime-ui.glade.h:21 +msgid "Do not trust the authenticity of this certificate" +msgstr "Stol ikke på at dette certifikat er autentisk" -#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2 -msgid "Python Loader" -msgstr "Python-indlæsningsinstans" +#: ../smime/gui/smime-ui.glade.h:22 +msgid "Dummy window only" +msgstr "Kun attrapvindue" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:107 -msgid "SpamAssassin (built-in)" -msgstr "SpamAssassin (indbygget)" +#: ../smime/gui/smime-ui.glade.h:23 +msgid "Edit" +msgstr "Ret" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:133 -#, c-format -msgid "SpamAssassin not found, code: %d" -msgstr "SpamAssassin ikke fundet, kode: %d" +#: ../smime/gui/smime-ui.glade.h:24 +msgid "Email Certificate Trust Settings" +msgstr "Opsætning af troværdighed for e-post-certifikat" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:141 -#: ../plugins/sa-junk-plugin/em-junk-filter.c:149 -#, c-format -msgid "Failed to create pipe: %s" -msgstr "Kunne ikke danne rør: %s" +#: ../smime/gui/smime-ui.glade.h:25 +msgid "Email Recipient Certificate" +msgstr "Certifikat for e-post-modtager" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:188 -#, c-format -msgid "Error after fork: %s" -msgstr "Fejl efter forgrening: %s" +#: ../smime/gui/smime-ui.glade.h:26 +msgid "Email Signer Certificate" +msgstr "Certifikat for indehaver af e-post-signatur" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:243 -#, c-format -msgid "SpamAssassin child process does not respond, killing..." -msgstr "SpamAssassin-underproces svarer ikke, afslutter den..." +#: ../smime/gui/smime-ui.glade.h:27 +msgid "Expires On" +msgstr "Udløber den" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:245 -#, c-format -msgid "Wait for SpamAssassin child process interrupted, terminating..." -msgstr "Venten på SpamAssassin-underproces afbrudt, afslutter den..." +#: ../smime/gui/smime-ui.glade.h:29 +msgid "Import" +msgstr "Importér" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:254 -#, c-format -msgid "Pipe to SpamAssassin failed, error code: %d" -msgstr "Rør til SpamAssassin fejlede, fejlkode: %d" +#: ../smime/gui/smime-ui.glade.h:30 +msgid "Issued On" +msgstr "Udstedt den" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:497 -#, c-format -msgid "SpamAssassin is not available." -msgstr "SpamAssassin er ikke tilgængelig." +#: ../smime/gui/smime-ui.glade.h:31 +msgid "MD5 Fingerprint" +msgstr "MD5-fingeraftryk" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:864 -msgid "This will make SpamAssassin more reliable, but slower" -msgstr "Dette vil gøre SpamAssassin mere pålidelig, men langsommere" +#: ../smime/gui/smime-ui.glade.h:32 +msgid "Organization (O)" +msgstr "Organisation (O)" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:870 -msgid "I_nclude remote tests" -msgstr "_Inkludér fjerntest" +#: ../smime/gui/smime-ui.glade.h:33 +msgid "Organizational Unit (OU)" +msgstr "Organisationsenhed (OU)" -#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1 -msgid "" -"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin " -"to be installed." -msgstr "" -"Bortfiltrerer spam med SpamAssassin. Dette udvidelsesmodul kræver at " -"SpamAssassin er installeret." +#: ../smime/gui/smime-ui.glade.h:34 +msgid "SHA1 Fingerprint" +msgstr "SHA1-fingeraftryk" -#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2 -msgid "SpamAssassin Options" -msgstr "SpamAssassin-indstillinger" +#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802 +msgid "SSL Client Certificate" +msgstr "Certifikat for SSL-klient" -#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3 -msgid "SpamAssassin junk plugin" -msgstr "SpamAssassin-udvidelsesmodul til spam" +#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806 +msgid "SSL Server Certificate" +msgstr "Certifikat for SSL-server" -#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1 -msgid "A plugin for saving all attachments or parts of a message at once." -msgstr "Et udvidelsesmodul der gemmer alle bilag eller brevdele på en gang." +#: ../smime/gui/smime-ui.glade.h:38 +msgid "Trust the authenticity of this certificate" +msgstr "Stol på at dette certifikat er autentisk" -#. the path to the shared library -#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3 -#: ../plugins/save-attachments/save-attachments.c:315 -msgid "Save attachments" -msgstr "Gem bilag" +#: ../smime/gui/smime-ui.glade.h:39 +msgid "Trust this CA to identify email users." +msgstr "Stol på at denne CA kan identificere bruger af e-post." -#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1 -msgid "Save Attachments..." -msgstr "Gem bilag..." +#: ../smime/gui/smime-ui.glade.h:40 +msgid "Trust this CA to identify software developers." +msgstr "Stol på at denne CA kan identificere programmører." -#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2 -msgid "Save all attachments" -msgstr "Gem alle bilag" +#: ../smime/gui/smime-ui.glade.h:41 +msgid "Trust this CA to identify web sites." +msgstr "Stol på at denne CA kan identificere netsteder." -#: ../plugins/save-attachments/save-attachments.c:321 -msgid "Select save base name" -msgstr "Vælg basisnavn for gemning" +#: ../smime/gui/smime-ui.glade.h:42 +msgid "View" +msgstr "Vis" -#: ../plugins/save-attachments/save-attachments.c:340 -msgid "MIME Type" -msgstr "MIME-type" +#: ../smime/gui/smime-ui.glade.h:43 +msgid "You have certificates from these organizations that identify you:" +msgstr "Du har certifikater som identificerer dig fra disse organisationene:" -#: ../plugins/save-attachments/save-attachments.c:348 -msgid "Save" -msgstr "Gem" +#: ../smime/gui/smime-ui.glade.h:44 +msgid "" +"You have certificates on file that identify these certificate authorities:" +msgstr "" +"Du har certifikater på filer som identificerer disse certifikat-myndigheder:" -#. -#. * Translator: the %F %T is the thirth argument for a strftime function. -#. * It lets you define the formatting of the date in the csv-file. -#. * -#: ../plugins/save-calendar/csv-format.c:163 -msgid "%F %T" -msgstr "%d-%m-%Y %T" +#: ../smime/gui/smime-ui.glade.h:45 +msgid "You have certificates on file that identify these people:" +msgstr "Du har arkiverede certifikater som identificerer disse mennesker:" -#: ../plugins/save-calendar/csv-format.c:361 -msgid "UID" -msgstr "Bruger-id" +#: ../smime/gui/smime-ui.glade.h:46 +msgid "Your Certificates" +msgstr "Dine certifikater" -#: ../plugins/save-calendar/csv-format.c:363 -msgid "Description List" -msgstr "Beskrivelsesliste" +#: ../smime/gui/smime-ui.glade.h:47 +msgid "_Edit CA Trust" +msgstr "_Redigér troværdighed for certificeringsmyndighed" -#: ../plugins/save-calendar/csv-format.c:364 -msgid "Categories List" -msgstr "Kategoriliste" +#. XXX we shouldn't be popping up dialogs in this code. +#: ../smime/lib/e-cert-db.c:653 +msgid "Certificate already exists" +msgstr "Certifikatet findes allerede" -#: ../plugins/save-calendar/csv-format.c:365 -msgid "Comment List" -msgstr "Kommentarliste" +#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232 +msgid "%d/%m/%Y" +msgstr "%d/%m/%Y" -#: ../plugins/save-calendar/csv-format.c:367 -msgid "Created" -msgstr "Oprettet" +#. x509 certificate usage types +#: ../smime/lib/e-cert.c:408 +msgid "Sign" +msgstr "Underskriv" -#: ../plugins/save-calendar/csv-format.c:368 -msgid "Contact List" -msgstr "Liste over kontaktpersoner" +#: ../smime/lib/e-cert.c:409 +msgid "Encrypt" +msgstr "Kryptér" -#: ../plugins/save-calendar/csv-format.c:369 -msgid "Start" -msgstr "Start" +#: ../smime/lib/e-cert.c:514 +msgid "Version" +msgstr "Version" -#: ../plugins/save-calendar/csv-format.c:370 -msgid "End" -msgstr "End" +#: ../smime/lib/e-cert.c:529 +msgid "Version 1" +msgstr "Version 1" -#: ../plugins/save-calendar/csv-format.c:372 -msgid "percent Done" -msgstr "procent færdig" +#: ../smime/lib/e-cert.c:532 +msgid "Version 2" +msgstr "Version 2" -#: ../plugins/save-calendar/csv-format.c:374 -msgid "URL" -msgstr "Adresse" +#: ../smime/lib/e-cert.c:535 +msgid "Version 3" +msgstr "Version 3" -#: ../plugins/save-calendar/csv-format.c:375 -msgid "Attendees List" -msgstr "Deltagerliste" +#: ../smime/lib/e-cert.c:617 +msgid "PKCS #1 MD2 With RSA Encryption" +msgstr "PKCS #1 MD2 med RSA-kryptering" -#: ../plugins/save-calendar/csv-format.c:377 -msgid "Modified" -msgstr "Ændret" +#: ../smime/lib/e-cert.c:620 +msgid "PKCS #1 MD5 With RSA Encryption" +msgstr "PKCS #1 MD5 med RSA-kryptering" -#: ../plugins/save-calendar/csv-format.c:532 -msgid "Advanced options for the CSV format" -msgstr "Avancerede indstillinger for CSV-formatet" +#: ../smime/lib/e-cert.c:623 +msgid "PKCS #1 SHA-1 With RSA Encryption" +msgstr "PKCS #1 SHA-1 med RSA-kryptering" -#: ../plugins/save-calendar/csv-format.c:539 -msgid "Prepend a header" -msgstr "Tilføj et hoved" +#: ../smime/lib/e-cert.c:650 +msgid "PKCS #1 RSA Encryption" +msgstr "PKCS #1 RSA-kryptering" -#: ../plugins/save-calendar/csv-format.c:548 -msgid "Value delimiter:" -msgstr "Værdiadskiller:" +#: ../smime/lib/e-cert.c:653 +msgid "Certificate Key Usage" +msgstr "Certifikat-nøglebenyttelse" -#: ../plugins/save-calendar/csv-format.c:554 -msgid "Record delimiter:" -msgstr "Posteringsadskiller:" +#: ../smime/lib/e-cert.c:656 +msgid "Netscape Certificate Type" +msgstr "Netscape certifikat-type" -#: ../plugins/save-calendar/csv-format.c:560 -msgid "Encapsulate values with:" -msgstr "Indkapsl værdier med:" +#: ../smime/lib/e-cert.c:659 +msgid "Certificate Authority Key Identifier" +msgstr "Certificeringsmyndighed til nøgleidentifikation" -#: ../plugins/save-calendar/csv-format.c:582 -msgid "Comma separated value format (.csv)" -msgstr "Kommasepareret format for værdier (.csv)" +#: ../smime/lib/e-cert.c:671 +#, c-format +msgid "Object Identifier (%s)" +msgstr "Objekt-identifikation (%s)" -#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1 -msgid "Save Selected" -msgstr "Gem de markerede" +#: ../smime/lib/e-cert.c:722 +msgid "Algorithm Identifier" +msgstr "Algoritme-identifikation" -#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2 -msgid "Saves selected calendar or tasks list to disk." -msgstr "Gemmer den valgte kalender eller opgaveliste til disken." +#: ../smime/lib/e-cert.c:730 +msgid "Algorithm Parameters" +msgstr "Parametre for algoritme" -#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3 -msgid "_Save to Disk" -msgstr "Gem til _disken" +#: ../smime/lib/e-cert.c:752 +msgid "Subject Public Key Info" +msgstr "Information om emnets offentlige nøgle" -#. -#. * Translator: the %FT%T is the thirth argument for a strftime function. -#. * It lets you define the formatting of the date in the rdf-file. -#. * Also check out http://www.w3.org/2002/12/cal/tzd -#. * -#: ../plugins/save-calendar/rdf-format.c:150 -msgid "%FT%T" -msgstr "%FT%T" +#: ../smime/lib/e-cert.c:757 +msgid "Subject Public Key Algorithm" +msgstr "Algoritme for emnets offentlige nøgle" -#: ../plugins/save-calendar/rdf-format.c:377 -msgid "RDF format (.rdf)" -msgstr "RDF-format (.rdf)" +#: ../smime/lib/e-cert.c:772 +msgid "Subject's Public Key" +msgstr "Emnets offentlige nøgle" -#: ../plugins/save-calendar/save-calendar.c:161 -msgid "Select destination file" -msgstr "Vælg en målfil" +#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842 +msgid "Error: Unable to process extension" +msgstr "Fejl: Kan ikke behandle udvidelsen" -#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1 -msgid "Select one source" -msgstr "Vælg en kilde" +#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826 +msgid "Object Signer" +msgstr "Indehaver af signatur for objekt" -#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2 -msgid "Selects a single calendar or task source for viewing." -msgstr "Vælger en enkelt kalender eller opgavekilde til visning." +#: ../smime/lib/e-cert.c:818 +msgid "SSL Certificate Authority" +msgstr "SSL-certificeringsmyndighed" -#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3 -msgid "Show _only this Calendar" -msgstr "Vis _kun denne kalender" +#: ../smime/lib/e-cert.c:822 +msgid "Email Certificate Authority" +msgstr "E-post-certificeringsmyndighed" -#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4 -msgid "Show _only this Memo List" -msgstr "Vis _kun denne huskeseddel" +#: ../smime/lib/e-cert.c:850 +msgid "Signing" +msgstr "Underskriver" -#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5 -msgid "Show _only this Task List" -msgstr "Vis _kun denne opgaveliste" +#: ../smime/lib/e-cert.c:854 +msgid "Non-repudiation" +msgstr "Ingen-tilbagevisning" -#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1 -msgid "Guides you through your initial account setup." -msgstr "Hjælper dig igennem den indledende kontoopsætning." +#: ../smime/lib/e-cert.c:858 +msgid "Key Encipherment" +msgstr "Nøgle-kodning" -#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2 -msgid "Setup Assistant" -msgstr "Opsætningsassistent" +#: ../smime/lib/e-cert.c:862 +msgid "Data Encipherment" +msgstr "Data-kodning" -#: ../plugins/startup-wizard/startup-wizard.c:85 -msgid "Evolution Setup Assistant" -msgstr "Opsætningsvejleder til Evolution" +#: ../smime/lib/e-cert.c:866 +msgid "Key Agreement" +msgstr "Nøgle-aftale" -#: ../plugins/startup-wizard/startup-wizard.c:88 -msgid "Welcome" -msgstr "Velkommen" +#: ../smime/lib/e-cert.c:870 +msgid "Certificate Signer" +msgstr "Certifikat for indehaver af signatur" -#: ../plugins/startup-wizard/startup-wizard.c:89 -msgid "" -"Welcome to Evolution. The next few screens will allow Evolution to connect " -"to your email accounts, and to import files from other applications. \n" -"\n" -"Please click the \"Forward\" button to continue. " -msgstr "" -"Velkommen til Evolution. De næste skærme lader dig\n" -"konfigurere Evolution til at forbinde til dine e-post-konti, og\n" -"importere filer fra andre applikationer. \n" -"\n" -"Klík venligst på knappen \"Næste\" for at fortsætte. " +#: ../smime/lib/e-cert.c:874 +msgid "CRL Signer" +msgstr "Indehaver af CRL-signatur" -#: ../plugins/startup-wizard/startup-wizard.c:135 -msgid "Importing files" -msgstr "Importér filer" +#: ../smime/lib/e-cert.c:922 +msgid "Critical" +msgstr "Kritisk" -#: ../plugins/startup-wizard/startup-wizard.c:137 -#: ../shell/e-shell-importer.c:141 -msgid "Please select the information that you would like to import:" -msgstr "Venligst vælg information du ønsker at importere:" +#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927 +msgid "Not Critical" +msgstr "Ukritisk" -#: ../plugins/startup-wizard/startup-wizard.c:152 -#: ../shell/e-shell-importer.c:394 -#, c-format -msgid "From %s:" -msgstr "Fra %s:" +#: ../smime/lib/e-cert.c:948 +msgid "Extensions" +msgstr "Udvidelser" -#: ../plugins/startup-wizard/startup-wizard.c:232 -#: ../shell/e-shell-importer.c:505 +#: ../smime/lib/e-cert.c:1019 #, c-format -msgid "Importing data." -msgstr "Importerer data." +msgid "%s = %s" +msgstr "%s = %s" -#: ../plugins/startup-wizard/startup-wizard.c:234 -#: ../shell/e-shell-importer.c:519 -msgid "Please wait" -msgstr "Vent venligst" +#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195 +msgid "Certificate Signature Algorithm" +msgstr "Certifikat-signaturalgoritme" -#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1 -msgid "Indicates if threading of messages should fall back to subject." -msgstr "Indikerer om trådning af breve, skal falde tilbage på emne." +#: ../smime/lib/e-cert.c:1084 +msgid "Issuer" +msgstr "Udsteder" -#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2 -msgid "Subject Threading" -msgstr "Trådning baseret på emne" +#: ../smime/lib/e-cert.c:1138 +msgid "Issuer Unique ID" +msgstr "Unik id for udsteder" -#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3 -msgid "Thread messages by subject" -msgstr "Trådning af breve baseret på emne" +#: ../smime/lib/e-cert.c:1157 +msgid "Subject Unique ID" +msgstr "Emnets entydige id" -#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog -#: ../plugins/subject-thread/subject-thread.c:56 -msgid "F_all back to threading messages by subject" -msgstr "G_å tilbage til at vise breve trådet efter emne" +#: ../smime/lib/e-cert.c:1200 +msgid "Certificate Signature Value" +msgstr "Certifikat-signaturværdi" -#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1 -msgid "" -"List of keyword/value pairs for the Templates plugin to substitute in a " -"message body." -msgstr "" -"Liste af nøgleord/værdi-par som skabelonudvidelsesmodulet kan substituere " -"ind i en brevkrop." +#: ../smime/lib/e-pkcs12.c:249 +msgid "PKCS12 File Password" +msgstr "Adgangskode for PKCS12-fil" -#: ../plugins/templates/templates.c:603 -msgid "No title" -msgstr "Ingen titel" +#: ../smime/lib/e-pkcs12.c:249 +msgid "Enter password for PKCS12 file:" +msgstr "Indtast adgangskode for PKCS12-filen:" -#: ../plugins/templates/templates.c:711 -msgid "Save as _Template" -msgstr "Gem som _skabelon" +#: ../smime/lib/e-pkcs12.c:348 +msgid "Imported Certificate" +msgstr "Importeret certifikat" -#: ../plugins/templates/templates.c:713 -msgid "Save as Template" -msgstr "Gem som skabelon" +#. This most likely means that KILL_PROCESS_CMD wasn't +#. * found, so just bail completely. +#. +#: ../tools/killev.c:61 +#, c-format +msgid "Could not execute '%s': %s\n" +msgstr "Kunne ikke udføre \"%s\": %s\n" -#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1 -msgid "Drafts based template plugin" -msgstr "Kladdebaseret skabelonudvidelsesmodul" +#: ../tools/killev.c:76 +#, c-format +msgid "Shutting down %s (%s)\n" +msgstr "Lukker %s (%s) ned\n" -#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1 -msgid "A simple plugin which uses yTNEF to decode TNEF attachments." -msgstr "Et simpelt udvidelsesmodul som bruger yTNEF til at afkode TNEF-bilag." +#: ../ui/evolution-addressbook.xml.h:1 +msgid "Address _Book Properties" +msgstr "Egenskaber for adresse_bog" -#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2 -msgid "TNEF Attachment decoder" -msgstr "TNEF bilagsafkoder" +#: ../ui/evolution-addressbook.xml.h:3 +msgid "Change the properties of the selected folder" +msgstr "Ret egenskaber for den valgte mappe" -#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1 -msgid "A plugin to setup WebDAV contacts." -msgstr "Et udvidelsesmodul til opsætning af WebDAV-kontaktpersoner." +#: ../ui/evolution-addressbook.xml.h:4 +msgid "Co_py All Contacts To..." +msgstr "_Kopiér alle kontaktpersoner til..." -#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2 -msgid "WebDAV contacts" -msgstr "WebDAV-kontaktpersoner" +#: ../ui/evolution-addressbook.xml.h:5 +msgid "Contact _Preview" +msgstr "_Vis udskrift af kontaktperson" -#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96 -#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107 -msgid "WebDAV" -msgstr "WebDAV" +#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2 +#: ../ui/evolution-tasks.xml.h:2 +msgid "Copy" +msgstr "Kopiér" -#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336 -msgid "URL:" -msgstr "URL:" +#: ../ui/evolution-addressbook.xml.h:7 +msgid "Copy selected contacts to another folder" +msgstr "Kopiér de valgte kontaktpersoner til en anden mappe" -#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363 -msgid "_Avoid IfMatch (needed on Apache < 2.2.8)" -msgstr "_Undgå IfMatch (påkrævet i Apache < 2.2.8)" +#: ../ui/evolution-addressbook.xml.h:8 +msgid "Copy the contacts of the selected folder into another folder" +msgstr "Kopiér kontaktpersonerne i den valgte mappe til en anden mappe" -#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1 -msgid "Evolution Shell" -msgstr "Evolutions kommandoskal" +#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2 +msgid "Copy the selection" +msgstr "Kopier det valgte" -#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2 -msgid "Evolution Shell Config factory" -msgstr "Funktion til opsætning af Evolutions kommandoskal" +#: ../ui/evolution-addressbook.xml.h:10 +msgid "Copy to Folder..." +msgstr "Kopiér til mappe..." -#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1 -msgid "Evolution Test" -msgstr "Evolution-test" +#: ../ui/evolution-addressbook.xml.h:11 +msgid "Create a new address book folder" +msgstr "Opret en ny mappe til adressebøger" -#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2 -msgid "Evolution Test component" -msgstr "Evolutions testkomponent" +#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4 +#: ../ui/evolution-tasks.xml.h:4 +msgid "Cut" +msgstr "Klip" -#: ../shell/apps_evolution_shell.schemas.in.h:1 -msgid "Authenticate proxy server connections" -msgstr "Godkend proxyserverforbindelse" +#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3 +msgid "Cut the selection" +msgstr "Klip det markerede ud" -#: ../shell/apps_evolution_shell.schemas.in.h:2 -msgid "Automatic proxy configuration URL" -msgstr "URL til automatisk proxykonfiguration" +#: ../ui/evolution-addressbook.xml.h:14 +msgid "Del_ete Address Book" +msgstr "Sl_et adressebog" -#: ../shell/apps_evolution_shell.schemas.in.h:3 -msgid "Configuration version" -msgstr "Konfigurationsversion" +#: ../ui/evolution-addressbook.xml.h:16 +msgid "Delete selected contacts" +msgstr "Slet de valgte kontaktpersoner" -#: ../shell/apps_evolution_shell.schemas.in.h:4 -msgid "Default sidebar width" -msgstr "Standardbredde på sidepanel" +#: ../ui/evolution-addressbook.xml.h:17 +msgid "Delete the selected folder" +msgstr "Slet den valgte mappe" -#: ../shell/apps_evolution_shell.schemas.in.h:5 -msgid "Default window height" -msgstr "Standardvindueshøjde" +#: ../ui/evolution-addressbook.xml.h:18 +msgid "Forward Contact" +msgstr "Videresend kontaktperson" -#: ../shell/apps_evolution_shell.schemas.in.h:6 -msgid "Default window state" -msgstr "Normal tilstand for vindue" +#: ../ui/evolution-addressbook.xml.h:19 +msgid "Mo_ve All Contacts To..." +msgstr "Fl_yt alle kontaktpersoner til..." -#: ../shell/apps_evolution_shell.schemas.in.h:7 -msgid "Default window width" -msgstr "Standardvinduesbredde" +#: ../ui/evolution-addressbook.xml.h:20 +msgid "Move selected contacts to another folder" +msgstr "Flyt de valgte kontaktpersoner til en anden mappe" -#: ../shell/apps_evolution_shell.schemas.in.h:8 -msgid "" -"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet." -msgstr "" -"Slår proxyindstillingerne til ved tilgang til HTTP/sikker HTTP over " -"internettet." +#: ../ui/evolution-addressbook.xml.h:21 +msgid "Move the contacts of the selected folder into another folder" +msgstr "Flyt kontaktpersonerne i den valgte mappe til en anden mappe" -#: ../shell/apps_evolution_shell.schemas.in.h:9 -msgid "HTTP proxy host name" -msgstr "HTTP-proxyværtsnavn" +#: ../ui/evolution-addressbook.xml.h:22 +msgid "Move to Folder..." +msgstr "Flyt til mappe..." -#: ../shell/apps_evolution_shell.schemas.in.h:10 -msgid "HTTP proxy password" -msgstr "HTTP-proxyadgangkode" +#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8 +#: ../ui/evolution-tasks.xml.h:11 +msgid "Paste" +msgstr "Indsæt" -#: ../shell/apps_evolution_shell.schemas.in.h:11 -msgid "HTTP proxy port" -msgstr "HTTP-proxyport" +#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17 +msgid "Paste the clipboard" +msgstr "Indsæt fra udklipsholderen" -#: ../shell/apps_evolution_shell.schemas.in.h:12 -msgid "HTTP proxy username" -msgstr "HTTP-proxybrugernavn" +#: ../ui/evolution-addressbook.xml.h:25 +msgid "Previews the contacts to be printed" +msgstr "Forhåndsviser kontaktpersoner som skal udskrives" -#: ../shell/apps_evolution_shell.schemas.in.h:13 -msgid "ID or alias of the component to be shown by default at start-up." -msgstr "Identifikation eller alias for komponenten der skal vises ved opstart." +#: ../ui/evolution-addressbook.xml.h:28 +msgid "Print selected contacts" +msgstr "Udskriv valgte kontaktpersoner" -#: ../shell/apps_evolution_shell.schemas.in.h:14 -msgid "" -"If true, then connections to the proxy server require authentication. The " -"username is retrieved from the \"/apps/evolution/shell/network_config/" -"authentication_user\" GConf key, and the password is retrieved from either " -"gnome-keyring or the ~/.gnome2_private/Evolution password file." -msgstr "" -"Hvis sand så vil der kræves godkendelse for forbindelsen til proxyserveren. " -"Brugernavnet hentes fra \"/apps/evolution/shell/network_config/" -"authentication_user\"-GConfnøglen og kodeordet hentes enten fra gnome-" -"keyring eller \"~/.gnome2_private/Evolution\"-kodeordsfilen." +#: ../ui/evolution-addressbook.xml.h:29 +msgid "Rename the selected folder" +msgstr "Omdøb den valgte mappe" -#: ../shell/apps_evolution_shell.schemas.in.h:15 -msgid "Last upgraded configuration version" -msgstr "Sidste opgraderet konfigurationsversion" +#: ../ui/evolution-addressbook.xml.h:30 +msgid "S_ave Address Book As VCard" +msgstr "Gem adressebog som _VCard" -#: ../shell/apps_evolution_shell.schemas.in.h:16 -msgid "" -"List of paths for the folders to be synchronized to disk for offline usage" -msgstr "" -"Liste over stier til mapper der skal synkroniseres til disken for " -"afkobletbrug" +#: ../ui/evolution-addressbook.xml.h:31 +msgid "Save as VCard..." +msgstr "Gem som VCard..." -#: ../shell/apps_evolution_shell.schemas.in.h:17 -msgid "Non-proxy hosts" -msgstr "Ikke-proxyværter" +#: ../ui/evolution-addressbook.xml.h:32 +msgid "Save selected contacts as a VCard" +msgstr "Gem de valgte kontaktpersoner som et VCard" -#: ../shell/apps_evolution_shell.schemas.in.h:18 -msgid "Password to pass as authentication when doing HTTP proxying." -msgstr "Kodeord som skal gives som godkendelse ved brug af HTTP-proxy." +#: ../ui/evolution-addressbook.xml.h:33 +msgid "Save the contacts of the selected folder as VCard" +msgstr "Gem kontaktpersonerne i den valgte mappe som et VCard" -#: ../shell/apps_evolution_shell.schemas.in.h:19 -msgid "Proxy configuration mode" -msgstr "Proxykonfigurationstilstand" +#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2725 +msgid "Select All" +msgstr "Marker alt" -#: ../shell/apps_evolution_shell.schemas.in.h:20 -msgid "SOCKS proxy host name" -msgstr "SOCKS-proxyværtsnavn" +#: ../ui/evolution-addressbook.xml.h:35 +msgid "Select _All" +msgstr "Markér _alt" -#: ../shell/apps_evolution_shell.schemas.in.h:21 -msgid "SOCKS proxy port" -msgstr "SOCKS-proxyværtport" +#: ../ui/evolution-addressbook.xml.h:36 +msgid "Select all contacts" +msgstr "Vælg alle kontaktpersoner" -#: ../shell/apps_evolution_shell.schemas.in.h:22 -msgid "Secure HTTP proxy host name" -msgstr "Sikker HTTP-proxyværtnavn" +#: ../ui/evolution-addressbook.xml.h:37 +msgid "Send a message to the selected contacts" +msgstr "Send et brev til de valgte kontaktpersoner" -#: ../shell/apps_evolution_shell.schemas.in.h:23 -msgid "Secure HTTP proxy port" -msgstr "Sikker HTTP-proxyport" +#: ../ui/evolution-addressbook.xml.h:38 +msgid "Send message to contact" +msgstr "Send brev til kontaktperson" -#: ../shell/apps_evolution_shell.schemas.in.h:24 -msgid "" -"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 " -"representing \"use system settings\", \"no proxy\", \"use manual proxy " -"configuration\" and \"use proxy configuration provided in the autoconfig url" -"\" respectively." -msgstr "" -"Vælg proxykonfigurationstilstanden. Understøttede værdier er 0, 1, 2 og 3 " -"som respektivt repræsenterer \"brug systemindstillinger\", \"ingen proxy\", " -"\"brug manuel proxykonfiguration\" og \"brug proxykonfiguration som er givet " -"i autoconfig-URL'en\"." +#: ../ui/evolution-addressbook.xml.h:39 +msgid "Send selected contacts to another person" +msgstr "Send valgte kontaktpersoner til en anden person" -#: ../shell/apps_evolution_shell.schemas.in.h:25 -msgid "Sidebar is visible" -msgstr "Sidepanel er synlig" +#: ../ui/evolution-addressbook.xml.h:40 +msgid "Show contact preview window" +msgstr "Vis vinduet med forhåndsvisning af kontaktperson" -#: ../shell/apps_evolution_shell.schemas.in.h:26 -msgid "Skip development warning dialog" -msgstr "Spring advarselsvinduet for udviklingsversionen over" +#: ../ui/evolution-addressbook.xml.h:41 +msgid "St_op" +msgstr "St_op" -#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483 -msgid "Start in offline mode" -msgstr "Start i afkoblet tilstand" +#: ../ui/evolution-addressbook.xml.h:42 +msgid "Stop" +msgstr "Stop" -#: ../shell/apps_evolution_shell.schemas.in.h:28 -msgid "Statusbar is visible" -msgstr "Statuslinjen er synlig" +#: ../ui/evolution-addressbook.xml.h:43 +msgid "Stop Loading" +msgstr "Stop indlæsning" -#: ../shell/apps_evolution_shell.schemas.in.h:29 -msgid "" -"The configuration version of Evolution, with major/minor/configuration level " -"(for example \"2.6.0\")." -msgstr "" -"Konfigurationsversionen for Evolution, med hovednummer/undernummer/" -"konfigurationsniveau (f.eks. \"2.6.0\")." +#: ../ui/evolution-addressbook.xml.h:44 +msgid "View the current contact" +msgstr "Vis den aktuelle kontaktperson" -#: ../shell/apps_evolution_shell.schemas.in.h:30 -msgid "The default height for the main window, in pixels." -msgstr "Standardhøjden på hovedvinduet, i billedpunkter." +#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39 +#: ../ui/evolution-tasks.xml.h:21 +msgid "_Actions" +msgstr "H_andlinger" -#: ../shell/apps_evolution_shell.schemas.in.h:31 -msgid "The default width for the main window, in pixels." -msgstr "Standardbredden på hovedvinduet, i billedpunkter." +#: ../ui/evolution-addressbook.xml.h:47 +msgid "_Copy Contact to..." +msgstr "Kopiér _kontaktperson til..." -#: ../shell/apps_evolution_shell.schemas.in.h:32 -msgid "The default width for the sidebar, in pixels." -msgstr "Standardbredden på sidepanelet, i billedpunkter." +#: ../ui/evolution-addressbook.xml.h:48 +msgid "_Copy Folder Contacts To" +msgstr "_Kopiér kontaktpersoner i mappe til" -#: ../shell/apps_evolution_shell.schemas.in.h:33 -msgid "" -"The last upgraded configuration version of Evolution, with major/minor/" -"configuration level (for example \"2.6.0\")." -msgstr "" -"Den sidst opgraderede konfigurationsversion for Evolution, med hovednummer/" -"undernummer/konfigurationsniveau (f.eks. \"2.6.0\")." +#: ../ui/evolution-addressbook.xml.h:50 +msgid "_Delete Contact" +msgstr "_Slet kontaktperson" -#: ../shell/apps_evolution_shell.schemas.in.h:34 -msgid "The machine name to proxy HTTP through." -msgstr "Navnet på maskinen, der fungerer som HTTP-proxy." +#: ../ui/evolution-addressbook.xml.h:52 +msgid "_Forward Contact..." +msgstr "_Videresend kontaktperson..." -#: ../shell/apps_evolution_shell.schemas.in.h:35 -msgid "The machine name to proxy secure HTTP through." -msgstr "Navnet på maskinen, der fungerer som sikker HTTP-proxy." +#: ../ui/evolution-addressbook.xml.h:53 +msgid "_Move Contact to..." +msgstr "_Flyt kontaktperson til..." -#: ../shell/apps_evolution_shell.schemas.in.h:36 -msgid "The machine name to proxy socks through." -msgstr "Navnet på maskinen, der fungerer som socks-proxy." +#: ../ui/evolution-addressbook.xml.h:54 +msgid "_Move Folder Contacts To" +msgstr "_Flyt kontaktpersoner i mappe til" -#: ../shell/apps_evolution_shell.schemas.in.h:37 -msgid "" -"The port on the machine defined by \"/apps/evolution/shell/network_config/" -"http_host\" that you proxy through." -msgstr "" -"Porten på maskinen, defineret ved \"/apps/evolution/shell/network_config/" -"http_host\", der fungerer som proxy." +#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49 +msgid "_New" +msgstr "_Ny" -#: ../shell/apps_evolution_shell.schemas.in.h:38 -msgid "" -"The port on the machine defined by \"/apps/evolution/shell/network_config/" -"secure_host\" that you proxy through." -msgstr "" -"Porten på maskinen, defineret ved \"/apps/evolution/shell/network_config/" -"secure_host\", der fungerer som proxy." +#: ../ui/evolution-addressbook.xml.h:60 +msgid "_Rename" +msgstr "_Omdøb" -#: ../shell/apps_evolution_shell.schemas.in.h:39 -msgid "" -"The port on the machine defined by \"/apps/evolution/shell/network_config/" -"socks_host\" that you proxy through." -msgstr "" -"Porten på maskinen, defineret ved \"/apps/evolution/shell/network_config/" -"socks_host\", der fungerer som proxy." +#: ../ui/evolution-addressbook.xml.h:61 +msgid "_Save Contact as VCard..." +msgstr "_Gem kontaktperson som visitkort..." -#: ../shell/apps_evolution_shell.schemas.in.h:40 -msgid "" -"The style of the window buttons. Can be \"text\", \"icons\", \"both\", " -"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined " -"by the GNOME toolbar setting." -msgstr "" -"Stilen for vindueknapperne. Kan være \"text\", \"icons\", \"both\", \"toolbar" -"\". Hvis \"toolbar\" er sat, vil knappernes stil blive afgjort af " -"indstillingerne for Gnomes værktøjslinje." +#: ../ui/evolution-addressbook.xml.h:62 +msgid "_Save Folder Contacts As VCard" +msgstr "_Gem kontaktpersoner i mappe som visitkort" -#: ../shell/apps_evolution_shell.schemas.in.h:41 -msgid "" -"This key contains a list of hosts which are connected to directly, rather " -"than via the proxy (if it is active). The values can be hostnames, domains " -"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and " -"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)." -msgstr "" -"Denne nøgle indeholder en liste af værter som der forbindes til direkte, i " -"stedet for via proxy (hvis den er aktiv). Værdierne kan være værtsnavne, " -"domæner (ved brug af en asterisk som i *.foo.com), IP-værtsadresser (både " -"IPv4 og IPv6) og netværksadresser med en netmaske (sådan noget som " -"192.168.0.0/24)." +#: ../ui/evolution-addressbook.xml.h:63 +msgid "_Send Message to Contact..." +msgstr "_Send brev til kontaktperson..." -#: ../shell/apps_evolution_shell.schemas.in.h:42 -msgid "Toolbar is visible" -msgstr "Værktøjslinjen er synlig" +#: ../ui/evolution-calendar.xml.h:4 +msgid "Day" +msgstr "Dag" -#: ../shell/apps_evolution_shell.schemas.in.h:43 -msgid "URL that provides proxy configuration values." -msgstr "URL som giver proxykonfigurationsværdier." +#: ../ui/evolution-calendar.xml.h:6 +msgid "Delete _all Occurrences" +msgstr "Slet _alle forekomster" -#: ../shell/apps_evolution_shell.schemas.in.h:44 -msgid "Use HTTP proxy" -msgstr "Brug HTTP-proxy" +#: ../ui/evolution-calendar.xml.h:7 +msgid "Delete all occurrences" +msgstr "Slet alle forekomster" -#: ../shell/apps_evolution_shell.schemas.in.h:45 -msgid "User name to pass as authentication when doing HTTP proxying." -msgstr "Brugernavn som skal gives som godkendelse ved brug af HTTP-proxy." +#: ../ui/evolution-calendar.xml.h:8 +msgid "Delete the appointment" +msgstr "Slet aftalen" -#: ../shell/apps_evolution_shell.schemas.in.h:46 -msgid "Whether Evolution will start up in offline mode instead of online mode." -msgstr "" -"Om Evolution starter i afkoblet tilstand istedet for opkoblet tilstand." +#: ../ui/evolution-calendar.xml.h:10 +msgid "Delete this occurrence" +msgstr "Slet denne hændelse" -#: ../shell/apps_evolution_shell.schemas.in.h:47 -msgid "Whether or not the window should be maximized." -msgstr "Vælg om vinduet skal være maksimeret." +#: ../ui/evolution-calendar.xml.h:11 +msgid "Go To" +msgstr "Gå til" -#: ../shell/apps_evolution_shell.schemas.in.h:48 -msgid "Whether the sidebar should be visible." -msgstr "Vælg om sidepanelet skal være synligt." +#: ../ui/evolution-calendar.xml.h:12 +msgid "Go back" +msgstr "Gå tilbage" -#: ../shell/apps_evolution_shell.schemas.in.h:49 -msgid "Whether the status bar should be visible." -msgstr "Vælg om statuslinjen skal være synlig." +#: ../ui/evolution-calendar.xml.h:13 +msgid "Go forward" +msgstr "Gå fremad" -#: ../shell/apps_evolution_shell.schemas.in.h:50 -msgid "Whether the toolbar should be visible." -msgstr "Vælg om værktøjslinjen skal være synlig." +#: ../ui/evolution-calendar.xml.h:14 +msgid "List" +msgstr "Liste" -#: ../shell/apps_evolution_shell.schemas.in.h:51 -msgid "" -"Whether the warning dialog in development versions of Evolution is skipped." -msgstr "" -"Vælg om advarselsvinduet i udviklingsversionen af Evolution springes over." +#: ../ui/evolution-calendar.xml.h:15 +msgid "Month" +msgstr "Måned" -#: ../shell/apps_evolution_shell.schemas.in.h:52 -msgid "Whether the window buttons should be visible." -msgstr "Vælg om vinduesknapperne skal være synlige." +#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58 +#: ../widgets/misc/e-calendar.c:195 +msgid "Next" +msgstr "Næste" -#: ../shell/apps_evolution_shell.schemas.in.h:53 -msgid "Window button style" -msgstr "Vinduesknap-stil" +#: ../ui/evolution-calendar.xml.h:18 +msgid "Previews the calendar to be printed" +msgstr "Forhåndsviser kalenderen som skal skrives ud" -#: ../shell/apps_evolution_shell.schemas.in.h:54 -msgid "Window buttons are visible" -msgstr "Vinduesknapper er synlige" +#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70 +#: ../widgets/misc/e-calendar.c:171 +msgid "Previous" +msgstr "Forrige" -#: ../shell/e-active-connection-dialog.glade.h:1 -msgid "Active Connections" -msgstr "Aktive forbindelser" +#: ../ui/evolution-calendar.xml.h:22 +msgid "Print this calendar" +msgstr "Udskriv denne kalender" -#: ../shell/e-active-connection-dialog.glade.h:2 -msgid "Active Connections" -msgstr "Aktive opkoblinger" +#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17 +msgid "Purg_e" +msgstr "_Fjern" -#: ../shell/e-active-connection-dialog.glade.h:3 -msgid "Click OK to close these connections and go offline" -msgstr "Klik o.k. for at lukke disse forbindelser og gå afkoblet" +#: ../ui/evolution-calendar.xml.h:24 +msgid "Purge old appointments and meetings" +msgstr "Fjern gamle aftaler og møder" -#: ../shell/e-shell-importer.c:131 -msgid "Choose the type of importer to run:" -msgstr "Vælg type importerer som skal køres:" +#: ../ui/evolution-calendar.xml.h:25 +msgid "Select _Date" +msgstr "Vælg _dato" -#: ../shell/e-shell-importer.c:134 -msgid "" -"Choose the file that you want to import into Evolution, and select what type " -"of file it is from the list." -msgstr "" -"Vælg filen du ønsker at importere i Evolution, og vælg hvilken type fil det " -"er fra listen." +#: ../ui/evolution-calendar.xml.h:26 +msgid "Select _Today" +msgstr "Vælg _dagen i dag" -#: ../shell/e-shell-importer.c:138 -msgid "Choose the destination for this import" -msgstr "Vælg målet for denne importering" +#: ../ui/evolution-calendar.xml.h:27 +msgid "Select a specific date" +msgstr "Vælg en specifik dato" -#: ../shell/e-shell-importer.c:144 -msgid "" -"Evolution checked for settings to import from the following\n" -"applications: Pine, Netscape, Elm, iCalendar. No importable\n" -"settings found. If you would like to\n" -"try again, please click the \"Back\" button.\n" -msgstr "" -"Evolution undersøgte om indstillinger kunne importeres fra\n" -"følgende programmer: Pine, Netscape, Elm og iCalendar.\n" -"Ingen indstillinger som kunne importeres blev fundet.\n" -"Hvis du vil prøve igen kan du klikke på \"Tilbage\"-knappen.\n" +#: ../ui/evolution-calendar.xml.h:28 +msgid "Select today" +msgstr "Vælg dagen i dag" -#: ../shell/e-shell-importer.c:282 -msgid "F_ilename:" -msgstr "_Filnavn:" +#: ../ui/evolution-calendar.xml.h:29 +msgid "Show as list" +msgstr "Vis som liste" -#: ../shell/e-shell-importer.c:287 -msgid "Select a file" -msgstr "Vælg en fil" +#: ../ui/evolution-calendar.xml.h:30 +msgid "Show one day" +msgstr "Vis en dag" -#: ../shell/e-shell-importer.c:296 -msgid "File _type:" -msgstr "Fil_type:" +#: ../ui/evolution-calendar.xml.h:31 +msgid "Show one month" +msgstr "Vis en måned" -#: ../shell/e-shell-importer.c:332 -msgid "Import data and settings from _older programs" -msgstr "Importer data og indstillinger fra _ældre programmer" +#: ../ui/evolution-calendar.xml.h:32 +msgid "Show one week" +msgstr "Vis en uge" -#: ../shell/e-shell-importer.c:335 -msgid "Import a _single file" -msgstr "Importer en _enkelt fil" +#: ../ui/evolution-calendar.xml.h:33 +msgid "Show the working week" +msgstr "Vis arbejdsugen" -#: ../shell/e-shell-settings-dialog.c:313 -msgid "Evolution Preferences" -msgstr "Evolution-indstillinger" +#: ../ui/evolution-calendar.xml.h:35 +msgid "View the current appointment" +msgstr "Vis den aktuelle aftale" -#. To translators: This is the window title and %s is the -#. component name. Most translators will want to keep it as is. -#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328 -#, c-format -msgid "%s - Evolution" -msgstr "%s - Evolution" +#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19 +msgid "View the debug console for log messages" +msgstr "Kig i fejlfindings-konsollen for at se logbeskeder" -#: ../shell/e-shell-window-commands.c:75 -msgid "The GNOME Pilot tools do not appear to be installed on this system." -msgstr "" -"GNOMEs pilotværktøjer ser ikke ud til at være installeret på dette system." +#: ../ui/evolution-calendar.xml.h:37 +msgid "Week" +msgstr "Uge" -#: ../shell/e-shell-window-commands.c:83 -#, c-format -msgid "Error executing %s." -msgstr "Fejl under kørsel af %s." +#: ../ui/evolution-calendar.xml.h:38 +msgid "Work Week" +msgstr "Arbejdsuge" -#: ../shell/e-shell-window-commands.c:139 -msgid "Bug buddy is not installed." -msgstr "Bug buddy er ikke installeret." +#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22 +msgid "_Debug Logs" +msgstr "_Fejlfindingslogge" -#: ../shell/e-shell-window-commands.c:142 -msgid "Bug buddy could not be run." -msgstr "Bug buddy kunne ikke køres." +#: ../ui/evolution-calendar.xml.h:45 +msgid "_Open Appointment" +msgstr "_Åbn aftale" -#. The translator-credits string is for translators to list -#. * per-language credits for translation, displayed in the -#. * about dialog. -#: ../shell/e-shell-window-commands.c:942 -msgid "translator-credits" -msgstr "" -"Anna Jonna Armannsdottir\n" -"Keld Simonsen\n" -"Kenneth Christiansen\n" -"Kjartan Maraas\n" -"Martin Willemoes Hansen\n" -"Rasmus Ory Nielsen\n" -"Søren Boll Overgaard\n" -"Marie Lund\n" -"Ole Laursen\n" -"Morten Bo Johansen\n" -"Peter Bach\n" -"Kenneth Nielsen\n" -"\n" -"Dansk-gruppen \n" -"Mere info: http://www.dansk-gruppen.dk" +#: ../ui/evolution-mail-global.xml.h:2 +msgid "Cancel the current mail operation" +msgstr "Afbryd igangværende handling" -#: ../shell/e-shell-window-commands.c:953 -msgid "Evolution Website" -msgstr "Evolutions webside" +#: ../ui/evolution-mail-global.xml.h:3 +msgid "Copy the selected folder into another folder" +msgstr "Kopiér den valgte mappe til en anden mappe" -#: ../shell/e-shell-window-commands.c:1170 -msgid "_Work Online" -msgstr "_Arbejd opkoblet" +#: ../ui/evolution-mail-global.xml.h:4 +msgid "Create a new folder for storing mail" +msgstr "Opret en ny mappe til at gemme post i" -#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57 -msgid "_Work Offline" -msgstr "Ar_bejd afkoblet" +#: ../ui/evolution-mail-global.xml.h:5 +msgid "Create or edit Search Folder definitions" +msgstr "Opret eller redigér definitioner af søgemapper" -#: ../shell/e-shell-window-commands.c:1196 -msgid "Work Offline" -msgstr "Arbejd afkoblet" +#: ../ui/evolution-mail-global.xml.h:6 +msgid "Create or edit rules for filtering new mail" +msgstr "Opret eller redigér regler for filtrering af ny e-post" -#: ../shell/e-shell-window.c:377 -msgid "" -"Evolution is currently online.\n" -"Click on this button to work offline." +#: ../ui/evolution-mail-global.xml.h:7 +msgid "Download messages of accounts/folders marked for offline" msgstr "" -"Evolution er nu opkoblet.\n" -"Klik på denne knap for at arbejde afkoblet." - -#: ../shell/e-shell-window.c:384 -msgid "Evolution is in the process of going offline." -msgstr "Evolution er i færd med at afkoble." +"Hent breve ned til de mapper der er markeret til brug i afkoblet tilstand" -#: ../shell/e-shell-window.c:391 -msgid "" -"Evolution is currently offline.\n" -"Click on this button to work online." -msgstr "" -"Evolution er nu afkoblet.\n" -"Klik på denne knap for at arbejde opkoblet." +#: ../ui/evolution-mail-global.xml.h:8 +msgid "Empty _Trash" +msgstr "_Tøm affaldskurven" -#: ../shell/e-shell-window.c:787 -#, c-format -msgid "Switch to %s" -msgstr "Skift til %s" +#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11 +msgid "F_older" +msgstr "M_appe" -#: ../shell/e-shell.c:640 -msgid "Unknown system error." -msgstr "Ukendt systemfejl." +#: ../ui/evolution-mail-global.xml.h:10 +msgid "Move the selected folder into another folder" +msgstr "Flyt den valgte mappe til en anden mappe" -#: ../shell/e-shell.c:838 ../shell/e-shell.c:839 -#, c-format -msgid "%ld KB" -msgstr "%ld kB" +#. Alphabetical by name, yo +#: ../ui/evolution-mail-global.xml.h:12 +msgid "Permanently remove all deleted messages from all folders" +msgstr "Fjern alle slettede breve permanent fra alle mapper" -#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313 -msgid "OK" -msgstr "O.k." +#: ../ui/evolution-mail-global.xml.h:13 +msgid "Search F_olders" +msgstr "Søg _mapper" -#: ../shell/e-shell.c:1263 -msgid "Invalid arguments" -msgstr "Ugyldige argumenter" +#: ../ui/evolution-mail-global.xml.h:14 +msgid "Show Message _Preview" +msgstr "_Vis brev" -#: ../shell/e-shell.c:1265 -msgid "Cannot register on OAF" -msgstr "Kan ikke registrere i OAF" +#: ../ui/evolution-mail-global.xml.h:15 +msgid "Show message preview below the message list" +msgstr "Vis brevets indhold nedenunder brevindekset" -#: ../shell/e-shell.c:1267 -msgid "Configuration Database not found" -msgstr "Konfigurationsdatabase ikke fundet" +#: ../ui/evolution-mail-global.xml.h:16 +msgid "Show message preview side-by-side with the message list" +msgstr "Vis brevindhold side om side med brevindeks" -#: ../shell/e-user-creatable-items-handler.c:678 -#: ../shell/e-user-creatable-items-handler.c:688 -#: ../shell/e-user-creatable-items-handler.c:693 -msgid "New" -msgstr "Nye" +#: ../ui/evolution-mail-global.xml.h:17 +msgid "Show message preview window" +msgstr "Vis vindue med brevindhold" -#: ../shell/test/evolution-test-component.c:105 -msgid "New Test" -msgstr "Ny test" +#: ../ui/evolution-mail-global.xml.h:18 +msgid "Subscribe or unsubscribe to folders on remote servers" +msgstr "Abonnér eller fjern abonnement på mapper på eksterne servere" -#: ../shell/test/evolution-test-component.c:107 -msgid "Create a new test item" -msgstr "Opret et nyt testelement" +#: ../ui/evolution-mail-global.xml.h:20 +msgid "_Classic View" +msgstr "K_lassisk oversigt" -#: ../shell/import.glade.h:1 -msgid "Click \"Import\" to begin importing the file into Evolution. " -msgstr "Klik \"Importér\" for at starte import af filen til Evolution. " +#: ../ui/evolution-mail-global.xml.h:21 +msgid "_Copy Folder To..." +msgstr "_Kopiér mappe til..." -#: ../shell/import.glade.h:2 -msgid "Evolution Import Assistant" -msgstr "Import-vejleder til Evolution" +#: ../ui/evolution-mail-global.xml.h:23 +msgid "_Download Messages for Offline Usage" +msgstr "_Hent breve ned til afkoblet tilstand" -#: ../shell/import.glade.h:3 -msgid "Import File" -msgstr "Importér fil" +#: ../ui/evolution-mail-global.xml.h:25 +msgid "_Message Filters" +msgstr "_Brevfiltre" -#: ../shell/import.glade.h:4 -msgid "Import Location" -msgstr "Importér sted" +#: ../ui/evolution-mail-global.xml.h:26 +msgid "_Move Folder To..." +msgstr "Fl_yt mappe til..." -#: ../shell/import.glade.h:5 -msgid "Importer Type" -msgstr "Importér type" +#: ../ui/evolution-mail-global.xml.h:27 +msgid "_New..." +msgstr "_Ny..." -#: ../shell/import.glade.h:6 -msgid "Select Information to Import" -msgstr "Vælg information som skal importeres" +#: ../ui/evolution-mail-global.xml.h:28 +msgid "_Preview" +msgstr "Forhå_ndsvisning" -#: ../shell/import.glade.h:7 -msgid "Select a File" -msgstr "Vælg en fil" +#. +#. +#. +#: ../ui/evolution-mail-global.xml.h:32 +msgid "_Subscriptions..." +msgstr "_Abonnementer..." -#: ../shell/import.glade.h:8 +#: ../ui/evolution-mail-global.xml.h:33 +msgid "_Vertical View" +msgstr "_Lodret oversigt" + +#: ../ui/evolution-mail-list.xml.h:1 +msgid "Change the name of this folder" +msgstr "Ret navnet på denne mappe" + +#: ../ui/evolution-mail-list.xml.h:2 +msgid "Change the properties of this folder" +msgstr "Ret egenskaberne for denne mappe" + +#: ../ui/evolution-mail-list.xml.h:3 +msgid "Collapse All _Threads" +msgstr "Sammenfold alle _tråde" + +#: ../ui/evolution-mail-list.xml.h:4 +msgid "Collapse all message threads" +msgstr "Sammenfold alle brevtråde" + +#: ../ui/evolution-mail-list.xml.h:5 +msgid "Copy selected message(s) to the clipboard" +msgstr "Kopiér markerede breve til udklipsholderen" + +#. Alphabetical by name, yo +#: ../ui/evolution-mail-list.xml.h:7 +msgid "Cut selected message(s) to the clipboard" +msgstr "Klip markerede breve til udklipsholderen" + +#: ../ui/evolution-mail-list.xml.h:8 +msgid "E_xpand All Threads" +msgstr "_Udfold alle tråde" + +#: ../ui/evolution-mail-list.xml.h:9 +msgid "E_xpunge" +msgstr "_Tøm" + +#: ../ui/evolution-mail-list.xml.h:10 +msgid "Expand all message threads" +msgstr "Udfold alle brevtråde" + +#: ../ui/evolution-mail-list.xml.h:12 +msgid "Hide S_elected Messages" +msgstr "Skjul valgt_e breve" + +#: ../ui/evolution-mail-list.xml.h:13 +msgid "Hide _Deleted Messages" +msgstr "Skjul slette_de breve" + +#: ../ui/evolution-mail-list.xml.h:14 +msgid "Hide _Read Messages" +msgstr "Skjul læ_ste breve" + +#: ../ui/evolution-mail-list.xml.h:15 msgid "" -"Welcome to the Evolution Import Assistant.\n" -"With this assistant you will be guided through the process of\n" -"importing external files into Evolution." -msgstr "" -"Velkommen til Evolutions import-vejleder\n" -"Gennem denne vejleder vil du blive guidet gennem proceduren\n" -"for import af eksterne filer til Evolution." +"Hide deleted messages rather than displaying them with a line through them" +msgstr "Skjul slettede breve i stedet for at vise dem gennemstreget" + +#: ../ui/evolution-mail-list.xml.h:16 +msgid "Mar_k All Messages as Read" +msgstr "Mar_kér alle breve som værende læst" + +#: ../ui/evolution-mail-list.xml.h:17 +msgid "Mark all messages in the folder as read" +msgstr "Markér alle breve i denne mappe som læst" + +#: ../ui/evolution-mail-list.xml.h:18 +msgid "Paste message(s) from the clipboard" +msgstr "Indsæt breve fra udklipsholderen" + +#: ../ui/evolution-mail-list.xml.h:19 +msgid "Permanently remove all deleted messages from this folder" +msgstr "Fjern alle slettede breve fra denne mappe permanent" + +#: ../ui/evolution-mail-list.xml.h:20 +msgid "Permanently remove this folder" +msgstr "Fjern denne mappe permanent" + +#: ../ui/evolution-mail-list.xml.h:22 +msgid "Refresh the folder" +msgstr "Opdatér mappen" + +#: ../ui/evolution-mail-list.xml.h:23 +msgid "Select Message S_ubthread" +msgstr "Vælg brevets u_ndertråd" + +#: ../ui/evolution-mail-list.xml.h:24 +msgid "Select Message _Thread" +msgstr "Vælg brev_tråd" + +#: ../ui/evolution-mail-list.xml.h:25 +msgid "Select _All Messages" +msgstr "Vælg _alle breve" + +#: ../ui/evolution-mail-list.xml.h:26 +msgid "Select all and only the messages that are not currently selected" +msgstr "Vælg alle og kun breve som ikke allerede er valgt" + +#: ../ui/evolution-mail-list.xml.h:27 +msgid "Select all messages in the same thread as the selected message" +msgstr "Vælg alle breve i samme tråd som det valgte brev" + +#: ../ui/evolution-mail-list.xml.h:28 +msgid "Select all replies to the currently selected message" +msgstr "Vælg alle svar til det valgte brev" + +#: ../ui/evolution-mail-list.xml.h:29 +msgid "Select all visible messages" +msgstr "Vælg alle synlige breve" + +#: ../ui/evolution-mail-list.xml.h:30 +msgid "Show Hidde_n Messages" +msgstr "Vis skj_ulte breve" + +#: ../ui/evolution-mail-list.xml.h:31 +msgid "Show messages that have been temporarily hidden" +msgstr "Vis breve som er midlertidig skjult" + +#: ../ui/evolution-mail-list.xml.h:32 +msgid "Temporarily hide all messages that have already been read" +msgstr "Skjul alle læste breve midlertidigt" + +#: ../ui/evolution-mail-list.xml.h:33 +msgid "Temporarily hide the selected messages" +msgstr "Skjul valgte breve midlertidigt" + +#: ../ui/evolution-mail-list.xml.h:34 +msgid "Threaded Message list" +msgstr "Brug trådning i brevindeks" + +#: ../ui/evolution-mail-list.xml.h:36 +msgid "_Group By Threads" +msgstr "_Gruppér efter tråde" + +#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111 +#: ../ui/evolution-mail-messagedisplay.xml.h:7 +msgid "_Message" +msgstr "_Brev" + +#: ../ui/evolution-mail-message.xml.h:1 +msgid "A_dd Sender to Address Book" +msgstr "Føj afsender til adresse_bog" + +#: ../ui/evolution-mail-message.xml.h:2 +msgid "A_pply Filters" +msgstr "Anvend _filtre" + +#. Alphabetical by name, yo +#: ../ui/evolution-mail-message.xml.h:4 +msgid "Add Sender to Address Book" +msgstr "Føj afsenderen til adressebogen" + +#: ../ui/evolution-mail-message.xml.h:5 +msgid "All Message _Headers" +msgstr "Hele brev_hovedet" + +#: ../ui/evolution-mail-message.xml.h:6 +msgid "Apply filter rules to the selected messages" +msgstr "Aktivér filterregler på de valgte breve" + +#: ../ui/evolution-mail-message.xml.h:7 +msgid "Check for _Junk" +msgstr "Se efter _spam" + +#: ../ui/evolution-mail-message.xml.h:8 +msgid "Compose _New Message" +msgstr "Skriv _nyt brev" + +#: ../ui/evolution-mail-message.xml.h:9 +msgid "Compose a reply to all of the recipients of the selected message" +msgstr "Skriv et svar til alle modtagere af det valgte brev" + +#: ../ui/evolution-mail-message.xml.h:10 +msgid "Compose a reply to the mailing list of the selected message" +msgstr "Skriv et svar til e-postlisten for det valgte brev" + +#: ../ui/evolution-mail-message.xml.h:11 +msgid "Compose a reply to the sender of the selected message" +msgstr "Skriv et svar til afsenderen af det valgte brev" + +#: ../ui/evolution-mail-message.xml.h:12 +msgid "Copy selected messages to another folder" +msgstr "Kopiér valgte breve til en anden mappe" + +#: ../ui/evolution-mail-message.xml.h:13 +msgid "Copy selected messages to the clipboard" +msgstr "Kopiér markerede breve til udklipsholderen" + +#: ../ui/evolution-mail-message.xml.h:14 +msgid "Create R_ule" +msgstr "Opret re_gel" + +#: ../ui/evolution-mail-message.xml.h:15 +msgid "Create a Search Folder for these recipients" +msgstr "Opret en søgemappe til disse modtagere" + +#: ../ui/evolution-mail-message.xml.h:16 +msgid "Create a Search Folder for this mailing list" +msgstr "Opret en søgemappe til denne postliste" + +#: ../ui/evolution-mail-message.xml.h:17 +msgid "Create a Search Folder for this sender" +msgstr "Opret en søgemappe til denne afsender" + +#: ../ui/evolution-mail-message.xml.h:18 +msgid "Create a Search Folder for this subject" +msgstr "Opret en søgemappe til dette emne" + +#: ../ui/evolution-mail-message.xml.h:19 +msgid "Create a rule to filter messages from this sender" +msgstr "Lav en regel til at filtrere breve fra denne afsender" + +#: ../ui/evolution-mail-message.xml.h:20 +msgid "Create a rule to filter messages to these recipients" +msgstr "Lav en regel til at filtrere breve til disse modtagere" + +#: ../ui/evolution-mail-message.xml.h:21 +msgid "Create a rule to filter messages to this mailing list" +msgstr "Lav en regel for at filtrere breve til denne postliste" + +#: ../ui/evolution-mail-message.xml.h:22 +msgid "Create a rule to filter messages with this subject" +msgstr "Lav en regel for filtrering af breve med dette emne" + +#: ../ui/evolution-mail-message.xml.h:23 +msgid "Cut selected messages to the clipboard" +msgstr "Klip markerede breve til udklipsholderen" + +#: ../ui/evolution-mail-message.xml.h:24 +msgid "Decrease the text size" +msgstr "Formindsk tekstens størrelse" + +#: ../ui/evolution-mail-message.xml.h:26 +msgid "Display the next important message" +msgstr "Vis næste vigtige brev" + +#: ../ui/evolution-mail-message.xml.h:27 +msgid "Display the next message" +msgstr "Vis næste brev" + +#: ../ui/evolution-mail-message.xml.h:28 +msgid "Display the next thread" +msgstr "Vis næste tråd" + +#: ../ui/evolution-mail-message.xml.h:29 +msgid "Display the next unread message" +msgstr "Vis næste ulæste brev" + +#: ../ui/evolution-mail-message.xml.h:30 +msgid "Display the previous important message" +msgstr "Vis forrige vigtige brev" + +#: ../ui/evolution-mail-message.xml.h:31 +msgid "Display the previous message" +msgstr "Vis forrige brev" + +#: ../ui/evolution-mail-message.xml.h:32 +msgid "Display the previous unread message" +msgstr "Vis forrige ulæste brev" + +#: ../ui/evolution-mail-message.xml.h:33 +msgid "F_orward As..." +msgstr "Videresend s_om..." + +#: ../ui/evolution-mail-message.xml.h:34 +msgid "Filter on Mailing _List..." +msgstr "Filtrér på e-post_liste..." + +#: ../ui/evolution-mail-message.xml.h:35 +msgid "Filter on Se_nder..." +msgstr "Filtrér på se_nder..." + +#: ../ui/evolution-mail-message.xml.h:36 +msgid "Filter on _Recipients..." +msgstr "Filtrér på modtage_re..." + +#: ../ui/evolution-mail-message.xml.h:37 +msgid "Filter on _Subject..." +msgstr "Filtrér på e_mne..." + +#: ../ui/evolution-mail-message.xml.h:38 +msgid "Filter the selected messages for junk status" +msgstr "Filtrér de valgte breve til spamstatus" + +#: ../ui/evolution-mail-message.xml.h:39 +msgid "Flag selected messages for follow-up" +msgstr "Markér markerede breve til opfølgning" + +#: ../ui/evolution-mail-message.xml.h:40 +msgid "Follow _Up..." +msgstr "Følg _op..." + +#: ../ui/evolution-mail-message.xml.h:41 +msgid "Force images in HTML mail to be loaded" +msgstr "Tvungen indlæsning af billeder i HTML-breve" + +#: ../ui/evolution-mail-message.xml.h:43 +msgid "Forward the selected message in the body of a new message" +msgstr "Videresend det valgte brev i kroppen af et nyt brev" + +#: ../ui/evolution-mail-message.xml.h:44 +msgid "Forward the selected message quoted like a reply" +msgstr "Videresend det valgte brev, citeret som et svar" + +#: ../ui/evolution-mail-message.xml.h:45 +msgid "Forward the selected message to someone" +msgstr "Videresend det valgte brev til en eller anden" + +#: ../ui/evolution-mail-message.xml.h:46 +msgid "Forward the selected message to someone as an attachment" +msgstr "Videresend det valgte brev til nogen som et bilag" + +#: ../ui/evolution-mail-message.xml.h:47 +msgid "Increase the text size" +msgstr "Forøg tekstens størrelse" + +#: ../ui/evolution-mail-message.xml.h:49 +msgid "Mar_k as" +msgstr "Mar_kér som" + +#: ../ui/evolution-mail-message.xml.h:50 +msgid "Mark the selected messages as having been read" +msgstr "Markér de valgte breve som værende læste" + +#: ../ui/evolution-mail-message.xml.h:51 +msgid "Mark the selected messages as important" +msgstr "Markér de valgte breve som vigtige" + +#: ../ui/evolution-mail-message.xml.h:52 +msgid "Mark the selected messages as junk" +msgstr "Markér de valgte breve som spam" + +#: ../ui/evolution-mail-message.xml.h:53 +msgid "Mark the selected messages as not being junk" +msgstr "Markér de valgte breve som ikke værende spam" + +#: ../ui/evolution-mail-message.xml.h:54 +msgid "Mark the selected messages as not having been read" +msgstr "Markér de valgte breve som værende ulæste" + +#: ../ui/evolution-mail-message.xml.h:55 +msgid "Mark the selected messages as unimportant" +msgstr "Markér de valgte breve som uvigtige" + +#: ../ui/evolution-mail-message.xml.h:56 +msgid "Mark the selected messages for deletion" +msgstr "Markér de valgte breve til sletning" + +#: ../ui/evolution-mail-message.xml.h:57 +msgid "Move selected messages to another folder" +msgstr "Flyt de valgte breve til en anden mappe" + +#: ../ui/evolution-mail-message.xml.h:59 +msgid "Next _Important Message" +msgstr "Næste _vigtige meddelelse" + +#: ../ui/evolution-mail-message.xml.h:60 +msgid "Next _Thread" +msgstr "Næste _tråd" + +#: ../ui/evolution-mail-message.xml.h:61 +msgid "Next _Unread Message" +msgstr "Næste _ulæste brev" + +#: ../ui/evolution-mail-message.xml.h:62 +msgid "Not Junk" +msgstr "Ikke spam" + +#: ../ui/evolution-mail-message.xml.h:63 +msgid "Open a window for composing a mail message" +msgstr "Åbn et vindue for at skrive et brev" + +#: ../ui/evolution-mail-message.xml.h:64 +msgid "Open the selected messages in a new window" +msgstr "Åbn de valgt breve i et nyt vindue" + +#: ../ui/evolution-mail-message.xml.h:65 +msgid "Open the selected messages in the composer for editing" +msgstr "Åbn de valgte breve i redigeringsvinduet" + +#: ../ui/evolution-mail-message.xml.h:66 +msgid "P_revious Unread Message" +msgstr "F_oregående ulæste brev" + +#: ../ui/evolution-mail-message.xml.h:67 +msgid "Paste messages from the clipboard" +msgstr "Indsæt breve fra udklipsholderen" + +#: ../ui/evolution-mail-message.xml.h:68 +msgid "Pr_evious Important Message" +msgstr "Fo_regående vigtige brev" + +#: ../ui/evolution-mail-message.xml.h:69 +msgid "Preview the message to be printed" +msgstr "Forhåndsvis brevet som skal udskrives" + +#: ../ui/evolution-mail-message.xml.h:73 +msgid "Print this message" +msgstr "Udskriv dette brev" + +#: ../ui/evolution-mail-message.xml.h:74 +msgid "Re_direct" +msgstr "_Omdirigér" + +#: ../ui/evolution-mail-message.xml.h:75 +msgid "Redirect (bounce) the selected message to someone" +msgstr "Omdirigér (bounce) det markerede brev til en eller anden" + +#: ../ui/evolution-mail-message.xml.h:80 +msgid "Reset the text to its original size" +msgstr "Nulstil tekststørrelsen til den oprindelige" + +#: ../ui/evolution-mail-message.xml.h:81 +msgid "Save the selected messages as a text file" +msgstr "Gem de valgte breve som tekstfil" + +#: ../ui/evolution-mail-message.xml.h:82 +msgid "Search Folder from Mailing _List..." +msgstr "Søgemappe ud fra post-_liste..." + +#: ../ui/evolution-mail-message.xml.h:83 +msgid "Search Folder from Recipien_ts..." +msgstr "Søgemappe ud fra _modtagere..." + +#: ../ui/evolution-mail-message.xml.h:84 +msgid "Search Folder from S_ubject..." +msgstr "Søgemappe ud fra e_mne..." + +#: ../ui/evolution-mail-message.xml.h:85 +msgid "Search Folder from Sen_der..." +msgstr "Søgemappe ud fra afse_nder..." + +#: ../ui/evolution-mail-message.xml.h:86 +msgid "Search for text in the body of the displayed message" +msgstr "Søg efter tekst i kroppen af det viste brev" + +#: ../ui/evolution-mail-message.xml.h:87 +msgid "Select _All Text" +msgstr "Vælg _hele teksten" + +#: ../ui/evolution-mail-message.xml.h:88 +msgid "Select all the text in a message" +msgstr "Vælg hele teksten i et brev" + +#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27 +msgid "Set up the page settings for your current printer" +msgstr "Konfigurér sideindstillingerne for din aktuelle printer" + +#: ../ui/evolution-mail-message.xml.h:90 +msgid "Show a blinking cursor in the body of displayed messages" +msgstr "Vis en blinkende markør i kroppen af viste breve" + +#: ../ui/evolution-mail-message.xml.h:91 +msgid "Show messages with all email headers" +msgstr "Vis breve med det fulde brevhoved" + +#: ../ui/evolution-mail-message.xml.h:92 +msgid "Show the raw email source of the message" +msgstr "Vis brevet i sin rå form" + +#: ../ui/evolution-mail-message.xml.h:93 +msgid "Undelete the selected messages" +msgstr "Fortryd sletning af de valgte breve" + +#: ../ui/evolution-mail-message.xml.h:94 +msgid "Uni_mportant" +msgstr "_Ikke vigtig" + +#: ../ui/evolution-mail-message.xml.h:95 +msgid "Zoom _Out" +msgstr "Zoom _ud" + +#: ../ui/evolution-mail-message.xml.h:96 +msgid "_Attached" +msgstr "_Vedlagt" + +#: ../ui/evolution-mail-message.xml.h:97 +msgid "_Caret Mode" +msgstr "Markør_tilstand" + +#: ../ui/evolution-mail-message.xml.h:98 +msgid "_Clear Flag" +msgstr "_Fjern markering" + +#: ../ui/evolution-mail-message.xml.h:101 +msgid "_Delete Message" +msgstr "_Slet brev" + +#: ../ui/evolution-mail-message.xml.h:103 +msgid "_Find in Message..." +msgstr "S_øg i brev..." + +#: ../ui/evolution-mail-message.xml.h:104 +msgid "_Flag Completed" +msgstr "_Markering sat" + +#: ../ui/evolution-mail-message.xml.h:106 +msgid "_Go To" +msgstr "_Gå til" + +#: ../ui/evolution-mail-message.xml.h:107 +msgid "_Important" +msgstr "_Vigtig" + +#: ../ui/evolution-mail-message.xml.h:108 +msgid "_Inline" +msgstr "_Integreret" + +#: ../ui/evolution-mail-message.xml.h:109 +msgid "_Junk" +msgstr "_Spam" + +#: ../ui/evolution-mail-message.xml.h:110 +msgid "_Load Images" +msgstr "_Indlæs billeder" + +#: ../ui/evolution-mail-message.xml.h:112 +msgid "_Message Source" +msgstr "_Brevkildetekst" + +#: ../ui/evolution-mail-message.xml.h:114 +msgid "_Next Message" +msgstr "_Næste brev" + +#: ../ui/evolution-mail-message.xml.h:115 +msgid "_Normal Size" +msgstr "_Normal størrelse" + +#: ../ui/evolution-mail-message.xml.h:116 +msgid "_Not Junk" +msgstr "_Ikke spam" + +#: ../ui/evolution-mail-message.xml.h:117 +msgid "_Open in New Window" +msgstr "Åbn i nyt _vindue" + +#: ../ui/evolution-mail-message.xml.h:118 +msgid "_Previous Message" +msgstr "_Foregående brev" + +#: ../ui/evolution-mail-message.xml.h:120 +msgid "_Quoted" +msgstr "_Citeret" + +# rettigheder, ikke bydeform +#. Translators: "Read" as in "has been read" (evolution-mail-message.xml) +#: ../ui/evolution-mail-message.xml.h:122 +msgid "_Read" +msgstr "_Læse" + +#: ../ui/evolution-mail-message.xml.h:124 +msgid "_Save Message..." +msgstr "_Gem brev..." + +#: ../ui/evolution-mail-message.xml.h:125 +msgid "_Undelete Message" +msgstr "_Fortryd sletning af brev" + +#: ../ui/evolution-mail-message.xml.h:126 +msgid "_Unread" +msgstr "_Ulæst" + +#: ../ui/evolution-mail-message.xml.h:127 +msgid "_Zoom" +msgstr "_Zoom" + +#: ../ui/evolution-mail-message.xml.h:128 +msgid "_Zoom In" +msgstr "Zoom _ind" + +#: ../ui/evolution-mail-messagedisplay.xml.h:1 +msgid "Close" +msgstr "Luk" + +#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18 +msgid "Main toolbar" +msgstr "Hovedværktøjslinje" + +#: ../ui/evolution-memos.xml.h:3 +msgid "Copy selected memo" +msgstr "Kopiér valgte huskeseddel" + +#: ../ui/evolution-memos.xml.h:5 +msgid "Cut selected memo" +msgstr "Klip valgte huskeseddel ud" + +#: ../ui/evolution-memos.xml.h:7 +msgid "Delete selected memos" +msgstr "Slet valgte huskesedler" + +#: ../ui/evolution-memos.xml.h:9 +msgid "Paste memo from the clipboard" +msgstr "Indsæt huskeseddel fra udklipsholderen" + +#: ../ui/evolution-memos.xml.h:10 +msgid "Previews the list of memos to be printed" +msgstr "Viser listen over huskesedler som skal udskrives" + +#: ../ui/evolution-memos.xml.h:13 +msgid "Print the list of memos" +msgstr "Udskriv listen med huskesedler" + +#: ../ui/evolution-memos.xml.h:14 +msgid "View the selected memo" +msgstr "Vis den valgte huskeseddel" + +#: ../ui/evolution-memos.xml.h:18 +msgid "_Open Memo" +msgstr "_Åbn huskeseddel" + +#: ../ui/evolution-tasks.xml.h:3 +msgid "Copy selected tasks" +msgstr "Kopiér valgte opgaver" + +#: ../ui/evolution-tasks.xml.h:5 +msgid "Cut selected tasks" +msgstr "Klip valgte opgaver ud" + +#: ../ui/evolution-tasks.xml.h:7 +msgid "Delete completed tasks" +msgstr "Fjern fuldførte opgaver" + +#: ../ui/evolution-tasks.xml.h:8 +msgid "Delete selected tasks" +msgstr "Slet valgte opgaver" + +#: ../ui/evolution-tasks.xml.h:9 +msgid "Mar_k as Complete" +msgstr "Mar_kér som fuldført" + +#: ../ui/evolution-tasks.xml.h:10 +msgid "Mark selected tasks as complete" +msgstr "Markér de valgte opgaver som fuldførte" + +#: ../ui/evolution-tasks.xml.h:12 +msgid "Paste tasks from the clipboard" +msgstr "Indsæt opgaver fra udklipsholderen" + +#: ../ui/evolution-tasks.xml.h:13 +msgid "Previews the list of tasks to be printed" +msgstr "Viser listen over opgaver som skal udskrives" + +#: ../ui/evolution-tasks.xml.h:16 +msgid "Print the list of tasks" +msgstr "Udskriv listen med opgaver" + +#: ../ui/evolution-tasks.xml.h:18 +msgid "Show task preview window" +msgstr "Vis vinduet med forhåndsvisning af opgave" + +#: ../ui/evolution-tasks.xml.h:19 +msgid "Task _Preview" +msgstr "_Vis opgave" + +#: ../ui/evolution-tasks.xml.h:20 +msgid "View the selected task" +msgstr "Vis den valgte opgave" + +#: ../ui/evolution-tasks.xml.h:27 +msgid "_Open Task" +msgstr "_Åbn opgave" + +#: ../ui/evolution.xml.h:1 +msgid "About Evolution..." +msgstr "Om Evolution..." + +#: ../ui/evolution.xml.h:2 +msgid "Change Evolution's settings" +msgstr "Skift indstillinger for Evolution" + +#: ../ui/evolution.xml.h:3 +msgid "Change the visibility of the toolbar" +msgstr "Ændr værktøjslinjens synlighed" + +#: ../ui/evolution.xml.h:5 +msgid "Create a new window displaying this folder" +msgstr "Opret et nyt vindue som viser denne mappe" -#. Preview/Alpha/Beta version warning message -#: ../shell/main.c:221 -#, no-c-format -msgid "" -"Hi. Thanks for taking the time to download this preview release\n" -"of the Evolution groupware suite.\n" -"\n" -"This version of Evolution is not yet complete. It is getting close,\n" -"but some features are either unfinished or do not work properly.\n" -"\n" -"If you want a stable version of Evolution, we urge you to uninstall\n" -"this version, and install version %s instead.\n" -"\n" -"If you find bugs, please report them to us at bugzilla.gnome.org.\n" -"This product comes with no warranty and is not intended for\n" -"individuals prone to violent fits of anger.\n" -"\n" -"We hope that you enjoy the results of our hard work, and we\n" -"eagerly await your contributions!\n" +#: ../ui/evolution.xml.h:6 +msgid "Display window buttons using the desktop toolbar setting" msgstr "" -"Hej. Tak for at du tog dig tid til at hente denne forudgave\n" -"af samarbejdsprogrammelsuiten Evolution.\n" -"\n" -"Denne version af Evolution er ikke færdig endnu. Det begynder at nærme sig,\n" -"men der findes steder hvor funktioner enten mangler eller kun fungerer " -"delvis.\n" -"\n" -"Hvis du vil have en stabil version af Evolution anbefaler vi dig at\n" -"afinstallere denne version og installere version %s i stedet.\n" -"\n" -"Hvis du finder fejl i programmet, beder vi om at du rapporterer dem til os\n" -"på bugzilla.gnome.org.\n" -"\n" -"Dette produkt leveres uden garanti og er ikke beregnet for\n" -"personer der let får vredesudbrud.\n" -"\n" -"Vi håber at du vil være fornøjet med resultatet af vort hårde arbejde, og " -"vi\n" -"venter med spænding på dine bidrag!\n" +"Vis vinduesknapper vha. indstillingerne for skrivebordets værktøjslinje" + +#: ../ui/evolution.xml.h:7 +msgid "Display window buttons with icons and text" +msgstr "Vis vinduesknapper med ikoner og tekst" + +#: ../ui/evolution.xml.h:8 +msgid "Display window buttons with icons only" +msgstr "Vis vinduesknapper kun med ikoner" + +#: ../ui/evolution.xml.h:9 +msgid "Display window buttons with text only" +msgstr "Vis vinduesknapper kun med tekst" + +#: ../ui/evolution.xml.h:10 +msgid "Evolution _FAQ" +msgstr "Evolution _OSS" + +#: ../ui/evolution.xml.h:11 +msgid "Exit the program" +msgstr "Afslut programmet" + +#: ../ui/evolution.xml.h:12 +msgid "Forget remembered passwords so you will be prompted for them again" +msgstr "Glem alle adgangskoder så du vil blive spurgt om at opgive dem igen" + +#: ../ui/evolution.xml.h:13 +msgid "Hide window buttons" +msgstr "Skjul vinduesknapper" + +#: ../ui/evolution.xml.h:14 +msgid "I_mport..." +msgstr "Im_portér..." + +#: ../ui/evolution.xml.h:15 +msgid "Icons _and Text" +msgstr "Ikoner _og tekst" + +#: ../ui/evolution.xml.h:16 +msgid "Import data from other programs" +msgstr "Importér data fra andre programmer" + +#: ../ui/evolution.xml.h:17 +msgid "Lay_out" +msgstr "La_yout" + +#: ../ui/evolution.xml.h:19 +msgid "New _Window" +msgstr "Nyt _vindue" + +#: ../ui/evolution.xml.h:20 +msgid "Open the Frequently Asked Questions webpage" +msgstr "Åbner Ofte Stillede Spørgsmål-websiden" + +#: ../ui/evolution.xml.h:21 +msgid "Page Set_up..." +msgstr "Sideop_sætning..." + +#: ../ui/evolution.xml.h:22 +msgid "Prefere_nces" +msgstr "_Indstillinger" + +#: ../ui/evolution.xml.h:23 +msgid "Send / Receive" +msgstr "Send / modtag" + +#: ../ui/evolution.xml.h:24 +msgid "Send / _Receive" +msgstr "Send / _modtag" + +#: ../ui/evolution.xml.h:25 +msgid "Send queued items and retrieve new items" +msgstr "Send udgående breve og hent nye breve" + +#: ../ui/evolution.xml.h:26 +msgid "Set up Pilot configuration" +msgstr "Konfigurér Pilotkonfiguration" + +#: ../ui/evolution.xml.h:28 +msgid "Show Side _Bar" +msgstr "Vis side_panel" + +#: ../ui/evolution.xml.h:29 +msgid "Show _Status Bar" +msgstr "Vis stat_uslinje" + +#: ../ui/evolution.xml.h:30 +msgid "Show _Toolbar" +msgstr "Vis værk_tøjslinje" + +#: ../ui/evolution.xml.h:31 +msgid "Show information about Evolution" +msgstr "Vis information om Evolution" + +#: ../ui/evolution.xml.h:32 +msgid "Submit Bug Report" +msgstr "Indsend fejlrapport" + +#: ../ui/evolution.xml.h:33 +msgid "Submit _Bug Report" +msgstr "Indsen_d fejlrapport" + +#: ../ui/evolution.xml.h:34 +msgid "Submit a bug report using Bug Buddy" +msgstr "Indsend en fejlrapport med Bug Buddy" + +#: ../ui/evolution.xml.h:35 +msgid "Toggle whether we are working offline." +msgstr "Skift mellem opkoblet/afkoblet arbejdstilstand." + +#: ../ui/evolution.xml.h:36 +msgid "Tool_bar Style" +msgstr "Værktøjs_linjestil" + +#: ../ui/evolution.xml.h:37 +msgid "View/Hide the Side Bar" +msgstr "Vis/skjul sidepanelet" + +#: ../ui/evolution.xml.h:38 +msgid "View/Hide the Status Bar" +msgstr "Vis/skjul statuslinjen" + +#: ../ui/evolution.xml.h:39 +msgid "Work _Offline" +msgstr "Arbejd _afkoblet" + +#: ../ui/evolution.xml.h:40 +msgid "_About" +msgstr "_Om" + +#: ../ui/evolution.xml.h:41 +msgid "_Close Window" +msgstr "_Luk vindue" + +#: ../ui/evolution.xml.h:44 +msgid "_Forget Passwords" +msgstr "_Glem adgangskoder" + +#: ../ui/evolution.xml.h:45 +msgid "_Frequently Asked Questions" +msgstr "_Ofte Stillede Spørgsmål" + +#: ../ui/evolution.xml.h:47 +msgid "_Hide Buttons" +msgstr "_Skjul knapper" + +#: ../ui/evolution.xml.h:48 +msgid "_Icons Only" +msgstr "Kun _ikoner" + +#: ../ui/evolution.xml.h:50 +msgid "_Quick Reference" +msgstr "_Kvikreference" + +#: ../ui/evolution.xml.h:51 +msgid "_Quit" +msgstr "_Afslut" + +#: ../ui/evolution.xml.h:52 +msgid "_Switcher Appearance" +msgstr "V_ælger-udseende" + +#: ../ui/evolution.xml.h:53 +msgid "_Synchronization Options..." +msgstr "S_ynkroniserings-indstillinger..." + +#: ../ui/evolution.xml.h:54 +msgid "_Text Only" +msgstr "Kun _tekst" + +#: ../ui/evolution.xml.h:56 +msgid "_Window" +msgstr "_Vindue" + +#: ../views/addressbook/galview.xml.h:1 +msgid "By _Company" +msgstr "Efter _firma" + +#: ../views/addressbook/galview.xml.h:2 +msgid "_Address Cards" +msgstr "_Adressekort" + +#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3 +msgid "_List View" +msgstr "_Listeoversigt" + +#: ../views/calendar/galview.xml.h:1 +msgid "W_eek View" +msgstr "_Ugeoversigt" + +#: ../views/calendar/galview.xml.h:2 +msgid "_Day View" +msgstr "_Dagsoversigt" + +#: ../views/calendar/galview.xml.h:4 +msgid "_Month View" +msgstr "_Månedsoversigt" + +#: ../views/calendar/galview.xml.h:5 +msgid "_Work Week View" +msgstr "_Arbejdsugeoversigt" + +#: ../views/mail/galview.xml.h:1 +msgid "As Sent Folder for Wi_de View" +msgstr "Som Sendt-mappen til b_redformat" + +#: ../views/mail/galview.xml.h:2 +msgid "As _Sent Folder" +msgstr "Som Sendt-_mappen" + +#: ../views/mail/galview.xml.h:3 +msgid "By S_tatus" +msgstr "Efter _status" + +#: ../views/mail/galview.xml.h:4 +msgid "By Se_nder" +msgstr "Efter _afsender" -#: ../shell/main.c:245 -msgid "" -"Thanks\n" -"The Evolution Team\n" -msgstr "" -"Tak\n" -"Evolution-holdet\n" +#: ../views/mail/galview.xml.h:5 +msgid "By Su_bject" +msgstr "Efter _emne" -#: ../shell/main.c:252 -msgid "Do not tell me again" -msgstr "Fortæl mig det ikke igen" +#: ../views/mail/galview.xml.h:6 +msgid "By _Follow Up Flag" +msgstr "Efter _følg-op-markering" -#: ../shell/main.c:481 -msgid "Start Evolution activating the specified component" -msgstr "Start Evolution med den angivne komponent aktiveret" +#: ../views/mail/galview.xml.h:7 +msgid "For _Wide View" +msgstr "Til _bredformat" -#: ../shell/main.c:485 -msgid "Start in online mode" -msgstr "Start i opkoblet tilstand" +#: ../views/mail/galview.xml.h:8 +msgid "_Messages" +msgstr "_Breve" -#: ../shell/main.c:488 -msgid "Forcibly shut down all Evolution components" -msgstr "Gennemtving nedlukning af alle komponenter i Evolution" +#: ../views/memos/galview.xml.h:1 +msgid "_Memos" +msgstr "_Huskesedler" -#: ../shell/main.c:492 -msgid "Forcibly re-migrate from Evolution 1.4" -msgstr "Gennemtving genoverflytning fra Evolution 1.4" +#: ../views/tasks/galview.xml.h:1 +msgid "With _Due Date" +msgstr "Med _forfaldsdato" -#: ../shell/main.c:495 -msgid "Send the debugging output of all components to a file." -msgstr "Send fejlsøgingsudskrift for alle komponenterne til en fil." +#: ../views/tasks/galview.xml.h:2 +msgid "With _Status" +msgstr "Med _status" -#: ../shell/main.c:497 -msgid "Disable loading of any plugins." -msgstr "Deaktivér indlæsning af alle udvidelsesmoduler." +#. Put the "UTC" entry at the top of the combo's list. +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:426 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:777 +msgid "UTC" +msgstr "UTC" -#: ../shell/main.c:499 -msgid "Disable preview pane of Mail, Contacts and Tasks." -msgstr "Deaktivér forhåndsvisnings-panel for post, kontaktpersoner og opgaver." +#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1 +msgid "Time Zones" +msgstr "Tidszoner" -#: ../shell/main.c:586 -msgid "- The Evolution PIM and Email Client" -msgstr "- Evolution, en PIM og e-post-klient" +#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2 +msgid "_Selection" +msgstr "_Markering" -#: ../shell/main.c:614 -#, c-format +#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4 +msgid "Select a Time Zone" +msgstr "Vælg en tidszone" + +#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5 +msgid "Timezone drop-down combination box" +msgstr "Rullegardin-kombinationsboks til tidszoner" + +#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6 msgid "" -"%s: --online and --offline cannot be used together.\n" -" Use %s --help for more information.\n" +"Use the left mouse button to zoom in on an area of the map and select a time " +"zone.\n" +"Use the right mouse button to zoom out." msgstr "" -"%s: --online og --offline kan ikke bruges sammen.\n" -" Brug %s --help for mere information.\n" +"Brug venstre museknap til at zoome ind på et område af kortet og vælg en " +"tidszone.\n" +"Brug højre museknap til at zoome ud." -#: ../shell/shell.error.xml.h:1 -msgid "Are you sure you want to forget all remembered passwords?" -msgstr "Er du sikker på du vil glemme alle huskede adgangskoder?" +#: ../widgets/menus/gal-define-views-dialog.c:74 +#: ../widgets/menus/gal-define-views-model.c:185 +msgid "Collection" +msgstr "Samling" -#: ../shell/shell.error.xml.h:2 -msgid "Cannot start Evolution" -msgstr "Kan ikke starte Evolution" +#: ../widgets/menus/gal-define-views-dialog.c:356 +#: ../widgets/menus/gal-define-views.glade.h:4 +#, no-c-format +msgid "Define Views for %s" +msgstr "Definér oversigter for %s" -#: ../shell/shell.error.xml.h:3 -msgid "Continue" -msgstr "Fortsæt" +#: ../widgets/menus/gal-define-views-dialog.c:364 +#: ../widgets/menus/gal-define-views-dialog.c:366 +msgid "Define Views" +msgstr "Definér oversigter" -#: ../shell/shell.error.xml.h:4 -msgid "Delete old data from version {0}?" -msgstr "Slet gamle data fra version {0}?" +#: ../widgets/menus/gal-define-views.glade.h:2 +#, no-c-format +msgid "Define Views for \"%s\"" +msgstr "Definér oversigter for \"%s\"" -#: ../shell/shell.error.xml.h:5 -msgid "Evolution can not start." -msgstr "Evolution kan ikke starte." +#: ../widgets/menus/gal-view-factory-etable.c:37 +#: ../widgets/table/e-table-scrolled.c:215 +#: ../widgets/table/e-table-scrolled.c:216 +msgid "Table" +msgstr "Tabel" -#: ../shell/shell.error.xml.h:6 -msgid "" -"Forgetting your passwords will clear all remembered passwords. You will be " -"reprompted next time they are needed." -msgstr "" -"Hvis du \"glemmer\" dine adgangskoder, vil alle huskede adgangskoder blive " -"fjernet. Du vil blive spurgt igen, næste gang der er brug for dem." +#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225 +msgid "Instance" +msgstr "Tilfælde" -#: ../shell/shell.error.xml.h:8 -msgid "Insufficient disk space for upgrade." -msgstr "Der er ikke nok diskplads til opgraderingen." +#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283 +msgid "Save Current View" +msgstr "Gem nuværende oversigt" -#: ../shell/shell.error.xml.h:9 -msgid "Really delete old data?" -msgstr "Skal gamle data virkelig slettes?" +#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1 +msgid "_Create new view" +msgstr "_Opret ny oversigt" -#: ../shell/shell.error.xml.h:10 -msgid "" -"The entire contents of the "evolution" directory are about to be " -"permanently removed.\n" -"\n" -"It is suggested you manually verify that all of your mail, contact, and " -"calendar data is present, and that this version of Evolution operates " -"correctly before deleting this old data.\n" -"\n" -"Once deleted, you cannot downgrade to the previous version of Evolution " -"without manual intervention.\n" -msgstr "" -"Hele indholdet af "evolution"-mappen er ved at blive fjernet " -"permanent.\n" -"\n" -"Du bør manuelt kontrollere at al din e-post-, dine kontaktperson- og " -"kalender-data er tilstede, og at denne version af Evolution opfører sig " -"korrekt, før du sletter disse gamle data.\n" -"\n" -"Når dataene er slettet, kan du ikke nedgradere til en tidligere version af " -"Evolution, uden manuel indgriben.\n" +#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3 +msgid "_Replace existing view" +msgstr "_Erstat eksisterende oversigt" -#: ../shell/shell.error.xml.h:16 -msgid "" -"The previous version of Evolution stored its data in a different location.\n" -"\n" -"If you choose to remove this data, the entire contents of the "" -"evolution" directory will be removed permanently. If you choose to keep " -"this data, then you may manually remove the contents of "" -"evolution" at your convenience.\n" -msgstr "" -"Den tidligere version af Evolution lagrede sine data et andet sted.\n" -"\n" -"Hvis du vælger at fjerne disse data, vil alt indholdet af " " -"evolution"-mappen blive fjernet permanent. Hvis du vælger at beholde " -"disse data, kan du manuelt fjerne indholdet af "evolution" når du " -"har lyst.\n" +#. bonobo displays this string so it must be in locale +#: ../widgets/menus/gal-view-instance.c:581 +#: ../widgets/menus/gal-view-menus.c:367 +msgid "Custom View" +msgstr "Tilpasset oversigt" -#: ../shell/shell.error.xml.h:20 -msgid "Upgrade from previous version failed: {0}" -msgstr "Opgradering fra forrige version mislykkedes: {0}" +#: ../widgets/menus/gal-view-instance.c:582 +msgid "Save Custom View" +msgstr "Gem tilpasset oversigt" -#: ../shell/shell.error.xml.h:21 -msgid "" -"Upgrading your data and settings will require up to {0} of disk space, but " -"you only have {1} available.\n" -"\n" -"You will need to make more space available in your home directory before you " -"can continue." -msgstr "" -"Opgradering af dine data og indstillinger vil kræve optil {0} diskplads, men " -"du har kun {1} tilgængelig.\n" -"\n" -"Du må gøre mere plads tilgængelig i dit hjemmekatalog før du kan fortsætte." +#: ../widgets/menus/gal-view-instance.c:586 +#: ../widgets/menus/gal-view-menus.c:391 +msgid "Define Views..." +msgstr "Definér oversigter..." -#: ../shell/shell.error.xml.h:24 -msgid "" -"Your system configuration does not match your Evolution configuration.\n" -"\n" -"Click help for details" -msgstr "" -"Din systemopsætning matcher ikke din Evolutionopsætning.\n" -"\n" -"Klik på hjælp for detaljer" +#: ../widgets/menus/gal-view-menus.c:304 +msgid "C_urrent View" +msgstr "_Aktuel oversigt" -#: ../shell/shell.error.xml.h:27 -msgid "" -"Your system configuration does not match your Evolution configuration:\n" -"\n" -"{0}\n" -"\n" -"Click help for details." -msgstr "" -"Din systemopsætning matcher ikke din Evolutionopsætning:\n" -"\n" -"{0}\n" -"\n" -"Klik på hjælp for detaljer." +#: ../widgets/menus/gal-view-menus.c:328 +#, c-format +msgid "Select View: %s" +msgstr "Vælg oversigt: %s" -#: ../shell/shell.error.xml.h:32 -msgid "_Forget" -msgstr "_Glem" +#: ../widgets/menus/gal-view-menus.c:372 +msgid "Current view is a customized view" +msgstr "Nuværende oversigt er en tilpasset oversigt" + +#: ../widgets/menus/gal-view-menus.c:377 +msgid "Save Custom View..." +msgstr "Gem tilrettet oversigt..." + +#: ../widgets/menus/gal-view-menus.c:382 +msgid "Save current custom view" +msgstr "Gem nuværende tilpassede oversigt" + +#: ../widgets/menus/gal-view-menus.c:396 +msgid "Create or edit views" +msgstr "Opret alle rediger oversigter" + +#: ../widgets/menus/gal-view-new-dialog.c:68 +msgid "Factory" +msgstr "Funktion" + +#: ../widgets/menus/gal-view-new-dialog.c:103 +msgid "Define New View" +msgstr "Definér ny oversigt" + +#: ../widgets/menus/gal-view-new-dialog.glade.h:1 +msgid "Name of new view:" +msgstr "Navn på ny oversigt:" -#: ../shell/shell.error.xml.h:33 -msgid "_Keep Data" -msgstr "_Behold data" +#: ../widgets/menus/gal-view-new-dialog.glade.h:2 +msgid "Type of View" +msgstr "Type af oversigt" -#: ../shell/shell.error.xml.h:34 -msgid "_Remind Me Later" -msgstr "_Påmind mig senere" +#: ../widgets/menus/gal-view-new-dialog.glade.h:3 +msgid "Type of view:" +msgstr "Type af oversigt:" -#: ../shell/shell.error.xml.h:35 -msgid "" -"{1}\n" -"\n" -"If you choose to continue, you may not have access to some of your old " -"data.\n" -msgstr "" -"{1}\n" -"\n" -"Hvis du vælger at fortsætte vil du måske ikke få adgang til alle dine gamle " -"data.\n" +#: ../widgets/misc/e-attachment.c:940 +#, fuzzy +msgid "Attached message" +msgstr "Vedlagt brev" -#: ../smime/gui/ca-trust-dialog.c:102 -#, c-format -msgid "" -"Certificate '%s' is a CA certificate.\n" -"\n" -"Edit trust settings:" -msgstr "" -"Certifikatet \"%s\" er et CA-certifikat.\n" -"\n" -"Redigér troværdighedsopsætning:" +#. Translators: Default attachment filename. +#: ../widgets/misc/e-attachment.c:1719 ../widgets/misc/e-attachment.c:2270 +#: ../widgets/misc/e-attachment-store.c:636 +#, fuzzy +msgid "attachment.dat" +msgstr "bilag" -#: ../smime/gui/cert-trust-dialog.c:151 -msgid "" -"Because you trust the certificate authority that issued this certificate, " -"then you trust the authenticity of this certificate unless otherwise " -"indicated here" +#: ../widgets/misc/e-attachment.c:1766 ../widgets/misc/e-attachment.c:2572 +msgid "A load operation is already in progress" msgstr "" -"Fordi du stoler på certificeringsmyndigheden som har udstedt dette " -"certifikat, så stoler du også på at dette certifikat er autentisk, med " -"mindre du angiver det her" -#: ../smime/gui/cert-trust-dialog.c:155 -msgid "" -"Because you do not trust the certificate authority that issued this " -"certificate, then you do not trust the authenticity of this certificate " -"unless otherwise indicated here" +#: ../widgets/misc/e-attachment.c:1774 ../widgets/misc/e-attachment.c:2580 +msgid "A save operation is already in progress" msgstr "" -"Fordi du ikke stoler på certificeringsmyndigheden som har udstedet dette " -"certifikat, så stoler du heller ikke på at dette certifikat er autentisk, " -"med mindre du angiver det her" - -#: ../smime/gui/certificate-manager.c:137 -#: ../smime/gui/certificate-manager.c:380 -#: ../smime/gui/certificate-manager.c:604 -msgid "Select a certificate to import..." -msgstr "Vælg et certifikat, at importere..." -#: ../smime/gui/certificate-manager.c:146 -msgid "All PKCS12 files" -msgstr "Alle PKCS12-filer" +#: ../widgets/misc/e-attachment.c:1867 +#, fuzzy, c-format +msgid "Could not load '%s'" +msgstr "Kunne ikke indlæse adressebogen" -#: ../smime/gui/certificate-manager.c:151 -#: ../smime/gui/certificate-manager.c:394 -#: ../smime/gui/certificate-manager.c:618 -msgid "All files" -msgstr "Alle filer" +#: ../widgets/misc/e-attachment.c:1870 +#, fuzzy, c-format +msgid "Could not load the attachment" +msgstr "Bilagets indholdstype." -#: ../smime/gui/certificate-manager.c:271 -#: ../smime/gui/certificate-manager.c:480 -#: ../smime/gui/certificate-manager.c:702 -msgid "Certificate Name" -msgstr "Certifikat-navn" +#: ../widgets/misc/e-attachment.c:2147 +#, fuzzy, c-format +msgid "Could not open '%s'" +msgstr "Kunne ikke åbne kilde" -#: ../smime/gui/certificate-manager.c:280 -#: ../smime/gui/certificate-manager.c:498 -msgid "Purposes" -msgstr "Formål" +#: ../widgets/misc/e-attachment.c:2150 +#, fuzzy, c-format +msgid "Could not open the attachment" +msgstr "Kunne ikke åbne link." -#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37 -#: ../smime/lib/e-cert.c:553 -msgid "Serial Number" -msgstr "Serienummer" +#: ../widgets/misc/e-attachment.c:2588 +#, fuzzy +msgid "Attachment contents not loaded" +msgstr "Bilag som skal tilføjes." -#: ../smime/gui/certificate-manager.c:297 -msgid "Expires" -msgstr "Udløber" +#: ../widgets/misc/e-attachment.c:2665 +#, fuzzy, c-format +msgid "Could not save '%s'" +msgstr "Kunne ikke udføre \"%s\": %s\n" -#: ../smime/gui/certificate-manager.c:389 -msgid "All email certificate files" -msgstr "Alle e-post-certifikatsfiler" +#: ../widgets/misc/e-attachment.c:2668 +#, fuzzy, c-format +msgid "Could not save the attachment" +msgstr "Bilagets indholdstype." -#: ../smime/gui/certificate-manager.c:489 -msgid "E-Mail Address" -msgstr "E-postadresse" +#: ../widgets/misc/e-attachment-dialog.c:305 +msgid "Attachment Properties" +msgstr "Egenskaber for bilag" -#: ../smime/gui/certificate-manager.c:613 -msgid "All CA certificate files" -msgstr "Alle CA-Certifikatsfiler" +#: ../widgets/misc/e-attachment-dialog.c:328 +#, fuzzy +msgid "_Filename:" +msgstr "_Filnavn:" -#: ../smime/gui/certificate-viewer.c:338 -#, c-format -msgid "Certificate Viewer: %s" -msgstr "Certifikat-viser: %s" +#: ../widgets/misc/e-attachment-dialog.c:363 +#, fuzzy +msgid "MIME Type:" +msgstr "MIME-type" -#: ../smime/gui/component.c:46 -#, c-format -msgid "Enter the password for `%s'" -msgstr "Indtast adgangskoden for \"%s\"" +#: ../widgets/misc/e-attachment-handler-image.c:95 +#, fuzzy +msgid "Could not set as background" +msgstr "Vælg som _baggrund" -#. we're setting the password initially -#: ../smime/gui/component.c:69 -msgid "Enter new password for certificate database" -msgstr "Indtast ny adgangskode for certifikat-databasen" +#: ../widgets/misc/e-attachment-handler-sendto.c:87 +#, fuzzy +msgid "Could not send attachment" +msgid_plural "Could not send attachments" +msgstr[0] "Kunne ikke åbne link." +msgstr[1] "Kunne ikke åbne link." -#: ../smime/gui/component.c:71 -msgid "Enter new password" -msgstr "Indtast ny adgangskode" +#: ../widgets/misc/e-attachment-handler-sendto.c:129 +#, fuzzy +msgid "_Send To..." +msgstr "Send til:" -#. FIXME: add serial no, validity date, uses -#: ../smime/gui/e-cert-selector.c:117 -#, c-format -msgid "" -"Issued to:\n" -" Subject: %s\n" -msgstr "" -"Udstedt til:\n" -" Emne: %s\n" +#: ../widgets/misc/e-attachment-handler-sendto.c:131 +#, fuzzy +msgid "Send the selected attachments somewhere" +msgstr "Vælg mappen hvor de valgte bilag skal gemmes..." -#: ../smime/gui/e-cert-selector.c:118 -#, c-format -msgid "" -"Issued by:\n" -" Subject: %s\n" -msgstr "" -"Udstedt af:\n" -" Emne: %s\n" +#: ../widgets/misc/e-attachment-icon-view.c:473 +#: ../widgets/misc/e-attachment-tree-view.c:517 +#, fuzzy +msgid "Loading" +msgstr "Indlæser..." -#: ../smime/gui/e-cert-selector.c:170 -msgid "Select certificate" -msgstr "Vælg certifikat" +#: ../widgets/misc/e-attachment-icon-view.c:485 +#: ../widgets/misc/e-attachment-tree-view.c:529 +#, fuzzy +msgid "Saving" +msgstr "Skyggelægning" -#: ../smime/gui/smime-ui.glade.h:1 -msgid "" -msgstr "" +#: ../widgets/misc/e-attachment-paned.c:80 +msgid "Hide _Attachment Bar" +msgstr "Skj_ul bilagspanel" -#: ../smime/gui/smime-ui.glade.h:2 -msgid "Certificate Fields" -msgstr "Certifikat-felter" +#: ../widgets/misc/e-attachment-paned.c:82 +#: ../widgets/misc/e-attachment-paned.c:618 +msgid "Show _Attachment Bar" +msgstr "_Vis bilagspanel" -#: ../smime/gui/smime-ui.glade.h:3 -msgid "Certificate Hierarchy" -msgstr "Certifikat-hierarki" +#: ../widgets/misc/e-attachment-store.c:541 +#, fuzzy +msgid "Add Attachment" +msgstr "Bilag" -#: ../smime/gui/smime-ui.glade.h:4 -msgid "Field Value" -msgstr "Feltværdi" +#: ../widgets/misc/e-attachment-store.c:544 +msgid "A_ttach" +msgstr "_Vedlæg" -#: ../smime/gui/smime-ui.glade.h:5 -msgid "Fingerprints" -msgstr "Fingeraftryk" +#: ../widgets/misc/e-attachment-store.c:607 +#, fuzzy +msgid "Save Attachment" +msgid_plural "Save Attachments" +msgstr[0] "Gem bilag" +msgstr[1] "Gem bilag" -#: ../smime/gui/smime-ui.glade.h:6 -msgid "Issued By" -msgstr "Udstedt af" +#: ../widgets/misc/e-attachment-view.c:300 +msgid "S_ave All" +msgstr "_Gem alt" -#: ../smime/gui/smime-ui.glade.h:7 -msgid "Issued To" -msgstr "Udstedt til" +#: ../widgets/misc/e-attachment-view.c:326 +#, fuzzy +msgid "A_dd Attachment..." +msgstr "_Tilføj bilag..." -#: ../smime/gui/smime-ui.glade.h:8 -msgid "This certificate has been verified for the following uses:" -msgstr "Dette certifikat er verificeret til følgende brug:" +#: ../widgets/misc/e-attachment-view.c:646 +#, fuzzy, c-format +msgid "Open with \"%s\"" +msgstr "Åbn i %s..." -#: ../smime/gui/smime-ui.glade.h:9 -msgid "Validity" -msgstr "Gyldighed" +#: ../widgets/misc/e-attachment-view.c:649 +#, fuzzy, c-format +msgid "Open this attachment in %s" +msgstr "Påmind om _manglende bilag" -#: ../smime/gui/smime-ui.glade.h:10 -msgid "Authorities" -msgstr "Myndigheder" +#. This is a strftime() format. %B = Month name, %Y = Year. +#: ../widgets/misc/e-calendar-item.c:1267 +msgid "%B %Y" +msgstr "%B %Y" -#: ../smime/gui/smime-ui.glade.h:11 -msgid "Backup" -msgstr "Tag sikkerhedskopi" +#: ../widgets/misc/e-calendar.c:220 +msgid "Month Calendar" +msgstr "Månedskalender" -#: ../smime/gui/smime-ui.glade.h:12 -msgid "Backup All" -msgstr "Sikkerhedskopiér alle" +#: ../widgets/misc/e-canvas-background.c:454 +#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3645 +#: ../widgets/text/e-text.c:3646 +msgid "Fill color" +msgstr "Udfyldningsfarve" -#: ../smime/gui/smime-ui.glade.h:13 -msgid "" -"Before trusting this CA for any purpose, you should examine its certificate " -"and its policy and procedures (if available)." -msgstr "" -"Før du stoler på denne CA til noget formål, bør du undersøge dens " -"certifikat, regelsæt og procedurer (hvis de er tilgængelige)." +#: ../widgets/misc/e-canvas-background.c:461 +#: ../widgets/misc/e-canvas-background.c:462 +#: ../widgets/misc/e-canvas-background.c:468 +#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3652 +#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3660 +#: ../widgets/text/e-text.c:3661 +msgid "GDK fill color" +msgstr "GDK-udfyldningsfarve" -#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060 -msgid "Certificate" -msgstr "Certifikat" +#: ../widgets/misc/e-canvas-background.c:475 +#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3667 +#: ../widgets/text/e-text.c:3668 +msgid "Fill stipple" +msgstr "Udfyldningssting" -#: ../smime/gui/smime-ui.glade.h:15 -msgid "Certificate Authority Trust" -msgstr "Troværdighed for certificeringsmyndighed" +#: ../widgets/misc/e-canvas-background.c:482 +#: ../widgets/misc/e-canvas-background.c:483 +msgid "X1" +msgstr "X1" -#: ../smime/gui/smime-ui.glade.h:16 -msgid "Certificate details" -msgstr "Certifikat-detaljer" +#: ../widgets/misc/e-canvas-background.c:489 +#: ../widgets/misc/e-canvas-background.c:490 +msgid "X2" +msgstr "X2" -#: ../smime/gui/smime-ui.glade.h:17 -msgid "Certificates Table" -msgstr "Certifikat-tabel" +#: ../widgets/misc/e-canvas-background.c:496 +#: ../widgets/misc/e-canvas-background.c:497 +msgid "Y1" +msgstr "Y1" -#: ../smime/gui/smime-ui.glade.h:18 -msgid "Common Name (CN)" -msgstr "Normalt navn (CN)" +#: ../widgets/misc/e-canvas-background.c:503 +#: ../widgets/misc/e-canvas-background.c:504 +msgid "Y2" +msgstr "Y2" -#: ../smime/gui/smime-ui.glade.h:19 -msgid "Contact Certificates" -msgstr "Kontaktpersoners certifikater" +#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1416 +#: ../widgets/table/e-table-group-container.c:1003 +#: ../widgets/table/e-table-group-leaf.c:649 +#: ../widgets/table/e-table-item.c:3070 +msgid "Minimum width" +msgstr "Min. bredde" -#: ../smime/gui/smime-ui.glade.h:21 -msgid "Do not trust the authenticity of this certificate" -msgstr "Stol ikke på at dette certifikat er autentisk" +#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1417 +#: ../widgets/table/e-table-group-container.c:1004 +#: ../widgets/table/e-table-group-leaf.c:650 +#: ../widgets/table/e-table-item.c:3071 +msgid "Minimum Width" +msgstr "Mindste bredde" -#: ../smime/gui/smime-ui.glade.h:22 -msgid "Dummy window only" -msgstr "Kun attrapvindue" +#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102 +msgid "Spacing" +msgstr "Mellemrum" -#: ../smime/gui/smime-ui.glade.h:23 -msgid "Edit" -msgstr "Ret" +#: ../widgets/misc/e-cell-date-edit.c:300 +msgid "Now" +msgstr "Nu" -#: ../smime/gui/smime-ui.glade.h:24 -msgid "Email Certificate Trust Settings" -msgstr "Opsætning af troværdighed for e-post-certifikat" +#: ../widgets/misc/e-cell-date-edit.c:865 +#, c-format +msgid "The time must be in the format: %s" +msgstr "Datoen skal skrives ind på formatet: %s" -#: ../smime/gui/smime-ui.glade.h:25 -msgid "Email Recipient Certificate" -msgstr "Certifikat for e-post-modtager" +#: ../widgets/misc/e-cell-percent.c:77 +msgid "The percent value must be between 0 and 100, inclusive" +msgstr "Procentværdien skal være mellem 0 og 100, begge inklusive" -#: ../smime/gui/smime-ui.glade.h:26 -msgid "Email Signer Certificate" -msgstr "Certifikat for indehaver af e-post-signatur" +#: ../widgets/misc/e-charset-picker.c:57 +msgid "Arabic" +msgstr "Arabisk" -#: ../smime/gui/smime-ui.glade.h:27 -msgid "Expires On" -msgstr "Udløber den" +#: ../widgets/misc/e-charset-picker.c:58 +msgid "Baltic" +msgstr "Baltisk" -#: ../smime/gui/smime-ui.glade.h:29 -msgid "Import" -msgstr "Importér" +#: ../widgets/misc/e-charset-picker.c:59 +msgid "Central European" +msgstr "Centraleuropæisk" -#: ../smime/gui/smime-ui.glade.h:30 -msgid "Issued On" -msgstr "Udstedt den" +#: ../widgets/misc/e-charset-picker.c:60 +msgid "Chinese" +msgstr "Kinesisk" -#: ../smime/gui/smime-ui.glade.h:31 -msgid "MD5 Fingerprint" -msgstr "MD5-fingeraftryk" +#: ../widgets/misc/e-charset-picker.c:61 +msgid "Cyrillic" +msgstr "Kyrillisk" -#: ../smime/gui/smime-ui.glade.h:32 -msgid "Organization (O)" -msgstr "Organisation (O)" +#: ../widgets/misc/e-charset-picker.c:62 +msgid "Greek" +msgstr "Græsk" -#: ../smime/gui/smime-ui.glade.h:33 -msgid "Organizational Unit (OU)" -msgstr "Organisationsenhed (OU)" +#: ../widgets/misc/e-charset-picker.c:63 +msgid "Hebrew" +msgstr "Hebraisk" -#: ../smime/gui/smime-ui.glade.h:34 -msgid "SHA1 Fingerprint" -msgstr "SHA1-fingeraftryk" +#: ../widgets/misc/e-charset-picker.c:64 +msgid "Japanese" +msgstr "Japansk" -#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802 -msgid "SSL Client Certificate" -msgstr "Certifikat for SSL-klient" +#: ../widgets/misc/e-charset-picker.c:65 +msgid "Korean" +msgstr "Koreansk" -#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806 -msgid "SSL Server Certificate" -msgstr "Certifikat for SSL-server" +#: ../widgets/misc/e-charset-picker.c:66 +msgid "Thai" +msgstr "Thai" -#: ../smime/gui/smime-ui.glade.h:38 -msgid "Trust the authenticity of this certificate" -msgstr "Stol på at dette certifikat er autentisk" +#: ../widgets/misc/e-charset-picker.c:67 +msgid "Turkish" +msgstr "Tyrkisk" -#: ../smime/gui/smime-ui.glade.h:39 -msgid "Trust this CA to identify email users." -msgstr "Stol på at denne CA kan identificere bruger af e-post." +#: ../widgets/misc/e-charset-picker.c:68 +msgid "Unicode" +msgstr "UCS" -#: ../smime/gui/smime-ui.glade.h:40 -msgid "Trust this CA to identify software developers." -msgstr "Stol på at denne CA kan identificere programmører." +#: ../widgets/misc/e-charset-picker.c:69 +msgid "Western European" +msgstr "Vesteuropæisk" -#: ../smime/gui/smime-ui.glade.h:41 -msgid "Trust this CA to identify web sites." -msgstr "Stol på at denne CA kan identificere netsteder." +#: ../widgets/misc/e-charset-picker.c:70 +msgid "Western European, New" +msgstr "Vesteuropæisk, ny" -#: ../smime/gui/smime-ui.glade.h:42 -msgid "View" -msgstr "Vis" +#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90 +#: ../widgets/misc/e-charset-picker.c:91 +msgid "Traditional" +msgstr "Traditionel" -#: ../smime/gui/smime-ui.glade.h:43 -msgid "You have certificates from these organizations that identify you:" -msgstr "Du har certifikater som identificerer dig fra disse organisationene:" +#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93 +#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95 +msgid "Simplified" +msgstr "Forenklet" -#: ../smime/gui/smime-ui.glade.h:44 -msgid "" -"You have certificates on file that identify these certificate authorities:" -msgstr "" -"Du har certifikater på filer som identificerer disse certifikat-myndigheder:" +#: ../widgets/misc/e-charset-picker.c:98 +msgid "Ukrainian" +msgstr "Ukrainsk" -#: ../smime/gui/smime-ui.glade.h:45 -msgid "You have certificates on file that identify these people:" -msgstr "Du har arkiverede certifikater som identificerer disse mennesker:" +#: ../widgets/misc/e-charset-picker.c:101 +msgid "Visual" +msgstr "Visuel" -#: ../smime/gui/smime-ui.glade.h:46 -msgid "Your Certificates" -msgstr "Dine certifikater" +#: ../widgets/misc/e-charset-picker.c:170 +#, c-format +msgid "Unknown character set: %s" +msgstr "Ukendt tegnsæt: %s" -#: ../smime/gui/smime-ui.glade.h:47 -msgid "_Edit CA Trust" -msgstr "_Redigér troværdighed for certificeringsmyndighed" +#: ../widgets/misc/e-charset-picker.c:215 +msgid "Character Encoding" +msgstr "Tegnkodning" -#. XXX we shouldn't be popping up dialogs in this code. -#: ../smime/lib/e-cert-db.c:656 -msgid "Certificate already exists" -msgstr "Certifikatet findes allerede" +#: ../widgets/misc/e-charset-picker.c:230 +msgid "Enter the character set to use" +msgstr "Indtast tegnsæt som skal bruges" -#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232 -msgid "%d/%m/%Y" -msgstr "%d/%m/%Y" +#: ../widgets/misc/e-charset-picker.c:337 +msgid "Other..." +msgstr "Andre..." -#. x509 certificate usage types -#: ../smime/lib/e-cert.c:408 -msgid "Sign" -msgstr "Underskriv" +#: ../widgets/misc/e-charset-picker.c:599 +msgid "Ch_aracter Encoding" +msgstr "Tegnk_odning" -#: ../smime/lib/e-cert.c:409 -msgid "Encrypt" -msgstr "Kryptér" +#: ../widgets/misc/e-dateedit.c:302 +msgid "Date and Time" +msgstr "Dato og tidspunkt" -#: ../smime/lib/e-cert.c:514 -msgid "Version" -msgstr "Version" +#: ../widgets/misc/e-dateedit.c:323 +msgid "Text entry to input date" +msgstr "Tekstindtastningsfelt til indtastning af dato" -#: ../smime/lib/e-cert.c:529 -msgid "Version 1" -msgstr "Version 1" +#: ../widgets/misc/e-dateedit.c:345 +msgid "Click this button to show a calendar" +msgstr "Klík på denne knap for at vise en kalender" -#: ../smime/lib/e-cert.c:532 -msgid "Version 2" -msgstr "Version 2" +#: ../widgets/misc/e-dateedit.c:387 +msgid "Drop-down combination box to select time" +msgstr "Rullegardin-kombinationsfelt for valg af tid" -#: ../smime/lib/e-cert.c:535 -msgid "Version 3" -msgstr "Version 3" +#: ../widgets/misc/e-dateedit.c:463 +msgid "No_w" +msgstr "N_u" -#: ../smime/lib/e-cert.c:617 -msgid "PKCS #1 MD2 With RSA Encryption" -msgstr "PKCS #1 MD2 med RSA-kryptering" +#: ../widgets/misc/e-dateedit.c:469 +msgid "_Today" +msgstr "I _dag" -#: ../smime/lib/e-cert.c:620 -msgid "PKCS #1 MD5 With RSA Encryption" -msgstr "PKCS #1 MD5 med RSA-kryptering" +#: ../widgets/misc/e-dateedit.c:1634 +msgid "Invalid Date Value" +msgstr "Ugyldig datoværdi" -#: ../smime/lib/e-cert.c:623 -msgid "PKCS #1 SHA-1 With RSA Encryption" -msgstr "PKCS #1 SHA-1 med RSA-kryptering" +#: ../widgets/misc/e-dateedit.c:1665 +msgid "Invalid Time Value" +msgstr "Ugyldig tidsværdi" -#: ../smime/lib/e-cert.c:650 -msgid "PKCS #1 RSA Encryption" -msgstr "PKCS #1 RSA-kryptering" +#. FIXME: get the toplevel window... +#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180 +#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:742 +msgid "Advanced Search" +msgstr "Avanceret søgning" -#: ../smime/lib/e-cert.c:653 -msgid "Certificate Key Usage" -msgstr "Certifikat-nøglebenyttelse" +#. FIXME: get the toplevel window... +#: ../widgets/misc/e-filter-bar.c:231 +msgid "Save Search" +msgstr "Gem søgning" -#: ../smime/lib/e-cert.c:656 -msgid "Netscape Certificate Type" -msgstr "Netscape certifikat-type" +#: ../widgets/misc/e-filter-bar.c:268 +msgid "_Searches" +msgstr "_Søgninger" -#: ../smime/lib/e-cert.c:659 -msgid "Certificate Authority Key Identifier" -msgstr "Certificeringsmyndighed til nøgleidentifikation" +#: ../widgets/misc/e-filter-bar.c:270 +msgid "Searches" +msgstr "Søgninger" -#: ../smime/lib/e-cert.c:671 -#, c-format -msgid "Object Identifier (%s)" -msgstr "Objekt-identifikation (%s)" +#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:113 +msgid "_Save Search..." +msgstr "_Gem søgning..." -#: ../smime/lib/e-cert.c:722 -msgid "Algorithm Identifier" -msgstr "Algoritme-identifikation" +#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:114 +msgid "_Edit Saved Searches..." +msgstr "_Redigér gemte søgninger..." -#: ../smime/lib/e-cert.c:730 -msgid "Algorithm Parameters" -msgstr "Parametre for algoritme" +#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:115 +msgid "_Advanced Search..." +msgstr "_Avanceret søgning..." -#: ../smime/lib/e-cert.c:752 -msgid "Subject Public Key Info" -msgstr "Information om emnets offentlige nøgle" +#: ../widgets/misc/e-filter-bar.h:106 +msgid "All Accounts" +msgstr "Alle konti" -#: ../smime/lib/e-cert.c:757 -msgid "Subject Public Key Algorithm" -msgstr "Algoritme for emnets offentlige nøgle" +#: ../widgets/misc/e-filter-bar.h:107 +msgid "Current Account" +msgstr "Aktuel konto" -#: ../smime/lib/e-cert.c:772 -msgid "Subject's Public Key" -msgstr "Emnets offentlige nøgle" +#: ../widgets/misc/e-filter-bar.h:108 +msgid "Current Folder" +msgstr "Aktuel mappe" -#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842 -msgid "Error: Unable to process extension" -msgstr "Fejl: Kan ikke behandle udvidelsen" +#: ../widgets/misc/e-image-chooser.c:168 +msgid "Choose Image" +msgstr "Vælg billede" -#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826 -msgid "Object Signer" -msgstr "Indehaver af signatur for objekt" +#: ../widgets/misc/e-map.c:627 +msgid "World Map" +msgstr "Verdenskort" -#: ../smime/lib/e-cert.c:818 -msgid "SSL Certificate Authority" -msgstr "SSL-certificeringsmyndighed" +#: ../widgets/misc/e-map.c:629 +msgid "" +"Mouse-based interactive map widget for selecting timezone. Keyboard users " +"should instead select the timezone from the drop-down combination box below." +msgstr "" +"Musebaseret interaktiv kort-kontrol til at vælge tidszone. Tastatur-brugere " +"bør i stedet vælge tidszonen fra rullegardin-kombinationsfeltet nedenfor." -#: ../smime/lib/e-cert.c:822 -msgid "Email Certificate Authority" -msgstr "E-post-certificeringsmyndighed" +#: ../widgets/misc/e-online-button.c:106 +msgid "Online" +msgstr "Opkoblet" -#: ../smime/lib/e-cert.c:850 -msgid "Signing" -msgstr "Underskriver" +#: ../widgets/misc/e-online-button.c:107 +msgid "The button state is online" +msgstr "Knappens tilstand er opkoblet" -#: ../smime/lib/e-cert.c:854 -msgid "Non-repudiation" -msgstr "Ingen-tilbagevisning" +#: ../widgets/misc/e-pilot-settings.c:102 +msgid "Sync with:" +msgstr "Synkronisér med:" -#: ../smime/lib/e-cert.c:858 -msgid "Key Encipherment" -msgstr "Nøgle-kodning" +#: ../widgets/misc/e-pilot-settings.c:110 +msgid "Sync Private Records:" +msgstr "Synkroniser private poster:" -#: ../smime/lib/e-cert.c:862 -msgid "Data Encipherment" -msgstr "Data-kodning" +#: ../widgets/misc/e-pilot-settings.c:119 +msgid "Sync Categories:" +msgstr "Synkroniser kategorier:" -#: ../smime/lib/e-cert.c:866 -msgid "Key Agreement" -msgstr "Nøgle-aftale" +#: ../widgets/misc/e-reflow.c:1438 ../widgets/misc/e-reflow.c:1439 +msgid "Empty message" +msgstr "Tomt brev" -#: ../smime/lib/e-cert.c:870 -msgid "Certificate Signer" -msgstr "Certifikat for indehaver af signatur" +#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446 +msgid "Reflow model" +msgstr "Genstrømsmodel" -#: ../smime/lib/e-cert.c:874 -msgid "CRL Signer" -msgstr "Indehaver af CRL-signatur" +#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453 +msgid "Column width" +msgstr "Kolonnebredde" -#: ../smime/lib/e-cert.c:922 -msgid "Critical" -msgstr "Kritisk" +#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:475 +#: ../widgets/misc/e-search-bar.c:477 +msgid "Search" +msgstr "Søg" -#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927 -msgid "Not Critical" -msgstr "Ukritisk" +#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:475 +#: ../widgets/misc/e-search-bar.c:477 +msgid "Click here to change the search type" +msgstr "Klik her for at ændre søgningstypen" -#: ../smime/lib/e-cert.c:948 -msgid "Extensions" -msgstr "Udvidelser" +#: ../widgets/misc/e-search-bar.c:608 +msgid "_Search" +msgstr "_Søg" -#: ../smime/lib/e-cert.c:1019 -#, c-format -msgid "%s = %s" -msgstr "%s = %s" +#: ../widgets/misc/e-search-bar.c:614 +msgid "_Find Now" +msgstr "_Søg nu" -#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195 -msgid "Certificate Signature Algorithm" -msgstr "Certifikat-signaturalgoritme" +#: ../widgets/misc/e-search-bar.c:615 +msgid "_Clear" +msgstr "_Tøm" -#: ../smime/lib/e-cert.c:1084 -msgid "Issuer" -msgstr "Udsteder" +#: ../widgets/misc/e-search-bar.c:870 +msgid "Item ID" +msgstr "Objekt-id" -#: ../smime/lib/e-cert.c:1138 -msgid "Issuer Unique ID" -msgstr "Unik id for udsteder" +#: ../widgets/misc/e-search-bar.c:877 ../widgets/text/e-text.c:3567 +#: ../widgets/text/e-text.c:3568 +msgid "Text" +msgstr "Tekst" -#: ../smime/lib/e-cert.c:1157 -msgid "Subject Unique ID" -msgstr "Emnets entydige id" +#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose +#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on... +#: ../widgets/misc/e-search-bar.c:1013 +msgid "Sho_w: " +msgstr "V_is: " -#: ../smime/lib/e-cert.c:1200 -msgid "Certificate Signature Value" -msgstr "Certifikat-signaturværdi" +#: ../widgets/misc/e-search-bar.c:1032 +msgid "Sear_ch: " +msgstr "Sø_g: " -#: ../smime/lib/e-pkcs12.c:249 -msgid "PKCS12 File Password" -msgstr "Adgangskode for PKCS12-fil" +#. To Translators: The " in " label is part of the Quick Search Bar, example: +#. Search: | | in | Current Folder/All Accounts/Current Account +#: ../widgets/misc/e-search-bar.c:1048 +msgid " i_n " +msgstr " _i " -#: ../smime/lib/e-pkcs12.c:249 -msgid "Enter password for PKCS12 file:" -msgstr "Indtast adgangskode for PKCS12-filen:" +#: ../widgets/misc/e-selection-model-array.c:594 +#: ../widgets/table/e-tree-selection-model.c:806 +msgid "Cursor Row" +msgstr "Markørrække" -#: ../smime/lib/e-pkcs12.c:348 -msgid "Imported Certificate" -msgstr "Importeret certifikat" +#: ../widgets/misc/e-selection-model-array.c:601 +#: ../widgets/table/e-tree-selection-model.c:813 +msgid "Cursor Column" +msgstr "Markørkolonne" -#. This most likely means that KILL_PROCESS_CMD wasn't -#. * found, so just bail completely. -#. -#: ../tools/killev.c:61 -#, c-format -msgid "Could not execute '%s': %s\n" -msgstr "Kunne ikke udføre \"%s\": %s\n" +#: ../widgets/misc/e-selection-model.c:208 +msgid "Sorter" +msgstr "Sortér" -#: ../tools/killev.c:76 -#, c-format -msgid "Shutting down %s (%s)\n" -msgstr "Lukker %s (%s) ned\n" +#: ../widgets/misc/e-selection-model.c:215 +msgid "Selection Mode" +msgstr "Markeringstilstand" -#: ../ui/evolution-addressbook.xml.h:1 -msgid "Address _Book Properties" -msgstr "Egenskaber for adresse_bog" +#: ../widgets/misc/e-selection-model.c:223 +msgid "Cursor Mode" +msgstr "Markørtilstand" -#: ../ui/evolution-addressbook.xml.h:3 -msgid "Change the properties of the selected folder" -msgstr "Ret egenskaber for den valgte mappe" +#: ../widgets/misc/e-send-options.c:522 +msgid "When de_leted:" +msgstr "Ved s_letning:" -#: ../ui/evolution-addressbook.xml.h:4 -msgid "Co_py All Contacts To..." -msgstr "_Kopiér alle kontaktpersoner til..." +#: ../widgets/misc/e-send-options.glade.h:1 +msgid "Delivery Options" +msgstr "Valgmuligheder for levering" -#: ../ui/evolution-addressbook.xml.h:5 -msgid "Contact _Preview" -msgstr "_Vis udskrift af kontaktperson" +#: ../widgets/misc/e-send-options.glade.h:2 +msgid "Replies" +msgstr "Svar" -#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2 -#: ../ui/evolution-tasks.xml.h:2 -msgid "Copy" -msgstr "Kopiér" +#: ../widgets/misc/e-send-options.glade.h:3 +msgid "Return Notification" +msgstr "Returnér påmindelse" -#: ../ui/evolution-addressbook.xml.h:7 -msgid "Copy selected contacts to another folder" -msgstr "Kopiér de valgte kontaktpersoner til en anden mappe" +#: ../widgets/misc/e-send-options.glade.h:4 +msgid "Status Tracking" +msgstr "Statussporing" -#: ../ui/evolution-addressbook.xml.h:8 -msgid "Copy the contacts of the selected folder into another folder" -msgstr "Kopiér kontaktpersonerne i den valgte mappe til en anden mappe" +#: ../widgets/misc/e-send-options.glade.h:5 +msgid "A_uto-delete sent item" +msgstr "Slet a_utomatisk sendte poster" -#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2 -msgid "Copy the selection" -msgstr "Kopier det valgte" +#: ../widgets/misc/e-send-options.glade.h:6 +msgid "Creat_e a sent item to track information" +msgstr "Opret _et sendt-element for at spore information" -#: ../ui/evolution-addressbook.xml.h:10 -msgid "Copy to Folder..." -msgstr "Kopiér til mappe..." +#: ../widgets/misc/e-send-options.glade.h:7 +msgid "Deli_vered and opened" +msgstr "Le_veret og åbnet" -#: ../ui/evolution-addressbook.xml.h:11 -msgid "Create a new address book folder" -msgstr "Opret en ny mappe til adressebøger" +#: ../widgets/misc/e-send-options.glade.h:8 +msgid "Gene_ral Options" +msgstr "Gene_relle valgmuligheder" -#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4 -#: ../ui/evolution-tasks.xml.h:4 -msgid "Cut" -msgstr "Klip" +#: ../widgets/misc/e-send-options.glade.h:9 +msgid "" +"None\n" +"Mail Receipt" +msgstr "" +"Ingen\n" +"Kvittering for brev" -#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3 -msgid "Cut the selection" -msgstr "Klip det markerede ud" +#: ../widgets/misc/e-send-options.glade.h:11 +msgid "" +"Normal\n" +"Proprietary\n" +"Confidential\n" +"Secret\n" +"Top Secret\n" +"For Your Eyes Only" +msgstr "" +"Normal\n" +"Navnebeskyttet\n" +"Fortroligt\n" +"Hemmeligt\n" +"Top-hemmeligt\n" +"Ekstra fortroligt" -#: ../ui/evolution-addressbook.xml.h:14 -msgid "Del_ete Address Book" -msgstr "Sl_et adressebog" +#: ../widgets/misc/e-send-options.glade.h:17 +msgid "R_eply requested" +msgstr "_Svar forespurgt" -#: ../ui/evolution-addressbook.xml.h:16 -msgid "Delete selected contacts" -msgstr "Slet de valgte kontaktpersoner" +#: ../widgets/misc/e-send-options.glade.h:19 +msgid "Sta_tus Tracking" +msgstr "Sta_tus-sporing" -#: ../ui/evolution-addressbook.xml.h:17 -msgid "Delete the selected folder" -msgstr "Slet den valgte mappe" +#: ../widgets/misc/e-send-options.glade.h:20 +msgid "" +"Undefined\n" +"High\n" +"Standard\n" +"Low" +msgstr "" +"Udefineret\n" +"Høj\n" +"Standard\n" +"Lav" + +#: ../widgets/misc/e-send-options.glade.h:24 +msgid "When acce_pted:" +msgstr "Ved _godkendelse:" -#: ../ui/evolution-addressbook.xml.h:18 -msgid "Forward Contact" -msgstr "Videresend kontaktperson" +#: ../widgets/misc/e-send-options.glade.h:25 +msgid "When co_mpleted:" +msgstr "Ved _fuldførelse:" -#: ../ui/evolution-addressbook.xml.h:19 -msgid "Mo_ve All Contacts To..." -msgstr "Fl_yt alle kontaktpersoner til..." +#: ../widgets/misc/e-send-options.glade.h:26 +msgid "When decli_ned:" +msgstr "Ved afvis_ning:" -#: ../ui/evolution-addressbook.xml.h:20 -msgid "Move selected contacts to another folder" -msgstr "Flyt de valgte kontaktpersoner til en anden mappe" +#: ../widgets/misc/e-send-options.glade.h:27 +msgid "Wi_thin" +msgstr "_Inden for" -#: ../ui/evolution-addressbook.xml.h:21 -msgid "Move the contacts of the selected folder into another folder" -msgstr "Flyt kontaktpersonerne i den valgte mappe til en anden mappe" +#: ../widgets/misc/e-send-options.glade.h:28 +msgid "_After:" +msgstr "_Efter:" -#: ../ui/evolution-addressbook.xml.h:22 -msgid "Move to Folder..." -msgstr "Flyt til mappe..." +#: ../widgets/misc/e-send-options.glade.h:29 +msgid "_All information" +msgstr "_Al information" -#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8 -#: ../ui/evolution-tasks.xml.h:11 -msgid "Paste" -msgstr "Indsæt" +#: ../widgets/misc/e-send-options.glade.h:30 +#, fuzzy +msgid "_Classification:" +msgstr "K_lassificering" -#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17 -msgid "Paste the clipboard" -msgstr "Indsæt fra klippebordet" +#. To translators: This means Delay the message delivery for some time +#: ../widgets/misc/e-send-options.glade.h:32 +msgid "_Delay message delivery" +msgstr "_Forsink levering af brev" -#: ../ui/evolution-addressbook.xml.h:25 -msgid "Previews the contacts to be printed" -msgstr "Forhåndsviser kontaktpersoner som skal udskrives" +#: ../widgets/misc/e-send-options.glade.h:33 +msgid "_Delivered" +msgstr "_Leveret" -#: ../ui/evolution-addressbook.xml.h:28 -msgid "Print selected contacts" -msgstr "Udskriv valgte kontaktpersoner" +#: ../widgets/misc/e-send-options.glade.h:35 +msgid "_Set expiration date" +msgstr "_Sæt udløbsdato" -#: ../ui/evolution-addressbook.xml.h:29 -msgid "Rename the selected folder" -msgstr "Omdøb den valgte mappe" +#: ../widgets/misc/e-send-options.glade.h:36 +msgid "_Until:" +msgstr "_Indtil:" -#: ../ui/evolution-addressbook.xml.h:30 -msgid "S_ave Address Book As VCard" -msgstr "Gem adressebog som _VCard" +#: ../widgets/misc/e-send-options.glade.h:37 +msgid "_When convenient" +msgstr "_Når det er belejligt" -#: ../ui/evolution-addressbook.xml.h:31 -msgid "Save as VCard..." -msgstr "Gem som VCard..." +#: ../widgets/misc/e-send-options.glade.h:38 +msgid "_When opened:" +msgstr "_Ved åbning:" -#: ../ui/evolution-addressbook.xml.h:32 -msgid "Save selected contacts as a VCard" -msgstr "Gem de valgte kontaktpersoner som et VCard" +#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects") +#: ../widgets/misc/e-task-widget.c:252 +#, c-format +msgid "%s (...)" +msgstr "%s (...)" -#: ../ui/evolution-addressbook.xml.h:33 -msgid "Save the contacts of the selected folder as VCard" -msgstr "Gem kontaktpersonerne i den valgte mappe som et VCard" +#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects"); +#. %d is a number between 0 and 100, describing the percentage of operation complete +#: ../widgets/misc/e-task-widget.c:258 +#, c-format +msgid "%s (%d%% complete)" +msgstr "%s (%d%% fuldført)" -#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724 -msgid "Select All" -msgstr "Marker alt" +#: ../widgets/misc/e-url-entry.c:105 +msgid "Click here to go to URL" +msgstr "Klik her for at gå til adresse" -#: ../ui/evolution-addressbook.xml.h:35 -msgid "Select _All" -msgstr "Markér _alt" +#: ../widgets/table/e-cell-combo.c:173 +msgid "popup list" +msgstr "pop op-liste" -#: ../ui/evolution-addressbook.xml.h:36 -msgid "Select all contacts" -msgstr "Vælg alle kontaktpersoner" +#: ../widgets/table/e-cell-date.c:63 +msgid "%l:%M %p" +msgstr "%H:%M" -#: ../ui/evolution-addressbook.xml.h:37 -msgid "Send a message to the selected contacts" -msgstr "Send et brev til de valgte kontaktpersoner" +#: ../widgets/table/e-cell-pixbuf.c:360 +msgid "Selected Column" +msgstr "Markeret kolonne" -#: ../ui/evolution-addressbook.xml.h:38 -msgid "Send message to contact" -msgstr "Send brev til kontaktperson" +#: ../widgets/table/e-cell-pixbuf.c:367 +msgid "Focused Column" +msgstr "Kolonne med fokus" -#: ../ui/evolution-addressbook.xml.h:39 -msgid "Send selected contacts to another person" -msgstr "Send valgte kontaktpersoner til en anden person" +#: ../widgets/table/e-cell-pixbuf.c:374 +msgid "Unselected Column" +msgstr "Umarkeret kolonne" -#: ../ui/evolution-addressbook.xml.h:40 -msgid "Show contact preview window" -msgstr "Vis vinduet med forhåndsvisning af kontaktperson" +#: ../widgets/table/e-cell-text.c:1800 +msgid "Strikeout Column" +msgstr "Udstreget kolonne" -#: ../ui/evolution-addressbook.xml.h:41 -msgid "St_op" -msgstr "St_op" +#: ../widgets/table/e-cell-text.c:1807 +msgid "Underline Column" +msgstr "Understreget kolonne" -#: ../ui/evolution-addressbook.xml.h:42 -msgid "Stop" -msgstr "Stop" +#: ../widgets/table/e-cell-text.c:1814 +msgid "Bold Column" +msgstr "Fed kolonne" -#: ../ui/evolution-addressbook.xml.h:43 -msgid "Stop Loading" -msgstr "Stop indlæsning" +#: ../widgets/table/e-cell-text.c:1821 +msgid "Color Column" +msgstr "Farvet kolonne" -#: ../ui/evolution-addressbook.xml.h:44 -msgid "View the current contact" -msgstr "Vis den aktuelle kontaktperson" +#: ../widgets/table/e-cell-text.c:1835 +msgid "BG Color Column" +msgstr "Kolonnebaggrundsfarve" -#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39 -#: ../ui/evolution-tasks.xml.h:21 -msgid "_Actions" -msgstr "H_andlinger" +#: ../widgets/table/e-table-config.c:152 +msgid "State" +msgstr "Tilstand" -#: ../ui/evolution-addressbook.xml.h:47 -msgid "_Copy Contact to..." -msgstr "Kopiér _kontaktperson til..." +#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427 +msgid "(Ascending)" +msgstr "(Stigende)" -#: ../ui/evolution-addressbook.xml.h:48 -msgid "_Copy Folder Contacts To" -msgstr "_Kopiér kontaktpersoner i mappe til" +#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427 +msgid "(Descending)" +msgstr "(Faldende)" -#: ../ui/evolution-addressbook.xml.h:50 -msgid "_Delete Contact" -msgstr "_Slet kontaktperson" +#: ../widgets/table/e-table-config.c:392 +msgid "Not sorted" +msgstr "Ikke sorteret" -#: ../ui/evolution-addressbook.xml.h:52 -msgid "_Forward Contact..." -msgstr "_Videresend kontaktperson..." +#: ../widgets/table/e-table-config.c:433 +msgid "No grouping" +msgstr "Ingen gruppering" -#: ../ui/evolution-addressbook.xml.h:53 -msgid "_Move Contact to..." -msgstr "_Flyt kontaktperson til..." +#: ../widgets/table/e-table-config.c:644 +#: ../widgets/table/e-table-config.glade.h:11 +msgid "Show Fields" +msgstr "Vis felter" -#: ../ui/evolution-addressbook.xml.h:54 -msgid "_Move Folder Contacts To" -msgstr "_Flyt kontaktpersoner i mappe til" +#: ../widgets/table/e-table-config.c:665 +msgid "Available Fields" +msgstr "Tilgængelige felter" -#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49 -msgid "_New" -msgstr "_Ny" +#: ../widgets/table/e-table-config.glade.h:1 +msgid "A_vailable Fields:" +msgstr "_Tilgængelige felter:" -#: ../ui/evolution-addressbook.xml.h:60 -msgid "_Rename" -msgstr "_Omdøb" +#: ../widgets/table/e-table-config.glade.h:2 +#: ../widgets/table/e-table-header-item.c:1581 +msgid "Ascending" +msgstr "Stigende" -#: ../ui/evolution-addressbook.xml.h:61 -msgid "_Save Contact as VCard..." -msgstr "_Gem kontaktperson som visitkort..." +#: ../widgets/table/e-table-config.glade.h:3 +msgid "Clear All" +msgstr "Tøm alt" -#: ../ui/evolution-addressbook.xml.h:62 -msgid "_Save Folder Contacts As VCard" -msgstr "_Gem kontaktpersoner i mappe som visitkort" +#: ../widgets/table/e-table-config.glade.h:4 +msgid "Clear _All" +msgstr "Tøm _alt" -#: ../ui/evolution-addressbook.xml.h:63 -msgid "_Send Message to Contact..." -msgstr "_Send brev til kontaktperson..." +#: ../widgets/table/e-table-config.glade.h:5 +#: ../widgets/table/e-table-header-item.c:1581 +msgid "Descending" +msgstr "Faldende" -#: ../ui/evolution-calendar.xml.h:4 -msgid "Day" -msgstr "Dag" +#: ../widgets/table/e-table-config.glade.h:8 +msgid "Group Items By" +msgstr "Gruppér punkter efter" -#: ../ui/evolution-calendar.xml.h:6 -msgid "Delete _all Occurrences" -msgstr "Slet _alle forekomster" +#: ../widgets/table/e-table-config.glade.h:9 +msgid "Move _Down" +msgstr "Flyt ne_d" -#: ../ui/evolution-calendar.xml.h:7 -msgid "Delete all occurrences" -msgstr "Slet alle forekomster" +#: ../widgets/table/e-table-config.glade.h:10 +msgid "Move _Up" +msgstr "Flyt _op" -#: ../ui/evolution-calendar.xml.h:8 -msgid "Delete the appointment" -msgstr "Slet aftalen" +#: ../widgets/table/e-table-config.glade.h:12 +msgid "Show _field in View" +msgstr "Vis _felt i oversigt" -#: ../ui/evolution-calendar.xml.h:10 -msgid "Delete this occurrence" -msgstr "Slet denne hændelse" +#: ../widgets/table/e-table-config.glade.h:13 +msgid "Show field i_n View" +msgstr "Vis felt _i oversigt" -#: ../ui/evolution-calendar.xml.h:11 -msgid "Go To" -msgstr "Gå til" +#: ../widgets/table/e-table-config.glade.h:14 +msgid "Show field in _View" +msgstr "Vis felt i _oversigt" + +#: ../widgets/table/e-table-config.glade.h:15 +msgid "Sort" +msgstr "Sortér" -#: ../ui/evolution-calendar.xml.h:12 -msgid "Go back" -msgstr "Gå tilbage" +#: ../widgets/table/e-table-config.glade.h:16 +msgid "Sort Items By" +msgstr "Sortér punkter efter" -#: ../ui/evolution-calendar.xml.h:13 -msgid "Go forward" -msgstr "Gå fremad" +#: ../widgets/table/e-table-config.glade.h:17 +msgid "Then By" +msgstr "Så efter" -#: ../ui/evolution-calendar.xml.h:14 -msgid "List" -msgstr "Liste" +#: ../widgets/table/e-table-config.glade.h:19 +msgid "_Fields Shown..." +msgstr "Viste _felter..." -#: ../ui/evolution-calendar.xml.h:15 -msgid "Month" -msgstr "Måned" +#: ../widgets/table/e-table-config.glade.h:20 +msgid "_Group By..." +msgstr "_Gruppér efter..." -#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58 -#: ../widgets/misc/e-calendar.c:195 -msgid "Next" -msgstr "Næste" +#: ../widgets/table/e-table-config.glade.h:22 +msgid "_Show field in View" +msgstr "_Vis felt i oversigt" -#: ../ui/evolution-calendar.xml.h:18 -msgid "Previews the calendar to be printed" -msgstr "Forhåndsviser kalenderen som skal skrives ud" +#: ../widgets/table/e-table-config.glade.h:23 +msgid "_Show these fields in order:" +msgstr "_Vis disse felter i rækkefølge:" -#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74 -#: ../widgets/misc/e-calendar.c:171 -msgid "Previous" -msgstr "Forrige" +#: ../widgets/table/e-table-config.glade.h:24 +msgid "_Sort..." +msgstr "_Sortér..." -#: ../ui/evolution-calendar.xml.h:22 -msgid "Print this calendar" -msgstr "Udskriv denne kalender" +#: ../widgets/table/e-table-field-chooser-dialog.c:114 +msgid "Add a column..." +msgstr "Tilføj en kolonne..." -#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17 -msgid "Purg_e" -msgstr "_Fjern" +#: ../widgets/table/e-table-field-chooser.glade.h:1 +msgid "Field Chooser" +msgstr "Feltvælger" -#: ../ui/evolution-calendar.xml.h:24 -msgid "Purge old appointments and meetings" -msgstr "Fjern gamle aftaler og møder" +#: ../widgets/table/e-table-field-chooser.glade.h:2 +msgid "" +"To add a column to your table, drag it into\n" +"the location in which you want it to appear." +msgstr "" +"For at tilføje en kolonne i din tabel, træk\n" +"den hen til stedet hvor du vil have den." -#: ../ui/evolution-calendar.xml.h:25 -msgid "Select _Date" -msgstr "Vælg _dato" +#: ../widgets/table/e-table-group-container.c:343 +#, c-format +msgid "%s : %s (%d item)" +msgid_plural "%s : %s (%d items)" +msgstr[0] "%s : %s (%d punkt)" +msgstr[1] "%s : %s (%d punkter)" -#: ../ui/evolution-calendar.xml.h:26 -msgid "Select _Today" -msgstr "Vælg _dagen i dag" +#: ../widgets/table/e-table-group-container.c:349 +#, c-format +msgid "%s (%d item)" +msgid_plural "%s (%d items)" +msgstr[0] "%s (%d punkt)" +msgstr[1] "%s (%d punkter)" -#: ../ui/evolution-calendar.xml.h:27 -msgid "Select a specific date" -msgstr "Vælg en specifik dato" +#: ../widgets/table/e-table-group-container.c:926 +#: ../widgets/table/e-table-group-container.c:927 +#: ../widgets/table/e-table-group-leaf.c:586 +#: ../widgets/table/e-table-group-leaf.c:587 +#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029 +msgid "Alternating Row Colors" +msgstr "Skiftende rækkefarver" -#: ../ui/evolution-calendar.xml.h:28 -msgid "Select today" -msgstr "Vælg dagen i dag" +#: ../widgets/table/e-table-group-container.c:933 +#: ../widgets/table/e-table-group-container.c:934 +#: ../widgets/table/e-table-group-leaf.c:593 +#: ../widgets/table/e-table-group-leaf.c:594 +#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036 +#: ../widgets/table/e-tree.c:3342 ../widgets/table/e-tree.c:3343 +msgid "Horizontal Draw Grid" +msgstr "Vandret tegnegitter" -#: ../ui/evolution-calendar.xml.h:29 -msgid "Show as list" -msgstr "Vis som liste" +#: ../widgets/table/e-table-group-container.c:940 +#: ../widgets/table/e-table-group-container.c:941 +#: ../widgets/table/e-table-group-leaf.c:600 +#: ../widgets/table/e-table-group-leaf.c:601 +#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043 +#: ../widgets/table/e-tree.c:3348 ../widgets/table/e-tree.c:3349 +msgid "Vertical Draw Grid" +msgstr "Lodret tegnegitter" -#: ../ui/evolution-calendar.xml.h:30 -msgid "Show one day" -msgstr "Vis en dag" +#: ../widgets/table/e-table-group-container.c:947 +#: ../widgets/table/e-table-group-container.c:948 +#: ../widgets/table/e-table-group-leaf.c:607 +#: ../widgets/table/e-table-group-leaf.c:608 +#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050 +#: ../widgets/table/e-tree.c:3354 ../widgets/table/e-tree.c:3355 +msgid "Draw focus" +msgstr "Tegn fokus" -#: ../ui/evolution-calendar.xml.h:31 -msgid "Show one month" -msgstr "Vis en måned" +#: ../widgets/table/e-table-group-container.c:954 +#: ../widgets/table/e-table-group-container.c:955 +#: ../widgets/table/e-table-group-leaf.c:614 +#: ../widgets/table/e-table-group-leaf.c:615 +#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057 +msgid "Cursor mode" +msgstr "Markørtilstand" -#: ../ui/evolution-calendar.xml.h:32 -msgid "Show one week" -msgstr "Vis en uge" +#: ../widgets/table/e-table-group-container.c:961 +#: ../widgets/table/e-table-group-container.c:962 +#: ../widgets/table/e-table-group-leaf.c:628 +#: ../widgets/table/e-table-group-leaf.c:629 +#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022 +msgid "Selection model" +msgstr "Markeringsmodel" -#: ../ui/evolution-calendar.xml.h:33 -msgid "Show the working week" -msgstr "Vis arbejdsugen" +#: ../widgets/table/e-table-group-container.c:968 +#: ../widgets/table/e-table-group-container.c:969 +#: ../widgets/table/e-table-group-leaf.c:621 +#: ../widgets/table/e-table-group-leaf.c:622 +#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064 +#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3336 +#: ../widgets/table/e-tree.c:3337 +msgid "Length Threshold" +msgstr "Længdetærskel" -#: ../ui/evolution-calendar.xml.h:35 -msgid "View the current appointment" -msgstr "Vis den aktuelle aftale" +#: ../widgets/table/e-table-group-container.c:975 +#: ../widgets/table/e-table-group-container.c:976 +#: ../widgets/table/e-table-group-leaf.c:663 +#: ../widgets/table/e-table-group-leaf.c:664 +#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098 +#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3368 +#: ../widgets/table/e-tree.c:3369 +msgid "Uniform row height" +msgstr "Ens rækkehøjde" -#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19 -msgid "View the debug console for log messages" -msgstr "Kig i fejlfindings-konsollen for at se logbeskeder" +#: ../widgets/table/e-table-group-container.c:982 +#: ../widgets/table/e-table-group-container.c:983 +#: ../widgets/table/e-table-group-leaf.c:656 +#: ../widgets/table/e-table-group-leaf.c:657 +msgid "Frozen" +msgstr "Frosset" -#: ../ui/evolution-calendar.xml.h:37 -msgid "Week" -msgstr "Uge" +#: ../widgets/table/e-table-header-item.c:1451 +msgid "Customize Current View" +msgstr "Tilpas aktuel oversigt" -#: ../ui/evolution-calendar.xml.h:38 -msgid "Work Week" -msgstr "Arbejdsuge" +#: ../widgets/table/e-table-header-item.c:1471 +msgid "Sort _Ascending" +msgstr "Sortér _stigende" -#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22 -msgid "_Debug Logs" -msgstr "_Fejlfindingslogge" +#: ../widgets/table/e-table-header-item.c:1472 +msgid "Sort _Descending" +msgstr "Sortér _faldende" -#: ../ui/evolution-calendar.xml.h:45 -msgid "_Open Appointment" -msgstr "_Åbn aftale" +#: ../widgets/table/e-table-header-item.c:1473 +msgid "_Unsort" +msgstr "_Rod rundt" -#: ../ui/evolution-mail-global.xml.h:2 -msgid "Cancel the current mail operation" -msgstr "Afbryd igangværende handling" +#: ../widgets/table/e-table-header-item.c:1475 +msgid "Group By This _Field" +msgstr "Gruppér efter dette _felt" -#: ../ui/evolution-mail-global.xml.h:3 -msgid "Copy the selected folder into another folder" -msgstr "Kopiér den valgte mappe til en anden mappe" +#: ../widgets/table/e-table-header-item.c:1476 +msgid "Group By _Box" +msgstr "Gruppér efter _boks" -#: ../ui/evolution-mail-global.xml.h:4 -msgid "Create a new folder for storing mail" -msgstr "Opret en ny mappe til at gemme post i" +#: ../widgets/table/e-table-header-item.c:1478 +msgid "Remove This _Column" +msgstr "Fjern denne _kolonne" -#: ../ui/evolution-mail-global.xml.h:5 -msgid "Create or edit Search Folder definitions" -msgstr "Opret eller redigér definitioner af søgemapper" +#: ../widgets/table/e-table-header-item.c:1479 +msgid "Add a C_olumn..." +msgstr "Tilføj k_olonne..." -#: ../ui/evolution-mail-global.xml.h:6 -msgid "Create or edit rules for filtering new mail" -msgstr "Opret eller redigér regler for filtrering af ny e-post" +#: ../widgets/table/e-table-header-item.c:1481 +msgid "A_lignment" +msgstr "J_ustering" -#: ../ui/evolution-mail-global.xml.h:7 -msgid "Download messages of accounts/folders marked for offline" -msgstr "" -"Hent breve ned til de mapper der er markeret til brug i afkoblet tilstand" +#: ../widgets/table/e-table-header-item.c:1482 +msgid "B_est Fit" +msgstr "Som passer b_edst" -#: ../ui/evolution-mail-global.xml.h:8 -msgid "Empty _Trash" -msgstr "_Tøm affaldskurven" +#: ../widgets/table/e-table-header-item.c:1483 +msgid "Format Column_s..." +msgstr "Formatér kolonne_r..." -#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11 -msgid "F_older" -msgstr "M_appe" +#: ../widgets/table/e-table-header-item.c:1485 +msgid "Custo_mize Current View..." +msgstr "Til_pas aktuel oversigt..." -#: ../ui/evolution-mail-global.xml.h:10 -msgid "Move the selected folder into another folder" -msgstr "Flyt den valgte mappe til en anden mappe" +#: ../widgets/table/e-table-header-item.c:1541 +msgid "_Sort By" +msgstr "_Sortér efter" -#. Alphabetical by name, yo -#: ../ui/evolution-mail-global.xml.h:12 -msgid "Permanently remove all deleted messages from all folders" -msgstr "Fjern alle slettede breve permanent fra alle mapper" +#. Custom +#: ../widgets/table/e-table-header-item.c:1559 +msgid "_Custom" +msgstr "_Tilpasset" -#: ../ui/evolution-mail-global.xml.h:13 -msgid "Search F_olders" -msgstr "Søg _mapper" +#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008 +msgid "Table header" +msgstr "Tabelhoved" -#: ../ui/evolution-mail-global.xml.h:14 -msgid "Show Message _Preview" -msgstr "_Vis brev" +#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015 +msgid "Table model" +msgstr "Tabelmodel" -#: ../ui/evolution-mail-global.xml.h:15 -msgid "Show message preview below the message list" -msgstr "Vis brevets indhold nedenunder brevindekset" +#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091 +msgid "Cursor row" +msgstr "Markørrække" -#: ../ui/evolution-mail-global.xml.h:16 -msgid "Show message preview side-by-side with the message list" -msgstr "Vis brevindhold side om side med brevindeks" +#: ../widgets/table/e-table-sorter.c:172 +msgid "Sort Info" +msgstr "Sortér info" -#: ../ui/evolution-mail-global.xml.h:17 -msgid "Show message preview window" -msgstr "Vis vindue med brevindhold" +#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3375 +#: ../widgets/table/e-tree.c:3376 +msgid "Always search" +msgstr "Søg altid" -#: ../ui/evolution-mail-global.xml.h:18 -msgid "Subscribe or unsubscribe to folders on remote servers" -msgstr "Abonnér eller fjern abonnement på mapper på eksterne servere" +#: ../widgets/table/e-table.c:3345 +msgid "Use click to add" +msgstr "Tilføj ved at klikke" -#: ../ui/evolution-mail-global.xml.h:20 -msgid "_Classic View" -msgstr "K_lassisk oversigt" +#: ../widgets/table/e-tree-scrolled.c:225 +#: ../widgets/table/e-tree-scrolled.c:226 +msgid "Tree" +msgstr "Træ" -#: ../ui/evolution-mail-global.xml.h:21 -msgid "_Copy Folder To..." -msgstr "_Kopiér mappe til..." +#: ../widgets/table/e-tree.c:3361 ../widgets/table/e-tree.c:3362 +msgid "ETree table adapter" +msgstr "ETree-tabel-adapter" -#: ../ui/evolution-mail-global.xml.h:23 -msgid "_Download Messages for Offline Usage" -msgstr "_Hent breve ned til afkoblet tilstand" +#: ../widgets/table/e-tree.c:3382 +msgid "Retro Look" +msgstr "Retro-udseende" -#: ../ui/evolution-mail-global.xml.h:25 -msgid "_Message Filters" -msgstr "_Brevfiltre" +#: ../widgets/table/e-tree.c:3383 +msgid "Draw lines and +/- expanders." +msgstr "Tegn linjer og \"+/-\"-udviderere." -#: ../ui/evolution-mail-global.xml.h:26 -msgid "_Move Folder To..." -msgstr "Fl_yt mappe til..." +# se næste for forklaring +#: ../widgets/table/e-tree.c:3389 +msgid "Expander Size" +msgstr "Pilstørrelse" -#: ../ui/evolution-mail-global.xml.h:27 -msgid "_New..." -msgstr "_Ny..." +#: ../widgets/table/e-tree.c:3390 +msgid "Size of the expander arrow" +msgstr "Størrelsen af udvidelsespilen" -#: ../ui/evolution-mail-global.xml.h:28 -msgid "_Preview" -msgstr "Forhå_ndsvisning" +#: ../widgets/text/e-text.c:2737 +msgid "Input Methods" +msgstr "Indtastningsmetoder" -#. -#. -#. -#: ../ui/evolution-mail-global.xml.h:32 -msgid "_Subscriptions..." -msgstr "_Abonnementer..." +#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561 +msgid "Event Processor" +msgstr "Begivenhedsbehandler" -#: ../ui/evolution-mail-global.xml.h:33 -msgid "_Vertical View" -msgstr "_Lodret oversigt" +#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575 +msgid "Bold" +msgstr "Fed" -#: ../ui/evolution-mail-list.xml.h:1 -msgid "Change the name of this folder" -msgstr "Ret navnet på denne mappe" +#: ../widgets/text/e-text.c:3581 ../widgets/text/e-text.c:3582 +msgid "Strikeout" +msgstr "Gennemstreget" -#: ../ui/evolution-mail-list.xml.h:2 -msgid "Change the properties of this folder" -msgstr "Ret egenskaberne for denne mappe" +#: ../widgets/text/e-text.c:3588 ../widgets/text/e-text.c:3589 +msgid "Anchor" +msgstr "Anker" -#: ../ui/evolution-mail-list.xml.h:3 -msgid "Collapse All _Threads" -msgstr "Sammenfold alle _tråde" +#: ../widgets/text/e-text.c:3596 ../widgets/text/e-text.c:3597 +msgid "Justification" +msgstr "Justering" -#: ../ui/evolution-mail-list.xml.h:4 -msgid "Collapse all message threads" -msgstr "Sammenfold alle brevtråde" +#: ../widgets/text/e-text.c:3603 ../widgets/text/e-text.c:3604 +msgid "Clip Width" +msgstr "Klipbredde" -#: ../ui/evolution-mail-list.xml.h:5 -msgid "Copy selected message(s) to the clipboard" -msgstr "Kopiér markerede breve til klippebord" +#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611 +msgid "Clip Height" +msgstr "Kliphøjde" -#. Alphabetical by name, yo -#: ../ui/evolution-mail-list.xml.h:7 -msgid "Cut selected message(s) to the clipboard" -msgstr "Klip markerede breve ind på klippebord" +#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618 +msgid "Clip" +msgstr "Klip" -#: ../ui/evolution-mail-list.xml.h:8 -msgid "E_xpand All Threads" -msgstr "_Udfold alle tråde" +#: ../widgets/text/e-text.c:3624 ../widgets/text/e-text.c:3625 +msgid "Fill clip rectangle" +msgstr "Udfyld kliprektangel" -#: ../ui/evolution-mail-list.xml.h:9 -msgid "E_xpunge" -msgstr "_Tøm" +#: ../widgets/text/e-text.c:3631 ../widgets/text/e-text.c:3632 +msgid "X Offset" +msgstr "X-forskydning" -#: ../ui/evolution-mail-list.xml.h:10 -msgid "Expand all message threads" -msgstr "Udfold alle brevtråde" +#: ../widgets/text/e-text.c:3638 ../widgets/text/e-text.c:3639 +msgid "Y Offset" +msgstr "Y-forskydning" -#: ../ui/evolution-mail-list.xml.h:12 -msgid "Hide S_elected Messages" -msgstr "Skjul valgt_e breve" +#: ../widgets/text/e-text.c:3674 ../widgets/text/e-text.c:3675 +msgid "Text width" +msgstr "Tekstbredde" -#: ../ui/evolution-mail-list.xml.h:13 -msgid "Hide _Deleted Messages" -msgstr "Skjul slette_de breve" +#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682 +msgid "Text height" +msgstr "Teksthøjde" -#: ../ui/evolution-mail-list.xml.h:14 -msgid "Hide _Read Messages" -msgstr "Skjul læ_ste breve" +#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697 +msgid "Use ellipsis" +msgstr "Benyt tre prikker" -#: ../ui/evolution-mail-list.xml.h:15 -msgid "" -"Hide deleted messages rather than displaying them with a line through them" -msgstr "Skjul slettede breve i stedet for at vise dem gennemstreget" +#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704 +msgid "Ellipsis" +msgstr "Tre prikker" -#: ../ui/evolution-mail-list.xml.h:16 -msgid "Mar_k All Messages as Read" -msgstr "Mar_kér alle breve som værende læst" +#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711 +msgid "Line wrap" +msgstr "Linjeombrydning" -#: ../ui/evolution-mail-list.xml.h:17 -msgid "Mark all messages in the folder as read" -msgstr "Markér alle breve i denne mappe som læst" +#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718 +msgid "Break characters" +msgstr "Ombryd tegn" -#: ../ui/evolution-mail-list.xml.h:18 -msgid "Paste message(s) from the clipboard" -msgstr "Indsæt brev(e) fra klippebord" +#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725 +msgid "Max lines" +msgstr "Maks. linjer" -#: ../ui/evolution-mail-list.xml.h:19 -msgid "Permanently remove all deleted messages from this folder" -msgstr "Fjern alle slettede breve fra denne mappe permanent" +#: ../widgets/text/e-text.c:3746 ../widgets/text/e-text.c:3747 +msgid "Draw borders" +msgstr "Tegn kanter" -#: ../ui/evolution-mail-list.xml.h:20 -msgid "Permanently remove this folder" -msgstr "Fjern denne mappe permanent" +#: ../widgets/text/e-text.c:3753 ../widgets/text/e-text.c:3754 +msgid "Allow newlines" +msgstr "Tillad linjeskift" -#: ../ui/evolution-mail-list.xml.h:22 -msgid "Refresh the folder" -msgstr "Opdatér mappen" +#: ../widgets/text/e-text.c:3760 ../widgets/text/e-text.c:3761 +msgid "Draw background" +msgstr "Tegn baggrund" -#: ../ui/evolution-mail-list.xml.h:23 -msgid "Select Message S_ubthread" -msgstr "Vælg brevets u_ndertråd" +#: ../widgets/text/e-text.c:3767 ../widgets/text/e-text.c:3768 +msgid "Draw button" +msgstr "Tegn knap" -#: ../ui/evolution-mail-list.xml.h:24 -msgid "Select Message _Thread" -msgstr "Vælg brev_tråd" +#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775 +msgid "Cursor position" +msgstr "Markørposition" -#: ../ui/evolution-mail-list.xml.h:25 -msgid "Select _All Messages" -msgstr "Vælg _alle breve" +#. Translators: Input Method Context +#: ../widgets/text/e-text.c:3782 ../widgets/text/e-text.c:3784 +msgid "IM Context" +msgstr "IM-kontekst" -#: ../ui/evolution-mail-list.xml.h:26 -msgid "Select all and only the messages that are not currently selected" -msgstr "Vælg alle og kun breve som ikke allerede er valgt" +#: ../widgets/text/e-text.c:3790 ../widgets/text/e-text.c:3791 +msgid "Handle Popup" +msgstr "Håndtagspopop" -#: ../ui/evolution-mail-list.xml.h:27 -msgid "Select all messages in the same thread as the selected message" -msgstr "Vælg alle breve i samme tråd som det valgte brev" +#~ msgid "_Post-To Field" +#~ msgstr "_Post-til-felt" -#: ../ui/evolution-mail-list.xml.h:28 -msgid "Select all replies to the currently selected message" -msgstr "Vælg alle svar til det valgte brev" +#~ msgid "Toggles whether the Post-To field is displayed" +#~ msgstr "Slå visning af Send-til-feltet fra/til" -#: ../ui/evolution-mail-list.xml.h:29 -msgid "Select all visible messages" -msgstr "Vælg alle synlige breve" +#~ msgid "_Subject Field" +#~ msgstr "_Emnefelt" -#: ../ui/evolution-mail-list.xml.h:30 -msgid "Show Hidde_n Messages" -msgstr "Vis skj_ulte breve" +#~ msgid "Toggles whether the Subject field is displayed" +#~ msgstr "Slå visning af emnefeltet fra/til" -#: ../ui/evolution-mail-list.xml.h:31 -msgid "Show messages that have been temporarily hidden" -msgstr "Vis breve som er midlertidig skjult" +#~ msgid "_To Field" +#~ msgstr "_Til-felt" -#: ../ui/evolution-mail-list.xml.h:32 -msgid "Temporarily hide all messages that have already been read" -msgstr "Skjul alle læste breve midlertidigt" +#~ msgid "Toggles whether the To field is displayed" +#~ msgstr "Slå visning af Til-feltet fra/til" -#: ../ui/evolution-mail-list.xml.h:33 -msgid "Temporarily hide the selected messages" -msgstr "Skjul valgte breve midlertidigt" +#~ msgid "C_all To..." +#~ msgstr "Opk_ald til..." -#: ../ui/evolution-mail-list.xml.h:34 -msgid "Threaded Message list" -msgstr "Brug trådning i brevindeks" +#~ msgid "View/Bcc menu item is checked" +#~ msgstr "Vis/Bcc-menupunktet er afkrydset" -#: ../ui/evolution-mail-list.xml.h:36 -msgid "_Group By Threads" -msgstr "_Gruppér efter tråde" +#~ msgid "View/Bcc menu item is checked." +#~ msgstr "Vis/Bcc-menupunktet er afkrydset." -#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115 -#: ../ui/evolution-mail-messagedisplay.xml.h:7 -msgid "_Message" -msgstr "_Brev" +#~ msgid "View/Cc menu item is checked" +#~ msgstr "Vis/Cc-menupunktet er afkrydset" -#: ../ui/evolution-mail-message.xml.h:1 -msgid "A_dd Sender to Address Book" -msgstr "Føj afsender til adresse_bog" +#~ msgid "View/Cc menu item is checked." +#~ msgstr "Vis/Cc-menupunktet er afkrydset." -#: ../ui/evolution-mail-message.xml.h:2 -msgid "A_pply Filters" -msgstr "Anvend _filtre" +#~ msgid "View/From menu item is checked" +#~ msgstr "Vis/Fra-menupunktet er afkrydset" -#. Alphabetical by name, yo -#: ../ui/evolution-mail-message.xml.h:4 -msgid "Add Sender to Address Book" -msgstr "Føj afsenderen til adressebogen" +#~ msgid "View/From menu item is checked." +#~ msgstr "Vis/Fra-menupunktet er afkrydset." -#: ../ui/evolution-mail-message.xml.h:5 -msgid "All Message _Headers" -msgstr "Hele brev_hovedet" +#~ msgid "View/PostTo menu item is checked" +#~ msgstr "Vis/Send til-menupunktet er afkrydset" -#: ../ui/evolution-mail-message.xml.h:6 -msgid "Apply filter rules to the selected messages" -msgstr "Aktivér filterregler på de valgte breve" +#~ msgid "View/PostTo menu item is checked." +#~ msgstr "Vis/Send til-menupunktet er afkrydset." -#: ../ui/evolution-mail-message.xml.h:7 -msgid "Check for _Junk" -msgstr "Se efter _spam" +#~ msgid "View/ReplyTo menu item is checked" +#~ msgstr "Vis/Svar til-menupunktet er afkrydset" -#: ../ui/evolution-mail-message.xml.h:8 -msgid "Compose _New Message" -msgstr "Skriv _nyt brev" +#~ msgid "View/ReplyTo menu item is checked." +#~ msgstr "Vis/Svar til-menupunktet er afkrydset." -#: ../ui/evolution-mail-message.xml.h:9 -msgid "Compose a reply to all of the recipients of the selected message" -msgstr "Skriv et svar til alle modtagere af det valgte brev" +#~ msgid "Case _sensitive" +#~ msgstr "Skeln mellem _store/små bogstaver" -#: ../ui/evolution-mail-message.xml.h:10 -msgid "Compose a reply to the mailing list of the selected message" -msgstr "Skriv et svar til e-postlisten for det valgte brev" +#~ msgid "F_ind:" +#~ msgstr "F_ind:" -#: ../ui/evolution-mail-message.xml.h:11 -msgid "Compose a reply to the sender of the selected message" -msgstr "Skriv et svar til afsenderen af det valgte brev" +#~ msgid "Find in Message" +#~ msgstr "Søg efter i brev" -#: ../ui/evolution-mail-message.xml.h:12 -msgid "Copy selected messages to another folder" -msgstr "Kopiér valgte breve til en anden mappe" +#~ msgid "Provides core functionality for local address books." +#~ msgstr "Sørger for kernefunktionalitet til lokale adressebøger." -#: ../ui/evolution-mail-message.xml.h:13 -msgid "Copy selected messages to the clipboard" -msgstr "Kopiér markerede breve til klippebord" +#~ msgid "" +#~ "Looks for clues in a message for mention of attachments and warns if the " +#~ "attachment is missing" +#~ msgstr "" +#~ "Kigger efter spor som omhandler bilag i dette brev og advarer hvis der " +#~ "ikke er noget bilag" -#: ../ui/evolution-mail-message.xml.h:14 -msgid "Create R_ule" -msgstr "Opret re_gel" +#~ msgid "" +#~ "A formatter plugin which displays audio attachments inline and allows you " +#~ "to play them directly from Evolution." +#~ msgstr "" +#~ "Et formateringsudvidelsesmodul, der viser lydbilag indlejret, og tillader " +#~ "dig at afspille dem direkte i Evolution." -#: ../ui/evolution-mail-message.xml.h:15 -msgid "Create a Search Folder for these recipients" -msgstr "Opret en søgemappe til disse modtagere" +#~ msgid "A plugin for backing up and restore Evolution data and settings." +#~ msgstr "" +#~ "Et udvidelsesmodul til at tage sikkerhedskopier og genoprette Evolutions " +#~ "data og indstillinger." -#: ../ui/evolution-mail-message.xml.h:16 -msgid "Create a Search Folder for this mailing list" -msgstr "Opret en søgemappe til denne postliste" +#~ msgid "CalDAV Calendar sources" +#~ msgstr "Kilder til CalDAV-kalendere" -#: ../ui/evolution-mail-message.xml.h:17 -msgid "Create a Search Folder for this sender" -msgstr "Opret en søgemappe til denne afsender" +#~ msgid "Provides core functionality for local calendars." +#~ msgstr "Sørger for kernefunktionalitet til lokale kalendere." -#: ../ui/evolution-mail-message.xml.h:18 -msgid "Create a Search Folder for this subject" -msgstr "Opret en søgemappe til dette emne" +#~ msgid "HTTP Calendars" +#~ msgstr "HTTP-kalendere" -#: ../ui/evolution-mail-message.xml.h:19 -msgid "Create a rule to filter messages from this sender" -msgstr "Lav en regel til at filtrere breve fra denne afsender" +#~ msgid "Provides core functionality for webcal and http calendars." +#~ msgstr "Sørger for kernefunktionalitet til webcal- og http-kalendere." -#: ../ui/evolution-mail-message.xml.h:20 -msgid "Create a rule to filter messages to these recipients" -msgstr "Lav en regel til at filtrere breve til disse modtagere" +#~ msgid "Provides core functionality for weather calendars." +#~ msgstr "Sørger for kernefunktionalitet til vejrkalendere." -#: ../ui/evolution-mail-message.xml.h:21 -msgid "Create a rule to filter messages to this mailing list" -msgstr "Lav en regel for at filtrere breve til denne postliste" +#~ msgid "" +#~ "A test plugin which demonstrates a popup menu plugin which lets you copy " +#~ "things to the clipboard." +#~ msgstr "" +#~ "Et test-udvidelsesmodul som demonstrerer et pop op-menu-udvidelsesmodul " +#~ "der lader dig kopiere ting til udklipsholderen." -#: ../ui/evolution-mail-message.xml.h:22 -msgid "Create a rule to filter messages with this subject" -msgstr "Lav en regel for filtrering af breve med dette emne" +#~ msgid "" +#~ "Provides functionality for marking a calendar or an address book as the " +#~ "default one." +#~ msgstr "" +#~ "Sørger for funktionalitet til at markere en kalender eller en adressebog " +#~ "som den forvalgte." -#: ../ui/evolution-mail-message.xml.h:23 -msgid "Cut selected messages to the clipboard" -msgstr "Klip markerede breve til klippebordet" +#~ msgid "" +#~ "A plugin that manages a collection of Exchange account specific " +#~ "operations and features." +#~ msgstr "" +#~ "Et udvidelsesmodul der håndterer et udvalg af specifikke handlinger og " +#~ "funktioner for en Exchange-konto." -#: ../ui/evolution-mail-message.xml.h:24 -msgid "Decrease the text size" -msgstr "Formindsk tekstens størrelse" +#~ msgid "Allows unsubscribing of mail folders in the side bar context menu." +#~ msgstr "Tillader afmeldelse af brevmapper i sidepanelets kontekstmenu." -#: ../ui/evolution-mail-message.xml.h:26 -msgid "Display the next important message" -msgstr "Vis næste vigtige brev" +#~ msgid "A plugin to setup Google Calendar and Contacts." +#~ msgstr "" +#~ "Et udvidelsesmodul til opsætning af Google-kalender og -kontaktpersoner." -#: ../ui/evolution-mail-message.xml.h:27 -msgid "Display the next message" -msgstr "Vis næste brev" +#~ msgid "Google sources" +#~ msgstr "Google-kilder" -#: ../ui/evolution-mail-message.xml.h:28 -msgid "Display the next thread" -msgstr "Vis næste tråd" +#~ msgid "A plugin to setup GroupWise calendar and contacts sources." +#~ msgstr "" +#~ "Et udvidelsesmodul til opsætning af GroupWise-kalender og -kontaktkilder." -#: ../ui/evolution-mail-message.xml.h:29 -msgid "Display the next unread message" -msgstr "Vis næste ulæste brev" +#~ msgid "This is a recurring meeting" +#~ msgstr "Dette er et tilbagevendende møde" -#: ../ui/evolution-mail-message.xml.h:30 -msgid "Display the previous important message" -msgstr "Vis forrige vigtige brev" +#~ msgid "Would you like to accept it?" +#~ msgstr "Accepterer du?" -#: ../ui/evolution-mail-message.xml.h:31 -msgid "Display the previous message" -msgstr "Vis forrige brev" +#~ msgid "Would you like to decline it?" +#~ msgstr "Afviser du?" -#: ../ui/evolution-mail-message.xml.h:32 -msgid "Display the previous unread message" -msgstr "Vis forrige ulæste brev" +#~ msgid "A plugin to setup hula calendar sources." +#~ msgstr "Et udvidelsesmodul til opsætning af kilder til hula-kalendere." -#: ../ui/evolution-mail-message.xml.h:33 -msgid "F_orward As..." -msgstr "Videresend s_om..." +#~ msgid "Hula Account Setup" +#~ msgstr "Opsætning af Hula-konto" -#: ../ui/evolution-mail-message.xml.h:34 -msgid "Filter on Mailing _List..." -msgstr "Filtrér på e-post_liste..." +#~ msgid "A plugin for the features in the IMAP accounts." +#~ msgstr "Et udvidelsesmodul til faciliteterne i IMAP-kontiene." -#: ../ui/evolution-mail-message.xml.h:35 -msgid "Filter on Se_nder..." -msgstr "Filtrér på se_nder..." +#~ msgid "" +#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod" +#~ msgstr "" +#~ "Synkronisér den valgte opgave/memo/kalender/adressebog med en Apple iPod" -#: ../ui/evolution-mail-message.xml.h:36 -msgid "Filter on _Recipients..." -msgstr "Filtrér på modtage_re..." +#~ msgid "Allows disabling of accounts." +#~ msgstr "Tillader deaktivering af konti." -#: ../ui/evolution-mail-message.xml.h:37 -msgid "Filter on _Subject..." -msgstr "Filtrér på e_mne..." +#~ msgid "" +#~ "Generates a D-Bus message or notifies the user with an icon in " +#~ "notification area and a notification message whenever a new message has " +#~ "arrived." +#~ msgstr "" +#~ "Genererer en D-Bus-besked eller underretter brugeren om at der er " +#~ "ankommet ny post ved hjælp af et ikon i påmindelsesområdet og en " +#~ "påmindelsesbesked." -#: ../ui/evolution-mail-message.xml.h:38 -msgid "Filter the selected messages for junk status" -msgstr "Filtrér de valgte breve til spamstatus" +#~ msgid "" +#~ "A plugin which allows the creation of tasks from the contents of a mail " +#~ "message." +#~ msgstr "" +#~ "Et udvidelsesmodul der tillader oprettelse af opgaver ud fra indholdet af " +#~ "et brev." -#: ../ui/evolution-mail-message.xml.h:39 -msgid "Flag selected messages for follow-up" -msgstr "Markér markerede breve til opfølgning" +#~ msgid "Used for marking all the messages under a folder as read" +#~ msgstr "Bruges til at markere alle breve i en mappe som læste" -#: ../ui/evolution-mail-message.xml.h:40 -msgid "Follow _Up..." -msgstr "Følg _op..." +#~ msgid "A plugin which implements mono plugins." +#~ msgstr "Et udvidelsesmodul som muliggør Mono-udvidelsesmoduler." -#: ../ui/evolution-mail-message.xml.h:41 -msgid "Force images in HTML mail to be loaded" -msgstr "Tvungen indlæsning af billeder i HTML-breve" +#~ msgid "A plugin for managing which plugins are enabled or disabled." +#~ msgstr "" +#~ "Et udvidelsesmodul der håndterer hvilke udvidelsesmoduler der er " +#~ "aktiveret eller deaktiveret." -#: ../ui/evolution-mail-message.xml.h:43 -msgid "Forward the selected message in the body of a new message" -msgstr "Videresend det valgte brev i kroppen af et nyt brev" +#~ msgid "" +#~ "A test plugin which demonstrates a formatter plugin which lets you choose " +#~ "to disable HTML messages.\n" +#~ "\n" +#~ "This plugin is unsupported demonstration code only.\n" +#~ msgstr "" +#~ "Et formaterings-testudvidelsesmodul som gør det muligt at deaktivere HTML-" +#~ "breve.\n" +#~ "\n" +#~ "Dette udvidelsesmodul er ikke understøttet og kun til " +#~ "demonstrationsbrug.\n" -#: ../ui/evolution-mail-message.xml.h:44 -msgid "Forward the selected message quoted like a reply" -msgstr "Videresend det valgte brev, citeret som et svar" +#~ msgid "Writes a log of profiling data events." +#~ msgstr "Skriver en log over begivenheder ifm. dannelse af profil." -#: ../ui/evolution-mail-message.xml.h:45 -msgid "Forward the selected message to someone" -msgstr "Videresend det valgte brev til en eller anden" +#~ msgid "SpamAssassin (built-in)" +#~ msgstr "SpamAssassin (indbygget)" -#: ../ui/evolution-mail-message.xml.h:46 -msgid "Forward the selected message to someone as an attachment" -msgstr "Videresend det valgte brev til nogen som et bilag" +#~ msgid "" +#~ "Filters junk messages using SpamAssassin. This plugin requires " +#~ "SpamAssassin to be installed." +#~ msgstr "" +#~ "Bortfiltrerer spam med SpamAssassin. Dette udvidelsesmodul kræver at " +#~ "SpamAssassin er installeret." -#: ../ui/evolution-mail-message.xml.h:47 -msgid "Increase the text size" -msgstr "Forøg tekstens størrelse" +#~ msgid "Indicates if threading of messages should fall back to subject." +#~ msgstr "Indikerer om trådning af breve, skal falde tilbage på emne." -#: ../ui/evolution-mail-message.xml.h:49 -msgid "Mar_k as" -msgstr "Mar_kér som" +#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments." +#~ msgstr "" +#~ "Et simpelt udvidelsesmodul som bruger yTNEF til at afkode TNEF-bilag." -#: ../ui/evolution-mail-message.xml.h:50 -msgid "Mark the selected messages as having been read" -msgstr "Markér de valgte breve som værende læste" +#~ msgid "A plugin to setup WebDAV contacts." +#~ msgstr "Et udvidelsesmodul til opsætning af WebDAV-kontaktpersoner." -#: ../ui/evolution-mail-message.xml.h:51 -msgid "Mark the selected messages as important" -msgstr "Markér de valgte breve som vigtige" +#~ msgid "Pos_t New Message to Folder" +#~ msgstr "Send nyt brev til _mappe" -#: ../ui/evolution-mail-message.xml.h:52 -msgid "Mark the selected messages as junk" -msgstr "Markér de valgte breve som spam" +#~ msgid "Post a Repl_y" +#~ msgstr "Sen_d et svar" -#: ../ui/evolution-mail-message.xml.h:53 -msgid "Mark the selected messages as not being junk" -msgstr "Markér de valgte breve som ikke værende spam" +#~ msgid "Post a message to a Public folder" +#~ msgstr "Send et brev til en offentlig mappe" -#: ../ui/evolution-mail-message.xml.h:54 -msgid "Mark the selected messages as not having been read" -msgstr "Markér de valgte breve som værende ulæste" +#~ msgid "Post a reply to a message in a Public folder" +#~ msgstr "Send et svar til et brev i en offentlig mappe" -#: ../ui/evolution-mail-message.xml.h:55 -msgid "Mark the selected messages as unimportant" -msgstr "Markér de valgte breve som uvigtige" +#~ msgid "Current Message" +#~ msgstr "Aktuelle brev" -#: ../ui/evolution-mail-message.xml.h:56 -msgid "Mark the selected messages for deletion" -msgstr "Markér de valgte breve til sletning" +#~ msgid "Toggle Attachment Bar" +#~ msgstr "Vis/skjul bilags-panel" -#: ../ui/evolution-mail-message.xml.h:57 -msgid "Move selected messages to another folder" -msgstr "Flyt de valgte breve til en anden mappe" +#~ msgid "activate" +#~ msgstr "aktivér" -#: ../ui/evolution-mail-message.xml.h:59 -msgid "Next _Important Message" -msgstr "Næste _vigtige meddelelse" +#~ msgid "3268" +#~ msgstr "3268" -#: ../ui/evolution-mail-message.xml.h:60 -msgid "Next _Thread" -msgstr "Næste _tråd" +#~ msgid "389" +#~ msgstr "389" -#: ../ui/evolution-mail-message.xml.h:61 -msgid "Next _Unread Message" -msgstr "Næste _ulæste brev" +#~ msgid "636" +#~ msgstr "636" -#: ../ui/evolution-mail-message.xml.h:62 -msgid "Not Junk" -msgstr "Ikke spam" +#~ msgid "Type:" +#~ msgstr "Type:" -#: ../ui/evolution-mail-message.xml.h:63 -msgid "Open a window for composing a mail message" -msgstr "Åbn et vindue for at skrive et brev" +#~ msgid "Add Address Book" +#~ msgstr "Tilføj adressebog" -#: ../ui/evolution-mail-message.xml.h:64 -msgid "Open the selected messages in a new window" -msgstr "Åbn de valgt breve i et nyt vindue" +#~ msgid "Anonymously" +#~ msgstr "Anonymt" -#: ../ui/evolution-mail-message.xml.h:65 -msgid "Open the selected messages in the composer for editing" -msgstr "Åbn de valgte breve i redigeringsvinduet" +#~ msgid "Basic" +#~ msgstr "Basal" -#: ../ui/evolution-mail-message.xml.h:66 -msgid "P_revious Unread Message" -msgstr "F_oregående ulæste brev" +#~ msgid "Distinguished name" +#~ msgstr "Specielt navn" -#: ../ui/evolution-mail-message.xml.h:67 -msgid "Paste messages from the clipboard" -msgstr "Indsæt breve fra klippebordet" +#~ msgid "Email address" +#~ msgstr "E-mail-adresse" -#: ../ui/evolution-mail-message.xml.h:68 -msgid "Pos_t New Message to Folder" -msgstr "Send nyt brev til _mappe" +#~ msgid "Find Possible Search Bases" +#~ msgstr "Find mulige søgebaser" -#: ../ui/evolution-mail-message.xml.h:69 -msgid "Post a Repl_y" -msgstr "Sen_d et svar" +#~ msgid "Search filter" +#~ msgstr "Søgefilter" -#: ../ui/evolution-mail-message.xml.h:70 -msgid "Post a message to a Public folder" -msgstr "Send et brev til en offentlig mappe" +#~ msgid "Sub" +#~ msgstr "Under" -#: ../ui/evolution-mail-message.xml.h:71 -msgid "Post a reply to a message in a Public folder" -msgstr "Send et svar til et brev i en offentlig mappe" +#~ msgid "Using email address" +#~ msgstr "Bruger e-postadresse" -#: ../ui/evolution-mail-message.xml.h:72 -msgid "Pr_evious Important Message" -msgstr "Fo_regående vigtige brev" +#~ msgid "Whenever Possible" +#~ msgstr "Når det er muligt" -#: ../ui/evolution-mail-message.xml.h:73 -msgid "Preview the message to be printed" -msgstr "Forhåndsvis brevet som skal udskrives" +#~ msgid "_Add Address Book" +#~ msgstr "_Tilføj adressebog" -#: ../ui/evolution-mail-message.xml.h:77 -msgid "Print this message" -msgstr "Udskriv dette brev" +#~ msgid "MSN Messenger" +#~ msgstr "MSN Messenger" -#: ../ui/evolution-mail-message.xml.h:78 -msgid "Re_direct" -msgstr "_Omdirigér" +#~ msgid "Novell GroupWise" +#~ msgstr "Novell GroupWise" -#: ../ui/evolution-mail-message.xml.h:79 -msgid "Redirect (bounce) the selected message to someone" -msgstr "Omdirigér (bounce) det markerede brev til en eller anden" +#~ msgid "Novell Groupwise" +#~ msgstr "Novell Groupwise" -#: ../ui/evolution-mail-message.xml.h:84 -msgid "Reset the text to its original size" -msgstr "Nulstil tekststørrelsen til den oprindelige" +#~ msgid "United States" +#~ msgstr "U.S.A." -#: ../ui/evolution-mail-message.xml.h:85 -msgid "Save the selected messages as a text file" -msgstr "Gem de valgte breve som tekstfil" +#~ msgid "Afghanistan" +#~ msgstr "Afghanistan" -#: ../ui/evolution-mail-message.xml.h:86 -msgid "Search Folder from Mailing _List..." -msgstr "Søgemappe ud fra post-_liste..." +#~ msgid "Albania" +#~ msgstr "Albanien" -#: ../ui/evolution-mail-message.xml.h:87 -msgid "Search Folder from Recipien_ts..." -msgstr "Søgemappe ud fra _modtagere..." +#~ msgid "Algeria" +#~ msgstr "Algeriet" -#: ../ui/evolution-mail-message.xml.h:88 -msgid "Search Folder from S_ubject..." -msgstr "Søgemappe ud fra e_mne..." +#~ msgid "American Samoa" +#~ msgstr "Amerikansk Samoa" -#: ../ui/evolution-mail-message.xml.h:89 -msgid "Search Folder from Sen_der..." -msgstr "Søgemappe ud fra afse_nder..." +#~ msgid "Andorra" +#~ msgstr "Andorra" -#: ../ui/evolution-mail-message.xml.h:90 -msgid "Search for text in the body of the displayed message" -msgstr "Søg efter tekst i kroppen af det viste brev" +#~ msgid "Angola" +#~ msgstr "Angola" -#: ../ui/evolution-mail-message.xml.h:91 -msgid "Select _All Text" -msgstr "Vælg _hele teksten" +#~ msgid "Anguilla" +#~ msgstr "Anguilla" -#: ../ui/evolution-mail-message.xml.h:92 -msgid "Select all the text in a message" -msgstr "Vælg hele teksten i et brev" +#~ msgid "Antarctica" +#~ msgstr "Antarktis" -#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27 -msgid "Set up the page settings for your current printer" -msgstr "Konfigurér sideindstillingerne for din aktuelle printer" +#~ msgid "Antigua And Barbuda" +#~ msgstr "Antigua og Barbuda" -#: ../ui/evolution-mail-message.xml.h:94 -msgid "Show a blinking cursor in the body of displayed messages" -msgstr "Vis en blinkende markør i kroppen af viste breve" +#~ msgid "Argentina" +#~ msgstr "Argentina" -#: ../ui/evolution-mail-message.xml.h:95 -msgid "Show messages with all email headers" -msgstr "Vis breve med det fulde brevhoved" +#~ msgid "Armenia" +#~ msgstr "Armenien" -#: ../ui/evolution-mail-message.xml.h:96 -msgid "Show the raw email source of the message" -msgstr "Vis brevet i sin rå form" +#~ msgid "Aruba" +#~ msgstr "Aruba" -#: ../ui/evolution-mail-message.xml.h:97 -msgid "Undelete the selected messages" -msgstr "Fortryd sletning af de valgte breve" +#~ msgid "Australia" +#~ msgstr "Australien" -#: ../ui/evolution-mail-message.xml.h:98 -msgid "Uni_mportant" -msgstr "_Ikke vigtig" +#~ msgid "Austria" +#~ msgstr "Østrig" -#: ../ui/evolution-mail-message.xml.h:99 -msgid "Zoom _Out" -msgstr "Zoom _ud" +#~ msgid "Azerbaijan" +#~ msgstr "Aserbajdsjan" -#: ../ui/evolution-mail-message.xml.h:100 -msgid "_Attached" -msgstr "_Vedlagt" +#~ msgid "Bahamas" +#~ msgstr "Bahamas" -#: ../ui/evolution-mail-message.xml.h:101 -msgid "_Caret Mode" -msgstr "Markør_tilstand" +#~ msgid "Bahrain" +#~ msgstr "Bahrain" -#: ../ui/evolution-mail-message.xml.h:102 -msgid "_Clear Flag" -msgstr "_Fjern markering" +#~ msgid "Bangladesh" +#~ msgstr "Bangladesh" -#: ../ui/evolution-mail-message.xml.h:105 -msgid "_Delete Message" -msgstr "_Slet brev" +#~ msgid "Barbados" +#~ msgstr "Barbados" -#: ../ui/evolution-mail-message.xml.h:107 -msgid "_Find in Message..." -msgstr "S_øg i brev..." +#~ msgid "Belarus" +#~ msgstr "Hviderusland" -#: ../ui/evolution-mail-message.xml.h:108 -msgid "_Flag Completed" -msgstr "_Markering sat" +#~ msgid "Belgium" +#~ msgstr "Belgien" -#: ../ui/evolution-mail-message.xml.h:110 -msgid "_Go To" -msgstr "_Gå til" +#~ msgid "Belize" +#~ msgstr "Belize" -#: ../ui/evolution-mail-message.xml.h:111 -msgid "_Important" -msgstr "_Vigtig" +#~ msgid "Benin" +#~ msgstr "Benin" -#: ../ui/evolution-mail-message.xml.h:112 -msgid "_Inline" -msgstr "_Integreret" +#~ msgid "Bermuda" +#~ msgstr "Bermuda" -#: ../ui/evolution-mail-message.xml.h:113 -msgid "_Junk" -msgstr "_Spam" +#~ msgid "Bhutan" +#~ msgstr "Bhutan" -#: ../ui/evolution-mail-message.xml.h:114 -msgid "_Load Images" -msgstr "_Indlæs billeder" +#~ msgid "Bolivia" +#~ msgstr "Bolivia" -#: ../ui/evolution-mail-message.xml.h:116 -msgid "_Message Source" -msgstr "_Brevkildetekst" +#~ msgid "Bosnia And Herzegowina" +#~ msgstr "Bosnien og Herzegovina" -#: ../ui/evolution-mail-message.xml.h:118 -msgid "_Next Message" -msgstr "_Næste brev" +#~ msgid "Botswana" +#~ msgstr "Botswana" -#: ../ui/evolution-mail-message.xml.h:119 -msgid "_Normal Size" -msgstr "_Normal størrelse" +#~ msgid "Bouvet Island" +#~ msgstr "Bouvetøen" -#: ../ui/evolution-mail-message.xml.h:120 -msgid "_Not Junk" -msgstr "_Ikke spam" +#~ msgid "Brazil" +#~ msgstr "Brasilien" -#: ../ui/evolution-mail-message.xml.h:121 -msgid "_Open in New Window" -msgstr "Åbn i nyt _vindue" +#~ msgid "British Indian Ocean Territory" +#~ msgstr "Britisk-Indisk havområde" -#: ../ui/evolution-mail-message.xml.h:122 -msgid "_Previous Message" -msgstr "_Foregående brev" +#~ msgid "Brunei Darussalam" +#~ msgstr "Brunei Dar-es-salam" -#: ../ui/evolution-mail-message.xml.h:124 -msgid "_Quoted" -msgstr "_Citeret" +#~ msgid "Bulgaria" +#~ msgstr "Bulgarien" -# rettigheder, ikke bydeform -#. Translators: "Read" as in "has been read" (evolution-mail-message.xml) -#: ../ui/evolution-mail-message.xml.h:126 -msgid "_Read" -msgstr "_Læse" +#~ msgid "Burkina Faso" +#~ msgstr "Burkina Faso" + +#~ msgid "Burundi" +#~ msgstr "Burundi" -#: ../ui/evolution-mail-message.xml.h:128 -msgid "_Save Message..." -msgstr "_Gem brev..." +#~ msgid "Cambodia" +#~ msgstr "Cambodja" -#: ../ui/evolution-mail-message.xml.h:129 -msgid "_Undelete Message" -msgstr "_Fortryd sletning af brev" +#~ msgid "Cameroon" +#~ msgstr "Kamerun" -#: ../ui/evolution-mail-message.xml.h:130 -msgid "_Unread" -msgstr "_Ulæst" +#~ msgid "Canada" +#~ msgstr "Canada" -#: ../ui/evolution-mail-message.xml.h:131 -msgid "_Zoom" -msgstr "_Zoom" +#~ msgid "Cape Verde" +#~ msgstr "Kap Verde" -#: ../ui/evolution-mail-message.xml.h:132 -msgid "_Zoom In" -msgstr "Zoom _ind" +#~ msgid "Cayman Islands" +#~ msgstr "Cayman-øerne" -#: ../ui/evolution-mail-messagedisplay.xml.h:1 -msgid "Close" -msgstr "Luk" +#~ msgid "Central African Republic" +#~ msgstr "Centralafrikanske republik" -#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18 -msgid "Main toolbar" -msgstr "Hovedværktøjslinje" +#~ msgid "Chad" +#~ msgstr "Tchad" -#: ../ui/evolution-memos.xml.h:3 -msgid "Copy selected memo" -msgstr "Kopiér valgte huskeseddel" +#~ msgid "Chile" +#~ msgstr "Chile" -#: ../ui/evolution-memos.xml.h:5 -msgid "Cut selected memo" -msgstr "Klip valgte huskeseddel ud" +#~ msgid "China" +#~ msgstr "Kina" -#: ../ui/evolution-memos.xml.h:7 -msgid "Delete selected memos" -msgstr "Slet valgte huskesedler" +#~ msgid "Christmas Island" +#~ msgstr "Juleøen" -#: ../ui/evolution-memos.xml.h:9 -msgid "Paste memo from the clipboard" -msgstr "Indsæt huskeseddel fra klippebordet" +#~ msgid "Cocos (Keeling) Islands" +#~ msgstr "Cocos (Keeling)-øerne" -#: ../ui/evolution-memos.xml.h:10 -msgid "Previews the list of memos to be printed" -msgstr "Viser listen over huskesedler som skal udskrives" +#~ msgid "Colombia" +#~ msgstr "Columbia" -#: ../ui/evolution-memos.xml.h:13 -msgid "Print the list of memos" -msgstr "Udskriv listen med huskesedler" +#~ msgid "Comoros" +#~ msgstr "Komorene" -#: ../ui/evolution-memos.xml.h:14 -msgid "View the selected memo" -msgstr "Vis den valgte huskeseddel" +#~ msgid "Congo" +#~ msgstr "Congo" -#: ../ui/evolution-memos.xml.h:18 -msgid "_Open Memo" -msgstr "_Åbn huskeseddel" +#~ msgid "Congo, The Democratic Republic Of The" +#~ msgstr "Congo" -#: ../ui/evolution-tasks.xml.h:3 -msgid "Copy selected tasks" -msgstr "Kopiér valgte opgaver" +#~ msgid "Cook Islands" +#~ msgstr "Cook-øerne" -#: ../ui/evolution-tasks.xml.h:5 -msgid "Cut selected tasks" -msgstr "Klip valgte opgaver ud" +#~ msgid "Costa Rica" +#~ msgstr "Costa Rica" -#: ../ui/evolution-tasks.xml.h:7 -msgid "Delete completed tasks" -msgstr "Fjern fuldførte opgaver" +#~ msgid "Cote d'Ivoire" +#~ msgstr "Elfenbenskysten" -#: ../ui/evolution-tasks.xml.h:8 -msgid "Delete selected tasks" -msgstr "Slet valgte opgaver" +#~ msgid "Croatia" +#~ msgstr "Kroatien" -#: ../ui/evolution-tasks.xml.h:9 -msgid "Mar_k as Complete" -msgstr "Mar_kér som fuldført" +#~ msgid "Cuba" +#~ msgstr "Cuba" -#: ../ui/evolution-tasks.xml.h:10 -msgid "Mark selected tasks as complete" -msgstr "Markér de valgte opgaver som fuldførte" +#~ msgid "Cyprus" +#~ msgstr "Cypern" -#: ../ui/evolution-tasks.xml.h:12 -msgid "Paste tasks from the clipboard" -msgstr "Indsæt opgaver fra klippebordet" +#~ msgid "Czech Republic" +#~ msgstr "Tjekkiet" -#: ../ui/evolution-tasks.xml.h:13 -msgid "Previews the list of tasks to be printed" -msgstr "Viser listen over opgaver som skal udskrives" +#~ msgid "Denmark" +#~ msgstr "Danmark" -#: ../ui/evolution-tasks.xml.h:16 -msgid "Print the list of tasks" -msgstr "Udskriv listen med opgaver" +#~ msgid "Djibouti" +#~ msgstr "Djibouti" -#: ../ui/evolution-tasks.xml.h:18 -msgid "Show task preview window" -msgstr "Vis vinduet med forhåndsvisning af opgave" +#~ msgid "Dominica" +#~ msgstr "Dominika" -#: ../ui/evolution-tasks.xml.h:19 -msgid "Task _Preview" -msgstr "_Vis opgave" +#~ msgid "Dominican Republic" +#~ msgstr "Dominikanske Republik" -#: ../ui/evolution-tasks.xml.h:20 -msgid "View the selected task" -msgstr "Vis den valgte opgave" +#~ msgid "Ecuador" +#~ msgstr "Ækvador" -#: ../ui/evolution-tasks.xml.h:27 -msgid "_Open Task" -msgstr "_Åbn opgave" +#~ msgid "Egypt" +#~ msgstr "Egypten" -#: ../ui/evolution.xml.h:1 -msgid "About Evolution..." -msgstr "Om Evolution..." +#~ msgid "El Salvador" +#~ msgstr "El Salvador" -#: ../ui/evolution.xml.h:2 -msgid "Change Evolution's settings" -msgstr "Skift indstillinger for Evolution" +#~ msgid "Equatorial Guinea" +#~ msgstr "Ækvatorial Guinea" -#: ../ui/evolution.xml.h:3 -msgid "Change the visibility of the toolbar" -msgstr "Ændr værktøjslinjens synlighed" +#~ msgid "Eritrea" +#~ msgstr "Eritrea" -#: ../ui/evolution.xml.h:5 -msgid "Create a new window displaying this folder" -msgstr "Opret et nyt vindue som viser denne mappe" +#~ msgid "Estonia" +#~ msgstr "Estland" -#: ../ui/evolution.xml.h:6 -msgid "Display window buttons using the desktop toolbar setting" -msgstr "" -"Vis vinduesknapper vha. indstillingerne for skrivebordets værktøjslinje" +#~ msgid "Ethiopia" +#~ msgstr "Etiopien" -#: ../ui/evolution.xml.h:7 -msgid "Display window buttons with icons and text" -msgstr "Vis vinduesknapper med ikoner og tekst" +#~ msgid "Falkland Islands" +#~ msgstr "Falklandsøerne" -#: ../ui/evolution.xml.h:8 -msgid "Display window buttons with icons only" -msgstr "Vis vinduesknapper kun med ikoner" +#~ msgid "Faroe Islands" +#~ msgstr "Færøerne" -#: ../ui/evolution.xml.h:9 -msgid "Display window buttons with text only" -msgstr "Vis vinduesknapper kun med tekst" +#~ msgid "Fiji" +#~ msgstr "Fiji" -#: ../ui/evolution.xml.h:10 -msgid "Evolution _FAQ" -msgstr "Evolution _OSS" +#~ msgid "Finland" +#~ msgstr "Finland" -#: ../ui/evolution.xml.h:11 -msgid "Exit the program" -msgstr "Afslut programmet" +#~ msgid "France" +#~ msgstr "Frankrig" -#: ../ui/evolution.xml.h:12 -msgid "Forget remembered passwords so you will be prompted for them again" -msgstr "Glem alle adgangskoder så du vil blive spurgt om at opgive dem igen" +#~ msgid "French Guiana" +#~ msgstr "Fransk Guinea" -#: ../ui/evolution.xml.h:13 -msgid "Hide window buttons" -msgstr "Skjul vinduesknapper" +#~ msgid "French Polynesia" +#~ msgstr "Fransk polynesien" -#: ../ui/evolution.xml.h:14 -msgid "I_mport..." -msgstr "Im_portér..." +#~ msgid "French Southern Territories" +#~ msgstr "Sydlige franske territorier" -#: ../ui/evolution.xml.h:15 -msgid "Icons _and Text" -msgstr "Ikoner _og tekst" +#~ msgid "Gabon" +#~ msgstr "Gabon" -#: ../ui/evolution.xml.h:16 -msgid "Import data from other programs" -msgstr "Importér data fra andre programmer" +#~ msgid "Gambia" +#~ msgstr "Gambia" -#: ../ui/evolution.xml.h:17 -msgid "Lay_out" -msgstr "La_yout" +#~ msgid "Georgia" +#~ msgstr "Georgien" -#: ../ui/evolution.xml.h:19 -msgid "New _Window" -msgstr "Nyt _vindue" +#~ msgid "Germany" +#~ msgstr "Tyskland" -#: ../ui/evolution.xml.h:20 -msgid "Open the Frequently Asked Questions webpage" -msgstr "Åbner Ofte Stillede Spørgsmål-websiden" +#~ msgid "Ghana" +#~ msgstr "Ghana" -#: ../ui/evolution.xml.h:21 -msgid "Page Set_up..." -msgstr "Sideop_sætning..." +#~ msgid "Gibraltar" +#~ msgstr "Gibraltar" -#: ../ui/evolution.xml.h:22 -msgid "Prefere_nces" -msgstr "_Indstillinger" +#~ msgid "Greece" +#~ msgstr "Grækenland" -#: ../ui/evolution.xml.h:23 -msgid "Send / Receive" -msgstr "Send / modtag" +#~ msgid "Greenland" +#~ msgstr "Grønland" -#: ../ui/evolution.xml.h:24 -msgid "Send / _Receive" -msgstr "Send / _modtag" +#~ msgid "Grenada" +#~ msgstr "Grenada" -#: ../ui/evolution.xml.h:25 -msgid "Send queued items and retrieve new items" -msgstr "Send udgående breve og hent nye breve" +#~ msgid "Guadeloupe" +#~ msgstr "Guadeloupe" -#: ../ui/evolution.xml.h:26 -msgid "Set up Pilot configuration" -msgstr "Konfigurér Pilotkonfiguration" +#~ msgid "Guam" +#~ msgstr "Guam" -#: ../ui/evolution.xml.h:28 -msgid "Show Side _Bar" -msgstr "Vis side_panel" +#~ msgid "Guatemala" +#~ msgstr "Guatemala" -#: ../ui/evolution.xml.h:29 -msgid "Show _Status Bar" -msgstr "Vis stat_uslinje" +#~ msgid "Guernsey" +#~ msgstr "Guernsey" -#: ../ui/evolution.xml.h:30 -msgid "Show _Toolbar" -msgstr "Vis værk_tøjslinje" +#~ msgid "Guinea" +#~ msgstr "Guinea" -#: ../ui/evolution.xml.h:31 -msgid "Show information about Evolution" -msgstr "Vis information om Evolution" +#~ msgid "Guinea-Bissau" +#~ msgstr "Guinea-Bissau" -#: ../ui/evolution.xml.h:32 -msgid "Submit Bug Report" -msgstr "Indsend fejlrapport" +#~ msgid "Guyana" +#~ msgstr "Guyana" -#: ../ui/evolution.xml.h:33 -msgid "Submit _Bug Report" -msgstr "Indsen_d fejlrapport" +#~ msgid "Haiti" +#~ msgstr "Haiti" -#: ../ui/evolution.xml.h:34 -msgid "Submit a bug report using Bug Buddy" -msgstr "Indsend en fejlrapport med Bug Buddy" +#~ msgid "Heard And McDonald Islands" +#~ msgstr "Heard og McDonald-øerne" -#: ../ui/evolution.xml.h:35 -msgid "Toggle whether we are working offline." -msgstr "Skift mellem opkoblet/afkoblet arbejdstilstand." +#~ msgid "Holy See" +#~ msgstr "Dødehavet" -#: ../ui/evolution.xml.h:36 -msgid "Tool_bar Style" -msgstr "Værktøjs_linjestil" +#~ msgid "Honduras" +#~ msgstr "Honduras" -#: ../ui/evolution.xml.h:37 -msgid "View/Hide the Side Bar" -msgstr "Vis/skjul sidepanelet" +#~ msgid "Hong Kong" +#~ msgstr "Hong Kong" -#: ../ui/evolution.xml.h:38 -msgid "View/Hide the Status Bar" -msgstr "Vis/skjul statuslinjen" +#~ msgid "Hungary" +#~ msgstr "Ungarn" -#: ../ui/evolution.xml.h:39 -msgid "Work _Offline" -msgstr "Arbejd _afkoblet" +#~ msgid "Iceland" +#~ msgstr "Island" -#: ../ui/evolution.xml.h:40 -msgid "_About" -msgstr "_Om" +#~ msgid "India" +#~ msgstr "Indien" -#: ../ui/evolution.xml.h:41 -msgid "_Close Window" -msgstr "_Luk vindue" +#~ msgid "Indonesia" +#~ msgstr "Indonesien" -#: ../ui/evolution.xml.h:44 -msgid "_Forget Passwords" -msgstr "_Glem adgangskoder" +#~ msgid "Iran" +#~ msgstr "Iran" -#: ../ui/evolution.xml.h:45 -msgid "_Frequently Asked Questions" -msgstr "_Ofte Stillede Spørgsmål" +#~ msgid "Iraq" +#~ msgstr "Irak" -#: ../ui/evolution.xml.h:47 -msgid "_Hide Buttons" -msgstr "_Skjul knapper" +#~ msgid "Ireland" +#~ msgstr "Irland" -#: ../ui/evolution.xml.h:48 -msgid "_Icons Only" -msgstr "Kun _ikoner" +#~ msgid "Isle of Man" +#~ msgstr "Isle of Man" -#: ../ui/evolution.xml.h:50 -msgid "_Quick Reference" -msgstr "_Kvikreference" +#~ msgid "Israel" +#~ msgstr "Israel" -#: ../ui/evolution.xml.h:51 -msgid "_Quit" -msgstr "_Afslut" +#~ msgid "Italy" +#~ msgstr "Italien" -#: ../ui/evolution.xml.h:52 -msgid "_Switcher Appearance" -msgstr "V_ælger-udseende" +#~ msgid "Jamaica" +#~ msgstr "Jamaica" -#: ../ui/evolution.xml.h:53 -msgid "_Synchronization Options..." -msgstr "S_ynkroniserings-indstillinger..." +#~ msgid "Japan" +#~ msgstr "Japan" -#: ../ui/evolution.xml.h:54 -msgid "_Text Only" -msgstr "Kun _tekst" +#~ msgid "Jersey" +#~ msgstr "Jersey" -#: ../ui/evolution.xml.h:56 -msgid "_Window" -msgstr "_Vindue" +#~ msgid "Jordan" +#~ msgstr "Jordan" -#: ../views/addressbook/galview.xml.h:1 -msgid "By _Company" -msgstr "Efter _firma" +#~ msgid "Kazakhstan" +#~ msgstr "Kasakhstan" -#: ../views/addressbook/galview.xml.h:2 -msgid "_Address Cards" -msgstr "_Adressekort" +#~ msgid "Kenya" +#~ msgstr "Kenya" -#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3 -msgid "_List View" -msgstr "_Listeoversigt" +#~ msgid "Kiribati" +#~ msgstr "Kiribati" -#: ../views/calendar/galview.xml.h:1 -msgid "W_eek View" -msgstr "_Ugeoversigt" +#~ msgid "Korea, Democratic People's Republic Of" +#~ msgstr "Nordkorea" -#: ../views/calendar/galview.xml.h:2 -msgid "_Day View" -msgstr "_Dagsoversigt" +#~ msgid "Korea, Republic Of" +#~ msgstr "Sydkorea" -#: ../views/calendar/galview.xml.h:4 -msgid "_Month View" -msgstr "_Månedsoversigt" +#~ msgid "Kuwait" +#~ msgstr "Kuwait" -#: ../views/calendar/galview.xml.h:5 -msgid "_Work Week View" -msgstr "_Arbejdsugeoversigt" +#~ msgid "Kyrgyzstan" +#~ msgstr "Kirgisistan" -#: ../views/mail/galview.xml.h:1 -msgid "As Sent Folder for Wi_de View" -msgstr "Som Sendt-mappen til b_redformat" +#~ msgid "Laos" +#~ msgstr "Laos" -#: ../views/mail/galview.xml.h:2 -msgid "As _Sent Folder" -msgstr "Som Sendt-_mappen" +#~ msgid "Latvia" +#~ msgstr "Letland" -#: ../views/mail/galview.xml.h:3 -msgid "By S_tatus" -msgstr "Efter _status" +#~ msgid "Lebanon" +#~ msgstr "Libanon" -#: ../views/mail/galview.xml.h:4 -msgid "By Se_nder" -msgstr "Efter _afsender" +#~ msgid "Lesotho" +#~ msgstr "Lesotho" -#: ../views/mail/galview.xml.h:5 -msgid "By Su_bject" -msgstr "Efter _emne" +#~ msgid "Liberia" +#~ msgstr "Liberia" -#: ../views/mail/galview.xml.h:6 -msgid "By _Follow Up Flag" -msgstr "Efter _følg-op-markering" +#~ msgid "Libya" +#~ msgstr "Libya" -#: ../views/mail/galview.xml.h:7 -msgid "For _Wide View" -msgstr "Til _bredformat" +#~ msgid "Liechtenstein" +#~ msgstr "Liechtenstein" -#: ../views/mail/galview.xml.h:8 -msgid "_Messages" -msgstr "_Breve" +#~ msgid "Lithuania" +#~ msgstr "Litauen" -#: ../views/memos/galview.xml.h:1 -msgid "_Memos" -msgstr "_Huskesedler" +#~ msgid "Luxembourg" +#~ msgstr "Luxembourg" -#: ../views/tasks/galview.xml.h:1 -msgid "With _Due Date" -msgstr "Med _forfaldsdato" +#~ msgid "Macao" +#~ msgstr "Macao" -#: ../views/tasks/galview.xml.h:2 -msgid "With _Status" -msgstr "Med _status" +#~ msgid "Macedonia" +#~ msgstr "Makedonien" -#. Put the "UTC" entry at the top of the combo's list. -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784 -msgid "UTC" -msgstr "UTC" +#~ msgid "Madagascar" +#~ msgstr "Madagaskar" -#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1 -msgid "Time Zones" -msgstr "Tidszoner" +#~ msgid "Malawi" +#~ msgstr "Malawi" -#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2 -msgid "_Selection" -msgstr "_Markering" +#~ msgid "Malaysia" +#~ msgstr "Malaysia" -#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4 -msgid "Select a Time Zone" -msgstr "Vælg en tidszone" +#~ msgid "Maldives" +#~ msgstr "Maldiverne" -#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5 -msgid "Timezone drop-down combination box" -msgstr "Rullegardin-kombinationsboks til tidszoner" +#~ msgid "Mali" +#~ msgstr "Mali" -#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6 -msgid "" -"Use the left mouse button to zoom in on an area of the map and select a time " -"zone.\n" -"Use the right mouse button to zoom out." -msgstr "" -"Brug venstre museknap til at zoome ind på et område af kortet og vælg en " -"tidszone.\n" -"Brug højre museknap til at zoome ud." +#~ msgid "Malta" +#~ msgstr "Malta" -#: ../widgets/menus/gal-define-views-dialog.c:76 -#: ../widgets/menus/gal-define-views-model.c:185 -msgid "Collection" -msgstr "Samling" +#~ msgid "Marshall Islands" +#~ msgstr "Marshalløerne" -#: ../widgets/menus/gal-define-views-dialog.c:358 -#: ../widgets/menus/gal-define-views.glade.h:4 -#, no-c-format -msgid "Define Views for %s" -msgstr "Definér oversigter for %s" +#~ msgid "Martinique" +#~ msgstr "Martinique" -#: ../widgets/menus/gal-define-views-dialog.c:366 -#: ../widgets/menus/gal-define-views-dialog.c:368 -msgid "Define Views" -msgstr "Definér oversigter" +#~ msgid "Mauritania" +#~ msgstr "Mauretanien" -#: ../widgets/menus/gal-define-views.glade.h:2 -#, no-c-format -msgid "Define Views for \"%s\"" -msgstr "Definér oversigter for \"%s\"" +#~ msgid "Mauritius" +#~ msgstr "Mauritius" -#: ../widgets/menus/gal-view-factory-etable.c:37 -#: ../widgets/table/e-table-header-item.c:1921 -#: ../widgets/table/e-table-scrolled.c:215 -#: ../widgets/table/e-table-scrolled.c:216 -msgid "Table" -msgstr "Tabel" +#~ msgid "Mayotte" +#~ msgstr "Mayotte" -#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225 -msgid "Instance" -msgstr "Tilfælde" +#~ msgid "Mexico" +#~ msgstr "Mexico" -#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283 -msgid "Save Current View" -msgstr "Gem nuværende oversigt" +#~ msgid "Micronesia" +#~ msgstr "Mikronesien" -#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1 -msgid "_Create new view" -msgstr "_Opret ny oversigt" +#~ msgid "Moldova, Republic Of" +#~ msgstr "Moldova" -#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3 -msgid "_Replace existing view" -msgstr "_Erstat eksisterende oversigt" +#~ msgid "Monaco" +#~ msgstr "Monaco" -#. bonobo displays this string so it must be in locale -#: ../widgets/menus/gal-view-instance.c:581 -#: ../widgets/menus/gal-view-menus.c:367 -msgid "Custom View" -msgstr "Tilpasset oversigt" +#~ msgid "Mongolia" +#~ msgstr "Mongoliet" -#: ../widgets/menus/gal-view-instance.c:582 -msgid "Save Custom View" -msgstr "Gem tilpasset oversigt" +#~ msgid "Montserrat" +#~ msgstr "Montserrat" -#: ../widgets/menus/gal-view-instance.c:586 -#: ../widgets/menus/gal-view-menus.c:391 -msgid "Define Views..." -msgstr "Definér oversigter..." +#~ msgid "Morocco" +#~ msgstr "Marokko" -#: ../widgets/menus/gal-view-menus.c:304 -msgid "C_urrent View" -msgstr "_Aktuel oversigt" +#~ msgid "Mozambique" +#~ msgstr "Mozambique" -#: ../widgets/menus/gal-view-menus.c:328 -#, c-format -msgid "Select View: %s" -msgstr "Vælg oversigt: %s" +#~ msgid "Myanmar" +#~ msgstr "Myanmar" -#: ../widgets/menus/gal-view-menus.c:372 -msgid "Current view is a customized view" -msgstr "Nuværende oversigt er en tilpasset oversigt" +#~ msgid "Namibia" +#~ msgstr "Namibia" -#: ../widgets/menus/gal-view-menus.c:377 -msgid "Save Custom View..." -msgstr "Gem tilrettet oversigt..." +#~ msgid "Nauru" +#~ msgstr "Nauru" -#: ../widgets/menus/gal-view-menus.c:382 -msgid "Save current custom view" -msgstr "Gem nuværende tilpassede oversigt" +#~ msgid "Nepal" +#~ msgstr "Nepal" -#: ../widgets/menus/gal-view-menus.c:396 -msgid "Create or edit views" -msgstr "Opret alle rediger oversigter" +# Holland udgør kun 2 af Nederland(ene)s 12 provinser. +# og der skelnes mellem Holland og Nederland på sproget. +# Off. danske navn iflg. udenrigsministeriet er Nederlandene. +#~ msgid "Netherlands" +#~ msgstr "Nederlandene" -#: ../widgets/menus/gal-view-new-dialog.c:70 -msgid "Factory" -msgstr "Funktion" +#~ msgid "Netherlands Antilles" +#~ msgstr "Nederlandske Antiller" -#: ../widgets/menus/gal-view-new-dialog.c:105 -msgid "Define New View" -msgstr "Definér ny oversigt" +#~ msgid "New Caledonia" +#~ msgstr "Ny-kaledonia" -#: ../widgets/menus/gal-view-new-dialog.glade.h:1 -msgid "Name of new view:" -msgstr "Navn på ny oversigt:" +#~ msgid "New Zealand" +#~ msgstr "New Zealand" -#: ../widgets/menus/gal-view-new-dialog.glade.h:2 -msgid "Type of View" -msgstr "Type af oversigt" +#~ msgid "Nicaragua" +#~ msgstr "Nicaragua" -#: ../widgets/menus/gal-view-new-dialog.glade.h:3 -msgid "Type of view:" -msgstr "Type af oversigt:" +#~ msgid "Niger" +#~ msgstr "Niger" -#: ../widgets/misc/e-attachment-bar.c:1132 -msgid "Attachment Bar" -msgstr "Bilagslinje" +#~ msgid "Nigeria" +#~ msgstr "Nigeria" -#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305 -#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607 -#, c-format -msgid "Cannot attach file %s: %s" -msgstr "Kan ikke vedlægge fil %s: %s" +#~ msgid "Niue" +#~ msgstr "Niue" -#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599 -#, c-format -msgid "Cannot attach file %s: not a regular file" -msgstr "Kan ikke vedlægge fil %s: ikke en almindelig fil" +#~ msgid "Norfolk Island" +#~ msgstr "Norfolk-øen" -#: ../widgets/misc/e-attachment.glade.h:1 -msgid "Attachment Properties" -msgstr "Egenskaber for bilag" +#~ msgid "Northern Mariana Islands" +#~ msgstr "Nordre Mariana-øerne" -#: ../widgets/misc/e-attachment.glade.h:3 -msgid "File name:" -msgstr "Filnavn:" +#~ msgid "Norway" +#~ msgstr "Norge" -#: ../widgets/misc/e-attachment.glade.h:4 -msgid "MIME type:" -msgstr "MIME-type:" +#~ msgid "Oman" +#~ msgstr "Oman" -#: ../widgets/misc/e-attachment.glade.h:5 -msgid "Suggest automatic display of attachment" -msgstr "Foreslå automatisk visning af bilag" +#~ msgid "Pakistan" +#~ msgstr "Pakistan" -#. This is a strftime() format. %B = Month name, %Y = Year. -#: ../widgets/misc/e-calendar-item.c:1267 -msgid "%B %Y" -msgstr "%B %Y" +#~ msgid "Palau" +#~ msgstr "Palau" -#: ../widgets/misc/e-calendar.c:220 -msgid "Month Calendar" -msgstr "Månedskalender" +#~ msgid "Palestinian Territory" +#~ msgstr "Palestinensisk område" -#: ../widgets/misc/e-canvas-background.c:454 -#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644 -#: ../widgets/text/e-text.c:3645 -msgid "Fill color" -msgstr "Udfyldningsfarve" +#~ msgid "Panama" +#~ msgstr "Panama" -#: ../widgets/misc/e-canvas-background.c:461 -#: ../widgets/misc/e-canvas-background.c:462 -#: ../widgets/misc/e-canvas-background.c:468 -#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651 -#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659 -#: ../widgets/text/e-text.c:3660 -msgid "GDK fill color" -msgstr "GDK-udfyldningsfarve" +#~ msgid "Papua New Guinea" +#~ msgstr "Papua Ny Guinea" -#: ../widgets/misc/e-canvas-background.c:475 -#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666 -#: ../widgets/text/e-text.c:3667 -msgid "Fill stipple" -msgstr "Udfyldningssting" +#~ msgid "Paraguay" +#~ msgstr "Paraguay" -#: ../widgets/misc/e-canvas-background.c:482 -#: ../widgets/misc/e-canvas-background.c:483 -msgid "X1" -msgstr "X1" +#~ msgid "Peru" +#~ msgstr "Peru" -#: ../widgets/misc/e-canvas-background.c:489 -#: ../widgets/misc/e-canvas-background.c:490 -msgid "X2" -msgstr "X2" +#~ msgid "Philippines" +#~ msgstr "Filippinerne" -#: ../widgets/misc/e-canvas-background.c:496 -#: ../widgets/misc/e-canvas-background.c:497 -msgid "Y1" -msgstr "Y1" +#~ msgid "Pitcairn" +#~ msgstr "Pitcairn" -#: ../widgets/misc/e-canvas-background.c:503 -#: ../widgets/misc/e-canvas-background.c:504 -msgid "Y2" -msgstr "Y2" +#~ msgid "Poland" +#~ msgstr "Polen" -#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417 -#: ../widgets/table/e-table-group-container.c:999 -#: ../widgets/table/e-table-group-leaf.c:644 -#: ../widgets/table/e-table-item.c:3070 -msgid "Minimum width" -msgstr "Min. bredde" +#~ msgid "Portugal" +#~ msgstr "Portugal" -#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418 -#: ../widgets/table/e-table-group-container.c:1000 -#: ../widgets/table/e-table-group-leaf.c:645 -#: ../widgets/table/e-table-item.c:3071 -msgid "Minimum Width" -msgstr "Mindste bredde" +#~ msgid "Puerto Rico" +#~ msgstr "Puerto Rico" -#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104 -#: ../widgets/misc/e-expander.c:206 -msgid "Spacing" -msgstr "Mellemrum" +#~ msgid "Qatar" +#~ msgstr "Qatar" -#: ../widgets/misc/e-cell-date-edit.c:289 -msgid "Now" -msgstr "Nu" +#~ msgid "Reunion" +#~ msgstr "Réunion" -#: ../widgets/misc/e-cell-date-edit.c:846 -#, c-format -msgid "The time must be in the format: %s" -msgstr "Datoen skal skrives ind på formatet: %s" +#~ msgid "Romania" +#~ msgstr "Rumænien" -#: ../widgets/misc/e-cell-percent.c:77 -msgid "The percent value must be between 0 and 100, inclusive" -msgstr "Procentværdien skal være mellem 0 og 100, begge inklusive" +#~ msgid "Russian Federation" +#~ msgstr "Rusland" -#: ../widgets/misc/e-charset-picker.c:57 -msgid "Arabic" -msgstr "Arabisk" +#~ msgid "Rwanda" +#~ msgstr "Rwanda" -#: ../widgets/misc/e-charset-picker.c:58 -msgid "Baltic" -msgstr "Baltisk" +#~ msgid "Saint Kitts And Nevis" +#~ msgstr "Saint Kitts og Nevis" -#: ../widgets/misc/e-charset-picker.c:59 -msgid "Central European" -msgstr "Centraleuropæisk" +#~ msgid "Saint Lucia" +#~ msgstr "Saint Lucia" -#: ../widgets/misc/e-charset-picker.c:60 -msgid "Chinese" -msgstr "Kinesisk" +#~ msgid "Saint Vincent And The Grenadines" +#~ msgstr "Saint Vincent og Grenadinerne" -#: ../widgets/misc/e-charset-picker.c:61 -msgid "Cyrillic" -msgstr "Kyrillisk" +#~ msgid "Samoa" +#~ msgstr "Samoa" -#: ../widgets/misc/e-charset-picker.c:62 -msgid "Greek" -msgstr "Græsk" +#~ msgid "San Marino" +#~ msgstr "San Marino" -#: ../widgets/misc/e-charset-picker.c:63 -msgid "Hebrew" -msgstr "Hebraisk" +#~ msgid "Sao Tome And Principe" +#~ msgstr "Sao Tome og Principe" -#: ../widgets/misc/e-charset-picker.c:64 -msgid "Japanese" -msgstr "Japansk" +#~ msgid "Saudi Arabia" +#~ msgstr "Saudi Arabien" -#: ../widgets/misc/e-charset-picker.c:65 -msgid "Korean" -msgstr "Koreansk" +#~ msgid "Senegal" +#~ msgstr "Senegal" -#: ../widgets/misc/e-charset-picker.c:66 -msgid "Thai" -msgstr "Thai" +#~ msgid "Serbia And Montenegro" +#~ msgstr "Serbien og Montenegro" -#: ../widgets/misc/e-charset-picker.c:67 -msgid "Turkish" -msgstr "Tyrkisk" +#~ msgid "Seychelles" +#~ msgstr "Seyschellene" -#: ../widgets/misc/e-charset-picker.c:68 -msgid "Unicode" -msgstr "UCS" +#~ msgid "Sierra Leone" +#~ msgstr "Sierra Leone" -#: ../widgets/misc/e-charset-picker.c:69 -msgid "Western European" -msgstr "Vesteuropæisk" +#~ msgid "Singapore" +#~ msgstr "Singapore" -#: ../widgets/misc/e-charset-picker.c:70 -msgid "Western European, New" -msgstr "Vesteuropæisk, ny" +#~ msgid "Slovakia" +#~ msgstr "Slovakiet" -#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90 -#: ../widgets/misc/e-charset-picker.c:91 -msgid "Traditional" -msgstr "Traditionel" +#~ msgid "Slovenia" +#~ msgstr "Slovenien" -#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93 -#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95 -msgid "Simplified" -msgstr "Forenklet" +#~ msgid "Solomon Islands" +#~ msgstr "Solomonøerne" -#: ../widgets/misc/e-charset-picker.c:98 -msgid "Ukrainian" -msgstr "Ukrainsk" +#~ msgid "Somalia" +#~ msgstr "Somalia" -#: ../widgets/misc/e-charset-picker.c:101 -msgid "Visual" -msgstr "Visuel" +#~ msgid "South Africa" +#~ msgstr "Sydafrika" -#: ../widgets/misc/e-charset-picker.c:170 -#, c-format -msgid "Unknown character set: %s" -msgstr "Ukendt tegnsæt: %s" +#~ msgid "South Georgia And The South Sandwich Islands" +#~ msgstr "Syd Georgia og De Sydlige Sandwich-øer" -#: ../widgets/misc/e-charset-picker.c:215 -msgid "Character Encoding" -msgstr "Tegnkodning" +#~ msgid "Spain" +#~ msgstr "Spanien" -#: ../widgets/misc/e-charset-picker.c:230 -msgid "Enter the character set to use" -msgstr "Indtast tegnsæt som skal bruges" +#~ msgid "Sri Lanka" +#~ msgstr "Sri Lanka" -#: ../widgets/misc/e-charset-picker.c:337 -msgid "Other..." -msgstr "Andre..." +#~ msgid "St. Helena" +#~ msgstr "St. Helena" -#: ../widgets/misc/e-charset-picker.c:599 -msgid "Ch_aracter Encoding" -msgstr "Tegnk_odning" +#~ msgid "St. Pierre And Miquelon" +#~ msgstr "St. Pierre og Miquelon" -#: ../widgets/misc/e-dateedit.c:303 -msgid "Date and Time" -msgstr "Dato og tidspunkt" +#~ msgid "Sudan" +#~ msgstr "Sudan" -#: ../widgets/misc/e-dateedit.c:324 -msgid "Text entry to input date" -msgstr "Tekstindtastningsfelt til indtastning af dato" +#~ msgid "Suriname" +#~ msgstr "Surinam" -#: ../widgets/misc/e-dateedit.c:346 -msgid "Click this button to show a calendar" -msgstr "Klík på denne knap for at vise en kalender" +#~ msgid "Svalbard And Jan Mayen Islands" +#~ msgstr "Øerne Svalbard og Jan Mayen" -#: ../widgets/misc/e-dateedit.c:388 -msgid "Drop-down combination box to select time" -msgstr "Rullegardin-kombinationsfelt for valg af tid" +#~ msgid "Swaziland" +#~ msgstr "Swaziland" -#: ../widgets/misc/e-dateedit.c:464 -msgid "No_w" -msgstr "N_u" +#~ msgid "Sweden" +#~ msgstr "Sverige" -#: ../widgets/misc/e-dateedit.c:470 -msgid "_Today" -msgstr "I _dag" +#~ msgid "Switzerland" +#~ msgstr "Schweiz" -#: ../widgets/misc/e-dateedit.c:1635 -msgid "Invalid Date Value" -msgstr "Ugyldig datoværdi" +#~ msgid "Syria" +#~ msgstr "Syrien" -#: ../widgets/misc/e-dateedit.c:1664 -msgid "Invalid Time Value" -msgstr "Ugyldig tidsværdi" +#~ msgid "Taiwan" +#~ msgstr "Taiwan" -#: ../widgets/misc/e-expander.c:182 -msgid "Expanded" -msgstr "Udvidet" +#~ msgid "Tajikistan" +#~ msgstr "Tadsjikistan" -#: ../widgets/misc/e-expander.c:183 -msgid "Whether or not the expander is expanded" -msgstr "Om udfolderen er udvidet eller ej" +#~ msgid "Tanzania, United Republic Of" +#~ msgstr "Tanzania" -#: ../widgets/misc/e-expander.c:191 -msgid "Text of the expander's label" -msgstr "Tekst til mærkning af udfolder" +#~ msgid "Thailand" +#~ msgstr "Thailand" -#: ../widgets/misc/e-expander.c:198 -msgid "Use underline" -msgstr "Benyt understregning" +#~ msgid "Timor-Leste" +#~ msgstr "Timor-Leste" -#: ../widgets/misc/e-expander.c:199 -msgid "" -"If set, an underline in the text indicates the next character should be used " -"for the mnemonic accelerator key" -msgstr "" -"Hvis sat indikerer en understregning i teksten at det næste tegn skal bruges " -"som genvejstast" +#~ msgid "Togo" +#~ msgstr "Togo" -#: ../widgets/misc/e-expander.c:207 -msgid "Space to put between the label and the child" -msgstr "Mellemrum mellem etiketten og barnet" +#~ msgid "Tokelau" +#~ msgstr "Tokelau" -#: ../widgets/misc/e-expander.c:216 -msgid "Label widget" -msgstr "Grafisk komponent til mærkning" +#~ msgid "Tonga" +#~ msgstr "Tonga" -#: ../widgets/misc/e-expander.c:217 -msgid "A widget to display in place of the usual expander label" -msgstr "" -"En grafisk komponent som vises i stedet for den sædvanlige mærkningsliste" +#~ msgid "Trinidad And Tobago" +#~ msgstr "Trinidad og Tobago" -# se næste for forklaring -#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390 -msgid "Expander Size" -msgstr "Pilstørrelse" +#~ msgid "Tunisia" +#~ msgstr "Tunesien" -#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391 -msgid "Size of the expander arrow" -msgstr "Størrelsen af udvidelsespilen" +#~ msgid "Turkey" +#~ msgstr "Tyrkiet" -#: ../widgets/misc/e-expander.c:232 -msgid "Indicator Spacing" -msgstr "Indikatormellemrum" +#~ msgid "Turkmenistan" +#~ msgstr "Turkmenistan" -#: ../widgets/misc/e-expander.c:233 -msgid "Spacing around expander arrow" -msgstr "Mellemrum omkring udviderpil" +#~ msgid "Turks And Caicos Islands" +#~ msgstr "Turks og Caicos-øerne" -#. FIXME: get the toplevel window... -#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180 -#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750 -msgid "Advanced Search" -msgstr "Avanceret søgning" +#~ msgid "Tuvalu" +#~ msgstr "Tuvalu" -#. FIXME: get the toplevel window... -#: ../widgets/misc/e-filter-bar.c:231 -msgid "Save Search" -msgstr "Gem søgning" +#~ msgid "Uganda" +#~ msgstr "Uganda" -#: ../widgets/misc/e-filter-bar.c:268 -msgid "_Searches" -msgstr "_Søgninger" +#~ msgid "Ukraine" +#~ msgstr "Ukraine" -#: ../widgets/misc/e-filter-bar.c:270 -msgid "Searches" -msgstr "Søgninger" +#~ msgid "United Arab Emirates" +#~ msgstr "De forenede arabiske emirater" -#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115 -msgid "_Save Search..." -msgstr "_Gem søgning..." +#~ msgid "United Kingdom" +#~ msgstr "Storbritannien" -#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116 -msgid "_Edit Saved Searches..." -msgstr "_Redigér gemte søgninger..." +#~ msgid "United States Minor Outlying Islands" +#~ msgstr "USA, mindre omliggende øer" -#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117 -msgid "_Advanced Search..." -msgstr "_Avanceret søgning..." +#~ msgid "Uruguay" +#~ msgstr "Uruguay" -#: ../widgets/misc/e-filter-bar.h:107 -msgid "All Accounts" -msgstr "Alle konti" +#~ msgid "Uzbekistan" +#~ msgstr "Usbekistan" -#: ../widgets/misc/e-filter-bar.h:108 -msgid "Current Account" -msgstr "Aktuel konto" +#~ msgid "Vanuatu" +#~ msgstr "Vanuatu" -#: ../widgets/misc/e-filter-bar.h:109 -msgid "Current Folder" -msgstr "Aktuel mappe" +#~ msgid "Venezuela" +#~ msgstr "Venezuela" -#: ../widgets/misc/e-filter-bar.h:110 -msgid "Current Message" -msgstr "Aktuelle brev" +#~ msgid "Viet Nam" +#~ msgstr "Vietnam" -#: ../widgets/misc/e-image-chooser.c:169 -msgid "Choose Image" -msgstr "Vælg billede" +#~ msgid "Virgin Islands, British" +#~ msgstr "Britiske Jomfruøer" -#: ../widgets/misc/e-map.c:627 -msgid "World Map" -msgstr "Verdenskort" +#~ msgid "Virgin Islands, U.S." +#~ msgstr "Amerikanske Jomfruøer" -#: ../widgets/misc/e-map.c:629 -msgid "" -"Mouse-based interactive map widget for selecting timezone. Keyboard users " -"should instead select the timezone from the drop-down combination box below." -msgstr "" -"Musebaseret interaktiv kort-kontrol til at vælge tidszone. Tastatur-brugere " -"bør i stedet vælge tidszonen fra rullegardin-kombinationsfeltet nedenfor." +#~ msgid "Wallis And Futuna Islands" +#~ msgstr "Wallis- og Futuna-øerne" -#: ../widgets/misc/e-online-button.c:106 -msgid "Online" -msgstr "Opkoblet" +#~ msgid "Western Sahara" +#~ msgstr "Vestlige Sahara" -#: ../widgets/misc/e-online-button.c:107 -msgid "The button state is online" -msgstr "Knappens tilstand er opkoblet" +#~ msgid "Yemen" +#~ msgstr "Yemen" -#: ../widgets/misc/e-pilot-settings.c:102 -msgid "Sync with:" -msgstr "Synkronisér med:" +#~ msgid "Zambia" +#~ msgstr "Zambia" -#: ../widgets/misc/e-pilot-settings.c:110 -msgid "Sync Private Records:" -msgstr "Synkroniser private poster:" +#~ msgid "Zimbabwe" +#~ msgstr "Zimbabwe" -#: ../widgets/misc/e-pilot-settings.c:119 -msgid "Sync Categories:" -msgstr "Synkroniser kategorier:" +#~ msgid "AOL Instant Messenger" +#~ msgstr "AOL-kvikbesked" -#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440 -msgid "Empty message" -msgstr "Tomt brev" +#~ msgid "Yahoo Messenger" +#~ msgstr "Yahoo Messenger" -#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447 -msgid "Reflow model" -msgstr "Genstrømsmodel" +#~ msgid "Gadu-Gadu Messenger" +#~ msgstr "Gadu-Gadu Messenger" -#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454 -msgid "Column width" -msgstr "Kolonnebredde" +#~ msgid "Service" +#~ msgstr "Tjeneste" -#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470 -#: ../widgets/misc/e-search-bar.c:472 -msgid "Search" -msgstr "Søg" +#~ msgid "Username" +#~ msgstr "Brugernavn" -#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470 -#: ../widgets/misc/e-search-bar.c:472 -msgid "Click here to change the search type" -msgstr "Klik her for at ændre søgningstypen" +#~ msgid "Address _2:" +#~ msgstr "Adresse _2:" -#: ../widgets/misc/e-search-bar.c:603 -msgid "_Search" -msgstr "_Søg" +#~ msgid "Ci_ty:" +#~ msgstr "_By:" -#: ../widgets/misc/e-search-bar.c:609 -msgid "_Find Now" -msgstr "_Søg nu" +#~ msgid "Countr_y:" +#~ msgstr "Lan_d:" -#: ../widgets/misc/e-search-bar.c:610 -msgid "_Clear" -msgstr "_Tøm" +#~ msgid "Full Address" +#~ msgstr "Fulde adresse" -#: ../widgets/misc/e-search-bar.c:865 -msgid "Item ID" -msgstr "Objekt-id" +#~ msgid "_ZIP Code:" +#~ msgstr "_ZIP/Postnummer:" -#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566 -#: ../widgets/text/e-text.c:3567 -msgid "Text" -msgstr "Tekst" +#~ msgid "Dr." +#~ msgstr "Dr." -#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose -#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on... -#: ../widgets/misc/e-search-bar.c:1003 -msgid "Sho_w: " -msgstr "V_is: " +#~ msgid "Esq." +#~ msgstr "Herr" -#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters -#. the term to search for -#: ../widgets/misc/e-search-bar.c:1020 -msgid "Sear_ch: " -msgstr "Sø_g: " +#~ msgid "I" +#~ msgstr "I" -#. To Translators: The " in " label is part of the Quick Search Bar, example: -#. Search: | | in | Current Folder/All Accounts/Current Account -#: ../widgets/misc/e-search-bar.c:1032 -msgid " i_n " -msgstr " _i " +#~ msgid "II" +#~ msgstr "II" -#: ../widgets/misc/e-selection-model-array.c:594 -#: ../widgets/table/e-tree-selection-model.c:806 -msgid "Cursor Row" -msgstr "Markørrække" +#~ msgid "III" +#~ msgstr "III" -#: ../widgets/misc/e-selection-model-array.c:601 -#: ../widgets/table/e-tree-selection-model.c:813 -msgid "Cursor Column" -msgstr "Markørkolonne" +#~ msgid "Jr." +#~ msgstr "Jr." -#: ../widgets/misc/e-selection-model.c:209 -msgid "Sorter" -msgstr "Sortér" +#~ msgid "Miss" +#~ msgstr "Frk." -#: ../widgets/misc/e-selection-model.c:216 -msgid "Selection Mode" -msgstr "Markeringstilstand" +#~ msgid "Mr." +#~ msgstr "Hr." -#: ../widgets/misc/e-selection-model.c:224 -msgid "Cursor Mode" -msgstr "Markørtilstand" +#~ msgid "Mrs." +#~ msgstr "Fru" -#: ../widgets/misc/e-send-options.c:522 -msgid "When de_leted:" -msgstr "Ved s_letning:" +#~ msgid "Ms." +#~ msgstr "Frk." -#: ../widgets/misc/e-send-options.glade.h:1 -msgid "Delivery Options" -msgstr "Valgmuligheder for levering" +#~ msgid "Sr." +#~ msgstr "Sr." -#: ../widgets/misc/e-send-options.glade.h:2 -msgid "Replies" -msgstr "Svar" +#~ msgid "Add IM Account" +#~ msgstr "Tilføj kvikbesked-konto" -#: ../widgets/misc/e-send-options.glade.h:3 -msgid "Return Notification" -msgstr "Returnér påmindelse" +#~ msgid "_Account name:" +#~ msgstr "_Kontonavn:" -#: ../widgets/misc/e-send-options.glade.h:4 -msgid "Status Tracking" -msgstr "Statussporing" +#~ msgid "_IM Service:" +#~ msgstr "_Kvikbesked-tjeneste:" -#: ../widgets/misc/e-send-options.glade.h:5 -msgid "A_uto-delete sent item" -msgstr "Slet a_utomatisk sendte poster" +#~ msgid "10 pt. Tahoma" +#~ msgstr "10 pt. Tahoma" -#: ../widgets/misc/e-send-options.glade.h:7 -msgid "Creat_e a sent item to track information" -msgstr "Opret _et sendt-element for at spore information" +#~ msgid "8 pt. Tahoma" +#~ msgstr "8 pt. Tahoma" -#: ../widgets/misc/e-send-options.glade.h:8 -msgid "Deli_vered and opened" -msgstr "Le_veret og åbnet" +#~ msgid "Blank forms at end:" +#~ msgstr "Blanke skemaer ved slutningen:" -#: ../widgets/misc/e-send-options.glade.h:9 -msgid "Gene_ral Options" -msgstr "Gene_relle valgmuligheder" +#~ msgid "Body" +#~ msgstr "Indhold" -#: ../widgets/misc/e-send-options.glade.h:10 -msgid "" -"None\n" -"Mail Receipt" -msgstr "" -"Ingen\n" -"Kvittering for brev" +#~ msgid "Bottom:" +#~ msgstr "Nederst:" -#: ../widgets/misc/e-send-options.glade.h:12 -msgid "" -"Normal\n" -"Proprietary\n" -"Confidential\n" -"Secret\n" -"Top Secret\n" -"For Your Eyes Only" -msgstr "" -"Normal\n" -"Navnebeskyttet\n" -"Fortroligt\n" -"Hemmeligt\n" -"Top-hemmeligt\n" -"Ekstra fortroligt" +#~ msgid "Dimensions:" +#~ msgstr "Dimensioner:" -#: ../widgets/misc/e-send-options.glade.h:18 -msgid "R_eply requested" -msgstr "_Svar forespurgt" +#~ msgid "F_ont..." +#~ msgstr "Skr_ifttype..." -#: ../widgets/misc/e-send-options.glade.h:20 -msgid "Sta_tus Tracking" -msgstr "Sta_tus-sporing" +#~ msgid "Fonts" +#~ msgstr "Skrifttyper" -#: ../widgets/misc/e-send-options.glade.h:21 -msgid "" -"Undefined\n" -"High\n" -"Standard\n" -"Low" -msgstr "" -"Udefineret\n" -"Høj\n" -"Standard\n" -"Lav" +#~ msgid "Footer:" +#~ msgstr "Bundtekst:" -#: ../widgets/misc/e-send-options.glade.h:25 -msgid "When acce_pted:" -msgstr "Ved _godkendelse:" +#~ msgid "Format" +#~ msgstr "Format" -#: ../widgets/misc/e-send-options.glade.h:26 -msgid "When co_mpleted:" -msgstr "Ved _fuldførelse:" +#~ msgid "Header/Footer" +#~ msgstr "Top-/bundtekst" -#: ../widgets/misc/e-send-options.glade.h:27 -msgid "When decli_ned:" -msgstr "Ved afvis_ning:" +#~ msgid "Headings" +#~ msgstr "Toptekster" -#: ../widgets/misc/e-send-options.glade.h:28 -msgid "Wi_thin" -msgstr "_Inden for" +#~ msgid "Headings for each letter" +#~ msgstr "Toptekst for hvert bogstav" -#: ../widgets/misc/e-send-options.glade.h:29 -msgid "_After:" -msgstr "_Efter:" +#~ msgid "Height:" +#~ msgstr "Højde:" -#: ../widgets/misc/e-send-options.glade.h:30 -msgid "_All information" -msgstr "_Al information" +#~ msgid "Immediately follow each other" +#~ msgstr "Lige efter hinanden" -#. To translators: This means Delay the message delivery for some time -#: ../widgets/misc/e-send-options.glade.h:32 -msgid "_Delay message delivery" -msgstr "_Forsink levering af brev" +#~ msgid "Include:" +#~ msgstr "Inkludér:" -#: ../widgets/misc/e-send-options.glade.h:33 -msgid "_Delivered" -msgstr "_Leveret" +#~ msgid "Landscape" +#~ msgstr "Liggende" -#: ../widgets/misc/e-send-options.glade.h:35 -msgid "_Set expiration date" -msgstr "_Sæt udløbsdato" +#~ msgid "Left:" +#~ msgstr "Venstre:" -#: ../widgets/misc/e-send-options.glade.h:36 -msgid "_Until:" -msgstr "_Indtil:" +#~ msgid "Letter tabs on side" +#~ msgstr "Bogstavfaneblade på siden" -#: ../widgets/misc/e-send-options.glade.h:37 -msgid "_When convenient" -msgstr "_Når det er belejligt" +#~ msgid "Margins" +#~ msgstr "Margener" -#: ../widgets/misc/e-send-options.glade.h:38 -msgid "_When opened:" -msgstr "_Ved åbning:" +#~ msgid "Number of columns:" +#~ msgstr "Antal kolonner:" -#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects") -#: ../widgets/misc/e-task-widget.c:252 -#, c-format -msgid "%s (...)" -msgstr "%s (...)" +#~ msgid "Options" +#~ msgstr "Indstillinger" -#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects"); -#. %d is a number between 0 and 100, describing the percentage of operation complete -#: ../widgets/misc/e-task-widget.c:258 -#, c-format -msgid "%s (%d%% complete)" -msgstr "%s (%d%% fuldført)" +#~ msgid "Orientation" +#~ msgstr "Orientering" -#: ../widgets/misc/e-url-entry.c:105 -msgid "Click here to go to URL" -msgstr "Klik her for at gå til adresse" +#~ msgid "Page" +#~ msgstr "Side" -#: ../widgets/misc/gal-categories.glade.h:1 -msgid "Edit Master Category List..." -msgstr "Redigér hovedkategorilisten..." +#~ msgid "Page Setup:" +#~ msgstr "Sideopsætning:" -#: ../widgets/misc/gal-categories.glade.h:2 -msgid "Item(s) belong to these _categories:" -msgstr "Elementerne tilhører disse _kategorier:" +#~ msgid "Paper" +#~ msgstr "Papir" -#: ../widgets/misc/gal-categories.glade.h:3 -msgid "_Available Categories:" -msgstr "_Tilgængelige kategorier:" +#~ msgid "Paper source:" +#~ msgstr "Papirkilde:" -#: ../widgets/misc/gal-categories.glade.h:4 -msgid "categories" -msgstr "kategorier" +#~ msgid "Portrait" +#~ msgstr "Stående" -#: ../widgets/table/e-cell-combo.c:170 -msgid "popup list" -msgstr "pop op-liste" +#~ msgid "Preview:" +#~ msgstr "Forhåndsvisning:" -#: ../widgets/table/e-cell-date.c:62 -msgid "%l:%M %p" -msgstr "%H:%M" +#~ msgid "Print using gray shading" +#~ msgstr "Udskriv med gråtoner" -#: ../widgets/table/e-cell-pixbuf.c:360 -msgid "Selected Column" -msgstr "Markeret kolonne" +#~ msgid "Reverse on even pages" +#~ msgstr "Modsat på lige sider" -#: ../widgets/table/e-cell-pixbuf.c:367 -msgid "Focused Column" -msgstr "Kolonne med fokus" +#~ msgid "Right:" +#~ msgstr "Højre:" -#: ../widgets/table/e-cell-pixbuf.c:374 -msgid "Unselected Column" -msgstr "Umarkeret kolonne" +#~ msgid "Sections:" +#~ msgstr "Sektioner:" -#: ../widgets/table/e-cell-text.c:1794 -msgid "Strikeout Column" -msgstr "Udstreget kolonne" +#~ msgid "Start on a new page" +#~ msgstr "Start på en ny side" -#: ../widgets/table/e-cell-text.c:1801 -msgid "Underline Column" -msgstr "Understreget kolonne" +#~ msgid "Style name:" +#~ msgstr "Stilnavn:" -#: ../widgets/table/e-cell-text.c:1808 -msgid "Bold Column" -msgstr "Fed kolonne" +#~ msgid "Top:" +#~ msgstr "Top:" -#: ../widgets/table/e-cell-text.c:1815 -msgid "Color Column" -msgstr "Farvet kolonne" +#~ msgid "Width:" +#~ msgstr "Bredde:" -#: ../widgets/table/e-cell-text.c:1829 -msgid "BG Color Column" -msgstr "Kolonnebaggrundsfarve" +#~ msgid "_Font..." +#~ msgstr "Skri_fttype..." -#: ../widgets/table/e-table-config.c:152 -msgid "State" -msgstr "Tilstand" +#~ msgid "Whether to use daylight savings time while displaying events." +#~ msgstr "Vælg om sommertid bruges når begivenhed vises." -#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427 -msgid "(Ascending)" -msgstr "(Stigende)" +#~ msgid "daylight savings time" +#~ msgstr "sommertid" -#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427 -msgid "(Descending)" -msgstr "(Faldende)" +#~ msgid "after" +#~ msgstr "efter" -#: ../widgets/table/e-table-config.c:392 -msgid "Not sorted" -msgstr "Ikke sorteret" +#~ msgid "day(s)" +#~ msgstr "dag(er)" -#: ../widgets/table/e-table-config.c:433 -msgid "No grouping" -msgstr "Ingen gruppering" +#~ msgid "end of appointment" +#~ msgstr "slutning på aftale" -#: ../widgets/table/e-table-config.c:643 -#: ../widgets/table/e-table-config.glade.h:11 -msgid "Show Fields" -msgstr "Vis felter" +#~ msgid "hour(s)" +#~ msgstr "time(r)" -#: ../widgets/table/e-table-config.c:664 -msgid "Available Fields" -msgstr "Tilgængelige felter" +#~ msgid "minute(s)" +#~ msgstr "minutt(er)" -#: ../widgets/table/e-table-config.glade.h:1 -msgid "A_vailable Fields:" -msgstr "_Tilgængelige felter:" +#~ msgid "Adjust for daylight sa_ving time" +#~ msgstr "Tilpas til _sommertid" -#: ../widgets/table/e-table-config.glade.h:2 -#: ../widgets/table/e-table-header-item.c:1582 -msgid "Ascending" -msgstr "Stigende" +#~ msgid "Attached message - %s" +#~ msgstr "Vedlagt brev - %s" -#: ../widgets/table/e-table-config.glade.h:3 -msgid "Clear All" -msgstr "Tøm alt" +#~ msgid "%d Attachment" +#~ msgid_plural "%d Attachments" +#~ msgstr[0] "%d Bilag" +#~ msgstr[1] "%d Bilag" -#: ../widgets/table/e-table-config.glade.h:4 -msgid "Clear _All" -msgstr "Tøm _alt" +#~ msgid "Hide Attachment _Bar" +#~ msgstr "_Skjul bilagslinje" -#: ../widgets/table/e-table-config.glade.h:5 -#: ../widgets/table/e-table-header-item.c:1582 -msgid "Descending" -msgstr "Faldende" +#~ msgid "Show Attachment _Bar" +#~ msgstr "_Vis bilagslinje" -#: ../widgets/table/e-table-config.glade.h:8 -msgid "Group Items By" -msgstr "Gruppér punkter efter" +#~ msgid "Show Attachments" +#~ msgstr "Vis bilag" -#: ../widgets/table/e-table-config.glade.h:9 -msgid "Move _Down" -msgstr "Flyt ne_d" +#~ msgid "Press space key to toggle attachment bar" +#~ msgstr "Tast mellemrum for at vise/skjule bilagslinjen" -#: ../widgets/table/e-table-config.glade.h:10 -msgid "Move _Up" -msgstr "Flyt _op" +#~ msgid "1 day before appointment" +#~ msgstr "1 dag før aftalen" -#: ../widgets/table/e-table-config.glade.h:12 -msgid "Show _field in View" -msgstr "Vis _felt i oversigt" +#~ msgid "1 hour before appointment" +#~ msgstr "1 time før aftalen" -#: ../widgets/table/e-table-config.glade.h:13 -msgid "Show field i_n View" -msgstr "Vis felt _i oversigt" +#~ msgid "15 minutes before appointment" +#~ msgstr "15 minutter før aftalen" -#: ../widgets/table/e-table-config.glade.h:14 -msgid "Show field in _View" -msgstr "Vis felt i _oversigt" +#~ msgid "for" +#~ msgstr "for" -#: ../widgets/table/e-table-config.glade.h:15 -msgid "Sort" -msgstr "Sortér" +#~ msgid "Att_endees" +#~ msgstr "Del_tagere" -#: ../widgets/table/e-table-config.glade.h:16 -msgid "Sort Items By" -msgstr "Sortér punkter efter" +#~ msgid "C_hange Organizer" +#~ msgstr "_Skift organisator" -#: ../widgets/table/e-table-config.glade.h:17 -msgid "Then By" -msgstr "Så efter" +#~ msgid "Co_ntacts..." +#~ msgstr "_Kontaktpersoner..." -#: ../widgets/table/e-table-config.glade.h:19 -msgid "_Fields Shown..." -msgstr "Viste _felter..." +#~ msgid "forever" +#~ msgstr "for altid" -#: ../widgets/table/e-table-config.glade.h:20 -msgid "_Group By..." -msgstr "_Gruppér efter..." +#~ msgid "month(s)" +#~ msgstr "måned(er)" -#: ../widgets/table/e-table-config.glade.h:22 -msgid "_Show field in View" -msgstr "_Vis felt i oversigt" +#~ msgid "week(s)" +#~ msgstr "uge(r)" -#: ../widgets/table/e-table-config.glade.h:23 -msgid "_Show these fields in order:" -msgstr "_Vis disse felter i rækkefølge:" +#~ msgid "year(s)" +#~ msgstr "år" -#: ../widgets/table/e-table-config.glade.h:24 -msgid "_Sort..." -msgstr "_Sortér..." +#~ msgid "_Save Selected" +#~ msgstr "Gem _valgte" -#: ../widgets/table/e-table-field-chooser-dialog.c:67 -#: ../widgets/table/e-table-field-chooser-item.c:633 -#: ../widgets/table/e-table-field-chooser.c:66 -#: ../widgets/table/e-table-header-item.c:1886 -msgid "DnD code" -msgstr "Træk og slip-kode" - -#: ../widgets/table/e-table-field-chooser-dialog.c:74 -#: ../widgets/table/e-table-field-chooser-item.c:640 -#: ../widgets/table/e-table-field-chooser.c:73 -#: ../widgets/table/e-table-header-item.c:1900 -msgid "Full Header" -msgstr "Komplet brevhoved" - -#: ../widgets/table/e-table-field-chooser-dialog.c:116 -msgid "Add a column..." -msgstr "Tilføj en kolonne..." +#~ msgid "April" +#~ msgstr "April" -#: ../widgets/table/e-table-field-chooser.glade.h:1 -msgid "Field Chooser" -msgstr "Feltvælger" +#~ msgid "August" +#~ msgstr "August" -#: ../widgets/table/e-table-field-chooser.glade.h:2 -msgid "" -"To add a column to your table, drag it into\n" -"the location in which you want it to appear." -msgstr "" -"For at tilføje en kolonne i din tabel, træk\n" -"den hen til stedet hvor du vil have den." +#~ msgid "December" +#~ msgstr "December" -#: ../widgets/table/e-table-group-container.c:344 -#, c-format -msgid "%s : %s (%d item)" -msgid_plural "%s : %s (%d items)" -msgstr[0] "%s : %s (%d punkt)" -msgstr[1] "%s : %s (%d punkter)" +#~ msgid "February" +#~ msgstr "Februar" -#: ../widgets/table/e-table-group-container.c:350 -#, c-format -msgid "%s (%d item)" -msgid_plural "%s (%d items)" -msgstr[0] "%s (%d punkt)" -msgstr[1] "%s (%d punkter)" +#~ msgid "January" +#~ msgstr "Januar" -#: ../widgets/table/e-table-group-container.c:922 -#: ../widgets/table/e-table-group-container.c:923 -#: ../widgets/table/e-table-group-leaf.c:581 -#: ../widgets/table/e-table-group-leaf.c:582 -#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029 -msgid "Alternating Row Colors" -msgstr "Skiftende rækkefarver" +#~ msgid "July" +#~ msgstr "Juli" -#: ../widgets/table/e-table-group-container.c:929 -#: ../widgets/table/e-table-group-container.c:930 -#: ../widgets/table/e-table-group-leaf.c:588 -#: ../widgets/table/e-table-group-leaf.c:589 -#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036 -#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344 -msgid "Horizontal Draw Grid" -msgstr "Vandret tegnegitter" +#~ msgid "June" +#~ msgstr "Juni" -#: ../widgets/table/e-table-group-container.c:936 -#: ../widgets/table/e-table-group-container.c:937 -#: ../widgets/table/e-table-group-leaf.c:595 -#: ../widgets/table/e-table-group-leaf.c:596 -#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043 -#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350 -msgid "Vertical Draw Grid" -msgstr "Lodret tegnegitter" +#~ msgid "March" +#~ msgstr "Marts" -#: ../widgets/table/e-table-group-container.c:943 -#: ../widgets/table/e-table-group-container.c:944 -#: ../widgets/table/e-table-group-leaf.c:602 -#: ../widgets/table/e-table-group-leaf.c:603 -#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050 -#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356 -msgid "Draw focus" -msgstr "Tegn fokus" +#~ msgid "May" +#~ msgstr "Maj" -#: ../widgets/table/e-table-group-container.c:950 -#: ../widgets/table/e-table-group-container.c:951 -#: ../widgets/table/e-table-group-leaf.c:609 -#: ../widgets/table/e-table-group-leaf.c:610 -#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057 -msgid "Cursor mode" -msgstr "Markørtilstand" +#~ msgid "November" +#~ msgstr "November" -#: ../widgets/table/e-table-group-container.c:957 -#: ../widgets/table/e-table-group-container.c:958 -#: ../widgets/table/e-table-group-leaf.c:623 -#: ../widgets/table/e-table-group-leaf.c:624 -#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022 -msgid "Selection model" -msgstr "Markeringsmodel" +#~ msgid "October" +#~ msgstr "Oktober" -#: ../widgets/table/e-table-group-container.c:964 -#: ../widgets/table/e-table-group-container.c:965 -#: ../widgets/table/e-table-group-leaf.c:616 -#: ../widgets/table/e-table-group-leaf.c:617 -#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064 -#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337 -#: ../widgets/table/e-tree.c:3338 -msgid "Length Threshold" -msgstr "Længdetærskel" +#~ msgid "September" +#~ msgstr "September" -#: ../widgets/table/e-table-group-container.c:971 -#: ../widgets/table/e-table-group-container.c:972 -#: ../widgets/table/e-table-group-leaf.c:658 -#: ../widgets/table/e-table-group-leaf.c:659 -#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098 -#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369 -#: ../widgets/table/e-tree.c:3370 -msgid "Uniform row height" -msgstr "Ens rækkehøjde" +#~ msgid "ago" +#~ msgstr "siden" -#: ../widgets/table/e-table-group-container.c:978 -#: ../widgets/table/e-table-group-container.c:979 -#: ../widgets/table/e-table-group-leaf.c:651 -#: ../widgets/table/e-table-group-leaf.c:652 -msgid "Frozen" -msgstr "Frosset" +#~ msgid "months" +#~ msgstr "måneder" -#: ../widgets/table/e-table-header-item.c:1452 -msgid "Customize Current View" -msgstr "Tilpas aktuel oversigt" +#~ msgid "the current time" +#~ msgstr "tiden nu" -#: ../widgets/table/e-table-header-item.c:1472 -msgid "Sort _Ascending" -msgstr "Sortér _stigende" +#~ msgid "the time you specify" +#~ msgstr "den tid du angiver" -#: ../widgets/table/e-table-header-item.c:1473 -msgid "Sort _Descending" -msgstr "Sortér _faldende" +#~ msgid "years" +#~ msgstr "år" -#: ../widgets/table/e-table-header-item.c:1474 -msgid "_Unsort" -msgstr "_Rod rundt" +#~ msgid "Save attachment as" +#~ msgstr "Gem bilag som" -#: ../widgets/table/e-table-header-item.c:1476 -msgid "Group By This _Field" -msgstr "Gruppér efter dette _felt" +#~ msgid "Select folder to save all attachments" +#~ msgstr "Vælg mappe til at gemme alle bilag i" -#: ../widgets/table/e-table-header-item.c:1477 -msgid "Group By _Box" -msgstr "Gruppér efter _boks" +#~ msgid "_Save Selected..." +#~ msgstr "_Gem markerede..." -#: ../widgets/table/e-table-header-item.c:1479 -msgid "Remove This _Column" -msgstr "Fjern denne _kolonne" +#~ msgid "%d at_tachment" +#~ msgid_plural "%d at_tachments" +#~ msgstr[0] "%d _bilag" +#~ msgstr[1] "%d _bilag" -#: ../widgets/table/e-table-header-item.c:1480 -msgid "Add a C_olumn..." -msgstr "Tilføj k_olonne..." +#~ msgid "S_ave" +#~ msgstr "_Gem" -#: ../widgets/table/e-table-header-item.c:1482 -msgid "A_lignment" -msgstr "J_ustering" +#~ msgid "No Attachment" +#~ msgstr "Intet bilag" -#: ../widgets/table/e-table-header-item.c:1483 -msgid "B_est Fit" -msgstr "Som passer b_edst" +#~ msgid "" +#~ "Enable side bar search feature so that you can start interactive " +#~ "searching by typing in the text. Use is that you can easily find a folder " +#~ "in that side bar by just typing the folder name and the selection jumps " +#~ "automatically to that folder." +#~ msgstr "" +#~ "Aktivér sidepanelet, så du kan starte en interaktiv søgning ved at " +#~ "indtaste søgeteksten. Man kan f.eks. let finde en mappe ved simpelthen at " +#~ "indtaste dens navn og derefter hoppe til denne mappe." -#: ../widgets/table/e-table-header-item.c:1484 -msgid "Format Column_s..." -msgstr "Formatér kolonne_r..." +#~ msgid "Do not quote" +#~ msgstr "Citér ikke" -#: ../widgets/table/e-table-header-item.c:1486 -msgid "Custo_mize Current View..." -msgstr "Til_pas aktuel oversigt..." +#~ msgid "Inline" +#~ msgstr "Integreret" -#: ../widgets/table/e-table-header-item.c:1542 -msgid "_Sort By" -msgstr "_Sortér efter" +#~ msgid "Inline (Outlook style)" +#~ msgstr "Integreret (som i Outlook)" -#. Custom -#: ../widgets/table/e-table-header-item.c:1560 -msgid "_Custom" -msgstr "_Tilpasset" +#~ msgid "Quoted" +#~ msgstr "Citeret" -#: ../widgets/table/e-table-header-item.c:1893 -msgid "Font Description" -msgstr "Skrifttypebeskrivelse" +#~ msgid "S_OCKS Host:" +#~ msgstr "S_OCKS-vært:" -#: ../widgets/table/e-table-header-item.c:1914 -#: ../widgets/table/e-table-sorter.c:172 -msgid "Sort Info" -msgstr "Sortér info" +#~ msgid "Select Drafts Folder" +#~ msgstr "Vælg udkastmappe" -#: ../widgets/table/e-table-header-item.c:1928 -#: ../widgets/table/e-tree-scrolled.c:225 -#: ../widgets/table/e-tree-scrolled.c:226 -msgid "Tree" -msgstr "Træ" +#~ msgid "Select Sent Folder" +#~ msgstr "Vælg \"Afsendte\"-mappen" -#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008 -msgid "Table header" -msgstr "Tabelhoved" +#~ msgid "_Automatic proxy configuration URL:" +#~ msgstr "URL for _automatisk proxykonfiguration:" -#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015 -msgid "Table model" -msgstr "Tabelmodel" +#~ msgid "None Selected" +#~ msgstr "Ingen valgt" -#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091 -msgid "Cursor row" -msgstr "Markørrække" +#~ msgid "S_pecify the mailbox name" +#~ msgstr "A_ngiv navnet for brevbakke" -#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376 -#: ../widgets/table/e-tree.c:3377 -msgid "Always search" -msgstr "Søg altid" +#~ msgid "Compose messages using an external editor" +#~ msgstr "Skrive breve ved hjælp af et eksternt tekstredigeringsprogram" -#: ../widgets/table/e-table.c:3347 -msgid "Use click to add" -msgstr "Tilføj ved at klikke" +#~ msgid "_Import to Calendar" +#~ msgstr "_Importér til kalender" -#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363 -msgid "ETree table adapter" -msgstr "ETree-tabel-adapter" +#~ msgid "Import ICS" +#~ msgstr "Importér ICS" -#: ../widgets/table/e-tree.c:3383 -msgid "Retro Look" -msgstr "Retro-udseende" +#~ msgid "Imports ICS attachments to calendar." +#~ msgstr "Importerer ICS-bilag til kalender." -#: ../widgets/table/e-tree.c:3384 -msgid "Draw lines and +/- expanders." -msgstr "Tegn linjer og \"+/-\"-udviderere." +#~ msgid "_Tasks :" +#~ msgstr "_Opgaver :" -#: ../widgets/text/e-text.c:2736 -msgid "Input Methods" -msgstr "Indtastningsmetoder" +#~ msgid "Memos :" +#~ msgstr "Huskesedler :" -#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560 -msgid "Event Processor" -msgstr "Begivenhedsbehandler" +#~ msgid "" +#~ "A plugin which allows the creation of meetings from the contents of a " +#~ "mail message." +#~ msgstr "" +#~ "Et udvidelsesmodul der tillader oprettelse af møder ud fra indholdet af " +#~ "et brev." -#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574 -msgid "Bold" -msgstr "Fed" +#~ msgid "Mail to meeting" +#~ msgstr "Brev til møde" -#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581 -msgid "Strikeout" -msgstr "Gennemstreget" +#~ msgid "A plugin for saving all attachments or parts of a message at once." +#~ msgstr "Et udvidelsesmodul der gemmer alle bilag eller brevdele på en gang." -#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588 -msgid "Anchor" -msgstr "Anker" +#~ msgid "Save Attachments..." +#~ msgstr "Gem bilag..." -#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596 -msgid "Justification" -msgstr "Justering" +#~ msgid "Save all attachments" +#~ msgstr "Gem alle bilag" -#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603 -msgid "Clip Width" -msgstr "Klipbredde" +#~ msgid "Select save base name" +#~ msgstr "Vælg basisnavn for gemning" -#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610 -msgid "Clip Height" -msgstr "Kliphøjde" +#~ msgid "Save" +#~ msgstr "Gem" -#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617 -msgid "Clip" -msgstr "Klip" +#~ msgid "Attachment Bar" +#~ msgstr "Bilagslinje" -#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624 -msgid "Fill clip rectangle" -msgstr "Udfyld kliprektangel" +#~ msgid "Cannot attach file %s: %s" +#~ msgstr "Kan ikke vedlægge fil %s: %s" -#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631 -msgid "X Offset" -msgstr "X-forskydning" +#~ msgid "Cannot attach file %s: not a regular file" +#~ msgstr "Kan ikke vedlægge fil %s: ikke en almindelig fil" -#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638 -msgid "Y Offset" -msgstr "Y-forskydning" +#~ msgid "File name:" +#~ msgstr "Filnavn:" -#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674 -msgid "Text width" -msgstr "Tekstbredde" +#~ msgid "MIME type:" +#~ msgstr "MIME-type:" -#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681 -msgid "Text height" -msgstr "Teksthøjde" +#~ msgid "Suggest automatic display of attachment" +#~ msgstr "Foreslå automatisk visning af bilag" -#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696 -msgid "Use ellipsis" -msgstr "Benyt tre prikker" +#~ msgid "Expanded" +#~ msgstr "Udvidet" -#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703 -msgid "Ellipsis" -msgstr "Tre prikker" +#~ msgid "Whether or not the expander is expanded" +#~ msgstr "Om udfolderen er udvidet eller ej" -#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710 -msgid "Line wrap" -msgstr "Linjeombrydning" +#~ msgid "Text of the expander's label" +#~ msgstr "Tekst til mærkning af udfolder" -#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717 -msgid "Break characters" -msgstr "Ombryd tegn" +#~ msgid "Use underline" +#~ msgstr "Benyt understregning" -#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724 -msgid "Max lines" -msgstr "Maks. linjer" +#~ msgid "" +#~ "If set, an underline in the text indicates the next character should be " +#~ "used for the mnemonic accelerator key" +#~ msgstr "" +#~ "Hvis sat indikerer en understregning i teksten at det næste tegn skal " +#~ "bruges som genvejstast" -#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746 -msgid "Draw borders" -msgstr "Tegn kanter" +#~ msgid "Space to put between the label and the child" +#~ msgstr "Mellemrum mellem etiketten og barnet" -#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753 -msgid "Allow newlines" -msgstr "Tillad linjeskift" +#~ msgid "Label widget" +#~ msgstr "Grafisk komponent til mærkning" -#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760 -msgid "Draw background" -msgstr "Tegn baggrund" +#~ msgid "A widget to display in place of the usual expander label" +#~ msgstr "" +#~ "En grafisk komponent som vises i stedet for den sædvanlige mærkningsliste" -#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767 -msgid "Draw button" -msgstr "Tegn knap" +#~ msgid "Indicator Spacing" +#~ msgstr "Indikatormellemrum" -#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774 -msgid "Cursor position" -msgstr "Markørposition" +#~ msgid "Spacing around expander arrow" +#~ msgstr "Mellemrum omkring udviderpil" -#. Translators: Input Method Context -#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783 -msgid "IM Context" -msgstr "IM-kontekst" +#~ msgid "Edit Master Category List..." +#~ msgstr "Redigér hovedkategorilisten..." -#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790 -msgid "Handle Popup" -msgstr "Håndtagspopop" +#~ msgid "Item(s) belong to these _categories:" +#~ msgstr "Elementerne tilhører disse _kategorier:" -#~ msgctxt "New" -#~ msgid "_Contact" -#~ msgstr "_Kontaktperson" - -#~ msgctxt "New" -#~ msgid "Contact _List" -#~ msgstr "Kontakt_liste" - -#~ msgctxt "New" -#~ msgid "Address _Book" -#~ msgstr "Adresse_bog" - -#~ msgctxt "New" -#~ msgid "_Appointment" -#~ msgstr "_Aftale" - -#~ msgctxt "New" -#~ msgid "M_eeting" -#~ msgstr "Mød_e" - -#~ msgctxt "New" -#~ msgid "All Day A_ppointment" -#~ msgstr "_Heldagsaftale" - -#~ msgctxt "New" -#~ msgid "Cale_ndar" -#~ msgstr "Kale_nder" - -#~| msgid "Accepted" -#~ msgctxt "Meeting" -#~ msgid "Accepted" -#~ msgstr "Accepteret" - -#~| msgid "Tentatively Accepted" -#~ msgctxt "Meeting" -#~ msgid "Tentatively Accepted" -#~ msgstr "Forsøgsvist accepteret" - -#~| msgid "Declined" -#~ msgctxt "Meeting" -#~ msgid "Declined" -#~ msgstr "Afslået" - -#~| msgid "Delegated" -#~ msgctxt "Meeting" -#~ msgid "Delegated" -#~ msgstr "Uddelegeret" - -#~| msgid "Updated" -#~ msgctxt "Meeting" -#~ msgid "Updated" -#~ msgstr "Opdateret" - -#~| msgid "Cancel" -#~ msgctxt "Meeting" -#~ msgid "Cancel" -#~ msgstr "Aflys" - -#~| msgid "Refresh" -#~ msgctxt "Meeting" -#~ msgid "Refresh" -#~ msgstr "Genopfrisk" - -#~| msgid "Counter-proposal" -#~ msgctxt "Meeting" -#~ msgid "Counter-proposal" -#~ msgstr "Modforslag" - -#~ msgctxt "New" -#~ msgid "Mem_o" -#~ msgstr "H_uskeseddel" - -#~ msgctxt "New" -#~ msgid "_Shared memo" -#~ msgstr "_Fælles huskeseddel" - -#~ msgctxt "New" -#~ msgid "Memo li_st" -#~ msgstr "Liste over _huskesedler" - -#~ msgctxt "New" -#~ msgid "_Task" -#~ msgstr "_Opgave" - -#~ msgctxt "New" -#~ msgid "Assigne_d Task" -#~ msgstr "_Tildelt opgave" - -#~ msgctxt "New" -#~ msgid "Tas_k list" -#~ msgstr "_Opgaveliste" - -#~ msgctxt "folder-display" -#~ msgid "%s (%u)" -#~ msgstr "%s (%u)" +#~ msgid "_Available Categories:" +#~ msgstr "_Tilgængelige kategorier:" + +#~ msgid "categories" +#~ msgstr "kategorier" -#~ msgctxt "New" -#~ msgid "_Mail Message" -#~ msgstr "_Brevbesked" +#~ msgid "DnD code" +#~ msgstr "Træk og slip-kode" -#~ msgctxt "New" -#~ msgid "Mail _Folder" -#~ msgstr "_Brevmappe" +#~ msgid "Full Header" +#~ msgstr "Komplet brevhoved" -#~ msgctxt "New" -#~ msgid "_Test" -#~ msgstr "_Test" +#~ msgid "Font Description" +#~ msgstr "Skrifttypebeskrivelse" #~ msgid "" #~ "We were unable to open this address book. This either means you have " @@ -24318,9 +24605,6 @@ msgstr "Håndtagspopop" #~ msgid "Enable attachment reminder plugin." #~ msgstr "Aktivér udvidelsesmodul til påmindelse om bilag." -#~ msgid "Remind _missing attachments" -#~ msgstr "Påmind om _manglende bilag" - #~ msgid "_Refresh:" #~ msgstr "_Opdatér:" @@ -24393,15 +24677,6 @@ msgstr "Håndtagspopop" #~ msgid "_Do not show this message again" #~ msgstr "_Vis ikke denne meddelelse igen" -#~ msgid "Copy selection to clipboard" -#~ msgstr "Kopiér det markerede til klippebordet" - -#~ msgid "Cut selection to clipboard" -#~ msgstr "Klip det markerede til klippebordet" - -#~ msgid "Paste from clipboard" -#~ msgstr "Indsæt fra klippebordet" - #~ msgid "All Day Event" #~ msgstr "Heldagsbegivenhed" @@ -25012,12 +25287,6 @@ msgstr "Håndtagspopop" #~ msgid "New mail notify" #~ msgstr "Underretning om ny post" -#~ msgid "An attachment to add." -#~ msgstr "Bilag som skal tilføjes." - -#~ msgid "Content type of the attachment." -#~ msgstr "Bilagets indholdstype." - #~ msgid "The filename to display in the mail." #~ msgstr "Filnavnet som skal vises i brevet." -- cgit v1.2.3 From 24dd706993a64fd0a314dd5bce2d7200d734a44a Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Sun, 31 May 2009 00:54:40 +0200 Subject: Small update --- po/hu.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/hu.po b/po/hu.po index 98650eeb0d..abdfaeef27 100644 --- a/po/hu.po +++ b/po/hu.po @@ -19627,7 +19627,7 @@ msgstr "_Bővítmények" #: ../plugins/plugin-manager/plugin-manager.c:58 msgid "Author(s)" -msgstr "Szerző(k)" +msgstr "Szerzők" #: ../plugins/plugin-manager/plugin-manager.c:146 msgid "Configuration" -- cgit v1.2.3 From 9e5775a7f6b7ba129e4538dbc0e6dfdaf7402f22 Mon Sep 17 00:00:00 2001 From: Tobias Mueller Date: Sat, 30 May 2009 18:19:32 +0200 Subject: Update the address of the FSF This fixes bug 584304. --- COPYING-DOCS | 2 +- e-util/gconf-bridge.c | 4 ++-- e-util/gconf-bridge.h | 4 ++-- help/es/evolution-doc-1.4.po | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/COPYING-DOCS b/COPYING-DOCS index 55aa5faad2..1a864561bd 100644 --- a/COPYING-DOCS +++ b/COPYING-DOCS @@ -2,7 +2,7 @@ Version 1.1, March 2000 Copyright (C) 2000 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index 2c0f0f2d4f..4722989980 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. */ #include diff --git a/e-util/gconf-bridge.h b/e-util/gconf-bridge.h index b3cdd2bbeb..7c7f53b0ce 100644 --- a/e-util/gconf-bridge.h +++ b/e-util/gconf-bridge.h @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. */ #ifndef __GCONF_BRIDGE_H__ diff --git a/help/es/evolution-doc-1.4.po b/help/es/evolution-doc-1.4.po index 210e29ef9b..a3efd4ad68 100644 --- a/help/es/evolution-doc-1.4.po +++ b/help/es/evolution-doc-1.4.po @@ -12213,7 +12213,7 @@ msgstr "" #~ "linkend=\"apx-gpl\"/>. You may also obtain a copy of the license from the " #~ "Free Software Foundation by visiting their Web site or by writing to: Free Software " -#~ "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." #~ msgstr "" #~ "La propia aplicación Ximian Evolution está bajo los auspicios de la " #~ "GNU General Public License (GPL) (Licencia " @@ -12223,7 +12223,7 @@ msgstr "" #~ "copia de la misma. También puede obtener una copia en el sitio web de la " #~ "Free Software Foundation o escriba a: Free Software Foundation, Inc., 59 " -#~ "Temple Place - Suite 330, Boston, MA 02111-1307, USA.." +#~ "Temple Place - Suite 330, Boston, MA 02110-1301, USA.." #~ msgid "Direct Booking" #~ msgstr "Reserva directa" -- cgit v1.2.3 From de681d39eb1980215c71de9b338e24d0031c0d27 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Sat, 30 May 2009 01:07:39 -0400 Subject: =?UTF-8?q?Bug=20323037=20=E2=80=93=20Folder=20emblem=20to=20show?= =?UTF-8?q?=20new=20mail=20arrival?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mail/em-folder-tree-model.c | 51 +++++++++++++++++++++++++----------- mail/em-folder-tree-model.h | 1 + mail/em-folder-tree.c | 64 ++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 97 insertions(+), 19 deletions(-) diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index a12b453e53..f04cf03720 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -65,19 +65,6 @@ #define u(x) /* unread count debug */ #define d(x) -static GType col_types[] = { - G_TYPE_STRING, /* display name */ - G_TYPE_POINTER, /* store object */ - G_TYPE_STRING, /* full name */ - G_TYPE_STRING, /* icon name */ - G_TYPE_STRING, /* uri */ - G_TYPE_UINT, /* unread count */ - G_TYPE_UINT, /* flags */ - G_TYPE_BOOLEAN, /* is a store node */ - G_TYPE_BOOLEAN, /* is a folder node */ - G_TYPE_BOOLEAN, /* has not-yet-loaded subfolders */ -}; - /* GObject virtual method overrides */ static void em_folder_tree_model_class_init (EMFolderTreeModelClass *klass); static void em_folder_tree_model_init (EMFolderTreeModel *model); @@ -374,6 +361,20 @@ em_folder_tree_model_new (const gchar *evolution_dir) EMFolderTreeModel *model; gchar *filename; + GType col_types[] = { + G_TYPE_STRING, /* display name */ + G_TYPE_POINTER, /* store object */ + G_TYPE_STRING, /* full name */ + G_TYPE_STRING, /* icon name */ + G_TYPE_STRING, /* uri */ + G_TYPE_UINT, /* unread count */ + G_TYPE_UINT, /* flags */ + G_TYPE_BOOLEAN, /* is a store node */ + G_TYPE_BOOLEAN, /* is a folder node */ + G_TYPE_BOOLEAN, /* has not-yet-loaded subfolders */ + G_TYPE_UINT /* last known unread count */ + }; + model = g_object_new (EM_TYPE_FOLDER_TREE_MODEL, NULL); gtk_tree_store_set_column_types ((GtkTreeStore *) model, NUM_COLUMNS, col_types); gtk_tree_sortable_set_sort_column_id ((GtkTreeSortable *) model, @@ -540,13 +541,16 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite COL_BOOL_IS_STORE, FALSE, COL_BOOL_IS_FOLDER, TRUE, COL_BOOL_LOAD_SUBDIRS, load, + COL_UINT_UNREAD_LAST_SEL, 0, -1); target = em_event_target_new_custom_icon (em_event_peek(), tree_store, iter, fi->full_name, EM_EVENT_CUSTOM_ICON); e_event_emit ((EEvent *)em_event_peek (), "folder.customicon", (EEventTarget *) target); if (unread != ~0) - gtk_tree_store_set (tree_store, iter, COL_UINT_UNREAD, unread, -1); + gtk_tree_store_set ( + tree_store, iter, COL_UINT_UNREAD, unread, + COL_UINT_UNREAD_LAST_SEL, unread, -1); if (load) { /* create a placeholder node for our subfolders... */ @@ -562,6 +566,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite COL_BOOL_IS_FOLDER, FALSE, COL_STRING_URI, NULL, COL_UINT_UNREAD, 0, + COL_UINT_UNREAD_LAST_SEL, 0, -1); path = gtk_tree_model_get_path ((GtkTreeModel *) model, iter); @@ -869,6 +874,7 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model, CamelStore *store, con COL_BOOL_IS_STORE, FALSE, COL_STRING_URI, NULL, COL_UINT_UNREAD, 0, + COL_UINT_UNREAD_LAST_SEL, 0, -1); g_free (uri); @@ -1323,6 +1329,8 @@ em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *sto GtkTreeRowReference *row; GtkTreePath *tree_path; GtkTreeIter iter; + guint old_unread = 0; + gchar *uri, *sel_uri; g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model)); g_return_if_fail (CAMEL_IS_STORE (store)); @@ -1351,7 +1359,20 @@ em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *sto gtk_tree_path_free (tree_path); - gtk_tree_store_set ((GtkTreeStore *) model, &iter, COL_UINT_UNREAD, unread, -1); + sel_uri = em_folder_tree_model_get_selected (model); + gtk_tree_model_get ( + GTK_TREE_MODEL (model), &iter, + COL_UINT_UNREAD_LAST_SEL, &old_unread, + COL_STRING_URI, &uri, -1); + if (!(g_strcmp0 (sel_uri, uri) != 0 && unread > old_unread)) + old_unread = unread; + gtk_tree_store_set ( + GTK_TREE_STORE (model), &iter, + COL_UINT_UNREAD, unread, + COL_UINT_UNREAD_LAST_SEL, old_unread, -1); + + g_free (uri); + g_free (sel_uri); /* May be this is from where we should propagate unread count to parents etc. */ emft_model_unread_count_changed (GTK_TREE_MODEL (model), &iter); diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h index 3748da79a0..563ede2787 100644 --- a/mail/em-folder-tree-model.h +++ b/mail/em-folder-tree-model.h @@ -61,6 +61,7 @@ enum { COL_BOOL_LOAD_SUBDIRS, /* %TRUE only if the store/folder * has subfolders which have not yet * been added to the tree */ + COL_UINT_UNREAD_LAST_SEL, /* last known unread count */ NUM_COLUMNS }; diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index a7b56e7fcb..25c7809c54 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -309,6 +309,49 @@ render_display_name (GtkTreeViewColumn *column, GtkCellRenderer *renderer, g_free (display); } +static void +render_icon (GtkTreeViewColumn *column, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter) +{ + GIcon *icon; + guint unread; + guint old_unread; + gchar *icon_name; + + gtk_tree_model_get ( + model, iter, + COL_STRING_ICON_NAME, &icon_name, + COL_UINT_UNREAD_LAST_SEL, &old_unread, + COL_UINT_UNREAD, &unread, -1); + + if (icon_name == NULL) + return; + + icon = g_themed_icon_new (icon_name); + + /* Show an emblem if there's new mail. */ + if (unread > old_unread) { + GIcon *temp_icon; + GEmblem *emblem; + + temp_icon = g_themed_icon_new ("emblem-new"); + emblem = g_emblem_new (temp_icon); + g_object_unref (temp_icon); + + temp_icon = g_emblemed_icon_new (icon, emblem); + g_object_unref (emblem); + g_object_unref (icon); + + icon = temp_icon; + } + + g_object_set (renderer, "gicon", icon, NULL); + + g_object_unref (icon); +} + static gboolean emft_select_func(GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *path, gboolean selected, gpointer data) { @@ -440,10 +483,11 @@ folder_tree_new (EMFolderTree *emft, EMFolderTreeModel *model) renderer = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer, FALSE); - gtk_tree_view_column_add_attribute ( - column, renderer, "icon-name", COL_STRING_ICON_NAME); gtk_tree_view_column_add_attribute ( column, renderer, "visible", COL_BOOL_IS_FOLDER); + gtk_tree_view_column_set_cell_data_func ( + column, renderer, (GtkTreeCellDataFunc) + render_icon, NULL, NULL); renderer = gtk_cell_renderer_text_new (); if (!gconf_client_get_bool (gconf, "/apps/evolution/mail/display/no_folder_dots", NULL)) @@ -2256,6 +2300,8 @@ emft_tree_selection_changed (GtkTreeSelection *selection, EMFolderTree *emft) GtkTreeModel *model; GtkTreeIter iter; guint32 flags; + guint unread = 0; + guint old_unread = 0; if (!emft_selection_get_selected (selection, &model, &iter)) { em_folder_tree_model_set_selected (emft->priv->model, NULL); @@ -2264,8 +2310,18 @@ emft_tree_selection_changed (GtkTreeSelection *selection, EMFolderTree *emft) return; } - gtk_tree_model_get (model, &iter, COL_STRING_FULL_NAME, &full_name, - COL_STRING_URI, &uri, COL_UINT_FLAGS, &flags, -1); + gtk_tree_model_get ( + model, &iter, + COL_STRING_FULL_NAME, &full_name, + COL_STRING_URI, &uri, COL_UINT_FLAGS, &flags, + COL_UINT_UNREAD, &unread, COL_UINT_UNREAD_LAST_SEL, + &old_unread, -1); + + /* Sync unread counts to distinguish new incoming mail. */ + if (unread != old_unread) + gtk_tree_store_set ( + GTK_TREE_STORE (model), &iter, + COL_UINT_UNREAD_LAST_SEL, unread, -1); g_signal_emit (emft, signals[FOLDER_SELECTED], 0, full_name, uri, flags); g_free(uri); -- cgit v1.2.3 From 700dad871baf9ff39e6e66511856486f75a777cf Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 1 Jun 2009 19:15:55 +0200 Subject: Part of bug #580212 - Report inline parts only when found both tags When parsing inline parts, like inline signatures, report the part type only when found also the end tag for the part type. --- mail/em-inline-filter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index 7da549cd34..bdacda912e 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -325,6 +325,9 @@ emif_scan(CamelMimeFilter *f, gchar *in, size_t len, gint final) } if (final) { + /* always stop as plain, especially when not read those tags fully */ + emif->state = EMIF_PLAIN; + emif_add_part(emif, data_start, inend-data_start); } else { g_byte_array_append(emif->data, (guchar *)data_start, inend-data_start); -- cgit v1.2.3 From 8079db6e4695e37c2b7777e61d6e657e7eadc564 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 1 Jun 2009 20:12:34 +0200 Subject: Bug #337082 - Do not produce unnamed folders in a folder tree --- mail/em-folder-tree.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 25c7809c54..182a40df36 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1775,9 +1775,12 @@ emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) gint fully_loaded = (m->flags & CAMEL_STORE_FOLDER_INFO_RECURSIVE) ? TRUE : FALSE; do { - em_folder_tree_model_set_folder_info (priv->model, &iter, si, fi, fully_loaded); + gboolean known = g_hash_table_lookup (si->full_hash, fi->full_name) != NULL; - if ((fi = fi->next) != NULL) + if (!known) + em_folder_tree_model_set_folder_info (priv->model, &iter, si, fi, fully_loaded); + + if ((fi = fi->next) != NULL && !known) gtk_tree_store_append (model, &iter, &root); } while (fi != NULL); } @@ -1863,8 +1866,7 @@ emft_tree_row_expanded (GtkTreeView *treeview, GtkTreeIter *root, GtkTreePath *t return; } - /* do not set LOAD_SUBDIRS to FALSE until we are really done with loading */ - /* gtk_tree_store_set ((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); */ + gtk_tree_store_set ((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); m = mail_msg_new (&get_folder_info_info); m->root = gtk_tree_row_reference_new (model, tree_path); -- cgit v1.2.3 From 69a1e923a71ee881721e21b991de08b897f9e7b0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 1 Jun 2009 21:27:44 +0200 Subject: Part of bug #574940 - Do not use freed memory in EMFolderView/Browser --- mail/em-folder-browser.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 3c2d223307..50add07fb7 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -1939,8 +1939,12 @@ emfb_gui_folder_changed(CamelFolder *folder, gpointer dummy, EMFolderBrowser *em mi = camel_folder_get_message_info(emfb->view.folder, emfb->priv->select_uid); if (mi) { + /* because some sub-functions might free the pointer before it's done here */ + gchar *uid = g_strdup (emfb->priv->select_uid); + camel_folder_free_message_info(emfb->view.folder, mi); - em_folder_view_set_message(&emfb->view, emfb->priv->select_uid, FALSE); + em_folder_view_set_message (&emfb->view, uid, FALSE); + g_free (uid); g_free (emfb->priv->select_uid); emfb->priv->select_uid = NULL; } -- cgit v1.2.3 From 8771a6de3590d468d1a2c3cfab34955c624f614a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 1 Jun 2009 19:09:19 -0400 Subject: More code cleanup. --- a11y/calendar/ea-day-view-main-item.c | 2 +- a11y/calendar/ea-week-view-main-item.c | 2 +- a11y/e-table/gal-a11y-e-cell-toggle.c | 4 +- a11y/e-table/gal-a11y-e-table-item.c | 12 ++-- a11y/e-text/gal-a11y-e-text.c | 2 +- addressbook/conduit/address-conduit.c | 6 +- addressbook/gui/component/addressbook-component.c | 2 +- addressbook/gui/component/addressbook-config.c | 2 +- addressbook/gui/component/addressbook-migrate.c | 12 ++-- addressbook/gui/component/addressbook-view.c | 2 +- addressbook/gui/component/openldap-extract.h | 50 +++++++------- addressbook/gui/contact-editor/e-contact-editor.c | 4 +- addressbook/gui/merging/eab-contact-merging.c | 6 +- addressbook/gui/widgets/e-addressbook-model.c | 4 +- .../gui/widgets/e-addressbook-reflow-adapter.c | 10 +-- .../gui/widgets/e-addressbook-table-adapter.c | 4 +- addressbook/gui/widgets/e-addressbook-view.c | 4 +- addressbook/gui/widgets/e-minicard-view.c | 4 +- addressbook/gui/widgets/e-minicard.c | 2 +- addressbook/gui/widgets/eab-contact-display.c | 10 +-- addressbook/gui/widgets/eab-popup-control.c | 2 +- addressbook/gui/widgets/gal-view-minicard.c | 14 ++-- addressbook/importers/evolution-csv-importer.c | 8 +-- addressbook/printing/e-contact-print.c | 2 +- addressbook/util/eab-book-util.c | 2 +- calendar/conduits/calendar/calendar-conduit.c | 4 +- calendar/conduits/memo/memo-conduit.c | 2 +- calendar/conduits/todo/todo-conduit.c | 2 +- calendar/gui/alarm-notify/alarm-queue.c | 2 +- calendar/gui/alarm-notify/alarm.c | 2 +- calendar/gui/alarm-notify/util.c | 2 +- calendar/gui/cal-search-bar.c | 8 +-- calendar/gui/calendar-component.c | 8 +-- calendar/gui/calendar-config.c | 4 +- calendar/gui/calendar-config.h | 4 +- calendar/gui/comp-editor-factory.c | 2 +- calendar/gui/dialogs/alarm-dialog.c | 2 +- calendar/gui/dialogs/cal-prefs-dialog.c | 2 +- calendar/gui/dialogs/comp-editor.c | 2 +- calendar/gui/dialogs/recurrence-page.c | 4 +- calendar/gui/dialogs/task-details-page.c | 2 +- calendar/gui/e-alarm-list.c | 2 +- calendar/gui/e-cal-model-calendar.c | 2 +- calendar/gui/e-cal-model-memos.c | 2 +- calendar/gui/e-cal-model-tasks.c | 4 +- calendar/gui/e-cal-model.c | 4 +- calendar/gui/e-calendar-table.c | 2 +- calendar/gui/e-calendar-view.c | 2 +- calendar/gui/e-date-time-list.c | 2 +- calendar/gui/e-day-view-main-item.c | 10 +-- calendar/gui/e-day-view-time-item.c | 18 ++--- calendar/gui/e-day-view-top-item.c | 40 ++++++------ calendar/gui/e-day-view.c | 2 +- calendar/gui/e-meeting-store.c | 4 +- calendar/gui/e-meeting-time-sel.c | 2 +- calendar/gui/e-timezone-entry.c | 2 +- calendar/gui/e-week-view-event-item.c | 24 +++---- calendar/gui/e-week-view-layout.c | 2 +- calendar/gui/e-week-view-main-item.c | 24 +++---- calendar/gui/e-week-view-titles-item.c | 24 +++---- calendar/gui/e-week-view.c | 4 +- calendar/gui/gnome-cal.c | 4 +- calendar/gui/itip-utils.c | 4 +- calendar/gui/memos-component.c | 2 +- calendar/gui/memos-control.c | 16 ++--- calendar/gui/migration.c | 10 +-- calendar/gui/misc.c | 4 +- calendar/gui/print.c | 6 +- calendar/gui/tasks-component.c | 4 +- calendar/gui/tasks-control.c | 24 +++---- e-util/e-config-listener.c | 18 ++--- e-util/e-config-listener.h | 12 ++-- e-util/e-config.c | 6 +- e-util/e-config.h | 2 +- e-util/e-dialog-widgets.c | 8 +-- e-util/e-dialog-widgets.h | 2 +- e-util/e-error.c | 4 +- e-util/e-event.c | 6 +- e-util/e-event.h | 2 +- e-util/e-fsutils.c | 4 +- e-util/e-fsutils.h | 4 +- e-util/e-import.c | 4 +- e-util/e-import.h | 2 +- e-util/e-logger.c | 2 +- e-util/e-menu.c | 8 +-- e-util/e-menu.h | 2 +- e-util/e-mktemp.c | 6 +- e-util/e-plugin.c | 18 ++--- e-util/e-popup.c | 6 +- e-util/e-popup.h | 2 +- e-util/e-sorter-array.c | 20 +++--- e-util/e-text-event-processor-emacs-like.c | 20 +++--- e-util/e-util.c | 2 +- e-util/gconf-bridge.c | 4 +- filter/filter-colour.c | 4 +- filter/filter-datespec.c | 16 ++--- filter/filter-element.c | 2 +- filter/filter-element.h | 4 +- filter/filter-file.c | 4 +- filter/filter-input.c | 8 +-- filter/filter-int.c | 4 +- filter/filter-option.c | 4 +- filter/filter-part.c | 4 +- filter/filter-rule.c | 8 +-- filter/rule-context.c | 8 +-- mail/e-searching-tokenizer.c | 10 +-- mail/em-account-editor.c | 6 +- mail/em-composer-utils.c | 6 +- mail/em-filter-folder-element.c | 4 +- mail/em-filter-rule.c | 8 +-- mail/em-filter-source-element.c | 2 +- mail/em-folder-browser.c | 10 +-- mail/em-folder-properties.c | 4 +- mail/em-folder-tree-model.c | 2 +- mail/em-folder-tree.c | 6 +- mail/em-folder-utils.c | 6 +- mail/em-folder-view.c | 8 +-- mail/em-format-hook.c | 2 +- mail/em-format-html-display.c | 2 +- mail/em-format-html.c | 6 +- mail/em-format-html.h | 2 +- mail/em-format.c | 8 +-- mail/em-format.h | 2 +- mail/em-html-stream.c | 12 ++-- mail/em-icon-stream.c | 12 ++-- mail/em-inline-filter.c | 12 ++-- mail/em-junk-hook.c | 2 +- mail/em-mailer-prefs.c | 8 +-- mail/em-message-browser.c | 2 +- mail/em-migrate.c | 62 +++++++++--------- mail/em-stripsig-filter.c | 20 +++--- mail/em-subscribe-editor.c | 4 +- mail/em-sync-stream.c | 4 +- mail/em-sync-stream.h | 4 +- mail/em-utils.c | 12 ++-- mail/em-utils.h | 4 +- mail/em-vfolder-rule.c | 8 +-- mail/importers/elm-importer.c | 2 +- mail/importers/mail-importer.c | 2 +- mail/importers/pine-importer.c | 8 +-- mail/mail-component.c | 8 +-- mail/mail-folder-cache.c | 2 +- mail/mail-mt.c | 6 +- mail/mail-send-recv.c | 4 +- mail/mail-tools.c | 2 +- mail/mail-vfolder.c | 8 +-- mail/message-list.c | 34 +++++----- mail/message-list.h | 2 +- mail/message-tag-followup.c | 2 +- plugins/caldav/caldav-source.c | 2 +- plugins/exchange-operations/exchange-calendar.c | 2 +- .../exchange-operations/exchange-config-listener.c | 22 +++---- plugins/exchange-operations/exchange-delegates.c | 2 +- .../exchange-folder-permission.c | 2 +- .../exchange-mail-send-options.c | 4 +- plugins/exchange-operations/exchange-operations.h | 2 +- .../exchange-operations/exchange-send-options.c | 2 +- .../exchange-operations/exchange-send-options.h | 2 +- plugins/external-editor/external-editor.c | 8 +-- plugins/google-account-setup/google-source.c | 4 +- .../groupwise-account-setup/camel-gw-listener.c | 24 +++---- .../groupwise-account-setup.c | 4 +- plugins/groupwise-features/addressbook-groupwise.c | 2 +- plugins/groupwise-features/junk-mail-settings.c | 2 +- plugins/groupwise-features/junk-settings.c | 4 +- plugins/groupwise-features/mail-retract.c | 2 +- plugins/groupwise-features/mail-send-options.c | 40 ++++++------ plugins/groupwise-features/process-meeting.c | 8 +-- plugins/groupwise-features/proxy-login.c | 6 +- plugins/groupwise-features/proxy.c | 4 +- plugins/groupwise-features/send-options.c | 2 +- plugins/groupwise-features/share-folder-common.c | 10 +-- plugins/groupwise-features/share-folder.c | 14 ++-- plugins/groupwise-features/status-track.c | 26 ++++---- plugins/hula-account-setup/camel-hula-listener.c | 18 ++--- plugins/ipod-sync/sync.c | 2 +- plugins/itip-formatter/itip-view.c | 4 +- plugins/mono/mono-plugin.c | 4 +- plugins/profiler/profiler.c | 2 +- plugins/pst-import/pst-importer.c | 4 +- plugins/publish-calendar/publish-calendar.c | 2 +- plugins/python/python-plugin-loader.c | 4 +- plugins/sa-junk-plugin/em-junk-filter.c | 6 +- plugins/templates/templates.c | 2 +- plugins/tnef-attachments/tnef-plugin.c | 6 +- shell/e-component-registry.c | 2 +- shell/e-shell-importer.c | 2 +- shell/e-shell-settings-dialog.c | 2 +- shell/e-shell-window.c | 24 +++---- shell/e-shell.c | 4 +- shell/e-sidebar.c | 2 +- shell/e-user-creatable-items-handler.c | 8 +-- shell/main.c | 2 +- smime/lib/e-asn1-object.c | 2 +- smime/lib/e-pkcs12.c | 2 +- widgets/e-timezone-dialog/e-timezone-dialog.c | 6 +- widgets/menus/gal-define-views-model.c | 4 +- widgets/menus/gal-view-etable.c | 14 ++-- widgets/menus/gal-view-new-dialog.c | 2 +- widgets/misc/e-activity-handler.c | 4 +- widgets/misc/e-calendar-item.c | 76 +++++++++++----------- widgets/misc/e-canvas-vbox.c | 2 +- widgets/misc/e-canvas.c | 8 +-- widgets/misc/e-cell-date-edit.c | 10 +-- widgets/misc/e-cell-percent.c | 2 +- widgets/misc/e-combo-button.c | 6 +- widgets/misc/e-dateedit.c | 6 +- widgets/misc/e-dropdown-button.c | 2 +- widgets/misc/e-filter-bar.c | 2 +- widgets/misc/e-image-chooser.c | 10 +-- widgets/misc/e-info-label.c | 4 +- widgets/misc/e-map.c | 6 +- widgets/misc/e-map.h | 2 +- widgets/misc/e-multi-config-dialog.c | 2 +- widgets/misc/e-reflow.c | 18 ++--- widgets/misc/e-search-bar.c | 4 +- widgets/misc/e-selection-model-array.c | 44 ++++++------- widgets/misc/e-spinner.c | 4 +- widgets/misc/e-task-widget.c | 2 +- widgets/misc/e-unicode.c | 8 +-- widgets/misc/test-multi-config-dialog.c | 2 +- widgets/table/e-cell-combo.c | 4 +- widgets/table/e-cell-hbox.c | 4 +- widgets/table/e-cell-popup.c | 70 ++++++++++---------- widgets/table/e-cell-size.c | 2 +- widgets/table/e-cell-text.c | 18 ++--- widgets/table/e-cell-text.h | 2 +- widgets/table/e-cell-toggle.c | 4 +- widgets/table/e-cell-tree.c | 6 +- widgets/table/e-cell-vbox.c | 4 +- widgets/table/e-table-click-to-add.c | 4 +- widgets/table/e-table-config-field.c | 2 +- widgets/table/e-table-config.c | 4 +- widgets/table/e-table-example-1.c | 4 +- widgets/table/e-table-example-2.c | 8 +-- widgets/table/e-table-field-chooser-item.c | 2 +- widgets/table/e-table-group-container.c | 16 ++--- widgets/table/e-table-group-leaf.c | 2 +- widgets/table/e-table-group.c | 2 +- widgets/table/e-table-header-item.c | 10 +-- widgets/table/e-table-header-utils.c | 6 +- widgets/table/e-table-header-utils.h | 4 +- widgets/table/e-table-item.c | 24 +++---- widgets/table/e-table-item.h | 6 +- widgets/table/e-table-memory-callbacks.c | 2 +- widgets/table/e-table-memory-store.c | 2 +- widgets/table/e-table-memory.c | 2 +- widgets/table/e-table-one.c | 4 +- widgets/table/e-table-simple.c | 4 +- widgets/table/e-table-sorted-variable.c | 6 +- widgets/table/e-table-sorted-variable.h | 4 +- widgets/table/e-table-sorted.c | 6 +- widgets/table/e-table-sorted.h | 4 +- widgets/table/e-table-sorter.c | 14 ++-- widgets/table/e-table-sorting-utils.c | 16 ++--- widgets/table/e-table-subset-variable.c | 10 +-- widgets/table/e-table-subset.c | 6 +- widgets/table/e-table-without.c | 2 +- widgets/table/e-table.c | 6 +- widgets/table/e-tree-memory-callbacks.c | 2 +- widgets/table/e-tree-memory.c | 4 +- widgets/table/e-tree-selection-model.c | 36 +++++----- widgets/table/e-tree-simple.c | 2 +- widgets/table/e-tree-sorted-variable.c | 8 +-- widgets/table/e-tree-sorted-variable.h | 4 +- widgets/table/e-tree-sorted.c | 2 +- widgets/table/e-tree-table-adapter.c | 8 +-- widgets/table/e-tree.c | 8 +-- widgets/text/e-text-model.c | 4 +- widgets/text/e-text.c | 12 ++-- 270 files changed, 992 insertions(+), 992 deletions(-) diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c index 87cd266c5c..3bfd56f0b3 100644 --- a/a11y/calendar/ea-day-view-main-item.c +++ b/a11y/calendar/ea-day-view-main-item.c @@ -551,7 +551,7 @@ ea_day_view_main_item_get_row_label (EaDayViewMainItem *ea_main_item, atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item); g_obj = atk_gobject_accessible_get_object (atk_gobj); if (!g_obj) - return 0 ; + return 0; main_item = E_DAY_VIEW_MAIN_ITEM (g_obj); day_view = main_item->day_view; diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c index 065f2be528..74f4695a69 100644 --- a/a11y/calendar/ea-week-view-main-item.c +++ b/a11y/calendar/ea-week-view-main-item.c @@ -536,7 +536,7 @@ ea_week_view_main_item_get_row_label (EaWeekViewMainItem *ea_main_item, atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item); g_obj = atk_gobject_accessible_get_object (atk_gobj); if (!g_obj) - return 0 ; + return 0; return g_snprintf (buffer, buffer_size, "the %i week", row + 1); diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c index 4fec22577b..df687f4005 100644 --- a/a11y/e-table/gal-a11y-e-cell-toggle.c +++ b/a11y/e-table/gal-a11y-e-cell-toggle.c @@ -102,8 +102,8 @@ toggle_cell_action (GalA11yECell *cell) e_table_item_get_cell_geometry (cell->item, &row, &col, &x, &y, &width, &height); - event.x = x + width / 2 + (int)(GNOME_CANVAS_ITEM (cell->item)->x1); - event.y = y + height / 2 + (int)(GNOME_CANVAS_ITEM (cell->item)->y1); + event.x = x + width / 2 + (gint)(GNOME_CANVAS_ITEM (cell->item)->x1); + event.y = y + height / 2 + (gint)(GNOME_CANVAS_ITEM (cell->item)->y1); event.type = GDK_BUTTON_PRESS; event.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(cell->item)->canvas)->bin_window; diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c index a3044a702b..561b9a84d6 100644 --- a/a11y/e-table/gal-a11y-e-table-item.c +++ b/a11y/e-table/gal-a11y-e-table-item.c @@ -799,8 +799,8 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) reorder = g_malloc0 (sizeof (gint) * n_cols); /* Compare with previously saved column headers. */ - for ( i = 0 ; i < n_cols && cols[i]; i ++ ) { - for ( j = 0 ; j < prev_n_cols && prev_cols[j]; j ++ ) { + for ( i = 0; i < n_cols && cols[i]; i ++ ) { + for ( j = 0; j < prev_n_cols && prev_cols[j]; j ++ ) { if ( prev_cols [j] == cols[i] && i != j ) { reorder_found = TRUE; @@ -822,8 +822,8 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) } /* Now try to find if there are removed columns. */ - for (i = 0 ; i < prev_n_cols && prev_cols[i]; i ++) { - for (j = 0 ; j < n_cols && cols[j]; j ++) + for (i = 0; i < prev_n_cols && prev_cols[i]; i ++) { + for (j = 0; j < n_cols && cols[j]; j ++) if ( prev_cols [j] == cols[i] ) break; @@ -847,7 +847,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) for (i = 0; i < prev_n_cols; i ++ ) { if (prev_state[i] == ETI_HEADER_REMOVED) { g_signal_emit_by_name (G_OBJECT(a11y_item), "column-deleted", i, 1); - for (j = 0 ; j < n_rows; j ++) + for (j = 0; j < n_rows; j ++) g_signal_emit_by_name (G_OBJECT(a11y_item), "children_changed::remove", ((j+1)*prev_n_cols+i), NULL, NULL); } } @@ -857,7 +857,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) for ( i = 0; i < n_cols; i ++ ) { if (state[i] == ETI_HEADER_NEW_ADDED) { g_signal_emit_by_name (G_OBJECT(a11y_item), "column-inserted", i, 1); - for (j = 0 ; j < n_rows; j ++) + for (j = 0; j < n_rows; j ++) g_signal_emit_by_name (G_OBJECT(a11y_item), "children_changed::add", ((j+1)*n_cols+i), NULL, NULL); } } diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c index f5939670f2..99fb4e8a94 100644 --- a/a11y/e-text/gal-a11y-e-text.c +++ b/a11y/e-text/gal-a11y-e-text.c @@ -439,7 +439,7 @@ et_get_text_before_offset (AtkText *text, break; case ATK_TEXT_BOUNDARY_WORD_START: end = find_word_start (full_text, offset - 1, -1); - start = find_word_start (full_text, end - 1, -1) ; + start = find_word_start (full_text, end - 1, -1); break; case ATK_TEXT_BOUNDARY_WORD_END: end = find_word_end (full_text, offset, -1); diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index 2b7aad0812..ed17e40a0e 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -167,7 +167,7 @@ struct _EAddrConduitCfg { * in UTF-8 format. A conversion must take place before calling * this function (see e_pilot_utf8_to_pchar() in e-pilot-util.c) */ -static int +static gint e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *category) { gint i, j; @@ -965,7 +965,7 @@ is_syncable (EAddrConduitContext *ctxt, EAddrLocalRecord *local) if (empty) continue; - for ( ; priority_label[l] != -1; l++) + for (; priority_label[l] != -1; l++) if (phonelabel == priority_label[l]) break; @@ -1268,7 +1268,7 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui phone++; } } - for ( ; phone <= entryPhone5; phone++) + for (; phone <= entryPhone5; phone++) local->addr->phoneLabel[phone - entryPhone1] = phone - entryPhone1; local->addr->showPhone = 0; } else { diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index ec715b7cb9..521551e66b 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -332,7 +332,7 @@ impl_handleURI (PortableServer_Servant servant, EUri *euri = e_uri_new (uri); const gchar *p; gchar *header, *content; - size_t len, clen; + gsize len, clen; p = euri->query; if (p) { diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 46ab002ecb..5c925ce3de 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -306,7 +306,7 @@ addressbook_ldap_auth (GtkWidget *window, LDAP *ldap) return ldap_error; } -static int +static gint addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap, const gchar **attrs, LDAPMessage **resp) { diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index 8ba997cd3e..c4272742cc 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -142,7 +142,7 @@ dialog_set_progress (MigrationContext *context, double percent) { gchar text[5]; - snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f)); + snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f)); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (context->progress), percent); gtk_progress_bar_set_text (GTK_PROGRESS_BAR (context->progress), text); @@ -186,7 +186,7 @@ get_source_name (ESourceGroup *group, const gchar *path) gboolean conflict; GString *s = g_string_new (""); - for (i = 0; p[i]; i ++) ; + for (i = 0; p[i]; i ++); num_elements = i; i--; @@ -586,7 +586,7 @@ get_string_child (xmlNode *node, return retval; } -static int +static gint get_integer_child (xmlNode *node, const gchar *name, gint defval) @@ -779,7 +779,7 @@ migrate_completion_folders (MigrationContext *context) if the physical_uri is anything else, we strip off the args - (anything after ;) before searching + (anything after;) before searching for the uri. */ if (!strncmp (physical_uri, "file://", 7)) { @@ -1018,9 +1018,9 @@ migrate_pilot_data (const gchar *old_path, const gchar *new_path) ((ext = strrchr (dent, '.')) && !strcmp (ext, ".db")))) { /* src and dest file formats are identical for both map and changelog files */ guchar inbuf[4096]; - size_t nread, nwritten; + gsize nread, nwritten; gint fd0, fd1; - ssize_t n; + gssize n; filename = g_build_filename (old_path, dent, NULL); if ((fd0 = g_open (filename, O_RDONLY | O_BINARY, 0)) == -1) { diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 3ce0a855b9..e70225ba31 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -452,7 +452,7 @@ static gboolean folder_can_delete (AddressbookView *view) { AddressbookViewPrivate *priv = view->priv; - ESource *source ; + ESource *source; const gchar *source_uri; source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->selector)); diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h index 630e12e4f6..996bf370a8 100644 --- a/addressbook/gui/component/openldap-extract.h +++ b/addressbook/gui/component/openldap-extract.h @@ -147,7 +147,7 @@ struct token { gchar *sval; }; -static int +static gint get_token( const gchar ** sp, gchar ** token_val ) { gint kind; @@ -743,7 +743,7 @@ ldap_str2objectclass( LDAP_CONST gchar * s, static gchar *ldap_utf8_strchr( const gchar *str, const gchar *chr ) { - for( ; *str != '\0'; LDAP_UTF8_INCR(str) ) { + for(; *str != '\0'; LDAP_UTF8_INCR(str) ) { if( ldap_x_utf8_to_ucs4( str ) == ldap_x_utf8_to_ucs4( chr ) ) { return (gchar *) str; } @@ -752,7 +752,7 @@ static gchar *ldap_utf8_strchr( const gchar *str, const gchar *chr ) return NULL; } -static size_t ldap_utf8_strcspn( const gchar *str, const gchar *set ) +static gsize ldap_utf8_strcspn( const gchar *str, const gchar *set ) { const gchar *cstr; const gchar *cset; @@ -768,7 +768,7 @@ static size_t ldap_utf8_strcspn( const gchar *str, const gchar *set ) return cstr - str; } -static size_t ldap_utf8_strspn( const gchar *str, const gchar *set ) +static gsize ldap_utf8_strspn( const gchar *str, const gchar *set ) { const gchar *cstr; const gchar *cset; @@ -843,15 +843,15 @@ static gchar *ldap_utf8_strtok(gchar *str, const gchar *sep, gchar **last) typedef struct ldap_url_desc { struct ldap_url_desc *lud_next; - char *lud_scheme; - char *lud_host; - int lud_port; - char *lud_dn; - char **lud_attrs; - int lud_scope; - char *lud_filter; - char **lud_exts; - int lud_crit_exts; + gchar *lud_scheme; + gchar *lud_host; + gint lud_port; + gchar *lud_dn; + gchar **lud_attrs; + gint lud_scope; + gchar *lud_filter; + gchar **lud_exts; + gint lud_crit_exts; } LDAPURLDesc; /* from url.c */ @@ -979,7 +979,7 @@ ldap_free_urldesc( LDAPURLDesc *ludp ) LDAP_FREE( ludp ); } -static int +static gint ldap_int_unhex( gint c ) { return( c >= '0' && c <= '9' ? c - '0' @@ -994,7 +994,7 @@ ldap_pvt_hex_unescape( gchar *s ) * Remove URL hex escapes from s... done in place. The basic concept for * this routine is borrowed from the WWW library HTUnEscape() routine. */ - char *p; + gchar *p; for ( p = s; *s != '\0'; ++s ) { if ( *s == '%' ) { @@ -1017,10 +1017,10 @@ ldap_pvt_hex_unescape( gchar *s ) static gchar ** ldap_str2charray( const gchar *str_in, const gchar *brkstr ) { - char **res; - char *str, *s; - char *lasts; - int i; + gchar **res; + gchar *str, *s; + gchar *lasts; + gint i; /* protect the input string from strtok */ str = LDAP_STRDUP( str_in ); @@ -1051,7 +1051,7 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr ) res[i] = LDAP_STRDUP( s ); if(res[i] == NULL) { - for( --i ; i >= 0 ; i-- ) { + for( --i; i >= 0; i-- ) { LDAP_FREE( res[i] ); } LDAP_FREE( res ); @@ -1068,7 +1068,7 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr ) return( res ); } -static int +static gint ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp ) { /* @@ -1076,8 +1076,8 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp ) */ LDAPURLDesc *ludp; - char *p, *q, *r; - int i, enclosed; + gchar *p, *q, *r; + gint i, enclosed; const gchar *scheme = NULL; const gchar *url_tmp; gchar *url; @@ -1162,7 +1162,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp ) } if ( q != NULL ) { - char *next; + gchar *next; *q++ = '\0'; ldap_pvt_hex_unescape( q ); @@ -1392,7 +1392,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp ) return LDAP_URL_SUCCESS; } -static int +static gint ldap_url_parse( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp ) { gint rc = ldap_url_parse_ext( url_in, ludpp ); diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 0ba954320f..e2468ee6dd 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -444,7 +444,7 @@ name_to_style (const EContactName *name, const gchar *company, gint style) return string; } -static int +static gint file_as_get_style (EContactEditor *editor) { GtkEntry *file_as = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (glade_xml_get_widget(editor->gui, "combo-file-as")))); @@ -1482,7 +1482,7 @@ fill_in_im (EContactEditor *editor) /* Clear */ - for (record_n = 1 ; record_n <= IM_SLOTS; record_n++) { + for (record_n = 1; record_n <= IM_SLOTS; record_n++) { fill_in_im_record (editor, record_n, -1, NULL, -1); } diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 983de5dab6..6e6224835c 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -183,7 +183,7 @@ dropdown_changed (GtkWidget *dropdown, dropdown_data *data) return; } -static int +static gint mergeit (EContactMergingLookup *lookup) { GtkWidget *scrolled_window, *label, *hbox, *dropdown; @@ -218,7 +218,7 @@ mergeit (EContactMergingLookup *lookup) num_of_email = g_list_length (email_attr_list); /*we match all the string fields of the already existing contact and the new contact.*/ - for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) ; field++) { + for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1); field++) { dropdown_data *data = NULL; string = (gchar *)e_contact_get_const (lookup->contact, field); string1 = (gchar *)e_contact_get_const (lookup->match, field); @@ -369,7 +369,7 @@ check_if_same (EContact *contact, EContact *match) gint num_of_email; gchar *str = NULL, *string = NULL, *string1 = NULL; - for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1) ; field++) { + for(field = E_CONTACT_FULL_NAME; field != (E_CONTACT_LAST_SIMPLE_STRING -1); field++) { email_attr_list = e_contact_get_attributes (match, E_CONTACT_EMAIL); num_of_email = g_list_length (email_attr_list); diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 2176fc3915..7389cdc8c6 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -188,7 +188,7 @@ create_contact(EBookView *book_view, model->data = g_renew(EContact *, model->data, model->allocated_count); } - for ( ; contacts; contacts = contacts->next) { + for (; contacts; contacts = contacts->next) { model->data[model->data_count++] = contacts->data; g_object_ref (contacts->data); } @@ -235,7 +235,7 @@ modify_contact(EBookView *book_view, const GList *contacts, EABModel *model) { - for ( ; contacts; contacts = contacts->next) { + for (; contacts; contacts = contacts->next) { gint i; for ( i = 0; i < model->data_count; i++) { if ( !strcmp(e_contact_get_const(model->data[i], E_CONTACT_UID), diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 6258ed28ca..56f64e158b 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -98,7 +98,7 @@ unlink_model(EAddressbookReflowAdapter *adapter) } -static int +static gint text_height (PangoLayout *layout, const gchar *text) { gint height; @@ -124,7 +124,7 @@ addressbook_set_width (EReflowModel *erm, gint width) } /* This function returns the number of items in our EReflowModel. */ -static int +static gint addressbook_count (EReflowModel *erm) { EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm); @@ -134,7 +134,7 @@ addressbook_count (EReflowModel *erm) } /* This function returns the height of the minicontact in question */ -static int +static gint addressbook_height (EReflowModel *erm, gint i, GnomeCanvasGroup *parent) { EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm); @@ -180,7 +180,7 @@ addressbook_height (EReflowModel *erm, gint i, GnomeCanvasGroup *parent) return height; } -static int +static gint addressbook_compare (EReflowModel *erm, gint n1, gint n2) { EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm); @@ -222,7 +222,7 @@ addressbook_compare (EReflowModel *erm, gint n1, gint n2) } } -static int +static gint adapter_drag_begin (EMinicard *card, GdkEvent *event, EAddressbookReflowAdapter *adapter) { gint ret_val = 0; diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index 59e670e772..f285d76493 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -87,14 +87,14 @@ addressbook_dispose(GObject *object) } /* This function returns the number of columns in our ETableModel. */ -static int +static gint addressbook_col_count (ETableModel *etc) { return COLS; } /* This function returns the number of rows in our ETableModel. */ -static int +static gint addressbook_row_count (ETableModel *etc) { EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER(etc); diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index ed726db613..53cd6aadec 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1447,7 +1447,7 @@ query_changed (ESearchBar *esb, EABView *view) } } -static int +static gint compare_subitems (gconstpointer a, gconstpointer b) { const ESearchBarItem *subitem_a = a; @@ -1946,7 +1946,7 @@ void eab_view_save_as (EABView *view, gboolean all) { GList *list = NULL; - EBook *book ; + EBook *book; g_object_get(view->model, "book", &book, diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 8cb68bb504..9461dca3ae 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -123,7 +123,7 @@ clear_drag_data (EMinicardView *view) view->drag_list = NULL; } -static int +static gint e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, EMinicardView *view) { GdkDragContext *context; @@ -477,7 +477,7 @@ do_remove (gint i, gpointer user_data) } #if 0 -static int +static gint compare_to_utf_str (EMinicard *card, const gchar *utf_str) { g_return_val_if_fail(card != NULL, 0); diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 30f326402a..1a021bea04 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -903,7 +903,7 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, g g_list_free (emails); } -static int +static gint get_left_width (EMinicard *e_minicard, gboolean is_list) { gchar *name; diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 1e39b10cf0..40e75523cc 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -188,11 +188,11 @@ eab_uri_popup_free(EPopup *ep, GSList *list, gpointer data) } } -static int +static gint eab_uri_popup_event(EABContactDisplay *display, GdkEvent *event, const gchar *uri) { EABPopup *emp; - EABPopupTargetURI *t ; + EABPopupTargetURI *t; GtkMenu *menu; GSList *menus = NULL; gint i; @@ -801,8 +801,8 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac max_dimension = calced_height; if (max_dimension > MAX_COMPACT_IMAGE_DIMENSION) { - calced_width *= ((float)MAX_COMPACT_IMAGE_DIMENSION / max_dimension); - calced_height *= ((float)MAX_COMPACT_IMAGE_DIMENSION / max_dimension); + calced_width *= ((gfloat)MAX_COMPACT_IMAGE_DIMENSION / max_dimension); + calced_height *= ((gfloat)MAX_COMPACT_IMAGE_DIMENSION / max_dimension); } } @@ -923,7 +923,7 @@ eab_contact_display_render (EABContactDisplay *display, EContact *contact, } } -static int +static gint eab_html_press_event (GtkWidget *widget, GdkEvent *event,EABContactDisplay *display) { gchar *uri; diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c index e56b816af2..78b99cf6a4 100644 --- a/addressbook/gui/widgets/eab-popup-control.c +++ b/addressbook/gui/widgets/eab-popup-control.c @@ -355,7 +355,7 @@ eab_popup_control_query (EABPopupControl *pop) g_object_ref (pop); - eab_popup_control_no_matches (pop) ; + eab_popup_control_no_matches (pop); g_object_unref (pop); diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index ae9b916e54..8ff48bede6 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -122,15 +122,15 @@ gal_view_minicard_class_init (GObjectClass *object_class) GalViewClass *gal_view_class = GAL_VIEW_CLASS(object_class); gal_view_minicard_parent_class = g_type_class_ref (PARENT_TYPE); - gal_view_class->edit = NULL ; - gal_view_class->load = gal_view_minicard_load ; - gal_view_class->save = gal_view_minicard_save ; - gal_view_class->get_title = gal_view_minicard_get_title ; - gal_view_class->set_title = gal_view_minicard_set_title ; + gal_view_class->edit = NULL; + gal_view_class->load = gal_view_minicard_load; + gal_view_class->save = gal_view_minicard_save; + gal_view_class->get_title = gal_view_minicard_get_title; + gal_view_class->set_title = gal_view_minicard_set_title; gal_view_class->get_type_code = gal_view_minicard_get_type_code; - gal_view_class->clone = gal_view_minicard_clone ; + gal_view_class->clone = gal_view_minicard_clone; - object_class->dispose = gal_view_minicard_dispose ; + object_class->dispose = gal_view_minicard_dispose; } static void diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index 0456f81b19..9cce21d548 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -570,12 +570,12 @@ getNextCSVEntry(CSVImporter *gci, FILE *f) { line = g_string_new(""); while (1) { - c = fgetc (f) ; + c = fgetc (f); if (c == EOF) return NULL; if (c == '\n') { g_string_append_c (line, c); - break ; + break; } if (c == '"') { g_string_append_c (line, c); @@ -594,12 +594,12 @@ getNextCSVEntry(CSVImporter *gci, FILE *f) { g_string_free (line, TRUE); line = g_string_new(""); while (1) { - c = fgetc (f) ; + c = fgetc (f); if (c == EOF) return NULL; if (c == '\n') { g_string_append_c (line, c); - break ; + break; } if (c == '"') { g_string_append_c (line, c); diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index 6c6710a479..cc55b97769 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -298,7 +298,7 @@ e_contact_start_new_column (EContactPrintContext *ctxt) } } -static int +static gint contact_compare (EContact *contact1, EContact *contact2) { const gchar *field1, *field2; diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c index ec8fccb5ba..b3450a29cf 100644 --- a/addressbook/util/eab-book-util.c +++ b/addressbook/util/eab-book-util.c @@ -104,7 +104,7 @@ eab_name_and_email_query (EBook *book, while (*t && *t != '@') ++t; if (*t == '@' && escaped_name) { - email_query = g_strdup_printf ("(beginswith \"email\" \"%.*s@\")", (int)(t-escaped_email), escaped_email); + email_query = g_strdup_printf ("(beginswith \"email\" \"%.*s@\")", (gint)(t-escaped_email), escaped_email); } else { email_query = g_strdup_printf ("(beginswith \"email\" \"%s\")", escaped_email); diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index fe6f7dfe5d..e899ad203d 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -461,7 +461,7 @@ auth_func_cb (ECal *ecal, const gchar * prompt, const gchar *key, gpointer user_ return password; } -static int +static gint start_calendar_server (ECalConduitContext *ctxt) { gchar *str_uri = NULL; @@ -575,7 +575,7 @@ get_ical_day (gint day) return ICAL_NO_WEEKDAY; } -static int +static gint get_pilot_day (icalrecurrencetype_weekday wd) { switch (wd) { diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c index 9a226f59b8..b22216eecd 100644 --- a/calendar/conduits/memo/memo-conduit.c +++ b/calendar/conduits/memo/memo-conduit.c @@ -356,7 +356,7 @@ static gchar *print_remote (GnomePilotRecord *remote) return buff; } -static int +static gint start_calendar_server (EMemoConduitContext *ctxt) { g_return_val_if_fail (ctxt != NULL, -2); diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index b0b5526fba..7ff2161772 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -449,7 +449,7 @@ auth_func_cb (ECal *ecal, const gchar * prompt, const gchar *key, gpointer user_ return password; } -static int +static gint start_calendar_server (EToDoConduitContext *ctxt) { gchar *str_uri = NULL; diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index d5984d1e96..180542eb6e 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -1636,7 +1636,7 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa, ECalComponent *comp; ECalComponentAlarm *alarm; icalattach *attach; - int flag = 0; + gint flag = 0; d(printf("%s:%d (audio_notification)\n",__FILE__, __LINE__)); diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c index f2ab4bb23d..c487d94503 100644 --- a/calendar/gui/alarm-notify/alarm.c +++ b/calendar/gui/alarm-notify/alarm.c @@ -158,7 +158,7 @@ setup_timeout (void) } /* Used from g_list_insert_sorted(); compares the trigger times of two AlarmRecord structures. */ -static int +static gint compare_alarm_by_time (gconstpointer a, gconstpointer b) { const AlarmRecord *ara = a; diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c index 5377c8d4b2..e0bbf10245 100644 --- a/calendar/gui/alarm-notify/util.c +++ b/calendar/gui/alarm-notify/util.c @@ -76,7 +76,7 @@ calculate_time (time_t start, time_t end) } if (i == 0 || difference != 0) { /* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */ - times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (int)difference); + times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (gint)difference); } times[i] = NULL; diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index b93a98a934..424db0d5e4 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -288,10 +288,10 @@ get_current_category (CalSearchBar *cal_search) static gchar * get_show_option_sexp (CalSearchBar *cal_search) { - CalSearchBarPrivate *priv ; - gint viewid ; + CalSearchBarPrivate *priv; + gint viewid; gchar *start, *end, *due, *ret = NULL; - const gchar *category = NULL ; + const gchar *category = NULL; time_t start_range, end_range; priv = cal_search->priv; @@ -830,7 +830,7 @@ cal_search_bar_new (guint32 flags) } /* Used from qsort() */ -static int +static gint compare_categories_cb (gconstpointer a, gconstpointer b) { const gchar **ca, **cb; diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 072df02049..5fbf0313ab 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -112,7 +112,7 @@ typedef struct EActivityHandler *activity_handler; - float vpane_pos; + gfloat vpane_pos; } CalendarComponentView; struct _CalendarComponentPrivate { @@ -142,7 +142,7 @@ extern ECompEditorRegistry *comp_editor_registry; static void calcomp_vpane_realized (GtkWidget *vpane, CalendarComponentView *view) { - gtk_paned_set_position (GTK_PANED (vpane), (int)(view->vpane_pos*vpane->allocation.height)); + gtk_paned_set_position (GTK_PANED (vpane), (gint)(view->vpane_pos*vpane->allocation.height)); } @@ -151,7 +151,7 @@ calcomp_vpane_resized (GtkWidget *vpane, GdkEventButton *e, CalendarComponentVie { view->vpane_pos = gtk_paned_get_position (GTK_PANED (vpane)); - calendar_config_set_tag_vpane_pos (view->vpane_pos/(float)vpane->allocation.height); + calendar_config_set_tag_vpane_pos (view->vpane_pos/(gfloat)vpane->allocation.height); return FALSE; } @@ -888,7 +888,7 @@ impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environm EUri *euri = e_uri_new (uri); const gchar *p; gchar *header, *content; - size_t len, clen; + gsize len, clen; time_t start = -1, end = -1; p = euri->query; diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index 58f77968d6..02b051a095 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -808,7 +808,7 @@ calendar_config_set_month_vpane_pos (gint vpane_pos) gconf_client_set_int (config, CALENDAR_CONFIG_MONTH_VPANE_POS, vpane_pos, NULL); } -float +gfloat calendar_config_get_tag_vpane_pos (void) { calendar_config_init (); @@ -818,7 +818,7 @@ calendar_config_get_tag_vpane_pos (void) void -calendar_config_set_tag_vpane_pos (float vpane_pos) +calendar_config_set_tag_vpane_pos (gfloat vpane_pos) { calendar_config_init (); diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h index c4f264c230..c7f0556ac8 100644 --- a/calendar/gui/calendar-config.h +++ b/calendar/gui/calendar-config.h @@ -182,8 +182,8 @@ void calendar_config_set_month_hpane_pos (gint hpane_pos); gint calendar_config_get_month_vpane_pos (void); void calendar_config_set_month_vpane_pos (gint vpane_pos); -float calendar_config_get_tag_vpane_pos (void); -void calendar_config_set_tag_vpane_pos (float vpane_pos); +gfloat calendar_config_get_tag_vpane_pos (void); +void calendar_config_set_tag_vpane_pos (gfloat vpane_pos); /* The current list of task lists selected */ GSList *calendar_config_get_tasks_selected (void); diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c index a217254b18..6a1c71740f 100644 --- a/calendar/gui/comp-editor-factory.c +++ b/calendar/gui/comp-editor-factory.c @@ -277,7 +277,7 @@ edit_existing (OpenClient *oc, const gchar *uid) break; default: - g_message ("edit_exiting(): Unsupported object type %d", (int) vtype); + g_message ("edit_exiting(): Unsupported object type %d", (gint) vtype); g_object_unref (comp); return; } diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 5284656d1d..ab411f9e7b 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -1105,7 +1105,7 @@ action_changed_cb (GtkWidget *action_combo, gpointer data) gint page = 0, i; action = e_dialog_combo_box_get (dialog->action_combo, action_map); - for (i = 0; action_map[i] != -1 ; i++) { + for (i = 0; action_map[i] != -1; i++) { if (action == action_map[i]) { page = i; break; diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index ce6f607b5f..96f91c741f 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -420,7 +420,7 @@ ba_reminder_interval_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) gint value; str = gtk_entry_get_text (GTK_ENTRY (widget)); - value = (int) g_ascii_strtod (str, NULL); + value = (gint) g_ascii_strtod (str, NULL); calendar_config_set_ba_reminder (NULL, &value, NULL); } diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 4063a317f4..598dbf4ff4 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -2455,7 +2455,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str num_attachments = e_cal_component_get_num_attachments (send_comp); - for (i = 0; i < num_attachments ; i++) { + for (i = 0; i < num_attachments; i++) { attach_list = g_slist_append (attach_list, g_strdup ("CID:...")); } e_cal_component_set_attachment_list (send_comp, attach_list); diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index 5e24495b5c..5fbf69df74 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -643,7 +643,7 @@ nth_weekday (gint pos, icalrecurrencetype_weekday weekday) { g_assert (pos > 0 && pos <= 5); - return (pos << 3) | (int) weekday; + return (pos << 3) | (gint) weekday; } #endif @@ -1312,7 +1312,7 @@ make_recurrence_special (RecurrencePage *rpage) } /* Counts the elements in the by_xxx fields of an icalrecurrencetype */ -static int +static gint count_by_xxx (short *field, gint max_elements) { gint i; diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 4cff39864a..23f4b1f840 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -186,7 +186,7 @@ priority_value_to_index (gint priority_value) return retval; } -static int +static gint priority_index_to_value (TaskEditorPriority priority) { gint retval; diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c index 32e5b4214a..4fdf5e71eb 100644 --- a/calendar/gui/e-alarm-list.c +++ b/calendar/gui/e-alarm-list.c @@ -170,7 +170,7 @@ all_rows_deleted (EAlarmList *alarm_list) i = g_list_length (alarm_list->list); gtk_tree_path_append_index (path, i); - for ( ; i >= 0; i--) { + for (; i >= 0; i--) { gtk_tree_model_row_deleted (GTK_TREE_MODEL (alarm_list), path); gtk_tree_path_prev (path); } diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c index 25bb9364d3..452ce88b34 100644 --- a/calendar/gui/e-cal-model-calendar.c +++ b/calendar/gui/e-cal-model-calendar.c @@ -107,7 +107,7 @@ e_cal_model_calendar_finalize (GObject *object) } /* ETableModel methods */ -static int +static gint ecmc_column_count (ETableModel *etm) { return E_CAL_MODEL_CALENDAR_FIELD_LAST; diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c index 904868adfe..414a0698e3 100644 --- a/calendar/gui/e-cal-model-memos.c +++ b/calendar/gui/e-cal-model-memos.c @@ -108,7 +108,7 @@ e_cal_model_memos_finalize (GObject *object) } /* ETableModel methods */ -static int +static gint ecmm_column_count (ETableModel *etm) { return E_CAL_MODEL_MEMOS_FIELD_LAST; diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 4e384f2774..63749c5aaa 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -112,7 +112,7 @@ e_cal_model_tasks_finalize (GObject *object) } /* ETableModel methods */ -static int +static gint ecmt_column_count (ETableModel *etm) { return E_CAL_MODEL_TASKS_FIELD_LAST; @@ -310,7 +310,7 @@ get_geo (ECalModelComponent *comp_data) return (gpointer) ""; } -static int +static gint get_percent (ECalModelComponent *comp_data) { icalproperty *prop; diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 68214fa051..eec7403ff3 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -298,13 +298,13 @@ e_cal_model_finalize (GObject *object) /* ETableModel methods */ -static int +static gint ecm_column_count (ETableModel *etm) { return E_CAL_MODEL_FIELD_LAST; } -static int +static gint ecm_row_count (ETableModel *etm) { ECalModelPrivate *priv; diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 27cf7dbfeb..9eb53d9006 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -361,7 +361,7 @@ ec_query_tooltip (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, Gtk e_cal_component_get_organizer (new_comp, &organizer); if (organizer.cn) { - gchar *ptr ; + gchar *ptr; ptr = strchr( organizer.value, ':'); if (ptr) { diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index a2b1b735de..2bca3e7ed9 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -2427,7 +2427,7 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data) e_cal_component_get_organizer (newcomp, &organiser); if (organiser.cn) { - gchar *ptr ; + gchar *ptr; ptr = strchr(organiser.value, ':'); if (ptr) { diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c index bf75f5ff04..5160f1b419 100644 --- a/calendar/gui/e-date-time-list.c +++ b/calendar/gui/e-date-time-list.c @@ -168,7 +168,7 @@ all_rows_deleted (EDateTimeList *date_time_list) i = g_list_length (date_time_list->list); gtk_tree_path_append_index (path, i); - for ( ; i >= 0; i--) { + for (; i >= 0; i--) { gtk_tree_model_row_deleted (GTK_TREE_MODEL (date_time_list), path); gtk_tree_path_prev (path); } diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 6f9d6333d6..6d65dc063f 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -618,7 +618,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, gdouble date_fraction; gboolean short_event = FALSE, resize_flag = FALSE; const gchar *end_resize_suffix; - gchar *end_resize_time; + gchar *end_regsizeime; 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; @@ -970,12 +970,12 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) { cairo_translate (cr, item_x + item_w - E_DAY_VIEW_BAR_WIDTH - 32, item_y + item_h - 8); - end_resize_time = g_strdup_printf ("%2i:%02i", + end_regsizeime = g_strdup_printf ("%2i:%02i", end_display_hour, end_minute); } else { cairo_translate (cr, item_x + item_w - E_DAY_VIEW_BAR_WIDTH - 48, item_y + item_h - 8); - end_resize_time = g_strdup_printf ("%2i:%02i%s", + end_regsizeime = g_strdup_printf ("%2i:%02i%s", end_display_hour, end_minute, end_resize_suffix); } @@ -985,7 +985,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, else cairo_set_source_rgb (cr, 1, 1, 1); cairo_set_font_options (cr, font_options); - cairo_show_text (cr, end_resize_time); + cairo_show_text (cr, end_regsizeime); cairo_close_path (cr); cairo_restore (cr); } @@ -1019,7 +1019,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, cairo_restore (cr); /* This is for achieving the white stripes in vbar across event color */ - for (i = 0; i <= (bar_y2 - bar_y1) ; i+=4) { + for (i = 0; i <= (bar_y2 - bar_y1); i+=4) { cairo_set_source_rgb (cr, 1, 1, 1); cairo_set_line_width (cr, 0.3); cairo_move_to (cr, item_x + 1, bar_y1 + i); diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index 78bf55863f..232534d51a 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -274,11 +274,11 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem) static void edvti_draw_zone (GnomeCanvasItem *canvas_item, GdkDrawable *drawable, - int x, - int y, - int width, - int height, - int x_offset, + gint x, + gint y, + gint width, + gint height, + gint x_offset, icaltimezone *use_zone) { EDayView *day_view; @@ -609,10 +609,10 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item, static void e_day_view_time_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable, - int x, - int y, - int width, - int height) + gint x, + gint y, + gint width, + gint height) { EDayViewTimeItem *dvtmitem; diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index 7579f00986..31cce40a5a 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -44,20 +44,20 @@ static void e_day_view_top_item_set_property (GObject *object, static void e_day_view_top_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags); + gint flags); static void e_day_view_top_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, - int x, - int y, - int width, - int height); + gint x, + gint y, + gint width, + gint height); static void e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem, gint event_num, GdkDrawable *drawable, - int x, - int y, - int width, - int height); + gint x, + gint y, + gint width, + gint height); static void e_day_view_top_item_draw_triangle (EDayViewTopItem *dvtitem, GdkDrawable *drawable, gint x, @@ -68,8 +68,8 @@ static void e_day_view_top_item_draw_triangle (EDayViewTopItem *dvtitem, static double e_day_view_top_item_point (GnomeCanvasItem *item, double x, double y, - int cx, - int cy, + gint cx, + gint cy, GnomeCanvasItem **actual_item); static gint e_day_view_top_item_event (GnomeCanvasItem *item, GdkEvent *event); @@ -155,7 +155,7 @@ static void e_day_view_top_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags) + gint flags) { if (GNOME_CANVAS_ITEM_CLASS (e_day_view_top_item_parent_class)->update) (* GNOME_CANVAS_ITEM_CLASS (e_day_view_top_item_parent_class)->update) (item, affine, clip_path, flags); @@ -174,10 +174,10 @@ e_day_view_top_item_update (GnomeCanvasItem *item, static void e_day_view_top_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable, - int x, - int y, - int width, - int height) + gint x, + gint y, + gint width, + gint height) { EDayViewTopItem *dvtitem; EDayView *day_view; @@ -358,10 +358,10 @@ static void e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem, gint event_num, GdkDrawable *drawable, - int x, - int y, - int width, - int height) + gint x, + gint y, + gint width, + gint height) { EDayView *day_view; EDayViewEvent *event; diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index ba05c400c0..088f544aae 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -5982,7 +5982,7 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item, data->cal_view = (ECalendarView *)day_view; data->day = day; data->event_num = event_num; - data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event; + data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, gint)) tooltip_get_view_event; pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data); return TRUE; diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index b555c41f6c..da60b19f43 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -217,7 +217,7 @@ get_flags (GtkTreeModel *model) return GTK_TREE_MODEL_ITERS_PERSIST | GTK_TREE_MODEL_LIST_ONLY; } -static int +static gint get_n_columns (GtkTreeModel *model) { g_return_val_if_fail (E_IS_MEETING_STORE (model), 0); @@ -400,7 +400,7 @@ iter_has_child (GtkTreeModel *model, GtkTreeIter *iter) return FALSE; } -static int +static gint iter_n_children (GtkTreeModel *model, GtkTreeIter *iter) { g_return_val_if_fail (E_IS_MEETING_STORE (model), -1); diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index e8cc938429..1ea1c9082a 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -872,7 +872,7 @@ e_meeting_time_selector_unrealize (GtkWidget *widget) (*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize)(widget); } -static int +static gint get_cell_height (GtkTreeView *tree) { GtkTreeViewColumn *column; diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index 2d0cf1ab5d..28660fd3b9 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -79,7 +79,7 @@ static void e_timezone_entry_class_init (ETimezoneEntryClass *class) { GtkObjectClass *object_class = (GtkObjectClass *) class; - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class) ; + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); object_class = (GtkObjectClass*) class; diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index f72c9dfcb1..6ab551e6fc 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -46,13 +46,13 @@ static void e_week_view_event_item_set_property (GObject *object, static void e_week_view_event_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags); + gint flags); static void e_week_view_event_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, - int x, - int y, - int width, - int height); + gint x, + gint y, + gint width, + gint height); static void e_week_view_draw_time (EWeekView *week_view, GdkDrawable *drawable, gint time_x, @@ -74,8 +74,8 @@ static void e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem, static double e_week_view_event_item_point (GnomeCanvasItem *item, double x, double y, - int cx, - int cy, + gint cx, + gint cy, GnomeCanvasItem **actual_item); static gint e_week_view_event_item_event (GnomeCanvasItem *item, GdkEvent *event); @@ -179,7 +179,7 @@ static void e_week_view_event_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags) + gint flags) { EWeekViewEventItem *wveitem; EWeekView *week_view; @@ -226,10 +226,10 @@ e_week_view_event_item_update (GnomeCanvasItem *item, static void e_week_view_event_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable, - int x, - int y, - int width, - int height) + gint x, + gint y, + gint width, + gint height) { EWeekViewEventItem *wveitem; EWeekView *week_view; diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c index 134b318118..8f0cb5ece8 100644 --- a/calendar/gui/e-week-view-layout.c +++ b/calendar/gui/e-week-view-layout.c @@ -432,7 +432,7 @@ e_week_view_layout_get_span_position (EWeekViewEvent *event, if (span->row >= rows_per_compressed_cell) { if (multi_week_view) { if (compress_weekend) { - /* If it ends on a Saturday and is 1 day long + /* If it ends on a Saturday and is 1 day glong we skip it, else we shorten it. If it ends on a Sunday it must be 1 day long and we skip it. */ diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c index a43e816406..34bbe0f0c0 100644 --- a/calendar/gui/e-week-view-main-item.c +++ b/calendar/gui/e-week-view-main-item.c @@ -38,13 +38,13 @@ static void e_week_view_main_item_set_property (GObject *object, static void e_week_view_main_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags); + gint flags); static void e_week_view_main_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, - int x, - int y, - int width, - int height); + gint x, + gint y, + gint width, + gint height); static void e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem, gint day, GDate *date, @@ -56,8 +56,8 @@ static void e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem, static double e_week_view_main_item_point (GnomeCanvasItem *item, double x, double y, - int cx, - int cy, + gint cx, + gint cy, GnomeCanvasItem **actual_item); /* The arguments we take */ @@ -127,7 +127,7 @@ static void e_week_view_main_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags) + gint flags) { if (GNOME_CANVAS_ITEM_CLASS (e_week_view_main_item_parent_class)->update) (* GNOME_CANVAS_ITEM_CLASS (e_week_view_main_item_parent_class)->update) (item, affine, clip_path, flags); @@ -146,10 +146,10 @@ e_week_view_main_item_update (GnomeCanvasItem *item, static void e_week_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable, - int x, - int y, - int width, - int height) + gint x, + gint y, + gint width, + gint height) { EWeekViewMainItem *wvmitem; EWeekView *week_view; diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c index 7a5ae4bf9b..e9ff467b63 100644 --- a/calendar/gui/e-week-view-titles-item.c +++ b/calendar/gui/e-week-view-titles-item.c @@ -36,18 +36,18 @@ static void e_week_view_titles_item_set_property(GObject *object, static void e_week_view_titles_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags); + gint flags); static void e_week_view_titles_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, - int x, - int y, - int width, - int height); + gint x, + gint y, + gint width, + gint height); static double e_week_view_titles_item_point (GnomeCanvasItem *item, double x, double y, - int cx, - int cy, + gint cx, + gint cy, GnomeCanvasItem **actual_item); /* The arguments we take */ @@ -114,7 +114,7 @@ static void e_week_view_titles_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags) + gint flags) { if (GNOME_CANVAS_ITEM_CLASS (e_week_view_titles_item_parent_class)->update) (* GNOME_CANVAS_ITEM_CLASS (e_week_view_titles_item_parent_class)->update) (item, affine, clip_path, flags); @@ -134,10 +134,10 @@ e_week_view_titles_item_update (GnomeCanvasItem *item, static void e_week_view_titles_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable, - int x, - int y, - int width, - int height) + gint x, + gint y, + gint width, + gint height) { EWeekViewTitlesItem *wvtitem; EWeekView *week_view; diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 97f85a5f4f..839cad6688 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -2707,7 +2707,7 @@ tooltip_event_cb (GnomeCanvasItem *item, data->cal_view = (ECalendarView *)view; data->day = -1; data->event_num = event_num; - data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event; + data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, gint)) tooltip_get_view_event; pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data); g_object_set_data ((GObject *)view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout)); @@ -3291,7 +3291,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item, data->cal_view = (ECalendarView *)week_view; data->day = -1; data->event_num = nevent; - data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event; + data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, gint)) tooltip_get_view_event; pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data); g_object_set_data ((GObject *)week_view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout)); diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index ff99530429..458a5c1dc9 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -2416,9 +2416,9 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra E_CALENDAR_VIEW (priv->views [view_type])->in_focus = TRUE; gtk_notebook_set_current_page ( - GTK_NOTEBOOK (priv->notebook), (int) view_type); + GTK_NOTEBOOK (priv->notebook), (gint) view_type); - for (i = 0; i < GNOME_CAL_LAST_VIEW ; i++) { + for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) { if (i == view_type) continue; E_CALENDAR_VIEW (priv->views [i])->in_focus = FALSE; diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 19d0aa37c2..cc290b2c3d 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -655,7 +655,7 @@ comp_subject (ECalComponentItipMethod method, ECalComponent *comp) sender = itip_get_comp_attendee (comp, NULL); if (sender) { - for (l = alist; l != NULL ; l = l->next) { + for (l = alist; l != NULL; l = l->next) { a = l->data; if ((sender && *sender) && (g_ascii_strcasecmp (itip_strip_mailto (a->value), sender) || (a->sentby && g_ascii_strcasecmp (itip_strip_mailto (a->sentby), sender)))) break; @@ -1161,7 +1161,7 @@ append_cal_attachments (EMsgComposer *composer, struct CalMimeAttach *mime_attach; GSList *l; - for (l = attach_list; l ; l = l->next) { + for (l = attach_list; l; l = l->next) { CamelMimePart *attachment; mime_attach = (struct CalMimeAttach *) l->data; diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index ff540bbab7..1efc7e64ea 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -766,7 +766,7 @@ setup_create_ecal (MemosComponent *component, MemosComponentView *component_view /* Save the primary source for use elsewhere */ calendar_config_set_primary_memos (e_source_peek_uid (source)); - return priv->create_ecal ; + return priv->create_ecal; } /* Ensures the calendar is selected */ diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c index a12d9e2935..46719a55fe 100644 --- a/calendar/gui/memos-control.c +++ b/calendar/gui/memos-control.c @@ -53,10 +53,10 @@ static void memos_control_activate_cb (BonoboControl *control, gpointer user_data); static void memos_control_open_memo_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void memos_control_new_memo_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void memos_control_cut_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path); @@ -68,13 +68,13 @@ static void memos_control_paste_cmd (BonoboUIComponent *uic, const gchar *path); static void memos_control_delete_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void memos_control_print_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void memos_control_print_preview_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); struct focus_changed_data { BonoboControl *control; @@ -296,7 +296,7 @@ memos_control_deactivate (BonoboControl *control, EMemos *memos) static void memos_control_open_memo_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { EMemos *memos; @@ -307,7 +307,7 @@ static void memos_control_open_memo_cmd (BonoboUIComponent *uic, static void memos_control_new_memo_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { EMemos *memos; @@ -365,7 +365,7 @@ memos_control_paste_cmd (BonoboUIComponent *uic, static void memos_control_delete_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { EMemos *memos; diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index 6c5504afa3..6ebf17fd6c 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -207,7 +207,7 @@ dialog_set_progress (double percent) { gchar text[5]; - snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f)); + snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f)); gtk_progress_bar_set_fraction (progress, percent); gtk_progress_bar_set_text (progress, text); @@ -243,7 +243,7 @@ get_source_name (ESourceGroup *group, const gchar *path) gboolean conflict; GString *s = g_string_new (NULL); - for (i = 0; p[i]; i ++) ; + for (i = 0; p[i]; i ++); num_elements = i; i--; @@ -644,9 +644,9 @@ migrate_pilot_data (const gchar *component, const gchar *conduit, const gchar *o ((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) { /* pilot map file - src and dest file formats are identical */ guchar inbuf[4096]; - size_t nread, nwritten; + gsize nread, nwritten; gint fd0, fd1; - ssize_t n; + gssize n; filename = g_build_filename (old_path, dent, NULL); if ((fd0 = g_open (filename, O_RDONLY|O_BINARY, 0)) == -1) { @@ -1140,7 +1140,7 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name, const gchar { ESourceGroup *group; ESource *source; - GSList *ids, *temp ; + GSList *ids, *temp; GError *error = NULL; gchar *relative_uri; const gchar *soap_port; diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c index 9fdf6f971b..36490c5463 100644 --- a/calendar/gui/misc.c +++ b/calendar/gui/misc.c @@ -55,7 +55,7 @@ string_is_empty (const gchar *value) if (value) { p = value; while (*p) { - if (!isspace ((unsigned char) *p)) { + if (!isspace ((guchar) *p)) { empty = FALSE; break; } @@ -123,7 +123,7 @@ calculate_time (time_t start, time_t end) } if (i == 0 || difference != 0) { /* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */ - times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (int)difference); + times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (gint)difference); } times[i] = NULL; diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 659897bda6..6931474349 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -241,7 +241,7 @@ build_month (gint month, gint year, gint *days, gint *start, gint *end) /* Note that months are zero-based, so September is month 8 */ if ((year == 1752) && (month == 8)) { - memcpy (days, sept_1752, 42 * sizeof (int)); + memcpy (days, sept_1752, 42 * sizeof (gint)); if (start) *start = SEPT_1752_START; @@ -817,7 +817,7 @@ print_day_background (GtkPrintContext *context, GnomeCalendar *gcal, row = 0; hour_minute_x = left + width * 0.58; for (i = pdi->start_hour; i < pdi->end_hour; i++) { - y = top + yinc * (row + 1) ; + y = top + yinc * (row + 1); cr = gtk_print_context_get_cairo_context (context); cairo_set_source_rgb (cr, 0, 0, 0); @@ -2635,7 +2635,7 @@ print_comp_draw_real (GtkPrintOperation *operation, categories); top = bound_text (context, font, categories_string, -1, 0.0, top, width, height, TRUE, &page_start, &pages); - top += get_font_size (font) - 6 ; + top += get_font_size (font) - 6; g_free (categories_string); } diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index e848b9b468..7d98e7c305 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -761,7 +761,7 @@ setup_create_ecal (TasksComponent *component, TasksComponentView *component_view /* Save the primary source for use elsewhere */ calendar_config_set_primary_tasks (e_source_peek_uid (source)); - return priv->create_ecal ; + return priv->create_ecal; } /* Ensures the calendar is selected */ @@ -1049,7 +1049,7 @@ impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environm EUri *euri = e_uri_new (uri); const gchar *p; gchar *header, *content; - size_t len, clen; + gsize len, clen; p = euri->query; if (p) { diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 15a4e38db7..e5109da7a0 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -55,10 +55,10 @@ static void tasks_control_activate_cb (BonoboControl *control, gpointer user_data); static void tasks_control_open_task_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void tasks_control_new_task_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void tasks_control_cut_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path); @@ -70,19 +70,19 @@ static void tasks_control_paste_cmd (BonoboUIComponent *uic, const gchar *path); static void tasks_control_delete_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void tasks_control_complete_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void tasks_control_purge_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void tasks_control_print_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void tasks_control_print_preview_cmd (BonoboUIComponent *uic, gpointer data, - const char *path); + const gchar *path); static void tasks_control_assign_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path); @@ -377,7 +377,7 @@ tasks_control_deactivate (BonoboControl *control, ETasks *tasks) static void tasks_control_open_task_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { ETasks *tasks; @@ -388,7 +388,7 @@ static void tasks_control_open_task_cmd (BonoboUIComponent *uic, static void tasks_control_new_task_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { ETasks *tasks; @@ -447,7 +447,7 @@ tasks_control_paste_cmd (BonoboUIComponent *uic, static void tasks_control_delete_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { ETasks *tasks; @@ -458,7 +458,7 @@ tasks_control_delete_cmd (BonoboUIComponent *uic, static void tasks_control_complete_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { ETasks *tasks; @@ -503,7 +503,7 @@ confirm_purge (ETasks *tasks) static void tasks_control_purge_cmd (BonoboUIComponent *uic, gpointer data, - const char *path) + const gchar *path) { ETasks *tasks; diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c index 97360a7552..ea76200c48 100644 --- a/e-util/e-config-listener.c +++ b/e-util/e-config-listener.c @@ -35,7 +35,7 @@ typedef struct { GConfValueType type; union { gboolean v_bool; - float v_float; + gfloat v_float; long v_long; gchar *v_str; } value; @@ -230,7 +230,7 @@ add_key (EConfigListener *cl, const gchar *key, GConfValueType type, memcpy (&kd->value.v_bool, value, sizeof (gboolean)); break; case GCONF_VALUE_FLOAT : - memcpy (&kd->value.v_float, value, sizeof (float)); + memcpy (&kd->value.v_float, value, sizeof (gfloat)); break; case GCONF_VALUE_INT : memcpy (&kd->value.v_long, value, sizeof (long)); @@ -305,20 +305,20 @@ e_config_listener_get_boolean_with_default (EConfigListener *cl, return value; } -float +gfloat e_config_listener_get_float (EConfigListener *cl, const gchar *key) { return e_config_listener_get_float_with_default (cl, key, 0.0, NULL); } -float +gfloat e_config_listener_get_float_with_default (EConfigListener *cl, const gchar *key, - float def, + gfloat def, gboolean *used_default) { GConfValue *conf_value; - float value; + gfloat value; KeyData *kd; g_return_val_if_fail (E_IS_CONFIG_LISTENER (cl), -1); @@ -355,13 +355,13 @@ e_config_listener_get_float_with_default (EConfigListener *cl, return value; } -long +glong e_config_listener_get_long (EConfigListener *cl, const gchar *key) { return e_config_listener_get_long_with_default (cl, key, 0, NULL); } -long +glong e_config_listener_get_long_with_default (EConfigListener *cl, const gchar *key, long def, @@ -481,7 +481,7 @@ e_config_listener_set_boolean (EConfigListener *cl, const gchar *key, gboolean v } void -e_config_listener_set_float (EConfigListener *cl, const gchar *key, float value) +e_config_listener_set_float (EConfigListener *cl, const gchar *key, gfloat value) { KeyData *kd; GError *err = NULL; diff --git a/e-util/e-config-listener.h b/e-util/e-config-listener.h index 47eb9c2e80..35aca2b97f 100644 --- a/e-util/e-config-listener.h +++ b/e-util/e-config-listener.h @@ -56,13 +56,13 @@ gboolean e_config_listener_get_boolean_with_default (EConfigListene const gchar *key, gboolean def, gboolean *used_default); -float e_config_listener_get_float (EConfigListener *cl, const gchar *key); -float e_config_listener_get_float_with_default (EConfigListener *cl, +gfloat e_config_listener_get_float (EConfigListener *cl, const gchar *key); +gfloat e_config_listener_get_float_with_default (EConfigListener *cl, const gchar *key, - float def, + gfloat def, gboolean *used_default); -long e_config_listener_get_long (EConfigListener *cl, const gchar *key); -long e_config_listener_get_long_with_default (EConfigListener *cl, +glong e_config_listener_get_long (EConfigListener *cl, const gchar *key); +glong e_config_listener_get_long_with_default (EConfigListener *cl, const gchar *key, long def, gboolean *used_default); @@ -76,7 +76,7 @@ void e_config_listener_set_boolean (EConfigListener *cl, gboolean value); void e_config_listener_set_float (EConfigListener *cl, const gchar *key, - float value); + gfloat value); void e_config_listener_set_long (EConfigListener *cl, const gchar *key, long value); diff --git a/e-util/e-config.c b/e-util/e-config.c index b51ca463a5..9336e778cd 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -300,7 +300,7 @@ ec_add_static_items(EConfig *ec) } } -static int +static gint ep_cmp(gconstpointer ap, gconstpointer bp) { struct _widget_node *a = *((gpointer *)ap); @@ -1193,7 +1193,7 @@ e_config_class_remove_factory(EConfigClass *klass, EConfigFactory *f) * Allocate a new config target suitable for this class. Implementing * classes will define the actual content of the target. **/ -gpointer e_config_target_new(EConfig *ep, gint type, size_t size) +gpointer e_config_target_new(EConfig *ep, gint type, gsize size) { EConfigTarget *t; @@ -1438,7 +1438,7 @@ error: return NULL; } -static int +static gint emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) { xmlNodePtr node; diff --git a/e-util/e-config.h b/e-util/e-config.h index afb897477f..55bd6abc8b 100644 --- a/e-util/e-config.h +++ b/e-util/e-config.h @@ -253,7 +253,7 @@ const gchar *e_config_page_prev(EConfig *ec, const gchar *pageid); void e_config_abort(EConfig *); void e_config_commit(EConfig *); -gpointer e_config_target_new(EConfig *, gint type, size_t size); +gpointer e_config_target_new(EConfig *, gint type, gsize size); void e_config_target_free(EConfig *, gpointer ); /* ********************************************************************** */ diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c index ae53a17ca7..afa680d11b 100644 --- a/e-util/e-dialog-widgets.c +++ b/e-util/e-dialog-widgets.c @@ -79,7 +79,7 @@ get_dialog_hooks (GtkWidget *dialog) /* Converts an mapped value to the appropriate index in an item group. The * values for the items are provided as a -1-terminated array. */ -static int +static gint value_to_index (const gint *value_map, gint value) { gint i; @@ -94,7 +94,7 @@ value_to_index (const gint *value_map, gint value) /* Converts an index in an item group to the appropriate mapped value. See the * function above. */ -static int +static gint index_to_value (const gint *value_map, gint index) { gint i; @@ -408,7 +408,7 @@ e_dialog_spin_set (GtkWidget *widget, double value) * * Return value: Numeric value. **/ -double +gdouble e_dialog_spin_get_double (GtkWidget *widget) { GtkAdjustment *adj; @@ -437,7 +437,7 @@ e_dialog_spin_get_int (GtkWidget *widget) g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), -1); value = e_dialog_spin_get_double (widget); - return (int) floor (value); + return (gint) floor (value); } /** diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h index b40edc832a..ff4a9e0d0d 100644 --- a/e-util/e-dialog-widgets.h +++ b/e-util/e-dialog-widgets.h @@ -40,7 +40,7 @@ void e_dialog_toggle_set (GtkWidget *widget, gboolean value); gboolean e_dialog_toggle_get (GtkWidget *widget); void e_dialog_spin_set (GtkWidget *widget, double value); -double e_dialog_spin_get_double (GtkWidget *widget); +gdouble e_dialog_spin_get_double (GtkWidget *widget); gint e_dialog_spin_get_int (GtkWidget *widget); void e_dialog_combo_box_set (GtkWidget *widget, gint value, const gint *value_map); diff --git a/e-util/e-error.c b/e-util/e-error.c index c35e8b2dde..4215bfe7de 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -98,7 +98,7 @@ static struct { { "GTK_RESPONSE_HELP", GTK_RESPONSE_HELP }, }; -static int +static gint map_response(const gchar *name) { gint i; @@ -121,7 +121,7 @@ static struct { { "error", GTK_STOCK_DIALOG_ERROR, N_("Evolution Error") }, }; -static int +static gint map_type(const gchar *name) { gint i; diff --git a/e-util/e-event.c b/e-util/e-event.c index d449030c0b..a94c238035 100644 --- a/e-util/e-event.c +++ b/e-util/e-event.c @@ -218,7 +218,7 @@ e_event_remove_items(EEvent *emp, gpointer handle) } } -static int +static gint ee_cmp(gconstpointer ap, gconstpointer bp) { gint a = ((struct _event_info **)ap)[0]->item->priority; @@ -306,7 +306,7 @@ e_event_emit(EEvent *emp, const gchar *id, EEventTarget *target) * the implementation to define the available target types and their * structure. **/ -gpointer e_event_target_new(EEvent *ep, gint type, size_t size) +gpointer e_event_target_new(EEvent *ep, gint type, gsize size) { EEventTarget *t; @@ -455,7 +455,7 @@ error: return NULL; } -static int +static gint emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) { xmlNodePtr node; diff --git a/e-util/e-event.h b/e-util/e-event.h index 5ae3b61d1b..3ea5c8202b 100644 --- a/e-util/e-event.h +++ b/e-util/e-event.h @@ -163,7 +163,7 @@ void e_event_remove_items(EEvent *emp, gpointer handle); void e_event_emit(EEvent *, const gchar *id, EEventTarget *); -gpointer e_event_target_new(EEvent *, gint type, size_t size); +gpointer e_event_target_new(EEvent *, gint type, gsize size); void e_event_target_free(EEvent *, gpointer ); /* ********************************************************************** */ diff --git a/e-util/e-fsutils.c b/e-util/e-fsutils.c index 335fad4aff..c5426f8c81 100644 --- a/e-util/e-fsutils.c +++ b/e-util/e-fsutils.c @@ -60,7 +60,7 @@ * Return value: The number of 1024 byte blocks used by the * filesystem. **/ -long e_fsutils_usage(const gchar *inpath) +glong e_fsutils_usage(const gchar *inpath) { GDir *dir; const gchar *d; @@ -128,7 +128,7 @@ fail: * number of disk blocks, expressed as system-independent, 1024 byte * blocks. **/ -long +glong e_fsutils_avail(const gchar *path) { #if defined(HAVE_STATVFS) diff --git a/e-util/e-fsutils.h b/e-util/e-fsutils.h index d675b39e80..6143e487ab 100644 --- a/e-util/e-fsutils.h +++ b/e-util/e-fsutils.h @@ -27,8 +27,8 @@ G_BEGIN_DECLS -long e_fsutils_usage(const gchar *path); -long e_fsutils_avail(const gchar *path); +glong e_fsutils_usage(const gchar *path); +glong e_fsutils_avail(const gchar *path); G_END_DECLS diff --git a/e-util/e-import.c b/e-util/e-import.c index 84c8a24605..4e2cdc3302 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -337,7 +337,7 @@ void e_import_class_remove_importer(EImportClass *klass, EImportImporter *f) * Allocate a new import target suitable for this class. Implementing * classes will define the actual content of the target. **/ -gpointer e_import_target_new(EImport *ep, gint type, size_t size) +gpointer e_import_target_new(EImport *ep, gint type, gsize size) { EImportTarget *t; @@ -520,7 +520,7 @@ error: return NULL; } -static int +static gint emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) { xmlNodePtr node; diff --git a/e-util/e-import.h b/e-util/e-import.h index 760544667d..5e95d6ae6b 100644 --- a/e-util/e-import.h +++ b/e-util/e-import.h @@ -188,7 +188,7 @@ struct _GtkWidget *e_import_get_widget(EImport *ei, EImportTarget *, EImportImpo void e_import_status(EImport *, EImportTarget *, const gchar *what, gint pc); void e_import_complete(EImport *, EImportTarget *); -gpointer e_import_target_new(EImport *ep, gint type, size_t size); +gpointer e_import_target_new(EImport *ep, gint type, gsize size); void e_import_target_free(EImport *ep, gpointer o); EImportTargetURI *e_import_target_new_uri(EImport *ei, const gchar *suri, const gchar *duri); diff --git a/e-util/e-logger.c b/e-util/e-logger.c index 19326d2d67..eac1a8fb06 100644 --- a/e-util/e-logger.c +++ b/e-util/e-logger.c @@ -266,7 +266,7 @@ e_logger_get_logs (ELogger *logger, while (!feof (fp)) { gchar *tmp; - size_t len; + gsize len; tmp = fgets (buf, sizeof (buf), fp); if (!tmp) diff --git a/e-util/e-menu.c b/e-util/e-menu.c index 4687e97fb1..76c41b62f5 100644 --- a/e-util/e-menu.c +++ b/e-util/e-menu.c @@ -366,13 +366,13 @@ void e_menu_activate(EMenu *em, struct _BonoboUIComponent *uic, gint act) for (mw = (struct _menu_node *)p->menus.head;mw->next;mw=mw->next) { struct _item_node *inode; - for (l = mw->uis; l ; l = g_slist_next(l)) { + for (l = mw->uis; l; l = g_slist_next(l)) { EMenuUIFile *ui = l->data; bonobo_ui_util_set_ui(uic, ui->appdir, ui->filename, ui->appname, NULL); } - for (l = mw->pixmaps; l ; l = g_slist_next(l)) { + for (l = mw->pixmaps; l; l = g_slist_next(l)) { EMenuPixmap *pm = l->data; if (pm->pixmap) @@ -538,7 +538,7 @@ e_menu_class_remove_factory(EMenuClass *klass, EMenuFactory *f) * to specify the actual target size, which may vary depending on the * implementing class. **/ -gpointer e_menu_target_new(EMenu *ep, gint type, size_t size) +gpointer e_menu_target_new(EMenu *ep, gint type, gsize size) { EMenuTarget *t; @@ -821,7 +821,7 @@ error: return NULL; } -static int +static gint emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) { xmlNodePtr node; diff --git a/e-util/e-menu.h b/e-util/e-menu.h index 42e03572ae..d0a8e9939d 100644 --- a/e-util/e-menu.h +++ b/e-util/e-menu.h @@ -222,7 +222,7 @@ void e_menu_remove_items(EMenu *emp, gpointer handle); void e_menu_activate(EMenu *, struct _BonoboUIComponent *uic, gint act); void e_menu_update_target(EMenu *, gpointer ); -gpointer e_menu_target_new(EMenu *, gint type, size_t size); +gpointer e_menu_target_new(EMenu *, gint type, gsize size); void e_menu_target_free(EMenu *, gpointer ); /* ********************************************************************** */ diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c index 0044b2e085..0e4cc6c7f3 100644 --- a/e-util/e-mktemp.c +++ b/e-util/e-mktemp.c @@ -50,13 +50,13 @@ /* dont scan more often than this */ #define TEMP_SCAN (60) -static int +static gint expire_dir_rec(const gchar *base, time_t now) { GDir *dir; const gchar *d; GString *path; - size_t len; + gsize len; struct stat st; gint count = 0; @@ -120,7 +120,7 @@ get_dir (gboolean make) g_free(tmpdir); #else path = g_string_new("/tmp/evolution-"); - g_string_append_printf (path, "%d", (int) getuid ()); + g_string_append_printf (path, "%d", (gint) getuid ()); if (make) { gint ret; diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index 61cf2c5e9f..3b3d5d215d 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -131,7 +131,7 @@ ep_set_enabled (const gchar *id, gint state) GCONF_VALUE_STRING, ep_disabled, NULL); } -static int +static gint ep_construct (EPlugin *ep, xmlNodePtr root) { xmlNodePtr node; @@ -420,7 +420,7 @@ ep_load_plugin(xmlNodePtr root, struct _plugin_doc *pdoc) return ep; } -static int +static gint ep_load(const gchar *filename, gint load_level) { xmlDocPtr doc; @@ -445,7 +445,7 @@ ep_load(const gchar *filename, gint load_level) pdoc->doc = doc; pdoc->filename = g_strdup(filename); - for (root = root->children; root ; root = root->next) { + for (root = root->children; root; root = root->next) { if (strcmp((gchar *)root->name, "e-plugin") == 0) { gchar *plugin_load_level, *is_system_plugin; @@ -503,7 +503,7 @@ ep_load(const gchar *filename, gint load_level) /* This loads a hook that was pending on a given plugin but the type wasn't registered yet */ /* This works in conjunction with ep_construct and e_plugin_hook_register_type to make sure everything works nicely together. Apparently. */ -static int +static gint ep_load_pending(EPlugin *ep, EPluginHookClass *type) { gint res = 0; @@ -988,7 +988,7 @@ static gpointer epl_parent_class; static GList *missing_symbols = NULL; -static int +static gint epl_loadmodule(EPlugin *ep, gboolean fatal) { EPluginLib *epl = E_PLUGIN_LIB (ep); @@ -1070,7 +1070,7 @@ epl_get_symbol(EPlugin *ep, const gchar *name) return symbol; } -static int +static gint epl_construct(EPlugin *ep, xmlNodePtr root) { EPluginLib *epl = E_PLUGIN_LIB (ep); @@ -1234,7 +1234,7 @@ e_plugin_lib_get_type (void) static gpointer eph_parent_class; -static int +static gint eph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) { eph->plugin = ep; @@ -1484,7 +1484,7 @@ e_plugin_hook_id(xmlNodePtr root, const struct _EPluginHookTargetKey *map, const static gpointer epth_parent_class; -static int +static gint epth_load_plugin(gpointer d) { EPluginHook *eph = d; @@ -1500,7 +1500,7 @@ epth_load_plugin(gpointer d) return FALSE; } -static int +static gint epth_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) { EPluginTypeHook *epth = E_PLUGIN_TYPE_HOOK (eph); diff --git a/e-util/e-popup.c b/e-util/e-popup.c index 9bb63748dd..4cbe221ea8 100644 --- a/e-util/e-popup.c +++ b/e-util/e-popup.c @@ -263,7 +263,7 @@ ep_add_static_items(EPopup *emp) } } -static int +static gint ep_cmp(gconstpointer ap, gconstpointer bp) { struct _item_node *a = *((gpointer *)ap); @@ -648,7 +648,7 @@ e_popup_class_remove_factory(EPopupClass *klass, EPopupFactory *f) * * Allocate a new popup target suitable for this popup type. **/ -gpointer e_popup_target_new(EPopup *ep, gint type, size_t size) +gpointer e_popup_target_new(EPopup *ep, gint type, gsize size) { EPopupTarget *t; @@ -853,7 +853,7 @@ error: return NULL; } -static int +static gint emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) { xmlNodePtr node; diff --git a/e-util/e-popup.h b/e-util/e-popup.h index 0f430af801..8779ce8dd9 100644 --- a/e-util/e-popup.h +++ b/e-util/e-popup.h @@ -213,7 +213,7 @@ void e_popup_add_static_items(EPopup *emp, EPopupTarget *target); struct _GtkMenu *e_popup_create_menu(EPopup *, EPopupTarget *, guint32 mask); struct _GtkMenu *e_popup_create_menu_once(EPopup *emp, EPopupTarget *, guint32 mask); -gpointer e_popup_target_new(EPopup *, gint type, size_t size); +gpointer e_popup_target_new(EPopup *, gint type, gsize size); void e_popup_target_free(EPopup *, gpointer ); /* ********************************************************************** */ diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c index 02f9bc2bfc..b3b4c4a2f2 100644 --- a/e-util/e-sorter-array.c +++ b/e-util/e-sorter-array.c @@ -45,7 +45,7 @@ static gboolean esa_needs_sorting (ESorter *esa); #define ESA_NEEDS_SORTING(esa) (((ESorterArray *) (esa))->compare != NULL) -static int +static gint esort_callback(gconstpointer data1, gconstpointer data2, gpointer user_data) { ESorterArray *esa = user_data; @@ -83,7 +83,7 @@ esa_sort(ESorterArray *esa) if (esa->compare) g_qsort_with_data ( - esa->sorted, rows, sizeof(int), + esa->sorted, rows, sizeof(gint), esort_callback, esa); } @@ -204,9 +204,9 @@ e_sorter_array_append (ESorterArray *esa, gint count) esa->sorted = g_renew(int, esa->sorted, esa->rows + count); for (i = 0; i < count; i++) { gint value = esa->rows; - size_t pos; - e_bsearch (&value, esa->sorted, esa->rows, sizeof (int), esort_callback, esa, &pos, NULL); - memmove (esa->sorted + pos + 1, esa->sorted + pos, sizeof (int) * (esa->rows - pos)); + gsize pos; + e_bsearch (&value, esa->sorted, esa->rows, sizeof (gint), esort_callback, esa, &pos, NULL); + memmove (esa->sorted + pos + 1, esa->sorted + pos, sizeof (gint) * (esa->rows - pos)); esa->sorted[pos] = value; esa->rows ++; } @@ -238,11 +238,11 @@ e_sorter_array_class_init (ESorterArrayClass *klass) { ESorterClass *sorter_class = E_SORTER_CLASS(klass); - sorter_class->model_to_sorted = esa_model_to_sorted ; - sorter_class->sorted_to_model = esa_sorted_to_model ; - sorter_class->get_model_to_sorted_array = esa_get_model_to_sorted_array ; - sorter_class->get_sorted_to_model_array = esa_get_sorted_to_model_array ; - sorter_class->needs_sorting = esa_needs_sorting ; + sorter_class->model_to_sorted = esa_model_to_sorted; + sorter_class->sorted_to_model = esa_sorted_to_model; + sorter_class->get_model_to_sorted_array = esa_get_model_to_sorted_array; + sorter_class->get_sorted_to_model_array = esa_get_sorted_to_model_array; + sorter_class->needs_sorting = esa_needs_sorting; } static void diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c index f44019165d..8f44c0c2a2 100644 --- a/e-util/e-text-event-processor-emacs-like.c +++ b/e-util/e-text-event-processor-emacs-like.c @@ -435,11 +435,11 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro key.keyval -= 'A' - 'a'; if ((key.keyval >= 'a') && (key.keyval <= 'z')) { - command.position = control_keys[(int) (key.keyval - 'a')].position; - if (control_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE) - command.action = control_keys[(int) (key.keyval - 'a')].action; - command.value = control_keys[(int) (key.keyval - 'a')].value; - command.string = control_keys[(int) (key.keyval - 'a')].string; + command.position = control_keys[(gint) (key.keyval - 'a')].position; + if (control_keys[(gint) (key.keyval - 'a')].action != E_TEP_MOVE) + command.action = control_keys[(gint) (key.keyval - 'a')].action; + command.value = control_keys[(gint) (key.keyval - 'a')].value; + command.string = control_keys[(gint) (key.keyval - 'a')].string; } if (key.keyval == ' ') { @@ -461,11 +461,11 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro key.keyval -= 'A' - 'a'; if ((key.keyval >= 'a') && (key.keyval <= 'z')) { - command.position = alt_keys[(int) (key.keyval - 'a')].position; - if (alt_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE) - command.action = alt_keys[(int) (key.keyval - 'a')].action; - command.value = alt_keys[(int) (key.keyval - 'a')].value; - command.string = alt_keys[(int) (key.keyval - 'a')].string; + command.position = alt_keys[(gint) (key.keyval - 'a')].position; + if (alt_keys[(gint) (key.keyval - 'a')].action != E_TEP_MOVE) + command.action = alt_keys[(gint) (key.keyval - 'a')].action; + command.value = alt_keys[(gint) (key.keyval - 'a')].value; + command.string = alt_keys[(gint) (key.keyval - 'a')].string; } } else if (!(key.state & GDK_MOD1_MASK) && !(key.state & GDK_CONTROL_MASK) && key.length > 0) { if (key.keyval >= GDK_KP_0 && key.keyval <= GDK_KP_9) { diff --git a/e-util/e-util.c b/e-util/e-util.c index 408a201c0a..160e858487 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -1448,7 +1448,7 @@ e_util_read_file (const gchar *filename, gboolean filename_is_uri, gchar **buffe gchar *buff; sz = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); - buff = g_malloc (sizeof (char) * sz); + buff = g_malloc (sizeof (gchar) * sz); if (buff) { GInputStream *stream; diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index 4722989980..259ad14adc 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -321,11 +321,11 @@ prop_binding_sync_prop_to_pref (PropBinding *binding) case G_TYPE_DOUBLE: gconf_value = gconf_value_new (GCONF_VALUE_FLOAT); #ifdef HAVE_CORBA_GCONF - /* FIXME we cast to a float explicitly as CORBA GConf + /* FIXME we cast to a gfloat explicitly as CORBA GConf * uses doubles in its API, but treats them as floats * when transporting them over CORBA. See #322837 */ gconf_value_set_float (gconf_value, - (float) g_value_get_double (&value)); + (gfloat) g_value_get_double (&value)); #else gconf_value_set_float (gconf_value, g_value_get_double (&value)); diff --git a/filter/filter-colour.c b/filter/filter-colour.c index c175829a5e..7672a77be6 100644 --- a/filter/filter-colour.c +++ b/filter/filter-colour.c @@ -116,7 +116,7 @@ filter_colour_new (void) return (FilterColour *) g_object_new (FILTER_TYPE_COLOUR, NULL, NULL); } -static int +static gint colour_eq (FilterElement *fe, FilterElement *cm) { FilterColour *fc = (FilterColour *) fe; @@ -151,7 +151,7 @@ xml_encode (FilterElement *fe) return value; } -static int +static gint xml_decode (FilterElement *fe, xmlNodePtr node) { FilterColour *fc = (FilterColour *)fe; diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c index 4ab85d36bf..a7ef49981e 100644 --- a/filter/filter-datespec.c +++ b/filter/filter-datespec.c @@ -66,7 +66,7 @@ typedef struct _timespan { const gchar *past_plural; const gchar *future_singular; const gchar *future_plural; - float max; + gfloat max; } timespan; #ifdef ngettext @@ -195,7 +195,7 @@ validate (FilterElement *fe) return valid; } -static int +static gint date_eq (FilterElement *fe, FilterElement *cm) { FilterDatespec *fd = (FilterDatespec *)fe, *cd = (FilterDatespec *)cm; @@ -228,13 +228,13 @@ xml_encode (FilterElement *fe) work = xmlNewChild (value, NULL, (const guchar *)"datespec", NULL); sprintf (str, "%d", fds->type); xmlSetProp (work, (const guchar *)"type", (guchar *)str); - sprintf (str, "%d", (int)fds->value); + sprintf (str, "%d", (gint)fds->value); xmlSetProp (work, (const guchar *)"value", (guchar *)str); return value; } -static int +static gint xml_decode (FilterElement *fe, xmlNodePtr node) { FilterDatespec *fds = (FilterDatespec *)fe; @@ -263,7 +263,7 @@ xml_decode (FilterElement *fe, xmlNodePtr node) return 0; } -static int +static gint get_best_span (time_t val) { gint i; @@ -508,13 +508,13 @@ format_sexp (FilterElement *fe, GString *out) g_string_append (out, "(get-current-date)"); break; case FDST_SPECIFIED: - g_string_append_printf (out, "%d", (int) fds->value); + g_string_append_printf (out, "%d", (gint) fds->value); break; case FDST_X_AGO: - g_string_append_printf (out, "(- (get-current-date) %d)", (int) fds->value); + g_string_append_printf (out, "(- (get-current-date) %d)", (gint) fds->value); break; case FDST_X_FUTURE: - g_string_append_printf (out, "(+ (get-current-date) %d)", (int) fds->value); + g_string_append_printf (out, "(+ (get-current-date) %d)", (gint) fds->value); break; } } diff --git a/filter/filter-element.c b/filter/filter-element.c index f2d65d63b4..7eb898f025 100644 --- a/filter/filter-element.c +++ b/filter/filter-element.c @@ -244,7 +244,7 @@ validate (FilterElement *fe) return TRUE; } -static int +static gint element_eq (FilterElement *fe, FilterElement *cm) { return ((fe->name && cm->name && strcmp (fe->name, cm->name) == 0) diff --git a/filter/filter-element.h b/filter/filter-element.h index 4c105a77c3..5a78c98980 100644 --- a/filter/filter-element.h +++ b/filter/filter-element.h @@ -77,12 +77,12 @@ void filter_element_set_data (FilterElement *fe, gpointer data); /* methods */ gboolean filter_element_validate (FilterElement *fe); -int filter_element_eq (FilterElement *fe, FilterElement *cm); +gint filter_element_eq (FilterElement *fe, FilterElement *cm); void filter_element_xml_create (FilterElement *fe, xmlNodePtr node); xmlNodePtr filter_element_xml_encode (FilterElement *fe); -int filter_element_xml_decode (FilterElement *fe, xmlNodePtr node); +gint filter_element_xml_decode (FilterElement *fe, xmlNodePtr node); FilterElement *filter_element_clone (FilterElement *fe); void filter_element_copy_value (FilterElement *de, FilterElement *se); diff --git a/filter/filter-file.c b/filter/filter-file.c index 0d421042e6..ea14fadb12 100644 --- a/filter/filter-file.c +++ b/filter/filter-file.c @@ -184,7 +184,7 @@ validate (FilterElement *fe) return TRUE; } -static int +static gint file_eq (FilterElement *fe, FilterElement *cm) { FilterFile *ff = (FilterFile *)fe, *cf = (FilterFile *)cm; @@ -224,7 +224,7 @@ xml_encode (FilterElement *fe) return value; } -static int +static gint xml_decode (FilterElement *fe, xmlNodePtr node) { FilterFile *file = (FilterFile *)fe; diff --git a/filter/filter-input.c b/filter/filter-input.c index 5eeed60de7..690ccd6e48 100644 --- a/filter/filter-input.c +++ b/filter/filter-input.c @@ -175,7 +175,7 @@ validate (FilterElement *fe) pattern = fi->values->data; if ((regerr = regcomp (®expat, pattern, REG_EXTENDED | REG_NEWLINE | REG_ICASE))) { - size_t reglen; + gsize reglen; gchar *regmsg; /* regerror gets called twice to get the full error string @@ -200,7 +200,7 @@ validate (FilterElement *fe) return valid; } -static int +static gint list_eq (GList *al, GList *bl) { gint truth = TRUE; @@ -214,7 +214,7 @@ list_eq (GList *al, GList *bl) return truth && al == NULL && bl == NULL; } -static int +static gint input_eq (FilterElement *fe, FilterElement *cm) { FilterInput *fi = (FilterInput *)fe, *ci = (FilterInput *)cm; @@ -263,7 +263,7 @@ xml_encode (FilterElement *fe) return value; } -static int +static gint xml_decode (FilterElement *fe, xmlNodePtr node) { FilterInput *fi = (FilterInput *)fe; diff --git a/filter/filter-int.c b/filter/filter-int.c index 220e12fb38..9d72fdfdc8 100644 --- a/filter/filter-int.c +++ b/filter/filter-int.c @@ -144,7 +144,7 @@ filter_int_set_value (FilterInt *fi, gint val) fi->val = val; } -static int +static gint int_eq (FilterElement *fe, FilterElement *cm) { return FILTER_ELEMENT_CLASS (parent_class)->eq (fe, cm) @@ -193,7 +193,7 @@ xml_encode (FilterElement *fe) return value; } -static int +static gint xml_decode (FilterElement *fe, xmlNodePtr node) { FilterInt *fs = (FilterInt *)fe; diff --git a/filter/filter-option.c b/filter/filter-option.c index 5341705986..07e7ee950d 100644 --- a/filter/filter-option.c +++ b/filter/filter-option.c @@ -211,7 +211,7 @@ filter_option_remove_all (FilterOption *fo) fo->current = NULL; } -static int +static gint option_eq(FilterElement *fe, FilterElement *cm) { FilterOption *fo = (FilterOption *)fe, *co = (FilterOption *)cm; @@ -322,7 +322,7 @@ xml_encode (FilterElement *fe) return value; } -static int +static gint xml_decode (FilterElement *fe, xmlNodePtr node) { FilterOption *fo = (FilterOption *)fe; diff --git a/filter/filter-part.c b/filter/filter-part.c index f8dc448f77..79b9da9ac0 100644 --- a/filter/filter-part.c +++ b/filter/filter-part.c @@ -489,7 +489,7 @@ filter_part_expand_code (FilterPart *ff, const gchar *source, GString *out) fe = filter_part_find_element (ff, name); d(printf("expand code: looking up variab le '%s' = %p\n", ff, name, fe)); if (fe) { - g_string_append_printf (out, "%.*s", (int)(newstart-start), start); + g_string_append_printf (out, "%.*s", (gint)(newstart-start), start); filter_element_format_sexp (fe, out); #if 0 } else if ((val = g_hash_table_lookup (ff->globals, name))) { @@ -497,7 +497,7 @@ filter_part_expand_code (FilterPart *ff, const gchar *source, GString *out) e_sexp_encode_string (out, val); #endif } else { - g_string_append_printf (out, "%.*s", (int)(end-start+1), start); + g_string_append_printf (out, "%.*s", (gint)(end-start+1), start); } start = end + 1; } diff --git a/filter/filter-rule.c b/filter/filter-rule.c index 00610c48ea..354d276fe8 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -203,7 +203,7 @@ filter_rule_validate (FilterRule *fr) return FILTER_RULE_GET_CLASS (fr)->validate (fr); } -static int +static gint validate (FilterRule *fr) { gint valid = TRUE; @@ -240,7 +240,7 @@ filter_rule_eq (FilterRule *fr, FilterRule *cm) && FILTER_RULE_GET_CLASS (fr)->eq (fr, cm); } -static int +static gint list_eq(GList *al, GList *bl) { gint truth = TRUE; @@ -256,7 +256,7 @@ list_eq(GList *al, GList *bl) return truth && al == NULL && bl == NULL; } -static int +static gint rule_eq (FilterRule *fr, FilterRule *cm) { return fr->enabled == cm->enabled @@ -387,7 +387,7 @@ filter_rule_xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f) return res; } -static int +static gint xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f) { xmlNodePtr work; diff --git a/filter/rule-context.c b/filter/rule-context.c index e9dc71a150..5f00adff71 100644 --- a/filter/rule-context.c +++ b/filter/rule-context.c @@ -295,7 +295,7 @@ rule_context_load(RuleContext *rc, const gchar *system, const gchar *user) return res; } -static int +static gint load(RuleContext *rc, const gchar *system, const gchar *user) { xmlNodePtr set, rule, root; @@ -422,7 +422,7 @@ rule_context_save(RuleContext *rc, const gchar *user) return RULE_CONTEXT_GET_CLASS(rc)->save(rc, user); } -static int +static gint save(RuleContext *rc, const gchar *user) { xmlDocPtr doc; @@ -507,14 +507,14 @@ source_hashf(const gchar *a) return 0; } -static int +static gint source_eqf(const gchar *a, const gchar *b) { return((a && b && strcmp(a, b) == 0)) || (a == NULL && b == NULL); } -static int +static gint revert(RuleContext *rc, const gchar *user) { xmlNodePtr set, rule; diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index b0b1db1879..e06885a320 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -157,7 +157,7 @@ loop: static const gchar *ignored_tags[] = { "B", "I", "FONT", "TT", "EM", /* and more? */}; -static int +static gint ignore_tag (const gchar *tag) { gchar *t = alloca(strlen(tag)+1), c, *out; @@ -593,7 +593,7 @@ output_match(struct _searcher *s, guint start, guint end) /* output highlight/bold */ if (s->flags & SEARCH_BOLD) { - sprintf(b, "%c", (char)TAG_ESCAPE); + sprintf(b, "%c", (gchar)TAG_ESCAPE); append_token(&s->output, b, -1); } if (s->tags) @@ -621,7 +621,7 @@ output_match(struct _searcher *s, guint start, guint end) /* and close bold if we need to */ if (s->flags & SEARCH_BOLD) { - sprintf(b, "%c", (char)TAG_ESCAPE); + sprintf(b, "%c", (gchar)TAG_ESCAPE); append_token(&s->output, b, -1); } } @@ -638,7 +638,7 @@ output_subpending(struct _searcher *s) } /* returns true if a merge took place */ -static int +static gint merge_subpending(struct _searcher *s, gint offstart, gint offend) { gint i; @@ -831,7 +831,7 @@ searcher_peek_token(struct _searcher *s) return tok; } -static int +static gint searcher_pending(struct _searcher *s) { return !(e_dlist_empty(&s->input) && e_dlist_empty(&s->output)); diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 570858cd68..0016952cff 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -611,7 +611,7 @@ emae_signature_added(ESignatureList *signatures, ESignature *sig, EMAccountEdito gtk_combo_box_set_active(emae->priv->signatures_dropdown, gtk_tree_model_iter_n_children(model, NULL)-1); } -static int +static gint emae_signature_get_iter(EMAccountEditor *emae, ESignature *sig, GtkTreeModel **modelp, GtkTreeIter *iter) { GtkTreeModel *model; @@ -1225,7 +1225,7 @@ emae_path_changed(GtkWidget *widget, EMAccountEditorService *service) emae_service_url_path_changed(service, camel_url_set_path, widget); } -static int +static gint emae_ssl_update(EMAccountEditorService *service, CamelURL *url) { gint id = gtk_combo_box_get_active(service->use_ssl); @@ -2727,7 +2727,7 @@ struct _server_prefill { {"msn", "pop3.email.msn.com", "smtp.email.msn.com", "pop", "never"} }; -static int +static gint check_servers (gchar *server) { gint len = G_N_ELEMENTS(mail_servers), i; diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 19a20b2c1b..4a681c99bc 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1096,7 +1096,7 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, flags |= EM_FORMAT_QUOTE_CITE; for (i = 0; i < messages->len; i++) { - ssize_t len; + gssize len; message = messages->pdata[i]; subject = mail_tool_generate_forward_subject (message); @@ -2200,7 +2200,7 @@ composer_set_body (EMsgComposer *composer, CamelMimeMessage *message, EMFormat * gchar *text, *credits; CamelMimePart *part; GConfClient *gconf; - ssize_t len = 0; + gssize len = 0; gboolean start_bottom; gconf = mail_config_get_gconf_client (); @@ -2259,7 +2259,7 @@ gchar * em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source) { gchar *text, *credits; - ssize_t len = 0; + gssize len = 0; gboolean start_bottom = 0; credits = attribution_format (ATTRIBUTION, message); diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c index 553fba0895..b531780287 100644 --- a/mail/em-filter-folder-element.c +++ b/mail/em-filter-folder-element.c @@ -156,7 +156,7 @@ validate(FilterElement *fe) } } -static int +static gint folder_eq(FilterElement *fe, FilterElement *cm) { return FILTER_ELEMENT_CLASS(parent_class)->eq(fe, cm) @@ -191,7 +191,7 @@ xml_encode(FilterElement *fe) return value; } -static int +static gint xml_decode(FilterElement *fe, xmlNodePtr node) { EMFilterFolderElement *ff = (EMFilterFolderElement *)fe; diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index 03d0028b6e..47c5e4d0d2 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -171,7 +171,7 @@ em_filter_rule_build_action(EMFilterRule *fr, GString *out) g_string_append(out, ")\n"); } -static int +static gint validate(FilterRule *fr) { EMFilterRule *ff =(EMFilterRule *)fr; @@ -190,7 +190,7 @@ validate(FilterRule *fr) return valid; } -static int +static gint list_eq(GList *al, GList *bl) { gint truth = TRUE; @@ -206,7 +206,7 @@ list_eq(GList *al, GList *bl) return truth && al == NULL && bl == NULL; } -static int +static gint filter_eq(FilterRule *fr, FilterRule *cm) { return FILTER_RULE_CLASS(parent_class)->eq(fr, cm) @@ -262,7 +262,7 @@ load_set(xmlNodePtr node, EMFilterRule *ff, RuleContext *rc) } } -static int +static gint xml_decode(FilterRule *fr, xmlNodePtr node, RuleContext *rc) { EMFilterRule *ff =(EMFilterRule *)fr; diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index 126cbe2a50..1fd5a518ad 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -151,7 +151,7 @@ em_filter_source_element_new(void) return (EMFilterSourceElement *)g_object_new(em_filter_source_element_get_type(), NULL, NULL); } -static int +static gint source_eq(FilterElement *fe, FilterElement *cm) { EMFilterSourceElement *fs = (EMFilterSourceElement *)fe, *cs = (EMFilterSourceElement *)cm; diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 50add07fb7..085521febd 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -1105,7 +1105,7 @@ static MailMsgInfo vfolder_setup_info = { }; /* sources_uri should be camel uri's */ -static int +static gint vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList *sources_folder, CamelOperation *cancel) { struct _setup_msg *m; @@ -1140,8 +1140,8 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) CamelFolder *folder; CamelStore *store; GPtrArray *folders; - GList *folder_list_account = NULL ; - GList *l, *folder_list = NULL ; + GList *folder_list_account = NULL; + GList *l, *folder_list = NULL; CamelException *ex; ex = camel_exception_new (); @@ -1336,7 +1336,7 @@ emfb_search_search_cleared(ESearchBar *esb) /* ********************************************************************** */ -static int +static gint emfb_list_key_press(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *ev, EMFolderBrowser *emfb) { gboolean state, folder_choose = TRUE; @@ -2224,7 +2224,7 @@ emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint act) bonobo_ui_component_add_listener(uic, "ViewPreview", emfb_view_preview, emfv); /* Stop button */ - state = mail_msg_active((unsigned int)-1); + state = mail_msg_active((guint)-1); bonobo_ui_component_set_prop(uic, "/commands/MailStop", "sensitive", state?"1":"0", NULL); /* HideDeleted */ diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index db8bff5315..429b409b54 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -126,7 +126,7 @@ emfp_free(EConfig *ec, GSList *items, gpointer data) g_free (prop_data); } -static int +static gint add_numbered_row (GtkTable *table, gint row, const gchar *description, const gchar *format, gint num) { gchar *str; @@ -197,7 +197,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, else descr = g_strdup_printf (_("Quota usage")); - procs = (int) ((((double) info->used) / ((double) info->total)) * 100.0 + 0.5); + procs = (gint) ((((double) info->used) / ((double) info->total)) * 100.0 + 0.5); row = add_numbered_row (GTK_TABLE (table), row, descr, "%d%%", procs); diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index f04cf03720..89a0e77b66 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -173,7 +173,7 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *klass) G_TYPE_STRING); } -static int +static gint sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data) { gchar *aname, *bname; diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 182a40df36..d765c2de7b 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -580,7 +580,7 @@ emft_expand_node (EMFolderTreeModel *model, const gchar *key, EMFolderTree *emft CamelStore *store; const gchar *p; gchar *uid; - size_t n; + gsize n; struct _selected_uri *u; if (!(p = strchr (key, '/'))) @@ -1340,7 +1340,7 @@ tree_autoscroll (EMFolderTree *emft) GdkRectangle rect; GdkWindow *window; gint offset, y; - float value; + gfloat value; /* get the y pointer position relative to the treeview */ window = gtk_tree_view_get_bin_window (priv->treeview); @@ -2256,7 +2256,7 @@ emft_tree_button_press (GtkTreeView *treeview, GdkEventButton *event, EMFolderTr if (event->button != 3 && !(event->button == 1 && event->type == GDK_2BUTTON_PRESS)) return FALSE; - if (!gtk_tree_view_get_path_at_pos (treeview, (int) event->x, (int) event->y, &tree_path, NULL, NULL, NULL)) + if (!gtk_tree_view_get_path_at_pos (treeview, (gint) event->x, (gint) event->y, &tree_path, NULL, NULL, NULL)) return FALSE; /* select/focus the row that was right-clicked or double-clicked */ diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index b9fda4f9b0..f5378684b0 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -434,7 +434,7 @@ em_folder_utils_rename_folder (CamelFolder *folder) const gchar *p; CamelStore *local; gboolean done = FALSE; - size_t base_len; + gsize base_len; local = mail_component_peek_local_store (NULL); @@ -446,7 +446,7 @@ em_folder_utils_rename_folder (CamelFolder *folder) } if ((p = strrchr (folder->full_name, '/'))) - base_len = (size_t) (p - folder->full_name); + base_len = (gsize) (p - folder->full_name); else base_len = 0; @@ -574,7 +574,7 @@ static MailMsgInfo create_folder_info = { }; -static int +static gint emfu_create_folder_real (CamelStore *store, const gchar *full_name, void (* done) (CamelFolderInfo *fi, gpointer user_data), gpointer user_data) { gchar *name, *namebuf = NULL; diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 4a23dceb03..466dc34a63 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -2425,7 +2425,7 @@ mst_free (struct mst_t *mst) g_free (mst); } -static int +static gint do_mark_seen (gpointer user_data) { struct mst_t *mst = user_data; @@ -2614,7 +2614,7 @@ emfv_list_double_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent em_folder_view_open_selected(emfv); } -static int +static gint emfv_list_right_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, EMFolderView *emfv) { emfv_popup(emfv, event, FALSE); @@ -2622,7 +2622,7 @@ emfv_list_right_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent return TRUE; } -static int +static gint emfv_list_key_press(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *ev, EMFolderView *emfv) { GPtrArray *uids; @@ -2807,7 +2807,7 @@ emfv_append_menu (EMPopup *des_emp, GtkMenu *des_menu, EMPopup *src_emp, GtkMenu return des_menu; } -static int +static gint emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const gchar *uri, CamelMimePart *part, EMFolderView *emfv) { GtkMenu *menu = NULL; diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c index ad7cbd7144..61cc515684 100644 --- a/mail/em-format-hook.c +++ b/mail/em-format-hook.c @@ -157,7 +157,7 @@ error: return NULL; } -static int +static gint emfh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) { xmlNodePtr node; diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 28e67f0f18..3a75bfb59a 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -481,7 +481,7 @@ efhd_get_uri_puri (GtkWidget *html, GdkEventButton *event, EMFormatHTMLDisplay * g_free (img_url); } -static int +static gint efhd_html_button_press_event (GtkWidget *widget, GdkEventButton *event, EMFormatHTMLDisplay *efhd) { gchar *uri = NULL; diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 9a2c6a184b..c62bd3e569 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -358,7 +358,7 @@ em_format_html_file_part(EMFormatHTML *efh, const gchar *mime_type, const gchar /* all this api is a pain in the bum ... */ EMFormatHTMLPObject * -em_format_html_add_pobject(EMFormatHTML *efh, size_t size, const gchar *classid, CamelMimePart *part, EMFormatHTMLPObjectFunc func) +em_format_html_add_pobject(EMFormatHTML *efh, gsize size, const gchar *classid, CamelMimePart *part, EMFormatHTMLPObjectFunc func) { EMFormatHTMLPObject *pobj; @@ -468,7 +468,7 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, gint cancelled) CamelURL *url; CamelContentType *content_type; CamelHttpStream *tmp_stream; - ssize_t n, total = 0, pc_complete = 0, nread = 0; + gssize n, total = 0, pc_complete = 0, nread = 0; gchar buffer[1500]; const gchar *length; @@ -994,7 +994,7 @@ efh_message_external(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part s = d = url; while (*s) { /* FIXME: use camel_isspace */ - if (!isspace ((unsigned char)*s)) + if (!isspace ((guchar)*s)) *d++ = *s; s++; } diff --git a/mail/em-format-html.h b/mail/em-format-html.h index 776a5fb9c9..81a6811de5 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -247,7 +247,7 @@ CamelMimePart * em_format_html_file_part (EMFormatHTML *efh, /* for implementers */ EMFormatHTMLPObject * em_format_html_add_pobject (EMFormatHTML *efh, - size_t size, + gsize size, const gchar *classid, CamelMimePart *part, EMFormatHTMLPObjectFunc func); diff --git a/mail/em-format.c b/mail/em-format.c index ed7d48ea06..99c71ec1e6 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -324,7 +324,7 @@ em_format_fallback_handler(EMFormat *emf, const gchar *mime_type) if (s == NULL) mime = (gchar *)mime_type; else { - size_t len = (s-mime_type)+1; + gsize len = (s-mime_type)+1; mime = alloca(len+2); strncpy(mime, mime_type, len); @@ -359,7 +359,7 @@ em_format_fallback_handler(EMFormat *emf, const gchar *mime_type) * are resolved by forgetting the old PURI in the global index. **/ EMFormatPURI * -em_format_add_puri(EMFormat *emf, size_t size, const gchar *cid, CamelMimePart *part, EMFormatPURIFunc func) +em_format_add_puri(EMFormat *emf, gsize size, const gchar *cid, CamelMimePart *part, EMFormatPURIFunc func) { EMFormatPURI *puri; const gchar *tmp; @@ -1121,8 +1121,8 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw) const gchar *charset = NULL; CamelMimeFilterWindows *windows = NULL; CamelStream *mem_stream = NULL; - size_t size; - size_t max; + gsize size; + gsize max; if (emf->charset) { charset = emf->charset; diff --git a/mail/em-format.h b/mail/em-format.h index 3602e5b75e..35569a4bc4 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -316,7 +316,7 @@ void em_format_class_remove_handler(EMFormatClass *emfc, EMFormatHandler *info); const EMFormatHandler *em_format_fallback_handler(EMFormat *emf, const gchar *mime_type); /* puri is short for pending uri ... really */ -EMFormatPURI *em_format_add_puri(EMFormat *emf, size_t size, const gchar *uri, CamelMimePart *part, EMFormatPURIFunc func); +EMFormatPURI *em_format_add_puri(EMFormat *emf, gsize size, const gchar *uri, CamelMimePart *part, EMFormatPURIFunc func); EMFormatPURI *em_format_find_visible_puri(EMFormat *emf, const gchar *uri); EMFormatPURI *em_format_find_puri(EMFormat *emf, const gchar *uri); void em_format_clear_puri_tree(EMFormat *emf); diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c index a3284ab33e..501a2b7bad 100644 --- a/mail/em-html-stream.c +++ b/mail/em-html-stream.c @@ -38,7 +38,7 @@ static void em_html_stream_class_init (EMHTMLStreamClass *klass); static void em_html_stream_init (CamelObject *object); static void em_html_stream_finalize (CamelObject *object); -static ssize_t emhs_sync_write(CamelStream *stream, const gchar *buffer, size_t n); +static gssize emhs_sync_write(CamelStream *stream, const gchar *buffer, gsize n); static gint emhs_sync_close(CamelStream *stream); static gint emhs_sync_flush(CamelStream *stream); @@ -103,8 +103,8 @@ em_html_stream_finalize (CamelObject *object) } } -static ssize_t -emhs_sync_write(CamelStream *stream, const gchar *buffer, size_t n) +static gssize +emhs_sync_write(CamelStream *stream, const gchar *buffer, gsize n) { EMHTMLStream *emhs = EM_HTML_STREAM (stream); @@ -116,10 +116,10 @@ emhs_sync_write(CamelStream *stream, const gchar *buffer, size_t n) gtk_html_stream_write(emhs->html_stream, buffer, n); - return (ssize_t) n; + return (gssize) n; } -static int +static gint emhs_sync_flush(CamelStream *stream) { EMHTMLStream *emhs = (EMHTMLStream *)stream; @@ -132,7 +132,7 @@ emhs_sync_flush(CamelStream *stream) return 0; } -static int +static gint emhs_sync_close(CamelStream *stream) { EMHTMLStream *emhs = (EMHTMLStream *)stream; diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c index 91dc5e10ca..384d79846f 100644 --- a/mail/em-icon-stream.c +++ b/mail/em-icon-stream.c @@ -50,7 +50,7 @@ static void em_icon_stream_class_init (EMIconStreamClass *klass); static void em_icon_stream_init (CamelObject *object); static void em_icon_stream_finalize (CamelObject *object); -static ssize_t emis_sync_write(CamelStream *stream, const gchar *buffer, size_t n); +static gssize emis_sync_write(CamelStream *stream, const gchar *buffer, gsize n); static gint emis_sync_close(CamelStream *stream); static gint emis_sync_flush(CamelStream *stream); @@ -132,8 +132,8 @@ em_icon_stream_finalize(CamelObject *object) emis_cleanup(emis); } -static ssize_t -emis_sync_write(CamelStream *stream, const gchar *buffer, size_t n) +static gssize +emis_sync_write(CamelStream *stream, const gchar *buffer, gsize n) { EMIconStream *emis = EM_ICON_STREAM (stream); @@ -145,10 +145,10 @@ emis_sync_write(CamelStream *stream, const gchar *buffer, size_t n) return -1; } - return (ssize_t) n; + return (gssize) n; } -static int +static gint emis_sync_flush(CamelStream *stream) { return 0; @@ -190,7 +190,7 @@ emis_fit(GdkPixbuf *pixbuf, gint maxwidth, gint maxheight, gint *scale) return mini; } -static int +static gint emis_sync_close(CamelStream *stream) { EMIconStream *emis = (EMIconStream *)stream; diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index bdacda912e..71d16e98f7 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -39,8 +39,8 @@ static void em_inline_filter_class_init (EMInlineFilterClass *klass); static void em_inline_filter_init (CamelObject *object); static void em_inline_filter_finalize (CamelObject *object); -static void emif_filter(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace); -static void emif_complete(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace); +static void emif_filter(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace); +static void emif_complete(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace); static void emif_reset(CamelMimeFilter *f); static CamelMimeFilterClass *parent_class = NULL; @@ -190,8 +190,8 @@ emif_add_part(EMInlineFilter *emif, const gchar *data, gint len) emif->parts = g_slist_append(emif->parts, part); } -static int -emif_scan(CamelMimeFilter *f, gchar *in, size_t len, gint final) +static gint +emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final) { EMInlineFilter *emif = (EMInlineFilter *)f; gchar *inptr = in, *inend = in+len; @@ -337,7 +337,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, size_t len, gint final) } static void -emif_filter(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace) +emif_filter(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace) { emif_scan(f, in, len, FALSE); @@ -347,7 +347,7 @@ emif_filter(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar ** } static void -emif_complete(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace) +emif_complete(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace) { emif_scan(f, in, len, TRUE); diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c index a0a2a205ce..d032823bed 100644 --- a/mail/em-junk-hook.c +++ b/mail/em-junk-hook.c @@ -267,7 +267,7 @@ error: return NULL; } -static int +static gint emjh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) { xmlNodePtr node; diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index ac6f3db5d9..12b2996b70 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -730,7 +730,7 @@ mark_seen_timeout_changed (GtkSpinButton *spin, EMMailerPrefs *prefs) { gint timeout; - timeout = (int) (gtk_spin_button_get_value (prefs->timeout) * 1000.0); + timeout = (gint) (gtk_spin_button_get_value (prefs->timeout) * 1000.0); gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/mark_seen_timeout", timeout, NULL); } @@ -739,7 +739,7 @@ address_compress_count_changed (GtkSpinButton *spin, EMMailerPrefs *prefs) { gint count; - count = (int) gtk_spin_button_get_value (prefs->address_count); + count = (gint) gtk_spin_button_get_value (prefs->address_count); gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/address_count", count, NULL); } @@ -749,13 +749,13 @@ mlimit_count_changed (GtkSpinButton *spin, EMMailerPrefs *prefs) { gint count; - count = (int) gtk_spin_button_get_value (prefs->mlimit_count); + count = (gint) gtk_spin_button_get_value (prefs->mlimit_count); gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/message_text_part_limit", count, NULL); } static void -spin_button_init (EMMailerPrefs *prefs, GtkSpinButton *spin, const gchar *key, float div, GCallback value_changed) +spin_button_init (EMMailerPrefs *prefs, GtkSpinButton *spin, const gchar *key, gfloat div, GCallback value_changed) { GError *err = NULL; double min, max; diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c index 9299f3754f..fec31575b7 100644 --- a/mail/em-message-browser.c +++ b/mail/em-message-browser.c @@ -195,7 +195,7 @@ emmb_window_size_allocate (GtkWidget *widget, g_object_unref (client); } -static int +static gint emmb_key_press_event_cb (EMMessageBrowser *emmb, GdkEventKey *event) { diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 3d32783298..1428013891 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -101,7 +101,7 @@ emm_load_xml (const gchar *dirname, const gchar *filename) return doc; } -static int +static gint emm_save_xml (xmlDocPtr doc, const gchar *dirname, const gchar *filename) { gchar *path; @@ -380,7 +380,7 @@ parse_lsub (const gchar *lsub, gchar *dir_sep) return NULL; } -static int +static gint read_imap_storeinfo (struct _account_info_1_0 *si) { FILE *storeinfo; @@ -476,7 +476,7 @@ read_imap_storeinfo (struct _account_info_1_0 *si) return 0; } -static int +static gint load_accounts_1_0 (xmlDocPtr doc) { xmlNodePtr source; @@ -539,7 +539,7 @@ load_accounts_1_0 (xmlDocPtr doc) return 0; } -static int +static gint em_migrate_1_0 (const gchar *evolution_dir, xmlDocPtr config_xmldb, xmlDocPtr filters, xmlDocPtr vfolders, CamelException *ex) { accounts_1_0 = g_hash_table_new_full ( @@ -559,7 +559,7 @@ em_migrate_1_0 (const gchar *evolution_dir, xmlDocPtr config_xmldb, xmlDocPtr fi } /* 1.2 upgrade functions */ -static int +static gint is_xml1encoded (const gchar *txt) { const guchar *p; @@ -653,7 +653,7 @@ utf8_reencode (const gchar *txt) } } -static int +static gint upgrade_xml_1_2_rec (xmlNodePtr node) { const gchar *value_tags[] = { "string", "address", "regex", "file", "command", NULL }; @@ -721,7 +721,7 @@ upgrade_xml_1_2_rec (xmlNodePtr node) return 0; } -static int +static gint em_upgrade_xml_1_2 (xmlDocPtr doc) { xmlNodePtr root; @@ -963,7 +963,7 @@ static struct { }; /* remaps mail config from bconf to gconf */ -static int +static gint bconf_import(GConfClient *gconf, xmlDocPtr config_xmldb) { xmlNodePtr source; @@ -1017,7 +1017,7 @@ bconf_import(GConfClient *gconf, xmlDocPtr config_xmldb) return 0; } -static int +static gint em_migrate_1_2(const gchar *evolution_dir, xmlDocPtr config_xmldb, xmlDocPtr filters, xmlDocPtr vfolders, CamelException *ex) { GConfClient *gconf; @@ -1180,7 +1180,7 @@ em_migrate_set_progress (double percent) { gchar text[5]; - snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f)); + snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f)); gtk_progress_bar_set_fraction (progress, percent); gtk_progress_bar_set_text (progress, text); @@ -1239,7 +1239,7 @@ is_mail_folder (const gchar *metadata) return FALSE; } -static int +static gint get_local_et_expanded (const gchar *dirname) { xmlNodePtr node; @@ -1357,13 +1357,13 @@ static gint open_flags[3] = { O_WRONLY | O_CREAT | O_APPEND, }; -static int +static gint cp (const gchar *src, const gchar *dest, gboolean show_progress, gint mode) { guchar readbuf[65536]; - ssize_t nread, nwritten; + gssize nread, nwritten; gint errnosav, readfd, writefd; - size_t total = 0; + gsize total = 0; struct stat st; struct utimbuf ut; @@ -1439,12 +1439,12 @@ cp (const gchar *src, const gchar *dest, gboolean show_progress, gint mode) #ifndef G_OS_WIN32 -static int +static gint cp_r (const gchar *src, const gchar *dest, const gchar *pattern, gint mode) { GString *srcpath, *destpath; struct dirent *dent; - size_t slen, dlen; + gsize slen, dlen; struct stat st; DIR *dir; @@ -1524,7 +1524,7 @@ mbox_build_filename (GString *path, const gchar *toplevel_dir, const gchar *full } } -static int +static gint em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar *full_name, CamelException *ex) { CamelFolder *old_folder = NULL, *new_folder = NULL; @@ -1556,7 +1556,7 @@ em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar * /* Manually copy local mbox files, its much faster */ if (!strncmp (uri, "mbox:", 5)) { static const gchar *meta_ext[] = { ".summary", ".ibex.index", ".ibex.index.data" }; - size_t slen, dlen; + gsize slen, dlen; FILE *fp; gchar *p; gint mode; @@ -1722,7 +1722,7 @@ fatal: return res; } -static int +static gint em_migrate_dir (EMMigrateSession *session, const gchar *dirname, const gchar *full_name, CamelException *ex) { gchar *path; @@ -1772,7 +1772,7 @@ em_migrate_dir (EMMigrateSession *session, const gchar *dirname, const gchar *fu return res; } -static int +static gint em_migrate_local_folders_1_4 (EMMigrateSession *session, CamelException *ex) { struct dirent *dent; @@ -1967,12 +1967,12 @@ em_upgrade_accounts_1_4 (void) mail_config_save_accounts (); } -static int +static gint em_migrate_pop_uid_caches_1_4 (const gchar *evolution_dir, CamelException *ex) { GString *oldpath, *newpath; struct dirent *dent; - size_t olen, nlen; + gsize olen, nlen; gchar *cache_dir; DIR *dir; gint res = 0; @@ -2046,7 +2046,7 @@ em_migrate_pop_uid_caches_1_4 (const gchar *evolution_dir, CamelException *ex) return res; } -static int +static gint em_migrate_imap_caches_1_4 (const gchar *evolution_dir, CamelException *ex) { gchar *src, *dest; @@ -2069,11 +2069,11 @@ em_migrate_imap_caches_1_4 (const gchar *evolution_dir, CamelException *ex) return 0; } -static int +static gint em_migrate_folder_expand_state_1_4 (const gchar *evolution_dir, CamelException *ex) { GString *srcpath, *destpath; - size_t slen, dlen, rlen; + gsize slen, dlen, rlen; gchar *evo14_mbox_root; struct dirent *dent; struct stat st; @@ -2167,11 +2167,11 @@ em_migrate_folder_expand_state_1_4 (const gchar *evolution_dir, CamelException * return 0; } -static int +static gint em_migrate_folder_view_settings_1_4 (const gchar *evolution_dir, CamelException *ex) { GString *srcpath, *destpath; - size_t slen, dlen, rlen; + gsize slen, dlen, rlen; gchar *evo14_mbox_root; struct dirent *dent; struct stat st; @@ -2207,7 +2207,7 @@ em_migrate_folder_view_settings_1_4 (const gchar *evolution_dir, CamelException while ((dent = readdir (dir))) { gchar *full_name, *inptr, *buf = NULL; const gchar *filename, *ext; - size_t prelen = 0; + gsize prelen = 0; GString *new; if (dent->d_name[0] == '.') @@ -2367,7 +2367,7 @@ e_path_to_physical (const gchar *prefix, const gchar *vpath) return ppath; } -static int +static gint em_migrate_imap_cmeta_1_4(const gchar *evolution_dir, CamelException *ex) { GConfClient *gconf; @@ -2480,7 +2480,7 @@ remove_system_searches(xmlDocPtr searches) } } -static int +static gint em_migrate_1_4 (const gchar *evolution_dir, xmlDocPtr filters, xmlDocPtr vfolders, CamelException *ex) { EMMigrateSession *session; @@ -2600,7 +2600,7 @@ em_update_accounts_2_11 (void) #endif /* !G_OS_WIN32 */ -static int +static gint emm_setup_initial(const gchar *evolution_dir) { GDir *dir; diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c index 1b977e975f..65400027ff 100644 --- a/mail/em-stripsig-filter.c +++ b/mail/em-stripsig-filter.c @@ -34,10 +34,10 @@ static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass); static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass); -static void filter_filter (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace); -static void filter_complete (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace); +static void filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace); +static void filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace); static void filter_reset (CamelMimeFilter *filter); @@ -83,8 +83,8 @@ em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass) } static void -strip_signature (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace, gint flush) +strip_signature (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace, gint flush) { EMStripSigFilter *stripsig = (EMStripSigFilter *) filter; register const gchar *inptr = in; @@ -132,15 +132,15 @@ strip_signature (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace } static void -filter_filter (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace) +filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace) { strip_signature (filter, in, len, prespace, out, outlen, outprespace, FALSE); } static void -filter_complete (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace) +filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace) { strip_signature (filter, in, len, prespace, out, outlen, outprespace, TRUE); } diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 95714a948b..eaac3b4d71 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -245,7 +245,7 @@ static MailMsgInfo sub_subscribe_folder_info = { }; /* spath is tree path in string form */ -static int +static gint sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, gint state, const gchar *spath) { struct _zsubscribe_msg *m; @@ -420,7 +420,7 @@ static MailMsgInfo sub_folderinfo_info = { (MailMsgFreeFunc) sub_folderinfo_free }; -static int +static gint sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node) { struct _emse_folderinfo_msg *m; diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c index 138932cfc7..7e93b33dde 100644 --- a/mail/em-sync-stream.c +++ b/mail/em-sync-stream.c @@ -138,7 +138,7 @@ emss_stream_write (CamelStream *stream, const gchar *string, gsize len) return (gssize) len; } -static int +static gint emss_stream_flush (CamelStream *stream) { EMSyncStream *emss = EM_SYNC_STREAM (stream); @@ -154,7 +154,7 @@ emss_stream_flush (CamelStream *stream) return 0; } -static int +static gint emss_stream_close (CamelStream *stream) { EMSyncStream *emss = EM_SYNC_STREAM (stream); diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h index fc687fa462..16cdc272d1 100644 --- a/mail/em-sync-stream.h +++ b/mail/em-sync-stream.h @@ -61,8 +61,8 @@ struct _EMSyncStreamClass { gssize (*sync_write) (CamelStream *stream, const gchar *string, gsize len); - int (*sync_close) (CamelStream *stream); - int (*sync_flush) (CamelStream *stream); + gint (*sync_close) (CamelStream *stream); + gint (*sync_flush) (CamelStream *stream); }; CamelType em_sync_stream_get_type (void); diff --git a/mail/em-utils.c b/mail/em-utils.c index 7204d761c3..207c96718a 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -472,7 +472,7 @@ get_unique_file_names (GSList *parts) /* if we have an extension, then place number before it (at p is ".ext"), otherwise just append number in brackets */ if (p) - new_name = g_strdup_printf ("%.*s(%d)%s", (int) (p - name), name, counter, p); + new_name = g_strdup_printf ("%.*s(%d)%s", (gint) (p - name), name, counter, p); else new_name = g_strdup_printf ("%s(%d)", name, counter); @@ -953,7 +953,7 @@ em_utils_flag_for_followup_completed (GtkWidget *parent, CamelFolder *folder, GP /* This kind of sucks, because for various reasons most callers need to run synchronously in the gui thread, however this could take a long, blocking time, to run */ -static int +static gint em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStream *stream) { CamelStreamFilter *filtered_stream; @@ -998,7 +998,7 @@ em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStr /* This kind of sucks, because for various reasons most callers need to run synchronously in the gui thread, however this could take a long, blocking time, to run */ -static int +static gint em_utils_read_messages_from_stream(CamelFolder *folder, CamelStream *stream) { CamelException *ex = camel_exception_new(); @@ -1533,7 +1533,7 @@ em_utils_folder_is_outbox(CamelFolder *folder, const gchar *uri) void em_utils_adjustment_page(GtkAdjustment *adj, gboolean down) { - float page_size = adj->page_size - adj->step_increment; + gfloat page_size = adj->page_size - adj->step_increment; if (down) { if (adj->value < adj->upper - adj->page_size - page_size) @@ -1606,7 +1606,7 @@ em_utils_get_proxy_uri (const gchar *pUri) * Return Value: The part in displayable html format. **/ gchar * -em_utils_part_to_html(CamelMimePart *part, ssize_t *len, EMFormat *source) +em_utils_part_to_html(CamelMimePart *part, gssize *len, EMFormat *source) { EMFormatQuote *emfq; CamelStreamMem *mem; @@ -1656,7 +1656,7 @@ em_utils_part_to_html(CamelMimePart *part, ssize_t *len, EMFormat *source) * Return value: The html version. **/ gchar * -em_utils_message_to_html(CamelMimeMessage *message, const gchar *credits, guint32 flags, ssize_t *len, EMFormat *source, const gchar *append) +em_utils_message_to_html(CamelMimeMessage *message, const gchar *credits, guint32 flags, gssize *len, EMFormat *source, const gchar *append) { EMFormatQuote *emfq; CamelStreamMem *mem; diff --git a/mail/em-utils.h b/mail/em-utils.h index 76674bea11..19a0da6788 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -91,8 +91,8 @@ void em_utils_adjustment_page(struct _GtkAdjustment *adj, gboolean down); gchar *em_utils_get_proxy_uri (const gchar *uri); /* FIXME: should this have an override charset? */ -gchar *em_utils_part_to_html(struct _CamelMimePart *part, ssize_t *len, struct _EMFormat *source); -gchar *em_utils_message_to_html(struct _CamelMimeMessage *msg, const gchar *credits, guint32 flags, ssize_t *len, struct _EMFormat *source, const gchar *append); +gchar *em_utils_part_to_html(struct _CamelMimePart *part, gssize *len, struct _EMFormat *source); +gchar *em_utils_message_to_html(struct _CamelMimeMessage *msg, const gchar *credits, guint32 flags, gssize *len, struct _EMFormat *source, const gchar *append); void em_utils_expunge_folder (struct _GtkWidget *parent, struct _CamelFolder *folder); void em_utils_empty_trash (struct _GtkWidget *parent); diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index d3090a672d..dea8b3ab7c 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -206,7 +206,7 @@ em_vfolder_rule_next_source(EMVFolderRule *vr, const gchar *last) return NULL; } -static int +static gint validate(FilterRule *fr) { g_return_val_if_fail(fr != NULL, 0); @@ -228,7 +228,7 @@ validate(FilterRule *fr) return FILTER_RULE_CLASS(parent_class)->validate(fr); } -static int +static gint list_eq(GList *al, GList *bl) { gint truth = TRUE; @@ -244,7 +244,7 @@ list_eq(GList *al, GList *bl) return truth && al == NULL && bl == NULL; } -static int +static gint vfolder_eq(FilterRule *fr, FilterRule *cm) { return FILTER_RULE_CLASS(parent_class)->eq(fr, cm) @@ -291,7 +291,7 @@ set_with(EMVFolderRule *vr, const gchar *name) vr->with = 0; } -static int +static gint xml_decode(FilterRule *fr, xmlNodePtr node, struct _RuleContext *f) { xmlNodePtr set, work; diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 6e65418441..1c28e2d82d 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -281,7 +281,7 @@ static MailMsgInfo elm_import_info = { (MailMsgFreeFunc) elm_import_free }; -static int +static gint mail_importer_elm_import(EImport *ei, EImportTarget *target) { struct _elm_import_msg *m; diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index ab5cf18e9b..daecfaee53 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -237,7 +237,7 @@ import_mbox_exec (struct _import_mbox_msg *m) guint32 flags = 0; if (st.st_size > 0) - pc = (int)(100.0 * ((double)camel_mime_parser_tell(mp) / (double)st.st_size)); + pc = (gint)(100.0 * ((double)camel_mime_parser_tell(mp) / (double)st.st_size)); camel_operation_progress(NULL, pc); msg = camel_mime_message_new(); diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index 0c5b5fd92e..84c29b24c5 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -109,7 +109,7 @@ import_contact(EBook *book, gchar *line) GList *list; /*EContactName *name;*/ EContact *card; - size_t len; + gsize len; card = e_contact_new(); strings = g_strsplit(line, "\t", 5); @@ -168,7 +168,7 @@ import_contacts(void) gchar *name; GString *line; FILE *fp; - size_t offset; + gsize offset; printf("importing pine addressbook\n"); @@ -197,7 +197,7 @@ import_contacts(void) g_string_set_size(line, 256); offset = 0; while (fgets(line->str+offset, 256, fp)) { - size_t len; + gsize len; len = strlen(line->str+offset)+offset; if (line->str[len-1] == '\n') @@ -324,7 +324,7 @@ static MailMsgInfo pine_import_info = { (MailMsgFreeFunc) pine_import_free }; -static int +static gint mail_importer_pine_import(EImport *ei, EImportTarget *target) { struct _pine_import_msg *m; diff --git a/mail/mail-component.c b/mail/mail-component.c index bda9e7ea18..8d72fb590c 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -414,7 +414,7 @@ folder_selected_cb (EMFolderTree *emft, const gchar *path, const gchar *uri, gui } } -static int +static gint check_autosave(gpointer data) { e_msg_composer_check_autosave(NULL); @@ -622,7 +622,7 @@ view_changed_timeout_remove (EComponentView *component_view) } } -static int +static gint view_changed_timeout(gpointer d) { EComponentView *component_view = d; @@ -905,7 +905,7 @@ impl_quit(PortableServer_Servant servant, CORBA_Environment *ev) /* Falls through */ case MC_QUIT_THREADS: /* should we keep cancelling? */ - if (mail_msg_active((unsigned int)-1)) + if (mail_msg_active((guint)-1)) return FALSE; mail_session_shutdown (); @@ -945,7 +945,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment return list; } -static int +static gint create_item(const gchar *type, EMFolderTreeModel *model, const gchar *uri, gpointer tree) { if (strcmp(type, "message") == 0) { diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index a6c4b800ad..6ab9187e49 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -684,7 +684,7 @@ get_folders(CamelFolderInfo *fi, GPtrArray *folders) } } -static int +static gint folder_cmp(gconstpointer ap, gconstpointer bp) { const CamelFolderInfo *a = ((CamelFolderInfo **)ap)[0]; diff --git a/mail/mail-mt.c b/mail/mail-mt.c index f820f78a76..bc94d4538f 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -382,7 +382,7 @@ gint mail_msg_active(guint msgid) gint active; MAIL_MT_LOCK(mail_msg_lock); - if (msgid == (unsigned int)-1) + if (msgid == (guint)-1) active = g_hash_table_size(mail_msg_active_table) > 0; else active = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)) != NULL; @@ -686,7 +686,7 @@ do_async_event(struct _proxy_msg *m) g_mutex_unlock(m->ea->lock); } -static int +static gint idle_async_event(gpointer mm) { do_async_event(mm); @@ -829,7 +829,7 @@ do_call(struct _call_msg *m) case MAIL_CALL_p_ppippp: p1 = va_arg(ap, gpointer ); p2 = va_arg(ap, gpointer ); - i1 = va_arg(ap, int); + i1 = va_arg(ap, gint); p3 = va_arg(ap, gpointer ); p4 = va_arg(ap, gpointer ); p5 = va_arg(ap, gpointer ); diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index b26203c6da..f20d71f84e 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -93,7 +93,7 @@ typedef enum { SEND_SEND, /* sender */ SEND_UPDATE, /* imap-like 'just update folder info' */ SEND_INVALID -} send_info_t ; +} send_info_t; typedef enum { SEND_ACTIVE, @@ -254,7 +254,7 @@ dialog_response(GtkDialog *gd, gint button, struct _send_data *data) } } -static int +static gint operation_status_timeout(gpointer data) { struct _send_info *info = data; diff --git a/mail/mail-tools.c b/mail/mail-tools.c index 33c47462f9..d83aace1ea 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -112,7 +112,7 @@ mail_tool_get_local_movemail_path (const guchar *uri, CamelException *ex) safe_uri = (guchar *)g_strdup ((const gchar *)uri); for (c = safe_uri; *c; c++) - if (strchr("/:;=|%&#!*^()\\, ", *c) || !isprint((int) *c)) + if (strchr("/:;=|%&#!*^()\\, ", *c) || !isprint((gint) *c)) *c = '_'; path = g_strdup_printf("%s/spool", mail_component_peek_base_directory(NULL)); diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index de79eaa694..ac18f2deb7 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -169,7 +169,7 @@ static MailMsgInfo vfolder_setup_info = { }; /* sources_uri should be camel uri's */ -static int +static gint vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList *sources_folder) { struct _setup_msg *m; @@ -300,7 +300,7 @@ static MailMsgInfo vfolder_adduri_info = { /* uri should be a camel uri */ -static int +static gint vfolder_adduri(const gchar *uri, GList *folders, gint remove) { struct _adduri_msg *m; @@ -331,7 +331,7 @@ mv_find_folder(GList *l, CamelStore *store, const gchar *uri) } /* uri is a camel uri */ -static int +static gint uri_is_ignore(CamelStore *store, const gchar *uri) { EAccountList *accounts; @@ -384,7 +384,7 @@ uri_is_ignore(CamelStore *store, const gchar *uri) } /* so special we never use it */ -static int +static gint uri_is_spethal(CamelStore *store, const gchar *uri) { CamelURL *url; diff --git a/mail/message-list.c b/mail/message-list.c index bfa51250df..2d5b34a270 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -283,7 +283,7 @@ e_mail_address_free (EMailAddress *addr) /* Note: by the time this function is called, the strings have already been normalised which means we can assume all lowercase chars and we can just use strcmp for the final comparison. */ -static int +static gint e_mail_address_compare (gconstpointer address1, gconstpointer address2) { const EMailAddress *addr1 = address1; @@ -345,7 +345,7 @@ e_mail_address_compare (gconstpointer address1, gconstpointer address2) /* Note: by the time this function is called, the strings have already been normalised which means we can assume all lowercase chars and we can just use strcmp for the final comparison. */ -static int +static gint address_compare (gconstpointer address1, gconstpointer address2) { #ifdef SMART_ADDRESS_COMPARE @@ -465,12 +465,12 @@ get_normalised_string (MessageList *message_list, CamelMessageInfo *info, gint c subject += 3; /* jump over any spaces */ - while (*subject && isspace ((int) *subject)) + while (*subject && isspace ((gint) *subject)) subject++; } /* jump over any spaces */ - while (*subject && isspace ((int) *subject)) + while (*subject && isspace ((gint) *subject)) subject++; string = (const gchar *) subject; @@ -851,7 +851,7 @@ message_list_paste(MessageList *ml) /* * SimpleTableModel::col_count */ -static int +static gint ml_column_count (ETreeModel *etm, gpointer data) { return COL_LAST; @@ -1126,7 +1126,7 @@ ml_tree_icon_at (ETreeModel *etm, ETreePath path, gpointer model_data) } /* return true if there are any unread messages in the subtree */ -static int +static gint subtree_unread(MessageList *ml, ETreePath node) { CamelMessageInfo *info; @@ -1221,7 +1221,7 @@ sanitize_recipients (const gchar *string) return g_string_free (recipients, FALSE); } -static int +static gint get_all_labels (CamelMessageInfo *msg_info, gchar **label_str, gboolean get_tags) { GString *str; @@ -1299,7 +1299,7 @@ get_trimmed_subject (CamelMessageInfo *info) subject += 3; /* jump over any spaces */ - while (*subject && isspace ((int) *subject)) + while (*subject && isspace ((gint) *subject)) subject++; } @@ -1311,13 +1311,13 @@ get_trimmed_subject (CamelMessageInfo *info) found_mlist = TRUE; /* jump over any spaces */ - while (*subject && isspace ((int) *subject)) + while (*subject && isspace ((gint) *subject)) subject++; } } while (found_mlist); /* jump over any spaces */ - while (*subject && isspace ((int) *subject)) + while (*subject && isspace ((gint) *subject)) subject++; return subject; @@ -2841,7 +2841,7 @@ build_subtree (MessageList *ml, ETreePath parent, CamelFolderThreadNode *c, gint /* compares a thread tree node with the etable tree node to see if they point to the same object */ -static int +static gint node_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp) { CamelMessageInfo *info; @@ -2856,7 +2856,7 @@ node_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp) #ifndef BROKEN_ETREE /* debug function - compare the two trees to see if they are the same */ -static int +static gint tree_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp) { CamelMessageInfo *info; @@ -2981,7 +2981,7 @@ build_subtree_diff(MessageList *ml, ETreePath parent, ETreePath path, CamelFolde gpointer olduid, oldrow; /* if this is a message row, check/update the row id map */ if (g_hash_table_lookup_extended(ml->uid_rowmap, camel_message_info_uid(bp->message), &olduid, &oldrow)) { - if ((int)oldrow != (*row)) { + if ((gint)oldrow != (*row)) { g_hash_table_insert(ml->uid_rowmap, olduid, (gpointer)(*row)); } } else { @@ -3724,7 +3724,7 @@ message_list_ensure_message (MessageList *ml, const gchar *uid) } /* returns the number of messages displayable *after* expression hiding has taken place */ -unsigned int +guint message_list_length (MessageList *ml) { return ml->hide_unhidden; @@ -3752,7 +3752,7 @@ glib_crapback(gpointer key, gpointer data, gpointer x) } /* returns 0 or 1 depending if there are hidden messages */ -unsigned int +guint message_list_hidden(MessageList *ml) { guint hidden = 0; @@ -3815,7 +3815,7 @@ message_list_hide_uids (MessageList *ml, GPtrArray *uids) uid = e_mempool_strdup (ml->hidden_pool, uids->pdata[i]); g_hash_table_insert (ml->hidden, uid, uid); - for ( ; i < uids->len; i++) { + for (; i < uids->len; i++) { if (g_hash_table_lookup (ml->uid_nodemap, uids->pdata[i])) { uid = e_mempool_strdup (ml->hidden_pool, uids->pdata[i]); g_hash_table_insert (ml->hidden, uid, uid); @@ -4482,7 +4482,7 @@ mail_regen_list (MessageList *ml, const gchar *search, const gchar *hideexpr, Ca } -double +gdouble message_list_get_scrollbar_position (MessageList *ml) { return gtk_range_get_value ((GtkRange *) ((GtkScrolledWindow *) ml)->vscrollbar); diff --git a/mail/message-list.h b/mail/message-list.h index 02bd486920..04a937047a 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -234,7 +234,7 @@ void message_list_ensure_message (MessageList *ml, const gchar *uid); void message_list_save_state (MessageList *ml); -double message_list_get_scrollbar_position (MessageList *ml); +gdouble message_list_get_scrollbar_position (MessageList *ml); void message_list_set_scrollbar_position (MessageList *ml, double pos); #define MESSAGE_LIST_LOCK(m, l) g_mutex_lock(((MessageList *)m)->l) diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index b59154c47e..bf596c17da 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -212,7 +212,7 @@ completed_toggled (GtkToggleButton *button, gpointer user_data) followup->completed_date = 0; } -static int +static gint get_week_start_day (void) { GConfClient *gconf; diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index 76d19a9929..d28f24a8d4 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -90,7 +90,7 @@ replace_at_sign (const gchar *str) res = g_strdup (str); while (at = strchr (res, '@'), at) { - gchar *tmp = g_malloc0 (sizeof (char) * (1 + strlen (res) + 2)); + gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (res) + 2)); strncpy (tmp, res, at - res); strcat (tmp, "%40"); diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c index e43d3b0531..f9f7bd7d40 100644 --- a/plugins/exchange-operations/exchange-calendar.c +++ b/plugins/exchange-operations/exchange-calendar.c @@ -391,7 +391,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target) uri_text = e_source_get_uri (source); if (uri_text && strncmp (uri_text, "exchange", 8)) { g_free (uri_text); - return ; + return; } status = exchange_is_offline (&offline_status); diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index c898f1b4c5..4e10acabdd 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -207,7 +207,7 @@ set_special_mail_folder (ExchangeAccount *account, const gchar *folder_type, return; physical_uri = e_folder_get_physical_uri (folder); - /* remove ; form the uri */ + /* remove; form the uri */ camel_url = camel_url_new (physical_uri, NULL); url_string = camel_url_to_string (camel_url, CAMEL_URL_HIDE_ALL); camel_url_free (camel_url); @@ -311,7 +311,7 @@ add_account_esources (ExchangeAccount *account, !e_source_list_add_group (tasks_source_list, tasks_source_group, -1)) { goto done; } - for ( ; folders != NULL ; folders = g_slist_next (folders)) { + for (; folders != NULL; folders = g_slist_next (folders)) { /* Create source for each folder and add to the group */ folder = folders->data; @@ -537,7 +537,7 @@ remove_account_esource (ExchangeAccount *account, groups = e_source_list_peek_groups (source_list); found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), account->account_name) == 0 @@ -545,7 +545,7 @@ remove_account_esource (ExchangeAccount *account, strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) { sources = e_source_group_peek_sources (group); - for( ; sources != NULL; sources = g_slist_next (sources)) { + for(; sources != NULL; sources = g_slist_next (sources)) { source = E_SOURCE (sources->data); source_uid = e_source_peek_uid (source); @@ -1193,7 +1193,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl groups = e_source_list_peek_groups (c_source_list); - for ( ; groups != NULL; groups = g_slist_next (groups)) { + for (; groups != NULL; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if (!strcmp (e_source_group_peek_name (group), old_name)) { e_source_group_set_name (group, new_name); @@ -1203,7 +1203,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl groups = e_source_list_peek_groups (t_source_list); - for ( ; groups != NULL; groups = g_slist_next (groups)) { + for (; groups != NULL; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if (!strcmp (e_source_group_peek_name (group), old_name)) { e_source_group_set_name (group, new_name); @@ -1213,7 +1213,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl groups = e_source_list_peek_groups (a_source_list); - for ( ; groups != NULL; groups = g_slist_next (groups)) { + for (; groups != NULL; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if (!strcmp (e_source_group_peek_name (group), old_name)) { e_source_group_set_name (group, new_name); @@ -1252,7 +1252,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac sl = e_source_list_new_for_gconf (gc_client, CONF_KEY_CONTACTS); groups = e_source_list_peek_groups (sl); - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), account->account_name) == 0 @@ -1260,7 +1260,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) { GSList *sources = e_source_group_peek_sources (group); - for( ; sources != NULL; sources = g_slist_next (sources)) { + for(; sources != NULL; sources = g_slist_next (sources)) { ESource *source = E_SOURCE (sources->data); const gchar *absolute_uri; @@ -1372,7 +1372,7 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco groups = e_source_list_peek_groups (source_list); found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), account->account_name) == 0 @@ -1380,7 +1380,7 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) { sources = e_source_group_peek_sources (group); - for( ; sources != NULL; sources = g_slist_next (sources)) { + for(; sources != NULL; sources = g_slist_next (sources)) { source = E_SOURCE (sources->data); source_uid = e_source_peek_uid (source); diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c index b4ef8c43ad..5ecc02e0b1 100644 --- a/plugins/exchange-operations/exchange-delegates.c +++ b/plugins/exchange-operations/exchange-delegates.c @@ -472,7 +472,7 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data) -1); } -static int +static gint get_selected_row (GtkWidget *tree_view, GtkTreeIter *iter) { GtkTreeSelection *selection; diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c index 03d7ac7aa9..7113ef8e64 100644 --- a/plugins/exchange-operations/exchange-folder-permission.c +++ b/plugins/exchange-operations/exchange-folder-permission.c @@ -181,7 +181,7 @@ org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *target) if (! g_strrstr (target->uri, "exchange://") || !exchange_account_get_folder (account, fixed_path)) { g_free (fixed_path); - return ; + return; } g_free (fixed_path); diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c index 9537f592a3..87f851a8c8 100644 --- a/plugins/exchange-operations/exchange-mail-send-options.c +++ b/plugins/exchange-operations/exchange-mail-send-options.c @@ -185,8 +185,8 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target) e_msg_composer_set_send_options (composer, TRUE); /*disply the send options dialog*/ if (!dialog) { - g_print ("New dialog\n\n") ; - dialog = exchange_sendoptions_dialog_new () ; + g_print ("New dialog\n\n"); + dialog = exchange_sendoptions_dialog_new (); } exchange_sendoptions_dialog_run (dialog, GTK_WIDGET (composer)); g_signal_connect (dialog, "sod_response", G_CALLBACK (append_to_header), GTK_WIDGET (composer)); diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h index 5de844ba7f..3b4518f5fa 100644 --- a/plugins/exchange-operations/exchange-operations.h +++ b/plugins/exchange-operations/exchange-operations.h @@ -46,7 +46,7 @@ ExchangeConfigListenerStatus exchange_is_offline (gint *mode); gboolean exchange_operations_tokenize_string (gchar **string, gchar *token, gchar delimit, guint maxsize); gboolean exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri); -void exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri, const gchar *ruri, GtkTreeSelection *selection) ; +void exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri, const gchar *ruri, GtkTreeSelection *selection); void exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResult result); diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c index e44056abb8..cc707ab65e 100644 --- a/plugins/exchange-operations/exchange-send-options.c +++ b/plugins/exchange-operations/exchange-send-options.c @@ -87,7 +87,7 @@ static guint signals[LAST_SIGNAL] = {0}; /* exchange_send_options_get_widgets_data(ExchangeSendOptionsDialog *sod) Return Value:This function returns a -1 if an error occurs. In case of error-free operation a 1 is returned. */ -static int +static gint exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod) { ExchangeSendOptionsDialogPrivate *priv; diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h index 8a6d37d947..f41ac85371 100644 --- a/plugins/exchange-operations/exchange-send-options.h +++ b/plugins/exchange-operations/exchange-send-options.h @@ -63,7 +63,7 @@ typedef struct { const gchar *delegate_name; const gchar *delegate_email; const gchar *delegate_address; -} ExchangeSendOptions ; +} ExchangeSendOptions; struct _ExchangeSendOptionsDialog { GObject object; diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 10cfdb4fd6..5d8ae3bfcd 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -228,7 +228,7 @@ async_external_editor (EMsgComposer *composer) g_idle_add ((GSourceFunc) run_error_dialog, "org.gnome.evolution.plugins.external-editor:no-temp-file"); g_idle_add ((GSourceFunc) enable_composer, composer); - return ; + return; } gconf = gconf_client_get_default (); @@ -253,7 +253,7 @@ async_external_editor (EMsgComposer *composer) g_free (filename); g_free (editor_cmd_line); - return ; + return; } g_free (editor_cmd_line); @@ -264,7 +264,7 @@ async_external_editor (EMsgComposer *composer) #endif d(printf ("\n\nsome problem here with external editor\n\n")); g_idle_add ((GSourceFunc) enable_composer, composer); - return ; + return; } else { gchar *buf; @@ -294,7 +294,7 @@ static void launch_editor (GtkAction *action, EMsgComposer *composer) if (editor_running()) { d(printf("not opening editor, because it's still running\n")); - return ; + return; } disable_composer (composer); diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index 93b4ee9876..d475bf8036 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -137,7 +137,7 @@ sanitize_user_mail (const gchar *user) if (!is_email (user)) { return g_strconcat (user, "%40gmail.com", NULL); } else { - gchar *tmp = g_malloc0 (sizeof (char) * (1 + strlen (user) + 2)); + gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (user) + 2)); gchar *at = strchr (user, '@'); strncpy (tmp, user, at - user); @@ -183,7 +183,7 @@ is_default_uri (const gchar *given_uri, const gchar *username) res = g_ascii_strcasecmp (given_uri, uri) == 0; else { const gchar *last; - gchar *tmp = g_malloc0 (sizeof (char) * (1 + strlen (given_uri) + (2 * ats))); + gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (given_uri) + (2 * ats))); last = given_uri; for (at = strchr (last, '@'); at; at = strchr (at + 1, '@')) { diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index 99679ebd18..a86eeaae9e 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -106,7 +106,7 @@ finalize (GObject *object) g_free (config_listener->priv); } - for ( list = g_list_first (groupwise_accounts); list ; list = g_list_next (list) ) { + for ( list = g_list_first (groupwise_accounts); list; list = g_list_next (list) ) { info = (GwAccountInfo *) (list->data); @@ -142,7 +142,7 @@ static GwAccountInfo* lookup_account_info (const gchar *key) { GList *list; - GwAccountInfo *info ; + GwAccountInfo *info; gint found = 0; if (!key) @@ -175,7 +175,7 @@ add_esource (const gchar *conf_key, GwAccountInfo *info, const gchar *source_na ESourceGroup *group; ESource *source; GConfClient* client; - GSList *ids, *temp ; + GSList *ids, *temp; const gchar *source_selection_key; gchar *relative_uri; const gchar *soap_port; @@ -282,14 +282,14 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), group_name) == 0 && strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX ) == 0) { GSList *sources = e_source_group_peek_sources (group); - for( ; sources != NULL; sources = g_slist_next (sources)) { + for(; sources != NULL; sources = g_slist_next (sources)) { ESource *source = E_SOURCE (sources->data); const gchar *source_relative_uri; @@ -363,14 +363,14 @@ modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccoun found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 && strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX) == 0) { GSList *sources = e_source_group_peek_sources (group); - for ( ; sources != NULL; sources = g_slist_next (sources)) { + for (; sources != NULL; sources = g_slist_next (sources)) { ESource *source = E_SOURCE (sources->data); const gchar *source_relative_uri; @@ -697,7 +697,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_ url = camel_url_new (account->source->url, NULL); if (url == NULL) - return ; + return; poa_address = url->host; if (!poa_address || strlen (poa_address) ==0) return; @@ -715,7 +715,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_ delete_group = TRUE; group = NULL; found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if ( strcmp ( e_source_group_peek_base_uri(group), old_base_uri) == 0 && strcmp (e_source_group_peek_name (group), existing_account_info->name) == 0) { @@ -782,7 +782,7 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info) found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if ( strcmp ( e_source_group_peek_base_uri (group), base_uri) == 0 && strcmp (e_source_group_peek_name (group), existing_account_info->name) == 0) { @@ -994,13 +994,13 @@ camel_gw_listener_construct (CamelGwListener *config_listener) { EIterator *iter; EAccount *account; - GwAccountInfo *info ; + GwAccountInfo *info; prune_proxies (); config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client); - for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) { + for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ); e_iterator_is_valid (iter); e_iterator_next (iter) ) { account = E_ACCOUNT (e_iterator_get (iter)); diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c index 549c75da61..8899b17653 100644 --- a/plugins/groupwise-account-setup/groupwise-account-setup.c +++ b/plugins/groupwise-account-setup/groupwise-account-setup.c @@ -55,14 +55,14 @@ set_esource_props (const gchar *path, EAccount *a, GConfClient *client, const gc list = e_source_list_new_for_gconf (client, path); groups = e_source_list_peek_groups (list); - for ( ; groups != NULL; groups = g_slist_next (groups)) { + for (; groups != NULL; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), name) == 0 && strcmp (e_source_group_peek_base_uri (group), GROUPWISE_BASE_URI) == 0) { GSList *sources = e_source_group_peek_sources (group); - for ( ; sources != NULL; sources = g_slist_next (sources)) { + for (; sources != NULL; sources = g_slist_next (sources)) { ESource *source = E_SOURCE (sources->data); if (a->source->auto_check) { diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c index ae0c5e1e8a..4ee5af017e 100644 --- a/plugins/groupwise-features/addressbook-groupwise.c +++ b/plugins/groupwise-features/addressbook-groupwise.c @@ -43,7 +43,7 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target) if (strncmp (uri_text, "groupwise", 9)) { g_free (uri_text); - return ; + return; } e_source_set_property (source, "auth-domain", "Groupwise"); relative_uri = g_strconcat (";", e_source_peek_name (source), NULL); diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index dc13fad256..68cbaf6f9d 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -132,7 +132,7 @@ org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t) static gint first = 0; if (! g_strrstr (t->uri, "groupwise://")) - return ; + return; /* for translation*/ if (!first) { diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index cc735feee1..23c3820130 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -142,11 +142,11 @@ find_node(GList *list, gchar *match) JunkEntry *one_entry = NULL; EGwJunkEntry *ent = NULL; GList *tmp; - gint i ; + gint i; if(list){ tmp = g_list_first(list); - for(i=0; tmp ; i++) + for(i=0; tmp; i++) { one_entry = tmp->data; ent = one_entry->entry; diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 7007ba5760..9e2920d6ab 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -115,5 +115,5 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t) e_popup_add_items (t->target.popup, menus, NULL, popup_free, t->folder); } - return ; + return; } diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c index 05b3452091..05d22bedce 100644 --- a/plugins/groupwise-features/mail-send-options.c +++ b/plugins/groupwise-features/mail-send-options.c @@ -41,7 +41,7 @@ #include "misc/e-send-options.h" -static ESendOptionsDialog * dialog = NULL ; +static ESendOptionsDialog * dialog = NULL; void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t); @@ -69,12 +69,12 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data) if (state == GTK_RESPONSE_OK) { if (dialog->data->gopts->reply_enabled) { if (dialog->data->gopts->reply_convenient) - e_msg_composer_add_header (comp, X_REPLY_CONVENIENT ,"1" ) ; + e_msg_composer_add_header (comp, X_REPLY_CONVENIENT ,"1" ); else if (dialog->data->gopts->reply_within) { time_t t; t = add_day_to_time (time (NULL), dialog->data->gopts->reply_within); strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&t)); - e_msg_composer_add_header (comp, X_REPLY_WITHIN , value) ; + e_msg_composer_add_header (comp, X_REPLY_WITHIN , value); } } @@ -83,33 +83,33 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data) time_t t; t = add_day_to_time (time (NULL), dialog->data->gopts->expire_after); strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&t)); - e_msg_composer_add_header (comp, X_EXPIRE_AFTER, value) ; + e_msg_composer_add_header (comp, X_EXPIRE_AFTER, value); } } if (dialog->data->gopts->delay_enabled) { strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&dialog->data->gopts->delay_until)); - e_msg_composer_add_header (comp, X_DELAY_UNTIL, value) ; + e_msg_composer_add_header (comp, X_DELAY_UNTIL, value); } /*Status Tracking Options*/ if (dialog->data->sopts->tracking_enabled) { - temp = g_strdup_printf ("%d",dialog->data->sopts->track_when) ; - e_msg_composer_add_header (comp, X_TRACK_WHEN, temp) ; - g_free (temp) ; + temp = g_strdup_printf ("%d",dialog->data->sopts->track_when); + e_msg_composer_add_header (comp, X_TRACK_WHEN, temp); + g_free (temp); } if (dialog->data->sopts->autodelete) { - e_msg_composer_add_header (comp, X_AUTODELETE, "1") ; + e_msg_composer_add_header (comp, X_AUTODELETE, "1"); } if (dialog->data->sopts->opened) { - temp = g_strdup_printf ("%d",dialog->data->sopts->opened) ; - e_msg_composer_add_header (comp, X_RETURN_NOTIFY_OPEN, temp) ; - g_free (temp) ; + temp = g_strdup_printf ("%d",dialog->data->sopts->opened); + e_msg_composer_add_header (comp, X_RETURN_NOTIFY_OPEN, temp); + g_free (temp); } if (dialog->data->sopts->declined) { - temp = g_strdup_printf ("%d",dialog->data->sopts->declined) ; - e_msg_composer_add_header (comp, X_RETURN_NOTIFY_DELETE, temp) ; - g_free (temp) ; + temp = g_strdup_printf ("%d",dialog->data->sopts->declined); + e_msg_composer_add_header (comp, X_RETURN_NOTIFY_DELETE, temp); + g_free (temp); } if (dialog->data->gopts->priority) { @@ -142,7 +142,7 @@ void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t) { - EMsgComposer *comp = (struct _EMsgComposer *)t->composer ; + EMsgComposer *comp = (struct _EMsgComposer *)t->composer; EComposerHeaderTable *table; EAccount *account = NULL; gchar *temp = NULL; @@ -152,17 +152,17 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t) if (!account) return; - temp = strstr (account->transport->url, "groupwise") ; + temp = strstr (account->transport->url, "groupwise"); if (!temp) { return; } e_msg_composer_set_send_options (comp, TRUE); /* display the send options dialog */ if (!dialog) { - g_print ("New dialog\n\n") ; - dialog = e_sendoptions_dialog_new () ; + g_print ("New dialog\n\n"); + dialog = e_sendoptions_dialog_new (); } - e_sendoptions_dialog_run (dialog, GTK_WIDGET (comp), E_ITEM_MAIL) ; + e_sendoptions_dialog_run (dialog, GTK_WIDGET (comp), E_ITEM_MAIL); g_signal_connect (dialog, "sod_response", G_CALLBACK (feed_input_data), comp); diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index 57eba9392c..5a8a991288 100644 --- a/plugins/groupwise-features/process-meeting.c +++ b/plugins/groupwise-features/process-meeting.c @@ -85,7 +85,7 @@ org_gnome_accept (EPlugin *ep, ECalPopupTargetSelect *target) return; if (! g_strrstr (uri, "groupwise://")) - return ; + return; /* for translation*/ if (!first) { @@ -347,7 +347,7 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target) return; if (! g_strrstr (uri, "groupwise://")) - return ; + return; comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); @@ -451,7 +451,7 @@ retract_object (gpointer val) } g_free (rid); - free_thread_data (data) ; + free_thread_data (data); return GINT_TO_POINTER (0); } @@ -466,7 +466,7 @@ object_created_cb (CompEditor *ce, gpointer data) response = e_error_run (NULL, "org.gnome.evolution.process_meeting:resend-retract", NULL); if (response == GTK_RESPONSE_NO) { - free_thread_data (data) ; + free_thread_data (data); return; } diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 8c8013f6fe..d48afaa452 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -174,7 +174,7 @@ proxy_login_new (void) return prd; } -static int +static gint proxy_get_password (EAccount *account, gchar **user_name, gchar **password) { const gchar *failed_auth; @@ -308,9 +308,9 @@ proxy_soap_login (gchar *email) EAccount *srcAccount; EAccount *dstAccount; EGwConnection *proxy_cnc, *cnc; - CamelURL *uri = NULL, *parent = NULL ; + CamelURL *uri = NULL, *parent = NULL; gchar *password = NULL, *user_name = NULL; - gchar *proxy_source_url = NULL, *parent_source_url = NULL ; + gchar *proxy_source_url = NULL, *parent_source_url = NULL; gchar *name; gint i; gint permissions = 0; diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 44c82610d6..7f526f8389 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -251,7 +251,7 @@ proxy_dialog_new (void) return prd; } -static int +static gint proxy_get_permissions_from_dialog (EAccount *account) { gint permissions; @@ -301,7 +301,7 @@ proxy_get_permissions_from_dialog (EAccount *account) return permissions; } -static int +static gint proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog) { GtkTreeIter iter; diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index c3036d1da3..b75d9abebb 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -328,7 +328,7 @@ static void send_options_copy_check_changed (EGwSendOptions *n_opts) { EGwSendOptionsGeneral *ggopts, *o_gopts; - EGwSendOptionsStatusTracking *gmopts, *o_gmopts ; + EGwSendOptionsStatusTracking *gmopts, *o_gmopts; EGwSendOptionsStatusTracking *gcopts, *o_gcopts; EGwSendOptionsStatusTracking *gtopts, *o_gtopts; diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index c7c315c7f0..50bb6fccf3 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -159,7 +159,7 @@ static void create_folder_done (struct _EMCreateFolder *m) { struct ShareInfo *ssi = (struct ShareInfo *) m->user_data; - CamelStore *store = CAMEL_STORE (m->store) ; + CamelStore *store = CAMEL_STORE (m->store); EGwConnection *ccnc; if (m->done) { @@ -207,7 +207,7 @@ new_folder_created_cb (struct _EMCreateFolder *m, gpointer user_data) g_object_unref (emfs); } -static int +static gint create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct _EMCreateFolder *m, gpointer user_data), gpointer user_data) { gchar *name, *namebuf = NULL; @@ -332,7 +332,7 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m g_signal_connect (users_dialog, "response", G_CALLBACK (users_dialog_response), ssi); camel_object_unref (store); - return ; + return; } @@ -355,7 +355,7 @@ org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *t) if (! g_strrstr (t->uri, "groupwise://")) - return ; + return; /* for translation*/ if (!first) { @@ -378,7 +378,7 @@ create_shared_folder(EPopup *ep, EPopupItem *p, gpointer data) EMFolderTreeModel *model; EMFolderTree *folder_tree; - GtkWidget *dialog ; + GtkWidget *dialog; gchar *uri; model = mail_component_peek_tree_model (mail_component_peek ()); diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 2b12d4be9b..87404db6bc 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -133,7 +133,7 @@ free_user_node(EShUsers *user) g_free(user->email); user->email = NULL; } - return ; + return; } static void @@ -144,7 +144,7 @@ free_node(SharedUser *usr) g_free(user->email); user->email = NULL; } - return ; + return; } static SharedUser * @@ -153,11 +153,11 @@ find_node(GList *list, gchar *email) SharedUser *user = NULL; EShUsers *usr = NULL; GList *tmp; - gint i ; + gint i; if(list){ tmp = g_list_first(list); - for(i=0; tmp ; i++) + for(i=0; tmp; i++) { user = tmp->data; usr = user->user_node; @@ -346,7 +346,7 @@ add_clicked(GtkButton *button, ShareFolder *sf) if (!g_ascii_strcasecmp (email, "" )) { e_error_run (NULL, "org.gnome.evolution.mail_shared_folder:no-user",NULL); - return ; + return; } @@ -354,7 +354,7 @@ add_clicked(GtkButton *button, ShareFolder *sf) if (sf->users_list && email){ new_user = find_node (sf->users_list, (gchar *)email); if (new_user) - return ; + return; } usr = g_new0 (EShUsers, 1); @@ -586,7 +586,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) path = gtk_tree_path_new_from_string (arg1); if (!gtk_tree_model_get_iter ((GtkTreeModel *) sf->model, &(sf->iter), path)){ gtk_tree_path_free (path); - return ; + return; } gtk_tree_model_get ((GtkTreeModel *) sf->model, &(sf->iter), 0, &email, 1, &right , -1); usr = find_node(sf->users_list, email); diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index 2569cbebd7..d9173e09e2 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -64,18 +64,18 @@ static void track_status (EPopup *ep, EPopupItem *item, gpointer data) { EMPopupTargetSelect *t = (EMPopupTargetSelect *)data; - CamelMimeMessage *msg = NULL ; - const CamelInternetAddress *from ; - const gchar *namep, *addp ; + CamelMimeMessage *msg = NULL; + const CamelInternetAddress *from; + const gchar *namep, *addp; - GtkDialog *d ; - GtkTable *table ; + GtkDialog *d; + GtkTable *table; GtkWidget *widget; GtkScrolledWindow *win; GtkVBox *vbox; - time_t time ; - gchar *time_str ; + time_t time; + gchar *time_str; gchar *boldmsg; @@ -87,8 +87,8 @@ track_status (EPopup *ep, EPopupItem *item, gpointer data) /*Get message*/ msg = camel_folder_get_message (t->folder, g_ptr_array_index (t->uids, 0), NULL); if (!msg) { - g_print ("Error!! No message\n") ; - return ; + g_print ("Error!! No message\n"); + return; } /*Create the dialog*/ @@ -120,8 +120,8 @@ track_status (EPopup *ep, EPopupItem *item, gpointer data) row++; /*From*/ - from = camel_mime_message_get_from (msg) ; - camel_internet_address_get (from, 0, &namep, &addp) ; + from = camel_mime_message_get_from (msg); + camel_internet_address_get (from, 0, &namep, &addp); boldmsg = g_strdup_printf ("%s", _("From:")); widget = gtk_label_new (boldmsg); g_free (boldmsg); @@ -134,8 +134,8 @@ track_status (EPopup *ep, EPopupItem *item, gpointer data) row++; /*creation date*/ - time = camel_mime_message_get_date (msg, NULL) ; - time_str = ctime (&time) ; + time = camel_mime_message_get_date (msg, NULL); + time_str = ctime (&time); time_str[strlen(time_str)-1] = '\0' ; boldmsg = g_strdup_printf ("%s", _("Creation date:")); widget = gtk_label_new (boldmsg); diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index d5a17b7893..818c6a5e14 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -101,7 +101,7 @@ finalize (GObject *object) g_free (config_listener->priv); } - for ( list = g_list_first (hula_accounts); list ; list = g_list_next (list) ) { + for ( list = g_list_first (hula_accounts); list; list = g_list_next (list) ) { info = (HulaAccountInfo *) (list->data); @@ -147,7 +147,7 @@ static HulaAccountInfo* lookup_account_info (const gchar *key) { GList *list; - HulaAccountInfo *info ; + HulaAccountInfo *info; gint found = 0; if (!key) @@ -176,7 +176,7 @@ add_esource (const gchar *conf_key, const gchar *group_name, const gchar *sourc ESourceGroup *group; ESource *source; GConfClient *client; - GSList *ids, *temp ; + GSList *ids, *temp; gboolean result; gchar *source_selection_key; gchar *relative_uri; @@ -253,14 +253,14 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), group_name) == 0 && strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX ) == 0) { GSList *sources = e_source_group_peek_sources (group); - for( ; sources != NULL; sources = g_slist_next (sources)) { + for(; sources != NULL; sources = g_slist_next (sources)) { ESource *source = E_SOURCE (sources->data); const gchar *source_relative_uri; @@ -325,7 +325,7 @@ modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); @@ -333,7 +333,7 @@ modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX) == 0) { GSList *sources = e_source_group_peek_sources (group); - for ( ; sources != NULL; sources = g_slist_next (sources)) { + for (; sources != NULL; sources = g_slist_next (sources)) { ESource *source = E_SOURCE (sources->data); const gchar *source_relative_uri; @@ -544,11 +544,11 @@ camel_hula_listener_construct (CamelHulaListener *config_listener) { EIterator *iter; EAccount *account; - HulaAccountInfo *info ; + HulaAccountInfo *info; config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client); - for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) { + for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ); e_iterator_is_valid (iter); e_iterator_next (iter) ) { account = E_ACCOUNT (e_iterator_get (iter)); diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c index 5f518dece6..8c930eb82b 100644 --- a/plugins/ipod-sync/sync.c +++ b/plugins/ipod-sync/sync.c @@ -159,7 +159,7 @@ write_to_ipod (GString *str, gchar *path, gchar *filename) guchar *utf8; gunichar2 *utf16; guchar bom[2] = {0xFF, 0xFE}; - int i, count; + gint i, count; output_path = g_build_path (G_DIR_SEPARATOR_S, ipod_info.mount_point, diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index c2fe0e163a..5007bf6541 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -145,8 +145,8 @@ format_date_and_time_x (struct tm *date_tm, gboolean use_24_hour_format, gboolean show_midnight, gboolean show_zero_seconds, - char *buffer, - int buffer_size) + gchar *buffer, + gint buffer_size) { gchar *format; struct tm tomorrow_tm, week_tm; diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c index c7feb024b0..76b1e42da1 100644 --- a/plugins/mono/mono-plugin.c +++ b/plugins/mono/mono-plugin.c @@ -159,13 +159,13 @@ epm_invoke(EPlugin *ep, const gchar *name, gpointer data) if (res) { gpointer *p = mono_object_unbox(res); - d(printf("mono method returned '%p' %ld\n", *p, (long int)*p)); + d(printf("mono method returned '%p' %ld\n", *p, (long gint)*p)); return *p; } else return NULL; } -static int +static gint epm_construct(EPlugin *ep, xmlNodePtr root) { if (((EPluginClass *)epm_parent_class)->construct(ep, root) == -1) diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c index 94984a3560..49e1dffda4 100644 --- a/plugins/profiler/profiler.c +++ b/plugins/profiler/profiler.c @@ -40,7 +40,7 @@ org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t) if (!fp) { gchar *name; - name = g_strdup_printf("eprofile.%ld", (long int)getpid()); + name = g_strdup_printf("eprofile.%ld", (long gint)getpid()); fp = fopen(name, "w"); if (fp) fprintf(stderr, "Generating profiling data in `%s'\n", name); diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index ac3d8ea6f0..445b5f80bd 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -755,7 +755,7 @@ attachment_to_part (PstImporter *m, pst_item_attach *attach) camel_mime_part_set_content (part, attach->data, strlen (attach->data), mimetype); } else { gchar *buf = NULL; - size_t size; + gsize size; size = pst_attach_to_mem (&m->pst, attach, &buf); camel_mime_part_set_content (part, (gchar *) buf, size, mimetype); @@ -1617,7 +1617,7 @@ pst_status (CamelOperation *op, const gchar *what, gint pc, gpointer data) g_mutex_unlock (importer->status_lock); } -static int +static gint pst_import (EImport *ei, EImportTarget *target) { PstImporter *m; diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 4650d97375..43e093eff2 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -394,7 +394,7 @@ update_timestamp (EPublishUri *uri) if (uri->last_pub_time) g_free (uri->last_pub_time); - uri->last_pub_time = g_strdup_printf ("%d", (int) time (NULL)); + uri->last_pub_time = g_strdup_printf ("%d", (gint) time (NULL)); uris = g_slist_prepend (uris, e_publish_uri_to_xml (uri)); diff --git a/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c index aa273ae264..0a03809e97 100644 --- a/plugins/python/python-plugin-loader.c +++ b/plugins/python/python-plugin-loader.c @@ -69,7 +69,7 @@ epp_invoke(EPlugin *ep, const gchar *name, gpointer data) if (p->pModule == NULL) { pModuleName = PyString_FromString(epp->module_name); - PyRun_SimpleString(g_strdup_printf ("import sys ; sys.path.insert(0, '%s')", epp->location)); + PyRun_SimpleString(g_strdup_printf ("import sys; sys.path.insert(0, '%s')", epp->location)); p->pModule = PyImport_Import(pModuleName); @@ -114,7 +114,7 @@ epp_invoke(EPlugin *ep, const gchar *name, gpointer data) return NULL; } -static int +static gint epp_construct(EPlugin *ep, xmlNodePtr root) { if (((EPluginClass *)epp_parent_class)->construct(ep, root) == -1) diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index d7123dc4e7..5736786725 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -103,7 +103,7 @@ static gboolean em_junk_sa_allow_tell_tested = FALSE; gchar *em_junk_sa_spamc_gconf_binary = NULL; gchar *em_junk_sa_spamd_gconf_binary = NULL; -static int +static gint pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gint rv_err, gint wait_for_termination, GByteArray *output_buffer, GError **error) { gint result, status, errnosav, fds[2], out_fds[2]; @@ -253,7 +253,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gin return 0; } -static int +static gint 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); @@ -513,7 +513,7 @@ em_junk_sa_is_available (GError **error) /* While we're at it, see if spamd is running with --allow-tell */ if (!em_junk_sa_allow_tell_tested) - em_junk_sa_test_allow_tell () ; + em_junk_sa_test_allow_tell (); pthread_mutex_unlock (&em_junk_sa_init_lock); diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 95a3c1e361..53669ba347 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -550,7 +550,7 @@ reply_with_template (EPopup *ep, EPopupItem *item, gpointer data) camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_BCC)); camel_mime_part_set_content((CamelMimePart *)new, - cont, (int) g_utf8_strlen(cont, -1), "text"); + cont, (gint) g_utf8_strlen(cont, -1), "text"); /* Create the composer */ em_utils_edit_message (new, templates_folder); diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index 1777f526fb..c23cfaa730 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -223,7 +223,7 @@ void processTnef(TNEFStruct *tnef) { gint foundCal=0; FILE *fptr; - ifilename = (gchar *) g_malloc(sizeof(char) * 256); + ifilename = (gchar *) g_malloc(sizeof(gchar) * 256); /* First see if this requires special processing. */ /* ie: it's a Contact Card, Task, or Meeting request (vCal/vCard) */ @@ -940,7 +940,7 @@ void saveVCalendar(TNEFStruct *tnef) { if (filename!=NULL) { fprintf(fptr, "UID:"); for(index=0;indexsize;index++) { - fprintf(fptr,"%02X", (unsigned char)filename->data[index]); + fprintf(fptr,"%02X", (guchar)filename->data[index]); } fprintf(fptr,"\n"); } @@ -950,7 +950,7 @@ void saveVCalendar(TNEFStruct *tnef) { if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_LONG, 0x8201))) != MAPI_UNDEFINED) { ddword_ptr = (DDWORD*)filename->data; - fprintf(fptr, "SEQUENCE:%i\n", (int) *ddword_ptr); + fprintf(fptr, "SEQUENCE:%i\n", (gint) *ddword_ptr); } if ((filename=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_BINARY, PR_SENDER_SEARCH_KEY))) diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 97490b45ac..6497a7bdd1 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -89,7 +89,7 @@ component_info_free (EComponentInfo *info) g_free (info); } -static int +static gint component_info_compare_func (EComponentInfo *a, EComponentInfo *b) { diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 30318ccb0b..57ed2495b5 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -252,7 +252,7 @@ filetype_changed_cb (GtkWidget *combobox, ImportData *data) } #if 0 -static int +static gint compare_info_name (gconstpointer data1, const void *data2) { const Bonobo_ServerInfo *info1 = (Bonobo_ServerInfo *)data1; diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 8b13233a9d..6e3cf1175d 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -123,7 +123,7 @@ page_free (Page *page) g_free (page); } -static int +static gint compare_page_func (gconstpointer a, gconstpointer b) { diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index eb1f96e6d8..6e8215c63e 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -113,7 +113,7 @@ struct _EShellWindowPrivate { GtkWidget *menu_hint_label; /* The timeout for saving the window size */ - guint store_window_size_timer; + guint store_window_gsizeimer; gboolean destroyed; }; @@ -842,9 +842,9 @@ impl_dispose (GObject *object) priv->ui_component = NULL; } - if (priv->store_window_size_timer) { - g_source_remove (priv->store_window_size_timer); - self->priv->store_window_size_timer = 0; + if (priv->store_window_gsizeimer) { + g_source_remove (priv->store_window_gsizeimer); + self->priv->store_window_gsizeimer = 0; /* There was a timer. Let us store the settings.*/ store_window_size (GTK_WIDGET (self)); @@ -870,11 +870,11 @@ impl_finalize (GObject *object) /* GtkWidget methods */ static void -e_shell_window_remove_resize_timer (EShellWindow* self) +e_shell_window_remove_regsizeimer (EShellWindow* self) { - if (self->priv->store_window_size_timer) { - g_source_remove (self->priv->store_window_size_timer); - self->priv->store_window_size_timer = 0; + if (self->priv->store_window_gsizeimer) { + g_source_remove (self->priv->store_window_gsizeimer); + self->priv->store_window_gsizeimer = 0; } } @@ -892,7 +892,7 @@ impl_window_state (GtkWidget *widget, GdkEventWindowState* ev) } if ((ev->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0) { - e_shell_window_remove_resize_timer (E_SHELL_WINDOW (widget)); + e_shell_window_remove_regsizeimer (E_SHELL_WINDOW (widget)); } if (GTK_WIDGET_CLASS (e_shell_window_parent_class)->window_state_event) { @@ -912,7 +912,7 @@ store_window_size (GtkWidget* widget) widget->allocation.height, NULL); g_object_unref(client); - E_SHELL_WINDOW (widget)->priv->store_window_size_timer = 0; + E_SHELL_WINDOW (widget)->priv->store_window_gsizeimer = 0; return FALSE; /* remove this timeout */ } @@ -920,11 +920,11 @@ static void impl_size_alloc (GtkWidget* widget, GtkAllocation* alloc) { EShellWindow* self = E_SHELL_WINDOW (widget); - e_shell_window_remove_resize_timer(self); + e_shell_window_remove_regsizeimer(self); if (GTK_WIDGET_REALIZED(widget) && !(gdk_window_get_state(widget->window) & GDK_WINDOW_STATE_MAXIMIZED)) { /* update the size storage timer */ - self->priv->store_window_size_timer = g_timeout_add_seconds (1, (GSourceFunc)store_window_size, self); + self->priv->store_window_gsizeimer = g_timeout_add_seconds (1, (GSourceFunc)store_window_size, self); } if (GTK_WIDGET_CLASS (e_shell_window_parent_class)->size_allocate) { diff --git a/shell/e-shell.c b/shell/e-shell.c index de4e0a88ca..9869d6e9e9 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -346,7 +346,7 @@ impl_Shell_findComponent(PortableServer_Servant servant, /* EShellWindow handling and bookkeeping. */ -static int +static gint window_delete_event_cb (GtkWidget *widget, GdkEventAny *ev, gpointer data) @@ -752,7 +752,7 @@ e_shell_new (EShellStartupLineMode startup_line_mode, return new; } -static int +static gint remove_dir(const gchar *root, const gchar *path) { GDir *dir; diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index 6a061ab422..8d5152966e 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -209,7 +209,7 @@ button_query_tooltip (GtkWidget *widget, /* Layout. */ -static int +static gint layout_buttons (ESidebar *sidebar) { GtkAllocation *allocation = & GTK_WIDGET (sidebar)->allocation; diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index 2fe35ddb78..ce2afa3fb7 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -445,7 +445,7 @@ add_verbs (EUserCreatableItemsHandler *handler, /* Generic menu construction code */ -static int +static gint item_types_sort_func (gconstpointer a, gconstpointer b) { @@ -470,9 +470,9 @@ item_types_sort_func (gconstpointer a, continue; } - if (toupper ((int) *p1) < toupper ((int) *p2)) + if (toupper ((gint) *p1) < toupper ((gint) *p2)) return -1; - else if (toupper ((int) *p1) > toupper ((int) *p2)) + else if (toupper ((gint) *p1) > toupper ((gint) *p2)) return +1; p1 ++, p2 ++; @@ -489,7 +489,7 @@ item_types_sort_func (gconstpointer a, } typedef void (*EUserCreatableItemsHandlerMenuItemFunc) (EUserCreatableItemsHandler *, gpointer, MenuItem *, gboolean); -typedef void (*EUserCreatableItemsHandlerSeparatorFunc) (EUserCreatableItemsHandler *, gpointer, int); +typedef void (*EUserCreatableItemsHandlerSeparatorFunc) (EUserCreatableItemsHandler *, gpointer, gint); static void construct_menu (EUserCreatableItemsHandler *handler, gpointer menu, diff --git a/shell/main.c b/shell/main.c index 4032c5544e..2eb2b2a5f3 100644 --- a/shell/main.c +++ b/shell/main.c @@ -417,7 +417,7 @@ idle_cb (gchar **uris) thread. So if we have to redirect the signal if the crash happens in another thread. */ -static void (*gnome_segv_handler) (int); +static void (*gnome_segv_handler) (gint); static GStaticMutex segv_mutex = G_STATIC_MUTEX_INIT; static pthread_t main_thread; diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c index 6e490f6123..e0d644344b 100644 --- a/smime/lib/e-asn1-object.c +++ b/smime/lib/e-asn1-object.c @@ -136,7 +136,7 @@ e_asn1_object_get_type (void) as defined by the DER (Distinguised Encoding Rules) of ASN1. */ -static int +static gint get_integer_256 (guchar *data, guint nb) { gint val; diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index 5caa13e4f4..52fa966f76 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -207,7 +207,7 @@ prompt_for_password (gchar *title, gchar *prompt, SECItem *pwd) NULL); if (passwd) { - size_t len = strlen (passwd); + gsize len = strlen (passwd); const gchar *inptr = passwd; guchar *outptr; gunichar2 c; diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index e55938978c..ea30c1701e 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -323,7 +323,7 @@ e_timezone_dialog_construct (ETimezoneDialog *etd) } #if 0 -static int +static gint get_local_offset (void) { time_t now = time(NULL), t_gmt, t_local; @@ -396,8 +396,8 @@ e_timezone_dialog_new (void) } static void -format_utc_offset (int utc_offset, - char *buffer) +format_utc_offset (gint utc_offset, + gchar *buffer) { const gchar *sign = "+"; gint hours, minutes, seconds; diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c index 82ab22eedc..a977e0a787 100644 --- a/widgets/menus/gal-define-views-model.c +++ b/widgets/menus/gal-define-views-model.c @@ -60,14 +60,14 @@ gdvm_dispose(GObject *object) } /* This function returns the number of columns in our ETableModel. */ -static int +static gint gdvm_col_count (ETableModel *etc) { return 1; } /* This function returns the number of rows in our ETableModel. */ -static int +static gint gdvm_row_count (ETableModel *etc) { GalDefineViewsModel *views = GAL_DEFINE_VIEWS_MODEL(etc); diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c index 688e833aeb..d12f4ae792 100644 --- a/widgets/menus/gal-view-etable.c +++ b/widgets/menus/gal-view-etable.c @@ -165,15 +165,15 @@ gal_view_etable_class_init (GalViewEtableClass *klass) GalViewClass *gal_view_class = GAL_VIEW_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass); - gal_view_class->edit = gal_view_etable_edit ; - gal_view_class->load = gal_view_etable_load ; - gal_view_class->save = gal_view_etable_save ; - gal_view_class->get_title = gal_view_etable_get_title ; - gal_view_class->set_title = gal_view_etable_set_title ; + gal_view_class->edit = gal_view_etable_edit; + gal_view_class->load = gal_view_etable_load; + gal_view_class->save = gal_view_etable_save; + gal_view_class->get_title = gal_view_etable_get_title; + gal_view_class->set_title = gal_view_etable_set_title; gal_view_class->get_type_code = gal_view_etable_get_type_code; - gal_view_class->clone = gal_view_etable_clone ; + gal_view_class->clone = gal_view_etable_clone; - object_class->dispose = gal_view_etable_dispose ; + object_class->dispose = gal_view_etable_dispose; } static void diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index ea38e155a2..ab819a484c 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -206,7 +206,7 @@ gal_view_new_dialog_construct (GalViewNewDialog *dialog, gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->list), column); iterator = dialog->collection->factory_list; - for ( ; iterator; iterator = g_list_next(iterator) ) { + for (; iterator; iterator = g_list_next(iterator) ) { GalViewFactory *factory = iterator->data; GtkTreeIter iter; diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index 003e326b69..d397f142dd 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -69,7 +69,7 @@ G_DEFINE_TYPE (EActivityHandler, e_activity_handler, G_TYPE_OBJECT) static void handle_error (ETaskWidget *task); -static unsigned int +static guint get_new_activity_id (EActivityHandler *activity_handler) { EActivityHandlerPrivate *priv; @@ -104,7 +104,7 @@ lookup_activity (GList *list, /* ETaskWidget actions. */ -static int +static gint task_widget_button_press_event_callback (GtkWidget *widget, GdkEventButton *button_event, gpointer data) diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index cd3e2b5ec7..890355620b 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -60,37 +60,37 @@ static void e_calendar_item_unmap (GnomeCanvasItem *item); static void e_calendar_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags); + gint flags); static void e_calendar_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, - int x, - int y, - int width, - int height); + gint x, + gint y, + gint width, + gint height); static void e_calendar_item_draw_month (ECalendarItem *calitem, GdkDrawable *drawable, - int x, - int y, - int width, - int height, - int row, - int col); + gint x, + gint y, + gint width, + gint height, + gint row, + gint col); static void e_calendar_item_draw_day_numbers (ECalendarItem *calitem, GdkDrawable *drawable, - int width, - int height, - int row, - int col, - int year, - int month, - int start_weekday, + gint width, + gint height, + gint row, + gint col, + gint year, + gint month, + gint start_weekday, gint cells_x, gint cells_y); static double e_calendar_item_point (GnomeCanvasItem *item, double x, double y, - int cx, - int cy, + gint cx, + gint cy, GnomeCanvasItem **actual_item); static void e_calendar_item_stop_selecting (ECalendarItem *calitem, guint32 time); @@ -891,7 +891,7 @@ static void e_calendar_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, - int flags) + gint flags) { ECalendarItem *calitem; GtkStyle *style; @@ -1024,10 +1024,10 @@ e_calendar_item_update (GnomeCanvasItem *item, static void e_calendar_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable, - int x, - int y, - int width, - int height) + gint x, + gint y, + gint width, + gint height) { ECalendarItem *calitem; GtkStyle *style; @@ -1151,12 +1151,12 @@ layout_set_day_text (ECalendarItem *calitem, PangoLayout *layout, gint day_index static void e_calendar_item_draw_month (ECalendarItem *calitem, GdkDrawable *drawable, - int x, - int y, - int width, - int height, - int row, - int col) + gint x, + gint y, + gint width, + gint height, + gint row, + gint col) { GnomeCanvasItem *item; GtkWidget *widget; @@ -1395,13 +1395,13 @@ get_digit_fomat () static void e_calendar_item_draw_day_numbers (ECalendarItem *calitem, GdkDrawable *drawable, - int width, - int height, - int row, - int col, - int year, - int month, - int start_weekday, + gint width, + gint height, + gint row, + gint col, + gint year, + gint month, + gint start_weekday, gint cells_x, gint cells_y) { diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c index 1eb0ddec12..bb0bd775e9 100644 --- a/widgets/misc/e-canvas-vbox.c +++ b/widgets/misc/e-canvas-vbox.c @@ -330,7 +330,7 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, gint flags ) max_width = item_width; list = g_list_next(list); - for( ; list; list = g_list_next(list)) { + for(; list; list = g_list_next(list)) { running_height += e_canvas_vbox->spacing; g_object_get (list->data, diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 39b89d2675..53e3eafeec 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -147,7 +147,7 @@ e_canvas_new (void) /* Emits an event for an item in the canvas, be it the current item, grabbed * item, or focused item, as appropriate. */ -static int +static gint emit_event (GnomeCanvas *canvas, GdkEvent *event) { GdkEvent *ev; @@ -316,7 +316,7 @@ gnome_canvas_item_invoke_point (GnomeCanvasItem *item, double x, double y, gint */ #define DISPLAY_X1(canvas) (GNOME_CANVAS (canvas)->layout.xoffset) #define DISPLAY_Y1(canvas) (GNOME_CANVAS (canvas)->layout.yoffset) -static int +static gint pick_current_item (GnomeCanvas *canvas, GdkEvent *event) { gint button_down; @@ -392,8 +392,8 @@ pick_current_item (GnomeCanvas *canvas, GdkEvent *event) /* canvas pixel coords */ - cx = (int) (x + 0.5); - cy = (int) (y + 0.5); + cx = (gint) (x + 0.5); + cy = (gint) (y + 0.5); /* world coords */ diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index 18723b5f61..38aaf590c6 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -65,7 +65,7 @@ static gint e_cell_date_edit_do_popup (ECellPopup *ecp, gint view_col); static void e_cell_date_edit_set_popup_values (ECellDateEdit *ecde); static void e_cell_date_edit_select_matching_time(ECellDateEdit *ecde, - char *time); + gchar *time); static void e_cell_date_edit_show_popup (ECellDateEdit *ecde, gint row, gint view_col); @@ -565,7 +565,7 @@ e_cell_date_edit_set_popup_values (ECellDateEdit *ecde) static void e_cell_date_edit_select_matching_time (ECellDateEdit *ecde, - char *time) + gchar *time) { gboolean found = FALSE; gboolean valid; @@ -667,7 +667,7 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, /* The ETable positions don't include the grid lines, I think, so we add 1. */ *y += y1 + 1 - - (int)((GnomeCanvas *)canvas)->layout.vadjustment->value + - (gint)((GnomeCanvas *)canvas)->layout.vadjustment->value + ((GnomeCanvas *)canvas)->zoom_yofs; avail_height = gdk_screen_height () - *y; @@ -713,7 +713,7 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, /* This handles key press events in the popup window. If the Escape key is pressed we hide the popup, and do not change the cell contents. */ -static int +static gint e_cell_date_edit_key_press (GtkWidget *popup_window, GdkEventKey *event, ECellDateEdit *ecde) @@ -731,7 +731,7 @@ e_cell_date_edit_key_press (GtkWidget *popup_window, /* This handles button press events in the popup window. If the button is pressed outside the popup, we hide it and do not change the cell contents. */ -static int +static gint e_cell_date_edit_button_press (GtkWidget *popup_window, GdkEventButton *event, ECellDateEdit *ecde) diff --git a/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c index 378bb8ab55..35dbb611ed 100644 --- a/widgets/misc/e-cell-percent.c +++ b/widgets/misc/e-cell-percent.c @@ -90,7 +90,7 @@ ecp_set_value (ECellText *cell, ETableModel *model, gint col, gint row, if (text) { p = text; while (*p) { - if (!isspace ((unsigned char) *p)) { + if (!isspace ((guchar) *p)) { empty = FALSE; break; } diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c index a6fb3b517f..f482f06094 100644 --- a/widgets/misc/e-combo-button.c +++ b/widgets/misc/e-combo-button.c @@ -285,7 +285,7 @@ e_combo_button_popup (EComboButton *combo_button, GdkEventButton *event) } /* GtkWidget methods. */ -static int +static gint impl_button_press_event (GtkWidget *widget, GdkEventButton *event) { @@ -315,7 +315,7 @@ impl_button_press_event (GtkWidget *widget, return TRUE; } -static int +static gint impl_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event) { @@ -335,7 +335,7 @@ impl_leave_notify_event (GtkWidget *widget, return FALSE; } -static int +static gint impl_expose_event (GtkWidget *widget, GdkEventExpose *event) { diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index b9ae1ad901..84b016934e 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -153,9 +153,9 @@ static void on_date_popup_date_selected (ECalendarItem *calitem, EDateEdit *dedit); static void hide_date_popup (EDateEdit *dedit); static void rebuild_time_popup (EDateEdit *dedit); -static gboolean field_set_to_none (const char *text); +static gboolean field_set_to_none (const gchar *text); static gboolean e_date_edit_parse_date (EDateEdit *dedit, - const char *date_text, + const gchar *date_text, struct tm *date_tm); static gboolean e_date_edit_parse_time (EDateEdit *dedit, const gchar *time_text, @@ -1504,7 +1504,7 @@ field_set_to_none (const gchar *text) gint n; pos = text; - while (n = (int)((unsigned char)*pos), isspace (n)) + while (n = (gint)((guchar)*pos), isspace (n)) pos++; none_string = _("None"); diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c index 54cc5a0be8..98c64f4ea7 100644 --- a/widgets/misc/e-dropdown-button.c +++ b/widgets/misc/e-dropdown-button.c @@ -70,7 +70,7 @@ menu_position_cb (GtkMenu *menu, that we unset the state of the toggle button when the pop-up menu disappears. */ -static int +static gint menu_deactivate_cb (GtkMenuShell *menu_shell, gpointer data) { diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 9fdb45b0b6..87725cd498 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -661,7 +661,7 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp } } -static int +static gint xml_get_prop_int (xmlNodePtr node, const gchar *prop) { gchar *buf; diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index e11439eb26..3c83cb1048 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -241,7 +241,7 @@ set_image_from_data (EImageChooser *chooser, GdkPixbuf *scaled; GdkPixbuf *composite; - float scale; + gfloat scale; gint new_height, new_width; new_height = gdk_pixbuf_get_height (pixbuf); @@ -259,17 +259,17 @@ set_image_from_data (EImageChooser *chooser, /* we need to scale down */ printf ("we need to scale down\n"); if (new_height > new_width) - scale = (float)chooser->priv->image_height / new_height; + scale = (gfloat)chooser->priv->image_height / new_height; else - scale = (float)chooser->priv->image_width / new_width; + scale = (gfloat)chooser->priv->image_width / new_width; } else { /* we need to scale up */ printf ("we need to scale up\n"); if (new_height > new_width) - scale = (float)new_height / chooser->priv->image_height; + scale = (gfloat)new_height / chooser->priv->image_height; else - scale = (float)new_width / chooser->priv->image_width; + scale = (gfloat)new_width / chooser->priv->image_width; } printf ("scale = %g\n", scale); diff --git a/widgets/misc/e-info-label.c b/widgets/misc/e-info-label.c index 4e158d4117..3333d47202 100644 --- a/widgets/misc/e-info-label.c +++ b/widgets/misc/e-info-label.c @@ -51,7 +51,7 @@ el_destroy (GtkObject *o) ((GtkObjectClass *)el_parent)->destroy(o); } -static int +static gint el_expose_event(GtkWidget *w, GdkEventExpose *event) { gint x = ((GtkContainer *)w)->border_width; @@ -66,7 +66,7 @@ el_expose_event(GtkWidget *w, GdkEventExpose *event) return ((GtkWidgetClass *)el_parent)->expose_event(w, event); } -static int +static gint get_text_full_width (GtkWidget *label) { PangoLayout *layout; diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index f35335f37d..82ce1c17aa 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -689,7 +689,7 @@ e_map_world_to_window (EMap *map, double world_longitude, double world_latitude, /* --- Zoom --- */ -double +gdouble e_map_get_magnification (EMap *map) { EMapPrivate *priv; @@ -1153,8 +1153,8 @@ repaint_point (EMap *map, EMapPoint *point) e_map_world_to_window (map, point->longitude, point->latitude, &px, &py); - area.x = (int) px - 2; - area.y = (int) py - 2; + area.x = (gint) px - 2; + area.y = (gint) py - 2; area.width = 5; area.height = 5; request_paint_area (map, &area); diff --git a/widgets/misc/e-map.h b/widgets/misc/e-map.h index 0c915fb5fa..df3f70a343 100644 --- a/widgets/misc/e-map.h +++ b/widgets/misc/e-map.h @@ -96,7 +96,7 @@ void e_map_world_to_window (EMap *map, /* --- Zoom --- */ -double e_map_get_magnification (EMap *map); +gdouble e_map_get_magnification (EMap *map); /* Pass TRUE if we want the smooth zoom hack */ void e_map_set_smooth_zoom (EMap *map, gboolean state); diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index ba1a5b011e..eaf843dfb2 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -94,7 +94,7 @@ create_page_container (const gchar *description, /* Timeout for switching pages (so it's more comfortable navigating with the keyboard). */ -static int +static gint set_page_timeout_callback (gpointer data) { EMultiConfigDialog *multi_config_dialog; diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index 2adad1991b..c20edfc5e4 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -89,7 +89,7 @@ e_reflow_pick_line (EReflow *reflow, double x) return x; } -static int +static gint er_find_item (EReflow *reflow, GnomeCanvasItem *item) { gint i; @@ -162,7 +162,7 @@ static gboolean do_adjustment (gpointer user_data) { gint row; - GtkAdjustment *adj ; + GtkAdjustment *adj; gfloat value, min_value, max_value; EReflow *reflow = user_data; @@ -389,7 +389,7 @@ item_removed (EReflowModel *model, gint i, EReflow *reflow) if (reflow->items[i]) gtk_object_destroy (GTK_OBJECT (reflow->items[i])); - memmove (reflow->heights + i, reflow->heights + i + 1, (reflow->count - i - 1) * sizeof (int)); + memmove (reflow->heights + i, reflow->heights + i + 1, (reflow->count - i - 1) * sizeof (gint)); memmove (reflow->items + i, reflow->items + i + 1, (reflow->count - i - 1) * sizeof (GnomeCanvasItem *)); reflow->count --; @@ -424,7 +424,7 @@ items_inserted (EReflowModel *model, gint position, gint count, EReflow *reflow) reflow->heights = g_renew (int, reflow->heights, reflow->allocated_count); reflow->items = g_renew (GnomeCanvasItem *, reflow->items, reflow->allocated_count); } - memmove (reflow->heights + position + count, reflow->heights + position, (reflow->count - position - count) * sizeof (int)); + memmove (reflow->heights + position + count, reflow->heights + position, (reflow->count - position - count) * sizeof (gint)); memmove (reflow->items + position + count, reflow->items + position, (reflow->count - position - count) * sizeof (GnomeCanvasItem *)); for (i = position; i < position + count; i++) { reflow->items[i] = NULL; @@ -1126,7 +1126,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, i /= column_width + E_REFLOW_FULL_GUTTER; running_width += i * (column_width + E_REFLOW_FULL_GUTTER); - for ( ; i < reflow->column_count; i++) { + for (; i < reflow->column_count; i++) { if ( running_width > x + width ) break; x_rect = running_width; @@ -1161,7 +1161,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, i /= column_width + E_REFLOW_FULL_GUTTER; running_width += i * (column_width + E_REFLOW_FULL_GUTTER); - for ( ; i < reflow->column_count; i++) { + for (; i < reflow->column_count; i++) { if ( running_width > x + width ) break; x_rect = running_width; @@ -1271,14 +1271,14 @@ e_reflow_point (GnomeCanvasItem *item, if (GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->point) distance = GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->point (item, x, y, cx, cy, actual_item); - if ((int) (distance * item->canvas->pixels_per_unit + 0.5) <= item->canvas->close_enough && *actual_item) + if ((gint) (distance * item->canvas->pixels_per_unit + 0.5) <= item->canvas->close_enough && *actual_item) return distance; *actual_item = item; return 0; #if 0 if (y >= E_REFLOW_BORDER_WIDTH && y <= reflow->height - E_REFLOW_BORDER_WIDTH) { - float n_x; + gfloat n_x; n_x = x; n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH; n_x = fmod(n_x, (reflow->column_width + E_REFLOW_FULL_GUTTER)); @@ -1337,7 +1337,7 @@ e_reflow_reflow( GnomeCanvasItem *item, gint flags ) e_canvas_item_request_parent_reflow(item); } -static int +static gint e_reflow_selection_event_real (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event) { gint row; diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 652123f2ce..7ae1abeadb 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -748,7 +748,7 @@ set_option (ESearchBar *esb, ESearchBarItem *items) entry_focus_out_cb (esb->entry, NULL, esb); } -static int +static gint find_id (GtkWidget *menu, gint idin, const gchar *type, GtkWidget **widget) { GList *l = GTK_MENU_SHELL (menu)->children; @@ -1614,7 +1614,7 @@ e_search_bar_get_text (ESearchBar *search_bar) void e_search_bar_scope_enable (ESearchBar *esb, gint did, gboolean state) { GtkWidget *widget=NULL; - GList *l ; + GList *l; gint id; gpointer *pointer; diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c index dde69a7e06..90922b5560 100644 --- a/widgets/misc/e-selection-model-array.c +++ b/widgets/misc/e-selection-model-array.c @@ -357,7 +357,7 @@ esma_invert_selection (ESelectionModel *selection) e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), -1, -1); } -static int +static gint esma_row_count (ESelectionModel *selection) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); @@ -405,14 +405,14 @@ esma_change_range(ESelectionModel *selection, gint start, gint end, gboolean gro } } -static int +static gint esma_cursor_row (ESelectionModel *selection) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); return esma->cursor_row; } -static int +static gint esma_cursor_col (ESelectionModel *selection) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); @@ -569,25 +569,25 @@ e_selection_model_array_class_init (ESelectionModelArrayClass *klass) object_class->get_property = esma_get_property; object_class->set_property = esma_set_property; - esm_class->is_row_selected = esma_is_row_selected ; - esm_class->foreach = esma_foreach ; - esm_class->clear = esma_clear ; - esm_class->selected_count = esma_selected_count ; - esm_class->select_all = esma_select_all ; - esm_class->invert_selection = esma_invert_selection ; - esm_class->row_count = esma_row_count ; - - esm_class->change_one_row = esma_change_one_row ; - esm_class->change_cursor = esma_change_cursor ; - esm_class->cursor_row = esma_cursor_row ; - esm_class->cursor_col = esma_cursor_col ; - - esm_class->select_single_row = esma_select_single_row ; - esm_class->toggle_single_row = esma_toggle_single_row ; - esm_class->move_selection_end = esma_move_selection_end ; - esm_class->set_selection_end = esma_set_selection_end ; - - klass->get_row_count = NULL ; + esm_class->is_row_selected = esma_is_row_selected; + esm_class->foreach = esma_foreach; + esm_class->clear = esma_clear; + esm_class->selected_count = esma_selected_count; + esm_class->select_all = esma_select_all; + esm_class->invert_selection = esma_invert_selection; + esm_class->row_count = esma_row_count; + + esm_class->change_one_row = esma_change_one_row; + esm_class->change_cursor = esma_change_cursor; + esm_class->cursor_row = esma_cursor_row; + esm_class->cursor_col = esma_cursor_col; + + esm_class->select_single_row = esma_select_single_row; + esm_class->toggle_single_row = esma_toggle_single_row; + esm_class->move_selection_end = esma_move_selection_end; + esm_class->set_selection_end = esma_set_selection_end; + + klass->get_row_count = NULL; g_object_class_install_property (object_class, PROP_CURSOR_ROW, g_param_spec_int ("cursor_row", diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c index 78303cc9ec..bf71e4e50c 100644 --- a/widgets/misc/e-spinner.c +++ b/widgets/misc/e-spinner.c @@ -315,7 +315,7 @@ e_spinner_images_load (GdkScreen *screen, n = 0; for (y = 0; y < grid_height; y += size) { - for (x = 0; x < grid_width ; x += size) + for (x = 0; x < grid_width; x += size) { pixbuf = extract_frame (icon_pixbuf, x, y, size); @@ -633,7 +633,7 @@ e_spinner_init (ESpinner *spinner) details->need_load = TRUE; } -static int +static gint e_spinner_expose (GtkWidget *widget, GdkEventExpose *event) { diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c index 59909f6542..bf3cefcf24 100644 --- a/widgets/misc/e-task-widget.c +++ b/widgets/misc/e-task-widget.c @@ -252,7 +252,7 @@ e_task_widget_update (ETaskWidget *task_widget, text = g_strdup_printf (_("%s (...)"), information); } else { gint percent_complete; - percent_complete = (int) (completion * 100.0 + .5); + percent_complete = (gint) (completion * 100.0 + .5); /* For Translator only: %s is status message that is displayed (eg "moving items", "updating objects"); %d is a number between 0 and 100, describing the percentage of operation complete */ text = g_strdup_printf (_("%s (%d%% complete)"), information, percent_complete); diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index f1fed4dfab..fb815ff94f 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -239,7 +239,7 @@ e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) { gchar *new, *ob; const gchar *ib; - size_t ibl, obl; + gsize ibl, obl; if (!string) return NULL; @@ -297,7 +297,7 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) { gchar *new, *ob; const gchar *ib; - size_t ibl, obl; + gsize ibl, obl; if (!string) return NULL; @@ -601,7 +601,7 @@ e_utf8_xml1_encode (const gchar *text) gint e_unichar_to_utf8 (gint c, gchar *outbuf) { - size_t len = 0; + gsize len = 0; gint first; gint i; @@ -1962,7 +1962,7 @@ e_canonical_decomposition (gunichar ch, gunichar * buf) /* Found it. */ gint i; /* We store as a double-nul terminated string. */ - for (len = 0; (e_decomp_table[half].expansion[len] || e_decomp_table[half].expansion[len + 1]); len += 2) ; + for (len = 0; (e_decomp_table[half].expansion[len] || e_decomp_table[half].expansion[len + 1]); len += 2); /* We've counted twice as many bytes as there are characters. */ diff --git a/widgets/misc/test-multi-config-dialog.c b/widgets/misc/test-multi-config-dialog.c index b8a43995bc..14327cd6ae 100644 --- a/widgets/misc/test-multi-config-dialog.c +++ b/widgets/misc/test-multi-config-dialog.c @@ -59,7 +59,7 @@ add_pages (EMultiConfigDialog *multi_config_dialog) } } -static int +static gint delete_event_callback (GtkWidget *widget, GdkEventAny *event, gpointer data) diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 638058621d..ef1bb5bc42 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -411,7 +411,7 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc, *x += x1; /* The ETable positions don't include the grid lines, I think, so we add 1. */ *y += y1 + 1 - - (int)((GnomeCanvas *)canvas)->layout.vadjustment->value + - (gint)((GnomeCanvas *)canvas)->layout.vadjustment->value + ((GnomeCanvas *)canvas)->zoom_yofs; scrollbar_width = popup->vscrollbar->requisition.width @@ -595,7 +595,7 @@ e_cell_combo_button_release (GtkWidget *popup_window, /* This handles key press events in the popup window. If the Escape key is pressed we hide the popup, and do not change the cell contents. */ -static int +static gint e_cell_combo_key_press (GtkWidget *popup_window, GdkEventKey *event, ECellCombo *ecc) diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c index 59a8cd3e0d..8fd82a9504 100644 --- a/widgets/table/e-cell-hbox.c +++ b/widgets/table/e-cell-hbox.c @@ -204,7 +204,7 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col /* * ECell::height method */ -static int +static gint ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { ECellHboxView *hbox_view = (ECellHboxView *)ecell_view; @@ -221,7 +221,7 @@ ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) /* * ECell::max_width method */ -static int +static gint ecv_max_width (ECellView *ecell_view, gint model_col, gint view_col) { ECellHboxView *hbox_view = (ECellHboxView *)ecell_view; diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index 64d7d69182..8dff44914a 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -57,55 +57,55 @@ static void ecp_realize (ECellView *ecv); static void ecp_unrealize (ECellView *ecv); static void ecp_draw (ECellView *ecv, GdkDrawable *drawable, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, ECellFlags flags, - int x1, - int y1, - int x2, - int y2); + gint x1, + gint y1, + gint x2, + gint y2); static gint ecp_event (ECellView *ecv, GdkEvent *event, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, ECellFlags flags, ECellActions *actions); -static int ecp_height (ECellView *ecv, - int model_col, - int view_col, - int row); +static gint ecp_height (ECellView *ecv, + gint model_col, + gint view_col, + gint row); static gpointer ecp_enter_edit (ECellView *ecv, - int model_col, - int view_col, - int row); + gint model_col, + gint view_col, + gint row); static void ecp_leave_edit (ECellView *ecv, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, void *edit_context); static void ecp_print (ECellView *ecv, GtkPrintContext *context, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, double width, double height); static gdouble ecp_print_height (ECellView *ecv, GtkPrintContext *context, - int model_col, - int view_col, - int row, + gint model_col, + gint view_col, + gint row, double width); -static int ecp_max_width (ECellView *ecv, - int model_col, - int view_col); +static gint ecp_max_width (ECellView *ecv, + gint model_col, + gint view_col); static void ecp_show_tooltip (ECellView *ecv, - int model_col, - int view_col, - int row, - int col_width, + gint model_col, + gint view_col, + gint row, + gint col_width, ETableTooltip *tooltip); static gchar *ecp_get_bg_color (ECellView *ecell_view, gint row); @@ -368,7 +368,7 @@ ecp_event (ECellView *ecv, GdkEvent *event, gint model_col, gint view_col, /* * ECell::height method */ -static int +static gint ecp_height (ECellView *ecv, gint model_col, gint view_col, gint row) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; @@ -426,7 +426,7 @@ ecp_print_height (ECellView *ecv, GtkPrintContext *context, } -static int +static gint ecp_max_width (ECellView *ecv, gint model_col, gint view_col) diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c index 1fa949ec6a..e2b379f2f9 100644 --- a/widgets/table/e-cell-size.c +++ b/widgets/table/e-cell-size.c @@ -42,7 +42,7 @@ ecd_get_text(ECellText *cell, ETableModel *model, gint col, gint row) } else { fsize = ((gfloat) size) / 1024.0; if (fsize < 1024.0) { - return g_strdup_printf ("%d K", (int)fsize); + return g_strdup_printf ("%d K", (gint)fsize); } else { fsize /= 1024.0; return g_strdup_printf ("%.1f MB", fsize); diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index ff3dd357e8..c62e2d52c5 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -504,7 +504,7 @@ static PangoLayout * layout_with_preedit (ECellTextView *text_view, gint row, const gchar *text, gint width) { CellEdit *edit = text_view->edit; - PangoAttrList *attrs ; + PangoAttrList *attrs; PangoLayout *layout; GString *tmp_string = g_string_new (NULL); PangoAttrList *preedit_attrs = NULL; @@ -567,7 +567,7 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width) { ECellView *ecell_view = (ECellView *) text_view; ECellText *ect = E_CELL_TEXT (ecell_view->ecell); - PangoAttrList *attrs ; + PangoAttrList *attrs; PangoLayout *layout; PangoContext *context; cairo_font_options_t *font_options; @@ -1145,7 +1145,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col /* * ECell::height method */ -static int +static gint ect_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { ECellTextView *text_view = (ECellTextView *) ecell_view; @@ -1430,7 +1430,7 @@ ect_print_height (ECellView *ecell_view, GtkPrintContext *context, return 16 + 8; } -static int +static gint ect_max_width (ECellView *ecell_view, gint model_col, gint view_col) @@ -1456,7 +1456,7 @@ ect_max_width (ECellView *ecell_view, return max_width + 8; } -static int +static gint ect_max_width_by_row (ECellView *ecell_view, gint model_col, gint view_col, @@ -1558,8 +1558,8 @@ ect_show_tooltip (ECellView *ecell_view, &canvas_x, &canvas_y); pixel_origin.x += canvas_x; pixel_origin.y += canvas_y; - pixel_origin.x -= (int) gtk_layout_get_hadjustment (GTK_LAYOUT (text_view->canvas))->value; - pixel_origin.y -= (int) gtk_layout_get_vadjustment (GTK_LAYOUT (text_view->canvas))->value; + pixel_origin.x -= (gint) gtk_layout_get_hadjustment (GTK_LAYOUT (text_view->canvas))->value; + pixel_origin.y -= (gint) gtk_layout_get_vadjustment (GTK_LAYOUT (text_view->canvas))->value; window = gtk_window_new (GTK_WINDOW_POPUP); gtk_container_set_border_width (GTK_CONTAINER (window), 1); @@ -2163,7 +2163,7 @@ _blink_scroll_timeout (gpointer data) return TRUE; } -static int +static gint next_word (CellEdit *edit, gint start) { gchar *p; @@ -2185,7 +2185,7 @@ next_word (CellEdit *edit, gint start) return p - edit->text; } -static int +static gint _get_position (ECellTextView *text_view, ETextEventProcessorCommand *command) { gint length; diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h index df4a6f827c..f3ecc415b4 100644 --- a/widgets/table/e-cell-text.h +++ b/widgets/table/e-cell-text.h @@ -98,7 +98,7 @@ ECell *e_cell_text_construct(ECellText *cell, const gchar *fontname, GtkJust /* Gets the value from the model and converts it into a string. In ECellText itself, the value is assumed to be a gchar * and so needs no conversion. In subclasses the ETableModel value may be a more complicated datatype. */ -char *e_cell_text_get_text (ECellText *cell, ETableModel *model, gint col, gint row); +gchar *e_cell_text_get_text (ECellText *cell, ETableModel *model, gint col, gint row); /* Frees the value returned by e_cell_text_get_text(). */ void e_cell_text_free_text (ECellText *cell, gchar *text); diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 1acbf7af61..4057c06440 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -215,7 +215,7 @@ etog_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_co /* * ECell::height method */ -static int +static gint etog_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell); @@ -275,7 +275,7 @@ etog_print_height (ECellView *ecell_view, GtkPrintContext *context, /* * ECell::max_width method */ -static int +static gint etog_max_width (ECellView *ecell_view, gint model_col, gint view_col) { ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell); diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index 0b61253c61..7e7325684d 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -93,7 +93,7 @@ e_cell_tree_get_tree_table_adapter (ETableModel *table_model, gint row) return e_table_model_value_at (table_model, -3, row); } -static int +static gint visible_depth_of_node (ETableModel *model, gint row) { ETreeModel *tree_model = e_cell_tree_get_tree_model(model, row); @@ -427,7 +427,7 @@ event_in_expander (GdkEvent *event, gint offset, gint height) /* * ECell::height method */ -static int +static gint ect_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { ECellTreeView *tree_view = (ECellTreeView *) ecell_view; @@ -567,7 +567,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col /* * ECell::max_width method */ -static int +static gint ect_max_width (ECellView *ecell_view, gint model_col, gint view_col) { ECellTreeView *tree_view = (ECellTreeView *) ecell_view; diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index 9bac6ad9c6..3d18894530 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -191,7 +191,7 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col /* * ECell::height method */ -static int +static gint ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) { ECellVboxView *vbox_view = (ECellVboxView *)ecell_view; @@ -207,7 +207,7 @@ ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) /* * ECell::max_width method */ -static int +static gint ecv_max_width (ECellView *ecell_view, gint model_col, gint view_col) { ECellVboxView *vbox_view = (ECellVboxView *)ecell_view; diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index 9b2efc49ee..eceae68bc8 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -313,7 +313,7 @@ etcta_unrealize (GnomeCanvasItem *item) static void finish_editing (ETableClickToAdd *etcta); -static int +static gint item_key_press (ETableItem *item, gint row, gint col, GdkEvent *event, ETableClickToAdd *etcta) { switch (event->key.keyval) { @@ -374,7 +374,7 @@ finish_editing (ETableClickToAdd *etcta) /* * Handles the events on the ETableClickToAdd, particularly it creates the ETableItem and passes in some events. */ -static int +static gint etcta_event (GnomeCanvasItem *item, GdkEvent *e) { ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item); diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c index 0fd82bf0ed..00b0ab2fd9 100644 --- a/widgets/table/e-table-config-field.c +++ b/widgets/table/e-table-config-field.c @@ -81,7 +81,7 @@ e_table_config_field_new (ETableSpecification *spec, return (ETableConfigField *) etcf; } -inline static int +inline static gint etcf_get_count (ETableConfigField *etcf) { if (etcf->grouping) diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 23ff88d2bd..3a0ee849e8 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -249,7 +249,7 @@ find_column_in_spec (ETableSpecification *spec, gint model_col) return NULL; } -static int +static gint find_model_column_by_name (ETableSpecification *spec, const gchar *s) { ETableColumnSpecification **column; @@ -1047,7 +1047,7 @@ config_button_remove (GtkWidget *widget, ETableConfig *config) for (column = columns; column; column = column->next) { gint row = GPOINTER_TO_INT (column->data); - memmove (config->temp_state->columns + row, config->temp_state->columns + row + 1, sizeof (int) * (config->temp_state->col_count - row - 1)); + memmove (config->temp_state->columns + row, config->temp_state->columns + row + 1, sizeof (gint) * (config->temp_state->col_count - row - 1)); memmove (config->temp_state->expansions + row, config->temp_state->expansions + row + 1, sizeof (double) * (config->temp_state->col_count - row - 1)); config->temp_state->col_count --; } diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c index 7772a2851b..39d9719b03 100644 --- a/widgets/table/e-table-example-1.c +++ b/widgets/table/e-table-example-1.c @@ -127,14 +127,14 @@ gchar *table_data [ROWS] [COLS]; */ /* This function returns the number of columns in our ETableModel. */ -static int +static gint my_col_count (ETableModel *etc, gpointer data) { return COLS; } /* This function returns the number of rows in our ETableModel. */ -static int +static gint my_row_count (ETableModel *etc, gpointer data) { return ROWS; diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c index 295820da23..391873b043 100644 --- a/widgets/table/e-table-example-2.c +++ b/widgets/table/e-table-example-2.c @@ -133,13 +133,13 @@ gboolean importance_data[ROWS]; static GdkColor *color1; static GdkColor *color2; -static int +static gint my_col_count (ETableModel *etc, gpointer data) { return VIRTUAL_COLS; } -static int +static gint my_row_count (ETableModel *etc, gpointer data) { return ROWS; @@ -232,9 +232,9 @@ static gchar * my_value_to_string (ETableModel *etc, gint col, gconstpointer value, gpointer data) { if (col == COLOR_COLUMN){ - return g_strdup_printf("%d", (int) value); + return g_strdup_printf("%d", (gint) value); } else if (col == IMPORTANCE_COLUMN){ - return g_strdup_printf("%d", (int) value); + return g_strdup_printf("%d", (gint) value); } else { return g_strdup(value); } diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 9c62064b27..d897d16f85 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -575,7 +575,7 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, double x, doub /* * Handles the events on the ETableFieldChooserItem */ -static int +static gint etfci_event (GnomeCanvasItem *item, GdkEvent *e) { ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item); diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 28b7f4e45f..1ba845e2c3 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -198,7 +198,7 @@ e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header } -static int +static gint etgc_event (GnomeCanvasItem *item, GdkEvent *event) { ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(item); @@ -572,7 +572,7 @@ etgc_remove (ETableGroup *etg, gint row) ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg); GList *list; - for (list = etgc->children ; list; list = g_list_next (list)) { + for (list = etgc->children; list; list = g_list_next (list)) { ETableGroupContainerChildNode *child_node = list->data; ETableGroup *child = child_node->child; @@ -593,7 +593,7 @@ etgc_remove (ETableGroup *etg, gint row) return FALSE; } -static int +static gint etgc_row_count (ETableGroup *etg) { ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg); @@ -613,7 +613,7 @@ etgc_increment (ETableGroup *etg, gint position, gint amount) ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg); GList *list = etgc->children; - for (list = etgc->children ; list; list = g_list_next (list)) + for (list = etgc->children; list; list = g_list_next (list)) e_table_group_increment (((ETableGroupContainerChildNode *)list->data)->child, position, amount); } @@ -624,7 +624,7 @@ etgc_decrement (ETableGroup *etg, gint position, gint amount) ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER(etg); GList *list = etgc->children; - for (list = etgc->children ; list; list = g_list_next (list)) + for (list = etgc->children; list; list = g_list_next (list)) e_table_group_decrement (((ETableGroupContainerChildNode *)list->data)->child, position, amount); } @@ -1220,8 +1220,8 @@ e_table_group_container_print_page (EPrintable *ep, cairo_save (cr); cairo_rectangle (cr, 0, 0, width,TEXT_AREA_HEIGHT); cairo_rectangle (cr, 0, 0, 2 * TEXT_AREA_HEIGHT, child_height + TEXT_AREA_HEIGHT); - cairo_set_source_rgb (cr, .7, .7, .7) ; - cairo_fill(cr) ; + cairo_set_source_rgb (cr, .7, .7, .7); + cairo_fill(cr); cairo_restore (cr); cairo_save (cr); @@ -1245,7 +1245,7 @@ e_table_group_container_print_page (EPrintable *ep, pango_cairo_show_layout (cr, layout); g_free(string); - cairo_translate(cr, 2 * TEXT_AREA_HEIGHT, TEXT_AREA_HEIGHT) ; + cairo_translate(cr, 2 * TEXT_AREA_HEIGHT, TEXT_AREA_HEIGHT); cairo_move_to(cr, 0, 0); cairo_rectangle (cr, 0, 0, width - 2 * TEXT_AREA_HEIGHT,child_height); cairo_clip(cr); diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c index 5e269e284e..61d357aaf2 100644 --- a/widgets/table/e-table-group-leaf.c +++ b/widgets/table/e-table-group-leaf.c @@ -363,7 +363,7 @@ etgl_decrement (ETableGroup *etg, gint position, gint amount) } } -static int +static gint etgl_row_count (ETableGroup *etg) { ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg); diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index a1d965b57a..7d3499f8f0 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -590,7 +590,7 @@ e_table_group_get_header (ETableGroup *etg) return etg->header; } -static int +static gint etg_event (GnomeCanvasItem *item, GdkEvent *event) { ETableGroup *etg = E_TABLE_GROUP (item); diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 909c00ddf7..67695e87b3 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -151,7 +151,7 @@ ethi_dispose (GObject *object){ (*G_OBJECT_CLASS (ethi_parent_class)->dispose) (object); } -static int +static gint e_table_header_item_get_height (ETableHeaderItem *ethi) { ETableHeader *eth; @@ -387,7 +387,7 @@ ethi_get_property (GObject *object, } } -static int +static gint ethi_find_col_by_x (ETableHeaderItem *ethi, gint x) { const gint cols = e_table_header_count (ethi->eth); @@ -417,7 +417,7 @@ ethi_find_col_by_x (ETableHeaderItem *ethi, gint x) return cols - 1; } -static int +static gint ethi_find_col_by_x_nearest (ETableHeaderItem *ethi, gint x) { const gint cols = e_table_header_count (ethi->eth); @@ -1682,7 +1682,7 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col) /* * Handles the events on the ETableHeaderItem, particularly it handles resizing */ -static int +static gint ethi_event (GnomeCanvasItem *item, GdkEvent *e) { ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item); @@ -1779,7 +1779,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) gint width = 0; g_signal_emit_by_name (ethi->eth, "request_width", - (int)ethi->resize_col, &width); + (gint)ethi->resize_col, &width); /* Add 10 to stop it from "..."ing */ e_table_header_set_size (ethi->eth, ethi->resize_col, width + 10); diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index 81adbf15e9..bfc6768817 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -67,7 +67,7 @@ build_header_layout (GtkWidget *widget, const gchar *str) * * Return value: The height of the button, in pixels. **/ -double +gdouble e_table_header_compute_height (ETableCol *ecol, GtkWidget *widget) { gint ythick; @@ -98,7 +98,7 @@ e_table_header_compute_height (ETableCol *ecol, GtkWidget *widget) return height; } -double +gdouble e_table_header_width_extras (GtkStyle *style) { g_return_val_if_fail (style != NULL, -1); @@ -179,7 +179,7 @@ make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc, else xfactor = width; - p[3] = ((int) p[3] * xfactor * yfactor / (width * height)); + p[3] = ((gint) p[3] * xfactor * yfactor / (width * height)); p += 4; } } diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h index 7804bd12c5..60b373ef7f 100644 --- a/widgets/table/e-table-header-utils.h +++ b/widgets/table/e-table-header-utils.h @@ -32,9 +32,9 @@ extern "C" { #endif /* __cplusplus */ -double e_table_header_compute_height (ETableCol *ecol, +gdouble e_table_header_compute_height (ETableCol *ecol, GtkWidget *widget); -double e_table_header_width_extras (GtkStyle *style); +gdouble e_table_header_width_extras (GtkStyle *style); void e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol, GtkStyle *style, diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index ec54f3dcfc..e5eb2f2d11 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -609,7 +609,7 @@ eti_remove_header_model (ETableItem *eti) * Returns the height used by row @row. This does not include the one-pixel * used as a separator between rows */ -static int +static gint eti_row_height_real (ETableItem *eti, gint row) { const gint cols = e_table_header_count (eti->header); @@ -698,7 +698,7 @@ calculate_height_cache (ETableItem *eti) * Returns the height used by row @row. This does not include the one-pixel * used as a separator between rows */ -static int +static gint eti_row_height (ETableItem *eti, gint row) { if (eti->uniform_row_height) { @@ -734,7 +734,7 @@ eti_row_height (ETableItem *eti, gint row) * when the height is computed by using the first row as the size for * every other row in the ETableItem. */ -static int +static gint eti_get_height (ETableItem *eti) { const gint rows = eti->rows; @@ -1169,7 +1169,7 @@ eti_table_model_rows_inserted (ETableModel *table_model, gint row, gint count, E if (eti->height_cache) { gint i; eti->height_cache = g_renew(int, eti->height_cache, eti->rows); - memmove(eti->height_cache + row + count, eti->height_cache + row, (eti->rows - count - row) * sizeof(int)); + memmove(eti->height_cache + row + count, eti->height_cache + row, (eti->rows - count - row) * sizeof(gint)); for (i = row; i < row + count; i++) eti->height_cache[i] = -1; } @@ -1195,7 +1195,7 @@ eti_table_model_rows_deleted (ETableModel *table_model, gint row, gint count, ET eti->rows = e_table_model_row_count (eti->table_model); if (eti->height_cache && (eti->rows > row)) { - memmove(eti->height_cache + row, eti->height_cache + row + count, (eti->rows - row) * sizeof(int)); + memmove(eti->height_cache + row, eti->height_cache + row + count, (eti->rows - row) * sizeof(gint)); } eti_unfreeze (eti); @@ -1372,7 +1372,7 @@ eti_header_structure_changed (ETableHeader *eth, ETableItem *eti) gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (eti)); } -static int +static gint eti_request_column_width (ETableHeader *eth, gint col, ETableItem *eti) { gint width = 0; @@ -2222,7 +2222,7 @@ eti_cursor_move_right (ETableItem *eti) } #ifdef DO_TOOLTIPS -static int +static gint _do_tooltip (ETableItem *eti) { ECellView *ecell_view; @@ -2312,7 +2312,7 @@ eti_e_cell_event (ETableItem *item, ECellView *ecell_view, GdkEvent *event, } /* FIXME: cursor */ -static int +static gint eti_event (GnomeCanvasItem *item, GdkEvent *e) { ETableItem *eti = E_TABLE_ITEM (item); @@ -2674,7 +2674,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) gint cursor_row, cursor_col; gint handled = TRUE; - d(g_print("%s: GDK_KEY_PRESS received, keyval: %d\n", __FUNCTION__, (int) e->key.keyval)); + d(g_print("%s: GDK_KEY_PRESS received, keyval: %d\n", __FUNCTION__, (gint) e->key.keyval)); g_object_get(eti->selection, "cursor_row", &cursor_row, @@ -2881,7 +2881,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) case GDK_KEY_RELEASE: { gint cursor_row, cursor_col; - d(g_print("%s: GDK_KEY_RELEASE received, keyval: %d\n", __FUNCTION__, (int) e->key.keyval)); + d(g_print("%s: GDK_KEY_RELEASE received, keyval: %d\n", __FUNCTION__, (gint) e->key.keyval)); g_object_get(eti->selection, "cursor_row", &cursor_row, @@ -3464,7 +3464,7 @@ e_table_item_compute_mouse_over (ETableItem *eti, gnome_canvas_item_w2i (GNOME_CANVAS_ITEM (eti), &realx, &realy); - if (!find_cell (eti, (int)realx, (int)realy, col, row, NULL, NULL)) { + if (!find_cell (eti, (gint)realx, (gint)realy, col, row, NULL, NULL)) { *row = -1; *col = -1; } @@ -3590,7 +3590,7 @@ e_table_item_print_page (EPrintable *ep, } yd++; - for (row = rows_printed; row < rows ; row++){ + for (row = rows_printed; row < rows; row++){ gdouble xd = 1, row_height; row_height = eti_printed_row_height(eti, widths, context, row); diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index f149656fac..92e8e0c2fd 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -227,9 +227,9 @@ void e_table_item_get_cell_geometry (ETableItem *eti, gint *width, gint *height); -int e_table_item_row_diff (ETableItem *eti, - int start_row, - int end_row); +gint e_table_item_row_diff (ETableItem *eti, + gint start_row, + gint end_row); G_END_DECLS diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c index c06303ca4b..d39a396c64 100644 --- a/widgets/table/e-table-memory-callbacks.c +++ b/widgets/table/e-table-memory-callbacks.c @@ -29,7 +29,7 @@ G_DEFINE_TYPE (ETableMemoryCalbacks, e_table_memory_callbacks, E_TABLE_MEMORY_TYPE) -static int +static gint etmc_column_count (ETableModel *etm) { ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS(etm); diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c index 622de851c0..95ea4bee99 100644 --- a/widgets/table/e-table-memory-store.c +++ b/widgets/table/e-table-memory-store.c @@ -87,7 +87,7 @@ free_value (ETableMemoryStore *etms, gint col, gpointer value) } -static int +static gint etms_column_count (ETableModel *etm) { ETableMemoryStore *etms = E_TABLE_MEMORY_STORE(etm); diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c index 98fd65c460..8eb6a3e30c 100644 --- a/widgets/table/e-table-memory.c +++ b/widgets/table/e-table-memory.c @@ -64,7 +64,7 @@ etmm_finalize (GObject *object) G_OBJECT_CLASS (e_table_memory_parent_class)->finalize (object); } -static int +static gint etmm_row_count (ETableModel *etm) { ETableMemory *etmm = E_TABLE_MEMORY (etm); diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c index c8cea32963..a604e7a590 100644 --- a/widgets/table/e-table-one.c +++ b/widgets/table/e-table-one.c @@ -29,7 +29,7 @@ G_DEFINE_TYPE (ETableOne, e_table_one, E_TABLE_MODEL_TYPE) -static int +static gint one_column_count (ETableModel *etm) { ETableOne *one = E_TABLE_ONE(etm); @@ -40,7 +40,7 @@ one_column_count (ETableModel *etm) return 0; } -static int +static gint one_row_count (ETableModel *etm) { return 1; diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c index f2eceb9314..2980bec7c0 100644 --- a/widgets/table/e-table-simple.c +++ b/widgets/table/e-table-simple.c @@ -30,7 +30,7 @@ G_DEFINE_TYPE (ETableSimple, e_table_simple, E_TABLE_MODEL_TYPE) -static int +static gint simple_column_count (ETableModel *etm) { ETableSimple *simple = E_TABLE_SIMPLE(etm); @@ -41,7 +41,7 @@ simple_column_count (ETableModel *etm) return 0; } -static int +static gint simple_row_count (ETableModel *etm) { ETableSimple *simple = E_TABLE_SIMPLE(etm); diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c index c4d5574dbc..4676db8ac4 100644 --- a/widgets/table/e-table-sorted-variable.c +++ b/widgets/table/e-table-sorted-variable.c @@ -133,7 +133,7 @@ etsv_add (ETableSubsetVariable *etssv, if (etss->n_map + 1 > etssv->n_vals_allocated) { etssv->n_vals_allocated += INCREMENT_AMOUNT; - etss->map_table = g_realloc (etss->map_table, (etssv->n_vals_allocated) * sizeof(int)); + etss->map_table = g_realloc (etss->map_table, (etssv->n_vals_allocated) * sizeof(gint)); } i = etss->n_map; if (etsv->sort_idle_id == 0) { @@ -149,7 +149,7 @@ etsv_add (ETableSubsetVariable *etssv, etsv->insert_idle_id = g_idle_add_full(40, (GSourceFunc) etsv_insert_idle, etsv, NULL); } i = e_table_sorting_utils_insert(etss->source, etsv->sort_info, etsv->full_header, etss->map_table, etss->n_map, row); - memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(int)); + memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(gint)); } } etss->map_table[i] = row; @@ -173,7 +173,7 @@ etsv_add_all (ETableSubsetVariable *etssv) if (etss->n_map + rows > etssv->n_vals_allocated){ etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, rows); - etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int)); + etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(gint)); } for (i = 0; i < rows; i++) etss->map_table[etss->n_map++] = i; diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h index 48bb0e3aa0..c778af3c1f 100644 --- a/widgets/table/e-table-sorted-variable.h +++ b/widgets/table/e-table-sorted-variable.h @@ -48,8 +48,8 @@ typedef struct { gint sort_info_changed_id; gint sort_idle_id; - int insert_idle_id; - int insert_count; + gint insert_idle_id; + gint insert_count; } ETableSortedVariable; diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c index ae9bbbd3eb..16bb3cf888 100644 --- a/widgets/table/e-table-sorted.c +++ b/widgets/table/e-table-sorted.c @@ -218,7 +218,7 @@ ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row } } - etss->map_table = g_realloc (etss->map_table, (etss->n_map + count) * sizeof(int)); + etss->map_table = g_realloc (etss->map_table, (etss->n_map + count) * sizeof(gint)); for (; count > 0; count --) { if (!full_change) @@ -237,7 +237,7 @@ ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row ets->insert_idle_id = g_idle_add_full(40, (GSourceFunc) ets_insert_idle, ets, NULL); } i = e_table_sorting_utils_insert(etss->source, ets->sort_info, ets->full_header, etss->map_table, etss->n_map, row); - memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(int)); + memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(gint)); } } etss->map_table[i] = row; @@ -271,7 +271,7 @@ ets_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *source, gint row, if (etss->map_table[i] == row + j) { if (shift) e_table_model_pre_change (etm); - memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(int)); + memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(gint)); etss->n_map --; if (shift) e_table_model_row_deleted (etm, i); diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h index cb802768d8..a9e815ef3a 100644 --- a/widgets/table/e-table-sorted.h +++ b/widgets/table/e-table-sorted.h @@ -48,8 +48,8 @@ typedef struct { gint sort_info_changed_id; gint sort_idle_id; - int insert_idle_id; - int insert_count; + gint insert_idle_id; + gint insert_count; } ETableSorted; diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c index 4d3148a902..766d94dd58 100644 --- a/widgets/table/e-table-sorter.c +++ b/widgets/table/e-table-sorter.c @@ -161,11 +161,11 @@ ets_class_init (ETableSorterClass *klass) object_class->set_property = ets_set_property; object_class->get_property = ets_get_property; - sorter_class->model_to_sorted = ets_model_to_sorted ; - sorter_class->sorted_to_model = ets_sorted_to_model ; - sorter_class->get_model_to_sorted_array = ets_get_model_to_sorted_array ; - sorter_class->get_sorted_to_model_array = ets_get_sorted_to_model_array ; - sorter_class->needs_sorting = ets_needs_sorting ; + sorter_class->model_to_sorted = ets_model_to_sorted; + sorter_class->sorted_to_model = ets_sorted_to_model; + sorter_class->get_model_to_sorted_array = ets_get_model_to_sorted_array; + sorter_class->get_sorted_to_model_array = ets_get_sorted_to_model_array; + sorter_class->needs_sorting = ets_needs_sorting; g_object_class_install_property (object_class, PROP_SORT_INFO, g_param_spec_object ("sort_info", @@ -268,7 +268,7 @@ static GCompareFunc *compare_closure; /* FIXME: Make it not cache the second and later columns (as if anyone cares.) */ -static int +static gint qsort_callback(gconstpointer data1, gconstpointer data2) { gint row1 = *(gint *)data1; @@ -355,7 +355,7 @@ ets_sort(ETableSorter *ets) ascending_closure[j] = column.ascending; } - qsort(ets->sorted, rows, sizeof(int), qsort_callback); + qsort(ets->sorted, rows, sizeof(gint), qsort_callback); g_free(vals_closure); g_free(ascending_closure); diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c index a8ab92bf94..cf1b503b09 100644 --- a/widgets/table/e-table-sorting-utils.c +++ b/widgets/table/e-table-sorting-utils.c @@ -31,7 +31,7 @@ #define d(x) /* This takes source rows. */ -static int +static gint etsu_compare(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint row1, gint row2) { gint j; @@ -77,7 +77,7 @@ typedef struct { /* FIXME: Make it not cache the second and later columns (as if anyone cares.) */ -static int +static gint e_sort_callback(gconstpointer data1, gconstpointer data2, gpointer user_data) { gint row1 = *(gint *)data1; @@ -142,7 +142,7 @@ e_table_sorting_utils_sort(ETableModel *source, ETableSortInfo *sort_info, ETabl } g_qsort_with_data ( - map_table, rows, sizeof(int), e_sort_callback, &closure); + map_table, rows, sizeof(gint), e_sort_callback, &closure); g_free(closure.vals); g_free(closure.ascending); @@ -218,7 +218,7 @@ e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_ /* This takes source rows. */ -static int +static gint etsu_tree_compare(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath path1, ETreePath path2) { gint j; @@ -243,7 +243,7 @@ etsu_tree_compare(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *f return comp_val; } -static int +static gint e_sort_tree_callback(gconstpointer data1, gconstpointer data2, gpointer user_data) { ETreePath *path1 = *(ETreePath *)data1; @@ -296,7 +296,7 @@ e_table_sorting_utils_tree_sort(ETreeModel *source, ETableSortInfo *sort_info, E } g_qsort_with_data ( - map, count, sizeof(int), e_sort_callback, &closure); + map, count, sizeof(gint), e_sort_callback, &closure); map_copy = g_new(ETreePath, count); for (i = 0; i < count; i++) { @@ -340,8 +340,8 @@ e_table_sorting_utils_tree_check_position (ETreeModel *source, ETableSortInfo *s gint e_table_sorting_utils_tree_insert(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, gint count, ETreePath path) { - size_t start; - size_t end; + gsize start; + gsize end; ETreeSortClosure closure; closure.tree = source; diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c index 93faeac0f8..de1d7ccacf 100644 --- a/widgets/table/e-table-subset-variable.c +++ b/widgets/table/e-table-subset-variable.c @@ -48,7 +48,7 @@ etssv_add (ETableSubsetVariable *etssv, if (etss->n_map + 1 > etssv->n_vals_allocated){ etssv->n_vals_allocated += INCREMENT_AMOUNT; - etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int)); + etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(gint)); } etss->map_table[etss->n_map++] = row; @@ -69,7 +69,7 @@ etssv_add_array (ETableSubsetVariable *etssv, if (etss->n_map + count > etssv->n_vals_allocated){ etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, count); - etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int)); + etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(gint)); } for (i = 0; i < count; i++) etss->map_table[etss->n_map++] = array[i]; @@ -90,7 +90,7 @@ etssv_add_all (ETableSubsetVariable *etssv) rows = e_table_model_row_count(etss->source); if (etss->n_map + rows > etssv->n_vals_allocated){ etssv->n_vals_allocated += MAX(INCREMENT_AMOUNT, rows); - etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(int)); + etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof(gint)); } for (i = 0; i < rows; i++) etss->map_table[etss->n_map++] = i; @@ -109,7 +109,7 @@ etssv_remove (ETableSubsetVariable *etssv, for (i = 0; i < etss->n_map; i++){ if (etss->map_table[i] == row) { e_table_model_pre_change (etm); - memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(int)); + memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(gint)); etss->n_map --; e_table_model_row_deleted (etm, i); @@ -253,6 +253,6 @@ e_table_subset_variable_set_allocation (ETableSubsetVariable *etssv, if (total <= 0) total = 1; if (total > etss->n_map){ - etss->map_table = g_realloc (etss->map_table, total * sizeof(int)); + etss->map_table = g_realloc (etss->map_table, total * sizeof(gint)); } } diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c index bf137e0ef8..a860aba24f 100644 --- a/widgets/table/e-table-subset.c +++ b/widgets/table/e-table-subset.c @@ -131,7 +131,7 @@ etss_finalize (GObject *object) G_OBJECT_CLASS (etss_parent_class)->finalize (object); } -static int +static gint etss_column_count (ETableModel *etm) { ETableSubset *etss = (ETableSubset *)etm; @@ -139,7 +139,7 @@ etss_column_count (ETableModel *etm) return e_table_model_column_count (etss->source); } -static int +static gint etss_row_count (ETableModel *etm) { ETableSubset *etss = (ETableSubset *)etm; @@ -394,7 +394,7 @@ e_table_subset_construct (ETableSubset *etss, ETableModel *source, gint nvals) gint i; if (nvals) { - buffer = (guint *) g_malloc (sizeof (unsigned int) * nvals); + buffer = (guint *) g_malloc (sizeof (guint) * nvals); if (buffer == NULL) return NULL; } else diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index fc7cb101ec..a53ada3589 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -114,7 +114,7 @@ remove_row (ETableWithout *etw, gint view_row) ETableSubset *etss = E_TABLE_SUBSET (etw); e_table_model_pre_change (E_TABLE_MODEL (etw)); - memmove (etss->map_table + view_row, etss->map_table + view_row + 1, (etss->n_map - view_row - 1) * sizeof (int)); + memmove (etss->map_table + view_row, etss->map_table + view_row + 1, (etss->n_map - view_row - 1) * sizeof (gint)); etss->n_map --; e_table_model_row_deleted (E_TABLE_MODEL (etw), view_row); } diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 29eb9ac481..703f645527 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -690,8 +690,8 @@ table_canvas_reflow_idle (ETable *e_table) "height", &height, "width", &width, NULL); - height = MAX ((int)height, alloc->height); - width = MAX((int)width, alloc->width); + height = MAX ((gint)height, alloc->height); + width = MAX((gint)width, alloc->width); /* I have no idea why this needs to be -1, but it works. */ gnome_canvas_get_scroll_region (GNOME_CANVAS (e_table->table_canvas), NULL, NULL, &oldwidth, &oldheight); @@ -720,7 +720,7 @@ table_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, g_object_get (e_table->canvas_vbox, "height", &height, NULL); - height = MAX ((int)height, alloc->height); + height = MAX ((gint)height, alloc->height); g_object_set (e_table->canvas_vbox, "width", width, diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c index 562a47386c..e961a067ca 100644 --- a/widgets/table/e-tree-memory-callbacks.c +++ b/widgets/table/e-tree-memory-callbacks.c @@ -39,7 +39,7 @@ etmc_icon_at (ETreeModel *etm, ETreePath node) return etmc->icon_at (etm, node, etmc->model_data); } -static int +static gint etmc_column_count (ETreeModel *etm) { ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS(etm); diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index 54bd7b77f5..8cd2f06cb9 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -84,7 +84,7 @@ check_children (ETreeMemory *memory, ETreePath node) } } -static int +static gint e_tree_memory_path_depth (ETreeMemoryPath *path) { gint depth = 0; @@ -636,7 +636,7 @@ typedef struct { ETreeMemorySortCallback callback; } MemoryAndClosure; -static int +static gint sort_callback(gconstpointer data1, gconstpointer data2, gpointer user_data) { ETreePath path1 = *(ETreePath *)data1; diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 3bb4375b4d..87140ef30a 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -455,7 +455,7 @@ etsm_selected_count (ESelectionModel *selection) return g_hash_table_size (etsm->priv->paths); } -static int +static gint etsm_row_count (ESelectionModel *selection) { ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL(selection); @@ -783,23 +783,23 @@ e_tree_selection_model_class_init (ETreeSelectionModelClass *klass) object_class->get_property = etsm_get_property; object_class->set_property = etsm_set_property; - esm_class->is_row_selected = etsm_is_row_selected ; - esm_class->foreach = etsm_foreach ; - esm_class->clear = etsm_clear ; - esm_class->selected_count = etsm_selected_count ; - esm_class->select_all = etsm_select_all ; - esm_class->invert_selection = etsm_invert_selection ; - esm_class->row_count = etsm_row_count ; - - esm_class->change_one_row = etsm_change_one_row ; - esm_class->change_cursor = etsm_change_cursor ; - esm_class->cursor_row = etsm_cursor_row ; - esm_class->cursor_col = etsm_cursor_col ; - - esm_class->select_single_row = etsm_select_single_row ; - esm_class->toggle_single_row = etsm_toggle_single_row ; - esm_class->move_selection_end = etsm_move_selection_end ; - esm_class->set_selection_end = etsm_set_selection_end ; + esm_class->is_row_selected = etsm_is_row_selected; + esm_class->foreach = etsm_foreach; + esm_class->clear = etsm_clear; + esm_class->selected_count = etsm_selected_count; + esm_class->select_all = etsm_select_all; + esm_class->invert_selection = etsm_invert_selection; + esm_class->row_count = etsm_row_count; + + esm_class->change_one_row = etsm_change_one_row; + esm_class->change_cursor = etsm_change_cursor; + esm_class->cursor_row = etsm_cursor_row; + esm_class->cursor_col = etsm_cursor_col; + + esm_class->select_single_row = etsm_select_single_row; + esm_class->toggle_single_row = etsm_toggle_single_row; + esm_class->move_selection_end = etsm_move_selection_end; + esm_class->set_selection_end = etsm_set_selection_end; g_object_class_install_property (object_class, PROP_CURSOR_ROW, g_param_spec_int ("cursor_row", diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c index b71f108a7d..a1668dc542 100644 --- a/widgets/table/e-tree-simple.c +++ b/widgets/table/e-tree-simple.c @@ -27,7 +27,7 @@ #include "e-tree-simple.h" -static int +static gint simple_column_count (ETableModel *etm) { ETreeSimple *simple = E_TREE_SIMPLE(etm); diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c index d9901e611b..822affeee8 100644 --- a/widgets/table/e-tree-sorted-variable.c +++ b/widgets/table/e-tree-sorted-variable.c @@ -211,7 +211,7 @@ etsv_sort_info_changed (ETableSortInfo *info, ETreeSortedVariable *etsv) } /* This takes source rows. */ -static int +static gint etsv_compare(ETreeSortedVariable *etsv, const ETreePath *path1, const ETreePath *path2) { gint j; @@ -249,7 +249,7 @@ gint *ascending_closure; gint *col_idx_closure; GCompareFunc *compare_closure; -static int +static gint etsv_compare_closure(const ETreePath *path1, const ETreePath *path2) { gint j; @@ -275,7 +275,7 @@ etsv_compare_closure(const ETreePath *path1, const ETreePath *path2) return comp_val; } -static int +static gint qsort_callback(gconstpointer data1, gconstpointer data2) { GNode *node1 = *(GNode **)data1; @@ -283,7 +283,7 @@ qsort_callback(gconstpointer data1, gconstpointer data2) return etsv_compare_closure(node1->data, node2->data); } -static int +static gint qsort_callback_source(gconstpointer data1, gconstpointer data2) { return etsv_compare_closure(data1, data2); diff --git a/widgets/table/e-tree-sorted-variable.h b/widgets/table/e-tree-sorted-variable.h index 2d5af111d9..1c4de3ed9c 100644 --- a/widgets/table/e-tree-sorted-variable.h +++ b/widgets/table/e-tree-sorted-variable.h @@ -51,8 +51,8 @@ typedef struct { gint table_model_cell_changed_id; gint sort_info_changed_id; gint sort_idle_id; - int insert_idle_id; - int insert_count; + gint insert_idle_id; + gint insert_count; } ETreeSortedVariable; diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index c72c269471..cd4ef4a537 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -1065,7 +1065,7 @@ ets_proxy_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETr } parent_path->num_children ++; parent_path->children = g_renew(ETreeSortedPath *, parent_path->children, parent_path->num_children); - memmove(parent_path->children + i + 1, parent_path->children + i, (parent_path->num_children - 1 - i) * sizeof(int)); + memmove(parent_path->children + i + 1, parent_path->children + i, (parent_path->num_children - 1 - i) * sizeof(gint)); parent_path->children[i] = path; for (j = i; j < parent_path->num_children; j++) { parent_path->children[j]->position = j; diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index cac1260681..783f58c4cc 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -73,7 +73,7 @@ struct ETreeTableAdapterPriv { gint pre_change_id; gint no_change_id; - int rebuilt_id; + gint rebuilt_id; gint node_changed_id; gint node_data_changed_id; gint node_col_changed_id; @@ -259,7 +259,7 @@ update_child_counts(GNode *gnode, gint delta) } } -static int +static gint delete_children(ETreeTableAdapter *etta, GNode *gnode) { node_t *node = (node_t *)gnode->data; @@ -566,7 +566,7 @@ etta_dispose (GObject *object) G_OBJECT_CLASS (etta_parent_class)->dispose (object); } -static int +static gint etta_column_count (ETableModel *etm) { ETreeTableAdapter *etta = (ETreeTableAdapter *)etm; @@ -599,7 +599,7 @@ etta_has_change_pending (ETableModel *etm) } -static int +static gint etta_row_count (ETableModel *etm) { ETreeTableAdapter *etta = (ETreeTableAdapter *)etm; diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 6e9b2f8d90..92b79fefd3 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -738,8 +738,8 @@ tree_canvas_reflow_idle (ETree *e_tree) "height", &height, "width", &width, NULL); - height = MAX ((int)height, alloc->height); - width = MAX((int)width, alloc->width); + height = MAX ((gint)height, alloc->height); + width = MAX((gint)width, alloc->width); /* I have no idea why this needs to be -1, but it works. */ gnome_canvas_get_scroll_region (GNOME_CANVAS (e_tree->priv->table_canvas), NULL, NULL, &oldwidth, &oldheight); @@ -771,7 +771,7 @@ tree_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, g_object_get (e_tree->priv->item, "height", &height, NULL); - height = MAX ((int)height, alloc->height); + height = MAX ((gint)height, alloc->height); g_object_set (e_tree->priv->item, "width", width, @@ -1766,7 +1766,7 @@ et_foreach_recurse (ETreeModel *model, callback(path, closure); child = e_tree_model_node_get_first_child(E_TREE_MODEL(model), path); - for ( ; child; child = e_tree_model_node_get_next(E_TREE_MODEL(model), child)) + for (; child; child = e_tree_model_node_get_next(E_TREE_MODEL(model), child)) if (child) et_foreach_recurse (model, child, callback, closure); } diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index 1bc2090caa..e1a0fca438 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -234,7 +234,7 @@ e_text_model_real_insert_length (ETextModel *model, gint position, const gchar * for (p = text, l = 0; l < length; - p = g_utf8_next_char (p), l ++) ; + p = g_utf8_next_char (p), l ++); byte_length = p - text; @@ -264,7 +264,7 @@ e_text_model_real_delete (ETextModel *model, gint position, gint length) for (p = offs, l = 0; l < length; - p = g_utf8_next_char (p), l ++) ; + p = g_utf8_next_char (p), l ++); byte_length = p - offs; diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index b63771500a..0b2f84cf8e 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -1994,8 +1994,8 @@ _do_tooltip (gpointer data) gdk_window_get_origin (GTK_WIDGET(GNOME_CANVAS_ITEM(text)->canvas)->window, &canvas_x, &canvas_y); pixel_origin.x += canvas_x; pixel_origin.y += canvas_y; - pixel_origin.x -= (int) gtk_layout_get_hadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value; - pixel_origin.y -= (int) gtk_layout_get_vadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value; + pixel_origin.x -= (gint) gtk_layout_get_hadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value; + pixel_origin.y -= (gint) gtk_layout_get_vadjustment(GTK_LAYOUT(GNOME_CANVAS_ITEM(text)->canvas))->value; tooltip_window = gtk_window_new (GTK_WINDOW_POPUP); gtk_container_set_border_width (GTK_CONTAINER (tooltip_window), 1); @@ -2798,7 +2798,7 @@ e_text_reset_im_context (EText *text) /* fixme: */ -static int +static gint next_word (EText *text, gint start) { gchar *p = g_utf8_offset_to_pointer (text->text, start); @@ -2827,7 +2827,7 @@ next_word (EText *text, gint start) return g_utf8_pointer_to_offset (text->text, p); } -static int +static gint find_offset_into_line (EText *text, gint offset_into_text, gchar **start_of_line) { gchar *p; @@ -2861,7 +2861,7 @@ find_offset_into_line (EText *text, gint offset_into_text, gchar **start_of_line /* direction = TRUE (move forward), FALSE (move backward) Any error shall return length(text->text) or 0 or text->selection_end (as deemed fit) */ -static int +static gint _get_updated_position (EText *text, gboolean direction) { PangoLogAttr *log_attrs = NULL; @@ -2927,7 +2927,7 @@ _get_updated_position (EText *text, gboolean direction) -static int +static gint _get_position(EText *text, ETextEventProcessorCommand *command) { gint length, obj_num; -- cgit v1.2.3 From 84ff048ccc0d4b829019baf3d614a10f3faa61ca Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 1 Jun 2009 22:50:46 -0400 Subject: Fix more compiler warnings. --- mail/em-folder-view.c | 36 --------------------------------- plugins/startup-wizard/startup-wizard.c | 2 +- widgets/misc/e-search-bar.c | 2 +- 3 files changed, 2 insertions(+), 38 deletions(-) diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 466dc34a63..f762e2ee39 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -2505,33 +2505,6 @@ emfv_list_done_message_selected(CamelFolder *folder, const gchar *uid, CamelMime } -static gboolean -emfv_spin(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject) -{ - GtkWidget *ep; - - if (!strcmp(eb->classid, "spinner")) { - GtkWidget *box, *label; - gchar *msg = g_strdup_printf("%s", _("Retrieving Message...")); - - label = gtk_label_new (NULL); - gtk_label_set_markup ((GtkLabel *)label, msg); - box = gtk_hbox_new (FALSE, 0); - g_free (msg); - - ep = e_spinner_new_spinning_small_shown (); - gtk_box_pack_start ((GtkBox *)box, ep, FALSE, FALSE, 0); - gtk_box_pack_start ((GtkBox *)box, label, FALSE, FALSE, 0); - - gtk_container_add ((GtkContainer *)eb, box); - gtk_widget_show_all ((GtkWidget *)eb); - - g_signal_handlers_disconnect_by_func(efh, emfv_spin, NULL); - } - - return TRUE; -} - static gboolean emfv_message_selected_timeout(gpointer data) { @@ -2547,15 +2520,6 @@ emfv_message_selected_timeout(gpointer data) g_object_ref (emfv); /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ e_profile_event_emit("goto.load", emfv->displayed_uid, 0); -/* hstream = gtk_html_begin(((EMFormatHTML *)emfv->preview)->html); - - g_signal_connect(((EMFormatHTML *)emfv->preview)->html, "object_requested", G_CALLBACK(emfv_spin), NULL); - - gtk_html_stream_printf(hstream, "

%s

%s

", - _("Retrieving Message"), - emfv->displayed_uid); - gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); -*/ mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_msg_fast_ordered_push); } else { e_profile_event_emit("goto.empty", "", 0); diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index cc8168159b..7dd3f5b3e3 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -46,7 +46,7 @@ static EImportImporter *import_importer; static GtkWidget *import_dialog, *import_progress, *import_label; static GSList *import_iterator, *import_importers; -static void +G_GNUC_NORETURN static void startup_wizard_delete (void) { gtk_main_quit (); _exit (0); diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 7ae1abeadb..041e46a1f3 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -678,7 +678,7 @@ set_menu (ESearchBar *esb, /* /\* Callback used when an option item is destroyed. We have to destroy its */ /* * suboption items. */ /* *\/ */ -/* static gpointer / +/* static gpointer */ /* option_item_destroy_cb (GtkObject *object, gpointer data) */ /* { */ /* /\* ESearchBarSubitem *subitems; *\/ */ -- cgit v1.2.3 From 7f9d248a0ad8c092fe028cffc5a77704dd957173 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Jun 2009 11:04:25 -0400 Subject: Use standard C types in iconv-detect.c --- iconv-detect.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/iconv-detect.c b/iconv-detect.c index 7cd6bde85e..4eb6597225 100644 --- a/iconv-detect.c +++ b/iconv-detect.c @@ -52,9 +52,9 @@ enum { typedef struct { - gchar *charset; - gchar *format; - gint id; + char *charset; + char *format; + int id; } CharInfo; @@ -67,7 +67,7 @@ static CharInfo iso8859_tests[] = { { "8859-1", "%d-%d", NO_ISO_D_DASH_D }, }; -static gint num_iso8859_tests = sizeof (iso8859_tests) / sizeof (CharInfo); +static int num_iso8859_tests = sizeof (iso8859_tests) / sizeof (CharInfo); static CharInfo iso2022_tests[] = { { "iso-2022-jp", "iso-%d-%s", ISO_DASH_D_DASH_S_LOWER }, @@ -75,7 +75,7 @@ static CharInfo iso2022_tests[] = { { "ISO2022-JP", "ISO%d-%s", ISO_D_DASH_S }, }; -static gint num_iso2022_tests = sizeof (iso2022_tests) / sizeof (CharInfo); +static int num_iso2022_tests = sizeof (iso2022_tests) / sizeof (CharInfo); static CharInfo iso10646_tests[] = { { "iso-10646-1", "iso-%d-%d", ISO_DASH_D_DASH_D_LOWER }, @@ -87,16 +87,16 @@ static CharInfo iso10646_tests[] = { { "UCS-4BE", "UCS-4BE", UCS4 }, }; -static gint num_iso10646_tests = sizeof (iso10646_tests) / sizeof (CharInfo); +static int num_iso10646_tests = sizeof (iso10646_tests) / sizeof (CharInfo); -gint main (gint argc, gchar **argv) +int main (int argc, char **argv) { - guint iso8859, iso2022, iso10646; + unsigned int iso8859, iso2022, iso10646; CharInfo *info; iconv_t cd; FILE *fp; - gint i; + int i; fp = fopen ("iconv-detect.h", "w"); if (fp == NULL) -- cgit v1.2.3 From 9934dcecd2b983e671ceb0daa1466ad8d13d90b3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Jun 2009 11:33:19 -0400 Subject: Add MAINTAINERCLEANFILES based on Pango. --- Makefile.am | 30 ++++++++++++++++++++++-------- mail/Makefile.am | 2 +- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index f341656a56..5dd4fab69a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,16 +59,30 @@ if WITH_HELP SUBDIRS += help endif -DISTCLEANFILES = \ - doltcompile \ - doltlibtool \ - intltool-extract \ - intltool-merge \ - intltool-update \ - iconv-detect.h \ - gnome-doc-utils.make \ +DISTCLEANFILES = \ + $(srcdir)/doltcompile \ + $(srcdir)/doltlibtool \ + $(srcdir)/intltool-extract \ + $(srcdir)/intltool-merge \ + $(srcdir)/intltool-update \ + $(srcdir)/iconv-detect.h \ $(pkgconfig_DATA) +MAINTAINERCLEANFILES = \ + $(srcdir)/INSTALL \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/autoscan.log \ + $(srcdir)/config.guess \ + $(srcdir)/config.h.in \ + $(srcdir)/config.sub \ + $(srcdir)/configure.scan \ + $(srcdir)/depcomp \ + $(srcdir)/install-sh \ + $(srcdir)/ltmain.sh \ + $(srcdir)/missing \ + $(srcdir)/mkinstalldirs \ + $(srcdir)/gnome-doc-utils.make + # Scrollkeeper must be disabled for distcheck to work because # distcheck uses a custom prefix. See GNOME bug #354357. DISTCHECK_CONFIGURE_FLAGS = \ diff --git a/mail/Makefile.am b/mail/Makefile.am index 8fbac19ce0..8d555b1204 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -286,7 +286,7 @@ errordir = $(privdatadir)/errors em-filter-i18n.h: filtertypes.xml vfoldertypes.xml searchtypes.xml echo "/* Automatically generated. Do not edit. */" > $@; \ cat $(srcdir)/filtertypes.xml $(srcdir)/vfoldertypes.xml $(srcdir)/searchtypes.xml | \ - sed -n -e 's:.*\(.*\):char *s = N_("\1");:p' | \ + sed -n -e 's:.*\(.*\):gchar *s = N_("\1");:p' | \ sort -u >> $@ glade_DATA = mail-config.glade mail-dialogs.glade -- cgit v1.2.3 From f2f9d1f22e3e723aa3508fa0ec91e780bbf2d3f9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Jun 2009 12:23:38 -0400 Subject: =?UTF-8?q?Bug=20582939=20=E2=80=93=20Drop=20support=20for=20CDE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile.am | 18 -- configure.ac | 31 --- data/Makefile.am | 18 +- data/cde_app_root/Makefile.am | 2 - data/cde_app_root/dt/Makefile.am | 2 - data/cde_app_root/dt/appconfig/Makefile.am | 2 - .../dt/appconfig/appmanager/C/Makefile.am | 2 - .../dt/appconfig/appmanager/C/Ximian/Evolution | 17 -- .../dt/appconfig/appmanager/C/Ximian/Makefile.am | 8 - .../dt/appconfig/appmanager/Makefile.am | 2 - .../dt/appconfig/icons/C/Evolution.l.pm | 307 --------------------- .../dt/appconfig/icons/C/Evolution.m.pm | 291 ------------------- .../dt/appconfig/icons/C/Evolution.t.pm | 103 ------- data/cde_app_root/dt/appconfig/icons/C/Makefile.am | 17 -- data/cde_app_root/dt/appconfig/icons/C/Ximian.l.pm | 147 ---------- data/cde_app_root/dt/appconfig/icons/C/Ximian.m.pm | 272 ------------------ data/cde_app_root/dt/appconfig/icons/C/Ximian.t.pm | 289 ------------------- data/cde_app_root/dt/appconfig/icons/Makefile.am | 2 - data/cde_app_root/dt/appconfig/types/C/Makefile.am | 8 - .../cde_app_root/dt/appconfig/types/C/Ximian.dt.in | 30 -- data/cde_app_root/dt/appconfig/types/Makefile.am | 3 - shell/Makefile.am | 17 -- 22 files changed, 1 insertion(+), 1587 deletions(-) delete mode 100644 data/cde_app_root/Makefile.am delete mode 100644 data/cde_app_root/dt/Makefile.am delete mode 100644 data/cde_app_root/dt/appconfig/Makefile.am delete mode 100644 data/cde_app_root/dt/appconfig/appmanager/C/Makefile.am delete mode 100755 data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Evolution delete mode 100644 data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am delete mode 100644 data/cde_app_root/dt/appconfig/appmanager/Makefile.am delete mode 100644 data/cde_app_root/dt/appconfig/icons/C/Evolution.l.pm delete mode 100644 data/cde_app_root/dt/appconfig/icons/C/Evolution.m.pm delete mode 100644 data/cde_app_root/dt/appconfig/icons/C/Evolution.t.pm delete mode 100644 data/cde_app_root/dt/appconfig/icons/C/Makefile.am delete mode 100644 data/cde_app_root/dt/appconfig/icons/C/Ximian.l.pm delete mode 100644 data/cde_app_root/dt/appconfig/icons/C/Ximian.m.pm delete mode 100644 data/cde_app_root/dt/appconfig/icons/C/Ximian.t.pm delete mode 100644 data/cde_app_root/dt/appconfig/icons/Makefile.am delete mode 100644 data/cde_app_root/dt/appconfig/types/C/Makefile.am delete mode 100644 data/cde_app_root/dt/appconfig/types/C/Ximian.dt.in delete mode 100644 data/cde_app_root/dt/appconfig/types/Makefile.am diff --git a/Makefile.am b/Makefile.am index 5dd4fab69a..d0cfe9e8ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,22 +89,4 @@ DISTCHECK_CONFIGURE_FLAGS = \ --disable-scrollkeeper \ --enable-test-component -# CDE Stuff - -if HAVE_DTAPPINTEGRATE - -# This installs Evolution into the Application Manager on CDE -dtappintegrate: - ( cd data && make dtappintegrate ) - -# ...And this uninstalls it -dtappunintegrate: - ( cd data ; make dtappunintegrate ) - -# Install/uninstall for CDE -cde-install: install dtappintegrate -cde-uninstall: dtappunintegrate uninstall - -endif - -include $(top_srcdir)/git.mk diff --git a/configure.ac b/configure.ac index 1a9f816843..a4d35b0c39 100644 --- a/configure.ac +++ b/configure.ac @@ -1293,26 +1293,6 @@ else fi AM_CONDITIONAL(ENABLE_EXCHANGE, [test x$enable_exchange = xyes]) -dnl ****************** -dnl CDE dtappintegrate -dnl ****************** - -AC_ARG_WITH([cde-path], - AC_HELP_STRING([--with-cde-path=PATH], - [Location of CDE installation]), - [with_cde_path=$withval],[with_cde_path=/usr/dt]) - -AC_MSG_CHECKING(for dtappintegrate) -if test -x "$with_cde_path/bin/dtappintegrate" ; then - DTAPPINTEGRATE="$with_cde_path/bin/dtappintegrate" -else - DTAPPINTEGRATE="no" -fi -AC_MSG_RESULT([$DTAPPINTEGRATE]) - -AC_SUBST(DTAPPINTEGRATE) -AM_CONDITIONAL(HAVE_DTAPPINTEGRATE, [test x$DTAPPINTEGRATE != xno]) - dnl ***************** dnl killall or pkill? dnl ***************** @@ -2006,17 +1986,6 @@ addressbook/tools/csv2vcard addressbook/util/Makefile art/Makefile data/Makefile -data/cde_app_root/Makefile -data/cde_app_root/dt/Makefile -data/cde_app_root/dt/appconfig/Makefile -data/cde_app_root/dt/appconfig/appmanager/Makefile -data/cde_app_root/dt/appconfig/appmanager/C/Makefile -data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile -data/cde_app_root/dt/appconfig/icons/Makefile -data/cde_app_root/dt/appconfig/icons/C/Makefile -data/cde_app_root/dt/appconfig/types/Makefile -data/cde_app_root/dt/appconfig/types/C/Makefile -data/cde_app_root/dt/appconfig/types/C/Ximian.dt data/icons/Makefile e-util/Makefile filter/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index d087e62f38..6fbfd499c9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -40,7 +40,7 @@ endif noinst_MANS = evolution.1 noinst_DATA = $(keys_file) $(desktop_file) -SUBDIRS = cde_app_root icons +SUBDIRS = icons install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file) $(mkinstalldirs) $(DESTDIR)$(desktopdir); \ @@ -56,20 +56,6 @@ uninstall-local: uninstall-kde-applnk rm -rf $(DESTDIR)$(keysdir)/$(keys_file) ; \ rm -rf $(DESTDIR)$(mimedir)/$(mime_file) ; -# CDE Stuff - -if HAVE_DTAPPINTEGRATE - -# This installs Evolution into the Application Manager on CDE -dtappintegrate: - $(DTAPPINTEGRATE) -s $(privdatadir)/cde_app_root - -# ...And this uninstalls it -dtappunintegrate: - $(DTAPPINTEGRATE) -u -s $(privdatadir)/cde_app_root - -endif - CLEANFILES = \ $(desktop_file) \ $(keys_file) @@ -80,6 +66,4 @@ EXTRA_DIST = \ $(keys_in_file) \ $(noinst_MANS) - - -include $(top_srcdir)/git.mk diff --git a/data/cde_app_root/Makefile.am b/data/cde_app_root/Makefile.am deleted file mode 100644 index 98eb7c244b..0000000000 --- a/data/cde_app_root/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = dt --include $(top_srcdir)/git.mk diff --git a/data/cde_app_root/dt/Makefile.am b/data/cde_app_root/dt/Makefile.am deleted file mode 100644 index b8aa411ebb..0000000000 --- a/data/cde_app_root/dt/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = appconfig --include $(top_srcdir)/git.mk diff --git a/data/cde_app_root/dt/appconfig/Makefile.am b/data/cde_app_root/dt/appconfig/Makefile.am deleted file mode 100644 index f839980ff8..0000000000 --- a/data/cde_app_root/dt/appconfig/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = appmanager icons types --include $(top_srcdir)/git.mk diff --git a/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.am b/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.am deleted file mode 100644 index 95de369f19..0000000000 --- a/data/cde_app_root/dt/appconfig/appmanager/C/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = Ximian --include $(top_srcdir)/git.mk diff --git a/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Evolution b/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Evolution deleted file mode 100755 index cad83932e6..0000000000 --- a/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Evolution +++ /dev/null @@ -1,17 +0,0 @@ -################################################ -# -# action -# -# Common Desktop Environment (CDE) -# -# $Revision: 1.2 $ -# -################################################ - -# This file represents a CDE Dt action. The contents of the file do -# not matter; however, the file must have executable permission and the -# name of the file must match an entry in the action database (*.dt files). -# -# For more information on Dt actions, see the CDE Dt manuals. - -echo "Common Desktop Environment Dt action" diff --git a/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am b/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am deleted file mode 100644 index 094ed3fd24..0000000000 --- a/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -EXTRA_DIST = Evolution - -if HAVE_DTAPPINTEGRATE -cdeappmanagerdir = $(privdatadir)/cde_app_root/dt/appconfig/appmanager/C/Ximian -cdeappmanager_SCRIPTS = Evolution -endif - --include $(top_srcdir)/git.mk diff --git a/data/cde_app_root/dt/appconfig/appmanager/Makefile.am b/data/cde_app_root/dt/appconfig/appmanager/Makefile.am deleted file mode 100644 index 29295aeb2b..0000000000 --- a/data/cde_app_root/dt/appconfig/appmanager/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = C --include $(top_srcdir)/git.mk diff --git a/data/cde_app_root/dt/appconfig/icons/C/Evolution.l.pm b/data/cde_app_root/dt/appconfig/icons/C/Evolution.l.pm deleted file mode 100644 index 907f0ad825..0000000000 --- a/data/cde_app_root/dt/appconfig/icons/C/Evolution.l.pm +++ /dev/null @@ -1,307 +0,0 @@ -/* XPM */ -static char * evo_cde_48_xpm[] = { -"48 48 256 2", -" c None", -". c #020202", -"+ c #3C2E06", -"@ c #6E6E6E", -"# c #AA8616", -"$ c #AA8E2A", -"% c #BA9E32", -"& c #BAA65E", -"* c #C6AE4A", -"= c #AEAEAE", -"- c #AE5A0A", -"; c #D6C26E", -"> c #DAC276", -", c #7E7E7E", -"' c #FEFEF6", -") c #864E0A", -"! c #8A6E0E", -"~ c #EAB216", -"{ c #2E1A02", -"] c #6A5A1A", -"^ c #C2C2C2", -"/ c #FCDE8A", -"( c #6A3606", -"_ c #9E720E", -": c #2A1E02", -"< c #664A0A", -"[ c #E6DA9E", -"} c #D2A612", -"| c #BA9A32", -"1 c #DEDEDE", -"2 c #A26E0E", -"3 c #121212", -"4 c #3E320A", -"5 c #FEEEC2", -"6 c #CEA212", -"7 c #B26E0E", -"8 c #5A5A5A", -"9 c #C6A632", -"0 c #AE820E", -"a c #0B0602", -"b c #D8BA46", -"c c #3E3A22", -"d c #FAE69E", -"e c #FAE6A2", -"f c #82560A", -"g c #8A8A8A", -"h c #5A4A0E", -"i c #CABA7E", -"j c #E6BA1E", -"k c #8A7E4A", -"l c #FCF2CA", -"m c #FEE6AA", -"n c #BE8E12", -"o c #462606", -"p c #E6C646", -"q c #CA9212", -"r c #5E4E16", -"s c #4E3206", -"t c #EEBA16", -"u c #BAAA6E", -"v c #F6C626", -"w c #70500A", -"x c #EEEEEE", -"y c #2E260C", -"z c #DACA82", -"A c #AA9A5E", -"B c #8E5A0A", -"C c #FEEAB6", -"D c #BE6A0E", -"E c #663E0A", -"F c #5A5226", -"G c #BE6E0E", -"H c #B6B6B6", -"I c #FEF2CE", -"J c #C27A0E", -"K c #E6D272", -"L c #DED6BA", -"M c #8A8252", -"N c #3E320E", -"O c #B6720E", -"P c #E6CA58", -"Q c #E6D682", -"R c #1A1202", -"S c #1E1E16", -"T c #9E9E9E", -"U c #0E0A02", -"V c #969696", -"W c #88640C", -"X c #F6F6F6", -"Y c #C2720E", -"Z c #2E2E2E", -"` c #E3A614", -" . c #E2E2E2", -".. c #8E7A3E", -"+. c #7A620B", -"@. c #C67A0E", -"#. c #AE5E0A", -"$. c #362606", -"%. c #D18612", -"&. c #F2BE16", -"*. c #3E3612", -"=. c #828281", -"-. c #C6C6C6", -";. c #F6CA2A", -">. c #6A420A", -",. c #E6E6E6", -"'. c #4E4E4E", -"). c #7A6212", -"!. c #8E6A0E", -"~. c #3A3A3A", -"{. c #0A0A0A", -"]. c #F6C61B", -"^. c #CE8212", -"/. c #FAD258", -"(. c #CE9212", -"_. c #D2A212", -":. c #C68E12", -"<. c #5E3206", -"[. c #261602", -"}. c #F6CE42", -"|. c #DA9612", -"1. c #2E2204", -"2. c #4E4626", -"3. c #6A6A6A", -"4. c #965A0A", -"5. c #E6AE16", -"6. c #F6DA66", -"7. c #AAAAAA", -"8. c #D2D2D0", -"9. c #1A0E02", -"0. c #964E0A", -"a. c #FADA80", -"b. c #F7D660", -"c. c #F6D252", -"d. c #F6CA2E", -"e. c #262626", -"f. c #D28A12", -"g. c #92620E", -"h. c #464646", -"i. c #BA660E", -"j. c #FEFAEA", -"k. c #BE760E", -"l. c #767676", -"m. c #523606", -"n. c #CECECC", -"o. c #0E0E06", -"p. c #BABABA", -"q. c #7E420A", -"r. c #DE9E12", -"s. c #F7CE3B", -"t. c #B6961A", -"u. c #A6760E", -"v. c #F2C216", -"w. c #603C06", -"x. c #8A8E8E", -"y. c #D6D6D2", -"z. c #3E2606", -"A. c #CA7E12", -"B. c #7A6A28", -"C. c #BA620E", -"D. c #4E3E06", -"E. c #F2F2F2", -"F. c #0E0E0A", -"G. c #A2620E", -"H. c #F6E280", -"I. c #CE8E12", -"J. c #1E1A06", -"K. c #C6760E", -"L. c #BEBEBE", -"M. c #D68E12", -"N. c #D29212", -"O. c #6A3A06", -"P. c #825E0A", -"Q. c #FAD672", -"R. c #F6D24B", -"S. c #522A06", -"T. c #9A8232", -"U. c #FCE49A", -"V. c #323232", -"W. c #8E520A", -"X. c #EDB616", -"Y. c #D69A12", -"Z. c #F6DA6D", -"`. c #E1A212", -" + c #F6D246", -".+ c #362206", -"++ c #F6CE35", -"@+ c #0E0E02", -"#+ c #E6AA16", -"$+ c #321E05", -"%+ c #9E5A0A", -"&+ c #8E8E8E", -"*+ c #AE760E", -"=+ c #6A5612", -"-+ c #866A0E", -";+ c #EAEAE2", -">+ c #563E06", -",+ c #764A0A", -"'+ c #B89A2A", -")+ c #221202", -"!+ c #1E1E1E", -"~+ c #DD9A12", -"{+ c #F6D659", -"]+ c #F6C216", -"^+ c #F6DE72", -"/+ c #D69212", -"(+ c #5E5E5E", -"_+ c #8A4A0A", -":+ c #8A560A", -"<+ c #C26E0E", -"[+ c #F6C622", -"}+ c #F6CA26", -"|+ c #9A620E", -"1+ c #160E02", -"2+ c #291A02", -"3+ c #F6DE7A", -"4+ c #DADADA", -"5+ c #BE660E", -"6+ c #3E361E", -"7+ c #C6720E", -"8+ c #72460A", -"9+ c #5A3A06", -"0+ c #723E06", -"a+ c #A2A2A2", -"b+ c #3E3E3E", -"c+ c #929292", -"d+ c #222222", -"e+ c #8E4E0A", -"f+ c #CE7E12", -"g+ c #CA7A0F", -"h+ c #FEF6D7", -"i+ c #FAFAFA", -"j+ c #F6CA33", -"k+ c #3E3206", -"l+ c #C07E10", -"m+ c #9A9A9A", -"n+ c #F6D652", -"o+ c #F2BA16", -"p+ c #3A2A06", -"q+ c #422A06", -"r+ c #FEFEFE", -"s+ c #EAEAEA", -"t+ c #0E0E0E", -"u+ c #FAD244", -"v+ c #161616", -"w+ c #FAF2C6", -"x+ c #2E2A12", -"y+ c #B6760E", -"z+ c #9A5E0E", -"A+ c #A27A0E", -"B+ c #6E3E06", -"C+ c #1E1602", -"D+ c #865A0A", -"E+ c #EAAE16", -"F+ c #D28E12", -"G+ c #DA9212", -" ", -" ", -" . . . . . . . . . ", -" . . . . . . . . . . . . . . . ", -" . . . . . . . . . . . . . . . . . . . . . ", -" . . . . . . . . 4 h ).+.+.+.+ C+. . . . . . . ", -" . . . . . . o.r $ ++s.++d.v ].].v.&._.W 1.. . . . . . ", -" . . . . . @+B.p R.}.}.}.}.}.++v [+].v.&.&.~ 0 p+. . . . . ", -" . . . . . N b c.c.b.b.{+c.R.}. +++d.v ].&.&.t ~ 5.P.. . . . . ", -" . . . . . B.b.5 l ; Z.Z.Z.6.6.{+c.}.j+d.[+].v.&.X.E+#+:.: . . . . ", -" . . . . . T.Z.j.r+y.@+2.K 3+Z.Z.b.{+{+% '+;.].v.&.t ~ #+`.N.: . . . . ", -" . . . . T.Z.h+j.5 6+@ '.o.A H.3+^+Z.p {.{.=+j v.v.o+~ 5.#+`.I.2+. . . ", -" . . . . ] {+5 l l M S r+n.t+i u K H.^+F Z g V.o.# v.&.t E+` r.~+l+. . . . ", -" . . . . y R.U.5 l z o.^ r+= S [ !+t+A & . b+V T 3.{.D.} o+~ 5.` ~+/+g.. . . . ", -" . . . . '+b.m C e 6+@ r+r+x b+. b+= t+. , b+{.@ T c+h.U -+~ #+` r.G+f.q+. . . ", -" . . . N R./ U.U.M !+x r+r+r+r+r+r+r+x '.t+= = t+V.&+T l.3 + n ` r.|.F+O . . . ", -" . . . . t.c.a./ > t+L.r+s+r+r+r+r+r+r+r+r+a+. a+x t+{.8 T T '.. w ~+|.F+^.z.. . . ", -" . . . C+}.c.Q.a.6+@ r+,.p.8.i+r+r+r+E.r+r+, @ r+b+. = !+e.=.T , e.C+2 f.%.:+. . . ", -" . . . =+j+c./...d+E.E.-.1 ^ ^ ,.r+ .&+L.X T t+@ t+!+b+ ., . '.a+T 8 {.9+J @.. . . ", -" . . . . t.j+}.b o.T r+E.L.= y.n.p.n.X -.x.m+ .T =.n.E.d+@ r+= . 3 l.T g V.a 4.$+. . . ", -" . . . . j d.}. +B.. , r+@ {., ^ y.L.L. .E.7.x.L.X r+&+!+x r+b+, &+t+h.V g . G.( . . . ", -" . . . . v.}+++}.R.* x+d+t+&+!+Z a+8.n.p.n.E.n.c+y.1 t+. @ &+d+x r+1 '.a !+w.Y B+. . . ", -" . . . k+v.].d.++}.c.p t+. .E.@ t+3.^ y.^ L. .x r+b+@ .b+. =.r+r+r+r+(+9.k.k.W.. . . ", -" . . . + &.v.[+j+}.R.B.b+'.&+r+r+L.Z d+V 8.n.p.X a+d+x r+'.b+t+'. .r+E.3 |+@.<+e+. . . ", -" . . . 1.&.v.v.}+j+9 . n.T Z r+r+r+r+=.. 8 H x x t+L.r+^ t+x E.@ 3 &+'.p+f+K.<+e+. . . ", -" . . . . t &.v.v.}+y , r+x . .r+r+r+r+4+h.v+L.'.. V.= !+&+r+r+r+L.Z a @.A.K.D ( . . . ", -" . . . . 6 o+v.v.! Z r+r+r+'.c+r+r+r+r+r+r+&+t+. 1 c+t+3 E.r+r+r+x d+f f+K.Y D S.. . . ", -" . . . . A+X.t } @+^ r+r+r+&+Z r+r+r+r+r+r+r+E.'.t+&+. '.t+a+r+r+@ 1.^.A.K.D C.{ . . . ", -" . . . r ~ X.+ @ .a+(+!+t+. .r+r+r+r+r+r+r+r+= !+!+1 = d+h.= a y+A.K.Y i.- . . . ", -" . . . R #+_ . t+t+'.c+8.r+'.&+r+r+r+r+r+r+r+r+r+x !+@ r+x @ . >.^.g+7+D C.0+. . . ", -" . . . . _ !.U b+x r+r+r+r+T V.^ a+=.=., =.=.=.h.Z d+x r+r+&+2+^.A.k.<+5+C.{ . . . ", -" . . . p+`.q p+!+= r+r+r+x b+b+b+!+'.=., , , T . &+r+r+1 F.|+A.K.<+5+C._+. . . ", -" . . . . W `.` _ U '.E.r+r+r+r+r+@ @ r+r+r+r+'.: U @ E.b+9+A.K.<+D i.C.)+. . . ", -" . . . . a I.r.`.Y.>+t+c+r+r+r+r+L.!+r+r+r+= {.f.l+$.!+R O K.<+D C.C.( . . . . ", -" . . . . .+/+|.r.r.u.C+h.1 r+r+r+3 1 r+E.S P.N.f.%.:+:+K.Y D i.C.0.. . . . ", -" . . . . m./+/+|.|.I.< . =.r+r+(+c+r+@ .+f.%.^.A.g+7+<+D i.C.0.a . . . ", -" . . . . . s f.F+M.G+M.*+2+V.L.T '.L.{.y+^.A.g+K.7+G i.C.C.0.a . . . . ", -" . . . . . p+J %.%.f.%.f.,+U (+. Z 8+g+@.K.Y <+D i.C.#._+a . . . . ", -" . . . . . 1+z+A.A.A.A.A.7 $+. [.@.K.Y <+D i.C.C.#.S.. . . . . ", -" . . . . . . : 4.K.K.K.K.K.) %+<+D D i.C.C.- <.a . . . . . ", -" . . . . . . . [.B+4.D D D 5+i.C.C.#.q.o a . . . . . . ", -" . . . . . . . . . { { { { { 1+. . . . . . . . ", -" . . . . . . . . . . . . . . . . . . . . . ", -" . . . . . . . . . . . . . . . ", -" . . . . . . . . . ", -" ", -" ", -" "}; diff --git a/data/cde_app_root/dt/appconfig/icons/C/Evolution.m.pm b/data/cde_app_root/dt/appconfig/icons/C/Evolution.m.pm deleted file mode 100644 index 72b591dd3f..0000000000 --- a/data/cde_app_root/dt/appconfig/icons/C/Evolution.m.pm +++ /dev/null @@ -1,291 +0,0 @@ -/* XPM */ -static char * evo_cde_32_xpm[] = { -"32 32 256 2", -" c None", -". c #020202", -"+ c #121212", -"@ c #7A620C", -"# c #767676", -"$ c #BA8E12", -"% c #B6962A", -"& c #C6AA3A", -"* c #DABA46", -"= c #E2C24A", -"- c #E2CA6E", -"; c #7E420A", -"> c #B25E0E", -", c #E6D276", -"' c #362A06", -") c #D2D2D2", -"! c #AA7A0E", -"~ c #FEF6DE", -"{ c #66520E", -"] c #825E12", -"^ c #CAA212", -"/ c #FEDE8A", -"( c #D6D6D6", -"_ c #6C3C08", -": c #EAE6DA", -"< c #A28E52", -"[ c #DAB216", -"} c #7A6216", -"| c #E6E6E6", -"1 c #5E4E1A", -"2 c #323232", -"3 c #5E5E5E", -"4 c #B07610", -"5 c #C2AA5A", -"6 c #EAEADE", -"7 c #482E06", -"8 c #CEBE8A", -"9 c #EAEAEA", -"0 c #D6B236", -"a c #3A2206", -"b c #A29666", -"c c #8A5E0E", -"d c #5A4E1E", -"e c #7A723E", -"f c #EEB616", -"g c #F6DE92", -"h c #463A16", -"i c #BE7612", -"j c #AAAAAA", -"k c #9A520E", -"l c #E2B622", -"m c #3E3E3E", -"n c #B66A0E", -"o c #7B7A7A", -"p c #BE860E", -"q c #665A22", -"r c #88480A", -"s c #FEEAA6", -"t c #BEBEBE", -"u c #B2A65E", -"v c #E2BA2E", -"w c #262212", -"x c #BE9212", -"y c #928A62", -"z c #965E0A", -"A c #EEE6DE", -"B c #524E3A", -"C c #B6B6B6", -"D c #5E5A42", -"E c #824E0A", -"F c #7A6A32", -"G c #A6A6A6", -"H c #2E2E2E", -"I c #5E3206", -"J c #F6C622", -"K c #F6CA2E", -"L c #FEEAB2", -"M c #DADADA", -"N c #6E6E6E", -"O c #EEEADE", -"P c #828282", -"Q c #54400C", -"R c #8E560E", -"S c #EECA4A", -"T c #EABA16", -"U c #9A720E", -"V c #8E8E8D", -"W c #BA7E0E", -"X c #D2CAA2", -"Y c #CA9412", -"Z c #F2F2F2", -"` c #EEEAD6", -" . c #BE6A0E", -".. c #C2C2C2", -"+. c #584816", -"@. c #FAFAFA", -"#. c #FEF2C6", -"$. c #6A6A6A", -"%. c #9A9A98", -"&. c #4A3A26", -"*. c #EAE6E2", -"=. c #726A62", -"-. c #281804", -";. c #464646", -">. c #C27A12", -",. c #F2E6CE", -"'. c #DE9A12", -"). c #F3C218", -"!. c #9E620E", -"~. c #BE720E", -"{. c #AE8612", -"]. c #F6DA66", -"^. c #EAEAE6", -"/. c #66665E", -"(. c #CACACA", -"_. c #EEEADA", -":. c #6E520E", -"<. c #3A3622", -"[. c #C68612", -"}. c #221E1A", -"|. c #F6DA6A", -"1. c #FCEEC0", -"2. c #BAA23E", -"3. c #DEDEDE", -"4. c #CE9212", -"5. c #AA8A1E", -"6. c #B29E52", -"7. c #8E6E0E", -"8. c #C28212", -"9. c #EECA42", -"0. c #5A5646", -"a. c #524E42", -"b. c #ADAEAE", -"c. c #BA660E", -"d. c #E6AA16", -"e. c #FEFEFE", -"f. c #3A3A3A", -"g. c #878685", -"h. c #F6D046", -"i. c #AC680E", -"j. c #E2B216", -"k. c #46361E", -"l. c #78560A", -"m. c #78400A", -"n. c #F6F6F6", -"o. c #DE9E12", -"p. c #7E6C26", -"q. c #B69A3A", -"r. c #362606", -"s. c #AA5A0E", -"t. c #161202", -"u. c #969696", -"v. c #F6D24A", -"w. c #96520A", -"x. c #565656", -"y. c #56421E", -"z. c #CA8612", -"A. c #3E2206", -"B. c #CE8212", -"C. c #463E2E", -"D. c #666256", -"E. c #4E4E46", -"F. c #865E0A", -"G. c #402C06", -"H. c #522E06", -"I. c #524A3E", -"J. c #EEEEEE", -"K. c #76726A", -"L. c #F3EACD", -"M. c #7E560A", -"N. c #423E2E", -"O. c #92560A", -"P. c #525252", -"Q. c #463612", -"R. c #4A4222", -"S. c #5E3E0A", -"T. c #D68E12", -"U. c #4A4232", -"V. c #2E221A", -"W. c #1E1810", -"X. c #6A561A", -"Y. c #A25E0A", -"Z. c #7A4E0A", -"`. c #C16E0E", -" + c #EEE6DA", -".+ c #F2DA72", -"++ c #9E5A0A", -"@+ c #B2720E", -"#+ c #262626", -"$+ c #F6D242", -"%+ c #B2B2B2", -"&+ c #AE6E0E", -"*+ c #3E320E", -"=+ c #DA9612", -"-+ c #CA7A11", -";+ c #EEBA16", -">+ c #5A5A59", -",+ c #F6CE3C", -"'+ c #C5760E", -")+ c #EAAE16", -"!+ c #E2E2E2", -"~+ c #F2EAD2", -"{+ c #F4C61A", -"]+ c #C97E12", -"^+ c #EAEAE2", -"/+ c #524A22", -"(+ c #F6D24E", -"_+ c #626262", -":+ c #C2720E", -"<+ c #929292", -"[+ c #4A4A49", -"}+ c #CECECE", -"|+ c #BA620E", -"1+ c #2A2206", -"2+ c #D18A12", -"3+ c #FADA76", -"4+ c #423826", -"5+ c #C2A246", -"6+ c #462606", -"7+ c #BABAB9", -"8+ c #422E12", -"9+ c #2E2612", -"0+ c #723A06", -"a+ c #1E1602", -"b+ c #52422A", -"c+ c #B6620E", -"d+ c #C6C6C6", -"e+ c #8A8A8A", -"f+ c #5A3E14", -"g+ c #B29A46", -"h+ c #F6CA26", -"i+ c #F2BE16", -"j+ c #DFA213", -"k+ c #E9B216", -"l+ c #F6D656", -"m+ c #BE660E", -"n+ c #B27A0E", -"o+ c #424242", -"p+ c #B66E0E", -"q+ c #82520A", -"r+ c #5E3606", -"s+ c #8C5A0E", -"t+ c #765A0A", -"u+ c #945A0A", -"v+ c #D69212", -"w+ c #F6DE72", -"x+ c #4E4E4E", -"y+ c #727272", -"z+ c #3E3A34", -"A+ c #C6720E", -"B+ c #676666", -"C+ c #F6CE42", -"D+ c #86827E", -"E+ c #F6D256", -"F+ c #B6921A", -"G+ c #866212", -" ", -" . . . . . . . ", -" . . . . . . . . . . . . . ", -" . . . . . . 1+{ @ @ Q . . . . . . ", -" . . . . q p.0 ,+,+K {+{+T x t+. . . . ", -" . . . . p.* E+(+(+C+$+K J ).i+)+$ . . . . ", -" . . . 9+5 1.X 6..+|.l+E+S v J {+;+k+j+F.. . . ", -" . . . 9+6.#.#.D.[+e , w+|.q.h F+i+i+f )+j+M.. . . ", -" . . . q.s 1.y V ( B b u - <.N [+d ^ f )+j+v+4 . . ", -" . . . q w+L 8 0.J.| f.f./.4+x+f.P y+R.7.)+d.'.z.. . . ", -" . . *+& / g 0.t @.e.e.e.e.j P.%.[+x+g.x.+.! '.4.&+. . ", -" . . +.S 3+< P J.) Z e.e.n.e.# b.P.P.f.# y+N.l.z.&+. . . ", -" . . . 5.C+5+P.n.) }+d+3.^.G (.e+_+x.;.C _+[+g.3 k.z E . . ", -" . . . l ,+q.z+..b.3 7+(.}+( %+b.d+( x+( u.>+o+y+o a _ . . ", -" . . t.).,+$+= +.+ <+E.g...d+M d+) P o+3 x+n.J.B+}.z O.. . ", -" . . G.).J K v.F 2 ..3.N x+C (.( ) 3 | m H j @.%+f+'+++. . ", -" . . a+i+).{+% /.d+/.@.e.d+E.y+) o+j j o n.P _+&.i.:+w.. . ", -" . . . [ ).[ /+!+@.>+!+e.e.!+g.f.N _+w 3.e.Z _+q+]+`.; . . ", -" . . . {.f } u.M 7+x+b.e.e.e.e.) >+[+>+P.j %+y.]+>.c._ . . ", -" . . { Y }.[+y+<+g.P e.e.e.e.e.J.o $.) # <.!.-+`.s.. . . ", -" . . ' U Q.P 9 e.9 _+V $.# P P N H 7+@.<+Z.-+:+m+r . . ", -" . . . :.Y G+>+) @.) t # e+) ) e+}.o (.b+i A+ .c.6+. . ", -" . . . n+o.p Q g.!+e.!+_+@.) U.2+s+*+u+:+ .> r . . ", -" . . . r.W '.4.] I.(.e.B+!+K.c z.B.n p+`.|+; . . . ", -" . . . -.@+2+T.W f+=.N y+S.]+>.'+`.c.> ; . . . ", -" . . . 8+R B.B.W R V.t.&+'+A+ .|+c+m.. . . ", -" . . . . G.E i.p+n s. .m+> k 0+a+. . . ", -" . . . . . H.A.r+r+I H.6+. . . . . ", -" . . . . . . . . . . . . . ", -" . . . . . . . . . ", -" ", -" "}; diff --git a/data/cde_app_root/dt/appconfig/icons/C/Evolution.t.pm b/data/cde_app_root/dt/appconfig/icons/C/Evolution.t.pm deleted file mode 100644 index 27995ddcd9..0000000000 --- a/data/cde_app_root/dt/appconfig/icons/C/Evolution.t.pm +++ /dev/null @@ -1,103 +0,0 @@ -/* XPM */ -static char * evo_cde_16_xpm[] = { -"16 16 84 1", -" c None", -". c #020202", -"+ c #E6C750", -"@ c #F8E191", -"# c #F8E6A4", -"$ c #F7E499", -"% c #F2DD8B", -"& c #BDA752", -"* c #685617", -"= c #C9A92F", -"- c #F8E395", -"; c #F8E8AE", -"> c #F7DD7E", -", c #F7D65D", -"' c #F7D455", -") c #F6CF42", -"! c #DEC054", -"~ c #B49E4E", -"{ c #BC9F33", -"] c #000000", -"^ c #363326", -"/ c #F8E18C", -"( c #F9E499", -"_ c #F6D148", -": c #F6CE3B", -"< c #ECC63F", -"[ c #B59B3A", -"} c #060300", -"| c #100E0B", -"1 c #E7D184", -"2 c #F8E393", -"3 c #DEBA35", -"4 c #A68C26", -"5 c #282623", -"6 c #F1D97F", -"7 c #F8DE7D", -"8 c #848484", -"9 c #FFFFFF", -"0 c #E6E6E6", -"a c #5E5E5E", -"b c #A18726", -"c c #24221F", -"d c #F8E497", -"e c #F6D049", -"f c #EDEDED", -"g c #676767", -"h c #F5F5F5", -"i c #666666", -"j c #DDDDDD", -"k c #D5B233", -"l c #B4972A", -"m c #757575", -"n c #737373", -"o c #797979", -"p c #BABABA", -"q c #818181", -"r c #D9B634", -"s c #BC9D2D", -"t c #070502", -"u c #F5E5AA", -"v c #C2C2C2", -"w c #E1E1E1", -"x c #CFCFCF", -"y c #AA8E28", -"z c #E1C663", -"A c #F9E8AA", -"B c #BE9F2D", -"C c #8A7420", -"D c #F7DE82", -"E c #F9E6A0", -"F c #D0AE31", -"G c #937B23", -"H c #F7DC7A", -"I c #F9E8A5", -"J c #F6D55A", -"K c #ECC638", -"L c #9E8526", -"M c #AC9129", -"N c #D2B441", -"O c #D5C37E", -"P c #DABD56", -"Q c #C9AC40", -"R c #AE9129", -"S c #8A7421", -" ", -" ...... ", -" ..+@#$%&*. ", -" .=-;>,')!~{] ", -" ^/(_:::::<[} ", -" |12........34] ", -" 567.89990a.3b] ", -" cde.fgh0ij.kl] ", -" c$:.mjnopq.rs] ", -" tue.vwjwwx.ky] ", -" tzA........BC] ", -" .DE3rkrrrFG. ", -" .FHIJ:::KLM. ", -" ..NOPQRS.. ", -" ...... ", -" "}; diff --git a/data/cde_app_root/dt/appconfig/icons/C/Makefile.am b/data/cde_app_root/dt/appconfig/icons/C/Makefile.am deleted file mode 100644 index bf9df89c42..0000000000 --- a/data/cde_app_root/dt/appconfig/icons/C/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -ICONS = \ - Evolution.l.pm \ - Evolution.m.pm \ - Evolution.t.pm \ - Ximian.l.pm \ - Ximian.m.pm \ - Ximian.t.pm - -EXTRA_DIST = $(ICONS) - -if HAVE_DTAPPINTEGRATE -cdeiconsdir = $(privdatadir)/cde_app_root/dt/appconfig/icons/C -cdeicons_DATA = $(ICONS) -endif - - --include $(top_srcdir)/git.mk diff --git a/data/cde_app_root/dt/appconfig/icons/C/Ximian.l.pm b/data/cde_app_root/dt/appconfig/icons/C/Ximian.l.pm deleted file mode 100644 index a5fda59d40..0000000000 --- a/data/cde_app_root/dt/appconfig/icons/C/Ximian.l.pm +++ /dev/null @@ -1,147 +0,0 @@ -/* XPM */ -static char *ximian.l[] = { -/* columns rows colors chars-per-pixel */ -"16 16 125 2", -" c #000000", -". c #080502", -"X c #0d0b04", -"o c #140c01", -"O c #1d1201", -"+ c #19160b", -"@ c #1d190c", -"# c #1c1910", -"$ c #241e0a", -"% c #2a1f03", -"& c #391e02", -"* c #2d2405", -"= c #3d2202", -"- c #3c2e05", -"; c #4b2a02", -": c #4b3b0c", -"> c #463b13", -", c #532d02", -"< c #503907", -"1 c #633503", -"2 c #643b04", -"3 c #54440c", -"4 c #59440d", -"5 c #5c4b12", -"6 c #564e2e", -"7 c #524d3a", -"8 c #624b08", -"9 c #684706", -"0 c #694108", -"q c #6c4d07", -"w c #6c550a", -"e c #60511b", -"r c #6c5a18", -"t c #704104", -"y c #744d07", -"u c #7b4e07", -"i c #70570c", -"p c #7e580c", -"a c #725c13", -"s c #60562f", -"d c #605536", -"f c #79600e", -"g c #7e6611", -"h c #756427", -"j c #7f6b23", -"k c #7e703c", -"l c #716b57", -"z c #8f4d05", -"x c #8d5e09", -"c c #9e5908", -"v c #8a640a", -"b c #8b6e0f", -"n c #8a731f", -"m c #926b0e", -"M c #9e6409", -"N c #97760e", -"B c #99740d", -"V c #917414", -"C c #92791d", -"Z c #816f2b", -"A c #897a3f", -"S c #a15905", -"D c #ac6307", -"F c #a8750c", -"G c #a27b10", -"H c #a97d11", -"J c #b66606", -"K c #be6f08", -"L c #b2760a", -"P c #bc7309", -"I c #857949", -"U c #cc7c0a", -"Y c #ac860f", -"T c #b3870f", -"R c #968b5e", -"E c #9a8c52", -"W c #878165", -"Q c #a4924d", -"! c #bca650", -"~ c #afa065", -"^ c #b7a662", -"/ c #c28c10", -"( c #c88b12", -") c #c29211", -"_ c #c79e16", -"` c #ca9715", -"' c #ca9a11", -"] c #d1850c", -"[ c #d38a0d", -"{ c #d2970f", -"} c #db950f", -"| c #dd990f", -" . c #df9d10", -".. c #daa115", -"X. c #e4a311", -"o. c #e0b41e", -"O. c #edb515", -"+. c #f2be16", -"@. c #e5bc2d", -"#. c #c5aa59", -"$. c #d8bb4f", -"%. c #c9b878", -"&. c #f5c21a", -"*. c #f6c520", -"=. c #f7c827", -"-. c #f6c82a", -";. c #f6ce3d", -":. c #f8cf3d", -">. c #dcca7f", -",. c #f4d04d", -"<. c #f8d041", -"1. c #f6d558", -"2. c #f8d354", -"3. c #eacf65", -"4. c #f1d363", -"5. c #b4aa80", -"6. c #e1d18c", -"7. c #f4e299", -"8. c #fbe691", -"9. c #ede1a9", -"0. c #fcecaa", -"q. c #fdf0ba", -"w. c #fdf3c6", -"e. c #fef6d1", -"r. c None", -/* pixels */ -"r.r.r.r.r. r.r.r.r.r.", -"r.r.r. . * > r g w - . r.r.r.", -"r.r. @ 7 k 3.1.<.o.Y v O r.r.", -"r. + l R 7.>.Q j @.&.` v o r.", -"r.. d %.~ e.W ~ ! n &.O.{ y r.", -" $ #.E 9.e.q.8.4.e _ O.X.L O ", -" 5 2.I 6.0.7.I @ o * B ..[ ; ", -" V <.$.d ^ 6 + X . . ( [ t ", -" B =.:.,.h j -.f G H } U 2 ", -" 8 &.&.-.C a 3 &.i H .] K = ", -" * T _ b a G : O.) < x P S o ", -"r. q m ` ) 4 ....| [ 2 S , r.", -"r. o 9 F p ( } [ ] U J 1 . r.", -"r.r. o 2 u M P P D z ; . r.r.", -"r.r.r. O = , , & o r.r.r.", -"r.r.r.r.r. r.r.r.r.r." -}; diff --git a/data/cde_app_root/dt/appconfig/icons/C/Ximian.m.pm b/data/cde_app_root/dt/appconfig/icons/C/Ximian.m.pm deleted file mode 100644 index 125aaeceb9..0000000000 --- a/data/cde_app_root/dt/appconfig/icons/C/Ximian.m.pm +++ /dev/null @@ -1,272 +0,0 @@ -/* XPM */ -static char *ximian.m[] = { -/* columns rows colors chars-per-pixel */ -"32 32 234 2", -" c #000000", -". c #0a0602", -"X c #0c0902", -"o c #0b090a", -"O c #130d02", -"+ c #100c0e", -"@ c #1c0f01", -"# c #120e10", -"$ c #141004", -"% c #111009", -"& c #1c1302", -"* c #181409", -"= c #1c180c", -"- c #211401", -"; c #251b02", -": c #2b1601", -"> c #2c1c02", -", c #272109", -"< c #292004", -"1 c #2a230a", -"2 c #2e280f", -"3 c #262213", -"4 c #362604", -"5 c #342c0d", -"6 c #382603", -"7 c #36311d", -"8 c #3c3310", -"9 c #3b351f", -"0 c #2f2d22", -"q c #402a05", -"w c #482702", -"e c #4d2902", -"r c #433005", -"t c #45380c", -"y c #493707", -"u c #4c3d0b", -"i c #4a3810", -"p c #483f1c", -"a c #502f03", -"s c #553d06", -"d c #5c3503", -"f c #5f3a05", -"g c #423b22", -"h c #643503", -"j c #653f0a", -"k c #743e03", -"l c #534007", -"z c #55420f", -"x c #524516", -"c c #534619", -"v c #5a4711", -"b c #5b4a11", -"n c #4a4428", -"m c #4e4933", -"M c #524c33", -"N c #5d5123", -"B c #5e5532", -"V c #624206", -"C c #6f4706", -"Z c #684d09", -"A c #634c13", -"S c #665116", -"D c #6b5a1d", -"F c #794004", -"G c #7d4c0a", -"H c #775e0b", -"J c #7b5b0a", -"K c #6a5e2c", -"L c #625a3d", -"P c #7e6612", -"I c #7a6419", -"U c #6e602a", -"Y c #6c633e", -"T c #716844", -"R c #7e7240", -"E c #7a7354", -"W c #8e4c04", -"Q c #8d5106", -"! c #885908", -"~ c #995204", -"^ c #82640c", -"/ c #8c650b", -"( c #8a6b0c", -") c #856b11", -"_ c #836d1f", -"` c #8a721f", -"' c #95660e", -"] c #94680a", -"[ c #91710d", -"{ c #9b700e", -"} c #9b7a0e", -"| c #967018", -" . c #9a7014", -".. c #9d7e12", -"X. c #806e2d", -"o. c #937d2f", -"O. c #a55805", -"+. c #a05d0a", -"@. c #a85905", -"#. c #b25f06", -"$. c #a26308", -"%. c #ac6908", -"&. c #a2750f", -"*. c #a37c0e", -"=. c #ad720b", -"-. c #aa7c0d", -";. c #b66206", -":. c #b76807", -">. c #bb6506", -",. c #be6806", -"<. c #b9750a", -"1. c #81764d", -"2. c #877943", -"3. c #c06c07", -"4. c #c26e08", -"5. c #c57308", -"6. c #c87709", -"7. c #ca7b0a", -"8. c #9e8730", -"9. c #aa830f", -"0. c #a48110", -"q. c #a88716", -"w. c #b58e10", -"e. c #b58d1b", -"r. c #bf8e10", -"t. c #ba9312", -"y. c #a28d3c", -"u. c #b29325", -"i. c #bb9821", -"p. c #8e824e", -"a. c #9f8c46", -"s. c #a59966", -"d. c #b3a362", -"f. c #b8a867", -"g. c #bfaf6c", -"h. c #c1840d", -"j. c #ce810b", -"k. c #ca8a0e", -"l. c #cf8e14", -"z. c #ca910f", -"x. c #c49310", -"c. c #c79e15", -"v. c #ce9415", -"b. c #c89b18", -"n. c #d1850b", -"m. c #d48a0c", -"M. c #d9920e", -"N. c #dd980f", -"B. c #d49d1b", -"V. c #de9b10", -"C. c #c09d24", -"Z. c #cea61e", -"A. c #dca513", -"S. c #dba618", -"D. c #cfac35", -"F. c #cfb03f", -"G. c #d2b33f", -"H. c #dcba3c", -"J. c #e09d10", -"K. c #e3a311", -"L. c #e6a912", -"P. c #e0ad18", -"I. c #e8ab13", -"U. c #edb314", -"Y. c #e8b31d", -"T. c #ecb916", -"R. c #edbd1c", -"E. c #f1bb15", -"W. c #e2bb32", -"Q. c #c3aa4d", -"!. c #c8ae4e", -"~. c #c3ac55", -"^. c #ccb252", -"/. c #ccb55b", -"(. c #c6b265", -"). c #d0b961", -"_. c #f4c017", -"`. c #f6c31a", -"'. c #f7c621", -"]. c #f7c826", -"[. c #f7c92b", -"{. c #f9c928", -"}. c #f6cb33", -"|. c #fccd32", -" X c #f8ce3a", -".X c #f8d03e", -"XX c #ddc153", -"oX c #d9c678", -"OX c #dec975", -"+X c #ebca51", -"@X c #eccb58", -"#X c #f9cf41", -"$X c #f8d144", -"%X c #f8d34b", -"&X c #f9d451", -"*X c #f8d75a", -"=X c #f8d85d", -"-X c #e5ca63", -";X c #ecd47b", -":X c #fdd669", -">X c #fada66", -",X c #f9db69", -" cXcX", -"cX 1 $X:X2X3Xm rXjXlXkXgXiXyX1X*Xx l _._.U.I.J.M.j.f cXcX", -" P X&X>X).M sXfXgXgXdXuXOXa.X.D P T.U.L.J.M.n.+. cX", -" . q.|.$X=X-X7 6XsXdXsXiXd.n & l *.K.N.M.j.5. cX", -" $ t.{..X%X=XK n OXyXtXp. . { N.m.7.6.& cX", -" $ w.'.[.$X%X).U 7 Y 2.% * n & * . .N.m.7.4.- cX", -" $ w.`.`.[..X%X&X!.D = o.}.]... b.Z | V.l.n.6.3.@ cX", -" . 9.E.`.{.[. X#X$X!. 8 W.].`.0. U.K.K.N.m.7.5.,.. cX", -" J E.E.`.`.].].[.C.5 I X ) `.`.( = L.K.V.M.n.7.4.~ cX", -"cX r U.E.E.E.`.`.R.P v R.H , T.E.^ o / V.M.m.7.6.,.h cXcX", -"cX z.I.U.U.} } t t t.} O v Y.U.L.&.> V ! $.6.,.@.: # . cXcX", -"cX Z K.I.A.& z e.P.x.; S S.I.L.K.N.=.6 - j 4.,.F o # cXcX", -"cXcX X ] K.z.B.I.U.r.y A I.K.J.J.N.M.m.j.G +.,.@.@ # cXcXcX", -"cXcX ; k.V.V.N.K.s i v.K.V.N.M.m.n.j.6.4.,.#.e o o cXcXcX", -"cXcXcX > =.M.N.M.' l.M.M.m.m.m.7.6.4.3.,.#.w o # cXcXcXcX", -"cXcXcXcX > %.m.n.l.m.n.m.j.7.7.6.4.,.>.@.e . + cXcXcXcXcX", -"cXcXcXcXcX X d %.7.7.7.6.6.5.4.,.>.O.k O o o cXcXcXcXcXcX", -"cXcXcXcXcXcX - e W :.,.,.>.>.W d : X o o cXcXcXcXcXcXcX", -"cXcXcXcXcXcXcX . - O . o o o cXcXcXcXcXcXcXcX", -"cXcXcXcXcXcXcXcXcX . cXcXcXcXcXcXcXcXcXcX", -"cXcXcXcXcXcXcXcXcXcXcXcX cXcXcXcXcXcXcXcXcXcXcXcXcX", -"cXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcX" -}; diff --git a/data/cde_app_root/dt/appconfig/icons/C/Ximian.t.pm b/data/cde_app_root/dt/appconfig/icons/C/Ximian.t.pm deleted file mode 100644 index d0bdc61e8c..0000000000 --- a/data/cde_app_root/dt/appconfig/icons/C/Ximian.t.pm +++ /dev/null @@ -1,289 +0,0 @@ -/* XPM */ -static char *ximian.t[] = { -/* columns rows colors chars-per-pixel */ -"48 48 235 2", -" c #000000", -". c #090604", -"X c #080708", -"o c #0e0a01", -"O c #0d0a0a", -"+ c #100d0e", -"@ c #120f10", -"# c #1c1402", -"$ c #1e1905", -"% c #1e1908", -"& c #151213", -"* c #181315", -"= c #1b1618", -"- c #1e1b10", -"; c #1d181a", -": c #221201", -"> c #271902", -", c #2c1a01", -"< c #311d02", -"1 c #2c2204", -"2 c #2d260c", -"3 c #2c2410", -"4 c #2e2914", -"5 c #2e2918", -"6 c #332002", -"7 c #3f2503", -"8 c #3c2e05", -"9 c #3d3005", -"0 c #3e3209", -"q c #3d3311", -"w c #3b3218", -"e c #2f2c22", -"r c #3f3b2c", -"t c #452502", -"y c #4b2c03", -"u c #453005", -"i c #45320b", -"p c #483506", -"a c #493913", -"s c #512b02", -"d c #583504", -"f c #5c3b05", -"g c #5b3f17", -"h c #613704", -"j c #683703", -"k c #4d431d", -"l c #56400d", -"z c #584307", -"x c #5c4b10", -"c c #59491b", -"v c #4e472c", -"b c #5d5021", -"n c #5d532d", -"m c #674005", -"M c #684f09", -"N c #6b540a", -"B c #6c5a1a", -"V c #774c07", -"C c #7d4a06", -"Z c #725308", -"A c #7f5012", -"S c #6c5f2c", -"D c #7b610c", -"F c #7b6312", -"G c #7b661a", -"H c #6d6133", -"J c #6d633a", -"K c #7c6923", -"L c #7c6b2d", -"P c #7c6c30", -"I c #7d703e", -"U c #5e5840", -"Y c #7d7245", -"T c #7e785e", -"R c #8b4a04", -"E c #825207", -"W c #965004", -"Q c #8b6210", -"! c #896e13", -"~ c #936c0b", -"^ c #95710d", -"/ c #95741a", -"( c #896f20", -") c #8c7a36", -"_ c #a25605", -"` c #ae5c05", -"' c #a16b0a", -"] c #aa6107", -"[ c #ae6608", -"{ c #ab6f0a", -"} c #a57f0e", -"| c #ae730b", -" . c #ac7d0d", -".. c #b16c09", -"X. c #ba6406", -"o. c #be6906", -"O. c #b1780c", -"+. c #bd7f12", -"@. c #8c7d42", -"#. c #c06c07", -"$. c #c26e08", -"%. c #c57308", -"&. c #c57e0c", -"*. c #c87709", -"=. c #cb7b0a", -"-. c #9a8125", -";. c #9b832c", -":. c #a6800f", -">. c #a8840f", -",. c #aa891b", -"<. c #bc830d", -"1. c #be9123", -"2. c #b99a2a", -"3. c #ba9d33", -"4. c #ba9f3b", -"5. c #baa03e", -"6. c #9c8a48", -"7. c #9c8d54", -"8. c #9c8f5a", -"9. c #9c905a", -"0. c #8e8563", -"q. c #9e9676", -"w. c #baa141", -"e. c #bba758", -"r. c #bba85c", -"t. c #ada377", -"y. c #bcb07d", -"u. c #ce800b", -"i. c #cd8b0e", -"p. c #c38a1a", -"a. c #cb8913", -"s. c #c19111", -"d. c #c7921c", -"f. c #c59a11", -"g. c #c59c1f", -"h. c #cc9814", -"j. c #d1850c", -"k. c #d58c0d", -"l. c #d88f0e", -"z. c #d08512", -"x. c #d0900e", -"c. c #da930e", -"v. c #dd980f", -"b. c #d39510", -"n. c #d09d12", -"m. c #d59b1d", -"M. c #dd9b10", -"N. c #c8a016", -"B. c #d4a513", -"V. c #daa111", -"C. c #c9a62b", -"Z. c #c9ab3b", -"A. c #d8b024", -"S. c #d9b73a", -"D. c #e09d10", -"F. c #e3a311", -"G. c #e6a812", -"H. c #e6a818", -"J. c #e9ad13", -"K. c #e9ae19", -"L. c #e4b315", -"P. c #e3b21b", -"I. c #e7b91d", -"U. c #edb314", -"Y. c #edb51b", -"T. c #f0b715", -"R. c #f1bb15", -"E. c #e2b328", -"W. c #eab921", -"Q. c #c9ad41", -"!. c #caae49", -"~. c #cab050", -"^. c #dabf5c", -"/. c #cbb86d", -"(. c #cbb971", -"). c #cbbc79", -"_. c #f5c117", -"`. c #f6c41a", -"'. c #e9c33e", -"]. c #f7c622", -"[. c #f7c826", -"{. c #f7c92b", -"}. c #fac926", -"|. c #fbcb2b", -" X c #f7cc33", -".X c #f7cf3c", -"XX c #f8cc33", -"oX c #f8ce3a", -"OX c #f9d03c", -"+X c #e9c647", -"@X c #e8c749", -"#X c #e8c84d", -"$X c #e9cc5e", -"%X c #f8d143", -"&X c #f8d34c", -"*X c #f8d453", -"=X c #f9d65a", -"-X c #f9d85c", -";X c #eacf68", -":X c #ead273", -">X c #ead479", -",X c #fed76c", -" vXvXvXvXvXvXvX", -"vXvXvXvXvX & 2 #XaXxXcXeXI 9.0X0X0X4X2X1X-X*X%XoX X].`._.R.U.U.G.F.x.> vXvXvXvXvXvX", -"vXvXvXvXvXO 2 @XwXjXlXpX/.r wXwXwXqXqX0X2X1X-X5.S. X{.`.`.R.U.U.G.F.D.i.o vXvXvXvXvXvX", -"vXvXvXvX O Z.2XdXdXsX9X5 y.iXpXiXrX).8.H 4 q .X{.].`._.R.U.J.G.v.v.^ vXvXvXvXvX", -"vXvXvX O K *XyXsXsXwX8.r pXaXaXaXt. r J L -. X[.`._.R.U.J.G.D.v.l.f vXvXvXvX", -"vXvXvX X % %X2XyXuXwXqX- 5XsXfXfXfXT J wX0X2X.T.U.J.G.D.v.k.j.=.[ vXvX", -"vX % `.|.OX%X*XX0X0X6. d.v.l.k.=.*.$., vXvX", -"vX 8 _._.[.|.oX%X*X=X o L.T.R.s.2 > b.v.v.k.j.=.*.$.o.X.: + vXvXvX", -"vXvX M.J.U.U.R.R.B.f.L.N o ! `.>.o q A.U.J.J.M.l > <.| V =.*.*.#.X._ O @ vXvXvX", -"vXvXvX Z V.J.J.J.U.z o 1 - ( L.R.f.o c Y.U.U.J.J.V.F.Q o o V 6 ..%.#.X.X.t * . vXvXvXvX", -"vXvXvX o c.V.J.J.b. % / W.U.U.U.8 c Y.J.J.G.F.F.M.v.c.+.> A #.o.X._ X = vXvXvXvX", -"vXvXvX u v.F.F. .1.K.J.J.K.U.~ c K.G.G.F.F.v.v.c.c.k.j.z.d g ] o.X.X.> = X vXvXvXvX", -"vXvXvXvX ~ v.v.D.F.F.F.G.G., a H.F.F.D.v.v.v.v.l.k.j.u.*.*.$.o.X.X.j @ * vXvXvXvXvX", -"vXvXvXvXvX o O.v.v.v.D.D.D.D. 3 m.M.D.M.v.v.c.l.k.j.j.=.*.%.#.o.X.X.W X ; vXvXvXvXvXvX", -"vXvXvXvXvX o | l.c.c.v.c.v.i p.c.c.c.c.l.l.k.j.j.u.=.*.%.#.o.X.X.W . . * X vXvXvXvXvXvX", -"vXvXvXvXvXvX o { k.k.k.k.l.a.l.l.k.k.k.k.j.u.u.*.*.*.#.o.o.X.X.W o * + vXvXvXvXvXvXvX", -"vXvXvXvXvXvXvX o E j.j.j.k.j.j.k.j.j.j.=.=.*.*.*.$.#.o.X.X.X.j @ @ vXvXvXvXvXvXvXvX", -"vXvXvXvXvXvXvXvX < ..=.=.=.=.=.=.*.*.*.*.%.$.#.o.X.X.X.W , X * O vXvXvXvXvXvXvXvXvX", -"vXvXvXvXvXvXvXvXvX y [ *.*.*.%.%.$.#.#.o.o.X.X.X.W t O & X vXvXvXvXvXvXvXvXvXvX", -"vXvXvXvXvXvXvXvXvXvX : h R o.#.o.X.X.X.` R s : O @ + vXvXvXvXvXvXvXvXvXvXvX", -"vXvXvXvXvXvXvXvXvXvXvXvX , , , . O + + . vXvXvXvXvXvXvXvXvXvXvXvXvX", -"vXvXvXvXvXvXvXvXvXvXvXvXvX . . X X O O X vXvXvXvXvXvXvXvXvXvXvXvXvXvX", -"vXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvX X X X X vXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvX", -"vXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvX vXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvX", -"vXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvX", -"vXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvX" -}; diff --git a/data/cde_app_root/dt/appconfig/icons/Makefile.am b/data/cde_app_root/dt/appconfig/icons/Makefile.am deleted file mode 100644 index 29295aeb2b..0000000000 --- a/data/cde_app_root/dt/appconfig/icons/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = C --include $(top_srcdir)/git.mk diff --git a/data/cde_app_root/dt/appconfig/types/C/Makefile.am b/data/cde_app_root/dt/appconfig/types/C/Makefile.am deleted file mode 100644 index ca714075fa..0000000000 --- a/data/cde_app_root/dt/appconfig/types/C/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -EXTRA_DIST = Ximian.dt.in - -if HAVE_DTAPPINTEGRATE -cdetypesdir = $(privdatadir)/cde_app_root/dt/appconfig/types/C -cdetypes_DATA = Ximian.dt -endif - --include $(top_srcdir)/git.mk diff --git a/data/cde_app_root/dt/appconfig/types/C/Ximian.dt.in b/data/cde_app_root/dt/appconfig/types/C/Ximian.dt.in deleted file mode 100644 index 3815769b7e..0000000000 --- a/data/cde_app_root/dt/appconfig/types/C/Ximian.dt.in +++ /dev/null @@ -1,30 +0,0 @@ -DATA_ATTRIBUTES XimianAppgroup -{ - ACTIONS OpenInPlace, OpenNewView - ICON Ximian - DESCRIPTION Double-click to open the Ximian application group -} - -DATA_CRITERIA XimianAppgroupCriterial -{ - DATA_ATTRIBUTES_NAME XimianAppgroup - MODE d - PATH_PATTERN */appmanager/*/Ximian -} - -ACTION Open -{ - LABEL Open - ARG_TYPE XimianAppgroup - TYPE MAP - MAP_ACTION OpenAppGroup -} - -ACTION Evolution -{ - LABEL Ximian Evolution - TYPE COMMAND - EXEC_STRING @prefix@/bin/evolution-nognome - ICON Evolution - WINDOW_TYPE NO_STDIO -} diff --git a/data/cde_app_root/dt/appconfig/types/Makefile.am b/data/cde_app_root/dt/appconfig/types/Makefile.am deleted file mode 100644 index ec240797c0..0000000000 --- a/data/cde_app_root/dt/appconfig/types/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = C - --include $(top_srcdir)/git.mk diff --git a/shell/Makefile.am b/shell/Makefile.am index 6d47f6e933..025827d45a 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -208,23 +208,6 @@ install-evolution: $(install-privsolibLTLIBRARIES) uninstall-evolution: $(LIBTOOL) --mode=uninstall rm -rf $(DESTDIR)$(bindir)/evolution$(EXEEXT) -if HAVE_DTAPPINTEGRATE - -install-exec-local: install-evolution - $(mkinstalldirs) $(DESTDIR)$(libexecdir) - mv $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION) $(DESTDIR)$(libexecdir)/evolution-$(BASE_VERSION) - $(INSTALL_PROGRAM) evolution-nognome $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION) - -uninstall-local: uninstall-evolution - rm -rf $(DESTDIR)$(libexecdir)/evolution-$(BASE_VERSION) - rm -rf $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION)/evolution-nognome -else - -install-exec-local: install-evolution -uninstall-local: uninstall-evolution - -endif - # Extra dist stuff EXTRA_DIST = \ -- cgit v1.2.3 From 85b0a2981ad85972052fc76fc8fb6997183535f5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Jun 2009 12:49:49 -0400 Subject: Fix distcheck errors. --- Makefile.am | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index d0cfe9e8ec..f97649f331 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,13 +60,9 @@ SUBDIRS += help endif DISTCLEANFILES = \ - $(srcdir)/doltcompile \ - $(srcdir)/doltlibtool \ - $(srcdir)/intltool-extract \ - $(srcdir)/intltool-merge \ - $(srcdir)/intltool-update \ - $(srcdir)/iconv-detect.h \ - $(pkgconfig_DATA) + $(builddir)/doltcompile \ + $(builddir)/doltlibtool \ + $(builddir)/iconv-detect.h MAINTAINERCLEANFILES = \ $(srcdir)/INSTALL \ -- cgit v1.2.3 From 3c480eccbf37fdc71779850e292ab61edb03e73e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 May 2009 13:39:23 -0400 Subject: =?UTF-8?q?Bug=20581280=20=E2=80=93=20Wrong=20attachment=20name=20?= =?UTF-8?q?in=20event?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calendar/gui/dialogs/comp-editor.c | 220 ++++++++++++++++--------- widgets/misc/e-attachment-store.c | 327 ++++++++++++++++++++++++++++++++++++- widgets/misc/e-attachment-store.h | 7 + 3 files changed, 472 insertions(+), 82 deletions(-) diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 598dbf4ff4..469c1c6e28 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -190,99 +190,109 @@ attachment_store_changed_cb (CompEditor *editor) comp_editor_set_changed (editor, TRUE); } +static void +attachment_save_finished (EAttachmentStore *store, + GAsyncResult *result, + gpointer user_data) +{ + GtkWidget *dialog; + const gchar *primary_text; + gchar **uris; + GError *error = NULL; + + struct { + gchar **uris; + gboolean done; + GtkWindow *parent; + } *status = user_data; + + uris = e_attachment_store_save_finish (store, result, &error); + + status->uris = uris; + status->done = TRUE; + + if (uris != NULL) + goto exit; + + /* Ignore cancellations. */ + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + goto exit; + + primary_text = _("Could not save attachments"); + + dialog = gtk_message_dialog_new_with_markup ( + status->parent, GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + "%s", primary_text); + + gtk_message_dialog_format_secondary_text ( + GTK_MESSAGE_DIALOG (dialog), "%s", error->message); + + gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_widget_destroy (dialog); + +exit: + if (error != NULL) + g_error_free (error); + + g_object_unref (status->parent); +} + static GSList * get_attachment_list (CompEditor *editor) { EAttachmentStore *store; EAttachmentView *view; - GtkTreeModel *model; - GtkTreeIter iter; + GFile *destination; GSList *list = NULL; - const gchar *comp_uid = NULL; - const gchar *local_store = e_cal_get_local_attachment_store (editor->priv->client); - gboolean valid; - gint ticker=0; + const char *comp_uid = NULL; + const char *local_store; + gchar *uri; + gint ii; - e_cal_component_get_uid (editor->priv->comp, &comp_uid); + struct { + gchar **uris; + gboolean done; + GtkWindow *parent; + } status; + + status.uris = NULL; + status.done = FALSE; + status.parent = g_object_ref (editor); view = E_ATTACHMENT_VIEW (editor->priv->attachment_view); store = e_attachment_view_get_store (view); - model = GTK_TREE_MODEL (store); - valid = gtk_tree_model_get_iter_first (model, &iter); - - while (valid) { - EAttachment *attachment; - CamelDataWrapper *wrapper; - CamelMimePart *mime_part; - CamelStream *stream; - gchar *attach_file_url; - gchar *safe_fname, *utf8_safe_fname; - gchar *filename; - gint column_id; - - column_id = E_ATTACHMENT_STORE_COLUMN_ATTACHMENT; - gtk_tree_model_get (model, &iter, column_id, &attachment, -1); - mime_part = e_attachment_get_mime_part (attachment); - g_object_unref (attachment); - - valid = gtk_tree_model_iter_next (model, &iter); + local_store = e_cal_get_local_attachment_store (editor->priv->client); + e_cal_component_get_uid (editor->priv->comp, &comp_uid); + uri = g_build_path ("/", local_store, comp_uid, NULL); + destination = g_file_new_for_uri (uri); + g_free (uri); - if (mime_part == NULL) - continue; + e_attachment_store_save_async ( + store, destination, (GAsyncReadyCallback) + attachment_save_finished, &status); - wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part)); + g_object_unref (destination); - /* Extract the content from the stream and write it down - * as a mime part file into the directory denoting the - * calendar source */ - utf8_safe_fname = camel_file_util_safe_filename (camel_mime_part_get_filename (mime_part)); - - /* It is absolutely fine to get a NULL from the filename of - * mime part. We assume that it is named "Attachment" - * in mailer. I'll do that with a ticker */ - if (!utf8_safe_fname) - safe_fname = g_strdup_printf ("%s-%d", _("attachment"), ticker++); - else { - safe_fname = g_filename_from_utf8 ((const gchar *) utf8_safe_fname, -1, NULL, NULL, NULL); - g_free (utf8_safe_fname); - } - filename = g_strdup_printf ("%s-%s", comp_uid, safe_fname); - - attach_file_url = g_build_path ("/", local_store, filename, NULL); - - g_free (filename); - g_free (safe_fname); - - /* do not overwrite existing files, this will result in truncation */ - filename = g_filename_from_uri (attach_file_url, NULL, NULL); - if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { - stream = camel_stream_fs_new_with_name(filename, O_RDWR|O_CREAT|O_TRUNC, 0600); - if (!stream) { - /* TODO handle error conditions */ - g_message ("DEBUG: could not open the file to write\n"); - g_free (attach_file_url); - g_free (filename); - continue; - } + /* We can't return until we have results, so crank + * the main loop until the callback gets triggered. */ + while (!status.done) + gtk_main_iteration (); - if (camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) stream) == -1) { - g_free (attach_file_url); - camel_stream_close (stream); - camel_object_unref (stream); - g_message ("DEBUG: could not write to file\n"); - } + if (status.uris == NULL) + return NULL; - camel_stream_close (stream); - camel_object_unref (stream); - } - - list = g_slist_append (list, g_strdup (attach_file_url)); - g_free (attach_file_url); - g_free (filename); + /* Transfer the URI strings to the GSList. */ + for (ii = 0; status.uris[ii] != NULL; ii++) { + list = g_slist_prepend (list, status.uris[ii]); + status.uris[ii] = NULL; } - return list; + g_free (status.uris); + + return g_slist_reverse (list); } /* This sets the focus to the toplevel, so any field being edited is committed. @@ -2239,11 +2249,52 @@ comp_editor_get_client (CompEditor *editor) } static void -set_attachment_list (CompEditor *editor, GSList *attach_list) +attachment_loaded_cb (EAttachment *attachment, + GAsyncResult *result, + GtkWindow *parent) +{ + GFileInfo *file_info; + const gchar *display_name; + const gchar *uid; + + /* Prior to 2.27.2, attachment files were named: + * + * '-' + * ------------------------------------- + * (one long filename) + * + * Here we fix the display name if this form is detected so we + * don't show the component UID in the user interface. If the + * user saves changes in the editor, the attachment will be + * written to disk as: + * + * / + * --------------- ----------------- + * (directory) (original name) + * + * So this is a lazy migration from the old form to the new. + */ + + file_info = e_attachment_get_file_info (attachment); + display_name = g_file_info_get_display_name (file_info); + uid = g_object_get_data (G_OBJECT (attachment), "uid"); + + if (g_str_has_prefix (display_name, uid)) { + g_file_info_set_display_name ( + file_info, display_name + strlen (uid) + 1); + g_object_notify (G_OBJECT (attachment), "file-info"); + } + + e_attachment_load_handle_error (attachment, result, parent); +} + +static void +set_attachment_list (CompEditor *editor, GSList *uri_list) { EAttachmentStore *store; EAttachmentView *view; - GSList *iter = NULL; + const gchar *uid = NULL; + GSList *iter; view = E_ATTACHMENT_VIEW (editor->priv->attachment_view); store = e_attachment_view_get_store (view); @@ -2256,15 +2307,22 @@ set_attachment_list (CompEditor *editor, GSList *attach_list) return; } - for (iter = attach_list; iter != NULL; iter = iter->next) { + /* XXX What an awkward API this is. Takes a return location + * for a constant string instead of just returning it. */ + e_cal_component_get_uid (editor->priv->comp, &uid); + + for (iter = uri_list; iter != NULL; iter = iter->next) { EAttachment *attachment; - const gchar *uri = iter->data; - attachment = e_attachment_new_for_uri (uri); + attachment = e_attachment_new_for_uri (iter->data); e_attachment_store_add_attachment (store, attachment); + g_object_set_data_full ( + G_OBJECT (attachment), + "uid", g_strdup (uid), + (GDestroyNotify) g_free); e_attachment_load_async ( attachment, (GAsyncReadyCallback) - e_attachment_load_handle_error, editor); + attachment_loaded_cb, editor); g_object_unref (attachment); } } diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c index baa1ef6c7f..c99bdeab3f 100644 --- a/widgets/misc/e-attachment-store.c +++ b/widgets/misc/e-attachment-store.c @@ -854,7 +854,7 @@ e_attachment_store_get_uris_async (EAttachmentStore *store, path = e_mkdtemp (template); g_free (template); - /* XXX Let's hope errno got set property. */ + /* XXX Let's hope errno got set properly. */ if (path == NULL) { GSimpleAsyncResult *simple; @@ -903,3 +903,328 @@ e_attachment_store_get_uris_finish (EAttachmentStore *store, return uris; } + +/********************** e_attachment_store_save_async() **********************/ + +typedef struct _SaveContext SaveContext; + +struct _SaveContext { + GSimpleAsyncResult *simple; + GFile *destination; + GFile *fresh_directory; + GFile *trash_directory; + GList *attachment_list; + GError *error; + gchar **uris; + gint index; +}; + +static SaveContext * +attachment_store_save_context_new (EAttachmentStore *store, + GFile *destination, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SaveContext *save_context; + GSimpleAsyncResult *simple; + GList *attachment_list; + guint length; + gchar **uris; + + simple = g_simple_async_result_new ( + G_OBJECT (store), callback, user_data, + e_attachment_store_save_async); + + attachment_list = e_attachment_store_get_attachments (store); + + /* Add one for NULL terminator. */ + length = g_list_length (attachment_list) + 1; + uris = g_malloc0 (sizeof (gchar *) * length); + + save_context = g_slice_new0 (SaveContext); + save_context->simple = simple; + save_context->destination = g_object_ref (destination); + save_context->attachment_list = attachment_list; + save_context->uris = uris; + + return save_context; +} + +static void +attachment_store_save_context_free (SaveContext *save_context) +{ + /* Do not free the GSimpleAsyncResult. */ + + /* The attachment list should be empty now. */ + g_warn_if_fail (save_context->attachment_list == NULL); + + /* So should the error. */ + g_warn_if_fail (save_context->error == NULL); + + if (save_context->destination) { + g_object_unref (save_context->destination); + save_context->destination = NULL; + } + + if (save_context->fresh_directory) { + g_object_unref (save_context->fresh_directory); + save_context->fresh_directory = NULL; + } + + if (save_context->trash_directory) { + g_object_unref (save_context->trash_directory); + save_context->trash_directory = NULL; + } + + g_strfreev (save_context->uris); + + g_slice_free (SaveContext, save_context); +} + +static void +attachment_store_save_cb (EAttachment *attachment, + GAsyncResult *result, + SaveContext *save_context) +{ + GSimpleAsyncResult *simple; + GFile *file; + gchar **uris; + gchar *template; + gchar *path; + GError *error = NULL; + + file = e_attachment_save_finish (attachment, result, &error); + + /* Remove the attachment from the list. */ + save_context->attachment_list = g_list_remove ( + save_context->attachment_list, attachment); + g_object_unref (attachment); + + if (file != NULL) { + /* Assemble the file's final URI from its basename. */ + gchar *basename; + gchar *uri; + + basename = g_file_get_basename (file); + g_object_unref (file); + + file = save_context->destination; + file = g_file_get_child (file, basename); + uri = g_file_get_uri (file); + g_object_unref (file); + + save_context->uris[save_context->index++] = uri; + + } else if (error != NULL) { + /* If this is the first error, cancel the other jobs. */ + if (save_context->error == NULL) { + g_propagate_error (&save_context->error, error); + g_list_foreach ( + save_context->attachment_list, + (GFunc) e_attachment_cancel, NULL); + error = NULL; + + /* Otherwise, we can only report back one error. So if + * this is something other than cancellation, dump it to + * the terminal. */ + } else if (!g_error_matches ( + error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + g_warning ("%s", error->message); + } + + if (error != NULL) + g_error_free (error); + + /* If there's still jobs running, let them finish. */ + if (save_context->attachment_list != NULL) + return; + + /* If an error occurred while saving, we're done. */ + if (save_context->error != NULL) { + /* Steal the result. */ + simple = save_context->simple; + save_context->simple = NULL; + + /* And the error. */ + error = save_context->error; + save_context->error = NULL; + + g_simple_async_result_set_from_error (simple, error); + g_simple_async_result_complete (simple); + attachment_store_save_context_free (save_context); + g_error_free (error); + return; + } + + /* Attachments are all saved to a temporary directory. + * Now we need to move the existing destination directory + * out of the way (if it exists). Instead of testing for + * existence we'll just attempt the move and ignore any + * G_IO_ERROR_NOT_FOUND errors. */ + + /* First, however, we need another temporary directory to + * move the existing destination directory to. Note we're + * not actually creating the directory yet, just picking a + * name for it. The usual raciness with this approach + * applies here (read up on mktemp(3)), but worst case is + * we get a spurious G_IO_ERROR_WOULD_MERGE error and the + * user has to try saving attachments again. */ + template = g_strdup_printf (PACKAGE "-%s-XXXXXX", g_get_user_name ()); + path = e_mktemp (template); + g_free (template); + + save_context->trash_directory = g_file_new_for_path (path); + g_free (path); + + /* XXX No asynchronous move operation in GIO? */ + g_file_move ( + save_context->destination, + save_context->trash_directory, + G_FILE_COPY_NONE, NULL, NULL, NULL, &error); + + if (error != NULL && !g_error_matches ( + error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) { + + /* Steal the result. */ + simple = save_context->simple; + save_context->simple = NULL; + + g_simple_async_result_set_from_error (simple, error); + g_simple_async_result_complete (simple); + attachment_store_save_context_free (save_context); + g_error_free (error); + return; + } + + g_clear_error (&error); + + /* Now we can move the first temporary directory containing + * the newly saved files to the user-specified destination. */ + g_file_move ( + save_context->fresh_directory, + save_context->destination, + G_FILE_COPY_NONE, NULL, NULL, NULL, &error); + + if (error != NULL) { + /* Steal the result. */ + simple = save_context->simple; + save_context->simple = NULL; + + g_simple_async_result_set_from_error (simple, error); + g_simple_async_result_complete (simple); + attachment_store_save_context_free (save_context); + g_error_free (error); + return; + } + + /* Steal the result. */ + simple = save_context->simple; + save_context->simple = NULL; + + /* And the URI list. */ + uris = save_context->uris; + save_context->uris = NULL; + + g_simple_async_result_set_op_res_gpointer (simple, uris, NULL); + g_simple_async_result_complete (simple); + + attachment_store_save_context_free (save_context); +} + +void +e_attachment_store_save_async (EAttachmentStore *store, + GFile *destination, + GAsyncReadyCallback callback, + gpointer user_data) +{ + SaveContext *save_context; + GList *attachment_list, *iter; + GFile *temp_directory; + gchar *template; + gchar *path; + + g_return_if_fail (E_IS_ATTACHMENT_STORE (store)); + g_return_if_fail (G_IS_FILE (destination)); + g_return_if_fail (callback != NULL); + + save_context = attachment_store_save_context_new ( + store, destination, callback, user_data); + + attachment_list = save_context->attachment_list; + + /* Deal with an empty attachment store. The caller will get + * an empty NULL-terminated list as opposed to NULL, to help + * distinguish it from an error. */ + if (attachment_list == NULL) { + GSimpleAsyncResult *simple; + gchar **uris; + + /* Steal the result. */ + simple = save_context->simple; + save_context->simple = NULL; + + /* And the URI list. */ + uris = save_context->uris; + save_context->uris = NULL; + + g_simple_async_result_set_op_res_gpointer (simple, uris, NULL); + g_simple_async_result_complete_in_idle (simple); + attachment_store_save_context_free (save_context); + return; + } + + /* Save all attachments to a temporary directory, which we'll + * then move to its proper location. We use a directory so + * files can retain their basenames. + * XXX This could trigger a blocking temp directory cleanup. */ + template = g_strdup_printf (PACKAGE "-%s-XXXXXX", g_get_user_name ()); + path = e_mkdtemp (template); + g_free (template); + + /* XXX Let's hope errno got set properly. */ + if (path == NULL) { + GSimpleAsyncResult *simple; + + /* Steal the result. */ + simple = save_context->simple; + save_context->simple = NULL; + + g_simple_async_result_set_error ( + simple, G_FILE_ERROR, + g_file_error_from_errno (errno), + "%s", g_strerror (errno)); + + g_simple_async_result_complete_in_idle (simple); + attachment_store_save_context_free (save_context); + return; + } + + temp_directory = g_file_new_for_path (path); + save_context->fresh_directory = temp_directory; + g_free (path); + + for (iter = attachment_list; iter != NULL; iter = iter->next) + e_attachment_save_async ( + E_ATTACHMENT (iter->data), + temp_directory, (GAsyncReadyCallback) + attachment_store_save_cb, save_context); +} + +gchar ** +e_attachment_store_save_finish (EAttachmentStore *store, + GAsyncResult *result, + GError **error) +{ + GSimpleAsyncResult *simple; + gchar **uris; + + g_return_val_if_fail (E_IS_ATTACHMENT_STORE (store), NULL); + g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), NULL); + + simple = G_SIMPLE_ASYNC_RESULT (result); + uris = g_simple_async_result_get_op_res_gpointer (simple); + g_simple_async_result_propagate_error (simple, error); + g_object_unref (simple); + + return uris; +} diff --git a/widgets/misc/e-attachment-store.h b/widgets/misc/e-attachment-store.h index 46ca9e4aa6..1c3cb52731 100644 --- a/widgets/misc/e-attachment-store.h +++ b/widgets/misc/e-attachment-store.h @@ -118,6 +118,13 @@ gchar ** e_attachment_store_get_uris_finish (EAttachmentStore *store, GAsyncResult *result, GError **error); +void e_attachment_store_save_async (EAttachmentStore *store, + GFile *destination, + GAsyncReadyCallback callback, + gpointer user_data); +gchar ** e_attachment_store_save_finish (EAttachmentStore *store, + GAsyncResult *result, + GError **error); G_END_DECLS -- cgit v1.2.3 From 451c4065e5a8ae572c3176a17ba07c278830e762 Mon Sep 17 00:00:00 2001 From: Jorge Gonzalez Date: Tue, 2 Jun 2009 20:18:49 +0200 Subject: Updated Spanish translation --- po/es.po | 1109 ++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 538 insertions(+), 571 deletions(-) diff --git a/po/es.po b/po/es.po index 8c2ce4f3e9..4e077fc8bb 100644 --- a/po/es.po +++ b/po/es.po @@ -10,14 +10,14 @@ # Pablo Gonzalo del Campo ,2003 (revisión). # Francisco Javier F. Serrador , 2003, 2004, 2005, 2006. # Jorge González , 2007, 200, 2009. -#: ../shell/main.c:603 +#: ../shell/main.c:605 msgid "" msgstr "" "Project-Id-Version: evolution.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=evolution\n" -"POT-Creation-Date: 2009-05-25 18:00+0000\n" -"PO-Revision-Date: 2009-05-27 06:20+0200\n" +"POT-Creation-Date: 2009-05-27 04:24+0000\n" +"PO-Revision-Date: 2009-06-01 09:49+0200\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -65,32 +65,32 @@ msgstr "Contacto: " msgid "evolution minicard" msgstr "minitarjeta de Evolution" -#: ../a11y/calendar/ea-cal-view-event.c:265 +#: ../a11y/calendar/ea-cal-view-event.c:268 msgid "It has alarms." msgstr "Tiene alertas." -#: ../a11y/calendar/ea-cal-view-event.c:268 +#: ../a11y/calendar/ea-cal-view-event.c:271 msgid "It has recurrences." msgstr "Tiene repeticiones." -#: ../a11y/calendar/ea-cal-view-event.c:271 +#: ../a11y/calendar/ea-cal-view-event.c:274 msgid "It is a meeting." msgstr "Es una reunión." -#: ../a11y/calendar/ea-cal-view-event.c:277 +#: ../a11y/calendar/ea-cal-view-event.c:280 #, c-format msgid "Calendar Event: Summary is %s." msgstr "Acontecimiento de calendario: El resumen es %s." -#: ../a11y/calendar/ea-cal-view-event.c:279 +#: ../a11y/calendar/ea-cal-view-event.c:282 msgid "Calendar Event: It has no summary." msgstr "Acontecimiento de calendario: Sin resumen." -#: ../a11y/calendar/ea-cal-view-event.c:299 +#: ../a11y/calendar/ea-cal-view-event.c:302 msgid "calendar view event" msgstr "vista de acontecimientos del calendario" -#: ../a11y/calendar/ea-cal-view-event.c:527 +#: ../a11y/calendar/ea-cal-view-event.c:530 msgid "Grab Focus" msgstr "Obtener el foco" @@ -159,7 +159,7 @@ msgid "calendar view for one or more days" msgstr "vista de calendario para uno o más días" #: ../a11y/calendar/ea-gnome-calendar.c:186 -#: ../calendar/gui/calendar-component.c:771 +#: ../calendar/gui/calendar-component.c:772 msgid "%A %d %b %Y" msgstr "%A, %e de %b de %Y" @@ -170,7 +170,7 @@ msgstr "%A, %e de %b de %Y" #. You can change the order but don't change the #. specifiers or add anything. #: ../a11y/calendar/ea-gnome-calendar.c:189 -#: ../calendar/gui/calendar-component.c:774 +#: ../calendar/gui/calendar-component.c:775 #: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1598 #: ../calendar/gui/e-week-view-main-item.c:335 msgid "%a %d %b" @@ -179,9 +179,9 @@ msgstr "%a, %e de %b" #: ../a11y/calendar/ea-gnome-calendar.c:191 #: ../a11y/calendar/ea-gnome-calendar.c:196 #: ../a11y/calendar/ea-gnome-calendar.c:198 -#: ../calendar/gui/calendar-component.c:776 -#: ../calendar/gui/calendar-component.c:781 -#: ../calendar/gui/calendar-component.c:783 +#: ../calendar/gui/calendar-component.c:777 +#: ../calendar/gui/calendar-component.c:782 +#: ../calendar/gui/calendar-component.c:784 msgid "%a %d %b %Y" msgstr "%a, %e de %b de %Y" @@ -189,10 +189,10 @@ msgstr "%a, %e de %b de %Y" #: ../a11y/calendar/ea-gnome-calendar.c:221 #: ../a11y/calendar/ea-gnome-calendar.c:227 #: ../a11y/calendar/ea-gnome-calendar.c:229 -#: ../calendar/gui/calendar-component.c:795 -#: ../calendar/gui/calendar-component.c:802 -#: ../calendar/gui/calendar-component.c:808 -#: ../calendar/gui/calendar-component.c:810 +#: ../calendar/gui/calendar-component.c:796 +#: ../calendar/gui/calendar-component.c:803 +#: ../calendar/gui/calendar-component.c:809 +#: ../calendar/gui/calendar-component.c:811 msgid "%d %b %Y" msgstr "%e de %B de %Y" @@ -202,7 +202,7 @@ msgstr "%e de %B de %Y" #. month name. You can change the order but don't #. change the specifiers or add anything. #: ../a11y/calendar/ea-gnome-calendar.c:219 -#: ../calendar/gui/calendar-component.c:800 +#: ../calendar/gui/calendar-component.c:801 #: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1614 #: ../calendar/gui/e-week-view-main-item.c:349 msgid "%d %b" @@ -210,7 +210,7 @@ msgstr "%e de %b" #: ../a11y/calendar/ea-gnome-calendar.c:245 #: ../a11y/calendar/ea-gnome-calendar.c:253 -#: ../calendar/importers/icalendar-importer.c:780 +#: ../calendar/importers/icalendar-importer.c:782 msgid "Gnome Calendar" msgstr "Calendario de GNOME" @@ -609,7 +609,7 @@ msgstr "Configure el autocompletado aquí" #: ../addressbook/gui/component/addressbook-view.c:1213 #: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:396 #: ../plugins/exchange-operations/exchange-delegates-user.c:76 -#: ../plugins/exchange-operations/exchange-folder.c:582 +#: ../plugins/exchange-operations/exchange-folder.c:583 msgid "Contacts" msgstr "Contactos" @@ -652,9 +652,9 @@ msgstr "Gestione sus certificados S/MIME aquí" #: ../calendar/gui/calendar-component.c:192 #: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:475 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091 -#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:203 -#: ../mail/em-folder-tree-model.c:205 ../mail/em-migrate.c:2890 -#: ../mail/mail-component.c:318 ../mail/mail-vfolder.c:217 +#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:204 +#: ../mail/em-folder-tree-model.c:206 ../mail/em-migrate.c:2891 +#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217 #: ../mail/message-list.c:1517 msgid "On This Computer" msgstr "En este equipo" @@ -679,13 +679,13 @@ msgstr "En servidores LDAP" #: ../addressbook/gui/component/addressbook-component.c:135 #: ../addressbook/gui/component/addressbook-component.c:138 #: ../addressbook/gui/component/addressbook-migrate.c:508 -#: ../addressbook/gui/widgets/eab-contact-display.c:652 +#: ../addressbook/gui/widgets/eab-contact-display.c:653 #: ../calendar/gui/calendar-component.c:232 #: ../calendar/gui/calendar-component.c:238 #: ../calendar/gui/memos-component.c:190 ../calendar/gui/memos-component.c:194 #: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585 #: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:187 -#: ../calendar/gui/tasks-component.c:191 ../mail/em-migrate.c:959 +#: ../calendar/gui/tasks-component.c:191 ../mail/em-migrate.c:960 #: ../plugins/email-custom-header/email-custom-header.c:338 msgid "Personal" msgstr "Privado" @@ -830,7 +830,7 @@ msgid "Details" msgstr "Detalles" #: ../addressbook/gui/component/addressbook-config.c:1033 -#: ../mail/em-folder-browser.c:1026 +#: ../mail/em-folder-browser.c:1024 msgid "Searching" msgstr "Búsqueda" @@ -844,12 +844,12 @@ msgid "Address Book Properties" msgstr "Propiedades de la libreta de direcciones" #: ../addressbook/gui/component/addressbook-migrate.c:74 -#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109 +#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1110 msgid "Migrating..." msgstr "Migrando…" #: ../addressbook/gui/component/addressbook-migrate.c:126 -#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168 +#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1169 #, c-format msgid "Migrating '%s':" msgstr "Migrando «%s»:" @@ -930,7 +930,7 @@ msgid "Save As vCard..." msgstr "Guardar como vCard…" #: ../addressbook/gui/component/addressbook-view.c:951 -#: ../calendar/gui/calendar-component.c:628 +#: ../calendar/gui/calendar-component.c:629 #: ../calendar/gui/memos-component.c:481 ../calendar/gui/tasks-component.c:473 #: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:39 msgid "_Rename..." @@ -938,11 +938,11 @@ msgstr "_Renombrar…" #: ../addressbook/gui/component/addressbook-view.c:954 #: ../addressbook/gui/widgets/e-addressbook-view.c:954 -#: ../calendar/gui/calendar-component.c:631 -#: ../calendar/gui/e-calendar-table.c:1616 -#: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:954 +#: ../calendar/gui/calendar-component.c:632 +#: ../calendar/gui/e-calendar-table.c:1614 +#: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:952 #: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:476 -#: ../mail/em-folder-tree.c:2052 ../mail/em-folder-view.c:1340 +#: ../mail/em-folder-tree.c:2052 ../mail/em-folder-view.c:1341 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16 #: ../ui/evolution-tasks.xml.h:24 @@ -950,7 +950,7 @@ msgid "_Delete" msgstr "_Borrar" #: ../addressbook/gui/component/addressbook-view.c:957 -#: ../calendar/gui/calendar-component.c:636 +#: ../calendar/gui/calendar-component.c:637 #: ../calendar/gui/memos-component.c:489 ../calendar/gui/tasks-component.c:481 #: ../mail/em-folder-tree.c:2061 ../ui/evolution-addressbook.xml.h:59 #: ../ui/evolution-mail-list.xml.h:38 @@ -1345,7 +1345,7 @@ msgstr "_Cumpleaños:" #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23 #: ../calendar/gui/dialogs/event-page.c:805 #: ../calendar/gui/dialogs/event-page.glade.h:14 -#: ../plugins/itip-formatter/itip-view.c:1910 +#: ../plugins/itip-formatter/itip-view.c:1913 msgid "_Calendar:" msgstr "_Calendario:" @@ -1436,9 +1436,9 @@ msgstr "_Código postal:" #: ../plugins/exchange-operations/exchange-delegates.c:954 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:706 #: ../plugins/plugin-manager/plugin-manager.c:57 -#: ../widgets/menus/gal-define-views-dialog.c:346 +#: ../widgets/menus/gal-define-views-dialog.c:344 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90 -#: ../widgets/menus/gal-view-new-dialog.c:63 +#: ../widgets/menus/gal-view-new-dialog.c:61 msgid "Name" msgstr "Nombre" @@ -1458,50 +1458,50 @@ msgid "Editable" msgstr "Editable" #: ../addressbook/gui/contact-editor/e-contact-editor.c:172 -#: ../addressbook/gui/widgets/eab-contact-display.c:605 +#: ../addressbook/gui/widgets/eab-contact-display.c:606 msgid "AIM" msgstr "AIM" #: ../addressbook/gui/contact-editor/e-contact-editor.c:173 -#: ../addressbook/gui/widgets/eab-contact-display.c:608 +#: ../addressbook/gui/widgets/eab-contact-display.c:609 msgid "Jabber" msgstr "Jabber" #: ../addressbook/gui/contact-editor/e-contact-editor.c:174 -#: ../addressbook/gui/widgets/eab-contact-display.c:610 +#: ../addressbook/gui/widgets/eab-contact-display.c:611 msgid "Yahoo" msgstr "Yahoo" #: ../addressbook/gui/contact-editor/e-contact-editor.c:175 -#: ../addressbook/gui/widgets/eab-contact-display.c:611 +#: ../addressbook/gui/widgets/eab-contact-display.c:612 msgid "Gadu-Gadu" msgstr "Gadu-Gadu" #: ../addressbook/gui/contact-editor/e-contact-editor.c:176 -#: ../addressbook/gui/widgets/eab-contact-display.c:609 +#: ../addressbook/gui/widgets/eab-contact-display.c:610 msgid "MSN" msgstr "MSN" #: ../addressbook/gui/contact-editor/e-contact-editor.c:177 -#: ../addressbook/gui/widgets/eab-contact-display.c:607 +#: ../addressbook/gui/widgets/eab-contact-display.c:608 msgid "ICQ" msgstr "ICQ" #: ../addressbook/gui/contact-editor/e-contact-editor.c:178 -#: ../addressbook/gui/widgets/eab-contact-display.c:606 +#: ../addressbook/gui/widgets/eab-contact-display.c:607 msgid "GroupWise" msgstr "GroupWise" #: ../addressbook/gui/contact-editor/e-contact-editor.c:179 -#: ../addressbook/gui/widgets/eab-contact-display.c:612 +#: ../addressbook/gui/widgets/eab-contact-display.c:613 msgid "Skype" msgstr "Skype" #. red #: ../addressbook/gui/contact-editor/e-contact-editor.c:191 #: ../addressbook/gui/widgets/eab-contact-display.c:57 -#: ../addressbook/gui/widgets/eab-contact-display.c:635 -#: ../mail/em-migrate.c:958 +#: ../addressbook/gui/widgets/eab-contact-display.c:636 +#: ../mail/em-migrate.c:959 msgid "Work" msgstr "Trabajo" @@ -1697,7 +1697,7 @@ msgstr "Editor de listas de contactos" #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:213 -#: ../calendar/gui/e-day-view-time-item.c:815 +#: ../calendar/gui/e-day-view-time-item.c:816 #: ../calendar/gui/e-timezone-entry.c:121 msgid "Select..." msgstr "Seleccionar…" @@ -1785,11 +1785,11 @@ msgstr "Combinar contacto" #: ../addressbook/gui/merging/eab-contact-merging.c:267 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11 -#: ../addressbook/gui/widgets/eab-contact-display.c:583 -#: ../addressbook/gui/widgets/eab-contact-display.c:588 -#: ../addressbook/gui/widgets/eab-contact-display.c:591 -#: ../addressbook/gui/widgets/eab-contact-display.c:871 -#: ../plugins/groupwise-features/junk-settings.c:414 ../smime/lib/e-cert.c:810 +#: ../addressbook/gui/widgets/eab-contact-display.c:584 +#: ../addressbook/gui/widgets/eab-contact-display.c:589 +#: ../addressbook/gui/widgets/eab-contact-display.c:592 +#: ../addressbook/gui/widgets/eab-contact-display.c:872 +#: ../plugins/groupwise-features/junk-settings.c:421 ../smime/lib/e-cert.c:810 msgid "Email" msgstr "Correo-e" @@ -1855,7 +1855,7 @@ msgstr "Fuente" #: ../addressbook/gui/widgets/e-addressbook-view.c:231 #: ../calendar/gui/e-calendar-table.etspec.h:14 -#: ../calendar/gui/e-meeting-list-view.c:566 +#: ../calendar/gui/e-meeting-list-view.c:567 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11 #: ../calendar/gui/e-memo-table.etspec.h:7 #: ../widgets/misc/e-attachment-tree-view.c:554 @@ -1868,8 +1868,8 @@ msgid "Save as vCard..." msgstr "Guardar como vCard…" #: ../addressbook/gui/widgets/e-addressbook-view.c:932 -#: ../calendar/gui/e-calendar-table.c:1594 -#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:937 +#: ../calendar/gui/e-calendar-table.c:1592 +#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:935 #: ../ui/evolution-addressbook.xml.h:56 msgid "_Open" msgstr "_Abrir" @@ -1923,9 +1923,9 @@ msgid "Cu_t" msgstr "Cor_tar" #: ../addressbook/gui/widgets/e-addressbook-view.c:952 -#: ../calendar/gui/e-calendar-table.c:1602 -#: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:945 -#: ../mail/em-folder-tree.c:928 ../mail/em-folder-view.c:1325 +#: ../calendar/gui/e-calendar-table.c:1600 +#: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:943 +#: ../mail/em-folder-tree.c:928 ../mail/em-folder-view.c:1326 #: ../mail/message-list.c:2105 ../ui/evolution-addressbook.xml.h:46 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23 @@ -1950,7 +1950,7 @@ msgid "Unmatched" msgstr "No coincidente" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1 -#: ../addressbook/gui/widgets/eab-contact-display.c:626 +#: ../addressbook/gui/widgets/eab-contact-display.c:627 msgid "Assistant" msgstr "Secretario" @@ -1988,7 +1988,7 @@ msgid "Categories" msgstr "Categorías" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9 -#: ../addressbook/gui/widgets/eab-contact-display.c:621 +#: ../addressbook/gui/widgets/eab-contact-display.c:622 msgid "Company" msgstr "Empresa" @@ -2037,22 +2037,22 @@ msgid "Journal" msgstr "Diario" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23 -#: ../addressbook/gui/widgets/eab-contact-display.c:625 +#: ../addressbook/gui/widgets/eab-contact-display.c:626 msgid "Manager" msgstr "Jefe" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24 -#: ../addressbook/gui/widgets/eab-contact-display.c:646 +#: ../addressbook/gui/widgets/eab-contact-display.c:647 msgid "Mobile Phone" msgstr "Teléfono móvil" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25 -#: ../addressbook/gui/widgets/eab-contact-display.c:599 +#: ../addressbook/gui/widgets/eab-contact-display.c:600 msgid "Nickname" msgstr "Apodo" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26 -#: ../addressbook/gui/widgets/eab-contact-display.c:659 +#: ../addressbook/gui/widgets/eab-contact-display.c:660 msgid "Note" msgstr "Nota" @@ -2081,14 +2081,14 @@ msgid "Radio" msgstr "Radio" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33 -#: ../calendar/gui/e-meeting-list-view.c:578 +#: ../calendar/gui/e-meeting-list-view.c:579 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:710 msgid "Role" msgstr "Papel" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34 -#: ../addressbook/gui/widgets/eab-contact-display.c:650 +#: ../addressbook/gui/widgets/eab-contact-display.c:651 msgid "Spouse" msgstr "Cónyuge" @@ -2120,7 +2120,7 @@ msgstr "Sitio web" #: ../addressbook/gui/widgets/e-minicard-label.c:115 #: ../addressbook/gui/widgets/e-minicard.c:154 -#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86 +#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84 #: ../widgets/misc/e-reflow.c:1423 ../widgets/misc/e-reflow.c:1424 #: ../widgets/table/e-table-click-to-add.c:522 #: ../widgets/table/e-table-col.c:98 @@ -2135,7 +2135,7 @@ msgstr "Anchura" #: ../addressbook/gui/widgets/e-minicard-label.c:122 #: ../addressbook/gui/widgets/e-minicard.c:161 -#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98 +#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96 #: ../widgets/misc/e-reflow.c:1431 ../widgets/misc/e-reflow.c:1432 #: ../widgets/table/e-table-click-to-add.c:529 #: ../widgets/table/e-table-group-container.c:989 @@ -2260,7 +2260,7 @@ msgid "_Open Link in Browser" msgstr "_Abrir enlace en el navegador" #: ../addressbook/gui/widgets/eab-contact-display.c:170 -#: ../mail/em-folder-view.c:2733 +#: ../mail/em-folder-view.c:2734 msgid "_Copy Link Location" msgstr "_Copiar dirección del enlace" @@ -2286,27 +2286,27 @@ msgid "map" msgstr "mapa" #: ../addressbook/gui/widgets/eab-contact-display.c:478 -#: ../addressbook/gui/widgets/eab-contact-display.c:838 +#: ../addressbook/gui/widgets/eab-contact-display.c:839 msgid "List Members" msgstr "Listar miembros" -#: ../addressbook/gui/widgets/eab-contact-display.c:622 +#: ../addressbook/gui/widgets/eab-contact-display.c:623 msgid "Department" msgstr "Departamento" -#: ../addressbook/gui/widgets/eab-contact-display.c:623 +#: ../addressbook/gui/widgets/eab-contact-display.c:624 msgid "Profession" msgstr "Profesión" -#: ../addressbook/gui/widgets/eab-contact-display.c:624 +#: ../addressbook/gui/widgets/eab-contact-display.c:625 msgid "Position" msgstr "Posición" -#: ../addressbook/gui/widgets/eab-contact-display.c:627 +#: ../addressbook/gui/widgets/eab-contact-display.c:628 msgid "Video Chat" msgstr "Charla por vídeo" -#: ../addressbook/gui/widgets/eab-contact-display.c:628 +#: ../addressbook/gui/widgets/eab-contact-display.c:629 #: ../calendar/gui/calendar-commands.c:90 #: ../calendar/gui/dialogs/calendar-setup.c:368 #: ../calendar/gui/gnome-cal.c:2523 @@ -2321,53 +2321,53 @@ msgstr "Charla por vídeo" msgid "Calendar" msgstr "Calendario" -#: ../addressbook/gui/widgets/eab-contact-display.c:629 +#: ../addressbook/gui/widgets/eab-contact-display.c:630 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18 #: ../calendar/gui/dialogs/event-editor.c:116 msgid "Free/Busy" msgstr "Disponibilidad" -#: ../addressbook/gui/widgets/eab-contact-display.c:630 -#: ../addressbook/gui/widgets/eab-contact-display.c:645 +#: ../addressbook/gui/widgets/eab-contact-display.c:631 +#: ../addressbook/gui/widgets/eab-contact-display.c:646 msgid "Phone" msgstr "Teléfono" -#: ../addressbook/gui/widgets/eab-contact-display.c:631 +#: ../addressbook/gui/widgets/eab-contact-display.c:632 msgid "Fax" msgstr "Fax" -#: ../addressbook/gui/widgets/eab-contact-display.c:632 -#: ../addressbook/gui/widgets/eab-contact-display.c:647 +#: ../addressbook/gui/widgets/eab-contact-display.c:633 +#: ../addressbook/gui/widgets/eab-contact-display.c:648 msgid "Address" msgstr "Dirección" -#: ../addressbook/gui/widgets/eab-contact-display.c:642 +#: ../addressbook/gui/widgets/eab-contact-display.c:643 msgid "Home Page" msgstr "Página personal" -#: ../addressbook/gui/widgets/eab-contact-display.c:643 +#: ../addressbook/gui/widgets/eab-contact-display.c:644 msgid "Web Log" msgstr "Diario web" -#: ../addressbook/gui/widgets/eab-contact-display.c:648 +#: ../addressbook/gui/widgets/eab-contact-display.c:649 #: ../calendar/gui/e-calendar-view.c:2587 msgid "Birthday" msgstr "Cumpleaños" -#: ../addressbook/gui/widgets/eab-contact-display.c:649 +#: ../addressbook/gui/widgets/eab-contact-display.c:650 #: ../calendar/gui/e-calendar-view.c:2588 msgid "Anniversary" msgstr "Aniversario" -#: ../addressbook/gui/widgets/eab-contact-display.c:856 +#: ../addressbook/gui/widgets/eab-contact-display.c:857 msgid "Job Title" msgstr "Puesto" -#: ../addressbook/gui/widgets/eab-contact-display.c:892 +#: ../addressbook/gui/widgets/eab-contact-display.c:893 msgid "Home page" msgstr "Página personal" -#: ../addressbook/gui/widgets/eab-contact-display.c:900 +#: ../addressbook/gui/widgets/eab-contact-display.c:901 msgid "Blog" msgstr "Diario web" @@ -2425,8 +2425,8 @@ msgstr "Protocolo no implementado" #: ../calendar/gui/e-cal-component-preview.c:250 #: ../calendar/gui/e-cal-model-tasks.c:364 #: ../calendar/gui/e-cal-model-tasks.c:681 -#: ../calendar/gui/e-calendar-table.c:239 -#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2564 +#: ../calendar/gui/e-calendar-table.c:237 +#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2571 msgid "Canceled" msgstr "Cancelado" @@ -2691,8 +2691,8 @@ msgstr "Vista de la tarjeta" #: ../addressbook/importers/evolution-csv-importer.c:661 #: ../addressbook/importers/evolution-ldif-importer.c:513 #: ../addressbook/importers/evolution-vcard-importer.c:252 -#: ../calendar/importers/icalendar-importer.c:308 -#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7 +#: ../calendar/importers/icalendar-importer.c:310 +#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7 msgid "Importing..." msgstr "Importando…" @@ -2736,8 +2736,8 @@ msgstr "vCard (.vcf, .gcrd)" msgid "Evolution vCard Importer" msgstr "Importador de vCard de Evolution" -#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654 -#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:690 +#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653 +#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48 msgid "Can not open file" msgstr "No es posible abrir el archivo" @@ -3285,8 +3285,8 @@ msgid "Calendar and Tasks" msgstr "Calendario y tareas" #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2 -#: ../calendar/gui/calendar-component.c:819 -#: ../calendar/gui/calendar-component.c:1241 +#: ../calendar/gui/calendar-component.c:820 +#: ../calendar/gui/calendar-component.c:1242 msgid "Calendars" msgstr "Calendarios" @@ -3327,7 +3327,7 @@ msgid "Memo_s" msgstr "_Notas" #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12 -#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1132 +#: ../calendar/gui/e-memo-table.c:291 ../calendar/gui/e-memos.c:1132 #: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:566 #: ../calendar/gui/memos-component.c:884 ../calendar/gui/memos-control.c:389 #: ../calendar/gui/memos-control.c:405 @@ -3335,14 +3335,14 @@ msgid "Memos" msgstr "Notas" #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13 -#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1436 -#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988 +#: ../calendar/gui/e-calendar-table.c:723 ../calendar/gui/e-tasks.c:1436 +#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1991 #: ../calendar/gui/tasks-component.c:558 ../calendar/gui/tasks-component.c:880 #: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544 #: ../calendar/importers/icalendar-importer.c:76 -#: ../calendar/importers/icalendar-importer.c:749 +#: ../calendar/importers/icalendar-importer.c:751 #: ../plugins/exchange-operations/exchange-delegates-user.c:76 -#: ../plugins/exchange-operations/exchange-folder.c:588 +#: ../plugins/exchange-operations/exchange-folder.c:590 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:569 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12 @@ -3397,10 +3397,10 @@ msgstr "Descartar _todo" #. Location #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1605 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1611 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1604 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1610 #: ../calendar/gui/e-itip-control.c:1165 -#: ../plugins/itip-formatter/itip-view.c:1021 +#: ../plugins/itip-formatter/itip-view.c:1024 msgid "Location:" msgstr "Lugar:" @@ -3433,32 +3433,32 @@ msgstr "_Posponer" msgid "location of appointment" msgstr "lugar de la cita" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1463 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1588 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1462 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1587 msgid "No summary available." msgstr "No hay resumen disponible." -#: ../calendar/gui/alarm-notify/alarm-queue.c:1472 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1474 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1471 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1473 msgid "No description available." msgstr "No hay descripción disponible." -#: ../calendar/gui/alarm-notify/alarm-queue.c:1482 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1481 msgid "No location information available." msgstr "No hay información del lugar disponible." -#: ../calendar/gui/alarm-notify/alarm-queue.c:1527 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1526 #, c-format msgid "You have %d alarms" msgstr "Tiene %d alertas" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1689 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1717 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1688 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1716 #: ../e-util/e-non-intrusive-error-dialog.h:41 msgid "Warning" msgstr "Advertencia" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1693 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1692 msgid "" "Evolution does not support calendar reminders with\n" "email notifications yet, but this reminder was\n" @@ -3470,7 +3470,7 @@ msgstr "" "configurado para enviar un mensaje de correo-e. En su lugar\n" "Evolution mostrará un diálogo de recordatorio normal." -#: ../calendar/gui/alarm-notify/alarm-queue.c:1723 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1722 #, c-format msgid "" "An Evolution Calendar reminder is about to trigger. This reminder is " @@ -3487,7 +3487,7 @@ msgstr "" "\n" "¿Está seguro que quiere ejecutar este programa?" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1737 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1736 msgid "Do not ask me about this program again." msgstr "No preguntar otra vez sobre este programa." @@ -4171,93 +4171,93 @@ msgstr "Meteorología" msgid "Birthdays & Anniversaries" msgstr "Cumpleaños y aniversarios" -#: ../calendar/gui/calendar-component.c:626 +#: ../calendar/gui/calendar-component.c:627 msgid "_New Calendar" msgstr "Calendario _nuevo" -#: ../calendar/gui/calendar-component.c:627 +#: ../calendar/gui/calendar-component.c:628 #: ../calendar/gui/memos-component.c:480 ../calendar/gui/tasks-component.c:472 #: ../mail/em-folder-tree.c:2047 msgid "_Copy..." msgstr "_Copiar…" -#: ../calendar/gui/calendar-component.c:632 +#: ../calendar/gui/calendar-component.c:633 #: ../calendar/gui/memos-component.c:485 ../calendar/gui/tasks-component.c:477 msgid "_Make available for offline use" msgstr "_Hacer esto disponible para su uso desconectado" -#: ../calendar/gui/calendar-component.c:633 +#: ../calendar/gui/calendar-component.c:634 #: ../calendar/gui/memos-component.c:486 ../calendar/gui/tasks-component.c:478 msgid "_Do not make available for offline use" msgstr "_No hacer esto disponible sin conexión" -#: ../calendar/gui/calendar-component.c:963 +#: ../calendar/gui/calendar-component.c:964 msgid "Failed upgrading calendars." msgstr "Falló al actualizar calendarios." -#: ../calendar/gui/calendar-component.c:1092 +#: ../calendar/gui/calendar-component.c:1093 #, c-format msgid "Unable to open the calendar '%s' for creating events and meetings" msgstr "" "No es posible abrir el calendario «%s» para crear acontecimientos y reuniones" -#: ../calendar/gui/calendar-component.c:1108 +#: ../calendar/gui/calendar-component.c:1109 msgid "There is no calendar available for creating events and meetings" msgstr "No hay un calendario disponible para crear acontecimientos y reuniones" -#: ../calendar/gui/calendar-component.c:1221 +#: ../calendar/gui/calendar-component.c:1222 msgid "Calendar Source Selector" msgstr "Selector de origen del calendario" -#: ../calendar/gui/calendar-component.c:1437 +#: ../calendar/gui/calendar-component.c:1438 msgid "New appointment" msgstr "Cita nueva" -#: ../calendar/gui/calendar-component.c:1438 +#: ../calendar/gui/calendar-component.c:1439 msgctxt "New" msgid "_Appointment" msgstr "_Cita" -#: ../calendar/gui/calendar-component.c:1439 +#: ../calendar/gui/calendar-component.c:1440 msgid "Create a new appointment" msgstr "Crea una cita nueva" -#: ../calendar/gui/calendar-component.c:1445 +#: ../calendar/gui/calendar-component.c:1446 msgid "New meeting" msgstr "Reunión nueva" -#: ../calendar/gui/calendar-component.c:1446 +#: ../calendar/gui/calendar-component.c:1447 msgctxt "New" msgid "M_eeting" msgstr "_Reunión" -#: ../calendar/gui/calendar-component.c:1447 +#: ../calendar/gui/calendar-component.c:1448 msgid "Create a new meeting request" msgstr "Crea una solicitud de reunión nueva" -#: ../calendar/gui/calendar-component.c:1453 +#: ../calendar/gui/calendar-component.c:1454 msgid "New all day appointment" msgstr "Cita nueva para todo el día" -#: ../calendar/gui/calendar-component.c:1454 +#: ../calendar/gui/calendar-component.c:1455 msgctxt "New" msgid "All Day A_ppointment" msgstr "Cita para todo el _día" -#: ../calendar/gui/calendar-component.c:1455 +#: ../calendar/gui/calendar-component.c:1456 msgid "Create a new all-day appointment" msgstr "Crea una cita nueva para todo el día" -#: ../calendar/gui/calendar-component.c:1461 +#: ../calendar/gui/calendar-component.c:1462 msgid "New calendar" msgstr "Calendario nuevo" -#: ../calendar/gui/calendar-component.c:1462 +#: ../calendar/gui/calendar-component.c:1463 msgctxt "New" msgid "Cale_ndar" msgstr "Cale_ndario" -#: ../calendar/gui/calendar-component.c:1463 +#: ../calendar/gui/calendar-component.c:1464 msgid "Create a new calendar" msgstr "Crea un calendario nuevo" @@ -4303,7 +4303,7 @@ msgid "Classification" msgstr "Clasificación" #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:248 -#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568 +#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:566 #: ../calendar/gui/memotypes.xml.h:6 #: ../plugins/email-custom-header/email-custom-header.c:341 msgid "Confidential" @@ -4345,14 +4345,14 @@ msgid "Organizer" msgstr "Organizador" #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:247 -#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567 +#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:565 #: ../calendar/gui/memotypes.xml.h:12 msgid "Private" msgstr "Privado" #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:246 #: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348 -#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13 +#: ../calendar/gui/e-calendar-table.c:564 ../calendar/gui/memotypes.xml.h:13 msgid "Public" msgstr "Público" @@ -4558,9 +4558,9 @@ msgstr "Adjuntar archivo(s)" #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32 #: ../calendar/gui/dialogs/event-page.c:2968 #: ../calendar/gui/e-cal-model-tasks.c:673 -#: ../calendar/gui/e-day-view-time-item.c:788 +#: ../calendar/gui/e-day-view-time-item.c:789 #: ../calendar/gui/e-itip-control.c:1151 ../filter/filter-rule.c:942 -#: ../mail/em-account-editor.c:704 ../mail/em-account-editor.c:1432 +#: ../mail/em-account-editor.c:704 ../mail/em-account-editor.c:1433 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93 #: ../plugins/calendar-weather/calendar-weather.c:333 #: ../plugins/calendar-weather/calendar-weather.c:387 @@ -4965,23 +4965,23 @@ msgstr "%s No ha realizado cambios, ¿quiere actualizar el editor?" msgid "Validation error: %s" msgstr "Error de validación: %s" -#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365 +#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2372 msgid " to " msgstr " a " -#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369 +#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2376 msgid " (Completed " msgstr " (Completado " -#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371 +#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2378 msgid "Completed " msgstr "Completado " -#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376 +#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2383 msgid " (Due " msgstr " (Vence " -#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378 +#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2385 msgid "Due " msgstr "Vence " @@ -5289,7 +5289,7 @@ msgstr "Convertir en acontecimiento repetitivo" #: ../calendar/gui/dialogs/event-editor.c:216 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2 -#: ../plugins/groupwise-features/send-options.c:212 +#: ../plugins/groupwise-features/send-options.c:213 #: ../widgets/misc/e-send-options.glade.h:18 msgid "Send Options" msgstr "Opciones de envío" @@ -5510,7 +5510,7 @@ msgstr "" "durante\n" "hasta" -#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485 +#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2492 msgid "Memo" msgstr "Nota" @@ -5521,7 +5521,7 @@ msgstr "No es posible abrir las notas en «%s»." #: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567 #: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651 -#: ../mail/em-format-quote.c:210 ../mail/em-format.c:923 +#: ../mail/em-format-quote.c:210 ../mail/em-format.c:925 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20 msgid "To" msgstr "Para" @@ -5752,6 +5752,9 @@ msgid "" "until\n" "forever" msgstr "" +"durante\n" +"hasta\n" +"siempre\n" #: ../calendar/gui/dialogs/send-comp.c:116 msgid "Send my alarms with this event" @@ -5967,7 +5970,7 @@ msgid "I_mport to Tasks" msgstr "I_mportar a las tareas" #: ../calendar/gui/e-cal-component-memo-preview.c:69 -#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3249 +#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3250 #, c-format msgid "Click to open %s" msgstr "Pulse para abrir %s" @@ -6010,7 +6013,7 @@ msgstr "Fecha de vencimiento:" #: ../calendar/gui/e-cal-component-preview.c:240 #: ../calendar/gui/e-itip-control.c:1179 #: ../plugins/exchange-operations/exchange-account-setup.c:284 -#: ../plugins/itip-formatter/itip-view.c:1052 +#: ../plugins/itip-formatter/itip-view.c:1055 msgid "Status:" msgstr "Estado:" @@ -6018,8 +6021,8 @@ msgstr "Estado:" #: ../calendar/gui/e-cal-model-tasks.c:360 #: ../calendar/gui/e-cal-model-tasks.c:677 #: ../calendar/gui/e-cal-model-tasks.c:754 -#: ../calendar/gui/e-calendar-table.c:235 -#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2558 +#: ../calendar/gui/e-calendar-table.c:233 +#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/print.c:2565 msgid "In Progress" msgstr "En proceso" @@ -6028,10 +6031,10 @@ msgstr "En proceso" #: ../calendar/gui/e-cal-component-preview.c:247 #: ../calendar/gui/e-cal-model-tasks.c:362 #: ../calendar/gui/e-cal-model-tasks.c:679 -#: ../calendar/gui/e-calendar-table.c:237 -#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:939 +#: ../calendar/gui/e-calendar-table.c:235 +#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/e-itip-control.c:939 #: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203 -#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9 +#: ../calendar/gui/print.c:2568 ../calendar/gui/tasktypes.xml.h:9 #: ../plugins/save-calendar/csv-format.c:366 msgid "Completed" msgstr "Terminado" @@ -6039,8 +6042,8 @@ msgstr "Terminado" #: ../calendar/gui/e-cal-component-preview.c:254 #: ../calendar/gui/e-cal-model-tasks.c:358 #: ../calendar/gui/e-cal-model-tasks.c:675 -#: ../calendar/gui/e-calendar-table.c:233 -#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2555 +#: ../calendar/gui/e-calendar-table.c:231 +#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2562 #: ../calendar/gui/tasktypes.xml.h:18 msgid "Not Started" msgstr "Sin comenzar" @@ -6050,19 +6053,19 @@ msgid "Priority:" msgstr "Prioridad:" #: ../calendar/gui/e-cal-component-preview.c:266 -#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14 +#: ../calendar/gui/e-calendar-table.c:586 ../calendar/gui/tasktypes.xml.h:14 #: ../mail/message-list.c:1065 msgid "High" msgstr "Alta" #: ../calendar/gui/e-cal-component-preview.c:268 -#: ../calendar/gui/e-cal-model.c:1058 ../calendar/gui/e-calendar-table.c:589 +#: ../calendar/gui/e-cal-model.c:1058 ../calendar/gui/e-calendar-table.c:587 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064 msgid "Normal" msgstr "Normal" #: ../calendar/gui/e-cal-component-preview.c:270 -#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16 +#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:16 #: ../mail/message-list.c:1063 msgid "Low" msgstr "Baja" @@ -6090,12 +6093,12 @@ msgid "Start Date" msgstr "Fecha de inicio" #: ../calendar/gui/e-cal-model-calendar.c:187 -#: ../calendar/gui/e-calendar-table.c:640 +#: ../calendar/gui/e-calendar-table.c:638 msgid "Free" msgstr "Libre" #: ../calendar/gui/e-cal-model-calendar.c:190 -#: ../calendar/gui/e-calendar-table.c:641 +#: ../calendar/gui/e-calendar-table.c:639 #: ../calendar/gui/e-meeting-time-sel.c:397 msgid "Busy" msgstr "Ocupada" @@ -6111,7 +6114,7 @@ msgstr "" "45.436845,125.862501" #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064 -#: ../calendar/gui/e-meeting-list-view.c:190 +#: ../calendar/gui/e-meeting-list-view.c:191 #: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162 #: ../calendar/gui/e-meeting-store.c:745 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5 @@ -6119,7 +6122,7 @@ msgid "Yes" msgstr "Sí" #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064 -#: ../calendar/gui/e-meeting-list-view.c:191 +#: ../calendar/gui/e-meeting-list-view.c:192 #: ../calendar/gui/e-meeting-store.c:164 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2 msgid "No" @@ -6128,11 +6131,11 @@ msgstr "No" #. This is the default filename used for temporary file creation #: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-itip-control.c:1196 #: ../calendar/gui/e-itip-control.c:1336 -#: ../calendar/gui/e-meeting-list-view.c:166 -#: ../calendar/gui/e-meeting-list-view.c:180 +#: ../calendar/gui/e-meeting-list-view.c:167 +#: ../calendar/gui/e-meeting-list-view.c:181 #: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145 -#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984 -#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342 +#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:985 +#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1342 #: ../plugins/itip-formatter/itip-formatter.c:448 #: ../plugins/itip-formatter/itip-formatter.c:2217 #: ../plugins/plugin-manager/plugin-manager.c:89 @@ -6148,12 +6151,12 @@ msgstr "Repetición" msgid "Assigned" msgstr "Asignado" -#: ../calendar/gui/e-calendar-table.c:336 +#: ../calendar/gui/e-calendar-table.c:334 msgid "* No Summary *" msgstr "* Sin resumen *" #. To Translators: It will display "Organiser: NameOfTheUser " -#: ../calendar/gui/e-calendar-table.c:372 +#: ../calendar/gui/e-calendar-table.c:370 #: ../calendar/gui/e-calendar-view.c:2436 #, c-format msgid "Organizer: %s <%s>" @@ -6161,149 +6164,149 @@ msgstr "Organizador: %s <%s>" #. With SunOne accounts, there may be no ':' in organiser.value #. With SunOne accouts, there may be no ':' in organiser.value -#: ../calendar/gui/e-calendar-table.c:375 +#: ../calendar/gui/e-calendar-table.c:373 #: ../calendar/gui/e-calendar-view.c:2440 #, c-format msgid "Organizer: %s" msgstr "Organizador: %s" -#: ../calendar/gui/e-calendar-table.c:406 +#: ../calendar/gui/e-calendar-table.c:404 msgid "Start: " msgstr "Empieza: " -#: ../calendar/gui/e-calendar-table.c:418 +#: ../calendar/gui/e-calendar-table.c:416 msgid "Due: " msgstr "Vence: " -#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24 +#: ../calendar/gui/e-calendar-table.c:589 ../calendar/gui/tasktypes.xml.h:24 msgid "Undefined" msgstr "Sin definir" -#: ../calendar/gui/e-calendar-table.c:610 +#: ../calendar/gui/e-calendar-table.c:608 msgid "0%" msgstr "0%" -#: ../calendar/gui/e-calendar-table.c:611 +#: ../calendar/gui/e-calendar-table.c:609 msgid "10%" msgstr "10%" -#: ../calendar/gui/e-calendar-table.c:612 +#: ../calendar/gui/e-calendar-table.c:610 msgid "20%" msgstr "20%" -#: ../calendar/gui/e-calendar-table.c:613 +#: ../calendar/gui/e-calendar-table.c:611 msgid "30%" msgstr "30%" -#: ../calendar/gui/e-calendar-table.c:614 +#: ../calendar/gui/e-calendar-table.c:612 msgid "40%" msgstr "40%" -#: ../calendar/gui/e-calendar-table.c:615 +#: ../calendar/gui/e-calendar-table.c:613 msgid "50%" msgstr "50%" -#: ../calendar/gui/e-calendar-table.c:616 +#: ../calendar/gui/e-calendar-table.c:614 msgid "60%" msgstr "60%" -#: ../calendar/gui/e-calendar-table.c:617 +#: ../calendar/gui/e-calendar-table.c:615 msgid "70%" msgstr "70%" -#: ../calendar/gui/e-calendar-table.c:618 +#: ../calendar/gui/e-calendar-table.c:616 msgid "80%" msgstr "80%" -#: ../calendar/gui/e-calendar-table.c:619 +#: ../calendar/gui/e-calendar-table.c:617 msgid "90%" msgstr "90%" -#: ../calendar/gui/e-calendar-table.c:620 +#: ../calendar/gui/e-calendar-table.c:618 msgid "100%" msgstr "100%" -#: ../calendar/gui/e-calendar-table.c:900 -#: ../calendar/gui/e-calendar-view.c:658 ../calendar/gui/e-memo-table.c:452 +#: ../calendar/gui/e-calendar-table.c:898 +#: ../calendar/gui/e-calendar-view.c:658 ../calendar/gui/e-memo-table.c:450 msgid "Deleting selected objects" msgstr "Borrando los objetos seleccionados" -#: ../calendar/gui/e-calendar-table.c:1179 -#: ../calendar/gui/e-calendar-view.c:872 ../calendar/gui/e-memo-table.c:657 +#: ../calendar/gui/e-calendar-table.c:1177 +#: ../calendar/gui/e-calendar-view.c:872 ../calendar/gui/e-memo-table.c:655 msgid "Updating objects" msgstr "Actualizando objetos" -#: ../calendar/gui/e-calendar-table.c:1367 -#: ../calendar/gui/e-calendar-view.c:1334 ../calendar/gui/e-memo-table.c:833 +#: ../calendar/gui/e-calendar-table.c:1365 +#: ../calendar/gui/e-calendar-view.c:1334 ../calendar/gui/e-memo-table.c:831 #: ../composer/e-composer-actions.c:219 msgid "Save as..." msgstr "Guardar como…" -#: ../calendar/gui/e-calendar-table.c:1591 +#: ../calendar/gui/e-calendar-table.c:1589 #: ../calendar/gui/e-calendar-view.c:1794 msgid "New _Task" msgstr "_Tarea nueva" -#: ../calendar/gui/e-calendar-table.c:1595 ../calendar/gui/e-memo-table.c:938 +#: ../calendar/gui/e-calendar-table.c:1593 ../calendar/gui/e-memo-table.c:936 msgid "Open _Web Page" msgstr "Abrir página _web" -#: ../calendar/gui/e-calendar-table.c:1596 -#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939 -#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494 +#: ../calendar/gui/e-calendar-table.c:1594 +#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:937 +#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:494 msgid "_Save As..." msgstr "Guardar _como…" -#: ../calendar/gui/e-calendar-table.c:1597 -#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940 +#: ../calendar/gui/e-calendar-table.c:1595 +#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:938 msgid "P_rint..." msgstr "_Imprimir…" -#: ../calendar/gui/e-calendar-table.c:1601 -#: ../calendar/gui/e-calendar-view.c:1817 ../calendar/gui/e-memo-table.c:944 +#: ../calendar/gui/e-calendar-table.c:1599 +#: ../calendar/gui/e-calendar-view.c:1817 ../calendar/gui/e-memo-table.c:942 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1 msgid "C_ut" msgstr "C_ortar" -#: ../calendar/gui/e-calendar-table.c:1603 +#: ../calendar/gui/e-calendar-table.c:1601 #: ../calendar/gui/e-calendar-view.c:1800 -#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:946 +#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28 msgid "_Paste" msgstr "_Pegar" -#: ../calendar/gui/e-calendar-table.c:1607 ../ui/evolution-tasks.xml.h:22 +#: ../calendar/gui/e-calendar-table.c:1605 ../ui/evolution-tasks.xml.h:22 msgid "_Assign Task" msgstr "_Asignar tarea" -#: ../calendar/gui/e-calendar-table.c:1608 ../calendar/gui/e-memo-table.c:950 +#: ../calendar/gui/e-calendar-table.c:1606 ../calendar/gui/e-memo-table.c:948 #: ../ui/evolution-tasks.xml.h:26 msgid "_Forward as iCalendar" msgstr "_Reenviar como iCalendar" -#: ../calendar/gui/e-calendar-table.c:1609 +#: ../calendar/gui/e-calendar-table.c:1607 msgid "_Mark as Complete" msgstr "_Marcar como terminado" -#: ../calendar/gui/e-calendar-table.c:1610 +#: ../calendar/gui/e-calendar-table.c:1608 msgid "_Mark Selected Tasks as Complete" msgstr "_Marcar tareas seleccionadas como terminadas" -#: ../calendar/gui/e-calendar-table.c:1611 +#: ../calendar/gui/e-calendar-table.c:1609 msgid "_Mark as Incomplete" msgstr "_Marcar como incompleto" -#: ../calendar/gui/e-calendar-table.c:1612 +#: ../calendar/gui/e-calendar-table.c:1610 msgid "_Mark Selected Tasks as Incomplete" msgstr "_Marcar tareas seleccionadas como incompletas" -#: ../calendar/gui/e-calendar-table.c:1617 +#: ../calendar/gui/e-calendar-table.c:1615 msgid "_Delete Selected Tasks" msgstr "_Borrar las tareas seleccionadas" -#: ../calendar/gui/e-calendar-table.c:1854 +#: ../calendar/gui/e-calendar-table.c:1852 #: ../calendar/gui/e-calendar-table.etspec.h:4 msgid "Click to add a task" msgstr "Pulse para añadir una tarea" @@ -6339,7 +6342,7 @@ msgstr "Fecha de inicio" #. Status: Accepted: X Declined: Y ... #: ../calendar/gui/e-calendar-table.etspec.h:12 #: ../calendar/gui/e-calendar-view.c:2344 -#: ../calendar/gui/e-meeting-list-view.c:603 +#: ../calendar/gui/e-meeting-list-view.c:604 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72 #: ../mail/message-list.etspec.h:17 @@ -6408,7 +6411,7 @@ msgid "_Reply" msgstr "_Responder" #: ../calendar/gui/e-calendar-view.c:1829 -#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330 +#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1331 #: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78 msgid "Reply to _All" msgstr "Responder a _todos" @@ -6427,7 +6430,7 @@ msgstr "Borrar tod_as las repeticiones" #: ../calendar/gui/e-calendar-view.c:2291 #: ../calendar/gui/e-itip-control.c:1184 -#: ../calendar/gui/e-meeting-list-view.c:202 +#: ../calendar/gui/e-meeting-list-view.c:203 #: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195 #: ../plugins/itip-formatter/itip-formatter.c:2205 msgid "Accepted" @@ -6435,21 +6438,21 @@ msgstr "Aceptado" #: ../calendar/gui/e-calendar-view.c:2292 #: ../calendar/gui/e-itip-control.c:1192 -#: ../calendar/gui/e-meeting-list-view.c:203 +#: ../calendar/gui/e-meeting-list-view.c:204 #: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197 #: ../plugins/itip-formatter/itip-formatter.c:2211 msgid "Declined" msgstr "Rehusado" #: ../calendar/gui/e-calendar-view.c:2293 -#: ../calendar/gui/e-meeting-list-view.c:204 +#: ../calendar/gui/e-meeting-list-view.c:205 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199 #: ../calendar/gui/e-meeting-time-sel.c:396 msgid "Tentative" msgstr "Provisional" #: ../calendar/gui/e-calendar-view.c:2294 -#: ../calendar/gui/e-meeting-list-view.c:205 +#: ../calendar/gui/e-meeting-list-view.c:206 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201 #: ../plugins/itip-formatter/itip-formatter.c:2214 msgid "Delegated" @@ -6460,7 +6463,7 @@ msgid "Needs action" msgstr "Necesita una acción" #. To Translators: It will display "Location: PlaceOfTheMeeting" -#: ../calendar/gui/e-calendar-view.c:2456 ../calendar/gui/print.c:2517 +#: ../calendar/gui/e-calendar-view.c:2456 ../calendar/gui/print.c:2524 #, c-format msgid "Location: %s" msgstr "Lugar: %s" @@ -6494,12 +6497,12 @@ msgstr "" #. * to change the length of the time division in the calendar day view, e.g. #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions" #. -#: ../calendar/gui/e-day-view-time-item.c:750 +#: ../calendar/gui/e-day-view-time-item.c:751 #, c-format msgid "%02i minute divisions" msgstr "divisiones de %02i minutos" -#: ../calendar/gui/e-day-view-time-item.c:771 +#: ../calendar/gui/e-day-view-time-item.c:772 msgid "Show the second time zone" msgstr "Muestra la segunda zona horaria" @@ -6510,19 +6513,19 @@ msgstr "Muestra la segunda zona horaria" #. order but don't change the specifiers or add #. anything. #: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1581 -#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678 +#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1681 msgid "%A %d %B" msgstr "%A %e de %B" #. String to use in 12-hour time format for times in the morning. #: ../calendar/gui/e-day-view.c:804 ../calendar/gui/e-week-view.c:542 -#: ../calendar/gui/print.c:828 +#: ../calendar/gui/print.c:829 msgid "am" msgstr "am" #. String to use in 12-hour time format for times in the afternoon. #: ../calendar/gui/e-day-view.c:807 ../calendar/gui/e-week-view.c:545 -#: ../calendar/gui/print.c:830 +#: ../calendar/gui/print.c:831 msgid "pm" msgstr "pm" @@ -6886,7 +6889,7 @@ msgstr "Elija una acción:" #. To translators: RSVP means "please reply" #: ../calendar/gui/e-itip-control.c:2316 -#: ../calendar/gui/e-meeting-list-view.c:591 +#: ../calendar/gui/e-meeting-list-view.c:592 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8 msgid "RSVP" msgstr "Confirmar" @@ -6969,66 +6972,66 @@ msgstr "Participantes opcionales" msgid "Resources" msgstr "Recursos" -#: ../calendar/gui/e-meeting-list-view.c:151 +#: ../calendar/gui/e-meeting-list-view.c:152 msgid "Attendees" msgstr "Participantes" -#: ../calendar/gui/e-meeting-list-view.c:162 +#: ../calendar/gui/e-meeting-list-view.c:163 #: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102 -#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980 +#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:981 msgid "Individual" msgstr "Individual" -#: ../calendar/gui/e-meeting-list-view.c:163 +#: ../calendar/gui/e-meeting-list-view.c:164 #: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104 -#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7 +#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7 msgid "Group" msgstr "Grupo" -#: ../calendar/gui/e-meeting-list-view.c:164 +#: ../calendar/gui/e-meeting-list-view.c:165 #: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106 -#: ../calendar/gui/print.c:982 +#: ../calendar/gui/print.c:983 msgid "Resource" msgstr "Recurso" -#: ../calendar/gui/e-meeting-list-view.c:165 +#: ../calendar/gui/e-meeting-list-view.c:166 #: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108 -#: ../calendar/gui/print.c:983 +#: ../calendar/gui/print.c:984 msgid "Room" msgstr "Sala" -#: ../calendar/gui/e-meeting-list-view.c:176 +#: ../calendar/gui/e-meeting-list-view.c:177 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137 -#: ../calendar/gui/print.c:997 +#: ../calendar/gui/print.c:998 msgid "Chair" msgstr "Presidente" -#: ../calendar/gui/e-meeting-list-view.c:177 +#: ../calendar/gui/e-meeting-list-view.c:178 #: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139 -#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998 +#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:999 msgid "Required Participant" msgstr "Participante requerido" -#: ../calendar/gui/e-meeting-list-view.c:178 +#: ../calendar/gui/e-meeting-list-view.c:179 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141 -#: ../calendar/gui/print.c:999 +#: ../calendar/gui/print.c:1000 msgid "Optional Participant" msgstr "Participante opcional" -#: ../calendar/gui/e-meeting-list-view.c:179 +#: ../calendar/gui/e-meeting-list-view.c:180 #: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143 -#: ../calendar/gui/print.c:1000 +#: ../calendar/gui/print.c:1001 msgid "Non-Participant" msgstr "No participan" -#: ../calendar/gui/e-meeting-list-view.c:201 +#: ../calendar/gui/e-meeting-list-view.c:202 #: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193 #: ../calendar/gui/e-meeting-store.c:752 msgid "Needs Action" msgstr "Necesita acción" #. The extra space is just a hack to occupy more space for Attendee -#: ../calendar/gui/e-meeting-list-view.c:546 +#: ../calendar/gui/e-meeting-list-view.c:547 msgid "Attendee " msgstr "Participante " @@ -7146,11 +7149,11 @@ msgstr "Idioma" msgid "Member" msgstr "Miembro" -#: ../calendar/gui/e-memo-table.c:955 +#: ../calendar/gui/e-memo-table.c:953 msgid "_Delete Selected Memos" msgstr "_Borrar las notas seleccionadas" -#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2 +#: ../calendar/gui/e-memo-table.c:1104 ../calendar/gui/e-memo-table.etspec.h:2 msgid "Click to add a memo" msgstr "Pulse aquí para añadir una nota" @@ -7200,7 +7203,7 @@ msgstr "Seleccione la zona horaria" #. strftime format %d = day of month, %B = full #. month name. You can change the order but don't #. change the specifiers or add anything. -#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659 +#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1662 msgid "%d %B" msgstr "%e de %B" @@ -7643,78 +7646,77 @@ msgstr "30" msgid "31st" msgstr "31" -#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday -#: ../calendar/gui/print.c:595 +#: ../calendar/gui/print.c:596 msgid "Su" msgstr "Do" -#: ../calendar/gui/print.c:595 +#: ../calendar/gui/print.c:596 msgid "Mo" msgstr "Lu" -#: ../calendar/gui/print.c:595 +#: ../calendar/gui/print.c:596 msgid "Tu" msgstr "Ma" -#: ../calendar/gui/print.c:595 +#: ../calendar/gui/print.c:596 msgid "We" msgstr "Mi" -#: ../calendar/gui/print.c:596 +#: ../calendar/gui/print.c:597 msgid "Th" msgstr "Ju" -#: ../calendar/gui/print.c:596 +#: ../calendar/gui/print.c:597 msgid "Fr" msgstr "Vi" -#: ../calendar/gui/print.c:596 +#: ../calendar/gui/print.c:597 msgid "Sa" msgstr "Sa" -#: ../calendar/gui/print.c:2481 +#: ../calendar/gui/print.c:2488 msgid "Appointment" msgstr "Cita" -#: ../calendar/gui/print.c:2483 +#: ../calendar/gui/print.c:2490 msgid "Task" msgstr "Tarea" -#: ../calendar/gui/print.c:2508 +#: ../calendar/gui/print.c:2515 #, c-format msgid "Summary: %s" msgstr "Resumen: %s" -#: ../calendar/gui/print.c:2531 +#: ../calendar/gui/print.c:2538 msgid "Attendees: " msgstr "Participantes: " -#: ../calendar/gui/print.c:2571 +#: ../calendar/gui/print.c:2578 #, c-format msgid "Status: %s" msgstr "Estado: %s" -#: ../calendar/gui/print.c:2587 +#: ../calendar/gui/print.c:2594 #, c-format msgid "Priority: %s" msgstr "Prioridad: %s" -#: ../calendar/gui/print.c:2602 +#: ../calendar/gui/print.c:2609 #, c-format msgid "Percent Complete: %i" msgstr "Porcentaje completado: %i" -#: ../calendar/gui/print.c:2614 +#: ../calendar/gui/print.c:2621 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: ../calendar/gui/print.c:2627 +#: ../calendar/gui/print.c:2634 #, c-format msgid "Categories: %s" msgstr "Categorías: %s" -#: ../calendar/gui/print.c:2638 +#: ../calendar/gui/print.c:2645 msgid "Contacts: " msgstr "Contactos: " @@ -7799,7 +7801,7 @@ msgstr "" "\n" "¿Borrar realmente esas tareas?" -#: ../calendar/gui/tasks-control.c:491 ../mail/em-folder-view.c:1126 +#: ../calendar/gui/tasks-control.c:491 ../mail/em-folder-view.c:1127 msgid "Do not ask me again." msgstr "No me preguntes otra vez." @@ -7832,37 +7834,37 @@ msgstr "es menor que" msgid "Appointments and Meetings" msgstr "Reuniones y citas" -#: ../calendar/importers/icalendar-importer.c:333 -#: ../calendar/importers/icalendar-importer.c:628 +#: ../calendar/importers/icalendar-importer.c:335 +#: ../calendar/importers/icalendar-importer.c:630 #: ../plugins/itip-formatter/itip-formatter.c:1729 msgid "Opening calendar" msgstr "Apertura del calendario" -#: ../calendar/importers/icalendar-importer.c:440 +#: ../calendar/importers/icalendar-importer.c:442 msgid "iCalendar files (.ics)" msgstr "Archivos iCalendar (.ics)" -#: ../calendar/importers/icalendar-importer.c:441 +#: ../calendar/importers/icalendar-importer.c:443 msgid "Evolution iCalendar importer" msgstr "Importador de iCalendar de Evolution" -#: ../calendar/importers/icalendar-importer.c:529 +#: ../calendar/importers/icalendar-importer.c:531 msgid "Reminder!" msgstr "¡Recuerde!" -#: ../calendar/importers/icalendar-importer.c:581 +#: ../calendar/importers/icalendar-importer.c:583 msgid "vCalendar files (.vcf)" msgstr "Archivos vCalendar (.vcf)" -#: ../calendar/importers/icalendar-importer.c:582 +#: ../calendar/importers/icalendar-importer.c:584 msgid "Evolution vCalendar importer" msgstr "Importador de vCalendar de Evolution" -#: ../calendar/importers/icalendar-importer.c:744 +#: ../calendar/importers/icalendar-importer.c:746 msgid "Calendar Events" msgstr "Acontecimientos de calendario" -#: ../calendar/importers/icalendar-importer.c:781 +#: ../calendar/importers/icalendar-importer.c:783 msgid "Evolution Calendar intelligent importer" msgstr "Importador inteligente del calendario de Evolution" @@ -9441,7 +9443,7 @@ msgstr "_Cerrar" msgid "Close the current file" msgstr "Cierra el archivo actual" -#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337 +#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1338 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47 #: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20 #: ../ui/evolution-tasks.xml.h:29 @@ -9610,37 +9612,37 @@ msgstr "_De:" msgid "_Reply-To:" msgstr "_Responder a:" -#: ../composer/e-composer-header-table.c:940 +#: ../composer/e-composer-header-table.c:941 msgid "_To:" msgstr "_Para:" -#: ../composer/e-composer-header-table.c:945 +#: ../composer/e-composer-header-table.c:947 msgid "_Cc:" msgstr "_Cc:" # #En conflicto con _Mensaje -#: ../composer/e-composer-header-table.c:945 +#: ../composer/e-composer-header-table.c:947 msgid "Show CC" msgstr "Mostrar Cc" -#: ../composer/e-composer-header-table.c:950 +#: ../composer/e-composer-header-table.c:953 msgid "_Bcc:" msgstr "Cc_o:" # #En conflicto con _Mensaje -#: ../composer/e-composer-header-table.c:950 +#: ../composer/e-composer-header-table.c:953 msgid "Show BCC" msgstr "Mostrar Cco" -#: ../composer/e-composer-header-table.c:955 +#: ../composer/e-composer-header-table.c:958 msgid "_Post To:" msgstr "_Publicar en:" -#: ../composer/e-composer-header-table.c:959 +#: ../composer/e-composer-header-table.c:962 msgid "S_ubject:" msgstr "_Asunto:" -#: ../composer/e-composer-header-table.c:968 +#: ../composer/e-composer-header-table.c:971 msgid "Si_gnature:" msgstr "_Firma:" @@ -9886,7 +9888,7 @@ msgid "Evolution Query" msgstr "Consulta de Evolution" #. setup a dummy error -#: ../e-util/e-error.c:444 +#: ../e-util/e-error.c:448 #, c-format msgid "Internal error, unknown error '%s' requested" msgstr "Error interno, solicitado un error desconocido «%s»" @@ -10019,47 +10021,47 @@ msgstr "No se pudo abrir el enlace." msgid "Could not display help for Evolution." msgstr "No se pudo mostrar la ayuda de Evolution." -#: ../e-util/e-util-labels.c:39 +#: ../e-util/e-util-labels.c:45 msgid "I_mportant" msgstr "_Importante" #. red -#: ../e-util/e-util-labels.c:40 +#: ../e-util/e-util-labels.c:46 msgid "_Work" msgstr "_Trabajo" #. orange -#: ../e-util/e-util-labels.c:41 +#: ../e-util/e-util-labels.c:47 msgid "_Personal" msgstr "_Privado" #. green -#: ../e-util/e-util-labels.c:42 +#: ../e-util/e-util-labels.c:48 msgid "_To Do" msgstr "Ta_reas pendientes" #. blue -#: ../e-util/e-util-labels.c:43 +#: ../e-util/e-util-labels.c:49 msgid "_Later" msgstr "_Más tarde" -#: ../e-util/e-util-labels.c:315 +#: ../e-util/e-util-labels.c:321 msgid "Label _Name:" msgstr "_Nombre de la etiqueta:" -#: ../e-util/e-util-labels.c:338 +#: ../e-util/e-util-labels.c:344 msgid "Edit Label" msgstr "Editar etiqueta" -#: ../e-util/e-util-labels.c:338 +#: ../e-util/e-util-labels.c:344 msgid "Add Label" msgstr "Añadir etiqueta" -#: ../e-util/e-util-labels.c:357 +#: ../e-util/e-util-labels.c:363 msgid "Label name cannot be empty." msgstr "El nombre de la etiqueta no puede estar vacío." -#: ../e-util/e-util-labels.c:362 +#: ../e-util/e-util-labels.c:368 msgid "" "A label having the same tag already exists on the server. Please rename your " "label." @@ -10067,12 +10069,12 @@ msgstr "" "Ya existe una etiqueta con el mismo nombre en el servidor. Renombre la " "etiqueta." -#: ../e-util/gconf-bridge.c:1221 +#: ../e-util/gconf-bridge.c:1216 #, c-format msgid "GConf error: %s" msgstr "Error de GConf: %s" -#: ../e-util/gconf-bridge.c:1232 +#: ../e-util/gconf-bridge.c:1227 msgid "All further errors shown only on terminal." msgstr "En adelante todos los errores sólo se mostrarán en el terminal." @@ -10434,10 +10436,10 @@ msgstr "Control de preferencias de Evolution" msgid "Evolution Network configuration control" msgstr "Control de configuración de red de Evolution" -#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602 +#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:603 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378 -#: ../mail/mail-component.c:599 ../mail/mail-component.c:600 -#: ../mail/mail-component.c:769 +#: ../mail/mail-component.c:601 ../mail/mail-component.c:602 +#: ../mail/mail-component.c:771 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6 msgid "Mail" msgstr "Correo" @@ -10461,12 +10463,12 @@ msgstr "Preferencias de red" msgid "_Mail" msgstr "Co_rreo" -#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331 +#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1332 #: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105 msgid "_Forward" msgstr "Reen_viar" -#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329 +#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1330 #: ../ui/evolution-mail-message.xml.h:123 msgid "_Reply to Sender" msgstr "Responder al _remitente" @@ -10599,50 +10601,51 @@ msgstr "Siempre" msgid "Ask for each message" msgstr "Preguntar por cada mensaje" -#: ../mail/em-account-editor.c:1853 ../mail/mail-config.glade.h:100 +#: ../mail/em-account-editor.c:1854 ../mail/mail-config.glade.h:100 msgid "Identity" msgstr "Identidad" -#: ../mail/em-account-editor.c:1904 ../mail/mail-config.glade.h:127 +#: ../mail/em-account-editor.c:1905 ../mail/mail-config.glade.h:127 msgid "Receiving Email" msgstr "Recepción de correo" -#: ../mail/em-account-editor.c:2176 +#: ../mail/em-account-editor.c:2177 msgid "Check for _new messages every" msgstr "Comprobar si hay correo _nuevo cada" -#: ../mail/em-account-editor.c:2184 +#: ../mail/em-account-editor.c:2185 msgid "minu_tes" msgstr "minu_tos" -#: ../mail/em-account-editor.c:2374 ../mail/mail-config.glade.h:138 +#: ../mail/em-account-editor.c:2375 ../mail/mail-config.glade.h:138 msgid "Sending Email" msgstr "Envío de correo" -#: ../mail/em-account-editor.c:2433 ../mail/mail-config.glade.h:73 +#: ../mail/em-account-editor.c:2434 ../mail/mail-config.glade.h:73 msgid "Defaults" msgstr "Predeterminados" #. Security settings -#: ../mail/em-account-editor.c:2499 ../mail/mail-config.glade.h:133 +#: ../mail/em-account-editor.c:2500 ../mail/mail-config.glade.h:133 #: ../plugins/exchange-operations/exchange-account-setup.c:332 msgid "Security" msgstr "Seguridad" +#. Most sections for this is auto-generated from the camel config #. Most sections for this is auto-generated fromt the camel config -#: ../mail/em-account-editor.c:2536 ../mail/em-account-editor.c:2631 +#: ../mail/em-account-editor.c:2537 ../mail/em-account-editor.c:2632 msgid "Receiving Options" msgstr "Opciones de recepción" -#: ../mail/em-account-editor.c:2537 ../mail/em-account-editor.c:2632 +#: ../mail/em-account-editor.c:2538 ../mail/em-account-editor.c:2633 msgid "Checking for New Messages" msgstr "Comprobando si hay mensajes nuevos" -#: ../mail/em-account-editor.c:3089 ../mail/mail-config.glade.h:34 +#: ../mail/em-account-editor.c:3094 ../mail/mail-config.glade.h:34 msgid "Account Editor" msgstr "Editor de cuentas" -#: ../mail/em-account-editor.c:3089 ../mail/mail-config.glade.h:89 +#: ../mail/em-account-editor.c:3094 ../mail/mail-config.glade.h:89 msgid "Evolution Account Assistant" msgstr "Asistente de cuentas de Evolution" @@ -10692,14 +10695,14 @@ msgid "No account found to use, forward of the message has been cancelled." msgstr "" "No se encontró ninguna cuenta que usar, se canceló el reenvío del mensaje." -#: ../mail/em-composer-utils.c:2027 +#: ../mail/em-composer-utils.c:2030 msgid "an unknown sender" msgstr "un remitente desconocido" #. Note to translators: this is the attribution string used when quoting messages. #. * each ${Variable} gets replaced with a value. To see a full list of available #. * variables, see em-composer-utils.c:1514 -#: ../mail/em-composer-utils.c:2074 +#: ../mail/em-composer-utils.c:2077 msgid "" "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " "${TimeZone}, ${Sender} wrote:" @@ -10707,7 +10710,7 @@ msgstr "" "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} " "${TimeZone}, ${Sender} escribió:" -#: ../mail/em-composer-utils.c:2217 +#: ../mail/em-composer-utils.c:2220 msgid "-----Original Message-----" msgstr "-----Mensaje original-----" @@ -10757,7 +10760,7 @@ msgid "Date sent" msgstr "Fecha de envío" #: ../mail/em-filter-i18n.h:14 -#: ../plugins/groupwise-features/share-folder.c:766 +#: ../plugins/groupwise-features/share-folder.c:770 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6 #: ../ui/evolution-tasks.xml.h:6 @@ -10812,7 +10815,7 @@ msgstr "Seguimiento" msgid "Forward to" msgstr "Reenviar a" -#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:957 +#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958 msgid "Important" msgstr "Importante" @@ -10971,7 +10974,7 @@ msgid "Stop Processing" msgstr "Parar de procesar" #: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:342 -#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:80 +#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:80 #: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:305 #: ../plugins/groupwise-features/properties.glade.h:7 #: ../smime/lib/e-cert.c:1115 @@ -11031,11 +11034,11 @@ msgstr "Mensajes importantes" msgid "Messages Not Junk" msgstr "Mensajes que no son SPAM" -#: ../mail/em-folder-browser.c:1202 +#: ../mail/em-folder-browser.c:1201 msgid "Account Search" msgstr "Búsqueda en la cuenta" -#: ../mail/em-folder-browser.c:1255 +#: ../mail/em-folder-browser.c:1254 msgid "All Account Search" msgstr "Búsqueda en todas las cuentas" @@ -11065,11 +11068,11 @@ msgid "Quota usage" msgstr "Uso de cuota" #. translators: standard local mailbox names -#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:516 -#: ../mail/em-folder-tree.c:2524 ../mail/mail-component.c:166 -#: ../mail/mail-component.c:587 +#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517 +#: ../mail/em-folder-tree.c:2524 ../mail/mail-component.c:168 +#: ../mail/mail-component.c:589 #: ../plugins/exchange-operations/exchange-delegates-user.c:76 -#: ../plugins/exchange-operations/exchange-folder.c:594 +#: ../plugins/exchange-operations/exchange-folder.c:597 msgid "Inbox" msgstr "Bandeja de entrada" @@ -11091,34 +11094,34 @@ msgid "Folder _name:" msgstr "_Nombre de la carpeta:" #. load store to mail component -#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209 -#: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1028 +#: ../mail/em-folder-tree-model.c:208 ../mail/em-folder-tree-model.c:210 +#: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1029 msgid "Search Folders" msgstr "Carpetas de búsqueda" #. UNMATCHED is always last -#: ../mail/em-folder-tree-model.c:213 ../mail/em-folder-tree-model.c:215 +#: ../mail/em-folder-tree-model.c:214 ../mail/em-folder-tree-model.c:216 msgid "UNMATCHED" msgstr "NO COINCIDENTE" -#: ../mail/em-folder-tree-model.c:511 ../mail/mail-component.c:167 +#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:169 msgid "Drafts" msgstr "Borradores" -#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:170 +#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:172 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2 msgid "Templates" msgstr "Plantillas" -#: ../mail/em-folder-tree-model.c:519 ../mail/mail-component.c:168 +#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170 msgid "Outbox" msgstr "Bandeja de salida" -#: ../mail/em-folder-tree-model.c:521 ../mail/mail-component.c:169 +#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171 msgid "Sent" msgstr "Correo enviado" -#: ../mail/em-folder-tree-model.c:550 ../mail/em-folder-tree-model.c:859 +#: ../mail/em-folder-tree-model.c:551 ../mail/em-folder-tree-model.c:860 msgid "Loading..." msgstr "Cargando…" @@ -11137,7 +11140,7 @@ msgstr "Cargando…" #. * Do not translate the "folder-display|" part. Remove it #. * from your translation. #. -#: ../mail/em-folder-tree.c:299 +#: ../mail/em-folder-tree.c:300 #, c-format msgctxt "folder-display" msgid "%s (%u)" @@ -11180,7 +11183,7 @@ msgid "_Move to Folder" msgstr "_Mover a la carpeta" #: ../mail/em-folder-tree.c:929 ../mail/em-folder-utils.c:362 -#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2106 +#: ../mail/em-folder-view.c:1187 ../mail/message-list.c:2106 msgid "_Move" msgstr "_Mover" @@ -11227,14 +11230,14 @@ msgstr "Carpeta de búsqueda de _no leídos" msgid "Copying `%s' to `%s'" msgstr "Copiando «%s» a «%s»" -#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186 -#: ../mail/em-folder-view.c:1201 +#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1187 +#: ../mail/em-folder-view.c:1202 #: ../mail/importers/evolution-mbox-importer.c:82 #: ../plugins/pst-import/pst-importer.c:305 msgid "Select folder" msgstr "Seleccionar carpeta" -#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201 +#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1202 msgid "C_opy" msgstr "C_opiar" @@ -11256,160 +11259,160 @@ msgstr "Crear carpeta" msgid "Specify where to create the folder:" msgstr "Especifique donde crear la carpeta:" -#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70 +#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70 msgid "Mail Deletion Failed" msgstr "Ha fallado el borrado del correo" -#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126 +#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126 msgid "You do not have sufficient permissions to delete this mail." msgstr "No tiene suficientes permisos para borrar este correo." #. 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 -#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102 +#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:102 msgid "_Edit as New Message..." msgstr "_Editar como un mensaje nuevo…" -#: ../mail/em-folder-view.c:1341 +#: ../mail/em-folder-view.c:1342 msgid "U_ndelete" msgstr "_Recuperar" -#: ../mail/em-folder-view.c:1342 +#: ../mail/em-folder-view.c:1343 msgid "_Move to Folder..." msgstr "_Mover a la carpeta…" -#: ../mail/em-folder-view.c:1343 +#: ../mail/em-folder-view.c:1344 msgid "_Copy to Folder..." msgstr "Copiar a la c_arpeta…" -#: ../mail/em-folder-view.c:1346 +#: ../mail/em-folder-view.c:1347 msgid "Mar_k as Read" msgstr "Marcar como _leído" -#: ../mail/em-folder-view.c:1347 +#: ../mail/em-folder-view.c:1348 msgid "Mark as _Unread" msgstr "Marcar como no _leído" -#: ../mail/em-folder-view.c:1348 +#: ../mail/em-folder-view.c:1349 msgid "Mark as _Important" msgstr "Marcar como imp_ortante" -#: ../mail/em-folder-view.c:1349 +#: ../mail/em-folder-view.c:1350 msgid "Mark as Un_important" msgstr "Marcar como no imp_ortante" -#: ../mail/em-folder-view.c:1350 +#: ../mail/em-folder-view.c:1351 msgid "Mark as _Junk" msgstr "Marcar como _SPAM" -#: ../mail/em-folder-view.c:1351 +#: ../mail/em-folder-view.c:1352 msgid "Mark as _Not Junk" msgstr "Marcar como no _SPAM" -#: ../mail/em-folder-view.c:1352 +#: ../mail/em-folder-view.c:1353 msgid "Mark for Follo_w Up..." msgstr "Marcar para se_guimiento…" -#: ../mail/em-folder-view.c:1354 +#: ../mail/em-folder-view.c:1355 msgid "_Label" msgstr "Etiq_ueta" #. Note that we don't show this here, since by default a 'None' date #. is not permitted. -#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:477 +#: ../mail/em-folder-view.c:1356 ../widgets/misc/e-dateedit.c:477 msgid "_None" msgstr "_Ninguna" -#: ../mail/em-folder-view.c:1358 +#: ../mail/em-folder-view.c:1359 msgid "_New Label" msgstr "Etiqueta n_ueva" -#: ../mail/em-folder-view.c:1362 +#: ../mail/em-folder-view.c:1363 msgid "Fla_g Completed" msgstr "Ma_rcar como terminado" -#: ../mail/em-folder-view.c:1363 +#: ../mail/em-folder-view.c:1364 msgid "Cl_ear Flag" msgstr "_Quitar marca" -#: ../mail/em-folder-view.c:1366 +#: ../mail/em-folder-view.c:1367 msgid "Crea_te Rule From Message" msgstr "Crear re_gla desde el mensaje" #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on. -#: ../mail/em-folder-view.c:1368 +#: ../mail/em-folder-view.c:1369 msgid "Search Folder based on _Subject" msgstr "Carpeta de búsqueda según el a_sunto" -#: ../mail/em-folder-view.c:1369 +#: ../mail/em-folder-view.c:1370 msgid "Search Folder based on Se_nder" msgstr "Carpeta de búsqueda según el r_emitente" -#: ../mail/em-folder-view.c:1370 +#: ../mail/em-folder-view.c:1371 msgid "Search Folder based on _Recipients" msgstr "Carpeta de búsqueda según los des_tinatarios" -#: ../mail/em-folder-view.c:1371 +#: ../mail/em-folder-view.c:1372 msgid "Search Folder based on Mailing _List" msgstr "Carpeta de búsqueda según la l_ista de correo" #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on. -#: ../mail/em-folder-view.c:1376 +#: ../mail/em-folder-view.c:1377 msgid "Filter based on Sub_ject" msgstr "Filtro según el _asunto" -#: ../mail/em-folder-view.c:1377 +#: ../mail/em-folder-view.c:1378 msgid "Filter based on Sen_der" msgstr "Filtro según el _remitente" -#: ../mail/em-folder-view.c:1378 +#: ../mail/em-folder-view.c:1379 msgid "Filter based on Re_cipients" msgstr "Filtro según los _destinatarios" -#: ../mail/em-folder-view.c:1379 +#: ../mail/em-folder-view.c:1380 msgid "Filter based on _Mailing List" msgstr "Filtro según la lista de _correo" #. default charset used in mail view #. we changed user, thus reset the chosen calendar combo too, because #. other user means other calendars subscribed -#: ../mail/em-folder-view.c:2234 ../mail/em-folder-view.c:2277 +#: ../mail/em-folder-view.c:2235 ../mail/em-folder-view.c:2278 #: ../plugins/google-account-setup/google-source.c:232 #: ../plugins/google-account-setup/google-source.c:511 #: ../plugins/google-account-setup/google-source.c:699 msgid "Default" msgstr "Predeterminado" -#: ../mail/em-folder-view.c:2495 +#: ../mail/em-folder-view.c:2496 msgid "Unable to retrieve message" msgstr "No se pudo obtener el mensaje" -#: ../mail/em-folder-view.c:2514 +#: ../mail/em-folder-view.c:2515 msgid "Retrieving Message..." msgstr "Obteniendo mensaje…" -#: ../mail/em-folder-view.c:2735 +#: ../mail/em-folder-view.c:2736 msgid "Create _Search Folder" msgstr "Crear carpeta de _búsqueda" -#: ../mail/em-folder-view.c:2736 +#: ../mail/em-folder-view.c:2737 msgid "_From this Address" msgstr "_Desde esta dirección" -#: ../mail/em-folder-view.c:2737 +#: ../mail/em-folder-view.c:2738 msgid "_To this Address" msgstr "_A esta dirección" -#: ../mail/em-folder-view.c:3230 +#: ../mail/em-folder-view.c:3231 #, c-format msgid "Click to mail %s" msgstr "Pulse para enviar correo a %s" -#: ../mail/em-folder-view.c:3242 +#: ../mail/em-folder-view.c:3243 #, c-format msgid "Click to call %s" msgstr "Pulse para llamar a %s" -#: ../mail/em-folder-view.c:3247 +#: ../mail/em-folder-view.c:3248 msgid "Click to hide/unhide addresses" msgstr "Pulse para ocultar/mostrar las direcciones" @@ -11636,13 +11639,13 @@ msgstr "Formateando el mensaje…" #: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632 #: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210 -#: ../mail/em-format.c:924 ../mail/em-mailer-prefs.c:78 +#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:78 msgid "Cc" msgstr "Cc" #: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638 #: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210 -#: ../mail/em-format.c:925 ../mail/em-mailer-prefs.c:79 +#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:79 msgid "Bcc" msgstr "Cco" @@ -11670,74 +11673,74 @@ msgstr " (%R %Z)" msgid "This message was sent by %s on behalf of %s" msgstr "Este mensaje lo envió %s en nombre de %s" -#: ../mail/em-format-quote.c:210 ../mail/em-format.c:921 +#: ../mail/em-format-quote.c:210 ../mail/em-format.c:923 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7 #: ../mail/message-tag-followup.c:301 msgid "From" msgstr "De" -#: ../mail/em-format-quote.c:210 ../mail/em-format.c:922 +#: ../mail/em-format-quote.c:210 ../mail/em-format.c:924 #: ../mail/em-mailer-prefs.c:76 msgid "Reply-To" msgstr "Responder a" -#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:81 +#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:81 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:324 #: ../widgets/misc/e-dateedit.c:346 msgid "Date" msgstr "Fecha" -#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:82 +#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:82 msgid "Newsgroups" msgstr "Grupos de noticias" -#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:83 +#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:83 #: ../plugins/face/org-gnome-face.eplug.xml.h:4 msgid "Face" msgstr "Cara" -#: ../mail/em-format.c:1196 +#: ../mail/em-format.c:1198 #, c-format msgid "%s attachment" msgstr "%s adjunto" -#: ../mail/em-format.c:1235 +#: ../mail/em-format.c:1236 msgid "Could not parse S/MIME message: Unknown error" msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido" -#: ../mail/em-format.c:1372 ../mail/em-format.c:1528 +#: ../mail/em-format.c:1373 ../mail/em-format.c:1530 msgid "Could not parse MIME message. Displaying as source." msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente." -#: ../mail/em-format.c:1380 +#: ../mail/em-format.c:1381 msgid "Unsupported encryption type for multipart/encrypted" msgstr "Tipo de cifrado no soportado para multipart/encrypted" -#: ../mail/em-format.c:1390 +#: ../mail/em-format.c:1391 msgid "Could not parse PGP/MIME message" msgstr "No es posible interpretar el mensaje PGP/MIME" -#: ../mail/em-format.c:1390 +#: ../mail/em-format.c:1391 msgid "Could not parse PGP/MIME message: Unknown error" msgstr "No se pudo interpretar el mensaje PGP/MIME: Error desconocido" -#: ../mail/em-format.c:1547 +#: ../mail/em-format.c:1549 msgid "Unsupported signature format" msgstr "Formato de firma no soportado" -#: ../mail/em-format.c:1555 ../mail/em-format.c:1626 +#: ../mail/em-format.c:1557 ../mail/em-format.c:1628 msgid "Error verifying signature" msgstr "Error al verificar la firma" -#: ../mail/em-format.c:1555 ../mail/em-format.c:1617 ../mail/em-format.c:1626 +#: ../mail/em-format.c:1557 ../mail/em-format.c:1619 ../mail/em-format.c:1628 msgid "Unknown error verifying signature" msgstr "Error desconocido al verificar la firma" -#: ../mail/em-format.c:1700 +#: ../mail/em-format.c:1702 msgid "Could not parse PGP message" msgstr "No es posible interpretar el mensaje PGP" -#: ../mail/em-format.c:1700 +#: ../mail/em-format.c:1702 msgid "Could not parse PGP message: Unknown error" msgstr "No es posible interpretar el mensaje PGP: Error desconocido" @@ -11805,35 +11808,35 @@ msgid "No Junk plugin available" msgstr "No hay complemento para SPAM disponible" #. green -#: ../mail/em-migrate.c:960 +#: ../mail/em-migrate.c:961 msgid "To Do" msgstr "Tareas pendientes" #. blue -#: ../mail/em-migrate.c:961 +#: ../mail/em-migrate.c:962 msgid "Later" msgstr "Más tarde" -#: ../mail/em-migrate.c:1128 +#: ../mail/em-migrate.c:1129 msgid "Migration" msgstr "Migración" -#: ../mail/em-migrate.c:1573 +#: ../mail/em-migrate.c:1574 #, c-format msgid "Unable to create new folder `%s': %s" msgstr "No es posible crear la carpeta nueva: «%s»: %s" -#: ../mail/em-migrate.c:1599 +#: ../mail/em-migrate.c:1600 #, c-format msgid "Unable to copy folder `%s' to `%s': %s" msgstr "No es posible copiar el la carpeta «%s» a «%s»: %s" -#: ../mail/em-migrate.c:1784 +#: ../mail/em-migrate.c:1785 #, c-format msgid "Unable to scan for existing mailboxes at `%s': %s" msgstr "No es posible buscar buzones existentes en «%s»: %s" -#: ../mail/em-migrate.c:1789 +#: ../mail/em-migrate.c:1790 msgid "" "The location and hierarchy of the Evolution mailbox folders has changed " "since Evolution 1.x.\n" @@ -11845,31 +11848,31 @@ msgstr "" "\n" "Tenga paciencia mientras Evolution migra sus carpetas…" -#: ../mail/em-migrate.c:1990 +#: ../mail/em-migrate.c:1991 #, c-format msgid "Unable to open old POP keep-on-server data `%s': %s" msgstr "No es posible abrir los datos antiguos POP keep-on-server «%s»: %s" -#: ../mail/em-migrate.c:2004 +#: ../mail/em-migrate.c:2005 #, c-format msgid "Unable to create POP3 keep-on-server data directory `%s': %s" msgstr "Fallo al crear directorio de datos POP3 keep-on-server «%s»: %s" -#: ../mail/em-migrate.c:2033 +#: ../mail/em-migrate.c:2034 #, c-format msgid "Unable to copy POP3 keep-on-server data `%s': %s" msgstr "No es posible copiar los datos POP3 keep-on-server «%s»: %s" -#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516 +#: ../mail/em-migrate.c:2505 ../mail/em-migrate.c:2517 #, c-format msgid "Failed to create local mail storage `%s': %s" msgstr "No es posible crear el almacén de correo local «%s»: %s" -#: ../mail/em-migrate.c:2874 +#: ../mail/em-migrate.c:2875 msgid "Migrating Folders" msgstr "Migrando carpetas" -#: ../mail/em-migrate.c:2874 +#: ../mail/em-migrate.c:2875 msgid "" "The summary format of the Evolution mailbox folders has been moved to SQLite " "since Evolution 2.24.\n" @@ -11881,12 +11884,12 @@ msgstr "" "\n" "Tenga paciencia mientras Evolution migra sus carpetas…" -#: ../mail/em-migrate.c:2956 +#: ../mail/em-migrate.c:2957 #, c-format msgid "Unable to create local mail folders at `%s': %s" msgstr "No es posible crear las carpetas de correo local en: «%s»: %s" -#: ../mail/em-migrate.c:2975 +#: ../mail/em-migrate.c:2976 msgid "" "Unable to read settings from previous Evolution install, `evolution/config." "xmldb' does not exist or is corrupt." @@ -11925,24 +11928,24 @@ msgstr "_Añadir a la libreta de direcciones" msgid "Open in %s..." msgstr "Abrir en %s…" -#: ../mail/em-subscribe-editor.c:605 +#: ../mail/em-subscribe-editor.c:606 msgid "This store does not support subscriptions, or they are not enabled." msgstr "Este almacén no soporta suscripciones, o no están activadas." -#: ../mail/em-subscribe-editor.c:638 +#: ../mail/em-subscribe-editor.c:639 msgid "Subscribed" msgstr "Suscrito" -#: ../mail/em-subscribe-editor.c:642 +#: ../mail/em-subscribe-editor.c:643 msgid "Folder" msgstr "Carpeta" #. FIXME: This is just to get the shadow, is there a better way? -#: ../mail/em-subscribe-editor.c:858 +#: ../mail/em-subscribe-editor.c:859 msgid "Please select a server." msgstr "Seleccione un servidor." -#: ../mail/em-subscribe-editor.c:894 +#: ../mail/em-subscribe-editor.c:895 msgid "No server has been selected" msgstr "No se ha seleccionado ningún servidor" @@ -13001,89 +13004,89 @@ msgstr "Lista de correo %s" msgid "Add Filter Rule" msgstr "Añadir regla de filtrado" -#: ../mail/mail-component.c:552 +#: ../mail/mail-component.c:554 #, c-format msgid "%d selected, " msgid_plural "%d selected, " msgstr[0] "%d seleccionado, " msgstr[1] "%d seleccionados, " -#: ../mail/mail-component.c:556 +#: ../mail/mail-component.c:558 #, c-format msgid "%d deleted" msgid_plural "%d deleted" msgstr[0] "%d borrado" msgstr[1] "%d borrados" -#: ../mail/mail-component.c:563 +#: ../mail/mail-component.c:565 #, c-format msgid "%d junk" msgid_plural "%d junk" msgstr[0] "%d SPAM" msgstr[1] "%d SPAM" -#: ../mail/mail-component.c:566 +#: ../mail/mail-component.c:568 #, c-format msgid "%d draft" msgid_plural "%d drafts" msgstr[0] "%d borrador" msgstr[1] "%d borradores" -#: ../mail/mail-component.c:568 +#: ../mail/mail-component.c:570 #, c-format msgid "%d sent" msgid_plural "%d sent" msgstr[0] "%d enviado" msgstr[1] "%d enviados" -#: ../mail/mail-component.c:570 +#: ../mail/mail-component.c:572 #, c-format msgid "%d unsent" msgid_plural "%d unsent" msgstr[0] "%d sin enviar" msgstr[1] "%d sin enviar" -#: ../mail/mail-component.c:576 +#: ../mail/mail-component.c:578 #, c-format msgid "%d unread, " msgid_plural "%d unread, " msgstr[0] "%d no leído, " msgstr[1] "%d no leídos, " -#: ../mail/mail-component.c:577 +#: ../mail/mail-component.c:579 #, c-format msgid "%d total" msgid_plural "%d total" msgstr[0] "%d en total" msgstr[1] "%d en total" -#: ../mail/mail-component.c:929 +#: ../mail/mail-component.c:930 msgid "New Mail Message" msgstr "Mensaje de correo nuevo" -#: ../mail/mail-component.c:930 +#: ../mail/mail-component.c:931 msgctxt "New" msgid "_Mail Message" msgstr "_Mensaje de correo" -#: ../mail/mail-component.c:931 +#: ../mail/mail-component.c:932 msgid "Compose a new mail message" msgstr "Redacta un mensaje de correo nuevo" -#: ../mail/mail-component.c:937 +#: ../mail/mail-component.c:938 msgid "New Mail Folder" msgstr "Carpeta de correo nueva" -#: ../mail/mail-component.c:938 +#: ../mail/mail-component.c:939 msgctxt "New" msgid "Mail _Folder" msgstr "_Carpeta de correo" -#: ../mail/mail-component.c:939 +#: ../mail/mail-component.c:940 msgid "Create a new mail folder" msgstr "Crea una carpeta de correo nueva" -#: ../mail/mail-component.c:1086 +#: ../mail/mail-component.c:1087 msgid "Failed upgrading Mail settings or folders." msgstr "Falló al actualizar la configuración de correo o carpetas." @@ -14174,11 +14177,11 @@ msgstr "Actualizando carpetas de búsqueda para «%s: %s»" msgid "Updating Search Folders for '%s'" msgstr "Actualizando carpetas de búsqueda para «%s»" -#: ../mail/mail-vfolder.c:1067 +#: ../mail/mail-vfolder.c:1068 msgid "Edit Search Folder" msgstr "Editar carpeta de búsqueda" -#: ../mail/mail-vfolder.c:1156 +#: ../mail/mail-vfolder.c:1157 msgid "New Search Folder" msgstr "Carpeta de búsqueda nueva" @@ -15167,31 +15170,31 @@ msgid "Restoring from the folder %s" msgstr "Restaurando desde la carpeta %s" #. Backup / Restore only can have GUI. We should restrict the rest -#: ../plugins/backup-restore/backup.c:410 +#: ../plugins/backup-restore/backup.c:411 msgid "Evolution Backup" msgstr "Respaldo de Evolution" -#: ../plugins/backup-restore/backup.c:410 +#: ../plugins/backup-restore/backup.c:411 msgid "Evolution Restore" msgstr "Restaurador de Evolution" -#: ../plugins/backup-restore/backup.c:445 +#: ../plugins/backup-restore/backup.c:446 msgid "Backing up Evolution Data" msgstr "Respaldando los datos de Evolution" -#: ../plugins/backup-restore/backup.c:446 +#: ../plugins/backup-restore/backup.c:447 msgid "Please wait while Evolution is backing up your data." msgstr "Espere mientras Evolution respalda sus datos." -#: ../plugins/backup-restore/backup.c:448 +#: ../plugins/backup-restore/backup.c:449 msgid "Restoring Evolution Data" msgstr "Restaurando los datos de Evolution" -#: ../plugins/backup-restore/backup.c:449 +#: ../plugins/backup-restore/backup.c:450 msgid "Please wait while Evolution is restoring your data." msgstr "Espere mientras Evolution restaura sus datos." -#: ../plugins/backup-restore/backup.c:467 +#: ../plugins/backup-restore/backup.c:468 msgid "This may take a while depending on the amount of data in your account." msgstr "" "Esto puede llevar un tiempo dependiendo de la cantidad de datos en su cuenta." @@ -15270,40 +15273,40 @@ msgstr "R_estaurar ajustes…" msgid "_Backup Settings..." msgstr "_Respaldar ajustes…" -#: ../plugins/bbdb/bbdb.c:621 ../plugins/bbdb/bbdb.c:630 +#: ../plugins/bbdb/bbdb.c:620 ../plugins/bbdb/bbdb.c:629 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1 msgid "Automatic Contacts" msgstr "Contactos automáticos" #. Enable BBDB checkbox -#: ../plugins/bbdb/bbdb.c:645 +#: ../plugins/bbdb/bbdb.c:644 msgid "Create _address book entries when sending mails" msgstr "" "Crear entradas _automáticamente en la libreta de direcciones al enviar " "correos" -#: ../plugins/bbdb/bbdb.c:651 +#: ../plugins/bbdb/bbdb.c:650 msgid "Select Address book for Automatic Contacts" msgstr "Seleccione la libreta para contactos automáticos" -#: ../plugins/bbdb/bbdb.c:666 +#: ../plugins/bbdb/bbdb.c:665 msgid "Instant Messaging Contacts" msgstr "Contactos de mensajería instantánea" #. Enable Gaim Checkbox -#: ../plugins/bbdb/bbdb.c:681 +#: ../plugins/bbdb/bbdb.c:680 msgid "Synchronize contact info and images from Pidgin buddy list" msgstr "" "Sincronizar información e imágenes de contactos desde la lista de contactos " "de Pidgin" -#: ../plugins/bbdb/bbdb.c:687 +#: ../plugins/bbdb/bbdb.c:686 msgid "Select Address book for Pidgin buddy list" msgstr "" "Seleccione la libreta de direcciones para la lista de contactos de Pidgin" #. Synchronize now button. -#: ../plugins/bbdb/bbdb.c:698 +#: ../plugins/bbdb/bbdb.c:697 msgid "Synchronize with _buddy list now" msgstr "Sincronizar con la lista de _contactos de MI ahora" @@ -15531,7 +15534,7 @@ msgid "Do you want to make Evolution your default e-mail client?" msgstr "¿Quiere que Evolution sea su cliente de correo predeterminado?" #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2 -#: ../shell/main.c:599 +#: ../shell/main.c:601 msgid "Evolution" msgstr "Evolution" @@ -15854,7 +15857,7 @@ msgstr "Permisos para %s" #. To translators: This is a part of the message to be sent to the delegatee #. summarizing the permissions assigned to him. #. -#: ../plugins/exchange-operations/exchange-delegates-user.c:329 +#: ../plugins/exchange-operations/exchange-delegates-user.c:330 msgid "" "This message was sent automatically by Evolution to inform you that you have " "been designated as a delegate. You can now send messages on my behalf." @@ -15864,25 +15867,25 @@ msgstr "" #. To translators: Another chunk of the same message. #. -#: ../plugins/exchange-operations/exchange-delegates-user.c:334 +#: ../plugins/exchange-operations/exchange-delegates-user.c:335 msgid "You have been given the following permissions on my folders:" msgstr "Se le han otorgado los siguientes permisos sobre mis carpetas:" #. To translators: This message is included if the delegatee has been given access #. to the private items. #. -#: ../plugins/exchange-operations/exchange-delegates-user.c:352 +#: ../plugins/exchange-operations/exchange-delegates-user.c:355 msgid "You are also permitted to see my private items." msgstr "También se le permite ver mis elementos privados." #. To translators: This message is included if the delegatee has not been given access #. to the private items. #. -#: ../plugins/exchange-operations/exchange-delegates-user.c:359 +#: ../plugins/exchange-operations/exchange-delegates-user.c:362 msgid "However you are not permitted to see my private items." msgstr "No obstante no se le permite ver mis elementos privados." -#: ../plugins/exchange-operations/exchange-delegates-user.c:391 +#: ../plugins/exchange-operations/exchange-delegates-user.c:394 #, c-format msgid "You have been designated as a delegate for %s" msgstr "Ha sido designado como delegado para %s" @@ -15980,7 +15983,7 @@ msgstr "_Resumir permisos" #. Translators: This is used for permissions for for the folder Tasks. #: ../plugins/exchange-operations/exchange-delegates.glade.h:20 -#: ../plugins/itip-formatter/itip-view.c:1912 +#: ../plugins/itip-formatter/itip-view.c:1915 msgid "_Tasks:" msgstr "_Tareas:" @@ -16098,8 +16101,8 @@ msgstr "Añadir usuario:" #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403 #: ../plugins/exchange-operations/exchange-send-options.c:410 -#: ../plugins/groupwise-features/proxy.c:935 -#: ../plugins/groupwise-features/share-folder.c:714 +#: ../plugins/groupwise-features/proxy.c:936 +#: ../plugins/groupwise-features/share-folder.c:718 msgid "Add User" msgstr "Añadir usuario" @@ -16615,9 +16618,6 @@ msgid "External Editor" msgstr "Editor externo" #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2 -#| msgid "" -#| "A plugin for using an external editor as the composer. You can send only " -#| "plain-text messages." msgid "Use an external editor to compose plain-text mail messages." msgstr "Usar un editor externo para editar mensajes de correo en texto plano." @@ -16866,7 +16866,6 @@ msgid "Add Send Options to GroupWise messages" msgstr "Añadir opciones de envío a los mensajes de GroupWise" #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1 -#| msgid "A plugin for the features in GroupWise accounts." msgid "Fine-tune your GroupWise accounts." msgstr "Configurar las cuentas GroupWise." @@ -16940,7 +16939,6 @@ msgid "Accept Tentatively" msgstr "Aceptar provisionalmente" #: ../plugins/groupwise-features/process-meeting.c:322 -#| msgid "_Delegate Meeting..." msgid "Rese_nd Meeting..." msgstr "Reen_viar reunión…" @@ -17040,10 +17038,10 @@ msgstr "Nombre de la cuenta" msgid "Proxy Login" msgstr "Sesión proxy" -#: ../plugins/groupwise-features/proxy-login.c:206 -#: ../plugins/groupwise-features/proxy-login.c:248 -#: ../plugins/groupwise-features/proxy.c:489 -#: ../plugins/groupwise-features/send-options.c:85 +#: ../plugins/groupwise-features/proxy-login.c:207 +#: ../plugins/groupwise-features/proxy-login.c:250 +#: ../plugins/groupwise-features/proxy.c:490 +#: ../plugins/groupwise-features/send-options.c:86 #, c-format msgid "%sEnter password for %s (user %s)" msgstr "%s Introduzca la contraseña para %s (usuario %s)" @@ -17051,28 +17049,28 @@ msgstr "%s Introduzca la contraseña para %s (usuario %s)" #. 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 -#: ../plugins/groupwise-features/proxy-login.c:510 +#: ../plugins/groupwise-features/proxy-login.c:512 msgid "_Proxy Login..." msgstr "Sesión _proxy…" #. 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 -#: ../plugins/groupwise-features/proxy.c:690 +#: ../plugins/groupwise-features/proxy.c:691 msgid "The Proxy tab will be available only when the account is online." msgstr "" "La solapa del Proxy estará disponible sólo cuando la cuenta esté conectada." #. 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 -#: ../plugins/groupwise-features/proxy.c:696 +#: ../plugins/groupwise-features/proxy.c:697 msgid "The Proxy tab will be available only when the account is enabled." msgstr "" "La solapa del Proxy estará disponible sólo cuando la cuenta esté activada." -#: ../plugins/groupwise-features/send-options.c:214 +#: ../plugins/groupwise-features/send-options.c:215 msgid "Advanced send options" msgstr "Opciones de envío avanzadas" #: ../plugins/groupwise-features/share-folder-common.c:320 -#: ../plugins/groupwise-features/share-folder.c:749 +#: ../plugins/groupwise-features/share-folder.c:753 msgid "Users" msgstr "Usuarios" @@ -17088,15 +17086,15 @@ msgstr "Carpeta compartida _nueva…" msgid "Sharing" msgstr "Compartir" -#: ../plugins/groupwise-features/share-folder.c:532 +#: ../plugins/groupwise-features/share-folder.c:536 msgid "Custom Notification" msgstr "Notificación personalizada" -#: ../plugins/groupwise-features/share-folder.c:754 +#: ../plugins/groupwise-features/share-folder.c:758 msgid "Add " msgstr "Añadir " -#: ../plugins/groupwise-features/share-folder.c:760 +#: ../plugins/groupwise-features/share-folder.c:764 msgid "Modify" msgstr "Modificar" @@ -17254,7 +17252,6 @@ msgid "Synchronize to iPod" msgstr "Sincronizar con iPod" #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2 -#| msgid "Synchronize to iPod" msgid "Synchronize your data with your Apple iPod." msgstr "Sincronizar sus datos con su iPod de Apple." @@ -17295,7 +17292,6 @@ msgid "Unable to find this memo in any memo list" msgstr "No se puede encontrar esta nota en ninguna lista de notas" #: ../plugins/itip-formatter/itip-formatter.c:839 -#| msgid "Opening calendar" msgid "Opening the calendar. Please wait.." msgstr "Abriendo el calendario. Espere..." @@ -17445,7 +17441,7 @@ msgid "_Delete message after acting" msgstr "_Borrar el mensaje después de actuar" #: ../plugins/itip-formatter/itip-formatter.c:2571 -#: ../plugins/itip-formatter/itip-formatter.c:2603 +#: ../plugins/itip-formatter/itip-formatter.c:2604 msgid "Conflict Search" msgstr "Búsqueda de conflictos" @@ -17837,106 +17833,105 @@ msgid "%s has canceled the following shared memo:" msgstr "%s ha cancelado la siguiente nota compartida:" #. Everything gets the open button -#: ../plugins/itip-formatter/itip-view.c:821 +#: ../plugins/itip-formatter/itip-view.c:824 msgid "_Open Calendar" msgstr "_Abrir calendario" -#: ../plugins/itip-formatter/itip-view.c:827 -#: ../plugins/itip-formatter/itip-view.c:831 -#: ../plugins/itip-formatter/itip-view.c:837 -#: ../plugins/itip-formatter/itip-view.c:854 -#: ../plugins/itip-formatter/itip-view.c:859 +#: ../plugins/itip-formatter/itip-view.c:830 +#: ../plugins/itip-formatter/itip-view.c:834 +#: ../plugins/itip-formatter/itip-view.c:840 +#: ../plugins/itip-formatter/itip-view.c:857 +#: ../plugins/itip-formatter/itip-view.c:862 msgid "_Decline" msgstr "_Rehusar" -#: ../plugins/itip-formatter/itip-view.c:828 -#: ../plugins/itip-formatter/itip-view.c:833 -#: ../plugins/itip-formatter/itip-view.c:840 -#: ../plugins/itip-formatter/itip-view.c:856 -#: ../plugins/itip-formatter/itip-view.c:861 +#: ../plugins/itip-formatter/itip-view.c:831 +#: ../plugins/itip-formatter/itip-view.c:836 +#: ../plugins/itip-formatter/itip-view.c:843 +#: ../plugins/itip-formatter/itip-view.c:859 +#: ../plugins/itip-formatter/itip-view.c:864 msgid "_Accept" msgstr "_Aceptar" -#: ../plugins/itip-formatter/itip-view.c:831 +#: ../plugins/itip-formatter/itip-view.c:834 msgid "_Decline all" msgstr "_Rehusar todo" -#: ../plugins/itip-formatter/itip-view.c:832 +#: ../plugins/itip-formatter/itip-view.c:835 msgid "_Tentative all" msgstr "_Provisional todo" -#: ../plugins/itip-formatter/itip-view.c:832 -#: ../plugins/itip-formatter/itip-view.c:838 -#: ../plugins/itip-formatter/itip-view.c:855 -#: ../plugins/itip-formatter/itip-view.c:860 +#: ../plugins/itip-formatter/itip-view.c:835 +#: ../plugins/itip-formatter/itip-view.c:841 +#: ../plugins/itip-formatter/itip-view.c:858 +#: ../plugins/itip-formatter/itip-view.c:863 msgid "_Tentative" msgstr "_Provisional" -#: ../plugins/itip-formatter/itip-view.c:833 +#: ../plugins/itip-formatter/itip-view.c:836 msgid "_Accept all" msgstr "_Aceptar todo" #. FIXME Is this really the right button? -#: ../plugins/itip-formatter/itip-view.c:844 +#: ../plugins/itip-formatter/itip-view.c:847 msgid "_Send Information" msgstr "_Enviar información" #. FIXME Is this really the right button? -#: ../plugins/itip-formatter/itip-view.c:848 +#: ../plugins/itip-formatter/itip-view.c:851 msgid "_Update Attendee Status" msgstr "_Actualizar el estado del participante" -#: ../plugins/itip-formatter/itip-view.c:851 +#: ../plugins/itip-formatter/itip-view.c:854 msgid "_Update" msgstr "_Actualizar" #. Start time -#: ../plugins/itip-formatter/itip-view.c:1031 +#: ../plugins/itip-formatter/itip-view.c:1034 msgid "Start time:" msgstr "Hora de inicio:" #. End time -#: ../plugins/itip-formatter/itip-view.c:1042 +#: ../plugins/itip-formatter/itip-view.c:1045 msgid "End time:" msgstr "Hora de fin:" #. Comment -#: ../plugins/itip-formatter/itip-view.c:1062 -#: ../plugins/itip-formatter/itip-view.c:1116 +#: ../plugins/itip-formatter/itip-view.c:1065 +#: ../plugins/itip-formatter/itip-view.c:1119 msgid "Comment:" msgstr "Comentario:" -#: ../plugins/itip-formatter/itip-view.c:1101 +#: ../plugins/itip-formatter/itip-view.c:1104 msgid "Send _reply to sender" msgstr "_Responder al remitente" -#: ../plugins/itip-formatter/itip-view.c:1131 +#: ../plugins/itip-formatter/itip-view.c:1134 msgid "Send _updates to attendees" msgstr "Mandar _actualizaciones a los participantes" -#: ../plugins/itip-formatter/itip-view.c:1140 +#: ../plugins/itip-formatter/itip-view.c:1143 msgid "_Apply to all instances" msgstr "_Aplicar a todas las instancias" -#: ../plugins/itip-formatter/itip-view.c:1149 +#: ../plugins/itip-formatter/itip-view.c:1152 msgid "Show time as _free" msgstr "Mostrar hora como _libre" -#: ../plugins/itip-formatter/itip-view.c:1152 +#: ../plugins/itip-formatter/itip-view.c:1155 msgid "_Preserve my reminder" msgstr "Conser_var mi recordatorio" #. To Translators: This is a check box to inherit a reminder. -#: ../plugins/itip-formatter/itip-view.c:1158 +#: ../plugins/itip-formatter/itip-view.c:1161 msgid "_Inherit reminder" msgstr "_Heredar recordatorio" -#: ../plugins/itip-formatter/itip-view.c:1914 +#: ../plugins/itip-formatter/itip-view.c:1917 msgid "_Memos:" msgstr "_Notas:" #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1 -#| msgid "Displays text/calendar parts in messages." msgid "Display \"text/calendar\" MIME parts in mail messages." msgstr "Mostrar las partes MIME de texto/calendario en los mensajes." @@ -18135,7 +18130,6 @@ msgid "Mail Notification" msgstr "Notificación de correo" #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2 -#| msgid "Play sound when new messages arrive." msgid "Notifies you when new mail messages arrive." msgstr "Le notifica cuando llega un mensaje de correo nuevo." @@ -18179,19 +18173,16 @@ msgid "Cannot get source list. %s" msgstr "No se pudo obtener la lista de origen. %s" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1 -#| msgid "Convert the selected message to a new task" msgid "Convert a mail message to a task." msgstr "Convertir el mensaje de correo en una tarea." #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5 -#| msgid "Con_vert to Task" msgid "Convert to a Mem_o" msgstr "Convertir en _nota" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6 -#| msgid "Con_vert to Meeting" msgid "Convert to a _Meeting" msgstr "Convertir en re_unión" @@ -18202,12 +18193,10 @@ msgstr "Convertir en ta_rea" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8 -#| msgid "Con_vert to Meeting" msgid "Convert to an _Event" msgstr "Convertir en ac_ontecimiento" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6 -#| msgid "Mail to task" msgid "Mail-to-Task" msgstr "Correo a tarea" @@ -18249,9 +18238,6 @@ msgid "Mailing _List" msgstr "_Lista de correo" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6 -#| msgid "" -#| "Provide actions for common mailing list commands (subscribe, " -#| "unsubscribe...)." msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)." msgstr "" "Realizar acciones típicas de listas de correo (suscribirse, desuscribirse…)." @@ -18430,7 +18416,6 @@ msgid "Mark Me_ssages as Read" msgstr "Marcar los mensajes como _leídos" #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3 -#| msgid "Mark all messages in the folder as read" msgid "Mark all messages in a folder as read." msgstr "Marcar todos los mensajes en una carpeta como leídos." @@ -18443,7 +18428,6 @@ msgid "Support plugins written in Mono." msgstr "Soportar complementos escritos en Mono." #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1 -#| msgid "Change Evolution's settings" msgid "Manage your Evolution plugins." msgstr "Gestionar sus complementos de Evolution" @@ -18488,7 +18472,6 @@ msgid "Plain Text Mode" msgstr "Modo de texto sin formato" #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3 -#| msgid "Prefer plain-text" msgid "Prefer Plain Text" msgstr "Preferir texto plano" @@ -18560,7 +18543,6 @@ msgid "Locations" msgstr "Lugares" #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3 -#| msgid "Allows calendars to be published to the web" msgid "Publish calendars to the web." msgstr "Publicar calendarios en la web." @@ -18707,11 +18689,11 @@ msgid "Could not publish calendar: Calendar backend no longer exists" msgstr "" "No se pudo publicar el calendario: El «backend» del calendario ya no existe." -#: ../plugins/publish-calendar/url-editor-dialog.c:480 +#: ../plugins/publish-calendar/url-editor-dialog.c:481 msgid "New Location" msgstr "Ubicación nueva" -#: ../plugins/publish-calendar/url-editor-dialog.c:482 +#: ../plugins/publish-calendar/url-editor-dialog.c:483 msgid "Edit Location" msgstr "Editar ubicación" @@ -18775,21 +18757,19 @@ msgstr "Falló la tubería hacia SpamAssasin, código de error: %d" msgid "SpamAssassin is not available." msgstr "SpamAssasin no está disponible." -#: ../plugins/sa-junk-plugin/em-junk-filter.c:904 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:910 msgid "This will make SpamAssassin more reliable, but slower" msgstr "Esto hará que SpamAssasin sea más exacto, pero más lento" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:910 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:916 msgid "I_nclude remote tests" msgstr "I_ncluir tests remotos" #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1 -#| msgid "Filters junk messages using Bogofilter." msgid "Filter junk messages using SpamAssassin." msgstr "Filtrar mensajes SPAM usando SpamAssasin." #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2 -#| msgid "SpamAssassin junk plugin" msgid "SpamAssassin Junk Filter" msgstr "Filtro de SPAM SpamAssassin" @@ -18878,7 +18858,6 @@ msgid "Save Selected" msgstr "Guardar seleccionados" #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2 -#| msgid "Saves selected calendar or tasks list to disk." msgid "Save a calendar or task list to disk." msgstr "Guardar un calendario o una lista de tareas al disco." @@ -18904,12 +18883,10 @@ msgid "Select destination file" msgstr "Seleccione el archivo de destino" #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1 -#| msgid "Selects a single calendar or task source for viewing." msgid "Quickly select a single calendar or task list for viewing." msgstr "Seleccionar rápidamente un sólo calendario o tarea para verlo." #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2 -#| msgid "Select one source" msgid "Select One Source" msgstr "Seleccionar un origen" @@ -18981,7 +18958,6 @@ msgid "Please wait" msgstr "Por favor espere" #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1 -#| msgid "Thread messages by subject" msgid "Sort mail message threads by subject." msgstr "Ordenar conversaciones de mensajes de correo por asunto." @@ -19028,17 +19004,14 @@ msgstr "" "Decodificar adjuntos TNEF (.dat de correo de Windows) de Microsoft Outlook." #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2 -#| msgid "TNEF Attachment decoder" msgid "TNEF Decoder" msgstr "Decodificador TNEF" #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1 -#| msgid "Multiple vCards" msgid "Inline vCards" msgstr "vCards en línea" #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2 -#| msgid "Show \"Cc\" field when sending a mail message" msgid "Show vCards directly in mail messages." msgstr "Mostrar vCards directamente en los mensajes de correo." @@ -19052,27 +19025,21 @@ msgid "Show Compact vCard" msgstr "Mostrar vCard compacta" #: ../plugins/vcard-inline/vcard-inline.c:218 -#| msgid "There is one other contact." -#| msgid_plural "There are %d other contacts." msgid "There is one other contact." msgstr "Hay otro contacto más." #: ../plugins/vcard-inline/vcard-inline.c:227 #, c-format -#| msgid "There is one other contact." -#| msgid_plural "There are %d other contacts." msgid "There is %d other contact." msgid_plural "There are %d other contacts." msgstr[0] "Hay %d contacto más." msgstr[1] "Hay otros %d contactos." #: ../plugins/vcard-inline/vcard-inline.c:248 -#| msgid "Save in address book" msgid "Save in Address Book" msgstr "Guardar en la libreta de direcciones" #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1 -#| msgid "WebDAV contacts" msgid "Add WebDAV contacts to Evolution." msgstr "Añadir contactos WebDAV a Evolution." @@ -19254,7 +19221,7 @@ msgstr "La barra lateral es visible" msgid "Skip development warning dialog" msgstr "Saltar el diálogo de advertencia de desarrollo" -#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:483 +#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:485 msgid "Start in offline mode" msgstr "Iniciar en modo desconectado" @@ -19579,9 +19546,9 @@ msgstr "No es posible registrar en OAF" msgid "Configuration Database not found" msgstr "No se encontró la base de datos de configuración" -#: ../shell/e-user-creatable-items-handler.c:677 -#: ../shell/e-user-creatable-items-handler.c:687 -#: ../shell/e-user-creatable-items-handler.c:692 +#: ../shell/e-user-creatable-items-handler.c:678 +#: ../shell/e-user-creatable-items-handler.c:688 +#: ../shell/e-user-creatable-items-handler.c:693 msgid "New" msgstr "Nuevo" @@ -19637,7 +19604,7 @@ msgstr "" "importación de archivos externos dentro de Evolution." #. Preview/Alpha/Beta version warning message -#: ../shell/main.c:221 +#: ../shell/main.c:222 #, no-c-format msgid "" "Hi. Thanks for taking the time to download this preview release\n" @@ -19673,7 +19640,7 @@ msgstr "" "Esperamos que disfrute del resultado de nuestro duro trabajo y \n" "esperamos su contribución.\n" -#: ../shell/main.c:245 +#: ../shell/main.c:246 msgid "" "Thanks\n" "The Evolution Team\n" @@ -19681,43 +19648,43 @@ msgstr "" "Gracias\n" "El equipo de Evolution\n" -#: ../shell/main.c:252 +#: ../shell/main.c:253 msgid "Do not tell me again" msgstr "No preguntarme más veces" -#: ../shell/main.c:481 +#: ../shell/main.c:483 msgid "Start Evolution activating the specified component" msgstr "Iniciar Evolution activando el componente especificado" -#: ../shell/main.c:485 +#: ../shell/main.c:487 msgid "Start in online mode" msgstr "Iniciar en modo conectado" -#: ../shell/main.c:488 +#: ../shell/main.c:490 msgid "Forcibly shut down all Evolution components" msgstr "Forzar el cierre de todos los componentes de Evolution" -#: ../shell/main.c:492 +#: ../shell/main.c:494 msgid "Forcibly re-migrate from Evolution 1.4" msgstr "Fuerza la reemigración desde Evolution 1.4" -#: ../shell/main.c:495 +#: ../shell/main.c:497 msgid "Send the debugging output of all components to a file." msgstr "Envía la salida de depuración de todos los componentes a un archivo." -#: ../shell/main.c:497 +#: ../shell/main.c:499 msgid "Disable loading of any plugins." msgstr "Desactivar la carga de cualquier complemento." -#: ../shell/main.c:499 +#: ../shell/main.c:501 msgid "Disable preview pane of Mail, Contacts and Tasks." msgstr "Desactivar la vista previa del correo, contactos y tareas." -#: ../shell/main.c:586 +#: ../shell/main.c:588 msgid "- The Evolution PIM and Email Client" msgstr "El cliente de correo-e y GIP Evolution" -#: ../shell/main.c:614 +#: ../shell/main.c:616 #, c-format msgid "" "%s: --online and --offline cannot be used together.\n" @@ -21735,11 +21702,11 @@ msgid "With _Status" msgstr "Con _estado" #. Put the "UTC" entry at the top of the combo's list. -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:426 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:777 msgid "UTC" msgstr "UTC" @@ -21769,19 +21736,19 @@ msgstr "" "una zona horaria.\n" "Use el botón derecho del ratón para reducir el mapa al tamaño anterior." -#: ../widgets/menus/gal-define-views-dialog.c:76 +#: ../widgets/menus/gal-define-views-dialog.c:74 #: ../widgets/menus/gal-define-views-model.c:185 msgid "Collection" msgstr "Colección" -#: ../widgets/menus/gal-define-views-dialog.c:358 +#: ../widgets/menus/gal-define-views-dialog.c:356 #: ../widgets/menus/gal-define-views.glade.h:4 #, no-c-format msgid "Define Views for %s" msgstr "Definir vistas para %s" +#: ../widgets/menus/gal-define-views-dialog.c:364 #: ../widgets/menus/gal-define-views-dialog.c:366 -#: ../widgets/menus/gal-define-views-dialog.c:368 msgid "Define Views" msgstr "Definir vistas" @@ -21852,11 +21819,11 @@ msgstr "Guardar la vista actual personalizada" msgid "Create or edit views" msgstr "Crear o editar vistas" -#: ../widgets/menus/gal-view-new-dialog.c:70 +#: ../widgets/menus/gal-view-new-dialog.c:68 msgid "Factory" msgstr "Fábrica" -#: ../widgets/menus/gal-view-new-dialog.c:105 +#: ../widgets/menus/gal-view-new-dialog.c:103 msgid "Define New View" msgstr "Definir vistas nuevas" @@ -22055,21 +22022,21 @@ msgstr "Y1" msgid "Y2" msgstr "Y2" -#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1416 +#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1416 #: ../widgets/table/e-table-group-container.c:1003 #: ../widgets/table/e-table-group-leaf.c:649 #: ../widgets/table/e-table-item.c:3070 msgid "Minimum width" msgstr "Ancho mínimo" -#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1417 +#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1417 #: ../widgets/table/e-table-group-container.c:1004 #: ../widgets/table/e-table-group-leaf.c:650 #: ../widgets/table/e-table-item.c:3071 msgid "Minimum Width" msgstr "Ancho mínimo" -#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104 +#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102 msgid "Spacing" msgstr "Espaciado" @@ -22527,7 +22494,7 @@ msgstr "%s (%d%% completado)" msgid "Click here to go to URL" msgstr "Pulse aquí para ir a la URL" -#: ../widgets/table/e-cell-combo.c:175 +#: ../widgets/table/e-cell-combo.c:173 msgid "popup list" msgstr "lista emergente" @@ -22587,12 +22554,12 @@ msgstr "Sin ordenar" msgid "No grouping" msgstr "Sin agrupar" -#: ../widgets/table/e-table-config.c:643 +#: ../widgets/table/e-table-config.c:644 #: ../widgets/table/e-table-config.glade.h:11 msgid "Show Fields" msgstr "Mostrar campos" -#: ../widgets/table/e-table-config.c:664 +#: ../widgets/table/e-table-config.c:665 msgid "Available Fields" msgstr "Campos disponibles" @@ -22674,7 +22641,7 @@ msgstr "_Mostrar estos campos en orden:" msgid "_Sort..." msgstr "_Ordenar…" -#: ../widgets/table/e-table-field-chooser-dialog.c:116 +#: ../widgets/table/e-table-field-chooser-dialog.c:114 msgid "Add a column..." msgstr "Añadir una columna…" -- cgit v1.2.3 From ad02694cc1b61e3e8989bf505743430ec2e6b416 Mon Sep 17 00:00:00 2001 From: Jorge Gonzalez Date: Tue, 2 Jun 2009 20:20:48 +0200 Subject: Updated Spanish translation --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 4e077fc8bb..3924075d20 100644 --- a/po/es.po +++ b/po/es.po @@ -5754,7 +5754,7 @@ msgid "" msgstr "" "durante\n" "hasta\n" -"siempre\n" +"siempre" #: ../calendar/gui/dialogs/send-comp.c:116 msgid "Send my alarms with this event" -- cgit v1.2.3 From 93ce399686756d80238c0307f3d0539a4a8d1174 Mon Sep 17 00:00:00 2001 From: Jorge Gonzalez Date: Tue, 2 Jun 2009 20:24:25 +0200 Subject: Updated Spanish translation --- po/es.po | 251 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 127 insertions(+), 124 deletions(-) diff --git a/po/es.po b/po/es.po index 3924075d20..166e8360a4 100644 --- a/po/es.po +++ b/po/es.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: evolution.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=evolution\n" -"POT-Creation-Date: 2009-05-27 04:24+0000\n" -"PO-Revision-Date: 2009-06-01 09:49+0200\n" +"POT-Creation-Date: 2009-06-02 18:21+0000\n" +"PO-Revision-Date: 2009-06-02 20:23+0200\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -652,8 +652,8 @@ msgstr "Gestione sus certificados S/MIME aquí" #: ../calendar/gui/calendar-component.c:192 #: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:475 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091 -#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:204 -#: ../mail/em-folder-tree-model.c:206 ../mail/em-migrate.c:2891 +#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:192 +#: ../mail/em-folder-tree-model.c:194 ../mail/em-migrate.c:2891 #: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217 #: ../mail/message-list.c:1517 msgid "On This Computer" @@ -932,7 +932,7 @@ msgstr "Guardar como vCard…" #: ../addressbook/gui/component/addressbook-view.c:951 #: ../calendar/gui/calendar-component.c:629 #: ../calendar/gui/memos-component.c:481 ../calendar/gui/tasks-component.c:473 -#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:39 +#: ../mail/em-folder-tree.c:2105 ../ui/evolution-mail-list.xml.h:39 msgid "_Rename..." msgstr "_Renombrar…" @@ -942,7 +942,7 @@ msgstr "_Renombrar…" #: ../calendar/gui/e-calendar-table.c:1614 #: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:952 #: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:476 -#: ../mail/em-folder-tree.c:2052 ../mail/em-folder-view.c:1341 +#: ../mail/em-folder-tree.c:2102 ../mail/em-folder-view.c:1341 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16 #: ../ui/evolution-tasks.xml.h:24 @@ -952,7 +952,7 @@ msgstr "_Borrar" #: ../addressbook/gui/component/addressbook-view.c:957 #: ../calendar/gui/calendar-component.c:637 #: ../calendar/gui/memos-component.c:489 ../calendar/gui/tasks-component.c:481 -#: ../mail/em-folder-tree.c:2061 ../ui/evolution-addressbook.xml.h:59 +#: ../mail/em-folder-tree.c:2111 ../ui/evolution-addressbook.xml.h:59 #: ../ui/evolution-mail-list.xml.h:38 msgid "_Properties" msgstr "_Propiedades" @@ -1925,7 +1925,7 @@ msgstr "Cor_tar" #: ../addressbook/gui/widgets/e-addressbook-view.c:952 #: ../calendar/gui/e-calendar-table.c:1600 #: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:943 -#: ../mail/em-folder-tree.c:928 ../mail/em-folder-view.c:1326 +#: ../mail/em-folder-tree.c:972 ../mail/em-folder-view.c:1326 #: ../mail/message-list.c:2105 ../ui/evolution-addressbook.xml.h:46 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23 @@ -2260,7 +2260,7 @@ msgid "_Open Link in Browser" msgstr "_Abrir enlace en el navegador" #: ../addressbook/gui/widgets/eab-contact-display.c:170 -#: ../mail/em-folder-view.c:2734 +#: ../mail/em-folder-view.c:2698 msgid "_Copy Link Location" msgstr "_Copiar dirección del enlace" @@ -3413,7 +3413,7 @@ msgid "_Dismiss" msgstr "_Descartar" #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6 -#: ../calendar/gui/dialogs/comp-editor.c:1019 +#: ../calendar/gui/dialogs/comp-editor.c:1029 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15 @@ -4177,7 +4177,7 @@ msgstr "Calendario _nuevo" #: ../calendar/gui/calendar-component.c:628 #: ../calendar/gui/memos-component.c:480 ../calendar/gui/tasks-component.c:472 -#: ../mail/em-folder-tree.c:2047 +#: ../mail/em-folder-tree.c:2097 msgid "_Copy..." msgstr "_Copiar…" @@ -4985,212 +4985,216 @@ msgstr " (Vence " msgid "Due " msgstr "Vence " -#: ../calendar/gui/dialogs/comp-editor.c:245 -#: ../calendar/gui/dialogs/comp-editor.c:2676 ../mail/em-utils.c:373 -#: ../plugins/prefer-plain/prefer-plain.c:91 -msgid "attachment" -msgstr "adjunto" +#: ../calendar/gui/dialogs/comp-editor.c:221 +#| msgid "Could not save the attachment" +msgid "Could not save attachments" +msgstr "No se pudieron guardar los adjuntos" -#: ../calendar/gui/dialogs/comp-editor.c:474 +#: ../calendar/gui/dialogs/comp-editor.c:484 msgid "Could not update object" msgstr "No es posible actualizar el objeto" -#: ../calendar/gui/dialogs/comp-editor.c:563 +#: ../calendar/gui/dialogs/comp-editor.c:573 msgid "Edit Appointment" msgstr "Editar cita" -#: ../calendar/gui/dialogs/comp-editor.c:570 +#: ../calendar/gui/dialogs/comp-editor.c:580 #, c-format msgid "Meeting - %s" msgstr "Reunión: %s" -#: ../calendar/gui/dialogs/comp-editor.c:572 +#: ../calendar/gui/dialogs/comp-editor.c:582 #, c-format msgid "Appointment - %s" msgstr "Cita: %s" -#: ../calendar/gui/dialogs/comp-editor.c:578 +#: ../calendar/gui/dialogs/comp-editor.c:588 #, c-format msgid "Assigned Task - %s" msgstr "Tarea asignada: %s" -#: ../calendar/gui/dialogs/comp-editor.c:580 +#: ../calendar/gui/dialogs/comp-editor.c:590 #, c-format msgid "Task - %s" msgstr "Tarea: %s" -#: ../calendar/gui/dialogs/comp-editor.c:585 +#: ../calendar/gui/dialogs/comp-editor.c:595 #, c-format msgid "Memo - %s" msgstr "Nota - %s" -#: ../calendar/gui/dialogs/comp-editor.c:601 +#: ../calendar/gui/dialogs/comp-editor.c:611 msgid "No Summary" msgstr "Sin resumen" -#: ../calendar/gui/dialogs/comp-editor.c:743 +#: ../calendar/gui/dialogs/comp-editor.c:753 msgid "Keep original item?" msgstr "¿Mantener el elemento original?" -#: ../calendar/gui/dialogs/comp-editor.c:949 +#: ../calendar/gui/dialogs/comp-editor.c:959 msgid "Click here to close the current window" msgstr "Pulse aquí para cerrar la ventana actual" -#: ../calendar/gui/dialogs/comp-editor.c:956 +#: ../calendar/gui/dialogs/comp-editor.c:966 msgid "Copy selected text to the clipboard" msgstr "Copia el texto seleccionado al portapapeles" -#: ../calendar/gui/dialogs/comp-editor.c:963 +#: ../calendar/gui/dialogs/comp-editor.c:973 msgid "Cut selected text to the clipboard" msgstr "Corta el texto seleccionado al portapapeles" -#: ../calendar/gui/dialogs/comp-editor.c:970 +#: ../calendar/gui/dialogs/comp-editor.c:980 msgid "Click here to view help available" msgstr "Pulse aquí para ver la ayuda disponible" -#: ../calendar/gui/dialogs/comp-editor.c:977 +#: ../calendar/gui/dialogs/comp-editor.c:987 msgid "Paste text from the clipboard" msgstr "Pega texto desde el portapapeles" -#: ../calendar/gui/dialogs/comp-editor.c:998 +#: ../calendar/gui/dialogs/comp-editor.c:1008 msgid "Click here to save the current window" msgstr "Pulse aquí para guardar la vista actual" -#: ../calendar/gui/dialogs/comp-editor.c:1005 +#: ../calendar/gui/dialogs/comp-editor.c:1015 msgid "Select all text" msgstr "Selecciona todo el texto" -#: ../calendar/gui/dialogs/comp-editor.c:1012 +#: ../calendar/gui/dialogs/comp-editor.c:1022 msgid "_Classification" msgstr "_Clasificación" -#: ../calendar/gui/dialogs/comp-editor.c:1026 +#: ../calendar/gui/dialogs/comp-editor.c:1036 #: ../mail/mail-signature-editor.c:208 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43 msgid "_File" msgstr "_Archivo" -#: ../calendar/gui/dialogs/comp-editor.c:1033 +#: ../calendar/gui/dialogs/comp-editor.c:1043 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24 #: ../ui/evolution.xml.h:46 msgid "_Help" msgstr "Ay_uda" -#: ../calendar/gui/dialogs/comp-editor.c:1040 +#: ../calendar/gui/dialogs/comp-editor.c:1050 msgid "_Insert" msgstr "_Insertar" -#: ../calendar/gui/dialogs/comp-editor.c:1047 +#: ../calendar/gui/dialogs/comp-editor.c:1057 msgid "_Options" msgstr "_Opciones" -#: ../calendar/gui/dialogs/comp-editor.c:1054 ../mail/em-folder-tree.c:2039 +#: ../calendar/gui/dialogs/comp-editor.c:1064 ../mail/em-folder-tree.c:2089 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30 #: ../ui/evolution.xml.h:55 msgid "_View" msgstr "_Ver" -#: ../calendar/gui/dialogs/comp-editor.c:1064 +#: ../calendar/gui/dialogs/comp-editor.c:1074 #: ../composer/e-composer-actions.c:315 msgid "_Attachment..." msgstr "_Adjunto…" -#: ../calendar/gui/dialogs/comp-editor.c:1066 +#: ../calendar/gui/dialogs/comp-editor.c:1076 msgid "Click here to attach a file" msgstr "Pulse aquí para adjuntar un archivo" -#: ../calendar/gui/dialogs/comp-editor.c:1074 +#: ../calendar/gui/dialogs/comp-editor.c:1084 msgid "_Categories" msgstr "_Categorías" -#: ../calendar/gui/dialogs/comp-editor.c:1076 +#: ../calendar/gui/dialogs/comp-editor.c:1086 msgid "Toggles whether to display categories" msgstr "Conmuta cuando se muestran las categorías" -#: ../calendar/gui/dialogs/comp-editor.c:1082 +#: ../calendar/gui/dialogs/comp-editor.c:1092 msgid "Time _Zone" msgstr "_Zona horaria" -#: ../calendar/gui/dialogs/comp-editor.c:1084 +#: ../calendar/gui/dialogs/comp-editor.c:1094 msgid "Toggles whether the time zone is displayed" msgstr "Conmuta cuando se muestra la «Zona horaria»" -#: ../calendar/gui/dialogs/comp-editor.c:1093 +#: ../calendar/gui/dialogs/comp-editor.c:1103 msgid "Pu_blic" msgstr "Pú_blico" -#: ../calendar/gui/dialogs/comp-editor.c:1095 +#: ../calendar/gui/dialogs/comp-editor.c:1105 msgid "Classify as public" msgstr "Clasificar como público" -#: ../calendar/gui/dialogs/comp-editor.c:1100 +#: ../calendar/gui/dialogs/comp-editor.c:1110 msgid "_Private" msgstr "_Privado" -#: ../calendar/gui/dialogs/comp-editor.c:1102 +#: ../calendar/gui/dialogs/comp-editor.c:1112 msgid "Classify as private" msgstr "Clasificar como privado" -#: ../calendar/gui/dialogs/comp-editor.c:1107 +#: ../calendar/gui/dialogs/comp-editor.c:1117 msgid "_Confidential" msgstr "_Confidencial" -#: ../calendar/gui/dialogs/comp-editor.c:1109 +#: ../calendar/gui/dialogs/comp-editor.c:1119 msgid "Classify as confidential" msgstr "Clasificar como confidencial" -#: ../calendar/gui/dialogs/comp-editor.c:1117 +#: ../calendar/gui/dialogs/comp-editor.c:1127 msgid "R_ole Field" msgstr "Campo «_Rol»" -#: ../calendar/gui/dialogs/comp-editor.c:1119 +#: ../calendar/gui/dialogs/comp-editor.c:1129 msgid "Toggles whether the Role field is displayed" msgstr "Conmuta cuando se muestra el campo «Rol»" -#: ../calendar/gui/dialogs/comp-editor.c:1125 +#: ../calendar/gui/dialogs/comp-editor.c:1135 msgid "_RSVP" msgstr "_Confirmar" -#: ../calendar/gui/dialogs/comp-editor.c:1127 +#: ../calendar/gui/dialogs/comp-editor.c:1137 msgid "Toggles whether the RSVP field is displayed" msgstr "Conmuta cuando se muestra el campo «Confirmar»" -#: ../calendar/gui/dialogs/comp-editor.c:1133 +#: ../calendar/gui/dialogs/comp-editor.c:1143 msgid "_Status Field" msgstr "Campo de _estado" -#: ../calendar/gui/dialogs/comp-editor.c:1135 +#: ../calendar/gui/dialogs/comp-editor.c:1145 msgid "Toggles whether the Status field is displayed" msgstr "Conmuta cuando se muestra el campo «Estado»" -#: ../calendar/gui/dialogs/comp-editor.c:1141 +#: ../calendar/gui/dialogs/comp-editor.c:1151 msgid "_Type Field" msgstr "Campo de _tipo" -#: ../calendar/gui/dialogs/comp-editor.c:1143 +#: ../calendar/gui/dialogs/comp-editor.c:1153 msgid "Toggles whether the Attendee Type is displayed" msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»" -#: ../calendar/gui/dialogs/comp-editor.c:1167 +#: ../calendar/gui/dialogs/comp-editor.c:1177 #: ../composer/e-composer-private.c:66 msgid "Recent _Documents" msgstr "_Documentos recientes" -#: ../calendar/gui/dialogs/comp-editor.c:1593 +#: ../calendar/gui/dialogs/comp-editor.c:1603 #: ../composer/e-composer-actions.c:518 msgid "Attach" msgstr "Adjuntar" -#: ../calendar/gui/dialogs/comp-editor.c:1856 -#: ../calendar/gui/dialogs/comp-editor.c:1905 -#: ../calendar/gui/dialogs/comp-editor.c:2707 +#: ../calendar/gui/dialogs/comp-editor.c:1866 +#: ../calendar/gui/dialogs/comp-editor.c:1915 +#: ../calendar/gui/dialogs/comp-editor.c:2765 msgid "Changes made to this item may be discarded if an update arrives" msgstr "" "Los cambios efectuados a este elemento pueden descartarse si llega una " "actualización por correo" -#: ../calendar/gui/dialogs/comp-editor.c:2736 +#: ../calendar/gui/dialogs/comp-editor.c:2734 ../mail/em-utils.c:373 +#: ../plugins/prefer-plain/prefer-plain.c:91 +msgid "attachment" +msgstr "adjunto" + +#: ../calendar/gui/dialogs/comp-editor.c:2794 msgid "Unable to use current version!" msgstr "Imposible usar la versión actual." @@ -5970,7 +5974,7 @@ msgid "I_mport to Tasks" msgstr "I_mportar a las tareas" #: ../calendar/gui/e-cal-component-memo-preview.c:69 -#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3250 +#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3214 #, c-format msgid "Click to open %s" msgstr "Pulse para abrir %s" @@ -10069,12 +10073,12 @@ msgstr "" "Ya existe una etiqueta con el mismo nombre en el servidor. Renombre la " "etiqueta." -#: ../e-util/gconf-bridge.c:1216 +#: ../e-util/gconf-bridge.c:1222 #, c-format msgid "GConf error: %s" msgstr "Error de GConf: %s" -#: ../e-util/gconf-bridge.c:1227 +#: ../e-util/gconf-bridge.c:1233 msgid "All further errors shown only on terminal." msgstr "En adelante todos los errores sólo se mostrarán en el terminal." @@ -11068,8 +11072,8 @@ msgid "Quota usage" msgstr "Uso de cuota" #. translators: standard local mailbox names -#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517 -#: ../mail/em-folder-tree.c:2524 ../mail/mail-component.c:168 +#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:520 +#: ../mail/em-folder-tree.c:2586 ../mail/mail-component.c:168 #: ../mail/mail-component.c:589 #: ../plugins/exchange-operations/exchange-delegates-user.c:76 #: ../plugins/exchange-operations/exchange-folder.c:597 @@ -11094,34 +11098,34 @@ msgid "Folder _name:" msgstr "_Nombre de la carpeta:" #. load store to mail component -#: ../mail/em-folder-tree-model.c:208 ../mail/em-folder-tree-model.c:210 +#: ../mail/em-folder-tree-model.c:196 ../mail/em-folder-tree-model.c:198 #: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1029 msgid "Search Folders" msgstr "Carpetas de búsqueda" #. UNMATCHED is always last -#: ../mail/em-folder-tree-model.c:214 ../mail/em-folder-tree-model.c:216 +#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204 msgid "UNMATCHED" msgstr "NO COINCIDENTE" -#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:169 +#: ../mail/em-folder-tree-model.c:515 ../mail/mail-component.c:169 msgid "Drafts" msgstr "Borradores" -#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:172 +#: ../mail/em-folder-tree-model.c:517 ../mail/mail-component.c:172 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2 msgid "Templates" msgstr "Plantillas" -#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170 +#: ../mail/em-folder-tree-model.c:523 ../mail/mail-component.c:170 msgid "Outbox" msgstr "Bandeja de salida" -#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171 +#: ../mail/em-folder-tree-model.c:525 ../mail/mail-component.c:171 msgid "Sent" msgstr "Correo enviado" -#: ../mail/em-folder-tree-model.c:551 ../mail/em-folder-tree-model.c:860 +#: ../mail/em-folder-tree-model.c:560 ../mail/em-folder-tree-model.c:870 msgid "Loading..." msgstr "Cargando…" @@ -11146,82 +11150,82 @@ msgctxt "folder-display" msgid "%s (%u)" msgstr "%s (%u)" -#: ../mail/em-folder-tree.c:664 +#: ../mail/em-folder-tree.c:708 msgid "Mail Folder Tree" msgstr "Árbol de carpetas de correo" -#: ../mail/em-folder-tree.c:823 +#: ../mail/em-folder-tree.c:867 #, c-format msgid "Moving folder %s" msgstr "Moviendo la carpeta %s" -#: ../mail/em-folder-tree.c:825 +#: ../mail/em-folder-tree.c:869 #, c-format msgid "Copying folder %s" msgstr "Copiando la carpeta %s" -#: ../mail/em-folder-tree.c:832 ../mail/message-list.c:2014 +#: ../mail/em-folder-tree.c:876 ../mail/message-list.c:2014 #, c-format msgid "Moving messages into folder %s" msgstr "Moviendo los mensajes a la carpeta %s" -#: ../mail/em-folder-tree.c:834 ../mail/message-list.c:2016 +#: ../mail/em-folder-tree.c:878 ../mail/message-list.c:2016 #, c-format msgid "Copying messages into folder %s" msgstr "Copiando los mensajes a la carpeta %s" -#: ../mail/em-folder-tree.c:849 +#: ../mail/em-folder-tree.c:893 msgid "Cannot drop message(s) into toplevel store" msgstr "No se puede dejar el(los) mensaje(s) en el almacén de nivel superior" -#: ../mail/em-folder-tree.c:926 ../ui/evolution-mail-message.xml.h:100 +#: ../mail/em-folder-tree.c:970 ../ui/evolution-mail-message.xml.h:100 msgid "_Copy to Folder" msgstr "_Copiar a la carpeta" -#: ../mail/em-folder-tree.c:927 ../ui/evolution-mail-message.xml.h:113 +#: ../mail/em-folder-tree.c:971 ../ui/evolution-mail-message.xml.h:113 msgid "_Move to Folder" msgstr "_Mover a la carpeta" -#: ../mail/em-folder-tree.c:929 ../mail/em-folder-utils.c:362 +#: ../mail/em-folder-tree.c:973 ../mail/em-folder-utils.c:362 #: ../mail/em-folder-view.c:1187 ../mail/message-list.c:2106 msgid "_Move" msgstr "_Mover" -#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:2108 +#: ../mail/em-folder-tree.c:975 ../mail/message-list.c:2108 msgid "Cancel _Drag" msgstr "Cancelar _arrastre" -#: ../mail/em-folder-tree.c:1641 ../mail/mail-ops.c:1065 +#: ../mail/em-folder-tree.c:1685 ../mail/mail-ops.c:1065 #, c-format msgid "Scanning folders in \"%s\"" msgstr "Analizando carpetas en «%s»" -#: ../mail/em-folder-tree.c:2040 +#: ../mail/em-folder-tree.c:2090 msgid "Open in _New Window" msgstr "Abrir en una ventana _nueva" #. FIXME: need to disable for nochildren folders -#: ../mail/em-folder-tree.c:2045 +#: ../mail/em-folder-tree.c:2095 msgid "_New Folder..." msgstr "Carpeta _nueva…" -#: ../mail/em-folder-tree.c:2048 +#: ../mail/em-folder-tree.c:2098 msgid "_Move..." msgstr "_Mover…" -#: ../mail/em-folder-tree.c:2056 ../ui/evolution-mail-list.xml.h:21 +#: ../mail/em-folder-tree.c:2106 ../ui/evolution-mail-list.xml.h:21 msgid "Re_fresh" msgstr "Actuali_zar" -#: ../mail/em-folder-tree.c:2057 +#: ../mail/em-folder-tree.c:2107 msgid "Fl_ush Outbox" msgstr "Enviar correos pe_ndientes" -#: ../mail/em-folder-tree.c:2063 ../mail/mail.error.xml.h:138 +#: ../mail/em-folder-tree.c:2113 ../mail/mail.error.xml.h:138 msgid "_Empty Trash" msgstr "_Vaciar papelera" -#: ../mail/em-folder-tree.c:2166 +#: ../mail/em-folder-tree.c:2216 msgid "_Unread Search Folder" msgstr "Carpeta de búsqueda de _no leídos" @@ -11386,33 +11390,29 @@ msgstr "Predeterminado" msgid "Unable to retrieve message" msgstr "No se pudo obtener el mensaje" -#: ../mail/em-folder-view.c:2515 -msgid "Retrieving Message..." -msgstr "Obteniendo mensaje…" - -#: ../mail/em-folder-view.c:2736 +#: ../mail/em-folder-view.c:2700 msgid "Create _Search Folder" msgstr "Crear carpeta de _búsqueda" -#: ../mail/em-folder-view.c:2737 +#: ../mail/em-folder-view.c:2701 msgid "_From this Address" msgstr "_Desde esta dirección" -#: ../mail/em-folder-view.c:2738 +#: ../mail/em-folder-view.c:2702 msgid "_To this Address" msgstr "_A esta dirección" -#: ../mail/em-folder-view.c:3231 +#: ../mail/em-folder-view.c:3195 #, c-format msgid "Click to mail %s" msgstr "Pulse para enviar correo a %s" -#: ../mail/em-folder-view.c:3243 +#: ../mail/em-folder-view.c:3207 #, c-format msgid "Click to call %s" msgstr "Pulse para llamar a %s" -#: ../mail/em-folder-view.c:3248 +#: ../mail/em-folder-view.c:3212 msgid "Click to hide/unhide addresses" msgstr "Pulse para ocultar/mostrar las direcciones" @@ -11699,48 +11699,48 @@ msgstr "Grupos de noticias" msgid "Face" msgstr "Cara" -#: ../mail/em-format.c:1198 +#: ../mail/em-format.c:1201 #, c-format msgid "%s attachment" msgstr "%s adjunto" -#: ../mail/em-format.c:1236 +#: ../mail/em-format.c:1239 msgid "Could not parse S/MIME message: Unknown error" msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido" -#: ../mail/em-format.c:1373 ../mail/em-format.c:1530 +#: ../mail/em-format.c:1376 ../mail/em-format.c:1533 msgid "Could not parse MIME message. Displaying as source." msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente." -#: ../mail/em-format.c:1381 +#: ../mail/em-format.c:1384 msgid "Unsupported encryption type for multipart/encrypted" msgstr "Tipo de cifrado no soportado para multipart/encrypted" -#: ../mail/em-format.c:1391 +#: ../mail/em-format.c:1394 msgid "Could not parse PGP/MIME message" msgstr "No es posible interpretar el mensaje PGP/MIME" -#: ../mail/em-format.c:1391 +#: ../mail/em-format.c:1394 msgid "Could not parse PGP/MIME message: Unknown error" msgstr "No se pudo interpretar el mensaje PGP/MIME: Error desconocido" -#: ../mail/em-format.c:1549 +#: ../mail/em-format.c:1552 msgid "Unsupported signature format" msgstr "Formato de firma no soportado" -#: ../mail/em-format.c:1557 ../mail/em-format.c:1628 +#: ../mail/em-format.c:1560 ../mail/em-format.c:1631 msgid "Error verifying signature" msgstr "Error al verificar la firma" -#: ../mail/em-format.c:1557 ../mail/em-format.c:1619 ../mail/em-format.c:1628 +#: ../mail/em-format.c:1560 ../mail/em-format.c:1622 ../mail/em-format.c:1631 msgid "Unknown error verifying signature" msgstr "Error desconocido al verificar la firma" -#: ../mail/em-format.c:1702 +#: ../mail/em-format.c:1705 msgid "Could not parse PGP message" msgstr "No es posible interpretar el mensaje PGP" -#: ../mail/em-format.c:1702 +#: ../mail/em-format.c:1705 msgid "Could not parse PGP message: Unknown error" msgstr "No es posible interpretar el mensaje PGP: Error desconocido" @@ -15273,40 +15273,40 @@ msgstr "R_estaurar ajustes…" msgid "_Backup Settings..." msgstr "_Respaldar ajustes…" -#: ../plugins/bbdb/bbdb.c:620 ../plugins/bbdb/bbdb.c:629 +#: ../plugins/bbdb/bbdb.c:624 ../plugins/bbdb/bbdb.c:633 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1 msgid "Automatic Contacts" msgstr "Contactos automáticos" #. Enable BBDB checkbox -#: ../plugins/bbdb/bbdb.c:644 +#: ../plugins/bbdb/bbdb.c:648 msgid "Create _address book entries when sending mails" msgstr "" "Crear entradas _automáticamente en la libreta de direcciones al enviar " "correos" -#: ../plugins/bbdb/bbdb.c:650 +#: ../plugins/bbdb/bbdb.c:654 msgid "Select Address book for Automatic Contacts" msgstr "Seleccione la libreta para contactos automáticos" -#: ../plugins/bbdb/bbdb.c:665 +#: ../plugins/bbdb/bbdb.c:669 msgid "Instant Messaging Contacts" msgstr "Contactos de mensajería instantánea" #. Enable Gaim Checkbox -#: ../plugins/bbdb/bbdb.c:680 +#: ../plugins/bbdb/bbdb.c:684 msgid "Synchronize contact info and images from Pidgin buddy list" msgstr "" "Sincronizar información e imágenes de contactos desde la lista de contactos " "de Pidgin" -#: ../plugins/bbdb/bbdb.c:686 +#: ../plugins/bbdb/bbdb.c:690 msgid "Select Address book for Pidgin buddy list" msgstr "" "Seleccione la libreta de direcciones para la lista de contactos de Pidgin" #. Synchronize now button. -#: ../plugins/bbdb/bbdb.c:697 +#: ../plugins/bbdb/bbdb.c:701 msgid "Synchronize with _buddy list now" msgstr "Sincronizar con la lista de _contactos de MI ahora" @@ -21845,7 +21845,7 @@ msgstr "Mensaje adjunto" #. Translators: Default attachment filename. #: ../widgets/misc/e-attachment.c:1719 ../widgets/misc/e-attachment.c:2270 -#: ../widgets/misc/e-attachment-store.c:635 +#: ../widgets/misc/e-attachment-store.c:636 msgid "attachment.dat" msgstr "attachment.dat" @@ -21948,7 +21948,7 @@ msgstr "Añadir adjunto" msgid "A_ttach" msgstr "_Adjuntar" -#: ../widgets/misc/e-attachment-store.c:606 +#: ../widgets/misc/e-attachment-store.c:607 msgid "Save Attachment" msgid_plural "Save Attachments" msgstr[0] "Guarda el adjunto" @@ -22961,6 +22961,9 @@ msgstr "Contexto IM" msgid "Handle Popup" msgstr "Tirador emergente" +#~ msgid "Retrieving Message..." +#~ msgstr "Obteniendo mensaje…" + #~ msgid "Case _sensitive" #~ msgstr "_Discriminar según capitalización" -- cgit v1.2.3 From af79a822bc244226fc3df48b45bd98b1bb9e08c3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 3 Jun 2009 14:54:08 +0200 Subject: Replace libgnome function with equivalent glib functions. --- e-util/e-win32-reloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c index a080518d4c..c862826fed 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -104,7 +104,8 @@ setup (void) } /* This requires that the libeutil DLL is installed in $bindir */ - gnome_win32_get_prefixes (hmodule, &full_prefix, &cp_prefix); + full_prefix = g_win32_get_package_installation_directory_of_module(hmodule); + cp_prefix = g_win32_locale_filename_from_utf8(full_prefix); localedir = replace_prefix (cp_prefix, EVOLUTION_LOCALEDIR); -- cgit v1.2.3 From 25d235eaa2323317cffb1e6fbb9e233b8b2cb537 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 3 Jun 2009 15:03:46 +0200 Subject: Remove libgnome include --- e-util/e-win32-reloc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c index c862826fed..3ad8bbf5a4 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -27,7 +27,6 @@ #include #include -#include /* localedir uses system codepage as it is passed to the non-UTF8ified * gettext library -- cgit v1.2.3 From f7a066d03ea560f289420d6fc794808516c4c257 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 3 Jun 2009 09:45:36 -0400 Subject: It might help to install the evolution binary. I caused this in the "Drop support for CDE" commit. Nice little regression there. --- shell/Makefile.am | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/shell/Makefile.am b/shell/Makefile.am index 025827d45a..0edf5f87a3 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -23,7 +23,7 @@ INCLUDES = \ $(TZDIALOG_CFLAGS) \ $(SHELL_CFLAGS) -noinst_PROGRAMS = evolution +bin_PROGRAMS = evolution # Shell CORBA stuff @@ -201,13 +201,6 @@ install-data-local: fi endif -install-evolution: $(install-privsolibLTLIBRARIES) - $(mkinstalldirs) $(DESTDIR)$(bindir) - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution$(EXEEXT) $(DESTDIR)$(bindir)/evolution$(EXEEXT) - -uninstall-evolution: - $(LIBTOOL) --mode=uninstall rm -rf $(DESTDIR)$(bindir)/evolution$(EXEEXT) - # Extra dist stuff EXTRA_DIST = \ -- cgit v1.2.3 From 32bb1e1650e3afe951b35b4ee53edd600741f842 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Wed, 3 Jun 2009 13:31:56 +0530 Subject: More Anjal stuff for trunk. --- composer/e-composer-header-table.c | 22 ++++++++++++++++++++++ composer/e-composer-header-table.h | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index f25c3b722c..542a836dc8 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -1032,6 +1032,28 @@ e_composer_header_table_get_header (EComposerHeaderTable *table, return table->priv->headers[type]; } +void +e_composer_header_table_set_header_visible (EComposerHeaderTable *table, + EComposerHeaderType type, + gboolean visible) +{ + EComposerHeader *header; + + header = e_composer_header_table_get_header (table, type); + e_composer_header_set_visible (header, visible); + + /* Signature widgets track the "From" header. */ + if (type == E_COMPOSER_HEADER_FROM) { + if (visible) { + gtk_widget_show (table->priv->signature_label); + gtk_widget_show (table->priv->signature_combo_box); + } else { + gtk_widget_hide (table->priv->signature_label); + gtk_widget_hide (table->priv->signature_combo_box); + } + } +} + EAccount * e_composer_header_table_get_account (EComposerHeaderTable *table) { diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h index 91ad56da46..3e3c95bff7 100644 --- a/composer/e-composer-header-table.h +++ b/composer/e-composer-header-table.h @@ -149,7 +149,9 @@ const gchar * e_composer_header_table_get_subject void e_composer_header_table_set_subject (EComposerHeaderTable *table, const gchar *subject); - +void e_composer_header_table_set_header_visible (EComposerHeaderTable *table, + EComposerHeaderType type, + gboolean visible); G_END_DECLS #endif /* E_COMPOSER_HEADER_TABLE_H */ -- cgit v1.2.3 From 7703ffcdd4e2f5343a80f5f0e082fe5d050b7328 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Wed, 3 Jun 2009 19:42:35 +0530 Subject: Add option for Sender/Addresses contain. --- mail/searchtypes.xml | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/mail/searchtypes.xml b/mail/searchtypes.xml index 83941d875c..63a52ca772 100644 --- a/mail/searchtypes.xml +++ b/mail/searchtypes.xml @@ -329,7 +329,7 @@ - + @@ -764,18 +764,29 @@ - - <_title>Subject or Sender contains + <_title>Subject or Addresses contains - + + + + + + + + + + + + + @@ -795,6 +806,21 @@ + + <_title>Subject or Sender contains + + + + + + + + + + + + + <_title>Recipients contain -- cgit v1.2.3 From 5b1e05dbf5448251ea0dffc727233e52a2c2e518 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Wed, 3 Jun 2009 19:43:06 +0530 Subject: Anjal stuff's for Evo. --- composer/e-composer-header-table.c | 4 ++-- composer/e-composer-header.c | 19 +++++++++++++++---- mail/em-composer-utils.c | 10 +++++++--- mail/em-composer-utils.h | 2 +- widgets/misc/e-search-bar.c | 7 ++++++- 5 files changed, 31 insertions(+), 11 deletions(-) diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index 542a836dc8..b47a15b115 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -944,13 +944,13 @@ composer_header_table_init (EComposerHeaderTable *table) table->priv->headers[E_COMPOSER_HEADER_TO] = header; header = e_composer_name_header_new_with_action ( - _("_Cc:"), _("Show CC"), name_selector); + _("_Cc:"), _("CC"), name_selector); e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_CC); composer_header_table_bind_header ("destinations-cc", "changed", header); table->priv->headers[E_COMPOSER_HEADER_CC] = header; header = e_composer_name_header_new_with_action ( - _("_Bcc:"), _("Show BCC"), name_selector); + _("_Bcc:"), _("BCC"), name_selector); e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_BCC); composer_header_table_bind_header ("destinations-bcc", "changed", header); table->priv->headers[E_COMPOSER_HEADER_BCC] = header; diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c index d679bdd263..f57d569ead 100644 --- a/composer/e-composer-header.c +++ b/composer/e-composer-header.c @@ -21,7 +21,7 @@ */ #include "e-composer-header.h" - +#include #define E_COMPOSER_HEADER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_COMPOSER_HEADER, EComposerHeaderPrivate)) @@ -47,6 +47,7 @@ struct _EComposerHeaderPrivate { gboolean button; gchar *addaction_text; gboolean addaction; /*For Add button.*/ + GtkWidget *action_label; guint sensitive : 1; guint visible : 1; @@ -67,8 +68,13 @@ static void composer_header_addaction_clicked_cb (GtkButton *button, EComposerHeader *header) { - gtk_widget_hide ((GtkWidget *)button); - e_composer_header_set_visible (header, TRUE); + gboolean show = !e_composer_header_get_visible(header); + if (!show) + gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "show")); + else + gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "hide")); + + e_composer_header_set_visible (header, show); } static GObject * @@ -108,8 +114,13 @@ composer_header_constructor (GType type, tmp = gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON); gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3); tmp = gtk_label_new (NULL); - str = g_strdup_printf ("%s", header->priv->addaction_text); + str = g_strdup_printf ("%s %s", _("Show"), header->priv->addaction_text); + g_object_set_data ((GObject *)tmp, "show", str); gtk_label_set_markup((GtkLabel *)tmp, str); + str = g_strdup_printf ("%s %s", _("Hide"), header->priv->addaction_text); + g_object_set_data ((GObject *)tmp, "hide", str); + + header->priv->action_label = tmp; gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3); gtk_container_add((GtkContainer *)header->action_widget, box); gtk_widget_show_all(header->action_widget); diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 4a681c99bc..7bb87222cd 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -732,7 +732,7 @@ em_utils_compose_lite_new_message (const gchar *fromuri) * window. If @url is non-NULL, the composer fields will be filled in * according to the values in the mailto url. **/ -void +struct _EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri) { EMsgComposer *composer; @@ -753,8 +753,12 @@ em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri composer_set_no_change (composer, TRUE, url == NULL); - gtk_widget_show ((GtkWidget *) composer); - gdk_window_raise (((GtkWidget *) composer)->window); + if (!e_msg_composer_get_lite()) { + gtk_widget_show ((GtkWidget *) composer); + gdk_window_raise (((GtkWidget *) composer)->window); + } + + return composer; } /* Editing messages... */ diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index 2f78f2769f..ab4a86368e 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -53,7 +53,7 @@ void em_utils_compose_new_message (const gchar *fromuri); struct _EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ -void em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); +struct _EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); void em_utils_edit_message (struct _CamelMimeMessage *message, struct _CamelFolder *folder); void em_utils_edit_messages (struct _CamelFolder *folder, GPtrArray *uids, gboolean replace); diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 041e46a1f3..acd52ece6f 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -1451,7 +1451,9 @@ e_search_bar_set_search_scope (ESearchBar *search_bar, gint id) gint row; g_return_if_fail (E_IS_SEARCH_BAR (search_bar)); - + + if (!search_bar->scopeoption_menu) + return; row = find_id (search_bar->scopeoption_menu, id, "EsbItemId", NULL); if (row == -1) return; @@ -1505,6 +1507,9 @@ e_search_bar_get_search_scope (ESearchBar *search_bar) g_return_val_if_fail (search_bar != NULL, -1); g_return_val_if_fail (E_IS_SEARCH_BAR (search_bar), -1); + if (!search_bar->scopeoption_menu) + return -7 /*Current folder hack */; + menu_item = gtk_menu_get_active (GTK_MENU (search_bar->scopeoption_menu)); scopeitem_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menu_item), "EsbItemId")); -- cgit v1.2.3 From 2c3ca95413624723d717cf0f8876b88b5df3c12e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 3 Jun 2009 11:55:52 -0400 Subject: =?UTF-8?q?Bug=20572543=20=E2=80=93=20Doesn't=20show=20correct=20a?= =?UTF-8?q?pplication=20for=20pdf=20attachments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fix got dropped in the attachment rewrite. Also, ignore the application's NoDisplay setting when building the "open with" menu. That's mainly so "Document Viewer" shows up in the list. --- widgets/misc/e-attachment-view.c | 3 --- widgets/misc/e-attachment.c | 12 +++++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index 41e0b302a2..345510230b 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -635,9 +635,6 @@ attachment_view_update_actions (EAttachmentView *view) gchar *action_label; gchar *action_name; - if (!g_app_info_should_show (app_info)) - continue; - app_executable = g_app_info_get_executable (app_info); app_icon = g_app_info_get_icon (app_info); app_name = g_app_info_get_name (app_info); diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index e9df6024bc..e7a03950db 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -1320,9 +1320,11 @@ GList * e_attachment_list_apps (EAttachment *attachment) { GList *app_info_list; + GList *guessed_infos; GFileInfo *file_info; const gchar *content_type; const gchar *display_name; + gboolean type_is_unknown; gchar *allocated; g_return_val_if_fail (E_IS_ATTACHMENT (attachment), NULL); @@ -1336,18 +1338,22 @@ e_attachment_list_apps (EAttachment *attachment) g_return_val_if_fail (content_type != NULL, NULL); app_info_list = g_app_info_get_all_for_type (content_type); + type_is_unknown = g_content_type_is_unknown (content_type); - if (app_info_list != NULL || display_name == NULL) + if (app_info_list != NULL && !type_is_unknown) goto exit; - if (!g_content_type_is_unknown (content_type)) + if (display_name == NULL) goto exit; allocated = g_content_type_guess (display_name, NULL, 0, NULL); - app_info_list = g_app_info_get_all_for_type (allocated); + guessed_infos = g_app_info_get_all_for_type (allocated); + app_info_list = g_list_concat (guessed_infos, app_info_list); g_free (allocated); exit: + g_debug ("App List Length: %d", g_list_length (app_info_list)); + return app_info_list; } -- cgit v1.2.3 From 0fd4314bc9a6b4fae7772b48a16ac25b67e72100 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 3 Jun 2009 12:03:55 -0400 Subject: Whoops, forgot to remove a debug message. --- widgets/misc/e-attachment.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index e7a03950db..35c377abe5 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -1352,8 +1352,6 @@ e_attachment_list_apps (EAttachment *attachment) g_free (allocated); exit: - g_debug ("App List Length: %d", g_list_length (app_info_list)); - return app_info_list; } -- cgit v1.2.3 From 9271d4e8e459608e3cdcc7e0a148f5e6dbba16e7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 3 Jun 2009 18:53:43 +0200 Subject: Remove a horrible hack and stuff the localizable strings into if-zero-ed block --- filter/filter-datespec.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c index a7ef49981e..000e64da5b 100644 --- a/filter/filter-datespec.c +++ b/filter/filter-datespec.c @@ -69,27 +69,33 @@ typedef struct _timespan { gfloat max; } timespan; -#ifdef ngettext -#undef ngettext +#if 0 +ngettext("1 second ago", "%d seconds ago") +ngettext("1 second in the future", "%d seconds in the future") +ngettext("1 minute ago", "%d minutes ago") +ngettext("1 minute in the future", "%d minutes in the future") +ngettext("1 hour ago", "%d hours ago") +ngettext("1 hour in the future", "%d hours in the future") +ngettext("1 day ago", "%d days ago") +ngettext("1 day in the future", "%d days in the future") +ngettext("1 week ago", "%d weeks ago") +ngettext("1 week in the future", "%d weeks in the future") +ngettext("1 month ago", "%d months ago") +ngettext("1 month in the future", "%d months in the future") +ngettext("1 year ago", "%d years ago") +ngettext("1 year in the future", "%d years in the future") #endif -/* This is a nasty hack trying to keep both ngettext function and xgettext tool happy */ -/* It *will* cause problems if ngettext is a macro */ -#define ngettext(a, b) a, b - static const timespan timespans[] = { - { 1, ngettext("1 second ago", "%d seconds ago"), ngettext("1 second in the future", "%d seconds in the future"), 59.0 }, - { 60, ngettext("1 minute ago", "%d minutes ago"), ngettext("1 minute in the future", "%d minutes in the future"), 59.0 }, - { 3600, ngettext("1 hour ago", "%d hours ago"), ngettext("1 hour in the future", "%d hours in the future"), 23.0 }, - { 86400, ngettext("1 day ago", "%d days ago"), ngettext("1 day in the future", "%d days in the future"), 31.0 }, - { 604800, ngettext("1 week ago", "%d weeks ago"), ngettext("1 week in the future", "%d weeks in the future"), 52.0 }, - { 2419200, ngettext("1 month ago", "%d months ago"), ngettext("1 month in the future", "%d months in the future"), 12.0 }, - { 31557600, ngettext("1 year ago", "%d years ago"), ngettext("1 year in the future", "%d years in the future"), 1000.0 }, + { 1, "1 second ago", "%d seconds ago", "1 second in the future", "%d seconds in the future", 59.0 }, + { 60, "1 minute ago", "%d minutes ago", "1 minute in the future", "%d minutes in the future", 59.0 }, + { 3600, "1 hour ago", "%d hours ago", "1 hour in the future", "%d hours in the future", 23.0 }, + { 86400, "1 day ago", "%d days ago", "1 day in the future", "%d days in the future", 31.0 }, + { 604800, "1 week ago", "%d weeks ago", "1 week in the future", "%d weeks in the future", 52.0 }, + { 2419200, "1 month ago", "%d months ago", "1 month in the future", "%d months in the future", 12.0 }, + { 31557600, "1 year ago", "%d years ago", "1 year in the future", "%d years in the future", 1000.0 }, }; -/* now we let the compiler see the real function call */ -#undef ngettext - #define DAY_INDEX 3 #define N_TIMESPANS (sizeof (timespans) / sizeof (timespans[0])) -- cgit v1.2.3 From 3bfe9497a68753c12c6cef695595b9993d3fef21 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 3 Jun 2009 19:22:16 +0200 Subject: Add libraries to LIBADD so that -no-undefined on win32 works well. --- plugins/audio-inline/Makefile.am | 10 +++++++++- plugins/bbdb/Makefile.am | 10 +++++++++- plugins/vcard-inline/Makefile.am | 13 +++++++++++-- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am index 73e0b988d6..006b39f3c8 100644 --- a/plugins/audio-inline/Makefile.am +++ b/plugins/audio-inline/Makefile.am @@ -1,3 +1,10 @@ +if OS_WIN32 +NO_UNDEFINED_REQUIRED_LIBS = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/e-util/libeutil.la \ + $(GNOME_PLATFORM_LIBS) +endif + INCLUDES = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) \ @@ -12,7 +19,8 @@ liborg_gnome_audio_inline_la_SOURCES = audio-inline.c liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_audio_inline_la_LIBADD = \ $(GSTREAMER_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(NO_UNDEFINED_REQUIRED_LIBS) EXTRA_DIST = org-gnome-audio-inline.eplug.xml diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index 1bf7604e92..481d465887 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -1,3 +1,10 @@ +if OS_WIN32 +NO_UNDEFINED_REQUIRED_LIBS = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/e-util/libeutil.la \ + $(GNOME_PLATFORM_LIBS) +endif + INCLUDES = \ -I$(top_builddir)/composer \ -I$(top_srcdir) \ @@ -14,7 +21,8 @@ liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_evolution_bbdb_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(NO_UNDEFINED_REQUIRED_LIBS) EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am index 781eb53bd4..01e1f3f811 100644 --- a/plugins/vcard-inline/Makefile.am +++ b/plugins/vcard-inline/Makefile.am @@ -1,3 +1,10 @@ +if OS_WIN32 +NO_UNDEFINED_REQUIRED_LIBS = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/e-util/libeutil.la \ + $(GNOME_PLATFORM_LIBS) +endif + INCLUDES = \ -I$(top_srcdir) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ @@ -11,8 +18,10 @@ plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_vcard_inline_la_LIBADD = \ - $(EVOLUTION_ADDRESSBOOK_LIBS) - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(NO_UNDEFINED_REQUIRED_LIBS) EXTRA_DIST = org-gnome-vcard-inline.eplug.xml -- cgit v1.2.3 From f7a7b0de15f238a0a9850c1194cbbbf3a89d64e5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 3 Jun 2009 19:23:33 +0200 Subject: Cater for circular dependencies between libevolution-mail and libevolution-mail-shared --- mail/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mail/Makefile.am b/mail/Makefile.am index 8d555b1204..9df825ff62 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -235,12 +235,18 @@ libevolution_mail_shared_la_SOURCES = \ message-tag-followup.c \ message-tag-followup.h +if OS_WIN32 +LIBEVOMAIL=$(top_builddir)/win32/libevolution-mail.la +endif + libevolution_mail_shared_la_LIBADD = \ + $(LIBEVOMAIL) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/widgets/menus/libmenus.la \ + $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(SMIME_LIBS) \ $(THREADS_LIBS) -- cgit v1.2.3 From f1deed5a6c7c2ec1fa0cd455f4ce4329164016f7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 3 Jun 2009 19:24:38 +0200 Subject: Don't declare x_mailer "extern" because it causes undefined symbols while linking. --- mail/mail-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail/mail-ops.c b/mail/mail-ops.c index a75d330e93..6bb9e059a4 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -72,7 +72,7 @@ #define w(x) #define d(x) -extern const gchar *x_mailer; +const gchar *x_mailer; /* used for both just filtering a folder + uid's, and for filtering a whole folder */ /* used both for fetching mail, and for filtering mail */ -- cgit v1.2.3 From aef7ab0983089d8aa4e06966b2c34bcdcf1afe66 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 3 Jun 2009 19:50:23 +0200 Subject: Bug #581780 - Remember passwords in keyring for web calendars too --- plugins/calendar-http/calendar-http.c | 84 +++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 9 deletions(-) diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c index 86f96404e2..ad89379922 100644 --- a/plugins/calendar-http/calendar-http.c +++ b/plugins/calendar-http/calendar-http.c @@ -33,20 +33,54 @@ gboolean e_calendar_http_check (EPlugin *epl, EConfigHookPageCheckData *data); GtkWidget * e_calendar_http_secure (EPlugin *epl, EConfigHookItemFactoryData *data); GtkWidget *e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data); +/* replaces all '@' with '%40' in str; returns newly allocated string */ +static char * +replace_at_sign (const char *str) +{ + char *res, *at; + + if (!str) + return NULL; + + res = g_strdup (str); + while (at = strchr (res, '@'), at) { + char *tmp = g_malloc0 (sizeof (char) * (1 + strlen (res) + 2)); + + strncpy (tmp, res, at - res); + strcat (tmp, "%40"); + strcat (tmp, at + 1); + + g_free (res); + res = tmp; + } + + return res; +} + static gchar * print_uri_noproto (EUri *uri) { - gchar *uri_noproto; + gchar *uri_noproto, *user, *pass; + + if (uri->user) + user = replace_at_sign (uri->user); + else + user = NULL; + + if (uri->passwd) + pass = replace_at_sign (uri->passwd); + else + pass = NULL; if (uri->port != 0) uri_noproto = g_strdup_printf ( "%s%s%s%s%s%s%s:%d%s%s%s", - uri->user ? uri->user : "", + user ? user : "", uri->authmech ? ";auth=" : "", uri->authmech ? uri->authmech : "", - uri->passwd ? ":" : "", - uri->passwd ? uri->passwd : "", - uri->user ? "@" : "", + pass ? ":" : "", + pass ? pass : "", + user ? "@" : "", uri->host ? uri->host : "", uri->port, uri->path ? uri->path : "", @@ -55,16 +89,20 @@ print_uri_noproto (EUri *uri) else uri_noproto = g_strdup_printf ( "%s%s%s%s%s%s%s%s%s%s", - uri->user ? uri->user : "", + user ? user : "", uri->authmech ? ";auth=" : "", uri->authmech ? uri->authmech : "", - uri->passwd ? ":" : "", - uri->passwd ? uri->passwd : "", - uri->user ? "@" : "", + pass ? ":" : "", + pass ? pass : "", + user ? "@" : "", uri->host ? uri->host : "", uri->path ? uri->path : "", uri->query ? "?" : "", uri->query ? uri->query : ""); + + g_free (user); + g_free (pass); + return uri_noproto; } @@ -85,6 +123,8 @@ url_changed (GtkEntry *entry, ESource *source) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (secure_checkbox), TRUE); } + g_free (uri->user); + uri->user = g_strdup (e_source_get_property (source, "username")); relative_uri = print_uri_noproto (uri); e_source_set_relative_uri (source, relative_uri); g_free (relative_uri); @@ -117,6 +157,11 @@ e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data) g_free (uri_text); return hidden; } + g_free (uri->user); + uri->user = NULL; + + g_free (uri_text); + uri_text = e_uri_to_string (uri, FALSE); e_uri_free (uri); parent = data->parent; @@ -341,6 +386,7 @@ static void username_changed (GtkEntry *entry, ESource *source) { const gchar *username; + char *uri; username = gtk_entry_get_text (GTK_ENTRY (entry)); @@ -351,6 +397,26 @@ username_changed (GtkEntry *entry, ESource *source) e_source_set_property (source, "auth", NULL); e_source_set_property (source, "username", NULL); } + + uri = e_source_get_uri (source); + if (uri != NULL) { + EUri *euri; + char *ruri; + + if (username && !*username) + username = NULL; + + euri = e_uri_new (uri); + + g_free (euri->user); + euri->user = g_strdup (username); + + ruri = print_uri_noproto (euri); + e_source_set_relative_uri (source, ruri); + e_uri_free (euri); + g_free (ruri); + g_free (uri); + } } GtkWidget * -- cgit v1.2.3 From 1d5b6c6a13059f475d8f5db941f8145f362b3eba Mon Sep 17 00:00:00 2001 From: Jorge Gonzalez Date: Wed, 3 Jun 2009 20:15:22 +0200 Subject: Updated Spanish translation --- po/es.po | 54 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/po/es.po b/po/es.po index 166e8360a4..d512d53332 100644 --- a/po/es.po +++ b/po/es.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: evolution.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=evolution\n" -"POT-Creation-Date: 2009-06-02 18:21+0000\n" -"PO-Revision-Date: 2009-06-02 20:23+0200\n" +"POT-Creation-Date: 2009-06-03 14:16+0000\n" +"PO-Revision-Date: 2009-06-03 20:13+0200\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -4986,7 +4986,6 @@ msgid "Due " msgstr "Vence " #: ../calendar/gui/dialogs/comp-editor.c:221 -#| msgid "Could not save the attachment" msgid "Could not save attachments" msgstr "No se pudieron guardar los adjuntos" @@ -9624,19 +9623,17 @@ msgstr "_Para:" msgid "_Cc:" msgstr "_Cc:" -# #En conflicto con _Mensaje -#: ../composer/e-composer-header-table.c:947 -msgid "Show CC" -msgstr "Mostrar Cc" +#: ../composer/e-composer-header-table.c:947 ../mail/em-filter-i18n.h:8 +msgid "CC" +msgstr "Cc" #: ../composer/e-composer-header-table.c:953 msgid "_Bcc:" msgstr "Cc_o:" -# #En conflicto con _Mensaje -#: ../composer/e-composer-header-table.c:953 -msgid "Show BCC" -msgstr "Mostrar Cco" +#: ../composer/e-composer-header-table.c:953 ../mail/em-filter-i18n.h:6 +msgid "BCC" +msgstr "Cco" #: ../composer/e-composer-header-table.c:958 msgid "_Post To:" @@ -10683,30 +10680,30 @@ msgstr "Añadir un script de firma" msgid "Signature(s)" msgstr "Firma(s)" -#: ../mail/em-composer-utils.c:1104 ../mail/em-format-quote.c:416 +#: ../mail/em-composer-utils.c:1108 ../mail/em-format-quote.c:416 msgid "-------- Forwarded Message --------" msgstr "--------- Mensaje reenviado --------" -#: ../mail/em-composer-utils.c:1556 +#: ../mail/em-composer-utils.c:1560 msgid "" "No destination address provided, forward of the message has been cancelled." msgstr "" "No se proporcionó ninguna dirección de destino, se canceló el reenvío del " "mensaje." -#: ../mail/em-composer-utils.c:1562 +#: ../mail/em-composer-utils.c:1566 msgid "No account found to use, forward of the message has been cancelled." msgstr "" "No se encontró ninguna cuenta que usar, se canceló el reenvío del mensaje." -#: ../mail/em-composer-utils.c:2030 +#: ../mail/em-composer-utils.c:2034 msgid "an unknown sender" msgstr "un remitente desconocido" #. Note to translators: this is the attribution string used when quoting messages. #. * each ${Variable} gets replaced with a value. To see a full list of available #. * variables, see em-composer-utils.c:1514 -#: ../mail/em-composer-utils.c:2077 +#: ../mail/em-composer-utils.c:2081 msgid "" "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " "${TimeZone}, ${Sender} wrote:" @@ -10714,7 +10711,7 @@ msgstr "" "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} " "${TimeZone}, ${Sender} escribió:" -#: ../mail/em-composer-utils.c:2220 +#: ../mail/em-composer-utils.c:2224 msgid "-----Original Message-----" msgstr "-----Mensaje original-----" @@ -10735,18 +10732,10 @@ msgstr "Asignar color" msgid "Assign Score" msgstr "Asignar puntuación" -#: ../mail/em-filter-i18n.h:6 -msgid "BCC" -msgstr "Cco" - #: ../mail/em-filter-i18n.h:7 msgid "Beep" msgstr "Pitar" -#: ../mail/em-filter-i18n.h:8 -msgid "CC" -msgstr "Cc" - #: ../mail/em-filter-i18n.h:9 msgid "Completed On" msgstr "Completado en" @@ -14978,10 +14967,15 @@ msgid "Subject contains" msgstr "El asunto contiene" #: ../mail/searchtypes.xml.h:6 +#| msgid "Subject or Sender contains" +msgid "Subject or Addresses contains" +msgstr "El asunto o las direcciones contienen" + +#: ../mail/searchtypes.xml.h:7 msgid "Subject or Recipients contains" msgstr "El asunto o el destinatarios contiene" -#: ../mail/searchtypes.xml.h:7 +#: ../mail/searchtypes.xml.h:8 msgid "Subject or Sender contains" msgstr "El asunto o el remitente contiene" @@ -22961,6 +22955,14 @@ msgstr "Contexto IM" msgid "Handle Popup" msgstr "Tirador emergente" +# #En conflicto con _Mensaje +#~ msgid "Show CC" +#~ msgstr "Mostrar Cc" + +# #En conflicto con _Mensaje +#~ msgid "Show BCC" +#~ msgstr "Mostrar Cco" + #~ msgid "Retrieving Message..." #~ msgstr "Obteniendo mensaje…" -- cgit v1.2.3 From dbee806d9db60bdaf0f6e1d15b26c3ee7e2dd9db Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Thu, 4 Jun 2009 00:52:25 +0530 Subject: =?UTF-8?q?Bug=20584733=20=E2=80=93=20Cannot=20create=20new=20acco?= =?UTF-8?q?unt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Broken stuffs post, Anjal migration. --- mail/em-account-editor.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 0016952cff..1f0fdb8ba9 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -183,6 +183,7 @@ typedef struct _EMAccountEditorPrivate { /* for druid page preparation */ guint identity_set:1; guint receive_set:1; + guint send_set:1; guint management_set:1; } EMAccountEditorPrivate; @@ -1420,7 +1421,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) current[len] = 0; } } else { - current = g_strdup("imap"); + current = "imap"; } store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); @@ -1466,7 +1467,6 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) i++; } - gtk_cell_layout_clear((GtkCellLayout *)dropdown); gtk_combo_box_set_model(dropdown, (GtkTreeModel *)store); gtk_cell_layout_pack_start((GtkCellLayout *)dropdown, cell, TRUE); @@ -2788,28 +2788,33 @@ emae_check_complete(EConfig *ec, const gchar *pageid, gpointer data) gtk_entry_set_text(emae->priv->transport.username, user); if (uri && (url = camel_url_new(uri, NULL)) != NULL) { refresh = TRUE; - camel_url_set_protocol(url, mail_servers[index].proto); - camel_url_set_param(url, "use_ssl", mail_servers[index].ssl); - camel_url_set_host (url, mail_servers[index].recv); camel_url_set_user (url, user); - gtk_entry_set_text(emae->priv->source.hostname, mail_servers[index].recv); - gtk_entry_set_text(emae->priv->transport.hostname, mail_servers[index].send); + if (index != -1) { + camel_url_set_protocol(url, mail_servers[index].proto); + camel_url_set_param(url, "use_ssl", mail_servers[index].ssl); + camel_url_set_host (url, mail_servers[index].recv); + gtk_entry_set_text(emae->priv->source.hostname, mail_servers[index].recv); + gtk_entry_set_text(emae->priv->transport.hostname, mail_servers[index].send); + camel_url_set_host (url, mail_servers[index].recv); + + } else { + camel_url_set_host (url, ""); + } + camel_url_set_user (url, user); uri = camel_url_to_string(url, 0); e_account_set_string(emae->account, E_ACCOUNT_SOURCE_URL, uri); - g_free(uri); camel_url_free(url); - } else { - g_warning("buz1\n"); } } } else if (!strcmp(pageid, "30.send")) { + if (!emae->priv->send_set) { CamelURL *url; gchar *at, *user; gint index; gchar *uri = (gchar *)e_account_get_string(emae->account, E_ACCOUNT_TRANSPORT_URL); - + emae->priv->send_set = 1; tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS); at = strchr(tmp, '@'); user = g_alloca(at-tmp+1); @@ -2818,7 +2823,7 @@ emae_check_complete(EConfig *ec, const gchar *pageid, gpointer data) at++; index = check_servers(at); - if (uri && (url = camel_url_new(uri, NULL)) != NULL) { + if (index != -1 && uri && (url = camel_url_new(uri, NULL)) != NULL) { refresh = TRUE; camel_url_set_protocol (url, "smtp"); camel_url_set_param(url, "use_ssl", mail_servers[index].ssl); @@ -2828,11 +2833,9 @@ emae_check_complete(EConfig *ec, const gchar *pageid, gpointer data) e_account_set_string(emae->account, E_ACCOUNT_TRANSPORT_URL, uri); g_free(uri); camel_url_free(url); - } else { - g_warning("buz2\n"); } - + } } else if (!strcmp(pageid, "20.receive_options")) { if (emae->priv->source.provider && emae->priv->extra_provider != emae->priv->source.provider) { -- cgit v1.2.3 From ac11f6a280488b5bb1b5e19aa7f01bdb5e82f1d9 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Thu, 4 Jun 2009 08:10:56 +0530 Subject: Fix Anjal's composer path. --- composer/e-composer-private.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c index 2a2cea6a4c..30cf5ac2c2 100644 --- a/composer/e-composer-private.c +++ b/composer/e-composer-private.c @@ -177,6 +177,7 @@ e_composer_private_init (EMsgComposer *composer) gtk_container_add((GtkContainer *)send_widget, tmp); gtk_button_set_relief ((GtkButton *)send_widget, GTK_RELIEF_NORMAL); +/* path = "/main-toolbar/pre-main-toolbar/attach"; send_widget = gtk_ui_manager_get_widget (ui_manager, path); tmp = gtk_hbox_new (FALSE, 0); @@ -193,7 +194,7 @@ e_composer_private_init (EMsgComposer *composer) gtk_container_remove((GtkContainer *)send_widget, gtk_bin_get_child ((GtkBin *)send_widget)); gtk_container_add((GtkContainer *)send_widget, tmp); gtk_button_set_relief ((GtkButton *)send_widget, GTK_RELIEF_NORMAL); - +*/ gtk_widget_show(tmp_box); gtk_box_pack_end ((GtkBox *)exp_box, tmp_box, TRUE, TRUE, 0); gtk_box_pack_end ((GtkBox *)editor->vbox, exp_box, FALSE, FALSE, 3); -- cgit v1.2.3 From 085201ee4a7608c8bd3bc68c968feb69f0e81ae4 Mon Sep 17 00:00:00 2001 From: Manoj Kumar Giri Date: Thu, 4 Jun 2009 17:56:52 +0530 Subject: Updated Oriya Translation --- po/or.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/po/or.po b/po/or.po index 017d86678a..74a52317b3 100644 --- a/po/or.po +++ b/po/or.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: or\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n" "POT-Creation-Date: 2009-05-05 00:57+0000\n" -"PO-Revision-Date: 2009-05-07 19:12+0530\n" +"PO-Revision-Date: 2009-06-04 17:55+0530\n" "Last-Translator: Manoj Kumar Giri \n" "Language-Team: Oriya \n" "MIME-Version: 1.0\n" @@ -39,6 +39,8 @@ msgstr "" "\n" "\n" "\n" +"\n" +"\n" "X-Generator: KBabel 1.11.4\n" #: ../a11y/addressbook/ea-addressbook-view.c:94 @@ -5311,12 +5313,13 @@ msgid "" msgstr "" #: ../calendar/gui/dialogs/event-page.glade.h:20 -#, fuzzy #| msgid "until" msgid "" "for\n" "until" -msgstr "ଯେପର୍ଯ୍ଯନ୍ତ" +msgstr "" +"ପାଇଁ\n" +"ଯେ ପର୍ଯ୍ଯନ୍ତ" #: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485 msgid "Memo" @@ -5740,15 +5743,13 @@ msgid "%s for an unknown trigger type" msgstr "ଗୋଟିଏ ଅଜଣା ଟ୍ରିଗର ପ୍ରକାର ପାଇଁ %s" #: ../calendar/gui/e-attachment-handler-calendar.c:258 -#, fuzzy #| msgid "Import" msgid "I_mport" -msgstr "ଆୟତ କରନ୍ତୁ" +msgstr "ଆମଦାନୀ କରନ୍ତୁ (_m)" #: ../calendar/gui/e-attachment-handler-calendar.c:340 -#, fuzzy msgid "Select a Calendar" -msgstr "ମନୋନୀତ କର କ୍ଯାଲେଣ୍ଡର" +msgstr "ଗୋଟିଏ କ୍ଯାଲେଣ୍ଡର ବାଛନ୍ତୁ" #: ../calendar/gui/e-attachment-handler-calendar.c:367 #, fuzzy -- cgit v1.2.3 From 6ff4cd4b2895bf7dce4065cd58837ef3c8980d18 Mon Sep 17 00:00:00 2001 From: Manoj Kumar Giri Date: Thu, 4 Jun 2009 17:57:14 +0530 Subject: Added Entries for Oriya Translation. --- po/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/po/ChangeLog b/po/ChangeLog index 288d6506bd..1a1b53f1c4 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-06-04 Manoj Kumar Giri + + * or.po: Updated Oriya Translation + 2009-04-24 Milan Crha ** Part of fix for bug #340783 -- cgit v1.2.3 From 75ef38d5cbe86fd72cb34e5d04bf2c49e00ec912 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 5 Jun 2009 11:02:59 +0200 Subject: Bug #362907 - Give icons to Drafts/Sent/Templates folders --- mail/em-folder-tree-model.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 89a0e77b66..aa977ad3e7 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -449,12 +449,12 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite guint unread; GtkTreePath *path; GtkTreeIter sub; - gboolean load = FALSE; + gboolean load = FALSE, is_drafts = FALSE, is_templates = FALSE; struct _CamelFolder *folder; gboolean emitted = FALSE; const gchar *name; const gchar *icon_name; - guint32 flags; + guint32 flags, add_flags = 0; EMEventTargetCustomIcon *target; /* make sure we don't already know about it? */ @@ -513,8 +513,10 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite if (si->store == mail_component_peek_local_store(NULL)) { if (!strcmp(fi->full_name, "Drafts")) { name = _("Drafts"); + is_drafts = TRUE; } else if (!strcmp(fi->full_name, "Templates")) { name = _("Templates"); + is_templates = TRUE; } else if (!strcmp(fi->full_name, "Inbox")) { flags = (flags & ~CAMEL_FOLDER_TYPE_MASK) | CAMEL_FOLDER_TYPE_INBOX; name = _("Inbox"); @@ -527,8 +529,31 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite } } + if (si->account && (flags & CAMEL_FOLDER_TYPE_MASK) == 0) { + if (!is_drafts && si->account->drafts_folder_uri) { + gchar *curi = em_uri_to_camel (si->account->drafts_folder_uri); + is_drafts = camel_store_folder_uri_equal (si->store, fi->uri, curi); + g_free (curi); + } + + if (si->account->sent_folder_uri) { + gchar *curi = em_uri_to_camel (si->account->sent_folder_uri); + if (camel_store_folder_uri_equal (si->store, fi->uri, curi)) { + add_flags = CAMEL_FOLDER_TYPE_SENT; + } + g_free(curi); + } + } + /* Choose an icon name for the folder. */ - icon_name = em_folder_utils_get_icon_name (flags); + icon_name = em_folder_utils_get_icon_name (flags | add_flags); + + if (g_str_equal (icon_name, "folder")) { + if (is_drafts) + icon_name = "accessories-text-editor"; + else if (is_templates) + icon_name = "text-x-generic-template"; + } gtk_tree_store_set ( tree_store, iter, -- cgit v1.2.3 From 4f37292cf83994f511fc6113cbc0e63b8f612099 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 5 Jun 2009 13:21:50 +0200 Subject: Regenerate the def files according to the current state of the real exports. --- win32/libemiscwidgets.def | 170 +++++++++--- win32/libetable.def | 1 + win32/libevolution-addressbook.def | 5 - win32/libevolution-calendar.def | 31 +-- win32/libevolution-mail.def | 547 ++----------------------------------- 5 files changed, 160 insertions(+), 594 deletions(-) diff --git a/win32/libemiscwidgets.def b/win32/libemiscwidgets.def index 2681060858..b713ce180d 100644 --- a/win32/libemiscwidgets.def +++ b/win32/libemiscwidgets.def @@ -21,34 +21,137 @@ EXPORTS e_activity_handler_set_logger e_activity_handler_set_message e_activity_handler_unset_message - e_attachment_bar_add_attachment - e_attachment_bar_add_attachment_silent - e_attachment_bar_attach - e_attachment_bar_attach_mime_part - e_attachment_bar_attach_remote_file - e_attachment_bar_bonobo_ui_populate_with_recent - e_attachment_bar_create_attachment_cache - e_attachment_bar_edit_selected - e_attachment_bar_get_all_attachments - e_attachment_bar_get_attachment - e_attachment_bar_get_download_count - e_attachment_bar_get_num_attachments - e_attachment_bar_get_parts - e_attachment_bar_get_selected - e_attachment_bar_get_selector - e_attachment_bar_get_type - e_attachment_bar_new - e_attachment_bar_recent_action_new - e_attachment_bar_refresh - e_attachment_bar_remove_selected - e_attachment_bar_set_width - e_attachment_bar_to_multipart - e_attachment_build_remote_file - e_attachment_edit + e_attachment_add_to_multipart + e_attachment_button_get_attachment + e_attachment_button_get_expandable + e_attachment_button_get_expanded + e_attachment_button_get_type + e_attachment_button_get_view + e_attachment_button_new + e_attachment_button_set_attachment + e_attachment_button_set_expandable + e_attachment_button_set_expanded + e_attachment_cancel + e_attachment_dialog_get_attachment + e_attachment_dialog_get_type + e_attachment_dialog_new + e_attachment_dialog_set_attachment + e_attachment_get_can_show + e_attachment_get_description + e_attachment_get_disposition + e_attachment_get_encrypted + e_attachment_get_file + e_attachment_get_file_info + e_attachment_get_loading + e_attachment_get_mime_part + e_attachment_get_percent + e_attachment_get_reference + e_attachment_get_saving + e_attachment_get_shown + e_attachment_get_signed + e_attachment_get_thumbnail_path e_attachment_get_type + e_attachment_handler_get_drag_actions + e_attachment_handler_get_target_table + e_attachment_handler_get_type + e_attachment_handler_get_view + e_attachment_handler_image_get_type + e_attachment_handler_sendto_get_type + e_attachment_icon_view_get_type + e_attachment_icon_view_new + e_attachment_is_rfc822 + e_attachment_list_apps + e_attachment_load_async + e_attachment_load_finish + e_attachment_load_handle_error e_attachment_new - e_attachment_new_from_mime_part - e_attachment_new_remote_file + e_attachment_new_for_message + e_attachment_new_for_path + e_attachment_new_for_uri + e_attachment_open_async + e_attachment_open_finish + e_attachment_open_handle_error + e_attachment_paned_drag_data_received + e_attachment_paned_get_active_view + e_attachment_paned_get_content_area + e_attachment_paned_get_expanded + e_attachment_paned_get_type + e_attachment_paned_new + e_attachment_paned_set_active_view + e_attachment_paned_set_expanded + e_attachment_save_async + e_attachment_save_finish + e_attachment_save_handle_error + e_attachment_set_can_show + e_attachment_set_disposition + e_attachment_set_encrypted + e_attachment_set_file + e_attachment_set_mime_part + e_attachment_set_reference + e_attachment_set_shown + e_attachment_set_signed + e_attachment_store_add_attachment + e_attachment_store_add_to_multipart + e_attachment_store_get_attachments + e_attachment_store_get_current_folder + e_attachment_store_get_num_attachments + e_attachment_store_get_num_loading + e_attachment_store_get_total_size + e_attachment_store_get_type + e_attachment_store_get_uris_async + e_attachment_store_get_uris_finish + e_attachment_store_new + e_attachment_store_remove_attachment + e_attachment_store_run_file_chooser_dialog + e_attachment_store_run_load_dialog + e_attachment_store_run_save_dialog + e_attachment_store_save_async + e_attachment_store_save_finish + e_attachment_store_set_current_folder + e_attachment_tree_view_get_type + e_attachment_tree_view_new + e_attachment_view_add_action_group + e_attachment_view_button_press_event + e_attachment_view_button_release_event + e_attachment_view_dispose + e_attachment_view_drag_begin + e_attachment_view_drag_data_get + e_attachment_view_drag_data_received + e_attachment_view_drag_dest_set + e_attachment_view_drag_dest_unset + e_attachment_view_drag_drop + e_attachment_view_drag_end + e_attachment_view_drag_motion + e_attachment_view_drag_source_set + e_attachment_view_drag_source_unset + e_attachment_view_finalize + e_attachment_view_get_action + e_attachment_view_get_action_group + e_attachment_view_get_drag_actions + e_attachment_view_get_editable + e_attachment_view_get_path_at_pos + e_attachment_view_get_popup_menu + e_attachment_view_get_private + e_attachment_view_get_selected_attachments + e_attachment_view_get_selected_paths + e_attachment_view_get_store + e_attachment_view_get_target_list + e_attachment_view_get_type + e_attachment_view_get_ui_manager + e_attachment_view_init + e_attachment_view_key_press_event + e_attachment_view_open_path + e_attachment_view_path_is_selected + e_attachment_view_recent_action_new + e_attachment_view_remove_selected + e_attachment_view_select_all + e_attachment_view_select_path + e_attachment_view_set_editable + e_attachment_view_show_popup_menu + e_attachment_view_sync_selection + e_attachment_view_unselect_all + e_attachment_view_unselect_path + e_attachment_view_update_actions e_auto_kill_popup_menu_on_selection_done e_black DATA e_calendar_get_border_size @@ -180,19 +283,6 @@ EXPORTS e_dropdown_button_construct e_dropdown_button_get_type e_dropdown_button_new - e_expander_get_expanded - e_expander_get_label - e_expander_get_label_widget - e_expander_get_spacing - e_expander_get_type - e_expander_get_use_underline - e_expander_new - e_expander_new_with_mnemonic - e_expander_set_expanded - e_expander_set_label - e_expander_set_label_widget - e_expander_set_spacing - e_expander_set_use_underline e_glade_xml_connect_widget e_glade_xml_set_sensitive e_hsv_to_rgb @@ -277,6 +367,7 @@ EXPORTS e_search_bar_get_text e_search_bar_get_type e_search_bar_get_viewitem_id + e_search_bar_lite_new e_search_bar_new e_search_bar_paint e_search_bar_scope_enable @@ -398,3 +489,4 @@ EXPORTS e_xml_get_translated_utf8_string_prop_by_name icon_data DATA send_options_make_dateedit + diff --git a/win32/libetable.def b/win32/libetable.def index f735270ee0..8c3a487439 100644 --- a/win32/libetable.def +++ b/win32/libetable.def @@ -433,6 +433,7 @@ EXPORTS e_tree_model_node_traverse e_tree_model_node_traverse_preorder e_tree_model_pre_change + e_tree_model_rebuilt e_tree_model_set_value_at e_tree_model_sort_value_at e_tree_model_to_view_row diff --git a/win32/libevolution-addressbook.def b/win32/libevolution-addressbook.def index 6610055249..19d58ee961 100644 --- a/win32/libevolution-addressbook.def +++ b/win32/libevolution-addressbook.def @@ -25,8 +25,6 @@ EXPORTS e_addressbook_reflow_adapter_get_type e_addressbook_reflow_adapter_new e_contact_print - e_contact_print_style_editor_get_type - e_contact_print_style_editor_new e_minicard_activate_editor e_minicard_compare e_minicard_get_card_id @@ -65,8 +63,6 @@ EXPORTS eab_create_image_chooser_widget eab_error_dialog eab_load_error_dialog - eab_marshal_INT__POINTER - eab_marshal_VOID__INT_INT eab_menu_get_type eab_menu_hook_get_type eab_menu_new @@ -107,7 +103,6 @@ EXPORTS eab_table_adapter_get_type eab_table_adapter_new eab_transfer_contacts - eab_vcard_control_new eab_view_can_copy eab_view_can_copy_to_folder eab_view_can_create diff --git a/win32/libevolution-calendar.def b/win32/libevolution-calendar.def index b4cfde7282..d7dda49b16 100644 --- a/win32/libevolution-calendar.def +++ b/win32/libevolution-calendar.def @@ -248,7 +248,6 @@ EXPORTS calendar_config_add_notification_day_second_zone calendar_config_add_notification_day_start_hour calendar_config_add_notification_day_start_minute - calendar_config_add_notification_daylight_saving calendar_config_add_notification_dnav_show_week_no calendar_config_add_notification_dview_show_week_no calendar_config_add_notification_free_busy_template @@ -257,6 +256,7 @@ EXPORTS calendar_config_add_notification_hide_completed_tasks_value calendar_config_add_notification_marcus_bains calendar_config_add_notification_memos_selected + calendar_config_add_notification_month_scroll_by_week calendar_config_add_notification_preview_state calendar_config_add_notification_primary_calendar calendar_config_add_notification_primary_memos @@ -265,6 +265,7 @@ EXPORTS calendar_config_add_notification_tasks_selected calendar_config_add_notification_time_divisions calendar_config_add_notification_timezone + calendar_config_add_notification_use_system_timezone calendar_config_add_notification_week_start_day calendar_config_add_notification_working_days calendar_config_free_day_second_zones @@ -280,7 +281,6 @@ EXPORTS calendar_config_get_day_second_zones calendar_config_get_day_start_hour calendar_config_get_day_start_minute - calendar_config_get_daylight_saving calendar_config_get_default_reminder_interval calendar_config_get_default_reminder_units calendar_config_get_dir_path @@ -296,6 +296,7 @@ EXPORTS calendar_config_get_marcus_bains calendar_config_get_memos_selected calendar_config_get_month_hpane_pos + calendar_config_get_month_scroll_by_week calendar_config_get_month_vpane_pos calendar_config_get_preview_state calendar_config_get_primary_calendar @@ -315,7 +316,9 @@ EXPORTS calendar_config_get_tasks_selected calendar_config_get_time_divisions calendar_config_get_timezone + calendar_config_get_timezone_stored calendar_config_get_use_default_reminder + calendar_config_get_use_system_timezone calendar_config_get_vpane_pos calendar_config_get_week_start_day calendar_config_get_working_days @@ -333,7 +336,6 @@ EXPORTS calendar_config_set_day_second_zone calendar_config_set_day_start_hour calendar_config_set_day_start_minute - calendar_config_set_daylight_saving calendar_config_set_default_reminder_interval calendar_config_set_default_reminder_units calendar_config_set_dir_path @@ -346,6 +348,7 @@ EXPORTS calendar_config_set_hpane_pos calendar_config_set_memos_selected calendar_config_set_month_hpane_pos + calendar_config_set_month_scroll_by_week calendar_config_set_month_vpane_pos calendar_config_set_preview_state calendar_config_set_primary_calendar @@ -366,6 +369,7 @@ EXPORTS calendar_config_set_time_divisions calendar_config_set_timezone calendar_config_set_use_default_reminder + calendar_config_set_use_system_timezone calendar_config_set_vpane_pos calendar_config_set_week_start_day calendar_config_set_working_days @@ -461,6 +465,7 @@ EXPORTS e_alarm_list_new e_alarm_list_remove e_alarm_list_set_alarm + e_attachment_handler_calendar_get_type e_cal_comp_preview_url_requested_cb e_cal_component_memo_preview_clear e_cal_component_memo_preview_display @@ -547,26 +552,8 @@ EXPORTS e_cal_popup_get_type e_cal_popup_hook_get_type e_cal_popup_new - e_cal_popup_target_new_attachments e_cal_popup_target_new_select e_cal_popup_target_new_source - e_calendar_marshal_VOID__ENUM_ENUM - e_calendar_marshal_VOID__ENUM_STRING - e_calendar_marshal_VOID__INT_BOOLEAN - e_calendar_marshal_VOID__INT_INT - e_calendar_marshal_VOID__INT_OBJECT - e_calendar_marshal_VOID__INT_POINTER - e_calendar_marshal_VOID__INT_STRING - e_calendar_marshal_VOID__LONG_LONG - e_calendar_marshal_VOID__POINTER_ENUM - e_calendar_marshal_VOID__POINTER_POINTER - e_calendar_marshal_VOID__POINTER_STRING - e_calendar_marshal_VOID__STRING_BOOLEAN_INT_INT - e_calendar_marshal_VOID__STRING_INT - e_calendar_marshal_VOID__STRING_INT_INT - e_calendar_marshal_VOID__STRING_POINTER_POINTER - e_calendar_marshal_VOID__STRING_STRING - e_calendar_marshal_VOID__STRING_STRING_STRING e_calendar_table_complete_selected e_calendar_table_config_get_table e_calendar_table_config_get_type @@ -617,6 +604,7 @@ EXPORTS e_calendar_view_new_appointment_for e_calendar_view_new_appointment_full e_calendar_view_open_event + e_calendar_view_open_event_with_flags e_calendar_view_paste_clipboard e_calendar_view_set_activity_handler e_calendar_view_set_calendar @@ -1119,4 +1107,3 @@ EXPORTS weekday_picker_set_blocked_days weekday_picker_set_days weekday_picker_set_week_start_day - diff --git a/win32/libevolution-mail.def b/win32/libevolution-mail.def index 9e630a836e..b0530a17fc 100644 --- a/win32/libevolution-mail.def +++ b/win32/libevolution-mail.def @@ -6,132 +6,26 @@ EXPORTS GNOME_Evolution_MailComponent_test POA_GNOME_Evolution_MailComponent__fini POA_GNOME_Evolution_MailComponent__init - TC_GNOME_Evolution_MailComponent_struct + TC_GNOME_Evolution_MailComponent_struct DATA _ORBIT_skel_small_GNOME_Evolution_MailComponent_test create_combo_text_widget - e_composer_actions_init - e_composer_autosave_find_orphans - e_composer_autosave_get_enabled - e_composer_autosave_get_fd - e_composer_autosave_get_filename - e_composer_autosave_get_saved - e_composer_autosave_register - e_composer_autosave_set_enabled - e_composer_autosave_set_saved - e_composer_autosave_snapshot - e_composer_autosave_unregister - e_composer_find_data_file - e_composer_from_header_get_account_list - e_composer_from_header_get_active - e_composer_from_header_get_active_name - e_composer_from_header_get_type - e_composer_from_header_new - e_composer_from_header_set_account_list - e_composer_from_header_set_active - e_composer_from_header_set_active_name - e_composer_get_default_charset - e_composer_header_get_label - e_composer_header_get_sensitive - e_composer_header_get_type - e_composer_header_get_visible - e_composer_header_set_input_tooltip - e_composer_header_set_sensitive - e_composer_header_set_title_tooltip - e_composer_header_set_visible - e_composer_header_table_add_destinations_bcc - e_composer_header_table_add_destinations_cc - e_composer_header_table_add_destinations_to - e_composer_header_table_get_account - e_composer_header_table_get_account_list - e_composer_header_table_get_account_name - e_composer_header_table_get_destinations - e_composer_header_table_get_destinations_bcc - e_composer_header_table_get_destinations_cc - e_composer_header_table_get_destinations_to - e_composer_header_table_get_header - e_composer_header_table_get_header_sensitive - e_composer_header_table_get_header_visible - e_composer_header_table_get_post_to - e_composer_header_table_get_reply_to - e_composer_header_table_get_signature - e_composer_header_table_get_signature_list - e_composer_header_table_get_subject - e_composer_header_table_get_type - e_composer_header_table_new - e_composer_header_table_set_account - e_composer_header_table_set_account_list - e_composer_header_table_set_account_name - e_composer_header_table_set_destinations_bcc - e_composer_header_table_set_destinations_cc - e_composer_header_table_set_destinations_to - e_composer_header_table_set_header_sensitive - e_composer_header_table_set_header_visible - e_composer_header_table_set_post_to_base - e_composer_header_table_set_post_to_list - e_composer_header_table_set_reply_to - e_composer_header_table_set_signature - e_composer_header_table_set_signature_list - e_composer_header_table_set_subject - e_composer_name_header_add_destinations - e_composer_name_header_get_destinations - e_composer_name_header_get_name_selector - e_composer_name_header_get_type - e_composer_name_header_new - e_composer_name_header_set_destinations - e_composer_post_header_get_account - e_composer_post_header_get_folders - e_composer_post_header_get_type - e_composer_post_header_new - e_composer_post_header_set_account - e_composer_post_header_set_folders - e_composer_post_header_set_folders_base - e_composer_private_dispose - e_composer_private_finalize - e_composer_private_init - e_composer_text_header_get_text - e_composer_text_header_get_type - e_composer_text_header_new_button - e_composer_text_header_new_label - e_composer_text_header_set_text - e_load_spell_languages - e_msg_composer_add_header - e_msg_composer_add_inline_image_from_file - e_msg_composer_add_inline_image_from_mime_part - e_msg_composer_add_message_attachments - e_msg_composer_attach - e_msg_composer_check_autosave - e_msg_composer_clear_inlined_table - e_msg_composer_get_attachment_bar - e_msg_composer_get_from - e_msg_composer_get_header_table - e_msg_composer_get_message - e_msg_composer_get_message_draft - e_msg_composer_get_message_print - e_msg_composer_get_raw_message_text - e_msg_composer_get_remote_download_count - e_msg_composer_get_reply_to - e_msg_composer_get_sig_file_content - e_msg_composer_get_type - e_msg_composer_is_exiting - e_msg_composer_load_from_file - e_msg_composer_modify_header - e_msg_composer_new - e_msg_composer_new_from_url - e_msg_composer_new_redirect - e_msg_composer_new_with_message - e_msg_composer_new_with_type - e_msg_composer_remove_header - e_msg_composer_reply_indent - e_msg_composer_request_close_all - e_msg_composer_save_draft - e_msg_composer_send - e_msg_composer_set_alternative - e_msg_composer_set_body - e_msg_composer_set_body_text - e_msg_composer_set_enable_autosave - e_msg_composer_set_send_options - e_msg_composer_show_sig_file - e_save_spell_languages + e_attachment_handler_mail_get_type + e_mail_attachment_bar_get_active_view + e_mail_attachment_bar_get_expanded + e_mail_attachment_bar_get_type + e_mail_attachment_bar_new + e_mail_attachment_bar_set_active_view + e_mail_attachment_bar_set_expanded + e_mail_search_bar_changed + e_mail_search_bar_clear + e_mail_search_bar_get_case_sensitive + e_mail_search_bar_get_html + e_mail_search_bar_get_text + e_mail_search_bar_get_tokenizer + e_mail_search_bar_get_type + e_mail_search_bar_new + e_mail_search_bar_set_case_sensitive + e_mail_search_bar_set_text e_searching_tokenizer_add_primary_search_string e_searching_tokenizer_add_secondary_search_string e_searching_tokenizer_get_type @@ -145,121 +39,18 @@ EXPORTS e_signature_editor_get_type e_signature_editor_new e_signature_editor_set_signature - efhd_mnemonic_show_bar - em_account_editor_dropdown_new - em_account_editor_folder_selector_button_new - em_account_editor_get_type - em_account_editor_new - em_account_editor_ssl_selector_new em_account_prefs_get_type em_account_prefs_new em_account_prefs_treeview_new em_composer_prefs_get_type em_composer_prefs_new em_composer_prefs_new_signature - em_composer_utils_setup_callbacks - em_config_get_type - em_config_hook_get_type - em_config_new - em_config_target_new_account - em_config_target_new_folder - em_config_target_new_prefs - em_event_get_type - em_event_hook_get_type - em_event_peek - em_event_target_new_composer - em_event_target_new_custom_icon - em_event_target_new_folder - em_event_target_new_folder_browser - em_event_target_new_message - em_event_target_new_send_receive - em_filename_make_safe - em_filter_context_add_action - em_filter_context_create_action - em_filter_context_find_action - em_filter_context_get_type - em_filter_context_new - em_filter_context_next_action - em_filter_editor_construct - em_filter_editor_get_type - em_filter_editor_new - em_filter_folder_element_get_type - em_filter_folder_element_new - em_filter_folder_element_set_value - em_filter_rule_add_action - em_filter_rule_build_action - em_filter_rule_get_type - em_filter_rule_new - em_filter_rule_remove_action - em_filter_rule_replace_action - em_filter_source_element_get_type - em_filter_source_element_new em_folder_browser_get_type em_folder_browser_get_wide em_folder_browser_new em_folder_browser_show_preview em_folder_browser_show_wide em_folder_browser_suppress_message_selection - em_folder_properties_show - em_folder_selection_button_get_multiselect - em_folder_selection_button_get_selection - em_folder_selection_button_get_selection_mult - em_folder_selection_button_get_type - em_folder_selection_button_new - em_folder_selection_button_set_multiselect - em_folder_selection_button_set_selection - em_folder_selection_button_set_selection_mult - em_folder_selector_construct - em_folder_selector_create_new - em_folder_selector_get_selected_path - em_folder_selector_get_selected_paths - em_folder_selector_get_selected_uri - em_folder_selector_get_selected_uris - em_folder_selector_get_type - em_folder_selector_new - em_folder_selector_set_selected - em_folder_selector_set_selected_list - em_folder_tree_enable_drag_and_drop - em_folder_tree_get_model - em_folder_tree_get_model_storeinfo - em_folder_tree_get_selected_folder - em_folder_tree_get_selected_folder_info - em_folder_tree_get_selected_path - em_folder_tree_get_selected_paths - em_folder_tree_get_selected_uri - em_folder_tree_get_selected_uris - em_folder_tree_get_type - em_folder_tree_model_add_store - em_folder_tree_model_expand_foreach - em_folder_tree_model_get_expanded - em_folder_tree_model_get_expanded_uri - em_folder_tree_model_get_folder_name - em_folder_tree_model_get_selected - em_folder_tree_model_get_type - em_folder_tree_model_is_type_inbox - em_folder_tree_model_new - em_folder_tree_model_remove_folders - em_folder_tree_model_remove_store - em_folder_tree_model_save_state - em_folder_tree_model_set_expanded - em_folder_tree_model_set_expanded_uri - em_folder_tree_model_set_folder_info - em_folder_tree_model_set_selected - em_folder_tree_model_set_unread_count - em_folder_tree_new - em_folder_tree_new_with_model - em_folder_tree_select_next_path - em_folder_tree_select_prev_path - em_folder_tree_set_excluded - em_folder_tree_set_excluded_func - em_folder_tree_set_multiselect - em_folder_tree_set_selected - em_folder_tree_set_selected_list - em_folder_utils_copy_folder - em_folder_utils_copy_folders - em_folder_utils_create_folder - em_folder_utils_delete_folder - em_folder_utils_rename_folder em_folder_view_get_popup_target em_folder_view_get_type em_folder_view_mark_selected @@ -269,47 +60,26 @@ EXPORTS em_folder_view_set_hide_deleted em_folder_view_set_statusbar em_folder_view_setup_view_instance - em_format_add_header - em_format_add_puri - em_format_class_add_handler - em_format_class_remove_handler - em_format_clear_headers - em_format_clear_puri_tree - em_format_default_headers - em_format_describe_part - em_format_fallback_handler - em_format_find_puri - em_format_find_visible_puri - em_format_format_content - em_format_format_error - em_format_format_secure - em_format_format_text - em_format_get_type + em_folder_view_show_search_bar em_format_hook_get_type em_format_hook_register_type em_format_html_add_pobject em_format_html_clear_pobject em_format_html_display_copy em_format_html_display_cut - em_format_html_display_get_bar em_format_html_display_get_type em_format_html_display_goto_anchor em_format_html_display_new em_format_html_display_paste em_format_html_display_popup_menu - em_format_html_display_search - em_format_html_display_search_close - em_format_html_display_search_with em_format_html_display_set_animate em_format_html_display_set_caret_mode - em_format_html_display_set_search em_format_html_display_zoom_in em_format_html_display_zoom_out em_format_html_display_zoom_reset em_format_html_file_part em_format_html_find_pobject em_format_html_find_pobject_func - em_format_html_get_search_dialog em_format_html_get_type em_format_html_job_new em_format_html_job_queue @@ -322,31 +92,9 @@ EXPORTS em_format_html_remove_pobject em_format_html_set_load_http em_format_html_set_mark_citations - em_format_is_attachment - em_format_is_inline - em_format_merge_handler - em_format_part - em_format_part_as - em_format_pull_level - em_format_push_level - em_format_quote_get_type - em_format_quote_new - em_format_set_charset - em_format_set_default_charset - em_format_set_inline - em_format_set_mode - em_format_set_session em_html_stream_get_type em_html_stream_new em_html_stream_set_flags - em_icon_stream_clear_cache - em_icon_stream_get_image - em_icon_stream_get_type - em_icon_stream_is_resized - em_icon_stream_new - em_inline_filter_get_multipart - em_inline_filter_get_type - em_inline_filter_new em_junk_error_quark em_junk_hook_get_type em_junk_hook_register_type @@ -355,11 +103,6 @@ EXPORTS em_mailer_prefs_header_from_xml em_mailer_prefs_header_to_xml em_mailer_prefs_new - em_marshal_BOOLEAN__BOXED_POINTER_POINTER - em_marshal_BOOLEAN__POINTER - em_marshal_VOID__POINTER_POINTER - em_marshal_VOID__STRING_STRING - em_marshal_VOID__STRING_STRING_UINT em_menu_get_type em_menu_hook_get_type em_menu_new @@ -371,113 +114,9 @@ EXPORTS em_migrate em_network_prefs_get_type em_network_prefs_new - em_popup_get_type - em_popup_hook_get_type - em_popup_new - em_popup_target_new_attachments - em_popup_target_new_folder - em_popup_target_new_part - em_popup_target_new_select - em_popup_target_new_uri - em_search_context_get_type - em_search_context_new - em_select_folder - em_stripsig_filter_get_type - em_stripsig_filter_new em_subscribe_editor_new - em_sync_stream_get_type - em_sync_stream_set_buffer_size - em_uri_from_camel - em_uri_to_camel - em_utils_add_address - em_utils_add_vcard - em_utils_adjustment_page - em_utils_check_user_can_send_mail - em_utils_clear_get_password_canceled_accounts_flag - em_utils_compose_new_message - em_utils_compose_new_message_with_mailto - em_utils_composer_save_draft_cb - em_utils_composer_send_cb - em_utils_configure_account - em_utils_contact_photo - em_utils_edit_filters - em_utils_edit_message - em_utils_edit_messages - em_utils_empty_trash - em_utils_expunge_folder - em_utils_flag_for_followup - em_utils_flag_for_followup_clear - em_utils_flag_for_followup_completed - em_utils_folder_is_drafts - em_utils_folder_is_outbox - em_utils_folder_is_sent - em_utils_folder_is_templates - em_utils_folder_name_from_uri - em_utils_forward_attached - em_utils_forward_inline - em_utils_forward_message - em_utils_forward_message_raw - em_utils_forward_messages - em_utils_forward_quoted - em_utils_get_proxy_uri - em_utils_handle_receipt - em_utils_in_addressbook - em_utils_message_to_html - em_utils_part_to_html - em_utils_post_reply_to_message_by_uid - em_utils_post_to_folder - em_utils_post_to_url - em_utils_prompt_user - em_utils_redirect_message - em_utils_redirect_message_by_uid - em_utils_reply_to_message - em_utils_save_messages - em_utils_save_part - em_utils_save_part_to_file - em_utils_save_parts - em_utils_selection_get_mailbox - em_utils_selection_get_message - em_utils_selection_get_uidlist - em_utils_selection_get_urilist - em_utils_selection_set_mailbox - em_utils_selection_set_uidlist - em_utils_selection_set_urilist - em_utils_send_receipt - em_utils_show_error_silent - em_utils_show_info_silent - em_utils_snoop_type - em_utils_temp_save_part - em_utils_uids_copy - em_utils_uids_free - em_vfolder_context_get_type - em_vfolder_context_new - em_vfolder_editor_get_type - em_vfolder_editor_new - em_vfolder_editor_sourcelist_new - em_vfolder_rule_add_source - em_vfolder_rule_find_source - em_vfolder_rule_from_address - em_vfolder_rule_from_message - em_vfolder_rule_get_type - em_vfolder_rule_new - em_vfolder_rule_next_source - em_vfolder_rule_remove_source emj_get_type - filter_gui_add_from_message - filter_rule_from_message ldata DATA - mail_append_mail - mail_async_event DATA - mail_async_event_destroy - mail_async_event_emit - mail_async_event_new - mail_autoreceive_init - mail_build_attachment - mail_call_main - mail_cancel_all - mail_cancel_hook_add - mail_cancel_hook_remove - mail_check_service mail_component_add_store mail_component_get_folder mail_component_get_folder_uri @@ -496,139 +135,8 @@ EXPORTS mail_component_remove_store_by_uri mail_component_show_logger mail_component_stores_foreach - mail_config_add_account - mail_config_add_signature - mail_config_clear mail_config_control_factory_cb - mail_config_find_account - mail_config_folder_to_cachename - mail_config_folder_to_safe_url - mail_config_get_account_by_name - mail_config_get_account_by_source_url - mail_config_get_account_by_transport_url - mail_config_get_account_by_uid - mail_config_get_accounts - mail_config_get_address_count - mail_config_get_allowable_mime_types - mail_config_get_default_account - mail_config_get_default_identity - mail_config_get_default_transport - mail_config_get_enable_magic_spacebar - mail_config_get_error_level - mail_config_get_error_timeout - mail_config_get_gconf_client - mail_config_get_labels - mail_config_get_lookup_book - mail_config_get_lookup_book_local_only - mail_config_get_message_limit - mail_config_get_signature_by_name - mail_config_get_signature_by_uid - mail_config_get_signatures - mail_config_get_sync_timeout - mail_config_has_proxies - mail_config_init - mail_config_is_configured - mail_config_is_corrupt - mail_config_prune_proxies - mail_config_reload_junk_headers - mail_config_remove_account - mail_config_remove_account_proxies - mail_config_remove_signature - mail_config_save_accounts - mail_config_save_signatures - mail_config_scripts_disabled - mail_config_service_set_save_passwd - mail_config_set_default_account - mail_config_signature_new - mail_config_signature_run_script - mail_config_uri_deleted - mail_config_uri_renamed - mail_config_write - mail_config_write_on_exit - mail_crypto_get_pgp_cipher_context - mail_disable_stop - mail_empty_trash - mail_enable_stop - mail_execute_shell_command - mail_expunge_folder - mail_fetch_mail - mail_filter_delete_uri - mail_filter_folder - mail_filter_junk - mail_filter_on_demand - mail_filter_rename_uri - mail_folder_cache_get_folder_info_flags - mail_get_folder - mail_get_folder_quota - mail_get_folderinfo - mail_get_message - mail_get_messages - mail_get_messagex - mail_get_store - mail_in_main_thread mail_indicate_new_mail - mail_msg_active - mail_msg_cancel - mail_msg_check_error - mail_msg_cleanup - mail_msg_fast_ordered_push - mail_msg_init - mail_msg_main_loop_push - mail_msg_new - mail_msg_ref - mail_msg_set_cancelable - mail_msg_slow_ordered_push - mail_msg_unordered_push - mail_msg_unref - mail_msg_wait - mail_msg_wait_all - mail_note_folder - mail_note_get_folder_from_uri - mail_note_store - mail_note_store_remove - mail_prep_offline - mail_receive_uri - mail_refresh_folder - mail_remove_folder - mail_save_messages - mail_save_part - mail_send - mail_send_queue - mail_send_receive - mail_session_add_junk_plugin - mail_session_add_password - mail_session_flush_filter_log - mail_session_forget_password - mail_session_forget_passwords - mail_session_get_interactive - mail_session_get_junk_plugins - mail_session_get_password - mail_session_init - mail_session_remember_password - mail_session_set_interactive - mail_session_set_junk_headers - mail_session_shutdown - mail_store_prepare_offline - mail_store_set_offline - mail_sync_folder - mail_sync_store - mail_tool_do_movemail - mail_tool_generate_forward_subject - mail_tool_get_inbox - mail_tool_get_trash - mail_tool_make_message_attachment - mail_tool_remove_xevolution_headers - mail_tool_restore_xevolution_headers - mail_tool_uri_to_folder - mail_tools_folder_to_url - mail_tools_x_evolution_message_parse - mail_transfer_messages - mail_vfolder_add_uri - mail_vfolder_delete_uri - mail_vfolder_get_sources_local - mail_vfolder_get_sources_remote - mail_vfolder_rename_uri - mail_vfolder_shutdown message_list_can_select message_list_copy message_list_ensure_message @@ -662,22 +170,5 @@ EXPORTS message_list_set_threaded_collapse_all message_list_set_threaded_expand_all message_list_thaw - message_tag_editor_get_tag_list - message_tag_editor_get_type - message_tag_editor_set_tag_list - message_tag_followup_append_message - message_tag_followup_get_type - message_tag_followup_new - session DATA status_check - target_date_new - vfolder_clone_rule - vfolder_create_part - vfolder_edit - vfolder_edit_rule - vfolder_gui_add_from_address - vfolder_gui_add_from_message - vfolder_gui_add_rule - vfolder_load_storage - vfolder_revert vfolder_store DATA -- cgit v1.2.3 From a979826a00beebd29850445ff2a27187946fade1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 5 Jun 2009 14:45:59 +0200 Subject: libevolution-mail-shared is a new library, so reflect its existence in the win32 bootstrap import libraries. --- addressbook/gui/component/Makefile.am | 2 +- calendar/gui/Makefile.am | 2 +- mail/importers/Makefile.am | 4 +- win32/Makefile.am | 7 + win32/libevolution-mail-shared.def | 531 ++++++++++++++++++++++++++++++++++ 5 files changed, 543 insertions(+), 3 deletions(-) create mode 100644 win32/libevolution-mail-shared.def diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index b7870eddc7..3a0732a995 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -1,5 +1,5 @@ if OS_WIN32 -WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la +WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail-shared.la endif INCLUDES = \ diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 509aff1596..95576afc33 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -1,5 +1,5 @@ if OS_WIN32 -WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la +WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail-shared.la endif ## CORBA stuff diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 9029d705a0..4faee016da 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -1,5 +1,7 @@ if OS_WIN32 -WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la +WIN32_BOOTSTRAP_LIBS = \ + $(top_builddir)/win32/libevolution-mail-shared.la \ + $(top_builddir)/win32/libevolution-mail.la endif privsolib_LTLIBRARIES = libevolution-mail-importers.la diff --git a/win32/Makefile.am b/win32/Makefile.am index 7720d56543..d2b25958c0 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -6,6 +6,7 @@ EXTRA_DIST = \ libevolution-addressbook.def \ libevolution-calendar.def \ libevolution-mail.def \ + libevolution-mail-shared.def \ libfilter.def if OS_WIN32 @@ -16,6 +17,7 @@ BOOTSTRAP_LIBS = \ libevolution-addressbook.la \ libevolution-calendar.la \ libevolution-mail.la \ + libevolution-mail-shared.la \ libfilter.la endif @@ -56,6 +58,11 @@ libevolution-mail.la: dummy.la libevolution-mail.def mkdir -p .libs $(DLLTOOL) --output-lib=.libs/libevolution-mail.dll.a --dllname=libevolution-mail.dll --input-def=libevolution-mail.def +libevolution-mail-shared.la: dummy.la libevolution-mail-shared.def + sed -e s!%DLL%!libevolution-mail-shared-0! -e s!%LIB%!libevolution-mail-shared! -e s!%PFX%!$(prefix)! $@ + mkdir -p .libs + $(DLLTOOL) --output-lib=.libs/libevolution-mail-shared.dll.a --dllname=libevolution-mail-shared-0.dll --input-def=libevolution-mail-shared.def + libfilter.la: dummy.la libfilter.def sed -e s!%DLL%!libfilter-0! -e s!%LIB%!libfilter! -e s!%PFX%!$(prefix)! $@ mkdir -p .libs diff --git a/win32/libevolution-mail-shared.def b/win32/libevolution-mail-shared.def new file mode 100644 index 0000000000..a86804025b --- /dev/null +++ b/win32/libevolution-mail-shared.def @@ -0,0 +1,531 @@ +EXPORTS + composer_lite DATA + e_composer_actions_init + e_composer_autosave_find_orphans + e_composer_autosave_get_enabled + e_composer_autosave_get_fd + e_composer_autosave_get_filename + e_composer_autosave_get_saved + e_composer_autosave_register + e_composer_autosave_set_enabled + e_composer_autosave_set_saved + e_composer_autosave_snapshot + e_composer_autosave_unregister + e_composer_find_data_file + e_composer_from_header_get_account_list + e_composer_from_header_get_active + e_composer_from_header_get_active_name + e_composer_from_header_get_type + e_composer_from_header_new + e_composer_from_header_set_account_list + e_composer_from_header_set_active + e_composer_from_header_set_active_name + e_composer_get_default_charset + e_composer_header_get_label + e_composer_header_get_sensitive + e_composer_header_get_type + e_composer_header_get_visible + e_composer_header_set_input_tooltip + e_composer_header_set_property + e_composer_header_set_sensitive + e_composer_header_set_title_tooltip + e_composer_header_set_visible + e_composer_header_table_add_destinations_bcc + e_composer_header_table_add_destinations_cc + e_composer_header_table_add_destinations_to + e_composer_header_table_get_account + e_composer_header_table_get_account_list + e_composer_header_table_get_account_name + e_composer_header_table_get_destinations + e_composer_header_table_get_destinations_bcc + e_composer_header_table_get_destinations_cc + e_composer_header_table_get_destinations_to + e_composer_header_table_get_header + e_composer_header_table_get_post_to + e_composer_header_table_get_reply_to + e_composer_header_table_get_signature + e_composer_header_table_get_signature_list + e_composer_header_table_get_subject + e_composer_header_table_get_type + e_composer_header_table_new + e_composer_header_table_set_account + e_composer_header_table_set_account_list + e_composer_header_table_set_account_name + e_composer_header_table_set_destinations_bcc + e_composer_header_table_set_destinations_cc + e_composer_header_table_set_destinations_to + e_composer_header_table_set_header_visible + e_composer_header_table_set_post_to_base + e_composer_header_table_set_post_to_list + e_composer_header_table_set_reply_to + e_composer_header_table_set_signature + e_composer_header_table_set_signature_list + e_composer_header_table_set_subject + e_composer_name_header_add_destinations + e_composer_name_header_get_destinations + e_composer_name_header_get_name_selector + e_composer_name_header_get_type + e_composer_name_header_new + e_composer_name_header_new_with_action + e_composer_name_header_new_with_label + e_composer_name_header_set_destinations + e_composer_post_header_get_account + e_composer_post_header_get_folders + e_composer_post_header_get_type + e_composer_post_header_new + e_composer_post_header_set_account + e_composer_post_header_set_folders + e_composer_post_header_set_folders_base + e_composer_private_dispose + e_composer_private_finalize + e_composer_private_init + e_composer_text_header_get_text + e_composer_text_header_get_type + e_composer_text_header_new_button + e_composer_text_header_new_label + e_composer_text_header_set_text + e_load_spell_languages + e_msg_composer_add_header + e_msg_composer_add_inline_image_from_file + e_msg_composer_add_inline_image_from_mime_part + e_msg_composer_add_message_attachments + e_msg_composer_attach + e_msg_composer_check_autosave + e_msg_composer_clear_inlined_table + e_msg_composer_get_attachment_view + e_msg_composer_get_from + e_msg_composer_get_header_table + e_msg_composer_get_lite + e_msg_composer_get_message + e_msg_composer_get_message_draft + e_msg_composer_get_message_print + e_msg_composer_get_raw_message_text + e_msg_composer_get_reply_to + e_msg_composer_get_sig_file_content + e_msg_composer_get_type + e_msg_composer_is_exiting + e_msg_composer_lite_new + e_msg_composer_load_from_file + e_msg_composer_modify_header + e_msg_composer_new + e_msg_composer_new_from_url + e_msg_composer_new_redirect + e_msg_composer_new_with_message + e_msg_composer_remove_header + e_msg_composer_reply_indent + e_msg_composer_request_close_all + e_msg_composer_save_draft + e_msg_composer_send + e_msg_composer_set_alternative + e_msg_composer_set_body + e_msg_composer_set_body_text + e_msg_composer_set_enable_autosave + e_msg_composer_set_lite + e_msg_composer_set_send_options + e_msg_composer_show_sig_file + e_save_spell_languages + em_account_editor_check + em_account_editor_commit + em_account_editor_dropdown_new + em_account_editor_folder_selector_button_new + em_account_editor_get_type + em_account_editor_new + em_account_editor_new_for_pages + em_account_editor_ssl_selector_new + em_composer_utils_setup_callbacks + em_config_get_type + em_config_hook_get_type + em_config_new + em_config_target_new_account + em_config_target_new_folder + em_config_target_new_prefs + em_event_get_type + em_event_hook_get_type + em_event_peek + em_event_target_new_composer + em_event_target_new_custom_icon + em_event_target_new_folder + em_event_target_new_folder_browser + em_event_target_new_message + em_event_target_new_send_receive + em_filename_make_safe + em_filter_context_add_action + em_filter_context_create_action + em_filter_context_find_action + em_filter_context_get_type + em_filter_context_new + em_filter_context_next_action + em_filter_editor_construct + em_filter_editor_get_type + em_filter_editor_new + em_filter_folder_element_get_type + em_filter_folder_element_new + em_filter_folder_element_set_value + em_filter_rule_add_action + em_filter_rule_build_action + em_filter_rule_get_type + em_filter_rule_new + em_filter_rule_remove_action + em_filter_rule_replace_action + em_filter_source_element_get_type + em_filter_source_element_new + em_folder_properties_show + em_folder_selection_button_get_multiselect + em_folder_selection_button_get_selection + em_folder_selection_button_get_selection_mult + em_folder_selection_button_get_type + em_folder_selection_button_new + em_folder_selection_button_set_multiselect + em_folder_selection_button_set_selection + em_folder_selection_button_set_selection_mult + em_folder_selector_construct + em_folder_selector_create_new + em_folder_selector_get_selected_path + em_folder_selector_get_selected_paths + em_folder_selector_get_selected_uri + em_folder_selector_get_selected_uris + em_folder_selector_get_type + em_folder_selector_new + em_folder_selector_set_selected + em_folder_selector_set_selected_list + em_folder_tree_enable_drag_and_drop + em_folder_tree_get_model + em_folder_tree_get_model_storeinfo + em_folder_tree_get_selected_folder + em_folder_tree_get_selected_folder_info + em_folder_tree_get_selected_path + em_folder_tree_get_selected_paths + em_folder_tree_get_selected_uri + em_folder_tree_get_selected_uris + em_folder_tree_get_tree_view + em_folder_tree_get_type + em_folder_tree_model_add_store + em_folder_tree_model_expand_foreach + em_folder_tree_model_get_expanded + em_folder_tree_model_get_expanded_uri + em_folder_tree_model_get_folder_name + em_folder_tree_model_get_selected + em_folder_tree_model_get_type + em_folder_tree_model_is_type_inbox + em_folder_tree_model_new + em_folder_tree_model_remove_folders + em_folder_tree_model_remove_store + em_folder_tree_model_save_state + em_folder_tree_model_set_expanded + em_folder_tree_model_set_expanded_uri + em_folder_tree_model_set_folder_info + em_folder_tree_model_set_selected + em_folder_tree_model_set_unread_count + em_folder_tree_new + em_folder_tree_new_with_model + em_folder_tree_select_next_path + em_folder_tree_select_prev_path + em_folder_tree_set_excluded + em_folder_tree_set_excluded_func + em_folder_tree_set_multiselect + em_folder_tree_set_selected + em_folder_tree_set_selected_list + em_folder_tree_set_skip_double_click + em_folder_utils_copy_folder + em_folder_utils_copy_folders + em_folder_utils_create_folder + em_folder_utils_delete_folder + em_folder_utils_get_icon_name + em_folder_utils_rename_folder + em_format_add_header + em_format_add_puri + em_format_class_add_handler + em_format_class_remove_handler + em_format_clear_headers + em_format_clear_puri_tree + em_format_default_headers + em_format_describe_part + em_format_fallback_handler + em_format_find_puri + em_format_find_visible_puri + em_format_format + em_format_format_clone + em_format_format_content + em_format_format_error + em_format_format_secure + em_format_format_text + em_format_get_type + em_format_is_attachment + em_format_is_inline + em_format_merge_handler + em_format_part + em_format_part_as + em_format_pull_level + em_format_push_level + em_format_quote_get_type + em_format_quote_new + em_format_redraw + em_format_set_charset + em_format_set_default_charset + em_format_set_inline + em_format_set_mode + em_format_set_session + em_icon_stream_clear_cache + em_icon_stream_get_image + em_icon_stream_get_type + em_icon_stream_is_resized + em_icon_stream_new + em_inline_filter_get_multipart + em_inline_filter_get_type + em_inline_filter_new + em_popup_get_type + em_popup_hook_get_type + em_popup_new + em_popup_target_new_folder + em_popup_target_new_part + em_popup_target_new_select + em_popup_target_new_uri + em_search_context_get_type + em_search_context_new + em_select_folder + em_stripsig_filter_get_type + em_stripsig_filter_new + em_sync_stream_get_type + em_sync_stream_set_buffer_size + em_uri_from_camel + em_uri_to_camel + em_utils_add_address + em_utils_add_vcard + em_utils_adjustment_page + em_utils_camel_address_to_destination + em_utils_check_user_can_send_mail + em_utils_clear_get_password_canceled_accounts_flag + em_utils_compose_lite_new_message + em_utils_compose_new_message + em_utils_compose_new_message_with_mailto + em_utils_composer_save_draft_cb + em_utils_composer_send_cb + em_utils_configure_account + em_utils_construct_composer_text + em_utils_contact_photo + em_utils_edit_filters + em_utils_edit_message + em_utils_edit_messages + em_utils_empty_trash + em_utils_expunge_folder + em_utils_flag_for_followup + em_utils_flag_for_followup_clear + em_utils_flag_for_followup_completed + em_utils_folder_is_drafts + em_utils_folder_is_outbox + em_utils_folder_is_sent + em_utils_folder_is_templates + em_utils_folder_name_from_uri + em_utils_forward_attached + em_utils_forward_inline + em_utils_forward_message + em_utils_forward_message_raw + em_utils_forward_messages + em_utils_forward_quoted + em_utils_get_proxy_uri + em_utils_get_reply_all + em_utils_get_reply_sender + em_utils_handle_receipt + em_utils_in_addressbook + em_utils_message_to_html + em_utils_part_to_html + em_utils_prompt_user + em_utils_redirect_message + em_utils_redirect_message_by_uid + em_utils_reply_to_message + em_utils_save_messages + em_utils_save_part + em_utils_save_part_to_file + em_utils_save_parts + em_utils_selection_get_mailbox + em_utils_selection_get_message + em_utils_selection_get_uidlist + em_utils_selection_get_urilist + em_utils_selection_set_mailbox + em_utils_selection_set_uidlist + em_utils_selection_set_urilist + em_utils_send_receipt + em_utils_show_error_silent + em_utils_show_info_silent + em_utils_snoop_type + em_utils_temp_save_part + em_utils_uids_copy + em_utils_uids_free + em_vfolder_context_get_type + em_vfolder_context_new + em_vfolder_editor_get_type + em_vfolder_editor_new + em_vfolder_editor_sourcelist_new + em_vfolder_rule_add_source + em_vfolder_rule_find_source + em_vfolder_rule_from_address + em_vfolder_rule_from_message + em_vfolder_rule_get_type + em_vfolder_rule_new + em_vfolder_rule_next_source + em_vfolder_rule_remove_source + filter_gui_add_from_message + filter_rule_from_message + mail_append_mail + mail_async_event DATA + mail_async_event_destroy + mail_async_event_emit + mail_async_event_new + mail_autoreceive_init + mail_build_attachment + mail_call_main + mail_cancel_all + mail_cancel_hook_add + mail_cancel_hook_remove + mail_check_service + mail_config_add_account + mail_config_add_signature + mail_config_clear + mail_config_find_account + mail_config_folder_to_cachename + mail_config_folder_to_safe_url + mail_config_get_account_by_name + mail_config_get_account_by_source_url + mail_config_get_account_by_transport_url + mail_config_get_account_by_uid + mail_config_get_accounts + mail_config_get_address_count + mail_config_get_allowable_mime_types + mail_config_get_default_account + mail_config_get_default_identity + mail_config_get_default_transport + mail_config_get_enable_magic_spacebar + mail_config_get_error_level + mail_config_get_error_timeout + mail_config_get_gconf_client + mail_config_get_labels + mail_config_get_lookup_book + mail_config_get_lookup_book_local_only + mail_config_get_message_limit + mail_config_get_signature_by_name + mail_config_get_signature_by_uid + mail_config_get_signatures + mail_config_get_sync_timeout + mail_config_has_proxies + mail_config_init + mail_config_is_configured + mail_config_is_corrupt + mail_config_prune_proxies + mail_config_reload_junk_headers + mail_config_remove_account + mail_config_remove_account_proxies + mail_config_remove_signature + mail_config_save_accounts + mail_config_save_signatures + mail_config_scripts_disabled + mail_config_service_set_save_passwd + mail_config_set_default_account + mail_config_signature_new + mail_config_signature_run_script + mail_config_uri_deleted + mail_config_uri_renamed + mail_config_write + mail_config_write_on_exit + mail_crypto_get_pgp_cipher_context + mail_disable_stop + mail_empty_trash + mail_enable_stop + mail_execute_shell_command + mail_expunge_folder + mail_fetch_mail + mail_filter_delete_uri + mail_filter_folder + mail_filter_junk + mail_filter_on_demand + mail_filter_rename_uri + mail_folder_cache_get_folder_info_flags + mail_get_folder + mail_get_folder_quota + mail_get_folderinfo + mail_get_message + mail_get_messages + mail_get_messagex + mail_get_store + mail_in_main_thread + mail_msg_active + mail_msg_cancel + mail_msg_check_error + mail_msg_cleanup + mail_msg_fast_ordered_push + mail_msg_init + mail_msg_main_loop_push + mail_msg_new + mail_msg_ref + mail_msg_set_cancelable + mail_msg_slow_ordered_push + mail_msg_unordered_push + mail_msg_unref + mail_msg_wait + mail_msg_wait_all + mail_note_folder + mail_note_get_folder_from_uri + mail_note_store + mail_note_store_remove + mail_prep_offline + mail_receive_uri + mail_refresh_folder + mail_remove_folder + mail_save_messages + mail_save_part + mail_send + mail_send_queue + mail_send_receive + mail_servers DATA + mail_session_add_junk_plugin + mail_session_add_password + mail_session_flush_filter_log + mail_session_forget_password + mail_session_forget_passwords + mail_session_get_interactive + mail_session_get_junk_plugins + mail_session_get_password + mail_session_init + mail_session_remember_password + mail_session_set_interactive + mail_session_set_junk_headers + mail_session_shutdown + mail_store_prepare_offline + mail_store_set_offline + mail_sync_folder + mail_sync_store + mail_tool_do_movemail + mail_tool_generate_forward_subject + mail_tool_get_inbox + mail_tool_get_trash + mail_tool_make_message_attachment + mail_tool_remove_xevolution_headers + mail_tool_restore_xevolution_headers + mail_tool_uri_to_folder + mail_tools_folder_to_url + mail_tools_x_evolution_message_parse + mail_transfer_messages + mail_vfolder_add_uri + mail_vfolder_delete_uri + mail_vfolder_get_sources_local + mail_vfolder_get_sources_remote + mail_vfolder_rename_uri + mail_vfolder_shutdown + message_tag_editor_get_tag_list + message_tag_editor_get_type + message_tag_editor_set_tag_list + message_tag_followup_append_message + message_tag_followup_get_type + message_tag_followup_new + session DATA + target_date_new + vfolder_clone_rule + vfolder_create_part + vfolder_edit + vfolder_edit_rule + vfolder_gui_add_from_address + vfolder_gui_add_from_message + vfolder_gui_add_rule + vfolder_load_storage + vfolder_revert + vfolder_store DATA + x_mailer DATA -- cgit v1.2.3 From 84c55f4e983c4458a08f9bd19fe63b3fd7af2fa7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 5 Jun 2009 14:48:29 +0200 Subject: Fix even more compiler warnings and disable one for format strings --- addressbook/conduit/address-conduit.c | 10 +++++----- calendar/conduits/calendar/calendar-conduit.c | 7 ++++--- calendar/conduits/memo/memo-conduit.c | 7 ++++--- calendar/conduits/todo/todo-conduit.c | 7 ++++--- calendar/gui/e-cal-model-tasks.c | 2 +- calendar/gui/print.c | 6 ++---- configure.ac | 3 ++- mail/em-account-editor.c | 14 +++++++------- mail/em-format-quote.c | 7 +++---- mail/em-inline-filter.c | 16 ++++++++-------- mail/em-stripsig-filter.c | 12 ++++++------ .../apps-evolution-external-editor.schemas.in | 2 ++ plugins/external-editor/external-editor.c | 4 ++-- plugins/folder-unsubscribe/folder-unsubscribe.c | 3 ++- plugins/hula-account-setup/camel-hula-listener.c | 4 ++-- plugins/ipod-sync/evolution-ipod-sync.c | 22 ++++++++++------------ plugins/ipod-sync/ipod.c | 4 ++-- plugins/vcard-inline/Makefile.am | 2 ++ shell/e-shell-window.c | 4 ++-- 19 files changed, 70 insertions(+), 66 deletions(-) diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index ed17e40a0e..15cbe75045 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -29,7 +29,6 @@ #define G_LOG_DOMAIN "eaddrconduit" -#include #include #include #include @@ -471,7 +470,7 @@ addrconduit_load_configuration (guint32 pilot_id) g_assert (c != NULL); c->pilot_id = pilot_id; - management = gnome_pilot_conduit_management_new ("e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); + management = gnome_pilot_conduit_management_new ((gchar*)"e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); g_object_ref_sink (management); config = gnome_pilot_conduit_config_new (management, pilot_id); g_object_ref_sink (config); @@ -1559,14 +1558,15 @@ addressbook_authenticate (EBook *book, e_uri_free (e_uri); passwd = e_passwords_get_password (component_name, pass_key); - if (passwd) - passwd = ""; + if (!passwd) + passwd = g_strdup (""); if (book) if (!e_book_authenticate_user (book, user, passwd, auth, NULL)) LOG (g_warning ("Authentication failed")); g_free (pass_key); g_free (str_uri); + g_free (passwd); return; } @@ -2183,7 +2183,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id) LOG (g_message ( "in address's conduit_get_gpilot_conduit\n" )); - retval = gnome_pilot_conduit_sync_abs_new ("AddressDB", 0x61646472); + retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"AddressDB", 0x61646472); g_assert (retval != NULL); ctxt = e_addr_context_new (pilot_id); diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index e899ad203d..04f7c424dd 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -123,7 +123,7 @@ calconduit_load_configuration (guint32 pilot_id) c->pilot_id = pilot_id; /* Sync Type */ - management = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); + management = gnome_pilot_conduit_management_new ((gchar*)"e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); g_object_ref_sink (management); config = gnome_pilot_conduit_config_new (management, pilot_id); g_object_ref_sink (config); @@ -400,7 +400,8 @@ print_local (ECalLocalRecord *local) return buff; } - return ""; + strcpy (buff, ""); + return buff; } static gchar *print_remote (GnomePilotRecord *remote) @@ -2104,7 +2105,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id) LOG (g_message ( "in calendar's conduit_get_gpilot_conduit\n" )); - retval = gnome_pilot_conduit_sync_abs_new ("DatebookDB", 0x64617465); + retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"DatebookDB", 0x64617465); g_assert (retval != NULL); ctxt = e_calendar_context_new (pilot_id); diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c index b22216eecd..8fae261828 100644 --- a/calendar/conduits/memo/memo-conduit.c +++ b/calendar/conduits/memo/memo-conduit.c @@ -126,7 +126,7 @@ memoconduit_load_configuration (guint32 pilot_id) c->pilot_id = pilot_id; - management = gnome_pilot_conduit_management_new ("e_memo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); + management = gnome_pilot_conduit_management_new ((gchar*)"e_memo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); g_object_ref_sink (management); config = gnome_pilot_conduit_config_new (management, pilot_id); g_object_ref_sink (config); @@ -314,7 +314,8 @@ print_local (EMemoLocalRecord *local) return buff; } - return ""; + strcpy (buff, ""); + return buff; } static gchar *print_remote (GnomePilotRecord *remote) @@ -1382,7 +1383,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id) LOG (g_message ( "in memo's conduit_get_gpilot_conduit\n" )); - retval = gnome_pilot_conduit_sync_abs_new ("MemoDB", 0x6D656D6F); + retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"MemoDB", 0x6D656D6F); g_assert (retval != NULL); ctxt = e_memo_context_new (pilot_id); diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 7ff2161772..b5bfc5b996 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -128,7 +128,7 @@ todoconduit_load_configuration (guint32 pilot_id) c->pilot_id = pilot_id; - management = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); + management = gnome_pilot_conduit_management_new ((gchar*)"e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID); g_object_ref_sink (management); config = gnome_pilot_conduit_config_new (management, pilot_id); g_object_ref_sink (config); @@ -385,7 +385,8 @@ print_local (EToDoLocalRecord *local) return buff; } - return ""; + strcpy (buff, ""); + return buff; } static gchar *print_remote (GnomePilotRecord *remote) @@ -1572,7 +1573,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id) LOG (g_message ( "in todo's conduit_get_gpilot_conduit\n" )); - retval = gnome_pilot_conduit_sync_abs_new ("ToDoDB", 0x746F646F); + retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"ToDoDB", 0x746F646F); g_assert (retval != NULL); ctxt = e_todo_context_new (pilot_id); diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 63749c5aaa..63bc37af4e 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -329,7 +329,7 @@ get_priority (ECalModelComponent *comp_data) prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PRIORITY_PROPERTY); if (prop) - return e_cal_util_priority_to_string (icalproperty_get_priority (prop)); + return (gpointer) e_cal_util_priority_to_string (icalproperty_get_priority (prop)); return (gpointer) ""; } diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 6931474349..eced381faa 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -2587,11 +2587,9 @@ print_comp_draw_real (GtkPrintOperation *operation, /* Priority */ e_cal_component_get_priority (comp, &priority); if (priority && *priority >= 0) { - gchar *priority_string, *pri_text; + gchar *pri_text; - priority_string = e_cal_util_priority_to_string (*priority); - - pri_text = g_strdup_printf (_("Priority: %s"), priority_string); + pri_text = g_strdup_printf (_("Priority: %s"), e_cal_util_priority_to_string (*priority)); top = bound_text (context, font, pri_text, -1, 0.0, top, width, height, FALSE, &page_start, &pages); top += get_font_size (font) - 6; diff --git a/configure.ac b/configure.ac index a4d35b0c39..2fa56eacda 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ AS_COMPILER_FLAGS(WARNING_FLAGS, -Wno-unused-parameter -Wdeclaration-after-statement -Werror-implicit-function-declaration - -Wformat-nonliteral -Wformat-security -Winit-self + -Wformat-security -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Wmissing-noreturn -Wnested-externs -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings") @@ -69,6 +69,7 @@ AC_SUBST(WARNING_FLAGS) # # -Wmissing-format-attribute # -Wshadow +# -Wformat-nonliteral CFLAGS="$CFLAGS $WARNING_FLAGS" diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 1f0fdb8ba9..bce0bbb469 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -1421,7 +1421,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service) current[len] = 0; } } else { - current = "imap"; + current = (gchar*)"imap"; } store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); @@ -2257,7 +2257,7 @@ section: case CAMEL_PROVIDER_CONF_CHECKBOX: w = emae_option_toggle(service, url, entries[i].text, entries[i].name, atoi(entries[i].value)); gtk_table_attach((GtkTable *)parent, w, 0, 2, row, row+1, GTK_EXPAND|GTK_FILL, 0, 0, 0); - g_hash_table_insert(extra, entries[i].name, w); + g_hash_table_insert(extra, (gpointer)entries[i].name, w); if (depw) depl = g_slist_prepend(depl, w); row++; @@ -2278,7 +2278,7 @@ section: } row++; /* FIXME: this is another hack for exchange/groupwise connector */ - g_hash_table_insert(item->extra_table, entries[i].name, w); + g_hash_table_insert(item->extra_table, (gpointer)entries[i].name, w); break; case CAMEL_PROVIDER_CONF_CHECKSPIN: w = emae_option_checkspin(service, url, entries[i].name, entries[i].text, entries[i].value); @@ -3053,7 +3053,7 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account for (i=0;entries && entries[i].type != CAMEL_PROVIDER_CONF_END;i++) { struct _receive_options_item *item; - gchar *name = entries[i].name; + const gchar *name = entries[i].name; gint myindex = index; if (entries[i].type != CAMEL_PROVIDER_CONF_SECTION_START @@ -3068,7 +3068,7 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account item = g_malloc0(sizeof(*item)); item->item.type = E_CONFIG_SECTION_TABLE; item->item.path = g_strdup_printf("20.receive_options/%02d.%s", myindex, name?name:"unnamed"); - item->item.label = entries[i].text; + item->item.label = g_strdup (entries[i].text); l = g_slist_prepend(l, item); @@ -3076,12 +3076,12 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account item->item.type = E_CONFIG_ITEM_TABLE; item->item.path = g_strdup_printf("20.receive_options/%02d.%s/80.camelitem", myindex, name?name:"unnamed"); item->item.factory = emae_receive_options_extra_item; - item->item.user_data = entries[i].name; + item->item.user_data = g_strdup (entries[i].name); l = g_slist_prepend(l, item); index += 10; - g_hash_table_insert(have, entries[i].name, have); + g_hash_table_insert(have, (gpointer)entries[i].name, have); } } g_hash_table_destroy(have); diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index a61c3f26f5..af8616a981 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -174,7 +174,7 @@ emfq_format_error(EMFormat *emf, CamelStream *stream, const gchar *txt) static void emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const gchar *label, const gchar *value, guint32 flags, gint is_html) { - const gchar *fmt, *html; + const gchar *html; gchar *mhtml = NULL; if (value == NULL) @@ -189,11 +189,10 @@ emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const gchar * html = value; if (flags & EM_FORMAT_HEADER_BOLD) - fmt = "%s: %s
"; + camel_stream_printf (stream, "%s: %s
", label, html); else - fmt = "%s: %s
"; + camel_stream_printf (stream, "%s: %s
", label, html); - camel_stream_printf (stream, fmt, label, html); g_free (mhtml); } diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index 71d16e98f7..19e3f2671f 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -39,8 +39,8 @@ static void em_inline_filter_class_init (EMInlineFilterClass *klass); static void em_inline_filter_init (CamelObject *object); static void em_inline_filter_finalize (CamelObject *object); -static void emif_filter(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace); -static void emif_complete(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace); +static void emif_filter(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace); +static void emif_complete(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace); static void emif_reset(CamelMimeFilter *f); static CamelMimeFilterClass *parent_class = NULL; @@ -337,21 +337,21 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final) } static void -emif_filter(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace) +emif_filter(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace) { - emif_scan(f, in, len, FALSE); + emif_scan(f, (gchar*)in, len, FALSE); - *out = in; + *out = (gchar*)in; *outlen = len; *outprespace = prespace; } static void -emif_complete(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace) +emif_complete(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace) { - emif_scan(f, in, len, TRUE); + emif_scan(f, (gchar*)in, len, TRUE); - *out = in; + *out = (gchar*)in; *outlen = len; *outprespace = prespace; } diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c index 65400027ff..f4097a1b3d 100644 --- a/mail/em-stripsig-filter.c +++ b/mail/em-stripsig-filter.c @@ -34,9 +34,9 @@ static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass); static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass); -static void filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, +static void filter_filter (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace); -static void filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, +static void filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace); static void filter_reset (CamelMimeFilter *filter); @@ -83,7 +83,7 @@ em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass) } static void -strip_signature (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, +strip_signature (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace, gint flush) { EMStripSigFilter *stripsig = (EMStripSigFilter *) filter; @@ -126,20 +126,20 @@ strip_signature (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, else if (!start) inptr = inend; - *out = in; + *out = (gchar*)in; *outlen = inptr - in; *outprespace = prespace; } static void -filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, +filter_filter (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace) { strip_signature (filter, in, len, prespace, out, outlen, outprespace, FALSE); } static void -filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, +filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace) { strip_signature (filter, in, len, prespace, out, outlen, outprespace, TRUE); diff --git a/plugins/external-editor/apps-evolution-external-editor.schemas.in b/plugins/external-editor/apps-evolution-external-editor.schemas.in index 38becebdb7..0f7db301e8 100644 --- a/plugins/external-editor/apps-evolution-external-editor.schemas.in +++ b/plugins/external-editor/apps-evolution-external-editor.schemas.in @@ -10,7 +10,9 @@ Default External Editor The default command that must be used as the editor. + + /schemas/apps/evolution/eplugin/external-editor/launch-on-key-press /apps/evolution/eplugin/external-editor/launch-on-key-press evolution-mail diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 5d8ae3bfcd..a7f06b62bf 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -226,7 +226,7 @@ async_external_editor (EMsgComposer *composer) } else { g_warning ("Temporary file fd is null"); g_idle_add ((GSourceFunc) run_error_dialog, - "org.gnome.evolution.plugins.external-editor:no-temp-file"); + (gpointer)"org.gnome.evolution.plugins.external-editor:no-temp-file"); g_idle_add ((GSourceFunc) enable_composer, composer); return; } @@ -248,7 +248,7 @@ async_external_editor (EMsgComposer *composer) { g_warning ("Unable to launch %s: ", editor_cmd_line); g_idle_add ((GSourceFunc) run_error_dialog, - "org.gnome.evolution.plugins.external-editor:editor-not-launchable"); + (gpointer)"org.gnome.evolution.plugins.external-editor:editor-not-launchable"); g_idle_add ((GSourceFunc) enable_composer, composer); g_free (filename); diff --git a/plugins/folder-unsubscribe/folder-unsubscribe.c b/plugins/folder-unsubscribe/folder-unsubscribe.c index 1d5e4fb8dc..7005ac7feb 100644 --- a/plugins/folder-unsubscribe/folder-unsubscribe.c +++ b/plugins/folder-unsubscribe/folder-unsubscribe.c @@ -56,10 +56,11 @@ folder_unsubscribe_desc (struct _folder_unsub_t *msg) _("Unsubscribing from folder \"%s\""), msg->uri); } +extern CamelSession *session; + static void folder_unsubscribe_exec (struct _folder_unsub_t *msg) { - extern CamelSession *session; const gchar *path = NULL; CamelStore *store; CamelURL *url; diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index 818c6a5e14..04fa4605d2 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -178,7 +178,7 @@ add_esource (const gchar *conf_key, const gchar *group_name, const gchar *sourc GConfClient *client; GSList *ids, *temp; gboolean result; - gchar *source_selection_key; + const gchar *source_selection_key; gchar *relative_uri; const gchar *cal_port = "8081"; /* const gchar *use_ssl = ""; */ @@ -245,7 +245,7 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n GConfClient* client; GSList *ids; GSList *node_tobe_deleted; - gchar *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/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c index 11df39777a..a60bd2dfd3 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.c +++ b/plugins/ipod-sync/evolution-ipod-sync.c @@ -45,18 +45,17 @@ ipod_check_status (gboolean silent) { if (!silent) { GtkWidget *message; - gchar *msg1, *msg2; + gchar *msg1; msg1 = g_strdup_printf("%s\n\n", _("Hardware Abstraction Layer not loaded")); - msg2 = g_strdup_printf("%s%s", msg1, _("The \"hald\" service is required but not currently " - "running. Please enable the service and rerun this " - "program, or contact your system administrator.") ); - message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg2); + message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + "%s%s", msg1, _("The \"hald\" service is required but not currently " + "running. Please enable the service and rerun this " + "program, or contact your system administrator.")); gtk_dialog_run (GTK_DIALOG (message)); g_free(msg1); - g_free(msg2); gtk_widget_destroy (message); } return FALSE; @@ -79,18 +78,17 @@ ipod_check_status (gboolean silent) * the iPod when we finish syncing. */ if (!silent) { GtkWidget *message; - gchar *msg1, *msg2; + gchar *msg1; msg1 = g_strdup_printf("%s\n\n", _("Search for an iPod failed")); - msg2 = g_strdup_printf("%s%s", msg1, _("Evolution could not find an iPod to synchronize with. " - "Either the iPod is not connected to the system or it " - "is not powered on.")); - message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg2); + message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + "%s%s", msg1, _("Evolution could not find an iPod to synchronize with. " + "Either the iPod is not connected to the system or it " + "is not powered on.")); gtk_dialog_run (GTK_DIALOG (message)); g_free(msg1); - g_free(msg2); gtk_widget_destroy (message); } diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c index 41267ae3e6..75568660f1 100644 --- a/plugins/ipod-sync/ipod.c +++ b/plugins/ipod-sync/ipod.c @@ -70,7 +70,7 @@ try_mount (gchar *device) GError *err = NULL; gint exit_status; - argv[0] = MOUNT; + argv[0] = (gchar*)MOUNT; argv[1] = device; argv[2] = NULL; @@ -94,7 +94,7 @@ try_umount (gchar *device) GError *err = NULL; gint exit_status; - argv[0] = UMOUNT; + argv[0] = (gchar*)UMOUNT; argv[1] = device; argv[2] = NULL; diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am index 01e1f3f811..499db50154 100644 --- a/plugins/vcard-inline/Makefile.am +++ b/plugins/vcard-inline/Makefile.am @@ -27,3 +27,5 @@ EXTRA_DIST = org-gnome-vcard-inline.eplug.xml BUILT_SOURCES = $(plugin_DATA) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 6e8215c63e..685b5a822f 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -51,7 +51,7 @@ #include -#if NM_SUPPORT +#if defined(NM_SUPPORT) && NM_SUPPORT gboolean e_shell_dbus_initialise (EShell *shell); #endif @@ -572,7 +572,7 @@ setup_statusbar_notebook (EShellWindow *window) static void setup_nm_support (EShellWindow *window) { -#if NM_SUPPORT +#if defined(NM_SUPPORT) && NM_SUPPORT e_shell_dbus_initialise (window->priv->shell.eshell); #endif } -- cgit v1.2.3 From d0917c97319e08d840cd78adf02b3e7456aa6366 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 5 Jun 2009 15:05:02 +0200 Subject: Avoid the console popping while evolution running on windows --- addressbook/tools/Makefile.am | 4 ++++ calendar/gui/alarm-notify/Makefile.am | 4 ++++ plugins/backup-restore/Makefile.am | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am index bc0cfb808d..ea1dc3867b 100644 --- a/addressbook/tools/Makefile.am +++ b/addressbook/tools/Makefile.am @@ -27,6 +27,10 @@ evolution_addressbook_export_SOURCES = \ evolution_addressbook_export_LDADD = \ $(EVOLUTION_ADDRESSBOOK_LIBS) +if OS_WIN32 +evolution_addressbook_export_LDFLAGS = -mwindows +endif + EXTRA_DIST = $(privlibexec_SCRIPTS) \ evolution-addressbook-clean.in diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index 76c2783fc6..9b001a0da0 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -53,6 +53,10 @@ evolution_alarm_notify_LDADD = \ $(CAMEL_LIBS) \ $(EVOLUTION_CALENDAR_LIBS) +if OS_WIN32 +evolution_alarm_notify_LDFLAGS = -mwindows +endif + server_in_files = GNOME_Evolution_Calendar_AlarmNotify.server.in.in server_DATA = $(server_in_files:.server.in.in=.server) @EVO_SERVER_RULE@ diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index b4e554cf47..1db60cd625 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -28,6 +28,10 @@ evolution_backup_SOURCES = backup.c evolution_backup_LDADD = $(SHELL_LIBS) \ $(top_builddir)/e-util/libeutil.la +if OS_WIN32 +evolution_backup_LDFLAGS = -mwindows +endif + EXTRA_DIST = \ org-gnome-backup-restore.eplug.xml \ -- cgit v1.2.3 From 379464b273fd517fef9e0aa9d84f7c0e111c79bf Mon Sep 17 00:00:00 2001 From: Manoj Kumar Giri Date: Fri, 5 Jun 2009 18:52:28 +0530 Subject: Updated Oriya Translation. --- po/or.po | 3426 ++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 1668 insertions(+), 1758 deletions(-) diff --git a/po/or.po b/po/or.po index 74a52317b3..998b3cf699 100644 --- a/po/or.po +++ b/po/or.po @@ -1,15 +1,15 @@ # translation of or.po to Oriya # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. -#: ../shell/main.c:603 +#: ../shell/main.c:605 # Subhransu Behera , 2006. # Manoj Kumar Giri , 2009. msgid "" msgstr "" "Project-Id-Version: or\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n" -"POT-Creation-Date: 2009-05-05 00:57+0000\n" -"PO-Revision-Date: 2009-06-04 17:55+0530\n" +"POT-Creation-Date: 2009-06-04 12:28+0000\n" +"PO-Revision-Date: 2009-06-05 18:49+0530\n" "Last-Translator: Manoj Kumar Giri \n" "Language-Team: Oriya \n" "MIME-Version: 1.0\n" @@ -41,6 +41,7 @@ msgstr "" "\n" "\n" "\n" +"\n" "X-Generator: KBabel 1.11.4\n" #: ../a11y/addressbook/ea-addressbook-view.c:94 @@ -82,32 +83,32 @@ msgstr "ସମ୍ପର୍କ:" msgid "evolution minicard" msgstr "evolution ମିନିକାର୍ଡ" -#: ../a11y/calendar/ea-cal-view-event.c:265 +#: ../a11y/calendar/ea-cal-view-event.c:268 msgid "It has alarms." msgstr "ଏଥିରେ ସତର୍କ ଘଣ୍ଟି ଅଛି।" -#: ../a11y/calendar/ea-cal-view-event.c:268 +#: ../a11y/calendar/ea-cal-view-event.c:271 msgid "It has recurrences." msgstr "ଏଥିରେ ପୁନରାବ୍ରୁତ୍ତି ଅଛି।" -#: ../a11y/calendar/ea-cal-view-event.c:271 +#: ../a11y/calendar/ea-cal-view-event.c:274 msgid "It is a meeting." msgstr "ଏହା ଗୋଟିଏ ସଭା ଅଟେ।" -#: ../a11y/calendar/ea-cal-view-event.c:277 +#: ../a11y/calendar/ea-cal-view-event.c:280 #, c-format msgid "Calendar Event: Summary is %s." msgstr "କ୍ଯାଲେଣ୍ଡର ଘଟଣା: %s ସାରାଂଶ ଅଟେ।" -#: ../a11y/calendar/ea-cal-view-event.c:279 +#: ../a11y/calendar/ea-cal-view-event.c:282 msgid "Calendar Event: It has no summary." msgstr "କ୍ଯାଲେଣ୍ଡର ଘଟଣା: ଏହାର କୌଣସି ସାରାଂଶ ନାହିଁ।" -#: ../a11y/calendar/ea-cal-view-event.c:299 +#: ../a11y/calendar/ea-cal-view-event.c:302 msgid "calendar view event" msgstr "କ୍ଯାଲେଣ୍ଡର ଦ୍ରୁଶ୍ଯ ଘଟଣା" -#: ../a11y/calendar/ea-cal-view-event.c:527 +#: ../a11y/calendar/ea-cal-view-event.c:530 msgid "Grab Focus" msgstr "ଫୋକସକୁ ନିଅନ୍ତୁ" @@ -176,7 +177,7 @@ msgid "calendar view for one or more days" msgstr "ଗୋଟିଏ ଏବଂ ଅଧିକ ଦିବସ ପାଇଁ କ୍ଯାଲେଣ୍ଡର ଦ୍ରୁଶ୍ଯ" #: ../a11y/calendar/ea-gnome-calendar.c:186 -#: ../calendar/gui/calendar-component.c:771 +#: ../calendar/gui/calendar-component.c:772 msgid "%A %d %b %Y" msgstr "%A %d %b %Y" @@ -187,8 +188,8 @@ msgstr "%A %d %b %Y" #. You can change the order but don't change the #. specifiers or add anything. #: ../a11y/calendar/ea-gnome-calendar.c:189 -#: ../calendar/gui/calendar-component.c:774 -#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599 +#: ../calendar/gui/calendar-component.c:775 +#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1598 #: ../calendar/gui/e-week-view-main-item.c:335 msgid "%a %d %b" msgstr "%a %d %b" @@ -196,9 +197,9 @@ msgstr "%a %d %b" #: ../a11y/calendar/ea-gnome-calendar.c:191 #: ../a11y/calendar/ea-gnome-calendar.c:196 #: ../a11y/calendar/ea-gnome-calendar.c:198 -#: ../calendar/gui/calendar-component.c:776 -#: ../calendar/gui/calendar-component.c:781 -#: ../calendar/gui/calendar-component.c:783 +#: ../calendar/gui/calendar-component.c:777 +#: ../calendar/gui/calendar-component.c:782 +#: ../calendar/gui/calendar-component.c:784 msgid "%a %d %b %Y" msgstr "%a %d %b %Y" @@ -206,10 +207,10 @@ msgstr "%a %d %b %Y" #: ../a11y/calendar/ea-gnome-calendar.c:221 #: ../a11y/calendar/ea-gnome-calendar.c:227 #: ../a11y/calendar/ea-gnome-calendar.c:229 -#: ../calendar/gui/calendar-component.c:795 -#: ../calendar/gui/calendar-component.c:802 -#: ../calendar/gui/calendar-component.c:808 -#: ../calendar/gui/calendar-component.c:810 +#: ../calendar/gui/calendar-component.c:796 +#: ../calendar/gui/calendar-component.c:803 +#: ../calendar/gui/calendar-component.c:809 +#: ../calendar/gui/calendar-component.c:811 msgid "%d %b %Y" msgstr "%d %b %Y" @@ -219,15 +220,15 @@ msgstr "%d %b %Y" #. month name. You can change the order but don't #. change the specifiers or add anything. #: ../a11y/calendar/ea-gnome-calendar.c:219 -#: ../calendar/gui/calendar-component.c:800 -#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615 +#: ../calendar/gui/calendar-component.c:801 +#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1614 #: ../calendar/gui/e-week-view-main-item.c:349 msgid "%d %b" msgstr "%d %b" #: ../a11y/calendar/ea-gnome-calendar.c:245 #: ../a11y/calendar/ea-gnome-calendar.c:253 -#: ../calendar/importers/icalendar-importer.c:780 +#: ../calendar/importers/icalendar-importer.c:782 msgid "Gnome Calendar" msgstr "ନୋମ କ୍ଯାଲେଣ୍ଡର" @@ -597,7 +598,7 @@ msgstr "ସ୍ବତଃସମ୍ପନ୍ନ ପ୍ରକ୍ରିୟାକୁ #: ../addressbook/gui/component/addressbook-view.c:1213 #: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:396 #: ../plugins/exchange-operations/exchange-delegates-user.c:76 -#: ../plugins/exchange-operations/exchange-folder.c:582 +#: ../plugins/exchange-operations/exchange-folder.c:583 msgid "Contacts" msgstr "ସମ୍ପର୍କ" @@ -640,9 +641,9 @@ msgstr "ଆପଣଙ୍କର ଏସ/ମାଇମ ପ୍ରମାଣପତ୍ର #: ../calendar/gui/calendar-component.c:192 #: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:475 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091 -#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:200 -#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2890 -#: ../mail/mail-component.c:318 ../mail/mail-vfolder.c:217 +#: ../calendar/gui/tasks-component.c:149 ../mail/em-folder-tree-model.c:192 +#: ../mail/em-folder-tree-model.c:194 ../mail/em-migrate.c:2891 +#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217 #: ../mail/message-list.c:1517 msgid "On This Computer" msgstr "ଏହି କମ୍ପୁଟରରେ" @@ -667,13 +668,13 @@ msgstr "LDAP ସେବକରେ" #: ../addressbook/gui/component/addressbook-component.c:135 #: ../addressbook/gui/component/addressbook-component.c:138 #: ../addressbook/gui/component/addressbook-migrate.c:508 -#: ../addressbook/gui/widgets/eab-contact-display.c:652 +#: ../addressbook/gui/widgets/eab-contact-display.c:653 #: ../calendar/gui/calendar-component.c:232 #: ../calendar/gui/calendar-component.c:238 #: ../calendar/gui/memos-component.c:190 ../calendar/gui/memos-component.c:194 #: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585 #: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:187 -#: ../calendar/gui/tasks-component.c:191 ../mail/em-migrate.c:959 +#: ../calendar/gui/tasks-component.c:191 ../mail/em-migrate.c:960 #: ../plugins/email-custom-header/email-custom-header.c:338 msgid "Personal" msgstr "ବ୍ଯକ୍ତିଗତ" @@ -770,12 +771,12 @@ msgstr "" #: ../addressbook/gui/component/addressbook-config.c:1022 #: ../addressbook/gui/component/ldap-config.glade.h:17 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20 #: ../calendar/gui/dialogs/calendar-setup.c:367 #: ../calendar/gui/dialogs/calendar-setup.c:378 #: ../calendar/gui/dialogs/calendar-setup.c:389 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95 -#: ../plugins/itip-formatter/itip-formatter.c:2532 +#: ../plugins/itip-formatter/itip-formatter.c:2545 #: ../smime/gui/smime-ui.glade.h:28 msgid "General" msgstr "ସାଧାରଣ" @@ -801,7 +802,7 @@ msgid "Details" msgstr "ବିସ୍ତ୍ରୁତ ବିବରଣୀ" #: ../addressbook/gui/component/addressbook-config.c:1033 -#: ../mail/em-folder-browser.c:1000 +#: ../mail/em-folder-browser.c:1024 msgid "Searching" msgstr "ସନ୍ଧାନ କରୁଅଛି" @@ -815,12 +816,12 @@ msgid "Address Book Properties" msgstr "ଠିକଣା ପୁସ୍ତିକା ଗୁଣଧର୍ମ" #: ../addressbook/gui/component/addressbook-migrate.c:74 -#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109 +#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1110 msgid "Migrating..." msgstr "ସ୍ଥାନ ପରିବର୍ତ୍ତନ କରୁଅଛି ..." #: ../addressbook/gui/component/addressbook-migrate.c:126 -#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168 +#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1169 #, c-format msgid "Migrating '%s':" msgstr "`%s' ର ସ୍ଥାନ ପରିବର୍ତ୍ତନ କରୁଅଛି:" @@ -872,18 +873,18 @@ msgstr "" "Evolution ଆପଣଙ୍କର Pilot Sync ତଥ୍ୟ ସହିତ ସ୍ଥାନାନ୍ତରିତ ହେବା ସମୟରେ ଦୟାକରି ଧୈର୍ଯ୍ୟ ରଖନ୍ତୁ..." #: ../addressbook/gui/component/addressbook-view.c:422 -#: ../mail/em-folder-utils.c:455 +#: ../mail/em-folder-utils.c:453 #, c-format msgid "Rename the \"%s\" folder to:" msgstr "\"%s\" ଫୋଲଡରର ନାମକୁ ବଦଳାନ୍ତୁ:" #: ../addressbook/gui/component/addressbook-view.c:425 -#: ../mail/em-folder-utils.c:457 +#: ../mail/em-folder-utils.c:455 msgid "Rename Folder" msgstr "ଫୋଲଡରର ନାମ ବଦଳାନ୍ତୁ" #: ../addressbook/gui/component/addressbook-view.c:430 -#: ../mail/em-folder-utils.c:463 +#: ../mail/em-folder-utils.c:461 msgid "Folder names cannot contain '/'" msgstr "ଫୋଲଡରର ନାମ ଗୋଟିଏ '/' ଧାରଣ କରିପାରିବ ନାହିଁ" @@ -896,19 +897,19 @@ msgid "Save As vCard..." msgstr "vCard ଭାବରେ ସଂରକ୍ଷଣ କରନ୍ତୁ..." #: ../addressbook/gui/component/addressbook-view.c:951 -#: ../calendar/gui/calendar-component.c:628 +#: ../calendar/gui/calendar-component.c:629 #: ../calendar/gui/memos-component.c:481 ../calendar/gui/tasks-component.c:473 -#: ../mail/em-folder-tree.c:2131 ../ui/evolution-mail-list.xml.h:39 +#: ../mail/em-folder-tree.c:2105 ../ui/evolution-mail-list.xml.h:39 msgid "_Rename..." msgstr "ନାମ ବଦଳାନ୍ତୁ ... (_R)" #: ../addressbook/gui/component/addressbook-view.c:954 #: ../addressbook/gui/widgets/e-addressbook-view.c:954 -#: ../calendar/gui/calendar-component.c:631 -#: ../calendar/gui/e-calendar-table.c:1620 -#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:954 +#: ../calendar/gui/calendar-component.c:632 +#: ../calendar/gui/e-calendar-table.c:1614 +#: ../calendar/gui/e-calendar-view.c:1833 ../calendar/gui/e-memo-table.c:952 #: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:476 -#: ../mail/em-folder-tree.c:2128 ../mail/em-folder-view.c:1341 +#: ../mail/em-folder-tree.c:2102 ../mail/em-folder-view.c:1341 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16 #: ../ui/evolution-tasks.xml.h:24 @@ -916,9 +917,9 @@ msgid "_Delete" msgstr "ଅପସାରଣ କରନ୍ତୁ (_D)" #: ../addressbook/gui/component/addressbook-view.c:957 -#: ../calendar/gui/calendar-component.c:636 +#: ../calendar/gui/calendar-component.c:637 #: ../calendar/gui/memos-component.c:489 ../calendar/gui/tasks-component.c:481 -#: ../mail/em-folder-tree.c:2137 ../ui/evolution-addressbook.xml.h:59 +#: ../mail/em-folder-tree.c:2111 ../ui/evolution-addressbook.xml.h:59 #: ../ui/evolution-mail-list.xml.h:38 msgid "_Properties" msgstr "ଗୁଣଧର୍ମ (_P)" @@ -967,8 +968,8 @@ msgid "" "Position of the vertical pane, between the card and list views and the " "preview pane, in pixels." msgstr "" -"କାର୍ଡ ଏବଂ ତାଲିକା ଦୃଶ୍ୟଗୁଡ଼ିକ ମଧ୍ଯରେ ଏବଂ ପ୍ରାକଦର୍ଶନ ପଟ୍ଟିକା ମଧ୍ଯରେ," -"ଭୂଲମ୍ବ ପଟ୍ଟିକର ଅବସ୍ଥାନ, ପିକସେଲରେ।" +"କାର୍ଡ ଏବଂ ତାଲିକା ଦୃଶ୍ୟଗୁଡ଼ିକ ମଧ୍ଯରେ ଏବଂ ପ୍ରାକଦର୍ଶନ ପଟ୍ଟିକା ମଧ୍ଯରେ,ଭୂଲମ୍ବ ପଟ୍ଟିକର ଅବସ୍ଥାନ, " +"ପିକସେଲରେ।" #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5 msgid "Show autocompleted name with an address" @@ -1046,7 +1047,6 @@ msgid "Searching" msgstr "ସନ୍ଧାନ କରୁଅଛି" #: ../addressbook/gui/component/ldap-config.glade.h:10 -#| msgid "Using distinguished name (DN)" msgid "" "Anonymously\n" "Using email address\n" @@ -1070,7 +1070,6 @@ msgid "Lo_gin:" msgstr "ଲଗଇନ (_g):" #: ../addressbook/gui/component/ldap-config.glade.h:19 -#| msgid "One" msgid "" "One\n" "Sub" @@ -1134,8 +1133,8 @@ msgid "" "This is the name for this server that will appear in your Evolution folder " "list. It is for display purposes only. " msgstr "" -"ଆପଣଙ୍କ Evolution ଫୋଲଡର ତାଲିକାରେ ଦର୍ଶାଯିବାକୁ ଥିବା ସର୍ଭରର ନାମ। " -"ଏହା କେବଳ ପ୍ରଦର୍ଶନ ଉଦ୍ଦେଶ୍ୟ ପାଇଁ।" +"ଆପଣଙ୍କ Evolution ଫୋଲଡର ତାଲିକାରେ ଦର୍ଶାଯିବାକୁ ଥିବା ସର୍ଭରର ନାମ। ଏହା କେବଳ ପ୍ରଦର୍ଶନ ଉଦ୍ଦେଶ୍ୟ " +"ପାଇଁ।" #: ../addressbook/gui/component/ldap-config.glade.h:33 msgid "_Download limit:" @@ -1186,8 +1185,8 @@ msgstr "କାର୍ଡ" #: ../addressbook/gui/component/ldap-config.glade.h:43 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10 #: ../calendar/gui/dialogs/event-page.glade.h:23 -#: ../plugins/caldav/caldav-source.c:411 -#: ../plugins/calendar-http/calendar-http.c:278 +#: ../plugins/caldav/caldav-source.c:448 +#: ../plugins/calendar-http/calendar-http.c:323 #: ../plugins/calendar-weather/calendar-weather.c:523 #: ../plugins/google-account-setup/google-source.c:653 #: ../plugins/google-account-setup/google-contacts-source.c:330 @@ -1291,9 +1290,9 @@ msgid "_Birthday:" msgstr "ଜନ୍ମଦିନ (_B):" #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23 -#: ../calendar/gui/dialogs/event-page.c:792 +#: ../calendar/gui/dialogs/event-page.c:805 #: ../calendar/gui/dialogs/event-page.glade.h:14 -#: ../plugins/itip-formatter/itip-view.c:1910 +#: ../plugins/itip-formatter/itip-view.c:1913 msgid "_Calendar:" msgstr "କ୍ଯାଲେଣ୍ଡର (_C):" @@ -1384,9 +1383,9 @@ msgstr "ଜିପ/ପୋଷ୍ଟାଲ କୋଡ (_Z):" #: ../plugins/exchange-operations/exchange-delegates.c:954 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:706 #: ../plugins/plugin-manager/plugin-manager.c:57 -#: ../widgets/menus/gal-define-views-dialog.c:346 +#: ../widgets/menus/gal-define-views-dialog.c:344 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90 -#: ../widgets/menus/gal-view-new-dialog.c:63 +#: ../widgets/menus/gal-view-new-dialog.c:61 msgid "Name" msgstr "ନାମ" @@ -1406,50 +1405,50 @@ msgid "Editable" msgstr "ସମ୍ପାଦନ ଯୋଗ୍ଯ" #: ../addressbook/gui/contact-editor/e-contact-editor.c:172 -#: ../addressbook/gui/widgets/eab-contact-display.c:605 +#: ../addressbook/gui/widgets/eab-contact-display.c:606 msgid "AIM" msgstr "AIM" #: ../addressbook/gui/contact-editor/e-contact-editor.c:173 -#: ../addressbook/gui/widgets/eab-contact-display.c:608 +#: ../addressbook/gui/widgets/eab-contact-display.c:609 msgid "Jabber" msgstr "Jabber" #: ../addressbook/gui/contact-editor/e-contact-editor.c:174 -#: ../addressbook/gui/widgets/eab-contact-display.c:610 +#: ../addressbook/gui/widgets/eab-contact-display.c:611 msgid "Yahoo" msgstr "Yahoo" #: ../addressbook/gui/contact-editor/e-contact-editor.c:175 -#: ../addressbook/gui/widgets/eab-contact-display.c:611 +#: ../addressbook/gui/widgets/eab-contact-display.c:612 msgid "Gadu-Gadu" msgstr "Gadu-Gadu" #: ../addressbook/gui/contact-editor/e-contact-editor.c:176 -#: ../addressbook/gui/widgets/eab-contact-display.c:609 +#: ../addressbook/gui/widgets/eab-contact-display.c:610 msgid "MSN" msgstr "MSN" #: ../addressbook/gui/contact-editor/e-contact-editor.c:177 -#: ../addressbook/gui/widgets/eab-contact-display.c:607 +#: ../addressbook/gui/widgets/eab-contact-display.c:608 msgid "ICQ" msgstr "ICQ" #: ../addressbook/gui/contact-editor/e-contact-editor.c:178 -#: ../addressbook/gui/widgets/eab-contact-display.c:606 +#: ../addressbook/gui/widgets/eab-contact-display.c:607 msgid "GroupWise" msgstr "ସମୂହ ଅନୁସାରେ" #: ../addressbook/gui/contact-editor/e-contact-editor.c:179 -#: ../addressbook/gui/widgets/eab-contact-display.c:612 +#: ../addressbook/gui/widgets/eab-contact-display.c:613 msgid "Skype" msgstr "Skype" #. red #: ../addressbook/gui/contact-editor/e-contact-editor.c:191 #: ../addressbook/gui/widgets/eab-contact-display.c:57 -#: ../addressbook/gui/widgets/eab-contact-display.c:635 -#: ../mail/em-migrate.c:958 +#: ../addressbook/gui/widgets/eab-contact-display.c:636 +#: ../mail/em-migrate.c:959 msgid "Work" msgstr "କାର୍ଯ୍ଯ" @@ -1461,7 +1460,7 @@ msgstr "ମୂଳସ୍ଥାନ" #: ../addressbook/gui/contact-editor/e-contact-editor.c:193 #: ../addressbook/gui/widgets/eab-contact-display.c:59 #: ../addressbook/gui/widgets/eab-contact-display.c:519 -#: ../calendar/gui/e-calendar-view.c:2297 +#: ../calendar/gui/e-calendar-view.c:2296 msgid "Other" msgstr "ଅନ୍ଯାନ୍ଯ" @@ -1651,7 +1650,7 @@ msgstr "ସମ୍ପର୍କ ତାଲିକା ସମ୍ପାଦକ" #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:213 -#: ../calendar/gui/e-day-view-time-item.c:815 +#: ../calendar/gui/e-day-view-time-item.c:816 #: ../calendar/gui/e-timezone-entry.c:121 msgid "Select..." msgstr "ଚୟନ କରନ୍ତୁ..." @@ -1738,11 +1737,11 @@ msgstr "ସମ୍ପର୍କ ମିଶାନ୍ତୁ" #: ../addressbook/gui/merging/eab-contact-merging.c:267 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11 -#: ../addressbook/gui/widgets/eab-contact-display.c:583 -#: ../addressbook/gui/widgets/eab-contact-display.c:588 -#: ../addressbook/gui/widgets/eab-contact-display.c:591 -#: ../addressbook/gui/widgets/eab-contact-display.c:871 -#: ../plugins/groupwise-features/junk-settings.c:414 ../smime/lib/e-cert.c:810 +#: ../addressbook/gui/widgets/eab-contact-display.c:584 +#: ../addressbook/gui/widgets/eab-contact-display.c:589 +#: ../addressbook/gui/widgets/eab-contact-display.c:592 +#: ../addressbook/gui/widgets/eab-contact-display.c:872 +#: ../plugins/groupwise-features/junk-settings.c:421 ../smime/lib/e-cert.c:810 msgid "Email" msgstr "ଇ-ଡାକ" @@ -1808,7 +1807,7 @@ msgstr "ଉତ୍ସ" #: ../addressbook/gui/widgets/e-addressbook-view.c:231 #: ../calendar/gui/e-calendar-table.etspec.h:14 -#: ../calendar/gui/e-meeting-list-view.c:566 +#: ../calendar/gui/e-meeting-list-view.c:567 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11 #: ../calendar/gui/e-memo-table.etspec.h:7 #: ../widgets/misc/e-attachment-tree-view.c:554 @@ -1821,8 +1820,8 @@ msgid "Save as vCard..." msgstr "vCard ଭାବରେ ସଂରକ୍ଷଣ କରନ୍ତୁ..." #: ../addressbook/gui/widgets/e-addressbook-view.c:932 -#: ../calendar/gui/e-calendar-table.c:1598 -#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:937 +#: ../calendar/gui/e-calendar-table.c:1592 +#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:935 #: ../ui/evolution-addressbook.xml.h:56 msgid "_Open" msgstr "ଖୋଲନ୍ତୁ (_O)" @@ -1876,11 +1875,11 @@ msgid "Cu_t" msgstr "କାଟନ୍ତୁ (_t)" #: ../addressbook/gui/widgets/e-addressbook-view.c:952 -#: ../calendar/gui/e-calendar-table.c:1606 -#: ../calendar/gui/e-calendar-view.c:1820 ../calendar/gui/e-memo-table.c:945 -#: ../mail/em-folder-tree.c:1004 ../mail/em-folder-view.c:1326 +#: ../calendar/gui/e-calendar-table.c:1600 +#: ../calendar/gui/e-calendar-view.c:1818 ../calendar/gui/e-memo-table.c:943 +#: ../mail/em-folder-tree.c:972 ../mail/em-folder-view.c:1326 #: ../mail/message-list.c:2105 ../ui/evolution-addressbook.xml.h:46 -#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:103 +#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23 msgid "_Copy" msgstr "ନକଲ କରନ୍ତୁ (_C)" @@ -1903,7 +1902,7 @@ msgid "Unmatched" msgstr "ଅମେଳ" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1 -#: ../addressbook/gui/widgets/eab-contact-display.c:626 +#: ../addressbook/gui/widgets/eab-contact-display.c:627 msgid "Assistant" msgstr "ସହକାରୀ" @@ -1941,7 +1940,7 @@ msgid "Categories" msgstr "ବିଭାଗ" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9 -#: ../addressbook/gui/widgets/eab-contact-display.c:621 +#: ../addressbook/gui/widgets/eab-contact-display.c:622 msgid "Company" msgstr "କମ୍ପାନୀ " @@ -1990,22 +1989,22 @@ msgid "Journal" msgstr "ପତ୍ରିକା" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23 -#: ../addressbook/gui/widgets/eab-contact-display.c:625 +#: ../addressbook/gui/widgets/eab-contact-display.c:626 msgid "Manager" msgstr "ପରିଚାଳକ" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24 -#: ../addressbook/gui/widgets/eab-contact-display.c:646 +#: ../addressbook/gui/widgets/eab-contact-display.c:647 msgid "Mobile Phone" msgstr "ମୋବାଇଲ ଫୋନ" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25 -#: ../addressbook/gui/widgets/eab-contact-display.c:599 +#: ../addressbook/gui/widgets/eab-contact-display.c:600 msgid "Nickname" msgstr "ଡାକ ନାମ" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26 -#: ../addressbook/gui/widgets/eab-contact-display.c:659 +#: ../addressbook/gui/widgets/eab-contact-display.c:660 msgid "Note" msgstr "ଟିପ୍ପଣୀ" @@ -2034,14 +2033,14 @@ msgid "Radio" msgstr "ରେଡିଓ" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33 -#: ../calendar/gui/e-meeting-list-view.c:578 +#: ../calendar/gui/e-meeting-list-view.c:579 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:710 msgid "Role" msgstr "ଭୂମିକା" #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34 -#: ../addressbook/gui/widgets/eab-contact-display.c:650 +#: ../addressbook/gui/widgets/eab-contact-display.c:651 msgid "Spouse" msgstr "ଜୀବନସାଥୀ" @@ -2073,7 +2072,7 @@ msgstr "ଓ୍ବେବ ସାଇଟ" #: ../addressbook/gui/widgets/e-minicard-label.c:115 #: ../addressbook/gui/widgets/e-minicard.c:154 -#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86 +#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84 #: ../widgets/misc/e-reflow.c:1423 ../widgets/misc/e-reflow.c:1424 #: ../widgets/table/e-table-click-to-add.c:522 #: ../widgets/table/e-table-col.c:98 @@ -2088,7 +2087,7 @@ msgstr "ପ୍ରସ୍ଥ" #: ../addressbook/gui/widgets/e-minicard-label.c:122 #: ../addressbook/gui/widgets/e-minicard.c:161 -#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98 +#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96 #: ../widgets/misc/e-reflow.c:1431 ../widgets/misc/e-reflow.c:1432 #: ../widgets/table/e-table-click-to-add.c:529 #: ../widgets/table/e-table-group-container.c:989 @@ -2208,16 +2207,16 @@ msgstr "ଚୟିତ" msgid "Has Cursor" msgstr "ଦର୍ଶିକା ଅଛି" -#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:549 +#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545 msgid "_Open Link in Browser" msgstr "ବ୍ରାଉଜରରେ ସଂଯୋଗକୁ ଖୋଲନ୍ତୁ (_O)" #: ../addressbook/gui/widgets/eab-contact-display.c:170 -#: ../mail/em-folder-view.c:2756 +#: ../mail/em-folder-view.c:2698 msgid "_Copy Link Location" msgstr "ସଂଯୋଗ ଅବସ୍ଥାନକୁ ନକଲ କରନ୍ତୁ (_C)" -#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:550 +#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546 msgid "_Send New Message To..." msgstr "ପାଖକୁ ନୂତନ ସଂଦେଶ ପଠାନ୍ତୁ (_S)..." @@ -2239,27 +2238,27 @@ msgid "map" msgstr "ନକ୍ସା" #: ../addressbook/gui/widgets/eab-contact-display.c:478 -#: ../addressbook/gui/widgets/eab-contact-display.c:838 +#: ../addressbook/gui/widgets/eab-contact-display.c:839 msgid "List Members" msgstr "ସଦସ୍ଯ ମାନଙ୍କୁ ସୂଚୀବଦ୍ଧ କରନ୍ତୁ" -#: ../addressbook/gui/widgets/eab-contact-display.c:622 +#: ../addressbook/gui/widgets/eab-contact-display.c:623 msgid "Department" msgstr "ବିଭାଗ" -#: ../addressbook/gui/widgets/eab-contact-display.c:623 +#: ../addressbook/gui/widgets/eab-contact-display.c:624 msgid "Profession" msgstr "ବ୍ରୁତ୍ତି" -#: ../addressbook/gui/widgets/eab-contact-display.c:624 +#: ../addressbook/gui/widgets/eab-contact-display.c:625 msgid "Position" msgstr "ଅବସ୍ଥାନ" -#: ../addressbook/gui/widgets/eab-contact-display.c:627 +#: ../addressbook/gui/widgets/eab-contact-display.c:628 msgid "Video Chat" msgstr "ଭିଡିଓ ଗପସପ" -#: ../addressbook/gui/widgets/eab-contact-display.c:628 +#: ../addressbook/gui/widgets/eab-contact-display.c:629 #: ../calendar/gui/calendar-commands.c:90 #: ../calendar/gui/dialogs/calendar-setup.c:368 #: ../calendar/gui/gnome-cal.c:2523 @@ -2274,53 +2273,53 @@ msgstr "ଭିଡିଓ ଗପସପ" msgid "Calendar" msgstr "କ୍ଯାଲେଣ୍ଡର" -#: ../addressbook/gui/widgets/eab-contact-display.c:629 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 +#: ../addressbook/gui/widgets/eab-contact-display.c:630 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18 #: ../calendar/gui/dialogs/event-editor.c:116 msgid "Free/Busy" msgstr "ମୁକ୍ତ/ବ୍ଯସ୍ତ" -#: ../addressbook/gui/widgets/eab-contact-display.c:630 -#: ../addressbook/gui/widgets/eab-contact-display.c:645 +#: ../addressbook/gui/widgets/eab-contact-display.c:631 +#: ../addressbook/gui/widgets/eab-contact-display.c:646 msgid "Phone" msgstr "ଫୋନ" -#: ../addressbook/gui/widgets/eab-contact-display.c:631 +#: ../addressbook/gui/widgets/eab-contact-display.c:632 msgid "Fax" msgstr "ଫ୍ଯାକ୍ସ" -#: ../addressbook/gui/widgets/eab-contact-display.c:632 -#: ../addressbook/gui/widgets/eab-contact-display.c:647 +#: ../addressbook/gui/widgets/eab-contact-display.c:633 +#: ../addressbook/gui/widgets/eab-contact-display.c:648 msgid "Address" msgstr "ଠିକଣା" -#: ../addressbook/gui/widgets/eab-contact-display.c:642 +#: ../addressbook/gui/widgets/eab-contact-display.c:643 msgid "Home Page" msgstr "ମୂଳସ୍ଥାନ ପ୍ରୁଷ୍ଠା" -#: ../addressbook/gui/widgets/eab-contact-display.c:643 +#: ../addressbook/gui/widgets/eab-contact-display.c:644 msgid "Web Log" msgstr "ଓ୍ବେବ ଲଗ" -#: ../addressbook/gui/widgets/eab-contact-display.c:648 -#: ../calendar/gui/e-calendar-view.c:2588 +#: ../addressbook/gui/widgets/eab-contact-display.c:649 +#: ../calendar/gui/e-calendar-view.c:2587 msgid "Birthday" msgstr "ଜନ୍ମଦିନ" -#: ../addressbook/gui/widgets/eab-contact-display.c:649 -#: ../calendar/gui/e-calendar-view.c:2589 +#: ../addressbook/gui/widgets/eab-contact-display.c:650 +#: ../calendar/gui/e-calendar-view.c:2588 msgid "Anniversary" msgstr "ବାର୍ଷିକୀ" -#: ../addressbook/gui/widgets/eab-contact-display.c:856 +#: ../addressbook/gui/widgets/eab-contact-display.c:857 msgid "Job Title" msgstr "କାର୍ଯ୍ଯ ଶୀର୍ଷକ" -#: ../addressbook/gui/widgets/eab-contact-display.c:892 +#: ../addressbook/gui/widgets/eab-contact-display.c:893 msgid "Home page" msgstr "ମୂଳସ୍ଥାନ ପ୍ରୁଷ୍ଠା" -#: ../addressbook/gui/widgets/eab-contact-display.c:900 +#: ../addressbook/gui/widgets/eab-contact-display.c:901 msgid "Blog" msgstr "ବ୍ଲୋଗ" @@ -2378,8 +2377,8 @@ msgstr "ପ୍ରୋଟୋକଲ ସମର୍ଥିତ ନୁହେଁ" #: ../calendar/gui/e-cal-component-preview.c:250 #: ../calendar/gui/e-cal-model-tasks.c:364 #: ../calendar/gui/e-cal-model-tasks.c:681 -#: ../calendar/gui/e-calendar-table.c:239 -#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2564 +#: ../calendar/gui/e-calendar-table.c:237 +#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2571 msgid "Canceled" msgstr "ବାତିଲ କରାଗଲା" @@ -2591,22 +2590,22 @@ msgstr "ଏଠାକୁ ସମ୍ପର୍କ ମାନଙ୍କୁ ଘୁଞ୍ msgid "Copy contacts to" msgstr "ଏଠାରେ ସମ୍ପର୍କ ମାନଙ୍କୁ ନକଲ କରନ୍ତୁ" -#: ../addressbook/gui/widgets/eab-gui-util.c:901 +#: ../addressbook/gui/widgets/eab-gui-util.c:903 msgid "Multiple vCards" msgstr "ଏକାଧିକ vCards" -#: ../addressbook/gui/widgets/eab-gui-util.c:908 +#: ../addressbook/gui/widgets/eab-gui-util.c:910 #, c-format msgid "vCard for %s" msgstr "%s ପାଇଁ vCard" -#: ../addressbook/gui/widgets/eab-gui-util.c:920 -#: ../addressbook/gui/widgets/eab-gui-util.c:946 +#: ../addressbook/gui/widgets/eab-gui-util.c:922 +#: ../addressbook/gui/widgets/eab-gui-util.c:948 #, c-format msgid "Contact information" msgstr "ସମ୍ପର୍କ ସୂଚନା" -#: ../addressbook/gui/widgets/eab-gui-util.c:948 +#: ../addressbook/gui/widgets/eab-gui-util.c:950 #, c-format msgid "Contact information for %s" msgstr "%s ପାଇଁ ସମ୍ପର୍କ ସୂଚନା" @@ -2615,26 +2614,6 @@ msgstr "%s ପାଇଁ ସମ୍ପର୍କ ସୂଚନା" msgid "Querying Address Book..." msgstr "ଠିକଣା ପୁସ୍ତିକାକୁ ପ୍ରଶ୍ନ ପଚାରୁଛି ..." -#: ../addressbook/gui/widgets/eab-vcard-control.c:141 -#, c-format -msgid "There is one other contact." -msgid_plural "There are %d other contacts." -msgstr[0] "ସେଠାରେ ଅନ୍ଯ ଗୋଟିଏ ସମ୍ପର୍କ ଅଛି।" -msgstr[1] "ସେଠାରେ ଅନ୍ଯାନ୍ଯ %d ସମ୍ପର୍କ ଅଛନ୍ତି।" - -#: ../addressbook/gui/widgets/eab-vcard-control.c:226 -#: ../addressbook/gui/widgets/eab-vcard-control.c:277 -msgid "Show Full vCard" -msgstr "ସମ୍ପୂର୍ଣ୍ଣ vCard କୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ" - -#: ../addressbook/gui/widgets/eab-vcard-control.c:230 -msgid "Show Compact vCard" -msgstr "ସଂକ୍ଷିପ୍ତ vCard କୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ" - -#: ../addressbook/gui/widgets/eab-vcard-control.c:282 -msgid "Save in address book" -msgstr "ଠିକଣା ପୁସ୍ତିକାରେ ସଂରକ୍ଷଣ କରନ୍ତୁ" - #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37 msgid "Card View" msgstr "କାର୍ଡ ଦ୍ରୁଶ୍ଯ" @@ -2642,8 +2621,8 @@ msgstr "କାର୍ଡ ଦ୍ରୁଶ୍ଯ" #: ../addressbook/importers/evolution-csv-importer.c:661 #: ../addressbook/importers/evolution-ldif-importer.c:513 #: ../addressbook/importers/evolution-vcard-importer.c:252 -#: ../calendar/importers/icalendar-importer.c:308 -#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7 +#: ../calendar/importers/icalendar-importer.c:310 +#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7 msgid "Importing..." msgstr "ଆୟତ କରୁଅଛି ..." @@ -2687,8 +2666,8 @@ msgstr "vCard (.vcf, .gcrd)" msgid "Evolution vCard Importer" msgstr "Evolution VCard ଆୟତକ" -#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654 -#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:690 +#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653 +#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48 msgid "Can not open file" msgstr "ଫାଇଲ ଖୋଲି ପାରିବ ନାହିଁ" @@ -3122,7 +3101,7 @@ msgstr "Evolution ପୁନଃଚାଳନ ନହେବା ପର୍ଯ୍ୟନ msgid "_Discard Changes" msgstr "ପରିବର୍ତ୍ତନଗୁଡ଼ିକୁ ପ୍ରତ୍ୟାଖାନ କରନ୍ତୁ (_D)" -#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:441 +#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343 msgid "_Save" msgstr "ସଂରକ୍ଷଣ କରନ୍ତୁ (_S)" @@ -3187,13 +3166,13 @@ msgid "Could not write pilot's ToDo application block" msgstr "pilotର କାର୍ଯ୍ୟସୂଚୀ ପ୍ରୟୋଗ ବ୍ଲକକୁ ଲେଖିପାରିଲା ନାହିଁ" #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1 -#: ../plugins/itip-formatter/itip-formatter.c:2523 +#: ../plugins/itip-formatter/itip-formatter.c:2536 msgid "Calendar and Tasks" msgstr "କ୍ୟାଲେଣ୍ଡର ଏବଂ କାର୍ଯ୍ୟଗୁଡ଼ିକ" #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2 -#: ../calendar/gui/calendar-component.c:819 -#: ../calendar/gui/calendar-component.c:1241 +#: ../calendar/gui/calendar-component.c:820 +#: ../calendar/gui/calendar-component.c:1242 msgid "Calendars" msgstr "କ୍ୟାଲେଣ୍ଡର" @@ -3234,7 +3213,7 @@ msgid "Memo_s" msgstr "Memos (_s)" #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12 -#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1132 +#: ../calendar/gui/e-memo-table.c:291 ../calendar/gui/e-memos.c:1132 #: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:566 #: ../calendar/gui/memos-component.c:884 ../calendar/gui/memos-control.c:389 #: ../calendar/gui/memos-control.c:405 @@ -3242,14 +3221,14 @@ msgid "Memos" msgstr "Memos" #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13 -#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1436 -#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988 +#: ../calendar/gui/e-calendar-table.c:723 ../calendar/gui/e-tasks.c:1436 +#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1991 #: ../calendar/gui/tasks-component.c:558 ../calendar/gui/tasks-component.c:880 #: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544 #: ../calendar/importers/icalendar-importer.c:76 -#: ../calendar/importers/icalendar-importer.c:749 +#: ../calendar/importers/icalendar-importer.c:751 #: ../plugins/exchange-operations/exchange-delegates-user.c:76 -#: ../plugins/exchange-operations/exchange-folder.c:588 +#: ../plugins/exchange-operations/exchange-folder.c:590 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:569 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12 @@ -3279,8 +3258,8 @@ msgstr[1] "ମିନିଟ" #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8 #: ../calendar/gui/dialogs/event-page.glade.h:22 -#: ../plugins/caldav/caldav-source.c:412 -#: ../plugins/calendar-http/calendar-http.c:279 +#: ../plugins/caldav/caldav-source.c:449 +#: ../plugins/calendar-http/calendar-http.c:324 #: ../plugins/calendar-weather/calendar-weather.c:524 #: ../plugins/google-account-setup/google-source.c:654 #: ../plugins/google-account-setup/google-contacts-source.c:331 @@ -3304,10 +3283,10 @@ msgstr "ସମସ୍ତଙ୍କୁ ଅସ୍ୱୀକାର କରନ୍ତୁ #. Location #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1606 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1612 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1604 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1610 #: ../calendar/gui/e-itip-control.c:1165 -#: ../plugins/itip-formatter/itip-view.c:1021 +#: ../plugins/itip-formatter/itip-view.c:1024 msgid "Location:" msgstr "ଅବସ୍ଥାନ:" @@ -3320,7 +3299,7 @@ msgid "_Dismiss" msgstr "ଅସ୍ୱୀକାର କରନ୍ତୁ (_D)" #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6 -#: ../calendar/gui/dialogs/comp-editor.c:1021 +#: ../calendar/gui/dialogs/comp-editor.c:1029 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15 @@ -3340,32 +3319,32 @@ msgstr "ସ୍ବଲ୍ପ ସମୟ ବିରତି (_S)" msgid "location of appointment" msgstr "ନିଯୁକ୍ତିର ଅବସ୍ଥାନ" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1464 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1589 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1462 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1587 msgid "No summary available." msgstr "କୌଣସି ସାରାଂଶ ଉପଲବ୍ଧ ନାହିଁ।" +#: ../calendar/gui/alarm-notify/alarm-queue.c:1471 #: ../calendar/gui/alarm-notify/alarm-queue.c:1473 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1475 msgid "No description available." msgstr "କୌଣସି ବର୍ଣ୍ଣନା ଉପଲବ୍ଧ ନାହିଁ।" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1483 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1481 msgid "No location information available." msgstr "କୌଣସି ଅବସ୍ଥାନ ସୂଚନା ଉପଲବ୍ଧ ନାହିଁ।" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1528 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1526 #, c-format msgid "You have %d alarms" msgstr "ଆପଣଙ୍କ ନିକଟରେ %d ସତର୍କ ଅଛି" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1690 -#: ../calendar/gui/alarm-notify/alarm-queue.c:1718 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1688 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1716 #: ../e-util/e-non-intrusive-error-dialog.h:41 msgid "Warning" msgstr "ଚେତାବନୀ" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1694 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1692 msgid "" "Evolution does not support calendar reminders with\n" "email notifications yet, but this reminder was\n" @@ -3373,7 +3352,7 @@ msgid "" "a normal reminder dialog box instead." msgstr "" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1724 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1722 #, c-format msgid "" "An Evolution Calendar reminder is about to trigger. This reminder is " @@ -3383,14 +3362,14 @@ msgid "" "\n" "Are you sure you want to run this program?" msgstr "" -"ଗୋଟିଏ Evolution କ୍ୟାଲେଣ୍ଡର ଆରମ୍ଭ ହେବାକୁ ଯାଉଛି। ଏହି ସ୍ମରଣକାରୀଟି ନିମ୍ନଲିଖିତ ପ୍ରଗ୍ରାମକୁ " -"ଚଲାଇବା ପାଇଁ ବିନ୍ୟାସ କରାଯାଇଛି:\n" +"ଗୋଟିଏ Evolution କ୍ୟାଲେଣ୍ଡର ଆରମ୍ଭ ହେବାକୁ ଯାଉଛି। ଏହି ସ୍ମରଣକାରୀଟି ନିମ୍ନଲିଖିତ ପ୍ରଗ୍ରାମକୁ ଚଲାଇବା " +"ପାଇଁ ବିନ୍ୟାସ କରାଯାଇଛି:\n" "\n" " %s\n" "\n" "ଆପଣ ନିଶ୍ଚିତକି ଆପଣ ଏହି ପ୍ରଗ୍ରାମକୁ ଚଲାଇବାକୁ ଚାହୁଁଛନ୍ତି?" -#: ../calendar/gui/alarm-notify/alarm-queue.c:1738 +#: ../calendar/gui/alarm-notify/alarm-queue.c:1736 msgid "Do not ask me about this program again." msgstr "ଏହି ପ୍ରୋଗ୍ରାମ ବିଷୟରେ ମୋତେ ପୁନର୍ବାର ପଚାରନ୍ତୁ ନାହିଁ।" @@ -3694,12 +3673,12 @@ msgid "Show status field in the event/task/meeting editor" msgstr "ଘଟଣା/କାର୍ଯ୍ୟସୂଚୀ/ସାକ୍ଷାତକାର ସମ୍ପାଦକରେ ଅବସ୍ଥିତ କ୍ଷେତ୍ରକୁ ଦର୍ଶାନ୍ତୁ" #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61 -#: ../mail/evolution-mail.schemas.in.h:126 +#: ../mail/evolution-mail.schemas.in.h:136 msgid "Show the \"Preview\" pane" msgstr "\"Preview\" ପ୍ୟାନ ଦର୍ଶାନ୍ତୁ" #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62 -#: ../mail/evolution-mail.schemas.in.h:127 +#: ../mail/evolution-mail.schemas.in.h:137 msgid "Show the \"Preview\" pane." msgstr "\"Preview\" ପ୍ୟାନ ଦର୍ଶାନ୍ତୁ।" @@ -3787,7 +3766,6 @@ msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"day msgstr "" #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82 -#| msgid "_Use system defaults" msgid "Use system timezone" msgstr "ତନ୍ତ୍ର ସମୟମଣ୍ଡଳକୁ ବ୍ଯବହାର କରନ୍ତୁ" @@ -3942,7 +3920,7 @@ msgid "Next 7 Days' Appointments" msgstr "ପରବର୍ତ୍ତି 7 ଦିନର ସାକ୍ଷାତକାର" #: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26 -#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75 +#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14 msgid "Print" msgstr "ମୂଦ୍ରଣ କରନ୍ତୁ" @@ -3959,8 +3937,8 @@ msgid "Purge events older than" msgstr "ଏହା ପୂର୍ବବର୍ତ୍ତୀ ଘଟଣା ମାନଙ୍କୁ ନିଷ୍କାସିତ କରନ୍ତୁ" #: ../calendar/gui/calendar-commands.c:326 -#: ../plugins/caldav/caldav-source.c:413 -#: ../plugins/calendar-http/calendar-http.c:280 +#: ../plugins/caldav/caldav-source.c:450 +#: ../plugins/calendar-http/calendar-http.c:325 #: ../plugins/calendar-weather/calendar-weather.c:525 #: ../plugins/google-account-setup/google-source.c:655 #: ../plugins/google-account-setup/google-contacts-source.c:332 @@ -3987,92 +3965,92 @@ msgstr "ପାଣିପାଗ" msgid "Birthdays & Anniversaries" msgstr "ଜନ୍ମଦିନ ଏବଂ ବାର୍ଷିକୀ" -#: ../calendar/gui/calendar-component.c:626 +#: ../calendar/gui/calendar-component.c:627 msgid "_New Calendar" msgstr "ନୂତନ କ୍ଯାଲେଣ୍ଡର (_N)" -#: ../calendar/gui/calendar-component.c:627 +#: ../calendar/gui/calendar-component.c:628 #: ../calendar/gui/memos-component.c:480 ../calendar/gui/tasks-component.c:472 -#: ../mail/em-folder-tree.c:2123 +#: ../mail/em-folder-tree.c:2097 msgid "_Copy..." msgstr "ନକଲ କରନ୍ତୁ (_C)..." -#: ../calendar/gui/calendar-component.c:632 +#: ../calendar/gui/calendar-component.c:633 #: ../calendar/gui/memos-component.c:485 ../calendar/gui/tasks-component.c:477 msgid "_Make available for offline use" msgstr "ଅଫ-ଲାଇନ ଧାରାରେ ବ୍ୟବହାର ପାଇଁ ଉପଲବ୍ଧ କରନ୍ତୁ (_M)" -#: ../calendar/gui/calendar-component.c:633 +#: ../calendar/gui/calendar-component.c:634 #: ../calendar/gui/memos-component.c:486 ../calendar/gui/tasks-component.c:478 msgid "_Do not make available for offline use" msgstr "ଅଫ-ଲାଇନ ଧାରାରେ ବ୍ୟବହାର ପାଇଁ ଉପଲବ୍ଧ କରନ୍ତୁ ନାହିଁ (_D)" -#: ../calendar/gui/calendar-component.c:963 +#: ../calendar/gui/calendar-component.c:964 msgid "Failed upgrading calendars." msgstr "କ୍ଯାଲେଣ୍ଡର ଉନ୍ନୟନ କରିବା ସମୟରେ ବିଫଳ।" -#: ../calendar/gui/calendar-component.c:1092 +#: ../calendar/gui/calendar-component.c:1093 #, c-format msgid "Unable to open the calendar '%s' for creating events and meetings" msgstr "ଘଟଣା ଏବଂ ସାକ୍ଷାତକାର ସ୍ରୁଷ୍ଟି କରିବା ପାଇଁ '%s' କ୍ଯାଲେଣ୍ଡର ଖୋଲିବାରେ ଅସମର୍ଥ" -#: ../calendar/gui/calendar-component.c:1108 +#: ../calendar/gui/calendar-component.c:1109 msgid "There is no calendar available for creating events and meetings" msgstr "ଘଟଣା ଏବଂ ସାକ୍ଷାତକାର ସ୍ରୁଷ୍ଟି କରିବା ପାଇଁ କୌଣସି କ୍ଯାଲେଣ୍ଡର ଉପଲବ୍ଧ ନାହିଁ" -#: ../calendar/gui/calendar-component.c:1221 +#: ../calendar/gui/calendar-component.c:1222 msgid "Calendar Source Selector" msgstr "କ୍ଯାଲେଣ୍ଡର ଉତ୍ସ ଚୟକ" -#: ../calendar/gui/calendar-component.c:1437 +#: ../calendar/gui/calendar-component.c:1438 msgid "New appointment" msgstr "ନୂତନ ସାକ୍ଷାତକାର" -#: ../calendar/gui/calendar-component.c:1438 +#: ../calendar/gui/calendar-component.c:1439 msgctxt "New" msgid "_Appointment" msgstr "ସାକ୍ଷାତକାର (_A)" -#: ../calendar/gui/calendar-component.c:1439 +#: ../calendar/gui/calendar-component.c:1440 msgid "Create a new appointment" msgstr "ଗୋଟିଏ ନୂତନ ସାକ୍ଷାତକାର ସ୍ରୁଷ୍ଟି କରନ୍ତୁ" -#: ../calendar/gui/calendar-component.c:1445 +#: ../calendar/gui/calendar-component.c:1446 msgid "New meeting" msgstr "ନୂତନ ସାକ୍ଷାତକାର" -#: ../calendar/gui/calendar-component.c:1446 +#: ../calendar/gui/calendar-component.c:1447 msgctxt "New" msgid "M_eeting" msgstr "ସାକ୍ଷାତକାର (_e)" -#: ../calendar/gui/calendar-component.c:1447 +#: ../calendar/gui/calendar-component.c:1448 msgid "Create a new meeting request" msgstr "ଗୋଟିଏ ନୂତନ ସାକ୍ଷାତକାର ନିବେଦନ" -#: ../calendar/gui/calendar-component.c:1453 +#: ../calendar/gui/calendar-component.c:1454 msgid "New all day appointment" msgstr "ନୂତନ ସମ୍ପୂର୍ଣ ଦିବସ ବ୍ଯାପି ସାକ୍ଷାତକାର" -#: ../calendar/gui/calendar-component.c:1454 +#: ../calendar/gui/calendar-component.c:1455 msgctxt "New" msgid "All Day A_ppointment" msgstr "ସମ୍ପୂର୍ଣ ଦିବସ ବ୍ଯାପି ସାକ୍ଷାତକାର (_p)" -#: ../calendar/gui/calendar-component.c:1455 +#: ../calendar/gui/calendar-component.c:1456 msgid "Create a new all-day appointment" msgstr "ଗୋଟିଏ ନୂତନ ସମ୍ପୂର୍ଣ ଦିବସ ବ୍ଯାପି ସାକ୍ଷାତକାର" -#: ../calendar/gui/calendar-component.c:1461 +#: ../calendar/gui/calendar-component.c:1462 msgid "New calendar" msgstr "ନୂତନ କ୍ଯାଲେଣ୍ଡର" -#: ../calendar/gui/calendar-component.c:1462 +#: ../calendar/gui/calendar-component.c:1463 msgctxt "New" msgid "Cale_ndar" msgstr "କ୍ଯାଲେଣ୍ଡର (_n)" -#: ../calendar/gui/calendar-component.c:1463 +#: ../calendar/gui/calendar-component.c:1464 msgid "Create a new calendar" msgstr "ଗୋଟିଏ ନୂତନ କ୍ଯାଲେଣ୍ଡର ସ୍ରୁଷ୍ଟି କରନ୍ତୁ" @@ -4117,8 +4095,8 @@ msgstr "ବିଭାଗ" msgid "Classification" msgstr "ବିଭାଗୀକରଣ" -#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249 -#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568 +#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:248 +#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:566 #: ../calendar/gui/memotypes.xml.h:6 #: ../plugins/email-custom-header/email-custom-header.c:341 msgid "Confidential" @@ -4159,15 +4137,15 @@ msgstr "ଅବସ୍ଥାନ" msgid "Organizer" msgstr "ସଙ୍ଗଠକ" -#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248 -#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567 +#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:247 +#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:565 #: ../calendar/gui/memotypes.xml.h:12 msgid "Private" msgstr "ବ୍ଯକ୍ତିଗତ" -#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247 +#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:246 #: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348 -#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13 +#: ../calendar/gui/e-calendar-table.c:564 ../calendar/gui/memotypes.xml.h:13 msgid "Public" msgstr "ସାର୍ବଜନୀନ" @@ -4304,7 +4282,6 @@ msgid "_Sound:" msgstr "ଧ୍ବନୀ (_S):" #: ../calendar/gui/dialogs/alarm-dialog.glade.h:14 -#| msgid "before" msgid "" "before\n" "after" @@ -4317,10 +4294,6 @@ msgid "extra times every" msgstr "ଅତିରିକ୍ତ ସମୟ ପ୍ରାପ୍ତି" #: ../calendar/gui/dialogs/alarm-dialog.glade.h:17 -#| msgid "" -#| "Minutes\n" -#| "Hours\n" -#| "Days" msgid "" "minute(s)\n" "hour(s)\n" @@ -4331,10 +4304,6 @@ msgstr "" "ଦିନ" #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20 -#| msgid "" -#| "Minutes\n" -#| "Hours\n" -#| "Days" msgid "" "minutes\n" "hours\n" @@ -4345,7 +4314,6 @@ msgstr "" "ଦିନ" #: ../calendar/gui/dialogs/alarm-dialog.glade.h:23 -#| msgid "start of appointment" msgid "" "start of appointment\n" "end of appointment" @@ -4362,14 +4330,14 @@ msgid "A_dd" msgstr "ଯୋଗ କରନ୍ତୁ (_d)" #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15 #: ../calendar/gui/dialogs/event-page.glade.h:4 msgid "Alarms" msgstr "ସତର୍କ ଧ୍ବନୀ" #: ../calendar/gui/dialogs/cal-attachment-select-file.c:81 #: ../widgets/misc/e-attachment-dialog.c:371 -#: ../widgets/misc/e-attachment-store.c:545 +#: ../widgets/misc/e-attachment-store.c:553 msgid "_Suggest automatic display of attachment" msgstr "ସଂଲଗ୍ନକର ସ୍ବତଃ ପ୍ରଦର୍ଶନକୁ ପରାମର୍ଶ କରନ୍ତୁ (_S)" @@ -4380,18 +4348,18 @@ msgstr "ଫାଇଲ ସଂଲଗ୍ନ କରନ୍ତୁ" #. an empty string is the same as 'None' #: ../calendar/gui/dialogs/cal-prefs-dialog.c:137 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:186 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 -#: ../calendar/gui/dialogs/event-page.c:2951 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32 +#: ../calendar/gui/dialogs/event-page.c:2968 #: ../calendar/gui/e-cal-model-tasks.c:673 -#: ../calendar/gui/e-day-view-time-item.c:788 +#: ../calendar/gui/e-day-view-time-item.c:789 #: ../calendar/gui/e-itip-control.c:1151 ../filter/filter-rule.c:942 -#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408 +#: ../mail/em-account-editor.c:705 ../mail/em-account-editor.c:1434 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93 #: ../plugins/calendar-weather/calendar-weather.c:333 #: ../plugins/calendar-weather/calendar-weather.c:387 #: ../plugins/email-custom-header/email-custom-header.c:395 #: ../plugins/exchange-operations/exchange-delegates-user.c:181 -#: ../plugins/itip-formatter/itip-formatter.c:2179 +#: ../plugins/itip-formatter/itip-formatter.c:2192 #: ../widgets/misc/e-cell-date-edit.c:316 ../widgets/misc/e-dateedit.c:1510 #: ../widgets/misc/e-dateedit.c:1726 #: ../widgets/misc/e-signature-combo-box.c:74 @@ -4452,25 +4420,21 @@ msgstr "ସମୟ" msgid "Work Week" msgstr "କାର୍ଯ୍ଯ ସପ୍ତାହ" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15 -msgid "Adjust for daylight sa_ving time" -msgstr "ଦିବାଲୋକ ସଂରକ୍ଷଣ ସମୟ ପାଇଁ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ (_v)" - -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16 msgid "Day _ends:" msgstr "ଦିବସ ସମାପ୍ତି (_e):" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 msgid "Display" msgstr "ପ୍ରଦର୍ଶନ" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 #: ../calendar/gui/dialogs/recurrence-page.c:1107 #: ../calendar/gui/e-itip-control.c:731 msgid "Friday" msgstr "ଶୁକ୍ରବାର" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21 msgid "" "Minutes\n" "Hours\n" @@ -4480,13 +4444,13 @@ msgstr "" "ଘଣ୍ଟା\n" "ଦିନ" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24 #: ../calendar/gui/dialogs/recurrence-page.c:1103 #: ../calendar/gui/e-itip-control.c:727 msgid "Monday" msgstr "ସୋମବାର" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25 msgid "" "Monday\n" "Tuesday\n" @@ -4504,180 +4468,179 @@ msgstr "" "ଶନିବାର\n" "ରବିବାର" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 #: ../mail/mail-config.glade.h:117 msgid "Pick a color" msgstr "ଗୋଟିଏ ରଙ୍ଗ ଚୟନ କରନ୍ତୁ" #. Sunday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35 msgid "S_un" msgstr "ରବି (_u)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36 #: ../calendar/gui/dialogs/recurrence-page.c:1108 #: ../calendar/gui/e-itip-control.c:732 msgid "Saturday" msgstr "ଶନିବାର" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37 msgid "Sc_roll Month View by a week" msgstr "" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38 msgid "Se_cond zone:" msgstr "ଦ୍ୱିତିୟ କ୍ଷେତ୍ର (_c):" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 msgid "Select the calendars for alarm notification" msgstr "ସତର୍କ ସୂଚନା ପାଇଁ କ୍ଯାଲଣ୍ଡର ଚୟନ କରନ୍ତୁ" #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 msgid "Sh_ow a reminder" msgstr "ଗୋଟିଏ ସ୍ମାରକପତ୍ର ଦେଖାନ୍ତୁ (_o)" #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 msgid "Show a _reminder" msgstr "ଗୋଟିଏ ସ୍ମାରକପତ୍ର ଦେଖାନ୍ତୁ (_r)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 msgid "Show week _numbers in date navigator" msgstr "ତାରିଖ ପ୍ରଦର୍ଶକରେ ସପ୍ତାହ ସଂଖ୍ଯା ମାନଙ୍କୁ ଦେଖାନ୍ତୁ (_n)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45 msgid "Show week n_umber in Day and Work Week View" msgstr "ତାରିଖ ପ୍ରଦର୍ଶକରେ ସପ୍ତାହ ସଂଖ୍ଯା ମାନଙ୍କୁ ଦେଖାନ୍ତୁ (_u)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46 #: ../calendar/gui/dialogs/recurrence-page.c:1109 #: ../calendar/gui/e-itip-control.c:726 msgid "Sunday" msgstr "ରବିବାର" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47 msgid "T_asks due today:" msgstr "ଆଜି କାର୍ଯ୍ଯ ସମାପ୍ତ କରିବାର ଅନ୍ତିମ ଦିବସ (_a):" #. Thursday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 msgid "T_hu" msgstr "ଗୁରୁ (_h)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50 msgid "Template:" msgstr "ଛାଞ୍ଚ:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51 #: ../calendar/gui/dialogs/recurrence-page.c:1106 #: ../calendar/gui/e-itip-control.c:730 msgid "Thursday" msgstr "ଗୁରୁବାର" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52 #: ../calendar/gui/dialogs/event-page.glade.h:12 msgid "Time _zone:" msgstr "ସମୟ ମଣ୍ଡଳ (_z):" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53 msgid "Time format:" msgstr "ସମୟ ପ୍ରାରୂପ:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54 #: ../calendar/gui/dialogs/recurrence-page.c:1104 #: ../calendar/gui/e-itip-control.c:728 msgid "Tuesday" msgstr "ମଙ୍ଗଳବାର" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56 -#| msgid "Show the second time zone" +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55 msgid "Use s_ystem time zone" msgstr "ତନ୍ତ୍ର ସମୟ ମଣ୍ଡଳକୁ ବ୍ୟବହାର କରନ୍ତୁ (_y)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56 #: ../calendar/gui/dialogs/recurrence-page.c:1105 #: ../calendar/gui/e-itip-control.c:729 msgid "Wednesday" msgstr "ବୁଧବାର" #. A weekday like "Monday" follows -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58 msgid "Wee_k starts on:" msgstr "ସପ୍ତାହ ଏହି ବାରରେ ଆରମ୍ଭ ହୁଏ (_k):" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59 msgid "Work days:" msgstr "କାର୍ଯ୍ଯ ଦିବସ:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60 msgid "_12 hour (AM/PM)" msgstr "୧୨ ଘଣ୍ଟା (ପୂର୍ବାହ୍ନ/ଅପରାହ୍ନ) (_1)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61 msgid "_24 hour" msgstr "୨୪ ଘଣ୍ଟା (_2)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62 msgid "_Ask for confirmation when deleting items" msgstr "ବସ୍ତୁଗୁଡ଼ିକୁ ଅପସାରଣ କରିବା ସମୟରେ ନିଶ୍ଚିତକରଣ ପାଇଁ ପଚାରନ୍ତୁ (_A)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63 msgid "_Compress weekends in month view" msgstr "ମାସ ଦୃଶ୍ୟରେ ସପ୍ତାହ ଶେଷକୁ ଚାପନ୍ତୁ (_C)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64 msgid "_Day begins:" msgstr "ଦିନ ପ୍ରାରମ୍ଭ ହୋଇଥାଏ (_D):" #. Friday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66 msgid "_Fri" msgstr "ଶୁକ୍ର (_F)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67 msgid "_Hide completed tasks after" msgstr "ସମ୍ପନ୍ନ କାର୍ଯ୍ଯକୁ ପରେ ଲୁକ୍କୟିତ କରନ୍ତୁ (_H)" #. Monday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69 msgid "_Mon" msgstr "ସୋମ (_M)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70 msgid "_Overdue tasks:" msgstr "ସମୟାତିକ୍ରାନ୍ତ କାର୍ଯ୍ଯ (_O):" #. Saturday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72 msgid "_Sat" msgstr "ଶନି (_S)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73 msgid "_Show appointment end times in week and month view" msgstr "ସାକ୍ଷାତକାର ଅନ୍ତିମ ସମୟକୁ ସପ୍ତାହ ଏବଂ ମାସ ଦୃଶ୍ୟ ଆକାରରେ ଦର୍ଶାନ୍ତୁ (_S)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74 msgid "_Time divisions:" msgstr "ସମୟ ବିଭାଜନ (_T):" #. Tuesday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76 msgid "_Tue" msgstr "ମଙ୍ଗଳ (_T)" #. Wednesday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78 msgid "_Wed" msgstr "ବୁଧ (_W)" #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80 msgid "before every anniversary/birthday" msgstr "ପ୍ରତ୍ୟେକ ବାର୍ଷିକ/ଜନ୍ମଦିନ ପୂର୍ବରୁ" #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82 msgid "before every appointment" msgstr "ପ୍ରତ୍ଯେକ ସାକ୍ଷାତକାର ପୂର୍ବରୁ" @@ -4782,230 +4745,234 @@ msgstr "%s ଆପଣ କୌଣସି ପରିବର୍ତ୍ତନ କରି msgid "Validation error: %s" msgstr "ବୈଧିକରଣ ତ୍ରୁଟି: %s" -#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365 +#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2372 msgid " to " msgstr "ଏଠାକୁ" -#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369 +#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2376 msgid " (Completed " msgstr " (ସମାପ୍ତ" -#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371 +#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2378 msgid "Completed " msgstr "ସମାପ୍ତ" -#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376 +#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2383 msgid " (Due " msgstr " (Due " -#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378 +#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2385 msgid "Due " msgstr "ବାକି" -#: ../calendar/gui/dialogs/comp-editor.c:245 -#: ../calendar/gui/dialogs/comp-editor.c:2677 ../mail/em-utils.c:373 -#: ../plugins/prefer-plain/prefer-plain.c:91 -msgid "attachment" -msgstr "ସଂଲଗ୍ନକ" +#: ../calendar/gui/dialogs/comp-editor.c:221 +#| msgid "Could not save the attachment" +msgid "Could not save attachments" +msgstr "ସଂଲଗ୍ନକକୁ ସଂରକ୍ଷଣ କରିପାରିଲା ନାହିଁ" -#: ../calendar/gui/dialogs/comp-editor.c:476 +#: ../calendar/gui/dialogs/comp-editor.c:484 msgid "Could not update object" msgstr "ବସ୍ତୁକୁ ଅଦ୍ଯତିତ କରିପାରିଲା ନାହିଁ" -#: ../calendar/gui/dialogs/comp-editor.c:565 +#: ../calendar/gui/dialogs/comp-editor.c:573 msgid "Edit Appointment" msgstr "ସାକ୍ଷାତକାରକୁ ସମ୍ପାଦନ କରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:572 +#: ../calendar/gui/dialogs/comp-editor.c:580 #, c-format msgid "Meeting - %s" msgstr "ସଭା - %s" -#: ../calendar/gui/dialogs/comp-editor.c:574 +#: ../calendar/gui/dialogs/comp-editor.c:582 #, c-format msgid "Appointment - %s" msgstr "ସାକ୍ଷାତକାର - %s" -#: ../calendar/gui/dialogs/comp-editor.c:580 +#: ../calendar/gui/dialogs/comp-editor.c:588 #, c-format msgid "Assigned Task - %s" msgstr "ହସ୍ତାନ୍ତରିତ କାର୍ଯ୍ଯ - %s" -#: ../calendar/gui/dialogs/comp-editor.c:582 +#: ../calendar/gui/dialogs/comp-editor.c:590 #, c-format msgid "Task - %s" msgstr "କାର୍ଯ୍ଯ - %s" -#: ../calendar/gui/dialogs/comp-editor.c:587 +#: ../calendar/gui/dialogs/comp-editor.c:595 #, c-format msgid "Memo - %s" msgstr "Memo - %s" -#: ../calendar/gui/dialogs/comp-editor.c:603 +#: ../calendar/gui/dialogs/comp-editor.c:611 msgid "No Summary" msgstr "କୌଣସି ସାରାଂଶ ନାହିଁ" -#: ../calendar/gui/dialogs/comp-editor.c:745 +#: ../calendar/gui/dialogs/comp-editor.c:753 msgid "Keep original item?" msgstr "ପ୍ରକୃତ ବସ୍ତୁକୁ ରଖିବେ କି?" -#: ../calendar/gui/dialogs/comp-editor.c:951 +#: ../calendar/gui/dialogs/comp-editor.c:959 msgid "Click here to close the current window" msgstr "ପ୍ରଚଳିତ ୱିଣ୍ଡୋକୁ ବନ୍ଦ କରିବା ପାଇଁ ଏଠାରେ କ୍ଲିକ କରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:958 +#: ../calendar/gui/dialogs/comp-editor.c:966 msgid "Copy selected text to the clipboard" msgstr "କ୍ଲିପବୋର୍ଡରେ ବଚ୍ଛିତ ପାଠ୍ୟକୁ ନକଲ କରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:965 +#: ../calendar/gui/dialogs/comp-editor.c:973 msgid "Cut selected text to the clipboard" msgstr "କ୍ଲିପବୋର୍ଡରେ ବଚ୍ଛିତ ପାଠ୍ୟକୁ କାଟନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:972 +#: ../calendar/gui/dialogs/comp-editor.c:980 msgid "Click here to view help available" msgstr "ଉପଲବ୍ଧ ସହାୟତାକୁ ଦେଖିବା ପାଇଁ ଏଠାରେ କ୍ଲିକ କରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:979 +#: ../calendar/gui/dialogs/comp-editor.c:987 msgid "Paste text from the clipboard" msgstr "କ୍ଲିପବୋର୍ଡରୁ ପାଠ୍ୟ ଲଗାନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:1000 +#: ../calendar/gui/dialogs/comp-editor.c:1008 msgid "Click here to save the current window" msgstr "ପ୍ରଚଳିତ ୱିଣ୍ଡୋକୁ ସଂରକ୍ଷଣ କରିବା ପାଇଁ ଏଠାରେ କ୍ଲିକ କରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:1007 +#: ../calendar/gui/dialogs/comp-editor.c:1015 msgid "Select all text" msgstr "ସମସ୍ତ ପାଠ୍ୟକୁ ବାଛନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:1014 +#: ../calendar/gui/dialogs/comp-editor.c:1022 msgid "_Classification" msgstr "ବିଭାଜନ (_C)" -#: ../calendar/gui/dialogs/comp-editor.c:1028 +#: ../calendar/gui/dialogs/comp-editor.c:1036 #: ../mail/mail-signature-editor.c:208 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43 msgid "_File" msgstr "ଫାଇଲ (_F)" -#: ../calendar/gui/dialogs/comp-editor.c:1035 +#: ../calendar/gui/dialogs/comp-editor.c:1043 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24 #: ../ui/evolution.xml.h:46 msgid "_Help" msgstr "ସହାୟତା (_H)" -#: ../calendar/gui/dialogs/comp-editor.c:1042 +#: ../calendar/gui/dialogs/comp-editor.c:1050 msgid "_Insert" msgstr "ଭର୍ତ୍ତି କରନ୍ତୁ (_I)" -#: ../calendar/gui/dialogs/comp-editor.c:1049 +#: ../calendar/gui/dialogs/comp-editor.c:1057 msgid "_Options" msgstr "ବିକଲ୍ପ (_O)" -#: ../calendar/gui/dialogs/comp-editor.c:1056 ../mail/em-folder-tree.c:2115 +#: ../calendar/gui/dialogs/comp-editor.c:1064 ../mail/em-folder-tree.c:2089 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30 #: ../ui/evolution.xml.h:55 msgid "_View" msgstr "ଦ୍ରୁଶ୍ଯ (_V)" -#: ../calendar/gui/dialogs/comp-editor.c:1066 -#: ../composer/e-composer-actions.c:413 +#: ../calendar/gui/dialogs/comp-editor.c:1074 +#: ../composer/e-composer-actions.c:315 msgid "_Attachment..." msgstr "ସଂଲଗ୍ନ (_A)..." -#: ../calendar/gui/dialogs/comp-editor.c:1068 +#: ../calendar/gui/dialogs/comp-editor.c:1076 msgid "Click here to attach a file" msgstr "ଗୋଟିଏ ଫାଇଲ ସଂଲଗ୍ନ କରିବା ପାଇଁ ଏଠାରେ କ୍ଲିକ କରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:1076 +#: ../calendar/gui/dialogs/comp-editor.c:1084 msgid "_Categories" msgstr "ବିଭାଗ (_C)" -#: ../calendar/gui/dialogs/comp-editor.c:1078 +#: ../calendar/gui/dialogs/comp-editor.c:1086 msgid "Toggles whether to display categories" msgstr "ବିଭାଗଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ପାଇଁ ଆଗପଛକରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:1084 +#: ../calendar/gui/dialogs/comp-editor.c:1092 msgid "Time _Zone" msgstr "ସମୟ ମଣ୍ଡଳ (_Z)" -#: ../calendar/gui/dialogs/comp-editor.c:1086 +#: ../calendar/gui/dialogs/comp-editor.c:1094 msgid "Toggles whether the time zone is displayed" msgstr "ସମୟ ମଣ୍ଡଳ ଦର୍ଶାଯାଇଛି କି ନାହିଁ ତାହା ପାଇଁ ଆଗପଛ କରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:1095 +#: ../calendar/gui/dialogs/comp-editor.c:1103 msgid "Pu_blic" msgstr "ସାର୍ବଜନିକ (_b)" -#: ../calendar/gui/dialogs/comp-editor.c:1097 +#: ../calendar/gui/dialogs/comp-editor.c:1105 msgid "Classify as public" msgstr "ସାର୍ବଜନିକ ଭାବରେ ବିଭକ୍ତ କରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:1102 +#: ../calendar/gui/dialogs/comp-editor.c:1110 msgid "_Private" msgstr "ବ୍ୟକ୍ତିଗତ (_P)" -#: ../calendar/gui/dialogs/comp-editor.c:1104 +#: ../calendar/gui/dialogs/comp-editor.c:1112 msgid "Classify as private" msgstr "ବ୍ୟକ୍ତିଗତ ଭାବରେ ଶ୍ରେଣୀବିଭାଗ କରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:1109 +#: ../calendar/gui/dialogs/comp-editor.c:1117 msgid "_Confidential" msgstr "ଗୁପ୍ତ (_C)" -#: ../calendar/gui/dialogs/comp-editor.c:1111 +#: ../calendar/gui/dialogs/comp-editor.c:1119 msgid "Classify as confidential" msgstr "ଗୋପନୀୟତା ଭାବରେ ଶ୍ରେଣୀବିଭାଗ କରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:1119 +#: ../calendar/gui/dialogs/comp-editor.c:1127 msgid "R_ole Field" msgstr "ଭୂମିକା କ୍ଷେତ୍ର (_o)" -#: ../calendar/gui/dialogs/comp-editor.c:1121 +#: ../calendar/gui/dialogs/comp-editor.c:1129 msgid "Toggles whether the Role field is displayed" msgstr "ଭୂମିର" -#: ../calendar/gui/dialogs/comp-editor.c:1127 +#: ../calendar/gui/dialogs/comp-editor.c:1135 msgid "_RSVP" msgstr "RSVP (_R)" -#: ../calendar/gui/dialogs/comp-editor.c:1129 +#: ../calendar/gui/dialogs/comp-editor.c:1137 msgid "Toggles whether the RSVP field is displayed" msgstr "RSVP କ୍ଷେତ୍ରକୁ ଦର୍ଶାଯିବ କି ନାହିଁ ତାହାପାଇଁ ଆଗପଛ କରିଥାଏ" -#: ../calendar/gui/dialogs/comp-editor.c:1135 +#: ../calendar/gui/dialogs/comp-editor.c:1143 msgid "_Status Field" msgstr "ସ୍ଥିତି କ୍ଷେତ୍ର (_S)" -#: ../calendar/gui/dialogs/comp-editor.c:1137 +#: ../calendar/gui/dialogs/comp-editor.c:1145 msgid "Toggles whether the Status field is displayed" msgstr "ସ୍ଥିତି କ୍ଷେତ୍ର ଦର୍ଶାଯାଇଛି କି ନାହିଁ ତାହା ପାଇଁ ଆଗପଛ କରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:1143 +#: ../calendar/gui/dialogs/comp-editor.c:1151 msgid "_Type Field" msgstr "ପ୍ରକାର କ୍ଷେତ୍ର (_T)" -#: ../calendar/gui/dialogs/comp-editor.c:1145 +#: ../calendar/gui/dialogs/comp-editor.c:1153 msgid "Toggles whether the Attendee Type is displayed" msgstr "ଉପସ୍ଥିତ ବ୍ୟକ୍ତି ପ୍ରକାର ଦର୍ଶାଯାଇଛି କି ନାହିଁ ତାହା ପାଇଁ ଆଗପଛ କରନ୍ତୁ" -#: ../calendar/gui/dialogs/comp-editor.c:1169 +#: ../calendar/gui/dialogs/comp-editor.c:1177 #: ../composer/e-composer-private.c:66 msgid "Recent _Documents" msgstr "ପ୍ରଚଳିତ ଦଲିଲ (_D)" -#: ../calendar/gui/dialogs/comp-editor.c:1595 -#: ../composer/e-composer-actions.c:640 +#: ../calendar/gui/dialogs/comp-editor.c:1603 +#: ../composer/e-composer-actions.c:518 msgid "Attach" msgstr "ସଂଯୁକ୍ତ" -#: ../calendar/gui/dialogs/comp-editor.c:1858 -#: ../calendar/gui/dialogs/comp-editor.c:1906 -#: ../calendar/gui/dialogs/comp-editor.c:2708 +#: ../calendar/gui/dialogs/comp-editor.c:1866 +#: ../calendar/gui/dialogs/comp-editor.c:1915 +#: ../calendar/gui/dialogs/comp-editor.c:2765 msgid "Changes made to this item may be discarded if an update arrives" msgstr "ଏହି ବସ୍ତୁରେ ପ୍ରୟୋଗ କରାଯାଇଥିବା ପରିବର୍ତ୍ତନକୁ ପରିତ୍ୟାଗ କରାଯାଇପାରେ ଯଦି କୌଣସି ଅଦ୍ୟତନ ଆସିଥାଏ" -#: ../calendar/gui/dialogs/comp-editor.c:2737 +#: ../calendar/gui/dialogs/comp-editor.c:2734 ../mail/em-utils.c:373 +#: ../plugins/prefer-plain/prefer-plain.c:91 +msgid "attachment" +msgstr "ସଂଲଗ୍ନକ" + +#: ../calendar/gui/dialogs/comp-editor.c:2794 msgid "Unable to use current version!" msgstr "ପ୍ରଚଳିତ ସଂସ୍କରଣକୁ ବ୍ୟବହାର କରିବାରେ ଅସମର୍ଥ!" @@ -5104,7 +5071,7 @@ msgstr "ଏହାକୁ ଗୋଟିଏ ପୁନରାବୃତ୍ତି ଘଟ #: ../calendar/gui/dialogs/event-editor.c:216 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2 -#: ../plugins/groupwise-features/send-options.c:212 +#: ../plugins/groupwise-features/send-options.c:213 #: ../widgets/misc/e-send-options.glade.h:18 msgid "Send Options" msgstr "ବିକଳ୍ପଗୁଡ଼ିକୁ ପଠାନ୍ତୁ" @@ -5142,69 +5109,69 @@ msgstr "" msgid "Appoint_ment" msgstr "ସାକ୍ଷାତକାର (_m)" -#: ../calendar/gui/dialogs/event-page.c:736 -#: ../calendar/gui/dialogs/event-page.c:2729 +#: ../calendar/gui/dialogs/event-page.c:749 +#: ../calendar/gui/dialogs/event-page.c:2743 msgid "This event has alarms" msgstr "ଏହି ଘଟଣାର ସତର୍କଧ୍ବନୀ ଅଛି" -#: ../calendar/gui/dialogs/event-page.c:799 +#: ../calendar/gui/dialogs/event-page.c:812 #: ../calendar/gui/dialogs/event-page.glade.h:10 #: ../calendar/gui/dialogs/memo-page.glade.h:2 msgid "Or_ganizer:" msgstr "ସଙ୍ଗଠକ (_g):" -#: ../calendar/gui/dialogs/event-page.c:845 +#: ../calendar/gui/dialogs/event-page.c:859 msgid "_Delegatees" msgstr "ନିର୍ବାଚିତ ପ୍ରତିନିଧୀ (_D)" -#: ../calendar/gui/dialogs/event-page.c:847 +#: ../calendar/gui/dialogs/event-page.c:861 msgid "Atte_ndees" msgstr "ଶ୍ରୋତା (_n)" -#: ../calendar/gui/dialogs/event-page.c:1032 +#: ../calendar/gui/dialogs/event-page.c:1046 msgid "Event with no start date" msgstr "ପ୍ରାରମ୍ଭିକ ତାରିଖ ସହିତ କୌଣସି ଘଟଣା ନାହିଁ" -#: ../calendar/gui/dialogs/event-page.c:1035 +#: ../calendar/gui/dialogs/event-page.c:1049 msgid "Event with no end date" msgstr "ଅନ୍ତିମ ତାରିଖ ସହିତ କୌଣସି ଘଟଣା ନାହିଁ" -#: ../calendar/gui/dialogs/event-page.c:1204 +#: ../calendar/gui/dialogs/event-page.c:1218 #: ../calendar/gui/dialogs/memo-page.c:640 #: ../calendar/gui/dialogs/task-page.c:814 msgid "Start date is wrong" msgstr "ପ୍ରାରମ୍ଭିକ ତାରିଖ ଭୂଲ ଅଟେ" -#: ../calendar/gui/dialogs/event-page.c:1214 +#: ../calendar/gui/dialogs/event-page.c:1228 msgid "End date is wrong" msgstr "ଅନ୍ତିମ ତାରିଖ ଭୂଲ ଅଟେ" -#: ../calendar/gui/dialogs/event-page.c:1237 +#: ../calendar/gui/dialogs/event-page.c:1251 msgid "Start time is wrong" msgstr "ପ୍ରାରମ୍ଭିକ ସମୟ ଭୂଲ ଅଟେ" -#: ../calendar/gui/dialogs/event-page.c:1244 +#: ../calendar/gui/dialogs/event-page.c:1258 msgid "End time is wrong" msgstr "ଅନ୍ତିମ ସମୟ ଭୂଲ ଅଟେ" -#: ../calendar/gui/dialogs/event-page.c:1407 +#: ../calendar/gui/dialogs/event-page.c:1421 #: ../calendar/gui/dialogs/memo-page.c:681 #: ../calendar/gui/dialogs/task-page.c:874 msgid "The organizer selected no longer has an account." msgstr "" -#: ../calendar/gui/dialogs/event-page.c:1413 +#: ../calendar/gui/dialogs/event-page.c:1427 #: ../calendar/gui/dialogs/memo-page.c:687 #: ../calendar/gui/dialogs/task-page.c:880 msgid "An organizer is required." msgstr "ଗୋଟିଏ ଆୟୋଜକ ଆବଶ୍ୟକ" -#: ../calendar/gui/dialogs/event-page.c:1438 +#: ../calendar/gui/dialogs/event-page.c:1452 #: ../calendar/gui/dialogs/task-page.c:904 msgid "At least one attendee is required." msgstr "ଅତିକମରେ ଜଣେ ଉପସ୍ଥିତ ବ୍ୟକ୍ତି ଆବଶ୍ୟକ।" -#: ../calendar/gui/dialogs/event-page.c:1878 +#: ../calendar/gui/dialogs/event-page.c:1892 #: ../calendar/gui/dialogs/task-page.c:1202 #: ../plugins/groupwise-features/junk-settings.glade.h:8 #: ../plugins/groupwise-features/properties.glade.h:13 @@ -5212,45 +5179,45 @@ msgstr "ଅତିକମରେ ଜଣେ ଉପସ୍ଥିତ ବ୍ୟକ୍ତ msgid "_Remove" msgstr "ଅପସାରଣ କରନ୍ତୁ (_R)" -#: ../calendar/gui/dialogs/event-page.c:1879 +#: ../calendar/gui/dialogs/event-page.c:1893 #: ../calendar/gui/dialogs/task-page.c:1203 msgid "_Add " msgstr "ଯୋଗ କରନ୍ତୁ (_A)" -#: ../calendar/gui/dialogs/event-page.c:2605 +#: ../calendar/gui/dialogs/event-page.c:2619 #, c-format msgid "Unable to open the calendar '%s'." msgstr "କ୍ୟାଲେଣ୍ଡର '%s'କୁ ଖୋଲିବାରେ ଅସମର୍ଥ।" -#: ../calendar/gui/dialogs/event-page.c:2649 +#: ../calendar/gui/dialogs/event-page.c:2663 #: ../calendar/gui/dialogs/memo-page.c:896 #: ../calendar/gui/dialogs/task-page.c:1810 #, c-format msgid "You are acting on behalf of %s" msgstr "ଆପଣ %s ବଦଳରେ କାର୍ଯ୍ୟକରୁଛନ୍ତି" -#: ../calendar/gui/dialogs/event-page.c:2928 +#: ../calendar/gui/dialogs/event-page.c:2942 #, c-format msgid "%d day before appointment" msgid_plural "%d days before appointment" msgstr[0] "" msgstr[1] "d ଦିନ ପୂର୍ବରୁ" -#: ../calendar/gui/dialogs/event-page.c:2934 +#: ../calendar/gui/dialogs/event-page.c:2948 #, c-format msgid "%d hour before appointment" msgid_plural "%d hours before appointment" msgstr[0] "ନିଯୁକ୍ତି ପୂର୍ବରୁ %d ଘଣ୍ଟା" msgstr[1] "ନିଯୁକ୍ତି ପୂର୍ବରୁ %d ଘଣ୍ଟା" -#: ../calendar/gui/dialogs/event-page.c:2940 +#: ../calendar/gui/dialogs/event-page.c:2954 #, c-format msgid "%d minute before appointment" msgid_plural "%d minutes before appointment" msgstr[0] "%d ମିନିଟ ପୂର୍ବରୁ ସାକ୍ଷାତକାର" msgstr[1] "%d ମିନିଟ ପୂର୍ବରୁ ସାକ୍ଷାତକାର" -#: ../calendar/gui/dialogs/event-page.c:2950 +#: ../calendar/gui/dialogs/event-page.c:2967 msgid "Customize" msgstr "ଇଚ୍ଛାରୂପଣ" @@ -5304,7 +5271,7 @@ msgstr "ସମୟ (_T)" #: ../calendar/gui/dialogs/event-page.glade.h:18 #: ../calendar/gui/dialogs/memo-page.glade.h:8 #: ../calendar/gui/dialogs/task-page.glade.h:10 -#: ../mail/mail-config.glade.h:193 ../mail/mail-dialogs.glade.h:24 +#: ../mail/mail-config.glade.h:193 ../mail/mail-dialogs.glade.h:21 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5 #: ../smime/gui/smime-ui.glade.h:49 msgid "" @@ -5313,7 +5280,6 @@ msgid "" msgstr "" #: ../calendar/gui/dialogs/event-page.glade.h:20 -#| msgid "until" msgid "" "for\n" "until" @@ -5321,7 +5287,7 @@ msgstr "" "ପାଇଁ\n" "ଯେ ପର୍ଯ୍ଯନ୍ତ" -#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485 +#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2492 msgid "Memo" msgstr "ସ୍ମାରକପତ୍ର" @@ -5332,7 +5298,7 @@ msgstr "'%s' ରେ ସ୍ମାରକପତ୍ରକୁ ଖୋଲିବାର #: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567 #: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651 -#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887 +#: ../mail/em-format-quote.c:210 ../mail/em-format.c:925 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20 msgid "To" msgstr "ଏଠାକୁ" @@ -5624,7 +5590,7 @@ msgid "Click to change or view the status details of the task" msgstr "" #: ../calendar/gui/dialogs/task-editor.c:123 -#: ../composer/e-composer-actions.c:469 +#: ../composer/e-composer-actions.c:371 msgid "_Send Options" msgstr "ପଠାଯାଇଥିବା ବିକଳ୍ପଗୁଡ଼ିକ (_S)" @@ -5743,7 +5709,6 @@ msgid "%s for an unknown trigger type" msgstr "ଗୋଟିଏ ଅଜଣା ଟ୍ରିଗର ପ୍ରକାର ପାଇଁ %s" #: ../calendar/gui/e-attachment-handler-calendar.c:258 -#| msgid "Import" msgid "I_mport" msgstr "ଆମଦାନୀ କରନ୍ତୁ (_m)" @@ -5752,23 +5717,20 @@ msgid "Select a Calendar" msgstr "ଗୋଟିଏ କ୍ଯାଲେଣ୍ଡର ବାଛନ୍ତୁ" #: ../calendar/gui/e-attachment-handler-calendar.c:367 -#, fuzzy msgid "Select a Task List" -msgstr "ମନୋନୀତ କର ଟାସ୍କ ତାଲିକା" +msgstr "ଗୋଟିଏ କାର୍ଯ୍ୟସୂଚୀ ବାଛନ୍ତୁ" #: ../calendar/gui/e-attachment-handler-calendar.c:377 -#, fuzzy #| msgid "Month Calendar" msgid "I_mport to Calendar" -msgstr "ମାସ ଅନୁଯାୟୀ କ୍ଯାଲେଣ୍ଡର" +msgstr "କ୍ଯାଲେଣ୍ଡର ମଧ୍ଯକୁ ଆମଦାନୀ କରନ୍ତୁ (_m)" #: ../calendar/gui/e-attachment-handler-calendar.c:384 -#, fuzzy msgid "I_mport to Tasks" -msgstr "ଆମଦାନୀ କର କୁ କାର୍ଯ୍ଯ" +msgstr "କାର୍ଯ୍ୟଗୁଡ଼ିକ ମଧ୍ଯକୁ ଆମଦାନୀ କରନ୍ତୁ (_m)" #: ../calendar/gui/e-cal-component-memo-preview.c:69 -#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3272 +#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3214 #, c-format msgid "Click to open %s" msgstr "%s କୁ ଖୋଲିବା ପାଇଁ ଦବାନ୍ତୁ" @@ -5811,7 +5773,7 @@ msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ତାରିଖ:" #: ../calendar/gui/e-cal-component-preview.c:240 #: ../calendar/gui/e-itip-control.c:1179 #: ../plugins/exchange-operations/exchange-account-setup.c:284 -#: ../plugins/itip-formatter/itip-view.c:1052 +#: ../plugins/itip-formatter/itip-view.c:1055 msgid "Status:" msgstr "ଅବସ୍ଥିତି:" @@ -5819,8 +5781,8 @@ msgstr "ଅବସ୍ଥିତି:" #: ../calendar/gui/e-cal-model-tasks.c:360 #: ../calendar/gui/e-cal-model-tasks.c:677 #: ../calendar/gui/e-cal-model-tasks.c:754 -#: ../calendar/gui/e-calendar-table.c:235 -#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2558 +#: ../calendar/gui/e-calendar-table.c:233 +#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/print.c:2565 msgid "In Progress" msgstr "ପ୍ରଗତି ପଥରେ" @@ -5829,10 +5791,10 @@ msgstr "ପ୍ରଗତି ପଥରେ" #: ../calendar/gui/e-cal-component-preview.c:247 #: ../calendar/gui/e-cal-model-tasks.c:362 #: ../calendar/gui/e-cal-model-tasks.c:679 -#: ../calendar/gui/e-calendar-table.c:237 -#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:939 +#: ../calendar/gui/e-calendar-table.c:235 +#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/e-itip-control.c:939 #: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203 -#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9 +#: ../calendar/gui/print.c:2568 ../calendar/gui/tasktypes.xml.h:9 #: ../plugins/save-calendar/csv-format.c:366 msgid "Completed" msgstr "ସମାପ୍ତ" @@ -5840,8 +5802,8 @@ msgstr "ସମାପ୍ତ" #: ../calendar/gui/e-cal-component-preview.c:254 #: ../calendar/gui/e-cal-model-tasks.c:358 #: ../calendar/gui/e-cal-model-tasks.c:675 -#: ../calendar/gui/e-calendar-table.c:233 -#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2555 +#: ../calendar/gui/e-calendar-table.c:231 +#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2562 #: ../calendar/gui/tasktypes.xml.h:18 msgid "Not Started" msgstr "ପ୍ରାରମ୍ଭ କରାଯାଇ ନାହିଁ" @@ -5851,19 +5813,19 @@ msgid "Priority:" msgstr "ଅଗ୍ରାଧିକାର:" #: ../calendar/gui/e-cal-component-preview.c:266 -#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14 +#: ../calendar/gui/e-calendar-table.c:586 ../calendar/gui/tasktypes.xml.h:14 #: ../mail/message-list.c:1065 msgid "High" msgstr "ବ୍ରୁହତ" #: ../calendar/gui/e-cal-component-preview.c:268 -#: ../calendar/gui/e-cal-model.c:1058 ../calendar/gui/e-calendar-table.c:589 +#: ../calendar/gui/e-cal-model.c:1058 ../calendar/gui/e-calendar-table.c:587 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064 msgid "Normal" msgstr "ସାଧାରଣ" #: ../calendar/gui/e-cal-component-preview.c:270 -#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16 +#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:16 #: ../mail/message-list.c:1063 msgid "Low" msgstr "ଧୀର" @@ -5882,10 +5844,9 @@ msgstr "ସମାପ୍ତ ତାରିଖ" #: ../calendar/gui/e-cal-list-view.etspec.h:4 #: ../calendar/gui/e-calendar-table.etspec.h:9 #: ../calendar/gui/e-memo-table.etspec.h:4 -#, fuzzy #| msgid "Modified" msgid "Last modified" -msgstr "ପରିବର୍ତ୍ତିତ" +msgstr "ଶେଷଥର ପରିବର୍ତ୍ତିତ" #: ../calendar/gui/e-cal-list-view.etspec.h:6 #: ../calendar/gui/e-memo-table.etspec.h:5 @@ -5893,13 +5854,13 @@ msgid "Start Date" msgstr "ପ୍ରାରମ୍ଭିକ ତାରିଖ" #: ../calendar/gui/e-cal-model-calendar.c:187 -#: ../calendar/gui/e-calendar-table.c:640 +#: ../calendar/gui/e-calendar-table.c:638 msgid "Free" msgstr "ମୁକ୍ତ" #: ../calendar/gui/e-cal-model-calendar.c:190 -#: ../calendar/gui/e-calendar-table.c:641 -#: ../calendar/gui/e-meeting-time-sel.c:398 +#: ../calendar/gui/e-calendar-table.c:639 +#: ../calendar/gui/e-meeting-time-sel.c:397 msgid "Busy" msgstr "ବ୍ଯସ୍ତ" @@ -5911,7 +5872,7 @@ msgid "" msgstr "" #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064 -#: ../calendar/gui/e-meeting-list-view.c:190 +#: ../calendar/gui/e-meeting-list-view.c:191 #: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162 #: ../calendar/gui/e-meeting-store.c:745 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5 @@ -5919,7 +5880,7 @@ msgid "Yes" msgstr "ହଁ" #: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1064 -#: ../calendar/gui/e-meeting-list-view.c:191 +#: ../calendar/gui/e-meeting-list-view.c:192 #: ../calendar/gui/e-meeting-store.c:164 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2 msgid "No" @@ -5928,13 +5889,13 @@ msgstr "ନାଁ" #. This is the default filename used for temporary file creation #: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-itip-control.c:1196 #: ../calendar/gui/e-itip-control.c:1336 -#: ../calendar/gui/e-meeting-list-view.c:166 -#: ../calendar/gui/e-meeting-list-view.c:180 +#: ../calendar/gui/e-meeting-list-view.c:167 +#: ../calendar/gui/e-meeting-list-view.c:181 #: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145 -#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984 -#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342 -#: ../plugins/itip-formatter/itip-formatter.c:447 -#: ../plugins/itip-formatter/itip-formatter.c:2204 +#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:985 +#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1342 +#: ../plugins/itip-formatter/itip-formatter.c:448 +#: ../plugins/itip-formatter/itip-formatter.c:2217 #: ../plugins/plugin-manager/plugin-manager.c:89 #: ../widgets/misc/e-charset-picker.c:56 msgid "Unknown" @@ -5948,162 +5909,162 @@ msgstr "ପୁନଃପୌନିକ" msgid "Assigned" msgstr "ନ୍ଯସ୍ତ" -#: ../calendar/gui/e-calendar-table.c:336 +#: ../calendar/gui/e-calendar-table.c:334 msgid "* No Summary *" msgstr "* କୌଣସି ସାରାଂଶ ନାହିଁ *" #. To Translators: It will display "Organiser: NameOfTheUser " -#: ../calendar/gui/e-calendar-table.c:372 -#: ../calendar/gui/e-calendar-view.c:2437 +#: ../calendar/gui/e-calendar-table.c:370 +#: ../calendar/gui/e-calendar-view.c:2436 #, c-format msgid "Organizer: %s <%s>" msgstr "ସଙ୍ଗଠକ: %s <%s>" #. With SunOne accounts, there may be no ':' in organiser.value #. With SunOne accouts, there may be no ':' in organiser.value -#: ../calendar/gui/e-calendar-table.c:375 -#: ../calendar/gui/e-calendar-view.c:2441 +#: ../calendar/gui/e-calendar-table.c:373 +#: ../calendar/gui/e-calendar-view.c:2440 #, c-format msgid "Organizer: %s" msgstr "ସଙ୍ଗଠକ: %s" -#: ../calendar/gui/e-calendar-table.c:406 +#: ../calendar/gui/e-calendar-table.c:404 msgid "Start: " msgstr "ଆରମ୍ଭ:" -#: ../calendar/gui/e-calendar-table.c:418 +#: ../calendar/gui/e-calendar-table.c:416 msgid "Due: " msgstr "ଦୋୟ: " -#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24 +#: ../calendar/gui/e-calendar-table.c:589 ../calendar/gui/tasktypes.xml.h:24 msgid "Undefined" msgstr "ଅପରିଭାଷିତ" -#: ../calendar/gui/e-calendar-table.c:610 +#: ../calendar/gui/e-calendar-table.c:608 msgid "0%" msgstr "୦%" -#: ../calendar/gui/e-calendar-table.c:611 +#: ../calendar/gui/e-calendar-table.c:609 msgid "10%" msgstr "୧୦%" -#: ../calendar/gui/e-calendar-table.c:612 +#: ../calendar/gui/e-calendar-table.c:610 msgid "20%" msgstr "୨୦%" -#: ../calendar/gui/e-calendar-table.c:613 +#: ../calendar/gui/e-calendar-table.c:611 msgid "30%" msgstr "୩୦%" -#: ../calendar/gui/e-calendar-table.c:614 +#: ../calendar/gui/e-calendar-table.c:612 msgid "40%" msgstr "୪୦%" -#: ../calendar/gui/e-calendar-table.c:615 +#: ../calendar/gui/e-calendar-table.c:613 msgid "50%" msgstr "୫୦%" -#: ../calendar/gui/e-calendar-table.c:616 +#: ../calendar/gui/e-calendar-table.c:614 msgid "60%" msgstr "୬୦%" -#: ../calendar/gui/e-calendar-table.c:617 +#: ../calendar/gui/e-calendar-table.c:615 msgid "70%" msgstr "୭୦%" -#: ../calendar/gui/e-calendar-table.c:618 +#: ../calendar/gui/e-calendar-table.c:616 msgid "80%" msgstr "୮୦%" -#: ../calendar/gui/e-calendar-table.c:619 +#: ../calendar/gui/e-calendar-table.c:617 msgid "90%" msgstr "୯୦%" -#: ../calendar/gui/e-calendar-table.c:620 +#: ../calendar/gui/e-calendar-table.c:618 msgid "100%" msgstr "୧୦୦%" -#: ../calendar/gui/e-calendar-table.c:900 -#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:452 +#: ../calendar/gui/e-calendar-table.c:898 +#: ../calendar/gui/e-calendar-view.c:658 ../calendar/gui/e-memo-table.c:450 msgid "Deleting selected objects" msgstr "ଚୟିତ ବସ୍ତୁ ମାନଙ୍କୁ ଅପସାରିଥ କରୁଅଛି" -#: ../calendar/gui/e-calendar-table.c:1183 -#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:657 +#: ../calendar/gui/e-calendar-table.c:1177 +#: ../calendar/gui/e-calendar-view.c:872 ../calendar/gui/e-memo-table.c:655 msgid "Updating objects" msgstr "ବସ୍ତୁ ମାନଙ୍କୁ ଅଦ୍ଯତିତ କରୁଅଛି" -#: ../calendar/gui/e-calendar-table.c:1371 -#: ../calendar/gui/e-calendar-view.c:1336 ../calendar/gui/e-memo-table.c:833 +#: ../calendar/gui/e-calendar-table.c:1365 +#: ../calendar/gui/e-calendar-view.c:1334 ../calendar/gui/e-memo-table.c:831 #: ../composer/e-composer-actions.c:219 msgid "Save as..." msgstr "ଏପରି ଭାବରେ ସଂରକ୍ଷିତ କରନ୍ତୁ..." -#: ../calendar/gui/e-calendar-table.c:1595 -#: ../calendar/gui/e-calendar-view.c:1796 +#: ../calendar/gui/e-calendar-table.c:1589 +#: ../calendar/gui/e-calendar-view.c:1794 msgid "New _Task" msgstr "ନୂତନ କାର୍ଯ୍ଯ (_T)" -#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938 +#: ../calendar/gui/e-calendar-table.c:1593 ../calendar/gui/e-memo-table.c:936 msgid "Open _Web Page" msgstr "ୱେବ ପ୍ରୁଷ୍ଠାକୁ ଖୋଲନ୍ତୁ (_W)" -#: ../calendar/gui/e-calendar-table.c:1600 -#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939 -#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:498 +#: ../calendar/gui/e-calendar-table.c:1594 +#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:937 +#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:494 msgid "_Save As..." msgstr "ଏପରି ଭାବରେ ସଂରକ୍ଷିତ କରନ୍ତୁ... (_S)" -#: ../calendar/gui/e-calendar-table.c:1601 -#: ../calendar/gui/e-calendar-view.c:1799 ../calendar/gui/e-memo-table.c:940 +#: ../calendar/gui/e-calendar-table.c:1595 +#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:938 msgid "P_rint..." msgstr "ମୂଦ୍ରଣ କରନ୍ତୁ (_r)..." -#: ../calendar/gui/e-calendar-table.c:1605 -#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944 +#: ../calendar/gui/e-calendar-table.c:1599 +#: ../calendar/gui/e-calendar-view.c:1817 ../calendar/gui/e-memo-table.c:942 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1 msgid "C_ut" msgstr "କାଟନ୍ତୁ (_u)" -#: ../calendar/gui/e-calendar-table.c:1607 -#: ../calendar/gui/e-calendar-view.c:1802 -#: ../calendar/gui/e-calendar-view.c:1821 ../calendar/gui/e-memo-table.c:946 +#: ../calendar/gui/e-calendar-table.c:1601 +#: ../calendar/gui/e-calendar-view.c:1800 +#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28 msgid "_Paste" msgstr "ଲଗାନ୍ତୁ (_P)" -#: ../calendar/gui/e-calendar-table.c:1611 ../ui/evolution-tasks.xml.h:22 +#: ../calendar/gui/e-calendar-table.c:1605 ../ui/evolution-tasks.xml.h:22 msgid "_Assign Task" msgstr "କାର୍ଯ୍ଯ ନ୍ଯସ୍ତ କରନ୍ତୁ (_A)" -#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950 +#: ../calendar/gui/e-calendar-table.c:1606 ../calendar/gui/e-memo-table.c:948 #: ../ui/evolution-tasks.xml.h:26 msgid "_Forward as iCalendar" msgstr "iCalendar ଭାବରେ ଅଗ୍ରସରିତ କରନ୍ତୁ (_F)" -#: ../calendar/gui/e-calendar-table.c:1613 +#: ../calendar/gui/e-calendar-table.c:1607 msgid "_Mark as Complete" msgstr "ସମ୍ପୂର୍ଣ୍ଣ ବୋଲି ଘୋଷିତ କରନ୍ତୁ (_M)" -#: ../calendar/gui/e-calendar-table.c:1614 +#: ../calendar/gui/e-calendar-table.c:1608 msgid "_Mark Selected Tasks as Complete" msgstr "ଚୟିତ କାର୍ଯ୍ଯକୁ ବୋଲି ଘୋଷିତ କରନ୍ତୁ (_M)" -#: ../calendar/gui/e-calendar-table.c:1615 +#: ../calendar/gui/e-calendar-table.c:1609 msgid "_Mark as Incomplete" msgstr "ଅସମ୍ପୂର୍ଣ୍ଣ ବୋଲି ଘୋଷିତ କରନ୍ତୁ (_M)" -#: ../calendar/gui/e-calendar-table.c:1616 +#: ../calendar/gui/e-calendar-table.c:1610 msgid "_Mark Selected Tasks as Incomplete" msgstr "ଚୟିତ କାର୍ଯ୍ଯକୁ ସମ୍ପୂର୍ଣ୍ଣ ବୋଲି ଘୋଷିତ କରନ୍ତୁ (_M)" -#: ../calendar/gui/e-calendar-table.c:1621 +#: ../calendar/gui/e-calendar-table.c:1615 msgid "_Delete Selected Tasks" msgstr "ଚୟିତ କାର୍ଯ୍ଯକୁ ଅପସାରଣ କରନ୍ତୁ (_D)" -#: ../calendar/gui/e-calendar-table.c:1858 +#: ../calendar/gui/e-calendar-table.c:1852 #: ../calendar/gui/e-calendar-table.etspec.h:4 msgid "Click to add a task" msgstr "ଗୋଟିଏ କାର୍ଯ୍ଯକୁ ଯୋଗ କରିବା ପାଇଁ ଦବାନ୍ତୁ" @@ -6138,135 +6099,135 @@ msgstr "ପ୍ରାରମ୍ଭିକ ତାରିଖ" #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form: #. Status: Accepted: X Declined: Y ... #: ../calendar/gui/e-calendar-table.etspec.h:12 -#: ../calendar/gui/e-calendar-view.c:2345 -#: ../calendar/gui/e-meeting-list-view.c:603 +#: ../calendar/gui/e-calendar-view.c:2344 +#: ../calendar/gui/e-meeting-list-view.c:604 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72 #: ../mail/message-list.etspec.h:17 msgid "Status" msgstr "ଅବସ୍ଥିତି" -#: ../calendar/gui/e-calendar-view.c:1482 +#: ../calendar/gui/e-calendar-view.c:1480 msgid "Moving items" msgstr "ବସ୍ତୁ ମାନଙ୍କୁ ସ୍ଥାନାନ୍ତରିତ କରୁଅଛି" -#: ../calendar/gui/e-calendar-view.c:1484 +#: ../calendar/gui/e-calendar-view.c:1482 msgid "Copying items" msgstr "ବସ୍ତୁ ମାନଙ୍କୁ ନକଲ କରୁଅଛି" -#: ../calendar/gui/e-calendar-view.c:1793 +#: ../calendar/gui/e-calendar-view.c:1791 msgid "New _Appointment..." msgstr "ନୂତନ ସାକ୍ଷାତକାର... (_A)" -#: ../calendar/gui/e-calendar-view.c:1794 +#: ../calendar/gui/e-calendar-view.c:1792 msgid "New All Day _Event" msgstr "ନୂତନ ସମଗ୍ର ଦିବସ ଘଟଣା (_E)" -#: ../calendar/gui/e-calendar-view.c:1795 +#: ../calendar/gui/e-calendar-view.c:1793 msgid "New _Meeting" msgstr "ନୂତନ ସଭା (_M)" #. FIXME: hook in this somehow -#: ../calendar/gui/e-calendar-view.c:1806 +#: ../calendar/gui/e-calendar-view.c:1804 msgid "_Current View" msgstr "ସାମ୍ପ୍ରତିକ ଦ୍ରୁଶ୍ଯ (_C)" -#: ../calendar/gui/e-calendar-view.c:1808 +#: ../calendar/gui/e-calendar-view.c:1806 msgid "Select T_oday" msgstr "ଅଜିର ତାରିଖ ଚୟନ କରନ୍ତୁ (_o)" -#: ../calendar/gui/e-calendar-view.c:1809 +#: ../calendar/gui/e-calendar-view.c:1807 msgid "_Select Date..." msgstr "ତାରିଖ ଚୟନ କରନ୍ତୁ... (_S)" -#: ../calendar/gui/e-calendar-view.c:1815 +#: ../calendar/gui/e-calendar-view.c:1813 msgid "Pri_nt..." msgstr "ମୂଦ୍ରଣ କରନ୍ତୁ (_n)..." -#: ../calendar/gui/e-calendar-view.c:1825 +#: ../calendar/gui/e-calendar-view.c:1823 msgid "Cop_y to Calendar..." msgstr "କ୍ଯାଲେଣ୍ଡରକୁ ନକଲ କରନ୍ତୁ... (_y)" -#: ../calendar/gui/e-calendar-view.c:1826 +#: ../calendar/gui/e-calendar-view.c:1824 msgid "Mo_ve to Calendar..." msgstr "କ୍ଯାଲେଣ୍ଡରକୁ ସ୍ଥାନାନ୍ତରିତ କରନ୍ତୁ... (_v)" -#: ../calendar/gui/e-calendar-view.c:1827 +#: ../calendar/gui/e-calendar-view.c:1825 msgid "_Delegate Meeting..." msgstr "ନିର୍ବାଚିତ ପ୍ରାର୍ଥୀ ମାନଙ୍କର ସଭା... (_D)" -#: ../calendar/gui/e-calendar-view.c:1828 +#: ../calendar/gui/e-calendar-view.c:1826 msgid "_Schedule Meeting..." msgstr "ସଭାର ଅନୁସୂଚୀ ସ୍ଥିର କରନ୍ତୁ... (_S)" -#: ../calendar/gui/e-calendar-view.c:1829 +#: ../calendar/gui/e-calendar-view.c:1827 msgid "_Forward as iCalendar..." msgstr "iCalendar ଭାବରେ ଅଗ୍ରସରିତ କରନ୍ତୁ... (_F)" -#: ../calendar/gui/e-calendar-view.c:1830 +#: ../calendar/gui/e-calendar-view.c:1828 msgid "_Reply" msgstr "ଉତ୍ତର ଦିଅନ୍ତୁ (_R)" -#: ../calendar/gui/e-calendar-view.c:1831 +#: ../calendar/gui/e-calendar-view.c:1829 #: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1331 -#: ../mail/em-popup.c:503 ../ui/evolution-mail-message.xml.h:82 +#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78 msgid "Reply to _All" msgstr "ସମସ୍ତଙ୍କୁ ଉତ୍ତର ଦିଅନ୍ତୁ (_A)" -#: ../calendar/gui/e-calendar-view.c:1836 +#: ../calendar/gui/e-calendar-view.c:1834 msgid "Make this Occurrence _Movable" msgstr "ଏହି ଘଟଣାକୁ ଗତିଶୀଳ ଭାବରେ ଚିହ୍ନିତ କରନ୍ତୁ (_M)" -#: ../calendar/gui/e-calendar-view.c:1837 ../ui/evolution-calendar.xml.h:9 +#: ../calendar/gui/e-calendar-view.c:1835 ../ui/evolution-calendar.xml.h:9 msgid "Delete this _Occurrence" msgstr "ଏହି ଘଟଣାକୁ ଅପସାରିତ କରନ୍ତୁ (_O)" -#: ../calendar/gui/e-calendar-view.c:1838 +#: ../calendar/gui/e-calendar-view.c:1836 msgid "Delete _All Occurrences" msgstr "ସମସ୍ତ ଘଟଣାକୁ ଅପସାରିତ କରନ୍ତୁ (_A)" -#: ../calendar/gui/e-calendar-view.c:2292 +#: ../calendar/gui/e-calendar-view.c:2291 #: ../calendar/gui/e-itip-control.c:1184 -#: ../calendar/gui/e-meeting-list-view.c:202 +#: ../calendar/gui/e-meeting-list-view.c:203 #: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195 -#: ../plugins/itip-formatter/itip-formatter.c:2192 +#: ../plugins/itip-formatter/itip-formatter.c:2205 msgid "Accepted" msgstr "ସ୍ବୀକୃତ" -#: ../calendar/gui/e-calendar-view.c:2293 +#: ../calendar/gui/e-calendar-view.c:2292 #: ../calendar/gui/e-itip-control.c:1192 -#: ../calendar/gui/e-meeting-list-view.c:203 +#: ../calendar/gui/e-meeting-list-view.c:204 #: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197 -#: ../plugins/itip-formatter/itip-formatter.c:2198 +#: ../plugins/itip-formatter/itip-formatter.c:2211 msgid "Declined" msgstr "ଅସ୍ବୀକୃତ" -#: ../calendar/gui/e-calendar-view.c:2294 -#: ../calendar/gui/e-meeting-list-view.c:204 +#: ../calendar/gui/e-calendar-view.c:2293 +#: ../calendar/gui/e-meeting-list-view.c:205 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199 -#: ../calendar/gui/e-meeting-time-sel.c:397 +#: ../calendar/gui/e-meeting-time-sel.c:396 msgid "Tentative" msgstr "ଚେଷ୍ଟାକୃତ" -#: ../calendar/gui/e-calendar-view.c:2295 -#: ../calendar/gui/e-meeting-list-view.c:205 +#: ../calendar/gui/e-calendar-view.c:2294 +#: ../calendar/gui/e-meeting-list-view.c:206 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201 -#: ../plugins/itip-formatter/itip-formatter.c:2201 +#: ../plugins/itip-formatter/itip-formatter.c:2214 msgid "Delegated" msgstr "ପ୍ରତିନିଧିତ୍ତ୍ୱ" -#: ../calendar/gui/e-calendar-view.c:2296 +#: ../calendar/gui/e-calendar-view.c:2295 msgid "Needs action" msgstr "କାର୍ଯ୍ଯ କରିବା ଆବଶ୍ୟକ" #. To Translators: It will display "Location: PlaceOfTheMeeting" -#: ../calendar/gui/e-calendar-view.c:2457 ../calendar/gui/print.c:2517 +#: ../calendar/gui/e-calendar-view.c:2456 ../calendar/gui/print.c:2524 #, c-format msgid "Location: %s" msgstr "ଅବସ୍ଥାନ: %s" #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)" -#: ../calendar/gui/e-calendar-view.c:2488 +#: ../calendar/gui/e-calendar-view.c:2487 #, c-format msgid "Time: %s %s" msgstr "ସମୟ: %s %s" @@ -6294,12 +6255,12 @@ msgstr "" #. * to change the length of the time division in the calendar day view, e.g. #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions" #. -#: ../calendar/gui/e-day-view-time-item.c:750 +#: ../calendar/gui/e-day-view-time-item.c:751 #, c-format msgid "%02i minute divisions" msgstr "%02i ମିନିଟ ବିଭାଜନ" -#: ../calendar/gui/e-day-view-time-item.c:771 +#: ../calendar/gui/e-day-view-time-item.c:772 msgid "Show the second time zone" msgstr "ଦ୍ୱିତିୟ ସମୟ ମଣ୍ଡଳ ଦର୍ଶାନ୍ତୁ" @@ -6309,25 +6270,25 @@ msgstr "ଦ୍ୱିତିୟ ସମୟ ମଣ୍ଡଳ ଦର୍ଶାନ୍ତ #. month, %B = full month name. You can change the #. order but don't change the specifiers or add #. anything. -#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1582 -#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678 +#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1581 +#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1681 msgid "%A %d %B" msgstr "%A %d %B" #. String to use in 12-hour time format for times in the morning. -#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:543 -#: ../calendar/gui/print.c:828 +#: ../calendar/gui/e-day-view.c:804 ../calendar/gui/e-week-view.c:542 +#: ../calendar/gui/print.c:829 msgid "am" msgstr "ପୂର୍ବାହ୍ନ" #. String to use in 12-hour time format for times in the afternoon. -#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:546 -#: ../calendar/gui/print.c:830 +#: ../calendar/gui/e-day-view.c:807 ../calendar/gui/e-week-view.c:545 +#: ../calendar/gui/print.c:831 msgid "pm" msgstr "ଅପରାହ୍ନ" #. To Translators: the %d stands for a week number, it's value between 1 and 52/53 -#: ../calendar/gui/e-day-view.c:2321 +#: ../calendar/gui/e-day-view.c:2320 #, c-format msgid "Week %d" msgstr "ସପ୍ତାହ %d" @@ -6441,7 +6402,7 @@ msgid "" msgstr "
ଦୟାକରି ନିମ୍ନଲିଖିତ ସୂଚନା, ଏବଂ ତାପରେ ନିମ୍ନ ତାଲିକାରୁ ଗୋଟିଏ କାର୍ଯ୍ୟ ମନୋନୀତ କରନ୍ତୁ।" #: ../calendar/gui/e-itip-control.c:1188 -#: ../plugins/itip-formatter/itip-formatter.c:2195 +#: ../plugins/itip-formatter/itip-formatter.c:2208 msgid "Tentatively Accepted" msgstr "ସାମୟିକଭାବେ ସ୍ବୀକୃତ" @@ -6657,7 +6618,7 @@ msgid "Attendee status updated\n" msgstr "ଶ୍ରୋତା ସ୍ଥିତି ଅଦ୍ୟତନ\n" #: ../calendar/gui/e-itip-control.c:2073 -#: ../plugins/itip-formatter/itip-formatter.c:1379 +#: ../plugins/itip-formatter/itip-formatter.c:1385 msgid "Attendee status can not be updated because the item no longer exists" msgstr "" @@ -6675,7 +6636,7 @@ msgstr "ଗୋଟିଏ କାର୍ଯ୍ୟ ବାଛନ୍ତୁ:" #. To translators: RSVP means "please reply" #: ../calendar/gui/e-itip-control.c:2316 -#: ../calendar/gui/e-meeting-list-view.c:591 +#: ../calendar/gui/e-meeting-list-view.c:592 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8 msgid "RSVP" msgstr "RSVP" @@ -6685,7 +6646,7 @@ msgid "Update" msgstr "ଅପଡେଟ କର" #: ../calendar/gui/e-itip-control.c:2380 -#: ../plugins/groupwise-features/process-meeting.c:51 +#: ../plugins/groupwise-features/process-meeting.c:53 msgid "Accept" msgstr "ଗ୍ରହଣକର" @@ -6694,7 +6655,7 @@ msgid "Tentatively accept" msgstr "" #: ../calendar/gui/e-itip-control.c:2382 -#: ../plugins/groupwise-features/process-meeting.c:53 +#: ../plugins/groupwise-features/process-meeting.c:55 msgid "Decline" msgstr "ହ୍ରାସ କର" @@ -6758,66 +6719,66 @@ msgstr "ଇଚ୍ଛାଧୀନ ଅଂଶଗ୍ରହଣ କାରୀ" msgid "Resources" msgstr "ଉତ୍ସଗୁଡ଼ିକ" -#: ../calendar/gui/e-meeting-list-view.c:151 +#: ../calendar/gui/e-meeting-list-view.c:152 msgid "Attendees" msgstr "ଉପସ୍ଥିତ ବ୍ୟକ୍ତି" -#: ../calendar/gui/e-meeting-list-view.c:162 +#: ../calendar/gui/e-meeting-list-view.c:163 #: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102 -#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980 +#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:981 msgid "Individual" msgstr "" -#: ../calendar/gui/e-meeting-list-view.c:163 +#: ../calendar/gui/e-meeting-list-view.c:164 #: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104 -#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7 +#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7 msgid "Group" msgstr "ସମୂହ" -#: ../calendar/gui/e-meeting-list-view.c:164 +#: ../calendar/gui/e-meeting-list-view.c:165 #: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106 -#: ../calendar/gui/print.c:982 +#: ../calendar/gui/print.c:983 msgid "Resource" msgstr "ସାଧନ" -#: ../calendar/gui/e-meeting-list-view.c:165 +#: ../calendar/gui/e-meeting-list-view.c:166 #: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108 -#: ../calendar/gui/print.c:983 +#: ../calendar/gui/print.c:984 msgid "Room" msgstr "କକ୍ଷ" -#: ../calendar/gui/e-meeting-list-view.c:176 +#: ../calendar/gui/e-meeting-list-view.c:177 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137 -#: ../calendar/gui/print.c:997 +#: ../calendar/gui/print.c:998 msgid "Chair" msgstr "" -#: ../calendar/gui/e-meeting-list-view.c:177 +#: ../calendar/gui/e-meeting-list-view.c:178 #: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139 -#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998 +#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:999 msgid "Required Participant" msgstr "ଅଂଶଗ୍ରହଣ କାରୀ ଆବଶ୍ଯକ" -#: ../calendar/gui/e-meeting-list-view.c:178 +#: ../calendar/gui/e-meeting-list-view.c:179 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141 -#: ../calendar/gui/print.c:999 +#: ../calendar/gui/print.c:1000 msgid "Optional Participant" msgstr "ଇଚ୍ଛାଧୀନ ଅଂଶଗ୍ରହଣ କାରୀ" -#: ../calendar/gui/e-meeting-list-view.c:179 +#: ../calendar/gui/e-meeting-list-view.c:180 #: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143 -#: ../calendar/gui/print.c:1000 +#: ../calendar/gui/print.c:1001 msgid "Non-Participant" msgstr "" -#: ../calendar/gui/e-meeting-list-view.c:201 +#: ../calendar/gui/e-meeting-list-view.c:202 #: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193 #: ../calendar/gui/e-meeting-store.c:752 msgid "Needs Action" msgstr "କାର୍ୟ୍ଯ ଆବଶ୍ୟକ" #. The extra space is just a hack to occupy more space for Attendee -#: ../calendar/gui/e-meeting-list-view.c:546 +#: ../calendar/gui/e-meeting-list-view.c:547 msgid "Attendee " msgstr "ଶ୍ରୋତା " @@ -6828,7 +6789,7 @@ msgstr "କାର୍ଯ୍ୟରତ" #. This is a strftime() format string %A = full weekday name, #. %B = full month name, %d = month day, %Y = full year. #: ../calendar/gui/e-meeting-time-sel-item.c:467 -#: ../calendar/gui/e-meeting-time-sel.c:2126 +#: ../calendar/gui/e-meeting-time-sel.c:2125 msgid "%A, %B %d, %Y" msgstr "%A, %B %d, %Y" @@ -6837,7 +6798,7 @@ msgstr "%A, %B %d, %Y" #. This is a strftime() format string %a = abbreviated weekday name, #. %m = month number, %d = month day, %Y = full year. #: ../calendar/gui/e-meeting-time-sel-item.c:471 -#: ../calendar/gui/e-meeting-time-sel.c:2157 +#: ../calendar/gui/e-meeting-time-sel.c:2156 msgid "%a %m/%d/%Y" msgstr "%a %m/%d/%Y" @@ -6847,67 +6808,67 @@ msgstr "%a %m/%d/%Y" msgid "%m/%d/%Y" msgstr "%m/%d/%Y" -#: ../calendar/gui/e-meeting-time-sel.c:399 +#: ../calendar/gui/e-meeting-time-sel.c:398 msgid "Out of Office" msgstr "କାର୍ଯ୍ଯାଳୟ ବାହାରେ" -#: ../calendar/gui/e-meeting-time-sel.c:400 +#: ../calendar/gui/e-meeting-time-sel.c:399 msgid "No Information" msgstr "କୌଣସି ସୂଚନା ନାହିଁ" -#: ../calendar/gui/e-meeting-time-sel.c:415 +#: ../calendar/gui/e-meeting-time-sel.c:414 msgid "A_ttendees..." msgstr "ଶ୍ରୋତା (_t)..." -#: ../calendar/gui/e-meeting-time-sel.c:436 +#: ../calendar/gui/e-meeting-time-sel.c:435 msgid "O_ptions" msgstr "ବିକଳ୍ପ_ଗୁଡିକ" -#: ../calendar/gui/e-meeting-time-sel.c:453 +#: ../calendar/gui/e-meeting-time-sel.c:452 msgid "Show _only working hours" msgstr "କେବଳ କାର୍ଯ୍ୟରତ ସମୟ ଦର୍ଶାନ୍ତୁ (_o)" -#: ../calendar/gui/e-meeting-time-sel.c:463 +#: ../calendar/gui/e-meeting-time-sel.c:462 msgid "Show _zoomed out" msgstr "ଛୋଟକରିବା ଦେଖାଅ" -#: ../calendar/gui/e-meeting-time-sel.c:478 +#: ../calendar/gui/e-meeting-time-sel.c:477 msgid "_Update free/busy" msgstr "ମୁକ୍ତ/ବ୍ୟସ୍ତ ଅଦ୍ୟତନ କରନ୍ତୁ (_U)" -#: ../calendar/gui/e-meeting-time-sel.c:493 +#: ../calendar/gui/e-meeting-time-sel.c:492 msgid "_<<" msgstr "" -#: ../calendar/gui/e-meeting-time-sel.c:511 +#: ../calendar/gui/e-meeting-time-sel.c:510 msgid "_Autopick" msgstr "" -#: ../calendar/gui/e-meeting-time-sel.c:526 +#: ../calendar/gui/e-meeting-time-sel.c:525 msgid ">_>" msgstr "" -#: ../calendar/gui/e-meeting-time-sel.c:543 +#: ../calendar/gui/e-meeting-time-sel.c:542 msgid "_All people and resources" msgstr "ସମସ୍ତ ବ୍ୟକ୍ତି ଏବଂ ଉତ୍ସଗୁଡ଼ିକ (_A)" -#: ../calendar/gui/e-meeting-time-sel.c:552 +#: ../calendar/gui/e-meeting-time-sel.c:551 msgid "All _people and one resource" msgstr "ସମସ୍ତ ବ୍ୟକ୍ତି ଏବଂ ଗୋଟିଏ ଉତ୍ସ (_p)" -#: ../calendar/gui/e-meeting-time-sel.c:561 +#: ../calendar/gui/e-meeting-time-sel.c:560 msgid "_Required people" msgstr "ବ୍ୟକ୍ତି ଆବଶ୍ଯକ (_R)" -#: ../calendar/gui/e-meeting-time-sel.c:570 +#: ../calendar/gui/e-meeting-time-sel.c:569 msgid "Required people and _one resource" msgstr "ବ୍ୟକ୍ତି ଏବଂ ଗୋଟିଏ ଉତ୍ସ ଆବଶ୍ୟକ (_o)" -#: ../calendar/gui/e-meeting-time-sel.c:606 +#: ../calendar/gui/e-meeting-time-sel.c:605 msgid "_Start time:" msgstr "ଆରମ୍ଭ ସମୟ (_S):" -#: ../calendar/gui/e-meeting-time-sel.c:633 +#: ../calendar/gui/e-meeting-time-sel.c:632 msgid "_End time:" msgstr "ସମାପ୍ତି ସମୟ (_E):" @@ -6935,11 +6896,11 @@ msgstr "ଭାଷା" msgid "Member" msgstr "ସଦସ୍ଯ" -#: ../calendar/gui/e-memo-table.c:955 +#: ../calendar/gui/e-memo-table.c:953 msgid "_Delete Selected Memos" msgstr "ଚୟିତ Memosକୁ ଅପସାରଣ କରନ୍ତୁ (_D)" -#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2 +#: ../calendar/gui/e-memo-table.c:1104 ../calendar/gui/e-memo-table.etspec.h:2 msgid "Click to add a memo" msgstr "ଗୋଟିଏ memo ଯୋଗକରିବା ପାଇଁ କ୍ଲିକ କରନ୍ତୁ" @@ -6989,7 +6950,7 @@ msgstr "ସମୟ ମଣ୍ଡଳ ମନୋନୀତ କରନ୍ତୁ" #. strftime format %d = day of month, %B = full #. month name. You can change the order but don't #. change the specifiers or add anything. -#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659 +#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1662 msgid "%d %B" msgstr "%d %B" @@ -7409,78 +7370,77 @@ msgstr "ତିଂଶ" msgid "31st" msgstr "ଏକତିଂଶ" -#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday -#: ../calendar/gui/print.c:595 +#: ../calendar/gui/print.c:596 msgid "Su" msgstr "" -#: ../calendar/gui/print.c:595 +#: ../calendar/gui/print.c:596 msgid "Mo" msgstr "" -#: ../calendar/gui/print.c:595 +#: ../calendar/gui/print.c:596 msgid "Tu" msgstr "" -#: ../calendar/gui/print.c:595 +#: ../calendar/gui/print.c:596 msgid "We" msgstr "" -#: ../calendar/gui/print.c:596 +#: ../calendar/gui/print.c:597 msgid "Th" msgstr "" -#: ../calendar/gui/print.c:596 +#: ../calendar/gui/print.c:597 msgid "Fr" msgstr "" -#: ../calendar/gui/print.c:596 +#: ../calendar/gui/print.c:597 msgid "Sa" msgstr "" -#: ../calendar/gui/print.c:2481 +#: ../calendar/gui/print.c:2488 msgid "Appointment" msgstr "" -#: ../calendar/gui/print.c:2483 +#: ../calendar/gui/print.c:2490 msgid "Task" msgstr "ଟାସ୍କ" -#: ../calendar/gui/print.c:2508 +#: ../calendar/gui/print.c:2515 #, c-format msgid "Summary: %s" msgstr "ସାରାଂଶ: %s" -#: ../calendar/gui/print.c:2531 +#: ../calendar/gui/print.c:2538 msgid "Attendees: " msgstr "ଉପସ୍ଥିତ ବ୍ୟକ୍ତିଗଣ: " -#: ../calendar/gui/print.c:2571 +#: ../calendar/gui/print.c:2578 #, c-format msgid "Status: %s" msgstr "ଅବସ୍ଥିତି: %s" -#: ../calendar/gui/print.c:2587 +#: ../calendar/gui/print.c:2594 #, c-format msgid "Priority: %s" msgstr "ଅଗ୍ରାଧିକାର: %s" -#: ../calendar/gui/print.c:2602 +#: ../calendar/gui/print.c:2609 #, c-format msgid "Percent Complete: %i" msgstr "ଶତକଡା ସମ୍ପୂର୍ଣ୍ଣ: %i" -#: ../calendar/gui/print.c:2614 +#: ../calendar/gui/print.c:2621 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: ../calendar/gui/print.c:2627 +#: ../calendar/gui/print.c:2634 #, c-format msgid "Categories: %s" msgstr "ବିଭାଗ: %s" -#: ../calendar/gui/print.c:2638 +#: ../calendar/gui/print.c:2645 msgid "Contacts: " msgstr "ଯୋଗାଯୋଗ: %s" @@ -7592,37 +7552,37 @@ msgstr "ଠାରୁ /ଅପେକ୍ଷାକୃତ ଛୋଟ /କମ୍" msgid "Appointments and Meetings" msgstr "ନିଯୁକ୍ତି ଏବଂ ସାକ୍ଷାତକାର" -#: ../calendar/importers/icalendar-importer.c:333 -#: ../calendar/importers/icalendar-importer.c:628 -#: ../plugins/itip-formatter/itip-formatter.c:1723 +#: ../calendar/importers/icalendar-importer.c:335 +#: ../calendar/importers/icalendar-importer.c:630 +#: ../plugins/itip-formatter/itip-formatter.c:1729 msgid "Opening calendar" msgstr "କାଲେଣ୍ଡର ଖୋଲୁଅଛି" -#: ../calendar/importers/icalendar-importer.c:440 +#: ../calendar/importers/icalendar-importer.c:442 msgid "iCalendar files (.ics)" msgstr "iCalendar ଫାଇଲଗୁଡ଼ିକ (.ics)" -#: ../calendar/importers/icalendar-importer.c:441 +#: ../calendar/importers/icalendar-importer.c:443 msgid "Evolution iCalendar importer" msgstr "Evolution iCalendar ଆମଦାନୀକର୍ତ୍ତା" -#: ../calendar/importers/icalendar-importer.c:529 +#: ../calendar/importers/icalendar-importer.c:531 msgid "Reminder!" msgstr "ସ୍ମାରକ!" -#: ../calendar/importers/icalendar-importer.c:581 +#: ../calendar/importers/icalendar-importer.c:583 msgid "vCalendar files (.vcf)" msgstr "vCalendar ଫାଇଲଗୁଡ଼ିକ (.vcf)" -#: ../calendar/importers/icalendar-importer.c:582 +#: ../calendar/importers/icalendar-importer.c:584 msgid "Evolution vCalendar importer" msgstr "Evolution vCalendar ଆମଦାନିକର୍ତ୍ତା" -#: ../calendar/importers/icalendar-importer.c:744 +#: ../calendar/importers/icalendar-importer.c:746 msgid "Calendar Events" msgstr "ପଞିକା ଘଟଣାଗୁଡିକ" -#: ../calendar/importers/icalendar-importer.c:781 +#: ../calendar/importers/icalendar-importer.c:783 msgid "Evolution Calendar intelligent importer" msgstr "Evolution କ୍ଯାଲେଣ୍ଡର ବୁଦ୍ଧିମାନ ଆମଦାନୀକର୍ତ୍ତା" @@ -9187,232 +9147,216 @@ msgstr "ସମ୍ପାଦକ ପାଖରୁ ସନ୍ଦେଶ କାଢ଼ି msgid "Untitled Message" msgstr "ଶୀର୍ଷକ-ହୀନ ସନ୍ଦେଶ" -#: ../composer/e-composer-actions.c:415 -#: ../widgets/misc/e-attachment-view.c:327 +#: ../composer/e-composer-actions.c:317 +#: ../widgets/misc/e-attachment-view.c:328 msgid "Attach a file" msgstr "ଗୋଟିଏ ଫାଇଲ ସଂଯୁକ୍ତ କରନ୍ତୁ" -#: ../composer/e-composer-actions.c:420 ../mail/mail-signature-editor.c:194 +#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:194 #: ../ui/evolution-mail-messagedisplay.xml.h:4 msgid "_Close" msgstr "ବନ୍ଦ କରନ୍ତୁ (_C)" -#: ../composer/e-composer-actions.c:422 +#: ../composer/e-composer-actions.c:324 msgid "Close the current file" msgstr "ସାମ୍ପ୍ରତିକ ଫାଇଲ ବନ୍ଦ କରନ୍ତୁ" -#: ../composer/e-composer-actions.c:427 ../mail/em-folder-view.c:1338 +#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1338 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47 -#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20 +#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20 #: ../ui/evolution-tasks.xml.h:29 msgid "_Print..." msgstr "ମୂଦ୍ରଣ କରନ୍ତୁ ... (_P)" -#: ../composer/e-composer-actions.c:434 ../ui/evolution-addressbook.xml.h:27 -#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76 +#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27 +#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15 msgid "Print Pre_view" msgstr "ମୁଦ୍ରଣ ପ୍ରାକ୍ଦର୍ଶନ (_v)" -#: ../composer/e-composer-actions.c:443 +#: ../composer/e-composer-actions.c:345 msgid "Save the current file" msgstr "ସାମ୍ପ୍ରତିକ ଫାଇଲକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ" -#: ../composer/e-composer-actions.c:448 +#: ../composer/e-composer-actions.c:350 msgid "Save _As..." msgstr "ନୂଆ ନାମରେ ସଂରକ୍ଷଣ କରନ୍ତୁ... (_A)" -#: ../composer/e-composer-actions.c:450 +#: ../composer/e-composer-actions.c:352 msgid "Save the current file with a different name" msgstr "ସାମ୍ପ୍ରତିକ ଫାଇଲକୁ ଏକ ଅଲଗା ନାମରେ ସଂରକ୍ଷଣ କରନ୍ତୁ" -#: ../composer/e-composer-actions.c:455 +#: ../composer/e-composer-actions.c:357 msgid "Save as _Draft" msgstr "ଡ୍ରାଫ୍ଟ ଭାବରେ ସଂରକ୍ଷଣ କରନ୍ତୁ (_D)..." -#: ../composer/e-composer-actions.c:457 +#: ../composer/e-composer-actions.c:359 msgid "Save as draft" msgstr "ଡ୍ରାଫ୍ଟ ପରି ସଂରକ୍ଷଣ କରନ୍ତୁ" -#: ../composer/e-composer-actions.c:462 +#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:152 msgid "S_end" msgstr "ପଠାନ୍ତୁ (_e)" -#: ../composer/e-composer-actions.c:464 +#: ../composer/e-composer-actions.c:366 msgid "Send this message" msgstr "ଏହି ସନ୍ଦେଶକୁ ପଠାନ୍ତୁ" -#: ../composer/e-composer-actions.c:471 +#: ../composer/e-composer-actions.c:373 msgid "Insert Send options" msgstr "ପଠାଯାଇଥିବା ବିକଳ୍ପଗୁଡ଼ିକୁ ଭର୍ତ୍ତିକରନ୍ତୁ" -#: ../composer/e-composer-actions.c:476 +#: ../composer/e-composer-actions.c:378 msgid "New _Message" msgstr "ନୂତନ ସନ୍ଦେଶ (_M)" -#: ../composer/e-composer-actions.c:478 +#: ../composer/e-composer-actions.c:380 msgid "Open New Message window" msgstr "ନୂତନ ସନ୍ଦେଶ ୱିଣ୍ଡୋକୁ ଖୋଲନ୍ତୁ" -#: ../composer/e-composer-actions.c:485 +#: ../composer/e-composer-actions.c:387 msgid "Character _Encoding" msgstr "ଅକ୍ଷର ସାଙ୍କେତିକରଣ (_E)" -#: ../composer/e-composer-actions.c:492 +#: ../composer/e-composer-actions.c:394 msgid "_Security" msgstr "ସୁରକ୍ଷା (_S)" -#: ../composer/e-composer-actions.c:502 +#: ../composer/e-composer-actions.c:404 msgid "PGP _Encrypt" msgstr "" -#: ../composer/e-composer-actions.c:504 +#: ../composer/e-composer-actions.c:406 msgid "Encrypt this message with PGP" msgstr "PGP ସହିତ ଏହି ସନ୍ଦେଶକୁ ସଂଗୁପ୍ତ କରନ୍ତୁ" -#: ../composer/e-composer-actions.c:510 +#: ../composer/e-composer-actions.c:412 msgid "PGP _Sign" msgstr "" -#: ../composer/e-composer-actions.c:512 +#: ../composer/e-composer-actions.c:414 msgid "Sign this message with your PGP key" msgstr "ଆପଣଙ୍କର PGP କି ସହିତ ଏହି ସନ୍ଦେଶକୁ ହସ୍ତକ୍ଷର କରନ୍ତୁ" -#: ../composer/e-composer-actions.c:518 +#: ../composer/e-composer-actions.c:420 msgid "_Prioritize Message" msgstr "ସନ୍ଦେଶକୁ ପ୍ରାଥମିକତା ଦିଅନ୍ତୁ (_P)" -#: ../composer/e-composer-actions.c:520 +#: ../composer/e-composer-actions.c:422 msgid "Set the message priority to high" msgstr "" -#: ../composer/e-composer-actions.c:526 +#: ../composer/e-composer-actions.c:428 msgid "Re_quest Read Receipt" msgstr "" -#: ../composer/e-composer-actions.c:528 +#: ../composer/e-composer-actions.c:430 msgid "Get delivery notification when your message is read" msgstr "" -#: ../composer/e-composer-actions.c:534 +#: ../composer/e-composer-actions.c:436 msgid "S/MIME En_crypt" msgstr "S/MIME ସେଗୁପ୍ତ (_c)" -#: ../composer/e-composer-actions.c:536 +#: ../composer/e-composer-actions.c:438 msgid "Encrypt this message with your S/MIME Encryption Certificate" msgstr "" -#: ../composer/e-composer-actions.c:542 +#: ../composer/e-composer-actions.c:444 msgid "S/MIME Sig_n" msgstr "S/MIME ହସ୍ତାକ୍ଷର (_n)" -#: ../composer/e-composer-actions.c:544 +#: ../composer/e-composer-actions.c:446 msgid "Sign this message with your S/MIME Signature Certificate" msgstr "" -#: ../composer/e-composer-actions.c:550 +#: ../composer/e-composer-actions.c:452 msgid "_Bcc Field" msgstr "Bcc କ୍ଷେତ୍ର (_B)" -#: ../composer/e-composer-actions.c:552 +#: ../composer/e-composer-actions.c:454 msgid "Toggles whether the BCC field is displayed" msgstr "BCC କ୍ଷେତ୍ରଟି ଆଗପଛ ହେଉଛି କି ନାହିଁ ଦର୍ଶାନ୍ତୁ" -#: ../composer/e-composer-actions.c:558 +#: ../composer/e-composer-actions.c:460 msgid "_Cc Field" msgstr "Cc କ୍ଷେତ୍ର (_C)" -#: ../composer/e-composer-actions.c:560 +#: ../composer/e-composer-actions.c:462 msgid "Toggles whether the CC field is displayed" msgstr "" -#: ../composer/e-composer-actions.c:566 +#: ../composer/e-composer-actions.c:468 msgid "_From Field" msgstr "ଠାରୁ କ୍ଷେତ୍ର (_F)" -#: ../composer/e-composer-actions.c:568 +#: ../composer/e-composer-actions.c:470 msgid "Toggles whether the From chooser is displayed" msgstr "" -#: ../composer/e-composer-actions.c:574 -msgid "_Post-To Field" -msgstr "ପୋଷ୍ଟ କୁ କ୍ଷେତ୍ର (_P)" - -#: ../composer/e-composer-actions.c:576 -msgid "Toggles whether the Post-To field is displayed" -msgstr "" - -#: ../composer/e-composer-actions.c:582 +#: ../composer/e-composer-actions.c:476 msgid "_Reply-To Field" msgstr "କ୍ଷେତ୍ରକୁ ଉତ୍ତର ଦିଅନ୍ତୁ (_R)" -#: ../composer/e-composer-actions.c:584 +#: ../composer/e-composer-actions.c:478 msgid "Toggles whether the Reply-To field is displayed" msgstr "" -#: ../composer/e-composer-actions.c:590 -msgid "_Subject Field" -msgstr "ବିଷୟ କ୍ଷେତ୍ର (_S)" - -#: ../composer/e-composer-actions.c:592 -msgid "Toggles whether the Subject field is displayed" -msgstr "" - -#: ../composer/e-composer-actions.c:598 -msgid "_To Field" -msgstr "କୁ କ୍ଷେତ୍ର (_T)" - -#: ../composer/e-composer-actions.c:600 -msgid "Toggles whether the To field is displayed" -msgstr "" - -#: ../composer/e-composer-actions.c:643 +#: ../composer/e-composer-actions.c:521 msgid "Save Draft" msgstr "ଡ୍ରାଫ୍ଟ ସଂରକ୍ଷଣ କରନ୍ତୁ" -#: ../composer/e-composer-header-table.c:64 +#: ../composer/e-composer-header-table.c:41 msgid "Enter the recipients of the message" msgstr "ସନ୍ଦେଶର ଗ୍ରାହକକୁ ଭରଣ କରନ୍ତୁ" -#: ../composer/e-composer-header-table.c:66 +#: ../composer/e-composer-header-table.c:43 msgid "Enter the addresses that will receive a carbon copy of the message" msgstr "" -#: ../composer/e-composer-header-table.c:69 +#: ../composer/e-composer-header-table.c:46 msgid "" "Enter the addresses that will receive a carbon copy of the message without " "appearing in the recipient list of the message" msgstr "" -#: ../composer/e-composer-header-table.c:643 +#: ../composer/e-composer-header-table.c:927 msgid "Fr_om:" msgstr "" -#: ../composer/e-composer-header-table.c:652 +#: ../composer/e-composer-header-table.c:936 msgid "_Reply-To:" msgstr "କୁ ଉତ୍ତର ଦିଅନ୍ତୁ (_R):" -#: ../composer/e-composer-header-table.c:656 +#: ../composer/e-composer-header-table.c:941 msgid "_To:" msgstr "ଏଠାକୁ (_T):" -#: ../composer/e-composer-header-table.c:661 +#: ../composer/e-composer-header-table.c:947 msgid "_Cc:" msgstr "" -#: ../composer/e-composer-header-table.c:666 +#: ../composer/e-composer-header-table.c:947 ../mail/em-filter-i18n.h:8 +msgid "CC" +msgstr "CC" + +#: ../composer/e-composer-header-table.c:953 msgid "_Bcc:" msgstr "" -#: ../composer/e-composer-header-table.c:671 +#: ../composer/e-composer-header-table.c:953 ../mail/em-filter-i18n.h:6 +msgid "BCC" +msgstr "BCC" + +#: ../composer/e-composer-header-table.c:958 msgid "_Post To:" msgstr "କୁ ପୋଷ୍ଟ କରନ୍ତୁ (_P):" -#: ../composer/e-composer-header-table.c:675 +#: ../composer/e-composer-header-table.c:962 msgid "S_ubject:" msgstr "ବି_ଷୟ:" -#: ../composer/e-composer-header-table.c:684 +#: ../composer/e-composer-header-table.c:971 msgid "Si_gnature:" msgstr "" @@ -9432,21 +9376,26 @@ msgstr "" msgid "Click here to select folders to post to" msgstr "" -#: ../composer/e-msg-composer.c:833 +#: ../composer/e-composer-private.c:169 +#| msgid "Save Draft" +msgid "Save draft" +msgstr "ଡ୍ରାଫ୍ଟ ସଂରକ୍ଷଣ କରନ୍ତୁ" + +#: ../composer/e-msg-composer.c:807 msgid "Cannot sign outgoing message: No signing certificate set for this account" msgstr "" -#: ../composer/e-msg-composer.c:840 +#: ../composer/e-msg-composer.c:814 msgid "" "Cannot encrypt outgoing message: No encryption certificate set for this " "account" msgstr "" -#: ../composer/e-msg-composer.c:1357 ../composer/e-msg-composer.c:2311 +#: ../composer/e-msg-composer.c:1331 ../composer/e-msg-composer.c:2170 msgid "Compose Message" msgstr "ସନ୍ଦେଶ ଲେଖନ୍ତୁ" -#: ../composer/e-msg-composer.c:3533 +#: ../composer/e-msg-composer.c:3329 msgid "" "(The composer contains a non-text message body, which cannot be edited.)" @@ -9593,7 +9542,7 @@ msgstr "ଡ୍ରାଫ୍ଟ ସଂରକ୍ଷଣ କରନ୍ତୁ (_S)" msgid "Evolution Mail and Calendar" msgstr "Evolution କ୍ଯାଲେଣ୍ଡର ବସ୍ତୁ" -#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951 +#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:948 msgid "Groupware Suite" msgstr "" @@ -9626,7 +9575,7 @@ msgid "Evolution Query" msgstr "Evolution ପ୍ରଶ୍ନ" #. setup a dummy error -#: ../e-util/e-error.c:444 +#: ../e-util/e-error.c:448 #, c-format msgid "Internal error, unknown error '%s' requested" msgstr "ଆଭ୍ୟନ୍ତରୀଣ ତୃଟି, ଅଜ୍ଞାତ ତୃଟି '%s'କୁ ଅନୁରୋଧ କରାଯାଇଛି" @@ -9755,174 +9704,174 @@ msgstr "ସଂଯୋଗକୁ ଖୋଲିପାରିଲା ନାହିଁ।" msgid "Could not display help for Evolution." msgstr "Evolution ପାଇଁ ସହାୟତା ଦର୍ଶାଇପାରିଲା ନାହିଁ।" -#: ../e-util/e-util-labels.c:39 +#: ../e-util/e-util-labels.c:45 msgid "I_mportant" msgstr "ଆବଶ୍ୟକୀୟ (_m)" #. red -#: ../e-util/e-util-labels.c:40 +#: ../e-util/e-util-labels.c:46 msgid "_Work" msgstr "କାର୍ଯ୍ୟ (_W)" #. orange -#: ../e-util/e-util-labels.c:41 +#: ../e-util/e-util-labels.c:47 msgid "_Personal" msgstr "ବ୍ୟକ୍ତିଗତ (_P)" #. green -#: ../e-util/e-util-labels.c:42 +#: ../e-util/e-util-labels.c:48 msgid "_To Do" msgstr "କାର୍ଯ୍ୟ କରିବାକୁ (_T)" #. blue -#: ../e-util/e-util-labels.c:43 +#: ../e-util/e-util-labels.c:49 msgid "_Later" msgstr "ପରେ (_L)" -#: ../e-util/e-util-labels.c:315 +#: ../e-util/e-util-labels.c:321 msgid "Label _Name:" msgstr "ନାମପଟି ନାମ (_N):" -#: ../e-util/e-util-labels.c:338 +#: ../e-util/e-util-labels.c:344 msgid "Edit Label" msgstr "ନାମପଟି ସମ୍ପାଦନ କରନ୍ତୁ" -#: ../e-util/e-util-labels.c:338 +#: ../e-util/e-util-labels.c:344 msgid "Add Label" msgstr "ନାମପଟି ଯୋଗକରନ୍ତୁ" -#: ../e-util/e-util-labels.c:357 +#: ../e-util/e-util-labels.c:363 msgid "Label name cannot be empty." msgstr "ନାମପଟିକୁ ଖାଲିକରାଯାଇପାରିବ ନାହିଁ।" -#: ../e-util/e-util-labels.c:362 +#: ../e-util/e-util-labels.c:368 msgid "" "A label having the same tag already exists on the server. Please rename your " "label." msgstr "" -#: ../e-util/gconf-bridge.c:1221 +#: ../e-util/gconf-bridge.c:1222 #, c-format msgid "GConf error: %s" msgstr "GConf ତ୍ରୁଟି: %s" -#: ../e-util/gconf-bridge.c:1232 +#: ../e-util/gconf-bridge.c:1233 msgid "All further errors shown only on terminal." msgstr "ସମସ୍ତ ଅତିରିକ୍ତ ତ୍ରୁଟି ଗୁଡିକ କେବଳ ଟର୍ମିନାଲରେ ପ୍ରଦର୍ଶିତ।" -#: ../filter/filter-datespec.c:81 +#: ../filter/filter-datespec.c:73 #, c-format msgid "1 second ago" msgid_plural "%d seconds ago" msgstr[0] "1 ସେକଣ୍ଡ ପୂର୍ବରୁ" msgstr[1] "%d ସେକଣ୍ଡ ପୂର୍ବରୁ" -#: ../filter/filter-datespec.c:81 +#: ../filter/filter-datespec.c:74 #, c-format msgid "1 second in the future" msgid_plural "%d seconds in the future" msgstr[0] "ଭବିଷ୍ୟତରେ 1 ସେକଣ୍ଡ" msgstr[1] "ଭବିଷ୍ୟତରେ %d ସେକଣ୍ଡ" -#: ../filter/filter-datespec.c:82 +#: ../filter/filter-datespec.c:75 #, c-format msgid "1 minute ago" msgid_plural "%d minutes ago" msgstr[0] "1 ମିନଟ ପୂର୍ବରୁ" msgstr[1] "%d ମିନଟ ପୂର୍ବରୁ" -#: ../filter/filter-datespec.c:82 +#: ../filter/filter-datespec.c:76 #, c-format msgid "1 minute in the future" msgid_plural "%d minutes in the future" msgstr[0] "" msgstr[1] "ମିନିଟ ଇଞ୍ଚଭବିଷ୍ୟତରେ %d ମିନଟ" -#: ../filter/filter-datespec.c:83 +#: ../filter/filter-datespec.c:77 #, c-format msgid "1 hour ago" msgid_plural "%d hours ago" msgstr[0] "1 ଘଣ୍ଟା ପୂର୍ବରୁ" msgstr[1] "%d ଘଣ୍ଟା ପୂର୍ବରୁ" -#: ../filter/filter-datespec.c:83 +#: ../filter/filter-datespec.c:78 #, c-format msgid "1 hour in the future" msgid_plural "%d hours in the future" msgstr[0] "ଭବିଷ୍ୟତରେ 1 ଘଣ୍ଟା" msgstr[1] "ଭବିଷ୍ୟତରେ %d ଘଣ୍ଟା" -#: ../filter/filter-datespec.c:84 +#: ../filter/filter-datespec.c:79 #, c-format msgid "1 day ago" msgid_plural "%d days ago" msgstr[0] "1 ଦିନ ପୂର୍ବରୁ" msgstr[1] "%d ଦିନ ପୂର୍ବରୁ" -#: ../filter/filter-datespec.c:84 +#: ../filter/filter-datespec.c:80 #, c-format msgid "1 day in the future" msgid_plural "%d days in the future" msgstr[0] "ଭବିଷ୍ୟତରେ 1 ଦିନ" msgstr[1] "ଭବିଷ୍ୟତରେ %d ଦିନ" -#: ../filter/filter-datespec.c:85 +#: ../filter/filter-datespec.c:81 #, c-format msgid "1 week ago" msgid_plural "%d weeks ago" msgstr[0] "" msgstr[1] "ସପ୍ତାହ ପୂର୍ବରୁ%d ସପ୍ତାହ ପୂର୍ବରୁ" -#: ../filter/filter-datespec.c:85 +#: ../filter/filter-datespec.c:82 #, c-format msgid "1 week in the future" msgid_plural "%d weeks in the future" msgstr[0] "" msgstr[1] "ସପ୍ତାହ ଇଞ୍ଚଭବିଷ୍ୟତରେ %d ସପ୍ତାହ" -#: ../filter/filter-datespec.c:86 +#: ../filter/filter-datespec.c:83 #, c-format msgid "1 month ago" msgid_plural "%d months ago" msgstr[0] "1 ମାସ ପୂର୍ବରୁ" msgstr[1] "%d ମାସ ପୂର୍ବରୁ" -#: ../filter/filter-datespec.c:86 +#: ../filter/filter-datespec.c:84 #, c-format msgid "1 month in the future" msgid_plural "%d months in the future" msgstr[0] "ଭବିଷ୍ୟତରେ 1 ମାସ" msgstr[1] "ଭବିଷ୍ୟତରେ %d ମାସ" -#: ../filter/filter-datespec.c:87 +#: ../filter/filter-datespec.c:85 #, c-format msgid "1 year ago" msgid_plural "%d years ago" msgstr[0] "1 ବର୍ଷ ପୂର୍ବରୁ" msgstr[1] "%d ବର୍ଷ ପୂର୍ବରୁ" -#: ../filter/filter-datespec.c:87 +#: ../filter/filter-datespec.c:86 #, c-format msgid "1 year in the future" msgid_plural "%d years in the future" msgstr[0] "ଭବିଷ୍ୟତରେ 1 ବର୍ଷ" msgstr[1] "ଭବିଷ୍ୟତରେ %d ବର୍ଷ" -#: ../filter/filter-datespec.c:288 +#: ../filter/filter-datespec.c:294 msgid "" msgstr "" -#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302 -#: ../filter/filter-datespec.c:313 +#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308 +#: ../filter/filter-datespec.c:319 msgid "now" msgstr "ବର୍ତ୍ତମାନ" #. strftime for date filter display, only needs to show a day date (i.e. no time) -#: ../filter/filter-datespec.c:298 +#: ../filter/filter-datespec.c:304 msgid "%d-%b-%Y" msgstr "%d-%b-%Y" -#: ../filter/filter-datespec.c:442 +#: ../filter/filter-datespec.c:448 msgid "Select a time to compare against" msgstr "" @@ -10063,12 +10012,13 @@ msgid "" msgstr "" #: ../filter/filter.glade.h:12 -#, fuzzy #| msgid "in the future" msgid "" "ago\n" "in the future" -msgstr "ଭବିଷ୍ୟତରେ" +msgstr "" +"ପୂର୍ବରୁ\n" +"ଭବିଷ୍ୟତରେ" #: ../filter/filter.glade.h:14 msgid "" @@ -10150,8 +10100,8 @@ msgstr "Evolution ଫୋଲଡର ସଂଯୋଜନା ବିନ୍ଯାସ #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:603 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378 -#: ../mail/mail-component.c:599 ../mail/mail-component.c:600 -#: ../mail/mail-component.c:769 +#: ../mail/mail-component.c:601 ../mail/mail-component.c:602 +#: ../mail/mail-component.c:771 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6 msgid "Mail" msgstr "ଡାକ" @@ -10176,24 +10126,24 @@ msgid "_Mail" msgstr "ମେଲ (_M)" #: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1332 -#: ../mail/em-popup.c:505 ../ui/evolution-mail-message.xml.h:109 +#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105 msgid "_Forward" msgstr "ପରବର୍ତ୍ତୀ (_F)" #: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1330 -#: ../ui/evolution-mail-message.xml.h:127 +#: ../ui/evolution-mail-message.xml.h:123 msgid "_Reply to Sender" msgstr "ପ୍ରେରକକୁ ଉତ୍ତର ଦିଅନ୍ତୁ" #. Translators: This is only for multiple messages. #: ../mail/e-attachment-handler-mail.c:334 -#, fuzzy, c-format +#, c-format #| msgid "Attached message" #| msgid_plural "%d attached messages" msgid "%d attached messages" -msgstr "ସଂଲଗ୍ନିତ ସନ୍ଦେଶ" +msgstr "%d ସଂଲଗ୍ନିତ ସନ୍ଦେଶ" -#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:2188 +#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1654 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:140 msgid "Attachment" msgid_plural "Attachments" @@ -10202,44 +10152,90 @@ msgstr[1] "ସଂଲଗ୍ନ" #: ../mail/e-mail-attachment-bar.c:615 #: ../widgets/misc/e-attachment-paned.c:599 -#, fuzzy #| msgid "Month View" msgid "Icon View" -msgstr "ମାନ ଦ୍ରୁଶ୍ଯ" +msgstr "ଚିତ୍ରସଂକେତ ଦ୍ରୁଶ୍ଯ" #: ../mail/e-mail-attachment-bar.c:616 #: ../widgets/misc/e-attachment-paned.c:600 -#, fuzzy #| msgid "_List View" msgid "List View" -msgstr "ତାଲିକା ପ୍ରଦର୍ଶନ (_L)" +msgstr "ତାଲିକା ପ୍ରଦର୍ଶନ" + +#: ../mail/e-mail-search-bar.c:76 +#, c-format +msgid "Matches: %d" +msgstr "ମେଳକଗୁଡିକ: %d" + +#: ../mail/e-mail-search-bar.c:520 +#| msgid "Close this window" +msgid "Close the find bar" +msgstr "ଏହି ସନ୍ଧାନ ପଟିକୁ ବନ୍ଦ କରନ୍ତୁ" + +#: ../mail/e-mail-search-bar.c:528 +msgid "Fin_d:" +msgstr "ଖୋଜନ୍ତୁ (_d):" + +#: ../mail/e-mail-search-bar.c:540 +#| msgid "Always search" +msgid "Clear the search" +msgstr "ସନ୍ଧାନକୁ ସଫା କରନ୍ତୁ" + +#: ../mail/e-mail-search-bar.c:559 +msgid "_Previous" +msgstr "ପୂର୍ବବର୍ତ୍ତୀ (_P)" + +#: ../mail/e-mail-search-bar.c:565 +msgid "Find the previous occurrence of the phrase" +msgstr "" + +#: ../mail/e-mail-search-bar.c:573 +msgid "_Next" +msgstr "ପରବର୍ତ୍ତୀ (_N)" + +#: ../mail/e-mail-search-bar.c:579 +msgid "Find the next occurrence of the phrase" +msgstr "" + +#: ../mail/e-mail-search-bar.c:587 +#| msgid "M_atch case" +msgid "Mat_ch case" +msgstr "ଏହି ବିଷୟକୁ ମେଳାନ୍ତୁ (_c)" + +#: ../mail/e-mail-search-bar.c:615 +msgid "Reached bottom of page, continued from top" +msgstr "" + +#: ../mail/e-mail-search-bar.c:637 +msgid "Reached top of page, continued from bottom" +msgstr "" #. Translators: This string is a "Use secure connection" option for #. the Mailer. It will not use an encrypted connection. -#: ../mail/em-account-editor.c:287 +#: ../mail/em-account-editor.c:308 msgid "No encryption" msgstr "କୌଣସି ଗୋପନୀୟତା ନାହିଁ" #. Translators: This string is a "Use secure connection" option for #. the Mailer. TLS (Transport Layer Security) is commonly known by #. this abbreviation. -#: ../mail/em-account-editor.c:291 +#: ../mail/em-account-editor.c:312 msgid "TLS encryption" msgstr "TLS ଗୋପନୀୟତା" #. Translators: This string is a "Use secure connection" option for #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this #. abbreviation. -#: ../mail/em-account-editor.c:295 +#: ../mail/em-account-editor.c:316 msgid "SSL encryption" msgstr "SSL ଗୋପନୀୟତା" -#: ../mail/em-account-editor.c:386 +#: ../mail/em-account-editor.c:407 #, c-format msgid "%s License Agreement" msgstr "%s ଅନୁମତି ପତ୍ର" -#: ../mail/em-account-editor.c:393 +#: ../mail/em-account-editor.c:414 #, c-format msgid "" "\n" @@ -10248,72 +10244,73 @@ msgid "" "and tick the check box for accepting it\n" msgstr "" -#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258 +#: ../mail/em-account-editor.c:486 ../mail/em-filter-folder-element.c:258 #: ../mail/em-vfolder-rule.c:513 msgid "Select Folder" msgstr "ଫୋଲଡର ବାଛନ୍ତୁ" -#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634 -#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102 +#: ../mail/em-account-editor.c:610 ../mail/em-account-editor.c:655 +#: ../mail/em-account-editor.c:722 ../widgets/misc/e-signature-combo-box.c:102 msgid "Autogenerated" msgstr "ସ୍ୱୟଂ ସୃଷ୍ଟି" -#: ../mail/em-account-editor.c:759 +#: ../mail/em-account-editor.c:780 msgid "Never" msgstr "କେବେ ନୁହେଁ" -#: ../mail/em-account-editor.c:760 +#: ../mail/em-account-editor.c:781 msgid "Always" msgstr "ସର୍ବଦା" -#: ../mail/em-account-editor.c:761 +#: ../mail/em-account-editor.c:782 msgid "Ask for each message" msgstr "ପ୍ରତ୍ୟେକ ସନ୍ଦେଶ ପାଇଁ ପଚାରନ୍ତୁ" -#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:100 +#: ../mail/em-account-editor.c:1854 ../mail/mail-config.glade.h:100 msgid "Identity" msgstr "ପରିଚୟ" -#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:127 +#: ../mail/em-account-editor.c:1905 ../mail/mail-config.glade.h:127 msgid "Receiving Email" msgstr "ଗ୍ରହଣ କରିଥିବା ଇମେଲ" -#: ../mail/em-account-editor.c:2130 +#: ../mail/em-account-editor.c:2177 msgid "Check for _new messages every" msgstr "ନୂତନ ସନ୍ଦେଶକୁ ଯାଞ୍ଚକରନ୍ତୁ (_n)" -#: ../mail/em-account-editor.c:2138 +#: ../mail/em-account-editor.c:2185 msgid "minu_tes" msgstr "ମିନିଟ (_t)" -#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138 +#: ../mail/em-account-editor.c:2375 ../mail/mail-config.glade.h:138 msgid "Sending Email" msgstr "ପଠାଯାଇଥିବା ଇମେଲ" -#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:73 +#: ../mail/em-account-editor.c:2434 ../mail/mail-config.glade.h:73 msgid "Defaults" msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ" #. Security settings -#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:133 +#: ../mail/em-account-editor.c:2500 ../mail/mail-config.glade.h:133 #: ../plugins/exchange-operations/exchange-account-setup.c:332 msgid "Security" msgstr "ସୁରକ୍ଷା" +#. Most sections for this is auto-generated from the camel config #. Most sections for this is auto-generated fromt the camel config -#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579 +#: ../mail/em-account-editor.c:2537 ../mail/em-account-editor.c:2632 msgid "Receiving Options" msgstr "ଗ୍ରହଣ କରାଯାଇଥିବା ବିକଳ୍ପଗୁଡ଼ିକ" -#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580 +#: ../mail/em-account-editor.c:2538 ../mail/em-account-editor.c:2633 msgid "Checking for New Messages" msgstr "ନୂତନ ସନ୍ଦେଶଗୁଡ଼ିକ ପାଇଁ ଯାଞ୍ଚକରନ୍ତୁ" -#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34 +#: ../mail/em-account-editor.c:3097 ../mail/mail-config.glade.h:34 msgid "Account Editor" msgstr "ଖାତା ସମ୍ପାଦକ" -#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:89 +#: ../mail/em-account-editor.c:3097 ../mail/mail-config.glade.h:89 msgid "Evolution Account Assistant" msgstr "Evolution ଖାତା ସହଯୋଗୀ" @@ -10347,26 +10344,26 @@ msgstr "ହସ୍ତାକ୍ଷର ସ୍କ୍ରିପ୍ଟ ଯୋଗକର msgid "Signature(s)" msgstr "ହସ୍ତାକ୍ଷର(ଗୁଡ଼ିକ)" -#: ../mail/em-composer-utils.c:1152 ../mail/em-format-quote.c:416 +#: ../mail/em-composer-utils.c:1108 ../mail/em-format-quote.c:416 msgid "-------- Forwarded Message --------" msgstr "-------- ପଠାଯାଇଥିବା ସନ୍ଦେଶ --------" -#: ../mail/em-composer-utils.c:1604 +#: ../mail/em-composer-utils.c:1560 msgid "No destination address provided, forward of the message has been cancelled." msgstr "କୌଣସି ଲକ୍ଷ୍ଯସ୍ଥଳ ଠିକଣା ଦିଆହୋଇନାହିଁ, ସନ୍ଦେଶର ଅଗ୍ରସରକୁ ବାତିଲ କରାଯାଇଛି।" -#: ../mail/em-composer-utils.c:1610 +#: ../mail/em-composer-utils.c:1566 msgid "No account found to use, forward of the message has been cancelled." msgstr "" -#: ../mail/em-composer-utils.c:2060 +#: ../mail/em-composer-utils.c:2034 msgid "an unknown sender" msgstr "ଜଣେ ଅଜ୍ଞାତ ପଠାଇଥିବା ବ୍ୟକ୍ତି" #. Note to translators: this is the attribution string used when quoting messages. #. * each ${Variable} gets replaced with a value. To see a full list of available #. * variables, see em-composer-utils.c:1514 -#: ../mail/em-composer-utils.c:2107 +#: ../mail/em-composer-utils.c:2081 msgid "" "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " "${TimeZone}, ${Sender} wrote:" @@ -10374,7 +10371,7 @@ msgstr "" "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " "${TimeZone}, ${Sender} wrote:" -#: ../mail/em-composer-utils.c:2250 +#: ../mail/em-composer-utils.c:2224 msgid "-----Original Message-----" msgstr "-----ପ୍ରକୃତ ସନ୍ଦେଶ-----" @@ -10395,18 +10392,10 @@ msgstr "ରଙ୍ଗ ନିଯୁକ୍ତ କରନ୍ତୁ" msgid "Assign Score" msgstr "ସ୍କୋର ନିର୍ଦ୍ଦିଷ୍ଟ କରନ୍ତୁ" -#: ../mail/em-filter-i18n.h:6 -msgid "BCC" -msgstr "BCC" - #: ../mail/em-filter-i18n.h:7 msgid "Beep" msgstr "ବିପ" -#: ../mail/em-filter-i18n.h:8 -msgid "CC" -msgstr "CC" - #: ../mail/em-filter-i18n.h:9 msgid "Completed On" msgstr "ରେ ସମାପ୍ତ" @@ -10424,7 +10413,7 @@ msgid "Date sent" msgstr "ପଠାଯାଇଥିବା ତାରିଖ" #: ../mail/em-filter-i18n.h:14 -#: ../plugins/groupwise-features/share-folder.c:766 +#: ../plugins/groupwise-features/share-folder.c:770 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6 #: ../ui/evolution-tasks.xml.h:6 @@ -10476,12 +10465,11 @@ msgid "Follow Up" msgstr "ଅନୁସରଣ" #: ../mail/em-filter-i18n.h:29 -#, fuzzy #| msgid "Forward" msgid "Forward to" msgstr "ଆଗକୁ" -#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:957 +#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958 msgid "Important" msgstr "ଗୁରୁତ୍ବପୂର୍ଣ୍ଣ" @@ -10547,10 +10535,9 @@ msgid "Message is not Junk" msgstr "ସନ୍ଦେଶଟି Junk ନୁହେଁ" #: ../mail/em-filter-i18n.h:50 -#, fuzzy #| msgid "Message contains" msgid "Message Location" -msgstr "ସନ୍ଦେଶ ଧାରଣ କରିଥାଏ" +msgstr "ସନ୍ଦେଶ ଅବସ୍ଥିତି" #: ../mail/em-filter-i18n.h:51 msgid "Move to Folder" @@ -10642,7 +10629,7 @@ msgid "Stop Processing" msgstr "ପ୍ରକ୍ରିୟା ବନ୍ଦକରନ୍ତୁ" #: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:342 -#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80 +#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:80 #: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:305 #: ../plugins/groupwise-features/properties.glade.h:7 #: ../smime/lib/e-cert.c:1115 @@ -10662,51 +10649,51 @@ msgstr "ତାପରେ" msgid "Add Ac_tion" msgstr "କାର୍ଯ୍ୟ ୟୋଗକରନ୍ତୁ (_t)" -#: ../mail/em-folder-browser.c:193 +#: ../mail/em-folder-browser.c:194 msgid "C_reate Search Folder From Search..." msgstr "ସନ୍ଧାନରୁ ସନ୍ଧାନ ଫୋଲଡର ସୃଷ୍ଟିକରନ୍ତୁ (_r)..." -#: ../mail/em-folder-browser.c:218 +#: ../mail/em-folder-browser.c:219 msgid "All Messages" msgstr "ସମସ୍ତ ସନ୍ଦେଶଗୁଡ଼ିକ" -#: ../mail/em-folder-browser.c:219 +#: ../mail/em-folder-browser.c:220 msgid "Unread Messages" msgstr "ଅପଠିତ ସଂଦେଶଗୁଡିକ" -#: ../mail/em-folder-browser.c:221 +#: ../mail/em-folder-browser.c:222 msgid "No Label" msgstr "ନାହିଁ ନାମପଟି" -#: ../mail/em-folder-browser.c:228 +#: ../mail/em-folder-browser.c:229 msgid "Read Messages" msgstr "ସନ୍ଦେଶଗୁଡ଼ିକୁ ପଢନ୍ତୁ" -#: ../mail/em-folder-browser.c:229 +#: ../mail/em-folder-browser.c:230 msgid "Recent Messages" msgstr "" -#: ../mail/em-folder-browser.c:230 +#: ../mail/em-folder-browser.c:231 msgid "Last 5 Days' Messages" msgstr "ଶେଷ 5 ଦିନର ସନ୍ଦେଶ" -#: ../mail/em-folder-browser.c:231 +#: ../mail/em-folder-browser.c:232 msgid "Messages with Attachments" msgstr "ସଂଲଗ୍ନକଗୁଡ଼ିକ ସହିତ ସନ୍ଦେଶ" -#: ../mail/em-folder-browser.c:232 +#: ../mail/em-folder-browser.c:233 msgid "Important Messages" msgstr "ଗୁରୁତ୍ବପୂର୍ଣ୍ଣ ସନ୍ଦେଶଗୁଡ଼ିକ" -#: ../mail/em-folder-browser.c:233 +#: ../mail/em-folder-browser.c:234 msgid "Messages Not Junk" msgstr "Junk ହୋଇନଥିବା ସନ୍ଦେଶଗୁଡ଼ିକ" -#: ../mail/em-folder-browser.c:1188 +#: ../mail/em-folder-browser.c:1201 msgid "Account Search" msgstr "ଖାତା ସନ୍ଧାନ" -#: ../mail/em-folder-browser.c:1241 +#: ../mail/em-folder-browser.c:1254 msgid "All Account Search" msgstr "ସମସ୍ତ ଖାତା ସନ୍ଧାନ" @@ -10736,11 +10723,11 @@ msgid "Quota usage" msgstr "" #. translators: standard local mailbox names -#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509 -#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:166 -#: ../mail/mail-component.c:587 +#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:520 +#: ../mail/em-folder-tree.c:2586 ../mail/mail-component.c:168 +#: ../mail/mail-component.c:589 #: ../plugins/exchange-operations/exchange-delegates-user.c:76 -#: ../plugins/exchange-operations/exchange-folder.c:594 +#: ../plugins/exchange-operations/exchange-folder.c:597 msgid "Inbox" msgstr "ଇନବକ୍ସ" @@ -10762,34 +10749,34 @@ msgid "Folder _name:" msgstr "ଫୋଲଡର ନାମ (_n):" #. load store to mail component -#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206 -#: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1028 +#: ../mail/em-folder-tree-model.c:196 ../mail/em-folder-tree-model.c:198 +#: ../mail/mail-vfolder.c:961 ../mail/mail-vfolder.c:1029 msgid "Search Folders" msgstr "ଫୋଲ୍ଡରଗୁଡ଼ିକ ଖୋଜନ୍ତୁ" #. UNMATCHED is always last -#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212 +#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204 msgid "UNMATCHED" msgstr "" -#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:167 +#: ../mail/em-folder-tree-model.c:515 ../mail/mail-component.c:169 msgid "Drafts" msgstr "ଡ୍ରାଫ୍ଟଗୁଡ଼ିକ" -#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:170 +#: ../mail/em-folder-tree-model.c:517 ../mail/mail-component.c:172 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2 msgid "Templates" msgstr "ନମୁନାଗୁଡିକ" -#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:168 +#: ../mail/em-folder-tree-model.c:523 ../mail/mail-component.c:170 msgid "Outbox" msgstr "ଆଉଟବକ୍ସ" -#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:169 +#: ../mail/em-folder-tree-model.c:525 ../mail/mail-component.c:171 msgid "Sent" msgstr "ପଠାଯାଇଛି" -#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843 +#: ../mail/em-folder-tree-model.c:560 ../mail/em-folder-tree-model.c:870 msgid "Loading..." msgstr "ଧାରଣ କରୁଅଛି..." @@ -10808,120 +10795,120 @@ msgstr "ଧାରଣ କରୁଅଛି..." #. * Do not translate the "folder-display|" part. Remove it #. * from your translation. #. -#: ../mail/em-folder-tree.c:379 +#: ../mail/em-folder-tree.c:300 #, c-format msgctxt "folder-display" msgid "%s (%u)" msgstr "%s (%u)" -#: ../mail/em-folder-tree.c:740 +#: ../mail/em-folder-tree.c:708 msgid "Mail Folder Tree" msgstr "ମେଲ ଫୋଲଡର ବ୍ରୁକ୍ଷ" -#: ../mail/em-folder-tree.c:899 +#: ../mail/em-folder-tree.c:867 #, c-format msgid "Moving folder %s" msgstr "" -#: ../mail/em-folder-tree.c:901 +#: ../mail/em-folder-tree.c:869 #, c-format msgid "Copying folder %s" msgstr "" -#: ../mail/em-folder-tree.c:908 ../mail/message-list.c:2014 +#: ../mail/em-folder-tree.c:876 ../mail/message-list.c:2014 #, c-format msgid "Moving messages into folder %s" msgstr "" -#: ../mail/em-folder-tree.c:910 ../mail/message-list.c:2016 +#: ../mail/em-folder-tree.c:878 ../mail/message-list.c:2016 #, c-format msgid "Copying messages into folder %s" msgstr "" -#: ../mail/em-folder-tree.c:925 +#: ../mail/em-folder-tree.c:893 msgid "Cannot drop message(s) into toplevel store" msgstr "" -#: ../mail/em-folder-tree.c:1002 ../ui/evolution-mail-message.xml.h:104 +#: ../mail/em-folder-tree.c:970 ../ui/evolution-mail-message.xml.h:100 msgid "_Copy to Folder" msgstr "ଫୋଲଡରକୁ ନକଲ କରନ୍ତୁ (_C)" -#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:117 +#: ../mail/em-folder-tree.c:971 ../ui/evolution-mail-message.xml.h:113 msgid "_Move to Folder" msgstr "ଫୋଲଡରକୁ ଘୁଞ୍ଚାନ୍ତୁ (_M)" -#: ../mail/em-folder-tree.c:1005 ../mail/em-folder-utils.c:364 +#: ../mail/em-folder-tree.c:973 ../mail/em-folder-utils.c:362 #: ../mail/em-folder-view.c:1187 ../mail/message-list.c:2106 msgid "_Move" msgstr "ଘୁଞ୍ଚାନ୍ତୁ (_M)" -#: ../mail/em-folder-tree.c:1007 ../mail/message-list.c:2108 +#: ../mail/em-folder-tree.c:975 ../mail/message-list.c:2108 msgid "Cancel _Drag" msgstr "ଟାଣିବା ପ୍ରକ୍ରିୟାକୁ ବାତିଲ କରନ୍ତୁ (_D)" -#: ../mail/em-folder-tree.c:1717 ../mail/mail-ops.c:1065 +#: ../mail/em-folder-tree.c:1685 ../mail/mail-ops.c:1065 #, c-format msgid "Scanning folders in \"%s\"" msgstr "\"%s\"ରେ ଫୋଲଡର କ୍ରମବୀକ୍ଷଣ କରୁଅଛି" -#: ../mail/em-folder-tree.c:2116 +#: ../mail/em-folder-tree.c:2090 msgid "Open in _New Window" msgstr "ନୂତନ ୱିଣ୍ଡୋରେ ଖୋଲନ୍ତୁ (_N)" #. FIXME: need to disable for nochildren folders -#: ../mail/em-folder-tree.c:2121 +#: ../mail/em-folder-tree.c:2095 msgid "_New Folder..." msgstr "_ନୂତନ ଖ଼ାମ୍..." -#: ../mail/em-folder-tree.c:2124 +#: ../mail/em-folder-tree.c:2098 msgid "_Move..." msgstr "_ସ୍ଥାନାନ୍ତରଣ..." -#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:21 +#: ../mail/em-folder-tree.c:2106 ../ui/evolution-mail-list.xml.h:21 msgid "Re_fresh" msgstr "ସତେଜନ କରନ୍ତୁ (_f)" -#: ../mail/em-folder-tree.c:2133 +#: ../mail/em-folder-tree.c:2107 msgid "Fl_ush Outbox" msgstr "ଫ୍ଲାସ ଆଉଟବକ୍ସ (_u)" -#: ../mail/em-folder-tree.c:2139 ../mail/mail.error.xml.h:138 +#: ../mail/em-folder-tree.c:2113 ../mail/mail.error.xml.h:138 msgid "_Empty Trash" msgstr "ଆବର୍ଜନା ପାତ୍ରକୁ ଖାଲି କରନ୍ତୁ (_E)" -#: ../mail/em-folder-tree.c:2242 +#: ../mail/em-folder-tree.c:2216 msgid "_Unread Search Folder" msgstr "ପଢାହୋଇନଥିବା ସନ୍ଧାନ ଫଲଡର (_U)" -#: ../mail/em-folder-utils.c:101 +#: ../mail/em-folder-utils.c:99 #, c-format msgid "Copying `%s' to `%s'" msgstr "`%s' କୁ `%s'ରେ ନକଲ କରନ୍ତୁ" -#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1187 +#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1187 #: ../mail/em-folder-view.c:1202 #: ../mail/importers/evolution-mbox-importer.c:82 #: ../plugins/pst-import/pst-importer.c:305 msgid "Select folder" msgstr "ଫଲଡର ଚୟନ କରନ୍ତୁ" -#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1202 +#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1202 msgid "C_opy" msgstr "ନକଲ କରନ୍ତୁ (_o)" -#: ../mail/em-folder-utils.c:539 +#: ../mail/em-folder-utils.c:537 #: ../plugins/groupwise-features/share-folder-common.c:144 #, c-format msgid "Creating folder `%s'" msgstr "ଫୋଲଡର `%s' ସୃଷ୍ଟିକରନ୍ତୁ" -#: ../mail/em-folder-utils.c:698 +#: ../mail/em-folder-utils.c:696 #: ../plugins/groupwise-features/install-shared.c:169 #: ../plugins/groupwise-features/share-folder-common.c:386 msgid "Create folder" msgstr "ଫୋଲଡର ସୃଷ୍ଟିକରନ୍ତୁ" -#: ../mail/em-folder-utils.c:698 +#: ../mail/em-folder-utils.c:696 #: ../plugins/groupwise-features/install-shared.c:169 #: ../plugins/groupwise-features/share-folder-common.c:386 msgid "Specify where to create the folder:" @@ -10936,7 +10923,7 @@ msgid "You do not have sufficient permissions to delete this mail." msgstr "" #. 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 -#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:106 +#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:102 msgid "_Edit as New Message..." msgstr "ନୂତନ ସନ୍ଦେଶକୁ ସମ୍ପାଦନ କରନ୍ତୁ (_E)..." @@ -11043,217 +11030,186 @@ msgstr "ମେଲିଙ୍ଗ ତାଲିକା ଉପରେ ଆଧାର କ #. default charset used in mail view #. we changed user, thus reset the chosen calendar combo too, because #. other user means other calendars subscribed -#: ../mail/em-folder-view.c:2256 ../mail/em-folder-view.c:2299 +#: ../mail/em-folder-view.c:2235 ../mail/em-folder-view.c:2278 #: ../plugins/google-account-setup/google-source.c:232 #: ../plugins/google-account-setup/google-source.c:511 #: ../plugins/google-account-setup/google-source.c:699 msgid "Default" msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ" -#: ../mail/em-folder-view.c:2517 +#: ../mail/em-folder-view.c:2496 msgid "Unable to retrieve message" msgstr "ସନ୍ଦେଶ କାଢ଼ିବାରେ ଅସମର୍ଥ" -#: ../mail/em-folder-view.c:2536 -msgid "Retrieving Message..." -msgstr "ସନ୍ଦେଶ କାଢ଼ୁଅଛି..." - -#: ../mail/em-folder-view.c:2755 -msgid "C_all To..." -msgstr "କୁ ଡାକନ୍ତୁ (_a)..." - -#: ../mail/em-folder-view.c:2758 +#: ../mail/em-folder-view.c:2700 msgid "Create _Search Folder" msgstr "ସନ୍ଧାନ ଫୋଲଡର ସୃଷ୍ଟିକରନ୍ତୁ (_S)" -#: ../mail/em-folder-view.c:2759 +#: ../mail/em-folder-view.c:2701 msgid "_From this Address" msgstr "ଏହି ଠିକଣାରୁ (_F)" -#: ../mail/em-folder-view.c:2760 +#: ../mail/em-folder-view.c:2702 msgid "_To this Address" msgstr "ଏହି ଠିକଣାକୁ (_T)" -#: ../mail/em-folder-view.c:3253 +#: ../mail/em-folder-view.c:3195 #, c-format msgid "Click to mail %s" msgstr "ମେଲ କରିବା ପାଇଁ କ୍ଲିକ କରନ୍ତୁ %s" -#: ../mail/em-folder-view.c:3265 +#: ../mail/em-folder-view.c:3207 #, c-format msgid "Click to call %s" msgstr "%s କୁ ଡାକିବା ପାଇଁ ଦବାନ୍ତୁ" -#: ../mail/em-folder-view.c:3270 +#: ../mail/em-folder-view.c:3212 msgid "Click to hide/unhide addresses" msgstr "ଲୁଚାଇବା ପାଇଁ କ୍ଲିକ କରନ୍ତୁ/ଲୁଚାହୋଇନଥିବା ଠିକଣା" -#. message-search popup match count string -#: ../mail/em-format-html-display.c:447 -#, c-format -msgid "Matches: %d" -msgstr "ମେଳକଗୁଡିକ: %d" - -#: ../mail/em-format-html-display.c:591 -msgid "Fin_d:" -msgstr "ଖୋଜନ୍ତୁ (_d):" - -#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5); -#: ../mail/em-format-html-display.c:615 -msgid "_Previous" -msgstr "ପୂର୍ବବର୍ତ୍ତୀ (_P)" - -#: ../mail/em-format-html-display.c:620 -msgid "_Next" -msgstr "ପରବର୍ତ୍ତୀ (_N)" - -#: ../mail/em-format-html-display.c:625 -msgid "M_atch case" -msgstr "ଏହି ବିଷୟକୁ ମେଳାନ୍ତୁ (_a)" - -#: ../mail/em-format-html-display.c:919 ../mail/em-format-html.c:655 +#: ../mail/em-format-html-display.c:570 ../mail/em-format-html.c:655 msgid "Unsigned" msgstr "ହସ୍ତାକ୍ଷର ହୋଇନଥିବା" -#: ../mail/em-format-html-display.c:919 +#: ../mail/em-format-html-display.c:570 msgid "" "This message is not signed. There is no guarantee that this message is " "authentic." msgstr "" -#: ../mail/em-format-html-display.c:920 ../mail/em-format-html.c:656 +#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:656 msgid "Valid signature" msgstr "ବୈଧ ହସ୍ତକ୍ଷର" -#: ../mail/em-format-html-display.c:920 +#: ../mail/em-format-html-display.c:571 msgid "" "This message is signed and is valid meaning that it is very likely that this " "message is authentic." msgstr "" -#: ../mail/em-format-html-display.c:921 ../mail/em-format-html.c:657 +#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:657 msgid "Invalid signature" msgstr "ଅବୈଧ ହସ୍ତାକ୍ଷର" -#: ../mail/em-format-html-display.c:921 +#: ../mail/em-format-html-display.c:572 msgid "" "The signature of this message cannot be verified, it may have been altered " "in transit." msgstr "" -#: ../mail/em-format-html-display.c:922 ../mail/em-format-html.c:658 +#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:658 msgid "Valid signature, but cannot verify sender" msgstr "" -#: ../mail/em-format-html-display.c:922 +#: ../mail/em-format-html-display.c:573 msgid "" "This message is signed with a valid signature, but the sender of the message " "cannot be verified." msgstr "" -#: ../mail/em-format-html-display.c:923 ../mail/em-format-html.c:659 +#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:659 msgid "Signature exists, but need public key" msgstr "" -#: ../mail/em-format-html-display.c:923 +#: ../mail/em-format-html-display.c:574 msgid "" "This message is signed with a signature, but there is no corresponding " "public key." msgstr "" -#: ../mail/em-format-html-display.c:930 ../mail/em-format-html.c:665 +#: ../mail/em-format-html-display.c:581 ../mail/em-format-html.c:665 msgid "Unencrypted" msgstr "" -#: ../mail/em-format-html-display.c:930 +#: ../mail/em-format-html-display.c:581 msgid "" "This message is not encrypted. Its content may be viewed in transit across " "the Internet." msgstr "" -#: ../mail/em-format-html-display.c:931 ../mail/em-format-html.c:666 +#: ../mail/em-format-html-display.c:582 ../mail/em-format-html.c:666 msgid "Encrypted, weak" msgstr "" -#: ../mail/em-format-html-display.c:931 +#: ../mail/em-format-html-display.c:582 msgid "" "This message is encrypted, but with a weak encryption algorithm. It would be " "difficult, but not impossible for an outsider to view the content of this " "message in a practical amount of time." msgstr "" -#: ../mail/em-format-html-display.c:932 ../mail/em-format-html.c:667 +#: ../mail/em-format-html-display.c:583 ../mail/em-format-html.c:667 msgid "Encrypted" msgstr "" -#: ../mail/em-format-html-display.c:932 +#: ../mail/em-format-html-display.c:583 msgid "" "This message is encrypted. It would be difficult for an outsider to view " "the content of this message." msgstr "" -#: ../mail/em-format-html-display.c:933 ../mail/em-format-html.c:668 +#: ../mail/em-format-html-display.c:584 ../mail/em-format-html.c:668 msgid "Encrypted, strong" msgstr "" -#: ../mail/em-format-html-display.c:933 +#: ../mail/em-format-html-display.c:584 msgid "" "This message is encrypted, with a strong encryption algorithm. It would be " "very difficult for an outsider to view the content of this message in a " "practical amount of time." msgstr "" -#: ../mail/em-format-html-display.c:1034 ../smime/gui/smime-ui.glade.h:48 +#: ../mail/em-format-html-display.c:685 ../smime/gui/smime-ui.glade.h:48 msgid "_View Certificate" msgstr "ଦୃଶ୍ଯ ପ୍ରମାଣପତ୍ର (_V)" -#: ../mail/em-format-html-display.c:1049 +#: ../mail/em-format-html-display.c:700 msgid "This certificate is not viewable" msgstr "" -#: ../mail/em-format-html-display.c:1369 +#: ../mail/em-format-html-display.c:992 msgid "Completed on %B %d, %Y, %l:%M %p" msgstr "%B %d, %Y, %l:%M %pରେ ସମ୍ପୂର୍ଣ୍ଣ" -#: ../mail/em-format-html-display.c:1377 +#: ../mail/em-format-html-display.c:1000 msgid "Overdue:" msgstr "" -#: ../mail/em-format-html-display.c:1380 +#: ../mail/em-format-html-display.c:1003 msgid "by %B %d, %Y, %l:%M %p" msgstr "%B %d, %Y, %l:%M %p ଦ୍ୱାରା" -#: ../mail/em-format-html-display.c:1460 -#: ../widgets/misc/e-attachment-view.c:356 +#: ../mail/em-format-html-display.c:1083 +#: ../widgets/misc/e-attachment-view.c:357 msgid "_View Inline" msgstr "ଇନଲାଇନ ଦେଖନ୍ତୁ (_V)" -#: ../mail/em-format-html-display.c:1461 -#: ../widgets/misc/e-attachment-view.c:349 +#: ../mail/em-format-html-display.c:1084 +#: ../widgets/misc/e-attachment-view.c:350 msgid "_Hide" msgstr "ଲୁଚାନ୍ତୁ (_H)" -#: ../mail/em-format-html-display.c:1462 +#: ../mail/em-format-html-display.c:1085 msgid "_Fit to Width" msgstr "ଓସାର ସହିତ ଖାପ ଖୁଆନ୍ତୁ (_F)" -#: ../mail/em-format-html-display.c:1463 +#: ../mail/em-format-html-display.c:1086 msgid "Show _Original Size" msgstr "ମୂଳ ଆକାରକୁ ଦର୍ଶାନ୍ତୁ (_O)" -#: ../mail/em-format-html-display.c:2121 ../mail/em-format-html-display.c:2160 +#: ../mail/em-format-html-display.c:1587 ../mail/em-format-html-display.c:1626 msgid "View _Unformatted" msgstr "ଅସଜଡ଼ାକୁ ଦର୍ଶାନ୍ତୁ (_U)" -#: ../mail/em-format-html-display.c:2123 +#: ../mail/em-format-html-display.c:1589 msgid "Hide _Unformatted" msgstr "ଅସଜଡ଼ାକୁ ଲୁଚାନ୍ତୁ (_U)" -#: ../mail/em-format-html-display.c:2180 +#: ../mail/em-format-html-display.c:1646 msgid "O_pen With" msgstr "ସହିତ ଖୋଲନ୍ତୁ (_p)" -#: ../mail/em-format-html-display.c:2257 +#: ../mail/em-format-html-display.c:1723 msgid "" "Evolution cannot render this email as it is too large to process. You can " "view it unformatted or with an external text editor." @@ -11312,19 +11268,19 @@ msgstr "ସନ୍ଦେଶକୁ ସଜାଡ଼ୁଛି..." #: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632 #: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210 -#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78 +#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:78 msgid "Cc" msgstr "" #: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638 #: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210 -#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79 +#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:79 msgid "Bcc" msgstr "" #. pseudo-header #: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353 -#: ../mail/em-mailer-prefs.c:1451 +#: ../mail/em-mailer-prefs.c:1439 msgid "Mailer" msgstr "ପ୍ରେରକ" @@ -11346,74 +11302,74 @@ msgstr " (%R %Z)" msgid "This message was sent by %s on behalf of %s" msgstr "%s ପାଇଁ ଏହି ସନ୍ଦେଶଟି %s ଦ୍ୱାରା ପଠାଯାଇଛି" -#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885 +#: ../mail/em-format-quote.c:210 ../mail/em-format.c:923 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7 #: ../mail/message-tag-followup.c:301 msgid "From" msgstr "ଠାରୁ" -#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886 +#: ../mail/em-format-quote.c:210 ../mail/em-format.c:924 #: ../mail/em-mailer-prefs.c:76 msgid "Reply-To" msgstr "କୁ ଉତ୍ତର ଦିଅନ୍ତୁ" -#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81 +#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:81 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:324 #: ../widgets/misc/e-dateedit.c:346 msgid "Date" msgstr "ତାରିଖ" -#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82 +#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:82 msgid "Newsgroups" msgstr "ସମାଚାରସମୂହଗୁଡିକ" -#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83 -#: ../plugins/face/org-gnome-face.eplug.xml.h:2 +#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:83 +#: ../plugins/face/org-gnome-face.eplug.xml.h:4 msgid "Face" msgstr "ମୁଖ" -#: ../mail/em-format.c:1160 +#: ../mail/em-format.c:1201 #, c-format msgid "%s attachment" msgstr "%s ସଂଲଗ୍ନକ" -#: ../mail/em-format.c:1199 +#: ../mail/em-format.c:1239 msgid "Could not parse S/MIME message: Unknown error" msgstr "" -#: ../mail/em-format.c:1336 ../mail/em-format.c:1492 +#: ../mail/em-format.c:1376 ../mail/em-format.c:1533 msgid "Could not parse MIME message. Displaying as source." msgstr "" -#: ../mail/em-format.c:1344 +#: ../mail/em-format.c:1384 msgid "Unsupported encryption type for multipart/encrypted" msgstr "" -#: ../mail/em-format.c:1354 +#: ../mail/em-format.c:1394 msgid "Could not parse PGP/MIME message" msgstr "" -#: ../mail/em-format.c:1354 +#: ../mail/em-format.c:1394 msgid "Could not parse PGP/MIME message: Unknown error" msgstr "PGP/MIME ସନ୍ଦେଶକୁ ବିଶ୍ଳେଷଣ କରିହେଲା ନାହିଁ: ଅଜଣା ତୃଟି" -#: ../mail/em-format.c:1511 +#: ../mail/em-format.c:1552 msgid "Unsupported signature format" msgstr "ଅସମର୍ଥିତ ହସ୍ତାକ୍ଷର ଶୈଳୀ" -#: ../mail/em-format.c:1519 ../mail/em-format.c:1590 +#: ../mail/em-format.c:1560 ../mail/em-format.c:1631 msgid "Error verifying signature" msgstr "ତ୍ରୁଟି ଯାଞ୍ଚକାରୀ ହସ୍ତାକ୍ଷର" -#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590 +#: ../mail/em-format.c:1560 ../mail/em-format.c:1622 ../mail/em-format.c:1631 msgid "Unknown error verifying signature" msgstr "ଅଜଣା ତୃଟି ଯାଞ୍ଚକାରୀ ହସ୍ତାକ୍ଷର" -#: ../mail/em-format.c:1664 +#: ../mail/em-format.c:1705 msgid "Could not parse PGP message" msgstr "PGP ସନ୍ଦେଶକୁ ବିଶ୍ଳେଷଣ କରିପାରିଲା ନାହିଁ" -#: ../mail/em-format.c:1664 +#: ../mail/em-format.c:1705 msgid "Could not parse PGP message: Unknown error" msgstr "PGP ସନ୍ଦେଶକୁ ବିଶ୍ଳେଷଣ କରିହେଲା ନାହିଁ: ଅଜଣା ତୃଟି" @@ -11463,51 +11419,51 @@ msgid "Tag" msgstr "ସୂଚକ" #. May be a better text -#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133 +#: ../mail/em-mailer-prefs.c:1067 ../mail/em-mailer-prefs.c:1121 #, c-format msgid "%s plugin is available and the binary is installed." msgstr "%s ପ୍ଲଗଇନ ଉପଲବ୍ଧ ଅଛି ଏବଂ ବାଇନାରୀ ସ୍ଥାପିତ ହୋଇଛି।" #. May be a better text -#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142 +#: ../mail/em-mailer-prefs.c:1075 ../mail/em-mailer-prefs.c:1130 #, c-format msgid "%s plugin is not available. Please check whether the package is installed." msgstr "%s ପ୍ଲଗଇନ ଉପଲବ୍ଧ ନାହିଁ। ଦୟାକରି ପ୍ୟାକେଜଟି ସ୍ଥାପିତ ହୋଇଛି କି ନାହିଁ ଯାଞ୍ଚକରନ୍ତୁ।" -#: ../mail/em-mailer-prefs.c:1108 +#: ../mail/em-mailer-prefs.c:1096 msgid "No Junk plugin available" msgstr "କୌଣସି ଜଙ୍କ ପ୍ଲଗଇନ ଉପଲବ୍ଧ ନାହିଁ" #. green -#: ../mail/em-migrate.c:960 +#: ../mail/em-migrate.c:961 msgid "To Do" msgstr "କରିବାକୁ" #. blue -#: ../mail/em-migrate.c:961 +#: ../mail/em-migrate.c:962 msgid "Later" msgstr "" -#: ../mail/em-migrate.c:1128 +#: ../mail/em-migrate.c:1129 msgid "Migration" msgstr "ସ୍ଥାନ ପରିବର୍ତ୍ତନ" -#: ../mail/em-migrate.c:1573 +#: ../mail/em-migrate.c:1574 #, c-format msgid "Unable to create new folder `%s': %s" msgstr "ନୂତନ ପୋଲଡର `%s' ସୃଷ୍ଟିକରିବାରେ ଅସମର୍ଥ: %s" -#: ../mail/em-migrate.c:1599 +#: ../mail/em-migrate.c:1600 #, c-format msgid "Unable to copy folder `%s' to `%s': %s" msgstr "ଫୋଲଡର `%s' କୁ `%s'ରେ ନକଲ କରିବାରେ ଅସମର୍ଥ: %s" -#: ../mail/em-migrate.c:1784 +#: ../mail/em-migrate.c:1785 #, c-format msgid "Unable to scan for existing mailboxes at `%s': %s" msgstr "ସ୍ଥିତବାନ ମେଲବାକ୍ସକୁ `%s'ରେ କ୍ରମବିକ୍ଷଣ କରିବାରେ ଅସମର୍ଥ: %s" -#: ../mail/em-migrate.c:1789 +#: ../mail/em-migrate.c:1790 msgid "" "The location and hierarchy of the Evolution mailbox folders has changed " "since Evolution 1.x.\n" @@ -11515,31 +11471,31 @@ msgid "" "Please be patient while Evolution migrates your folders..." msgstr "" -#: ../mail/em-migrate.c:1990 +#: ../mail/em-migrate.c:1991 #, c-format msgid "Unable to open old POP keep-on-server data `%s': %s" msgstr "ପୁରୁଣା POP ସର୍ଭରରେ ଥିବା ତଥ୍ୟ `%s'କୁ ଖୋଲିବାରେ ଅସମର୍ଥ: %s" -#: ../mail/em-migrate.c:2004 +#: ../mail/em-migrate.c:2005 #, c-format msgid "Unable to create POP3 keep-on-server data directory `%s': %s" msgstr "POP3 ସର୍ଭରରେ ଥିବା ତଥ୍ୟ ଡିରେକ୍ଟୋରୀ `%s'କୁ ଖୋଲିବାରେ ଅସମର୍ଥ: %s" -#: ../mail/em-migrate.c:2033 +#: ../mail/em-migrate.c:2034 #, c-format msgid "Unable to copy POP3 keep-on-server data `%s': %s" msgstr "POP3 ସର୍ଭରରେ ଥିବା ତଥ୍ୟ `%s'କୁ ନକଲ କରିବାରେ ଅସମର୍ଥ: %s" -#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516 +#: ../mail/em-migrate.c:2505 ../mail/em-migrate.c:2517 #, c-format msgid "Failed to create local mail storage `%s': %s" msgstr "ସ୍ଥାନୀୟ ମେଲ ଭଣ୍ଡାର `%s'କୁ ସୃଷ୍ଟି କରିବାରେ ଅସମର୍ଥ: %s" -#: ../mail/em-migrate.c:2874 +#: ../mail/em-migrate.c:2875 msgid "Migrating Folders" msgstr "ସ୍ଥାନ ପରିବର୍ତ୍ତନ କରୁଅଛି" -#: ../mail/em-migrate.c:2874 +#: ../mail/em-migrate.c:2875 msgid "" "The summary format of the Evolution mailbox folders has been moved to SQLite " "since Evolution 2.24.\n" @@ -11547,66 +11503,66 @@ msgid "" "Please be patient while Evolution migrates your folders..." msgstr "" -#: ../mail/em-migrate.c:2956 +#: ../mail/em-migrate.c:2957 #, c-format msgid "Unable to create local mail folders at `%s': %s" msgstr "`%s'ରେ ସ୍ଥାନୀୟ ମେଲ ଫୋଲଡର ନିର୍ମାଣ କରିବାରେ ଅସମର୍ଥ: %s" -#: ../mail/em-migrate.c:2975 +#: ../mail/em-migrate.c:2976 msgid "" "Unable to read settings from previous Evolution install, `evolution/config." "xmldb' does not exist or is corrupt." msgstr "" -#: ../mail/em-popup.c:368 +#: ../mail/em-popup.c:364 msgid "Save As..." msgstr "ଏପରି ଭାବରେ ସଂରକ୍ଷିତ କରନ୍ତୁ..." -#: ../mail/em-popup.c:393 +#: ../mail/em-popup.c:389 #, c-format msgid "untitled_image.%s" msgstr "ଶୀର୍ଷକ ବିହୀନ ପ୍ରତିଛବି (_i)। %s" -#: ../mail/em-popup.c:499 ../widgets/misc/e-attachment-handler-image.c:147 +#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147 msgid "Set as _Background" msgstr "ପ୍ରୁଷ୍ଠଭୂମି ଭାବରେ ବିନ୍ଯାସ କରନ୍ତୁ (_B)" -#: ../mail/em-popup.c:501 +#: ../mail/em-popup.c:497 msgid "_Reply to sender" msgstr "ପ୍ରେରକଙ୍କୁ ଉତ୍ତର ଦିଅନ୍ତୁ (_R)" -#: ../mail/em-popup.c:502 ../ui/evolution-mail-message.xml.h:83 +#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79 msgid "Reply to _List" msgstr "ତାଲିକାକୁ ଉତ୍ତର ଦିଅନ୍ତୁ (_L)" #. make it first item -#: ../mail/em-popup.c:551 ../mail/em-popup.c:751 +#: ../mail/em-popup.c:547 ../mail/em-popup.c:747 msgid "_Add to Address Book" msgstr "ଠିକଣା ପୁସ୍ତକରେ ଯୋଗକରନ୍ତୁ (_A)" -#: ../mail/em-popup.c:730 ../widgets/misc/e-attachment-view.c:645 +#: ../mail/em-popup.c:726 #, c-format msgid "Open in %s..." msgstr "%s ରେ ଖୋଲନ୍ତୁ..." -#: ../mail/em-subscribe-editor.c:604 +#: ../mail/em-subscribe-editor.c:606 msgid "This store does not support subscriptions, or they are not enabled." msgstr "" -#: ../mail/em-subscribe-editor.c:637 +#: ../mail/em-subscribe-editor.c:639 msgid "Subscribed" msgstr "ସ୍ବୀକାର କରାହୋଇଥିବା " -#: ../mail/em-subscribe-editor.c:641 +#: ../mail/em-subscribe-editor.c:643 msgid "Folder" msgstr "ଫୋଲଡର" #. FIXME: This is just to get the shadow, is there a better way? -#: ../mail/em-subscribe-editor.c:857 +#: ../mail/em-subscribe-editor.c:859 msgid "Please select a server." msgstr "ଦୟାକରି ଗୋଟିଏ ସର୍ଭର ମନୋନୀତ କରନ୍ତୁ।" -#: ../mail/em-subscribe-editor.c:893 +#: ../mail/em-subscribe-editor.c:895 msgid "No server has been selected" msgstr "କୌଣସି ସର୍ଭର ବଛାହୋଇନାହିଁ" @@ -12174,109 +12130,170 @@ msgid "Server synchronization interval" msgstr "ସର୍ଭର ସମକାଳନ ଅନ୍ତରାଳ" #: ../mail/evolution-mail.schemas.in.h:121 +msgid "Show \"Bcc\" field when sending a mail message" +msgstr "" + +#: ../mail/evolution-mail.schemas.in.h:122 +msgid "Show \"Cc\" field when sending a mail message" +msgstr "" + +#: ../mail/evolution-mail.schemas.in.h:123 +msgid "Show \"From\" field when posting to a newsgroup" +msgstr "" + +#: ../mail/evolution-mail.schemas.in.h:124 +msgid "Show \"From\" field when sending a mail message" +msgstr "" + +#: ../mail/evolution-mail.schemas.in.h:125 +msgid "Show \"Reply To\" field when posting to a newsgroup" +msgstr "" + +#: ../mail/evolution-mail.schemas.in.h:126 +#| msgid "Also encrypt to sel_f when sending encrypted messages" +msgid "Show \"Reply To\" field when sending a mail message" +msgstr "ମେଲ ସନ୍ଦେଶ ପଠାଇବା ସମୟରେ \"Reply To\" କ୍ଷେତ୍ରକୁ ଦର୍ଶାନ୍ତୁ" + +#: ../mail/evolution-mail.schemas.in.h:127 msgid "Show Animations" msgstr "ଜୀବନ୍ତଚିତ୍ରଗୁଡିକୁ ଦର୍ଶାନ୍ତୁ" -#: ../mail/evolution-mail.schemas.in.h:122 +#: ../mail/evolution-mail.schemas.in.h:128 msgid "Show animated images as animations." msgstr "ଜୀବନ୍ତଚିତ୍ରଗୁଡିକୁ ଜୀବନାୟନ ପ୍ରତିଛବି ଆକାରରେ ଦର୍ଶାନ୍ତୁ।" -#: ../mail/evolution-mail.schemas.in.h:123 +#: ../mail/evolution-mail.schemas.in.h:129 msgid "Show deleted messages (with a strike-through) in the message-list." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:124 +#: ../mail/evolution-mail.schemas.in.h:130 msgid "Show deleted messages in the message-list" msgstr "ଅପସାରିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ସନ୍ଦେଶ ତାଲିକାରେ ଦର୍ଶାନ୍ତୁ" -#: ../mail/evolution-mail.schemas.in.h:125 +#: ../mail/evolution-mail.schemas.in.h:131 msgid "Show photo of the sender" msgstr "ପ୍ରେରକର ଫୋଟୋ ଦର୍ଶାନ୍ତୁ" -#: ../mail/evolution-mail.schemas.in.h:128 +#: ../mail/evolution-mail.schemas.in.h:132 +msgid "" +"Show the \"Bcc\" field when sending a mail message. This is controlled from " +"the View menu when a mail account is chosen." +msgstr "" + +#: ../mail/evolution-mail.schemas.in.h:133 +msgid "" +"Show the \"Cc\" field when sending a mail message. This is controlled from " +"the View menu when a mail account is chosen." +msgstr "" + +#: ../mail/evolution-mail.schemas.in.h:134 +msgid "" +"Show the \"From\" field when posting to a newsgroup. This is controlled from " +"the View menu when a news account is chosen." +msgstr "" + +#: ../mail/evolution-mail.schemas.in.h:135 +msgid "" +"Show the \"From\" field when sending a mail message. This is controlled from " +"the View menu when a mail account is chosen." +msgstr "" + +#: ../mail/evolution-mail.schemas.in.h:138 +msgid "" +"Show the \"Reply To\" field when posting to a newsgroup. This is controlled " +"from the View menu when a news account is chosen." +msgstr "" + +#: ../mail/evolution-mail.schemas.in.h:139 +msgid "" +"Show the \"Reply To\" field when sending a mail message. This is controlled " +"from the View menu when a mail account is chosen." +msgstr "" + +#: ../mail/evolution-mail.schemas.in.h:140 msgid "" "Show the email-address of the sender in a separate column in the message " "list." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:129 +#: ../mail/evolution-mail.schemas.in.h:141 msgid "Show the photo of the sender in the message reading pane." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:130 +#: ../mail/evolution-mail.schemas.in.h:142 msgid "Spell check inline" msgstr "" -#: ../mail/evolution-mail.schemas.in.h:131 +#: ../mail/evolution-mail.schemas.in.h:143 msgid "Spell checking color" msgstr "" -#: ../mail/evolution-mail.schemas.in.h:132 +#: ../mail/evolution-mail.schemas.in.h:144 msgid "Spell checking languages" msgstr "ବନାନ ଯାଞ୍ଚକାରୀ ଭାଷାଗୁଡ଼ିକ" -#: ../mail/evolution-mail.schemas.in.h:133 +#: ../mail/evolution-mail.schemas.in.h:145 msgid "Subscribe dialog default height" msgstr "ସଂଳାପର ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଉଚ୍ଚତା କିଣନ୍ତୁ" -#: ../mail/evolution-mail.schemas.in.h:134 +#: ../mail/evolution-mail.schemas.in.h:146 msgid "Subscribe dialog default width" msgstr "ସଂଳାପର ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଉଚ୍ଚତା କିଣନ୍ତୁ" -#: ../mail/evolution-mail.schemas.in.h:135 +#: ../mail/evolution-mail.schemas.in.h:147 msgid "Terminal font" msgstr "ଟର୍ମିନାଲ ଅକ୍ଷରରୂପ" -#: ../mail/evolution-mail.schemas.in.h:136 +#: ../mail/evolution-mail.schemas.in.h:148 msgid "Text message part limit" msgstr "ପାଠ୍ୟ ସନ୍ଦେଶର ଅଂଶ ସୀମା" -#: ../mail/evolution-mail.schemas.in.h:137 +#: ../mail/evolution-mail.schemas.in.h:149 msgid "The default plugin for Junk hook" msgstr "Junk ହୁକ ପାଇଁ ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ପ୍ଲଗଇନ" -#: ../mail/evolution-mail.schemas.in.h:138 +#: ../mail/evolution-mail.schemas.in.h:150 msgid "The last time empty junk was run, in days since the epoch." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:139 +#: ../mail/evolution-mail.schemas.in.h:151 msgid "The last time empty trash was run, in days since the epoch." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:140 +#: ../mail/evolution-mail.schemas.in.h:152 msgid "The terminal font for mail display." msgstr "ମେଲ ପ୍ରଦର୍ଶନ ପାଇଁ ଟର୍ମିନାଲ ଅକ୍ଷରରୂପ।" -#: ../mail/evolution-mail.schemas.in.h:141 +#: ../mail/evolution-mail.schemas.in.h:153 msgid "The variable width font for mail display." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:142 +#: ../mail/evolution-mail.schemas.in.h:154 msgid "" "This can have three possible values. \"0\" for errors. \"1\" for warnings. " "\"2\" for debug messages." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:143 +#: ../mail/evolution-mail.schemas.in.h:155 msgid "" "This decides the max size of the text part that can be formatted under " "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:144 +#: ../mail/evolution-mail.schemas.in.h:156 msgid "" "This is the default junk plugin, even though there are multiple plugins " "enabled. If the default listed plugin is disabled, then it won't fall back " "to the other available plugins." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:145 +#: ../mail/evolution-mail.schemas.in.h:157 msgid "" "This key is read only once and reset to \"false\" after read. This unselects " "the mail in the list and removes the preview for that folder." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:146 +#: ../mail/evolution-mail.schemas.in.h:158 msgid "" "This key should contain a list of XML structures specifying custom headers, " "and whether they are to be displayed. The format of the XML structure is <" @@ -12284,159 +12301,119 @@ msgid "" "mail view." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:147 +#: ../mail/evolution-mail.schemas.in.h:159 msgid "" "This option is related to the key lookup_addressbook and is used to " "determine whether to look up addresses in local address book only to exclude " "mail sent by known contacts from junk filtering." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:148 +#: ../mail/evolution-mail.schemas.in.h:160 msgid "This option would help in improving the speed of fetching." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:149 +#: ../mail/evolution-mail.schemas.in.h:161 msgid "" "This sets the number of addresses to show in default message list view, " "beyond which a '...' is shown." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:150 +#: ../mail/evolution-mail.schemas.in.h:162 msgid "" "This setting specifies whether the threads should be in expanded or " "collapsed state by default. Evolution requires a restart." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:151 +#: ../mail/evolution-mail.schemas.in.h:163 msgid "" "This setting specifies whether the threads should be sorted based on latest " "message in each thread, rather than by message's date. Evolution requires a " "restart." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:152 +#: ../mail/evolution-mail.schemas.in.h:164 msgid "Thread the message list." msgstr "ସନ୍ଦେଶ ତାଲିକାକୁ ବାନ୍ଧନ୍ତୁ।" -#: ../mail/evolution-mail.schemas.in.h:153 +#: ../mail/evolution-mail.schemas.in.h:165 msgid "Thread the message-list" msgstr "ସନ୍ଦେଶ ତାଲିକାକୁ ବାନ୍ଧନ୍ତୁ।" -#: ../mail/evolution-mail.schemas.in.h:154 +#: ../mail/evolution-mail.schemas.in.h:166 msgid "Thread the message-list based on Subject" msgstr "ସନ୍ଦେଶ ତାଲିକାକୁ ବିଷୟ ଅନୁସାରେ ବାନ୍ଧନ୍ତୁ" -#: ../mail/evolution-mail.schemas.in.h:155 +#: ../mail/evolution-mail.schemas.in.h:167 msgid "Timeout for marking message as seen" msgstr "ସନ୍ଦେଶ ଦେଖାସରିଛି ପରି ଚିହ୍ନଟ କରିବା ପାଇଁ ସମୟ ସମାପ୍ତ" -#: ../mail/evolution-mail.schemas.in.h:156 +#: ../mail/evolution-mail.schemas.in.h:168 msgid "Timeout for marking message as seen." msgstr "ସନ୍ଦେଶ ଦେଖାସରିଛି ପରି ଚିହ୍ନଟ କରିବା ପାଇଁ ସମୟ ସମାପ୍ତ" -#: ../mail/evolution-mail.schemas.in.h:157 +#: ../mail/evolution-mail.schemas.in.h:169 msgid "UID string of the default account." msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଖାତାର UID ବାକ୍ୟଖଣ୍ଡ।" -#: ../mail/evolution-mail.schemas.in.h:158 +#: ../mail/evolution-mail.schemas.in.h:170 msgid "Underline color for misspelled words when using inline spelling." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:159 +#: ../mail/evolution-mail.schemas.in.h:171 msgid "Use SpamAssassin daemon and client" msgstr "SpamAssassin ଡେମନ ଏବଂ କ୍ଲାଏଣ୍ଟ ବ୍ୟବହାର କରନ୍ତୁ" -#: ../mail/evolution-mail.schemas.in.h:160 +#: ../mail/evolution-mail.schemas.in.h:172 msgid "Use SpamAssassin daemon and client (spamc/spamd)." msgstr "SpamAssassin ଡେମନ ଏବଂ କ୍ଲାଏଣ୍ଟ ବ୍ୟବହାର କରନ୍ତୁ (spamc/spamd)।" -#: ../mail/evolution-mail.schemas.in.h:161 +#: ../mail/evolution-mail.schemas.in.h:173 msgid "Use custom fonts" msgstr "ଇଚ୍ଛାରୂପଣ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ" -#: ../mail/evolution-mail.schemas.in.h:162 +#: ../mail/evolution-mail.schemas.in.h:174 msgid "Use custom fonts for displaying mail." msgstr "ମେଲ ଦର୍ଶାଇବା ପାଇଁ ଇଚ୍ଛାରୂପଣ ଅକ୍ଷରରୂପ ବ୍ୟବହାର କରନ୍ତୁ।" -#: ../mail/evolution-mail.schemas.in.h:163 +#: ../mail/evolution-mail.schemas.in.h:175 msgid "Use only local spam tests." msgstr "କେବଳ ସ୍ଥାନୀୟ ସ୍ପାମ ପରୀକ୍ଷଣ ବ୍ୟବହାର କରନ୍ତୁ।" -#: ../mail/evolution-mail.schemas.in.h:164 +#: ../mail/evolution-mail.schemas.in.h:176 msgid "Use only the local spam tests (no DNS)." msgstr "କେବଳ ସ୍ଥାନୀୟ ସ୍ପାମ ପରୀକ୍ଷଣ ବ୍ୟବହାର କରନ୍ତୁ (DNS ନାହିଁ)।" -#: ../mail/evolution-mail.schemas.in.h:165 +#: ../mail/evolution-mail.schemas.in.h:177 msgid "Use side-by-side or wide layout" msgstr "ପାଖକୁ ପାଖ କିମ୍ବା ପ୍ରସସ୍ତ ବିନ୍ୟାସ ବ୍ୟବହାର କରନ୍ତୁ" -#: ../mail/evolution-mail.schemas.in.h:166 +#: ../mail/evolution-mail.schemas.in.h:178 msgid "Variable width font" msgstr "ପରିବର୍ତ୍ତନଶୀଳ ଓସାର ଅକ୍ଷରରୂପ" -#: ../mail/evolution-mail.schemas.in.h:167 -msgid "View/Bcc menu item is checked" -msgstr "ଦୃଶ୍ୟ/Bcc ତାଲିକା ବସ୍ତୁଟି ଯାଞ୍ଚ କରାସରିଛି" - -#: ../mail/evolution-mail.schemas.in.h:168 -msgid "View/Bcc menu item is checked." -msgstr "ଦୃଶ୍ୟ/Bcc ତାଲିକା ବସ୍ତୁଟି ଯାଞ୍ଚ କରାସରିଛି।" - -#: ../mail/evolution-mail.schemas.in.h:169 -msgid "View/Cc menu item is checked" -msgstr "ଦୃଶ୍ୟ/Cc ତାଲିକା ବସ୍ତୁଟି ଯାଞ୍ଚ କରାସରିଛି" - -#: ../mail/evolution-mail.schemas.in.h:170 -msgid "View/Cc menu item is checked." -msgstr "ଦୃଶ୍ୟ/Cc ତାଲିକା ବସ୍ତୁଟି ଯାଞ୍ଚ କରାସରିଛି।" - -#: ../mail/evolution-mail.schemas.in.h:171 -msgid "View/From menu item is checked" -msgstr "ଦୃଶ୍ୟ/ଠାରୁ ତାଲିକା ବସ୍ତୁଟି ଯାଞ୍ଚ କରାସରିଛି" - -#: ../mail/evolution-mail.schemas.in.h:172 -msgid "View/From menu item is checked." -msgstr "ଦୃଶ୍ୟ/ଠାରୁ ତାଲିକା ବସ୍ତୁଟି ଯାଞ୍ଚ କରାସରିଛି।" - -#: ../mail/evolution-mail.schemas.in.h:173 -msgid "View/PostTo menu item is checked" -msgstr "ଦୃଶ୍ୟ/ରେ ପକାନ୍ତୁ ତାଲିକା ବସ୍ତୁଟି ଯାଞ୍ଚ କରାସରିଛି" - -#: ../mail/evolution-mail.schemas.in.h:174 -msgid "View/PostTo menu item is checked." -msgstr "ଦୃଶ୍ୟ/ରେ ପକାନ୍ତୁ ତାଲିକା ବସ୍ତୁଟି ଯାଞ୍ଚ କରାସରିଛି।" - -#: ../mail/evolution-mail.schemas.in.h:175 -msgid "View/ReplyTo menu item is checked" -msgstr "ଦୃଶ୍ୟ/କୁ ଉତ୍ତର ଦିଅନ୍ତୁ ତାଲିକା ବସ୍ତୁଟି ଯାଞ୍ଚ କରାସରିଛି" - -#: ../mail/evolution-mail.schemas.in.h:176 -msgid "View/ReplyTo menu item is checked." -msgstr "ଦୃଶ୍ୟ/କୁ ଉତ୍ତର ଦିଅନ୍ତୁ ତାଲିକା ବସ୍ତୁଟି ଯାଞ୍ଚ କରାସରିଛି।" - -#: ../mail/evolution-mail.schemas.in.h:177 +#: ../mail/evolution-mail.schemas.in.h:179 msgid "Whether a read receipt request gets added to every message by default." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:178 +#: ../mail/evolution-mail.schemas.in.h:180 msgid "Whether disable ellipsizing feature of folder names in side bar." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:179 +#: ../mail/evolution-mail.schemas.in.h:181 msgid "" "Whether or not to fall back on threading by subjects when the messages do " "not contain In-Reply-To or References headers." msgstr "" -#: ../mail/evolution-mail.schemas.in.h:180 +#: ../mail/evolution-mail.schemas.in.h:182 msgid "Whether sort threads based on latest message in that thread" msgstr "" -#: ../mail/evolution-mail.schemas.in.h:181 +#: ../mail/evolution-mail.schemas.in.h:183 msgid "Width of the message-list pane" msgstr "ସନ୍ଦେଶ-ତାଲିକା ପଟ୍ଟିକାର ଓସାର" -#: ../mail/evolution-mail.schemas.in.h:182 +#: ../mail/evolution-mail.schemas.in.h:184 msgid "Width of the message-list pane." msgstr "ସନ୍ଦେଶ-ତାଲିକା ପଟ୍ଟିକାର ଓସାର" @@ -12523,89 +12500,89 @@ msgstr "%s ମେଲିଙ୍ଗ ତାଲିକା" msgid "Add Filter Rule" msgstr "ଫିଲଟର ନିୟମ ଯୋଗକରନ୍ତୁ" -#: ../mail/mail-component.c:552 +#: ../mail/mail-component.c:554 #, c-format msgid "%d selected, " msgid_plural "%d selected, " msgstr[0] "%d ଚୟିତ, " msgstr[1] "%d ଚୟିତ," -#: ../mail/mail-component.c:556 +#: ../mail/mail-component.c:558 #, c-format msgid "%d deleted" msgid_plural "%d deleted" msgstr[0] "%d ବିଲୋପ ହୋଇଛି" msgstr[1] "%d ବିଲୋପ ହୋଇଛି" -#: ../mail/mail-component.c:563 +#: ../mail/mail-component.c:565 #, c-format msgid "%d junk" msgid_plural "%d junk" msgstr[0] "%d junk" msgstr[1] "%d junk" -#: ../mail/mail-component.c:566 +#: ../mail/mail-component.c:568 #, c-format msgid "%d draft" msgid_plural "%d drafts" msgstr[0] "%d ଡ୍ରାଫ୍ଟ" msgstr[1] "%d ଡ୍ରାଫ୍ଟଗୁଡ଼ିକ" -#: ../mail/mail-component.c:568 +#: ../mail/mail-component.c:570 #, c-format msgid "%d sent" msgid_plural "%d sent" msgstr[0] "%d ପଠାହୋଇଛି" msgstr[1] "%d ପଠାହୋଇଛି" -#: ../mail/mail-component.c:570 +#: ../mail/mail-component.c:572 #, c-format msgid "%d unsent" msgid_plural "%d unsent" msgstr[0] "%d ପଠାହୋଇନାହିଁ" msgstr[1] "%d ପଠାହୋଇନାହିଁ" -#: ../mail/mail-component.c:576 +#: ../mail/mail-component.c:578 #, c-format msgid "%d unread, " msgid_plural "%d unread, " msgstr[0] "%d ଅପଠିତ, " msgstr[1] "%d ଅପଠିତ, " -#: ../mail/mail-component.c:577 +#: ../mail/mail-component.c:579 #, c-format msgid "%d total" msgid_plural "%d total" msgstr[0] "%d ସର୍ବମୋଟ" msgstr[1] "%d ସର୍ବମୋଟ" -#: ../mail/mail-component.c:929 +#: ../mail/mail-component.c:930 msgid "New Mail Message" msgstr "ନୂତନ ମେଲ ସନ୍ଦେଶ" -#: ../mail/mail-component.c:930 +#: ../mail/mail-component.c:931 msgctxt "New" msgid "_Mail Message" msgstr "ମେଲ ସନ୍ଦେଶ (_M)" -#: ../mail/mail-component.c:931 +#: ../mail/mail-component.c:932 msgid "Compose a new mail message" msgstr "ନୂତନ ମେଲ ସନ୍ଦେଶ ଲେଖନ୍ତୁ" -#: ../mail/mail-component.c:937 +#: ../mail/mail-component.c:938 msgid "New Mail Folder" msgstr "ନୂତନ ମେଲ ଫୋଲଡର" -#: ../mail/mail-component.c:938 +#: ../mail/mail-component.c:939 msgctxt "New" msgid "Mail _Folder" msgstr "ମେଲ ଫୋଲଡର (_F)" -#: ../mail/mail-component.c:939 +#: ../mail/mail-component.c:940 msgid "Create a new mail folder" msgstr "ନୂତନ ଡାକ ସୃଷ୍ଟି କରନ୍ତୁ" -#: ../mail/mail-component.c:1086 +#: ../mail/mail-component.c:1087 msgid "Failed upgrading Mail settings or folders." msgstr "ମେଲ ବିନ୍ୟାସ କିମ୍ବା ଫୋଲଡରଗୁଡ଼ିକୁ ଉନ୍ନତତର କରିବା ବିଫଳ ହୋଇଛି।" @@ -12771,13 +12748,15 @@ msgid "Always request rea_d receipt" msgstr "ସର୍ବଦା ପଢ଼ାଯାଇଥିବା ରସିଦ ପାଇଁ ଅନୁରୋଧ କରନ୍ତୁ (_d)" #: ../mail/mail-config.glade.h:45 -#, fuzzy #| msgid "Attachment Reminder" msgid "" "Attachment\n" "Inline\n" "Quoted" -msgstr "ସଂଲଗ୍ନକ ସ୍ମରଣକର୍ତ୍ତା" +msgstr "" +"ସଂଲଗ୍ନକ\n" +"ଇନଲାଇନ\n" +"ଉଦ୍ଧୃତ" #: ../mail/mail-config.glade.h:48 msgid "" @@ -13149,7 +13128,7 @@ msgstr "ଚାଳକ ନାମ (_e):" msgid "Use Authe_ntication" msgstr "ବୈଧିକରଣ ବ୍ୟବହାର କରନ୍ତୁ (_n)" -#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:368 +#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:405 #: ../plugins/google-account-setup/google-source.c:613 #: ../plugins/google-account-setup/google-contacts-source.c:280 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:308 @@ -13317,64 +13296,52 @@ msgid "All local folders" msgstr "ସମସ୍ତ ସ୍ଥାନୀୟ ଫୋଲଡରଗୁଡ଼ିକ" #: ../mail/mail-dialogs.glade.h:8 -msgid "Case _sensitive" -msgstr "ଅକ୍ଷର ନିର୍ଦ୍ଦିଷ୍ଟ (_s)" - -#: ../mail/mail-dialogs.glade.h:9 msgid "Co_mpleted" msgstr "" -#: ../mail/mail-dialogs.glade.h:10 -msgid "F_ind:" -msgstr "ଖୋଜନ୍ତୁ (_i)" - -#: ../mail/mail-dialogs.glade.h:11 -msgid "Find in Message" -msgstr "ସନ୍ଦେଶରେ ଖୋଜନ୍ତୁ" - -#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:275 +#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:275 msgid "Flag to Follow Up" msgstr "ଅନୁସରଣ କରିବା ପାଇଁ ବିଶେଷ ସୂଚକ" -#: ../mail/mail-dialogs.glade.h:13 +#: ../mail/mail-dialogs.glade.h:10 msgid "Folder Subscriptions" msgstr "ଫୋଲଡର ସ୍ବୀକାରକରଣଗୁଡିକ" -#: ../mail/mail-dialogs.glade.h:14 +#: ../mail/mail-dialogs.glade.h:11 msgid "License Agreement" msgstr "ଲାଇସେନ୍ସ ରାଜିନାମା" -#: ../mail/mail-dialogs.glade.h:15 +#: ../mail/mail-dialogs.glade.h:12 msgid "S_erver:" msgstr "ସର୍ଭର (_e):" -#: ../mail/mail-dialogs.glade.h:16 +#: ../mail/mail-dialogs.glade.h:13 msgid "Security Information" msgstr "ସୁରକ୍ଷା ସୂଚନା" -#: ../mail/mail-dialogs.glade.h:17 +#: ../mail/mail-dialogs.glade.h:14 msgid "Specific folders" msgstr "" -#: ../mail/mail-dialogs.glade.h:18 +#: ../mail/mail-dialogs.glade.h:15 msgid "" "The messages you have selected for follow up are listed below.\n" "Please select a follow up action from the \"Flag\" menu." msgstr "" -#: ../mail/mail-dialogs.glade.h:20 +#: ../mail/mail-dialogs.glade.h:17 msgid "_Accept License" msgstr "ଅନୁମତି ପତ୍ର ଗ୍ରହଣକରନ୍ତୁ (_A)" -#: ../mail/mail-dialogs.glade.h:21 +#: ../mail/mail-dialogs.glade.h:18 msgid "_Due By:" msgstr "ଅନ୍ତିମ ଦିବସ (_D):" -#: ../mail/mail-dialogs.glade.h:22 +#: ../mail/mail-dialogs.glade.h:19 msgid "_Flag:" msgstr "" -#: ../mail/mail-dialogs.glade.h:23 +#: ../mail/mail-dialogs.glade.h:20 msgid "_Tick this to accept the license agreement" msgstr "" @@ -13383,21 +13350,21 @@ msgstr "" msgid "Pinging %s" msgstr "" -#: ../mail/mail-ops.c:106 +#: ../mail/mail-ops.c:107 msgid "Filtering Selected Messages" msgstr "ଚୟିତ ବସ୍ତୁ ମାନଙ୍କୁ ଛାଣୁଅଛି" -#: ../mail/mail-ops.c:265 +#: ../mail/mail-ops.c:266 msgid "Fetching Mail" msgstr "ମେଲ ଆନୟନ" #. sending mail, filtering failed -#: ../mail/mail-ops.c:561 +#: ../mail/mail-ops.c:562 #, c-format msgid "Failed to apply outgoing filters: %s" msgstr "ଯାଉଥିବା ଛାଣକକୁ ପ୍ରୟୋଗ କରିବାରେ ବିଫଳ ହୋଇଛି: %s" -#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602 +#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:603 #, c-format msgid "" "Failed to append to %s: %s\n" @@ -13406,34 +13373,34 @@ msgstr "" "%sରେ ଯୋଡ଼ିବା ବିଫଲ ହୋଇଛି: %s\n" "ଏହା ପରିବର୍ତ୍ତେ ସ୍ଥାନୀୟ `ଫଠାଯାଇଥିବା' ଫୋଲଡରକୁ ଯୋଡ଼ୁଅଛି।" -#: ../mail/mail-ops.c:619 +#: ../mail/mail-ops.c:620 #, c-format msgid "Failed to append to local `Sent' folder: %s" msgstr "ସ୍ଥାନୀୟ 'ପଠାଯାଇଥିବା' ଫୋଲଡର ସହିତ ଯୋଡିବାରେ ବିଫଳ ହୋଇଛି: %s " -#: ../mail/mail-ops.c:725 ../mail/mail-ops.c:806 +#: ../mail/mail-ops.c:726 ../mail/mail-ops.c:807 msgid "Sending message" msgstr "ସନ୍ଦେଶ ପଠାଉଅଛି" -#: ../mail/mail-ops.c:735 +#: ../mail/mail-ops.c:736 #, c-format msgid "Sending message %d of %d" msgstr "%dର ସନ୍ଦେଶ %d କୁ ପଠାଯାଉଛି" -#: ../mail/mail-ops.c:762 +#: ../mail/mail-ops.c:763 #, c-format msgid "Failed to send %d of %d messages" msgstr "%dର ସନ୍ଦେଶ %d କୁ ପଠାଇବାରେ ବିଫଳ" -#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700 +#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:700 msgid "Canceled." msgstr "ବାତିଲ ହୋଇଛି।" -#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702 +#: ../mail/mail-ops.c:767 ../mail/mail-send-recv.c:702 msgid "Complete." msgstr "ସମ୍ପୂର୍ଣ୍ଣ।" -#: ../mail/mail-ops.c:878 +#: ../mail/mail-ops.c:879 msgid "Saving message to folder" msgstr "ସନ୍ଦେଶକୁ ଫୋଲଡରରେ ସଂରକ୍ଷଣ କରୁଅଛି" @@ -13508,21 +13475,21 @@ msgstr "ସ୍ଥାନୀୟ ଫୋଲ୍ଡରଗୁଡ଼ିକ" msgid "Retrieving message %s" msgstr "ସନ୍ଦେଶ %sକୁ ପୁନରୁଦ୍ଧାର କରୁଅଛି" -#: ../mail/mail-ops.c:1931 +#: ../mail/mail-ops.c:1933 #, c-format msgid "Retrieving %d message" msgid_plural "Retrieving %d messages" msgstr[0] "ସନ୍ଦେଶ %dକୁ ପୁନରୁଦ୍ଧାର କରୁଅଛି" msgstr[1] "ସନ୍ଦେଶ %dଗୁଡ଼ିକୁ ପୁନରୁଦ୍ଧାର କରୁଅଛି" -#: ../mail/mail-ops.c:2016 +#: ../mail/mail-ops.c:2018 #, c-format msgid "Saving %d message" msgid_plural "Saving %d messages" msgstr[0] "%d ସନ୍ଦେଶକୁ ସଂରକ୍ଷଣ କରୁଅଛି" msgstr[1] "%d ସନ୍ଦେଶଗୁଡ଼ିକୁ ସଂରକ୍ଷଣ କରୁଅଛି" -#: ../mail/mail-ops.c:2094 +#: ../mail/mail-ops.c:2096 #, c-format msgid "" "Error saving messages to: %s:\n" @@ -13531,11 +13498,11 @@ msgstr "" "ରେ ସନ୍ଦେଶଗୁଡ଼ିକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି: %s:\n" " %s" -#: ../mail/mail-ops.c:2166 +#: ../mail/mail-ops.c:2168 msgid "Saving attachment" msgstr "ସଂଲଗ୍ନକୁ ସଂରକ୍ଷଣ କରୁଅଛି" -#: ../mail/mail-ops.c:2184 ../mail/mail-ops.c:2192 +#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194 #, c-format msgid "" "Cannot create output file: %s:\n" @@ -13544,27 +13511,27 @@ msgstr "" "ଫଳାଫଳ ଫାଇଲ ନିର୍ମାଣ କରିପାରିବେ ନାହିଁ: %s:\n" " %s" -#: ../mail/mail-ops.c:2207 +#: ../mail/mail-ops.c:2209 #, c-format msgid "Could not write data: %s" msgstr "ତଥ୍ଯ ଲେଖିପାରିବେ ନାହିଁ: %s" -#: ../mail/mail-ops.c:2353 +#: ../mail/mail-ops.c:2355 #, c-format msgid "Disconnecting from %s" msgstr "%s ଠାରୁ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରୁଅଛି" -#: ../mail/mail-ops.c:2353 +#: ../mail/mail-ops.c:2355 #, c-format msgid "Reconnecting to %s" msgstr "%s ସହିତ ପୁନଃସଂଯୋଗ କରୁଅଛି" -#: ../mail/mail-ops.c:2449 +#: ../mail/mail-ops.c:2451 #, c-format msgid "Preparing account '%s' for offline" msgstr "ଅଫ ଲାଇନ ପାଇଁ ଖାତା '%s' ପ୍ରସ୍ତୁତ କରୁଅଛି" -#: ../mail/mail-ops.c:2535 +#: ../mail/mail-ops.c:2537 msgid "Checking Service" msgstr "ସର୍ଭିସ ଯାଞ୍ଚ କରୁଅଛି" @@ -13667,11 +13634,11 @@ msgstr "'%s ପାଇଁ ସନ୍ଧାନ ଫୋଲଡରକୁ ଅଦ୍ୟ msgid "Updating Search Folders for '%s'" msgstr "'%s ପାଇଁ ସନ୍ଧାନ ଫୋଲଡରକୁ ଅଦ୍ୟତନ କରୁଅଛି" -#: ../mail/mail-vfolder.c:1067 +#: ../mail/mail-vfolder.c:1068 msgid "Edit Search Folder" msgstr "ସନ୍ଧାନ ଫୋଲଡରକୁ ସମ୍ପାଦନ କରନ୍ତୁ" -#: ../mail/mail-vfolder.c:1156 +#: ../mail/mail-vfolder.c:1157 msgid "New Search Folder" msgstr "ନୂତନ ସନ୍ଧାନ ଫୋଲଡର" @@ -14358,11 +14325,11 @@ msgstr "ଆଗକୁ" msgid "No Response Necessary" msgstr "କୌଣସି ଉତ୍ତର ଆବଶ୍ୟ ନାହିଁ" -#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80 +#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:76 msgid "Reply" msgstr "ଉତ୍ତର ଦିଅନ୍ତୁ" -#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81 +#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:77 msgid "Reply to All" msgstr "ସମସ୍ତଙ୍କୁ ଉତ୍ତର ଦିଅନ୍ତୁ" @@ -14391,20 +14358,26 @@ msgid "Subject contains" msgstr "ବିଷୟ ଧାରଣ କରିଥାଏ" #: ../mail/searchtypes.xml.h:6 +#| msgid "Subject or Sender contains" +msgid "Subject or Addresses contains" +msgstr "ବିଷୟ କିମ୍ବା ଠିକଣା ଧାରଣ କରିଥାଏ" + +#: ../mail/searchtypes.xml.h:7 msgid "Subject or Recipients contains" msgstr "ବିଷୟ କିମ୍ବା ଗ୍ରାହକ ଧାରଣ କରିଥାଏ" -#: ../mail/searchtypes.xml.h:7 +#: ../mail/searchtypes.xml.h:8 msgid "Subject or Sender contains" msgstr "ବିଷଯ କିମ୍ବା ପ୍ରେରକ ଧାରଣ କରିଥାଏ" #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1 -msgid "Local Address Books" -msgstr "ସ୍ଥାନୀୟ ଠିକଣା ବହି" +#| msgid "List local address book folders" +msgid "Add local address books to Evolution." +msgstr "Evolution ମଧ୍ଯରେ ସ୍ଥାନୀୟ ଠିକଣା ପୁସ୍ତିକାମାନଙ୍କୁ ସୂଚୀବଦ୍ଧ କରନ୍ତୁ।" #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2 -msgid "Provides core functionality for local address books." -msgstr "" +msgid "Local Address Books" +msgstr "ସ୍ଥାନୀୟ ଠିକଣା ବହି" #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1 msgid "" @@ -14429,9 +14402,7 @@ msgid "Attachment Reminder" msgstr "ସଂଲଗ୍ନକ ସ୍ମରଣକର୍ତ୍ତା" #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2 -msgid "" -"Looks for clues in a message for mention of attachments and warns if the " -"attachment is missing" +msgid "Reminds you when you forgot to add an attachment to a mail message." msgstr "" #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2 @@ -14453,14 +14424,13 @@ msgid "_Edit Message" msgstr "ସନ୍ଦେଶ ସମ୍ପାଦନକରନ୍ତୁ (_E)" #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1 -msgid "" -"A formatter plugin which displays audio attachments inline and allows you to " -"play them directly from Evolution." -msgstr "" +#| msgid "Audio inline plugin" +msgid "Audio Inline" +msgstr "ଧ୍ବନି ଇନଲାଇନ" #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2 -msgid "Audio inline plugin" -msgstr "ଧ୍ବନି ଇନଲାଇନ ପ୍ଲଗଇନ" +msgid "Play audio attachments directly from Evolution." +msgstr "" #: ../plugins/backup-restore/backup-restore.c:139 msgid "Select name of the Evolution backup file" @@ -14548,78 +14518,68 @@ msgid "Backup current Evolution data" msgstr "ସାମ୍ପ୍ରତିକ Evolution ତଥ୍ୟର ନକଲ ସଂରକ୍ଷଣ କରନ୍ତୁ" #: ../plugins/backup-restore/backup.c:244 -#, fuzzy msgid "Extracting files from backup" -msgstr "ଫାଇଲ ମାନ ଠାରୁ" +msgstr "ନକଲ ସଂରକ୍ଷଣରୁ ଫାଇଲଗୁଡ଼ିକୁ କାଢ଼ୁଅଛି" #: ../plugins/backup-restore/backup.c:251 msgid "Loading Evolution settings" msgstr "Evolutionର ବିନ୍ଯାସକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" #: ../plugins/backup-restore/backup.c:258 -#, fuzzy msgid "Removing temporary backup files" -msgstr "ଫାଇଲ ମାନ" +msgstr "ଅସ୍ଥାୟୀ ନକଲ ସଂରକ୍ଷଣ ଫାଇଲଗୁଡ଼ିକୁ କାଢ଼ୁଅଛି" #: ../plugins/backup-restore/backup.c:265 -#, fuzzy msgid "Ensuring local sources" -msgstr "ସ୍ଥାନୀୟ" +msgstr "ସ୍ଥାନୀୟ ଉତ୍ସଗୁଡ଼ିକୁ ନିଶ୍ଚିତ କରୁଅଛି" #: ../plugins/backup-restore/backup.c:386 -#, fuzzy, c-format +#, c-format msgid "Backing up to the folder %s" -msgstr "ଉପର କୁ" +msgstr "ଫୋଲଡର %sକୁ ନକଲ ସଂରକ୍ଷଣ କରୁଅଛି" #: ../plugins/backup-restore/backup.c:391 -#, fuzzy, c-format +#, c-format msgid "Restoring from the folder %s" -msgstr "ଠାରୁ" +msgstr "ଫୋଲଡ଼ର %sରୁ ପୁନଃସ୍ଥାପନ କରୁଅଛି" #. Backup / Restore only can have GUI. We should restrict the rest -#: ../plugins/backup-restore/backup.c:410 +#: ../plugins/backup-restore/backup.c:411 msgid "Evolution Backup" msgstr "Evolution ଠିକଣା ପୁସ୍ତିକା" -#: ../plugins/backup-restore/backup.c:410 +#: ../plugins/backup-restore/backup.c:411 msgid "Evolution Restore" msgstr "Evolution ଠିକଣା ପୁସ୍ତିକା" -#: ../plugins/backup-restore/backup.c:445 -#, fuzzy +#: ../plugins/backup-restore/backup.c:446 msgid "Backing up Evolution Data" -msgstr "ଉପର କ୍ରମବିକାଶ ତଥ୍ଯ" +msgstr "Evolution ତଥ୍ୟକୁ ନକଲ ସଂରକ୍ଷଣ କରୁଅଛି" -#: ../plugins/backup-restore/backup.c:446 -#, fuzzy +#: ../plugins/backup-restore/backup.c:447 msgid "Please wait while Evolution is backing up your data." -msgstr "ଦୟାକରି କ୍ରମବିକାଶ ଅଟେ ଉପର ତଥ୍ଯ." +msgstr "Evolution ଆପଣଙ୍କର ତଥ୍ୟର ନକଲ ସଂରକ୍ଷଣ କରିବା ସମୟରେ ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ।" -#: ../plugins/backup-restore/backup.c:448 -#, fuzzy +#: ../plugins/backup-restore/backup.c:449 msgid "Restoring Evolution Data" -msgstr "କ୍ରମବିକାଶ ତଥ୍ଯ" +msgstr "Evolution ତଥ୍ୟକୁ ପୁନଃସ୍ଥାପନ କରୁଅଛି" -#: ../plugins/backup-restore/backup.c:449 -#, fuzzy +#: ../plugins/backup-restore/backup.c:450 msgid "Please wait while Evolution is restoring your data." -msgstr "ଦୟାକରି କ୍ରମବିକାଶ ଅଟେ ତଥ୍ଯ." +msgstr "Evolution ଆପଣଙ୍କର ତଥ୍ୟକୁ ପୁନଃସ୍ଥାପନ କରିବା ସମୟରେ ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ।" -#: ../plugins/backup-restore/backup.c:467 -#, fuzzy +#: ../plugins/backup-restore/backup.c:468 msgid "This may take a while depending on the amount of data in your account." -msgstr "a ରେ ର ତଥ୍ଯ ଇଞ୍ଚ." - -#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1 -#, fuzzy -msgid "A plugin for backing up and restore Evolution data and settings." -msgstr "A ପାଇଁ ଉପର ଏବଂ କ୍ରମବିକାଶ ତଥ୍ଯ ଏବଂ." +msgstr "ଆପଣଙ୍କର ଖାତାରେ କେତେ ତଥ୍ୟ ଅଛି ତାହା ଉପରେ ନିର୍ଭର କରି ଏହା କିଛି ସମୟ ନେଇପାରେ।" #. the path to the shared library +#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2 +msgid "Backup and Restore" +msgstr "ନକଲ ସଂରକ୍ଷଣ ଏବଂ ପୁନଃସ୍ଥାପନ" + #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3 -#, fuzzy -msgid "Backup and restore plugin" -msgstr "ଏବଂ" +msgid "Backup and restore your Evolution data and settings." +msgstr "ଆପଣଙ୍କର Evolution ତଥ୍ୟ ଏବଂ ସଂରଚନାକୁ ନକଲ ସଂରକ୍ଷଣ ଏବଂ ପୁନଃସ୍ଥାପନ କରନ୍ତୁ।" #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1 msgid "Are you sure you want to close Evolution?" @@ -14630,36 +14590,30 @@ msgid "Are you sure you want to restore Evolution from the selected backup file? msgstr "" #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3 -#, fuzzy msgid "" "Evolution backup can start only when Evolution is not running. Please make " "sure that you save and close all your unsaved windows before proceeding. If " "you want Evolution to restart automatically after backup, please enable the " "toggle button." msgstr "" -"କ୍ରମବିକାଶ ଆରମ୍ଭ କ୍ରମବିକାଶ ଅଟେ ନୁହେଁ ଚାଲୁଅଛି ଦୟାକରି ସଂରକ୍ଷଣ ଏବଂ ବନ୍ଦ କରନ୍ତୁ ସମସ୍ତ ପୂର୍ବରୁ " -"କ୍ରମବିକାଶ କୁ ପୁନର୍ଚାଳନ ପରେ ସକ୍ରିୟ ଅଦଳବଦଳ କରନ୍ତୁ ବଟନ." #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4 msgid "Insufficient Permissions" msgstr "ଅପର୍ଯ୍ଯାପ୍ତ ଅନୁମତି" #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5 -#, fuzzy msgid "Invalid Evolution backup file" -msgstr "ଅବୈଧ କ୍ରମବିକାଶ ଫାଇଲ" +msgstr "ଅବୈଧ Evolution ନକଲ ସଂରକ୍ଷଣ ଫାଇଲ" #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6 msgid "Please select a valid backup file to restore." msgstr "ପୁନଃସ୍ଥାପନ କରିବା ପାଇଁ ଦୟାକରି ଗୋଟିଏ ବୈଧ ନକଲ ସଂରକ୍ଷଣ ଫାଇଲ ଚୟନ କରନ୍ତୁ।" #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7 -#, fuzzy msgid "The selected folder is not writable." -msgstr "ଚୟିତ ଅଟେ ନୁହେଁ." +msgstr "ବଚ୍ଛିତ ଫୋଲଡରଟି ଲିଖନ ଯୋଗ୍ୟ ନୁହେଁ।" #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8 -#, fuzzy msgid "" "This will delete all your current Evolution data and settings and restore " "them from your backup. Evolution restore can start only when Evolution is " @@ -14667,13 +14621,14 @@ msgid "" "you proceed. If you want Evolution to restart automatically restart after " "restore, please enable the toggle button." msgstr "" -"ବିଲୋପ କର ସମସ୍ତ କ୍ରମବିକାଶ ତଥ୍ଯ ଏବଂ ଏବଂ ଠାରୁ କ୍ରମବିକାଶ ଆରମ୍ଭ କ୍ରମବିକାଶ ଅଟେ ନୁହେଁ ଚାଲୁଅଛି " -"ଦୟାକରି ବନ୍ଦ କରନ୍ତୁ ସମସ୍ତ ପୂର୍ବରୁ କ୍ରମବିକାଶ କୁ ପୁନର୍ଚାଳନ ପୁନର୍ଚାଳନ ପରେ ସକ୍ରିୟ ଅଦଳବଦଳ କରନ୍ତୁ ବଟନ." +"ଏହା ଆପଣଙ୍କର ପ୍ରଚଳିତ ସମସ୍ତ Evolution ତଥ୍ୟ ଏବଂ ସଂରଚନାକୁ ନକଲ ସଂରକ୍ଷଣରୁ ବିଲୋପ କରିଦେବ।" +"Evolution ଚାଲୁନଥିବା ସମୟରେ Evolution ପୁନଃସ୍ଥାପନ ଆରମ୍ଭ ହୋଇଥାଏ। ଦୟାକରି ନିଶ୍ଚିତ କରନ୍ତୁ ଯେ " +"ଅଗ୍ରସର ହେବା ପୂର୍ବରୁ ଆପଣ ସମସ୍ତ ୱିଣ୍ଡୋକୁ ବନ୍ଦ କରିଛନ୍ତି। ଯଦି ଆପଣ ଚାହାନ୍ତି ତେବେ ପୁନଃସ୍ଥାପନ କରିବା ପୂର୍ବରୁ " +"Evolution ସ୍ୱୟଂଚାଳିତ ଭାବରେ ପୁନଃଚାଳନ ହେବ, ଦୟାକରି ଅଦଳବଦଳ ବଟନକୁ ସକ୍ରିୟ କରନ୍ତୁ।" #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1 -#, fuzzy msgid "Backup and restore Evolution data and settings" -msgstr "ଏବଂ କ୍ରମବିକାଶ ତଥ୍ଯ ଏବଂ" +msgstr "Evolution ତଥ୍ୟ ଏବଂ ସଂରଚନାଗୁଡ଼ିକୁ ନକଲ ସଂରକ୍ଷଣ ଏବଂ ପୁନଃସ୍ଥାପନ କରନ୍ତୁ" #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2 msgid "R_estore Settings..." @@ -14683,52 +14638,50 @@ msgstr "ବିନ୍ୟାସଗୁଡ଼ିକୁ ପୁନଃସ୍ଥାପ msgid "_Backup Settings..." msgstr "ନକଲ ସଂରକ୍ଷଣ ବିନ୍ୟାସ (_B)..." -#: ../plugins/bbdb/bbdb.c:621 ../plugins/bbdb/bbdb.c:630 +#: ../plugins/bbdb/bbdb.c:624 ../plugins/bbdb/bbdb.c:633 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1 msgid "Automatic Contacts" msgstr "ସ୍ବଯଂଚାଳିତ ଯୋଗାଯୋଗ" #. Enable BBDB checkbox -#: ../plugins/bbdb/bbdb.c:645 -#, fuzzy +#: ../plugins/bbdb/bbdb.c:648 #| msgid "_Hide addresses when sending mail to this list" msgid "Create _address book entries when sending mails" -msgstr "ଏହି ଗୋଷ୍ଠୀକୁ ଡାକ ପଠାଇବା ପୂର୍ବରୁ ଠିକଣା ମାନଙ୍କୁ ଲୁକ୍କାୟିତ କରନ୍ତୁ (_H)" +msgstr "ମେଲ ପଠାଇବା ସମୟରେ ଠିକଣା ପୁସ୍ତକ ନିର୍ମାଣ କରନ୍ତୁ (_a)" -#: ../plugins/bbdb/bbdb.c:651 -#, fuzzy +#: ../plugins/bbdb/bbdb.c:654 msgid "Select Address book for Automatic Contacts" -msgstr "ମନୋନୀତ କର ଠିକଣା ପାଇଁ ସ୍ବଯଂଚାଳିତ ଯୋଗାଯୋଗ" +msgstr "ସ୍ବୟଂଚାଳିତ ଯୋଗାଯୋଗ ପାଇଁ ଠିକଣା ପୁସ୍ତକ ବାଛନ୍ତୁ" -#: ../plugins/bbdb/bbdb.c:666 -#, fuzzy +#: ../plugins/bbdb/bbdb.c:669 msgid "Instant Messaging Contacts" -msgstr "ଜ୍ବଳନ୍ତ ଯୋଗାଯୋଗ" +msgstr "ତୁରନ୍ତ ସନ୍ଦେଶ ପ୍ରବାହ ଯୋଗାଯୋଗ" #. Enable Gaim Checkbox -#: ../plugins/bbdb/bbdb.c:681 -#, fuzzy +#: ../plugins/bbdb/bbdb.c:684 msgid "Synchronize contact info and images from Pidgin buddy list" -msgstr "ସମକାଳୀନ ସମ୍ପର୍କ info ଏବଂ ଠାରୁ ତାଲିକା" +msgstr "Pidgin ସାଥି ତାଲିକାରୁ ଯୋଗାଯୋଗ ସୂଚନା ଏବଂ ପ୍ରତିଛବିଗୁଡ଼ିକୁ ସମକାଳୀନ କରନ୍ତୁ" -#: ../plugins/bbdb/bbdb.c:687 +#: ../plugins/bbdb/bbdb.c:690 msgid "Select Address book for Pidgin buddy list" msgstr "Pidgin ସାଥି ତାଲିକା ପାଇଁ ଠିକଣା ବହି ମନୋନୀତ କରନ୍ତୁ" #. Synchronize now button. -#: ../plugins/bbdb/bbdb.c:698 +#: ../plugins/bbdb/bbdb.c:701 msgid "Synchronize with _buddy list now" msgstr "ସାଥି ତାଲିକା ସହିତ ବର୍ତ୍ତମାନ ସମକାଳୀନ କରନ୍ତୁ (_b)" #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2 -msgid "" -"Automatically fills your address book with names and email addresses as you " -"reply to messages. Also fills in IM contact information from your buddy " -"lists." +msgid "BBDB" msgstr "" #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3 -msgid "BBDB" +msgid "" +"Takes the gruntwork out of managing your address book.\n" +"\n" +"Automatically fills your address book with names and email addresses as you " +"reply to messages. Also fills in IM contact information from your buddy " +"lists." msgstr "" #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself. @@ -14767,43 +14720,45 @@ msgid "" msgstr "ବିଭିନ୍ନ ବର୍ଣ୍ଣ ସେଟରୁ ଆସିଥିବା ସନ୍ଦେଶ ପାଠ୍ଯକୁ ୟୁନିକୋଡ UTF-8 ରେ ରୂପାନ୍ତର କରନ୍ତୁ" #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1 -msgid "Bogofilter Options" -msgstr "Bogofilter ବିକଳ୍ପଗୁଡିକ" +#| msgid "Report Junk Failed" +msgid "Bogofilter Junk Filter" +msgstr "Bogofilter ଜଙ୍କ ଛାଣକ" #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2 -msgid "Bogofilter junk plugin" -msgstr "" +msgid "Bogofilter Options" +msgstr "Bogofilter ବିକଳ୍ପଗୁଡିକ" #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3 -msgid "Filters junk messages using Bogofilter." +#| msgid "Filters junk messages using Bogofilter." +msgid "Filter junk messages using Bogofilter." msgstr "Bogofilter ବ୍ୟବହାର କରି ଜଙ୍କ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଛାଣନ୍ତୁ।" #: ../plugins/caldav/caldav-source.c:64 msgid "CalDAV" msgstr "" -#: ../plugins/caldav/caldav-source.c:329 -#: ../plugins/calendar-http/calendar-http.c:126 +#: ../plugins/caldav/caldav-source.c:366 +#: ../plugins/calendar-http/calendar-http.c:171 msgid "_URL:" msgstr "ୟୁ.ଆର.ଏଲ. (_U):" -#: ../plugins/caldav/caldav-source.c:353 +#: ../plugins/caldav/caldav-source.c:390 #: ../plugins/google-account-setup/google-source.c:606 #: ../plugins/google-account-setup/google-contacts-source.c:303 msgid "Use _SSL" msgstr "SSL ବ୍ଯବହାର କରନ୍ତୁ (_S)" #. add refresh option -#: ../plugins/caldav/caldav-source.c:396 -#: ../plugins/calendar-http/calendar-http.c:263 +#: ../plugins/caldav/caldav-source.c:433 +#: ../plugins/calendar-http/calendar-http.c:308 #: ../plugins/calendar-weather/calendar-weather.c:508 #: ../plugins/google-account-setup/google-source.c:630 #: ../plugins/google-account-setup/google-contacts-source.c:322 msgid "Re_fresh:" msgstr "ସତେଜନ କରନ୍ତୁ (_f):" -#: ../plugins/caldav/caldav-source.c:414 -#: ../plugins/calendar-http/calendar-http.c:281 +#: ../plugins/caldav/caldav-source.c:451 +#: ../plugins/calendar-http/calendar-http.c:326 #: ../plugins/calendar-weather/calendar-weather.c:526 #: ../plugins/google-account-setup/google-source.c:656 #: ../plugins/google-account-setup/google-contacts-source.c:333 @@ -14811,36 +14766,37 @@ msgid "weeks" msgstr "ସପ୍ତାହ" #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1 -msgid "CalDAV Calendar sources" -msgstr "CalDAV କ୍ଯାଲେଣ୍ଡର ଉତ୍ସ" +msgid "Add CalDAV support to Evolution." +msgstr "" #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2 -msgid "CalDAV sources" +msgid "CalDAV Support" msgstr "" #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1 -msgid "Local Calendars" -msgstr "ସ୍ଥାନୀୟ କ୍ୟାଲେଣ୍ଡରଗୁଡ଼ିକ" +msgid "Add local calendars to Evolution." +msgstr "" #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2 -msgid "Provides core functionality for local calendars." -msgstr "ସ୍ଥାନୀୟ କ୍ୟାଲେଣ୍ଡରଗୁଡ଼ିକ ପାଇଁ ମୂଳ କାର୍ଯ୍ୟକଳାପ ପ୍ରଦାନ କରନ୍ତୁ।" +msgid "Local Calendars" +msgstr "ସ୍ଥାନୀୟ କ୍ୟାଲେଣ୍ଡରଗୁଡ଼ିକ" -#: ../plugins/calendar-http/calendar-http.c:324 +#: ../plugins/calendar-http/calendar-http.c:369 msgid "_Secure connection" msgstr "" -#: ../plugins/calendar-http/calendar-http.c:389 +#: ../plugins/calendar-http/calendar-http.c:455 msgid "Userna_me:" msgstr "ଚାଳକ ନାମ (_m):" #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1 -msgid "HTTP Calendars" -msgstr "HTTP କ୍ୟାଲେଣ୍ଡର" +msgid "Add web calendars to Evolution." +msgstr "" #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2 -msgid "Provides core functionality for webcal and http calendars." -msgstr "" +#| msgid "Calendars" +msgid "Web Calendars" +msgstr "ୱେବ କ୍ୟାଲେଣ୍ଡରଗୁଡ଼ିକ" #: ../plugins/calendar-weather/calendar-weather.c:61 msgid "Weather: Fog" @@ -14895,7 +14851,7 @@ msgid "Imperial (Fahrenheit, inches, etc)" msgstr "ଇମ୍ପେରୀୟାଲ (ଫାରେନହାଇଟ, ଇଞ୍ଚ୍ସ, ଇତ୍ୟାଦି)" #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1 -msgid "Provides core functionality for weather calendars." +msgid "Add weather calendars to Evolution." msgstr "" #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2 @@ -14903,14 +14859,14 @@ msgid "Weather Calendars" msgstr "ପାଣିପାଗ କ୍ୟାଲେଣ୍ଡର" #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1 -msgid "" -"A test plugin which demonstrates a popup menu plugin which lets you copy " -"things to the clipboard." -msgstr "" +#| msgid "Copy tool" +msgid "Copy Tool" +msgstr "ଉପକରଣ ନକଲ କରନ୍ତୁ" #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3 -msgid "Copy tool" -msgstr "ଉପକରଣ ନକଲ କରନ୍ତୁ" +#| msgid "Copy selected messages to the clipboard" +msgid "Copy things to the clipboard." +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ କ୍ଲିପବୋର୍ଡରେ ନକଲ କରନ୍ତୁ" #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1 msgid "Check whether Evolution is the default mailer" @@ -14921,11 +14877,13 @@ msgid "Every time Evolution starts, check whether or not it is the default maile msgstr "ପ୍ରତ୍ଯେକ ଥର Evolution ଆରମ୍ଭ ହେଲେ, ଏହା ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ମେଲର କି ନୁହଁ ଯାଞ୍ଚ କରନ୍ତୁ।" #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1 -msgid "Checks whether Evolution is the default mail client on startup." -msgstr "" +#| msgid "Check whether Evolution is the default mailer" +msgid "Check whether Evolution is the default mail client on startup." +msgstr "Evolution ଗୋଟିଏ ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ମେଲର କି ନୁହଁ ଯାଞ୍ଚ କରନ୍ତୁ" #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2 -msgid "Default Mail Client " +#| msgid "Default Mail Client " +msgid "Default Mail Client" msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ମେଲ ଗ୍ରାହକ " #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1 @@ -14933,7 +14891,7 @@ msgid "Do you want to make Evolution your default e-mail client?" msgstr "Evolutionକୁ ଆପଣଙ୍କର ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଇ-ମେଲ ଗ୍ରହକ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?" #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2 -#: ../shell/main.c:599 +#: ../shell/main.c:601 msgid "Evolution" msgstr "କ୍ରମବିକାଶ " @@ -14958,9 +14916,7 @@ msgid "Default Sources" msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଉତ୍ସ" #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2 -msgid "" -"Provides functionality for marking a calendar or an address book as the " -"default one." +msgid "Mark your preferred address book and calendar as default." msgstr "" #: ../plugins/email-custom-header/email-custom-header.c:334 @@ -15009,7 +14965,8 @@ msgstr "ଇ-ଡାକ ଇଚ୍ଛାରୂପଣ ଶୀର୍ଷକ" #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2 -msgid "Adds custom header to outgoing messages." +#| msgid "Adds custom header to outgoing messages." +msgid "Add custom headers to outgoing mail messages." msgstr "ଯାଉଥିବା ସନ୍ଦେଶରେ ଇଚ୍ଛାରୂପଣ ଶୀର୍ଷକକୁ ଯୋଗ କରନ୍ତୁ।" #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3 @@ -15246,7 +15203,7 @@ msgstr "%s ପାଇଁ ଅନୁମତି" #. To translators: This is a part of the message to be sent to the delegatee #. summarizing the permissions assigned to him. #. -#: ../plugins/exchange-operations/exchange-delegates-user.c:329 +#: ../plugins/exchange-operations/exchange-delegates-user.c:330 msgid "" "This message was sent automatically by Evolution to inform you that you have " "been designated as a delegate. You can now send messages on my behalf." @@ -15254,28 +15211,28 @@ msgstr "" #. To translators: Another chunk of the same message. #. -#: ../plugins/exchange-operations/exchange-delegates-user.c:334 +#: ../plugins/exchange-operations/exchange-delegates-user.c:335 msgid "You have been given the following permissions on my folders:" msgstr "ଆପଣ ମୋର ଫୋଲଡରରେ ନିମ୍ନଲିଖିତ ଅନୁମତି ଦେଇଛନ୍ତି:" #. To translators: This message is included if the delegatee has been given access #. to the private items. #. -#: ../plugins/exchange-operations/exchange-delegates-user.c:352 +#: ../plugins/exchange-operations/exchange-delegates-user.c:355 msgid "You are also permitted to see my private items." msgstr "ମୋର ବ୍ୟକ୍ତିଗତ ବସ୍ତୁଗୁଡ଼ିକୁ ଦେଖିବା ପାଇଁ ଆପଣହ୍କ ପାଖରେ ଅନୁମତି ଅଛି।" #. To translators: This message is included if the delegatee has not been given access #. to the private items. #. -#: ../plugins/exchange-operations/exchange-delegates-user.c:359 +#: ../plugins/exchange-operations/exchange-delegates-user.c:362 msgid "However you are not permitted to see my private items." msgstr "ତଥାପି ଆପଣଙ୍କ ପାଖରେ ମୋର ବ୍ୟକ୍ତିଗତ ବସ୍ତୁଗୁଡ଼ିକୁ ଦେଖିବାର ଅନୁମତି ନାହିଁ।" -#: ../plugins/exchange-operations/exchange-delegates-user.c:391 -#, fuzzy, c-format +#: ../plugins/exchange-operations/exchange-delegates-user.c:394 +#, c-format msgid "You have been designated as a delegate for %s" -msgstr "ଆପଣ a ପାଇଁ" +msgstr "%s ପାଇଁ ଆପଣଙ୍କୁ ପ୍ରତିନିଧି ଭାବରେ ନିଯୁକ୍ତ କରାଯାଇଛି" #: ../plugins/exchange-operations/exchange-delegates.c:417 msgid "Delegate To" @@ -15364,7 +15321,7 @@ msgstr "କ ଅନୁମକୁ ସଂକ୍ଷିପ୍ତ କରନ୍ତୁ (_ #. Translators: This is used for permissions for for the folder Tasks. #: ../plugins/exchange-operations/exchange-delegates.glade.h:20 -#: ../plugins/itip-formatter/itip-view.c:1912 +#: ../plugins/itip-formatter/itip-view.c:1915 msgid "_Tasks:" msgstr "କାର୍ଯ୍ଯ (_T):" @@ -15480,8 +15437,8 @@ msgstr "ଚାଳକକୁ ଯୋଗକରନ୍ତୁ:" #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403 #: ../plugins/exchange-operations/exchange-send-options.c:410 -#: ../plugins/groupwise-features/proxy.c:935 -#: ../plugins/groupwise-features/share-folder.c:714 +#: ../plugins/groupwise-features/proxy.c:936 +#: ../plugins/groupwise-features/share-folder.c:718 msgid "Add User" msgstr "ଚାଳକକୁ ଯୋଗ କରନ୍ତୁ" @@ -15616,9 +15573,7 @@ msgid "Subscribe to Other User's Calendar" msgstr "ଅନ୍ଯାନ୍ଯ ଚାଳକ କ୍ଯାଲେଣ୍ଡରର ଗ୍ରାହକ ହୁଅନ୍ତୁ" #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1 -msgid "" -"A plugin that manages a collection of Exchange account specific operations " -"and features." +msgid "Activates the Evolution-Exchange extension package." msgstr "" #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2 @@ -15953,15 +15908,14 @@ msgid "The default command that must be used as the editor." msgstr "ସମ୍ପାଦକ ଭାବରେ ବ୍ୟବହୃତ ହେଉଥିବା ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ନିର୍ଦ୍ଦେଶ।" #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1 -msgid "" -"A plugin for using an external editor as the composer. You can send only " -"plain-text messages." -msgstr "" - -#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2 msgid "External Editor" msgstr "ବାହ୍ୟ ସମ୍ପାଦକ" +#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2 +#| msgid "Open a window for composing a mail message" +msgid "Use an external editor to compose plain-text mail messages." +msgstr "ମେଲ ସନ୍ଦେଶ ଲେଖିବା ପାଇଁ ଗୋଟିଏ ବାହ୍ୟ ସମ୍ପାଦକକୁ ବ୍ୟବହାର କରନ୍ତୁ" + #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1 msgid "Cannot create Temporary File" msgstr "ଅସ୍ଥାୟୀ ଫାଇଲ ସୃଷ୍ଟି କରିପାରିବେ ନାହିଁ" @@ -15979,10 +15933,9 @@ msgstr "" "ଚେଷ୍ଟାକରନ୍ତୁ।" #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4 -#, fuzzy #| msgid "External Editor" msgid "External editor still running" -msgstr "ବାହ୍ୟ ସମ୍ପାଦକ" +msgstr "ବାହ୍ୟ ସମ୍ପାଦକ ଏପର୍ଯ୍ୟନ୍ତ ଚାଲୁଅଛି" #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5 msgid "" @@ -16001,7 +15954,6 @@ msgid "Command to be executed to launch the editor: " msgstr "" #: ../plugins/external-editor/external-editor.c:110 -#, fuzzy #| msgid "" #| "For Emacs use \"xemacs\"\n" #| "For VI use \"gvim\"" @@ -16010,14 +15962,13 @@ msgid "" "For VI use \"gvim -f\"" msgstr "" "Emacs ବ୍ୟବହାର ପାଇଁ \"xemacs\"\n" -"VI ବ୍ୟବହାର ପାଇଁ \"gvim\"" +"VI ପାଇଁ \"gvim-f\" ବ୍ୟବହାର କରନ୍ତୁ" #: ../plugins/external-editor/external-editor.c:308 #: ../plugins/external-editor/external-editor.c:310 -#, fuzzy #| msgid "Compose in _External Editor" msgid "Compose in External Editor" -msgstr "ବାହ୍ୟ ସମ୍ପାଦକରେ ଲେଖନ୍ତୁ (_E)" +msgstr "ବାହ୍ୟ ସମ୍ପାଦକରେ ଲେଖନ୍ତୁ" #: ../plugins/face/face.c:59 msgid "Select a (48*48) png of size < 700bytes" @@ -16033,9 +15984,11 @@ msgstr "ମୁଖ (_F)" #: ../plugins/face/org-gnome-face.eplug.xml.h:1 msgid "" -"Attach Face header to outgoing messages. First time the user needs to " -"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/" -"faces This will be used in messages that are sent further." +"Attach a small picture of your face to outgoing messages.\n" +"\n" +"First time the user needs to configure a 48x48 PNG image. It is Base-64 " +"encoded and stored in ~/.evolution/faces. This will be used in subsequent " +"sent messages." msgstr "" #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56 @@ -16044,13 +15997,13 @@ msgid "Unsubscribing from folder \"%s\"" msgstr "ଫୋଲଡର \"%s\"ରୁ ଅସ୍ୱୀରୋକ୍ତି ଆଣନ୍ତୁ" #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1 -msgid "Allows unsubscribing of mail folders in the side bar context menu." -msgstr "" - -#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2 msgid "Unsubscribe Folders" msgstr "ଅସ୍ବୀକାରକ୍ତି ଫୋଲ୍ଡରଗୁଡ଼ିକ" +#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2 +msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree." +msgstr "" + #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3 msgid "_Unsubscribe" msgstr "ଅସ୍ବୀକାରକ୍ତି (_U)" @@ -16088,20 +16041,21 @@ msgid "Server" msgstr "ସର୍ଭର" #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1 -msgid "A plugin to setup Google Calendar and Contacts." -msgstr "Google କ୍ଯାଲେଣ୍ଡର ଏବଂ ଯୋଗାଯୋଗଗୁଡ଼ିକୁ ବିନ୍ୟାସ କରିବା ପାଇଁ ଗୋଟିଏ ପ୍ଲଗଇନ।" +msgid "Add Google Calendars to Evolution." +msgstr "" #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2 -msgid "Google sources" -msgstr "Google ଉତ୍ସଗୁଡ଼ିକ" +#| msgid "Gnome Calendar" +msgid "Google Calendars" +msgstr "Google କ୍ଯାଲେଣ୍ଡର" #: ../plugins/groupwise-account-setup/camel-gw-listener.c:456 msgid "Checklist" msgstr "ଯାଞ୍ଚ ତାଲିକା" #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1 -msgid "A plugin to setup GroupWise calendar and contacts sources." -msgstr "ସମୂହ ଅନୁସାରେ କ୍ଯାଲେଣ୍ଡର ଏବଂ ଯୋଗାଯୋଗ ଉତ୍ସଗୁଡ଼ିକୁ ବିନ୍ୟାସ କରିବା ପାଇଁ ଗୋଟିଏ ପ୍ଲଗଇନ।" +msgid "Add Novell GroupWise support to Evolution." +msgstr "" #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2 msgid "GroupWise Account Setup" @@ -16197,7 +16151,7 @@ msgid "Add Send Options to GroupWise messages" msgstr "ପଠାନ୍ତୁ ବିକଳ୍ପଗୁଡିକୁ ସମୂହ ଅନୁସାରେ ସନ୍ଦେଶଗୁଡ଼ିକ ଭାବରେ ଯୋଗକରନ୍ତୁ" #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1 -msgid "A plugin for the features in GroupWise accounts." +msgid "Fine-tune your GroupWise accounts." msgstr "" #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2 @@ -16253,31 +16207,22 @@ msgid "" msgstr "" #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3 -msgid "This is a recurring meeting" -msgstr "ଏହା ଗୋଟିଏ ପୁନଃପୌନିକ ସଭା" - -#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") -#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:5 -msgid "Would you like to accept it?" -msgstr "ଆପଣ ଏହାକୁ ଗ୍ରହଣ କରିବା ପାଇଁ ଚାହିଁବେ କି?" - -#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") -#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:7 -msgid "Would you like to decline it?" -msgstr "ଆପଣ ଏହାକୁ ପ୍ରତ୍ୟାକାନ କରିବା ପାଇଁ ଚାହିଁବେ କି?" - -#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:8 msgid "You cannot share this folder with the specified user "{0}"" msgstr "" -#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:9 +#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4 msgid "You have to specify a user name which you want to add to the list" msgstr "" -#: ../plugins/groupwise-features/process-meeting.c:52 +#: ../plugins/groupwise-features/process-meeting.c:54 msgid "Accept Tentatively" msgstr "ମନଇଚ୍ଛା ଗ୍ରହଣକରନ୍ତୁ" +#: ../plugins/groupwise-features/process-meeting.c:322 +#| msgid "_Delegate Meeting..." +msgid "Rese_nd Meeting..." +msgstr "ସାକ୍ଷାତକାର କୁ ପୁଣି ପଠାନ୍ତୁ (_n)..." + #: ../plugins/groupwise-features/properties.glade.h:1 msgid "Users:" msgstr " ଚାଳକମାନେ:" @@ -16301,7 +16246,7 @@ msgstr "ସହଭାଗ ଫୋଲଡର ବିଜ୍ଞାପନ" #: ../plugins/groupwise-features/properties.glade.h:8 msgid "The participants will receive the following notification.\n" -msgstr "" +msgstr "ଅଂଶଗ୍ରହଣକାରୀମାନେ ନିମ୍ନଲିଖିତ ବିଜ୍ଞପ୍ତି ଗ୍ରହଣ କରିବେ।\n" #: ../plugins/groupwise-features/properties.glade.h:12 msgid "_Not Shared" @@ -16332,29 +16277,24 @@ msgid "Con_tacts" msgstr "ସମ୍ପର୍କଗୁଡ଼ିକ (_t)" #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7 -#, fuzzy msgid "Modify _folders/options/rules/" -msgstr "ପରିବର୍ତ୍ତନ କର ବିକଳ୍ପ ମାନ" +msgstr "ଫୋଲଡ଼ର/ବିକଳ୍ପ/ନିୟମଗୁଡ଼ିକୁ/ ପରିବର୍ତ୍ତନ କରନ୍ତୁ (_f)" #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8 -#, fuzzy msgid "Read items marked _private" -msgstr "ପଢନ୍ତୁ ଆଇଟମ୍ଗୁଡିକ" +msgstr "ବ୍ୟକ୍ତିଗତ ଭାବରେ ଚିହ୍ନିତ ବସ୍ତୁଗୁଡ଼ିକୁ ପଢନ୍ତୁ (_p)" #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9 -#, fuzzy msgid "Reminder Notes" msgstr "ସ୍ମାରକ ଟିପପ୍ଣୀଗୁଡିକ" #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10 -#, fuzzy msgid "Subscribe to my _alarms" -msgstr "କିଣନ୍ତୁ କୁ" +msgstr "ମୋର ଚେତାବନୀକୁ କିଣନ୍ତୁ (_a)" #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11 -#, fuzzy msgid "Subscribe to my _notifications" -msgstr "କିଣନ୍ତୁ କୁ" +msgstr "ମୋର ବିଜ୍ଞପ୍ତିକୁ କିଣନ୍ତୁ (_n)" #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13 msgid "_Write" @@ -16362,10 +16302,9 @@ msgstr "ଲେଖନ୍ତୁ (_W)" #. To Translators: strip the part in front of the | and the | itself #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15 -#, fuzzy #| msgid "Permission denied" msgid "permission to read|_Read" -msgstr "ଅନୁମତି ନିଷିଦ୍ଧ" +msgstr "ପଢ଼ନ୍ତୁ (_R)" #. 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 #: ../plugins/groupwise-features/proxy-listing.glade.h:2 @@ -16373,243 +16312,210 @@ msgid "Proxy" msgstr "ପ୍ରକ୍ସି" #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1 -#, fuzzy msgid "Account Name" -msgstr " ହିସାବ ଖାତା ନାମ" +msgstr "ହିସାବ ଖାତା ନାମ" #. 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 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3 -#, fuzzy msgid "Proxy Login" msgstr "ପ୍ରକ୍ସି ଲଗଇନ" -#: ../plugins/groupwise-features/proxy-login.c:206 -#: ../plugins/groupwise-features/proxy-login.c:248 -#: ../plugins/groupwise-features/proxy.c:489 -#: ../plugins/groupwise-features/send-options.c:85 -#, fuzzy, c-format +#: ../plugins/groupwise-features/proxy-login.c:207 +#: ../plugins/groupwise-features/proxy-login.c:250 +#: ../plugins/groupwise-features/proxy.c:490 +#: ../plugins/groupwise-features/send-options.c:86 +#, c-format msgid "%sEnter password for %s (user %s)" -msgstr "ଗୁପ୍ତଶବ୍ଦ ପାଇଁ ବ୍ଯବହାରକାରୀ" +msgstr "%sପ୍ରବେଶ ସଂକେତ ଭରଣ କରନ୍ତୁ %s ପାଇଁ (ଚାଳକ %s)" #. 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 -#: ../plugins/groupwise-features/proxy-login.c:510 -#, fuzzy +#: ../plugins/groupwise-features/proxy-login.c:512 msgid "_Proxy Login..." -msgstr "ପ୍ରକ୍ସି ଲଗଇନ." +msgstr "ପ୍ରକ୍ସି ଲଗଇନ (_P)..." #. 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 -#: ../plugins/groupwise-features/proxy.c:690 -#, fuzzy +#: ../plugins/groupwise-features/proxy.c:691 msgid "The Proxy tab will be available only when the account is online." -msgstr "ପ୍ରକ୍ସି ଟ୍ଯାବ ଉପଲବ୍ଧ ଅଟେ." +msgstr "ଖାତା ଅନଲାଇନ ଥିବା ସମୟରେ ପ୍ରକ୍ସି ଟ୍ଯାବ ଉପଲବ୍ଧ ହେବ।" #. 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 -#: ../plugins/groupwise-features/proxy.c:696 -#, fuzzy +#: ../plugins/groupwise-features/proxy.c:697 msgid "The Proxy tab will be available only when the account is enabled." -msgstr "ପ୍ରକ୍ସି ଟ୍ଯାବ ଉପଲବ୍ଧ ଅଟେ." +msgstr "ଖାତା ସକ୍ରିୟ ଥିବା ସମୟରେ ପ୍ରକ୍ସି ଟ୍ଯାବ ଉପଲବ୍ଧ ହେବ।" -#: ../plugins/groupwise-features/send-options.c:214 -#, fuzzy +#: ../plugins/groupwise-features/send-options.c:215 msgid "Advanced send options" -msgstr "ଉନ୍ନତ ବିକଳ୍ପ ମାନ" +msgstr "ଉନ୍ନତ ପ୍ରେରଣ ବିକଳ୍ପମାନ" #: ../plugins/groupwise-features/share-folder-common.c:320 -#: ../plugins/groupwise-features/share-folder.c:749 +#: ../plugins/groupwise-features/share-folder.c:753 msgid "Users" msgstr "ଚାଳକ" #: ../plugins/groupwise-features/share-folder-common.c:321 -#, fuzzy msgid "Enter the users and set permissions" -msgstr "ପ୍ରବେଶ କରନ୍ତୁ (Enter) ଏବଂ ସେଟ" +msgstr "ଚାଳକମାନଙ୍କୁ ପ୍ରବେଶ କରାନ୍ତୁ ଏବଂ ଅନୁମତି ନିର୍ଦ୍ଧାରଣ କରନ୍ତୁ" #: ../plugins/groupwise-features/share-folder-common.c:340 -#, fuzzy msgid "New _Shared Folder..." -msgstr "ନୂତନ ସହଭାଗ କରାଯାଇଛି ଫୋଲଡର." +msgstr "ନୂତନ ସହଭାଗ ଫୋଲଡର (_S)..." #: ../plugins/groupwise-features/share-folder-common.c:448 msgid "Sharing" msgstr "ସହଭାଗ" -#: ../plugins/groupwise-features/share-folder.c:532 -#, fuzzy +#: ../plugins/groupwise-features/share-folder.c:536 #| msgid "Justification" msgid "Custom Notification" -msgstr "ଯଥାର୍ଥତା" +msgstr "ଇଚ୍ଛାମୁତାବକ ବିଜ୍ଞପ୍ତି" -#: ../plugins/groupwise-features/share-folder.c:754 -#, fuzzy +#: ../plugins/groupwise-features/share-folder.c:758 #| msgid "_Add " msgid "Add " -msgstr "ଯୋଗ କରନ୍ତୁ (_A)" +msgstr "ଯୋଗ କରନ୍ତୁ..." -#: ../plugins/groupwise-features/share-folder.c:760 -#, fuzzy +#: ../plugins/groupwise-features/share-folder.c:764 #| msgid "Modified" msgid "Modify" -msgstr "ପରିବର୍ତ୍ତନ କର" +msgstr "ପରିବର୍ତ୍ତନ କରନ୍ତୁ" #: ../plugins/groupwise-features/status-track.c:97 -#, fuzzy #| msgid "_Messages" msgid "Message Status" -msgstr "ସନ୍ଦେଶ (_M)" +msgstr "ସନ୍ଦେଶ ସ୍ଥିତି" #. Subject #: ../plugins/groupwise-features/status-track.c:111 -#, fuzzy #| msgid "By Su_bject" msgid "Subject:" -msgstr "ବିଷଯ:" +msgstr "ବିଷୟ:" #: ../plugins/groupwise-features/status-track.c:125 msgid "From:" msgstr "ଠାରୁ:" #: ../plugins/groupwise-features/status-track.c:140 -#, fuzzy #| msgid "Completion date" msgid "Creation date:" -msgstr "ସମ୍ପନ୍ନ ତାରିଖ" +msgstr "ନିର୍ମାଣ ତାରିଖ:" #: ../plugins/groupwise-features/status-track.c:179 -#, fuzzy #| msgid "Description:" msgid "Recipient: " -msgstr "ବର୍ଣ୍ଣନା:" +msgstr "ଗ୍ରହଣକର୍ତ୍ତା:" #: ../plugins/groupwise-features/status-track.c:186 -#, fuzzy #| msgid "_Delivered" msgid "Delivered: " -msgstr "ପଠାଗଲା (_D)" +msgstr "ପଠାଗଲା:" #: ../plugins/groupwise-features/status-track.c:192 -#, fuzzy #| msgid "Open" msgid "Opened: " -msgstr "ଖୋଲନ୍ତୁ" +msgstr "ଖୋଲାଅଛି:" #: ../plugins/groupwise-features/status-track.c:197 -#, fuzzy #| msgid "Accepted" msgid "Accepted: " -msgstr "ସ୍ବୀକୃତ" +msgstr "ସ୍ବୀକୃତ:" #: ../plugins/groupwise-features/status-track.c:202 -#, fuzzy #| msgid "Delete" msgid "Deleted: " -msgstr "ଅପସାରଣ କରନ୍ତୁ" +msgstr "ଅପସାରଣ କରାଯାଇଛି:" #: ../plugins/groupwise-features/status-track.c:207 -#, fuzzy #| msgid "Declined" msgid "Declined: " -msgstr "ଅସ୍ବୀକୃତ" +msgstr "ଅସ୍ବୀକୃତ: " #: ../plugins/groupwise-features/status-track.c:212 -#, fuzzy #| msgid "Completed " msgid "Completed: " -msgstr "ସମାପ୍ତ" +msgstr "ସମାପ୍ତ: " #: ../plugins/groupwise-features/status-track.c:217 -#, fuzzy #| msgid "_Delivered" msgid "Undelivered: " -msgstr "ପଠାଗଲା (_D)" +msgstr "ପଠାଗଲା:" #: ../plugins/groupwise-features/status-track.c:241 -#, fuzzy msgid "Track Message Status..." -msgstr "ଟ୍ରାକ ସନ୍ଦେଶ ଅବସ୍ଥିତି." +msgstr "ସନ୍ଦେଶ ଅବସ୍ଥିତି ଟ୍ରାକ କରନ୍ତୁ..." #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1 -#, fuzzy -msgid "A plugin to setup hula calendar sources." -msgstr "A କୁ ବ୍ଯବସ୍ଥା କାଲେଣ୍ଡର." +msgid "Add Hula support to Evolution." +msgstr "" #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2 -#, fuzzy -msgid "Hula Account Setup" -msgstr "Hula ହିସାବ ଖାତା ସେଟଅପ" +msgid "Hula Support" +msgstr "" #: ../plugins/imap-features/imap-headers.c:320 -#, fuzzy #| msgid "Custom _message" msgid "Custom Headers" -msgstr "ସନ୍ଦେଶକୁ ଇଚ୍ଛାରୂପଣ କରନ୍ତୁ (_m)" +msgstr "ଶୀର୍ଷକଗୁଡ଼ିକୁ ଇଚ୍ଛାମୁତାବକ କରନ୍ତୁ" #: ../plugins/imap-features/imap-headers.c:333 -#, fuzzy #| msgid "Header" msgid "IMAP Headers" -msgstr "ଶୀର୍ଷକ" +msgstr "IMAP ଶୀର୍ଷକଗୁଡ଼ିକ" #: ../plugins/imap-features/imap-headers.glade.h:1 -#, fuzzy #| msgid "Att_endees" msgid "Custom Headers" -msgstr "ଶ୍ରୋତା (_e)" +msgstr "ଶୀର୍ଷକଗୁଡ଼ିକୁ ଇଚ୍ଛାମୁତାବକ କରନ୍ତୁ" #: ../plugins/imap-features/imap-headers.glade.h:2 -#, fuzzy #| msgid "Att_endees" msgid "IMAP Headers" -msgstr "ଶ୍ରୋତା (_e)" +msgstr "IMAP ଶୀର୍ଷକଗୁଡ଼ିକ" #: ../plugins/imap-features/imap-headers.glade.h:3 -#, fuzzy msgid "Basic and _Mailing List Headers (Default)" -msgstr "ମୌଳିକ ଏବଂ ତାଲିକା ଶୀର୍ଷକଗୁଡିକ ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ" +msgstr "ମୌଳିକ ଏବଂ ମେଲ ତାଲିକା ଶୀର୍ଷକଗୁଡିକ (ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ) (_M)" #: ../plugins/imap-features/imap-headers.glade.h:4 -#, fuzzy #| msgid "Full Header" msgid "Fetch A_ll Headers" -msgstr "ସମ୍ପୂର୍ଣ୍ଣ ଶୀର୍ଷକ" +msgstr "ସମସ୍ତ ଶୀର୍ଷକଗୁଡ଼ିକୁ ଆଣନ୍ତୁ (_l)" #: ../plugins/imap-features/imap-headers.glade.h:5 -#, fuzzy msgid "" "Give the extra headers that you need to fetch in addition to the above " "standard headers. \n" "You can ignore this if you choose \"All Headers\"." -msgstr "କୁ ଇଞ୍ଚ କୁ ବିଷଯରେ ଏହା ସମସ୍ତ ଶୀର୍ଷକଗୁଡିକ." +msgstr "" #: ../plugins/imap-features/imap-headers.glade.h:7 -#, fuzzy msgid "" "Select your IMAP Header Preferences. \n" "The more headers you have the more time it will take to download." -msgstr "ମନୋନୀତ କର IMAP ଶୀର୍ଷକ ପସନ୍ଦ କୁ." +msgstr "" +"ଆପଣଙ୍କର IMAP ଶୀର୍ଷକ ପସନ୍ଦଗୁଡ଼ିକୁ ବାଛନ୍ତୁ। \n" +"ଆପଣଙ୍କ ପାଖରେ ଯେତେ ଅଧିକ ଶୀର୍ଷକ ଅଛି ଆହରଣ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ସେତେ ଅଧିକ ସମୟ ଲାଗିବ।" #: ../plugins/imap-features/imap-headers.glade.h:9 -#, fuzzy msgid "" "_Basic Headers - (Fastest) \n" "Use this if you do not have filters based on mailing lists" -msgstr "ମୌଳିକ ଶୀର୍ଷକଗୁଡିକ ଏହା ନୁହେଁ ରେ" +msgstr "" +"ମୌଳିକ ଶୀର୍ଷକଗୁଡିକ - (ତୀବ୍ରତର) (_B) \n" +"ମେଲ ତାଲିକା ଉପରେ ଆଧାରିତ ଛାଣକ ନଥିଲେ ଏହାକୁ ବ୍ୟବହାର କରନ୍ତୁ" #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1 -#, fuzzy -msgid "A plugin for the features in the IMAP accounts." -msgstr "A ପାଇଁ ଇଞ୍ଚ IMAP ଆକାଉଣ୍ଟ ଗୁଡିକ." +msgid "Fine-tune your IMAP accounts." +msgstr "" #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2 -#, fuzzy msgid "IMAP Features" -msgstr "IMAP ଲକ୍ଷଣଗୁଡିକ " +msgstr "IMAP ଲକ୍ଷଣଗୁଡିକ" #: ../plugins/ipod-sync/evolution-ipod-sync.c:49 -#, fuzzy msgid "Hardware Abstraction Layer not loaded" -msgstr "ହାର୍ଡୱେର ସ୍ତର ନୁହେଁ" +msgstr "ହାର୍ଡୱେର ଛାଣିବା ସ୍ତରକୁ ଧାରଣ କରାଯାଇନାହିଁ" #: ../plugins/ipod-sync/evolution-ipod-sync.c:50 #, fuzzy @@ -16619,9 +16525,8 @@ msgid "" msgstr "ଅଟେ ନୁହେଁ ଚାଲୁଅଛି ଦୟାକରି ସକ୍ରିୟ ଏବଂ ଏହା ପ୍ରୋଗ୍ରାମ କିମ୍ବା ସମ୍ପର୍କ ତନ୍ତ୍ର." #: ../plugins/ipod-sync/evolution-ipod-sync.c:83 -#, fuzzy msgid "Search for an iPod failed" -msgstr "ଖୋଜନ୍ତୁ ପାଇଁ" +msgstr "iPod ସନ୍ଧାନ ବିଫଳ ହୋଇଛି" #: ../plugins/ipod-sync/evolution-ipod-sync.c:84 #, fuzzy @@ -16636,223 +16541,205 @@ msgid "iCalendar format (.ics)" msgstr "" #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1 -#, fuzzy -msgid "Synchronize the selected task/memo/calendar/address book with Apple iPod" -msgstr "ସମକାଳୀନ ଚୟିତ କାଲେଣ୍ଡର ସହିତ " +msgid "Synchronize to iPod" +msgstr "iPod ସହିତ ସମକାଳୀନ କରନ୍ତୁ" #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2 -#, fuzzy -msgid "Synchronize to iPod" -msgstr "ସମକାଳୀନ କୁ" +msgid "Synchronize your data with your Apple iPod." +msgstr "Apple iPod ସହିତ ଆପଣଙ୍କର ତଥ୍ୟକୁ ସମକାଳୀନ କରନ୍ତୁ।" #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3 msgid "iPod Synchronization" msgstr "" -#: ../plugins/itip-formatter/itip-formatter.c:481 -#: ../plugins/itip-formatter/itip-formatter.c:606 -#, fuzzy, c-format +#: ../plugins/itip-formatter/itip-formatter.c:482 +#: ../plugins/itip-formatter/itip-formatter.c:607 +#, c-format msgid "Failed to load the calendar '%s'" -msgstr "ବିଫଳ ହୋଇଛି କୁ କାଲେଣ୍ଡର" +msgstr "କାଲେଣ୍ଡର '%s'କୁ ଧାରଣ କରିବାରେ ବିଫଳ ହୋଇଛି" -#: ../plugins/itip-formatter/itip-formatter.c:626 -#, fuzzy, c-format +#: ../plugins/itip-formatter/itip-formatter.c:627 +#, c-format msgid "An appointment in the calendar '%s' conflicts with this meeting" -msgstr "ଇଞ୍ଚ କାଲେଣ୍ଡର ସହିତ ଏହା" +msgstr "କ୍ୟାଲେଣ୍ଡର '%s' ରେ ଥିବା ଗୋଟିଏ ସାକ୍ଷାତକାର ଏହି ସାକ୍ଷାକତକାର ସହିତ ଦ୍ୱନ୍ଦ ସୃଷ୍ଟି କରୁଅଛି" -#: ../plugins/itip-formatter/itip-formatter.c:662 -#, fuzzy, c-format +#: ../plugins/itip-formatter/itip-formatter.c:663 +#, c-format msgid "Found the appointment in the calendar '%s'" -msgstr "ଇଞ୍ଚ କାଲେଣ୍ଡର" +msgstr "କ୍ୟାଲେଣ୍ଡର '%s' ରେ ଗୋଟିଏ ସାକ୍ଷାତକାର ମିଳିଲା" -#: ../plugins/itip-formatter/itip-formatter.c:752 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:753 msgid "Unable to find any calendars" -msgstr "କୁ ଖୋଜନ୍ତୁ କୌଣସି" +msgstr "କୌଣସି କ୍ୟାଲେଣ୍ଡରକୁ ଖୋଜିବାରେ ଅସମର୍ଥ" -#: ../plugins/itip-formatter/itip-formatter.c:759 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:760 msgid "Unable to find this meeting in any calendar" -msgstr "କୁ ଖୋଜନ୍ତୁ ଏହା ଇଞ୍ଚ କୌଣସି କାଲେଣ୍ଡର" +msgstr "କ୍ୟାଲେଣ୍ଡରରେ ଯେକୌଣସି ସାକ୍ଷାତକାରକୁ ଖୋଜିବାରେ ଅସମର୍ଥ" -#: ../plugins/itip-formatter/itip-formatter.c:763 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:764 msgid "Unable to find this task in any task list" -msgstr "କୁ ଖୋଜନ୍ତୁ ଏହା ଇଞ୍ଚ କୌଣସି ତାଲିକା" +msgstr "କୌଣସି କାର୍ଯ୍ୟ ସୂଚୀରେ ଏହି କାର୍ଯ୍ୟକୁ ଖୋଜିବାରେ ଅସମର୍ଥ" -#: ../plugins/itip-formatter/itip-formatter.c:767 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:768 #| msgid "Unable to open memos in '%s'." msgid "Unable to find this memo in any memo list" -msgstr "'%s' ରେ ସ୍ମାରକପତ୍ରକୁ ଖୋଲିବାରେ ଅସମର୍ଥ।" +msgstr "କୌଣସି ସ୍ମାରକପତ୍ର ତାଲିକାରେ ଏହି ସ୍ମାରକପତ୍ରକୁ ଖୋଜିବାରେ ଅସମର୍ଥ" -#: ../plugins/itip-formatter/itip-formatter.c:838 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:839 +#| msgid "Opening calendar" +msgid "Opening the calendar. Please wait.." +msgstr "କାଲେଣ୍ଡର ଖୋଲୁଅଛି। ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ.." + +#: ../plugins/itip-formatter/itip-formatter.c:842 msgid "Searching for an existing version of this appointment" -msgstr "ସନ୍ଧାନ କରୁଅଛି ପାଇଁ ର ଏହା" +msgstr "ଏହି ସାକ୍ଷାତକାରର ଗୋଟିଏ ସ୍ଥିତବାନ ସଂସ୍କରଣକୁ ସନ୍ଧାନ କରୁଅଛି" -#: ../plugins/itip-formatter/itip-formatter.c:1020 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1024 msgid "Unable to parse item" -msgstr "କୁ ବସ୍ତୁ" +msgstr "ବସ୍ତୁକୁ ବିଶ୍ଳେଷଣ କରିବାରେ ଅସମର୍ଥ" -#: ../plugins/itip-formatter/itip-formatter.c:1107 -#, fuzzy, c-format +#: ../plugins/itip-formatter/itip-formatter.c:1111 +#, c-format msgid "Unable to send item to calendar '%s'. %s" -msgstr "କୁ ବସ୍ତୁ କୁ କାଲେଣ୍ଡର" +msgstr "କାଲେଣ୍ଡର '%s'କୁ ବସ୍ତୁ ପଠାଇବାରେ ଅସମର୍ଥ। %s" -#: ../plugins/itip-formatter/itip-formatter.c:1119 -#, fuzzy, c-format +#: ../plugins/itip-formatter/itip-formatter.c:1123 +#, c-format msgid "Sent to calendar '%s' as accepted" -msgstr "ପଠାଯାଇଛି କୁ କାଲେଣ୍ଡର" +msgstr "ଗ୍ରହଣୀୟ ଭାବରେ କାଲେଣ୍ଡର '%s'କୁ ପଠାଯାଇଛି" -#: ../plugins/itip-formatter/itip-formatter.c:1123 -#, fuzzy, c-format +#: ../plugins/itip-formatter/itip-formatter.c:1127 +#, c-format msgid "Sent to calendar '%s' as tentative" -msgstr "ପଠାଯାଇଛି କୁ କାଲେଣ୍ଡର" +msgstr "ଅସ୍ଥାୟୀ ଭାବରେ କାଲେଣ୍ଡର '%s'କୁ ପଠାଯାଇଛି" -#: ../plugins/itip-formatter/itip-formatter.c:1128 -#, fuzzy, c-format +#: ../plugins/itip-formatter/itip-formatter.c:1132 +#, c-format msgid "Sent to calendar '%s' as declined" -msgstr "ପଠାଯାଇଛି କୁ କାଲେଣ୍ଡର" +msgstr "ଅସ୍ୱୀକୃତ ଭାବରେ କାଲେଣ୍ଡର '%s'କୁ ପଠାଯାଇଛି" -#: ../plugins/itip-formatter/itip-formatter.c:1133 -#, fuzzy, c-format +#: ../plugins/itip-formatter/itip-formatter.c:1137 +#, c-format msgid "Sent to calendar '%s' as canceled" -msgstr "ପଠାଯାଇଛି କୁ କାଲେଣ୍ଡର" +msgstr "ବାତିଲ ଭାବରେ କାଲେଣ୍ଡର '%s'କୁ ପଠାଯାଇଛି" -#: ../plugins/itip-formatter/itip-formatter.c:1227 -#, fuzzy, c-format +#: ../plugins/itip-formatter/itip-formatter.c:1231 +#, c-format msgid "Organizer has removed the delegate %s " -msgstr "ସଙ୍ଗଠକ " +msgstr "ଆୟୋଜକ ପ୍ରତିନିଧି %s କୁ କାଢ଼ିଦେଇଛନ୍ତି" -#: ../plugins/itip-formatter/itip-formatter.c:1234 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1238 msgid "Sent a cancelation notice to the delegate" -msgstr "ପଠାଯାଇଛି a କୁ" +msgstr "ପ୍ରତିନିଧିଙ୍କ ପାଖକୁ ବାତିଲ ହୋଇଥିବା ବିଜ୍ଞପ୍ତି ପଠାନ୍ତୁ" -#: ../plugins/itip-formatter/itip-formatter.c:1236 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1240 msgid "Could not send the cancelation notice to the delegate" -msgstr "ନୁହେଁ କୁ" +msgstr "ପ୍ରତିନିଧିଙ୍କ ପାଖକୁ ବାତିଲ ହୋଇଥିବା ବିଜ୍ଞପ୍ତି ପଠାଇ ପାରିଲା ନାହିଁ" -#: ../plugins/itip-formatter/itip-formatter.c:1342 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1348 msgid "Attendee status could not be updated because the status is invalid" -msgstr "ଶ୍ରୋତା ନୁହେଁ ଅଟେ ଅମାନ୍ଯ" +msgstr "ଶ୍ରୋତାମାନଙ୍କ ସ୍ଥିତିକୁ ଅଦ୍ୟତନ କରାଯାଇପାରିଲା ନାହିଁ କାରଣ ସ୍ଥିତିଟି ଅବୈଧ ଅଟେ" -#: ../plugins/itip-formatter/itip-formatter.c:1371 -#, fuzzy, c-format +#: ../plugins/itip-formatter/itip-formatter.c:1377 +#, c-format msgid "Unable to update attendee. %s" -msgstr "କୁ" +msgstr "ଶ୍ରୋତାମାନଙ୍କୁ ଅଦ୍ୟତନ କରିବାରେ ଅସମର୍ଥ. %s" -#: ../plugins/itip-formatter/itip-formatter.c:1375 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1381 msgid "Attendee status updated" -msgstr "ଶ୍ରୋତା" +msgstr "ଶ୍ରୋତାମାନଙ୍କ ସ୍ଥିତିକୁ ଅଦ୍ୟତନ କରାଯାଇଛି" -#: ../plugins/itip-formatter/itip-formatter.c:1401 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1407 #| msgid "Meeting Information" msgid "Meeting information sent" -msgstr "ସଭା ସୂଚନା" +msgstr "ସଭା ସୂଚନା ପଠାଯାଇଛି" -#: ../plugins/itip-formatter/itip-formatter.c:1404 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1410 #| msgid "Contact information" msgid "Task information sent" -msgstr "ସମ୍ପର୍କ ସୂଚନା" +msgstr "କାର୍ଯ୍ୟ ସୂଚନା ପଠାଯାଇଛି" -#: ../plugins/itip-formatter/itip-formatter.c:1407 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1413 #| msgid "Contact information" msgid "Memo information sent" -msgstr "ସମ୍ପର୍କ ସୂଚନା" +msgstr "ସ୍ମାରକ ପତ୍ର ସୂଚନା ପଠାଯାଇଛି" -#: ../plugins/itip-formatter/itip-formatter.c:1416 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1422 msgid "Unable to send meeting information, the meeting does not exist" -msgstr "କୁ ନୁହେଁ" +msgstr "ସଭା ସୂଚନା ପଠାଇବାରେ ଅସମର୍ଥ, ସଭା ଅବସ୍ଥିତ ନାହିଁ" -#: ../plugins/itip-formatter/itip-formatter.c:1419 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1425 msgid "Unable to send task information, the task does not exist" -msgstr "କୁ ନୁହେଁ" +msgstr "କାର୍ଯ୍ୟ ସୂଚନା ପଠାଇବାରେ ଅସମର୍ଥ, କାର୍ଯ୍ୟ ଅବସ୍ଥିତ ନାହିଁ" -#: ../plugins/itip-formatter/itip-formatter.c:1422 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1428 msgid "Unable to send memo information, the memo does not exist" -msgstr "କୁ ନୁହେଁ" +msgstr "ସ୍ମାରକପତ୍ର ସୂଚନା ପଠାଇବାରେ ଅସମର୍ଥ, ସ୍ମାରକପତ୍ର ଅବସ୍ଥିତ ନାହିଁ" -#: ../plugins/itip-formatter/itip-formatter.c:1491 -#: ../plugins/itip-formatter/itip-formatter.c:1502 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1497 +#: ../plugins/itip-formatter/itip-formatter.c:1508 msgid "The calendar attached is not valid" -msgstr "କାଲେଣ୍ଡର ଅଟେ ନୁହେଁ" +msgstr "ସଂଲଗ୍ନ କରାଯାଇଥିବା କାଲେଣ୍ଡର ବୈଧ ନୁହଁ" -#: ../plugins/itip-formatter/itip-formatter.c:1492 -#: ../plugins/itip-formatter/itip-formatter.c:1503 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1498 +#: ../plugins/itip-formatter/itip-formatter.c:1509 msgid "" "The message claims to contain a calendar, but the calendar is not a valid " "iCalendar." -msgstr "କୁ a କାଲେଣ୍ଡର କାଲେଣ୍ଡର ଅଟେ ନୁହେଁ a." +msgstr "" +"ସନ୍ଦେଶଟି ଗୋଟିଏ କ୍ୟାଲେଣ୍ଡର ଧାରଣ କରିଅଛି ବୋଲି ଅଭିଯୋଗ କରୁଅଛି, କିନ୍ତୁ କ୍ୟାଲେଣ୍ଡରଟି ଗୋଟିଏ " +"ବୈଧ iCalendar ନୁହଁ।" -#: ../plugins/itip-formatter/itip-formatter.c:1543 -#: ../plugins/itip-formatter/itip-formatter.c:1571 -#: ../plugins/itip-formatter/itip-formatter.c:1663 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1549 +#: ../plugins/itip-formatter/itip-formatter.c:1577 +#: ../plugins/itip-formatter/itip-formatter.c:1669 msgid "The item in the calendar is not valid" -msgstr "ବସ୍ତୁ ଇଞ୍ଚ କାଲେଣ୍ଡର ଅଟେ ନୁହେଁ" +msgstr "କାଲେଣ୍ଡର ଭିତରେ ଥିବା ବସ୍ତୁଟି ବୈଧ ନୁହଁ" -#: ../plugins/itip-formatter/itip-formatter.c:1544 -#: ../plugins/itip-formatter/itip-formatter.c:1572 -#: ../plugins/itip-formatter/itip-formatter.c:1664 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1550 +#: ../plugins/itip-formatter/itip-formatter.c:1578 +#: ../plugins/itip-formatter/itip-formatter.c:1670 msgid "" "The message does contain a calendar, but the calendar contains no events, " "tasks or free/busy information" -msgstr "a କାଲେଣ୍ଡର କାଲେଣ୍ଡର ଧାରଣ କରିଥାଏ ନାଁ କିମ୍ବା ମୁକ୍ତ" +msgstr "" -#: ../plugins/itip-formatter/itip-formatter.c:1583 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:1589 msgid "The calendar attached contains multiple items" -msgstr "କାଲେଣ୍ଡର ଧାରଣ କରିଥାଏ ଆଇଟମ୍ଗୁଡିକ" +msgstr "ସଂଲଗ୍ନ ହୋଇଥିବା କାଲେଣ୍ଡରଟି ଏକାଧିକ ବସ୍ତୁ ଧାରଣ କରିଅଛି" -#: ../plugins/itip-formatter/itip-formatter.c:1584 +#: ../plugins/itip-formatter/itip-formatter.c:1590 #, fuzzy msgid "" "To process all of these items, the file should be saved and the calendar " "imported" msgstr "କୁ ସମସ୍ତ ର ଆଇଟମ୍ଗୁଡିକ ଫାଇଲ ଏବଂ କାଲେଣ୍ଡର" -#: ../plugins/itip-formatter/itip-formatter.c:2306 +#: ../plugins/itip-formatter/itip-formatter.c:2319 msgid "This meeting recurs" msgstr "" -#: ../plugins/itip-formatter/itip-formatter.c:2309 +#: ../plugins/itip-formatter/itip-formatter.c:2322 msgid "This task recurs" msgstr "" -#: ../plugins/itip-formatter/itip-formatter.c:2312 +#: ../plugins/itip-formatter/itip-formatter.c:2325 msgid "This memo recurs" msgstr "" #. Delete message after acting #. FIXME Need a schema for this -#: ../plugins/itip-formatter/itip-formatter.c:2548 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:2561 msgid "_Delete message after acting" -msgstr "ବିଲୋପ କର ପରେ" +msgstr "କାର୍ୟ୍ୟ ସମାପ୍ତ ହେବା ପରେ ସନ୍ଦେଶକୁ ଅପସାରଣ କରନ୍ତୁ (_D)" -#: ../plugins/itip-formatter/itip-formatter.c:2558 -#: ../plugins/itip-formatter/itip-formatter.c:2590 -#, fuzzy +#: ../plugins/itip-formatter/itip-formatter.c:2571 +#: ../plugins/itip-formatter/itip-formatter.c:2604 msgid "Conflict Search" -msgstr "ବିରୋଧ ଖୋଜନ୍ତୁ" +msgstr "ଦ୍ୱନ୍ଦ ସନ୍ଧାନ" #. Source selector -#: ../plugins/itip-formatter/itip-formatter.c:2573 +#: ../plugins/itip-formatter/itip-formatter.c:2586 #, fuzzy msgid "Select the calendars to search for meeting conflicts" msgstr "ମନୋନୀତ କର କୁ ପାଇଁ" @@ -17242,113 +17129,113 @@ msgid "%s has canceled the following shared memo:" msgstr "%s ନିମ୍ନଲିଖିତ ସହଭାଗୀ ମେମୋକୁ ବାତିଲ କରିଛି:" #. Everything gets the open button -#: ../plugins/itip-formatter/itip-view.c:821 +#: ../plugins/itip-formatter/itip-view.c:824 msgid "_Open Calendar" msgstr "କ୍ଯାଲେଣ୍ଡର ଖୋଲନ୍ତୁ (_O)" -#: ../plugins/itip-formatter/itip-view.c:827 -#: ../plugins/itip-formatter/itip-view.c:831 -#: ../plugins/itip-formatter/itip-view.c:837 -#: ../plugins/itip-formatter/itip-view.c:854 -#: ../plugins/itip-formatter/itip-view.c:859 +#: ../plugins/itip-formatter/itip-view.c:830 +#: ../plugins/itip-formatter/itip-view.c:834 +#: ../plugins/itip-formatter/itip-view.c:840 +#: ../plugins/itip-formatter/itip-view.c:857 +#: ../plugins/itip-formatter/itip-view.c:862 msgid "_Decline" msgstr "_ଅସ୍ବୀକାର" -#: ../plugins/itip-formatter/itip-view.c:828 -#: ../plugins/itip-formatter/itip-view.c:833 -#: ../plugins/itip-formatter/itip-view.c:840 -#: ../plugins/itip-formatter/itip-view.c:856 -#: ../plugins/itip-formatter/itip-view.c:861 +#: ../plugins/itip-formatter/itip-view.c:831 +#: ../plugins/itip-formatter/itip-view.c:836 +#: ../plugins/itip-formatter/itip-view.c:843 +#: ../plugins/itip-formatter/itip-view.c:859 +#: ../plugins/itip-formatter/itip-view.c:864 msgid "_Accept" msgstr "_ସ୍ବୀକାର କର" -#: ../plugins/itip-formatter/itip-view.c:831 +#: ../plugins/itip-formatter/itip-view.c:834 msgid "_Decline all" msgstr "ସମସ୍ତଙ୍କୁ ହ୍ରାସ କରନ୍ତୁ (_D)" -#: ../plugins/itip-formatter/itip-view.c:832 +#: ../plugins/itip-formatter/itip-view.c:835 msgid "_Tentative all" msgstr "ସମସ୍ତ ଚେଷ୍ଟାକୃତ (_T)" -#: ../plugins/itip-formatter/itip-view.c:832 -#: ../plugins/itip-formatter/itip-view.c:838 -#: ../plugins/itip-formatter/itip-view.c:855 -#: ../plugins/itip-formatter/itip-view.c:860 +#: ../plugins/itip-formatter/itip-view.c:835 +#: ../plugins/itip-formatter/itip-view.c:841 +#: ../plugins/itip-formatter/itip-view.c:858 +#: ../plugins/itip-formatter/itip-view.c:863 msgid "_Tentative" msgstr "ଚେଷ୍ଟାକୃତ (_T)" -#: ../plugins/itip-formatter/itip-view.c:833 +#: ../plugins/itip-formatter/itip-view.c:836 msgid "_Accept all" msgstr "ସମସ୍ତଙ୍କୁ ଗ୍ରହଣକରନ୍ତୁ (_A)" #. FIXME Is this really the right button? -#: ../plugins/itip-formatter/itip-view.c:844 +#: ../plugins/itip-formatter/itip-view.c:847 msgid "_Send Information" msgstr "ସୂଚନା ପଠାନ୍ତୁ (_S)" #. FIXME Is this really the right button? -#: ../plugins/itip-formatter/itip-view.c:848 +#: ../plugins/itip-formatter/itip-view.c:851 msgid "_Update Attendee Status" msgstr "ଅଂଶଗ୍ରହଣକର୍ତ୍ତା ସ୍ଥିତିକୁ ଅଦ୍ୟତନ କରନ୍ତୁ (_U)" -#: ../plugins/itip-formatter/itip-view.c:851 +#: ../plugins/itip-formatter/itip-view.c:854 msgid "_Update" msgstr "ଅଦ୍ଯତନ (_U)" #. Start time -#: ../plugins/itip-formatter/itip-view.c:1031 +#: ../plugins/itip-formatter/itip-view.c:1034 msgid "Start time:" msgstr "ଆରମ୍ଭ ସମୟ:" #. End time -#: ../plugins/itip-formatter/itip-view.c:1042 +#: ../plugins/itip-formatter/itip-view.c:1045 msgid "End time:" msgstr "ସମାପ୍ତି ସମୟ:" #. Comment -#: ../plugins/itip-formatter/itip-view.c:1062 -#: ../plugins/itip-formatter/itip-view.c:1116 +#: ../plugins/itip-formatter/itip-view.c:1065 +#: ../plugins/itip-formatter/itip-view.c:1119 msgid "Comment:" msgstr "ଟିପ୍ପଣୀ:" -#: ../plugins/itip-formatter/itip-view.c:1101 +#: ../plugins/itip-formatter/itip-view.c:1104 msgid "Send _reply to sender" msgstr "ପ୍ରେରକଙ୍କ ପାଖକୁ ଉତ୍ତର ପଠାନ୍ତୁ (_r)" -#: ../plugins/itip-formatter/itip-view.c:1131 +#: ../plugins/itip-formatter/itip-view.c:1134 msgid "Send _updates to attendees" msgstr "ଅଂଶଗ୍ରହଣକାରୀଙ୍କ ପାଖକୁ ଅଦ୍ୟତନଗୁଡ଼ିକୁ ପଠାନ୍ତୁ (_u)" -#: ../plugins/itip-formatter/itip-view.c:1140 -#| msgid "All Instances" +#: ../plugins/itip-formatter/itip-view.c:1143 msgid "_Apply to all instances" msgstr "ସମସ୍ତ ଦ୍ରୁଷ୍ଟାନ୍ତରେ ପ୍ରୟୋଗ କରନ୍ତୁ (_A)" -#: ../plugins/itip-formatter/itip-view.c:1149 +#: ../plugins/itip-formatter/itip-view.c:1152 #, fuzzy #| msgid "Show Side _Bar" msgid "Show time as _free" msgstr "ପାର୍ଶ୍ବ ପଟିକୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ (_B)" -#: ../plugins/itip-formatter/itip-view.c:1152 +#: ../plugins/itip-formatter/itip-view.c:1155 #, fuzzy msgid "_Preserve my reminder" msgstr "ସଂରକ୍ଷଣ" #. To Translators: This is a check box to inherit a reminder. -#: ../plugins/itip-formatter/itip-view.c:1158 +#: ../plugins/itip-formatter/itip-view.c:1161 #, fuzzy #| msgid "Sh_ow a reminder" msgid "_Inherit reminder" msgstr "ଗୋଟିଏ ସ୍ମାରକପତ୍ର ଦେଖାନ୍ତୁ (_o)" -#: ../plugins/itip-formatter/itip-view.c:1914 -#| msgid "_Memos" +#: ../plugins/itip-formatter/itip-view.c:1917 msgid "_Memos:" msgstr "ସ୍ମାରକପତ୍ର (_M):" #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1 -msgid "Displays text/calendar parts in messages." +#, fuzzy +#| msgid "Displays text/calendar parts in messages." +msgid "Display \"text/calendar\" MIME parts in mail messages." msgstr "ପାଠ୍ଯ/କାଲେଣ୍ଡର ଅଂଶବିଶେଷକୁ ସନ୍ଦେଶରେ ଦର୍ଶାନ୍ତୁ।" #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2 @@ -17375,15 +17262,14 @@ msgid "Proxy _Logout" msgstr "ପ୍ରକ୍ସି ଲଗଆଉଟ (_L)" #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1 -msgid "Allows disabling of accounts." -msgstr "ଖାତାଗୁଡ଼ିକର ନିଷ୍କ୍ରିୟତାକୁ ଅନୁମତି ଦିଅନ୍ତୁ।" - -#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2 msgid "Disable Account" msgstr "ଖାତାକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ" +#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2 +msgid "Disable an account by right-clicking on it in the folder tree." +msgstr "" + #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1 -#| msgid "Select sound file" msgid "Beep or play sound file." msgstr "ଶବ୍ଦ ଫାଇଲକୁ ଦପଦପ କରନ୍ତୁ ଅଥବା ଚଲାନ୍ତୁ। " @@ -17427,7 +17313,6 @@ msgid "Show new mail icon in notification area when new messages arrive." msgstr "ନୂତନ ସନ୍ଦେଶ ଆସିବା ସମୟରେ ବିଜ୍ଞପ୍ତି କ୍ଷେତ୍ରରେ ନୂତନ ମେଲ ଚିତ୍ରସଂକେତକୁ ଦର୍ଶାନ୍ତୁ।" #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11 -#| msgid "No filename provided." msgid "Sound file name to be played." msgstr "ଚଲାଇବା ପାଇଁ ଧ୍ୱନି ଫାଇଲ ନାମ।" @@ -17456,7 +17341,6 @@ msgid "Generate a _D-Bus message" msgstr "D-Bus ସନ୍ଦେଶ ସୃଷ୍ଟି କରୁଅଛି (_D)" #: ../plugins/mail-notification/mail-notification.c:379 -#| msgid "New Mail Notification" msgid "Evolution's Mail Notification" msgstr "Evolution ର ମେଲ ବିଜ୍ଞପ୍ତି" @@ -17537,16 +17421,15 @@ msgid "Notify new messages for _Inbox only" msgstr "ସୂଚୀତ କରନ୍ତୁ ନୂତନ ପାଇଁ ଇନବକ୍ସ" #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1 -#, fuzzy -msgid "" -"Generates a D-Bus message or notifies the user with an icon in notification " -"area and a notification message whenever a new message has arrived." -msgstr "a D ବସ କିମ୍ବା ବ୍ଯବହାରକାରୀ ସହିତ ଚିତ୍ରସଙ୍କେତ ଇଞ୍ଚ ଏବଂ a a ନୂତନ." - -#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2 msgid "Mail Notification" msgstr "ଡାକ ସୂଚନା" +#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2 +#, fuzzy +#| msgid "Play sound when new messages arrive." +msgid "Notifies you when new mail messages arrive." +msgstr "ନୂତନ ସନ୍ଦେଶ ଆସିବା ସମୟରେ ଧ୍ୱନି ଚଲାନ୍ତୁ।" + #: ../plugins/mail-to-task/mail-to-task.c:343 #, c-format msgid "Cannot open calendar. %s" @@ -17575,22 +17458,19 @@ msgstr "ଚୟିତ ଉତ୍ସ ଅଟେ ପଢନ୍ତୁ ମନୋନୀ #: ../plugins/mail-to-task/mail-to-task.c:455 #, c-format -#| msgid "Could not update object" msgid "Could not create object. %s" msgstr "ବସ୍ତୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ। %s" #: ../plugins/mail-to-task/mail-to-task.c:555 #, c-format -#| msgid "Cannot open source \"{2}\"." msgid "Cannot get source list. %s" msgstr "ଉତ୍ସ ତାଲିକାକୁ ପ୍ରାପ୍ତ କରିପାରିବେ ନାହିଁ। %s" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1 #, fuzzy -msgid "" -"A plugin which allows the creation of tasks from the contents of a mail " -"message." -msgstr "A ର ଠାରୁ ର a ଡାକ." +#| msgid "Convert the selected message to a new task" +msgid "Convert a mail message to a task." +msgstr "ବଚ୍ଛିତ ସନ୍ଦେଶକୁ ଗୋଟିଏ ନୂତନ ତାଲିକାରେ ରୂପାନ୍ତର କରନ୍ତୁ" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5 @@ -17613,7 +17493,9 @@ msgid "Convert to an _Event" msgstr "ଗୋଟିଏ ଘଟଣାକୁ ରୂପାନ୍ତର କରନ୍ତୁ (_E)" #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6 -msgid "Mail to task" +#, fuzzy +#| msgid "Mail to task" +msgid "Mail-to-Task" msgstr "କାର୍ଯ୍ୟକୁ ମେଲ" #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1 @@ -17655,7 +17537,7 @@ msgstr "ମେଲ ତାଲିକା (_L)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6 #, fuzzy -msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)." +msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)." msgstr "ପାଇଁ ତାଲିକା." #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7 @@ -17823,21 +17705,24 @@ msgid "Mark Me_ssages as Read" msgstr "ସନ୍ଦେଶ ମାନଙ୍କୁ ପଢିସାରିଲେ ବୋଲି ଚିହ୍ନିତ କରନ୍ତୁ (_s)" #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3 -msgid "Used for marking all the messages under a folder as read" -msgstr "ଗୋଟିଏ ଫୋଲଡର ଅନ୍ତର୍ଗତ ସମସ୍ତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ପଠିତ ବୋଲି ଚିହ୍ନଟ କରିବା ପାଇଁ ବ୍ୟବହୃତ ହୋଇଥାଏ" +#, fuzzy +#| msgid "Mark all messages in the folder as read" +msgid "Mark all messages in a folder as read." +msgstr "ସନ୍ଦେଶ ମାନଙ୍କୁ ପଢିସାରିଲେ ବୋଲି ଚିହ୍ନିତ କରନ୍ତୁ" #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1 -msgid "A plugin which implements mono plugins." -msgstr "ମନୋ ପ୍ଲଗଇନଗୁଡ଼ିକୁ କାର୍ଯ୍ୟକାରୀ କରୁଥିବା ଗୋଟିଏ ପ୍ଲଗଇନ।" - -#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2 msgid "Mono Loader" msgstr "ମନୋ ଧାରଣ କର୍ତ୍ତା" +#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2 +msgid "Support plugins written in Mono." +msgstr "" + #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1 #, fuzzy -msgid "A plugin for managing which plugins are enabled or disabled." -msgstr "A ପାଇଁ କିମ୍ବା." +#| msgid "Change Evolution's settings" +msgid "Manage your Evolution plugins." +msgstr "Evolutionର ବିନ୍ଯାସକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" #. Setup the ui #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2 @@ -17874,24 +17759,21 @@ msgstr "ସମୀକ୍ଷା" msgid "Plugin" msgstr "ପ୍ଲଗ-ଇନ" -#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1 -#, fuzzy -msgid "" -"A test plugin which demonstrates a formatter plugin which lets you choose to " -"disable HTML messages.\n" -"\n" -"This plugin is unsupported demonstration code only.\n" -msgstr "A a କୁ ନିଷ୍କ୍ରିୟ HTML ନାଁ ଅଟେ ନାଁ" - #. but then we also need to create our own section frame -#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6 +#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2 msgid "Plain Text Mode" msgstr "ସାଧାରଣ ପାଠ୍ଯ ଧାରା" -#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7 -msgid "Prefer plain-text" +#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3 +#, fuzzy +#| msgid "Prefer plain-text" +msgid "Prefer Plain Text" msgstr "ସାଧାରଣ-ପାଠ୍ଯକୁ ପସନ୍ଦ କରନ୍ତୁ" +#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4 +msgid "View mail messages as plain text, even if they contain HTML content." +msgstr "" + #: ../plugins/prefer-plain/prefer-plain.c:189 msgid "Show HTML if present" msgstr "ଉପସ୍ଥିତ ଥିଲେ HTML କୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ" @@ -17913,9 +17795,8 @@ msgid "Evolution Profiler" msgstr "Evolution ରେଖାଚିତ୍ରଣ" #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2 -#, fuzzy -msgid "Writes a log of profiling data events." -msgstr "a ର ତଥ୍ଯ." +msgid "Profile data events in Evolution (for developers only)." +msgstr "" #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1 msgid "Import Outlook messages from PST file" @@ -17949,17 +17830,19 @@ msgid "Importing Outlook data" msgstr "Outlook ତଥ୍ୟକୁ ଆମଦାନୀ କରୁଅଛି" #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1 -msgid "Allows calendars to be published to the web" -msgstr "କ୍ୟାଲେଣ୍ଡରକୁ ୱେବରେ ପ୍ରକାଶନ କରିବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ" - -#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2 msgid "Calendar Publishing" msgstr "କ୍ଯାଲେଣ୍ଡର ପ୍ରକାଶନ କରୁଅଛି" -#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3 +#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2 msgid "Locations" msgstr "ଅବସ୍ଥାନ" +#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3 +#, fuzzy +#| msgid "Allows calendars to be published to the web" +msgid "Publish calendars to the web." +msgstr "କ୍ୟାଲେଣ୍ଡରକୁ ୱେବରେ ପ୍ରକାଶନ କରିବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ" + #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1 msgid "_Publish Calendar Information" msgstr "କ୍ଯାଲେଣ୍ଡର ସୂଚନା ପ୍ରକାଶନ କରନ୍ତୁ (_P)" @@ -17967,13 +17850,11 @@ msgstr "କ୍ଯାଲେଣ୍ଡର ସୂଚନା ପ୍ରକାଶନ କ #: ../plugins/publish-calendar/publish-calendar.c:95 #: ../plugins/publish-calendar/publish-calendar.c:329 #, c-format -#| msgid "Could not open source" msgid "Could not open %s:" msgstr "%s କୁ ଖୋଲିହେଲା ନାହିଁ:" #: ../plugins/publish-calendar/publish-calendar.c:97 #, c-format -#| msgid "Could not parse PGP message: Unknown error" msgid "Could not open %s: Unknown error" msgstr "%s କୁ ଖୋଲିହେଲା ନାହିଁ: ଅଜଣା ତ୍ରୁଟି" @@ -17997,7 +17878,6 @@ msgid "Are you sure you want to remove this location?" msgstr "ଆପଣ ନିଶ୍ଚିତ କି ଆପଣ ଏହି ଅବସ୍ଥାନକୁ ଅପସାରଣ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି?" #: ../plugins/publish-calendar/publish-calendar.c:776 -#| msgid "Could not create message." msgid "Could not create publish thread." msgstr "ପ୍ରକାଶନ ଥ୍ରେଡ ସୃଷ୍ଟି କରିହେଲା ନାହିଁ।" @@ -18058,7 +17938,6 @@ msgid "Service _type:" msgstr "ସେବାର ପ୍ରକାର (_t):" #: ../plugins/publish-calendar/publish-calendar.glade.h:21 -#| msgid "Time _zone:" msgid "Time _duration:" msgstr "ସମୟ ଅବଧି (_d):" @@ -18106,11 +17985,11 @@ msgstr "" msgid "Could not publish calendar: Calendar backend no longer exists" msgstr "କ୍ୟାଲେଣ୍ଡର ପ୍ରକାଶନ କରିହେଲା ନାହିଁ: କ୍ୟାଲେଣ୍ଡର ପୃଷ୍ଠଭୂମି ଏବେ ଅବସ୍ଥିତ ନାହିଁ" -#: ../plugins/publish-calendar/url-editor-dialog.c:480 +#: ../plugins/publish-calendar/url-editor-dialog.c:481 msgid "New Location" msgstr "ନୂତନ ଅବସ୍ଥାନ" -#: ../plugins/publish-calendar/url-editor-dialog.c:482 +#: ../plugins/publish-calendar/url-editor-dialog.c:483 msgid "Edit Location" msgstr "ଅବସ୍ଥାନକୁ ସମ୍ପାଦନ କରନ୍ତୁ" @@ -18138,68 +18017,65 @@ msgstr "Python ବ୍ୟବହାର କରି ଲିଖିତ ଅନ୍ୟା msgid "Python Loader" msgstr "Python ଧାରଣକର୍ତ୍ତା" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:111 -msgid "SpamAssassin (built-in)" -msgstr "SpamAssassin (ସୁନିର୍ମିତ)" - -#: ../plugins/sa-junk-plugin/em-junk-filter.c:137 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:128 #, c-format msgid "SpamAssassin not found, code: %d" msgstr "SpamAssassin ମିଳୁନାହିଁ, ସଂକେତ: %d" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:145 -#: ../plugins/sa-junk-plugin/em-junk-filter.c:153 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:136 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:144 #, c-format msgid "Failed to create pipe: %s" msgstr "ପାଇପ ନିର୍ମାଣ କରିବାରେ ବିଫଳ: %s" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:192 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:183 #, c-format msgid "Error after fork: %s" msgstr "ବିଭାଜନ ପରେ ତ୍ରୁଟି: %s" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:247 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:238 #, c-format msgid "SpamAssassin child process does not respond, killing..." msgstr "SpamAssassin ନିମ୍ନସ୍ତର ପଦ୍ଧତି ଉତ୍ତର ଦେଉନାହିଁ, ବନ୍ଦ କରୁଅଛି..." -#: ../plugins/sa-junk-plugin/em-junk-filter.c:249 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:240 #, c-format msgid "Wait for SpamAssassin child process interrupted, terminating..." msgstr "SpamAssassin ନିମ୍ନସ୍ତର ପଦ୍ଧତି ବାଧାପ୍ରାପ୍ତ ପାଇଁ ଅପେକ୍ଷା କରନ୍ତୁ, ସମାପ୍ତ କରୁଅଛି..." -#: ../plugins/sa-junk-plugin/em-junk-filter.c:258 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:249 #, c-format msgid "Pipe to SpamAssassin failed, error code: %d" msgstr "SpamAssassin କୁ ପାଇପ ବିଫଳ ହୋଇଛି, ତ୍ରୁଟି ସଂକେତ: %d" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:521 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:512 #, c-format msgid "SpamAssassin is not available." msgstr "SpamAssassin ଉପଲବ୍ଧ ନାହିଁ।" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:913 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:910 msgid "This will make SpamAssassin more reliable, but slower" msgstr "ଏହା SpamAssassin କୁ ଅଧିକ ଭରସାଯୋଗ୍ୟ କରିଥାଏ, କିନ୍ତୁ ମନ୍ଥର" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:919 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:916 msgid "I_nclude remote tests" msgstr "ସୂଦୂର ପରୀକ୍ଷଣକୁ ଅନ୍ତର୍ଭୁକ୍ତ କରନ୍ତୁ (_n)" #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1 #, fuzzy -msgid "" -"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin " -"to be installed." -msgstr "ଫିଲ୍ଟରଗୁଡିକ କୁ." +#| msgid "Filters junk messages using Bogofilter." +msgid "Filter junk messages using SpamAssassin." +msgstr "Bogofilter ବ୍ୟବହାର କରି ଜଙ୍କ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଛାଣନ୍ତୁ।" #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2 -msgid "SpamAssassin Options" -msgstr "SpamAssassin ବିକଳ୍ପଗୁଡିକ" +#, fuzzy +#| msgid "SpamAssassin junk plugin" +msgid "SpamAssassin Junk Filter" +msgstr "SpamAssassin ଜଙ୍କ ପ୍ଲଗଇନ" #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3 -msgid "SpamAssassin junk plugin" -msgstr "SpamAssassin ଜଙ୍କ ପ୍ଲଗଇନ" +msgid "SpamAssassin Options" +msgstr "SpamAssassin ବିକଳ୍ପଗୁଡିକ" #. #. * Translator: the %F %T is the thirth argument for a strftime function. @@ -18282,7 +18158,9 @@ msgid "Save Selected" msgstr "ବଚ୍ଛିତକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ" #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2 -msgid "Saves selected calendar or tasks list to disk." +#, fuzzy +#| msgid "Saves selected calendar or tasks list to disk." +msgid "Save a calendar or task list to disk." msgstr "ଚୟିତ କାଲେଣ୍ଡର କିମ୍ବା କାର୍ଯ୍ୟ ତାଲିକାକୁ ଡିସ୍କରେ ସଂରକ୍ଷଣ କରିଥାଏ।" #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3 @@ -18307,12 +18185,16 @@ msgid "Select destination file" msgstr "ଲକ୍ଷ୍ଯ ସ୍ଥଳ ଫାଇଲ ମନୋନୀତ କରନ୍ତୁ" #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1 -msgid "Select one source" -msgstr "ଗୋଟିଏ ଉତ୍ସ ମନୋନୀତ କରନ୍ତୁ" +#, fuzzy +#| msgid "Selects a single calendar or task source for viewing." +msgid "Quickly select a single calendar or task list for viewing." +msgstr "ଦେଖିବା ପାଇଁ ଗୋଟିଏ କ୍ୟାଲେଣ୍ଡର କିମ୍ବା କାର୍ଯ୍ୟ ଉତ୍ସ ବାଛନ୍ତୁ।" #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2 -msgid "Selects a single calendar or task source for viewing." -msgstr "ଦେଖିବା ପାଇଁ ଗୋଟିଏ କ୍ୟାଲେଣ୍ଡର କିମ୍ବା କାର୍ଯ୍ୟ ଉତ୍ସ ବାଛନ୍ତୁ।" +#, fuzzy +#| msgid "Select one source" +msgid "Select One Source" +msgstr "ଗୋଟିଏ ଉତ୍ସ ମନୋନୀତ କରନ୍ତୁ" #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3 msgid "Show _only this Calendar" @@ -18380,8 +18262,10 @@ msgid "Please wait" msgstr "ଦଯାକରି ଅପେକ୍ଷାକର" #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1 -msgid "Indicates if threading of messages should fall back to subject." -msgstr "ଯଦି ସନ୍ଦେଶଗୁଡ଼ିକର ବନ୍ଧନ ବିଷୟ ଅନୁସାରେ ପଡ଼ିଥାଏ ତେବେ ସୂଚାନ୍ତୁ।" +#, fuzzy +#| msgid "Thread messages by subject" +msgid "Sort mail message threads by subject." +msgstr "ସନ୍ଦେଶଗୁଡ଼ିକୁ ବିଷୟ ଅନୁସାରେ ବାନ୍ଧନ୍ତୁ" #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2 msgid "Subject Threading" @@ -18400,9 +18284,7 @@ msgstr "ସନ୍ଦେଶଗୁଡ଼ିକୁ ବିଷୟ ଅନୁସାର msgid "" "List of keyword/value pairs for the Templates plugin to substitute in a " "message body." -msgstr "" -"ଗୋଟିଏ ସନ୍ଦେଶ ଭିତରେ ନମୁନା ପ୍ଲଗଇନକୁ ବଦଳାଇବା ପାଇଁ ସୂଚକ " -"ଶବ୍ଦ/ମୂଲ୍ୟର ତାଲିକା।" +msgstr "ଗୋଟିଏ ସନ୍ଦେଶ ଭିତରେ ନମୁନା ପ୍ଲଗଇନକୁ ବଦଳାଇବା ପାଇଁ ସୂଚକ ଶବ୍ଦ/ମୂଲ୍ୟର ତାଲିକା।" #: ../plugins/templates/templates.c:603 msgid "No title" @@ -18421,16 +18303,61 @@ msgid "Drafts based template plugin" msgstr "ଡ୍ରାଫ୍ଟ ଆଧାରିତ ନମୁନା ପ୍ଲଗଇନ" #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1 -msgid "A simple plugin which uses yTNEF to decode TNEF attachments." -msgstr "TNEF ସଂଲଗ୍ନକକୁ ସାଙ୍କେତିକରଣ କରିବା ପାଇଁ ବ୍ୟବହୃତ ସରଳ ପ୍ଲଗଇନ ଯାହାକି yTNEF କୁ ବ୍ୟବହାର କରିଥାଏ।" +msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook." +msgstr "" #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2 -msgid "TNEF Attachment decoder" +#, fuzzy +#| msgid "TNEF Attachment decoder" +msgid "TNEF Decoder" msgstr "TNEF ସଂଲଗ୍ନ ସାଙ୍କେତିକରଣ" +#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1 +#, fuzzy +#| msgid "Multiple vCards" +msgid "Inline vCards" +msgstr "ଏକାଧିକ vCards" + +#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2 +msgid "Show vCards directly in mail messages." +msgstr "" + +#: ../plugins/vcard-inline/vcard-inline.c:155 +#: ../plugins/vcard-inline/vcard-inline.c:239 +msgid "Show Full vCard" +msgstr "ସମ୍ପୂର୍ଣ୍ଣ vCard କୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ" + +#: ../plugins/vcard-inline/vcard-inline.c:158 +msgid "Show Compact vCard" +msgstr "ସଂକ୍ଷିପ୍ତ vCard କୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ" + +#: ../plugins/vcard-inline/vcard-inline.c:218 +#, fuzzy +#| msgid "There is one other contact." +#| msgid_plural "There are %d other contacts." +msgid "There is one other contact." +msgstr "ସେଠାରେ ଅନ୍ଯ ଗୋଟିଏ ସମ୍ପର୍କ ଅଛି।" + +#: ../plugins/vcard-inline/vcard-inline.c:227 +#, fuzzy, c-format +#| msgid "There is one other contact." +#| msgid_plural "There are %d other contacts." +msgid "There is %d other contact." +msgid_plural "There are %d other contacts." +msgstr[0] "ସେଠାରେ ଅନ୍ଯ ଗୋଟିଏ ସମ୍ପର୍କ ଅଛି।" +msgstr[1] "ସେଠାରେ ଅନ୍ଯାନ୍ଯ %d ସମ୍ପର୍କ ଅଛନ୍ତି।" + +#: ../plugins/vcard-inline/vcard-inline.c:248 +#, fuzzy +#| msgid "Save in address book" +msgid "Save in Address Book" +msgstr "ଠିକଣା ପୁସ୍ତିକାରେ ସଂରକ୍ଷଣ କରନ୍ତୁ" + #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1 -msgid "A plugin to setup WebDAV contacts." -msgstr "WebDAV ସମ୍ପର୍କଗୁଡ଼ିକୁ ବିନ୍ୟାସ କରିବା ପାଇଁ ଗୋଟିଏ ପ୍ଲଗଇନ।" +#, fuzzy +#| msgid "WebDAV contacts" +msgid "Add WebDAV contacts to Evolution." +msgstr "WebDAV ସମ୍ପର୍କ" #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2 msgid "WebDAV contacts" @@ -18528,12 +18455,10 @@ msgstr "" "ଗୁପ୍ତଶବ୍ଦ ଅଟେ ଠାରୁ କିମ୍ବା କ୍ରମବିକାଶ ଗୁପ୍ତଶବ୍ଦ ଫାଇଲ." #: ../shell/apps_evolution_shell.schemas.in.h:15 -#| msgid "Insert Attachment" msgid "Initial attachment view" msgstr "ପ୍ରାରମ୍ଭିକ ସଂଲଗ୍ନକ ଦୃଶ୍ୟ" #: ../shell/apps_evolution_shell.schemas.in.h:16 -#| msgid "Install the shared folder" msgid "Initial file chooser folder" msgstr "ପ୍ରାରମ୍ଭିକ ଫାଇଲ ଚୟନକାରୀ ଫୋଲଡର" @@ -18602,7 +18527,7 @@ msgstr "ପାର୍ଶ୍ୱପଟିଟି ଦୃଶ୍ୟମାନ ଅଟେ" msgid "Skip development warning dialog" msgstr "ବିକାଶ ଚେତାବନୀ ସଂଳାପକୁ ଏଡ଼ାଇଦିଅନ୍ତୁ" -#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:483 +#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:485 msgid "Start in offline mode" msgstr "ଅଫ ଲାଇନ ଧାରାରେ ଆରମ୍ଭ କରନ୍ତୁ" @@ -18675,9 +18600,9 @@ msgid "" "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined " "by the GNOME toolbar setting." msgstr "" -"ୱିଣ୍ଡୋ ବଟନର ଶୈଳୀ। \"text\", \"icons\", \"both\", " -"\"toolbar\" ହୋଇପାରେ। ଯଦି \"toolbar\" କୁ ସେଟ କରାଯାଏ, ତେବେ " -"ବଟନର ଶୈଳୀ GNOME ସାଧନ ପଟି ବିନ୍ୟାସ ଦ୍ୱାରା ନିର୍ଦ୍ଧାରଣ କରାଯାଇଥାଏ।" +"ୱିଣ୍ଡୋ ବଟନର ଶୈଳୀ। \"text\", \"icons\", \"both\", \"toolbar\" ହୋଇପାରେ। ଯଦି " +"\"toolbar\" କୁ ସେଟ କରାଯାଏ, ତେବେ ବଟନର ଶୈଳୀ GNOME ସାଧନ ପଟି ବିନ୍ୟାସ ଦ୍ୱାରା ନିର୍ଦ୍ଧାରଣ " +"କରାଯାଇଥାଏ।" #: ../shell/apps_evolution_shell.schemas.in.h:45 msgid "" @@ -18762,9 +18687,7 @@ msgstr "ଚଲାଇବା ପାଇଁ ଆମଦାନୀ ପ୍ରକାରକ msgid "" "Choose the file that you want to import into Evolution, and select what type " "of file it is from the list." -msgstr "" -"Evolution ମଧ୍ଯକୁ ଆମଦାନୀ କରିବାକୁ ଚାହୁଁଥିବା ଫାଇଲକୁ ବାଛନ୍ତୁ, ଏବଂ " -"ତାଲିକାରୁ ଫାଇଲ ପ୍ରକାର ବାଛନ୍ତୁ।" +msgstr "Evolution ମଧ୍ଯକୁ ଆମଦାନୀ କରିବାକୁ ଚାହୁଁଥିବା ଫାଇଲକୁ ବାଛନ୍ତୁ, ଏବଂ ତାଲିକାରୁ ଫାଇଲ ପ୍ରକାର ବାଛନ୍ତୁ।" #: ../shell/e-shell-importer.c:135 msgid "Choose the destination for this import" @@ -18816,43 +18739,44 @@ msgstr "Evolution ପସନ୍ଦ" msgid "%s - Evolution" msgstr "%s - Evolution" -#: ../shell/e-shell-window-commands.c:75 +#: ../shell/e-shell-window-commands.c:69 msgid "The GNOME Pilot tools do not appear to be installed on this system." msgstr "GNOME ପଥପ୍ରଦର୍ଶକ ସାଧନଗୁଡ଼ିକ ଏହି ତନ୍ତ୍ରରେ ସ୍ଥାପିତ ହେବାପରି ଦୃଶ୍ୟମାନ ହେଉନାହିଁ।" -#: ../shell/e-shell-window-commands.c:83 -#, c-format -msgid "Error executing %s." +#: ../shell/e-shell-window-commands.c:78 +#, fuzzy, c-format +#| msgid "Error executing %s." +msgid "Error executing %s. (%s)" msgstr "%s କୁ ନିଷ୍ପାଦନ କରିବାରେ ତ୍ରୁଟି।" -#: ../shell/e-shell-window-commands.c:139 +#: ../shell/e-shell-window-commands.c:136 msgid "Bug buddy is not installed." msgstr "Bug buddy ସ୍ଥାପିତ ହୋଇ ନାହିଁ।" -#: ../shell/e-shell-window-commands.c:142 +#: ../shell/e-shell-window-commands.c:139 msgid "Bug buddy could not be run." msgstr "Bug buddy କୁ ଚଲାଇ ପାରିଲା ନାହିଁ।" #. The translator-credits string is for translators to list #. * per-language credits for translation, displayed in the #. * about dialog. -#: ../shell/e-shell-window-commands.c:942 +#: ../shell/e-shell-window-commands.c:939 msgid "translator-credits" msgstr "ଶୁଭ୍ରାଂଶୁ ବେହେରା " -#: ../shell/e-shell-window-commands.c:953 +#: ../shell/e-shell-window-commands.c:950 msgid "Evolution Website" msgstr "Evolution କ୍ଯାଲେଣ୍ଡର ବସ୍ତୁ" -#: ../shell/e-shell-window-commands.c:1171 +#: ../shell/e-shell-window-commands.c:1168 msgid "_Work Online" msgstr "ଅନଲାଇନରେ କାର୍ଯ୍ୟ କରନ୍ତୁ (_W)" -#: ../shell/e-shell-window-commands.c:1184 ../ui/evolution.xml.h:57 +#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57 msgid "_Work Offline" msgstr "ଅଫଲାଇନରେ କାର୍ଯ୍ୟ କରନ୍ତୁ (_W)" -#: ../shell/e-shell-window-commands.c:1197 +#: ../shell/e-shell-window-commands.c:1194 msgid "Work Offline" msgstr "ଅଫଲାଇନରେ କାର୍ଯ୍ଯ କରନ୍ତୁ" @@ -18906,9 +18830,9 @@ msgstr "OAF ଉପରେ ପଞ୍ଜିକରଣ କରିପାରିବେ msgid "Configuration Database not found" msgstr "ସଂରଚନା ତଥ୍ୟାଧାର ମିଳିଲାନାହିଁ" -#: ../shell/e-user-creatable-items-handler.c:677 -#: ../shell/e-user-creatable-items-handler.c:687 -#: ../shell/e-user-creatable-items-handler.c:692 +#: ../shell/e-user-creatable-items-handler.c:678 +#: ../shell/e-user-creatable-items-handler.c:688 +#: ../shell/e-user-creatable-items-handler.c:693 msgid "New" msgstr "ନୂତନ" @@ -18964,7 +18888,7 @@ msgstr "" "ଆମଦାନୀ କରିବାର ପଦ୍ଧତି ବିଷୟରେ ପଥପ୍ରଦର୍ଶନ କରାଯିବ।" #. Preview/Alpha/Beta version warning message -#: ../shell/main.c:221 +#: ../shell/main.c:222 #, fuzzy, no-c-format msgid "" "Hi. Thanks for taking the time to download this preview release\n" @@ -18986,7 +18910,7 @@ msgstr "" "ପାଇଁ କୁ ଏହା କ୍ରମବିକାଶ ନାଁ ର କ୍ରମବିକାଶ ଅଟେ ନୁହେଁ ଅଟେ ବନ୍ଦ କରନ୍ତୁ କିମ୍ବା ନୁହେଁ ନାଁ a ର " "କ୍ରମବିକାଶ କୁ ଏବଂ ନାଁ ଖୋଜନ୍ତୁ କୁ us ଏଠାରେ ସହିତ ନାଁ ଏବଂ ଅଟେ ନୁହେଁ ପାଇଁ କୁ ର ନାଁ ର ଏବଂ ନାଁ" -#: ../shell/main.c:245 +#: ../shell/main.c:246 msgid "" "Thanks\n" "The Evolution Team\n" @@ -18994,43 +18918,43 @@ msgstr "" "ଧନ୍ୟବାଦ\n" "Evolution ଦଳ\n" -#: ../shell/main.c:252 +#: ../shell/main.c:253 msgid "Do not tell me again" msgstr "ମୋତେ ପୁଣିଥରେ ପଚାରନ୍ତୁ ନାହିଁ" -#: ../shell/main.c:481 +#: ../shell/main.c:483 msgid "Start Evolution activating the specified component" msgstr "ଉଲ୍ଲିଖିତ ଉପାଦାନଗୁଡ଼ିକୁ ସକ୍ରିୟ କରି Evolution କୁ ଆରମ୍ଭ କରନ୍ତୁ" -#: ../shell/main.c:485 +#: ../shell/main.c:487 msgid "Start in online mode" msgstr "ଅନଲାଇନ ଧାରାରେ ଆରମ୍ଭ କରନ୍ତୁ" -#: ../shell/main.c:488 +#: ../shell/main.c:490 msgid "Forcibly shut down all Evolution components" msgstr "ସମସ୍ତ Evolution ଉପାଦାନଗୁଡ଼ିକୁ ବାଧ୍ଯତାମୂଳକ ଭାବରେ ବନ୍ଦ କରନ୍ତୁ" -#: ../shell/main.c:492 +#: ../shell/main.c:494 msgid "Forcibly re-migrate from Evolution 1.4" msgstr "Evolution 1.4 ରୁ ବାଧ୍ୟତାମୂଳକ ଭାବରେ ସ୍ଥାନ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" -#: ../shell/main.c:495 +#: ../shell/main.c:497 msgid "Send the debugging output of all components to a file." msgstr "" -#: ../shell/main.c:497 +#: ../shell/main.c:499 msgid "Disable loading of any plugins." msgstr "ଯେକୌଣସି ପ୍ଲଗଇନଗୁଡ଼ିକର ଧାରଣକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ।" -#: ../shell/main.c:499 +#: ../shell/main.c:501 msgid "Disable preview pane of Mail, Contacts and Tasks." msgstr "ମେଲ, ଯୋଗାଯୋଗ ଏବଂ କାର୍ଯ୍ୟର ପ୍ରାକଦର୍ଶନ ପଟ୍ଟିକାକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ।" -#: ../shell/main.c:586 +#: ../shell/main.c:588 msgid "- The Evolution PIM and Email Client" msgstr "- Evolution PIM ଏବଂ ଇମେଲ ଗ୍ରାହକ" -#: ../shell/main.c:614 +#: ../shell/main.c:616 #, c-format msgid "" "%s: --online and --offline cannot be used together.\n" @@ -19064,8 +18988,8 @@ msgid "" "Forgetting your passwords will clear all remembered passwords. You will be " "reprompted next time they are needed." msgstr "" -"ଆପଣଙ୍କର ପ୍ରବେଶ ସଂକେତ ଭୁଲିବା ଦ୍ୱାରା ମନେ ଥିବା ସମସ୍ତ ପ୍ରବେଶ ସଂକେତକୁ ସଫାକରନ୍ତୁ। ପରବର୍ତ୍ତି ସମୟରେ " -"ଆବଶ୍ୟକ ହେଲେ ଆପଣଙ୍କୁ ପଚରାଯିବ।" +"ଆପଣଙ୍କର ପ୍ରବେଶ ସଂକେତ ଭୁଲିବା ଦ୍ୱାରା ମନେ ଥିବା ସମସ୍ତ ପ୍ରବେଶ ସଂକେତକୁ ସଫାକରନ୍ତୁ। ପରବର୍ତ୍ତି " +"ସମୟରେ ଆବଶ୍ୟକ ହେଲେ ଆପଣଙ୍କୁ ପଚରାଯିବ।" #: ../shell/shell.error.xml.h:8 msgid "Insufficient disk space for upgrade." @@ -19163,7 +19087,8 @@ msgid "" msgstr "" "{1}\n" "\n" -"ଯଦି ଆପଣ ଅଗ୍ରସର ହେବାକୁ ଚାହୁଁଛନ୍ତି, ତେବେ ଆପଣଙ୍କ ପାଖରେ କିଛି ପୁରୁଣା ତଥ୍ୟ ପାଇଁ ଅଭିଗମ୍ୟତା ନଥାଇପାରେ।\n" +"ଯଦି ଆପଣ ଅଗ୍ରସର ହେବାକୁ ଚାହୁଁଛନ୍ତି, ତେବେ ଆପଣଙ୍କ ପାଖରେ କିଛି ପୁରୁଣା ତଥ୍ୟ ପାଇଁ ଅଭିଗମ୍ୟତା " +"ନଥାଇପାରେ।\n" #: ../smime/gui/ca-trust-dialog.c:102 #, c-format @@ -19908,7 +19833,7 @@ msgstr "ପରବର୍ତ୍ତୀ" msgid "Previews the calendar to be printed" msgstr "ମୁଦ୍ରଣ ହେବାକୁ ଥିବା କ୍ୟାଲେଣ୍ଡରକୁ ପ୍ରାକଦର୍ଶନ କରନ୍ତୁ" -#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74 +#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70 #: ../widgets/misc/e-calendar.c:171 msgid "Previous" msgstr "ପୂର୍ବବର୍ତ୍ତୀ" @@ -20218,7 +20143,7 @@ msgstr "ସୂତ୍ର ସନ୍ଦେଶ ତାଲିକା" msgid "_Group By Threads" msgstr "ସୂତ୍ର ଦ୍ବାରା ସମୂହ (_G)" -#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115 +#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111 #: ../ui/evolution-mail-messagedisplay.xml.h:7 msgid "_Message" msgstr "ସନ୍ଦେଶ (_M)" @@ -20473,199 +20398,183 @@ msgid "Paste messages from the clipboard" msgstr "କ୍ଲିପବୋର୍ଡରୁ ସନ୍ଦେଶ ଲଗାନ୍ତୁ" #: ../ui/evolution-mail-message.xml.h:68 -msgid "Pos_t New Message to Folder" -msgstr "ଫୋଲଡରରେ ନୂତନ ସନ୍ଦେଶ କୁ ଦାଖଲ କରନ୍ତୁ (_t)" - -#: ../ui/evolution-mail-message.xml.h:69 -msgid "Post a Repl_y" -msgstr "ଉତ୍ତର ଦାଖଲ କରନ୍ତୁ (_y)" - -#: ../ui/evolution-mail-message.xml.h:70 -msgid "Post a message to a Public folder" -msgstr "ଗୋଟିଏ ସାର୍ବଜନୀନ ଫୋଲଡରରେ ସନ୍ଦେଶ ପଠାନ୍ତୁ" - -#: ../ui/evolution-mail-message.xml.h:71 -msgid "Post a reply to a message in a Public folder" -msgstr "ଗୋଟିଏ ସାର୍ବଜନୀନ ଫୋଲଡରରେ ସନ୍ଦେଶ ପାଇଁ ଉତ୍ତର ପୋଷ୍ଟ କରନ୍ତୁ" - -#: ../ui/evolution-mail-message.xml.h:72 msgid "Pr_evious Important Message" msgstr "ପୂର୍ବତନ ଗୁରୁତ୍ବପୂର୍ଣ୍ଣ ସନ୍ଦେଶ (_e)" -#: ../ui/evolution-mail-message.xml.h:73 +#: ../ui/evolution-mail-message.xml.h:69 msgid "Preview the message to be printed" msgstr "ମୁଦ୍ରଣ କରିବାକୁ ଥିବା ସନ୍ଦେଶକୁ ପ୍ରାକଦର୍ଶନ କରନ୍ତୁ" -#: ../ui/evolution-mail-message.xml.h:77 +#: ../ui/evolution-mail-message.xml.h:73 msgid "Print this message" msgstr "ଏହି ସନ୍ଦେଶକୁ ମୁଦ୍ରଣ କରନ୍ତୁ" -#: ../ui/evolution-mail-message.xml.h:78 +#: ../ui/evolution-mail-message.xml.h:74 msgid "Re_direct" msgstr "ପୁଣି ପଠାନ୍ତୁ (_d)" -#: ../ui/evolution-mail-message.xml.h:79 +#: ../ui/evolution-mail-message.xml.h:75 msgid "Redirect (bounce) the selected message to someone" msgstr "ଚୟିତ ସନ୍ଦେଶକୁ କେହି ଜଣକ ପାଖକୁ ପୁଣି ପଠାନ୍ତୁ" -#: ../ui/evolution-mail-message.xml.h:84 +#: ../ui/evolution-mail-message.xml.h:80 msgid "Reset the text to its original size" msgstr "ପାଠ୍ଯକୁ ତାହାର ପ୍ରକୃତ ଆକାରକୁ ପୁନଃସ୍ଥାପନ କରନ୍ତୁ" -#: ../ui/evolution-mail-message.xml.h:85 +#: ../ui/evolution-mail-message.xml.h:81 msgid "Save the selected messages as a text file" msgstr "ଚୟିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ପାଠ୍ଯ ଫାଇଲ ଭାବରେ ସଂରକ୍ଷଣ କରନ୍ତୁ" -#: ../ui/evolution-mail-message.xml.h:86 +#: ../ui/evolution-mail-message.xml.h:82 msgid "Search Folder from Mailing _List..." msgstr "ମେଲିଙ୍ଗ ତାଲିକାରୁ ଫୋଲଡର ଖୋଜନ୍ତୁ (_L)..." -#: ../ui/evolution-mail-message.xml.h:87 +#: ../ui/evolution-mail-message.xml.h:83 msgid "Search Folder from Recipien_ts..." msgstr "ଗ୍ରାହକଙ୍କ ପାଖରୁ ଫୋଲଡର ଖୋଜନ୍ତୁ (_t)..." -#: ../ui/evolution-mail-message.xml.h:88 +#: ../ui/evolution-mail-message.xml.h:84 msgid "Search Folder from S_ubject..." msgstr "ବିଷୟରୁ ଫୋଲଡର ଖୋଜନ୍ତୁ (_u)..." -#: ../ui/evolution-mail-message.xml.h:89 +#: ../ui/evolution-mail-message.xml.h:85 msgid "Search Folder from Sen_der..." msgstr "ପ୍ରେରକ ପାଖରୁ ଫୋଲଡ଼ରକୁ ସନ୍ଧାନ କରନ୍ତୁ (_d)..." -#: ../ui/evolution-mail-message.xml.h:90 +#: ../ui/evolution-mail-message.xml.h:86 msgid "Search for text in the body of the displayed message" msgstr "ପ୍ରଦର୍ଶିତ ସନ୍ଦେଶର ଶରୀରରେ ପାଠ୍ୟ ଖୋଜନ୍ତୁ" -#: ../ui/evolution-mail-message.xml.h:91 +#: ../ui/evolution-mail-message.xml.h:87 msgid "Select _All Text" msgstr "ସମସ୍ତ ପାଠ୍ୟକୁ ମନୋନୀତ କରନ୍ତୁ (_A)" -#: ../ui/evolution-mail-message.xml.h:92 +#: ../ui/evolution-mail-message.xml.h:88 msgid "Select all the text in a message" msgstr "ସନ୍ଦେଶରେ ସମସ୍ତ ପାଠ୍ଯକୁ ମନୋନୀତ କରନ୍ତୁ" -#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27 +#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27 msgid "Set up the page settings for your current printer" msgstr "ଆପଣଙ୍କର ପ୍ରଚଳିତ ମୁଦ୍ରଣୀ ପାଇଁ ପୃଷ୍ଠା ସଂରଚନାକୁ ବିନ୍ୟାସ କରନ୍ତୁ" -#: ../ui/evolution-mail-message.xml.h:94 +#: ../ui/evolution-mail-message.xml.h:90 msgid "Show a blinking cursor in the body of displayed messages" msgstr "ଦର୍ଶାଯାଇଥିବା ସନ୍ଦେଶଗୁଡ଼ିକର ଶରୀରରେ ଦପଦପ ହେଉଥିବା ସୂଚକକୁ ଦର୍ଶାନ୍ତୁ" -#: ../ui/evolution-mail-message.xml.h:95 +#: ../ui/evolution-mail-message.xml.h:91 msgid "Show messages with all email headers" msgstr "ସମସ୍ତ ଇମେଲ ଶୀର୍ଷକଗୁଡ଼ିକ ସହିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ" -#: ../ui/evolution-mail-message.xml.h:96 +#: ../ui/evolution-mail-message.xml.h:92 msgid "Show the raw email source of the message" msgstr "ସନ୍ଦେଶର ଅସମ୍ପୂର୍ଣ୍ଣ ଇମେଲ ଉତ୍ସକୁ ଦର୍ଶାନ୍ତୁ" -#: ../ui/evolution-mail-message.xml.h:97 +#: ../ui/evolution-mail-message.xml.h:93 msgid "Undelete the selected messages" msgstr "ଚୟିତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଅପସାରଣ କରନ୍ତୁ ନାହିଁ" -#: ../ui/evolution-mail-message.xml.h:98 +#: ../ui/evolution-mail-message.xml.h:94 msgid "Uni_mportant" msgstr "ଅଦରକାରୀ (_m)" -#: ../ui/evolution-mail-message.xml.h:99 +#: ../ui/evolution-mail-message.xml.h:95 msgid "Zoom _Out" msgstr "ସାନ କରନ୍ତୁ (_O)" -#: ../ui/evolution-mail-message.xml.h:100 +#: ../ui/evolution-mail-message.xml.h:96 msgid "_Attached" msgstr "ସଂଲଗ୍ନ (_A)" -#: ../ui/evolution-mail-message.xml.h:101 +#: ../ui/evolution-mail-message.xml.h:97 msgid "_Caret Mode" msgstr "କ୍ଯାରେଟ ଧାରା (_C)" -#: ../ui/evolution-mail-message.xml.h:102 +#: ../ui/evolution-mail-message.xml.h:98 msgid "_Clear Flag" msgstr "ବିଶେଷ ସୂଚକକୁ ସଫା କରନ୍ତୁ (_C)" -#: ../ui/evolution-mail-message.xml.h:105 +#: ../ui/evolution-mail-message.xml.h:101 msgid "_Delete Message" msgstr "ସନ୍ଦେଶ ବିଲୋପ କରନ୍ତୁ (_D)" -#: ../ui/evolution-mail-message.xml.h:107 +#: ../ui/evolution-mail-message.xml.h:103 msgid "_Find in Message..." msgstr "ସନ୍ଦେଶ ମଧ୍ଯରେ ଖୋଜନ୍ତୁ (_F)..." -#: ../ui/evolution-mail-message.xml.h:108 +#: ../ui/evolution-mail-message.xml.h:104 msgid "_Flag Completed" msgstr "ବିଶେଷ ସୂଚକ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି (_F)" -#: ../ui/evolution-mail-message.xml.h:110 +#: ../ui/evolution-mail-message.xml.h:106 msgid "_Go To" msgstr "ଏଠାକୁ ଯାଆନ୍ତୁ (_G)" -#: ../ui/evolution-mail-message.xml.h:111 +#: ../ui/evolution-mail-message.xml.h:107 msgid "_Important" msgstr "ଗୁରୁତ୍ବପୂର୍ଣ୍ଣ (_I)" -#: ../ui/evolution-mail-message.xml.h:112 +#: ../ui/evolution-mail-message.xml.h:108 msgid "_Inline" msgstr "ଇନଲାଇନ (_I)" -#: ../ui/evolution-mail-message.xml.h:113 +#: ../ui/evolution-mail-message.xml.h:109 msgid "_Junk" msgstr "Junk (_J)" -#: ../ui/evolution-mail-message.xml.h:114 +#: ../ui/evolution-mail-message.xml.h:110 msgid "_Load Images" msgstr "ପ୍ରତିଛବି ଧାରଣ କରନ୍ତୁ (_L)" -#: ../ui/evolution-mail-message.xml.h:116 +#: ../ui/evolution-mail-message.xml.h:112 msgid "_Message Source" msgstr "ସନ୍ଦେଶ ଉତ୍ସ (_M)" -#: ../ui/evolution-mail-message.xml.h:118 +#: ../ui/evolution-mail-message.xml.h:114 msgid "_Next Message" msgstr "ପରବର୍ତ୍ତୀ ସନ୍ଦେଶ (_N)" -#: ../ui/evolution-mail-message.xml.h:119 +#: ../ui/evolution-mail-message.xml.h:115 msgid "_Normal Size" msgstr "ସାଧାରଣ ଆକାର (_N)" -#: ../ui/evolution-mail-message.xml.h:120 +#: ../ui/evolution-mail-message.xml.h:116 msgid "_Not Junk" msgstr "Junk ନୁହଁ (_N)" -#: ../ui/evolution-mail-message.xml.h:121 +#: ../ui/evolution-mail-message.xml.h:117 msgid "_Open in New Window" msgstr "ନୂତନ ୱିଣ୍ଡୋରେ ଖୋଲନ୍ତୁ (_O)" -#: ../ui/evolution-mail-message.xml.h:122 +#: ../ui/evolution-mail-message.xml.h:118 msgid "_Previous Message" msgstr "ପୂର୍ବବର୍ତ୍ତୀ ସନ୍ଦେଶ (_P)" -#: ../ui/evolution-mail-message.xml.h:124 +#: ../ui/evolution-mail-message.xml.h:120 msgid "_Quoted" msgstr "ଉଦ୍ଧୃତ (_Q)" #. Translators: "Read" as in "has been read" (evolution-mail-message.xml) -#: ../ui/evolution-mail-message.xml.h:126 +#: ../ui/evolution-mail-message.xml.h:122 msgid "_Read" msgstr "ପଢନ୍ତୁ (_R)" -#: ../ui/evolution-mail-message.xml.h:128 +#: ../ui/evolution-mail-message.xml.h:124 msgid "_Save Message..." msgstr "ସନ୍ଦେଶ ସଂରକ୍ଷଣ କରନ୍ତୁ (_S)..." -#: ../ui/evolution-mail-message.xml.h:129 +#: ../ui/evolution-mail-message.xml.h:125 msgid "_Undelete Message" msgstr "ଅପସାରଣ କରାଯାଇନଥିବା ସନ୍ଦେଶ (_U)" -#: ../ui/evolution-mail-message.xml.h:130 +#: ../ui/evolution-mail-message.xml.h:126 msgid "_Unread" msgstr "ପଢ଼ାହୋଇନଥିବା (_U)" -#: ../ui/evolution-mail-message.xml.h:131 +#: ../ui/evolution-mail-message.xml.h:127 msgid "_Zoom" msgstr "_ଆକାରବୃଦ୍ଧିକରଣ" -#: ../ui/evolution-mail-message.xml.h:132 +#: ../ui/evolution-mail-message.xml.h:128 msgid "_Zoom In" msgstr "ବଡ଼ କରନ୍ତୁ (_Z)" @@ -21026,11 +20935,11 @@ msgid "With _Status" msgstr "ଅବସ୍ଥିତି ସହିତ (_S)" #. Put the "UTC" entry at the top of the combo's list. -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435 -#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:426 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428 +#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:777 msgid "UTC" msgstr "UTC" @@ -21060,19 +20969,19 @@ msgstr "" "ବାଛନ୍ତୁ।\n" "ଛୋଟ କରିବା ପାଇଁ ଡାହାଣ ମାଉସ ବଟନକୁ ବ୍ୟବହାର କରନ୍ତୁ।" -#: ../widgets/menus/gal-define-views-dialog.c:76 +#: ../widgets/menus/gal-define-views-dialog.c:74 #: ../widgets/menus/gal-define-views-model.c:185 msgid "Collection" msgstr "ସଂଗ୍ରହ" -#: ../widgets/menus/gal-define-views-dialog.c:358 +#: ../widgets/menus/gal-define-views-dialog.c:356 #: ../widgets/menus/gal-define-views.glade.h:4 #, no-c-format msgid "Define Views for %s" msgstr "%s ପାଇଁ ପ୍ରଦର୍ଶନ ମାନଙ୍କୁ ବ୍ଯାଖ୍ଯା କରନ୍ତୁ" +#: ../widgets/menus/gal-define-views-dialog.c:364 #: ../widgets/menus/gal-define-views-dialog.c:366 -#: ../widgets/menus/gal-define-views-dialog.c:368 msgid "Define Views" msgstr "ପ୍ରଦର୍ଶନ ଗୁଡିକୁ ବ୍ଯାଖ୍ଯା କରନ୍ତୁ" @@ -21143,11 +21052,11 @@ msgstr "ବର୍ତ୍ତମାନ ପ୍ରଦର୍ଶନକୁ ସଂରକ msgid "Create or edit views" msgstr "ଦୃଶ୍ୟଗୁଡ଼ିକୁ ସୃଷ୍ଟିକରନ୍ତୁ କିମ୍ବା ସମ୍ପାଦନ କରନ୍ତୁ" -#: ../widgets/menus/gal-view-new-dialog.c:70 +#: ../widgets/menus/gal-view-new-dialog.c:68 msgid "Factory" msgstr "କାରଖାନା" -#: ../widgets/menus/gal-view-new-dialog.c:105 +#: ../widgets/menus/gal-view-new-dialog.c:103 msgid "Define New View" msgstr "ନୂତନ ପ୍ରଦର୍ଶନକୁ ବ୍ଯାଖ୍ଯା କରନ୍ତୁ" @@ -21163,65 +21072,55 @@ msgstr "ପ୍ରଦର୍ଶନ କରିବାର ପ୍ରକାର:" msgid "Type of view:" msgstr "ପ୍ରଦର୍ଶନ କରିବାର ପ୍ରକାର:" -#: ../widgets/misc/e-attachment.c:936 -#| msgid "Attached message" -#| msgid_plural "%d attached messages" +#: ../widgets/misc/e-attachment.c:940 msgid "Attached message" msgstr "ସଂଲଗ୍ନିତ ସନ୍ଦେଶ" #. Translators: Default attachment filename. -#: ../widgets/misc/e-attachment.c:1709 ../widgets/misc/e-attachment.c:2258 -#: ../widgets/misc/e-attachment-store.c:627 -#| msgid "attachment" +#: ../widgets/misc/e-attachment.c:1723 ../widgets/misc/e-attachment.c:2274 +#: ../widgets/misc/e-attachment-store.c:636 msgid "attachment.dat" msgstr "attachment.dat" -#: ../widgets/misc/e-attachment.c:1756 ../widgets/misc/e-attachment.c:2560 +#: ../widgets/misc/e-attachment.c:1770 ../widgets/misc/e-attachment.c:2576 msgid "A load operation is already in progress" msgstr "ଗୋଟିଏ ଧାରଣ ପ୍ରୟୋଗ ପୂର୍ବରୁ ଅଗ୍ରସର ହେଉଛି" -#: ../widgets/misc/e-attachment.c:1764 ../widgets/misc/e-attachment.c:2568 +#: ../widgets/misc/e-attachment.c:1778 ../widgets/misc/e-attachment.c:2584 msgid "A save operation is already in progress" msgstr "" -#: ../widgets/misc/e-attachment.c:1857 +#: ../widgets/misc/e-attachment.c:1871 #, c-format -#| msgid "Could not load address book" msgid "Could not load '%s'" msgstr "'%s' କୁ ଧାରଣ କରିପାରିଲା ନାହିଁ" -#: ../widgets/misc/e-attachment.c:1860 +#: ../widgets/misc/e-attachment.c:1874 #, c-format -#| msgid "Could not open the link." msgid "Could not load the attachment" msgstr "ସଂଲଗ୍ନକକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ" -#: ../widgets/misc/e-attachment.c:2135 +#: ../widgets/misc/e-attachment.c:2151 #, c-format -#| msgid "Could not open source" msgid "Could not open '%s'" msgstr "'%s' କୁ ଖୋଲିପାରିଲା ନାହିଁ" -#: ../widgets/misc/e-attachment.c:2138 +#: ../widgets/misc/e-attachment.c:2154 #, c-format -#| msgid "Could not open the link." msgid "Could not open the attachment" msgstr "ସଂଲଗ୍ନକକୁ ଖୋଲିପାରିଲା ନାହିଁ" -#: ../widgets/misc/e-attachment.c:2576 -#| msgid "Attachment Reminder" +#: ../widgets/misc/e-attachment.c:2592 msgid "Attachment contents not loaded" msgstr "ସଂଲଗ୍ନକ ବିଷୟବସ୍ତୁଗୁଡ଼ିକୁ ଧାରଣ କରାଯାଇନାହିଁ" -#: ../widgets/misc/e-attachment.c:2653 +#: ../widgets/misc/e-attachment.c:2669 #, c-format -#| msgid "Could not execute '%s': %s\n" msgid "Could not save '%s'" msgstr "'%s' କୁ ସଂରକ୍ଷଣ କରିପାରିଲା ନାହିଁ" -#: ../widgets/misc/e-attachment.c:2656 +#: ../widgets/misc/e-attachment.c:2672 #, c-format -#| msgid "Select folder to save all attachments" msgid "Could not save the attachment" msgstr "ସଂଲଗ୍ନକକୁ ସଂରକ୍ଷଣ କରିପାରିଲା ନାହିଁ" @@ -21234,24 +21133,40 @@ msgid "_Filename:" msgstr "ଫାଇଲ ନାମ (_F):" #: ../widgets/misc/e-attachment-dialog.c:363 -#| msgid "MIME Type" msgid "MIME Type:" msgstr "MIME ପ୍ରକାର:" #: ../widgets/misc/e-attachment-handler-image.c:95 -#| msgid "Set as _Background" msgid "Could not set as background" msgstr "ପୃଷ୍ଠଭୂମି ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ" +#: ../widgets/misc/e-attachment-handler-sendto.c:87 +#, fuzzy +#| msgid "Could not open the attachment" +msgid "Could not send attachment" +msgid_plural "Could not send attachments" +msgstr[0] "ସଂଲଗ୍ନକକୁ ଖୋଲିପାରିଲା ନାହିଁ" +msgstr[1] "ସଂଲଗ୍ନକକୁ ଖୋଲିପାରିଲା ନାହିଁ" + +#: ../widgets/misc/e-attachment-handler-sendto.c:129 +#, fuzzy +#| msgid "Send To:" +msgid "_Send To..." +msgstr "ଏଠାକୁ ପଠାନ୍ତୁ:" + +#: ../widgets/misc/e-attachment-handler-sendto.c:131 +#, fuzzy +#| msgid "Send selected contacts to another person" +msgid "Send the selected attachments somewhere" +msgstr "ପଠାଅ ଚୟିତ କୁ" + #: ../widgets/misc/e-attachment-icon-view.c:473 #: ../widgets/misc/e-attachment-tree-view.c:517 -#| msgid "Loading..." msgid "Loading" msgstr "ଧାରଣ କରୁଅଛି" #: ../widgets/misc/e-attachment-icon-view.c:485 #: ../widgets/misc/e-attachment-tree-view.c:529 -#| msgid "Shading" msgid "Saving" msgstr "ସଂରକ୍ଷଣ କରୁଅଛି" @@ -21264,34 +21179,36 @@ msgstr "ସଂଲଗ୍ନ ପଟିକୁ ଲୁଚାନ୍ତୁ (_A)" msgid "Show _Attachment Bar" msgstr "ସଂଲଗ୍ନ ପଟି ଦେଖାନ୍ତୁ (_A)" -#: ../widgets/misc/e-attachment-store.c:533 -#| msgid "Attachment" -#| msgid_plural "Attachments" +#: ../widgets/misc/e-attachment-store.c:541 msgid "Add Attachment" msgstr "ସଂଲଗ୍ନକକୁ ଯୋଗ କରନ୍ତୁ" -#: ../widgets/misc/e-attachment-store.c:536 +#: ../widgets/misc/e-attachment-store.c:544 msgid "A_ttach" msgstr "ସଂଲଗ୍ନ କରନ୍ତୁ (_t)" -#: ../widgets/misc/e-attachment-store.c:598 +#: ../widgets/misc/e-attachment-store.c:607 msgid "Save Attachment" msgid_plural "Save Attachments" msgstr[0] "ସଂଲଗ୍ନକକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ" msgstr[1] "ସଂଲଗ୍ନକଗୁଡ଼ିକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ" -#: ../widgets/misc/e-attachment-view.c:299 +#: ../widgets/misc/e-attachment-view.c:300 msgid "S_ave All" msgstr "ସମସ୍ତଙ୍କୁ ସଂରକ୍ଷଣ କରନ୍ତୁ (_a)" -#: ../widgets/misc/e-attachment-view.c:325 -#| msgid "_Add attachment..." +#: ../widgets/misc/e-attachment-view.c:326 msgid "A_dd Attachment..." msgstr "ସଂଲଗ୍ନକ ଯୋଗ କରନ୍ତୁ (_d)..." -#: ../widgets/misc/e-attachment-view.c:648 +#: ../widgets/misc/e-attachment-view.c:643 +#, fuzzy, c-format +#| msgid "Opening %s" +msgid "Open with \"%s\"" +msgstr "%s କୁ ଖୋଲୁଅଛି" + +#: ../widgets/misc/e-attachment-view.c:646 #, c-format -#| msgid "Save attachment as" msgid "Open this attachment in %s" msgstr "ଏହି ସଂଲଗ୍ନକକୁ %s ରେ ଖୋଲନ୍ତୁ" @@ -21345,21 +21262,21 @@ msgstr "Y1" msgid "Y2" msgstr "Y2" -#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1416 +#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1416 #: ../widgets/table/e-table-group-container.c:1003 #: ../widgets/table/e-table-group-leaf.c:649 #: ../widgets/table/e-table-item.c:3070 msgid "Minimum width" msgstr "ସର୍ବନିମ୍ନ ଓସାର" -#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1417 +#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1417 #: ../widgets/table/e-table-group-container.c:1004 #: ../widgets/table/e-table-group-leaf.c:650 #: ../widgets/table/e-table-item.c:3071 msgid "Minimum Width" msgstr "ସର୍ବନିମ୍ନ ଓସାର" -#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104 +#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102 msgid "Spacing" msgstr "ବ୍ଯବଧାନ" @@ -21505,7 +21422,7 @@ msgstr "ଅବୈଧ ସମୟ ମୂଲ୍ୟ" #. FIXME: get the toplevel window... #: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180 -#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:748 +#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:742 msgid "Advanced Search" msgstr "ଉନ୍ନତ ସନ୍ଧାନ" @@ -21522,34 +21439,30 @@ msgstr "ଅନୁସନ୍ଧାନ (_S)" msgid "Searches" msgstr "ଅନୁସନ୍ଧାନ" -#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115 +#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:113 msgid "_Save Search..." msgstr "ସନ୍ଧାନ ଫଳାଫଳକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ (_S) ..." -#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116 +#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:114 msgid "_Edit Saved Searches..." msgstr "ସଂରକ୍ଷିତ ସନ୍ଧାନ ଫଳାଫଳକୁ ସମ୍ପାଦନ କରନ୍ତୁ (_E) ..." -#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117 +#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:115 msgid "_Advanced Search..." msgstr "ଉନ୍ନତ ସନ୍ଧାନ (_A) ..." -#: ../widgets/misc/e-filter-bar.h:107 +#: ../widgets/misc/e-filter-bar.h:106 msgid "All Accounts" msgstr "ସମସ୍ତ ଖାତା" -#: ../widgets/misc/e-filter-bar.h:108 +#: ../widgets/misc/e-filter-bar.h:107 msgid "Current Account" msgstr "ବର୍ତ୍ତମାନ ଖାତା" -#: ../widgets/misc/e-filter-bar.h:109 +#: ../widgets/misc/e-filter-bar.h:108 msgid "Current Folder" msgstr "ବର୍ତ୍ତମାନ ଫୋଲଡର" -#: ../widgets/misc/e-filter-bar.h:110 -msgid "Current Message" -msgstr "ବର୍ତ୍ତମାନ ସନ୍ଦେଶ" - #: ../widgets/misc/e-image-chooser.c:168 msgid "Choose Image" msgstr "ପ୍ରତିଛବି ଚୟନ କରନ୍ତୁ" @@ -21596,52 +21509,50 @@ msgstr "ପୁନଃପ୍ରବାହ ନମୁନା" msgid "Column width" msgstr "ସ୍ତମ୍ଭ ଓସାର" -#: ../widgets/misc/e-search-bar.c:336 ../widgets/misc/e-search-bar.c:469 -#: ../widgets/misc/e-search-bar.c:471 +#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:475 +#: ../widgets/misc/e-search-bar.c:477 msgid "Search" msgstr "ଖୋଜନ୍ତୁ" -#: ../widgets/misc/e-search-bar.c:336 ../widgets/misc/e-search-bar.c:469 -#: ../widgets/misc/e-search-bar.c:471 +#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:475 +#: ../widgets/misc/e-search-bar.c:477 msgid "Click here to change the search type" msgstr "ସନ୍ଧାନ ପ୍ରକାର ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଏଠାରେ ଦବାନ୍ତୁ" -#: ../widgets/misc/e-search-bar.c:602 +#: ../widgets/misc/e-search-bar.c:608 msgid "_Search" msgstr "ଖୋଜନ୍ତୁ (_S)" -#: ../widgets/misc/e-search-bar.c:608 +#: ../widgets/misc/e-search-bar.c:614 msgid "_Find Now" msgstr "ବର୍ତ୍ତମାନ ଖୋଜନ୍ତୁ (_F)" -#: ../widgets/misc/e-search-bar.c:609 +#: ../widgets/misc/e-search-bar.c:615 msgid "_Clear" msgstr "ସଫା କରନ୍ତୁ (_C)" -#: ../widgets/misc/e-search-bar.c:864 +#: ../widgets/misc/e-search-bar.c:870 msgid "Item ID" msgstr "ବସ୍ତୁ ପରିଚୟ" -#: ../widgets/misc/e-search-bar.c:871 ../widgets/text/e-text.c:3567 +#: ../widgets/misc/e-search-bar.c:877 ../widgets/text/e-text.c:3567 #: ../widgets/text/e-text.c:3568 msgid "Text" msgstr "ପାଠ୍ଯ" #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on... -#: ../widgets/misc/e-search-bar.c:1002 +#: ../widgets/misc/e-search-bar.c:1013 msgid "Sho_w: " msgstr "ପ୍ରଦର୍ଶନ କରନ୍ତୁ (_w): " -#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters -#. the term to search for -#: ../widgets/misc/e-search-bar.c:1019 +#: ../widgets/misc/e-search-bar.c:1032 msgid "Sear_ch: " msgstr "ସନ୍ଧାନ କରନ୍ତୁ (_c): " #. To Translators: The " in " label is part of the Quick Search Bar, example: #. Search: | | in | Current Folder/All Accounts/Current Account -#: ../widgets/misc/e-search-bar.c:1031 +#: ../widgets/misc/e-search-bar.c:1048 msgid " i_n " msgstr "ଚିହ୍ନିତ ସ୍ଥାନରେ (_n)" @@ -21772,7 +21683,6 @@ msgid "_All information" msgstr "ସମସ୍ତ ସୂଚନା (_A)" #: ../widgets/misc/e-send-options.glade.h:30 -#| msgid "_Classification" msgid "_Classification:" msgstr "ଶ୍ରେଣୀ ବିଭାଜନ (_C):" @@ -21818,7 +21728,7 @@ msgstr "%s (%d%% ସମାପ୍ତ)" msgid "Click here to go to URL" msgstr "ୟୁ.ଆର.ଏଲ. କୁ ଯିବା ପାଇଁ ଏଠାରେ ଦବାନ୍ତୁ" -#: ../widgets/table/e-cell-combo.c:175 +#: ../widgets/table/e-cell-combo.c:173 msgid "popup list" msgstr "ପପ-ଅପ ତାଲିକା" @@ -21878,12 +21788,12 @@ msgstr "ସଜଡା ଯାଇନାହିଁ" msgid "No grouping" msgstr "କୌଣସି ସମୂହୀକରଣ ହୋଇନାହିଁ" -#: ../widgets/table/e-table-config.c:643 +#: ../widgets/table/e-table-config.c:644 #: ../widgets/table/e-table-config.glade.h:11 msgid "Show Fields" msgstr "କ୍ଷେତ୍ର ପ୍ରଦର୍ଶନ କରନ୍ତୁ" -#: ../widgets/table/e-table-config.c:664 +#: ../widgets/table/e-table-config.c:665 msgid "Available Fields" msgstr "ଅବସ୍ଥିତ କ୍ଷେତ୍ର ମାନ" @@ -21965,7 +21875,7 @@ msgstr "ଏହି କ୍ଷେତ୍ର ମାନଙ୍କୁ କ୍ରମାନ msgid "_Sort..." msgstr "ସଜାଡନ୍ତୁ (_S) ..." -#: ../widgets/table/e-table-field-chooser-dialog.c:116 +#: ../widgets/table/e-table-field-chooser-dialog.c:114 msgid "Add a column..." msgstr "ଗୋଟିଏ ସ୍ତମ୍ଭକୁ ଯୋଗ କରନ୍ତୁ" -- cgit v1.2.3 From f25f00daf85c1fb7aa43eb04ee36c206cd60a8ea Mon Sep 17 00:00:00 2001 From: Manoj Kumar Giri Date: Fri, 5 Jun 2009 18:53:41 +0530 Subject: Added entries for Oriya Translation update. --- po/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/po/ChangeLog b/po/ChangeLog index 1a1b53f1c4..25b458fcdd 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-06-04 Manoj Kumar Giri + + * or.po: Updated Oriya Translation + 2009-06-04 Manoj Kumar Giri * or.po: Updated Oriya Translation -- cgit v1.2.3 From 25baf857ad84bc548653194d1f1b2621c99c3963 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Jun 2009 20:49:56 +0300 Subject: Fix build on Windows: link with needed libraries. --- mail/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mail/Makefile.am b/mail/Makefile.am index 9df825ff62..30cadeb736 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -247,7 +247,9 @@ libevolution_mail_shared_la_LIBADD = \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ + $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(SMIME_LIBS) \ + $(EVOLUTION_MAIL_LIBS) \ $(THREADS_LIBS) libevolution_mail_shared_la_LDFLAGS = $(NO_UNDEFINED) -- cgit v1.2.3 From a1604724a9a5166061924869b9521c2e9de04fa5 Mon Sep 17 00:00:00 2001 From: Manoj Kumar Giri Date: Tue, 9 Jun 2009 13:12:20 +0530 Subject: Updated Oriya Translation --- po/or.po | 109 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 58 insertions(+), 51 deletions(-) diff --git a/po/or.po b/po/or.po index 998b3cf699..af579eb342 100644 --- a/po/or.po +++ b/po/or.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: or\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n" "POT-Creation-Date: 2009-06-04 12:28+0000\n" -"PO-Revision-Date: 2009-06-05 18:49+0530\n" +"PO-Revision-Date: 2009-06-09 13:09+0530\n" "Last-Translator: Manoj Kumar Giri \n" "Language-Team: Oriya \n" "MIME-Version: 1.0\n" @@ -42,6 +42,7 @@ msgstr "" "\n" "\n" "\n" +"\n" "X-Generator: KBabel 1.11.4\n" #: ../a11y/addressbook/ea-addressbook-view.c:94 @@ -14596,6 +14597,10 @@ msgid "" "you want Evolution to restart automatically after backup, please enable the " "toggle button." msgstr "" +"Evolution ନକଲ ସଂରକ୍ଷଣ କେବଳ Evolution ଚାଲୁନଥିବା ସମୟରେ ଆରମ୍ଭ ହୋଇଥାଏ। ଦୟାକରି " +"ସୁନିଶ୍ଚିତ କରନ୍ତୁ ଯେ ଆପଣ ଅଗ୍ରସର ହେବା ପୂର୍ବରୁ ସମସ୍ତ ଅସଂରକ୍ଷିତ ୱିଣ୍ଡୋଗୁଡ଼ିକୁ ସଂରକ୍ଷଣ କରି ବନ୍ଦ " +"କରିଛନ୍ତି। ଯଦି ଆପଣ ଚାହାନ୍ତି ତେବେ Evolution ସ୍ୱୟଂଚାଳିତ ଭାବରେ ନକଲ ସଂରକ୍ଷଣ ପରେ ପୁନଃଚାଳନ " +"ହେବ, ଦୟାକରି ଅଦଳବଦଳ ବଟନକୁ ସକ୍ରିୟ କରନ୍ତୁ।" #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4 msgid "Insufficient Permissions" @@ -16522,7 +16527,9 @@ msgstr "ହାର୍ଡୱେର ଛାଣିବା ସ୍ତରକୁ ଧାର msgid "" "The \"hald\" service is required but not currently running. Please enable " "the service and rerun this program, or contact your system administrator." -msgstr "ଅଟେ ନୁହେଁ ଚାଲୁଅଛି ଦୟାକରି ସକ୍ରିୟ ଏବଂ ଏହା ପ୍ରୋଗ୍ରାମ କିମ୍ବା ସମ୍ପର୍କ ତନ୍ତ୍ର." +msgstr "" +"\"hald\" ସର୍ଭିସଟି ଆବଶ୍ୟକ କିନ୍ତୁ ବର୍ତ୍ତମାନ ଚାଲୁନାହିଁ। ଦୟାକରି ଏହି ସର୍ଭିସକୁ ସକ୍ରିୟ କରନ୍ତୁ ଏବଂ ଏହି ପ୍ରଗ୍ରାମକୁ ପୁଣି ଚଲାନ୍ତୁ, " +"କିମ୍ବା ଆପଣଙ୍କର ତନ୍ତ୍ର ପ୍ରଶାସକଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ।" #: ../plugins/ipod-sync/evolution-ipod-sync.c:83 msgid "Search for an iPod failed" @@ -16550,7 +16557,7 @@ msgstr "Apple iPod ସହିତ ଆପଣଙ୍କର ତଥ୍ୟକୁ ସମ #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3 msgid "iPod Synchronization" -msgstr "" +msgstr "iPod ସମକାଳୀନ" #: ../plugins/itip-formatter/itip-formatter.c:482 #: ../plugins/itip-formatter/itip-formatter.c:607 @@ -16742,7 +16749,7 @@ msgstr "ଦ୍ୱନ୍ଦ ସନ୍ଧାନ" #: ../plugins/itip-formatter/itip-formatter.c:2586 #, fuzzy msgid "Select the calendars to search for meeting conflicts" -msgstr "ମନୋନୀତ କର କୁ ପାଇଁ" +msgstr "ସାକ୍ଷାତକାର ଦ୍ୱନ୍ଦଗୁଡ଼ିକୁ ସନ୍ଧାନ କରିବା ପାଇଁ ଗୋଟିଏ କ୍ୟାଲେଣ୍ଡର ବାଛନ୍ତୁ" #. strftime format of a weekday and a date. #: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34 @@ -16755,21 +16762,21 @@ msgstr "ଆଜି" #: ../plugins/itip-formatter/itip-view.c:196 #, fuzzy msgid "Today %H:%M" -msgstr "ଆଜି H M" +msgstr "ଆଜି %H:%M" #. strftime format of a time, #. in 24-hour format. #: ../plugins/itip-formatter/itip-view.c:200 #, fuzzy msgid "Today %H:%M:%S" -msgstr "ଆଜି H M S" +msgstr "ଆଜି %H:%M:%S" #. strftime format of a time, #. in 12-hour format. #: ../plugins/itip-formatter/itip-view.c:209 #, fuzzy msgid "Today %l:%M:%S %p" -msgstr "ଆଜି M S" +msgstr "ଆଜି %l:%M:%S %p" #. strftime format of a weekday and a date. #: ../plugins/itip-formatter/itip-view.c:219 @@ -16781,69 +16788,69 @@ msgstr "ଆସନ୍ତାକାଲି" #: ../plugins/itip-formatter/itip-view.c:224 #, fuzzy msgid "Tomorrow %H:%M" -msgstr "ଆସନ୍ତାକାଲି H M" +msgstr "ଆସନ୍ତାକାଲି %H:%M" #. strftime format of a time, #. in 24-hour format. #: ../plugins/itip-formatter/itip-view.c:228 #, fuzzy msgid "Tomorrow %H:%M:%S" -msgstr "ଆସନ୍ତାକାଲି H M S" +msgstr "ଆସନ୍ତାକାଲି %H:%M:%S" #. strftime format of a time, #. in 12-hour format, without seconds. #: ../plugins/itip-formatter/itip-view.c:233 #, fuzzy msgid "Tomorrow %l:%M %p" -msgstr "ଆସନ୍ତାକାଲି M" +msgstr "ଆସନ୍ତାକାଲି %l:%M %p" #. strftime format of a time, #. in 12-hour format. #: ../plugins/itip-formatter/itip-view.c:237 #, fuzzy msgid "Tomorrow %l:%M:%S %p" -msgstr "ଆସନ୍ତାକାଲି M S" +msgstr "ଆସନ୍ତାକାଲି %l:%M:%S %p" #. strftime format of a weekday. #: ../plugins/itip-formatter/itip-view.c:256 #, fuzzy, c-format msgid "%A" -msgstr "A" +msgstr "%A" #. strftime format of a weekday and a #. time, in 24-hour format, without seconds. #: ../plugins/itip-formatter/itip-view.c:261 #, fuzzy msgid "%A %H:%M" -msgstr "A H M" +msgstr "%A %H:%M" #. strftime format of a weekday and a #. time, in 24-hour format. #: ../plugins/itip-formatter/itip-view.c:265 #, fuzzy msgid "%A %H:%M:%S" -msgstr "A H M S" +msgstr "%A %H:%M:%S" #. strftime format of a weekday and a #. time, in 12-hour format, without seconds. #: ../plugins/itip-formatter/itip-view.c:270 #, fuzzy msgid "%A %l:%M %p" -msgstr "A M" +msgstr "%A %l:%M %p" #. strftime format of a weekday and a #. time, in 12-hour format. #: ../plugins/itip-formatter/itip-view.c:274 #, fuzzy msgid "%A %l:%M:%S %p" -msgstr "A M S" +msgstr "%A %l:%M:%S %p" #. strftime format of a weekday and a date #. without a year. #: ../plugins/itip-formatter/itip-view.c:283 #, fuzzy msgid "%A, %B %e" -msgstr "A B e" +msgstr "%A, %B %e" #. strftime format of a weekday, a date #. without a year and a time, @@ -16851,62 +16858,62 @@ msgstr "A B e" #: ../plugins/itip-formatter/itip-view.c:289 #, fuzzy msgid "%A, %B %e %H:%M" -msgstr "A B e H M" +msgstr "%A, %B %e %H:%M" #. strftime format of a weekday, a date without a year #. and a time, in 24-hour format. #: ../plugins/itip-formatter/itip-view.c:293 #, fuzzy msgid "%A, %B %e %H:%M:%S" -msgstr "A B e H M S" +msgstr "%A, %B %e %H:%M:%S" #. strftime format of a weekday, a date without a year #. and a time, in 12-hour format, without seconds. #: ../plugins/itip-formatter/itip-view.c:298 #, fuzzy msgid "%A, %B %e %l:%M %p" -msgstr "A B e M" +msgstr "%A, %B %e %l:%M %p" #. strftime format of a weekday, a date without a year #. and a time, in 12-hour format. #: ../plugins/itip-formatter/itip-view.c:302 #, fuzzy msgid "%A, %B %e %l:%M:%S %p" -msgstr "A B e M S" +msgstr "%A, %B %e %l:%M:%S %p" #. strftime format of a weekday and a date. #: ../plugins/itip-formatter/itip-view.c:308 #, fuzzy msgid "%A, %B %e, %Y" -msgstr "A B e Y" +msgstr "%A, %B %e, %Y" #. strftime format of a weekday, a date and a #. time, in 24-hour format, without seconds. #: ../plugins/itip-formatter/itip-view.c:313 #, fuzzy msgid "%A, %B %e, %Y %H:%M" -msgstr "A B e Y H M" +msgstr "%A, %B %e, %Y %H:%M" #. strftime format of a weekday, a date and a #. time, in 24-hour format. #: ../plugins/itip-formatter/itip-view.c:317 #, fuzzy msgid "%A, %B %e, %Y %H:%M:%S" -msgstr "A B e Y H M S" +msgstr "%A, %B %e, %Y %H:%M:%S" #. strftime format of a weekday, a date and a #. time, in 12-hour format, without seconds. #: ../plugins/itip-formatter/itip-view.c:322 #, fuzzy msgid "%A, %B %e, %Y %l:%M %p" -msgstr "A B e Y M" +msgstr "%A, %B %e, %Y %l:%M %p" #. strftime format of a weekday, a date and a #. time, in 12-hour format. #: ../plugins/itip-formatter/itip-view.c:326 #, fuzzy msgid "%A, %B %e, %Y %l:%M:%S %p" -msgstr "A B e Y M S" +msgstr "%A, %B %e, %Y %l:%M:%S %p" #: ../plugins/itip-formatter/itip-view.c:351 #: ../plugins/itip-formatter/itip-view.c:439 @@ -17116,12 +17123,12 @@ msgstr " କୁ ଯୋଗ କରନ୍ତୁ କୁ:" #: ../plugins/itip-formatter/itip-view.c:543 #, fuzzy, c-format msgid "%s wishes to add to an existing memo:" -msgstr " କୁ ଯୋଗ କରନ୍ତୁ କୁ:" +msgstr "%s ଗୋଟିଏ ସ୍ଥିତବାନ ସ୍ମାରକ ପତ୍ରରେ ଯୋଗ କରିବା ପାଇଁ ଇଚ୍ଛାକରିଥାଏ:" #: ../plugins/itip-formatter/itip-view.c:547 #, fuzzy, c-format msgid "%s through %s has canceled the following shared memo:" -msgstr " ନିମ୍ନଲିଖିତ:" +msgstr "%s %s ମାଧ୍ଯମରେ ନିମ୍ନଲିଖିତ ସହଭାଗୀ ସ୍ମାରକପତ୍ରକୁ ବାତିଲ କରିଛି:" #: ../plugins/itip-formatter/itip-view.c:549 #, c-format @@ -17219,14 +17226,14 @@ msgstr "ପାର୍ଶ୍ବ ପଟିକୁ ପ୍ରଦର୍ଶନ କରନ #: ../plugins/itip-formatter/itip-view.c:1155 #, fuzzy msgid "_Preserve my reminder" -msgstr "ସଂରକ୍ଷଣ" +msgstr "ମୋର ସ୍ମାରକକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ (_P)" #. To Translators: This is a check box to inherit a reminder. #: ../plugins/itip-formatter/itip-view.c:1161 #, fuzzy #| msgid "Sh_ow a reminder" msgid "_Inherit reminder" -msgstr "ଗୋଟିଏ ସ୍ମାରକପତ୍ର ଦେଖାନ୍ତୁ (_o)" +msgstr "ଗୋଟିଏ ସ୍ମାରକପତ୍ର ଦେଖାନ୍ତୁ (_I)" #: ../plugins/itip-formatter/itip-view.c:1917 msgid "_Memos:" @@ -17383,17 +17390,17 @@ msgstr "ବିଜ୍ଞପ୍ତି କ୍ଷେତ୍ରରେ ଚିତ୍ର #: ../plugins/mail-notification/mail-notification.c:569 #, fuzzy msgid "B_link icon in notification area" -msgstr "B ସଂଯୋଗ ଚିତ୍ରସଙ୍କେତ ଇଞ୍ଚ" +msgstr "ସୂଚନା ପରିସରରେ ଦପଦପ ଚିତ୍ରସଙ୍କେତ (_l)" #: ../plugins/mail-notification/mail-notification.c:571 #, fuzzy msgid "Popup _message together with the icon" -msgstr "ପପ-ଅପ ସହିତ ଚିତ୍ରସଙ୍କେତ" +msgstr "ଚିତ୍ରସଙ୍କେତ ସହିତ ପପ-ଅପ ସନ୍ଦେଶ (_m)" #: ../plugins/mail-notification/mail-notification.c:752 #, fuzzy msgid "_Play sound when new messages arrive" -msgstr "ବଜାଅ ନୂତନ" +msgstr "ନୂତନ ସନ୍ଦେଶ ଆସିବା ସମୟରେ ଧ୍ୱନି ଚଲାନ୍ତୁ (_P)" #: ../plugins/mail-notification/mail-notification.c:758 msgid "_Beep" @@ -17418,7 +17425,7 @@ msgstr "ଚଲାନ୍ତୁ (_a)" #: ../plugins/mail-notification/mail-notification.c:829 #, fuzzy msgid "Notify new messages for _Inbox only" -msgstr "ସୂଚୀତ କରନ୍ତୁ ନୂତନ ପାଇଁ ଇନବକ୍ସ" +msgstr "କେବଳ ଇନବକ୍ସ ପାଇଁ ନୂତନ ସନ୍ଦେଶ ସୂଚୀତ କରନ୍ତୁ (_I)" #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1 msgid "Mail Notification" @@ -17547,12 +17554,12 @@ msgstr "ତାଲିକାରେ ସନ୍ଦେଶ ପୋଷ୍ଟ କରନ୍ #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8 #, fuzzy msgid "_Subscribe to list" -msgstr "କିଣନ୍ତୁ କୁ ତାଲିକା" +msgstr "ତାଲିକାକୁ କିଣନ୍ତୁ (_S)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9 #, fuzzy msgid "_Un-subscribe to list" -msgstr "କୁ ତାଲିକା" +msgstr "ତାଲିକାକୁ କିଣନ୍ତୁ ନାହିଁ (_U)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1 msgid "Action not available" @@ -17625,7 +17632,7 @@ msgstr "ସନ୍ଦେଶ ପଠାନ୍ତୁ (_S)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1 msgid "Contact List _Owner" -msgstr "" +msgstr "ସମ୍ପର୍କ ତାଲିକା ମାଲିକ (_O)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2 msgid "Contact the owner of the mailing list this message belongs to" @@ -17638,12 +17645,12 @@ msgstr "ତାଲିକା ଅଭିଲେଖନ ପ୍ରାପ୍ତ କରନ #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4 #, fuzzy msgid "Get List _Usage Information" -msgstr "ପ୍ରାପ୍ତ କର ତାଲିକା ବ୍ୟବହାର ବିଧି ସୂଚନା" +msgstr "ବ୍ୟବହାର ବିଧି ସୂଚନା ତାଲିକା ପ୍ରାପ୍ତ କରନ୍ତୁ (_U)" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5 #, fuzzy msgid "Get an archive of the list this message belongs to" -msgstr "ପ୍ରାପ୍ତ କର ର ତାଲିକା ଏହା କୁ" +msgstr "ଏହି ସନ୍ଦେଶଟି ଯେଉଁଠୁ ଆସିଛି ସେହି ମେଲ ତାଲିକାର ଗୋଟିଏ ଆଲେଖୀ ଗ୍ରହଣ କରନ୍ତୁ" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6 #, fuzzy @@ -17653,17 +17660,17 @@ msgstr "ପ୍ରାପ୍ତ କର ବିଷଯରେ ର ତାଲିକା #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8 #, fuzzy msgid "Post a message to the mailing list this message belongs to" -msgstr "ପୋଷ୍ଟ a କୁ ତାଲିକା ଏହା କୁ" +msgstr "ଏହି ସନ୍ଦେଶଟି ଯେଉଁଠୁ ଆସିଛି ସେହି ମେଲ ତାଲିକାରେ ଗୋଟିଏ ସନ୍ଦେଶ ଦିଅନ୍ତୁ" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9 #, fuzzy msgid "Subscribe to the mailing list this message belongs to" -msgstr "କିଣନ୍ତୁ କୁ ତାଲିକା ଏହା କୁ" +msgstr "ଏହି ସନ୍ଦେଶଟି ଯେଉଁଠୁ ଆସିଛି ସେହି ମେଲ ତାଲିକାକୁ ସ୍ବୀକାରକ୍ତି ଦିଅନ୍ତୁ" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10 #, fuzzy msgid "Unsubscribe to the mailing list this message belongs to" -msgstr "ଅସ୍ବୀକାରକ୍ତି କୁ ତାଲିକା ଏହା କୁ" +msgstr "ଏହି ସନ୍ଦେଶଟି ଯେଉଁଠୁ ଆସିଛି ସେହି ମେଲ ତାଲିକାକୁ ଅସ୍ବୀକାରକ୍ତି ଦିଅନ୍ତୁ" #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11 msgid "_Post Message to List" @@ -19068,7 +19075,7 @@ msgstr "" #: ../shell/shell.error.xml.h:32 msgid "_Forget" -msgstr "" +msgstr "ଭୁଲିଯାଏ (_F)" #: ../shell/shell.error.xml.h:33 msgid "_Keep Data" @@ -19076,7 +19083,7 @@ msgstr "ତଥ୍ଯ ରଖନ୍ତୁ (_K)" #: ../shell/shell.error.xml.h:34 msgid "_Remind Me Later" -msgstr "" +msgstr "ମୋତେ ପରେ ସ୍ମରଣ କରାନ୍ତୁ (_R)" #: ../shell/shell.error.xml.h:35 msgid "" @@ -19395,7 +19402,7 @@ msgstr "ହସ୍ତାକ୍ଷର କରନ୍ତୁ" #: ../smime/lib/e-cert.c:409 msgid "Encrypt" -msgstr "" +msgstr "ସଂଗୁପ୍ତ" #: ../smime/lib/e-cert.c:514 msgid "Version" @@ -19484,11 +19491,11 @@ msgstr "ଇ-ଡାକ" #: ../smime/lib/e-cert.c:850 msgid "Signing" -msgstr "" +msgstr "ହସ୍ତାକ୍ଷର କରୁଅଛି" #: ../smime/lib/e-cert.c:854 msgid "Non-repudiation" -msgstr "" +msgstr "ଅଖଣ୍ଡନ" #: ../smime/lib/e-cert.c:858 msgid "Key Encipherment" @@ -19504,11 +19511,11 @@ msgstr "କି ଚୁକ୍ତିପତ୍ର" #: ../smime/lib/e-cert.c:870 msgid "Certificate Signer" -msgstr "" +msgstr "ପ୍ରମାଣପତ୍ର ହସ୍ତାକ୍ଷର କାରୀ" #: ../smime/lib/e-cert.c:874 msgid "CRL Signer" -msgstr "" +msgstr "CRL ହସ୍ତାକ୍ଷରକାରୀ" #: ../smime/lib/e-cert.c:922 msgid "Critical" @@ -19557,7 +19564,7 @@ msgstr "PKCS12 ଫାଇଲ ପାଇଁ ପ୍ରବେଶ ସଂକେତ ଭ #: ../smime/lib/e-pkcs12.c:348 msgid "Imported Certificate" -msgstr "" +msgstr "ଆମଦାନୀ କରାଯାଇଥିବା ପ୍ରମାଣପତ୍ର" #. This most likely means that KILL_PROCESS_CMD wasn't #. * found, so just bail completely. @@ -19721,7 +19728,7 @@ msgstr "ଦେଖାଅ ସମ୍ପର୍କ ୱିଣ୍ଡୋ" #: ../ui/evolution-addressbook.xml.h:41 msgid "St_op" -msgstr "" +msgstr "ଅଟକନ୍ତୁ (_o)" #: ../ui/evolution-addressbook.xml.h:42 msgid "Stop" -- cgit v1.2.3 From 21ac085551d7c16dd900742a00ca8ef376b77a03 Mon Sep 17 00:00:00 2001 From: Manoj Kumar Giri Date: Tue, 9 Jun 2009 13:12:43 +0530 Subject: Added entries for Oriya Translation --- po/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/po/ChangeLog b/po/ChangeLog index 25b458fcdd..1f850530fb 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-06-09 Manoj Kumar Giri + + * or.po: Updated Oriya Translation. + 2009-06-04 Manoj Kumar Giri * or.po: Updated Oriya Translation -- cgit v1.2.3 From 209168921d0e6cbc38c6856e45af7085696b961e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 3 Jun 2009 15:02:14 -0400 Subject: Fix a runtime warning for zero-length attachments. --- widgets/misc/e-attachment.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index 35c377abe5..ba2811d5d9 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -2430,10 +2430,14 @@ attachment_save_got_output_stream (SaveContext *save_context) camel_data_wrapper_decode_to_stream (wrapper, stream); camel_object_unref (stream); - /* Load the buffer into a GMemoryInputStream. */ - input_stream = g_memory_input_stream_new_from_data ( - buffer->data, (gssize) buffer->len, - (GDestroyNotify) g_free); + /* Load the buffer into a GMemoryInputStream. + * But watch out for zero length MIME parts. */ + input_stream = g_memory_input_stream_new (); + if (buffer->len > 0) + g_memory_input_stream_add_data ( + G_MEMORY_INPUT_STREAM (input_stream), + buffer->data, (gssize) buffer->len, + (GDestroyNotify) g_free); save_context->input_stream = input_stream; save_context->total_num_bytes = (goffset) buffer->len; g_byte_array_free (buffer, FALSE); -- cgit v1.2.3