Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xfdesktop/patches/xfdesktop-4.6.2-automagic.patch

    Contents of /trunk/xfdesktop/patches/xfdesktop-4.6.2-automagic.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1065 - (show annotations) (download)
    Mon Aug 9 12:48:59 2010 UTC (13 years, 8 months ago) by niro
    File size: 4766 byte(s) 
    -added xfce patches
    1 diff --git a/modules/menu/Makefile.am b/modules/menu/Makefile.am
    2 index 11546c0..2a4317e 100644
    3 --- a/modules/menu/Makefile.am
    4 +++ b/modules/menu/Makefile.am
    5 @@ -15,11 +15,15 @@ xfce4_desktop_menu_la_CFLAGS = \
    6 $(LIBXFCE4MENU_CFLAGS) \
    7 $(LIBX11_CFLAGS) \
    8 $(LIBXFCEGUI4_CFLAGS) \
    9 - $(THUNAR_VFS_CFLAGS) \
    10 -DSYSCONFDIR=\"$(sysconfdir)\" \
    11 -DDATADIR=\"$(datadir)\" \
    12 -DBINDIR=\"$(bindir)\"
    13
    14 +if ENABLE_FILE_ICONS
    15 +xfce4_desktop_menu_la_CFLAGS += \
    16 + $(THUNAR_VFS_CFLAGS)
    17 +endif
    18 +
    19 xfce4_desktop_menu_la_DEPENDENCIES = \
    20 $(top_builddir)/common/libxfdesktop-menu-utils.la
    21
    22 @@ -40,5 +44,9 @@ xfce4_desktop_menu_la_LIBADD = \
    23 $(LIBXFCE4MENU_LIBS) \
    24 $(LIBX11_LDFLAGS) \
    25 $(LIBX11_LIBS) \
    26 - $(LIBXFCEGUI4_LIBS) \
    27 + $(LIBXFCEGUI4_LIBS)
    28 +
    29 +if ENABLE_FILE_ICONS
    30 +xfce4_desktop_menu_la_LIBADD += \
    31 $(THUNAR_VFS_LIBS)
    32 +endif
    33 diff --git a/modules/menu/desktop-menu.c b/modules/menu/desktop-menu.c
    34 index 2cfb52f..d983d1b 100644
    35 --- a/modules/menu/desktop-menu.c
    36 +++ b/modules/menu/desktop-menu.c
    37 @@ -63,7 +63,7 @@
    38 #include <libxfcegui4/libxfcegui4.h>
    39 #include <libxfce4menu/libxfce4menu.h>
    40
    41 -#ifdef HAVE_THUNAR_VFS
    42 +#ifdef ENABLE_FILE_ICONS
    43 #include <thunar-vfs/thunar-vfs.h>
    44 #endif
    45
    46 @@ -82,7 +82,7 @@ typedef struct
    47
    48 gint idle_id; /* source id for idled generation */
    49
    50 -#ifdef HAVE_THUNAR_VFS
    51 +#ifdef ENABLE_FILE_ICONS
    52 GList *monitors;
    53 #endif
    54 } XfceDesktopMenu;
    55 @@ -134,7 +134,7 @@ itheme_changed_cb(GtkIconTheme *itheme, gpointer user_data)
    56 desktop_menu->idle_id = g_idle_add(_generate_menu_idled, desktop_menu);
    57 }
    58
    59 -#ifdef HAVE_THUNAR_VFS
    60 +#ifdef ENABLE_FILE_ICONS
    61
    62 static void
    63 desktop_menu_something_changed(ThunarVfsMonitor *monitor,
    64 @@ -443,7 +443,7 @@ G_MODULE_EXPORT XfceDesktopMenu *
    65 xfce_desktop_menu_new_impl(const gchar *menu_file,
    66 gboolean deferred)
    67 {
    68 -#ifdef HAVE_THUNAR_VFS
    69 +#ifdef ENABLE_FILE_ICONS
    70 static XfceMenuMonitorVTable monitor_vtable = {
    71 NULL, /*desktop_menu_xfce_menu_monitor_file,*/
    72 desktop_menu_xfce_menu_monitor_directory,
    73 @@ -460,7 +460,7 @@ xfce_desktop_menu_new_impl(const gchar *menu_file,
    74 else
    75 desktop_menu->filename = xfce_desktop_get_menufile();
    76
    77 -#ifdef HAVE_THUNAR_VFS
    78 +#ifdef ENABLE_FILE_ICONS
    79 thunar_vfs_init();
    80 xfce_menu_monitor_set_vtable(&monitor_vtable, desktop_menu);
    81 #endif
    82 @@ -469,7 +469,7 @@ xfce_desktop_menu_new_impl(const gchar *menu_file,
    83 desktop_menu->idle_id = g_idle_add(_generate_menu_idled, desktop_menu);
    84 else {
    85 if(!_generate_menu(desktop_menu)) {
    86 -#ifdef HAVE_THUNAR_VFS
    87 +#ifdef ENABLE_FILE_ICONS
    88 xfce_menu_monitor_set_vtable(NULL, NULL);
    89 #endif
    90 g_free(desktop_menu);
    91 @@ -595,7 +595,7 @@ xfce_desktop_menu_destroy_impl(XfceDesktopMenu *desktop_menu)
    92 g_return_if_fail(desktop_menu != NULL);
    93 TRACE("dummy");
    94
    95 -#ifdef HAVE_THUNAR_VFS
    96 +#ifdef ENABLE_FILE_ICONS
    97 xfce_menu_monitor_set_vtable(NULL, NULL);
    98 #endif
    99
    100 diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
    101 index 0e0076b..46b1410 100644
    102 --- a/panel-plugin/Makefile.am
    103 +++ b/panel-plugin/Makefile.am
    104 @@ -9,12 +9,16 @@ xfce4_menu_plugin_CFLAGS = \
    105 $(LIBX11_CFLAGS) \
    106 $(LIBXFCEGUI4_CFLAGS) \
    107 $(LIBXFCE4PANEL_CFLAGS) \
    108 - $(THUNAR_VFS_CFLAGS) \
    109 $(LIBEXO_CFLAGS) \
    110 -DDATADIR=\"$(datadir)\" \
    111 -DLOCALEDIR=\"$(localedir)\" \
    112 -DBINDIR=\"$(bindir)\"
    113
    114 +if ENABLE_FILE_ICONS
    115 +xfce4_menu_plugin_CFLAGS += \
    116 + $(THUNAR_VFS_CFLAGS)
    117 +endif
    118 +
    119 xfce4_menu_plugin_DEPENDENCIES = \
    120 $(top_builddir)/common/libxfdesktop-menu.la \
    121 $(top_builddir)/common/libxfdesktop.la
    122 @@ -25,9 +29,13 @@ xfce4_menu_plugin_LDADD = \
    123 $(LIBX11_LIBS) \
    124 $(LIBXFCEGUI4_LIBS) \
    125 $(LIBXFCE4PANEL_LIBS) \
    126 - $(THUNAR_VFS_LIBS) \
    127 $(LIBEXO_LIBS)
    128
    129 +if ENABLE_FILE_ICONS
    130 +xfce4_menu_plugin_LDADD += \
    131 + $(THUNAR_VFS_LIBS)
    132 +endif
    133 +
    134 if HAVE_CYGWIN
    135 xfce4_menu_plugin_LDFLAGS = \
    136 -no-undefined
    137 diff --git a/panel-plugin/desktop-menu-plugin.c b/panel-plugin/desktop-menu-plugin.c
    138 index 36fe36a..178f5c8 100644
    139 --- a/panel-plugin/desktop-menu-plugin.c
    140 +++ b/panel-plugin/desktop-menu-plugin.c
    141 @@ -53,7 +53,7 @@
    142 #include <libxfce4panel/xfce-panel-plugin.h>
    143 #include <libxfce4panel/xfce-panel-convenience.h>
    144
    145 -#ifdef HAVE_THUNAR_VFS
    146 +#ifdef ENABLE_FILE_ICONS
    147 #include <thunar-vfs/thunar-vfs.h>
    148 #endif
    149
    150 @@ -897,7 +897,7 @@ static gboolean
    151 desktop_menu_plugin_preinit(int argc,
    152 char **argv)
    153 {
    154 -#ifdef HAVE_THUNAR_VFS
    155 +#ifdef ENABLE_FILE_ICONS
    156 g_thread_init(NULL);
    157 #endif
    158 return TRUE;
    159 @@ -1019,7 +1019,7 @@ desktop_menu_plugin_construct(XfcePanelPlugin *plugin)
    160
    161 xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
    162
    163 -#ifdef HAVE_THUNAR_VFS
    164 +#ifdef ENABLE_FILE_ICONS
    165 thunar_vfs_init();
    166 #endif
    167