[ekiga] Cleanup and reformatting
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Cleanup and reformatting
- Date: Wed, 2 Dec 2015 15:07:35 +0000 (UTC)
commit 97f804fbf66e69e9f0b680e0eaadd5d854ea2dce
Author: Eugen Dedu <eugen dedu univ-fcomte fr>
Date: Wed Dec 2 16:07:14 2015 +0100
Cleanup and reformatting
lib/engine/audiooutput/audiooutput-core.cpp | 74 ++++----
lib/engine/components/opal/opal-account.h | 40 ++---
lib/engine/components/opal/opal-audio.cpp | 14 +-
lib/engine/components/opal/opal-bank.cpp | 40 +++---
lib/engine/components/opal/opal-bank.h | 3 +-
lib/engine/components/opal/opal-call.cpp | 6 +-
lib/engine/components/opal/opal-main.cpp | 10 +-
lib/engine/components/opal/opal-presentity.h | 8 +-
.../components/opal/process/h323-endpoint.cpp | 4 +-
lib/engine/components/opal/process/h323-endpoint.h | 6 +-
.../components/opal/process/opal-endpoint.cpp | 6 +-
.../components/opal/process/sip-endpoint.cpp | 8 +-
lib/engine/components/opal/process/sip-endpoint.h | 2 +-
lib/engine/friend-or-foe/friend-or-foe.cpp | 2 +-
lib/engine/friend-or-foe/friend-or-foe.h | 4 +-
.../gui/gtk-frontend/call-history-view-gtk.cpp | 57 +++----
lib/engine/gui/gtk-frontend/call-window.cpp | 2 +-
lib/engine/gui/gtk-frontend/ekiga-app.cpp | 10 +-
lib/engine/gui/gtk-frontend/preferences-window.cpp | 2 +-
lib/engine/gui/gtk-frontend/roster-view-gtk.cpp | 176 ++++++++++----------
lib/engine/notification/notification-core.h | 4 +-
lib/engine/plugin/plugin-core.cpp | 12 +-
lib/engine/presence/presence-core.cpp | 20 +-
lib/engine/presence/presence-core.h | 4 +-
lib/settings/ekiga-settings.h | 17 +-
25 files changed, 263 insertions(+), 268 deletions(-)
---
diff --git a/lib/engine/audiooutput/audiooutput-core.cpp b/lib/engine/audiooutput/audiooutput-core.cpp
index ae7d541..2a908ff 100644
--- a/lib/engine/audiooutput/audiooutput-core.cpp
+++ b/lib/engine/audiooutput/audiooutput-core.cpp
@@ -53,8 +53,8 @@ using namespace Ekiga;
static void
sound_event_changed (G_GNUC_UNUSED GSettings* settings,
- const gchar* key,
- gpointer data)
+ const gchar* key,
+ gpointer data)
{
g_return_if_fail (data != NULL);
@@ -65,8 +65,8 @@ sound_event_changed (G_GNUC_UNUSED GSettings* settings,
static void
audio_device_changed (GSettings* settings,
- G_GNUC_UNUSED const gchar* key,
- gpointer data)
+ G_GNUC_UNUSED const gchar* key,
+ gpointer data)
{
g_return_if_fail (data != NULL);
@@ -319,9 +319,9 @@ AudioOutputCore::visit_managers (boost::function1<bool, AudioOutputManager&> vis
void
AudioOutputCore::map_event (const std::string& event_name,
- const std::string& file_name,
- AudioOutputPS ps,
- bool enabled)
+ const std::string& file_name,
+ AudioOutputPS ps,
+ bool enabled)
{
audio_event_scheduler->set_file_name(event_name, file_name, ps, enabled);
}
@@ -340,8 +340,8 @@ AudioOutputCore::play_event (const std::string& event_name)
void
AudioOutputCore::start_play_event (const std::string& event_name,
- unsigned interval,
- unsigned repetitions)
+ unsigned interval,
+ unsigned repetitions)
{
audio_event_scheduler->add_event_to_queue(event_name, false, interval, repetitions);
}
@@ -393,7 +393,7 @@ AudioOutputCore::get_devices (std::vector <AudioOutputDevice>& devices)
void
AudioOutputCore::set_device(AudioOutputPS ps,
- const AudioOutputDevice& device)
+ const AudioOutputDevice& device)
{
PTRACE(4, "AudioOutputCore\tSetting device[" << ps << "]: " << device);
yield = true;
@@ -429,8 +429,8 @@ AudioOutputCore::set_device(AudioOutputPS ps,
void
AudioOutputCore::add_device (const std::string& sink,
- const std::string& device_name,
- HalManager* /*manager*/)
+ const std::string& device_name,
+ HalManager* /*manager*/)
{
PTRACE(4, "AudioOutputCore\tAdding device " << device_name);
yield = true;
@@ -457,8 +457,8 @@ AudioOutputCore::add_device (const std::string& sink,
void
AudioOutputCore::remove_device (const std::string& sink,
- const std::string& device_name,
- HalManager* /*manager*/)
+ const std::string& device_name,
+ HalManager* /*manager*/)
{
PTRACE(4, "AudioOutputCore\tRemoving device " << device_name);
yield = true;
@@ -488,8 +488,8 @@ AudioOutputCore::remove_device (const std::string& sink,
void
AudioOutputCore::start (unsigned channels,
- unsigned samplerate,
- unsigned bits_per_sample)
+ unsigned samplerate,
+ unsigned bits_per_sample)
{
yield = true;
PWaitAndSignal m_pri(core_mutex[primary]);
@@ -525,7 +525,7 @@ AudioOutputCore::stop()
void
AudioOutputCore::set_buffer_size (unsigned buffer_size,
- unsigned num_buffers)
+ unsigned num_buffers)
{
yield = true;
PWaitAndSignal m_pri(core_mutex[primary]);
@@ -539,8 +539,8 @@ AudioOutputCore::set_buffer_size (unsigned buffer_size,
void
AudioOutputCore::set_frame_data (const char* data,
- unsigned size,
- unsigned& bytes_written)
+ unsigned size,
+ unsigned& bytes_written)
{
if (yield) {
@@ -574,7 +574,7 @@ AudioOutputCore::set_frame_data (const char* data,
void
AudioOutputCore::set_volume (AudioOutputPS ps,
- unsigned volume)
+ unsigned volume)
{
PWaitAndSignal m_vol(volume_mutex);
@@ -584,11 +584,11 @@ AudioOutputCore::set_volume (AudioOutputPS ps,
void
AudioOutputCore::play_buffer(AudioOutputPS ps,
- const char* buffer,
- unsigned long len,
- unsigned channels,
- unsigned sample_rate,
- unsigned bps)
+ const char* buffer,
+ unsigned long len,
+ unsigned channels,
+ unsigned sample_rate,
+ unsigned bps)
{
switch (ps) {
@@ -618,8 +618,8 @@ AudioOutputCore::play_buffer(AudioOutputPS ps,
if (current_manager[secondary]) {
- internal_play(secondary, buffer, len, channels, sample_rate, bps);
- core_mutex[secondary].Signal();
+ internal_play(secondary, buffer, len, channels, sample_rate, bps);
+ core_mutex[secondary].Signal();
} else {
core_mutex[secondary].Signal();
PTRACE(1, "AudioOutputCore\tNo secondary audiooutput device defined, trying primary");
@@ -667,7 +667,7 @@ AudioOutputCore::internal_set_primary_device(const AudioOutputDevice& device)
void
AudioOutputCore::internal_set_manager (AudioOutputPS ps,
- const AudioOutputDevice& device)
+ const AudioOutputDevice& device)
{
current_manager[ps] = NULL;
for (std::set<AudioOutputManager*>::iterator iter = managers.begin ();
@@ -710,9 +710,9 @@ AudioOutputCore::internal_set_primary_fallback ()
bool
AudioOutputCore::internal_open (AudioOutputPS ps,
- unsigned channels,
- unsigned samplerate,
- unsigned bits_per_sample)
+ unsigned channels,
+ unsigned samplerate,
+ unsigned bits_per_sample)
{
PTRACE(4, "AudioOutputCore\tOpening device["<<ps<<"] with " << channels<< "-" << samplerate << "/" <<
bits_per_sample);
@@ -751,11 +751,11 @@ AudioOutputCore::internal_close (AudioOutputPS ps)
void
AudioOutputCore::internal_play(AudioOutputPS ps,
- const char* buffer,
- unsigned long len,
- unsigned channels,
- unsigned sample_rate,
- unsigned bps)
+ const char* buffer,
+ unsigned long len,
+ unsigned channels,
+ unsigned sample_rate,
+ unsigned bps)
{
unsigned long pos = 0;
unsigned bytes_written = 0;
@@ -780,7 +780,7 @@ AudioOutputCore::internal_play(AudioOutputPS ps,
void
AudioOutputCore::calculate_average_level (const short*buffer,
- unsigned size)
+ unsigned size)
{
int sum = 0;
unsigned csize = 0;
diff --git a/lib/engine/components/opal/opal-account.h b/lib/engine/components/opal/opal-account.h
index 3917468..d33fb4e 100644
--- a/lib/engine/components/opal/opal-account.h
+++ b/lib/engine/components/opal/opal-account.h
@@ -80,14 +80,14 @@ public:
typedef enum { SIP, Ekiga, DiamondCard, H323 } Type;
static xmlNodePtr build_node (Account::Type typus,
- std::string name,
- std::string host,
- std::string outbound_proxy,
- std::string user,
- std::string auth_user,
- std::string password,
- bool enabled,
- unsigned timeout);
+ std::string name,
+ std::string host,
+ std::string outbound_proxy,
+ std::string user,
+ std::string auth_user,
+ std::string password,
+ bool enabled,
+ unsigned timeout);
/* The Opal::Account is implemented using the H.323 and SIP
* EndPoints from OPAL.
@@ -200,7 +200,7 @@ public:
* want its Register method to take a const account...
*/
void handle_registration_event (RegistrationState state_,
- const std::string info,
+ const std::string info,
const std::string & aor);
/* This method is public to be called by an opal endpoint, which will push
@@ -215,17 +215,17 @@ protected:
private:
Account (Bank & bank,
- boost::weak_ptr<Ekiga::PresenceCore> _presence_core,
- boost::shared_ptr<Ekiga::NotificationCore> _notification_core,
- boost::shared_ptr<Ekiga::PersonalDetails> _personal_details,
- boost::shared_ptr<Ekiga::AudioOutputCore> _audiooutput_core,
+ boost::weak_ptr<Ekiga::PresenceCore> _presence_core,
+ boost::shared_ptr<Ekiga::NotificationCore> _notification_core,
+ boost::shared_ptr<Ekiga::PersonalDetails> _personal_details,
+ boost::shared_ptr<Ekiga::AudioOutputCore> _audiooutput_core,
EndPoint& _endpoint,
#ifdef HAVE_H323
H323::EndPoint* _h323_endpoint,
#endif
Sip::EndPoint* _sip_endpoint,
- boost::function0<std::list<std::string> > _existing_groups,
- xmlNodePtr node_);
+ boost::function0<std::list<std::string> > _existing_groups,
+ xmlNodePtr node_);
boost::shared_ptr<Presentity> load_presentity (boost::weak_ptr<Ekiga::PresenceCore> _presence_core,
boost::function0<std::list<std::string> >
_existing_groups,
xmlNodePtr _node);
@@ -239,11 +239,11 @@ private:
void add_contact ();
bool on_add_contact_form_submitted (bool submitted,
- Ekiga::Form& result,
+ Ekiga::Form& result,
std::string& error);
bool on_edit_form_submitted (bool submitted,
- Ekiga::Form &result,
+ Ekiga::Form &result,
std::string& error);
void on_consult (const std::string url);
@@ -255,8 +255,6 @@ private:
Type type;
mutable RegistrationState state;
bool dead;
- bool failed;
- std::string aid;
std::string status; // the state, as a string
int message_waiting_number;
std::string protocol_name;
@@ -271,8 +269,8 @@ private:
xmlNodePtr node;
xmlNodePtr roster_node;
void presence_status_in_main (std::string uri,
- std::string presence,
- std::string status) const;
+ std::string presence,
+ std::string status) const;
Bank & bank;
diff --git a/lib/engine/components/opal/opal-audio.cpp b/lib/engine/components/opal/opal-audio.cpp
index 900bb64..6801d38 100644
--- a/lib/engine/components/opal/opal-audio.cpp
+++ b/lib/engine/components/opal/opal-audio.cpp
@@ -40,7 +40,7 @@
#include "opal-audio.h"
PSoundChannel_EKIGA::PSoundChannel_EKIGA (boost::shared_ptr<Ekiga::AudioInputCore> _audioinput_core,
- boost::shared_ptr<Ekiga::AudioOutputCore> _audiooutput_core):
+ boost::shared_ptr<Ekiga::AudioOutputCore> _audiooutput_core):
audioinput_core (_audioinput_core),
audiooutput_core (_audiooutput_core)
{
@@ -49,12 +49,12 @@ PSoundChannel_EKIGA::PSoundChannel_EKIGA (boost::shared_ptr<Ekiga::AudioInputCor
PSoundChannel_EKIGA::PSoundChannel_EKIGA (const PString & /*_device*/,
- Directions dir,
- unsigned numChannels,
- unsigned sampleRate,
- unsigned bitsPerSample,
- boost::shared_ptr<Ekiga::AudioInputCore> _audioinput_core,
- boost::shared_ptr<Ekiga::AudioOutputCore> _audiooutput_core):
+ Directions dir,
+ unsigned numChannels,
+ unsigned sampleRate,
+ unsigned bitsPerSample,
+ boost::shared_ptr<Ekiga::AudioInputCore> _audioinput_core,
+ boost::shared_ptr<Ekiga::AudioOutputCore> _audiooutput_core):
audioinput_core (_audioinput_core),
audiooutput_core (_audiooutput_core)
{
diff --git a/lib/engine/components/opal/opal-bank.cpp b/lib/engine/components/opal/opal-bank.cpp
index 2ded6c5..73744b7 100644
--- a/lib/engine/components/opal/opal-bank.cpp
+++ b/lib/engine/components/opal/opal-bank.cpp
@@ -185,7 +185,7 @@ Opal::Bank::new_account (Account::Type acc_type,
case Opal::Account::DiamondCard:
request->link (_("Get an Ekiga Call Out account"),
- "https://www.diamondcard.us/exec/voip-login?act=sgn&spo=ekiga";);
+ "https://www.diamondcard.us/exec/voip-login?act=sgn&spo=ekiga";);
request->hidden ("name", "Ekiga Call Out");
request->hidden ("host", "sip.diamondcard.us");
request->text ("user", _("_Account ID"), username, _("1234567890"),
@@ -474,45 +474,45 @@ Opal::Bank::migrate_from_gconf (const std::list<std::string> old)
switch (ii) {
case 0:
- enabled = atoi (pch);
- break;
+ enabled = atoi (pch);
+ break;
case 3:
- name = pch;
- break;
+ name = pch;
+ break;
case 4:
- protocol_name = pch;
- break;
+ protocol_name = pch;
+ break;
case 5:
- host = pch;
- break;
+ host = pch;
+ break;
case 7:
- user = pch;
- break;
+ user = pch;
+ break;
case 8:
- auth_user = pch;
- break;
+ auth_user = pch;
+ break;
case 9:
- password = pch;
- if (password == " ")
- password = "";
- break;
+ password = pch;
+ if (password == " ")
+ password = "";
+ break;
case 10:
- timeout = atoi (pch);
- break;
+ timeout = atoi (pch);
+ break;
case 1:
case 2:
case 6:
case 11:
default:
- break;
+ break;
}
pch = strtok (NULL, "|");
ii++;
diff --git a/lib/engine/components/opal/opal-bank.h b/lib/engine/components/opal/opal-bank.h
index 205de89..38df347 100644
--- a/lib/engine/components/opal/opal-bank.h
+++ b/lib/engine/components/opal/opal-bank.h
@@ -43,7 +43,6 @@
#include "contact-core.h"
#include "presence-core.h"
-#include "opal-account.h"
#include "ekiga-settings.h"
#include "sip-endpoint.h"
@@ -171,7 +170,7 @@ private:
void on_account_removed (boost::shared_ptr<Account> account);
void on_mwi_event (std::string aor,
- std::string info);
+ std::string info);
void update_sip_endpoint_aor_map ();
diff --git a/lib/engine/components/opal/opal-call.cpp b/lib/engine/components/opal/opal-call.cpp
index 309657e..a55c92d 100644
--- a/lib/engine/components/opal/opal-call.cpp
+++ b/lib/engine/components/opal/opal-call.cpp
@@ -223,9 +223,9 @@ Opal::Call::toggle_stream_pause (StreamType type)
stream->SetPaused (!paused);
if (paused)
- Ekiga::Runtime::run_in_main (boost::bind (boost::ref (stream_resumed), this->shared_from_this (),
stream_name, type));
+ Ekiga::Runtime::run_in_main (boost::bind (boost::ref (stream_resumed), this->shared_from_this (),
stream_name, type));
else
- Ekiga::Runtime::run_in_main (boost::bind (boost::ref (stream_paused), this->shared_from_this (),
stream_name, type));
+ Ekiga::Runtime::run_in_main (boost::bind (boost::ref (stream_paused), this->shared_from_this (),
stream_name, type));
}
}
}
@@ -564,7 +564,7 @@ Opal::Call::OnCleared ()
OpalConnection::AnswerCallResponse
Opal::Call::OnAnswerCall (OpalConnection & connection,
- const PString & caller)
+ const PString & caller)
{
remote_party_name = (const char *) caller;
diff --git a/lib/engine/components/opal/opal-main.cpp b/lib/engine/components/opal/opal-main.cpp
index 44e8f6f..6a37180 100644
--- a/lib/engine/components/opal/opal-main.cpp
+++ b/lib/engine/components/opal/opal-main.cpp
@@ -66,8 +66,8 @@ public:
bool try_initialize_more (Ekiga::ServiceCore& core,
- int* /*argc*/,
- char** /*argv*/[])
+ int* /*argc*/,
+ char** /*argv*/[])
{
boost::shared_ptr<Ekiga::ContactCore> contact_core = core.get<Ekiga::ContactCore> ("contact-core");
boost::shared_ptr<Ekiga::PresenceCore> presence_core = core.get<Ekiga::PresenceCore> ("presence-core");
@@ -81,9 +81,9 @@ public:
boost::shared_ptr<Bank> account_store = core.get<Bank> ("opal-account-store");
if (contact_core && presence_core && call_core
- && account_core && audioinput_core && videoinput_core
- && audiooutput_core && videooutput_core && personal_details
- && !account_store) {
+ && account_core && audioinput_core && videoinput_core
+ && audiooutput_core && videooutput_core && personal_details
+ && !account_store) {
Opal::EndPoint& endpoint = GnomeMeeting::Process ()->GetEndPoint ();
Opal::Sip::EndPoint& sip_endpoint = endpoint.GetSipEndPoint ();
diff --git a/lib/engine/components/opal/opal-presentity.h b/lib/engine/components/opal/opal-presentity.h
index 78515c2..2a80459 100644
--- a/lib/engine/components/opal/opal-presentity.h
+++ b/lib/engine/components/opal/opal-presentity.h
@@ -67,8 +67,8 @@ namespace Opal
/* build a node describing a valid presentity, which the caller
* will then use to create a valid instance using the ctor */
static xmlNodePtr build_node (const std::string name_,
- const std::string uri_,
- const std::list<std::string> groups_);
+ const std::string uri_,
+ const std::list<std::string> groups_);
static boost::shared_ptr<Presentity> create (Account & _account,
boost::weak_ptr<Ekiga::PresenceCore> _presence_core,
@@ -101,7 +101,7 @@ namespace Opal
// method to rename a group for this presentity
void rename_group (const std::string old_name,
- const std::string new_name);
+ const std::string new_name);
/* Those allow the parent Opal::Heap to manage this presentity
* effectively.
@@ -132,7 +132,7 @@ namespace Opal
*/
void edit_presentity ();
bool edit_presentity_form_submitted (bool submitted,
- Ekiga::Form& result,
+ Ekiga::Form& result,
std::string& error);
Account & account;
diff --git a/lib/engine/components/opal/process/h323-endpoint.cpp
b/lib/engine/components/opal/process/h323-endpoint.cpp
index b96af92..7eb19a4 100644
--- a/lib/engine/components/opal/process/h323-endpoint.cpp
+++ b/lib/engine/components/opal/process/h323-endpoint.cpp
@@ -267,8 +267,8 @@ Opal::H323::EndPoint::IsRegisteredWithGatekeeper (const PString & address)
bool
Opal::H323::EndPoint::OnIncomingConnection (OpalConnection & connection,
- G_GNUC_UNUSED unsigned options,
- G_GNUC_UNUSED OpalConnection::StringOptions *stroptions)
+ G_GNUC_UNUSED unsigned options,
+ G_GNUC_UNUSED OpalConnection::StringOptions *stroptions)
{
PTRACE (3, "Opal::H323::EndPoint\tIncoming connection");
diff --git a/lib/engine/components/opal/process/h323-endpoint.h
b/lib/engine/components/opal/process/h323-endpoint.h
index e530a38..9d22d86 100644
--- a/lib/engine/components/opal/process/h323-endpoint.h
+++ b/lib/engine/components/opal/process/h323-endpoint.h
@@ -61,9 +61,9 @@ namespace Opal {
{
PCLASSINFO(EndPoint, H323EndPoint);
- public:
+ public:
EndPoint (Opal::EndPoint & ep,
- const Ekiga::ServiceCore& core);
+ const Ekiga::ServiceCore& core);
~EndPoint ();
@@ -96,7 +96,7 @@ namespace Opal {
bool IsRegisteredWithGatekeeper (const PString & address);
- private:
+ private:
bool OnIncomingConnection (OpalConnection &connection,
unsigned options,
OpalConnection::StringOptions *str_options);
diff --git a/lib/engine/components/opal/process/opal-endpoint.cpp
b/lib/engine/components/opal/process/opal-endpoint.cpp
index d416828..d6deab9 100644
--- a/lib/engine/components/opal/process/opal-endpoint.cpp
+++ b/lib/engine/components/opal/process/opal-endpoint.cpp
@@ -530,8 +530,8 @@ Opal::EndPoint::HandleSTUNResult ()
stun_thread = 0;
if (result == PSTUNClient::SymmetricNat
- || result == PSTUNClient::BlockedNat
- || result == PSTUNClient::PartiallyBlocked) {
+ || result == PSTUNClient::BlockedNat
+ || result == PSTUNClient::PartiallyBlocked) {
error = true;
}
@@ -549,7 +549,7 @@ Opal::EndPoint::HandleSTUNResult ()
if (error) {
ReportSTUNError (_("Ekiga did not manage to configure your network settings automatically. We suggest"
- " you disable STUN support and relay on a SIP provider that supports NAT
environments.\n\n"));
+ " you disable STUN support and relay on a SIP provider that supports NAT
environments.\n\n"));
isReady = true;
ready ();
}
diff --git a/lib/engine/components/opal/process/sip-endpoint.cpp
b/lib/engine/components/opal/process/sip-endpoint.cpp
index fe86ceb..88f61f8 100644
--- a/lib/engine/components/opal/process/sip-endpoint.cpp
+++ b/lib/engine/components/opal/process/sip-endpoint.cpp
@@ -538,8 +538,8 @@ Opal::Sip::EndPoint::OnRegistrationStatus (const RegistrationStatus & status)
void
Opal::Sip::EndPoint::OnMWIReceived (const PString & party,
- OpalManager::MessageWaitingType /*type*/,
- const PString & info)
+ OpalManager::MessageWaitingType /*type*/,
+ const PString & info)
{
std::string mwi = info;
std::transform (mwi.begin(), mwi.end(), mwi.begin(), ::tolower);
@@ -553,8 +553,8 @@ Opal::Sip::EndPoint::OnMWIReceived (const PString & party,
bool
Opal::Sip::EndPoint::OnIncomingConnection (OpalConnection &connection,
- unsigned options,
- OpalConnection::StringOptions *stroptions)
+ unsigned options,
+ OpalConnection::StringOptions *stroptions)
{
PTRACE (3, "Opal::Sip::EndPoint\tIncoming connection");
diff --git a/lib/engine/components/opal/process/sip-endpoint.h
b/lib/engine/components/opal/process/sip-endpoint.h
index d0172ef..6305a89 100644
--- a/lib/engine/components/opal/process/sip-endpoint.h
+++ b/lib/engine/components/opal/process/sip-endpoint.h
@@ -63,7 +63,7 @@ namespace Opal {
public:
EndPoint (Opal::EndPoint& ep,
- const Ekiga::ServiceCore& core);
+ const Ekiga::ServiceCore& core);
~EndPoint ();
diff --git a/lib/engine/friend-or-foe/friend-or-foe.cpp b/lib/engine/friend-or-foe/friend-or-foe.cpp
index 4e559a0..14e3359 100644
--- a/lib/engine/friend-or-foe/friend-or-foe.cpp
+++ b/lib/engine/friend-or-foe/friend-or-foe.cpp
@@ -36,7 +36,7 @@
Ekiga::FriendOrFoe::Identification
Ekiga::FriendOrFoe::decide (const std::string domain,
- const std::string token)
+ const std::string token)
{
Identification answer = Unknown;
Identification iter_answer;
diff --git a/lib/engine/friend-or-foe/friend-or-foe.h b/lib/engine/friend-or-foe/friend-or-foe.h
index 9bae07e..a1580d3 100644
--- a/lib/engine/friend-or-foe/friend-or-foe.h
+++ b/lib/engine/friend-or-foe/friend-or-foe.h
@@ -74,7 +74,7 @@ namespace Ekiga
{}
virtual Identification decide (const std::string domain,
- const std::string token) = 0;
+ const std::string token) = 0;
protected:
virtual void pull_actions (Actor & actor,
@@ -83,7 +83,7 @@ namespace Ekiga
};
Identification decide (const std::string domain,
- const std::string token);
+ const std::string token);
void add_helper (boost::shared_ptr<Helper> helper);
diff --git a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
index afb444e..e1e780e 100644
--- a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
@@ -93,7 +93,7 @@ G_DEFINE_TYPE (CallHistoryViewGtk, call_history_view_gtk, GTK_TYPE_SCROLLED_WIND
/* react to a new call being inserted in history */
static void
on_contact_added (Ekiga::ContactPtr contact,
- GtkListStore *store)
+ GtkListStore *store)
{
time_t t;
struct tm *timeinfo = NULL;
@@ -142,17 +142,17 @@ on_contact_added (Ekiga::ContactPtr contact,
info << hcontact->get_call_duration ();
gtk_list_store_set (store, &iter,
- COLUMN_CONTACT, contact.get (),
- COLUMN_PIXBUF, id.c_str (),
- COLUMN_NAME, contact->get_name ().c_str (),
- COLUMN_INFO, info.str ().c_str (),
- -1);
+ COLUMN_CONTACT, contact.get (),
+ COLUMN_PIXBUF, id.c_str (),
+ COLUMN_NAME, contact->get_name ().c_str (),
+ COLUMN_INFO, info.str ().c_str (),
+ -1);
}
static void
on_selection_changed (G_GNUC_UNUSED GtkTreeSelection* selection,
- gpointer data)
+ gpointer data)
{
CallHistoryViewGtk* self = NULL;
History::Contact *contact = NULL;
@@ -179,7 +179,7 @@ on_selection_changed (G_GNUC_UNUSED GtkTreeSelection* selection,
static bool
on_visit_contacts (Ekiga::ContactPtr contact,
- GtkListStore *store)
+ GtkListStore *store)
{
on_contact_added (contact, store);
return true;
@@ -224,8 +224,8 @@ on_book_cleared (CallHistoryViewGtk* data)
/* react to user clicks */
static gint
on_clicked (G_GNUC_UNUSED GtkWidget *tree,
- GdkEventButton *event,
- gpointer data)
+ GdkEventButton *event,
+ gpointer data)
{
CallHistoryViewGtk *self = CALL_HISTORY_VIEW_GTK (data);
@@ -287,12 +287,12 @@ call_history_view_gtk_class_init (CallHistoryViewGtkClass* klass)
signals[ACTIONS_CHANGED_SIGNAL] =
g_signal_new ("actions-changed",
- G_OBJECT_CLASS_TYPE (gobject_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (CallHistoryViewGtkClass, selection_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1, G_TYPE_MENU_MODEL);
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (CallHistoryViewGtkClass, selection_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1, G_TYPE_MENU_MODEL);
}
/* public api */
@@ -316,7 +316,7 @@ call_history_view_gtk_new (boost::shared_ptr<History::Book> book,
self->priv = new _CallHistoryViewGtkPrivate (book);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
/* build the store then the tree */
store = gtk_list_store_new (COLUMN_NUMBER,
@@ -339,32 +339,32 @@ call_history_view_gtk_new (boost::shared_ptr<History::Book> book,
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
gtk_tree_view_column_add_attribute (column, renderer,
- "icon-name", COLUMN_ERROR_PIXBUF);
+ "icon-name", COLUMN_ERROR_PIXBUF);
g_object_set (renderer, "xalign", 0.0, "yalign", 0.5, "xpad", 6, "stock-size", 1, NULL);
/* show name and text */
renderer = gm_cell_renderer_bitext_new ();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
gtk_tree_view_column_add_attribute (column, renderer,
- "primary-text", COLUMN_NAME);
+ "primary-text", COLUMN_NAME);
gtk_tree_view_column_add_attribute (column, renderer,
- "secondary-text", COLUMN_INFO);
+ "secondary-text", COLUMN_INFO);
gtk_tree_view_append_column (self->priv->tree, column);
/* show icon */
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_end (column, renderer, FALSE);
gtk_tree_view_column_add_attribute (column, renderer,
- "icon-name", COLUMN_PIXBUF);
+ "icon-name", COLUMN_PIXBUF);
g_object_set (renderer, "xalign", 1.0, "yalign", 0.5, "xpad", 6, "stock-size", 2, NULL);
/* react to user clicks */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->tree));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
g_signal_connect (selection, "changed",
- G_CALLBACK (on_selection_changed), self);
+ G_CALLBACK (on_selection_changed), self);
g_signal_connect (self->priv->tree, "event-after",
- G_CALLBACK (on_clicked), self);
+ G_CALLBACK (on_clicked), self);
g_signal_connect (GTK_WIDGET (self), "map",
G_CALLBACK (on_map_cb), self);
@@ -383,7 +383,7 @@ call_history_view_gtk_new (boost::shared_ptr<History::Book> book,
void
call_history_view_gtk_get_selected (CallHistoryViewGtk* self,
- History::Contact** contact)
+ History::Contact** contact)
{
g_return_if_fail (IS_CALL_HISTORY_VIEW_GTK (self) && contact != NULL);
@@ -393,11 +393,10 @@ call_history_view_gtk_get_selected (CallHistoryViewGtk* self,
selection = gtk_tree_view_get_selection (self->priv->tree);
- if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
gtk_tree_model_get (model, &iter,
- COLUMN_CONTACT, contact,
- -1);
- } else
+ COLUMN_CONTACT, contact,
+ -1);
+ else
*contact = NULL;
}
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index ae5e4e8..75c2b4f 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -864,7 +864,7 @@ on_stream_closed_cb (boost::shared_ptr<Ekiga::Call> /* call */,
static bool
on_handle_questions (Ekiga::FormRequestPtr request,
- gpointer data)
+ gpointer data)
{
FormDialog dialog (request, GTK_WIDGET (data));
diff --git a/lib/engine/gui/gtk-frontend/ekiga-app.cpp b/lib/engine/gui/gtk-frontend/ekiga-app.cpp
index 28a33b9..a8570e6 100644
--- a/lib/engine/gui/gtk-frontend/ekiga-app.cpp
+++ b/lib/engine/gui/gtk-frontend/ekiga-app.cpp
@@ -740,9 +740,9 @@ gm_application_show_help (GmApplication *app,
/* try returned locale first, it may be fully qualified e.g. zh_CN */
index_path = g_build_filename (WIN32_HELP_DIR, locale,
- WIN32_HELP_FILE, NULL);
+ WIN32_HELP_FILE, NULL);
hinst = (int) ShellExecute (NULL, "open", index_path, NULL,
- DATA_DIR, SW_SHOWNORMAL);
+ DATA_DIR, SW_SHOWNORMAL);
g_free (index_path);
}
@@ -750,9 +750,9 @@ gm_application_show_help (GmApplication *app,
/* on error, try short locale */
*loc_ = 0;
index_path = g_build_filename (WIN32_HELP_DIR, locale,
- WIN32_HELP_FILE, NULL);
+ WIN32_HELP_FILE, NULL);
hinst = (int) ShellExecute (NULL, "open", index_path, NULL,
- DATA_DIR, SW_SHOWNORMAL);
+ DATA_DIR, SW_SHOWNORMAL);
g_free (index_path);
}
@@ -763,7 +763,7 @@ gm_application_show_help (GmApplication *app,
/* on error or missing locale, try default locale */
index_path = g_build_filename (WIN32_HELP_DIR, "C", WIN32_HELP_FILE, NULL);
(void)ShellExecute (NULL, "open", index_path, NULL,
- DATA_DIR, SW_SHOWNORMAL);
+ DATA_DIR, SW_SHOWNORMAL);
g_free (index_path);
}
#else /* !WIN32 */
diff --git a/lib/engine/gui/gtk-frontend/preferences-window.cpp
b/lib/engine/gui/gtk-frontend/preferences-window.cpp
index 41870a4..ae8d115 100644
--- a/lib/engine/gui/gtk-frontend/preferences-window.cpp
+++ b/lib/engine/gui/gtk-frontend/preferences-window.cpp
@@ -399,7 +399,7 @@ static void sound_event_selected_cb (GtkTreeSelection *selection,
/* DESCRIPTION : This callback is called when the user clicks
* on the play button in the sound events list.
- * BEHAVIOR : Plays the currently selected sound event using the
+ * BEHAVIOR : Plays the currently selected sound event using the
* selected audio player and plugin through a GMSoundEvent.
* PRE : The entry.
*/
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index 6dbfad9..731542e 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -171,8 +171,8 @@ static void on_selection_changed (GtkTreeSelection* actions,
* PRE : The gpointer must point to the RosterViewGtk GObject.
*/
static gint on_view_event_after (GtkWidget *tree_view,
- GdkEventButton *event,
- gpointer data);
+ GdkEventButton *event,
+ gpointer data);
/* DESCRIPTION : Called when the RosterViewGtk widget becomes visible.
@@ -189,14 +189,14 @@ static void on_map_cb (G_GNUC_UNUSED GtkWidget *widget,
* PRE : The gpointer must point to a RosterViewGtk object.
*/
static gboolean presentity_hide_show_offline (RosterViewGtk* self,
- GtkTreeModel* model,
- GtkTreeIter* iter);
+ GtkTreeModel* model,
+ GtkTreeIter* iter);
static gboolean group_hide_show_offline (RosterViewGtk* self,
- GtkTreeModel* model,
- GtkTreeIter* iter);
+ GtkTreeModel* model,
+ GtkTreeIter* iter);
static gboolean tree_model_filter_hide_show_offline (GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer data);
+ GtkTreeIter *iter,
+ gpointer data);
/* DESCRIPTION : Called for a given renderer in order to show or hide it.
@@ -206,10 +206,10 @@ static gboolean tree_model_filter_hide_show_offline (GtkTreeModel *model,
* once casted using GPOINTER_TO_INT.
*/
static void show_cell_data_func (GtkTreeViewColumn *column,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer data);
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data);
/* DESCRIPTION : Called for a given renderer in order to modify properties.
@@ -266,7 +266,7 @@ static void on_account_updated (RosterViewGtk* self,
* PRE : /
*/
static bool on_visit_clusters (RosterViewGtk* self,
- Ekiga::ClusterPtr cluster);
+ Ekiga::ClusterPtr cluster);
/* DESCRIPTION : Called when a new cluster has been added
@@ -274,7 +274,7 @@ static bool on_visit_clusters (RosterViewGtk* self,
* PRE : /
*/
static void on_cluster_added (RosterViewGtk* self,
- Ekiga::ClusterPtr cluster);
+ Ekiga::ClusterPtr cluster);
/* DESCRIPTION : Called when visiting a new cluster
@@ -282,7 +282,7 @@ static void on_cluster_added (RosterViewGtk* self,
* PRE : /
*/
static bool visit_heaps (RosterViewGtk* self,
- Ekiga::HeapPtr heap);
+ Ekiga::HeapPtr heap);
/* DESCRIPTION : Called when the or heap_added signal has been emitted
@@ -290,7 +290,7 @@ static bool visit_heaps (RosterViewGtk* self,
* PRE : /
*/
static void on_heap_added (RosterViewGtk* self,
- Ekiga::HeapPtr heap);
+ Ekiga::HeapPtr heap);
/* DESCRIPTION : Called when the heap_updated signal has been emitted
@@ -298,7 +298,7 @@ static void on_heap_added (RosterViewGtk* self,
* PRE : /
*/
static void on_heap_updated (RosterViewGtk* self,
- Ekiga::HeapPtr heap);
+ Ekiga::HeapPtr heap);
/* DESCRIPTION : Called when the heap_removed signal has been emitted.
@@ -308,7 +308,7 @@ static void on_heap_updated (RosterViewGtk* self,
* PRE : /
*/
static void on_heap_removed (RosterViewGtk* self,
- Ekiga::HeapPtr heap);
+ Ekiga::HeapPtr heap);
/* DESCRIPTION : Called when visiting a new heap
@@ -326,8 +326,8 @@ static bool on_visit_presentities (RosterViewGtk* self,
* PRE : A valid Heap.
*/
static void on_presentity_added (RosterViewGtk* self,
- GtkTreeIter heap_iter,
- Ekiga::PresentityPtr presentity);
+ GtkTreeIter heap_iter,
+ Ekiga::PresentityPtr presentity);
/* DESCRIPTION : Called when the presentity_updated signal has been emitted.
@@ -336,7 +336,7 @@ static void on_presentity_added (RosterViewGtk* self,
*/
static void on_presentity_updated (RosterViewGtk* self,
GtkTreeIter heap_iter,
- Ekiga::PresentityPtr presentity);
+ Ekiga::PresentityPtr presentity);
/* DESCRIPTION : Called when the presentity_removed signal has been emitted.
@@ -344,8 +344,8 @@ static void on_presentity_updated (RosterViewGtk* self,
* PRE : A valid Heap.
*/
static void on_presentity_removed (RosterViewGtk* self,
- GtkTreeIter heap_iter,
- Ekiga::PresentityPtr presentity);
+ GtkTreeIter heap_iter,
+ Ekiga::PresentityPtr presentity);
/* DESCRIPTION : Called when the PresenceCore has a form request to handle.
@@ -353,7 +353,7 @@ static void on_presentity_removed (RosterViewGtk* self,
* PRE : The given pointer is the roster view widget.
*/
static bool on_handle_questions (RosterViewGtk* self,
- Ekiga::FormRequestPtr request);
+ Ekiga::FormRequestPtr request);
/*
@@ -476,8 +476,8 @@ static void roster_view_gtk_update_account (RosterViewGtk *self,
/* Implementation of the helpers */
static void
on_clicked_fold (RosterViewGtk* self,
- GtkTreePath* path,
- const gchar* name)
+ GtkTreePath* path,
+ const gchar* name)
{
gboolean row_expanded = TRUE;
GSList* existing_group = NULL;
@@ -485,13 +485,13 @@ on_clicked_fold (RosterViewGtk* self,
row_expanded = gtk_tree_view_row_expanded (GTK_TREE_VIEW (self->priv->tree_view), path);
existing_group = g_slist_find_custom (self->priv->folded_groups,
- name,
- (GCompareFunc) g_ascii_strcasecmp);
+ name,
+ (GCompareFunc) g_ascii_strcasecmp);
if (!row_expanded) {
if (existing_group == NULL) {
self->priv->folded_groups = g_slist_append (self->priv->folded_groups,
- g_strdup (name));
+ g_strdup (name));
}
}
else {
@@ -604,7 +604,7 @@ on_show_offline_contacts_changed_cb (GSettings *settings,
static void
on_selection_changed (GtkTreeSelection* selection,
- gpointer data)
+ gpointer data)
{
RosterViewGtk* self = NULL;
GtkTreeModel *model = NULL;
@@ -663,8 +663,8 @@ on_selection_changed (GtkTreeSelection* selection,
static gint
on_view_event_after (GtkWidget *tree_view,
- GdkEventButton *event,
- gpointer data)
+ GdkEventButton *event,
+ gpointer data)
{
RosterViewGtk *self = NULL;
GtkTreeModel *model = NULL;
@@ -755,8 +755,8 @@ on_map_cb (G_GNUC_UNUSED GtkWidget *widget,
static gboolean
presentity_hide_show_offline (RosterViewGtk* self,
- GtkTreeModel* model,
- GtkTreeIter* iter)
+ GtkTreeModel* model,
+ GtkTreeIter* iter)
{
gboolean result = FALSE;
@@ -764,8 +764,8 @@ presentity_hide_show_offline (RosterViewGtk* self,
result = TRUE;
else
gtk_tree_model_get (model, iter,
- COLUMN_OFFLINE, &result,
- -1);
+ COLUMN_OFFLINE, &result,
+ -1);
return result;
}
@@ -797,8 +797,8 @@ group_hide_show_offline (RosterViewGtk* self,
static gboolean
tree_model_filter_hide_show_offline (GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer data)
+ GtkTreeIter *iter,
+ gpointer data)
{
gboolean result = FALSE;
RosterViewGtk *self = NULL;
@@ -807,8 +807,8 @@ tree_model_filter_hide_show_offline (GtkTreeModel *model,
self = ROSTER_VIEW_GTK (data);
gtk_tree_model_get (model, iter,
- COLUMN_TYPE, &column_type,
- -1);
+ COLUMN_TYPE, &column_type,
+ -1);
switch (column_type) {
@@ -833,10 +833,10 @@ tree_model_filter_hide_show_offline (GtkTreeModel *model,
static void
show_cell_data_func (GtkTreeViewColumn * /*column*/,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer data)
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data)
{
gint column_type;
@@ -910,7 +910,7 @@ on_account_updated (RosterViewGtk* self,
static bool
on_visit_clusters (RosterViewGtk* self,
- Ekiga::ClusterPtr cluster)
+ Ekiga::ClusterPtr cluster)
{
on_cluster_added (self, cluster);
@@ -920,7 +920,7 @@ on_visit_clusters (RosterViewGtk* self,
static void
on_cluster_added (RosterViewGtk* self,
- Ekiga::ClusterPtr cluster)
+ Ekiga::ClusterPtr cluster)
{
boost::signals2::connection conn;
cluster->visit_heaps (boost::bind (&visit_heaps, self, _1));
@@ -937,7 +937,7 @@ on_cluster_added (RosterViewGtk* self,
static bool
visit_heaps (RosterViewGtk* self,
- Ekiga::HeapPtr heap)
+ Ekiga::HeapPtr heap)
{
on_heap_added (self, heap);
@@ -947,7 +947,7 @@ visit_heaps (RosterViewGtk* self,
static void
on_heap_added (RosterViewGtk* self,
- Ekiga::HeapPtr heap)
+ Ekiga::HeapPtr heap)
{
GtkTreeIter heap_iter;
boost::signals2::connection conn;
@@ -974,7 +974,7 @@ on_heap_added (RosterViewGtk* self,
static void
on_heap_updated (RosterViewGtk* self,
- Ekiga::HeapPtr heap)
+ Ekiga::HeapPtr heap)
{
GtkTreeIter iter;
@@ -985,7 +985,7 @@ on_heap_updated (RosterViewGtk* self,
static void
on_heap_removed (RosterViewGtk* self,
- Ekiga::HeapPtr heap)
+ Ekiga::HeapPtr heap)
{
GtkTreeIter iter;
@@ -1008,7 +1008,7 @@ on_visit_presentities (RosterViewGtk* self,
static void
on_presentity_added (RosterViewGtk* self,
GtkTreeIter heap_iter,
- Ekiga::PresentityPtr presentity)
+ Ekiga::PresentityPtr presentity)
{
std::list<std::string> groups = presentity->get_groups ();
GtkTreeIter group_iter;
@@ -1045,7 +1045,7 @@ on_presentity_added (RosterViewGtk* self,
static void
on_presentity_updated (RosterViewGtk* self,
GtkTreeIter heap_iter,
- Ekiga::PresentityPtr presentity)
+ Ekiga::PresentityPtr presentity)
{
GtkTreeModel *model;
GtkTreeIter group_iter;
@@ -1125,7 +1125,7 @@ on_presentity_updated (RosterViewGtk* self,
static void
on_presentity_removed (RosterViewGtk* self,
GtkTreeIter heap_iter,
- Ekiga::PresentityPtr presentity)
+ Ekiga::PresentityPtr presentity)
{
GtkTreeModel *model = NULL;
GtkTreeIter group_iter;
@@ -1152,7 +1152,7 @@ on_presentity_removed (RosterViewGtk* self,
static bool
on_handle_questions (RosterViewGtk* self,
- Ekiga::FormRequestPtr request)
+ Ekiga::FormRequestPtr request)
{
GtkWidget *parent = gtk_widget_get_toplevel (GTK_WIDGET (self));
FormDialog dialog (request, parent);
@@ -1449,9 +1449,9 @@ roster_view_gtk_update_heap (RosterViewGtk* self,
heap->get_name ().c_str ());
gtk_tree_store_set (self->priv->store, &iter,
- COLUMN_TYPE, TYPE_HEAP,
- COLUMN_HEAP, heap.get (),
- COLUMN_NAME, heap_name, -1);
+ COLUMN_TYPE, TYPE_HEAP,
+ COLUMN_HEAP, heap.get (),
+ COLUMN_NAME, heap_name, -1);
g_free (heap_name);
}
@@ -1582,7 +1582,7 @@ roster_view_gtk_init (RosterViewGtk* self)
gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 0);
gtk_frame_set_shadow_type (GTK_FRAME (self), GTK_SHADOW_NONE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
self->priv->store = gtk_tree_store_new (COLUMN_NUMBER,
G_TYPE_INT, // type
@@ -1600,28 +1600,28 @@ roster_view_gtk_init (RosterViewGtk* self)
GDK_TYPE_RGBA, // cell foreground color
G_TYPE_STRING, // group name (invisible)
G_TYPE_STRING, // presence
- G_TYPE_BOOLEAN); // offline
+ G_TYPE_BOOLEAN); // offline
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self->priv->store),
COLUMN_NAME, GTK_SORT_ASCENDING);
filtered = gtk_tree_model_filter_new (GTK_TREE_MODEL (self->priv->store),
- NULL);
+ NULL);
g_object_unref (self->priv->store);
self->priv->tree_view =
GTK_TREE_VIEW (gtk_tree_view_new_with_model (filtered));
g_object_unref (filtered);
gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filtered),
- tree_model_filter_hide_show_offline,
- self, NULL);
+ tree_model_filter_hide_show_offline,
+ self, NULL);
gtk_tree_view_set_headers_visible (self->priv->tree_view, FALSE);
gtk_tree_view_set_grid_lines (self->priv->tree_view, GTK_TREE_VIEW_GRID_LINES_HORIZONTAL);
gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (vbox));
gtk_box_pack_start (GTK_BOX (vbox),
- GTK_WIDGET (scrolled_window), TRUE, TRUE, 0);
+ GTK_WIDGET (scrolled_window), TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (scrolled_window),
- GTK_WIDGET (self->priv->tree_view));
+ GTK_WIDGET (self->priv->tree_view));
/* Build the GtkTreeView */
// We hide the normal GTK+ expanders and use our own
@@ -1657,7 +1657,7 @@ roster_view_gtk_init (RosterViewGtk* self)
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (col, renderer, TRUE);
gtk_tree_view_column_add_attribute (col, renderer,
- "text", COLUMN_NAME);
+ "text", COLUMN_NAME);
gtk_tree_view_column_add_attribute (col, renderer, "foreground-rgba", COLUMN_FOREGROUND_COLOR);
g_object_set (renderer, "weight", PANGO_WEIGHT_BOLD, NULL);
gtk_tree_view_column_set_cell_data_func (col, renderer,
@@ -1667,8 +1667,8 @@ roster_view_gtk_init (RosterViewGtk* self)
g_object_set (renderer, "xalign", 0.5, "xpad", 6, "stock-size", 1, NULL);
gtk_tree_view_column_pack_start (col, renderer, FALSE);
gtk_tree_view_column_add_attribute (col, renderer,
- "icon-name",
- COLUMN_PRESENCE_ICON);
+ "icon-name",
+ COLUMN_PRESENCE_ICON);
gtk_tree_view_column_set_cell_data_func (col, renderer,
show_cell_data_func, GINT_TO_POINTER (TYPE_PRESENTITY), NULL);
@@ -1685,8 +1685,8 @@ roster_view_gtk_init (RosterViewGtk* self)
g_object_set (renderer, "xalign", 1.0, "xpad", 0, NULL);
gtk_tree_view_column_pack_start (col, renderer, FALSE);
gtk_tree_view_column_add_attribute (col, renderer,
- "pixbuf",
- COLUMN_AVATAR_PIXBUF);
+ "pixbuf",
+ COLUMN_AVATAR_PIXBUF);
gtk_tree_view_column_set_cell_data_func (col, renderer,
show_cell_data_func, GINT_TO_POINTER (TYPE_PRESENTITY), NULL);
@@ -1694,11 +1694,11 @@ roster_view_gtk_init (RosterViewGtk* self)
g_object_set (renderer, "xalign", 1.0, "xpad", 6, NULL);
gtk_tree_view_column_pack_end (col, renderer, FALSE);
gtk_tree_view_column_add_attribute (col, renderer,
- "pixbuf",
- COLUMN_ACCOUNT_STATUS_ICON);
+ "pixbuf",
+ COLUMN_ACCOUNT_STATUS_ICON);
gtk_tree_view_column_add_attribute (col, renderer,
- "visible",
- COLUMN_ACCOUNT_STATUS_ICON_VISIBLE);
+ "visible",
+ COLUMN_ACCOUNT_STATUS_ICON_VISIBLE);
renderer = gtk_cell_renderer_spinner_new ();
g_object_set (renderer, "xalign", 1.0,
@@ -1706,28 +1706,28 @@ roster_view_gtk_init (RosterViewGtk* self)
"xpad", 6, NULL);
gtk_tree_view_column_pack_end (col, renderer, FALSE);
gtk_tree_view_column_add_attribute (col, renderer,
- "pulse",
- COLUMN_ACCOUNT_SPINNER_PULSE);
+ "pulse",
+ COLUMN_ACCOUNT_SPINNER_PULSE);
gtk_tree_view_column_add_attribute (col, renderer,
- "active",
- COLUMN_ACCOUNT_SPINNER_VISIBLE);
+ "active",
+ COLUMN_ACCOUNT_SPINNER_VISIBLE);
gtk_tree_view_column_add_attribute (col, renderer,
- "visible",
- COLUMN_ACCOUNT_SPINNER_VISIBLE);
+ "visible",
+ COLUMN_ACCOUNT_SPINNER_VISIBLE);
/* Callback when the selection has been changed */
selection = gtk_tree_view_get_selection (self->priv->tree_view);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
g_signal_connect (selection, "changed",
- G_CALLBACK (on_selection_changed), self);
+ G_CALLBACK (on_selection_changed), self);
g_signal_connect (self->priv->tree_view, "event-after",
- G_CALLBACK (on_view_event_after), self);
+ G_CALLBACK (on_view_event_after), self);
g_signal_connect (GTK_WIDGET (self), "map",
G_CALLBACK (on_map_cb), self);
/* Other signals */
g_signal_connect (self->priv->settings->get_g_settings (), "changed::show-offline-contacts",
- G_CALLBACK (&on_show_offline_contacts_changed_cb), self);
+ G_CALLBACK (&on_show_offline_contacts_changed_cb), self);
}
@@ -1741,12 +1741,12 @@ roster_view_gtk_class_init (RosterViewGtkClass* klass)
signals[ACTIONS_CHANGED_SIGNAL] =
g_signal_new ("actions-changed",
- G_OBJECT_CLASS_TYPE (gobject_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (RosterViewGtkClass, selection_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1, G_TYPE_MENU_MODEL);
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (RosterViewGtkClass, selection_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1, G_TYPE_MENU_MODEL);
}
diff --git a/lib/engine/notification/notification-core.h b/lib/engine/notification/notification-core.h
index a5a791a..ef1f3bc 100644
--- a/lib/engine/notification/notification-core.h
+++ b/lib/engine/notification/notification-core.h
@@ -52,8 +52,8 @@ namespace Ekiga
typedef enum { Info, Warning, Error } NotificationLevel;
Notification (NotificationLevel level_,
- const std::string title_,
- const std::string body_,
+ const std::string title_,
+ const std::string body_,
const std::string action_name_ = "",
boost::function0<void> action_callback_ = NULL)
: level(level_), title(title_), body(body_), action_name(action_name_),
action_callback(action_callback_)
diff --git a/lib/engine/plugin/plugin-core.cpp b/lib/engine/plugin/plugin-core.cpp
index ea4a864..b352b01 100644
--- a/lib/engine/plugin/plugin-core.cpp
+++ b/lib/engine/plugin/plugin-core.cpp
@@ -64,7 +64,7 @@
static void
plugin_parse_file (Ekiga::KickStart& kickstart,
- const gchar* filename)
+ const gchar* filename)
{
#if DEBUG
std::cout << "Trying to load " << filename << "... ";
@@ -102,7 +102,7 @@ plugin_parse_file (Ekiga::KickStart& kickstart,
static void
plugin_parse_directory (Ekiga::KickStart& kickstart,
- const gchar* path)
+ const gchar* path)
{
g_return_if_fail (path != NULL);
@@ -131,9 +131,9 @@ plugin_parse_directory (Ekiga::KickStart& kickstart,
*/
if (g_str_has_suffix (filename, G_MODULE_SUFFIX))
- plugin_parse_file (kickstart, filename);
+ plugin_parse_file (kickstart, filename);
else
- plugin_parse_directory (kickstart, filename);
+ plugin_parse_directory (kickstart, filename);
g_free (filename);
name = g_dir_read_name (directory);
@@ -155,11 +155,11 @@ plugin_init (Ekiga::KickStart& kickstart)
#if DEBUG
// should make it easier to test ekiga without installing
gchar* path = g_build_path (G_DIR_SEPARATOR_S,
- g_get_tmp_dir (), "ekiga_debug_plugins", NULL);
+ g_get_tmp_dir (), "ekiga_debug_plugins", NULL);
plugin_parse_directory (kickstart, path);
g_free (path);
#else
plugin_parse_directory (kickstart,
- EKIGA_PLUGIN_DIR);
+ EKIGA_PLUGIN_DIR);
#endif
}
diff --git a/lib/engine/presence/presence-core.cpp b/lib/engine/presence/presence-core.cpp
index b2b5ca8..b1ec20f 100644
--- a/lib/engine/presence/presence-core.cpp
+++ b/lib/engine/presence/presence-core.cpp
@@ -80,7 +80,7 @@ Ekiga::PresenceCore::add_presence_fetcher (boost::shared_ptr<PresenceFetcher> fe
conns.add (fetcher->presence_received.connect (boost::bind (&Ekiga::PresenceCore::on_presence_received,
this, _1, _2)));
conns.add (fetcher->status_received.connect (boost::bind (&Ekiga::PresenceCore::on_status_received, this,
_1, _2)));
for (std::map<std::string, uri_info>::const_iterator iter
- = uri_infos.begin ();
+ = uri_infos.begin ();
iter != uri_infos.end ();
++iter)
fetcher->fetch (iter->first);
@@ -100,9 +100,9 @@ Ekiga::PresenceCore::fetch_presence (const std::string uri)
if (uri_infos[uri].count == 1) {
for (std::list<boost::shared_ptr<PresenceFetcher> >::iterator iter
- = presence_fetchers.begin ();
- iter != presence_fetchers.end ();
- ++iter)
+ = presence_fetchers.begin ();
+ iter != presence_fetchers.end ();
+ ++iter)
(*iter)->fetch (uri);
}
@@ -119,9 +119,9 @@ void Ekiga::PresenceCore::unfetch_presence (const std::string uri)
uri_infos.erase (uri_infos.find (uri));
for (std::list<boost::shared_ptr<PresenceFetcher> >::iterator iter
- = presence_fetchers.begin ();
- iter != presence_fetchers.end ();
- ++iter)
+ = presence_fetchers.begin ();
+ iter != presence_fetchers.end ();
+ ++iter)
(*iter)->unfetch (uri);
}
}
@@ -140,7 +140,7 @@ bool Ekiga::PresenceCore::is_supported_uri (const std::string & uri)
void
Ekiga::PresenceCore::on_presence_received (const std::string uri,
- const std::string presence)
+ const std::string presence)
{
uri_infos[uri].presence = presence;
presence_received (uri, presence);
@@ -148,7 +148,7 @@ Ekiga::PresenceCore::on_presence_received (const std::string uri,
void
Ekiga::PresenceCore::on_status_received (const std::string uri,
- const std::string status)
+ const std::string status)
{
uri_infos[uri].status = status;
status_received (uri, status);
@@ -170,7 +170,7 @@ void
Ekiga::PresenceCore::publish ()
{
for (std::list<boost::shared_ptr<PresencePublisher> >::iterator iter
- = presence_publishers.begin ();
+ = presence_publishers.begin ();
iter != presence_publishers.end ();
++iter)
(*iter)->publish (*details);
diff --git a/lib/engine/presence/presence-core.h b/lib/engine/presence/presence-core.h
index 8b1d0e2..5d99836 100644
--- a/lib/engine/presence/presence-core.h
+++ b/lib/engine/presence/presence-core.h
@@ -218,9 +218,9 @@ namespace Ekiga
std::list<boost::shared_ptr<PresenceFetcher> > presence_fetchers;
void on_presence_received (const std::string uri,
- const std::string presence);
+ const std::string presence);
void on_status_received (const std::string uri,
- const std::string status);
+ const std::string status);
struct uri_info
{
uri_info (): count(0), presence("unknown"), status("")
diff --git a/lib/settings/ekiga-settings.h b/lib/settings/ekiga-settings.h
index cce7598..0b5cca1 100644
--- a/lib/settings/ekiga-settings.h
+++ b/lib/settings/ekiga-settings.h
@@ -122,7 +122,7 @@ public:
std::string result;
if (value)
- result = value;
+ result = value;
g_free (value);
return result;
@@ -169,7 +169,7 @@ public:
std::list<std::string> result;
for (int i = 0 ; values && values[i] != NULL ; i++)
- result.push_back (values[i]);
+ result.push_back (values[i]);
return result;
}
@@ -179,9 +179,9 @@ public:
gchar **values = (gchar**) g_malloc (sizeof (gchar*) * (list.size() + 1));
int i = 0;
for (std::list<std::string>::const_iterator it = list.begin ();
- it != list.end ();
- it++)
- values[i++] = g_strdup (it->c_str ());
+ it != list.end ();
+ it++)
+ values[i++] = g_strdup (it->c_str ());
values[i++] = NULL;
g_settings_set_strv (gsettings, key.c_str (), values);
@@ -193,9 +193,8 @@ public:
GSList* list = NULL;
gchar **values = g_settings_get_strv (gsettings, key.c_str ());
if (values) {
- for (int i = 0 ; values[i] ; i++) {
- list = g_slist_append (list, g_strdup (values[i]));
- }
+ for (int i = 0 ; values[i] ; i++)
+ list = g_slist_append (list, g_strdup (values[i]));
}
g_strfreev (values);
@@ -206,7 +205,7 @@ public:
{
GArray* array = g_array_new (TRUE, TRUE, sizeof (gchar *));
for (const GSList *l = list ; l ; l = g_slist_next (l))
- array = g_array_append_val (array, l->data);
+ array = g_array_append_val (array, l->data);
g_settings_set_strv (gsettings, key.c_str (), (const gchar **) array->data);
g_array_free (array, TRUE);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
