Import upstream version 0.2.46upstream-0.2.46

(bzr r55.4.30)

9 files changed, 98 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d640f449..0b01a2ec8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,45 @@
 # Generated by Makefile. Do not edit.
 
+2010-09-27 Gord Allott <gord.allott@canonical.com>
+
+	fix for crasher in favourites
+
+2010-09-27 Gord Allott <gord.allott@canonical.com>
+
+	use get_basename instead of silly str manipulating, should fix lp:648625
+
+2010-09-27 Didier Roche <didier.roche@canonical.com>
+
+	fix remaining issue when software is at start for non 3D detection (LP: #614088)
+
+2010-09-27 Didier Roche <didier.roche@canonical.com>
+
+	silly issue when software is at start
+
+2010-09-27 Didier Roche <didier.roche@canonical.com>
+
+	Fix duplicate ubiquity entry in UNE live session (was importing it from the GNOME desktop) (LP: #648827)
+
+2010-09-27 Didier Roche <didier.roche@canonical.com>
+
+	Fix duplicate ubiquity entry in UNE live session (was importing it from the GNOME desktop) (LP: #648827)
+
+2010-09-24 Neil Jagdish Patel <neil.patel@canonical.com>
+
+	[merge] Jason pleasures didrocks
+
+2010-09-24 jassmith@gmail.com
+
+	Ensure the user has at least 4 workspaces and respect if they have more
+
+2010-09-24 Neil Jagdish Patel <neil.patel@canonical.com>
+
+	Bump to next devel release
+
+2010-09-24 Neil Jagdish Patel <neil.patel@canonical.com>
+
+	[release] 0.2.44
+
 2010-09-24 jassmith@gmail.com
 
	Merge configure workspace layout branch
diff --git a/configure b/configure
index a287c2fa1..ad7a7a383 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for unity 0.2.44.
+# Generated by GNU Autoconf 2.67 for unity 0.2.46.
 #
 # Report bugs to <https://launchpad.net/unity>.
 #
@@ -763,8 +763,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='unity'
 PACKAGE_TARNAME='unity'
-PACKAGE_VERSION='0.2.44'
-PACKAGE_STRING='unity 0.2.44'
+PACKAGE_VERSION='0.2.46'
+PACKAGE_STRING='unity 0.2.46'
 PACKAGE_BUGREPORT='https://launchpad.net/unity'
 PACKAGE_URL=''
 
@@ -1574,7 +1574,7 @@ if test "$ac_init_help" = "long"; then
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures unity 0.2.44 to adapt to many kinds of systems.
+\`configure' configures unity 0.2.46 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1644,7 +1644,7 @@ fi
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of unity 0.2.44:";;
+ short | recursive ) echo "Configuration of unity 0.2.46:";;
 esac
 cat <<\_ACEOF
 
@@ -1777,7 +1777,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-unity configure 0.2.44
+unity configure 0.2.46
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2057,7 +2057,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by unity $as_me 0.2.44, which was
+It was created by unity $as_me 0.2.46, which was
 generated by GNU Autoconf 2.67. Invocation command line was
 
 $ $0 $@
@@ -2891,7 +2891,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=unity
- VERSION=0.2.44
+ VERSION=0.2.46
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2934,8 +2934,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 DL_MAJOR_VERSION=0
 DL_MINOR_VERSION=2
-DL_MICRO_VERSION=44
-DL_VERSION=0.2.44
+DL_MICRO_VERSION=46
+DL_VERSION=0.2.46
 
 
 
@@ -14546,7 +14546,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by unity $as_me 0.2.44, which was
+This file was extended by unity $as_me 0.2.46, which was
 generated by GNU Autoconf 2.67. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -14612,7 +14612,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-unity config.status 0.2.44
+unity config.status 0.2.46
 configured by $0, generated by GNU Autoconf 2.67,
 with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index e07418716..5846a0e04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([unity_major], [0])
 m4_define([unity_minor], [2])
-m4_define([unity_micro], [44])
+m4_define([unity_micro], [46])
 
 m4_define([unity_api],
 [unity_major.unity_minor])
diff --git a/targets/mutter/main.c b/targets/mutter/main.c
index f90c874b0..9dd0539cd 100644
--- a/targets/mutter/main.c
+++ b/targets/mutter/main.c
@@ -267,7 +267,7 @@ rendering_available (void)
 renderer = g_ascii_strdown (glRenderer, -1);
 g_debug ("OpenGL renderer string: %s\n", glRenderer);
 
- if (renderer && strstr (renderer, "software"))
+ if (renderer && (strstr (renderer, "software") != NULL))
 return FALSE;
 
 return TRUE;
diff --git a/targets/mutter/spaces-manager.c b/targets/mutter/spaces-manager.c
index 100c34879..f20d9b4c5 100644
--- a/targets/mutter/spaces-manager.c
+++ b/targets/mutter/spaces-manager.c
@@ -26,13 +26,13 @@
 #include <glib/gi18n-lib.h>
 #include <clutter/clutter.h>
 #include <mutter-plugins.h>
+#include <math.h>
+#include <float.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #include <X11/Xregion.h>
 #include <unity.h>
-#include <float.h>
-#include <math.h>
 #include <gee.h>
 #include <gdk/gdk.h>
 
@@ -698,11 +698,27 @@ static void _unity_spaces_manager_workspace_switched_unity_plugin_workspace_swit
 UnitySpacesManager* unity_spaces_manager_construct (GType object_type, UnityPlugin* plugin) {
	UnitySpacesManager * self;
	UnityPlugin* _tmp0_;
+	gint num_workspaces;
	g_return_val_if_fail (plugin != NULL, NULL);
	self = (UnitySpacesManager*) g_object_new (object_type, NULL);
	self->priv->plugin = (_tmp0_ = _g_object_ref0 (plugin), _g_object_unref0 (self->priv->plugin), _tmp0_);
	g_signal_connect_object (self->priv->plugin, "workspace-switch-event", (GCallback) _unity_spaces_manager_workspace_switched_unity_plugin_workspace_switch_event, self, 0);
-	unity_spaces_manager_set_desktop_layout (self, 2, 2, 2 * 2);
+	num_workspaces = meta_prefs_get_num_workspaces ();
+	if (num_workspaces <= 4) {
+	unity_spaces_manager_set_desktop_layout (self, 2, 2, 2 * 2);
+	} else {
+	gint width;
+	gint height;
+	width = (gint) ceil (sqrt ((double) num_workspaces));
+	height = 1;
+	while (TRUE) {
+	if (!((width * height) < num_workspaces)) {
+	break;
+	}
+	height++;
+	}
+	unity_spaces_manager_set_desktop_layout (self, width, height, num_workspaces);
+	}
	return self;
 }
 
diff --git a/targets/mutter/spaces-manager.vala b/targets/mutter/spaces-manager.vala
index 025fdb19a..0145020a8 100644
--- a/targets/mutter/spaces-manager.vala
+++ b/targets/mutter/spaces-manager.vala
@@ -155,7 +155,21 @@ namespace Unity {
 this.plugin = plugin;
 this.plugin.workspace_switch_event.connect (this.workspace_switched);
 
- set_desktop_layout (2, 2, 2 * 2);
+ int num_workspaces = Mutter.meta_prefs_get_num_workspaces ();
+ 
+ if (num_workspaces <= 4)
+ {
+ set_desktop_layout (2, 2, 2 * 2);
+ }
+ else
+ {
+ int width = (int) Math.ceil (Math.sqrt ((double) num_workspaces));
+ int height = 1;
+ while (width * height < num_workspaces)
+ height++;
+ 
+ set_desktop_layout (width, height, num_workspaces);
+ } 
 }
 
 void set_desktop_layout (int columns, int rows, int num_workspace)
diff --git a/tools/migrate_favorites.py b/tools/migrate_favorites.py
index d8a8081b7..15e959982 100755
--- a/tools/migrate_favorites.py
+++ b/tools/migrate_favorites.py
@@ -88,7 +88,9 @@ for candidate in lucid_favorites_list:
 # get GNOME desktop launchers
 desktop_dir = get_desktop_dir()
 for launcher_location in glob.glob('%s/*.desktop' % desktop_dir):
- (apps_list, priority_position) = register_new_app(client, launcher_location, apps_list, priority_position)
+ # blacklist ubiquity as will have two ubiquity in the netbook live session then
+ if not "ubiquity" in launcher_location:
+ (apps_list, priority_position) = register_new_app(client, launcher_location, apps_list, priority_position)
 
 # set list of default and new favorites and write everything!
 client.set_list('/desktop/unity/launcher/favorites/favorites_list', gconf.VALUE_STRING, apps_list)
diff --git a/unity-private/launcher/application-controller.c b/unity-private/launcher/application-controller.c
index e1ca21e75..ac1e29dc5 100644
--- a/unity-private/launcher/application-controller.c
+++ b/unity-private/launcher/application-controller.c
@@ -305,8 +305,6 @@ static GObject * unity_launcher_application_controller_constructor (GType type,
 static void unity_launcher_application_controller_finalize (GObject* obj);
 static void unity_launcher_application_controller_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void unity_launcher_application_controller_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
 static int _vala_strcmp0 (const char * str1, const char * str2);
 
@@ -1225,15 +1223,11 @@ const char* unity_launcher_application_controller_get_fav_id (UnityLauncherAppli
	_tmp0_ = _tmp1_;
	}
	if (_tmp0_) {
-	gint filepath_length1;
-	gint _filepath_size_;
-	char** _tmp4_;
-	char** _tmp3_;
-	char** filepath;
-	char* _tmp5_;
-	filepath = (_tmp4_ = _tmp3_ = g_strsplit (self->priv->_desktop_file, "/", 0), filepath_length1 = _vala_array_length (_tmp3_), _filepath_size_ = filepath_length1, _tmp4_);
-	self->priv->_fav_id = (_tmp5_ = g_strconcat ("app-", filepath[filepath_length1 - 1], NULL), _g_free0 (self->priv->_fav_id), _tmp5_);
-	filepath = (_vala_array_free (filepath, filepath_length1, (GDestroyNotify) g_free), NULL);
+	char* filepath;
+	char* _tmp3_;
+	filepath = g_path_get_basename (self->priv->_desktop_file);
+	self->priv->_fav_id = (_tmp3_ = g_strconcat ("app-", filepath, NULL), _g_free0 (self->priv->_fav_id), _tmp3_);
+	_g_free0 (filepath);
	}
	result = self->priv->_fav_id;
	return result;
@@ -1367,24 +1361,6 @@ static void unity_launcher_application_controller_set_property (GObject * object
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	if ((array != NULL) && (destroy_func != NULL)) {
-	int i;
-	for (i = 0; i < array_length; i = i + 1) {
-	if (((gpointer*) array)[i] != NULL) {
-	destroy_func (((gpointer*) array)[i]);
-	}
-	}
-	}
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
 static gint _vala_array_length (gpointer array) {
	int length;
	length = 0;
diff --git a/unity-private/launcher/application-controller.vala b/unity-private/launcher/application-controller.vala
index 4d264a3b3..f81a0b095 100644
--- a/unity-private/launcher/application-controller.vala
+++ b/unity-private/launcher/application-controller.vala
@@ -44,8 +44,8 @@ namespace Unity.Launcher
 if (_fav_id == "" || _fav_id == null &&
 desktop_file != "" && desktop_file != null)
 {
- var filepath = desktop_file.split ("/");
- _fav_id = "app-" + filepath[filepath.length - 1];
+ var filepath = Path.get_basename (desktop_file);
+ _fav_id = "app-" + filepath;
 }
 return _fav_id;
 }