2006-12-12 [paul] 2.6.1cvs20

	* src/gtk/combobox.c
		fix compilation warning

diff --git a/ChangeLog b/ChangeLog
index 9d566f9c34d67546c8fa69897670bc3b9ee45f61..b2821a09914f42a03895963369c24ec2517e9930 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-12 [paul]      2.6.1cvs20
+
+       * src/gtk/combobox.c
+               fix compilation warning
+
 2006-12-11 [colin]     2.6.1cvs19
 
        * src/wizard.c

diff --git a/PATCHSETS b/PATCHSETS
index 91d93c790199135f47a152ebfb0cf06e73643efd..7352b15be0d54cc95a87e0b24c898b8b105b4ee8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2127,3 +2127,4 @@
 ( cvs diff -u -r 1.115.2.114 -r 1.115.2.115 src/main.c;  ) > 2.6.1cvs17.patchset
 ( cvs diff -u -r 1.115.2.115 -r 1.115.2.116 src/main.c;  ) > 2.6.1cvs18.patchset
 ( cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/wizard.c;  ) > 2.6.1cvs19.patchset
+( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/combobox.c;  ) > 2.6.1cvs20.patchset

diff --git a/configure.ac b/configure.ac
index 2031ca5c3a137ad6f4b0dbed0d62c98757f95d0e..19606a507d7dfc500c82b35c3c909ddc03af385b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=19
+EXTRA_VERSION=20
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/combobox.c b/src/gtk/combobox.c
index d92f717a275e2619dea70439788efaa96f5c772e..6375cb7df773eaf06f54952a14802cd5df19364e 100644 (file)
--- a/src/gtk/combobox.c
+++ b/src/gtk/combobox.c
@@ -25,7 +25,7 @@
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <utils.h>
+#include "gtkutils.h"
 
 typedef struct _combobox_sel_by_data_ctx {
        GtkComboBox *combobox;