[Xfce4-commits] <ristretto:master> Remove exo dependency

[Stephan Arts]

Updating branch refs/heads/master
         to 21087fcb542b48552312b238c026a4de854d22df (commit)
       from 08099d83701a4b9ab74657147af5ffe0192246ac (commit)

commit 21087fcb542b48552312b238c026a4de854d22df
Author: Stephan Arts <stephan at xfce.org>
Date:   Tue Feb 28 07:45:41 2012 +0100

    Remove exo dependency

 configure.in.in      |    2 --
 src/Makefile.am      |    1 +
 src/{util.c => db.c} |    5 ++---
 src/{util.c => db.h} |   12 +++++++-----
 src/util.c           |    1 -
 src/util.h           |   10 ++++++++++
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 7795e08..310f9c2 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -61,8 +61,6 @@ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0])
 
-XDT_CHECK_PACKAGE([EXO], [exo-1], [0.4.0])
-
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
 
 XDT_CHECK_PACKAGE([CAIRO], [cairo], [1.8.0])
diff --git a/src/Makefile.am b/src/Makefile.am
index 513ec83..e86d739 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,7 @@ ristretto_SOURCES = \
 	file.c file.h \
 	privacy_dialog.h privacy_dialog.c \
 	util.c util.h \
+	db.c db.h \
 	icon_bar.c icon_bar.h \
 	main.c
 
diff --git a/src/util.c b/src/db.c
similarity index 89%
copy from src/util.c
copy to src/db.c
index 9150762..9989850 100644
--- a/src/util.c
+++ b/src/db.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) Stephan Arts 2011 <stephan at xfce.org>
+ *  Copyright (c) Stephan Arts 2012 <stephan at xfce.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,6 +19,5 @@
 #include <config.h>
 #include <glib.h>
 #include <locale.h>
-#include <exo/exo.h>
 
-#include "util.h"
+#include "db.h"
diff --git a/src/util.c b/src/db.h
similarity index 87%
copy from src/util.c
copy to src/db.h
index 9150762..3d59cdd 100644
--- a/src/util.c
+++ b/src/db.h
@@ -16,9 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
-#include <glib.h>
-#include <locale.h>
-#include <exo/exo.h>
+#ifndef __RISTRETTO_DB_H__
+#define __RISTRETTO_DB_H__
 
-#include "util.h"
+G_BEGIN_DECLS
+
+G_END_DECLS
+
+#endif /* __RSTTO_DB_H__ */
diff --git a/src/util.c b/src/util.c
index 9150762..8179a37 100644
--- a/src/util.c
+++ b/src/util.c
@@ -19,6 +19,5 @@
 #include <config.h>
 #include <glib.h>
 #include <locale.h>
-#include <exo/exo.h>
 
 #include "util.h"
diff --git a/src/util.h b/src/util.h
index 64e405e..9d585f0 100644
--- a/src/util.h
+++ b/src/util.h
@@ -67,4 +67,14 @@ typedef enum {
     THUMBNAIL_SIZE_COUNT,
 } RsttoThumbnailSize;
 
+#define THUMBNAIL_SIZE_VERY_SMALL_SIZE   24
+#define THUMBNAIL_SIZE_SMALLER_SIZE      32
+#define THUMBNAIL_SIZE_SMALL_SIZE        48
+#define THUMBNAIL_SIZE_NORMAL_SIZE       64
+#define THUMBNAIL_SIZE_LARGE_SIZE        96
+#define THUMBNAIL_SIZE_LARGER_SIZE      128
+#define THUMBNAIL_SIZE_VERY_LARGE_SIZE  256
+
+G_END_DECLS
+
 #endif /* __RSTTO_UTIL_H__ */