Hello community,
here is the log from the commit of package empathy for openSUSE:Factory checked in at 2014-07-06 22:52:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/empathy (Old)
and /work/SRC/openSUSE:Factory/.empathy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "empathy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/empathy/empathy.changes 2014-05-20 14:26:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.empathy.new/empathy.changes 2014-07-06 22:52:26.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Jun 23 19:17:19 UTC 2014 - zaitor@opensuse.org
+
+- Update to version 3.12.4:
+ + Picking a specific persona/account from context menu doesn't
+ work (bgo#732100).
+- Changes from version 3.12.3:
+ + This new stable release removes support for connecting to
+ Windows Live chat using XMPP as Microsoft shut down their XMPP
+ gateways. However, you can continue using the proprietary MSN
+ protocol through telepathy-haze.
+ + Bugs fixed: bgo#696977, bgo#731150.
+
+-------------------------------------------------------------------
Old:
----
empathy-3.12.2.tar.xz
New:
----
empathy-3.12.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ empathy.spec ++++++
--- /var/tmp/diff_new_pack.SGQBt8/_old 2014-07-06 22:52:27.000000000 +0200
+++ /var/tmp/diff_new_pack.SGQBt8/_new 2014-07-06 22:52:27.000000000 +0200
@@ -19,7 +19,7 @@
%define with_geocode 1
Name: empathy
-Version: 3.12.2
+Version: 3.12.4
Release: 0
# FIXME: re-enable parallel build
Summary: Instant Messenger Client for GNOME, based on Telepathy
++++++ empathy-3.12.2.tar.xz -> empathy-3.12.4.tar.xz ++++++
++++ 5001 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/ChangeLog new/empathy-3.12.4/ChangeLog
--- old/empathy-3.12.2/ChangeLog 2014-05-14 10:06:08.000000000 +0200
+++ new/empathy-3.12.4/ChangeLog 2014-06-23 18:15:55.000000000 +0200
@@ -1,3 +1,193 @@
+commit 0eee2312758104f3b9b04753a358d82aa96a28a7
+Author: Guillaume Desmottes
+Date: Mon Jun 23 18:15:38 2014 +0200
+
+ 3.12.4
+
+ NEWS | 6 ++++++
+ configure.ac | 4 ++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+commit 8ac7209da2305762f9ef2c711c555afb19e85b62
+Author: Guillaume Desmottes
+Date: Mon Jun 23 15:35:03 2014 +0200
+
+ individual-menu: stop creating single_individual
+
+ This code was always pretty hacky and created loads of nasty bugs
+ so I'm glad
+ to get rid of it.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=732100
+
+ libempathy-gtk/empathy-individual-menu.c | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+commit a2a7b6ecc313022e4e0904651ba4b27ae83ca293
+Author: Guillaume Desmottes
+Date: Mon Jun 23 15:33:11 2014 +0200
+
+ individual-menu: remove 'block' item from personas sub menus
+
+ Blocking a specific persona from an individual is a very uncommon
+ operation.
+ Either you want to block the full individual or the personas
+ shouldn't be
+ linked together.
+ There is not much point cluttering the menu with it.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=732100
+
+ libempathy-gtk/empathy-individual-menu.c | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+commit 1f9230409b3e8bdba369a994102b53a9e591ba6e
+Author: Guillaume Desmottes
+Date: Mon Jun 23 15:10:17 2014 +0200
+
+ individual-menu: use the proper persona in submenus
+
+ 'single_individual' uses to be a FolksIndivudal containing a single
+ persona
+ (the one from the submenu) ensuring that operations (chat, call,
+ etc) were
+ performed on this very persona.
+
+ But we broke this in 0909d1f884c4542553d98b18e7622664d2a02169 by
+ replacing the
+ empathy_create_individual_from_tp_contact() call by
+ empathy_ensure_individual_from_tp_contact() as the same individuals
+ (the one
+ will all the personas) was now used in all the sub menus.
+
+ Fixing this by introducing 'contact' variant of the menu_item_new
+ methods
+ which is always cleaner.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=732100
+
+ libempathy-gtk/empathy-individual-menu.c | 155
+ +++++++++++++++++++++++++++++--
+ 1 file changed, 146 insertions(+), 9 deletions(-)
+
+commit ad1b40b1d31b4c612a94736f27072baab4ac1364
+Author: Guillaume Desmottes
+Date: Mon Jun 23 14:54:09 2014 +0200
+
+ individual-menu: factor out some item_new() code
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=732100
+
+ libempathy-gtk/empathy-individual-menu.c | 158
+ +++++++++++++++++++++++--------
+ 1 file changed, 121 insertions(+), 37 deletions(-)
+
+commit 8a91bd6aa01f46742c11b22c7d404c9f6d56b7a9
+Author: Guillaume Desmottes
+Date: Mon Jun 23 14:39:28 2014 +0200
+
+ individual-menu: rename menu_item_new functions
+
+ - Remove the namespace prefix for static functions
+ - Add 'individual' suffix
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=732100
+
+ libempathy-gtk/empathy-individual-menu.c | 114
+ ++++++++++++++-----------------
+ libempathy-gtk/empathy-individual-menu.h | 4 +-
+ libempathy-gtk/empathy-individual-view.c | 6 +-
+ 3 files changed, 59 insertions(+), 65 deletions(-)
+
+commit d53111417536194edd8bfd66f98630416de72e50
+Author: Giovanni Campagna
+Date: Fri Jan 10 11:03:28 2014 +0100
+
+ EmpathySmileyManager: use the proper Unicode characters
+
+ For emoticons that are part of the freedesktop icon spec and of
+ Unicode 6.3, recognize the character and replace it with the icon.
+ Also, prefer the unicode character to the older ASCII encoding.
+ This ensures the maximum compatibility with Hangouts, and also
+ looks nice on iOS/Android.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=692689
+
+ libempathy-gtk/empathy-smiley-manager.c | 69
+ ++++++++++++++++++++++-----------
+ 1 file changed, 46 insertions(+), 23 deletions(-)
+
+commit 1d7db6929a00bf0fc87be40e3a9628ff6bed473a
+Author: Giovanni Campagna
+Date: Mon Jan 28 10:21:49 2013 +0100
+
+ Be more compatible with Facebook emoticon codes
+
+ Since we support Facebook chat, and interoperate with the chat
+ from the
+ browser, we need to support roughly the same emoticon codes.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=692689
+
+ libempathy-gtk/empathy-smiley-manager.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+commit 1460786fe3362c7b33a3f37f8f353e391e267566
+Author: Guillaume Desmottes
+Date: Wed Jun 11 14:02:28 2014 +0200
+
+ remove released flag
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 99a7002f326e5210852c0be25b7d0ff9c93f7db2
+Author: Guillaume Desmottes
+Date: Wed Jun 11 13:45:59 2014 +0200
+
+ 3.12.3
+
+ NEWS | 12 ++++++++++++
+ configure.ac | 4 ++--
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+commit e8316b6de102ebcc818989c10ac2801ad12a196e
+Author: Debarshi Ray
+Date: Tue Jun 3 15:13:54 2014 +0200
+
+ goa-mc-plugin: Remove Windows Live chat using Jabber
+
+ Microsoft has been planning to drop Windows Live Messenger in
+ favour of
+ Skype for quite some time now. The XMPP gateway that we used does not
+ work anymore. However, you can continue using the proprietary MSN
+ protocol.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=731150
+
+ goa-mc-plugin/mcp-account-manager-goa.c | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+commit 6598a3c9d90ce78fd2fd641ca552840742756dfb
+Author: Juan A. Suarez Romero
+Date: Thu Mar 20 15:04:53 2014 +0000
+
+ Add missing textdomain() call
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=696977
+
+ src/empathy-accounts.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 49a243cad6305982770295dae06db6a2a74309f4
+Author: Guillaume Desmottes
+Date: Wed May 14 10:12:23 2014 +0200
+
+ remove released flag
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
commit 9c08470223a2f42956e34b5f34f95acd8b2ce076
Author: Guillaume Desmottes
Date: Wed May 14 10:04:00 2014 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/NEWS new/empathy-3.12.4/NEWS
--- old/empathy-3.12.2/NEWS 2014-05-14 10:03:47.000000000 +0200
+++ new/empathy-3.12.4/NEWS 2014-06-23 18:15:34.000000000 +0200
@@ -1,3 +1,21 @@
+NEW in 3.12.4 (23/06/2014)
+=============
+
+Bugs fixed:
+ - Fixed #732100, Picking a specific persona/account from context menu doesn't work (Guillaume Desmottes)
+
+NEW in 3.12.3 (11/06/2014)
+=============
+
+This new stable release removes support for connecting to Windows Live chat
+using XMPP as Microsoft shut down their XMPP gateways.
+However, you can continue using the proprietary MSN protocol through
+telepathy-haze.
+
+Bugs fixed:
+ - Fixed #696977, Dialog title is not translated (Juan A. Suarez Romero)
+ - Fixed #731150, MSN live connection not removed from mission-control (Debarshi Ray)
+
NEW in 3.12.2 (14/05/2014)
=============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/configure.ac new/empathy-3.12.4/configure.ac
--- old/empathy-3.12.2/configure.ac 2014-05-14 10:02:44.000000000 +0200
+++ new/empathy-3.12.4/configure.ac 2014-06-23 18:14:55.000000000 +0200
@@ -3,7 +3,7 @@
m4_define([empathy_major_version], [3])
m4_define([empathy_minor_version], [12])
-m4_define([empathy_micro_version], [2])
+m4_define([empathy_micro_version], [4])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/data/empathy.desktop new/empathy-3.12.4/data/empathy.desktop
--- old/empathy-3.12.2/data/empathy.desktop 2014-05-14 10:02:55.000000000 +0200
+++ new/empathy-3.12.4/data/empathy.desktop 2014-06-23 18:15:06.000000000 +0200
@@ -351,4 +351,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=empathy
X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=3.12.2
+X-GNOME-Bugzilla-Version=3.12.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/data/empathy.desktop.in new/empathy-3.12.4/data/empathy.desktop.in
--- old/empathy-3.12.2/data/empathy.desktop.in 2014-05-14 10:02:53.000000000 +0200
+++ new/empathy-3.12.4/data/empathy.desktop.in 2014-06-23 18:15:04.000000000 +0200
@@ -15,4 +15,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=empathy
X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=3.12.2
+X-GNOME-Bugzilla-Version=3.12.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/goa-mc-plugin/mcp-account-manager-goa.c new/empathy-3.12.4/goa-mc-plugin/mcp-account-manager-goa.c
--- old/empathy-3.12.2/goa-mc-plugin/mcp-account-manager-goa.c 2014-02-12 08:55:12.000000000 +0100
+++ new/empathy-3.12.4/goa-mc-plugin/mcp-account-manager-goa.c 2014-06-11 13:18:08.000000000 +0200
@@ -159,19 +159,6 @@
PARAM ("param-fallback-servers",
"chat.facebook.com:443");
}
- else if (!tp_strdiff (type, "windows_live"))
- {
- PARAM ("manager", "gabble");
- PARAM ("protocol", "jabber");
- PARAM ("Icon", "im-msn");
- PARAM ("Service", "windows-live");
-
- PARAM ("param-account", "messenger.live.com");
- PARAM ("param-require-encryption", "true");
- PARAM ("param-fallback-servers", "xmpp.messenger.live.com");
- PARAM ("param-extra-certificate-identities",
- "*.gateway.messenger.live.com");
- }
else
{
DEBUG ("Unknown account type %s", type);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/libempathy-gtk/empathy-individual-menu.c new/empathy-3.12.4/libempathy-gtk/empathy-individual-menu.c
--- old/empathy-3.12.2/libempathy-gtk/empathy-individual-menu.c 2014-02-26 10:32:49.000000000 +0100
+++ new/empathy-3.12.4/libempathy-gtk/empathy-individual-menu.c 2014-06-23 17:18:12.000000000 +0200
@@ -72,32 +72,41 @@
G_DEFINE_TYPE (EmpathyIndividualMenu, empathy_individual_menu, GTK_TYPE_MENU);
-static GtkWidget * empathy_individual_chat_menu_item_new (
- EmpathyIndividualMenu *self, FolksIndividual *individual);
-static GtkWidget * empathy_individual_sms_menu_item_new (
- EmpathyIndividualMenu *self, FolksIndividual *individual);
-static GtkWidget * empathy_individual_log_menu_item_new (
+static GtkWidget * chat_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
-static GtkWidget * empathy_individual_info_menu_item_new (
- FolksIndividual *individual);
-static GtkWidget * empathy_individual_edit_menu_item_new (
+static GtkWidget * chat_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact);
+static GtkWidget * sms_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
-static GtkWidget * empathy_individual_invite_menu_item_new (
- FolksIndividual *individual,
+static GtkWidget * sms_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact);
+static GtkWidget * audio_call_menu_item_new_contact (
+ EmpathyIndividualMenu *self,
+ EmpathyContact *contact);
+static GtkWidget * video_call_menu_item_new_contact (
+ EmpathyIndividualMenu *self,
+ EmpathyContact *contact);
+static GtkWidget * log_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * log_menu_item_new_contact (EmpathyContact *contact);
+static GtkWidget * info_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * edit_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * invite_menu_item_new (FolksIndividual *individual,
EmpathyContact *contact);
-static GtkWidget * empathy_individual_file_transfer_menu_item_new (
- EmpathyIndividualMenu *self, FolksIndividual *individual);
-static GtkWidget * empathy_individual_share_my_desktop_menu_item_new (
- EmpathyIndividualMenu *self, FolksIndividual *individual);
-static GtkWidget * empathy_individual_favourite_menu_item_new (
+static GtkWidget * file_transfer_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
-static GtkWidget * empathy_individual_add_menu_item_new (
+static GtkWidget * file_transfer_menu_item_new_contact (
EmpathyIndividualMenu *self,
+ EmpathyContact *contact);
+static GtkWidget * share_my_desktop_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
-static GtkWidget * empathy_individiual_block_menu_item_new (
+static GtkWidget * share_my_desktop_menu_item_new_contact (
+ EmpathyIndividualMenu *self,
+ EmpathyContact *contact);
+static GtkWidget * favourite_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * add_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual);
-static GtkWidget * empathy_individiual_remove_menu_item_new (
- EmpathyIndividualMenu *self);
+static GtkWidget * block_menu_item_new_individual (FolksIndividual *individual);
+static GtkWidget * remove_menu_item_new_individual (EmpathyIndividualMenu *self);
static void
individual_menu_add_personas (EmpathyIndividualMenu *self,
@@ -153,8 +162,6 @@
FolksPersonaStore *store;
const gchar *account;
GtkWidget *action;
- /* Individual containing only persona */
- FolksIndividual *single_individual;
if (!empathy_folks_persona_is_interesting (FOLKS_PERSONA (persona)))
goto while_finish;
@@ -164,13 +171,6 @@
goto while_finish;
contact = empathy_contact_dup_from_tp_contact (tp_contact);
- single_individual = empathy_ensure_individual_from_tp_contact (
- tp_contact);
-
- /* Pretty hacky. Creating single_individual had a side effect to change
- * persona.individual from individual to single_individual which is not
- * what we want so we set it back. See bgo#684971 for details. */
- g_object_set (persona, "individual", individual, NULL);
store = folks_persona_get_store (FOLKS_PERSONA (persona));
account = folks_persona_store_get_display_name (store);
@@ -194,8 +194,7 @@
/* Chat */
if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT)
{
- action = empathy_individual_chat_menu_item_new (self,
- single_individual);
+ action = chat_menu_item_new_contact (self, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
@@ -203,8 +202,7 @@
/* SMS */
if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS)
{
- action = empathy_individual_sms_menu_item_new (self,
- single_individual);
+ action = sms_menu_item_new_contact (self, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
@@ -212,14 +210,12 @@
if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL)
{
/* Audio Call */
- action = empathy_individual_audio_call_menu_item_new (
- self, single_individual);
+ action = audio_call_menu_item_new_contact (self, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
/* Video Call */
- action = empathy_individual_video_call_menu_item_new (
- self, single_individual);
+ action = video_call_menu_item_new_contact (self, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
@@ -227,51 +223,34 @@
/* Log */
if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG)
{
- action = empathy_individual_log_menu_item_new (single_individual);
+ action = log_menu_item_new_contact (contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
/* Invite */
- action = empathy_individual_invite_menu_item_new (NULL, contact);
+ action = invite_menu_item_new (NULL, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
/* File transfer */
if (features & EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER)
{
- action = empathy_individual_file_transfer_menu_item_new (
- self, single_individual);
+ action = file_transfer_menu_item_new_contact (self, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
}
/* Share my desktop */
- action = empathy_individual_share_my_desktop_menu_item_new (
- self, single_individual);
+ action = share_my_desktop_menu_item_new_contact (self, contact);
gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
gtk_widget_show (action);
- /* Block */
- if (features & EMPATHY_INDIVIDUAL_FEATURE_BLOCK &&
- (item = empathy_individiual_block_menu_item_new (single_individual))
- != NULL) {
- GtkWidget *sep;
-
- sep = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), sep);
- gtk_widget_show (sep);
-
- gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), item);
- gtk_widget_show (item);
- }
-
gtk_menu_shell_append (GTK_MENU_SHELL (menu), contact_item);
gtk_widget_show (contact_item);
g_free (label);
g_object_unref (contact);
- g_object_unref (single_individual);
while_finish:
g_clear_object (&persona);
@@ -681,7 +660,7 @@
}
static GtkWidget *
-empathy_individiual_block_menu_item_new (FolksIndividual *individual)
+block_menu_item_new_individual (FolksIndividual *individual)
{
GtkWidget *item;
GList *contacts, *l;
@@ -921,7 +900,7 @@
}
static GtkWidget *
-empathy_individiual_remove_menu_item_new (EmpathyIndividualMenu *self)
+remove_menu_item_new_individual (EmpathyIndividualMenu *self)
{
GeeSet *personas;
GeeIterator *iter;
@@ -981,7 +960,7 @@
/* Add contact */
if (features & EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT)
{
- item = empathy_individual_add_menu_item_new (self, individual);
+ item = add_menu_item_new_individual (self, individual);
if (item != NULL)
{
gtk_menu_shell_append (GTK_MENU_SHELL (shell), item);
@@ -992,7 +971,7 @@
/* Chat */
if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT)
{
- item = empathy_individual_chat_menu_item_new (self, individual);
+ item = chat_menu_item_new_individual (self, individual);
if (item != NULL)
{
gtk_menu_shell_append (shell, item);
@@ -1003,7 +982,7 @@
/* SMS */
if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS)
{
- item = empathy_individual_sms_menu_item_new (self, individual);
+ item = sms_menu_item_new_individual (self, individual);
if (item != NULL)
{
gtk_menu_shell_append (shell, item);
@@ -1014,12 +993,14 @@
if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL)
{
/* Audio Call */
- item = empathy_individual_audio_call_menu_item_new (self, individual);
+ item = empathy_individual_audio_call_menu_item_new_individual (self,
+ individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* Video Call */
- item = empathy_individual_video_call_menu_item_new (self, individual);
+ item = empathy_individual_video_call_menu_item_new_individual (self,
+ individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
@@ -1028,14 +1009,14 @@
add_phone_numbers (self);
/* Invite */
- item = empathy_individual_invite_menu_item_new (individual, NULL);
+ item = invite_menu_item_new (individual, NULL);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* File transfer */
if (features & EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER)
{
- item = empathy_individual_file_transfer_menu_item_new (self, individual);
+ item = file_transfer_menu_item_new_individual (self, individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
@@ -1043,7 +1024,7 @@
/* Share my desktop */
/* FIXME we should add the "Share my desktop" menu item if Vino is
a registered handler in MC5 */
- item = empathy_individual_share_my_desktop_menu_item_new (self, individual);
+ item = share_my_desktop_menu_item_new_individual (self, individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
@@ -1064,7 +1045,7 @@
/* Edit */
if (features & EMPATHY_INDIVIDUAL_FEATURE_EDIT)
{
- item = empathy_individual_edit_menu_item_new (individual);
+ item = edit_menu_item_new_individual (individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
@@ -1072,7 +1053,7 @@
/* Log */
if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG)
{
- item = empathy_individual_log_menu_item_new (individual);
+ item = log_menu_item_new_individual (individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
@@ -1080,7 +1061,7 @@
/* Info */
if (features & EMPATHY_INDIVIDUAL_FEATURE_INFO)
{
- item = empathy_individual_info_menu_item_new (individual);
+ item = info_menu_item_new_individual (individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
@@ -1088,14 +1069,14 @@
/* Favorite checkbox */
if (features & EMPATHY_INDIVIDUAL_FEATURE_FAVOURITE)
{
- item = empathy_individual_favourite_menu_item_new (individual);
+ item = favourite_menu_item_new_individual (individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
}
/* Separator & Block */
if (features & EMPATHY_INDIVIDUAL_FEATURE_BLOCK &&
- (item = empathy_individiual_block_menu_item_new (individual)) != NULL) {
+ (item = block_menu_item_new_individual (individual)) != NULL) {
GtkWidget *sep;
sep = gtk_separator_menu_item_new ();
@@ -1108,7 +1089,7 @@
/* Separator & Remove */
if (features & EMPATHY_INDIVIDUAL_FEATURE_REMOVE &&
- (item = empathy_individiual_remove_menu_item_new (self)) != NULL) {
+ (item = remove_menu_item_new_individual (self)) != NULL) {
GtkWidget *sep;
sep = gtk_separator_menu_item_new ();
@@ -1362,15 +1343,11 @@
}
static GtkWidget *
-empathy_individual_chat_menu_item_new (EmpathyIndividualMenu *self,
- FolksIndividual *individual)
+chat_menu_item_new (EmpathyIndividualMenu *self)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) &&
- empathy_folks_individual_contains_contact (individual), NULL);
-
item = gtk_image_menu_item_new_with_mnemonic (_("_Chat"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_MESSAGE,
GTK_ICON_SIZE_MENU);
@@ -1378,6 +1355,21 @@
gtk_widget_show (image);
g_object_set_data (G_OBJECT (item), "individual-menu", self);
+
+ return item;
+}
+
+static GtkWidget *
+chat_menu_item_new_individual (EmpathyIndividualMenu *self,
+ FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) &&
+ empathy_folks_individual_contains_contact (individual), NULL);
+
+ item = chat_menu_item_new (self);
+
menu_item_set_first_contact (item, individual,
G_CALLBACK (empathy_individual_chat_menu_item_activated),
EMPATHY_ACTION_CHAT);
@@ -1385,6 +1377,23 @@
return item;
}
+static GtkWidget *
+chat_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = chat_menu_item_new (self);
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_chat_menu_item_activated),
+ EMPATHY_ACTION_CHAT);
+
+ return item;
+}
+
static void
empathy_individual_sms_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
@@ -1401,15 +1410,11 @@
}
static GtkWidget *
-empathy_individual_sms_menu_item_new (EmpathyIndividualMenu *self,
- FolksIndividual *individual)
+sms_menu_item_new (EmpathyIndividualMenu *self)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) &&
- empathy_folks_individual_contains_contact (individual), NULL);
-
item = gtk_image_menu_item_new_with_mnemonic (_("_SMS"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_SMS,
GTK_ICON_SIZE_MENU);
@@ -1417,6 +1422,21 @@
gtk_widget_show (image);
g_object_set_data (G_OBJECT (item), "individual-menu", self);
+
+ return item;
+}
+
+static GtkWidget *
+sms_menu_item_new_individual (EmpathyIndividualMenu *self,
+ FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual) &&
+ empathy_folks_individual_contains_contact (individual), NULL);
+
+ item = sms_menu_item_new (self);
+
menu_item_set_first_contact (item, individual,
G_CALLBACK (empathy_individual_sms_menu_item_activated),
EMPATHY_ACTION_SMS);
@@ -1424,6 +1444,24 @@
return item;
}
+static GtkWidget *
+sms_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = sms_menu_item_new (self);
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_sms_menu_item_activated),
+ EMPATHY_ACTION_SMS);
+
+ return item;
+}
+
+
static void
empathy_individual_audio_call_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
@@ -1437,21 +1475,33 @@
emit_menu_item_activated (item);
}
-GtkWidget *
-empathy_individual_audio_call_menu_item_new (EmpathyIndividualMenu *self,
- FolksIndividual *individual)
+static GtkWidget *
+audio_call_menu_item_new (EmpathyIndividualMenu *self)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
-
item = gtk_image_menu_item_new_with_mnemonic (C_("menu item", "_Audio Call"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VOIP, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
g_object_set_data (G_OBJECT (item), "individual-menu", self);
+
+ return item;
+}
+
+GtkWidget *
+empathy_individual_audio_call_menu_item_new_individual (
+ EmpathyIndividualMenu *self,
+ FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+
+ item = audio_call_menu_item_new (self);
+
menu_item_set_first_contact (item, individual,
G_CALLBACK (empathy_individual_audio_call_menu_item_activated),
EMPATHY_ACTION_AUDIO_CALL);
@@ -1459,6 +1509,25 @@
return item;
}
+static GtkWidget *
+audio_call_menu_item_new_contact (
+ EmpathyIndividualMenu *self,
+ EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = audio_call_menu_item_new (self);
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_audio_call_menu_item_activated),
+ EMPATHY_ACTION_AUDIO_CALL);
+
+ return item;
+}
+
+
static void
empathy_individual_video_call_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
@@ -1472,15 +1541,11 @@
emit_menu_item_activated (item);
}
-GtkWidget *
-empathy_individual_video_call_menu_item_new (EmpathyIndividualMenu *self,
- FolksIndividual *individual)
+static GtkWidget *
+video_call_menu_item_new (EmpathyIndividualMenu *self)
{
GtkWidget *item;
GtkWidget *image;
- TpawCameraMonitor *monitor;
-
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
item = gtk_image_menu_item_new_with_mnemonic (C_("menu item", "_Video Call"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_VIDEO_CALL,
@@ -1489,9 +1554,14 @@
gtk_widget_show (image);
g_object_set_data (G_OBJECT (item), "individual-menu", self);
- menu_item_set_first_contact (item, individual,
- G_CALLBACK (empathy_individual_video_call_menu_item_activated),
- EMPATHY_ACTION_VIDEO_CALL);
+
+ return item;
+}
+
+static void
+check_camera_available (GtkWidget *item)
+{
+ TpawCameraMonitor *monitor;
/* Only follow available cameras if the contact can do Video calls */
if (gtk_widget_get_sensitive (item))
@@ -1502,6 +1572,43 @@
g_object_bind_property (monitor, "available", item, "sensitive",
G_BINDING_SYNC_CREATE);
}
+}
+
+GtkWidget *
+empathy_individual_video_call_menu_item_new_individual (
+ EmpathyIndividualMenu *self,
+ FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+
+ item = video_call_menu_item_new (self);
+
+ menu_item_set_first_contact (item, individual,
+ G_CALLBACK (empathy_individual_video_call_menu_item_activated),
+ EMPATHY_ACTION_VIDEO_CALL);
+
+ check_camera_available (item);
+
+ return item;
+}
+
+GtkWidget *
+video_call_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = video_call_menu_item_new (self);
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_video_call_menu_item_activated),
+ EMPATHY_ACTION_VIDEO_CALL);
+
+ check_camera_available (item);
return item;
}
@@ -1517,18 +1624,28 @@
}
static GtkWidget *
-empathy_individual_log_menu_item_new (FolksIndividual *individual)
+log_menu_item_new (void)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
-
item = gtk_image_menu_item_new_with_mnemonic (_("_Previous Conversations"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_LOG, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
+ return item;
+}
+
+static GtkWidget *
+log_menu_item_new_individual (FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+
+ item = log_menu_item_new ();
+
menu_item_set_first_contact (item, individual,
G_CALLBACK (empathy_individual_log_menu_item_activated),
EMPATHY_ACTION_VIEW_LOGS);
@@ -1536,6 +1653,22 @@
return item;
}
+static GtkWidget *
+log_menu_item_new_contact (EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = log_menu_item_new ();
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_log_menu_item_activated),
+ EMPATHY_ACTION_VIEW_LOGS);
+
+ return item;
+}
+
static void
empathy_individual_file_transfer_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
@@ -1548,14 +1681,11 @@
}
static GtkWidget *
-empathy_individual_file_transfer_menu_item_new (EmpathyIndividualMenu *self,
- FolksIndividual *individual)
+file_transfer_menu_item_new (EmpathyIndividualMenu *self)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
-
item = gtk_image_menu_item_new_with_mnemonic (_("Send File"));
image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_DOCUMENT_SEND,
GTK_ICON_SIZE_MENU);
@@ -1563,6 +1693,20 @@
gtk_widget_show (image);
g_object_set_data (G_OBJECT (item), "individual-menu", self);
+
+ return item;
+}
+
+static GtkWidget *
+file_transfer_menu_item_new_individual (EmpathyIndividualMenu *self,
+ FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+
+ item = file_transfer_menu_item_new (self);
+
menu_item_set_first_contact (item, individual,
G_CALLBACK (empathy_individual_file_transfer_menu_item_activated),
EMPATHY_ACTION_SEND_FILE);
@@ -1570,6 +1714,23 @@
return item;
}
+static GtkWidget *
+file_transfer_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = file_transfer_menu_item_new (self);
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_file_transfer_menu_item_activated),
+ EMPATHY_ACTION_SEND_FILE);
+
+ return item;
+}
+
static void
empathy_individual_share_my_desktop_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
@@ -1582,20 +1743,31 @@
}
static GtkWidget *
-empathy_individual_share_my_desktop_menu_item_new (EmpathyIndividualMenu *self,
- FolksIndividual *individual)
+share_my_desktop_menu_item_new (EmpathyIndividualMenu *self)
{
GtkWidget *item;
GtkWidget *image;
- g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
-
item = gtk_image_menu_item_new_with_mnemonic (_("Share My Desktop"));
image = gtk_image_new_from_icon_name (GTK_STOCK_NETWORK, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
g_object_set_data (G_OBJECT (item), "individual-menu", self);
+
+ return item;
+}
+
+static GtkWidget *
+share_my_desktop_menu_item_new_individual (EmpathyIndividualMenu *self,
+ FolksIndividual *individual)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+
+ item = share_my_desktop_menu_item_new (self);
+
menu_item_set_first_contact (item, individual,
G_CALLBACK (empathy_individual_share_my_desktop_menu_item_activated),
EMPATHY_ACTION_SHARE_MY_DESKTOP);
@@ -1603,6 +1775,23 @@
return item;
}
+static GtkWidget *
+share_my_desktop_menu_item_new_contact (EmpathyIndividualMenu *self,
+ EmpathyContact *contact)
+{
+ GtkWidget *item;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ item = share_my_desktop_menu_item_new (self);
+
+ menu_item_set_contact (item, contact,
+ G_CALLBACK (empathy_individual_share_my_desktop_menu_item_activated),
+ EMPATHY_ACTION_SHARE_MY_DESKTOP);
+
+ return item;
+}
+
static void
favourite_menu_item_toggled_cb (GtkCheckMenuItem *item,
FolksIndividual *individual)
@@ -1613,7 +1802,7 @@
}
static GtkWidget *
-empathy_individual_favourite_menu_item_new (FolksIndividual *individual)
+favourite_menu_item_new_individual (FolksIndividual *individual)
{
GtkWidget *item;
@@ -1637,7 +1826,7 @@
}
static GtkWidget *
-empathy_individual_info_menu_item_new (FolksIndividual *individual)
+info_menu_item_new_individual (FolksIndividual *individual)
{
GtkWidget *item;
GtkWidget *image;
@@ -1666,7 +1855,7 @@
}
static GtkWidget *
-empathy_individual_edit_menu_item_new (FolksIndividual *individual)
+edit_menu_item_new_individual (FolksIndividual *individual)
{
EmpathyIndividualManager *manager;
GtkWidget *item;
@@ -1835,7 +2024,7 @@
}
static GtkWidget *
-empathy_individual_invite_menu_item_new (FolksIndividual *individual,
+invite_menu_item_new (FolksIndividual *individual,
EmpathyContact *contact)
{
GtkWidget *item;
@@ -1977,7 +2166,7 @@
}
static GtkWidget *
-empathy_individual_add_menu_item_new (EmpathyIndividualMenu *self,
+add_menu_item_new_individual (EmpathyIndividualMenu *self,
FolksIndividual *individual)
{
EmpathyIndividualMenuPriv *priv = GET_PRIV (self);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/libempathy-gtk/empathy-individual-menu.h new/empathy-3.12.4/libempathy-gtk/empathy-individual-menu.h
--- old/empathy-3.12.2/libempathy-gtk/empathy-individual-menu.h 2014-02-06 15:08:20.000000000 +0100
+++ new/empathy-3.12.4/libempathy-gtk/empathy-individual-menu.h 2014-06-23 17:18:12.000000000 +0200
@@ -76,9 +76,9 @@
EmpathyIndividualFeatureFlags features,
EmpathyIndividualStore *store);
-GtkWidget * empathy_individual_audio_call_menu_item_new (
+GtkWidget * empathy_individual_audio_call_menu_item_new_individual (
EmpathyIndividualMenu *self, FolksIndividual *individual);
-GtkWidget * empathy_individual_video_call_menu_item_new (
+GtkWidget * empathy_individual_video_call_menu_item_new_individual (
EmpathyIndividualMenu *self, FolksIndividual *individual);
G_END_DECLS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/libempathy-gtk/empathy-individual-view.c new/empathy-3.12.4/libempathy-gtk/empathy-individual-view.c
--- old/empathy-3.12.2/libempathy-gtk/empathy-individual-view.c 2014-02-06 15:08:20.000000000 +0100
+++ new/empathy-3.12.4/libempathy-gtk/empathy-individual-view.c 2014-06-23 17:18:12.000000000 +0200
@@ -1071,12 +1071,14 @@
shell = GTK_MENU_SHELL (menu);
/* audio */
- item = empathy_individual_audio_call_menu_item_new (NULL, individual);
+ item = empathy_individual_audio_call_menu_item_new_individual (NULL,
+ individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* video */
- item = empathy_individual_video_call_menu_item_new (NULL, individual);
+ item = empathy_individual_video_call_menu_item_new_individual (NULL,
+ individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/libempathy-gtk/empathy-smiley-manager.c new/empathy-3.12.4/libempathy-gtk/empathy-smiley-manager.c
--- old/empathy-3.12.2/libempathy-gtk/empathy-smiley-manager.c 2014-02-06 15:08:20.000000000 +0100
+++ new/empathy-3.12.4/libempathy-gtk/empathy-smiley-manager.c 2014-06-23 13:52:53.000000000 +0200
@@ -267,27 +267,53 @@
g_return_if_fail (EMPATHY_IS_SMILEY_MANAGER (manager));
/* From fd.o icon-naming spec */
- empathy_smiley_manager_add (manager, "face-angel", "O:-)", "O:)", NULL);
- empathy_smiley_manager_add (manager, "face-angry", "X-(", ":@", NULL);
- empathy_smiley_manager_add (manager, "face-cool", "B-)", NULL);
- empathy_smiley_manager_add (manager, "face-crying", ":'(", NULL);
- empathy_smiley_manager_add (manager, "face-devilish", ">:-)", ">:)", NULL);
- empathy_smiley_manager_add (manager, "face-embarrassed",":-[", ":[", ":-$", ":$", NULL);
- empathy_smiley_manager_add (manager, "face-kiss", ":-*", ":*", NULL);
- empathy_smiley_manager_add (manager, "face-laugh", ":-))", ":))", NULL);
- empathy_smiley_manager_add (manager, "face-monkey", ":-(|)", ":(|)", NULL);
- empathy_smiley_manager_add (manager, "face-plain", ":-|", ":|", NULL);
- empathy_smiley_manager_add (manager, "face-raspberry", ":-P", ":P", ":-p", ":p", NULL);
- empathy_smiley_manager_add (manager, "face-sad", ":-(", ":(", NULL);
- empathy_smiley_manager_add (manager, "face-sick", ":-&", ":&", NULL);
- empathy_smiley_manager_add (manager, "face-smile", ":-)", ":)", NULL);
- empathy_smiley_manager_add (manager, "face-smile-big", ":-D", ":D", ":-d", ":d", NULL);
- empathy_smiley_manager_add (manager, "face-smirk", ":-!", ":!", NULL);
- empathy_smiley_manager_add (manager, "face-surprise", ":-O", ":O", ":-o", ":o", NULL);
- empathy_smiley_manager_add (manager, "face-tired", "|-)", "|)", NULL);
- empathy_smiley_manager_add (manager, "face-uncertain", ":-/", ":/", NULL);
- empathy_smiley_manager_add (manager, "face-wink", ";-)", ";)", NULL);
- empathy_smiley_manager_add (manager, "face-worried", ":-S", ":S", ":-s", ":s", NULL);
+
+ /* U+1F47C BABY ANGEL */
+ empathy_smiley_manager_add (manager, "face-angel", "👼", "O:-)", "O:)", NULL);
+ /* U+1F620 ANGRY FACE */
+ empathy_smiley_manager_add (manager, "face-angry", "😠", "X-(", ":@", NULL);
+ /* U+1F60E SMILING FACE WITH SUNGLASSES */
+ empathy_smiley_manager_add (manager, "face-cool", "😎", "B-)", "B-|", NULL);
+ /* U+1F62D LOUDLY CRYING FACE */
+ empathy_smiley_manager_add (manager, "face-crying", "😭", ":'(", NULL);
+ /* U+1F608 SMILING FACE WITH HORNS */
+ empathy_smiley_manager_add (manager, "face-devilish", "😈", ">:-)", ">:)", NULL);
+ /* U+1F633 FLUSHED FACE */
+ empathy_smiley_manager_add (manager, "face-embarrassed","😳", ":-[", ":[", ":-$", ":$", NULL);
+ /* no suitable character in unicode */
+ empathy_smiley_manager_add (manager, "face-glasses", "8-)", NULL);
+ /* U+1F618 FACE THROWING A KISS */
+ empathy_smiley_manager_add (manager, "face-kiss", "😘", ":-*", ":*", NULL);
+ /* U+1F604 SMILING FACE WITH OPEN MOUTH AND SMILING EYES" */
+ empathy_smiley_manager_add (manager, "face-laugh", "😄", ":-))", ":))", NULL);
+ /* U+1F435 MONKEY */
+ empathy_smiley_manager_add (manager, "face-monkey", "🐵", ":-(|)", ":(|)", NULL);
+ /* U+1F610 NEUTRAL FACE */
+ empathy_smiley_manager_add (manager, "face-plain", "😐", ":-|", ":|", NULL);
+ /* U+1F61B FACE WITH STUCK-OUT TONGUE */
+ empathy_smiley_manager_add (manager, "face-raspberry", "😛", ":-P", ":P", ":-p", ":p", NULL);
+ /* U+1F626 FROWING FACE WITH OPEN MOUTH */
+ empathy_smiley_manager_add (manager, "face-sad", "😦", ":-(", ":(", NULL);
+ /* U+1F635 DIZZY FACE */
+ empathy_smiley_manager_add (manager, "face-sick", "😵", ":-&", ":&", NULL);
+ /* U+1F603 SMILING FACE WITH OPEN MOUTH */
+ empathy_smiley_manager_add (manager, "face-smile", "😃", ":-)", ":)", ":]", "=)", NULL);
+ /* U+1F601 GRINNING FACE WITH SMILING EYES */
+ empathy_smiley_manager_add (manager, "face-smile-big", "😁", ":-D", ":D", ":-d", ":d", NULL);
+ /* U+1F60F SMIRKING FACE */
+ empathy_smiley_manager_add (manager, "face-smirk", "😏", ":-!", ":!", NULL);
+ /* U+1F632 ASTONISHED FACE */
+ empathy_smiley_manager_add (manager, "face-surprise", "😲", ":-O", ":O", ":-o", ":o", NULL);
+ /* U+1F62A SLEEPY FACE */
+ empathy_smiley_manager_add (manager, "face-tired", "😪", "|-)", "|)", NULL);
+ /* U+1F615 CONFUSED FACE */
+ empathy_smiley_manager_add (manager, "face-uncertain", "😕", ":-/", ":/", ":-\\", ":\\", NULL);
+ /* U+1F609 WINKING FACE */
+ empathy_smiley_manager_add (manager, "face-wink", "😉", ";-)", ";)", NULL);
+ /* U+1F61F WORRIED FACE */
+ empathy_smiley_manager_add (manager, "face-worried", "😟", ":-S", ":S", ":-s", ":s", NULL);
+ /* U+2764 HEAVY BLACK HEART */
+ empathy_smiley_manager_add (manager, "emblem-favorite", "❤", "<3", NULL);
}
static EmpathySmileyHit *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/src/chat-manager-interface.c new/empathy-3.12.4/src/chat-manager-interface.c
--- old/empathy-3.12.2/src/chat-manager-interface.c 2014-02-17 10:49:12.000000000 +0100
+++ new/empathy-3.12.4/src/chat-manager-interface.c 2014-06-11 10:03:02.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.39.5. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.41.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/src/chat-manager-interface.h new/empathy-3.12.4/src/chat-manager-interface.h
--- old/empathy-3.12.2/src/chat-manager-interface.h 2014-02-17 10:49:12.000000000 +0100
+++ new/empathy-3.12.4/src/chat-manager-interface.h 2014-06-11 10:03:02.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.39.5. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.41.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/empathy-3.12.2/src/empathy-accounts.c new/empathy-3.12.4/src/empathy-accounts.c
--- old/empathy-3.12.2/src/empathy-accounts.c 2014-02-07 10:25:55.000000000 +0100
+++ new/empathy-3.12.4/src/empathy-accounts.c 2014-06-09 10:39:58.000000000 +0200
@@ -236,6 +236,7 @@
empathy_init ();
+ textdomain (GETTEXT_PACKAGE);
g_set_application_name (_("Empathy Accounts"));
/* Make empathy and empathy-accounts appear as the same app in gnome-shell */
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org