diff --git a/ChangeLog b/ChangeLog
index 090e5efbdd73ae66738c924fafa210fd232c3a09..3793633200e981bd3ce9bf7121d75d41faef810d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-14 Benedikt Meurer <benny@xfce.org>
+
+ * icons/16x16/Makefile.am, icons/16x16/stock_thunar-group.png,
+ icons/16x16/stock_thunar-user.png: Remove the "thunar-user" and
+ "thunar-group" stock icons.
+ * thunar/thunar-permissions-chooser.c, thunar/thunar-stock.{c,h}: Do
+ not display "thunar-user" and "thunar-group" stock icons in the
+ permissions chooser any more, as it makes the dialog look busy.
+
2006-02-14 Benedikt Meurer <benny@xfce.org>
* acinclude.m4, configure.in.in: Print build configuration summary.
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 3426c0f4e84545b8c6580d9ba52825d205089e49..4aac0c1945146bdb1189b926f8c4fd93364c7333 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -2,9 +2,7 @@
stockdir = $(datadir)/icons/hicolor/16x16/stock/generic
stock_DATA = \
- stock_thunar-group.png \
- stock_thunar-templates.png \
- stock_thunar-user.png
+ stock_thunar-templates.png
EXTRA_DIST = \
$(stock_DATA)
diff --git a/icons/16x16/stock_thunar-group.png b/icons/16x16/stock_thunar-group.png
deleted file mode 100644
index ed2d33b9f861db2daebf5d371047f3af5884f869..0000000000000000000000000000000000000000
Binary files a/icons/16x16/stock_thunar-group.png and /dev/null differ
diff --git a/icons/16x16/stock_thunar-user.png b/icons/16x16/stock_thunar-user.png
deleted file mode 100644
index 397cd73a137fc86334b01e81f52dc47e1b8c6bab..0000000000000000000000000000000000000000
Binary files a/icons/16x16/stock_thunar-user.png and /dev/null differ
diff --git a/po/Thunar.pot b/po/Thunar.pot
index 714db8cb576526d599945f16a255d0d9ba155366..a29f4daf7e48958dad27cf8a27ffa849b5cf62f0 100644
--- a/po/Thunar.pot
+++ b/po/Thunar.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-14 17:32+0100\n"
+"POT-Creation-Date: 2006-02-14 22:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -857,11 +857,11 @@ msgid_plural "%d items selected"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-location-buttons.c:284
+#: ../thunar/thunar-location-buttons.c:290
msgid "Spacing"
msgstr ""
-#: ../thunar/thunar-location-buttons.c:285
+#: ../thunar/thunar-location-buttons.c:291
msgid "The amount of space between the path buttons"
msgstr ""
@@ -887,104 +887,104 @@ msgid "The icon size for the path entry"
msgstr ""
#. 0000
-#: ../thunar/thunar-permissions-chooser.c:245
+#: ../thunar/thunar-permissions-chooser.c:243
msgid "None"
msgstr ""
#. 0002
-#: ../thunar/thunar-permissions-chooser.c:247
+#: ../thunar/thunar-permissions-chooser.c:245
msgid "Write only"
msgstr ""
#. 0004
-#: ../thunar/thunar-permissions-chooser.c:249
+#: ../thunar/thunar-permissions-chooser.c:247
msgid "Read only"
msgstr ""
#. 0006
-#: ../thunar/thunar-permissions-chooser.c:251
+#: ../thunar/thunar-permissions-chooser.c:249
msgid "Read & Write"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:263
+#: ../thunar/thunar-permissions-chooser.c:260
msgid "Owner:"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:277
+#: ../thunar/thunar-permissions-chooser.c:270
msgid "Unknown"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:291
-#: ../thunar/thunar-permissions-chooser.c:346
+#: ../thunar/thunar-permissions-chooser.c:284
+#: ../thunar/thunar-permissions-chooser.c:337
msgid "Access:"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:320
+#: ../thunar/thunar-permissions-chooser.c:313
msgid "Group:"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:375
+#: ../thunar/thunar-permissions-chooser.c:366
msgid "Others:"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:404
+#: ../thunar/thunar-permissions-chooser.c:395
msgid "Program:"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:410
+#: ../thunar/thunar-permissions-chooser.c:401
msgid "Allow this file to _run as a program"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:436
+#: ../thunar/thunar-permissions-chooser.c:427
msgid ""
"Allowing untrusted programs to run\n"
"presents a security risk to your system."
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:451
+#: ../thunar/thunar-permissions-chooser.c:442
msgid ""
"The folder permissions are inconsistent, you\n"
"may not be able to work with files in this folder."
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:464
+#: ../thunar/thunar-permissions-chooser.c:455
msgid "Correct folder permissions..."
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:465
+#: ../thunar/thunar-permissions-chooser.c:456
msgid "Click here to automatically fix the folder permissions."
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:476
+#: ../thunar/thunar-permissions-chooser.c:467
msgid "Please wait..."
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:481
+#: ../thunar/thunar-permissions-chooser.c:472
msgid "Stop applying permissions recursively."
msgstr ""
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:599
-#: ../thunar/thunar-permissions-chooser.c:1145
+#: ../thunar/thunar-permissions-chooser.c:590
+#: ../thunar/thunar-permissions-chooser.c:1135
#: ../thunar/thunar-progress-dialog.c:294
msgid "Question"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:623
+#: ../thunar/thunar-permissions-chooser.c:614
msgid "Apply recursively?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:629
+#: ../thunar/thunar-permissions-chooser.c:620
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolder below the selected folder?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:634
+#: ../thunar/thunar-permissions-chooser.c:625
msgid "Do _not ask me again"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:635
+#: ../thunar/thunar-permissions-chooser.c:626
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -992,51 +992,51 @@ msgid ""
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:715
+#: ../thunar/thunar-permissions-chooser.c:706
msgid "Failed to change group"
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:768
-#: ../thunar/thunar-permissions-chooser.c:1104
+#: ../thunar/thunar-permissions-chooser.c:759
+#: ../thunar/thunar-permissions-chooser.c:1094
msgid "Failed to apply new permissions"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:947
+#: ../thunar/thunar-permissions-chooser.c:937
msgid "Unknown file owner"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1078
+#: ../thunar/thunar-permissions-chooser.c:1068
msgid "Correct folder permissions automatically?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1080
+#: ../thunar/thunar-permissions-chooser.c:1070
msgid "Correct folder permissions"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1082
+#: ../thunar/thunar-permissions-chooser.c:1072
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
"folder afterwards."
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1174
+#: ../thunar/thunar-permissions-chooser.c:1164
#: ../thunar/thunar-progress-dialog.c:320
msgid "_Yes"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1178
+#: ../thunar/thunar-permissions-chooser.c:1168
#: ../thunar/thunar-progress-dialog.c:324
msgid "Yes to _all"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1182
+#: ../thunar/thunar-permissions-chooser.c:1172
#: ../thunar/thunar-progress-dialog.c:328
msgid "_No"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1186
+#: ../thunar/thunar-permissions-chooser.c:1176
#: ../thunar/thunar-progress-dialog.c:332
msgid "_Cancel"
msgstr ""
diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c
index 2b6407b24bf04d9a776ed4ab0067a88e966299f4..1186aeca5ba1f3901cc4392b1ca28840504e6478 100644
--- a/thunar/thunar-permissions-chooser.c
+++ b/thunar/thunar-permissions-chooser.c
@@ -52,7 +52,6 @@ enum
/* Column identifiers for the group combo box */
enum
{
- THUNAR_PERMISSIONS_STORE_COLUMN_STOCK_ID,
THUNAR_PERMISSIONS_STORE_COLUMN_NAME,
THUNAR_PERMISSIONS_STORE_COLUMN_GID,
THUNAR_PERMISSIONS_STORE_N_COLUMNS,
@@ -218,7 +217,6 @@ thunar_permissions_chooser_class_init (ThunarPermissionsChooserClass *klass)
static void
thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
{
- GtkCellRenderer *renderer_pixbuf;
GtkCellRenderer *renderer_text;
AtkRelationSet *relations;
GtkListStore *store;
@@ -250,8 +248,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_list_store_append (store, &iter); /* 0006 */
gtk_list_store_set (store, &iter, 0, _("Read & Write"), -1);
- /* allocate the shared renderers for the various combo boxes */
- renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
+ /* allocate the shared renderer for the various combo boxes */
renderer_text = gtk_cell_renderer_text_new ();
chooser->table = gtk_table_new (2, 2, FALSE);
@@ -270,10 +267,6 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_table_attach (GTK_TABLE (chooser->table), hbox, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 6);
gtk_widget_show (hbox);
- image = gtk_image_new_from_stock (THUNAR_STOCK_USER, GTK_ICON_SIZE_MENU);
- gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
- gtk_widget_show (image);
-
chooser->user_label = gtk_label_new (_("Unknown"));
gtk_misc_set_alignment (GTK_MISC (chooser->user_label), 0.0f, 0.5f);
gtk_box_pack_start (GTK_BOX (hbox), chooser->user_label, TRUE, TRUE, 0);
@@ -324,8 +317,6 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_widget_show (label);
chooser->group_combo = gtk_combo_box_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser->group_combo), renderer_pixbuf, FALSE);
- gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (chooser->group_combo), renderer_pixbuf, "stock-id", THUNAR_PERMISSIONS_STORE_COLUMN_STOCK_ID);
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser->group_combo), renderer_text, TRUE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (chooser->group_combo), renderer_text, "text", THUNAR_PERMISSIONS_STORE_COLUMN_NAME);
gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (chooser->group_combo), thunar_permissions_chooser_row_separator, NULL, NULL);
@@ -869,7 +860,7 @@ thunar_permissions_chooser_file_changed (ThunarPermissionsChooser *chooser,
/* allocate a new store for the group combo box */
g_signal_handlers_block_by_func (G_OBJECT (chooser->group_combo), thunar_permissions_chooser_group_changed, chooser);
- store = gtk_list_store_new (THUNAR_PERMISSIONS_STORE_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT);
+ store = gtk_list_store_new (THUNAR_PERMISSIONS_STORE_N_COLUMNS, G_TYPE_STRING, G_TYPE_UINT);
gtk_combo_box_set_model (GTK_COMBO_BOX (chooser->group_combo), GTK_TREE_MODEL (store));
/* determine the owner of the new file */
@@ -916,7 +907,6 @@ thunar_permissions_chooser_file_changed (ThunarPermissionsChooser *chooser,
/* append a new item for the group */
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
- THUNAR_PERMISSIONS_STORE_COLUMN_STOCK_ID, THUNAR_STOCK_GROUP,
THUNAR_PERMISSIONS_STORE_COLUMN_NAME, thunar_vfs_group_get_name (lp->data),
THUNAR_PERMISSIONS_STORE_COLUMN_GID, thunar_vfs_group_get_id (lp->data),
-1);
diff --git a/thunar/thunar-stock.c b/thunar/thunar-stock.c
index ee936230e5f4d511ace8515d707aaed5f3f0fc4b..797a83c5ea078b741d7de20d1de803988e043781 100644
--- a/thunar/thunar-stock.c
+++ b/thunar/thunar-stock.c
@@ -37,9 +37,7 @@
/* keep in sync with thunar-stock.h */
static const gchar *thunar_stock_icons[] =
{
- THUNAR_STOCK_GROUP,
THUNAR_STOCK_TEMPLATES,
- THUNAR_STOCK_USER,
};
diff --git a/thunar/thunar-stock.h b/thunar/thunar-stock.h
index 6754fc46b07ee31562931cdc528331cb234c6c5c..ca1122575f32612db9dbe480eaf76a5e72857a72 100644
--- a/thunar/thunar-stock.h
+++ b/thunar/thunar-stock.h
@@ -23,9 +23,7 @@
G_BEGIN_DECLS;
/* stock icons for the ThunarPermissionsChooser */
-#define THUNAR_STOCK_GROUP "thunar-group"
#define THUNAR_STOCK_TEMPLATES "thunar-templates"
-#define THUNAR_STOCK_USER "thunar-user"
void thunar_stock_init (void) G_GNUC_INTERNAL;