← Back to branch summary

~ubuntu-branches/ubuntu/saucy/empathy/saucy-updates

« back to all changes in this revision

Viewing changes to .pc/34_start_raised_execpt_in_session.patch/src/empathy-status-icon.c

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2013-05-31 10:44:31 UTC
  • mfrom: (1.1.111) (6.6.55 experimental)
  • Revision ID: package-import@ubuntu.com-20130531104431-w0ec8ntcojx76y61
Tags: 3.8.3-0ubuntu1
* Merge with Debian, remaining changes:
  - debian/patches/00_linker-fixes.patch
  - debian/patches/10_use_notify_osd_icons.patch
  - debian/patches/23_idomessagedialog_for_voip_and_ft.patch
  - debian/patches/34_start_raised_execpt_in_session.patch
  - debian/patches/38_default_to_facebook_for_im.patch
  - debian/patches/39_default_to_freenode_for_irc.patch
  - debian/patches/41_unity_launcher_progress.patch
  - debian/patches/42_shell_running.patch
  - debian/patches/43_quicklists.patch
  - debian/patches/47_git_activate_with_platform_data.patch: Patches kept,
    see newly completed patch headers for descriptions.
  - debian/*: Turn on UOA and split out account plugins into
    account-plugins-* packages.
  - Remove Universe Build-Deps for geocode and cheese and disable these
    features.
  - debian/indicators/empathy: Install indicator integration point.
* New upstream release 3.8.3
* debian/patches/include-empathy-keyring.h: Add, fix implicit declaration of
  empathy_keyring_set_account_password_finish and co by including the right
  header.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/34_start_raised_execpt_in_session.patch/src/empathy-status-icon.c
19
19
 * Authors: Xavier Claessens <xclaesse@gmail.com>
20
20
 */
21
21
 
22
 
#include <config.h>
23
 
 
24
 
#include <string.h>
25
 
 
26
 
#include <glib.h>
27
 
 
28
 
#include <gtk/gtk.h>
29
 
#include <gdk/gdkkeysyms.h>
30
 
#include <glib/gi18n.h>
31
 
 
32
 
#include <telepathy-glib/telepathy-glib.h>
 
22
#include "config.h"
33
23
 
34
24
#include <libempathy/empathy-gsettings.h>
35
25
#include <libempathy/empathy-utils.h>
36
26
 
37
27
#include <libempathy-gtk/empathy-presence-chooser.h>
38
28
#include <libempathy-gtk/empathy-ui-utils.h>
39
 
#include <libempathy-gtk/empathy-images.h>
40
29
#include <libempathy-gtk/empathy-new-message-dialog.h>
41
30
#include <libempathy-gtk/empathy-new-call-dialog.h>
42
31
 
43
 
#include "empathy-accounts-dialog.h"
44
32
#include "empathy-status-icon.h"
45
 
#include "empathy-preferences.h"
46
33
#include "empathy-event-manager.h"
47
34
 
48
35
#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER