applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert the previous two commits. It looks like the fix in gnome-vfs to

Browse source 
2005-02-03  Kjartan Maraas  <kmaraas@gnome.org>

	* gnome-theme-info.c: (update_theme_index),
	(top_theme_dir_changed), (top_icon_theme_dir_changed),
	(real_add_top_theme_dir_monitor): Revert the previous
	two commits. It looks like the fix in gnome-vfs to make
	sure gnome_vfs_uri_extract_short_name() doesn't return
	NULL was what we really needed. Please retest to see if
	you can still reproduce the crashes in the theme-manager
	after this change and with the latest gnome-vfs from CVS.
This commit is contained in:
Kjartan Maraas 2005-02-03 00:07:37 +00:00 • committed by Kjartan Maraas
parent 41e0025e21
commit ae7e92ad37
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
capplets/common/ChangeLog
View file

@ -1,3 +1,14 @@
2005-02-03 Kjartan Maraas <kmaraas@gnome.org>
* gnome-theme-info.c: (update_theme_index),
(top_theme_dir_changed), (top_icon_theme_dir_changed),
(real_add_top_theme_dir_monitor): Revert the previous
two commits. It looks like the fix in gnome-vfs to make
sure gnome_vfs_uri_extract_short_name() doesn't return
NULL was what we really needed. Please retest to see if
you can still reproduce the crashes in the theme-manager
after this change and with the latest gnome-vfs from CVS.
2005-02-02 Kjartan Maraas <kmaraas@gnome.org> 2005-02-02 Kjartan Maraas <kmaraas@gnome.org>
* gnome-theme-info.c: (update_theme_index), * gnome-theme-info.c: (update_theme_index),

6
capplets/common/gnome-theme-info.c
View file

@ -527,7 +527,7 @@ update_theme_index (GnomeVFSURI *index_uri,
theme_info->has_metacity = TRUE; theme_info->has_metacity = TRUE;
g_hash_table_insert (theme_hash_by_uri, g_strdup (common_theme_dir), theme_info); g_hash_table_insert (theme_hash_by_uri, g_strdup (common_theme_dir), theme_info);
add_data_to_hash_by_name (theme_hash_by_name, g_strdup (theme_info->name), theme_info); add_data_to_hash_by_name (theme_hash_by_name, theme_info->name, theme_info);
handle_change_signal (GNOME_THEME_TYPE_REGULAR, theme_info, GNOME_THEME_CHANGE_CREATED, key_element); handle_change_signal (GNOME_THEME_TYPE_REGULAR, theme_info, GNOME_THEME_CHANGE_CREATED, key_element);
} }
} }
@ -953,6 +953,7 @@ top_theme_dir_changed (GnomeVFSMonitorHandle *handle,
g_hash_table_remove (handle_hash, name); g_hash_table_remove (handle_hash, name);
g_free (monitor_data); g_free (monitor_data);
} }
g_free (name);
} }
gnome_vfs_uri_unref (common_theme_dir_uri); gnome_vfs_uri_unref (common_theme_dir_uri);
} }
@ -1004,6 +1005,7 @@ top_icon_theme_dir_changed (GnomeVFSMonitorHandle *handle,
g_hash_table_remove (handle_hash, name); g_hash_table_remove (handle_hash, name);
g_free (monitor_data); g_free (monitor_data);
} }
g_free (name);
} }
gnome_vfs_uri_unref (common_icon_theme_dir_uri); gnome_vfs_uri_unref (common_icon_theme_dir_uri);
} }
@ -1185,7 +1187,7 @@ real_add_top_theme_dir_monitor (GnomeVFSURI *uri,
* use it to remove the monitor handles when a dir is removed. * use it to remove the monitor handles when a dir is removed.
*/ */
tuple = g_new0 (CallbackTuple, 1); tuple = g_new0 (CallbackTuple, 1);
tuple->handle_hash = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL); tuple->handle_hash = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, NULL);
tuple->priority = priority; tuple->priority = priority;
/* Check the URI */ /* Check the URI */