← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/pidgin/intrepid-security

« back to all changes in this revision

Viewing changes to finch/gntblist.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2008-04-04 02:18:00 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20080404021800-qaa00wom38gd7xus
Tags: 1:2.4.1-1ubuntu1
https://launchpad.net/bugs/211769
* Sync with Debian, remaining Ubuntu changes; (LP: #211769)
  - debian/control:
    + Set Maintainer to Ubuntu Core Developers.
    + Add build-deps on liblaunchpad-integration-dev, intltool,
      libnm-glib-dev (for --enable-nm)
    + Drop build-deps on libsilc-1.1-2-dev | libsilc-dev (>= 1.1.1) as
      this library is in universe.
    + Drop the libpurple0 recommends on libpurple-bin.
    + Add a gaim transitionnal package for upgrades.
    + Moved finch's libx11-6 dependency to Suggests
  - Ship compatibility symlinks via debian/gaim.links
  - debian/rules:
    + Pass --enable-nm to configure to enable NetworkManager support
    + Pass --disable-silc to configure to disable silc support even if
      it's installed in the build environment.
    + Add X-Ubuntu-Gettext-Domain to the desktop file and update the
      translation templates in common-install-impl::.
    + Added necessary arguments to dh_shlibdeps for finch
  - Update debian/prefs.xml to set the notify plugin prefs
    /plugins/gtk/X11/notify/* and set /pidgin/plugins/loaded to load
    the notify plugin
  - debian/patches:
    + 02_lpi for LP integration
    + 04_let_crasher_for_apport to stop catching the SIGSEGV signal
      and let apport handle it
    + 05_default_to_irc_ubuntu_com to set the default IRC
      server to irc.ubuntu.com.
    + 70_autoconf patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
finch/gntblist.c
1742
1742
        gnt_text_view_set_flag(GNT_TEXT_VIEW(tv), GNT_TEXT_VIEW_NO_SCROLL);
1743
1743
        gnt_box_add_widget(GNT_BOX(box), tv);
1744
1744
 
 
1745
        if (x + w >= getmaxx(stdscr))
 
1746
                x -= w + width + 2;
1745
1747
        gnt_widget_set_position(box, x, y);
1746
1748
        GNT_WIDGET_UNSET_FLAGS(box, GNT_WIDGET_CAN_TAKE_FOCUS);
1747
1749
        GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_TRANSIENT);
2610
2612
{
2611
2613
        PurpleAccount *account;
2612
2614
        const char *username;
 
2615
        PurpleConversation *conv;
2613
2616
 
2614
2617
        account  = purple_request_fields_get_account(fields, "account");
2615
2618
        username = purple_request_fields_get_string(fields,  "screenname");
2616
2619
 
2617
 
        purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username);
 
2620
        conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username);
 
2621
        purple_conversation_present(conv);
2618
2622
}
2619
2623
 
2620
2624
static void