Merge lp:~seriy-pr/gwibber/vkontakte-ru-plugin into lp:gwibber

[Sergey Prokhorov]

Added plugin for vkontakte.ru ( http://vk.com/ ) - most popular social network in Russia, Ukraine and many ex-USSR countries (>100 mln users, http://www.alexa.com/siteinfo/vkontakte.ru #44).

This branch contains a fix of whishlist bug #572753
Also there is a related blueprint https://blueprints.edge.launchpad.net/gwibber/+spec/vkontakte.ru

Some peoples report that plugin works for them: https://bugs.edge.launchpad.net/gwibber/+bug/572753/comments/18 and http://forum.ubuntu.ru/index.php?topic=65621.msg1004248#msg1004248 + there is non-oficial DEB build for it: http://www.mediafire.com/?z2ye2u9chtda9vu

[lp:~seriy-pr/gwibber/vkontakte-ru-plugin]

969. By Sergey Prokhorov on 2011-05-19

Simplify lazy loading mechanizm

970. By Sergey Prokhorov on 2011-05-19

Linkify comments and links description

971. By Sergey Prokhorov on 2011-05-19

Add mentions support

972. By Sergey Prokhorov on 2011-05-21

Fix notifications

973. By Sergey Prokhorov on 2011-05-28

Fix right-aligned text on "\ufeff" char appears on message

974. By Sergey Prokhorov on 2011-06-04

Add support for vkontakte hashtags.

975. By Sergey Prokhorov on 2011-06-07

Merged with trunk

976. By Sergey Prokhorov on 2011-10-02

Merged with head

[Ken VanDine (ken-vandine)]

I think this would be best as a standalone plugin, packaged separately from gwibber. We want to move most of the plugins out of the gwibber source and into separate projects. You can look at https://launchpad.net/gwibber-service-sina as an example. I think we will be keeping twitter, facebook and g+ (when it exists) in gwibber mainline and move the rest to new source packages. If you have questions, please join us in #gwibber on Freenode.

Thanks for the awesome work!

review: Needs Fixing

[Sergey Prokhorov (seriy-pr)]

> I think this would be best as a standalone plugin, packaged separately from
> gwibber. We want to move most of the plugins out of the gwibber source and
> into separate projects. You can look at https://launchpad.net/gwibber-
> service-sina as an example. I think we will be keeping twitter, facebook and
> g+ (when it exists) in gwibber mainline and move the rest to new source
> packages. If you have questions, please join us in #gwibber on Freenode.
>
> Thanks for the awesome work!

Ok, I think this is good idea. Also, we already has ppa for vkontakte plugin https://launchpad.net/~gwibber-vkontakte-plugin/+archive/ppa. I begin to create a separate project for plugin next week I think.

[lp:~seriy-pr/gwibber/vkontakte-ru-plugin]

977. By Sergey Prokhorov on 2012-01-04

merged with trunk

978. By Sergey Prokhorov on 2012-01-05

Make code less ugly + replace <br> with <br/>

979. By Sergey Prokhorov on 2012-01-19

merged with trunk

980. By Sergey Prokhorov on 2012-01-19

move icons to plugin directory

981. By Sergey Prokhorov on 2012-01-19

setup.py don't used in gwibber now

982. By Sergey Prokhorov on 2012-03-16

merged with trunk

983. By Sergey Prokhorov on 2012-03-16

Fix logging issue

984. By Sergey Prokhorov on 2012-03-16

Fix indentation

985. By Sergey Prokhorov on 2012-03-16

Fix logger issue

986. By Sergey Prokhorov on 2012-03-17

More logging fixes

987. By Sergey Prokhorov on 2012-03-17

fix code conventions

988. By Sergey Prokhorov on 2012-03-17

Fix issue of renaming the vk api wrapper

989. By Sergey Prokhorov on 2012-03-17

Fix indentation on gui module

990. By Sergey Prokhorov on 2012-03-17

Compatible with 3.3.92 on ubuntu 12.04

Unmerged revisions

990. By Sergey Prokhorov on 2012-03-17

Compatible with 3.3.92 on ubuntu 12.04

989. By Sergey Prokhorov on 2012-03-17

Fix indentation on gui module

988. By Sergey Prokhorov on 2012-03-17

Fix issue of renaming the vk api wrapper

987. By Sergey Prokhorov on 2012-03-17

fix code conventions

986. By Sergey Prokhorov on 2012-03-17

More logging fixes

985. By Sergey Prokhorov on 2012-03-16

Fix logger issue

984. By Sergey Prokhorov on 2012-03-16

Fix indentation

983. By Sergey Prokhorov on 2012-03-16

Fix logging issue

982. By Sergey Prokhorov on 2012-03-16

merged with trunk

981. By Sergey Prokhorov on 2012-01-19

setup.py don't used in gwibber now

=== modified file '.bzrignore'
--- .bzrignore	2012-01-12 17:31:35 +0000
+++ .bzrignore	2012-03-17 22:54:18 +0000
@@ -1,5 +1,3 @@
-unknown:
-.bzrignore
 gwibber/semantic.cache
 semantic.cache
 *.gmo

=== added directory 'gwibber/microblog/plugins/vkontakte'
=== added file 'gwibber/microblog/plugins/vkontakte/__init__.py'
--- gwibber/microblog/plugins/vkontakte/__init__.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/plugins/vkontakte/__init__.py	2012-03-17 22:54:18 +0000
@@ -0,0 +1,593 @@
+# -*- coding: utf-8 -*-
+'''
+Created on 05.12.2010
+
+@author: Sergey Prokhorov <[e-mail]>
+'''
+import json
+import inspect
+from gwibber.microblog.util.const import *
+from gwibber.microblog import util
+import time
+import urllib
+import re
+import logging
+
+
+from vk_api_wrapper import VkApi, VkException
+# Try to import * from custom, install custom.py to include packaging
+# customizations like distro API keys, etc
+try:
+    from gwibber.microblog.util.custom import *
+except:
+    pass
+
+logger = logging.getLogger("Vkontakte")
+logger.debug("Initializing.")
+
+#XXX: remove me! see gwibber.microblog.util.const.VK_APP_ID
+VK_APP_ID = "2036925"
+
+PROTOCOL_INFO = {
+    "name": "Vkontakte",
+    "version": "0.3",
+
+    "config": [
+        "color",
+        "receive_enabled",
+        "receive_groups",
+        "send_enabled",
+        "username",
+        "uid",
+        "private:access_token"
+    ],
+
+    "authtype": "vkontakte",
+    "color": "#45688E",    # #6D8FB3
+
+    "features": [
+        "send",
+        "reply",
+        "receive",
+        #"thread",
+        "delete",
+        #"send_thread",
+        "like",
+        "sincetime"
+    ],
+
+    "default_streams": [
+        "receive",
+        "images",
+        "links",
+        "videos",
+    ]
+}
+
+URL_PREFIX = 'http://vkontakte.ru/'
+
+
+class attachment_processor(object):
+    """Generate attachment fields
+    http://vkontakte.ru/developers.php?o=-1&p=%D0%9E%D0%BF%D0%B8%D1%81%D0%B0%D0%BD%D0%B8%D0%B5+%D0%BF%D0%BE%D0%BB%D1%8F+attachment
+    """
+
+    def __init__(self, client):
+        self.client = client
+
+    def _process_photo(self, attachment):
+        return ("photo",
+                photoAttachment(
+                    url="{0}photo{1}_{2}".format(URL_PREFIX,
+                                                 attachment["owner_id"],
+                                                 attachment["pid"]),
+                    picture=attachment["src"]))
+
+    _process_posted_photo = _process_photo
+
+    def _process_graffiti(self, attachment):
+        return ("photo",
+                  photoAttachment(
+                  url="{0}graffiti{1}?from_id={2}".format(URL_PREFIX,
+                                                      attachment["gid"],
+                                                      attachment["owner_id"]),
+                  picture=attachment["src"]))
+
+    def _process_video(self, attachment):
+        lnk = "{0}video{1}_{2}".format(URL_PREFIX, attachment["owner_id"],
+                                       attachment["vid"])
+        video_data = self.client.api.video.get(videos="{0}_{1}".format(
+            attachment["owner_id"],
+            attachment["vid"]))["response"]
+        return ("video",
+                videoAttachment(
+                    url=lnk,
+                    name=attachment["title"],
+                    source=lnk,
+                    picture=video_data[1]["image"]))
+
+    def _process_link(self, attachment):
+        l = linkAttachment(
+            name=attachment["title"],
+            url=attachment["url"],
+            description=util.linkify(attachment["description"], escape=False))
+        if "image_src" in attachment:
+            l.picture = attachment["image_src"]
+        return "link", l
+
+    def process(self, attachment, message):
+        """find is processor has matched handler, and if yes,
+        generate attachment with this handler and merge it with
+        original message"""
+        type_ = attachment["type"]
+        processor_name = "_process_{0}".format(type_)
+        if hasattr(self, processor_name):
+            key, val = getattr(self, processor_name)(attachment[type_])
+            setattr(message, key, val)
+            message.type = key
+        return message
+
+
+###########
+# MAGICK!!!
+###########
+'''vkontakte API don't return comments for wall posts,
+but return comments count, so, we need download comments
+for each posts with comments count > 0 by separate API query.
+But, surprise! API don't return commenters profile data, only
+commenter ID. That means, that we need download commenter profile
+for each commenter. Only one good thing is that we can
+download many profiles by single query. So, when process
+wall posts, we insert "lazyUserLoader" fake objects in places, where
+commenter profile must be. And ALL profiles loads only when
+some slave object need profile data.
+'''
+
+
+class lazy_profiles_loader(object):
+    '''Dispatcher, that store slaves and start
+    worker when one of slaves need data'''
+
+    def __init__(self, client):
+        '''
+        @param client: Client's instance'''
+        self.client = client
+        self.masks = {}
+        self.results = {}
+
+    def new_mask(self, id):
+        mask = lazyUserLoader(id, self)
+        self.masks[id] = mask
+        return mask
+
+    def run(self):
+        '''magick (see comments upper) lazy worker (transform map of
+        profile id's to map of profiles)'''
+        ids = [str(k) for k in self.masks.keys()]
+        uids = ",".join(ids)
+        try:
+            profiles = self.client.api.getProfiles(
+                uids=uids, fields="uid,photo,first_name,last_name")
+        except VkException, e:
+            self.client._format_error(e)  #log message to console
+            return {}
+        for profile in profiles['response']:
+            self.results[profile["uid"]] = self.client._user(profile)
+
+    def get(self, id):
+        if not self.results:
+            self.run()
+        return self.results.get(id, None)
+
+
+###########
+# END MAGICK!!!
+###########
+
+###########
+# declarative description of Gwibber message JSON structure
+# XXX: this can/must be reused in other Gwibber plugins!!!
+###########
+
+# base class
+class jsonable(object):
+    """
+    Allow subclass instances be represented as combination
+    of python std types (list, str, dict, int, float) that
+    can be used by json.dumps()
+    eg
+    ========================
+    class C2(jsonable):
+        prop0=""
+
+    class C1(jsonable):
+        prop1="" #  str
+        prop2=0 #  int
+        prop3=0.0 #  float
+        prop4={} #  as is
+        prop5=("choice1", "choice2", "choice3") #  one of
+        prop6=[C2, ] # list of
+
+  c1=C1(prop1="p1_val") #  pass to constructor
+    c1.prop2=100500 #  pass as property assignment
+    ...
+    prop5=[C2(prop0="c2_p0_val1"), C2(prop0="c2_p0_val2")]
+
+    >>> c1.to_jsonable() #  return dict object
+    {
+        "prop1": "p1_val",
+        "prop2": 100500,
+        ...
+        "prop6":[
+            {
+                "prop0": "c2_p0_val1"
+            },
+            {
+                "prop0": "c2_p0_val2"
+            }
+        ]
+    }
+    ===========================
+    Idea came from http://code.google.com/p/gdata-python-client/source/browse/src/atom/core.py
+    "XmlElement" class
+    """
+    _members = None
+
+    def __init__(self, **kwargs):
+        if self.__class__._members is None:
+            self.__class__._members = tuple(self.__class__._list_members())
+        for member_name, member_type in self.__class__._members:
+            if member_name in kwargs:
+                setattr(self, member_name, kwargs[member_name])
+            else:
+                if isinstance(member_type, list):
+                    setattr(self, member_name, [])
+                else:
+                    setattr(self, member_name, None)
+
+    @classmethod
+    def _list_members(cls):
+        """Introspect class properties"""
+        for pair in inspect.getmembers(cls):
+            if not pair[0].startswith('_'):
+                member_type = pair[1]
+                if (isinstance(member_type, (tuple, list, str, unicode, dict,
+                                             int, float, bool))
+                    or (inspect.isclass(member_type)
+                        and issubclass(member_type, jsonable))):
+                    yield pair
+
+    def to_jsonable(self):
+        """Recursively transform objects hierarchy to
+        hierarchy of python std types"""
+        res = {}
+        for m_name, m_type in self._members:
+            child = getattr(self, m_name)
+            if child is None:
+                continue
+            if isinstance(m_type, (str, unicode)):
+                res[m_name] = unicode(child)
+            elif isinstance(m_type, int):
+                res[m_name] = int(child)
+            elif isinstance(m_type, float):
+                res[m_name] = float(child)
+            elif isinstance(m_type, bool):
+                res[m_name] = bool(child)
+            elif isinstance(m_type, dict):  # copy as is
+                res[m_name] = child
+            elif isinstance(m_type, list):
+                res[m_name] = []
+                for subchild in child:
+                    res[m_name].append(subchild.to_jsonable())
+            elif isinstance(m_type, tuple):
+                if child in m_type:
+                    res[m_name] = child
+            elif inspect.isclass(m_type) and issubclass(m_type, jsonable):
+                res[m_name] = child.to_jsonable()  # recursively
+        return res
+
+    def __str__(self):
+        return str(self.to_jsonable())
+
+
+# Gwibber message structure hierarchy:
+
+class errMessage(jsonable):
+    type = ""
+    account = {}
+    message = ""
+
+
+class error(jsonable):
+    error = errMessage
+
+
+class user(jsonable):
+    name = ""
+    id = ""
+    is_me = False
+    image = ""
+    url = ""
+
+
+class lazyUserLoader(jsonable):
+    """Loads user profile only when to_json() called"""
+    def __init__(self, id, master, **kwargs):
+        super(lazyUserLoader, self).__init__(**kwargs)
+        self._id = id
+        self._master = master
+
+    def to_jsonable(self):
+        res = self._master.get(self._id)
+        return res.to_jsonable() if isinstance(res, jsonable) else {}
+
+
+class like(jsonable):
+    count = 0
+
+
+class photoAttachment(jsonable):
+    url = ""
+    picture = ""
+
+
+class videoAttachment(jsonable):
+    url = ""
+    name = ""
+    source = ""
+    picture = ""
+
+
+class linkAttachment(jsonable):
+    name = ""
+    url = ""
+    description = ""
+    picture = ""
+
+
+class comment(jsonable):
+    text = ""
+    time = ""
+    sender = lazyUserLoader
+
+
+class message(jsonable):
+    mid = ""
+    service = ""
+    account = ""
+    time = 0
+    sender = user
+    to_me = False
+    url = ""
+    text = ""
+    html = ""
+    content = ""
+    likes = like
+    photo = photoAttachment
+    video = videoAttachment
+    link = linkAttachment
+    type = ("photo", "video", "link")
+    comments = [comment, ]
+
+
+###########
+# END declarative description of Gwibber message JSON structure
+###########
+
+class Client(object):
+
+    mention_re = re.compile(r"\[id(\d+)\|(.+)\]", re.U)
+    hash_re = re.compile("#([A-Za-z0-9_]+)")
+
+    def mentify(self, text):
+        return self.mention_re.sub(r'<a href="%sid\1">\2</a>' % URL_PREFIX,
+                                   text)
+
+    def hashify(self, text):
+        return self.hash_re.sub(
+            r'#<a class="hash" href="{0}feed?q=%23\1&section=search">\1</a>'.format(
+                URL_PREFIX), text)
+
+    def __init__(self, acct):
+        self.account = acct
+        self.access_token = acct.get("access_token")
+        self.api = VkApi(access_token=self.access_token)
+        self.attachment_processor = attachment_processor(self)
+
+    def __call__(self, opname, **args):
+        try:
+            ret = [item for item in getattr(self, opname)(**args)
+                   if isinstance(item, jsonable)]  # read all yield's
+            #for i in ret:
+            #  print str(i)
+            return [item.to_jsonable() for item in ret]
+        except VkException, e:
+            return [self._format_error(e).to_jsonable()]
+
+    def _format_error(self, e, type=None, message=None):
+        logger.error('Vkontakte error #%d: "%s" in url %s',
+                         e.code, e.msg, e.url)
+        if e.code in (3, 5, 7):
+            _type = "auth"
+        #elif e.code in (2, 4, 100):
+        #    _type = "internal"
+        else:
+            _type = "unknown"
+        return error(error=errMessage(type=type or _type,
+                                      account=self.account,
+                                      message=message or e.msg))
+
+    def _user(self, acc_data):
+        """Extract single user data from API response"""
+        if "gid" in acc_data:
+            return user(name=acc_data["name"],
+                        id=str(acc_data["gid"] * -1),
+                        is_me=False,
+                        image=acc_data["photo"],
+                        url="{0}sclub{1}".format(URL_PREFIX, acc_data["gid"]))
+        else:
+            return user(name=u"{0} {1}".format(acc_data["first_name"],
+                                              acc_data["last_name"]),
+                        id=str(acc_data["uid"]),
+                        is_me=acc_data["uid"] == int(self.account["uid"]),
+                        image=acc_data["photo"],
+                        url="{0}id{1}".format(URL_PREFIX, acc_data["uid"]))
+
+    def _message(self, item, account, comment_author_factory):
+        """Extract single message data from API response"""
+        m = message()
+        m.mid = str(item["post_id"])
+        m.service = "vkontakte"
+        m.account = self.account["id"]
+        # XXX: WTF?!? why we don't move timezone correction to presentation
+        # logic??? We must store to DB absolute UTC timestamp!!!
+        m.time = item["date"] + time.timezone
+        m.sender = self._user(account)
+        m.url = "{0}wall{1}_{2}".format(URL_PREFIX, m.sender.id, item["post_id"])
+        # remove strange align-right chars + opening br tags
+        m.text = item["text"].replace(u"\ufeff", "").replace("<br>", "<br/>")
+        m.html = self.hashify(
+            self.mentify(
+                util.linkify(m.text, escape=False)))
+        m.content = m.html
+
+        # find all mentions in message text where id is mine...
+        m.to_me = len([id for id, _name in self.mention_re.findall(m.text)
+                       if id == self.account["uid"]]) > 0
+
+        if item.get("likes", 0):
+            m.likes = like(count=item["likes"]["count"])
+
+        if "attachment" in item:
+            if item["attachment"]["type"] == "audio":
+                return  # FIXME: Gwibber don't support audio
+            m = self.attachment_processor.process(item["attachment"], m)
+
+        if item["comments"]["count"] > 0:
+            try:
+                comments = self.api.wall.getComments(owner_id=m.sender.id,
+                                                     post_id=item["post_id"],
+                                                     sort="asc",
+                                                     count=50)
+            except VkException, e:
+                return self._format_error(e)  # XXX: may be return "m" ?
+            if "response" in comments:
+                for comm in comments["response"]:
+                    if not isinstance(comm, dict):
+                        # drop first(?) element, because it is
+                        # integer count of comments
+                        continue
+                    mask = comment_author_factory.new_mask(comm["uid"])
+                    m.comments.append(
+                        comment(
+                            text=self.hashify(
+                                self.mentify(
+                                    util.linkify(comm["text"]))),
+                            time=comm["date"],
+                            sender=mask
+                        )
+                    )
+        return m
+
+    def receive(self, since=None):
+        '''Retrieve messages from friend's and own walls.'''
+        if not since:
+            since = int(time.time() - 60 * 60 * 24)  # 24 hours
+        response = self.api.newsfeed.get(filters="post",
+                                         start_time=since)["response"]
+
+        comment_author_factory = lazy_profiles_loader(self)
+
+        profiles_by_id = {}  # index user and group profiles by user id
+        for _acc in response["profiles"]:
+            profiles_by_id[_acc["uid"]] = _acc
+        if self.account["receive_groups"]:
+            for _acc in response["groups"]:
+                profiles_by_id[_acc["gid"] * -1] = _acc
+
+        for item in response["items"]:
+            #source_id > 0 for peoples and < 0 for groups
+            if item["source_id"] < 0 and not self.account["receive_groups"]:
+                continue  # skip groups if "receive_groups" option disabled
+            account = profiles_by_id[item["source_id"]]
+            message = self._message(item, account, comment_author_factory)
+            yield message
+
+        for msg in self._own_wall_posts(10, comment_author_factory):
+            yield msg
+
+    def _own_wall_posts(self, count, comment_author_factory):
+        '''Download all posts user post in own wall'''
+        try:
+            response = self.api.wall.get(
+                filter="owner", count=count)["response"]
+        except VkException, e:
+            yield self._format_error(e)
+            return
+        me = None
+        for post in response:
+            if not isinstance(post, dict):
+                # skip first element - number of items
+                continue
+            post["post_id"] = post["id"]
+            post["source_id"] = post["from_id"]
+            if not me:
+                me = self.api.getProfiles(
+                    uids=post["source_id"],
+                    fields="uid,photo,first_name,last_name")["response"][0]
+            yield self._message(post, me, comment_author_factory)
+
+    def user_messages(self, id=None, count=util.COUNT, since=None):
+        """Messages posted by some user"""
+        raise NotImplementedError
+        #if count>100:#vk limit
+        #    count = 100
+        #comment_author_factory = lazy_profiles_loader(self)
+        #return self._own_wall_posts(count, comment_author_factory)
+
+    def send(self, message):
+        """Send new post to own wall"""
+        self.api.wall.post(message=message)
+        return self._own_wall_posts(1, lazy_profiles_loader(self))
+
+    def send_thread(self, message, target):
+        """Send comment with text @message to post @target
+        @param message: message text
+        @param target: target post"""
+        self.api.wall.addComment(owner_id=target["sender"]["id"],
+                                 post_id=target["mid"],
+                                 text=message)
+        #  Update post data
+        # XXX: this doesn't update Gwibber UI and this is a Gwibber bug...
+        return self._post_by_id(target["sender"]["id"], target["mid"])
+
+    def _post_by_id(self, owner_id, post_id):
+        response = self.api.wall.getById(
+            posts="{0}_{1}".format(owner_id, post_id))["response"]
+        comment_author_factory = lazy_profiles_loader(self)
+        me = None
+        for post in response:
+            if not isinstance(post, dict):
+                # skip first element - number of items
+                continue
+            post["post_id"] = post["id"]
+            post["source_id"] = post["from_id"]
+            if not me:
+                me = self.api.getProfiles(
+                    uids=post["source_id"],
+                    fields="uid,photo,first_name,last_name")["response"][0]
+            yield self._message(post, me, comment_author_factory)
+
+    def like(self, message):
+        """Like message
+        @param message: target post you like"""
+        self.api.wall.addLike(owner_id=message["sender"]["id"],
+                              post_id=message["mid"])
+        return []
+
+    def delete(self, message):
+        """Remove message from you wall
+        @param message: post you want to delete"""
+        self.api.wall.delete(owner_id=message["sender"]["id"],
+                             post_id=message["mid"])
+        return []

=== added directory 'gwibber/microblog/plugins/vkontakte/gtk'
=== added file 'gwibber/microblog/plugins/vkontakte/gtk/__init__.py'
=== added directory 'gwibber/microblog/plugins/vkontakte/gtk/vkontakte'
=== added file 'gwibber/microblog/plugins/vkontakte/gtk/vkontakte/__init__.py'
--- gwibber/microblog/plugins/vkontakte/gtk/vkontakte/__init__.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/plugins/vkontakte/gtk/vkontakte/__init__.py	2012-03-17 22:54:18 +0000
@@ -0,0 +1,185 @@
+# -*- coding: utf-8 -*-
+'''
+@author: Sergey Prokhorov <[e-mail]>
+'''
+from gi.repository import Gdk, Gtk, WebKit, Pango
+from gi.repository.Gtk import Builder
+from gwibber.microblog.util import resources
+from gwibber.microblog.util.const import *
+from gwibber.microblog.util.keyring import get_from_keyring
+
+try:
+    from gwibber.microblog.plugins.vkontakte.vk_api_wrapper import VkApi
+except ImportError:
+    try:
+        from vkontakte.vk_api_wrapper import VkApi
+    except ImportError:
+        VkApi = None
+
+import urllib
+import urlparse
+import logging
+
+import gettext
+from gettext import gettext as _
+if hasattr(gettext, 'bind_textdomain_codeset'):
+    gettext.bind_textdomain_codeset('gwibber', 'UTF-8')
+gettext.textdomain('gwibber')
+
+logger = logging.getLogger('Vkontakte')
+logger.info('Initializing...')
+
+# XXX: remove me! see gwibber.microblog.util.const.VK_APP_ID
+VK_APP_ID = "2036925"
+
+
+class AccountWidget(Gtk.VBox):
+    """AccountWidget: A widget that provides a user interface for configuring
+    Vkontakte accounts in Gwibber"""
+
+    def __init__(self, account=None, dialog=None):
+        """Creates the account pane for configuring Vkontakte accounts"""
+        Gtk.VBox.__init__(self, False, 20)
+        self._state_init()
+        if account:
+            self.account = account
+        else:
+            self.account = {}
+        self.dialog = dialog
+        self.window = dialog.dialog
+        has_access_token = True
+        if "id" in self.account:  # check is current account already authorized
+                has_access_token = get_from_keyring(self.account['id'],
+                                                    'access_token') is not None
+        try:  # if account authorized, don't show "authorize" button
+            if (self.account["access_token"]
+                    and self.account["username"]
+                    and has_access_token
+                    and not self.dialog.condition):
+                self._state_authorized()
+            else:  # else don't show "authorized" label
+                self._state_not_authorized()
+        except:
+            self._state_not_authorized()
+
+
+    def on_vk_auth_clicked(self, widget, data=None):
+        """Start embed browser and show authorization dialog"""
+        web = WebKit.WebView()
+        web.get_settings().set_property("enable-plugins", False)
+        web.load_html_string(_("<p>Please wait...</p>"), "file:///")
+
+        qstring = urllib.urlencode({  #call to vkontakte API authorization 
+                "client_id": VK_APP_ID,
+                "redirect_uri": "http://vkontakte.ru/api/login_success.html", #FIXME: http://api.vkontakte.ru/blank.html don't fire "title-changed"
+                "response_type": "token",
+                "display": "popup",
+                "scope": ",".join(("video", "offline", "wall"))
+                })
+        url = "http://api.vkontakte.ru/oauth/authorize?" + qstring
+        web.set_size_request(550, 440)
+        logger.info("Load url %s", url)
+        web.load_uri(url)
+        #http://api.vkontakte.ru/oauth/authorize?client_id=2036925&response_type=token&scope=video,offline,wal&redirect_uri=http://api.vkontakte.ru/blank.html
+        web.connect("title-changed", self.on_vk_auth_title_change)
+        self._state_show_browser(web)
+
+    def on_vk_auth_title_change(self, web=None, title=None, data=None):
+        """When user confirm or revoke authorization in embed browser"""
+        saved = False
+        url = web.get_main_frame().get_uri()
+        logger.info("title changed...")
+        if "access_token=" in url:
+            """When user successfully authorize our application, extract
+            access_token secret...
+            http://api.vkontakte.ru/blank.html#access_token=55a69...c55&expires_in=0&user_id=535...7"""
+            query_string = url.split("#", 1)[1]
+            data = urlparse.parse_qs(query_string)
+            self.account["access_token"] = str(data["access_token"][0])
+            self.account["uid"] = data["user_id"][0]
+            if VkApi:  # try retrieve user name and last name from API
+                profile = (VkApi(access_token=self.account["access_token"])
+                           .getProfiles(uids=self.account["uid"],
+                                        fields="first_name,last_name"))
+                self.account["username"] = u"%(first_name)s %(last_name)s" % (profile['response'][0])
+            else:
+                self.account["username"] = "id%s" % self.account["uid"]
+            saved = self.dialog.on_edit_account_save()  # store user account data
+            self._state_authorized()
+            self._state_login_success(saved)
+            self._state_hide_browser(web)
+        if "error=" in url:
+            query_string = url.split("?", 1)[1]
+            desc = urlparse.parse_qs(query_string)["error_description"][0]
+            self._state_not_authorized()
+            self._state_login_failed(_("Authentication error: %s") % desc)
+            self._state_hide_browser(web)
+
+    ### UI-manipulation methods ###
+
+    def _state_init(self):
+        """create UI from UI file"""
+        self._browser_scroll = None
+        self.ui = Gtk.Builder()
+        self.ui.set_translation_domain("gwibber")
+        self.ui.add_from_file(
+            resources.get_ui_asset("gwibber-accounts-vkontakte.ui"))
+        self.ui.connect_signals(self)  # attach events (on_vk_auth_clicked)
+        self.vbox_settings = self.ui.get_object("vbox_settings")
+        self.pack_start(self.vbox_settings, False, False, 0)
+        self.show_all()
+
+    def _state_show_browser(self, web):
+        """Show webkit widget, hide settings etc.."""
+        (self.win_w, self.win_h) = self.window.get_size()
+        if not self._browser_scroll:
+            self._browser_scroll = Gtk.ScrolledWindow()
+            self.pack_start(self._browser_scroll, True, True, 0)
+        self._browser_scroll.child = None
+        self._browser_scroll.add(web)
+        self._browser_scroll.set_size_request(550, 440)
+        self.show_all()
+        self.dialog.infobar.hide()
+        self.ui.get_object("vbox1").hide()
+        self.ui.get_object("vbox_advanced").hide()
+
+    def _state_hide_browser(self, web):
+        """Hide webkit, show advanced settings, etc.."""
+        web.hide()
+        self.window.resize(self.win_w, self.win_h)
+        self.ui.get_object("vbox1").show()
+        self.ui.get_object("vbox_advanced").show()
+
+    def _state_login_success(self, saved):
+        """Show 'update' or 'create' buttons if not saved automatically"""
+        if self.dialog.ui and "id" in self.account and not saved:
+            self.dialog.ui.get_object("vbox_save").show()
+        elif self.dialog.ui and not saved:
+            self.dialog.ui.get_object("vbox_create").show()
+
+    def _state_login_failed(self, reason=None):
+        """When user fail or revoke authorization, show popup message"""
+        Gtk.gdk.threads_enter()
+        if not reason:
+            reason = _("Vkontakte authorization failed. Please try again.")
+        else:
+            reason = _(reason)
+        d = Gtk.MessageDialog(None, Gtk.DIALOG_MODAL, Gtk.MESSAGE_ERROR,
+                              Gtk.BUTTONS_OK, reason)
+        if d.run():
+            d.destroy()
+        Gtk.gdk.threads_leave()
+
+    def _state_not_authorized(self):
+        """Show 'Authorize with vkontakte' button"""
+        self.ui.get_object("hbox_vk_auth_done").hide()
+        self.ui.get_object("hbox_vk_auth").show()
+        if self.dialog.ui:
+            self.dialog.ui.get_object('vbox_create').hide()
+
+    def _state_authorized(self):
+        """Hide 'Authorize with vkontakte' button, show 'Authorized'"""
+        self.ui.get_object("hbox_vk_auth").hide()
+        self.ui.get_object("vk_auth_done_label").set_label(
+            _("%s has been authorized by Vkontakte") % self.account["username"].encode('utf-8'))
+        self.ui.get_object("hbox_vk_auth_done").show()

=== added directory 'gwibber/microblog/plugins/vkontakte/ui'
=== added file 'gwibber/microblog/plugins/vkontakte/ui/gwibber-accounts-vkontakte.ui'
--- gwibber/microblog/plugins/vkontakte/ui/gwibber-accounts-vkontakte.ui	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/plugins/vkontakte/ui/gwibber-accounts-vkontakte.ui	2012-03-17 22:54:18 +0000
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.24"/>
+  <object class="GtkVBox" id="vbox_settings">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkHBox" id="hbox_vk_auth">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkButton" id="vk_auth_button">
+                <property name="label" translatable="yes">_Authorize</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="on_vk_auth_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="vk_auth_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Authorize with vkontakte</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox_vk_auth_done">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkLabel" id="vk_auth_done_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Vkontakte authorized</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkHSeparator" id="hseparator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkVBox" id="vbox_advanced">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Account Settings:</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkCheckButton" id="receive_enabled">
+                <property name="label" translatable="yes">_Receive Messages</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="tooltip_text" translatable="yes">Include this account when downloading messages</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="send_enabled">
+                <property name="label" translatable="yes">_Send Messages</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="tooltip_text" translatable="yes">Allow sending posts to this account</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="receive_groups">
+                <property name="label" translatable="yes" comments="Receive messages from the groups, in addition to messages from users?">_Receive groups</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="tooltip_text" translatable="yes">Receive news from groups</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Color used to help distinguish accounts</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Account Color:</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkColorButton" id="color">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Color used to help distinguish accounts</property>
+                <property name="use_action_appearance">False</property>
+                <property name="color">#000000000000</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+  </object>
+</interface>

=== added directory 'gwibber/microblog/plugins/vkontakte/ui/icons'
=== added directory 'gwibber/microblog/plugins/vkontakte/ui/icons/16x16'
=== added file 'gwibber/microblog/plugins/vkontakte/ui/icons/16x16/vkontakte.png'
Binary files gwibber/microblog/plugins/vkontakte/ui/icons/16x16/vkontakte.png	1970-01-01 00:00:00 +0000 and gwibber/microblog/plugins/vkontakte/ui/icons/16x16/vkontakte.png	2012-03-17 22:54:18 +0000 differ
=== added directory 'gwibber/microblog/plugins/vkontakte/ui/icons/22x22'
=== added file 'gwibber/microblog/plugins/vkontakte/ui/icons/22x22/vkontakte.png'
Binary files gwibber/microblog/plugins/vkontakte/ui/icons/22x22/vkontakte.png	1970-01-01 00:00:00 +0000 and gwibber/microblog/plugins/vkontakte/ui/icons/22x22/vkontakte.png	2012-03-17 22:54:18 +0000 differ
=== added directory 'gwibber/microblog/plugins/vkontakte/ui/icons/32x32'
=== added file 'gwibber/microblog/plugins/vkontakte/ui/icons/32x32/vkontakte.png'
Binary files gwibber/microblog/plugins/vkontakte/ui/icons/32x32/vkontakte.png	1970-01-01 00:00:00 +0000 and gwibber/microblog/plugins/vkontakte/ui/icons/32x32/vkontakte.png	2012-03-17 22:54:18 +0000 differ
=== added directory 'gwibber/microblog/plugins/vkontakte/ui/icons/scalable'
=== added file 'gwibber/microblog/plugins/vkontakte/ui/icons/scalable/vkontakte.png'
Binary files gwibber/microblog/plugins/vkontakte/ui/icons/scalable/vkontakte.png	1970-01-01 00:00:00 +0000 and gwibber/microblog/plugins/vkontakte/ui/icons/scalable/vkontakte.png	2012-03-17 22:54:18 +0000 differ
=== added file 'gwibber/microblog/plugins/vkontakte/ui/icons/scalable/vkontakte.svg'
--- gwibber/microblog/plugins/vkontakte/ui/icons/scalable/vkontakte.svg	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/plugins/vkontakte/ui/icons/scalable/vkontakte.svg	2012-03-17 22:54:18 +0000
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<!-- SVG Created by Sergey A Prochorov <[e-mail]> (http://seriyps.ru/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="285"
+   height="285"
+   id="svg3036">
+  <defs
+     id="defs8">
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter3773">
+      <feGaussianBlur
+         id="feGaussianBlur3775"
+         stdDeviation="3.931875" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata3042">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-45.0635,-38.936486)"
+     id="g3796">
+    <rect
+       width="168"
+       height="197"
+       x="108"
+       y="87"
+       id="rect4024"
+       style="fill:#4c77a0;fill-opacity:1;stroke:none" />
+    <path
+       d="M 102,52.5 C 78.75,55 57.625,71.25 54.5,98 l 0,170.5 c 2.875,25.25 20,43.625 46.5,46 l 168.5,0 c 22.75,-0.625 43.625,-18.125 47.25,-46.5 l 0,-169.375 C 314.25,73.875 292.375,54.5 270,52.5 l -168,0 z m 34,55.75 64.25,0 c 66,0.5 51.15504,62.271 24,68.5 44.5,3.75 50.25,82.5 -23.75,83.25 L 136.25,260 136,108.25 z m 36,27 0,31.75 18,0 c 22.1875,0 23.0625,-31.75 0,-31.75 l -18,0 z m 0,58 0,37.5 24.25,0 c 26.75,0 28,-37.5 0,-37.5 l -24.25,0 z"
+       id="path3978"
+       style="opacity:0.62999998;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3773)" />
+    <path
+       d="M 99,50 C 75.75,52.5 54.625,68.75 51.5,95.5 l 0,170.5 c 2.875,25.25 20,43.625 46.5,46 l 168.5,0 c 22.75,-0.625 43.625,-18.125 47.25,-46.5 l 0,-169.375 C 311.25,71.375 289.375,52 267,50 L 99,50 z m 34,55.75 64.25,0 c 66,0.5 51.15504,62.271 24,68.5 44.5,3.75 50.25,82.5 -23.75,83.25 l -64.25,0 L 133,105.75 z m 36,27 0,31.75 18,0 c 22.1875,0 23.0625,-31.75 0,-31.75 l -18,0 z m 0,58 0,37.5 24.25,0 c 26.75,0 28,-37.5 0,-37.5 l -24.25,0 z"
+       id="path3046"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+  </g>
+</svg>

=== added file 'gwibber/microblog/plugins/vkontakte/vk_api_wrapper.py'
--- gwibber/microblog/plugins/vkontakte/vk_api_wrapper.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/plugins/vkontakte/vk_api_wrapper.py	2012-03-17 22:54:18 +0000
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+'''
+Created on 07.12.2010
+
+@author: Sergey Prokhorov <[e-mail]>
+'''
+from gwibber.microblog import network
+import urllib
+import time
+import logging
+
+logger = logging.getLogger("Vkontakte.vk_api_wrapper")
+
+
+class VkException(Exception):
+
+    def __init__(self, code, msg, url, response):
+        self.code = code
+        self.msg = msg
+        self.response = response
+        self.url = url
+        Exception.__init__(self, code, msg, url, response)
+
+
+class VkApi(object):
+    """Vkontakte.ru (vk.com) API wrapper for Gwibber
+    == Usage ==
+    Initialization:
+        api=vk_api(access_token)
+        "access_token" can be retrieved from call to http://api.vkontakte.ru/oauth/authorize
+        (see http://vkontakte.ru/developers.php?o=-1&p=%C0%E2%F2%EE%F0%E8%E7%E0%F6%E8%FF%20%EA%EB%E8%E5%ED%F2%F1%EA%E8%F5%20%EF%F0%E8%EB%EE%E6%E5%ED%E8%E9)
+    Make calls to simple methods (has no dots in name, like "getProfiles", "isAppUser"):
+        res=api.method(arg_name1=arg1, arg_name2=arg2)
+        eg res=api.getProfiles(uids="535397,1", fields="uid,first_name,last_name")
+    Make calls to namespaced methods (has dots in name, like "wall.post", "newsfeed.get"):
+        res=api.namespace.method(arg_name1=arg1, arg_name2=arg2)
+        eg res=api.wall.post(message="New wall post from API")
+    Alternative call syntax (better performance):
+        res=api._load('namespace.method', arg_name1=arg1, arg_name2=arg2)
+        eg res=api._get('wall.post', message="New wall post from API")
+    """
+
+    api_url = 'https://api.vkontakte.ru/method/%s'
+
+    def __init__(self, access_token):
+        super(VkApi, self).__init__()
+        self._access_token = access_token
+        self._prefix = []
+
+    def _load(self, method, **params):
+        """Make call by method name and arguments"""
+        params["access_token"] = self._access_token
+        url = self.api_url % method
+        for _i in xrange(3):
+            # this cycle used for API error #6 "Too many requests"
+            logger.debug("Perform API request to method %s. URL: %s?%s",
+                         method, url, urllib.urlencode(params))
+            res = network.Download(url, params, False).get_json()
+            if "error" not in res:
+                #log.logger.debug("%s"%res)
+                return res
+
+            if res["error"]["error_code"] != 6:
+                break
+            logging.warning('Error #6 "%s". Wait 0.5s and retry...',
+                            res["error"]["error_msg"])
+            '''if we get error #6 "Too many requests per second" (vk allow
+            max 3rps http://vkontakte.ru/developers.php?o=-1&p=%D0%92%D0%B7%D0%B0%D0%B8%D0%BC%D0%BE%D0%B4%D0%B5%D0%B9%D1%81%D1%82%D0%B2%D0%B8%D0%B5+%D0%BF%D1%80%D0%B8%D0%BB%D0%BE%D0%B6%D0%B5%D0%BD%D0%B8%D1%8F+%D1%81+API )
+            try to sleep with small delay and retry request not more then 3x times'''
+            time.sleep(0.5)#TODO: play with sleep value
+        raise VkException(res["error"]["error_code"],
+                          res["error"]["error_msg"],
+                          "%s?%s" % (url, urllib.urlencode(params)),
+                          res)
+
+    """Support for api.namespace.method(**kwargs) calls below"""
+    def __getattr__(self, name):
+        self._prefix.append(name)
+        return self
+
+    def __call__(self, **kwargs):
+        if self._prefix:
+            method = ".".join(self._prefix)
+            self._prefix = []
+        else:
+            method = kwargs.pop("method")
+        return self._load(method, **kwargs)

=== modified file 'gwibber/microblog/util/const.py.in'
--- gwibber/microblog/util/const.py.in	2012-02-23 18:02:08 +0000
+++ gwibber/microblog/util/const.py.in	2012-03-17 22:54:18 +0000
@@ -15,6 +15,8 @@
 TWITTER_OAUTH_KEY = "qMBra1U4bpNYvDz947M5Q"
 TWITTER_OAUTH_SECRET = "Lzdkhg0WvGYFzD9tnsuwC0zYmpJ4z7HrZl3yOxU1g"
 
+VK_APP_ID="2036925"
+
 # Gwibber
 MAX_MESSAGE_LENGTH = 140
 MAX_MESSAGE_COUNT = 20000