Author: benny
Date: 2007-01-15 17:31:25 +0000 (Mon, 15 Jan 2007)
New Revision: 24485
Modified:
xfdesktop/trunk/settings/Makefile.am
xfdesktop/trunk/settings/appearance-settings.c
Log:
Use GtkFileChooser preview from libexo if available.
Modified: xfdesktop/trunk/settings/Makefile.am
===================================================================
--- xfdesktop/trunk/settings/Makefile.am 2007-01-15 17:20:39 UTC (rev
24484)
+++ xfdesktop/trunk/settings/Makefile.am 2007-01-15 17:31:25 UTC (rev
24485)
@@ -30,14 +30,17 @@
backdrop_settings_la_CFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/common \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src \
+ $(LIBEXO_CFLAGS) \
$(XFCE_MCS_MANAGER_CFLAGS) \
+ -DEXO_API_SUBJECT_TO_CHANGE \
-DLOCALEDIR=\"$(localedir)\" \
-DDATADIR=\"$(datadir)\" \
-DBINDIR=\"$(bindir)\"
backdrop_settings_la_LIBADD = \
- $(top_builddir)/common/libxfdesktop.la
+ $(top_builddir)/common/libxfdesktop.la \
+ $(LIBEXO_LIBS)
if HAVE_CYGWIN
backdrop_settings_la_LIBADD += \
Modified: xfdesktop/trunk/settings/appearance-settings.c
===================================================================
--- xfdesktop/trunk/settings/appearance-settings.c 2007-01-15 17:20:39 UTC
(rev 24484)
+++ xfdesktop/trunk/settings/appearance-settings.c 2007-01-15 17:31:25 UTC
(rev 24485)
@@ -57,6 +57,10 @@
#endif
#include <gtk/gtk.h>
+#ifdef HAVE_LIBEXO
+#include <exo/exo.h>
+#endif
+
#include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h>
#include <xfce-mcs-manager/manager-plugin.h>
@@ -496,6 +500,7 @@
return FALSE;
}
+#ifndef HAVE_LIBEXO
static void
update_preview_cb(GtkFileChooser *chooser, gpointer data)
{
@@ -516,11 +521,15 @@
}
gtk_file_chooser_set_preview_widget_active(chooser, (pix != NULL));
}
+#endif
static void
browse_cb(GtkWidget *b, BackdropPanel *bp)
{
- GtkWidget *chooser, *preview;
+ GtkWidget *chooser;
+#ifndef HAVE_LIBEXO
+ GtkWidget *preview;
+#endif
GtkFileFilter *filter;
gchar *confdir;
@@ -565,12 +574,16 @@
g_free(tmppath);
}
+#ifdef HAVE_LIBEXO
+ exo_gtk_file_chooser_add_thumbnail_preview(GTK_FILE_CHOOSER(chooser));
+#else
preview = gtk_image_new();
gtk_widget_show(preview);
gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(chooser), preview);
gtk_file_chooser_set_preview_widget_active(GTK_FILE_CHOOSER(chooser),
FALSE);
g_signal_connect(G_OBJECT(chooser), "update-preview",
G_CALLBACK(update_preview_cb), preview);
+#endif
gtk_widget_show(chooser);
if(gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) {
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
