Fix the doc formatting.

2004-10-25  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkdialog.c (gtk_dialog_set_alternative_button_order): Fix the
	doc formatting.

	* gtk/gtkcellview.[hc]: Make function parameter names consistent.

diff --git a/ChangeLog b/ChangeLog
index 364dcd406d779f45e3dd9240c0d39aab753f7b5a..f078f573f3809628a90f1a15d7c49c6362c66319 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-10-25  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkdialog.c (gtk_dialog_set_alternative_button_order): Fix the 
+       doc formatting.
+
+       * gtk/gtkcellview.[hc]: Make function parameter names consistent.
+
        * tests/Makefile.am (noinst_PROGRAMS): Add testimage.
 
        * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name().

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 364dcd406d779f45e3dd9240c0d39aab753f7b5a..f078f573f3809628a90f1a15d7c49c6362c66319 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2004-10-25  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkdialog.c (gtk_dialog_set_alternative_button_order): Fix the 
+       doc formatting.
+
+       * gtk/gtkcellview.[hc]: Make function parameter names consistent.
+
        * tests/Makefile.am (noinst_PROGRAMS): Add testimage.
 
        * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name().

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 364dcd406d779f45e3dd9240c0d39aab753f7b5a..f078f573f3809628a90f1a15d7c49c6362c66319 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2004-10-25  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkdialog.c (gtk_dialog_set_alternative_button_order): Fix the 
+       doc formatting.
+
+       * gtk/gtkcellview.[hc]: Make function parameter names consistent.
+
        * tests/Makefile.am (noinst_PROGRAMS): Add testimage.
 
        * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name().

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 364dcd406d779f45e3dd9240c0d39aab753f7b5a..f078f573f3809628a90f1a15d7c49c6362c66319 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2004-10-25  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkdialog.c (gtk_dialog_set_alternative_button_order): Fix the 
+       doc formatting.
+
+       * gtk/gtkcellview.[hc]: Make function parameter names consistent.
+
        * tests/Makefile.am (noinst_PROGRAMS): Add testimage.
 
        * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name().

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 5b462ec820e01f6574e872c071e4e5ac45c1fe3d..ed3450df9b854747da436f01c3302699a35f8465 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -535,22 +535,22 @@ gtk_cell_view_get_cell_info (GtkCellView     *cellview,
 }
 
 void
-gtk_cell_view_set_cell_data (GtkCellView *cellview)
+gtk_cell_view_set_cell_data (GtkCellView *cell_view)
 {
   GList *i;
   GtkTreeIter iter;
   GtkTreePath *path;
 
-  g_return_if_fail (cellview->priv->displayed_row != NULL);
+  g_return_if_fail (cell_view->priv->displayed_row != NULL);
 
-  path = gtk_tree_row_reference_get_path (cellview->priv->displayed_row);
+  path = gtk_tree_row_reference_get_path (cell_view->priv->displayed_row);
   if (!path)
     return;
 
-  gtk_tree_model_get_iter (cellview->priv->model, &iter, path);
+  gtk_tree_model_get_iter (cell_view->priv->model, &iter, path);
   gtk_tree_path_free (path);
 
-  for (i = cellview->priv->cell_list; i; i = i->next)
+  for (i = cell_view->priv->cell_list; i; i = i->next)
     {
       GSList *j;
       GtkCellViewCellInfo *info = i->data;
@@ -563,7 +563,7 @@ gtk_cell_view_set_cell_data (GtkCellView *cellview)
           gint column = GPOINTER_TO_INT (j->next->data);
           GValue value = {0, };
 
-          gtk_tree_model_get_value (cellview->priv->model, &iter,
+          gtk_tree_model_get_value (cell_view->priv->model, &iter,
                                     column, &value);
           g_object_set_property (G_OBJECT (info->cell),
                                  property, &value);
@@ -571,9 +571,9 @@ gtk_cell_view_set_cell_data (GtkCellView *cellview)
         }
 
       if (info->func)
-       (* info->func) (GTK_CELL_LAYOUT (cellview),
+       (* info->func) (GTK_CELL_LAYOUT (cell_view),
                        info->cell,
-                       cellview->priv->model,
+                       cell_view->priv->model,
                        &iter,
                        info->func_data);
 
@@ -1064,7 +1064,7 @@ gtk_cell_view_get_size_of_row (GtkCellView    *cell_view,
 
 /**
  * gtk_cell_view_set_background_color:
- * @view: a #GtkCellView
+ * @cell_view: a #GtkCellView
  * @color: the new background color
  *
  * Sets the background color of @view.
@@ -1072,27 +1072,27 @@ gtk_cell_view_get_size_of_row (GtkCellView    *cell_view,
  * Since: 2.6
  */
 void
-gtk_cell_view_set_background_color (GtkCellView    *view,
+gtk_cell_view_set_background_color (GtkCellView    *cell_view,
                                     const GdkColor *color)
 {
-  g_return_if_fail (GTK_IS_CELL_VIEW (view));
+  g_return_if_fail (GTK_IS_CELL_VIEW (cell_view));
 
   if (color)
     {
-      if (!view->priv->background_set)
+      if (!cell_view->priv->background_set)
         {
-          view->priv->background_set = TRUE;
-          g_object_notify (G_OBJECT (view), "background_set");
+          cell_view->priv->background_set = TRUE;
+          g_object_notify (G_OBJECT (cell_view), "background_set");
         }
 
-      view->priv->background = *color;
+      cell_view->priv->background = *color;
     }
   else
     {
-      if (view->priv->background_set)
+      if (cell_view->priv->background_set)
         {
-          view->priv->background_set = FALSE;
-          g_object_notify (G_OBJECT (view), "background_set");
+          cell_view->priv->background_set = FALSE;
+          g_object_notify (G_OBJECT (cell_view), "background_set");
         }
     }
 }

diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index 844d505f8093b7e87d37724a97520d81955e71c3..890f95e0616d57d94f2aa42075b57e0c90493a52 100644 (file)
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -76,8 +76,8 @@ gboolean          gtk_cell_view_get_size_of_row         (GtkCellView     *cell_v
 
 void              gtk_cell_view_set_background_color    (GtkCellView     *cell_view,
                                                          const GdkColor  *color);
-void              gtk_cell_view_set_cell_data           (GtkCellView     *cellview);
-GList            *gtk_cell_view_get_cell_renderers      (GtkCellView     *cellview);
+void              gtk_cell_view_set_cell_data           (GtkCellView     *cell_view);
+GList            *gtk_cell_view_get_cell_renderers      (GtkCellView     *cell_view);
 
 G_END_DECLS
 

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index a2d6ef014c949ebe4199411639d83d6857d85a84..efc00a1e908414b5aca4b7da3257ebb5a06d355f 100644 (file)
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -1144,17 +1144,17 @@ gtk_dialog_set_alternative_button_order_valist (GtkDialog *dialog,
  * cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
  *                                        GTK_STOCK_CANCEL,
  *                                        GTK_RESPONSE_CANCEL);
- * 
+ *  
  * ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
  *                                    GTK_STOCK_OK,
  *                                    GTK_RESPONSE_OK);
- *                                                   
+ *   
  * gtk_widget_grab_default (ok_button);
- * 
+ *   
  * help_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
  *                                      GTK_STOCK_HELP,
  *                                      GTK_RESPONSE_HELP);
- *
+ *  
  * gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
  *                                          GTK_RESPONSE_OK,
  *                                          GTK_RESPONSE_CANCEL,