summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2007-01-04 14:48:03 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-01-04 14:48:03 +0000
commit07ed18bf4963e4388068d675f27d12291a9df873 (patch)
treef9310e5bf85ddce0b4a3fdcc2c072296044a71e1
parent50cccdc0b898552e5df6ea1a7df790203872f244 (diff)
downloadgdk-pixbuf-07ed18bf4963e4388068d675f27d12291a9df873.tar.gz
Fix some compiler warnings.
2007-01-04 Matthias Clasen <mclasen@redhat.com> * demos/gtk-demo/textscroll.c: * gtk/gtkiconview.c: * gtk/gtkicontheme.c: * gtk/gtkhandlebox.c: * gtk/gtkfilechooserentry.c: * gtk/gtkentrycompletion.c: * gtk/gtkcolorsel.c: Fix some compiler warnings. svn path=/branches/gtk-2-10/; revision=17064
-rw-r--r--ChangeLog10
-rw-r--r--demos/gtk-demo/textscroll.c2
-rw-r--r--gtk/gtkcolorsel.c3
-rw-r--r--gtk/gtkentrycompletion.c2
-rw-r--r--gtk/gtkfilechooserentry.c2
-rw-r--r--gtk/gtkhandlebox.c3
-rw-r--r--gtk/gtkicontheme.c2
-rw-r--r--gtk/gtkiconview.c1
8 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 26ff6e0f8..613111c05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-04 Matthias Clasen <mclasen@redhat.com>
+
+ * demos/gtk-demo/textscroll.c:
+ * gtk/gtkiconview.c:
+ * gtk/gtkicontheme.c:
+ * gtk/gtkhandlebox.c:
+ * gtk/gtkfilechooserentry.c:
+ * gtk/gtkentrycompletion.c:
+ * gtk/gtkcolorsel.c: Fix some compiler warnings.
+
2007-01-03 Matthias Clasen <mclasen@redhat.com>
* NEWS: Updates
diff --git a/demos/gtk-demo/textscroll.c b/demos/gtk-demo/textscroll.c
index 063322141..4dec2b4f6 100644
--- a/demos/gtk-demo/textscroll.c
+++ b/demos/gtk-demo/textscroll.c
@@ -109,7 +109,6 @@ setup_scroll (GtkTextView *textview,
{
GtkTextBuffer *buffer;
GtkTextIter iter;
- GtkTextMark *mark;
buffer = gtk_text_view_get_buffer (textview);
gtk_text_buffer_get_end_iter (buffer, &iter);
@@ -179,7 +178,6 @@ do_textscroll (GtkWidget *do_widget)
if (!window)
{
GtkWidget *hbox;
- GtkWidget *swindow;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
g_signal_connect (window, "destroy",
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 9b21d3258..8c5520c01 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -788,6 +788,7 @@ palette_change_color (GtkWidget *drawing_area,
gdk_color.red = UNSCALE (color[0]);
gdk_color.green = UNSCALE (color[1]);
gdk_color.blue = UNSCALE (color[2]);
+ gdk_color.pixel = 0;
x = 0;
y = 0; /* Quiet GCC */
@@ -1442,7 +1443,7 @@ get_screen_color (GtkWidget *button)
gtk_widget_add_events (grab_widget,
GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK);
- toplevel = gtk_widget_get_toplevel (colorsel);
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (colorsel));
if (GTK_IS_WINDOW (toplevel))
{
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index e779cf3c1..474b65764 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -832,7 +832,7 @@ gtk_entry_completion_action_button_press (GtkWidget *widget,
if (!GTK_WIDGET_MAPPED (completion->priv->popup_window))
return FALSE;
- _gtk_entry_reset_im_context (completion->priv->entry);
+ _gtk_entry_reset_im_context (GTK_ENTRY (completion->priv->entry));
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
event->x, event->y,
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 4beaf1a79..919da3469 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -646,8 +646,6 @@ out:
static gboolean
load_directory_callback (GtkFileChooserEntry *chooser_entry)
{
- GSList *child_paths = NULL;
-
GDK_THREADS_ENTER ();
chooser_entry->load_directory_idle = 0;
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 53e761940..43a7edd79 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -923,6 +923,9 @@ gtk_handle_box_paint (GtkWidget *widget,
rect.height = DRAG_HANDLE_SIZE;
handle_orientation = GTK_ORIENTATION_HORIZONTAL;
break;
+ default:
+ g_assert_not_reached ();
+ break;
}
if (gdk_rectangle_intersect (event ? &event->area : area, &rect, &dest))
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 757b57e4f..7a9072a80 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -877,7 +877,7 @@ insert_theme (GtkIconTheme *icon_theme, const char *theme_name)
char **dirs;
char **themes;
GtkIconThemePrivate *priv;
- IconTheme *theme;
+ IconTheme *theme = NULL;
char *path;
GKeyFile *theme_file;
GError *error = NULL;
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 2991ef561..0365d6d8f 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -8923,7 +8923,6 @@ gtk_icon_view_accessible_is_child_selected (AtkSelection *selection,
GtkWidget *widget;
GtkIconView *icon_view;
GtkIconViewItem *item;
- GList *l;
widget = GTK_ACCESSIBLE (selection)->widget;
if (widget == NULL)