epiphany r8361 - in branches/gnome-2-24: . embed

[diegoe svn gnome org]

Author: diegoe
Date: Thu Jul 24 21:05:35 2008
New Revision: 8361
URL: http://svn.gnome.org/viewvc/epiphany?rev=8361&view=rev

Log:
Enable complete-download sound with libcanberra.


Modified:
   branches/gnome-2-24/configure.ac
   branches/gnome-2-24/embed/downloader-view.c

Modified: branches/gnome-2-24/configure.ac
==============================================================================
--- branches/gnome-2-24/configure.ac	(original)
+++ branches/gnome-2-24/configure.ac	Thu Jul 24 21:05:35 2008
@@ -114,10 +114,17 @@
 GNOME_DESKTOP_REQUIRED=2.9.91
 LIBSTARTUP_NOTIFICATION_REQUIRED=0.5
 LIBNOTIFY_REQUIRED=0.4
+LIBCANBERRA_GTK_REQUIRED=0.3
 DBUS_GLIB_REQUIRED=0.35
 
 PKG_CHECK_EXISTS([libnotify >= $LIBNOTIFY_REQUIRED],[have_libnotify=yes],[have_libnotify=no])
+PKG_CHECK_EXISTS([libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED],[have_libcanberra_gtk=yes],[have_libcanberra_gtk=no])
 
+LIBCANBERRA_GTK_PACKAGE=
+if test "$have_libcanberra_gtk" = "yes"; then
+  LIBCANBERRA_GTK_PACKAGE="libcanberra_gtk >= $LIBCANBERRA_GTK_REQUIRED"
+  AC_DEFINE([HAVE_LIBCANBERRA_GTK],[1],[Define if libcanberra-gtk is available])
+fi
 LIBNOTIFY_PACKAGE=
 if test "$have_libnotify" = "yes"; then
   LIBNOTIFY_PACKAGE="libnotify >= $LIBNOTIFY_REQUIRED"
@@ -137,6 +144,7 @@
 		  libglade-2.0 >= $LIBGLADE_REQUIRED \
 		  gconf-2.0
 		  gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+		  libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED
 		  libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
 		  $LIBNOTIFY_PACKAGE
 		  ])

Modified: branches/gnome-2-24/embed/downloader-view.c
==============================================================================
--- branches/gnome-2-24/embed/downloader-view.c	(original)
+++ branches/gnome-2-24/embed/downloader-view.c	Thu Jul 24 21:05:35 2008
@@ -35,6 +35,9 @@
 #include <gtk/gtk.h>
 #include <libgnomeui/gnome-icon-lookup.h>
 
+#ifdef HAVE_LIBCANBERRA_GTK
+#include <canberra-gtk.h>
+#endif
 
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
@@ -440,6 +443,13 @@
 		
 		g_free (downloaded);
 #endif
+#ifdef HAVE_LIBCANBERRA_GTK
+        ca_context_play (ca_gtk_context_get (), 0,
+                         CA_PROP_APPLICATION_NAME, _("GNOME Web Browser"),
+                         CA_PROP_EVENT_ID, "complete-download",
+                         CA_PROP_EVENT_DESCRIPTION, _("Download completed"),
+                         NULL);
+#endif
 
 		return;
 	case EPHY_DOWNLOAD_PAUSED: