callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of an unnecessary static variable.

Browse Source 
2006-04-03  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmain.c: Get rid of an unnecessary static variable.
This commit is contained in:
Matthias Clasen
2006-04-03 16:21:41 +00:00
committed by Matthias Clasen
parent 8de7c8b761
commit 6ff309a95c
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,9 +1,13 @@
2006-04-03 Matthias Clasen <mclasen@redhat.com> 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/gtktextlayout.c: Fix a warning.
* gtk/gtktextsegment.h: * gtk/gtktextsegment.h:
* gtk/gtktextsegment.c: * gtk/gtktextsegment.c:
* gtk/gtktextchild.c:
* gtk/gtktextbtree.c:
* gtk/gtktextmark.c: * gtk/gtktextmark.c:
* gtk/gtktexttypes.h: Make the segment class pointers const. * gtk/gtktexttypes.h: Make the segment class pointers const.

4
ChangeLog.pre-2-10
View File

@ -1,9 +1,13 @@
2006-04-03 Matthias Clasen <mclasen@redhat.com> 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/gtktextlayout.c: Fix a warning.
* gtk/gtktextsegment.h: * gtk/gtktextsegment.h:
* gtk/gtktextsegment.c: * gtk/gtktextsegment.c:
* gtk/gtktextchild.c:
* gtk/gtktextbtree.c:
* gtk/gtktextmark.c: * gtk/gtktextmark.c:
* gtk/gtktexttypes.h: Make the segment class pointers const. * gtk/gtktexttypes.h: Make the segment class pointers const.

9
gtk/gtkmain.c
View File

@ -161,9 +161,6 @@ static const GDebugKey gtk_debug_keys[] = {
{"geometry", GTK_DEBUG_GEOMETRY}, {"geometry", GTK_DEBUG_GEOMETRY},
{"icontheme", GTK_DEBUG_ICONTHEME} {"icontheme", GTK_DEBUG_ICONTHEME}
}; };
static const guint gtk_ndebug_keys = sizeof (gtk_debug_keys) / sizeof (GDebugKey);
#endif /* G_ENABLE_DEBUG */ #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_flags |= g_parse_debug_string (value,
gtk_debug_keys, gtk_debug_keys,
gtk_ndebug_keys); G_N_ELEMENTS (gtk_debug_keys));
return TRUE; 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_flags &= ~g_parse_debug_string (value,
gtk_debug_keys, gtk_debug_keys,
gtk_ndebug_keys); G_N_ELEMENTS (gtk_debug_keys));
return TRUE; return TRUE;
} }
@ -447,7 +444,7 @@ do_pre_parse_initialization (int *argc,
{ {
gtk_debug_flags = g_parse_debug_string (env_string, gtk_debug_flags = g_parse_debug_string (env_string,
gtk_debug_keys, gtk_debug_keys,
gtk_ndebug_keys); G_N_ELEMENTS (gtk_debug_keys));
env_string = NULL; env_string = NULL;
} }
#endif /* G_ENABLE_DEBUG */ #endif /* G_ENABLE_DEBUG */