From f83d78dd2801c7e4bee406379d3119f8852cf297 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 19 Jul 2014 13:36:13 +1000 Subject: Warning cleanup - ignoring const - declarations after statements - some C files didnt include own headers (risking them getting out of sync) Closes #1064 --- src/fe-gtk/chanview-tabs.c | 3 ++- src/fe-gtk/plugin-tray.c | 3 ++- src/fe-gtk/xtext.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/fe-gtk') diff --git a/src/fe-gtk/chanview-tabs.c b/src/fe-gtk/chanview-tabs.c index 8f940c24..32039d6d 100644 --- a/src/fe-gtk/chanview-tabs.c +++ b/src/fe-gtk/chanview-tabs.c @@ -62,12 +62,13 @@ cv_tabs_sizerequest (GtkWidget *viewport, GtkRequisition *requisition, chanview static void cv_tabs_sizealloc (GtkWidget *widget, GtkAllocation *allocation, chanview *cv) { + GdkWindow *parent_win; GtkAdjustment *adj; GtkWidget *inner; gint viewport_size; inner = ((tabview *)cv)->inner; - GdkWindow *parent_win = gtk_widget_get_window (gtk_widget_get_parent (inner)); + parent_win = gtk_widget_get_window (gtk_widget_get_parent (inner)); if (cv->vertical) { diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index b3e34c0a..3cd6502d 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -186,9 +186,10 @@ fe_tray_set_balloon (const char *title, const char *text) if (!notify_is_initted()) { + GList* server_caps; notify_init(PACKAGE_NAME); - GList* server_caps = notify_get_server_caps (); + server_caps = notify_get_server_caps (); if (g_list_find_custom (server_caps, "body-markup", (GCompareFunc)strcmp)) { notify_text_strip_flags |= STRIP_ESCMARKUP; diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c index 7b0e64c6..63b87ce8 100644 --- a/src/fe-gtk/xtext.c +++ b/src/fe-gtk/xtext.c @@ -3257,7 +3257,7 @@ gtk_xtext_render_stamp (GtkXText * xtext, textentry * ent, { textentry tmp_ent; int jo, ji, hs; - int xsize, y; + int xsize, y, emphasis; /* trashing ent here, so make a backup first */ memcpy (&tmp_ent, ent, sizeof (tmp_ent)); @@ -3267,7 +3267,7 @@ gtk_xtext_render_stamp (GtkXText * xtext, textentry * ent, xtext->jump_out_offset = 0; xtext->jump_in_offset = 0; xtext->hilight_start = 0xffff; /* temp disable */ - int emphasis = 0; + emphasis = 0; if (xtext->mark_stamp) { -- cgit 1.4.1