← Back to branch summary

~vcs-imports/hildon-desktop/trunk

« back to all changes in this revision

Viewing changes to src/hd-switcher-menu.c

  • Committer: klattimer
  • Date: 2008-07-15 11:05:02 UTC
  • Revision ID: vcs-imports@canonical.com-20080715110502-tphhqgpfvuhodglt
  * 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/hd-switcher-menu.c
183
183
#endif
184
184
 
185
185
  gboolean                  system_inactivity;
186
 
  
 
186
 
 
187
#ifdef HILDON_HAS_ESD
187
188
  gint                      esd_socket;
 
189
#endif
188
190
};
189
191
 
190
192
static GObject *hd_switcher_menu_constructor (GType gtype,
281
283
 
282
284
  g_object_ref (switcher->hdwm);
283
285
 
 
286
#ifdef HILDON_HAS_ESD
284
287
  switcher->priv->esd_socket = hn_as_sound_init ();
 
288
#endif
285
289
}
286
290
 
287
291
static void 
1318
1322
     
1319
1323
  g_object_unref (switcher->priv->icon_theme);
1320
1324
 
 
1325
#ifdef HILDON_HAS_ESD
1321
1326
  hn_as_sound_deinit (switcher->priv->esd_socket); 
 
1327
#endif
1322
1328
 
1323
1329
  if (switcher->priv->notification_groups)
1324
1330
  {
2471
2477
                                        HDSwitcherMenu *switcher)
2472
2478
{
2473
2479
  GHashTable *hints;
2474
 
  const gchar *category = NULL, *sound_file = NULL;
 
2480
  const gchar *category = NULL; 
2475
2481
  GValue *hint;
2476
2482
  guint id;
2477
2483
  
2500
2506
 
2501
2507
  hint = g_hash_table_lookup (hints, "sound-file");
2502
2508
 
 
2509
#ifdef HILDON_HAS_ESD 
 
2510
  const gchar *sound_file = NULL;
2503
2511
  if (hint)
2504
2512
  {
2505
2513
    gint sample_id;
2523
2531
    hn_as_sound_deregister_sample (switcher->priv->esd_socket, 
2524
2532
                                   sample_id);
2525
2533
  }
 
2534
#endif
2526
2535
 
2527
2536
#ifdef HAVE_MCE
2528
2537
  hint = g_hash_table_lookup (hints, "led-pattern");