diff options
| author | Rebecca Schulman <rebecka@eazel.com> | 2000-09-27 19:19:33 +0000 |
|---|---|---|
| committer | Rebecca Schulman <rebecka@src.gnome.org> | 2000-09-27 19:19:33 +0000 |
| commit | 0af5148ab49a2f21bf1b652562d3df5321aafbda (patch) | |
| tree | f9612c1672e24d19843f56c5c5dd67b6f236c989 /libnautilus/nautilus-clipboard.c | |
| parent | bd41bdc3706daa88c3f89d7a25b6526a58056127 (diff) | |
| download | nautilus-0af5148ab49a2f21bf1b652562d3df5321aafbda.tar.gz | |
Fixed bug 1275, that sidebar panels don't have defaults per user level.
2000-09-27 Rebecca Schulman <rebecka@eazel.com>
Fixed bug 1275, that sidebar panels don't have defaults
per user level.
* libnautilus-extensions/nautilus-global-preferences.c:
(get_default_sidebar_iids_for_user_level),
(sidebar_panel_iid_is_in_default_list),
(global_preferences_register_sidebar_panels),
(global_preferences_is_sidebar_panel_enabled):
Added default sets (hard coded, as before) for each
user level, and used them to get the defaults, instead of
the single set for all levels
* libnautilus/nautilus-clipboard.c:
(set_paste_sensitive_if_clipboard_contains_data):
simplified check whether paste should be available.
* src/nautilus-window-menus.c: (nautilus_window_initialize_menus):
Fixed a typo in the clipboard menu text.
Diffstat (limited to 'libnautilus/nautilus-clipboard.c')
| -rw-r--r-- | libnautilus/nautilus-clipboard.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libnautilus/nautilus-clipboard.c b/libnautilus/nautilus-clipboard.c index 47fbdde9d..1eb173e6a 100644 --- a/libnautilus/nautilus-clipboard.c +++ b/libnautilus/nautilus-clipboard.c @@ -105,16 +105,9 @@ set_paste_sensitive_if_clipboard_contains_data (GtkWidget *window, BonoboUIHandler *ui_handler) { gboolean clipboard_contains_data; - gboolean are_already_selection_owner; - GdkAtom clipboard_atom; - - clipboard_atom = gdk_atom_intern ("CLIPBOARD", TRUE); - g_return_if_fail (clipboard_atom != GDK_NONE); - are_already_selection_owner = gdk_selection_owner_get (clipboard_atom) != NULL; - clipboard_contains_data = gtk_selection_convert (GTK_WIDGET (window), - GDK_SELECTION_PRIMARY, - clipboard_atom, - GDK_CURRENT_TIME); + + clipboard_contains_data = + (gdk_selection_owner_get (GDK_SELECTION_PRIMARY) != NULL); bonobo_ui_handler_menu_set_sensitivity (ui_handler, NAUTILUS_MENU_PATH_PASTE_ITEM, |