← Back to branch summary

~micahg/ubuntu/natty/pidgin/2.7.9-2

« back to all changes in this revision

Viewing changes to pidgin/gtkdialogs.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-08-11 14:16:15 UTC
  • mfrom: (1.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20100811141615-lsqya0vlqrnu14lo
Tags: 1:2.7.3-1ubuntu1
* Resync on Debian, workaround build issue (lp:#600952) 
* debian/control:
  - Build-Depends on liblaunchpad-integration-dev
  - Drop libpurple0 dependency from libpurple-bin
  - Drop pidgin-data dependency from libpurple0
  - Recommends pidgin-libnotify
* debian/libpurple0.symbols: 
  - add epochs
* debian/patches/02_lpi.patch:
  - launchpad integration
* debian/patches/04_let_crasher_for_apport.patch:
  - stop catching the SIGSEGV signal and let apport handle it
* debian/patches/05_default_to_irc_ubuntu_com.patch:
  - set the default IRC server to irc.ubuntu.com
* debian/patches/10_docklet_default_off.patch:
  - default behavior to have no notification area icon.
* debian/patches/11_buddy_list_really_show.patch:
  - the buddy list tries harder to appear.  This fixes some issues with it
    not appearing.
* debian/patches/ 13_sounds_and_timers.patch:
  - adjusts the time out for sounds to be 15 seconds, 
    which helps get fewer spurious login notifications on slow connections.
* debian/patches/60_1024x600_gtk*.c.patch: 
  - add scrollbars into preferences and pounce dialogs
* debian/prefs.xml: 
  - Update to set the notify plugin prefs /plugins/gtk/X11/notify/*, 
    set /pidgin/plugins/loaded to load the notify plugin and enable 
    the standard logging options by default
* debian/rules:
  - install a launcher in the message indicator
  - set translation domain and update template
  - use simple-patchsys rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
pidgin/gtkdialogs.c
206
206
        {N_("Malay"),               "ms_MY", "Muhammad Najmi bin Ahmad Zabidi", "najmi.zabidi@gmail.com"},
207
207
        {N_("Bokmål Norwegian"),    "nb", "Hans Fredrik Nordhaug", "hans@nordhaug.priv.no"},
208
208
        {N_("Nepali"),              "ne", "Shyam Krishna Bal", "shyamkrishna_bal@yahoo.com"},
209
 
        {N_("Dutch, Flemish"),      "nl", "Vincent van Adrighem", "V.vanAdrighem@dirck.mine.nu"},
210
 
        {N_("Norwegian Nynorsk"),   "nn", "Yngve Spjeld Landro", "nynorsk@strilen.net"},
 
209
        {N_("Dutch, Flemish"),      "nl", "Gideon van Melle", "translations@gvmelle.com"},
 
210
        {N_("Norwegian Nynorsk"),   "nn", "Yngve Spjeld Landro", "l10n@landro.net"},
211
211
        {N_("Occitan"),             "oc", "Yannig Marchegay", "yannig@marchegay.org"},
212
212
        {N_("Oriya"),               "or", "Manoj Kumar Giri", "giri.manojkr@gmail.com"},
213
213
        {N_("Punjabi"),             "pa", "Amanpreet Singh Alam", "aalam@users.sf.net"},
288
288
        {N_("Bokmål Norwegian"),    "nb", "Hallvard Glad", "hallvard.glad@gmail.com"},
289
289
        {N_("Bokmål Norwegian"),    "nb", "Petter Johan Olsen", NULL},
290
290
        {N_("Bokmål Norwegian"),    "nb", "Espen Stefansen", "espenas@gmail.com"},
 
291
        {N_("Dutch, Flemish"),      "nl", "Vincent van Adrighem", "V.vanAdrighem@dirck.mine.nu"},
291
292
        {N_("Polish"),              "pl", "Emil Nowak", "emil5@go2.pl"},
292
293
        {N_("Polish"),              "pl", "Paweł Godlewski", "pawel@bajk.pl"},
293
294
        {N_("Polish"),              "pl", "Krzysztof Foltman", "krzysztof@foltman.com"},
430
431
 
431
432
        /* Insert the logo */
432
433
        logo = gtk_image_new_from_pixbuf(pixbuf);
433
 
        g_object_unref(G_OBJECT(pixbuf));
 
434
        if (pixbuf)
 
435
                g_object_unref(G_OBJECT(pixbuf));
434
436
        obj = gtk_widget_get_accessible(logo);
435
437
        tmp = g_strconcat(PIDGIN_NAME, " " DISPLAY_VERSION, NULL);
436
438
        atk_object_set_description(obj, tmp);