Document the xalign property and its getter and setter as 2.4 additions.

Mon Aug  2 00:12:16 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkentry.c (gtk_entry_class_init):
	(gtk_entry_get_alignment):
	(gtk_entry_set_alignment): Document the xalign property
	and its getter and setter as 2.4 additions.  (#148978,
	Axel Simon)

Mon Aug  2 00:11:31 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkuimanager.c (gtk_ui_manager_class_init):
	* gtk/gtkactiongroup.c (gtk_action_group_class_init): Use
	canonical signal names in doc comments, since gtk-doc won't
	pick up signal docs with underscores.

diff --git a/ChangeLog b/ChangeLog
index 81362972095a826509171651851cb6d6a7f738f3..2b211eda9446b6c55eb8dd98ff50b592fecac852 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Mon Aug  2 00:12:16 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkentry.c (gtk_entry_class_init):
+       (gtk_entry_get_alignment): 
+       (gtk_entry_set_alignment): Document the xalign property
+       and its getter and setter as 2.4 additions.  (#148978,
+       Axel Simon)
+
+Mon Aug  2 00:11:31 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_class_init): 
+       * gtk/gtkactiongroup.c (gtk_action_group_class_init): Use
+       canonical signal names in doc comments, since gtk-doc won't
+       pick up signal docs with underscores.  
+
 2004-08-01  Matthias Clasen  <mclasen@redhat.com>
        
        * configure.in: Post-release version bump

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 81362972095a826509171651851cb6d6a7f738f3..2b211eda9446b6c55eb8dd98ff50b592fecac852 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,18 @@
+Mon Aug  2 00:12:16 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkentry.c (gtk_entry_class_init):
+       (gtk_entry_get_alignment): 
+       (gtk_entry_set_alignment): Document the xalign property
+       and its getter and setter as 2.4 additions.  (#148978,
+       Axel Simon)
+
+Mon Aug  2 00:11:31 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_class_init): 
+       * gtk/gtkactiongroup.c (gtk_action_group_class_init): Use
+       canonical signal names in doc comments, since gtk-doc won't
+       pick up signal docs with underscores.  
+
 2004-08-01  Matthias Clasen  <mclasen@redhat.com>
        
        * configure.in: Post-release version bump

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 81362972095a826509171651851cb6d6a7f738f3..2b211eda9446b6c55eb8dd98ff50b592fecac852 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,18 @@
+Mon Aug  2 00:12:16 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkentry.c (gtk_entry_class_init):
+       (gtk_entry_get_alignment): 
+       (gtk_entry_set_alignment): Document the xalign property
+       and its getter and setter as 2.4 additions.  (#148978,
+       Axel Simon)
+
+Mon Aug  2 00:11:31 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_class_init): 
+       * gtk/gtkactiongroup.c (gtk_action_group_class_init): Use
+       canonical signal names in doc comments, since gtk-doc won't
+       pick up signal docs with underscores.  
+
 2004-08-01  Matthias Clasen  <mclasen@redhat.com>
        
        * configure.in: Post-release version bump

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 81362972095a826509171651851cb6d6a7f738f3..2b211eda9446b6c55eb8dd98ff50b592fecac852 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,18 @@
+Mon Aug  2 00:12:16 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkentry.c (gtk_entry_class_init):
+       (gtk_entry_get_alignment): 
+       (gtk_entry_set_alignment): Document the xalign property
+       and its getter and setter as 2.4 additions.  (#148978,
+       Axel Simon)
+
+Mon Aug  2 00:11:31 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_class_init): 
+       * gtk/gtkactiongroup.c (gtk_action_group_class_init): Use
+       canonical signal names in doc comments, since gtk-doc won't
+       pick up signal docs with underscores.  
+
 2004-08-01  Matthias Clasen  <mclasen@redhat.com>
        
        * configure.in: Post-release version bump

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index de0d40fec49e5284fcf1785b40bfd6c50c1d65d3..e4f456beafd9cec66aa41eae35f2be2143f4c449 100644 (file)
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -202,7 +202,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass)
                  GTK_TYPE_ACTION, GTK_TYPE_WIDGET);
 
   /**
-   * GtkActionGroup::pre_activate:
+   * GtkActionGroup::pre-activate:
    * @action_group: the group
    * @action: the action
    *
@@ -223,7 +223,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass)
                  GTK_TYPE_ACTION);
 
   /**
-   * GtkActionGroup::post_activate:
+   * GtkActionGroup::post-activate:
    * @action_group: the group
    * @action: the action
    *

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 8351a74c826392a77efdc6e5ed6f59fc78df0b9a..60f5cd66d2e597d12623dc905c6d3f37d08ebef2 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -571,6 +571,14 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                        "",
                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
 
+  /**
+   * GtkEntry:xalign:
+   *
+   * The horizontal alignment, from 0 (left) to 1 (right). 
+   * Reversed for RTL layouts.
+   * 
+   * Since: 2.4
+   */
   g_object_class_install_property (gobject_class,
                                    PROP_XALIGN,
                                    g_param_spec_float ("xalign",
@@ -4158,6 +4166,8 @@ gtk_entry_get_layout_offsets (GtkEntry *entry,
  * Sets the alignment for the contents of the entry. This controls
  * the horizontal positioning of the contents when the displayed
  * text is shorter than the width of the entry.
+ *
+ * Since: 2.4
  **/
 void
 gtk_entry_set_alignment (GtkEntry *entry, gfloat xalign)
@@ -4190,6 +4200,8 @@ gtk_entry_set_alignment (GtkEntry *entry, gfloat xalign)
  * Gets the value set by gtk_entry_set_alignment().
  * 
  * Return value: the alignment
+ *
+ * Since: 2.4
  **/
 gfloat
 gtk_entry_get_alignment (GtkEntry *entry)

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 5fbf7b707c923ca268c69748f692a886bf14fe33..9b07ab524c72671eeca32d1da18786e977bb9abe 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -271,7 +271,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
                  G_TYPE_NONE, 0);
   
   /**
-   * GtkUIManager::connect_proxy:
+   * GtkUIManager::connect-proxy:
    * @uimanager: the ui manager
    * @action: the action
    * @proxy: the proxy
@@ -297,7 +297,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
                  GTK_TYPE_WIDGET);
 
   /**
-   * GtkUIManager::disconnect_proxy:
+   * GtkUIManager::disconnect-proxy:
    * @uimanager: the ui manager
    * @action: the action
    * @proxy: the proxy
@@ -319,7 +319,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
                  GTK_TYPE_WIDGET);
 
   /**
-   * GtkUIManager::pre_activate:
+   * GtkUIManager::pre-activate:
    * @uimanager: the ui manager
    * @action: the action
    *
@@ -342,7 +342,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
                  GTK_TYPE_ACTION);
 
   /**
-   * GtkUIManager::post_activate:
+   * GtkUIManager::post-activate:
    * @uimanager: the ui manager
    * @action: the action
    *