Merge branch 'sasl'

[empathy.git] / libempathy-gtk / empathy-sound-manager.c

diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c
index 87118e1920556fbbbf23a5d5eac8a4daa8dce43a..afa27bed43ca9209a0f39f63692069f6d3b616e0 100644 (file)
--- a/libempathy-gtk/empathy-sound-manager.c
+++ b/libempathy-gtk/empathy-sound-manager.c
@@ -73,7 +73,7 @@ G_DEFINE_TYPE (EmpathySoundManager, empathy_sound_manager, G_TYPE_OBJECT)
 
 struct _EmpathySoundManagerPrivate
 {
-  /* An hash table containing currently repeating sounds. The format is the
+  /* A hash table containing currently repeating sounds. The format is the
    * following:
    * Key: An EmpathySound
    * Value : The EmpathyRepeatableSound associated with that EmpathySound. */
@@ -151,7 +151,7 @@ empathy_sound_manager_dup_singleton (void)
 {
   static EmpathySoundManager *manager = NULL;
 
-  if (manager != NULL)
+  if (G_LIKELY (manager != NULL))
       return g_object_ref (manager);
 
   manager = g_object_new (EMPATHY_TYPE_SOUND_MANAGER, NULL);