Merge lp:~nataliabidart/ubuntuone-control-panel/messaging-menu into lp:ubuntuone-control-panel

[Natalia Bidart]

Added support to install u1cp-gtk in the messaging menu (LP: #708003).

We have U1CP in the messaging menu. No much testing instructions since all the magic happens when packaging this tiger.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Eric Casteleijn (thisfred)]

It werks!

review: Approve

=== modified file 'setup.py'
--- setup.py	2011-01-25 18:51:17 +0000
+++ setup.py	2011-01-27 21:10:01 +0000
@@ -32,15 +32,16 @@
 
 POT_FILE = 'po/ubuntuone-control-panel.pot'
 SERVICE_FILE = 'com.ubuntuone.controlpanel.service'
+MESSAGE_ENTRY = 'ubuntuone-control-panel'
 CONSTANTS = 'ubuntuone/controlpanel/constants.py'
 
-CLEANFILES = [SERVICE_FILE, CONSTANTS, POT_FILE, 'MANIFEST']
+CLEANFILES = [SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS, POT_FILE, 'MANIFEST']
 
 
 def replace_prefix(prefix):
     """Replace every '@prefix@' with prefix within 'filename' content."""
     # replace .service file, DATA_DIR constant
-    for filename in (SERVICE_FILE, CONSTANTS):
+    for filename in (SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS):
         with open(filename + '.in') as in_file:
             content = in_file.read()
             with open(filename, 'w') as out_file:
@@ -88,6 +89,7 @@
         ('lib/ubuntuone-control-panel',
          ['bin/ubuntuone-control-panel-backend']),
         ('share/dbus-1/services/', [SERVICE_FILE]),
+        ('share/indicators/messages/applications/', [MESSAGE_ENTRY]),
     ],
     cmdclass={
         'install': ControlPanelInstall,

=== added file 'ubuntuone-control-panel.in'
--- ubuntuone-control-panel.in	1970-01-01 00:00:00 +0000
+++ ubuntuone-control-panel.in	2011-01-27 21:10:01 +0000
@@ -0,0 +1,1 @@
+@prefix@/share/applications/ubuntuone-control-panel-gtk.desktop