diff options
author | Steve Zesch <[email protected]> | 2012-05-10 12:59:42 -0700 |
---|---|---|
committer | Steve Zesch <[email protected]> | 2012-05-10 12:59:42 -0700 |
commit | 69769af51fe3f072bfd2612a27afc095eb67384f (patch) | |
tree | d6763f371a423ce34a333b457c66ef69019fa219 /mate-panel/panel-menu-items.c | |
parent | 9639e4e9ccdbf44e8a4a29a57c23cc7c4cf05253 (diff) | |
parent | 4cd113800b89a73dfa77ed4081811055a4cbe23e (diff) | |
download | mate-panel-69769af51fe3f072bfd2612a27afc095eb67384f.tar.bz2 mate-panel-69769af51fe3f072bfd2612a27afc095eb67384f.tar.xz |
Merge pull request #18 from benpicco/upstream
pull in upstream changes & fixes
Diffstat (limited to 'mate-panel/panel-menu-items.c')
-rw-r--r-- | mate-panel/panel-menu-items.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c index 81668dbc..bd234de9 100644 --- a/mate-panel/panel-menu-items.c +++ b/mate-panel/panel-menu-items.c @@ -261,7 +261,7 @@ panel_menu_items_append_from_desktop (GtkWidget *menu, uri = g_filename_to_uri (full_path, NULL, NULL); - setup_uri_drag (item, uri, icon); + setup_uri_drag (item, uri, icon, GDK_ACTION_COPY); g_free (uri); g_key_file_free (key_file); @@ -308,7 +308,8 @@ panel_menu_items_append_place_item (const char *icon_name, g_signal_connect (G_OBJECT (item), "button_press_event", G_CALLBACK (menu_dummy_button_press_event), NULL); - setup_uri_drag (item, uri, icon_name); + if (g_str_has_prefix (uri, "file:")) /*Links only work for local files*/ + setup_uri_drag (item, uri, icon_name, GDK_ACTION_LINK); } static GtkWidget * @@ -1602,7 +1603,7 @@ panel_menu_items_append_lock_logout (GtkWidget *menu) } item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN); - if (item != NULL) { + if (item != NULL && !g_getenv("LTSP_CLIENT")) { if (!separator_inserted) add_menu_separator (menu); |