linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Razzloss (razzloss)
------------------------------------------------------------
revno: 415 [merge]
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: linuxdcpp-i18n
timestamp: Fri 2011-01-21 00:15:48 -0600
message:
  Merge with trunk r404
modified:
  SConstruct
  linux/bookentry.cc
  linux/bookentry.hh


--
lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n

Your team LinuxDC++ Team is subscribed to branch lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n/+edit-subscription

=== modified file 'SConstruct'
--- SConstruct	2010-11-28 17:03:04 +0000
+++ SConstruct	2011-01-21 06:15:48 +0000
@@ -18,8 +18,8 @@
 BUILD_LOCALE_PATH = BUILD_PATH + 'locale/'
 
 BUILD_FLAGS = {
-	'common': ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'],
-	'debug': ['-g', '-ggdb', '-Wall'], 
+	'common'  : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'],
+	'debug'   : ['-g', '-ggdb', '-Wall', '-D_DEBUG'], 
 	'release' : ['-O3', '-fomit-frame-pointer', '-DNDEBUG']
 }
 

=== modified file 'linux/bookentry.cc'
--- linux/bookentry.cc	2010-11-10 03:45:41 +0000
+++ linux/bookentry.cc	2011-01-21 06:15:48 +0000
@@ -116,7 +116,7 @@
 	updateLabel_gui();
 
 	// Update the main window title if the current tab is selected.
-	if (isActive_gui())
+	if (isSelected_gui())
 		WulforManager::get()->getMainWindow()->setTitle(getLabelText());
 }
 
@@ -215,6 +215,13 @@
 	return mw->isActive_gui() && mw->currentPage_gui() == getContainer();
 }
 
+bool BookEntry::isSelected_gui() 
+{
+	MainWindow *mw = WulforManager::get()->getMainWindow();
+
+	return mw->currentPage_gui() == getContainer();
+}
+
 void BookEntry::updateLabel_gui()
 {
 	const char *format = "%s";

=== modified file 'linux/bookentry.hh'
--- linux/bookentry.hh	2010-10-11 06:05:22 +0000
+++ linux/bookentry.hh	2011-01-21 06:15:48 +0000
@@ -41,6 +41,7 @@
 		void setUrgent_gui();
 		void setActive_gui();
 		bool isActive_gui();
+		bool isSelected_gui();
 		virtual void show() = 0;
 
 	private: