Mercurial > pidgin.yaz

comparison finch/gntsound.c @ 19137:51772173a916

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a few merge errors
author Eric Polino <aluink@pidgin.im>
date Fri, 06 Jul 2007 01:08:22 +0000
parents 6b85cbfc80b7
children 2d0925800d72
comparison
equal deleted inserted replaced
19136:6b85cbfc80b7 19137:51772173a916
589 char * filepref = g_strdup_printf("%s/sound/file/%s",FINCH_PREFS_ROOT,event->pref); 589 char * filepref = g_strdup_printf("%s/sound/file/%s",FINCH_PREFS_ROOT,event->pref);
590 char * boolpref = g_strdup_printf(FINCH_PREFS_ROOT "/sound/enabled/%s",event->pref); 590 char * boolpref = g_strdup_printf(FINCH_PREFS_ROOT "/sound/enabled/%s",event->pref);
591 purple_prefs_set_bool(boolpref,gnt_tree_get_choice(GNT_TREE(pref_dialog->events),itr->data)); 591 purple_prefs_set_bool(boolpref,gnt_tree_get_choice(GNT_TREE(pref_dialog->events),itr->data));
592 purple_prefs_set_path(filepref,event->file ? event->file : ""); 592 purple_prefs_set_path(filepref,event->file ? event->file : "");
593 g_free(filepref); 593 g_free(filepref);
594 g_free(boolpref);
594 } 595 }
595 gnt_widget_destroy(GNT_WIDGET(win)); 596 gnt_widget_destroy(GNT_WIDGET(win));
596 } 597 }
597 static void 598 static void
598 file_cb(GntWidget *w, gpointer data) 599 file_cb(GntWidget *w, gpointer data)
705 gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"alsa","ALSA"); 706 gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"alsa","ALSA");
706 gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"esd","ESD"); 707 gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"esd","ESD");
707 gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"beep",_("Console Beep")); 708 gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"beep",_("Console Beep"));
708 gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"custom",_("Command")); 709 gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"custom",_("Command"));
709 gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"nosound",_("No Sound")); 710 gnt_combo_box_add_data(GNT_COMBO_BOX(cmbox),"nosound",_("No Sound"));
710 buf = g_strdup(purple_prefs_get_string(FINCH_PREFS_ROOT "/sound/method")); 711 gnt_combo_box_set_selected(GNT_COMBO_BOX(cmbox),(gchar *)purple_prefs_get_string(FINCH_PREFS_ROOT "/sound/method"));
711 gnt_combo_box_set_selected(GNT_COMBO_BOX(cmbox),buf);
712 g_free(buf);
713 712
714 label = gnt_label_new_with_format(_("Sound Method"),GNT_TEXT_FLAG_BOLD); 713 label = gnt_label_new_with_format(_("Sound Method"),GNT_TEXT_FLAG_BOLD);
715 gnt_box_add_widget(GNT_BOX(win),label); 714 gnt_box_add_widget(GNT_BOX(win),label);
716 box = gnt_hbox_new(TRUE); 715 box = gnt_hbox_new(TRUE);
717 gnt_box_set_fill(GNT_BOX(box),FALSE); 716 gnt_box_set_fill(GNT_BOX(box),FALSE);