← Back to branch summary

~ubuntu-branches/ubuntu/maverick/evolution-data-server/maverick-proposed

« back to all changes in this revision

Viewing changes to libedataserver/e-proxy.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-17 17:02:06 UTC
  • mfrom: (1.1.79 upstream) (1.6.12 experimental)
  • Revision ID: james.westby@ubuntu.com-20100517170206-4ufr52vwrhh26yh0
Tags: 2.30.1-1ubuntu1
https://launchpad.net/bugs/42199
https://launchpad.net/bugs/229669
https://launchpad.net/bugs/173703
https://launchpad.net/bugs/360344
https://launchpad.net/bugs/508494
* Merge from debian experimental. Remaining change:
  (LP: #42199, #229669, #173703, #360344, #508494)
  + debian/control:
    - add Vcs-Bzr tag
    - don't use libgnome
    - Use Breaks instead of Conflicts against evolution 2.25 and earlier.
  + debian/evolution-data-server.install,
    debian/patches/45_libcamel_providers_version.patch:
    - use the upstream versioning, not a Debian-specific one 
  + debian/libedata-book1.2-dev.install, debian/libebackend-1.2-dev.install,
    debian/libcamel1.2-dev.install, debian/libedataserverui1.2-dev.install:
    - install html documentation
  + debian/rules:
    - don't build documentation it's shipped with the tarball

Show diffs side-by-side

added added

removed removed

Lines of Context:
libedataserver/e-proxy.c
32
32
#include <winsock2.h>
33
33
#ifndef IN6_ARE_ADDR_EQUAL
34
34
#define IN6_ARE_ADDR_EQUAL(a, b)        \
35
 
    (memcmp ((void*)(a), (void*)(b), sizeof (struct in6_addr)) == 0)
 
35
    (memcmp ((gpointer)(a), (gpointer)(b), sizeof (struct in6_addr)) == 0)
36
36
#endif
37
37
#else
38
38
#include <netinet/in.h>
49
49
#include <libsoup/soup-uri.h>
50
50
#include "e-proxy.h"
51
51
 
 
52
G_DEFINE_TYPE (EProxy, e_proxy, G_TYPE_OBJECT)
 
53
 
52
54
/* Debug */
53
55
#define d(x)
54
56
 
179
181
}
180
182
 
181
183
static void
182
 
e_proxy_init (EProxy *pxy, EProxyClass *klass)
 
184
e_proxy_init (EProxy *pxy)
183
185
{
184
186
        EProxyPrivate *priv;
185
187
 
245
247
        }
246
248
}
247
249
 
248
 
GType
249
 
e_proxy_get_type (void)
250
 
{
251
 
        static GType type = 0;
252
 
 
253
 
        if (!type) {
254
 
                static GTypeInfo info = {
255
 
                        sizeof (EProxyClass),
256
 
                        (GBaseInitFunc) NULL,
257
 
                        (GBaseFinalizeFunc) NULL,
258
 
                        (GClassInitFunc) e_proxy_class_init,
259
 
                        NULL, NULL,
260
 
                        sizeof (EProxy),
261
 
                        0,
262
 
                        (GInstanceInitFunc) e_proxy_init
263
 
                };
264
 
                type = g_type_register_static (G_TYPE_OBJECT, "EProxy", &info, 0);
265
 
        }
266
 
 
267
 
        return type;
268
 
}
269
 
 
270
250
static gboolean
271
251
ep_is_in_ignored (EProxy *proxy, const gchar *host)
272
252
{
722
702
        }
723
703
}
724
704
 
 
705
/**
 
706
 * e_proxy_new:
 
707
 *
 
708
 * Since: 2.24
 
709
 **/
725
710
EProxy*
726
711
e_proxy_new (void)
727
712
{
732
717
        return proxy;
733
718
}
734
719
 
 
720
/**
 
721
 * e_proxxy_setup_proxy:
 
722
 *
 
723
 * Since: 2.24
 
724
 **/
735
725
void
736
726
e_proxy_setup_proxy (EProxy* proxy)
737
727
{
770
760
        g_object_unref (client);
771
761
}
772
762
 
 
763
/**
 
764
 * e_proxy_peek_uri_for:
 
765
 *
 
766
 * Since: 2.26
 
767
 **/
773
768
SoupURI*
774
769
e_proxy_peek_uri_for (EProxy* proxy, const gchar *uri)
775
770
{
788
783
        return proxy->priv->uri_http;
789
784
}
790
785
 
 
786
/**
 
787
 * e_proxy_require_proxy_for_uri:
 
788
 *
 
789
 * Since: 2.24
 
790
 **/
791
791
gboolean
792
792
e_proxy_require_proxy_for_uri (EProxy* proxy, const gchar * uri)
793
793
{