Updating branch refs/heads/master
to 95a5f72c444ff26777831fdffcffe64015324c4c (commit)
from bab7bc4b9af228f5e1b313ebd83f1cfd655dde10 (commit)
commit 95a5f72c444ff26777831fdffcffe64015324c4c
Author: Eric Koegel <eric.koe...@gmail.com>
Date: Sun Feb 19 23:29:17 2012 +0300
Require libexo & update min requirements in readme
README | 16 +++++++++-------
configure.ac.in | 5 +++--
settings/main.c | 5 -----
src/xfdesktop-file-utils.c | 2 --
src/xfdesktop-icon-view.c | 24 +++++-------------------
src/xfdesktop-regular-file-icon.c | 2 --
src/xfdesktop-volume-icon.c | 4 ----
7 files changed, 17 insertions(+), 41 deletions(-)
diff --git a/README b/README
index 3ade158..987d7b1 100644
--- a/README
+++ b/README
@@ -17,14 +17,16 @@ MINIMUM REQUIREMENTS
~~~~~~~~~~~~~~~~~~~~
* intltool 0.34
-* GTK+ 2.10.0
-* libxfce4util 4.5.0svn-r26490
-* libxfcegui4 4.5.2svn-r27035
-* libwnck 2.12.0
-* libxfce4menu 0.1.0svn-r26507 (optional; required for apps menu)
-* libthunar-vfs 0.8.0 (optional; required for file icons)
+* GTK+ 2.14.0
+* libxfce4util 4.8
+* libxfce4ui 4.9
+* libwnck 2.22
+* libexo 0.6
+* xfconf 4.8
+* garcon 0.1.2 (optional; required for apps menu)
+* thunar 1.2 (optional; required for file icons)
* dbus-glib 0.34 (optional; required for file icons)
-* libexo 0.3.2 (optional)
+* tumbler 1.6 (optional; enables thumbnail previews for file icons)
HIDDEN CUSTOMISATIONS
diff --git a/configure.ac.in b/configure.ac.in
index b22e8dc..ca0277f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -145,8 +145,9 @@ dnl calls AM_CONDITIONAL(), which cannot be in an 'if' block
XDT_CHECK_OPTIONAL_PACKAGE([THUNARX], [thunarx-2], [thunar_minimum_version],
[thunarx],
[Thunar's extension mechanism, to add external features to the desktop
icon implementation])
-XDT_CHECK_OPTIONAL_PACKAGE([LIBEXO], [exo-1], [exo_minimum_version], [exo],
- [libexo, for nifty icon effects])
+
+dnl LIBEXO is required if file icons are enabled
+XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [exo_minimum_version])
AC_ARG_ENABLE([desktop-menu],
diff --git a/settings/main.c b/settings/main.c
index 554f802..c6fbaad 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -46,10 +46,7 @@
#include <libxfce4util/libxfce4util.h>
#include <xfconf/xfconf.h>
#include <libxfce4ui/libxfce4ui.h>
-
-#ifdef HAVE_LIBEXO
#include <exo/exo.h>
-#endif
#include "xfdesktop-common.h"
#include "xfdesktop-settings-ui.h"
@@ -897,9 +894,7 @@ add_file_button_clicked(GtkWidget *button,
(GtkFileFilterFunc)gtk_true, NULL, NULL);
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser), filter);
-#ifdef HAVE_LIBEXO
exo_gtk_file_chooser_add_thumbnail_preview(GTK_FILE_CHOOSER(chooser));
-#endif
if(gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) {
GSList *filenames =
gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(chooser));
diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index 75bf0ce..5b015fd 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -570,13 +570,11 @@ xfdesktop_file_utils_get_icon(const gchar
*custom_icon_name,
}
}
-#ifdef HAVE_LIBEXO
if(opacity != 100) {
GdkPixbuf *tmp = exo_gdk_pixbuf_lucent(pix, opacity);
g_object_unref(G_OBJECT(pix));
pix = tmp;
}
-#endif
return pix;
}
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index d7dfdc4..868ba41 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -39,12 +39,7 @@
#include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-
-#ifdef HAVE_LIBEXO
#include <exo/exo.h>
-#else
-#define I_(str) g_intern_static_string(str)
-#endif
#include "xfdesktop-icon-view.h"
#include "xfdesktop-file-icon-manager.h"
@@ -262,10 +257,10 @@ static void
xfdesktop_icon_view_invalidate_icon(XfdesktopIconView *icon_view,
gboolean recalc_extents);
static void xfdesktop_icon_view_icon_changed(XfdesktopIcon *icon,
gpointer user_data);
-#ifdef HAVE_LIBEXO
+
static void xfdesktop_icon_view_invalidate_icon_pixbuf(XfdesktopIconView
*icon_view,
XfdesktopIcon *icon);
-#endif
+
static void xfdesktop_icon_view_paint_icon(XfdesktopIconView *icon_view,
XfdesktopIcon *icon,
GdkRectangle *area);
@@ -1210,9 +1205,8 @@ xfdesktop_icon_view_motion_notify(GtkWidget *widget,
{
icon = icon_view->priv->item_under_pointer;
icon_view->priv->item_under_pointer = NULL;
-#ifdef HAVE_LIBEXO
+
xfdesktop_icon_view_invalidate_icon_pixbuf(icon_view, icon);
-#endif
}
} else {
if(G_UNLIKELY(icon_view->priv->single_click)) {
@@ -1225,9 +1219,8 @@ xfdesktop_icon_view_motion_notify(GtkWidget *widget,
&& xfdesktop_rectangle_contains_point(&extents, evt->x, evt->y))
{
icon_view->priv->item_under_pointer = icon;
-#ifdef HAVE_LIBEXO
+
xfdesktop_icon_view_invalidate_icon_pixbuf(icon_view, icon);
-#endif
}
}
}
@@ -1245,13 +1238,10 @@ xfdesktop_icon_view_leave_notify(GtkWidget *widget,
XfdesktopIconView *icon_view = XFDESKTOP_ICON_VIEW(user_data);
if(icon_view->priv->item_under_pointer) {
-#ifdef HAVE_LIBEXO
XfdesktopIcon *icon = icon_view->priv->item_under_pointer;
-#endif
icon_view->priv->item_under_pointer = NULL;
-#ifdef HAVE_LIBEXO
+
xfdesktop_icon_view_invalidate_icon(icon_view, icon, FALSE);
-#endif
}
if(G_UNLIKELY(icon_view->priv->single_click)) {
@@ -2659,7 +2649,6 @@ xfdesktop_icon_view_invalidate_icon(XfdesktopIconView
*icon_view,
}
}
-#ifdef HAVE_LIBEXO
static void
xfdesktop_icon_view_invalidate_icon_pixbuf(XfdesktopIconView *icon_view,
XfdesktopIcon *icon)
@@ -2685,7 +2674,6 @@
xfdesktop_icon_view_invalidate_icon_pixbuf(XfdesktopIconView *icon_view,
}
}
}
-#endif
static void
xfdesktop_paint_rounded_box(XfdesktopIconView *icon_view,
@@ -2949,7 +2937,6 @@ xfdesktop_icon_view_paint_icon(XfdesktopIconView
*icon_view,
GdkPixbuf *pix = xfdesktop_icon_peek_pixbuf(icon, ICON_SIZE);
GdkPixbuf *pix_free = NULL;
-#ifdef HAVE_LIBEXO
if(state != GTK_STATE_NORMAL) {
pix_free = exo_gdk_pixbuf_colorize(pix,
&widget->style->base[state]);
pix = pix_free;
@@ -2962,7 +2949,6 @@ xfdesktop_icon_view_paint_icon(XfdesktopIconView
*icon_view,
pix = tmp;
pix_free = tmp;
}
-#endif
TRACE("painting pixbuf at %dx%d+%d+%d",
intersection.width, intersection.height,
diff --git a/src/xfdesktop-regular-file-icon.c
b/src/xfdesktop-regular-file-icon.c
index 4a2d6c6..db6e66b 100644
--- a/src/xfdesktop-regular-file-icon.c
+++ b/src/xfdesktop-regular-file-icon.c
@@ -36,9 +36,7 @@
#include <time.h>
#endif
-#ifdef HAVE_LIBEXO
#include <exo/exo.h>
-#endif
#ifndef PATH_MAX
#define PATH_MAX 4096
diff --git a/src/xfdesktop-volume-icon.c b/src/xfdesktop-volume-icon.c
index ed6abe5..c0cae93 100644
--- a/src/xfdesktop-volume-icon.c
+++ b/src/xfdesktop-volume-icon.c
@@ -52,9 +52,7 @@
#include "xfdesktop-notify.h"
#endif
-#ifdef HAVE_LIBEXO
#include <exo/exo.h>
-#endif
#include "xfdesktop-common.h"
#include "xfdesktop-file-utils.h"
@@ -273,7 +271,6 @@ xfdesktop_volume_icon_peek_pixbuf(XfdesktopIcon *icon,
file_icon->priv->pix = xfdesktop_file_utils_get_icon(NULL, gicon,
size,
NULL, 100);
-#ifdef HAVE_LIBEXO
/* If the volume isn't mounted show it as semi-transparent */
if(!xfdesktop_volume_icon_is_mounted(icon)) {
GdkPixbuf *temp;
@@ -284,7 +281,6 @@ xfdesktop_volume_icon_peek_pixbuf(XfdesktopIcon *icon,
file_icon->priv->pix = temp;
}
}
-#endif
file_icon->priv->cur_pix_size = size;
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
