[maemo-commits] [maemo-commits] r15779 - in projects/haf/trunk/hildon-desktop: . debian doc/libhildondesktop/tmpl src

Tue Jul 15 14:05:18 EEST 2008

Author: klattimer
Date: 2008-07-15 14:05:02 +0300 (Tue, 15 Jul 2008)
New Revision: 15779

Modified:
   projects/haf/trunk/hildon-desktop/configure.ac
   projects/haf/trunk/hildon-desktop/debian/changelog
   projects/haf/trunk/hildon-desktop/debian/control
   projects/haf/trunk/hildon-desktop/doc/libhildondesktop/tmpl/hildon-desktop-item.sgml
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
   projects/haf/trunk/hildon-desktop/src/hn-app-sound.c
   projects/haf/trunk/hildon-desktop/src/hn-app-sound.h
   projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c
Log:
  * debian/control: Removed dependency on ESD 
  * src/hn-app-sound.c: Removed dependency on ESD 
  * src/hn-app-switcher.c: Removed dependency on ESD 
  * src/hn-app-sound.h: Removed dependency on ESD 
  * src/hd-switcher-menu.c: Removed dependency on ESD 
  * configure.ac 2.0.19: Removed dependency on ESD 
  * Fixes: NB#86876



Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================

--- projects/haf/trunk/hildon-desktop/configure.ac	2008-07-14 12:26:06 UTC (rev 15778)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2008-07-15 11:05:02 UTC (rev 15779)
@@ -1,6 +1,6 @@
 AC_INIT(Makefile.am)
 
-AM_INIT_AUTOMAKE(hildon-desktop, 2.0.18)
+AM_INIT_AUTOMAKE(hildon-desktop, 2.0.19)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -189,9 +189,10 @@
 AC_SUBST(LIBXML_LIBS)
 AC_SUBST(LIBXML_CFLAGS)
 
-PKG_CHECK_MODULES(ESD, esound)
-AC_SUBST(ESD_LIBS)
-AC_SUBST(ESD_CFLAGS)
+# esd removed in fremantle
+# PKG_CHECK_MODULES(ESD, esound)
+# AC_SUBST(ESD_LIBS)
+# AC_SUBST(ESD_CFLAGS)
 
 PKG_CHECK_MODULES(XDAMAGE, xdamage, has_damage=yes,
 [AC_MSG_NOTICE(libxdamage not found, compositing will be disabled)])

Modified: projects/haf/trunk/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/changelog	2008-07-14 12:26:06 UTC (rev 15778)
+++ projects/haf/trunk/hildon-desktop/debian/changelog	2008-07-15 11:05:02 UTC (rev 15779)
@@ -1,3 +1,15 @@
+hildon-desktop (1:2.0.19-1) sardine; urgency=low
+
+  * debian/control: Removed dependency on ESD 
+  * src/hn-app-sound.c: Removed dependency on ESD 
+  * src/hn-app-switcher.c: Removed dependency on ESD 
+  * src/hn-app-sound.h: Removed dependency on ESD 
+  * src/hd-switcher-menu.c: Removed dependency on ESD 
+  * configure.ac 2.0.19: Removed dependency on ESD 
+  * Fixes: NB#86876
+
+ -- Karl Lattimer <karl.lattimer at nokia.com>  Tue, 15 Jul 2008 13:32:24 +0300
+
 hildon-desktop (1:2.0.18-1) sardine; urgency=low
 
   * src/hd-applications-menu.c: Applied patch to ensure that memory is

Modified: projects/haf/trunk/hildon-desktop/debian/control
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/control	2008-07-14 12:26:06 UTC (rev 15778)
+++ projects/haf/trunk/hildon-desktop/debian/control	2008-07-15 11:05:02 UTC (rev 15779)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Johan Bilien <johan.bilien at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libhildon1-dev | hildon-libs-dev, pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, libhildonfm2-dev | hildon-fm-dev, libhildonhelp-dev | libosso-help-dev, libxtst-dev, libxml2-dev, osso-esd-dev, libxdamage-dev, libxcomposite-dev, libsqlite3-dev, mce-dev, gtk-doc-tools, maemo-launcher-dev (>= 0.23-1)
+Build-Depends: debhelper (>= 4.0.0), libhildon1-dev | hildon-libs-dev, pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, libhildonfm2-dev | hildon-fm-dev, libhildonhelp-dev | libosso-help-dev, libxtst-dev, libxml2-dev, libxdamage-dev, libxcomposite-dev, libsqlite3-dev, mce-dev, gtk-doc-tools, maemo-launcher-dev (>= 0.23-1)
 Build-Depends-Indep: gtk-doc-tools
 Standards-Version: 3.6.0
 

Modified: projects/haf/trunk/hildon-desktop/doc/libhildondesktop/tmpl/hildon-desktop-item.sgml
===================================================================
--- projects/haf/trunk/hildon-desktop/doc/libhildondesktop/tmpl/hildon-desktop-item.sgml	2008-07-14 12:26:06 UTC (rev 15778)
+++ projects/haf/trunk/hildon-desktop/doc/libhildondesktop/tmpl/hildon-desktop-item.sgml	2008-07-15 11:05:02 UTC (rev 15779)
@@ -89,6 +89,15 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION hildon_desktop_item_get_resource ##### -->
+<para>
+
+</para>
+
+ at item: 
+ at Returns: 
+
+
 <!-- ##### FUNCTION hildon_desktop_item_get_name ##### -->
 <para>
 

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2008-07-14 12:26:06 UTC (rev 15778)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2008-07-15 11:05:02 UTC (rev 15779)
@@ -183,8 +183,10 @@
 #endif
 
   gboolean                  system_inactivity;
-  
+
+#ifdef HILDON_HAS_ESD
   gint                      esd_socket;
+#endif
 };
 
 static GObject *hd_switcher_menu_constructor (GType gtype,
@@ -281,7 +283,9 @@
 
   g_object_ref (switcher->hdwm);
 
+#ifdef HILDON_HAS_ESD
   switcher->priv->esd_socket = hn_as_sound_init ();
+#endif
 }
 
 static void 
@@ -1318,7 +1322,9 @@
      
   g_object_unref (switcher->priv->icon_theme);
 
+#ifdef HILDON_HAS_ESD
   hn_as_sound_deinit (switcher->priv->esd_socket); 
+#endif
 
   if (switcher->priv->notification_groups)
   {
@@ -2471,7 +2477,7 @@
                                         HDSwitcherMenu *switcher)
 {
   GHashTable *hints;
-  const gchar *category = NULL, *sound_file = NULL;
+  const gchar *category = NULL; 
   GValue *hint;
   guint id;
   
@@ -2500,6 +2506,8 @@
 
   hint = g_hash_table_lookup (hints, "sound-file");
 
+#ifdef HILDON_HAS_ESD 
+  const gchar *sound_file = NULL;
   if (hint)
   {
     gint sample_id;
@@ -2523,6 +2531,7 @@
     hn_as_sound_deregister_sample (switcher->priv->esd_socket, 
 		                   sample_id);
   }
+#endif
 
 #ifdef HAVE_MCE
   hint = g_hash_table_lookup (hints, "led-pattern");

Modified: projects/haf/trunk/hildon-desktop/src/hn-app-sound.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-app-sound.c	2008-07-14 12:26:06 UTC (rev 15778)
+++ projects/haf/trunk/hildon-desktop/src/hn-app-sound.c	2008-07-15 11:05:02 UTC (rev 15779)
@@ -24,12 +24,17 @@
 #include <unistd.h> /* close() */
 #include <glib/gtypes.h>
 #include <gconf/gconf-client.h>
-#include <esd.h>
+
 #include "hn-app-sound.h"
 
+#ifdef HILDON_HAS_ESD 
+#include <esd.h>
+#endif
+
 #define PROGRAM_NAME        "MaemoApplicationSwitcher"
 #define ALARM_GCONF_PATH    "/apps/osso/sound/system_alert_volume"
 
+#ifdef HILDON_HAS_ESD 
 static gint
 hn_as_sound_get_volume_scale (void);
 
@@ -115,3 +120,4 @@
 
     return 0;
 }
+#endif

Modified: projects/haf/trunk/hildon-desktop/src/hn-app-sound.h
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-app-sound.h	2008-07-14 12:26:06 UTC (rev 15778)
+++ projects/haf/trunk/hildon-desktop/src/hn-app-sound.h	2008-07-15 11:05:02 UTC (rev 15779)
@@ -20,8 +20,11 @@
  * 02110-1301 USA
  *
  */
+/* Only if we have esd, also removed from configure.ac for fremantle
+#define HILDON_HAS_ESD 
+*/
 
-
+#ifdef HILDON_HAS_ESD 
 gint
 hn_as_sound_init(void);
 
@@ -36,4 +39,4 @@
 
 void
 hn_as_sound_deinit (gint socket);
-
+#endif

Modified: projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c	2008-07-14 12:26:06 UTC (rev 15778)
+++ projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c	2008-07-15 11:05:02 UTC (rev 15779)
@@ -225,9 +225,11 @@
   guint queue_refresh_id;
 
   /* sound samples data */
+#ifdef HILDON_HAS_ESD
   gint esd_socket;
   gint start_sample;
   gint end_sample;
+#endif
 };
 
 G_DEFINE_TYPE (HNAppSwitcher, hn_app_switcher, TASKNAVIGATOR_TYPE_ITEM);
@@ -444,6 +446,7 @@
     gtk_widget_set_size_request (GTK_WIDGET (app_switcher), -1, req.height);
 }
 
+#ifdef HILDON_HAS_ESD
 /*
  * initializes esd cache of sound samples
  */
@@ -459,6 +462,7 @@
           app_switcher->priv->esd_socket,
           HN_WINDOW_CLOSE_SOUND);
 }
+#endif
 
 #ifdef HAVE_LIBOSSO
 /*
@@ -823,14 +827,15 @@
 hn_app_switcher_add_info_cb (HDWM *hdwm, HDWMEntryInfo *entry_info, gpointer data)
 {
   HNAppSwitcher *app_switcher = HN_APP_SWITCHER (data);
-  HNAppSwitcherPrivate *priv = app_switcher->priv;
-  
+
   if (!entry_info)
   {
     g_warning ("%s: No entry info provided!",__FILE__);
     return;
   }
 
+#ifdef HILDON_HAS_ESD
+  HNAppSwitcherPrivate *priv = app_switcher->priv;
   /* Play a sound */
   if (hn_as_sound_play_sample (priv->esd_socket, priv->start_sample) == -1)
   {
@@ -839,6 +844,7 @@
     hn_app_switcher_init_sound_samples (app_switcher);
     hn_as_sound_play_sample (priv->esd_socket, priv->start_sample);
   }
+#endif
 
   queue_refresh_buttons (app_switcher);
 }
@@ -853,9 +859,10 @@
 				gpointer data)
 {
   HNAppSwitcher *app_switcher = HN_APP_SWITCHER (data);
+  HDWMEntryInfo *info_parent = hd_wm_entry_info_get_parent(entry_info);
+
+#ifdef HILDON_HAS_ESD  
   HNAppSwitcherPrivate *priv = app_switcher->priv;
-  HDWMEntryInfo *info_parent = hd_wm_entry_info_get_parent(entry_info);
-  
   /* Play a sound */
   if (hn_as_sound_play_sample (priv->esd_socket, priv->end_sample) == -1)
   {
@@ -864,6 +871,7 @@
     hn_app_switcher_init_sound_samples (app_switcher);
     hn_as_sound_play_sample (priv->esd_socket, priv->start_sample);
   }
+#endif
   
   if (removed_app)
     remove_entry_from_app_button (app_switcher, info_parent);
@@ -1251,7 +1259,10 @@
   
   gtk_container_set_border_width (GTK_CONTAINER (app_switcher), 0);
 
+#ifdef HILDON_HAS_ESD
   hn_app_switcher_init_sound_samples (app_switcher);
+#endif
+
 }
 
 static void 


