Index: head/x11-fm/thunar/Makefile =================================================================== --- head/x11-fm/thunar/Makefile (revision 376663) +++ head/x11-fm/thunar/Makefile (revision 376664) @@ -1,126 +1,127 @@ # Created by: Oliver Lehmann # $FreeBSD$ PORTNAME= Thunar PORTVERSION= 1.6.4 +PORTREVISION= 1 CATEGORIES= x11-fm xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/${PORTNAME:tl}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce file manager LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB LIB_DEPENDS= libtumbler-1.so:${PORTSDIR}/deskutils/xfce4-tumbler \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= pkexec:${PORTSDIR}/sysutils/polkit GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_GNOME= gtk20 intltool intlhack gdkpixbuf2 USE_LDCONFIG= yes USE_XFCE= configenv libexo libmenu libutil xfconf USE_XORG= sm x11 USES= desktop-file-utils gmake pathfix perl5 libtool pkgconfig \ tar:bzip2 OPTIONS_DEFINE= GVFS NLS NOTIFY STARTUP OPTIONS_GROUP= PLUGINS OPTIONS_GROUP_PLUGINS= PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL OPTIONS_DEFAULT= GVFS NOTIFY PLUG_APR PLUG_SBR PLUG_UCA PLUG_TPA STARTUP # Override NOTIFY_DESC NOTIFY_DESC= Display notifications STARTUP_DESC= Startup notification PLUG_APR_DESC= Advanced Properties plugin PLUG_SBR_DESC= Simple Builtin Renamers plugin PLUG_TPA_DESC= Trash Panel Applet plugin PLUG_UCA_DESC= User Customizable Actions plugin PLUG_WALL_DESC= Wallpaper plugin CONFIGURE_ARGS+=--enable-gio-unix \ --disable-gudev \ --enable-dbus \ --without-html-dir .include .if ${PORT_OPTIONS:MNLS} USES+= gettext CONFIGURE_ARGS+=--enable-nls PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MNOTIFY} LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--enable-notifications .else CONFIGURE_ARGS+=--disable-notifications .endif .if ${PORT_OPTIONS:MPLUG_APR} LIB_DEPENDS+= libexif.so:${PORTSDIR}/graphics/libexif CONFIGURE_ARGS+=--enable-apr-plugin --enable-exif PLIST_SUB+= PLUGIN_APR="" .else CONFIGURE_ARGS+=--disable-apr-plugin --disable-exif PLIST_SUB+= PLUGIN_APR="@comment " .endif .if ${PORT_OPTIONS:MPLUG_SBR} LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+=--enable-sbr-plugin --enable-pcre PLIST_SUB+= PLUGIN_SBR="" .else CONFIGURE_ARGS+=--disable-sbr-plugin --disable-pcre PLIST_SUB+= PLUGIN_SBR="@comment " .endif .if ${PORT_OPTIONS:MPLUG_TPA} CONFIGURE_ARGS+=--enable-tpa-plugin PLIST_SUB+= PLUGIN_TPA="" USE_XFCE+= panel .else CONFIGURE_ARGS+=--disable-tpa-plugin PLIST_SUB+= PLUGIN_TPA="@comment " .endif .if ${PORT_OPTIONS:MPLUG_UCA} CONFIGURE_ARGS+=--enable-uca-plugin PLIST_SUB+= PLUGIN_UCA="" .else CONFIGURE_ARGS+=--disable-uca-plugin PLIST_SUB+= PLUGIN_UCA="@comment " .endif .if ${PORT_OPTIONS:MPLUG_WALL} CONFIGURE_ARGS+=--enable-wallpaper-plugin PLIST_SUB+= PLUGIN_WALL="" .else CONFIGURE_ARGS+=--disable-wallpaper-plugin PLIST_SUB+= PLUGIN_WALL="@comment " .endif .if ${PORT_OPTIONS:MSTARTUP} LIB_DEPENDS+= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification CONFIGURE_ARGS+=--enable-startup-notification .else CONFIGURE_ARGS+=--disable-startup-notification .endif .if ${PORT_OPTIONS:MGVFS} USE_GNOME+=gvfs .endif post-patch: ${REINPLACE_CMD} -e 's|internet-mail|mail-send|' \ ${WRKSRC}/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in .include Index: head/x11-fm/thunar/files/patch-thunar_thunar-launcher.c =================================================================== --- head/x11-fm/thunar/files/patch-thunar_thunar-launcher.c (nonexistent) +++ head/x11-fm/thunar/files/patch-thunar_thunar-launcher.c (revision 376664) @@ -0,0 +1,34 @@ +Right click context menu with wrong icon (bug #10652) + +--- thunar/thunar-launcher.c.orig 2013-12-18 23:41:57 UTC ++++ thunar/thunar-launcher.c +@@ -815,8 +815,9 @@ thunar_launcher_update_idle (gpointer da + ** - "Open", "Open in n New Windows" and "Open in n New Tabs" actions + **/ + +- /* Prepare "Open" label */ ++ /* Prepare "Open" label and icon */ + gtk_action_set_label (launcher->action_open, _("_Open")); ++ gtk_action_set_stock_id (launcher->action_open, GTK_STOCK_OPEN); + + if (n_selected_files == n_directories && n_directories >= 1) + { +@@ -928,6 +929,7 @@ thunar_launcher_update_idle (gpointer da + /* turn the "Open" action into "Execute" */ + g_object_set (G_OBJECT (launcher->action_open), + "label", _("_Execute"), ++ "stock-id", GTK_STOCK_EXECUTE, + "tooltip", ngettext ("Execute the selected file", "Execute the selected files", n_selected_files), + NULL); + } +@@ -945,6 +947,10 @@ thunar_launcher_update_idle (gpointer da + g_free (tooltip); + g_free (label); + ++ /* load default application icon */ ++ gtk_action_set_stock_id (launcher->action_open, NULL); ++ gtk_action_set_gicon (launcher->action_open, g_app_info_get_icon (applications->data)); ++ + /* remember the default application for the "Open" action */ + g_object_set_qdata_full (G_OBJECT (launcher->action_open), thunar_launcher_handler_quark, applications->data, g_object_unref); + Property changes on: head/x11-fm/thunar/files/patch-thunar_thunar-launcher.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-fm/thunar/files/patch-thunar_thunar-location-buttons.c =================================================================== --- head/x11-fm/thunar/files/patch-thunar_thunar-location-buttons.c (nonexistent) +++ head/x11-fm/thunar/files/patch-thunar_thunar-location-buttons.c (revision 376664) @@ -0,0 +1,13 @@ +Right click context menu with wrong icon (bug #10652) + +--- thunar/thunar-location-buttons.c.orig 2013-12-18 23:41:57 UTC ++++ thunar/thunar-location-buttons.c +@@ -175,7 +175,7 @@ static const GtkActionEntry action_entri + { "location-buttons-open", GTK_STOCK_OPEN, N_("_Open"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open), }, + { "location-buttons-open-in-new-tab", NULL, N_("Open in New Tab"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open_in_new_tab), }, + { "location-buttons-open-in-new-window", NULL, N_("Open in New Window"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open_in_new_window), }, +- { "location-buttons-create-folder", NULL, N_("Create _Folder..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_create_folder), }, ++ { "location-buttons-create-folder", "folder-new", N_("Create _Folder..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_create_folder), }, + { "location-buttons-empty-trash", NULL, N_("_Empty Trash"), "", N_("Delete all files and folders in the Trash"), G_CALLBACK (thunar_location_buttons_action_empty_trash), }, + { "location-buttons-paste-into-folder", GTK_STOCK_PASTE, N_("Paste Into Folder"), "", NULL, G_CALLBACK (thunar_location_buttons_action_paste_into_folder), }, + { "location-buttons-properties", GTK_STOCK_PROPERTIES, N_("_Properties..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_properties), }, Property changes on: head/x11-fm/thunar/files/patch-thunar_thunar-location-buttons.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-fm/thunar/files/patch-thunar_thunar-standard-view.c =================================================================== --- head/x11-fm/thunar/files/patch-thunar_thunar-standard-view.c (nonexistent) +++ head/x11-fm/thunar/files/patch-thunar_thunar-standard-view.c (revision 376664) @@ -0,0 +1,13 @@ +Right click context menu with wrong icon (bug #10652) + +--- thunar/thunar-standard-view.c.orig 2014-12-20 00:21:57 UTC ++++ thunar/thunar-standard-view.c +@@ -393,7 +393,7 @@ static const GtkActionEntry action_entri + { + { "file-context-menu", NULL, N_ ("File Context Menu"), NULL, NULL, NULL, }, + { "folder-context-menu", NULL, N_ ("Folder Context Menu"), NULL, NULL, NULL, }, +- { "create-folder", NULL, N_ ("Create _Folder..."), "N", N_ ("Create an empty folder within the current folder"), G_CALLBACK (thunar_standard_view_action_create_folder), }, ++ { "create-folder", "folder-new", N_ ("Create _Folder..."), "N", N_ ("Create an empty folder within the current folder"), G_CALLBACK (thunar_standard_view_action_create_folder), }, + { "properties", GTK_STOCK_PROPERTIES, N_ ("_Properties..."), "Return", N_ ("View the properties of the selected file"), G_CALLBACK (thunar_standard_view_action_properties), }, + { "cut", GTK_STOCK_CUT, N_ ("Cu_t"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_cut), }, + { "copy", GTK_STOCK_COPY, N_ ("_Copy"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_copy), }, Property changes on: head/x11-fm/thunar/files/patch-thunar_thunar-standard-view.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-fm/thunar/files/patch-thunar_thunar-templates-action.c =================================================================== --- head/x11-fm/thunar/files/patch-thunar_thunar-templates-action.c (nonexistent) +++ head/x11-fm/thunar/files/patch-thunar_thunar-templates-action.c (revision 376664) @@ -0,0 +1,21 @@ +Right click context menu with wrong icon (bug #10652) + +--- thunar/thunar-templates-action.c.orig 2013-12-18 23:41:57 UTC ++++ thunar/thunar-templates-action.c +@@ -477,7 +477,7 @@ thunar_templates_action_load_finished (T + gtk_widget_show (item); + + /* add the icon for the emtpy file item */ +- image = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU); ++ image = gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); + } + +@@ -542,6 +542,7 @@ thunar_templates_action_new (const gchar + "hide-if-empty", FALSE, + "label", label, + "name", name, ++ "icon-name", "document-new", + NULL); + } + Property changes on: head/x11-fm/thunar/files/patch-thunar_thunar-templates-action.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-fm/thunar/files/patch-thunar_thunar-tree-view.c =================================================================== --- head/x11-fm/thunar/files/patch-thunar_thunar-tree-view.c (nonexistent) +++ head/x11-fm/thunar/files/patch-thunar_thunar-tree-view.c (revision 376664) @@ -0,0 +1,25 @@ +Right click context menu with wrong icon (bug #10652) + +--- thunar/thunar-tree-view.c.orig 2013-12-18 23:41:57 UTC ++++ thunar/thunar-tree-view.c +@@ -1093,6 +1093,7 @@ thunar_tree_view_context_menu (ThunarTre + GtkWidget *menu; + GtkWidget *item; + GtkWidget *window; ++ GIcon *icon; + GList *providers, *lp; + GList *actions = NULL, *tmp; + +@@ -1201,6 +1202,12 @@ thunar_tree_view_context_menu (ThunarTre + g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_create_folder), view); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_widget_show (item); ++ ++ /* set the stock icon */ ++ icon = g_themed_icon_new ("folder-new"); ++ image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU); ++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); ++ g_object_unref (icon); + + /* append a separator item */ + item = gtk_separator_menu_item_new (); Property changes on: head/x11-fm/thunar/files/patch-thunar_thunar-tree-view.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-fm/thunar/files/patch-thunar_thunar-window.c =================================================================== --- head/x11-fm/thunar/files/patch-thunar_thunar-window.c (nonexistent) +++ head/x11-fm/thunar/files/patch-thunar_thunar-window.c (revision 376664) @@ -0,0 +1,15 @@ +Right click context menu with wrong icon (bug #10652) + +--- thunar/thunar-window.c.orig 2013-12-18 23:41:57 UTC ++++ thunar/thunar-window.c +@@ -345,8 +345,8 @@ struct _ThunarWindow + static GtkActionEntry action_entries[] = + { + { "file-menu", NULL, N_ ("_File"), NULL, }, +- { "new-tab", NULL, N_ ("New _Tab"), "T", N_ ("Open a new tab for the displayed location"), G_CALLBACK (thunar_window_action_open_new_tab), }, +- { "new-window", NULL, N_ ("New _Window"), "N", N_ ("Open a new Thunar window for the displayed location"), G_CALLBACK (thunar_window_action_open_new_window), }, ++ { "new-tab", "tab-new", N_ ("New _Tab"), "T", N_ ("Open a new tab for the displayed location"), G_CALLBACK (thunar_window_action_open_new_tab), }, ++ { "new-window", "window-new", N_ ("New _Window"), "N", N_ ("Open a new Thunar window for the displayed location"), G_CALLBACK (thunar_window_action_open_new_window), }, + { "sendto-menu", NULL, N_ ("_Send To"), NULL, }, + { "empty-trash", NULL, N_ ("_Empty Trash"), NULL, N_ ("Delete all files and folders in the Trash"), G_CALLBACK (thunar_window_action_empty_trash), }, + { "detach-tab", NULL, N_ ("Detac_h Tab"), NULL, N_ ("Open current folder in a new window"), G_CALLBACK (thunar_window_action_detach_tab), }, Property changes on: head/x11-fm/thunar/files/patch-thunar_thunar-window.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property