Updating branch refs/heads/master
to fc6906c4c9ae1da2d5793cc9427bd19aa023cc0a (commit)
from 34b09310e0559a3efe098a8160078fa5671b57b7 (commit)
commit fc6906c4c9ae1da2d5793cc9427bd19aa023cc0a
Author: Jannis Pohlmann <[email protected]>
Date: Sun Nov 7 14:40:31 2010 +0100
Fix incompatibility with the icon naming specification (bug #6786).
icons/48x48/Makefile.am | 3 +--
icons/48x48/tvm-dev-tablet.png | Bin 3099 -> 0 bytes
thunar-volman-settings/tvm-preferences-dialog.c | 20 ++++++++++----------
thunar-volman/tvm-run.c | 4 ++--
4 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index e228516..e2a29d8 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -3,8 +3,7 @@
iconsdir = $(datadir)/icons/hicolor/48x48/apps
icons_DATA = \
tvm-burn-cd.png \
- tvm-dev-pocketpc.png \
- tvm-dev-tablet.png
+ tvm-dev-pocketpc.png
EXTRA_DIST = \
$(icons_DATA)
diff --git a/icons/48x48/tvm-dev-tablet.png b/icons/48x48/tvm-dev-tablet.png
deleted file mode 100644
index c82a526..0000000
Binary files a/icons/48x48/tvm-dev-tablet.png and /dev/null differ
diff --git a/thunar-volman-settings/tvm-preferences-dialog.c
b/thunar-volman-settings/tvm-preferences-dialog.c
index 13772e8..375ffdc 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -97,7 +97,7 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
/* configure the dialog properties */
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
- gtk_window_set_icon_name (GTK_WINDOW (dialog), "gnome-dev-removable");
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "drive-removable-media");
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (dialog), _("Removable Drives and Media"));
xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog),
@@ -150,7 +150,7 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
- image = gtk_image_new_from_icon_name ("gnome-dev-removable",
GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("drive-removable-media",
GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL,
0, 0);
gtk_widget_show (image);
@@ -275,7 +275,7 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
- image = gtk_image_new_from_icon_name ("gnome-dev-cdrom-audio",
GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("media-optical", GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL,
0, 0);
gtk_widget_show (image);
@@ -313,7 +313,7 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
- image = gtk_image_new_from_icon_name ("gnome-dev-cdrom",
GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("drive-optical", GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL,
0, 0);
gtk_widget_show (image);
@@ -352,7 +352,7 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
- image = gtk_image_new_from_icon_name ("gnome-dev-ipod",
GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("multimedia-player",
GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL,
0, 0);
gtk_widget_show (image);
@@ -450,7 +450,7 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
- image = gtk_image_new_from_icon_name ("palm-pilot", GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("pda", GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL,
0, 0);
gtk_widget_show (image);
@@ -537,7 +537,7 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
- image = gtk_image_new_from_icon_name ("gnome-dev-printer",
GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("printer", GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL,
0, 0);
gtk_widget_show (image);
@@ -585,7 +585,7 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
- image = gtk_image_new_from_icon_name ("gnome-dev-keyboard",
GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("input-keyboard",
GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL,
0, 0);
gtk_widget_show (image);
@@ -624,7 +624,7 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
- image = gtk_image_new_from_icon_name ("gnome-dev-mouse-optical",
GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("input-mouse", GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL,
0, 0);
gtk_widget_show (image);
@@ -663,7 +663,7 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
- image = gtk_image_new_from_icon_name ("tvm-dev-tablet",
GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("input-tablet", GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL,
0, 0);
gtk_widget_show (image);
diff --git a/thunar-volman/tvm-run.c b/thunar-volman/tvm-run.c
index c1ff47d..ee3d039 100644
--- a/thunar-volman/tvm-run.c
+++ b/thunar-volman/tvm-run.c
@@ -185,7 +185,7 @@ tvm_run_burn_software (TvmContext *context,
if (is_dvd)
{
/* ask what to do with the empty DVD */
- response = tvm_prompt (context, "gnome-dev-disc-dvdr",
+ response = tvm_prompt (context, "media-optical",
_("Blank DVD inserted"),
_("You have inserted a blank DVD."),
_("What would you like to do?"),
@@ -196,7 +196,7 @@ tvm_run_burn_software (TvmContext *context,
else
{
/* ask whether to burn data or audio CD */
- response = tvm_prompt (context, "gnome-dev-disc-cdr",
+ response = tvm_prompt (context, "media-optical",
_("Blank CD inserted"),
_("You have inserted a blank CD."),
_("What would you like to do?"),
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
