* Backport Gord's changes to fix scrolling and click issues in the

 launcher and Neil's changes for the recent artwork changes * debian/source: - use format 3 - list binaries that changed in the backport (bzr r55.3.162)

10 files changed, 23 insertions, 40 deletions

diff --git a/data/devices.png b/data/devices.png
new file mode 100644
index 000000000..5847209cf
--- /dev/null
+++ b/data/devices.png
diff --git a/debian/applications.png b/debian/applications.png
new file mode 100644
index 000000000..51899194b
--- /dev/null
+++ b/debian/applications.png
diff --git a/debian/changelog b/debian/changelog
index 1e3661bce..baa74dcf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+unity (0.2.32-0ubuntu3) UNRELEASED; urgency=low
+
+ * Backport Gord's changes to fix scrolling and click issues in the 
+ launcher and Neil's changes for the recent artwork changes
+ * debian/source:
+ - use format 3
+ - list binaries that changed in the backport
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 31 Aug 2010 16:39:52 +0200
+
 unity (0.2.32-0ubuntu2) maverick; urgency=low
 
 * debian/control: clean the build-depends on libvala it's not required
diff --git a/debian/files.png b/debian/files.png
new file mode 100644
index 000000000..ebae21032
--- /dev/null
+++ b/debian/files.png
diff --git a/debian/rules b/debian/rules
index 870281355..3485fd3cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ DEB_DBG_PACKAGE_libunity0 = unity-dbg
 DEB_DH_GENCONTROL_ARGS_netbook-launcher = -- -v2:$(DEB_VERSION)
 
 common-binary-post-install-arch::
+	cp debian/*.png debian/unity/usr/share/unity
	find debian/tmp/usr/lib -name \*.la -exec rm {} \;
	find debian/tmp/usr/lib -name \*.a -exec rm {} \;
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 000000000..ccc5d11b5
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,6 @@
+debian/applications.png
+data/devices.png
+debian/files.png
+debian/trash.png
+
+
diff --git a/debian/trash.png b/debian/trash.png
new file mode 100644
index 000000000..dff2d675e
--- /dev/null
+++ b/debian/trash.png
diff --git a/unity-private/places/places-place-home-renderer.vala b/unity-private/places/places-place-home-renderer.vala
index 360a5e269..259f258b4 100644
--- a/unity-private/places/places-place-home-renderer.vala
+++ b/unity-private/places/places-place-home-renderer.vala
@@ -94,7 +94,7 @@ namespace Unity.Places
 activate_place (APPS_PLACE, 5);
 });
 
- icon = new HomeButton (_("Files & Folders"), filename_for_icon ("work"), "");
+ icon = new HomeButton (_("Files & Folders"), filename_for_icon ("filesandfolders"), "");
 icon_view.add_actor (icon);
 icon.show ();
 icon.clicked.connect (() => {
@@ -168,28 +168,8 @@ namespace Unity.Places
 
 private string filename_for_icon (string icon)
 {
- if (theme == null)
- {
- theme = new Gtk.IconTheme ();
- theme.set_custom_theme ("unity-icon-theme");
- }
-
- string icon_file = "";
- if (theme.has_icon (icon))
- {
- var info = theme.lookup_icon (icon, 128, 0);
- if (info != null)
- {
- var filename = info.get_filename ();
- if (FileUtils.test(filename, FileTest.IS_REGULAR))
- {
- icon_file = filename;
- }
- }
-
- }
-
- return icon_file;
+ /* FIXME: We'll autoget this from the theme before release */
+ return "/usr/share/icons/unity-icon-theme/apps/128/" + icon + ".svg";
 }
 }
 
diff --git a/unity-private/places/places-volume-child-controller.vala b/unity-private/places/places-volume-child-controller.vala
index 9d587895c..0e46203d9 100644
--- a/unity-private/places/places-volume-child-controller.vala
+++ b/unity-private/places/places-volume-child-controller.vala
@@ -24,7 +24,7 @@ namespace Unity.Places
 {
 public class VolumeChildController : ScrollerChildController
 {
- public static const string ICON = "/usr/share/unity/trash.png";
+ public static const string ICON = "/usr/share/unity/devices.png";
 
 public Volume volume { get; construct; }
 
@@ -37,22 +37,7 @@ namespace Unity.Places
 construct
 {
 name = volume.get_name ();
- 
- var icon = volume.get_icon ();
- var icon_name = "";
- if (icon is ThemedIcon)
- {
- icon_name = (icon as ThemedIcon).get_names ()[0];
- }
- else if (icon is FileIcon)
- {
- icon_name = (icon as FileIcon).get_file ().get_path ();
- }
- else
- {
- icon_name = ICON;
- }
- load_icon_from_icon_name (icon_name);
+ load_icon_from_icon_name (ICON);
 
 child.group_type = ScrollerChild.GroupType.DEVICE;
 child.drag_removed.connect (eject_volume);