Mercurial > pidgin.yaz
comparison pidgin/gtkprefs.c @ 18379:794a527c8198
Minor coding style changes.
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 30 Jun 2007 23:12:10 +0000 |
parents | 52436b1c0723 |
children | 95c45d72c6e7 |
comparison
equal
deleted
inserted
replaced
18378:affffa44fad4 | 18379:794a527c8198 |
---|---|
521 | 521 |
522 theme_rowref = theme_refresh_theme_list(); | 522 theme_rowref = theme_refresh_theme_list(); |
523 if (theme_rowref != NULL) { | 523 if (theme_rowref != NULL) { |
524 GtkTreePath *tp = gtk_tree_row_reference_get_path(theme_rowref); | 524 GtkTreePath *tp = gtk_tree_row_reference_get_path(theme_rowref); |
525 | 525 |
526 if(tp) | 526 if (tp) |
527 gtk_tree_selection_select_path(smiley_theme_sel, tp); | 527 gtk_tree_selection_select_path(smiley_theme_sel, tp); |
528 gtk_tree_row_reference_free(theme_rowref); | 528 gtk_tree_row_reference_free(theme_rowref); |
529 } | 529 } |
530 } | 530 } |
531 | 531 |
648 char *theme_name = NULL, *theme_file = NULL; | 648 char *theme_name = NULL, *theme_file = NULL; |
649 GtkTreeModel *tm; | 649 GtkTreeModel *tm; |
650 GtkTreeIter itr; | 650 GtkTreeIter itr; |
651 GtkTreeRowReference *trr = NULL; | 651 GtkTreeRowReference *trr = NULL; |
652 | 652 |
653 if ((tm = gtk_tree_view_get_model(tv)) == NULL) return; | 653 if ((tm = gtk_tree_view_get_model(tv)) == NULL) |
654 if (!gtk_tree_selection_get_selected(smiley_theme_sel, NULL, &itr)) return; | 654 return; |
655 if (!gtk_tree_selection_get_selected(smiley_theme_sel, NULL, &itr)) | |
656 return; | |
655 gtk_tree_model_get(tm, &itr, 2, &theme_file, 3, &theme_name, -1); | 657 gtk_tree_model_get(tm, &itr, 2, &theme_file, 3, &theme_name, -1); |
656 | 658 |
657 if(theme_name && strcmp(theme_name, "none")) { | 659 if (theme_file && theme_name && strcmp(theme_name, "none")) |
658 if (theme_file) { | 660 pidgin_themes_remove_smiley_theme(theme_file); |
659 pidgin_themes_remove_smiley_theme(theme_file); | |
660 } | |
661 } | |
662 | 661 |
663 if ((trr = theme_refresh_theme_list()) != NULL) { | 662 if ((trr = theme_refresh_theme_list()) != NULL) { |
664 GtkTreePath *tp = gtk_tree_row_reference_get_path(trr); | 663 GtkTreePath *tp = gtk_tree_row_reference_get_path(trr); |
665 | 664 |
666 if (tp) { | 665 if (tp) { |