mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-26 02:32:35 +01:00
Code Issues Releases Wiki Activity
1,620 Commits 73 Branches 35 Tags
Commit Graph

93 Commits

Author SHA1 Message Date
Jeff Mitchell
18708f7c28 Update qtweetlib; removes need to compile in oauth consumer token/secret and fixes bug needing custom qtweetstatus 2011-05-18 18:02:27 -04:00
Dominik Schmidt
da1089bbd9 Bump jreen submodule version 2011-05-18 22:22:17 +02:00
Jeff Mitchell
43194e777a Add missing file, doh 2011-05-13 12:19:22 -04:00
Jeff Mitchell
08d268a961 Use custom qtweetstatus until a compilation error is fixed upstream 2011-05-13 12:07:06 -04:00
Jeff Mitchell
1f7257e061 Add qtweetlib blocks files 2011-05-13 12:00:59 -04:00
Jeff Mitchell
4b801849d3 Add QTweetLib as a submodule 2011-05-13 11:52:23 -04:00
Jeff Mitchell
ade334dec1 Remove our copy; will use git submodule 2011-05-13 11:50:08 -04:00
Jeff Mitchell
aedc1b362d Fix liblastfm2 mingw32 compilation 2011-05-12 22:35:45 -04:00
Leo Franchi
272a67b703 Immediately update delegate with widget config change 2011-05-11 14:11:15 +02:00
Christian Muehlhaeuser
47158465d9 * Fixed pipeline. Speeds it up, allows for parallel execution of multiple same-weighted resolvers. 2011-05-08 19:12:56 +02:00
Dominik Schmidt
6c8252cefb Bump jreen submodule revision 2011-05-08 15:43:35 +02:00
Jeff Mitchell
a81bca6ce1 Merge remote branch 'origin/master' into leos-crash 
Conflicts:
	src/sip/twitter/twitter.cpp
	src/sip/twitter/twitterconfigwidget.cpp
 2011-05-03 21:58:24 -04:00
Jeff Mitchell
1a1c9a68ed Remove extra liblastfm2 debug 2011-05-03 21:48:14 -04:00
Jeff Mitchell
97ca55fd53 A fix for the introduced crash in liblastfm, ready for more lfranchi debugging 2011-05-03 16:58:10 -04:00
Jeff Mitchell
dd4d268c11 readd possibly crash code 2011-05-03 16:21:27 -04:00
Leo Franchi
ea7e8f6ede Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/libtomahawk/sip/SipPlugin.cpp
	src/resolverconfigdelegate.cpp
	src/sip/jreen/jabber.cpp
	src/sip/jreen/jabber.h
 2011-05-03 16:16:16 -04:00
Leo Franchi
e1aee9b299 Merge branch 'master' of github.com:tomahawk-player/tomahawk 
Conflicts:
	src/libtomahawk/tomahawksettings.cpp
	src/libtomahawk/tomahawksettings.h
	src/sip/jreen/jabber.cpp
	src/sip/jreen/jabber.h
	src/tomahawkapp.cpp
	src/tomahawkwindow.h
	thirdparty/jreen
 2011-05-03 15:56:08 -04:00
Jeff Mitchell
b8bb29161f More debug and a fix 2011-05-03 14:48:17 -04:00
Jeff Mitchell
fe478a0759 Switch around when the oauthtwitter gets its nam and add some debug 2011-05-03 14:18:05 -04:00
Jeff Mitchell
b42e36a240 Add another bit of debug 2011-05-03 13:56:00 -04:00
Jeff Mitchell
e615362672 add more debug 2011-05-03 13:41:24 -04:00
Jeff Mitchell
085e6f11bd A bit more safety -- kind of redundant with the mutex, but doesn't hurt to have it 2011-05-03 08:03:01 -04:00
Dominik Schmidt
92f23bc20b sipjreen: regressions--: subscription handling 
UPDATE JREEN to make it work!
 2011-05-02 17:08:15 +02:00
Dominik Schmidt
0d43d54c3b ugly hacks to make liblastfm compile on windows 2011-05-02 04:04:04 +02:00
Dominik Schmidt
26d383eeab Update to latest jreen with subscription api, some fixes for crashes and proxy support 2011-05-01 22:35:57 +02:00
Jeff Mitchell
7f7c55a293 Only delete qnam objects in liblastfm2 that it creates itself 2011-05-01 10:27:43 -04:00
Jeff Mitchell
032e6f8d6f Update local liblastfm2 to deal better with threads and qnams 2011-05-01 02:22:01 -04:00
Leo Franchi
8d777ff6a9 Initial work towards SIP Factoryizing. Migrates and stuff, too. Config dialog unfinished. 2011-04-25 21:55:26 -04:00
Leo Franchi
dd685d600d Update jreen submodule to newest trunk. 2011-04-23 12:43:45 -04:00
Leo Franchi
519e1bb71e allow to rename playlist when creating via drag 
Merge branch 'master' into sourcelistrefactor

Conflicts:
	src/tomahawkwindow.cpp
 2011-04-22 17:09:23 -04:00
Leo Franchi
127548e3a2 Merge remote-tracking branch 'origin/master' into sourcelistrefactor 
Conflicts:
	src/sourcetree/sourcetreeitem.cpp
	src/sourcetree/sourcetreeview.cpp
	thirdparty/jreen
 2011-04-21 11:32:14 -04:00
Christian Muehlhaeuser
af0b7f9a74 * Merged master into phonon branch. 2011-04-19 00:03:55 +02:00
Dominik Schmidt
5b01ae5268 On default use system jreen package, allow the user to enforce in-tree compilation with -DINTERNAL_JREEN=ON. 2011-04-17 21:25:24 +02:00
Dominik Schmidt
b52b87f818 Updated jreen submodule 2011-04-17 19:49:03 +02:00
Leo Franchi
2f7167037a refactor the sourcetreeitem a bit so an item always exists properly as soon as it is constructed 
that way the model's rowForItem() will work with any just-constructed SourceTreeItem

make the treeview open the playlists when you open the collection.
 2011-04-17 11:50:49 -04:00
Frank Osterfeld
db4fc8bd03 Fix compiler warnings. 2011-04-15 13:46:51 +02:00
Christian Muehlhaeuser
71a3f223c2 * Merged master into branch phonon. 2011-04-15 11:06:26 +02:00
Leo Franchi
3ce41c50bc Don't assert if a scrobble failed, that's no fun. 2011-04-14 10:42:16 -04:00
Jeff Mitchell
3b873dfeda Limit policy setting to 2.8.4 or higher 2011-04-12 11:00:07 -04:00
Jeff Mitchell
0d6c335e45 Suppress warning with newer cmake 2011-04-12 10:53:32 -04:00
Leo Franchi
79542e60e6 Merge branch 'stable' 
Conflicts:
	CMakeLists.txt
 2011-04-11 15:40:07 -04:00
Leo Franchi
24d9cce3a8 Install a .protocol file on KDE so tomahawk:// links work there too 2011-04-11 15:36:29 -04:00
Frank Osterfeld
b6d6969281 pass parent to messageboxes 2011-03-30 19:11:32 +02:00
Dominik Schmidt
f52205d2cc Update jreen plugin to newer jreen and sip plugin interface 2011-03-30 05:05:22 +02:00
Leo Franchi
ecd8b302c4 build liblastfm2 statically on non-win32, and don't build fingerprinter. 
got multiple reports of tomahawk not finding liblastfm2 due to rpath or other issues, and we are building our o ther 3rdparty deps statically like this.
 2011-03-27 22:06:55 -04:00
Leo Franchi
1697b27aca fix compile on osx 
don't use API that doesn't exist in snow leopard---same code is in liblastfmv1. if jono wants to rewrite the path detection code in snow leopard-compatible APIs, we can use that
 2011-03-26 18:29:35 -04:00
Jeff Mitchell
3182df93dd Don't install liblastfm2 headers 2011-03-26 12:25:35 -04:00
Christian Muehlhaeuser
74ea476ad6 Merge remote-tracking branch 'origin/stable' 2011-03-26 02:40:12 +01:00
Leo Franchi
631c39163d don't install a static lib 2011-03-25 17:45:32 -04:00
Jeff Mitchell
6b1bb4da61 Merge remote branch 'origin/master' into liblastfm2 2011-03-25 09:40:56 -04:00