Application Menu: add support for showing GApplication actions

Use the new GApplication support in ShellApp to create the application
menu. Supports plain (no state), boolean and double actions.
Includes a test application (as no other application uses GApplication
for actions)

https://bugzilla.gnome.org/show_bug.cgi?id=621203

.gitignore

@@ -16,18 +16,11 @@ config.log
 config.status
 config
 configure
-data/50-gnome-shell-*.xml
 data/gnome-shell.desktop
 data/gnome-shell.desktop.in
-data/gnome-shell-wayland.desktop
-data/gnome-shell-wayland.desktop.in
-data/gnome-shell-extension-prefs.desktop
-data/gnome-shell-extension-prefs.desktop.in
 data/gschemas.compiled
 data/org.gnome.shell.gschema.xml
 data/org.gnome.shell.gschema.valid
-data/org.gnome.shell.evolution.calendar.gschema.xml
-data/org.gnome.shell.evolution.calendar.gschema.valid
 docs/reference/*/*.args
 docs/reference/*/*.bak
 docs/reference/*/*.hierarchy
@@ -40,24 +33,19 @@ docs/reference/*/*.txt
 docs/reference/*/*.types
 docs/reference/*/html/
 docs/reference/*/xml/
-docs/reference/shell/doc-gen-*
 gtk-doc.make
 js/misc/config.js
-js/js-resources.c
-js/js-resources.h
 intltool-extract.in
 intltool-merge.in
 intltool-update.in
 libtool
 m4/
-man/gnome-shell.1
 omf.make
 po/*.gmo
 po/gnome-shell.pot
 po/*.header
 po/*.sed
 po/*.sin
-po/.intltool-merge-cache
 po/Makefile.in.in
 po/Makevars.template
 po/POTFILES
@@ -70,19 +58,14 @@ src/*-enum-types.[ch]
 src/*-marshal.[ch]
 src/Makefile
 src/Makefile.in
-src/calendar-server/evolution-calendar.desktop
-src/calendar-server/evolution-calendar.desktop.in
 src/calendar-server/org.gnome.Shell.CalendarServer.service
 src/gnome-shell
 src/gnome-shell-calendar-server
-src/gnome-shell-extension-prefs
 src/gnome-shell-extension-tool
 src/gnome-shell-hotplug-sniffer
 src/gnome-shell-jhbuild
 src/gnome-shell-perf-helper
-src/gnome-shell-perf-tool
 src/gnome-shell-real
-src/gnome-shell-wayland
 src/hotplug-sniffer/org.gnome.Shell.HotplugSniffer.service
 src/run-js-test
 src/test-recorder
@@ -91,8 +74,6 @@ src/test-theme
 src/st.h
 src/stamp-st.h
 src/stamp-st.h.tmp
-src/st-scroll-view-fade-generated.c
-src/stamp-st-scroll-view-fade-generated.c
 stamp-h1
 tests/run-test.sh
 xmldocs.make

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "src/gvc"]
-	path = src/gvc
-	url = git://git.gnome.org/libgnome-volume-control

HACKING

@@ -1,331 +0,0 @@
-Coding guide
-============
-
-Our goal is to have all JavaScript code in GNOME follow a consistent style. In
-a dynamic language like JavaScript, it is essential to be rigorous about style
-(and unit tests), or you rapidly end up with a spaghetti-code mess.
-
-A quick note
-------------
-
-Life isn't fun if you can't break the rules. If a rule seems unnecessarily
-restrictive while you're coding, ignore it, and let the patch reviewer decide
-what to do.
-
-Indentation and whitespace
---------------------------
-
-Use four-space indents. Braces are on the same line as their associated
-statements.  You should only omit braces if *both* sides of the statement are
-on one line.
-
-* One space after the `function` keyword.  No space between the function name
-* in a declaration or a call.  One space before the parens in the `if`
-* statements, or `while`, or `for` loops.
-
-    function foo(a, b) {
-        let bar;
-
-        if (a > b)
-            bar = do_thing(a);
-        else
-            bar = do_thing(b);
-
-        if (var == 5) {
-            for (let i = 0; i < 10; i++) {
-                print(i);
-            }
-        } else {
-            print(20);
-        }
-    }
-
-Semicolons
-----------
-
-JavaScript allows omitting semicolons at the end of lines, but don't. Always
-end statements with a semicolon.
-
-js2-mode
---------
-
-If using Emacs, do not use js2-mode. It is outdated and hasn't worked for a
-while. emacs now has a built-in JavaScript mode, js-mode, based on
-espresso-mode. It is the de facto emacs mode for JavaScript.
-
-File naming and creation
-------------------------
-
-For JavaScript files, use lowerCamelCase-style names, with a `.js` extension.
-
-We only use C where gjs/gobject-introspection is not available for the task, or
-where C would be cleaner. To work around limitations in
-gjs/gobject-introspection itself, add a new method in `shell-util.[ch]`.
-
-Like many other GNOME projects, we prefix our C source filenames with the
-library name followed by a dash, e.g. `shell-app-system.c`. Create a
-`-private.h` header when you want to share code internally in the
-library. These headers are not installed, distributed or introspected.
-
-Imports
--------
-
-Use UpperCamelCase when importing modules to distinguish them from ordinary
-variables, e.g.
-
-    const GLib = imports.gi.GLib;
-
-Imports should be categorized into one of two places. The top-most import block
-should contain only "environment imports". These are either modules from
-gobject-introspection or modules added by gjs itself.
-
-The second block of imports should contain only "application imports". These
-are the JS code that is in the gnome-shell codebase,
-e.g. `imports.ui.popupMenu`.
-
-Each import block should be sorted alphabetically. Don't import modules you
-don't use.
-
-    const GLib = imports.gi.GLib;
-    const Gio = imports.gi.Gio;
-    const Lang = imports.lang;
-    const St = imports.gi.St;
-
-    const Main = imports.ui.main;
-    const Params = imports.misc.params;
-    const Tweener = imports.ui.tweener;
-    const Util = imports.misc.util;
-
-The alphabetical ordering should be done independently of the location of the
-location. Never reference `imports` in actual code.
-
-Constants
----------
-
-We use CONSTANTS_CASE to define constants. All constants should be directly
-under the imports:
-
-    const MY_DBUS_INTERFACE = 'org.my.Interface';
-
-Variable declaration
---------------------
-
-Always use either `const` or `let` when defining a variable.
-
-    // Iterating over an array
-    for (let i = 0; i < arr.length; ++i) {
-        let item = arr[i];
-    }
-
-    // Iterating over an object's properties
-    for (let prop in someobj) {
-        ...
-    }
-
-If you use "var" then the variable is added to function scope, not block scope.
-See [What's new in JavaScript 1.7](https://developer.mozilla.org/en/JavaScript/New_in_JavaScript/1.7#Block_scope_with_let_%28Merge_into_let_Statement%29)
-
-Classes
--------
-
-There are many approaches to classes in JavaScript. We use our own class framework
-(sigh), which is built in gjs. The advantage is that it supports inheriting from
-GObjects, although this feature isn't used very often in the Shell itself.
-
-    const IconLabelMenuItem = new Lang.Class({
-        Name: 'IconLabelMenuItem',
-        Extends: PopupMenu.PopupMenuBaseItem,
-
-        _init: function(icon, label) {
-            this.parent({ reactive: false });
-            this.actor.add_child(icon);
-            this.actor.add_child(label);
-        },
-
-        open: function() {
-            log("menu opened!");
-        }
-    });
-
-* 'Name' is required. 'Extends' is optional. If you leave it out, you will
-  automatically inherit from Object.
-
-* Leave a blank line between the "class header" (Name, Extends, and other
-  things)  and the "class body" (methods). Leave a blank line between each
-  method.
-
-* No space before the colon, one space after.
-
-* No trailing comma after the last item.
-
-* Make sure to use a semicolon after the closing paren to the class. It's
-  still a giant function call, even though it may resemble a more
-  conventional syntax.
-
-GObject Introspection
----------------------
-
-GObject Introspection is a powerful feature that allows us to have native
-bindings for almost any library built around GObject. If a library requires
-you to inherit from a type to use it, you can do so:
-
-    const MyClutterActor = new Lang.Class({
-        Name: 'MyClutterActor',
-        Extends: Clutter.Actor,
-
-        vfunc_get_preferred_width: function(actor, forHeight) {
-             return [100, 100];
-        },
-
-        vfunc_get_preferred_height: function(actor, forWidth) {
-             return [100, 100];
-        },
-
-        vfunc_paint: function(actor) {
-             let alloc = this.get_allocation_box();
-             Cogl.set_source_color4ub(255, 0, 0, 255);
-             Cogl.rectangle(alloc.x1, alloc.y1,
-                            alloc.x2, alloc.y2);
-        }
-    });
-
-Translatable strings, `environment.js`
---------------------------------------
-
-We use gettext to translate the GNOME Shell into all the languages that GNOME
-supports. The `gettext` function is aliased globally as `_`, you do not need to
-explicitly import it. This is done through some magic in the
-[environment.js](http://git.gnome.org/browse/gnome-shell/tree/js/ui/environment.js)
-file. If you can't find a method that's used, it's probably either in gjs itself
-or installed on the global object from the Environment.
-
-Use 'single quotes' for programming strings that should not be translated
-and "double quotes" for strings that the user may see. This allows us to
-quickly find untranslated or mistranslated strings by grepping through the
-sources for double quotes without a gettext call around them.
-
-`actor` and `_delegate`
------------------------
-
-gjs allows us to set so-called "expando properties" on introspected objects,
-allowing us to treat them like any other. Because the Shell was built before
-you could inherit from GTypes natively in JS, we usually have a wrapper class
-that has a property called `actor`. We call this wrapper class the "delegate".
-
-We sometimes use expando properties to set a property called `_delegate` on
-the actor itself:
-
-    const MyClass = new Lang.Class({
-        Name: 'MyClass',
-
-        _init: function() {
-            this.actor = new St.Button({ text: "This is a button" });
-            this.actor._delegate = this;
-
-            this.actor.connect('clicked', Lang.bind(this, this._onClicked));
-        },
-
-        _onClicked: function(actor) {
-            actor.set_label("You clicked the button!");
-        }
-    });
-
-The 'delegate' property is important for anything which trying to get the
-delegate object from an associated actor. For instance, the drag and drop
-system calls the `handleDragOver` function on the delegate of a "drop target"
-when the user drags an item over it. If you do not set the `_delegate`
-property, your actor will not be able to be dropped onto.
-
-Functional style
-----------------
-
-JavaScript Array objects offer a lot of common functional programming
-capabilities such as forEach, map, filter and so on. You can use these when
-they make sense, but please don't have a spaghetti mess of function programming
-messed in a procedural style. Use your best judgment.
-
-Closures
---------
-
-`this` will not be captured in a closure, it is relative to how the closure is
-invoked, not to the value of this where the closure is created, because "this"
-is a keyword with a value passed in at function invocation time, it is not a
-variable that can be captured in closures.
-
-All closures should be wrapped with a Lang.bind.
-
-    const Lang = imports.lang;
-
-    let closure = Lang.bind(this, function() { this._fnorbate(); });
-
-A more realistic example would be connecting to a signal on a method of a
-prototype:
-
-    const Lang = imports.lang;
-    const FnorbLib = imports.fborbLib;
-
-    const MyClass = new Lang.Class({
-        _init: function() {
-            let fnorb = new FnorbLib.Fnorb();
-            fnorb.connect('frobate', Lang.bind(this, this._onFnorbFrobate));
-        },
-
-        _onFnorbFrobate: function(fnorb) {
-            this._updateFnorb();
-        }
-    });
-
-Object literal syntax
----------------------
-
-In JavaScript, these are equivalent:
-
-    foo = { 'bar': 42 };
-    foo = { bar: 42 };
-
-and so are these:
-
-    var b = foo['bar'];
-    var b = foo.bar;
-
-If your usage of an object is like an object, then you're defining "member
-variables." For member variables, use the no-quotes no-brackets syntax: `{ bar:
-42 }` `foo.bar`.
-
-If your usage of an object is like a hash table (and thus conceptually the keys
-can have special chars in them), don't use quotes, but use brackets: `{ bar: 42
-}`, `foo['bar']`.
-
-Getters, setters, and Tweener
------------------------------
-
-Getters and setters should be used when you are dealing with an API that is
-designed around setting properties, like Tweener. If you want to animate an
-arbitrary property, create a getter and setter, and use Tweener to animate the
-property.
-
-    const ANIMATION_TIME = 2000;
-
-    const MyClass = new Lang.Class({
-        Name: 'MyClass',
-
-        _init: function() {
-            this.actor = new St.BoxLayout();
-            this._position = 0;
-        },
-
-        get position() {
-            return this._position;
-        },
-
-        set position(value) {
-            this._position = value;
-            this.actor.set_position(value, value);
-        }
-    });
-
-    let myThing = new MyClass();
-    Tweener.addTween(myThing,
-                     { position: 100,
-                       time: ANIMATION_TIME,
-                       transition: 'easeOutQuad' });

Makefile.am

@@ -1,15 +1,7 @@
 # Point to our macro directory and pick up user flags from the environment
 ACLOCAL_AMFLAGS  = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = data js src  tests po docs
-
-if BUILD_BROWSER_PLUGIN
-SUBDIRS += browser-plugin
-endif
-
-if ENABLE_MAN
-SUBDIRS += man
-endif
+SUBDIRS = data js src browser-plugin tests po man docs
 
 EXTRA_DIST =		\
 	.project	\
@@ -20,9 +12,7 @@ EXTRA_DIST =		\
 # These are files checked into Git that we don't want to distribute
 DIST_EXCLUDE =					\
 	.gitignore				\
-	.gitmodules				\
 	gnome-shell.doap			\
-	HACKING					\
 	MAINTAINERS				\
 	tools/build/*
 
@@ -30,4 +20,4 @@ distcheck-hook:
 	@echo "Checking disted files against files in git"
 	@$(srcdir)/tools/check-for-missing.py $(srcdir) $(distdir) $(DIST_EXCLUDE)
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc

autogen.sh

@@ -13,14 +13,6 @@ PKG_NAME="gnome-shell"
     exit 1
 }
 
-# Fetch submodules if needed
-if test ! -f src/gvc/Makefile.am;
-then
-  echo "+ Setting up submodules"
-  git submodule init
-fi
-git submodule update
-
 which gnome-autogen.sh || {
     echo "You need to install gnome-common from GNOME Git (or from"
     echo "your OS vendor's package manager)."

browser-plugin/Makefile.am

@@ -17,4 +17,5 @@ libgnome_shell_browser_plugin_la_SOURCES = 	\
 
 libgnome_shell_browser_plugin_la_CFLAGS = 	\
 	$(BROWSER_PLUGIN_CFLAGS)		\
+	-DG_DISABLE_DEPRECATED			\
 	-DG_LOG_DOMAIN=\"GnomeShellBrowserPlugin\"

browser-plugin/browser-plugin.c

@@ -41,7 +41,7 @@
       "It can be used only by extensions.gnome.org"
 #define PLUGIN_MIME_STRING "application/x-gnome-shell-integration::Gnome Shell Integration Dummy Content-Type";
 
-#define PLUGIN_API_VERSION 5
+#define PLUGIN_API_VERSION 1
 
 typedef struct {
   GDBusProxy *proxy;
@@ -104,7 +104,7 @@ check_origin_and_protocol (NPP instance)
                           &location))
     goto out;
 
-  if (!NPVARIANT_IS_OBJECT (location))
+  if (!NPVARIANT_IS_OBJECT (document))
     goto out;
 
   hostname = get_string_property (instance,
@@ -161,7 +161,6 @@ NP_Initialize(NPNetscapeFuncs *pfuncs, NPPluginFuncs *plugin)
   plugin->newp = NPP_New;
   plugin->destroy = NPP_Destroy;
   plugin->getvalue = NPP_GetValue;
-  plugin->setwindow = NPP_SetWindow;
 
   return NPERR_NO_ERROR;
 }
@@ -223,7 +222,7 @@ NPP_New(NPMIMEType    mimetype,
                                                NULL, /* interface info */
                                                "org.gnome.Shell",
                                                "/org/gnome/Shell",
-                                               "org.gnome.Shell.Extensions",
+                                               "org.gnome.Shell",
                                                NULL, /* GCancellable */
                                                &error);
   if (!data->proxy)
@@ -263,14 +262,11 @@ NPP_Destroy(NPP           instance,
 /* =================== scripting interface =================== */
 
 typedef struct {
-  NPObject     parent;
-  NPP          instance;
-  GDBusProxy  *proxy;
-  GSettings   *settings;
-  NPObject    *listener;
-  NPObject    *restart_listener;
-  gint         signal_id;
-  guint        watch_name_id;
+	NPObject     parent;
+	NPP          instance;
+	GDBusProxy  *proxy;
+	NPObject    *listener;
+	gint         signal_id;
 } PluginObject;
 
 static void
@@ -288,7 +284,7 @@ on_shell_signal (GDBusProxy *proxy,
       gint32 status;
       gchar *error;
       NPVariant args[3];
-      NPVariant result = { NPVariantType_Void };
+      NPVariant result;
 
       g_variant_get (parameters, "(sis)", &uuid, &status, &error);
       STRINGZ_TO_NPVARIANT (uuid, args[0]);
@@ -304,28 +300,6 @@ on_shell_signal (GDBusProxy *proxy,
     }
 }
 
-static void
-on_shell_appeared (GDBusConnection *connection,
-                   const gchar     *name,
-                   const gchar     *name_owner,
-                   gpointer         user_data)
-{
-  PluginObject *obj = (PluginObject*) user_data;
-
-  if (obj->restart_listener)
-    {
-      NPVariant result = { NPVariantType_Void };
-
-      funcs.invokeDefault (obj->instance, obj->restart_listener,
-                           NULL, 0, &result);
-
-      funcs.releasevariantvalue (&result);
-    }
-}
-
-#define SHELL_SCHEMA "org.gnome.shell"
-#define ENABLED_EXTENSIONS_KEY "enabled-extensions"
-
 static NPObject *
 plugin_object_allocate (NPP      instance,
                         NPClass *klass)
@@ -335,18 +309,9 @@ plugin_object_allocate (NPP      instance,
 
   obj->instance = instance;
   obj->proxy = g_object_ref (data->proxy);
-  obj->settings = g_settings_new (SHELL_SCHEMA);
   obj->signal_id = g_signal_connect (obj->proxy, "g-signal",
                                      G_CALLBACK (on_shell_signal), obj);
 
-  obj->watch_name_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                                         "org.gnome.Shell",
-                                         G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                         on_shell_appeared,
-                                         NULL,
-                                         obj,
-                                         NULL);
-
   g_debug ("plugin object created");
 
   return (NPObject*)obj;
@@ -363,22 +328,41 @@ plugin_object_deallocate (NPObject *npobj)
   if (obj->listener)
     funcs.releaseobject (obj->listener);
 
-  if (obj->watch_name_id)
-    g_bus_unwatch_name (obj->watch_name_id);
-
   g_debug ("plugin object destroyed");
 
   g_slice_free (PluginObject, obj);
 }
 
+static NPIdentifier api_version_id;
+static NPIdentifier shell_version_id;
+static NPIdentifier get_info_id;
+static NPIdentifier list_extensions_id;
+static NPIdentifier enable_extension_id;
+static NPIdentifier install_extension_id;
+static NPIdentifier uninstall_extension_id;
+static NPIdentifier onextension_changed_id;
+static NPIdentifier get_errors_id;
+
+static bool
+plugin_object_has_method (NPObject     *npobj,
+                          NPIdentifier  name)
+{
+  return (name == get_info_id ||
+          name == list_extensions_id ||
+          name == enable_extension_id ||
+          name == install_extension_id ||
+          name == uninstall_extension_id ||
+          name == get_errors_id);
+}
+
 static inline gboolean
-uuid_is_valid (NPString string)
+uuid_is_valid (const gchar *uuid)
 {
   gsize i;
 
-  for (i = 0; i < string.UTF8Length; i++)
+  for (i = 0; uuid[i]; i ++)
     {
-      gchar c = string.UTF8Characters[i];
+      gchar c = uuid[i];
       if (c < 32 || c >= 127)
         return FALSE;
 
@@ -442,73 +426,8 @@ jsonify_variant (GVariant  *variant,
 }
 
 static gboolean
-parse_args (const gchar     *format_str,
-            uint32_t         argc,
-            const NPVariant *argv,
-            ...)
-{
-  va_list args;
-  gsize i;
-  gboolean ret = FALSE;
-
-  if (strlen (format_str) != argc)
-    return FALSE;
-
-  va_start (args, argv);
-
-  for (i = 0; format_str[i]; i++)
-    {
-      gpointer arg_location;
-      const NPVariant arg = argv[i];
-
-      arg_location = va_arg (args, gpointer);
-
-      switch (format_str[i])
-        {
-        case 'u':
-          {
-            NPString string;
-
-            if (!NPVARIANT_IS_STRING (arg))
-              goto out;
-
-            string = NPVARIANT_TO_STRING (arg);
-
-            if (!uuid_is_valid (string))
-              goto out;
-
-            *(gchar **) arg_location = g_strndup (string.UTF8Characters, string.UTF8Length);
-          }
-          break;
-
-        case 'b':
-          if (!NPVARIANT_IS_BOOLEAN (arg))
-            goto out;
-
-          *(gboolean *) arg_location = NPVARIANT_TO_BOOLEAN (arg);
-          break;
-
-        case 'o':
-          if (!NPVARIANT_IS_OBJECT (arg))
-            goto out;
-
-          *(NPObject **) arg_location = NPVARIANT_TO_OBJECT (arg);
-        }
-    }
-
-  ret = TRUE;
-
- out:
-  va_end (args);
-
-  return ret;
-}
-
-static gboolean
-plugin_list_extensions (PluginObject    *obj,
-                        uint32_t         argc,
-                        const NPVariant *args,
-                        NPVariant       *result)
+plugin_list_extensions (PluginObject  *obj,
+                        NPVariant     *result)
 {
   GError *error = NULL;
   GVariant *res;
@@ -532,160 +451,71 @@ plugin_list_extensions (PluginObject    *obj,
 }
 
 static gboolean
-plugin_enable_extension (PluginObject    *obj,
-                         uint32_t         argc,
-                         const NPVariant *argv,
-                         NPVariant       *result)
+plugin_enable_extension (PluginObject *obj,
+                         NPString      uuid,
+                         gboolean      enabled)
 {
-  gboolean ret;
-  gchar *uuid;
-  gboolean enabled;
-  gsize length;
-  gchar **uuids;
-  const gchar **new_uuids;
-
-  if (!parse_args ("ub", argc, argv, &uuid, &enabled))
+  const gchar *uuid_str = uuid.UTF8Characters;
+  if (!uuid_is_valid (uuid_str))
     return FALSE;
 
-  uuids = g_settings_get_strv (obj->settings, ENABLED_EXTENSIONS_KEY);
-  length = g_strv_length (uuids);
-
-  if (enabled)
-    {
-      new_uuids = g_new (const gchar *, length + 2); /* New key, NULL */
-      memcpy (new_uuids, uuids, length * sizeof (*new_uuids));
-      new_uuids[length] = uuid;
-      new_uuids[length + 1] = NULL;
-    }
-  else
-    {
-      gsize i = 0, j = 0;
-      new_uuids = g_new (const gchar *, length);
-      for (i = 0; i < length; i ++)
-        {
-          if (g_str_equal (uuids[i], uuid))
-            continue;
-
-          new_uuids[j] = uuids[i];
-          j++;
-        }
-
-      new_uuids[j] = NULL;
-    }
-
-  ret = g_settings_set_strv (obj->settings,
-                             ENABLED_EXTENSIONS_KEY,
-                             new_uuids);
-
-  g_strfreev (uuids);
-  g_free (new_uuids);
-  g_free (uuid);
-
-  return ret;
-}
-
-typedef struct _AsyncClosure AsyncClosure;
-
-struct _AsyncClosure {
-  PluginObject *obj;
-  NPObject *callback;
-  NPObject *errback;
-};
-
-static void
-install_extension_cb (GObject      *proxy,
-                      GAsyncResult *async_res,
-                      gpointer      user_data)
-{
-  AsyncClosure *async_closure = (AsyncClosure *) user_data;
-  GError *error = NULL;
-  GVariant *res;
-  NPVariant args[1];
-  NPVariant result = { NPVariantType_Void };
-  NPObject *callback;
-
-  res = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), async_res, &error);
-
-  if (res == NULL)
-    {
-      if (g_dbus_error_is_remote_error (error))
-        g_dbus_error_strip_remote_error (error);
-      STRINGZ_TO_NPVARIANT (error->message, args[0]);
-      callback = async_closure->errback;
-    }
-  else
-    {
-      char *string_result;
-      g_variant_get (res, "(&s)", &string_result);
-      STRINGZ_TO_NPVARIANT (string_result, args[0]);
-      callback = async_closure->callback;
-    }
-
-  funcs.invokeDefault (async_closure->obj->instance,
-                       callback, args, 1, &result);
-
-  funcs.releasevariantvalue (&result);
-
-  funcs.releaseobject (async_closure->callback);
-  funcs.releaseobject (async_closure->errback);
-  g_slice_free (AsyncClosure, async_closure);
-}
-
-static gboolean
-plugin_install_extension (PluginObject    *obj,
-                          uint32_t         argc,
-                          const NPVariant *argv,
-                          NPVariant       *result)
-{
-  gchar *uuid;
-  NPObject *callback, *errback;
-  AsyncClosure *async_closure;
-
-  if (!parse_args ("uoo", argc, argv, &uuid, &callback, &errback))
-    return FALSE;
-
-  async_closure = g_slice_new (AsyncClosure);
-  async_closure->obj = obj;
-  async_closure->callback = funcs.retainobject (callback);
-  async_closure->errback = funcs.retainobject (errback);
-
   g_dbus_proxy_call (obj->proxy,
-                     "InstallRemoteExtension",
-                     g_variant_new ("(s)", uuid),
+                     (enabled ? "EnableExtension" : "DisableExtension"),
+                     g_variant_new ("(s)", uuid_str),
                      G_DBUS_CALL_FLAGS_NONE,
                      -1, /* timeout */
                      NULL, /* cancellable */
-                     install_extension_cb,
-                     async_closure);
-
-  g_free (uuid);
+                     NULL, /* callback */
+                     NULL /* user_data */);
 
   return TRUE;
 }
 
 static gboolean
-plugin_uninstall_extension (PluginObject    *obj,
-                            uint32_t         argc,
-                            const NPVariant *argv,
-                            NPVariant       *result)
+plugin_install_extension (PluginObject *obj,
+                          NPString      uuid,
+                          NPString      version_tag)
+{
+  const gchar *uuid_str = uuid.UTF8Characters;
+  if (!uuid_is_valid (uuid_str))
+    return FALSE;
+
+  g_dbus_proxy_call (obj->proxy,
+                     "InstallRemoteExtension",
+                     g_variant_new ("(ss)",
+                                    uuid_str,
+                                    version_tag.UTF8Characters),
+                     G_DBUS_CALL_FLAGS_NONE,
+                     -1, /* timeout */
+                     NULL, /* cancellable */
+                     NULL, /* callback */
+                     NULL /* user_data */);
+
+  return TRUE;
+}
+
+static gboolean
+plugin_uninstall_extension (PluginObject *obj,
+                            NPString      uuid,
+                            NPVariant    *result)
 {
   GError *error = NULL;
   GVariant *res;
-  gchar *uuid;
+  const gchar *uuid_str;
 
-  if (!parse_args ("u", argc, argv, &uuid))
+  uuid_str = uuid.UTF8Characters;
+  if (!uuid_is_valid (uuid_str))
     return FALSE;
 
   res = g_dbus_proxy_call_sync (obj->proxy,
                                 "UninstallExtension",
-                                g_variant_new ("(s)", uuid),
+                                g_variant_new ("(s)",
+                                               uuid_str),
                                 G_DBUS_CALL_FLAGS_NONE,
                                 -1, /* timeout */
                                 NULL, /* cancellable */
                                 &error);
 
-  g_free (uuid);
-
   if (!res)
     {
       g_warning ("Failed to uninstall extension: %s", error->message);
@@ -697,28 +527,26 @@ plugin_uninstall_extension (PluginObject    *obj,
 }
 
 static gboolean
-plugin_get_info (PluginObject    *obj,
-                 uint32_t         argc,
-                 const NPVariant *argv,
-                 NPVariant       *result)
+plugin_get_info (PluginObject *obj,
+                 NPString      uuid,
+                 NPVariant    *result)
 {
   GError *error = NULL;
   GVariant *res;
-  gchar *uuid;
+  const gchar *uuid_str;
 
-  if (!parse_args ("u", argc, argv, &uuid))
+  uuid_str = uuid.UTF8Characters;
+  if (!uuid_is_valid (uuid_str))
     return FALSE;
 
   res = g_dbus_proxy_call_sync (obj->proxy,
                                 "GetExtensionInfo",
-                                g_variant_new ("(s)", uuid),
+                                g_variant_new ("(s)", uuid_str),
                                 G_DBUS_CALL_FLAGS_NONE,
                                 -1, /* timeout */
                                 NULL, /* cancellable */
                                 &error);
 
-  g_free (uuid);
-
   if (!res)
     {
       g_warning ("Failed to retrieve extension metadata: %s", error->message);
@@ -730,21 +558,21 @@ plugin_get_info (PluginObject    *obj,
 }
 
 static gboolean
-plugin_get_errors (PluginObject    *obj,
-                   uint32_t         argc,
-                   const NPVariant *argv,
-                   NPVariant       *result)
+plugin_get_errors (PluginObject *obj,
+                   NPString      uuid,
+                   NPVariant    *result)
 {
   GError *error = NULL;
   GVariant *res;
-  gchar *uuid;
+  const gchar *uuid_str;
 
-  if (!parse_args ("u", argc, argv, &uuid))
+  uuid_str = uuid.UTF8Characters;
+  if (!uuid_is_valid (uuid_str))
     return FALSE;
 
   res = g_dbus_proxy_call_sync (obj->proxy,
                                 "GetExtensionErrors",
-                                g_variant_new ("(s)", uuid),
+                                g_variant_new ("(s)", uuid_str),
                                 G_DBUS_CALL_FLAGS_NONE,
                                 -1, /* timeout */
                                 NULL, /* cancellable */
@@ -760,29 +588,6 @@ plugin_get_errors (PluginObject    *obj,
   return jsonify_variant (res, result);
 }
 
-static gboolean
-plugin_launch_extension_prefs (PluginObject    *obj,
-                               uint32_t         argc,
-                               const NPVariant *argv,
-                               NPVariant       *result)
-{
-  gchar *uuid;
-
-  if (!parse_args ("u", argc, argv, &uuid))
-    return FALSE;
-
-  g_dbus_proxy_call (obj->proxy,
-                     "LaunchExtensionPrefs",
-                     g_variant_new ("(s)", uuid),
-                     G_DBUS_CALL_FLAGS_NONE,
-                     -1, /* timeout */
-                     NULL, /* cancellable */
-                     NULL, /* callback */
-                     NULL /* user_data */);
-
-  return TRUE;
-}
-
 static int
 plugin_get_api_version (PluginObject  *obj,
                         NPVariant     *result)
@@ -828,45 +633,14 @@ plugin_get_shell_version (PluginObject  *obj,
   STRINGN_TO_NPVARIANT (buffer, length, *result);
 
  out:
-  if (res)
-    g_variant_unref (res);
+  g_variant_unref (res);
   return ret;
 }
 
-#define METHODS                                 \
-  METHOD (list_extensions)                      \
-  METHOD (get_info)                             \
-  METHOD (enable_extension)                     \
-  METHOD (install_extension)                    \
-  METHOD (uninstall_extension)                  \
-  METHOD (get_errors)                           \
-  METHOD (launch_extension_prefs)               \
-  /* */
-
-#define METHOD(x)                               \
-  static NPIdentifier x##_id;
-METHODS
-#undef METHOD
-
-static NPIdentifier api_version_id;
-static NPIdentifier shell_version_id;
-static NPIdentifier onextension_changed_id;
-static NPIdentifier onrestart_id;
-
-static bool
-plugin_object_has_method (NPObject     *npobj,
-                          NPIdentifier  name)
-{
-#define METHOD(x) (name == (x##_id)) ||
-  /* expands to (name == list_extensions_id) || FALSE; */
-  return METHODS FALSE;
-#undef METHOD
-}
-
 static bool
 plugin_object_invoke (NPObject        *npobj,
                       NPIdentifier     name,
-                      const NPVariant *argv,
+                      const NPVariant *args,
                       uint32_t         argc,
                       NPVariant       *result)
 {
@@ -878,13 +652,53 @@ plugin_object_invoke (NPObject        *npobj,
 
   VOID_TO_NPVARIANT (*result);
 
-#define METHOD(x)                                       \
-  if (name == x##_id)                                   \
-    return plugin_##x (obj, argc, argv, result);
-METHODS
-#undef METHOD
+  if (!plugin_object_has_method (npobj, name))
+    return FALSE;
 
-  return FALSE;
+  if (name == list_extensions_id)
+    return plugin_list_extensions (obj, result);
+  else if (name == get_info_id)
+    {
+      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
+
+      return plugin_get_info (obj, NPVARIANT_TO_STRING(args[0]), result);
+    }
+  else if (name == enable_extension_id)
+    {
+      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
+      if (!NPVARIANT_IS_BOOLEAN(args[1])) return FALSE;
+
+      return plugin_enable_extension (obj,
+                                      NPVARIANT_TO_STRING(args[0]),
+                                      NPVARIANT_TO_BOOLEAN(args[1]));
+    }
+  else if (name == install_extension_id)
+    {
+      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
+      if (!NPVARIANT_IS_STRING(args[1])) return FALSE;
+
+      return plugin_install_extension (obj,
+                                       NPVARIANT_TO_STRING(args[0]),
+                                       NPVARIANT_TO_STRING(args[1]));
+    }
+  else if (name == uninstall_extension_id)
+    {
+      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
+
+      return plugin_uninstall_extension (obj,
+                                         NPVARIANT_TO_STRING(args[0]),
+                                         result);
+    }
+  else if (name == get_errors_id)
+    {
+      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
+
+      return plugin_get_errors (obj,
+                                NPVARIANT_TO_STRING(args[0]),
+                                result);
+    }
+
+  return TRUE;
 }
 
 static bool
@@ -892,7 +706,6 @@ plugin_object_has_property (NPObject     *npobj,
                             NPIdentifier  name)
 {
   return (name == onextension_changed_id ||
-          name == onrestart_id ||
           name == api_version_id ||
           name == shell_version_id);
 }
@@ -919,33 +732,6 @@ plugin_object_get_property (NPObject     *npobj,
       else
         NULL_TO_NPVARIANT (*result);
     }
-  else if (name == onrestart_id)
-    {
-      if (obj->restart_listener)
-        OBJECT_TO_NPVARIANT (obj->restart_listener, *result);
-      else
-        NULL_TO_NPVARIANT (*result);
-    }
-
-  return TRUE;
-}
-
-static bool
-plugin_object_set_callback (NPObject        **listener,
-                            const NPVariant  *value)
-{
-  if (!NPVARIANT_IS_OBJECT (*value) && !NPVARIANT_IS_NULL (*value))
-    return FALSE;
-
-  if (*listener)
-    funcs.releaseobject (*listener);
-  *listener = NULL;
-
-  if (NPVARIANT_IS_OBJECT (*value))
-    {
-      *listener = NPVARIANT_TO_OBJECT (*value);
-      funcs.retainobject (*listener);
-    }
 
   return TRUE;
 }
@@ -957,13 +743,25 @@ plugin_object_set_property (NPObject        *npobj,
 {
   PluginObject *obj;
 
-  obj = (PluginObject *)npobj;
+  if (!plugin_object_has_property (npobj, name))
+    return FALSE;
 
   if (name == onextension_changed_id)
-    return plugin_object_set_callback (&obj->listener, value);
+    {
+      obj = (PluginObject*) npobj;
+      if (obj->listener)
+        funcs.releaseobject (obj->listener);
 
-  if (name == onrestart_id)
-    return plugin_object_set_callback (&obj->restart_listener, value);
+      obj->listener = NULL;
+      if (NPVARIANT_IS_OBJECT (*value))
+        {
+          obj->listener = NPVARIANT_TO_OBJECT (*value);
+          funcs.retainobject (obj->listener);
+          return TRUE;
+        }
+      else if (NPVARIANT_IS_NULL (*value))
+        return TRUE;
+    }
 
   return FALSE;
 }
@@ -997,9 +795,7 @@ init_methods_and_properties (void)
   install_extension_id = funcs.getstringidentifier ("installExtension");
   uninstall_extension_id = funcs.getstringidentifier ("uninstallExtension");
   get_errors_id = funcs.getstringidentifier ("getExtensionErrors");
-  launch_extension_prefs_id = funcs.getstringidentifier ("launchExtensionPrefs");
 
-  onrestart_id = funcs.getstringidentifier ("onshellrestart");
   onextension_changed_id = funcs.getstringidentifier ("onchange");
 }
 
@@ -1028,12 +824,3 @@ NPP_GetValue(NPP          instance,
 
   return NPERR_NO_ERROR;
 }
-
-/* Opera tries to call NPP_SetWindow without checking the
- * NULL pointer beforehand. */
-NPError
-NPP_SetWindow(NPP          instance,
-              NPWindow    *window)
-{
-  return NPERR_NO_ERROR;
-}

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.11.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.3.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -16,7 +16,8 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 # Checks for programs.
 AC_PROG_CC
-AC_PROG_CXX
+# Needed for per-target cflags, like in gnomeshell-taskpanel
+AM_PROG_CC_C_O
 
 # Initialize libtool
 LT_PREREQ([2.2.6])
@@ -25,6 +26,9 @@ LT_INIT([disable-static])
 # i18n
 IT_PROG_INTLTOOL([0.40])
 
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.17])
+
 GETTEXT_PACKAGE=gnome-shell
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
@@ -32,8 +36,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 
 PKG_PROG_PKG_CONFIG([0.22])
 
-AC_PATH_PROG([XSLTPROC], [xsltproc])
-
 GLIB_GSETTINGS
 
 # Get a value to substitute into gnome-shell.in
@@ -42,131 +44,109 @@ AC_SUBST(PYTHON)
 
 # We need at least this, since gst_plugin_register_static() was added
 # in 0.10.16, but nothing older than 0.10.21 has been tested.
-GSTREAMER_MIN_VERSION=0.11.92
+GSTREAMER_MIN_VERSION=0.10.16
 
 recorder_modules=
 build_recorder=false
 AC_MSG_CHECKING([for GStreamer (needed for recording functionality)])
-if $PKG_CONFIG --exists gstreamer-1.0 '>=' $GSTREAMER_MIN_VERSION ; then
+if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
    AC_MSG_RESULT(yes)
    build_recorder=true
-   recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11 gtk+-3.0"
-   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0)
+   recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
+   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes)
 else
    AC_MSG_RESULT(no)
 fi
 
 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 
-AC_ARG_ENABLE([systemd],
-              AS_HELP_STRING([--enable-systemd], [Use systemd]),
-              [enable_systemd=$enableval],
-              [enable_systemd=auto])
-AS_IF([test x$enable_systemd != xno], [
-  AC_MSG_CHECKING([for libsystemd-journal])
-  PKG_CHECK_EXISTS([libsystemd-journal],
-                   [have_systemd=yes
-                    AC_DEFINE([HAVE_SYSTEMD], [1], [Define if we have systemd])],
-                   [have_systemd=no])
-  AC_MSG_RESULT($have_systemd)
-])
-
-AC_MSG_RESULT($enable_systemd)
-
-CLUTTER_MIN_VERSION=1.13.4
+CLUTTER_MIN_VERSION=1.7.5
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
-GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.11.1
-GTK_MIN_VERSION=3.7.9
-GIO_MIN_VERSION=2.37.0
-LIBECAL_MIN_VERSION=3.5.3
-LIBEDATASERVER_MIN_VERSION=3.5.3
-TELEPATHY_GLIB_MIN_VERSION=0.17.5
+GJS_MIN_VERSION=1.29.18
+MUTTER_MIN_VERSION=3.3.2
+FOLKS_MIN_VERSION=0.5.2
+GTK_MIN_VERSION=3.0.0
+GIO_MIN_VERSION=2.31.0
+LIBECAL_MIN_VERSION=2.32.0
+LIBEDATASERVER_MIN_VERSION=1.2.0
+LIBEDATASERVERUI_MIN_VERSION=2.91.6
+TELEPATHY_GLIB_MIN_VERSION=0.15.5
+TELEPATHY_LOGGER_MIN_VERSION=0.2.4
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
-GCR_MIN_VERSION=3.7.5
-GNOME_DESKTOP_REQUIRED_VERSION=3.7.90
-NETWORKMANAGER_MIN_VERSION=0.9.8
-PULSE_MIN_VERS=2.0
 
 # Collect more than 20 libraries for a prize!
-SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
-            libxml-2.0
-            gtk+-3.0 >= $GTK_MIN_VERSION
-            atk-bridge-2.0
-            gjs-internals-1.0 >= $GJS_MIN_VERSION
-            $recorder_modules
-            gdk-x11-3.0 libsoup-2.4
-            xtst
-            clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
-            clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
-            libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
-            gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
-            libcanberra libcanberra-gtk3
-            telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
-            polkit-agent-1 >= $POLKIT_MIN_VERSION
-            libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
-            libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
-            libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION"
-if test x$have_systemd = xyes; then
-  SHARED_PCS="${SHARED_PCS} libsystemd-journal"
-fi
+PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
+			       libxml-2.0
+                               gtk+-3.0 >= $GTK_MIN_VERSION
+                               folks >= $FOLKS_MIN_VERSION
+                               libmutter >= $MUTTER_MIN_VERSION
+                               gjs-internals-1.0 >= $GJS_MIN_VERSION
+			       libgnome-menu-3.0 $recorder_modules
+                               gdk-x11-3.0 libsoup-2.4
+			       clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
+			       clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
+                               libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
+                               gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
+			       libcanberra
+                               telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
+                               telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
+                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+                               libnm-glib libnm-util gnome-keyring-1)
 
-PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
-PKG_CHECK_MODULES(MUTTER, libmutter >= $MUTTER_MIN_VERSION)
-PKG_CHECK_MODULES(MUTTER_WAYLAND, [libmutter-wayland >= $MUTTER_MIN_VERSION],
-                 [MUTTER_WAYLAND_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter-wayland`
-                  AC_SUBST(MUTTER_WAYLAND_TYPELIB_DIR)
-                  have_mutter_wayland=yes],
-                 [have_mutter_wayland=no])
-
-AM_CONDITIONAL(HAVE_MUTTER_WAYLAND, test $have_mutter_wayland != no)
-
-PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11)
 PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
+
 PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
+
+PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
+
+GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
+AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
+AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
+
+GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
+JHBUILD_TYPELIBDIR="$INTROSPECTION_TYPELIBDIR"
+AC_SUBST(JHBUILD_TYPELIBDIR)
+
+saved_CFLAGS=$CFLAGS
+saved_LIBS=$LIBS
+CFLAGS=$GNOME_SHELL_CFLAGS
+LIBS=$GNOME_SHELL_LIBS
+AC_CHECK_FUNCS(JS_NewGlobalObject XFixesCreatePointerBarrier)
+CFLAGS=$saved_CFLAGS
+LIBS=$saved_LIBS
+
+PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
-PKG_CHECK_MODULES(GVC, libpulse >= $PULSE_MIN_VERS libpulse-mainloop-glib gobject-2.0)
-PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4)
-PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8)
+PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
 
-AC_ARG_ENABLE(browser-plugin,
-              [AS_HELP_STRING([--enable-browser-plugin],
-                              [Enable browser plugin [default=yes]])],,
-              enable_browser_plugin=yes)
-AS_IF([test x$enable_browser_plugin = xyes], [
-  PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
-])
-AM_CONDITIONAL(BUILD_BROWSER_PLUGIN, test x$enable_browser_plugin = xyes)
-
-PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 3.9.0,
-        [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
-	 AC_SUBST([HAVE_BLUETOOTH],[1])],
+AC_MSG_CHECKING([for bluetooth support])
+PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
+        [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
+	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
+	 AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
+	 AC_SUBST([BLUETOOTH_DIR],["$BLUETOOTH_DIR"])
+	 AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library])
+	 AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
+	 AC_SUBST([HAVE_BLUETOOTH],[1])
+	 AC_MSG_RESULT([yes])],
 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
-	 AC_SUBST([HAVE_BLUETOOTH],[0])])
+	 AC_SUBST([HAVE_BLUETOOTH],[0])
+	 AC_MSG_RESULT([no])])
 
-PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0)
+PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0)
 AC_SUBST(CALENDAR_SERVER_CFLAGS)
 AC_SUBST(CALENDAR_SERVER_LIBS)
 
-GNOME_KEYBINDINGS_KEYSDIR=`$PKG_CONFIG --variable keysdir gnome-keybindings`
-AC_SUBST([GNOME_KEYBINDINGS_KEYSDIR])
-
-GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
-
 MUTTER_GIR_DIR=`$PKG_CONFIG --variable=girdir libmutter`
-AC_SUBST(MUTTER_GIR_DIR)
-
 MUTTER_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter`
+AC_SUBST(MUTTER_GIR_DIR)
 AC_SUBST(MUTTER_TYPELIB_DIR)
 
 GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
 AC_SUBST(GJS_CONSOLE)
 
-GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
-AC_SUBST(GLIB_COMPILE_RESOURCES)
-
 AC_CHECK_FUNCS(fdwalk)
 AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_HEADERS([sys/resource.h])
@@ -184,22 +164,74 @@ fi
 
 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
 AM_PATH_GLIB_2_0()
+G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+AC_SUBST(G_IR_SCANNER)
+G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+AC_SUBST(G_IR_COMPILER)
+G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+AC_SUBST(G_IR_GENERATE)
+GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+AC_SUBST(GIRDIR)
+TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+AC_SUBST(TYPELIBDIR)
 
 GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
 
-AC_ARG_ENABLE(man,
-              [AS_HELP_STRING([--enable-man],
-                              [generate man pages [default=yes]])],,
-              enable_man=yes)
-if test "$enable_man" != no; then
-  AC_PATH_PROG([XSLTPROC], [xsltproc])
-  if test -z "$XSLTPROC"; then
-    AC_MSG_ERROR([xsltproc is required for --enable-man])
+# Stay command-line compatible with the gnome-common configure option. Here
+# minimum/yes/maximum are the same, however.
+AC_ARG_ENABLE(compile_warnings,
+  AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],[Turn on compiler warnings]),,
+  enable_compile_warnings=maximum)
+
+changequote(,)dnl
+if test "$enable_compile_warnings" != no ; then
+  if test "x$GCC" = "xyes"; then
+    case " $CFLAGS " in
+    *[\ \	]-Wall[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -Wall" ;;
+    esac
+    case " $CFLAGS " in
+    *[\ \	]-Wmissing-prototypes[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
+    esac
+    if test "$enable_compile_warnings" = error ; then
+      case " $CFLAGS " in
+      *[\ \	]-Werror[\ \	]*) ;;
+      *) CFLAGS="$CFLAGS -Werror" ;;
+      esac
+    fi
   fi
 fi
-AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
+changequote([,])dnl
 
-GNOME_COMPILE_WARNINGS([error])
+AC_ARG_ENABLE(jhbuild-wrapper-script,
+  AS_HELP_STRING([--jhbuild-wrapper-script=yes],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no)
+AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIPT, test "x$enable_jhbuild_wrapper_script" = xyes)
+
+AC_MSG_CHECKING([location of system Certificate Authority list])
+AC_ARG_WITH(ca-certificates,
+            [AC_HELP_STRING([--with-ca-certificates=@<:@path@:>@],
+                            [path to system Certificate Authority list])])
+
+if test "$with_ca_certificates" = "no"; then
+    AC_MSG_RESULT([disabled])
+else
+    if test -z "$with_ca_certificates"; then
+        for f in /etc/pki/tls/certs/ca-bundle.crt \
+                 /etc/ssl/certs/ca-certificates.crt; do
+             if test -f "$f"; then
+                with_ca_certificates="$f"
+             fi
+        done
+        if test -z "$with_ca_certificates"; then
+            AC_MSG_ERROR([could not find. Use --with-ca-certificates=path to set, or --without-ca-certificates to disable])
+        fi
+   fi
+
+   AC_MSG_RESULT($with_ca_certificates)
+   AC_DEFINE_UNQUOTED(SHELL_SYSTEM_CA_FILE, ["$with_ca_certificates"], [The system TLS CA list])
+fi
+AC_SUBST(SHELL_SYSTEM_CA_FILE,["$with_ca_certificates"])
 
 BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
@@ -214,9 +246,8 @@ AC_CONFIG_FILES([
   docs/reference/st/Makefile
   docs/reference/st/st-docs.sgml
   js/Makefile
-  src/calendar-server/evolution-calendar.desktop.in
+  js/misc/config.js
   src/Makefile
-  src/gvc/Makefile
   browser-plugin/Makefile
   tests/Makefile
   po/Makefile.in

data/50-gnome-shell-system.xml.in

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.shell.keybindings"
-                group="system"
-                _name="System"
-                wm_name="GNOME Shell"
-                package="gnome-shell">
-
-	<KeyListEntry name="toggle-message-tray"
-                      _description="Show the message tray"/>
-
-	<KeyListEntry name="focus-active-notification"
-                      _description="Focus the active notification"/>
-
-	<KeyListEntry name="toggle-overview"
-                      _description="Show the overview"/>
-
-	<KeyListEntry name="toggle-application-view"
-                      _description="Show all applications"/>
-
-	<KeyListEntry name="open-application-menu"
-                      _description="Open the application menu"/>
-
-</KeyListEntries>
-

data/Makefile.am

@@ -1,9 +1,5 @@
 desktopdir=$(datadir)/applications
-desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
-if HAVE_MUTTER_WAYLAND
-desktop_DATA += gnome-shell-wayland.desktop
-endif HAVE_MUTTER_WAYLAND
-
+desktop_DATA = gnome-shell.desktop
 
 # We substitute in bindir so it works as an autostart
 # file when built in a non-system prefix
@@ -12,24 +8,20 @@ endif HAVE_MUTTER_WAYLAND
 	    -e "s|@VERSION[@]|$(VERSION)|" \
 	    $< > $@ || rm $@
 
-@INTLTOOL_DESKTOP_RULE@
+# Placeholder until we add intltool
+%.desktop:%.desktop.in
+	$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@
 
-introspectiondir = $(datadir)/dbus-1/interfaces
-introspection_DATA =				\
-	org.gnome.Shell.Screencast.xml		\
-	org.gnome.Shell.Screenshot.xml		\
-	org.gnome.ShellSearchProvider.xml	\
-	org.gnome.ShellSearchProvider2.xml
+searchprovidersdir = $(pkgdatadir)/search_providers
+dist_searchproviders_DATA =				\
+	search_providers/google.xml				\
+	search_providers/wikipedia.xml
 
 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
 	theme/calendar-arrow-left.svg		\
 	theme/calendar-arrow-right.svg		\
 	theme/calendar-today.svg		\
-	theme/checkbox-focused.svg		\
-	theme/checkbox-off-focused.svg		\
-	theme/checkbox-off.svg			\
-	theme/checkbox.svg			\
 	theme/close-window.svg			\
 	theme/close.svg				\
 	theme/corner-ripple-ltr.png		\
@@ -37,41 +29,27 @@ dist_theme_DATA =				\
 	theme/dash-placeholder.svg		\
 	theme/filter-selected-ltr.svg		\
 	theme/filter-selected-rtl.svg		\
+	theme/gdm.css				\
 	theme/gnome-shell.css			\
-	theme/logged-in-indicator.svg		\
-	theme/message-tray-background.png	\
-	theme/more-results.svg			\
-	theme/noise-texture.png			\
-	theme/page-indicator-active.svg		\
-	theme/page-indicator-inactive.svg	\
-	theme/page-indicator-checked.svg	\
-	theme/page-indicator-hover.svg		\
+	theme/panel-border.svg			\
 	theme/panel-button-border.svg		\
 	theme/panel-button-highlight-narrow.svg	\
 	theme/panel-button-highlight-wide.svg	\
 	theme/process-working.svg		\
 	theme/running-indicator.svg		\
+	theme/scroll-hhandle.svg		\
+	theme/scroll-vhandle.svg		\
 	theme/source-button-border.svg		\
-	theme/summary-counter.svg		\
 	theme/toggle-off-us.svg			\
 	theme/toggle-off-intl.svg		\
 	theme/toggle-on-us.svg			\
 	theme/toggle-on-intl.svg		\
-	theme/ws-switch-arrow-up.png		\
-	theme/ws-switch-arrow-down.png
-
-keysdir = @GNOME_KEYBINDINGS_KEYSDIR@
-keys_in_files = 50-gnome-shell-system.xml.in
-keys_DATA = $(keys_in_files:.xml.in=.xml)
+	theme/ws-switch-arrow-up.svg		\
+	theme/ws-switch-arrow-down.svg
 
 gsettings_SCHEMAS = org.gnome.shell.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
-
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) sed -e 's|@GETTEXT_PACKAGE[@]|$(GETTEXT_PACKAGE)|g' \
-	$< > $@ || rm $@
-
 @GSETTINGS_RULES@
 
 # We need to compile schemas at make time
@@ -81,26 +59,21 @@ gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid)
 
 all-local: gschemas.compiled
 
-convertdir = $(datadir)/GConf/gsettings
-convert_DATA = gnome-shell-overrides.convert
+
+shadersdir = $(pkgdatadir)/shaders
+shaders_DATA = \
+	shaders/dim-window.glsl
+
 
 EXTRA_DIST =						\
 	gnome-shell.desktop.in.in			\
-	gnome-shell-wayland.desktop.in.in		\
-	gnome-shell-extension-prefs.desktop.in.in	\
-	$(introspection_DATA)				\
 	$(menu_DATA)					\
-	$(convert_DATA)					\
-	$(keys_in_files)				\
-	org.gnome.shell.gschema.xml.in.in
+	$(shaders_DATA)					\
+	org.gnome.shell.gschema.xml.in
 
 CLEANFILES =						\
 	gnome-shell.desktop.in				\
-	gnome-shell-wayland.desktop.in			\
-	gnome-shell-extension-prefs.in			\
 	$(desktop_DATA)					\
-	$(keys_DATA)					\
 	$(gsettings_SCHEMAS)				\
-	gschemas.compiled				\
-	org.gnome.shell.gschema.valid			\
-	org.gnome.shell.gschema.xml.in
+	gschemas.compiled
+

data/gnome-shell-extension-prefs.desktop.in.in

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=GNOME Shell Extension Preferences
-_Comment=Configure GNOME Shell Extensions
-Exec=@bindir@/gnome-shell-extension-prefs %u
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-shell
-X-GNOME-Bugzilla-Component=extensions
-X-GNOME-Bugzilla-Version=@VERSION@
-Categories=GNOME;GTK;
-OnlyShowIn=GNOME;
-NoDisplay=true

data/gnome-shell-overrides.convert

@@ -1,5 +0,0 @@
-[org.gnome.shell.overrides]
-attach-modal-dialogs = /desktop/gnome/shell/windows/attach_modal_dialogs
-button-layout = /desktop/gnome/shell/windows/button_layout
-edge-tiling = /desktop/gnome/shell/windows/edge_tiling
-workspaces-only-on-primary = /desktop/gnome/shell/windows/workspaces_only_on_primary

data/gnome-shell-wayland.desktop.in.in

@@ -1,15 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=GNOME Shell (wayland compositor)
-_Comment=Window management and application launching
-Exec=@bindir@/mutter-launch -- gnome-shell-wayland --wayland
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-shell
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
-Categories=GNOME;GTK;Core;
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=DisplayServer
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=false

data/gnome-shell.desktop.in.in

@@ -13,4 +13,4 @@ NoDisplay=true
 X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=panel;windowmanager;
 X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=false
+X-GNOME-AutoRestart=true

data/org.gnome.Shell.Screencast.xml

@@ -1,96 +0,0 @@
-<!DOCTYPE node PUBLIC
-'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
-'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
-<node>
-
-  <!--
-      org.gnome.Shell.Screencast:
-      @short_description: Screencast interface
-
-      The interface used to record screen contents.
-  -->
-  <interface name="org.gnome.Shell.Screencast">
-
-    <!--
-        Screencast:
-        @file_template: the template for the filename to use
-        @options: a dictionary of optional parameters
-        @success: whether the screencast was started successfully
-        @filename_used: the file where the screencast is being saved
-
-        Records a screencast of the whole screen and saves it
-        (by default) as webm video under a filename derived from
-        @file_template. The template is either a relative or absolute
-        filename which may contain some escape sequences - %d and %t
-        will be replaced by the start date and time of the recording.
-        If a relative name is used, the screencast will be saved in the
-        $XDG_VIDEOS_DIR if it exists, or the home directory otherwise.
-        The actual filename of the saved video is returned in @filename_used.
-        The set of optional parameters in @options currently consists of:
-            'draw-cursor'(b): whether the cursor should be included in the
-                              recording (true)
-            'framerate'(i): the number of frames per second that should be
-                            recorded if possible (30)
-            'pipeline'(s): the GStreamer pipeline used to encode recordings
-                           in gst-launch format; if not specified, the
-                           recorder will produce vp8 (webm) video (unset)
-    -->
-    <method name="Screencast">
-      <arg type="s" direction="in" name="file_template"/>
-      <arg type="a{sv}" direction="in" name="options"/>
-      <arg type="b" direction="in" name="flash"/>
-      <arg type="b" direction="out" name="success"/>
-      <arg type="s" direction="out" name="filename_used"/>
-    </method>
-
-    <!--
-        ScreencastArea:
-        @x: the X coordinate of the area to capture
-        @y: the Y coordinate of the area to capture
-        @width: the width of the area to capture
-        @height: the height of the area to capture
-        @file_template: the template for the filename to use
-        @options: a dictionary of optional parameters
-        @success: whether the screencast was started successfully
-        @filename_used: the file where the screencast is being saved
-
-        Records a screencast of the passed in area and saves it
-        (by default) as webm video under a filename derived from
-        @file_template. The template is either a relative or absolute
-        filename which may contain some escape sequences - %d and %t
-        will be replaced by the start date and time of the recording.
-        If a relative name is used, the screencast will be saved in the
-        $XDG_VIDEOS_DIR if it exists, or the home directory otherwise.
-        The actual filename of the saved video is returned in @filename_used.
-        The set of optional parameters in @options currently consists of:
-            'draw-cursor'(b): whether the cursor should be included in the
-                              recording (true)
-            'framerate'(i): the number of frames per second that should be
-                            recorded if possible (30)
-            'pipeline'(s): the GStreamer pipeline used to encode recordings
-                           in gst-launch format; if not specified, the
-                           recorder will produce vp8 (webm) video (unset)
-    -->
-    <method name="ScreencastArea">
-      <arg type="i" direction="in" name="x"/>
-      <arg type="i" direction="in" name="y"/>
-      <arg type="i" direction="in" name="width"/>
-      <arg type="i" direction="in" name="height"/>
-      <arg type="s" direction="in" name="file_template"/>
-      <arg type="a{sv}" direction="in" name="options"/>
-      <arg type="b" direction="out" name="success"/>
-      <arg type="s" direction="out" name="filename_used"/>
-    </method>
-
-    <!--
-        StopScreencast:
-        @success: whether stopping the recording was successful
-
-        Stop the recording started by either Screencast or ScreencastArea.
-    -->
-    <method name="StopScreencast">
-      <arg type="b" direction="out" name="success"/>
-    </method>
-
-  </interface>
-</node>

data/org.gnome.Shell.Screenshot.xml

@@ -1,128 +0,0 @@
-<!DOCTYPE node PUBLIC
-'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
-'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
-<node>
-
-  <!--
-      org.gnome.Shell.Screenshot:
-      @short_description: Screenshot interface
-
-      The interface used to capture pictures of the screen contents.
-  -->
-  <interface name="org.gnome.Shell.Screenshot">
-
-    <!--
-        Screenshot:
-        @filename: The filename for the screenshot
-        @include_cursor: Whether to include the cursor image or not
-        @flash: Whether to flash the screen or not
-        @success: whether the screenshot was captured
-        @filename_used: the file where the screenshot was saved
-
-        Takes a screenshot of the whole screen and saves it
-        in @filename as png image, it returns a boolean
-        indicating whether the operation was successful or not.
-        @filename can either be an absolute path or a basename, in
-        which case the screenshot will be saved in the $XDG_PICTURES_DIR
-        or the home directory if it doesn't exist. The filename used
-        to save the screenshot will be returned in @filename_used.
-    -->
-    <method name="Screenshot">
-      <arg type="b" direction="in" name="include_cursor"/>
-      <arg type="b" direction="in" name="flash"/>
-      <arg type="s" direction="in" name="filename"/>
-      <arg type="b" direction="out" name="success"/>
-      <arg type="s" direction="out" name="filename_used"/>
-    </method>
-
-    <!--
-        ScreenshotWindow:
-        @include_frame: Whether to include the frame or not
-        @include_cursor: Whether to include the cursor image or not
-        @flash: Whether to flash the window area or not
-        @filename: The filename for the screenshot
-        @success: whether the screenshot was captured
-        @filename_used: the file where the screenshot was saved
-
-        Takes a screenshot of the focused window (optionally omitting the frame)
-        and saves it in @filename as png image, it returns a boolean
-        indicating whether the operation was successful or not.
-        @filename can either be an absolute path or a basename, in
-        which case the screenshot will be saved in the $XDG_PICTURES_DIR
-        or the home directory if it doesn't exist. The filename used
-        to save the screenshot will be returned in @filename_used.
-    -->
-    <method name="ScreenshotWindow">
-      <arg type="b" direction="in" name="include_frame"/>
-      <arg type="b" direction="in" name="include_cursor"/>
-      <arg type="b" direction="in" name="flash"/>
-      <arg type="s" direction="in" name="filename"/>
-      <arg type="b" direction="out" name="success"/>
-      <arg type="s" direction="out" name="filename_used"/>
-    </method>
-
-    <!--
-        ScreenshotArea:
-        @x: the X coordinate of the area to capture
-        @y: the Y coordinate of the area to capture
-        @width: the width of the area to capture
-        @height: the height of the area to capture
-        @flash: whether to flash the area or not
-        @filename: the filename for the screenshot
-        @success: whether the screenshot was captured
-        @filename_used: the file where the screenshot was saved
-
-        Takes a screenshot of the passed in area and saves it
-        in @filename as png image, it returns a boolean
-        indicating whether the operation was successful or not.
-        @filename can either be an absolute path or a basename, in
-        which case the screenshot will be saved in the $XDG_PICTURES_DIR
-        or the home directory if it doesn't exist. The filename used
-        to save the screenshot will be returned in @filename_used.
-    -->
-    <method name="ScreenshotArea">
-      <arg type="i" direction="in" name="x"/>
-      <arg type="i" direction="in" name="y"/>
-      <arg type="i" direction="in" name="width"/>
-      <arg type="i" direction="in" name="height"/>
-      <arg type="b" direction="in" name="flash"/>
-      <arg type="s" direction="in" name="filename"/>
-      <arg type="b" direction="out" name="success"/>
-      <arg type="s" direction="out" name="filename_used"/>
-    </method>
-
-    <!--
-        FlashArea:
-        @x: the X coordinate of the area to flash
-        @y: the Y coordinate of the area to flash
-        @width: the width of the area to flash
-        @height: the height of the area to flash
-
-        Renders a flash spot effect in the specified rectangle of the screen.
-    -->
-    <method name="FlashArea">
-      <arg type="i" direction="in" name="x"/>
-      <arg type="i" direction="in" name="y"/>
-      <arg type="i" direction="in" name="width"/>
-      <arg type="i" direction="in" name="height"/>
-    </method>
-
-    <!--
-        SelectArea:
-        @x: the X coordinate of the selected area
-        @y: the Y coordinate of the selected area
-        @width: the width of the selected area
-        @height: the height of the selected area
-
-        Interactively allows the user to select a rectangular area of
-        the screen, and returns its coordinates.
-    -->
-    <method name="SelectArea">
-      <arg type="i" direction="out" name="x"/>
-      <arg type="i" direction="out" name="y"/>
-      <arg type="i" direction="out" name="width"/>
-      <arg type="i" direction="out" name="height"/>
-    </method>
-
-  </interface>
-</node>

data/org.gnome.ShellSearchProvider.xml

@@ -1,73 +0,0 @@
-<!DOCTYPE node PUBLIC
-'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
-'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
-<node>
-
-  <!--
-      org.gnome.Shell.SearchProvider:
-      @short_description: Search provider interface
-
-      The interface used for integrating into GNOME Shell's search
-      interface. This interface is deprecated, and org.gnome.Shell.SearchProvider2 should be used instead.
-  -->
-  <interface name="org.gnome.Shell.SearchProvider">
-
-    <!--
-        GetInitialResultSet:
-        @terms: Array of search terms, which the provider should treat as logical AND.
-        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
-
-        Called when the user first begins a search.
-    -->
-    <method name="GetInitialResultSet">
-      <arg type="as" name="terms" direction="in" />
-      <arg type="as" name="results" direction="out" />
-    </method>
-
-    <!--
-        GetSubsearchResultSet:
-        @previous_results: Array of results previously returned by GetInitialResultSet().
-        @terms: Array of updated search terms, which the provider should treat as logical AND.
-        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
-
-        Called when a search is performed which is a "subsearch" of
-        the previous search, e.g. the method may return less results, but
-        not more or different results.
-
-        This allows search providers to only search through the previous
-        result set, rather than possibly performing a full re-query.
-    -->
-    <method name="GetSubsearchResultSet">
-      <arg type="as" name="previous_results" direction="in" />
-      <arg type="as" name="terms" direction="in" />
-      <arg type="as" name="results" direction="out" />
-    </method>
-
-    <!--
-        GetResultMetas:
-        @identifiers: An array of result identifiers as returned by GetInitialResultSet() or GetSubsearchResultSet()
-        @metas: A dictionary describing the given search result, containing a human-readable 'name' (string), along with the result identifier this meta is for, 'id' (string). Optionally, either 'gicon' (a serialized GIcon) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) can be specified if the result can be better served with a thumbnail of the content (such as with images). A 'description' field (string) may also be specified if more context would help the user find the desired result.
-
-        Return an array of meta data used to display each given result
-    -->
-    <method name="GetResultMetas">
-      <arg type="as" name="identifiers" direction="in" />
-      <arg type="aa{sv}" name="metas" direction="out" />
-    </method>
-
-    <!--
-        ActivateResult:
-        @identifier: A result identifier as returned by GetInitialResultSet() or GetSubsearchResultSet()
-
-        Called when the users chooses a given result. The result should
-        be displayed in the application associated with the corresponding
-        provider.
-
-        This method is deprecated, and providers should implement ActivateResult2()
-        instead.
-    -->
-    <method name="ActivateResult">
-      <arg type="s" name="identifier" direction="in" />
-    </method>
-  </interface>
-</node>

data/org.gnome.ShellSearchProvider2.xml

@@ -1,87 +0,0 @@
-<!DOCTYPE node PUBLIC
-'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
-'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
-<node>
-
-  <!--
-      org.gnome.Shell.SearchProvider2:
-      @short_description: Search provider interface
-
-      The interface used for integrating into GNOME Shell's search
-      interface (version 2).
-  -->
-  <interface name="org.gnome.Shell.SearchProvider2">
-
-    <!--
-        GetInitialResultSet:
-        @terms: Array of search terms, which the provider should treat as logical AND.
-        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
-
-        Called when the user first begins a search.
-    -->
-    <method name="GetInitialResultSet">
-      <arg type="as" name="terms" direction="in" />
-      <arg type="as" name="results" direction="out" />
-    </method>
-
-    <!--
-        GetSubsearchResultSet:
-        @previous_results: Array of results previously returned by GetInitialResultSet().
-        @terms: Array of updated search terms, which the provider should treat as logical AND.
-        @results: An array of result identifier strings representing items which match the given search terms. Identifiers must be unique within the provider's domain, but other than that may be chosen freely by the provider.
-
-        Called when a search is performed which is a "subsearch" of
-        the previous search, e.g. the method may return less results, but
-        not more or different results.
-
-        This allows search providers to only search through the previous
-        result set, rather than possibly performing a full re-query.
-    -->
-    <method name="GetSubsearchResultSet">
-      <arg type="as" name="previous_results" direction="in" />
-      <arg type="as" name="terms" direction="in" />
-      <arg type="as" name="results" direction="out" />
-    </method>
-
-    <!--
-        GetResultMetas:
-        @identifiers: An array of result identifiers as returned by GetInitialResultSet() or GetSubsearchResultSet()
-        @metas: A dictionary describing the given search result, containing a human-readable 'name' (string), along with the result identifier this meta is for, 'id' (string). Optionally, 'icon' (a serialized GIcon as obtained by g_icon_serialize) can be specified if the result can be better served with a thumbnail of the content (such as with images). 'gicon' (a serialized GIcon as obtained by g_icon_to_string) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) are deprecated values that can also be used for that purpose. A 'description' field (string) may also be specified if more context would help the user find the desired result.
-
-        Return an array of meta data used to display each given result
-    -->
-    <method name="GetResultMetas">
-      <arg type="as" name="identifiers" direction="in" />
-      <arg type="aa{sv}" name="metas" direction="out" />
-    </method>
-
-    <!--
-        ActivateResult:
-        @identifier: A result identifier as returned by GetInitialResultSet() or GetSubsearchResultSet()
-        @terms: Array of search terms, which the provider should treat as logical AND.
-        @timestamp: A timestamp of the user interaction that triggered this call
-
-        Called when the users chooses a given result. The result should
-        be displayed in the application associated with the corresponding
-        provider. The provided search terms can be used to allow launching a full search in
-        the application.
-    -->
-    <method name="ActivateResult">
-      <arg type="s" name="identifier" direction="in" />
-      <arg type="as" name="terms" direction="in" />
-      <arg type="u" name="timestamp" direction="in" />
-    </method>
-
-    <!--
-        LaunchSearch:
-        @terms: Array of search terms, which the provider should treat as logical AND.
-        @timestamp: A timestamp of the user interaction that triggered this call
-
-        Asks the search provider to launch a full search in the application for the provided terms.
-    -->
-    <method name="LaunchSearch">
-      <arg type="as" name="terms" direction="in" />
-      <arg type="u" name="timestamp" direction="in" />
-    </method>
-  </interface>
-</node>

data/org.gnome.shell.gschema.xml.in

@@ -0,0 +1,181 @@
+<schemalist>
+  <schema id="org.gnome.shell" path="/org/gnome/shell/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="development-tools" type="b">
+      <default>true</default>
+      <_summary>
+        Enable internal tools useful for developers and testers from Alt-F2
+      </_summary>
+      <_description>
+        Allows access to internal debugging and monitoring tools
+        using the Alt-F2 dialog.
+      </_description>
+    </key>
+    <key name="enabled-extensions" type="as">
+      <default>[]</default>
+      <_summary>Uuids of extensions to enable</_summary>
+      <_description>
+        GNOME Shell extensions have a uuid property; this key lists extensions
+        which should be loaded. Any extension that wants to be loaded needs
+        to be in this list. You can also manipulate this list with the
+        EnableExtension and DisableExtension DBus methods on org.gnome.Shell.
+      </_description>
+    </key>
+    <key name="enable-app-monitoring" type="b">
+      <default>true</default>
+      <_summary>Whether to collect stats about applications usage</_summary>
+      <_description>
+        The shell normally monitors active applications in order to present
+        the most used ones (e.g. in launchers). While this data will be
+        kept private, you may want to disable this for privacy reasons.
+        Please note that doing so won't remove already saved data.
+      </_description>
+    </key>
+    <key name="favorite-apps" type="as">
+      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
+      <_summary>List of desktop file IDs for favorite applications</_summary>
+      <_description>
+        The applications corresponding to these identifiers
+        will be displayed in the favorites area.
+      </_description>
+    </key>
+    <key name="disabled-open-search-providers" type="as">
+      <default>[]</default>
+      <_summary>disabled OpenSearch providers</_summary>
+    </key>
+    <key name="command-history" type="as">
+      <default>[]</default>
+      <_summary>History for command (Alt-F2) dialog</_summary>
+    </key>
+    <key name="looking-glass-history" type="as">
+      <default>[]</default>
+      <_summary>History for the looking glass dialog</_summary>
+    </key>
+    <key name="saved-im-presence" type="i">
+      <default>1</default>
+      <_summary></_summary>
+    </key>
+    <key name="saved-session-presence" type="i">
+      <default>0</default>
+      <_summary></_summary>
+    </key>
+    <child name="clock" schema="org.gnome.shell.clock"/>
+    <child name="calendar" schema="org.gnome.shell.calendar"/>
+    <child name="recorder" schema="org.gnome.shell.recorder"/>
+    <child name="keyboard" schema="org.gnome.shell.keyboard"/>
+  </schema>
+
+  <schema id="org.gnome.shell.calendar" path="/org/gnome/shell/calendar/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="show-weekdate" type="b">
+      <default>false</default>
+      <_summary>Show the week date in the calendar</_summary>
+      <_description>
+        If true, display the ISO week date in the calendar.
+      </_description>
+      </key>
+  </schema>
+
+  <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="keyboard-type" type="s">
+      <default>'touch'</default>
+      <_summary>Which keyboard to use</_summary>
+      <_description>
+        The type of keyboard to use.
+      </_description>
+    </key>
+  </schema>
+
+  <schema id="org.gnome.shell.clock" path="/org/gnome/shell/clock/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="show-seconds" type="b">
+      <default>false</default>
+      <_summary>Show time with seconds</_summary>
+      <_description>
+        If true, display seconds in time.
+      </_description>
+    </key>
+    <key name="show-date" type="b">
+      <default>false</default>
+      <_summary>Show date in clock</_summary>
+      <_description>
+        If true, display date in the clock, in addition to time.
+      </_description>
+    </key>
+  </schema>
+
+  <schema id="org.gnome.shell.recorder" path="/org/gnome/shell/recorder/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="framerate" type="i">
+      <default>15</default>
+      <_summary>Framerate used for recording screencasts.</_summary>
+      <_description>
+        The framerate of the resulting screencast recordered
+        by GNOME Shell's screencast recorder in frames-per-second.
+      </_description>
+    </key>
+    <key name="pipeline" type="s">
+      <default>''</default>
+      <_summary>The gstreamer pipeline used to encode the screencast</_summary>
+      <_description>
+        Sets the GStreamer pipeline used to encode recordings.
+        It follows the syntax used for gst-launch. The pipeline should have
+        an unconnected sink pad where the recorded video is recorded. It will
+        normally have a unconnected source pad; output from that pad
+        will be written into the output file. However the pipeline can also
+        take care of its own output - this might be used to send the output
+        to an icecast server via shout2send or similar. When unset or set
+        to an empty value, the default pipeline will be used. This is currently
+        'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux'
+        and records to WEBM using the VP8 codec. %T is used as a placeholder
+        for a guess at the optimal thread count on the system.
+      </_description>
+    </key>
+    <key name="file-extension" type="s">
+      <default>'webm'</default>
+      <_summary>File extension used for storing the screencast</_summary>
+      <_description>
+        The filename for recorded screencasts will be a unique filename
+        based on the current date, and use this extension. It should be
+        changed when recording to a different container format.
+      </_description>
+    </key>
+  </schema>
+
+  <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/">
+    <key name="attach-modal-dialogs" type="b">
+      <default>true</default>
+      <summary>Attach modal dialog to the parent window</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running
+        GNOME Shell.
+      </description>
+    </key>
+
+    <key name="button-layout" type="s">
+      <default>":close"</default>
+      <summary>Arrangement of buttons on the titlebar</summary>
+      <description>
+        This key overrides the key in org.gnome.desktop.wm.preferences when
+        running GNOME Shell.
+      </description>
+    </key>
+
+    <key name="edge-tiling" type="b">
+      <default>true</default>
+      <summary>Enable edge tiling when dropping windows on screen edges</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </description>
+    </key>
+
+    <key name="workspaces-only-on-primary" type="b">
+      <default>true</default>
+      <summary>Workspaces only on primary monitor</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </description>
+    </key>
+  </schema>
+</schemalist>

data/org.gnome.shell.gschema.xml.in.in

@@ -1,232 +0,0 @@
-<schemalist>
-  <schema id="org.gnome.shell" path="/org/gnome/shell/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="development-tools" type="b">
-      <default>true</default>
-      <_summary>
-        Enable internal tools useful for developers and testers from Alt-F2
-      </_summary>
-      <_description>
-        Allows access to internal debugging and monitoring tools
-        using the Alt-F2 dialog.
-      </_description>
-    </key>
-    <key name="enabled-extensions" type="as">
-      <default>[]</default>
-      <_summary>Uuids of extensions to enable</_summary>
-      <_description>
-        GNOME Shell extensions have a uuid property; this key lists extensions
-        which should be loaded. Any extension that wants to be loaded needs
-        to be in this list. You can also manipulate this list with the
-        EnableExtension and DisableExtension DBus methods on org.gnome.Shell.
-      </_description>
-    </key>
-    <key name="favorite-apps" type="as">
-      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
-      <_summary>List of desktop file IDs for favorite applications</_summary>
-      <_description>
-        The applications corresponding to these identifiers
-        will be displayed in the favorites area.
-      </_description>
-    </key>
-    <key name="app-folder-categories" type="as">
-      <default>[ 'Utilities', 'Sundry' ]</default>
-      <_summary>List of categories that should be displayed as folders</_summary>
-      <_description>
-        Each category name in this list will be represented as folder in the
-        application view, rather than being displayed inline in the main view.
-      </_description>
-    </key>
-    <key name="app-picker-view" type="u">
-      <default>0</default>
-      <summary>App Picker View</summary>
-      <description>
-        Index of the currently selected view in the application picker.
-      </description>
-    </key>
-    <key name="command-history" type="as">
-      <default>[]</default>
-      <_summary>History for command (Alt-F2) dialog</_summary>
-    </key>
-    <key name="looking-glass-history" type="as">
-      <default>[]</default>
-      <_summary>History for the looking glass dialog</_summary>
-    </key>
-    <key name="always-show-log-out" type="b">
-      <default>false</default>
-      <_summary>Always show the 'Log out' menuitem in the user menu.</_summary>
-      <_description>
-        This key overrides the automatic hiding of the 'Log out'
-        menuitem in single-user, single-session situations.
-      </_description>
-    </key>
-    <key name="remember-mount-password" type="b">
-      <default>false</default>
-      <_summary>Whether to remember password for mounting encrypted or remote filesystems</_summary>
-      <_description>
-        The shell will request a password when an encrypted device or a
-        remote filesystem is mounted.  If the password can be saved for
-        future use a 'Remember Password' checkbox will be present.
-        This key sets the default state of the checkbox.
-      </_description>
-    </key>
-    <child name="calendar" schema="org.gnome.shell.calendar"/>
-    <child name="keybindings" schema="org.gnome.shell.keybindings"/>
-    <child name="keyboard" schema="org.gnome.shell.keyboard"/>
-  </schema>
-
-  <schema id="org.gnome.shell.calendar" path="/org/gnome/shell/calendar/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="show-weekdate" type="b">
-      <default>false</default>
-      <_summary>Show the week date in the calendar</_summary>
-      <_description>
-        If true, display the ISO week date in the calendar.
-      </_description>
-      </key>
-  </schema>
-
-  <schema id="org.gnome.shell.keybindings" path="/org/gnome/shell/keybindings/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="open-application-menu" type="as">
-      <default>["&lt;Super&gt;F10"]</default>
-      <_summary>Keybinding to open the application menu</_summary>
-      <_description>
-        Keybinding to open the application menu.
-      </_description>
-    </key>
-    <key name="toggle-application-view" type="as">
-      <default>["&lt;Super&gt;a"]</default>
-      <_summary>Keybinding to open the "Show Applications" view</_summary>
-      <_description>
-        Keybinding to open the "Show Applications" view of the Activities
-        Overview.
-      </_description>
-    </key>
-    <key name="toggle-overview" type="as">
-      <default>["&lt;Super&gt;s"]</default>
-      <_summary>Keybinding to open the overview</_summary>
-      <_description>
-        Keybinding to open the Activities Overview.
-      </_description>
-    </key>
-    <key name="toggle-message-tray" type="as">
-      <default>["&lt;Super&gt;m"]</default>
-      <_summary>Keybinding to toggle the visibility of the message tray</_summary>
-      <_description>
-        Keybinding to toggle the visibility of the message tray.
-      </_description>
-    </key>
-    <key name="focus-active-notification" type="as">
-      <default>["&lt;Super&gt;n"]</default>
-      <_summary>Keybinding to focus the active notification</_summary>
-      <_description>
-        Keybinding to focus the active notification.
-      </_description>
-    </key>
-  </schema>
-
-  <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="keyboard-type" type="s">
-      <default>'touch'</default>
-      <_summary>Which keyboard to use</_summary>
-      <_description>
-        The type of keyboard to use.
-      </_description>
-    </key>
-  </schema>
-
-  <schema id="org.gnome.shell.app-switcher"
-          path="/org/gnome/shell/app-switcher/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key type="b" name="current-workspace-only">
-      <default>false</default>
-      <summary>Limit switcher to current workspace.</summary>
-      <description>
-	If true, only applications that have windows on the current workspace are shown in the switcher.
-	Otherwise, all applications are included.
-      </description>
-    </key>
-  </schema>
-
-  <enum id="org.gnome.shell.window-switcher.AppIconMode">
-    <value value="1" nick="thumbnail-only"/>
-    <value value="2" nick="app-icon-only"/>
-    <value value="3" nick="both"/>
-  </enum>
-  <schema id="org.gnome.shell.window-switcher"
-          path="/org/gnome/shell/window-switcher/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="app-icon-mode" enum="org.gnome.shell.window-switcher.AppIconMode">
-      <default>'both'</default>
-      <_summary>The application icon mode.</_summary>
-      <_description>
-	Configures how the windows are shown in the switcher. Valid possibilities
-	are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-only'
-	(shows only the application icon) or 'both'.
-      </_description>
-    </key>
-    <key type="b" name="current-workspace-only">
-      <default>true</default>
-      <summary>Limit switcher to current workspace.</summary>
-      <description>
-	If true, only windows from the current workspace are shown in the switcher.
-	Otherwise, all windows are included.
-      </description>
-    </key>
-  </schema>
-
-  <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/"
-	  gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="attach-modal-dialogs" type="b">
-      <default>true</default>
-      <_summary>Attach modal dialog to the parent window</_summary>
-      <_description>
-        This key overrides the key in org.gnome.mutter when running
-        GNOME Shell.
-      </_description>
-    </key>
-
-    <key name="button-layout" type="s">
-      <default>":close"</default>
-      <_summary>Arrangement of buttons on the titlebar</_summary>
-      <_description>
-        This key overrides the key in org.gnome.desktop.wm.preferences when
-        running GNOME Shell.
-      </_description>
-    </key>
-
-    <key name="edge-tiling" type="b">
-      <default>true</default>
-      <_summary>Enable edge tiling when dropping windows on screen edges</_summary>
-      <_description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
-    </key>
-
-    <key name="dynamic-workspaces" type="b">
-      <default>true</default>
-      <_summary>Workspaces are managed dynamically</_summary>
-      <_description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
-    </key>
-
-    <key name="workspaces-only-on-primary" type="b">
-      <default>true</default>
-      <_summary>Workspaces only on primary monitor</_summary>
-      <_description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
-    </key>
-
-    <key name="focus-change-on-pointer-rest" type="b">
-      <default>true</default>
-      <_summary>Delay focus changes in mouse mode until the pointer stops moving</_summary>
-      <_description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
-    </key>
-  </schema>
-</schemalist>

data/search_providers/google.xml

@@ -0,0 +1,7 @@
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+<ShortName>Google</ShortName>
+<Description>Google Search</Description>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
+<Url type="text/html" method="GET" template="http://www.google.com/search?q={searchTerms}"/>
+</OpenSearchDescription>

data/search_providers/wikipedia.xml

@@ -0,0 +1,44 @@
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+<ShortName>Wikipedia</ShortName>
+<Description>Wikipedia, the free encyclopedia</Description>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</Image>
+<Url type="text/html" method="GET" template="http://{language}.wikipedia.org/wiki/Special:Search?search={searchTerms}"/>
+<!-- The criterion for being below is being listed with more than 100,000
+articles on http://meta.wikimedia.org/wiki/List_of_Wikipedias -->
+<Language>ar</Language>
+<Language>bg</Language>
+<Language>ca</Language>
+<Language>cs</Language>
+<Language>da</Language>
+<Language>de</Language>
+<Language>en</Language>
+<Language>eo</Language>
+<Language>es</Language>
+<Language>fa</Language>
+<Language>fi</Language>
+<Language>fr</Language>
+<Language>he</Language>
+<Language>hu</Language>
+<Language>id</Language>
+<Language>it</Language>
+<Language>ja</Language>
+<Language>ko</Language>
+<Language>lt</Language>
+<Language>nl</Language>
+<Language>no</Language>
+<Language>pl</Language>
+<Language>pt</Language>
+<Language>ro</Language>
+<Language>ru</Language>
+<Language>sk</Language>
+<Language>sl</Language>
+<Language>sr</Language>
+<Language>sv</Language>
+<Language>tr</Language>
+<Language>uk</Language>
+<Language>vi</Language>
+<Language>vo</Language>
+<Language>war</Language>
+<Language>zh</Language>
+</OpenSearchDescription>

data/shaders/dim-window.glsl

@@ -0,0 +1,27 @@
+#version 110
+uniform sampler2D tex;
+uniform float fraction;
+uniform float height;
+const float c = -0.2;
+const float border_max_height = 60.0;
+
+mat4 contrast = mat4 (1.0 + c, 0.0, 0.0, 0.0,
+                      0.0, 1.0 + c, 0.0, 0.0,
+                      0.0, 0.0, 1.0 + c, 0.0,
+                      0.0, 0.0, 0.0, 1.0);
+vec4 off = vec4(0.633, 0.633, 0.633, 0);
+void main()
+{
+  vec4 color = texture2D(tex, cogl_tex_coord_in[0].xy);
+  float y = height * cogl_tex_coord_in[0].y;
+
+  // To reduce contrast, blend with a mid gray
+  cogl_color_out = color * contrast - off * c * color.a;
+
+  // We only fully dim at a distance of BORDER_MAX_HEIGHT from the top and
+  // when the fraction is 1.0. For other locations and fractions we linearly
+  // interpolate back to the original undimmed color, so the top of the window
+  // is at full color.
+  cogl_color_out = color + (cogl_color_out - color) * max(min(y / border_max_height, 1.0), 0.0);
+  cogl_color_out = color + (cogl_color_out - color) * fraction;
+}

data/theme/calendar-today.svg

@@ -10,11 +10,11 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="29"
-   height="29"
+   width="28"
+   height="25"
    id="svg10621"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.1 r9760"
    sodipodi:docname="calendar-today.svg">
   <defs
      id="defs10623">
@@ -118,17 +118,6 @@
        fx="51"
        fy="30"
        r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3113"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -138,29 +127,20 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="15.839192"
-     inkscape:cx="20.652108"
-     inkscape:cy="11.839084"
+     inkscape:cx="8.3750933"
+     inkscape:cy="8.0837211"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="true"
+     showgrid="false"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="741"
+     inkscape:window-width="1440"
+     inkscape:window-height="843"
      inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3109"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata10626">
     <rdf:RDF>
@@ -177,28 +157,31 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-469.08263,-532.99307)">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4625;color:#000000;fill:url(#radialGradient3113);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path34506-3"
-       sodipodi:cx="51"
-       sodipodi:cy="30"
-       sodipodi:rx="42"
-       sodipodi:ry="16"
-       d="M 9,29.999999 A 42,16 0 0 1 93,30 l -42,0 z"
-       sodipodi:start="3.1415927"
-       sodipodi:end="6.2831853"
-       transform="matrix(0.43692393,0,0,1.3783114,461.29951,517.6437)"
-       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#ffffff;fill-opacity:0.50196078;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect2996"
-       width="31"
-       height="3"
-       x="468.08264"
-       y="558.99304" />
+     transform="translate(-469.08263,-536.99307)">
+    <g
+       id="g3003">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
+         transform="matrix(0.43692393,0,0,1.3783114,460.60467,517.48289)"
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
+         sodipodi:ry="16"
+         sodipodi:rx="42"
+         sodipodi:cy="30"
+         sodipodi:cx="51"
+         id="path34506-3"
+         style="opacity:0.4625;color:#000000;fill:url(#radialGradient2997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="558.85046"
+         x="468.96878"
+         height="3.1425927"
+         width="28.149134"
+         id="rect2996"
+         style="fill:#ffffff;fill-opacity:0.50196078;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none" />
+    </g>
   </g>
 </svg>

data/theme/checkbox-focused.svg

@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="22"
-   id="svg3199"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="checkbox.svg">
-  <defs
-     id="defs3201">
-    <linearGradient
-       id="linearGradient15404"
-       inkscape:collect="always">
-      <stop
-         id="stop15406"
-         offset="0"
-         style="stop-color:#515151;stop-opacity:1" />
-      <stop
-         id="stop15408"
-         offset="1"
-         style="stop-color:#292929;stop-opacity:1" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3207" />
-    <inkscape:perspective
-       id="perspective3187"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872-5-1"
-       id="linearGradient5891-0-4"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872-5-1">
-      <stop
-         style="stop-color:#0b2e52;stop-opacity:1"
-         offset="0"
-         id="stop5874-4-4" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876-0-5" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837-4-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect14768"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884-4-7"
-       is_visible="true" />
-    <linearGradient
-       y2="-388.72955"
-       x2="-93.031357"
-       y1="-396.34738"
-       x1="-93.031357"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient14219"
-       xlink:href="#linearGradient15404"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10013-4-63-6">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop10015-2-76-1" />
-      <stop
-         style="stop-color:#292929;stop-opacity:1"
-         offset="1"
-         id="stop10017-46-15-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10597-5">
-      <stop
-         style="stop-color:#16191a;stop-opacity:1;"
-         offset="0"
-         id="stop10599-2" />
-      <stop
-         style="stop-color:#2b3133;stop-opacity:1"
-         offset="1"
-         id="stop10601-5" />
-    </linearGradient>
-    <linearGradient
-       y2="-322.16354"
-       x2="921.22498"
-       y1="-330.05121"
-       x1="921.32812"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-1456.5464,275.45191)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient15374"
-       xlink:href="#linearGradient10013-4-63-6"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-1199.9852,216.38048)"
-       y2="-227.07961"
-       x2="1203.9177"
-       y1="-217.56708"
-       x1="1203.9177"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient15376"
-       xlink:href="#linearGradient10597-5"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="-388.72955"
-       x2="-93.031357"
-       y1="-396.34738"
-       x1="-93.031357"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient14219-6"
-       xlink:href="#linearGradient15404-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient15404-9"
-       inkscape:collect="always">
-      <stop
-         id="stop15406-6"
-         offset="0"
-         style="stop-color:#515151;stop-opacity:1" />
-      <stop
-         id="stop15408-7"
-         offset="1"
-         style="stop-color:#292929;stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#2d2d2d"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="71.516955"
-     inkscape:cy="5.8710559"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1412"
-     inkscape:window-height="1067"
-     inkscape:window-x="2635"
-     inkscape:window-y="226"
-     inkscape:window-maximized="0"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid14843"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3204">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-342.5,-521.36218)">
-    <g
-       transform="matrix(0.80230061,0,0,0.80230061,-87.624044,-453.10297)"
-       id="g14586-0"
-       style="stroke-width:2.3714385;stroke-miterlimit:4;stroke-dasharray:none">
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
-         id="g15291-9-6"
-         style="stroke-width:1.18754292;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new">
-        <g
-           transform="translate(877.50354,-102.83507)"
-           id="g16853-4-9"
-           style="stroke-width:1.18754292;stroke-miterlimit:4;stroke-dasharray:none;enable-background:new">
-          <rect
-             transform="scale(1,-1)"
-             style="color:#000000;fill:url(#linearGradient14219-6);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1.24833274;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-             id="rect6506-6"
-             width="11.281681"
-             height="11.26221"
-             x="-409.59354"
-             y="-284.40115"
-             rx="1.0052766"
-             ry="1.0052764" />
-        </g>
-      </g>
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-         transform="translate(343.99999,987.99997)"
-         id="g5886-5"
-         style="stroke-width:2.3714385;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new" />
-    </g>
-    <g
-       transform="matrix(0.84337,0,0,0.84337,-110.16632,-503.56182)"
-       id="g14586">
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
-         id="g15291-9"
-         style="display:inline;enable-background:new">
-        <g
-           transform="translate(877.50354,-102.83507)"
-           id="g16853-4"
-           style="enable-background:new" />
-      </g>
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-         transform="translate(343.99999,987.99997)"
-         id="g5886"
-         style="display:inline;enable-background:new">
-        <path
-           style="fill:none;stroke:url(#linearGradient5891-0-4);stroke-width:7.11431503;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 198.5,240 5.25,5.25 13.98616,-14.43081"
-           id="path5835"
-           inkscape:path-effect="#path-effect5837-4-6"
-           inkscape:original-d="m 198.5,240 5.25,5.25 13.98616,-14.43081"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccc" />
-        <path
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 198.5,240 5.25,5.25 13.91205,-14.31964"
-           inkscape:path-effect="#path-effect5837-4-6"
-           id="path5880"
-           d="m 198.5,240 5.25,5.25 13.91205,-14.31964"
-           style="fill:none;stroke:#4787c8;stroke-width:3.55715752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           sodipodi:nodetypes="ccc" />
-        <path
-           style="fill:none;stroke:#7ea7d3;stroke-width:1.18571913px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 197.45937,240.47455 c -0.17828,-0.29362 -0.20087,-0.67548 -0.0603,-0.98892 0.14055,-0.31344 0.43739,-0.54812 0.77144,-0.62817 0.33405,-0.08 0.69314,-0.01 0.99635,0.15175 0.30321,0.16144 0.55146,0.40727 0.79165,0.65284 l 3.66429,3.74643 12.87946,-12.98973 c 0.20796,-0.20974 0.42306,-0.41969 0.68548,-0.55522 0.26242,-0.13553 0.57293,-0.19052 0.85827,-0.11426 0.14267,0.0381 0.27708,0.10787 0.38874,0.20452 0.11167,0.0966 0.20021,0.22004 0.25479,0.35726 0.0546,0.13722 0.075,0.28793 0.0585,0.43468 -0.0165,0.14674 -0.07,0.28919 -0.15422,0.41052"
-           id="path5882"
-           inkscape:path-effect="#path-effect5884-4-7"
-           inkscape:original-d="m 197.45937,240.47455 c 0.65604,-0.56057 2.02485,-1.34847 2.49911,-0.8125 l 3.66429,3.74643 12.87946,-12.98973 c 0.6875,-0.6875 2.09152,0.7375 2.09152,0.7375"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csccc" />
-      </g>
-    </g>
-  </g>
-</svg>

data/theme/checkbox-off-focused.svg

@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="22"
-   id="svg3199"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="checkbox-off.svg">
-  <defs
-     id="defs3201">
-    <linearGradient
-       id="linearGradient15404"
-       inkscape:collect="always">
-      <stop
-         id="stop15406"
-         offset="0"
-         style="stop-color:#515151;stop-opacity:1" />
-      <stop
-         id="stop15408"
-         offset="1"
-         style="stop-color:#292929;stop-opacity:1" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3207" />
-    <inkscape:perspective
-       id="perspective3187"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837-4-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect14768"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884-4-7"
-       is_visible="true" />
-    <linearGradient
-       y2="-388.72955"
-       x2="-93.031357"
-       y1="-396.34738"
-       x1="-93.031357"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient14219"
-       xlink:href="#linearGradient15404"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10013-4-63-6">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop10015-2-76-1" />
-      <stop
-         style="stop-color:#292929;stop-opacity:1"
-         offset="1"
-         id="stop10017-46-15-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10597-5">
-      <stop
-         style="stop-color:#16191a;stop-opacity:1;"
-         offset="0"
-         id="stop10599-2" />
-      <stop
-         style="stop-color:#2b3133;stop-opacity:1"
-         offset="1"
-         id="stop10601-5" />
-    </linearGradient>
-    <linearGradient
-       y2="-322.16354"
-       x2="921.22498"
-       y1="-330.05121"
-       x1="921.32812"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-1456.5464,275.45191)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient15374"
-       xlink:href="#linearGradient10013-4-63-6"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-1199.9852,216.38048)"
-       y2="-227.07961"
-       x2="1203.9177"
-       y1="-217.56708"
-       x1="1203.9177"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient15376"
-       xlink:href="#linearGradient10597-5"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#2d2d2d"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="6.1225392"
-     inkscape:cy="3.6003241"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1412"
-     inkscape:window-height="1067"
-     inkscape:window-x="2116"
-     inkscape:window-y="261"
-     inkscape:window-maximized="0"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid14843"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3204">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-342.5,-521.36218)">
-    <g
-       transform="matrix(0.80230061,0,0,0.80230061,-87.624044,-453.10297)"
-       id="g14586"
-       style="stroke-width:2.3714385;stroke-miterlimit:4;stroke-dasharray:none">
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
-         id="g15291-9"
-         style="stroke-width:1.18754292;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new">
-        <g
-           transform="translate(877.50354,-102.83507)"
-           id="g16853-4"
-           style="stroke-width:1.18754292;stroke-miterlimit:4;stroke-dasharray:none;enable-background:new">
-          <rect
-             transform="scale(1,-1)"
-             style="color:#000000;fill:url(#linearGradient14219);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1.24833274;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-             id="rect6506-6"
-             width="11.281681"
-             height="11.26221"
-             x="-409.59354"
-             y="-284.40115"
-             rx="1.0052766"
-             ry="1.0052764" />
-        </g>
-      </g>
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-         transform="translate(343.99999,987.99997)"
-         id="g5886"
-         style="stroke-width:2.3714385;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new" />
-    </g>
-  </g>
-</svg>

data/theme/checkbox-off.svg

@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="22"
-   id="svg3199"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="checkbox.svg">
-  <defs
-     id="defs3201">
-    <linearGradient
-       id="linearGradient15404"
-       inkscape:collect="always">
-      <stop
-         id="stop15406"
-         offset="0"
-         style="stop-color:#515151;stop-opacity:1" />
-      <stop
-         id="stop15408"
-         offset="1"
-         style="stop-color:#292929;stop-opacity:1" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3207" />
-    <inkscape:perspective
-       id="perspective3187"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872-5-1"
-       id="linearGradient5891-0-4"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872-5-1">
-      <stop
-         style="stop-color:#0b2e52;stop-opacity:1"
-         offset="0"
-         id="stop5874-4-4" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876-0-5" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837-4-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect14768"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884-4-7"
-       is_visible="true" />
-    <linearGradient
-       y2="-388.72955"
-       x2="-93.031357"
-       y1="-396.34738"
-       x1="-93.031357"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient14219"
-       xlink:href="#linearGradient15404"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10013-4-63-6">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop10015-2-76-1" />
-      <stop
-         style="stop-color:#292929;stop-opacity:1"
-         offset="1"
-         id="stop10017-46-15-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10597-5">
-      <stop
-         style="stop-color:#16191a;stop-opacity:1;"
-         offset="0"
-         id="stop10599-2" />
-      <stop
-         style="stop-color:#2b3133;stop-opacity:1"
-         offset="1"
-         id="stop10601-5" />
-    </linearGradient>
-    <linearGradient
-       y2="-322.16354"
-       x2="921.22498"
-       y1="-330.05121"
-       x1="921.32812"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-1456.5464,275.45191)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient15374"
-       xlink:href="#linearGradient10013-4-63-6"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-1199.9852,216.38048)"
-       y2="-227.07961"
-       x2="1203.9177"
-       y1="-217.56708"
-       x1="1203.9177"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient15376"
-       xlink:href="#linearGradient10597-5"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#2d2d2d"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="71.247925"
-     inkscape:cy="33.339093"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1412"
-     inkscape:window-height="1067"
-     inkscape:window-x="2116"
-     inkscape:window-y="261"
-     inkscape:window-maximized="0"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid14843"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3204">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-342.5,-521.36218)">
-    <g
-       transform="matrix(0.84337,0,0,0.84337,-110.16632,-503.56182)"
-       id="g14586">
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
-         id="g15291-9"
-         style="display:inline;enable-background:new">
-        <g
-           transform="translate(877.50354,-102.83507)"
-           id="g16853-4"
-           style="enable-background:new">
-          <rect
-             transform="scale(1,-1)"
-             style="color:#000000;fill:url(#linearGradient14219);fill-opacity:1;fill-rule:nonzero;stroke:#868686;stroke-width:0.59377144999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-             id="rect6506-6"
-             width="11.281681"
-             height="11.26221"
-             x="-409.59354"
-             y="-284.40115"
-             rx="0.95632279"
-             ry="0.95632273" />
-        </g>
-      </g>
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-         transform="translate(343.99999,987.99997)"
-         id="g5886"
-         style="display:inline;enable-background:new" />
-    </g>
-  </g>
-</svg>

data/theme/checkbox.svg

@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="22"
-   id="svg3199"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="checkbox-focused.svg">
-  <defs
-     id="defs3201">
-    <linearGradient
-       id="linearGradient15404"
-       inkscape:collect="always">
-      <stop
-         id="stop15406"
-         offset="0"
-         style="stop-color:#515151;stop-opacity:1" />
-      <stop
-         id="stop15408"
-         offset="1"
-         style="stop-color:#292929;stop-opacity:1" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3207" />
-    <inkscape:perspective
-       id="perspective3187"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872-5-1"
-       id="linearGradient5891-0-4"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872-5-1">
-      <stop
-         style="stop-color:#0b2e52;stop-opacity:1"
-         offset="0"
-         id="stop5874-4-4" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876-0-5" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837-4-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect14768"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884-4-7"
-       is_visible="true" />
-    <linearGradient
-       y2="-388.72955"
-       x2="-93.031357"
-       y1="-396.34738"
-       x1="-93.031357"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-256.56122,59.685418)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient14219"
-       xlink:href="#linearGradient15404"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10013-4-63-6">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop10015-2-76-1" />
-      <stop
-         style="stop-color:#292929;stop-opacity:1"
-         offset="1"
-         id="stop10017-46-15-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10597-5">
-      <stop
-         style="stop-color:#16191a;stop-opacity:1;"
-         offset="0"
-         id="stop10599-2" />
-      <stop
-         style="stop-color:#2b3133;stop-opacity:1"
-         offset="1"
-         id="stop10601-5" />
-    </linearGradient>
-    <linearGradient
-       y2="-322.16354"
-       x2="921.22498"
-       y1="-330.05121"
-       x1="921.32812"
-       gradientTransform="matrix(1.5918367,0,0,0.85714285,-1456.5464,275.45191)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient15374"
-       xlink:href="#linearGradient10013-4-63-6"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-1199.9852,216.38048)"
-       y2="-227.07961"
-       x2="1203.9177"
-       y1="-217.56708"
-       x1="1203.9177"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient15376"
-       xlink:href="#linearGradient10597-5"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#2d2d2d"
-     borderopacity="1"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="64.516955"
-     inkscape:cy="13.871056"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1412"
-     inkscape:window-height="1067"
-     inkscape:window-x="2635"
-     inkscape:window-y="226"
-     inkscape:window-maximized="0"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid14843"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3204">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-342.5,-521.36218)">
-    <g
-       transform="matrix(0.84337,0,0,0.84337,-110.16632,-503.56182)"
-       id="g14586">
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-         transform="matrix(1.9969286,0,0,1.9969286,-397.05491,877.00482)"
-         id="g15291-9"
-         style="display:inline;enable-background:new">
-        <g
-           transform="translate(877.50354,-102.83507)"
-           id="g16853-4"
-           style="enable-background:new">
-          <rect
-             transform="scale(1,-1)"
-             style="color:#000000;fill:url(#linearGradient14219);fill-opacity:1;fill-rule:nonzero;stroke:#868686;stroke-width:0.59377144999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-             id="rect6506-6"
-             width="11.281681"
-             height="11.26221"
-             x="-409.59354"
-             y="-284.40115"
-             rx="0.95632279"
-             ry="0.95632273" />
-        </g>
-      </g>
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-         transform="translate(343.99999,987.99997)"
-         id="g5886"
-         style="display:inline;enable-background:new">
-        <path
-           style="fill:none;stroke:url(#linearGradient5891-0-4);stroke-width:7.11431503;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 198.5,240 5.25,5.25 13.98616,-14.43081"
-           id="path5835"
-           inkscape:path-effect="#path-effect5837-4-6"
-           inkscape:original-d="m 198.5,240 5.25,5.25 13.98616,-14.43081"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccc" />
-        <path
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 198.5,240 5.25,5.25 13.91205,-14.31964"
-           inkscape:path-effect="#path-effect5837-4-6"
-           id="path5880"
-           d="m 198.5,240 5.25,5.25 13.91205,-14.31964"
-           style="fill:none;stroke:#4787c8;stroke-width:3.55715752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           sodipodi:nodetypes="ccc" />
-        <path
-           style="fill:none;stroke:#7ea7d3;stroke-width:1.18571913px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 197.45937,240.47455 c -0.17828,-0.29362 -0.20087,-0.67548 -0.0603,-0.98892 0.14055,-0.31344 0.43739,-0.54812 0.77144,-0.62817 0.33405,-0.08 0.69314,-0.01 0.99635,0.15175 0.30321,0.16144 0.55146,0.40727 0.79165,0.65284 l 3.66429,3.74643 12.87946,-12.98973 c 0.20796,-0.20974 0.42306,-0.41969 0.68548,-0.55522 0.26242,-0.13553 0.57293,-0.19052 0.85827,-0.11426 0.14267,0.0381 0.27708,0.10787 0.38874,0.20452 0.11167,0.0966 0.20021,0.22004 0.25479,0.35726 0.0546,0.13722 0.075,0.28793 0.0585,0.43468 -0.0165,0.14674 -0.07,0.28919 -0.15422,0.41052"
-           id="path5882"
-           inkscape:path-effect="#path-effect5884-4-7"
-           inkscape:original-d="m 197.45937,240.47455 c 0.65604,-0.56057 2.02485,-1.34847 2.49911,-0.8125 l 3.66429,3.74643 12.87946,-12.98973 c 0.6875,-0.6875 2.09152,0.7375 2.09152,0.7375"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csccc" />
-      </g>
-    </g>
-  </g>
-</svg>

data/theme/gdm.css

@@ -0,0 +1,180 @@
+/* Copyright 2011, Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Login Dialog */
+
+.login-dialog-title {
+    font-size: 14pt;
+    font-weight: bold;
+    color: #666666;
+    padding-bottom: 2em;
+}
+
+.login-dialog {
+    border-radius: 16px;
+    min-height: 150px;
+    max-height: 700px;
+    min-width: 350px;
+}
+
+.login-dialog-prompt-fingerprint-message {
+    font-size: 10.5pt;
+}
+
+.login-dialog-user-list-view {
+    -st-vfade-offset: 1em;
+}
+
+.login-dialog-user-list {
+    spacing: 12px;
+}
+
+.login-dialog-user-list-item {
+    color: #666666;
+}
+
+.login-dialog-user-list-item:ltr {
+    padding-right: 1em;
+}
+
+.login-dialog-user-list-item:rtl {
+    padding-left: 1em;
+}
+
+.login-dialog-user-list-item .login-dialog-user-list-item-name {
+    font-size: 20pt;
+    padding-left: 1em;
+    color: #666666;
+}
+
+.login-dialog-user-list-item:hover .login-dialog-user-list-item-name {
+    color: white;
+}
+
+.login-dialog-user-list-item:focus .login-dialog-user-list-item-name {
+    color: white;
+    text-shadow: black 0px 2px 2px;
+}
+
+.login-dialog-user-list-item-vertical-layout {
+    spacing: 2px;
+}
+
+.login-dialog-user-list-item .login-dialog-user-list-item-focus-bin {
+    background-color: rgba(0,0,0,0.0);
+    height: 2px;
+}
+
+.login-dialog-user-list-item:focus .login-dialog-user-list-item-focus-bin {
+    background-color: #666666;
+}
+
+.login-dialog-user-list-item-icon {
+    border: 2px solid #8b8b8b;
+    border-radius: 8px;
+    width: 64px;
+    height: 64px;
+}
+
+.login-dialog-not-listed-button {
+    padding-top: 2em;
+}
+.login-dialog-not-listed-label {
+    font-size: 14pt;
+    font-weight: bold;
+    color: #666666;
+}
+
+.login-dialog-not-listed-button:hover .login-dialog-not-listed-label {
+    color: white;
+}
+
+.login-dialog-prompt-layout {
+    padding-bottom: 32px;
+}
+.login-dialog-prompt-label {
+    color: white;
+    font-size: 20pt;
+}
+
+.login-dialog-prompt-entry {
+    padding: 4px;
+    border-radius: 4px;
+    border: 2px solid #5656cc;
+    color: black;
+    background-color: white;
+    caret-color: black;
+    caret-size: 1px;
+    width: 15em;
+}
+
+.login-dialog-prompt-entry .capslock-warning {
+    icon-size: 16px;
+    warning-color: #999;
+}
+
+.login-dialog-prompt-entry:insensitive {
+    color: rgba(0,0,0,0.7);
+    border: 2px solid #565656;
+}
+
+.login-dialog-session-list {
+    color: #ffffff;
+    font-size: 10.5pt;
+}
+
+.login-dialog-session-list-button {
+    padding: 4px;
+}
+
+.login-dialog-session-list-button:focus {
+    background-color: #4c4c4c;
+}
+
+.login-dialog-session-list-button:active {
+    background-color: #4c4c4c;
+}
+
+.login-dialog-session-list-button:hover {
+    font-weight: bold;
+}
+
+.login-dialog-session-list-scroll-view {
+    background-gradient-start: rgba(80,80,80,0.3);
+    background-gradient-end: rgba(80,80,80,0.7);
+    background-gradient-direction: vertical;
+    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.9);
+    border-radius: 8px;
+    border: 1px solid rgba(80,80,80,1.0);
+    padding: .5em;
+}
+
+.login-dialog-session-list-item:focus {
+    background-color: #666666;
+}
+
+.login-dialog-session-list-triangle {
+    padding-right: .5em;
+}
+
+.login-dialog-session-list-item-box {
+    spacing: .25em;
+}
+
+.login-dialog-session-list-item-dot {
+    width: .75em;
+    height: .75em;
+}

data/theme/logged-in-indicator.svg

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="300"
-   height="80"
-   id="svg7355"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="logged-in-indicator.svg">
-  <metadata
-     id="metadata4175">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#2c1cff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     id="namedview4173"
-     showgrid="false"
-     inkscape:zoom="2.8760889"
-     inkscape:cx="106.00403"
-     inkscape:cy="80.68078"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g30864" />
-  <defs
-     id="defs7357">
-    <radialGradient
-       xlink:href="#linearGradient36429"
-       id="radialGradient7461"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.5919312,0,0,0.57582113,-20.687059,48.400487)"
-       cx="47.428951"
-       cy="167.16817"
-       fx="47.428951"
-       fy="167.16817"
-       r="37" />
-    <linearGradient
-       id="linearGradient36429">
-      <stop
-         id="stop36431"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop36433"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient36471"
-       id="radialGradient7463"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1891549,0,0,0.55513246,-9.281289,36.12653)"
-       cx="49.067139"
-       cy="242.50381"
-       fx="49.067139"
-       fy="242.50381"
-       r="37.00671" />
-    <linearGradient
-       id="linearGradient36471">
-      <stop
-         id="stop36473"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop36475"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       r="37.00671"
-       fy="242.50381"
-       fx="49.067139"
-       cy="242.50381"
-       cx="49.067139"
-       gradientTransform="matrix(3.4218418,0,0,0.03365337,-61.309005,138.5071)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient7488"
-       xlink:href="#linearGradient36471" />
-  </defs>
-  <g
-     id="layer1"
-     transform="matrix(1.6213276,0,0,1.6213276,-431.6347,-272.5745)">
-    <g
-       style="display:inline"
-       id="g30864"
-       transform="translate(255.223,70.118091)">
-      <rect
-         ry="3.4593496"
-         rx="8.8641119"
-         y="76.159348"
-         x="12.596948"
-         height="71.116341"
-         width="182.22595"
-         id="rect14000"
-         style="opacity:0.371875;fill:url(#radialGradient7461);fill-opacity:1;stroke:none" />
-      <path
-         id="rect34520"
-         d="m 194.80022,146.83551 -182.559919,0"
-         style="opacity:0.35;fill:none;stroke:url(#radialGradient7488);stroke-width:0.61184424;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         connector-curvature="0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-    </g>
-  </g>
-</svg>

data/theme/more-results.svg

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg12430"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="more-results.svg">
-  <defs
-     id="defs12432" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#7a7a7a"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="90.509668"
-     inkscape:cx="6.5009792"
-     inkscape:cy="8.3589595"
-     inkscape:document-units="px"
-     inkscape:current-layer="g14642-3-0"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="840"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid13002" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata12435">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       style="display:inline"
-       transform="translate(-141.99984,638.37113)"
-       inkscape:label="zoom-in"
-       id="g14642-3-0">
-      <path
-         sodipodi:type="inkscape:offset"
-         inkscape:radius="0"
-         inkscape:original="M 145.1875 400 C 144.5248 400 144 400.54899 144 401.21875 L 144 410.78125 C 144 411.45101 144.5248 412 145.1875 412 L 154.8125 412 C 155.4752 412 156 411.45101 156 410.78125 L 156 401.21875 C 156 400.54899 155.4752 400 154.8125 400 L 145.1875 400 z M 149 403 L 151 403 L 151 405 L 153 405 L 153 407 L 151 407 L 151 409 L 149 409 L 149 407 L 147 407 L 147 405 L 149 405 L 149 403 z "
-         xlink:href="#rect11749-5-0-1-8"
-         style="color:#bebebe;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;opacity:0.8"
-         id="path13004"
-         inkscape:href="#rect11749-5-0-1-8"
-         d="M 145.1875,400 C 144.5248,400 144,400.54899 144,401.21875 l 0,9.5625 c 0,0.66976 0.5248,1.21875 1.1875,1.21875 l 9.625,0 c 0.6627,0 1.1875,-0.54899 1.1875,-1.21875 l 0,-9.5625 C 156,400.54899 155.4752,400 154.8125,400 L 145.1875,400 z m 3.8125,3 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 L 149,403 Z"
-         transform="translate(0,1)" />
-      <use
-         x="0"
-         y="0"
-         xlink:href="#path13004"
-         id="use11960"
-         transform="translate(1,-1)"
-         width="16"
-         height="16" />
-      <use
-         x="0"
-         y="0"
-         xlink:href="#use11960"
-         id="use11962"
-         transform="translate(-2,0)"
-         width="16"
-         height="16" />
-      <path
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-         d="M 7 5 L 7 7 L 5 7 L 5 9 L 7 9 L 7 11 L 9 11 L 9 9 L 11 9 L 11 7 L 9 7 L 9 5 L 7 5 z "
-         transform="translate(141.99984,397.99107)"
-         id="rect3757" />
-      <path
-         inkscape:connector-curvature="0"
-         style="color:#bebebe;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
-         d="M 145.1875,400 C 144.5248,400 144,400.54899 144,401.21875 l 0,9.5625 c 0,0.66976 0.5248,1.21875 1.1875,1.21875 l 9.625,0 c 0.6627,0 1.1875,-0.54899 1.1875,-1.21875 l 0,-9.5625 C 156,400.54899 155.4752,400 154.8125,400 L 145.1875,400 z m 3.8125,3 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 L 149,403 Z"
-         id="rect11749-5-0-1-8" />
-      <rect
-         style="fill:none;stroke:none"
-         id="rect3620-5-4"
-         width="15.981825"
-         height="16"
-         x="142"
-         y="398"
-         rx="0"
-         ry="0" />
-    </g>
-  </g>
-</svg>

data/theme/page-indicator-active.svg

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg4703"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="page-indicator-pushed.svg">
-  <defs
-     id="defs4705" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="31.392433"
-     inkscape:cx="1.0245308"
-     inkscape:cy="13.3715"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="2560"
-     inkscape:window-height="1374"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid6140" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata4708">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,2)">
-    <path
-       transform="matrix(0.54617904,0,0,0.62523128,-1131.9904,-392.39214)"
-       d="m 2099.9808,638.83099 a 10.985409,9.5964489 0 1 1 -21.9708,0 10.985409,9.5964489 0 1 1 21.9708,0 z"
-       sodipodi:ry="9.5964489"
-       sodipodi:rx="10.985409"
-       sodipodi:cy="638.83099"
-       sodipodi:cx="2088.9954"
-       id="path4711"
-       style="fill:#fdffff;fill-opacity:1;stroke:none"
-       sodipodi:type="arc" />
-  </g>
-</svg>

data/theme/page-indicator-checked.svg

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg4703"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="page-indicator-active.svg">
-  <defs
-     id="defs4705" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="2.1522887"
-     inkscape:cy="16.782904"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4708">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,2)">
-    <path
-       transform="matrix(0.72823872,0,0,0.8336417,-1512.2872,-525.55618)"
-       d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
-       sodipodi:ry="9.5964489"
-       sodipodi:rx="10.985409"
-       sodipodi:cy="638.83099"
-       sodipodi:cx="2088.9954"
-       id="path4711"
-       style="fill:#fdffff;fill-opacity:0.94117647;stroke:none"
-       sodipodi:type="arc" />
-  </g>
-</svg>

data/theme/page-indicator-hover.svg

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg5266"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="page-indicator-inactive.svg">
-  <defs
-     id="defs5268" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-2.307566"
-     inkscape:cy="17.859535"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="2560"
-     inkscape:window-height="1374"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5271">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,2)">
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276000000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path5274"
-       sodipodi:cx="2088.9954"
-       sodipodi:cy="638.83099"
-       sodipodi:rx="10.985409"
-       sodipodi:ry="9.5964489"
-       d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
-       transform="matrix(0.63720887,0,0,0.72943648,-1322.1264,-458.98661)" />
-  </g>
-</svg>

data/theme/page-indicator-inactive.svg

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="18"
-   height="18"
-   id="svg5266"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="page-indicator-inactive.svg">
-  <defs
-     id="defs5268" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-2.307566"
-     inkscape:cy="17.859535"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="2560"
-     inkscape:window-height="1374"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5271">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,2)">
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276000000005;stroke-miterlimit:4;stroke-opacity:0.39215686000000000;stroke-dasharray:none"
-       id="path5274"
-       sodipodi:cx="2088.9954"
-       sodipodi:cy="638.83099"
-       sodipodi:rx="10.985409"
-       sodipodi:ry="9.5964489"
-       d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
-       transform="matrix(0.63720887,0,0,0.72943648,-1322.1264,-458.98661)" />
-  </g>
-</svg>

data/theme/panel-border.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="3"
+   height="10"
+   id="svg2"
+   version="1.1">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+  </metadata>
+  <g
+     id="layer1">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke-width:0.43599999000000000;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3779"
+       width="3"
+       height="10"
+       x="0"
+       y="0" />
+    <rect
+       style="fill:#536272;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3796"
+       width="3"
+       height="1"
+       x="0"
+       y="9" />
+  </g>
+</svg>

data/theme/panel-button-border.svg

@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="17"
+   width="21"
    height="10"
    id="svg2"
    version="1.1"
@@ -66,9 +66,9 @@
     <rect
        style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
        id="rect3796"
-       width="7"
+       width="3"
        height="2"
-       x="5"
+       x="9"
        y="8" />
   </g>
 </svg>

data/theme/scroll-hhandle.svg

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10"
+   height="4"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="scroll-hhandle.svg">
+  <defs
+     id="defs4">
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect3592"
+       width="2"
+       height="4"
+       x="0"
+       y="0"
+       rx="0"
+       ry="0" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3592"
+       id="use2825"
+       transform="translate(8,0)"
+       width="10"
+       height="4" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use2825"
+       id="use2827"
+       transform="translate(-4,0)"
+       width="10"
+       height="4" />
+  </g>
+</svg>

data/theme/scroll-vhandle.svg

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="4"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="scroll-hhandle.svg">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect3592"
+       width="2"
+       height="4"
+       x="0"
+       y="-4"
+       rx="0"
+       ry="0"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3592"
+       id="use3705"
+       transform="translate(0,4)"
+       width="4"
+       height="10" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use3705"
+       id="use3707"
+       transform="translate(0,4)"
+       width="4"
+       height="10" />
+  </g>
+</svg>

data/theme/summary-counter.svg

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   id="Foreground"
-   x="0px"
-   y="0px"
-   width="32"
-   height="32"
-   viewBox="0 0 23.272727 23.272727"
-   enable-background="new 0 0 16 16"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="summary-counter.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-     id="metadata2399"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs2397"><linearGradient
-       id="linearGradient3173"><stop
-         style="stop-color:#c4c4c4;stop-opacity:1;"
-         offset="0"
-         id="stop3175" /><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3177" /></linearGradient><inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 8 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="16 : 8 : 1"
-       inkscape:persp3d-origin="8 : 5.3333333 : 1"
-       id="perspective2401" /><filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter16494-4"
-       x="-0.20989846"
-       width="1.4197969"
-       y="-0.20903821"
-       height="1.4180764"><feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.3282637"
-         id="feGaussianBlur16496-8" /></filter><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16498-6"
-       id="radialGradient16504-1"
-       cx="7.6582627"
-       cy="5.8191104"
-       fx="7.6582627"
-       fy="5.8191104"
-       r="8.6928644"
-       gradientTransform="matrix(1.0474339,0,0,1.0517402,-0.3632615,-0.42032492)"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       id="linearGradient16498-6"><stop
-         style="stop-color:#9FD0FF;stop-opacity:1"
-         offset="0"
-         id="stop16500-8" /><stop
-         style="stop-color:#3465A4;stop-opacity:1"
-         offset="1"
-         id="stop16502-0" /></linearGradient></defs><sodipodi:namedview
-     inkscape:window-height="709"
-     inkscape:window-width="1366"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#000000"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="11.313708"
-     inkscape:cx="15.386407"
-     inkscape:cy="13.739577"
-     inkscape:window-x="0"
-     inkscape:window-y="1179"
-     inkscape:current-layer="g16402-8"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="1"><inkscape:grid
-       type="xygrid"
-       id="grid11246"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" /></sodipodi:namedview><g
-     style="display:inline"
-     id="g16402-8"
-     transform="translate(4.7533483,2.8238929)"><g
-       id="g3175-4"
-       transform="translate(-0.89995416,0.94028614)"><path
-         sodipodi:type="inkscape:offset"
-         inkscape:radius="0"
-         inkscape:original="M 7.65625 0.125 C 3.2589349 0.125 -0.3125 3.7070002 -0.3125 8.125 C -0.3125 12.543001 3.2589349 16.125 7.65625 16.125 C 12.053566 16.125 15.625 12.543001 15.625 8.125 C 15.625 3.7070002 12.053566 0.125 7.65625 0.125 z "
-         xlink:href="#path2394-32"
-         style="opacity:0.52994014;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.18181825;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter16494-4);enable-background:accumulate"
-         id="path16480-5"
-         inkscape:href="#path2394-32"
-         d="m 7.65625,0.125 c -4.3973151,0 -7.96875,3.5820002 -7.96875,8 0,4.418001 3.5714349,8 7.96875,8 4.397316,0 7.96875,-3.581999 7.96875,-8 0,-4.4179998 -3.571434,-8 -7.96875,-8 z"
-         transform="translate(0,1.028519)" /><path
-         clip-rule="evenodd"
-         d="m -0.30428257,8.1237596 c 0,-4.4179998 3.56522987,-7.9999996 7.96254497,-7.9999996 4.3973156,0 7.9625456,3.5819998 7.9625456,7.9999996 0,4.4180014 -3.56523,8.0000004 -7.9625456,8.0000004 -4.3973151,0 -7.96254497,-3.581999 -7.96254497,-8.0000004 z"
-         id="path2394-32"
-         style="color:#000000;fill:url(#radialGradient16504-1);fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1.4545455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:nodetypes="csssc"
-         inkscape:connector-curvature="0" /><g
-         id="g3172-6" /></g></g></svg>

data/theme/toggle-off-intl.svg

@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
+   width="64"
    height="22"
    id="svg3273"
    version="1.1"

data/theme/toggle-off-us.svg

@@ -9,7 +9,7 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="65"
+   width="64"
    height="22"
    id="svg3012"
    version="1.1"

data/theme/ws-switch-arrow-down.svg

@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="96"
+   height="96"
+   id="svg25070"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="ws-switch-arrow-down.svg">
+  <metadata
+     id="metadata3353">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="718"
+     inkscape:window-height="480"
+     id="namedview3351"
+     showgrid="false"
+     inkscape:zoom="2.6979167"
+     inkscape:cx="48"
+     inkscape:cy="48"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg25070" />
+  <defs
+     id="defs25072">
+    <linearGradient
+       x1="-86.552246"
+       y1="185.439"
+       x2="-83.37072"
+       y2="197.31261"
+       id="linearGradient24957"
+       xlink:href="#linearGradient4034-0-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(6,0)" />
+    <linearGradient
+       id="linearGradient4034-0-4">
+      <stop
+         id="stop4036-5-7"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4038-9-6"
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter24765">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix24767" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix24769" />
+    </filter>
+    <linearGradient
+       x1="-74.520325"
+       y1="169.06032"
+       x2="-74.520325"
+       y2="205.94189"
+       id="linearGradient24955"
+       xlink:href="#linearGradient4632-1-3-9-3-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,0)" />
+    <linearGradient
+       id="linearGradient4632-1-3-9-3-2">
+      <stop
+         id="stop4634-1-8-3-9-0"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4636-1-9-9-8-8"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.0274937" />
+      <stop
+         id="stop4638-8-3-9-6-6"
+         style="stop-color:#f2f2f2;stop-opacity:1"
+         offset="0.274937" />
+      <stop
+         id="stop4640-8-5-7-8-9"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.38707438" />
+      <stop
+         id="stop4642-5-41-9-6-9"
+         style="stop-color:#d9dad8;stop-opacity:1"
+         offset="0.66528589" />
+      <stop
+         id="stop4644-5-2-7-9-2"
+         style="stop-color:#dfe0dd;stop-opacity:1"
+         offset="0.76745707" />
+      <stop
+         id="stop4646-3-2-3-7-3"
+         style="stop-color:#f0f0f0;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="-33.412369"
+       cy="185.74171"
+       r="2.3554697"
+       fx="-33.412369"
+       fy="185.74171"
+       id="radialGradient24959"
+       xlink:href="#linearGradient4869-4-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0075,0,0,1.0075,-5.4544,-1.25141)" />
+    <linearGradient
+       id="linearGradient4869-4-1">
+      <stop
+         id="stop4871-6-2"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4879-7-4"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.31807542" />
+      <stop
+         id="stop4877-6-1"
+         style="stop-color:#c8c9c6;stop-opacity:1"
+         offset="0.74691135" />
+      <stop
+         id="stop4873-1-0"
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter25011">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix25013" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix25015" />
+    </filter>
+    <radialGradient
+       cx="-33.412369"
+       cy="185.74171"
+       r="2.3554697"
+       fx="-33.412369"
+       fy="185.74171"
+       id="radialGradient24961"
+       xlink:href="#linearGradient4869-4-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0075,0,0,1.0075,-5.4544,-1.25141)" />
+    <linearGradient
+       id="linearGradient4869-4-0">
+      <stop
+         id="stop4871-6-8"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4879-7-5"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.31807542" />
+      <stop
+         id="stop4877-6-5"
+         style="stop-color:#c8c9c6;stop-opacity:1"
+         offset="0.74691135" />
+      <stop
+         id="stop4873-1-4"
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter25023">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix25025" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix25027" />
+    </filter>
+    <linearGradient
+       x1="-39.858727"
+       y1="184.61784"
+       x2="-38.244785"
+       y2="188.84898"
+       id="linearGradient24963"
+       xlink:href="#linearGradient4941"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4941">
+      <stop
+         id="stop4943"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4945"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter25033">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix25035" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix25037" />
+    </filter>
+    <linearGradient
+       x1="-39.858727"
+       y1="184.61784"
+       x2="-38.244785"
+       y2="188.84898"
+       id="linearGradient24965"
+       xlink:href="#linearGradient4941-7"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4941-7">
+      <stop
+         id="stop4943-2"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4945-5"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter25043">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix25045" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix25047" />
+    </filter>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter25049">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix25051" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix25053" />
+    </filter>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter25055">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix25057" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix25059" />
+    </filter>
+  </defs>
+  <g
+     transform="matrix(0,1,-1,0,48.0003,4.1307112e-7)"
+     id="layer1">
+    <g
+       transform="matrix(-2,0,0,2,-97.2497,-374.967)"
+       id="g4030-1-8"
+       style="stroke:#000000;stroke-opacity:1;display:inline">
+      <path
+         d="m -72.5,173.5 -14,14 14,14"
+         id="path3165-7-3"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
+       transform="matrix(-3.34328,0,0,3.34328,-89.2797,-623.176)"
+       id="path4050-2-7-9-4"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
+       transform="matrix(-3.34328,0,0,3.34328,-111.2797,-623.176)"
+       id="path4050-2-7-9-4-8"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
+       transform="matrix(-2.86565,0,0,2.86565,-70.8457,-534.143)"
+       id="path4050-2-7-9-4-0"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
+       transform="matrix(-2.86565,0,0,2.86565,-92.8457,-534.143)"
+       id="path4050-2-7-9-4-0-9"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 47.87528,-34.0295 c 1.53896,0.0448 3.0511,0.70928 4.125,1.8125 l 32.25,32.25 -32.25,32.25 c -2.2253,2.2253 -6.2747,2.2253 -8.5,0 -2.2253,-2.22528 -2.2253,-6.2747 0,-8.5 l 23.75,-23.75 -23.75,-23.75 c -1.73168,-1.6731 -2.295,-4.44228 -1.3546,-6.65894 0.94042,-2.21668 3.32312,-3.73604 5.7296,-3.65356 z"
+       id="path3165-7-3-1"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 41.8316,28.09418 c -0.014,-1.58898 0.54158,-3.18406 1.66868,-4.31118 l 23.75,-23.75 m -25.1046,-30.40894 c 0.94042,-2.21668 3.32312,-3.73604 5.7296,-3.65356 1.53896,0.0448 3.0511,0.70928 4.125,1.8125 l 32.25,32.25"
+       id="path3165-7-3-1-9"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

data/theme/ws-switch-arrow-up.svg

@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg25070"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="ws-switch-arrow-up.svg">
+  <defs
+     id="defs25072">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective25078" />
+    <inkscape:perspective
+       id="perspective24985"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4034-0-4"
+       id="linearGradient24957"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(6)"
+       x1="-86.552246"
+       y1="185.439"
+       x2="-83.37072"
+       y2="197.31261" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4034-0-4">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4036-5-7" />
+      <stop
+         style="stop-color: rgb(186, 189, 182); stop-opacity: 1;"
+         offset="1"
+         id="stop4038-9-6" />
+    </linearGradient>
+    <filter
+       id="filter24765"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix24767"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix24769"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4632-1-3-9-3-2"
+       id="linearGradient24955"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5)"
+       x1="-74.520325"
+       y1="169.06032"
+       x2="-74.520325"
+       y2="205.94189" />
+    <linearGradient
+       id="linearGradient4632-1-3-9-3-2">
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="0"
+         id="stop4634-1-8-3-9-0" />
+      <stop
+         id="stop4636-1-9-9-8-8"
+         offset="0.0274937"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
+      <stop
+         id="stop4638-8-3-9-6-6"
+         offset="0.274937"
+         style="stop-color: rgb(242, 242, 242); stop-opacity: 1;" />
+      <stop
+         id="stop4640-8-5-7-8-9"
+         offset="0.38707438"
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
+      <stop
+         id="stop4642-5-41-9-6-9"
+         offset="0.66528589"
+         style="stop-color: rgb(217, 218, 216); stop-opacity: 1;" />
+      <stop
+         id="stop4644-5-2-7-9-2"
+         offset="0.76745707"
+         style="stop-color: rgb(223, 224, 221); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(240, 240, 240); stop-opacity: 1;"
+         offset="1"
+         id="stop4646-3-2-3-7-3" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4869-4-1"
+       id="radialGradient24959"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)"
+       cx="-33.412369"
+       cy="185.74171"
+       fx="-33.412369"
+       fy="185.74171"
+       r="2.3554697" />
+    <linearGradient
+       id="linearGradient4869-4-1">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop4871-6-2" />
+      <stop
+         id="stop4879-7-4"
+         offset="0.31807542"
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
+      <stop
+         id="stop4877-6-1"
+         offset="0.74691135"
+         style="stop-color: rgb(200, 201, 198); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4873-1-0" />
+    </linearGradient>
+    <filter
+       id="filter25011"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix25013"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix25015"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4869-4-0"
+       id="radialGradient24961"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)"
+       cx="-33.412369"
+       cy="185.74171"
+       fx="-33.412369"
+       fy="185.74171"
+       r="2.3554697" />
+    <linearGradient
+       id="linearGradient4869-4-0">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop4871-6-8" />
+      <stop
+         id="stop4879-7-5"
+         offset="0.31807542"
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
+      <stop
+         id="stop4877-6-5"
+         offset="0.74691135"
+         style="stop-color: rgb(200, 201, 198); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop4873-1-4" />
+    </linearGradient>
+    <filter
+       id="filter25023"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix25025"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix25027"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4941"
+       id="linearGradient24963"
+       gradientUnits="userSpaceOnUse"
+       x1="-39.858727"
+       y1="184.61784"
+       x2="-38.244785"
+       y2="188.84898" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4941">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop4943" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4945" />
+    </linearGradient>
+    <filter
+       id="filter25033"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix25035"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix25037"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4941-7"
+       id="linearGradient24965"
+       gradientUnits="userSpaceOnUse"
+       x1="-39.858727"
+       y1="184.61784"
+       x2="-38.244785"
+       y2="188.84898" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4941-7">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop4943-2" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop4945-5" />
+    </linearGradient>
+    <filter
+       id="filter25043"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix25045"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix25047"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+    <filter
+       id="filter25049"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix25051"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix25053"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+    <filter
+       id="filter25055"
+       inkscape:label="Invert"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Invert colors"
+       color-interpolation-filters="sRGB">
+      <feColorMatrix
+         id="feColorMatrix25057"
+         type="saturate"
+         values="1"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix25059"
+         in="fbSourceGraphic"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="-12.356322"
+     inkscape:cy="57.536221"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1200"
+     inkscape:window-height="840"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata25075">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0, 48)">
+    <g
+       id="g3181"
+       transform="matrix(0,1,-1,0,48.0003,-48)">
+      <g
+         style="stroke:#000000;stroke-opacity:1;display:inline"
+         transform="matrix(2,0,0,2,193.25,-374.967)"
+         id="g4030-1-8">
+        <path
+           style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+           d="m -72.5,173.5 -14,14 14,14"
+           id="path3165-7-3"
+           sodipodi:nodetypes="ccc"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         transform="matrix(3.34328,0,0,3.34328,185.28,-623.176)"
+         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
+         sodipodi:ry="2.09375"
+         sodipodi:rx="2.09375"
+         sodipodi:cy="186.40625"
+         sodipodi:cx="-38.59375"
+         id="path4050-2-7-9-4"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(3.34328,0,0,3.34328,207.28,-623.176)"
+         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
+         sodipodi:ry="2.09375"
+         sodipodi:rx="2.09375"
+         sodipodi:cy="186.40625"
+         sodipodi:cx="-38.59375"
+         id="path4050-2-7-9-4-8"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(2.86565,0,0,2.86565,166.846,-534.143)"
+         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
+         sodipodi:ry="2.09375"
+         sodipodi:rx="2.09375"
+         sodipodi:cy="186.40625"
+         sodipodi:cx="-38.59375"
+         id="path4050-2-7-9-4-0"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(2.86565,0,0,2.86565,188.846,-534.143)"
+         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
+         sodipodi:ry="2.09375"
+         sodipodi:rx="2.09375"
+         sodipodi:cy="186.40625"
+         sodipodi:cx="-38.59375"
+         id="path4050-2-7-9-4-0-9"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(2,0,0,2,-586,-765.967)"
+         sodipodi:nodetypes="ccccscccsc"
+         id="path3165-7-3-1"
+         d="m 317.06251,365.96875 c -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 l -16.125,16.125 16.125,16.125 c 1.11265,1.11265 3.13735,1.11265 4.25,0 1.11265,-1.11264 1.11265,-3.13735 0,-4.25 l -11.875,-11.875 11.875,-11.875 c 0.86584,-0.83655 1.1475,-2.22114 0.6773,-3.32947 -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 z"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(2,0,0,2,-586,-765.967)"
+         sodipodi:nodetypes="ccccccc"
+         id="path3165-7-3-1-9"
+         d="m 320.08435,397.03059 c 0.007,-0.79449 -0.27079,-1.59203 -0.83434,-2.15559 L 307.37501,383 m 12.5523,-15.20447 c -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 L 298.87501,383"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

docs/reference/shell/Makefile.am

@@ -18,10 +18,11 @@ DOC_MODULE=shell
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 
-# Directories containing the source code
+# Directories containing the source code, relative to $(srcdir).
 # gtk-doc will search all .c and .h files beneath these paths
 # for inline comments documenting functions and macros.
-DOC_SOURCE_DIR=$(top_srcdir)/src
+# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
+DOC_SOURCE_DIR=../../../src
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
@@ -57,49 +58,15 @@ EXTRA_HFILES=
 
 # Header files or dirs to ignore when scanning. Use base file/dir names
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
-IGNORE_HFILES=					\
-	calendar-server				\
-	gvc					\
-	hotplug-sniffer				\
-	st					\
-	tray					\
-	gactionmuxer.h				\
-	gactionobservable.h			\
-	gactionobserver.h			\
-	shell-recorder-src.h
-
-if !BUILD_RECORDER
-IGNORE_HFILES += shell-recorder.h
-endif
+IGNORE_HFILES=calendar-server gvc hotplug-sniffer st tray
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
 HTML_IMAGES=
 
-doc-gen-org.gnome.Shell.SearchProvider.xml: $(top_srcdir)/data/org.gnome.ShellSearchProvider.xml
-	gdbus-codegen 						\
-	--interface-prefix org.gnome.ShellSearchProvider. 	\
-	--generate-docbook doc-gen				\
-	$(top_srcdir)/data/org.gnome.ShellSearchProvider.xml
-
-doc-gen-org.gnome.Shell.SearchProvider2.xml: $(top_srcdir)/data/org.gnome.ShellSearchProvider2.xml
-	gdbus-codegen 						\
-	--interface-prefix org.gnome.ShellSearchProvider2. 	\
-	--generate-docbook doc-gen				\
-	$(top_srcdir)/data/org.gnome.ShellSearchProvider2.xml
-
-doc-gen-org.gnome.Shell.Screenshot.xml: $(top_srcdir)/data/org.gnome.Shell.Screenshot.xml
-	gdbus-codegen 						\
-	--interface-prefix org.gnome.Shell.Screenshot.		\
-	--generate-docbook doc-gen				\
-	$(top_srcdir)/data/org.gnome.Shell.Screenshot.xml
-
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files= \
-	doc-gen-org.gnome.Shell.SearchProvider.xml	\
-	doc-gen-org.gnome.Shell.SearchProvider2.xml	\
-	doc-gen-org.gnome.Shell.Screenshot.xml
+content_files=
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
@@ -112,7 +79,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=$(GNOME_SHELL_CFLAGS)
-GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la
+GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

docs/reference/shell/shell-docs.sgml.in

@@ -29,6 +29,8 @@
   <chapter>
     <title>Search</title>
     <xi:include href="xml/shell-app-system.xml"/>
+    <xi:include href="xml/shell-contact-system.xml"/>
+    <xi:include href="xml/shell-doc-system.xml"/>
   </chapter>
   <chapter>
     <title>Tray Icons</title>
@@ -40,16 +42,16 @@
   <chapter>
     <title>Recorder</title>
     <xi:include href="xml/shell-recorder.xml"/>
+    <xi:include href="xml/shell-recorder-src.xml"/>
   </chapter>
   <chapter>
     <title>Integration helpers and utilities</title>
-    <xi:include href="doc-gen-org.gnome.Shell.SearchProvider.xml"/>
-    <xi:include href="doc-gen-org.gnome.Shell.SearchProvider2.xml"/>
     <xi:include href="xml/shell-global.xml"/>
-    <xi:include href="xml/shell-keybinding-modes.xml"/>
     <xi:include href="xml/shell-wm.xml"/>
+    <xi:include href="xml/shell-xfixes-cursor.xml"/>
     <xi:include href="xml/shell-util.xml"/>
     <xi:include href="xml/shell-mount-operation.xml"/>
+    <xi:include href="xml/shell-mobile-providers.xml"/>
     <xi:include href="xml/shell-network-agent.xml"/>
     <xi:include href="xml/shell-polkit-authentication-agent.xml"/>
     <xi:include href="xml/shell-tp-client.xml"/>

docs/reference/st/Makefile.am

@@ -18,10 +18,11 @@ DOC_MODULE=st
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 
-# Directories containing the source code
+# Directories containing the source code, relative to $(srcdir).
 # gtk-doc will search all .c and .h files beneath these paths
 # for inline comments documenting functions and macros.
-DOC_SOURCE_DIR=$(top_srcdir)/src/st
+# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
+DOC_SOURCE_DIR=../../../src/st
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=

docs/reference/st/st-docs.sgml.in

@@ -20,6 +20,7 @@
       <title>Abstract classes and Interfaces</title>
       <xi:include href="xml/st-widget.xml"/>
       <xi:include href="xml/st-widget-accessible.xml"/>
+      <xi:include href="xml/st-container.xml"/>
       <xi:include href="xml/st-scrollable.xml"/>
     </chapter>
     <chapter id="widgets">
@@ -29,11 +30,14 @@
       <xi:include href="xml/st-entry.xml"/>
       <xi:include href="xml/st-icon.xml"/>
       <xi:include href="xml/st-label.xml"/>
+      <xi:include href="xml/st-tooltip.xml"/>
     </chapter>
     <chapter id="containers">
       <title>Containers</title>
       <xi:include href="xml/st-bin.xml"/>
       <xi:include href="xml/st-box-layout.xml"/>
+      <xi:include href="xml/st-group.xml"/>
+      <xi:include href="xml/st-overflow-box.xml"/>
       <xi:include href="xml/st-scroll-view.xml"/>
       <xi:include href="xml/st-table.xml"/>
     </chapter>

gnome-shell.doap

@@ -52,6 +52,13 @@ its dependencies to build from tarballs.</description>
       <gnome:userid>walters</gnome:userid>
     </foaf:Person>
   </maintainer>
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Dan Winship</foaf:name>
+      <foaf:mbox rdf:resource="mailto:danw@gnome.org" />
+      <gnome:userid>danw</gnome:userid>
+    </foaf:Person>
+  </maintainer>
   <maintainer>
     <foaf:Person>
       <foaf:name>Marina Zhurakhinskaya</foaf:name>
@@ -59,11 +66,4 @@ its dependencies to build from tarballs.</description>
       <gnome:userid>marinaz</gnome:userid>
     </foaf:Person>
   </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Florian Müllner</foaf:name>
-      <foaf:mbox rdf:resource="mailto:fmuellner@gnome.org" />
-      <gnome:userid>fmuellner</gnome:userid>
-    </foaf:Person>
-  </maintainer>
 </Project>

js/Makefile.am

@@ -1,37 +1,81 @@
-NULL =
-BUILT_SOURCES =
 
-misc/config.js: misc/config.js.in Makefile
-	[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
-	sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
-	    -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
-	    -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
-	    -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
-	    -e "s|[@]datadir@|$(datadir)|g" \
-	    -e "s|[@]libexecdir@|$(libexecdir)|g" \
-	    -e "s|[@]sysconfdir@|$(sysconfdir)|g" \
-               $< > $@
+jsdir = $(pkgdatadir)/js
 
-js_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/js-resources.gresource.xml)
-js-resources.h: js-resources.gresource.xml $(js_resource_files) misc/config.js
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate --c-name shell_js_resources $<
-js-resources.c: js-resources.gresource.xml $(js_resource_files) misc/config.js
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate --c-name shell_js_resources $<
-
-js_built_sources = js-resources.c js-resources.h
-
-BUILT_SOURCES += $(js_built_sources)
-
-all-local: $(js_built_sources)
-
-js_resource_dist_files = $(filter-out misc/config.js, $(js_resource_files))
-
-EXTRA_DIST = \
-	$(js_resource_dist_files) \
-	js-resources.gresource.xml \
-	misc/config.js.in \
-	$(NULL)
-
-CLEANFILES = \
-	$(js_built_sources) \
-	$(NULL)
+nobase_dist_js_DATA = 	\
+	gdm/batch.js		\
+	gdm/consoleKit.js	\
+	gdm/fingerprint.js	\
+	gdm/loginDialog.js	\
+	gdm/powerMenu.js	\
+	misc/config.js		\
+	misc/docInfo.js		\
+	misc/fileUtils.js	\
+	misc/format.js		\
+	misc/gnomeSession.js	\
+	misc/history.js		\
+	misc/jsParse.js		\
+	misc/modemManager.js	\
+	misc/params.js		\
+	misc/screenSaver.js     \
+	misc/util.js		\
+	perf/core.js		\
+	ui/altTab.js		\
+	ui/appDisplay.js	\
+	ui/appFavorites.js	\
+	ui/automountManager.js  \
+	ui/autorunManager.js    \
+	ui/boxpointer.js	\
+	ui/calendar.js		\
+	ui/contactDisplay.js \
+	ui/ctrlAltTab.js	\
+	ui/dash.js		\
+	ui/dateMenu.js		\
+	ui/dnd.js		\
+	ui/docDisplay.js	\
+	ui/endSessionDialog.js	\
+	ui/environment.js	\
+	ui/extensionSystem.js	\
+	ui/iconGrid.js		\
+	ui/keyboard.js		\
+	ui/layout.js		\
+	ui/lightbox.js		\
+	ui/link.js		\
+	ui/lookingGlass.js	\
+	ui/magnifier.js		\
+	ui/magnifierDBus.js	\
+	ui/main.js		\
+	ui/messageTray.js	\
+	ui/modalDialog.js	\
+	ui/networkAgent.js	\
+	ui/shellEntry.js	\
+	ui/shellMountOperation.js \
+	ui/notificationDaemon.js \
+	ui/overview.js		\
+	ui/panel.js		\
+	ui/panelMenu.js		\
+	ui/placeDisplay.js	\
+	ui/polkitAuthenticationAgent.js \
+	ui/popupMenu.js		\
+	ui/runDialog.js		\
+	ui/scripting.js		\
+	ui/search.js		\
+	ui/searchDisplay.js	\
+	ui/shellDBus.js		\
+	ui/statusIconDispatcher.js	\
+	ui/status/accessibility.js	\
+	ui/status/keyboard.js	\
+	ui/status/network.js	\
+	ui/status/power.js	\
+	ui/status/volume.js	\
+	ui/status/bluetooth.js	\
+	ui/telepathyClient.js	\
+	ui/tweener.js		\
+	ui/userMenu.js		\
+	ui/viewSelector.js	\
+	ui/windowAttentionHandler.js	\
+	ui/windowManager.js	\
+	ui/workspace.js		\
+	ui/workspaceThumbnail.js	\
+	ui/workspacesView.js	\
+	ui/workspaceSwitcherPopup.js    \
+	ui/xdndHandler.js

js/extensionPrefs/main.js

@@ -1,279 +0,0 @@
-
-const Lang = imports.lang;
-const Gettext = imports.gettext;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-const Pango = imports.gi.Pango;
-const Format = imports.format;
-
-const _ = Gettext.gettext;
-
-const Config = imports.misc.config;
-const ExtensionUtils = imports.misc.extensionUtils;
-
-const GnomeShellIface = '<node> \
-<interface name="org.gnome.Shell.Extensions"> \
-<signal name="ExtensionStatusChanged"> \
-    <arg type="s" name="uuid"/> \
-    <arg type="i" name="state"/> \
-    <arg type="s" name="error"/> \
-</signal> \
-</interface> \
-</node>';
-
-const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);
-
-function stripPrefix(string, prefix) {
-    if (string.slice(0, prefix.length) == prefix)
-        return string.slice(prefix.length);
-    return string;
-}
-
-const Application = new Lang.Class({
-    Name: 'Application',
-    _init: function() {
-        GLib.set_prgname('gnome-shell-extension-prefs');
-        this.application = new Gtk.Application({
-            application_id: 'org.gnome.shell.ExtensionPrefs',
-            flags: Gio.ApplicationFlags.HANDLES_COMMAND_LINE
-        });
-
-        this.application.connect('activate', Lang.bind(this, this._onActivate));
-        this.application.connect('command-line', Lang.bind(this, this._onCommandLine));
-        this.application.connect('startup', Lang.bind(this, this._onStartup));
-
-        this._extensionPrefsModules = {};
-
-        this._extensionIters = {};
-        this._startupUuid = null;
-    },
-
-    _buildModel: function() {
-        this._model = new Gtk.ListStore();
-        this._model.set_column_types([GObject.TYPE_STRING, GObject.TYPE_STRING]);
-    },
-
-    _extensionAvailable: function(uuid) {
-        let extension = ExtensionUtils.extensions[uuid];
-
-        if (!extension)
-            return false;
-
-        if (ExtensionUtils.isOutOfDate(extension))
-            return false;
-
-        if (!extension.dir.get_child('prefs.js').query_exists(null))
-            return false;
-
-        return true;
-    },
-
-    _setExtensionInsensitive: function(layout, cell, model, iter, data) {
-        let uuid = model.get_value(iter, 0);
-        cell.set_sensitive(this._extensionAvailable(uuid));
-    },
-
-    _getExtensionPrefsModule: function(extension) {
-        let uuid = extension.metadata.uuid;
-
-        if (this._extensionPrefsModules.hasOwnProperty(uuid))
-            return this._extensionPrefsModules[uuid];
-
-        ExtensionUtils.installImporter(extension);
-
-        let prefsModule = extension.imports.prefs;
-        prefsModule.init(extension.metadata);
-
-        this._extensionPrefsModules[uuid] = prefsModule;
-        return prefsModule;
-    },
-
-    _selectExtension: function(uuid) {
-        if (!this._extensionAvailable(uuid))
-            return;
-
-        let extension = ExtensionUtils.extensions[uuid];
-        let widget;
-
-        try {
-            let prefsModule = this._getExtensionPrefsModule(extension);
-            widget = prefsModule.buildPrefsWidget();
-        } catch (e) {
-            widget = this._buildErrorUI(extension, e);
-        }
-
-        // Destroy the current prefs widget, if it exists
-        if (this._extensionPrefsBin.get_child())
-            this._extensionPrefsBin.get_child().destroy();
-
-        this._extensionPrefsBin.add(widget);
-        this._extensionSelector.set_active_iter(this._extensionIters[uuid]);
-    },
-
-    _extensionSelected: function() {
-        let [success, iter] = this._extensionSelector.get_active_iter();
-        if (!success)
-            return;
-
-        let uuid = this._model.get_value(iter, 0);
-        this._selectExtension(uuid);
-    },
-
-    _buildErrorUI: function(extension, exc) {
-        let box = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
-        let label = new Gtk.Label({
-            label: _("There was an error loading the preferences dialog for %s:").format(extension.metadata.name)
-        });
-        box.add(label);
-
-        let errortext = '';
-        errortext += exc;
-        errortext += '\n\n';
-        errortext += 'Stack trace:\n';
-
-        // Indent stack trace.
-        errortext += exc.stack.split('\n').map(function(line) {
-            return '  ' + line;
-        }).join('\n');
-
-        let scroll = new Gtk.ScrolledWindow({ vexpand: true });
-        let buffer = new Gtk.TextBuffer({ text: errortext });
-        let textview = new Gtk.TextView({ buffer: buffer });
-        textview.override_font(Pango.font_description_from_string('monospace'));
-        scroll.add(textview);
-        box.add(scroll);
-
-        box.show_all();
-        return box;
-    },
-
-    _buildUI: function(app) {
-        this._window = new Gtk.ApplicationWindow({ application: app,
-                                                   window_position: Gtk.WindowPosition.CENTER,
-                                                   title: _("GNOME Shell Extension Preferences") });
-
-        this._window.set_size_request(600, 400);
-
-        let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
-        this._window.add(vbox);
-
-        let toolbar = new Gtk.Toolbar();
-        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_PRIMARY_TOOLBAR);
-        vbox.add(toolbar);
-        let toolitem;
-
-        let label = new Gtk.Label({ label: '<b>' + _("Extension") + '</b>',
-                                    use_markup: true });
-        toolitem = new Gtk.ToolItem({ child: label });
-        toolbar.add(toolitem);
-
-        this._extensionSelector = new Gtk.ComboBox({ model: this._model,
-                                                     margin_left: 8,
-                                                     hexpand: true });
-        this._extensionSelector.get_style_context().add_class(Gtk.STYLE_CLASS_RAISED);
-
-        let renderer = new Gtk.CellRendererText();
-        this._extensionSelector.pack_start(renderer, true);
-        this._extensionSelector.add_attribute(renderer, 'text', 1);
-        this._extensionSelector.set_cell_data_func(renderer, Lang.bind(this, this._setExtensionInsensitive));
-        this._extensionSelector.connect('changed', Lang.bind(this, this._extensionSelected));
-
-        toolitem = new Gtk.ToolItem({ child: this._extensionSelector });
-        toolitem.set_expand(true);
-        toolbar.add(toolitem);
-
-        this._extensionPrefsBin = new Gtk.Frame();
-        vbox.add(this._extensionPrefsBin);
-
-        let label = new Gtk.Label({
-            label: _("Select an extension to configure using the combobox above."),
-            vexpand: true
-        });
-
-        this._extensionPrefsBin.add(label);
-
-        this._shellProxy = new GnomeShellProxy(Gio.DBus.session, 'org.gnome.Shell', '/org/gnome/Shell');
-        this._shellProxy.connectSignal('ExtensionStatusChanged', Lang.bind(this, function(proxy, senderName, [uuid, state, error]) {
-            if (ExtensionUtils.extensions[uuid] !== undefined)
-                this._scanExtensions();
-        }));
-
-        this._window.show_all();
-    },
-
-    _scanExtensions: function() {
-        let finder = new ExtensionUtils.ExtensionFinder();
-        finder.connect('extension-found', Lang.bind(this, this._extensionFound));
-        finder.scanExtensions();
-        this._extensionsLoaded();
-    },
-
-    _extensionFound: function(finder, extension) {
-        let iter = this._model.append();
-        this._model.set(iter, [0, 1], [extension.uuid, extension.metadata.name]);
-        this._extensionIters[extension.uuid] = iter;
-    },
-
-    _extensionsLoaded: function() {
-        if (this._startupUuid && this._extensionAvailable(this._startupUuid))
-            this._selectExtension(this._startupUuid);
-        this._startupUuid = null;
-    },
-
-    _onActivate: function() {
-        this._window.present();
-    },
-
-    _onStartup: function(app) {
-        this._buildModel();
-        this._buildUI(app);
-        this._scanExtensions();
-    },
-
-    _onCommandLine: function(app, commandLine) {
-        app.activate();
-        let args = commandLine.get_arguments();
-        if (args.length) {
-            let uuid = args[0];
-
-            // Strip off "extension:///" prefix which fakes a URI, if it exists
-            uuid = stripPrefix(uuid, "extension:///");
-
-            if (this._extensionAvailable(uuid))
-                this._selectExtension(uuid);
-            else
-                this._startupUuid = uuid;
-        }
-        return 0;
-    }
-});
-
-function initEnvironment() {
-    // Monkey-patch in a "global" object that fakes some Shell utilities
-    // that ExtensionUtils depends on.
-    window.global = {
-        log: function() {
-            print([].join.call(arguments, ', '));
-        },
-
-        logError: function(s) {
-            log('ERROR: ' + s);
-        },
-
-        userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell'])
-    };
-
-    String.prototype.format = Format.format;
-}
-
-function main(argv) {
-    initEnvironment();
-
-    Gettext.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
-    Gettext.textdomain(Config.GETTEXT_PACKAGE);
-
-    let app = new Application();
-    app.application.run(argv);
-}

js/gdm/authPrompt.js

@@ -1,506 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const Animation = imports.ui.animation;
-const Batch = imports.gdm.batch;
-const GdmUtil = imports.gdm.util;
-const Params = imports.misc.params;
-const ShellEntry = imports.ui.shellEntry;
-const Tweener = imports.ui.tweener;
-const UserWidget = imports.ui.userWidget;
-
-const DEFAULT_BUTTON_WELL_ICON_SIZE = 24;
-const DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1.0;
-const DEFAULT_BUTTON_WELL_ANIMATION_TIME = 0.3;
-
-const MESSAGE_FADE_OUT_ANIMATION_TIME = 0.5;
-
-const AuthPromptMode = {
-    UNLOCK_ONLY: 0,
-    UNLOCK_OR_LOG_IN: 1
-};
-
-const AuthPromptStatus = {
-    NOT_VERIFYING: 0,
-    VERIFYING: 1,
-    VERIFICATION_FAILED: 2,
-    VERIFICATION_SUCCEEDED: 3
-};
-
-const BeginRequestType = {
-    PROVIDE_USERNAME: 0,
-    DONT_PROVIDE_USERNAME: 1
-};
-
-const AuthPrompt = new Lang.Class({
-    Name: 'AuthPrompt',
-
-    _init: function(gdmClient, mode) {
-        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-
-        this._gdmClient = gdmClient;
-        this._mode = mode;
-
-        let reauthenticationOnly;
-        if (this._mode == AuthPromptMode.UNLOCK_ONLY)
-            reauthenticationOnly = true;
-        else if (this._mode == AuthPromptMode.UNLOCK_OR_LOG_IN)
-            reauthenticationOnly = false;
-
-        this._userVerifier = new GdmUtil.ShellUserVerifier(this._gdmClient, { reauthenticationOnly: reauthenticationOnly });
-
-        this._userVerifier.connect('ask-question', Lang.bind(this, this._onAskQuestion));
-        this._userVerifier.connect('show-message', Lang.bind(this, this._onShowMessage));
-        this._userVerifier.connect('verification-failed', Lang.bind(this, this._onVerificationFailed));
-        this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
-        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
-        this._userVerifier.connect('smartcard-status-changed', Lang.bind(this, this._onSmartcardStatusChanged));
-        this._userVerifier.connect('ovirt-user-authenticated', Lang.bind(this, this._onOVirtUserAuthenticated));
-        this.smartcardDetected = this._userVerifier.smartcardDetected;
-
-        this.connect('next', Lang.bind(this, function() {
-                         this.updateSensitivity(false);
-                         this.startSpinning();
-                         if (this._queryingService) {
-                             this._userVerifier.answerQuery(this._queryingService, this._entry.text);
-                         } else {
-                             this._preemptiveAnswer = this._entry.text;
-                         }
-                     }));
-
-        this.actor = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
-                                        vertical: true });
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        this.actor.connect('key-press-event',
-                           Lang.bind(this, function(actor, event) {
-                               if (event.get_key_symbol() == Clutter.KEY_Escape) {
-                                   this.cancel();
-                               }
-                               return Clutter.EVENT_PROPAGATE;
-                           }));
-
-        this._userWell = new St.Bin({ x_fill: true,
-                                      x_align: St.Align.START });
-        this.actor.add(this._userWell,
-                       { x_align: St.Align.START,
-                         x_fill: true,
-                         y_fill: true,
-                         expand: true });
-        this._label = new St.Label({ style_class: 'login-dialog-prompt-label' });
-
-        this.actor.add(this._label,
-                       { expand: true,
-                         x_fill: false,
-                         y_fill: true,
-                         x_align: St.Align.START });
-        this._entry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
-                                     can_focus: true });
-        ShellEntry.addContextMenu(this._entry, { isPassword: true });
-
-        this.actor.add(this._entry,
-                       { expand: true,
-                         x_fill: true,
-                         y_fill: false,
-                         x_align: St.Align.START });
-
-        this._entry.grab_key_focus();
-
-        this._message = new St.Label({ opacity: 0,
-                                       styleClass: 'login-dialog-message' });
-        this._message.clutter_text.line_wrap = true;
-        this.actor.add(this._message, { x_fill: false, x_align: St.Align.START, y_align: St.Align.START });
-
-        this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
-                                             vertical: false });
-        this.actor.add(this._buttonBox,
-                       { expand:  true,
-                         x_align: St.Align.MIDDLE,
-                         y_align: St.Align.END });
-
-        this._defaultButtonWell = new St.Widget({ layout_manager: new Clutter.BinLayout() });
-        this._defaultButtonWellActor = null;
-
-        this._initButtons();
-
-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
-        this._spinner = new Animation.AnimatedIcon(spinnerIcon, DEFAULT_BUTTON_WELL_ICON_SIZE);
-        this._spinner.actor.opacity = 0;
-        this._spinner.actor.show();
-        this._defaultButtonWell.add_child(this._spinner.actor);
-    },
-
-    _onDestroy: function() {
-        this._userVerifier.clear();
-        this._userVerifier.disconnectAll();
-        this._userVerifier = null;
-    },
-
-    _initButtons: function() {
-        this.cancelButton = new St.Button({ style_class: 'modal-dialog-button',
-                                            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-                                            reactive: true,
-                                            can_focus: true,
-                                            label: _("Cancel") });
-        this.cancelButton.connect('clicked',
-                                   Lang.bind(this, function() {
-                                       this.cancel();
-                                   }));
-        this._buttonBox.add(this.cancelButton,
-                            { expand: false,
-                              x_fill: false,
-                              y_fill: false,
-                              x_align: St.Align.START,
-                              y_align: St.Align.END });
-
-        this._buttonBox.add(this._defaultButtonWell,
-                            { expand: true,
-                              x_fill: false,
-                              y_fill: false,
-                              x_align: St.Align.END,
-                              y_align: St.Align.MIDDLE });
-        this.nextButton = new St.Button({ style_class: 'modal-dialog-button',
-                                          button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
-                                          reactive: true,
-                                          can_focus: true,
-                                          label: _("Next") });
-        this.nextButton.connect('clicked',
-                                 Lang.bind(this, function() {
-                                     this.emit('next');
-                                 }));
-        this.nextButton.add_style_pseudo_class('default');
-        this._buttonBox.add(this.nextButton,
-                            { expand: false,
-                              x_fill: false,
-                              y_fill: false,
-                              x_align: St.Align.END,
-                              y_align: St.Align.END });
-
-        this._updateNextButtonSensitivity(this._entry.text.length > 0);
-
-        this._entry.clutter_text.connect('text-changed',
-                                         Lang.bind(this, function() {
-                                             if (!this._userVerifier.hasPendingMessages)
-                                                 this._fadeOutMessage();
-
-                                             this._updateNextButtonSensitivity(this._entry.text.length > 0);
-                                         }));
-        this._entry.clutter_text.connect('activate', Lang.bind(this, function() {
-            this.emit('next');
-        }));
-    },
-
-    _onAskQuestion: function(verifier, serviceName, question, passwordChar) {
-        if (this._preemptiveAnswer) {
-            if (this._queryingService)
-                this._userVerifier.answerQuery(this._queryingService, this._preemptiveAnswer);
-            this._preemptiveAnswer = null;
-            return;
-        }
-
-        if (this._queryingService)
-            this.clear();
-
-        this._queryingService = serviceName;
-        this.setPasswordChar(passwordChar);
-        this.setQuestion(question);
-
-        if (passwordChar) {
-            if (this._userVerifier.reauthenticating)
-                this.nextButton.label = _("Unlock");
-            else
-                this.nextButton.label = C_("button", "Sign In");
-        } else {
-            this.nextButton.label = _("Next");
-        }
-
-        this.updateSensitivity(true);
-        this.emit('prompted');
-    },
-
-    _onOVirtUserAuthenticated: function() {
-        if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
-            this.reset();
-    },
-
-    _onSmartcardStatusChanged: function() {
-        this.smartcardDetected = this._userVerifier.smartcardDetected;
-
-        // Most of the time we want to reset if the user inserts or removes
-        // a smartcard. Smartcard insertion "preempts" what the user was
-        // doing, and smartcard removal aborts the preemption.
-        // The exceptions are: 1) Don't reset on smartcard insertion if we're already verifying
-        //                        with a smartcard
-        //                     2) Don't reset if we've already succeeded at verification and
-        //                        the user is getting logged in.
-        if (this._userVerifier.serviceIsDefault(GdmUtil.SMARTCARD_SERVICE_NAME) &&
-            this.verificationStatus == AuthPromptStatus.VERIFYING &&
-            this.smartcardDetected)
-            return;
-
-        if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
-            this.reset();
-    },
-
-    _onShowMessage: function(userVerifier, message, type) {
-        this.setMessage(message, type);
-        this.emit('prompted');
-    },
-
-    _onVerificationFailed: function() {
-        this._queryingService = null;
-        this.clear();
-
-        this.updateSensitivity(true);
-        this.setActorInDefaultButtonWell(null);
-        this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
-    },
-
-    _onVerificationComplete: function() {
-        this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
-    },
-
-    _onReset: function() {
-        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-        this.reset();
-    },
-
-    addActorToDefaultButtonWell: function(actor) {
-        this._defaultButtonWell.add_child(actor);
-    },
-
-    setActorInDefaultButtonWell: function(actor, animate) {
-        if (!this._defaultButtonWellActor &&
-            !actor)
-            return;
-
-        let oldActor = this._defaultButtonWellActor;
-
-        if (oldActor)
-            Tweener.removeTweens(oldActor);
-
-        let isSpinner;
-        if (actor == this._spinner.actor)
-            isSpinner = true;
-        else
-            isSpinner = false;
-
-        if (this._defaultButtonWellActor != actor && oldActor) {
-            if (!animate) {
-                oldActor.opacity = 0;
-            } else {
-                Tweener.addTween(oldActor,
-                                 { opacity: 0,
-                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
-                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
-                                   transition: 'linear',
-                                   onCompleteScope: this,
-                                   onComplete: function() {
-                                      if (isSpinner) {
-                                          if (this._spinner)
-                                              this._spinner.stop();
-                                      }
-                                   }
-                                 });
-            }
-        }
-
-        if (actor) {
-            if (isSpinner)
-                this._spinner.play();
-
-            if (!animate)
-                actor.opacity = 255;
-            else
-                Tweener.addTween(actor,
-                                 { opacity: 255,
-                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
-                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
-                                   transition: 'linear' });
-        }
-
-        this._defaultButtonWellActor = actor;
-    },
-
-    startSpinning: function() {
-        this.setActorInDefaultButtonWell(this._spinner.actor, true);
-    },
-
-    stopSpinning: function() {
-        this.setActorInDefaultButtonWell(null, false);
-    },
-
-    clear: function() {
-        this._entry.text = '';
-        this.stopSpinning();
-    },
-
-    setPasswordChar: function(passwordChar) {
-        this._entry.clutter_text.set_password_char(passwordChar);
-        this._entry.menu.isPassword = passwordChar != '';
-    },
-
-    setQuestion: function(question) {
-        this._label.set_text(question);
-
-        this._label.show();
-        this._entry.show();
-
-        this._entry.grab_key_focus();
-    },
-
-    getAnswer: function() {
-        let text;
-
-        if (this._preemptiveAnswer) {
-            text = this._preemptiveAnswer;
-            this._preemptiveAnswer = null;
-        } else {
-            text = this._entry.get_text();
-        }
-
-        return text;
-    },
-
-    _fadeOutMessage: function() {
-        if (this._message.opacity == 0)
-            return;
-        Tweener.removeTweens(this._message);
-        Tweener.addTween(this._message,
-                         { opacity: 0,
-                           time: MESSAGE_FADE_OUT_ANIMATION_TIME,
-                           transition: 'easeOutQuad'
-                         });
-    },
-
-    setMessage: function(message, type) {
-        if (type == GdmUtil.MessageType.ERROR)
-            this._message.add_style_class_name('login-dialog-message-warning');
-        else
-            this._message.remove_style_class_name('login-dialog-message-warning');
-
-        if (type == GdmUtil.MessageType.HINT)
-            this._message.add_style_class_name('login-dialog-message-hint');
-        else
-            this._message.remove_style_class_name('login-dialog-message-hint');
-
-        if (message) {
-            Tweener.removeTweens(this._message);
-            this._message.text = message;
-            this._message.opacity = 255;
-        } else {
-            this._message.opacity = 0;
-        }
-    },
-
-    _updateNextButtonSensitivity: function(sensitive) {
-        this.nextButton.reactive = sensitive;
-        this.nextButton.can_focus = sensitive;
-    },
-
-    updateSensitivity: function(sensitive) {
-        this._updateNextButtonSensitivity(sensitive);
-        this._entry.reactive = sensitive;
-        this._entry.clutter_text.editable = sensitive;
-    },
-
-    hide: function() {
-        this.setActorInDefaultButtonWell(null, true);
-        this.actor.hide();
-        this._message.opacity = 0;
-
-        this.setUser(null);
-
-        this.updateSensitivity(true);
-        this._entry.set_text('');
-    },
-
-    setUser: function(user) {
-        if (user) {
-            let userWidget = new UserWidget.UserWidget(user);
-            this._userWell.set_child(userWidget.actor);
-        } else {
-            this._userWell.set_child(null);
-        }
-    },
-
-    reset: function() {
-        let oldStatus = this.verificationStatus;
-        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-
-        if (oldStatus == AuthPromptStatus.VERIFYING)
-            this._userVerifier.cancel();
-
-        this._queryingService = null;
-        this.clear();
-        this._message.opacity = 0;
-        this.setUser(null);
-        this.stopSpinning();
-
-        if (oldStatus == AuthPromptStatus.VERIFICATION_FAILED)
-            this.emit('failed');
-
-        let beginRequestType;
-
-        if (this._mode == AuthPromptMode.UNLOCK_ONLY) {
-            // The user is constant at the unlock screen, so it will immediately
-            // respond to the request with the username
-            beginRequestType = BeginRequestType.PROVIDE_USERNAME;
-        } else if (this._userVerifier.serviceIsForeground(GdmUtil.OVIRT_SERVICE_NAME) ||
-                   (this.smartcardDetected &&
-                    this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME))) {
-            // We don't need to know the username if the user preempted the login screen
-            // with a smartcard or with preauthenticated oVirt credentials
-            beginRequestType = BeginRequestType.DONT_PROVIDE_USERNAME;
-        } else {
-            // In all other cases, we should get the username up front.
-            beginRequestType = BeginRequestType.PROVIDE_USERNAME;
-        }
-
-        this.emit('reset', beginRequestType);
-    },
-
-    addCharacter: function(unichar) {
-        if (!this._entry.visible)
-            return;
-
-        this._entry.grab_key_focus();
-        this._entry.clutter_text.insert_unichar(unichar);
-    },
-
-    begin: function(params) {
-        params = Params.parse(params, { userName: null,
-                                        hold: null });
-
-        this.updateSensitivity(false);
-
-        let hold = params.hold;
-        if (!hold)
-            hold = new Batch.Hold();
-
-        this._userVerifier.begin(params.userName, hold);
-        this.verificationStatus = AuthPromptStatus.VERIFYING;
-    },
-
-    finish: function(onComplete) {
-        if (!this._userVerifier.hasPendingMessages) {
-            onComplete();
-            return;
-        }
-
-        let signalId = this._userVerifier.connect('no-more-messages',
-                                                  Lang.bind(this, function() {
-                                                      this._userVerifier.disconnect(signalId);
-                                                      onComplete();
-                                                  }));
-    },
-
-    cancel: function() {
-        this.reset();
-        this.emit('cancelled');
-    }
-});
-Signals.addSignalMethods(AuthPrompt.prototype);

js/gdm/consoleKit.js

@@ -0,0 +1,22 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Gio = imports.gi.Gio;
+
+const ConsoleKitManagerIface = <interface name='org.freedesktop.ConsoleKit.Manager'>
+<method name='CanRestart'>
+    <arg type='b' direction='out'/>
+</method>
+<method name='CanStop'>
+    <arg type='b' direction='out'/>
+</method>
+<method name='Restart' />
+<method name='Stop' />
+</interface>;
+
+const ConsoleKitProxy = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);
+
+function ConsoleKitManager() {
+    return new ConsoleKitProxy(Gio.DBus.system,
+                               'org.freedesktop.ConsoleKit',
+                               '/org/freedesktop/ConsoleKit/Manager');
+};

js/gdm/fingerprint.js

@@ -5,24 +5,16 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const FprintManagerIface = '<node> \
-<interface name="net.reactivated.Fprint.Manager"> \
-<method name="GetDefaultDevice"> \
-    <arg type="o" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const FprintManagerIface = <interface name='net.reactivated.Fprint.Manager'>
+<method name='GetDefaultDevice'>
+    <arg type='o' direction='out' />
+</method>
+</interface>;
 
-const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(FprintManagerIface);
+const FprintManagerProxy = Gio.DBusProxy.makeProxyWrapper(FprintManagerIface);
 
 function FprintManager() {
-    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system,
-                                   g_interface_name: FprintManagerInfo.name,
-                                   g_interface_info: FprintManagerInfo,
-                                   g_name: 'net.reactivated.Fprint',
-                                   g_object_path: '/net/reactivated/Fprint/Manager',
-                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-
-    self.init(null);
-    return self;
-}
+    return new FprintManagerProxy(Gio.DBus.system,
+                           'net.reactivated.Fprint',
+                           '/net/reactivated/Fprint/Manager');
+};

js/gdm/oVirt.js

@@ -1,64 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Signals = imports.signals;
-
-const OVirtCredentialsIface = '<node> \
-<interface name="org.ovirt.vdsm.Credentials"> \
-<signal name="UserAuthenticated"> \
-    <arg type="s" name="token"/> \
-</signal> \
-</interface> \
-</node>';
-
-const OVirtCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(OVirtCredentialsIface);
-
-let _oVirtCredentialsManager = null;
-
-function OVirtCredentials() {
-    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system,
-                                   g_interface_name: OVirtCredentialsInfo.name,
-                                   g_interface_info: OVirtCredentialsInfo,
-                                   g_name: 'org.ovirt.vdsm.Credentials',
-                                   g_object_path: '/org/ovirt/vdsm/Credentials',
-                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-    self.init(null);
-    return self;
-}
-
-const OVirtCredentialsManager = new Lang.Class({
-    Name: 'OVirtCredentialsManager',
-    _init: function() {
-        this._token = null;
-
-        this._credentials = new OVirtCredentials();
-        this._credentials.connectSignal('UserAuthenticated',
-                                        Lang.bind(this, this._onUserAuthenticated));
-    },
-
-    _onUserAuthenticated: function(proxy, sender, [token]) {
-        this._token = token;
-        this.emit('user-authenticated', token);
-    },
-
-    hasToken: function() {
-        return this._token != null;
-    },
-
-    getToken: function() {
-        return this._token;
-    },
-
-    resetToken: function() {
-        this._token = null;
-    }
-});
-Signals.addSignalMethods(OVirtCredentialsManager.prototype);
-
-function getOVirtCredentialsManager() {
-    if (!_oVirtCredentialsManager)
-        _oVirtCredentialsManager = new OVirtCredentialsManager();
-
-    return _oVirtCredentialsManager;
-}

js/gdm/powerMenu.js

@@ -0,0 +1,143 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
+ * Copyright 2011 Red Hat, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+const Lang = imports.lang;
+const UPowerGlib = imports.gi.UPowerGlib;
+
+const ConsoleKit = imports.gdm.consoleKit;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+
+const PowerMenuButton = new Lang.Class({
+    Name: 'PowerMenuButton',
+    Extends: PanelMenu.SystemStatusButton,
+
+    _init: function() {
+        this.parent('system-shutdown', null);
+        this._consoleKitManager = new ConsoleKit.ConsoleKitManager();
+        this._upClient = new UPowerGlib.Client();
+
+        this._createSubMenu();
+
+        this._upClient.connect('notify::can-suspend',
+                               Lang.bind(this, this._updateHaveSuspend));
+        this._updateHaveSuspend();
+
+        // ConsoleKit doesn't send notifications when shutdown/reboot
+        // are disabled, so we update the menu item each time the menu opens
+        this.menu.connect('open-state-changed', Lang.bind(this,
+            function(menu, open) {
+                if (open) {
+                    this._updateHaveShutdown();
+                    this._updateHaveRestart();
+                }
+            }));
+        this._updateHaveShutdown();
+        this._updateHaveRestart();
+    },
+
+    _updateVisibility: function() {
+        if (!this._haveSuspend && !this._haveShutdown && !this._haveRestart)
+            this.actor.hide();
+        else
+            this.actor.show();
+    },
+
+    _updateHaveShutdown: function() {
+        this._consoleKitManager.CanStopRemote(Lang.bind(this,
+            function(result, error) {
+                if (!error)
+                    this._haveShutdown = result;
+                else
+                    this._haveShutdown = false;
+
+                if (this._haveShutdown) {
+                    this._powerOffItem.actor.show();
+                } else {
+                    this._powerOffItem.actor.hide();
+                }
+
+                this._updateVisibility();
+            }));
+    },
+
+    _updateHaveRestart: function() {
+        this._consoleKitManager.CanRestartRemote(Lang.bind(this,
+            function(result, error) {
+                if (!error)
+                    this._haveRestart = result;
+                else
+                    this._haveRestart = false;
+
+                if (this._haveRestart) {
+                    this._restartItem.actor.show();
+                } else {
+                    this._restartItem.actor.hide();
+                }
+
+                this._updateVisibility();
+            }));
+    },
+
+    _updateHaveSuspend: function() {
+        this._haveSuspend = this._upClient.get_can_suspend();
+
+        if (this._haveSuspend)
+            this._suspendItem.actor.show();
+        else
+            this._suspendItem.actor.hide();
+
+        this._updateVisibility();
+    },
+
+    _createSubMenu: function() {
+        let item;
+
+        item = new PopupMenu.PopupMenuItem(_("Suspend"));
+        item.connect('activate', Lang.bind(this, this._onActivateSuspend));
+        this.menu.addMenuItem(item);
+        this._suspendItem = item;
+
+        item = new PopupMenu.PopupMenuItem(_("Restart"));
+        item.connect('activate', Lang.bind(this, this._onActivateRestart));
+        this.menu.addMenuItem(item);
+        this._restartItem = item;
+
+        item = new PopupMenu.PopupMenuItem(_("Power Off"));
+        item.connect('activate', Lang.bind(this, this._onActivatePowerOff));
+        this.menu.addMenuItem(item);
+        this._powerOffItem = item;
+    },
+
+    _onActivateSuspend: function() {
+        if (this._haveSuspend)
+            this._upClient.suspend_sync(null);
+    },
+
+    _onActivateRestart: function() {
+        if (this._haveRestart)
+            this._consoleKitManager.RestartRemote();
+    },
+
+    _onActivatePowerOff: function() {
+        if (this._haveShutdown)
+            this._consoleKitManager.StopRemote();
+    }
+});

js/gdm/realmd.js

@@ -1,157 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-
-const ProviderIface = '<node> \
-<interface name="org.freedesktop.realmd.Provider"> \
-    <property name="Name" type="s" access="read"/> \
-    <property name="Version" type="s" access="read"/> \
-    <property name="Realms" type="ao" access="read"/> \
-    <method name="Discover"> \
-        <arg name="string" type="s" direction="in"/> \
-        <arg name="options" type="a{sv}" direction="in"/> \
-        <arg name="relevance" type="i" direction="out"/> \
-        <arg name="realm" type="ao" direction="out"/> \
-    </method> \
-</interface> \
-</node>';
-const Provider = Gio.DBusProxy.makeProxyWrapper(ProviderIface);
-
-const ServiceIface = '<node> \
-<interface name="org.freedesktop.realmd.Service"> \
-    <method name="Cancel"> \
-        <arg name="operation" type="s" direction="in"/> \
-    </method> \
-    <method name="Release" /> \
-    <method name="SetLocale"> \
-        <arg name="locale" type="s" direction="in"/> \
-    </method> \
-    <signal name="Diagnostics"> \
-        <arg name="data" type="s"/> \
-        <arg name="operation" type="s"/> \
-    </signal> \
-</interface> \
-</node>';
-const Service = Gio.DBusProxy.makeProxyWrapper(ServiceIface);
-
-const RealmIface = '<node> \
-<interface name="org.freedesktop.realmd.Realm"> \
-    <property name="Name" type="s" access="read"/> \
-    <property name="Configured" type="s" access="read"/> \
-    <property name="Details" type="a(ss)" access="read"/> \
-    <property name="LoginFormats" type="as" access="read"/> \
-    <property name="LoginPolicy" type="s" access="read"/> \
-    <property name="PermittedLogins" type="as" access="read"/> \
-    <property name="SupportedInterfaces" type="as" access="read"/> \
-    <method name="ChangeLoginPolicy"> \
-        <arg name="login_policy" type="s" direction="in"/> \
-        <arg name="permitted_add" type="as" direction="in"/> \
-        <arg name="permitted_remove" type="as" direction="in"/> \
-        <arg name="options" type="a{sv}" direction="in"/> \
-    </method> \
-    <method name="Deconfigure"> \
-        <arg name="options" type="a{sv}" direction="in"/> \
-    </method> \
-</interface> \
-</node>';
-const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface);
-
-const Manager = new Lang.Class({
-    Name: 'Manager',
-
-    _init: function(parentActor) {
-        this._aggregateProvider = Provider(Gio.DBus.system,
-                                           'org.freedesktop.realmd',
-                                           '/org/freedesktop/realmd',
-                                           Lang.bind(this, this._reloadRealms))
-        this._realms = {};
-
-        this._signalId = this._aggregateProvider.connect('g-properties-changed',
-                                        Lang.bind(this, function(proxy, properties) {
-                                            if ('Realms' in properties.deep_unpack())
-                                                this._reloadRealms();
-                                        }));
-    },
-
-    _reloadRealms: function() {
-        let realmPaths = this._aggregateProvider.Realms;
-
-        if (!realmPaths)
-            return;
-
-        for (let i = 0; i < realmPaths.length; i++) {
-            let realm = Realm(Gio.DBus.system,
-                              'org.freedesktop.realmd',
-                              realmPaths[i],
-                              Lang.bind(this, this._onRealmLoaded));
-        }
-    },
-
-    _reloadRealm: function(realm) {
-        if (!realm.Configured) {
-            if (this._realms[realm.get_object_path()])
-                delete this._realms[realm.get_object_path()];
-
-            return;
-        }
-
-        this._realms[realm.get_object_path()] = realm;
-
-        this._updateLoginFormat();
-    },
-
-    _onRealmLoaded: function(realm, error) {
-        if (error)
-            return;
-
-        this._reloadRealm(realm);
-
-        realm.connect('g-properties-changed',
-                      Lang.bind(this, function(proxy, properties) {
-                                if ('Configured' in properties.deep_unpack())
-                                    this._reloadRealm(realm);
-                                }));
-    },
-
-    _updateLoginFormat: function() {
-        let newLoginFormat;
-
-        for (let realmPath in this._realms) {
-            let realm = this._realms[realmPath];
-            if (realm.LoginFormats && realm.LoginFormats.length > 0) {
-                newLoginFormat = realm.LoginFormats[0];
-                break;
-            }
-        }
-
-        if (this._loginFormat != newLoginFormat) {
-            this._loginFormat = newLoginFormat;
-            this.emit('login-format-changed', newLoginFormat);
-        }
-    },
-
-    get loginFormat() {
-        if (this._loginFormat !== undefined)
-            return this._loginFormat;
-
-        this._updateLoginFormat();
-
-        return this._loginFormat;
-    },
-
-    release: function() {
-        Service(Gio.DBus.system,
-                'org.freedesktop.realmd',
-                '/org/freedesktop/realmd',
-                function(service) {
-                    service.ReleaseRemote();
-                });
-        this._aggregateProvider.disconnect(this._signalId);
-        this._realms = { };
-        this._updateLoginFormat();
-    }
-});
-Signals.addSignalMethods(Manager.prototype)

js/gdm/util.js

@@ -1,558 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const Batch = imports.gdm.batch;
-const Fprint = imports.gdm.fingerprint;
-const OVirt = imports.gdm.oVirt;
-const Main = imports.ui.main;
-const Params = imports.misc.params;
-const ShellEntry = imports.ui.shellEntry;
-const SmartcardManager = imports.misc.smartcardManager;
-const Tweener = imports.ui.tweener;
-
-const PASSWORD_SERVICE_NAME = 'gdm-password';
-const FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint';
-const SMARTCARD_SERVICE_NAME = 'gdm-smartcard';
-const OVIRT_SERVICE_NAME = 'gdm-ovirtcred';
-const FADE_ANIMATION_TIME = 0.16;
-const CLONE_FADE_ANIMATION_TIME = 0.25;
-
-const LOGIN_SCREEN_SCHEMA = 'org.gnome.login-screen';
-const PASSWORD_AUTHENTICATION_KEY = 'enable-password-authentication';
-const FINGERPRINT_AUTHENTICATION_KEY = 'enable-fingerprint-authentication';
-const SMARTCARD_AUTHENTICATION_KEY = 'enable-smartcard-authentication';
-const BANNER_MESSAGE_KEY = 'banner-message-enable';
-const BANNER_MESSAGE_TEXT_KEY = 'banner-message-text';
-const ALLOWED_FAILURES_KEY = 'allowed-failures';
-
-const LOGO_KEY = 'logo';
-const DISABLE_USER_LIST_KEY = 'disable-user-list';
-
-// Give user 16ms to read each character of a PAM message
-const USER_READ_TIME = 16
-
-const MessageType = {
-    NONE: 0,
-    ERROR: 1,
-    INFO: 2,
-    HINT: 3
-};
-
-function fadeInActor(actor) {
-    if (actor.opacity == 255 && actor.visible)
-        return null;
-
-    let hold = new Batch.Hold();
-    actor.show();
-    let [minHeight, naturalHeight] = actor.get_preferred_height(-1);
-
-    actor.opacity = 0;
-    actor.set_height(0);
-    Tweener.addTween(actor,
-                     { opacity: 255,
-                       height: naturalHeight,
-                       time: FADE_ANIMATION_TIME,
-                       transition: 'easeOutQuad',
-                       onComplete: function() {
-                           this.set_height(-1);
-                           hold.release();
-                       },
-                     });
-
-    return hold;
-}
-
-function fadeOutActor(actor) {
-    if (!actor.visible || actor.opacity == 0) {
-        actor.opacity = 0;
-        actor.hide();
-        return null;
-    }
-
-    let hold = new Batch.Hold();
-    Tweener.addTween(actor,
-                     { opacity: 0,
-                       height: 0,
-                       time: FADE_ANIMATION_TIME,
-                       transition: 'easeOutQuad',
-                       onComplete: function() {
-                           this.hide();
-                           this.set_height(-1);
-                           hold.release();
-                       },
-                     });
-    return hold;
-}
-
-function cloneAndFadeOutActor(actor) {
-    // Immediately hide actor so its sibling can have its space
-    // and position, but leave a non-reactive clone on-screen,
-    // so from the user's point of view it smoothly fades away
-    // and reveals its sibling.
-    actor.hide();
-
-    let clone = new Clutter.Clone({ source: actor,
-                                    reactive: false });
-
-    Main.uiGroup.add_child(clone);
-
-    let [x, y] = actor.get_transformed_position();
-    clone.set_position(x, y);
-
-    let hold = new Batch.Hold();
-    Tweener.addTween(clone,
-                     { opacity: 0,
-                       time: CLONE_FADE_ANIMATION_TIME,
-                       transition: 'easeOutQuad',
-                       onComplete: function() {
-                           clone.destroy();
-                           hold.release();
-                       }
-                     });
-    return hold;
-}
-
-const ShellUserVerifier = new Lang.Class({
-    Name: 'ShellUserVerifier',
-
-    _init: function(client, params) {
-        params = Params.parse(params, { reauthenticationOnly: false });
-        this._reauthOnly = params.reauthenticationOnly;
-
-        this._client = client;
-
-        this._settings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
-        this._settings.connect('changed',
-                               Lang.bind(this, this._updateDefaultService));
-        this._updateDefaultService();
-
-        this._fprintManager = new Fprint.FprintManager();
-        this._smartcardManager = SmartcardManager.getSmartcardManager();
-
-        // We check for smartcards right away, since an inserted smartcard
-        // at startup should result in immediately initiating authentication.
-        // This is different than fingeprint readers, where we only check them
-        // after a user has been picked.
-        this._checkForSmartcard();
-
-        this._smartcardManager.connect('smartcard-inserted',
-                                       Lang.bind(this, this._checkForSmartcard));
-        this._smartcardManager.connect('smartcard-removed',
-                                       Lang.bind(this, this._checkForSmartcard));
-
-        this._messageQueue = [];
-        this._messageQueueTimeoutId = 0;
-        this.hasPendingMessages = false;
-        this.reauthenticating = false;
-
-        this._failCounter = 0;
-
-        this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager();
-
-        if (this._oVirtCredentialsManager.hasToken())
-            this._oVirtUserAuthenticated(this._oVirtCredentialsManager.getToken());
-
-        this._oVirtCredentialsManager.connect('user-authenticated',
-                                              Lang.bind(this, this._oVirtUserAuthenticated));
-    },
-
-    begin: function(userName, hold) {
-        this._cancellable = new Gio.Cancellable();
-        this._hold = hold;
-        this._userName = userName;
-        this.reauthenticating = false;
-
-        this._checkForFingerprintReader();
-
-        if (userName) {
-            // If possible, reauthenticate an already running session,
-            // so any session specific credentials get updated appropriately
-            this._client.open_reauthentication_channel(userName, this._cancellable,
-                                                       Lang.bind(this, this._reauthenticationChannelOpened));
-        } else {
-            this._client.get_user_verifier(this._cancellable, Lang.bind(this, this._userVerifierGot));
-        }
-    },
-
-    cancel: function() {
-        if (this._cancellable)
-            this._cancellable.cancel();
-
-        if (this._userVerifier) {
-            this._userVerifier.call_cancel_sync(null);
-            this.clear();
-        }
-    },
-
-    clear: function() {
-        if (this._cancellable) {
-            this._cancellable.cancel();
-            this._cancellable = null;
-        }
-
-        if (this._userVerifier) {
-            this._userVerifier.run_dispose();
-            this._userVerifier = null;
-        }
-
-        this._clearMessageQueue();
-    },
-
-    answerQuery: function(serviceName, answer) {
-        if (!this.hasPendingMessages) {
-            this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
-        } else {
-            let signalId = this.connect('no-more-messages',
-                                        Lang.bind(this, function() {
-                                            this.disconnect(signalId);
-                                            this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
-                                        }));
-        }
-    },
-
-    _getIntervalForMessage: function(message) {
-        // We probably could be smarter here
-        return message.length * USER_READ_TIME;
-    },
-
-    finishMessageQueue: function() {
-        if (!this.hasPendingMessages)
-            return;
-
-        this._messageQueue = [];
-
-        this.hasPendingMessages = false;
-        this.emit('no-more-messages');
-    },
-
-    _queueMessageTimeout: function() {
-        if (this._messageQueue.length == 0) {
-            this.finishMessageQueue();
-            return;
-        }
-
-        if (this._messageQueueTimeoutId != 0)
-            return;
-
-        let message = this._messageQueue.shift();
-
-        this.emit('show-message', message.text, message.type);
-
-        this._messageQueueTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-                                                       message.interval,
-                                                       Lang.bind(this, function() {
-                                                           this._messageQueueTimeoutId = 0;
-                                                           this._queueMessageTimeout();
-                                                           return GLib.SOURCE_REMOVE;
-                                                       }));
-    },
-
-    _queueMessage: function(message, messageType) {
-        let interval = this._getIntervalForMessage(message);
-
-        this.hasPendingMessages = true;
-        this._messageQueue.push({ text: message, type: messageType, interval: interval });
-        this._queueMessageTimeout();
-    },
-
-    _clearMessageQueue: function() {
-        this.finishMessageQueue();
-
-        if (this._messageQueueTimeoutId != 0) {
-            GLib.source_remove(this._messageQueueTimeoutId);
-            this._messageQueueTimeoutId = 0;
-        }
-        this.emit('show-message', null, MessageType.NONE);
-    },
-
-    _checkForFingerprintReader: function() {
-        this._haveFingerprintReader = false;
-
-        if (!this._settings.get_boolean(FINGERPRINT_AUTHENTICATION_KEY)) {
-            this._updateDefaultService();
-            return;
-        }
-
-        this._fprintManager.GetDefaultDeviceRemote(Gio.DBusCallFlags.NONE, this._cancellable, Lang.bind(this,
-            function(device, error) {
-                if (!error && device)
-                    this._haveFingerprintReader = true;
-                    this._updateDefaultService();
-            }));
-    },
-
-    _oVirtUserAuthenticated: function(token) {
-        this._preemptingService = OVIRT_SERVICE_NAME;
-        this.emit('ovirt-user-authenticated');
-    },
-
-    _checkForSmartcard: function() {
-        let smartcardDetected;
-
-        if (!this._settings.get_boolean(SMARTCARD_AUTHENTICATION_KEY))
-            smartcardDetected = false;
-        else if (this.reauthenticating)
-            smartcardDetected = this._smartcardManager.hasInsertedLoginToken();
-        else
-            smartcardDetected = this._smartcardManager.hasInsertedTokens();
-
-        if (smartcardDetected != this.smartcardDetected) {
-            this.smartcardDetected = smartcardDetected;
-
-            if (this.smartcardDetected)
-                this._preemptingService = SMARTCARD_SERVICE_NAME;
-            else if (this._preemptingService == SMARTCARD_SERVICE_NAME)
-                this._preemptingService = null;
-
-            this.emit('smartcard-status-changed');
-        }
-    },
-
-    _reportInitError: function(where, error) {
-        logError(error, where);
-        this._hold.release();
-
-        this._queueMessage(_("Authentication error"), MessageType.ERROR);
-        this._verificationFailed(false);
-    },
-
-    _reauthenticationChannelOpened: function(client, result) {
-        try {
-            this._userVerifier = client.open_reauthentication_channel_finish(result);
-        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-            return;
-        } catch(e if e.matches(Gio.DBusError, Gio.DBusError.ACCESS_DENIED) &&
-                !this._reauthOnly) {
-            // Gdm emits org.freedesktop.DBus.Error.AccessDenied when there is
-            // no session to reauthenticate. Fall back to performing verification
-            // from this login session
-            client.get_user_verifier(this._cancellable, Lang.bind(this, this._userVerifierGot));
-            return;
-        } catch(e) {
-            this._reportInitError('Failed to open reauthentication channel', e);
-            return;
-        }
-
-        this.reauthenticating = true;
-        this._connectSignals();
-        this._beginVerification();
-        this._hold.release();
-    },
-
-    _userVerifierGot: function(client, result) {
-        try {
-            this._userVerifier = client.get_user_verifier_finish(result);
-        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-            return;
-        } catch(e) {
-            this._reportInitError('Failed to obtain user verifier', e);
-            return;
-        }
-
-        this._connectSignals();
-        this._beginVerification();
-        this._hold.release();
-    },
-
-    _connectSignals: function() {
-        this._userVerifier.connect('info', Lang.bind(this, this._onInfo));
-        this._userVerifier.connect('problem', Lang.bind(this, this._onProblem));
-        this._userVerifier.connect('info-query', Lang.bind(this, this._onInfoQuery));
-        this._userVerifier.connect('secret-info-query', Lang.bind(this, this._onSecretInfoQuery));
-        this._userVerifier.connect('conversation-stopped', Lang.bind(this, this._onConversationStopped));
-        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
-        this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
-    },
-
-    _getForegroundService: function() {
-        if (this._preemptingService)
-            return this._preemptingService;
-
-        return this._defaultService;
-    },
-
-    serviceIsForeground: function(serviceName) {
-        return serviceName == this._getForegroundService();
-    },
-
-    serviceIsDefault: function(serviceName) {
-        return serviceName == this._defaultService;
-    },
-
-    _updateDefaultService: function() {
-        if (this._settings.get_boolean(PASSWORD_AUTHENTICATION_KEY))
-            this._defaultService = PASSWORD_SERVICE_NAME;
-        else if (this.smartcardDetected)
-            this._defaultService = SMARTCARD_SERVICE_NAME;
-        else if (this._haveFingerprintReader)
-            this._defaultService = FINGERPRINT_SERVICE_NAME;
-    },
-
-    _startService: function(serviceName) {
-        this._hold.acquire();
-        if (this._userName) {
-           this._userVerifier.call_begin_verification_for_user(serviceName,
-                                                               this._userName,
-                                                               this._cancellable,
-                                                               Lang.bind(this, function(obj, result) {
-               try {
-                   obj.call_begin_verification_for_user_finish(result);
-               } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-                   return;
-               } catch(e) {
-                   this._reportInitError('Failed to start verification for user', e);
-                   return;
-               }
-
-               this._hold.release();
-           }));
-        } else {
-           this._userVerifier.call_begin_verification(serviceName,
-                                                      this._cancellable,
-                                                      Lang.bind(this, function(obj, result) {
-               try {
-                   obj.call_begin_verification_finish(result);
-               } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-                   return;
-               } catch(e) {
-                   this._reportInitError('Failed to start verification', e);
-                   return;
-               }
-
-               this._hold.release();
-           }));
-        }
-    },
-
-    _beginVerification: function() {
-        this._startService(this._getForegroundService());
-
-        if (this._userName && this._haveFingerprintReader && !this.serviceIsForeground(FINGERPRINT_SERVICE_NAME))
-            this._startService(FINGERPRINT_SERVICE_NAME);
-    },
-
-    _onInfo: function(client, serviceName, info) {
-        if (this.serviceIsForeground(serviceName)) {
-            this._queueMessage(info, MessageType.INFO);
-        } else if (serviceName == FINGERPRINT_SERVICE_NAME &&
-            this._haveFingerprintReader) {
-            // We don't show fingerprint messages directly since it's
-            // not the main auth service. Instead we use the messages
-            // as a cue to display our own message.
-
-            // Translators: this message is shown below the password entry field
-            // to indicate the user can swipe their finger instead
-            this._queueMessage(_("(or swipe finger)"), MessageType.HINT);
-        }
-    },
-
-    _onProblem: function(client, serviceName, problem) {
-        if (!this.serviceIsForeground(serviceName))
-            return;
-
-        this._queueMessage(problem, MessageType.ERROR);
-    },
-
-    _onInfoQuery: function(client, serviceName, question) {
-        if (!this.serviceIsForeground(serviceName))
-            return;
-
-        this.emit('ask-question', serviceName, question, '');
-    },
-
-    _onSecretInfoQuery: function(client, serviceName, secretQuestion) {
-        if (!this.serviceIsForeground(serviceName))
-            return;
-
-        if (serviceName == OVIRT_SERVICE_NAME) {
-            // The only question asked by this service is "Token?"
-            this.answerQuery(serviceName, this._oVirtCredentialsManager.getToken());
-            return;
-        }
-
-        this.emit('ask-question', serviceName, secretQuestion, '\u25cf');
-    },
-
-    _onReset: function() {
-        // Clear previous attempts to authenticate
-        this._failCounter = 0;
-        this._updateDefaultService();
-
-        this.emit('reset');
-    },
-
-    _onVerificationComplete: function() {
-        this.emit('verification-complete');
-    },
-
-    _cancelAndReset: function() {
-        this.cancel();
-        this._onReset();
-    },
-
-    _retry: function() {
-        this.begin(this._userName, new Batch.Hold());
-    },
-
-    _verificationFailed: function(retry) {
-        // For Not Listed / enterprise logins, immediately reset
-        // the dialog
-        // Otherwise, we allow ALLOWED_FAILURES attempts. After that, we
-        // go back to the welcome screen.
-
-        this._failCounter++;
-        let canRetry = retry && this._userName &&
-            this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);
-
-        if (canRetry) {
-            if (!this.hasPendingMessages) {
-                this._retry();
-            } else {
-                let signalId = this.connect('no-more-messages',
-                                            Lang.bind(this, function() {
-                                                this.disconnect(signalId);
-                                                this._retry();
-                                            }));
-            }
-        } else {
-            if (!this.hasPendingMessages) {
-                this._cancelAndReset();
-            } else {
-                let signalId = this.connect('no-more-messages',
-                                            Lang.bind(this, function() {
-                                                this.disconnect(signalId);
-                                                this._cancelAndReset();
-                                            }));
-            }
-        }
-
-        this.emit('verification-failed');
-    },
-
-    _onConversationStopped: function(client, serviceName) {
-        // If the login failed with the preauthenticated oVirt credentials
-        // then discard the credentials and revert to default authentication
-        // mechanism.
-        if (this.serviceIsForeground(OVIRT_SERVICE_NAME)) {
-            this._oVirtCredentialsManager.resetToken();
-            this._preemptingService = null;
-            this._verificationFailed(false);
-            return;
-        }
-
-        // if the password service fails, then cancel everything.
-        // But if, e.g., fingerprint fails, still give
-        // password authentication a chance to succeed
-        if (this.serviceIsForeground(serviceName)) {
-            this._verificationFailed(true);
-        }
-    },
-});
-Signals.addSignalMethods(ShellUserVerifier.prototype);

js/js-resources.gresource.xml

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/shell">
-    <file>gdm/authPrompt.js</file>
-    <file>gdm/batch.js</file>
-    <file>gdm/fingerprint.js</file>
-    <file>gdm/loginDialog.js</file>
-    <file>gdm/oVirt.js</file>
-    <file>gdm/realmd.js</file>
-    <file>gdm/util.js</file>
-
-    <file>extensionPrefs/main.js</file>
-
-    <file>misc/config.js</file>
-    <file>misc/extensionUtils.js</file>
-    <file>misc/fileUtils.js</file>
-    <file>misc/gnomeSession.js</file>
-    <file>misc/hash.js</file>
-    <file>misc/history.js</file>
-    <file>misc/jsParse.js</file>
-    <file>misc/loginManager.js</file>
-    <file>misc/modemManager.js</file>
-    <file>misc/objectManager.js</file>
-    <file>misc/params.js</file>
-    <file>misc/smartcardManager.js</file>
-    <file>misc/util.js</file>
-
-    <file>perf/core.js</file>
-
-    <file>ui/altTab.js</file>
-    <file>ui/animation.js</file>
-    <file>ui/appDisplay.js</file>
-    <file>ui/appFavorites.js</file>
-    <file>ui/backgroundMenu.js</file>
-    <file>ui/background.js</file>
-    <file>ui/boxpointer.js</file>
-    <file>ui/calendar.js</file>
-    <file>ui/checkBox.js</file>
-    <file>ui/ctrlAltTab.js</file>
-    <file>ui/dash.js</file>
-    <file>ui/dateMenu.js</file>
-    <file>ui/dnd.js</file>
-    <file>ui/endSessionDialog.js</file>
-    <file>ui/environment.js</file>
-    <file>ui/extensionDownloader.js</file>
-    <file>ui/extensionSystem.js</file>
-    <file>ui/focusCaretTracker.js</file>
-    <file>ui/grabHelper.js</file>
-    <file>ui/ibusCandidatePopup.js</file>
-    <file>ui/iconGrid.js</file>
-    <file>ui/keyboard.js</file>
-    <file>ui/layout.js</file>
-    <file>ui/lightbox.js</file>
-    <file>ui/lookingGlass.js</file>
-    <file>ui/magnifier.js</file>
-    <file>ui/magnifierDBus.js</file>
-    <file>ui/main.js</file>
-    <file>ui/messageTray.js</file>
-    <file>ui/modalDialog.js</file>
-    <file>ui/notificationDaemon.js</file>
-    <file>ui/osdWindow.js</file>
-    <file>ui/overview.js</file>
-    <file>ui/overviewControls.js</file>
-    <file>ui/panel.js</file>
-    <file>ui/panelMenu.js</file>
-    <file>ui/pointerWatcher.js</file>
-    <file>ui/popupMenu.js</file>
-    <file>ui/remoteMenu.js</file>
-    <file>ui/remoteSearch.js</file>
-    <file>ui/runDialog.js</file>
-    <file>ui/screenShield.js</file>
-    <file>ui/screencast.js</file>
-    <file>ui/screenshot.js</file>
-    <file>ui/scripting.js</file>
-    <file>ui/search.js</file>
-    <file>ui/separator.js</file>
-    <file>ui/sessionMode.js</file>
-    <file>ui/shellDBus.js</file>
-    <file>ui/shellEntry.js</file>
-    <file>ui/shellMountOperation.js</file>
-    <file>ui/slider.js</file>
-    <file>ui/switcherPopup.js</file>
-    <file>ui/tweener.js</file>
-    <file>ui/unlockDialog.js</file>
-    <file>ui/userWidget.js</file>
-    <file>ui/viewSelector.js</file>
-    <file>ui/windowAttentionHandler.js</file>
-    <file>ui/windowManager.js</file>
-    <file>ui/workspace.js</file>
-    <file>ui/workspaceSwitcherPopup.js</file>
-    <file>ui/workspaceThumbnail.js</file>
-    <file>ui/workspacesView.js</file>
-    <file>ui/xdndHandler.js</file>
-
-    <file>ui/components/__init__.js</file>
-    <file>ui/components/autorunManager.js</file>
-    <file>ui/components/automountManager.js</file>
-    <file>ui/components/networkAgent.js</file>
-    <file>ui/components/polkitAgent.js</file>
-    <file>ui/components/telepathyClient.js</file>
-    <file>ui/components/keyring.js</file>
-
-    <file>ui/status/accessibility.js</file>
-    <file>ui/status/brightness.js</file>
-    <file>ui/status/keyboard.js</file>
-    <file>ui/status/network.js</file>
-    <file>ui/status/power.js</file>
-    <file>ui/status/rfkill.js</file>
-    <file>ui/status/volume.js</file>
-    <file>ui/status/bluetooth.js</file>
-    <file>ui/status/screencast.js</file>
-    <file>ui/status/system.js</file>
-  </gresource>
-</gresources>

js/misc/config.js.in

@@ -4,12 +4,9 @@
 const PACKAGE_NAME = '@PACKAGE_NAME@';
 /* The version of this package */
 const PACKAGE_VERSION = '@PACKAGE_VERSION@';
+/* The version of GJS we're linking to */
+const GJS_VERSION = '@GJS_VERSION@';
 /* 1 if gnome-bluetooth is available, 0 otherwise */
 const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-/* gettext package */
-const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
-/* locale dir */
-const LOCALEDIR = '@datadir@/locale';
-/* other standard directories */
-const LIBEXECDIR = '@libexecdir@';
-const SYSCONFDIR = '@sysconfdir@';
+/* The system TLS CA list */
+const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';

js/misc/docInfo.js

@@ -0,0 +1,136 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+const Lang = imports.lang;
+const Signals = imports.signals;
+const Search = imports.ui.search;
+
+const THUMBNAIL_ICON_MARGIN = 2;
+
+const DocInfo = new Lang.Class({
+    Name: 'DocInfo',
+
+    _init : function(recentInfo) {
+        this.recentInfo = recentInfo;
+        // We actually used get_modified() instead of get_visited()
+        // here, as GtkRecentInfo doesn't updated get_visited()
+        // correctly. See http://bugzilla.gnome.org/show_bug.cgi?id=567094
+        this.timestamp = recentInfo.get_modified();
+        this.name = recentInfo.get_display_name();
+        this._lowerName = this.name.toLowerCase();
+        this.uri = recentInfo.get_uri();
+        this.mimeType = recentInfo.get_mime_type();
+    },
+
+    createIcon : function(size) {
+        return St.TextureCache.get_default().load_recent_thumbnail(size, this.recentInfo);
+    },
+
+    launch : function(workspaceIndex) {
+        Shell.DocSystem.get_default().open(this.recentInfo, workspaceIndex);
+    },
+
+    matchTerms: function(terms) {
+        let mtype = Search.MatchType.NONE;
+        for (let i = 0; i < terms.length; i++) {
+            let term = terms[i];
+            let idx = this._lowerName.indexOf(term);
+            if (idx == 0) {
+                mtype = Search.MatchType.PREFIX;
+            } else if (idx > 0) {
+                if (mtype == Search.MatchType.NONE)
+                    mtype = Search.MatchType.SUBSTRING;
+            } else {
+                return Search.MatchType.NONE;
+            }
+        }
+        return mtype;
+    }
+});
+
+var docManagerInstance = null;
+
+function getDocManager() {
+    if (docManagerInstance == null)
+        docManagerInstance = new DocManager();
+    return docManagerInstance;
+}
+
+/**
+ * DocManager wraps the DocSystem, primarily to expose DocInfo objects.
+ */
+const DocManager = new Lang.Class({
+    Name: 'DocManager',
+
+    _init: function() {
+        this._docSystem = Shell.DocSystem.get_default();
+        this._infosByTimestamp = [];
+        this._infosByUri = {};
+        this._docSystem.connect('changed', Lang.bind(this, this._reload));
+        this._reload();
+    },
+
+    _reload: function() {
+        let docs = this._docSystem.get_all();
+        this._infosByTimestamp = [];
+        this._infosByUri = {};
+        for (let i = 0; i < docs.length; i++) {
+            let recentInfo = docs[i];
+
+            let docInfo = new DocInfo(recentInfo);
+            this._infosByTimestamp.push(docInfo);
+            this._infosByUri[docInfo.uri] = docInfo;
+        }
+        this.emit('changed');
+    },
+
+    getTimestampOrderedInfos: function() {
+        return this._infosByTimestamp;
+    },
+
+    getInfosByUri: function() {
+        return this._infosByUri;
+    },
+
+    lookupByUri: function(uri) {
+        return this._infosByUri[uri];
+    },
+
+    queueExistenceCheck: function(count) {
+        return this._docSystem.queue_existence_check(count);
+    },
+
+    _searchDocs: function(items, terms) {
+        let multiplePrefixMatches = [];
+        let prefixMatches = [];
+        let multipleSubtringMatches = [];
+        let substringMatches = [];
+        for (let i = 0; i < items.length; i++) {
+            let item = items[i];
+            let mtype = item.matchTerms(terms);
+            if (mtype == Search.MatchType.MULTIPLE_PREFIX)
+                multiplePrefixMatches.push(item.uri);
+            else if (mtype == Search.MatchType.PREFIX)
+                prefixMatches.push(item.uri);
+            else if (mtype == Search.MatchType.MULTIPLE_SUBSTRING)
+                multipleSubtringMatches.push(item.uri);
+            else if (mtype == Search.MatchType.SUBSTRING)
+                substringMatches.push(item.uri);
+         }
+        return multiplePrefixMatches.concat(prefixMatches.concat(multipleSubtringMatches.concat(substringMatches)));
+    },
+
+    initialSearch: function(terms) {
+        return this._searchDocs(this._infosByTimestamp, terms);
+    },
+
+    subsearch: function(previousResults, terms) {
+        return this._searchDocs(previousResults.map(Lang.bind(this,
+            function(url) {
+                return this._infosByUri[url];
+            })), terms);
+    }
+});
+
+Signals.addSignalMethods(DocManager.prototype);

js/misc/extensionUtils.js

@@ -1,182 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-// Common utils for the extension system and the extension
-// preferences tool
-
-const Lang = imports.lang;
-const Signals = imports.signals;
-
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const ShellJS = imports.gi.ShellJS;
-
-const Config = imports.misc.config;
-const FileUtils = imports.misc.fileUtils;
-
-const ExtensionType = {
-    SYSTEM: 1,
-    PER_USER: 2
-};
-
-// Maps uuid -> metadata object
-const extensions = {};
-
-function getCurrentExtension() {
-    let stack = (new Error()).stack;
-
-    // Assuming we're importing this directly from an extension (and we shouldn't
-    // ever not be), its UUID should be directly in the path here.
-    let extensionStackLine = stack.split('\n')[1];
-    if (!extensionStackLine)
-        throw new Error('Could not find current extension');
-
-    // The stack line is like:
-    //   init([object Object])@/home/user/data/gnome-shell/extensions/u@u.id/prefs.js:8
-    //
-    // In the case that we're importing from
-    // module scope, the first field is blank:
-    //   @/home/user/data/gnome-shell/extensions/u@u.id/prefs.js:8
-    let match = new RegExp('@(.+):\\d+').exec(extensionStackLine);
-    if (!match)
-        throw new Error('Could not find current extension');
-
-    let path = match[1];
-    let file = Gio.File.new_for_path(path);
-
-    // Walk up the directory tree, looking for an extesion with
-    // the same UUID as a directory name.
-    while (file != null) {
-        let extension = extensions[file.get_basename()];
-        if (extension !== undefined)
-            return extension;
-        file = file.get_parent();
-    }
-
-    throw new Error('Could not find current extension');
-}
-
-/**
- * versionCheck:
- * @required: an array of versions we're compatible with
- * @current: the version we have
- *
- * Check if a component is compatible for an extension.
- * @required is an array, and at least one version must match.
- * @current must be in the format <major>.<minor>.<point>.<micro>
- * <micro> is always ignored
- * <point> is ignored if <minor> is even (so you can target the
- * whole stable release)
- * <minor> and <major> must match
- * Each target version must be at least <major> and <minor>
- */
-function versionCheck(required, current) {
-    let currentArray = current.split('.');
-    let major = currentArray[0];
-    let minor = currentArray[1];
-    let point = currentArray[2];
-    for (let i = 0; i < required.length; i++) {
-        let requiredArray = required[i].split('.');
-        if (requiredArray[0] == major &&
-            requiredArray[1] == minor &&
-            (requiredArray[2] == point ||
-             (requiredArray[2] == undefined && parseInt(minor) % 2 == 0)))
-            return true;
-    }
-    return false;
-}
-
-function isOutOfDate(extension) {
-    if (!versionCheck(extension.metadata['shell-version'], Config.PACKAGE_VERSION))
-        return true;
-
-    return false;
-}
-
-function createExtensionObject(uuid, dir, type) {
-    let info;
-
-    let metadataFile = dir.get_child('metadata.json');
-    if (!metadataFile.query_exists(null)) {
-        throw new Error('Missing metadata.json');
-    }
-
-    let metadataContents, success, tag;
-    try {
-        [success, metadataContents, tag] = metadataFile.load_contents(null);
-    } catch (e) {
-        throw new Error('Failed to load metadata.json: ' + e);
-    }
-    let meta;
-    try {
-        meta = JSON.parse(metadataContents);
-    } catch (e) {
-        throw new Error('Failed to parse metadata.json: ' + e);
-    }
-
-    let requiredProperties = ['uuid', 'name', 'description', 'shell-version'];
-    for (let i = 0; i < requiredProperties.length; i++) {
-        let prop = requiredProperties[i];
-        if (!meta[prop]) {
-            throw new Error('missing "' + prop + '" property in metadata.json');
-        }
-    }
-
-    if (uuid != meta.uuid) {
-        throw new Error('uuid "' + meta.uuid + '" from metadata.json does not match directory name "' + uuid + '"');
-    }
-
-    let extension = {};
-
-    extension.metadata = meta;
-    extension.uuid = meta.uuid;
-    extension.type = type;
-    extension.dir = dir;
-    extension.path = dir.get_path();
-    extension.error = '';
-    extension.hasPrefs = dir.get_child('prefs.js').query_exists(null);
-
-    extensions[uuid] = extension;
-
-    return extension;
-}
-
-var _extension = null;
-
-function installImporter(extension) {
-    _extension = extension;
-    ShellJS.add_extension_importer('imports.misc.extensionUtils._extension', 'imports', extension.path);
-    _extension = null;
-}
-
-const ExtensionFinder = new Lang.Class({
-    Name: 'ExtensionFinder',
-
-    _loadExtension: function(extensionDir, info, perUserDir) {
-        let fileType = info.get_file_type();
-        if (fileType != Gio.FileType.DIRECTORY)
-            return;
-        let uuid = info.get_name();
-        let existing = extensions[uuid];
-        if (existing) {
-            log('Extension %s already installed in %s. %s will not be loaded'.format(uuid, existing.path, extensionDir.get_path()));
-            return;
-        }
-
-        let extension;
-        let type = extensionDir.has_prefix(perUserDir) ? ExtensionType.PER_USER
-                                                       : ExtensionType.SYSTEM;
-        try {
-            extension = createExtensionObject(uuid, extensionDir, type);
-        } catch(e) {
-            logError(e, 'Could not load extension %s'.format(uuid));
-            return;
-        }
-        this.emit('extension-found', extension);
-    },
-
-    scanExtensions: function() {
-        let perUserDir = Gio.File.new_for_path(global.userdatadir);
-        FileUtils.collectFromDatadirs('extensions', true, Lang.bind(this, this._loadExtension, perUserDir));
-    }
-});
-Signals.addSignalMethods(ExtensionFinder.prototype);

js/misc/fileUtils.js

@@ -2,12 +2,10 @@
 
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Params = imports.misc.params;
 
 function listDirAsync(file, callback) {
     let allFiles = [];
-    file.enumerate_children_async('standard::name,standard::type',
+    file.enumerate_children_async(Gio.FILE_ATTRIBUTE_STANDARD_NAME,
                                   Gio.FileQueryInfoFlags.NONE,
                                   GLib.PRIORITY_LOW, null, function (obj, res) {
         let enumerator = obj.enumerate_children_finish(res);
@@ -25,36 +23,12 @@ function listDirAsync(file, callback) {
     });
 }
 
-function collectFromDatadirs(subdir, includeUserDir, processFile) {
-    let dataDirs = GLib.get_system_data_dirs();
-    if (includeUserDir)
-        dataDirs.unshift(GLib.get_user_data_dir());
-
-    for (let i = 0; i < dataDirs.length; i++) {
-        let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', subdir]);
-        let dir = Gio.File.new_for_path(path);
-
-        let fileEnum;
-        try {
-            fileEnum = dir.enumerate_children('standard::name,standard::type',
-                                              Gio.FileQueryInfoFlags.NONE, null);
-        } catch (e) {
-            fileEnum = null;
-        }
-        if (fileEnum != null) {
-            let info;
-            while ((info = fileEnum.next_file(null)))
-                processFile(fileEnum.get_child(info), info);
-        }
-    }
-}
-
 function deleteGFile(file) {
     // Work around 'delete' being a keyword in JS.
     return file['delete'](null);
 }
 
-function recursivelyDeleteDir(dir, deleteParent) {
+function recursivelyDeleteDir(dir) {
     let children = dir.enumerate_children('standard::name,standard::type',
                                           Gio.FileQueryInfoFlags.NONE, null);
 
@@ -64,29 +38,9 @@ function recursivelyDeleteDir(dir, deleteParent) {
         let child = dir.get_child(info.get_name());
         if (type == Gio.FileType.REGULAR)
             deleteGFile(child);
-        else if (type == Gio.FileType.DIRECTORY)
-            recursivelyDeleteDir(child, true);
+        else if (type == Gio.TypeType.DIRECTORY)
+            recursivelyDeleteDir(child);
     }
 
-    if (deleteParent)
-        deleteGFile(dir);
-}
-
-function recursivelyMoveDir(srcDir, destDir) {
-    let children = srcDir.enumerate_children('standard::name,standard::type',
-                                             Gio.FileQueryInfoFlags.NONE, null);
-
-    if (!destDir.query_exists(null))
-        destDir.make_directory_with_parents(null);
-
-    let info, child;
-    while ((info = children.next_file(null)) != null) {
-        let type = info.get_file_type();
-        let srcChild = srcDir.get_child(info.get_name());
-        let destChild = destDir.get_child(info.get_name());
-        if (type == Gio.FileType.REGULAR)
-            srcChild.move(destChild, Gio.FileCopyFlags.NONE, null, null);
-        else if (type == Gio.FileType.DIRECTORY)
-            recursivelyMoveDir(srcChild, destChild);
-    }
+    deleteGFile(dir);
 }

js/misc/format.js

@@ -0,0 +1,60 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+/*
+ * This function is intended to extend the String object and provide
+ * an String.format API for string formatting.
+ * It has to be set up using String.prototype.format = Format.format;
+ * Usage:
+ * "somestring %s %d".format('hello', 5);
+ * It supports %s, %d, %x and %f, for %f it also support precisions like
+ * "%.2f".format(1.526). All specifiers can be prefixed with a minimum
+ * field width, e.g. "%5s".format("foo"). Unless the width is prefixed
+ * with '0', the formatted string will be padded with spaces.
+ */
+
+function format() {
+    let str = this;
+    let i = 0;
+    let args = arguments;
+
+    return str.replace(/%([0-9]+)?(?:\.([0-9]+))?(.)/g, function (str, widthGroup, precisionGroup, genericGroup) {
+
+                    if (precisionGroup != '' && genericGroup != 'f')
+                        throw new Error("Precision can only be specified for 'f'");
+
+                    let fillChar = (widthGroup[0] == '0') ? '0' : ' ';
+                    let width = parseInt(widthGroup, 10) || 0;
+
+                    function fillWidth(s, c, w) {
+                        let fill = '';
+                        for (let i = 0; i < w; i++)
+                            fill += c;
+                        return fill.substr(s.length) + s;
+                    }
+
+                    let s = '';
+                    switch (genericGroup) {
+                        case '%':
+                            return '%';
+                            break;
+                        case 's':
+                            s = args[i++].toString();
+                            break;
+                        case 'd':
+                            s = parseInt(args[i++]).toString();
+                            break;
+                        case 'x':
+                            s = parseInt(args[i++]).toString(16);
+                            break;
+                        case 'f':
+                            if (precisionGroup == '')
+                                s = parseFloat(args[i++]).toString();
+                            else
+                                s = parseFloat(args[i++]).toFixed(parseInt(precisionGroup));
+                            break;
+                        default:
+                            throw new Error('Unsupported conversion character %' + genericGroup);
+                    }
+                    return fillWidth(s, fillChar, width);
+                });
+}

js/misc/gnomeSession.js

@@ -4,17 +4,15 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Signals = imports.signals;
 
-const PresenceIface = '<node> \
-<interface name="org.gnome.SessionManager.Presence"> \
-<method name="SetStatus"> \
-    <arg type="u" direction="in"/> \
-</method> \
-<property name="status" type="u" access="readwrite"/> \
-<signal name="StatusChanged"> \
-    <arg type="u" direction="out"/> \
-</signal> \
-</interface> \
-</node>';
+const PresenceIface = <interface name="org.gnome.SessionManager.Presence">
+<method name="SetStatus">
+    <arg type="u" direction="in"/>
+</method>
+<property name="status" type="u" access="readwrite"/>
+<signal name="StatusChanged">
+    <arg type="u" direction="out"/>
+</signal>
+</interface>;
 
 const PresenceStatus = {
     AVAILABLE: 0,
@@ -32,16 +30,14 @@ function Presence(initCallback, cancellable) {
 // Note inhibitors are immutable objects, so they don't
 // change at runtime (changes always come in the form
 // of new inhibitors)
-const InhibitorIface = '<node> \
-<interface name="org.gnome.SessionManager.Inhibitor"> \
-<method name="GetAppId"> \
-    <arg type="s" direction="out" /> \
-</method> \
-<method name="GetReason"> \
-    <arg type="s" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const InhibitorIface = <interface name="org.gnome.SessionManager.Inhibitor">
+<property name="app_id" type="s" access="read" />
+<property name="client_id" type="s" access="read" />
+<property name="reason" type="s" access="read" />
+<property name="flags" type="u" access="read" />
+<property name="toplevel_xid" type="u" access="read" />
+<property name="cookie" type="u" access="read" />
+</interface>;
 
 var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface);
 function Inhibitor(objectPath, initCallback, cancellable) {
@@ -49,29 +45,15 @@ function Inhibitor(objectPath, initCallback, cancellable) {
 }
 
 // Not the full interface, only the methods we use
-const SessionManagerIface = '<node> \
-<interface name="org.gnome.SessionManager"> \
-<method name="Logout"> \
-    <arg type="u" direction="in" /> \
-</method> \
-<method name="Shutdown" /> \
-<method name="Reboot" /> \
-<method name="CanShutdown"> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="IsInhibited"> \
-    <arg type="u" direction="in" /> \
-    <arg type="b" direction="out" /> \
-</method> \
-<property name="SessionIsActive" type="b" access="read"/> \
-<signal name="InhibitorAdded"> \
-    <arg type="o" direction="out"/> \
-</signal> \
-<signal name="InhibitorRemoved"> \
-    <arg type="o" direction="out"/> \
-</signal> \
-</interface> \
-</node>';
+const SessionManagerIface = <interface name="org.gnome.SessionManager">
+<method name="Logout">
+    <arg type="u" direction="in" />
+</method>
+<method name="Shutdown" />
+<method name="CanShutdown">
+    <arg type="b" direction="out" />
+</method>
+</interface>;
 
 var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface);
 function SessionManager(initCallback, cancellable) {

js/misc/hash.js

@@ -1,144 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Lang = imports.lang;
-const System = imports.system;
-
-const Params = imports.misc.params;
-
-// This is an implementation of EcmaScript SameValue algorithm,
-// which returns true if two values are not observably distinguishable.
-// It was taken from http://wiki.ecmascript.org/doku.php?id=harmony:egal
-//
-// In the future, we may want to use the 'is' operator instead.
-function _sameValue(x, y) {
-    if (x === y) {
-        // 0 === -0, but they are not identical
-        return x !== 0 || 1 / x === 1 / y;
-    }
-
-    // NaN !== NaN, but they are identical.
-    // NaNs are the only non-reflexive value, i.e., if x !== x,
-    // then x is a NaN.
-    // isNaN is broken: it converts its argument to number, so
-    // isNaN("foo") => true
-    return x !== x && y !== y;
-}
-
-const _hashers = {
-    object: function(o) { return o ? System.addressOf(o) : 'null'; },
-    function: function(f) { return System.addressOf(f); },
-    string: function(s) { return s; },
-    number: function(n) { return String(n); },
-    undefined: function() { return 'undefined'; },
-};
-
-/* Map is meant to be similar in usage to ES6 Map, which is
-   described at http://wiki.ecmascript.org/doku.php?id=harmony:simple_maps_and_sets,
-   without requiring more than ES5 + Gjs extensions.
-
-   Known differences from other implementations:
-   Polyfills around the web usually implement HashMaps for
-   primitive values and reversed WeakMaps for object keys,
-   but we want real maps with real O(1) semantics in all cases,
-   and the easiest way is to have different hashers for different
-   types.
-
-   Known differences from the ES6 specification:
-   - Map is a Lang.Class, not a ES6 class, so inheritance,
-     prototype, sealing, etc. work differently.
-   - items(), keys() and values() don't return iterators,
-     they return actual arrays, so they incur a full copy everytime
-     they're called, and they don't see changes if you mutate
-     the table while iterating
-     (admittedly, the ES6 spec is a bit unclear on this, and
-     the reference code would just blow up)
-*/
-const Map = new Lang.Class({
-    Name: 'Map',
-
-    _init: function(iterable) {
-        this._pool = { };
-        this._size = 0;
-
-        if (iterable) {
-            for (let i = 0; i < iterable.length; i++) {
-                let [key, value] = iterable[i];
-                this.set(key, value);
-            }
-        }
-    },
-
-    _hashKey: function(key) {
-        let type = typeof(key);
-        return type + ':' + _hashers[type](key);
-    },
-
-    _internalGet: function(key) {
-        let hash = this._hashKey(key);
-        let node = this._pool[hash];
-
-        if (node && _sameValue(node.key, key))
-            return [true, node.value];
-        else
-            return [false, null];
-    },
-
-    get: function(key) {
-        return this._internalGet(key)[1];
-    },
-
-    has: function(key) {
-        return this._internalGet(key)[0];
-    },
-
-    set: function(key, value) {
-        let hash = this._hashKey(key);
-        let node = this._pool[hash];
-
-        if (node) {
-            node.key = key;
-            node.value = value;
-        } else {
-            this._pool[hash] = { key: key, value: value };
-            this._size++;
-        }
-    },
-
-    delete: function(key) {
-        let hash = this._hashKey(key);
-        let node = this._pool[hash];
-
-        if (node && _sameValue(node.key, key)) {
-            delete this._pool[hash];
-            this._size--;
-            return [node.key, node.value];
-        } else {
-            return [null, null];
-        }
-    },
-
-    keys: function() {
-        let pool = this._pool;
-        return Object.getOwnPropertyNames(pool).map(function(hash) {
-            return pool[hash].key;
-        });
-    },
-
-    values: function() {
-        let pool = this._pool;
-        return Object.getOwnPropertyNames(pool).map(function(hash) {
-            return pool[hash].value;
-        });
-    },
-
-    items: function() {
-        let pool = this._pool;
-        return Object.getOwnPropertyNames(pool).map(function(hash) {
-            return [pool[hash].key, pool[hash].value];
-        });
-    },
-
-    size: function() {
-        return this._size;
-    },
-});

js/misc/history.js

@@ -41,26 +41,24 @@ const HistoryManager = new Lang.Class({
         this._historyIndex = this._history.length;
     },
 
-    _setPrevItem: function(text) {
+    prevItem: function(text) {
         if (this._historyIndex <= 0)
-            return false;
+            return text;
 
         if (text)
             this._history[this._historyIndex] = text;
         this._historyIndex--;
-        this._indexChanged();
-        return true;
+        return this._indexChanged();
     },
 
-    _setNextItem: function(text) {
+    nextItem: function(text) {
         if (this._historyIndex >= this._history.length)
-            return false;
+            return text;
 
         if (text)
             this._history[this._historyIndex] = text;
         this._historyIndex++;
-        this._indexChanged();
-        return true;
+        return this._indexChanged();
     },
 
     lastItem: function() {
@@ -85,11 +83,13 @@ const HistoryManager = new Lang.Class({
     _onEntryKeyPress: function(entry, event) {
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Up) {
-            return this._setPrevItem(entry.get_text());
+            this.prevItem(entry.get_text());
+            return true;
         } else if (symbol == Clutter.KEY_Down) {
-            return this._setNextItem(entry.get_text());
+            this.nextItem(entry.get_text());
+            return true;
         }
-        return Clutter.EVENT_PROPAGATE;
+        return false;
     },
 
     _indexChanged: function() {
@@ -98,6 +98,8 @@ const HistoryManager = new Lang.Class({
 
         if (this._entry)
             this._entry.set_text(current);
+
+        return current;
     },
 
     _save: function() {

js/misc/loginManager.js

@@ -1,256 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-
-const SystemdLoginManagerIface = '<node> \
-<interface name="org.freedesktop.login1.Manager"> \
-<method name="Suspend"> \
-    <arg type="b" direction="in"/> \
-</method> \
-<method name="CanSuspend"> \
-    <arg type="s" direction="out"/> \
-</method> \
-<method name="Inhibit"> \
-    <arg type="s" direction="in"/> \
-    <arg type="s" direction="in"/> \
-    <arg type="s" direction="in"/> \
-    <arg type="s" direction="in"/> \
-    <arg type="h" direction="out"/> \
-</method> \
-<method name="GetSession"> \
-    <arg type="s" direction="in"/> \
-    <arg type="o" direction="out"/> \
-</method> \
-<method name="ListSessions"> \
-    <arg name="sessions" type="a(susso)" direction="out"/> \
-</method> \
-<signal name="PrepareForSleep"> \
-    <arg type="b" direction="out"/> \
-</signal> \
-</interface> \
-</node>';
-
-const SystemdLoginSessionIface = '<node> \
-<interface name="org.freedesktop.login1.Session"> \
-<signal name="Lock" /> \
-<signal name="Unlock" /> \
-</interface> \
-</node>';
-
-const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface);
-const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
-
-const ConsoleKitManagerIface = '<node> \
-<interface name="org.freedesktop.ConsoleKit.Manager"> \
-<method name="CanRestart"> \
-    <arg type="b" direction="out"/> \
-</method> \
-<method name="CanStop"> \
-    <arg type="b" direction="out"/> \
-</method> \
-<method name="Restart" /> \
-<method name="Stop" /> \
-<method name="GetCurrentSession"> \
-    <arg type="o" direction="out" /> \
-</method> \
-</interface> \
-</node>';
-
-const ConsoleKitSessionIface = '<node> \
-<interface name="org.freedesktop.ConsoleKit.Session"> \
-<signal name="Lock" /> \
-<signal name="Unlock" /> \
-</interface> \
-</node>';
-
-const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
-const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);
-
-function haveSystemd() {
-    return GLib.access("/run/systemd/seats", 0) >= 0;
-}
-
-function versionCompare(required, reference) {
-    required = required.split('.');
-    reference = reference.split('.');
-
-    for (let i = 0; i < required.length; i++) {
-        let requiredInt = parseInt(required[i]);
-        let referenceInt = parseInt(reference[i]);
-        if (requiredInt != referenceInt)
-            return requiredInt < referenceInt;
-    }
-
-    return true;
-}
-
-function canLock() {
-    try {
-        let params = GLib.Variant.new('(ss)', ['org.gnome.DisplayManager.Manager', 'Version']);
-        let result = Gio.DBus.system.call_sync('org.gnome.DisplayManager',
-                                               '/org/gnome/DisplayManager/Manager',
-                                               'org.freedesktop.DBus.Properties',
-                                               'Get', params, null,
-                                               Gio.DBusCallFlags.NONE,
-                                               -1, null);
-
-        let version = result.deep_unpack()[0].deep_unpack();
-        return versionCompare('3.5.91', version);
-    } catch(e) {
-        return false;
-    }
-}
-
-let _loginManager = null;
-
-/**
- * LoginManager:
- * An abstraction over systemd/logind and ConsoleKit.
- *
- */
-function getLoginManager() {
-    if (_loginManager == null) {
-        if (haveSystemd())
-            _loginManager = new LoginManagerSystemd();
-        else
-            _loginManager = new LoginManagerConsoleKit();
-    }
-
-    return _loginManager;
-}
-
-const LoginManagerSystemd = new Lang.Class({
-    Name: 'LoginManagerSystemd',
-
-    _init: function() {
-        this._proxy = new SystemdLoginManager(Gio.DBus.system,
-                                              'org.freedesktop.login1',
-                                              '/org/freedesktop/login1');
-        this._proxy.connectSignal('PrepareForSleep',
-                                  Lang.bind(this, this._prepareForSleep));
-    },
-
-    // Having this function is a bit of a hack since the Systemd and ConsoleKit
-    // session objects have different interfaces - but in both cases there are
-    // Lock/Unlock signals, and that's all we count upon at the moment.
-    getCurrentSessionProxy: function(callback) {
-        if (this._currentSession) {
-            callback (this._currentSession);
-            return;
-        }
-
-        this._proxy.GetSessionRemote(GLib.getenv('XDG_SESSION_ID'), Lang.bind(this,
-            function(result, error) {
-                if (error) {
-                    logError(error, 'Could not get a proxy for the current session');
-                } else {
-                    this._currentSession = new SystemdLoginSession(Gio.DBus.system,
-                                                                   'org.freedesktop.login1',
-                                                                   result[0]);
-                    callback(this._currentSession);
-                }
-            }));
-    },
-
-    canSuspend: function(asyncCallback) {
-        this._proxy.CanSuspendRemote(function(result, error) {
-            if (error)
-                asyncCallback(false);
-            else
-                asyncCallback(result[0] != 'no');
-        });
-    },
-
-    listSessions: function(asyncCallback) {
-        this._proxy.ListSessionsRemote(function(result, error) {
-            if (error)
-                asyncCallback([]);
-            else
-                asyncCallback(result[0]);
-        });
-    },
-
-    suspend: function() {
-        this._proxy.SuspendRemote(true);
-    },
-
-    inhibit: function(reason, callback) {
-        let inVariant = GLib.Variant.new('(ssss)',
-                                         ['sleep',
-                                          'GNOME Shell',
-                                          reason,
-                                          'delay']);
-        this._proxy.call_with_unix_fd_list('Inhibit', inVariant, 0, -1, null, null,
-            Lang.bind(this, function(proxy, result) {
-                let fd = -1;
-                try {
-                    let [outVariant, fdList] = proxy.call_with_unix_fd_list_finish(result);
-                    fd = fdList.steal_fds(outVariant.deep_unpack())[0];
-                    callback(new Gio.UnixInputStream({ fd: fd }));
-                } catch(e) {
-                    logError(e, "Error getting systemd inhibitor");
-                    callback(null);
-                }
-            }));
-    },
-
-    _prepareForSleep: function(proxy, sender, [aboutToSuspend]) {
-        this.emit('prepare-for-sleep', aboutToSuspend);
-    }
-});
-Signals.addSignalMethods(LoginManagerSystemd.prototype);
-
-const LoginManagerConsoleKit = new Lang.Class({
-    Name: 'LoginManagerConsoleKit',
-
-    _init: function() {
-        this._proxy = new ConsoleKitManager(Gio.DBus.system,
-                                            'org.freedesktop.ConsoleKit',
-                                            '/org/freedesktop/ConsoleKit/Manager');
-    },
-
-    // Having this function is a bit of a hack since the Systemd and ConsoleKit
-    // session objects have different interfaces - but in both cases there are
-    // Lock/Unlock signals, and that's all we count upon at the moment.
-    getCurrentSessionProxy: function(callback) {
-        if (this._currentSession) {
-            callback (this._currentSession);
-            return;
-        }
-
-        this._proxy.GetCurrentSessionRemote(Lang.bind(this,
-            function(result, error) {
-                if (error) {
-                    logError(error, 'Could not get a proxy for the current session');
-                } else {
-                    this._currentSession = new ConsoleKitSession(Gio.DBus.system,
-                                                                 'org.freedesktop.ConsoleKit',
-                                                                 result[0]);
-                    callback(this._currentSession);
-                }
-            }));
-    },
-
-    canSuspend: function(asyncCallback) {
-        asyncCallback(false);
-    },
-
-    listSessions: function(asyncCallback) {
-        asyncCallback([]);
-    },
-
-    suspend: function() {
-        this.emit('prepare-for-sleep', true);
-        this.emit('prepare-for-sleep', false);
-    },
-
-    inhibit: function(reason, callback) {
-        callback(null);
-    }
-});
-Signals.addSignalMethods(LoginManagerConsoleKit.prototype);

js/misc/modemManager.js

@@ -2,134 +2,58 @@
 
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
-const NMGtk = imports.gi.NMGtk;
+const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-// _getMobileProvidersDatabase:
-//
-// Gets the database of mobile providers, with references between MCCMNC/SID and
-// operator name
-//
-let _mpd;
-function _getMobileProvidersDatabase() {
-    if (_mpd == null) {
-        try {
-            _mpd = new NMGtk.MobileProvidersDatabase();
-            _mpd.init(null);
-        } catch (e) {
-            log(e.message);
-            _mpd = null;
-        }
-    }
-
-    return _mpd;
-}
-
-// _findProviderForMccMnc:
-// @operator_name: operator name
-// @operator_code: operator code
-//
-// Given an operator name string (which may not be a real operator name) and an
-// operator code string, tries to find a proper operator name to display.
-//
-function _findProviderForMccMnc(operator_name, operator_code) {
-    if (operator_name) {
-        if (operator_name.length != 0 &&
-            (operator_name.length > 6 || operator_name.length < 5)) {
-            // this looks like a valid name, i.e. not an MCCMNC (that some
-            // devices return when not yet connected
-            return operator_name;
-        }
-
-        if (isNaN(parseInt(operator_name))) {
-            // name is definitely not a MCCMNC, so it may be a name
-            // after all; return that
-            return operator_name;
-        }
-    }
-
-    let needle;
-    if ((!operator_name || operator_name.length == 0) && operator_code)
-        needle = operator_code;
-    else if (operator_name && (operator_name.length == 6 || operator_name.length == 5))
-        needle = operator_name;
-    else // nothing to search
-        return null;
-
-    let mpd = _getMobileProvidersDatabase();
-    if (mpd) {
-        let provider = mpd.lookup_3gpp_mcc_mnc(needle);
-        if (provider)
-            return provider.get_name();
-    }
-    return null;
-}
-
-// _findProviderForSid:
-// @sid: System Identifier of the serving CDMA network
-//
-// Tries to find the operator name corresponding to the given SID
-//
-function _findProviderForSid(sid) {
-    if (sid == 0)
-        return null;
-
-    let mpd = _getMobileProvidersDatabase();
-    if (mpd) {
-        let provider = mpd.lookup_cdma_sid(sid);
-        if (provider)
-            return provider.get_name();
-    }
-    return null;
-}
-
-
-//------------------------------------------------------------------------------
-// Support for the old ModemManager interface (MM < 0.7)
-//------------------------------------------------------------------------------
-
-
 // The following are not the complete interfaces, just the methods we need
 // (or may need in the future)
 
-const ModemGsmNetworkInterface = '<node> \
-<interface name="org.freedesktop.ModemManager.Modem.Gsm.Network"> \
-<method name="GetRegistrationInfo"> \
-    <arg type="(uss)" direction="out" /> \
-</method> \
-<method name="GetSignalQuality"> \
-    <arg type="u" direction="out" /> \
-</method> \
-<property name="AccessTechnology" type="u" access="read" /> \
-<signal name="SignalQuality"> \
-    <arg type="u" direction="out" /> \
-</signal> \
-<signal name="RegistrationInfo"> \
-    <arg type="u" direction="out" /> \
-    <arg type="s" direction="out" /> \
-    <arg type="s" direction="out" /> \
-</signal> \
-</interface> \
-</node>';
+const ModemGsmNetworkInterface = <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
+<method name="GetRegistrationInfo">
+    <arg type="u" direction="out" />
+    <arg type="s" direction="out" />
+    <arg type="s" direction="out" />
+</method>
+<method name="GetSignalQuality">
+    <arg type="u" direction="out" />
+</method>
+<property name="AccessTechnology" type="u" access="read" />
+<signal name="SignalQuality">
+    <arg type="u" direction="out" />
+</signal>
+<signal name="RegistrationInfo">
+    <arg type="u" direction="out" />
+    <arg type="s" direction="out" />
+    <arg type="s" direction="out" />
+</signal>
+</interface>;
 
 const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface);
 
-const ModemCdmaInterface = '<node> \
-<interface name="org.freedesktop.ModemManager.Modem.Cdma"> \
-<method name="GetSignalQuality"> \
-    <arg type="u" direction="out" /> \
-</method> \
-<method name="GetServingSystem"> \
-    <arg type="(usu)" direction="out" /> \
-</method> \
-<signal name="SignalQuality"> \
-    <arg type="u" direction="out" /> \
-</signal> \
-</interface> \
-</node>';
+const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.Cdma">
+<method name="GetSignalQuality">
+    <arg type="u" direction="out" />
+</method>
+<method name="GetServingSystem">
+    <arg type="u" direction="out" />
+    <arg type="s" direction="out" />
+    <arg type="u" direction="out" />
+</method>
+<signal name="SignalQuality">
+    <arg type="u" direction="out" />
+</signal>
+</interface>;
 
 const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);
 
+let _providersTable;
+function _getProvidersTable() {
+    if (_providersTable)
+        return _providersTable;
+    let [providers, countryCodes] = Shell.mobile_providers_parse();
+    return _providersTable = providers;
+}
+
 const ModemGsm = new Lang.Class({
     Name: 'ModemGsm',
 
@@ -145,17 +69,17 @@ const ModemGsm = new Lang.Class({
             this.emit('notify::signal-quality');
         }));
         this._proxy.connectSignal('RegistrationInfo', Lang.bind(this, function(proxy, sender, [status, code, name]) {
-            this.operator_name = _findProviderForMccMnc(name, code);
+            this.operator_name = this._findOperatorName(name, code);
             this.emit('notify::operator-name');
         }));
-        this._proxy.GetRegistrationInfoRemote(Lang.bind(this, function([result], err) {
+        this._proxy.GetRegistrationInfoRemote(Lang.bind(this, function(result, err) {
             if (err) {
                 log(err);
                 return;
             }
 
             let [status, code, name] = result;
-            this.operator_name = _findProviderForMccMnc(name, code);
+            this.operator_name = this._findOperatorName(name, code);
             this.emit('notify::operator-name');
         }));
         this._proxy.GetSignalQualityRemote(Lang.bind(this, function(result, err) {
@@ -168,6 +92,67 @@ const ModemGsm = new Lang.Class({
             }
             this.emit('notify::signal-quality');
         }));
+    },
+
+    _findOperatorName: function(name, opCode) {
+        if (name.length != 0 && (name.length > 6 || name.length < 5)) {
+            // this looks like a valid name, i.e. not an MCCMNC (that some
+            // devices return when not yet connected
+            return name;
+        }
+        if (isNaN(parseInt(name))) {
+            // name is definitely not a MCCMNC, so it may be a name
+            // after all; return that
+            return name;
+        }
+
+        let needle;
+        if (name.length == 0 && opCode)
+            needle = opCode;
+        else if (name.length == 6 || name.length == 5)
+            needle = name;
+        else // nothing to search
+            return null;
+
+        return this._findProviderForMCCMNC(needle);
+    },
+
+    _findProviderForMCCMNC: function(needle) {
+        let table = _getProvidersTable();
+        let needlemcc = needle.substring(0, 3);
+        let needlemnc = needle.substring(3, needle.length);
+
+        let name2, name3;
+        for (let iter in table) {
+            let providers = table[iter];
+
+            // Search through each country's providers
+            for (let i = 0; i < providers.length; i++) {
+                let provider = providers[i];
+
+                // Search through MCC/MNC list
+                let list = provider.get_gsm_mcc_mnc();
+                for (let j = 0; j < list.length; j++) {
+                    let mccmnc = list[j];
+
+                    // Match both 2-digit and 3-digit MNC; prefer a
+                    // 3-digit match if found, otherwise a 2-digit one.
+                    if (mccmnc.mcc != needlemcc)
+                        continue;  // MCC was wrong
+
+                    if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
+                        name3 = provider.name;
+
+                    if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
+                        name2 = provider.name;
+
+                    if (name2 && name3)
+                        break;
+                }
+            }
+        }
+
+        return name3 || name2 || null;
     }
 });
 Signals.addSignalMethods(ModemGsm.prototype);
@@ -180,7 +165,7 @@ const ModemCdma = new Lang.Class({
 
         this.signal_quality = 0;
         this.operator_name = null;
-        this._proxy.connectSignal('SignalQuality', Lang.bind(this, function(proxy, sender, params) {
+        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, sender, params) {
             this.signal_quality = params[0];
             this.emit('notify::signal-quality');
 
@@ -202,110 +187,45 @@ const ModemCdma = new Lang.Class({
     },
 
     _refreshServingSystem: function() {
-        this._proxy.GetServingSystemRemote(Lang.bind(this, function([result], err) {
+        this._proxy.GetServingSystemRemote(Lang.bind(this, function(result, err) {
             if (err) {
                 // it will return an error if the device is not connected
                 this.operator_name = null;
             } else {
-                let [bandClass, band, sid] = result;
-
-                this.operator_name = _findProviderForSid(sid)
+                let [bandClass, band, id] = result;
+                if (name.length > 0)
+                    this.operator_name = this._findProviderForSid(id);
+                else
+                    this.operator_name = null;
             }
             this.emit('notify::operator-name');
         }));
+    },
+
+    _findProviderForSid: function(sid) {
+        if (sid == 0)
+            return null;
+
+        let table = _getProvidersTable();
+
+        // Search through each country
+        for (let iter in table) {
+            let providers = table[iter];
+
+            // Search through each country's providers
+            for (let i = 0; i < providers.length; i++) {
+                let provider = providers[i];
+                let cdma_sid = provider.get_cdma_sid();
+
+                // Search through CDMA SID list
+                for (let j = 0; j < cdma_sid.length; j++) {
+                    if (cdma_sid[j] == sid)
+                        return provider.name;
+                }
+            }
+        }
+
+        return null;
     }
 });
 Signals.addSignalMethods(ModemCdma.prototype);
-
-
-//------------------------------------------------------------------------------
-// Support for the new ModemManager1 interface (MM >= 0.7)
-//------------------------------------------------------------------------------
-
-const BroadbandModemInterface = '<node> \
-<interface name="org.freedesktop.ModemManager1.Modem"> \
-<property name="SignalQuality" type="(ub)" access="read" /> \
-</interface> \
-</node>';
-const BroadbandModemProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemInterface);
-
-const BroadbandModem3gppInterface = '<node> \
-<interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp"> \
-<property name="OperatorCode" type="s" access="read" /> \
-<property name="OperatorName" type="s" access="read" /> \
-</interface> \
-</node>';
-const BroadbandModem3gppProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModem3gppInterface);
-
-const BroadbandModemCdmaInterface = '<node> \
-<interface name="org.freedesktop.ModemManager1.Modem.ModemCdma"> \
-<property name="Sid" type="u" access="read" /> \
-</interface> \
-</node>';
-const BroadbandModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemCdmaInterface);
-
-const BroadbandModem = new Lang.Class({
-    Name: 'BroadbandModem',
-
-    _init: function(path, capabilities) {
-        this._proxy = new BroadbandModemProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
-        this._proxy_3gpp = new BroadbandModem3gppProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
-        this._proxy_cdma = new BroadbandModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
-        this._capabilities = capabilities;
-
-        this._proxy.connect('g-properties-changed', Lang.bind(this, function(proxy, properties) {
-            if ('SignalQuality' in properties.deep_unpack())
-                this._reloadSignalQuality();
-        }));
-        this._reloadSignalQuality();
-
-        this._proxy_3gpp.connect('g-properties-changed', Lang.bind(this, function(proxy, properties) {
-            let unpacked = properties.deep_unpack();
-            if ('OperatorName' in unpacked || 'OperatorCode' in unpacked)
-                this._reload3gppOperatorName();
-        }));
-        this._reload3gppOperatorName();
-
-        this._proxy_cdma.connect('g-properties-changed', Lang.bind(this, function(proxy, properties) {
-            let unpacked = properties.deep_unpack();
-            if ('Nid' in unpacked || 'Sid' in unpacked)
-                this._reloadCdmaOperatorName();
-        }));
-        this._reloadCdmaOperatorName();
-    },
-
-    _reloadSignalQuality: function() {
-        let [quality, recent] = this._proxy.SignalQuality;
-        this.signal_quality = quality;
-        this.emit('notify::signal-quality');
-    },
-
-    _reloadOperatorName: function() {
-        let new_name = "";
-        if (this.operator_name_3gpp && this.operator_name_3gpp.length > 0)
-            new_name += this.operator_name_3gpp;
-
-        if (this.operator_name_cdma && this.operator_name_cdma.length > 0) {
-            if (new_name != "")
-                new_name += ", ";
-            new_name += this.operator_name_cdma;
-        }
-
-        this.operator_name = new_name;
-        this.emit('notify::operator-name');
-    },
-
-    _reload3gppOperatorName: function() {
-        let name = this._proxy_3gpp.OperatorName;
-        let code = this._proxy_3gpp.OperatorCode;
-        this.operator_name_3gpp = _findProviderForMccMnc(name, code);
-        this._reloadOperatorName();
-    },
-
-    _reloadCdmaOperatorName: function() {
-        let sid = this._proxy_cdma.Sid;
-        this.operator_name_cdma = _findProviderForSid(sid);
-        this._reloadOperatorName();
-    }
-});
-Signals.addSignalMethods(BroadbandModem.prototype);

js/misc/objectManager.js

@@ -1,259 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Params = imports.misc.params;
-const Signals = imports.signals;
-
-// Specified in the D-Bus specification here:
-// http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-objectmanager
-const ObjectManagerIface = '<node> \
-<interface name="org.freedesktop.DBus.ObjectManager"> \
-  <method name="GetManagedObjects"> \
-    <arg name="objects" type="a{oa{sa{sv}}}" direction="out"/> \
-  </method> \
-  <signal name="InterfacesAdded"> \
-    <arg name="objectPath" type="o"/> \
-    <arg name="interfaces" type="a{sa{sv}}" /> \
-  </signal> \
-  <signal name="InterfacesRemoved"> \
-    <arg name="objectPath" type="o"/> \
-    <arg name="interfaces" type="as" /> \
-  </signal> \
-</interface> \
-</node>';
-
-const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface);
-
-const ObjectManager = new Lang.Class({
-    Name: 'ObjectManager',
-    _init: function(params) {
-        params = Params.parse(params, { connection: null,
-                                        name: null,
-                                        objectPath: null,
-                                        knownInterfaces: null,
-                                        cancellable: null,
-                                        onLoaded: null });
-
-        this._connection = params.connection;
-        this._serviceName = params.name;
-        this._managerPath = params.objectPath;
-        this._cancellable = params.cancellable;
-
-        this._managerProxy = new Gio.DBusProxy({ g_connection: this._connection,
-                                                 g_interface_name: ObjectManagerInfo.name,
-                                                 g_interface_info: ObjectManagerInfo,
-                                                 g_name: this._serviceName,
-                                                 g_object_path: this._managerPath,
-                                                 g_flags: Gio.DBusProxyFlags.NONE });
-
-        this._interfaceInfos = {};
-        this._objects = {};
-        this._interfaces = {};
-        this._onLoaded = params.onLoaded;
-
-        if (params.knownInterfaces)
-            this._registerInterfaces(params.knownInterfaces);
-
-        // Start out inhibiting load until at least the proxy
-        // manager is loaded and the remote objects are fetched
-        this._numLoadInhibitors = 1;
-        this._managerProxy.init_async(GLib.PRIORITY_DEFAULT,
-                                      this._cancellable,
-                                      Lang.bind(this, this._onManagerProxyLoaded));
-    },
-
-    _tryToCompleteLoad: function() {
-        this._numLoadInhibitors--;
-        if (this._numLoadInhibitors == 0) {
-            if (this._onLoaded)
-                this._onLoaded();
-        }
-    },
-
-    _addInterface: function(objectPath, interfaceName, onFinished) {
-        let info = this._interfaceInfos[interfaceName];
-
-        if (!info) {
-           if (onFinished)
-               onFinished();
-           return;
-        }
-
-        let proxy = new Gio.DBusProxy({ g_connection: this._connection,
-                                       g_name: this._serviceName,
-                                       g_object_path: objectPath,
-                                       g_interface_name: interfaceName,
-                                       g_interface_info: info,
-                                       g_flags: Gio.DBusProxyFlags.NONE });
-
-        proxy.init_async(GLib.PRIORITY_DEFAULT,
-                         this._cancellable,
-                         Lang.bind(this, function(initable, result) {
-               let error = null;
-               try {
-                   initable.init_finish(result);
-               } catch(e) {
-                   logError(e, 'could not initialize proxy for interface ' + interfaceName);
-
-                   if (onFinished)
-                       onFinished();
-                   return;
-               }
-
-               let isNewObject;
-               if (!this._objects[objectPath]) {
-                   this._objects[objectPath] = {};
-                   isNewObject = true;
-               } else {
-                   isNewObject = false;
-               }
-
-               this._objects[objectPath][interfaceName] = proxy;
-
-               if (!this._interfaces[interfaceName])
-                   this._interfaces[interfaceName] = [];
-
-               this._interfaces[interfaceName].push(proxy);
-
-               if (isNewObject)
-                   this.emit('object-added', objectPath);
-
-               this.emit('interface-added', interfaceName, proxy);
-
-               if (onFinished)
-                   onFinished();
-        }));
-    },
-
-    _removeInterface: function(objectPath, interfaceName) {
-        if (!this._objects[objectPath])
-            return;
-
-        let proxy = this._objects[objectPath][interfaceName];
-
-        if (this._interfaces[interfaceName]) {
-            let index = this._interfaces[interfaceName].indexOf(proxy);
-
-            if (index >= 0)
-                this._interfaces[interfaceName].splice(index, 1);
-
-            if (this._interfaces[interfaceName].length == 0)
-                delete this._interfaces[interfaceName];
-        }
-
-        this.emit('interface-removed', interfaceName, proxy);
-
-        this._objects[objectPath][interfaceName] = null;
-
-        if (Object.keys(this._objects[objectPath]).length == 0) {
-            delete this._objects[objectPath];
-            this.emit('object-removed', objectPath);
-        }
-    },
-
-    _onManagerProxyLoaded: function(initable, result) {
-        let error = null;
-        try {
-            initable.init_finish(result);
-        } catch(e) {
-            logError(e, 'could not initialize object manager for object ' + params.name);
-
-            this._tryToCompleteLoad();
-            return;
-        }
-
-        this._managerProxy.connectSignal('InterfacesAdded',
-                                         Lang.bind(this, function(objectManager, sender, [objectPath, interfaces]) {
-                                             let interfaceNames = Object.keys(interfaces);
-                                             for (let i = 0; i < interfaceNames.length; i++)
-                                                 this._addInterface(objectPath, interfaceNames[i]);
-                                         }));
-        this._managerProxy.connectSignal('InterfacesRemoved',
-                                         Lang.bind(this, function(objectManager, sender, [objectPath, interfaceNames]) {
-                                             for (let i = 0; i < interfaceNames.length; i++)
-                                                 this._removeInterface(objectPath, interfaceNames[i]);
-                                         }));
-
-        if (Object.keys(this._interfaceInfos).length == 0) {
-            this._tryToCompleteLoad();
-            return;
-        }
-
-        this._managerProxy.GetManagedObjectsRemote(Lang.bind(this, function(result, error) {
-            if (!result) {
-                if (error) {
-                   logError(error, 'could not get remote objects for service ' + this._serviceName + ' path ' + this._managerPath);
-                }
-
-                this._tryToCompleteLoad();
-                return;
-            }
-
-            let [objects] = result;
-
-            let objectPaths = Object.keys(objects);
-            for (let i = 0; i < objectPaths.length; i++) {
-                let objectPath = objectPaths[i];
-                let object = objects[objectPath];
-
-                let interfaceNames = Object.getOwnPropertyNames(object);
-                for (let j = 0; j < interfaceNames.length; j++) {
-                    let interfaceName = interfaceNames[j];
-
-                    // Prevent load from completing until the interface is loaded
-                    this._numLoadInhibitors++;
-                    this._addInterface(objectPath,
-                                       interfaceName,
-                                       Lang.bind(this, this._tryToCompleteLoad));
-                }
-            }
-            this._tryToCompleteLoad();
-        }));
-    },
-
-    _registerInterfaces: function(interfaces) {
-        for (let i = 0; i < interfaces.length; i++) {
-            let info = Gio.DBusInterfaceInfo.new_for_xml(interfaces[i]);
-            this._interfaceInfos[info.name] = info;
-        }
-    },
-
-    getProxy: function(objectPath, interfaceName) {
-        let object = this._objects[objectPath];
-
-        if (!object)
-            return null;
-
-        return object[interfaceName];
-    },
-
-    getProxiesForInterface: function(interfaceName) {
-        let proxyList = this._interfaces[interfaceName];
-
-        if (!proxyList)
-            return [];
-
-        return proxyList;
-    },
-
-    getAllProxies: function() {
-        let proxies = [];
-
-        let objectPaths = Object.keys(this._objects);
-        for (let i = 0; i < objectPaths.length; i++) {
-            let object = this._objects[objectPaths];
-
-            let interfaceNames = Object.keys(object);
-            for (let j = 0; i < interfaceNames.length; i++) {
-                let interfaceName = interfaceNames[i];
-                if (object[interfaceName])
-                    proxies.push(object(interfaceName));
-            }
-        }
-
-        return proxies;
-    }
-});
-Signals.addSignalMethods(ObjectManager.prototype);

js/misc/screenSaver.js

@@ -0,0 +1,48 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+
+const ScreenSaverIface = <interface name="org.gnome.ScreenSaver">
+<method name="GetActive">
+    <arg type="b" direction="out" />
+</method>
+<method name="Lock" />
+<method name="SetActive">
+    <arg type="b" direction="in" />
+</method>
+<signal name="ActiveChanged">
+    <arg type="b" direction="out" />
+</signal>
+</interface>;
+
+const ScreenSaverInfo = Gio.DBusInterfaceInfo.new_for_xml(ScreenSaverIface);
+
+function ScreenSaverProxy() {
+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
+				   g_interface_name: ScreenSaverInfo.name,
+				   g_interface_info: ScreenSaverInfo,
+				   g_name: 'org.gnome.ScreenSaver',
+				   g_object_path: '/org/gnome/ScreenSaver',
+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
+                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
+    self.init(null);
+    self.screenSaverActive = false;
+
+    self.connectSignal('ActiveChanged', function(proxy, senderName, [isActive]) {
+        self.screenSaverActive = isActive;
+    });
+    self.connect('notify::g-name-owner', function() {
+        if (self.g_name_owner) {
+            self.GetActiveRemote(function(result, excp) {
+                if (result) {
+                    let [isActive] = result;
+                    self.screenSaverActive = isActive;
+                }
+            });
+        } else
+            self.screenSaverActive = false;
+    });
+
+    return self;
+}

js/misc/smartcardManager.js

@@ -1,119 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-
-const ObjectManager = imports.misc.objectManager;
-
-const SmartcardTokenIface = '<node> \
-<interface name="org.gnome.SettingsDaemon.Smartcard.Token"> \
-  <property name="Name" type="s" access="read"/> \
-  <property name="Driver" type="o" access="read"/> \
-  <property name="IsInserted" type="b" access="read"/> \
-  <property name="UsedToLogin" type="b" access="read"/> \
-</interface> \
-</node>';
-
-let _smartcardManager = null;
-
-function getSmartcardManager() {
-    if (_smartcardManager == null)
-        _smartcardManager = new SmartcardManager();
-
-    return _smartcardManager;
-}
-
-const SmartcardManager = new Lang.Class({
-    Name: 'SmartcardManager',
-    _init: function() {
-        this._objectManager = new ObjectManager.ObjectManager({ connection: Gio.DBus.session,
-                                                                name: "org.gnome.SettingsDaemon.Smartcard",
-                                                                objectPath: '/org/gnome/SettingsDaemon/Smartcard',
-                                                                knownInterfaces: [ SmartcardTokenIface ],
-                                                                onLoaded: Lang.bind(this, this._onLoaded) });
-        this._insertedTokens = {};
-        this._loginToken = null;
-    },
-
-    _onLoaded: function() {
-        let tokens = this._objectManager.getProxiesForInterface('org.gnome.SettingsDaemon.Smartcard.Token');
-
-        for (let i = 0; i < tokens.length; i++)
-            this._addToken(tokens[i]);
-
-        this._objectManager.connect('interface-added', Lang.bind(this, function(objectManager, interfaceName, proxy) {
-            if (interfaceName == 'org.gnome.SettingsDaemon.Smartcard.Token')
-                this._addToken(proxy);
-        }));
-
-        this._objectManager.connect('interface-removed', Lang.bind(this, function(objectManager, interfaceName, proxy) {
-            if (interfaceName == 'org.gnome.SettingsDaemon.Smartcard.Token')
-                this._removeToken(proxy);
-        }));
-    },
-
-    _updateToken: function(token) {
-        let objectPath = token.get_object_path();
-
-        delete this._insertedTokens[objectPath];
-
-        if (token.IsInserted)
-            this._insertedTokens[objectPath] = token;
-
-        if (token.UsedToLogin)
-            this._loginToken = token;
-    },
-
-    _addToken: function(token) {
-        this._updateToken(token);
-
-        token.connect('g-properties-changed',
-                      Lang.bind(this, function(proxy, properties) {
-                          if ('IsInserted' in properties.deep_unpack()) {
-                              this._updateToken(token);
-
-                              if (token.IsInserted) {
-                                  this.emit('smartcard-inserted', token);
-                              } else {
-                                  this.emit('smartcard-removed', token);
-                              }
-                          }
-                      }));
-
-        // Emit a smartcard-inserted at startup if it's already plugged in
-        if (token.IsInserted)
-            this.emit('smartcard-inserted', token);
-    },
-
-    _removeToken: function(token) {
-        let objectPath = token.get_object_path();
-
-        if (this._insertedTokens[objectPath] == token) {
-            delete this._insertedTokens[objectPath];
-            this.emit('smartcard-removed', token);
-        }
-
-        if (this._loginToken == token)
-            this._loginToken = null;
-
-        token.disconnectAll();
-    },
-
-    hasInsertedTokens: function() {
-        return Object.keys(this._insertedTokens).length > 0;
-    },
-
-    hasInsertedLoginToken: function() {
-        if (!this._loginToken)
-            return false;
-
-        if (!this._loginToken.IsInserted)
-            return false;
-
-        return true;
-    }
-
-});
-Signals.addSignalMethods(SmartcardManager.prototype);

js/misc/util.js

@@ -1,15 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
+const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const St = imports.gi.St;
+const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-
-const SCROLL_TIME = 0.1;
 
 // http://daringfireball.net/2010/07/improved_regex_for_matching_urls
 const _balancedParens = '\\((?:[^\\s()<>]+|(?:\\(?:[^\\s()<>]+\\)))*\\)';
@@ -20,7 +16,7 @@ const _urlRegexp = new RegExp(
     '(^|' + _leadingJunk + ')' +
     '(' +
         '(?:' +
-            '(?:http|https|ftp)://' +             // scheme://
+            '[a-z][\\w-]+://' +                   // scheme://
             '|' +
             'www\\d{0,3}[.]' +                    // www.
             '|' +
@@ -80,22 +76,6 @@ function spawnCommandLine(command_line) {
     }
 }
 
-// spawnApp:
-// @argv: an argv array
-//
-// Runs @argv as if it was an application, handling startup notification
-function spawnApp(argv) {
-    try {
-        let app = Gio.AppInfo.create_from_commandline(argv.join(' '), null,
-                                                      Gio.AppInfoCreateFlags.SUPPORTS_STARTUP_NOTIFICATION);
-
-        let context = global.create_app_launch_context();
-        app.launch([], context);
-    } catch(err) {
-        _handleSpawnError(argv[0], err);
-    }
-}
-
 // trySpawn:
 // @argv: an argv array
 //
@@ -103,33 +83,24 @@ function spawnApp(argv) {
 // this will throw an error.
 function trySpawn(argv)
 {
-    var success, pid;
     try {
-        [success, pid] = GLib.spawn_async(null, argv, null,
-                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
-                                          null);
+        GLib.spawn_async(null, argv, null,
+                         GLib.SpawnFlags.SEARCH_PATH,
+                         null, null);
     } catch (err) {
-        /* Rewrite the error in case of ENOENT */
-        if (err.matches(GLib.SpawnError, GLib.SpawnError.NOENT)) {
-            throw new GLib.SpawnError({ code: GLib.SpawnError.NOENT,
-                                        message: _("Command not found") });
-        } else if (err instanceof GLib.Error) {
+        if (err.code == GLib.SpawnError.G_SPAWN_ERROR_NOENT) {
+            err.message = _("Command not found");
+        } else {
             // The exception from gjs contains an error string like:
             //   Error invoking GLib.spawn_command_line_async: Failed to
             //   execute child process "foo" (No such file or directory)
             // We are only interested in the part in the parentheses. (And
             // we can't pattern match the text, since it gets localized.)
-            let message = err.message.replace(/.*\((.+)\)/, '$1');
-            throw new (err.constructor)({ code: err.code,
-                                          message: message });
-        } else {
-            throw err;
+            err.message = err.message.replace(/.*\((.+)\)/, '$1');
         }
+
+        throw err;
     }
-    // Dummy child watch; we don't want to double-fork internally
-    // because then we lose the parent-child relationship, which
-    // can break polkit.  See https://bugzilla.redhat.com//show_bug.cgi?id=819275
-    GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function () {}, null);
 }
 
 // trySpawnCommandLine:
@@ -157,141 +128,107 @@ function _handleSpawnError(command, err) {
     Main.notifyError(title, err.message);
 }
 
-// lowerBound:
-// @array: an array or array-like object, already sorted
-//         according to @cmp
-// @val: the value to add
-// @cmp: a comparator (or undefined to compare as numbers)
+// killall:
+// @processName: a process name
 //
-// Returns the position of the first element that is not
-// lower than @val, according to @cmp.
-// That is, returns the first position at which it
-// is possible to insert @val without violating the
-// order.
-// This is quite like an ordinary binary search, except
-// that it doesn't stop at first element comparing equal.
+// Kills @processName. If no process with the given name is found,
+// this will fail silently.
+function killall(processName) {
+    try {
+        // pkill is more portable than killall, but on Linux at least
+        // it won't match if you pass more than 15 characters of the
+        // process name... However, if you use the '-f' flag to match
+        // the entire command line, it will work, but we have to be
+        // careful in that case that we can match
+        // '/usr/bin/processName' but not 'gedit processName.c' or
+        // whatever...
 
-function lowerBound(array, val, cmp) {
-    let min, max, mid, v;
-    cmp = cmp || function(a, b) { return a - b; };
+        let argv = ['pkill', '-f', '^([^ ]*/)?' + processName + '($| )'];
+        GLib.spawn_sync(null, argv, null, GLib.SpawnFlags.SEARCH_PATH, null, null);
+        // It might be useful to return success/failure, but we'd need
+        // a wrapper around WIFEXITED and WEXITSTATUS. Since none of
+        // the current callers care, we don't bother.
+    } catch (e) {
+        logError(e, 'Failed to kill ' + processName);
+    }
+}
 
-    if (array.length == 0)
-        return 0;
+// This was ported from network-manager-applet
+// Copyright 2007 - 2011 Red Hat, Inc.
+// Author: Dan Williams <dcbw@redhat.com>
 
-    min = 0; max = array.length;
-    while (min < (max - 1)) {
-        mid = Math.floor((min + max) / 2);
-        v = cmp(array[mid], val);
+const _IGNORED_WORDS = [
+        'Semiconductor',
+        'Components',
+        'Corporation',
+        'Communications',
+        'Company',
+        'Corp.',
+        'Corp',
+        'Co.',
+        'Inc.',
+        'Inc',
+        'Incorporated',
+        'Ltd.',
+        'Limited.',
+        'Intel',
+        'chipset',
+        'adapter',
+        '[hex]',
+        'NDIS',
+        'Module'
+];
 
-        if (v < 0)
-            min = mid + 1;
-        else
-            max = mid;
+const _IGNORED_PHRASES = [
+        'Multiprotocol MAC/baseband processor',
+        'Wireless LAN Controller',
+        'Wireless LAN Adapter',
+        'Wireless Adapter',
+        'Network Connection',
+        'Wireless Cardbus Adapter',
+        'Wireless CardBus Adapter',
+        '54 Mbps Wireless PC Card',
+        'Wireless PC Card',
+        'Wireless PC',
+        'PC Card with XJACK(r) Antenna',
+        'Wireless cardbus',
+        'Wireless LAN PC Card',
+        'Technology Group Ltd.',
+        'Communication S.p.A.',
+        'Business Mobile Networks BV',
+        'Mobile Broadband Minicard Composite Device',
+        'Mobile Communications AB',
+        '(PC-Suite Mode)'
+];
+
+function fixupPCIDescription(desc) {
+    desc = desc.replace(/[_,]/, ' ');
+
+    /* Attempt to shorten ID by ignoring certain phrases */
+    for (let i = 0; i < _IGNORED_PHRASES.length; i++) {
+        let item = _IGNORED_PHRASES[i];
+        let pos = desc.indexOf(item);
+        if (pos != -1) {
+            let before = desc.substring(0, pos);
+            let after = desc.substring(pos + item.length, desc.length);
+            desc = before + after;
+        }
     }
 
-    return (min == max || cmp(array[min], val) < 0) ? max : min;
-}
+    /* Attmept to shorten ID by ignoring certain individual words */
+    let words = desc.split(' ');
+    let out = [ ];
+    for (let i = 0; i < words.length; i++) {
+        let item = words[i];
 
-// insertSorted:
-// @array: an array sorted according to @cmp
-// @val: a value to insert
-// @cmp: the sorting function
-//
-// Inserts @val into @array, preserving the
-// sorting invariants.
-// Returns the position at which it was inserted
-function insertSorted(array, val, cmp) {
-    let pos = lowerBound(array, val, cmp);
-    array.splice(pos, 0, val);
+        // skip empty items (that come out from consecutive spaces)
+        if (item.length == 0)
+            continue;
 
-    return pos;
-}
-
-const CloseButton = new Lang.Class({
-    Name: 'CloseButton',
-    Extends: St.Button,
-
-    _init: function(boxpointer) {
-        this.parent({ style_class: 'notification-close'});
-
-        // This is a bit tricky. St.Bin has its own x-align/y-align properties
-        // that compete with Clutter's properties. This should be fixed for
-        // Clutter 2.0. Since St.Bin doesn't define its own setters, the
-        // setters are a workaround to get Clutter's version.
-        this.set_x_align(Clutter.ActorAlign.END);
-        this.set_y_align(Clutter.ActorAlign.START);
-
-        // XXX Clutter 2.0 workaround: ClutterBinLayout needs expand
-        // to respect the alignments.
-        this.set_x_expand(true);
-        this.set_y_expand(true);
-
-        this._boxPointer = boxpointer;
-        if (boxpointer)
-            this._boxPointer.connect('arrow-side-changed', Lang.bind(this, this._sync));
-    },
-
-    _computeBoxPointerOffset: function() {
-        if (!this._boxPointer || !this._boxPointer.actor.get_stage())
-            return 0;
-
-        let side = this._boxPointer.arrowSide;
-        if (side == St.Side.TOP)
-            return this._boxPointer.getArrowHeight();
-        else
-            return 0;
-    },
-
-    _sync: function() {
-        let themeNode = this.get_theme_node();
-
-        let offY = this._computeBoxPointerOffset();
-        this.translation_x = themeNode.get_length('-shell-close-overlap-x')
-        this.translation_y = themeNode.get_length('-shell-close-overlap-y') + offY;
-    },
-
-    vfunc_style_changed: function() {
-        this._sync();
-        this.parent();
-    },
-});
-
-function makeCloseButton(boxpointer) {
-    return new CloseButton(boxpointer);
-}
-
-function ensureActorVisibleInScrollView(scrollView, actor) {
-    let adjustment = scrollView.vscroll.adjustment;
-    let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
-
-    let offset = 0;
-    let vfade = scrollView.get_effect("fade");
-    if (vfade)
-        offset = vfade.vfade_offset;
-
-    let box = actor.get_allocation_box();
-    let y1 = box.y1, y2 = box.y2;
-
-    let parent = actor.get_parent();
-    while (parent != scrollView) {
-        if (!parent)
-            throw new Error("actor not in scroll view");
-
-        let box = parent.get_allocation_box();
-        y1 += box.y1;
-        y2 += box.y1;
-        parent = parent.get_parent();
+        if (_IGNORED_WORDS.indexOf(item) == -1) {
+            out.push(item);
+        }
     }
 
-    if (y1 < value + offset)
-        value = Math.max(0, y1 - offset);
-    else if (y2 > value + pageSize - offset)
-        value = Math.min(upper, y2 + offset - pageSize);
-    else
-        return;
-
-    Tweener.addTween(adjustment,
-                     { value: value,
-                       time: SCROLL_TIME,
-                       transition: 'easeOutQuad' });
+    return out.join(' ');
 }

js/perf/core.js

@@ -1,7 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const System = imports.system;
-
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;
 
@@ -101,7 +99,7 @@ function run() {
         Main.overview.hide();
         yield Scripting.waitLeisure();
 
-        System.gc();
+        global.gc();
         yield Scripting.sleep(1000);
         Scripting.collectStatistics();
         Scripting.scriptEvent('afterShowHide');
@@ -115,10 +113,10 @@ function run() {
 
     for (let i = 0; i < 2; i++) {
         Scripting.scriptEvent('applicationsShowStart');
-        Main.overview._dash.showAppsButton.checked = true;
+        Main.overview._viewSelector.switchTab('applications');
         yield Scripting.waitLeisure();
         Scripting.scriptEvent('applicationsShowDone');
-        Main.overview._dash.showAppsButton.checked = false;
+        Main.overview._viewSelector.switchTab('windows');
         yield Scripting.waitLeisure();
     }
 }

js/ui/animation.js

@@ -1,85 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const St = imports.gi.St;
-const Signals = imports.signals;
-const Atk = imports.gi.Atk;
-
-const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
-
-const Animation = new Lang.Class({
-    Name: 'Animation',
-
-    _init: function(filename, width, height, speed) {
-        this.actor = new St.Bin();
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        this._speed = speed;
-
-        this._isLoaded = false;
-        this._isPlaying = false;
-        this._timeoutId = 0;
-        this._frame = 0;
-        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height,
-                                                                            Lang.bind(this, this._animationsLoaded));
-        this.actor.set_child(this._animations);
-    },
-
-    play: function() {
-        if (this._isLoaded && this._timeoutId == 0) {
-            if (this._frame == 0)
-                this._showFrame(0);
-
-            this._timeoutId = Mainloop.timeout_add(this._speed, Lang.bind(this, this._update));
-        }
-
-        this._isPlaying = true;
-    },
-
-    stop: function() {
-        if (this._timeoutId > 0) {
-            Mainloop.source_remove(this._timeoutId);
-            this._timeoutId = 0;
-        }
-
-        this._isPlaying = false;
-    },
-
-    _showFrame: function(frame) {
-        let oldFrameActor = this._animations.get_child_at_index(this._frame);
-        if (oldFrameActor)
-            oldFrameActor.hide();
-
-        this._frame = (frame % this._animations.get_n_children());
-
-        let newFrameActor = this._animations.get_child_at_index(this._frame);
-        if (newFrameActor)
-            newFrameActor.show();
-    },
-
-    _update: function() {
-        this._showFrame(this._frame + 1);
-        return GLib.SOURCE_CONTINUE;
-    },
-
-    _animationsLoaded: function() {
-        this._isLoaded = true;
-
-        if (this._isPlaying)
-            this.play();
-    },
-
-    _onDestroy: function() {
-        this.stop();
-    }
-});
-
-const AnimatedIcon = new Lang.Class({
-    Name: 'AnimatedIcon',
-    Extends: Animation,
-
-    _init: function(filename, size) {
-        this.parent(filename, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
-    }
-});

js/ui/appFavorites.js

@@ -14,15 +14,15 @@ const AppFavorites = new Lang.Class({
     _init: function() {
         this._favorites = {};
         global.settings.connect('changed::' + this.FAVORITE_APPS_KEY, Lang.bind(this, this._onFavsChanged));
-        this.reload();
+        this._reload();
     },
 
     _onFavsChanged: function() {
-        this.reload();
+        this._reload();
         this.emit('changed');
     },
 
-    reload: function() {
+    _reload: function() {
         let ids = global.settings.get_strv(this.FAVORITE_APPS_KEY);
         let appSys = Shell.AppSystem.get_default();
         let apps = ids.map(function (id) {
@@ -84,12 +84,9 @@ const AppFavorites = new Lang.Class({
 
         let app = Shell.AppSystem.get_default().lookup_app(appId);
 
-        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()),
-                                 { forFeedback: true,
-                                   undoCallback: Lang.bind(this, function () {
-                                                               this._removeFavorite(appId);
-                                                           })
-                                 });
+        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
+            this._removeFavorite(appId);
+        }));
     },
 
     addFavorite: function(appId) {
@@ -119,11 +116,9 @@ const AppFavorites = new Lang.Class({
             return;
 
         Main.overview.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
-                                 { forFeedback: true,
-                                   undoCallback: Lang.bind(this, function () {
-                                                               this._addFavorite(appId, pos);
-                                                           })
-                                 });
+                                 Lang.bind(this, function () {
+            this._addFavorite(appId, pos);
+        }));
     }
 });
 Signals.addSignalMethods(AppFavorites.prototype);

js/ui/automountManager.js

@@ -0,0 +1,269 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Gio = imports.gi.Gio;
+const Params = imports.misc.params;
+
+const Main = imports.ui.main;
+const ShellMountOperation = imports.ui.shellMountOperation;
+const ScreenSaver = imports.misc.screenSaver;
+
+// GSettings keys
+const SETTINGS_SCHEMA = 'org.gnome.desktop.media-handling';
+const SETTING_ENABLE_AUTOMOUNT = 'automount';
+
+const AUTORUN_EXPIRE_TIMEOUT_SECS = 10;
+
+const ConsoleKitSessionIface = <interface name="org.freedesktop.ConsoleKit.Session">
+<method name="IsActive">
+    <arg type="b" direction="out" />
+</method>
+<signal name="ActiveChanged">
+    <arg type="b" direction="out" />
+</signal>
+</interface>;
+
+const ConsoleKitSessionProxy = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
+
+const ConsoleKitManagerIface = <interface name="org.freedesktop.ConsoleKit.Manager">
+<method name="GetCurrentSession">
+    <arg type="o" direction="out" />
+</method>
+</interface>;
+
+const ConsoleKitManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ConsoleKitManagerIface);
+
+function ConsoleKitManager() {
+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system,
+				   g_interface_name: ConsoleKitManagerInfo.name,
+				   g_interface_info: ConsoleKitManagerInfo,
+				   g_name: 'org.freedesktop.ConsoleKit',
+				   g_object_path: '/org/freedesktop/ConsoleKit/Manager',
+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
+                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
+
+    self.connect('notify::g-name-owner', function() {
+        if (self.g_name_owner) {
+            self.GetCurrentSessionRemote(function([session]) {
+                self._ckSession = new ConsoleKitSessionProxy(Gio.DBus.system, 'org.freedesktop.ConsoleKit', session);
+
+                self._ckSession.connectSignal('ActiveChanged', function(object, senderName, [isActive]) {
+                    self.sessionActive = isActive;
+                });
+                self._ckSession.IsActiveRemote(function([isActive]) {
+                    self.sessionActive = isActive;
+                });
+            });
+        } else {
+            self.sessionActive = true;
+        }
+    });
+
+    self.init(null);
+    return self;
+}
+
+const AutomountManager = new Lang.Class({
+    Name: 'AutomountManager',
+
+    _init: function() {
+        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
+        this._volumeQueue = [];
+
+        this.ckListener = new ConsoleKitManager();
+
+        this._ssProxy = new ScreenSaver.ScreenSaverProxy();
+        this._ssProxy.connectSignal('ActiveChanged',
+                                    Lang.bind(this, this._screenSaverActiveChanged));
+
+        this._volumeMonitor = Gio.VolumeMonitor.get();
+
+        this._volumeMonitor.connect('volume-added',
+                                    Lang.bind(this,
+                                              this._onVolumeAdded));
+        this._volumeMonitor.connect('volume-removed',
+                                    Lang.bind(this,
+                                              this._onVolumeRemoved));
+        this._volumeMonitor.connect('drive-connected',
+                                    Lang.bind(this,
+                                              this._onDriveConnected));
+        this._volumeMonitor.connect('drive-disconnected',
+                                    Lang.bind(this,
+                                              this._onDriveDisconnected));
+        this._volumeMonitor.connect('drive-eject-button',
+                                    Lang.bind(this,
+                                              this._onDriveEjectButton));
+
+        Mainloop.idle_add(Lang.bind(this, this._startupMountAll));
+    },
+
+    _screenSaverActiveChanged: function(object, senderName, [isActive]) {
+        if (!isActive) {
+            this._volumeQueue.forEach(Lang.bind(this, function(volume) {
+                this._checkAndMountVolume(volume);
+            }));
+        }
+
+        // clear the queue anyway
+        this._volumeQueue = [];
+    },
+
+    _startupMountAll: function() {
+        let volumes = this._volumeMonitor.get_volumes();
+        volumes.forEach(Lang.bind(this, function(volume) {
+            this._checkAndMountVolume(volume, { checkSession: false,
+                                                useMountOp: false });
+        }));
+
+        return false;
+    },
+
+    _onDriveConnected: function() {
+        // if we're not in the current ConsoleKit session,
+        // or screensaver is active, don't play sounds
+        if (!this.ckListener.sessionActive)
+            return;        
+
+        if (this._ssProxy.screenSaverActive)
+            return;
+
+        global.play_theme_sound(0, 'device-added-media');
+    },
+
+    _onDriveDisconnected: function() {
+        // if we're not in the current ConsoleKit session,
+        // or screensaver is active, don't play sounds
+        if (!this.ckListener.sessionActive)
+            return;        
+
+        if (this._ssProxy.screenSaverActive)
+            return;
+
+        global.play_theme_sound(0, 'device-removed-media');        
+    },
+
+    _onDriveEjectButton: function(monitor, drive) {
+        // TODO: this code path is not tested, as the GVfs volume monitor
+        // doesn't emit this signal just yet.
+        if (!this.ckListener.sessionActive)
+            return;
+
+        // we force stop/eject in this case, so we don't have to pass a
+        // mount operation object
+        if (drive.can_stop()) {
+            drive.stop
+                (Gio.MountUnmountFlags.FORCE, null, null,
+                 Lang.bind(this, function(drive, res) {
+                     try {
+                         drive.stop_finish(res);
+                     } catch (e) {
+                         log("Unable to stop the drive after drive-eject-button " + e.toString());
+                     }
+                 }));
+        } else if (drive.can_eject()) {
+            drive.eject_with_operation 
+                (Gio.MountUnmountFlags.FORCE, null, null,
+                 Lang.bind(this, function(drive, res) {
+                     try {
+                         drive.eject_with_operation_finish(res);
+                     } catch (e) {
+                         log("Unable to eject the drive after drive-eject-button " + e.toString());
+                     }
+                 }));
+        }
+    },
+
+    _onVolumeAdded: function(monitor, volume) {
+        this._checkAndMountVolume(volume);
+    },
+
+    _checkAndMountVolume: function(volume, params) {
+        params = Params.parse(params, { checkSession: true,
+                                        useMountOp: true });
+
+        if (params.checkSession) {
+            // if we're not in the current ConsoleKit session,
+            // don't attempt automount
+            if (!this.ckListener.sessionActive)
+                return;
+
+            if (this._ssProxy.screenSaverActive) {
+                if (this._volumeQueue.indexOf(volume) == -1)
+                    this._volumeQueue.push(volume);
+
+                return;
+            }
+        }
+
+        // Volume is already mounted, don't bother.
+        if (volume.get_mount())
+            return;
+
+        if (!this._settings.get_boolean(SETTING_ENABLE_AUTOMOUNT) ||
+            !volume.should_automount() ||
+            !volume.can_mount()) {
+            // allow the autorun to run anyway; this can happen if the
+            // mount gets added programmatically later, even if 
+            // should_automount() or can_mount() are false, like for
+            // blank optical media.
+            this._allowAutorun(volume);
+            this._allowAutorunExpire(volume);
+
+            return;
+        }
+
+        if (params.useMountOp) {
+            let operation = new ShellMountOperation.ShellMountOperation(volume);
+            this._mountVolume(volume, operation.mountOp);
+        } else {
+            this._mountVolume(volume, null);
+        }
+    },
+
+    _mountVolume: function(volume, operation) {
+        this._allowAutorun(volume);
+        volume.mount(0, operation, null,
+                     Lang.bind(this, this._onVolumeMounted));
+    },
+
+    _onVolumeMounted: function(volume, res) {
+        this._allowAutorunExpire(volume);
+
+        try {
+            volume.mount_finish(res);
+        } catch (e) {
+            let string = e.toString();
+
+            // FIXME: needs proper error code handling instead of this
+            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
+            if (string.indexOf('No key available with this passphrase') != -1)
+                this._reaskPassword(volume);
+            else
+                log('Unable to mount volume ' + volume.get_name() + ': ' + string);
+        }
+    },
+
+    _onVolumeRemoved: function(monitor, volume) {
+        this._volumeQueue = 
+            this._volumeQueue.filter(function(element) {
+                return (element != volume);
+            });
+    },
+
+    _reaskPassword: function(volume) {
+        let operation = new ShellMountOperation.ShellMountOperation(volume, { reaskPassword: true });
+        this._mountVolume(volume, operation.mountOp);        
+    },
+
+    _allowAutorun: function(volume) {
+        volume.allowAutorun = true;
+    },
+
+    _allowAutorunExpire: function(volume) {
+        Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, function() {
+            volume.allowAutorun = false;
+            return false;
+        });
+    }
+});

js/ui/autorunManager.js

@@ -4,7 +4,6 @@ const Lang = imports.lang;
 const Gio = imports.gi.Gio;
 const St = imports.gi.St;
 
-const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const ShellMountOperation = imports.ui.shellMountOperation;
@@ -24,14 +23,12 @@ const AutorunSetting = {
 };
 
 // misc utils
-function shouldAutorunMount(mount, forTransient) {
+function ignoreAutorunForMount(mount) {
     let root = mount.get_root();
     let volume = mount.get_volume();
 
-    if (!volume || (!volume.allowAutorun && forTransient))
-        return false;
-
-    if (root.is_native() && isMountRootHidden(root))
+    if ((root.is_native() && !isMountRootHidden(root)) ||
+        (volume && volume.allowAutorun && volume.should_automount()))
         return false;
 
     return true;
@@ -44,17 +41,6 @@ function isMountRootHidden(root) {
     return (path.indexOf('/.') != -1);
 }
 
-function isMountNonLocal(mount) {
-    // If the mount doesn't have an associated volume, that means it's
-    // an uninteresting filesystem. Most devices that we care about will
-    // have a mount, like media players and USB sticks.
-    let volume = mount.get_volume();
-    if (volume == null)
-        return true;
-
-    return (volume.get_identifier("class") == "network");
-}
-
 function startAppForMount(app, mount) {
     let files = [];
     let root = mount.get_root();
@@ -75,14 +61,12 @@ function startAppForMount(app, mount) {
 
 /******************************************/
 
-const HotplugSnifferIface = '<node> \
-<interface name="org.gnome.Shell.HotplugSniffer"> \
-<method name="SniffURI"> \
-    <arg type="s" direction="in" /> \
-    <arg type="as" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const HotplugSnifferIface = <interface name="org.gnome.Shell.HotplugSniffer">
+<method name="SniffURI">
+    <arg type="s" direction="in" />
+    <arg type="as" direction="out" />
+</method>
+</interface>;
 
 const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface);
 function HotplugSniffer() {
@@ -96,21 +80,13 @@ const ContentTypeDiscoverer = new Lang.Class({
 
     _init: function(callback) {
         this._callback = callback;
-        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
     },
 
     guessContentTypes: function(mount) {
-        let autorunEnabled = !this._settings.get_boolean(SETTING_DISABLE_AUTORUN);
-        let shouldScan = autorunEnabled && !isMountNonLocal(mount);
-
-        if (shouldScan) {
-            // guess mount's content types using GIO
-            mount.guess_content_type(false, null,
-                                     Lang.bind(this,
-                                               this._onContentTypeGuessed));
-        } else {
-            this._emitCallback(mount, []);
-        }
+        // guess mount's content types using GIO
+        mount.guess_content_type(false, null,
+                                 Lang.bind(this,
+                                           this._onContentTypeGuessed));
     },
 
     _onContentTypeGuessed: function(mount, res) {
@@ -164,68 +140,55 @@ const AutorunManager = new Lang.Class({
     Name: 'AutorunManager',
 
     _init: function() {
-        this._session = new GnomeSession.SessionManager();
         this._volumeMonitor = Gio.VolumeMonitor.get();
 
-        this._transDispatcher = new AutorunTransientDispatcher(this);
-    },
+        this._volumeMonitor.connect('mount-added',
+                                    Lang.bind(this,
+                                              this._onMountAdded));
+        this._volumeMonitor.connect('mount-removed',
+                                    Lang.bind(this,
+                                              this._onMountRemoved));
 
-    _ensureResidentSource: function() {
-        if (this._residentSource)
-            return;
+        this._transDispatcher = new AutorunTransientDispatcher();
+        this._createResidentSource();
 
-        this._residentSource = new AutorunResidentSource(this);
-        let destroyId = this._residentSource.connect('destroy', Lang.bind(this, function() {
-            this._residentSource.disconnect(destroyId);
-            this._residentSource = null;
-        }));
-    },
-
-    enable: function() {
-        this._scanMounts();
-
-        this._mountAddedId = this._volumeMonitor.connect('mount-added', Lang.bind(this, this._onMountAdded));
-        this._mountRemovedId = this._volumeMonitor.connect('mount-removed', Lang.bind(this, this._onMountRemoved));
-    },
-
-    disable: function() {
-        if (this._residentSource)
-            this._residentSource.destroy();
-        this._volumeMonitor.disconnect(this._mountAddedId);
-        this._volumeMonitor.disconnect(this._mountRemovedId);
-    },
-
-    _processMount: function(mount, hotplug) {
-        let discoverer = new ContentTypeDiscoverer(Lang.bind(this, function(mount, apps, contentTypes) {
-            this._ensureResidentSource();
-            this._residentSource.addMount(mount, apps);
-
-            if (hotplug)
-                this._transDispatcher.addMount(mount, apps, contentTypes);
-        }));
-        discoverer.guessContentTypes(mount);
-    },
-
-    _scanMounts: function() {
         let mounts = this._volumeMonitor.get_mounts();
-        mounts.forEach(Lang.bind(this, function(mount) {
-            this._processMount(mount, false);
+
+        mounts.forEach(Lang.bind(this, function (mount) {
+            let discoverer = new ContentTypeDiscoverer(Lang.bind (this, 
+                function (mount, apps) {
+                    this._residentSource.addMount(mount, apps);
+                }));
+
+            discoverer.guessContentTypes(mount);
         }));
     },
 
+    _createResidentSource: function() {
+        this._residentSource = new AutorunResidentSource();
+        this._residentSource.connect('destroy',
+                                     Lang.bind(this,
+                                               this._createResidentSource));
+    },
+
     _onMountAdded: function(monitor, mount) {
         // don't do anything if our session is not the currently
         // active one
-        if (!this._session.SessionIsActive)
+        if (!Main.automountManager.ckListener.sessionActive)
             return;
 
-        this._processMount(mount, true);
+        let discoverer = new ContentTypeDiscoverer(Lang.bind (this,
+            function (mount, apps, contentTypes) {
+                this._transDispatcher.addMount(mount, apps, contentTypes);
+                this._residentSource.addMount(mount, apps);
+            }));
+
+        discoverer.guessContentTypes(mount);
     },
 
     _onMountRemoved: function(monitor, mount) {
         this._transDispatcher.removeMount(mount);
-        if (this._residentSource)
-            this._residentSource.removeMount(mount);
+        this._residentSource.removeMount(mount);
     },
 
     ejectMount: function(mount) {
@@ -261,9 +224,11 @@ const AutorunManager = new Lang.Class({
         try {
             mount.unmount_with_operation_finish(res);
         } catch (e) {
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                log('Unable to eject the mount ' + mount.get_name() 
-                    + ': ' + e.toString());
+            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
+            // but we can't access the error code from JS.
+            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
+            log('Unable to eject the mount ' + mount.get_name() 
+                + ': ' + e.toString());
         }
     },
 
@@ -271,9 +236,11 @@ const AutorunManager = new Lang.Class({
         try {
             source.eject_with_operation_finish(res);
         } catch (e) {
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                log('Unable to eject the drive ' + source.get_name()
-                    + ': ' + e.toString());
+            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
+            // but we can't access the error code from JS.
+            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
+            log('Unable to eject the drive ' + source.get_name() 
+                + ': ' + e.toString());
         }
     },
 
@@ -281,9 +248,11 @@ const AutorunManager = new Lang.Class({
         try {
             drive.stop_finish(res);
         } catch (e) {
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                log('Unable to stop the drive ' + drive.get_name() 
-                    + ': ' + e.toString());
+            // FIXME: we need to ignore G_IO_ERROR_FAILED_HANDLED errors here
+            // but we can't access the error code from JS.
+            // See https://bugzilla.gnome.org/show_bug.cgi?id=591480
+            log('Unable to stop the drive ' + drive.get_name() 
+                + ': ' + e.toString());
         }
     },
 });
@@ -292,26 +261,17 @@ const AutorunResidentSource = new Lang.Class({
     Name: 'AutorunResidentSource',
     Extends: MessageTray.Source,
 
-    _init: function(manager) {
-        this.parent(_("Removable Devices"), 'media-removable');
-        this.resident = true;
+    _init: function() {
+        this.parent(_("Removable Devices"));
 
         this._mounts = [];
 
-        this._manager = manager;
-        this._notification = new AutorunResidentNotification(this._manager, this);
-    },
-
-    _createPolicy: function() {
-        return new MessageTray.NotificationPolicy({ showInLockScreen: false });
-    },
-
-    buildRightClickMenu: function() {
-        return null;
+        this._notification = new AutorunResidentNotification(this);
+        this._setSummaryIcon(this.createNotificationIcon());
     },
 
     addMount: function(mount, apps) {
-        if (!shouldAutorunMount(mount, false))
+        if (ignoreAutorunForMount(mount))
             return;
 
         let filtered = this._mounts.filter(function (element) {
@@ -350,6 +310,12 @@ const AutorunResidentSource = new Lang.Class({
             Main.messageTray.add(this);
             this.pushNotification(this._notification);
         }
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon ({ icon_name: 'media-removable',
+                              icon_type: St.IconType.FULLCOLOR,
+                              icon_size: this.ICON_SIZE });
     }
 });
 
@@ -357,7 +323,7 @@ const AutorunResidentNotification = new Lang.Class({
     Name: 'AutorunResidentNotification',
     Extends: MessageTray.Notification,
 
-    _init: function(manager, source) {
+    _init: function(source) {
         this.parent(source, source.title, null, { customContent: true });
 
         // set the notification as resident
@@ -365,7 +331,6 @@ const AutorunResidentNotification = new Lang.Class({
 
         this._layout = new St.BoxLayout ({ style_class: 'hotplug-resident-box',
                                            vertical: true });
-        this._manager = manager;
 
         this.addActor(this._layout,
                       { x_expand: true,
@@ -374,7 +339,7 @@ const AutorunResidentNotification = new Lang.Class({
 
     updateForMounts: function(mounts) {
         // remove all the layout content
-        this._layout.destroy_all_children();
+        this._layout.destroy_children();
 
         for (let idx = 0; idx < mounts.length; idx++) {
             let element = mounts[idx];
@@ -413,7 +378,7 @@ const AutorunResidentNotification = new Lang.Class({
                                 expand: true });
 
         let ejectIcon = 
-            new St.Icon({ icon_name: 'media-eject-symbolic',
+            new St.Icon({ icon_name: 'media-eject',
                           style_class: 'hotplug-resident-eject-icon' });
 
         let ejectButton =
@@ -428,7 +393,7 @@ const AutorunResidentNotification = new Lang.Class({
         }));
 
         ejectButton.connect('clicked', Lang.bind(this, function() {
-            this._manager.ejectMount(mount);
+            Main.autorunManager.ejectMount(mount);
         }));
 
         return item;
@@ -438,8 +403,7 @@ const AutorunResidentNotification = new Lang.Class({
 const AutorunTransientDispatcher = new Lang.Class({
     Name: 'AutorunTransientDispatcher',
 
-    _init: function(manager) {
-        this._manager = manager;
+    _init: function() {
         this._sources = [];
         this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
     },
@@ -482,7 +446,7 @@ const AutorunTransientDispatcher = new Lang.Class({
             return;
      
         // add a new source
-        this._sources.push(new AutorunTransientSource(this._manager, mount, apps));
+        this._sources.push(new AutorunTransientSource(mount, apps));
     },
 
     addMount: function(mount, apps, contentTypes) {
@@ -491,7 +455,7 @@ const AutorunTransientDispatcher = new Lang.Class({
             return;
 
         // if the mount doesn't want to be autorun, return
-        if (!shouldAutorunMount(mount, true))
+        if (ignoreAutorunForMount(mount))
             return;
 
         let setting = this._getAutorunSettingForType(contentTypes[0]);
@@ -535,22 +499,23 @@ const AutorunTransientSource = new Lang.Class({
     Name: 'AutorunTransientSource',
     Extends: MessageTray.Source,
 
-    _init: function(manager, mount, apps) {
-        this._manager = manager;
+    _init: function(mount, apps) {
+        this.parent(mount.get_name());
+
         this.mount = mount;
         this.apps = apps;
 
-        this.parent(mount.get_name());
-
-        this._notification = new AutorunTransientNotification(this._manager, this);
+        this._notification = new AutorunTransientNotification(this);
+        this._setSummaryIcon(this.createNotificationIcon());
 
         // add ourselves as a source, and popup the notification
         Main.messageTray.add(this);
         this.notify(this._notification);
     },
 
-    getIcon: function() {
-        return this.mount.get_icon();
+    createNotificationIcon: function() {
+        return new St.Icon({ gicon: this.mount.get_icon(),
+                             icon_size: this.ICON_SIZE });
     }
 });
 
@@ -558,10 +523,9 @@ const AutorunTransientNotification = new Lang.Class({
     Name: 'AutorunTransientNotification',
     Extends: MessageTray.Notification,
 
-    _init: function(manager, source) {
+    _init: function(source) {
         this.parent(source, source.title, null, { customContent: true });
 
-        this._manager = manager;
         this._box = new St.BoxLayout({ style_class: 'hotplug-transient-box',
                                        vertical: true });
         this.addActor(this._box);
@@ -593,7 +557,7 @@ const AutorunTransientNotification = new Lang.Class({
 
         let label = new St.Bin({ y_align: St.Align.MIDDLE,
                                  child: new St.Label
-                                 ({ text: _("Open with %s").format(app.get_name()) })
+                                 ({ text: _("Open with %s").format(app.get_display_name()) })
                                });
         box.add(label);
 
@@ -613,7 +577,7 @@ const AutorunTransientNotification = new Lang.Class({
 
     _buttonForEject: function() {
         let box = new St.BoxLayout();
-        let icon = new St.Icon({ icon_name: 'media-eject-symbolic',
+        let icon = new St.Icon({ icon_name: 'media-eject',
                                  style_class: 'hotplug-notification-item-icon' });
         box.add(icon);
 
@@ -630,11 +594,10 @@ const AutorunTransientNotification = new Lang.Class({
                                      style_class: 'hotplug-notification-item' });
 
         button.connect('clicked', Lang.bind(this, function() {
-            this._manager.ejectMount(this._mount);
+            Main.autorunManager.ejectMount(this._mount);
         }));
 
         return button;
     }
 });
 
-const Component = AutorunManager;

js/ui/background.js

@@ -1,800 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const GDesktopEnums = imports.gi.GDesktopEnums;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GnomeDesktop = imports.gi.GnomeDesktop;
-const Lang = imports.lang;
-const Meta = imports.gi.Meta;
-const Signals = imports.signals;
-
-const Main = imports.ui.main;
-const Params = imports.misc.params;
-const Tweener = imports.ui.tweener;
-
-const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';
-const PRIMARY_COLOR_KEY = 'primary-color';
-const SECONDARY_COLOR_KEY = 'secondary-color';
-const COLOR_SHADING_TYPE_KEY = 'color-shading-type';
-const BACKGROUND_STYLE_KEY = 'picture-options';
-const PICTURE_OPACITY_KEY = 'picture-opacity';
-const PICTURE_URI_KEY = 'picture-uri';
-
-const FADE_ANIMATION_TIME = 1.0;
-
-// These parameters affect how often we redraw.
-// The first is how different (percent crossfaded) the slide show
-// has to look before redrawing and the second is the minimum
-// frequency (in seconds) we're willing to wake up
-const ANIMATION_OPACITY_STEP_INCREMENT = 4.0;
-const ANIMATION_MIN_WAKEUP_INTERVAL = 1.0;
-
-let _backgroundCache = null;
-
-const BackgroundCache = new Lang.Class({
-    Name: 'BackgroundCache',
-
-    _init: function() {
-       this._patterns = [];
-       this._images = [];
-       this._pendingFileLoads = [];
-       this._fileMonitors = {};
-    },
-
-    getPatternContent: function(params) {
-        params = Params.parse(params, { monitorIndex: 0,
-                                        color: null,
-                                        secondColor: null,
-                                        shadingType: null,
-                                        effects: Meta.BackgroundEffects.NONE });
-
-        let content = null;
-
-        let candidateContent = null;
-        for (let i = 0; i < this._patterns.length; i++) {
-            if (this._patterns[i].get_shading() != params.shadingType)
-                continue;
-
-            if (!params.color.equal(this._patterns[i].get_color()))
-                continue;
-
-            if (params.shadingType != GDesktopEnums.BackgroundShading.SOLID &&
-                !params.secondColor.equal(this._patterns[i].get_second_color()))
-                continue;
-
-            candidateContent = this._patterns[i];
-
-            if (params.effects != this._patterns[i].effects)
-                continue;
-
-            break;
-        }
-
-        if (candidateContent) {
-            content = candidateContent.copy(params.monitorIndex, params.effects);
-        } else {
-            content = new Meta.Background({ meta_screen: global.screen,
-                                            monitor: params.monitorIndex,
-                                            effects: params.effects });
-
-            if (params.shadingType == GDesktopEnums.BackgroundShading.SOLID) {
-                content.load_color(params.color);
-            } else {
-                content.load_gradient(params.shadingType, params.color, params.secondColor);
-            }
-        }
-
-        this._patterns.push(content);
-        return content;
-    },
-
-    _monitorFile: function(filename) {
-        if (this._fileMonitors[filename])
-            return;
-
-        let file = Gio.File.new_for_path(filename);
-        let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null);
-
-        let signalId = monitor.connect('changed',
-                                       Lang.bind(this, function() {
-                                           for (let i = 0; i < this._images.length; i++) {
-                                               if (this._images[i].get_filename() == filename)
-                                                   this._images.splice(i, 1);
-                                           }
-
-                                           monitor.disconnect(signalId);
-
-                                           this.emit('file-changed', filename);
-                                       }));
-
-        this._fileMonitors[filename] = monitor;
-    },
-
-    _removeContent: function(contentList, content) {
-        let index = contentList.indexOf(content);
-        if (index < 0)
-            throw new Error("Trying to remove invalid content: " + content);
-        contentList.splice(index, 1);
-    },
-
-    removePatternContent: function(content) {
-        this._removeContent(this._patterns, content);
-    },
-
-    removeImageContent: function(content) {
-        let filename = content.get_filename();
-
-        let hasOtherUsers = this._images.some(function(content) { return filename == content.get_filename(); });
-        if (!hasOtherUsers)
-            delete this._fileMonitors[filename];
-
-        this._removeContent(this._images, content);
-    },
-
-    _loadImageContent: function(params) {
-        params = Params.parse(params, { monitorIndex: 0,
-                                        style: null,
-                                        filename: null,
-                                        effects: Meta.BackgroundEffects.NONE,
-                                        cancellable: null,
-                                        onFinished: null });
-
-        for (let i = 0; i < this._pendingFileLoads.length; i++) {
-            if (this._pendingFileLoads[i].filename == params.filename &&
-                this._pendingFileLoads[i].style == params.style) {
-                this._pendingFileLoads[i].callers.push({ shouldCopy: true,
-                                                         monitorIndex: params.monitorIndex,
-                                                         effects: params.effects,
-                                                         onFinished: params.onFinished });
-                return;
-            }
-        }
-
-        this._pendingFileLoads.push({ filename: params.filename,
-                                      style: params.style,
-                                      callers: [{ shouldCopy: false,
-                                                  monitorIndex: params.monitorIndex,
-                                                  effects: params.effects,
-                                                  onFinished: params.onFinished }] });
-
-        let content = new Meta.Background({ meta_screen: global.screen,
-                                            monitor: params.monitorIndex,
-                                            effects: params.effects });
-
-        content.load_file_async(params.filename,
-                                params.style,
-                                params.cancellable,
-                                Lang.bind(this,
-                                          function(object, result) {
-                                              try {
-                                                  content.load_file_finish(result);
-
-                                                  this._monitorFile(params.filename);
-                                                  this._images.push(content);
-                                              } catch(e) {
-                                                  content = null;
-                                              }
-
-                                              for (let i = 0; i < this._pendingFileLoads.length; i++) {
-                                                  let pendingLoad = this._pendingFileLoads[i];
-                                                  if (pendingLoad.filename != params.filename ||
-                                                      pendingLoad.style != params.style)
-                                                      continue;
-
-                                                  for (let j = 0; j < pendingLoad.callers.length; j++) {
-                                                      if (pendingLoad.callers[j].onFinished) {
-                                                          let newContent;
-
-                                                          if (content && pendingLoad.callers[j].shouldCopy) {
-                                                              newContent = content.copy(pendingLoad.callers[j].monitorIndex,
-                                                                                        pendingLoad.callers[j].effects);
-                                                              this._images.push(newContent);
-                                                          } else {
-                                                              newContent = content;
-                                                          }
-
-                                                          pendingLoad.callers[j].onFinished(newContent);
-                                                      }
-                                                  }
-
-                                                  this._pendingFileLoads.splice(i, 1);
-                                              }
-                                          }));
-    },
-
-    getImageContent: function(params) {
-        params = Params.parse(params, { monitorIndex: 0,
-                                        style: null,
-                                        filename: null,
-                                        effects: Meta.BackgroundEffects.NONE,
-                                        cancellable: null,
-                                        onFinished: null });
-
-        let content = null;
-
-        let candidateContent = null;
-        for (let i = 0; i < this._images.length; i++) {
-            if (this._images[i].get_style() != params.style)
-                continue;
-
-            if (this._images[i].get_filename() != params.filename)
-                continue;
-
-            if (params.style == GDesktopEnums.BackgroundStyle.SPANNED &&
-                this._images[i].monitor != params.monitorIndex)
-                continue;
-
-            candidateContent = this._images[i];
-
-            if (params.effects != this._images[i].effects)
-                continue;
-
-            break;
-        }
-
-        if (candidateContent) {
-            content = candidateContent.copy(params.monitorIndex, params.effects);
-
-            if (params.cancellable && params.cancellable.is_cancelled())
-                content = null;
-            else
-                this._images.push(content);
-
-            if (params.onFinished)
-                params.onFinished(content);
-        } else {
-            this._loadImageContent({ filename: params.filename,
-                                     style: params.style,
-                                     effects: params.effects,
-                                     monitorIndex: params.monitorIndex,
-                                     cancellable: params.cancellable,
-                                     onFinished: params.onFinished });
-
-        }
-    },
-
-    getAnimation: function(params) {
-        params = Params.parse(params, { filename: null,
-                                        onLoaded: null });
-
-        if (this._animationFilename == params.filename) {
-            if (params.onLoaded) {
-                GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
-                    params.onLoaded(this._animation);
-                    return GLib.SOURCE_REMOVE;
-                }));
-            }
-        }
-
-        let animation = new Animation({ filename: params.filename });
-
-        animation.load(Lang.bind(this, function() {
-                           this._monitorFile(params.filename);
-                           this._animationFilename = params.filename;
-                           this._animation = animation;
-
-                           if (params.onLoaded) {
-                               GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
-                                   params.onLoaded(this._animation);
-                                   return GLib.SOURCE_REMOVE;
-                               }));
-                           }
-                       }));
-    }
-});
-Signals.addSignalMethods(BackgroundCache.prototype);
-
-function getBackgroundCache() {
-    if (!_backgroundCache)
-        _backgroundCache = new BackgroundCache();
-    return _backgroundCache;
-}
-
-const Background = new Lang.Class({
-    Name: 'Background',
-
-    _init: function(params) {
-        params = Params.parse(params, { monitorIndex: 0,
-                                        layoutManager: Main.layoutManager,
-                                        effects: Meta.BackgroundEffects.NONE,
-                                        settings: null });
-        this.actor = new Meta.BackgroundGroup();
-        this.actor._delegate = this;
-
-        this._destroySignalId = this.actor.connect('destroy',
-                                                   Lang.bind(this, this._destroy));
-
-        this._settings = params.settings;
-        this._monitorIndex = params.monitorIndex;
-        this._layoutManager = params.layoutManager;
-        this._effects = params.effects;
-        this._fileWatches = {};
-        this._pattern = null;
-        // contains a single image for static backgrounds and
-        // two images (from and to) for slide shows
-        this._images = {};
-
-        this._brightness = 1.0;
-        this._vignetteSharpness = 0.2;
-        this._cancellable = new Gio.Cancellable();
-        this.isLoaded = false;
-
-        this._settingsChangedSignalId = this._settings.connect('changed', Lang.bind(this, function() {
-                                            this.emit('changed');
-                                        }));
-
-        this._load();
-    },
-
-    _destroy: function() {
-        this._cancellable.cancel();
-
-        if (this._updateAnimationTimeoutId) {
-            GLib.source_remove (this._updateAnimationTimeoutId);
-            this._updateAnimationTimeoutId = 0;
-        }
-
-        let i;
-        let keys = Object.keys(this._fileWatches);
-        for (i = 0; i < keys.length; i++) {
-            this._cache.disconnect(this._fileWatches[keys[i]]);
-        }
-        this._fileWatches = null;
-
-        if (this._pattern) {
-            if (this._pattern.content)
-                this._cache.removePatternContent(this._pattern.content);
-
-            this._pattern.destroy();
-            this._pattern = null;
-        }
-
-        keys = Object.keys(this._images);
-        for (i = 0; i < keys.length; i++) {
-            let actor = this._images[keys[i]];
-
-            if (actor.content)
-                this._cache.removeImageContent(actor.content);
-
-            actor.destroy();
-            this._images[keys[i]] = null;
-        }
-
-        this.actor.disconnect(this._destroySignalId);
-        this._destroySignalId = 0;
-
-        if (this._settingsChangedSignalId != 0)
-            this._settings.disconnect(this._settingsChangedSignalId);
-        this._settingsChangedSignalId = 0;
-    },
-
-    _setLoaded: function() {
-        if (this.isLoaded)
-            return;
-
-        this.isLoaded = true;
-
-        GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
-            this.emit('loaded');
-            return GLib.SOURCE_REMOVE;
-        }));
-    },
-
-    _loadPattern: function() {
-        let colorString, res, color, secondColor;
-
-        colorString = this._settings.get_string(PRIMARY_COLOR_KEY);
-        [res, color] = Clutter.Color.from_string(colorString);
-        colorString = this._settings.get_string(SECONDARY_COLOR_KEY);
-        [res, secondColor] = Clutter.Color.from_string(colorString);
-
-        let shadingType = this._settings.get_enum(COLOR_SHADING_TYPE_KEY);
-
-        let content = this._cache.getPatternContent({ monitorIndex: this._monitorIndex,
-                                                      effects: this._effects,
-                                                      color: color,
-                                                      secondColor: secondColor,
-                                                      shadingType: shadingType });
-
-        this._pattern = new Meta.BackgroundActor();
-        this.actor.add_child(this._pattern);
-
-        this._pattern.content = content;
-    },
-
-    _watchCacheFile: function(filename) {
-        if (this._fileWatches[filename])
-            return;
-
-        let signalId = this._cache.connect('file-changed',
-                                           Lang.bind(this, function(cache, changedFile) {
-                                               if (changedFile == filename) {
-                                                   this.emit('changed');
-                                               }
-                                           }));
-        this._fileWatches[filename] = signalId;
-    },
-
-    _ensureImage: function(index) {
-        if (this._images[index])
-            return;
-
-        let actor = new Meta.BackgroundActor();
-
-        // The background pattern is the first actor in
-        // the group, and all images should be above that.
-        this.actor.insert_child_at_index(actor, index + 1);
-        this._images[index] = actor;
-    },
-
-    _updateImage: function(index, content, filename) {
-        content.brightness = this._brightness;
-        content.vignette_sharpness = this._vignetteSharpness;
-
-        let image = this._images[index];
-        if (image.content)
-            this._cache.removeImageContent(content);
-        image.content = content;
-        this._watchCacheFile(filename);
-    },
-
-    _updateAnimationProgress: function() {
-        if (this._images[1])
-            this._images[1].opacity = this._animation.transitionProgress * 255;
-
-        this._queueUpdateAnimation();
-    },
-
-    _updateAnimation: function() {
-        this._updateAnimationTimeoutId = 0;
-
-        this._animation.update(this._layoutManager.monitors[this._monitorIndex]);
-        let files = this._animation.keyFrameFiles;
-
-        if (files.length == 0) {
-            this._setLoaded();
-            this._queueUpdateAnimation();
-            return;
-        }
-
-        let numPendingImages = files.length;
-        for (let i = 0; i < files.length; i++) {
-            if (this._images[i] && this._images[i].content &&
-                this._images[i].content.get_filename() == files[i]) {
-
-                numPendingImages--;
-                if (numPendingImages == 0)
-                    this._updateAnimationProgress();
-                continue;
-            }
-            this._cache.getImageContent({ monitorIndex: this._monitorIndex,
-                                          effects: this._effects,
-                                          style: this._style,
-                                          filename: files[i],
-                                          cancellable: this._cancellable,
-                                          onFinished: Lang.bind(this, function(content, i) {
-                                              numPendingImages--;
-
-                                              if (!content) {
-                                                  this._setLoaded();
-                                                  if (numPendingImages == 0)
-                                                      this._updateAnimationProgress();
-                                                  return;
-                                              }
-
-                                              this._ensureImage(i);
-                                              this._updateImage(i, content, files[i]);
-
-                                              if (numPendingImages == 0) {
-                                                  this._setLoaded();
-                                                  this._updateAnimationProgress();
-                                              }
-                                          }, i)
-                                        });
-        }
-    },
-
-    _queueUpdateAnimation: function() {
-        if (this._updateAnimationTimeoutId != 0)
-            return;
-
-        if (!this._cancellable || this._cancellable.is_cancelled())
-            return;
-
-        if (!this._animation.transitionDuration)
-            return;
-
-        let nSteps = 255 / ANIMATION_OPACITY_STEP_INCREMENT;
-        let timePerStep = (this._animation.transitionDuration * 1000) / nSteps;
-
-        let interval = Math.max(ANIMATION_MIN_WAKEUP_INTERVAL * 1000,
-                                timePerStep);
-
-        if (interval > GLib.MAXUINT32)
-            return;
-
-        this._updateAnimationTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
-                                                      interval,
-                                                      Lang.bind(this, function() {
-                                                                    this._updateAnimationTimeoutId = 0;
-                                                                    this._updateAnimation();
-                                                                    return GLib.SOURCE_REMOVE;
-                                                                }));
-    },
-
-    _loadAnimation: function(filename) {
-        this._cache.getAnimation({ filename: filename,
-                                             onLoaded: Lang.bind(this, function(animation) {
-                                                 this._animation = animation;
-
-                                                 if (!this._animation || this._cancellable.is_cancelled()) {
-                                                     this._setLoaded();
-                                                     return;
-                                                 }
-
-                                                 this._updateAnimation();
-                                                 this._watchCacheFile(filename);
-                                             })
-                                           });
-    },
-
-    _loadImage: function(filename) {
-        this._cache.getImageContent({ monitorIndex: this._monitorIndex,
-                                      effects: this._effects,
-                                      style: this._style,
-                                      filename: filename,
-                                      cancellable: this._cancellable,
-                                      onFinished: Lang.bind(this, function(content) {
-                                          if (content) {
-                                              this._ensureImage(0);
-                                              this._updateImage(0, content, filename);
-                                          }
-                                          this._setLoaded();
-                                      })
-                                    });
-    },
-
-    _loadFile: function(filename) {
-        if (filename.endsWith('.xml'))
-            this._loadAnimation(filename);
-        else
-            this._loadImage(filename);
-    },
-
-    _load: function () {
-        this._cache = getBackgroundCache();
-
-        this._loadPattern(this._cache);
-
-        this._style = this._settings.get_enum(BACKGROUND_STYLE_KEY);
-        if (this._style == GDesktopEnums.BackgroundStyle.NONE) {
-            this._setLoaded();
-            return;
-        }
-
-        let uri = this._settings.get_string(PICTURE_URI_KEY);
-        let filename;
-        if (GLib.uri_parse_scheme(uri) != null)
-            filename = Gio.File.new_for_uri(uri).get_path();
-        else
-            filename = uri;
-
-        if (!filename) {
-            this._setLoaded();
-            return;
-        }
-
-        this._loadFile(filename);
-    },
-
-    get brightness() {
-        return this._brightness;
-    },
-
-    set brightness(factor) {
-        this._brightness = factor;
-        if (this._pattern && this._pattern.content)
-            this._pattern.content.brightness = factor;
-
-        let keys = Object.keys(this._images);
-        for (let i = 0; i < keys.length; i++) {
-            let image = this._images[keys[i]];
-            if (image && image.content)
-                image.content.brightness = factor;
-        }
-    },
-
-    get vignetteSharpness() {
-        return this._vignetteSharpness;
-    },
-
-    set vignetteSharpness(sharpness) {
-        this._vignetteSharpness = sharpness;
-        if (this._pattern && this._pattern.content)
-            this._pattern.content.vignette_sharpness = sharpness;
-
-        let keys = Object.keys(this._images);
-        for (let i = 0; i < keys.length; i++) {
-            let image = this._images[keys[i]];
-            if (image && image.content)
-                image.content.vignette_sharpness = sharpness;
-        }
-    }
-});
-Signals.addSignalMethods(Background.prototype);
-
-const SystemBackground = new Lang.Class({
-    Name: 'SystemBackground',
-
-    _init: function() {
-        this._cache = getBackgroundCache();
-        this.actor = new Meta.BackgroundActor();
-
-        this._cache.getImageContent({ style: GDesktopEnums.BackgroundStyle.WALLPAPER,
-                                      filename: global.datadir + '/theme/noise-texture.png',
-                                      effects: Meta.BackgroundEffects.NONE,
-                                      onFinished: Lang.bind(this, function(content) {
-                                          this.actor.content = content;
-                                          this.emit('loaded');
-                                      })
-                                    });
-
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-    },
-
-    _onDestroy: function() {
-        this._cache.removeImageContent(this.actor.content);
-    },
-});
-Signals.addSignalMethods(SystemBackground.prototype);
-
-const Animation = new Lang.Class({
-    Name: 'Animation',
-
-    _init: function(params) {
-        params = Params.parse(params, { filename: null });
-
-        this.filename = params.filename;
-        this.keyFrameFiles = [];
-        this.transitionProgress = 0.0;
-        this.transitionDuration = 0.0;
-        this.loaded = false;
-    },
-
-    load: function(callback) {
-        let file = Gio.File.new_for_path(this.filename);
-
-        this._show = new GnomeDesktop.BGSlideShow({ filename: this.filename });
-
-        this._show.load_async(null,
-                              Lang.bind(this,
-                                        function(object, result) {
-                                            this.loaded = true;
-                                            if (callback)
-                                                callback();
-                                        }));
-    },
-
-    update: function(monitor) {
-        this.keyFrameFiles = [];
-
-        if (!this._show)
-            return;
-
-        if (this._show.get_num_slides() < 1)
-            return;
-
-        let [progress, duration, isFixed, file1, file2] = this._show.get_current_slide(monitor.width, monitor.height);
-
-        this.transitionDuration = duration;
-        this.transitionProgress = progress;
-
-        if (file1)
-            this.keyFrameFiles.push(file1);
-
-        if (file2)
-            this.keyFrameFiles.push(file2);
-    },
-});
-Signals.addSignalMethods(Animation.prototype);
-
-const BackgroundManager = new Lang.Class({
-    Name: 'BackgroundManager',
-
-    _init: function(params) {
-        params = Params.parse(params, { container: null,
-                                        layoutManager: Main.layoutManager,
-                                        monitorIndex: null,
-                                        effects: Meta.BackgroundEffects.NONE,
-                                        controlPosition: true,
-                                        settingsSchema: BACKGROUND_SCHEMA });
-
-        this._settings = new Gio.Settings({ schema: params.settingsSchema });
-        this._container = params.container;
-        this._layoutManager = params.layoutManager;
-        this._effects = params.effects;
-        this._monitorIndex = params.monitorIndex;
-        this._controlPosition = params.controlPosition;
-
-        this.background = this._createBackground();
-        this._newBackground = null;
-    },
-
-    destroy: function() {
-        if (this._newBackground) {
-            this._newBackground.actor.destroy();
-            this._newBackground = null;
-        }
-
-        if (this.background) {
-            this.background.actor.destroy();
-            this.background = null;
-        }
-    },
-
-    _updateBackground: function(background) {
-        let newBackground = this._createBackground();
-        newBackground.vignetteSharpness = background.vignetteSharpness;
-        newBackground.brightness = background.brightness;
-        newBackground.visible = background.visible;
-
-        newBackground.loadedSignalId = newBackground.connect('loaded',
-            Lang.bind(this, function() {
-                newBackground.disconnect(newBackground.loadedSignalId);
-                newBackground.loadedSignalId = 0;
-                Tweener.addTween(background.actor,
-                                 { opacity: 0,
-                                   time: FADE_ANIMATION_TIME,
-                                   transition: 'easeOutQuad',
-                                   onComplete: Lang.bind(this, function() {
-                                       if (this._newBackground == newBackground) {
-                                           this.background = newBackground;
-                                           this._newBackground = null;
-                                       } else {
-                                           newBackground.actor.destroy();
-                                       }
-
-                                       background.actor.destroy();
-
-                                       this.emit('changed');
-                                   })
-                                 });
-        }));
-
-        this._newBackground = newBackground;
-    },
-
-    _createBackground: function() {
-        let background = new Background({ monitorIndex: this._monitorIndex,
-                                          layoutManager: this._layoutManager,
-                                          effects: this._effects,
-                                          settings: this._settings });
-        this._container.add_child(background.actor);
-
-        let monitor = this._layoutManager.monitors[this._monitorIndex];
-
-        background.actor.set_size(monitor.width, monitor.height);
-        if (this._controlPosition) {
-            background.actor.set_position(monitor.x, monitor.y);
-            background.actor.lower_bottom();
-        }
-
-        background.changeSignalId = background.connect('changed', Lang.bind(this, function() {
-            background.disconnect(background.changeSignalId);
-            background.changeSignalId = 0;
-            this._updateBackground(background);
-        }));
-
-        background.actor.connect('destroy', Lang.bind(this, function() {
-            if (background.changeSignalId)
-                background.disconnect(background.changeSignalId);
-
-            if (background.loadedSignalId)
-                background.disconnect(background.loadedSignalId);
-        }));
-
-        return background;
-    },
-});
-Signals.addSignalMethods(BackgroundManager.prototype);

js/ui/backgroundMenu.js

@@ -1,68 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-
-const BoxPointer = imports.ui.boxpointer;
-const Main = imports.ui.main;
-const PopupMenu = imports.ui.popupMenu;
-
-const BackgroundMenu = new Lang.Class({
-    Name: 'BackgroundMenu',
-    Extends: PopupMenu.PopupMenu,
-
-    _init: function(source, layoutManager) {
-        this.parent(source, 0, St.Side.TOP);
-
-        this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.addSettingsAction(_("Change Background…"), 'gnome-background-panel.desktop');
-
-        this.actor.add_style_class_name('background-menu');
-
-        layoutManager.uiGroup.add_actor(this.actor);
-        this.actor.hide();
-    }
-});
-
-function addBackgroundMenu(actor, layoutManager) {
-    let cursor = new St.Bin({ opacity: 0 });
-    layoutManager.uiGroup.add_actor(cursor);
-
-    actor.reactive = true;
-    actor._backgroundMenu = new BackgroundMenu(cursor, layoutManager);
-    actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
-    actor._backgroundManager.addMenu(actor._backgroundMenu);
-
-    function openMenu() {
-        let [x, y] = global.get_pointer();
-        cursor.set_position(x, y);
-        actor._backgroundMenu.open(BoxPointer.PopupAnimation.NONE);
-    }
-
-    let clickAction = new Clutter.ClickAction();
-    clickAction.connect('long-press', function(action, actor, state) {
-        if (state == Clutter.LongPressState.QUERY)
-            return action.get_button() == 1 && !actor._backgroundMenu.isOpen;
-        if (state == Clutter.LongPressState.ACTIVATE) {
-            openMenu();
-            actor._backgroundManager.ignoreRelease();
-        }
-        return true;
-    });
-    clickAction.connect('clicked', function(action) {
-        if (action.get_button() == 3)
-            openMenu();
-    });
-    actor.add_action(clickAction);
-
-    actor.connect('destroy', function() {
-                      actor._backgroundMenu.destroy();
-                      actor._backgroundMenu = null;
-                      actor._backgroundManager = null;
-
-                      cursor.destroy();
-                  });
-}

js/ui/boxpointer.js

@@ -3,20 +3,12 @@
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;
+const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
-const PopupAnimation = {
-    NONE:  0,
-    SLIDE: 1 << 0,
-    FADE:  1 << 1,
-    FULL:  ~0,
-};
-
 const POPUP_ANIMATION_TIME = 0.15;
 
 /**
@@ -26,10 +18,7 @@ const POPUP_ANIMATION_TIME = 0.15;
  *
  * An actor which displays a triangle "arrow" pointing to a given
  * side.  The .bin property is a container in which content can be
- * placed.  The arrow position may be controlled via
- * setArrowOrigin(). The arrow side might be temporarily flipped
- * depending on the box size and source position to keep the box
- * totally inside the monitor if possible.
+ * placed.  The arrow position may be controlled via setArrowOrigin().
  *
  */
 const BoxPointer = new Lang.Class({
@@ -37,9 +26,7 @@ const BoxPointer = new Lang.Class({
 
     _init: function(arrowSide, binProperties) {
         this._arrowSide = arrowSide;
-        this._userArrowSide = arrowSide;
         this._arrowOrigin = 0;
-        this._arrowActor = null;
         this.actor = new St.Bin({ x_fill: true,
                                   y_fill: true });
         this._container = new Shell.GenericContainer();
@@ -58,40 +45,16 @@ const BoxPointer = new Lang.Class({
         this._xPosition = 0;
         this._yPosition = 0;
         this._sourceAlignment = 0.5;
-        this._capturedEventId = 0;
-        this._muteInput();
-    },
-
-    get arrowSide() {
-        return this._arrowSide;
-    },
-
-    _muteInput: function() {
-        if (this._capturedEventId == 0)
-            this._capturedEventId = this.actor.connect('captured-event',
-                                                       function() { return Clutter.EVENT_STOP; });
-    },
-
-    _unmuteInput: function() {
-        if (this._capturedEventId != 0) {
-            this.actor.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
     },
 
     show: function(animate, onComplete) {
         let themeNode = this.actor.get_theme_node();
         let rise = themeNode.get_length('-arrow-rise');
-        let animationTime = (animate & PopupAnimation.FULL) ? POPUP_ANIMATION_TIME : 0;
-
-        if (animate & PopupAnimation.FADE)
-            this.opacity = 0;
-        else
-            this.opacity = 255;
 
+        this.opacity = 0;
         this.actor.show();
 
-        if (animate & PopupAnimation.SLIDE) {
+        if (animate) {
             switch (this._arrowSide) {
                 case St.Side.TOP:
                     this.yOffset = -rise;
@@ -112,26 +75,17 @@ const BoxPointer = new Lang.Class({
                                  xOffset: 0,
                                  yOffset: 0,
                                  transition: 'linear',
-                                 onComplete: Lang.bind(this, function() {
-                                     this._unmuteInput();
-                                     if (onComplete)
-                                         onComplete();
-                                 }),
-                                 time: animationTime });
+                                 onComplete: onComplete,
+                                 time: POPUP_ANIMATION_TIME });
     },
 
     hide: function(animate, onComplete) {
-        if (!this.actor.visible)
-            return;
-
         let xOffset = 0;
         let yOffset = 0;
         let themeNode = this.actor.get_theme_node();
         let rise = themeNode.get_length('-arrow-rise');
-        let fade = (animate & PopupAnimation.FADE);
-        let animationTime = (animate & PopupAnimation.FULL) ? POPUP_ANIMATION_TIME : 0;
 
-        if (animate & PopupAnimation.SLIDE) {
+        if (animate) {
             switch (this._arrowSide) {
                 case St.Side.TOP:
                     yOffset = rise;
@@ -148,17 +102,13 @@ const BoxPointer = new Lang.Class({
             }
         }
 
-        this._muteInput();
-
-        Tweener.removeTweens(this);
-        Tweener.addTween(this, { opacity: fade ? 0 : 255,
+        Tweener.addTween(this, { opacity: 0,
                                  xOffset: xOffset,
                                  yOffset: yOffset,
                                  transition: 'linear',
-                                 time: animationTime,
+                                 time: POPUP_ANIMATION_TIME,
                                  onComplete: Lang.bind(this, function () {
                                      this.actor.hide();
-                                     this.opacity = 0;
                                      this.xOffset = 0;
                                      this.yOffset = 0;
                                      if (onComplete)
@@ -188,9 +138,7 @@ const BoxPointer = new Lang.Class({
     },
 
     _getPreferredHeight: function(actor, forWidth, alloc) {
-        let themeNode = this.actor.get_theme_node();
-        let borderWidth = themeNode.get_length('-arrow-border-width');
-        let [minSize, naturalSize] = this.bin.get_preferred_height(forWidth - 2 * borderWidth);
+        let [minSize, naturalSize] = this.bin.get_preferred_height(forWidth);
         alloc.min_size = minSize;
         alloc.natural_size = naturalSize;
         this._adjustAllocationForArrow(false, alloc);
@@ -230,28 +178,13 @@ const BoxPointer = new Lang.Class({
         }
         this.bin.allocate(childBox, flags);
 
-        if (this._sourceActor && this._sourceActor.mapped) {
-            this._reposition();
-            this._updateFlip();
-        }
+        if (this._sourceActor && this._sourceActor.mapped)
+            this._reposition(this._sourceActor, this._arrowAlignment);
     },
 
     _drawBorder: function(area) {
         let themeNode = this.actor.get_theme_node();
 
-        if (this._arrowActor) {
-            let [sourceX, sourceY] = this._arrowActor.get_transformed_position();
-            let [sourceWidth, sourceHeight] = this._arrowActor.get_transformed_size();
-            let [absX, absY] = this.actor.get_transformed_position();
-
-            if (this._arrowSide == St.Side.TOP ||
-                this._arrowSide == St.Side.BOTTOM) {
-                this._arrowOrigin = sourceX - absX + sourceWidth / 2;
-            } else {
-                this._arrowOrigin = sourceY - absY + sourceHeight / 2;
-            }
-        }
-
         let borderWidth = themeNode.get_length('-arrow-border-width');
         let base = themeNode.get_length('-arrow-base');
         let rise = themeNode.get_length('-arrow-rise');
@@ -260,6 +193,7 @@ const BoxPointer = new Lang.Class({
         let halfBorder = borderWidth / 2;
         let halfBase = Math.floor(base/2);
 
+        let borderColor = themeNode.get_color('-arrow-border-color');
         let backgroundColor = themeNode.get_color('-arrow-background-color');
 
         let [width, height] = area.get_surface_size();
@@ -270,6 +204,7 @@ const BoxPointer = new Lang.Class({
             boxWidth -= rise;
         }
         let cr = area.get_context();
+        Clutter.cairo_set_source_color(cr, borderColor);
 
         // Translate so that box goes from 0,0 to boxWidth,boxHeight,
         // with the arrow poking out of that
@@ -282,51 +217,14 @@ const BoxPointer = new Lang.Class({
         let [x1, y1] = [halfBorder, halfBorder];
         let [x2, y2] = [boxWidth - halfBorder, boxHeight - halfBorder];
 
-        let skipTopLeft = false;
-        let skipTopRight = false;
-        let skipBottomLeft = false;
-        let skipBottomRight = false;
-
-        switch (this._arrowSide) {
-        case St.Side.TOP:
-            if (this._arrowOrigin == x1)
-                skipTopLeft = true;
-            else if (this._arrowOrigin == x2)
-                skipTopRight = true;
-            break;
-
-        case St.Side.RIGHT:
-            if (this._arrowOrigin == y1)
-                skipTopRight = true;
-            else if (this._arrowOrigin == y2)
-                skipBottomRight = true;
-            break;
-
-        case St.Side.BOTTOM:
-            if (this._arrowOrigin == x1)
-                skipBottomLeft = true;
-            else if (this._arrowOrigin == x2)
-                skipBottomRight = true;
-            break;
-
-        case St.Side.LEFT:
-            if (this._arrowOrigin == y1)
-                skipTopLeft = true;
-            else if (this._arrowOrigin == y2)
-                skipBottomLeft = true;
-            break;
-        }
-
         cr.moveTo(x1 + borderRadius, y1);
         if (this._arrowSide == St.Side.TOP) {
-            if (skipTopLeft) {
-                cr.moveTo(x1, y2 - borderRadius);
-                cr.lineTo(x1, y1 - rise);
-                cr.lineTo(x1 + halfBase, y1);
-            } else if (skipTopRight) {
-                cr.lineTo(x2 - halfBase, y1);
-                cr.lineTo(x2, y1 - rise);
-                cr.lineTo(x2, y1 + borderRadius);
+            if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
+                cr.lineTo(this._arrowOrigin, y1 - rise);
+                cr.lineTo(Math.max(x1 + borderRadius, this._arrowOrigin) + halfBase, y1);
+            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
+                cr.lineTo(Math.min(x2 - borderRadius, this._arrowOrigin) - halfBase, y1);
+                cr.lineTo(this._arrowOrigin, y1 - rise);
             } else {
                 cr.lineTo(this._arrowOrigin - halfBase, y1);
                 cr.lineTo(this._arrowOrigin, y1 - rise);
@@ -334,20 +232,19 @@ const BoxPointer = new Lang.Class({
             }
         }
 
-        if (!skipTopRight) {
-            cr.lineTo(x2 - borderRadius, y1);
-            cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
-                   3*Math.PI/2, Math.PI*2);
-        }
+        cr.lineTo(x2 - borderRadius, y1);
+
+        // top-right corner
+        cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
+               3*Math.PI/2, Math.PI*2);
 
         if (this._arrowSide == St.Side.RIGHT) {
-            if (skipTopRight) {
-                cr.lineTo(x2 + rise, y1);
-                cr.lineTo(x2 + rise, y1 + halfBase);
-            } else if (skipBottomRight) {
-                cr.lineTo(x2, y2 - halfBase);
-                cr.lineTo(x2 + rise, y2);
-                cr.lineTo(x2 - borderRadius, y2);
+            if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
+                cr.lineTo(x2 + rise, this._arrowOrigin);
+                cr.lineTo(x2, Math.max(y1 + borderRadius, this._arrowOrigin) + halfBase);
+            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
+                cr.lineTo(x2, Math.min(y2 - borderRadius, this._arrowOrigin) - halfBase);
+                cr.lineTo(x2 + rise, this._arrowOrigin);
             } else {
                 cr.lineTo(x2, this._arrowOrigin - halfBase);
                 cr.lineTo(x2 + rise, this._arrowOrigin);
@@ -355,20 +252,19 @@ const BoxPointer = new Lang.Class({
             }
         }
 
-        if (!skipBottomRight) {
-            cr.lineTo(x2, y2 - borderRadius);
-            cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
-                   0, Math.PI/2);
-        }
+        cr.lineTo(x2, y2 - borderRadius);
+
+        // bottom-right corner
+        cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
+               0, Math.PI/2);
 
         if (this._arrowSide == St.Side.BOTTOM) {
-            if (skipBottomLeft) {
-                cr.lineTo(x1 + halfBase, y2);
-                cr.lineTo(x1, y2 + rise);
-                cr.lineTo(x1, y2 - borderRadius);
-            } else if (skipBottomRight) {
-                cr.lineTo(x2, y2 + rise);
-                cr.lineTo(x2 - halfBase, y2);
+            if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
+                cr.lineTo(Math.max(x1 + borderRadius, this._arrowOrigin) + halfBase, y2);
+                cr.lineTo(this._arrowOrigin, y2 + rise);
+            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
+                cr.lineTo(this._arrowOrigin, y2 + rise);
+                cr.lineTo(Math.min(x2 - borderRadius, this._arrowOrigin) - halfBase, y2);
             } else {
                 cr.lineTo(this._arrowOrigin + halfBase, y2);
                 cr.lineTo(this._arrowOrigin, y2 + rise);
@@ -376,20 +272,19 @@ const BoxPointer = new Lang.Class({
             }
         }
 
-        if (!skipBottomLeft) {
-            cr.lineTo(x1 + borderRadius, y2);
-            cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
-                   Math.PI/2, Math.PI);
-        }
+        cr.lineTo(x1 + borderRadius, y2);
+
+        // bottom-left corner
+        cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
+               Math.PI/2, Math.PI);
 
         if (this._arrowSide == St.Side.LEFT) {
-            if (skipTopLeft) {
-                cr.lineTo(x1, y1 + halfBase);
-                cr.lineTo(x1 - rise, y1);
-                cr.lineTo(x1 + borderRadius, y1);
-            } else if (skipBottomLeft) {
-                cr.lineTo(x1 - rise, y2)
-                cr.lineTo(x1 - rise, y2 - halfBase);
+            if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
+                cr.lineTo(x1, Math.max(y1 + borderRadius, this._arrowOrigin) + halfBase);
+                cr.lineTo(x1 - rise, this._arrowOrigin);
+            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
+                cr.lineTo(x1 - rise, this._arrowOrigin);
+                cr.lineTo(x1, Math.min(y2 - borderRadius, this._arrowOrigin) - halfBase);
             } else {
                 cr.lineTo(x1, this._arrowOrigin + halfBase);
                 cr.lineTo(x1 - rise, this._arrowOrigin);
@@ -397,23 +292,17 @@ const BoxPointer = new Lang.Class({
             }
         }
 
-        if (!skipTopLeft) {
-            cr.lineTo(x1, y1 + borderRadius);
-            cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
-                   Math.PI, 3*Math.PI/2);
-        }
+        cr.lineTo(x1, y1 + borderRadius);
+
+        // top-left corner
+        cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
+               Math.PI, 3*Math.PI/2);
 
         Clutter.cairo_set_source_color(cr, backgroundColor);
         cr.fillPreserve();
-
-        if (borderWidth > 0) {
-            let borderColor = themeNode.get_color('-arrow-border-color');
-            Clutter.cairo_set_source_color(cr, borderColor);
-            cr.setLineWidth(borderWidth);
-            cr.stroke();
-        }
-
-        cr.$dispose();
+        Clutter.cairo_set_source_color(cr, borderColor);
+        cr.setLineWidth(borderWidth);
+        cr.stroke();
     },
 
     setPosition: function(sourceActor, alignment) {
@@ -424,8 +313,7 @@ const BoxPointer = new Lang.Class({
         this._sourceActor = sourceActor;
         this._arrowAlignment = alignment;
 
-        this._reposition();
-        this._updateFlip();
+        this._reposition(sourceActor, alignment);
     },
 
     setSourceAlignment: function(alignment) {
@@ -434,13 +322,14 @@ const BoxPointer = new Lang.Class({
         if (!this._sourceActor)
             return;
 
-        this.setPosition(this._sourceActor, this._arrowAlignment);
+        // We need to show it now to force an allocation,
+        // so that we can query the correct size.
+        this.actor.show();
+
+        this._reposition(this._sourceActor, this._arrowAlignment);
     },
 
-    _reposition: function() {
-        let sourceActor = this._sourceActor;
-        let alignment = this._arrowAlignment;
-
+    _reposition: function(sourceActor, alignment) {
         // Position correctly relative to the sourceActor
         let sourceNode = sourceActor.get_theme_node();
         let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());
@@ -458,9 +347,10 @@ const BoxPointer = new Lang.Class({
         let arrowBase = themeNode.get_length('-arrow-base');
         let borderRadius = themeNode.get_length('-arrow-border-radius');
         let margin = (4 * borderRadius + borderWidth + arrowBase);
+        let halfMargin = margin / 2;
 
+        let themeNode = this.actor.get_theme_node();
         let gap = themeNode.get_length('-boxpointer-gap');
-        let padding = themeNode.get_length('-arrow-rise');
 
         let resX, resY;
 
@@ -479,66 +369,29 @@ const BoxPointer = new Lang.Class({
             break;
         }
 
-        // Now align and position the pointing axis, making sure it fits on
-        // screen. If the arrowOrigin is so close to the edge that the arrow
-        // will not be isosceles, we try to compensate as follows:
-        //   - We skip the rounded corner and settle for a right angled arrow
-        //     as shown below. See _drawBorder for further details.
-        //     |\_____
-        //     |
-        //     |
-        //   - If the arrow was going to be acute angled, we move the position
-        //     of the box to maintain the arrow's accuracy.
-
-        let arrowOrigin;
-        let halfBase = Math.floor(arrowBase/2);
-        let halfBorder = borderWidth / 2;
-        let halfMargin = margin / 2;
-        let [x1, y1] = [halfBorder, halfBorder];
-        let [x2, y2] = [natWidth - halfBorder, natHeight - halfBorder];
-
+        // Now align and position the pointing axis, making sure
+        // it fits on screen
         switch (this._arrowSide) {
         case St.Side.TOP:
         case St.Side.BOTTOM:
             resX = sourceCenterX - (halfMargin + (natWidth - margin) * alignment);
 
-            resX = Math.max(resX, monitor.x + padding);
-            resX = Math.min(resX, monitor.x + monitor.width - (padding + natWidth));
-
-            arrowOrigin = sourceCenterX - resX;
-            if (arrowOrigin <= (x1 + (borderRadius + halfBase))) {
-                if (arrowOrigin > x1)
-                    resX += (arrowOrigin - x1);
-                arrowOrigin = x1;
-            } else if (arrowOrigin >= (x2 - (borderRadius + halfBase))) {
-                if (arrowOrigin < x2)
-                    resX -= (x2 - arrowOrigin);
-                arrowOrigin = x2;
-            }
+            resX = Math.max(resX, monitor.x + 10);
+            resX = Math.min(resX, monitor.x + monitor.width - (10 + natWidth));
+            this.setArrowOrigin(sourceCenterX - resX);
             break;
 
         case St.Side.LEFT:
         case St.Side.RIGHT:
             resY = sourceCenterY - (halfMargin + (natHeight - margin) * alignment);
 
-            resY = Math.max(resY, monitor.y + padding);
-            resY = Math.min(resY, monitor.y + monitor.height - (padding + natHeight));
+            resY = Math.max(resY, monitor.y + 10);
+            resY = Math.min(resY, monitor.y + monitor.height - (10 + natHeight));
 
-            arrowOrigin = sourceCenterY - resY;
-            if (arrowOrigin <= (y1 + (borderRadius + halfBase))) {
-                if (arrowOrigin > y1)
-                    resY += (arrowOrigin - y1);
-                arrowOrigin = y1;
-            } else if (arrowOrigin >= (y2 - (borderRadius + halfBase))) {
-                if (arrowOrigin < y2)
-                    resX -= (y2 - arrowOrigin);
-                arrowOrigin = y2;
-            }
+            this.setArrowOrigin(sourceCenterY - resY);
             break;
         }
 
-        this.setArrowOrigin(arrowOrigin);
-
         let parent = this.actor.get_parent();
         let success, x, y;
         while (!success) {
@@ -561,20 +414,10 @@ const BoxPointer = new Lang.Class({
         }
     },
 
-    // @actor: an actor relative to which the arrow is positioned.
-    // Differently from setPosition, this will not move the boxpointer itself,
-    // on the arrow
-    setArrowActor: function(actor) {
-        if (this._arrowActor != actor) {
-            this._arrowActor = actor;
-            this._border.queue_repaint();
-        }
-    },
-
     _shiftActor : function() {
         // Since the position of the BoxPointer depends on the allocated size
         // of the BoxPointer and the position of the source actor, trying
-        // to position the BoxPointer via the x/y properties will result in
+        // to position the BoxPoiner via the x/y properties will result in
         // allocation loops and warnings. Instead we do the positioning via
         // the anchor point, which is independent of allocation, and leave
         // x == y == 0.
@@ -582,51 +425,6 @@ const BoxPointer = new Lang.Class({
                                     -(this._yPosition + this._yOffset));
     },
 
-    _calculateArrowSide: function(arrowSide) {
-        let sourceAllocation = Shell.util_get_transformed_allocation(this._sourceActor);
-        let [minWidth, minHeight, boxWidth, boxHeight] = this._container.get_preferred_size();
-        let monitor = Main.layoutManager.findMonitorForActor(this.actor);
-
-        switch (arrowSide) {
-        case St.Side.TOP:
-            if (sourceAllocation.y2 + boxHeight > monitor.y + monitor.height &&
-                boxHeight < sourceAllocation.y1 - monitor.y)
-                return St.Side.BOTTOM;
-            break;
-        case St.Side.BOTTOM:
-            if (sourceAllocation.y1 - boxHeight < monitor.y &&
-                boxHeight < monitor.y + monitor.height - sourceAllocation.y2)
-                return St.Side.TOP;
-            break;
-        case St.Side.LEFT:
-            if (sourceAllocation.x2 + boxWidth > monitor.x + monitor.width &&
-                boxWidth < sourceAllocation.x1 - monitor.x)
-                return St.Side.RIGHT;
-            break;
-        case St.Side.RIGHT:
-            if (sourceAllocation.x1 - boxWidth < monitor.x &&
-                boxWidth < monitor.x + monitor.width - sourceAllocation.x2)
-                return St.Side.LEFT;
-            break;
-        }
-
-        return arrowSide;
-    },
-
-    _updateFlip: function() {
-        let arrowSide = this._calculateArrowSide(this._userArrowSide);
-        if (this._arrowSide != arrowSide) {
-            this._arrowSide = arrowSide;
-            this._reposition();
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-                this._container.queue_relayout();
-                return false;
-            }));
-
-            this.emit('arrow-side-changed');
-        }
-    },
-
     set xOffset(offset) {
         this._xOffset = offset;
         this._shiftActor();
@@ -651,21 +449,5 @@ const BoxPointer = new Lang.Class({
 
     get opacity() {
         return this.actor.opacity;
-    },
-
-    updateArrowSide: function(side) {
-        this._arrowSide = side;
-        this._border.queue_repaint();
-
-        this.emit('arrow-side-changed');
-    },
-
-    getPadding: function(side) {
-        return this.bin.get_theme_node().get_padding(side);
-    },
-
-    getArrowHeight: function() {
-        return this.actor.get_theme_node().get_length('-arrow-rise');
     }
 });
-Signals.addSignalMethods(BoxPointer.prototype);

js/ui/calendar.js

@@ -2,7 +2,6 @@
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const St = imports.gi.St;
 const Signals = imports.signals;
@@ -12,23 +11,22 @@ const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
 
 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
+const WEEKDATE_HEADER_WIDTH_DIGITS = 3;
 const SHOW_WEEKDATE_KEY = 'show-weekdate';
 
 // in org.gnome.desktop.interface
 const CLOCK_FORMAT_KEY        = 'clock-format';
 
+function _sameDay(dateA, dateB) {
+    return (dateA.getDate() == dateB.getDate() &&
+            dateA.getMonth() == dateB.getMonth() &&
+            dateA.getYear() == dateB.getYear());
+}
+
 function _sameYear(dateA, dateB) {
     return (dateA.getYear() == dateB.getYear());
 }
 
-function _sameMonth(dateA, dateB) {
-    return _sameYear(dateA, dateB) && (dateA.getMonth() == dateB.getMonth());
-}
-
-function _sameDay(dateA, dateB) {
-    return _sameMonth(dateA, dateB) && (dateA.getDate() == dateB.getDate());
-}
-
 /* TODO: maybe needs config - right now we assume that Saturday and
  * Sunday are non-work days (not true in e.g. Israel, it's Sunday and
  * Monday there)
@@ -65,18 +63,15 @@ function _formatEventTime(event, clockFormat) {
     } else {
         switch (clockFormat) {
         case '24h':
-            /* Translators: Shown in calendar event list, if 24h format,
-               \u2236 is a ratio character, similar to : */
-            ret = event.date.toLocaleFormat(C_("event list time", "%H\u2236%M"));
+            /* Translators: Shown in calendar event list, if 24h format */
+            ret = event.date.toLocaleFormat(C_("event list time", "%H:%M"));
             break;
 
         default:
             /* explicit fall-through */
         case '12h':
-            /* Translators: Shown in calendar event list, if 12h format,
-               \u2236 is a ratio character, similar to : and \u2009 is
-               a thin space */
-            ret = event.date.toLocaleFormat(C_("event list time", "%l\u2236%M\u2009%p"));
+            /* Transators: Shown in calendar event list, if 12h format */
+            ret = event.date.toLocaleFormat(C_("event list time", "%l:%M %p"));
             break;
         }
     }
@@ -100,6 +95,15 @@ function _getCalendarWeekForDate(date) {
     return weekNumber;
 }
 
+function _getDigitWidth(actor){
+    let context = actor.get_pango_context();
+    let themeNode = actor.get_theme_node();
+    let font = themeNode.get_font();
+    let metrics = context.get_metrics(font, context.get_language());
+    let width = metrics.get_approximate_digit_width();
+    return width;
+}
+
 function _getCalendarDayAbbreviation(dayNumber) {
     let abbreviations = [
         /* Translators: Calendar grid abbreviation for Sunday.
@@ -170,12 +174,6 @@ const EmptyEventSource = new Lang.Class({
     Name: 'EmptyEventSource',
 
     _init: function() {
-        this.isLoading = false;
-        this.isDummy = true;
-        this.hasCalendars = false;
-    },
-
-    destroy: function() {
     },
 
     requestRange: function(begin, end) {
@@ -192,27 +190,29 @@ const EmptyEventSource = new Lang.Class({
 });
 Signals.addSignalMethods(EmptyEventSource.prototype);
 
-const CalendarServerIface = '<node> \
-<interface name="org.gnome.Shell.CalendarServer"> \
-<method name="GetEvents"> \
-    <arg type="x" direction="in" /> \
-    <arg type="x" direction="in" /> \
-    <arg type="b" direction="in" /> \
-    <arg type="a(sssbxxa{sv})" direction="out" /> \
-</method> \
-<property name="HasCalendars" type="b" access="read" /> \
-<signal name="Changed" /> \
-</interface> \
-</node>';
+const CalendarServerIface = <interface name="org.gnome.Shell.CalendarServer">
+<method name="GetEvents">
+    <arg type="x" direction="in" />
+    <arg type="x" direction="in" />
+    <arg type="b" direction="in" />
+    <arg type="a(sssbxxa{sv})" direction="out" />
+</method>
+<signal name="Changed" />
+</interface>;
 
 const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);
 
 function CalendarServer() {
-    return new Gio.DBusProxy({ g_connection: Gio.DBus.session,
-                               g_interface_name: CalendarServerInfo.name,
-                               g_interface_info: CalendarServerInfo,
-                               g_name: 'org.gnome.Shell.CalendarServer',
-                               g_object_path: '/org/gnome/Shell/CalendarServer' });
+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
+				   g_interface_name: CalendarServerInfo.name,
+				   g_interface_info: CalendarServerInfo,
+				   g_name: 'org.gnome.Shell.CalendarServer',
+				   g_object_path: '/org/gnome/Shell/CalendarServer',
+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
+                                             Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
+
+    self.init(null);
+    return self;
 }
 
 function _datesEqual(a, b) {
@@ -239,49 +239,18 @@ const DBusEventSource = new Lang.Class({
 
     _init: function() {
         this._resetCache();
-        this.isLoading = false;
-        this.isDummy = false;
 
-        this._initialized = false;
         this._dbusProxy = new CalendarServer();
-        this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(object, result) {
-            try {
-                this._dbusProxy.init_finish(result);
-            } catch(e) {
-                log('Error loading calendars: ' + e.message);
-                return;
-            }
+        this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
 
-            this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
-
-            this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
-                if (this._dbusProxy.g_name_owner)
-                    this._onNameAppeared();
-                else
-                    this._onNameVanished();
-            }));
-
-            this._dbusProxy.connect('g-properties-changed', Lang.bind(this, function() {
-                this.emit('notify::has-calendars');
-            }));
-
-            this._initialized = true;
-            this.emit('notify::has-calendars');
-            this._onNameAppeared();
+        this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
+            if (this._dbusProxy.g_name_owner)
+                this._onNameAppeared();
+            else
+                this._onNameVanished();
         }));
     },
 
-    destroy: function() {
-        this._dbusProxy.run_dispose();
-    },
-
-    get hasCalendars() {
-        if (this._initialized)
-            return this._dbusProxy.HasCalendars;
-        else
-            return false;
-    },
-
     _resetCache: function() {
         this._events = [];
         this._lastRequestBegin = null;
@@ -302,9 +271,8 @@ const DBusEventSource = new Lang.Class({
         this._loadEvents(false);
     },
 
-    _onEventsReceived: function(results, error) {
+    _onEventsReceived: function([appointments]) {
         let newEvents = [];
-        let appointments = results ? results[0] : null;
         if (appointments != null) {
             for (let n = 0; n < appointments.length; n++) {
                 let a = appointments[n];
@@ -321,32 +289,29 @@ const DBusEventSource = new Lang.Class({
         }
 
         this._events = newEvents;
-        this.isLoading = false;
         this.emit('changed');
     },
 
     _loadEvents: function(forceReload) {
-        // Ignore while loading
-        if (!this._initialized)
-            return;
-
         if (this._curRequestBegin && this._curRequestEnd){
+            let callFlags = Gio.DBusCallFlags.NO_AUTO_START;
+            if (forceReload)
+                callFlags = Gio.DBusCallFlags.NONE;
             this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
                                             this._curRequestEnd.getTime() / 1000,
                                             forceReload,
                                             Lang.bind(this, this._onEventsReceived),
-                                            Gio.DBusCallFlags.NONE);
+                                            callFlags);
         }
     },
 
-    requestRange: function(begin, end) {
-        if (!(_datesEqual(begin, this._lastRequestBegin) && _datesEqual(end, this._lastRequestEnd))) {
-            this.isLoading = true;
+    requestRange: function(begin, end, forceReload) {
+        if (forceReload || !(_datesEqual(begin, this._lastRequestBegin) && _datesEqual(end, this._lastRequestEnd))) {
             this._lastRequestBegin = begin;
             this._lastRequestEnd = end;
             this._curRequestBegin = begin;
             this._curRequestEnd = end;
-            this._loadEvents(false);
+            this._loadEvents(forceReload);
         }
     },
 
@@ -375,11 +340,25 @@ const DBusEventSource = new Lang.Class({
 });
 Signals.addSignalMethods(DBusEventSource.prototype);
 
+// Calendar:
+// @eventSource: is an object implementing the EventSource API, e.g. the
+// requestRange(), getEvents(), hasEvents() methods and the ::changed signal.
 const Calendar = new Lang.Class({
     Name: 'Calendar',
 
-    _init: function() {
+    _init: function(eventSource) {
+        if (eventSource) {
+            this._eventSource = eventSource;
+
+            this._eventSource.connect('changed', Lang.bind(this,
+                                                           function() {
+                                                               this._update(false);
+                                                           }));
+        }
+
         this._weekStart = Shell.util_get_week_start();
+        this._weekdate = NaN;
+        this._digitWidth = NaN;
         this._settings = new Gio.Settings({ schema: 'org.gnome.shell.calendar' });
 
         this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, Lang.bind(this, this._onSettingsChange));
@@ -413,50 +392,39 @@ const Calendar = new Lang.Class({
         this._buildHeader ();
     },
 
-    // @eventSource: is an object implementing the EventSource API, e.g. the
-    // requestRange(), getEvents(), hasEvents() methods and the ::changed signal.
-    setEventSource: function(eventSource) {
-        this._eventSource = eventSource;
-        this._eventSource.connect('changed', Lang.bind(this, function() {
-            this._update();
-        }));
-        this._update();
-    },
-
     // Sets the calendar to show a specific date
-    setDate: function(date) {
-        if (_sameDay(date, this._selectedDate))
-            return;
-
-        this._selectedDate = date;
-        this._update();
-        this.emit('selected-date-changed', new Date(this._selectedDate));
+    setDate: function(date, forceReload) {
+        if (!_sameDay(date, this._selectedDate)) {
+            this._selectedDate = date;
+            this._update(forceReload);
+            this.emit('selected-date-changed', new Date(this._selectedDate));
+        } else {
+            if (forceReload)
+                this._update(forceReload);
+        }
     },
 
     _buildHeader: function() {
         let offsetCols = this._useWeekdate ? 1 : 0;
-        this.actor.destroy_all_children();
+        this.actor.destroy_children();
 
         // Top line of the calendar '<| September 2009 |>'
         this._topBox = new St.BoxLayout();
         this.actor.add(this._topBox,
                        { row: 0, col: 0, col_span: offsetCols + 7 });
 
-        this._backButton = new St.Button({ style_class: 'calendar-change-month-back',
-                                           accessible_name: _("Previous month"),
-                                           can_focus: true });
-        this._topBox.add(this._backButton);
-        this._backButton.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));
+        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChange));
 
-        this._monthLabel = new St.Label({style_class: 'calendar-month-label',
-                                         can_focus: true });
+        let back = new St.Button({ style_class: 'calendar-change-month-back' });
+        this._topBox.add(back);
+        back.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));
+
+        this._monthLabel = new St.Label({style_class: 'calendar-month-label'});
         this._topBox.add(this._monthLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
 
-        this._forwardButton = new St.Button({ style_class: 'calendar-change-month-forward',
-                                              accessible_name: _("Next month"),
-                                              can_focus: true });
-        this._topBox.add(this._forwardButton);
-        this._forwardButton.connect('clicked', Lang.bind(this, this._onNextMonthButtonClicked));
+        let forward = new St.Button({ style_class: 'calendar-change-month-forward' });
+        this._topBox.add(forward);
+        forward.connect('clicked', Lang.bind(this, this._onNextMonthButtonClicked));
 
         // Add weekday labels...
         //
@@ -480,7 +448,19 @@ const Calendar = new Lang.Class({
         }
 
         // All the children after this are days, and get removed when we update the calendar
-        this._firstDayIndex = this.actor.get_n_children();
+        this._firstDayIndex = this.actor.get_children().length;
+    },
+
+    _onStyleChange: function(actor, event) {
+        // width of a digit in pango units
+        this._digitWidth = _getDigitWidth(this.actor) / Pango.SCALE;
+        this._setWeekdateHeaderWidth();
+    },
+
+    _setWeekdateHeaderWidth: function() {
+        if (this.digitWidth != NaN && this._useWeekdate && this._weekdateHeader) {
+            this._weekdateHeader.set_width (this._digitWidth * WEEKDATE_HEADER_WIDTH_DIGITS);
+        }
     },
 
     _onScroll : function(actor, event) {
@@ -494,7 +474,6 @@ const Calendar = new Lang.Class({
             this._onNextMonthButtonClicked();
             break;
         }
-        return Clutter.EVENT_PROPAGATE;
     },
 
     _onPrevMonthButtonClicked: function() {
@@ -516,12 +495,10 @@ const Calendar = new Lang.Class({
             }
         }
 
-        this._backButton.grab_key_focus();
+        this.setDate(newDate, false);
+   },
 
-        this.setDate(newDate);
-    },
-
-    _onNextMonthButtonClicked: function() {
+   _onNextMonthButtonClicked: function() {
         let newDate = new Date(this._selectedDate);
         let oldMonth = newDate.getMonth();
         if (oldMonth == 11) {
@@ -540,91 +517,61 @@ const Calendar = new Lang.Class({
             }
         }
 
-        this._forwardButton.grab_key_focus();
-
-        this.setDate(newDate);
+       this.setDate(newDate, false);
     },
 
     _onSettingsChange: function() {
         this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
         this._buildHeader();
-        this._update();
+        this._update(false);
     },
 
-    _rebuildCalendar: function() {
+    _update: function(forceReload) {
         let now = new Date();
 
+        if (_sameYear(this._selectedDate, now))
+            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormatWithoutYear);
+        else
+            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormat);
+
         // Remove everything but the topBox and the weekday labels
         let children = this.actor.get_children();
         for (let i = this._firstDayIndex; i < children.length; i++)
             children[i].destroy();
 
-        this._buttons = [];
-
         // Start at the beginning of the week before the start of the month
-        //
-        // We want to show always 6 weeks (to keep the calendar menu at the same
-        // height if there are no events), so we pad it according to the following
-        // policy:
-        //
-        // 1 - If a month has 6 weeks, we place no padding (example: Dec 2012)
-        // 2 - If a month has 5 weeks and it starts on week start, we pad one week
-        //     before it (example: Apr 2012)
-        // 3 - If a month has 5 weeks and it starts on any other day, we pad one week
-        //     after it (example: Nov 2012)
-        // 4 - If a month has 4 weeks, we pad one week before and one after it
-        //     (example: Feb 2010)
-        //
-        // Actually computing the number of weeks is complex, but we know that the
-        // problematic categories (2 and 4) always start on week start, and that
-        // all months at the end have 6 weeks.
         let beginDate = new Date(this._selectedDate);
         beginDate.setDate(1);
         beginDate.setSeconds(0);
         beginDate.setHours(12);
-
-        this._calendarBegin = new Date(beginDate);
-
-        let year = beginDate.getYear();
-
         let daysToWeekStart = (7 + beginDate.getDay() - this._weekStart) % 7;
-        let startsOnWeekStart = daysToWeekStart == 0;
-        let weekPadding = startsOnWeekStart ? 7 : 0;
-
-        beginDate.setTime(beginDate.getTime() - (weekPadding + daysToWeekStart) * MSECS_IN_DAY);
+        beginDate.setTime(beginDate.getTime() - daysToWeekStart * MSECS_IN_DAY);
 
         let iter = new Date(beginDate);
         let row = 2;
-        // nRows here means 6 weeks + one header + one navbar
-        let nRows = 8;
-        while (row < 8) {
-            let button = new St.Button({ label: iter.getDate().toString(),
-                                         can_focus: true });
-            let rtl = button.get_text_direction() == Clutter.TextDirection.RTL;
+        while (true) {
+            let button = new St.Button({ label: iter.getDate().toString() });
 
-            if (this._eventSource.isDummy)
+            if (!this._eventSource)
                 button.reactive = false;
 
-            button._date = new Date(iter);
+            let iterStr = iter.toUTCString();
             button.connect('clicked', Lang.bind(this, function() {
-                this.setDate(button._date);
+                let newlySelectedDate = new Date(iterStr);
+                this.setDate(newlySelectedDate, false);
             }));
 
-            let hasEvents = this._eventSource.hasEvents(iter);
+            let hasEvents = this._eventSource && this._eventSource.hasEvents(iter);
             let styleClass = 'calendar-day-base calendar-day';
-
             if (_isWorkDay(iter))
-                styleClass += ' calendar-work-day';
+                styleClass += ' calendar-work-day'
             else
-                styleClass += ' calendar-nonwork-day';
+                styleClass += ' calendar-nonwork-day'
 
             // Hack used in lieu of border-collapse - see gnome-shell.css
             if (row == 2)
                 styleClass = 'calendar-day-top ' + styleClass;
-
-            let leftMost = rtl ? iter.getDay() == (this._weekStart + 6) % 7
-                               : iter.getDay() == this._weekStart;
-            if (leftMost)
+            if (iter.getDay() == this._weekStart)
                 styleClass = 'calendar-day-left ' + styleClass;
 
             if (_sameDay(now, iter))
@@ -632,8 +579,11 @@ const Calendar = new Lang.Class({
             else if (iter.getMonth() != this._selectedDate.getMonth())
                 styleClass += ' calendar-other-month-day';
 
+            if (_sameDay(this._selectedDate, iter))
+                button.add_style_pseudo_class('active');
+
             if (hasEvents)
-                styleClass += ' calendar-day-with-events';
+                styleClass += ' calendar-day-with-events'
 
             button.style_class = styleClass;
 
@@ -641,8 +591,6 @@ const Calendar = new Lang.Class({
             this.actor.add(button,
                            { row: row, col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7 });
 
-            this._buttons.push(button);
-
             if (this._useWeekdate && iter.getDay() == 4) {
                 let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
                                            style_class: 'calendar-day-base calendar-week-number'});
@@ -651,33 +599,17 @@ const Calendar = new Lang.Class({
             }
 
             iter.setTime(iter.getTime() + MSECS_IN_DAY);
-
-            if (iter.getDay() == this._weekStart)
+            if (iter.getDay() == this._weekStart) {
+                // We stop on the first "first day of the week" after the month we are displaying
+                if (iter.getMonth() > this._selectedDate.getMonth() || iter.getYear() > this._selectedDate.getYear())
+                    break;
                 row++;
+            }
         }
-
         // Signal to the event source that we are interested in events
         // only from this date range
-        this._eventSource.requestRange(beginDate, iter);
-    },
-
-    _update: function() {
-        let now = new Date();
-
-        if (_sameYear(this._selectedDate, now))
-            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormatWithoutYear);
-        else
-            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormat);
-
-        if (!this._calendarBegin || !_sameMonth(this._selectedDate, this._calendarBegin))
-            this._rebuildCalendar();
-
-        this._buttons.forEach(Lang.bind(this, function(button) {
-            if (_sameDay(button._date, this._selectedDate))
-                button.add_style_pseudo_class('active');
-            else
-                button.remove_style_pseudo_class('active');
-        }));
+        if (this._eventSource)
+            this._eventSource.requestRange(beginDate, iter, forceReload);
     }
 });
 
@@ -686,89 +618,74 @@ Signals.addSignalMethods(Calendar.prototype);
 const EventsList = new Lang.Class({
     Name: 'EventsList',
 
-    _init: function() {
-        this.actor = new St.Table({ style_class: 'events-table' });
+    _init: function(eventSource) {
+        this.actor = new St.BoxLayout({ vertical: true, style_class: 'events-header-vbox'});
         this._date = new Date();
+        this._eventSource = eventSource;
+        this._eventSource.connect('changed', Lang.bind(this, this._update));
         this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
         this._desktopSettings.connect('changed', Lang.bind(this, this._update));
         this._weekStart = Shell.util_get_week_start();
+
+        this._update();
     },
 
-    setEventSource: function(eventSource) {
-        this._eventSource = eventSource;
-        this._eventSource.connect('changed', Lang.bind(this, this._update));
+    _addEvent: function(dayNameBox, timeBox, eventTitleBox, includeDayName, day, time, desc) {
+        if (includeDayName) {
+            dayNameBox.add(new St.Label( { style_class: 'events-day-dayname',
+                                           text: day } ),
+                           { x_fill: true } );
+        }
+        timeBox.add(new St.Label( { style_class: 'events-day-time',
+                                    text: time} ),
+                    { x_fill: true } );
+        eventTitleBox.add(new St.Label( { style_class: 'events-day-task',
+                                          text: desc} ));
     },
 
-    _addEvent: function(event, index, includeDayName) {
-        let dayString;
-        if (includeDayName)
-            dayString = _getEventDayAbbreviation(event.date.getDay());
-        else
-            dayString = '';
+    _addPeriod: function(header, begin, end, includeDayName, showNothingScheduled) {
+        if (!this._eventSource)
+            return;
 
-        let dayLabel = new St.Label({ style_class: 'events-day-dayname',
-                                      text: dayString });
-        dayLabel.clutter_text.line_wrap = false;
-        dayLabel.clutter_text.ellipsize = false;
-
-        this.actor.add(dayLabel, { row: index, col: 0,
-                                   x_expand: false, x_align: St.Align.END,
-                                   y_fill: false, y_align: St.Align.START });
-
-        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
-        let timeString = _formatEventTime(event, clockFormat);
-        let timeLabel = new St.Label({ style_class: 'events-day-time',
-                                       text: timeString });
-        timeLabel.clutter_text.line_wrap = false;
-        timeLabel.clutter_text.ellipsize = false;
-
-        this.actor.add(timeLabel, { row: index, col: 1,
-                                    x_expand: false, x_align: St.Align.MIDDLE,
-                                    y_fill: false, y_align: St.Align.START });
-
-        let titleLabel = new St.Label({ style_class: 'events-day-task',
-                                        text: event.summary });
-        titleLabel.clutter_text.line_wrap = true;
-        titleLabel.clutter_text.ellipsize = false;
-
-        this.actor.add(titleLabel, { row: index, col: 2,
-                                     x_expand: true, x_align: St.Align.START,
-                                     y_fill: false, y_align: St.Align.START });
-    },
-
-    _addPeriod: function(header, index, begin, end, includeDayName, showNothingScheduled) {
         let events = this._eventSource.getEvents(begin, end);
 
-        if (events.length == 0 && !showNothingScheduled)
-            return index;
+        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);;
 
-        this.actor.add(new St.Label({ style_class: 'events-day-header', text: header }),
-                       { row: index, col: 0, col_span: 3,
-                         // In theory, x_expand should be true here, but x_expand
-                         // is a property of the column for StTable, ie all day cells
-                         // get it too
-                         x_expand: false, x_align: St.Align.START,
-                         y_fill: false, y_align: St.Align.START });
-        index++;
+        if (events.length == 0 && !showNothingScheduled)
+            return;
+
+        let vbox = new St.BoxLayout( {vertical: true} );
+        this.actor.add(vbox);
+
+        vbox.add(new St.Label({ style_class: 'events-day-header', text: header }));
+        let box = new St.BoxLayout({style_class: 'events-header-hbox'});
+        let dayNameBox = new St.BoxLayout({ vertical: true, style_class: 'events-day-name-box' });
+        let timeBox = new St.BoxLayout({ vertical: true, style_class: 'events-time-box' });
+        let eventTitleBox = new St.BoxLayout({ vertical: true, style_class: 'events-event-box' });
+        box.add(dayNameBox, {x_fill: false});
+        box.add(timeBox, {x_fill: false});
+        box.add(eventTitleBox, {expand: true});
+        vbox.add(box);
 
         for (let n = 0; n < events.length; n++) {
-            this._addEvent(events[n], index, includeDayName);
-            index++;
+            let event = events[n];
+            let dayString = _getEventDayAbbreviation(event.date.getDay());
+            let timeString = _formatEventTime(event, clockFormat);
+            let summaryString = event.summary;
+            this._addEvent(dayNameBox, timeBox, eventTitleBox, includeDayName, dayString, timeString, summaryString);
         }
 
         if (events.length == 0 && showNothingScheduled) {
             let now = new Date();
             /* Translators: Text to show if there are no events */
             let nothingEvent = new CalendarEvent(now, now, _("Nothing Scheduled"), true);
-            this._addEvent(nothingEvent, index, false);
-            index++;
+            let timeString = _formatEventTime(nothingEvent, clockFormat);
+            this._addEvent(dayNameBox, timeBox, eventTitleBox, false, "", timeString, nothingEvent.summary);
         }
-
-        return index;
     },
 
     _showOtherDay: function(day) {
-        this.actor.destroy_all_children();
+        this.actor.destroy_children();
 
         let dayBegin = _getBeginningOfDay(day);
         let dayEnd = _getEndOfDay(day);
@@ -781,40 +698,37 @@ const EventsList = new Lang.Class({
         else
             /* Translators: Shown on calendar heading when selected day occurs on different year */
             dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d, %Y"));
-        this._addPeriod(dayString, 0, dayBegin, dayEnd, false, true);
+        this._addPeriod(dayString, dayBegin, dayEnd, false, true);
     },
 
     _showToday: function() {
-        this.actor.destroy_all_children();
-        let index = 0;
+        this.actor.destroy_children();
 
         let now = new Date();
         let dayBegin = _getBeginningOfDay(now);
         let dayEnd = _getEndOfDay(now);
-        index = this._addPeriod(_("Today"), index, dayBegin, dayEnd, false, true);
+        this._addPeriod(_("Today"), dayBegin, dayEnd, false, true);
 
         let tomorrowBegin = new Date(dayBegin.getTime() + 86400 * 1000);
         let tomorrowEnd = new Date(dayEnd.getTime() + 86400 * 1000);
-        index = this._addPeriod(_("Tomorrow"), index, tomorrowBegin, tomorrowEnd, false, true);
+        this._addPeriod(_("Tomorrow"), tomorrowBegin, tomorrowEnd, false, true);
 
-        let dayInWeek = (dayEnd.getDay() - this._weekStart + 7) % 7;
-
-        if (dayInWeek < 5) {
+        if (dayEnd.getDay() <= 4 + this._weekStart) {
             /* If now is within the first 5 days we show "This week" and
              * include events up until and including Saturday/Sunday
              * (depending on whether a week starts on Sunday/Monday).
              */
             let thisWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
-            let thisWeekEnd = new Date(dayEnd.getTime() + (6 - dayInWeek) * 86400 * 1000);
-            index = this._addPeriod(_("This week"), index, thisWeekBegin, thisWeekEnd, true, false);
+            let thisWeekEnd = new Date(dayEnd.getTime() + (6 + this._weekStart - dayEnd.getDay()) * 86400 * 1000);
+            this._addPeriod(_("This week"), thisWeekBegin, thisWeekEnd, true, false);
         } else {
             /* otherwise it's one of the two last days of the week ... show
              * "Next week" and include events up until and including *next*
              * Saturday/Sunday
              */
             let nextWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
-            let nextWeekEnd = new Date(dayEnd.getTime() + (13 - dayInWeek) * 86400 * 1000);
-            index = this._addPeriod(_("Next week"), index, nextWeekBegin, nextWeekEnd, true, false);
+            let nextWeekEnd = new Date(dayEnd.getTime() + (13 + this._weekStart - dayEnd.getDay()) * 86400 * 1000);
+            this._addPeriod(_("Next week"), nextWeekBegin, nextWeekEnd, true, false);
         }
     },
 
@@ -827,9 +741,6 @@ const EventsList = new Lang.Class({
     },
 
     _update: function() {
-        if (this._eventSource.isLoading)
-            return;
-
         let today = new Date();
         if (_sameDay (this._date, today)) {
             this._showToday();

js/ui/checkBox.js

@@ -1,40 +0,0 @@
-const Clutter = imports.gi.Clutter;
-const Pango = imports.gi.Pango;
-const St = imports.gi.St;
-
-const Lang = imports.lang;
-
-const CheckBox = new Lang.Class({
-    Name: 'CheckBox',
-
-    _init: function(label) {
-        let container = new St.BoxLayout();
-        this.actor = new St.Button({ style_class: 'check-box',
-                                     child: container,
-                                     button_mask: St.ButtonMask.ONE,
-                                     toggle_mode: true,
-                                     can_focus: true,
-                                     x_fill: true,
-                                     y_fill: true });
-
-        this._box = new St.Bin();
-        this._box.set_y_align(Clutter.ActorAlign.START);
-        container.add_actor(this._box);
-
-        this._label = new St.Label();
-        this._label.clutter_text.set_line_wrap(true);
-        this._label.clutter_text.set_ellipsize(Pango.EllipsizeMode.NONE);
-        container.add_actor(this._label);
-
-        if (label)
-            this.setLabel(label);
-    },
-
-    setLabel: function(label) {
-        this._label.set_text(label);
-    },
-
-    getLabelActor: function() {
-        return this._label;
-    }
-});

js/ui/components/__init__.js

@@ -1,65 +0,0 @@
-
-const Lang = imports.lang;
-const Main = imports.ui.main;
-
-const ComponentManager = new Lang.Class({
-    Name: 'ComponentManager',
-
-    _init: function() {
-        this._allComponents = {};
-        this._enabledComponents = [];
-
-        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
-        this._sessionUpdated();
-    },
-
-    _sessionUpdated: function() {
-        let newEnabledComponents = Main.sessionMode.components;
-
-        newEnabledComponents.filter(Lang.bind(this, function(name) {
-            return this._enabledComponents.indexOf(name) == -1;
-        })).forEach(Lang.bind(this, function(name) {
-            this._enableComponent(name);
-        }));
-
-        this._enabledComponents.filter(Lang.bind(this, function(name) {
-            return newEnabledComponents.indexOf(name) == -1;
-        })).forEach(Lang.bind(this, function(name) {
-            this._disableComponent(name);
-        }));
-
-        this._enabledComponents = newEnabledComponents;
-    },
-
-    _importComponent: function(name) {
-        let module = imports.ui.components[name];
-        return module.Component;
-    },
-
-    _ensureComponent: function(name) {
-        let component = this._allComponents[name];
-        if (component)
-            return component;
-
-	if (Main.sessionMode.isLocked)
-	    return null;
-
-        let constructor = this._importComponent(name);
-        component = new constructor();
-        this._allComponents[name] = component;
-        return component;
-    },
-
-    _enableComponent: function(name) {
-        let component = this._ensureComponent(name);
-	if (component)
-            component.enable();
-    },
-
-    _disableComponent: function(name) {
-        let component = this._allComponents[name];
-        if (component == null)
-            return;
-        component.disable();
-    }
-});

js/ui/components/automountManager.js

@@ -1,243 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Params = imports.misc.params;
-const Shell = imports.gi.Shell;
-
-const GnomeSession = imports.misc.gnomeSession;
-const Main = imports.ui.main;
-const ShellMountOperation = imports.ui.shellMountOperation;
-
-const GNOME_SESSION_AUTOMOUNT_INHIBIT = 16;
-
-// GSettings keys
-const SETTINGS_SCHEMA = 'org.gnome.desktop.media-handling';
-const SETTING_ENABLE_AUTOMOUNT = 'automount';
-
-const AUTORUN_EXPIRE_TIMEOUT_SECS = 10;
-
-const AutomountManager = new Lang.Class({
-    Name: 'AutomountManager',
-
-    _init: function() {
-        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
-        this._volumeQueue = [];
-        this._session = new GnomeSession.SessionManager();
-        this._session.connectSignal('InhibitorAdded',
-                                    Lang.bind(this, this._InhibitorsChanged));
-        this._session.connectSignal('InhibitorRemoved',
-                                    Lang.bind(this, this._InhibitorsChanged));
-        this._inhibited = false;
-
-        this._volumeMonitor = Gio.VolumeMonitor.get();
-    },
-
-    enable: function() {
-        this._volumeAddedId = this._volumeMonitor.connect('volume-added', Lang.bind(this, this._onVolumeAdded));
-        this._volumeRemovedId = this._volumeMonitor.connect('volume-removed', Lang.bind(this, this._onVolumeRemoved));
-        this._driveConnectedId = this._volumeMonitor.connect('drive-connected', Lang.bind(this, this._onDriveConnected));
-        this._driveDisconnectedId = this._volumeMonitor.connect('drive-disconnected', Lang.bind(this, this._onDriveDisconnected));
-        this._driveEjectButtonId = this._volumeMonitor.connect('drive-eject-button', Lang.bind(this, this._onDriveEjectButton));
-
-        this._mountAllId = Mainloop.idle_add(Lang.bind(this, this._startupMountAll));
-    },
-
-    disable: function() {
-        this._volumeMonitor.disconnect(this._volumeAddedId);
-        this._volumeMonitor.disconnect(this._volumeRemovedId);
-        this._volumeMonitor.disconnect(this._driveConnectedId);
-        this._volumeMonitor.disconnect(this._driveDisconnectedId);
-        this._volumeMonitor.disconnect(this._driveEjectButtonId);
-
-        if (this._mountAllId > 0) {
-            Mainloop.source_remove(this._mountAllId);
-            this._mountAllId = 0;
-        }
-    },
-
-    _InhibitorsChanged: function(object, senderName, [inhibtor]) {
-        this._session.IsInhibitedRemote(GNOME_SESSION_AUTOMOUNT_INHIBIT,
-            Lang.bind(this,
-                function(result, error) {
-                    if (!error) {
-                        this._inhibited = result[0];
-                    }
-                }));
-    },
-
-    _startupMountAll: function() {
-        let volumes = this._volumeMonitor.get_volumes();
-        volumes.forEach(Lang.bind(this, function(volume) {
-            this._checkAndMountVolume(volume, { checkSession: false,
-                                                useMountOp: false,
-                                                allowAutorun: false });
-        }));
-
-        this._mountAllId = 0;
-        return GLib.SOURCE_REMOVE;
-    },
-
-    _onDriveConnected: function() {
-        // if we're not in the current ConsoleKit session,
-        // or screensaver is active, don't play sounds
-        if (!this._session.SessionIsActive)
-            return;
-
-        global.play_theme_sound(0, 'device-added-media',
-                                _("External drive connected"),
-                                null);
-    },
-
-    _onDriveDisconnected: function() {
-        // if we're not in the current ConsoleKit session,
-        // or screensaver is active, don't play sounds
-        if (!this._session.SessionIsActive)
-            return;
-
-        global.play_theme_sound(0, 'device-removed-media',
-                                _("External drive disconnected"),
-                                null);
-    },
-
-    _onDriveEjectButton: function(monitor, drive) {
-        // TODO: this code path is not tested, as the GVfs volume monitor
-        // doesn't emit this signal just yet.
-        if (!this._session.SessionIsActive)
-            return;
-
-        // we force stop/eject in this case, so we don't have to pass a
-        // mount operation object
-        if (drive.can_stop()) {
-            drive.stop
-                (Gio.MountUnmountFlags.FORCE, null, null,
-                 Lang.bind(this, function(drive, res) {
-                     try {
-                         drive.stop_finish(res);
-                     } catch (e) {
-                         log("Unable to stop the drive after drive-eject-button " + e.toString());
-                     }
-                 }));
-        } else if (drive.can_eject()) {
-            drive.eject_with_operation 
-                (Gio.MountUnmountFlags.FORCE, null, null,
-                 Lang.bind(this, function(drive, res) {
-                     try {
-                         drive.eject_with_operation_finish(res);
-                     } catch (e) {
-                         log("Unable to eject the drive after drive-eject-button " + e.toString());
-                     }
-                 }));
-        }
-    },
-
-    _onVolumeAdded: function(monitor, volume) {
-        this._checkAndMountVolume(volume);
-    },
-
-    _checkAndMountVolume: function(volume, params) {
-        params = Params.parse(params, { checkSession: true,
-                                        useMountOp: true,
-                                        allowAutorun: true });
-
-        if (params.checkSession) {
-            // if we're not in the current ConsoleKit session,
-            // don't attempt automount
-            if (!this._session.SessionIsActive)
-                return;
-        }
-
-        if (this._inhibited)
-            return;
-
-        // Volume is already mounted, don't bother.
-        if (volume.get_mount())
-            return;
-
-        if (!this._settings.get_boolean(SETTING_ENABLE_AUTOMOUNT) ||
-            !volume.should_automount() ||
-            !volume.can_mount()) {
-            // allow the autorun to run anyway; this can happen if the
-            // mount gets added programmatically later, even if 
-            // should_automount() or can_mount() are false, like for
-            // blank optical media.
-            this._allowAutorun(volume);
-            this._allowAutorunExpire(volume);
-
-            return;
-        }
-
-        if (params.useMountOp) {
-            let operation = new ShellMountOperation.ShellMountOperation(volume);
-            this._mountVolume(volume, operation, params.allowAutorun);
-        } else {
-            this._mountVolume(volume, null, params.allowAutorun);
-        }
-    },
-
-    _mountVolume: function(volume, operation, allowAutorun) {
-        if (allowAutorun)
-            this._allowAutorun(volume);
-
-        let mountOp = operation ? operation.mountOp : null;
-        volume._operation = operation;
-
-        volume.mount(0, mountOp, null,
-                     Lang.bind(this, this._onVolumeMounted));
-    },
-
-    _onVolumeMounted: function(volume, res) {
-        this._allowAutorunExpire(volume);
-
-        try {
-            volume.mount_finish(res);
-            this._closeOperation(volume);
-        } catch (e) {
-            // FIXME: we will always get G_IO_ERROR_FAILED from the gvfs udisks
-            // backend in this case, see 
-            // https://bugs.freedesktop.org/show_bug.cgi?id=51271
-            if (e.message.indexOf('No key available with this passphrase') != -1) {
-                this._reaskPassword(volume);
-            } else {
-                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                    log('Unable to mount volume ' + volume.get_name() + ': ' + e.toString());
-
-                this._closeOperation(volume);
-            }
-        }
-    },
-
-    _onVolumeRemoved: function(monitor, volume) {
-        this._volumeQueue = 
-            this._volumeQueue.filter(function(element) {
-                return (element != volume);
-            });
-    },
-
-    _reaskPassword: function(volume) {
-        let existingDialog = volume._operation ? volume._operation.borrowDialog() : null;
-        let operation = 
-            new ShellMountOperation.ShellMountOperation(volume,
-                                                        { existingDialog: existingDialog });
-        this._mountVolume(volume, operation);
-    },
-
-    _closeOperation: function(volume) {
-        if (volume._operation)
-            volume._operation.close();
-    },
-
-    _allowAutorun: function(volume) {
-        volume.allowAutorun = true;
-    },
-
-    _allowAutorunExpire: function(volume) {
-        Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, function() {
-            volume.allowAutorun = false;
-            return GLib.SOURCE_REMOVE;
-        });
-    }
-});
-const Component = AutomountManager;

js/ui/components/keyring.js

@@ -1,280 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Pango = imports.gi.Pango;
-const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
-const Gcr = imports.gi.Gcr;
-
-const ModalDialog = imports.ui.modalDialog;
-const ShellEntry = imports.ui.shellEntry;
-const CheckBox = imports.ui.checkBox;
-
-const KeyringDialog = new Lang.Class({
-    Name: 'KeyringDialog',
-    Extends: ModalDialog.ModalDialog,
-
-    _init: function() {
-        this.parent({ styleClass: 'prompt-dialog' });
-
-        this.prompt = new Shell.KeyringPrompt();
-        this.prompt.connect('show-password', Lang.bind(this, this._onShowPassword));
-        this.prompt.connect('show-confirm', Lang.bind(this, this._onShowConfirm));
-        this.prompt.connect('prompt-close', Lang.bind(this, this._onHidePrompt));
-
-        let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout',
-                                                vertical: false });
-        this.contentLayout.add(mainContentBox);
-
-        let icon = new St.Icon({ icon_name: 'dialog-password-symbolic' });
-        mainContentBox.add(icon,
-                           { x_fill:  true,
-                             y_fill:  false,
-                             x_align: St.Align.END,
-                             y_align: St.Align.START });
-
-        this._messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout',
-                                              vertical: true });
-        mainContentBox.add(this._messageBox,
-                           { y_align: St.Align.START, expand: true, x_fill: true, y_fill: true });
-
-        let subject = new St.Label({ style_class: 'prompt-dialog-headline' });
-        this.prompt.bind_property('message', subject, 'text', GObject.BindingFlags.SYNC_CREATE);
-
-        this._messageBox.add(subject,
-                             { x_fill: false,
-                               y_fill:  false,
-                               x_align: St.Align.START,
-                               y_align: St.Align.START });
-
-        let description = new St.Label({ style_class: 'prompt-dialog-description' });
-        description.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        description.clutter_text.line_wrap = true;
-        this.prompt.bind_property('description', description, 'text', GObject.BindingFlags.SYNC_CREATE);
-        this._messageBox.add(description,
-                            { y_fill:  true,
-                              y_align: St.Align.START });
-
-        this._controlTable = null;
-
-
-        this._cancelButton = this.addButton({ label: '',
-                                              action: Lang.bind(this, this._onCancelButton),
-                                              key: Clutter.Escape },
-                                            { expand: true, x_fill: false, x_align: St.Align.START });
-        this.placeSpinner({ expand: false,
-                            x_fill: false,
-                            y_fill: false,
-                            x_align: St.Align.END,
-                            y_align: St.Align.MIDDLE });
-        this._continueButton = this.addButton({ label: '',
-                                                action: Lang.bind(this, this._onContinueButton),
-                                                default: true },
-                                              { expand: false, x_fill: false, x_align: St.Align.END });
-
-        this.prompt.bind_property('cancel-label', this._cancelButton, 'label', GObject.BindingFlags.SYNC_CREATE);
-        this.prompt.bind_property('continue-label', this._continueButton, 'label', GObject.BindingFlags.SYNC_CREATE);
-    },
-
-    _buildControlTable: function() {
-        let layout = new Clutter.TableLayout();
-        let table = new St.Widget({ style_class: 'keyring-dialog-control-table',
-                                    layout_manager: layout });
-        layout.hookup_style(table);
-        let row = 0;
-
-        if (this.prompt.password_visible) {
-            let label = new St.Label({ style_class: 'prompt-dialog-password-label' });
-            label.set_text(_("Password:"));
-            label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-            layout.pack(label, 0, row);
-            layout.child_set(label, { x_expand: false, y_fill: false,
-                                      x_align: Clutter.TableAlignment.START });
-            this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
-                                                 text: '',
-                                                 can_focus: true });
-            this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
-            ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
-            this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onPasswordActivate));
-            layout.pack(this._passwordEntry, 1, row);
-            row++;
-        } else {
-            this._passwordEntry = null;
-        }
-
-        if (this.prompt.confirm_visible) {
-            var label = new St.Label(({ style_class: 'prompt-dialog-password-label' }));
-            label.set_text(_("Type again:"));
-            layout.pack(label, 0, row);
-            layout.child_set(label, { x_expand: false, y_fill: false,
-                                      x_align: Clutter.TableAlignment.START });
-            this._confirmEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
-                                                text: '',
-                                                can_focus: true });
-            this._confirmEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
-            ShellEntry.addContextMenu(this._confirmEntry, { isPassword: true });
-            this._confirmEntry.clutter_text.connect('activate', Lang.bind(this, this._onConfirmActivate));
-            layout.pack(this._confirmEntry, 1, row);
-            row++;
-        } else {
-            this._confirmEntry = null;
-        }
-
-        this.prompt.set_password_actor(this._passwordEntry ? this._passwordEntry.clutter_text : null);
-        this.prompt.set_confirm_actor(this._confirmEntry ? this._confirmEntry.clutter_text : null);
-
-        if (this.prompt.choice_visible) {
-            let choice = new CheckBox.CheckBox();
-            this.prompt.bind_property('choice-label', choice.getLabelActor(), 'text', GObject.BindingFlags.SYNC_CREATE);
-            this.prompt.bind_property('choice-chosen', choice.actor, 'checked', GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
-            layout.pack(choice.actor, 1, row);
-            row++;
-        }
-
-        let warning = new St.Label({ style_class: 'prompt-dialog-error-label' });
-        warning.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        warning.clutter_text.line_wrap = true;
-        layout.pack(warning, 1, row);
-        layout.child_set(warning, { x_fill: false, x_align: Clutter.TableAlignment.START });
-        this.prompt.bind_property('warning-visible', warning, 'visible', GObject.BindingFlags.SYNC_CREATE);
-        this.prompt.bind_property('warning', warning, 'text', GObject.BindingFlags.SYNC_CREATE);
-
-        if (this._controlTable) {
-            this._controlTable.destroy_all_children();
-            this._controlTable.destroy();
-        }
-
-        this._controlTable = table;
-        this._messageBox.add(table, { x_fill: true, y_fill: true });
-    },
-
-    _updateSensitivity: function(sensitive) {
-        if (this._passwordEntry) {
-            this._passwordEntry.reactive = sensitive;
-            this._passwordEntry.clutter_text.editable = sensitive;
-        }
-
-        if (this._confirmEntry) {
-            this._confirmEntry.reactive = sensitive;
-            this._confirmEntry.clutter_text.editable = sensitive;
-        }
-
-        this._continueButton.can_focus = sensitive;
-        this._continueButton.reactive = sensitive;
-        this.setWorking(!sensitive);
-    },
-
-    _ensureOpen: function() {
-        // NOTE: ModalDialog.open() is safe to call if the dialog is
-        // already open - it just returns true without side-effects
-        if (this.open())
-          return true;
-
-        // The above fail if e.g. unable to get input grab
-        //
-        // In an ideal world this wouldn't happen (because the
-        // Shell is in complete control of the session) but that's
-        // just not how things work right now.
-
-        log('keyringPrompt: Failed to show modal dialog.' +
-            ' Dismissing prompt request');
-        this.prompt.cancel()
-        return false;
-    },
-
-    _onShowPassword: function(prompt) {
-        this._buildControlTable();
-        this._ensureOpen();
-        this._updateSensitivity(true);
-        this._passwordEntry.grab_key_focus();
-    },
-
-    _onShowConfirm: function(prompt) {
-        this._buildControlTable();
-        this._ensureOpen();
-        this._updateSensitivity(true);
-        this._continueButton.grab_key_focus();
-    },
-
-    _onHidePrompt: function(prompt) {
-        this.close();
-    },
-
-    _onPasswordActivate: function() {
-        if (this.prompt.confirm_visible)
-            this._confirmEntry.grab_key_focus();
-        else
-            this._onContinueButton();
-    },
-
-    _onConfirmActivate: function() {
-        this._onContinueButton();
-    },
-
-    _onContinueButton: function() {
-        this._updateSensitivity(false);
-        this.prompt.complete();
-    },
-
-    _onCancelButton: function() {
-        this.prompt.cancel();
-    },
-});
-
-const KeyringDummyDialog = new Lang.Class({
-    Name: 'KeyringDummyDialog',
-
-    _init: function() {
-        this.prompt = new Shell.KeyringPrompt();
-        this.prompt.connect('show-password',
-                            Lang.bind(this, this._cancelPrompt));
-        this.prompt.connect('show-confirm', Lang.bind(this,
-                            this._cancelPrompt));
-    },
-
-    _cancelPrompt: function() {
-        this.prompt.cancel();
-    }
-});
-
-const KeyringPrompter = new Lang.Class({
-    Name: 'KeyringPrompter',
-
-    _init: function() {
-        this._prompter = new Gcr.SystemPrompter();
-        this._prompter.connect('new-prompt', Lang.bind(this,
-            function() {
-                let dialog = this._enabled ? new KeyringDialog()
-                                           : new KeyringDummyDialog();
-                this._currentPrompt = dialog.prompt;
-                return this._currentPrompt;
-            }));
-        this._dbusId = null;
-        this._registered = false;
-        this._enabled = false;
-        this._currentPrompt = null;
-    },
-
-    enable: function() {
-        if (!this._registered) {
-            this._prompter.register(Gio.DBus.session);
-            this._dbusId = Gio.DBus.session.own_name('org.gnome.keyring.SystemPrompter',
-                                                     Gio.BusNameOwnerFlags.ALLOW_REPLACEMENT, null, null);
-            this._registered = true;
-        }
-        this._enabled = true;
-    },
-
-    disable: function() {
-        this._enabled = false;
-
-        if (this._prompter.prompting)
-            this._currentPrompt.cancel();
-        this._currentPrompt = null;
-    }
-});
-
-const Component = KeyringPrompter;

js/ui/components/networkAgent.js

@@ -1,712 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
-const Lang = imports.lang;
-const NetworkManager = imports.gi.NetworkManager;
-const NMClient = imports.gi.NMClient;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-
-const Config = imports.misc.config;
-const ModalDialog = imports.ui.modalDialog;
-const PopupMenu = imports.ui.popupMenu;
-const ShellEntry = imports.ui.shellEntry;
-
-const VPN_UI_GROUP = 'VPN Plugin UI';
-
-const NetworkSecretDialog = new Lang.Class({
-    Name: 'NetworkSecretDialog',
-    Extends: ModalDialog.ModalDialog,
-
-    _init: function(agent, requestId, connection, settingName, hints, contentOverride) {
-        this.parent({ styleClass: 'prompt-dialog' });
-
-        this._agent = agent;
-        this._requestId = requestId;
-        this._connection = connection;
-        this._settingName = settingName;
-        this._hints = hints;
-
-        if (contentOverride)
-            this._content = contentOverride;
-        else
-            this._content = this._getContent();
-
-        let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout',
-                                                vertical: false });
-        this.contentLayout.add(mainContentBox,
-                               { x_fill: true,
-                                 y_fill: true });
-
-        let icon = new St.Icon({ icon_name: 'dialog-password-symbolic' });
-        mainContentBox.add(icon,
-                           { x_fill:  true,
-                             y_fill:  false,
-                             x_align: St.Align.END,
-                             y_align: St.Align.START });
-
-        let messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout',
-                                            vertical: true });
-        mainContentBox.add(messageBox,
-                           { y_align: St.Align.START });
-
-        let subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline',
-                                            text: this._content.title });
-        messageBox.add(subjectLabel,
-                       { y_fill:  false,
-                         y_align: St.Align.START });
-
-        if (this._content.message != null) {
-            let descriptionLabel = new St.Label({ style_class: 'prompt-dialog-description',
-                                                  text: this._content.message });
-            descriptionLabel.clutter_text.line_wrap = true;
-            descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-
-            messageBox.add(descriptionLabel,
-                           { y_fill:  true,
-                             y_align: St.Align.START,
-                             expand: true });
-        }
-
-        let layout = new Clutter.TableLayout();
-        let secretTable = new St.Widget({ style_class: 'network-dialog-secret-table',
-                                          layout_manager: layout });
-        layout.hookup_style(secretTable);
-
-        let initialFocusSet = false;
-        let pos = 0;
-        for (let i = 0; i < this._content.secrets.length; i++) {
-            let secret = this._content.secrets[i];
-            let label = new St.Label({ style_class: 'prompt-dialog-password-label',
-                                       text: secret.label });
-            label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-
-            let reactive = secret.key != null;
-
-            secret.entry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
-                                          text: secret.value, can_focus: reactive,
-                                          reactive: reactive });
-            ShellEntry.addContextMenu(secret.entry,
-                                      { isPassword: secret.password });
-
-            if (secret.validate)
-                secret.valid = secret.validate(secret);
-            else // no special validation, just ensure it's not empty
-                secret.valid = secret.value.length > 0;
-
-            if (reactive) {
-                if (!initialFocusSet) {
-                    this.setInitialKeyFocus(secret.entry);
-                    initialFocusSet = true;
-                }
-
-                secret.entry.clutter_text.connect('activate', Lang.bind(this, this._onOk));
-                secret.entry.clutter_text.connect('text-changed', Lang.bind(this, function() {
-                    secret.value = secret.entry.get_text();
-                    if (secret.validate)
-                        secret.valid = secret.validate(secret);
-                    else
-                        secret.valid = secret.value.length > 0;
-                    this._updateOkButton();
-                }));
-            } else
-                secret.valid = true;
-
-            layout.pack(label, 0, pos);
-            layout.child_set(label, { x_expand: false, y_fill: false,
-                                      x_align: Clutter.TableAlignment.START });
-            layout.pack(secret.entry, 1, pos);
-            pos++;
-
-            if (secret.password)
-                secret.entry.clutter_text.set_password_char('\u25cf');
-        }
-
-        messageBox.add(secretTable);
-
-        this._okButton = { label:  _("Connect"),
-                           action: Lang.bind(this, this._onOk),
-                           default: true
-                         };
-
-        this.setButtons([{ label: _("Cancel"),
-                           action: Lang.bind(this, this.cancel),
-                           key:    Clutter.KEY_Escape,
-                         },
-                         this._okButton]);
-
-        this._updateOkButton();
-    },
-
-    _updateOkButton: function() {
-        let valid = true;
-        for (let i = 0; i < this._content.secrets.length; i++) {
-            let secret = this._content.secrets[i];
-            valid = valid && secret.valid;
-        }
-
-        this._okButton.button.reactive = valid;
-        this._okButton.button.can_focus = valid;
-    },
-
-    _onOk: function() {
-        let valid = true;
-        for (let i = 0; i < this._content.secrets.length; i++) {
-            let secret = this._content.secrets[i];
-            valid = valid && secret.valid;
-            if (secret.key != null)
-                this._agent.set_password(this._requestId, secret.key, secret.value);
-        }
-
-        if (valid) {
-            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.CONFIRMED);
-            this.close(global.get_current_time());
-        }
-        // do nothing if not valid
-    },
-
-    cancel: function() {
-        this._agent.respond(this._requestId, Shell.NetworkAgentResponse.USER_CANCELED);
-        this.close(global.get_current_time());
-    },
-
-    _validateWpaPsk: function(secret) {
-        let value = secret.value;
-        if (value.length == 64) {
-            // must be composed of hexadecimal digits only
-            for (let i = 0; i < 64; i++) {
-                if (!((value[i] >= 'a' && value[i] <= 'f')
-                      || (value[i] >= 'A' && value[i] <= 'F')
-                      || (value[i] >= '0' && value[i] <= '9')))
-                    return false;
-            }
-            return true;
-        }
-
-        return (value.length >= 8 && value.length <= 63);
-    },
-
-    _validateStaticWep: function(secret) {
-        let value = secret.value;
-        if (secret.wep_key_type == NetworkManager.WepKeyType.KEY) {
-            if (value.length == 10 || value.length == 26) {
-		for (let i = 0; i < value.length; i++) {
-                    if (!((value[i] >= 'a' && value[i] <= 'f')
-                          || (value[i] >= 'A' && value[i] <= 'F')
-                          || (value[i] >= '0' && value[i] <= '9')))
-                        return false;
-		}
-	    } else if (value.length == 5 || value.length == 13) {
-		for (let i = 0; i < value.length; i++) {
-                    if (!((value[i] >= 'a' && value[i] <= 'z')
-                          || (value[i] >= 'A' && value[i] <= 'Z')))
-                        return false;
-                }
-            } else
-                return false;
-	} else if (secret.wep_key_type == NetworkManager.WepKeyType.PASSPHRASE) {
-	    if (value.length < 0 || value.length > 64)
-	        return false;
-	}
-        return true;
-    },
-
-    _getWirelessSecrets: function(secrets, wirelessSetting) {
-        let wirelessSecuritySetting = this._connection.get_setting_wireless_security();
-        switch (wirelessSecuritySetting.key_mgmt) {
-        // First the easy ones
-        case 'wpa-none':
-        case 'wpa-psk':
-            secrets.push({ label: _("Password: "), key: 'psk',
-                           value: wirelessSecuritySetting.psk || '',
-                           validate: this._validateWpaPsk, password: true });
-            break;
-        case 'none': // static WEP
-            secrets.push({ label: _("Key: "), key: 'wep-key' + wirelessSecuritySetting.wep_tx_keyidx,
-                           value: wirelessSecuritySetting.get_wep_key(wirelessSecuritySetting.wep_tx_keyidx) || '',
-                           wep_key_type: wirelessSecuritySetting.wep_key_type,
-                           validate: this._validateStaticWep, password: true });
-            break;
-        case 'ieee8021x':
-            if (wirelessSecuritySetting.auth_alg == 'leap') // Cisco LEAP
-                secrets.push({ label: _("Password: "), key: 'leap-password',
-                               value: wirelessSecuritySetting.leap_password || '', password: true });
-            else // Dynamic (IEEE 802.1x) WEP
-                this._get8021xSecrets(secrets);
-            break;
-        case 'wpa-eap':
-            this._get8021xSecrets(secrets);
-            break;
-        default:
-            log('Invalid wireless key management: ' + wirelessSecuritySetting.key_mgmt);
-        }
-    },
-
-    _get8021xSecrets: function(secrets) {
-        let ieee8021xSetting = this._connection.get_setting_802_1x();
-        let phase2method;
-
-        switch (ieee8021xSetting.get_eap_method(0)) {
-        case 'md5':
-        case 'leap':
-        case 'ttls':
-        case 'peap':
-        case 'fast':
-            // TTLS and PEAP are actually much more complicated, but this complication
-            // is not visible here since we only care about phase2 authentication
-            // (and don't even care of which one)
-            secrets.push({ label: _("Username: "), key: null,
-                           value: ieee8021xSetting.identity || '', password: false });
-            secrets.push({ label: _("Password: "), key: 'password',
-                           value: ieee8021xSetting.password || '', password: true });
-            break;
-        case 'tls':
-            secrets.push({ label: _("Identity: "), key: null,
-                           value: ieee8021xSetting.identity || '', password: false });
-            secrets.push({ label: _("Private key password: "), key: 'private-key-password',
-                           value: ieee8021xSetting.private_key_password || '', password: true });
-            break;
-        default:
-            log('Invalid EAP/IEEE802.1x method: ' + ieee8021xSetting.get_eap_method(0));
-        }
-    },
-
-    _getPPPoESecrets: function(secrets) {
-        let pppoeSetting = this._connection.get_setting_pppoe();
-        secrets.push({ label: _("Username: "), key: 'username',
-                       value: pppoeSetting.username || '', password: false });
-        secrets.push({ label: _("Service: "), key: 'service',
-                       value: pppoeSetting.service || '', password: false });
-        secrets.push({ label: _("Password: "), key: 'password',
-                       value: pppoeSetting.password || '', password: true });
-    },
-
-    _getMobileSecrets: function(secrets, connectionType) {
-        let setting;
-        if (connectionType == 'bluetooth')
-            setting = this._connection.get_setting_cdma() || this._connection.get_setting_gsm();
-        else
-            setting = this._connection.get_setting_by_name(connectionType);
-        secrets.push({ label: _("Password: "), key: 'password',
-                       value: setting.value || '', password: true });
-    },
-
-    _getContent: function() {
-        let connectionSetting = this._connection.get_setting_connection();
-        let connectionType = connectionSetting.get_connection_type();
-        let wirelessSetting;
-        let ssid;
-
-        let content = { };
-        content.secrets = [ ];
-
-        switch (connectionType) {
-        case '802-11-wireless':
-            wirelessSetting = this._connection.get_setting_wireless();
-            ssid = NetworkManager.utils_ssid_to_utf8(wirelessSetting.get_ssid());
-            content.title = _("Authentication required by wireless network");
-            content.message = _("Passwords or encryption keys are required to access the wireless network '%s'.").format(ssid);
-            this._getWirelessSecrets(content.secrets, wirelessSetting);
-            break;
-        case '802-3-ethernet':
-            content.title = _("Wired 802.1X authentication");
-            content.message = null;
-            content.secrets.push({ label: _("Network name: "), key: null,
-                                   value: connectionSetting.get_id(), password: false });
-            this._get8021xSecrets(content.secrets);
-            break;
-        case 'pppoe':
-            content.title = _("DSL authentication");
-            content.message = null;
-            this._getPPPoESecrets(content.secrets);
-            break;
-        case 'gsm':
-            if (this._hints.indexOf('pin') != -1) {
-                let gsmSetting = this._connection.get_setting_gsm();
-                content.title = _("PIN code required");
-                content.message = _("PIN code is needed for the mobile broadband device");
-                content.secrets.push({ label: _("PIN: "), key: 'pin',
-                                       value: gsmSetting.pin || '', password: true });
-            }
-            // fall through
-        case 'cdma':
-        case 'bluetooth':
-            content.title = _("Mobile broadband network password");
-            content.message = _("A password is required to connect to '%s'.").format(connectionSetting.get_id());
-            this._getMobileSecrets(content.secrets, connectionType);
-            break;
-        default:
-            log('Invalid connection type: ' + connectionType);
-        };
-
-        return content;
-    }
-});
-
-const VPNRequestHandler = new Lang.Class({
-    Name: 'VPNRequestHandler',
-
-    _init: function(agent, requestId, authHelper, serviceType, connection, hints, flags) {
-        this._agent = agent;
-        this._requestId = requestId;
-        this._connection = connection;
-        this._pluginOutBuffer = [];
-        this._title = null;
-        this._description = null;
-        this._content = [ ];
-        this._shellDialog = null;
-
-        let connectionSetting = connection.get_setting_connection();
-
-        let argv = [ authHelper.fileName,
-                     '-u', connectionSetting.uuid,
-                     '-n', connectionSetting.id,
-                     '-s', serviceType
-                   ];
-        if (authHelper.externalUIMode)
-            argv.push('--external-ui-mode');
-        if (flags & NMClient.SecretAgentGetSecretsFlags.ALLOW_INTERACTION)
-            argv.push('-i');
-        if (flags & NMClient.SecretAgentGetSecretsFlags.REQUEST_NEW)
-            argv.push('-r');
-
-        this._newStylePlugin = authHelper.externalUIMode;
-
-        try {
-            let [success, pid, stdin, stdout, stderr] =
-                GLib.spawn_async_with_pipes(null, /* pwd */
-                                            argv,
-                                            null, /* envp */
-                                            GLib.SpawnFlags.DO_NOT_REAP_CHILD,
-                                            null /* child_setup */);
-
-            this._childPid = pid;
-            this._stdin = new Gio.UnixOutputStream({ fd: stdin, close_fd: true });
-            this._stdout = new Gio.UnixInputStream({ fd: stdout, close_fd: true });
-            GLib.close(stderr);
-            this._dataStdout = new Gio.DataInputStream({ base_stream: this._stdout });
-
-            if (this._newStylePlugin)
-                this._readStdoutNewStyle();
-            else
-                this._readStdoutOldStyle();
-
-            this._childWatch = GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid,
-                                                    Lang.bind(this, this._vpnChildFinished));
-
-            this._writeConnection();
-        } catch(e) {
-            logError(e, 'error while spawning VPN auth helper');
-
-            this._agent.respond(requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
-        }
-    },
-
-    cancel: function(respond) {
-        if (respond)
-            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.USER_CANCELED);
-
-        if (this._newStylePlugin && this._shellDialog) {
-            this._shellDialog.close(global.get_current_time());
-            this._shellDialog.destroy();
-        } else {
-            try {
-                this._stdin.write('QUIT\n\n', null);
-            } catch(e) { /* ignore broken pipe errors */ }
-        }
-
-        this.destroy();
-    },
-
-    destroy: function() {
-        if (this._destroyed)
-            return;
-
-        GLib.source_remove(this._childWatch);
-
-        this._stdin.close(null);
-        // Stdout is closed when we finish reading from it
-
-        this._destroyed = true;
-    },
-
-    _vpnChildFinished: function(pid, status, requestObj) {
-        this._childWatch = 0;
-        if (this._newStylePlugin) {
-            // For new style plugin, all work is done in the async reading functions
-            // Just reap the process here
-            return;
-        }
-
-        let [exited, exitStatus] = Shell.util_wifexited(status);
-
-        if (exited) {
-            if (exitStatus != 0)
-                this._agent.respond(this._requestId, Shell.NetworkAgentResponse.USER_CANCELED);
-            else
-                this._agent.respond(this._requestId, Shell.NetworkAgentResponse.CONFIRMED);
-        } else
-            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
-
-        this.destroy();
-    },
-
-    _vpnChildProcessLineOldStyle: function(line) {
-        if (this._previousLine != undefined) {
-            // Two consecutive newlines mean that the child should be closed
-            // (the actual newlines are eaten by Gio.DataInputStream)
-            // Send a termination message
-            if (line == '' && this._previousLine == '') {
-                try {
-                    this._stdin.write('QUIT\n\n', null);
-                } catch(e) { /* ignore broken pipe errors */ }
-            } else {
-                this._agent.set_password(this._requestId, this._previousLine, line);
-                this._previousLine = undefined;
-            }
-        } else {
-            this._previousLine = line;
-        }
-    },
-
-    _readStdoutOldStyle: function() {
-        this._dataStdout.read_line_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(stream, result) {
-            let [line, len] = this._dataStdout.read_line_finish_utf8(result);
-
-            if (line == null) {
-                // end of file
-                this._stdout.close(null);
-                return;
-            }
-
-            this._vpnChildProcessLineOldStyle(line);
-
-            // try to read more!
-            this._readStdoutOldStyle();
-        }));
-    },
-
-    _readStdoutNewStyle: function() {
-        this._dataStdout.fill_async(-1, GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(stream, result) {
-            let cnt = this._dataStdout.fill_finish(result);
-
-            if (cnt == 0) {
-                // end of file
-                this._showNewStyleDialog();
-
-                this._stdout.close(null);
-                return;
-            }
-
-            // Try to read more
-            this._dataStdout.set_buffer_size(2 * this._dataStdout.get_buffer_size());
-            this._readStdoutNewStyle();
-        }));
-    },
-
-    _showNewStyleDialog: function() {
-        let keyfile = new GLib.KeyFile();
-        let contentOverride;
-
-        try {
-            let data = this._dataStdout.peek_buffer();
-            keyfile.load_from_data(data.toString(), data.length,
-                                   GLib.KeyFileFlags.NONE);
-
-            if (keyfile.get_integer(VPN_UI_GROUP, 'Version') != 2)
-                throw new Error('Invalid plugin keyfile version, is %d');
-
-            contentOverride = { title: keyfile.get_string(VPN_UI_GROUP, 'Title'),
-                                message: keyfile.get_string(VPN_UI_GROUP, 'Description'),
-                                secrets: [] };
-
-            let [groups, len] = keyfile.get_groups();
-            for (let i = 0; i < groups.length; i++) {
-                if (groups[i] == VPN_UI_GROUP)
-                    continue;
-
-                let value = keyfile.get_string(groups[i], 'Value');
-                let shouldAsk = keyfile.get_boolean(groups[i], 'ShouldAsk');
-
-                if (shouldAsk) {
-                    contentOverride.secrets.push({ label: keyfile.get_string(groups[i], 'Label'),
-                                                   key: groups[i],
-                                                   value: value,
-                                                   password: keyfile.get_boolean(groups[i], 'IsSecret')
-                                                 });
-                } else {
-                    if (!value.length) // Ignore empty secrets
-                        continue;
-
-                    this._agent.set_password(this._requestId, groups[i], value);
-                }
-            }
-        } catch(e) {
-            logError(e, 'error while reading VPN plugin output keyfile');
-
-            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
-            return;
-        }
-
-        if (contentOverride.secrets.length) {
-            // Only show the dialog if we actually have something to ask
-            this._shellDialog = new NetworkSecretDialog(this._agent, this._requestId, this._connection, 'vpn', [], contentOverride);
-            this._shellDialog.open(global.get_current_time());
-        } else {
-            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.CONFIRMED);
-        }
-    },
-
-    _writeConnection: function() {
-        let vpnSetting = this._connection.get_setting_vpn();
-
-        try {
-            vpnSetting.foreach_data_item(Lang.bind(this, function(key, value) {
-                this._stdin.write('DATA_KEY=' + key + '\n', null);
-                this._stdin.write('DATA_VAL=' + (value || '') + '\n\n', null);
-            }));
-            vpnSetting.foreach_secret(Lang.bind(this, function(key, value) {
-                this._stdin.write('SECRET_KEY=' + key + '\n', null);
-                this._stdin.write('SECRET_VAL=' + (value || '') + '\n\n', null);
-            }));
-            this._stdin.write('DONE\n\n', null);
-        } catch(e) {
-            logError(e, 'internal error while writing connection to helper');
-
-            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
-        }
-    },
-});
-
-const NetworkAgent = new Lang.Class({
-    Name: 'NetworkAgent',
-
-    _init: function() {
-        this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent' });
-
-        this._dialogs = { };
-        this._vpnRequests = { };
-
-        this._native.connect('new-request', Lang.bind(this, this._newRequest));
-        this._native.connect('cancel-request', Lang.bind(this, this._cancelRequest));
-
-        this._enabled = false;
-    },
-
-    enable: function() {
-        this._enabled = true;
-    },
-
-    disable: function() {
-        let requestId;
-
-        for (requestId in this._dialogs)
-            this._dialogs[requestId].cancel();
-        this._dialogs = { };
-
-        for (requestId in this._vpnRequests)
-            this._vpnRequests[requestId].cancel(true);
-        this._vpnRequests = { };
-
-        this._enabled = false;
-    },
-
-    _newRequest:  function(agent, requestId, connection, settingName, hints, flags) {
-        if (!this._enabled) {
-            agent.respond(requestId, Shell.NetworkAgentResponse.USER_CANCELED);
-            return;
-        }
-
-        if (settingName == 'vpn') {
-            this._vpnRequest(requestId, connection, hints, flags);
-            return;
-        }
-
-        let dialog = new NetworkSecretDialog(agent, requestId, connection, settingName, hints);
-        dialog.connect('destroy', Lang.bind(this, function() {
-            delete this._dialogs[requestId];
-        }));
-        this._dialogs[requestId] = dialog;
-        dialog.open(global.get_current_time());
-    },
-
-    _cancelRequest: function(agent, requestId) {
-        if (this._dialogs[requestId]) {
-            this._dialogs[requestId].close(global.get_current_time());
-            this._dialogs[requestId].destroy();
-            delete this._dialogs[requestId];
-        } else if (this._vpnRequests[requestId]) {
-            this._vpnRequests[requestId].cancel(false);
-            delete this._vpnRequests[requestId];
-        }
-    },
-
-    _vpnRequest: function(requestId, connection, hints, flags) {
-        let vpnSetting = connection.get_setting_vpn();
-        let serviceType = vpnSetting.service_type;
-
-        this._buildVPNServiceCache();
-
-        let binary = this._vpnBinaries[serviceType];
-        if (!binary) {
-            log('Invalid VPN service type (cannot find authentication binary)');
-
-            /* cancel the auth process */
-            this._native.respond(requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
-            return;
-        }
-
-        this._vpnRequests[requestId] = new VPNRequestHandler(this._native, requestId, binary, serviceType, connection, hints, flags);
-    },
-
-    _buildVPNServiceCache: function() {
-        if (this._vpnCacheBuilt)
-            return;
-
-        this._vpnCacheBuilt = true;
-        this._vpnBinaries = { };
-
-        let dir = Gio.file_new_for_path(GLib.build_filenamev([Config.SYSCONFDIR, 'NetworkManager/VPN']));
-        try {
-            let fileEnum = dir.enumerate_children('standard::name', Gio.FileQueryInfoFlags.NONE, null);
-            let info;
-
-            while ((info = fileEnum.next_file(null))) {
-                let name = info.get_name();
-                if (name.substr(-5) != '.name')
-                    continue;
-
-                try {
-                    let keyfile = new GLib.KeyFile();
-                    keyfile.load_from_file(dir.get_child(name).get_path(), GLib.KeyFileFlags.NONE);
-                    let service = keyfile.get_string('VPN Connection', 'service');
-                    let binary = keyfile.get_string('GNOME', 'auth-dialog');
-                    let externalUIMode = false;
-                    try {
-                        externalUIMode = keyfile.get_boolean('GNOME', 'supports-external-ui-mode');
-                    } catch(e) { } // ignore errors if key does not exist
-                    let path = binary;
-                    if (!GLib.path_is_absolute(path)) {
-                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
-                    }
-
-                    if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))
-                        this._vpnBinaries[service] = { fileName: path, externalUIMode: externalUIMode };
-                    else
-                        throw new Error('VPN plugin at %s is not executable'.format(path));
-                } catch(e) {
-                    log('Error \'%s\' while processing VPN keyfile \'%s\''.
-                        format(e.message, dir.get_child(name).get_path()));
-                    continue;
-                }
-            }
-        } catch(e) {
-            logError(e, 'error while enumerating VPN auth helpers');
-        }
-    }
-});
-const Component = NetworkAgent;

js/ui/contactDisplay.js

@@ -0,0 +1,180 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Folks = imports.gi.Folks
+const Lang = imports.lang;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
+const Util = imports.misc.util;
+const IconGrid = imports.ui.iconGrid;
+const Search = imports.ui.search;
+const SearchDisplay = imports.ui.searchDisplay;
+
+const MAX_SEARCH_RESULTS_ROWS = 1;
+const ICON_SIZE = 81;
+
+function launchContact(id) {
+    Util.spawn(['gnome-contacts', '-i', id]);
+}
+
+
+/* This class represents a shown contact search result in the overview */
+const Contact = new Lang.Class({
+    Name: 'Contact',
+
+    _init: function(id) {
+        this._contactSys = Shell.ContactSystem.get_default();
+        this.individual = this._contactSys.get_individual(id);
+
+        this.actor = new St.Bin({ style_class: 'contact',
+                                  reactive: true,
+                                  track_hover: true });
+
+        let content = new St.BoxLayout( { style_class: 'contact-content',
+                                          vertical: false });
+        this.actor.set_child(content);
+
+        let icon = new St.Icon({ icon_type: St.IconType.FULLCOLOR,
+                                 icon_size: ICON_SIZE,
+                                 style_class: 'contact-icon' });
+        if (this.individual.avatar != null)
+            icon.gicon = this.individual.avatar;
+        else
+            icon.icon_name = 'avatar-default';
+
+        content.add(icon, { x_fill: true,
+                            y_fill: false,
+                            x_align: St.Align.START,
+                            y_align: St.Align.MIDDLE });
+
+        let details = new St.BoxLayout({ style_class: 'contact-details',
+                                         vertical: true });
+        content.add(details, { x_fill: true,
+                               y_fill: false,
+                               x_align: St.Align.START,
+                               y_align: St.Align.MIDDLE });
+
+        let email = this._contactSys.get_email_for_display(this.individual);
+        let aliasText = this.individual.alias     ||
+                        this.individual.full_name ||
+                        this.individual.nickname  ||
+                        email                     ||
+                        _("Unknown");
+        let aliasLabel = new St.Label({ text: aliasText,
+                                        style_class: 'contact-details-alias' });
+        details.add(aliasLabel, { x_fill: true,
+                                  y_fill: false,
+                                  x_align: St.Align.START,
+                                  y_align: St.Align.START });
+
+        let presence = this._createPresence(this.individual.presence_type);
+        details.add(presence, { x_fill: false,
+                                y_fill: true,
+                                x_align: St.Align.START,
+                                y_align: St.Align.END });
+    },
+
+    _createPresence: function(presence) {
+        let text;
+        let iconName;
+
+        switch(presence) {
+          case Folks.PresenceType.AVAILABLE:
+            text = _("Available");
+            iconName = 'user-available';
+            break;
+          case Folks.PresenceType.AWAY:
+          case Folks.PresenceType.EXTENDED_AWAY:
+            text = _("Away");
+            iconName = 'user-away';
+            break;
+          case Folks.PresenceType.BUSY:
+            text = _("Busy");
+            iconName = 'user-busy';
+            break;
+          default:
+            text = _("Offline");
+            iconName = 'user-offline';
+          }
+
+        let icon = new St.Icon({ icon_name: iconName,
+                                 icon_type: St.IconType.FULLCOLOR,
+                                 icon_size: 16,
+                                 style_class: 'contact-details-status-icon' });
+        let label = new St.Label({ text: text });
+
+        let box = new St.BoxLayout({ vertical: false,
+                                     style_class: 'contact-details-status' });
+        box.add(icon, { x_fill: true,
+                        y_fill: false,
+                        x_align: St.Align.START,
+                        y_align: St.Align.START });
+
+        box.add(label, { x_fill: true,
+                         y_fill: false,
+                         x_align: St.Align.END,
+                         y_align: St.Align.START });
+
+        return box;
+    },
+
+    createIcon: function(size) {
+        let tc = St.TextureCache.get_default();
+        let icon = this.individual.avatar;
+
+        if (icon != null) {
+            return tc.load_gicon(null, icon, size);
+        } else {
+            return tc.load_icon_name(null, 'avatar-default', St.IconType.FULLCOLOR, size);
+        }
+    },
+});
+
+
+/* Searches for and returns contacts */
+const ContactSearchProvider = new Lang.Class({
+    Name: 'ContactSearchProvider',
+    Extends: Search.SearchProvider,
+
+    _init: function() {
+        this.parent(_("CONTACTS"));
+        this._contactSys = Shell.ContactSystem.get_default();
+    },
+
+    getResultMeta: function(id) {
+        let contact = new Contact(id);
+        return { 'id': id,
+                 'name': contact.alias,
+                 'createIcon': function(size) {
+                         return contact.createIcon(size);
+                 }
+        };
+    },
+
+    getInitialResultSet: function(terms) {
+        return this._contactSys.initial_search(terms);
+    },
+
+    getSubsearchResultSet: function(previousResults, terms) {
+        return this._contactSys.subsearch(previousResults, terms);
+    },
+
+    createResultActor: function(resultMeta, terms) {
+        let contact = new Contact(resultMeta.id);
+        return contact.actor;
+    },
+
+    createResultContainerActor: function() {
+        let grid = new IconGrid.IconGrid({ rowLimit: MAX_SEARCH_RESULTS_ROWS,
+                                             xAlign: St.Align.START });
+        grid.actor.style_class = 'contact-grid';
+
+        let actor = new SearchDisplay.GridSearchResults(this, grid);
+        return actor;
+    },
+
+    activateResult: function(id, params) {
+        launchContact(id);
+    }
+});

js/ui/ctrlAltTab.js

@@ -1,14 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
+const Gdk = imports.gi.Gdk;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
+const AltTab = imports.ui.altTab;
 const Main = imports.ui.main;
-const SwitcherPopup = imports.ui.switcherPopup;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 
@@ -26,9 +27,7 @@ const CtrlAltTabManager = new Lang.Class({
 
     _init: function() {
         this._items = [];
-        this.addGroup(global.window_group, _("Windows"),
-                      'emblem-documents-symbolic', { sortGroup: SortGroup.TOP,
-                                                     focusCallback: Lang.bind(this, this._focusWindows) });
+        this._focusManager = St.FocusManager.get_for_stage(global.stage);
     },
 
     addGroup: function(root, name, icon, params) {
@@ -42,13 +41,11 @@ const CtrlAltTabManager = new Lang.Class({
 
         this._items.push(item);
         root.connect('destroy', Lang.bind(this, function() { this.removeGroup(root); }));
-        if (root instanceof St.Widget)
-            global.focus_manager.add_group(root);
+        this._focusManager.add_group(root);
     },
 
     removeGroup: function(root) {
-        if (root instanceof St.Widget)
-            global.focus_manager.remove_group(root);
+        this._focusManager.remove_group(root);
         for (let i = 0; i < this._items.length; i++) {
             if (this._items[i].root == root) {
                 this._items.splice(i, 1);
@@ -57,9 +54,15 @@ const CtrlAltTabManager = new Lang.Class({
         }
     },
 
-    focusGroup: function(item, timestamp) {
-        if (item.focusCallback)
-            item.focusCallback(timestamp);
+    focusGroup: function(item) {
+        if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
+            global.stage_input_mode == Shell.StageInputMode.NORMAL)
+            global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+
+        if (item.window)
+            Main.activateWindow(item.window);
+        else if (item.focusCallback)
+            item.focusCallback();
         else
             item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
     },
@@ -72,45 +75,44 @@ const CtrlAltTabManager = new Lang.Class({
         if (a.sortGroup != b.sortGroup)
             return a.sortGroup - b.sortGroup;
 
-        let ax, bx, y;
-        [ax, y] = a.proxy.get_transformed_position();
-        [bx, y] = b.proxy.get_transformed_position();
+        let y;
+        if (a.x == undefined) {
+            if (a.window)
+                a.x = a.window.get_compositor_private().x;
+            else
+                [a.x, y] = a.proxy.get_transformed_position();
+        }
+        if (b.x == undefined) {
+            if (b.window)
+                b.x = b.window.get_compositor_private().x;
+            else
+                [b.x, y] = b.proxy.get_transformed_position();
+        }
 
-        return ax - bx;
+        return a.x - b.x;
     },
 
-    popup: function(backward, binding, mask) {
+    popup: function(backwards, mask) {
         // Start with the set of focus groups that are currently mapped
         let items = this._items.filter(function (item) { return item.proxy.mapped; });
 
         // And add the windows metacity would show in its Ctrl-Alt-Tab list
-        if (Main.sessionMode.hasWindows && !Main.overview.visible) {
+        if (!Main.overview.visible) {
             let screen = global.screen;
             let display = screen.get_display();
             let windows = display.get_tab_list(Meta.TabList.DOCKS, screen, screen.get_active_workspace ());
             let windowTracker = Shell.WindowTracker.get_default();
             let textureCache = St.TextureCache.get_default();
             for (let i = 0; i < windows.length; i++) {
-                let icon = null;
-                let iconName = null;
-                if (windows[i].get_window_type () == Meta.WindowType.DESKTOP) {
-                    iconName = 'video-display-symbolic';
-                } else {
-                    let app = windowTracker.get_window_app(windows[i]);
-                    if (app)
-                        icon = app.create_icon_texture(POPUP_APPICON_SIZE);
-                    else
-                        icon = textureCache.bind_pixbuf_property(windows[i], 'icon');
-                }
-
-                items.push({ name: windows[i].title,
-                             proxy: windows[i].get_compositor_private(),
-                             focusCallback: Lang.bind(windows[i],
-                                 function(timestamp) {
-                                     Main.activateWindow(this, timestamp);
-                                 }),
+                let icon;
+                let app = windowTracker.get_window_app(windows[i]);
+                if (app)
+                    icon = app.create_icon_texture(POPUP_APPICON_SIZE);
+                else
+                    icon = textureCache.bind_pixbuf_property(windows[i], 'icon');
+                items.push({ window: windows[i],
+                             name: windows[i].title,
                              iconActor: icon,
-                             iconName: iconName,
                              sortGroup: SortGroup.MIDDLE });
             }
         }
@@ -121,61 +123,187 @@ const CtrlAltTabManager = new Lang.Class({
         items.sort(Lang.bind(this, this._sortItems));
 
         if (!this._popup) {
-            this._popup = new CtrlAltTabPopup(items);
-            this._popup.show(backward, binding, mask);
+            this._popup = new CtrlAltTabPopup();
+            this._popup.show(items, backwards, mask);
 
             this._popup.actor.connect('destroy',
                                       Lang.bind(this, function() {
                                           this._popup = null;
                                       }));
         }
-    },
-
-    _focusWindows: function(timestamp) {
-        global.screen.focus_default_window(timestamp);
     }
 });
 
+function mod(a, b) {
+    return (a + b) % b;
+}
+
 const CtrlAltTabPopup = new Lang.Class({
     Name: 'CtrlAltTabPopup',
-    Extends: SwitcherPopup.SwitcherPopup,
 
-    _createSwitcher: function() {
-        this._switcherList = new CtrlAltTabSwitcher(this._items);
+    _init : function() {
+        this.actor = new Shell.GenericContainer({ name: 'ctrlAltTabPopup',
+                                                  reactive: true });
+
+        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
+        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
+        this.actor.connect('allocate', Lang.bind(this, this._allocate));
+
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+
+        this._haveModal = false;
+        this._modifierMask = 0;
+        this._selection = 0;
+
+        Main.uiGroup.add_actor(this.actor);
+    },
+
+    _getPreferredWidth: function (actor, forHeight, alloc) {
+        let primary = Main.layoutManager.primaryMonitor;
+
+        alloc.min_size = primary.width;
+        alloc.natural_size = primary.width;
+    },
+
+    _getPreferredHeight: function (actor, forWidth, alloc) {
+        let primary = Main.layoutManager.primaryMonitor;
+
+        alloc.min_size = primary.height;
+        alloc.natural_size = primary.height;
+    },
+
+    _allocate: function (actor, box, flags) {
+        let childBox = new Clutter.ActorBox();
+        let primary = Main.layoutManager.primaryMonitor;
+
+        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
+        let vPadding = this.actor.get_theme_node().get_vertical_padding();
+        let hPadding = this.actor.get_theme_node().get_horizontal_padding();
+
+        let [childMinHeight, childNaturalHeight] = this._switcher.actor.get_preferred_height(primary.width - hPadding);
+        let [childMinWidth, childNaturalWidth] = this._switcher.actor.get_preferred_width(childNaturalHeight);
+        childBox.x1 = Math.max(primary.x + leftPadding, primary.x + Math.floor((primary.width - childNaturalWidth) / 2));
+        childBox.x2 = Math.min(primary.x + primary.width - hPadding, childBox.x1 + childNaturalWidth);
+        childBox.y1 = primary.y + Math.floor((primary.height - childNaturalHeight) / 2);
+        childBox.y2 = childBox.y1 + childNaturalHeight;
+        this._switcher.actor.allocate(childBox, flags);
+    },
+
+    show : function(items, startBackwards, mask) {
+        if (!Main.pushModal(this.actor))
+            return false;
+        this._haveModal = true;
+        this._modifierMask = AltTab.primaryModifier(mask);
+
+        this._keyPressEventId = this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
+        this._keyReleaseEventId = this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
+
+        this._items = items;
+        this._switcher = new CtrlAltTabSwitcher(items);
+        this.actor.add_actor(this._switcher.actor);
+
+        if (startBackwards)
+            this._selection = this._items.length - 1;
+        this._select(this._selection);
+
+        let [x, y, mods] = global.get_pointer();
+        if (!(mods & this._modifierMask)) {
+            this._finish();
+            return false;
+        }
+
+        this.actor.opacity = 0;
+        this.actor.show();
+        Tweener.addTween(this.actor,
+                         { opacity: 255,
+                           time: POPUP_FADE_TIME,
+                           transition: 'easeOutQuad'
+                         });
+
         return true;
     },
 
-    _initialSelection: function(backward, binding) {
-        if (binding == 'switch-panels') {
-            if (backward)
-                this._selectedIndex = this._items.length - 1;
-        } else if (binding == 'switch-panels-backward') {
-            if (!backward)
-                this._selectedIndex = this._items.length - 1;
-        }
-        this._select(this._selectedIndex);
+    _next : function() {
+        return mod(this._selection + 1, this._items.length);
     },
 
-    _keyPressHandler: function(keysym, backwards, action) {
-        if (action == Meta.KeyBindingAction.SWITCH_PANELS)
-            this._select(backwards ? this._previous() : this._next());
-        else if (action == Meta.KeyBindingAction.SWITCH_PANELS_BACKWARD)
-            this._select(backwards ? this._next() : this._previous());
-        else if (keysym == Clutter.Left)
-            this._select(this._previous());
-        else if (keysym == Clutter.Right)
+    _previous : function() {
+        return mod(this._selection - 1, this._items.length);
+    },
+
+    _keyPressEvent : function(actor, event) {
+        let keysym = event.get_key_symbol();
+        let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
+        if (shift && keysym == Clutter.KEY_Tab)
+            keysym = Clutter.ISO_Left_Tab;
+
+        if (keysym == Clutter.KEY_Escape)
+            this.destroy();
+        else if (keysym == Clutter.KEY_Tab)
             this._select(this._next());
+        else if (keysym == Clutter.KEY_ISO_Left_Tab)
+            this._select(this._previous());
+        else if (keysym == Clutter.KEY_Left)
+            this._select(this._previous());
+        else if (keysym == Clutter.KEY_Right)
+            this._select(this._next());
+
+        return true;
     },
 
-    _finish : function(time) {
-        this.parent(time);
-        Main.ctrlAltTabManager.focusGroup(this._items[this._selectedIndex], time);
+    _keyReleaseEvent : function(actor, event) {
+        let [x, y, mods] = global.get_pointer();
+        let state = mods & this._modifierMask;
+
+        if (state == 0)
+            this._finish();
+
+        return true;
     },
+
+    _finish : function() {
+        this.destroy();
+
+        Main.ctrlAltTabManager.focusGroup(this._items[this._selection]);
+    },
+
+    _popModal: function() {
+        if (this._haveModal) {
+            Main.popModal(this.actor);
+            this._haveModal = false;
+        }
+    },
+
+    destroy : function() {
+        this._popModal();
+        Tweener.addTween(this.actor,
+                         { opacity: 0,
+                           time: POPUP_FADE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                               function() {
+                                   this.actor.destroy();
+                               })
+                         });
+    },
+
+    _onDestroy : function() {
+        this._popModal();
+        if (this._keyPressEventId)
+            this.actor.disconnect(this._keyPressEventId);
+        if (this._keyReleaseEventId)
+            this.actor.disconnect(this._keyReleaseEventId);
+    },
+
+    _select : function(num) {
+        this._selection = num;
+        this._switcher.highlight(num);
+    }
 });
 
 const CtrlAltTabSwitcher = new Lang.Class({
     Name: 'CtrlAltTabSwitcher',
-    Extends: SwitcherPopup.SwitcherList,
+    Extends: AltTab.SwitcherList,
 
     _init : function(items) {
         this.parent(true);
@@ -191,6 +319,7 @@ const CtrlAltTabSwitcher = new Lang.Class({
         let icon = item.iconActor;
         if (!icon) {
             icon = new St.Icon({ icon_name: item.iconName,
+                                 icon_type: St.IconType.SYMBOLIC,
                                  icon_size: POPUP_APPICON_SIZE });
         }
         box.add(icon, { x_fill: false, y_fill: false } );

js/ui/dash.js

@@ -1,13 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
 const Signals = imports.signals;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const Mainloop = imports.mainloop;
 
 const AppDisplay = imports.ui.appDisplay;
 const AppFavorites = imports.ui.appFavorites;
@@ -18,42 +16,29 @@ const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;
 
 const DASH_ANIMATION_TIME = 0.2;
-const DASH_ITEM_LABEL_SHOW_TIME = 0.15;
-const DASH_ITEM_LABEL_HIDE_TIME = 0.1;
-const DASH_ITEM_HOVER_TIMEOUT = 300;
-
-function getAppFromSource(source) {
-    if (source instanceof AppDisplay.AppIcon) {
-        return source.app;
-    } else {
-        return null;
-    }
-}
 
 // A container like StBin, but taking the child's scale into account
 // when requesting a size
 const DashItemContainer = new Lang.Class({
     Name: 'DashItemContainer',
-    Extends: St.Widget,
 
     _init: function() {
-        this.parent({ style_class: 'dash-item-container' });
-
-        this._labelText = "";
-        this.label = new St.Label({ style_class: 'dash-label'});
-        this.label.hide();
-        Main.layoutManager.addChrome(this.label);
-        this.label_actor = this.label;
+        this.actor = new Shell.GenericContainer({ style_class: 'dash-item-container' });
+        this.actor.connect('get-preferred-width',
+                           Lang.bind(this, this._getPreferredWidth));
+        this.actor.connect('get-preferred-height',
+                           Lang.bind(this, this._getPreferredHeight));
+        this.actor.connect('allocate',
+                           Lang.bind(this, this._allocate));
+        this.actor._delegate = this;
 
         this.child = null;
-        this._childScale = 0;
-        this._childOpacity = 0;
+        this._childScale = 1;
+        this._childOpacity = 255;
         this.animatingOut = false;
     },
 
-    vfunc_allocate: function(box, flags) {
-        this.set_allocation(box, flags);
-
+    _allocate: function(actor, box, flags) {
         if (this.child == null)
             return;
 
@@ -75,131 +60,69 @@ const DashItemContainer = new Lang.Class({
         this.child.allocate(childBox, flags);
     },
 
-    vfunc_get_preferred_height: function(forWidth) {
-        let themeNode = this.get_theme_node();
+    _getPreferredHeight: function(actor, forWidth, alloc) {
+        alloc.min_size = 0;
+        alloc.natural_size = 0;
 
         if (this.child == null)
-            return [0, 0];
-
-        forWidth = themeNode.adjust_for_width(forWidth);
-        let [minHeight, natHeight] = this.child.get_preferred_height(forWidth);
-        return themeNode.adjust_preferred_height(minHeight * this.child.scale_y,
-                                                 natHeight * this.child.scale_y);
-    },
-
-    vfunc_get_preferred_width: function(forHeight) {
-        let themeNode = this.get_theme_node();
-
-        if (this.child == null)
-            return [0, 0];
-
-        forHeight = themeNode.adjust_for_height(forHeight);
-        let [minWidth, natWidth] = this.child.get_preferred_width(forHeight);
-        return themeNode.adjust_preferred_width(minWidth * this.child.scale_y,
-                                                natWidth * this.child.scale_y);
-    },
-
-    showLabel: function() {
-        if (!this._labelText)
             return;
 
-        this.label.set_text(this._labelText);
-        this.label.opacity = 0;
-        this.label.show();
-
-        let [stageX, stageY] = this.get_transformed_position();
-
-        let itemHeight = this.allocation.y2 - this.allocation.y1;
-
-        let labelHeight = this.label.get_height();
-        let yOffset = Math.floor((itemHeight - labelHeight) / 2)
-
-        let y = stageY + yOffset;
-
-        let node = this.label.get_theme_node();
-        let xOffset = node.get_length('-x-offset');
-
-        let x;
-        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
-            x = stageX - this.label.get_width() - xOffset;
-        else
-            x = stageX + this.get_width() + xOffset;
-
-        this.label.set_position(x, y);
-        Tweener.addTween(this.label,
-                         { opacity: 255,
-                           time: DASH_ITEM_LABEL_SHOW_TIME,
-                           transition: 'easeOutQuad',
-                         });
+        let [minHeight, natHeight] = this.child.get_preferred_height(forWidth);
+        alloc.min_size += minHeight * this.child.scale_y;
+        alloc.natural_size += natHeight * this.child.scale_y;
     },
 
-    setLabelText: function(text) {
-        this._labelText = text;
-        this.child.accessible_name = text;
-    },
+    _getPreferredWidth: function(actor, forHeight, alloc) {
+        alloc.min_size = 0;
+        alloc.natural_size = 0;
 
-    hideLabel: function () {
-        Tweener.addTween(this.label,
-                         { opacity: 0,
-                           time: DASH_ITEM_LABEL_HIDE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
-                               this.label.hide();
-                           })
-                         });
+        if (this.child == null)
+            return;
+
+        let [minWidth, natWidth] = this.child.get_preferred_width(forHeight);
+        alloc.min_size = minWidth * this.child.scale_y;
+        alloc.natural_size = natWidth * this.child.scale_y;
     },
 
     setChild: function(actor) {
         if (this.child == actor)
             return;
 
-        this.destroy_all_children();
+        this.actor.destroy_children();
 
         this.child = actor;
-        this.add_actor(this.child);
-
-        this.child.set_scale_with_gravity(this._childScale, this._childScale,
-                                          Clutter.Gravity.CENTER);
-        this.child.set_opacity(this._childOpacity);
+        this.actor.add_actor(this.child);
     },
 
-    show: function(animate) {
+    animateIn: function() {
         if (this.child == null)
             return;
 
-        let time = animate ? DASH_ANIMATION_TIME : 0;
+        this.childScale = 0;
+        this.childOpacity = 0;
         Tweener.addTween(this,
                          { childScale: 1.0,
                            childOpacity: 255,
-                           time: time,
+                           time: DASH_ANIMATION_TIME,
                            transition: 'easeOutQuad'
                          });
     },
 
-    destroy: function() {
-        if (this.label)
-            this.label.destroy();
-
-        this.parent();
-    },
-
     animateOutAndDestroy: function() {
-        if (this.label)
-            this.label.destroy();
-
         if (this.child == null) {
-            this.destroy();
+            this.actor.destroy();
             return;
         }
 
         this.animatingOut = true;
+        this.childScale = 1.0;
         Tweener.addTween(this,
                          { childScale: 0.0,
                            childOpacity: 0,
                            time: DASH_ANIMATION_TIME,
                            transition: 'easeOutQuad',
                            onComplete: Lang.bind(this, function() {
-                               this.destroy();
+                               this.actor.destroy();
                            })
                          });
     },
@@ -212,7 +135,7 @@ const DashItemContainer = new Lang.Class({
 
         this.child.set_scale_with_gravity(scale, scale,
                                           Clutter.Gravity.CENTER);
-        this.queue_relayout();
+        this.actor.queue_relayout();
     },
 
     get childScale() {
@@ -226,7 +149,7 @@ const DashItemContainer = new Lang.Class({
             return;
 
         this.child.set_opacity(opacity);
-        this.queue_redraw();
+        this.actor.queue_redraw();
     },
 
     get childOpacity() {
@@ -234,70 +157,52 @@ const DashItemContainer = new Lang.Class({
     }
 });
 
-const ShowAppsIcon = new Lang.Class({
-    Name: 'ShowAppsIcon',
+const RemoveFavoriteIcon = new Lang.Class({
+    Name: 'RemoveFavoriteIcon',
     Extends: DashItemContainer,
 
     _init: function() {
         this.parent();
 
-        this.toggleButton = new St.Button({ style_class: 'show-apps',
-                                            track_hover: true,
-                                            can_focus: true,
-                                            toggle_mode: true });
+        this._iconBin = new St.Bin({ style_class: 'remove-favorite' });
         this._iconActor = null;
-        this.icon = new IconGrid.BaseIcon(_("Show Applications"),
+        this.icon = new IconGrid.BaseIcon(_("Remove"),
                                            { setSizeManually: true,
                                              showLabel: false,
                                              createIcon: Lang.bind(this, this._createIcon) });
-        this.toggleButton.add_actor(this.icon.actor);
-        this.toggleButton._delegate = this;
+        this._iconBin.set_child(this.icon.actor);
+        this._iconBin._delegate = this;
 
-        this.setChild(this.toggleButton);
-        this.setDragApp(null);
+        this.setChild(this._iconBin);
     },
 
     _createIcon: function(size) {
-        this._iconActor = new St.Icon({ icon_name: 'view-grid-symbolic',
-                                        icon_size: size,
-                                        style_class: 'show-apps-icon',
-                                        track_hover: true });
+        this._iconActor = new St.Icon({ icon_name: 'user-trash',
+                                        style_class: 'remove-favorite-icon',
+                                        icon_size: size });
         return this._iconActor;
     },
 
-    _canRemoveApp: function(app) {
-        if (app == null)
-            return false;
-
-        let id = app.get_id();
-        let isFavorite = AppFavorites.getAppFavorites().isFavorite(id);
-        return isFavorite;
-    },
-
-    setDragApp: function(app) {
-        let canRemove = this._canRemoveApp(app);
-
-        this.toggleButton.set_hover(canRemove);
+    setHover: function(hovered) {
+        this._iconBin.set_hover(hovered);
         if (this._iconActor)
-            this._iconActor.set_hover(canRemove);
-
-        if (canRemove)
-            this.setLabelText(_("Remove from Favorites"));
-        else
-            this.setLabelText(_("Show Applications"));
+            this._iconActor.set_hover(hovered);
     },
 
+    // Rely on the dragged item being a favorite
     handleDragOver: function(source, actor, x, y, time) {
-        if (!this._canRemoveApp(getAppFromSource(source)))
-            return DND.DragMotionResult.NO_DROP;
-
         return DND.DragMotionResult.MOVE_DROP;
     },
 
     acceptDrop: function(source, actor, x, y, time) {
-        let app = getAppFromSource(source);
-        if (!this._canRemoveApp(app))
-            return false;
+        let app = null;
+        if (source instanceof AppDisplay.AppWellIcon) {
+            let appSystem = Shell.AppSystem.get_default();
+            app = appSystem.lookup_app(source.getId());
+        } else if (source.metaWindow) {
+            let tracker = Shell.WindowTracker.get_default();
+            app = tracker.get_window_app(source.metaWindow);
+        }
 
         let id = app.get_id();
 
@@ -321,66 +226,6 @@ const DragPlaceholderItem = new Lang.Class({
     }
 });
 
-const EmptyDropTargetItem = new Lang.Class({
-    Name: 'EmptyDropTargetItem',
-    Extends: DashItemContainer,
-
-    _init: function() {
-        this.parent();
-        this.setChild(new St.Bin({ style_class: 'empty-dash-drop-target' }));
-    }
-});
-
-const DashActor = new Lang.Class({
-    Name: 'DashActor',
-    Extends: St.Widget,
-
-    _init: function() {
-        let layout = new Clutter.BoxLayout({ orientation: Clutter.Orientation.VERTICAL });
-        this.parent({ name: 'dash',
-                      layout_manager: layout,
-                      clip_to_allocation: true });
-    },
-
-    vfunc_allocate: function(box, flags) {
-        let contentBox = this.get_theme_node().get_content_box(box);
-        let availWidth = contentBox.x2 - contentBox.x1;
-
-        this.set_allocation(box, flags);
-
-        let [appIcons, showAppsButton] = this.get_children();
-        let [showAppsMinHeight, showAppsNatHeight] = showAppsButton.get_preferred_height(availWidth);
-
-        let childBox = new Clutter.ActorBox();
-        childBox.x1 = contentBox.x1;
-        childBox.y1 = contentBox.y1;
-        childBox.x2 = contentBox.x2;
-        childBox.y2 = contentBox.y2 - showAppsNatHeight;
-        appIcons.allocate(childBox, flags);
-
-        childBox.y1 = contentBox.y2 - showAppsNatHeight;
-        childBox.y2 = contentBox.y2;
-        showAppsButton.allocate(childBox, flags);
-    },
-
-    vfunc_get_preferred_height: function(forWidth) {
-        // We want to request the natural height of all our children
-        // as our natural height, so we chain up to StWidget (which
-        // then calls BoxLayout), but we only request the showApps
-        // button as the minimum size
-
-        let [, natHeight] = this.parent(forWidth);
-
-        let themeNode = this.get_theme_node();
-        let adjustedForWidth = themeNode.adjust_for_width(forWidth);
-        let [, showAppsButton] = this.get_children();
-        let [minHeight, ] = showAppsButton.get_preferred_height(adjustedForWidth);
-        [minHeight, ] = themeNode.adjust_preferred_height(minHeight, natHeight);
-
-        return [minHeight, natHeight];
-    }
-});
-
 const Dash = new Lang.Class({
     Name: 'Dash',
 
@@ -392,27 +237,14 @@ const Dash = new Lang.Class({
         this._dragPlaceholder = null;
         this._dragPlaceholderPos = -1;
         this._animatingPlaceholdersCount = 0;
-        this._showLabelTimeoutId = 0;
-        this._resetHoverTimeoutId = 0;
-        this._labelShowing = false;
+        this._favRemoveTarget = null;
 
-        this._container = new DashActor();
-        this._box = new St.BoxLayout({ vertical: true,
+        this._box = new St.BoxLayout({ name: 'dash',
+                                       vertical: true,
                                        clip_to_allocation: true });
         this._box._delegate = this;
-        this._container.add_actor(this._box);
 
-        this._showAppsIcon = new ShowAppsIcon();
-        this._showAppsIcon.childScale = 1;
-        this._showAppsIcon.childOpacity = 255;
-        this._showAppsIcon.icon.setIconSize(this.iconSize);
-        this._hookUpLabel(this._showAppsIcon);
-
-        this.showAppsButton = this._showAppsIcon.toggleButton;
-
-        this._container.add_actor(this._showAppsIcon);
-
-        this.actor = new St.Bin({ child: this._container });
+        this.actor = new St.Bin({ y_align: St.Align.START, child: this._box });
         this.actor.connect('notify::height', Lang.bind(this,
             function() {
                 if (this._maxHeight != this.actor.height)
@@ -422,12 +254,10 @@ const Dash = new Lang.Class({
 
         this._workId = Main.initializeDeferredWork(this._box, Lang.bind(this, this._redisplay));
 
+        this._tracker = Shell.WindowTracker.get_default();
         this._appSystem = Shell.AppSystem.get_default();
 
-        this._appSystem.connect('installed-changed', Lang.bind(this, function() {
-            AppFavorites.getAppFavorites().reload();
-            this._queueRedisplay();
-        }));
+        this._appSystem.connect('installed-changed', Lang.bind(this, this._queueRedisplay));
         AppFavorites.getAppFavorites().connect('changed', Lang.bind(this, this._queueRedisplay));
         this._appSystem.connect('app-state-changed', Lang.bind(this, this._queueRedisplay));
 
@@ -437,10 +267,12 @@ const Dash = new Lang.Class({
                               Lang.bind(this, this._onDragEnd));
         Main.overview.connect('item-drag-cancelled',
                               Lang.bind(this, this._onDragCancelled));
-
-        // Translators: this is the name of the dock/favorites area on
-        // the left of the overview
-        Main.ctrlAltTabManager.addGroup(this.actor, _("Dash"), 'user-bookmarks-symbolic');
+        Main.overview.connect('window-drag-begin',
+                              Lang.bind(this, this._onDragBegin));
+        Main.overview.connect('window-drag-cancelled',
+                              Lang.bind(this, this._onDragCancelled));
+        Main.overview.connect('window-drag-end',
+                              Lang.bind(this, this._onDragEnd));
     },
 
     _onDragBegin: function() {
@@ -449,12 +281,6 @@ const Dash = new Lang.Class({
             dragMotion: Lang.bind(this, this._onDragMotion)
         };
         DND.addDragMonitor(this._dragMonitor);
-
-        if (this._box.get_n_children() == 0) {
-            this._emptyDropTarget = new EmptyDropTargetItem();
-            this._box.insert_child_at_index(this._emptyDropTarget, 0);
-            this._emptyDropTarget.show(true);
-        }
     },
 
     _onDragCancelled: function() {
@@ -471,26 +297,53 @@ const Dash = new Lang.Class({
 
     _endDrag: function() {
         this._clearDragPlaceholder();
-        this._clearEmptyDropTarget();
-        this._showAppsIcon.setDragApp(null);
+        if (this._favRemoveTarget) {
+            this._favRemoveTarget.animateOutAndDestroy();
+            this._favRemoveTarget.actor.connect('destroy', Lang.bind(this,
+                function() {
+                    this._favRemoveTarget = null;
+                }));
+            this._adjustIconSize();
+        }
         DND.removeDragMonitor(this._dragMonitor);
     },
 
     _onDragMotion: function(dragEvent) {
-        let app = getAppFromSource(dragEvent.source);
-        if (app == null)
+        let app = null;
+        if (dragEvent.source instanceof AppDisplay.AppWellIcon)
+            app = this._appSystem.lookup_app(dragEvent.source.getId());
+        else if (dragEvent.source.metaWindow)
+            app = this._tracker.get_window_app(dragEvent.source.metaWindow);
+        else
             return DND.DragMotionResult.CONTINUE;
 
-        let showAppsHovered =
-                this._showAppsIcon.contains(dragEvent.targetActor);
+        let id = app.get_id();
 
-        if (!this._box.contains(dragEvent.targetActor) || showAppsHovered)
+        let favorites = AppFavorites.getAppFavorites().getFavoriteMap();
+
+        let srcIsFavorite = (id in favorites);
+
+        if (srcIsFavorite &&
+            dragEvent.source.actor &&
+            this.actor.contains (dragEvent.source.actor) &&
+            this._favRemoveTarget == null) {
+                this._favRemoveTarget = new RemoveFavoriteIcon();
+                this._favRemoveTarget.icon.setIconSize(this.iconSize);
+                this._box.add(this._favRemoveTarget.actor);
+                this._adjustIconSize();
+                this._favRemoveTarget.animateIn();
+        }
+
+        let favRemoveHovered = false;
+        if (this._favRemoveTarget)
+            favRemoveHovered =
+                this._favRemoveTarget.actor.contains(dragEvent.targetActor);
+
+        if (!this._box.contains(dragEvent.targetActor) || favRemoveHovered)
             this._clearDragPlaceholder();
 
-        if (showAppsHovered)
-            this._showAppsIcon.setDragApp(app);
-        else
-            this._showAppsIcon.setDragApp(null);
+        if (this._favRemoveTarget)
+            this._favRemoveTarget.setHover(favRemoveHovered);
 
         return DND.DragMotionResult.CONTINUE;
     },
@@ -506,119 +359,52 @@ const Dash = new Lang.Class({
         Main.queueDeferredWork(this._workId);
     },
 
-    _hookUpLabel: function(item, appIcon) {
-        item.child.connect('notify::hover', Lang.bind(this, function() {
-            this._syncLabel(item, appIcon);
-        }));
-
-        Main.overview.connect('hiding', Lang.bind(this, function() {
-            this._labelShowing = false;
-            item.hideLabel();
-        }));
-
-        if (appIcon) {
-            appIcon.connect('sync-tooltip', Lang.bind(this, function() {
-                this._syncLabel(item, appIcon);
-            }));
-        }
-    },
-
     _createAppItem: function(app) {
-        let appIcon = new AppDisplay.AppIcon(app,
-                                             { setSizeManually: true,
-                                               showLabel: false });
-        appIcon._draggable.connect('drag-begin',
+        let display = new AppDisplay.AppWellIcon(app,
+                                                 { setSizeManually: true,
+                                                   showLabel: false });
+        display._draggable.connect('drag-begin',
                                    Lang.bind(this, function() {
-                                       appIcon.actor.opacity = 50;
+                                       display.actor.opacity = 50;
                                    }));
-        appIcon._draggable.connect('drag-end',
+        display._draggable.connect('drag-end',
                                    Lang.bind(this, function() {
-                                       appIcon.actor.opacity = 255;
+                                       display.actor.opacity = 255;
                                    }));
-        appIcon.connect('menu-state-changed',
-                        Lang.bind(this, function(appIcon, opened) {
-                            this._itemMenuStateChanged(item, opened);
-                        }));
+        display.actor.set_tooltip_text(app.get_name());
 
         let item = new DashItemContainer();
-        item.setChild(appIcon.actor);
+        item.setChild(display.actor);
 
-        // Override default AppIcon label_actor, now the
-        // accessible_name is set at DashItemContainer.setLabelText
-        appIcon.actor.label_actor = null;
-        item.setLabelText(app.get_name());
-
-        appIcon.icon.setIconSize(this.iconSize);
-        this._hookUpLabel(item, appIcon);
+        display.icon.setIconSize(this.iconSize);
 
         return item;
     },
 
-    _itemMenuStateChanged: function(item, opened) {
-        // When the menu closes, it calls sync_hover, which means
-        // that the notify::hover handler does everything we need to.
-        if (opened) {
-            if (this._showLabelTimeoutId > 0) {
-                Mainloop.source_remove(this._showLabelTimeoutId);
-                this._showLabelTimeoutId = 0;
-            }
-
-            item.hideLabel();
-        }
-    },
-
-    _syncLabel: function (item, appIcon) {
-        let shouldShow = appIcon ? appIcon.shouldShowTooltip() : item.child.get_hover();
-
-        if (shouldShow) {
-            if (this._showLabelTimeoutId == 0) {
-                let timeout = this._labelShowing ? 0 : DASH_ITEM_HOVER_TIMEOUT;
-                this._showLabelTimeoutId = Mainloop.timeout_add(timeout,
-                    Lang.bind(this, function() {
-                        this._labelShowing = true;
-                        item.showLabel();
-                        this._showLabelTimeoutId = 0;
-                        return GLib.SOURCE_REMOVE;
-                    }));
-                if (this._resetHoverTimeoutId > 0) {
-                    Mainloop.source_remove(this._resetHoverTimeoutId);
-                    this._resetHoverTimeoutId = 0;
-                }
-            }
-        } else {
-            if (this._showLabelTimeoutId > 0)
-                Mainloop.source_remove(this._showLabelTimeoutId);
-            this._showLabelTimeoutId = 0;
-            item.hideLabel();
-            if (this._labelShowing) {
-                this._resetHoverTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT,
-                    Lang.bind(this, function() {
-                        this._labelShowing = false;
-                        this._resetHoverTimeoutId = 0;
-                        return GLib.SOURCE_REMOVE;
-                    }));
-            }
-        }
-    },
-
     _adjustIconSize: function() {
         // For the icon size, we only consider children which are "proper"
         // icons (i.e. ignoring drag placeholders) and which are not
         // animating out (which means they will be destroyed at the end of
         // the animation)
         let iconChildren = this._box.get_children().filter(function(actor) {
-            return actor.child &&
-                   actor.child._delegate &&
-                   actor.child._delegate.icon &&
-                   !actor.animatingOut;
+            return actor._delegate.child &&
+                   actor._delegate.child._delegate &&
+                   actor._delegate.child._delegate.icon &&
+                   !actor._delegate.animatingOut;
         });
 
-        iconChildren.push(this._showAppsIcon);
+        if (iconChildren.length == 0) {
+            this._box.add_style_pseudo_class('empty');
+            return;
+        }
+
+        this._box.remove_style_pseudo_class('empty');
 
         if (this._maxHeight == -1)
             return;
 
-        let themeNode = this._container.get_theme_node();
+
+        let themeNode = this.actor.get_theme_node();
         let maxAllocation = new Clutter.ActorBox({ x1: 0, y1: 0,
                                                    x2: 42 /* whatever */,
                                                    y2: this._maxHeight });
@@ -626,18 +412,24 @@ const Dash = new Lang.Class({
         let availHeight = maxContent.y2 - maxContent.y1;
         let spacing = themeNode.get_length('spacing');
 
-        let firstButton = iconChildren[0].child;
-        let firstIcon = firstButton._delegate.icon;
+
+        let firstIcon = iconChildren[0]._delegate.child._delegate.icon;
 
         let minHeight, natHeight;
 
-        // Enforce the current icon size during the size request
-        let [currentWidth, currentHeight] = firstIcon.icon.get_size();
+        // Enforce the current icon size during the size request if
+        // the icon is animating
+        if (firstIcon._animating) {
+            let [currentWidth, currentHeight] = firstIcon.icon.get_size();
 
-        firstIcon.icon.set_size(this.iconSize, this.iconSize);
-        [minHeight, natHeight] = firstButton.get_preferred_height(-1);
+            firstIcon.icon.set_size(this.iconSize, this.iconSize);
+            [minHeight, natHeight] = iconChildren[0].get_preferred_height(-1);
+
+            firstIcon.icon.set_size(currentWidth, currentHeight);
+        } else {
+            [minHeight, natHeight] = iconChildren[0].get_preferred_height(-1);
+        }
 
-        firstIcon.icon.set_size(currentWidth, currentHeight);
 
         // Subtract icon padding and box spacing from the available height
         availHeight -= iconChildren.length * (natHeight - this.iconSize) +
@@ -662,17 +454,15 @@ const Dash = new Lang.Class({
 
         let scale = oldIconSize / newIconSize;
         for (let i = 0; i < iconChildren.length; i++) {
-            let icon = iconChildren[i].child._delegate.icon;
+            let icon = iconChildren[i]._delegate.child._delegate.icon;
 
             // Set the new size immediately, to keep the icons' sizes
             // in sync with this.iconSize
             icon.setIconSize(this.iconSize);
 
             // Don't animate the icon size change when the overview
-            // is transitioning, not visible or when initially filling
-            // the dash
-            if (!Main.overview.visible || Main.overview.animationInProgress ||
-                !this._shownInitially)
+            // is not visible or when initially filling the dash
+            if (!Main.overview.visible || !this._shownInitially)
                 continue;
 
             let [targetWidth, targetHeight] = icon.icon.get_size();
@@ -682,11 +472,15 @@ const Dash = new Lang.Class({
             icon.icon.set_size(icon.icon.width * scale,
                                icon.icon.height * scale);
 
+            icon._animating = true;
             Tweener.addTween(icon.icon,
                              { width: targetWidth,
                                height: targetHeight,
                                time: DASH_ANIMATION_TIME,
                                transition: 'easeOutQuad',
+                               onComplete: function() {
+                                   icon._animating = false;
+                               }
                              });
         }
     },
@@ -697,13 +491,13 @@ const Dash = new Lang.Class({
         let running = this._appSystem.get_running();
 
         let children = this._box.get_children().filter(function(actor) {
-                return actor.child &&
-                       actor.child._delegate &&
-                       actor.child._delegate.app;
+                return actor._delegate.child &&
+                       actor._delegate.child._delegate &&
+                       actor._delegate.child._delegate.app;
             });
         // Apps currently in the dash
         let oldApps = children.map(function(actor) {
-                return actor.child._delegate.app;
+                return actor._delegate.child._delegate.app;
             });
         // Apps supposed to be in the dash
         let newApps = [];
@@ -769,7 +563,7 @@ const Dash = new Lang.Class({
             let insertHere = newApps[newIndex + 1] &&
                              newApps[newIndex + 1] == oldApps[oldIndex];
             let alreadyRemoved = removedActors.reduce(function(result, actor) {
-                let removedApp = actor.child._delegate.app;
+                let removedApp = actor._delegate.child._delegate.app;
                 return result || removedApp == newApps[newIndex];
             }, false);
 
@@ -786,62 +580,50 @@ const Dash = new Lang.Class({
         }
 
         for (let i = 0; i < addedItems.length; i++)
-            this._box.insert_child_at_index(addedItems[i].item,
-                                            addedItems[i].pos);
+            this._box.insert_actor(addedItems[i].item.actor,
+                                   addedItems[i].pos);
 
         for (let i = 0; i < removedActors.length; i++) {
-            let item = removedActors[i];
+            let item = removedActors[i]._delegate;
 
-            // Don't animate item removal when the overview is transitioning
-            // or hidden
-            if (Main.overview.visible && !Main.overview.animationInProgress)
+            // Don't animate item removal when the overview is hidden
+            if (Main.overview.visible)
                 item.animateOutAndDestroy();
             else
-                item.destroy();
+                item.actor.destroy();
         }
 
         this._adjustIconSize();
 
         // Skip animations on first run when adding the initial set
         // of items, to avoid all items zooming in at once
-
-        let animate = this._shownInitially && Main.overview.visible &&
-            !Main.overview.animationInProgress;
-
-        if (!this._shownInitially)
+        if (!this._shownInitially) {
             this._shownInitially = true;
-
-        for (let i = 0; i < addedItems.length; i++) {
-            addedItems[i].item.show(animate);
+            return;
         }
 
-        // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=692744
-        // Without it, StBoxLayout may use a stale size cache
-        this._box.queue_relayout();
+        // Don't animate item addition when the overview is hidden
+        if (!Main.overview.visible)
+            return;
+
+        for (let i = 0; i < addedItems.length; i++)
+            addedItems[i].item.animateIn();
     },
 
     _clearDragPlaceholder: function() {
         if (this._dragPlaceholder) {
-            this._animatingPlaceholdersCount++;
             this._dragPlaceholder.animateOutAndDestroy();
-            this._dragPlaceholder.connect('destroy',
-                Lang.bind(this, function() {
-                    this._animatingPlaceholdersCount--;
-                }));
             this._dragPlaceholder = null;
-        }
-        this._dragPlaceholderPos = -1;
-    },
-
-    _clearEmptyDropTarget: function() {
-        if (this._emptyDropTarget) {
-            this._emptyDropTarget.animateOutAndDestroy();
-            this._emptyDropTarget = null;
+            this._dragPlaceholderPos = -1;
         }
     },
 
     handleDragOver : function(source, actor, x, y, time) {
-        let app = getAppFromSource(source);
+        let app = null;
+        if (source instanceof AppDisplay.AppWellIcon)
+            app = this._appSystem.lookup_app(source.getId());
+        else if (source.metaWindow)
+            app = this._tracker.get_window_app(source.metaWindow);
 
         // Don't allow favoriting of transient apps
         if (app == null || app.is_window_backed())
@@ -860,22 +642,37 @@ const Dash = new Lang.Class({
         // the remove target has the same size as "normal" items, we don't
         // need to do the same adjustment there.
         if (this._dragPlaceholder) {
-            boxHeight -= this._dragPlaceholder.height;
+            boxHeight -= this._dragPlaceholder.actor.height;
             numChildren--;
         }
 
-        let pos;
-        if (!this._emptyDropTarget)
-            pos = Math.floor(y * numChildren / boxHeight);
-        else
-            pos = 0; // always insert at the top when dash is empty
+        let pos = Math.round(y * numChildren / boxHeight);
 
-        if (pos != this._dragPlaceholderPos && pos <= numFavorites && this._animatingPlaceholdersCount == 0) {
-            this._dragPlaceholderPos = pos;
+        if (pos != this._dragPlaceholderPos && pos <= numFavorites) {
+            if (this._animatingPlaceholdersCount > 0) {
+                let appChildren = children.filter(function(actor) {
+                    return actor._delegate &&
+                           actor._delegate.child &&
+                           actor._delegate.child._delegate &&
+                           actor._delegate.child._delegate.app;
+                });
+                this._dragPlaceholderPos = children.indexOf(appChildren[pos]);
+            } else {
+                this._dragPlaceholderPos = pos;
+            }
 
             // Don't allow positioning before or after self
             if (favPos != -1 && (pos == favPos || pos == favPos + 1)) {
-                this._clearDragPlaceholder();
+                if (this._dragPlaceholder) {
+                    this._dragPlaceholder.animateOutAndDestroy();
+                    this._animatingPlaceholdersCount++;
+                    this._dragPlaceholder.actor.connect('destroy',
+                        Lang.bind(this, function() {
+                            this._animatingPlaceholdersCount--;
+                        }));
+                }
+                this._dragPlaceholder = null;
+
                 return DND.DragMotionResult.CONTINUE;
             }
 
@@ -884,7 +681,7 @@ const Dash = new Lang.Class({
             // an animation
             let fadeIn;
             if (this._dragPlaceholder) {
-                this._dragPlaceholder.destroy();
+                this._dragPlaceholder.actor.destroy();
                 fadeIn = false;
             } else {
                 fadeIn = true;
@@ -893,19 +690,12 @@ const Dash = new Lang.Class({
             this._dragPlaceholder = new DragPlaceholderItem();
             this._dragPlaceholder.child.set_width (this.iconSize);
             this._dragPlaceholder.child.set_height (this.iconSize / 2);
-            this._box.insert_child_at_index(this._dragPlaceholder,
-                                            this._dragPlaceholderPos);
-            this._dragPlaceholder.show(fadeIn);
+            this._box.insert_actor(this._dragPlaceholder.actor,
+                                   this._dragPlaceholderPos);
+            if (fadeIn)
+                this._dragPlaceholder.animateIn();
         }
 
-        // Remove the drag placeholder if we are not in the
-        // "favorites zone"
-        if (pos > numFavorites)
-            this._clearDragPlaceholder();
-
-        if (!this._dragPlaceholder)
-            return DND.DragMotionResult.NO_DROP;
-
         let srcIsFavorite = (favPos != -1);
 
         if (srcIsFavorite)
@@ -916,7 +706,12 @@ const Dash = new Lang.Class({
 
     // Draggable target interface
     acceptDrop : function(source, actor, x, y, time) {
-        let app = getAppFromSource(source);
+        let app = null;
+        if (source instanceof AppDisplay.AppWellIcon) {
+            app = this._appSystem.lookup_app(source.getId());
+        } else if (source.metaWindow) {
+            app = this._tracker.get_window_app(source.metaWindow);
+        }
 
         // Don't allow favoriting of transient apps
         if (app == null || app.is_window_backed()) {
@@ -933,21 +728,16 @@ const Dash = new Lang.Class({
         let children = this._box.get_children();
         for (let i = 0; i < this._dragPlaceholderPos; i++) {
             if (this._dragPlaceholder &&
-                children[i] == this._dragPlaceholder)
+                children[i] == this._dragPlaceholder.actor)
                 continue;
 
-            let childId = children[i].child._delegate.app.get_id();
+            let childId = children[i]._delegate.child._delegate.app.get_id();
             if (childId == id)
                 continue;
             if (childId in favorites)
                 favPos++;
         }
 
-        // No drag placeholder means we don't wan't to favorite the app
-        // and we are dragging it to its original position
-        if (!this._dragPlaceholder)
-            return true;
-
         Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this,
             function () {
                 let appFavorites = AppFavorites.getAppFavorites();

js/ui/dateMenu.js

@@ -2,14 +2,12 @@
 
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
-const GnomeDesktop = imports.gi.GnomeDesktop;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const Atk = imports.gi.Atk;
 
 const Params = imports.misc.params;
 const Util = imports.misc.util;
@@ -17,6 +15,14 @@ const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Calendar = imports.ui.calendar;
+const UPowerGlib = imports.gi.UPowerGlib;
+
+// in org.gnome.desktop.interface
+const CLOCK_FORMAT_KEY        = 'clock-format';
+
+// in org.gnome.shell.clock
+const CLOCK_SHOW_DATE_KEY     = 'show-date';
+const CLOCK_SHOW_SECONDS_KEY  = 'show-seconds';
 
 function _onVertSepRepaint (area)
 {
@@ -32,30 +38,29 @@ function _onVertSepRepaint (area)
     cr.setDash([1, 3], 1); // Hard-code for now
     cr.setLineWidth(stippleWidth);
     cr.stroke();
-    cr.$dispose();
 };
 
 const DateMenuButton = new Lang.Class({
     Name: 'DateMenuButton',
     Extends: PanelMenu.Button,
 
-    _init: function() {
+    _init: function(params) {
+        params = Params.parse(params, { showEvents: true });
+
         let item;
         let hbox;
         let vbox;
 
         let menuAlignment = 0.25;
-        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
             menuAlignment = 1.0 - menuAlignment;
         this.parent(menuAlignment);
 
-        this._clockDisplay = new St.Label({ y_align: Clutter.ActorAlign.CENTER });
-        this.actor.label_actor = this._clockDisplay;
-        this.actor.add_actor(this._clockDisplay);
-        this.actor.add_style_class_name ('clock-display');
+        this._clock = new St.Label();
+        this.actor.add_actor(this._clock);
 
-        hbox = new St.BoxLayout({ name: 'calendarArea' });
-        this.menu.box.add_child(hbox);
+        hbox = new St.BoxLayout({name: 'calendarArea' });
+        this.menu.addActor(hbox);
 
         // Fill up the first column
 
@@ -63,12 +68,20 @@ const DateMenuButton = new Lang.Class({
         hbox.add(vbox);
 
         // Date
-        this._date = new St.Label({ style_class: 'datemenu-date-label',
-                                    can_focus: true });
+        this._date = new St.Label();
+        this._date.style_class = 'datemenu-date-label';
         vbox.add(this._date);
 
-        this._eventList = new Calendar.EventsList();
-        this._calendar = new Calendar.Calendar();
+        if (params.showEvents) {
+            this._eventSource = new Calendar.DBusEventSource();
+            this._eventList = new Calendar.EventsList(this._eventSource);
+        } else {
+            this._eventSource = null;
+            this._eventList = null;
+        }
+
+        // Calendar
+        this._calendar = new Calendar.Calendar(this._eventSource);
 
         this._calendar.connect('selected-date-changed',
                                Lang.bind(this, function(calendar, date) {
@@ -80,143 +93,147 @@ const DateMenuButton = new Lang.Class({
                                }));
         vbox.add(this._calendar.actor);
 
-        let separator = new PopupMenu.PopupSeparatorMenuItem();
-        vbox.add(separator.actor, { y_align: St.Align.END, expand: true, y_fill: false });
-
-        this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar"));
-        this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
-        vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
-
-        this._openClocksItem = new PopupMenu.PopupMenuItem(_("Open Clocks"));
-        this._openClocksItem.connect('activate', Lang.bind(this, this._onOpenClocksActivate));
-        vbox.add(this._openClocksItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
-
-        Shell.AppSystem.get_default().connect('installed-changed',
-                                              Lang.bind(this, this._appInstalledChanged));
-
-        item = this.menu.addSettingsAction(_("Date & Time Settings"), 'gnome-datetime-panel.desktop');
+        item = this.menu.addSettingsAction(_("Date and Time Settings"), 'gnome-datetime-panel.desktop');
         if (item) {
-            item.actor.show_on_set_parent = false;
+            let separator = new PopupMenu.PopupSeparatorMenuItem();
+            separator.setColumnWidths(1);
+            vbox.add(separator.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+
+            item.actor.can_focus = false;
             item.actor.reparent(vbox);
-            this._dateAndTimeSeparator = separator;
         }
 
-        this._separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
-                                               pseudo_class: 'highlighted' });
-        this._separator.connect('repaint', Lang.bind(this, _onVertSepRepaint));
-        hbox.add(this._separator);
+        if (params.showEvents) {
+            // Add vertical separator
 
-        // Fill up the second column
-        hbox.add(this._eventList.actor, { expand: true, y_fill: false, y_align: St.Align.START });
+            item = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
+                                        pseudo_class: 'highlighted' });
+            item.connect('repaint', Lang.bind(this, _onVertSepRepaint));
+            hbox.add(item);
+
+            // Fill up the second column
+            vbox = new St.BoxLayout({name:     'calendarEventsArea',
+                                     vertical: true});
+            hbox.add(vbox, { expand: true });
+
+            // Event list
+            vbox.add(this._eventList.actor, { expand: true });
+
+            item = new PopupMenu.PopupMenuItem(_("Open Calendar"));
+            item.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
+            item.actor.can_focus = false;
+            vbox.add(item.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+        }
 
         // Whenever the menu is opened, select today
         this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) {
             if (isOpen) {
                 let now = new Date();
-                this._calendar.setDate(now);
+                /* Passing true to setDate() forces events to be reloaded. We
+                 * want this behavior, because
+                 *
+                 *   o It will cause activation of the calendar server which is
+                 *     useful if it has crashed
+                 *
+                 *   o It will cause the calendar server to reload events which
+                 *     is useful if dynamic updates are not supported or not
+                 *     properly working
+                 *
+                 * Since this only happens when the menu is opened, the cost
+                 * isn't very big.
+                 */
+                this._calendar.setDate(now, true);
+                // No need to update this._eventList as ::selected-date-changed
+                // signal will fire
             }
         }));
 
         // Done with hbox for calendar and event list
 
-        this._clock = new GnomeDesktop.WallClock();
-        this._clock.connect('notify::clock', Lang.bind(this, this._updateClockAndDate));
+        // Track changes to clock settings
+        this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
+        this._clockSettings = new Gio.Settings({ schema: 'org.gnome.shell.clock' });
+        this._desktopSettings.connect('changed', Lang.bind(this, this._updateClockAndDate));
+        this._clockSettings.connect('changed', Lang.bind(this, this._updateClockAndDate));
+
+        // https://bugzilla.gnome.org/show_bug.cgi?id=655129
+        this._upClient = new UPowerGlib.Client();
+        this._upClient.connect('notify-resume', Lang.bind(this, this._updateClockAndDate));
+
+        // Start the clock
         this._updateClockAndDate();
-
-        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
-        this._sessionUpdated();
-    },
-
-    _appInstalledChanged: function() {
-        this._calendarApp = undefined;
-        this._updateEventsVisibility();
-    },
-
-    _updateEventsVisibility: function() {
-        let visible = this._eventSource.hasCalendars;
-        this._openCalendarItem.actor.visible = visible &&
-            (this._getCalendarApp() != null);
-        this._openClocksItem.actor.visible = visible &&
-            (this._getClockApp() != null);
-        this._separator.visible = visible;
-        this._eventList.actor.visible = visible;
-        if (visible) {
-            let alignment = 0.25;
-            if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
-                alignment = 1.0 - alignment;
-            this.menu._arrowAlignment = alignment;
-        } else {
-            this.menu._arrowAlignment = 0.5;
-        }
-    },
-
-    _setEventSource: function(eventSource) {
-        if (this._eventSource)
-            this._eventSource.destroy();
-
-        this._calendar.setEventSource(eventSource);
-        this._eventList.setEventSource(eventSource);
-
-        this._eventSource = eventSource;
-        this._eventSource.connect('notify::has-calendars', Lang.bind(this, function() {
-            this._updateEventsVisibility();
-        }));
-    },
-
-    _sessionUpdated: function() {
-        let eventSource;
-        let showEvents = Main.sessionMode.showCalendarEvents;
-        if (showEvents) {
-            eventSource = new Calendar.DBusEventSource();
-        } else {
-            eventSource = new Calendar.EmptyEventSource();
-        }
-        this._setEventSource(eventSource);
-        this._updateEventsVisibility();
-
-        // This needs to be handled manually, as the code to
-        // autohide separators doesn't work across the vbox
-        this._dateAndTimeSeparator.actor.visible = Main.sessionMode.allowSettings;
     },
 
     _updateClockAndDate: function() {
-        this._clockDisplay.set_text(this._clock.clock);
+        let format = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
+        let showDate = this._clockSettings.get_boolean(CLOCK_SHOW_DATE_KEY);
+        let showSeconds = this._clockSettings.get_boolean(CLOCK_SHOW_SECONDS_KEY);
+
+        let clockFormat;
+        let dateFormat;
+
+        switch (format) {
+            case '24h':
+                if (showDate)
+                    /* Translators: This is the time format with date used
+                       in 24-hour mode. */
+                    clockFormat = showSeconds ? _("%a %b %e, %R:%S")
+                                              : _("%a %b %e, %R");
+                else
+                    /* Translators: This is the time format without date used
+                       in 24-hour mode. */
+                    clockFormat = showSeconds ? _("%a %R:%S")
+                                              : _("%a %R");
+                break;
+            case '12h':
+            default:
+                if (showDate)
+                    /* Translators: This is a time format with date used
+                       for AM/PM. */
+                    clockFormat = showSeconds ? _("%a %b %e, %l:%M:%S %p")
+                                              : _("%a %b %e, %l:%M %p");
+                else
+                    /* Translators: This is a time format without date used
+                       for AM/PM. */
+                    clockFormat = showSeconds ? _("%a %l:%M:%S %p")
+                                              : _("%a %l:%M %p");
+                break;
+        }
+
+        let displayDate = new Date();
+
+        this._clock.set_text(displayDate.toLocaleFormat(clockFormat));
+
         /* Translators: This is the date format to use when the calendar popup is
          * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
          */
-        let dateFormat = _("%A %B %e, %Y");
-        let displayDate = new Date();
+        dateFormat = _("%A %B %e, %Y");
         this._date.set_text(displayDate.toLocaleFormat(dateFormat));
-    },
 
-    _getCalendarApp: function() {
-        if (this._calendarApp !== undefined)
-            return this._calendarApp;
-
-        let apps = Gio.AppInfo.get_recommended_for_type('text/calendar');
-        if (apps && (apps.length > 0))
-            this._calendarApp = apps[0];
-        else
-            this._calendarApp = null;
-        return this._calendarApp;
-    },
-
-    _getClockApp: function() {
-        return Shell.AppSystem.get_default().lookup_app('gnome-clocks.desktop');
+        Mainloop.timeout_add_seconds(1, Lang.bind(this, this._updateClockAndDate));
+        return false;
     },
 
     _onOpenCalendarActivate: function() {
         this.menu.close();
-
-        let app = this._getCalendarApp();
-        if (app.get_id() == 'evolution.desktop')
-            app = Gio.DesktopAppInfo.new('evolution-calendar.desktop');
-        app.launch([], global.create_app_launch_context());
-    },
-
-    _onOpenClocksActivate: function() {
-        this.menu.close();
-        let app = this._getClockApp();
-        app.activate();
+        let calendarSettings = new Gio.Settings({ schema: 'org.gnome.desktop.default-applications.office.calendar' });
+        let tool = calendarSettings.get_string('exec');
+        if (tool.length == 0 || tool == 'evolution') {
+            // TODO: pass the selected day
+            Util.spawn(['evolution', '-c', 'calendar']);
+        } else {
+            let needTerm = calendarSettings.get_boolean('needs-term');
+            if (needTerm) {
+                let terminalSettings = new Gio.Settings({ schema: 'org.gnome.desktop.default-applications.terminal' });
+                let term = terminalSettings.get_string('exec');
+                let arg = terminalSettings.get_string('exec-arg');
+                if (arg != '')
+                    Util.spawn([term, arg, tool]);
+                else
+                    Util.spawn([term, tool]);
+            } else {
+                Util.spawnCommandLine(tool)
+            }
+        }
     }
 });