Fixed configure.in to AC_CONFIG_SUBDIRS(glib)

diff --git a/configure.in b/configure.in
index bbde83a1e2c0d0115ca2b6857546f2c0fa4060ca..4858d9078aa164303676b02010912617cf796119 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ VERSION=$GTK_VERSION
 PACKAGE=gtk+
 
 # Configure glib
-#AC_CONFIG_SUBDIRS(glib)
+AC_CONFIG_SUBDIRS(glib)
 
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index b625dd5225a4f04e70145afd53d91c691df77b61..0e42ea2eda5320df4f98f4b24d7c6a26b7dd8219 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -40,6 +40,10 @@
 #define SAMPLE_WIDTH  WHEEL_WIDTH+VALUE_WIDTH+5
 #define SAMPLE_HEIGHT 28
 
+static void gtk_color_selection_class_init (GtkColorSelectionClass *klass);
+static void gtk_color_selection_init (GtkColorSelection *colorsel);
+static void gtk_color_selection_dialog_class_init(GtkColorSelectionDialogClass *klass);
+static void gtk_color_selection_dialog_init(GtkColorSelectionDialog *colorseldiag);
 
 enum
 {
@@ -201,7 +205,7 @@ gtk_color_selection_get_type ()
   return color_selection_type;
 }
 
-void
+static void
 gtk_color_selection_class_init (GtkColorSelectionClass *klass)
 {
   GtkObjectClass *object_class;
@@ -228,7 +232,7 @@ gtk_color_selection_class_init (GtkColorSelectionClass *klass)
   widget_class->realize = gtk_color_selection_realize;
 }
 
-void
+static void
 gtk_color_selection_init (GtkColorSelection *colorsel)
 {
   GtkWidget *frame, *hbox, *vbox, *hbox2, *label, *table;
@@ -1407,19 +1411,19 @@ gtk_color_selection_dialog_get_type ()
   return color_selection_dialog_type;
 }
 
-void
-gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *class)
+static void
+gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass)
 {
   GtkObjectClass *object_class;
 
-  object_class = (GtkObjectClass*) class;
+  object_class = (GtkObjectClass*) klass;
 
   color_selection_dialog_parent_class = gtk_type_class (gtk_window_get_type ());
 
   object_class->destroy = gtk_color_selection_dialog_destroy;
 }
 
-void
+static void
 gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
 {
   GtkWidget *action_area, *frame;

diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h
index 744a4a02ba2ac0a975684b6074815e99e8ccee6b..48b46bc938d69874c30f5ddc7da06a0bdfd91065 100644 (file)
--- a/gtk/gtkcolorsel.h
+++ b/gtk/gtkcolorsel.h
@@ -119,8 +119,6 @@ struct _GtkColorSelectionDialogClass
 /* ColorSelection */
 
 guint      gtk_color_selection_get_type          (void);
-void       gtk_color_selection_class_init        (GtkColorSelectionClass *klass);
-void       gtk_color_selection_init              (GtkColorSelection      *colorsel);
 
 GtkWidget* gtk_color_selection_new               (void);
 
@@ -139,8 +137,6 @@ void       gtk_color_selection_get_color         (GtkColorSelection     *colorse
 /* ColorSelectionDialog */
 
 guint      gtk_color_selection_dialog_get_type   (void);
-void       gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass);
-void       gtk_color_selection_dialog_init       (GtkColorSelectionDialog      *colorseldiag);
 
 GtkWidget* gtk_color_selection_dialog_new        (const gchar *title);