pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16168] trunk/src/gtksound.c

[<rl...@us...>]

Revision: 16168
Author:   rlaager
Date:     2006-05-09 18:27:51 -0700 (Tue, 09 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16168&view=rev

Log Message:
-----------
Remove the expire_old_child static function, since it's not used:
gtksound.c:344: warning: ?\226?\128?\152expire_old_child?\226?\128?\153 defined but not used

Modified Paths:
--------------
    trunk/src/gtksound.c
Modified: trunk/src/gtksound.c
===================================================================
--- trunk/src/gtksound.c	2006-05-09 17:38:37 UTC (rev 16167)
+++ trunk/src/gtksound.c	2006-05-10 01:27:51 UTC (rev 16168)
@@ -340,23 +340,6 @@
 
 #ifdef USE_GSTREAMER
 static gboolean
-expire_old_child(gpointer data)
-{
-	int ret;
-	pid_t pid = GPOINTER_TO_INT(data);
-
-	ret = waitpid(pid, NULL, WNOHANG | WUNTRACED);
-
-	if(ret == 0) {
-		if(kill(pid, SIGKILL) < 0)
-			gaim_debug_error("gtksound", "Killing process %d failed (%s)\n",
-							 pid, strerror(errno));
-	}
-
-    return FALSE; /* do not run again */
-}
-
-static gboolean
 bus_call (GstBus     *bus,
 	  GstMessage *msg,
   	  gpointer    data)


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

[Gaim-commits] SF.net SVN: gaim: [16206] trunk/src/gtksound.c

[<sea...@us...>]

Revision: 16206
Author:   seanegan
Date:     2006-05-30 10:02:27 -0700 (Tue, 30 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16206&view=rev

Log Message:
-----------
We don't really need to pop up an error if the sound file doesn't exist

Modified Paths:
--------------
    trunk/src/gtksound.c
Modified: trunk/src/gtksound.c
===================================================================
--- trunk/src/gtksound.c	2006-05-30 01:31:13 UTC (rev 16205)
+++ trunk/src/gtksound.c	2006-05-30 17:02:27 UTC (rev 16206)
@@ -392,12 +392,8 @@
 		return;
 	}
 
-	if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
-		char *tmp = g_strdup_printf(_("Unable to play sound because the chosen file (%s) does not exist."), filename);
-		gaim_notify_error(NULL, NULL, tmp, NULL);
-		g_free(tmp);
+	if (!g_file_test(filename, G_FILE_TEST_EXISTS))
 		return;
-	}
 
 #ifndef _WIN32
 	if (!strcmp(method, "custom")) {


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

[Gaim-commits] SF.net SVN: gaim: [16207] trunk/src/gtksound.c

[<sea...@us...>]

Revision: 16207
Author:   seanegan
Date:     2006-05-30 11:17:34 -0700 (Tue, 30 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16207&view=rev

Log Message:
-----------
Actually, stick it in Debug

Modified Paths:
--------------
    trunk/src/gtksound.c
Modified: trunk/src/gtksound.c
===================================================================
--- trunk/src/gtksound.c	2006-05-30 17:02:27 UTC (rev 16206)
+++ trunk/src/gtksound.c	2006-05-30 18:17:34 UTC (rev 16207)
@@ -392,8 +392,12 @@
 		return;
 	}
 
-	if (!g_file_test(filename, G_FILE_TEST_EXISTS))
+	if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
+		char *tmp = g_strdup_printf("sound file (%s) does not exist.\n", filename);
+		gaim_debug_error("gtksound", tmp);
+		g_free(tmp);
 		return;
+	}
 
 #ifndef _WIN32
 	if (!strcmp(method, "custom")) {
@@ -404,10 +408,9 @@
 		sound_cmd = gaim_prefs_get_string("/gaim/gtk/sound/command");
 
 		if (!sound_cmd || *sound_cmd == '\0') {
-			gaim_notify_error(NULL, NULL,
-							  _("Unable to play sound because the "
-								"'Command' sound method has been chosen, "
-								"but no command has been set."), NULL);
+			gaim_debug_error("gtksound",
+					 "'Command' sound method has been chosen, "
+					 "but no command has been set.");
 			return;
 		}
 
@@ -417,8 +420,8 @@
 			command = g_strdup_printf("%s %s", sound_cmd, filename);
 
 		if(!g_spawn_command_line_async(command, &error)) {
-			char *tmp = g_strdup_printf(_("Unable to play sound because the configured sound command could not be launched: %s"), error->message);
-			gaim_notify_error(NULL, NULL, tmp, NULL);
+			char *tmp = g_strdup_printf("sound command could not be launched: %s\n", error->message);
+			gaim_debug_error("gtksound", tmp);
 			g_free(tmp);
 			g_error_free(error);
 		}


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

[Gaim-commits] SF.net SVN: gaim: [16209] trunk/src/gtksound.c

[<rl...@us...>]

Revision: 16209
Author:   rlaager
Date:     2006-05-30 15:21:00 -0700 (Tue, 30 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16209&view=rev

Log Message:
-----------
SimGuy pointed out that the gaim_debug functions take format strings.

Modified Paths:
--------------
    trunk/src/gtksound.c
Modified: trunk/src/gtksound.c
===================================================================
--- trunk/src/gtksound.c	2006-05-30 19:42:16 UTC (rev 16208)
+++ trunk/src/gtksound.c	2006-05-30 22:21:00 UTC (rev 16209)
@@ -393,9 +393,7 @@
 	}
 
 	if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
-		char *tmp = g_strdup_printf("sound file (%s) does not exist.\n", filename);
-		gaim_debug_error("gtksound", tmp);
-		g_free(tmp);
+		gaim_debug_error("gtksound", "sound file (%s) does not exist.\n", filename);
 		return;
 	}
 


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