January 2008 - Wine-Commits

Francois Gouget : wwn333: Spelling fixes.
by Jeremy Newman Jan. 23, 2008

Jan. 23, 2008

Module: website Branch: master Commit: fafb510622bf64f631b202ceba42ed1ab9645c13 URL: http://source.winehq.org/git/website.git/?a=commit;h=fafb510622bf64f631b202… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 23 20:13:03 2008 +0100 wwn333: Spelling fixes. --- wwn/wn20071203_333.xml | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/wwn/wn20071203_333.xml b/wwn/wn20071203_333.xml index b4f53fc..a8faffe 100644 --- a/wwn/wn20071203_333.xml +++ b/wwn/wn20071203_333.xml @@ -181,19 +181,19 @@ me, I'm boring. On with the wine! <topic>DirectX</topic> <p><quote who="Roderick Colenbrander"> wined3d: Use native shader limits instead of the maximum the driver can handle -in software. This should prevent software fallbacks and and second it will -allow for ps2.0/ps3.0 detection. +in software. This should prevent software fallbacks and it will +allow for ps2.0/ps3.0 detection.<br/> wined3d: Default to GLSL. This is safe because we now have proper ps2.0/vs2.0 detection. </quote></p> <p> -Its rare for the WWN to highlight individual commits however this one by +It's rare for the WWN to highlight individual commits however this one by Roderick Colenbrander actually could likely have an impact on the average -(gaming) wine user. This patch allows for natural detection and in +(gaming) wine user. This patch allows for natural detection of GLSL and in combination with the <a href="http://source.winehq.org/git/wine.git/?a=commit;h=59eba5cb41d165734468dcab0…">following -commit:</a> we now have the registry key "useGLSL" set to "enabled" by +commit</a>, we now have the registry key "useGLSL" set to "enabled" by default. This should mean that for many of us playing games such as <a href='http://appdb.winehq.org/objectManager.php?sClass=application&iId=3150'>Elder Scrolls IV: Oblivion</a> may no longer have to set that key explicitly! @@ -216,7 +216,7 @@ Scrolls IV: Oblivion</a> may no longer have to set that key explicitly! posts="7" > <topic>Applications</topic> -<p>We all know that of the many uses for wine gaming is one of the more +<p>We all know that of the many uses for wine, gaming is one of the more popular ones. But just how many actual gamers are there using wine to play their favorite games? Well, lucky for us Valve has begun to conduct surveys of the hardware and software configurations of people using their Steam @@ -245,7 +245,7 @@ like the Wine one. If even only a quarter of these "others" are using Wine, that still gives us 1% of the entire 10 million+ Steam user base, translating into hundreds of thousands of users. </p></quote></p><p> -As you can see, its actually non-trivial to determine who uses wine simply +As you can see, it's actually non-trivial to determine who uses wine simply from the drivers and such reported by the Steam survey. However we seem to have caught a lucky break with the sound driver:</p> <p><quote who="Stefan Dosinger"><pre> @@ -294,7 +294,7 @@ The numbers are now 0.13% of total reports coming from Wine users. Unfortunately many of the dev's were out stuffing themselves with turkey and hence a release last week made no sense. However, this week has come and we have 0.9.50:</p> -<p><quote who="Alexander Juillard"><pre> +<p><quote who="Alexandre Julliard"><pre> Wine 0.9.50 was released today, with the following main changes: * Completed I/O completion. @@ -325,7 +325,7 @@ packages for your distribution. <topic>Code</topic> <p>Kai Blin brings up the topic of planning out this summer's Google Summer of Code projects. The problem, he explains, is that projects were not -extremly well defined and communication was not as good as it could have +extremely well defined and communication was not as good as it could have been. All easily solvable.</p> <p><quote who="Kai Blin"> Hi folks,<br /> @@ -399,15 +399,15 @@ certainly would have been used and been a great resource. </section> <section - title="Transgaming giving back to WINE" - subject="Transgaming" + title="TransGaming giving back to WINE" + subject="TransGaming" archive="http://www.winehq.org/pipermail/wine-devel/2007-November/060705.html" posts="4" > <topic>Code</topic> -<p>Gavriel State of Transgaming has been hanging around on one of wine's IRC +<p>Gavriel State of TransGaming has been hanging around on one of wine's IRC Channels (#winehackers) and in a conversation with Kai Blin actually offered -code for something Transgaming has already begun to implement: +code for something TransGaming has already begun to implement: </p> <p><quote author="Gavrial State"> Hi all,<br />

1 0

Alexander Nicolaysen Sørnes : test_om_objects: Extend objectGetEntries test
by Chris Morgan Jan. 23, 2008

Jan. 23, 2008

Module: appdb Branch: master Commit: d8c67b4740e636ff0f7c5e9d380c6a481d1c120e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d8c67b4740e636ff0f7c5e9d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 15:10:49 2008 +0100 test_om_objects: Extend objectGetEntries test --- include/downloadurl.php | 5 ++++ include/note.php | 14 +++++++++++ unit_test/test_om_objects.php | 50 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 66 insertions(+), 3 deletions(-) diff --git a/include/downloadurl.php b/include/downloadurl.php index 91c5f47..68c35fd 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -437,6 +437,11 @@ class downloadurl return appData::objectGetEntries($sState, $iRows, $iStart, 'downloadurl'); } + function objectGetEntriesCount($sState) + { + return appData::objectGetEntriesCount($sState, 'downloadurl'); + } + function objectGetHeader() { return appData::objectGetHeader("downloadurl"); diff --git a/include/note.php b/include/note.php index b5a7a9e..0e640b9 100644 --- a/include/note.php +++ b/include/note.php @@ -327,6 +327,20 @@ class Note { return $hResult; } + function objectGetEntriesCount($sState) + { + $sQuery = "SELECT COUNT(DISTINCT noteId) as count FROM appNotes"; + $hResult = query_parameters($sQuery); + + if(!$hResult) + return false; + + if(($oRow = mysql_fetch_object($hResult))) + return $oRow->count; + + return false; + } + //TODO: not sure how to best let users view a table of notes // since the note contents could be very long we would only // want to show a small amount of the text. Implement this diff --git a/unit_test/test_om_objects.php b/unit_test/test_om_objects.php index 5531d06..a1d7c23 100644 --- a/unit_test/test_om_objects.php +++ b/unit_test/test_om_objects.php @@ -97,9 +97,7 @@ function test_class($sClassName, $aTestMethods) { switch($sMethod) { - /* Should also test for queued entries, but vendor does not support - queueing yet */ - case "objectGetEntries": + case 'objectGetEntries': if(!$oTestObject = create_object($sClassName, $oUser)) return FALSE; @@ -115,8 +113,38 @@ function test_class($sClassName, $aTestMethods) return FALSE; } + /* Create an object as a regular user */ + $oTestObject2 = create_object($sClassName, $oUser, false); + + /* objectGetEntries() and objectGetEntriesCount() should return matching results */ + $iExpected = mysql_num_rows($oTestObject2->objectGetEntries('accepted')); + $iReceived = $oTestObject2->objectGetEntriesCount('accepted'); + if($iExpected != $iReceived) + { + error("ObjectGetEntriesCount returned $iReceived, objectGetEntries fetched $iExpected rows\n"); + error("FAILED\t\t$sClassName::$sMethod"); + cleanup_and_purge($oTestObject, $oUser); + cleanup_and_purge($oTestObject2, $oUser); + return false; + } + + /* Now test for queued objects, as admin */ + $oUser->addPriv('admin'); + $iExpected = mysql_num_rows($oTestObject2->objectGetEntries('queued')); + $iReceived = $oTestObject2->objectGetEntriesCount('queued'); + $oUser->delPriv('admin'); + if($iExpected != $iReceived) + { + error("ObjectGetEntriesCount returned $iReceived, objectGetEntries fetched $iExpected rows\n"); + error("FAILED\t\t$sClassName::$sMethod"); + cleanup_and_purge($oTestObject, $oUser); + cleanup_and_purge($oTestObject2, $oUser); + return false; + } + /* Class specific clean-up */ cleanup_and_purge($oTestObject, $oUser); + cleanup_and_purge($oTestObject2, $oUser); echo "PASSED\t\t$sClassName::$sMethod\n"; break; @@ -190,6 +218,14 @@ function cleanup_and_purge($oObject, $oUser) cleanup($oObject); $oObject->purge(); + switch(get_class($oObject)) + { + case 'application': + $oVendor = new vendor($oObject->iVendorId); + $oVendor->purge(); + break; + } + if(!$bWasAdmin) $oUser->delPriv('admin'); } @@ -203,6 +239,13 @@ function create_object($sClassName, $oUser, $bAsAdmin = true) /* Set up one test entry, depending on class */ switch($sClassName) { + // Some application functions require a vendor to be set + case 'application': + $oVendor = new vendor(); + $oVendor->create(); + $oTestObject->iVendorId = $oVendor->objectGetId(); + break; + case "bug": // create a bug in the bugzilla database, we need a valid // bug id to create a bug entry @@ -304,6 +347,7 @@ function test_object_methods() "mustBeQueued", "objectGetChildren", "objectGetEntries", + 'objectGetEntriesCount', "objectGetHeader", "objectGetId", "objectGetMail",

1 0

Alexander Nicolaysen Sørnes : test_om_objects: Cleanup properly when testing objectGetEntries
by Chris Morgan Jan. 23, 2008

Jan. 23, 2008

Module: appdb Branch: master Commit: 55d9f32c0a50aac2aaa63b04e5e50e676ab2fc81 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=55d9f32c0a50aac2aaa63b04… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 14:28:19 2008 +0100 test_om_objects: Cleanup properly when testing objectGetEntries --- unit_test/test_om_objects.php | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/unit_test/test_om_objects.php b/unit_test/test_om_objects.php index 26c2081..5531d06 100644 --- a/unit_test/test_om_objects.php +++ b/unit_test/test_om_objects.php @@ -111,13 +111,12 @@ function test_class($sClassName, $aTestMethods) { error("Got $iReceived instead of >= $iExpected"); error("FAILED\t\t$sClassName::$sMethod"); - $oTestObject->purge(); + cleanup_and_purge($oTestObject, $oUser); return FALSE; } /* Class specific clean-up */ - cleanup($oTestObject); - $oTestObject->purge(); + cleanup_and_purge($oTestObject, $oUser); echo "PASSED\t\t$sClassName::$sMethod\n"; break; @@ -183,6 +182,18 @@ function cleanup($oObject) } } +function cleanup_and_purge($oObject, $oUser) +{ + $bWasAdmin = $oUser->hasPriv('admin'); + + $oUser->addPriv('admin'); + cleanup($oObject); + $oObject->purge(); + + if(!$bWasAdmin) + $oUser->delPriv('admin'); +} + function create_object($sClassName, $oUser, $bAsAdmin = true) { if($bAsAdmin)

1 0

Francois Gouget : wwn335: Fix stray CRLF line endings, EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful .
by Jeremy Newman Jan. 23, 2008

Jan. 23, 2008

Module: website Branch: master Commit: 44ba86a3bf0f0da5842c320a5bda695d0d7c58f0 URL: http://source.winehq.org/git/website.git/?a=commit;h=44ba86a3bf0f0da5842c32… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 18 13:06:16 2008 +0100 wwn335: Fix stray CRLF line endings, EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful. --- wwn/wn20071217_335.xml | 88 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 68 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=44ba86a3bf0f0da584…

1 0

Francois Gouget : wwn334: Fix stray CRLF line endings, EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful .
by Jeremy Newman Jan. 23, 2008

Jan. 23, 2008

Module: website Branch: master Commit: fed1c91abf5e209872b9266917f6094e4e5bf78f URL: http://source.winehq.org/git/website.git/?a=commit;h=fed1c91abf5e209872b926… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 18 13:00:10 2008 +0100 wwn334: Fix stray CRLF line endings, EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful. --- wwn/wn20071210_334.xml | 717 +++++++++++++++++++++++++++--------------------- 1 files changed, 400 insertions(+), 317 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=fed1c91abf5e209872…

1 0

Francois Gouget : wwn333: Fix stray CRLF line endings, EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful .
by Jeremy Newman Jan. 23, 2008

Jan. 23, 2008

Module: website Branch: master Commit: b95f8a1dc1bd7e45753a752bb2721c53c1d4286f URL: http://source.winehq.org/git/website.git/?a=commit;h=b95f8a1dc1bd7e45753a75… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 18 13:03:11 2008 +0100 wwn333: Fix stray CRLF line endings, EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful. --- wwn/wn20071203_333.xml | 889 ++++++++++++++++++++++++++---------------------- 1 files changed, 475 insertions(+), 414 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=b95f8a1dc1bd7e4575…

1 0

Alexander Nicolaysen Sørnes : test_om_objects: Test unQueue()
by Chris Morgan Jan. 23, 2008

Jan. 23, 2008

Module: appdb Branch: master Commit: 1f081f4be1e15f9a62d0fd7ae9e89c3e63cae5ee URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1f081f4be1e15f9a62d0fd7a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 14:18:43 2008 +0100 test_om_objects: Test unQueue() --- include/application_queue.php | 5 ++++ include/bugs.php | 5 ++++ include/downloadurl.php | 5 ++++ include/maintainer.php | 5 ++++ include/monitor.php | 11 ++++++++++ include/note.php | 10 +++++++++ include/screenshot.php | 5 ++++ include/testData_queue.php | 5 ++++ include/version_queue.php | 5 ++++ unit_test/test_om_objects.php | 45 ++++++++++++++++++++++++++++++++++++++-- 10 files changed, 98 insertions(+), 3 deletions(-) diff --git a/include/application_queue.php b/include/application_queue.php index 82c8383..5727a28 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -259,6 +259,11 @@ class application_queue return $sErrors; } + function objectGetState() + { + return $this->oApp->objectGetState(); + } + function canEdit() { return $this->oApp->canEdit(); diff --git a/include/bugs.php b/include/bugs.php index 34cdd5d..a65caa5 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -462,6 +462,11 @@ class Bug return $sLink; } + function objectGetState() + { + return ($this->bQueued) ? 'queued' : 'accepted'; + } + function canEdit() { if($_SESSION['current']->hasPriv("admin")) diff --git a/include/downloadurl.php b/include/downloadurl.php index c4346ef..91c5f47 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -249,6 +249,11 @@ class downloadurl return TRUE; } + function objectGetState() + { + return ($this->bQueued) ? 'queued' : 'accepted'; + } + function canEdit($iVersionId = NULL) { if($_SESSION['current']->hasPriv("admin") || diff --git a/include/maintainer.php b/include/maintainer.php index 3449b80..4ad898b 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -675,6 +675,11 @@ class maintainer echo "</td></tr></table></div>\n\n"; } + function objectGetState() + { + return $this->sState; + } + function canEdit() { if($_SESSION['current']->hasPriv("admin") || $this->iUserId == $_SESSION['current']->iUserId) diff --git a/include/monitor.php b/include/monitor.php index 7726fb6..afa724d 100644 --- a/include/monitor.php +++ b/include/monitor.php @@ -107,6 +107,11 @@ class Monitor { return TRUE; } + function unQueue() + { + return true; // We don't queue monitors + } + function objectGetSubmitterId() { return $this->iUserId; @@ -226,6 +231,12 @@ class Monitor { mail_appdb($sEmail, $sSubject ,$sMsg); } + function objectGetState() + { + // We don't queue monitors + return 'accepted'; + } + function canEdit() { if($_SESSION['current']->hasPriv("admin") || diff --git a/include/note.php b/include/note.php index 0535a9e..b5a7a9e 100644 --- a/include/note.php +++ b/include/note.php @@ -77,6 +77,11 @@ class Note { } + function unQueue() + { + return true; // We don't queue notes + } + /** * Update note. * Returns true on success and false on failure. @@ -372,6 +377,11 @@ class Note { return $sLink; } + function objectGetState() + { + return 'accepted'; // We don't queue notes + } + // users can edit the note if they: // - have "admin" privileges // - maintain the version, or supermaintain the application that diff --git a/include/screenshot.php b/include/screenshot.php index b0c6ca2..6838814 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -665,6 +665,11 @@ class screenshot return appData::objectGetHeader("screenshot"); } + function objectGetState() + { + return ($this->bQueued) ? 'queued' : 'accepted'; + } + function canEdit() { if($this) diff --git a/include/testData_queue.php b/include/testData_queue.php index e08f756..7831015 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -122,6 +122,11 @@ class testData_queue return $this->oTestData->checkOutputEditorInput($aClean); } + function objectGetState() + { + return $this->oTestData->objectGetState(); + } + function canEdit() { return $this->oTestData->canEdit(); diff --git a/include/version_queue.php b/include/version_queue.php index c29916b..08e9a69 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -205,6 +205,11 @@ class version_queue return $sErrors; } + function objectGetState() + { + return $this->oVersion->objectGetState(); + } + function canEdit() { return $this->oVersion->canEdit(); diff --git a/unit_test/test_om_objects.php b/unit_test/test_om_objects.php index 404100f..26c2081 100644 --- a/unit_test/test_om_objects.php +++ b/unit_test/test_om_objects.php @@ -121,6 +121,30 @@ function test_class($sClassName, $aTestMethods) echo "PASSED\t\t$sClassName::$sMethod\n"; break; + case 'unQueue': + $bSuccess = true; + $oTestObject = create_object($sClassName, $oUser, false); + + $oUser->addPriv('admin'); + $oTestObject->unQueue(); + + $iReceived = $oTestObject->objectGetState(); + $iExpected = 'accepted'; + if($iReceived != $iExpected) + { + error("Got queue state of $iReceived instead of $iExpected\n"); + error("FAILED\t\t$sClassName::$sMethod"); + $bSuccess = false; + } + cleanup($oTestObject); + $oTestObject->purge(); + $oUser->delPriv('admin'); + + if(!$bSuccess) + return $bSuccess; + + echo "PASSED\t\t$sClassName::$sMethod\n"; + break; } } @@ -159,9 +183,11 @@ function cleanup($oObject) } } -function create_object($sClassName, $oUser) +function create_object($sClassName, $oUser, $bAsAdmin = true) { - $oUser->addPriv("admin"); + if($bAsAdmin) + $oUser->addPriv("admin"); + $oTestObject = new $sClassName(); /* Set up one test entry, depending on class */ switch($sClassName) @@ -188,7 +214,15 @@ function create_object($sClassName, $oUser) $oTestObject->iVersionId = create_version_and_parent_app("create_object_downloadurl"); break; case "maintainer": + /* We create the version as admin anyway to avoid the maintainer entry getting a state of 'pending' */ + if(!$bAsAdmin) + $oUser->addPriv('admin'); + $iVersionId = create_version_and_parent_app("create_object_maintainer"); + + if(!$bAsAdmin) + $oUser->delPriv('admin'); + $oVersion = new version($iVersionId); $oTestObject->iUserId = $oUser->iUserId; $oTestObject->iAppId = $oVersion->iAppId; @@ -242,6 +276,9 @@ function create_object($sClassName, $oUser) $oTestObject->iScreenshotId = query_appdb_insert_id(); } + if($bAsAdmin) + $oUser->delPriv('admin'); + return $oTestObject; } @@ -260,12 +297,14 @@ function test_object_methods() "objectGetId", "objectGetMail", "objectGetMailOptions", + 'objectGetState', "objectGetSubmitterId", "objectGetTableRow", "objectMakeLink", "objectMakeUrl", "outputEditor", - "purge" + 'purge', + 'unQueue' ); $aTestClasses = array("application",

1 0

Alexander Nicolaysen Sørnes : vendor: Update sState mmeber on successful unQueue()
by Chris Morgan Jan. 23, 2008

Jan. 23, 2008

Module: appdb Branch: master Commit: 70c992a37987254ebe015f7b3cf3589d1d3e2ba2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=70c992a37987254ebe015f7b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 14:18:17 2008 +0100 vendor: Update sState mmeber on successful unQueue() --- include/vendor.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index a0d7cad..2cb80b6 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -114,6 +114,8 @@ class Vendor { if(!$hResult) return FALSE; + $this->sState = 'accepted'; + return TRUE; }

1 0

Alexander Nicolaysen Sørnes : Fix AppDB stats page
by Chris Morgan Jan. 23, 2008

Jan. 23, 2008

Module: appdb Branch: master Commit: 663894bed4ba8d66174de63b2cbdb7815902ddd5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=663894bed4ba8d66174de63b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 15:17:33 2008 +0100 Fix AppDB stats page --- appdbStats.php | 12 ++++++------ include/maintainer.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appdbStats.php b/appdbStats.php index d3dcef2..0915839 100644 --- a/appdbStats.php +++ b/appdbStats.php @@ -60,13 +60,13 @@ echo "</tr>\n\n"; /* Display the number of application familes */ echo "<tr class=color4>\n"; echo " <td>Application families:</td>\n"; -echo " <td>".application::objectGetEntriesCount(false, false)."</td>\n"; +echo " <td>".application::objectGetEntriesCount('accepted')."</td>\n"; echo "</tr>\n\n"; /* Display the number of versions */ echo "<tr class=color4>\n"; echo " <td>Versions:</td>\n"; -echo " <td>".version::objectGetEntriesCount(false, false)."</td>\n"; +echo " <td>".version::objectGetEntriesCount('accepted')."</td>\n"; echo "</tr>\n\n"; /* Display the number of application maintainers */ @@ -75,16 +75,16 @@ echo " <td>Application maintainers:</td>\n"; echo " <td>".Maintainer::getNumberOfMaintainers()."</td>\n"; echo "</tr>\n\n"; -/* Display the number of testing reports */ +/* Display the number of test reports */ echo "<tr class=color4>\n"; -echo " <td>Testing reports:</td>\n"; -echo " <td>".testData::objectGetEntriescount(false, false)."</td>\n"; +echo " <td>Test reports:</td>\n"; +echo " <td>".testData::objectGetEntriescount('accepted')."</td>\n"; echo "</tr>\n\n"; /* Display the number of images */ echo "<tr class=color4>\n"; echo " <td>Screenshots:</td>\n"; -echo " <td>".appData::objectGetEntriesCount("false", false, "screenshot")."</td>\n"; +echo " <td>".screenshot::objectGetEntriesCount('accepted')."</td>\n"; echo "</tr>\n\n"; echo "</table>\n\n"; diff --git a/include/maintainer.php b/include/maintainer.php index b886d4a..3449b80 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -514,7 +514,7 @@ class maintainer /* see how many unique maintainers we actually have */ function getNumberOfMaintainers() { - $hResult = query_parameters("SELECT DISTINCT userId FROM appMaintainers WHERE queued='false';"); + $hResult = query_parameters("SELECT DISTINCT userId FROM appMaintainers WHERE state='accepted';"); return query_num_rows($hResult); }

1 0

Alexander Nicolaysen Sørnes : maintainer : Update sState member on successful unQueue
by Chris Morgan Jan. 23, 2008

Jan. 23, 2008

Module: appdb Branch: master Commit: b6d2c560e7ac88828d1b11a92bb46f0d06f817b9 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b6d2c560e7ac88828d1b11a9… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 23 14:17:31 2008 +0100 maintainer: Update sState member on successful unQueue --- include/maintainer.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 61e6b6b..b886d4a 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -281,6 +281,7 @@ class maintainer mail_appdb($sEmail, $sSubject ,$sMsg); } + $this->sState = 'accepted'; } } else {

1 0