comparison: pidgin/gtkprefs.c
pidgin/gtkprefs.c
- branch
- next.minor
- changeset 25887
- 6eac2f6c32e2
- parent 25874
- 966325e48356
- child 25888
- d0fdd378a635
equal
deleted
inserted
replaced
| 25886:49853db421dd | 25887:6eac2f6c32e2 |
|---|---|
| 701 | 701 |
| 702 cell_rend = gtk_cell_renderer_pixbuf_new(); | 702 cell_rend = gtk_cell_renderer_pixbuf_new(); |
| 703 gtk_cell_renderer_set_fixed_size(cell_rend, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE); | 703 gtk_cell_renderer_set_fixed_size(cell_rend, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE); |
| 704 gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo_box), cell_rend, FALSE); | 704 gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo_box), cell_rend, FALSE); |
| 705 gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), cell_rend, "pixbuf", 0, NULL); | 705 gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), cell_rend, "pixbuf", 0, NULL); |
| 706 | 706 |
| 707 cell_rend = gtk_cell_renderer_text_new(); | 707 cell_rend = gtk_cell_renderer_text_new(); |
| 708 gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo_box), cell_rend, FALSE); | 708 gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo_box), cell_rend, FALSE); |
| 709 gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), cell_rend, "markup", 1, NULL); | 709 gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), cell_rend, "markup", 1, NULL); |
| 710 /*#if GTK_CHECK_VERSION(2,6,0) | 710 /*#if GTK_CHECK_VERSION(2,6,0) |
| 711 g_object_set(cell_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); | 711 g_object_set(cell_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); |
| 712 #endif*/ | 712 #endif*/ |
| 713 | 713 |
| 714 if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) { | 714 if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) { |
| 715 do { | 715 do { |
| 716 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 2, &theme, -1); | 716 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 2, &theme, -1); |
| 717 | 717 |
| 718 if (g_str_equal(current_theme, theme)) { | 718 if (g_str_equal(current_theme, theme)) { |
| 735 prefs_set_sound_theme_cb(GtkComboBox *combo_box, gpointer user_data) | 735 prefs_set_sound_theme_cb(GtkComboBox *combo_box, gpointer user_data) |
| 736 { | 736 { |
| 737 gint i; | 737 gint i; |
| 738 gchar *pref; | 738 gchar *pref; |
| 739 gchar *new_theme; | 739 gchar *new_theme; |
| 740 gboolean sucess; | 740 gboolean success; |
| 741 GtkTreeIter new_iter; | 741 GtkTreeIter new_iter; |
| 742 | 742 |
| 743 | 743 success = gtk_combo_box_get_active_iter(combo_box, &new_iter); |
| 744 sucess = gtk_combo_box_get_active_iter(combo_box, &new_iter); | 744 g_return_if_fail(success); |
| 745 g_return_if_fail(sucess); | |
| 746 | 745 |
| 747 gtk_tree_model_get(GTK_TREE_MODEL(prefs_sound_themes), &new_iter, 2, &new_theme, -1); | 746 gtk_tree_model_get(GTK_TREE_MODEL(prefs_sound_themes), &new_iter, 2, &new_theme, -1); |
| 748 | 747 |
| 749 purple_prefs_set_string(PIDGIN_PREFS_ROOT "/sound/theme", new_theme); | 748 purple_prefs_set_string(PIDGIN_PREFS_ROOT "/sound/theme", new_theme); |
| 750 | 749 |
