[KBear-cvs] kbear/databasedeamon sitemanagerdb.cpp,1.33,1.33.2.1 sitemanagerdbapp.cpp,1.11,1.11.2.1

[<kb...@us...>]

Update of /cvsroot/kbear/kbear/databasedeamon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1539/databasedeamon

Modified Files:
      Tag: KBEAR_2_BRANCH
	sitemanagerdb.cpp sitemanagerdbapp.cpp 
Log Message:
Fixed bug that trashed the system tray

Index: sitemanagerdb.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/databasedeamon/sitemanagerdb.cpp,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -C2 -d -r1.33 -r1.33.2.1
*** sitemanagerdb.cpp	4 Nov 2002 00:08:59 -0000	1.33
--- sitemanagerdb.cpp	21 Oct 2005 19:14:15 -0000	1.33.2.1
***************
*** 45,50 ****
  	kapp->dcopClient()->setDefaultObject( objId() );
  	// create the system tray icon
! 	m_dockWindow = new KSystemTray( kapp->mainWidget(), "SiteManagerDockWindow" );		
! 	m_dockWindow->setPixmap( KGlobal::iconLoader()->loadIcon("kbearsitemanager", KIcon::Small ) );
  
  	/*
--- 45,50 ----
  	kapp->dcopClient()->setDefaultObject( objId() );
  	// create the system tray icon
! //	m_dockWindow = new KSystemTray( kapp->mainWidget(), "SiteManagerDockWindow" );		
! //	m_dockWindow->setPixmap( KGlobal::iconLoader()->loadIcon("kbearsitemanager", KIcon::Small ) );
  
  	/*
***************
*** 715,718 ****
--- 715,719 ----
  void SiteManagerDB::showSystemTrayIcon(bool show) {
  	kdDebug()<<"SiteManagerDB::showSystemTrayIcon="<<show<<endl;
+ /*
  	if( show )
  		m_dockWindow->show();
***************
*** 724,728 ****
  	stream << show;
  	emitDCOPSignal( signal, data );
! }
  //-----------------------------------------------
  void SiteManagerDB::setPlugInKonq(bool plug ) {
--- 725,729 ----
  	stream << show;
  	emitDCOPSignal( signal, data );
! */}
  //-----------------------------------------------
  void SiteManagerDB::setPlugInKonq(bool plug ) {

Index: sitemanagerdbapp.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/databasedeamon/sitemanagerdbapp.cpp,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** sitemanagerdbapp.cpp	23 Jul 2002 21:00:28 -0000	1.11
--- sitemanagerdbapp.cpp	21 Oct 2005 19:14:15 -0000	1.11.2.1
***************
*** 35,39 ****
  //-----------------------------------------------
  SiteManagerDBApp::SiteManagerDBApp()
! 	:	KUniqueApplication( false, true ),
  		m_siteManagerDB( 0L )
  	
--- 35,39 ----
  //-----------------------------------------------
  SiteManagerDBApp::SiteManagerDBApp()
! 	:	KUniqueApplication( true, true, false ),
  		m_siteManagerDB( 0L )