[empathy/mc5: 237/483] Merge branch 'sjoerd-mc5' into mc5
- From: Sjoerd Simons <sjoerds src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy/mc5: 237/483] Merge branch 'sjoerd-mc5' into mc5
- Date: Fri, 21 Aug 2009 17:19:04 +0000 (UTC)
commit 3e8f25168aadd741ecc0fe8da4d1847eece5ff83
Merge: 41e5b31... 87070d2...
Author: Cosimo Cecchi <cosimo cecchi collabora co uk>
Date: Sat Aug 1 10:32:39 2009 +0200
Merge branch 'sjoerd-mc5' into mc5
Conflicts:
libempathy-gtk/empathy-account-widget.c
libempathy-gtk/empathy-protocol-chooser.c
NEWS | 66 +
configure.ac | 8 +-
data/empathy.schemas.in | 14 +
empathy.doap | 1 +
help/de/de.po | 780 +++----
libempathy-gtk/Makefile.am | 4 +
libempathy-gtk/empathy-account-chooser.c | 18 +-
libempathy-gtk/empathy-account-widget-irc.c | 2 +-
libempathy-gtk/empathy-avatar-chooser.c | 10 +-
libempathy-gtk/empathy-avatar-image.c | 2 +-
libempathy-gtk/empathy-cell-renderer-expander.c | 38 +-
libempathy-gtk/empathy-chat-text-view.c | 10 +-
libempathy-gtk/empathy-chat.c | 112 +-
libempathy-gtk/empathy-contact-dialogs.c | 21 +-
libempathy-gtk/empathy-contact-dialogs.h | 4 +-
libempathy-gtk/empathy-contact-list-store.c | 44 +-
libempathy-gtk/empathy-contact-list-store.h | 1 +
libempathy-gtk/empathy-contact-list-view.c | 64 +-
libempathy-gtk/empathy-contact-list-view.h | 1 +
libempathy-gtk/empathy-contact-menu.c | 135 ++-
libempathy-gtk/empathy-contact-menu.h | 2 +
libempathy-gtk/empathy-contact-widget.c | 15 +-
libempathy-gtk/empathy-contact-widget.ui | 12 +-
libempathy-gtk/empathy-geometry.c | 20 +-
libempathy-gtk/empathy-kludge-label.c | 89 +
libempathy-gtk/empathy-kludge-label.h | 53 +
libempathy-gtk/empathy-log-window.c | 2 +-
libempathy-gtk/empathy-new-message-dialog.ui | 84 +-
libempathy-gtk/empathy-presence-chooser.c | 12 +-
libempathy-gtk/empathy-protocol-chooser.c | 5 +-
libempathy-gtk/empathy-share-my-desktop.c | 247 ++
libempathy-gtk/empathy-share-my-desktop.h | 28 +
libempathy-gtk/empathy-status-preset-dialog.c | 4 +-
libempathy-gtk/empathy-theme-adium.c | 388 +++-
libempathy-gtk/empathy-theme-manager.c | 67 +-
libempathy-gtk/empathy-theme-manager.h | 1 +
libempathy-gtk/empathy-ui-utils.c | 9 +-
libempathy-gtk/empathy-video-widget.c | 6 +-
libempathy/empathy-account-manager.c | 29 +-
libempathy/empathy-account-manager.h | 4 +-
libempathy/empathy-account-settings.c | 33 +-
libempathy/empathy-account.c | 42 +-
libempathy/empathy-chatroom-manager.c | 21 +-
libempathy/empathy-chatroom.c | 3 +-
libempathy/empathy-contact-groups.c | 4 +-
libempathy/empathy-contact-list.c | 11 +
libempathy/empathy-contact-list.h | 12 +
libempathy/empathy-contact-manager.c | 34 +-
libempathy/empathy-contact-manager.h | 4 +-
libempathy/empathy-contact.c | 27 +-
libempathy/empathy-contact.h | 2 +
libempathy/empathy-debug.h | 1 +
libempathy/empathy-dispatcher.c | 5 +-
libempathy/empathy-idle.c | 4 +-
libempathy/empathy-log-store-empathy.c | 12 +-
libempathy/empathy-message.c | 36 +
libempathy/empathy-message.h | 3 +
libempathy/empathy-status-presets.c | 4 +-
libempathy/empathy-tp-chat.c | 65 +-
libempathy/empathy-tp-contact-list.c | 133 +-
libempathy/empathy-utils.c | 21 +-
libempathy/empathy-utils.h | 5 +-
megaphone/src/megaphone-applet.c | 7 +-
po/POTFILES.in | 1 +
po/ar.po | 2279 ++++++++++++-------
po/be.po | 2698 +++++++++++++++------
po/es.po | 798 ++++---
po/fr.po | 2103 +++++++++++------
po/gl.po | 1831 +++++++++------
po/lt.po | 616 +++---
po/pa.po | 1060 +++++----
po/sv.po | 2860 +++++++++++------------
po/ta.po | 819 ++++---
po/zh_CN.po | 2392 ++++++++++++-------
python/pyempathy/pyempathy.defs | 166 +-
python/pyempathygtk/pyempathygtk.defs | 120 +-
python/pyempathygtk/pyempathygtk.override | 1 +
src/empathy-accounts-dialog.ui | 43 +-
src/empathy-call-window-fullscreen.c | 6 +-
src/empathy-call-window.c | 12 +-
src/empathy-chat-window.c | 44 +-
src/empathy-chatrooms-window.c | 2 +-
src/empathy-debug-dialog.c | 4 +-
src/empathy-main-window.c | 230 ++-
src/empathy-main-window.ui | 57 +
src/empathy-new-chatroom-dialog.ui | 43 +-
src/empathy-preferences.c | 223 +--
src/empathy-preferences.ui | 138 --
src/empathy-sidebar.c | 2 +-
src/empathy.c | 67 +-
src/ephy-spinner.c | 4 +-
tests/.gitignore | 2 +-
92 files changed, 13234 insertions(+), 8288 deletions(-)
---
diff --cc libempathy-gtk/empathy-account-widget-irc.c
index 425adbc,c04f346..932e2f8
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@@ -422,13 -422,16 +422,13 @@@ empathy_account_widget_irc_build (Empat
{
EmpathyAccountWidgetIrc *settings;
gchar *dir, *user_file_with_path, *global_file_with_path;
- GtkBuilder *gui;
- GtkWidget *widget;
GtkListStore *store;
GtkCellRenderer *renderer;
- gchar *filename;
settings = g_slice_new0 (EmpathyAccountWidgetIrc);
- settings->settings = g_object_ref (account_settings);
+ settings->self = self;
- dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+ dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
user_file_with_path = g_build_filename (dir, IRC_NETWORKS_FILENAME, NULL);
g_free (dir);
diff --cc libempathy-gtk/empathy-contact-dialogs.c
index 4252ae0,fc1cbbc..725011c
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@@ -334,13 -334,11 +334,15 @@@ can_add_contact_to_account (EmpathyAcco
gboolean result;
connection = empathy_account_get_connection (account);
+ if (connection == NULL)
+ return FALSE;
+ if (connection == NULL) {
+ return FALSE;
+ }
+
contact_manager = empathy_contact_manager_dup_singleton ();
- result = empathy_contact_manager_can_add (contact_manager, connection);
+ result = empathy_contact_manager_get_flags_for_connection (contact_manager, connection) & EMPATHY_CONTACT_LIST_CAN_ADD;
g_object_unref (contact_manager);
return result;
diff --cc libempathy-gtk/empathy-protocol-chooser.c
index 79adbac,65f778a..ecd26d8
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@@ -164,19 -132,14 +164,19 @@@ protocol_choosers_add_cm (EmpathyProtoc
{
const TpConnectionManagerProtocol *proto = *iter;
gchar *icon_name;
- gchar *display_name;
+ const gchar *display_name;
+ gchar *display_name_set;
- icon_name = g_strdup_printf ("im-%s", proto->name);
+ icon_name = empathy_protocol_icon_name (proto->name);
+ display_name = protocol_chooser_proto_name_to_display_name (proto->name);
+
+ if (display_name == NULL)
+ display_name = proto->name;
if (!tp_strdiff (cm->name, "haze"))
- display_name = g_strdup_printf ("%s (Haze)", proto->name);
+ display_name_set = g_strdup_printf ("%s (Haze)", display_name);
else
- display_name = g_strdup (proto->name);
+ display_name_set = g_strdup (display_name);
gtk_list_store_insert_with_values (priv->store, NULL, 0,
COL_ICON, icon_name,
diff --cc libempathy/empathy-account-manager.c
index b037f5d,727eb7e..18eff35
--- a/libempathy/empathy-account-manager.c
+++ b/libempathy/empathy-account-manager.c
@@@ -914,17 -847,17 +912,20 @@@ empathy_account_manager_created_cb (TpA
void
empathy_account_manager_create_account_async (EmpathyAccountManager *manager,
- const gchar *connection_manager,
- const gchar *protocol, const gchar *display_name,
- GHashTable *parameters, GHashTable *properties,
- GAsyncReadyCallback callback, gpointer user_data)
+ const gchar *connection_manager,
+ const gchar *protocol,
+ const gchar *display_name,
+ GHashTable *parameters,
+ GHashTable *properties,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
- GSimpleAsyncResult *result = g_simple_async_result_new (G_OBJECT (manager),
- callback, user_data, empathy_account_manager_create_account_finish);
+ GSimpleAsyncResult *res;
+
+ res = g_simple_async_result_new
+ (G_OBJECT (manager), callback, user_data,
+ empathy_account_manager_create_account_finish);
tp_cli_account_manager_call_create_account (priv->tp_manager,
-1,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
