SF.net SVN: geany:[5949] trunk/src

[colombanw at users.sourceforge.net]

Revision: 5949
          http://geany.svn.sourceforge.net/geany/?rev=5949&view=rev
Author:   colombanw
Date:     2011-09-22 18:04:03 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Fix a few warnings

Modified Paths:
--------------
    trunk/src/about.c
    trunk/src/stash.c
    trunk/src/symbols.c

Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c	2011-09-22 16:11:53 UTC (rev 5948)
+++ trunk/src/about.c	2011-09-22 18:04:03 UTC (rev 5949)
@@ -233,7 +233,7 @@
 	box = gtk_hbutton_box_new();
 	url_button = gtk_button_new();
 	gtk_button_set_relief(GTK_BUTTON(url_button), GTK_RELIEF_NONE);
-	g_signal_connect(url_button, "clicked", G_CALLBACK(homepage_clicked), GEANY_HOMEPAGE);
+	g_signal_connect(url_button, "clicked", G_CALLBACK(homepage_clicked), (gpointer)GEANY_HOMEPAGE);
 	label = gtk_label_new(NULL);
 	gtk_label_set_text(GTK_LABEL(label), GEANY_HOMEPAGE);
 	gtk_widget_show(label);

Modified: trunk/src/stash.c
===================================================================
--- trunk/src/stash.c	2011-09-22 16:11:53 UTC (rev 5948)
+++ trunk/src/stash.c	2011-09-22 18:04:03 UTC (rev 5949)
@@ -210,11 +210,11 @@
 		case SETTING_WRITE:
 		{
 			/* don't try to save a NULL string vector */
-			gchar *dummy[] = { "", NULL };
-			gchar **strv = *setting ? *setting : dummy;
+			const gchar *dummy[] = { "", NULL };
+			const gchar **strv = *setting ? (const gchar **)*setting : dummy;
 
 			g_key_file_set_string_list(config, group->name, se->key_name,
-				(const gchar**)strv, g_strv_length(strv));
+				strv, g_strv_length((gchar **)strv));
 			break;
 		}
 	}

Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2011-09-22 16:11:53 UTC (rev 5948)
+++ trunk/src/symbols.c	2011-09-22 18:04:03 UTC (rev 5949)
@@ -2141,12 +2141,12 @@
 	symbol_menu.expand_all = item = ui_image_menu_item_new(GTK_STOCK_ADD, _("_Expand All"));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
-	g_signal_connect(item, "activate", G_CALLBACK(on_expand_collapse), GTK_STOCK_ADD);
+	g_signal_connect(item, "activate", G_CALLBACK(on_expand_collapse), (gpointer)GTK_STOCK_ADD);
 
 	symbol_menu.collapse_all = item = ui_image_menu_item_new(GTK_STOCK_REMOVE, _("_Collapse All"));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
-	g_signal_connect(item, "activate", G_CALLBACK(on_expand_collapse), GTK_STOCK_REMOVE);
+	g_signal_connect(item, "activate", G_CALLBACK(on_expand_collapse), (gpointer)GTK_STOCK_REMOVE);
 
 	item = gtk_separator_menu_item_new();
 	gtk_widget_show(item);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.