2006-11-16 Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
authorMichael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
Thu, 16 Nov 2006 09:17:44 +0000 (09:17 +0000)
committerMichael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
Thu, 16 Nov 2006 09:17:44 +0000 (09:17 +0000)
* src/hildon-calendar-popup.h:
* src/hildon-caption.c:
* src/hildon-caption.h:
* src/hildon-date-editor.h:
* src/hildon-font-selection-dialog.c:
* src/hildon-font-selection-dialog.h:
* src/hildon-get-password-dialog.c:
* src/hildon-get-password-dialog.h:
* src/hildon-note.c:
* src/hildon-note.h:
* src/hildon-program.h:
* src/hildon-range-editor.h:
* src/hildon-time-editor.c:
* src/hildon-time-editor.h:
* src/hildon-volumebar-range.h:
* src/hildon-weekday-picker.h:
* src/hildon-wizard-dialog.h: Removing deprecated functions.

18 files changed:
ChangeLog
src/hildon-calendar-popup.h
src/hildon-caption.c
src/hildon-caption.h
src/hildon-date-editor.h
src/hildon-font-selection-dialog.c
src/hildon-font-selection-dialog.h
src/hildon-get-password-dialog.c
src/hildon-get-password-dialog.h
src/hildon-note.c
src/hildon-note.h
src/hildon-program.h
src/hildon-range-editor.h
src/hildon-time-editor.c
src/hildon-time-editor.h
src/hildon-volumebar-range.h
src/hildon-weekday-picker.h
src/hildon-wizard-dialog.h

index ace00ce..19d345e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2006-11-16  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
+       * src/hildon-calendar-popup.h:
+       * src/hildon-caption.c:
+       * src/hildon-caption.h:
+       * src/hildon-date-editor.h:
+       * src/hildon-font-selection-dialog.c:
+       * src/hildon-font-selection-dialog.h:
+       * src/hildon-get-password-dialog.c:
+       * src/hildon-get-password-dialog.h:
+       * src/hildon-note.c:
+       * src/hildon-note.h:
+       * src/hildon-program.h:
+       * src/hildon-range-editor.h:
+       * src/hildon-time-editor.c:
+       * src/hildon-time-editor.h:
+       * src/hildon-volumebar-range.h:
+       * src/hildon-weekday-picker.h:
+       * src/hildon-wizard-dialog.h: Removing deprecated functions.
+
 2006-11-15  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
        * src/hildon-caption.c:
index e2e1d15..2b38800 100644 (file)
@@ -36,13 +36,6 @@ G_BEGIN_DECLS
  */
 #define HILDON_TYPE_CALENDAR_POPUP ( hildon_calendar_popup_get_type() )
 
-/**
- * HILDON_CALENDAR_POPUP_TYPE:
- *
- * Deprecated: use #HILDON_TYPE_CALENDAR_POPUP instead
- */
-#define HILDON_CALENDAR_POPUP_TYPE HILDON_TYPE_CALENDAR_POPUP
-
 #define HILDON_CALENDAR_POPUP(obj) (GTK_CHECK_CAST (obj,\
   HILDON_TYPE_CALENDAR_POPUP, HildonCalendarPopup))
 #define HILDON_CALENDAR_POPUP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass),\
@@ -60,9 +53,6 @@ G_BEGIN_DECLS
 typedef struct _HildonCalendarPopup HildonCalendarPopup;
 typedef struct _HildonCalendarPopupClass HildonCalendarPopupClass;
 
-/* Note: CalendarPopup is no longer derived from GtkWindow
-   but from GtkDialog */
-
 struct _HildonCalendarPopup {
     GtkDialog par;
 };
index 2875d93..c481213 100644 (file)
@@ -761,10 +761,9 @@ static void hildon_caption_forall( GtkContainer *container,
  *
  * Sets a #GtkSizeGroup of a given captioned control.
  *
- * Deprecated: use g_object_set, property :size-group
  */
-void hildon_caption_set_sizegroup( const HildonCaption *self,
-                                   GtkSizeGroup *group )
+void hildon_caption_set_size_group( const HildonCaption *self,
+                                    GtkSizeGroup *group )
 {
   g_object_set( G_OBJECT(self), "size_group", group, NULL );
 }
@@ -777,9 +776,8 @@ void hildon_caption_set_sizegroup( const HildonCaption *self,
  *
  * @Returns : a #GtkSizeGroup
  * 
- * Deprecated: Use g_object_get, property :size-group
  */
-GtkSizeGroup *hildon_caption_get_sizegroup( const HildonCaption *self )
+GtkSizeGroup *hildon_caption_get_size_group( const HildonCaption *self )
 {
   HildonCaptionPrivate *priv;
   g_return_val_if_fail( HILDON_IS_CAPTION (self), NULL );
@@ -1025,23 +1023,6 @@ gchar *hildon_caption_get_separator( const HildonCaption *caption )
   return priv->separator;
 }
 
-
-/**
- * hildon_caption_get_control:
- * @caption : a #HildonCaption
- *
- * Gets caption's control.
- * 
- * @Returns : a #GtkWidget
- *  
- * Deprecated: use gtk_bin_get_child instead
- */
-GtkWidget *hildon_caption_get_control( const HildonCaption *caption )
-{
-  g_return_val_if_fail( HILDON_IS_CAPTION(caption), NULL );
-  return GTK_BIN(caption)->child;
-}
-
 /*activates the child control
  *We have this signal so that if needed an application can 
  *know when we've been activated (useful for captions with
@@ -1106,37 +1087,6 @@ gboolean hildon_caption_get_child_expand( const HildonCaption *caption )
   return priv->expand;
 }
 
-/**
- * hildon_caption_set_control: 
- * @caption : a #HildonCaption
- * @control : the control to use. Control should not be NULL.
- *
- * Sets the control of the caption. 
- * The old control will be destroyed, unless the caller has added a
- * reference to it.
- * Function unparents the old control (if there is one) and adds the new
- * control.
- *
- * Deprecated: use gtk_container_add 
- */
-void hildon_caption_set_control( HildonCaption *caption, GtkWidget *control )
-{
-  GtkWidget *child = NULL;
-  g_return_if_fail( HILDON_IS_CAPTION(caption) );
-  child = GTK_BIN(caption)->child;
-
-  if( child )
-    gtk_container_remove( GTK_CONTAINER(caption), child );
-    
-  if( control )
-  {
-    gtk_container_add( GTK_CONTAINER(caption), control );
-    child = control;
-  }
-  else
-    child = NULL;
-}
-
 static void
 hildon_caption_set_label_text( HildonCaptionPrivate *priv )
 {
index e5bab3d..d36ab93 100644 (file)
@@ -100,12 +100,11 @@ GType hildon_caption_get_type (void) G_GNUC_CONST;
 GtkWidget *hildon_caption_new( GtkSizeGroup *group, const gchar *value,
                                GtkWidget *control, GtkWidget *icon,
                                HildonCaptionStatus flag );
-#ifndef HILDON_DISABLE_DEPRECATED
-GtkSizeGroup *hildon_caption_get_sizegroup( const HildonCaption *caption );
 
-void hildon_caption_set_sizegroup( const HildonCaption *caption,
-                                   GtkSizeGroup *new_group );
-#endif
+GtkSizeGroup *hildon_caption_get_size_group( const HildonCaption *caption );
+
+void hildon_caption_set_size_group( const HildonCaption *caption,
+                                    GtkSizeGroup *new_group );
 
 gboolean hildon_caption_is_mandatory( const HildonCaption *caption );
 
@@ -136,12 +135,6 @@ void hildon_caption_set_label_alignment(HildonCaption *caption,
                                         gfloat alignment);
 gfloat hildon_caption_get_label_alignment(HildonCaption *caption);
 
-#ifndef HILDON_DISABLE_DEPRECATED
-GtkWidget *hildon_caption_get_control( const HildonCaption *caption );
-
-void hildon_caption_set_control( HildonCaption *caption, GtkWidget *control );
-#endif
-
 void hildon_caption_set_child_expand( HildonCaption *caption, gboolean expand );
 gboolean hildon_caption_get_child_expand( const HildonCaption *caption );
 
index 368cc33..cca2bd1 100644 (file)
@@ -36,14 +36,6 @@ G_BEGIN_DECLS
  */
 #define HILDON_TYPE_DATE_EDITOR ( hildon_date_editor_get_type() )
 
-
-/**
- * HILDON_DATE_EDITOR_TYPE:
- *
- * Deprecated: use #HILDON_TYPE_DATE_EDITOR instead
- */
-#define HILDON_DATE_EDITOR_TYPE HILDON_TYPE_DATE_EDITOR
-
 #define HILDON_DATE_EDITOR(obj) (GTK_CHECK_CAST (obj,\
   HILDON_TYPE_DATE_EDITOR, HildonDateEditor))
 #define HILDON_DATE_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass),\
index 1ffa8c0..a3951aa 100644 (file)
@@ -1745,254 +1745,3 @@ hildon_font_selection_dialog_set_preview_text(HildonFontSelectionDialog *
    priv->preview_text = g_strdup(text);
    g_object_notify (G_OBJECT (fsd), "preview-text");
 }
-
-/**
- * hildon_font_selection_dialog_get_text_tag:
- * @fsd: the font selection dialog
- *
- * Get the #GtkTextTag for selections. This function
- * is deprecated. The best way to use
- * the text tags is to reuse them as much as possible.
- * The recommended way is to get the properties of the font
- * selection dialog on GTK_RESPONSE_OK, and according to
- * these properties use the tags that you have pre-created.
- * 
- * Returns: a #GtkTextTag having corresponding properties
- * set 
- */ 
-GtkTextTag * 
-hildon_font_selection_dialog_get_text_tag (HildonFontSelectionDialog *fsd)
-{
-  GtkTextTag *tag;
-  gint size, position;
-  gboolean family_set, size_set, color_set, bold, bold_set,
-           italic, italic_set, underline, underline_set,
-          strikethrough, strikethrough_set, position_set;
-  GdkColor *color = NULL;
-  gchar *family = NULL;
-
-  tag = gtk_text_tag_new(NULL);
-  
-  g_object_get(G_OBJECT(fsd),
-              "family", &family, "family-set", &family_set,
-              "size", &size, "size-set", &size_set,
-              "color", &color, "color-set", &color_set,
-              "bold", &bold, "bold-set", &bold_set,
-              "italic", &italic, "italic-set", &italic_set,
-              "underline", &underline, "underline-set", &underline_set,
-              "strikethrough", &strikethrough, "strikethrough-set", 
-              &strikethrough_set, "position", &position, 
-              "position-set", &position_set, NULL);
-  /*family*/
-  if(family_set)
-    g_object_set(G_OBJECT(tag), "family",
-                family, "family-set", TRUE, NULL);
-  else
-    g_object_set(G_OBJECT(tag), "family-set", FALSE, NULL);
-
-  g_free(family);
-  
-  /*size*/
-  if(size_set)
-    g_object_set(G_OBJECT(tag), "size", size * PANGO_SCALE, 
-                "size-set", TRUE, NULL);
-  else
-    g_object_set(G_OBJECT(tag), "size-set", FALSE, NULL);
-  
-  /*color*/
-  if(color_set)
-    g_object_set(G_OBJECT(tag), "foreground-gdk", color, 
-                "foreground-set", TRUE ,NULL);
-  else
-    g_object_set(G_OBJECT(tag), "foreground-set", FALSE, NULL);
-
-  if(color != NULL)
-    gdk_color_free(color);
-  
-  /*weight*/
-  if(bold_set)
-    {
-      if(bold)
-        g_object_set(G_OBJECT(tag), "weight", PANGO_WEIGHT_BOLD, NULL);
-      else
-        g_object_set(G_OBJECT(tag), "weight", PANGO_WEIGHT_NORMAL, NULL);
-       
-      g_object_set(G_OBJECT(tag), "weight-set", TRUE, NULL);
-    }
-  else
-    g_object_set(G_OBJECT(tag), "weight-set", FALSE, NULL);
-  
-  /*style*/
-  if(italic_set)
-    {
-      if(italic)
-        g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_ITALIC, NULL);
-      else
-        g_object_set(G_OBJECT(tag), "style", PANGO_STYLE_NORMAL, NULL);
-       
-      g_object_set(G_OBJECT(tag), "style-set", TRUE, NULL);
-    }
-  else
-    g_object_set(G_OBJECT(tag), "style-set", FALSE, NULL);
-  
-  /*underline*/
-  if(underline_set)
-    {
-      if(underline)
-        g_object_set(G_OBJECT(tag), "underline", PANGO_UNDERLINE_SINGLE, NULL);
-      else
-        g_object_set(G_OBJECT(tag), "underline", PANGO_UNDERLINE_NONE, NULL);
-       
-      g_object_set(G_OBJECT(tag), "underline-set", TRUE, NULL);
-    }
-  else
-    g_object_set(G_OBJECT(tag), "underline-set", FALSE, NULL);
-  
-  /*strikethrough*/
-  if(strikethrough_set)
-    {
-      if(strikethrough)
-        g_object_set(G_OBJECT(tag), "strikethrough", TRUE, NULL);
-      else
-        g_object_set(G_OBJECT(tag), "strikethrough", FALSE, NULL);
-       
-      g_object_set(G_OBJECT(tag), "strikethrough-set", TRUE, NULL);
-    }
-  else
-    g_object_set(G_OBJECT(tag), "strikethrough-set", FALSE, NULL);
-  
-  /*position*/
-  if(position_set)
-    {
-      switch(position)
-       {
-       case 1: /*super*/
-         g_object_set(G_OBJECT(tag), "rise", SUPERSCRIPT_RISE, NULL);
-         break;
-       case -1: /*sub*/
-         g_object_set(G_OBJECT(tag), "rise", SUBSCRIPT_LOW, NULL);
-         break;
-       case 0: /*normal*/
-         g_object_set(G_OBJECT(tag), "rise", 0, NULL);
-         break;
-       }
-      g_object_set(G_OBJECT(tag), "rise-set", TRUE, NULL);
-    }
-  else
-    g_object_set(G_OBJECT(tag), "rise-set", FALSE, NULL);
-  
-  return tag;
-}
-
-/** 
- * hildon_font_selection_dialog_set_buffer:
- * @fsd: the font selection dialog
- * @buffer: a #GtkTextBuffer containing the text to which the selections will 
- * be applied. Applying is responsibility of application.
- *
- * This is deprecated. GtkTextBuffer is not enough
- * to get the attributes of currently selected text. Please 
- * inspect the attributes yourself, and set the properties of
- * font selection dialog to reflect your inspection.
- */
-void 
-hildon_font_selection_dialog_set_buffer (HildonFontSelectionDialog *fsd,
-                                        GtkTextBuffer *buffer)
-{
-  GtkTextIter begin, end, iter;
-  HildonFontSelectionDialogSettings settings;
-
-  gtk_text_buffer_get_selection_bounds(buffer, &begin, &end);
-  
-  settings_init(&settings, fsd);
-  
-  iter = begin;
-
-  /* Keep original settings if the selection includes nothing */ 
-  if(gtk_text_iter_compare(&iter, &end) == 0)
-    {
-      GSList *slist;
-      
-      slist = gtk_text_iter_get_tags(&iter);
-      g_slist_foreach(slist, check_tags, (gpointer) &settings);
-      g_slist_free(slist);
-    }
-
-  /* Apply the user settings to the selected text */
-  while(gtk_text_iter_compare(&iter, &end) < 0)
-    {
-      GSList *slist;
-      
-      slist = gtk_text_iter_get_tags(&iter);
-      g_slist_foreach(slist, check_tags, (gpointer) &settings);
-      g_slist_free(slist);
-      
-      if(!gtk_text_iter_forward_cursor_position(&iter))
-       break;
-    }
-
-  settings_apply(&settings);
-  settings_destroy(&settings);
-}
-
-/**
- * hildon_font_selection_dialog_get_font:
- * @fsd: the font selection dialog
- *
- * This is deprecated. @PangoAttrList needs
- * starting index, and end index on construction.
- *
- * Returns: pointer to @PangoAttrList
- */
-PangoAttrList
-*hildon_font_selection_dialog_get_font(HildonFontSelectionDialog * fsd)
-{
-  HildonFontSelectionDialogPrivate *priv
-    = HILDON_FONT_SELECTION_DIALOG_GET_PRIVATE(fsd);
-  
-  g_return_val_if_fail(HILDON_IS_FONT_SELECTION_DIALOG(fsd), FALSE);
-  /*an approve of none working api, should have ask for start_index,
-   * and length in bytes of the string, currently using preview_text 
-   * length, KLUDGE!*/
-  
-  return hildon_font_selection_dialog_create_attrlist(fsd, 
-                               0, strlen(priv->preview_text));
-}
-
-/**
- * hildon_font_selection_dialog_set_font:
- * @fsd: the font selection dialog
- * @list: the pango attribute list
- *
- * This is a deprecated.
- * 
- * Sets the font to the dialog.
- */
-void 
-hildon_font_selection_dialog_set_font(HildonFontSelectionDialog * fsd,
-                                     PangoAttrList * list)
-{
-  PangoAttrIterator *iter;
-  HildonFontSelectionDialogSettings settings;
-
-  iter = pango_attr_list_get_iterator(list);
-  
-  settings_init(&settings, fsd);
-  
-  while(iter != NULL)
-    {
-      GSList *slist;
-      
-      slist = pango_attr_iterator_get_attrs(iter);
-      g_slist_foreach(slist, check_attrs, (gpointer) &settings);
-      g_slist_free(slist);
-      
-      if(!pango_attr_iterator_next(iter))
-       break;
-    }
-
-  pango_attr_iterator_destroy(iter);
-
-  settings_apply(&settings);
-  settings_destroy(&settings);
-}
index da8134b..da6ae0c 100644 (file)
@@ -68,28 +68,11 @@ struct _HildonFontSelectionDialogClass
     void (*_gtk_reserved4) (void);
 };
 
-#ifndef HILDON_DISABLE_DEPRECATED
-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;
 
 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);
-#endif
-
-       
 gchar*  hildon_font_selection_dialog_get_preview_text  (HildonFontSelectionDialog *fsd);
 
 void    hildon_font_selection_dialog_set_preview_text  (HildonFontSelectionDialog *fsd, 
index 45bd412..60b782d 100644 (file)
@@ -483,26 +483,6 @@ void hildon_get_password_dialog_set_domain(HildonGetPasswordDialog *dialog,
 }
 
 /**
- * hildon_get_password_dialog_set_title:
- * @dialog: the dialog
- * @new_title: the text to be set as the dialog title
- * 
- * Sets the dialog title.
- *
- * DEPRECATED! use gtk_window_set_title instead.
- */
-void hildon_get_password_dialog_set_title(HildonGetPasswordDialog *dialog,
-                                         const gchar *new_title)
-
-{
-  /* FIXME: This method is completely useless, should be deprecated/removed */
-  g_return_if_fail (HILDON_IS_GET_PASSWORD_DIALOG(dialog));
-  g_return_if_fail (new_title !=NULL);
-  gtk_window_set_title(GTK_WINDOW(dialog), 
-                      new_title);
-}
-
-/**
  * hildon_get_password_dialog_set_caption:
  * @dialog: the dialog
  * @new_caption: the text to be set as the caption label
index bca82da..5cf005b 100644 (file)
@@ -89,11 +89,5 @@ void       hildon_get_password_dialog_set_max_characters(HildonGetPasswordDialog
 
 const gchar * hildon_get_password_dialog_get_password(HildonGetPasswordDialog * dialog);
 
-
-#ifndef HILDON_DISABLE_DEPRECATED
-void       hildon_get_password_dialog_set_title        (HildonGetPasswordDialog *dialog,
-                                                       const gchar             *new_title);
-#endif /* HILDON_DISABLE_DEPRECATED */
-
 G_END_DECLS
 #endif /* __HILDON_GET_PASSWORD_DIALOG_H__ */
index d25006b..aec578a 100644 (file)
@@ -539,42 +539,6 @@ GtkWidget *hildon_note_new_confirmation(GtkWindow * parent,
         (parent, description, HILDON_NOTE_CONFIRMATION_ICON);
 }
 
-
-/**
- * hildon_note_new_confirmation_with_icon_stock:
- * @parent: the parent window. The X window ID of the parent window
- *   has to be the same as the X window ID of the application. This is
- *   important so that the window manager could handle the windows
- *   correctly. In GTK the X window ID can be checked using
- *   GDK_WINDOW_XID(GTK_WIDGET(parent)->window).
- * @description: the message to confirm
- * @stock_id: icon to be displayed. If NULL, default icon is used.
- * 
- * Create a new confirmation note. Confirmation note has text (description) 
- * that you specify, two buttons and an icon.
- *
- * Deprecated: this function is broken, and really should not be used by anyone!
- *
- * Returns: a #GtkWidget pointer of the note
- */
-GtkWidget *hildon_note_new_confirmation_with_icon_stock(GtkWindow * parent,
-                                                        const gchar *
-                                                        description,
-                                                        const gchar *
-                                                        stock_id)
-{
-    GtkWidget *dialog = g_object_new(HILDON_TYPE_NOTE,
-                                     "note_type",
-                                     HILDON_NOTE_CONFIRMATION_TYPE,
-                                     "description", description, "stock-icon",
-                                     stock_id, NULL);
-
-    if (parent != NULL)
-        gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
-
-    return dialog;
-}
-
 /**
  * hildon_note_new_confirmation_with_icon_name:
  * @parent: the parent window. The X window ID of the parent window
@@ -633,46 +597,6 @@ GtkWidget *hildon_note_new_information(GtkWindow * parent,
 }
 
 /**
- * hildon_note_new_information_with_icon_stock:
- * @parent: the parent window. The X window ID of the parent window
- *   has to be the same as the X window ID of the application. This is
- *   important so that the window manager could handle the windows
- *   correctly. In GTK the X window ID can be checked using
- *   GDK_WINDOW_XID(GTK_WIDGET(parent)->window).
- * @description: the message to confirm
- * @stock_id: icon to be displayed. If NULL, default icon is used.
- * 
- * Create a new information note. Information note has text(description) 
- * that you specify, an OK button and a default stock note icon.
- * 
- * Note! This function is broken and deprecated and should not be
- *       used by anybody. Since the platform doesn't use stock icons, 
- *       use #hildon_note_new_information_with_icon_name instead.
- *
- * Returns: a #GtkWidget pointer of the note
- */
-GtkWidget *hildon_note_new_information_with_icon_stock(GtkWindow * parent,
-                                                       const gchar *
-                                                       description,
-                                                       const gchar *
-                                                       stock_id)
-{
-    GtkWidget *dialog = NULL;
-
-    g_return_val_if_fail(parent == NULL || GTK_IS_WINDOW(parent), NULL);
-
-    dialog = g_object_new(HILDON_TYPE_NOTE,
-                                     "note_type",
-                                     HILDON_NOTE_INFORMATION_TYPE,
-                                     "description", description,
-                                     "icon", stock_id, NULL);
-    if (parent != NULL)
-        gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
-
-    return dialog;
-}
-
-/**
  * hildon_note_new_information_with_icon_name:
  * @parent: the parent window. The X window ID of the parent window
  *   has to be the same as the X window ID of the application. This is
@@ -709,31 +633,6 @@ GtkWidget *hildon_note_new_information_with_icon_name(GtkWindow * parent,
 }
 
 /**
- * hildon_note_new_information_with_icon_theme:
- * @parent: the parent window. The X window ID of the parent window
- *   has to be the same as the X window ID of the application. This is
- *   important so that the window manager could handle the windows
- *   correctly. In GTK the X window ID can be checked using
- *   GDK_WINDOW_XID(GTK_WIDGET(parent)->window).
- * @description: the message to confirm
- * @icon: #GtkIconTheme icon to be displayed
- * 
- * This function is deprecated. Use 
- * #hildon_note_new_information_with_icon_name instead.
- *
- * Create a new information note. Information note has text(description) 
- * that you specify, an OK button and an icon.
- *
- * Returns: a #GtkWidget pointer of the note. 
- */
-GtkWidget *hildon_note_new_information_with_icon_theme(GtkWindow *parent,
-                                                       const gchar *description,
-                                                       const gchar *icon)
-{
-    return hildon_note_new_information_with_icon_name(parent, description, icon);
-}
-
-/**
  * hildon_note_new_cancel_with_progress_bar:
  * @parent: the parent window. The X window ID of the parent window
  *   has to be the same as the X window ID of the application. This is
index f7c8b20..9e89659 100644 (file)
@@ -63,13 +63,6 @@ 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 *
@@ -77,7 +70,6 @@ GtkWidget *hildon_note_new_confirmation_with_icon_name(GtkWindow * parent,
                                                         const gchar *
                                                         icon_name);
 
-
 GtkWidget *hildon_note_new_cancel_with_progress_bar(GtkWindow * parent,
                                                     const gchar *
                                                     description,
@@ -92,19 +84,6 @@ 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,
-                                                       const gchar *
-                                                       stock_id);
-                                                       
-GtkWidget *hildon_note_new_information_with_icon_theme(GtkWindow * parent,
-                                                       const gchar *
-                                                       description,
-                                                       const gchar *
-                                                       icon);
-#endif /* HILDON_DISABLE_DEPRECATED */
                                                        
 void hildon_note_set_button_text(HildonNote * note, const gchar * text);
 
index 1b021f2..65f8188 100644 (file)
@@ -39,11 +39,6 @@ typedef struct _HildonProgramClass HildonProgramClass;
 #define HILDON_IS_PROGRAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, \
             HILDON_TYPE_PROGRAM))
 
-/* deprecated */
-#define hildon_program_new hildon_program_get_instance
-
-
-
 struct _HildonProgram
 {
     GObject parent;
index dbbf424..0b0a153 100644 (file)
@@ -36,13 +36,6 @@ G_BEGIN_DECLS
  */
 #define HILDON_TYPE_RANGE_EDITOR (hildon_range_editor_get_type())
 
-/**
- * HILDON_RANGE_EDITOR_TYPE
- *
- * Deprecated: use #HILDON_TYPE_RANGE_EDITOR instead
- */
-#define HILDON_RANGE_EDITOR_TYPE HILDON_TYPE_RANGE_EDITOR
-
 #define HILDON_RANGE_EDITOR(obj) \
         (GTK_CHECK_CAST (obj, HILDON_TYPE_RANGE_EDITOR, HildonRangeEditor))
 #define HILDON_RANGE_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass),\
index 0ac3492..38c5085 100644 (file)
@@ -1860,37 +1860,6 @@ gboolean hildon_time_editor_get_show_hours(HildonTimeEditor *editor)
     return priv->show_hours;
 }
 
-/***
- * Deprecated functions
- */
-
-/**
- * hildon_time_editor_show_seconds:
- * @editor: the #HildonTimeEditor
- * @enable: enable or disable showing of seconds
- *
- * This function is deprecated, 
- * use #hildon_time_editor_set_show_seconds instead.
- */
-void hildon_time_editor_show_seconds(HildonTimeEditor * editor,
-                                     gboolean enable)
-{
-    hildon_time_editor_set_show_seconds (editor, enable);
-}
-/**
- * hildon_time_editor_enable_duration_mode:
- * @editor: the #HildonTimeEditor
- * @enable: enable or disable duration editor mode
- *
- * This function is deprecated, 
- * use #hildon_time_editor_set_duration_mode instead.
- */
-void hildon_time_editor_enable_duration_mode(HildonTimeEditor * editor,
-                                             gboolean enable)
-{
-    hildon_time_editor_set_duration_mode (editor, enable);
-}
-
 /* Idle callback */
 static gboolean
 _hildon_time_editor_entry_select_all (GtkWidget *widget)
index e39ff67..fbcdf29 100644 (file)
@@ -84,12 +84,6 @@ void       hildon_time_editor_get_time           (HildonTimeEditor * editor,
                                                   guint            * minutes,
                                                   guint            * seconds);
 
-#ifndef HILDON_DISABLE_DEPRECATED
-void       hildon_time_editor_show_seconds         (HildonTimeEditor * editor, gboolean enable);
-void       hildon_time_editor_enable_duration_mode (HildonTimeEditor * editor, gboolean enable);
-#endif /* HILDON_DISABLE_DEPRECATED */
-
-
 void       hildon_time_editor_set_duration_range (HildonTimeEditor * editor,
                                                   guint              min_seconds,
                                                   guint              max_seconds);
@@ -116,6 +110,5 @@ guint      hildon_time_editor_get_duration_min   (HildonTimeEditor * editor);
 void       hildon_time_editor_set_duration_max   (HildonTimeEditor * editor, guint    duration_max);
 guint      hildon_time_editor_get_duration_max   (HildonTimeEditor * editor);
 
-
 G_END_DECLS
 #endif /* __HILDON_TIME_EDITOR_H__ */
index 545ff9d..d5675ea 100644 (file)
@@ -37,14 +37,6 @@ G_BEGIN_DECLS
  */
 #define HILDON_TYPE_VOLUMEBAR_RANGE ( hildon_volumebar_range_get_type() )
 
-/**
- * HILDON_VOLUMEBAR_RANGE_TYPE
- *
- * Deprecated: use #HILDON_VOLUMEBAR_RANGE_TYPE instead
- */
-#define HILDON_VOLUMEBAR_RANGE_TYPE HILDON_TYPE_VOLUMEBAR_RANGE
-
-
 #define HILDON_VOLUMEBAR_RANGE(obj) (GTK_CHECK_CAST (obj,\
         HILDON_TYPE_VOLUMEBAR_RANGE, HildonVolumebarRange))
 #define HILDON_VOLUMEBAR_RANGE_CLASS(klass) \
index feb0db6..9709d23 100644 (file)
@@ -36,13 +36,6 @@ G_BEGIN_DECLS
  */
 #define HILDON_TYPE_WEEKDAY_PICKER ( hildon_weekday_picker_get_type() )
 
-/**
- * HILDON_WEEKDAY_PICKER_TYPE:
- *
- * Deprecated: use #HILDON_TYPE_WEEKDAY_PICKER instead.
- */
-#define HILDON_WEEKDAY_PICKER_TYPE HILDON_TYPE_WEEKDAY_PICKER
-
 #define HILDON_WEEKDAY_PICKER(obj) \
         (GTK_CHECK_CAST (obj, HILDON_TYPE_WEEKDAY_PICKER, \
          HildonWeekdayPicker))
index 38de909..52863cb 100644 (file)
@@ -54,12 +54,12 @@ typedef struct _HildonWizardDialogClass HildonWizardDialogClass;
 typedef struct _HildonWizardDialogPrivate HildonWizardDialogPrivate;
 
 /* button response IDs */
-enum {
+typedef enum {
     HILDON_WIZARD_DIALOG_CANCEL = GTK_RESPONSE_CANCEL,
     HILDON_WIZARD_DIALOG_PREVIOUS = 0,
     HILDON_WIZARD_DIALOG_NEXT,
     HILDON_WIZARD_DIALOG_FINISH
-};
+} HildonWizardDialogResponse;
 
 struct _HildonWizardDialog {
     GtkDialog                   parent;