[cheese/netbook-mode] hildon: drop last HILDON bits still alive



commit b7a33d840297472d0472555fe5a2bb629d706e84
Author: Filippo Argiolas <filippo argiolas gmail com>
Date:   Mon Aug 10 17:38:52 2009 +0200

    hildon: drop last HILDON bits still alive
    
    Completely drop HILDON mode, it was partial and didn't work since some
    time. If we really want to support HILDON someone should step in and
    write a good patch.

 configure.ac          |   10 ----------
 src/Makefile.am       |    5 -----
 src/cheese-fileutil.c |   15 ---------------
 3 files changed, 0 insertions(+), 30 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d7863c9..1f97924 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,16 +96,6 @@ CHEESE_LIBS="$CHEESE_LIBS -lgstinterfaces-0.10"
 
 AC_SUBST(CHEESE_LIBS)
 
-AC_ARG_ENABLE(hildon, AS_HELP_STRING([--enable-hildon],[compile for Hildon environment (default=no)]),,enable_hildon=no)
-
-if test "x$enable_hildon" = "xyes"; then
-   PKG_CHECK_MODULES([HILDON], hildon-1 >= 1.0.5,enable_hildon=yes,enable_hildon=no)
-else
-   enable_hildon=no
-fi
-
-AM_CONDITIONAL(WITH_HILDON, test "x$enable_hildon" = "xyes")
-
 dnl Multimedia keys
 have_xfree=no
 AC_COMPILE_IFELSE([
diff --git a/src/Makefile.am b/src/Makefile.am
index d713c6d..21cb8a9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,11 +60,6 @@ cheese_SOURCES = \
 cheese_LDADD = \
 	$(CHEESE_LIBS)
 
-if WITH_HILDON
-  INCLUDES += $(HILDON_CFLAGS) -DHILDON
-  cheese_LDADD += $(HILDON_LIBS)
-endif
-
 #dbus
 BUILT_SOURCES = cheese-dbus-infos.h
 # We don't want to install this header
diff --git a/src/cheese-fileutil.c b/src/cheese-fileutil.c
index 2fbf724..0c89dd3 100644
--- a/src/cheese-fileutil.c
+++ b/src/cheese-fileutil.c
@@ -49,12 +49,7 @@ cheese_fileutil_get_video_path (CheeseFileUtil *fileutil)
 
   gchar *path;
 
-#ifdef HILDON
-  /* TODO change HILDON to xdg as well? */
-  path = g_strjoin (G_DIR_SEPARATOR_S, g_get_home_dir (), "Mydocs", ".videos", NULL);
-#else
   path = priv->video_path;
-#endif
 
   return path;
 }
@@ -66,12 +61,7 @@ cheese_fileutil_get_photo_path (CheeseFileUtil *fileutil)
 
   gchar *path;
 
-#ifdef HILDON
-  /* TODO change HILDON to xdg as well? */
-  path = g_strjoin (G_DIR_SEPARATOR_S, g_get_home_dir (), "Mydocs", ".images", NULL);
-#else
   path = priv->photo_path;
-#endif
 
   return path;
 }
@@ -89,12 +79,7 @@ cheese_fileutil_get_log_path (CheeseFileUtil *fileutil)
 
   gchar *path;
 
-#ifdef HILDON
-  /* TODO change HILDON to xdg as well? */
-  path = g_strjoin (G_DIR_SEPARATOR_S, g_get_home_dir (), "Mydocs", ".cheese-log", NULL);
-#else
   path = priv->log_path;
-#endif
 
   return path;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]