← Back to branch summary

~ubuntu-branches/ubuntu/precise/empathy/precise-proposed-201205180810

« back to all changes in this revision

Viewing changes to src/empathy-about-dialog.c

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis, Brian Curtis, Ken VanDine
  • Date: 2011-06-01 10:35:24 UTC
  • mfrom: (1.1.70 upstream) (6.3.44 experimental)
  • Revision ID: james.westby@ubuntu.com-20110601103524-wx3wgp71394730jt
Tags: 3.1.1-1ubuntu1
[ Brian Curtis ]
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add Vcz-Bzr link
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommend the freedesktop sound theme we have an ubuntu one
  - Add build depend for libunity-dev
* debian/rules:
  - Use autoreconf.mk
  - Disable map and location
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/34_start_raised_execpt_in_session.patch
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts 
* debian/patches/41_unity_launcher_progress.patch
  - Display file transfer progress in the unity launcher

[ Ken VanDine ]
* debian/control
  - build depend on libgcr-3-dev instead of libgcr-dev
  - dropped build depends for libindicate, we will use telepathy-indicator
  - Depend on dconf-gsettings-backend | gsettings-backend
  - Added a Recommends for telepathy-indicator
* +debian/empathy.gsettings-override
  - Added an override for notifications-focus
* debian/patches/series
  - commented out 23_idomessagedialog_for_voip_and_ft.patch, until ido has 
    been ported to gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/empathy-about-dialog.c
33
33
 
34
34
#define WEB_SITE "http://live.gnome.org/Empathy"
35
35
 
36
 
static void about_dialog_activate_link_cb (GtkAboutDialog  *about,
37
 
                                           const gchar     *link,
38
 
                                           gpointer         data);
39
 
 
40
36
static const char *authors[] = {
41
37
        "Alban Crequy",
42
38
        "Andreas Lööw",
49
45
        "Frederic Crozat",
50
46
        "Frederic Peters",
51
47
        "Geert-Jan Van den Bogaerde",
52
 
        "Guillaume Desmottes",
 
48
        "Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>",
53
49
        "Johan Hammar",
54
50
        "Jonatan Magnusson",
55
51
        "Jonny Lamb",
95
91
           "51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA")
96
92
};
97
93
 
98
 
static void
99
 
about_dialog_activate_link_cb (GtkAboutDialog *about,
100
 
                               const gchar    *link_,
101
 
                               gpointer        data)
102
 
{
103
 
        empathy_url_show (GTK_WIDGET (about), link_);
104
 
}
105
 
 
106
94
void
107
95
empathy_about_dialog_new (GtkWindow *parent)
108
96
{
109
97
        gchar *license_trans;
110
98
 
111
 
        gtk_about_dialog_set_url_hook (about_dialog_activate_link_cb, NULL, NULL);
112
 
 
113
99
        license_trans = g_strconcat (_(license[0]), "\n\n",
114
100
                                     _(license[1]), "\n\n",
115
101
                                     _(license[2]), "\n\n",