remove trailing spaces

SVN revision: 31638
devs/devilhorns/wayland_egl
doursse 16 years ago committed by doursse
parent 5209a42671
commit 6a7494bba7
  1. 2
      legacy/efreet/src/bin/Makefile.am
  2. 507
      legacy/efreet/src/bin/compare/comp.h
  3. 3
      legacy/efreet/src/bin/ef_data_dirs.c
  4. 17
      legacy/efreet/src/bin/ef_desktop.c
  5. 17
      legacy/efreet/src/bin/ef_icon_theme.c
  6. 14
      legacy/efreet/src/bin/ef_ini.c
  7. 11
      legacy/efreet/src/bin/ef_locale.c
  8. 3
      legacy/efreet/src/bin/ef_menu.c
  9. 14
      legacy/efreet/src/bin/ef_mime.c
  10. 3
      legacy/efreet/src/bin/efreet_spec_test.c
  11. 9
      legacy/efreet/src/bin/main.c
  12. 5
      legacy/efreet/src/lib/Efreet.h
  13. 10
      legacy/efreet/src/lib/Efreet_Mime.h
  14. 2
      legacy/efreet/src/lib/Makefile.am
  15. 6
      legacy/efreet/src/lib/efreet.c
  16. 7
      legacy/efreet/src/lib/efreet_base.c
  17. 5
      legacy/efreet/src/lib/efreet_base.h
  18. 232
      legacy/efreet/src/lib/efreet_desktop.c
  19. 31
      legacy/efreet/src/lib/efreet_desktop.h
  20. 2
      legacy/efreet/src/lib/efreet_icon.c
  21. 39
      legacy/efreet/src/lib/efreet_icon.h
  22. 18
      legacy/efreet/src/lib/efreet_ini.c
  23. 13
      legacy/efreet/src/lib/efreet_ini.h
  24. 211
      legacy/efreet/src/lib/efreet_menu.c
  25. 3
      legacy/efreet/src/lib/efreet_menu.h
  26. 281
      legacy/efreet/src/lib/efreet_mime.c
  27. 19
      legacy/efreet/src/lib/efreet_private.h
  28. 4
      legacy/efreet/src/lib/efreet_utils.c
  29. 12
      legacy/efreet/src/lib/efreet_xml.c
  30. 9
      legacy/efreet/src/lib/efreet_xml.h

@ -1,4 +1,6 @@
SUBDIRS = data compare
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \

@ -5,268 +5,268 @@
#define THEME "Tango"
#define SIZE "16x16"
#define ADDRESS_BOOK_NEW "address-book-new"
#define APPLICATION_EXIT "application-exit"
#define APPOINTMENT_NEW "appointment-new"
#define CONTACT_NEW "contact-new"
#define DIALOG_APPLY "dialog-apply"
#define DIALOG_CANCEL "dialog-cancel"
#define DIALOG_CLOSE "dialog-close"
#define DIALOG_OK "dialog-ok"
#define DOCUMENT_NEW "document-new"
#define DOCUMENT_OPEN "document-open"
#define DOCUMENT_OPEN_RECENT "document-open-recent"
#define DOCUMENT_PAGE_SETUP "document-page-setup"
#define DOCUMENT_PRINT "document-print"
#define DOCUMENT_PRINT_PREVIEW "document-print-preview"
#define DOCUMENT_PROPERTIES "document-properties"
#define DOCUMENT_REVERT "document-revert"
#define DOCUMENT_SAVE "document-save"
#define DOCUMENT_SAVE_AS "document-save-as"
#define EDIT_COPY "edit-copy"
#define EDIT_CUT "edit-cut"
#define EDIT_DELETE "edit-delete"
#define EDIT_FIND "edit-find"
#define EDIT_FIND_REPLACE "edit-find-replace"
#define EDIT_PASTE "edit-paste"
#define EDIT_REDO "edit-redo"
#define EDIT_SELECT_ALL "edit-select-all"
#define EDIT_UNDO "edit-undo"
#define FORMAT_INDENT_LESS "format-indent-less"
#define FORMAT_INDENT_MORE "format-indent-more"
#define FORMAT_JUSTIFY_CENTER "format-justify-center"
#define FORMAT_JUSTIFY_FILL "format-justify-fill"
#define FORMAT_JUSTIFY_LEFT "format-justify-left"
#define FORMAT_JUSTIFY_RIGHT "format-justify-right"
#define FORMAT_TEXT_DIRECTION_LTR "format-text-direction-ltr"
#define FORMAT_TEXT_DIRECTION_RTL "format-text-direction-rtl"
#define FORMAT_TEXT_BOLD "format-text-bold"
#define FORMAT_TEXT_ITALIC "format-text-italic"
#define FORMAT_TEXT_UNDERLINE "format-text-underline"
#define FORMAT_TEXT_STRIKETHROUGH "format-text-strikethrough"
#define GO_BOTTOM "go-bottom"
#define GO_DOWN "go-down"
#define GO_FIRST "go-first"
#define GO_HOME "go-home"
#define GO_JUMP "go-jump"
#define GO_LAST "go-last"
#define GO_NEXT "go-next"
#define GO_PREVIOUS "go-previous"
#define GO_TOP "go-top"
#define GO_UP "go-up"
#define HELP_ABOUT "help-about"
#define HELP_CONTENTS "help-contents"
#define HELP_FAQ "help-faq"
#define INSERT_IMAGE "insert-image"
#define INSERT_LINK "insert-link"
#define INSERT_OBJECT "insert-object"
#define INSERT_TEXT "insert-text"
#define LIST_ADD "list-add"
#define LIST_REMOVE "list-remove"
#define MAIL_FORWARD "mail-forward"
#define MAIL_MARK_IMPORTANT "mail-mark-important"
#define MAIL_MARK_JUNK "mail-mark-junk"
#define MAIL_MARK_NOTJUNK "mail-mark-notjunk"
#define MAIL_MARK_READ "mail-mark-read"
#define MAIL_MARK_UNREAD "mail-mark-unread"
#define MAIL_MESSAGE_NEW "mail-message-new"
#define MAIL_REPLY_ALL "mail-reply-all"
#define MAIL_REPLY_SENDER "mail-reply-sender"
#define MAIL_SEND_RECEIVE "mail-send-receive"
#define MEDIA_EJECT "media-eject"
#define MEDIA_PLAYBACK_PAUSE "media-playback-pause"
#define MEDIA_PLAYBACK_START "media-playback-start"
#define MEDIA_PLAYBACK_STOP "media-playback-stop"
#define MEDIA_RECORD "media-record"
#define MEDIA_SEEK_BACKWARD "media-seek-backward"
#define MEDIA_SEEK_FORWARD "media-seek-forward"
#define MEDIA_SKIP_BACKWARD "media-skip-backward"
#define MEDIA_SKIP_FORWARD "media-skip-forward"
#define SYSTEM_LOCK_SCREEN "system-lock-screen"
#define SYSTEM_LOG_OUT "system-log-out"
#define SYSTEM_RUN "system-run"
#define SYSTEM_SEARCH "system-search"
#define TOOLS_CHECK_SPELLING "tools-check-spelling"
#define VIEW_FULLSCREEN "view-fullscreen"
#define VIEW_REFRESH "view-refresh"
#define VIEW_SORT_ASCENDING "view-sort-ascending"
#define VIEW_SORT_DESCENDING "view-sort-descending"
#define WINDOW_CLOSE "window-close"
#define WINDOW_NEW "window-new"
#define ZOOM_BEST_FIT "zoom-best-fit"
#define ZOOM_IN "zoom-in"
#define ZOOM_ORIGINAL "zoom-original"
#define ZOOM_OUT "zoom-out"
#define ADDRESS_BOOK_NEW "address-book-new"
#define APPLICATION_EXIT "application-exit"
#define APPOINTMENT_NEW "appointment-new"
#define CONTACT_NEW "contact-new"
#define DIALOG_APPLY "dialog-apply"
#define DIALOG_CANCEL "dialog-cancel"
#define DIALOG_CLOSE "dialog-close"
#define DIALOG_OK "dialog-ok"
#define DOCUMENT_NEW "document-new"
#define DOCUMENT_OPEN "document-open"
#define DOCUMENT_OPEN_RECENT "document-open-recent"
#define DOCUMENT_PAGE_SETUP "document-page-setup"
#define DOCUMENT_PRINT "document-print"
#define DOCUMENT_PRINT_PREVIEW "document-print-preview"
#define DOCUMENT_PROPERTIES "document-properties"
#define DOCUMENT_REVERT "document-revert"
#define DOCUMENT_SAVE "document-save"
#define DOCUMENT_SAVE_AS "document-save-as"
#define EDIT_COPY "edit-copy"
#define EDIT_CUT "edit-cut"
#define EDIT_DELETE "edit-delete"
#define EDIT_FIND "edit-find"
#define EDIT_FIND_REPLACE "edit-find-replace"
#define EDIT_PASTE "edit-paste"
#define EDIT_REDO "edit-redo"
#define EDIT_SELECT_ALL "edit-select-all"
#define EDIT_UNDO "edit-undo"
#define FORMAT_INDENT_LESS "format-indent-less"
#define FORMAT_INDENT_MORE "format-indent-more"
#define FORMAT_JUSTIFY_CENTER "format-justify-center"
#define FORMAT_JUSTIFY_FILL "format-justify-fill"
#define FORMAT_JUSTIFY_LEFT "format-justify-left"
#define FORMAT_JUSTIFY_RIGHT "format-justify-right"
#define FORMAT_TEXT_DIRECTION_LTR "format-text-direction-ltr"
#define FORMAT_TEXT_DIRECTION_RTL "format-text-direction-rtl"
#define FORMAT_TEXT_BOLD "format-text-bold"
#define FORMAT_TEXT_ITALIC "format-text-italic"
#define FORMAT_TEXT_UNDERLINE "format-text-underline"
#define FORMAT_TEXT_STRIKETHROUGH "format-text-strikethrough"
#define GO_BOTTOM "go-bottom"
#define GO_DOWN "go-down"
#define GO_FIRST "go-first"
#define GO_HOME "go-home"
#define GO_JUMP "go-jump"
#define GO_LAST "go-last"
#define GO_NEXT "go-next"
#define GO_PREVIOUS "go-previous"
#define GO_TOP "go-top"
#define GO_UP "go-up"
#define HELP_ABOUT "help-about"
#define HELP_CONTENTS "help-contents"
#define HELP_FAQ "help-faq"
#define INSERT_IMAGE "insert-image"
#define INSERT_LINK "insert-link"
#define INSERT_OBJECT "insert-object"
#define INSERT_TEXT "insert-text"
#define LIST_ADD "list-add"
#define LIST_REMOVE "list-remove"
#define MAIL_FORWARD "mail-forward"
#define MAIL_MARK_IMPORTANT "mail-mark-important"
#define MAIL_MARK_JUNK "mail-mark-junk"
#define MAIL_MARK_NOTJUNK "mail-mark-notjunk"
#define MAIL_MARK_READ "mail-mark-read"
#define MAIL_MARK_UNREAD "mail-mark-unread"
#define MAIL_MESSAGE_NEW "mail-message-new"
#define MAIL_REPLY_ALL "mail-reply-all"
#define MAIL_REPLY_SENDER "mail-reply-sender"
#define MAIL_SEND_RECEIVE "mail-send-receive"
#define MEDIA_EJECT "media-eject"
#define MEDIA_PLAYBACK_PAUSE "media-playback-pause"
#define MEDIA_PLAYBACK_START "media-playback-start"
#define MEDIA_PLAYBACK_STOP "media-playback-stop"
#define MEDIA_RECORD "media-record"
#define MEDIA_SEEK_BACKWARD "media-seek-backward"
#define MEDIA_SEEK_FORWARD "media-seek-forward"
#define MEDIA_SKIP_BACKWARD "media-skip-backward"
#define MEDIA_SKIP_FORWARD "media-skip-forward"
#define SYSTEM_LOCK_SCREEN "system-lock-screen"
#define SYSTEM_LOG_OUT "system-log-out"
#define SYSTEM_RUN "system-run"
#define SYSTEM_SEARCH "system-search"
#define TOOLS_CHECK_SPELLING "tools-check-spelling"
#define VIEW_FULLSCREEN "view-fullscreen"
#define VIEW_REFRESH "view-refresh"
#define VIEW_SORT_ASCENDING "view-sort-ascending"
#define VIEW_SORT_DESCENDING "view-sort-descending"
#define WINDOW_CLOSE "window-close"
#define WINDOW_NEW "window-new"
#define ZOOM_BEST_FIT "zoom-best-fit"
#define ZOOM_IN "zoom-in"
#define ZOOM_ORIGINAL "zoom-original"
#define ZOOM_OUT "zoom-out"
#define PROCESS_WORKING "process-working"
#define PROCESS_WORKING "process-working"
#define ACCESSORIES_CALCULATOR "accessories-calculator"
#define ACCESSORIES_CHARACTER_MAP "accessories-character-map"
#define ACCESSORIES_DICTIONARY "accessories-dictionary"
#define ACCESSORIES_TEXT_EDITOR "accessories-text-editor"
#define HELP_BROWSER "help-browser"
#define MULTIMEDIA_VOLUME_CONTROL "multimedia-volume-control"
#define PREFERENCES_DESKTOP_ACCESSIBILITY "preferences-desktop-accessibility"
#define PREFERENCES_DESKTOP_FONT "preferences-desktop-font"
#define PREFERENCES_DESKTOP_KEYBOARD "preferences-desktop-keyboard"
#define PREFERENCES_DESKTOP_LOCALE "preferences-desktop-locale"
#define PREFERENCES_DESKTOP_MULTIMEDIA "preferences-desktop-multimedia"
#define PREFERENCES_DESKTOP_SCREENSAVER "preferences-desktop-screensaver"
#define PREFERENCES_DESKTOP_THEME "preferences-desktop-theme"
#define PREFERENCES_DESKTOP_WALLPAPER "preferences-desktop-wallpaper"
#define SYSTEM_FILE_MANAGER "system-file-manager"
#define SYSTEM_SOFTWARE_UPDATE "system-software-update"
#define UTILITIES_TERMINAL "utilities-terminal"
#define ACCESSORIES_CALCULATOR "accessories-calculator"
#define ACCESSORIES_CHARACTER_MAP "accessories-character-map"
#define ACCESSORIES_DICTIONARY "accessories-dictionary"
#define ACCESSORIES_TEXT_EDITOR "accessories-text-editor"
#define HELP_BROWSER "help-browser"
#define MULTIMEDIA_VOLUME_CONTROL "multimedia-volume-control"
#define PREFERENCES_DESKTOP_ACCESSIBILITY "preferences-desktop-accessibility"
#define PREFERENCES_DESKTOP_FONT "preferences-desktop-font"
#define PREFERENCES_DESKTOP_KEYBOARD "preferences-desktop-keyboard"
#define PREFERENCES_DESKTOP_LOCALE "preferences-desktop-locale"
#define PREFERENCES_DESKTOP_MULTIMEDIA "preferences-desktop-multimedia"
#define PREFERENCES_DESKTOP_SCREENSAVER "preferences-desktop-screensaver"
#define PREFERENCES_DESKTOP_THEME "preferences-desktop-theme"
#define PREFERENCES_DESKTOP_WALLPAPER "preferences-desktop-wallpaper"
#define SYSTEM_FILE_MANAGER "system-file-manager"
#define SYSTEM_SOFTWARE_UPDATE "system-software-update"
#define UTILITIES_TERMINAL "utilities-terminal"
#define APPLICATIONS_ACCESSORIES "applications-accessories"
#define APPLICATIONS_DEVELOPMENT "applications-development"
#define APPLICATIONS_GAMES "applications-games"
#define APPLICATIONS_GRAPHICS "applications-graphics"
#define APPLICATIONS_INTERNET "applications-internet"
#define APPLICATIONS_MULTIMEDIA "applications-multimedia"
#define APPLICATIONS_OFFICE "applications-office"
#define APPLICATIONS_OTHER "applications-other"
#define APPLICATIONS_SYSTEM "applications-system"
#define APPLICATIONS_UTILITIES "applications-utilities"
#define PREFERENCES_DESKTOP "preferences-desktop"
#define PREFERENCES_DESKTOP_ACCESSIBILITY "preferences-desktop-accessibility"
#define PREFERENCES_DESKTOP_PERIPHERALS "preferences-desktop-peripherals"
#define PREFERENCES_DESKTOP_PERSONAL "preferences-desktop-personal"
#define PREFERENCES_OTHER "preferences-other"
#define PREFERENCES_SYSTEM "preferences-system"
#define PREFERENCES_SYSTEM_NETWORK "preferences-system-network"
#define SYSTEM_HELP "system-help"
#define APPLICATIONS_ACCESSORIES "applications-accessories"
#define APPLICATIONS_DEVELOPMENT "applications-development"
#define APPLICATIONS_GAMES "applications-games"
#define APPLICATIONS_GRAPHICS "applications-graphics"
#define APPLICATIONS_INTERNET "applications-internet"
#define APPLICATIONS_MULTIMEDIA "applications-multimedia"
#define APPLICATIONS_OFFICE "applications-office"
#define APPLICATIONS_OTHER "applications-other"
#define APPLICATIONS_SYSTEM "applications-system"
#define APPLICATIONS_UTILITIES "applications-utilities"
#define PREFERENCES_DESKTOP "preferences-desktop"
#define PREFERENCES_DESKTOP_ACCESSIBILITY "preferences-desktop-accessibility"
#define PREFERENCES_DESKTOP_PERIPHERALS "preferences-desktop-peripherals"
#define PREFERENCES_DESKTOP_PERSONAL "preferences-desktop-personal"
#define PREFERENCES_OTHER "preferences-other"
#define PREFERENCES_SYSTEM "preferences-system"
#define PREFERENCES_SYSTEM_NETWORK "preferences-system-network"
#define SYSTEM_HELP "system-help"
#define AUDIO_CARD "audio-card"
#define AUDIO_INPUT_MICROPHONE "audio-input-microphone"
#define BATTERY "battery"
#define CAMERA_PHOTO "camera-photo"
#define CAMERA_VIDEO "camera-video"
#define COMPUTER "computer"
#define DRIVE_CDROM "drive-cdrom"
#define DRIVE_HARDDISK "drive-harddisk"
#define DRIVE_REMOVABLE_MEDIA "drive-removable-media"
#define INPUT_GAMING "input-gaming"
#define INPUT_KEYBOARD "input-keyboard"
#define INPUT_MOUSE "input-mouse"
#define MEDIA_CDROM "media-cdrom"
#define MEDIA_FLOPPY "media-floppy"
#define MULTIMEDIA_PLAYER "multimedia-player"
#define NETWORK_WIRED "network-wired"
#define NETWORK_WIRELESS "network-wireless"
#define PRINTER "printer"
#define AUDIO_CARD "audio-card"
#define AUDIO_INPUT_MICROPHONE "audio-input-microphone"
#define BATTERY "battery"
#define CAMERA_PHOTO "camera-photo"
#define CAMERA_VIDEO "camera-video"
#define COMPUTER "computer"
#define DRIVE_CDROM "drive-cdrom"
#define DRIVE_HARDDISK "drive-harddisk"
#define DRIVE_REMOVABLE_MEDIA "drive-removable-media"
#define INPUT_GAMING "input-gaming"
#define INPUT_KEYBOARD "input-keyboard"
#define INPUT_MOUSE "input-mouse"
#define MEDIA_CDROM "media-cdrom"
#define MEDIA_FLOPPY "media-floppy"
#define MULTIMEDIA_PLAYER "multimedia-player"
#define NETWORK_WIRED "network-wired"
#define NETWORK_WIRELESS "network-wireless"
#define PRINTER "printer"
#define EMBLEM_DEFAULT "emblem-default"
#define EMBLEM_DOCUMENTS "emblem-documents"
#define EMBLEM_DOWNLOADS "emblem-downloads"
#define EMBLEM_FAVORITE "emblem-favorite"
#define EMBLEM_IMPORTANT "emblem-important"
#define EMBLEM_MAIL "emblem-mail"
#define EMBLEM_PHOTOS "emblem-photos"
#define EMBLEM_READONLY "emblem-readonly"
#define EMBLEM_SHARED "emblem-shared"
#define EMBLEM_SYMBOLIC_LINK "emblem-symbolic-link"
#define EMBLEM_SYNCHRONIZED "emblem-synchronized"
#define EMBLEM_SYSTEM "emblem-system"
#define EMBLEM_UNREADABLE "emblem-unreadable"
#define EMBLEM_DEFAULT "emblem-default"
#define EMBLEM_DOCUMENTS "emblem-documents"
#define EMBLEM_DOWNLOADS "emblem-downloads"
#define EMBLEM_FAVORITE "emblem-favorite"
#define EMBLEM_IMPORTANT "emblem-important"
#define EMBLEM_MAIL "emblem-mail"
#define EMBLEM_PHOTOS "emblem-photos"
#define EMBLEM_READONLY "emblem-readonly"
#define EMBLEM_SHARED "emblem-shared"
#define EMBLEM_SYMBOLIC_LINK "emblem-symbolic-link"
#define EMBLEM_SYNCHRONIZED "emblem-synchronized"
#define EMBLEM_SYSTEM "emblem-system"
#define EMBLEM_UNREADABLE "emblem-unreadable"
#define FACE_ANGEL "face-angel"
#define FACE_CRYING "face-crying"
#define FACE_DEVIL_GRIN "face-devil-grin"
#define FACE_DEVIL_SAD "face-devil-sad"
#define FACE_GLASSES "face-glasses"
#define FACE_KISS "face-kiss"
#define FACE_MONKEY "face-monkey"
#define FACE_PLAIN "face-plain"
#define FACE_SAD "face-sad"
#define FACE_SMILE "face-smile"
#define FACE_SMILE_BIG "face-smile-big"
#define FACE_SMIRK "face-smirk"
#define FACE_SURPRISE "face-surprise"
#define FACE_WINK "face-wink"
#define FACE_ANGEL "face-angel"
#define FACE_CRYING "face-crying"
#define FACE_DEVIL_GRIN "face-devil-grin"
#define FACE_DEVIL_SAD "face-devil-sad"
#define FACE_GLASSES "face-glasses"
#define FACE_KISS "face-kiss"
#define FACE_MONKEY "face-monkey"
#define FACE_PLAIN "face-plain"
#define FACE_SAD "face-sad"
#define FACE_SMILE "face-smile"
#define FACE_SMILE_BIG "face-smile-big"
#define FACE_SMIRK "face-smirk"
#define FACE_SURPRISE "face-surprise"
#define FACE_WINK "face-wink"
#define APPLICATION_X_EXECUTABLE "application-x-executable"
#define AUDIO_X_GENERIC "audio-x-generic"
#define FONT_X_GENERIC "font-x-generic"
#define IMAGE_X_GENERIC "image-x-generic"
#define PACKAGE_X_GENERIC "package-x-generic"
#define TEXT_HTML "text-html"
#define TEXT_X_GENERIC "text-x-generic"
#define TEXT_X_GENERIC_TEMPLATE "text-x-generic-template"
#define TEXT_X_SCRIPT "text-x-script"
#define VIDEO_X_GENERIC "video-x-generic"
#define X_OFFICE_ADDRESS_BOOK "x-office-address-book"
#define X_OFFICE_CALENDAR "x-office-calendar"
#define X_OFFICE_DOCUMENT "x-office-document"
#define X_OFFICE_PRESENTATION "x-office-presentation"
#define X_OFFICE_SPREADSHEET "x-office-spreadsheet"
#define APPLICATION_X_EXECUTABLE "application-x-executable"
#define AUDIO_X_GENERIC "audio-x-generic"
#define FONT_X_GENERIC "font-x-generic"
#define IMAGE_X_GENERIC "image-x-generic"
#define PACKAGE_X_GENERIC "package-x-generic"
#define TEXT_HTML "text-html"
#define TEXT_X_GENERIC "text-x-generic"
#define TEXT_X_GENERIC_TEMPLATE "text-x-generic-template"
#define TEXT_X_SCRIPT "text-x-script"
#define VIDEO_X_GENERIC "video-x-generic"
#define X_OFFICE_ADDRESS_BOOK "x-office-address-book"
#define X_OFFICE_CALENDAR "x-office-calendar"
#define X_OFFICE_DOCUMENT "x-office-document"
#define X_OFFICE_PRESENTATION "x-office-presentation"
#define X_OFFICE_SPREADSHEET "x-office-spreadsheet"
#define FOLDER "folder"
#define FOLDER_REMOTE "folder-remote"
#define NETWORK_SERVER "network-server"
#define NETWORK_WORKGROUP "network-workgroup"
#define START_HERE "start-here"
#define USER_DESKTOP "user-desktop"
#define USER_HOME "user-home"
#define USER_TRASH "user-trash"
#define FOLDER "folder"
#define FOLDER_REMOTE "folder-remote"
#define NETWORK_SERVER "network-server"
#define NETWORK_WORKGROUP "network-workgroup"
#define START_HERE "start-here"
#define USER_DESKTOP "user-desktop"
#define USER_HOME "user-home"
#define USER_TRASH "user-trash"
#define APPOINTMENT_MISSED "appointment-missed"
#define APPOINTMENT_SOON "appointment-soon"
#define AUDIO_VOLUME_HIGH "audio-volume-high"
#define AUDIO_VOLUME_LOW "audio-volume-low"
#define AUDIO_VOLUME_MEDIUM "audio-volume-medium"
#define AUDIO_VOLUME_MUTED "audio-volume-muted"
#define BATTERY_CAUTION "battery-caution"
#define BATTERY_LOW "battery-low"
#define DIALOG_ERROR "dialog-error"
#define DIALOG_INFORMATION "dialog-information"
#define DIALOG_PASSWORD "dialog-password"
#define DIALOG_QUESTION "dialog-question"
#define DIALOG_WARNING "dialog-warning"
#define FOLDER_DRAG_ACCEPT "folder-drag-accept"
#define FOLDER_OPEN "folder-open"
#define FOLDER_VISITING "folder-visiting"
#define IMAGE_LOADING "image-loading"
#define IMAGE_MISSING "image-missing"
#define MAIL_ATTACHMENT "mail-attachment"
#define MAIL_UNREAD "mail-unread"
#define MAIL_READ "mail-read"
#define MAIL_REPLIED "mail-replied"
#define MAIL_SIGNED "mail-signed"
#define MAIL_SIGNED_VERIFIED "mail-signed-verified"
#define MEDIA_PLAYLIST_REPEAT "media-playlist-repeat"
#define MEDIA_PLAYLIST_SHUFFLE "media-playlist-shuffle"
#define NETWORK_ERROR "network-error"
#define NETWORK_IDLE "network-idle"
#define APPOINTMENT_MISSED "appointment-missed"
#define APPOINTMENT_SOON "appointment-soon"
#define AUDIO_VOLUME_HIGH "audio-volume-high"
#define AUDIO_VOLUME_LOW "audio-volume-low"
#define AUDIO_VOLUME_MEDIUM "audio-volume-medium"
#define AUDIO_VOLUME_MUTED "audio-volume-muted"
#define BATTERY_CAUTION "battery-caution"
#define BATTERY_LOW "battery-low"
#define DIALOG_ERROR "dialog-error"
#define DIALOG_INFORMATION "dialog-information"
#define DIALOG_PASSWORD "dialog-password"
#define DIALOG_QUESTION "dialog-question"
#define DIALOG_WARNING "dialog-warning"
#define FOLDER_DRAG_ACCEPT "folder-drag-accept"
#define FOLDER_OPEN "folder-open"
#define FOLDER_VISITING "folder-visiting"
#define IMAGE_LOADING "image-loading"
#define IMAGE_MISSING "image-missing"
#define MAIL_ATTACHMENT "mail-attachment"
#define MAIL_UNREAD "mail-unread"
#define MAIL_READ "mail-read"
#define MAIL_REPLIED "mail-replied"
#define MAIL_SIGNED "mail-signed"
#define MAIL_SIGNED_VERIFIED "mail-signed-verified"
#define MEDIA_PLAYLIST_REPEAT "media-playlist-repeat"
#define MEDIA_PLAYLIST_SHUFFLE "media-playlist-shuffle"
#define NETWORK_ERROR "network-error"
#define NETWORK_IDLE "network-idle"
#define NETWORK_OFFLINE "network-offline"
#define NETWORK_RECEIVE "network-receive"
#define NETWORK_TRANSMIT "network-transmit"
#define NETWORK_TRANSMIT_RECEIVE "network-transmit-receive"
#define PRINTER_ERROR "printer-error"
#define PRINTER_PRINTING "printer-printing"
#define SOFTWARE_UPDATE_AVAILABLE "software-update-available"
#define SOFTWARE_UPDATE_URGENT "software-update-urgent"
#define SYNC_ERROR "sync-error"
#define SYNC_SYNCHRONIZING "sync-synchronizing"
#define TASK_DUE "task-due"
#define TASK_PASSED_DUE "task-passed-due"
#define USER_AWAY "user-away"
#define USER_IDLE "user-idle"
#define USER_OFFLINE "user-offline"
#define USER_ONLINE "user-online"
#define USER_TRASH_FULL "user-trash-full"
#define WEATHER_CLEAR "weather-clear"
#define WEATHER_CLEAR_NIGHT "weather-clear-night"
#define WEATHER_FEW_CLOUDS "weather-few-clouds"
#define WEATHER_FEW_CLOUDS_NIGHT "weather-few-clouds-night"
#define WEATHER_FOG "weather-fog"
#define WEATHER_OVERCAST "weather-overcast"
#define WEATHER_SEVERE_ALERT "weather-severe-alert"
#define WEATHER_SHOWERS "weather-showers"
#define WEATHER_SHOWERS_SCATTERED "weather-showers-scattered"
#define WEATHER_SNOW "weather-snow"
#define WEATHER_STORM "weather-storm"
#define NETWORK_OFFLINE "network-offline"
#define NETWORK_RECEIVE "network-receive"
#define NETWORK_TRANSMIT "network-transmit"
#define NETWORK_TRANSMIT_RECEIVE "network-transmit-receive"
#define PRINTER_ERROR "printer-error"
#define PRINTER_PRINTING "printer-printing"
#define SOFTWARE_UPDATE_AVAILABLE "software-update-available"
#define SOFTWARE_UPDATE_URGENT "software-update-urgent"
#define SYNC_ERROR "sync-error"
#define SYNC_SYNCHRONIZING "sync-synchronizing"
#define TASK_DUE "task-due"
#define TASK_PASSED_DUE "task-passed-due"
#define USER_AWAY "user-away"
#define USER_IDLE "user-idle"
#define USER_OFFLINE "user-offline"
#define USER_ONLINE "user-online"
#define USER_TRASH_FULL "user-trash-full"
#define WEATHER_CLEAR "weather-clear"
#define WEATHER_CLEAR_NIGHT "weather-clear-night"
#define WEATHER_FEW_CLOUDS "weather-few-clouds"
#define WEATHER_FEW_CLOUDS_NIGHT "weather-few-clouds-night"
#define WEATHER_FOG "weather-fog"
#define WEATHER_OVERCAST "weather-overcast"
#define WEATHER_SEVERE_ALERT "weather-severe-alert"
#define WEATHER_SHOWERS "weather-showers"
#define WEATHER_SHOWERS_SCATTERED "weather-showers-scattered"
#define WEATHER_SNOW "weather-snow"
#define WEATHER_STORM "weather-storm"
const char *icons[] = {
ADDRESS_BOOK_NEW,
@ -414,7 +414,7 @@ const char *icons[] = {
MULTIMEDIA_PLAYER,
NETWORK_WIRED,
NETWORK_WIRELESS,
PRINTER,
PRINTER,
EMBLEM_DEFAULT,
EMBLEM_DOCUMENTS,
EMBLEM_DOWNLOADS,
@ -525,4 +525,3 @@ const char *icons[] = {
};
#endif

@ -236,7 +236,7 @@ ef_cb_efreet_config_dirs(void)
char dirs[128], *val;
char *vals[] = {"/var/tmp/a", "/tmp/b", "/usr/local/share", "/etc", NULL};
char *def_vals[] = {"/etc/xdg", NULL};
dirs[0] = '\0';
for (i = 0; vals[i] != NULL; i++)
@ -300,4 +300,3 @@ ef_cb_efreet_config_dirs(void)
}
return ret;
}

@ -17,7 +17,7 @@ ef_cb_desktop_parse(void)
int ret = 1;
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
if (!desktop)
if (!desktop)
{
printf("No desktop found.\n");
return 0;
@ -29,7 +29,7 @@ ef_cb_desktop_parse(void)
ret = 0;
}
if (!desktop->generic_name ||
if (!desktop->generic_name ||
strcmp(desktop->generic_name, "Test Application"))
{
printf("Incorrent GenericName\n");
@ -51,7 +51,7 @@ ef_cb_desktop_parse(void)
ecore_list_first_goto(desktop->categories);
while ((cat = ecore_list_next(desktop->categories)))
{
if (i >= num_categories)
if (i >= num_categories)
{
printf("Too many categories found.\n");
ret = 0;
@ -318,7 +318,7 @@ ef_cb_desktop_command_get(void)
ret = info->error > 0 ? 0 : 1;
free(info);
chdir(olddir);
return ret;
@ -367,10 +367,10 @@ ef_cb_desktop_type_parse(void)
/* add my custom desktop type to efreet */
my_type = efreet_desktop_type_add("My_Type", cb_type_parse, NULL,
(Efreet_Desktop_Type_Free_Cb)free);
(Efreet_Desktop_Type_Free_Cb)free);
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test_type.desktop");
if (!desktop)
if (!desktop)
{
printf("No desktop found.\n");
return 0;
@ -388,10 +388,7 @@ ef_cb_desktop_type_parse(void)
printf("Invalid value of custom key (%s).\n", val);
ret = 0;
}
efreet_desktop_free(desktop);
return ret;
}

@ -12,9 +12,9 @@
#define SIZE "128x128"
#define THEME "Tango"
static void ef_icon_theme_themes_find(const char *search_dir,
static void ef_icon_theme_themes_find(const char *search_dir,
Ecore_Hash *themes);
static void ef_icons_find(Efreet_Icon_Theme *theme, Ecore_List *themes,
static void ef_icons_find(Efreet_Icon_Theme *theme, Ecore_List *themes,
Ecore_Hash *icons);
static void ef_read_dir(const char *dir, Ecore_Hash *icons);
@ -70,13 +70,13 @@ ef_cb_efreet_icon_theme_list(void)
ecore_list_first_goto(icon_dirs);
ef_icon_theme_themes_find(efreet_icon_user_dir_get(), dirs);
while ((dir = ecore_list_next(icon_dirs)))
while ((dir = ecore_list_next(icon_dirs)))
{
snprintf(buf, sizeof(buf), "%s/icons", dir);
ef_icon_theme_themes_find(buf, dirs);
}
ef_icon_theme_themes_find("/usr/share/pixmaps", dirs);
themes = efreet_icon_theme_list_get();
ecore_list_first_goto(themes);
while ((theme = ecore_list_next(themes)))
@ -159,7 +159,7 @@ ef_icon_theme_themes_find(const char *search_dir, Ecore_Hash *themes)
ecore_list_destroy(dirs);
}
const char *icons[] =
const char *icons[] =
{
"address-book-new",
"application-exit",
@ -169,7 +169,7 @@ const char *icons[] =
"dialog-cancel",
"dialog-close",
"dialog-ok",
"document-new",
"document-new",
"document-open",
"document-open-recent",
"document-page-setup",
@ -445,7 +445,7 @@ ef_cb_efreet_icon_match(void)
ecore_hash_free_key_cb_set(icon_hash, free);
ecore_hash_free_value_cb_set(icon_hash, free);
ef_icons_find(theme, themes, icon_hash);
ef_icons_find(theme, themes, icon_hash);
ecore_list_destroy(themes);
for (i = 0; icons[i] != NULL; i++)
@ -580,7 +580,7 @@ ef_read_dir(const char *dir, Ecore_Hash *icons)
char *p;
p = strrchr(file, '.');
if (!p)
if (!p)
{
FREE(file);
continue;
@ -599,4 +599,3 @@ ef_read_dir(const char *dir, Ecore_Hash *icons)
}
ecore_list_destroy(files);
}

@ -13,7 +13,7 @@ ef_cb_ini_parse(void)
putenv("LC_ALL=en_US");
ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/test.ini");
if (!ini)
if (!ini)
{
printf("efreet_ini_parse() Failed to initialize Efreet_Ini\n");
return 0;
@ -26,14 +26,14 @@ ef_cb_ini_parse(void)
unsigned int bval;
val = efreet_ini_string_get(ini, "Name");
if (!val || strcmp(val, "Foo Bar"))
if (!val || strcmp(val, "Foo Bar"))
{
printf("efreet_ini_string_get() Name parsed incorrectly\n");
ret = 0;
}
val = efreet_ini_localestring_get(ini, "Name");
if (!val || strcmp(val, "English Foo Bar"))
if (!val || strcmp(val, "English Foo Bar"))
{
printf("efreet_ini_localestring_get() Name parsed incorrectly\n");
ret = 0;
@ -88,7 +88,7 @@ ef_cb_ini_parse(void)
ret = 0;
}
}
else
else
{
printf("efreet_ini_section_set() Failed to set 'contact' section\n");
ret = 0;
@ -105,7 +105,7 @@ ef_cb_ini_long_line(void)
Efreet_Ini *ini;
int ret = 1;
struct
struct
{
char *key;
int len;
@ -113,7 +113,7 @@ ef_cb_ini_long_line(void)
{"key", 5099},
{"key2", 5099},
{NULL, 0}
};
};
ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/long.ini");
if (!ini)
@ -121,7 +121,7 @@ ef_cb_ini_long_line(void)
printf("Ini failed to parse.\n");
ret = 0;
}
if (ret) ret = efreet_ini_section_set(ini, "section");
if (ret)
{

@ -12,7 +12,7 @@ ef_cb_locale(void)
char *country;
char *modifier;
} langs[] = {
/* these are ordered such that when we move from LANG to LC_MESSAGES
/* these are ordered such that when we move from LANG to LC_MESSAGES
* the LANG env will still be effect. Same with moving from
* LC_MESSAGES to LANG */
{"LANG=", NULL, NULL, NULL},
@ -51,7 +51,7 @@ ef_cb_locale(void)
if ((langs[i].lang && (!tmp || strcmp(tmp, langs[i].lang)))
|| (!langs[i].lang && tmp))
{
printf("efreet_lang_get() is wrong (%s) with %s\n",
printf("efreet_lang_get() is wrong (%s) with %s\n",
tmp, langs[i].lang);
ret = 0;
}
@ -60,13 +60,13 @@ ef_cb_locale(void)
if ((langs[i].country && (!tmp || strcmp(tmp, langs[i].country)))
|| (!langs[i].country && tmp))
{
printf("efreet_lang_country_get() is wrong (%s) with %s\n",
printf("efreet_lang_country_get() is wrong (%s) with %s\n",
tmp, langs[i].lang);
ret = 0;
}
tmp = efreet_lang_modifier_get();
if ((langs[i].modifier && (!tmp || strcmp(tmp, langs[i].modifier)))
if ((langs[i].modifier && (!tmp || strcmp(tmp, langs[i].modifier)))
|| (!langs[i].modifier && tmp))
{
printf("efreet_lang_modifier_get() is wrong with %s with %s\n",
@ -77,7 +77,6 @@ ef_cb_locale(void)
efreet_shutdown();
efreet_init();
}
return ret;
}

@ -98,7 +98,7 @@ ef_cb_menu_edit(void)
#endif
desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop");
if (!desktop)
if (!desktop)
{
efreet_menu_free(menu);
printf("No desktop found.\n");
@ -150,4 +150,3 @@ ef_cb_menu_edit(void)
efreet_menu_free(menu);
return 1;
}

@ -11,7 +11,7 @@ ef_mime_cb_get(void)
{
const char *mime = NULL;
int misses = 0, i = 0;
struct
struct
{
char *file;
char *mime;
@ -22,8 +22,8 @@ ef_mime_cb_get(void)
{PACKAGE_DATA_DIR"/efreet/test/sub", "inode/directory"},
{NULL, NULL}
};
if (!efreet_mime_init())
{
printf("Could not init efreet\n");
@ -31,10 +31,10 @@ ef_mime_cb_get(void)
}
for (i = 0; files[i].file != NULL; ++i)
{
{
mime = efreet_mime_type_get(files[i].file);
if (!mime)
{
{
printf("Got %s as null instead of %s\n", files[i].file, files[i].mime);
misses ++;
}
@ -44,8 +44,8 @@ ef_mime_cb_get(void)
misses ++;
}
}
efreet_mime_shutdown();
return !misses;
}

@ -43,7 +43,7 @@ dump(Efreet_Menu *menu, const char *path)
if (entry->type == EFREET_MENU_ENTRY_DESKTOP)
{
if (!path || !*path) path = "/";
printf("%s\t%s\t%s\n", path, entry->id,
printf("%s\t%s\t%s\n", path, entry->id,
entry->desktop->orig_path);
}
else if (entry->type == EFREET_MENU_ENTRY_MENU)
@ -55,4 +55,3 @@ dump(Efreet_Menu *menu, const char *path)
}
}
}

@ -135,9 +135,9 @@ main(int argc, char ** argv)
double start;
/* we've been given specific tests and it isn't in the list */
if (run && !ecore_list_find(run, ECORE_COMPARE_CB(strcasecmp),
if (run && !ecore_list_find(run, ECORE_COMPARE_CB(strcasecmp),
tests[i].name))
continue;
continue;
if (!efreet_init())
{
@ -147,11 +147,11 @@ main(int argc, char ** argv)
num_tests ++;
printf("%s:\t\t", tests[i].name);
printf("%s:\t\t", tests[i].name);
fflush(stdout);
start = ecore_time_get();
ret = tests[i].cb();
printf("%s in %.3f seconds\n", (ret ? "PASSED" : "FAILED"),
printf("%s in %.3f seconds\n", (ret ? "PASSED" : "FAILED"),
ecore_time_get() - start);
passed += ret;
@ -168,4 +168,3 @@ main(int argc, char ** argv)
printf("Total run: %.3f seconds\n", ecore_time_get() - total);
return 0;
}

@ -3,7 +3,7 @@
#define EFREET_H
/**
* @file Efreet.h
* @file Efreet.h
* @brief The file that must be included by any project wishing to use
* Efreet. Efreet.h provides all of the necessary headers and includes to
* work with Efreet.
@ -17,7 +17,7 @@
* Efreet is a library designed to help apps work several of the
* Freedesktop.org standards regarding Icons, Desktop files and Menus. To
* that end it implements the following specifications:
*
*
* @li XDG Base Directory Specification
* @li Icon Theme Specification
* @li Desktop Entry Specification
@ -42,4 +42,3 @@ int efreet_shutdown(void);
#endif
#endif

@ -3,9 +3,9 @@
#define EFREET_MIME_H
/**
* @file Efreet_Mime.h
* @file Efreet_Mime.h
* @brief The file that must be included by any project wishing to use
* Efreet_Mime. Efreet_Mime.h provides all of the necessary headers and
* Efreet_Mime. Efreet_Mime.h provides all of the necessary headers and
* includes to work with Efreet_Mime.
*/
@ -14,7 +14,7 @@
*
* @section intro Introduction
*
* Efreet Mime is a library designed to help apps work with the
* Efreet Mime is a library designed to help apps work with the
* Freedesktop.org Shared Mime Info standard.
*/
@ -34,8 +34,8 @@ const char *efreet_mime_magic_type_get(const char *file);
const char *efreet_mime_globs_type_get(const char *file);
const char *efreet_mime_special_type_get(const char *file);
const char *efreet_mime_fallback_type_get(const char *file);
char *efreet_mime_type_icon_get(const char *mime, const char *theme,
char *efreet_mime_type_icon_get(const char *mime, const char *theme,
const char *size);
/**

@ -16,7 +16,7 @@ efreet_desktop.h \
efreet_icon.h \
efreet_ini.h \
efreet_menu.h \
efreet_utils.h
efreet_utils.h
EFREETSOURCES = \
efreet.c \

@ -32,7 +32,7 @@ efreet_init(void)
* @return Returns the number of times the init function as been called
* minus the corresponding init call.
* @brief Shuts down Efreet if a balanced number of init/shutdown calls have
* been made
* been made
*/
int
efreet_shutdown(void)
@ -106,7 +106,7 @@ static void
efreet_parse_locale(void)
{
efreet_parsed_locale = 1;
if (efreet_parse_locale_setting("LC_ALL"))
return;
@ -187,5 +187,3 @@ efreet_array_cat(char *buffer, size_t size, const char *strs[])
}
return n;
}

@ -10,7 +10,7 @@ static Ecore_List *xdg_data_dirs = NULL;
static Ecore_List *xdg_config_dirs = NULL;
static const char *efreet_dir_get(const char *key, const char *fallback);
static Ecore_List *efreet_dirs_get(const char *key,
static Ecore_List *efreet_dirs_get(const char *key,
const char *fallback);
/**
@ -89,7 +89,7 @@ Ecore_List *
efreet_data_dirs_get(void)
{
if (xdg_data_dirs) return xdg_data_dirs;
xdg_data_dirs = efreet_dirs_get("XDG_DATA_DIRS",
xdg_data_dirs = efreet_dirs_get("XDG_DATA_DIRS",
"/usr/local/share:/usr/share");
return xdg_data_dirs;
}
@ -154,7 +154,7 @@ efreet_dir_get(const char *key, const char *fallback)
{
int len;
const char *user;
user = efreet_home_dir_get();
len = strlen(user) + strlen(fallback) + 1;
dir = malloc(sizeof(char) * len);
@ -209,4 +209,3 @@ efreet_dirs_get(const char *key, const char *fallback)
return dirs;
}

@ -4,9 +4,9 @@
/**
* @file efreet_base.h
* @brief Contains the methods used to support the FDO base directory
* @brief Contains the methods used to support the FDO base directory
* specification.
* @addtogroup Efreet_Base Efreet_Base: The XDG Base Directory Specification
* @addtogroup Efreet_Base Efreet_Base: The XDG Base Directory Specification
* functions
*
* @{
@ -28,4 +28,3 @@ const char *efreet_cache_home_get(void);
*/
#endif

@ -10,7 +10,7 @@
static const char *desktop_environment = NULL;
/**
* A cache of all loaded desktops, hashed by file name.
* A cache of all loaded desktops, hashed by file name.
* Values are Efreet_Desktop structures
*/
static Ecore_Hash *efreet_desktop_cache = NULL;
@ -49,53 +49,53 @@ struct Efreet_Desktop_Type_Info
static int efreet_desktop_read(Efreet_Desktop *desktop);
static void efreet_desktop_clear(Efreet_Desktop *desktop);
static Efreet_Desktop_Type_Info *efreet_desktop_type_parse(const char *type_str);
static void *efreet_desktop_application_fields_parse(Efreet_Desktop *desktop,
static void *efreet_desktop_application_fields_parse(Efreet_Desktop *desktop,
Efreet_Ini *ini);
static void efreet_desktop_application_fields_save(Efreet_Desktop *desktop,
static void efreet_desktop_application_fields_save(Efreet_Desktop *desktop,
Efreet_Ini *ini);
static void *efreet_desktop_link_fields_parse(Efreet_Desktop *desktop,
Efreet_Ini *ini);
static void efreet_desktop_link_fields_save(Efreet_Desktop *desktop,
static void efreet_desktop_link_fields_save(Efreet_Desktop *desktop,
Efreet_Ini *ini);
static int efreet_desktop_generic_fields_parse(Efreet_Desktop *desktop,
static int efreet_desktop_generic_fields_parse(Efreet_Desktop *desktop,
Efreet_Ini *ini);
static void efreet_desktop_generic_fields_save(Efreet_Desktop *desktop,
static void efreet_desktop_generic_fields_save(Efreet_Desktop *desktop,
Efreet_Ini *ini);
static void efreet_desktop_x_fields_parse(Ecore_Hash_Node *node,
static void efreet_desktop_x_fields_parse(Ecore_Hash_Node *node,
Efreet_Desktop *desktop);
static int efreet_desktop_environment_check(Efreet_Ini *ini);
static char *efreet_string_append(char *dest, int *size,
static char *efreet_string_append(char *dest, int *size,
int *len, const char *src);
static char *efreet_string_append_char(char *dest, int *size,
static char *efreet_string_append_char(char *dest, int *size,
int *len, char c);
static Ecore_List *efreet_desktop_command_build(Efreet_Desktop_Command *command);
static void efreet_desktop_command_free(Efreet_Desktop_Command *command);
static char *efreet_desktop_command_append_quoted(char *dest, int *size,
static char *efreet_desktop_command_append_quoted(char *dest, int *size,
int *len, char *src);
static char *efreet_desktop_command_append_icon(char *dest, int *size, int *len,
Efreet_Desktop *desktop);
static char *efreet_desktop_command_append_single(char *dest, int *size, int *len,
Efreet_Desktop_Command_File *file,
static char *efreet_desktop_command_append_single(char *dest, int *size, int *len,
Efreet_Desktop_Command_File *file,
char type);
static char *efreet_desktop_command_append_multiple(char *dest, int *size, int *len,
Efreet_Desktop_Command *command,
static char *efreet_desktop_command_append_multiple(char *dest, int *size, int *len,
Efreet_Desktop_Command *command,
char type);
static char *efreet_desktop_command_path_absolute(const char *path);
static Efreet_Desktop_Command_File *efreet_desktop_command_file_process(
Efreet_Desktop_Command *command,
Efreet_Desktop_Command *command,
const char *file);
static const char *efreet_desktop_command_file_uri_process(const char *uri);
static void efreet_desktop_command_file_free(Efreet_Desktop_Command_File *file);
static void efreet_desktop_cb_download_complete(void *data, const char *file,
static void efreet_desktop_cb_download_complete(void *data, const char *file,
int status);
static int efreet_desktop_cb_download_progress(void *data, const char *file,
long int dltotal, long int dlnow,
long int ultotal, long int ulnow);
static void efreet_desktop_exec_cb(void *data, Efreet_Desktop *desktop,
static void efreet_desktop_exec_cb(void *data, Efreet_Desktop *desktop,
char *exec, int remaining);
static void efreet_desktop_type_info_free(Efreet_Desktop_Type_Info *info);
@ -117,22 +117,22 @@ efreet_desktop_init(void)
efreet_desktop_cache = ecore_hash_new(ecore_str_hash, ecore_str_compare);
ecore_hash_free_key_cb_set(efreet_desktop_cache, ECORE_FREE_CB(free));
#if 0
ecore_hash_free_value_cb_set(efreet_desktop_cache,
ecore_hash_free_value_cb_set(efreet_desktop_cache,
ECORE_FREE_CB(efreet_desktop_free));
#endif
efreet_desktop_types = ecore_list_new();
ecore_list_free_cb_set(efreet_desktop_types,
ecore_list_free_cb_set(efreet_desktop_types,
ECORE_FREE_CB(efreet_desktop_type_info_free));
EFREET_DESKTOP_TYPE_APPLICATION = efreet_desktop_type_add("Application",
efreet_desktop_application_fields_parse,
efreet_desktop_application_fields_save,
EFREET_DESKTOP_TYPE_APPLICATION = efreet_desktop_type_add("Application",
efreet_desktop_application_fields_parse,
efreet_desktop_application_fields_save,
NULL);
EFREET_DESKTOP_TYPE_LINK = efreet_desktop_type_add("Link",
efreet_desktop_link_fields_parse,
EFREET_DESKTOP_TYPE_LINK = efreet_desktop_type_add("Link",
efreet_desktop_link_fields_parse,
efreet_desktop_link_fields_save, NULL);
EFREET_DESKTOP_TYPE_DIRECTORY = efreet_desktop_type_add("Directory", NULL,
EFREET_DESKTOP_TYPE_DIRECTORY = efreet_desktop_type_add("Directory", NULL,
NULL, NULL);
return init;
@ -161,7 +161,7 @@ efreet_desktop_shutdown(void)
* @internal
* @param desktop: The desktop to check
* @return Returns 1 if the cache is still valid, 0 otherwise
* @brief This will check if the desktop cache is still valid.
* @brief This will check if the desktop cache is still valid.
*/
static int
efreet_desktop_cache_check(Efreet_Desktop *desktop)
@ -169,7 +169,7 @@ efreet_desktop_cache_check(Efreet_Desktop *desktop)
if (!desktop) return 0;
/* have we modified this file since we last read it in? */
if ((desktop->cache_flush != cache_flush) ||
if ((desktop->cache_flush != cache_flush) ||
(ecore_file_mod_time(desktop->orig_path) != desktop->load_time))
return 0;
@ -178,7 +178,7 @@ efreet_desktop_cache_check(Efreet_Desktop *desktop)
/**
* @param file: The file to get the Efreet_Desktop from
* @return Returns a reference to a cached Efreet_Desktop on success, NULL
* @return Returns a reference to a cached Efreet_Desktop on success, NULL
* on failure. This reference should not be freed.
* @brief Gets a reference to an Efreet_Desktop structure representing the
* contents of @a file or NULL if @a file is not a valid .desktop file.
@ -188,7 +188,7 @@ efreet_desktop_get(const char *file)
{
Efreet_Desktop *desktop;
if (efreet_desktop_cache)
if (efreet_desktop_cache)
{
desktop = ecore_hash_get(efreet_desktop_cache, file);
if (desktop)
@ -299,7 +299,7 @@ efreet_desktop_read(Efreet_Desktop *desktop)
int ok;
ini = efreet_ini_new(desktop->orig_path);
if (!ini->data)
if (!ini->data)
{
efreet_ini_free(ini);
return 0;
@ -307,7 +307,7 @@ efreet_desktop_read(Efreet_Desktop *desktop)
ok = efreet_ini_section_set(ini, "Desktop Entry");
if (!ok) ok = efreet_ini_section_set(ini, "KDE Desktop Entry");
if (!ok)
if (!ok)
{
printf("efreet_desktop_new error: no Desktop Entry section\n");
error = 1;
@ -324,7 +324,7 @@ efreet_desktop_read(Efreet_Desktop *desktop)
desktop->version = efreet_ini_double_get(ini, "Version");
if (info->parse_func)
desktop->type_data = info->parse_func(desktop, ini);
desktop->type_data = info->parse_func(desktop, ini);
}
else
error = 1;
@ -377,7 +377,7 @@ efreet_desktop_clear(Efreet_Desktop *desktop)
Efreet_Desktop_Type_Info *info;
info = ecore_list_index_goto(efreet_desktop_types, desktop->type);
if (info->free_func)
info->free_func(desktop->type_data);
info->free_func(desktop->type_data);
}
}