[libexif-cvs] libexif-gtk/gtk-extensions Makefile.am,1.4,1.5 gtk-options.c,1.4,1.5

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif-gtk/gtk-extensions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18459/gtk-extensions

Modified Files:
	Makefile.am gtk-options.c 
Log Message:

2004-10-17  Lutz Mueller <lu...@us...>

	* libexif-gtk/gtk-exif-entry-version.c and others: Adapt to new
	  gtk API


Index: gtk-options.c
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/gtk-extensions/gtk-options.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gtk-options.c	17 Oct 2004 13:54:23 -0000	1.4
+++ gtk-options.c	17 Oct 2004 15:32:47 -0000	1.5
@@ -22,6 +22,7 @@
 #include "gtk-options.h"
 
 #include <gtk/gtkliststore.h>
+#include <gtk/gtktreemodel.h>
 
 #include <string.h>
 
@@ -50,13 +51,13 @@
 	guint i;
 	GtkTreeIter iter;
 	
-	ls = gtk_list_store_new (GTK_OPTIONS_N_COLUMNS,
-		GTK_OPTIONS_OPTION_COLUMN, GTK_OPTIONS_NAME_COLUMN);
-	for (i = 0; i < G_N_ELEMENTS (options); i++) {
+	ls = gtk_list_store_new (GTK_OPTIONS_N_COLUMNS, G_TYPE_INT,
+				 G_TYPE_STRING);
+	for (i = 0; options[i].name; i++) {
 		gtk_list_store_append (ls, &iter);
-		gtk_tree_model_set (GTK_TREE_MODEL (ls),
-			OPTION_COLUMN, options[i].option,
-			NAME_COLUMN, options[i].name, -1);
+		gtk_list_store_set (ls, &iter,
+			GTK_OPTIONS_OPTION_COLUMN, options[i].option,
+			GTK_OPTIONS_NAME_COLUMN, options[i].name, -1);
 	}
 
 	return GTK_TREE_MODEL (ls);
@@ -71,9 +72,14 @@
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (tm), FALSE);
 	g_return_val_if_fail (iter != NULL, FALSE);
 
+	/* Search the option in the list store. */
 	if (!gtk_tree_model_get_iter_first (tm, iter)) return FALSE;
-	gtk_tree_model_get_value (tm, iter, GTK_OPTIONS_OPTION_COLUMN, &v);
-	while ((option != g_value_get_int (&v)) && 
-	       gtk_tree_model_iter_next (tm, iter));
+	do {
+		gtk_tree_model_get_value (tm, iter, GTK_OPTIONS_OPTION_COLUMN,
+					  &v);
+		if (option == g_value_get_int (&v)) break;
+		g_value_unset (&v);
+	} while (gtk_tree_model_iter_next (tm, iter));
+
 	return (option == g_value_get_int (&v));
 }

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/gtk-extensions/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	17 Oct 2004 13:54:23 -0000	1.4
+++ Makefile.am	17 Oct 2004 15:32:47 -0000	1.5
@@ -5,8 +5,7 @@
 	$(GTK_CFLAGS)
 
 noinst_LTLIBRARIES = libgtk-extensions.la
-libgtk_extensions_la_SOURCES =					\
-	gtk-menu-option.c gtk-menu-option.h			\
+libgtk_extensions_la_SOURCES =			\
+	gtk-menu-option.c gtk-menu-option.h	\
 	gtk-options.c gtk-options.h
-libgtk_extensions_la_LIBADD =		\
-	$(GTK_LIBS)
+libgtk_extensions_la_LIBADD = $(GTK_LIBS)