Mercurial > audlegacy

changeset 314:31725d73a697 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] Squash the implicit declaration warnings by including the correct util.h
author chainsaw
date Sat, 17 Dec 2005 14:59:54 -0800
parents 5a20f229ece6
children 3a2771d4140e
files Plugins/Visualization/libvisual-proxy/lv_bmp_config.c Plugins/Visualization/libvisual-proxy/lv_bmp_config.h Plugins/Visualization/libvisual-proxy/main.c
diffstat 3 files changed, 13 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Visualization/libvisual-proxy/lv_bmp_config.c	Sat Dec 17 13:51:17 2005 -0800
+++ b/Plugins/Visualization/libvisual-proxy/lv_bmp_config.c	Sat Dec 17 14:59:54 2005 -0800
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <libaudacious/configfile.h>
-#include <audacious/util.h>
+#include <libaudacious/util.h>
 #include <libvisual/libvisual.h>
 #include <glib/gi18n.h>
 
@@ -171,7 +171,7 @@
 					" morph plugin instead.\n"
 					"If you want another one, please choose it\n"
 					"on the configure dialog."),
-					_("Accept"), TRUE, dummy, NULL);
+					_("Accept"), TRUE, GTK_SIGNAL_FUNC(dummy), NULL);
 		gtk_widget_show (msg);
 		strcpy (morph_plugin_buffer, CONFIG_DEFAULT_MORPH_PLUGIN);
 	}
@@ -243,7 +243,7 @@
 	xmms_cfg_write_string (f, "libvisual_bmp", "version", VERSION);
 
 	if (options.last_plugin != NULL && (strlen(options.last_plugin) > 0))
-		xmms_cfg_write_string (f, "libvisual_bmp", "last_plugin", options.last_plugin);
+		xmms_cfg_write_string (f, "libvisual_bmp", "last_plugin", GTK_SIGNAL_FUNC(options.last_plugin));
 	else
 		xmms_cfg_write_string (f, "libvisual_bmp", "last_plugin", CONFIG_DEFAULT_ACTOR_PLUGIN);
 
@@ -516,7 +516,7 @@
 	visual_log_return_if_fail (enabled != NULL);
 
 	gtk_signal_disconnect_by_func (GTK_OBJECT (config_win->checkbutton_vis_plugin),
-					on_checkbutton_vis_plugin_toggled, NULL);
+					GTK_SIGNAL_FUNC(on_checkbutton_vis_plugin_toggled), NULL);
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (config_win->checkbutton_vis_plugin), *enabled);	
 
@@ -617,7 +617,7 @@
 				current_actor->info->about, "\n",
 				_("Author: "), current_actor->info->author, "\n\n",
 				current_actor->info->help, 0);
-	msgwin = xmms_show_message (PACKAGE_NAME, msg, _("Accept"), TRUE, dummy, NULL);
+	msgwin = xmms_show_message (PACKAGE_NAME, msg, _("Accept"), TRUE, GTK_SIGNAL_FUNC(dummy), NULL);
 	gtk_widget_show (msgwin);
 	g_free (msg);
 }
@@ -680,7 +680,7 @@
 					PACKAGE_NAME " cannot be initialized.\n"
 					"Please visit http://libvisual.sf.net to\n"
 					"to get some nice plugins."),
-					_("Accept"), TRUE, dummy, NULL);
+					_("Accept"), TRUE, GTK_SIGNAL_FUNC(dummy), NULL);
 		return -1;
 	}
 
@@ -850,7 +850,7 @@
 					_("There are no morph plugins, so switching\n"
 					"between visualization plugins will be do it\n"
 					"without any morphing."),
-					_("Accept"), TRUE, dummy, NULL);
+					_("Accept"), TRUE, GTK_SIGNAL_FUNC(dummy), NULL);
 		return -1;
 	}
 	index = 0;
@@ -904,7 +904,7 @@
 					_("There are no morph plugins, so switching\n"
 					"between visualization plugins will be do it\n"
 					"without any morphing."),
-					_("Accept"), TRUE, dummy, NULL);
+					_("Accept"), TRUE, GTK_SIGNAL_FUNC(dummy), NULL);
 		return -1;
 	}
 	item = NULL;
@@ -946,7 +946,7 @@
 					_("Author: "), morph->info->author, "\n\n",
 					morph->info->help, 0);
 			msgwin = xmms_show_message (PACKAGE_NAME, msg,
-					_("Accept"), TRUE, dummy, NULL);
+					_("Accept"), TRUE, GTK_SIGNAL_FUNC(dummy), NULL);
 			gtk_widget_show (msgwin);
 			g_free (msg);
 			break;
@@ -1050,7 +1050,7 @@
 			msg = xmms_show_message (PACKAGE_NAME,
 					_("We cannot initialize Libvisual library.\n"
 					"Libvisual is necessary for this plugin to work."),
-					_("Accept"), TRUE, dummy, NULL);
+					_("Accept"), TRUE, GTK_SIGNAL_FUNC(dummy), NULL);
 			gtk_widget_show (msg);
         		g_free (argv[0]);
 		        g_free (argv);
--- a/Plugins/Visualization/libvisual-proxy/lv_bmp_config.h	Sat Dec 17 13:51:17 2005 -0800
+++ b/Plugins/Visualization/libvisual-proxy/lv_bmp_config.h	Sat Dec 17 14:59:54 2005 -0800
@@ -15,7 +15,7 @@
 typedef struct {
 
 	const gchar *last_plugin;	/**< Name of the last plugin runned,
-				  with length < OPTIONS_MAX_NAME_LEN. */
+					  with length < OPTIONS_MAX_NAME_LEN. */
 
 	gchar *morph_plugin; /**< */
 	
--- a/Plugins/Visualization/libvisual-proxy/main.c	Sat Dec 17 13:51:17 2005 -0800
+++ b/Plugins/Visualization/libvisual-proxy/main.c	Sat Dec 17 14:59:54 2005 -0800
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include <audacious/plugin.h>
-#include <audacious/util.h>
+#include <libaudacious/util.h>
 #include <libaudacious/beepctrl.h>
 
 #include <SDL.h>
@@ -107,7 +107,6 @@
 {
         char **argv;
         int argc;
-	int ret;
 	gchar *msg;
 	GtkWidget *msgwin;
 
@@ -142,7 +141,7 @@
 					SDL_GetError(),
 					"\n\n", PACKAGE_NAME,
 					_(" will not be loaded."), 0);
-		msgwin = xmms_show_message ("libvisual-proxy", msg, _("Accept"), TRUE, dummy, NULL);
+		msgwin = xmms_show_message ("libvisual-proxy", msg, _("Accept"), TRUE, GTK_SIGNAL_FUNC(dummy), NULL);
 		gtk_widget_show (msgwin);
 		g_free (msg);
 		return;