summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.cvsignore1
-rw-r--r--ChangeLog36
-rw-r--r--ChangeLog.pre-2-036
-rw-r--r--ChangeLog.pre-2-1036
-rw-r--r--ChangeLog.pre-2-236
-rw-r--r--ChangeLog.pre-2-436
-rw-r--r--ChangeLog.pre-2-636
-rw-r--r--ChangeLog.pre-2-836
-rw-r--r--demos/pixbuf-demo.c2
-rw-r--r--demos/testpixbuf-scale.c1
-rw-r--r--gdk/gdkkeys.c13
-rw-r--r--gdk/x11/gdkfont-x11.c4
-rw-r--r--gdk/x11/gdkmain-x11.c1
-rw-r--r--gdk/x11/gdkpango-x11.c2
-rw-r--r--gdk/x11/gdkselection-x11.c4
-rw-r--r--gtk/gtkimage.c2
-rw-r--r--gtk/gtkmenubar.c2
-rw-r--r--gtk/gtksettings.c1
-rw-r--r--gtk/gtkstatusbar.c1
-rw-r--r--gtk/gtktreemodelsort.c1
-rw-r--r--modules/input/gtkimcontextxim.c2
-rw-r--r--tests/testsocket.c2
-rw-r--r--tests/testtextbuffer.c2
-rw-r--r--tests/testtreefocus.c1
-rw-r--r--tests/treestoretest.c15
25 files changed, 266 insertions, 43 deletions
diff --git a/.cvsignore b/.cvsignore
index 7d1327f8f0..ef55b6d1d3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -31,3 +31,4 @@ gdk-pixbuf-2.0-uninstalled.pc
missing
install-sh
mkinstalldirs
+sgml
diff --git a/ChangeLog b/ChangeLog
index 979fd127d3..83656ef0a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2001-07-17 Darin Adler <darin@bentspoon.com>
+
+ * .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.
+
Sat Jul 14 12:47:35 2001 Tim Janik <timj@gtk.org>
* gtk/gtkrange.c:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 979fd127d3..83656ef0a3 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,39 @@
+2001-07-17 Darin Adler <darin@bentspoon.com>
+
+ * .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.
+
Sat Jul 14 12:47:35 2001 Tim Janik <timj@gtk.org>
* gtk/gtkrange.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 979fd127d3..83656ef0a3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,39 @@
+2001-07-17 Darin Adler <darin@bentspoon.com>
+
+ * .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.
+
Sat Jul 14 12:47:35 2001 Tim Janik <timj@gtk.org>
* gtk/gtkrange.c:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 979fd127d3..83656ef0a3 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,39 @@
+2001-07-17 Darin Adler <darin@bentspoon.com>
+
+ * .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.
+
Sat Jul 14 12:47:35 2001 Tim Janik <timj@gtk.org>
* gtk/gtkrange.c:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 979fd127d3..83656ef0a3 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,39 @@
+2001-07-17 Darin Adler <darin@bentspoon.com>
+
+ * .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.
+
Sat Jul 14 12:47:35 2001 Tim Janik <timj@gtk.org>
* gtk/gtkrange.c:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 979fd127d3..83656ef0a3 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,39 @@
+2001-07-17 Darin Adler <darin@bentspoon.com>
+
+ * .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.
+
Sat Jul 14 12:47:35 2001 Tim Janik <timj@gtk.org>
* gtk/gtkrange.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 979fd127d3..83656ef0a3 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,39 @@
+2001-07-17 Darin Adler <darin@bentspoon.com>
+
+ * .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.
+
Sat Jul 14 12:47:35 2001 Tim Janik <timj@gtk.org>
* gtk/gtkrange.c:
diff --git a/demos/pixbuf-demo.c b/demos/pixbuf-demo.c
index 641bdf3468..11b5e1a15f 100644
--- a/demos/pixbuf-demo.c
+++ b/demos/pixbuf-demo.c
@@ -213,7 +213,7 @@ main (int argc, char **argv)
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_widget_set_usize (window, back_width, back_height);
- gtk_window_set_policy (GTK_WINDOW (window), FALSE, FALSE, FALSE);
+ gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
GTK_SIGNAL_FUNC (destroy_cb), NULL);
diff --git a/demos/testpixbuf-scale.c b/demos/testpixbuf-scale.c
index 68b57a5bca..d2c318d2b2 100644
--- a/demos/testpixbuf-scale.c
+++ b/demos/testpixbuf-scale.c
@@ -1,6 +1,7 @@
#include <gtk/gtk.h>
#include <stdio.h>
+#include <stdlib.h>
GdkInterpType interp_type = GDK_INTERP_BILINEAR;
int overall_alpha = 255;
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index c978d62f3a..86c13ccc36 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -34,7 +34,6 @@ enum {
static void gdk_keymap_init (GdkKeymap *keymap);
static void gdk_keymap_class_init (GdkKeymapClass *klass);
-static void gdk_keymap_finalize (GObject *object);
static gpointer parent_class = NULL;
@@ -81,8 +80,6 @@ gdk_keymap_class_init (GdkKeymapClass *klass)
parent_class = g_type_class_peek_parent (klass);
- object_class->finalize = gdk_keymap_finalize;
-
signals[DIRECTION_CHANGED] =
g_signal_new ("direction_changed",
G_OBJECT_CLASS_TYPE (object_class),
@@ -94,16 +91,6 @@ gdk_keymap_class_init (GdkKeymapClass *klass)
0);
}
-static void
-gdk_keymap_finalize (GObject *object)
-{
- GdkKeymap *keymap = GDK_KEYMAP (object);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-
-
/* Other key-handling stuff
*/
diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c
index 63de7162dd..1f4b76c1c7 100644
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -137,7 +137,7 @@ gdk_font_load (const gchar *font_name)
}
static char *
-gdk_font_charset_for_locale ()
+gdk_font_charset_for_locale (void)
{
static char *charset_map[][2] = {
{ "ANSI_X3.4-1968", "iso8859-1" },
@@ -154,7 +154,7 @@ gdk_font_charset_for_locale ()
{ "UTF-8", "iso8859-1" }
};
- char *codeset;
+ const char *codeset;
char *result = NULL;
int i;
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 188c64cfa0..53c75e4d81 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -170,7 +170,6 @@ _gdk_windowing_init_check (int argc, char **argv)
{
gint xkb_major = XkbMajorVersion;
gint xkb_minor = XkbMinorVersion;
- gint xkb_event_type;
if (XkbLibraryVersion (&xkb_major, &xkb_minor))
{
xkb_major = XkbMajorVersion;
diff --git a/gdk/x11/gdkpango-x11.c b/gdk/x11/gdkpango-x11.c
index 09e44f4450..3900de59be 100644
--- a/gdk/x11/gdkpango-x11.c
+++ b/gdk/x11/gdkpango-x11.c
@@ -34,7 +34,7 @@ gdk_pango_context_get (void)
static gint use_xft = -1;
if (use_xft == -1)
{
- char *val = g_getenv ("GDK_USE_XFT");
+ const char *val = g_getenv ("GDK_USE_XFT");
use_xft = val && (atoi (val) != 0);
}
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index 8ca9389834..b52bf2f102 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -414,7 +414,7 @@ gdk_text_property_to_utf8_list (GdkAtom encoding,
gchar **local_list;
gint local_count;
gint i;
- gchar *charset = NULL;
+ const gchar *charset = NULL;
gboolean need_conversion = !g_get_charset (&charset);
gint count = 0;
GError *error = NULL;
@@ -598,7 +598,7 @@ gdk_utf8_to_compound_text (const gchar *str,
gint *length)
{
gboolean need_conversion;
- gchar *charset;
+ const gchar *charset;
gchar *locale_str, *tmp_str;
GError *error = NULL;
gboolean result;
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);
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 6f4e4f4a0a..2da314c81e 100644
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -258,7 +258,7 @@ gtk_im_context_xim_new (void)
{
GtkXIMInfo *info;
GtkIMContextXIM *result;
- gchar *charset;
+ const gchar *charset;
info = get_im (setlocale (LC_CTYPE, NULL));
if (!info)
diff --git a/tests/testsocket.c b/tests/testsocket.c
index 55d0afa980..de143b3e5a 100644
--- a/tests/testsocket.c
+++ b/tests/testsocket.c
@@ -206,7 +206,7 @@ add_child (GtkWidget *window,
socket = create_socket ();
gtk_box_pack_start (GTK_BOX (vbox), socket->box, TRUE, TRUE, 0);
gtk_widget_show (socket->box);
- sprintf(buffer, "%#lx", gtk_socket_get_id (GTK_SOCKET (socket->socket)));
+ sprintf(buffer, "%#lx", (gulong) gtk_socket_get_id (GTK_SOCKET (socket->socket)));
argv[1] = buffer;
}
diff --git a/tests/testtextbuffer.c b/tests/testtextbuffer.c
index a5525a5c14..0bf1a25e18 100644
--- a/tests/testtextbuffer.c
+++ b/tests/testtextbuffer.c
@@ -551,7 +551,7 @@ run_tests (GtkTextBuffer *buffer)
}
-static char *book_closed_xpm[] = {
+static const char *book_closed_xpm[] = {
"16 16 6 1",
" c None s None",
". c black",
diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index adf43f6915..705468e1ea 100644
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -309,7 +309,6 @@ main (int argc, char *argv[])
GtkCellRenderer *renderer;
gint col_offset;
GtkTreeViewColumn *column;
- GtkTreeSelection *selection;
gtk_init (&argc, &argv);
diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index 0c966d76a3..e930593100 100644
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -38,7 +38,6 @@ static void
iter_remove (GtkWidget *button, GtkTreeView *tree_view)
{
GtkTreeIter selected;
- GtkTreeIter s_selected;
GtkTreeModel *model;
model = gtk_tree_view_get_model (tree_view);
@@ -201,19 +200,6 @@ iter_append (GtkWidget *button, GtkTreeView *tree_view)
}
static void
-uppercase_value (const GValue *src, GValue *dest, gpointer data)
-{
- gchar *str;
-
- g_value_init (dest, G_TYPE_STRING);
- str = g_strdup (g_value_get_string (src));
- if (str)
- g_strup (str);
- g_value_set_string (dest, str);
- g_free (str);
-}
-
-static void
make_window (gint view_type)
{
GtkWidget *window;
@@ -257,6 +243,7 @@ make_window (gint view_type)
break;
default:
g_assert_not_reached ();
+ tree_view = NULL; /* Quiet compiler */
break;
}
View Lorry Controller Status