[maemo-commits] [maemo-commits] r11473 - projects/haf/trunk/hildon-fm/hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-05-07 13:01:14 +0300 (Mon, 07 May 2007)
New Revision: 11473

Added:
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-fm1-compat.h
Modified:
   projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-fm1-compat.c
Log:
	* hildon-fm/hildon-fm1-compat.h: New.
	* hildon-fm/hildon-fm1-compat.c: Move prototypes to
	hildon-fm1-compat.h, include it.
	* hildon-fm/Makefile.am (libhildonfm_la_SOURCES,
	hildonincludeinst_DATA): Add it.


Modified: projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am	2007-05-07 08:16:06 UTC (rev 11472)
+++ projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am	2007-05-07 10:01:14 UTC (rev 11473)
@@ -51,20 +51,21 @@
 	hildon-file-system-upnp.c		\
 	hildon-file-system-obex.h		\
 	hildon-file-system-obex.c		\
+	hildon-fm1-compat.h			\
 	hildon-fm1-compat.c			\
 	$(hildonfm_built_headers)		\
 	$(hildonfm_built_cfiles)
 
 hildonincludeinstdir=$(includedir)/hildon-fm-2/hildon
-hildonincludeinst_DATA = \
-	hildon-file-selection.h \
-	hildon-file-system-model.h \
-	hildon-file-chooser-dialog.h \
-	hildon-file-system-common.h \
-	hildon-file-system-info.h \
-	hildon-file-details-dialog.h
+hildonincludeinst_DATA =			\
+	hildon-file-selection.h			\
+	hildon-file-system-model.h		\
+	hildon-file-chooser-dialog.h		\
+	hildon-file-system-common.h		\
+	hildon-file-system-info.h		\
+	hildon-file-details-dialog.h		\
+	hildon-fm1-compat.h
 
-
 headers_to_scan_for_enums = $(hildonincludeinst_DATA)
  
 # Generate the enums source code, with glib-mkenums:

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-fm1-compat.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-fm1-compat.c	2007-05-07 08:16:06 UTC (rev 11472)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-fm1-compat.c	2007-05-07 10:01:14 UTC (rev 11473)
@@ -21,36 +21,18 @@
  *
  */
 
-/* This is a thin compatibility layer on top of libhildonfm.so.2 that
-   gives you (more or less) the ABI of the old libhildonfm.so.1.  This
-   works well enough since we only removed functions in
-   libhildonfm.so.2 but didn't change existing functions in an
-   incompatible way.
-
-   However, this hack is only a migration helper.  It will not be
-   officially supported.
-*/
-
-#include "hildon-file-selection.h"
+#include "hildon-fm1-compat.h"
 #include "hildon-file-common-private.h"
 
 gboolean
 hildon_file_selection_set_current_folder (HildonFileSelection *self,
 					  const GtkFilePath *folder,
-					  GError **error);
-
-gboolean
-hildon_file_selection_set_current_folder (HildonFileSelection *self,
-					  const GtkFilePath *folder,
 					  GError **error)
 {
   return _hildon_file_selection_set_current_folder_path (self, folder, error);
 }
 
 GtkFilePath *
-hildon_file_selection_get_current_folder (HildonFileSelection *self);
-
-GtkFilePath *
 hildon_file_selection_get_current_folder (HildonFileSelection *self)
 {
   return _hildon_file_selection_get_current_folder_path (self);
@@ -59,32 +41,19 @@
 gboolean
 hildon_file_selection_select_path (HildonFileSelection *self,
 				   const GtkFilePath *path,
-				   GError **error);
-
-gboolean
-hildon_file_selection_select_path (HildonFileSelection *self,
-				   const GtkFilePath *path,
 				   GError **error)
 {
   return _hildon_file_selection_select_path (self, path, error);
 }
 
-
 void
 hildon_file_selection_unselect_path (HildonFileSelection *self,
-				     const GtkFilePath *path);
-
-void
-hildon_file_selection_unselect_path (HildonFileSelection *self,
 				     const GtkFilePath *path)
 {
   return _hildon_file_selection_unselect_path (self, path);
 }
 
 GSList *
-hildon_file_selection_get_selected_paths (HildonFileSelection *self);
-
-GSList *
 hildon_file_selection_get_selected_paths (HildonFileSelection *self)
 {
   HildonFileSystemModel *model = NULL;

Added: projects/haf/trunk/hildon-fm/hildon-fm/hildon-fm1-compat.h
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-fm1-compat.h	2007-05-07 08:16:06 UTC (rev 11472)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-fm1-compat.h	2007-05-07 10:01:14 UTC (rev 11473)
@@ -0,0 +1,54 @@
+/*
+ * This file is part of hildon-fm package
+ *
+ * Copyright (C) 2007 Nokia Corporation.  All rights reserved.
+ *
+ * Contact: Marius Vollmer <marius.vollmer at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef HILDON_FM1_COMPAT_H
+#define HILDON_FM1_COMPAT_H
+
+/* This is a thin compatibility layer on top of libhildonfm.so.2 that
+   gives you (more or less) the ABI of the old libhildonfm.so.1.  This
+   works well enough since we only removed functions in
+   libhildonfm.so.2 but didn't change existing functions in an
+   incompatible way.
+
+   However, this hack is only a migration helper.  It will not be
+   officially supported.
+*/
+
+#include "hildon-file-selection.h"
+
+gboolean hildon_file_selection_set_current_folder (HildonFileSelection *self,
+						   const GtkFilePath *folder,
+						   GError **error);
+
+GtkFilePath * hildon_file_selection_get_current_folder (HildonFileSelection *self);
+
+gboolean hildon_file_selection_select_path (HildonFileSelection *self,
+					    const GtkFilePath *path,
+					    GError **error);
+
+void hildon_file_selection_unselect_path (HildonFileSelection *self,
+					  const GtkFilePath *path);
+
+GSList * hildon_file_selection_get_selected_paths (HildonFileSelection *self);
+
+#endif /* !HILDON_FM1_COMPAT_H */