AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Allocate pixmap_path dynamically, rather than using a fixed array of size

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

	* gtk/gtkrc.c: Allocate pixmap_path dynamically, rather than
	using a fixed array of size 128.
This commit is contained in:
Matthias Clasen 2006-04-18 17:46:15 +00:00 committed by Matthias Clasen
parent da63cf9805
commit 8245abde4b
3 changed files with 18 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-04-18 Matthias Clasen <mclasen@redhat.com> 2006-04-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkrc.c: Allocate pixmap_path dynamically, rather than
using a fixed array of size 128.
* gtk/gtkiconcache.c: Apply a patch by Paolo Borelli to factor * gtk/gtkiconcache.c: Apply a patch by Paolo Borelli to factor
out a strip_suffix() function and save some memory. (#338307) out a strip_suffix() function and save some memory. (#338307)

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2006-04-18 Matthias Clasen <mclasen@redhat.com> 2006-04-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkrc.c: Allocate pixmap_path dynamically, rather than
using a fixed array of size 128.
* gtk/gtkiconcache.c: Apply a patch by Paolo Borelli to factor * gtk/gtkiconcache.c: Apply a patch by Paolo Borelli to factor
out a strip_suffix() function and save some memory. (#338307) out a strip_suffix() function and save some memory. (#338307)

60
gtk/gtkrc.c
View File

@ -105,7 +105,6 @@ struct _GtkRcFile
guint is_string : 1; /* If TRUE, name is a string to parse with gtk_rc_parse_string() */ guint is_string : 1; /* If TRUE, name is a string to parse with gtk_rc_parse_string() */
}; };
#define GTK_RC_MAX_PIXMAP_PATHS 128
struct _GtkRcContext struct _GtkRcContext
{ {
@ -122,7 +121,7 @@ struct _GtkRcContext
gchar *key_theme_name; gchar *key_theme_name;
gchar *font_name; gchar *font_name;
gchar *pixmap_path[GTK_RC_MAX_PIXMAP_PATHS]; gchar **pixmap_path;
gint default_priority; gint default_priority;
GtkStyle *default_style; GtkStyle *default_style;
@ -702,7 +701,7 @@ gtk_rc_context_get (GtkSettings *settings)
G_CALLBACK (gtk_rc_color_hash_changed), G_CALLBACK (gtk_rc_color_hash_changed),
context); context);
context->pixmap_path[0] = NULL; context->pixmap_path = NULL;
context->default_priority = GTK_PATH_PRIO_RC; context->default_priority = GTK_PATH_PRIO_RC;
@ -3208,13 +3207,14 @@ gtk_rc_find_pixmap_in_path (GtkSettings *settings,
GtkRcContext *context = gtk_rc_context_get (settings); GtkRcContext *context = gtk_rc_context_get (settings);
for (i = 0; (i < GTK_RC_MAX_PIXMAP_PATHS) && (context->pixmap_path[i] != NULL); i++) if (context->pixmap_path)
{ for (i = 0; context->pixmap_path[i] != NULL; i++)
filename = gtk_rc_check_pixmap_dir (context->pixmap_path[i], pixmap_file); {
if (filename) filename = gtk_rc_check_pixmap_dir (context->pixmap_path[i], pixmap_file);
return filename; if (filename)
} return filename;
}
tmp_list = current_files_stack; tmp_list = current_files_stack;
while (tmp_list) while (tmp_list)
{ {
@ -3793,44 +3793,8 @@ gtk_rc_parse_pixmap_path_string (GtkRcContext *context,
GScanner *scanner, GScanner *scanner,
const gchar *pix_path) const gchar *pix_path)
{ {
gint end_offset; g_strfreev (context->pixmap_path);
gint start_offset = 0; context->pixmap_path = g_strsplit (pix_path, G_SEARCHPATH_SEPARATOR_S, -1);
gint path_len;
gint path_num;
/* free the old one, or just add to the old one ? */
for (path_num = 0; context->pixmap_path[path_num]; path_num++)
{
g_free (context->pixmap_path[path_num]);
context->pixmap_path[path_num] = NULL;
}
path_num = 0;
path_len = strlen (pix_path);
for (end_offset = 0; end_offset <= path_len; end_offset++)
{
if ((pix_path[end_offset] == G_SEARCHPATH_SEPARATOR) ||
(end_offset == path_len))
{
gchar *path_element = g_strndup (pix_path + start_offset, end_offset - start_offset);
if (g_path_is_absolute (path_element))
{
context->pixmap_path[path_num] = path_element;
path_num++;
context->pixmap_path[path_num] = NULL;
}
else
{
g_warning (_("Pixmap path element: \"%s\" must be absolute, %s, line %d"),
path_element, scanner->input_name, scanner->line);
g_free (path_element);
}
start_offset = end_offset + 1;
}
}
} }
static guint static guint