Merge branch 'cleanup/twitterapi'

ayoy · Oct 26, 2009 · 9f01a83 · 9f01a83
2 parents fcb2410 + 6c1795b
commit 9f01a83
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 194 deletions.
diff --git a/qtwitter-app/src/statuslist.cpp b/qtwitter-app/src/statuslist.cpp
@@ -68,13 +68,15 @@ void StatusListPrivate::init()
     twitterapi->setServiceUrl( account->serviceUrl() );
     twitterapi->setLogin( account->login() );
     twitterapi->setPassword( account->password() );
+#ifdef HAVE_OAUTH
     if ( account->serviceUrl() == Account::NetworkUrlTwitter ) {
         twitterapi->setUsingOAuth( true );
         twitterapi->setConsumerKey( OAuthWizard::ConsumerKey );
         twitterapi->setConsumerSecret( OAuthWizard::ConsumerSecret );
     } else {
         twitterapi->setUsingOAuth( false );
     }
+#endif
 
     connect( twitterapi, SIGNAL(newEntries(EntryList)), this, SLOT(addEntries(EntryList)));
     connect( twitterapi, SIGNAL(deleteEntry(quint64)), this, SLOT(deleteEntry(quint64)) );