2008-11-20 Alberto Garcia <agarcia@igalia.com>

Based on a patch by Claudio Saavedra (csaavedra@igalia.com)

	* src/hildon-volumebar.h
	* src/hildon-volumebar.c (hildon_volumebar_set_range_insensitive_message)
	(hildon_volumebar_set_range_insensitive_messagef): Mark as deprecated.

	* src/hildon-helper.h
	* src/hildon-helper.c (hildon_helper_set_insensitive_message)
	(hildon_helper_set_insensitive_messagef): Mark as deprecated.

	* examples/Makefile.am:
	Deprecate hildon-insensitive-example

	Fixes: NB#92664 (Deprecate hildon_helper_set_insensitive_message)

diff --git a/ChangeLog b/ChangeLog
index aded838..8b9c384 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2008-11-20  Alberto Garcia  <agarcia@igalia.com>
 
+       Based on a patch by Claudio Saavedra (csaavedra@igalia.com)
+
+       * src/hildon-volumebar.h
+       * src/hildon-volumebar.c (hildon_volumebar_set_range_insensitive_message)
+       (hildon_volumebar_set_range_insensitive_messagef): Mark as deprecated.
+
+       * src/hildon-helper.h
+       * src/hildon-helper.c (hildon_helper_set_insensitive_message)
+       (hildon_helper_set_insensitive_messagef): Mark as deprecated.
+
+       * examples/Makefile.am:
+       Deprecate hildon-insensitive-example
+
+       Fixes: NB#92664 (Deprecate hildon_helper_set_insensitive_message)
+
+2008-11-20  Alberto Garcia  <agarcia@igalia.com>
+
        * examples/hildon-pannable-area-buttons-scroll-example.c:
        Make all buttons finger height
 

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 65c37fd..7f18aee 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -7,7 +7,6 @@ EXAMPLES                                = hildon-window-example                         \
                                          hildon-caption-example                        \
                                          hildon-note-example                           \
                                          hildon-icon-sizes-example                     \
-                                         hildon-insensitive-example                    \
                                          hildon-window-menu-example                    \
                                          hildon-window-cmn-menu-example                \
                                          hildon-toolbar-example                        \
@@ -65,7 +64,8 @@ DEPRECATED_EXAMPLES                   = hildon-weekday-picker-example                 \
                                          hildon-bread-crumb-trail-example              \
                                          hildon-seekbar-example                        \
                                          hildon-toolbar-seekbar-example                \
-                                         hildon-hvolumebar-timer-example
+                                         hildon-hvolumebar-timer-example               \
+                                         hildon-insensitive-example
 
 
 if HILDON_DISABLE_DEPRECATED

diff --git a/src/hildon-helper.c b/src/hildon-helper.c
index 49b7dc3..ccb04b0 100644 (file)
--- a/src/hildon-helper.c
+++ b/src/hildon-helper.c
@@ -31,6 +31,8 @@
  * on widget styles and probing functions for touch events.
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif
@@ -373,6 +375,8 @@ show_insensitive_message                        (GtkWidget *widget,
  * This function assigns an insensitive message to a @widget. When the @widget is
  * in an insensitive state and the user activates it, the @message will be displayed
  * using a standard #HildonBanner.
+ *
+ * Deprecated: As of hildon 2.2, it is strongly discouraged to use insensitive messages.
  **/
 void
 hildon_helper_set_insensitive_message           (GtkWidget *widget,
@@ -404,6 +408,8 @@ hildon_helper_set_insensitive_message           (GtkWidget *widget,
  * @Varargs: arguments for the format string
  *
  * A version of hildon_helper_set_insensitive_message with string formatting.
+ *
+ * Deprecated: As of hildon 2.2, it is strongly discouraged to use insensitive messages.
  **/
 void
 hildon_helper_set_insensitive_messagef          (GtkWidget *widget,

diff --git a/src/hildon-helper.h b/src/hildon-helper.h
index 3a54f39..834e47b 100644 (file)
--- a/src/hildon-helper.h
+++ b/src/hildon-helper.h
@@ -44,6 +44,7 @@ hildon_helper_set_logical_color                 (GtkWidget *widget,
 gboolean 
 hildon_helper_event_button_is_finger            (GdkEventButton *event);
 
+#ifndef HILDON_DISABLE_DEPRECATED
 void
 hildon_helper_set_insensitive_message           (GtkWidget *widget,
                                                  const gchar *message);
@@ -52,6 +53,7 @@ void
 hildon_helper_set_insensitive_messagef          (GtkWidget *widget,
                                                 const gchar *format,
                                                 ...);
+#endif
 
 void
 hildon_helper_set_thumb_scrollbar               (GtkScrolledWindow *win, 

diff --git a/src/hildon-volumebar.c b/src/hildon-volumebar.c
index 2d460d5..adc8f2f 100644 (file)
--- a/src/hildon-volumebar.c
+++ b/src/hildon-volumebar.c
@@ -746,7 +746,9 @@ hildon_volumebar_level_change                   (HildonVolumebar *self)
  *
  * Used to asign an insensitive message to the slider of the given volumebar.
  * It simply calls hildon_helper_set_insensitive_message on the slider/range of 
- * the volumebar. 
+ * the volumebar.
+ *
+ * Deprecated: As of hildon 2.2, it is strongly discouraged to use insensitive messages.
  */
 void
 hildon_volumebar_set_range_insensitive_message  (HildonVolumebar *widget,
@@ -767,6 +769,8 @@ hildon_volumebar_set_range_insensitive_message  (HildonVolumebar *widget,
  * @varargs : arguments for the format string
  *
  * A helper printf-like variant of hildon_helper_set_insensitive_message.
+ *
+ * Deprecated: As of hildon 2.2, it is strongly discouraged to use insensitive messages.
  */
 void
 hildon_volumebar_set_range_insensitive_messagef (HildonVolumebar *widget,

diff --git a/src/hildon-volumebar.h b/src/hildon-volumebar.h
index cdba7ae..9e10b36 100644 (file)
--- a/src/hildon-volumebar.h
+++ b/src/hildon-volumebar.h
@@ -90,6 +90,7 @@ hildon_volumebar_set_mute                       (HildonVolumebar *self,
 GtkAdjustment* 
 hildon_volumebar_get_adjustment                 (HildonVolumebar *self);
 
+#ifndef HILDON_DISABLE_DEPRECATED
 void
 hildon_volumebar_set_range_insensitive_message  (HildonVolumebar *widget,
                                                  const gchar *message);
@@ -98,6 +99,7 @@ void
 hildon_volumebar_set_range_insensitive_messagef (HildonVolumebar *widget,
                                                  const gchar *format,
                                                  ...);
+#endif
 
 G_END_DECLS