[maemo-commits] [maemo-commits] r12709 - in projects/haf/trunk/hildon-desktop: . libhildondesktop libhildonwm policies

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-07-10 16:44:42 +0300 (Tue, 10 Jul 2007)
New Revision: 12709

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/Makefile.am
   projects/haf/trunk/hildon-desktop/libhildonwm/Makefile.am
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
   projects/haf/trunk/hildon-desktop/policies/Makefile.am
Log:

2007-07-10  Johan Bilien  <johan.bilien at nokia.com>

	Fixed make dist:
	* libhildonwm/hd-wm.c: do not include libosso.h (not used)
	* */Makefile.am: removed legacy EXTRA_DIST rule
	* libhildondesktop/Makefile.am: fixed typo in source file list
	Thanks to Richard Hult for poiting these out



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-10 13:03:04 UTC (rev 12708)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-10 13:44:42 UTC (rev 12709)
@@ -1,3 +1,11 @@
+2007-07-10  Johan Bilien  <johan.bilien at nokia.com>
+
+	Fixed make dist:
+	* libhildonwm/hd-wm.c: do not include libosso.h (not used)
+	* */Makefile.am: removed legacy EXTRA_DIST rule
+	* libhildondesktop/Makefile.am: fixed typo in source file list
+	Thanks to Richard Hult for poiting these out
+
 2007-07-10  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/Makefile.am, src/hd-panel-window-dialog.[ch]

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/Makefile.am	2007-07-10 13:03:04 UTC (rev 12708)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/Makefile.am	2007-07-10 13:44:42 UTC (rev 12709)
@@ -35,8 +35,6 @@
 	libhildonmenu.h		      \
         hildon-status-bar-item.h	
 
-EXTRA_DIST = .empty
-
 INCLUDES = \
 	$(HILDON_CFLAGS)             \
 	$(GNOME_VFS_CFLAGS)          \
@@ -62,7 +60,7 @@
 	hildon-home-area.c           \
 	hildon-home-area.h           \
 	hildon-desktop-home-item.c   \
-	hildon-desktop-home.item.h   \
+	hildon-desktop-home-item.h   \
 	hildon-home-window.c         \
 	hildon-home-window.h         \
 	hildon-home-titlebar.c       \

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/Makefile.am	2007-07-10 13:03:04 UTC (rev 12708)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/Makefile.am	2007-07-10 13:44:42 UTC (rev 12709)
@@ -13,10 +13,7 @@
 		     hd-wm-window.h \
 		     hd-wm-desktop.h \
 		     hd-wm.h
-		     
 
-EXTRA_DIST = .empty
-
 INCLUDES = \
 	$(HILDON_CFLAGS) \
         $(GTK_CFLAGS) \

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-07-10 13:03:04 UTC (rev 12708)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-07-10 13:44:42 UTC (rev 12709)
@@ -38,10 +38,6 @@
 #include <libgnomevfs/gnome-vfs.h>
 #include <glib/gi18n.h>
 
-#ifdef HAVE_LIBOSSO
-#include <libosso.h>
-#endif
-
 #include <hildon/hildon-window.h>
 
 #define DBUS_API_SUBJECT_TO_CHANGE
@@ -1398,8 +1394,7 @@
        guint interval = LAUNCH_SUCCESS_TIMEOUT * 1000;
        HDWMWindow *h_active_win = hd_wm_application_get_active_window(app);
       
-       hd_wm_debug ("app is hibernating, attempting to reawaken"
-		 "via osso_manager_launch()");
+       hd_wm_debug ("app is hibernating, attempting to reawaken");
 
        if (h_active_win)
          hd_wm_window_awake (h_active_win);

Modified: projects/haf/trunk/hildon-desktop/policies/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-desktop/policies/Makefile.am	2007-07-10 13:03:04 UTC (rev 12708)
+++ projects/haf/trunk/hildon-desktop/policies/Makefile.am	2007-07-10 13:44:42 UTC (rev 12709)
@@ -1,5 +1,3 @@
-EXTRA_DIST = .empty
-
 hildonuipolicylib_LTLIBRARIES = libtasknavigatorpolicy.la
 
 libtasknavigatorpolicy_la_LDFLAGS = -module -avoid-version