Commit 1536ed51 authored by Pierre-Luc Beaudoin's avatar Pierre-Luc Beaudoin

Fix typo: SFLPhone ==> SFLphone

parent f39a3010
AC_INIT([SFLPhone],[0.8],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_INIT([SFLphone],[0.8],[sflphoneteam@savoirfairelinux.com],[sflphone])
AM_CONFIG_HEADER(config.h)
PACKAGE=SFLPhone
PACKAGE=SFLphone
VERSION=0.8
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
......
......@@ -114,7 +114,7 @@ sflphone_init()
account_list_init ();
if(!dbus_connect ())
{
main_window_error_message("Unable to connect to the SFLPhone server.\nMake sure the daemon is running.");
main_window_error_message("Unable to connect to the SFLphone server.\nMake sure the daemon is running.");
return FALSE;
}
else
......
This diff is collapsed.
......@@ -96,6 +96,10 @@ call_state_cb (DBusGProxy *proxy,
{
sflphone_hung_up (c);
}
else if ( strcmp(state, "UNHOLD") == 0 )
{
sflphone_current (c);
}
else if ( strcmp(state, "HOLD") == 0 )
{
sflphone_hold (c);
......@@ -139,9 +143,9 @@ dbus_connect ()
/* Create a proxy object for the "bus driver" (name "org.freedesktop.DBus") */
callManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
"org.sflphone.SFLPhone",
"/org/sflphone/SFLPhone/CallManager",
"org.sflphone.SFLPhone.CallManager",
"org.sflphone.SFLphone",
"/org/sflphone/SFLphone/CallManager",
"org.sflphone.SFLphone.CallManager",
&error);
if (error)
{
......@@ -188,9 +192,9 @@ dbus_connect ()
"volumeChanged", G_CALLBACK(volume_changed_cb), NULL, NULL);
configurationManagerProxy = dbus_g_proxy_new_for_name_owner (connection,
"org.sflphone.SFLPhone",
"/org/sflphone/SFLPhone/ConfigurationManager",
"org.sflphone.SFLPhone.ConfigurationManager",
"org.sflphone.SFLphone",
"/org/sflphone/SFLphone/ConfigurationManager",
"org.sflphone.SFLphone.ConfigurationManager",
&error);
if (error)
{
......@@ -212,13 +216,14 @@ void
dbus_clean ()
{
g_object_unref (callManagerProxy);
g_object_unref (configurationManagerProxy);
}
void
dbus_hold (const call_t * c)
{
GError *error = NULL;
org_sflphone_SFLPhone_CallManager_hold ( callManagerProxy, c->callID, &error);
org_sflphone_SFLphone_CallManager_hold ( callManagerProxy, c->callID, &error);
if (error)
{
g_printerr ("Failed to call hold() on CallManager: %s\n",
......@@ -236,7 +241,7 @@ void
dbus_unhold (const call_t * c)
{
GError *error = NULL;
org_sflphone_SFLPhone_CallManager_unhold ( callManagerProxy, c->callID, &error);
org_sflphone_SFLphone_CallManager_unhold ( callManagerProxy, c->callID, &error);
if (error)
{
g_printerr ("Failed to call unhold() on CallManager: %s\n",
......@@ -254,7 +259,7 @@ void
dbus_hang_up (const call_t * c)
{
GError *error = NULL;
org_sflphone_SFLPhone_CallManager_hang_up ( callManagerProxy, c->callID, &error);
org_sflphone_SFLphone_CallManager_hang_up ( callManagerProxy, c->callID, &error);
if (error)
{
g_printerr ("Failed to call hang_up() on CallManager: %s\n",
......@@ -272,7 +277,7 @@ void
dbus_transfert (const call_t * c, gchar * to )
{
GError *error = NULL;
org_sflphone_SFLPhone_CallManager_transfert ( callManagerProxy, c->callID, to, &error);
org_sflphone_SFLphone_CallManager_transfert ( callManagerProxy, c->callID, to, &error);
if (error)
{
g_printerr ("Failed to call transfert() on CallManager: %s\n",
......@@ -290,7 +295,7 @@ void
dbus_accept (const call_t * c)
{
GError *error = NULL;
org_sflphone_SFLPhone_CallManager_accept ( callManagerProxy, c->callID, &error);
org_sflphone_SFLphone_CallManager_accept ( callManagerProxy, c->callID, &error);
if (error)
{
g_printerr ("Failed to call accept(%s) on CallManager: %s\n", c->callID,
......@@ -308,7 +313,7 @@ void
dbus_refuse (const call_t * c)
{
GError *error = NULL;
org_sflphone_SFLPhone_CallManager_refuse ( callManagerProxy, c->callID, &error);
org_sflphone_SFLphone_CallManager_refuse ( callManagerProxy, c->callID, &error);
if (error)
{
g_printerr ("Failed to call refuse() on CallManager: %s\n",
......@@ -328,7 +333,7 @@ void
dbus_place_call (const call_t * c)
{
GError *error = NULL;
org_sflphone_SFLPhone_CallManager_place_call ( callManagerProxy, c->accountID, c->callID, c->to, &error);
org_sflphone_SFLphone_CallManager_place_call ( callManagerProxy, c->accountID, c->callID, c->to, &error);
if (error)
{
g_printerr ("Failed to call placeCall() on CallManager: %s\n",
......@@ -348,7 +353,7 @@ dbus_account_list()
{
GError *error = NULL;
char ** array;
org_sflphone_SFLPhone_ConfigurationManager_get_account_list (
org_sflphone_SFLphone_ConfigurationManager_get_account_list (
configurationManagerProxy,
&array,
&error);
......@@ -371,7 +376,7 @@ dbus_account_details(gchar * accountID)
{
GError *error = NULL;
GHashTable * details;
org_sflphone_SFLPhone_ConfigurationManager_get_account_details (
org_sflphone_SFLphone_ConfigurationManager_get_account_details (
configurationManagerProxy,
accountID,
&details,
......@@ -394,7 +399,7 @@ void
dbus_remove_account(gchar * accountID)
{
GError *error = NULL;
org_sflphone_SFLPhone_ConfigurationManager_remove_account (
org_sflphone_SFLphone_ConfigurationManager_remove_account (
configurationManagerProxy,
accountID,
&error);
......@@ -415,7 +420,7 @@ void
dbus_set_account_details(account_t *a)
{
GError *error = NULL;
org_sflphone_SFLPhone_ConfigurationManager_set_account_details (
org_sflphone_SFLphone_ConfigurationManager_set_account_details (
configurationManagerProxy,
a->accountID,
a->properties,
......@@ -437,7 +442,7 @@ void
dbus_set_volume(const gchar * device, gdouble value)
{
GError *error = NULL;
org_sflphone_SFLPhone_CallManager_set_volume(
org_sflphone_SFLphone_CallManager_set_volume(
callManagerProxy,
device,
value,
......@@ -463,7 +468,7 @@ dbus_get_volume(const gchar * device)
gdouble value;
GError *error = NULL;
org_sflphone_SFLPhone_CallManager_get_volume(
org_sflphone_SFLphone_CallManager_get_volume(
callManagerProxy,
device,
&value,
......
......@@ -41,6 +41,7 @@ void dbus_refuse (const call_t * c);
void dbus_place_call (const call_t * c);
/* ConfigurationManager */
/** Returns a NULL terminated array of gchar pointers */
gchar ** dbus_account_list();
GHashTable * dbus_account_details(gchar * accountID);
void dbus_set_account_details(account_t *a);
......
......@@ -85,8 +85,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\n");
/** @file callmanager-glue.h
* @brief CallManager dbus API.
* This file is generated by dbus-binding-tool using the server's
* callmanager-introspec.xml.
*
* callmanager-introspec.xml:
* <pre> dbus-binding-tool --mode=glib-client "../../src/dbus/callmanager-introspec.xml" > callmanager-glue.h</pre>
* This file dbus calls wrapper functions to simplify access to dbus API.
*
*/
......@@ -95,7 +95,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\n");
/** @file configurationmanager-glue.h
* @brief ConfigurationManager dbus API.
* This file is generated by dbus-binding-tool using the server's
* configurationmanager-introspec.xml.
* configurationmanager-introspec.xml:
* <pre>dbus-binding-tool --mode=glib-client "../../src/dbus/configurationmanager-introspec.xml" > configurationmanager-glue.h</pre>
*
* This file dbus calls wrapper functions to simplify access to dbus API.
*
......
......@@ -45,12 +45,12 @@ help_about ( void * foo)
gtk_show_about_dialog( GTK_WINDOW(get_main_window()),
"name", PACKAGE,
"title", "About SFLPhone",
"title", "About SFLphone",
"version", VERSION,
"website", "http://www.sflphone.org",
"copyright", "Copyright © 2004-2007 Savoir-faire Linux Inc.",
"translator-credits", "Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.net>",
"comments", "SFLPhone is a VOIP client compatible with SIP and IAX protocols.",
"comments", "SFLphone is a VOIP client compatible with SIP and IAX protocols.",
"artists", artists,
"authors", authors,
NULL);
......
......@@ -24,8 +24,6 @@
GtkWidget * label;
GtkWidget * hbox;
GtkWidget *
create_screen()
{
......@@ -54,25 +52,15 @@ create_screen()
gtk_box_pack_start (GTK_BOX (subvbox), sw, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
screen_clear();
return subvbox;
}
void
screen_clear()
{
gtk_label_set_markup(GTK_LABEL(label), "<big><b>Welcome to SFLPhone</b></big>\n");
/*gtk_widget_hide( hangupButton );
gtk_widget_show( callButton );
gtk_widget_set_sensitive( GTK_WIDGET(callButton), FALSE);
gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), FALSE);
gtk_widget_set_sensitive( GTK_WIDGET(holdButton), FALSE);
gtk_widget_set_sensitive( GTK_WIDGET(transfertButton), FALSE);*/
gtk_label_set_markup(GTK_LABEL(label), "<big><b>Welcome to SFLphone</b></big>\n");
}
void
......@@ -81,28 +69,4 @@ screen_set_call(const call_t * c)
gchar * markup = g_strconcat("<big><b>", call_get_name(c), "</b></big>\n", call_get_number(c), NULL);
gtk_label_set_markup(GTK_LABEL(label), markup);
g_free(markup);
if(c->state == CALL_STATE_DIALING)
{
/*gtk_widget_hide( hangupButton );
gtk_widget_show( callButton );
gtk_widget_set_sensitive( GTK_WIDGET(callButton), TRUE);
gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), FALSE);
gtk_widget_set_sensitive( GTK_WIDGET(holdButton), FALSE);
gtk_widget_set_sensitive( GTK_WIDGET(transfertButton), FALSE);*/
}
else if (c->state == CALL_STATE_CURRENT)
{
//gtk_widget_hide( callButton );
/* Hack : if hangupButton is put on the window in create_screen()
* the hbox will request space for 4 buttons making the window larger than needed */
//gtk_box_pack_start (GTK_BOX (hbox), hangupButton, TRUE /*expand*/, TRUE /*fill*/, 10 /*padding*/);
/*gtk_box_reorder_child(GTK_BOX (hbox), hangupButton, 0);
gtk_widget_show( hangupButton );
gtk_widget_set_sensitive( GTK_WIDGET(callButton), FALSE);
gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE);
gtk_widget_set_sensitive( GTK_WIDGET(holdButton), TRUE);
gtk_widget_set_sensitive( GTK_WIDGET(transfertButton), TRUE);*/
}
}
......@@ -10,7 +10,7 @@
namespace org {
namespace sflphone {
namespace SFLPhone {
namespace SFLphone {
class CallManager
: public ::DBus::InterfaceAdaptor
......@@ -18,7 +18,7 @@ class CallManager
public:
CallManager()
: ::DBus::InterfaceAdaptor("org.sflphone.SFLPhone.CallManager")
: ::DBus::InterfaceAdaptor("org.sflphone.SFLphone.CallManager")
{
register_method(CallManager, placeCall, _placeCall_stub);
register_method(CallManager, refuse, _refuse_stub);
......@@ -163,7 +163,7 @@ public:
};
static ::DBus::IntrospectedInterface CallManager_interface =
{
"org.sflphone.SFLPhone.CallManager",
"org.sflphone.SFLphone.CallManager",
CallManager_methods,
CallManager_signals,
CallManager_properties
......
<?xml version="1.0" ?>
<node name="/org/sflphone/SFLPhone">
<interface name="org.sflphone.SFLPhone.CallManager">
<node name="/org/sflphone/SFLphone">
<interface name="org.sflphone.SFLphone.CallManager">
<method name="placeCall">
<arg type="s" name="accountID" direction="in"/>
......
......@@ -20,7 +20,7 @@
#include <callmanager.h>
#include "../manager.h"
const char* CallManager::SERVER_PATH = "/org/sflphone/SFLPhone/CallManager";
const char* CallManager::SERVER_PATH = "/org/sflphone/SFLphone/CallManager";
CallManager::CallManager( DBus::Connection& connection )
: DBus::ObjectAdaptor(connection, SERVER_PATH)
......@@ -130,7 +130,7 @@ CallManager::getCallDetails( const ::DBus::String& callID )
CallManager::getCurrentCallID( )
{
_debug("CallManager::getCurrentCallID received\n");
return getCurrentCallId();
return Manager::instance().getCurrentCallId();
}
......@@ -25,7 +25,7 @@
class CallManager
: public org::sflphone::SFLPhone::CallManager,
: public org::sflphone::SFLphone::CallManager,
public DBus::IntrospectableAdaptor,
public DBus::ObjectAdaptor
{
......
......@@ -10,7 +10,7 @@
namespace org {
namespace sflphone {
namespace SFLPhone {
namespace SFLphone {
class ConfigurationManager
: public ::DBus::InterfaceAdaptor
......@@ -18,7 +18,7 @@ class ConfigurationManager
public:
ConfigurationManager()
: ::DBus::InterfaceAdaptor("org.sflphone.SFLPhone.ConfigurationManager")
: ::DBus::InterfaceAdaptor("org.sflphone.SFLphone.ConfigurationManager")
{
register_method(ConfigurationManager, getAccountDetails, _getAccountDetails_stub);
register_method(ConfigurationManager, setAccountDetails, _setAccountDetails_stub);
......@@ -163,7 +163,7 @@ public:
};
static ::DBus::IntrospectedInterface ConfigurationManager_interface =
{
"org.sflphone.SFLPhone.ConfigurationManager",
"org.sflphone.SFLphone.ConfigurationManager",
ConfigurationManager_methods,
ConfigurationManager_signals,
ConfigurationManager_properties
......
<?xml version="1.0" ?>
<node name="/org/sflphone/SFLPhone">
<interface name="org.sflphone.SFLPhone.ConfigurationManager">
<node name="/org/sflphone/SFLphone">
<interface name="org.sflphone.SFLphone.ConfigurationManager">
<method name="getAccountDetails">
<arg type="s" name="accountID" direction="in"/>
......
......@@ -21,7 +21,7 @@
#include <configurationmanager.h>
#include "../manager.h"
const char* ConfigurationManager::SERVER_PATH = "/org/sflphone/SFLPhone/ConfigurationManager";
const char* ConfigurationManager::SERVER_PATH = "/org/sflphone/SFLphone/ConfigurationManager";
......
......@@ -25,7 +25,7 @@
class ConfigurationManager
: public org::sflphone::SFLPhone::ConfigurationManager,
: public org::sflphone::SFLphone::ConfigurationManager,
public DBus::IntrospectableAdaptor,
public DBus::ObjectAdaptor
{
......
......@@ -20,7 +20,7 @@
#include <dbusmanagerimpl.h>
#include "manager.h"
const char* DBusManagerImpl::SERVER_NAME = "org.sflphone.SFLPhone";
const char* DBusManagerImpl::SERVER_NAME = "org.sflphone.SFLphone";
int
DBusManagerImpl::exec(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment