gnome-desktop r5053 - trunk/libgnome-desktop
- From: vuntz svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-desktop r5053 - trunk/libgnome-desktop
- Date: Wed, 19 Mar 2008 14:42:27 +0000 (GMT)
Author: vuntz
Date: Wed Mar 19 14:42:26 2008
New Revision: 5053
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5053&view=rev
Log:
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
Modified:
trunk/libgnome-desktop/ChangeLog
trunk/libgnome-desktop/gnome-bg.c
trunk/libgnome-desktop/gnome-ditem-edit.c
Modified: trunk/libgnome-desktop/gnome-bg.c
==============================================================================
--- trunk/libgnome-desktop/gnome-bg.c (original)
+++ trunk/libgnome-desktop/gnome-bg.c Wed Mar 19 14:42:26 2008
@@ -95,7 +95,7 @@
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,
Modified: trunk/libgnome-desktop/gnome-ditem-edit.c
==============================================================================
--- trunk/libgnome-desktop/gnome-ditem-edit.c (original)
+++ trunk/libgnome-desktop/gnome-ditem-edit.c Wed Mar 19 14:42:26 2008
@@ -447,42 +447,6 @@
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 @@
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]