Updating branch refs/heads/jannis/port-to-udev to 5d4c994056a4775e3e13da333cd43f37e584f50f (commit) from 2a54a9f15f8bab70d738bb44e607fca05560acff (commit)
commit 5d4c994056a4775e3e13da333cd43f37e584f50f Author: Jannis Pohlmann <jan...@xfce.org> Date: Fri Jul 23 13:41:24 2010 +0200 Use "drive-removable-media" as a fallback icon for notifications. Also update POTFILES.in and the API documentation templates. docs/reference/thunarx/tmpl/thunarx-file-info.sgml | 3 +++ .../thunarx/tmpl/thunarx-menu-provider.sgml | 3 +++ .../thunarx/tmpl/thunarx-preferences-provider.sgml | 3 +++ .../tmpl/thunarx-property-page-provider.sgml | 3 +++ .../thunarx/tmpl/thunarx-property-page.sgml | 3 +++ .../thunarx/tmpl/thunarx-provider-factory.sgml | 4 ++++ .../thunarx/tmpl/thunarx-provider-plugin.sgml | 3 +++ .../thunarx/tmpl/thunarx-renamer-provider.sgml | 3 +++ docs/reference/thunarx/tmpl/thunarx-renamer.sgml | 3 +++ .../thunarx/tmpl/thunarx-version-information.sgml | 3 +++ po/POTFILES.in | 3 +-- thunar/thunar-notify.c | 10 ++++++++-- 12 files changed, 40 insertions(+), 4 deletions(-) diff --git a/docs/reference/thunarx/tmpl/thunarx-file-info.sgml b/docs/reference/thunarx/tmpl/thunarx-file-info.sgml index fb89ab9..410a6cf 100644 --- a/docs/reference/thunarx/tmpl/thunarx-file-info.sgml +++ b/docs/reference/thunarx/tmpl/thunarx-file-info.sgml @@ -18,6 +18,9 @@ Abstraction of a file handled within the file manager <!-- ##### SECTION Stability_Level ##### --> Stable +<!-- ##### SECTION Image ##### --> + + <!-- ##### STRUCT ThunarxFileInfoIface ##### --> <para> Interface with virtual methods implemented by the file manager and accessible diff --git a/docs/reference/thunarx/tmpl/thunarx-menu-provider.sgml b/docs/reference/thunarx/tmpl/thunarx-menu-provider.sgml index bc71743..5828d00 100644 --- a/docs/reference/thunarx/tmpl/thunarx-menu-provider.sgml +++ b/docs/reference/thunarx/tmpl/thunarx-menu-provider.sgml @@ -99,6 +99,9 @@ hello_get_file_actions (ThunarxMenuProvider *provider, <!-- ##### SECTION Stability_Level ##### --> Stable +<!-- ##### SECTION Image ##### --> + + <!-- ##### STRUCT ThunarxMenuProviderIface ##### --> <para> Interface with virtual methods implemented by extensions that provide diff --git a/docs/reference/thunarx/tmpl/thunarx-preferences-provider.sgml b/docs/reference/thunarx/tmpl/thunarx-preferences-provider.sgml index 51fd132..684390a 100644 --- a/docs/reference/thunarx/tmpl/thunarx-preferences-provider.sgml +++ b/docs/reference/thunarx/tmpl/thunarx-preferences-provider.sgml @@ -83,6 +83,9 @@ hello_get_actions (ThunarxPreferencesProvider *provider, <!-- ##### SECTION Stability_Level ##### --> Stable +<!-- ##### SECTION Image ##### --> + + <!-- ##### STRUCT ThunarxPreferencesProviderIface ##### --> <para> Interface with virtual methods implementation by extensions that diff --git a/docs/reference/thunarx/tmpl/thunarx-property-page-provider.sgml b/docs/reference/thunarx/tmpl/thunarx-property-page-provider.sgml index 80c6513..0a6339f 100644 --- a/docs/reference/thunarx/tmpl/thunarx-property-page-provider.sgml +++ b/docs/reference/thunarx/tmpl/thunarx-property-page-provider.sgml @@ -21,6 +21,9 @@ The interface to extensions that provide additional property pages <!-- ##### SECTION Stability_Level ##### --> Stable +<!-- ##### SECTION Image ##### --> + + <!-- ##### STRUCT ThunarxPropertyPageProvider ##### --> <para> Property page provider type. diff --git a/docs/reference/thunarx/tmpl/thunarx-property-page.sgml b/docs/reference/thunarx/tmpl/thunarx-property-page.sgml index 2012a0e..53bc161 100644 --- a/docs/reference/thunarx/tmpl/thunarx-property-page.sgml +++ b/docs/reference/thunarx/tmpl/thunarx-property-page.sgml @@ -262,6 +262,9 @@ tag_page_set_file (TagPage *tag_page, <!-- ##### SECTION Stability_Level ##### --> Stable +<!-- ##### SECTION Image ##### --> + + <!-- ##### STRUCT ThunarxPropertyPage ##### --> <para> Base instance type for property pages. diff --git a/docs/reference/thunarx/tmpl/thunarx-provider-factory.sgml b/docs/reference/thunarx/tmpl/thunarx-provider-factory.sgml index d7ce760..988a510 100644 --- a/docs/reference/thunarx/tmpl/thunarx-provider-factory.sgml +++ b/docs/reference/thunarx/tmpl/thunarx-provider-factory.sgml @@ -19,6 +19,9 @@ The provider factory support for applications <!-- ##### SECTION Stability_Level ##### --> Stable +<!-- ##### SECTION Image ##### --> + + <!-- ##### STRUCT ThunarxProviderFactory ##### --> <para> The #ThunarxProviderFactory struct contains only private data. It should @@ -31,6 +34,7 @@ Stable </para> +...@void: @Returns: diff --git a/docs/reference/thunarx/tmpl/thunarx-provider-plugin.sgml b/docs/reference/thunarx/tmpl/thunarx-provider-plugin.sgml index 2dbab0d..2c78acc 100644 --- a/docs/reference/thunarx/tmpl/thunarx-provider-plugin.sgml +++ b/docs/reference/thunarx/tmpl/thunarx-provider-plugin.sgml @@ -19,6 +19,9 @@ The interface to the plugin type registration <!-- ##### SECTION Stability_Level ##### --> Stable +<!-- ##### SECTION Image ##### --> + + <!-- ##### STRUCT ThunarxProviderPlugin ##### --> <para> The #ThunarxProviderPlugin struct is just a typedef for diff --git a/docs/reference/thunarx/tmpl/thunarx-renamer-provider.sgml b/docs/reference/thunarx/tmpl/thunarx-renamer-provider.sgml index 9574857..a71f075 100644 --- a/docs/reference/thunarx/tmpl/thunarx-renamer-provider.sgml +++ b/docs/reference/thunarx/tmpl/thunarx-renamer-provider.sgml @@ -20,6 +20,9 @@ The interface to extensions that provide additional bulk renamers <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + <!-- ##### STRUCT ThunarxRenamerProvider ##### --> <para> Bulk renamer provider type. diff --git a/docs/reference/thunarx/tmpl/thunarx-renamer.sgml b/docs/reference/thunarx/tmpl/thunarx-renamer.sgml index d8a6f44..4988a8f 100644 --- a/docs/reference/thunarx/tmpl/thunarx-renamer.sgml +++ b/docs/reference/thunarx/tmpl/thunarx-renamer.sgml @@ -43,6 +43,9 @@ The abstract base class for bulk renamers <!-- ##### SECTION Stability_Level ##### --> +<!-- ##### SECTION Image ##### --> + + <!-- ##### STRUCT ThunarxRenamer ##### --> <para> Abstract base instance type for bulk renamers. diff --git a/docs/reference/thunarx/tmpl/thunarx-version-information.sgml b/docs/reference/thunarx/tmpl/thunarx-version-information.sgml index 5834bbe..4d49acb 100644 --- a/docs/reference/thunarx/tmpl/thunarx-version-information.sgml +++ b/docs/reference/thunarx/tmpl/thunarx-version-information.sgml @@ -18,6 +18,9 @@ Variables and functions to check the library version <!-- ##### SECTION Stability_Level ##### --> Stable +<!-- ##### SECTION Image ##### --> + + <!-- ##### VARIABLE thunarx_major_version ##### --> <para> diff --git a/po/POTFILES.in b/po/POTFILES.in index f21d35d..3c79db9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -49,6 +49,7 @@ thunar/thunar-location-buttons.c thunar/thunar-location-dialog.c thunar/thunar-location-entry.c thunar/thunar-metafile.c +thunar/thunar-notify.c thunar/thunar-misc-jobs.c thunar/thunar-navigator.c thunar/thunar-pango-extensions.c @@ -93,8 +94,6 @@ thunarx/thunarx-property-page.c thunarx/thunarx-provider-plugin.c thunarx/thunarx-renamer.c -thunar-mount-notify/main.c - plugins/thunar-apr/thunar-apr-abstract-page.c plugins/thunar-apr/thunar-apr-desktop-page.c plugins/thunar-apr/thunar-apr-image-page.c diff --git a/thunar/thunar-notify.c b/thunar/thunar-notify.c index 7a5ecc8..3b66f91 100644 --- a/thunar/thunar-notify.c +++ b/thunar/thunar-notify.c @@ -44,7 +44,7 @@ thunar_notify_unmount (GMount *mount) GFile *icon_file; GFile *mount_point; GIcon *icon; - gchar *icon_name; + gchar *icon_name = NULL; gchar *message; gchar *name; @@ -85,6 +85,9 @@ thunar_notify_unmount (GMount *mount) } g_object_unref (icon); + if (icon_name == NULL) + icon_name = g_strdup ("drive-removable-media"); + if (read_only) { summary = _("Unmounting device"); @@ -145,7 +148,7 @@ thunar_notify_eject (GVolume *volume) GFile *icon_file; GFile *mount_point; GIcon *icon; - gchar *icon_name; + gchar *icon_name = NULL; gchar *message; gchar *name; @@ -190,6 +193,9 @@ thunar_notify_eject (GVolume *volume) } g_object_unref (icon); + if (icon_name == NULL) + icon_name = g_strdup ("drive-removable-media"); + if (read_only) { summary = _("Ejecting device"); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits