Cleanup font selection dialog,

* hildon-widgets/hildon-font-selection-dialog.h: use G_BEGIN_DECLS
        + coding style cleanup

        * hildon-widgets/hildon-font-selection-dialog.c
        (hildon_font_selection_dialog_finalize): use g_return_if_fail
        instead of g_assert.

        * hildon-widgets/hildon-font-selection-dialog.c
        (hildon_font_selection_dialog_get_text_tag)
        (hildon_font_selection_dialog_set_buffer)
        (hildon_font_selection_dialog_get_font)
        (hildon_font_selection_dialog_set_font): Removed deprecation #ifdef.

diff --git a/ChangeLog b/ChangeLog
index e06cd63..10a598c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,24 @@
 
 2006-03-01  Luc Pionchon  <luc.pionchon@nokia.com>
 
+        Cleanup font selection dialog,
+
+       * hildon-widgets/hildon-font-selection-dialog.h: use G_BEGIN_DECLS
+        + coding style cleanup
+
+       * hildon-widgets/hildon-font-selection-dialog.c
+       (hildon_font_selection_dialog_finalize): use g_return_if_fail
+       instead of g_assert.
+
+       * hildon-widgets/hildon-font-selection-dialog.c
+       (hildon_font_selection_dialog_get_text_tag)
+       (hildon_font_selection_dialog_set_buffer)
+       (hildon_font_selection_dialog_get_font)
+       (hildon_font_selection_dialog_set_font): Removed deprecation #ifdef.
+
+
+2006-03-01  Luc Pionchon  <luc.pionchon@nokia.com>
+
        Cleanup range editor,
        
        * hildon-widgets/hildon-range-editor.c
@@ -92,7 +110,7 @@
        (hildon_range_editor_forall): use g_return_if_fail instead of
        g_assert
 
-       * hildon-widgets/hildon-range-editor.c
+       * hildon-widgets/hildon-range-editor.cvn
        (hildon_range_editor_mnemonic_activate): removed. (unused)
 
 

diff --git a/hildon-widgets/hildon-font-selection-dialog.c b/hildon-widgets/hildon-font-selection-dialog.c
index e1c3208..6fb842e 100644 (file)
--- a/hildon-widgets/hildon-font-selection-dialog.c
+++ b/hildon-widgets/hildon-font-selection-dialog.c
@@ -884,7 +884,7 @@ hildon_font_selection_dialog_finalize(GObject * object)
   HildonFontSelectionDialogPrivate *priv;
   HildonFontSelectionDialog *fontsel;
 
-  g_return_if_fail(HILDON_IS_FONT_SELECTION_DIALOG(object));
+  g_assert(HILDON_IS_FONT_SELECTION_DIALOG(object));
   fontsel = HILDON_FONT_SELECTION_DIALOG(object);
 
   priv = HILDON_FONT_SELECTION_DIALOG_GET_PRIVATE(fontsel);
@@ -1645,7 +1645,6 @@ hildon_font_selection_dialog_set_preview_text(HildonFontSelectionDialog *
  * Returns: a #GtkTextTag having corresponding properties
  * set. 
  */ 
-#ifndef HILDON_DISABLE_DEPRECATED
 GtkTextTag * 
 hildon_font_selection_dialog_get_text_tag (HildonFontSelectionDialog *fsd)
 {
@@ -1769,7 +1768,6 @@ hildon_font_selection_dialog_get_text_tag (HildonFontSelectionDialog *fsd)
   
   return tag;
 }
-#endif
 
 /** 
  * hildon_font_selection_dialog_set_buffer:
@@ -1783,7 +1781,6 @@ hildon_font_selection_dialog_get_text_tag (HildonFontSelectionDialog *fsd)
  * font selection dialog to reflect your inspection.
  * 
  */
-#ifndef HILDON_DISABLE_DEPRECATED
 void 
 hildon_font_selection_dialog_set_buffer (HildonFontSelectionDialog *fsd,
                                         GtkTextBuffer *buffer)
@@ -1823,7 +1820,6 @@ hildon_font_selection_dialog_set_buffer (HildonFontSelectionDialog *fsd,
   settings_apply(&settings);
   settings_destroy(&settings);
 }
-#endif
 
 /**
  * hildon_font_selection_dialog_get_font:
@@ -1834,7 +1830,6 @@ hildon_font_selection_dialog_set_buffer (HildonFontSelectionDialog *fsd,
  *
  * Return value: pointer to @PangoAttrList.
  */
-#ifndef HILDON_DISABLE_DEPRECATED
 PangoAttrList
 *hildon_font_selection_dialog_get_font(HildonFontSelectionDialog * fsd)
 {
@@ -1849,7 +1844,6 @@ PangoAttrList
   return hildon_font_selection_dialog_create_attrlist(fsd, 
                                0, strlen(priv->preview_text));
 }
-#endif
 
 /**
  * hildon_font_selection_dialog_set_font:
@@ -1860,7 +1854,6 @@ PangoAttrList
  * 
  * Sets the font to the dialog.
  */
-#ifndef HILDON_DISABLE_DEPRECATED
 void 
 hildon_font_selection_dialog_set_font(HildonFontSelectionDialog * fsd,
                                      PangoAttrList * list)
@@ -1889,4 +1882,3 @@ hildon_font_selection_dialog_set_font(HildonFontSelectionDialog * fsd,
   settings_apply(&settings);
   settings_destroy(&settings);
 }
-#endif

diff --git a/hildon-widgets/hildon-font-selection-dialog.h b/hildon-widgets/hildon-font-selection-dialog.h
index 1105fd9..88b994c 100644 (file)
--- a/hildon-widgets/hildon-font-selection-dialog.h
+++ b/hildon-widgets/hildon-font-selection-dialog.h
@@ -27,9 +27,7 @@
 #include <gtk/gtkdialog.h>
 #include <gtk/gtktextbuffer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define HILDON_TYPE_FONT_SELECTION_DIALOG \
         (hildon_font_selection_dialog_get_type ())
@@ -51,9 +49,8 @@ extern "C" {
          HILDON_TYPE_FONT_SELECTION_DIALOG,\
          HildonFontSelectionDialogClass))
 
-typedef struct _HildonFontSelectionDialog HildonFontSelectionDialog;
-typedef struct _HildonFontSelectionDialogClass
- HildonFontSelectionDialogClass;
+typedef struct _HildonFontSelectionDialog      HildonFontSelectionDialog;
+typedef struct _HildonFontSelectionDialogClass HildonFontSelectionDialogClass;
 
 struct _HildonFontSelectionDialog
 {
@@ -72,36 +69,32 @@ struct _HildonFontSelectionDialogClass
 };
 
 #ifndef HILDON_DISABLE_DEPRECATED
-PangoAttrList* 
-hildon_font_selection_dialog_get_font(HildonFontSelectionDialog *
-                                            fsd);
-void hildon_font_selection_dialog_set_font(HildonFontSelectionDialog *
-                                           fsd, PangoAttrList * list);
+PangoAttrList* hildon_font_selection_dialog_get_font(HildonFontSelectionDialog *fsd);
+
+void           hildon_font_selection_dialog_set_font(HildonFontSelectionDialog *fsd,
+                                                     PangoAttrList             *list);
 #endif
 
 
-GType   hildon_font_selection_dialog_get_type          (void) G_GNUC_CONST;
+GType      hildon_font_selection_dialog_get_type       (void) G_GNUC_CONST;
 
-GtkWidget*
-        hildon_font_selection_dialog_new               (GtkWindow * parent,
-                                                       const gchar * title);
+GtkWidget* hildon_font_selection_dialog_new            (GtkWindow   *parent,
+                                                       const gchar *title);
 
 
 #ifndef HILDON_DISABLE_DEPRECATED
 void    hildon_font_selection_dialog_set_buffer        (HildonFontSelectionDialog *fsd, 
                                                        GtkTextBuffer *buffer);
 
-GtkTextTag *
-        hildon_font_selection_dialog_get_text_tag      (HildonFontSelectionDialog *fsd);
-
+GtkTextTag* hildon_font_selection_dialog_get_text_tag  (HildonFontSelectionDialog *fsd);
 #endif
+
        
-gchar*  hildon_font_selection_dialog_get_preview_text  (HildonFontSelectionDialog * fsd);
+gchar*  hildon_font_selection_dialog_get_preview_text  (HildonFontSelectionDialog *fsd);
 
-void    hildon_font_selection_dialog_set_preview_text  (HildonFontSelectionDialog * fsd, 
+void    hildon_font_selection_dialog_set_preview_text  (HildonFontSelectionDialog *fsd, 
                                                        const gchar * text);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __HILDON_FONTSEL_H__ */
+G_END_DECLS
+
+#endif /* __HILDON_FONT_SELECTION_DIALOG_H__ */