[Pkg-e-commits] [SCM] Enlightenment 17 branch, upstream-vcs, updated. a8698069ec4eec9c2a189198fa5eec9854b168ac

[raster]

The following commit has been merged in the upstream-vcs branch:
commit c4fd02e2aa0b42bb3666cdaa8bd5916fcbb31c51
Author: raster <raster>
Date:   Fri Mar 28 20:53:26 2008 +0000

    add pkgconfig supprot to e17 itself.

diff --git a/Makefile.am b/Makefile.am
index f031c55..dac1065 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,14 +4,17 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        config.h.in config.sub configure install-sh \
 		       ltconfig ltmain.sh missing mkinstalldirs \
 		       stamp-h.in acconfig.h \
-		       enlightenment.spec
+		       enlightenment.spec enlightenment.pc
 
 bin_SCRIPTS = enlightenment-config
 
 EXTRA_DIST = config.rpath  README AUTHORS COPYING COPYING-PLAIN \
-             enlightenment.spec.in enlightenment.spec
+             enlightenment.spec.in enlightenment.spec enlightenment.pc
 
 filesdir = $(datadir)/enlightenment/
 files_DATA = AUTHORS COPYING 
 
 ACLOCAL_AMFLAGS = -I m4
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = enlightenment.pc
diff --git a/configure.in b/configure.in
index f0169f1..c3f73ac 100644
--- a/configure.in
+++ b/configure.in
@@ -265,6 +265,7 @@ AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as c
 AC_OUTPUT([
 Makefile
 enlightenment.spec
+enlightenment.pc
 src/Makefile
 src/bin/Makefile
 src/modules/Makefile
diff --git a/enlightenment.pc.in b/enlightenment.pc.in
new file mode 100644
index 0000000..fda2080
--- /dev/null
+++ b/enlightenment.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: enlightenment
+Description: Enlightenmnt Window Manager
+Version: @VERSION@
+Libs: 
+Libs.private: 
+Cflags: -I${includedir}
+
diff --git a/src/bin/e_fm_hal.c b/src/bin/e_fm_hal.c
index 48650a1..031de46 100644
--- a/src/bin/e_fm_hal.c
+++ b/src/bin/e_fm_hal.c
@@ -130,6 +130,7 @@ e_fm2_hal_volume_add(E_Volume *v)
    if ((!v->mount_point) || (v->mount_point[0] == 0))
      {
 	if (v->mount_point) free(v->mount_point);
+	v->mount_point = NULL;
 	v->mount_point = e_fm2_hal_volume_mountpoint_get(v);
 	if ((!v->mount_point) || (v->mount_point[0] == 0))
 	  {
@@ -137,6 +138,7 @@ e_fm2_hal_volume_add(E_Volume *v)
 	     char *id;
 	     
 	     if (v->mount_point) free(v->mount_point);
+	     v->mount_point = NULL;
 	     id = "disk";
 	     if ((v->uuid) && (v->uuid[0])) id = v->uuid;
 	     if (ecore_file_is_dir("/media"))
diff --git a/src/bin/e_slidesel.c b/src/bin/e_slidesel.c
index a773c8a..8ba7f23 100644
--- a/src/bin/e_slidesel.c
+++ b/src/bin/e_slidesel.c
@@ -155,7 +155,7 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
 		  if (sd->cur)
 		    {
 		       /* get rid of accidental release and presses */
-		       if ((t - sd->down_time) > 0.2)
+//		       if ((t - sd->down_time) > 0.2)
 			 {
 			    edje_object_signal_emit(sd->edje_obj, "e,action,select", "e");
 			    if (sd->cur->func) sd->cur->func(sd->cur->data);

-- 
Enlightenment 17