← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libpurple/protocols/yahoo/util.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:
libpurple/protocols/yahoo/util.c
33
33
#include <string.h>
34
34
 
35
35
gboolean
36
 
yahoo_account_use_http_proxy(PurpleConnection *conn)
 
36
yahoo_account_use_http_proxy(PurpleConnection *pc)
37
37
{
38
 
        PurpleProxyInfo *ppi = purple_proxy_get_setup(conn->account);
39
 
        return (ppi->type == PURPLE_PROXY_HTTP || ppi->type == PURPLE_PROXY_USE_ENVVAR);
 
38
        PurpleAccount *account = purple_connection_get_account(pc);
 
39
        PurpleProxyInfo *ppi = NULL;
 
40
        PurpleProxyType type = PURPLE_PROXY_NONE;
 
41
        gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE);
 
42
        
 
43
        if(proxy_ssl)
 
44
                ppi = purple_proxy_get_setup(account);
 
45
        else
 
46
                ppi = purple_global_proxy_get_info();
 
47
 
 
48
        type = purple_proxy_info_get_type(ppi);
 
49
 
 
50
        return (type == PURPLE_PROXY_HTTP || type == PURPLE_PROXY_USE_ENVVAR);
40
51
}
41
52
 
42
53
/*