2006-11-01 Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>

[hildon] / hildon-widgets / hildon-note.h

diff --git a/hildon-widgets/hildon-note.h b/hildon-widgets/hildon-note.h
index 7c36564..359eb23 100644 (file)
--- a/hildon-widgets/hildon-note.h
+++ b/hildon-widgets/hildon-note.h
@@ -1,14 +1,14 @@
 /*
  * This file is part of hildon-libs
  *
- * Copyright (C) 2005 Nokia Corporation.
+ * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
  *
- * Contact: Luc Pionchon <luc.pionchon@nokia.com>
+ * Contact: Michael Dominic Kostrzewa <michael.kostrzewa@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
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
  *
  * This library is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,7 +26,6 @@
 
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkprogressbar.h>
-#include <gtk/gtkicontheme.h>
 
 G_BEGIN_DECLS
 #define HILDON_TYPE_NOTE ( hildon_note_get_type() )
@@ -37,10 +36,11 @@ G_BEGIN_DECLS
 #define HILDON_IS_NOTE(obj) (GTK_CHECK_TYPE (obj, HILDON_TYPE_NOTE))
 #define HILDON_IS_NOTE_CLASS(klass) \
   (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_NOTE))
-typedef struct _HildonNote HildonNote;
+
+typedef struct _HildonNote      HildonNote;
 typedef struct _HildonNoteClass HildonNoteClass;
 
-typedef enum
+typedef enum /*< skip >*/
 {
     HILDON_NOTE_CONFIRMATION_TYPE = 0,
     HILDON_NOTE_CONFIRMATION_BUTTON_TYPE,
@@ -63,12 +63,13 @@ GtkWidget *hildon_note_new_confirmation(GtkWindow * parent,
 GtkWidget *hildon_note_new_confirmation_add_buttons(GtkWindow * parent,
                                                     const gchar *
                                                     description, ...);
-
+#ifndef HILDON_DISABLE_DEPRECATED
 GtkWidget *hildon_note_new_confirmation_with_icon_stock(GtkWindow * parent,
                                                         const gchar *
                                                         description,
                                                         const gchar *
                                                         stock_id);
+#endif /* HILDON_DISABLE_DEPRECATED */
 
 GtkWidget *hildon_note_new_confirmation_with_icon_name(GtkWindow * parent,
                                                         const gchar *
@@ -91,7 +92,7 @@ GtkWidget *hildon_note_new_information_with_icon_name(GtkWindow * parent,
                                                        description,
                                                        const gchar *
                                                        icon_name);
-
+#ifndef HILDON_DISABLE_DEPRECATED
 GtkWidget *hildon_note_new_information_with_icon_stock(GtkWindow * parent,
                                                        const gchar *
                                                        description,
@@ -103,6 +104,7 @@ GtkWidget *hildon_note_new_information_with_icon_theme(GtkWindow * parent,
                                                        description,
                                                        const gchar *
                                                        icon);
+#endif /* HILDON_DISABLE_DEPRECATED */
                                                        
 void hildon_note_set_button_text(HildonNote * note, const gchar * text);