summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLog.pre-2-1010
-rw-r--r--ChangeLog.pre-2-610
-rw-r--r--ChangeLog.pre-2-810
-rw-r--r--gtk/gtkalignment.c32
-rw-r--r--gtk/gtkexpander.c8
-rw-r--r--gtk/gtkliststore.h2
-rw-r--r--gtk/gtkpaned.c4
-rw-r--r--gtk/gtktexttag.c16
9 files changed, 71 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 41b5f6a409..0114e28908 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Aug 22 16:55:15 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtkexpander.c
+ * gtk/gtkalignment.c:
+ * gtk/gtktexttag.c
+ Make enums match property names. Found by a script by Tommi
+ Komulainen.
+
+ * gtk/gtkpaned.c (gtk_paned_class_init): fix min/max mixup.
+
Sun Aug 22 16:09:49 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkliststore.h (struct _GtkListStore):
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 41b5f6a409..0114e28908 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Sun Aug 22 16:55:15 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtkexpander.c
+ * gtk/gtkalignment.c:
+ * gtk/gtktexttag.c
+ Make enums match property names. Found by a script by Tommi
+ Komulainen.
+
+ * gtk/gtkpaned.c (gtk_paned_class_init): fix min/max mixup.
+
Sun Aug 22 16:09:49 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkliststore.h (struct _GtkListStore):
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 41b5f6a409..0114e28908 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Sun Aug 22 16:55:15 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtkexpander.c
+ * gtk/gtkalignment.c:
+ * gtk/gtktexttag.c
+ Make enums match property names. Found by a script by Tommi
+ Komulainen.
+
+ * gtk/gtkpaned.c (gtk_paned_class_init): fix min/max mixup.
+
Sun Aug 22 16:09:49 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkliststore.h (struct _GtkListStore):
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 41b5f6a409..0114e28908 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Sun Aug 22 16:55:15 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtkexpander.c
+ * gtk/gtkalignment.c:
+ * gtk/gtktexttag.c
+ Make enums match property names. Found by a script by Tommi
+ Komulainen.
+
+ * gtk/gtkpaned.c (gtk_paned_class_init): fix min/max mixup.
+
Sun Aug 22 16:09:49 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkliststore.h (struct _GtkListStore):
diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c
index af00335e0e..c79cba6722 100644
--- a/gtk/gtkalignment.c
+++ b/gtk/gtkalignment.c
@@ -37,10 +37,10 @@ enum {
PROP_XSCALE,
PROP_YSCALE,
- PROP_PADDING_TOP,
- PROP_PADDING_BOTTOM,
- PROP_PADDING_LEFT,
- PROP_PADDING_RIGHT,
+ PROP_TOP_PADDING,
+ PROP_BOTTOM_PADDING,
+ PROP_LEFT_PADDING,
+ PROP_RIGHT_PADDING,
PROP_LAST
};
@@ -159,7 +159,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
* Since: 2.4
*/
g_object_class_install_property (gobject_class,
- PROP_PADDING_TOP,
+ PROP_TOP_PADDING,
g_param_spec_uint("top_padding",
P_("Top Padding"),
P_("The padding to insert at the top of the widget."),
@@ -176,7 +176,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
* Since: 2.4
*/
g_object_class_install_property (gobject_class,
- PROP_PADDING_BOTTOM,
+ PROP_BOTTOM_PADDING,
g_param_spec_uint("bottom_padding",
P_("Bottom Padding"),
P_("The padding to insert at the bottom of the widget."),
@@ -193,7 +193,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
* Since: 2.4
*/
g_object_class_install_property (gobject_class,
- PROP_PADDING_LEFT,
+ PROP_LEFT_PADDING,
g_param_spec_uint("left_padding",
P_("Left Padding"),
P_("The padding to insert at the left of the widget."),
@@ -210,7 +210,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
* Since: 2.4
*/
g_object_class_install_property (gobject_class,
- PROP_PADDING_RIGHT,
+ PROP_RIGHT_PADDING,
g_param_spec_uint("right_padding",
P_("Right Padding"),
P_("The padding to insert at the right of the widget."),
@@ -305,28 +305,28 @@ gtk_alignment_set_property (GObject *object,
break;
/* Padding: */
- case PROP_PADDING_TOP:
+ case PROP_TOP_PADDING:
gtk_alignment_set_padding (alignment,
g_value_get_uint (value),
priv->padding_bottom,
priv->padding_left,
priv->padding_right);
break;
- case PROP_PADDING_BOTTOM:
+ case PROP_BOTTOM_PADDING:
gtk_alignment_set_padding (alignment,
priv->padding_top,
g_value_get_uint (value),
priv->padding_left,
priv->padding_right);
break;
- case PROP_PADDING_LEFT:
+ case PROP_LEFT_PADDING:
gtk_alignment_set_padding (alignment,
priv->padding_top,
priv->padding_bottom,
g_value_get_uint (value),
priv->padding_right);
break;
- case PROP_PADDING_RIGHT:
+ case PROP_RIGHT_PADDING:
gtk_alignment_set_padding (alignment,
priv->padding_top,
priv->padding_bottom,
@@ -368,16 +368,16 @@ gtk_alignment_get_property (GObject *object,
break;
/* Padding: */
- case PROP_PADDING_TOP:
+ case PROP_TOP_PADDING:
g_value_set_uint (value, priv->padding_top);
break;
- case PROP_PADDING_BOTTOM:
+ case PROP_BOTTOM_PADDING:
g_value_set_uint (value, priv->padding_bottom);
break;
- case PROP_PADDING_LEFT:
+ case PROP_LEFT_PADDING:
g_value_set_uint (value, priv->padding_left);
break;
- case PROP_PADDING_RIGHT:
+ case PROP_RIGHT_PADDING:
g_value_set_uint (value, priv->padding_right);
break;
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index d7dd352b6a..5cda320990 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -46,7 +46,7 @@ enum
PROP_LABEL,
PROP_USE_UNDERLINE,
PROP_USE_MARKUP,
- PROP_PADDING,
+ PROP_SPACING,
PROP_LABEL_WIDGET
};
@@ -225,7 +225,7 @@ gtk_expander_class_init (GtkExpanderClass *klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (gobject_class,
- PROP_PADDING,
+ PROP_SPACING,
g_param_spec_int ("spacing",
P_("Spacing"),
P_("Space to put between the label and the child"),
@@ -316,7 +316,7 @@ gtk_expander_set_property (GObject *object,
case PROP_USE_MARKUP:
gtk_expander_set_use_markup (expander, g_value_get_boolean (value));
break;
- case PROP_PADDING:
+ case PROP_SPACING:
gtk_expander_set_spacing (expander, g_value_get_int (value));
break;
case PROP_LABEL_WIDGET:
@@ -351,7 +351,7 @@ gtk_expander_get_property (GObject *object,
case PROP_USE_MARKUP:
g_value_set_boolean (value, priv->use_markup);
break;
- case PROP_PADDING:
+ case PROP_SPACING:
g_value_set_int (value, priv->spacing);
break;
case PROP_LABEL_WIDGET:
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index cd0993c163..b61fc1c48a 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -50,7 +50,7 @@ struct _GtkListStore
gint sort_column_id;
GtkSortType order;
GType *column_headers;
- gint _gtk_reserved2;
+ gint length;
GtkTreeIterCompareFunc default_sort_func;
gpointer default_sort_data;
GtkDestroyNotify default_sort_destroy;
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 3184d8ee19..c484205f62 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -268,7 +268,7 @@ gtk_paned_class_init (GtkPanedClass *class)
* Since: 2.4
*/
g_object_class_install_property (object_class,
- PROP_MAX_POSITION,
+ PROP_MIN_POSITION,
g_param_spec_int ("min_position",
P_("Minimal Position"),
P_("Smallest possible value for the \"position\" property"),
@@ -286,7 +286,7 @@ gtk_paned_class_init (GtkPanedClass *class)
* Since: 2.4
*/
g_object_class_install_property (object_class,
- PROP_MIN_POSITION,
+ PROP_MAX_POSITION,
g_param_spec_int ("max_position",
P_("Maximal Position"),
P_("Largest possible value for the \"position\" property"),
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 3ce9756615..8d05197496 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -100,7 +100,7 @@ enum {
PROP_RIGHT_MARGIN,
PROP_UNDERLINE,
PROP_RISE,
- PROP_BG_FULL_HEIGHT,
+ PROP_BACKGROUND_FULL_HEIGHT,
PROP_LANGUAGE,
PROP_TABS,
PROP_INVISIBLE,
@@ -129,7 +129,7 @@ enum {
PROP_RIGHT_MARGIN_SET,
PROP_UNDERLINE_SET,
PROP_RISE_SET,
- PROP_BG_FULL_HEIGHT_SET,
+ PROP_BACKGROUND_FULL_HEIGHT_SET,
PROP_LANGUAGE_SET,
PROP_TABS_SET,
PROP_INVISIBLE_SET,
@@ -218,7 +218,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
G_PARAM_READABLE | G_PARAM_WRITABLE));
g_object_class_install_property (object_class,
- PROP_BG_FULL_HEIGHT,
+ PROP_BACKGROUND_FULL_HEIGHT,
g_param_spec_boolean ("background_full_height",
P_("Background full height"),
P_("Whether the background color fills the entire line height or only the height of the tagged characters"),
@@ -510,7 +510,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
P_("Background set"),
P_("Whether this tag affects the background color"));
- ADD_SET_PROP ("background_full_height_set", PROP_BG_FULL_HEIGHT_SET,
+ ADD_SET_PROP ("background_full_height_set", PROP_BACKGROUND_FULL_HEIGHT_SET,
P_("Background full height set"),
P_("Whether this tag affects background height"));
@@ -1161,7 +1161,7 @@ gtk_text_tag_set_property (GObject *object,
size_changed = TRUE;
break;
- case PROP_BG_FULL_HEIGHT:
+ case PROP_BACKGROUND_FULL_HEIGHT:
text_tag->bg_full_height_set = TRUE;
text_tag->values->bg_full_height = g_value_get_boolean (value);
g_object_notify (object, "background_full_height_set");
@@ -1311,7 +1311,7 @@ gtk_text_tag_set_property (GObject *object,
size_changed = TRUE;
break;
- case PROP_BG_FULL_HEIGHT_SET:
+ case PROP_BACKGROUND_FULL_HEIGHT_SET:
text_tag->bg_full_height_set = g_value_get_boolean (value);
break;
@@ -1501,7 +1501,7 @@ gtk_text_tag_get_property (GObject *object,
g_value_set_int (value, tag->values->appearance.rise);
break;
- case PROP_BG_FULL_HEIGHT:
+ case PROP_BACKGROUND_FULL_HEIGHT:
g_value_set_boolean (value, tag->values->bg_full_height);
break;
@@ -1600,7 +1600,7 @@ gtk_text_tag_get_property (GObject *object,
g_value_set_boolean (value, tag->rise_set);
break;
- case PROP_BG_FULL_HEIGHT_SET:
+ case PROP_BACKGROUND_FULL_HEIGHT_SET:
g_value_set_boolean (value, tag->bg_full_height_set);
break;
View Lorry Controller Status