Hello andreip,
I'd like you to do a code review. Please execute
g4 diff -c 9976655
or point your web browser to
http://mondrian/9976655
to review the following code:
Change 9976655 by stevebl...@steveblock-gears1 on 2009/02/03 14:36:36 *pending*
Fixes shortcuts on non-WIN32 platforms, broken by CL 9687353.
This is a response to bug 806.
Mailed on behalf of [email protected].
R=andreip
[email protected],[email protected]
DELTA=6 (6 added, 0 deleted, 0 changed)
OCL=9976655
Affected files ...
... //depot/googleclient/gears/opensource/gears/desktop/desktop.cc#74 edit
6 delta lines: 6 added, 0 deleted, 0 changed
Also consider running:
g4 lint -c 9976655
which verifies that the changelist doesn't introduce new style violations.
If you can't do the review, please let me know as soon as possible. During
your review, please ensure that all new code has corresponding unit tests and
that existing unit tests are updated appropriately. Visit
http://www/eng/code_review.html for more information.
This is a semiautomated message from "g4 mail". Complaints or suggestions?
Mail [email protected].
Change 9976655 by stevebl...@steveblock-gears1 on 2009/02/03 14:36:36 *pending*
Fixes shortcuts on non-WIN32 platforms, broken by CL 9687353.
This is a response to bug 806.
Mailed on behalf of [email protected].
Affected files ...
... //depot/googleclient/gears/opensource/gears/desktop/desktop.cc#74 edit
==== //depot/googleclient/gears/opensource/gears/desktop/desktop.cc#74 -
c:\MyDocs\Gears1/googleclient/gears/opensource/gears/desktop/desktop.cc ====
# action=edit type=text
--- googleclient/gears/opensource/gears/desktop/desktop.cc 2009-02-03
15:15:45.000000000 +0000
+++ googleclient/gears/opensource/gears/desktop/desktop.cc 2009-02-03
14:32:51.000000000 +0000
@@ -288,10 +288,16 @@
// value of SHORTCUT_LOCATION_NONE, so we set the correct value here.
SHORTCUT_LOCATION_STARTMENU;
#else
+#if defined(LINUX)
+ // for linux we only support SHORTCUT_LOCATION_DESKTOP now.
+ // See gears/ui/common/shortcuts_dialog.html_m4:244
+ SHORTCUT_LOCATION_DESKTOP;
+#else
SHORTCUT_LOCATION_NONE;
if (shortcuts_dialog->result["locations"].asInt()) {
locations = shortcuts_dialog->result["locations"].asInt();
}
+#endif
#endif
if (!SetShortcut(shortcut_info, allow, permanently, locations, &error_)) {
