Permalink
Browse files

Merge 0.7-devel to trunk

I had to do a foreign merge because it has less query to 
googlecode. apearently googlecode is crashing with 502 gateway
errors.
  • Loading branch information...
1 parent e404436 commit 0fc20a73ec27f26bf1fd1f28c7aa1cb9d894fd81 @rainwoodman rainwoodman committed Dec 21, 2008
Showing with 7,303 additions and 12,740 deletions.
  1. +2 −2 AUTHORS
  2. +484 −3,087 ClassMap.dia
  3. +339 −0 GPLv2
  4. +2 −347 applet/GPL.vala → GPLv3
  5. +36 −10 Makefile.am
  6. +10 −0 Makefile.config
  7. +65 −0 Makefile.configmake
  8. +57 −0 Makefile.decl
  9. +16 −0 Makefile.licenses
  10. +5 −5 applet/{GlobalMenu_PanelApplet.server.in → GlobalMenu_PanelApplet.server.in.in}
  11. +0 −34 applet/GnomeMenuHelper.vala
  12. +64 −57 applet/Makefile.am
  13. +328 −151 applet/applet.vala
  14. 0 {vapi-compat → applet}/gconfcompat.vapi
  15. BIN applet/globalmenu.png
  16. +0 −54 applet/gnome-globalmenu-applet.schemas
  17. +35 −0 applet/gnomemenuhelper.vala
  18. +90 −63 applet/gtkextra-gconfdialog.vala
  19. +3 −0 applet/libpanelapplet-2.0.deps
  20. +77 −0 applet/libpanelapplet-2.0.vapi
  21. +54 −0 applet/main.vala
  22. +0 −29 applet/panelextra-menubar.vala
  23. +0 −193 applet/panelextra-switcher.vala
  24. +7 −0 applet/patch.sh
  25. +201 −0 applet/switcher.vala
  26. 0 {vapi-compat → applet}/wnckcompat.vapi
  27. +0 −158 autogen.sh
  28. +91 −121 configure.ac
  29. +0 −4 doc/Makefile.am
  30. +0 −1 doc/reference/Makefile.am
  31. +0 −87 doc/reference/libgnomenu/Makefile.am
  32. +0 −41 doc/reference/libgnomenu/libgnomenu-docs.sgml
  33. 0 doc/reference/libgnomenu/libgnomenu.types
  34. +0 −87 doc/reference/libgtkhotkey/Makefile.am
  35. +0 −27 doc/reference/libgtkhotkey/libgtkhotkey-docs.sgml
  36. 0 doc/reference/libgtkhotkey/libgtkhotkey.types
  37. +66 −0 gnome-globalmenu.schemas.in
  38. +122 −0 gnome-globalmenu.spec
  39. +0 −1 gnome-globalmenu.spec.tmpl
  40. +0 −177 gtk-aqd/0001-Global-Menu-Patch.patch
  41. +0 −9 gtk-aqd/Makefile.am
  42. +1 −1 gtk-modules/Makefile.am
  43. +64 −0 gtk-modules/globalmenu/Makefile.am
  44. +6 −0 gtk-modules/globalmenu/bindings.vapi
  45. +147 −0 gtk-modules/globalmenu/dyn-patch-menubar.c
  46. +54 −0 gtk-modules/globalmenu/dyn-patch-menushell.c
  47. +47 −0 gtk-modules/globalmenu/dyn-patch-widget.c
  48. +249 −0 gtk-modules/globalmenu/dyn-patch.c
  49. +55 −0 gtk-modules/globalmenu/dyn-patch.h
  50. +81 −0 gtk-modules/globalmenu/globalmenu-helper.c
  51. +37 −0 gtk-modules/globalmenu/globalmenu-locator.vala
  52. +153 −0 gtk-modules/globalmenu/globalmenu-serializer.vala
  53. +190 −0 gtk-modules/globalmenu/globalmenu.vala
  54. +164 −0 gtk-modules/globalmenu/module-main.vala
  55. +5 −0 gtk-modules/globalmenu/patch.sh
  56. +25 −0 gtk-modules/globalmenu/tests/Makefile.am
  57. +52 −0 gtk-modules/globalmenu/tests/test-serializer.vala
  58. +254 −0 gtk-modules/globalmenu/tests/test-unload.glade
  59. +63 −0 gtk-modules/globalmenu/tests/test-unload.vala
  60. +0 −62 gtk-modules/libgnomenugtk/Makefile.am
  61. +0 −55 gtk-modules/libgnomenugtk/gnomenugtk-client.vala
  62. +0 −238 gtk-modules/libgnomenugtk/gnomenugtk-document.vala
  63. +0 −226 gtk-modules/libgnomenugtk/gnomenugtk.vala
  64. +0 −89 gtk-modules/libgnomenugtk/gtkaqd.vapi
  65. +0 −240 gtk-modules/libgnomenugtk/utils.c
  66. +0 −131 libgmarkupdoc/Makefile.am
  67. +0 −123 libgmarkupdoc/gmarkupdoc-dbusview.vala
  68. +0 −19 libgmarkupdoc/gmarkupdoc-document.vala
  69. +0 −75 libgmarkupdoc/gmarkupdoc-documentmodel.vala
  70. +0 −115 libgmarkupdoc/gmarkupdoc-documenttreeadapter.vala
  71. +0 −205 libgmarkupdoc/gmarkupdoc-listview.vala
  72. +0 −212 libgmarkupdoc/gmarkupdoc-node.vala
  73. +0 −178 libgmarkupdoc/gmarkupdoc-parser.vala
  74. +0 −163 libgmarkupdoc/gmarkupdoc-remotedocument.vala
  75. +0 −85 libgmarkupdoc/gmarkupdoc-section.vala
  76. +0 −10 libgmarkupdoc/gmarkupdoc-view.vala
  77. +0 −7 libgmarkupdoc/gmarkupdoc.vala
  78. +34 −72 libgnomenu/Makefile.am
  79. +52 −0 libgnomenu/bindings.vapi
  80. +140 −0 libgnomenu/box.vala
  81. +0 −37 libgnomenu/example.c
  82. +0 −153 libgnomenu/gnomenu-client.vala
  83. +0 −159 libgnomenu/gnomenu-menubar.vala
  84. +0 −388 libgnomenu/gnomenu-menuview.vala
  85. +0 −85 libgnomenu/gnomenu-server.vala
  86. +93 −0 libgnomenu/gnomenu.vala
  87. +81 −0 libgnomenu/helper.vala
  88. +72 −0 libgnomenu/keygrab-ccode.c
  89. +16 −0 libgnomenu/keygrab.vala
  90. +302 −0 libgnomenu/label.vala
  91. +30 −0 libgnomenu/menu.vala
  92. +576 −0 libgnomenu/menubar.vala
  93. +239 −0 libgnomenu/menubarbox.vala
  94. +494 −0 libgnomenu/menuitem.vala
  95. +156 −0 libgnomenu/parser.vala
  96. +14 −0 libgnomenu/patch.sh
  97. +115 −0 libgnomenu/serializer.vala
  98. +23 −0 libgnomenu/tests/Makefile.am
  99. +1 −0 libgnomenu/tests/evo-nolabel.xml
  100. +1 −0 libgnomenu/tests/evo.xml
  101. +7 −0 libgnomenu/tests/patch.sh
  102. +65 −0 libgnomenu/tests/test-box.vala
  103. +32 −0 libgnomenu/tests/test-grab.vala
  104. +36 −0 libgnomenu/tests/test-label.vala
  105. +61 −0 libgnomenu/tests/test-leak.vala
  106. +123 −0 libgnomenu/tests/test-menubar.vala
  107. +62 −0 libgnomenu/tests/test-menushell.vala
  108. +85 −0 libgnomenu/tests/test-parser.vala
  109. +46 −0 libgnomenu/tests/test-window.vala
  110. +223 −0 libgnomenu/window.vala
  111. +0 −66 libgtkhotkey/Makefile.am
  112. +0 −31 libgtkhotkey/gtk-hotkey-error.c
  113. +0 −96 libgtkhotkey/gtk-hotkey-error.h
  114. +0 −658 libgtkhotkey/gtk-hotkey-info.c
  115. +0 −85 libgtkhotkey/gtk-hotkey-info.h
  116. +0 −719 libgtkhotkey/gtk-hotkey-key-file-registry.c
  117. +0 −55 libgtkhotkey/gtk-hotkey-key-file-registry.h
  118. +0 −218 libgtkhotkey/gtk-hotkey-listener.c
  119. +0 −73 libgtkhotkey/gtk-hotkey-listener.h
  120. +0 −86 libgtkhotkey/gtk-hotkey-marshal.c
  121. +0 −20 libgtkhotkey/gtk-hotkey-marshal.h
  122. +0 −34 libgtkhotkey/gtk-hotkey-private.h
  123. +0 −341 libgtkhotkey/gtk-hotkey-registry.c
  124. +0 −110 libgtkhotkey/gtk-hotkey-registry.h
  125. +0 −48 libgtkhotkey/gtk-hotkey-utils.c
  126. +0 −33 libgtkhotkey/gtk-hotkey-utils.h
  127. +0 −241 libgtkhotkey/gtk-hotkey-x11-listener.c
  128. +0 −53 libgtkhotkey/gtk-hotkey-x11-listener.h
  129. +0 −12 libgtkhotkey/gtkhotkey.h
  130. +0 −657 libgtkhotkey/x11/eggaccelerators.c
  131. +0 −87 libgtkhotkey/x11/eggaccelerators.h
  132. +0 −328 libgtkhotkey/x11/tomboykeybinder.c
  133. +0 −27 libgtkhotkey/x11/tomboykeybinder.h
  134. +0 −49 navigator/Makefile.am
  135. +0 −64 navigator/navigator.vala
  136. +23 −0 patch.sh.in
  137. +2 −0 po/LINGUAS
  138. +0 −217 po/Makefile.in.in
  139. +2 −0 po/Makevars
  140. +7 −0 po/POTFILES.in
  141. +87 −49 po/fr_FR.po
  142. +155 −71 po/zh_CN.po
  143. +0 −19 reference/Makefile.am
  144. +0 −28 rpm
  145. +0 −65 server/Makefile.am
  146. +0 −3 server/org.gnome.GlobalMenu.Server.service.in
  147. +0 −52 server/org.gnome.GlobalMenu.Server.vala
  148. +0 −5 server/utils.c
  149. +15 −18 tests/Makefile.am
  150. +0 −27 tests/lowercname.c
  151. +5 −0 tests/patch.sh
  152. +0 −4 tests/test.c
  153. +27 −0 tests/testman.vala
  154. +0 −1 vapi-compat/Makefile.am
  155. +0 −46 vapi-compat/gtkcompat.vapi
  156. +0 −21 vapi-compat/panelappletcompat.vapi
  157. +0 −50 vapi-compat/valacompat.vapi
View
@@ -1,4 +1,4 @@
-Programming:
+Coding:
Yu Feng <rainwoodman@gmail.com>
Mingxi Wu <fengshenx@gmail.com>
bis0n.lives <bis0n.lives@gmail.com>
@@ -9,5 +9,5 @@ sstasyuk <sstasyuk@gmail.com>
David Watson <dwatson031@gmail.com>
Valiant Wing <Valiant.Wing@gmail.com>
-Translatation/Documentation:
+Documentation:
Pierre Slamich <pierre.slamich@gmail.com>
Oops, something went wrong.

0 comments on commit 0fc20a7

Please sign in to comment.