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 |
|
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 |
|
Leo Franchi
|
811ac70fa6
|
fix config rect handling
|
2011-05-03 18:04:27 -04:00 |
|
Leo Franchi
|
63738b58c0
|
disable inline factories and use +/- button for now
|
2011-05-03 17:49:43 -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 |
|
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 |
|
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 |
|
Leo Franchi
|
48246e9ec1
|
more build fixes
|
2011-05-03 13:49:55 -04:00 |
|
Leo Franchi
|
93212251b6
|
fix build
|
2011-05-03 13:47:57 -04:00 |
|
Dominik Schmidt
|
d4109d8575
|
Remove warnings (aka make it compile with -Werror)
|
2011-05-03 19:40:51 +02: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 |
|
Leo Franchi
|
aff34374cb
|
update when new playlists are reset
|
2011-05-02 18:58:06 -04:00 |
|
Leo Franchi
|
1bb69c0fc9
|
add Open command to url handling
|
2011-05-02 18:56:30 -04:00 |
|
Leo Franchi
|
bbbd1a48bb
|
add new welcomeplaylistmodel
|
2011-05-02 18:22:40 -04:00 |
|
Leo Franchi
|
1bde1fe1bb
|
fix indenting
|
2011-05-02 18:22:25 -04:00 |
|
Leo Franchi
|
40d3b87af5
|
make welcomewidget and recently played playlist behave
|
2011-05-02 18:22:16 -04:00 |
|
Leo Franchi
|
59d72df046
|
Merge remote-tracking branch 'origin/master' into cleanmaster
|
2011-05-02 16:29:42 -04:00 |
|
Jeff Mitchell
|
58692f424d
|
Fix condition where duplicate connections could happen from twitter
|
2011-05-02 16:27:34 -04:00 |
|
Dominik Schmidt
|
81065243f4
|
sipjreen: regressions--: handle server and port settings correctly
|
2011-05-02 22:11:47 +02:00 |
|
Dominik Schmidt
|
92f23bc20b
|
sipjreen: regressions--: subscription handling
UPDATE JREEN to make it work!
|
2011-05-02 17:08:15 +02:00 |
|
Jeff Mitchell
|
9ed8caf277
|
Use liblastfm NAC in infosystemworker too, if available
|
2011-05-02 10:14:59 -04:00 |
|
Leo Franchi
|
68a3df17c4
|
change around some commands
|
2011-05-02 09:13:21 -04:00 |
|
Leo Franchi
|
55be3010e5
|
work on new welcome widget
|
2011-05-02 09:13:21 -04:00 |
|
Dominik Schmidt
|
e8be8e95b5
|
Weird, where did this come from?!
|
2011-05-02 04:07:31 +02:00 |
|
Dominik Schmidt
|
819fc4881e
|
Merge branch 'master' of git://github.com/tomahawk-player/tomahawk
|
2011-05-02 04:04:12 +02:00 |
|
Dominik Schmidt
|
0d43d54c3b
|
ugly hacks to make liblastfm compile on windows
|
2011-05-02 04:04:04 +02:00 |
|
Leo Franchi
|
6340b82921
|
Use a unique bookmarks playlist guid
|
2011-05-01 21:07:45 -04:00 |
|
Dominik Schmidt
|
d6c73e44e0
|
sipjreen: regressions--: update menu correctly
|
2011-05-02 01:37:27 +02:00 |
|
Dominik Schmidt
|
ea159cb2f4
|
sipjreen: warnings--
|
2011-05-02 00:05:15 +02:00 |
|
Dominik Schmidt
|
a8441ffb4c
|
sipjreen: regressions--: request subscription when adding someone to the roster
|
2011-05-01 23:30:18 +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 |
|