From: Xavier Claessens
Date: Tue, 7 May 2013 13:24:13 +0000 (+0200)
Subject: Merge branch 'gnome-3-8'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=10983e93f69ddcc048cc582d777433ca2c7a2b39;hp=add79d54e3c0149a2c336077d1e37c60d54c5ace
Merge branch 'gnome-3-8'
---
diff --git a/NEWS b/NEWS
index 5eae4d0d..92d20995 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+NEW in 3.9.1 (03/05/2013)
+============
+Bugs fixed:
+ - Fixed #692160, Updated Icon Names (B.Prathibha)
+ - Fixed #697214, call-window: Remember that the audio output has been added (Olivier Crête)
+ - Fixed #697302, Spelling mistake: "You need to setup an account..." (SandipTiwari)
+ - Fixed #699017, libempathy: Fix build by adding missing math.h header (Stef Walter)
+ - Fixed #673775, The icon for audio call in the help is wrong. (Ekaterina Gerasimova)
+ - Fixed #677549, "Link Contacts" user documentation is wrong (Shobha Tyagi)
+
+Translations:
+ - Updated crh Translation (ReÅat SABIQ)
+ - Updated it Translation (Milo Casagrande)
+
+Documentation translations:
+ - Updated de Documentation translation (Christian Kirbach)
+ - Updated el Documentation translation (Dimitris Spingos)
+ - Updated es Documentation translation (Daniel Mustieles)
+ - Updated zh_CN Documentation translation (Wylmer Wang)
+
NEW in 3.8.1 (15/04/2013)
============
Bugs fixed:
diff --git a/configure.ac b/configure.ac
index d4c07d0d..f88d1558 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl If not 1, append datestamp to the version number
m4_define(empathy_released, 0)
m4_define([empathy_major_version], [3])
-m4_define([empathy_minor_version], [8])
+m4_define([empathy_minor_version], [9])
m4_define([empathy_micro_version], [1])
m4_define([empathy_nano_version], [0])
diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in
index c5dea6f7..2e9b9fc9 100644
--- a/data/empathy.desktop.in.in
+++ b/data/empathy.desktop.in.in
@@ -7,7 +7,7 @@ _Comment=Chat on Google Talk, Facebook, MSN and many other chat services
_Keywords=chat;talk;im;message;irc;voip;gtalk;facebook;jabber;
Exec=empathy
Icon=empathy
-StartupNotify=false
+StartupNotify=true
Terminal=false
Type=Application
Categories=GNOME;GTK;Network;InstantMessaging;
diff --git a/extensions/extensions.h b/extensions/extensions.h
index 2dbd79cc..c1c42164 100644
--- a/extensions/extensions.h
+++ b/extensions/extensions.h
@@ -1,7 +1,6 @@
#ifndef __EMP_EXTENSIONS_H__
#define __EMP_EXTENSIONS_H__
-#include
#include
#include "extensions/_gen/enums.h"
diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 41eb8f6e..dc9e036e 100644
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -24,14 +24,11 @@
*/
#include "config.h"
-
-#include
+#include "mcp-account-manager-goa.h"
#define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
#include
-#include "mcp-account-manager-goa.h"
-
#define DEBUG g_debug
#define GET_PRIVATE(self) (((McpAccountManagerGoa *) self)->priv)
#define DECLARE_GASYNC_CALLBACK(name) \
diff --git a/goa-mc-plugin/mission-control-plugin.c b/goa-mc-plugin/mission-control-plugin.c
index 40653056..d4e8ae29 100644
--- a/goa-mc-plugin/mission-control-plugin.c
+++ b/goa-mc-plugin/mission-control-plugin.c
@@ -23,7 +23,7 @@
* Danielle Madeley
*/
-#include
+#include "config.h"
#include "mcp-account-manager-goa.h"
diff --git a/help/C/add-contact.page b/help/C/add-contact.page
index 0bf6a0b5..3426cd6f 100644
--- a/help/C/add-contact.page
+++ b/help/C/add-contact.page
@@ -5,7 +5,7 @@
-
+
Add someone to the contact list.
diff --git a/help/C/audio-call.page b/help/C/audio-call.page
index 024b4637..4d9707f3 100644
--- a/help/C/audio-call.page
+++ b/help/C/audio-call.page
@@ -1,5 +1,6 @@
@@ -15,10 +16,17 @@
+
+
Milo Casagrande
- milo@ubuntu.com
+ milo@ubuntu.com
+
+
+ Ekaterina Gerasimova
+ kittykat3756@gmail.com
+
Creative Commons Share Alike 3.0
@@ -26,27 +34,27 @@
Start an audio conversation
-
You can call your contacts and have an audio conversation with them.
- This features only works with certain types of accounts, and it requires
- the other person to have an application that supports audio calls.
+
You can call your contacts and have an audio conversation with them. This
+ features only works with certain types of accounts and it requires the other
+ person to have an application that supports audio calls.
+
- From the Contact List window, click the
- video call
- icon next to the name of the contact you wish to call and
- choose Audio Call.
+ Right-click on the contact that you want to call and select
+ Audio Call.
A new window will open. When the connection is established, you will
- see Connected at the bottom of the window, along with the
- total conversation time.
+ see the total conversation time at the bottom of the window.
+
- To end the conversation, click on Hang up.
+ To end the conversation, click the hand up
+ button.
diff --git a/help/C/figures/audio-input-microphone.png b/help/C/figures/audio-input-microphone.png
deleted file mode 100644
index f45d15d5..00000000
Binary files a/help/C/figures/audio-input-microphone.png and /dev/null differ
diff --git a/help/C/figures/camera-web.png b/help/C/figures/camera-web.png
deleted file mode 100644
index e5406c5b..00000000
Binary files a/help/C/figures/camera-web.png and /dev/null differ
diff --git a/help/C/index.page b/help/C/index.page
index 5b700188..16e0563c 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -1,5 +1,6 @@
@@ -25,8 +26,8 @@
-
- Empathy Internet Messenger logo
+
+ Empathy Internet Messenger logo
Empathy Internet Messenger
diff --git a/help/C/link-contacts.page b/help/C/link-contacts.page
index 06184ac6..6a23cd14 100644
--- a/help/C/link-contacts.page
+++ b/help/C/link-contacts.page
@@ -15,6 +15,10 @@
Milo Casagrandemilo@ubuntu.com
+
+ Shobha Tyagi
+ tyagishobha@gmail.com
+
- Combine and separate contacts
+ Link and unlink contacts
- If one, or more, of your contacts has multiple accounts with different
- messaging services, you can combine these contacts into a single one.
+ If one or more of your contacts has multiple accounts with different
+ messaging services, you can combine these accounts into a single contact.
The resulting contact is called a meta-contact: a contact composed
from different single contacts.
- If you have a Jane Smith contact that is using three different messaging
- services like:
+ Suppose you have a contact called Jane Smith who is using three different
+ messaging services like:
@@ -55,52 +59,71 @@
You can combine these contacts into a single Jane Smith one.
-
- Combining contacts
+ Link contacts
+
+ The way you can link your contacts is as follows:
+
- From the Contact List window, right-click one of the contact
- that has different accounts, and select
- Link Contacts....
+ Press the tick button to select entries you want to link. This will enable
+ selection mode and you can see a checkbox for each entry.
- From the left pane in the Link Contacts window,
- select the contacts you want to combine.
+ Tick the checkboxes that correspond to the Contacts entries which
+ belong to the same contact.
- Click Link.
+ Press Link.
-
-
- When a meta-contact has been created, the default contact that will be used
- to have a conversation with when you double-click on it, is the contact with
- the highest presence on-line.
-
-
+
+ Repeat steps 3 and 4 in order to link other contacts.
+
-
- Separating contacts
+
+ Unlink contacts
+
+ To unlink a linked contact:
+
- From the Contact List, right-click the contact
- to separate, and select Link Contacts....
+ Select the contact from your list.
+
+
+
+
+ Press Edit in the top-right corner of Contacts.
+
+
+
+
+ Press Linked Contacts.
+
+
+
+
+ Press Remove to unlink an entry from the linked contact.
- Click Unlink.
+ Press Close if you do not want to unlink any more contacts.
From the Contact List window, click the
- video call
- icon next to the name of the contact you wish to call and choose Video Call.
-
+
Right-click on the contact that you want to call and select
+ Video Call.
A new window will open. When the connection is established, you will
- see Connected at the bottom of the window, along with the
- total conversation time.
+ see the total conversation time at the bottom of the window.
-
- To end the conversation, click on Hang up.
-
+
To end the conversation, click on the hang
+ up button.
+
-
- To turn a video conversation into an audio conversation, choose
- VideoVideo Off.
-
+
To turn a video conversation into an audio conversation, choose
+ VideoVideo Off.