A lice-sized code review (suzhe localrev 1625)

[jame...@gmail.com]

Hello phnixwxz,

I'd like you to do a code review. Please review the following patch:

----------------------------------------------------------------------
r1625: suzhe | 2010-01-18 16:15:17 +0800

- Fix test XMLHttpRequest.AbortAfterFinished of soup-xml-http-request extension.
- Apply patch of issue 336: Show Qt / Gtk shortcuts in the respective desktop environments
----------------------------------------------------------------------

=== extensions/soup_xml_http_request/tests/soup_xml_http_request_test.cc
==================================================================
--- extensions/soup_xml_http_request/tests/soup_xml_http_request_test.cc (revision 1624)
+++ extensions/soup_xml_http_request/tests/soup_xml_http_request_test.cc (revision 1625)
@@ -617,7 +617,7 @@
ASSERT_EQ(XMLHttpRequestInterface::NO_ERR,
request->SetRequestHeader("TestHeader", "TestHeaderValue"));
ASSERT_EQ(XMLHttpRequestInterface::OPENED, request->GetReadyState());
- ASSERT_EQ(XMLHttpRequestInterface::ABORT_ERR, request->Send(std::string()));
+ ASSERT_EQ(XMLHttpRequestInterface::NO_ERR, request->Send(std::string()));
// no additional readystatechange signal.
ASSERT_EQ(5, callback.callback_count_);
ASSERT_TRUE(callback.aborted_);
=== extensions/soup_xml_http_request/tests/Makefile.am
==================================================================
--- extensions/soup_xml_http_request/tests/Makefile.am (revision 1624)
+++ extensions/soup_xml_http_request/tests/Makefile.am (revision 1625)
@@ -22,6 +22,7 @@
-I$(top_srcdir)

LDADD = $(PTHRREAD_LIBS) \
+ $(GTK2_LIBS) \
$(top_builddir)/unittest/libgtest.la \
$(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la \
$(top_builddir)/ggadget/gtk/libggadget-gtk@GGL_EPOCH@.la
=== hosts/qt/ggl-qt.desktop.in
==================================================================
--- hosts/qt/ggl-qt.desktop.in (revision 1624)
+++ hosts/qt/ggl-qt.desktop.in (revision 1625)
@@ -10,3 +10,4 @@
Type=Application
Categories=KDE;Qt;Network;News;
MimeType=application/x-google-gadget;app/gg;
+OnlyShowIn=KDE;
=== hosts/gtk/ggl-gtk.desktop.in
==================================================================
--- hosts/gtk/ggl-gtk.desktop.in (revision 1624)
+++ hosts/gtk/ggl-gtk.desktop.in (revision 1625)
@@ -10,3 +10,4 @@
Type=Application
Categories=GNOME;GTK;Network;News;
MimeType=application/x-google-gadget;app/gg;
+OnlyShowIn=GNOME;XFCE;

This is a semiautomated message from "svkmail". Complaints or suggestions?
Mail edy...@gmail.com.

[Xianzhu Wang]

LGTM.

2010/1/18 <jame...@gmail.com>: