* #6742 : clean dbus & icons

daemon/src/dbus/callmanager-introspec.xml

@@ -418,14 +418,6 @@
 			<arg type="s" name="message" direction="in"/>
 		</method>
 
-		<signal name="currentSelectedAudioCodec" tp:name-for-bindings="currentSelectedAudioCodec">
-			<tp:docstring>
-			  Unused
-			</tp:docstring>
-			<arg type="s" name="callID" />
-			<arg type="s" name="codecName"/>
-		</signal>
-
 		<signal name="newCallCreated" tp:name-for-bindings="newCallCreated">
 			<tp:docstring>
 			  <p>Notify that a cell have been created.</p>

daemon/src/global.h

@@ -116,7 +116,6 @@ static const SOUND_FORMAT INT32 = 0x8;
 #define NO_ERROR		      0x0000	/** No error - Everything alright */
 #define ALSA_CAPTURE_DEVICE           0x0001	/** Error while opening capture device */
 #define ALSA_PLAYBACK_DEVICE          0x0010	/** Error while opening playback device */
-#define NETWORK_UNREACHABLE           0x0011	/** Network unreachable */
 #define PULSEAUDIO_NOT_RUNNING          0x0100  /** Pulseaudio is not running */
 
 #define ALSA			  0

gnome/src/Makefile.am

@@ -12,7 +12,6 @@ SFLPHONEGTK_LIBS=./contacts/libcontacts.la ./config/libconfig.la ./dbus/libdbus.
 
 sflphone_client_gnome_SOURCES = \
   main.c \
-  errors.c \
   logger.c \
   uimanager.c \
   sflnotify.c \
@@ -31,7 +30,7 @@ sflphone_client_gnome_SOURCES = \
   eel-gconf-extensions.c
 
 noinst_HEADERS =  actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \
-                  reqaccount.h errors.h sflphone_const.h uimanager.h \
+                  reqaccount.h sflphone_const.h uimanager.h \
                   accountlist.h sliders.h statusicon.h callable_obj.h conference_obj.h \
                   shortcuts.h eel-gconf-extensions.h logger.h imwindow.h
 

gnome/src/actions.h

@@ -38,9 +38,9 @@
 #include <accountlist.h>
 #include <codeclist.h>
 #include <sflphone_const.h>
-#include <errors.h>
 #include <conference_obj.h>
 
+
 #define	UC(b)	(((int)b)&0xff)
 
 /** @file actions.h

gnome/src/conference_obj.c

@@ -104,6 +104,8 @@ conference_obj_t *create_new_conference_from_details (const gchar *conf_id, GHas
     // generate conference participant list
     conference_participant_list_update (participants, new_conf);
 
+    g_strfreev(participants);
+
     state_str = g_hash_table_lookup (details, "CONF_STATE");
 
     if (g_strcasecmp (state_str, "ACTIVE_ATACHED") == 0)
@@ -119,6 +121,7 @@ conference_obj_t *create_new_conference_from_details (const gchar *conf_id, GHas
     else if (g_strcasecmp (state_str, "HOLD_REC") == 0)
         new_conf->_state = CONFERENCE_STATE_HOLD_RECORD;
 
+
     new_conf->_recordfile = NULL;
     new_conf->_record_is_playing = FALSE;
 

gnome/src/config/audioconf.c

@@ -34,6 +34,8 @@
 #include <string.h>
 #include <eel-gconf-extensions.h>
 #include "dbus/dbus.h"
+#include "uimanager.h"
+#include "mainwindow.h"
 
 /* FIXME: these should be in a struct rather than at file scope */
 static GtkListStore *pluginlist;

gnome/src/contacts/addrbookfactory.c

@@ -31,6 +31,7 @@
 #include "addrbookfactory.h"
 #include "addressbook-config.h"
 
+#include "calltab.h"
 
 #include <glib.h>
 #include <dlfcn.h>

gnome/src/dbus/callmanager-introspec.xml

@@ -418,14 +418,6 @@
 			<arg type="s" name="message" direction="in"/>
 		</method>
 
-		<signal name="currentSelectedAudioCodec" tp:name-for-bindings="currentSelectedAudioCodec">
-			<tp:docstring>
-			  Unused
-			</tp:docstring>
-			<arg type="s" name="callID" />
-			<arg type="s" name="codecName"/>
-		</signal>
-
 		<signal name="newCallCreated" tp:name-for-bindings="newCallCreated">
 			<tp:docstring>
 			  <p>Notify that a cell have been created.</p>

gnome/src/dialpad.c

@@ -30,6 +30,7 @@
 
 #include <dialpad.h>
 #include <actions.h>
+#include "calltab.h"
 
 /**
  * button pressed event

gnome/src/errors.c

-/*
- *  Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc.
- *  Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
- */
-
-#include <errors.h>
-#include <sflphone_const.h>
-
-void
-sflphone_throw_exception (int err)
-{
-    gchar* markup = NULL;
-
-    switch (err) {
-        case ALSA_PLAYBACK_DEVICE:
-            markup = g_markup_printf_escaped (_ ("ALSA notification\n\nError while opening playback device"));
-            break;
-        case ALSA_CAPTURE_DEVICE:
-            markup = g_markup_printf_escaped (_ ("ALSA notification\n\nError while opening capture device"));
-            break;
-        case PULSEAUDIO_NOT_RUNNING:
-            markup = g_markup_printf_escaped (_ ("Pulseaudio notification\n\nPulseaudio is not running"));
-            break;
-    }
-
-    if (markup)
-        main_window_error_message (markup);
-    g_free (markup);
-}

gnome/src/errors.h

-/*
- *  Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc.
- *  Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Additional permission under GNU GPL version 3 section 7:
- *
- *  If you modify this program, or any covered work, by linking or
- *  combining it with the OpenSSL project's OpenSSL library (or a
- *  modified version of that library), containing parts covered by the
- *  terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- *  grants you additional permission to convey the resulting work.
- *  Corresponding Source for a non-source form of such a combination
- *  shall include the source code for the parts of OpenSSL used as well
- *  as that of the covered work.
- */
-
-#ifndef __ERRORS_H
-#define __ERRORS_H
-
-/** @file errors.h
-  * @brief Implements internal errors notifications to the client.
-  */
-
-#include <stdlib.h>
-
-#include <mainwindow.h>
-
-/**
- * Display an internal error.
- * @param err The error code
- *	  ALSA_PLAYBACK_ERROR
- *	  ALSA_CAPTURE_ERROR
- */
-void sflphone_throw_exception (int err);
-
-#endif