[ekiga] Removed strange build-dep of the preferences window on ekiga.h

[Julien Puydt <jpuydt src gnome org>]

commit 27deb2ab142d4e706e00638a5e8564e340110306
Author: Snark <jpuydt gnome org>
Date:   Tue Nov 2 10:32:41 2010 +0100

    Removed strange build-dep of the preferences window on ekiga.h
    
    The inclusion looked strange -- and indeed, it was unnecessary

 src/gui/preferences.cpp |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/src/gui/preferences.cpp b/src/gui/preferences.cpp
index e18c1a9..c7b27d1 100644
--- a/src/gui/preferences.cpp
+++ b/src/gui/preferences.cpp
@@ -42,7 +42,6 @@
 #include "preferences.h"
 #include "misc.h"
 #include "accounts.h"
-#include "ekiga.h"
 #include "callbacks.h"
 
 #include <gmdialog.h>
@@ -1086,14 +1085,13 @@ audioev_filename_browse_cb (GtkWidget *b,
 static void
 sound_events_list_changed_nt (G_GNUC_UNUSED gpointer id,
 			      GmConfEntry *entry,
-			      G_GNUC_UNUSED gpointer data)
+			      gpointer data)
 {
-  GtkWidget *prefs_window;
+  GtkWidget *prefs_window = (GtkWidget*)data;
 
   if (gm_conf_entry_get_type (entry) == GM_CONF_STRING
       || gm_conf_entry_get_type (entry) == GM_CONF_BOOL) {
-   
-    prefs_window = GnomeMeeting::Process ()->GetPrefsWindow ();
+
     if (prefs_window) {
       gm_prefs_window_sound_events_list_build (prefs_window);
     }
@@ -1438,34 +1436,34 @@ gm_prefs_window_new (Ekiga::ServiceCore *core)
 
   /* Connect notifiers for SOUND_EVENTS_KEY keys */
   gm_conf_notifier_add (SOUND_EVENTS_KEY "enable_incoming_call_sound", 
-			sound_events_list_changed_nt, NULL);
+			sound_events_list_changed_nt, pw);
   
   gm_conf_notifier_add (SOUND_EVENTS_KEY "incoming_call_sound",
-			sound_events_list_changed_nt, NULL);
+			sound_events_list_changed_nt, pw);
 
   gm_conf_notifier_add (SOUND_EVENTS_KEY "enable_ring_tone_sound", 
-			sound_events_list_changed_nt, NULL);
+			sound_events_list_changed_nt, pw);
   
   gm_conf_notifier_add (SOUND_EVENTS_KEY "ring_tone_sound", 
-			sound_events_list_changed_nt, NULL);
+			sound_events_list_changed_nt, pw);
   
   gm_conf_notifier_add (SOUND_EVENTS_KEY "enable_busy_tone_sound", 
-			sound_events_list_changed_nt, NULL);
+			sound_events_list_changed_nt, pw);
   
   gm_conf_notifier_add (SOUND_EVENTS_KEY "busy_tone_sound",
-			sound_events_list_changed_nt, NULL);
+			sound_events_list_changed_nt, pw);
   
   gm_conf_notifier_add (SOUND_EVENTS_KEY "enable_new_voicemail_sound", 
-			sound_events_list_changed_nt, NULL);
+			sound_events_list_changed_nt, pw);
   
   gm_conf_notifier_add (SOUND_EVENTS_KEY "new_voicemail_sound",
-			sound_events_list_changed_nt, NULL);
+			sound_events_list_changed_nt, pw);
 
   gm_conf_notifier_add (SOUND_EVENTS_KEY "enable_new_message_sound",
-			sound_events_list_changed_nt, NULL);
+			sound_events_list_changed_nt, pw);
 
   gm_conf_notifier_add (SOUND_EVENTS_KEY "new_message_sound",
-			sound_events_list_changed_nt, NULL);
+			sound_events_list_changed_nt, pw);
 
   return window;
 }