[libexif-cvs] libexif-gtk/gtk-extensions Makefile.am,1.3,1.4 gtk-options.c,1.3,1.4 gtk-options.h,1.2,1.3 gtk-option-menu-option.c,1.4,NONE gtk-option-menu-option.h,1.2,NONE

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

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

Modified Files:
	Makefile.am gtk-options.c gtk-options.h 
Removed Files:
	gtk-option-menu-option.c gtk-option-menu-option.h 
Log Message:

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

	First part of a patch to get libexif-gtk to compile again against
	current gtk. For now, libexif-gtk does not compile at all.

	* gtk-extensions/gtk-option-menu-option.[c,h]: Removed.
	* libexif-gtk/gtk-exif-browser.c: Redirect EXPOSURE_PROGRAM to 
	  the generic entry.
	* libexif-gtk/gtk-exif-tag-menu.[c,h]: Removed.
	* libexif-gtk/gtk-exif-entry-exposure.[c,h]: Removed. Now covered
	  by the generic entry.
	* configure.in: CURRENT = 5.


Index: gtk-options.c
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/gtk-extensions/gtk-options.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gtk-options.c	15 Dec 2002 11:41:28 -0000	1.3
+++ gtk-options.c	17 Oct 2004 13:54:23 -0000	1.4
@@ -21,6 +21,8 @@
 #include "config.h"
 #include "gtk-options.h"
 
+#include <gtk/gtkliststore.h>
+
 #include <string.h>
 
 void
@@ -41,3 +43,37 @@
 	}
 }
 
+GtkTreeModel *
+gtk_tree_model_new_from_options (GtkOptions *options)
+{
+	GtkListStore *ls;
+	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++) {
+		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);
+	}
+
+	return GTK_TREE_MODEL (ls);
+}
+
+gboolean
+gtk_tree_model_get_iter_from_option (GtkTreeModel *tm, guint option, 
+				     GtkTreeIter *iter)
+{
+	GValue v = {0,};
+
+	g_return_val_if_fail (GTK_IS_TREE_MODEL (tm), FALSE);
+	g_return_val_if_fail (iter != NULL, FALSE);
+
+	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));
+	return (option == g_value_get_int (&v));
+}

Index: gtk-options.h
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/gtk-extensions/gtk-options.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gtk-options.h	15 Dec 2002 11:41:28 -0000	1.2
+++ gtk-options.h	17 Oct 2004 13:54:23 -0000	1.3
@@ -21,7 +21,7 @@
 #ifndef __GTK_OPTIONS_H__ 
 #define __GTK_OPTIONS_H__
 
-#include <glib.h>
+#include <gtk/gtktreemodel.h>
 
 typedef struct _GtkOptions GtkOptions;
 struct _GtkOptions {
@@ -29,7 +29,17 @@
 	const gchar *name;
 };
 
-void gtk_options_sort (GtkOptions *options);
+void          gtk_options_sort (GtkOptions *);
+
+enum {
+	GTK_OPTIONS_OPTION_COLUMN,
+	GTK_OPTIONS_NAME_COLUMN,
+	GTK_OPTIONS_N_COLUMNS
+};
+
+GtkTreeModel *gtk_tree_model_new_from_options     (GtkOptions *);
+gboolean      gtk_tree_model_get_iter_from_option (GtkTreeModel *, guint,
+						   GtkTreeIter *);
 
 #endif /* __GTK_OPTIONS_H__ */
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/gtk-extensions/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	15 Sep 2002 13:22:41 -0000	1.3
+++ Makefile.am	17 Oct 2004 13:54:23 -0000	1.4
@@ -7,7 +7,6 @@
 noinst_LTLIBRARIES = libgtk-extensions.la
 libgtk_extensions_la_SOURCES =					\
 	gtk-menu-option.c gtk-menu-option.h			\
-	gtk-option-menu-option.c gtk-option-menu-option.h	\
 	gtk-options.c gtk-options.h
 libgtk_extensions_la_LIBADD =		\
 	$(GTK_LIBS)

--- gtk-option-menu-option.c DELETED ---

--- gtk-option-menu-option.h DELETED ---