[maemo-commits] [maemo-commits] r10793 - in projects/haf/trunk/libosso: . debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-03-28 10:44:06 +0300 (Wed, 28 Mar 2007)
New Revision: 10793

Modified:
   projects/haf/trunk/libosso/ChangeLog
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/src/Makefile.am
   projects/haf/trunk/libosso/src/Makefile.in
   projects/haf/trunk/libosso/src/osso-state.h
Log:
brought back API


Modified: projects/haf/trunk/libosso/ChangeLog
===================================================================
--- projects/haf/trunk/libosso/ChangeLog	2007-03-27 17:41:59 UTC (rev 10792)
+++ projects/haf/trunk/libosso/ChangeLog	2007-03-28 07:44:06 UTC (rev 10793)
@@ -1,3 +1,13 @@
+2007-03-27  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* src/osso-state.h (validate_state): Removed static prototype,
+	which pointless in a header.
+
+	* src/deprecated.c: New, to bring osso_application_set_exit_cb(),
+	osso_state_open_write(), osso_state_open_read(), and
+	osso_state_close() back.
+	* src/Makefile.am (libosso_la_SOURCES): Include it.
+
 2006-10-23   Murray Cumming  <murrayc at murrayc.com>
 
 	* src/muali.h:

Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2007-03-27 17:41:59 UTC (rev 10792)
+++ projects/haf/trunk/libosso/debian/changelog	2007-03-28 07:44:06 UTC (rev 10793)
@@ -1,3 +1,11 @@
+libosso (2.4-1) unstable; urgency=low
+
+  * UNRELEASED
+  * Bring back osso_application_set_exit_cb(), osso_state_open_write(),
+    osso_state_open_read(), osso_state_close() to stay binary compatible.
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 27 Mar 2007 20:10:19 +0300
+
 libosso (2.3-1) unstable; urgency=low
 
   * New API (osso_hw_set_display_event_cb) for catching the MCE display

Modified: projects/haf/trunk/libosso/src/Makefile.am
===================================================================
--- projects/haf/trunk/libosso/src/Makefile.am	2007-03-27 17:41:59 UTC (rev 10792)
+++ projects/haf/trunk/libosso/src/Makefile.am	2007-03-28 07:44:06 UTC (rev 10793)
@@ -3,7 +3,7 @@
 
 AM_CPPFLAGS = \
 	-DPREFIX=\"${prefix}\" \
-       	-DOSSO_CTRLPANELPLUGINDIR=\"${prefix}/lib/hildon-control-panel\"
+	-DOSSO_CTRLPANELPLUGINDIR=\"${prefix}/lib/hildon-control-panel\"
 
 lib_LTLIBRARIES = libosso.la
 
@@ -43,4 +43,5 @@
 	osso-application-init.c \
 	osso-mem.h \
 	osso-mem.c \
-	muali.h
+	muali.h \
+        deprecated.c

Modified: projects/haf/trunk/libosso/src/Makefile.in
===================================================================
--- projects/haf/trunk/libosso/src/Makefile.in	2007-03-27 17:41:59 UTC (rev 10792)
+++ projects/haf/trunk/libosso/src/Makefile.in	2007-03-28 07:44:06 UTC (rev 10793)
@@ -59,12 +59,13 @@
 	osso-hw.lo osso-mime.lo osso-system-note.lo osso-rpc.lo \
 	osso-statusbar.lo osso-cp-plugin.lo osso-log.lo osso-time.lo \
 	osso-locale.lo osso-display.lo osso-application-init.lo \
-	osso-mem.lo
+	osso-mem.lo deprecated.lo
 libosso_la_OBJECTS = $(am_libosso_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/osso-application-autosave.Plo \
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/deprecated.Plo \
+ at AMDEP_TRUE@	./$(DEPDIR)/osso-application-autosave.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/osso-application-init.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/osso-application-top.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/osso-cp-plugin.Plo \
@@ -214,7 +215,7 @@
 
 AM_CPPFLAGS = \
 	-DPREFIX=\"${prefix}\" \
-       	-DOSSO_CTRLPANELPLUGINDIR=\"${prefix}/lib/hildon-control-panel\"
+	-DOSSO_CTRLPANELPLUGINDIR=\"${prefix}/lib/hildon-control-panel\"
 
 lib_LTLIBRARIES = libosso.la
 libosso_la_LIBADD = -ldl -lc $(GTHREAD_LIBS) $(GLIB_LIBS) $(DBUS_LIBS)
@@ -251,7 +252,8 @@
 	osso-application-init.c \
 	osso-mem.h \
 	osso-mem.c \
-	muali.h
+	muali.h \
+        deprecated.c
 
 all: all-am
 
@@ -322,6 +324,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/deprecated.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/osso-application-autosave.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/osso-application-init.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/osso-application-top.Plo at am__quote@

Modified: projects/haf/trunk/libosso/src/osso-state.h
===================================================================
--- projects/haf/trunk/libosso/src/osso-state.h	2007-03-27 17:41:59 UTC (rev 10792)
+++ projects/haf/trunk/libosso/src/osso-state.h	2007-03-28 07:44:06 UTC (rev 10793)
@@ -42,6 +42,4 @@
 #define LOCATION_VAR "STATESAVEDIR"
 #define FALLBACK_PREFIX "/tmp/state"
 
-static gboolean _validate_state(osso_state_t *state);
-
 #endif /* OSSO_STATE_H */