Commit 58505161 authored by Xavier Claessens's avatar Xavier Claessens Committed by Xavier Claessens

Rename all filenames starting with "gossip" by "empathy", change namespace

2007-06-22 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy/*.[ch]:
	* libempathy-gtk/*.[ch]:
	* src/*.[ch]: Rename all filenames starting with "gossip" by "empathy",
	change namespace of all gossip_*() functions to empathy_*().
	Fixes bug #444490 (Mario Danic, Xavier Claessens).


svn path=/trunk/; revision=170
parent f50c7c8d
2007-06-22 Xavier Claessens <xclaesse@gmail.com>
* libempathy/*.[ch]:
* libempathy-gtk/*.[ch]:
* src/*.[ch]: Rename all filenames starting with "gossip" by "empathy",
change namespace of all gossip_*() functions to empathy_*().
Fixes bug #444490 (Mario Danic, Xavier Claessens).
2007-06-21 Xavier Claessens <xclaesse@gmail.com>
* configure.ac: Bump version to 0.9
......
Things you can do if you want to help:
- Rename all files and functions name to use the empathy namespace. Bug #444490.
- Porting gossip-account-widget-*.{c,h} from gossip project (Guillaume is already working on IRC widget).
- UI for inviting a contact in a chatroom.
- UI for accept/refuse invitation to join a chatroom.
- UI to send a message directly to a contact.
- GtkWidget-ify libempathy-gtk. Actually most window/dialog do not inherit from GtkWindow/GtkDialog. Need to create a glade catalog.
- Filter channels before dispatching them. For example we need a GtkStatusIcon that blink when an event arrives (text/voip/ft channel) and tells the MC to dispatch the channel only when the user clicked the icon. Like in gossip. For that we need a filter DBus API in MC, not yet written, a draft spec is proposed on the telepathy ML.
- Make use of NetworkManager to set the presence
- Remove Quit option everywhere, empathy is a session service and shouldn't be leaved.
- Add sound events
- Add register capability in GossipAccountsDialog if the profile says it's supported.
- Write a manual based on gossip's.
- Testing and Bugfixing.
- Update translations.
- Fix indentation and alignment broken since namespace changed from gossip_ to empathy_
SoC projects:
- Adding VoIP support based on the patch proposed for gossip.
......
......@@ -14,33 +14,33 @@ libempathy_gtk_la_SOURCES = \
empathy-status-icon.c empathy-status-icon.h \
empathy-contact-widget.c empathy-contact-widget.h \
empathy-contact-dialogs.c empathy-contact-dialogs.h \
gossip-accounts-dialog.c gossip-accounts-dialog.h \
gossip-account-widget-generic.c gossip-account-widget-generic.h \
gossip-account-widget-jabber.c gossip-account-widget-jabber.h \
gossip-profile-chooser.c gossip-profile-chooser.h \
gossip-cell-renderer-expander.c gossip-cell-renderer-expander.h \
gossip-cell-renderer-text.c gossip-cell-renderer-text.h \
gossip-spell.c gossip-spell.h \
gossip-spell-dialog.c gossip-spell-dialog.h \
gossip-contact-groups.c gossip-contact-groups.h \
gossip-contact-list-store.c gossip-contact-list-store.h \
gossip-contact-list-view.c gossip-contact-list-view.h \
gossip-preferences.c gossip-preferences.h \
gossip-theme-manager.c gossip-theme-manager.h \
gossip-chat-window.c gossip-chat-window.h \
gossip-chat.c gossip-chat.h \
gossip-chat-view.c gossip-chat-view.h \
gossip-private-chat.c gossip-private-chat.h \
gossip-group-chat.c gossip-group-chat.h \
gossip-geometry.c gossip-geometry.h \
gossip-status-presets.c gossip-status-presets.h \
gossip-presence-chooser.c gossip-presence-chooser.h \
gossip-about-dialog.c gossip-about-dialog.h \
gossip-account-chooser.c gossip-account-chooser.h \
gossip-new-chatroom-dialog.c gossip-new-chatroom-dialog.h \
gossip-chatrooms-window.c gossip-chatrooms-window.h \
gossip-log-window.c gossip-log-window.h \
gossip-ui-utils.c gossip-ui-utils.h
empathy-accounts-dialog.c empathy-accounts-dialog.h \
empathy-account-widget-generic.c empathy-account-widget-generic.h \
empathy-account-widget-jabber.c empathy-account-widget-jabber.h \
empathy-profile-chooser.c empathy-profile-chooser.h \
empathy-cell-renderer-expander.c empathy-cell-renderer-expander.h \
empathy-cell-renderer-text.c empathy-cell-renderer-text.h \
empathy-spell.c empathy-spell.h \
empathy-spell-dialog.c empathy-spell-dialog.h \
empathy-contact-groups.c empathy-contact-groups.h \
empathy-contact-list-store.c empathy-contact-list-store.h \
empathy-contact-list-view.c empathy-contact-list-view.h \
empathy-preferences.c empathy-preferences.h \
empathy-theme-manager.c empathy-theme-manager.h \
empathy-chat-window.c empathy-chat-window.h \
empathy-chat.c empathy-chat.h \
empathy-chat-view.c empathy-chat-view.h \
empathy-private-chat.c empathy-private-chat.h \
empathy-group-chat.c empathy-group-chat.h \
empathy-geometry.c empathy-geometry.h \
empathy-status-presets.c empathy-status-presets.h \
empathy-presence-chooser.c empathy-presence-chooser.h \
empathy-about-dialog.c empathy-about-dialog.h \
empathy-account-chooser.c empathy-account-chooser.h \
empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h \
empathy-chatrooms-window.c empathy-chatrooms-window.h \
empathy-log-window.c empathy-log-window.h \
empathy-ui-utils.c empathy-ui-utils.h
libempathy_gtk_la_LIBADD = \
$(EMPATHY_LIBS) \
......@@ -54,21 +54,21 @@ glade_DATA = \
empathy-status-icon.glade \
empathy-contact-widget.glade \
empathy-contact-dialogs.glade \
gossip-preferences.glade \
gossip-presence-chooser.glade \
gossip-accounts-dialog.glade \
gossip-account-widget-jabber.glade \
gossip-new-chatroom-dialog.glade \
gossip-group-chat.glade \
gossip-chatrooms-window.glade \
gossip-spell-dialog.glade \
gossip-log-window.glade \
gossip-chat.glade
empathy-preferences.glade \
empathy-presence-chooser.glade \
empathy-accounts-dialog.glade \
empathy-account-widget-jabber.glade \
empathy-new-chatroom-dialog.glade \
empathy-group-chat.glade \
empathy-chatrooms-window.glade \
empathy-spell-dialog.glade \
empathy-log-window.glade \
empathy-chat.glade
dtddir = $(datadir)/empathy
dtd_DATA = \
gossip-status-presets.dtd \
gossip-contact-groups.dtd
empathy-status-presets.dtd \
empathy-contact-groups.dtd
EXTRA_DIST = \
......
......@@ -29,8 +29,8 @@
#include <gtk/gtksizegroup.h>
#include <glade/glade.h>
#include "gossip-about-dialog.h"
#include "gossip-ui-utils.h"
#include "empathy-about-dialog.h"
#include "empathy-ui-utils.h"
#define WEB_SITE "http://live.gnome.org/Empathy"
......@@ -78,11 +78,11 @@ about_dialog_activate_link_cb (GtkAboutDialog *about,
const gchar *link,
gpointer data)
{
gossip_url_show (link);
empathy_url_show (link);
}
void
gossip_about_dialog_new (GtkWindow *parent)
empathy_about_dialog_new (GtkWindow *parent)
{
gchar *license_trans;
......
......@@ -20,15 +20,15 @@
* Authors: Martyn Russell <martyn@imendio.com>
*/
#ifndef __GOSSIP_ABOUT_DIALOG_H__
#define __GOSSIP_ABOUT_DIALOG_H__
#ifndef __EMPATHY_ABOUT_DIALOG_H__
#define __EMPATHY_ABOUT_DIALOG_H__
#include <gtk/gtkwindow.h>
G_BEGIN_DECLS
void gossip_about_dialog_new (GtkWindow *parent);
void empathy_about_dialog_new (GtkWindow *parent);
G_END_DECLS
#endif /* __GOSSIP_ABOUT_DIALOG_H__ */
#endif /* __EMPATHY_ABOUT_DIALOG_H__ */
......@@ -32,12 +32,12 @@
#include <libmissioncontrol/mc-account-monitor.h>
#include <libmissioncontrol/mission-control.h>
#include <libempathy/gossip-utils.h>
#include <libempathy/empathy-utils.h>
#include "gossip-ui-utils.h"
#include "gossip-account-chooser.h"
#include "empathy-ui-utils.h"
#include "empathy-account-chooser.h"
#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GOSSIP_TYPE_ACCOUNT_CHOOSER, GossipAccountChooserPriv))
#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_ACCOUNT_CHOOSER, EmpathyAccountChooserPriv))
typedef struct {
MissionControl *mc;
......@@ -46,10 +46,10 @@ typedef struct {
gboolean set_active_item;
gboolean can_select_all;
gboolean has_all_option;
} GossipAccountChooserPriv;
} EmpathyAccountChooserPriv;
typedef struct {
GossipAccountChooser *chooser;
EmpathyAccountChooser *chooser;
McAccount *account;
gboolean set;
} SetAccountData;
......@@ -71,18 +71,18 @@ static void account_chooser_set_property (GObject
guint param_id,
const GValue *value,
GParamSpec *pspec);
static void account_chooser_setup (GossipAccountChooser *chooser);
static void account_chooser_setup (EmpathyAccountChooser *chooser);
static void account_chooser_account_created_cb (McAccountMonitor *monitor,
const gchar *unique_name,
GossipAccountChooser *chooser);
EmpathyAccountChooser *chooser);
static void account_chooser_account_add_foreach (McAccount *account,
GossipAccountChooser *chooser);
EmpathyAccountChooser *chooser);
static void account_chooser_account_deleted_cb (McAccountMonitor *monitor,
const gchar *unique_name,
GossipAccountChooser *chooser);
EmpathyAccountChooser *chooser);
static void account_chooser_account_remove_foreach (McAccount *account,
GossipAccountChooser *chooser);
static void account_chooser_update_iter (GossipAccountChooser *chooser,
EmpathyAccountChooser *chooser);
static void account_chooser_update_iter (EmpathyAccountChooser *chooser,
GtkTreeIter *iter,
McAccount *account);
static void account_chooser_status_changed_cb (MissionControl *mc,
......@@ -90,10 +90,10 @@ static void account_chooser_status_changed_cb (MissionControl
McPresence presence,
TelepathyConnectionStatusReason reason,
const gchar *unique_name,
GossipAccountChooser *chooser);
EmpathyAccountChooser *chooser);
static gboolean account_chooser_separator_func (GtkTreeModel *model,
GtkTreeIter *iter,
GossipAccountChooser *chooser);
EmpathyAccountChooser *chooser);
static gboolean account_chooser_set_account_foreach (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
......@@ -101,7 +101,7 @@ static gboolean account_chooser_set_account_foreach (GtkTreeModel
static gboolean account_chooser_set_enabled_foreach (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
GossipAccountChooser *chooser);
EmpathyAccountChooser *chooser);
enum {
PROP_0,
......@@ -109,10 +109,10 @@ enum {
PROP_HAS_ALL_OPTION,
};
G_DEFINE_TYPE (GossipAccountChooser, gossip_account_chooser, GTK_TYPE_COMBO_BOX);
G_DEFINE_TYPE (EmpathyAccountChooser, empathy_account_chooser, GTK_TYPE_COMBO_BOX);
static void
gossip_account_chooser_class_init (GossipAccountChooserClass *klass)
empathy_account_chooser_class_init (EmpathyAccountChooserClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
......@@ -136,21 +136,21 @@ gossip_account_chooser_class_init (GossipAccountChooserClass *klass)
FALSE,
G_PARAM_READWRITE));
g_type_class_add_private (object_class, sizeof (GossipAccountChooserPriv));
g_type_class_add_private (object_class, sizeof (EmpathyAccountChooserPriv));
}
static void
gossip_account_chooser_init (GossipAccountChooser *chooser)
empathy_account_chooser_init (EmpathyAccountChooser *chooser)
{
}
static void
account_chooser_finalize (GObject *object)
{
GossipAccountChooser *chooser;
GossipAccountChooserPriv *priv;
EmpathyAccountChooser *chooser;
EmpathyAccountChooserPriv *priv;
chooser = GOSSIP_ACCOUNT_CHOOSER (object);
chooser = EMPATHY_ACCOUNT_CHOOSER (object);
priv = GET_PRIV (object);
g_signal_handlers_disconnect_by_func (priv->monitor,
......@@ -166,7 +166,7 @@ account_chooser_finalize (GObject *object)
g_object_unref (priv->mc);
g_object_unref (priv->monitor);
G_OBJECT_CLASS (gossip_account_chooser_parent_class)->finalize (object);
G_OBJECT_CLASS (empathy_account_chooser_parent_class)->finalize (object);
}
static void
......@@ -175,7 +175,7 @@ account_chooser_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
priv = GET_PRIV (object);
......@@ -198,17 +198,17 @@ account_chooser_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
priv = GET_PRIV (object);
switch (param_id) {
case PROP_CAN_SELECT_ALL:
gossip_account_chooser_set_can_select_all (GOSSIP_ACCOUNT_CHOOSER (object),
empathy_account_chooser_set_can_select_all (EMPATHY_ACCOUNT_CHOOSER (object),
g_value_get_boolean (value));
break;
case PROP_HAS_ALL_OPTION:
gossip_account_chooser_set_has_all_option (GOSSIP_ACCOUNT_CHOOSER (object),
empathy_account_chooser_set_has_all_option (EMPATHY_ACCOUNT_CHOOSER (object),
g_value_get_boolean (value));
break;
default:
......@@ -218,18 +218,18 @@ account_chooser_set_property (GObject *object,
}
GtkWidget *
gossip_account_chooser_new (void)
empathy_account_chooser_new (void)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
McAccountMonitor *monitor;
GtkWidget *chooser;
monitor = mc_account_monitor_new ();
chooser = g_object_new (GOSSIP_TYPE_ACCOUNT_CHOOSER, NULL);
chooser = g_object_new (EMPATHY_TYPE_ACCOUNT_CHOOSER, NULL);
priv = GET_PRIV (chooser);
priv->mc = gossip_mission_control_new ();
priv->mc = empathy_mission_control_new ();
priv->monitor = mc_account_monitor_new ();
g_signal_connect (priv->monitor, "account-created",
......@@ -242,20 +242,20 @@ gossip_account_chooser_new (void)
G_CALLBACK (account_chooser_status_changed_cb),
chooser, NULL);
account_chooser_setup (GOSSIP_ACCOUNT_CHOOSER (chooser));
account_chooser_setup (EMPATHY_ACCOUNT_CHOOSER (chooser));
return chooser;
}
McAccount *
gossip_account_chooser_get_account (GossipAccountChooser *chooser)
empathy_account_chooser_get_account (EmpathyAccountChooser *chooser)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
McAccount *account;
GtkTreeModel *model;
GtkTreeIter iter;
g_return_val_if_fail (GOSSIP_IS_ACCOUNT_CHOOSER (chooser), NULL);
g_return_val_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser), NULL);
priv = GET_PRIV (chooser);
......@@ -268,7 +268,7 @@ gossip_account_chooser_get_account (GossipAccountChooser *chooser)
}
gboolean
gossip_account_chooser_set_account (GossipAccountChooser *chooser,
empathy_account_chooser_set_account (EmpathyAccountChooser *chooser,
McAccount *account)
{
GtkComboBox *combobox;
......@@ -276,7 +276,7 @@ gossip_account_chooser_set_account (GossipAccountChooser *chooser,
GtkTreeIter iter;
SetAccountData data;
g_return_val_if_fail (GOSSIP_IS_ACCOUNT_CHOOSER (chooser), FALSE);
g_return_val_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser), FALSE);
combobox = GTK_COMBO_BOX (chooser);
model = gtk_combo_box_get_model (combobox);
......@@ -293,11 +293,11 @@ gossip_account_chooser_set_account (GossipAccountChooser *chooser,
}
gboolean
gossip_account_chooser_get_can_select_all (GossipAccountChooser *chooser)
empathy_account_chooser_get_can_select_all (EmpathyAccountChooser *chooser)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
g_return_val_if_fail (GOSSIP_IS_ACCOUNT_CHOOSER (chooser), FALSE);
g_return_val_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser), FALSE);
priv = GET_PRIV (chooser);
......@@ -305,14 +305,14 @@ gossip_account_chooser_get_can_select_all (GossipAccountChooser *chooser)
}
void
gossip_account_chooser_set_can_select_all (GossipAccountChooser *chooser,
empathy_account_chooser_set_can_select_all (EmpathyAccountChooser *chooser,
gboolean can_select_all)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
GtkComboBox *combobox;
GtkTreeModel *model;
g_return_if_fail (GOSSIP_IS_ACCOUNT_CHOOSER (chooser));
g_return_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser));
priv = GET_PRIV (chooser);
......@@ -333,11 +333,11 @@ gossip_account_chooser_set_can_select_all (GossipAccountChooser *chooser,
}
gboolean
gossip_account_chooser_get_has_all_option (GossipAccountChooser *chooser)
empathy_account_chooser_get_has_all_option (EmpathyAccountChooser *chooser)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
g_return_val_if_fail (GOSSIP_IS_ACCOUNT_CHOOSER (chooser), FALSE);
g_return_val_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser), FALSE);
priv = GET_PRIV (chooser);
......@@ -345,16 +345,16 @@ gossip_account_chooser_get_has_all_option (GossipAccountChooser *chooser)
}
void
gossip_account_chooser_set_has_all_option (GossipAccountChooser *chooser,
empathy_account_chooser_set_has_all_option (EmpathyAccountChooser *chooser,
gboolean has_all_option)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
GtkComboBox *combobox;
GtkListStore *store;
GtkTreeModel *model;
GtkTreeIter iter;
g_return_if_fail (GOSSIP_IS_ACCOUNT_CHOOSER (chooser));
g_return_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser));
priv = GET_PRIV (chooser);
......@@ -410,9 +410,9 @@ gossip_account_chooser_set_has_all_option (GossipAccountChooser *chooser,
}
static void
account_chooser_setup (GossipAccountChooser *chooser)
account_chooser_setup (EmpathyAccountChooser *chooser)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
GList *accounts;
GtkListStore *store;
GtkCellRenderer *renderer;
......@@ -461,7 +461,7 @@ account_chooser_setup (GossipAccountChooser *chooser)
static void
account_chooser_account_created_cb (McAccountMonitor *monitor,
const gchar *unique_name,
GossipAccountChooser *chooser)
EmpathyAccountChooser *chooser)
{
McAccount *account;
......@@ -472,9 +472,9 @@ account_chooser_account_created_cb (McAccountMonitor *monitor,
static void
account_chooser_account_add_foreach (McAccount *account,
GossipAccountChooser *chooser)
EmpathyAccountChooser *chooser)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
GtkListStore *store;
GtkComboBox *combobox;
GtkTreeIter iter;
......@@ -491,7 +491,7 @@ account_chooser_account_add_foreach (McAccount *account,
static void
account_chooser_account_deleted_cb (McAccountMonitor *monitor,
const gchar *unique_name,
GossipAccountChooser *chooser)
EmpathyAccountChooser *chooser)
{
McAccount *account;
......@@ -502,17 +502,17 @@ account_chooser_account_deleted_cb (McAccountMonitor *monitor,
static void
account_chooser_account_remove_foreach (McAccount *account,
GossipAccountChooser *chooser)
EmpathyAccountChooser *chooser)
{
/* Fixme: TODO */
}
static void
account_chooser_update_iter (GossipAccountChooser *chooser,
account_chooser_update_iter (EmpathyAccountChooser *chooser,
GtkTreeIter *iter,
McAccount *account)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
GtkListStore *store;
GtkComboBox *combobox;
TpConn *tp_conn;
......@@ -524,7 +524,7 @@ account_chooser_update_iter (GossipAccountChooser *chooser,
combobox = GTK_COMBO_BOX (chooser);
store = GTK_LIST_STORE (gtk_combo_box_get_model (combobox));
icon_name = gossip_icon_name_from_account (account);
icon_name = empathy_icon_name_from_account (account);
tp_conn = mission_control_get_connection (priv->mc, account, NULL);
is_enabled = (tp_conn != NULL || priv->can_select_all);
......@@ -552,7 +552,7 @@ account_chooser_status_changed_cb (MissionControl *mc,
McPresence presence,
TelepathyConnectionStatusReason reason,
const gchar *unique_name,
GossipAccountChooser *chooser)
EmpathyAccountChooser *chooser)
{
/* FIXME: implement */
}
......@@ -560,9 +560,9 @@ account_chooser_status_changed_cb (MissionControl *mc,
static gboolean
account_chooser_separator_func (GtkTreeModel *model,
GtkTreeIter *iter,
GossipAccountChooser *chooser)
EmpathyAccountChooser *chooser)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
gchar *text;
gboolean is_separator;
......@@ -597,7 +597,7 @@ account_chooser_set_account_foreach (GtkTreeModel *model,
else if ((data->account && !account) || (!data->account && account)) {
equal = FALSE;
} else {
equal = gossip_account_equal (data->account, account);
equal = empathy_account_equal (data->account, account);
g_object_unref (account);
}
......@@ -617,9 +617,9 @@ static gboolean
account_chooser_set_enabled_foreach (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
GossipAccountChooser *chooser)
EmpathyAccountChooser *chooser)
{
GossipAccountChooserPriv *priv;
EmpathyAccountChooserPriv *priv;
McAccount *account;
priv = GET_PRIV (chooser);
......
......@@ -20,8 +20,8 @@
* Authors: Martyn Russell <martyn@imendio.com>
*/
#ifndef __GOSSIP_ACCOUNT_CHOOSER_H__
#define __GOSSIP_ACCOUNT_CHOOSER_H__
#ifndef __EMPATHY_ACCOUNT_CHOOSER_H__
#define __EMPATHY_ACCOUNT_CHOOSER_H__
#include <gtk/gtkcombobox.h>
......@@ -29,38 +29,38 @@
G_BEGIN_DECLS
#define GOSSIP_TYPE_ACCOUNT_CHOOSER (gossip_account_chooser_get_type ())
#define GOSSIP_ACCOUNT_CHOOSER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOSSIP_TYPE_ACCOUNT_CHOOSER, GossipAccountChooser))
#define GOSSIP_ACCOUNT_CHOOSER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOSSIP_TYPE_ACCOUNT_CHOOSER, GossipAccountChooserClass))
#define GOSSIP_IS_ACCOUNT_CHOOSER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOSSIP_TYPE_ACCOUNT_CHOOSER))
#define GOSSIP_IS_ACCOUNT_CHOOSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOSSIP_TYPE_ACCOUNT_CHOOSER))
#define GOSSIP_ACCOUNT_CHOOSER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOSSIP_TYPE_ACCOUNT_CHOOSER, GossipAccountChooserClass))
#define EMPATHY_TYPE_ACCOUNT_CHOOSER (empathy_account_chooser_get_type ())
#define EMPATHY_ACCOUNT_CHOOSER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_ACCOUNT_CHOOSER, EmpathyAccountChooser))
#define EMPATHY_ACCOUNT_CHOOSER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_ACCOUNT_CHOOSER, EmpathyAccountChooserClass))
#define EMPATHY_IS_ACCOUNT_CHOOSER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_ACCOUNT_CHOOSER))
#define EMPATHY_IS_ACCOUNT_CHOOSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_ACCOUNT_CHOOSER))
#define EMPATHY_ACCOUNT_CHOOSER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_ACCOUNT_CHOOSER, EmpathyAccountChooserClass))
typedef struct _GossipAccountChooser GossipAccountChooser;
typedef struct _GossipAccountChooserClass GossipAccountChooserClass;
typedef struct _EmpathyAccountChooser EmpathyAccountChooser;
typedef struct _EmpathyAccountChooserClass EmpathyAccountChooserClass;
struct _GossipAccountChooser {
struct _EmpathyAccountChooser {
GtkComboBox parent;
};
struct _GossipAccountChooserClass {
struct _EmpathyAccountChooserClass {
GtkComboBoxClass parent_class;
};
GType gossip_account_chooser_get_type (void) G_GNUC_CONST;
GtkWidget * gossip_account_chooser_new (void);
McAccount * gossip_account_chooser_get_account (GossipAccountChooser *chooser);
gboolean gossip_account_chooser_set_account (GossipAccountChooser *chooser,
GType empathy_account_chooser_get_type (void) G_GNUC_CONST;
GtkWidget * empathy_account_chooser_new (void);
McAccount * empathy_account_chooser_get_account (EmpathyAccountChooser *chooser);
gboolean empathy_account_chooser_set_account (EmpathyAccountChooser *chooser,
McAccount *account);
gboolean gossip_account_chooser_get_can_select_all (GossipAccountChooser *chooser);
gboolean empathy_account_chooser_get_can_select_all (EmpathyAccountChooser *chooser);
void gossip_account_chooser_set_can_select_all (GossipAccountChooser *chooser,
void empathy_account_chooser_set_can_select_all (EmpathyAccountChooser *chooser,
gboolean can_select_all);
gboolean gossip_account_chooser_get_has_all_option (GossipAccountChooser *chooser);
void gossip_account_chooser_set_has_all_option (GossipAccountChooser *chooser,
gboolean empathy_account_chooser_get_has_all_option (EmpathyAccountChooser *chooser);
void empathy_account_chooser_set_has_all_option (EmpathyAccountChooser *chooser,
gboolean has_all_option);
G_END_DECLS
#endif /* __GOSSIP_ACCOUNT_CHOOSER_H__ */
#endif /* __EMPATHY_ACCOUNT_CHOOSER_H__ */
......@@ -32,9 +32,9 @@
#include <libmissioncontrol/mc-account.h>
#include <libmissioncontrol/mc-protocol.h>
#include <libempathy-gtk/gossip-ui-utils.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include "gossip-account-widget-generic.h"
#include "empathy-account-widget-generic.h"
typedef struct {
McAccount *account;
......@@ -44,25 +44,25 @@ typedef struct {
GtkSizeGroup *size_group;
guint n_rows;
} GossipAccountWidgetGeneric;
} EmpathyAccountWidgetGeneric;
static gboolean account_widget_generic_entry_focus_cb (GtkWidget *widget,
GdkEventFocus *event,
GossipAccountWidgetGeneric *settings);
EmpathyAccountWidgetGeneric *settings);
static void account_widget_generic_int_changed_cb (GtkWidget *widget,
GossipAccountWidgetGeneric *settings);
EmpathyAccountWidgetGeneric *settings);
static void account_widget_generic_checkbutton_toggled_cb (GtkWidget *widget,
GossipAccountWidgetGeneric *settings);
EmpathyAccountWidgetGeneric *settings);
static gchar * account_widget_generic_format_param_name (const gchar *param_name);
static void account_widget_generic_setup_foreach (McProtocolParam *param,
GossipAccountWidgetGeneric *settings);
EmpathyAccountWidgetGeneric *settings);
static void account_widget_generic_destroy_cb (GtkWidget *widget,
GossipAccountWidgetGeneric *settings);
EmpathyAccountWidgetGeneric *settings);
static gboolean
account_widget_generic_entry_focus_cb (GtkWidget *widget,
GdkEventFocus *event,
GossipAccountWidgetGeneric *settings)
EmpathyAccountWidgetGeneric *settings)
{
const gchar *str;
const gchar *param_name;
......@@ -77,7 +77,7 @@ account_widget_generic_entry_focus_cb (GtkWidget *widget,
static void
account_widget_generic_int_changed_cb (GtkWidget *widget,
GossipAccountWidgetGeneric *settings)
EmpathyAccountWidgetGeneric *settings)
{