diff options
| author | Vincent Untz <vuntz@gnome.org> | 2008-03-19 14:42:26 +0000 |
|---|---|---|
| committer | Vincent Untz <vuntz@src.gnome.org> | 2008-03-19 14:42:26 +0000 |
| commit | 00cc714380a4876777e8511615145bcb08a042e4 (patch) | |
| tree | 784e10996490a9ef6d701df7f4c24f5c5044e4d7 | |
| parent | 0b2a3157bd0f268fedbf297727387f4706fb2baf (diff) | |
| download | gnome-desktop-00cc714380a4876777e8511615145bcb08a042e4.tar.gz | |
Fix compiler warnings. Patch by Kjartan Maraas <kmaraas@gnome.org> Fix bug
2008-03-19 Vincent Untz <vuntz@gnome.org>
Fix compiler warnings.
Patch by Kjartan Maraas <kmaraas@gnome.org>
Fix bug #521531
* gnome-bg.c: remove ;
* gnome-ditem-edit.c: (return_iter_nth_row): kill
(gnome_ditem_edit_sync_display): don't define variables with the same
name in this scope
svn path=/trunk/; revision=5053
| -rw-r--r-- | libgnome-desktop/ChangeLog | 11 | ||||
| -rw-r--r-- | libgnome-desktop/gnome-bg.c | 2 | ||||
| -rw-r--r-- | libgnome-desktop/gnome-ditem-edit.c | 37 |
3 files changed, 12 insertions, 38 deletions
diff --git a/libgnome-desktop/ChangeLog b/libgnome-desktop/ChangeLog index 4707f330..a79909e1 100644 --- a/libgnome-desktop/ChangeLog +++ b/libgnome-desktop/ChangeLog @@ -1,3 +1,14 @@ +2008-03-19 Vincent Untz <vuntz@gnome.org> + + Fix compiler warnings. + Patch by Kjartan Maraas <kmaraas@gnome.org> + Fix bug #521531 + + * gnome-bg.c: remove ; + * gnome-ditem-edit.c: (return_iter_nth_row): kill + (gnome_ditem_edit_sync_display): don't define variables with the same + name in this scope + ==================== 2.22.0 ==================== ==================== 2.21.92 ==================== diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c index 1bc97fe7..352c492e 100644 --- a/libgnome-desktop/gnome-bg.c +++ b/libgnome-desktop/gnome-bg.c @@ -95,7 +95,7 @@ enum { static guint signals[N_SIGNALS] = { 0 }; -G_DEFINE_TYPE (GnomeBG, gnome_bg, G_TYPE_OBJECT); +G_DEFINE_TYPE (GnomeBG, gnome_bg, G_TYPE_OBJECT) static GdkPixmap *make_root_pixmap (GdkScreen *screen, gint width, diff --git a/libgnome-desktop/gnome-ditem-edit.c b/libgnome-desktop/gnome-ditem-edit.c index 0a0e1a2e..f4cfb9c6 100644 --- a/libgnome-desktop/gnome-ditem-edit.c +++ b/libgnome-desktop/gnome-ditem-edit.c @@ -447,42 +447,6 @@ make_easy_page (GnomeDItemEdit *dee) return table; } -static GtkTreeIter* -return_iter_nth_row(GtkTreeView *tree_view, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - gint increment, - gint row) -{ - GtkTreePath *current_path; - gboolean row_expanded; - gboolean children_present; - gboolean next_iter; - gboolean parent_iter; - gboolean parent_next_iter; - - current_path = gtk_tree_model_get_path (tree_model, iter); - - if (increment == row) - return iter; - - row_expanded = gtk_tree_view_row_expanded (tree_view, current_path); - gtk_tree_path_free (current_path); - children_present = gtk_tree_model_iter_children (tree_model, iter, iter); - next_iter = gtk_tree_model_iter_next (tree_model, iter); - parent_iter = gtk_tree_model_iter_parent (tree_model, iter, iter); - parent_next_iter = gtk_tree_model_iter_next (tree_model, iter); - - if ((row_expanded && children_present) || - (next_iter) || - (parent_iter && parent_next_iter)){ - return return_iter_nth_row (tree_view, tree_model, iter, - ++increment, row); - } - - return NULL; -} - static void translations_select_row (GtkTreeSelection *selection, GnomeDItemEdit *dee) @@ -991,7 +955,6 @@ gnome_ditem_edit_sync_display (GnomeDItemEdit *dee) gtk_list_store_clear (GTK_LIST_STORE (model)); i18n_list = gnome_desktop_item_get_languages (ditem, NULL); for (li = i18n_list; li != NULL; li = li->next) { - const char *name, *comment, *generic_name; const char *lang = li->data; name = gnome_desktop_item_get_localestring_lang |