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

fix critical warning when music directory isn't set

Browse source 
2008-07-28  Jens Granseuer  <jensgr@gmx.net>

	* sound-theme.c: (get_sound_filename): fix critical warning when music
	directory isn't set

	* (setting_column_edited): fix more leaks

	* (theme_changed_custom_reinit): when resetting a theme, also reset
	the preview icon status

svn path=/trunk/; revision=8816
This commit is contained in:
Jens Granseuer 2008-07-28 20:51:28 +00:00 • committed by Jens Granseuer
parent 0a36199bb6
commit 07ac9b7c5d
2 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
capplets/sound/ChangeLog
View file

@ -1,3 +1,13 @@
2008-07-28 Jens Granseuer <jensgr@gmx.net>
* sound-theme.c: (get_sound_filename): fix critical warning when music
directory isn't set
* (setting_column_edited): fix more leaks
* (theme_changed_custom_reinit): when resetting a theme, also reset
the preview icon status
2008-07-28 Jens Granseuer <jensgr@gmx.net> 2008-07-28 Jens Granseuer <jensgr@gmx.net>
* sound-theme.c: (load_index_theme_name), * sound-theme.c: (load_index_theme_name),

20
capplets/sound/sound-theme.c
View file

@ -506,6 +506,7 @@ get_sound_filename (GladeXML *dialog)
g_free (path); g_free (path);
} }
data_dir = g_get_user_special_dir (G_USER_DIRECTORY_MUSIC); data_dir = g_get_user_special_dir (G_USER_DIRECTORY_MUSIC);
if (data_dir != NULL)
gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (chooser), data_dir, NULL); gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (chooser), data_dir, NULL);
response = gtk_dialog_run (GTK_DIALOG (chooser)); response = gtk_dialog_run (GTK_DIALOG (chooser));
@ -747,7 +748,7 @@ setting_column_edited (GtkCellRendererText *renderer,
if (new_text == NULL) if (new_text == NULL)
return; return;
g_object_get (G_OBJECT (renderer), g_object_get (renderer,
"model", &model, "model", &model,
NULL); NULL);
@ -762,13 +763,17 @@ setting_column_edited (GtkCellRendererText *renderer,
gtk_tree_model_get_iter_first (model, &iter); gtk_tree_model_get_iter_first (model, &iter);
do { do {
gint cmp;
gtk_tree_model_get (model, &iter, 0, &text, 1, &setting, -1); gtk_tree_model_get (model, &iter, 0, &text, 1, &setting, -1);
if (g_utf8_collate (text, new_text) == 0) { cmp = g_utf8_collate (text, new_text);
g_free (text);
if (cmp == 0) {
if (type == SOUND_TYPE_NORMAL || type == SOUND_TYPE_FEEDBACK || type == SOUND_TYPE_AUDIO_BELL) { if (type == SOUND_TYPE_NORMAL || type == SOUND_TYPE_FEEDBACK || type == SOUND_TYPE_AUDIO_BELL) {
char *filename;
if (setting == SOUND_CUSTOM || (setting == SOUND_CUSTOM_OLD && old_filename == NULL)) { if (setting == SOUND_CUSTOM || (setting == SOUND_CUSTOM_OLD && old_filename == NULL)) {
filename = get_sound_filename (dialog); char *filename = get_sound_filename (dialog);
if (filename == NULL) if (filename == NULL)
break; break;
gtk_tree_store_set (GTK_TREE_STORE (tree_model), gtk_tree_store_set (GTK_TREE_STORE (tree_model),
@ -777,6 +782,7 @@ setting_column_edited (GtkCellRendererText *renderer,
HAS_PREVIEW_COL, setting != SOUND_OFF, HAS_PREVIEW_COL, setting != SOUND_OFF,
FILENAME_COL, filename, FILENAME_COL, filename,
-1); -1);
g_free (filename);
} else if (setting == SOUND_CUSTOM_OLD) { } else if (setting == SOUND_CUSTOM_OLD) {
gtk_tree_store_set (GTK_TREE_STORE (tree_model), gtk_tree_store_set (GTK_TREE_STORE (tree_model),
&tree_iter, &tree_iter,
@ -904,11 +910,15 @@ theme_changed_custom_reinit (GtkTreeModel *model,
gpointer data) gpointer data)
{ {
int type; int type;
gboolean sensitive;
gtk_tree_model_get (model, iter, TYPE_COL, &type, -1); gtk_tree_model_get (model, iter,
TYPE_COL, &type,
SENSITIVE_COL, &sensitive, -1);
if (type != -1 && type != SOUND_TYPE_VISUAL_BELL) { if (type != -1 && type != SOUND_TYPE_VISUAL_BELL) {
gtk_tree_store_set (GTK_TREE_STORE (model), iter, gtk_tree_store_set (GTK_TREE_STORE (model), iter,
SETTING_COL, SOUND_BUILTIN, SETTING_COL, SOUND_BUILTIN,
HAS_PREVIEW_COL, sensitive,
-1); -1);
} }
return FALSE; return FALSE;