bell: Restore configurability.

Previously cinnamon took a signal from MetaDisplay to ding the
bell (when event-sounds were enabled). Now it's all contained
in muffin, we lost the ability to configure the bell sound.

Author: mtwebster

src/core/bell.c

@@ -75,6 +75,13 @@ prefs_changed_callback (MetaPreference pref,
       g_signal_emit (bell, bell_signals[IS_AUDIBLE_CHANGED], 0,
                      meta_prefs_bell_is_audible ());
     }
+  else
+  if (pref == META_PREF_BELL_SOUND)
+    {
+      g_clear_object (&bell->bell_sound_file);
+
+      bell->bell_sound_file = g_file_new_for_path (meta_prefs_get_bell_sound ());
+    }
 }
 
 static void
@@ -83,6 +90,7 @@ meta_bell_finalize (GObject *object)
   MetaBell *bell = META_BELL (object);
 
   meta_prefs_remove_listener (prefs_changed_callback, bell);
+  g_clear_object (&bell->bell_sound_file);
 
   G_OBJECT_CLASS (meta_bell_parent_class)->finalize (object);
 }
@@ -108,6 +116,7 @@ static void
 meta_bell_init (MetaBell *bell)
 {
   meta_prefs_add_listener (prefs_changed_callback, bell);
+  bell->bell_sound_file = g_file_new_for_path (meta_prefs_get_bell_sound ());
 }
 
 MetaBell *
@@ -187,10 +196,10 @@ bell_audible_notify (MetaDisplay *display,
   MetaSoundPlayer *player;
 
   player = meta_display_get_sound_player (display);
-  meta_sound_player_play_from_theme (player,
-                                     "bell-window-system",
-                                     _("Bell event"),
-                                     NULL);
+  meta_sound_player_play_from_file (player,
+                                    display->bell->bell_sound_file,
+                                    _("Bell event"),
+                                    NULL);
   return TRUE;
 }
 

src/core/bell.h

@@ -23,6 +23,8 @@
 struct _MetaBell
 {
   GObject parent;
+
+  GFile *bell_sound_file;
 };
 
 #define META_TYPE_BELL (meta_bell_get_type ())

src/core/prefs.c

@@ -140,6 +140,7 @@ static MetaX11BackgroundTransition background_transition = META_X11_BACKGROUND_T
 static gboolean unredirect_fullscreen_windows = FALSE;
 static gboolean tile_maximize = FALSE;
 static char *gtk_theme = NULL;
+static char *bell_sound = NULL;
 
 static void handle_preference_update_enum (GSettings *settings,
                                            gchar     *key);
@@ -529,6 +530,14 @@ static MetaStringPreference preferences_string[] =
       NULL,
       &gtk_theme,
     },
+    {
+      { "bell-sound",
+        SCHEMA_GENERAL,
+        META_PREF_BELL_SOUND,
+      },
+      NULL,
+      &bell_sound,
+    },
     { { NULL, 0, 0 }, NULL },
   };
 
@@ -1917,6 +1926,9 @@ meta_preference_to_string (MetaPreference pref)
 
     case META_PREF_GTK_THEME:
       return "GTK_THEME";
+
+    case META_PREF_BELL_SOUND:
+      return "BELL_SOUND";
     }
 
   return "(unknown)";
@@ -2435,3 +2447,9 @@ meta_prefs_get_min_win_opacity (void)
 {
   return min_window_opacity;
 }
+
+const char *
+meta_prefs_get_bell_sound (void)
+{
+    return bell_sound;
+}

src/meta/prefs.h

@@ -69,6 +69,7 @@
  * @META_PREF_DRAG_THRESHOLD: drag threshold
  * @META_PREF_LOCATE_POINTER: show pointer location
  * @META_PREF_GTK_THEME: gtk theme name
+ * @META_PREF_BELL_SOUND: sound to use for audible event bell
  */
 
 /* Keep in sync with GSettings schemas! */
@@ -117,7 +118,8 @@ typedef enum
   META_PREF_MIN_WIN_OPACITY,
   META_PREF_MOUSE_ZOOM_ENABLED,
   META_PREF_TILE_MAXIMIZE,
-  META_PREF_GTK_THEME
+  META_PREF_GTK_THEME,
+  META_PREF_BELL_SOUND
 } MetaPreference;
 
 typedef void (* MetaPrefsChangedFunc) (MetaPreference pref,
@@ -269,6 +271,9 @@ gboolean    meta_prefs_get_workspace_cycle (void);
 META_EXPORT
 gint meta_prefs_get_min_win_opacity (void);
 
+META_EXPORT
+const char* meta_prefs_get_bell_sound (void);
+
 /**
  * MetaKeyBindingAction:
  * @META_KEYBINDING_ACTION_NONE: FILLME