Commits

troorl  committed f50e5cd

oh boy, here we go again

  • Participants
  • Parent commits dd5b2cc

Comments (0)

Files changed (30)

File CMakeLists.txt

 pkg_check_modules(WEBKIT REQUIRED "webkit-1.0 >= 1.0")
 pkg_check_modules(LIBUNIQUE REQUIRED "unique-1.0 >= 1.0")
 pkg_check_modules(GTKSPELL REQUIRED "gtkspell-2.0 >= 2.0")
-pkg_check_modules(REST REQUIRED "rest-0.6 >= 0.6")
-pkg_check_modules(RESTEXTRAS REQUIRED "rest-extras-0.6 >= 0.6")
-pkg_check_modules(LIBINDICATE "indicate >= 0.3")
+pkg_check_modules(REST REQUIRED "rest-0.7 >= 0.6")
+#pkg_check_modules(RESTEXTRAS REQUIRED "rest-extras-0.7 >= 0.6")
+#pkg_check_modules(LIBINDICATE "indicate >= 0.3")
 
 if(${LIBINDICATE_FOUND})
   message(STATUS "libindicate found, support enabled...")
   libsoup-2.4
   libxml-2.0
   webkit-1.0
+  rest-0.6
   unique-1.0
-  rest-0.6
-  rest-extras-0.6
+  
+  #rest-extras-0.6
 OPTIONS
   --thread
   -g
   ${GTKSPELL_CFLAGS}
   ${LIBINDICATE_CFLAGS}
   ${REST_CFLAGS}
-  ${RESTEXTRAS_CFLAGS}
+  #${RESTEXTRAS_CFLAGS}
 )
 
 link_libraries(
   ${GTKSPELL_LIBRARIES}
   ${LIBINDICATE_LIBRARIES}
   ${REST_LIBRARIES}
-  ${RESTEXTRAS_LIBRARIES}
+  #${RESTEXTRAS_LIBRARIES}
 )
 
 include_directories(src/vapi/)
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 3, 29 June 2007
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
 
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
+  0. Additional Definitions. 
 
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
 
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
 
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
 
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
 
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
 
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  1. Exception to Section 3 of the GNU GPL.
 
-  The precise terms and conditions for copying, distribution and
-modification follow.
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
 
-		       TERMS AND CONDITIONS
+  2. Conveying Modified Versions.
 
-  0. Definitions.
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
 
-  "This License" refers to version 3 of the GNU General Public License.
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
 
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
- 
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
 
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
+  3. Object Code Incorporating Material from Library Header Files.
 
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
 
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
 
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
 
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
+  4. Combined Works.
 
-  1. Source Code.
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
 
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
 
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
 
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
 
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
+   d) Do one of the following:
 
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
 
-  The Corresponding Source for a work in source code form is that
-same work.
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
 
-  2. Basic Permissions.
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
 
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
+  5. Combined Libraries.
 
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
 
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
 
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
 
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
+  6. Revised Versions of the GNU Lesser General Public License.
 
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
 
-  4. Conveying Verbatim Copies.
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
 
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-  
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
 
 Pino is a fast, easy and free Twitter client.
 
-Visit http://code.google.com/p/pino-twitter/ for more information.
+Visit http://pino-app.appspot.com/ for more information.
 

File img/delete_status.png

Old
Old image
New
New image

File img/direct_reply.png

Old
Old image
New
New image

File img/updating.png

Old
Old image
New
New image

File src/account_abstract.vala

 public abstract class AAccount : GLib.Object {
 
 	public signal void stream_was_added(AAccount account, AStream stream);
-	public signal void stream_was_removed(AAccount account, int stream_index);
+	public signal void stream_was_removed(AAccount account, AStream stream);
 	public signal void fresh_items_changed(int items, int stream_index, AAccount account);
 	public signal void account_was_changed(AAccount account);
 	public signal void status_sent(AAccount account, bool ok, string error_msg = "");
 	public signal void stop_indicate();
 	public signal void do_reply(AAccount account, Status status);
 	public signal void insert_reply(string stream_hash, string status_id, Status result);
+	public signal void cursor_changed(AStream? new_stream, AStream? old_stream);
 	
 	/* For tree widget */
 	public signal void stream_was_changed(AAccount account, AStream stream, int stream_index);
 	public string s_avatar_url {get; set; default = "";}
 	
 	/** Holdes list of current streams */
-	private ArrayList<AStream> _streams = new ArrayList<AStream>();
-	public ArrayList<AStream> streams {get { return _streams; } }
+	//private ArrayList<AStream> _streams = new ArrayList<AStream>();
+	public StreamsModel streams {get; set; default = new StreamsModel(); }
 	
 	/** Items in context menu of this account */
 	public abstract MenuItems[] popup_items {owned get;}
 			debug("userpic changed");
 			account_was_changed(this);
 		});
+		
+		streams.cursor_changed.connect((new_stream, old_stream) => {
+			cursor_changed(new_stream, old_stream);
+		});
 	}
 	
 	/** Unique hash of stream+account */
 
 		AStream stream = (AStream) GLib.Object.new(stype);
 		stream.account = this;
-		streams.add(stream);
 		
 		if(props != null) {
 			var obj = (ObjectClass) stype.class_ref();
 		});
 		
 		if(emit_signal) {
-			stream_was_added(this, stream);
+			//stream_was_added(this, stream);
 		}
 		
 		init_stream(stream);
+		
+		streams.add(stream);
 	}
 	
 	/** If we need to add some options to the stream */
 	}
 	
 	/** Reaction on stream's popup menu actions */
-	public void streams_actions_tracker(int stream_index, MenuItems item) {
+	public void streams_actions_tracker(AStream stream, MenuItems item) {
 		debug("action: %d", item);
 		switch(item) {
 		case MenuItems.REMOVE:
-			stream_was_removed(this, stream_index);
-			streams.remove_at(stream_index);
+			//stream_was_removed(this, stream);
+			streams.remove(stream);
 			break;
 		
 		case MenuItems.REFRESH:
-			streams.get(stream_index).menu_refresh();
+			stream.menu_refresh();
 			break;
 		
 		case MenuItems.SETTINGS:
-			streams.get(stream_index).menu_settings();
+			stream.menu_settings();
 			break;
 		
 		case MenuItems.MORE:
-			streams.get(stream_index).menu_more();
+			stream.menu_more();
 			break;
 		}
 	}

File src/accounts.vala

 	
 	public signal void insert_new_account(AAccount account);
 	public signal void insert_new_stream_after(string after_path, AStream stream);
-	public signal void element_was_removed(string path, AAccount account, AStream? stream = null);
+	public signal void account_was_removed(AAccount account);
 	public signal void fresh_items_changed(int items, string path);
 	public signal void account_was_changed(string path, AAccount account);
 	public signal void stream_was_changed(string path, AStream stream);
 	public signal void stop_indicate();
 	public signal void do_reply(AAccount account, Status status);
 	public signal void insert_reply(string stream_hash, string status_id, Status result);
+	public signal void cursor_changed(AStream? new_stream, AStream? old_stream);
 	
 	private string accounts_path;
 	
 		account.insert_reply.connect((stream_hash, status_id, result) => {
 			insert_reply(stream_hash, status_id, result);
 		});
+		
+		account.cursor_changed.connect((new_stream, old_stream) => {
+			cursor_changed(new_stream, old_stream);
+		});
 	}
 
 	/** New stream was added, we need to report about this to the tree widget */
 	}
 	
 	/** Stream was removed from some account */
-	private void remove_stream(AAccount account, int stream_index) {
+	private void remove_stream(AAccount account, AStream stream) {
 		int account_index = index_of(account);
-		AStream stream = account.streams.get(stream_index);
-		element_was_removed("%d:%d".printf(account_index, stream_index), account, stream);
+		//AStream stream = account.streams.get(stream_index);
+		//element_was_removed("%d:%d".printf(account_index, account.streams.index_of(stream)), account, stream);
 	}
 	
 	/** New data in account */
 	}
 	
 	/** Action for accounts */
-	public virtual void actions_tracker(AAccount account, MenuItems item,
-		Gtk.Window parent) {
+	public void actions_tracker(AAccount account, MenuItems item) {
 		
 		switch(item) {
 		case MenuItems.REMOVE:
-			Gtk.MessageDialog dlg = new Gtk.MessageDialog(parent, Gtk.DialogFlags.MODAL,
+			Gtk.MessageDialog dlg = new Gtk.MessageDialog(main_window, Gtk.DialogFlags.MODAL,
 				Gtk.MessageType.QUESTION, Gtk.ButtonsType.YES_NO,
 				_("Do you realy want to remove this account?"));
 			
 			if(result == Gtk.ResponseType.YES) {
 				debug("remove");
 				int account_index = index_of(account);
-				element_was_removed(account_index.to_string(), account);
+				account_was_removed(account);
 				this.remove(account);
 			}
 			break;

File src/accounts_widget.vala

+using Gtk;
+using Cairo;
+using PinoEnums;
+using Gee;
+
+public class StreamIcon : EventBox {
+	
+	public signal void activated(AStream stream);
+	
+	public AStream stream;
+	
+	//private Menu? menu = null;
+	
+	private Gdk.Pixbuf? status_icon = null;
+	
+	private Gdk.Pixbuf? icon = null;
+	private Gdk.Pixbuf? icon_inactive = null;
+	private Gdk.Pixbuf? icon_hovered = null;
+	private Gdk.Pixbuf? icon_pressed = null;
+	private Gdk.Pixbuf? icon_active_hovered = null;
+	
+	private Gdk.Pixbuf? icon_tmp = null;
+	
+	private int size = 48;
+	
+	public State state = State.INACTIVE;
+	
+	private bool checked {get; set; default = false;}
+	
+	public static enum State {
+		ACTIVE,
+		ACTIVE_HOVERED,
+		INACTIVE,
+		HOVERED,
+		PRESSED
+	}
+	
+	public StreamIcon(AStream stream, string tooltip, owned Gdk.Pixbuf icon,
+		int size = 48) {
+		
+		this.stream = stream;
+		
+		set_tooltip_text(tooltip);
+		
+		if(icon.width > size - 20)
+			icon = icon.scale_simple(size - 20, size - 20, Gdk.InterpType.BILINEAR);
+		
+		this.icon = icon;
+		
+		this.size = size;
+		
+		set_size_request(size, size);
+		set_has_window(false);
+		
+		icon_hovered = new Gdk.Pixbuf(Gdk.Colorspace.RGB, icon.has_alpha, icon.bits_per_sample, icon.width, icon.height);
+		icon.saturate_and_pixelate(icon_hovered, (float) 1.5, false);
+		//icon.composite(icon_hovered, 0, 0, icon.width, icon.height, 0, 0, 1, 1, Gdk.InterpType.NEAREST, 100);
+		
+		icon_pressed = icon.scale_simple(icon.width - 2, icon.height - 2, Gdk.InterpType.BILINEAR);
+		
+		set_events(Gdk.EventMask.ENTER_NOTIFY_MASK);
+		set_events(Gdk.EventMask.LEAVE_NOTIFY_MASK);
+		set_events(Gdk.EventMask.BUTTON_PRESS_MASK);
+		set_events(Gdk.EventMask.BUTTON_RELEASE_MASK);
+		
+		enter_notify_event.connect(on_enter);
+		leave_notify_event.connect(on_leave);
+		button_press_event.connect(on_press);
+		button_release_event.connect(on_release);
+		
+		this.stream.notify["status"].connect(set_status);
+		//this.notify["checked"].connect(set_checked);
+		
+		if(stream.status != StreamStatus.READY) {
+			ParamSpec? pspec = null;
+			set_status(pspec);
+		}
+	}
+	
+	public void set_checked_simple(bool checked) {
+		this.checked = checked;
+		
+		if(checked)
+			state = State.ACTIVE;
+		else
+			state = State.INACTIVE;
+		
+		redraw();
+	}
+	
+	private void set_status(ParamSpec? pspec) {
+		switch(stream.status) {
+		case StreamStatus.READY:
+			status_icon = null;
+			break;
+		
+		case StreamStatus.UPDATING:
+			status_icon = new Gdk.Pixbuf.from_file(Config.UPDATING_PATH);
+			break;
+		}
+		
+		redraw();
+	}
+	
+	private bool on_enter(Gdk.EventCrossing event) {
+		if(checked)
+			state = State.ACTIVE_HOVERED;
+		else
+			state = State.HOVERED;
+		
+		redraw();
+		
+		return false;
+	}
+	
+	private bool on_leave(Gdk.EventCrossing event) {
+		if(checked)
+			state = State.ACTIVE;
+		else
+			state = State.INACTIVE;
+		
+		redraw();
+		return false;
+	}
+	
+	private bool on_press(Gdk.EventButton event) {
+		switch(event.button) {
+		case 1:
+			state = State.PRESSED;
+			redraw();
+			activated(stream); //emit signal
+			return true;
+		case 3:
+			context_menu(event);
+			return true;
+		}
+		
+		
+		//state = State.ACTIVE;
+		return true;
+	}
+	
+	public void activate() {
+		
+	}
+	
+	private bool on_release(Gdk.EventButton event) {
+		return true;
+	}
+	
+	private bool context_menu(Gdk.EventButton event) {
+		Menu menu = new Menu();
+		
+		foreach(MenuItems item in stream.popup_items) {
+			MenuItems sitem = item;
+			debug("action: %d", sitem);
+			ImageMenuItem menu_item = item2menu(sitem);
+			
+			menu_item.activate.connect(() => {
+				stream.account.streams_actions_tracker(stream, sitem);
+			});
+			menu.append(menu_item);
+		}
+		
+		menu.show_all();
+		debug("%d", (int) event.time);
+		menu.popup(null, null, null, 1, event.time);
+		
+		return true;
+	}
+	
+	public static ImageMenuItem item2menu(MenuItems item) {
+		string label = "";
+		
+		switch(item) {
+		case MenuItems.SETTINGS:
+			label = _("Settings...");
+			break;
+		
+		case MenuItems.REMOVE:
+			label = _("Remove");
+			break;
+		
+		case MenuItems.REFRESH:
+			label = _("Refresh");
+			break;
+		
+		case MenuItems.MORE:
+			label = _("Get more");
+			break;
+		}
+		
+		ImageMenuItem menu_item = new ImageMenuItem.with_label(label);
+		
+		return menu_item;
+	}
+	
+	private void redraw() {
+		if (null == this.window)
+			return;
+
+		unowned Gdk.Region region = this.window.get_clip_region ();
+		this.window.invalidate_region (region, true);
+		this.window.process_updates (true);
+    }
+	
+	public override bool expose_event(Gdk.EventExpose event) {
+		Context ctx = Gdk.cairo_create(this.window);
+		
+		Allocation alloc;
+		get_allocation(out alloc);
+		
+		/*
+		Gdk.Color color = {1, 240, 119, 70};
+		Gdk.cairo_rectangle(ctx, {alloc.x, alloc.y, alloc.width, alloc.height});
+		
+		Cairo.Pattern grad = new Cairo.Pattern.linear(alloc.x, alloc.y, alloc.x, alloc.height);
+		grad.add_color_stop_rgba(0, color.red/256.0, color.green/256.0, color.blue/256.0, 1.0);
+		grad.add_color_stop_rgba(0.5, color.red/256.0, color.green/256.0, color.blue/256.0, 0.5);
+		grad.add_color_stop_rgba(1, color.red/256.0, color.green/256.0, color.blue/256.0, 1.0);
+		
+		ctx.set_source(grad);
+		
+		ctx.fill();
+		*/
+		base.expose_event(event);
+		
+		switch(state) {
+		case State.INACTIVE:
+			icon_tmp = icon;//_inactive;
+			break;
+		case State.ACTIVE:
+			Gdk.Color color = {1, 242, 241, 240};
+			draw_rect(ctx, alloc, color);
+			icon_tmp = icon;
+			break;
+		case State.ACTIVE_HOVERED:
+			Gdk.Color color = {1, 254, 253, 252};
+			draw_rect(ctx, alloc, color);
+			icon_tmp = icon_hovered;//icon_active_hovered;
+			break;
+		case State.HOVERED:
+			Gdk.Color color = {1, 229, 226, 224};
+			//draw_rect(ctx, alloc, color);
+			icon_tmp = icon_hovered;
+			break;
+		case State.PRESSED:
+			Gdk.Color color = {1, 229, 226, 224};
+			draw_rect(ctx, alloc, color);
+			icon_tmp = icon_pressed;
+			break;
+		}
+		
+		if(icon_tmp != null) {
+			Gdk.Rectangle big_rect = {alloc.x + (alloc.width - icon.width) / 2,
+				alloc.y + (alloc.height - icon.height) / 2 , icon.width, icon.height};
+			Gdk.cairo_rectangle(ctx, big_rect);
+			Gdk.cairo_set_source_pixbuf(ctx, icon_tmp, big_rect.x,
+				big_rect.y);
+			
+			ctx.fill();
+			
+			
+			if(status_icon != null) {
+				Gdk.Rectangle status_rect = {big_rect.x + big_rect.width - status_icon.width,
+					big_rect.y + big_rect.height - status_icon.height, status_icon.width,
+					status_icon.height};
+				
+				Gdk.cairo_rectangle(ctx, status_rect);
+				Gdk.cairo_set_source_pixbuf(ctx, status_icon, status_rect.x,
+					status_rect.y);
+				
+				ctx.fill();
+			}
+		}
+		
+		return false;
+	}
+	
+	private void draw_rect(Context ctx, Allocation alloc, Gdk.Color color) {
+		Gdk.cairo_rectangle(ctx, {alloc.x, alloc.y, alloc.width, alloc.height});
+		
+		Cairo.Pattern grad = new Cairo.Pattern.linear(alloc.x, alloc.y, alloc.x, alloc.height);
+		grad.add_color_stop_rgba(0, color.red/256.0, color.green/256.0, color.blue/256.0, 1.0);
+		grad.add_color_stop_rgba(0.5, color.red/256.0, color.green/256.0, color.blue/256.0, 0.5);
+		grad.add_color_stop_rgba(1, color.red/256.0, color.green/256.0, color.blue/256.0, 1.0);
+		
+		ctx.set_source(grad);
+		
+		ctx.fill();
+		
+		//draw top and bottom lines
+		Gdk.cairo_rectangle(ctx, {alloc.x, alloc.y, alloc.x + alloc.width, 1});
+		ctx.set_source_rgb(178/256.0, 176/256.0, 164/256.0);
+		ctx.fill_preserve();
+		
+		Gdk.cairo_rectangle(ctx, {alloc.x, alloc.y + alloc.height, alloc.x + alloc.width, 1});
+		ctx.set_source_rgb(178/256.0, 176/256.0, 164/256.0);
+		ctx.fill_preserve();
+	}
+}
+
+public class StreamsWidget : VBox {
+	
+	public signal void activated(AStream stream);
+	
+	private AAccount account;
+	
+	//public AStream? current_stream = null;
+	
+	public StreamsWidget(AAccount account) {
+		GLib.Object(homogeneous: false, spacing: 0);
+		
+		this.account = account;
+		
+		//setup streams
+		foreach(AStream stream in account.streams) {
+			new_stream_icon(stream);
+		}
+		
+		account.streams.cursor_changed.connect(move_cursor);
+		account.streams.removed.connect(stream_removed);
+		account.streams.added.connect(stream_added);
+		
+		show_all();
+	}
+	
+	private void new_stream_icon(AStream stream) {
+		StreamIcon icon = create_icon(stream);
+		icon.activated.connect(on_activated);
+		icon.show_all();
+		pack_start(icon, false, false, 0);
+	}
+	
+	private void move_cursor(AStream? new_stream, AStream? old_stream) {
+		StreamIcon? icon = stream_icon_from_stream(new_stream);
+		if(icon != null)
+			icon.set_checked_simple(true);
+		
+		icon = stream_icon_from_stream(old_stream);
+		if(icon != null)
+			icon.set_checked_simple(false);
+	}
+	
+	private void stream_removed(AStream stream) {
+		StreamIcon? icon = stream_icon_from_stream(stream);
+		
+		if(icon != null) {
+			remove(icon);
+			icon.dispose();
+		}
+		
+		debug("removed");
+	}
+	
+	private void stream_added(AStream stream) {
+		new_stream_icon(stream);
+	}
+	
+	public void on_activated(AStream stream) {
+		if(stream == account.streams.get_current())
+			return;
+		
+		account.streams.set_current(stream);
+		/*
+		if(current_stream != null) {
+			StreamIcon? icon = stream_icon_from_stream(current_stream);
+			debug("ok");
+			if(icon != null) {
+				icon.set_checked_simple(false);
+				debug("ok");
+			}
+		}
+		
+		current_stream = stream;
+		activated(stream);	
+		*/
+	}
+	
+	private StreamIcon? stream_icon_from_stream(AStream? stream) {
+		if(stream == null)
+			return null;
+		
+		foreach(Widget i in this.get_children()) {
+			if(i.get_type() != typeof(StreamIcon))
+				continue;
+			
+			if(((StreamIcon) i).stream == stream) {
+					return (StreamIcon) i;
+			}
+		}
+		
+		return null;
+	}
+	
+	private StreamIcon create_icon(AStream stream) {
+		Gdk.Pixbuf pic = streams_types[stream.stream_type].icon;
+		string tooltip = streams_types[stream.stream_type].name;
+		StreamIcon icon = new StreamIcon(stream, tooltip, pic);
+		//icon.show();
+		return icon;
+	}
+}
+
+public class AccountWidget : EventBox {
+	
+	public AAccount account;
+	private Accounts accounts;
+	private Avatar avatar;
+	
+	public bool active {get; set; default = false;}
+	
+	public signal void account_activate(AccountWidget acc_widget);
+	
+	public class AccountWidget(AAccount account, Accounts accounts) {
+		this.account = account;
+		this.accounts = accounts;
+		
+		set_size_request(48, 48);
+		
+		avatar = new Avatar.from_url(this.account.s_avatar_url, 48);
+		avatar.show();
+		
+		add(avatar);
+		
+		notify["active"].connect(on_active);
+		
+		set_events(Gdk.EventMask.BUTTON_PRESS_MASK);
+		button_press_event.connect(on_press);
+		
+		set_has_window(false);
+	}
+	
+	private bool on_press(Gdk.EventButton event) {
+		switch(event.button) {
+		case 1:
+			if(active)
+				return true;
+			
+			active = true;
+			account_activate(this); //emit signal
+			break;
+		case 3:
+			context_menu(event);
+			break;
+		}
+		
+		return true;
+	}
+	/*
+	private bool on_release(Gdk.EventButton event) {
+		
+		
+		return true;
+	}*/
+	
+	public void on_active(ParamSpec? pspec = null) {
+		avatar.set_active(active);
+		redraw();
+	}
+	
+	private void redraw() {
+		if (null == this.window)
+			return;
+
+		unowned Gdk.Region region = this.window.get_clip_region();
+		this.window.invalidate_region(region, true);
+		this.window.process_updates(true);
+    }
+    
+    private bool context_menu(Gdk.EventButton event) {
+		Menu menu = new Menu();
+		
+		Menu streams_menu = new Menu(); //for streams
+		
+		foreach(StreamEnum stream in account.avaliable_streams().keys) {
+			string label = streams_types.get(stream).name;
+			ImageMenuItem menu_item = new ImageMenuItem.with_label(label);
+			Image img = streams_types.get(stream).get_menu_image();
+			
+			if(img != null)
+				menu_item.set_image(img);
+			
+			menu_item.activate.connect(() => { //add new stream to account
+				account.add_stream(stream, true);
+			});
+			streams_menu.append(menu_item);
+		}
+		
+		MenuItem streams_item = new MenuItem.with_label("Add stream");
+		streams_item.set_submenu(streams_menu);
+		menu.append(streams_item);
+		
+		foreach(MenuItems item in account.popup_items) {
+			MenuItems aitem = item;
+			MenuItem? menu_item = StreamIcon.item2menu(item); //static method
+			
+			menu_item.activate.connect(() => {
+				accounts.actions_tracker(account, aitem);
+			});
+			
+			if(menu_item != null)
+				menu.append(menu_item);
+			else
+				debug("item doesn't supported");
+		}
+		
+		menu.show_all();
+		menu.popup(null, null, null, 1, event.time);
+		
+		return true;
+	}
+	
+	/*
+	public override bool expose_event(Gdk.EventExpose event) {
+		base.expose_event(event);
+		
+		Context ctx = Gdk.cairo_create(this.window);
+		
+		Allocation alloc;
+		get_allocation(out alloc);
+		
+		if(!active) {
+			Avatar.draw_rounded_path(ctx, 0, 0, alloc.width,
+				alloc.height, 4);
+			ctx.set_source_rgba(242 / 256.0, 241 / 256.0, 240 / 256.0, 0.6);
+			ctx.fill_preserve();
+		}
+		
+		return true;
+	}*/
+}
+
+public class StreamsModel : ArrayList<AStream> {
+	
+	private AStream? current_stream {get; set; default = null;}
+	
+	public signal void added(AStream stream);
+	public signal void removed(AStream stream);
+	public signal void cursor_changed(AStream? new_stream, AStream? old_stream);
+	
+	public StreamsModel() {
+		base();
+	}
+	
+	public override bool add(AStream stream) {
+		base.add(stream);
+		
+		added(stream);
+		
+		set_current(stream);
+		
+		return true;
+	}
+	
+	public override bool remove(AStream stream) {
+		removed(stream);
+		
+		base.remove(stream);
+		
+		if(current_stream == stream) {
+			if(this.size < 1)
+				set_current(null);
+			else {
+				this.set_current(this.get(0));
+			}
+		}
+		
+		return true;
+	}
+	
+	public void set_current(AStream? stream) {
+		if(stream == current_stream)
+			return;
+		
+		if(contains(stream)) {
+			cursor_changed(stream, current_stream); //emit signal
+			current_stream = stream;
+		}
+		else
+			debug("no such stream");
+	}
+	
+	public AStream? get_current() {
+		if(current_stream == null) {
+			if(this.size == 0)
+				return null;
+			
+			this.set_current(this.get(0));
+		}
+		
+		return current_stream;
+	}
+}
+
+public class AccountsWidget : EventBox {
+	
+	public signal void cursor_moved(AAccount account, AStream? stream);
+	
+	private Accounts accounts;
+	
+	private AAccount? current_account = null;
+	
+	private VBox main_vb;
+	private VBox top_acc;
+	private HBox top_acc_h;
+	private VBox streams_box;
+	private VBox bottom_acc;
+	private HBox bottom_acc_h;
+	
+	private HashMap<AAccount, StreamsWidget> accounts_map {get; set; default = new HashMap<AAccount, StreamsWidget>();}
+	
+	public AccountsWidget(Accounts accounts) {
+		this.accounts = accounts;
+		
+		set_size_request(56, 100);
+		set_has_window(false);
+		
+		main_vb = new VBox(false, 4);
+		top_acc = new VBox(false, 2);
+		top_acc_h = new HBox(false, 2);
+		streams_box = new VBox(false, 0);
+		bottom_acc_h = new HBox(false, 2);
+		bottom_acc = new VBox(false, 2);
+		
+		top_acc.pack_start(top_acc_h, false, false, 4);
+		bottom_acc_h.pack_start(bottom_acc, false, false, 4);
+		
+		main_vb.pack_start(top_acc, false, false, 2);
+		main_vb.pack_start(streams_box, false, false, 0);
+		main_vb.pack_end(bottom_acc_h, false, false, 0);
+		/*
+		if(accounts.size > 0) {
+			current_account = accounts.get(0);
+			AccountWidget aw = new AccountWidget(current_account);
+			aw.account_activate.connect(on_account_activate);
+			top_acc.pack_start(aw, false, false, 0);
+			aw.show();
+			aw.active = true;
+			
+			StreamsWidget sw = setup_streams(accounts.get(0));
+			accounts_map.set(accounts.get(0), sw);
+			streams_box.pack_start(sw, false, false, 0);
+		}*/
+		
+		if(accounts.size - 1 < settings.current_account)
+			settings.current_account = 0;
+		
+		//accounts setup
+		foreach(AAccount account in accounts) {
+			//if(account == current_account)
+			//	continue;
+			
+			AccountWidget aw = new AccountWidget(account, accounts);
+			aw.account_activate.connect(on_account_activate);
+			
+			StreamsWidget sw = setup_streams(account);
+			accounts_map.set(account, sw);
+			
+			if(accounts.index_of(account) == settings.current_account) {
+				current_account = account;
+				top_acc_h.pack_start(aw, false, false, 4);
+				aw.active = true;
+				
+				streams_box.pack_start(sw, false, false, 0);
+			} else {
+				bottom_acc.pack_start(aw, false, false, 4);
+				aw.active = false;
+			}
+			
+			aw.show();
+		}
+		
+		add(main_vb);
+		
+		accounts.account_was_removed.connect(remove_account);
+	}
+	
+	private void remove_account(AAccount account) {
+		AccountWidget rw = widget_from_account(account);
+		StreamsWidget sw = accounts_map.get(account);
+		
+		if(current_account == account) {
+			top_acc_h.remove(rw);
+			streams_box.remove(sw);
+			
+			current_account = null;
+			
+			if(bottom_acc.get_children().length() > 0) {
+				((AccountWidget) bottom_acc.get_children().nth_data(0)).on_active();
+			}
+			//current_account = null;
+		} else {
+			bottom_acc.remove(rw);
+		}
+	}
+	
+	private StreamsWidget setup_streams(AAccount account) {
+		StreamsWidget stream_widget = new StreamsWidget(account);
+		stream_widget.activated.connect(stream_activate);
+		
+		return stream_widget;
+	}
+	
+	public void setup_current_stream() {
+		if(current_account == null)
+			return;
+		
+		if(current_account.streams.size < 1)
+			return;
+		
+		current_account.streams.set_current(current_account.streams.get(0));
+	}
+	
+	private void on_account_activate(AccountWidget acc_widget) {
+		AccountWidget? tmp_widget = widget_from_account(current_account);
+		if(tmp_widget != null) {
+			top_acc_h.remove(tmp_widget);
+			tmp_widget.active = false;
+			bottom_acc.pack_start(tmp_widget, false, false, 0);
+			
+			if(streams_box.get_children().length() == 1) {
+				streams_box.remove(streams_box.get_children().nth_data(0));
+			}
+		}
+		
+		bottom_acc.remove(acc_widget);
+		top_acc_h.pack_start(acc_widget, false, false, 4);
+		
+		AStream? old_stream = current_account.streams.get_current(); //get old active stream
+		
+		current_account = acc_widget.account;
+		
+		if(current_account != null)
+			settings.current_account = accounts.index_of(current_account); //write to settings
+		
+		streams_box.pack_start(accounts_map.get(current_account), false, false, 0);
+		
+		AStream? stream = current_account.streams.get_current();
+		
+		if(stream == null)
+			return;
+		
+		current_account.streams.cursor_changed(stream, old_stream);
+	}
+	
+	private AccountWidget? widget_from_account(AAccount account) {
+		foreach(Widget aw in top_acc_h.get_children()) {
+			if(((AccountWidget) aw).account == account)
+				return (AccountWidget) aw;
+		}
+		
+		foreach(Widget aw in bottom_acc.get_children()) {
+			if(((AccountWidget) aw).account == account)
+				return (AccountWidget) aw;
+		}
+		
+		return null;
+	}
+	
+	private void stream_activate(AStream stream) {
+		//cursor_moved(stream.account, stream); //emit signal
+	}
+	
+	public override bool expose_event(Gdk.EventExpose event) {
+		Context ctx = Gdk.cairo_create(this.window);
+		
+		Allocation alloc;
+		get_allocation(out alloc);
+		Gdk.Color color = {1, 230, 224, 218};
+		Gdk.cairo_rectangle(ctx, {alloc.x, alloc.y, alloc.width, alloc.height});
+		/*
+		Cairo.Pattern grad = new Cairo.Pattern.linear(0, 1, alloc.width, 1);
+		grad.add_color_stop_rgb(0, color.red/256.0, color.green/256.0, color.blue/256.0);
+		grad.add_color_stop_rgb(0.5, 212/256.0, 211/256.0, 210/256.0);
+		grad.add_color_stop_rgb(1, color.red/256.0, color.green/256.0, color.blue/256.0);
+		
+		ctx.set_source(grad);*/
+		ctx.set_source_rgb(230/256.0, 224/256.0, 218/256.0);
+		ctx.fill();
+		
+		base.expose_event(event);
+		
+		Gdk.cairo_rectangle(ctx, {alloc.width - 1, alloc.y, 1, alloc.height});
+		ctx.set_source_rgb(178/256.0, 176/256.0, 164/256.0);
+		ctx.fill_preserve();
+		
+		Gdk.cairo_rectangle(ctx, {alloc.width - 2, alloc.y, 1, alloc.height});
+		ctx.set_source_rgba(178/256.0, 176/256.0, 164/256.0, 0.4);
+		ctx.fill_preserve();
+		
+		Gdk.cairo_rectangle(ctx, {alloc.width - 3, alloc.y, 1, alloc.height});
+		ctx.set_source_rgba(178/256.0, 176/256.0, 164/256.0, 0.2);
+		ctx.fill_preserve();
+		
+		return true;
+	}
+}

File src/avatar.vala

 	public string url {get; set; default = "";}
 	public int pix_size {get; set; default = 1;}
 	
-	private const double M_PI = 3.1415926535;
-	private const double MAX_RGB = (double) uint16.MAX;
+	public static const double M_PI = 3.1415926535;
+	public static double MAX_RGB = (double) uint16.MAX;
 	
-	private unowned Thread? thread = null;
+	private bool active = true;
+	private Gdk.Pixbuf? ipixbuf = null;
+	private Gdk.Pixbuf? cpixbuf = null;
+	
+	private unowned Thread<void*>? thread = null;
 	
 	public Avatar() {
 		GLib.Object();
 			pixbuf = pixbuf.scale_simple(pix_size, pix_size, Gdk.InterpType.BILINEAR);
 		}
 		
+		set_active(active);
+		
+		//pixbuf = pixbuf.add_alpha(false, 0xff, 0xff, 0xff);
+		
+		redraw();
+	}
+	
+	public void set_active(bool active) {
+		this.active = active;
+		
+		if(active) {
+			cpixbuf = pixbuf;
+		} else {
+			if(ipixbuf == null && pixbuf != null) {
+				ipixbuf = pixbuf.composite_color_simple (pixbuf.width, pixbuf.height, Gdk.InterpType.BILINEAR, 50, 24, 0xd9d7d5, 0xd9d7d5);
+			}
+			
+			cpixbuf = ipixbuf;
+		}
+		
 		redraw();
 	}
 	
 	public override bool expose_event(Gdk.EventExpose event) {
 		Context ctx = Gdk.cairo_create(this.window);
 		
-		if(pixbuf != null) {
-			if(!pixbuf.has_alpha) {
+		if(cpixbuf != null) {
+			/*
+			if(false) {//!pixbuf.has_alpha) {
 				draw_rounded_path(ctx, allocation.x + 2, allocation.y + 2, allocation.width - 2,
 					allocation.height - 2, 4);
 				ctx.set_source_rgb(242 / 256.0, 242 / 256.0, 242 / 256.0);
 				
 				ctx.reset_clip();
 			}
+			*/
+			draw_rounded_path(ctx, allocation.x, allocation.y, allocation.width,
+				allocation.height, 4);
 			
-			draw_rounded_path(ctx, allocation.x, allocation.y, allocation.width - 2,
-				allocation.height - 2, 4);
-			
-			Gdk.cairo_set_source_pixbuf(ctx, pixbuf, allocation.x, allocation.y);
+			Gdk.cairo_set_source_pixbuf(ctx, cpixbuf, allocation.x, allocation.y);
 			ctx.clip();
 			ctx.paint();
 		}
 		return false;
 	}
 	
-	private void draw_rounded_path(Context ctx, double x, double y,
+	public static void draw_rounded_path(Context ctx, double x, double y,
 		double width, double height, double radius) {
 		
 		double degrees = M_PI / 180.0;
 			
 			Idle.add(() => {
 				thread.join();
+				thread = null;
+				
 				try {
 					this.set_file_name(img_path);
 				} catch(GLib.Error e) {

File src/bg_box.vala

 	
 	public bool fresh {get; set; default = false;}
 	public bool favorited {get; set; default = false;}
-	private const double MAX_RGB = (double) uint16.MAX;
+	private double MAX_RGB = (double) uint16.MAX;
 	
 	//it's not actualy true colors, like in Gdk
 	private Gdk.Color color_fresh;

File src/excluded/tree_widget.vala

+using Gtk;
+using PinoEnums;
+
+public class TreeWidget : TreeView {
+	
+	public signal void cursor_moved(AStream stream);
+	
+	private Window parent;
+	private Accounts accounts;
+
+	private TreeStore store;
+	public TreePath current_tree_path;
+	
+	private Gdk.Pixbuf pix_account;
+	private Gdk.Pixbuf pix_updating;
+	
+	public Frame frame;
+	
+	public TreeWidget(Window parent, Accounts accounts) {
+		this.parent = parent;
+		this.accounts = accounts;
+		
+		try {
+			pix_account = new Gdk.Pixbuf.from_file("/usr/share/icons/Humanity/places/24/folder-videos.svg");
+			pix_updating = new Gdk.Pixbuf.from_file(Config.UPDATING_PATH);
+		} catch(GLib.Error e) {
+			debug(e.message);
+		}
+		
+		accounts.insert_new_account.connect(new_account);
+		accounts.insert_new_stream_after.connect((after_path, stream) => {
+			new_stream(after_path, stream, true);
+		});
+		accounts.element_was_removed.connect(remove_element);
+		
+		set_rules_hint(false);
+		set_headers_visible(false);
+		
+		frame = new Frame(null);
+		frame.add(this);
+		
+		setup();
+		
+		accounts.fresh_items_changed.connect((items, path) => {
+			TreeIter iter;
+			
+			store.get_iter_from_string(out iter, path);
+			store.set(iter, 2, items.to_string(), -1);
+		});
+		
+		accounts.account_was_changed.connect((path, account) => {
+			TreeIter iter;
+			store.get_iter_from_string(out iter, path);
+			new_account_general(iter, account);
+		});
+		
+		accounts.stream_was_changed.connect((path, stream) => {
+			debug("stream was changed");
+			debug(path);
+			TreeIter iter;
+			store.get_iter_from_string(out iter, path);
+			
+			new_stream_general(iter, stream);
+		});
+		
+		button_release_event.connect(context_menu);
+	}
+
+	/** Building tree of accounts */
+	public void setup() {
+		//var icon_cell = new CellRendererPixbuf();
+		//icon_cell.stock_size = 24;
+		
+		insert_column_with_attributes(-1, "Icon", new IconWithStatusCellRrenderer(), "meta_row", 0, null);
+		//insert_column_with_attributes(-1, "Name", new CellRendererText(), "text", 1, null);
+		//insert_column_with_attributes(-1, "New messages", new UpdatesCellRrenderer(), "text", 2, null);
+	
+		store = new TreeStore(1, typeof(MetaRow));
+		set_model(store);
+
+		foreach(AAccount acc in accounts) {
+			debug(acc.s_name);
+			TreeIter iter;
+			store.append(out iter, null);
+			new_account_general(iter, acc);
+			new_streams(acc, iter);
+		}
+
+		expand_all();
+
+		cursor_changed.connect(cursor_changed_callback);
+	}
+	
+	/** Set current item */
+	public void set_current(string path) {
+		if(path == "")
+			return;
+		
+		TreePath tree_path = new TreePath.from_string(path);
+		set_cursor(tree_path, null, false);
+	}
+	
+	/** When current stream or account is changed */
+	private void cursor_changed_callback() {
+		debug("cursor was changed");
+		TreePath? path;
+		TreeViewColumn column;
+
+		get_cursor(out path, out column);
+		
+		if(path == null || path.to_string() == current_tree_path.to_string())
+			return;
+		
+		current_tree_path = path;
+		
+		debug(path.to_string());
+
+		if(path.get_depth() == 2) { //stream
+			int account_index = path.to_string().split(":")[0].to_int();
+			int stream_index = path.to_string().split(":")[1].to_int();
+			
+			AAccount active_account = accounts.get(account_index);
+			AStream active_stream = active_account.streams.get(stream_index);
+			
+			string hash = active_account.get_stream_hash(active_stream);
+
+			cursor_moved(active_stream);
+		}
+	}
+
+	/** Get current account */
+	private AAccount? get_current_account() {
+		TreePath path;
+		TreeViewColumn column;
+
+		get_cursor(out path, out column);
+		string spath = path.to_string().split(":")[0];
+		
+		return accounts.get(spath.to_int());
+	}
+
+	/** Get current stream index */
+	private int? get_stream_index() {
+		TreePath path;
+		TreeViewColumn column;
+
+		get_cursor(out path, out column);
+		if(path.get_depth() < 2)
+			return null;
+		
+		string spath = path.to_string().split(":")[1];
+		
+		return spath.to_int();
+	}
+	
+	/** Context menu for accounts and streams */
+	private bool context_menu(Gdk.EventButton event) {
+		if(event.button != 3)
+			return false;
+		
+		debug("popup");
+		AAccount? account = get_current_account();
+		if(account == null)
+			return false;
+		
+		int? stream_index = get_stream_index();
+		
+		if(stream_index == null) { //display account menu
+			Menu menu = new Menu(); //main popup
+
+			Menu streams_menu = new Menu(); //for streams
+			
+			foreach(StreamEnum stream in account.avaliable_streams().keys) {
+				string label = streams_types.get(stream).name;
+				ImageMenuItem menu_item = new ImageMenuItem.with_label(label);
+				Image img = streams_types.get(stream).get_menu_image();
+				
+				if(img != null)
+					menu_item.set_image(img);
+				
+				menu_item.activate.connect(() => { //add new stream to account
+					account.add_stream(stream, true);
+				});
+				streams_menu.append(menu_item);
+			}
+			
+			MenuItem streams_item = new MenuItem.with_label("Add stream");
+			streams_item.set_submenu(streams_menu);
+			menu.append(streams_item);