diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | gtk/gtkmain.c | 9 |
3 files changed, 11 insertions, 6 deletions
@@ -1,9 +1,13 @@ 2006-04-03 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkmain.c: Get rid of an unnecessary static variable. + * gtk/gtktextlayout.c: Fix a warning. * gtk/gtktextsegment.h: * gtk/gtktextsegment.c: + * gtk/gtktextchild.c: + * gtk/gtktextbtree.c: * gtk/gtktextmark.c: * gtk/gtktexttypes.h: Make the segment class pointers const. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8c156cca04..62bfa55503 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,9 +1,13 @@ 2006-04-03 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkmain.c: Get rid of an unnecessary static variable. + * gtk/gtktextlayout.c: Fix a warning. * gtk/gtktextsegment.h: * gtk/gtktextsegment.c: + * gtk/gtktextchild.c: + * gtk/gtktextbtree.c: * gtk/gtktextmark.c: * gtk/gtktexttypes.h: Make the segment class pointers const. diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 7e7fe83d29..c97b68b740 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -161,9 +161,6 @@ static const GDebugKey gtk_debug_keys[] = { {"geometry", GTK_DEBUG_GEOMETRY}, {"icontheme", GTK_DEBUG_ICONTHEME} }; - -static const guint gtk_ndebug_keys = sizeof (gtk_debug_keys) / sizeof (GDebugKey); - #endif /* G_ENABLE_DEBUG */ /** @@ -370,7 +367,7 @@ gtk_arg_debug_cb (const char *key, const char *value, gpointer user_data) { gtk_debug_flags |= g_parse_debug_string (value, gtk_debug_keys, - gtk_ndebug_keys); + G_N_ELEMENTS (gtk_debug_keys)); return TRUE; } @@ -380,7 +377,7 @@ gtk_arg_no_debug_cb (const char *key, const char *value, gpointer user_data) { gtk_debug_flags &= ~g_parse_debug_string (value, gtk_debug_keys, - gtk_ndebug_keys); + G_N_ELEMENTS (gtk_debug_keys)); return TRUE; } @@ -447,7 +444,7 @@ do_pre_parse_initialization (int *argc, { gtk_debug_flags = g_parse_debug_string (env_string, gtk_debug_keys, - gtk_ndebug_keys); + G_N_ELEMENTS (gtk_debug_keys)); env_string = NULL; } #endif /* G_ENABLE_DEBUG */ |