Merge branch 'master' of git+ssh://ywwg@dev.laptop.org/git/sugar

shell/intro/intro.py

@@ -15,6 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import gtk, gobject
+import dbus
 import hippo
 import logging
 from gettext import gettext as _
@@ -100,11 +101,28 @@ class VideoBox(hippo.CanvasBox, hippo.CanvasItem):
         self._label.props.font_desc = font.DEFAULT.get_pango_desc()
         self.append(self._label)
 
+        # check for camera and if not generate a .jpg
+        has_webcam = False
         try:
-            import glive
-            self._video = glive.LiveVideoSlot(_VIDEO_WIDTH, _VIDEO_HEIGHT)
-        except ImportError:
-            self._video = IntroFallbackVideo()
+            sys_bus = dbus.SystemBus()
+            hal_obj = sys_bus.get_object ('org.freedesktop.Hal', '/org/freedesktop/Hal/Manager')
+            hal = dbus.Interface (hal_obj, 'org.freedesktop.Hal.Manager')
+
+            udis = hal.FindDeviceByCapability ('video4linux')
+
+            # check for the olpc specific camera
+            if not udis:
+                udis = hal.FindDeviceStringMatch('info.linux.driver','cafe1000-ccic')
+
+            if udis:
+                has_webcam = True
+                 
+        finally:
+            if has_webcam:
+                import glive
+                self._video = glive.LiveVideoSlot(_VIDEO_WIDTH, _VIDEO_HEIGHT)
+            else:
+                self._video = IntroFallbackVideo()
 
         self._video.set_size_request(_VIDEO_WIDTH, _VIDEO_HEIGHT)
         self._video.connect('pixbuf', self._new_pixbuf_cb)

shell/model/MeshModel.py

@@ -100,7 +100,7 @@ class MeshModel(gobject.GObject):
         self._add_access_point(nm_device, nm_network)
 
     def _nm_network_disappeared_cb(self, nm_device, nm_network):
-        self._remove_access_point(nm_device, nm_network)
+        self._remove_access_point(nm_network)
 
     def _add_network_device(self, nm_device):
         for nm_network in nm_device.get_networks():

shell/view/Shell.py

@@ -55,7 +55,7 @@ class Shell(gobject.GObject):
         self._frame = Frame(self)
         self._frame.show_and_hide(3)
 
-        self.start_activity('org.laptop.JournalActivity')
+        #self.start_activity('org.laptop.JournalActivity')
 
     def _activity_added_cb(self, home_model, home_activity):
         activity_host = ActivityHost(home_activity)