diff options
author | Marcel Dijkstra <[email protected]> | 2012-05-23 02:33:19 +0200 |
---|---|---|
committer | Marcel Dijkstra <[email protected]> | 2012-05-23 02:33:19 +0200 |
commit | 13d41840ccb39bebe44b52653ba8d59b0c4985a0 (patch) | |
tree | 913ab19cfa015a5ec63ff66c37a6d67696c347d1 /mate-panel/menu.c | |
parent | d3b927a321242e36abdb1e4acc488cde7899800e (diff) | |
parent | 9af851f0c4f0296eb5654233b9fc251e9377c8b9 (diff) | |
download | mate-panel-13d41840ccb39bebe44b52653ba8d59b0c4985a0.tar.bz2 mate-panel-13d41840ccb39bebe44b52653ba8d59b0c4985a0.tar.xz |
Merge remote-tracking branch 'upstream/master' into slave
Diffstat (limited to 'mate-panel/menu.c')
-rw-r--r-- | mate-panel/menu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mate-panel/menu.c b/mate-panel/menu.c index 273fae86..8b60058c 100644 --- a/mate-panel/menu.c +++ b/mate-panel/menu.c @@ -1211,7 +1211,8 @@ drag_data_get_string_cb (GtkWidget *widget, GdkDragContext *context, void setup_uri_drag (GtkWidget *menuitem, const char *uri, - const char *icon) + const char *icon, + GdkDragAction action) { static GtkTargetEntry menu_item_targets[] = { { "text/uri-list", 0, 0 } @@ -1223,7 +1224,7 @@ setup_uri_drag (GtkWidget *menuitem, gtk_drag_source_set (menuitem, GDK_BUTTON1_MASK|GDK_BUTTON2_MASK, menu_item_targets, 1, - GDK_ACTION_COPY); + action); if (icon != NULL) gtk_drag_source_set_icon_name (menuitem, icon); @@ -1488,7 +1489,7 @@ create_menuitem (GtkWidget *menu, NULL, NULL, alias_directory ? matemenu_tree_directory_get_icon (alias_directory) : matemenu_tree_entry_get_icon (entry), - NULL); + PANEL_STOCK_DEFAULT_ICON); setup_menuitem (menuitem, panel_menu_icon_get_size (), |