Merge lp:~nataliabidart/ubuntuone-client/remove-preferences-desktop into lp:ubuntuone-client

[Natalia Bidart]

Remove access points (.desktop entry, me menu entry) for ubuntuone-preferences. To be replcaed by ubuntuone-control-panel (LP: #693879).

[dobey (dobey)]

In general it looks ok to me, but I am still worried about the proper separation of concerns. Also, shouldn't you remove bin/ubuntuone-preferences as well? If the goal is to replace it, shouldn't it be removed?

review: Abstain

[Natalia Bidart (nataliabidart)]

Rodney,

My plan was to remove the script bin/ubuntuone-preferences once the control panel is already installed and accessible from the menus. I wanted to leave the possibility of executing u1prefs from command line, if necessary, por example.
We should remove it before final freezes, for sure.

Thanks!

[Roberto Alsina (ralsina)]

Agreed with Naty about not removing the binary immediately, just in case.

review: Approve

[Martin Albisetti (beuno)]

review: Approve

=== modified file 'bin/ubuntuone-launch'
--- bin/ubuntuone-launch	2010-12-20 15:06:22 +0000
+++ bin/ubuntuone-launch	2011-01-06 14:00:39 +0000
@@ -23,7 +23,7 @@
 This script decides whether to start and connect syncdaemon.
 
  * If you've never used Ubuntu One file sync, or if you've disabled
-   file sync via ubuntuone-preferences (or equivalently via setting
+   file sync via Ubuntu One control panel (or equivalently via setting
    files_sync_enabled to False in the syncdaemon configuration file),
    syncdaemon is not started, and nothing happens as a result of this
    script being run.

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2011-01-04 13:09:01 +0000
+++ data/Makefile.am	2011-01-06 14:00:39 +0000
@@ -9,17 +9,6 @@
 config_in_files = logging.conf.in
 config_DATA = syncdaemon.conf $(config_in_files:.conf.in=.conf)
 
-memenudir = $(datadir)/indicators/me
-memenu_in_files = ubuntuone.menu.in
-memenu_DATA = $(memenu_in_files:.menu.in=.menu)
-
-%.menu: %.menu.in
-	@sed -e "s|\@DATADIR\@|$(datadir)|" $< > $@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = ubuntuone-preferences.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = ubuntuone-launch.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
@@ -133,8 +122,6 @@
 
 EXTRA_DIST =			\
 	$(config_in_files)	\
-	$(memenu_in_files)	\
-	$(desktop_in_files)     \
 	$(autostart_in_files)     \
 	$(service_in_files)	\
 	$(emblem_in_files)	\
@@ -146,8 +133,6 @@
 	$(crashdb_DATA)
 
 CLEANFILES =		\
-	$(memenu_DATA)	\
-	$(desktop_DATA) \
 	$(autostart_DATA) \
 	$(service_DATA)	\
 	$(emblem_files)	\

=== removed file 'data/ubuntuone-preferences.desktop.in'
--- data/ubuntuone-preferences.desktop.in	2010-03-12 19:16:51 +0000
+++ data/ubuntuone-preferences.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=Ubuntu One
-_Comment=Configure and manage your Ubuntu One account
-Exec=ubuntuone-preferences
-Icon=ubuntuone
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Settings;
-X-Ayatana-Desktop-Shortcuts=U1
-
-[U1 Shortcut Group]
-Name=Ubuntu One…
-Exec=ubuntuone-preferences

=== removed file 'data/ubuntuone.menu.in'
--- data/ubuntuone.menu.in	2010-02-17 17:42:26 +0000
+++ data/ubuntuone.menu.in	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-@DATADIR@/applications/ubuntuone-preferences.desktop

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-01-04 13:09:01 +0000
+++ po/POTFILES.in	2011-01-06 14:00:39 +0000
@@ -4,7 +4,6 @@
 data/emblem-ubuntuone-downloading.icon.in
 data/emblem-ubuntuone-unsynchronized.icon.in
 data/emblem-ubuntuone-uploading.icon.in
-data/ubuntuone-preferences.desktop.in
 libsyncdaemon/syncdaemon-authentication.c
 nautilus/add-contact-dialog.c
 nautilus/ubuntuone-nautilus.c