← Back to branch summary

~prateek.karandikar/ubuntu/precise/pidgin/add_quicklist

« back to all changes in this revision

Viewing changes to pidgin/gtkdialogs.c

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2011-04-11 03:27:22 UTC
  • mfrom: (2.3.17 sid)
  • Revision ID: james.westby@ubuntu.com-20110411032722-farsw08i6ouj5dnd
Tags: 1:2.7.11-1ubuntu1
https://launchpad.net/bugs/757146
* Merge from Debian unstable (LP: #757146), remaining changes:
  + debian/control:
    - Add libtool and liblaunchpad-integration-dev build depends
    - Bump standards version
    - Relax binary depends on pidgin versions
    - Add pidgin-libnotify as Recommends for pidgin binary
    - Fix description of pidgin binary
    - Don't have libpurple-bin depend on libpurple0
  + debian/libpurple0.symbols: add epoch to appropriate symbols
  + Add debian/patches:
    - 02_lpi.patch
    - 04_let_crasher_for_apport.patch
    - 05_default_to_irc_ubuntu_com.patch
    - 10_docklet_default_off.patch
    - 11_buddy_list_really_show.patch
    - 13_sounds_and_timers.patch
    - 60_1024x600_gtkpounce.c.patch
    - 60_1024x600_gtkprefs.c.patch
  + debian/prefs.xml: add notification prefs
  + debian/rules:
    - Add translation domain to desktop file with gettext
    - Add the launcher for pidgin

* Add configure check for launchpad integration attached to the gtk check since 
  upstream dropped the startup notification check which is where this check was 
  previously
  - update debian/patches/02_lpi.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
pidgin/gtkdialogs.c
73
73
static const struct developer developers[] = {
74
74
        {"Daniel 'datallah' Atallah",          NULL,                  NULL},
75
75
        {"Paul 'darkrain42' Aurich",           NULL,                  NULL},
76
 
        {"John 'rekkanoryo' Bailey",           N_("bug master"),      NULL},
 
76
        {"John 'rekkanoryo' Bailey",           NULL,                  NULL},
77
77
        {"Ethan 'Paco-Paco' Blanton",          NULL,                  NULL},
78
78
        {"Hylke Bons",                         N_("artist"),          "hylkebons@gmail.com"},
79
79
        /* feel free to not translate this */
199
199
        {N_("Kurdish"),             "ku", "Rizoyê Xerzî", "rizoxerzi@hotmail.com"},
200
200
        {N_("Lao"),                 "lo", "Anousak Souphavah", "anousak@gmail.com"},
201
201
        {N_("Maithili"),            "mai", "Sangeeta Kumari", "sangeeta_0975@yahoo.com"},
202
 
        {"Meadow Mari",             "mhr", "David Preece", "davidpreece1@gmail.com"},
 
202
        {N_("Meadow Mari"),         "mhr", "David Preece", "davidpreece1@gmail.com"},
203
203
        {N_("Macedonian"),          "mk", "Arangel Angov ", "arangel@linux.net.mk"},
204
204
        {N_("Macedonian"),          "mk", "Ivana Kirkovska", "ivana.kirkovska@gmail.com"},
205
205
        {N_("Macedonian"),          "mk", "Jovan Naumovski", "jovan@lugola.net"},
650
650
else
651
651
        g_string_append(str, "    <b>Perl:</b> Disabled<br/>");
652
652
 
653
 
#ifndef _WIN32
654
 
#ifdef HAVE_STARTUP_NOTIFICATION
655
 
        g_string_append(str, "    <b>Startup Notification:</b> Enabled<br/>");
656
 
#else
657
 
        g_string_append(str, "    <b>Startup Notification:</b> Disabled<br/>");
658
 
#endif
659
 
#endif
660
 
 
661
653
if (purple_plugins_find_with_id("core-tcl") != NULL) {
662
654
        g_string_append(str, "    <b>Tcl:</b> Enabled<br/>");
663
655
#ifdef HAVE_TK