Add a empathy_sound_play_full function

[empathy.git] / libempathy-gtk / empathy-ui-utils.c

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 10c32bcb7a30092260835bbdf4e0e32acca8ea17..692b6ff7d82f6d44764a3152d79d32c3b07c2024 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -544,14 +544,12 @@ empathy_pixbuf_scale_down_if_necessary (GdkPixbuf *pixbuf, gint max_size)
 }
 
 GdkPixbuf *
-empathy_pixbuf_from_icon_name (const gchar *icon_name,
-                             GtkIconSize  icon_size)
+empathy_pixbuf_from_icon_name_sized (const gchar *icon_name,
+                                    gint size)
 {
-       GtkIconTheme  *theme;
-       GdkPixbuf     *pixbuf = NULL;
-       GError        *error = NULL;
-       gint           w, h;
-       gint           size = 48;
+       GtkIconTheme *theme;
+       GdkPixbuf *pixbuf;
+       GError *error = NULL;
 
        if (!icon_name) {
                return NULL;
@@ -559,10 +557,6 @@ empathy_pixbuf_from_icon_name (const gchar *icon_name,
 
        theme = gtk_icon_theme_get_default ();
 
-       if (gtk_icon_size_lookup (icon_size, &w, &h)) {
-               size = (w + h) / 2;
-       }
-
        pixbuf = gtk_icon_theme_load_icon (theme,
                                           icon_name,
                                           size,
@@ -576,6 +570,24 @@ empathy_pixbuf_from_icon_name (const gchar *icon_name,
        return pixbuf;
 }
 
+GdkPixbuf *
+empathy_pixbuf_from_icon_name (const gchar *icon_name,
+                              GtkIconSize  icon_size)
+{
+       gint  w, h;
+       gint  size = 48;
+
+       if (!icon_name) {
+               return NULL;
+       }
+
+       if (gtk_icon_size_lookup (icon_size, &w, &h)) {
+               size = (w + h) / 2;
+       }
+
+       return empathy_pixbuf_from_icon_name_sized (icon_name, size);
+}
+
 /* Stolen from GtkSourceView, hence the weird intendation. Please keep it like
  * that to make it easier to apply changes from the original code.
  */
@@ -1424,27 +1436,25 @@ empathy_toggle_button_set_state_quietly (GtkWidget *widget,
 
 static void
 file_manager_send_file_request_cb (EmpathyDispatchOperation *operation,
-  const GError *error, gpointer user_data)
+                                  const GError *error, gpointer user_data)
 {
-  GFile *file = (GFile *)user_data;
-  EmpathyTpFile *tp_file;
+       GFile *file = (GFile *)user_data;
+       EmpathyTpFile *tp_file;
 
-  if (error != NULL)
-    {
-      DEBUG ("Couldn't request channel: %s", error->message);
-      g_object_unref (file);
-      return;
-    }
+       if (error != NULL) {
+               DEBUG ("Couldn't request channel: %s", error->message);
+               g_object_unref (file);
+               return;
+       }
 
-  DEBUG ("Starting to send file");
+       DEBUG ("Starting to send file");
 
-  tp_file = EMPATHY_TP_FILE (
-    empathy_dispatch_operation_get_channel_wrapper (operation));
+       tp_file = EMPATHY_TP_FILE (
+               empathy_dispatch_operation_get_channel_wrapper (operation));
 
-  empathy_tp_file_offer (tp_file, file, NULL);
+       empathy_tp_file_offer (tp_file, file, NULL);
 
-  g_object_unref (file);
-  g_object_unref (tp_file);
+       g_object_unref (file);
 }
 
 static void
@@ -1574,13 +1584,12 @@ static EmpathySoundEntry sound_entries[LAST_EMPATHY_SOUND] = {
          N_("Voice call ended"), NULL },
 };
 
+
 static gboolean
 empathy_sound_pref_is_enabled (const char *key)
 {
        EmpathyConf *conf;
-       McPresence presence;
        gboolean res;
-       EmpathyIdle *idle;
 
        conf = empathy_conf_get ();
        res = FALSE;
@@ -1591,12 +1600,7 @@ empathy_sound_pref_is_enabled (const char *key)
                return FALSE;
        }
 
-       idle = empathy_idle_dup_singleton ();
-       presence = empathy_idle_get_state (idle);
-       g_object_unref (idle);
-
-       if (presence != MC_PRESENCE_AVAILABLE &&
-           presence != MC_PRESENCE_UNSET) {
+       if (!empathy_check_available_state ()) {
                empathy_conf_get_bool (conf, EMPATHY_PREFS_SOUNDS_DISABLED_AWAY,
                                       &res);
                if (res) {
@@ -1610,29 +1614,77 @@ empathy_sound_pref_is_enabled (const char *key)
 }
 
 void
-empathy_sound_play (GtkWidget *widget,
-                   EmpathySound sound_id)
+empathy_sound_stop (EmpathySound sound_id)
 {
        EmpathySoundEntry *entry;
-       gboolean should_play = TRUE;
 
        g_return_if_fail (sound_id < LAST_EMPATHY_SOUND);
 
        entry = &(sound_entries[sound_id]);
        g_return_if_fail (entry->sound_id == sound_id);
 
+       ca_context_cancel (ca_gtk_context_get (), entry->sound_id);
+}
+
+
+gboolean
+empathy_sound_play_full (GtkWidget *widget, EmpathySound sound_id,
+       ca_finish_callback_t callback, gpointer user_data)
+{
+       EmpathySoundEntry *entry;
+       gboolean should_play = TRUE;
+       ca_proplist *p = NULL;
+       ca_context *c;
+
+       g_return_val_if_fail (sound_id < LAST_EMPATHY_SOUND, FALSE);
+
+       entry = &(sound_entries[sound_id]);
+       g_return_val_if_fail (entry->sound_id == sound_id, FALSE);
+
        if (entry->gconf_key != NULL) {
                should_play = empathy_sound_pref_is_enabled (entry->gconf_key);
        }
 
-       if (should_play) {
-               DEBUG ("Play sound \"%s\" (%s)",
-                      entry->event_ca_id,
-                      entry->event_ca_description);
+       if (!should_play)
+               return FALSE;
 
-               ca_gtk_play_for_widget (widget, 0,
-                                       CA_PROP_EVENT_ID, entry->event_ca_id,
-                                       CA_PROP_EVENT_DESCRIPTION, gettext (entry->event_ca_description),
-                                       NULL);
-       }
+       c = ca_gtk_context_get ();
+       ca_context_cancel (c, entry->sound_id);
+
+       DEBUG ("Play sound \"%s\" (%s)",
+              entry->event_ca_id,
+              entry->event_ca_description);
+
+       if (ca_proplist_create(&p) < 0)
+               goto failed;
+
+       if (ca_proplist_sets (p, CA_PROP_EVENT_ID, entry->event_ca_id) < 0)
+               goto failed;
+
+       if (ca_proplist_sets (p, CA_PROP_EVENT_DESCRIPTION,
+                       gettext (entry->event_ca_id)) < 0)
+               goto failed;
+
+       if (ca_gtk_proplist_set_for_widget (p, widget) < 0)
+               goto failed;
+
+       ca_context_play_full (ca_gtk_context_get (), entry->sound_id,
+               p, callback, user_data);
+
+       ca_proplist_destroy (p);
+
+       return TRUE;
+
+failed:
+       if (p != NULL)
+               ca_proplist_destroy (p);
+
+       return FALSE;
+}
+
+void
+empathy_sound_play (GtkWidget *widget, EmpathySound sound_id)
+{
+       empathy_sound_play_full (widget, sound_id, NULL, NULL);
 }
+