2008-12-09 Claudio Saavedra <csaavedra@igalia.com>

* src/hildon-dialog.c: Mark as deprecated.
	* src/hildon-dialog.h: Mark as deprecated.
	* src/hildon-picker-dialog.h: Allow HildonPickerDialog to derive
	from HildonDialog and still work, even if
	HILDON_DISABLE_DEPRECATED is defined. This is required as we can't currently
	break the ABI and simply make HildonPickerDialog derive from GtkDialog.

	Fixes: NB#90867 (Deprecate HildonDialog and use GtkDialog (with
	maemo changes) instead)

diff --git a/ChangeLog b/ChangeLog
index 2c7a3f6..17be0ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-12-09  Claudio Saavedra  <csaavedra@igalia.com>
+
+       * src/hildon-dialog.c: Mark as deprecated.
+       * src/hildon-dialog.h: Mark as deprecated.
+       * src/hildon-picker-dialog.h: Allow HildonPickerDialog to derive
+       from HildonDialog and still work, even if
+       HILDON_DISABLE_DEPRECATED is defined. This is required as we can't currently
+       break the ABI and simply make HildonPickerDialog derive from GtkDialog.
+
+       Fixes: NB#90867 (Deprecate HildonDialog and use GtkDialog (with
+       maemo changes) instead)
+
 2008-12-09  Alejandro G. Castro         <alex@igalia.com>
 
        * src/hildon-pannable_area.h:

diff --git a/src/hildon-dialog.c b/src/hildon-dialog.c
index 995c5da..6c3ff3d 100644 (file)
--- a/src/hildon-dialog.c
+++ b/src/hildon-dialog.c
@@ -27,10 +27,12 @@
  * @short_description: Widget representing a popup window in the Hildon framework.
  * @see_also: #HildonCodeDialog, #HildonColorChooserDialog, #HildonFontSelectionDialog, #HildonGetPasswordDialog, #HildonLoginDialog, #HildonSetPasswordDialog, #HildonSortDialog, #HildonWizardDialog
  *
- * The HildonDialog is a GTK widget which represent a popup window in the
- * Hildon framework. It is derived from the GtkDialog and provides additional
+ * #HildonDialog is a GTK widget which represent a popup window in the
+ * Hildon framework. It is derived from #GtkDialog and provides additional
  * commodities specific to the Hildon framework.
  *
+ * As of hildon 2.2, #HildonDialog has been deprecated in favor of #GtkDialog.
+ *
  * <example>
  * <title>Simple <structname>HildonDialog</structname> usage</title>
  * <programlisting>
@@ -56,6 +58,8 @@
  * </example>
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #include                                        "hildon-dialog.h"
 #include                                        "hildon-gtk.h"
 

diff --git a/src/hildon-dialog.h b/src/hildon-dialog.h
index d88be5b..eca9e4d 100644 (file)
--- a/src/hildon-dialog.h
+++ b/src/hildon-dialog.h
@@ -22,6 +22,8 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_DIALOG_H__
 #define                                         __HILDON_DIALOG_H__
 
@@ -95,3 +97,5 @@ hildon_dialog_add_buttons                       (HildonDialog *dialog,
 G_END_DECLS
 
 #endif                                          /* __HILDON_DIALOG_H__ */
+
+#endif                                          /* HILDON_DISABLE_DEPRECATED */

diff --git a/src/hildon-picker-dialog.h b/src/hildon-picker-dialog.h
index 040b733..3d867f5 100644 (file)
--- a/src/hildon-picker-dialog.h
+++ b/src/hildon-picker-dialog.h
@@ -21,7 +21,17 @@
 #ifndef                                         __HILDON_PICKER_DIALOG_H__
 #define                                         __HILDON_PICKER_DIALOG_H__
 
+#ifdef HILDON_DISABLE_DEPRECATED
+  #define __SHOULD_REENABLE_DISABLE_DEPRECATED
+#endif
+
+#undef HILDON_DISABLE_DEPRECATED
 #include                                        "hildon-dialog.h"
+
+#ifdef __SHOULD_REENABLE_DISABLE_DEPRECATED
+  #define HILDON_DISABLE_DEPRECATED
+#endif
+
 #include                                        "hildon-touch-selector.h"
 
 G_BEGIN_DECLS