Blame SOURCES/pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
|
 |
4133dc |
diff -urN pidgin-2.5.2.orig/pidgin/gtksound.c pidgin-2.5.2/pidgin/gtksound.c
|
|
|
4133dc |
--- pidgin-2.5.2.orig/pidgin/gtksound.c 2008-07-13 22:05:38.000000000 -0400
|
|
|
4133dc |
+++ pidgin-2.5.2/pidgin/gtksound.c 2008-11-22 13:36:54.000000000 -0500
|
|
|
4133dc |
@@ -298,6 +298,9 @@
|
|
|
4133dc |
purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/mute", FALSE);
|
|
|
4133dc |
purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/command", "");
|
|
|
4133dc |
purple_prefs_add_string(PIDGIN_PREFS_ROOT "/sound/method", "automatic");
|
|
|
4133dc |
+#ifndef USE_GSTREAMER
|
|
|
4133dc |
+ purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/rhel4migrated", FALSE);
|
|
|
4133dc |
+#endif
|
|
|
4133dc |
purple_prefs_add_int(PIDGIN_PREFS_ROOT "/sound/volume", 50);
|
|
|
4133dc |
|
|
|
4133dc |
#ifdef USE_GSTREAMER
|
|
|
4133dc |
@@ -433,6 +436,19 @@
|
|
|
4133dc |
return;
|
|
|
4133dc |
}
|
|
|
4133dc |
|
|
|
4133dc |
+#ifndef USE_GSTREAMER
|
|
|
4133dc |
+ /* RHEL4 migration code */
|
|
|
4133dc |
+ if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/rhel4migrated")) {
|
|
|
4133dc |
+ purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/sound/rhel4migrated", TRUE);
|
|
|
4133dc |
+ if(!strcmp(method, "automatic") ||
|
|
|
4133dc |
+ !strcmp(method, "esd") ||
|
|
|
4133dc |
+ !strcmp(method, "arts")) {
|
|
|
4133dc |
+ purple_prefs_set_string(PIDGIN_PREFS_ROOT "/sound/method", "custom");
|
|
|
4133dc |
+ purple_prefs_set_path(PIDGIN_PREFS_ROOT "/sound/command", "aplay %s");
|
|
|
4133dc |
+ }
|
|
|
4133dc |
+ }
|
|
|
4133dc |
+#endif
|
|
|
4133dc |
+
|
|
|
4133dc |
#ifndef _WIN32
|
|
|
4133dc |
if (!strcmp(method, "custom")) {
|
|
|
4133dc |
const char *sound_cmd;
|