gdk/gdk.c gdk/gdkinputnone.h casts to get rid of const warnings
* gdk/gdk.c * gdk/gdkinputnone.h * gtk/gtkruler.c: casts to get rid of const warnings * gtk/Makefile.am: fix gtktypebuiltins.h dependencies, and do a cmp so people don't whine about rebuilds * gtk/gtknotebook.c: use g_snprintf on translated strings, so we don't get buffer overflows * gtk/gtkrc.c: use g_strdup_printf instead of g_malloc/sprintf Plug some memleaks. -Yosh
This commit is contained in:
10
gdk/gdk.c
10
gdk/gdk.c
@ -175,7 +175,7 @@ gdk_init (int *argc,
|
||||
gchar *debug_string = getenv("GDK_DEBUG");
|
||||
if (debug_string != NULL)
|
||||
gdk_debug_flags = g_parse_debug_string (debug_string,
|
||||
gdk_debug_keys,
|
||||
(GDebugKey *) gdk_debug_keys,
|
||||
gdk_ndebug_keys);
|
||||
}
|
||||
#endif /* G_ENABLE_DEBUG */
|
||||
@ -204,13 +204,13 @@ gdk_init (int *argc,
|
||||
if (equal_pos != NULL)
|
||||
{
|
||||
gdk_debug_flags |= g_parse_debug_string (equal_pos+1,
|
||||
gdk_debug_keys,
|
||||
(GDebugKey *) gdk_debug_keys,
|
||||
gdk_ndebug_keys);
|
||||
}
|
||||
else if ((i + 1) < *argc && (*argv)[i + 1])
|
||||
{
|
||||
gdk_debug_flags |= g_parse_debug_string ((*argv)[i+1],
|
||||
gdk_debug_keys,
|
||||
(GDebugKey *) gdk_debug_keys,
|
||||
gdk_ndebug_keys);
|
||||
(*argv)[i] = NULL;
|
||||
i += 1;
|
||||
@ -225,13 +225,13 @@ gdk_init (int *argc,
|
||||
if (equal_pos != NULL)
|
||||
{
|
||||
gdk_debug_flags &= ~g_parse_debug_string (equal_pos+1,
|
||||
gdk_debug_keys,
|
||||
(GDebugKey *) gdk_debug_keys,
|
||||
gdk_ndebug_keys);
|
||||
}
|
||||
else if ((i + 1) < *argc && (*argv)[i + 1])
|
||||
{
|
||||
gdk_debug_flags &= ~g_parse_debug_string ((*argv)[i+1],
|
||||
gdk_debug_keys,
|
||||
(GDebugKey *) gdk_debug_keys,
|
||||
gdk_ndebug_keys);
|
||||
(*argv)[i] = NULL;
|
||||
i += 1;
|
||||
|
||||
@ -45,7 +45,7 @@ gdk_input_init (void)
|
||||
gdk_input_vtable.enable_window = NULL;
|
||||
gdk_input_vtable.disable_window = NULL;
|
||||
|
||||
gdk_input_devices = g_list_append (NULL, &gdk_input_core_info);
|
||||
gdk_input_devices = g_list_append (NULL, (GdkDeviceInfo *) &gdk_input_core_info);
|
||||
|
||||
gdk_input_ignore_core = FALSE;
|
||||
}
|
||||
|
||||
@ -45,7 +45,7 @@ gdk_input_init (void)
|
||||
gdk_input_vtable.enable_window = NULL;
|
||||
gdk_input_vtable.disable_window = NULL;
|
||||
|
||||
gdk_input_devices = g_list_append (NULL, &gdk_input_core_info);
|
||||
gdk_input_devices = g_list_append (NULL, (GdkDeviceInfo *) &gdk_input_core_info);
|
||||
|
||||
gdk_input_ignore_core = FALSE;
|
||||
}
|
||||
|
||||
@ -175,7 +175,7 @@ gdk_init (int *argc,
|
||||
gchar *debug_string = getenv("GDK_DEBUG");
|
||||
if (debug_string != NULL)
|
||||
gdk_debug_flags = g_parse_debug_string (debug_string,
|
||||
gdk_debug_keys,
|
||||
(GDebugKey *) gdk_debug_keys,
|
||||
gdk_ndebug_keys);
|
||||
}
|
||||
#endif /* G_ENABLE_DEBUG */
|
||||
@ -204,13 +204,13 @@ gdk_init (int *argc,
|
||||
if (equal_pos != NULL)
|
||||
{
|
||||
gdk_debug_flags |= g_parse_debug_string (equal_pos+1,
|
||||
gdk_debug_keys,
|
||||
(GDebugKey *) gdk_debug_keys,
|
||||
gdk_ndebug_keys);
|
||||
}
|
||||
else if ((i + 1) < *argc && (*argv)[i + 1])
|
||||
{
|
||||
gdk_debug_flags |= g_parse_debug_string ((*argv)[i+1],
|
||||
gdk_debug_keys,
|
||||
(GDebugKey *) gdk_debug_keys,
|
||||
gdk_ndebug_keys);
|
||||
(*argv)[i] = NULL;
|
||||
i += 1;
|
||||
@ -225,13 +225,13 @@ gdk_init (int *argc,
|
||||
if (equal_pos != NULL)
|
||||
{
|
||||
gdk_debug_flags &= ~g_parse_debug_string (equal_pos+1,
|
||||
gdk_debug_keys,
|
||||
(GDebugKey *) gdk_debug_keys,
|
||||
gdk_ndebug_keys);
|
||||
}
|
||||
else if ((i + 1) < *argc && (*argv)[i + 1])
|
||||
{
|
||||
gdk_debug_flags &= ~g_parse_debug_string ((*argv)[i+1],
|
||||
gdk_debug_keys,
|
||||
(GDebugKey *) gdk_debug_keys,
|
||||
gdk_ndebug_keys);
|
||||
(*argv)[i] = NULL;
|
||||
i += 1;
|
||||
|
||||
Reference in New Issue
Block a user