Jeff Mitchell
|
f4508fc79a
|
Properly delete scanner in-thread
|
2011-05-03 22:13:16 -04: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
|
bcfea87607
|
Remove more extra debugging, and fix a couple omissions
|
2011-05-03 21:53:39 -04:00 |
|
Jeff Mitchell
|
1a1c9a68ed
|
Remove extra liblastfm2 debug
|
2011-05-03 21:48:14 -04:00 |
|
Leo Franchi
|
7d1067dafa
|
fix some crashes
|
2011-05-03 19:37:58 -04:00 |
|
Leo Franchi
|
ea5cefd2d4
|
Auto-create zeroconf plugin with new installs
Actually save no-config-widget plugins to settings too
|
2011-05-03 19:17:00 -04:00 |
|
Leo Franchi
|
81fe1c8061
|
allow factories to be marked as unique
|
2011-05-03 19:10:36 -04:00 |
|
Jeff Mitchell
|
33530084b0
|
Properly delete infosystem objects in the correct thread
|
2011-05-03 18:44:09 -04:00 |
|
Leo Franchi
|
7be0cdb714
|
show zeroconf icon
|
2011-05-03 18:42:46 -04:00 |
|
Leo Franchi
|
3b734df57e
|
tweak icons, make things work more
|
2011-05-03 18:41:01 -04:00 |
|
Jeff Mitchell
|
eb31702711
|
More debug
|
2011-05-03 18:06:42 -04:00 |
|
Leo Franchi
|
811ac70fa6
|
fix config rect handling
|
2011-05-03 18:04:27 -04:00 |
|
Jeff Mitchell
|
7f26f34fdd
|
Revamp how the plugins interact with the infosystemworker
|
2011-05-03 18:00:14 -04:00 |
|
Leo Franchi
|
63738b58c0
|
disable inline factories and use +/- button for now
|
2011-05-03 17:49:43 -04:00 |
|
Jeff Mitchell
|
de28596438
|
We're making progress...move back into a thread
|
2011-05-03 17:06:04 -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 |
|
Leo Franchi
|
52c2fd2a5a
|
spacing tweaks, they will never end
|
2011-05-03 16:50:30 -04:00 |
|
Leo Franchi
|
c72f6cf508
|
fix merge config changes
|
2011-05-03 16:38:45 -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
|
a8ad8cd774
|
I can haz lfranchi crash fix?
|
2011-05-03 14:34:31 -04:00 |
|
Jeff Mitchell
|
e802201341
|
Merge branch 'master' into leos-crash
|
2011-05-03 14:18:12 -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 |
|
Dominik Schmidt
|
7a595aaa76
|
remove last warning ;-)
|
2011-05-03 20:00:49 +02:00 |
|
Leo Franchi
|
e001c6a197
|
more build fixes
|
2011-05-03 13:56:26 -04:00 |
|
Jeff Mitchell
|
b42e36a240
|
Add another bit of debug
|
2011-05-03 13:56:00 -04:00 |
|
Leo Franchi
|
48246e9ec1
|
more build fixes
|
2011-05-03 13:49:55 -04:00 |
|
Jeff Mitchell
|
3b84824f11
|
Gah our startup is so breaky.
|
2011-05-03 13:49:10 -04:00 |
|
Leo Franchi
|
93212251b6
|
fix build
|
2011-05-03 13:47:57 -04:00 |
|
Jeff Mitchell
|
e615362672
|
add more debug
|
2011-05-03 13:41:24 -04:00 |
|
Dominik Schmidt
|
d4109d8575
|
Remove warnings (aka make it compile with -Werror)
|
2011-05-03 19:40:51 +02:00 |
|
Jeff Mitchell
|
8b2ce768d1
|
Move scrobbler init far down where it belongs
|
2011-05-03 13:13:04 -04:00 |
|
Jeff Mitchell
|
e6819d48a8
|
Move nam init further up
|
2011-05-03 13:08:04 -04:00 |
|
Jeff Mitchell
|
44173808cb
|
Hopefully fix startup crash in single-threaded infosystemworker mode
|
2011-05-03 12:36:23 -04:00 |
|
Dominik Schmidt
|
6239f90cf0
|
sipjreen: remove unneeded m_connected state - m_client knows better about it
|
2011-05-03 17:12:54 +02:00 |
|
Dominik Schmidt
|
117bff483d
|
Add setProxy() method to SipPlugin interface
|
2011-05-03 16:53:29 +02:00 |
|
Dominik Schmidt
|
5b961e1a58
|
sipjreen: fix build
|
2011-05-03 16:12:32 +02:00 |
|
Dominik Schmidt
|
2772e69a40
|
sipjreen: implement setProxy()
|
2011-05-03 15:58:47 +02:00 |
|
Dominik Schmidt
|
99563bfde6
|
sipjreen: constify parameters in SipMessageExtension
|
2011-05-03 15:22:43 +02:00 |
|
Dominik Schmidt
|
137c608fa2
|
sipjreen: hopefully fix a bug that could happen with visible:false peers
|
2011-05-03 15:22:43 +02:00 |
|
Jeff Mitchell
|
7330c9364d
|
Add debug towards figuring out leo's crash
|
2011-05-03 08:33:21 -04:00 |
|
Jeff Mitchell
|
bbfd4c91e7
|
Fix scrobbling. Thanks lfranchi for being my rubber duck.
|
2011-05-03 08:03:17 -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 |
|
Leo Franchi
|
5b0ed433f5
|
fix recent playlists
|
2011-05-02 23:05:59 -04:00 |
|
Leo Franchi
|
bc1ce656ae
|
quiet up debug
|
2011-05-02 22:29:29 -04:00 |
|
Leo Franchi
|
8b95f7330b
|
also send args on first startup, not completely working
|
2011-05-02 22:17:53 -04:00 |
|
Leo Franchi
|
0f47027c9c
|
Cache playlist guids to speed up reloading
|
2011-05-02 22:14:45 -04:00 |
|
Leo Franchi
|
aec8c97eac
|
Add context menu item to create track links
|
2011-05-02 22:05:29 -04:00 |
|