[elvystrac] r1703 - preparation for branch

• From: elvys@xxxxxxxxxxxxxxxxxxxxxx
• To: elvystrac@xxxxxxxxxxxxx
• Date: Wed, 10 Feb 2010 22:18:51 +0100

Author: JirkaH
Date: 2010-02-10 22:18:51 +0100 (Wed, 10 Feb 2010)
New Revision: 1703

Modified:
   trunk/client/elvys-client/Makefile
   trunk/client/elvys-client/elvys-client.pro.user
   trunk/client/elvys-client/src/categorymanager.cpp
Log:
preparation for branch


Modified: trunk/client/elvys-client/Makefile
===================================================================
--- trunk/client/elvys-client/Makefile  2010-02-10 10:31:47 UTC (rev 1702)
+++ trunk/client/elvys-client/Makefile  2010-02-10 21:18:51 UTC (rev 1703)
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: elvys-client
-# Generated by qmake (2.01a) (Qt 4.5.3) on: Fri Feb 5 11:19:35 2010
+# Generated by qmake (2.01a) (Qt 4.5.3) on: Wed Feb 10 10:48:49 2010
 # Project:  elvys-client.pro
 # Template: subdirs
 # Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ -unix 
CONFIG+=debug_and_release -o Makefile elvys-client.pro

Modified: trunk/client/elvys-client/elvys-client.pro.user
===================================================================
--- trunk/client/elvys-client/elvys-client.pro.user     2010-02-10 10:31:47 UTC 
(rev 1702)
+++ trunk/client/elvys-client/elvys-client.pro.user     2010-02-10 21:18:51 UTC 
(rev 1703)
@@ -88,7 +88,7 @@
     <value type="QString" >CONFIG_PROTECT=/usr/share/X11/xkb /var/lib/hsqldb 
/usr/share/config</value>
     <value type="QString" >CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/ 
/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ 
/etc/php/apache2-php5/ext-active/ /etc/udev/rules.d /etc/fonts/fonts.conf 
/etc/gconf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c 
/etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d 
/etc/revdep-rebuild</value>
     <value type="QString" >CVS_RSH=ssh</value>
-    <value type="QString" 
>DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-lFB4NWwryE,guid=a80ce8fe3b43c017eacce48d4b6af5f5</value>
+    <value type="QString" 
>DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-R2PIKvvtlK,guid=115ae8503f718c05610a77224b71a116</value>
     <value type="QString" >DESKTOP_SESSION=KDE-4</value>
     <value type="QString" >DESKTOP_STARTUP_ID=</value>
     <value type="QString" >DISPLAY=:0.0</value>
@@ -127,7 +127,7 @@
     <value type="QString" 
>QT_PLUGIN_PATH=/home/keruom/.kde4/lib/kde4/plugins/:/usr/lib/kde4/plugins/</value>
     <value type="QString" >RUBYOPT=-rauto_gem</value>
     <value type="QString" >R_HOME=/usr/lib/R</value>
-    <value type="QString" 
>SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/6258,unix/LenR61:/tmp/.ICE-unix/6258</value>
+    <value type="QString" 
>SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/7052,unix/LenR61:/tmp/.ICE-unix/7052</value>
     <value type="QString" 
>SGML_CATALOG_FILES=/etc/sgml/sgml-lite.cat:/etc/sgml/openjade-1.3.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/sgml-ent.cat</value>
     <value type="QString" >SHELL=/bin/bash</value>
     <value type="QString" >SHLVL=1</value>
@@ -138,7 +138,7 @@
     <value type="QString" >XCURSOR_THEME=Oxygen_Black</value>
     <value type="QString" >XDG_CONFIG_DIRS=/etc/xdg</value>
     <value type="QString" 
>XDG_DATA_DIRS=/usr/share:/usr/local/share:/usr/share</value>
-    <value type="QString" 
>XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1265300980.687240-1823848348</value>
+    <value type="QString" 
>XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1265738005.664191-1899895014</value>
     <value type="QString" >XDM_MANAGED=method=classic</value>
     <value type="QString" >_=/usr/bin/kdeinit4</value>
    </valuelist>
@@ -165,7 +165,7 @@
     <value type="QString" >CONFIG_PROTECT=/usr/share/X11/xkb /var/lib/hsqldb 
/usr/share/config</value>
     <value type="QString" >CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/ 
/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ 
/etc/php/apache2-php5/ext-active/ /etc/udev/rules.d /etc/fonts/fonts.conf 
/etc/gconf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c 
/etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d 
/etc/revdep-rebuild</value>
     <value type="QString" >CVS_RSH=ssh</value>
-    <value type="QString" 
>DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-lFB4NWwryE,guid=a80ce8fe3b43c017eacce48d4b6af5f5</value>
+    <value type="QString" 
>DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-R2PIKvvtlK,guid=115ae8503f718c05610a77224b71a116</value>
     <value type="QString" >DESKTOP_SESSION=KDE-4</value>
     <value type="QString" >DESKTOP_STARTUP_ID=</value>
     <value type="QString" >DISPLAY=:0.0</value>
@@ -204,7 +204,7 @@
     <value type="QString" 
>QT_PLUGIN_PATH=/home/keruom/.kde4/lib/kde4/plugins/:/usr/lib/kde4/plugins/</value>
     <value type="QString" >RUBYOPT=-rauto_gem</value>
     <value type="QString" >R_HOME=/usr/lib/R</value>
-    <value type="QString" 
>SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/6258,unix/LenR61:/tmp/.ICE-unix/6258</value>
+    <value type="QString" 
>SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/7052,unix/LenR61:/tmp/.ICE-unix/7052</value>
     <value type="QString" 
>SGML_CATALOG_FILES=/etc/sgml/sgml-lite.cat:/etc/sgml/openjade-1.3.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/sgml-ent.cat</value>
     <value type="QString" >SHELL=/bin/bash</value>
     <value type="QString" >SHLVL=1</value>
@@ -215,7 +215,7 @@
     <value type="QString" >XCURSOR_THEME=Oxygen_Black</value>
     <value type="QString" >XDG_CONFIG_DIRS=/etc/xdg</value>
     <value type="QString" 
>XDG_DATA_DIRS=/usr/share:/usr/local/share:/usr/share</value>
-    <value type="QString" 
>XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1265300980.687240-1823848348</value>
+    <value type="QString" 
>XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1265738005.664191-1899895014</value>
     <value type="QString" >XDM_MANAGED=method=classic</value>
     <value type="QString" >_=/usr/bin/kdeinit4</value>
    </valuelist>

Modified: trunk/client/elvys-client/src/categorymanager.cpp
===================================================================
--- trunk/client/elvys-client/src/categorymanager.cpp   2010-02-10 10:31:47 UTC 
(rev 1702)
+++ trunk/client/elvys-client/src/categorymanager.cpp   2010-02-10 21:18:51 UTC 
(rev 1703)
@@ -248,9 +248,9 @@
                return;
        }
 
-       if (cat->toBeDeleted() == false)  {
+       if (cat->toBeDeleted() == false)  {             
                catToDelete.insert(id, true);
-               
QTimer::singleShot(AppConfig::getInstance()->getDocumentPeriod()*100, this, 
SLOT(deleteOldCategories()));
+               
QTimer::singleShot(AppConfig::getInstance()->getDocumentPeriod()/100, this, 
SLOT(deleteOldCategories()));
                return;
        }
 

Other related posts:

• » [elvystrac] r1703 - preparation for branch - elvys

1. Home
2. elvystrac
3. Archive
4. 02-2010

---

• » Previous by Date
• » Next by Date
• » Related Posts
• » View list details
• » Manage your subscription

---