diff options
| author | Padraig O'Briain <padraig.obriain@sun.com> | 2003-11-19 10:44:59 +0000 |
|---|---|---|
| committer | Padraig O'Briain <padraigo@src.gnome.org> | 2003-11-19 10:44:59 +0000 |
| commit | 5977be4551cf772b7db040a901b0b3baea16f6bb (patch) | |
| tree | 92cf22cfe810f2baf2edf055522b60d1124f7fcc | |
| parent | b17fc06c233549f8a971683dfcbdf3326096cec3 (diff) | |
| download | nautilus-5977be4551cf772b7db040a901b0b3baea16f6bb.tar.gz | |
Return option_menu created in this function. (create_permissions_page):
2003-11-19 Padraig O'Briain <padraig.obriain@sun.com>
* src/file-manger/fm-properties-window.c:
(attach_owner_menu): Return option_menu created in this function.
(create_permissions_page): Set mnemonic widget for owner_label.
Fixes bug #126637.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/file-manager/fm-properties-window.c | 14 |
2 files changed, 16 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2003-11-19 Padraig O'Briain <padraig.obriain@sun.com> + * src/file-manger/fm-properties-window.c: + (attach_owner_menu): Return option_menu created in this function. + (create_permissions_page): Set mnemonic widget for owner_label. + Fixes bug #126637. + +2003-11-19 Padraig O'Briain <padraig.obriain@sun.com> + * libnautilus-private/nautilus-link.c (nautilus_link_get_link_info_given_file_contents): Do not return value in function returing void. Fixes build problem. diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index 3633fac25..36a4b6461 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -1636,7 +1636,7 @@ synch_user_menu (GtkOptionMenu *option_menu, NautilusFile *file) eel_g_list_free_deep (users); } -static void +static GtkOptionMenu* attach_owner_menu (GtkTable *table, int row, NautilusFile *file) @@ -1651,6 +1651,7 @@ attach_owner_menu (GtkTable *table, g_signal_connect_object (file, "changed", G_CALLBACK (synch_user_menu), option_menu, G_CONNECT_SWAPPED); + return option_menu; } static guint @@ -2848,7 +2849,9 @@ create_permissions_page (FMPropertiesWindow *window) guint last_row; guint checkbox_titles_row; GtkLabel *group_label; + GtkLabel *owner_label; GtkOptionMenu *group_menu; + GtkOptionMenu *owner_menu; GList *file_list; vbox = create_page_with_vbox (window->details->notebook, @@ -2875,13 +2878,14 @@ create_permissions_page (FMPropertiesWindow *window) GTK_WIDGET (page_table), TRUE, TRUE, 0); - attach_title_field (page_table, last_row, _("File owner:")); - - if (!is_multi_file_window (window) && nautilus_file_can_set_owner (get_target_file (window))) { + owner_label = attach_title_field (page_table, last_row, _("File _owner:")); /* Option menu in this case. */ - attach_owner_menu (page_table, last_row, get_target_file (window)); + owner_menu = attach_owner_menu (page_table, last_row, get_target_file (window)); + gtk_label_set_mnemonic_widget (GTK_LABEL (owner_label), + GTK_WIDGET (owner_menu)); } else { + attach_title_field (page_table, last_row, _("File owner:")); /* Static text in this case. */ attach_value_field (window, page_table, last_row, VALUE_COLUMN, |