Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline

12 files changed, 54 insertions, 20 deletions

diff --git a/bin/sugar-emulator b/bin/sugar-emulator
index acd5976..7f06609 100644
--- a/bin/sugar-emulator
+++ b/bin/sugar-emulator
@@ -88,11 +88,10 @@ def _start_xephyr(dpi, dimensions, fullscreen):
                     tries -= 1
                     time.sleep(0.1)
 
-def _start_matchbox():
-    cmd = ['matchbox-window-manager']
+def _start_window_manager():
+    cmd = ['metacity']
 
-    cmd.extend(['-use_titlebar', 'no'])
-    cmd.extend(['-theme', 'sugar'])
+    cmd.extend(['--no-force-fullscreen'])
 
     gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
 
@@ -157,7 +156,7 @@ def main():
     if not args:
         command.append('sugar')
     else:
-        _start_matchbox()
+        _start_window_manager()
 
         if args[0].endswith('.py'):
             command.append('python')
diff --git a/bin/sugar.in b/bin/sugar.in
index 3c9b9b6..7b5ca25 100644
--- a/bin/sugar.in
+++ b/bin/sugar.in
@@ -16,7 +16,6 @@ if [ -f ~/.sugar/debug ]; then
         . ~/.sugar/debug
 fi
 
-matchbox-window-manager -use_titlebar no -theme sugar \
-                        -kbdconfig @prefix@/share/sugar/data/kbdconfig &
+metacity --no-force-fullscreen &
 
 exec sugar-session
diff --git a/configure.ac b/configure.ac
index 103533d..6622db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar],[0.84.1],[],[sugar])
+AC_INIT([Sugar],[0.85.1],[],[sugar])
 
 AC_PREREQ([2.59])
 
diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
index 94c3bc1..5016943 100644
--- a/extensions/deviceicon/network.py
+++ b/extensions/deviceicon/network.py
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2008 One Laptop Per Child
+# Copyright (C) 2009 Tomeu Vizoso, Simon Schampijer
 #
 # 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
@@ -124,6 +125,12 @@ class WirelessPalette(Palette):
         self._set_channel(frequency)
         self._set_ip_address(iaddress)
         self._disconnect_item.show()
+        
+    def set_disconnected(self):
+        self.props.primary_text = ''
+        self.props.secondary_text = ''
+        self._disconnect_item.hide()
+        self.set_content(None)
 
     def __disconnect_activate_cb(self, menuitem):
         self.emit('deactivate-connection')
@@ -362,6 +369,12 @@ class WirelessDeviceView(ToolButton):
             address = self._device_props.Get(_NM_DEVICE_IFACE, 'Ip4Address')
             self._palette.set_connected(self._frequency, address)
             self._icon.props.pulsing = False
+        else:
+            self._icon.props.badge_name = None
+            self._icon.props.pulsing = False
+            self._icon.props.pulse_color = self._inactive_color
+            self._icon.props.base_color = self._inactive_color
+            self._palette.set_disconnected()
 
     def _update_color(self):
         self._icon.props.base_color = self._color
@@ -394,11 +407,9 @@ class WirelessDeviceView(ToolButton):
             settings.connection.id = 'Auto ' + connection_name
             settings.connection.uuid = unique_id()
             settings.connection.type = '802-11-wireless'
-            settings.connection.mode = 'adhoc'
             settings.wireless.ssid = dbus.ByteArray(connection_name)
-            settings.wireless.channel = 'bg'
+            settings.wireless.band = 'bg'
             settings.wireless.mode = 'adhoc'
-
             settings.ip4_config = IP4Config()
             settings.ip4_config.method = 'shared'
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5f19663..e01fb8b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,6 +29,7 @@ src/jarabe/controlpanel/cmd.py
 src/jarabe/controlpanel/gui.py
 src/jarabe/controlpanel/sectionview.py
 src/jarabe/controlpanel/toolbar.py
+src/jarabe/desktop/activitieslist.py
 src/jarabe/desktop/favoriteslayout.py
 src/jarabe/desktop/favoritesview.py
 src/jarabe/desktop/homebox.py
@@ -41,7 +42,6 @@ src/jarabe/frame/clipboardobject.py
 src/jarabe/frame/devicestray.py
 src/jarabe/frame/zoomtoolbar.py
 src/jarabe/intro/window.py
-src/jarabe/journal/collapsedentry.py
 src/jarabe/journal/detailview.py
 src/jarabe/journal/expandedentry.py
 src/jarabe/journal/journalactivity.py
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 75aad39..5d197c5 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -623,7 +623,8 @@ class CurrentActivityIcon(CanvasIcon, hippo.CanvasItem):
         self.connect('button-release-event', self.__button_release_event_cb)
 
     def __button_release_event_cb(self, icon, event):
-        self._home_model.get_active_activity().get_window().activate(1)
+        window = self._home_model.get_active_activity().get_window()
+        window.activate(gtk.get_current_event_time())
 
     def _update(self):
         self.props.file_name = self._home_activity.get_icon_path()
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index 8a1d569..de1f18d 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2006-2007 Red Hat, Inc.
+# Copyright (C) 2009 Tomeu Vizoso, Simon Schampijer
 #
 # 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
@@ -46,6 +47,7 @@ from jarabe.model import bundleregistry
 from jarabe.model import network
 from jarabe.model import shell
 from jarabe.model.network import Settings
+from jarabe.model.network import IP4Config
 from jarabe.model.network import WirelessSecurity
 
 _NM_SERVICE = 'org.freedesktop.NetworkManager'
@@ -228,7 +230,8 @@ class AccessPointView(CanvasPulsingIcon):
         if state == network.DEVICE_STATE_ACTIVATED:
             connection = network.find_connection(self._name)
             if connection:
-                connection.set_connected()
+                if self._mode == network.NM_802_11_MODE_INFRA:
+                    connection.set_connected()
 
             icon_name = '%s-connected' % _ICON_NAME
         else:
@@ -357,6 +360,9 @@ class AccessPointView(CanvasPulsingIcon):
                 settings.wireless.mode = 'infrastructure'
             elif self._mode == network.NM_802_11_MODE_ADHOC:
                 settings.wireless.mode = 'adhoc'
+                settings.wireless.band = 'bg'
+                settings.ip4_config = IP4Config()
+                settings.ip4_config.method = 'shared'
 
             wireless_security = self._get_security()
             settings.wireless_security = wireless_security
diff --git a/src/jarabe/frame/framewindow.py b/src/jarabe/frame/framewindow.py
index 02bb131..5cb1241 100644
--- a/src/jarabe/frame/framewindow.py
+++ b/src/jarabe/frame/framewindow.py
@@ -93,7 +93,7 @@ class FrameWindow(gtk.Window):
             self.resize(self.size, gtk.gdk.screen_height())
 
     def _realize_cb(self, widget):
-        self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
+        self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DOCK)
         self.window.set_accept_focus(False)
 
     def _enter_notify_cb(self, window, event):
diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py
index bff5197..2607005 100644
--- a/src/jarabe/model/network.py
+++ b/src/jarabe/model/network.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2008 Red Hat, Inc.
+# Copyright (C) 2009 Tomeu Vizoso, Simon Schampijer
 #
 # 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
@@ -103,7 +104,7 @@ class Wireless(object):
         self.ssid = None
         self.security = None
         self.mode = None
-        self.channel = None
+        self.band = None
 
     def get_dict(self):
         wireless = {'ssid': self.ssid}
@@ -111,8 +112,8 @@ class Wireless(object):
             wireless['security'] = self.security
         if self.mode:
             wireless['mode'] = self.mode
-        if self.channel:
-            wireless['channel'] = self.channel
+        if self.band:
+            wireless['band'] = self.band
         return wireless
 
 class Connection(object):
@@ -138,7 +139,6 @@ class IP4Config(object):
 
     def get_dict(self):
         ip4_config = {}
-        print self.method
         if self.method is not None:
             ip4_config['method'] = self.method
         return ip4_config
@@ -269,7 +269,6 @@ class NMSettingsConnection(dbus.service.Object):
             if self._settings.connection.timestamp is not None:
                 config.set(identifier, 'timestamp', 
                            self._settings.connection.timestamp)
-
             if self._settings.wireless_security is not None:
                 if self._settings.wireless_security.key_mgmt is not None:
                     config.set(identifier, 'key-mgmt',
diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py
index 709eb03..d7810ba 100644
--- a/src/jarabe/model/shell.py
+++ b/src/jarabe/model/shell.py
@@ -457,6 +457,12 @@ class ShellModel(gobject.GObject):
             if activity_id:
                 home_activity = self.get_activity_by_id(activity_id)
 
+                xid = window.get_xid()
+                gdk_window = gtk.gdk.window_foreign_new(xid)
+                gdk_window.set_decorations(0)
+
+                window.maximize()
+
             if not home_activity:
                 home_activity = Activity(activity_info, activity_id, window)
                 self._add_activity(home_activity)
diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py
index 08856c0..1f75851 100644
--- a/src/jarabe/view/keyhandler.py
+++ b/src/jarabe/view/keyhandler.py
@@ -22,6 +22,7 @@ import errno
 import traceback
 import sys
 
+import gconf
 import dbus
 import gtk
 
@@ -86,6 +87,8 @@ class KeyHandler(object):
         self._keystate_pressed = 0
         self._speech_proxy = None
 
+        self._ungrab_metacity_keys()
+
         self._key_grabber = KeyGrabber()
         self._key_grabber.connect('key-pressed',
                                   self._key_pressed_cb)
@@ -111,6 +114,15 @@ class KeyHandler(object):
 
         self._key_grabber.grab_keys(_actions_table.keys())
 
+    def _ungrab_metacity_keys(self):
+        """So we can grab those instead.
+        """
+        client = gconf.client_get_default()
+        for key in ['run_command_screenshot', 'switch_windows',
+                    'cycle_windows']:
+            key = '/apps/metacity/global_keybindings/' + key
+            client.set_string(key, 'disabled')
+
     def _change_volume(self, step=None, value=None):
         if step is not None:
             volume = sound.get_volume() + step
diff --git a/src/jarabe/view/launcher.py b/src/jarabe/view/launcher.py
index 3071790..0d0532f 100644
--- a/src/jarabe/view/launcher.py
+++ b/src/jarabe/view/launcher.py
@@ -61,6 +61,7 @@ class LaunchWindow(gtk.Window):
         wm.set_activity_id(widget.window, str(self._activity_id))
         widget.window.property_change('_SUGAR_WINDOW_TYPE', 'STRING', 8,
                                       gtk.gdk.PROP_MODE_REPLACE, 'launcher')
+        widget.window.set_decorations(0)
 
     def __size_changed_cb(self, screen):
         self._update_size()