Merge pull request #383 from RichardHitt/warnings

Correct almost all compiler warning issues

5 files changed, 6 insertions, 15 deletions

diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index 2767fc52..a29a6fda 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -990,9 +990,9 @@ fe_set_inputbox_contents (session *sess, char *text)
 #ifndef WIN32
 
 static gboolean
-try_browser (const char *browser, const char *arg, const char *url)
+try_browser (const char *browser, char *arg, const char *url)
 {
-	const char *argv[4];
+	char *argv[4];
 	char *path;
 
 	path = g_find_program_in_path (browser);
@@ -1000,12 +1000,12 @@ try_browser (const char *browser, const char *arg, const char *url)
 		return 0;
 
 	argv[0] = path;
-	argv[1] = url;
+	argv[1] = (char *)url;
 	argv[2] = NULL;
 	if (arg)
 	{
 		argv[1] = arg;
-		argv[2] = url;
+		argv[2] = (char *)url;
 		argv[3] = NULL;
 	}
 	hexchat_execv (argv);
diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c
index 0484de83..d032cf48 100644
--- a/src/fe-gtk/gtkutil.c
+++ b/src/fe-gtk/gtkutil.c
@@ -388,7 +388,7 @@ fe_get_str (char *msg, char *def, void *callback, void *userdata)
 										NULL);
 	gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dialog)->vbox), TRUE);
 
-	if ((int) userdata == 1)	/* nick box is usually on the very bottom, make it centered */
+	if (userdata == (void *)1)	/* nick box is usually on the very bottom, make it centered */
 	{
 		gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
 	}
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index a5ea0b66..2796b381 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -881,14 +881,11 @@ static int ul_tag = 0;
 static gboolean
 mg_populate_userlist (session *sess)
 {
-	session_gui *gui;
-
 	if (!sess)
 		sess = current_tab;
 
 	if (is_session (sess))
 	{
-		gui = sess->gui;
 		if (sess->type == SESS_DIALOG)
 			mg_set_access_icon (sess->gui, NULL, sess->server->is_away);
 		else
diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
index 48a6c383..aab82a7e 100644
--- a/src/fe-gtk/sexy-spell-entry.c
+++ b/src/fe-gtk/sexy-spell-entry.c
@@ -191,7 +191,6 @@ sexy_spell_entry_class_init(SexySpellEntryClass *klass)
 	GObjectClass *gobject_class;
 	GtkObjectClass *object_class;
 	GtkWidgetClass *widget_class;
-	GtkEntryClass *entry_class;
 
 	initialize_enchant();
 
@@ -200,7 +199,6 @@ sexy_spell_entry_class_init(SexySpellEntryClass *klass)
 	gobject_class = G_OBJECT_CLASS(klass);
 	object_class  = GTK_OBJECT_CLASS(klass);
 	widget_class  = GTK_WIDGET_CLASS(klass);
-	entry_class   = GTK_ENTRY_CLASS(klass);
 
 	if (have_enchant)
 		klass->word_check = default_word_check;
@@ -695,10 +693,6 @@ sexy_spell_entry_finalize(GObject *obj)
 static void
 sexy_spell_entry_destroy(GtkObject *obj)
 {
-	SexySpellEntry *entry;
-
-	entry = SEXY_SPELL_ENTRY(obj);
-
 	if (GTK_OBJECT_CLASS(parent_class)->destroy)
 		GTK_OBJECT_CLASS(parent_class)->destroy(obj);
 }
diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c
index e2dc2b7c..6005e265 100644
--- a/src/fe-gtk/xtext.c
+++ b/src/fe-gtk/xtext.c
@@ -3729,13 +3729,13 @@ static void
 shade_image (GdkVisual *visual, void *data, int bpl, int bpp, int w, int h,
 				 int rm, int gm, int bm, int bg, int depth)
 {
+#ifdef USE_MMX
 	int bg_r, bg_g, bg_b;
 
 	bg_r = bg & visual->red_mask;
 	bg_g = bg & visual->green_mask;
 	bg_b = bg & visual->blue_mask;
 
-#ifdef USE_MMX
 	/* the MMX routines are about 50% faster at 16-bit. */
 	/* only use MMX routines with a pure black background */
 	if (bg_r == 0 && bg_g == 0 && bg_b == 0 && have_mmx ())	/* do a runtime check too! */