Ignore the sgml directory made by gtkdoc. Use gtk_window_set_resizable

	* .cvsignore: Ignore the sgml directory made by gtkdoc.
	* demos/pixbuf-demo.c: (main): Use gtk_window_set_resizable
	instead of the deprecated gtk_window_set_policy.
	* demos/testpixbuf-scale.c: Add missing <stdlib.h> include.
	* gdk/gdkkeys.c: (gdk_keymap_class_init): Remove empty finalize
	function to get rid of warning and some code too.
	* gdk/x11/gdkfont-x11.c: (gdk_font_charset_for_locale): Add
	missing const.
	* gdk/x11/gdkmain-x11.c: (_gdk_windowing_init_check): Remove
	unused local.
	* gdk/x11/gdkpango-x11.c: (gdk_pango_context_get): Add missing
	const.
	* gdk/x11/gdkselection-x11.c: (gdk_text_property_to_utf8_list),
	(gdk_utf8_to_compound_text): Add missing const.
	* gtk/gtkimage.c: (gtk_image_expose): Remove unused local.
	* gtk/gtkmenubar.c: (gtk_menu_bar_hierarchy_changed): Add missing
	cast and get rid of an unnecessary one.
	* gtk/gtksettings.c: (gtk_settings_notify): Remove unused local.
	* gtk/gtkstatusbar.c: (gtk_statusbar_size_allocate): Remove unused
	local.
	* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_build_level):
	Remove unused local.
	* modules/input/gtkimcontextxim.c: (gtk_im_context_xim_new): Add
	missing const.
	* tests/testsocket.c: (add_child): Add cast so the printf format
	doesn't make us implicitly depend on what integer type
	gtk_socket_get_id returns.
	* tests/testtextbuffer.c: Add missing const.
	* tests/testtreefocus.c: (main): Remove unused local.
	* tests/treestoretest.c: (iter_remove): Remove unused local.
	(uppercase_value): Remove unused function.
	(make_window): Add statement to quiet the compiler's uninitialized
	variable warning.

5 files changed, 2 insertions, 5 deletions

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index bf972cb9a8..0188d8c2b8 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -874,7 +874,7 @@ gtk_image_expose (GtkWidget      *widget,
     {
       GtkImage *image;
       GtkMisc *misc;
-      GdkRectangle area, image_bound, intersection;
+      GdkRectangle area, image_bound;
       gint x, y;
       GdkBitmap *mask = NULL;
       GdkPixbuf *stock_pixbuf = NULL;
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 1268fb35a2..792ba27518 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -484,7 +484,7 @@ gtk_menu_bar_hierarchy_changed (GtkWidget *widget,
   toplevel = gtk_widget_get_toplevel (widget);
 
   if (old_toplevel)
-    remove_from_window (old_toplevel, GTK_MENU_BAR (menubar));
+    remove_from_window (GTK_WINDOW (old_toplevel), menubar);
   
   if (GTK_WIDGET_TOPLEVEL (toplevel))
     add_to_window (GTK_WINDOW (toplevel), menubar);
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 8439fce4a3..732677570e 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -314,7 +314,6 @@ gtk_settings_notify (GObject    *object,
 {
   guint property_id = pspec->param_id;
   gint double_click_time;
-  gchar *str_value;
   
 #if 1
   GValue tmp_value = { 0, };
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index a032eb7fad..df10e99232 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -643,7 +643,6 @@ gtk_statusbar_size_allocate  (GtkWidget     *widget,
   if (statusbar->has_resize_grip)
     {
       GdkRectangle rect;
-      GtkAllocation hbox_allocation;
       GtkRequisition saved_req;
       
       widget->allocation = *allocation; /* get_grip_rect needs this info */
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index b80f9ba565..5b59f10638 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -1129,7 +1129,6 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort,
   GtkTreeIter *parent_iter = NULL;
   GtkTreeIter iter;
   SortElt elt;
-  SortData sort_data;
 
   if (place)
     parent_iter = & (place->iter);